mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-25 09:45:02 +00:00
Code Issues Projects Releases Wiki Activity
oot/assets/xml/objects/object_mori_objects.xml

26 lines
1.6 KiB
XML
Raw Permalink Normal View History

Decompile a bunch of objects (#603) * Mostly done but shifted * still messed up * Almost OK * OBJECT_JYA_OBJ OK, OBJECT_GR OK * Done * Merge master and format * Cleanup * Cleanup 2 * Start object MB dont merge yet * Object_MB OK * Object_ydan_objects OK * General 'ydan' actor cleanup * Forgot some small things * Object_EC OK * add .gitkeep and run format * Object_sd OK but no textures cause of a zap issue * PR fixes * Fix object_sd * fix ydan * delete .gitkeep files * OBJECT_BOX as far as it can go with current ZAP * Fix undefined_syms * Start child link object * Push progress, dont merge yet * Object_mori_objects OK * Fixed? * Fix conflicts again * Seems like i missed some textures * Extract data for BgBombwall * More field * ZAP YEP 2.0 * Object_Box OK * Object_SD ok. Ready to merge * remove ASM and merge master * remove ASM * remove files wrongfully added to docs/ * Almost done * Change comment in z_player_lib.c * forgot some DLists in player_lib.c * Fix conflict, run format * Same as before but this time with Tex and TLUT * Last few things * fix object_GR and add limbs to object_sd * Nane -> Name * gChildDekuShieldMtx is now a matrix and not a blob * PR fixes (Fig) * add a space for comment in z_player_lib.c * re push and new lines * PR fixes (AngheloAlf) * PR fixes (Roman) * Fix Heishi2 * PR fixes (Fig) * Replace spacing in a file * PR fixes (Roman)
2021-05-26 22:59:21 +00:00
<Root>
Fix mori_tex object (#1380) * Update object_mori_tex.xml * Update object_mori_objects.xml * Update object_mori_objects.xml * Update object_mori_hineri1.xml * Update object_mori_hineri1a.xml * Update object_mori_hineri2.xml * Update object_mori_hineri2a.xml * fixed segment * Update assets/xml/objects/object_mori_tex.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Change water_tex to water Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2022-10-07 17:57:32 +00:00
<ExternalFile XmlPath="objects/object_mori_tex.xml" OutPath="assets/objects/object_mori_tex/"/>
Decompile a bunch of objects (#603) * Mostly done but shifted * still messed up * Almost OK * OBJECT_JYA_OBJ OK, OBJECT_GR OK * Done * Merge master and format * Cleanup * Cleanup 2 * Start object MB dont merge yet * Object_MB OK * Object_ydan_objects OK * General 'ydan' actor cleanup * Forgot some small things * Object_EC OK * add .gitkeep and run format * Object_sd OK but no textures cause of a zap issue * PR fixes * Fix object_sd * fix ydan * delete .gitkeep files * OBJECT_BOX as far as it can go with current ZAP * Fix undefined_syms * Start child link object * Push progress, dont merge yet * Object_mori_objects OK * Fixed? * Fix conflicts again * Seems like i missed some textures * Extract data for BgBombwall * More field * ZAP YEP 2.0 * Object_Box OK * Object_SD ok. Ready to merge * remove ASM and merge master * remove ASM * remove files wrongfully added to docs/ * Almost done * Change comment in z_player_lib.c * forgot some DLists in player_lib.c * Fix conflict, run format * Same as before but this time with Tex and TLUT * Last few things * fix object_GR and add limbs to object_sd * Nane -> Name * gChildDekuShieldMtx is now a matrix and not a blob * PR fixes (Fig) * add a space for comment in z_player_lib.c * re push and new lines * PR fixes (AngheloAlf) * PR fixes (Roman) * Fix Heishi2 * PR fixes (Fig) * Replace spacing in a file * PR fixes (Roman)
2021-05-26 22:59:21 +00:00
<File Name="object_mori_objects" Segment="6">
Change all instances of "palette" in object symbols/OutNames to "tlut" (#1099)
2022-01-11 01:41:47 +00:00
<Texture Name="gMoriHashiraTLUT" OutName="hashira_tlut" Format="rgba16" Width="112" Height="1" Offset="0x0000"/>
Cleanup asset xmls (#1044) * Consistent order for attributes of `Texture` nodes in asset xmls * Consistent order for attributes of `Blob` nodes in asset xmls * Use `LimbType` instead of `Type` in `Limb` nodes in asset xmls * Remove space before closing `/>` in asset xmls tags
2021-12-01 20:28:23 +00:00
<Texture Name="gMoriHashiraTex" OutName="hashira" Format="ci8" Width="32" Height="32" Offset="0x00E0" TlutOffset="0x0000"/>
Change all instances of "palette" in object symbols/OutNames to "tlut" (#1099)
2022-01-11 01:41:47 +00:00
<Texture Name="gMoriHashigoClaspTLUT" OutName="hashigo_clasp_tlut" Format="rgba16" Width="112" Height="1" Offset="0x3810"/>
Cleanup asset xmls (#1044) * Consistent order for attributes of `Texture` nodes in asset xmls * Consistent order for attributes of `Blob` nodes in asset xmls * Use `LimbType` instead of `Type` in `Limb` nodes in asset xmls * Remove space before closing `/>` in asset xmls tags
2021-12-01 20:28:23 +00:00
<Texture Name="gMoriHashigoClaspTex" OutName="hashigo_clasp" Format="ci8" Width="32" Height="32" Offset="0x38F0" TlutOffset="0x3810"/>
Decompile a bunch of objects (#603) * Mostly done but shifted * still messed up * Almost OK * OBJECT_JYA_OBJ OK, OBJECT_GR OK * Done * Merge master and format * Cleanup * Cleanup 2 * Start object MB dont merge yet * Object_MB OK * Object_ydan_objects OK * General 'ydan' actor cleanup * Forgot some small things * Object_EC OK * add .gitkeep and run format * Object_sd OK but no textures cause of a zap issue * PR fixes * Fix object_sd * fix ydan * delete .gitkeep files * OBJECT_BOX as far as it can go with current ZAP * Fix undefined_syms * Start child link object * Push progress, dont merge yet * Object_mori_objects OK * Fixed? * Fix conflicts again * Seems like i missed some textures * Extract data for BgBombwall * More field * ZAP YEP 2.0 * Object_Box OK * Object_SD ok. Ready to merge * remove ASM and merge master * remove ASM * remove files wrongfully added to docs/ * Almost done * Change comment in z_player_lib.c * forgot some DLists in player_lib.c * Fix conflict, run format * Same as before but this time with Tex and TLUT * Last few things * fix object_GR and add limbs to object_sd * Nane -> Name * gChildDekuShieldMtx is now a matrix and not a blob * PR fixes (Fig) * add a space for comment in z_player_lib.c * re push and new lines * PR fixes (AngheloAlf) * PR fixes (Roman) * Fix Heishi2 * PR fixes (Fig) * Replace spacing in a file * PR fixes (Roman)
2021-05-26 22:59:21 +00:00
<Collision Name="gMoriBigstCol" Offset="0x221C"/>
<DList Name="gMoriBigstDL" Offset="0x1E50"/>
<Collision Name="gMoriElevatorCol" Offset="0x35F8"/>
<DList Name="gMoriElevatorDL" Offset="0x2AD0"/>
<Collision Name="gMoriHashigoCol" Offset="0x37D8"/>
<DList Name="gMoriHashigoLadderDL" Offset="0x36B0"/>
<DList Name="gMoriHashigoClaspDL" Offset="0x4770"/>
<Collision Name="gMoriHashira1Col" Offset="0x1AF8"/>
<Collision Name="gMoriHashira2Col" Offset="0x89E0"/>
<DList Name="gMoriHashiraPlatformsDL" Offset="0x1300"/>
<DList Name="gMoriHashiraGateDL" Offset="0x8840"/>
<DList Name="gMoriIdomizuWaterDL" Offset="0x49D0"/>
<Collision Name="gMoriKaitenkabeCol" Offset="0x63B8"/>
<DList Name="gMoriKaitenkabeDL" Offset="0x56B0"/>
<Collision Name="gMoriRakkatenjoCol" Offset="0x87AC"/>
<DList Name="gMoriRakkatenjoDL" Offset="0x7690"/>
</File>
</Root>
Reference in a new issue Copy permalink