From f30be363ec88126b0fbf80d92fdf332bc1f7c42f Mon Sep 17 00:00:00 2001
From: Derek Hensley <hensley.derek58@gmail.com>
Date: Sun, 16 Aug 2026 08:47:37 -0700
Subject: [PATCH] Xml fixes (#1894)

* object_boj_TLUT_009848

* Add dependencies comment to xmls

* ExternalFile gameplay_keep

* Combine gEffFireMaskTexs into one gEffFireMaskTex

* gEffFleckTex

* gGoronEyeTLUT TlutOffsets

* gHiliteTexs

* gUnknownCircle4Tex

* object_nwc_Tex_001A40

* gBartenEyeTLUT TlutOffsets

* object_in2

* gFsnEyeTLUT TlutOffset

* object_rz_TLUT_00B650

* object_bji_TLUT_004130

* gOwlEyeTLUTs

* Many TlutOffsets
---
 assets/xml/code/eff_footmark.xml              |  3 +
 assets/xml/objects/gameplay_keep.xml          | 13 ++--
 assets/xml/objects/object_bg.xml              | 16 ++--
 assets/xml/objects/object_big_fwall.xml       |  3 +
 assets/xml/objects/object_bigpo.xml           |  3 +
 assets/xml/objects/object_bji.xml             |  8 +-
 assets/xml/objects/object_boj.xml             |  8 +-
 assets/xml/objects/object_boss02.xml          |  3 +
 assets/xml/objects/object_boss03.xml          |  3 +
 assets/xml/objects/object_dai.xml             |  3 +
 assets/xml/objects/object_fish.xml            |  3 +
 assets/xml/objects/object_fsn.xml             |  6 +-
 assets/xml/objects/object_fz.xml              |  3 +
 assets/xml/objects/object_gi_melody.xml       |  3 +
 assets/xml/objects/object_gla.xml             |  2 +-
 assets/xml/objects/object_hana.xml            |  2 +
 assets/xml/objects/object_ik.xml              | 18 ++---
 assets/xml/objects/object_in.xml              | 74 ++++++++++---------
 assets/xml/objects/object_in2.xml             | 36 ++++-----
 assets/xml/objects/object_kanban.xml          |  3 +
 assets/xml/objects/object_kusa.xml            |  3 +
 assets/xml/objects/object_link_boy.xml        | 19 +++--
 assets/xml/objects/object_link_child.xml      |  3 +
 assets/xml/objects/object_mm.xml              | 22 +++---
 assets/xml/objects/object_mnk.xml             | 12 +--
 assets/xml/objects/object_nwc.xml             |  5 +-
 assets/xml/objects/object_ny.xml              |  3 +
 assets/xml/objects/object_oF1d_map.xml        | 11 ++-
 assets/xml/objects/object_owl.xml             |  6 +-
 assets/xml/objects/object_pamera.xml          | 14 ++--
 assets/xml/objects/object_po.xml              |  3 +
 assets/xml/objects/object_po_composer.xml     |  1 +
 assets/xml/objects/object_rz.xml              | 12 +--
 assets/xml/objects/object_sb.xml              |  3 +
 assets/xml/objects/object_ssh.xml             |  6 +-
 assets/xml/objects/object_st.xml              |  3 +
 assets/xml/objects/object_stream.xml          |  3 +
 assets/xml/objects/object_syokudai.xml        |  2 +
 assets/xml/objects/object_syoten.xml          |  3 +
 assets/xml/objects/object_tab.xml             |  6 +-
 assets/xml/objects/object_trap.xml            |  3 +
 assets/xml/objects/object_tsn.xml             |  4 +-
 assets/xml/objects/object_water_effect.xml    |  3 +
 assets/xml/objects/object_wood02.xml          |  2 +
 assets/xml/objects/object_zo.xml              |  3 +
 assets/xml/objects/object_zoraegg.xml         |  6 +-
 assets/xml/objects/object_zov.xml             | 12 +--
 assets/xml/overlays/ovl_En_Bom.xml            |  4 +-
 assets/xml/overlays/ovl_Obj_Grass.xml         |  2 +
 assets/xml/overlays/ovl_Oceff_Storm.xml       |  2 +
 assets/xml/overlays/ovl_Oceff_Wipe4.xml       |  2 +
 assets/xml/overlays/ovl_Oceff_Wipe6.xml       |  2 +
 assets/xml/overlays/ovl_Oceff_Wipe7.xml       |  2 +
 .../xml/scenes/Z2_00KEIKOKU/Z2_00KEIKOKU.xml  |  2 +
 .../Z2_10YUKIYAMANOMURA.xml                   |  2 +
 .../Z2_10YUKIYAMANOMURA2.xml                  |  2 +
 .../Z2_11GORONNOSATO/Z2_11GORONNOSATO.xml     |  2 +
 .../Z2_11GORONNOSATO2/Z2_11GORONNOSATO2.xml   |  2 +
 .../Z2_12HAKUGINMAE/Z2_12HAKUGINMAE.xml       |  2 +
 .../Z2_14YUKIDAMANOMITI.xml                   |  2 +
 .../xml/scenes/Z2_17SETUGEN/Z2_17SETUGEN.xml  |  2 +
 .../scenes/Z2_17SETUGEN2/Z2_17SETUGEN2.xml    |  2 +
 .../scenes/Z2_20SICHITAI/Z2_20SICHITAI.xml    |  2 +
 .../scenes/Z2_20SICHITAI2/Z2_20SICHITAI2.xml  |  2 +
 .../scenes/Z2_22DEKUCITY/Z2_22DEKUCITY.xml    |  2 +
 .../Z2_24KEMONOMITI/Z2_24KEMONOMITI.xml       |  2 +
 .../Z2_26SARUNOMORI/Z2_26SARUNOMORI.xml       |  2 +
 assets/xml/scenes/Z2_30GYOSON/Z2_30GYOSON.xml |  2 +
 assets/xml/scenes/Z2_31MISAKI/Z2_31MISAKI.xml |  2 +
 .../scenes/Z2_AYASHIISHOP/Z2_AYASHIISHOP.xml  |  2 +
 assets/xml/scenes/Z2_DOUJOU/Z2_DOUJOU.xml     |  2 +
 assets/xml/scenes/Z2_KAJIYA/Z2_KAJIYA.xml     |  2 +
 .../xml/scenes/Z2_ROMANYMAE/Z2_ROMANYMAE.xml  |  2 +
 assets/xml/scenes/Z2_SINKAI/Z2_SINKAI.xml     |  2 +
 .../scenes/Z2_SONCHONOIE/Z2_SONCHONOIE.xml    |  2 +
 assets/xml/scenes/Z2_TORIDE/Z2_TORIDE.xml     |  2 +
 assets/xml/scenes/Z2_YADOYA/Z2_YADOYA.xml     |  2 +
 77 files changed, 295 insertions(+), 153 deletions(-)

diff --git a/assets/xml/code/eff_footmark.xml b/assets/xml/code/eff_footmark.xml
index 2fae1fe16b..c3852d7963 100644
--- a/assets/xml/code/eff_footmark.xml
+++ b/assets/xml/code/eff_footmark.xml
@@ -1,4 +1,7 @@
 <Root>
+    <!-- Dependencies -->
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
+
     <File Name="code" BaseAddress="0x800A5AC0" RangeStart="0x116750" RangeEnd="0x1167E0" OutName="eff_footmark">
         <Array Name="gEffFootprintVtx" Count="3" Offset="0x116750">
             <Vtx/>
diff --git a/assets/xml/objects/gameplay_keep.xml b/assets/xml/objects/gameplay_keep.xml
index 7fa171005a..9e506e48bb 100644
--- a/assets/xml/objects/gameplay_keep.xml
+++ b/assets/xml/objects/gameplay_keep.xml
@@ -1,5 +1,7 @@
 <Root>
+    <!-- Dependencies -->
     <ExternalFile XmlPath="misc/link_animetion.xml" OutPath="assets/misc/link_animetion/"/>
+
     <File Name="gameplay_keep" Segment="4">
         <!-- Bottles -->
         <Texture Name="gBottleTex" OutName="bottle" Format="i4" Width="16" Height="16" Offset="0x0" />
@@ -82,8 +84,8 @@
         <Texture Name="gFierceDeityMaskEarTex" OutName="fierce_deity_mask_ear" Format="ci8" Width="16" Height="16" Offset="0xC6B0" TlutOffset="0xB6B0"/>
         <Texture Name="gFierceDeityMaskHatTex" OutName="fierce_deity_mask_hat" Format="rgba16" Width="8" Height="8" Offset="0xC7B0" />
 
-        <Texture Name="gameplay_keep_Tex_00C830" OutName="tex_00C830" Format="rgba16" Width="16" Height="16" Offset="0xC830" />
-        <Texture Name="gameplay_keep_Tex_00CA30" OutName="tex_00CA30" Format="rgba16" Width="16" Height="16" Offset="0xCA30" />
+        <Texture Name="gHilite1Tex" OutName="hilite_1" Format="rgba16" Width="16" Height="16" Offset="0xC830" />
+        <Texture Name="gHilite2Tex" OutName="hilite_2" Format="rgba16" Width="16" Height="16" Offset="0xCA30" />
 
         <Texture Name="gDekuStickTex" OutName="deku_stick" Format="i8" Width="8" Height="8" Offset="0xCC30" />
 
@@ -1028,7 +1030,7 @@
         <Skeleton Name="gStrayFairySkel" Type="Flex" LimbType="Standard" LimbNone="STRAY_FAIRY_LIMB_NONE" LimbMax="STRAY_FAIRY_LIMB_MAX" EnumName="StrayFairyLimb" Offset="0x2CA98" />
 
         <Texture Name="gameplay_keep_Tex_02CAB0" OutName="tex_02CAB0" Format="i4" Width="16" Height="16" Offset="0x2CAB0" />
-        <Texture Name="gameplay_keep_Tex_02CB30" OutName="tex_02CB30" Format="i8" Width="16" Height="16" Offset="0x2CB30" />
+        <Texture Name="gUnknownCircle4Tex" OutName="unknown_circle_4" Format="i8" Width="16" Height="16" Offset="0x2CB30" />
         <Texture Name="gameplay_keep_Tex_02CC30" OutName="tex_02CC30" Format="rgba16" Width="32" Height="32" Offset="0x2CC30" />
         <Texture Name="gameplay_keep_Tex_02D430" OutName="tex_02D430" Format="i8" Width="32" Height="64" Offset="0x2D430" />
         <Texture Name="gameplay_keep_Tex_02DC30" OutName="tex_02DC30" Format="i8" Width="32" Height="64" Offset="0x2DC30" />
@@ -1091,7 +1093,7 @@
         <Texture Name="gEffHitmarkRed8Tex" OutName="eff_hitmark_red_8" Format="i4" Width="32" Height="24" Offset="0x35590" />
         <DList Name="gEffHitmarkDL" Offset="0x35710" />
         <Texture Name="gameplay_keep_Tex_0357B0" OutName="tex_0357B0" Format="ia8" Width="32" Height="64" Offset="0x357B0" />
-        <Texture Name="gameplay_keep_Tex_035FB0" OutName="tex_035FB0" Format="ia8" Width="32" Height="64" Offset="0x35FB0" />
+        <Texture Name="gEffFleckTex" OutName="eff_tex" Format="i4" Width="64" Height="64" Offset="0x35FB0" />
         <Texture Name="gEffWaterRippleTex" OutName="eff_water_ripple" Format="i8" Width="64" Height="64" Offset="0x367B0" />
         <DList Name="gEffWaterRippleDL" Offset="0x377B0" />
         <DList Name="gEffSparkDL" Offset="0x37850" />
@@ -1426,8 +1428,7 @@
 
         <DList Name="gEffFire1DL" Offset="0x7D590" />
         <DList Name="gEffFire2DL" Offset="0x7D650" />
-        <Texture Name="gEffFireMask1Tex" OutName="eff_fire_mask_1" Format="i4" Width="32" Height="64" Offset="0x7D710" />
-        <Texture Name="gEffFireMask2Tex" OutName="eff_fire_mask_2" Format="i4" Width="32" Height="64" Offset="0x7DB10" />
+        <Texture Name="gEffFireMaskTex" OutName="eff_fire_mask" Format="i4" Width="32" Height="128" Offset="0x7D710" />
         <Texture Name="gEffFireTex" OutName="eff_fire" Format="i8" Width="32" Height="64" Offset="0x7DF10" />
         <DList Name="gameplay_keep_DL_07E8C0" Offset="0x7E8C0" />
         <Texture Name="gameplay_keep_Tex_07EA08" OutName="tex_07EA08" Format="i8" Width="32" Height="64" Offset="0x7EA08" />
diff --git a/assets/xml/objects/object_bg.xml b/assets/xml/objects/object_bg.xml
index bd12e989fd..847fb1d1f1 100644
--- a/assets/xml/objects/object_bg.xml
+++ b/assets/xml/objects/object_bg.xml
@@ -27,11 +27,11 @@
         <Texture Name="gTreasureChestShopGalTLUT" OutName="treasure_cheat_shop_gal_tlut" Format="rgba16" Width="16" Height="16" Offset="0x68D8" />
         <Texture Name="gTreasureChestShopGalHairTex" OutName="treasure_cheat_shop_gal_hair" Format="ci8" Width="32" Height="32" Offset="0x6AD8" TlutOffset="0x68D8"/>
         <Texture Name="gTreasureChestShopGalHair2Tex" OutName="treasure_cheat_shop_gal_hair2" Format="ci8" Width="8" Height="16" Offset="0x6ED8" TlutOffset="0x68D8"/>
-        <Texture Name="gTreasureChestShopGalEyeOpenUpTex" OutName="treasure_cheat_shop_gal_eye_open_up" Format="ci8" Width="32" Height="32" Offset="0x6F58" />
-        <Texture Name="gTreasureChestShopGalEyeHalfUpTex" OutName="treasure_cheat_shop_gal_eye_half_up" Format="ci8" Width="32" Height="32" Offset="0x7358" />
-        <Texture Name="gTreasureChestShopGalEyeClosedTex" OutName="treasure_cheat_shop_gal_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x7758" />
-        <Texture Name="gTreasureChestShopGalEyeOpenDownTex" OutName="treasure_cheat_shop_gal_eye_open_down" Format="ci8" Width="32" Height="32" Offset="0x7B58" />
-        <Texture Name="gTreasureChestShopGalEyeHalfDownTex" OutName="treasure_cheat_shop_gal_eye_half_down" Format="ci8" Width="32" Height="32" Offset="0x7F58" />
+        <Texture Name="gTreasureChestShopGalEyeOpenUpTex" OutName="treasure_cheat_shop_gal_eye_open_up" Format="ci8" Width="32" Height="32" Offset="0x6F58" TlutOffset="0x68D8"/>
+        <Texture Name="gTreasureChestShopGalEyeHalfUpTex" OutName="treasure_cheat_shop_gal_eye_half_up" Format="ci8" Width="32" Height="32" Offset="0x7358" TlutOffset="0x68D8"/>
+        <Texture Name="gTreasureChestShopGalEyeClosedTex" OutName="treasure_cheat_shop_gal_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x7758" TlutOffset="0x68D8"/>
+        <Texture Name="gTreasureChestShopGalEyeOpenDownTex" OutName="treasure_cheat_shop_gal_eye_open_down" Format="ci8" Width="32" Height="32" Offset="0x7B58" TlutOffset="0x68D8"/>
+        <Texture Name="gTreasureChestShopGalEyeHalfDownTex" OutName="treasure_cheat_shop_gal_eye_half_down" Format="ci8" Width="32" Height="32" Offset="0x7F58" TlutOffset="0x68D8"/>
         <Texture Name="gTreasureChestShopGalMouthTex" OutName="treasure_cheat_shop_gal_mouth" Format="ci8" Width="32" Height="32" Offset="0x8358" TlutOffset="0x68D8"/>
         <Texture Name="gTreasureChestShopGalEarAndBellyButtonTex" OutName="treasure_cheat_shop_gal_ear_and_belly_button" Format="ci8" Width="16" Height="16" Offset="0x8758" TlutOffset="0x68D8"/>
         <Texture Name="gTreasureChestShopGalSkinTex" OutName="treasure_cheat_shop_gal_skin" Format="ci8" Width="16" Height="16" Offset="0x8858" TlutOffset="0x68D8"/>
@@ -93,9 +93,9 @@
         
         <!-- Mayor's receptionist Textures -->
         <Texture Name="object_bg_TLUT_00F6F0" OutName="tlut_00F6F0" Format="rgba16" Width="16" Height="16" Offset="0xF6F0" />
-        <Texture Name="object_bg_Tex_00F8F0" OutName="tex_00F8F0" Format="ci8" Width="32" Height="32" Offset="0xF8F0" />
-        <Texture Name="object_bg_Tex_00FCF0" OutName="tex_00FCF0" Format="ci8" Width="32" Height="32" Offset="0xFCF0" />
-        <Texture Name="object_bg_Tex_0100F0" OutName="tex_0100F0" Format="ci8" Width="32" Height="32" Offset="0x100F0" />
+        <Texture Name="object_bg_Tex_00F8F0" OutName="tex_00F8F0" Format="ci8" Width="32" Height="32" Offset="0xF8F0" TlutOffset="0xF6F0"/>
+        <Texture Name="object_bg_Tex_00FCF0" OutName="tex_00FCF0" Format="ci8" Width="32" Height="32" Offset="0xFCF0" TlutOffset="0xF6F0"/>
+        <Texture Name="object_bg_Tex_0100F0" OutName="tex_0100F0" Format="ci8" Width="32" Height="32" Offset="0x100F0" TlutOffset="0xF6F0"/>
         <Texture Name="object_bg_Tex_0104F0" OutName="tex_0104F0" Format="ci8" Width="16" Height="32" Offset="0x104F0" TlutOffset="0xF6F0"/>
         <Texture Name="object_bg_Tex_0106F0" OutName="tex_0106F0" Format="ci8" Width="16" Height="16" Offset="0x106F0" TlutOffset="0xF6F0"/>
         <Texture Name="object_bg_Tex_0107F0" OutName="tex_0107F0" Format="ci8" Width="64" Height="32" Offset="0x107F0" TlutOffset="0xF6F0"/>
diff --git a/assets/xml/objects/object_big_fwall.xml b/assets/xml/objects/object_big_fwall.xml
index f1becbe8ef..224377ea5c 100644
--- a/assets/xml/objects/object_big_fwall.xml
+++ b/assets/xml/objects/object_big_fwall.xml
@@ -1,4 +1,7 @@
 <Root>
+    <!-- Dependencies -->
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
+
     <!-- Ring Of Fire used during Garo's encounters -->
     <File Name="object_big_fwall" Segment="6">
         <Texture Name="gRingOfFireTex" OutName="ring_of_fire" Format="i8" Width="32" Height="64" Offset="0x0" />
diff --git a/assets/xml/objects/object_bigpo.xml b/assets/xml/objects/object_bigpo.xml
index fbde9e8e58..0bbe8c81db 100644
--- a/assets/xml/objects/object_bigpo.xml
+++ b/assets/xml/objects/object_bigpo.xml
@@ -1,4 +1,7 @@
 <Root>
+    <!-- Dependencies -->
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
+
     <!-- Assets for Big Poes -->
     <File Name="object_bigpo" Segment="6">
         <Animation Name="gBigPoeSwingLampAttackAnim" Offset="0x158" /> <!-- Original name is "pog_atack" -->
diff --git a/assets/xml/objects/object_bji.xml b/assets/xml/objects/object_bji.xml
index 937687bbde..9bf5119995 100644
--- a/assets/xml/objects/object_bji.xml
+++ b/assets/xml/objects/object_bji.xml
@@ -25,7 +25,7 @@
         <Texture Name="object_bji_TLUT_003B30" OutName="tlut_003B30" Format="rgba16" Width="16" Height="16" Offset="0x3B30" />
         <Texture Name="object_bji_TLUT_003D30" OutName="tlut_003D30" Format="rgba16" Width="16" Height="16" Offset="0x3D30" />
         <Texture Name="object_bji_TLUT_003F30" OutName="tlut_003F30" Format="rgba16" Width="16" Height="16" Offset="0x3F30" />
-        <Texture Name="object_bji_Tex_004130" OutName="tex_004130" Format="rgba16" Width="16" Height="16" Offset="0x4130" />
+        <Texture Name="object_bji_TLUT_004130" OutName="tlut_004130" Format="rgba16" Width="16" Height="16" Offset="0x4130"/>
         <Texture Name="object_bji_TLUT_004330" OutName="tlut_004330" Format="rgba16" Width="16" Height="16" Offset="0x4330" />
         <Texture Name="object_bji_TLUT_004530" OutName="tlut_004530" Format="rgba16" Width="16" Height="16" Offset="0x4530" />
         <Texture Name="object_bji_Tex_004730" OutName="tex_004730" Format="ci8" Width="8" Height="8" Offset="0x4730" TlutOffset="0x3730"/>
@@ -33,11 +33,11 @@
         <Texture Name="object_bji_Tex_004870" OutName="tex_004870" Format="ci8" Width="8" Height="8" Offset="0x4870" TlutOffset="0x3B30"/>
         <Texture Name="object_bji_Tex_0048B0" OutName="tex_0048B0" Format="ci8" Width="16" Height="16" Offset="0x48B0" TlutOffset="0x3D30"/>
         <Texture Name="object_bji_Tex_0049B0" OutName="tex_0049B0" Format="ci8" Width="8" Height="8" Offset="0x49B0" TlutOffset="0x3F30"/>
-        <Texture Name="object_bji_Tex_0049F0" OutName="tex_0049F0" Format="ci8" Width="32" Height="32" Offset="0x49F0" />
+        <Texture Name="object_bji_Tex_0049F0" OutName="tex_0049F0" Format="ci8" Width="32" Height="32" Offset="0x49F0" TlutOffset="0x4130"/>
         <Texture Name="object_bji_Tex_004DF0" OutName="tex_004DF0" Format="ci8" Width="8" Height="8" Offset="0x4DF0" TlutOffset="0x4330"/>
         <Texture Name="object_bji_Tex_004E30" OutName="tex_004E30" Format="ci8" Width="8" Height="8" Offset="0x4E30" TlutOffset="0x4530"/>
-        <Texture Name="object_bji_Tex_004E70" OutName="tex_004E70" Format="ci8" Width="32" Height="32" Offset="0x4E70" />
-        <Texture Name="object_bji_Tex_005270" OutName="tex_005270" Format="ci8" Width="32" Height="32" Offset="0x5270" />
+        <Texture Name="object_bji_Tex_004E70" OutName="tex_004E70" Format="ci8" Width="32" Height="32" Offset="0x4E70" TlutOffset="0x4130"/>
+        <Texture Name="object_bji_Tex_005270" OutName="tex_005270" Format="ci8" Width="32" Height="32" Offset="0x5270" TlutOffset="0x4130"/>
         
         <!-- Unused Eye Texture Animation -->
         <TextureAnimation Name="gShikashiEyeTexAnim" Offset="0x5694" />
diff --git a/assets/xml/objects/object_boj.xml b/assets/xml/objects/object_boj.xml
index f5882302fb..4fe3f0e017 100644
--- a/assets/xml/objects/object_boj.xml
+++ b/assets/xml/objects/object_boj.xml
@@ -20,9 +20,9 @@
         <Texture Name="object_boj_Tex_006030" OutName="tex_006030" Format="ci8" Width="8" Height="8" Offset="0x6030" TlutOffset="0x5DB0"/>
         <Texture Name="object_boj_Tex_006070" OutName="tex_006070" Format="ci8" Width="32" Height="16" Offset="0x6070" TlutOffset="0x5DB0"/>
         <Texture Name="object_boj_Tex_006270" OutName="tex_006270" Format="ci8" Width="8" Height="8" Offset="0x6270" TlutOffset="0x5DB0"/>
-        <Texture Name="object_boj_Tex_0062B0" OutName="tex_0062B0" Format="ci8" Width="16" Height="16" Offset="0x62B0" />
-        <Texture Name="object_boj_Tex_0063B0" OutName="tex_0063B0" Format="ci8" Width="16" Height="16" Offset="0x63B0" />
-        <Texture Name="object_boj_Tex_0064B0" OutName="tex_0064B0" Format="ci8" Width="16" Height="16" Offset="0x64B0" />
+        <Texture Name="object_boj_Tex_0062B0" OutName="tex_0062B0" Format="ci8" Width="16" Height="16" Offset="0x62B0" TlutOffset="0x5DB0"/>
+        <Texture Name="object_boj_Tex_0063B0" OutName="tex_0063B0" Format="ci8" Width="16" Height="16" Offset="0x63B0" TlutOffset="0x5DB0"/>
+        <Texture Name="object_boj_Tex_0064B0" OutName="tex_0064B0" Format="ci8" Width="16" Height="16" Offset="0x64B0" TlutOffset="0x5DB0"/>
         <Texture Name="object_boj_Tex_0065B0" OutName="tex_0065B0" Format="ci8" Width="8" Height="8" Offset="0x65B0" TlutOffset="0x5DB0"/>
         <Texture Name="object_boj_Tex_0065F0" OutName="tex_0065F0" Format="i8" Width="16" Height="16" Offset="0x65F0" />
         <Texture Name="object_boj_Tex_0066F0" OutName="tex_0066F0" Format="ci8" Width="8" Height="8" Offset="0x66F0" TlutOffset="0x5DB0"/>
@@ -42,7 +42,7 @@
         <DList Name="object_boj_DL_009448" Offset="0x9448" />
         <DList Name="object_boj_DL_009558" Offset="0x9558" />
         <DList Name="object_boj_DL_009660" Offset="0x9660" />
-        <!-- <Blob Name="object_boj_Blob_009848" Size="0x1F8" Offset="0x9848" /> -->
+        <Texture Name="object_boj_TLUT_009848" OutName="tlut_009848" Format="rgba16" Width="252" Height="1" Offset="0x9848" />
         <Texture Name="object_boj_Tex_009A40" OutName="tex_009A40" Format="ci8" Width="8" Height="8" Offset="0x9A40" TlutOffset="0x9848"/>
         <Texture Name="object_boj_Tex_009A80" OutName="tex_009A80" Format="ci8" Width="16" Height="16" Offset="0x9A80" TlutOffset="0x9848"/>
         <Texture Name="object_boj_Tex_009B80" OutName="tex_009B80" Format="ci8" Width="16" Height="16" Offset="0x9B80" TlutOffset="0x9848"/>
diff --git a/assets/xml/objects/object_boss02.xml b/assets/xml/objects/object_boss02.xml
index bf06a9e847..a1c454b796 100644
--- a/assets/xml/objects/object_boss02.xml
+++ b/assets/xml/objects/object_boss02.xml
@@ -1,4 +1,7 @@
 <Root>
+    <!-- Dependencies -->
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
+
     <!-- Assets for the Twinmold boss fight (Twinmold itself, the props in its arena, its title card, etc.)-->
     <File Name="object_boss02" Segment="6">
         <!-- DisplayLists and Textures for the dust that appears wherever Twinmold contacts the ground -->
diff --git a/assets/xml/objects/object_boss03.xml b/assets/xml/objects/object_boss03.xml
index 60849f4427..683067cce3 100644
--- a/assets/xml/objects/object_boss03.xml
+++ b/assets/xml/objects/object_boss03.xml
@@ -1,4 +1,7 @@
 <Root>
+    <!-- Dependencies -->
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
+
     <!-- 
         Gyorg, his title card, the small fishes he summons, the seaweed in his boss arena,
         and the bubbles in his intro cutscene. Also contains an unused copy of Majora's Wrath's
diff --git a/assets/xml/objects/object_dai.xml b/assets/xml/objects/object_dai.xml
index 14ddfa5d2e..fc8aef1f9d 100644
--- a/assets/xml/objects/object_dai.xml
+++ b/assets/xml/objects/object_dai.xml
@@ -1,4 +1,7 @@
 <Root>
+    <!-- Dependencies -->
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
+
     <File Name="object_dai" Segment="6">
         <Texture Name="object_dai_Tex_000000" OutName="tex_000000" Format="i4" Width="32" Height="32" Offset="0x0" />
         <DList Name="object_dai_DL_000230" Offset="0x230" />
diff --git a/assets/xml/objects/object_fish.xml b/assets/xml/objects/object_fish.xml
index 318cb53d5f..32b3eef710 100644
--- a/assets/xml/objects/object_fish.xml
+++ b/assets/xml/objects/object_fish.xml
@@ -1,4 +1,7 @@
 <Root>
+    <!-- Dependencies -->
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
+
     <!-- Assets for fishing -->
     <File Name="object_fish" Segment="6">
 
diff --git a/assets/xml/objects/object_fsn.xml b/assets/xml/objects/object_fsn.xml
index 6f0472637a..e89b75b8b4 100644
--- a/assets/xml/objects/object_fsn.xml
+++ b/assets/xml/objects/object_fsn.xml
@@ -37,14 +37,14 @@
         <Texture Name="gFsnPantsTex" OutName="fsn_pants" Format="rgba16" Width="16" Height="16" Offset="0x56C0" />
         <Texture Name="gFsnBootsTex" OutName="fsn_boots" Format="rgba16" Width="16" Height="16" Offset="0x58C0" />
         <Texture Name="gFsnHairTex" OutName="fsn_hair" Format="ci8" Width="16" Height="16" Offset="0x5AC0" TlutOffset="0x4900"/>
-        <Texture Name="gFsnEyeOpenTex" OutName="fsn_eye_open" Format="ci8" Width="32" Height="32" Offset="0x5BC0" /> 
+        <Texture Name="gFsnEyeOpenTex" OutName="fsn_eye_open" Format="ci8" Width="32" Height="32" Offset="0x5BC0" TlutOffset="0x4B00"/>
         <Texture Name="gFsnEarTex" OutName="fsn_ear" Format="ci8" Width="8" Height="8" Offset="0x5FC0" TlutOffset="0x4D00"/>
         <Texture Name="gFsnHairSkinTex" OutName="fsn_hair_and_skin" Format="ci8" Width="16" Height="16" Offset="0x6000" TlutOffset="0x4F00"/>
         <Texture Name="gFsnMouthTex" OutName="fsn_mouth" Format="ci8" Width="32" Height="32" Offset="0x6100" TlutOffset="0x5100"/>
         <Texture Name="gFsnNostrilTex" OutName="fsn_nostril" Format="ci8" Width="8" Height="8" Offset="0x6500" TlutOffset="0x5300"/>
         <Texture Name="gFsnVestTex" OutName="fsn_vest" Format="rgba16" Width="32" Height="32" Offset="0x6540" />
-        <Texture Name="gFsnEyeHalfTex" OutName="fsn_eye_half" Format="ci8" Width="32" Height="32" Offset="0x6D40" />
-        <Texture Name="gFsnEyeClosedTex" OutName="fsn_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x7140" />
+        <Texture Name="gFsnEyeHalfTex" OutName="fsn_eye_half" Format="ci8" Width="32" Height="32" Offset="0x6D40" TlutOffset="0x4B00"/>
+        <Texture Name="gFsnEyeClosedTex" OutName="fsn_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x7140" TlutOffset="0x4B00"/>
         
         <!-- Unused -->
         <!-- <Blob Name="object_fsn_Blob_007540" Size="0x1100" Offset="0x7540" /> -->
diff --git a/assets/xml/objects/object_fz.xml b/assets/xml/objects/object_fz.xml
index 1c90f5f596..f396c0a614 100644
--- a/assets/xml/objects/object_fz.xml
+++ b/assets/xml/objects/object_fz.xml
@@ -1,4 +1,7 @@
 <Root>
+    <!-- Dependencies -->
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
+
     <File Name="object_fz" Segment="6">
         <DList Name="gFreezardBodyIntactDL" Offset="0x1130" />
         <DList Name="gFreezardBodyHornBrokenDL" Offset="0x21A0" />
diff --git a/assets/xml/objects/object_gi_melody.xml b/assets/xml/objects/object_gi_melody.xml
index 4d4696528f..409cf1b208 100644
--- a/assets/xml/objects/object_gi_melody.xml
+++ b/assets/xml/objects/object_gi_melody.xml
@@ -1,4 +1,7 @@
 <Root>
+    <!-- Dependencies -->
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
+
     <!-- Get Item Draw: OoT Songs -->
     <File Name="object_gi_melody" Segment="6">
 
diff --git a/assets/xml/objects/object_gla.xml b/assets/xml/objects/object_gla.xml
index a59fe79e3f..21e3887d36 100644
--- a/assets/xml/objects/object_gla.xml
+++ b/assets/xml/objects/object_gla.xml
@@ -31,7 +31,7 @@
         <Texture Name="gGerudoPurpleSkinEdgeTex" OutName="gerudo_purple_skin_edge" Format="ci8" Width="8" Height="8" Offset="0x5328" TlutOffset="0x5178" />
         <Texture Name="gGerudoPurpleEarTex" OutName="gerudo_purple_ear" Format="ci8" Width="8" Height="16" Offset="0x5368" TlutOffset="0x5178" />
         <Texture Name="gGerudoPurpleEyeOpenTex" OutName="gerudo_purple_eye_open" Format="ci8" Width="32" Height="32" Offset="0x53E8" TlutOffset="0x5178" />
-        <Texture Name="gGerudoPurpleGlaiveGuardTex" OutName="gerudo_purple_glaive_guard" Format="ci8" Width="8" Height="8" Offset="0x57E8" />
+        <Texture Name="gGerudoPurpleGlaiveGuardTex" OutName="gerudo_purple_glaive_guard" Format="ci8" Width="8" Height="8" Offset="0x57E8" TlutOffset="0x5178"/>
         <Texture Name="gGerudoPurpleGlaiveBladeFabricPatternTex" OutName="gerudo_purple_fabric_pattern" Format="i8" Width="16" Height="16" Offset="0x5828" />
         <Texture Name="gGerudoPurpleShoeUpperTex" OutName="gerudo_purple_shoe_upper" Format="ci8" Width="8" Height="16" Offset="0x5928" TlutOffset="0x5178" />
         <Texture Name="gGerudoPurpleGlaiveHaftShoeSoleTex" OutName="gerudo_purple_glaive_haft_shoe_sole" Format="ci8" Width="8" Height="8" Offset="0x59A8" TlutOffset="0x5178" />
diff --git a/assets/xml/objects/object_hana.xml b/assets/xml/objects/object_hana.xml
index 79593345aa..975897ef2e 100644
--- a/assets/xml/objects/object_hana.xml
+++ b/assets/xml/objects/object_hana.xml
@@ -1,5 +1,7 @@
 <Root>
+    <!-- Dependencies -->
     <ExternalFile XmlPath="objects/gameplay_field_keep.xml" OutPath="assets/objects/gameplay_field_keep/"/>
+
     <!-- Assets for the orange graveyard flowers -->
     <File Name="object_hana" Segment="6">
         <!-- Each of these is a single flower out of the 3 -->
diff --git a/assets/xml/objects/object_ik.xml b/assets/xml/objects/object_ik.xml
index f377df59c8..685e786c35 100644
--- a/assets/xml/objects/object_ik.xml
+++ b/assets/xml/objects/object_ik.xml
@@ -53,8 +53,8 @@
         <DList Name="gIronKnuckleWaistArmorRightDL" Offset="0x106E0" />
         <Texture Name="gIronKnuckleChainMailTLUT" OutName="iron_knuckle_chain_mail_tlut" Format="rgba16" Width="16" Height="16" Offset="0x10A30" />
         <Texture Name="gIronKnuckleRivet1Tex" OutName="iron_knuckle_rivet_1" Format="ia16" Width="16" Height="16" Offset="0x10C30" />
-        <Texture Name="gIronKnuckleHair1Tex" OutName="iron_knuckle_hair_1" Format="ci8" Width="16" Height="16" Offset="0x10E30" />
-        <Texture Name="gIronKnuckleAxePomelJewel1Tex" OutName="iron_knuckle_axe_pomel_1_jewel" Format="ci8" Width="16" Height="16" Offset="0x10F30" />
+        <Texture Name="gIronKnuckleHair1Tex" OutName="iron_knuckle_hair_1" Format="ci8" Width="16" Height="16" Offset="0x10E30" TlutOffset="0x10A30"/>
+        <Texture Name="gIronKnuckleAxePomelJewel1Tex" OutName="iron_knuckle_axe_pomel_1_jewel" Format="ci8" Width="16" Height="16" Offset="0x10F30" TlutOffset="0x10A30"/>
         <Texture Name="gIronKnuckleAxeTLUT" OutName="iron_knuckle_axe_tlut" Format="rgba16" Width="8" Height="23" Offset="0x11030" />
         <Texture Name="gIronKnuckleFireTex" OutName="iron_knuckle_fire" Format="i4" Width="32" Height="64" Offset="0x111A0" />
         <Texture Name="gIronKnuckleRivet2Tex" OutName="iron_knuckle_rivet_2" Format="ia8" Width="32" Height="32" Offset="0x115A0" />
@@ -62,15 +62,15 @@
         <Texture Name="gIronKnuckleChainMailTex" OutName="iron_knuckle_chain_mail" Format="rgba16" Width="16" Height="16" Offset="0x11BA0" />
         <Texture Name="gIronKnuckleArmorEmblemTex" OutName="iron_knuckle_emblem" Format="ia16" Width="32" Height="32" Offset="0x11DA0" />
         <Texture Name="gIronKnuckleGerudoEyeTex" OutName="iron_knuckle_gerudo_eye" Format="rgba16" Width="32" Height="32" Offset="0x125A0" />
-        <Texture Name="gIronKnuckleChestJewelTex" OutName="iron_knuckle_chest_jewel" Format="ci8" Width="16" Height="16" Offset="0x12DA0" />
+        <Texture Name="gIronKnuckleChestJewelTex" OutName="iron_knuckle_chest_jewel" Format="ci8" Width="16" Height="16" Offset="0x12DA0" TlutOffset="0x11030"/>
         <Texture Name="gIronKnuckleArmorRivet2Tex" OutName="iron_knuckle_armor_rivet_2" Format="ia8" Width="16" Height="16" Offset="0x12EA0" />
         <Texture Name="gIronKnuckleArmorTLUT" OutName="iron_knuckle_armor_tlut" Format="rgba16" Width="8" Height="15" Offset="0x12FA0" />
-        <Texture Name="gIronKnuckleForeheadJewelTex" OutName="iron_knuckle_forehead_jewel" Format="ci8" Width="16" Height="16" Offset="0x13090" />
-        <Texture Name="gIronKnuckleGerudoSkinTex" OutName="iron_knuckle_gerudo_skin" Format="ci8" Width="8" Height="8" Offset="0x13190" />
-        <Texture Name="gIronKnuckleHair2Tex" OutName="iron_knuckle_hair_2" Format="ci8" Width="16" Height="16" Offset="0x131D0" />
-        <Texture Name="gIronKnuckleEarTex" OutName="iron_knuckle_ear" Format="ci8" Width="8" Height="16" Offset="0x132D0" />
-        <Texture Name="gIronKnuckleForeheadDecal1Tex" OutName="iron_knuckle_forehead_decal_1" Format="ci8" Width="8" Height="16" Offset="0x13350" />
-        <Texture Name="gIronKnuckleForeheadDecal2Tex" OutName="iron_knuckle_forehead_decal_2" Format="ci8" Width="16" Height="16" Offset="0x133D0" />
+        <Texture Name="gIronKnuckleForeheadJewelTex" OutName="iron_knuckle_forehead_jewel" Format="ci8" Width="16" Height="16" Offset="0x13090" TlutOffset="0x12FA0"/>
+        <Texture Name="gIronKnuckleGerudoSkinTex" OutName="iron_knuckle_gerudo_skin" Format="ci8" Width="8" Height="8" Offset="0x13190" TlutOffset="0x12FA0"/>
+        <Texture Name="gIronKnuckleHair2Tex" OutName="iron_knuckle_hair_2" Format="ci8" Width="16" Height="16" Offset="0x131D0" TlutOffset="0x12FA0"/>
+        <Texture Name="gIronKnuckleEarTex" OutName="iron_knuckle_ear" Format="ci8" Width="8" Height="16" Offset="0x132D0" TlutOffset="0x12FA0"/>
+        <Texture Name="gIronKnuckleForeheadDecal1Tex" OutName="iron_knuckle_forehead_decal_1" Format="ci8" Width="8" Height="16" Offset="0x13350" TlutOffset="0x12FA0"/>
+        <Texture Name="gIronKnuckleForeheadDecal2Tex" OutName="iron_knuckle_forehead_decal_2" Format="ci8" Width="16" Height="16" Offset="0x133D0" TlutOffset="0x12FA0"/>
         <Limb Name="gIronKnuckleRootLimb" Type="Standard" EnumName="IRON_KNUCKLE_LIMB_ROOT" Offset="0x134D0" />
         <Limb Name="gIronKnuckleTassetCenterLimb" EnumName="IRON_KNUCKLE_LIMB_TASSET_CENTER" Type="Standard" Offset="0x134DC" />
         <Limb Name="gIronKnuckleTassetRightLimb" EnumName="IRON_KNUCKLE_LIMB_TASSET_RIGHT" Type="Standard" Offset="0x134E8" />
diff --git a/assets/xml/objects/object_in.xml b/assets/xml/objects/object_in.xml
index ee7ceb3a05..9213e49dbe 100644
--- a/assets/xml/objects/object_in.xml
+++ b/assets/xml/objects/object_in.xml
@@ -5,22 +5,26 @@
         <Animation Name="object_in_Anim_001BE0" Offset="0x1BE0" /> <!-- Original name is "in2_kuyasii" -->
         <TextureAnimation Name="object_in_Matanimheader_001C30" Offset="0x1C30" />
         <Animation Name="object_in_Anim_001D10" Offset="0x1D10" /> <!-- Original name is "in_matsu1" -->
-        <!-- <Blob Name="object_in_Blob_001D20" Size="0x1738" Offset="0x1D20" /> -->
-        <Texture Name="object_in_Tex_003520" OutName="tex_003520" Format="ci8" Width="8" Height="8" Offset="0x3520" />
-        <Texture Name="object_in_Tex_0035E0" OutName="tex_0035E0" Format="ci8" Width="32" Height="32" Offset="0x35E0" />
+        <!-- <Blob Name="object_in_Blob_001D20" Size="0x1540" Offset="0x1D20"/> -->
+        <Texture Name="object_in_TLUT_003260" OutName="tlut_003260" Format="rgba16" Width="252" Height="1" Offset="0x3260"/>
+        <Texture Name="object_in_TLUT_003458" OutName="tlut_003458" Format="rgba16" Width="100" Height="1" Offset="0x3458"/>
+        <Texture Name="object_in_Tex_003520" OutName="tex_003520" Format="ci8" Width="8" Height="8" Offset="0x3520" TlutOffset="0x3260"/>
+        <Texture Name="object_in_Tex_003560" OutName="tex_003560" Format="ci8" Width="8" Height="8" Offset="0x3560" TlutOffset="0x3458"/>
+        <Texture Name="object_in_Tex_0035A0" OutName="tex_0035A0" Format="ci8" Width="8" Height="8" Offset="0x35A0" TlutOffset="0x3458"/>
+        <Texture Name="object_in_Tex_0035E0" OutName="tex_0035E0" Format="ci8" Width="32" Height="32" Offset="0x35E0" TlutOffset="0x3260"/>
         <Texture Name="object_in_Tex_0039E0" OutName="tex_0039E0" Format="rgba16" Width="16" Height="16" Offset="0x39E0" />
-        <Texture Name="object_in_Tex_003BE0" OutName="tex_003BE0" Format="ci8" Width="16" Height="16" Offset="0x3BE0" />
-        <Texture Name="object_in_Tex_003CE0" OutName="tex_003CE0" Format="ci8" Width="16" Height="16" Offset="0x3CE0" />
+        <Texture Name="object_in_Tex_003BE0" OutName="tex_003BE0" Format="ci8" Width="16" Height="16" Offset="0x3BE0" TlutOffset="0x3458"/>
+        <Texture Name="object_in_Tex_003CE0" OutName="tex_003CE0" Format="ci8" Width="16" Height="16" Offset="0x3CE0" TlutOffset="0x3458"/>
         <Texture Name="object_in_Tex_003DE0" OutName="tex_003DE0" Format="i8" Width="8" Height="8" Offset="0x3DE0" />
         <Texture Name="object_in_Tex_003E20" OutName="tex_003E20" Format="rgba16" Width="8" Height="16" Offset="0x3E20" />
-        <Texture Name="object_in_Tex_003F20" OutName="tex_003F20" Format="ci8" Width="16" Height="32" Offset="0x3F20" />
+        <Texture Name="object_in_Tex_003F20" OutName="tex_003F20" Format="ci8" Width="16" Height="32" Offset="0x3F20" TlutOffset="0x3458"/>
         <Texture Name="object_in_Tex_004120" OutName="tex_004120" Format="rgba16" Width="8" Height="16" Offset="0x4120" />
-        <Texture Name="object_in_Tex_004220" OutName="tex_004220" Format="ci8" Width="8" Height="16" Offset="0x4220" />
-        <Texture Name="object_in_Tex_0042A0" OutName="tex_0042A0" Format="ci8" Width="16" Height="16" Offset="0x42A0" />
-        <Texture Name="object_in_Tex_0043E0" OutName="tex_0043E0" Format="ci8" Width="32" Height="32" Offset="0x43E0" />
-        <Texture Name="object_in_Tex_0047E0" OutName="tex_0047E0" Format="ci8" Width="8" Height="8" Offset="0x47E0" />
-        <Texture Name="object_in_Tex_004820" OutName="tex_004820" Format="ci8" Width="32" Height="32" Offset="0x4820" />
-        <Texture Name="object_in_Tex_004C20" OutName="tex_004C20" Format="ci8" Width="32" Height="32" Offset="0x4C20" />
+        <Texture Name="object_in_Tex_004220" OutName="tex_004220" Format="ci8" Width="8" Height="16" Offset="0x4220" TlutOffset="0x3458"/>
+        <Texture Name="object_in_Tex_0042A0" OutName="tex_0042A0" Format="ci8" Width="16" Height="16" Offset="0x42A0" TlutOffset="0x3458"/>
+        <Texture Name="object_in_Tex_0043E0" OutName="tex_0043E0" Format="ci8" Width="32" Height="32" Offset="0x43E0" TlutOffset="0x3260"/>
+        <Texture Name="object_in_Tex_0047E0" OutName="tex_0047E0" Format="ci8" Width="8" Height="8" Offset="0x47E0" TlutOffset="0x3458"/>
+        <Texture Name="object_in_Tex_004820" OutName="tex_004820" Format="ci8" Width="32" Height="32" Offset="0x4820" TlutOffset="0x3260"/>
+        <Texture Name="object_in_Tex_004C20" OutName="tex_004C20" Format="ci8" Width="32" Height="32" Offset="0x4C20" TlutOffset="0x3260"/>
         <DList Name="object_in_DL_006780" Offset="0x6780" />
         <DList Name="object_in_DL_0073E8" Offset="0x73E8" />
         <DList Name="object_in_DL_007510" Offset="0x7510" />
@@ -46,10 +50,10 @@
         <Texture Name="object_in_TLUT_00C078" OutName="tlut_00C078" Format="rgba16" Width="16" Height="16" Offset="0xC078" />
         <Texture Name="object_in_TLUT_00C278" OutName="tlut_00C278" Format="rgba16" Width="16" Height="16" Offset="0xC278" />
         <!-- <Blob Name="object_in_Blob_00C478" Size="0x200" Offset="0xC478" /> -->
-        <Texture Name="object_in_Tex_00C678" OutName="tex_00C678" Format="ci8" Width="8" Height="8" Offset="0xC678" />
+        <Texture Name="object_in_Tex_00C678" OutName="tex_00C678" Format="ci8" Width="8" Height="8" Offset="0xC678" TlutOffset="0xBA78"/>
         <!-- <Blob Name="object_in_Blob_00C6B8" Size="0x640" Offset="0xC6B8" /> -->
-        <Texture Name="object_in_Tex_00CCF8" OutName="tex_00CCF8" Format="ci8" Width="16" Height="32" Offset="0xCCF8" />
-        <Texture Name="object_in_Tex_00CEF8" OutName="tex_00CEF8" Format="ci8" Width="16" Height="16" Offset="0xCEF8" />
+        <Texture Name="object_in_Tex_00CCF8" OutName="tex_00CCF8" Format="ci8" Width="16" Height="32" Offset="0xCCF8" TlutOffset="0xC078"/>
+        <Texture Name="object_in_Tex_00CEF8" OutName="tex_00CEF8" Format="ci8" Width="16" Height="16" Offset="0xCEF8" TlutOffset="0xC278"/>
         <!-- <Blob Name="object_in_Blob_00CFF8" Size="0x100" Offset="0xCFF8" /> -->
         <Texture Name="object_in_Tex_00D0F8" OutName="tex_00D0F8" Format="i8" Width="8" Height="8" Offset="0xD0F8" />
         <Texture Name="object_in_Tex_00D138" OutName="tex_00D138" Format="i8" Width="32" Height="32" Offset="0xD138" />
@@ -57,24 +61,24 @@
         <Texture Name="object_in_Tex_00D578" OutName="tex_00D578" Format="i8" Width="8" Height="8" Offset="0xD578" />
         <Texture Name="object_in_TLUT_00D5B8" OutName="tlut_00D5B8" Format="rgba16" Width="16" Height="16" Offset="0xD5B8" />
         <Texture Name="object_in_Tex_00D7B8" OutName="tex_00D7B8" Format="rgba16" Width="16" Height="16" Offset="0xD7B8" />
-        <Texture Name="object_in_Tex_00D9B8" OutName="tex_00D9B8" Format="ci8" Width="8" Height="8" Offset="0xD9B8" />
-        <Texture Name="object_in_Tex_00D9F8" OutName="tex_00D9F8" Format="ci8" Width="8" Height="8" Offset="0xD9F8" />
-        <Texture Name="object_in_Tex_00DA38" OutName="tex_00DA38" Format="ci8" Width="8" Height="8" Offset="0xDA38" />
-        <Texture Name="object_in_Tex_00DA78" OutName="tex_00DA78" Format="ci8" Width="16" Height="32" Offset="0xDA78" />
-        <Texture Name="object_in_Tex_00DC78" OutName="tex_00DC78" Format="ci8" Width="16" Height="16" Offset="0xDC78" />
-        <Texture Name="object_in_Tex_00DD78" OutName="tex_00DD78" Format="ci8" Width="16" Height="16" Offset="0xDD78" />
-        <Texture Name="object_in_Tex_00DE78" OutName="tex_00DE78" Format="ci8" Width="8" Height="8" Offset="0xDE78" />
+        <Texture Name="object_in_Tex_00D9B8" OutName="tex_00D9B8" Format="ci8" Width="8" Height="8" Offset="0xD9B8" TlutOffset="0xD5B8"/>
+        <Texture Name="object_in_Tex_00D9F8" OutName="tex_00D9F8" Format="ci8" Width="8" Height="8" Offset="0xD9F8" TlutOffset="0xD5B8"/>
+        <Texture Name="object_in_Tex_00DA38" OutName="tex_00DA38" Format="ci8" Width="8" Height="8" Offset="0xDA38" TlutOffset="0xD5B8"/>
+        <Texture Name="object_in_Tex_00DA78" OutName="tex_00DA78" Format="ci8" Width="16" Height="32" Offset="0xDA78" TlutOffset="0xD5B8"/>
+        <Texture Name="object_in_Tex_00DC78" OutName="tex_00DC78" Format="ci8" Width="16" Height="16" Offset="0xDC78" TlutOffset="0xD5B8"/>
+        <Texture Name="object_in_Tex_00DD78" OutName="tex_00DD78" Format="ci8" Width="16" Height="16" Offset="0xDD78" TlutOffset="0xD5B8"/>
+        <Texture Name="object_in_Tex_00DE78" OutName="tex_00DE78" Format="ci8" Width="8" Height="8" Offset="0xDE78" TlutOffset="0xD5B8"/>
         <!-- <Blob Name="object_in_Blob_00DEB8" Size="0x800" Offset="0xDEB8" /> -->
         <Texture Name="object_in_Tex_00E6B8" OutName="tex_00E6B8" Format="rgba16" Width="32" Height="32" Offset="0xE6B8" />
         <!-- <Blob Name="object_in_Blob_00EEB8" Size="0x800" Offset="0xEEB8" /> -->
-        <Texture Name="object_in_Tex_00F6B8" OutName="tex_00F6B8" Format="ci8" Width="16" Height="16" Offset="0xF6B8" />
-        <Texture Name="object_in_Tex_00F7B8" OutName="tex_00F7B8" Format="ci8" Width="16" Height="32" Offset="0xF7B8" />
-        <Texture Name="object_in_Tex_00F9B8" OutName="tex_00F9B8" Format="ci8" Width="16" Height="16" Offset="0xF9B8" />
-        <Texture Name="object_in_Tex_00FAB8" OutName="tex_00FAB8" Format="ci8" Width="16" Height="16" Offset="0xFAB8" />
-        <Texture Name="object_in_Tex_00FBB8" OutName="tex_00FBB8" Format="ci8" Width="16" Height="16" Offset="0xFBB8" />
-        <Texture Name="object_in_Tex_00FCB8" OutName="tex_00FCB8" Format="ci8" Width="16" Height="16" Offset="0xFCB8" />
-        <Texture Name="object_in_Tex_00FDB8" OutName="tex_00FDB8" Format="ci8" Width="8" Height="8" Offset="0xFDB8" />
-        <Texture Name="object_in_Tex_00FDF8" OutName="tex_00FDF8" Format="ci8" Width="8" Height="8" Offset="0xFDF8" />
+        <Texture Name="object_in_Tex_00F6B8" OutName="tex_00F6B8" Format="ci8" Width="16" Height="16" Offset="0xF6B8" TlutOffset="0xD5B8"/>
+        <Texture Name="object_in_Tex_00F7B8" OutName="tex_00F7B8" Format="ci8" Width="16" Height="32" Offset="0xF7B8" TlutOffset="0xD5B8"/>
+        <Texture Name="object_in_Tex_00F9B8" OutName="tex_00F9B8" Format="ci8" Width="16" Height="16" Offset="0xF9B8" TlutOffset="0xD5B8"/>
+        <Texture Name="object_in_Tex_00FAB8" OutName="tex_00FAB8" Format="ci8" Width="16" Height="16" Offset="0xFAB8" TlutOffset="0xD5B8"/>
+        <Texture Name="object_in_Tex_00FBB8" OutName="tex_00FBB8" Format="ci8" Width="16" Height="16" Offset="0xFBB8" TlutOffset="0xD5B8"/>
+        <Texture Name="object_in_Tex_00FCB8" OutName="tex_00FCB8" Format="ci8" Width="16" Height="16" Offset="0xFCB8" TlutOffset="0xD5B8"/>
+        <Texture Name="object_in_Tex_00FDB8" OutName="tex_00FDB8" Format="ci8" Width="8" Height="8" Offset="0xFDB8" TlutOffset="0xD5B8"/>
+        <Texture Name="object_in_Tex_00FDF8" OutName="tex_00FDF8" Format="ci8" Width="8" Height="8" Offset="0xFDF8" TlutOffset="0xD5B8"/>
         <DList Name="object_in_DL_012A78" Offset="0x12A78" />
         <DList Name="object_in_DL_012DF8" Offset="0x12DF8" />
         <DList Name="object_in_DL_013440" Offset="0x13440" />
@@ -130,11 +134,11 @@
         <Animation Name="object_in_Anim_01C0B0" Offset="0x1C0B0" /> <!-- Original name is "ingo_walk_loop" -->
         <DList Name="object_in_DL_01C520" Offset="0x1C520" />
         <DList Name="object_in_DL_01C528" Offset="0x1C528" />
-        <Texture Name="object_in_TLUT_01C8F0" OutName="tlut_01C8F0" Format="rgba16" Width="16" Height="16" Offset="0x1C8F0" />
-        <Texture Name="object_in_Tex_01CAF0" OutName="tex_01CAF0" Format="ci8" Width="8" Height="8" Offset="0x1CAF0" />
-        <Texture Name="object_in_Tex_01CB30" OutName="tex_01CB30" Format="ci8" Width="16" Height="8" Offset="0x1CB30" />
-        <Texture Name="object_in_Tex_01CBB0" OutName="tex_01CBB0" Format="ci8" Width="16" Height="16" Offset="0x1CBB0" />
+        <Texture Name="object_in_TLUT_01C8F0" OutName="tlut_01C8F0" Format="rgba16" Width="16" Height="16" Offset="0x1C8F0"/>
+        <Texture Name="object_in_Tex_01CAF0" OutName="tex_01CAF0" Format="ci8" Width="8" Height="8" Offset="0x1CAF0" TlutOffset="0x1C8F0"/>
+        <Texture Name="object_in_Tex_01CB30" OutName="tex_01CB30" Format="ci8" Width="16" Height="8" Offset="0x1CB30" TlutOffset="0x1C8F0"/>
+        <Texture Name="object_in_Tex_01CBB0" OutName="tex_01CBB0" Format="ci8" Width="16" Height="16" Offset="0x1CBB0" TlutOffset="0x1C8F0"/>
         <Texture Name="object_in_Tex_01CCB0" OutName="tex_01CCB0" Format="rgba16" Width="16" Height="16" Offset="0x1CCB0" />
-        <Texture Name="object_in_Tex_01CEB0" OutName="tex_01CEB0" Format="ci8" Width="8" Height="32" Offset="0x1CEB0" />
+        <Texture Name="object_in_Tex_01CEB0" OutName="tex_01CEB0" Format="ci8" Width="8" Height="32" Offset="0x1CEB0" TlutOffset="0x1C8F0"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_in2.xml b/assets/xml/objects/object_in2.xml
index e903185b4b..b250bb3692 100644
--- a/assets/xml/objects/object_in2.xml
+++ b/assets/xml/objects/object_in2.xml
@@ -19,28 +19,28 @@
         <DList Name="object_in2_DL_0048F8" Offset="0x48F8" />
         <DList Name="object_in2_DL_0049F0" Offset="0x49F0" />
         <DList Name="object_in2_DL_004AF8" Offset="0x4AF8" />
-        <Texture Name="object_in2_Tex_004C28" OutName="tex_004C28" Format="rgba16" Width="16" Height="16" Offset="0x4C28" />
+        <Texture Name="object_in2_TLUT_004C28" OutName="tlut_004C28" Format="rgba16" Width="16" Height="16" Offset="0x4C28" />
         <Texture Name="object_in2_TLUT_004E28" OutName="tlut_004E28" Format="rgba16" Width="16" Height="16" Offset="0x4E28" />
-        <Texture Name="object_in2_Tex_005028" OutName="tex_005028" Format="ci8" Width="32" Height="32" Offset="0x5028" />
-        <Texture Name="object_in2_Tex_005428" OutName="tex_005428" Format="ci8" Width="8" Height="8" Offset="0x5428" />
-        <Texture Name="object_in2_Tex_005468" OutName="tex_005468" Format="ci8" Width="8" Height="8" Offset="0x5468" />
-        <Texture Name="object_in2_Tex_0054A8" OutName="tex_0054A8" Format="ci8" Width="32" Height="32" Offset="0x54A8" />
+        <Texture Name="object_in2_Tex_005028" OutName="tex_005028" Format="ci8" Width="32" Height="32" Offset="0x5028" TlutOffset="0x4C28"/>
+        <Texture Name="object_in2_Tex_005428" OutName="tex_005428" Format="ci8" Width="8" Height="8" Offset="0x5428" TlutOffset="0x4E28"/>
+        <Texture Name="object_in2_Tex_005468" OutName="tex_005468" Format="ci8" Width="8" Height="8" Offset="0x5468" TlutOffset="0x4E28"/>
+        <Texture Name="object_in2_Tex_0054A8" OutName="tex_0054A8" Format="ci8" Width="32" Height="32" Offset="0x54A8" TlutOffset="0x4C28"/>
         <Texture Name="object_in2_Tex_0058A8" OutName="tex_0058A8" Format="rgba16" Width="16" Height="16" Offset="0x58A8" />
-        <Texture Name="object_in2_Tex_005AA8" OutName="tex_005AA8" Format="ci8" Width="16" Height="16" Offset="0x5AA8" />
-        <Texture Name="object_in2_Tex_005BA8" OutName="tex_005BA8" Format="ci8" Width="16" Height="16" Offset="0x5BA8" />
+        <Texture Name="object_in2_Tex_005AA8" OutName="tex_005AA8" Format="ci8" Width="16" Height="16" Offset="0x5AA8" TlutOffset="0x4E28"/>
+        <Texture Name="object_in2_Tex_005BA8" OutName="tex_005BA8" Format="ci8" Width="16" Height="16" Offset="0x5BA8" TlutOffset="0x4E28"/>
         <Texture Name="object_in2_Tex_005CA8" OutName="tex_005CA8" Format="i8" Width="8" Height="8" Offset="0x5CA8" />
-        <Texture Name="object_in2_Tex_005CE8" OutName="tex_005CE8" Format="ci8" Width="32" Height="32" Offset="0x5CE8" />
-        <Texture Name="object_in2_Tex_0060E8" OutName="tex_0060E8" Format="ci8" Width="16" Height="32" Offset="0x60E8" />
-        <Texture Name="object_in2_Tex_0062E8" OutName="tex_0062E8" Format="ci8" Width="16" Height="16" Offset="0x62E8" />
-        <Texture Name="object_in2_Tex_0063E8" OutName="tex_0063E8" Format="ci8" Width="8" Height="8" Offset="0x63E8" />
-        <Texture Name="object_in2_Tex_006428" OutName="tex_006428" Format="ci8" Width="16" Height="16" Offset="0x6428" />
-        <Texture Name="object_in2_Tex_006528" OutName="tex_006528" Format="ci8" Width="16" Height="16" Offset="0x6528" />
+        <Texture Name="object_in2_Tex_005CE8" OutName="tex_005CE8" Format="ci8" Width="32" Height="32" Offset="0x5CE8" TlutOffset="0x4C28"/>
+        <Texture Name="object_in2_Tex_0060E8" OutName="tex_0060E8" Format="ci8" Width="16" Height="32" Offset="0x60E8" TlutOffset="0x4E28"/>
+        <Texture Name="object_in2_Tex_0062E8" OutName="tex_0062E8" Format="ci8" Width="16" Height="16" Offset="0x62E8" TlutOffset="0x4E28"/>
+        <Texture Name="object_in2_Tex_0063E8" OutName="tex_0063E8" Format="ci8" Width="8" Height="8" Offset="0x63E8" TlutOffset="0x4E28"/>
+        <Texture Name="object_in2_Tex_006428" OutName="tex_006428" Format="ci8" Width="16" Height="16" Offset="0x6428" TlutOffset="0x4E28"/>
+        <Texture Name="object_in2_Tex_006528" OutName="tex_006528" Format="ci8" Width="16" Height="16" Offset="0x6528" TlutOffset="0x4E28"/>
         <Texture Name="object_in2_Tex_006628" OutName="tex_006628" Format="i8" Width="16" Height="16" Offset="0x6628" />
-        <Texture Name="object_in2_Tex_006728" OutName="tex_006728" Format="i8" Width="16" Height="16" Offset="0x6728" />
-        <Texture Name="object_in2_Tex_006828" OutName="tex_006828" Format="ci8" Width="32" Height="32" Offset="0x6828" />
-        <Texture Name="object_in2_Tex_006C28" OutName="tex_006C28" Format="ci8" Width="8" Height="8" Offset="0x6C28" />
-        <Texture Name="object_in2_Tex_006C68" OutName="tex_006C68" Format="ci8" Width="32" Height="32" Offset="0x6C68" />
-        <Texture Name="object_in2_Tex_007068" OutName="tex_007068" Format="ci8" Width="8" Height="8" Offset="0x7068" />
+        <Texture Name="object_in2_Tex_006728" OutName="tex_006728" Format="i8" Width="16" Height="16" Offset="0x6728"/>
+        <Texture Name="object_in2_Tex_006828" OutName="tex_006828" Format="ci8" Width="32" Height="32" Offset="0x6828" TlutOffset="0x4C28"/>
+        <Texture Name="object_in2_Tex_006C28" OutName="tex_006C28" Format="ci8" Width="8" Height="8" Offset="0x6C28" TlutOffset="0x4E28"/>
+        <Texture Name="object_in2_Tex_006C68" OutName="tex_006C68" Format="ci8" Width="32" Height="32" Offset="0x6C68" TlutOffset="0x4C28"/>
+        <Texture Name="object_in2_Tex_007068" OutName="tex_007068" Format="ci8" Width="8" Height="8" Offset="0x7068" TlutOffset="0x4E28"/>
         <DList Name="object_in2_DL_007198" Offset="0x7198" />
         <DList Name="object_in2_DL_0071A0" Offset="0x71A0" />
         <Texture Name="object_in2_Tex_007260" OutName="tex_007260" Format="rgba16" Width="16" Height="16" Offset="0x7260" />
diff --git a/assets/xml/objects/object_kanban.xml b/assets/xml/objects/object_kanban.xml
index e5baa90ee0..98a24437c7 100644
--- a/assets/xml/objects/object_kanban.xml
+++ b/assets/xml/objects/object_kanban.xml
@@ -1,4 +1,7 @@
 <Root>
+    <!-- Dependencies -->
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
+
     <!-- Assets for cuttable signs -->
     <File Name="object_kanban" Segment="6">
         <DList Name="gSignMaterialDL" Offset="0xC30" />
diff --git a/assets/xml/objects/object_kusa.xml b/assets/xml/objects/object_kusa.xml
index 362e47114b..af7b7f19b3 100644
--- a/assets/xml/objects/object_kusa.xml
+++ b/assets/xml/objects/object_kusa.xml
@@ -1,4 +1,7 @@
 <Root>
+    <!-- Dependencies -->
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
+
     <File Name="object_kusa" Segment="6">
         <DList Name="gKusaSproutDL" Offset="0x140" /> <!-- Original name is "obj_kusa01_model" -->
         <DList Name="gKusaStumpDL" Offset="0x2E0" /> <!-- Original name is "obj_kusa03_model" -->
diff --git a/assets/xml/objects/object_link_boy.xml b/assets/xml/objects/object_link_boy.xml
index 2fe50d9bca..5cda02e0c1 100644
--- a/assets/xml/objects/object_link_boy.xml
+++ b/assets/xml/objects/object_link_boy.xml
@@ -1,10 +1,13 @@
 <Root>
+    <!-- Dependencies -->
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
+
     <File Name="object_link_boy" Segment="6">
         <Texture Name="object_link_boy_TLUT_000000" OutName="tlut_000000" Format="rgba16" Width="16" Height="16" Offset="0x0" />
         <Texture Name="object_link_boy_TLUT_000200" OutName="tlut_000200" Format="rgba16" Width="16" Height="16" Offset="0x200" />
         <Texture Name="gLinkFierceDeityHandHoldingTLUT" OutName="hand_holding_tlut" Format="rgba16" Width="16" Height="16" Offset="0x400" />
         <Texture Name="object_link_boy_Tex_000600" OutName="tex_000600" Format="ci8" Width="16" Height="32" Offset="0x600" TlutOffset="0x0" />
-        <Texture Name="object_link_boy_Tex_000800" OutName="tex_000800" Format="ci8" Width="16" Height="32" Offset="0x800" />
+        <Texture Name="object_link_boy_Tex_000800" OutName="tex_000800" Format="ci8" Width="16" Height="32" Offset="0x800" TlutOffset="0x200"/>
         <Texture Name="gLinkFierceDeityHandHoldingTex" OutName="hand_holding" Format="ci8" Width="16" Height="16" Offset="0xA00" TlutOffset="0x400" />
         <Texture Name="object_link_boy_Tex_000B00" OutName="tex_000B00" Format="i8" Width="16" Height="16" Offset="0xB00" />
 
@@ -43,19 +46,19 @@
         <Texture Name="gLinkFierceDeityHandTLUT" OutName="hand_tlut" Format="rgba16" Width="4" Height="4" Offset="0x81C8" />
         <Texture Name="object_link_boy_TLUT_0081E8" OutName="tlut_0081E8" Format="rgba16" Width="4" Height="4" Offset="0x81E8" />
         <Texture Name="object_link_boy_Tex_008208" OutName="tex_008208" Format="rgba16" Width="16" Height="16" Offset="0x8208" />
-        <Texture Name="object_link_boy_Tex_008408" OutName="tex_008408" Format="ci4" Width="16" Height="16" Offset="0x8408" />
+        <Texture Name="object_link_boy_Tex_008408" OutName="tex_008408" Format="ci4" Width="16" Height="16" Offset="0x8408" TlutOffset="0x8108"/>
         <Texture Name="object_link_boy_Tex_008488" OutName="tex_008488" Format="rgba16" Width="16" Height="32" Offset="0x8488" />
         <Texture Name="object_link_boy_Tex_008888" OutName="tex_008888" Format="rgba16" Width="32" Height="16" Offset="0x8888" />
-        <Texture Name="object_link_boy_Tex_008C88" OutName="tex_008C88" Format="ci4" Width="16" Height="16" Offset="0x8C88" />
-        <Texture Name="object_link_boy_Tex_008D08" OutName="tex_008D08" Format="ci4" Width="32" Height="32" Offset="0x8D08" />
-        <Texture Name="object_link_boy_Tex_008F08" OutName="tex_008F08" Format="ci4" Width="64" Height="64" Offset="0x8F08" />
+        <Texture Name="object_link_boy_Tex_008C88" OutName="tex_008C88" Format="ci4" Width="16" Height="16" Offset="0x8C88" TlutOffset="0x8128"/>
+        <Texture Name="object_link_boy_Tex_008D08" OutName="tex_008D08" Format="ci4" Width="32" Height="32" Offset="0x8D08" TlutOffset="0x8148"/>
+        <Texture Name="object_link_boy_Tex_008F08" OutName="tex_008F08" Format="ci4" Width="64" Height="64" Offset="0x8F08" TlutOffset="0x8168"/>
         <Texture Name="gLinkFierceDeityEyesTex" OutName="eyes" Format="rgba16" Width="64" Height="32" Offset="0x9708" />
-        <Texture Name="object_link_boy_Tex_00A708" OutName="tex_00A708" Format="ci4" Width="32" Height="32" Offset="0xA708" />
+        <Texture Name="object_link_boy_Tex_00A708" OutName="tex_00A708" Format="ci4" Width="32" Height="32" Offset="0xA708" TlutOffset="0x8188"/>
         <Texture Name="gLinkFierceDeityMouthTex" OutName="mouth" Format="rgba16" Width="32" Height="16" Offset="0xA908" />
         <Texture Name="gLinkFierceDeityEarTex" OutName="ear" Format="rgba16" Width="16" Height="16" Offset="0xAD08" />
-        <Texture Name="object_link_boy_Tex_00AF08" OutName="tex_00AF08" Format="ci4" Width="32" Height="32" Offset="0xAF08" />
+        <Texture Name="object_link_boy_Tex_00AF08" OutName="tex_00AF08" Format="ci4" Width="32" Height="32" Offset="0xAF08" TlutOffset="0x81A8"/>
         <Texture Name="gLinkFierceDeityHandTex" OutName="hand" Format="ci4" Width="16" Height="16" Offset="0xB108" TlutOffset="0x81C8" />
-        <Texture Name="object_link_boy_Tex_00B188" OutName="tex_00B188" Format="ci4" Width="64" Height="64" Offset="0xB188" />
+        <Texture Name="object_link_boy_Tex_00B188" OutName="tex_00B188" Format="ci4" Width="64" Height="64" Offset="0xB188" TlutOffset="0x81E8"/>
 
         <!-- TODO this texture should be 50x75 but the u64 type of textures makes this not match currently -->
         <Texture Name="object_link_boy_Tex_00B988" OutName="tex_00B988" Format="rgba16" Width="50" Height="74" Offset="0xB988" />
diff --git a/assets/xml/objects/object_link_child.xml b/assets/xml/objects/object_link_child.xml
index 79275a1986..19b41d4e13 100644
--- a/assets/xml/objects/object_link_child.xml
+++ b/assets/xml/objects/object_link_child.xml
@@ -1,4 +1,7 @@
 <Root>
+    <!-- Dependencies -->
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
+
     <File Name="object_link_child" Segment="6">
         <Texture Name="gLinkHumanEyesOpenTex" OutName="eyes_open" Format="ci8" Width="64" Height="32" Offset="0x0" TlutOffset="0x5000" />
         <Texture Name="gLinkHumanEyesHalfTex" OutName="eyes_half" Format="ci8" Width="64" Height="32" Offset="0x800" TlutOffset="0x5000" />
diff --git a/assets/xml/objects/object_mm.xml b/assets/xml/objects/object_mm.xml
index b7b727d4e1..c90bd29e3c 100644
--- a/assets/xml/objects/object_mm.xml
+++ b/assets/xml/objects/object_mm.xml
@@ -6,17 +6,17 @@
         <Animation Name="object_mm_Anim_001F84" Offset="0x1F84" /> <!-- Original name is "mm_postcheck" -->
         <Animation Name="object_mm_Anim_002238" Offset="0x2238" /> <!-- Original name is "mm_run01" -->
         <Texture Name="object_mm_TLUT_002250" OutName="tlut_002250" Format="rgba16" Width="16" Height="16" Offset="0x2250" />
-        <Texture Name="object_mm_Tex_002450" OutName="tex_002450" Format="ci8" Width="8" Height="8" Offset="0x2450" />
-        <Texture Name="object_mm_Tex_002490" OutName="tex_002490" Format="ci8" Width="8" Height="8" Offset="0x2490" />
-        <Texture Name="object_mm_Tex_0024D0" OutName="tex_0024D0" Format="ci8" Width="8" Height="8" Offset="0x24D0" />
-        <Texture Name="object_mm_Tex_002510" OutName="tex_002510" Format="ci8" Width="8" Height="8" Offset="0x2510" />
-        <Texture Name="object_mm_Tex_002550" OutName="tex_002550" Format="ci8" Width="16" Height="16" Offset="0x2550" />
-        <Texture Name="object_mm_Tex_002650" OutName="tex_002650" Format="ci8" Width="16" Height="16" Offset="0x2650" />
-        <Texture Name="object_mm_Tex_002750" OutName="tex_002750" Format="ci8" Width="32" Height="16" Offset="0x2750" />
-        <Texture Name="object_mm_Tex_002950" OutName="tex_002950" Format="ci8" Width="32" Height="16" Offset="0x2950" />
-        <Texture Name="object_mm_Tex_002B50" OutName="tex_002B50" Format="ci8" Width="16" Height="16" Offset="0x2B50" />
-        <Texture Name="object_mm_Tex_002C50" OutName="tex_002C50" Format="ci8" Width="32" Height="16" Offset="0x2C50" />
-        <Texture Name="object_mm_Tex_002E50" OutName="tex_002E50" Format="ci8" Width="16" Height="16" Offset="0x2E50" />
+        <Texture Name="object_mm_Tex_002450" OutName="tex_002450" Format="ci8" Width="8" Height="8" Offset="0x2450" TlutOffset="0x2250"/>
+        <Texture Name="object_mm_Tex_002490" OutName="tex_002490" Format="ci8" Width="8" Height="8" Offset="0x2490" TlutOffset="0x2250"/>
+        <Texture Name="object_mm_Tex_0024D0" OutName="tex_0024D0" Format="ci8" Width="8" Height="8" Offset="0x24D0" TlutOffset="0x2250"/>
+        <Texture Name="object_mm_Tex_002510" OutName="tex_002510" Format="ci8" Width="8" Height="8" Offset="0x2510" TlutOffset="0x2250"/>
+        <Texture Name="object_mm_Tex_002550" OutName="tex_002550" Format="ci8" Width="16" Height="16" Offset="0x2550" TlutOffset="0x2250"/>
+        <Texture Name="object_mm_Tex_002650" OutName="tex_002650" Format="ci8" Width="16" Height="16" Offset="0x2650" TlutOffset="0x2250"/>
+        <Texture Name="object_mm_Tex_002750" OutName="tex_002750" Format="ci8" Width="32" Height="16" Offset="0x2750" TlutOffset="0x2250"/>
+        <Texture Name="object_mm_Tex_002950" OutName="tex_002950" Format="ci8" Width="32" Height="16" Offset="0x2950" TlutOffset="0x2250"/>
+        <Texture Name="object_mm_Tex_002B50" OutName="tex_002B50" Format="ci8" Width="16" Height="16" Offset="0x2B50" TlutOffset="0x2250"/>
+        <Texture Name="object_mm_Tex_002C50" OutName="tex_002C50" Format="ci8" Width="32" Height="16" Offset="0x2C50" TlutOffset="0x2250"/>
+        <Texture Name="object_mm_Tex_002E50" OutName="tex_002E50" Format="ci8" Width="16" Height="16" Offset="0x2E50" TlutOffset="0x2250"/>
         <DList Name="object_mm_DL_005B30" Offset="0x5B30" />
         <DList Name="object_mm_DL_005E70" Offset="0x5E70" />
         <DList Name="object_mm_DL_006598" Offset="0x6598" />
diff --git a/assets/xml/objects/object_mnk.xml b/assets/xml/objects/object_mnk.xml
index 73abc33f6b..0b34f98c1d 100644
--- a/assets/xml/objects/object_mnk.xml
+++ b/assets/xml/objects/object_mnk.xml
@@ -73,12 +73,12 @@
         <Texture Name="object_mnk_Tex_014C20" OutName="tex_014C20" Format="ci8" Width="32" Height="32" Offset="0x14C20" TlutOffset="0x14A20"/>
         <Texture Name="object_mnk_Tex_015020" OutName="tex_015020" Format="ci8" Width="32" Height="64" Offset="0x15020" TlutOffset="0x14A20"/>
         <Texture Name="object_mnk_Tex_015820" OutName="tex_015820" Format="ci8" Width="16" Height="16" Offset="0x15820" TlutOffset="0x14A20"/>
-        <Texture Name="object_mnk_Tex_015920" OutName="tex_015920" Format="ci8" Width="32" Height="64" Offset="0x15920" />
-        <Texture Name="object_mnk_Tex_016120" OutName="tex_016120" Format="ci8" Width="32" Height="64" Offset="0x16120" />
-        <Texture Name="object_mnk_Tex_016920" OutName="tex_016920" Format="ci8" Width="32" Height="64" Offset="0x16920" />
-        <Texture Name="object_mnk_Tex_017120" OutName="tex_017120" Format="ci8" Width="32" Height="64" Offset="0x17120" />
-        <Texture Name="object_mnk_Tex_017920" OutName="tex_017920" Format="ci8" Width="32" Height="64" Offset="0x17920" />
-        <Texture Name="object_mnk_Tex_018120" OutName="tex_018120" Format="ci8" Width="32" Height="64" Offset="0x18120" />
+        <Texture Name="object_mnk_Tex_015920" OutName="tex_015920" Format="ci8" Width="32" Height="64" Offset="0x15920" TlutOffset="0x14A20"/>
+        <Texture Name="object_mnk_Tex_016120" OutName="tex_016120" Format="ci8" Width="32" Height="64" Offset="0x16120" TlutOffset="0x14A20"/>
+        <Texture Name="object_mnk_Tex_016920" OutName="tex_016920" Format="ci8" Width="32" Height="64" Offset="0x16920" TlutOffset="0x14A20"/>
+        <Texture Name="object_mnk_Tex_017120" OutName="tex_017120" Format="ci8" Width="32" Height="64" Offset="0x17120" TlutOffset="0x14A20"/>
+        <Texture Name="object_mnk_Tex_017920" OutName="tex_017920" Format="ci8" Width="32" Height="64" Offset="0x17920" TlutOffset="0x14A20"/>
+        <Texture Name="object_mnk_Tex_018120" OutName="tex_018120" Format="ci8" Width="32" Height="64" Offset="0x18120" TlutOffset="0x14A20"/>
         <Texture Name="object_mnk_Tex_018920" OutName="tex_018920" Format="ci8" Width="16" Height="16" Offset="0x18920" TlutOffset="0x14A20"/>
         <Texture Name="object_mnk_Tex_018A20" OutName="tex_018A20" Format="ci8" Width="32" Height="32" Offset="0x18A20" TlutOffset="0x14A20"/>
         <Texture Name="object_mnk_Tex_018E20" OutName="tex_018E20" Format="ci8" Width="16" Height="16" Offset="0x18E20" TlutOffset="0x14A20"/>
diff --git a/assets/xml/objects/object_nwc.xml b/assets/xml/objects/object_nwc.xml
index db13b596ab..5c5bb02153 100644
--- a/assets/xml/objects/object_nwc.xml
+++ b/assets/xml/objects/object_nwc.xml
@@ -1,4 +1,7 @@
 <Root>
+    <!-- Dependencies -->
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
+
     <!-- Cucco Chick: the little baby Cucco you find and raise in the Cucco Shack -->
     <File Name="object_nwc" Segment="6">
         <DList Name="gNwcEndDL" Offset="0x2E0" />
@@ -42,7 +45,7 @@
 
         <!-- contains an unsupported texture (i16) used in an unused display list ( @ 0x1B80 ) -->
         <!-- is type G_IM_FMT_I, G_IM_SIZ_16b, dimensions are best guesses from Texture64 renders -->
-        <Texture Name="object_nwc_Tex_001A40" OutName="broken_tex_gimfmti_001A40" Format="ia16" Width="8" Height="16" Offset="0x1A40" />
+        <Texture Name="object_nwc_Tex_001A40" OutName="broken_tex_gimfmti_001A40" Format="ia16" Width="16" Height="8" Offset="0x1A40" />
 
         <!-- Z64Utils throws an error for this DL because of the above texture -->
         <DList Name="object_nwc_DL_001B80" Offset="0x1B80" />
diff --git a/assets/xml/objects/object_ny.xml b/assets/xml/objects/object_ny.xml
index 3f2d3a9088..2256a5930b 100644
--- a/assets/xml/objects/object_ny.xml
+++ b/assets/xml/objects/object_ny.xml
@@ -1,4 +1,7 @@
 <Root>
+    <!-- Dependencies -->
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
+
     <File Name="object_ny" Segment="6">
         <DList Name="object_ny_DL_000030" Offset="0x30" /> <!-- Original name is "ksl_kusari_modelT" -->
         <DList Name="object_ny_DL_0000B8" Offset="0xB8" />
diff --git a/assets/xml/objects/object_oF1d_map.xml b/assets/xml/objects/object_oF1d_map.xml
index 8812c7fdc5..1f85bdb3f6 100644
--- a/assets/xml/objects/object_oF1d_map.xml
+++ b/assets/xml/objects/object_oF1d_map.xml
@@ -1,4 +1,7 @@
 <Root>
+    <!-- Dependencies -->
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
+
     <!-- Object file for Gorons -->
     <File Name="object_oF1d_map" Segment="6">
         <!-- Snowball -->
@@ -99,10 +102,10 @@
         <Texture Name="gGoronBottomTex" OutName="goron_bottom" Format="ci8" Width="8" Height="16" Offset="0xFAB8" TlutOffset="0xEA78"/>
         <Texture Name="gGoronsRocksTex" OutName="goron_rocks" Format="ci8" Width="32" Height="64" Offset="0xFB38" TlutOffset="0xEA78"/>
         <Texture Name="gGoronHairTex" OutName="goron_hair" Format="ci8" Width="16" Height="16" Offset="0x10338" TlutOffset="0xEA78"/>
-        <Texture Name="gGoronEyeOpenTex" OutName="goron_eye_open" Format="ci8" Width="32" Height="32" Offset="0x10438" />
-        <Texture Name="gGoronEyeClosed2Tex" OutName="goron_eye_closed2" Format="ci8" Width="32" Height="32" Offset="0x10838" />
-        <Texture Name="gGoronEyeHalfTex" OutName="goron_eye_half" Format="ci8" Width="32" Height="32" Offset="0x10C38" />
-        <Texture Name="gGoronEyeClosedTex" OutName="goron_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x11038" />
+        <Texture Name="gGoronEyeOpenTex" OutName="goron_eye_open" Format="ci8" Width="32" Height="32" Offset="0x10438" TlutOffset="0xEC78"/>
+        <Texture Name="gGoronEyeClosed2Tex" OutName="goron_eye_closed2" Format="ci8" Width="32" Height="32" Offset="0x10838" TlutOffset="0xEC78"/>
+        <Texture Name="gGoronEyeHalfTex" OutName="goron_eye_half" Format="ci8" Width="32" Height="32" Offset="0x10C38" TlutOffset="0xEC78"/>
+        <Texture Name="gGoronEyeClosedTex" OutName="goron_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x11038" TlutOffset="0xEC78"/>
         <Texture Name="gGoronLipsTex" OutName="goron_lips" Format="rgba16" Width="8" Height="8" Offset="0x11438" />
         <Texture Name="gGoronDimpleTex" OutName="goron_dimple" Format="ci8" Width="16" Height="16" Offset="0x114B8" TlutOffset="0xEA78"/>
         <Texture Name="gGoronBeardTex" OutName="goron_beard" Format="rgba16" Width="32" Height="16" Offset="0x115B8" />
diff --git a/assets/xml/objects/object_owl.xml b/assets/xml/objects/object_owl.xml
index b07442a996..f3f9350ed4 100644
--- a/assets/xml/objects/object_owl.xml
+++ b/assets/xml/objects/object_owl.xml
@@ -43,9 +43,9 @@
         <Texture Name="gOwlChinMarking1Tex" OutName="owl_chin_marking1" Format="rgba16" Width="32" Height="32" Offset="0x76B8" />
         <Texture Name="gOwlForeheadMarkingTex" OutName="owl_forehead_marking" Format="rgba16" Width="32" Height="32" Offset="0x7EB8" />
         <Texture Name="gOwlBeakTex" OutName="owl_beak" Format="rgba16" Width="32" Height="32" Offset="0x86B8" />
-        <Texture Name="gOwlEyeOpenTex" OutName="owl_eye_open" Format="ci8" Width="32" Height="32" Offset="0x8EB8" />
-        <Texture Name="gOwlEyeHalfTex" OutName="owl_eye_half" Format="ci8" Width="32" Height="32" Offset="0x92B8" />
-        <Texture Name="gOwlEyeClosedTex" OutName="owl_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x96B8" />
+        <Texture Name="gOwlEyeOpenTex" OutName="owl_eye_open" Format="ci8" Width="32" Height="32" Offset="0x8EB8" TlutOffset="0x72B8"/>
+        <Texture Name="gOwlEyeHalfTex" OutName="owl_eye_half" Format="ci8" Width="32" Height="32" Offset="0x92B8" TlutOffset="0x72B8"/>
+        <Texture Name="gOwlEyeClosedTex" OutName="owl_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x96B8" TlutOffset="0x74B8"/>
         <Texture Name="gOwlChinMarking2Tex" OutName="owl_chin_marking2" Format="rgba16" Width="32" Height="32" Offset="0x9AB8" />
         <Texture Name="gOwlFeathersTex" OutName="owl_feathers" Format="rgba16" Width="16" Height="16" Offset="0xA2B8" />
         <Texture Name="gOwlEyebrowTex" OutName="owl_eyebrow" Format="rgba16" Width="64" Height="32" Offset="0xA4B8" />
diff --git a/assets/xml/objects/object_pamera.xml b/assets/xml/objects/object_pamera.xml
index 1af9406fef..8b83f67899 100644
--- a/assets/xml/objects/object_pamera.xml
+++ b/assets/xml/objects/object_pamera.xml
@@ -28,13 +28,13 @@
         <Texture Name="object_pamera_Tex_0063E8" OutName="tex_0063E8" Format="ci8" Width="16" Height="16" Offset="0x63E8" TlutOffset="0x60E8"/>
         <Texture Name="object_pamera_Tex_0064E8" OutName="tex_0064E8" Format="ci8" Width="16" Height="16" Offset="0x64E8" TlutOffset="0x60E8"/>
         <Texture Name="object_pamera_Tex_0065E8" OutName="tex_0065E8" Format="ci8" Width="16" Height="16" Offset="0x65E8" TlutOffset="0x60E8"/>
-        <Texture Name="object_pamera_Tex_0066E8" OutName="tex_0066E8" Format="ci8" Width="32" Height="32" Offset="0x66E8" />
-        <Texture Name="object_pamera_Tex_006AE8" OutName="tex_006AE8" Format="ci8" Width="32" Height="32" Offset="0x6AE8" />
-        <Texture Name="object_pamera_Tex_006EE8" OutName="tex_006EE8" Format="ci8" Width="32" Height="32" Offset="0x6EE8" />
-        <Texture Name="object_pamera_Tex_0072E8" OutName="tex_0072E8" Format="ci8" Width="16" Height="16" Offset="0x72E8" />
-        <Texture Name="object_pamera_Tex_0073E8" OutName="tex_0073E8" Format="ci8" Width="16" Height="16" Offset="0x73E8" />
-        <Texture Name="object_pamera_Tex_0074E8" OutName="tex_0074E8" Format="ci8" Width="32" Height="32" Offset="0x74E8" />
-        <Texture Name="object_pamera_Tex_0078E8" OutName="tex_0078E8" Format="ci8" Width="32" Height="32" Offset="0x78E8" />
+        <Texture Name="object_pamera_Tex_0066E8" OutName="tex_0066E8" Format="ci8" Width="32" Height="32" Offset="0x66E8" TlutOffset="0x60E8"/>
+        <Texture Name="object_pamera_Tex_006AE8" OutName="tex_006AE8" Format="ci8" Width="32" Height="32" Offset="0x6AE8" TlutOffset="0x60E8"/>
+        <Texture Name="object_pamera_Tex_006EE8" OutName="tex_006EE8" Format="ci8" Width="32" Height="32" Offset="0x6EE8" TlutOffset="0x60E8"/>
+        <Texture Name="object_pamera_Tex_0072E8" OutName="tex_0072E8" Format="ci8" Width="16" Height="16" Offset="0x72E8" TlutOffset="0x60E8"/>
+        <Texture Name="object_pamera_Tex_0073E8" OutName="tex_0073E8" Format="ci8" Width="16" Height="16" Offset="0x73E8" TlutOffset="0x60E8"/>
+        <Texture Name="object_pamera_Tex_0074E8" OutName="tex_0074E8" Format="ci8" Width="32" Height="32" Offset="0x74E8" TlutOffset="0x60E8"/>
+        <Texture Name="object_pamera_Tex_0078E8" OutName="tex_0078E8" Format="ci8" Width="32" Height="32" Offset="0x78E8" TlutOffset="0x60E8"/>
         <Texture Name="object_pamera_Tex_007CE8" OutName="tex_007CE8" Format="ci8" Width="16" Height="16" Offset="0x7CE8" TlutOffset="0x60E8"/>
         <Texture Name="object_pamera_Tex_007DE8" OutName="tex_007DE8" Format="ci8" Width="32" Height="16" Offset="0x7DE8" TlutOffset="0x60E8"/>
         <Texture Name="object_pamera_Tex_007FE8" OutName="tex_007FE8" Format="ci8" Width="16" Height="16" Offset="0x7FE8" TlutOffset="0x60E8"/>
diff --git a/assets/xml/objects/object_po.xml b/assets/xml/objects/object_po.xml
index dcf5845a3a..6765bcef7a 100644
--- a/assets/xml/objects/object_po.xml
+++ b/assets/xml/objects/object_po.xml
@@ -1,4 +1,7 @@
 <Root>
+    <!-- Dependencies -->
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
+
     <!-- Object for Poe -->
     <File Name="object_po" Segment="6">
         <!-- Animations -->
diff --git a/assets/xml/objects/object_po_composer.xml b/assets/xml/objects/object_po_composer.xml
index d2f4488508..8c122869f8 100644
--- a/assets/xml/objects/object_po_composer.xml
+++ b/assets/xml/objects/object_po_composer.xml
@@ -1,4 +1,5 @@
 <Root>
+    <!-- Dependencies -->
     <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
 
     <!-- Assets for the composer brothers Flat and Sharp -->
diff --git a/assets/xml/objects/object_rz.xml b/assets/xml/objects/object_rz.xml
index 9e62bdbcdd..0b8ccb14e4 100644
--- a/assets/xml/objects/object_rz.xml
+++ b/assets/xml/objects/object_rz.xml
@@ -27,20 +27,20 @@
         <DList Name="object_rz_DL_00B170" Offset="0xB170" />
         <DList Name="object_rz_DL_00B288" Offset="0xB288" />
         <Texture Name="object_rz_TLUT_00B450" OutName="tlut_00B450" Format="rgba16" Width="16" Height="16" Offset="0xB450" />
-        <Texture Name="object_rz_Tex_00B650" OutName="tex_00B650" Format="rgba16" Width="16" Height="16" Offset="0xB650" />
+        <Texture Name="object_rz_TLUT_00B650" OutName="tlut_00B650" Format="rgba16" Width="16" Height="16" Offset="0xB650"/>
         <Texture Name="object_rz_Tex_00B850" OutName="tex_00B850" Format="ci8" Width="8" Height="8" Offset="0xB850" TlutOffset="0xB450"/>
         <Texture Name="object_rz_Tex_00B890" OutName="tex_00B890" Format="ci8" Width="8" Height="8" Offset="0xB890" TlutOffset="0xB450"/>
         <Texture Name="object_rz_Tex_00B8D0" OutName="tex_00B8D0" Format="ci8" Width="16" Height="16" Offset="0xB8D0" TlutOffset="0xB450"/>
         <Texture Name="object_rz_Tex_00B9D0" OutName="tex_00B9D0" Format="ci8" Width="16" Height="16" Offset="0xB9D0" TlutOffset="0xB450"/>
         <Texture Name="object_rz_Tex_00BAD0" OutName="tex_00BAD0" Format="ci8" Width="16" Height="16" Offset="0xBAD0" TlutOffset="0xB450"/>
         <Texture Name="object_rz_Tex_00BBD0" OutName="tex_00BBD0" Format="ci8" Width="8" Height="16" Offset="0xBBD0" TlutOffset="0xB450"/>
-        <Texture Name="object_rz_Tex_00BC50" OutName="tex_00BC50" Format="ci8" Width="32" Height="32" Offset="0xBC50" />
+        <Texture Name="object_rz_Tex_00BC50" OutName="tex_00BC50" Format="ci8" Width="32" Height="32" Offset="0xBC50" TlutOffset="0xB650"/>
         <Texture Name="object_rz_Tex_00C050" OutName="tex_00C050" Format="ci8" Width="16" Height="16" Offset="0xC050" TlutOffset="0xB450"/>
         <Texture Name="object_rz_Tex_00C150" OutName="tex_00C150" Format="i8" Width="8" Height="8" Offset="0xC150" />
-        <Texture Name="object_rz_Tex_00C190" OutName="tex_00C190" Format="ci8" Width="32" Height="32" Offset="0xC190" />
-        <Texture Name="object_rz_Tex_00C590" OutName="tex_00C590" Format="ci8" Width="32" Height="32" Offset="0xC590" />
-        <Texture Name="object_rz_Tex_00C990" OutName="tex_00C990" Format="ci8" Width="32" Height="32" Offset="0xC990" />
-        <Texture Name="object_rz_Tex_00CD90" OutName="tex_00CD90" Format="ci8" Width="32" Height="32" Offset="0xCD90" />
+        <Texture Name="object_rz_Tex_00C190" OutName="tex_00C190" Format="ci8" Width="32" Height="32" Offset="0xC190" TlutOffset="0xB650"/>
+        <Texture Name="object_rz_Tex_00C590" OutName="tex_00C590" Format="ci8" Width="32" Height="32" Offset="0xC590" TlutOffset="0xB650"/>
+        <Texture Name="object_rz_Tex_00C990" OutName="tex_00C990" Format="ci8" Width="32" Height="32" Offset="0xC990" TlutOffset="0xB650"/>
+        <Texture Name="object_rz_Tex_00CD90" OutName="tex_00CD90" Format="ci8" Width="32" Height="32" Offset="0xCD90" TlutOffset="0xB650"/>
         <Texture Name="object_rz_Tex_00D190" OutName="tex_00D190" Format="i8" Width="8" Height="8" Offset="0xD190" />
         <Texture Name="object_rz_Tex_00D1D0" OutName="tex_00D1D0" Format="i8" Width="16" Height="16" Offset="0xD1D0" />
         <Texture Name="object_rz_Tex_00D2D0" OutName="tex_00D2D0" Format="i8" Width="32" Height="32" Offset="0xD2D0" />
diff --git a/assets/xml/objects/object_sb.xml b/assets/xml/objects/object_sb.xml
index 32f0ef1377..6c03d4eb03 100644
--- a/assets/xml/objects/object_sb.xml
+++ b/assets/xml/objects/object_sb.xml
@@ -1,4 +1,7 @@
 <Root>
+    <!-- Dependencies -->
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
+
     <File Name="object_sb" Segment="6">
         <Animation Name="object_sb_Anim_00004C" Offset="0x4C" /> <!-- Original name is "sb_close" -->
         <Animation Name="object_sb_Anim_0000B4" Offset="0xB4" />  <!-- Original name is "sb_jump_end" -->
diff --git a/assets/xml/objects/object_ssh.xml b/assets/xml/objects/object_ssh.xml
index 43fb39f6a1..b1a78e8933 100644
--- a/assets/xml/objects/object_ssh.xml
+++ b/assets/xml/objects/object_ssh.xml
@@ -11,10 +11,10 @@
         <Texture Name="object_ssh_Tex_0017B0" OutName="tex_0017B0" Format="i8" Width="16" Height="16" Offset="0x17B0" />
         <Texture Name="object_ssh_Tex_0018B0" OutName="tex_0018B0" Format="ci8" Width="8" Height="16" Offset="0x18B0" TlutOffset="0x14B0"/>
         <Texture Name="object_ssh_Tex_001930" OutName="tex_001930" Format="ci8" Width="8" Height="8" Offset="0x1930" TlutOffset="0x14B0"/>
-        <Texture Name="object_ssh_Tex_001970" OutName="tex_001970" Format="ci8" Width="32" Height="32" Offset="0x1970" />
+        <Texture Name="object_ssh_Tex_001970" OutName="tex_001970" Format="ci8" Width="32" Height="32" Offset="0x1970" TlutOffset="0x14B0"/>
         <Texture Name="object_ssh_Tex_001D70" OutName="tex_001D70" Format="ci8" Width="8" Height="16" Offset="0x1D70" TlutOffset="0x14B0"/>
-        <Texture Name="object_ssh_Tex_001DF0" OutName="tex_001DF0" Format="ci8" Width="32" Height="32" Offset="0x1DF0" />
-        <Texture Name="object_ssh_Tex_0021F0" OutName="tex_0021F0" Format="ci8" Width="32" Height="32" Offset="0x21F0" />
+        <Texture Name="object_ssh_Tex_001DF0" OutName="tex_001DF0" Format="ci8" Width="32" Height="32" Offset="0x1DF0" TlutOffset="0x14B0"/>
+        <Texture Name="object_ssh_Tex_0021F0" OutName="tex_0021F0" Format="ci8" Width="32" Height="32" Offset="0x21F0" TlutOffset="0x14B0"/>
         <DList Name="object_ssh_DL_004E60" Offset="0x4E60" />
         <DList Name="object_ssh_DL_005210" Offset="0x5210" />
         <DList Name="object_ssh_DL_0056A0" Offset="0x56A0" />
diff --git a/assets/xml/objects/object_st.xml b/assets/xml/objects/object_st.xml
index 41201b9d41..d99481875c 100644
--- a/assets/xml/objects/object_st.xml
+++ b/assets/xml/objects/object_st.xml
@@ -1,4 +1,7 @@
 <Root>
+    <!-- Dependencies -->
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
+
     <File Name="object_st" Segment="6">
         <Animation Name="object_st_Anim_000304" Offset="0x304" /> <!-- Original name is "st_matsu" -->
         <Texture Name="object_st_Tex_000320" OutName="tex_000320" Format="i4" Width="16" Height="8" Offset="0x320" />
diff --git a/assets/xml/objects/object_stream.xml b/assets/xml/objects/object_stream.xml
index 2e49af9163..d27b2ab8d7 100644
--- a/assets/xml/objects/object_stream.xml
+++ b/assets/xml/objects/object_stream.xml
@@ -1,4 +1,7 @@
 <Root>
+    <!-- Dependencies -->
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
+
     <!-- Used for the unused water vortex actor. -->
     <File Name="object_stream" Segment="6">
         <Texture Name="gWaterVortexTex" OutName="water_vortex" Format="i4" Width="64" Height="64" Offset="0x0" />
diff --git a/assets/xml/objects/object_syokudai.xml b/assets/xml/objects/object_syokudai.xml
index e31c307b35..c123b5d315 100644
--- a/assets/xml/objects/object_syokudai.xml
+++ b/assets/xml/objects/object_syokudai.xml
@@ -1,5 +1,7 @@
 <Root>
+    <!-- Dependencies -->
     <ExternalFile XmlPath="objects/gameplay_dangeon_keep.xml" OutPath="assets/objects/gameplay_dangeon_keep/"/>
+
     <File Name="object_syokudai" Segment="6">
         <DList Name="gObjectSyokudaiTypeSwitchCausesFlameDL" Offset="0x3A0" /> <!-- Original name is "syokudai_model" -->
         <DList Name="gObjectSyokudaiTypeNoSwitchDL" Offset="0x870" /> <!-- Original name is "syokudai_isi_model" -->
diff --git a/assets/xml/objects/object_syoten.xml b/assets/xml/objects/object_syoten.xml
index 2516167574..871a0f91cb 100644
--- a/assets/xml/objects/object_syoten.xml
+++ b/assets/xml/objects/object_syoten.xml
@@ -1,4 +1,7 @@
 <Root>
+    <!-- Dependencies -->
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
+
     <File Name="object_syoten" Segment="6">
         <KeyFrameAnimation Name="object_syoten_KFAnim_00023C" Skel="0x1328" Offset="0x23C"/>
         <DList Name="object_syoten_DL_000450" Offset="0x450" />
diff --git a/assets/xml/objects/object_tab.xml b/assets/xml/objects/object_tab.xml
index 4305c3cd61..092eabc80c 100644
--- a/assets/xml/objects/object_tab.xml
+++ b/assets/xml/objects/object_tab.xml
@@ -25,10 +25,10 @@
         <Texture Name="gBartenMouthTex" OutName="barten_mouth" Format="ci8" Width="8" Height="8" Offset="0x6328" TlutOffset="0x5CA8"/>
         <Texture Name="gBartenHairTex" OutName="barten_hair" Format="ci8" Width="8" Height="16" Offset="0x6368" TlutOffset="0x5CA8"/>
         <Texture Name="gBartenEarTex" OutName="barten_ear" Format="ci8" Width="8" Height="8" Offset="0x63E8" TlutOffset="0x5CA8"/>
-        <Texture Name="gBartenEyeOpenTex" OutName="barten_eye_open" Format="ci8" Width="32" Height="32" Offset="0x6428" />
+        <Texture Name="gBartenEyeOpenTex" OutName="barten_eye_open" Format="ci8" Width="32" Height="32" Offset="0x6428" TlutOffset="0x5EA8"/>
         <Texture Name="gBartenHandTex" OutName="barten_hand" Format="ci8" Width="16" Height="16" Offset="0x6828" TlutOffset="0x5CA8"/>
-        <Texture Name="gBartenEyeHalfOpenTex" OutName="barten_eye_half_open" Format="ci8" Width="32" Height="32" Offset="0x6928" />
-        <Texture Name="gBartenEyeClosedTex" OutName="barten_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x6D28" />
+        <Texture Name="gBartenEyeHalfOpenTex" OutName="barten_eye_half_open" Format="ci8" Width="32" Height="32" Offset="0x6928" TlutOffset="0x5EA8"/>
+        <Texture Name="gBartenEyeClosedTex" OutName="barten_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x6D28" TlutOffset="0x5EA8"/>
         <Texture Name="gBartenBroomTex" OutName="barten_broom" Format="ci8" Width="16" Height="16" Offset="0x7128" TlutOffset="0x5CA8"/>
         <Texture Name="gBartenBroomHeadTex" OutName="barten_broom_head" Format="ci8" Width="16" Height="16" Offset="0x7228" TlutOffset="0x5CA8"/>
         <Texture Name="gBartenPantsTex" OutName="barten_pants" Format="i8" Width="32" Height="32" Offset="0x7328" />
diff --git a/assets/xml/objects/object_trap.xml b/assets/xml/objects/object_trap.xml
index c138769f4f..5b9d249444 100644
--- a/assets/xml/objects/object_trap.xml
+++ b/assets/xml/objects/object_trap.xml
@@ -1,4 +1,7 @@
 <Root>
+    <!-- Dependencies -->
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
+
     <File Name="object_trap" Segment="6">
         <Texture Name="object_trap_Tex_000000" OutName="tex_000000" Format="i8" Width="32" Height="32" Offset="0x0" />
         <Texture Name="object_trap_Tex_000400" OutName="tex_000400" Format="i8" Width="32" Height="32" Offset="0x400" />
diff --git a/assets/xml/objects/object_tsn.xml b/assets/xml/objects/object_tsn.xml
index 90e7553d4c..a1c96f4cd1 100644
--- a/assets/xml/objects/object_tsn.xml
+++ b/assets/xml/objects/object_tsn.xml
@@ -26,11 +26,11 @@
         <Texture Name="object_tsn_Tex_006CB8" OutName="tex_006CB8" Format="ci8" Width="32" Height="32" Offset="0x6CB8" TlutOffset="0x61F8"/>
         <Texture Name="object_tsn_Tex_0070B8" OutName="tex_0070B8" Format="rgba16" Width="16" Height="16" Offset="0x70B8" />
         <Texture Name="object_tsn_Tex_0072B8" OutName="tex_0072B8" Format="ci8" Width="16" Height="16" Offset="0x72B8" TlutOffset="0x61F8"/>
-        <Texture Name="object_tsn_Tex_0073B8" OutName="tex_0073B8" Format="ci8" Width="32" Height="32" Offset="0x73B8" />
+        <Texture Name="object_tsn_Tex_0073B8" OutName="tex_0073B8" Format="ci8" Width="32" Height="32" Offset="0x73B8" TlutOffset="0x61F8"/>
         <Texture Name="object_tsn_Tex_0077B8" OutName="tex_0077B8" Format="rgba16" Width="16" Height="32" Offset="0x77B8" />
         <Texture Name="object_tsn_Tex_007BB8" OutName="tex_007BB8" Format="rgba16" Width="16" Height="16" Offset="0x7BB8" />
         <Texture Name="object_tsn_Tex_007DB8" OutName="tex_007DB8" Format="rgba16" Width="32" Height="32" Offset="0x7DB8" />
-        <Texture Name="object_tsn_Tex_0085B8" OutName="tex_0085B8" Format="ci8" Width="32" Height="32" Offset="0x85B8" />
+        <Texture Name="object_tsn_Tex_0085B8" OutName="tex_0085B8" Format="ci8" Width="32" Height="32" Offset="0x85B8" TlutOffset="0x61F8"/>
         <Limb Name="object_tsn_Standardlimb_0089B8" Type="Standard" EnumName="OBJECT_TSN_LIMB_01" Offset="0x89B8" />
         <Limb Name="object_tsn_Standardlimb_0089C4" Type="Standard" EnumName="OBJECT_TSN_LIMB_02" Offset="0x89C4" />
         <Limb Name="object_tsn_Standardlimb_0089D0" Type="Standard" EnumName="OBJECT_TSN_LIMB_03" Offset="0x89D0" />
diff --git a/assets/xml/objects/object_water_effect.xml b/assets/xml/objects/object_water_effect.xml
index f0455f87df..7bc67747b4 100644
--- a/assets/xml/objects/object_water_effect.xml
+++ b/assets/xml/objects/object_water_effect.xml
@@ -1,4 +1,7 @@
 <Root>
+    <!-- Dependencies -->
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
+
     <File Name="object_water_effect" Segment="6">
         <DList Name="object_water_effect_DL_000180" Offset="0x180" /> <!-- Original name is "spl_hasira_model" -->
         <DList Name="object_water_effect_DL_000420" Offset="0x420" /> <!-- Original name is "spl_sibuki01_model" -->
diff --git a/assets/xml/objects/object_wood02.xml b/assets/xml/objects/object_wood02.xml
index 9379c632e7..de80d4a946 100644
--- a/assets/xml/objects/object_wood02.xml
+++ b/assets/xml/objects/object_wood02.xml
@@ -1,5 +1,7 @@
 <Root>
+    <!-- Dependencies -->
     <ExternalFile XmlPath="objects/gameplay_field_keep.xml" OutPath="assets/objects/gameplay_field_keep/"/>
+
     <File Name="object_wood02" Segment="6">
         <DList Name="object_wood02_DL_000090" Offset="0x90" /> <!-- Original name might be "grass01_modelT" -->
         <DList Name="object_wood02_DL_000160" Offset="0x160" />
diff --git a/assets/xml/objects/object_zo.xml b/assets/xml/objects/object_zo.xml
index 5399e76424..20c5b7a139 100644
--- a/assets/xml/objects/object_zo.xml
+++ b/assets/xml/objects/object_zo.xml
@@ -1,4 +1,7 @@
 <Root>
+    <!-- Dependencies -->
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
+
     <!-- Object for the Zoras -->
     <File Name="object_zo" Segment="6">
         <!-- Animations -->
diff --git a/assets/xml/objects/object_zoraegg.xml b/assets/xml/objects/object_zoraegg.xml
index 1dc6c0d5fa..2bcc32e395 100644
--- a/assets/xml/objects/object_zoraegg.xml
+++ b/assets/xml/objects/object_zoraegg.xml
@@ -17,11 +17,11 @@
         <Texture Name="gZoraBabyTLUT" OutName="zora_baby_tlut" Format="rgba16" Width="16" Height="16" Offset="0x2DF0" />
         <Texture Name="gZoraBabyTailFinTex" OutName="zora_baby_tail_fin" Format="ci8" Width="32" Height="32" Offset="0x2FF0" TlutOffset="0x2DF0"/>
         <Texture Name="gZoraBabySkinTex" OutName="zora_baby_skin" Format="ci8" Width="8" Height="8" Offset="0x33F0" TlutOffset="0x2DF0"/>
-        <Texture Name="gZoraBabyEyeOpenTex" OutName="zora_baby_eye_open" Format="ci8" Width="32" Height="32" Offset="0x3430" />
+        <Texture Name="gZoraBabyEyeOpenTex" OutName="zora_baby_eye_open" Format="ci8" Width="32" Height="32" Offset="0x3430" TlutOffset="0x2DF0"/>
         <Texture Name="gZoraBabySkinPatternTex" OutName="zora_baby_skin_pattern" Format="ci8" Width="32" Height="64" Offset="0x3830" TlutOffset="0x2DF0"/>
         <Texture Name="gZoraBabyPectoralFinTex" OutName="zora_baby_pectoral_fin" Format="ci8" Width="32" Height="32" Offset="0x4030" TlutOffset="0x2DF0"/>
-        <Texture Name="gZoraBabyEyeHalfTex" OutName="zora_baby_eye_half" Format="ci8" Width="32" Height="32" Offset="0x4430" />
-        <Texture Name="gZoraBabyEyeClosedTex" OutName="zora_baby_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x4830" />
+        <Texture Name="gZoraBabyEyeHalfTex" OutName="zora_baby_eye_half" Format="ci8" Width="32" Height="32" Offset="0x4430" TlutOffset="0x2DF0"/>
+        <Texture Name="gZoraBabyEyeClosedTex" OutName="zora_baby_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x4830" TlutOffset="0x2DF0"/>
 
         <!-- Zora Baby Limbs -->
         <Limb Name="gZoraBabyHeadLimb" Type="Standard" EnumName="ZORA_BABY_LIMB_HEAD" Offset="0x4C30" />
diff --git a/assets/xml/objects/object_zov.xml b/assets/xml/objects/object_zov.xml
index db081e79b9..b366f57443 100644
--- a/assets/xml/objects/object_zov.xml
+++ b/assets/xml/objects/object_zov.xml
@@ -44,17 +44,17 @@
         <Texture Name="gLuluEarringTex" OutName="lulu_earring" Format="rgba16" Width="8" Height="16" Offset="0x13478" />
         <Texture Name="gLuluSkinTex" OutName="lulu_skin" Format="ci8" Width="8" Height="8" Offset="0x13578" TlutOffset="0x13278"/>
         <Texture Name="gLuluNostrilTex" OutName="lulu_nostril" Format="ci8" Width="8" Height="8" Offset="0x135B8" TlutOffset="0x13278"/>
-        <Texture Name="gLuluMouthClosedTex" OutName="lulu_mouth_closed" Format="ci8" Width="32" Height="32" Offset="0x135F8" />
+        <Texture Name="gLuluMouthClosedTex" OutName="lulu_mouth_closed" Format="ci8" Width="32" Height="32" Offset="0x135F8" TlutOffset="0x13278"/>
         <Texture Name="gLuluHeadSkinTex" OutName="lulu_head_skin" Format="ci8" Width="16" Height="16" Offset="0x139F8" TlutOffset="0x13278"/>
         <Texture Name="gLuluEarCavityTex" OutName="lulu_ear_cavity" Format="ci8" Width="8" Height="8" Offset="0x13AF8" TlutOffset="0x13278"/>
         <Texture Name="gLuluHeadHoleTex" OutName="lulu_head_hole" Format="ci8" Width="16" Height="16" Offset="0x13B38" TlutOffset="0x13278"/>
-        <Texture Name="gLuluEyeOpenTex" OutName="lulu_eye_open" Format="ci8" Width="32" Height="32" Offset="0x13C38" />
+        <Texture Name="gLuluEyeOpenTex" OutName="lulu_eye_open" Format="ci8" Width="32" Height="32" Offset="0x13C38" TlutOffset="0x13278"/>
         <Texture Name="gLuluEarTex" OutName="lulu_ear" Format="ci8" Width="16" Height="16" Offset="0x14038" TlutOffset="0x13278"/>
-        <Texture Name="gLuluEyeClosedTex" OutName="lulu_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x14138" />
-        <Texture Name="gLuluMouthOpenTex" OutName="lulu_mouth_open" Format="ci8" Width="32" Height="32" Offset="0x14538" />
+        <Texture Name="gLuluEyeClosedTex" OutName="lulu_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x14138" TlutOffset="0x13278"/>
+        <Texture Name="gLuluMouthOpenTex" OutName="lulu_mouth_open" Format="ci8" Width="32" Height="32" Offset="0x14538" TlutOffset="0x13278"/>
         <Texture Name="gLuluSpottedSkinTex" OutName="lulu_spotted_skin" Format="ci8" Width="32" Height="32" Offset="0x14938" TlutOffset="0x13278"/>
-        <Texture Name="gLuluMouthOpenFullTex" OutName="lulu_mouth_open_full" Format="ci8" Width="32" Height="32" Offset="0x14D38" />
-        <Texture Name="gLuluEyeHalfTex" OutName="lulu_eye_half" Format="ci8" Width="32" Height="32" Offset="0x15138" />
+        <Texture Name="gLuluMouthOpenFullTex" OutName="lulu_mouth_open_full" Format="ci8" Width="32" Height="32" Offset="0x14D38" TlutOffset="0x13278"/>
+        <Texture Name="gLuluEyeHalfTex" OutName="lulu_eye_half" Format="ci8" Width="32" Height="32" Offset="0x15138" TlutOffset="0x13278"/>
         <Texture Name="gLuluSkinShadowTex" OutName="lulu_skin_shadow" Format="ci8" Width="8" Height="8" Offset="0x15538" TlutOffset="0x13278"/>
         <Texture Name="gLuluKneeAndElbowTex" OutName="lulu_knee_and_elbow" Format="ci8" Width="16" Height="16" Offset="0x15578" TlutOffset="0x13278"/>
         <Texture Name="gLuluFingersTex" OutName="lulu_fingers" Format="ci8" Width="16" Height="16" Offset="0x15678" TlutOffset="0x13278"/>
diff --git a/assets/xml/overlays/ovl_En_Bom.xml b/assets/xml/overlays/ovl_En_Bom.xml
index 3db4c2b97d..10ac584175 100644
--- a/assets/xml/overlays/ovl_En_Bom.xml
+++ b/assets/xml/overlays/ovl_En_Bom.xml
@@ -9,12 +9,12 @@
 
         <!-- Textures and DisplayList for the Powder Keg -->
         <Texture Name="gPowderKegBarrelTLUT" OutName="powder_keg_barrel_tlut" Format="rgba16" Width="16" Height="16" Offset="0x22B0"/>
-        <Texture Name="gPowderKegBarrelTex" OutName="powder_keg_barrel" Format="ci8" Width="32" Height="32" Offset="0x24B0"/>
+        <Texture Name="gPowderKegBarrelTex" OutName="powder_keg_barrel" Format="ci8" Width="32" Height="32" Offset="0x24B0" TlutOffset="0x22B0"/>
         <DList Name="gPowderKegBarrelDL" Offset="0x2EF0"/> <!-- Original name is "bb_model_model" -->
 
         <!-- Textures and DisplayList for the Goron Skull on the side of the Powder Keg -->
         <Texture Name="gPowderKegGoronSkullTLUT" OutName="powder_keg_goron_skull_tlut" Format="rgba16" Width="16" Height="16" Offset="0x3048"/>
-        <Texture Name="gPowderKegGoronSkullTex" OutName="powder_keg_goron_skull" Format="ci8" Width="16" Height="32" Offset="0x3248"/>
+        <Texture Name="gPowderKegGoronSkullTex" OutName="powder_keg_goron_skull" Format="ci8" Width="16" Height="32" Offset="0x3248" TlutOffset="0x3048"/>
         <DList Name="gPowderKegGoronSkullDL" Offset="0x3548"/> <!-- Original name is "bb_relief_model" -->
     </File>
 </Root>
diff --git a/assets/xml/overlays/ovl_Obj_Grass.xml b/assets/xml/overlays/ovl_Obj_Grass.xml
index 5c8d55e4a8..946703389e 100644
--- a/assets/xml/overlays/ovl_Obj_Grass.xml
+++ b/assets/xml/overlays/ovl_Obj_Grass.xml
@@ -1,5 +1,7 @@
 <Root>
+    <!-- Dependencies -->
     <ExternalFile XmlPath="objects/gameplay_field_keep.xml" OutPath="assets/objects/gameplay_field_keep/"/>
+
     <File Name="ovl_Obj_Grass" BaseAddress="0x809A9110" RangeStart="0x18E0" RangeEnd="0x19F0">
         <DList Name="gObjGrass_D_809AA9F0" Offset="0x18E0"/>
         <DList Name="gObjGrass_D_809AAA68" Offset="0x1958"/>
diff --git a/assets/xml/overlays/ovl_Oceff_Storm.xml b/assets/xml/overlays/ovl_Oceff_Storm.xml
index 949c849c25..39cb2b602a 100644
--- a/assets/xml/overlays/ovl_Oceff_Storm.xml
+++ b/assets/xml/overlays/ovl_Oceff_Storm.xml
@@ -1,5 +1,7 @@
 <Root>
+    <!-- Dependencies -->
     <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
+
     <File Name="ovl_Oceff_Storm" BaseAddress="0x80981760" RangeStart="0x830" RangeEnd="0x1BC0">
         <Texture Name="sSongOfStormsEffectTex" OutName="song_of_storms_effect" Format="i8" Width="64" Height="64" Offset="0x830"/>
         <DList Name="sSongOfStormsMaterialDL" Offset="0x1830"/>
diff --git a/assets/xml/overlays/ovl_Oceff_Wipe4.xml b/assets/xml/overlays/ovl_Oceff_Wipe4.xml
index 1dc2e49fb3..8898177459 100644
--- a/assets/xml/overlays/ovl_Oceff_Wipe4.xml
+++ b/assets/xml/overlays/ovl_Oceff_Wipe4.xml
@@ -1,5 +1,7 @@
 <Root>
+    <!-- Dependencies -->
     <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
+
     <File Name="ovl_Oceff_Wipe4" BaseAddress="0x8099D780" RangeStart="0x430" RangeEnd="0xF18">
         <Texture Name="sScarecrowSongEffectTex" OutName="scarecrow_song_effect" Format="i8" Width="32" Height="64" Offset="0x430"/>
         <Array Name="sScarecrowSongFrustumVtx" Count="22" Offset="0xC30">
diff --git a/assets/xml/overlays/ovl_Oceff_Wipe6.xml b/assets/xml/overlays/ovl_Oceff_Wipe6.xml
index 3e8418af15..8ed1292465 100644
--- a/assets/xml/overlays/ovl_Oceff_Wipe6.xml
+++ b/assets/xml/overlays/ovl_Oceff_Wipe6.xml
@@ -1,5 +1,7 @@
 <Root>
+    <!-- Dependencies -->
     <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
+
     <File Name="ovl_Oceff_Wipe6" BaseAddress="0x80BCA5A0" RangeStart="0x330" RangeEnd="0x5B8">
         <TextureAnimation Name="ovl_Oceff_Wipe6_Matanimheader_000338" Offset="0x338" />
         <Array Name="gOceff6Vtx" Count="22" Offset="0x340">
diff --git a/assets/xml/overlays/ovl_Oceff_Wipe7.xml b/assets/xml/overlays/ovl_Oceff_Wipe7.xml
index 57dd72a838..3f70268f2c 100644
--- a/assets/xml/overlays/ovl_Oceff_Wipe7.xml
+++ b/assets/xml/overlays/ovl_Oceff_Wipe7.xml
@@ -1,5 +1,7 @@
 <Root>
+    <!-- Dependencies -->
     <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
+
     <File Name="ovl_Oceff_Wipe7" BaseAddress="0x80BCDCB0" RangeStart="0x330" RangeEnd="0xDB8">
         <Texture Name="sSongofHealingEffectTex" OutName="song_of_healing_effect" Format="i8" Width="32" Height="64" Offset="0x330"/>
         <TextureAnimation Name="sSongofHealingEffectTexAnim" Offset="0xB38" />
diff --git a/assets/xml/scenes/Z2_00KEIKOKU/Z2_00KEIKOKU.xml b/assets/xml/scenes/Z2_00KEIKOKU/Z2_00KEIKOKU.xml
index 7c0fd926fe..1c69276932 100644
--- a/assets/xml/scenes/Z2_00KEIKOKU/Z2_00KEIKOKU.xml
+++ b/assets/xml/scenes/Z2_00KEIKOKU/Z2_00KEIKOKU.xml
@@ -1,5 +1,7 @@
 <Root>
+    <!-- Dependencies -->
     <ExternalFile XmlPath="misc/scene_texture_08.xml" OutPath="assets/misc/scene_texture_08/"/>
+
     <File Name="Z2_00KEIKOKU" Segment="2" Game="MM">
         <Scene Name="Z2_00KEIKOKU" Offset="0x0"/>
         <Cutscene Name="gTerminaFieldClockTowerOpeningCs" Offset="0x9D8"/> <!-- Original name is "clock_t_change" -->
diff --git a/assets/xml/scenes/Z2_10YUKIYAMANOMURA/Z2_10YUKIYAMANOMURA.xml b/assets/xml/scenes/Z2_10YUKIYAMANOMURA/Z2_10YUKIYAMANOMURA.xml
index 4507c645d1..eefe65c0bb 100644
--- a/assets/xml/scenes/Z2_10YUKIYAMANOMURA/Z2_10YUKIYAMANOMURA.xml
+++ b/assets/xml/scenes/Z2_10YUKIYAMANOMURA/Z2_10YUKIYAMANOMURA.xml
@@ -1,5 +1,7 @@
 <Root>
+    <!-- Dependencies -->
     <ExternalFile XmlPath="misc/scene_texture_04.xml" OutPath="assets/misc/scene_texture_04/"/>
+
     <File Name="Z2_10YUKIYAMANOMURA" Segment="2" Game="MM">
         <Scene Name="Z2_10YUKIYAMANOMURA" Offset="0x0"/>
     </File>
diff --git a/assets/xml/scenes/Z2_10YUKIYAMANOMURA2/Z2_10YUKIYAMANOMURA2.xml b/assets/xml/scenes/Z2_10YUKIYAMANOMURA2/Z2_10YUKIYAMANOMURA2.xml
index 6c5edfb8f2..58cc577cf6 100644
--- a/assets/xml/scenes/Z2_10YUKIYAMANOMURA2/Z2_10YUKIYAMANOMURA2.xml
+++ b/assets/xml/scenes/Z2_10YUKIYAMANOMURA2/Z2_10YUKIYAMANOMURA2.xml
@@ -1,5 +1,7 @@
 <Root>
+    <!-- Dependencies -->
     <ExternalFile XmlPath="misc/scene_texture_04.xml" OutPath="assets/misc/scene_texture_04/"/>
+
     <File Name="Z2_10YUKIYAMANOMURA2" Segment="2" Game="MM">
         <Scene Name="Z2_10YUKIYAMANOMURA2" Offset="0x0"/>
     </File>
diff --git a/assets/xml/scenes/Z2_11GORONNOSATO/Z2_11GORONNOSATO.xml b/assets/xml/scenes/Z2_11GORONNOSATO/Z2_11GORONNOSATO.xml
index b04b4c75f1..770234b057 100644
--- a/assets/xml/scenes/Z2_11GORONNOSATO/Z2_11GORONNOSATO.xml
+++ b/assets/xml/scenes/Z2_11GORONNOSATO/Z2_11GORONNOSATO.xml
@@ -1,5 +1,7 @@
 <Root>
+    <!-- Dependencies -->
     <ExternalFile XmlPath="misc/scene_texture_04.xml" OutPath="assets/misc/scene_texture_04/"/>
+
     <File Name="Z2_11GORONNOSATO" Segment="2" Game="MM">
         <Scene Name="Z2_11GORONNOSATO" Offset="0x0"/>
     </File>
diff --git a/assets/xml/scenes/Z2_11GORONNOSATO2/Z2_11GORONNOSATO2.xml b/assets/xml/scenes/Z2_11GORONNOSATO2/Z2_11GORONNOSATO2.xml
index 8a40042d5c..83c8244a5e 100644
--- a/assets/xml/scenes/Z2_11GORONNOSATO2/Z2_11GORONNOSATO2.xml
+++ b/assets/xml/scenes/Z2_11GORONNOSATO2/Z2_11GORONNOSATO2.xml
@@ -1,5 +1,7 @@
 <Root>
+    <!-- Dependencies -->
     <ExternalFile XmlPath="misc/scene_texture_04.xml" OutPath="assets/misc/scene_texture_04/"/>
+
     <File Name="Z2_11GORONNOSATO2" Segment="2" Game="MM">
         <Scene Name="Z2_11GORONNOSATO2" Offset="0x0"/>
     </File>
diff --git a/assets/xml/scenes/Z2_12HAKUGINMAE/Z2_12HAKUGINMAE.xml b/assets/xml/scenes/Z2_12HAKUGINMAE/Z2_12HAKUGINMAE.xml
index 09cdfd338d..31ff6411e2 100644
--- a/assets/xml/scenes/Z2_12HAKUGINMAE/Z2_12HAKUGINMAE.xml
+++ b/assets/xml/scenes/Z2_12HAKUGINMAE/Z2_12HAKUGINMAE.xml
@@ -1,5 +1,7 @@
 <Root>
+    <!-- Dependencies -->
     <ExternalFile XmlPath="misc/scene_texture_04.xml" OutPath="assets/misc/scene_texture_04/"/>
+
     <File Name="Z2_12HAKUGINMAE" Segment="2" Game="MM">
         <Scene Name="Z2_12HAKUGINMAE" Offset="0x0"/>
     </File>
diff --git a/assets/xml/scenes/Z2_14YUKIDAMANOMITI/Z2_14YUKIDAMANOMITI.xml b/assets/xml/scenes/Z2_14YUKIDAMANOMITI/Z2_14YUKIDAMANOMITI.xml
index 18bc0256c8..69b3bcbe58 100644
--- a/assets/xml/scenes/Z2_14YUKIDAMANOMITI/Z2_14YUKIDAMANOMITI.xml
+++ b/assets/xml/scenes/Z2_14YUKIDAMANOMITI/Z2_14YUKIDAMANOMITI.xml
@@ -1,5 +1,7 @@
 <Root>
+    <!-- Dependencies -->
     <ExternalFile XmlPath="misc/scene_texture_04.xml" OutPath="assets/misc/scene_texture_04/"/>
+
     <File Name="Z2_14YUKIDAMANOMITI" Segment="2" Game="MM">
         <Scene Name="Z2_14YUKIDAMANOMITI" Offset="0x0"/>
     </File>
diff --git a/assets/xml/scenes/Z2_17SETUGEN/Z2_17SETUGEN.xml b/assets/xml/scenes/Z2_17SETUGEN/Z2_17SETUGEN.xml
index 679d4140b1..70956a343f 100644
--- a/assets/xml/scenes/Z2_17SETUGEN/Z2_17SETUGEN.xml
+++ b/assets/xml/scenes/Z2_17SETUGEN/Z2_17SETUGEN.xml
@@ -1,5 +1,7 @@
 <Root>
+    <!-- Dependencies -->
     <ExternalFile XmlPath="misc/scene_texture_04.xml" OutPath="assets/misc/scene_texture_04/"/>
+
     <File Name="Z2_17SETUGEN" Segment="2" Game="MM">
         <Scene Name="Z2_17SETUGEN" Offset="0x0"/>
     </File>
diff --git a/assets/xml/scenes/Z2_17SETUGEN2/Z2_17SETUGEN2.xml b/assets/xml/scenes/Z2_17SETUGEN2/Z2_17SETUGEN2.xml
index 5d5e0f3977..28c159f219 100644
--- a/assets/xml/scenes/Z2_17SETUGEN2/Z2_17SETUGEN2.xml
+++ b/assets/xml/scenes/Z2_17SETUGEN2/Z2_17SETUGEN2.xml
@@ -1,5 +1,7 @@
 <Root>
+    <!-- Dependencies -->
     <ExternalFile XmlPath="misc/scene_texture_04.xml" OutPath="assets/misc/scene_texture_04/"/>
+
     <File Name="Z2_17SETUGEN2" Segment="2" Game="MM">
         <Scene Name="Z2_17SETUGEN2" Offset="0x0"/>
     </File>
diff --git a/assets/xml/scenes/Z2_20SICHITAI/Z2_20SICHITAI.xml b/assets/xml/scenes/Z2_20SICHITAI/Z2_20SICHITAI.xml
index bb754b183d..69e97a3b0e 100644
--- a/assets/xml/scenes/Z2_20SICHITAI/Z2_20SICHITAI.xml
+++ b/assets/xml/scenes/Z2_20SICHITAI/Z2_20SICHITAI.xml
@@ -1,5 +1,7 @@
 <Root>
+    <!-- Dependencies -->
     <ExternalFile XmlPath="misc/scene_texture_06.xml" OutPath="assets/misc/scene_texture_06/"/>
+
     <File Name="Z2_20SICHITAI" Segment="2" Game="MM">
         <Scene Name="Z2_20SICHITAI" Offset="0x0"/>
     </File>
diff --git a/assets/xml/scenes/Z2_20SICHITAI2/Z2_20SICHITAI2.xml b/assets/xml/scenes/Z2_20SICHITAI2/Z2_20SICHITAI2.xml
index 6206f764b0..8d39d7ead9 100644
--- a/assets/xml/scenes/Z2_20SICHITAI2/Z2_20SICHITAI2.xml
+++ b/assets/xml/scenes/Z2_20SICHITAI2/Z2_20SICHITAI2.xml
@@ -1,5 +1,7 @@
 <Root>
+    <!-- Dependencies -->
     <ExternalFile XmlPath="misc/scene_texture_06.xml" OutPath="assets/misc/scene_texture_06/"/>
+
     <File Name="Z2_20SICHITAI2" Segment="2" Game="MM">
         <Scene Name="Z2_20SICHITAI2" Offset="0x0"/>
     </File>
diff --git a/assets/xml/scenes/Z2_22DEKUCITY/Z2_22DEKUCITY.xml b/assets/xml/scenes/Z2_22DEKUCITY/Z2_22DEKUCITY.xml
index 9d801149bf..6d28a65825 100644
--- a/assets/xml/scenes/Z2_22DEKUCITY/Z2_22DEKUCITY.xml
+++ b/assets/xml/scenes/Z2_22DEKUCITY/Z2_22DEKUCITY.xml
@@ -1,5 +1,7 @@
 <Root>
+    <!-- Dependencies -->
     <ExternalFile XmlPath="misc/scene_texture_06.xml" OutPath="assets/misc/scene_texture_06/"/>
+
     <File Name="Z2_22DEKUCITY" Segment="2" Game="MM">
         <Scene Name="Z2_22DEKUCITY" Offset="0x0"/>
     </File>
diff --git a/assets/xml/scenes/Z2_24KEMONOMITI/Z2_24KEMONOMITI.xml b/assets/xml/scenes/Z2_24KEMONOMITI/Z2_24KEMONOMITI.xml
index 9980c1d633..fe0d12be53 100644
--- a/assets/xml/scenes/Z2_24KEMONOMITI/Z2_24KEMONOMITI.xml
+++ b/assets/xml/scenes/Z2_24KEMONOMITI/Z2_24KEMONOMITI.xml
@@ -1,5 +1,7 @@
 <Root>
+    <!-- Dependencies -->
     <ExternalFile XmlPath="misc/scene_texture_08.xml" OutPath="assets/misc/scene_texture_08/"/>
+
     <File Name="Z2_24KEMONOMITI" Segment="2" Game="MM">
         <Scene Name="Z2_24KEMONOMITI" Offset="0x0"/>
     </File>
diff --git a/assets/xml/scenes/Z2_26SARUNOMORI/Z2_26SARUNOMORI.xml b/assets/xml/scenes/Z2_26SARUNOMORI/Z2_26SARUNOMORI.xml
index ea3c261095..6f0cda716d 100644
--- a/assets/xml/scenes/Z2_26SARUNOMORI/Z2_26SARUNOMORI.xml
+++ b/assets/xml/scenes/Z2_26SARUNOMORI/Z2_26SARUNOMORI.xml
@@ -1,5 +1,7 @@
 <Root>
+    <!-- Dependencies -->
     <ExternalFile XmlPath="misc/scene_texture_06.xml" OutPath="assets/misc/scene_texture_06/"/>
+
     <File Name="Z2_26SARUNOMORI" Segment="2" Game="MM">
         <Scene Name="Z2_26SARUNOMORI" Offset="0x0"/>
     </File>
diff --git a/assets/xml/scenes/Z2_30GYOSON/Z2_30GYOSON.xml b/assets/xml/scenes/Z2_30GYOSON/Z2_30GYOSON.xml
index 87b36eb1ac..a506b27c1e 100644
--- a/assets/xml/scenes/Z2_30GYOSON/Z2_30GYOSON.xml
+++ b/assets/xml/scenes/Z2_30GYOSON/Z2_30GYOSON.xml
@@ -1,5 +1,7 @@
 <Root>
+    <!-- Dependencies -->
     <ExternalFile XmlPath="misc/scene_texture_05.xml" OutPath="assets/misc/scene_texture_05/"/>
+
     <File Name="Z2_30GYOSON" Segment="2" Game="MM">
         <Scene Name="Z2_30GYOSON" Offset="0x0"/>
     </File>
diff --git a/assets/xml/scenes/Z2_31MISAKI/Z2_31MISAKI.xml b/assets/xml/scenes/Z2_31MISAKI/Z2_31MISAKI.xml
index ea108f732a..bb8045e0fe 100644
--- a/assets/xml/scenes/Z2_31MISAKI/Z2_31MISAKI.xml
+++ b/assets/xml/scenes/Z2_31MISAKI/Z2_31MISAKI.xml
@@ -1,5 +1,7 @@
 <Root>
+    <!-- Dependencies -->
     <ExternalFile XmlPath="misc/scene_texture_05.xml" OutPath="assets/misc/scene_texture_05/"/>
+
     <File Name="Z2_31MISAKI" Segment="2" Game="MM">
         <Scene Name="Z2_31MISAKI" Offset="0x0"/>
     </File>
diff --git a/assets/xml/scenes/Z2_AYASHIISHOP/Z2_AYASHIISHOP.xml b/assets/xml/scenes/Z2_AYASHIISHOP/Z2_AYASHIISHOP.xml
index 085f4ef4ce..8c39d9dae8 100644
--- a/assets/xml/scenes/Z2_AYASHIISHOP/Z2_AYASHIISHOP.xml
+++ b/assets/xml/scenes/Z2_AYASHIISHOP/Z2_AYASHIISHOP.xml
@@ -1,5 +1,7 @@
 <Root>
+    <!-- Dependencies -->
     <ExternalFile XmlPath="misc/scene_texture_02.xml" OutPath="assets/misc/scene_texture_02/"/>
+
     <File Name="Z2_AYASHIISHOP" Segment="2" Game="MM">
         <Scene Name="Z2_AYASHIISHOP" Offset="0x0"/>
     </File>
diff --git a/assets/xml/scenes/Z2_DOUJOU/Z2_DOUJOU.xml b/assets/xml/scenes/Z2_DOUJOU/Z2_DOUJOU.xml
index f3c5ad994a..e061628888 100644
--- a/assets/xml/scenes/Z2_DOUJOU/Z2_DOUJOU.xml
+++ b/assets/xml/scenes/Z2_DOUJOU/Z2_DOUJOU.xml
@@ -1,5 +1,7 @@
 <Root>
+    <!-- Dependencies -->
     <ExternalFile XmlPath="misc/scene_texture_01.xml" OutPath="assets/misc/scene_texture_01/"/>
+
     <File Name="Z2_DOUJOU" Segment="2" Game="MM">
         <Scene Name="Z2_DOUJOU" Offset="0x0"/>
     </File>
diff --git a/assets/xml/scenes/Z2_KAJIYA/Z2_KAJIYA.xml b/assets/xml/scenes/Z2_KAJIYA/Z2_KAJIYA.xml
index 998338ea9f..cdfeb524b7 100644
--- a/assets/xml/scenes/Z2_KAJIYA/Z2_KAJIYA.xml
+++ b/assets/xml/scenes/Z2_KAJIYA/Z2_KAJIYA.xml
@@ -1,5 +1,7 @@
 <Root>
+    <!-- Dependencies -->
     <ExternalFile XmlPath="misc/scene_texture_02.xml" OutPath="assets/misc/scene_texture_02/"/>
+
     <File Name="Z2_KAJIYA" Segment="2" Game="MM">
         <Scene Name="Z2_KAJIYA" Offset="0x0"/>
     </File>
diff --git a/assets/xml/scenes/Z2_ROMANYMAE/Z2_ROMANYMAE.xml b/assets/xml/scenes/Z2_ROMANYMAE/Z2_ROMANYMAE.xml
index 414ab53f24..1810d51f1f 100644
--- a/assets/xml/scenes/Z2_ROMANYMAE/Z2_ROMANYMAE.xml
+++ b/assets/xml/scenes/Z2_ROMANYMAE/Z2_ROMANYMAE.xml
@@ -1,5 +1,7 @@
 <Root>
+    <!-- Dependencies -->
     <ExternalFile XmlPath="misc/scene_texture_08.xml" OutPath="assets/misc/scene_texture_08/"/>
+
     <File Name="Z2_ROMANYMAE" Segment="2" Game="MM">
         <Scene Name="Z2_ROMANYMAE" Offset="0x0"/>
     </File>
diff --git a/assets/xml/scenes/Z2_SINKAI/Z2_SINKAI.xml b/assets/xml/scenes/Z2_SINKAI/Z2_SINKAI.xml
index d8c737f04c..2e8550700e 100644
--- a/assets/xml/scenes/Z2_SINKAI/Z2_SINKAI.xml
+++ b/assets/xml/scenes/Z2_SINKAI/Z2_SINKAI.xml
@@ -1,5 +1,7 @@
 <Root>
+    <!-- Dependencies -->
     <ExternalFile XmlPath="misc/scene_texture_05.xml" OutPath="assets/misc/scene_texture_05/"/>
+
     <File Name="Z2_SINKAI" Segment="2" Game="MM">
         <Scene Name="Z2_SINKAI" Offset="0x0"/>
     </File>
diff --git a/assets/xml/scenes/Z2_SONCHONOIE/Z2_SONCHONOIE.xml b/assets/xml/scenes/Z2_SONCHONOIE/Z2_SONCHONOIE.xml
index fa585c218e..56bfa14e32 100644
--- a/assets/xml/scenes/Z2_SONCHONOIE/Z2_SONCHONOIE.xml
+++ b/assets/xml/scenes/Z2_SONCHONOIE/Z2_SONCHONOIE.xml
@@ -1,5 +1,7 @@
 <Root>
+    <!-- Dependencies -->
     <ExternalFile XmlPath="misc/scene_texture_01.xml" OutPath="assets/misc/scene_texture_01/"/>
+
     <File Name="Z2_SONCHONOIE" Segment="2" Game="MM">
         <Scene Name="Z2_SONCHONOIE" Offset="0x0"/>
     </File>
diff --git a/assets/xml/scenes/Z2_TORIDE/Z2_TORIDE.xml b/assets/xml/scenes/Z2_TORIDE/Z2_TORIDE.xml
index 774130e6e6..df43a10337 100644
--- a/assets/xml/scenes/Z2_TORIDE/Z2_TORIDE.xml
+++ b/assets/xml/scenes/Z2_TORIDE/Z2_TORIDE.xml
@@ -1,5 +1,7 @@
 <Root>
+    <!-- Dependencies -->
     <ExternalFile XmlPath="misc/scene_texture_05.xml" OutPath="assets/misc/scene_texture_05/"/>
+
     <File Name="Z2_TORIDE" Segment="2" Game="MM">
         <Scene Name="Z2_TORIDE" Offset="0x0"/>
     </File>
diff --git a/assets/xml/scenes/Z2_YADOYA/Z2_YADOYA.xml b/assets/xml/scenes/Z2_YADOYA/Z2_YADOYA.xml
index 7e757d881b..29ab18fb44 100644
--- a/assets/xml/scenes/Z2_YADOYA/Z2_YADOYA.xml
+++ b/assets/xml/scenes/Z2_YADOYA/Z2_YADOYA.xml
@@ -1,5 +1,7 @@
 <Root>
+    <!-- Dependencies -->
     <ExternalFile XmlPath="misc/scene_texture_01.xml" OutPath="assets/misc/scene_texture_01/"/>
+
     <File Name="Z2_YADOYA" Segment="2" Game="MM">
         <Scene Name="Z2_YADOYA" Offset="0x0"/>
     </File>