Merge remote-tracking branch 'decomp/main' into decomp_merge

2026-01-21 10:37:37 -08:00 · 2025-02-19 15:55:51 +01:00
parent 7257ea8efc 981af4b6af
commit d7db68476b
827 changed files with 21209 additions and 2422 deletions
--- a/15
+++ b/15
@@ -383,7 +383,8 @@ CPP        := gcc -E
 MKLDSCRIPT := tools/mkldscript
 MKDMADATA  := tools/mkdmadata
 ELF2ROM    := tools/elf2rom
-ZAPD       := tools/ZAPD/ZAPD.out
+BIN2C      := tools/bin2c
+N64TEXCONV := tools/assets/n64texconv/n64texconv
 FADO       := tools/fado/fado.elf
 PYTHON     ?= $(VENV)/bin/python3
 FLIPS      := tools/Flips/flips
@@ -950,22 +951,22 @@ $(BUILD_DIR)/src/overlays/%_reloc.o: $(BUILD_DIR)/spec
 	$(V)$(AS) $(ASFLAGS) $(@:.o=.s) -o $@

 $(BUILD_DIR)/assets/%.inc.c: assets/%.png
-	$(V)$(ZAPD) btex -eh -tt $(subst .,,$(suffix $*)) -i $< -o $@
+	$(V)$(N64TEXCONV) $(subst .,,$(suffix $*)) "$(findstring u32,$(subst .,,$(suffix $(basename $*))))" $< $@ $(@:.inc.c=.pal.inc.c)

 $(BUILD_DIR)/assets/%.inc.c: $(EXTRACTED_DIR)/assets/%.png
-	$(V)$(ZAPD) btex -eh -tt $(subst .,,$(suffix $*)) -i $< -o $@
+	$(V)$(N64TEXCONV) $(subst .,,$(suffix $*)) "$(findstring u32,$(subst .,,$(suffix $(basename $*))))" $< $@ $(@:.inc.c=.pal.inc.c)

 $(BUILD_DIR)/assets/%.bin.inc.c: assets/%.bin
-	$(V)$(ZAPD) bblb -eh -i $< -o $@
+	$(V)$(BIN2C) -t 1 $< $@

 $(BUILD_DIR)/assets/%.bin.inc.c: $(EXTRACTED_DIR)/assets/%.bin
-	$(V)$(ZAPD) bblb -eh -i $< -o $@
+	$(V)$(BIN2C) -t 1 $< $@

 $(BUILD_DIR)/assets/%.jpg.inc.c: assets/%.jpg
-	$(V)$(ZAPD) bren -eh -i $< -o $@
+	$(V)$(N64TEXCONV) JFIF "" $< $@

 $(BUILD_DIR)/assets/%.jpg.inc.c: $(EXTRACTED_DIR)/assets/%.jpg
-	$(V)$(ZAPD) bren -eh -i $< -o $@
+	$(V)$(N64TEXCONV) JFIF "" $< $@

 F3DEX3/f3dzex2.code:
 	$(V)$(PYTHON) tools/data_extractor.py --start 0xBCD0F0 --size 0x1630 --input $(BASEROM_DIR)/baserom-decompressed.z64 --output $@
--- a/assets/xml/objects/gameplay_field_keep.xml
+++ b/assets/xml/objects/gameplay_field_keep.xml
@@ -29,7 +29,7 @@
        <DList Name="gFieldDoorDL_004720" Offset="0x4720"/>
        <DList Name="gFieldDoorLeftDL" Offset="0x47A0"/>
        <DList Name="gFieldDoorRightDL" Offset="0x4978"/>
-        <Texture Name="gFieldDoor1Tex" OutName="field_door1" Format="i8" Width="32" Height="128" Offset="0x04F50"/>
+        <Texture Name="gFieldDoor1Tex" OutName="field_door1" Format="i4" Width="64" Height="128" Offset="0x04F50"/>
        <Texture Name="gFieldDoorKnobTopHalfTex" OutName="field_door_knob_upper" Format="rgba16" Width="16" Height="16" Offset="0x4B50"/>
        <Texture Name="gFieldDoorKnobTex" OutName="field_door_knob" Format="rgba16" Width="16" Height="16" Offset="0x4D50"/>
        <Skeleton Name="gFieldUnusedFishSkel" Type="Normal" LimbType="Standard" Offset="0x088F8"/>
