mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-12-02 07:46:01 +00:00
Code Issues Projects Releases Wiki Activity
oot/assets/xml/objects/object_link_child.xml

226 lines
18 KiB
XML
Raw 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>
<File Name="object_link_child" Segment="6">
<Skeleton Name="gLinkChildSkel" Type="Flex" LimbType="LOD" Offset="0x2CF6C"/>
<!--Far Limb DLists-->
<DList Name="gLinkChildLeftHandFarDL" Offset="0x16280"/>
<DList Name="gLinkChildRightHandFarDL" Offset="0x164E0"/>
<DList Name="gLinkChildSwordAndSheathFarDL" Offset="0x17360"/>
<DList Name="gLinkChildWaistFarDL" Offset="0x1AEC8"/>
<DList Name="gLinkChildLeftThighFarDL" Offset="0x1B0F8"/>
<DList Name="gLinkChildLeftShinFarDL" Offset="0x1B2B8"/>
<DList Name="gLinkChildLeftFootFarDL" Offset="0x1B510"/>
<DList Name="gLinkChildRightThighFarDL" Offset="0x1B638"/>
<DList Name="gLinkChildRightShinFarDL" Offset="0x1B7F8"/>
<DList Name="gLinkChildRightFootFarDL" Offset="0x1BA50"/>
<DList Name="gLinkChildCollarFarDL" Offset="0x1BB78"/>
<DList Name="gLinkChildTorsoFarDL" Offset="0x1BBD8"/>
<DList Name="gLinkChildHeadFarDL" Offset="0x1BDA0"/>
<DList Name="gLinkChildHatFarDL" Offset="0x1C2A8"/>
<DList Name="gLinkChildLeftShoulderFarDL" Offset="0x1C398"/>
<DList Name="gLinkChildLeftForearmFarDL" Offset="0x1C558"/>
<DList Name="gLinkChildRightShoulderFarDL" Offset="0x1C688"/>
<DList Name="gLinkChildRightForearmFarDL" Offset="0x1C848"/>
<!--Near Limb DLists-->
<DList Name="gLinkChildLeftHandNearDL" Offset="0x13CB0"/>
<DList Name="gLinkChildRightHandNearDL" Offset="0x141C0"/>
<DList Name="gLinkChildSwordAndSheathNearDL" Offset="0x15248"/>
<DList Name="gLinkChildWaistNearDL" Offset="0x202A8"/>
<DList Name="gLinkChildLeftThighNearDL" Offset="0x204F0"/>
<DList Name="gLinkChildLeftShinNearDL" Offset="0x206E8"/>
<DList Name="gLinkChildLeftFootNearDL" Offset="0x20978"/>
<DList Name="gLinkChildRightThighNearDL" Offset="0x20AD8"/>
<DList Name="gLinkChildRightShinNearDL" Offset="0x20CD0"/>
<DList Name="gLinkChildRightFootNearDL" Offset="0x20F60"/>
<DList Name="gLinkChildCollarNearDL" Offset="0x210C0"/>
<DList Name="gLinkChildTorsoNearDL" Offset="0x21130"/>
<DList Name="gLinkChildHeadNearDL" Offset="0x21360"/>
<DList Name="gLinkChildHatNearDL" Offset="0x219B0"/>
<DList Name="gLinkChildLeftShoulderNearDL" Offset="0x21AE8"/>
<DList Name="gLinkChildLeftForearmNearDL" Offset="0x21CB8"/>
<DList Name="gLinkChildRightShoulderNearDL" Offset="0x21E18"/>
<DList Name="gLinkChildRightForearmNearDL" Offset="0x21FE8"/>
<!--Limbs-->
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
<Limb Name="gLinkChildLimb_02CDC8" LimbType="LOD" Offset="0x2CDC8"/>
<Limb Name="gLinkChildWaistLimb" LimbType="LOD" Offset="0x2CDD8"/>
<Limb Name="gLinkChildLimb_02CDE8" LimbType="LOD" Offset="0x2CDE8"/>
<Limb Name="gLinkChildLeftThighLimb" LimbType="LOD" Offset="0x2CDF8"/>
<Limb Name="gLinkChildLeftShinLimb" LimbType="LOD" Offset="0x2CE08"/>
<Limb Name="gLinkChildLeftFootLimb" LimbType="LOD" Offset="0x2CE18"/>
<Limb Name="gLinkChildRightThighLimb" LimbType="LOD" Offset="0x2CE28"/>
<Limb Name="gLinkChildRightShinLimb" LimbType="LOD" Offset="0x2CE38"/>
<Limb Name="gLinkChildRightFootLimb" LimbType="LOD" Offset="0x2CE48"/>
<Limb Name="gLinkChildLimb_02CE58" LimbType="LOD" Offset="0x2CE58"/>
<Limb Name="gLinkChildHandLimb" LimbType="LOD" Offset="0x2CE68"/>
<Limb Name="gLinkChildHatLimb" LimbType="LOD" Offset="0x2CE78"/>
<Limb Name="gLinkChildCollarLimb" LimbType="LOD" Offset="0x2CE88"/>
<Limb Name="gLinkChildRightSholderLimb" LimbType="LOD" Offset="0x2CE98"/>
<Limb Name="gLinkChildRightForearmLimb" LimbType="LOD" Offset="0x2CEA8"/>
<Limb Name="gLinkChildLeftHandLimb" LimbType="LOD" Offset="0x2CEB8"/>
<Limb Name="gLinkChildLeftSholderLimb" LimbType="LOD" Offset="0x2CEC8"/>
<Limb Name="gLinkChildLeftForearmLimb" LimbType="LOD" Offset="0x2CED8"/>
<Limb Name="gLinkChildRightHandLimb" LimbType="LOD" Offset="0x2CEE8"/>
<Limb Name="gLinkChildSwordAndSheathLimb" LimbType="LOD" Offset="0x2CEF8"/>
<Limb Name="gLinkChildTorsoLimb" LimbType="LOD" Offset="0x2CF08"/>
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
<!--General DLists-->
<DList Name="gLinkChildLinkDekuStickDL" Offset="0x6CC0"/>
<DList Name="gLinkChildLeftHandHoldingMasterSwordDL" Offset="0x15540"/>
<DList Name="gLinkChildGoronBraceletDL" Offset="0x16118"/>
<!--Body Parts not used in Limbs-->
<DList Name="gLinkChildLeftFistNearDL" Offset="0x13E18"/>
<DList Name="gLinkChildRightHandClosedNearDL" Offset="0x14320"/>
<DList Name="gLinkChildRightHandClosedFarDL" Offset="0x16620"/>
<DList Name="gLinkChildLeftFistFarDL" Offset="0x163C0"/>
<DList Name="gLinkChildLeftFistAndKokiriSwordNearDL" Offset="0x13F38"/>
<DList Name="gLinkChildLeftFistAndKokiriSwordFarDL" Offset="0x17630"/>
<DList Name="gLinkChildRightFistAndDekuShieldNearDL" Offset="0x14440"/>
<DList Name="gLinkChildRightFistAndDekuShieldFarDL" Offset="0x16740"/>
<DList Name="gLinkChildLeftFistAndBoomerangNearDL" Offset="0x14660"/>
<DList Name="gLinkChildLeftFistAndBoomerangFarDL" Offset="0x16908"/>
<DList Name="gLinkChildHylianShieldSwordAndSheathNearDL" Offset="0x148A8"/>
<DList Name="gLinkChildHylianShieldSwordAndSheathFarDL" Offset="0x16A98"/>
<DList Name="gLinkChildHylianShieldAndSheathNearDL" Offset="0x14B40"/>
<DList Name="gLinkChildHylianShieldAndSheathFarDL" Offset="0x16CF8"/>
<DList Name="gLinkChildDekuShieldSwordAndSheathNearDL" Offset="0x14D68"/>
<DList Name="gLinkChildDekuShieldSwordAndSheathFarDL" Offset="0x16EE8"/>
<DList Name="gLinkChildDekuShieldAndSheathNearDL" Offset="0x15010"/>
<DList Name="gLinkChildDekuShieldAndSheathFarDL" Offset="0x17150"/>
<DList Name="gLinkChildSheathNearDL" Offset="0x15408"/>
<DList Name="gLinkChildSheathFarDL" Offset="0x17500"/>
<DList Name="gLinkChildRightHandAndOOTNearDL" Offset="0x15958"/>
<DList Name="gLinkChildRightHandHoldingOOTFarDL" Offset="0x178A0"/>
<DList Name="gLinkChildRightHandHoldingFairyOcarinaNearDL" Offset="0x15BA8"/>
<DList Name="gLinkChildRightHandHoldingFairyOcarinaFarDL" Offset="0x17AF0"/>
<DList Name="gLinkChildRightHandHoldingFairySlingshotNearDL" Offset="0x15DF0"/>
<DList Name="gLinkChildRightHandHoldingFairySlingshotFarDL" Offset="0x17D38"/>
<DList Name="gLinkChildLeftHandUpNearDL" Offset="0x15FD0"/>
<DList Name="gLinkChildLeftHandUpFarDL" Offset="0x17F00"/>
<DList Name="gLinkChildRightArmStretchedSlingshotDL" Offset="0x18048"/>
<DList Name="gLinkChildBottleDL" Offset="0x18478"/>
<DList Name="gLinkChildDL_18580" Offset="0x18580"/>
<DList Name="gLinkChildBottle2DL" Offset="0x18648"/>
<DList Name="gLinkChildSlinghotStringDL" Offset="0x221A8"/>
<DList Name="gLinkChildDekuShieldDL" Offset="0x224F8"/>
<Mtx Name="gLinkChildDekuShieldMtx" Offset="0x22648"/>
<DList Name="gLinkChildDekuShieldWithMatrixDL" Offset="0x22688"/>
<!--Masks-->
<DList Name="gLinkChildSkullMaskDL" Offset="0x2AD40"/>
<DList Name="gLinkChildSpookyMaskDL" Offset="0x2AF70"/>
<DList Name="gLinkChildKeatonMaskDL" Offset="0x2B060"/>
<DList Name="gLinkChildMaskOfTruthDL" Offset="0x2B1F0"/>
<DList Name="gLinkChildGoronMaskDL" Offset="0x2B350"/>
<DList Name="gLinkChildZoraMaskDL" Offset="0x2B580"/>
<DList Name="gLinkChildGerudoMaskDL" Offset="0x2B788"/>
<DList Name="gLinkChildBunnyHoodDL" Offset="0x2CA38"/>
<!--Textures-->
Even more objects (#913) * malon adult limbs and enum * malon adult animations * Malon Adult textures * Object_ma2 OK * Cleanup undefined syms file * more cleanup * object_in OK * change * Object_TA limbs and Limb DLs ok * Textures in DLs OK * Object TA animations OK * Object TA OK * clean up the xml * almost done with impa textures * name impa draw funcs * fix globalCtx2 in talon_init * more progress in impa * eye texture stuff * impa OK * remove files * fix messed up merge * Switch MA2 blink timer from hex * Name a function * Fix skelanime fixer * Missing malon adult TLUT * add some missing symbols in DemoEc * Fix conflicts, part2 * Clean up TLUT related stuff and some minor things * Remove unused externs from z_demo_ec * Remove unused symbols from undefined_syms.txt * PR fixes (Dragorn) * Dragorn fixes * Fix various texture-related issues in object_link_child * Update assets/xml/objects/object_in.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_ta.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_ta.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_ta.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_ta.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_in.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_in.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_in.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_in.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_in.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * fix ingo and the rest of Dragorns fix * impa fixes * fix ingo again * fix windmill man missing TLUT * Fix impa in viewer * Roman's fixes * Add limb * Missed an animation Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2021-11-24 18:37:36 +00:00
<Texture Name="gLinkChildNoseTex" OutName="link_child_nose" Format="ci8" Width="16" Height="16" Offset="0x5000" TlutOffset="0x5500"/>
<Texture Name="gLinkChildUnusedHandTex" OutName="link_child_unused_hand" Format="ci8" Width="16" Height="16" Offset="0x5100" TlutOffset="0x5500"/>
<Texture Name="gLinkChildEarTex" OutName="link_child_ear" Format="ci8" Width="16" Height="16" Offset="0x5200" TlutOffset="0x5500"/>
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="gLinkChildLowerBootTex" OutName="link_child_lower_boot" Format="ci8" Width="16" Height="16" Offset="0x5C00" TlutOffset="0x5300"/>
<Texture Name="gLinkChildUnusedBootTex" OutName="link_child_unused_boot" Format="ci8" Width="24" Height="32" Offset="0x5D00" TlutOffset="0x5300"/><!--Unused so hard to verify-->
Even more objects (#913) * malon adult limbs and enum * malon adult animations * Malon Adult textures * Object_ma2 OK * Cleanup undefined syms file * more cleanup * object_in OK * change * Object_TA limbs and Limb DLs ok * Textures in DLs OK * Object TA animations OK * Object TA OK * clean up the xml * almost done with impa textures * name impa draw funcs * fix globalCtx2 in talon_init * more progress in impa * eye texture stuff * impa OK * remove files * fix messed up merge * Switch MA2 blink timer from hex * Name a function * Fix skelanime fixer * Missing malon adult TLUT * add some missing symbols in DemoEc * Fix conflicts, part2 * Clean up TLUT related stuff and some minor things * Remove unused externs from z_demo_ec * Remove unused symbols from undefined_syms.txt * PR fixes (Dragorn) * Dragorn fixes * Fix various texture-related issues in object_link_child * Update assets/xml/objects/object_in.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_ta.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_ta.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_ta.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_ta.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_in.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_in.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_in.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_in.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_in.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * fix ingo and the rest of Dragorns fix * impa fixes * fix ingo again * fix windmill man missing TLUT * Fix impa in viewer * Roman's fixes * Add limb * Missed an animation Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2021-11-24 18:37:36 +00:00
<Texture Name="gLinkChildBootTex" OutName="link_child_boot" Format="ci8" Width="32" Height="32" Offset="0x6000" TlutOffset="0x5300"/>
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
<Texture Name="gLinkChildWaistTex" OutName="link_child_waist" Format="i8" Width="32" Height="32" Offset="0x6400"/>
Even more objects (#913) * malon adult limbs and enum * malon adult animations * Malon Adult textures * Object_ma2 OK * Cleanup undefined syms file * more cleanup * object_in OK * change * Object_TA limbs and Limb DLs ok * Textures in DLs OK * Object TA animations OK * Object TA OK * clean up the xml * almost done with impa textures * name impa draw funcs * fix globalCtx2 in talon_init * more progress in impa * eye texture stuff * impa OK * remove files * fix messed up merge * Switch MA2 blink timer from hex * Name a function * Fix skelanime fixer * Missing malon adult TLUT * add some missing symbols in DemoEc * Fix conflicts, part2 * Clean up TLUT related stuff and some minor things * Remove unused externs from z_demo_ec * Remove unused symbols from undefined_syms.txt * PR fixes (Dragorn) * Dragorn fixes * Fix various texture-related issues in object_link_child * Update assets/xml/objects/object_in.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_ta.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_ta.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_ta.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_ta.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_in.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_in.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_in.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_in.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_in.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * fix ingo and the rest of Dragorns fix * impa fixes * fix ingo again * fix windmill man missing TLUT * Fix impa in viewer * Roman's fixes * Add limb * Missed an animation Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2021-11-24 18:37:36 +00:00
<Texture Name="gLinkChildBeltTex" OutName="link_child_belt" Format="ci8" Width="8" Height="16" Offset="0x6800" TlutOffset="0x5300"/>
<Texture Name="gLinkChildBeltClaspTex" OutName="link_child_belt_clasp" Format="ci8" Width="32" Height="16" Offset="0x6880" TlutOffset="0x5300"/>
ZAPD update: Gotta go fast! (#877) * copy over the xml * Rename anims * A bunch of renames * minor extract_assets fixes * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "820678b4e" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "820678b4e" git-subrepo: version: "0.4.3" origin: "???" commit: "???" * Change rgb5a1 to rgba16 * eye and eyebrows * some dlists * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "6be9af65d" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "6be9af65d" git-subrepo: version: "0.4.3" origin: "???" commit: "???"
2021-07-28 02:16:03 +00:00
<Texture Name="gLinkChildFairyOcarinaTex" OutName="link_child_fairy_ocarina" Format="rgba16" Width="32" Height="16" Offset="0x6E08"/>
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="gLinkChildDekuShieldBackTex" OutName="link_child_deku_shield_back" Format="rgba16" Width="32" Height="32" Offset="0x7688"/>
Even more objects (#913) * malon adult limbs and enum * malon adult animations * Malon Adult textures * Object_ma2 OK * Cleanup undefined syms file * more cleanup * object_in OK * change * Object_TA limbs and Limb DLs ok * Textures in DLs OK * Object TA animations OK * Object TA OK * clean up the xml * almost done with impa textures * name impa draw funcs * fix globalCtx2 in talon_init * more progress in impa * eye texture stuff * impa OK * remove files * fix messed up merge * Switch MA2 blink timer from hex * Name a function * Fix skelanime fixer * Missing malon adult TLUT * add some missing symbols in DemoEc * Fix conflicts, part2 * Clean up TLUT related stuff and some minor things * Remove unused externs from z_demo_ec * Remove unused symbols from undefined_syms.txt * PR fixes (Dragorn) * Dragorn fixes * Fix various texture-related issues in object_link_child * Update assets/xml/objects/object_in.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_ta.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_ta.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_ta.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_ta.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_in.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_in.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_in.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_in.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_in.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * fix ingo and the rest of Dragorns fix * impa fixes * fix ingo again * fix windmill man missing TLUT * Fix impa in viewer * Roman's fixes * Add limb * Missed an animation Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2021-11-24 18:37:36 +00:00
<Texture Name="gLinkChildDekuShieldFrontTex" OutName="link_child_deku_shield_front" Format="rgba16" Width="32" Height="64" Offset="0x7E88"/>
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="gLinkChildHylianShieldBackTex" OutName="link_child_hylian_shield_back" Format="rgba16" Width="16" Height="32" Offset="0x8E88"/>
ZAPD update: Gotta go fast! (#877) * copy over the xml * Rename anims * A bunch of renames * minor extract_assets fixes * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "820678b4e" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "820678b4e" git-subrepo: version: "0.4.3" origin: "???" commit: "???" * Change rgb5a1 to rgba16 * eye and eyebrows * some dlists * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "6be9af65d" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "6be9af65d" git-subrepo: version: "0.4.3" origin: "???" commit: "???"
2021-07-28 02:16:03 +00:00
<Texture Name="gLinkChildSlingshotTex" OutName="link_child_slingshot" Format="rgba16" Width="16" Height="32" Offset="0x9288"/>
<Texture Name="gLinkChildSlingshotSeedTex" OutName="link_child_slingshot_seed" Format="rgba16" Width="32" Height="32" Offset="0x9688"/>
Even more objects (#913) * malon adult limbs and enum * malon adult animations * Malon Adult textures * Object_ma2 OK * Cleanup undefined syms file * more cleanup * object_in OK * change * Object_TA limbs and Limb DLs ok * Textures in DLs OK * Object TA animations OK * Object TA OK * clean up the xml * almost done with impa textures * name impa draw funcs * fix globalCtx2 in talon_init * more progress in impa * eye texture stuff * impa OK * remove files * fix messed up merge * Switch MA2 blink timer from hex * Name a function * Fix skelanime fixer * Missing malon adult TLUT * add some missing symbols in DemoEc * Fix conflicts, part2 * Clean up TLUT related stuff and some minor things * Remove unused externs from z_demo_ec * Remove unused symbols from undefined_syms.txt * PR fixes (Dragorn) * Dragorn fixes * Fix various texture-related issues in object_link_child * Update assets/xml/objects/object_in.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_ta.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_ta.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_ta.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_ta.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_in.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_in.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_in.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_in.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_in.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * fix ingo and the rest of Dragorns fix * impa fixes * fix ingo again * fix windmill man missing TLUT * Fix impa in viewer * Roman's fixes * Add limb * Missed an animation Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2021-11-24 18:37:36 +00:00
<Texture Name="gLinkChildHandTex" OutName="link_child_hand" Format="ci8" Width="16" Height="16" Offset="0xA1F0" TlutOffset="0x9E88"/>
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="gLinkChildKokiriSwordSheathTex" OutName="link_child_kokiri_sword_sheath" Format="ci8" Width="16" Height="16" Offset="0xA2F0" TlutOffset="0x9F10"/>
Even more objects (#913) * malon adult limbs and enum * malon adult animations * Malon Adult textures * Object_ma2 OK * Cleanup undefined syms file * more cleanup * object_in OK * change * Object_TA limbs and Limb DLs ok * Textures in DLs OK * Object TA animations OK * Object TA OK * clean up the xml * almost done with impa textures * name impa draw funcs * fix globalCtx2 in talon_init * more progress in impa * eye texture stuff * impa OK * remove files * fix messed up merge * Switch MA2 blink timer from hex * Name a function * Fix skelanime fixer * Missing malon adult TLUT * add some missing symbols in DemoEc * Fix conflicts, part2 * Clean up TLUT related stuff and some minor things * Remove unused externs from z_demo_ec * Remove unused symbols from undefined_syms.txt * PR fixes (Dragorn) * Dragorn fixes * Fix various texture-related issues in object_link_child * Update assets/xml/objects/object_in.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_ta.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_ta.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_ta.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_ta.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_in.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_in.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_in.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_in.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_in.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * fix ingo and the rest of Dragorns fix * impa fixes * fix ingo again * fix windmill man missing TLUT * Fix impa in viewer * Roman's fixes * Add limb * Missed an animation Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2021-11-24 18:37:36 +00:00
<Texture Name="gLinkChildSwordJewelTex" OutName="link_child_sword_jewel" Format="ci8" Width="32" Height="16" Offset="0xA3F0" TlutOffset="0xA118"/>
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="gLinkChildMasterSwordPommelTex" OutName="link_child_master_sword_pommel" Format="ci8" Width="16" Height="16" Offset="0xA5F0" TlutOffset="0x9F10"/>
<Texture Name="gLinkChildMasterSwordGuardTex" OutName="link_child_master_sword_guard" Format="ci8" Width="32" Height="32" Offset="0xA6F0" TlutOffset="0x9F10"/>
<Texture Name="gLinkChildMasterSwordEmblemTex" OutName="link_child_master_sword_emblem" Format="ci8" Width="16" Height="16" Offset="0xAAF0" TlutOffset="0x9F10"/>
Even more objects (#913) * malon adult limbs and enum * malon adult animations * Malon Adult textures * Object_ma2 OK * Cleanup undefined syms file * more cleanup * object_in OK * change * Object_TA limbs and Limb DLs ok * Textures in DLs OK * Object TA animations OK * Object TA OK * clean up the xml * almost done with impa textures * name impa draw funcs * fix globalCtx2 in talon_init * more progress in impa * eye texture stuff * impa OK * remove files * fix messed up merge * Switch MA2 blink timer from hex * Name a function * Fix skelanime fixer * Missing malon adult TLUT * add some missing symbols in DemoEc * Fix conflicts, part2 * Clean up TLUT related stuff and some minor things * Remove unused externs from z_demo_ec * Remove unused symbols from undefined_syms.txt * PR fixes (Dragorn) * Dragorn fixes * Fix various texture-related issues in object_link_child * Update assets/xml/objects/object_in.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_ta.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_ta.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_ta.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_ta.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_in.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_in.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_in.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_in.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_in.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * fix ingo and the rest of Dragorns fix * impa fixes * fix ingo again * fix windmill man missing TLUT * Fix impa in viewer * Roman's fixes * Add limb * Missed an animation Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2021-11-24 18:37:36 +00:00
<Texture Name="gLinkChildGoronBraceletTex" OutName="link_child_goron_bracelet" Format="rgba16" Width="8" Height="8" Offset="0x7208"/>
Outname -> OutName for OBJECT_LINK_CHILD (#827) * Outname -> OutName * ANother child fix * TLUT -> tlut
2021-05-27 02:16:01 +00:00
<Texture Name="gLinkChildGoronSymbolTex" OutName="link_child_goron_symbol" Format="ia16" Width="16" Height="32" Offset="0x7288"/>
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
ZAPD update: Gotta go fast! (#877) * copy over the xml * Rename anims * A bunch of renames * minor extract_assets fixes * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "820678b4e" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "820678b4e" git-subrepo: version: "0.4.3" origin: "???" commit: "???" * Change rgb5a1 to rgba16 * eye and eyebrows * some dlists * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "6be9af65d" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "6be9af65d" git-subrepo: version: "0.4.3" origin: "???" commit: "???"
2021-07-28 02:16:03 +00:00
<Texture Name="gLinkChildSkullMaskTeethTex" OutName="link_child_skull_mask_teeth" Format="rgba16" Width="8" Height="8" Offset="0x26BA0"/>
<Texture Name="gLinkChildSkullMaskNoseTex" OutName="link_child_skull_mask_nose" Format="rgba16" Width="8" Height="8" Offset="0x27520"/>
<Texture Name="gLinkChildSkullMaskEyeTex" OutName="link_child_skull_mask_eye" Format="rgba16" Width="16" Height="16" Offset="0x23B20"/>
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
<Texture Name="gLinkChildSpookyMaskTex" OutName="link_child_spooky_mask" Format="ia16" Width="32" Height="64" Offset="0x226A0"/>
ZAPD update: Gotta go fast! (#877) * copy over the xml * Rename anims * A bunch of renames * minor extract_assets fixes * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "820678b4e" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "820678b4e" git-subrepo: version: "0.4.3" origin: "???" commit: "???" * Change rgb5a1 to rgba16 * eye and eyebrows * some dlists * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "6be9af65d" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "6be9af65d" git-subrepo: version: "0.4.3" origin: "???" commit: "???"
2021-07-28 02:16:03 +00:00
<Texture Name="gLinkChildKeatonMaskEyeBrowTex" OutName="link_child_keaton_mask_eye_brow" Format="rgba16" Width="32" Height="16" Offset="0x236A0"/>
<Texture Name="gLinkChildKeatonMaskEarTex" OutName="link_child_keaton_mask_ear" Format="rgba16" Width="8" Height="8" Offset="0x23AA0"/>
<Texture Name="gLinkChildMaskOfTruthCurveTex" OutName="link_child_mask_of_truth_curves" Format="rgba16" Width="16" Height="32" Offset="0x24D20"/>
<Texture Name="gLinkChildMaskOfTruthTex" OutName="link_child_mask_of_truth" Format="rgba16" Width="32" Height="64" Offset="0x23D20"/>
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
ZAPD update: Gotta go fast! (#877) * copy over the xml * Rename anims * A bunch of renames * minor extract_assets fixes * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "820678b4e" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "820678b4e" git-subrepo: version: "0.4.3" origin: "???" commit: "???" * Change rgb5a1 to rgba16 * eye and eyebrows * some dlists * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "6be9af65d" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "6be9af65d" git-subrepo: version: "0.4.3" origin: "???" commit: "???"
2021-07-28 02:16:03 +00:00
<Texture Name="gLinkChildGoronMaskMouthTex" OutName="link_child_goron_mask_mouth" Format="rgba16" Width="64" Height="32" Offset="0x25120"/>
<Texture Name="gLinkChildGoronMaskEyeTex" OutName="link_child_goron_mask_eye" Format="rgba16" Width="32" Height="32" Offset="0x26120"/>
<Texture Name="gLinkChildGoronMaskNoseTex" OutName="link_child_goron_mask_nose" Format="rgba16" Width="8" Height="8" Offset="0x26920"/>
<Texture Name="gLinkChildGoronMaskHairTex" OutName="link_child_goron_mask_hair" Format="rgba16" Width="16" Height="16" Offset="0x269A0"/>
<Texture Name="gLinkChildGoronMaskEarTex" OutName="link_child_goron_mask_ear" Format="rgba16" Width="8" Height="8" Offset="0x26C20"/><!--TODO verify this-->
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
ZAPD update: Gotta go fast! (#877) * copy over the xml * Rename anims * A bunch of renames * minor extract_assets fixes * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "820678b4e" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "820678b4e" git-subrepo: version: "0.4.3" origin: "???" commit: "???" * Change rgb5a1 to rgba16 * eye and eyebrows * some dlists * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "6be9af65d" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "6be9af65d" git-subrepo: version: "0.4.3" origin: "???" commit: "???"
2021-07-28 02:16:03 +00:00
<Texture Name="gLinkChildZoraMaskEyeBoarderTex" OutName="link_child_zora_mask_eye_boarder" Format="rgba16" Width="8" Height="8" Offset="0x26CA0"/>
<Texture Name="gLinkChildZoraMaskEarTex" OutName="link_child_zora_mask_ear" Format="rgba16" Width="32" Height="32" Offset="0x26D20"/>
<Texture Name="gLinkChildZoraMaskEyeTex" OutName="link_child_zora_mask_eye" Format="rgba16" Width="32" Height="32" Offset="0x275A0"/>
<Texture Name="gLinkChildZoraMaskMouthTex" OutName="link_child_zora_mask_mouth" Format="rgba16" Width="32" Height="32" Offset="0x27DA0"/>
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
ZAPD update: Gotta go fast! (#877) * copy over the xml * Rename anims * A bunch of renames * minor extract_assets fixes * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "820678b4e" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "820678b4e" git-subrepo: version: "0.4.3" origin: "???" commit: "???" * Change rgb5a1 to rgba16 * eye and eyebrows * some dlists * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "6be9af65d" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "6be9af65d" git-subrepo: version: "0.4.3" origin: "???" commit: "???"
2021-07-28 02:16:03 +00:00
<Texture Name="gLinkChildGerudoMaskEyeTex" OutName="link_child_gerudo_mask_eye" Format="rgba16" Width="32" Height="32" Offset="0x285A0"/>
<Texture Name="gLinkChildGerudoMaskMouthTex" OutName="link_child_gerudo_mask_mouth" Format="rgba16" Width="16" Height="16" Offset="0x28DA0"/>
<Texture Name="gLinkChildGerudoMaskHairTex" OutName="link_child_gerudo_mask_hair" Format="rgba16" Width="16" Height="16" Offset="0x28FA0"/>
<Texture Name="gLinkChildGerudoMaskNoseTex" OutName="link_child_gerudo_mask_nose" Format="rgba16" Width="8" Height="8" Offset="0x291A0"/>
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
ZAPD update: Gotta go fast! (#877) * copy over the xml * Rename anims * A bunch of renames * minor extract_assets fixes * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "820678b4e" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "820678b4e" git-subrepo: version: "0.4.3" origin: "???" commit: "???" * Change rgb5a1 to rgba16 * eye and eyebrows * some dlists * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "6be9af65d" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "6be9af65d" git-subrepo: version: "0.4.3" origin: "???" commit: "???"
2021-07-28 02:16:03 +00:00
<Texture Name="gLinkChildBunnyHoodEyeTex" OutName="link_child_bunny_hood_eye" Format="rgba16" Width="16" Height="16" Offset="0x2BA28"/>
<Texture Name="gLinkChildBunnyHoodTex" OutName="link_child_bunny_hood" Format="rgba16" Width="16" Height="32" Offset="0x2BC28"/>
<Texture Name="gLinkChildBunnyHoodEarTex" OutName="link_child_bunny_hood_ear" Format="rgba16" Width="16" Height="32" Offset="0x2C028"/>
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
Object_RU1, Object_MA1, and warp pad objects Decompiled (#828) * Ruto limbs * RutoLimb enum * the enum doesn't go in en_door * Limb DLists * Name almost all textures and clean up EnRu1.c * remove padding * Name all but 1 animation and remove undefined syms * Object MA limbs OK * (MA1)Most textures * Small renames in EnMa1.c * Object MA1 OK * add base object for Mjin * Mjin OK * Update object_ma1.xml * PR fixes (Fig) * PR fixes * Missed one * Update assets/xml/objects/object_ru1.xml Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-05-30 17:10:17 +00:00
<!--TLUTs-->
ZAPD update: Gotta go fast! (#877) * copy over the xml * Rename anims * A bunch of renames * minor extract_assets fixes * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "820678b4e" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "820678b4e" git-subrepo: version: "0.4.3" origin: "???" commit: "???" * Change rgb5a1 to rgba16 * eye and eyebrows * some dlists * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "6be9af65d" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "6be9af65d" git-subrepo: version: "0.4.3" origin: "???" commit: "???"
2021-07-28 02:16:03 +00:00
<Texture Name="gLinkChildSkinTLUT" OutName="link_child_skin_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5500"/>
<Texture Name="gLinkChildHandTLUT" OutName="link_child_hand_tlut" Format="rgba16" Width="17" Height="4" Offset="0x9E88"/>
<Texture Name="gLinkChildSwordsTLUT" OutName="link_child_swords_tlut" Format="rgba16" Width="16" Height="16" Offset="0x9F10"/> <!--For both the kokiri sword sheath and master sword-->
<Texture Name="gLinkChildSwordTLUT" OutName="link_child_sword_tlut" Format="rgba16" Width="27" Height="4" Offset="0xA118"/>
<Texture Name="gLinkChildBeltTLUT" OutName="link_child_belt_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5300"/>
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
<!--Eyes-->
Even more objects (#913) * malon adult limbs and enum * malon adult animations * Malon Adult textures * Object_ma2 OK * Cleanup undefined syms file * more cleanup * object_in OK * change * Object_TA limbs and Limb DLs ok * Textures in DLs OK * Object TA animations OK * Object TA OK * clean up the xml * almost done with impa textures * name impa draw funcs * fix globalCtx2 in talon_init * more progress in impa * eye texture stuff * impa OK * remove files * fix messed up merge * Switch MA2 blink timer from hex * Name a function * Fix skelanime fixer * Missing malon adult TLUT * add some missing symbols in DemoEc * Fix conflicts, part2 * Clean up TLUT related stuff and some minor things * Remove unused externs from z_demo_ec * Remove unused symbols from undefined_syms.txt * PR fixes (Dragorn) * Dragorn fixes * Fix various texture-related issues in object_link_child * Update assets/xml/objects/object_in.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_ta.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_ta.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_ta.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_ta.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_in.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_in.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_in.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_in.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_in.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * fix ingo and the rest of Dragorns fix * impa fixes * fix ingo again * fix windmill man missing TLUT * Fix impa in viewer * Roman's fixes * Add limb * Missed an animation Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2021-11-24 18:37:36 +00:00
<Texture Name="gLinkChildEyesOpenTex" OutName="link_child_eyes_open" Format="ci8" Width="64" Height="32" Offset="0x0000" TlutOffset="0x5500"/>
<Texture Name="gLinkChildEyesHalfTex" OutName="link_child_eyes_half" Format="ci8" Width="64" Height="32" Offset="0x0800" TlutOffset="0x5500"/>
<Texture Name="gLinkChildEyesClosedfTex" OutName="link_child_eyes_closed" Format="ci8" Width="64" Height="32" Offset="0x1000" TlutOffset="0x5500"/>
<Texture Name="gLinkChildEyesRollLeftTex" OutName="link_child_eyes_roll_left" Format="ci8" Width="64" Height="32" Offset="0x1800" TlutOffset="0x5500"/><!--Left from links perspective-->
<Texture Name="gLinkChildEyesRollRightTex" OutName="link_child_eyes_roll_right" Format="ci8" Width="64" Height="32" Offset="0x2000" TlutOffset="0x5500"/><!--Right from links perspective-->
<Texture Name="gLinkChildEyesShockTex" OutName="link_child_eyes_shock" Format="ci8" Width="64" Height="32" Offset="0x2800" TlutOffset="0x5500"/>
<Texture Name="gLinkChildEyesUnk1Tex" OutName="link_child_eyes_unk_1" Format="ci8" Width="64" Height="32" Offset="0x3000" TlutOffset="0x5500"/>
<Texture Name="gLinkChildEyesUnk2Tex" OutName="link_child_eyes_unk_2" Format="ci8" Width="64" Height="32" Offset="0x3800" TlutOffset="0x5500"/>
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
<!--Mouth-->
Even more objects (#913) * malon adult limbs and enum * malon adult animations * Malon Adult textures * Object_ma2 OK * Cleanup undefined syms file * more cleanup * object_in OK * change * Object_TA limbs and Limb DLs ok * Textures in DLs OK * Object TA animations OK * Object TA OK * clean up the xml * almost done with impa textures * name impa draw funcs * fix globalCtx2 in talon_init * more progress in impa * eye texture stuff * impa OK * remove files * fix messed up merge * Switch MA2 blink timer from hex * Name a function * Fix skelanime fixer * Missing malon adult TLUT * add some missing symbols in DemoEc * Fix conflicts, part2 * Clean up TLUT related stuff and some minor things * Remove unused externs from z_demo_ec * Remove unused symbols from undefined_syms.txt * PR fixes (Dragorn) * Dragorn fixes * Fix various texture-related issues in object_link_child * Update assets/xml/objects/object_in.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_ta.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_ta.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_ta.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_ta.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_in.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_in.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_in.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_in.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_in.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * fix ingo and the rest of Dragorns fix * impa fixes * fix ingo again * fix windmill man missing TLUT * Fix impa in viewer * Roman's fixes * Add limb * Missed an animation Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2021-11-24 18:37:36 +00:00
<Texture Name="gLinkChildMouth1Tex" OutName="link_mouth_1" Format="ci8" Width="32" Height="32" Offset="0x4000" TlutOffset="0x5500"/>
<Texture Name="gLinkChildMouth2Tex" OutName="link_mouth_2" Format="ci8" Width="32" Height="32" Offset="0x4400" TlutOffset="0x5500"/>
<Texture Name="gLinkChildMouth3Tex" OutName="link_mouth_3" Format="ci8" Width="32" Height="32" Offset="0x4800" TlutOffset="0x5500"/>
<Texture Name="gLinkChildMouth4Tex" OutName="link_mouth_4" Format="ci8" Width="32" Height="32" Offset="0x4C00" TlutOffset="0x5500"/>
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
<!--Unused Vtx-->
<Array Name="gLinkChildVtx_019E08" Count="35" Offset="0x19E08">
<Vtx/>
</Array>
<Array Name="gLinkChildVtx_01A428" Count="39" Offset="0x1A428">
<Vtx/>
</Array>
<Array Name="gLinkChildVtx_01AA98" Count="40" Offset="0x1AA98">
<Vtx/>
</Array>
<Array Name="gLinkChildVtx_01EB38" Count="39" Offset="0x1EB38">
<Vtx/>
</Array>
<Array Name="gLinkChildVtx_01F2B8" Count="39" Offset="0x1F2B8">
<Vtx/>
</Array>
<Array Name="gLinkChildVtx_01FA28" Count="62" Offset="0x1FA28">
<Vtx/>
</Array>
</File>
</Root>
Reference in a new issue Copy permalink