From 924d8e81b9ec84145ef2910d1566ea1b2dc16bdb Mon Sep 17 00:00:00 2001
From: Dragorn421 <Dragorn421@users.noreply.github.com>
Date: Fri, 7 Feb 2025 18:43:09 +0100
Subject: [PATCH] Assets fixups (#2454)

* Assets fixups

* gDCRoom0TLUT, also object_mo.xml and ddan.xml

* gMegami3TLUT -> Tex

* yeet gDCRoom0TLUT (crashes ZAPD for an unknown reason)
---
 assets/xml/objects/object_gla.xml         | 2 +-
 assets/xml/objects/object_jya_obj.xml     | 6 +++---
 assets/xml/objects/object_link_boy.xml    | 8 ++++++++
 assets/xml/objects/object_mo.xml          | 4 ----
 assets/xml/objects/object_mo_pal.xml      | 4 ----
 assets/xml/objects/object_tk.xml          | 1 +
 assets/xml/objects/object_zl2.xml         | 2 ++
 assets/xml/scenes/dungeons/ddan.xml       | 1 +
 assets/xml/scenes/dungeons/ddan_mq.xml    | 1 +
 assets/xml/scenes/dungeons/ganon_boss.xml | 3 +++
 10 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/assets/xml/objects/object_gla.xml b/assets/xml/objects/object_gla.xml
index ca4d9225da..dbbfcb58ff 100644
--- a/assets/xml/objects/object_gla.xml
+++ b/assets/xml/objects/object_gla.xml
@@ -58,7 +58,7 @@
         <Texture Name="gGerudoPurpleEarTex" OutName="gerudo_purple_ear" Format="ci8" Width="8" Height="16" Offset="0x4EF8" TlutOffset="0x4D08"/>
         <Texture Name="gGerudoPurpleDarkFabricTex" OutName="gerudo_purple_dark_fabric" Format="ci8" Width="8" Height="8" Offset="0x49C8" TlutOffset="0x4788"/>
         <Texture Name="gGerudoPurpleFabricFoldTex" OutName="gerudo_purple_fabric_fold" Format="i8" Width="16" Height="16" Offset="0x4C08"/>
-        <Texture Name="gGerudoPurpleGlaiveGuard" OutName="gerudo_purple_glaive_guard" Format="i8" Width="8" Height="8" Offset="0x5378"/>
+        <Texture Name="gGerudoPurpleGlaiveGuard" OutName="gerudo_purple_glaive_guard" Format="ci8" Width="8" Height="8" Offset="0x5378" TlutOffset="0x4D08"/>
         <Texture Name="gGerudoPurpleGlaiveBladeFabricPatternTex" OutName="gerudo_purple_fabric_pattern" Format="i8" Width="16" Height="16" Offset="0x53B8"/>
         <Texture Name="gGerudoPurpleShoeUpperTex" OutName="gerudo_purple_shoe_upper" Format="ci8" Width="8" Height="16" Offset="0x54B8" TlutOffset="0x4D08"/>
         <Texture Name="gGerudoPurpleGlaiveHaftShoeSoleTex" OutName="gerudo_purple_glaive_haft_shoe_upper" Format="ci8" Width="8" Height="8" Offset="0x5538" TlutOffset="0x4D08"/>
diff --git a/assets/xml/objects/object_jya_obj.xml b/assets/xml/objects/object_jya_obj.xml
index 4a203b0b92..fc3d53ccdb 100644
--- a/assets/xml/objects/object_jya_obj.xml
+++ b/assets/xml/objects/object_jya_obj.xml
@@ -59,10 +59,10 @@
         <Texture Name="gMegami1Tex" OutName="megami_tex_1" Format="ci4" Width="64" Height="64" Offset="0x5CE8" TlutOffset="0x5C80"/>
         <Texture Name="gMegami2TLUT" OutName="megami_tlut_2" Format="rgba16" Width="4" Height="4" Offset="0xAC50"/>
         <Texture Name="gMegami2Tex" OutName="megami_tex_2" Format="ci4" Width="64" Height="64" Offset="0xACB8" TlutOffset="0xAC50"/>
-        <Texture Name="gMegami3TLUT" OutName="megami_tlut_3" Format="rgba16" Width="4" Height="64" Offset="0x6CE8"/>
+        <Texture Name="gMegamiTex_006CE8" Format="ci8" Width="32" Height="32" Offset="0x6CE8" TlutOffset="0x5CA0"/>
         <Texture Name="gMegami3Tex" OutName="megami_tex_3" Format="ci4" Width="64" Height="64" Offset="0x64E8" TlutOffset="0x5C80"/>
-        <Texture Name="gMegami4TLUT" OutName="megami_tlut_4" Format="rgba16" Width="4" Height="4" Offset="0x5CA0"/>
-        <Texture Name="gMegami5TLUT" OutName="megami_tlut_5" Format="rgba16" Width="4" Height="4" Offset="0xAC70"/>
+        <Texture Name="gMegami4TLUT" OutName="megami_tlut_4" Format="rgba16" Width="36" Height="1" Offset="0x5CA0"/>
+        <Texture Name="gMegami5TLUT" OutName="megami_tlut_5" Format="rgba16" Width="36" Height="1" Offset="0xAC70"/>
         <Texture Name="gMegamiCrumbleTLUT" OutName="megami_crumble_tlut" Format="rgba16" Width="4" Height="4" Offset="0x4E0"/>
         <Texture Name="gMegamiRightCrumble1Tex" OutName="megami_right_crumble_1" Format="ci4" Width="64" Height="64" Offset="0xD00" TlutOffset="0x4E0"/>
         <Texture Name="gMegamiRightCrumble2Tex" OutName="megami_right_crumble_2" Format="ci4" Width="64" Height="64" Offset="0x1D00" TlutOffset="0x4E0"/>
diff --git a/assets/xml/objects/object_link_boy.xml b/assets/xml/objects/object_link_boy.xml
index c5e11f54ce..77254f5557 100644
--- a/assets/xml/objects/object_link_boy.xml
+++ b/assets/xml/objects/object_link_boy.xml
@@ -125,6 +125,14 @@
         <DList Name="gLinkAdultBrokenGiantsKnifeBladeDL" Offset="0x2BA38"/> <!-- Used for when Giants Knife shatters -->
 
 
+        <Texture Name="gLinkAdultTLUT1" Format="rgba16" Width="16" Height="16" Offset="0x5400"/>
+        <Texture Name="gLinkAdultTLUT2" Format="rgba16" Width="16" Height="16" Offset="0x5800"/>
+        <Texture Name="gLinkAdultTLUT3" Format="rgba16" Width="8" Height="11" Offset="0x5A00"/>
+        <Texture Name="gLinkAdultTLUT4" Format="rgba16" Width="16" Height="16" Offset="0xCB40"/>
+        <Texture Name="gLinkAdultTLUT5" Format="rgba16" Width="16" Height="16" Offset="0xCD48"/>
+        <Texture Name="gLinkAdultTLUT6" Format="rgba16" Width="12" Height="12" Offset="0xCF50"/>
+        <Texture Name="gLinkAdultTLUT7" Format="rgba16" Width="8" Height="4" Offset="0xD078"/>
+
         <Texture Name="gLinkAdultShieldHandleTex" OutName="shield_handle" Format="ci8" Width="8" Height="16" Offset="0xD4B8" TlutOffset="0xCD48"/>
         <Texture Name="gLinkAdultHylianShieldBackTex" OutName="hylian_shield_back" Format="ci8" Width="16" Height="32" Offset="0xD938" TlutOffset="0xCB40"/>
         <Texture Name="gLinkAdultSheathBandTex" OutName="sheath_band" Format="ci8" Width="32" Height="16" Offset="0xE838" TlutOffset="0xCB40"/>
diff --git a/assets/xml/objects/object_mo.xml b/assets/xml/objects/object_mo.xml
index 68035c3844..ad84a14026 100644
--- a/assets/xml/objects/object_mo.xml
+++ b/assets/xml/objects/object_mo.xml
@@ -74,9 +74,5 @@
             <Vtx/>
         </Array>
 
-        <Array Name="gMorphaVtx_007BB8" Count="4" Offset="0x67B8">
-            <Vtx/>
-        </Array>
-
     </File>
 </Root>
diff --git a/assets/xml/objects/object_mo_pal.xml b/assets/xml/objects/object_mo_pal.xml
index b191e8395e..17cd4fc2f4 100644
--- a/assets/xml/objects/object_mo_pal.xml
+++ b/assets/xml/objects/object_mo_pal.xml
@@ -74,9 +74,5 @@
             <Vtx/>
         </Array>
 
-        <Array Name="gMorphaVtx_007BB8" Count="4" Offset="0x7BB8">
-            <Vtx/>
-        </Array>
-
     </File>
 </Root>
diff --git a/assets/xml/objects/object_tk.xml b/assets/xml/objects/object_tk.xml
index 5b2fd13806..ffa44c5485 100644
--- a/assets/xml/objects/object_tk.xml
+++ b/assets/xml/objects/object_tk.xml
@@ -4,6 +4,7 @@
         <Animation Name="gDampeWalkAnim" Offset="0x1FA8"/>
         <Animation Name="gDampeRestAnim" Offset="0x2F84"/>
         <Animation Name="gDampeFloatAnim" Offset="0x3768"/>
+        <Texture Name="gDampeUnkTLUT" Format="rgba16" Width="102" Height="2" Offset="0x3780"/>
         <Texture Name="gDampeEyeOpenTex" OutName="dampe_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x3B40"/>
         <Texture Name="gDampeEyeHalfTex" OutName="dampe_eye_half_open" Format="rgba16" Width="32" Height="32" Offset="0x4340"/>
         <Texture Name="gDampeEyeClosedTex" OutName="dampe_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x4B40"/>
diff --git a/assets/xml/objects/object_zl2.xml b/assets/xml/objects/object_zl2.xml
index 9af0a65270..2503b811d3 100644
--- a/assets/xml/objects/object_zl2.xml
+++ b/assets/xml/objects/object_zl2.xml
@@ -38,5 +38,7 @@
         <Texture Name="gZelda2_7TLUT" OutName="zelda_2_7_tlut" Format="rgba16" Width="6" Height="4" Offset="0x9708"/>
 
         <Texture Name="gZelda2TriforceTex" OutName="zelda_2_triforce" Format="rgba16" Width="16" Height="16" Offset="0x2900"/>
+
+        <Texture Name="gZelda2Tex_003A08" OutName="tex_003A08" Format="ci8" Width="8" Height="8" Offset="0x3A08" TlutOffset="0x2F50"/>
     </File>
 </Root>
diff --git a/assets/xml/scenes/dungeons/ddan.xml b/assets/xml/scenes/dungeons/ddan.xml
index a42e97cfc9..d78f8dabee 100644
--- a/assets/xml/scenes/dungeons/ddan.xml
+++ b/assets/xml/scenes/dungeons/ddan.xml
@@ -1,5 +1,6 @@
 <Root>
     <File Name="ddan_scene" Segment="2">
+        <Texture Name="gDCSceneTLUT" Format="rgba16" Width="16" Height="16" Offset="0x11D70"/>
         <Texture Name="gDCDayEntranceTex" OutName="day_entrance" Format="ci8" Width="32" Height="64" Offset="0x12378" TlutOffset="0x11D70"/>
         <Texture Name="gDCNightEntranceTex" OutName="night_entrance" Format="ci8" Width="32" Height="64" Offset="0x13378" TlutOffset="0x11D70"/>
 
diff --git a/assets/xml/scenes/dungeons/ddan_mq.xml b/assets/xml/scenes/dungeons/ddan_mq.xml
index a42e97cfc9..d78f8dabee 100644
--- a/assets/xml/scenes/dungeons/ddan_mq.xml
+++ b/assets/xml/scenes/dungeons/ddan_mq.xml
@@ -1,5 +1,6 @@
 <Root>
     <File Name="ddan_scene" Segment="2">
+        <Texture Name="gDCSceneTLUT" Format="rgba16" Width="16" Height="16" Offset="0x11D70"/>
         <Texture Name="gDCDayEntranceTex" OutName="day_entrance" Format="ci8" Width="32" Height="64" Offset="0x12378" TlutOffset="0x11D70"/>
         <Texture Name="gDCNightEntranceTex" OutName="night_entrance" Format="ci8" Width="32" Height="64" Offset="0x13378" TlutOffset="0x11D70"/>
 
diff --git a/assets/xml/scenes/dungeons/ganon_boss.xml b/assets/xml/scenes/dungeons/ganon_boss.xml
index c75914c29c..7c28b472d6 100644
--- a/assets/xml/scenes/dungeons/ganon_boss.xml
+++ b/assets/xml/scenes/dungeons/ganon_boss.xml
@@ -1,6 +1,9 @@
 <Root>
     <File Name="ganon_boss_scene" Segment="2">
         <Scene Name="ganon_boss_scene" Offset="0x0"/>
+        <Texture Name="ganon_boss_sceneTLUT_001680" Width="16" Height="16" Format="rgba16" Offset="0x1680"/>
+        <Texture Name="ganon_boss_sceneTex_006C18" Width="32" Height="64" Format="ci8" Offset="0x6C18" TlutOffset="0x1680"/>
+        <Texture Name="ganon_boss_sceneTex_007418" Width="32" Height="64" Format="ci8" Offset="0x7418" TlutOffset="0x1680"/>
     </File>
     <File Name="ganon_boss_room_0" Segment="3">
         <Room Name="ganon_boss_room_0" Offset="0x0"/>