--- a/assets/xml/objects/gameplay_keep.xml
+++ b/assets/xml/objects/gameplay_keep.xml
@@ -759,7 +759,7 @@
        <Texture Name="gEffHitMark24Tex" OutName="eff_hit_mark_24" Format="i4" Width="32" Height="24" Offset="0x21A90"/>
        <DList Name="gEffHitMarkDL" Offset="0x21C10"/>
        <Texture Name="gEffUnknown6Tex" OutName="eff_unknown_6" Format="i8" Width="32" Height="64" Offset="0x21CB0"/>
-        <Texture Name="gEffFleckTex" OutName="eff_fleck" Format="i8" Width="32" Height="64" Offset="0x224B0"/>
+        <Texture Name="gEffFleckTex" OutName="eff_fleck" Format="i4" Width="64" Height="64" Offset="0x224B0"/>
        <Texture Name="gEffUnknown8Tex" OutName="eff_unknown_8" Format="i8" Width="64" Height="64" Offset="0x22CB0"/>
        <Texture Name="gEffMagmaBubble1Tex" OutName="eff_magma_bubbles_1" Format="ia8" Width="16" Height="24" Offset="0x23CB0"/>
        <Texture Name="gEffMagmaBubble2Tex" OutName="eff_magma_bubbles_2" Format="ia8" Width="16" Height="24" Offset="0x23E30"/>
@@ -848,7 +848,7 @@
        <DList Name="gBugLimb9WrapperDL" Offset="0x34EE0"/>
        <DList Name="gBugLimb9WrapperWrapperDL" Offset="0x34EF0"/>
        <Texture Name="gBugBodyTex" OutName="bug_body" Format="rgba16" Width="16" Height="64" Offset="0x34FC0"/>
-        <Texture Name="gBugLegTex" OutName="bug_leg" Format="rgba16" Width="32" Height="4" Offset="0x357C0"/>
+        <Texture Name="gBugLegTex" OutName="bug_leg" Format="rgba16" Width="8" Height="16" Offset="0x357C0"/>
        <Skeleton Name="gBugSkel" Type="Normal" LimbType="Standard" Offset="0x35A30"/>
        <DList Name="gCuttableShrubStalkDL" Offset="0x35A80"/>
        <DList Name="gCuttableShrubTipDL" Offset="0x35B40"/>
--- a/assets/xml/objects/gameplay_keep_pal.xml
+++ b/assets/xml/objects/gameplay_keep_pal.xml
@@ -753,7 +753,7 @@
        <Texture Name="gEffHitMark24Tex" OutName="eff_hit_mark_24" Format="i4" Width="32" Height="24" Offset="0x215F0"/>
        <DList Name="gEffHitMarkDL" Offset="0x21770"/>
        <Texture Name="gEffUnknown6Tex" OutName="eff_unknown_6" Format="i8" Width="32" Height="64" Offset="0x21810"/>
-        <Texture Name="gEffFleckTex" OutName="eff_fleck" Format="i8" Width="32" Height="64" Offset="0x22010"/>
+        <Texture Name="gEffFleckTex" OutName="eff_fleck" Format="i4" Width="64" Height="64" Offset="0x22010"/>
        <Texture Name="gEffUnknown8Tex" OutName="eff_unknown_8" Format="i8" Width="64" Height="64" Offset="0x22810"/>
        <Texture Name="gEffMagmaBubble1Tex" OutName="eff_magma_bubbles_1" Format="ia8" Width="16" Height="24" Offset="0x23810"/>
        <Texture Name="gEffMagmaBubble2Tex" OutName="eff_magma_bubbles_2" Format="ia8" Width="16" Height="24" Offset="0x23990"/>
@@ -843,7 +843,7 @@
        <DList Name="gBugLimb9WrapperWrapperDL" Offset="0x34A50"/>
        <Skeleton Name="gBugSkel" Type="Normal" LimbType="Standard" Offset="0x35590"/>
        <Texture Name="gBugBodyTex" OutName="bug_body" Format="rgba16" Width="16" Height="64" Offset="0x34B20"/>
