From ec30dcbe4ef6184c13c85c85b212efd9b58e6c76 Mon Sep 17 00:00:00 2001
From: Dragorn421 <Dragorn421@users.noreply.github.com>
Date: Mon, 17 Feb 2025 00:10:26 +0100
Subject: [PATCH] assets xmls fixes (#2476)

---
 assets/xml/objects/gameplay_field_keep.xml |  2 +-
 assets/xml/objects/gameplay_keep.xml       |  4 ++--
 assets/xml/objects/gameplay_keep_pal.xml   |  4 ++--
 assets/xml/objects/object_gnd.xml          | 10 +++++-----
 assets/xml/objects/object_jya_obj.xml      |  2 +-
 assets/xml/objects/object_link_child.xml   |  3 +--
 assets/xml/objects/object_mori_tex.xml     |  4 ++--
 assets/xml/objects/object_spot17_obj.xml   |  2 +-
 8 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/assets/xml/objects/gameplay_field_keep.xml b/assets/xml/objects/gameplay_field_keep.xml
index 011e8f7fc..3c0f18d74 100644
--- a/assets/xml/objects/gameplay_field_keep.xml
+++ b/assets/xml/objects/gameplay_field_keep.xml
@@ -29,7 +29,7 @@
         <DList Name="gFieldDoorDL_004720" Offset="0x4720"/>
         <DList Name="gFieldDoorLeftDL" Offset="0x47A0"/>
         <DList Name="gFieldDoorRightDL" Offset="0x4978"/>
-        <Texture Name="gFieldDoor1Tex" OutName="field_door1" Format="i8" Width="32" Height="128" Offset="0x04F50"/>
+        <Texture Name="gFieldDoor1Tex" OutName="field_door1" Format="i4" Width="64" Height="128" Offset="0x04F50"/>
         <Texture Name="gFieldDoorKnobTopHalfTex" OutName="field_door_knob_upper" Format="rgba16" Width="16" Height="16" Offset="0x4B50"/>
         <Texture Name="gFieldDoorKnobTex" OutName="field_door_knob" Format="rgba16" Width="16" Height="16" Offset="0x4D50"/>
         <Skeleton Name="gFieldUnusedFishSkel" Type="Normal" LimbType="Standard" Offset="0x088F8"/>
diff --git a/assets/xml/objects/gameplay_keep.xml b/assets/xml/objects/gameplay_keep.xml
index dcb7e2960..008497601 100644
--- a/assets/xml/objects/gameplay_keep.xml
+++ b/assets/xml/objects/gameplay_keep.xml
@@ -759,7 +759,7 @@
         <Texture Name="gEffHitMark24Tex" OutName="eff_hit_mark_24" Format="i4" Width="32" Height="24" Offset="0x21A90"/>
         <DList Name="gEffHitMarkDL" Offset="0x21C10"/>
         <Texture Name="gEffUnknown6Tex" OutName="eff_unknown_6" Format="i8" Width="32" Height="64" Offset="0x21CB0"/>
-        <Texture Name="gEffFleckTex" OutName="eff_fleck" Format="i8" Width="32" Height="64" Offset="0x224B0"/>
+        <Texture Name="gEffFleckTex" OutName="eff_fleck" Format="i4" Width="64" Height="64" Offset="0x224B0"/>
         <Texture Name="gEffUnknown8Tex" OutName="eff_unknown_8" Format="i8" Width="64" Height="64" Offset="0x22CB0"/>
         <Texture Name="gEffMagmaBubble1Tex" OutName="eff_magma_bubbles_1" Format="ia8" Width="16" Height="24" Offset="0x23CB0"/>
         <Texture Name="gEffMagmaBubble2Tex" OutName="eff_magma_bubbles_2" Format="ia8" Width="16" Height="24" Offset="0x23E30"/>
@@ -848,7 +848,7 @@
         <DList Name="gBugLimb9WrapperDL" Offset="0x34EE0"/>
         <DList Name="gBugLimb9WrapperWrapperDL" Offset="0x34EF0"/>
         <Texture Name="gBugBodyTex" OutName="bug_body" Format="rgba16" Width="16" Height="64" Offset="0x34FC0"/>
-        <Texture Name="gBugLegTex" OutName="bug_leg" Format="rgba16" Width="32" Height="4" Offset="0x357C0"/>
+        <Texture Name="gBugLegTex" OutName="bug_leg" Format="rgba16" Width="8" Height="16" Offset="0x357C0"/>
         <Skeleton Name="gBugSkel" Type="Normal" LimbType="Standard" Offset="0x35A30"/>
         <DList Name="gCuttableShrubStalkDL" Offset="0x35A80"/>
         <DList Name="gCuttableShrubTipDL" Offset="0x35B40"/>
diff --git a/assets/xml/objects/gameplay_keep_pal.xml b/assets/xml/objects/gameplay_keep_pal.xml
index fbea0efd0..c7485d73f 100644
--- a/assets/xml/objects/gameplay_keep_pal.xml
+++ b/assets/xml/objects/gameplay_keep_pal.xml
@@ -753,7 +753,7 @@
         <Texture Name="gEffHitMark24Tex" OutName="eff_hit_mark_24" Format="i4" Width="32" Height="24" Offset="0x215F0"/>
         <DList Name="gEffHitMarkDL" Offset="0x21770"/>
         <Texture Name="gEffUnknown6Tex" OutName="eff_unknown_6" Format="i8" Width="32" Height="64" Offset="0x21810"/>
-        <Texture Name="gEffFleckTex" OutName="eff_fleck" Format="i8" Width="32" Height="64" Offset="0x22010"/>
+        <Texture Name="gEffFleckTex" OutName="eff_fleck" Format="i4" Width="64" Height="64" Offset="0x22010"/>
         <Texture Name="gEffUnknown8Tex" OutName="eff_unknown_8" Format="i8" Width="64" Height="64" Offset="0x22810"/>
         <Texture Name="gEffMagmaBubble1Tex" OutName="eff_magma_bubbles_1" Format="ia8" Width="16" Height="24" Offset="0x23810"/>
         <Texture Name="gEffMagmaBubble2Tex" OutName="eff_magma_bubbles_2" Format="ia8" Width="16" Height="24" Offset="0x23990"/>
@@ -843,7 +843,7 @@
         <DList Name="gBugLimb9WrapperWrapperDL" Offset="0x34A50"/>
         <Skeleton Name="gBugSkel" Type="Normal" LimbType="Standard" Offset="0x35590"/>
         <Texture Name="gBugBodyTex" OutName="bug_body" Format="rgba16" Width="16" Height="64" Offset="0x34B20"/>
-        <Texture Name="gBugLegTex" OutName="bug_leg" Format="rgba16" Width="32" Height="4" Offset="0x35320"/>
+        <Texture Name="gBugLegTex" OutName="bug_leg" Format="rgba16" Width="8" Height="16" Offset="0x35320"/>
         <DList Name="gCuttableShrubStalkDL" Offset="0x355E0"/>
         <DList Name="gCuttableShrubTipDL" Offset="0x356A0"/>
         <Texture Name="gCuttableShrubLeafTFragmentTex" OutName="cuttable_shrub_leaf_fragment" Format="rgba16" Width="32" Height="32" Offset="0x35730"/>
diff --git a/assets/xml/objects/object_gnd.xml b/assets/xml/objects/object_gnd.xml
index 53d2bbde4..d073b8b97 100644
--- a/assets/xml/objects/object_gnd.xml
+++ b/assets/xml/objects/object_gnd.xml
@@ -44,11 +44,11 @@
         <Texture Name="gPhantomGanonLimbTex_00AE80" OutName="phantom_ganon_limb_tex_00AE80" Format="rgba16" Width="8" Height="8" Offset="0xAE80"/>
         <Texture Name="gPhantomGanonLimbTex_00AF00" OutName="phantom_ganon_limb_tex_00AF00" Format="rgba16" Width="8" Height="8" Offset="0xAF00"/>
         <Texture Name="gPhantomGanonLimbTex_00C180" OutName="phantom_ganon_limb_tex_00C180" Format="rgba16" Width="8" Height="8" Offset="0xC180"/>
-        <Texture Name="gPhantomGanonLimbTex_00C400" OutName="phantom_ganon_limb_tex_00C400" Format="rgba16" Width="8" Height="8" Offset="0xC400"/>
-        <Texture Name="gPhantomGanonLimbTex_00B980" OutName="phantom_ganon_limb_tex_00B980" Format="rgba16" Width="16" Height="8" Offset="0xB980"/>
-        <Texture Name="gPhantomGanonLimbTex_00C480" OutName="phantom_ganon_limb_tex_00C480" Format="rgba16" Width="16" Height="8" Offset="0xC480"/>
-        <Texture Name="gPhantomGanonLimbTex_00BC80" OutName="phantom_ganon_limb_tex_00BC80" Format="rgba16" Width="16" Height="8" Offset="0xBC80"/>
-        <Texture Name="gPhantomGanonLimbTex_00BD80" OutName="phantom_ganon_limb_tex_00BD80" Format="rgba16" Width="16" Height="8" Offset="0xBD80"/>
+        <Texture Name="gPhantomGanonLimbTex_00C400" OutName="phantom_ganon_limb_tex_00C400" Format="rgba16" Width="4" Height="16" Offset="0xC400"/>
+        <Texture Name="gPhantomGanonLimbTex_00B980" OutName="phantom_ganon_limb_tex_00B980" Format="rgba16" Width="8" Height="16" Offset="0xB980"/>
+        <Texture Name="gPhantomGanonLimbTex_00C480" OutName="phantom_ganon_limb_tex_00C480" Format="rgba16" Width="8" Height="16" Offset="0xC480"/>
+        <Texture Name="gPhantomGanonLimbTex_00BC80" OutName="phantom_ganon_limb_tex_00BC80" Format="rgba16" Width="8" Height="16" Offset="0xBC80"/>
+        <Texture Name="gPhantomGanonLimbTex_00BD80" OutName="phantom_ganon_limb_tex_00BD80" Format="rgba16" Width="8" Height="16" Offset="0xBD80"/>
         <Texture Name="gPhantomGanonLimbTex_00C080" OutName="phantom_ganon_limb_tex_00C080" Format="rgba16" Width="16" Height="8" Offset="0xC080"/>
         <Texture Name="gPhantomGanonLimbTex_00C200" OutName="phantom_ganon_limb_tex_00C200" Format="rgba16" Width="16" Height="16" Offset="0xC200"/>
         <Texture Name="gPhantomGanonLimbTex_00A000" OutName="phantom_ganon_limb_tex_00A000" Format="rgba16" Width="16" Height="16" Offset="0xA000"/>
diff --git a/assets/xml/objects/object_jya_obj.xml b/assets/xml/objects/object_jya_obj.xml
index fc3d53ccd..50c2700db 100644
--- a/assets/xml/objects/object_jya_obj.xml
+++ b/assets/xml/objects/object_jya_obj.xml
@@ -29,7 +29,7 @@
         <Texture Name="gCobraMirrorEyeTex" OutName="cobra_eye" Format="rgba16" Width="32" Height="32" Offset="0x15540"/>
         <Texture Name="gCobraMirrorHandleTex" OutName="cobra_handle" Format="rgba16" Width="32" Height="8" Offset="0x15F40"/>
         <Texture Name="gCobraMirrorMirrorTex" OutName="cobra_mirror" Format="ia16" Width="32" Height="32" Offset="0x14540"/>
-        <Texture Name="gCobraMirrorToothTex" OutName="cobra_tooth" Format="ia16" Width="32" Height="32" Offset="0x14D40"/>
+        <Texture Name="gCobraMirrorToothTex" OutName="cobra_tooth" Format="ia8" Width="64" Height="32" Offset="0x14D40"/>
         <DList Name="gKanaamiDL" Offset="0xF000"/>
         <Collision Name="gKanaamiCol" Offset="0xF208"/>
         <Texture Name="gKanaamiTopTex" OutName="kanaami_top" Format="rgba16" Width="32" Height="64" Offset="0x12540"/>
diff --git a/assets/xml/objects/object_link_child.xml b/assets/xml/objects/object_link_child.xml
index c6bfd2df8..36baf5aa6 100644
--- a/assets/xml/objects/object_link_child.xml
+++ b/assets/xml/objects/object_link_child.xml
@@ -125,8 +125,7 @@
         <Texture Name="gLinkChildEarTex" OutName="ear" Format="ci8" Width="16" Height="16" Offset="0x5200" TlutOffset="0x5500"/>
         <Texture Name="gLinkChildUnused1Tex" OutName="unused_1" Format="ci8" Width="16" Height="16" Offset="0x5900" TlutOffset="0x5700"/>
         <Texture Name="gLinkChildUnused2Tex" OutName="unused_2" Format="ci8" Width="32" Height="16" Offset="0x5A00" TlutOffset="0x5300"/>
-        <Texture Name="gLinkChildLowerBootTex" OutName="lower_boot" Format="ci8" Width="16" Height="16" Offset="0x5C00" TlutOffset="0x5300"/>
-        <Texture Name="gLinkChildUnusedBootTex" OutName="unused_boot" Format="ci8" Height="32" Width="24" Offset="0x5D00" TlutOffset="0x5300"/><!--Unused so hard to verify-->
+        <Texture Name="gLinkChildLowerBootTex" OutName="lower_boot" Format="ci8" Width="32" Height="32" Offset="0x5C00" TlutOffset="0x5300"/>
         <Texture Name="gLinkChildBootTex" OutName="boot" Format="ci8" Width="32" Height="32" Offset="0x6000" TlutOffset="0x5300"/>
         <Texture Name="gLinkChildWaistTex" OutName="waist" Format="i8" Width="32" Height="32" Offset="0x6400"/>
         <Texture Name="gLinkChildBeltTex" OutName="belt" Format="ci8" Width="8" Height="16" Offset="0x6800" TlutOffset="0x5300"/>
diff --git a/assets/xml/objects/object_mori_tex.xml b/assets/xml/objects/object_mori_tex.xml
index 79f1f0b4c..756347bcc 100644
--- a/assets/xml/objects/object_mori_tex.xml
+++ b/assets/xml/objects/object_mori_tex.xml
@@ -1,12 +1,12 @@
 <Root>
     <File Name="object_mori_tex" Segment="8">
-        <Texture Name="gMoriElevatorBarTex" OutName="elevator_bar" Format="rgba16" Height="16" Width="64" Offset="0x0"/>
+        <Texture Name="gMoriElevatorBarTex" OutName="elevator_bar" Format="rgba16" Height="64" Width="16" Offset="0x0"/>
         <Texture Name="gMoriElevatorTopTex" OutName="elevator_top" Format="rgba16" Height="32" Width="32" Offset="0x800"/>
         <Texture Name="gMoriElevatorSideTex" OutName="elevator_side" Format="rgba16" Height="16" Width="16" Offset="0x1000"/>
 
         <Texture Name="gMoriStoneWallTex" OutName="stone_wall" Format="rgba16" Height="32" Width="32" Offset="0x1200"/>
         <Texture Name="gMoriKaitenkabeMetalWallTex" OutName="metal_wall" Format="rgba16" Height="32" Width="32" Offset="0x1A00"/>
-        <Texture Name="gMoriRakkatenjoCheckerboardTex" OutName="checkerboard" Format="rgba16" Height="32" Width="64" Offset="0x2200"/>
+        <Texture Name="gMoriRakkatenjoCheckerboardTex" OutName="checkerboard" Format="rgba16" Height="64" Width="32" Offset="0x2200"/>
 
         <Texture Name="gMoriStalfosPlatformSideTex" OutName="stalfos_platform_side" Format="rgba16" Height="32" Width="64" Offset="0x3200"/>
         <Texture Name="gMoriStalfosPlatformTopTex" OutName="stalfos_platform_top" Format="rgba16" Height="32" Width="32" Offset="0x4200"/>
diff --git a/assets/xml/objects/object_spot17_obj.xml b/assets/xml/objects/object_spot17_obj.xml
index d4239d8d2..73a4ca520 100644
--- a/assets/xml/objects/object_spot17_obj.xml
+++ b/assets/xml/objects/object_spot17_obj.xml
@@ -7,6 +7,6 @@
         <Collision Name="gCraterBombableWallCol" Offset="0xA38"/>
         <DList Name="gCraterSmokeConeDL" Offset="0xB40"/>
         <Texture Name="gCraterSmokeConeTex" OutName="crater_smoke_cone" Format="ia8" Width="32" Height="32" Offset="0xC30"/>
-        <Texture Name="gCraterBombableWallCracksTex" OutName="crater_bombable_wall_cracks" Format="ia8" Width="32" Height="64" Offset="0x1030"/>
+        <Texture Name="gCraterBombableWallCracksTex" OutName="crater_bombable_wall_cracks" Format="i4" Width="64" Height="64" Offset="0x1030"/>
     </File>
 </Root>