From a750282d2d48d8dff589cdfca17ccdd0389419c6 Mon Sep 17 00:00:00 2001
From: Dragorn421 <Dragorn421@users.noreply.github.com>
Date: Fri, 6 Jun 2025 02:24:29 +0200
Subject: [PATCH] Add various undocumented resources in xmls 1 (#2589)

* Add various undocumented resources in xmls 1

* bss
---
 assets/xml/objects/gameplay_dangeon_keep.xml  | 23 ++++++
 assets/xml/objects/gameplay_keep.xml          | 54 +++++++++++++
 assets/xml/objects/gameplay_keep_pal.xml      | 54 +++++++++++++
 assets/xml/objects/object_door_killer.xml     |  8 ++
 assets/xml/objects/object_gi_boots_2.xml      |  1 +
 assets/xml/objects/object_gi_butterfly.xml    |  1 +
 assets/xml/objects/object_gi_clothes.xml      |  1 +
 assets/xml/objects/object_gi_dekupouch.xml    |  2 +
 assets/xml/objects/object_gi_fire.xml         |  2 +
 assets/xml/objects/object_gi_frog.xml         |  1 +
 assets/xml/objects/object_gi_gerudo.xml       |  1 +
 assets/xml/objects/object_gi_gerudomask.xml   |  6 ++
 assets/xml/objects/object_gi_ghost.xml        |  2 +
 assets/xml/objects/object_gi_gloves.xml       |  1 +
 assets/xml/objects/object_gi_golonmask.xml    |  6 ++
 assets/xml/objects/object_gi_hoverboots.xml   |  2 +
 assets/xml/objects/object_gi_ki_tan_mask.xml  |  1 +
 assets/xml/objects/object_gi_letter.xml       |  2 +
 assets/xml/objects/object_gi_liquid.xml       |  3 +
 assets/xml/objects/object_gi_milk.xml         |  1 +
 assets/xml/objects/object_gi_niwatori.xml     |  2 +
 assets/xml/objects/object_gi_nuts.xml         |  1 +
 assets/xml/objects/object_gi_ocarina.xml      |  1 +
 assets/xml/objects/object_gi_ocarina_0.xml    |  1 +
 assets/xml/objects/object_gi_prescription.xml |  1 +
 assets/xml/objects/object_gi_purse.xml        |  1 +
 assets/xml/objects/object_gi_rabit_mask.xml   |  1 +
 assets/xml/objects/object_gi_shield_1.xml     |  1 +
 assets/xml/objects/object_gi_shield_3.xml     |  2 +
 assets/xml/objects/object_gi_soldout.xml      |  1 +
 assets/xml/objects/object_gi_soul.xml         |  1 +
 assets/xml/objects/object_gi_ticketstone.xml  |  2 +
 assets/xml/objects/object_gi_truth_mask.xml   |  2 +
 assets/xml/objects/object_gi_zoramask.xml     |  6 ++
 assets/xml/objects/object_kingdodongo.xml     | 75 +++++++++++++++++++
 assets/xml/objects/object_oE4s.xml            |  2 +
 assets/xml/objects/object_ossan.xml           | 26 +++++++
 assets/xml/objects/object_po_field.xml        | 28 +++++++
 assets/xml/objects/object_po_sisters.xml      | 31 ++++++++
 assets/xml/objects/object_poh.xml             | 39 ++++++++++
 assets/xml/objects/object_ps.xml              | 45 +++++++++++
 assets/xml/objects/object_reeba.xml           | 17 +++++
 assets/xml/objects/object_rl.xml              |  2 +
 assets/xml/objects/object_tk.xml              | 51 +++++++++++++
 .../actors/ovl_En_Viewer/z_en_viewer.c        |  2 +
 src/overlays/actors/ovl_En_Xc/z_en_xc.c       |  2 +-
 46 files changed, 514 insertions(+), 1 deletion(-)

diff --git a/assets/xml/objects/gameplay_dangeon_keep.xml b/assets/xml/objects/gameplay_dangeon_keep.xml
index 4dcfa922b1..4b1360a558 100644
--- a/assets/xml/objects/gameplay_dangeon_keep.xml
+++ b/assets/xml/objects/gameplay_dangeon_keep.xml
@@ -1,5 +1,7 @@
 <Root>
     <File Name="gameplay_dangeon_keep" Segment="5">
+        <Texture Name="gameplay_dangeon_keep_000000_Tex" Format="i8" Width="16" Height="32" Offset="0x0"/>
+        <Texture Name="gameplay_dangeon_keep_000200_Tex" Format="i8" Width="16" Height="32" Offset="0x200"/>
         <Array Name="gUnusedCandleVtx" Count="4" Offset="0x400">
             <Vtx/>
         </Array>
@@ -8,6 +10,7 @@
             <Vtx/>
         </Array>
         <DList Name="gBrownFragmentDL" Offset="0x530"/>
+        <Texture Name="gameplay_dangeon_keep_0005C0_Tex" Format="rgba16" Width="16" Height="16" Offset="0x5C0"/>
         <Texture Name="gUnusedStoneTex" OutName="unused_stone" Format="rgba16" Width="32" Height="32" Offset="0x7C0"/>
         <Array Name="gDoorLockVtx" Count="20" Offset="0xFC0">
             <Vtx/>
@@ -17,6 +20,7 @@
             <Vtx/>
         </Array>
         <DList Name="gDoorChainDL" Offset="0x11F0"/>
+        <Texture Name="gameplay_dangeon_keep_001280_Tex" Format="rgba16" Width="32" Height="32" Offset="0x1280"/>
         <Texture Name="gUnusedGoldLockTex" OutName="unused_gold_lock" Format="rgba16" Width="32" Height="32" Offset="0x1A80"/>
         <Texture Name="gDoorChainTex" OutName="door_chain" Format="rgba16" Width="16" Height="128" Offset="0x2280"/>
         <Array Name="gUnusedBombBagVtx" Count="4" Offset="0x3280">
@@ -104,6 +108,10 @@
             <Vtx/>
         </Array>
         <DList Name="gBetaCrystalSwitchDL" Offset="0x77B0"/>
+        <Texture Name="gameplay_dangeon_keep_0078A0_Tex" Format="i8" Width="32" Height="32" Offset="0x78A0"/>
+        <Texture Name="gameplay_dangeon_keep_007CA0_Tex" Format="i8" Width="32" Height="32" Offset="0x7CA0"/>
+        <Texture Name="gameplay_dangeon_keep_0080A0_Tex" Format="rgba16" Width="32" Height="32" Offset="0x80A0"/>
+        <Texture Name="gameplay_dangeon_keep_0088A0_Tex" Format="rgba16" Width="32" Height="32" Offset="0x88A0"/>
         <Texture Name="gEyeSwitchGoldClosedTex" OutName="eye_gold_closed" Format="rgba16" Width="32" Height="32" Offset="0x90A0"/>
         <Texture Name="gEyeSwitchGoldOpeningTex" OutName="eye_gold_opening" Format="rgba16" Width="32" Height="32" Offset="0x98A0"/>
         <Texture Name="gEyeSwitchGoldClosingTex" OutName="eye_gold_closing" Format="rgba16" Width="32" Height="32" Offset="0xA0A0"/>
@@ -113,11 +121,26 @@
         <Texture Name="gEyeSwitchSilverClosedTex" OutName="eye_silver_closed" Format="rgba16" Width="32" Height="32" Offset="0xC0A0"/>
         <Texture Name="gDungeonKeepTex_00C8A0" OutName="dungeon_keep_tex_00C8A0" Format="rgba16" Width="32" Height="32" Offset="0xC8A0"/>
         <Texture Name="gDungeonkeepTex_00D0A0" OutName="dungeon_keep_tex_00D0A0" Format="rgba16" Width="32" Height="32" Offset="0xD0A0"/>
+        <Texture Name="gameplay_dangeon_keep_00D8A0_Tex" Format="rgba16" Width="32" Height="32" Offset="0xD8A0"/>
+        <Texture Name="gameplay_dangeon_keep_00E0A0_Tex" Format="rgba16" Width="32" Height="32" Offset="0xE0A0"/>
         <Texture Name="gDungeonKeepTex_00E8A0" OutName="dungeon_keep_tex_00E8A0" Format="i8" Width="32" Height="32" Offset="0xE8A0"/>
         <Texture Name="gDungeonKeepTex_00ECA0" OutName="dungeon_keep_tex_00ECA0" Format="i8" Width="32" Height="32" Offset="0xECA0"/>
         <Texture Name="gDungeonKeepTex_00F0A0" OutName="dungeon_keep_tex_00F0A0" Format="rgba16" Width="32" Height="32" Offset="0xF0A0"/>
+        <Texture Name="gameplay_dangeon_keep_00F8A0_Tex" Format="rgba16" Width="64" Height="32" Offset="0xF8A0"/>
+        <Texture Name="gameplay_dangeon_keep_0108A0_Tex" Format="rgba16" Width="32" Height="64" Offset="0x108A0"/>
+        <Texture Name="gameplay_dangeon_keep_0118A0_Tex" Format="rgba16" Width="16" Height="16" Offset="0x118A0"/>
+        <Texture Name="gameplay_dangeon_keep_011AA0_Tex" Format="rgba16" Width="16" Height="16" Offset="0x11AA0"/>
+        <Texture Name="gameplay_dangeon_keep_011CA0_Tex" Format="rgba16" Width="32" Height="64" Offset="0x11CA0"/>
+        <Texture Name="gameplay_dangeon_keep_012CA0_Tex" Format="rgba16" Width="64" Height="16" Offset="0x12CA0"/>
+        <Texture Name="gameplay_dangeon_keep_0134A0_Tex" Format="rgba16" Width="32" Height="32" Offset="0x134A0"/>
+        <Texture Name="gameplay_dangeon_keep_013CA0_Tex" Format="ia8" Width="4" Height="4" Offset="0x13CA0"/>
+        <Texture Name="gameplay_dangeon_keep_013CB0_Tex" Format="i4" Width="64" Height="64" Offset="0x13CB0"/>
         <Texture Name="gCrstalSwitchRedTex" OutName="crystal_red" Format="rgba16" Width="32" Height="32" Offset="0x144B0"/>
         <Texture Name="gCrstalSwitchBlueTex" OutName="crystal_blue" Format="rgba16" Width="32" Height="32" Offset="0x14CB0"/>
+        <Texture Name="gameplay_dangeon_keep_0154B0_Tex" Format="rgba16" Width="32" Height="32" Offset="0x154B0"/>
+        <Texture Name="gameplay_dangeon_keep_015CB0_Tex" Format="rgba16" Width="32" Height="32" Offset="0x15CB0"/>
+        <Texture Name="gameplay_dangeon_keep_0164B0_Tex" Format="rgba16" Width="32" Height="32" Offset="0x164B0"/>
+        <Texture Name="gameplay_dangeon_keep_016CB0_Tex" Format="rgba16" Width="32" Height="32" Offset="0x16CB0"/>
         <Array Name="gPotVtx" Count="60" Offset="0x174B0">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/gameplay_keep.xml b/assets/xml/objects/gameplay_keep.xml
index 0c90a35d5c..d41a28b8d9 100644
--- a/assets/xml/objects/gameplay_keep.xml
+++ b/assets/xml/objects/gameplay_keep.xml
@@ -640,6 +640,10 @@
             <Vtx/>
         </Array>
         <DList Name="gArrowFarDL" Offset="0x5E20"/>
+        <Limb Name="gameplay_keep_005FC0_Limb" LimbType="LOD" EnumName="LIMB_GAMEPLAY_KEEP_005FC0" Offset="0x5FC0"/>
+        <Limb Name="gameplay_keep_005FD0_Limb" LimbType="LOD" EnumName="LIMB_GAMEPLAY_KEEP_005FD0" Offset="0x5FD0"/>
+        <Limb Name="gameplay_keep_005FE0_Limb" LimbType="LOD" EnumName="LIMB_GAMEPLAY_KEEP_005FE0" Offset="0x5FE0"/>
+        <Limb Name="gameplay_keep_005FF0_Limb" LimbType="LOD" EnumName="LIMB_GAMEPLAY_KEEP_005FF0" Offset="0x5FF0"/>
         <Skeleton Name="gArrowSkel" Type="Normal" LimbType="LOD" Offset="0x6010"/> <!-- fix pointer for this! -->
         <Texture Name="gUnknownEffBlureTex" OutName="unknown_eff_blure" Format="i8" Width="64" Height="32" Offset="0x6020"/>
         <Texture Name="gBombBodyTex" OutName="bomb_body" Format="ia8" Width="64" Height="64" Offset="0x6820"/>
@@ -733,6 +737,10 @@
         <DList Name="gDoorLeftDL" Offset="0xF158"/>
         <DList Name="gDoorRightDL" Offset="0xF2A0"/>
         <Texture Name="gWoodenDoorTex" OutName="wooden_door" Format="rgba16" Width="32" Height="64" Offset="0xF3D8"/>
+        <Limb Name="gameplay_keep_0103D8_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_0103D8" Offset="0x103D8"/>
+        <Limb Name="gameplay_keep_0103E4_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_0103E4" Offset="0x103E4"/>
+        <Limb Name="gameplay_keep_0103F0_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_0103F0" Offset="0x103F0"/>
+        <Limb Name="gameplay_keep_0103FC_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_0103FC" Offset="0x103FC"/>
         <Skeleton Name="gDoorSkel" Type="Normal" LimbType="Standard" Offset="0x10418"/>
         <Animation Name="gDoorAdultOpeningRightAnim" Offset="0x104D8"/>
         <DList Name="gEffDustDL" Offset="0x104F0"/>
@@ -803,6 +811,20 @@
             <Vtx/>
         </Array>
         <Texture Name="gUnusedFairyWingTex" OutName="unused_fairy_wing" Format="rgba16" Width="32" Height="64" Offset="0x15E08"/>
+        <Limb Name="gameplay_keep_016E08_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_016E08" Offset="0x16E08"/>
+        <Limb Name="gameplay_keep_016E14_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_016E14" Offset="0x16E14"/>
+        <Limb Name="gameplay_keep_016E20_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_016E20" Offset="0x16E20"/>
+        <Limb Name="gameplay_keep_016E2C_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_016E2C" Offset="0x16E2C"/>
+        <Limb Name="gameplay_keep_016E38_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_016E38" Offset="0x16E38"/>
+        <Limb Name="gameplay_keep_016E44_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_016E44" Offset="0x16E44"/>
+        <Limb Name="gameplay_keep_016E50_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_016E50" Offset="0x16E50"/>
+        <Limb Name="gameplay_keep_016E5C_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_016E5C" Offset="0x16E5C"/>
+        <Limb Name="gameplay_keep_016E68_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_016E68" Offset="0x16E68"/>
+        <Limb Name="gameplay_keep_016E74_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_016E74" Offset="0x16E74"/>
+        <Limb Name="gameplay_keep_016E80_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_016E80" Offset="0x16E80"/>
+        <Limb Name="gameplay_keep_016E8C_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_016E8C" Offset="0x16E8C"/>
+        <Limb Name="gameplay_keep_016E98_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_016E98" Offset="0x16E98"/>
+        <Limb Name="gameplay_keep_016EA4_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_016EA4" Offset="0x16EA4"/>
         <Skeleton Name="gFairySkel" Type="Normal" LimbType="Standard" Offset="0x16EE8"/>
         <Texture Name="gUnknownCircle3Tex" OutName="unknown_circle_3" Format="i4" Width="16" Height="16" Offset="0x16EF0"/>
         <Texture Name="gUnknownCircle4Tex" OutName="unknown_circle_4" Format="i8" Width="16" Height="16" Offset="0x16F70"/>
@@ -823,8 +845,17 @@
         <Array Name="gameplay_keep_Vtx_018BF0" Count="22" Offset="0x18BF0">
             <Vtx/>
         </Array>
+        <DList Name="gameplay_keep_018D50_DL" Offset="0x18D50"/>
+        <DList Name="gameplay_keep_018DF0_DL" Offset="0x18DF0"/>
+        <DList Name="gameplay_keep_018F08_DL" Offset="0x18F08"/>
         <Texture Name="gFishTailTex" OutName="fish_tail" Format="rgba16" Width="16" Height="16" Offset="0x19020"/>
         <Texture Name="gFishBodyTex" OutName="fish_body" Format="rgba16" Width="32" Height="8" Offset="0x19220"/>
+        <Limb Name="gameplay_keep_019420_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_019420" Offset="0x19420"/>
+        <Limb Name="gameplay_keep_01942C_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_01942C" Offset="0x1942C"/>
+        <Limb Name="gameplay_keep_019438_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_019438" Offset="0x19438"/>
+        <Limb Name="gameplay_keep_019444_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_019444" Offset="0x19444"/>
+        <Limb Name="gameplay_keep_019450_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_019450" Offset="0x19450"/>
+        <Limb Name="gameplay_keep_01945C_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_01945C" Offset="0x1945C"/>
         <Skeleton Name="gFishSkel" Type="Flex" LimbType="Standard" Offset="0x19480"/>
         <Animation Name="gFishInWaterAnim" Offset="0x1953C"/>
         <Texture Name="gEffShockwaveTex" OutName="eff_shockwave" Format="i8" Width="64" Height="64" Offset="0x19550"/>
@@ -1035,6 +1066,29 @@
         </Array>
         <Texture Name="gBugBodyTex" OutName="bug_body" Format="rgba16" Width="16" Height="64" Offset="0x34FC0"/>
         <Texture Name="gBugLegTex" OutName="bug_leg" Format="rgba16" Width="8" Height="16" Offset="0x357C0"/>
+        <Limb Name="gameplay_keep_0358C0_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_0358C0" Offset="0x358C0"/>
+        <Limb Name="gameplay_keep_0358CC_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_0358CC" Offset="0x358CC"/>
+        <Limb Name="gameplay_keep_0358D8_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_0358D8" Offset="0x358D8"/>
+        <Limb Name="gameplay_keep_0358E4_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_0358E4" Offset="0x358E4"/>
+        <Limb Name="gameplay_keep_0358F0_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_0358F0" Offset="0x358F0"/>
+        <Limb Name="gameplay_keep_0358FC_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_0358FC" Offset="0x358FC"/>
+        <Limb Name="gameplay_keep_035908_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_035908" Offset="0x35908"/>
+        <Limb Name="gameplay_keep_035914_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_035914" Offset="0x35914"/>
+        <Limb Name="gameplay_keep_035920_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_035920" Offset="0x35920"/>
+        <Limb Name="gameplay_keep_03592C_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_03592C" Offset="0x3592C"/>
+        <Limb Name="gameplay_keep_035938_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_035938" Offset="0x35938"/>
+        <Limb Name="gameplay_keep_035944_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_035944" Offset="0x35944"/>
+        <Limb Name="gameplay_keep_035950_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_035950" Offset="0x35950"/>
+        <Limb Name="gameplay_keep_03595C_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_03595C" Offset="0x3595C"/>
+        <Limb Name="gameplay_keep_035968_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_035968" Offset="0x35968"/>
+        <Limb Name="gameplay_keep_035974_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_035974" Offset="0x35974"/>
+        <Limb Name="gameplay_keep_035980_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_035980" Offset="0x35980"/>
+        <Limb Name="gameplay_keep_03598C_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_03598C" Offset="0x3598C"/>
+        <Limb Name="gameplay_keep_035998_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_035998" Offset="0x35998"/>
+        <Limb Name="gameplay_keep_0359A4_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_0359A4" Offset="0x359A4"/>
+        <Limb Name="gameplay_keep_0359B0_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_0359B0" Offset="0x359B0"/>
+        <Limb Name="gameplay_keep_0359BC_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_0359BC" Offset="0x359BC"/>
+        <Limb Name="gameplay_keep_0359C8_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_0359C8" Offset="0x359C8"/>
         <Skeleton Name="gBugSkel" Type="Normal" LimbType="Standard" Offset="0x35A30"/>
         <Array Name="gCuttableShrubStalkVtx" Count="4" Offset="0x35A40">
             <Vtx/>
diff --git a/assets/xml/objects/gameplay_keep_pal.xml b/assets/xml/objects/gameplay_keep_pal.xml
index f290314d5c..2c5f147386 100644
--- a/assets/xml/objects/gameplay_keep_pal.xml
+++ b/assets/xml/objects/gameplay_keep_pal.xml
@@ -640,6 +640,10 @@
             <Vtx/>
         </Array>
         <DList Name="gArrowFarDL" Offset="0x5E20"/>
+        <Limb Name="gameplay_keep_005FC0_Limb" LimbType="LOD" EnumName="LIMB_GAMEPLAY_KEEP_005FC0" Offset="0x5FC0"/>
+        <Limb Name="gameplay_keep_005FD0_Limb" LimbType="LOD" EnumName="LIMB_GAMEPLAY_KEEP_005FD0" Offset="0x5FD0"/>
+        <Limb Name="gameplay_keep_005FE0_Limb" LimbType="LOD" EnumName="LIMB_GAMEPLAY_KEEP_005FE0" Offset="0x5FE0"/>
+        <Limb Name="gameplay_keep_005FF0_Limb" LimbType="LOD" EnumName="LIMB_GAMEPLAY_KEEP_005FF0" Offset="0x5FF0"/>
         <Skeleton Name="gArrowSkel" Type="Normal" LimbType="LOD" Offset="0x6010"/> <!-- fix pointer for this! -->
         <Texture Name="gUnknownEffBlureTex" OutName="unknown_eff_blure" Format="i8" Width="64" Height="32" Offset="0x6020"/>
         <Texture Name="gBombBodyTex" OutName="bomb_body" Format="ia8" Width="64" Height="64" Offset="0x6820"/>
@@ -724,6 +728,10 @@
         <DList Name="gDoorLeftDL" Offset="0xECB8"/>
         <DList Name="gDoorRightDL" Offset="0xEE00"/>
         <Texture Name="gWoodenDoorTex" OutName="wooden_door" Format="rgba16" Width="32" Height="64" Offset="0xEF38"/>
+        <Limb Name="gameplay_keep_00FF38_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_00FF38" Offset="0xFF38"/>
+        <Limb Name="gameplay_keep_00FF44_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_00FF44" Offset="0xFF44"/>
+        <Limb Name="gameplay_keep_00FF50_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_00FF50" Offset="0xFF50"/>
+        <Limb Name="gameplay_keep_00FF5C_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_00FF5C" Offset="0xFF5C"/>
         <Skeleton Name="gDoorSkel" Type="Normal" LimbType="Standard" Offset="0xFF78"/>
         <Animation Name="gDoorAdultOpeningRightAnim" Offset="0x10038"/>
         <DList Name="gEffDustDL" Offset="0x10050"/>
@@ -794,6 +802,20 @@
             <Vtx/>
         </Array>
         <Texture Name="gUnusedFairyWingTex" OutName="unused_fairy_wing" Format="rgba16" Width="32" Height="64" Offset="0x15968"/>
+        <Limb Name="gameplay_keep_016968_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_016968" Offset="0x16968"/>
+        <Limb Name="gameplay_keep_016974_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_016974" Offset="0x16974"/>
+        <Limb Name="gameplay_keep_016980_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_016980" Offset="0x16980"/>
+        <Limb Name="gameplay_keep_01698C_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_01698C" Offset="0x1698C"/>
+        <Limb Name="gameplay_keep_016998_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_016998" Offset="0x16998"/>
+        <Limb Name="gameplay_keep_0169A4_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_0169A4" Offset="0x169A4"/>
+        <Limb Name="gameplay_keep_0169B0_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_0169B0" Offset="0x169B0"/>
+        <Limb Name="gameplay_keep_0169BC_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_0169BC" Offset="0x169BC"/>
+        <Limb Name="gameplay_keep_0169C8_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_0169C8" Offset="0x169C8"/>
+        <Limb Name="gameplay_keep_0169D4_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_0169D4" Offset="0x169D4"/>
+        <Limb Name="gameplay_keep_0169E0_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_0169E0" Offset="0x169E0"/>
+        <Limb Name="gameplay_keep_0169EC_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_0169EC" Offset="0x169EC"/>
+        <Limb Name="gameplay_keep_0169F8_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_0169F8" Offset="0x169F8"/>
+        <Limb Name="gameplay_keep_016A04_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_016A04" Offset="0x16A04"/>
         <Skeleton Name="gFairySkel" Type="Normal" LimbType="Standard" Offset="0x16A48"/>
         <Texture Name="gUnknownCircle3Tex" OutName="unknown_circle_3" Format="i4" Width="16" Height="16" Offset="0x16A50"/>
         <Texture Name="gUnknownCircle4Tex" OutName="unknown_circle_4" Format="i8" Width="16" Height="16" Offset="0x16AD0"/>
@@ -814,8 +836,17 @@
         <Array Name="gameplay_keep_Vtx_018750" Count="22" Offset="0x18750">
             <Vtx/>
         </Array>
+        <DList Name="gameplay_keep_0188B0_DL" Offset="0x188B0"/>
+        <DList Name="gameplay_keep_018950_DL" Offset="0x18950"/>
+        <DList Name="gameplay_keep_018A68_DL" Offset="0x18A68"/>
         <Texture Name="gFishTailTex" OutName="fish_tail" Format="rgba16" Width="16" Height="16" Offset="0x18B80"/>
         <Texture Name="gFishBodyTex" OutName="fish_body" Format="rgba16" Width="32" Height="8" Offset="0x18D80"/>
+        <Limb Name="gameplay_keep_018F80_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_018F80" Offset="0x18F80"/>
+        <Limb Name="gameplay_keep_018F8C_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_018F8C" Offset="0x18F8C"/>
+        <Limb Name="gameplay_keep_018F98_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_018F98" Offset="0x18F98"/>
+        <Limb Name="gameplay_keep_018FA4_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_018FA4" Offset="0x18FA4"/>
+        <Limb Name="gameplay_keep_018FB0_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_018FB0" Offset="0x18FB0"/>
+        <Limb Name="gameplay_keep_018FBC_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_018FBC" Offset="0x18FBC"/>
         <Skeleton Name="gFishSkel" Type="Flex" LimbType="Standard" Offset="0x18FE0"/>
         <Animation Name="gFishInWaterAnim" Offset="0x1909C"/>
         <Texture Name="gEffShockwaveTex" OutName="eff_shockwave" Format="i8" Width="64" Height="64" Offset="0x190B0"/>
@@ -1026,6 +1057,29 @@
         </Array>
         <Texture Name="gBugBodyTex" OutName="bug_body" Format="rgba16" Width="16" Height="64" Offset="0x34B20"/>
         <Texture Name="gBugLegTex" OutName="bug_leg" Format="rgba16" Width="8" Height="16" Offset="0x35320"/>
+        <Limb Name="gameplay_keep_035420_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_035420" Offset="0x35420"/>
+        <Limb Name="gameplay_keep_03542C_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_03542C" Offset="0x3542C"/>
+        <Limb Name="gameplay_keep_035438_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_035438" Offset="0x35438"/>
+        <Limb Name="gameplay_keep_035444_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_035444" Offset="0x35444"/>
+        <Limb Name="gameplay_keep_035450_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_035450" Offset="0x35450"/>
+        <Limb Name="gameplay_keep_03545C_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_03545C" Offset="0x3545C"/>
+        <Limb Name="gameplay_keep_035468_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_035468" Offset="0x35468"/>
+        <Limb Name="gameplay_keep_035474_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_035474" Offset="0x35474"/>
+        <Limb Name="gameplay_keep_035480_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_035480" Offset="0x35480"/>
+        <Limb Name="gameplay_keep_03548C_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_03548C" Offset="0x3548C"/>
+        <Limb Name="gameplay_keep_035498_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_035498" Offset="0x35498"/>
+        <Limb Name="gameplay_keep_0354A4_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_0354A4" Offset="0x354A4"/>
+        <Limb Name="gameplay_keep_0354B0_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_0354B0" Offset="0x354B0"/>
+        <Limb Name="gameplay_keep_0354BC_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_0354BC" Offset="0x354BC"/>
+        <Limb Name="gameplay_keep_0354C8_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_0354C8" Offset="0x354C8"/>
+        <Limb Name="gameplay_keep_0354D4_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_0354D4" Offset="0x354D4"/>
+        <Limb Name="gameplay_keep_0354E0_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_0354E0" Offset="0x354E0"/>
+        <Limb Name="gameplay_keep_0354EC_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_0354EC" Offset="0x354EC"/>
+        <Limb Name="gameplay_keep_0354F8_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_0354F8" Offset="0x354F8"/>
+        <Limb Name="gameplay_keep_035504_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_035504" Offset="0x35504"/>
+        <Limb Name="gameplay_keep_035510_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_035510" Offset="0x35510"/>
+        <Limb Name="gameplay_keep_03551C_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_03551C" Offset="0x3551C"/>
+        <Limb Name="gameplay_keep_035528_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_KEEP_035528" Offset="0x35528"/>
         <Skeleton Name="gBugSkel" Type="Normal" LimbType="Standard" Offset="0x35590"/>
         <Array Name="gCuttableShrubStalkVtx" Count="4" Offset="0x355A0">
             <Vtx/>
diff --git a/assets/xml/objects/object_door_killer.xml b/assets/xml/objects/object_door_killer.xml
index 7f8d8f186c..8ef83cd9fa 100644
--- a/assets/xml/objects/object_door_killer.xml
+++ b/assets/xml/objects/object_door_killer.xml
@@ -48,6 +48,14 @@
             <Vtx/>
         </Array>
         <DList Name="object_door_killer_DL_001A58" Offset="0x1A58"/>
+        <Limb Name="object_door_killer_001B28_Limb" LimbType="LOD" EnumName="LIMB_OBJECT_DOOR_KILLER_001B28" Offset="0x1B28"/>
+        <Limb Name="object_door_killer_001B38_Limb" LimbType="LOD" EnumName="LIMB_OBJECT_DOOR_KILLER_001B38" Offset="0x1B38"/>
+        <Limb Name="object_door_killer_001B48_Limb" LimbType="LOD" EnumName="LIMB_OBJECT_DOOR_KILLER_001B48" Offset="0x1B48"/>
+        <Limb Name="object_door_killer_001B58_Limb" LimbType="LOD" EnumName="LIMB_OBJECT_DOOR_KILLER_001B58" Offset="0x1B58"/>
+        <Limb Name="object_door_killer_001B68_Limb" LimbType="LOD" EnumName="LIMB_OBJECT_DOOR_KILLER_001B68" Offset="0x1B68"/>
+        <Limb Name="object_door_killer_001B78_Limb" LimbType="LOD" EnumName="LIMB_OBJECT_DOOR_KILLER_001B78" Offset="0x1B78"/>
+        <Limb Name="object_door_killer_001B88_Limb" LimbType="LOD" EnumName="LIMB_OBJECT_DOOR_KILLER_001B88" Offset="0x1B88"/>
+        <Limb Name="object_door_killer_001B98_Limb" LimbType="LOD" EnumName="LIMB_OBJECT_DOOR_KILLER_001B98" Offset="0x1B98"/>
         <Skeleton Name="object_door_killer_Skel_001BC8" Type="Flex" LimbType="LOD" Offset="0x1BC8"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_gi_boots_2.xml b/assets/xml/objects/object_gi_boots_2.xml
index 026e9a482a..ae5d148421 100644
--- a/assets/xml/objects/object_gi_boots_2.xml
+++ b/assets/xml/objects/object_gi_boots_2.xml
@@ -1,6 +1,7 @@
 <Root>
     <ExternalFile OutPath="assets/objects/gameplay_keep"/>
     <File Name="object_gi_boots_2" Segment="6">
+        <Texture Name="object_gi_boots_2_000000_Tex" Format="ia8" Width="16" Height="16" Offset="0x0"/>
         <Array Name="gGiIronBootsVtx" Count="287" Offset="0x100">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gi_butterfly.xml b/assets/xml/objects/object_gi_butterfly.xml
index 23487544e4..65eed5b0e8 100644
--- a/assets/xml/objects/object_gi_butterfly.xml
+++ b/assets/xml/objects/object_gi_butterfly.xml
@@ -1,6 +1,7 @@
 <Root>
     <ExternalFile OutPath="assets/objects/gameplay_keep"/>
     <File Name="object_gi_butterfly" Segment="6">
+        <Texture Name="object_gi_butterfly_000000_Tex" Format="ia4" Width="24" Height="48" Offset="0x0"/>
         <Array Name="gGiButterflyContainerVtx" Count="65" Offset="0x240">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gi_clothes.xml b/assets/xml/objects/object_gi_clothes.xml
index 32550cfc8d..be9853eb8f 100644
--- a/assets/xml/objects/object_gi_clothes.xml
+++ b/assets/xml/objects/object_gi_clothes.xml
@@ -1,5 +1,6 @@
 <Root>
     <File Name="object_gi_clothes" Segment="6">
+        <Texture Name="object_gi_clothes_000000_Tex" Format="i4" Width="64" Height="64" Offset="0x0"/>
         <Array Name="gGiTunicCollarVtx" Count="16" Offset="0x800">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gi_dekupouch.xml b/assets/xml/objects/object_gi_dekupouch.xml
index f51d885c01..d717edb8ba 100644
--- a/assets/xml/objects/object_gi_dekupouch.xml
+++ b/assets/xml/objects/object_gi_dekupouch.xml
@@ -1,6 +1,8 @@
 <Root>
     <ExternalFile OutPath="assets/objects/gameplay_keep"/>
     <File Name="object_gi_dekupouch" Segment="6">
+        <Texture Name="object_gi_dekupouch_000000_Tex" Format="i4" Width="32" Height="16" Offset="0x0"/>
+        <Texture Name="object_gi_dekupouch_000100_Tex" Format="i4" Width="32" Height="32" Offset="0x100"/>
         <Array Name="gGiBulletBagVtx" Count="111" Offset="0x300">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gi_fire.xml b/assets/xml/objects/object_gi_fire.xml
index ddeafaaf48..0211f60187 100644
--- a/assets/xml/objects/object_gi_fire.xml
+++ b/assets/xml/objects/object_gi_fire.xml
@@ -1,6 +1,8 @@
 <Root>
     <ExternalFile OutPath="assets/objects/gameplay_keep"/>
     <File Name="object_gi_fire" Segment="6">
+        <Texture Name="object_gi_fire_000000_Tex" Format="i8" Width="16" Height="32" Offset="0x0"/>
+        <Texture Name="object_gi_fire_000200_Tex" Format="i8" Width="16" Height="32" Offset="0x200"/>
         <Array Name="gGiBlueFireChamberstickVtx" Count="130" Offset="0x400">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gi_frog.xml b/assets/xml/objects/object_gi_frog.xml
index 503f08c416..53384429b4 100644
--- a/assets/xml/objects/object_gi_frog.xml
+++ b/assets/xml/objects/object_gi_frog.xml
@@ -1,6 +1,7 @@
 <Root>
     <ExternalFile OutPath="assets/objects/gameplay_keep"/>
     <File Name="object_gi_frog" Segment="6">
+        <Texture Name="object_gi_frog_000000_Tex" Format="i8" Width="32" Height="32" Offset="0x0"/>
         <Array Name="gGiFrogVtx" Count="139" Offset="0x400">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gi_gerudo.xml b/assets/xml/objects/object_gi_gerudo.xml
index ac80cdd2f7..34986a295e 100644
--- a/assets/xml/objects/object_gi_gerudo.xml
+++ b/assets/xml/objects/object_gi_gerudo.xml
@@ -1,6 +1,7 @@
 <Root>
     <ExternalFile OutPath="assets/objects/gameplay_keep"/>
     <File Name="object_gi_gerudo" Segment="6">
+        <Texture Name="object_gi_gerudo_000000_Tex" Format="i8" Width="32" Height="32" Offset="0x0"/>
         <Array Name="gGiGerudoCardVtx" Count="182" Offset="0x400">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gi_gerudomask.xml b/assets/xml/objects/object_gi_gerudomask.xml
index 3b42e2ee29..94576b0406 100644
--- a/assets/xml/objects/object_gi_gerudomask.xml
+++ b/assets/xml/objects/object_gi_gerudomask.xml
@@ -1,5 +1,11 @@
 <Root>
     <File Name="object_gi_gerudomask" Segment="6">
+        <Texture Name="object_gi_gerudomask_000000_Tex" Format="rgba16" Width="256" Height="1" Offset="0x0"/>
+        <Blob Name="object_gi_gerudomask_000200_Blob" Size="0x8" Offset="0x200"/>
+        <Texture Name="object_gi_gerudomask_000208_Tex" Format="ci8" Width="8" Height="8" Offset="0x208" TlutOffset="0x0"/>
+        <Texture Name="object_gi_gerudomask_000248_Tex" Format="ci8" Width="16" Height="16" Offset="0x248" TlutOffset="0x0"/>
+        <Texture Name="object_gi_gerudomask_000348_Tex" Format="ci8" Width="16" Height="16" Offset="0x348" TlutOffset="0x0"/>
+        <Texture Name="object_gi_gerudomask_000448_Tex" Format="ci8" Width="32" Height="32" Offset="0x448" TlutOffset="0x0"/>
         <Array Name="gGiGerudoMaskVtx" Count="138" Offset="0x848">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gi_ghost.xml b/assets/xml/objects/object_gi_ghost.xml
index 30a0edf1eb..5dbf39480f 100644
--- a/assets/xml/objects/object_gi_ghost.xml
+++ b/assets/xml/objects/object_gi_ghost.xml
@@ -1,6 +1,8 @@
 <Root>
     <ExternalFile OutPath="assets/objects/gameplay_keep"/>
     <File Name="object_gi_ghost" Segment="6">
+        <Texture Name="object_gi_ghost_000000_Tex" Format="i8" Width="16" Height="32" Offset="0x0"/>
+        <Texture Name="object_gi_ghost_000200_Tex" Format="i8" Width="16" Height="32" Offset="0x200"/>
         <Array Name="gGiGhostContainerLidVtx" Count="56" Offset="0x400">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gi_gloves.xml b/assets/xml/objects/object_gi_gloves.xml
index 09976d11ef..85ad6ddeff 100644
--- a/assets/xml/objects/object_gi_gloves.xml
+++ b/assets/xml/objects/object_gi_gloves.xml
@@ -1,6 +1,7 @@
 <Root>
     <ExternalFile OutPath="assets/objects/gameplay_keep"/>
     <File Name="object_gi_gloves" Segment="6">
+        <Texture Name="object_gi_gloves_000000_Tex" Format="i8" Width="64" Height="32" Offset="0x0"/>
         <Array Name="gGiGauntletsVtx" Count="152" Offset="0x800">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gi_golonmask.xml b/assets/xml/objects/object_gi_golonmask.xml
index ac8d86669c..68dbddb365 100644
--- a/assets/xml/objects/object_gi_golonmask.xml
+++ b/assets/xml/objects/object_gi_golonmask.xml
@@ -1,5 +1,11 @@
 <Root>
     <File Name="object_gi_golonmask" Segment="6">
+        <Texture Name="object_gi_golonmask_000000_Tex" Format="rgba16" Width="256" Height="1" Offset="0x0"/>
+        <Blob Name="object_gi_golonmask_000200_Blob" Size="0x8" Offset="0x200"/>
+        <Texture Name="object_gi_golonmask_000208_Tex" Format="ci8" Width="8" Height="8" Offset="0x208" TlutOffset="0x0"/>
+        <Texture Name="object_gi_golonmask_000248_Tex" Format="ci8" Width="16" Height="16" Offset="0x248" TlutOffset="0x0"/>
+        <Texture Name="object_gi_golonmask_000348_Tex" Format="ci8" Width="32" Height="32" Offset="0x348" TlutOffset="0x0"/>
+        <Texture Name="object_gi_golonmask_000748_Tex" Format="ci8" Width="64" Height="32" Offset="0x748" TlutOffset="0x0"/>
         <Array Name="gGiGoronMaskVtx" Count="91" Offset="0xF48">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gi_hoverboots.xml b/assets/xml/objects/object_gi_hoverboots.xml
index 5b3bf0c80f..fed584e742 100644
--- a/assets/xml/objects/object_gi_hoverboots.xml
+++ b/assets/xml/objects/object_gi_hoverboots.xml
@@ -1,6 +1,8 @@
 <Root>
     <ExternalFile OutPath="assets/objects/gameplay_keep"/>
     <File Name="object_gi_hoverboots" Segment="6">
+        <Texture Name="object_gi_hoverboots_000000_Tex" Format="ia4" Width="48" Height="32" Offset="0x0"/>
+        <Texture Name="object_gi_hoverboots_000300_Tex" Format="i4" Width="16" Height="32" Offset="0x300"/>
         <Array Name="gGiHoverBootsVtx" Count="325" Offset="0x400">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gi_ki_tan_mask.xml b/assets/xml/objects/object_gi_ki_tan_mask.xml
index ad6763bb9c..b888acfe73 100644
--- a/assets/xml/objects/object_gi_ki_tan_mask.xml
+++ b/assets/xml/objects/object_gi_ki_tan_mask.xml
@@ -1,6 +1,7 @@
 <Root>
     <ExternalFile OutPath="assets/objects/gameplay_keep"/>
     <File Name="object_gi_ki_tan_mask" Segment="6">
+        <Texture Name="object_gi_ki_tan_mask_000000_Tex" Format="ia8" Width="8" Height="32" Offset="0x0"/>
         <Array Name="gGiKeatonMaskVtx" Count="148" Offset="0x100">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gi_letter.xml b/assets/xml/objects/object_gi_letter.xml
index d6acdf820d..098b8cca79 100644
--- a/assets/xml/objects/object_gi_letter.xml
+++ b/assets/xml/objects/object_gi_letter.xml
@@ -1,5 +1,7 @@
 <Root>
     <File Name="object_gi_letter" Segment="6">
+        <Texture Name="object_gi_letter_000000_Tex" Format="i8" Width="48" Height="32" Offset="0x0"/>
+        <Texture Name="object_gi_letter_000600_Tex" Format="ia8" Width="48" Height="32" Offset="0x600"/>
         <Array Name="gGiLetterVtx" Count="8" Offset="0xC00">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gi_liquid.xml b/assets/xml/objects/object_gi_liquid.xml
index 27ef25b0b0..133d8ce902 100644
--- a/assets/xml/objects/object_gi_liquid.xml
+++ b/assets/xml/objects/object_gi_liquid.xml
@@ -1,6 +1,9 @@
 <Root>
     <ExternalFile OutPath="assets/objects/gameplay_keep"/>
     <File Name="object_gi_liquid" Segment="6">
+        <Texture Name="object_gi_liquid_000000_Tex" Format="ia8" Width="16" Height="32" Offset="0x0"/>
+        <Texture Name="object_gi_liquid_000200_Tex" Format="ia8" Width="16" Height="32" Offset="0x200"/>
+        <Texture Name="object_gi_liquid_000400_Tex" Format="ia8" Width="16" Height="32" Offset="0x400"/>
         <Array Name="gGiPotionPotVtx" Count="176" Offset="0x600">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gi_milk.xml b/assets/xml/objects/object_gi_milk.xml
index a1904f7f1d..cc72cec9d1 100644
--- a/assets/xml/objects/object_gi_milk.xml
+++ b/assets/xml/objects/object_gi_milk.xml
@@ -1,6 +1,7 @@
 <Root>
     <ExternalFile OutPath="assets/objects/gameplay_keep"/>
     <File Name="object_gi_milk" Segment="6">
+        <Texture Name="object_gi_milk_000000_Tex" Format="i8" Width="72" Height="24" Offset="0x0"/>
         <Array Name="gGiMilkBottleContentsVtx" Count="63" Offset="0x6C0">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gi_niwatori.xml b/assets/xml/objects/object_gi_niwatori.xml
index 9bea0dbbaf..edf67f88d8 100644
--- a/assets/xml/objects/object_gi_niwatori.xml
+++ b/assets/xml/objects/object_gi_niwatori.xml
@@ -1,6 +1,8 @@
 <Root>
     <ExternalFile OutPath="assets/objects/gameplay_keep"/>
     <File Name="object_gi_niwatori" Segment="6">
+        <Texture Name="object_gi_niwatori_000000_Tex" Format="i8" Width="32" Height="64" Offset="0x0"/>
+        <Texture Name="object_gi_niwatori_000800_Tex" Format="ia8" Width="32" Height="32" Offset="0x800"/>
         <Array Name="gGiChickenVtx" Count="153" Offset="0xC00">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gi_nuts.xml b/assets/xml/objects/object_gi_nuts.xml
index 590c78d7dd..d4a2f0e9cd 100644
--- a/assets/xml/objects/object_gi_nuts.xml
+++ b/assets/xml/objects/object_gi_nuts.xml
@@ -1,6 +1,7 @@
 <Root>
     <ExternalFile OutPath="assets/objects/gameplay_keep"/>
     <File Name="object_gi_nuts" Segment="6">
+        <Texture Name="object_gi_nuts_000000_Tex" Format="i8" Width="32" Height="32" Offset="0x0"/>
         <Array Name="gGiNutVtx" Count="169" Offset="0x400">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gi_ocarina.xml b/assets/xml/objects/object_gi_ocarina.xml
index 4e85cc04e1..dafcb92424 100644
--- a/assets/xml/objects/object_gi_ocarina.xml
+++ b/assets/xml/objects/object_gi_ocarina.xml
@@ -1,6 +1,7 @@
 <Root>
     <ExternalFile OutPath="assets/objects/gameplay_keep"/>
     <File Name="object_gi_ocarina" Segment="6">
+        <Texture Name="object_gi_ocarina_000000_Tex" Format="i8" Width="16" Height="16" Offset="0x0"/>
         <Array Name="gGiOcarinaTimeVtx" Count="100" Offset="0x100">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gi_ocarina_0.xml b/assets/xml/objects/object_gi_ocarina_0.xml
index 7ec13c466e..e43bb3a87c 100644
--- a/assets/xml/objects/object_gi_ocarina_0.xml
+++ b/assets/xml/objects/object_gi_ocarina_0.xml
@@ -1,6 +1,7 @@
 <Root>
     <ExternalFile OutPath="assets/objects/gameplay_keep"/>
     <File Name="object_gi_ocarina_0" Segment="6">
+        <Texture Name="object_gi_ocarina_0_000000_Tex" Format="i8" Width="16" Height="16" Offset="0x0"/>
         <Array Name="gGiOcarinaFairyVtx" Count="105" Offset="0x100">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gi_prescription.xml b/assets/xml/objects/object_gi_prescription.xml
index 619252fafb..1b4e54ec5d 100644
--- a/assets/xml/objects/object_gi_prescription.xml
+++ b/assets/xml/objects/object_gi_prescription.xml
@@ -1,6 +1,7 @@
 <Root>
     <ExternalFile OutPath="assets/objects/gameplay_keep"/>
     <File Name="object_gi_prescription" Segment="6">
+        <Texture Name="object_gi_prescription_000000_Tex" Format="ia8" Width="32" Height="48" Offset="0x0"/>
         <Array Name="gGiPrescriptionVtx" Count="30" Offset="0x600">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gi_purse.xml b/assets/xml/objects/object_gi_purse.xml
index c896b47de0..70ec500508 100644
--- a/assets/xml/objects/object_gi_purse.xml
+++ b/assets/xml/objects/object_gi_purse.xml
@@ -1,5 +1,6 @@
 <Root>
     <File Name="object_gi_purse" Segment="6">
+        <Texture Name="object_gi_purse_000000_Tex" Format="i8" Width="64" Height="64" Offset="0x0"/>
         <Array Name="gGiWalletVtx" Count="32" Offset="0x1000">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gi_rabit_mask.xml b/assets/xml/objects/object_gi_rabit_mask.xml
index 64e82b888c..65b6cdd4bc 100644
--- a/assets/xml/objects/object_gi_rabit_mask.xml
+++ b/assets/xml/objects/object_gi_rabit_mask.xml
@@ -1,6 +1,7 @@
 <Root>
     <ExternalFile OutPath="assets/objects/gameplay_keep"/>
     <File Name="object_gi_rabit_mask" Segment="6">
+        <Texture Name="object_gi_rabit_mask_000000_Tex" Format="ia8" Width="16" Height="16" Offset="0x0"/>
         <Array Name="gGiBunnyHoodVtx" Count="166" Offset="0x100">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gi_shield_1.xml b/assets/xml/objects/object_gi_shield_1.xml
index 5fa12c7cc2..c7a5c7cb42 100644
--- a/assets/xml/objects/object_gi_shield_1.xml
+++ b/assets/xml/objects/object_gi_shield_1.xml
@@ -1,6 +1,7 @@
 <Root>
     <ExternalFile OutPath="assets/objects/gameplay_keep"/>
     <File Name="object_gi_shield_1" Segment="6">
+        <Texture Name="object_gi_shield_1_000000_Tex" Format="i8" Width="32" Height="32" Offset="0x0"/>
         <Array Name="gGiDekuShieldVtx" Count="101" Offset="0x400">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gi_shield_3.xml b/assets/xml/objects/object_gi_shield_3.xml
index 2ff34c2f23..3550bd0d89 100644
--- a/assets/xml/objects/object_gi_shield_3.xml
+++ b/assets/xml/objects/object_gi_shield_3.xml
@@ -1,6 +1,8 @@
 <Root>
     <ExternalFile OutPath="assets/objects/gameplay_keep"/>
     <File Name="object_gi_shield_3" Segment="6">
+        <Texture Name="object_gi_shield_3_000000_Tex" Format="i4" Width="64" Height="32" Offset="0x0"/>
+        <Texture Name="object_gi_shield_3_000400_Tex" Format="i4" Width="64" Height="64" Offset="0x400"/>
         <Array Name="gGiMirrorShieldVtx" Count="49" Offset="0xC00">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gi_soldout.xml b/assets/xml/objects/object_gi_soldout.xml
index 517750ee9a..ba45784761 100644
--- a/assets/xml/objects/object_gi_soldout.xml
+++ b/assets/xml/objects/object_gi_soldout.xml
@@ -1,5 +1,6 @@
 <Root>
     <File Name="object_gi_soldout" Segment="6">
+        <Texture Name="object_gi_soldout_000000_Tex" Format="ia8" Width="32" Height="32" Offset="0x0"/>
         <Array Name="gGiSoldOutVtx" Count="4" Offset="0x400">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gi_soul.xml b/assets/xml/objects/object_gi_soul.xml
index 1487b57042..519226270d 100644
--- a/assets/xml/objects/object_gi_soul.xml
+++ b/assets/xml/objects/object_gi_soul.xml
@@ -1,6 +1,7 @@
 <Root>
     <ExternalFile OutPath="assets/objects/gameplay_keep"/>
     <File Name="object_gi_soul" Segment="6">
+        <Texture Name="object_gi_soul_000000_Tex" Format="i8" Width="32" Height="32" Offset="0x0"/>
         <Array Name="gGiFairyContainerBaseCapVtx" Count="69" Offset="0x400">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gi_ticketstone.xml b/assets/xml/objects/object_gi_ticketstone.xml
index cebc99a759..ce756e3abc 100644
--- a/assets/xml/objects/object_gi_ticketstone.xml
+++ b/assets/xml/objects/object_gi_ticketstone.xml
@@ -1,6 +1,8 @@
 <Root>
     <ExternalFile OutPath="assets/objects/gameplay_keep"/>
     <File Name="object_gi_ticketstone" Segment="6">
+        <Texture Name="object_gi_ticketstone_000000_Tex" Format="i4" Width="48" Height="24" Offset="0x0"/>
+        <Texture Name="object_gi_ticketstone_000240_Tex" Format="i8" Width="32" Height="24" Offset="0x240"/>
         <Array Name="gGiClaimCheckVtx" Count="138" Offset="0x540">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gi_truth_mask.xml b/assets/xml/objects/object_gi_truth_mask.xml
index fbeab76d3e..32c550560c 100644
--- a/assets/xml/objects/object_gi_truth_mask.xml
+++ b/assets/xml/objects/object_gi_truth_mask.xml
@@ -1,6 +1,8 @@
 <Root>
     <ExternalFile OutPath="assets/objects/gameplay_keep"/>
     <File Name="object_gi_truth_mask" Segment="6">
+        <Texture Name="object_gi_truth_mask_000000_Tex" Format="i8" Width="32" Height="32" Offset="0x0"/>
+        <Texture Name="object_gi_truth_mask_000400_Tex" Format="i8" Width="32" Height="32" Offset="0x400"/>
         <Array Name="gGiMaskOfTruthVtx" Count="158" Offset="0x800">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gi_zoramask.xml b/assets/xml/objects/object_gi_zoramask.xml
index 06bca27371..0788f67f0d 100644
--- a/assets/xml/objects/object_gi_zoramask.xml
+++ b/assets/xml/objects/object_gi_zoramask.xml
@@ -1,5 +1,11 @@
 <Root>
     <File Name="object_gi_zoramask" Segment="6">
+        <Texture Name="object_gi_zoramask_000000_Tex" Format="rgba16" Width="256" Height="1" Offset="0x0"/>
+        <Blob Name="object_gi_zoramask_000200_Blob" Size="0x8" Offset="0x200"/>
+        <Texture Name="object_gi_zoramask_000208_Tex" Format="ci8" Width="8" Height="8" Offset="0x208" TlutOffset="0x0"/>
+        <Texture Name="object_gi_zoramask_000248_Tex" Format="ci8" Width="32" Height="32" Offset="0x248" TlutOffset="0x0"/>
+        <Texture Name="object_gi_zoramask_000648_Tex" Format="ci8" Width="32" Height="32" Offset="0x648" TlutOffset="0x0"/>
+        <Texture Name="object_gi_zoramask_000A48_Tex" Format="ci8" Width="32" Height="32" Offset="0xA48" TlutOffset="0x0"/>
         <Array Name="gGiZoraMaskVtx" Count="85" Offset="0xE48">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_kingdodongo.xml b/assets/xml/objects/object_kingdodongo.xml
index 3ada2822c9..ff8b2014dd 100644
--- a/assets/xml/objects/object_kingdodongo.xml
+++ b/assets/xml/objects/object_kingdodongo.xml
@@ -10,6 +10,9 @@
         <Animation Name="object_kingdodongo_Anim_006924" Offset="0x6924"/>
         <Animation Name="object_kingdodongo_Anim_008EEC" Offset="0x8EEC"/>
         <Animation Name="object_kingdodongo_Anim_009D10" Offset="0x9D10"/>
+        <Array Name="object_kingdodongo_009D20_Vtx" Count="3" Offset="0x9D20">
+            <Vtx/>
+        </Array>
         <DList Name="object_kingdodongo_DL_009D50" Offset="0x9D50"/>
         <DList Name="object_kingdodongo_DL_009DD0" Offset="0x9DD0"/>
         <Texture Name="object_kingdodongo_Tex_009DE8" OutName="tex_00009DE8" Format="i8" Width="16" Height="16" Offset="0x9DE8"/>
@@ -17,25 +20,85 @@
         <Animation Name="object_kingdodongo_Anim_00DF38" Offset="0xDF38"/>
         <Animation Name="object_kingdodongo_Anim_00E848" Offset="0xE848"/>
         <Animation Name="object_kingdodongo_Anim_00F0D8" Offset="0xF0D8"/>
+        <Array Name="object_kingdodongo_00F0F0_Vtx" Count="34" Offset="0xF0F0">
+            <Vtx/>
+        </Array>
         <DList Name="object_kingdodongo_DL_00F310" Offset="0xF310"/>
+        <Array Name="object_kingdodongo_00F470_Vtx" Count="37" Offset="0xF470">
+            <Vtx/>
+        </Array>
         <DList Name="object_kingdodongo_DL_00F6C0" Offset="0xF6C0"/>
+        <Array Name="object_kingdodongo_00F840_Vtx" Count="40" Offset="0xF840">
+            <Vtx/>
+        </Array>
         <DList Name="object_kingdodongo_DL_00FAC0" Offset="0xFAC0"/>
+        <Array Name="object_kingdodongo_00FBE8_Vtx" Count="56" Offset="0xFBE8">
+            <Vtx/>
+        </Array>
         <DList Name="object_kingdodongo_DL_00FF68" Offset="0xFF68"/>
+        <Array Name="object_kingdodongo_010120_Vtx" Count="39" Offset="0x10120">
+            <Vtx/>
+        </Array>
         <DList Name="object_kingdodongo_DL_010390" Offset="0x10390"/>
+        <Array Name="object_kingdodongo_010508_Vtx" Count="55" Offset="0x10508">
+            <Vtx/>
+        </Array>
         <DList Name="object_kingdodongo_DL_010878" Offset="0x10878"/>
+        <Array Name="object_kingdodongo_0109C0_Vtx" Count="34" Offset="0x109C0">
+            <Vtx/>
+        </Array>
         <DList Name="object_kingdodongo_DL_010BE0" Offset="0x10BE0"/>
+        <Array Name="object_kingdodongo_010D40_Vtx" Count="37" Offset="0x10D40">
+            <Vtx/>
+        </Array>
         <DList Name="object_kingdodongo_DL_010F90" Offset="0x10F90"/>
+        <Array Name="object_kingdodongo_011110_Vtx" Count="40" Offset="0x11110">
+            <Vtx/>
+        </Array>
         <DList Name="object_kingdodongo_DL_011390" Offset="0x11390"/>
+        <Array Name="object_kingdodongo_0114B8_Vtx" Count="56" Offset="0x114B8">
+            <Vtx/>
+        </Array>
         <DList Name="object_kingdodongo_DL_011838" Offset="0x11838"/>
+        <Array Name="object_kingdodongo_0119F0_Vtx" Count="39" Offset="0x119F0">
+            <Vtx/>
+        </Array>
         <DList Name="object_kingdodongo_DL_011C60" Offset="0x11C60"/>
+        <Array Name="object_kingdodongo_011DD8_Vtx" Count="55" Offset="0x11DD8">
+            <Vtx/>
+        </Array>
         <DList Name="object_kingdodongo_DL_012148" Offset="0x12148"/>
+        <Array Name="object_kingdodongo_012290_Vtx" Count="84" Offset="0x12290">
+            <Vtx/>
+        </Array>
         <DList Name="object_kingdodongo_DL_0127D0" Offset="0x127D0"/>
+        <Array Name="object_kingdodongo_012A28_Vtx" Count="80" Offset="0x12A28">
+            <Vtx/>
+        </Array>
         <DList Name="object_kingdodongo_DL_012F28" Offset="0x12F28"/>
+        <Array Name="object_kingdodongo_013160_Vtx" Count="101" Offset="0x13160">
+            <Vtx/>
+        </Array>
         <DList Name="object_kingdodongo_DL_0137B0" Offset="0x137B0"/>
+        <Array Name="object_kingdodongo_013A10_Vtx" Count="33" Offset="0x13A10">
+            <Vtx/>
+        </Array>
         <DList Name="object_kingdodongo_DL_013C20" Offset="0x13C20"/>
+        <Array Name="object_kingdodongo_013D78_Vtx" Count="24" Offset="0x13D78">
+            <Vtx/>
+        </Array>
         <DList Name="object_kingdodongo_DL_013EF8" Offset="0x13EF8"/>
+        <Array Name="object_kingdodongo_014040_Vtx" Count="12" Offset="0x14040">
+            <Vtx/>
+        </Array>
         <DList Name="object_kingdodongo_DL_014100" Offset="0x14100"/>
+        <Array Name="object_kingdodongo_0141E0_Vtx" Count="133" Offset="0x141E0">
+            <Vtx/>
+        </Array>
         <DList Name="object_kingdodongo_DL_014A30" Offset="0x14A30"/>
+        <Array Name="object_kingdodongo_014D50_Vtx" Count="142" Offset="0x14D50">
+            <Vtx/>
+        </Array>
         <DList Name="object_kingdodongo_DL_015630" Offset="0x15630"/>
         <Texture Name="object_kingdodongo_Tex_015890" OutName="tex_00015890" Format="rgba16" Width="8" Height="16" Offset="0x15890"/>
         <Texture Name="object_kingdodongo_Tex_015990" OutName="tex_00015990" Format="rgba16" Width="16" Height="32" Offset="0x15990"/>
@@ -102,6 +165,9 @@
         <Animation Name="object_kingdodongo_Anim_01D218" Offset="0x1BE18"/>
         <Animation Name="object_kingdodongo_Anim_01D934" Offset="0x1C534"/>
         <DList Name="object_kingdodongo_DL_01D950" Offset="0x1C550"/>
+        <Array Name="object_kingdodongo_01C5B0_Vtx" Count="4" Offset="0x1C5B0">
+            <Vtx/>
+        </Array>
         <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"/>
@@ -111,8 +177,17 @@
         <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"/>
+        <Array Name="object_kingdodongo_024650_Vtx" Count="4" Offset="0x24650">
+            <Vtx/>
+        </Array>
         <DList Name="object_kingdodongo_DL_025A90" Offset="0x24690"/>
+        <Array Name="object_kingdodongo_0246F0_Vtx" Count="4" Offset="0x246F0">
+            <Vtx/>
+        </Array>
         <Collision Name="object_kingdodongo_Col_025B64" Offset="0x24764"/>
+        <Array Name="object_kingdodongo_024790_Vtx" Count="4" Offset="0x24790">
+            <Vtx/>
+        </Array>
         <DList Name="object_kingdodongo_DL_025BD0" Offset="0x247D0"/>
         <Texture Name="object_kingdodongo_Tex_025C58" OutName="tex_00025C58" Format="rgba16" Width="32" Height="32" Offset="0x24858"/>
         <Collision Name="object_kingdodongo_Col_0264A8" Offset="0x250A8"/>
diff --git a/assets/xml/objects/object_oE4s.xml b/assets/xml/objects/object_oE4s.xml
index 1f1b33dcfa..8aefb0bb2c 100644
--- a/assets/xml/objects/object_oE4s.xml
+++ b/assets/xml/objects/object_oE4s.xml
@@ -19,6 +19,8 @@
         <Limb Name="object_oE4s_Limb_000144" LimbType="Standard" Offset="0x144"/>
         <Skeleton Name="object_oE4s_Skel_000190" Type="Flex" LimbType="Standard" Offset="0x190"/>
         <Texture Name="object_oE4s_TLUT_0001A8" OutName="tlut_000001A8" Format="rgba16" Width="124" Height="1" Offset="0x1A8"/><!--Blob Name="object_oE4s_Blob_0003A8" Size="0xF8" Offset="0x3A8" /-->
+        <Texture Name="object_oE4s_0002A0_Tex" Format="ci8" Width="16" Height="16" Offset="0x2A0" TlutOffset="0x1A8"/>
+        <Texture Name="object_oE4s_0003A0_Tex" Format="ci8" Width="16" Height="16" Offset="0x3A0" TlutOffset="0x1A8"/>
         <Texture Name="object_oE4s_Tex_0004A0" OutName="tex_000004A0" Format="ci8" Width="8" Height="8" Offset="0x4A0" TlutOffset="0x1A8"/>
         <Texture Name="object_oE4s_Tex_0004E0" OutName="tex_000004E0" Format="rgba16" Width="16" Height="32" Offset="0x4E0"/>
         <Texture Name="object_oE4s_Tex_0008E0" OutName="tex_000008E0" Format="rgba16" Width="8" Height="16" Offset="0x8E0"/>
diff --git a/assets/xml/objects/object_ossan.xml b/assets/xml/objects/object_ossan.xml
index c0d80ad0b0..4eb3e74131 100644
--- a/assets/xml/objects/object_ossan.xml
+++ b/assets/xml/objects/object_ossan.xml
@@ -25,19 +25,45 @@
         <Array Name="object_ossan_Vtx_0024E0" Count="149" Offset="0x24E0">
             <Vtx/>
         </Array>
+        <DList Name="object_ossan_002E30_DL" Offset="0x2E30"/>
+        <DList Name="object_ossan_003130_DL" Offset="0x3130"/>
+        <DList Name="object_ossan_003318_DL" Offset="0x3318"/>
+        <DList Name="object_ossan_003708_DL" Offset="0x3708"/>
+        <DList Name="object_ossan_003B30_DL" Offset="0x3B30"/>
+        <DList Name="object_ossan_003D18_DL" Offset="0x3D18"/>
+        <DList Name="object_ossan_004108_DL" Offset="0x4108"/>
         <Texture Name="gOssanEyesTLUT" OutName="ossan_eyes_tlut" Format="rgba16" Width="63" Height="4" Offset="0x4530"/>
         <Texture Name="gOssanTLUT" OutName="ossan_tlut" Format="rgba16" Width="168" Height="1" Offset="0x4728"/>
         <Texture Name="gOssanEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x4878" TlutOffset="0x4530"/>
         <Texture Name="gOssanBeardTex" OutName="beard" Format="ci8" Width="32" Height="32" Offset="0x4C78" TlutOffset="0x4728"/>
+        <Texture Name="object_ossan_005078_Tex" Format="ci8" Width="16" Height="16" Offset="0x5078" TlutOffset="0x4728"/>
+        <Texture Name="object_ossan_005178_Tex" Format="ci8" Width="16" Height="16" Offset="0x5178" TlutOffset="0x4728"/>
+        <Texture Name="object_ossan_005278_Tex" Format="ci8" Width="8" Height="8" Offset="0x5278" TlutOffset="0x4728"/>
         <Texture Name="gOssanEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x52B8" TlutOffset="0x4530"/>
         <Texture Name="gOssanEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x56B8" TlutOffset="0x4530"/>
+        <Texture Name="object_ossan_005AB8_Tex" Format="ci8" Width="8" Height="8" Offset="0x5AB8" TlutOffset="0x4728"/>
         <Array Name="object_ossan_Vtx_005AF8" Count="169" Offset="0x5AF8">
             <Vtx/>
         </Array>
         <Array Name="object_ossan_Vtx_006588" Count="234" Offset="0x6588">
             <Vtx/>
         </Array>
+        <DList Name="object_ossan_007428_DL" Offset="0x7428"/>
         <DList Name="gObjectOssanEnSyatekiManDL_007E28" Offset="0x7E28"/>
+        <Texture Name="object_ossan_008A38_Tex" Format="rgba16" Width="8" Height="8" Offset="0x8A38"/>
+        <Texture Name="object_ossan_008AB8_Tex" Format="rgba16" Width="16" Height="16" Offset="0x8AB8"/>
+        <Texture Name="object_ossan_008CB8_Tex" Format="rgba16" Width="16" Height="16" Offset="0x8CB8"/>
+        <Texture Name="object_ossan_008EB8_Tex" Format="rgba16" Width="32" Height="32" Offset="0x8EB8"/>
+        <Texture Name="object_ossan_0096B8_Tex" Format="rgba16" Width="16" Height="16" Offset="0x96B8"/>
+        <Texture Name="object_ossan_0098B8_Tex" Format="rgba16" Width="16" Height="16" Offset="0x98B8"/>
+        <Limb Name="object_ossan_009AB8_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OSSAN_009AB8" Offset="0x9AB8"/>
+        <Limb Name="object_ossan_009AC4_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OSSAN_009AC4" Offset="0x9AC4"/>
+        <Limb Name="object_ossan_009AD0_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OSSAN_009AD0" Offset="0x9AD0"/>
+        <Limb Name="object_ossan_009ADC_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OSSAN_009ADC" Offset="0x9ADC"/>
+        <Limb Name="object_ossan_009AE8_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OSSAN_009AE8" Offset="0x9AE8"/>
+        <Limb Name="object_ossan_009AF4_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OSSAN_009AF4" Offset="0x9AF4"/>
+        <Limb Name="object_ossan_009B00_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OSSAN_009B00" Offset="0x9B00"/>
+        <Limb Name="object_ossan_009B0C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OSSAN_009B0C" Offset="0x9B0C"/>
         <Skeleton Name="gObjectOssanSkel" Type="Flex" LimbType="Standard" Offset="0x9B38"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_po_field.xml b/assets/xml/objects/object_po_field.xml
index 7900b787ac..2caf708162 100644
--- a/assets/xml/objects/object_po_field.xml
+++ b/assets/xml/objects/object_po_field.xml
@@ -13,6 +13,15 @@
             <Vtx/>
         </Array>
         <DList Name="gPoeFieldSoulDL" Offset="0x23B0"/>
+        <Texture Name="object_po_field_002470_Tex" Format="rgba16" Width="16" Height="16" Offset="0x2470"/>
+        <Texture Name="object_po_field_002670_Tex" Format="rgba16" Width="16" Height="16" Offset="0x2670"/>
+        <Texture Name="object_po_field_002870_Tex" Format="rgba16" Width="32" Height="32" Offset="0x2870"/>
+        <Texture Name="object_po_field_003070_Tex" Format="rgba16" Width="16" Height="16" Offset="0x3070"/>
+        <Texture Name="object_po_field_003270_Tex" Format="rgba16" Width="8" Height="8" Offset="0x3270"/>
+        <Texture Name="object_po_field_0032F0_Tex" Format="rgba16" Width="16" Height="8" Offset="0x32F0"/>
+        <Texture Name="object_po_field_0033F0_Tex" Format="rgba16" Width="16" Height="16" Offset="0x33F0"/>
+        <Texture Name="object_po_field_0035F0_Tex" Format="rgba16" Width="16" Height="16" Offset="0x35F0"/>
+        <Texture Name="object_po_field_0037F0_Tex" Format="rgba16" Width="16" Height="16" Offset="0x37F0"/>
         <Array Name="gPoeFieldLanternVtx" Count="17" Offset="0x39F0">
             <Vtx/>
         </Array>
@@ -54,13 +63,32 @@
         </Array>
         <DList Name="gPoeFieldLanternDL" Offset="0x4BA0"/>
         <DList Name="gPoeFieldLanternTopDL" Offset="0x4CC0"/>
+        <DList Name="object_po_field_004D48_DL" Offset="0x4D48"/>
+        <DList Name="object_po_field_004DF8_DL" Offset="0x4DF8"/>
+        <DList Name="object_po_field_004F60_DL" Offset="0x4F60"/>
+        <DList Name="object_po_field_005058_DL" Offset="0x5058"/>
+        <DList Name="object_po_field_0050F8_DL" Offset="0x50F8"/>
+        <DList Name="object_po_field_0051A0_DL" Offset="0x51A0"/>
+        <DList Name="object_po_field_005288_DL" Offset="0x5288"/>
+        <DList Name="object_po_field_005328_DL" Offset="0x5328"/>
         <DList Name="gBigPoeCloakDL" Offset="0x5620"/>
         <DList Name="gBigPoeFaceDL" Offset="0x5900"/>
         <DList Name="gBigPoeBodyDL" Offset="0x59F0"/>
+        <Texture Name="object_po_field_005AB0_Tex" Format="rgba16" Width="16" Height="16" Offset="0x5AB0"/>
+        <Texture Name="object_po_field_005CB0_Tex" Format="rgba16" Width="8" Height="8" Offset="0x5CB0"/>
         <Array Name="gPoeFieldBurnVtx" Count="154" Offset="0x5D30">
             <Vtx/>
         </Array>
         <DList Name="gPoeFieldBurnDL" Offset="0x66D0"/>
+        <Limb Name="object_po_field_0069A0_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_PO_FIELD_0069A0" Offset="0x69A0"/>
+        <Limb Name="object_po_field_0069AC_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_PO_FIELD_0069AC" Offset="0x69AC"/>
+        <Limb Name="object_po_field_0069B8_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_PO_FIELD_0069B8" Offset="0x69B8"/>
+        <Limb Name="object_po_field_0069C4_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_PO_FIELD_0069C4" Offset="0x69C4"/>
+        <Limb Name="object_po_field_0069D0_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_PO_FIELD_0069D0" Offset="0x69D0"/>
+        <Limb Name="object_po_field_0069DC_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_PO_FIELD_0069DC" Offset="0x69DC"/>
+        <Limb Name="object_po_field_0069E8_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_PO_FIELD_0069E8" Offset="0x69E8"/>
+        <Limb Name="object_po_field_0069F4_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_PO_FIELD_0069F4" Offset="0x69F4"/>
+        <Limb Name="object_po_field_006A00_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_PO_FIELD_006A00" Offset="0x6A00"/>
         <Skeleton Name="gPoeFieldSkel" Type="Normal" LimbType="Standard" Offset="0x6A30"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_po_sisters.xml b/assets/xml/objects/object_po_sisters.xml
index 2ba750a2a2..f82b24286a 100644
--- a/assets/xml/objects/object_po_sisters.xml
+++ b/assets/xml/objects/object_po_sisters.xml
@@ -36,7 +36,13 @@
         <Array Name="object_po_sisters_Vtx_002408" Count="10" Offset="0x2408">
             <Vtx/>
         </Array>
+        <DList Name="object_po_sisters_0024A8_DL" Offset="0x24A8"/>
+        <DList Name="object_po_sisters_002570_DL" Offset="0x2570"/>
+        <DList Name="object_po_sisters_0025E8_DL" Offset="0x25E8"/>
+        <DList Name="object_po_sisters_002680_DL" Offset="0x2680"/>
+        <DList Name="object_po_sisters_002718_DL" Offset="0x2718"/>
         <DList Name="gPoSistersTorchDL" Offset="0x27B0"/>
+        <DList Name="object_po_sisters_002870_DL" Offset="0x2870"/>
         <Array Name="gPoeSistersJoelleFaceVtx" Count="19" Offset="0x2908">
             <Vtx/>
         </Array>
@@ -65,6 +71,31 @@
             <Vtx/>
         </Array>
         <DList Name="gPoSistersBurnDL" Offset="0x46E0"/>
+        <Texture Name="object_po_sisters_0048D8_Tex" Format="rgba16" Width="16" Height="16" Offset="0x48D8"/>
+        <Texture Name="object_po_sisters_004AD8_Tex" Format="rgba16" Width="32" Height="32" Offset="0x4AD8"/>
+        <Texture Name="object_po_sisters_0052D8_Tex" Format="rgba16" Width="32" Height="16" Offset="0x52D8"/>
+        <Texture Name="object_po_sisters_0056D8_Tex" Format="rgba16" Width="16" Height="16" Offset="0x56D8"/>
+        <Texture Name="object_po_sisters_0058D8_Tex" Format="rgba16" Width="4" Height="4" Offset="0x58D8"/>
+        <Texture Name="object_po_sisters_0058F8_Tex" Format="rgba16" Width="16" Height="16" Offset="0x58F8"/>
+        <Texture Name="object_po_sisters_005AF8_Tex" Format="rgba16" Width="16" Height="16" Offset="0x5AF8"/>
+        <Texture Name="object_po_sisters_005CF8_Tex" Format="rgba16" Width="8" Height="8" Offset="0x5CF8"/>
+        <Texture Name="object_po_sisters_005D78_Tex" Format="rgba16" Width="16" Height="16" Offset="0x5D78"/>
+        <Texture Name="object_po_sisters_005F78_Tex" Format="rgba16" Width="16" Height="8" Offset="0x5F78"/>
+        <Texture Name="object_po_sisters_006078_Tex" Format="rgba16" Width="16" Height="16" Offset="0x6078"/>
+        <Texture Name="object_po_sisters_006278_Tex" Format="rgba16" Width="8" Height="8" Offset="0x6278"/>
+        <Texture Name="object_po_sisters_0062F8_Tex" Format="rgba16" Width="4" Height="4" Offset="0x62F8"/>
+        <Texture Name="object_po_sisters_006318_Tex" Format="rgba16" Width="16" Height="16" Offset="0x6318"/>
+        <Limb Name="object_po_sisters_006518_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_PO_SISTERS_006518" Offset="0x6518"/>
+        <Limb Name="object_po_sisters_006524_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_PO_SISTERS_006524" Offset="0x6524"/>
+        <Limb Name="object_po_sisters_006530_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_PO_SISTERS_006530" Offset="0x6530"/>
+        <Limb Name="object_po_sisters_00653C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_PO_SISTERS_00653C" Offset="0x653C"/>
+        <Limb Name="object_po_sisters_006548_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_PO_SISTERS_006548" Offset="0x6548"/>
+        <Limb Name="object_po_sisters_006554_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_PO_SISTERS_006554" Offset="0x6554"/>
+        <Limb Name="object_po_sisters_006560_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_PO_SISTERS_006560" Offset="0x6560"/>
+        <Limb Name="object_po_sisters_00656C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_PO_SISTERS_00656C" Offset="0x656C"/>
+        <Limb Name="object_po_sisters_006578_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_PO_SISTERS_006578" Offset="0x6578"/>
+        <Limb Name="object_po_sisters_006584_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_PO_SISTERS_006584" Offset="0x6584"/>
+        <Limb Name="object_po_sisters_006590_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_PO_SISTERS_006590" Offset="0x6590"/>
         <Skeleton Name="gPoeSistersSkel" Type="Normal" LimbType="Standard" Offset="0x65C8"/>
         <Array Name="gPoSistersJoellePaintingVtx" Count="38" Offset="0x65D0">
             <Vtx/>
diff --git a/assets/xml/objects/object_poh.xml b/assets/xml/objects/object_poh.xml
index b2dd07568d..30cd1c4a62 100644
--- a/assets/xml/objects/object_poh.xml
+++ b/assets/xml/objects/object_poh.xml
@@ -10,21 +10,27 @@
         <Array Name="object_poh_Vtx_0015C0" Count="6" Offset="0x15C0">
             <Vtx/>
         </Array>
+        <DList Name="object_poh_001620_DL" Offset="0x1620"/>
         <Array Name="object_poh_Vtx_0016B8" Count="30" Offset="0x16B8">
             <Vtx/>
         </Array>
+        <DList Name="object_poh_001898_DL" Offset="0x1898"/>
         <Array Name="object_poh_Vtx_001A18" Count="6" Offset="0x1A18">
             <Vtx/>
         </Array>
+        <DList Name="object_poh_001A78_DL" Offset="0x1A78"/>
         <Array Name="object_poh_Vtx_001B10" Count="6" Offset="0x1B10">
             <Vtx/>
         </Array>
+        <DList Name="object_poh_001B70_DL" Offset="0x1B70"/>
         <Array Name="object_poh_Vtx_001C08" Count="6" Offset="0x1C08">
             <Vtx/>
         </Array>
+        <DList Name="object_poh_001C68_DL" Offset="0x1C68"/>
         <Array Name="object_poh_Vtx_001CE0" Count="45" Offset="0x1CE0">
             <Vtx/>
         </Array>
+        <DList Name="object_poh_001FB0_DL" Offset="0x1FB0"/>
         <Array Name="gPoeBurnVtx" Count="75" Offset="0x2158">
             <Vtx/>
         </Array>
@@ -32,6 +38,7 @@
         <Array Name="object_poh_Vtx_0027C0" Count="21" Offset="0x27C0">
             <Vtx/>
         </Array>
+        <DList Name="object_poh_002910_DL" Offset="0x2910"/>
         <Array Name="gPoeLanternVtx" Count="53" Offset="0x29D8">
             <Vtx/>
         </Array>
@@ -39,10 +46,42 @@
         <Array Name="object_poh_Vtx_002EB8" Count="10" Offset="0x2EB8">
             <Vtx/>
         </Array>
+        <DList Name="object_poh_002F58_DL" Offset="0x2F58"/>
+        <Texture Name="object_poh_003010_Tex" Format="i8" Width="32" Height="64" Offset="0x3010"/>
         <Array Name="gPoeSoulVtx" Count="4" Offset="0x3810">
             <Vtx/>
         </Array>
         <DList Name="gPoeSoulDL" Offset="0x3850"/>
+        <Texture Name="object_poh_003910_Tex" Format="rgba16" Width="32" Height="16" Offset="0x3910"/>
+        <Texture Name="object_poh_003D10_Tex" Format="rgba16" Width="32" Height="32" Offset="0x3D10"/>
+        <Texture Name="object_poh_004510_Tex" Format="rgba16" Width="16" Height="16" Offset="0x4510"/>
+        <Texture Name="object_poh_004710_Tex" Format="rgba16" Width="8" Height="8" Offset="0x4710"/>
+        <Texture Name="object_poh_004790_Tex" Format="rgba16" Width="16" Height="16" Offset="0x4790"/>
+        <Texture Name="object_poh_004990_Tex" Format="rgba16" Width="8" Height="8" Offset="0x4990"/>
+        <Texture Name="object_poh_004A10_Tex" Format="rgba16" Width="8" Height="16" Offset="0x4A10"/>
+        <Texture Name="object_poh_004B10_Tex" Format="rgba16" Width="16" Height="16" Offset="0x4B10"/>
+        <Texture Name="object_poh_004D10_Tex" Format="rgba16" Width="16" Height="16" Offset="0x4D10"/>
+        <Texture Name="object_poh_004F10_Tex" Format="rgba16" Width="8" Height="8" Offset="0x4F10"/>
+        <Limb Name="object_poh_004F90_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_POH_004F90" Offset="0x4F90"/>
+        <Limb Name="object_poh_004F9C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_POH_004F9C" Offset="0x4F9C"/>
+        <Limb Name="object_poh_004FA8_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_POH_004FA8" Offset="0x4FA8"/>
+        <Limb Name="object_poh_004FB4_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_POH_004FB4" Offset="0x4FB4"/>
+        <Limb Name="object_poh_004FC0_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_POH_004FC0" Offset="0x4FC0"/>
+        <Limb Name="object_poh_004FCC_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_POH_004FCC" Offset="0x4FCC"/>
+        <Limb Name="object_poh_004FD8_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_POH_004FD8" Offset="0x4FD8"/>
+        <Limb Name="object_poh_004FE4_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_POH_004FE4" Offset="0x4FE4"/>
+        <Limb Name="object_poh_004FF0_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_POH_004FF0" Offset="0x4FF0"/>
+        <Limb Name="object_poh_004FFC_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_POH_004FFC" Offset="0x4FFC"/>
+        <Limb Name="object_poh_005008_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_POH_005008" Offset="0x5008"/>
+        <Limb Name="object_poh_005014_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_POH_005014" Offset="0x5014"/>
+        <Limb Name="object_poh_005020_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_POH_005020" Offset="0x5020"/>
+        <Limb Name="object_poh_00502C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_POH_00502C" Offset="0x502C"/>
+        <Limb Name="object_poh_005038_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_POH_005038" Offset="0x5038"/>
+        <Limb Name="object_poh_005044_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_POH_005044" Offset="0x5044"/>
+        <Limb Name="object_poh_005050_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_POH_005050" Offset="0x5050"/>
+        <Limb Name="object_poh_00505C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_POH_00505C" Offset="0x505C"/>
+        <Limb Name="object_poh_005068_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_POH_005068" Offset="0x5068"/>
+        <Limb Name="object_poh_005074_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_POH_005074" Offset="0x5074"/>
         <Skeleton Name="gPoeSkel" Type="Normal" LimbType="Standard" Offset="0x50D0"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_ps.xml b/assets/xml/objects/object_ps.xml
index e3a04685c6..4b49513afa 100644
--- a/assets/xml/objects/object_ps.xml
+++ b/assets/xml/objects/object_ps.xml
@@ -2,9 +2,27 @@
     <ExternalFile OutPath="assets/objects/gameplay_keep"/>
     <File Name="object_ps" Segment="6">
         <Animation Name="gPoeSellerIdleAnim" Offset="0x049C"/>
+        <Texture Name="object_ps_0004B0_Tex" Format="rgba16" Width="132" Height="1" Offset="0x4B0"/>
+        <Texture Name="object_ps_0005B8_Tex" Format="rgba16" Width="32" Height="64" Offset="0x5B8"/>
+        <Texture Name="object_ps_0015B8_Tex" Format="ci8" Width="8" Height="8" Offset="0x15B8" TlutOffset="0x4B0"/>
+        <Texture Name="object_ps_0015F8_Tex" Format="rgba16" Width="16" Height="16" Offset="0x15F8"/>
+        <Texture Name="object_ps_0017F8_Tex" Format="ci8" Width="8" Height="8" Offset="0x17F8" TlutOffset="0x4B0"/>
+        <Texture Name="object_ps_001838_Tex" Format="ci8" Width="32" Height="32" Offset="0x1838" TlutOffset="0x4B0"/>
+        <Texture Name="object_ps_001C38_Tex" Format="ci8" Width="16" Height="16" Offset="0x1C38" TlutOffset="0x4B0"/>
+        <Texture Name="object_ps_001D38_Tex" Format="i8" Width="8" Height="8" Offset="0x1D38"/>
+        <Texture Name="object_ps_001D78_Tex" Format="ci8" Width="16" Height="16" Offset="0x1D78" TlutOffset="0x4B0"/>
+        <Texture Name="object_ps_001E78_Tex" Format="ci8" Width="16" Height="16" Offset="0x1E78" TlutOffset="0x4B0"/>
+        <Texture Name="object_ps_001F78_Tex" Format="rgba16" Width="16" Height="16" Offset="0x1F78"/>
+        <Texture Name="object_ps_002178_Tex" Format="rgba16" Width="16" Height="16" Offset="0x2178"/>
+        <Texture Name="object_ps_002378_Tex" Format="i4" Width="32" Height="32" Offset="0x2378"/>
+        <Texture Name="object_ps_002578_Tex" Format="ci8" Width="32" Height="32" Offset="0x2578" TlutOffset="0x4B0"/>
+        <Texture Name="object_ps_002978_Tex" Format="rgba16" Width="8" Height="16" Offset="0x2978"/>
         <Array Name="object_ps_Vtx_002A78" Count="476" Offset="0x2A78">
             <Vtx/>
         </Array>
+        <DList Name="object_ps_004838_DL" Offset="0x4838"/>
+        <Texture Name="object_ps_005880_Tex" Format="rgba16" Width="184" Height="1" Offset="0x5880"/>
+        <Blob Name="object_ps_0059F0_Blob" Size="0x90" Offset="0x59F0"/>
         <Texture Name="gPoeSellerMetalFrameTex" OutName="poe_seller_metal_frame" Format="rgba16" Width="8" Height="8" Offset="0x5A80"/>
         <Texture Name="gPoeSellerMattressTex" OutName="poe_seller_mattress" Format="rgba16" Width="8" Height="8" Offset="0x5B00"/>
         <Texture Name="gPoeSellerClothTex" OutName="poe_seller_cloth" Format="rgba16" Width="32" Height="32" Offset="0x5B80"/>
@@ -12,6 +30,13 @@
         <Texture Name="gPoeSellerBottleLabelTex" OutName="poe_seller_bottle_label" Format="rgba16" Width="16" Height="16" Offset="0x6580"/>
         <Texture Name="gPoeSellerWoodenPanelTex" OutName="poe_seller_wooden_panel" Format="rgba16" Width="32" Height="32" Offset="0x6780"/>
         <Texture Name="gPoeSellerLanternTex" OutName="poe_seller_lantern" Format="rgba16" Width="16" Height="16" Offset="0x6F80"/>
+        <Texture Name="object_ps_007180_Tex" Format="ci8" Width="8" Height="8" Offset="0x7180" TlutOffset="0x5880"/>
+        <Texture Name="object_ps_0071C0_Tex" Format="ci8" Width="32" Height="32" Offset="0x71C0" TlutOffset="0x5880"/>
+        <Texture Name="object_ps_0075C0_Tex" Format="ci8" Width="8" Height="8" Offset="0x75C0" TlutOffset="0x5880"/>
+        <Texture Name="object_ps_007600_Tex" Format="ci8" Width="8" Height="8" Offset="0x7600" TlutOffset="0x5880"/>
+        <Texture Name="object_ps_007640_Tex" Format="ci8" Width="32" Height="32" Offset="0x7640" TlutOffset="0x5880"/>
+        <Texture Name="object_ps_007A40_Tex" Format="rgba16" Width="16" Height="16" Offset="0x7A40"/>
+        <Texture Name="object_ps_007C40_Tex" Format="ci8" Width="32" Height="32" Offset="0x7C40" TlutOffset="0x5880"/>
         <Array Name="object_ps_Vtx_008040" Count="55" Offset="0x8040">
             <Vtx/>
         </Array>
@@ -39,6 +64,15 @@
         <Array Name="object_ps_Vtx_0091A0" Count="82" Offset="0x91A0">
             <Vtx/>
         </Array>
+        <DList Name="object_ps_0096C0_DL" Offset="0x96C0"/>
+        <DList Name="object_ps_009AE8_DL" Offset="0x9AE8"/>
+        <DList Name="object_ps_009FC8_DL" Offset="0x9FC8"/>
+        <DList Name="object_ps_00A0F8_DL" Offset="0xA0F8"/>
+        <DList Name="object_ps_00A1D8_DL" Offset="0xA1D8"/>
+        <DList Name="object_ps_00A400_DL" Offset="0xA400"/>
+        <DList Name="object_ps_00A510_DL" Offset="0xA510"/>
+        <DList Name="object_ps_00A638_DL" Offset="0xA638"/>
+        <DList Name="object_ps_00A748_DL" Offset="0xA748"/>
         <Texture Name="gPoeSellerAngrySoulTex" OutName="poe_seller_angry_soul" Format="i8" Width="32" Height="64" Offset="0xA870"/>
         <Texture Name="gPoeSellerHappySoulTex" OutName="poe_seller_happy_soul" Format="i8" Width="32" Height="64" Offset="0xB070"/>
         <Texture Name="gPoeSellerSadSoulTex" OutName="poe_seller_sad_soul" Format="i8" Width="32" Height="64" Offset="0xB870"/>
@@ -46,6 +80,17 @@
             <Vtx/>
         </Array>
         <DList Name="gPoeSellerCagedSoulDL" Offset="0xC0B0"/>
+        <Limb Name="object_ps_00C170_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_PS_00C170" Offset="0xC170"/>
+        <Limb Name="object_ps_00C17C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_PS_00C17C" Offset="0xC17C"/>
+        <Limb Name="object_ps_00C188_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_PS_00C188" Offset="0xC188"/>
+        <Limb Name="object_ps_00C194_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_PS_00C194" Offset="0xC194"/>
+        <Limb Name="object_ps_00C1A0_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_PS_00C1A0" Offset="0xC1A0"/>
+        <Limb Name="object_ps_00C1AC_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_PS_00C1AC" Offset="0xC1AC"/>
+        <Limb Name="object_ps_00C1B8_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_PS_00C1B8" Offset="0xC1B8"/>
+        <Limb Name="object_ps_00C1C4_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_PS_00C1C4" Offset="0xC1C4"/>
+        <Limb Name="object_ps_00C1D0_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_PS_00C1D0" Offset="0xC1D0"/>
+        <Limb Name="object_ps_00C1DC_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_PS_00C1DC" Offset="0xC1DC"/>
+        <Limb Name="object_ps_00C1E8_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_PS_00C1E8" Offset="0xC1E8"/>
         <Skeleton Name="gPoeSellerSkel" Type="Flex" LimbType="Standard" Offset="0xC220"/>
         <Collision Name="gPoeSellerCol" Offset="0xC2D0"/>
         <Animation Name="gPoeSellerSwingStickAnim" Offset="0xC8EC"/>
diff --git a/assets/xml/objects/object_reeba.xml b/assets/xml/objects/object_reeba.xml
index 474e4edc59..4fc31fb594 100644
--- a/assets/xml/objects/object_reeba.xml
+++ b/assets/xml/objects/object_reeba.xml
@@ -40,6 +40,23 @@
         <Texture Name="object_reeba_Tex_000CD8" OutName="tex_00000CD8" Format="rgba16" Width="8" Height="16" Offset="0xCD8"/>
         <Texture Name="object_reeba_Tex_000DD8" OutName="tex_00000DD8" Format="rgba16" Width="32" Height="32" Offset="0xDD8"/>
         <Texture Name="object_reeba_Tex_0015D8" OutName="tex_000015D8" Format="rgba16" Width="32" Height="32" Offset="0x15D8"/>
+        <Limb Name="object_reeba_001DD8_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_REEBA_001DD8" Offset="0x1DD8"/>
+        <Limb Name="object_reeba_001DE4_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_REEBA_001DE4" Offset="0x1DE4"/>
+        <Limb Name="object_reeba_001DF0_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_REEBA_001DF0" Offset="0x1DF0"/>
+        <Limb Name="object_reeba_001DFC_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_REEBA_001DFC" Offset="0x1DFC"/>
+        <Limb Name="object_reeba_001E08_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_REEBA_001E08" Offset="0x1E08"/>
+        <Limb Name="object_reeba_001E14_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_REEBA_001E14" Offset="0x1E14"/>
+        <Limb Name="object_reeba_001E20_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_REEBA_001E20" Offset="0x1E20"/>
+        <Limb Name="object_reeba_001E2C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_REEBA_001E2C" Offset="0x1E2C"/>
+        <Limb Name="object_reeba_001E38_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_REEBA_001E38" Offset="0x1E38"/>
+        <Limb Name="object_reeba_001E44_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_REEBA_001E44" Offset="0x1E44"/>
+        <Limb Name="object_reeba_001E50_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_REEBA_001E50" Offset="0x1E50"/>
+        <Limb Name="object_reeba_001E5C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_REEBA_001E5C" Offset="0x1E5C"/>
+        <Limb Name="object_reeba_001E68_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_REEBA_001E68" Offset="0x1E68"/>
+        <Limb Name="object_reeba_001E74_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_REEBA_001E74" Offset="0x1E74"/>
+        <Limb Name="object_reeba_001E80_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_REEBA_001E80" Offset="0x1E80"/>
+        <Limb Name="object_reeba_001E8C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_REEBA_001E8C" Offset="0x1E8C"/>
+        <Limb Name="object_reeba_001E98_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_REEBA_001E98" Offset="0x1E98"/>
         <Skeleton Name="object_reeba_Skel_001EE8" Type="Normal" LimbType="Standard" Offset="0x1EE8"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_rl.xml b/assets/xml/objects/object_rl.xml
index e9a26ef2fb..5be8b03fe4 100644
--- a/assets/xml/objects/object_rl.xml
+++ b/assets/xml/objects/object_rl.xml
@@ -36,6 +36,8 @@
         <DList Name="object_rl_DL_002F20" Offset="0x2F20"/>
         <DList Name="object_rl_DL_003058" Offset="0x3058"/>
         <Texture Name="object_rl_TLUT_0032A0" OutName="tlut_000032A0" Format="rgba16" Width="160" Height="1" Offset="0x32A0"/>
+        <Texture Name="object_rl_0033E0_Tex" Format="ci8" Width="8" Height="8" Offset="0x33E0" TlutOffset="0x32A0"/>
+        <Texture Name="object_rl_003420_Tex" Format="ci8" Width="16" Height="16" Offset="0x3420" TlutOffset="0x32A0"/>
         <Texture Name="object_rl_Tex_003520" OutName="tex_00003520" Format="ci8" Width="16" Height="16" Offset="0x3520" TlutOffset="0x32A0"/>
         <Texture Name="object_rl_Tex_003620" OutName="tex_00003620" Format="ci8" Width="32" Height="16" Offset="0x3620" TlutOffset="0x32A0"/>
         <Texture Name="object_rl_Tex_003820" OutName="tex_00003820" Format="ci8" Width="16" Height="16" Offset="0x3820" TlutOffset="0x32A0"/>
diff --git a/assets/xml/objects/object_tk.xml b/assets/xml/objects/object_tk.xml
index 6ea256b875..d257294d8c 100644
--- a/assets/xml/objects/object_tk.xml
+++ b/assets/xml/objects/object_tk.xml
@@ -5,11 +5,19 @@
         <Animation Name="gDampeRestAnim" Offset="0x2F84"/>
         <Animation Name="gDampeFloatAnim" Offset="0x3768"/>
         <Texture Name="gDampeUnkTLUT" Format="rgba16" Width="102" Height="2" Offset="0x3780"/>
+        <Blob Name="object_tk_003918_Blob" Size="0x68" Offset="0x3918"/>
+        <Texture Name="object_tk_003980_Tex" Format="ci8" Width="8" Height="8" Offset="0x3980" TlutOffset="0x3780"/>
+        <Texture Name="object_tk_0039C0_Tex" Format="ci8" Width="8" Height="8" Offset="0x39C0" TlutOffset="0x3780"/>
+        <Texture Name="object_tk_003A00_Tex" Format="ci8" Width="8" Height="8" Offset="0x3A00" TlutOffset="0x3780"/>
+        <Texture Name="object_tk_003A40_Tex" Format="ci8" Width="16" Height="16" Offset="0x3A40" TlutOffset="0x3780"/>
         <Texture Name="gDampeEyeOpenTex" OutName="dampe_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x3B40"/>
         <Texture Name="gDampeEyeHalfTex" OutName="dampe_eye_half_open" Format="rgba16" Width="32" Height="32" Offset="0x4340"/>
         <Texture Name="gDampeEyeClosedTex" OutName="dampe_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x4B40"/>
+        <Texture Name="object_tk_005340_Tex" Format="ci8" Width="16" Height="16" Offset="0x5340" TlutOffset="0x3780"/>
+        <Texture Name="object_tk_005440_Tex" Format="ci8" Width="16" Height="16" Offset="0x5440" TlutOffset="0x3780"/>
         <Texture Name="gDampeUnused1Tex" OutName="dampe_unused_1" Format="ci8" Width="16" Height="16" Offset="0x5540" TlutOffset="0x3780"/>
         <Texture Name="gDampeUnused2Tex" OutName="dampe_unused_2" Format="ci8" Width="8" Height="16" Offset="0x5640" TlutOffset="0x3780"/>
+        <Texture Name="object_tk_0056C0_Tex" Format="ci8" Width="16" Height="16" Offset="0x56C0" TlutOffset="0x3780"/>
         <Array Name="object_tk_Vtx_0057C0" Count="38" Offset="0x57C0">
             <Vtx/>
         </Array>
@@ -55,6 +63,27 @@
         <Array Name="object_tk_Vtx_007BC0" Count="70" Offset="0x7BC0">
             <Vtx/>
         </Array>
+        <DList Name="object_tk_008020_DL" Offset="0x8020"/>
+        <DList Name="object_tk_008160_DL" Offset="0x8160"/>
+        <DList Name="object_tk_0082F0_DL" Offset="0x82F0"/>
+        <DList Name="object_tk_008410_DL" Offset="0x8410"/>
+        <DList Name="object_tk_008958_DL" Offset="0x8958"/>
+        <DList Name="object_tk_008CA0_DL" Offset="0x8CA0"/>
+        <DList Name="object_tk_008DD0_DL" Offset="0x8DD0"/>
+        <DList Name="object_tk_008F00_DL" Offset="0x8F00"/>
+        <DList Name="object_tk_009110_DL" Offset="0x9110"/>
+        <DList Name="object_tk_009240_DL" Offset="0x9240"/>
+        <DList Name="object_tk_009370_DL" Offset="0x9370"/>
+        <DList Name="object_tk_009580_DL" Offset="0x9580"/>
+        <DList Name="object_tk_009738_DL" Offset="0x9738"/>
+        <DList Name="object_tk_009818_DL" Offset="0x9818"/>
+        <DList Name="object_tk_0099D0_DL" Offset="0x99D0"/>
+        <Texture Name="object_tk_009AB0_Tex" Format="rgba16" Width="40" Height="1" Offset="0x9AB0"/>
+        <Texture Name="object_tk_009B00_Tex" Format="ci8" Width="16" Height="16" Offset="0x9B00" TlutOffset="0x9AB0"/>
+        <Texture Name="object_tk_009C00_Tex" Format="ci8" Width="8" Height="16" Offset="0x9C00" TlutOffset="0x9AB0"/>
+        <Texture Name="object_tk_009C80_Tex" Format="i8" Width="8" Height="8" Offset="0x9C80"/>
+        <Texture Name="object_tk_009CC0_Tex" Format="rgba16" Width="8" Height="8" Offset="0x9CC0"/>
+        <Texture Name="object_tk_009D40_Tex" Format="i4" Width="16" Height="32" Offset="0x9D40"/>
         <Array Name="object_tk_Vtx_009E40" Count="43" Offset="0x9E40">
             <Vtx/>
         </Array>
@@ -64,7 +93,12 @@
         <Array Name="gDampeShovelVtx" Count="103" Offset="0xA3A0">
             <Vtx/>
         </Array>
+        <DList Name="object_tk_00AA10_DL" Offset="0xAA10"/>
+        <DList Name="object_tk_00AB78_DL" Offset="0xAB78"/>
         <DList Name="gDampeShovelDL" Offset="0xACE0"/>
+        <Texture Name="object_tk_00B088_Tex" Format="rgba16" Width="16" Height="16" Offset="0xB088"/>
+        <Texture Name="object_tk_00B288_Tex" Format="rgba16" Width="16" Height="16" Offset="0xB288"/>
+        <Texture Name="object_tk_00B488_Tex" Format="rgba16" Width="16" Height="16" Offset="0xB488"/>
         <Array Name="gDampeLanternVtx" Count="27" Offset="0xB688">
             <Vtx/>
         </Array>
@@ -78,6 +112,23 @@
         <Array Name="gDampeEff2Vtx" Count="4" Offset="0xBCF0">
             <Vtx/>
         </Array>
+        <Limb Name="object_tk_00BD30_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_TK_00BD30" Offset="0xBD30"/>
+        <Limb Name="object_tk_00BD3C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_TK_00BD3C" Offset="0xBD3C"/>
+        <Limb Name="object_tk_00BD48_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_TK_00BD48" Offset="0xBD48"/>
+        <Limb Name="object_tk_00BD54_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_TK_00BD54" Offset="0xBD54"/>
+        <Limb Name="object_tk_00BD60_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_TK_00BD60" Offset="0xBD60"/>
+        <Limb Name="object_tk_00BD6C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_TK_00BD6C" Offset="0xBD6C"/>
+        <Limb Name="object_tk_00BD78_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_TK_00BD78" Offset="0xBD78"/>
+        <Limb Name="object_tk_00BD84_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_TK_00BD84" Offset="0xBD84"/>
+        <Limb Name="object_tk_00BD90_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_TK_00BD90" Offset="0xBD90"/>
+        <Limb Name="object_tk_00BD9C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_TK_00BD9C" Offset="0xBD9C"/>
+        <Limb Name="object_tk_00BDA8_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_TK_00BDA8" Offset="0xBDA8"/>
+        <Limb Name="object_tk_00BDB4_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_TK_00BDB4" Offset="0xBDB4"/>
+        <Limb Name="object_tk_00BDC0_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_TK_00BDC0" Offset="0xBDC0"/>
+        <Limb Name="object_tk_00BDCC_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_TK_00BDCC" Offset="0xBDCC"/>
+        <Limb Name="object_tk_00BDD8_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_TK_00BDD8" Offset="0xBDD8"/>
+        <Limb Name="object_tk_00BDE4_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_TK_00BDE4" Offset="0xBDE4"/>
+        <Limb Name="object_tk_00BDF0_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_TK_00BDF0" Offset="0xBDF0"/>
         <Skeleton Name="gDampeSkel" Type="Flex" LimbType="Standard" Offset="0xBE40"/>
     </File>
 </Root>
diff --git a/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c b/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c
index 09368f5b09..ce7ea7e2c9 100644
--- a/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c
+++ b/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c
@@ -34,6 +34,8 @@
 #include "assets/objects/object_ganon/object_ganon.h"
 #include "assets/objects/object_opening_demo1/object_opening_demo1.h"
 
+#pragma increment_block_number "ntsc-1.0:128"
+
 #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED
 
 void EnViewer_Init(Actor* thisx, PlayState* play);
diff --git a/src/overlays/actors/ovl_En_Xc/z_en_xc.c b/src/overlays/actors/ovl_En_Xc/z_en_xc.c
index 2ff73c8f4a..2820225931 100644
--- a/src/overlays/actors/ovl_En_Xc/z_en_xc.c
+++ b/src/overlays/actors/ovl_En_Xc/z_en_xc.c
@@ -1416,7 +1416,7 @@ void func_80B3F3D8(void) {
 }
 
 #pragma increment_block_number "gc-eu:64 gc-eu-mq:64 gc-jp:64 gc-jp-ce:64 gc-jp-mq:64 gc-us:64 gc-us-mq:64 ique-cn:64" \
-                               "ntsc-1.0:128 ntsc-1.1:128 ntsc-1.2:128 pal-1.0:128 pal-1.1:128"
+                               "ntsc-1.0:64 ntsc-1.1:128 ntsc-1.2:128 pal-1.0:128 pal-1.1:128"
 
 void EnXc_PlayDiveSFX(Vec3f* src, PlayState* play) {
     static Vec3f D_80B42DA0;