-        <Texture Name="gBugLegTex" OutName="bug_leg" Format="rgba16" Width="32" Height="4" Offset="0x35320"/>
+        <Texture Name="gBugLegTex" OutName="bug_leg" Format="rgba16" Width="8" Height="16" Offset="0x35320"/>
        <DList Name="gCuttableShrubStalkDL" Offset="0x355E0"/>
        <DList Name="gCuttableShrubTipDL" Offset="0x356A0"/>
        <Texture Name="gCuttableShrubLeafTFragmentTex" OutName="cuttable_shrub_leaf_fragment" Format="rgba16" Width="32" Height="32" Offset="0x35730"/>
--- a/assets/xml/objects/object_am.xml
+++ b/assets/xml/objects/object_am.xml
@@ -5,5 +5,6 @@
        <Animation Name="gArmosHopAnim" Offset="0x238"/>
        <Animation Name="gArmosDamagedAnim" Offset="0x5B3C"/>
        <Collision Name="gArmosCol" Offset="0x118"/>
+        <DList Name="gArmosUnusedDL" Offset="0x7A8"/>
    </File>
 </Root>
--- a/assets/xml/objects/object_ani.xml
+++ b/assets/xml/objects/object_ani.xml
@@ -51,6 +51,8 @@
        <Texture Name="gRoofManEarTex" OutName="roof_man_ear" Format="ci8" Width="16" Height="16" Offset="0x01318" TlutOffset="0x1088"/>
        <Texture Name="gRoofManHairTex" OutName="roof_man_hair" Format="ci8" Width="16" Height="16" Offset="0x01418" TlutOffset="0x1088"/>

+        <!-- Kakariko Roof Man Unused Textures -->
+        <Texture Name="gRoofManUnusedTex" OutName="roof_man_unused" Format="ci8" Width="16" Height="16" Offset="0x308" TlutOffset="0x00108"/>

        <!-- Kakariko Roof Man Eye Textures -->
        <Texture Name="gRoofManEyeOpenTex" OutName="roof_man_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x408"/>
--- a/assets/xml/objects/object_box.xml
+++ b/assets/xml/objects/object_box.xml
@@ -5,7 +5,9 @@
        <CurveAnimation Name="gTreasureChestCurveAnim_4F70" SkelOffset="0x5EB8" Offset="0x4F70"/>
        <Animation Name="gTreasureChestAnim_000128" Offset="0x128"/>
        <Animation Name="gTreasureChestAnim_00024C" Offset="0x24C"/>
+        <Blob Name="object_box_zeroes_Blob_00025C" Size="0xF4" Offset="0x025C"/>
        <Animation Name="gTreasureChestAnim_00043C" Offset="0x43C"/>
+        <Blob Name="object_box_zeroes_Blob_00044C" Size="0x64" Offset="0x044C"/>

        <DList Name="gTreasureChestChestFrontDL" Offset="0x6F0"/>
        <Texture Name="gTreasureChestFrontTex" OutName="chest_front" Format="rgba16" Width="32" Height="64" Offset="0x1798"/>
@@ -19,11 +21,7 @@
        <DList Name="gTreasureChestBossKeyChestSideAndTopDL" Offset="0x1678"/>
        <Texture Name="gTreasureChestBossKeySideAndTopTex" OutName="boss_key_side_and_top" Format="rgba16" Width="32" Height="32" Offset="0x2F98"/>

-        <Skeleton Name="gTreasureChestSkel" Type="Normal" LimbType="Standard" Offset="0x47D8"/>
+        <Skeleton Name="gTreasureChestSkel" Type="Flex" LimbType="Standard" Offset="0x47D8"/>
        <Collision Name="gTreasureChestCol" Offset="0x5FC8"/>
-
-        <!--Large Unaccounted-->
-        <Blob Name="gBoxBlob_00025C" Size="0xF4" Offset="0x025C"/>
-        <Blob Name="gBoxBlob_00044C" Size="0x64" Offset="0x044C"/>
    </File>
 </Root>
--- a/assets/xml/objects/object_bv.xml
+++ b/assets/xml/objects/object_bv.xml
@@ -7,7 +7,7 @@
        <Skeleton Name="gBarinadeSupportSkel" Type="Flex" LimbType="Standard" Offset="0x16098"/>
        <Skeleton Name="gBarinadeZapperSkel" Type="Flex" LimbType="Standard" Offset="0x185A0"/>
        <Skeleton Name="gBarinadeStumpSkel" Type="Flex" LimbType="Standard" Offset="0x17470"/>
-        <Skeleton Name="gBarinadeBariSkel" Type="Normal" LimbType="Standard" Offset="0x3A70"/>
+        <Skeleton Name="gBarinadeBariSkel" Type="Flex" LimbType="Standard" Offset="0x3A70"/>
        <Skeleton Name="gBarinadeCutSupportSkel" Type="Flex" LimbType="Standard" Offset="0x16BC8"/>

        <Animation Name="gBarinadeBodyAnim" Offset="0x3D84"/> <!-- Body anim 1-->
--- a/assets/xml/objects/object_bv_pal.xml
+++ b/assets/xml/objects/object_bv_pal.xml
@@ -7,7 +7,7 @@
        <Skeleton Name="gBarinadeSupportSkel" Type="Flex" LimbType="Standard" Offset="0x17498"/>
        <Skeleton Name="gBarinadeZapperSkel" Type="Flex" LimbType="Standard" Offset="0x199A0"/>
        <Skeleton Name="gBarinadeStumpSkel" Type="Flex" LimbType="Standard" Offset="0x18870"/>
-        <Skeleton Name="gBarinadeBariSkel" Type="Normal" LimbType="Standard" Offset="0x4E70"/>
+        <Skeleton Name="gBarinadeBariSkel" Type="Flex" LimbType="Standard" Offset="0x4E70"/>
        <Skeleton Name="gBarinadeCutSupportSkel" Type="Flex" LimbType="Standard" Offset="0x17FC8"/>

        <Animation Name="gBarinadeBodyAnim" Offset="0x5184"/> <!-- Body anim 1-->
--- a/assets/xml/objects/object_door_killer.xml
+++ b/assets/xml/objects/object_door_killer.xml
@@ -12,6 +12,6 @@
        <DList Name="object_door_killer_DL_001550" Offset="0x1550"/>
        <DList Name="object_door_killer_DL_0017B8" Offset="0x17B8"/>
        <DList Name="object_door_killer_DL_001A58" Offset="0x1A58"/>
-        <Skeleton Name="object_door_killer_Skel_001BC8" Type="Flex" LimbType="Standard" Offset="0x1BC8"/>
+        <Skeleton Name="object_door_killer_Skel_001BC8" Type="Flex" LimbType="LOD" Offset="0x1BC8"/>
    </File>
 </Root>
--- a/assets/xml/objects/object_fd.xml
+++ b/assets/xml/objects/object_fd.xml
@@ -19,9 +19,10 @@
        <DList Name="gVolvagiaManeModelDL" Offset="0x91E8"/>

        <!-- Eye textures -->
-        <Texture Name="gVolvagiaEyeOpenTex" OutName="volvagia_eye_open" Format="i8" Width="32" Height="32" Offset="0x38A8"/>
-        <Texture Name="gVolvagiaEyeHalfTex" OutName="volvagia_eye_half" Format="i8" Width="32" Height="32" Offset="0x34A8"/>
-        <Texture Name="gVolvagiaEyeClosedTex" OutName="volvagia_eye_closed" Format="i8" Width="32" Height="32" Offset="0x3CA8"/>
+        <Texture Name="gVolvagiaEyeTLUT" Format="rgba16" Width="16" Height="16" Offset="0x32A8"/>
+        <Texture Name="gVolvagiaEyeOpenTex" OutName="volvagia_eye_open" Format="ci8" Width="32" Height="32" Offset="0x38A8" TlutOffset="0x32A8"/>
+        <Texture Name="gVolvagiaEyeHalfTex" OutName="volvagia_eye_half" Format="ci8" Width="32" Height="32" Offset="0x34A8" TlutOffset="0x32A8"/>
+        <Texture Name="gVolvagiaEyeClosedTex" OutName="volvagia_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x3CA8" TlutOffset="0x32A8"/>

        <!-- Death display lists -->
        <DList Name="gVolvagiaRibsDL" Offset="0xB2F8"/>
--- a/assets/xml/objects/object_fd2.xml
+++ b/assets/xml/objects/object_fd2.xml
@@ -21,9 +21,10 @@
        <Animation Name="gHoleVolvagiaIdleAnim" Offset="0xC8EC"/>

        <!-- Eye textures -->
-        <Texture Name="gHoleVolvagiaEyeHalfTex" OutName="hole_volvagia_eye_half" Format="i8" Width="32" Height="32" Offset="0x2708"/>
-        <Texture Name="gHoleVolvagiaEyeOpenTex" OutName="hole_volvagia_eye_open" Format="i8" Width="32" Height="32" Offset="0x2B08"/>
-        <Texture Name="gHoleVolvagiaEyeClosedTex" OutName="hole_volvagia_eye_closed" Format="i8" Width="32" Height="32" Offset="0x2F08"/>
+        <Texture Name="gHoleVolvagiaEyeTLUT" Format="rgba16" Width="16" Height="16" Offset="0x2508"/>
+        <Texture Name="gHoleVolvagiaEyeHalfTex" OutName="hole_volvagia_eye_half" Format="ci8" Width="32" Height="32" Offset="0x2708" TlutOffset="0x2508"/>
+        <Texture Name="gHoleVolvagiaEyeOpenTex" OutName="hole_volvagia_eye_open" Format="ci8" Width="32" Height="32" Offset="0x2B08" TlutOffset="0x2508"/>
+        <Texture Name="gHoleVolvagiaEyeClosedTex" OutName="hole_volvagia_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x2F08" TlutOffset="0x2508"/>

        <!-- Unused animation -->
        <Animation Name="gHoleVolvagiaAnim_00CDAC" Offset="0xCDAC"/> <!-- Looks tired. Low health animation? -->
--- a/assets/xml/objects/object_fd_pal.xml
+++ b/assets/xml/objects/object_fd_pal.xml
@@ -19,9 +19,10 @@
        <DList Name="gVolvagiaManeModelDL" Offset="0x91E8"/>

        <!-- Eye textures -->
-        <Texture Name="gVolvagiaEyeOpenTex" OutName="volvagia_eye_open" Format="i8" Width="32" Height="32" Offset="0x38A8"/>
-        <Texture Name="gVolvagiaEyeHalfTex" OutName="volvagia_eye_half" Format="i8" Width="32" Height="32" Offset="0x34A8"/>
-        <Texture Name="gVolvagiaEyeClosedTex" OutName="volvagia_eye_closed" Format="i8" Width="32" Height="32" Offset="0x3CA8"/>
+        <Texture Name="gVolvagiaEyeTLUT" Format="rgba16" Width="16" Height="16" Offset="0x32A8"/>
+        <Texture Name="gVolvagiaEyeOpenTex" OutName="volvagia_eye_open" Format="ci8" Width="32" Height="32" Offset="0x38A8" TlutOffset="0x32A8"/>
+        <Texture Name="gVolvagiaEyeHalfTex" OutName="volvagia_eye_half" Format="ci8" Width="32" Height="32" Offset="0x34A8" TlutOffset="0x32A8"/>
+        <Texture Name="gVolvagiaEyeClosedTex" OutName="volvagia_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x3CA8" TlutOffset="0x32A8"/>

        <!-- Death display lists -->
        <DList Name="gVolvagiaRibsDL" Offset="0xB2F8"/>
--- a/assets/xml/objects/object_gi_medal.xml
+++ b/assets/xml/objects/object_gi_medal.xml
@@ -2,10 +2,25 @@
    <File Name="object_gi_medal" Segment="6">
        <DList Name="gGiForestMedallionFaceDL" Offset="0x0CB0"/>
        <DList Name="gGiMedallionDL" Offset="0x0E18"/>
+        <Array Name="gGiFireMedallionUnusedVtx" Count="148" Offset="0x11B0">
+            <Vtx/>
+        </Array>
        <DList Name="gGiFireMedallionFaceDL" Offset="0x1AF0"/>
+        <Array Name="gGiWaterMedallionUnusedVtx" Count="143" Offset="0x1F40">
+            <Vtx/>
+        </Array>
        <DList Name="gGiWaterMedallionFaceDL" Offset="0x2830"/>
+        <Array Name="gGiSpiritMedallionUnusedVtx" Count="143" Offset="0x2D20">
+            <Vtx/>
+        </Array>
        <DList Name="gGiSpiritMedallionFaceDL" Offset="0x3610"/>
+        <Array Name="gGiShadowMedallionUnusedVtx" Count="143" Offset="0x3A40">
+            <Vtx/>
+        </Array>
        <DList Name="gGiShadowMedallionFaceDL" Offset="0x4330"/>
+        <Array Name="gGiLightMedallionUnusedVtx" Count="143" Offset="0x4930">
+            <Vtx/>
+        </Array>
        <DList Name="gGiLightMedallionFaceDL" Offset="0x5220"/>
    </File>
 </Root>
--- a/assets/xml/objects/object_gnd.xml
+++ b/assets/xml/objects/object_gnd.xml
@@ -44,11 +44,11 @@
        <Texture Name="gPhantomGanonLimbTex_00AE80" OutName="phantom_ganon_limb_tex_00AE80" Format="rgba16" Width="8" Height="8" Offset="0xAE80"/>
        <Texture Name="gPhantomGanonLimbTex_00AF00" OutName="phantom_ganon_limb_tex_00AF00" Format="rgba16" Width="8" Height="8" Offset="0xAF00"/>
        <Texture Name="gPhantomGanonLimbTex_00C180" OutName="phantom_ganon_limb_tex_00C180" Format="rgba16" Width="8" Height="8" Offset="0xC180"/>
-        <Texture Name="gPhantomGanonLimbTex_00C400" OutName="phantom_ganon_limb_tex_00C400" Format="rgba16" Width="8" Height="8" Offset="0xC400"/>
-        <Texture Name="gPhantomGanonLimbTex_00B980" OutName="phantom_ganon_limb_tex_00B980" Format="rgba16" Width="16" Height="8" Offset="0xB980"/>
-        <Texture Name="gPhantomGanonLimbTex_00C480" OutName="phantom_ganon_limb_tex_00C480" Format="rgba16" Width="16" Height="8" Offset="0xC480"/>
-        <Texture Name="gPhantomGanonLimbTex_00BC80" OutName="phantom_ganon_limb_tex_00BC80" Format="rgba16" Width="16" Height="8" Offset="0xBC80"/>
-        <Texture Name="gPhantomGanonLimbTex_00BD80" OutName="phantom_ganon_limb_tex_00BD80" Format="rgba16" Width="16" Height="8" Offset="0xBD80"/>
+        <Texture Name="gPhantomGanonLimbTex_00C400" OutName="phantom_ganon_limb_tex_00C400" Format="rgba16" Width="4" Height="16" Offset="0xC400"/>
+        <Texture Name="gPhantomGanonLimbTex_00B980" OutName="phantom_ganon_limb_tex_00B980" Format="rgba16" Width="8" Height="16" Offset="0xB980"/>
+        <Texture Name="gPhantomGanonLimbTex_00C480" OutName="phantom_ganon_limb_tex_00C480" Format="rgba16" Width="8" Height="16" Offset="0xC480"/>
+        <Texture Name="gPhantomGanonLimbTex_00BC80" OutName="phantom_ganon_limb_tex_00BC80" Format="rgba16" Width="8" Height="16" Offset="0xBC80"/>
+        <Texture Name="gPhantomGanonLimbTex_00BD80" OutName="phantom_ganon_limb_tex_00BD80" Format="rgba16" Width="8" Height="16" Offset="0xBD80"/>
        <Texture Name="gPhantomGanonLimbTex_00C080" OutName="phantom_ganon_limb_tex_00C080" Format="rgba16" Width="16" Height="8" Offset="0xC080"/>
        <Texture Name="gPhantomGanonLimbTex_00C200" OutName="phantom_ganon_limb_tex_00C200" Format="rgba16" Width="16" Height="16" Offset="0xC200"/>
        <Texture Name="gPhantomGanonLimbTex_00A000" OutName="phantom_ganon_limb_tex_00A000" Format="rgba16" Width="16" Height="16" Offset="0xA000"/>
--- a/assets/xml/objects/object_hintnuts.xml
+++ b/assets/xml/objects/object_hintnuts.xml
@@ -1,7 +1,7 @@
 <Root>
    <File Name="object_hintnuts" Segment="6">
        <!-- Deku scrub skeleton -->
-        <Skeleton Name="gHintNutsSkel" Type="Normal" LimbType="Standard" Offset="0x23B8"/>
+        <Skeleton Name="gHintNutsSkel" Type="Flex" LimbType="Standard" Offset="0x23B8"/>

        <!-- Deku Scrub animations -->
        <Animation Name="gHintNutsSpitAnim" Offset="0x168"/>
--- a/assets/xml/objects/object_hni.xml
+++ b/assets/xml/objects/object_hni.xml
@@ -16,7 +16,7 @@
        <Texture Name="gHorseIngoManeTex" OutName="horse_ingo_mane" Format="i8" Width="16" Height="16" Offset="0x740"/>
        <Texture Name="gHorseIngoNostrilsTex" OutName="horse_ingo_nostrils" Format="rgba16" Width="16" Height="16" Offset="0x440"/>
        <Texture Name="gHorseIngoNoseTex" OutName="horse_ingo_nose" Format="i8" Width="8" Height="8" Offset="0x400"/>
-        <Texture Name="gHorseIngoForeheadTex" OutName="horse_ingo_forehead" Format="i8" Width="8" Height="8" Offset="0x840"/>
+        <Texture Name="gHorseIngoForeheadTex" OutName="horse_ingo_forehead" Format="i8" Width="16" Height="8" Offset="0x840"/>
        <Limb Name="gHorseIngoHeadLimb" LimbType="Skin" Offset="0x4748"/>

        <!-- Body -->
--- a/assets/xml/objects/object_ik.xml
+++ b/assets/xml/objects/object_ik.xml
@@ -1,8 +1,8 @@
 <Root>
    <File Name="object_ik" Segment="6">
-        <Skeleton Name="object_ik_Skel_000380" Type="Normal" LimbType="Standard" Offset="0x380"/>
-        <Skeleton Name="object_ik_Skel_000660" Type="Normal" LimbType="Standard" Offset="0x660"/>
-        <Skeleton Name="object_ik_Skel_000C90" Type="Normal" LimbType="Standard" Offset="0xC90"/>
+        <Skeleton Name="object_ik_Skel_000380" Type="Flex" LimbType="Standard" Offset="0x380"/>
+        <Skeleton Name="object_ik_Skel_000660" Type="Flex" LimbType="Standard" Offset="0x660"/>
+        <Skeleton Name="object_ik_Skel_000C90" Type="Flex" LimbType="Standard" Offset="0xC90"/>

        <Skeleton Name="object_ik_Skel_000900" Type="Flex" LimbType="Standard" Offset="0x900"/>
        <Skeleton Name="object_ik_Skel_000F30" Type="Flex" LimbType="Standard" Offset="0xF30"/>
@@ -29,7 +29,10 @@
        <Animation Name="gIronKnuckleNabooruSummonAxeAnim" Offset="0xC114"/>
        <Animation Name="gIronKnuckleStandUpAnim" Offset="0xCD70"/>
        <Animation Name="object_ik_Anim_00DD50" Offset="0xDD50"/>
+        <Animation Name="gIronKnuckleUnused1Anim" Offset="0xE28C"/>
        <Animation Name="gIronKnuckleWalkAnim" Offset="0xED24"/>
+        <Animation Name="gIronKnuckleUnused2Anim" Offset="0xF620"/>
+        <Animation Name="gIronKnuckleUnused3Anim" Offset="0x1E820"/>
        <Animation Name="object_ik_Anim_01EB14" Offset="0x1EB14"/>
        <Animation Name="object_ik_Anim_01EE34" Offset="0x1EE34"/>
        <Animation Name="gIronKnuckleNabooruDeathAnim" Offset="0x203D8"/>
--- a/assets/xml/objects/object_jya_obj.xml
+++ b/assets/xml/objects/object_jya_obj.xml
@@ -29,7 +29,7 @@
        <Texture Name="gCobraMirrorEyeTex" OutName="cobra_eye" Format="rgba16" Width="32" Height="32" Offset="0x15540"/>
        <Texture Name="gCobraMirrorHandleTex" OutName="cobra_handle" Format="rgba16" Width="32" Height="8" Offset="0x15F40"/>
        <Texture Name="gCobraMirrorMirrorTex" OutName="cobra_mirror" Format="ia16" Width="32" Height="32" Offset="0x14540"/>
-        <Texture Name="gCobraMirrorToothTex" OutName="cobra_tooth" Format="ia16" Width="32" Height="32" Offset="0x14D40"/>
+        <Texture Name="gCobraMirrorToothTex" OutName="cobra_tooth" Format="ia8" Width="64" Height="32" Offset="0x14D40"/>
        <DList Name="gKanaamiDL" Offset="0xF000"/>
        <Collision Name="gKanaamiCol" Offset="0xF208"/>
        <Texture Name="gKanaamiTopTex" OutName="kanaami_top" Format="rgba16" Width="32" Height="64" Offset="0x12540"/>
--- a/assets/xml/objects/object_kingdodongo.xml
+++ b/assets/xml/objects/object_kingdodongo.xml
@@ -101,7 +101,15 @@
        <Animation Name="object_kingdodongo_Anim_01CAE0" Offset="0x1B6E0"/>
        <Animation Name="object_kingdodongo_Anim_01D218" Offset="0x1BE18"/>
        <Animation Name="object_kingdodongo_Anim_01D934" Offset="0x1C534"/>
-        <DList Name="object_kingdodongo_DL_01D950" Offset="0x1C550"/><!--Blob Name="object_kingdodongo_Blob_01D9F0" Size="0x8000" Offset="0x1C5F0" /-->
+        <DList Name="object_kingdodongo_DL_01D950" Offset="0x1C550"/>
+        <Texture Name="object_kingdodongo_Tex_01D9F0" OutName="tex_0001D9F0" Format="ia8" Width="64" Height="64" Offset="0x1C5F0"/>
+        <Texture Name="object_kingdodongo_Tex_01E9F0" OutName="tex_0001E9F0" Format="ia8" Width="64" Height="64" Offset="0x1D5F0"/>
+        <Texture Name="object_kingdodongo_Tex_01F9F0" OutName="tex_0001F9F0" Format="ia8" Width="64" Height="64" Offset="0x1E5F0"/>
+        <Texture Name="object_kingdodongo_Tex_0209F0" OutName="tex_000209F0" Format="ia8" Width="64" Height="64" Offset="0x1F5F0"/>
+        <Texture Name="object_kingdodongo_Tex_0219F0" OutName="tex_000219F0" Format="ia8" Width="64" Height="64" Offset="0x205F0"/>
+        <Texture Name="object_kingdodongo_Tex_0229F0" OutName="tex_000229F0" Format="ia8" Width="64" Height="64" Offset="0x215F0"/>
+        <Texture Name="object_kingdodongo_Tex_0239F0" OutName="tex_000239F0" Format="ia8" Width="64" Height="64" Offset="0x225F0"/>
+        <Texture Name="object_kingdodongo_Tex_0249F0" OutName="tex_000249F0" Format="ia8" Width="64" Height="64" Offset="0x235F0"/>
        <DList Name="object_kingdodongo_DL_0259F0" Offset="0x245F0"/>
        <DList Name="object_kingdodongo_DL_025A90" Offset="0x24690"/>
        <Collision Name="object_kingdodongo_Col_025B64" Offset="0x24764"/>
--- a/Show More
+++ b/Show More