From 4a3809d4d25845e15fa65feba239f1ec471ac8d8 Mon Sep 17 00:00:00 2001
From: Dragorn421 <Dragorn421@users.noreply.github.com>
Date: Wed, 1 Dec 2021 21:28:23 +0100
Subject: [PATCH] Cleanup asset xmls (#1044)

* Consistent order for attributes of `Texture` nodes in asset xmls

* Consistent order for attributes of `Blob` nodes in asset xmls

* Use `LimbType` instead of `Type` in `Limb` nodes in asset xmls

* Remove space before closing `/>` in asset xmls tags
---
 assets/xml/objects/gameplay_keep.xml          |   8 +-
 assets/xml/objects/object_ahg.xml             |  98 +--
 assets/xml/objects/object_ane.xml             |  30 +-
 assets/xml/objects/object_ani.xml             |  30 +-
 assets/xml/objects/object_aob.xml             |  30 +-
 assets/xml/objects/object_bji.xml             |  88 +--
 assets/xml/objects/object_bl.xml              |   8 +-
 assets/xml/objects/object_boj.xml             | 108 +--
 assets/xml/objects/object_cne.xml             |  84 +--
 assets/xml/objects/object_cow.xml             |  20 +-
 assets/xml/objects/object_dog.xml             |  74 +--
 assets/xml/objects/object_door_killer.xml     |   2 +-
 assets/xml/objects/object_ds.xml              |  10 +-
 assets/xml/objects/object_dy_obj.xml          |  54 +-
 assets/xml/objects/object_ei.xml              |  36 +-
 assets/xml/objects/object_fa.xml              |  16 +-
 assets/xml/objects/object_fw.xml              |  72 +-
 assets/xml/objects/object_ge1.xml             |  30 +-
 assets/xml/objects/object_gla.xml             |  42 +-
 assets/xml/objects/object_hni.xml             |  46 +-
 assets/xml/objects/object_horse.xml           |  58 +-
 assets/xml/objects/object_horse_ganon.xml     |   6 +-
 .../xml/objects/object_horse_link_child.xml   |   2 +-
 assets/xml/objects/object_horse_zelda.xml     |   8 +-
 assets/xml/objects/object_human.xml           | 160 ++---
 assets/xml/objects/object_ik.xml              |  96 +--
 assets/xml/objects/object_in.xml              |   2 +-
 assets/xml/objects/object_js.xml              |  24 +-
 assets/xml/objects/object_jya_obj.xml         |  16 +-
 assets/xml/objects/object_km1.xml             |  58 +-
 assets/xml/objects/object_kw1.xml             |  94 +--
 assets/xml/objects/object_kz.xml              |  56 +-
 assets/xml/objects/object_link_child.xml      |  58 +-
 assets/xml/objects/object_md.xml              |  32 +-
 assets/xml/objects/object_mizu_objects.xml    |   2 +-
 assets/xml/objects/object_mori_objects.xml    |   8 +-
 assets/xml/objects/object_ms.xml              |  16 +-
 assets/xml/objects/object_nb.xml              |  36 +-
 assets/xml/objects/object_niw.xml             |  30 +-
 assets/xml/objects/object_oA11.xml            | 102 +--
 assets/xml/objects/object_oB2.xml             | 114 ++--
 assets/xml/objects/object_oE1s.xml            |  82 +--
 assets/xml/objects/object_oE5.xml             | 112 ++--
 assets/xml/objects/object_oF1s.xml            |  98 +--
 assets/xml/objects/object_owl.xml             |  40 +-
 assets/xml/objects/object_peehat.xml          |  46 +-
 assets/xml/objects/object_po_field.xml        |   4 +-
 assets/xml/objects/object_ru2.xml             |  44 +-
 assets/xml/objects/object_shopnuts.xml        |  34 +-
 assets/xml/objects/object_sk2.xml             | 236 +++----
 assets/xml/objects/object_skb.xml             |  38 +-
 assets/xml/objects/object_spot01_objects2.xml |   2 +-
 assets/xml/objects/object_ta.xml              |   2 +-
 assets/xml/objects/object_tk.xml              |   6 +-
 assets/xml/objects/object_toki_objects.xml    |  40 +-
 assets/xml/objects/object_tw.xml              | 616 +++++++++---------
 assets/xml/objects/object_vali.xml            |  56 +-
 assets/xml/objects/object_vm.xml              |  20 +-
 assets/xml/objects/object_warp1.xml           |  42 +-
 assets/xml/objects/object_zl1.xml             |  34 +-
 assets/xml/overlays/ovl_Bg_Ganon_Otyuka.xml   |   2 +-
 assets/xml/overlays/ovl_Magic_Wind.xml        |   6 +-
 assets/xml/scenes/dungeons/ddan.xml           |  16 +-
 assets/xml/scenes/indoors/miharigoya.xml      |  10 +-
 docs/tutorial/object_decomp_example.md        |  20 +-
 65 files changed, 1735 insertions(+), 1735 deletions(-)

diff --git a/assets/xml/objects/gameplay_keep.xml b/assets/xml/objects/gameplay_keep.xml
index a9f2df696..f10424c13 100644
--- a/assets/xml/objects/gameplay_keep.xml
+++ b/assets/xml/objects/gameplay_keep.xml
@@ -15,16 +15,16 @@
             <Vector Type="s16" Dimensions="3"/>
         </Array>
         <Array Name="D_040020D0" Count="24" Offset="0x20D0">
-            <Vector Type="s16" Dimensions="3" />
+            <Vector Type="s16" Dimensions="3"/>
         </Array>
         <Array Name="D_04002160" Count="24" Offset="0x2160">
-            <Vector Type="s16" Dimensions="3" />
+            <Vector Type="s16" Dimensions="3"/>
         </Array>
         <Array Name="D_040021F0" Count="24" Offset="0x21F0">
-            <Vector Type="s16" Dimensions="3" />
+            <Vector Type="s16" Dimensions="3"/>
         </Array>
         <Array Name="D_04002280" Count="24" Offset="0x2280">
-            <Vector Type="s16" Dimensions="3" />
+            <Vector Type="s16" Dimensions="3"/>
         </Array>
 
         <PlayerAnimation Name="gPlayerAnim_002310" Offset="0x2310"/>
diff --git a/assets/xml/objects/object_ahg.xml b/assets/xml/objects/object_ahg.xml
index 803912a8c..2bf39576a 100644
--- a/assets/xml/objects/object_ahg.xml
+++ b/assets/xml/objects/object_ahg.xml
@@ -2,66 +2,66 @@
     <File Name="object_ahg" Segment="6">
         <!-- The textures used by these limbs aren't 64-bit aligned, so this won't compile to a matching ROM. -->
         <!-- 
-        <Limb Name="object_ahg_Limb_000000" LimbType="Standard" Offset="0x0" />
-        <Limb Name="object_ahg_Limb_00000C" LimbType="Standard" Offset="0xC" />
-        <Limb Name="object_ahg_Limb_000018" LimbType="Standard" Offset="0x18" />
-        <Limb Name="object_ahg_Limb_000024" LimbType="Standard" Offset="0x24" />
-        <Limb Name="object_ahg_Limb_000030" LimbType="Standard" Offset="0x30" />
-        <Limb Name="object_ahg_Limb_00003C" LimbType="Standard" Offset="0x3C" />
-        <Limb Name="object_ahg_Limb_000048" LimbType="Standard" Offset="0x48" />
-        <Limb Name="object_ahg_Limb_000054" LimbType="Standard" Offset="0x54" />
-        <Limb Name="object_ahg_Limb_000060" LimbType="Standard" Offset="0x60" />
-        <Limb Name="object_ahg_Limb_00006C" LimbType="Standard" Offset="0x6C" />
-        <Limb Name="object_ahg_Limb_000078" LimbType="Standard" Offset="0x78" />
-        <Limb Name="object_ahg_Limb_000084" LimbType="Standard" Offset="0x84" />
-        <Limb Name="object_ahg_Limb_000090" LimbType="Standard" Offset="0x90" />
-        <Limb Name="object_ahg_Limb_00009C" LimbType="Standard" Offset="0x9C" />
-        <Limb Name="object_ahg_Limb_0000A8" LimbType="Standard" Offset="0xA8" />
+        <Limb Name="object_ahg_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_ahg_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_ahg_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_ahg_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_ahg_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_ahg_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_ahg_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_ahg_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_ahg_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_ahg_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_ahg_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_ahg_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_ahg_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_ahg_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_ahg_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
         -->
 
         <!-- 
-        <Skeleton Name="object_ahg_Skel_0000F0" Type="Flex" LimbType="Standard" Offset="0xF0" />
+        <Skeleton Name="object_ahg_Skel_0000F0" Type="Flex" LimbType="Standard" Offset="0xF0"/>
         -->
 
         <!-- 32-bit aligned textures. -->
         <!--
-        <Texture Name="object_ahg_TLUT_0000FC" OutName="tlut_000000FC" Format="rgba16" Width="16" Height="16" Offset="0xFC" />
-        <Texture Name="object_ahg_Tex_0002FC" OutName="tex_000002FC" Format="ci8" Width="16" Height="16" Offset="0x2FC" />
-        <Texture Name="object_ahg_Tex_0003FC" OutName="tex_000003FC" Format="ci8" Width="16" Height="16" Offset="0x3FC" />
-        <Texture Name="object_ahg_Tex_0004FC" OutName="tex_000004FC" Format="ci8" Width="8" Height="8" Offset="0x4FC" />
-        <Texture Name="object_ahg_Tex_00053C" OutName="tex_0000053C" Format="ci8" Width="8" Height="8" Offset="0x53C" />
-        <Blob Name="object_ahg_Blob_00057C" Size="0x300" Offset="0x57C" />
-        <Texture Name="object_ahg_Tex_00087C" OutName="tex_0000087C" Format="ci8" Width="16" Height="16" Offset="0x87C" />
-        <Texture Name="object_ahg_Tex_00097C" OutName="tex_0000097C" Format="i8" Width="8" Height="8" Offset="0x97C" />
-        <Texture Name="object_ahg_Tex_0009BC" OutName="tex_000009BC" Format="i8" Width="8" Height="8" Offset="0x9BC" />
-        <Texture Name="object_ahg_Tex_0009FC" OutName="tex_000009FC" Format="ci8" Width="32" Height="16" Offset="0x9FC" />
-        <Texture Name="object_ahg_Tex_000BFC" OutName="tex_00000BFC" Format="ci8" Width="16" Height="16" Offset="0xBFC" />
+        <Texture Name="object_ahg_TLUT_0000FC" OutName="tlut_000000FC" Format="rgba16" Width="16" Height="16" Offset="0xFC"/>
+        <Texture Name="object_ahg_Tex_0002FC" OutName="tex_000002FC" Format="ci8" Width="16" Height="16" Offset="0x2FC"/>
+        <Texture Name="object_ahg_Tex_0003FC" OutName="tex_000003FC" Format="ci8" Width="16" Height="16" Offset="0x3FC"/>
+        <Texture Name="object_ahg_Tex_0004FC" OutName="tex_000004FC" Format="ci8" Width="8" Height="8" Offset="0x4FC"/>
+        <Texture Name="object_ahg_Tex_00053C" OutName="tex_0000053C" Format="ci8" Width="8" Height="8" Offset="0x53C"/>
+        <Blob Name="object_ahg_Blob_00057C" Size="0x300" Offset="0x57C"/>
+        <Texture Name="object_ahg_Tex_00087C" OutName="tex_0000087C" Format="ci8" Width="16" Height="16" Offset="0x87C"/>
+        <Texture Name="object_ahg_Tex_00097C" OutName="tex_0000097C" Format="i8" Width="8" Height="8" Offset="0x97C"/>
+        <Texture Name="object_ahg_Tex_0009BC" OutName="tex_000009BC" Format="i8" Width="8" Height="8" Offset="0x9BC"/>
+        <Texture Name="object_ahg_Tex_0009FC" OutName="tex_000009FC" Format="ci8" Width="32" Height="16" Offset="0x9FC"/>
+        <Texture Name="object_ahg_Tex_000BFC" OutName="tex_00000BFC" Format="ci8" Width="16" Height="16" Offset="0xBFC"/>
         -->
 
         <!--
-        <DList Name="object_ahg_DL_0030F0" Offset="0x30F0" />
-        <DList Name="object_ahg_DL_003500" Offset="0x3500" />
-        <DList Name="object_ahg_DL_003670" Offset="0x3670" />
-        <DList Name="object_ahg_DL_0037A0" Offset="0x37A0" />
-        <DList Name="object_ahg_DL_0038D8" Offset="0x38D8" />
-        <DList Name="object_ahg_DL_003A48" Offset="0x3A48" />
-        <DList Name="object_ahg_DL_003B78" Offset="0x3B78" />
-        <DList Name="object_ahg_DL_003CB0" Offset="0x3CB0" />
-        <DList Name="object_ahg_DL_003ED8" Offset="0x3ED8" />
-        <DList Name="object_ahg_DL_004018" Offset="0x4018" />
-        <DList Name="object_ahg_DL_004148" Offset="0x4148" />
-        <DList Name="object_ahg_DL_004280" Offset="0x4280" />
-        <DList Name="object_ahg_DL_0043C0" Offset="0x43C0" />
-        <DList Name="object_ahg_DL_0044F0" Offset="0x44F0" />
-        <DList Name="object_ahg_DL_004628" Offset="0x4628" />
+        <DList Name="object_ahg_DL_0030F0" Offset="0x30F0"/>
+        <DList Name="object_ahg_DL_003500" Offset="0x3500"/>
+        <DList Name="object_ahg_DL_003670" Offset="0x3670"/>
+        <DList Name="object_ahg_DL_0037A0" Offset="0x37A0"/>
+        <DList Name="object_ahg_DL_0038D8" Offset="0x38D8"/>
+        <DList Name="object_ahg_DL_003A48" Offset="0x3A48"/>
+        <DList Name="object_ahg_DL_003B78" Offset="0x3B78"/>
+        <DList Name="object_ahg_DL_003CB0" Offset="0x3CB0"/>
+        <DList Name="object_ahg_DL_003ED8" Offset="0x3ED8"/>
+        <DList Name="object_ahg_DL_004018" Offset="0x4018"/>
+        <DList Name="object_ahg_DL_004148" Offset="0x4148"/>
+        <DList Name="object_ahg_DL_004280" Offset="0x4280"/>
+        <DList Name="object_ahg_DL_0043C0" Offset="0x43C0"/>
+        <DList Name="object_ahg_DL_0044F0" Offset="0x44F0"/>
+        <DList Name="object_ahg_DL_004628" Offset="0x4628"/>
         -->
 
-        <!-- <Blob Name="object_ahg_Blob_0047C8" Size="0x180" Offset="0x47C8" /> -->
-        <Texture Name="object_ahg_Tex_004948" OutName="tex_00004948" Format="ci8" Width="8" Height="8" Offset="0x4948" />
-        <Texture Name="object_ahg_Tex_004988" OutName="tex_00004988" Format="ci8" Width="32" Height="16" Offset="0x4988" />
-        <Texture Name="object_ahg_Tex_004B88" OutName="tex_00004B88" Format="ci8" Width="16" Height="16" Offset="0x4B88" />
-        <Texture Name="object_ahg_Tex_004C88" OutName="tex_00004C88" Format="ci8" Width="8" Height="16" Offset="0x4C88" />
-        <DList Name="object_ahg_DL_005508" Offset="0x5508" />
-        <DList Name="object_ahg_DL_005728" Offset="0x5728" />
+        <!-- <Blob Name="object_ahg_Blob_0047C8" Size="0x180" Offset="0x47C8"/> -->
+        <Texture Name="object_ahg_Tex_004948" OutName="tex_00004948" Format="ci8" Width="8" Height="8" Offset="0x4948"/>
+        <Texture Name="object_ahg_Tex_004988" OutName="tex_00004988" Format="ci8" Width="32" Height="16" Offset="0x4988"/>
+        <Texture Name="object_ahg_Tex_004B88" OutName="tex_00004B88" Format="ci8" Width="16" Height="16" Offset="0x4B88"/>
+        <Texture Name="object_ahg_Tex_004C88" OutName="tex_00004C88" Format="ci8" Width="8" Height="16" Offset="0x4C88"/>
+        <DList Name="object_ahg_DL_005508" Offset="0x5508"/>
+        <DList Name="object_ahg_DL_005728" Offset="0x5728"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_ane.xml b/assets/xml/objects/object_ane.xml
index f21ddfbbd..1e29b351e 100644
--- a/assets/xml/objects/object_ane.xml
+++ b/assets/xml/objects/object_ane.xml
@@ -4,21 +4,21 @@
         <Skeleton Name="gCuccoLadySkel" Type="Flex" LimbType="Standard" Offset="0xF0"/>
 
         <!-- Cucco Lady Skeleton Limbs -->
-        <Limb Name="gCuccoLadyRootLimb" Type="Standard" Offset="0x000"/>
-        <Limb Name="gCuccoLadyLimb_00C" Type="Standard" Offset="0x00C"/>
-        <Limb Name="gCuccoLadyLimb_018" Type="Standard" Offset="0x018"/>
-        <Limb Name="gCuccoLadyLimb_024" Type="Standard" Offset="0x024"/>
-        <Limb Name="gCuccoLadyLimb_030" Type="Standard" Offset="0x030"/>
-        <Limb Name="gCuccoLadyLimb_03C" Type="Standard" Offset="0x03C"/>
-        <Limb Name="gCuccoLadyLimb_048" Type="Standard" Offset="0x048"/>
-        <Limb Name="gCuccoLadyTorsoLimb" Type="Standard" Offset="0x054"/>
-        <Limb Name="gCuccoLadyLimb_060" Type="Standard" Offset="0x060"/>
-        <Limb Name="gCuccoLadyLimb_06C" Type="Standard" Offset="0x06C"/>
-        <Limb Name="gCuccoLadyLimb_078" Type="Standard" Offset="0x078"/>
-        <Limb Name="gCuccoLadyLimb_084" Type="Standard" Offset="0x084"/>
-        <Limb Name="gCuccoLadyLimb_090" Type="Standard" Offset="0x090"/>
-        <Limb Name="gCuccoLadyLimb_09C" Type="Standard" Offset="0x09C"/>
-        <Limb Name="gCuccoLadyHeadLimb" Type="Standard" Offset="0x0A8"/>
+        <Limb Name="gCuccoLadyRootLimb" LimbType="Standard" Offset="0x000"/>
+        <Limb Name="gCuccoLadyLimb_00C" LimbType="Standard" Offset="0x00C"/>
+        <Limb Name="gCuccoLadyLimb_018" LimbType="Standard" Offset="0x018"/>
+        <Limb Name="gCuccoLadyLimb_024" LimbType="Standard" Offset="0x024"/>
+        <Limb Name="gCuccoLadyLimb_030" LimbType="Standard" Offset="0x030"/>
+        <Limb Name="gCuccoLadyLimb_03C" LimbType="Standard" Offset="0x03C"/>
+        <Limb Name="gCuccoLadyLimb_048" LimbType="Standard" Offset="0x048"/>
+        <Limb Name="gCuccoLadyTorsoLimb" LimbType="Standard" Offset="0x054"/>
+        <Limb Name="gCuccoLadyLimb_060" LimbType="Standard" Offset="0x060"/>
+        <Limb Name="gCuccoLadyLimb_06C" LimbType="Standard" Offset="0x06C"/>
+        <Limb Name="gCuccoLadyLimb_078" LimbType="Standard" Offset="0x078"/>
+        <Limb Name="gCuccoLadyLimb_084" LimbType="Standard" Offset="0x084"/>
+        <Limb Name="gCuccoLadyLimb_090" LimbType="Standard" Offset="0x090"/>
+        <Limb Name="gCuccoLadyLimb_09C" LimbType="Standard" Offset="0x09C"/>
+        <Limb Name="gCuccoLadyHeadLimb" LimbType="Standard" Offset="0x0A8"/>
 
         <!-- Cucco Lady Limb DisplayLists -->
         <DList Name="gCuccoLadyDressDL" Offset="0x6DF0"/>
diff --git a/assets/xml/objects/object_ani.xml b/assets/xml/objects/object_ani.xml
index 4d3ee0e98..c69656043 100644
--- a/assets/xml/objects/object_ani.xml
+++ b/assets/xml/objects/object_ani.xml
@@ -4,21 +4,21 @@
         <Skeleton Name="gRoofManSkel" Type="Flex" LimbType="Standard" Offset="0xF0"/>
         
         <!-- Kakariko Roof Man Limbs -->
-        <Limb Name="gRoofManRootLimb" Type="Standard" Offset="0x0"/>
-        <Limb Name="gRoofManLeftThighLimb" Type="Standard" Offset="0xC"/>
-        <Limb Name="gRoofManLeftLegLimb" Type="Standard" Offset="0x18"/>
-        <Limb Name="gRoofManLeftFootLimb" Type="Standard" Offset="0x24"/>
-        <Limb Name="gRoofManRightThighLimb" Type="Standard" Offset="0x30"/>
-        <Limb Name="gRoofManRightLegLimb" Type="Standard" Offset="0x3C"/>
-        <Limb Name="gRoofManRightFootLimb" Type="Standard" Offset="0x48"/>
-        <Limb Name="gRoofManTorsoLimb" Type="Standard" Offset="0x54"/>
-        <Limb Name="gRoofManLeftUpperArmLimb" Type="Standard" Offset="0x60"/>
-        <Limb Name="gRoofManLeftForearmLimb" Type="Standard" Offset="0x6C"/>
-        <Limb Name="gRoofManLeftHandLimb" Type="Standard" Offset="0x78"/>
-        <Limb Name="gRoofManRightUpperArmLimb" Type="Standard" Offset="0x84"/>
-        <Limb Name="gRoofManRightForearmLimb" Type="Standard" Offset="0x90"/>
-        <Limb Name="gRoofManRightHandLimb" Type="Standard" Offset="0x9C"/>
-        <Limb Name="gRoofManHeadLimb" Type="Standard" Offset="0xA8"/>
+        <Limb Name="gRoofManRootLimb" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="gRoofManLeftThighLimb" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="gRoofManLeftLegLimb" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="gRoofManLeftFootLimb" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="gRoofManRightThighLimb" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="gRoofManRightLegLimb" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="gRoofManRightFootLimb" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="gRoofManTorsoLimb" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="gRoofManLeftUpperArmLimb" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="gRoofManLeftForearmLimb" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="gRoofManLeftHandLimb" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="gRoofManRightUpperArmLimb" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="gRoofManRightForearmLimb" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="gRoofManRightHandLimb" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="gRoofManHeadLimb" LimbType="Standard" Offset="0xA8"/>
 
         <!-- Kakariko Roof Man Limb DisplayLists -->
         <DList Name="gRoofManWaistDL" Offset="0x61C8"/>
diff --git a/assets/xml/objects/object_aob.xml b/assets/xml/objects/object_aob.xml
index 56d0c52b6..e6202d0cf 100644
--- a/assets/xml/objects/object_aob.xml
+++ b/assets/xml/objects/object_aob.xml
@@ -4,21 +4,21 @@
         <Skeleton Name="gDogLadySkel" Type="Flex" LimbType="Standard" Offset="0xF0"/>
 
         <!-- Dog Lady Limbs -->
-        <Limb Name="gDogLadyRootLimb" Type="Standard" Offset="0x000"/>
-        <Limb Name="gDogLadyLimb_00C" Type="Standard" Offset="0x00C"/>
-        <Limb Name="gDogLadyLimb_018" Type="Standard" Offset="0x018"/>
-        <Limb Name="gDogLadyLimb_024" Type="Standard" Offset="0x024"/>
-        <Limb Name="gDogLadyLimb_030" Type="Standard" Offset="0x030"/>
-        <Limb Name="gDogLadyLimb_03C" Type="Standard" Offset="0x03C"/>
-        <Limb Name="gDogLadyLimb_048" Type="Standard" Offset="0x048"/>
-        <Limb Name="gDogLadyTorsoLimb" Type="Standard" Offset="0x054"/>
-        <Limb Name="gDogLadyLimb_060" Type="Standard" Offset="0x060"/>
-        <Limb Name="gDogLadyLimb_06C" Type="Standard" Offset="0x06C"/>
-        <Limb Name="gDogLadyLimb_078" Type="Standard" Offset="0x078"/>
-        <Limb Name="gDogLadyLimb_084" Type="Standard" Offset="0x084"/>
-        <Limb Name="gDogLadyLimb_090" Type="Standard" Offset="0x090"/>
-        <Limb Name="gDogLadyLimb_09C" Type="Standard" Offset="0x09C"/>
-        <Limb Name="gDogLadyHeadLimb" Type="Standard" Offset="0x0A8"/>
+        <Limb Name="gDogLadyRootLimb" LimbType="Standard" Offset="0x000"/>
+        <Limb Name="gDogLadyLimb_00C" LimbType="Standard" Offset="0x00C"/>
+        <Limb Name="gDogLadyLimb_018" LimbType="Standard" Offset="0x018"/>
+        <Limb Name="gDogLadyLimb_024" LimbType="Standard" Offset="0x024"/>
+        <Limb Name="gDogLadyLimb_030" LimbType="Standard" Offset="0x030"/>
+        <Limb Name="gDogLadyLimb_03C" LimbType="Standard" Offset="0x03C"/>
+        <Limb Name="gDogLadyLimb_048" LimbType="Standard" Offset="0x048"/>
+        <Limb Name="gDogLadyTorsoLimb" LimbType="Standard" Offset="0x054"/>
+        <Limb Name="gDogLadyLimb_060" LimbType="Standard" Offset="0x060"/>
+        <Limb Name="gDogLadyLimb_06C" LimbType="Standard" Offset="0x06C"/>
+        <Limb Name="gDogLadyLimb_078" LimbType="Standard" Offset="0x078"/>
+        <Limb Name="gDogLadyLimb_084" LimbType="Standard" Offset="0x084"/>
+        <Limb Name="gDogLadyLimb_090" LimbType="Standard" Offset="0x090"/>
+        <Limb Name="gDogLadyLimb_09C" LimbType="Standard" Offset="0x09C"/>
+        <Limb Name="gDogLadyHeadLimb" LimbType="Standard" Offset="0x0A8"/>
 
         
         <!-- Dog Lady Limb DisplayLists -->
diff --git a/assets/xml/objects/object_bji.xml b/assets/xml/objects/object_bji.xml
index 3b993ca29..31f987302 100644
--- a/assets/xml/objects/object_bji.xml
+++ b/assets/xml/objects/object_bji.xml
@@ -2,61 +2,61 @@
     <File Name="object_bji" Segment="6">
         <!-- The textures used by these limbs aren't 64-bit aligned, so this won't compile to a matching ROM. -->
         <!-- 
-        <Limb Name="object_bji_Limb_000000" LimbType="Standard" Offset="0x0" />
-        <Limb Name="object_bji_Limb_00000C" LimbType="Standard" Offset="0xC" />
-        <Limb Name="object_bji_Limb_000018" LimbType="Standard" Offset="0x18" />
-        <Limb Name="object_bji_Limb_000024" LimbType="Standard" Offset="0x24" />
-        <Limb Name="object_bji_Limb_000030" LimbType="Standard" Offset="0x30" />
-        <Limb Name="object_bji_Limb_00003C" LimbType="Standard" Offset="0x3C" />
-        <Limb Name="object_bji_Limb_000048" LimbType="Standard" Offset="0x48" />
-        <Limb Name="object_bji_Limb_000054" LimbType="Standard" Offset="0x54" />
-        <Limb Name="object_bji_Limb_000060" LimbType="Standard" Offset="0x60" />
-        <Limb Name="object_bji_Limb_00006C" LimbType="Standard" Offset="0x6C" />
-        <Limb Name="object_bji_Limb_000078" LimbType="Standard" Offset="0x78" />
-        <Limb Name="object_bji_Limb_000084" LimbType="Standard" Offset="0x84" />
-        <Limb Name="object_bji_Limb_000090" LimbType="Standard" Offset="0x90" />
-        <Limb Name="object_bji_Limb_00009C" LimbType="Standard" Offset="0x9C" />
-        <Limb Name="object_bji_Limb_0000A8" LimbType="Standard" Offset="0xA8" />
+        <Limb Name="object_bji_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_bji_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_bji_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_bji_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_bji_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_bji_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_bji_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_bji_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_bji_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_bji_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_bji_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_bji_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_bji_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_bji_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_bji_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
         -->
 
         <!-- 
-        <Skeleton Name="object_bji_Skel_0000F0" Type="Flex" LimbType="Standard" Offset="0xF0" />
+        <Skeleton Name="object_bji_Skel_0000F0" Type="Flex" LimbType="Standard" Offset="0xF0"/>
         -->
 
         <!-- 32-bit aligned textures. -->
         <!--
-        <Texture Name="object_bji_TLUT_0000FC" OutName="tlut_000000FC" Format="rgba16" Width="16" Height="16" Offset="0xFC" />
-        <Texture Name="object_bji_Tex_0002FC" OutName="tex_000002FC" Format="ci8" Width="8" Height="8" Offset="0x2FC" />
-        <Texture Name="object_bji_Tex_00033C" OutName="tex_0000033C" Format="ci8" Width="8" Height="8" Offset="0x33C" />
-        <Texture Name="object_bji_Tex_00037C" OutName="tex_0000037C" Format="ci8" Width="16" Height="16" Offset="0x37C" />
-        <Texture Name="object_bji_Tex_00047C" OutName="tex_0000047C" Format="ci8" Width="8" Height="8" Offset="0x47C" />
-        <Texture Name="object_bji_Tex_0004BC" OutName="tex_000004BC" Format="ci8" Width="8" Height="8" Offset="0x4BC" />
-        <Texture Name="object_bji_Tex_0004FC" OutName="tex_000004FC" Format="i8" Width="16" Height="16" Offset="0x4FC" />
-        <Blob Name="object_bji_Blob_0005FC" Size="0xC00" Offset="0x5FC" />
-        <Texture Name="object_bji_Tex_0011FC" OutName="tex_000011FC" Format="i8" Width="8" Height="8" Offset="0x11FC" />
+        <Texture Name="object_bji_TLUT_0000FC" OutName="tlut_000000FC" Format="rgba16" Width="16" Height="16" Offset="0xFC"/>
+        <Texture Name="object_bji_Tex_0002FC" OutName="tex_000002FC" Format="ci8" Width="8" Height="8" Offset="0x2FC"/>
+        <Texture Name="object_bji_Tex_00033C" OutName="tex_0000033C" Format="ci8" Width="8" Height="8" Offset="0x33C"/>
+        <Texture Name="object_bji_Tex_00037C" OutName="tex_0000037C" Format="ci8" Width="16" Height="16" Offset="0x37C"/>
+        <Texture Name="object_bji_Tex_00047C" OutName="tex_0000047C" Format="ci8" Width="8" Height="8" Offset="0x47C"/>
+        <Texture Name="object_bji_Tex_0004BC" OutName="tex_000004BC" Format="ci8" Width="8" Height="8" Offset="0x4BC"/>
+        <Texture Name="object_bji_Tex_0004FC" OutName="tex_000004FC" Format="i8" Width="16" Height="16" Offset="0x4FC"/>
+        <Blob Name="object_bji_Blob_0005FC" Size="0xC00" Offset="0x5FC"/>
+        <Texture Name="object_bji_Tex_0011FC" OutName="tex_000011FC" Format="i8" Width="8" Height="8" Offset="0x11FC"/>
         -->
 
         <!--
-        <DList Name="object_bji_DL_002560" Offset="0x2560" />
-        <DList Name="object_bji_DL_002B88" Offset="0x2B88" />
-        <DList Name="object_bji_DL_002C50" Offset="0x2C50" />
-        <DList Name="object_bji_DL_002D40" Offset="0x2D40" />
-        <DList Name="object_bji_DL_002E40" Offset="0x2E40" />
-        <DList Name="object_bji_DL_002F08" Offset="0x2F08" />
-        <DList Name="object_bji_DL_002FF8" Offset="0x2FF8" />
-        <DList Name="object_bji_DL_0030F8" Offset="0x30F8" />
-        <DList Name="object_bji_DL_003328" Offset="0x3328" />
-        <DList Name="object_bji_DL_0033F0" Offset="0x33F0" />
-        <DList Name="object_bji_DL_0034B8" Offset="0x34B8" />
-        <DList Name="object_bji_DL_003580" Offset="0x3580" />
-        <DList Name="object_bji_DL_003648" Offset="0x3648" />
-        <DList Name="object_bji_DL_003710" Offset="0x3710" />
-        <DList Name="object_bji_DL_0037D8" Offset="0x37D8" />
+        <DList Name="object_bji_DL_002560" Offset="0x2560"/>
+        <DList Name="object_bji_DL_002B88" Offset="0x2B88"/>
+        <DList Name="object_bji_DL_002C50" Offset="0x2C50"/>
+        <DList Name="object_bji_DL_002D40" Offset="0x2D40"/>
+        <DList Name="object_bji_DL_002E40" Offset="0x2E40"/>
+        <DList Name="object_bji_DL_002F08" Offset="0x2F08"/>
+        <DList Name="object_bji_DL_002FF8" Offset="0x2FF8"/>
+        <DList Name="object_bji_DL_0030F8" Offset="0x30F8"/>
+        <DList Name="object_bji_DL_003328" Offset="0x3328"/>
+        <DList Name="object_bji_DL_0033F0" Offset="0x33F0"/>
+        <DList Name="object_bji_DL_0034B8" Offset="0x34B8"/>
+        <DList Name="object_bji_DL_003580" Offset="0x3580"/>
+        <DList Name="object_bji_DL_003648" Offset="0x3648"/>
+        <DList Name="object_bji_DL_003710" Offset="0x3710"/>
+        <DList Name="object_bji_DL_0037D8" Offset="0x37D8"/>
         -->
 
-        <Texture Name="object_bji_Tex_003908" OutName="tex_00003908" Format="rgba16" Width="8" Height="8" Offset="0x3908" />
-        <Texture Name="object_bji_Tex_003988" OutName="tex_00003988" Format="rgba16" Width="8" Height="8" Offset="0x3988" />
-        <Texture Name="object_bji_Tex_003A08" OutName="tex_00003A08" Format="rgba16" Width="8" Height="8" Offset="0x3A08" />
-        <DList Name="object_bji_DL_003F68" Offset="0x3F68" />
+        <Texture Name="object_bji_Tex_003908" OutName="tex_00003908" Format="rgba16" Width="8" Height="8" Offset="0x3908"/>
+        <Texture Name="object_bji_Tex_003988" OutName="tex_00003988" Format="rgba16" Width="8" Height="8" Offset="0x3988"/>
+        <Texture Name="object_bji_Tex_003A08" OutName="tex_00003A08" Format="rgba16" Width="8" Height="8" Offset="0x3A08"/>
+        <DList Name="object_bji_DL_003F68" Offset="0x3F68"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_bl.xml b/assets/xml/objects/object_bl.xml
index 8bf3945bc..1c2ef4ec6 100644
--- a/assets/xml/objects/object_bl.xml
+++ b/assets/xml/objects/object_bl.xml
@@ -23,10 +23,10 @@
         <Texture Name="gBiriInnerHoodTex" OutName="biri_inner_hood" Format="ia16" Width="16" Height="16" Offset="0x5608"/>
 
         <!-- Biri Limbs and Skeleton -->
-        <Limb Name="gBiriRootLimb" Type="Standard" Offset="0x5808"/>
-        <Limb Name="gBiriInnerHoodLimb" Type="Standard" Offset="0x5814"/>
-        <Limb Name="gBiriOuterHoodLimb" Type="Standard" Offset="0x5820"/>
-        <Limb Name="gBiriTentaclesLimb" Type="Standard" Offset="0x582C"/>
+        <Limb Name="gBiriRootLimb" LimbType="Standard" Offset="0x5808"/>
+        <Limb Name="gBiriInnerHoodLimb" LimbType="Standard" Offset="0x5814"/>
+        <Limb Name="gBiriOuterHoodLimb" LimbType="Standard" Offset="0x5820"/>
+        <Limb Name="gBiriTentaclesLimb" LimbType="Standard" Offset="0x582C"/>
         <Skeleton Name="gBiriSkel" Type="Normal" LimbType="Standard" Offset="0x5848"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_boj.xml b/assets/xml/objects/object_boj.xml
index 10c97c4f6..faf0622f7 100644
--- a/assets/xml/objects/object_boj.xml
+++ b/assets/xml/objects/object_boj.xml
@@ -2,68 +2,68 @@
     <File Name="object_boj" Segment="6">
         <!-- The textures used by these limbs aren't 64-bit aligned, so this won't compile to a matching ROM. -->
         <!-- 
-        <Limb Name="object_boj_Limb_000000" LimbType="Standard" Offset="0x0" />
-        <Limb Name="object_boj_Limb_00000C" LimbType="Standard" Offset="0xC" />
-        <Limb Name="object_boj_Limb_000018" LimbType="Standard" Offset="0x18" />
-        <Limb Name="object_boj_Limb_000024" LimbType="Standard" Offset="0x24" />
-        <Limb Name="object_boj_Limb_000030" LimbType="Standard" Offset="0x30" />
-        <Limb Name="object_boj_Limb_00003C" LimbType="Standard" Offset="0x3C" />
-        <Limb Name="object_boj_Limb_000048" LimbType="Standard" Offset="0x48" />
-        <Limb Name="object_boj_Limb_000054" LimbType="Standard" Offset="0x54" />
-        <Limb Name="object_boj_Limb_000060" LimbType="Standard" Offset="0x60" />
-        <Limb Name="object_boj_Limb_00006C" LimbType="Standard" Offset="0x6C" />
-        <Limb Name="object_boj_Limb_000078" LimbType="Standard" Offset="0x78" />
-        <Limb Name="object_boj_Limb_000084" LimbType="Standard" Offset="0x84" />
-        <Limb Name="object_boj_Limb_000090" LimbType="Standard" Offset="0x90" />
-        <Limb Name="object_boj_Limb_00009C" LimbType="Standard" Offset="0x9C" />
-        <Limb Name="object_boj_Limb_0000A8" LimbType="Standard" Offset="0xA8" />
+        <Limb Name="object_boj_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_boj_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_boj_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_boj_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_boj_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_boj_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_boj_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_boj_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_boj_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_boj_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_boj_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_boj_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_boj_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_boj_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_boj_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
         -->
 
         <!--
-        <Skeleton Name="object_boj_Skel_0000F0" Type="Flex" LimbType="Standard" Offset="0xF0" />
+        <Skeleton Name="object_boj_Skel_0000F0" Type="Flex" LimbType="Standard" Offset="0xF0"/>
         -->
 
         <!-- 32-bit aligned textures. -->
         <!--
-        <Texture Name="object_boj_TLUT_0000FC" OutName="tlut_000000FC" Format="rgba16" Width="16" Height="16" Offset="0xFC" />
-        <Texture Name="object_boj_Tex_0002FC" OutName="tex_000002FC" Format="ci8" Width="8" Height="16" Offset="0x2FC" />
-        <Texture Name="object_boj_Tex_00037C" OutName="tex_0000037C" Format="ci8" Width="8" Height="8" Offset="0x37C" />
-        <Texture Name="object_boj_Tex_0003BC" OutName="tex_000003BC" Format="ci8" Width="32" Height="16" Offset="0x3BC" />
-        <Texture Name="object_boj_Tex_0005BC" OutName="tex_000005BC" Format="ci8" Width="8" Height="8" Offset="0x5BC" />
-        <Blob Name="object_boj_Blob_0005FC" Size="0x300" Offset="0x5FC" />
-        <Texture Name="object_boj_Tex_0008FC" OutName="tex_000008FC" Format="ci8" Width="8" Height="8" Offset="0x8FC" />
-        <Texture Name="object_boj_Tex_00093C" OutName="tex_0000093C" Format="i8" Width="16" Height="16" Offset="0x93C" />
-        <Texture Name="object_boj_Tex_000A3C" OutName="tex_00000A3C" Format="ci8" Width="8" Height="8" Offset="0xA3C" />
-        <Texture Name="object_boj_Tex_000A7C" OutName="tex_00000A7C" Format="i8" Width="8" Height="8" Offset="0xA7C" />
-        <DList Name="object_boj_DL_0026F0" Offset="0x26F0" />
-        <DList Name="object_boj_DL_002AC8" Offset="0x2AC8" />
-        <DList Name="object_boj_DL_002C10" Offset="0x2C10" />
-        <DList Name="object_boj_DL_002D18" Offset="0x2D18" />
-        <DList Name="object_boj_DL_002E20" Offset="0x2E20" />
-        <DList Name="object_boj_DL_002F68" Offset="0x2F68" />
-        <DList Name="object_boj_DL_003070" Offset="0x3070" />
-        <DList Name="object_boj_DL_003178" Offset="0x3178" />
-        <DList Name="object_boj_DL_003350" Offset="0x3350" />
-        <DList Name="object_boj_DL_003468" Offset="0x3468" />
-        <DList Name="object_boj_DL_003578" Offset="0x3578" />
-        <DList Name="object_boj_DL_003680" Offset="0x3680" />
-        <DList Name="object_boj_DL_003798" Offset="0x3798" />
-        <DList Name="object_boj_DL_0038A8" Offset="0x38A8" />
-        <DList Name="object_boj_DL_0039B0" Offset="0x39B0" />
+        <Texture Name="object_boj_TLUT_0000FC" OutName="tlut_000000FC" Format="rgba16" Width="16" Height="16" Offset="0xFC"/>
+        <Texture Name="object_boj_Tex_0002FC" OutName="tex_000002FC" Format="ci8" Width="8" Height="16" Offset="0x2FC"/>
+        <Texture Name="object_boj_Tex_00037C" OutName="tex_0000037C" Format="ci8" Width="8" Height="8" Offset="0x37C"/>
+        <Texture Name="object_boj_Tex_0003BC" OutName="tex_000003BC" Format="ci8" Width="32" Height="16" Offset="0x3BC"/>
+        <Texture Name="object_boj_Tex_0005BC" OutName="tex_000005BC" Format="ci8" Width="8" Height="8" Offset="0x5BC"/>
+        <Blob Name="object_boj_Blob_0005FC" Size="0x300" Offset="0x5FC"/>
+        <Texture Name="object_boj_Tex_0008FC" OutName="tex_000008FC" Format="ci8" Width="8" Height="8" Offset="0x8FC"/>
+        <Texture Name="object_boj_Tex_00093C" OutName="tex_0000093C" Format="i8" Width="16" Height="16" Offset="0x93C"/>
+        <Texture Name="object_boj_Tex_000A3C" OutName="tex_00000A3C" Format="ci8" Width="8" Height="8" Offset="0xA3C"/>
+        <Texture Name="object_boj_Tex_000A7C" OutName="tex_00000A7C" Format="i8" Width="8" Height="8" Offset="0xA7C"/>
+        <DList Name="object_boj_DL_0026F0" Offset="0x26F0"/>
+        <DList Name="object_boj_DL_002AC8" Offset="0x2AC8"/>
+        <DList Name="object_boj_DL_002C10" Offset="0x2C10"/>
+        <DList Name="object_boj_DL_002D18" Offset="0x2D18"/>
+        <DList Name="object_boj_DL_002E20" Offset="0x2E20"/>
+        <DList Name="object_boj_DL_002F68" Offset="0x2F68"/>
+        <DList Name="object_boj_DL_003070" Offset="0x3070"/>
+        <DList Name="object_boj_DL_003178" Offset="0x3178"/>
+        <DList Name="object_boj_DL_003350" Offset="0x3350"/>
+        <DList Name="object_boj_DL_003468" Offset="0x3468"/>
+        <DList Name="object_boj_DL_003578" Offset="0x3578"/>
+        <DList Name="object_boj_DL_003680" Offset="0x3680"/>
+        <DList Name="object_boj_DL_003798" Offset="0x3798"/>
+        <DList Name="object_boj_DL_0038A8" Offset="0x38A8"/>
+        <DList Name="object_boj_DL_0039B0" Offset="0x39B0"/>
         -->
 
-        <!-- <Blob Name="object_boj_Blob_003B98" Size="0x1F8" Offset="0x3B98" /> -->
-        <Texture Name="object_boj_Tex_003D90" OutName="tex_00003D90" Format="ci8" Width="8" Height="8" Offset="0x3D90" />
-        <Texture Name="object_boj_Tex_003DD0" OutName="tex_00003DD0" Format="ci8" Width="16" Height="16" Offset="0x3DD0" />
-        <Texture Name="object_boj_Tex_003ED0" OutName="tex_00003ED0" Format="ci8" Width="16" Height="16" Offset="0x3ED0" />
-        <Texture Name="object_boj_Tex_003FD0" OutName="tex_00003FD0" Format="ci8" Width="8" Height="16" Offset="0x3FD0" />
-        <Texture Name="object_boj_Tex_004050" OutName="tex_00004050" Format="ci8" Width="16" Height="16" Offset="0x4050" />
-        <Texture Name="object_boj_Tex_004150" OutName="tex_00004150" Format="ci8" Width="16" Height="16" Offset="0x4150" />
-        <Texture Name="object_boj_Tex_004250" OutName="tex_00004250" Format="ci8" Width="16" Height="16" Offset="0x4250" />
-        <DList Name="object_boj_DL_0052E0" Offset="0x52E0" />
-        <DList Name="object_boj_DL_005528" Offset="0x5528" />
-        <DList Name="object_boj_DL_005738" Offset="0x5738" />
-        <DList Name="object_boj_DL_0059B0" Offset="0x59B0" />
-        <DList Name="object_boj_DL_005BC8" Offset="0x5BC8" />
+        <!-- <Blob Name="object_boj_Blob_003B98" Size="0x1F8" Offset="0x3B98"/> -->
+        <Texture Name="object_boj_Tex_003D90" OutName="tex_00003D90" Format="ci8" Width="8" Height="8" Offset="0x3D90"/>
+        <Texture Name="object_boj_Tex_003DD0" OutName="tex_00003DD0" Format="ci8" Width="16" Height="16" Offset="0x3DD0"/>
+        <Texture Name="object_boj_Tex_003ED0" OutName="tex_00003ED0" Format="ci8" Width="16" Height="16" Offset="0x3ED0"/>
+        <Texture Name="object_boj_Tex_003FD0" OutName="tex_00003FD0" Format="ci8" Width="8" Height="16" Offset="0x3FD0"/>
+        <Texture Name="object_boj_Tex_004050" OutName="tex_00004050" Format="ci8" Width="16" Height="16" Offset="0x4050"/>
+        <Texture Name="object_boj_Tex_004150" OutName="tex_00004150" Format="ci8" Width="16" Height="16" Offset="0x4150"/>
+        <Texture Name="object_boj_Tex_004250" OutName="tex_00004250" Format="ci8" Width="16" Height="16" Offset="0x4250"/>
+        <DList Name="object_boj_DL_0052E0" Offset="0x52E0"/>
+        <DList Name="object_boj_DL_005528" Offset="0x5528"/>
+        <DList Name="object_boj_DL_005738" Offset="0x5738"/>
+        <DList Name="object_boj_DL_0059B0" Offset="0x59B0"/>
+        <DList Name="object_boj_DL_005BC8" Offset="0x5BC8"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_cne.xml b/assets/xml/objects/object_cne.xml
index e58450b02..99daae4cc 100644
--- a/assets/xml/objects/object_cne.xml
+++ b/assets/xml/objects/object_cne.xml
@@ -2,60 +2,60 @@
     <File Name="object_cne" Segment="6">
         <!-- The textures used by these limbs aren't 64-bit aligned, so this won't compile to a matching ROM. -->
         <!-- 
-        <Limb Name="object_cne_Limb_000000" LimbType="Standard" Offset="0x0" />
-        <Limb Name="object_cne_Limb_00000C" LimbType="Standard" Offset="0xC" />
-        <Limb Name="object_cne_Limb_000018" LimbType="Standard" Offset="0x18" />
-        <Limb Name="object_cne_Limb_000024" LimbType="Standard" Offset="0x24" />
-        <Limb Name="object_cne_Limb_000030" LimbType="Standard" Offset="0x30" />
-        <Limb Name="object_cne_Limb_00003C" LimbType="Standard" Offset="0x3C" />
-        <Limb Name="object_cne_Limb_000048" LimbType="Standard" Offset="0x48" />
-        <Limb Name="object_cne_Limb_000054" LimbType="Standard" Offset="0x54" />
-        <Limb Name="object_cne_Limb_000060" LimbType="Standard" Offset="0x60" />
-        <Limb Name="object_cne_Limb_00006C" LimbType="Standard" Offset="0x6C" />
-        <Limb Name="object_cne_Limb_000078" LimbType="Standard" Offset="0x78" />
-        <Limb Name="object_cne_Limb_000084" LimbType="Standard" Offset="0x84" />
-        <Limb Name="object_cne_Limb_000090" LimbType="Standard" Offset="0x90" />
-        <Limb Name="object_cne_Limb_00009C" LimbType="Standard" Offset="0x9C" />
-        <Limb Name="object_cne_Limb_0000A8" LimbType="Standard" Offset="0xA8" />
+        <Limb Name="object_cne_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_cne_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_cne_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_cne_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_cne_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_cne_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_cne_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_cne_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_cne_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_cne_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_cne_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_cne_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_cne_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_cne_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_cne_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
         -->
 
         <!--
-        <Skeleton Name="object_cne_Skel_0000F0" Type="Flex" LimbType="Standard" Offset="0xF0" />
+        <Skeleton Name="object_cne_Skel_0000F0" Type="Flex" LimbType="Standard" Offset="0xF0"/>
         -->
 
         <!-- 32-bit aligned textures. -->
         <!--
-        <Texture Name="object_cne_TLUT_0000FC" OutName="tlut_000000FC" Format="rgba16" Width="16" Height="16" Offset="0xFC" />
-        <Texture Name="object_cne_Tex_0002FC" OutName="tex_000002FC" Format="ci8" Width="8" Height="8" Offset="0x2FC" />
-        <Texture Name="object_cne_Tex_00033C" OutName="tex_0000033C" Format="ci8" Width="8" Height="8" Offset="0x33C" />
-        <Texture Name="object_cne_Tex_00037C" OutName="tex_0000037C" Format="ci8" Width="8" Height="8" Offset="0x37C" />
-        <Texture Name="object_cne_Tex_0003BC" OutName="tex_000003BC" Format="ci8" Width="8" Height="8" Offset="0x3BC" />
-        <Texture Name="object_cne_Tex_0003FC" OutName="tex_000003FC" Format="ci8" Width="8" Height="16" Offset="0x3FC" />
-        <Texture Name="object_cne_Tex_00047C" OutName="tex_0000047C" Format="i8" Width="8" Height="8" Offset="0x47C" />
-        <Texture Name="object_cne_Tex_0004BC" OutName="tex_000004BC" Format="ci8" Width="8" Height="8" Offset="0x4BC" />
+        <Texture Name="object_cne_TLUT_0000FC" OutName="tlut_000000FC" Format="rgba16" Width="16" Height="16" Offset="0xFC"/>
+        <Texture Name="object_cne_Tex_0002FC" OutName="tex_000002FC" Format="ci8" Width="8" Height="8" Offset="0x2FC"/>
+        <Texture Name="object_cne_Tex_00033C" OutName="tex_0000033C" Format="ci8" Width="8" Height="8" Offset="0x33C"/>
+        <Texture Name="object_cne_Tex_00037C" OutName="tex_0000037C" Format="ci8" Width="8" Height="8" Offset="0x37C"/>
+        <Texture Name="object_cne_Tex_0003BC" OutName="tex_000003BC" Format="ci8" Width="8" Height="8" Offset="0x3BC"/>
+        <Texture Name="object_cne_Tex_0003FC" OutName="tex_000003FC" Format="ci8" Width="8" Height="16" Offset="0x3FC"/>
+        <Texture Name="object_cne_Tex_00047C" OutName="tex_0000047C" Format="i8" Width="8" Height="8" Offset="0x47C"/>
+        <Texture Name="object_cne_Tex_0004BC" OutName="tex_000004BC" Format="ci8" Width="8" Height="8" Offset="0x4BC"/>
         -->
 
         <!--
-        <DList Name="object_cne_DL_001300" Offset="0x1300" />
-        <DList Name="object_cne_DL_001608" Offset="0x1608" />
-        <DList Name="object_cne_DL_0016E8" Offset="0x16E8" />
-        <DList Name="object_cne_DL_001808" Offset="0x1808" />
-        <DList Name="object_cne_DL_0018C8" Offset="0x18C8" />
-        <DList Name="object_cne_DL_0019A8" Offset="0x19A8" />
-        <DList Name="object_cne_DL_001AC8" Offset="0x1AC8" />
-        <DList Name="object_cne_DL_001B88" Offset="0x1B88" />
-        <DList Name="object_cne_DL_001E50" Offset="0x1E50" />
-        <DList Name="object_cne_DL_001F18" Offset="0x1F18" />
-        <DList Name="object_cne_DL_001FE0" Offset="0x1FE0" />
-        <DList Name="object_cne_DL_0020A8" Offset="0x20A8" />
-        <DList Name="object_cne_DL_002170" Offset="0x2170" />
-        <DList Name="object_cne_DL_002238" Offset="0x2238" />
-        <DList Name="object_cne_DL_002300" Offset="0x2300" />
+        <DList Name="object_cne_DL_001300" Offset="0x1300"/>
+        <DList Name="object_cne_DL_001608" Offset="0x1608"/>
+        <DList Name="object_cne_DL_0016E8" Offset="0x16E8"/>
+        <DList Name="object_cne_DL_001808" Offset="0x1808"/>
+        <DList Name="object_cne_DL_0018C8" Offset="0x18C8"/>
+        <DList Name="object_cne_DL_0019A8" Offset="0x19A8"/>
+        <DList Name="object_cne_DL_001AC8" Offset="0x1AC8"/>
+        <DList Name="object_cne_DL_001B88" Offset="0x1B88"/>
+        <DList Name="object_cne_DL_001E50" Offset="0x1E50"/>
+        <DList Name="object_cne_DL_001F18" Offset="0x1F18"/>
+        <DList Name="object_cne_DL_001FE0" Offset="0x1FE0"/>
+        <DList Name="object_cne_DL_0020A8" Offset="0x20A8"/>
+        <DList Name="object_cne_DL_002170" Offset="0x2170"/>
+        <DList Name="object_cne_DL_002238" Offset="0x2238"/>
+        <DList Name="object_cne_DL_002300" Offset="0x2300"/>
         -->
 
-        <Texture Name="object_cne_Tex_0023D0" OutName="tex_000023D0" Format="rgba16" Width="8" Height="16" Offset="0x23D0" />
-        <Texture Name="object_cne_Tex_0024D0" OutName="tex_000024D0" Format="rgba16" Width="8" Height="8" Offset="0x24D0" />
+        <Texture Name="object_cne_Tex_0023D0" OutName="tex_000023D0" Format="rgba16" Width="8" Height="16" Offset="0x23D0"/>
+        <Texture Name="object_cne_Tex_0024D0" OutName="tex_000024D0" Format="rgba16" Width="8" Height="8" Offset="0x24D0"/>
 
-        <DList Name="object_cne_DL_002860" Offset="0x2860" />
+        <DList Name="object_cne_DL_002860" Offset="0x2860"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_cow.xml b/assets/xml/objects/object_cow.xml
index 2340129dc..5d067c329 100644
--- a/assets/xml/objects/object_cow.xml
+++ b/assets/xml/objects/object_cow.xml
@@ -4,11 +4,11 @@
         <Skeleton Name="gCowBodySkel" Type="Flex" LimbType="Standard" Offset="0x4010"/>
 
         <!-- Cow Body Limbs -->
-        <Limb Name="gCowRootLimb" Type="Standard" Offset="0x3FC0"/>
-        <Limb Name="gCowHeadLimb" Type="Standard" Offset="0x3FCC"/>
-        <Limb Name="gCowJawLimb" Type="Standard" Offset="0x3FD8"/>
-        <Limb Name="gCowNoseLimb" Type="Standard" Offset="0x3FE4"/>
-        <Limb Name="gCowNoseRingLimb" Type="Standard" Offset="0x3FF0"/>
+        <Limb Name="gCowRootLimb" LimbType="Standard" Offset="0x3FC0"/>
+        <Limb Name="gCowHeadLimb" LimbType="Standard" Offset="0x3FCC"/>
+        <Limb Name="gCowJawLimb" LimbType="Standard" Offset="0x3FD8"/>
+        <Limb Name="gCowNoseLimb" LimbType="Standard" Offset="0x3FE4"/>
+        <Limb Name="gCowNoseRingLimb" LimbType="Standard" Offset="0x3FF0"/>
 
         <!-- Cow Body Limb DisplayLists -->
         <DList Name="gCowTorsoDL" Offset="0x1A80"/>
@@ -21,11 +21,11 @@
         <Skeleton Name="gCowTailSkel" Type="Flex" LimbType="Standard" Offset="0x4C30"/>
 
         <!-- Cow Tail Limbs -->
-        <Limb Name="gCowTailRootLimb" Type="Standard" Offset="0x4BE0"/>
-        <Limb Name="gCowTailUpperLimb" Type="Standard" Offset="0x4BEC"/>
-        <Limb Name="gCowTailMiddleLimb" Type="Standard" Offset="0x4BF8"/>
-        <Limb Name="gCowTailLowerLimb" Type="Standard" Offset="0x4C04"/>
-        <Limb Name="gCowTailEndLimb" Type="Standard" Offset="0x4C10"/>
+        <Limb Name="gCowTailRootLimb" LimbType="Standard" Offset="0x4BE0"/>
+        <Limb Name="gCowTailUpperLimb" LimbType="Standard" Offset="0x4BEC"/>
+        <Limb Name="gCowTailMiddleLimb" LimbType="Standard" Offset="0x4BF8"/>
+        <Limb Name="gCowTailLowerLimb" LimbType="Standard" Offset="0x4C04"/>
+        <Limb Name="gCowTailEndLimb" LimbType="Standard" Offset="0x4C10"/>
 
         <!-- Cow Tail Limb DisplayLists -->
         <DList Name="gCowTailConnectionDL" Offset="0x46F0"/>
diff --git a/assets/xml/objects/object_dog.xml b/assets/xml/objects/object_dog.xml
index 26bc15ab2..151a208f3 100644
--- a/assets/xml/objects/object_dog.xml
+++ b/assets/xml/objects/object_dog.xml
@@ -1,41 +1,41 @@
 <Root>
     <File Name="object_dog" Segment="6">
-        <Animation Name="object_dog_Anim_000278" Offset="0x278" />
-        <Animation Name="object_dog_Anim_000928" Offset="0x928" />
-        <Animation Name="object_dog_Anim_000C28" Offset="0xC28" />
-        <Animation Name="object_dog_Anim_000D78" Offset="0xD78" />
-        <Animation Name="object_dog_Anim_001150" Offset="0x1150" />
-        <Animation Name="object_dog_Anim_001368" Offset="0x1368" />
-        <Texture Name="object_dog_Tex_001380" OutName="tex_001380" Format="rgba16" Width="32" Height="32" Offset="0x1380" />
-        <Texture Name="object_dog_Tex_001B80" OutName="tex_001B80" Format="rgba16" Width="32" Height="32" Offset="0x1B80" />
-        <Texture Name="object_dog_Tex_002380" OutName="tex_002380" Format="rgba16" Width="32" Height="32" Offset="0x2380" />
-        <Texture Name="object_dog_Tex_002B80" OutName="tex_002B80" Format="rgba16" Width="32" Height="32" Offset="0x2B80" />
-        <Texture Name="object_dog_Tex_003380" OutName="tex_003380" Format="rgba16" Width="32" Height="32" Offset="0x3380" />
-        <Texture Name="object_dog_Tex_003B80" OutName="tex_003B80" Format="rgba16" Width="32" Height="32" Offset="0x3B80" />
-        <Texture Name="object_dog_Tex_004380" OutName="tex_004380" Format="rgba16" Width="16" Height="16" Offset="0x4380" />
-        <Texture Name="object_dog_Tex_004580" OutName="tex_004580" Format="rgba16" Width="32" Height="32" Offset="0x4580" />
-        <DList Name="object_dog_DL_0060E0" Offset="0x60E0" />
-        <DList Name="object_dog_DL_006448" Offset="0x6448" />
-        <DList Name="object_dog_DL_0064E8" Offset="0x64E8" />
-        <DList Name="object_dog_DL_006588" Offset="0x6588" />
-        <DList Name="object_dog_DL_0067A0" Offset="0x67A0" />
-        <DList Name="object_dog_DL_006950" Offset="0x6950" />
-        <DList Name="object_dog_DL_006B00" Offset="0x6B00" />
-        <DList Name="object_dog_DL_006CA0" Offset="0x6CA0" />
-        <DList Name="object_dog_DL_006E50" Offset="0x6E50" />
-        <DList Name="object_dog_DL_007000" Offset="0x7000" />
-        <Limb Name="object_dog_Limb_0071D0" LimbType="Standard" Offset="0x71D0" />
-        <Limb Name="object_dog_Limb_0071DC" LimbType="Standard" Offset="0x71DC" />
-        <Limb Name="object_dog_Limb_0071E8" LimbType="Standard" Offset="0x71E8" />
-        <Limb Name="object_dog_Limb_0071F4" LimbType="Standard" Offset="0x71F4" />
-        <Limb Name="object_dog_Limb_007200" LimbType="Standard" Offset="0x7200" />
-        <Limb Name="object_dog_Limb_00720C" LimbType="Standard" Offset="0x720C" />
-        <Limb Name="object_dog_Limb_007218" LimbType="Standard" Offset="0x7218" />
-        <Limb Name="object_dog_Limb_007224" LimbType="Standard" Offset="0x7224" />
-        <Limb Name="object_dog_Limb_007230" LimbType="Standard" Offset="0x7230" />
-        <Limb Name="object_dog_Limb_00723C" LimbType="Standard" Offset="0x723C" />
-        <Limb Name="object_dog_Limb_007248" LimbType="Standard" Offset="0x7248" />
-        <Limb Name="object_dog_Limb_007254" LimbType="Standard" Offset="0x7254" />
-        <Skeleton Name="object_dog_Skel_007290" Type="Flex" LimbType="Standard" Offset="0x7290" />
+        <Animation Name="object_dog_Anim_000278" Offset="0x278"/>
+        <Animation Name="object_dog_Anim_000928" Offset="0x928"/>
+        <Animation Name="object_dog_Anim_000C28" Offset="0xC28"/>
+        <Animation Name="object_dog_Anim_000D78" Offset="0xD78"/>
+        <Animation Name="object_dog_Anim_001150" Offset="0x1150"/>
+        <Animation Name="object_dog_Anim_001368" Offset="0x1368"/>
+        <Texture Name="object_dog_Tex_001380" OutName="tex_001380" Format="rgba16" Width="32" Height="32" Offset="0x1380"/>
+        <Texture Name="object_dog_Tex_001B80" OutName="tex_001B80" Format="rgba16" Width="32" Height="32" Offset="0x1B80"/>
+        <Texture Name="object_dog_Tex_002380" OutName="tex_002380" Format="rgba16" Width="32" Height="32" Offset="0x2380"/>
+        <Texture Name="object_dog_Tex_002B80" OutName="tex_002B80" Format="rgba16" Width="32" Height="32" Offset="0x2B80"/>
+        <Texture Name="object_dog_Tex_003380" OutName="tex_003380" Format="rgba16" Width="32" Height="32" Offset="0x3380"/>
+        <Texture Name="object_dog_Tex_003B80" OutName="tex_003B80" Format="rgba16" Width="32" Height="32" Offset="0x3B80"/>
+        <Texture Name="object_dog_Tex_004380" OutName="tex_004380" Format="rgba16" Width="16" Height="16" Offset="0x4380"/>
+        <Texture Name="object_dog_Tex_004580" OutName="tex_004580" Format="rgba16" Width="32" Height="32" Offset="0x4580"/>
+        <DList Name="object_dog_DL_0060E0" Offset="0x60E0"/>
+        <DList Name="object_dog_DL_006448" Offset="0x6448"/>
+        <DList Name="object_dog_DL_0064E8" Offset="0x64E8"/>
+        <DList Name="object_dog_DL_006588" Offset="0x6588"/>
+        <DList Name="object_dog_DL_0067A0" Offset="0x67A0"/>
+        <DList Name="object_dog_DL_006950" Offset="0x6950"/>
+        <DList Name="object_dog_DL_006B00" Offset="0x6B00"/>
+        <DList Name="object_dog_DL_006CA0" Offset="0x6CA0"/>
+        <DList Name="object_dog_DL_006E50" Offset="0x6E50"/>
+        <DList Name="object_dog_DL_007000" Offset="0x7000"/>
+        <Limb Name="object_dog_Limb_0071D0" LimbType="Standard" Offset="0x71D0"/>
+        <Limb Name="object_dog_Limb_0071DC" LimbType="Standard" Offset="0x71DC"/>
+        <Limb Name="object_dog_Limb_0071E8" LimbType="Standard" Offset="0x71E8"/>
+        <Limb Name="object_dog_Limb_0071F4" LimbType="Standard" Offset="0x71F4"/>
+        <Limb Name="object_dog_Limb_007200" LimbType="Standard" Offset="0x7200"/>
+        <Limb Name="object_dog_Limb_00720C" LimbType="Standard" Offset="0x720C"/>
+        <Limb Name="object_dog_Limb_007218" LimbType="Standard" Offset="0x7218"/>
+        <Limb Name="object_dog_Limb_007224" LimbType="Standard" Offset="0x7224"/>
+        <Limb Name="object_dog_Limb_007230" LimbType="Standard" Offset="0x7230"/>
+        <Limb Name="object_dog_Limb_00723C" LimbType="Standard" Offset="0x723C"/>
+        <Limb Name="object_dog_Limb_007248" LimbType="Standard" Offset="0x7248"/>
+        <Limb Name="object_dog_Limb_007254" LimbType="Standard" Offset="0x7254"/>
+        <Skeleton Name="object_dog_Skel_007290" Type="Flex" LimbType="Standard" Offset="0x7290"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_door_killer.xml b/assets/xml/objects/object_door_killer.xml
index 8da96881f..a37f590d6 100644
--- a/assets/xml/objects/object_door_killer.xml
+++ b/assets/xml/objects/object_door_killer.xml
@@ -12,6 +12,6 @@
         <DList Name="object_door_killer_DL_001550" Offset="0x1550"/>
         <DList Name="object_door_killer_DL_0017B8" Offset="0x17B8"/>
         <DList Name="object_door_killer_DL_001A58" Offset="0x1A58"/>
-        <Skeleton Name="object_door_killer_Skel_001BC8" Type="Flex" LimbType="Standard" Offset="0x1BC8" />
+        <Skeleton Name="object_door_killer_Skel_001BC8" Type="Flex" LimbType="Standard" Offset="0x1BC8"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_ds.xml b/assets/xml/objects/object_ds.xml
index 2e68a3099..0413a9e2e 100644
--- a/assets/xml/objects/object_ds.xml
+++ b/assets/xml/objects/object_ds.xml
@@ -4,11 +4,11 @@
         <Skeleton Name="gPotionShopLadySkel" Type="Flex" LimbType="Standard" Offset="0x4768"/>
 
         <!-- Potion Shop Lady Limbs -->
-        <Limb Name="gPotionShopLadyRootLimb" Type="Standard" Offset="0x4718"/>
-        <Limb Name="gPotionShopLadyCatLimb" Type="Standard" Offset="0x4724"/>
-        <Limb Name="gPotionShopLadyTorsoLimb" Type="Standard" Offset="0x4730"/>
-        <Limb Name="gPotionShopLadyArmLimb" Type="Standard" Offset="0x473C"/>
-        <Limb Name="gPotionShopLadyHeadLimb" Type="Standard" Offset="0x4748"/>
+        <Limb Name="gPotionShopLadyRootLimb" LimbType="Standard" Offset="0x4718"/>
+        <Limb Name="gPotionShopLadyCatLimb" LimbType="Standard" Offset="0x4724"/>
+        <Limb Name="gPotionShopLadyTorsoLimb" LimbType="Standard" Offset="0x4730"/>
+        <Limb Name="gPotionShopLadyArmLimb" LimbType="Standard" Offset="0x473C"/>
+        <Limb Name="gPotionShopLadyHeadLimb" LimbType="Standard" Offset="0x4748"/>
 
         <!-- Potion Shop Lady Limb DisplayLists -->
         <DList Name="gPotionShopLadyCatDL" Offset="0x36C0"/>
diff --git a/assets/xml/objects/object_dy_obj.xml b/assets/xml/objects/object_dy_obj.xml
index 750603876..4d141d546 100644
--- a/assets/xml/objects/object_dy_obj.xml
+++ b/assets/xml/objects/object_dy_obj.xml
@@ -5,33 +5,33 @@
         <Skeleton Name="gGreatFairySkel" Type="Flex" LimbType="Standard" Offset="0x1C450"/>
 
         <!-- Great Fairy Limbs -->
-        <Limb Name="gGreatFairyRootLimb" Type="Standard" Offset="0x1C2A0"/>
-        <Limb Name="gGreatFairyLeftThighLimb" Type="Standard" Offset="0x1C2AC"/>
-        <Limb Name="gGreatFairyLeftLegLimb" Type="Standard" Offset="0x1C2B8"/>
-        <Limb Name="gGreatFairyLeftFootLimb" Type="Standard" Offset="0x1C2C4"/>
-        <Limb Name="gGreatFairyRightThighLimb" Type="Standard" Offset="0x1C2D0"/>
-        <Limb Name="gGreatFairyRightLegLimb" Type="Standard" Offset="0x1C2DC"/>
-        <Limb Name="gGreatFairyRightFootLimb" Type="Standard" Offset="0x1C2E8"/>
-        <Limb Name="gGreatFairyTorsoLimb" Type="Standard" Offset="0x1C2F4"/>
-        <Limb Name="gGreatFairyLeftUpperArmLimb" Type="Standard" Offset="0x1C300"/>
-        <Limb Name="gGreatFairyLeftForearmLimb" Type="Standard" Offset="0x1C30C"/>
-        <Limb Name="gGreatFairyLeftHandLimb" Type="Standard" Offset="0x1C318"/>
-        <Limb Name="gGreatFairyRightUpperArmLimb" Type="Standard" Offset="0x1C324"/>
-        <Limb Name="gGreatFairyRightForearmLimb" Type="Standard" Offset="0x1C330"/>
-        <Limb Name="gGreatFairyRightHandLimb" Type="Standard" Offset="0x1C33C"/>
-        <Limb Name="gGreatFairyHeadLimb" Type="Standard" Offset="0x1C348"/>
-        <Limb Name="gGreatFairyMiddleHairLowerPartLimb" Type="Standard" Offset="0x1C354"/>
-        <Limb Name="gGreatFairyMiddleHairMiddlePartLimb" Type="Standard" Offset="0x1C360"/>
-        <Limb Name="gGreatFairyMiddleHairUpperPartLimb" Type="Standard" Offset="0x1C36C"/>
-        <Limb Name="gGreatFairyMiddleHairTipLimb" Type="Standard" Offset="0x1C378"/>
-        <Limb Name="gGreatFairyLeftHairLowerPartLimb" Type="Standard" Offset="0x1C384"/>
-        <Limb Name="gGreatFairyLeftHairMiddlePartLimb" Type="Standard" Offset="0x1C390"/>
-        <Limb Name="gGreatFairyLeftHairUpperPartLimb" Type="Standard" Offset="0x1C39C"/>
-        <Limb Name="gGreatFairyLeftHairTipLimb" Type="Standard" Offset="0x1C3A8"/>
-        <Limb Name="gGreatFairyRightHairLowerPartLimb" Type="Standard" Offset="0x1C3B4"/>
-        <Limb Name="gGreatFairyRightHairMiddlePartLimb" Type="Standard" Offset="0x1C3C0"/>
-        <Limb Name="gGreatFairyRightHairUpperPartLimb" Type="Standard" Offset="0x1C3CC"/>
-        <Limb Name="gGreatFairyRightHairTipLimb" Type="Standard" Offset="0x1C3D8"/>
+        <Limb Name="gGreatFairyRootLimb" LimbType="Standard" Offset="0x1C2A0"/>
+        <Limb Name="gGreatFairyLeftThighLimb" LimbType="Standard" Offset="0x1C2AC"/>
+        <Limb Name="gGreatFairyLeftLegLimb" LimbType="Standard" Offset="0x1C2B8"/>
+        <Limb Name="gGreatFairyLeftFootLimb" LimbType="Standard" Offset="0x1C2C4"/>
+        <Limb Name="gGreatFairyRightThighLimb" LimbType="Standard" Offset="0x1C2D0"/>
+        <Limb Name="gGreatFairyRightLegLimb" LimbType="Standard" Offset="0x1C2DC"/>
+        <Limb Name="gGreatFairyRightFootLimb" LimbType="Standard" Offset="0x1C2E8"/>
+        <Limb Name="gGreatFairyTorsoLimb" LimbType="Standard" Offset="0x1C2F4"/>
+        <Limb Name="gGreatFairyLeftUpperArmLimb" LimbType="Standard" Offset="0x1C300"/>
+        <Limb Name="gGreatFairyLeftForearmLimb" LimbType="Standard" Offset="0x1C30C"/>
+        <Limb Name="gGreatFairyLeftHandLimb" LimbType="Standard" Offset="0x1C318"/>
+        <Limb Name="gGreatFairyRightUpperArmLimb" LimbType="Standard" Offset="0x1C324"/>
+        <Limb Name="gGreatFairyRightForearmLimb" LimbType="Standard" Offset="0x1C330"/>
+        <Limb Name="gGreatFairyRightHandLimb" LimbType="Standard" Offset="0x1C33C"/>
+        <Limb Name="gGreatFairyHeadLimb" LimbType="Standard" Offset="0x1C348"/>
+        <Limb Name="gGreatFairyMiddleHairLowerPartLimb" LimbType="Standard" Offset="0x1C354"/>
+        <Limb Name="gGreatFairyMiddleHairMiddlePartLimb" LimbType="Standard" Offset="0x1C360"/>
+        <Limb Name="gGreatFairyMiddleHairUpperPartLimb" LimbType="Standard" Offset="0x1C36C"/>
+        <Limb Name="gGreatFairyMiddleHairTipLimb" LimbType="Standard" Offset="0x1C378"/>
+        <Limb Name="gGreatFairyLeftHairLowerPartLimb" LimbType="Standard" Offset="0x1C384"/>
+        <Limb Name="gGreatFairyLeftHairMiddlePartLimb" LimbType="Standard" Offset="0x1C390"/>
+        <Limb Name="gGreatFairyLeftHairUpperPartLimb" LimbType="Standard" Offset="0x1C39C"/>
+        <Limb Name="gGreatFairyLeftHairTipLimb" LimbType="Standard" Offset="0x1C3A8"/>
+        <Limb Name="gGreatFairyRightHairLowerPartLimb" LimbType="Standard" Offset="0x1C3B4"/>
+        <Limb Name="gGreatFairyRightHairMiddlePartLimb" LimbType="Standard" Offset="0x1C3C0"/>
+        <Limb Name="gGreatFairyRightHairUpperPartLimb" LimbType="Standard" Offset="0x1C3CC"/>
+        <Limb Name="gGreatFairyRightHairTipLimb" LimbType="Standard" Offset="0x1C3D8"/>
 
         <!-- Great Fairy Limb DisplayLists -->
         <DList Name="gGreatFairyWaistDL" Offset="0x136D0"/>
diff --git a/assets/xml/objects/object_ei.xml b/assets/xml/objects/object_ei.xml
index f6dbd0238..e4132491f 100644
--- a/assets/xml/objects/object_ei.xml
+++ b/assets/xml/objects/object_ei.xml
@@ -4,24 +4,24 @@
         <Skeleton Name="gStingerSkel" Type="Normal" LimbType="Standard" Offset="0x3410"/>
 
         <!-- Stinger Limbs -->
-        <Limb Name="gStingerRootLimb" Type="Standard" Offset="0x32F0"/>
-        <Limb Name="gStingerBodyRootLimb" Type="Standard" Offset="0x32FC"/>
-        <Limb Name="gStingerBodyLimb" Type="Standard" Offset="0x3308"/>
-        <Limb Name="gStingerTailRootLimb" Type="Standard" Offset="0x3314"/>
-        <Limb Name="gStingerTailUpperLimb" Type="Standard" Offset="0x3320"/>
-        <Limb Name="gStingerTailLowerLimb" Type="Standard" Offset="0x332C"/>
-        <Limb Name="gStingerLimb_3338" Type="Standard" Offset="0x3338"/>
-        <Limb Name="gStingerFinRootLimb" Type="Standard" Offset="0x3344"/>
-        <Limb Name="gStingerFinUpperLimb" Type="Standard" Offset="0x3350"/>
-        <Limb Name="gStingerFinLowerLimb" Type="Standard" Offset="0x335C"/>
-        <Limb Name="gStingerHeadRootLimb" Type="Standard" Offset="0x3368"/>
-        <Limb Name="gStingerHeadLimb" Type="Standard" Offset="0x3374"/>
-        <Limb Name="gStingerLeftWingRootLimb" Type="Standard" Offset="0x3380"/>
-        <Limb Name="gStingerLeftWingBaseLimb" Type="Standard" Offset="0x338C"/>
-        <Limb Name="gStingerLeftWingEndLimb" Type="Standard" Offset="0x3398"/>
-        <Limb Name="gStingerRightWingRootLimb" Type="Standard" Offset="0x33A4"/>
-        <Limb Name="gStingerRightWingBaseLimb" Type="Standard" Offset="0x33B0"/>
-        <Limb Name="gStingerRightWingEndLimb" Type="Standard" Offset="0x33BC"/>
+        <Limb Name="gStingerRootLimb" LimbType="Standard" Offset="0x32F0"/>
+        <Limb Name="gStingerBodyRootLimb" LimbType="Standard" Offset="0x32FC"/>
+        <Limb Name="gStingerBodyLimb" LimbType="Standard" Offset="0x3308"/>
+        <Limb Name="gStingerTailRootLimb" LimbType="Standard" Offset="0x3314"/>
+        <Limb Name="gStingerTailUpperLimb" LimbType="Standard" Offset="0x3320"/>
+        <Limb Name="gStingerTailLowerLimb" LimbType="Standard" Offset="0x332C"/>
+        <Limb Name="gStingerLimb_3338" LimbType="Standard" Offset="0x3338"/>
+        <Limb Name="gStingerFinRootLimb" LimbType="Standard" Offset="0x3344"/>
+        <Limb Name="gStingerFinUpperLimb" LimbType="Standard" Offset="0x3350"/>
+        <Limb Name="gStingerFinLowerLimb" LimbType="Standard" Offset="0x335C"/>
+        <Limb Name="gStingerHeadRootLimb" LimbType="Standard" Offset="0x3368"/>
+        <Limb Name="gStingerHeadLimb" LimbType="Standard" Offset="0x3374"/>
+        <Limb Name="gStingerLeftWingRootLimb" LimbType="Standard" Offset="0x3380"/>
+        <Limb Name="gStingerLeftWingBaseLimb" LimbType="Standard" Offset="0x338C"/>
+        <Limb Name="gStingerLeftWingEndLimb" LimbType="Standard" Offset="0x3398"/>
+        <Limb Name="gStingerRightWingRootLimb" LimbType="Standard" Offset="0x33A4"/>
+        <Limb Name="gStingerRightWingBaseLimb" LimbType="Standard" Offset="0x33B0"/>
+        <Limb Name="gStingerRightWingEndLimb" LimbType="Standard" Offset="0x33BC"/>
 
         <!-- Stinger Limb DisplayLists -->
         <DList Name="gStingerBodyDL" Offset="0x2BD0"/>
diff --git a/assets/xml/objects/object_fa.xml b/assets/xml/objects/object_fa.xml
index 701c1cefd..2f1bf9a5e 100644
--- a/assets/xml/objects/object_fa.xml
+++ b/assets/xml/objects/object_fa.xml
@@ -1,15 +1,15 @@
 <Root>
     <File Name="object_fa" Segment="6">
         <Texture Name="gFaTLUT" OutName="tlut" Format="rgba16" Width="256" Height="1" Offset="0x0"/>
-        <Texture Name="gFaSkinTex" OutName="skin" Format="ci8" TlutOffset="0x0" Width="8" Height="8" Offset="0x200"/>
-        <Texture Name="gFaEyeOpenTex" OutName="eye_open" Format="ci8" TlutOffset="0x0" Width="32" Height="32" Offset="0x240"/>
-        <Texture Name="gFaMouthTex" OutName="mouth" Format="ci8" TlutOffset="0x0" Width="32" Height="16" Offset="0x640"/>
-        <Texture Name="gFaHair1Tex" OutName="hair1" Format="ci8" TlutOffset="0x0" Width="8" Height="16" Offset="0x840"/>
-        <Texture Name="gFaEarTex" OutName="ear" Format="ci8" TlutOffset="0x0" Width="8" Height="8" Offset="0x8C0"/>
+        <Texture Name="gFaSkinTex" OutName="skin" Format="ci8" Width="8" Height="8" Offset="0x200" TlutOffset="0x0"/>
+        <Texture Name="gFaEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x240" TlutOffset="0x0"/>
+        <Texture Name="gFaMouthTex" OutName="mouth" Format="ci8" Width="32" Height="16" Offset="0x640" TlutOffset="0x0"/>
+        <Texture Name="gFaHair1Tex" OutName="hair1" Format="ci8" Width="8" Height="16" Offset="0x840" TlutOffset="0x0"/>
+        <Texture Name="gFaEarTex" OutName="ear" Format="ci8" Width="8" Height="8" Offset="0x8C0" TlutOffset="0x0"/>
         <Texture Name="gFaHair2Tex" OutName="hair2" Format="rgba16" Width="32" Height="16" Offset="0x900"/>
-        <Texture Name="gFaHeadbandTex" OutName="headband" Format="ci8" TlutOffset="0x0" Width="8" Height="8" Offset="0xD00"/>
-        <Texture Name="gFaEyeHalfTex" OutName="eye_half" Format="ci8" TlutOffset="0x0" Width="32" Height="32" Offset="0xD40"/>
-        <Texture Name="gFaEyeClosedTex" OutName="eye_closed" Format="ci8" TlutOffset="0x0" Width="32" Height="32" Offset="0x1140"/>
+        <Texture Name="gFaHeadbandTex" OutName="headband" Format="ci8" Width="8" Height="8" Offset="0xD00" TlutOffset="0x0"/>
+        <Texture Name="gFaEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0xD40" TlutOffset="0x0"/>
+        <Texture Name="gFaEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x1140" TlutOffset="0x0"/>
         <DList Name="gFaDL" Offset="0x2940"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_fw.xml b/assets/xml/objects/object_fw.xml
index 35579eaf6..e71f83092 100644
--- a/assets/xml/objects/object_fw.xml
+++ b/assets/xml/objects/object_fw.xml
@@ -3,32 +3,32 @@
         <!-- Flare Dancer Enflamed Skeleton -->
         <Skeleton Name="gFlareDancerSkel" Type="Flex" LimbType="Standard" Offset="0x5810"/>
 
-        <Limb Name="gFlareDancerRootLimb" Type="Standard" Offset="0x5670"/>
-        <Limb Name="gFlareDancerLowerBodyRootLimb" Type="Standard" Offset="0x567C"/>
-        <Limb Name="gFlareDancerUpperRightLegLimb" Type="Standard" Offset="0x5688"/>
-        <Limb Name="gFlareDancerLowerRightLegBaseLimb" Type="Standard" Offset="0x5694"/>
-        <Limb Name="gFlareDancerRightStiltLimb" Type="Standard" Offset="0x56A0"/>
-        <Limb Name="gFlareDancerLowerRightLegLimb" Type="Standard" Offset="0x56AC"/>
-        <Limb Name="gFlareDancerUpperLeftLegLimb" Type="Standard" Offset="0x56B8"/>
-        <Limb Name="gFlareDancerLowerLeftLegBaseLimb" Type="Standard" Offset="0x56C4"/>
-        <Limb Name="gFlareDancerLeftStiltLimb" Type="Standard" Offset="0x56D0"/>
-        <Limb Name="gFlareDancerLowerLeftLegLimb" Type="Standard" Offset="0x56DC"/>
-        <Limb Name="gFlareDancerUpperBodyRootLimb" Type="Standard" Offset="0x56E8"/>
-        <Limb Name="gFlareDancerDressLimb" Type="Standard" Offset="0x56F4"/>
-        <Limb Name="gFlareDancerFuseLimb" Type="Standard" Offset="0x5700"/>
-        <Limb Name="gFlareDancerRightUpperArmLimb" Type="Standard" Offset="0x570C"/>
-        <Limb Name="gFlareDancerRightForearmLimb" Type="Standard" Offset="0x5718"/>
-        <Limb Name="gFlareDancerRightSwordLimb" Type="Standard" Offset="0x5724"/>
-        <Limb Name="gFlareDancerLeftUpperArmLimb" Type="Standard" Offset="0x5730"/>
-        <Limb Name="gFlareDancerLeftForearmLimb" Type="Standard" Offset="0x573C"/>
-        <Limb Name="gFlareDancerLeftSwordLimb" Type="Standard" Offset="0x5748"/>
-        <Limb Name="gFlareDancerHeadLimb" Type="Standard" Offset="0x5754"/>
-        <Limb Name="gFlareDancerTorsoLimb" Type="Standard" Offset="0x5760"/>
-        <Limb Name="gFlareDancerUpperFireHairLimb" Type="Standard" Offset="0x576C"/>
-        <Limb Name="gFlareDancerMiddleFireHair1Limb" Type="Standard" Offset="0x5778"/>
-        <Limb Name="gFlareDancerMiddleFireHair2Limb" Type="Standard" Offset="0x5784"/>
-        <Limb Name="gFlareDancerMiddleFireHair3Limb" Type="Standard" Offset="0x5790"/>
-        <Limb Name="gFlareDancerLowerFireHairLimb" Type="Standard" Offset="0x579C"/>
+        <Limb Name="gFlareDancerRootLimb" LimbType="Standard" Offset="0x5670"/>
+        <Limb Name="gFlareDancerLowerBodyRootLimb" LimbType="Standard" Offset="0x567C"/>
+        <Limb Name="gFlareDancerUpperRightLegLimb" LimbType="Standard" Offset="0x5688"/>
+        <Limb Name="gFlareDancerLowerRightLegBaseLimb" LimbType="Standard" Offset="0x5694"/>
+        <Limb Name="gFlareDancerRightStiltLimb" LimbType="Standard" Offset="0x56A0"/>
+        <Limb Name="gFlareDancerLowerRightLegLimb" LimbType="Standard" Offset="0x56AC"/>
+        <Limb Name="gFlareDancerUpperLeftLegLimb" LimbType="Standard" Offset="0x56B8"/>
+        <Limb Name="gFlareDancerLowerLeftLegBaseLimb" LimbType="Standard" Offset="0x56C4"/>
+        <Limb Name="gFlareDancerLeftStiltLimb" LimbType="Standard" Offset="0x56D0"/>
+        <Limb Name="gFlareDancerLowerLeftLegLimb" LimbType="Standard" Offset="0x56DC"/>
+        <Limb Name="gFlareDancerUpperBodyRootLimb" LimbType="Standard" Offset="0x56E8"/>
+        <Limb Name="gFlareDancerDressLimb" LimbType="Standard" Offset="0x56F4"/>
+        <Limb Name="gFlareDancerFuseLimb" LimbType="Standard" Offset="0x5700"/>
+        <Limb Name="gFlareDancerRightUpperArmLimb" LimbType="Standard" Offset="0x570C"/>
+        <Limb Name="gFlareDancerRightForearmLimb" LimbType="Standard" Offset="0x5718"/>
+        <Limb Name="gFlareDancerRightSwordLimb" LimbType="Standard" Offset="0x5724"/>
+        <Limb Name="gFlareDancerLeftUpperArmLimb" LimbType="Standard" Offset="0x5730"/>
+        <Limb Name="gFlareDancerLeftForearmLimb" LimbType="Standard" Offset="0x573C"/>
+        <Limb Name="gFlareDancerLeftSwordLimb" LimbType="Standard" Offset="0x5748"/>
+        <Limb Name="gFlareDancerHeadLimb" LimbType="Standard" Offset="0x5754"/>
+        <Limb Name="gFlareDancerTorsoLimb" LimbType="Standard" Offset="0x5760"/>
+        <Limb Name="gFlareDancerUpperFireHairLimb" LimbType="Standard" Offset="0x576C"/>
+        <Limb Name="gFlareDancerMiddleFireHair1Limb" LimbType="Standard" Offset="0x5778"/>
+        <Limb Name="gFlareDancerMiddleFireHair2Limb" LimbType="Standard" Offset="0x5784"/>
+        <Limb Name="gFlareDancerMiddleFireHair3Limb" LimbType="Standard" Offset="0x5790"/>
+        <Limb Name="gFlareDancerLowerFireHairLimb" LimbType="Standard" Offset="0x579C"/>
 
         <!-- Flare Dancer Enflamed DisplayLists -->
         <DList Name="gFlareDancerUpperRightLegDL" Offset="0x3FC0"/>
@@ -57,16 +57,16 @@
         <Skeleton Name="gFlareDancerCoreSkel" Type="Flex" LimbType="Standard" Offset="0x7C30"/>
 
         <!-- Flare Dancer Core Limbs -->
-        <Limb Name="gFlareDancerCoreRootLimb" Type="Standard" Offset="0x7B90"/>
-        <Limb Name="gFlareDancerCoreBodyLimb" Type="Standard" Offset="0x7B9C"/>
-        <Limb Name="gFlareDancerCoreFuseLimb" Type="Standard" Offset="0x7BA8"/>
-        <Limb Name="gFlareDancerCoreLegsRootLimb" Type="Standard" Offset="0x7BB4"/>
-        <Limb Name="gFlareDancerCoreUpperRightLegLimb" Type="Standard" Offset="0x7BC0"/>
-        <Limb Name="gFlareDancerCoreLowerRightLegLimb" Type="Standard" Offset="0x7BCC"/>
-        <Limb Name="gFlareDancerCoreRightFootLimb" Type="Standard" Offset="0x7BD8"/>
-        <Limb Name="gFlareDancerCoreUpperLeftLegLimb" Type="Standard" Offset="0x7BE4"/>
-        <Limb Name="gFlareDancerCoreLowerLeftLegLimb" Type="Standard" Offset="0x7BF0"/>
-        <Limb Name="gFlareDancerCoreLeftFootLimb" Type="Standard" Offset="0x7BFC"/>
+        <Limb Name="gFlareDancerCoreRootLimb" LimbType="Standard" Offset="0x7B90"/>
+        <Limb Name="gFlareDancerCoreBodyLimb" LimbType="Standard" Offset="0x7B9C"/>
+        <Limb Name="gFlareDancerCoreFuseLimb" LimbType="Standard" Offset="0x7BA8"/>
+        <Limb Name="gFlareDancerCoreLegsRootLimb" LimbType="Standard" Offset="0x7BB4"/>
+        <Limb Name="gFlareDancerCoreUpperRightLegLimb" LimbType="Standard" Offset="0x7BC0"/>
+        <Limb Name="gFlareDancerCoreLowerRightLegLimb" LimbType="Standard" Offset="0x7BCC"/>
+        <Limb Name="gFlareDancerCoreRightFootLimb" LimbType="Standard" Offset="0x7BD8"/>
+        <Limb Name="gFlareDancerCoreUpperLeftLegLimb" LimbType="Standard" Offset="0x7BE4"/>
+        <Limb Name="gFlareDancerCoreLowerLeftLegLimb" LimbType="Standard" Offset="0x7BF0"/>
+        <Limb Name="gFlareDancerCoreLeftFootLimb" LimbType="Standard" Offset="0x7BFC"/>
 
         <!-- Flare Dancer Core DisplayLists -->
         <DList Name="gFlareDancerCoreBodyDL" Offset="0x7410"/>
diff --git a/assets/xml/objects/object_ge1.xml b/assets/xml/objects/object_ge1.xml
index 90dc7cf68..79e0768b8 100644
--- a/assets/xml/objects/object_ge1.xml
+++ b/assets/xml/objects/object_ge1.xml
@@ -5,21 +5,21 @@
         <Skeleton Name="gGerudoWhiteSkel" Type="Flex" LimbType="Standard" Offset="0x0330"/>
 
         <!-- White-clothed Gerudo Limbs -->
-        <Limb Name="gGerudoWhiteWaistLimb" Type="Standard" Offset="0x0240"/>
-        <Limb Name="gGerudoWhiteLeftThighLimb" Type="Standard" Offset="0x024C"/>
-        <Limb Name="gGerudoWhiteLeftShinLimb" Type="Standard" Offset="0x0258"/>
-        <Limb Name="gGerudoWhiteLeftFootLimb" Type="Standard" Offset="0x0264"/>
-        <Limb Name="gGerudoWhiteRightThighLimb" Type="Standard" Offset="0x0270"/>
-        <Limb Name="gGerudoWhiteRightShinLimb" Type="Standard" Offset="0x027C"/>
-        <Limb Name="gGerudoWhiteRightFootLimb" Type="Standard" Offset="0x0288"/>
-        <Limb Name="gGerudoWhiteTorsoLimb" Type="Standard" Offset="0x0294"/>
-        <Limb Name="gGerudoWhiteLeftUpperArmLimb" Type="Standard" Offset="0x02A0"/>
-        <Limb Name="gGerudoWhiteLeftForearmLimb" Type="Standard" Offset="0x02AC"/>
-        <Limb Name="gGerudoWhiteLeftHandLimb" Type="Standard" Offset="0x02B8"/>
-        <Limb Name="gGerudoWhiteRightUpperArmLimb" Type="Standard" Offset="0x02C4"/>
-        <Limb Name="gGerudoWhiteRightForearmLimb" Type="Standard" Offset="0x02D0"/>
-        <Limb Name="gGerudoWhiteRightHandLimb" Type="Standard" Offset="0x02DC"/>
-        <Limb Name="gGerudoWhiteHeadLimb" Type="Standard" Offset="0x02E8"/>
+        <Limb Name="gGerudoWhiteWaistLimb" LimbType="Standard" Offset="0x0240"/>
+        <Limb Name="gGerudoWhiteLeftThighLimb" LimbType="Standard" Offset="0x024C"/>
+        <Limb Name="gGerudoWhiteLeftShinLimb" LimbType="Standard" Offset="0x0258"/>
+        <Limb Name="gGerudoWhiteLeftFootLimb" LimbType="Standard" Offset="0x0264"/>
+        <Limb Name="gGerudoWhiteRightThighLimb" LimbType="Standard" Offset="0x0270"/>
+        <Limb Name="gGerudoWhiteRightShinLimb" LimbType="Standard" Offset="0x027C"/>
+        <Limb Name="gGerudoWhiteRightFootLimb" LimbType="Standard" Offset="0x0288"/>
+        <Limb Name="gGerudoWhiteTorsoLimb" LimbType="Standard" Offset="0x0294"/>
+        <Limb Name="gGerudoWhiteLeftUpperArmLimb" LimbType="Standard" Offset="0x02A0"/>
+        <Limb Name="gGerudoWhiteLeftForearmLimb" LimbType="Standard" Offset="0x02AC"/>
+        <Limb Name="gGerudoWhiteLeftHandLimb" LimbType="Standard" Offset="0x02B8"/>
+        <Limb Name="gGerudoWhiteRightUpperArmLimb" LimbType="Standard" Offset="0x02C4"/>
+        <Limb Name="gGerudoWhiteRightForearmLimb" LimbType="Standard" Offset="0x02D0"/>
+        <Limb Name="gGerudoWhiteRightHandLimb" LimbType="Standard" Offset="0x02DC"/>
+        <Limb Name="gGerudoWhiteHeadLimb" LimbType="Standard" Offset="0x02E8"/>
 
         <!-- White-clothed Gerudo Limb DisplayLists -->
         <DList Name="gGerudoWhiteWaistDL" Offset="0x69E0"/>
diff --git a/assets/xml/objects/object_gla.xml b/assets/xml/objects/object_gla.xml
index ba3f44090..499a3720d 100644
--- a/assets/xml/objects/object_gla.xml
+++ b/assets/xml/objects/object_gla.xml
@@ -4,27 +4,27 @@
         <Skeleton Name="gGerudoPurpleSkel" Type="Flex" LimbType="Standard" Offset="0x8968"/>
 
         <!-- Purple-clothed Gerudo Limbs -->
-        <Limb Name="gGerudoPurpleRootLimb" Type="Standard" Offset="0x8818"/>
-        <Limb Name="gGerudoPurpleTorsoLimb" Type="Standard" Offset="0x8824"/>
-        <Limb Name="gGerudoPurpleNeckLimb" Type="Standard" Offset="0x8830"/>
-        <Limb Name="gGerudoPurplePonytailLimb" Type="Standard" Offset="0x883C"/>
-        <Limb Name="gGerudoPurpleVeilLimb" Type="Standard" Offset="0x8848"/>
-        <Limb Name="gGerudoPurpleHeadLimb" Type="Standard" Offset="0x8854"/>
-        <Limb Name="gGerudoPurpleRightUpperArmLimb" Type="Standard" Offset="0x8860"/>
-        <Limb Name="gGerudoPurpleRightForearmLimb" Type="Standard" Offset="0x886C"/>
-        <Limb Name="gGerudoPurpleRightWristLimb" Type="Standard" Offset="0x8878"/>
-        <Limb Name="gGerudoPurpleRightHandLimb" Type="Standard" Offset="0x8884"/>
-        <Limb Name="gGerudoPurpleGlaiveLimb" Type="Standard" Offset="0x8890"/>
-        <Limb Name="gGerudoPurpleLeftUpperArmLimb" Type="Standard" Offset="0x889C"/>
-        <Limb Name="gGerudoPurpleLeftForearmLimb" Type="Standard" Offset="0x88A8"/>
-        <Limb Name="gGerudoPurpleLeftHandLimb" Type="Standard" Offset="0x88B4"/>
-        <Limb Name="gGerudoPurpleLeftThighLimb" Type="Standard" Offset="0x88C0"/>
-        <Limb Name="gGerudoPurpleLeftShinLimb" Type="Standard" Offset="0x88CC"/>
-        <Limb Name="gGerudoPurpleLeftFootLimb" Type="Standard" Offset="0x88D8"/>
-        <Limb Name="gGerudoPurpleRightThighLimb" Type="Standard" Offset="0x88E4"/>
-        <Limb Name="gGerudoPurpleRightShinLimb" Type="Standard" Offset="0x88F0"/>
-        <Limb Name="gGerudoPurpleRightFootLimb" Type="Standard" Offset="0x88FC"/>
-        <Limb Name="gGerudoPurpleWaistLimb" Type="Standard" Offset="0x8908"/>
+        <Limb Name="gGerudoPurpleRootLimb" LimbType="Standard" Offset="0x8818"/>
+        <Limb Name="gGerudoPurpleTorsoLimb" LimbType="Standard" Offset="0x8824"/>
+        <Limb Name="gGerudoPurpleNeckLimb" LimbType="Standard" Offset="0x8830"/>
+        <Limb Name="gGerudoPurplePonytailLimb" LimbType="Standard" Offset="0x883C"/>
+        <Limb Name="gGerudoPurpleVeilLimb" LimbType="Standard" Offset="0x8848"/>
+        <Limb Name="gGerudoPurpleHeadLimb" LimbType="Standard" Offset="0x8854"/>
+        <Limb Name="gGerudoPurpleRightUpperArmLimb" LimbType="Standard" Offset="0x8860"/>
+        <Limb Name="gGerudoPurpleRightForearmLimb" LimbType="Standard" Offset="0x886C"/>
+        <Limb Name="gGerudoPurpleRightWristLimb" LimbType="Standard" Offset="0x8878"/>
+        <Limb Name="gGerudoPurpleRightHandLimb" LimbType="Standard" Offset="0x8884"/>
+        <Limb Name="gGerudoPurpleGlaiveLimb" LimbType="Standard" Offset="0x8890"/>
+        <Limb Name="gGerudoPurpleLeftUpperArmLimb" LimbType="Standard" Offset="0x889C"/>
+        <Limb Name="gGerudoPurpleLeftForearmLimb" LimbType="Standard" Offset="0x88A8"/>
+        <Limb Name="gGerudoPurpleLeftHandLimb" LimbType="Standard" Offset="0x88B4"/>
+        <Limb Name="gGerudoPurpleLeftThighLimb" LimbType="Standard" Offset="0x88C0"/>
+        <Limb Name="gGerudoPurpleLeftShinLimb" LimbType="Standard" Offset="0x88CC"/>
+        <Limb Name="gGerudoPurpleLeftFootLimb" LimbType="Standard" Offset="0x88D8"/>
+        <Limb Name="gGerudoPurpleRightThighLimb" LimbType="Standard" Offset="0x88E4"/>
+        <Limb Name="gGerudoPurpleRightShinLimb" LimbType="Standard" Offset="0x88F0"/>
+        <Limb Name="gGerudoPurpleRightFootLimb" LimbType="Standard" Offset="0x88FC"/>
+        <Limb Name="gGerudoPurpleWaistLimb" LimbType="Standard" Offset="0x8908"/>
 
         <!-- Purple-clothed Gerudo Limb DisplayLists -->
         <DList Name="gGerudoPurpleTorsoDL" Offset="0x3540"/>
diff --git a/assets/xml/objects/object_hni.xml b/assets/xml/objects/object_hni.xml
index 7f4f8a381..6b317eb7a 100644
--- a/assets/xml/objects/object_hni.xml
+++ b/assets/xml/objects/object_hni.xml
@@ -13,39 +13,39 @@
         <Animation Name="gHorseIngoJumpingHighAnim" Offset="0x5E20"/>
 
         <!-- Head -->
-        <Texture Name="gHorseIngoManeTex" OutName="horse_ingo_mane" Format="i8" Width="16" Height="16" Offset="0x740" />
-        <Texture Name="gHorseIngoNostrilsTex" OutName="horse_ingo_nostrils" Format="rgba16" Width="16" Height="16" Offset="0x440" />
-        <Texture Name="gHorseIngoNoseTex" OutName="horse_ingo_nose" Format="i8" Width="8" Height="8" Offset="0x400" />
-        <Texture Name="gHorseIngoForeheadTex" OutName="horse_ingo_forehead" Format="i8" Width="8" Height="8" Offset="0x840" />
-        <Limb Name="gHorseIngoHeadLimb" LimbType="Skin" Offset="0x4748" />
+        <Texture Name="gHorseIngoManeTex" OutName="horse_ingo_mane" Format="i8" Width="16" Height="16" Offset="0x740"/>
+        <Texture Name="gHorseIngoNostrilsTex" OutName="horse_ingo_nostrils" Format="rgba16" Width="16" Height="16" Offset="0x440"/>
+        <Texture Name="gHorseIngoNoseTex" OutName="horse_ingo_nose" Format="i8" Width="8" Height="8" Offset="0x400"/>
+        <Texture Name="gHorseIngoForeheadTex" OutName="horse_ingo_forehead" Format="i8" Width="8" Height="8" Offset="0x840"/>
+        <Limb Name="gHorseIngoHeadLimb" LimbType="Skin" Offset="0x4748"/>
 
         <!-- Body -->
-        <Texture Name="gHorseIngoNeckTex" OutName="horse_ingo_neck" Format="i8" Width="16" Height="16" Offset="0x6DD0" />
-        <Texture Name="gHorseIngoThighTex" OutName="horse_ingo_thigh" Format="i8" Width="16" Height="16" Offset="0x66D0" />
-        <Texture Name="gHorseIngoShoulderTex" OutName="horse_ingo_shoulder" Format="i8" Width="32" Height="32" Offset="0x67D0" />
-        <Texture Name="gHorseIngoSaddleGirthTex" OutName="horse_ingo_saddle_girth" Format="rgba16" Width="8" Height="16" Offset="0x6BD0" />
-        <Texture Name="gHorseIngoSaddlePadTex" OutName="horse_ingo_saddle_pad" Format="rgba16" Width="8" Height="16" Offset="0x6CD0" />
-        <Limb Name="gHorseIngoBodyLimb" LimbType="Skin" Offset="0x46C8" />
+        <Texture Name="gHorseIngoNeckTex" OutName="horse_ingo_neck" Format="i8" Width="16" Height="16" Offset="0x6DD0"/>
+        <Texture Name="gHorseIngoThighTex" OutName="horse_ingo_thigh" Format="i8" Width="16" Height="16" Offset="0x66D0"/>
+        <Texture Name="gHorseIngoShoulderTex" OutName="horse_ingo_shoulder" Format="i8" Width="32" Height="32" Offset="0x67D0"/>
+        <Texture Name="gHorseIngoSaddleGirthTex" OutName="horse_ingo_saddle_girth" Format="rgba16" Width="8" Height="16" Offset="0x6BD0"/>
+        <Texture Name="gHorseIngoSaddlePadTex" OutName="horse_ingo_saddle_pad" Format="rgba16" Width="8" Height="16" Offset="0x6CD0"/>
+        <Limb Name="gHorseIngoBodyLimb" LimbType="Skin" Offset="0x46C8"/>
 
         <!-- Saddle -->
-        <Texture Name="gHorseIngoSaddleTex" OutName="horse_ingo_saddle" Format="rgba16" Width="16" Height="16" Offset="0x8C0" />
-        <Texture Name="gHorseIngoSaddleFlapTex" OutName="horse_ingo_saddle_flap" Format="rgba16" Width="16" Height="32" Offset="0xAC0" />
-        <Limb Name="gHorseIngoSaddleLimb" LimbType="Skin" Offset="0x4858" />
+        <Texture Name="gHorseIngoSaddleTex" OutName="horse_ingo_saddle" Format="rgba16" Width="16" Height="16" Offset="0x8C0"/>
+        <Texture Name="gHorseIngoSaddleFlapTex" OutName="horse_ingo_saddle_flap" Format="rgba16" Width="16" Height="32" Offset="0xAC0"/>
+        <Limb Name="gHorseIngoSaddleLimb" LimbType="Skin" Offset="0x4858"/>
 
         <!-- Hooves -->
-        <Texture Name="gHorseIngoHorseshoeTex" OutName="horse_ingo_horseshoe" Format="rgba16" Width="8" Height="8" Offset="0x6C0" />
-        <Texture Name="gHorseIngoFeatheringTex" OutName="horse_ingo_feathering" Format="rgba16" Width="8" Height="8" Offset="0x640" />
-        <Limb Name="gHorseIngoHoof1Limb" LimbType="Skin" Offset="0x4838" />
-        <Limb Name="gHorseIngoHoof2Limb" LimbType="Skin" Offset="0x4948" />
-        <Limb Name="gHorseIngoHoof3Limb" LimbType="Skin" Offset="0x48C8" />
-        <Limb Name="gHorseIngoHoof4Limb" LimbType="Skin" Offset="0x47B8" />
+        <Texture Name="gHorseIngoHorseshoeTex" OutName="horse_ingo_horseshoe" Format="rgba16" Width="8" Height="8" Offset="0x6C0"/>
+        <Texture Name="gHorseIngoFeatheringTex" OutName="horse_ingo_feathering" Format="rgba16" Width="8" Height="8" Offset="0x640"/>
+        <Limb Name="gHorseIngoHoof1Limb" LimbType="Skin" Offset="0x4838"/>
+        <Limb Name="gHorseIngoHoof2Limb" LimbType="Skin" Offset="0x4948"/>
+        <Limb Name="gHorseIngoHoof3Limb" LimbType="Skin" Offset="0x48C8"/>
+        <Limb Name="gHorseIngoHoof4Limb" LimbType="Skin" Offset="0x47B8"/>
 
         <!-- Gerudo saddle -->
         <DList Name="gHorseIngoGerudoSaddleDL" Offset="0x6530"/>
-        <Texture Name="gHorseIngoGerudoSaddleTex" OutName="horse_ingo_gerudo_saddle" Format="rgba16" Width="16" Height="16" Offset="0x5E30" />
-        <Texture Name="gHorseIngoGerudoSaddleFlapTex" OutName="horse_ingo_gerudo_saddle_flap" Format="rgba16" Width="16" Height="16" Offset="0x6030" />
+        <Texture Name="gHorseIngoGerudoSaddleTex" OutName="horse_ingo_gerudo_saddle" Format="rgba16" Width="16" Height="16" Offset="0x5E30"/>
+        <Texture Name="gHorseIngoGerudoSaddleFlapTex" OutName="horse_ingo_gerudo_saddle_flap" Format="rgba16" Width="16" Height="16" Offset="0x6030"/>
 
         <!-- Eye texture -->
-        <Texture Name="gHorseIngoEyeTex" OutName="horse_ingo_eye" Format="rgba16" Width="32" Height="16" Offset="0x0" />
+        <Texture Name="gHorseIngoEyeTex" OutName="horse_ingo_eye" Format="rgba16" Width="32" Height="16" Offset="0x0"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_horse.xml b/assets/xml/objects/object_horse.xml
index c9fe4635c..74619e597 100644
--- a/assets/xml/objects/object_horse.xml
+++ b/assets/xml/objects/object_horse.xml
@@ -12,45 +12,45 @@
         <Animation Name="gEponaJumpingAnim" Offset="0x2470"/>
         <Animation Name="gEponaJumpingHighAnim" Offset="0x2C38"/>
 
-        <Texture Name="gEponaFeatheringTex" OutName="epona_feathering" Format="rgba16" Width="16" Height="16" Offset="0xBF10" />
-        <Texture Name="gEponaHairTex" OutName="epona_hair" Format="rgba16" Width="8" Height="8" Offset="0xC190" />
+        <Texture Name="gEponaFeatheringTex" OutName="epona_feathering" Format="rgba16" Width="16" Height="16" Offset="0xBF10"/>
+        <Texture Name="gEponaHairTex" OutName="epona_hair" Format="rgba16" Width="8" Height="8" Offset="0xC190"/>
 
         <!-- Head -->
-        <Texture Name="gEponaCrestTex" OutName="epona_crest" Format="rgba16" Width="16" Height="8" Offset="0xCA10" />
-        <Texture Name="gEponaManeTex" OutName="epona_mane" Format="rgba16" Width="16" Height="16" Offset="0xC810" />
-        <Texture Name="gEponaNostrilsTex" OutName="epona_nostrils" Format="rgba16" Width="16" Height="32" Offset="0xC410" />
-        <Texture Name="gEponaForeheadTex" OutName="epona_forehead" Format="rgba16" Width="8" Height="32" Offset="0xC210" />
-        <Limb Name="gEponaHeadLimb" LimbType="Skin" Offset="0x9A98" />
+        <Texture Name="gEponaCrestTex" OutName="epona_crest" Format="rgba16" Width="16" Height="8" Offset="0xCA10"/>
+        <Texture Name="gEponaManeTex" OutName="epona_mane" Format="rgba16" Width="16" Height="16" Offset="0xC810"/>
+        <Texture Name="gEponaNostrilsTex" OutName="epona_nostrils" Format="rgba16" Width="16" Height="32" Offset="0xC410"/>
+        <Texture Name="gEponaForeheadTex" OutName="epona_forehead" Format="rgba16" Width="8" Height="32" Offset="0xC210"/>
+        <Limb Name="gEponaHeadLimb" LimbType="Skin" Offset="0x9A98"/>
 
         <!-- Body -->
-        <Texture Name="gEponaNeckTex" OutName="epona_neck" Format="i8" Width="16" Height="16" Offset="0xDC10" />
-        <Texture Name="gEponaChestTex" OutName="epona_chest" Format="i8" Width="16" Height="16" Offset="0xDB10" />
-        <Texture Name="gEponaShoulderTex" OutName="epona_shoulder" Format="i8" Width="16" Height="16" Offset="0xDE10" />
-        <Texture Name="gEponaThighTex" OutName="epona_thigh" Format="i8" Width="16" Height="16" Offset="0xDD10" />
-        <Limb Name="gEponaBodyLimb" LimbType="Skin" Offset="0x9A18" />
+        <Texture Name="gEponaNeckTex" OutName="epona_neck" Format="i8" Width="16" Height="16" Offset="0xDC10"/>
+        <Texture Name="gEponaChestTex" OutName="epona_chest" Format="i8" Width="16" Height="16" Offset="0xDB10"/>
+        <Texture Name="gEponaShoulderTex" OutName="epona_shoulder" Format="i8" Width="16" Height="16" Offset="0xDE10"/>
+        <Texture Name="gEponaThighTex" OutName="epona_thigh" Format="i8" Width="16" Height="16" Offset="0xDD10"/>
+        <Limb Name="gEponaBodyLimb" LimbType="Skin" Offset="0x9A18"/>
 
         <!-- Saddle -->
-        <Texture Name="gEponaSaddleTex" OutName="epona_saddle" Format="rgba16" Width="32" Height="32" Offset="0xCB10" />
-        <Texture Name="gEponaSaddleFlapTex" OutName="epona_saddle_flap" Format="rgba16" Width="16" Height="16" Offset="0xD510" />
-        <Texture Name="gEponaSaddleLipTex" OutName="epona_saddle_lip" Format="rgba16" Width="16" Height="16" Offset="0xD310" />
-        <Texture Name="gEponaSaddleGirthTex" OutName="epona_saddle_girth" Format="rgba16" Width="32" Height="16" Offset="0xD710" />
-        <Limb Name="gEponaSaddleLimb" LimbType="Skin" Offset="0x9BA8" />
+        <Texture Name="gEponaSaddleTex" OutName="epona_saddle" Format="rgba16" Width="32" Height="32" Offset="0xCB10"/>
+        <Texture Name="gEponaSaddleFlapTex" OutName="epona_saddle_flap" Format="rgba16" Width="16" Height="16" Offset="0xD510"/>
+        <Texture Name="gEponaSaddleLipTex" OutName="epona_saddle_lip" Format="rgba16" Width="16" Height="16" Offset="0xD310"/>
+        <Texture Name="gEponaSaddleGirthTex" OutName="epona_saddle_girth" Format="rgba16" Width="32" Height="16" Offset="0xD710"/>
+        <Limb Name="gEponaSaddleLimb" LimbType="Skin" Offset="0x9BA8"/>
 
         <!-- Cannons -->
-        <Limb Name="gEponaCannon1Limb" LimbType="Skin" Offset="0x9B18" />
-        <Limb Name="gEponaCannon2Limb" LimbType="Skin" Offset="0x9B98" />
-        <Limb Name="gEponaCannon3Limb" LimbType="Skin" Offset="0x9C28" />
-        <Limb Name="gEponaCannon4Limb" LimbType="Skin" Offset="0x9CA8" />
+        <Limb Name="gEponaCannon1Limb" LimbType="Skin" Offset="0x9B18"/>
+        <Limb Name="gEponaCannon2Limb" LimbType="Skin" Offset="0x9B98"/>
+        <Limb Name="gEponaCannon3Limb" LimbType="Skin" Offset="0x9C28"/>
+        <Limb Name="gEponaCannon4Limb" LimbType="Skin" Offset="0x9CA8"/>
 
         <!-- Hooves -->
-        <Texture Name="gEponaHorseshoeTex" OutName="epona_horseshoe" Format="rgba16" Width="8" Height="8" Offset="0xC110" />
-        <Limb Name="gEponaHoof1Limb" LimbType="Skin" Offset="0x9B08" />
-        <Limb Name="gEponaHoof2Limb" LimbType="Skin" Offset="0x9B88" />
-        <Limb Name="gEponaHoof3Limb" LimbType="Skin" Offset="0x9C18" />
-        <Limb Name="gEponaHoof4Limb" LimbType="Skin" Offset="0x9C98" />
+        <Texture Name="gEponaHorseshoeTex" OutName="epona_horseshoe" Format="rgba16" Width="8" Height="8" Offset="0xC110"/>
+        <Limb Name="gEponaHoof1Limb" LimbType="Skin" Offset="0x9B08"/>
+        <Limb Name="gEponaHoof2Limb" LimbType="Skin" Offset="0x9B88"/>
+        <Limb Name="gEponaHoof3Limb" LimbType="Skin" Offset="0x9C18"/>
+        <Limb Name="gEponaHoof4Limb" LimbType="Skin" Offset="0x9C98"/>
 
         <!-- Eyes textures -->
-        <Texture Name="gEponaEyeTLUT" OutName="epona_eye_tlut" Format="rgba16" Width="16" Height="16" Offset="0x9D80" />
+        <Texture Name="gEponaEyeTLUT" OutName="epona_eye_tlut" Format="rgba16" Width="16" Height="16" Offset="0x9D80"/>
         <Texture Name="gEponaEyeOpenTex" OutName="epona_eye_open" Format="ci8" Width="32" Height="16" Offset="0x9F80"  TlutOffset="0x9D80"/>
         <Texture Name="gEponaEyeHalfTex" OutName="epona_eye_half" Format="ci8" Width="32" Height="16" Offset="0xA180"  TlutOffset="0x9D80"/>
         <Texture Name="gEponaEyeClosedTex" OutName="epona_eye_closed" Format="ci8" Width="32" Height="16" Offset="0xA380"  TlutOffset="0x9D80"/>
@@ -61,7 +61,7 @@
         <DList Name="gEponaUnusedWhiteRectangle3DL" Offset="0x6C0"/>
         <DList Name="gEponaUnusedWhiteRectangle4DL" Offset="0x760"/>
 
-        <Blob Name="gEponaBlob_000000" Offset="0x0" Size="0x380" />
-        <Blob Name="gEponaBlob_0007C0" Offset="0x7C0" Size="0xB0" />
+        <Blob Name="gEponaBlob_000000" Size="0x380" Offset="0x0"/>
+        <Blob Name="gEponaBlob_0007C0" Size="0xB0" Offset="0x7C0"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_horse_ganon.xml b/assets/xml/objects/object_horse_ganon.xml
index 22347ee2b..98babb080 100644
--- a/assets/xml/objects/object_horse_ganon.xml
+++ b/assets/xml/objects/object_horse_ganon.xml
@@ -15,8 +15,8 @@
         <!-- Stand in two legs for a moment. -->
         <Animation Name="gHorseGanonRearingAnim" Offset="0x3858"/>
 
-        <Texture Name="gHorseGanonEyeTex" OutName="horse_ganon_eye" Format="rgba16" Width="16" Height="16" Offset="0xAC10" />
-        <Texture Name="gHorseGanonHeadHairTex" OutName="horse_ganon_head_hair" Format="rgba16" Width="16" Height="16" Offset="0xAE10" />
-        <Texture Name="gHorseGanonLegTex" OutName="horse_ganon_leg" Format="rgba16" Width="16" Height="16" Offset="0xA370" />
+        <Texture Name="gHorseGanonEyeTex" OutName="horse_ganon_eye" Format="rgba16" Width="16" Height="16" Offset="0xAC10"/>
+        <Texture Name="gHorseGanonHeadHairTex" OutName="horse_ganon_head_hair" Format="rgba16" Width="16" Height="16" Offset="0xAE10"/>
+        <Texture Name="gHorseGanonLegTex" OutName="horse_ganon_leg" Format="rgba16" Width="16" Height="16" Offset="0xA370"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_horse_link_child.xml b/assets/xml/objects/object_horse_link_child.xml
index 8002b048d..f93abfa52 100644
--- a/assets/xml/objects/object_horse_link_child.xml
+++ b/assets/xml/objects/object_horse_link_child.xml
@@ -13,7 +13,7 @@
         <!-- Running. -->
         <Animation Name="gChildEponaGallopingAnim" Offset="0x2F98"/>
 
-        <Texture Name="gChildEponaEyePal" OutName="child_epona_eye_pal" Format="rgba16" Width="16" Height="16" Offset="0x1728" />
+        <Texture Name="gChildEponaEyePal" OutName="child_epona_eye_pal" Format="rgba16" Width="16" Height="16" Offset="0x1728"/>
         <Texture Name="gChildEponaEyeOpenTex" OutName="child_epona_eye_open" Format="ci8" Width="32" Height="16" Offset="0x1D28"  TlutOffset="0x1728"/>
         <Texture Name="gChildEponaEyeHalfTex" OutName="child_epona_eye_half" Format="ci8" Width="32" Height="16" Offset="0x1928"  TlutOffset="0x1728"/>
         <Texture Name="gChildEponaEyeCloseTex" OutName="child_epona_eye_close" Format="ci8" Width="32" Height="16" Offset="0x1B28"  TlutOffset="0x1728"/>
diff --git a/assets/xml/objects/object_horse_zelda.xml b/assets/xml/objects/object_horse_zelda.xml
index 98bf2f763..9595c3245 100644
--- a/assets/xml/objects/object_horse_zelda.xml
+++ b/assets/xml/objects/object_horse_zelda.xml
@@ -5,10 +5,10 @@
         <!-- Running. -->
         <Animation Name="gHorseZeldaGallopingAnim" Offset="0x7148"/>
 
-        <Texture Name="gHorseZeldaEyeTex" OutName="horse_zelda_eye" Format="rgba16" Width="32" Height="16" Offset="0x8" />
-        <Texture Name="gHorseZeldaHeadHairTex" OutName="horse_zelda_head_hair" Format="rgba16" Width="16" Height="16" Offset="0x688" />
-        <Texture Name="gHorseZeldaNoseTex" OutName="horse_zelda_nose" Format="rgba16" Width="16" Height="16" Offset="0x488" />
+        <Texture Name="gHorseZeldaEyeTex" OutName="horse_zelda_eye" Format="rgba16" Width="32" Height="16" Offset="0x8"/>
+        <Texture Name="gHorseZeldaHeadHairTex" OutName="horse_zelda_head_hair" Format="rgba16" Width="16" Height="16" Offset="0x688"/>
+        <Texture Name="gHorseZeldaNoseTex" OutName="horse_zelda_nose" Format="rgba16" Width="16" Height="16" Offset="0x488"/>
 
-        <Texture Name="gHorseZeldaLegTex" OutName="horse_zelda_leg" Format="rgba16" Width="16" Height="16" Offset="0x9A8" />
+        <Texture Name="gHorseZeldaLegTex" OutName="horse_zelda_leg" Format="rgba16" Width="16" Height="16" Offset="0x9A8"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_human.xml b/assets/xml/objects/object_human.xml
index 7736140f1..22ca81819 100644
--- a/assets/xml/objects/object_human.xml
+++ b/assets/xml/objects/object_human.xml
@@ -1,48 +1,48 @@
 <Root>
     <File Name="object_human" Segment="6">
         <!-- Facial textures -->
-        <Texture Name="gHumanEyeLookForwardOpenTex" OutName="eye_look_forward_open" Format="ci8" Width="32" Height="32" TlutOffset="0x7A00" Offset="0x0"/>
-        <Texture Name="gHumanEyeLookForwardHalfTex" OutName="eye_look_forward_half" Format="ci8" Width="32" Height="32" TlutOffset="0x7A00" Offset="0x400"/>
-        <Texture Name="gHumanEyeLookForwardClosedTex" OutName="eye_look_forward_closed" Format="ci8" Width="32" Height="32" TlutOffset="0x7A00" Offset="0x800"/>
-        <Texture Name="gHumanEyeLookRightOpenTex" OutName="eye_look_right_open" Format="ci8" Width="32" Height="32" TlutOffset="0x7A00" Offset="0xC00"/>
-        <Texture Name="gHumanEyeLookRightHalfTex" OutName="eye_look_right_half" Format="ci8" Width="32" Height="32" TlutOffset="0x7A00" Offset="0x1000"/>
-        <Texture Name="gHumanEyeLookLeftOpenTex" OutName="eye_look_left_open" Format="ci8" Width="32" Height="32" TlutOffset="0x7A00" Offset="0x1400"/>
-        <Texture Name="gHumanEyeLookLeftHalfTex" OutName="eye_look_left_half" Format="ci8" Width="32" Height="32" TlutOffset="0x7A00" Offset="0x1800"/>
-        <Texture Name="gHumanEyeLookUpOpenTex" OutName="eye_look_up_open" Format="ci8" Width="32" Height="32" TlutOffset="0x7A00" Offset="0x1C00"/>
-        <Texture Name="gHumanEyeLookDownOpenTex" OutName="eye_look_down_open" Format="ci8" Width="32" Height="32" TlutOffset="0x7A00" Offset="0x2000"/>
+        <Texture Name="gHumanEyeLookForwardOpenTex" OutName="eye_look_forward_open" Format="ci8" Width="32" Height="32" Offset="0x0" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookForwardHalfTex" OutName="eye_look_forward_half" Format="ci8" Width="32" Height="32" Offset="0x400" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookForwardClosedTex" OutName="eye_look_forward_closed" Format="ci8" Width="32" Height="32" Offset="0x800" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookRightOpenTex" OutName="eye_look_right_open" Format="ci8" Width="32" Height="32" Offset="0xC00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookRightHalfTex" OutName="eye_look_right_half" Format="ci8" Width="32" Height="32" Offset="0x1000" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookLeftOpenTex" OutName="eye_look_left_open" Format="ci8" Width="32" Height="32" Offset="0x1400" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookLeftHalfTex" OutName="eye_look_left_half" Format="ci8" Width="32" Height="32" Offset="0x1800" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookUpOpenTex" OutName="eye_look_up_open" Format="ci8" Width="32" Height="32" Offset="0x1C00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookDownOpenTex" OutName="eye_look_down_open" Format="ci8" Width="32" Height="32" Offset="0x2000" TlutOffset="0x7A00"/>
 
-        <Texture Name="gHumanEyebrowNormalTex" OutName="eyebrow_normal" Format="ci8" Width="32" Height="16" TlutOffset="0x7A00" Offset="0x2400"/>
-        <Texture Name="gHumanEyebrowSurprisedTex" OutName="eyebrow_surprised" Format="ci8" Width="32" Height="16" TlutOffset="0x7A00" Offset="0x2600"/>
-        <Texture Name="gHumanEyebrowSadTex" OutName="eyebrow_sad" Format="ci8" Width="32" Height="16" TlutOffset="0x7A00" Offset="0x2800"/>
+        <Texture Name="gHumanEyebrowNormalTex" OutName="eyebrow_normal" Format="ci8" Width="32" Height="16" Offset="0x2400" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyebrowSurprisedTex" OutName="eyebrow_surprised" Format="ci8" Width="32" Height="16" Offset="0x2600" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyebrowSadTex" OutName="eyebrow_sad" Format="ci8" Width="32" Height="16" Offset="0x2800" TlutOffset="0x7A00"/>
 
         <!-- Those are exaclty the same are above eye textures -->
-        <Texture Name="gHumanEyeLookForwardOpen2Tex" OutName="eye_look_forward_open_2" Format="ci8" Width="32" Height="32" TlutOffset="0x7A00" Offset="0x2A00"/>
-        <Texture Name="gHumanEyeLookForwardHalf2Tex" OutName="eye_look_forward_half_2" Format="ci8" Width="32" Height="32" TlutOffset="0x7A00" Offset="0x2E00"/>
-        <Texture Name="gHumanEyeLookForwardClosed2Tex" OutName="eye_look_forward_closed_2" Format="ci8" Width="32" Height="32" TlutOffset="0x7A00" Offset="0x3200"/>
-        <Texture Name="gHumanEyeLookRightOpen2Tex" OutName="eye_look_right_open_2" Format="ci8" Width="32" Height="32" TlutOffset="0x7A00" Offset="0x3600"/>
-        <Texture Name="gHumanEyeLookRightHalf2Tex" OutName="eye_look_right_half_2" Format="ci8" Width="32" Height="32" TlutOffset="0x7A00" Offset="0x3A00"/>
-        <Texture Name="gHumanEyeLookLeftOpen2Tex" OutName="eye_look_left_open_2" Format="ci8" Width="32" Height="32" TlutOffset="0x7A00" Offset="0x3E00"/>
-        <Texture Name="gHumanEyeLookLeftHalf2Tex" OutName="eye_look_left_half_2" Format="ci8" Width="32" Height="32" TlutOffset="0x7A00" Offset="0x4200"/>
-        <Texture Name="gHumanEyeLookUpOpen2Tex" OutName="eye_look_up_open_2" Format="ci8" Width="32" Height="32" TlutOffset="0x7A00" Offset="0x4600"/>
-        <Texture Name="gHumanEyeLookDownOpen2Tex" OutName="eye_look_down_open_2" Format="ci8" Width="32" Height="32" TlutOffset="0x7A00" Offset="0x4A00"/>
+        <Texture Name="gHumanEyeLookForwardOpen2Tex" OutName="eye_look_forward_open_2" Format="ci8" Width="32" Height="32" Offset="0x2A00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookForwardHalf2Tex" OutName="eye_look_forward_half_2" Format="ci8" Width="32" Height="32" Offset="0x2E00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookForwardClosed2Tex" OutName="eye_look_forward_closed_2" Format="ci8" Width="32" Height="32" Offset="0x3200" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookRightOpen2Tex" OutName="eye_look_right_open_2" Format="ci8" Width="32" Height="32" Offset="0x3600" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookRightHalf2Tex" OutName="eye_look_right_half_2" Format="ci8" Width="32" Height="32" Offset="0x3A00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookLeftOpen2Tex" OutName="eye_look_left_open_2" Format="ci8" Width="32" Height="32" Offset="0x3E00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookLeftHalf2Tex" OutName="eye_look_left_half_2" Format="ci8" Width="32" Height="32" Offset="0x4200" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookUpOpen2Tex" OutName="eye_look_up_open_2" Format="ci8" Width="32" Height="32" Offset="0x4600" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyeLookDownOpen2Tex" OutName="eye_look_down_open_2" Format="ci8" Width="32" Height="32" Offset="0x4A00" TlutOffset="0x7A00"/>
 
         <!-- Those are exaclty the same are above eyebrow textures -->
-        <Texture Name="gHumanEyebrowNormal2Tex" OutName="eyebrow_normal_2" Format="ci8" Width="32" Height="16" TlutOffset="0x7A00" Offset="0x4E00"/>
-        <Texture Name="gHumanEyebrowSurprised2Tex" OutName="eyebrow_surprised_2" Format="ci8" Width="32" Height="16" TlutOffset="0x7A00" Offset="0x5000"/>
-        <Texture Name="gHumanEyebrowSad2Tex" OutName="eyebrow_sad_2" Format="ci8" Width="32" Height="16" TlutOffset="0x7A00" Offset="0x5200"/>
+        <Texture Name="gHumanEyebrowNormal2Tex" OutName="eyebrow_normal_2" Format="ci8" Width="32" Height="16" Offset="0x4E00" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyebrowSurprised2Tex" OutName="eyebrow_surprised_2" Format="ci8" Width="32" Height="16" Offset="0x5000" TlutOffset="0x7A00"/>
+        <Texture Name="gHumanEyebrowSad2Tex" OutName="eyebrow_sad_2" Format="ci8" Width="32" Height="16" Offset="0x5200" TlutOffset="0x7A00"/>
 
-        <Texture Name="object_human_Tex_005400" OutName="object_human_Tex_005400" Format="ci8" Width="16" Height="16" TlutOffset="0x7A00" Offset="0x5400"/>
-        <Texture Name="object_human_Tex_005500" OutName="object_human_Tex_005500" Format="ci8" Width="16" Height="16" TlutOffset="0x7A00" Offset="0x5500"/>
+        <Texture Name="object_human_Tex_005400" OutName="object_human_Tex_005400" Format="ci8" Width="16" Height="16" Offset="0x5400" TlutOffset="0x7A00"/>
+        <Texture Name="object_human_Tex_005500" OutName="object_human_Tex_005500" Format="ci8" Width="16" Height="16" Offset="0x5500" TlutOffset="0x7A00"/>
 
-        <Texture Name="object_human_Tex_005600" OutName="object_human_Tex_005600" Format="ci8" Width="32" Height="32" TlutOffset="0x7A00" Offset="0x5600"/>
-        <Texture Name="object_human_Tex_005A00" OutName="object_human_Tex_005A00" Format="ci8" Width="32" Height="32" TlutOffset="0x7A00" Offset="0x5A00"/>
-        <Texture Name="object_human_Tex_005E00" OutName="object_human_Tex_005E00" Format="ci8" Width="32" Height="32" TlutOffset="0x7A00" Offset="0x5E00"/>
-        <Texture Name="object_human_Tex_006200" OutName="object_human_Tex_006200" Format="ci8" Width="32" Height="32" TlutOffset="0x7A00" Offset="0x6200"/>
-        <Texture Name="object_human_Tex_006600" OutName="object_human_Tex_006600" Format="ci8" Width="32" Height="32" TlutOffset="0x7A00" Offset="0x6600"/>
-        <Texture Name="object_human_Tex_006A00" OutName="object_human_Tex_006A00" Format="ci8" Width="32" Height="32" TlutOffset="0x7A00" Offset="0x6A00"/>
-        <Texture Name="object_human_Tex_006E00" OutName="object_human_Tex_006E00" Format="ci8" Width="32" Height="32" TlutOffset="0x7A00" Offset="0x6E00"/>
-        <Texture Name="object_human_Tex_007200" OutName="object_human_Tex_007200" Format="ci8" Width="32" Height="32" TlutOffset="0x7A00" Offset="0x7200"/>
-        <Texture Name="object_human_Tex_007600" OutName="object_human_Tex_007600" Format="ci8" Width="32" Height="32" TlutOffset="0x7A00" Offset="0x7600"/>
+        <Texture Name="object_human_Tex_005600" OutName="object_human_Tex_005600" Format="ci8" Width="32" Height="32" Offset="0x5600" TlutOffset="0x7A00"/>
+        <Texture Name="object_human_Tex_005A00" OutName="object_human_Tex_005A00" Format="ci8" Width="32" Height="32" Offset="0x5A00" TlutOffset="0x7A00"/>
+        <Texture Name="object_human_Tex_005E00" OutName="object_human_Tex_005E00" Format="ci8" Width="32" Height="32" Offset="0x5E00" TlutOffset="0x7A00"/>
+        <Texture Name="object_human_Tex_006200" OutName="object_human_Tex_006200" Format="ci8" Width="32" Height="32" Offset="0x6200" TlutOffset="0x7A00"/>
+        <Texture Name="object_human_Tex_006600" OutName="object_human_Tex_006600" Format="ci8" Width="32" Height="32" Offset="0x6600" TlutOffset="0x7A00"/>
+        <Texture Name="object_human_Tex_006A00" OutName="object_human_Tex_006A00" Format="ci8" Width="32" Height="32" Offset="0x6A00" TlutOffset="0x7A00"/>
+        <Texture Name="object_human_Tex_006E00" OutName="object_human_Tex_006E00" Format="ci8" Width="32" Height="32" Offset="0x6E00" TlutOffset="0x7A00"/>
+        <Texture Name="object_human_Tex_007200" OutName="object_human_Tex_007200" Format="ci8" Width="32" Height="32" Offset="0x7200" TlutOffset="0x7A00"/>
+        <Texture Name="object_human_Tex_007600" OutName="object_human_Tex_007600" Format="ci8" Width="32" Height="32" Offset="0x7600" TlutOffset="0x7A00"/>
 
         <Texture Name="gHumanTLUT" OutName="face_palette" Format="rgba16" Width="16" Height="16" Offset="0x7A00"/>
 
@@ -66,79 +66,79 @@
         <LegacyAnimation Name="gHumanThinkingAnim" Offset="0xAF30"/>
 
         <!-- Arm -->
-        <DList Name="gHumanArmLeftDL" Offset="0xAF40" />
-        <DList Name="gHumanArmLeftWrapperDL" Offset="0xB040" />
-        <DList Name="gHumanArmLeftWrapperWrapperDL" Offset="0xB050" />
+        <DList Name="gHumanArmLeftDL" Offset="0xAF40"/>
+        <DList Name="gHumanArmLeftWrapperDL" Offset="0xB040"/>
+        <DList Name="gHumanArmLeftWrapperWrapperDL" Offset="0xB050"/>
 
         <!-- Forearm -->
-        <DList Name="gHumanForearmLeftDL" Offset="0xB1A8" />
-        <DList Name="gHumanForearmLeftWrapperDL" Offset="0xB288" />
-        <DList Name="gHumanForearmLeftWrapperWrapperDL" Offset="0xB298" />
+        <DList Name="gHumanForearmLeftDL" Offset="0xB1A8"/>
+        <DList Name="gHumanForearmLeftWrapperDL" Offset="0xB288"/>
+        <DList Name="gHumanForearmLeftWrapperWrapperDL" Offset="0xB298"/>
 
         <!-- Foot? Shoe? -->
-        <DList Name="gHumanFootLeftDL" Offset="0xB3B0" />
-        <DList Name="gHumanFootLeftWrapperDL" Offset="0xB488" />
-        <DList Name="gHumanFootLeftWrapperWrapperDL" Offset="0xB498" />
+        <DList Name="gHumanFootLeftDL" Offset="0xB3B0"/>
+        <DList Name="gHumanFootLeftWrapperDL" Offset="0xB488"/>
+        <DList Name="gHumanFootLeftWrapperWrapperDL" Offset="0xB498"/>
 
         <!-- Left hand -->
-        <DList Name="gHumanHandLeftDL" Offset="0xB610" />
-        <DList Name="gHumanHandLeftWrapperDL" Offset="0xB750" />
-        <DList Name="gHumanHandLeftWrapperWrapperDL" Offset="0xB760" />
+        <DList Name="gHumanHandLeftDL" Offset="0xB610"/>
+        <DList Name="gHumanHandLeftWrapperDL" Offset="0xB750"/>
+        <DList Name="gHumanHandLeftWrapperWrapperDL" Offset="0xB760"/>
 
         <!-- Leg -->
-        <DList Name="gHumanLegLeftDL" Offset="0xB918" />
-        <DList Name="gHumanLegLeftWrapperDL" Offset="0xB9E0" />
-        <DList Name="gHumanLegLeftWrapperWrapperDL" Offset="0xB9F0" />
+        <DList Name="gHumanLegLeftDL" Offset="0xB918"/>
+        <DList Name="gHumanLegLeftWrapperDL" Offset="0xB9E0"/>
+        <DList Name="gHumanLegLeftWrapperWrapperDL" Offset="0xB9F0"/>
 
         <!-- Arm -->
-        <DList Name="gHumanArmRightDL" Offset="0xBAF8" />
-        <DList Name="gHumanArmRightWrapperDL" Offset="0xBBF8" />
-        <DList Name="gHumanArmRightWrapperWrapperDL" Offset="0xBC08" />
+        <DList Name="gHumanArmRightDL" Offset="0xBAF8"/>
+        <DList Name="gHumanArmRightWrapperDL" Offset="0xBBF8"/>
+        <DList Name="gHumanArmRightWrapperWrapperDL" Offset="0xBC08"/>
 
         <!-- Forearm -->
-        <DList Name="gHumanForearmRightDL" Offset="0xBD40" />
-        <DList Name="gHumanForearmRightWrapperDL" Offset="0xBE20" />
-        <DList Name="gHumanForearmRightWrapperWrapperDL" Offset="0xBE30" />
+        <DList Name="gHumanForearmRightDL" Offset="0xBD40"/>
+        <DList Name="gHumanForearmRightWrapperDL" Offset="0xBE20"/>
+        <DList Name="gHumanForearmRightWrapperWrapperDL" Offset="0xBE30"/>
 
         <!-- Foot? Shoe? -->
-        <DList Name="gHumanFootRightDL" Offset="0xBF38" />
-        <DList Name="gHumanFootRightWrapperDL" Offset="0xC010" />
-        <DList Name="gHumanFootRightWrapperWrapperDL" Offset="0xC020" />
+        <DList Name="gHumanFootRightDL" Offset="0xBF38"/>
+        <DList Name="gHumanFootRightWrapperDL" Offset="0xC010"/>
+        <DList Name="gHumanFootRightWrapperWrapperDL" Offset="0xC020"/>
 
         <!-- Right hand -->
-        <DList Name="gHumanHandRightDL" Offset="0xC178" />
-        <DList Name="gHumanHandRightWrapperDL" Offset="0xC2B8" />
-        <DList Name="gHumanHandRightWrapperWrapperDL" Offset="0xC2C8" />
+        <DList Name="gHumanHandRightDL" Offset="0xC178"/>
+        <DList Name="gHumanHandRightWrapperDL" Offset="0xC2B8"/>
+        <DList Name="gHumanHandRightWrapperWrapperDL" Offset="0xC2C8"/>
 
         <!-- Leg -->
-        <DList Name="object_human_DL_00C450" Offset="0xC450" />
-        <DList Name="object_human_DL_00C518" Offset="0xC518" />
-        <DList Name="object_human_DL_00C528" Offset="0xC528" />
+        <DList Name="object_human_DL_00C450" Offset="0xC450"/>
+        <DList Name="object_human_DL_00C518" Offset="0xC518"/>
+        <DList Name="object_human_DL_00C528" Offset="0xC528"/>
 
         <!-- Torso -->
-        <DList Name="object_human_DL_00C620" Offset="0xC620" />
-        <DList Name="object_human_DL_00C8B0" Offset="0xC8B0" />
-        <DList Name="object_human_DL_00C8C0" Offset="0xC8C0" />
+        <DList Name="object_human_DL_00C620" Offset="0xC620"/>
+        <DList Name="object_human_DL_00C8B0" Offset="0xC8B0"/>
+        <DList Name="object_human_DL_00C8C0" Offset="0xC8C0"/>
 
         <!-- Hair -->
-        <DList Name="gHumanHairDL" Offset="0xCCF8" />
-        <DList Name="gHumanHairWrapperDL" Offset="0xCDC8" />
-        <DList Name="gHumanHairWrapperWrapperDL" Offset="0xCDD8" />
+        <DList Name="gHumanHairDL" Offset="0xCCF8"/>
+        <DList Name="gHumanHairWrapperDL" Offset="0xCDC8"/>
+        <DList Name="gHumanHairWrapperWrapperDL" Offset="0xCDD8"/>
 
         <!-- Doesn't work in Z64Utils -->
-        <DList Name="gHumanHeadDL" Offset="0xCED0" />
-        <DList Name="gHumanHeadWrapperDL" Offset="0xD500" />
-        <DList Name="gHumanHeadWrapperWrapperDL" Offset="0xD510" />
+        <DList Name="gHumanHeadDL" Offset="0xCED0"/>
+        <DList Name="gHumanHeadWrapperDL" Offset="0xD500"/>
+        <DList Name="gHumanHeadWrapperWrapperDL" Offset="0xD510"/>
 
         <!-- Upper half of the dress? idk -->
-        <DList Name="object_human_DL_00E0B8" Offset="0xE0B8" />
-        <DList Name="object_human_DL_00E218" Offset="0xE218" />
-        <DList Name="object_human_DL_00E228" Offset="0xE228" />
+        <DList Name="object_human_DL_00E0B8" Offset="0xE0B8"/>
+        <DList Name="object_human_DL_00E218" Offset="0xE218"/>
+        <DList Name="object_human_DL_00E228" Offset="0xE228"/>
 
         <!-- Lower half of the dress -->
-        <DList Name="gHumanDressLowerDL" Offset="0xE3A0" />
-        <DList Name="gHumanDressLowerWrapperDL" Offset="0xE480" />
-        <DList Name="gHumanDressLowerWrapperWrapperDL" Offset="0xE490" />
+        <DList Name="gHumanDressLowerDL" Offset="0xE3A0"/>
+        <DList Name="gHumanDressLowerWrapperDL" Offset="0xE480"/>
+        <DList Name="gHumanDressLowerWrapperWrapperDL" Offset="0xE490"/>
 
         <Texture Name="gHumanEarTex" OutName="ear" Format="rgba16" Width="16" Height="32" Offset="0xE5A8"/>
         <Texture Name="gHumanDressOrnamentsTex" OutName="dress_ornaments" Format="rgba16" Width="32" Height="32" Offset="0xE9A8"/>
diff --git a/assets/xml/objects/object_ik.xml b/assets/xml/objects/object_ik.xml
index 7a812bbff..95606e6df 100644
--- a/assets/xml/objects/object_ik.xml
+++ b/assets/xml/objects/object_ik.xml
@@ -36,14 +36,14 @@
         <Animation Name="object_ik_Anim_01EE34" Offset="0x1EE34"/>
         <Animation Name="object_ik_Anim_0203D8" Offset="0x203D8"/>
 
-        <Texture Name="object_ik_Tlut_00F630" OutName="tlut_00F630" Format="rgba16" Width="23" Height="8" Offset="0xf630" />
-        <Texture Name="object_ik_Tex_00F7A0" OutName="tex_00F7A0" Format="i4" Width="32" Height="64" Offset="0xF7A0" />
-        <Texture Name="object_ik_Tex_00FBA0" OutName="tex_00FBA0" Format="ia8" Width="32" Height="32" Offset="0xFBA0" />
-        <Texture Name="object_ik_Tex_00FFA0" OutName="tex_00FFA0" Format="rgba16" Width="16" Height="16" Offset="0xFFA0" />
-        <Texture Name="object_ik_Tex_0101A0" OutName="tex_0101A0" Format="rgba16" Width="16" Height="16" Offset="0x101A0" />
-        <Texture Name="object_ik_Tex_0103A0" OutName="tex_0103A0" Format="ia16" Width="32" Height="32" Offset="0x103A0" />
-        <Texture Name="object_ik_Tex_010BA0" OutName="tex_010BA0" Format="rgba16" Width="32" Height="32" Offset="0x10BA0" />
-        <Texture Name="object_ik_Tex_0113A0" OutName="tex_0113A0" Format="rgba16" Width="8" Height="8" Offset="0x113A0" />
+        <Texture Name="object_ik_Tlut_00F630" OutName="tlut_00F630" Format="rgba16" Width="23" Height="8" Offset="0xf630"/>
+        <Texture Name="object_ik_Tex_00F7A0" OutName="tex_00F7A0" Format="i4" Width="32" Height="64" Offset="0xF7A0"/>
+        <Texture Name="object_ik_Tex_00FBA0" OutName="tex_00FBA0" Format="ia8" Width="32" Height="32" Offset="0xFBA0"/>
+        <Texture Name="object_ik_Tex_00FFA0" OutName="tex_00FFA0" Format="rgba16" Width="16" Height="16" Offset="0xFFA0"/>
+        <Texture Name="object_ik_Tex_0101A0" OutName="tex_0101A0" Format="rgba16" Width="16" Height="16" Offset="0x101A0"/>
+        <Texture Name="object_ik_Tex_0103A0" OutName="tex_0103A0" Format="ia16" Width="32" Height="32" Offset="0x103A0"/>
+        <Texture Name="object_ik_Tex_010BA0" OutName="tex_010BA0" Format="rgba16" Width="32" Height="32" Offset="0x10BA0"/>
+        <Texture Name="object_ik_Tex_0113A0" OutName="tex_0113A0" Format="rgba16" Width="8" Height="8" Offset="0x113A0"/>
         <Texture Name="object_ik_Tex_011420" OutName="tex_011420" Format="ci8" Width="16" Height="16" Offset="0x11420" TlutOffset="0xf630"/>
         <Texture Name="object_ik_Tex_011520" OutName="tex_011520" Format="ci8" Width="16" Height="16" Offset="0x11520" TlutOffset="0xf630"/>
         <Texture Name="object_ik_Tex_011620" OutName="tex_011620" Format="ci8" Width="8" Height="8" Offset="0x11620" TlutOffset="0xf630"/>
@@ -51,52 +51,52 @@
         <Texture Name="object_ik_Tex_011760" OutName="tex_011760" Format="ci8" Width="8" Height="16" Offset="0x11760" TlutOffset="0xf630"/>
         <Texture Name="object_ik_Tex_0117E0" OutName="tex_0117E0" Format="ci8" Width="8" Height="16" Offset="0x117E0" TlutOffset="0xf630"/>
         <Texture Name="object_ik_Tex_011860" OutName="tex_011860" Format="ci8" Width="16" Height="16" Offset="0x11860" TlutOffset="0xf630"/>
-        <Texture Name="object_ik_Tex_011960" OutName="tex_011960" Format="ia8" Width="16" Height="16" Offset="0x11960" />
-        <DList Name="object_ik_DL_0151F0" Offset="0x151F0" />
-        <DList Name="object_ik_DL_015380" Offset="0x15380" />
-        <DList Name="object_ik_DL_0154E0" Offset="0x154E0" />
-        <DList Name="object_ik_DL_015840" Offset="0x15840" />
-        <DList Name="object_ik_DL_015B00" Offset="0x15B00" />
-        <DList Name="object_ik_DL_016118" Offset="0x16118" />
-        <DList Name="object_ik_DL_016278" Offset="0x16278" />
-        <DList Name="object_ik_DL_016340" Offset="0x16340" />
-        <DList Name="object_ik_DL_0164A0" Offset="0x164A0" />
-        <DList Name="object_ik_DL_016568" Offset="0x16568" />
-        <DList Name="object_ik_DL_016658" Offset="0x16658" />
-        <DList Name="object_ik_DL_016748" Offset="0x16748" />
-        <DList Name="object_ik_DL_0169E8" Offset="0x169E8" />
-        <DList Name="object_ik_DL_016BE0" Offset="0x16BE0" />
-        <DList Name="object_ik_DL_016CD8" Offset="0x16CD8" />
-        <DList Name="object_ik_DL_016D88" Offset="0x16D88" />
-        <DList Name="object_ik_DL_016EE8" Offset="0x16EE8" />
-        <DList Name="object_ik_DL_016F88" Offset="0x16F88" />
-        <DList Name="object_ik_DL_017028" Offset="0x17028" />
-        <DList Name="object_ik_DL_017170" Offset="0x17170" />
-        <Texture Name="object_ik_Tlut_017288" OutName="tlut_017288" Format="rgba16" Width="15" Height="8" Offset="0x17288" />
+        <Texture Name="object_ik_Tex_011960" OutName="tex_011960" Format="ia8" Width="16" Height="16" Offset="0x11960"/>
+        <DList Name="object_ik_DL_0151F0" Offset="0x151F0"/>
+        <DList Name="object_ik_DL_015380" Offset="0x15380"/>
+        <DList Name="object_ik_DL_0154E0" Offset="0x154E0"/>
+        <DList Name="object_ik_DL_015840" Offset="0x15840"/>
+        <DList Name="object_ik_DL_015B00" Offset="0x15B00"/>
+        <DList Name="object_ik_DL_016118" Offset="0x16118"/>
+        <DList Name="object_ik_DL_016278" Offset="0x16278"/>
+        <DList Name="object_ik_DL_016340" Offset="0x16340"/>
+        <DList Name="object_ik_DL_0164A0" Offset="0x164A0"/>
+        <DList Name="object_ik_DL_016568" Offset="0x16568"/>
+        <DList Name="object_ik_DL_016658" Offset="0x16658"/>
+        <DList Name="object_ik_DL_016748" Offset="0x16748"/>
+        <DList Name="object_ik_DL_0169E8" Offset="0x169E8"/>
+        <DList Name="object_ik_DL_016BE0" Offset="0x16BE0"/>
+        <DList Name="object_ik_DL_016CD8" Offset="0x16CD8"/>
+        <DList Name="object_ik_DL_016D88" Offset="0x16D88"/>
+        <DList Name="object_ik_DL_016EE8" Offset="0x16EE8"/>
+        <DList Name="object_ik_DL_016F88" Offset="0x16F88"/>
+        <DList Name="object_ik_DL_017028" Offset="0x17028"/>
+        <DList Name="object_ik_DL_017170" Offset="0x17170"/>
+        <Texture Name="object_ik_Tlut_017288" OutName="tlut_017288" Format="rgba16" Width="15" Height="8" Offset="0x17288"/>
         <Texture Name="object_ik_Tex_017378" OutName="tex_017378" Format="ci8" Width="16" Height="16" Offset="0x17378" TlutOffset="0x17288"/>
         <Texture Name="object_ik_Tex_017478" OutName="tex_017478" Format="ci8" Width="8" Height="8" Offset="0x17478" TlutOffset="0x17288"/>
         <Texture Name="object_ik_Tex_0174B8" OutName="tex_0174B8" Format="ci8" Width="16" Height="16" Offset="0x174B8" TlutOffset="0x17288"/>
         <Texture Name="object_ik_Tex_0175B8" OutName="tex_0175B8" Format="ci8" Width="8" Height="16" Offset="0x175B8" TlutOffset="0x17288"/>
         <Texture Name="object_ik_Tex_017638" OutName="tex_017638" Format="ci8" Width="8" Height="16" Offset="0x17638" TlutOffset="0x17288"/>
         <Texture Name="object_ik_Tex_0176B8" OutName="tex_0176B8" Format="ci8" Width="16" Height="16" Offset="0x176B8" TlutOffset="0x17288"/>
-        <DList Name="object_ik_DL_018E78" Offset="0x18E78" />
-        <DList Name="object_ik_DL_019100" Offset="0x19100" />
-        <DList Name="object_ik_DL_019E08" Offset="0x19E08" />
-        <DList Name="object_ik_DL_01BA78" Offset="0x1BA78" />
-        <DList Name="object_ik_DL_01BE98" Offset="0x1BE98" />
-        <DList Name="object_ik_DL_01C130" Offset="0x1C130" />
-        <DList Name="object_ik_DL_01C2B8" Offset="0x1C2B8" />
-        <DList Name="object_ik_DL_01C550" Offset="0x1C550" />
-        <DList Name="object_ik_DL_01C6D8" Offset="0x1C6D8" />
-        <DList Name="object_ik_DL_01C7B8" Offset="0x1C7B8" />
-        <DList Name="object_ik_DL_01CB58" Offset="0x1CB58" />
-        <DList Name="object_ik_DL_01CCA0" Offset="0x1CCA0" />
-        <DList Name="object_ik_DL_01CEE0" Offset="0x1CEE0" />
-        <DList Name="object_ik_DL_01D2B0" Offset="0x1D2B0" />
-        <DList Name="object_ik_DL_01D3F8" Offset="0x1D3F8" />
-        <DList Name="object_ik_DL_01D638" Offset="0x1D638" />
-        <Texture Name="object_ik_Tlut_01D9A8" OutName="tlut_01D9A8" Format="rgba16" Width="16" Height="16" Offset="0x1D9A8" />
-        <Texture Name="object_ik_Tex_01DBA8" OutName="tex_01DBA8" Format="ia16" Width="16" Height="16" Offset="0x1DBA8" />
+        <DList Name="object_ik_DL_018E78" Offset="0x18E78"/>
+        <DList Name="object_ik_DL_019100" Offset="0x19100"/>
+        <DList Name="object_ik_DL_019E08" Offset="0x19E08"/>
+        <DList Name="object_ik_DL_01BA78" Offset="0x1BA78"/>
+        <DList Name="object_ik_DL_01BE98" Offset="0x1BE98"/>
+        <DList Name="object_ik_DL_01C130" Offset="0x1C130"/>
+        <DList Name="object_ik_DL_01C2B8" Offset="0x1C2B8"/>
+        <DList Name="object_ik_DL_01C550" Offset="0x1C550"/>
+        <DList Name="object_ik_DL_01C6D8" Offset="0x1C6D8"/>
+        <DList Name="object_ik_DL_01C7B8" Offset="0x1C7B8"/>
+        <DList Name="object_ik_DL_01CB58" Offset="0x1CB58"/>
+        <DList Name="object_ik_DL_01CCA0" Offset="0x1CCA0"/>
+        <DList Name="object_ik_DL_01CEE0" Offset="0x1CEE0"/>
+        <DList Name="object_ik_DL_01D2B0" Offset="0x1D2B0"/>
+        <DList Name="object_ik_DL_01D3F8" Offset="0x1D3F8"/>
+        <DList Name="object_ik_DL_01D638" Offset="0x1D638"/>
+        <Texture Name="object_ik_Tlut_01D9A8" OutName="tlut_01D9A8" Format="rgba16" Width="16" Height="16" Offset="0x1D9A8"/>
+        <Texture Name="object_ik_Tex_01DBA8" OutName="tex_01DBA8" Format="ia16" Width="16" Height="16" Offset="0x1DBA8"/>
         <Texture Name="object_ik_Tex_01DDA8" OutName="tex_01DDA8" Format="ci8" Width="16" Height="16" Offset="0x1DDA8" TlutOffset="0x1D9A8"/>
         <Texture Name="object_ik_Tex_01DEA8" OutName="tex_01DEA8" Format="ci8" Width="16" Height="16" Offset="0x1DEA8" TlutOffset="0x1D9A8"/>
         <!--Blob Name="object_ik_zeroes_unk_0001DFA8" Size="0x2628" Offset="0x1DFA8" /-->
diff --git a/assets/xml/objects/object_in.xml b/assets/xml/objects/object_in.xml
index 4660b601c..84c114047 100644
--- a/assets/xml/objects/object_in.xml
+++ b/assets/xml/objects/object_in.xml
@@ -32,7 +32,7 @@
         <Texture Name="gIngoHeadGradientTex" OutName="head_gradient" Format="ci8" Width="8" Height="8" Offset="0x4790" TlutOffset="0x3408"/>
 
         <Texture Name="gIngoEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x3590" TlutOffset="0x3210"/>
-        <Texture Name="gIngoRedTex" OutName="red" Format="ci8" Width="8" Height="8" TlutOffset="0x3210" Offset="0x4350"/>
+        <Texture Name="gIngoRedTex" OutName="red" Format="ci8" Width="8" Height="8" Offset="0x4350" TlutOffset="0x3210"/>
         <Texture Name="gIngoEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x47D0" TlutOffset="0x3210"/>
         <Texture Name="gIngoEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x4BD0" TlutOffset="0x3210"/>
         <Texture Name="gIngoEyeClosed2Tex" OutName="eye_closed_2" Format="ci8" Width="32" Height="32" Offset="0x4390" TlutOffset="0x3210"/>
diff --git a/assets/xml/objects/object_js.xml b/assets/xml/objects/object_js.xml
index 6f16b4f6e..ff7bd3efa 100644
--- a/assets/xml/objects/object_js.xml
+++ b/assets/xml/objects/object_js.xml
@@ -4,18 +4,18 @@
         <Skeleton Name="gCarpetMerchantSkel" Type="Flex" LimbType="Standard" Offset="0x5EA0"/>
 
         <!-- Carpet Merchant Limbs -->
-        <Limb Name="gCarpetMerchantRootLimb" Type="Standard" Offset="0x5DE0"/>
-        <Limb Name="gCarpetMerchantTopRootLimb" Type="Standard" Offset="0x5DEC"/>
-        <Limb Name="gCarpetMerchantLowerHairLimb" Type="Standard" Offset="0x5DF8"/>
-        <Limb Name="gCarpetMerchantUpperHairLimb" Type="Standard" Offset="0x5E04"/>
-        <Limb Name="gCarpetMerchantTorsoLimb" Type="Standard" Offset="0x5E10"/>
-        <Limb Name="gCarpetMerchantUpperArmLeftLimb" Type="Standard" Offset="0x5E1C"/>
-        <Limb Name="gCarpetMerchantForearmLeftLimb" Type="Standard" Offset="0x5E28"/>
-        <Limb Name="gCarpetMerchantLeftHandLimb" Type="Standard" Offset="0x5E34"/>
-        <Limb Name="gCarpetMerchantUpperArmRightLimb" Type="Standard" Offset="0x5E40"/>
-        <Limb Name="gCarpetMerchantForearmRightLimb" Type="Standard" Offset="0x5E4C"/>
-        <Limb Name="gCarpetMerchantRightHandLimb" Type="Standard" Offset="0x5E58"/>
-        <Limb Name="gCarpetMerchantHeadLimb" Type="Standard" Offset="0x5E64"/>
+        <Limb Name="gCarpetMerchantRootLimb" LimbType="Standard" Offset="0x5DE0"/>
+        <Limb Name="gCarpetMerchantTopRootLimb" LimbType="Standard" Offset="0x5DEC"/>
+        <Limb Name="gCarpetMerchantLowerHairLimb" LimbType="Standard" Offset="0x5DF8"/>
+        <Limb Name="gCarpetMerchantUpperHairLimb" LimbType="Standard" Offset="0x5E04"/>
+        <Limb Name="gCarpetMerchantTorsoLimb" LimbType="Standard" Offset="0x5E10"/>
+        <Limb Name="gCarpetMerchantUpperArmLeftLimb" LimbType="Standard" Offset="0x5E1C"/>
+        <Limb Name="gCarpetMerchantForearmLeftLimb" LimbType="Standard" Offset="0x5E28"/>
+        <Limb Name="gCarpetMerchantLeftHandLimb" LimbType="Standard" Offset="0x5E34"/>
+        <Limb Name="gCarpetMerchantUpperArmRightLimb" LimbType="Standard" Offset="0x5E40"/>
+        <Limb Name="gCarpetMerchantForearmRightLimb" LimbType="Standard" Offset="0x5E4C"/>
+        <Limb Name="gCarpetMerchantRightHandLimb" LimbType="Standard" Offset="0x5E58"/>
+        <Limb Name="gCarpetMerchantHeadLimb" LimbType="Standard" Offset="0x5E64"/>
 
         <!-- Carpet Merchant Limb DisplayLists -->
         <DList Name="gCarpetMerchantBlanketAndLowerBodyDL" Offset="0x3440"/>
diff --git a/assets/xml/objects/object_jya_obj.xml b/assets/xml/objects/object_jya_obj.xml
index c1f544704..5b488e86d 100644
--- a/assets/xml/objects/object_jya_obj.xml
+++ b/assets/xml/objects/object_jya_obj.xml
@@ -1,11 +1,11 @@
 <Root>
     <File Name="object_jya_obj" Segment="6">
         <DList Name="g1fliftDL" Offset="0x1F0"/>
-        <Collision Name="g1fliftCol" Offset="0x4A8" />
+        <Collision Name="g1fliftCol" Offset="0x4A8"/>
         <Texture Name="g1f1fiftTopTex" OutName="1flift_top" Format="rgba16" Width="32" Height="32" Offset="0x1B940"/>
         <Texture Name="g1fLiftBottomTex" OutName="1flift_bottom" Format="rgba16" Width="32" Height="32" Offset="0x17540"/>
         <DList Name="gAmishutterDL" Offset="0xC0A0"/>
-        <Collision Name="gAmishutterCol" Offset="0xC4C8" />
+        <Collision Name="gAmishutterCol" Offset="0xC4C8"/>
         <DList Name="gBigMirror1DL" Offset="0xBC70"/>
         <DList Name="gBigMirror2DL" Offset="0xBD80"/>
         <DList Name="gBigMirror3DL" Offset="0xE1B0"/>
@@ -19,10 +19,10 @@
         <DList Name="gBombiwaEffectDL" Offset="0xEDC0"/>
         <Texture Name="gBombiwaRockTex" OutName="bombiwa_rock" Format="rgba16" Width="32" Height="64" Offset="0x18B40"/>
         <Texture Name="gBombiwaLight1Tex" OutName="bombiwa_light" Format="ia16" Width="32" Height="64" Offset="0x19B40"/>
-        <Collision Name="gBombiwaCol" Offset="0xE710" />
+        <Collision Name="gBombiwaCol" Offset="0xE710"/>
         <DList Name="gCobra1DL" Offset="0x10790"/>
         <DList Name="gCobra2DL" Offset="0x10C20"/>
-        <Collision Name="gCobraCol" Offset="0x1167C" />
+        <Collision Name="gCobraCol" Offset="0x1167C"/>
         <DList Name="gCobra3DL" Offset="0x117D0"/>
         <Texture Name="gCobraMirrorStoneTex" OutName="cobra_stone" Format="rgba16" Width="32" Height="32" Offset="0x13D40"/>
         <Texture Name="gCobraMirrorBorderTex" OutName="cobra_boarder" Format="rgba16" Width="16" Height="16" Offset="0x15D40"/>
@@ -31,16 +31,16 @@
         <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"/>
         <DList Name="gKanaamiDL" Offset="0xF000"/>
-        <Collision Name="gKanaamiCol" Offset="0xF208" />
+        <Collision Name="gKanaamiCol" Offset="0xF208"/>
         <Texture Name="gKanaamiTopTex" OutName="kanaami_top" Format="rgba16" Width="32" Height="64" Offset="0x12540"/>
         <Texture Name="gKanaamiMiddleTex" OutName="kanaami_middle" Format="rgba16" Width="32" Height="32" Offset="0x13540"/>
         <DList Name="gLiftDL" Offset="0xCCE0"/>
         <Texture Name="gLiftChainTex" OutName="lift_chain" Format="rgba16" Width="16" Height="32" Offset="0x17D40"/>
         <Texture Name="gLiftTopTex" OutName="lift_top" Format="rgba16" Width="16" Height="64" Offset="0x18140"/>
         <Texture Name="gLiftUpperChainTex" OutName="lift_upper_chain" Format="rgba16" Width="8" Height="32" Offset="0x18940"/>
-        <Collision Name="gLiftCol" Offset="0xD7E8" />
+        <Collision Name="gLiftCol" Offset="0xD7E8"/>
         <DList Name="gMegami1DL" Offset="0x5780"/>
-        <Collision Name="GMegamiCol" Offset="0x5C4C" />
+        <Collision Name="GMegamiCol" Offset="0x5C4C"/>
         <DList Name="gMegami2DL" Offset="0xB9F8"/>
         <DList Name="gMegamiPiece1DL" Offset="0x9928"/>
         <DList Name="gMegamiPiece2DL" Offset="0x9AC0"/>
@@ -75,6 +75,6 @@
         <Texture Name="gMegamiLeftCrumble4Tex" OutName="megami_left_crumble_4" Format="ci4" Width="64" Height="64" Offset="0x4500" TlutOffset="0x4E0"/>
         <Texture Name="gMegamiLeftCrumble5Tex" OutName="megami_left_crumble_5" Format="ci4" Width="64" Height="64" Offset="0x0500" TlutOffset="0x4E0"/>
         <DList Name="gZurerukabeDL" Offset="0x12340"/>
-        <Collision Name="gZurerukabeCol" Offset="0x12508" />
+        <Collision Name="gZurerukabeCol" Offset="0x12508"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_km1.xml b/assets/xml/objects/object_km1.xml
index 94af8a1d6..0a918a798 100644
--- a/assets/xml/objects/object_km1.xml
+++ b/assets/xml/objects/object_km1.xml
@@ -2,38 +2,38 @@
     <File Name="object_km1" Segment="6">
         <!-- The textures used by these limbs aren't 64-bit aligned -->
         
-        <Limb Name="gKm1SkelLimb_000000" LimbType="Standard" Offset="0x0" />
-        <Limb Name="gKm1SkelLimb_00000C" LimbType="Standard" Offset="0xC" />
-        <Limb Name="gKm1SkelLimb_000018" LimbType="Standard" Offset="0x18" />
-        <Limb Name="gKm1SkelLimb_000024" LimbType="Standard" Offset="0x24" />
-        <Limb Name="gKm1SkelLimb_000030" LimbType="Standard" Offset="0x30" />
-        <Limb Name="gKm1SkelLimb_00003C" LimbType="Standard" Offset="0x3C" />
-        <Limb Name="gKm1SkelLimb_000048" LimbType="Standard" Offset="0x48" />
-        <Limb Name="gKm1SkelLimb_000054" LimbType="Standard" Offset="0x54" />
-        <Limb Name="gKm1SkelLimb_000060" LimbType="Standard" Offset="0x60" />
-        <Limb Name="gKm1SkelLimb_00006C" LimbType="Standard" Offset="0x6C" />
-        <Limb Name="gKm1SkelLimb_000078" LimbType="Standard" Offset="0x78" />
-        <Limb Name="gKm1SkelLimb_000084" LimbType="Standard" Offset="0x84" />
-        <Limb Name="gKm1SkelLimb_000090" LimbType="Standard" Offset="0x90" />
-        <Limb Name="gKm1SkelLimb_00009C" LimbType="Standard" Offset="0x9C" />
-        <Limb Name="gKm1SkelLimb_0000A8" LimbType="Standard" Offset="0xA8" />
+        <Limb Name="gKm1SkelLimb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="gKm1SkelLimb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="gKm1SkelLimb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="gKm1SkelLimb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="gKm1SkelLimb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="gKm1SkelLimb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="gKm1SkelLimb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="gKm1SkelLimb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="gKm1SkelLimb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="gKm1SkelLimb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="gKm1SkelLimb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="gKm1SkelLimb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="gKm1SkelLimb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="gKm1SkelLimb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="gKm1SkelLimb_0000A8" LimbType="Standard" Offset="0xA8"/>
       
-        <Skeleton Name="gKm1Skel" Type="Flex" LimbType="Standard" Offset="0xF0" />
+        <Skeleton Name="gKm1Skel" Type="Flex" LimbType="Standard" Offset="0xF0"/>
       
         <!-- 32-bit aligned textures. -->
-        <Texture Name="gKm1TLUT_0000FC" OutName="tlut_0000FC" Format="rgba16" Width="256" Height="1" Offset="0xFC" />
-        <Texture Name="gKm1TunicTex" OutName="tunic" Format="i8" Width="8" Height="8" Offset="0x2FC" />
-        <Texture Name="gKm1BootWrinkleTex" OutName="boot_wrinkle" Format="i8" Width="8" Height="8" Offset="0x33C" />
-        <Texture Name="gKm1Skin1Tex" OutName="skin1" Format="ci8" TlutOffset="0xFC" Width="8" Height="8" Offset="0x37C" />
-        <Texture Name="gKm1TunicFringeTex" OutName="tunic_fringe" Format="rgba16" Width="16" Height="16" Offset="0x3BC" />
-        <Texture Name="gKm1UnusedHairTex" OutName="unused_hair" Format="ci8" TlutOffset="0xFC" Width="16" Height="32" Offset="0x5BC" />
-        <Texture Name="gKm1Ear1Tex" OutName="ear1" Format="ci8" TlutOffset="0xFC" Width="8" Height="8" Offset="0x7BC"/>
-        <Texture Name="gKm1HandTex" OutName="hand" Format="ci8" TlutOffset="0xFC" Width="8" Height="8" Offset="0x7FC" />
+        <Texture Name="gKm1TLUT_0000FC" OutName="tlut_0000FC" Format="rgba16" Width="256" Height="1" Offset="0xFC"/>
+        <Texture Name="gKm1TunicTex" OutName="tunic" Format="i8" Width="8" Height="8" Offset="0x2FC"/>
+        <Texture Name="gKm1BootWrinkleTex" OutName="boot_wrinkle" Format="i8" Width="8" Height="8" Offset="0x33C"/>
+        <Texture Name="gKm1Skin1Tex" OutName="skin1" Format="ci8" Width="8" Height="8" Offset="0x37C" TlutOffset="0xFC"/>
+        <Texture Name="gKm1TunicFringeTex" OutName="tunic_fringe" Format="rgba16" Width="16" Height="16" Offset="0x3BC"/>
+        <Texture Name="gKm1UnusedHairTex" OutName="unused_hair" Format="ci8" Width="16" Height="32" Offset="0x5BC" TlutOffset="0xFC"/>
+        <Texture Name="gKm1Ear1Tex" OutName="ear1" Format="ci8" Width="8" Height="8" Offset="0x7BC" TlutOffset="0xFC"/>
+        <Texture Name="gKm1HandTex" OutName="hand" Format="ci8" Width="8" Height="8" Offset="0x7FC" TlutOffset="0xFC"/>
         
-        <Texture Name="gKm1TLUT_00083C" OutName="tlut_00083C" Format="rgba16" Width="96" Height="1" Offset="0x83C" />
-        <Texture Name="gKm1Ear2Tex" OutName="ear2" Format="ci8" TlutOffset="0x83C" Width="8" Height="8" Offset="0x8FC"/>
-        <Texture Name="gKm1Skin2Tex" OutName="skin2" Format="ci8" TlutOffset="0x83C" Width="8" Height="8" Offset="0x93C" />
-        <Texture Name="gKm1HairTex" OutName="hair" Format="ci8" TlutOffset="0x83C" Width="16" Height="32" Offset="0x97C" />
-        <DList Name="gKm1DL" Offset="0x1890" />
+        <Texture Name="gKm1TLUT_00083C" OutName="tlut_00083C" Format="rgba16" Width="96" Height="1" Offset="0x83C"/>
+        <Texture Name="gKm1Ear2Tex" OutName="ear2" Format="ci8" Width="8" Height="8" Offset="0x8FC" TlutOffset="0x83C"/>
+        <Texture Name="gKm1Skin2Tex" OutName="skin2" Format="ci8" Width="8" Height="8" Offset="0x93C" TlutOffset="0x83C"/>
+        <Texture Name="gKm1HairTex" OutName="hair" Format="ci8" Width="16" Height="32" Offset="0x97C" TlutOffset="0x83C"/>
+        <DList Name="gKm1DL" Offset="0x1890"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_kw1.xml b/assets/xml/objects/object_kw1.xml
index d620ef6c4..eab561b1f 100644
--- a/assets/xml/objects/object_kw1.xml
+++ b/assets/xml/objects/object_kw1.xml
@@ -2,62 +2,62 @@
     <File Name="object_kw1" Segment="6">
         <!-- The textures used by these limbs aren't 64-bit aligned -->
         
-        <Limb Name="gKw1SkelLimb_000000" LimbType="Standard" Offset="0x0" />
-        <Limb Name="gKw1SkelLimb_00000C" LimbType="Standard" Offset="0xC" />
-        <Limb Name="gKw1SkelLimb_000018" LimbType="Standard" Offset="0x18" />
-        <Limb Name="gKw1SkelLimb_000024" LimbType="Standard" Offset="0x24" />
-        <Limb Name="gKw1SkelLimb_000030" LimbType="Standard" Offset="0x30" />
-        <Limb Name="gKw1SkelLimb_00003C" LimbType="Standard" Offset="0x3C" />
-        <Limb Name="gKw1SkelLimb_000048" LimbType="Standard" Offset="0x48" />
-        <Limb Name="gKw1SkelLimb_000054" LimbType="Standard" Offset="0x54" />
-        <Limb Name="gKw1SkelLimb_000060" LimbType="Standard" Offset="0x60" />
-        <Limb Name="gKw1SkelLimb_00006C" LimbType="Standard" Offset="0x6C" />
-        <Limb Name="gKw1SkelLimb_000078" LimbType="Standard" Offset="0x78" />
-        <Limb Name="gKw1SkelLimb_000084" LimbType="Standard" Offset="0x84" />
-        <Limb Name="gKw1SkelLimb_000090" LimbType="Standard" Offset="0x90" />
-        <Limb Name="gKw1SkelLimb_00009C" LimbType="Standard" Offset="0x9C" />
-        <Limb Name="gKw1SkelLimb_0000A8" LimbType="Standard" Offset="0xA8" />
+        <Limb Name="gKw1SkelLimb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="gKw1SkelLimb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="gKw1SkelLimb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="gKw1SkelLimb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="gKw1SkelLimb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="gKw1SkelLimb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="gKw1SkelLimb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="gKw1SkelLimb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="gKw1SkelLimb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="gKw1SkelLimb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="gKw1SkelLimb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="gKw1SkelLimb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="gKw1SkelLimb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="gKw1SkelLimb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="gKw1SkelLimb_0000A8" LimbType="Standard" Offset="0xA8"/>
 
-        <Skeleton Name="gKw1Skel" Type="Flex" LimbType="Standard" Offset="0xF0" />
+        <Skeleton Name="gKw1Skel" Type="Flex" LimbType="Standard" Offset="0xF0"/>
 
         <!-- 32-bit aligned textures. -->
-        <Texture Name="object_kw1_TLUT_0000FC" OutName="tlut_000000FC" Format="rgba16" Width="256" Height="1" Offset="0xFC" />
-        <Texture Name="gKw1BootsTex" OutName="boots" Format="i8" Width="16" Height="16" Offset="0x2FC" />
+        <Texture Name="object_kw1_TLUT_0000FC" OutName="tlut_000000FC" Format="rgba16" Width="256" Height="1" Offset="0xFC"/>
+        <Texture Name="gKw1BootsTex" OutName="boots" Format="i8" Width="16" Height="16" Offset="0x2FC"/>
         <!-- Arm/neck texture-->
-        <Texture Name="gKw1Skin1Tex" OutName="skin1" Format="ci8" TlutOffset="0xFC" Width="8" Height="8" Offset="0x3FC" />
-        <Texture Name="gKw1TunicTex" OutName="tunic" Format="i8" Width="8" Height="8" Offset="0x43C" />
+        <Texture Name="gKw1Skin1Tex" OutName="skin1" Format="ci8" Width="8" Height="8" Offset="0x3FC" TlutOffset="0xFC"/>
+        <Texture Name="gKw1TunicTex" OutName="tunic" Format="i8" Width="8" Height="8" Offset="0x43C"/>
         
         <!-- Possibly a skin gradient texture -->
-        <Texture Name="object_kw1_Tex_00047C" OutName="tex_00047C" Format="ci8" TlutOffset="0xFC" Width="8" Height="8" Offset="0x47C" />
+        <Texture Name="object_kw1_Tex_00047C" OutName="tex_00047C" Format="ci8" Width="8" Height="8" Offset="0x47C" TlutOffset="0xFC"/>
         <Texture Name="gKw1UnusedEyeOpenTex" OutName="unused_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x4BC"/>
         
-        <Texture Name="gKw1HandTex" OutName="hand" Format="ci8" TlutOffset="0xFC" Width="8" Height="8" Offset="0xCBC" />
-        <Texture Name="gKw1BeltBuckleTex" OutName="belt_buckle" Format="ci8" TlutOffset="0xFC" Width="8" Height="8" Offset="0xCFC" />
+        <Texture Name="gKw1HandTex" OutName="hand" Format="ci8" Width="8" Height="8" Offset="0xCBC" TlutOffset="0xFC"/>
+        <Texture Name="gKw1BeltBuckleTex" OutName="belt_buckle" Format="ci8" Width="8" Height="8" Offset="0xCFC" TlutOffset="0xFC"/>
         
-        <Texture Name="object_kw1_TLUT_000D3C" OutName="tlut_00000D3C" Format="rgba16" Width="232" Height="1" Offset="0xD3C" />
-        <Texture Name="gKw1EarTex" OutName="ear" Format="ci8" TlutOffset="0xD3C" Width="8" Height="8" Offset="0xF0C"/>
-        <Texture Name="gKw1EyeOpenTex" OutName="eye_open" Format="ci8" TlutOffset="0xD3C" Width="32" Height="32" Offset="0xF4C"/>
-        <Texture Name="gKw1EyeHalfTex" OutName="eye_half" Format="ci8" TlutOffset="0xD3C" Width="32" Height="32" Offset="0x1A0C"/>
-        <Texture Name="gKw1EyeClosedTex" OutName="eye_closed" Format="ci8" TlutOffset="0xD3C" Width="32" Height="32" Offset="0x1E0C"/>
-        <Texture Name="gKw1HairTex" OutName="hair" Format="ci8" TlutOffset="0xD3C" Width="16" Height="32" Offset="0x134C" />
-        <Texture Name="gKw1Skin2Tex" OutName="skin2" Format="ci8" TlutOffset="0xD3C" Width="8" Height="8" Offset="0x154C" />
-        <Texture Name="gKw1HairlineTex" OutName="hairline" Format="ci8" TlutOffset="0xD3C" Width="16" Height="8" Offset="0x158C" />
-        <Texture Name="gKw1MouthTex" OutName="mouth" Format="ci8" TlutOffset="0xD3C" Width="32" Height="32" Offset="0x160C" />
+        <Texture Name="object_kw1_TLUT_000D3C" OutName="tlut_00000D3C" Format="rgba16" Width="232" Height="1" Offset="0xD3C"/>
+        <Texture Name="gKw1EarTex" OutName="ear" Format="ci8" Width="8" Height="8" Offset="0xF0C" TlutOffset="0xD3C"/>
+        <Texture Name="gKw1EyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0xF4C" TlutOffset="0xD3C"/>
+        <Texture Name="gKw1EyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x1A0C" TlutOffset="0xD3C"/>
+        <Texture Name="gKw1EyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x1E0C" TlutOffset="0xD3C"/>
+        <Texture Name="gKw1HairTex" OutName="hair" Format="ci8" Width="16" Height="32" Offset="0x134C" TlutOffset="0xD3C"/>
+        <Texture Name="gKw1Skin2Tex" OutName="skin2" Format="ci8" Width="8" Height="8" Offset="0x154C" TlutOffset="0xD3C"/>
+        <Texture Name="gKw1HairlineTex" OutName="hairline" Format="ci8" Width="16" Height="8" Offset="0x158C" TlutOffset="0xD3C"/>
+        <Texture Name="gKw1MouthTex" OutName="mouth" Format="ci8" Width="32" Height="32" Offset="0x160C" TlutOffset="0xD3C"/>
 
-        <DList Name="object_kw1_DL_002C10" Offset="0x2C10" />
-        <DList Name="object_kw1_DL_0053F8" Offset="0x53F8" />
-        <DList Name="object_kw1_DL_005668" Offset="0x5668" />
-        <DList Name="object_kw1_DL_0057A8" Offset="0x57A8" />
-        <DList Name="object_kw1_DL_0058D8" Offset="0x58D8" />
-        <DList Name="object_kw1_DL_005A60" Offset="0x5A60" />
-        <DList Name="object_kw1_DL_005BA0" Offset="0x5BA0" />
-        <DList Name="object_kw1_DL_005CD0" Offset="0x5CD0" />
-        <DList Name="object_kw1_DL_005E58" Offset="0x5E58" />
-        <DList Name="object_kw1_DL_006018" Offset="0x6018" />
-        <DList Name="object_kw1_DL_0061C0" Offset="0x61C0" />
-        <DList Name="object_kw1_DL_006360" Offset="0x6360" />
-        <DList Name="object_kw1_DL_006478" Offset="0x6478" />
-        <DList Name="object_kw1_DL_006620" Offset="0x6620" />
-        <DList Name="object_kw1_DL_0067C0" Offset="0x67C0" />
+        <DList Name="object_kw1_DL_002C10" Offset="0x2C10"/>
+        <DList Name="object_kw1_DL_0053F8" Offset="0x53F8"/>
+        <DList Name="object_kw1_DL_005668" Offset="0x5668"/>
+        <DList Name="object_kw1_DL_0057A8" Offset="0x57A8"/>
+        <DList Name="object_kw1_DL_0058D8" Offset="0x58D8"/>
+        <DList Name="object_kw1_DL_005A60" Offset="0x5A60"/>
+        <DList Name="object_kw1_DL_005BA0" Offset="0x5BA0"/>
+        <DList Name="object_kw1_DL_005CD0" Offset="0x5CD0"/>
+        <DList Name="object_kw1_DL_005E58" Offset="0x5E58"/>
+        <DList Name="object_kw1_DL_006018" Offset="0x6018"/>
+        <DList Name="object_kw1_DL_0061C0" Offset="0x61C0"/>
+        <DList Name="object_kw1_DL_006360" Offset="0x6360"/>
+        <DList Name="object_kw1_DL_006478" Offset="0x6478"/>
+        <DList Name="object_kw1_DL_006620" Offset="0x6620"/>
+        <DList Name="object_kw1_DL_0067C0" Offset="0x67C0"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_kz.xml b/assets/xml/objects/object_kz.xml
index a0e5dccd5..fe9ac5c06 100644
--- a/assets/xml/objects/object_kz.xml
+++ b/assets/xml/objects/object_kz.xml
@@ -1,9 +1,9 @@
 <Root>
     <File Name="object_kz" Segment="6">
-        <Animation Name="object_kz_Anim_00046C" Offset="0x46C" />
-        <Animation Name="object_kz_Anim_00075C" Offset="0x75C" />
-        <Texture Name="object_kz_TLUT_000770" OutName="tlut_000770" Format="rgba16" Width="16" Height="16" Offset="0x770" />
-        <Texture Name="object_kz_TLUT_000970" OutName="tlut_000970" Format="rgba16" Width="16" Height="16" Offset="0x970" />
+        <Animation Name="object_kz_Anim_00046C" Offset="0x46C"/>
+        <Animation Name="object_kz_Anim_00075C" Offset="0x75C"/>
+        <Texture Name="object_kz_TLUT_000770" OutName="tlut_000770" Format="rgba16" Width="16" Height="16" Offset="0x770"/>
+        <Texture Name="object_kz_TLUT_000970" OutName="tlut_000970" Format="rgba16" Width="16" Height="16" Offset="0x970"/>
         <Texture Name="object_kz_Tex_000B70" OutName="tex_000B70" Format="ci8" Width="32" Height="32" Offset="0xB70"  TlutOffset="0x770"/>
         <Texture Name="object_kz_Tex_000F70" OutName="tex_000F70" Format="ci8" Width="8" Height="16" Offset="0xF70"  TlutOffset="0x770"/>
         <Texture Name="object_kz_Tex_000FF0" OutName="tex_000FF0" Format="ci8" Width="32" Height="32" Offset="0xFF0"  TlutOffset="0x770"/>
@@ -12,32 +12,32 @@
         <Texture Name="object_kz_Tex_001470" OutName="tex_001470" Format="ci8" Width="32" Height="32" Offset="0x1470"  TlutOffset="0x970"/>
         <Texture Name="object_kz_Tex_001870" OutName="tex_001870" Format="ci8" Width="32" Height="32" Offset="0x1870"  TlutOffset="0x970"/>
         <Texture Name="object_kz_Tex_001C70" OutName="tex_001C70" Format="ci8" Width="32" Height="32" Offset="0x1C70"  TlutOffset="0x970"/>
-        <Blob Name="object_kz_Blob_002070" Size="0x400" Offset="0x2070" />
+        <Blob Name="object_kz_Blob_002070" Size="0x400" Offset="0x2070"/>
         <Texture Name="object_kz_Tex_002470" OutName="tex_002470" Format="ci8" Width="16" Height="16" Offset="0x2470"  TlutOffset="0x770"/>
         <Texture Name="object_kz_Tex_002570" OutName="tex_002570" Format="ci8" Width="16" Height="16" Offset="0x2570"  TlutOffset="0x770"/>
         <Texture Name="object_kz_Tex_002670" OutName="tex_002670" Format="ci8" Width="32" Height="32" Offset="0x2670"  TlutOffset="0x770"/>
-        <DList Name="object_kz_DL_005920" Offset="0x5920" />
-        <DList Name="object_kz_DL_006420" Offset="0x6420" />
-        <DList Name="object_kz_DL_007298" Offset="0x7298" />
-        <DList Name="object_kz_DL_0074B0" Offset="0x74B0" />
-        <DList Name="object_kz_DL_0076C8" Offset="0x76C8" />
-        <DList Name="object_kz_DL_0079E0" Offset="0x79E0" />
-        <DList Name="object_kz_DL_007C00" Offset="0x7C00" />
-        <DList Name="object_kz_DL_007D40" Offset="0x7D40" />
-        <DList Name="object_kz_DL_008000" Offset="0x8000" />
-        <DList Name="object_kz_DL_008220" Offset="0x8220" />
-        <DList Name="object_kz_DL_008360" Offset="0x8360" />
-        <Limb Name="object_kz_Limb_008620" LimbType="Standard" Offset="0x8620" />
-        <Limb Name="object_kz_Limb_00862C" LimbType="Standard" Offset="0x862C" />
-        <Limb Name="object_kz_Limb_008638" LimbType="Standard" Offset="0x8638" />
-        <Limb Name="object_kz_Limb_008644" LimbType="Standard" Offset="0x8644" />
-        <Limb Name="object_kz_Limb_008650" LimbType="Standard" Offset="0x8650" />
-        <Limb Name="object_kz_Limb_00865C" LimbType="Standard" Offset="0x865C" />
-        <Limb Name="object_kz_Limb_008668" LimbType="Standard" Offset="0x8668" />
-        <Limb Name="object_kz_Limb_008674" LimbType="Standard" Offset="0x8674" />
-        <Limb Name="object_kz_Limb_008680" LimbType="Standard" Offset="0x8680" />
-        <Limb Name="object_kz_Limb_00868C" LimbType="Standard" Offset="0x868C" />
-        <Limb Name="object_kz_Limb_008698" LimbType="Standard" Offset="0x8698" />
-        <Skeleton Name="object_kz_Skel_0086D0" Type="Flex" LimbType="Standard" Offset="0x86D0" />
+        <DList Name="object_kz_DL_005920" Offset="0x5920"/>
+        <DList Name="object_kz_DL_006420" Offset="0x6420"/>
+        <DList Name="object_kz_DL_007298" Offset="0x7298"/>
+        <DList Name="object_kz_DL_0074B0" Offset="0x74B0"/>
+        <DList Name="object_kz_DL_0076C8" Offset="0x76C8"/>
+        <DList Name="object_kz_DL_0079E0" Offset="0x79E0"/>
+        <DList Name="object_kz_DL_007C00" Offset="0x7C00"/>
+        <DList Name="object_kz_DL_007D40" Offset="0x7D40"/>
+        <DList Name="object_kz_DL_008000" Offset="0x8000"/>
+        <DList Name="object_kz_DL_008220" Offset="0x8220"/>
+        <DList Name="object_kz_DL_008360" Offset="0x8360"/>
+        <Limb Name="object_kz_Limb_008620" LimbType="Standard" Offset="0x8620"/>
+        <Limb Name="object_kz_Limb_00862C" LimbType="Standard" Offset="0x862C"/>
+        <Limb Name="object_kz_Limb_008638" LimbType="Standard" Offset="0x8638"/>
+        <Limb Name="object_kz_Limb_008644" LimbType="Standard" Offset="0x8644"/>
+        <Limb Name="object_kz_Limb_008650" LimbType="Standard" Offset="0x8650"/>
+        <Limb Name="object_kz_Limb_00865C" LimbType="Standard" Offset="0x865C"/>
+        <Limb Name="object_kz_Limb_008668" LimbType="Standard" Offset="0x8668"/>
+        <Limb Name="object_kz_Limb_008674" LimbType="Standard" Offset="0x8674"/>
+        <Limb Name="object_kz_Limb_008680" LimbType="Standard" Offset="0x8680"/>
+        <Limb Name="object_kz_Limb_00868C" LimbType="Standard" Offset="0x868C"/>
+        <Limb Name="object_kz_Limb_008698" LimbType="Standard" Offset="0x8698"/>
+        <Skeleton Name="object_kz_Skel_0086D0" Type="Flex" LimbType="Standard" Offset="0x86D0"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_link_child.xml b/assets/xml/objects/object_link_child.xml
index 49e0ad4ed..0e0bd8be3 100644
--- a/assets/xml/objects/object_link_child.xml
+++ b/assets/xml/objects/object_link_child.xml
@@ -43,27 +43,27 @@
         <DList Name="gLinkChildRightForearmNearDL" Offset="0x21FE8"/>
         
         <!--Limbs-->
-        <Limb Name="gLinkChildLimb_02CDC8" Type="LOD" Offset="0x2CDC8"/>
-        <Limb Name="gLinkChildWaistLimb" Type="LOD" Offset="0x2CDD8"/>
-        <Limb Name="gLinkChildLimb_02CDE8" Type="LOD" Offset="0x2CDE8"/>
-        <Limb Name="gLinkChildLeftThighLimb" Type="LOD" Offset="0x2CDF8"/>
-        <Limb Name="gLinkChildLeftShinLimb" Type="LOD" Offset="0x2CE08"/>
-        <Limb Name="gLinkChildLeftFootLimb" Type="LOD" Offset="0x2CE18"/>
-        <Limb Name="gLinkChildRightThighLimb" Type="LOD" Offset="0x2CE28"/>
-        <Limb Name="gLinkChildRightShinLimb" Type="LOD" Offset="0x2CE38"/>
-        <Limb Name="gLinkChildRightFootLimb" Type="LOD" Offset="0x2CE48"/>
-        <Limb Name="gLinkChildLimb_02CE58" Type="LOD" Offset="0x2CE58"/>
-        <Limb Name="gLinkChildHandLimb" Type="LOD" Offset="0x2CE68"/>
-        <Limb Name="gLinkChildHatLimb" Type="LOD" Offset="0x2CE78"/>
-        <Limb Name="gLinkChildCollarLimb" Type="LOD" Offset="0x2CE88"/>
-        <Limb Name="gLinkChildRightSholderLimb" Type="LOD" Offset="0x2CE98"/>
-        <Limb Name="gLinkChildRightForearmLimb" Type="LOD" Offset="0x2CEA8"/>
-        <Limb Name="gLinkChildLeftHandLimb" Type="LOD" Offset="0x2CEB8"/>
-        <Limb Name="gLinkChildLeftSholderLimb" Type="LOD" Offset="0x2CEC8"/>
-        <Limb Name="gLinkChildLeftForearmLimb" Type="LOD" Offset="0x2CED8"/>
-        <Limb Name="gLinkChildRightHandLimb" Type="LOD" Offset="0x2CEE8"/>
-        <Limb Name="gLinkChildSwordAndSheathLimb" Type="LOD" Offset="0x2CEF8"/>
-        <Limb Name="gLinkChildTorsoLimb" Type="LOD" Offset="0x2CF08"/>
+        <Limb Name="gLinkChildLimb_02CDC8" LimbType="LOD" Offset="0x2CDC8"/>
+        <Limb Name="gLinkChildWaistLimb" LimbType="LOD" Offset="0x2CDD8"/>
+        <Limb Name="gLinkChildLimb_02CDE8" LimbType="LOD" Offset="0x2CDE8"/>
+        <Limb Name="gLinkChildLeftThighLimb" LimbType="LOD" Offset="0x2CDF8"/>
+        <Limb Name="gLinkChildLeftShinLimb" LimbType="LOD" Offset="0x2CE08"/>
+        <Limb Name="gLinkChildLeftFootLimb" LimbType="LOD" Offset="0x2CE18"/>
+        <Limb Name="gLinkChildRightThighLimb" LimbType="LOD" Offset="0x2CE28"/>
+        <Limb Name="gLinkChildRightShinLimb" LimbType="LOD" Offset="0x2CE38"/>
+        <Limb Name="gLinkChildRightFootLimb" LimbType="LOD" Offset="0x2CE48"/>
+        <Limb Name="gLinkChildLimb_02CE58" LimbType="LOD" Offset="0x2CE58"/>
+        <Limb Name="gLinkChildHandLimb" LimbType="LOD" Offset="0x2CE68"/>
+        <Limb Name="gLinkChildHatLimb" LimbType="LOD" Offset="0x2CE78"/>
+        <Limb Name="gLinkChildCollarLimb" LimbType="LOD" Offset="0x2CE88"/>
+        <Limb Name="gLinkChildRightSholderLimb" LimbType="LOD" Offset="0x2CE98"/>
+        <Limb Name="gLinkChildRightForearmLimb" LimbType="LOD" Offset="0x2CEA8"/>
+        <Limb Name="gLinkChildLeftHandLimb" LimbType="LOD" Offset="0x2CEB8"/>
+        <Limb Name="gLinkChildLeftSholderLimb" LimbType="LOD" Offset="0x2CEC8"/>
+        <Limb Name="gLinkChildLeftForearmLimb" LimbType="LOD" Offset="0x2CED8"/>
+        <Limb Name="gLinkChildRightHandLimb" LimbType="LOD" Offset="0x2CEE8"/>
+        <Limb Name="gLinkChildSwordAndSheathLimb" LimbType="LOD" Offset="0x2CEF8"/>
+        <Limb Name="gLinkChildTorsoLimb" LimbType="LOD" Offset="0x2CF08"/>
         
         <!--General DLists-->
         <DList Name="gLinkChildLinkDekuStickDL" Offset="0x6CC0"/>
@@ -123,24 +123,24 @@
         <Texture Name="gLinkChildNoseTex" OutName="link_child_nose" Format="ci8" Width="16" Height="16" Offset="0x5000" TlutOffset="0x5500"/>
         <Texture Name="gLinkChildUnusedHandTex" OutName="link_child_unused_hand" Format="ci8" Width="16" Height="16" Offset="0x5100" TlutOffset="0x5500"/>
         <Texture Name="gLinkChildEarTex" OutName="link_child_ear" Format="ci8" Width="16" Height="16" Offset="0x5200" TlutOffset="0x5500"/>
-        <Texture Name="gLinkChildLowerBootTex" OutName="link_child_lower_boot" Format="ci8" Height="16" Width="16" Offset="0x5C00" TlutOffset="0x5300"/>
-        <Texture Name="gLinkChildUnusedBootTex" OutName="link_child_unused_boot" Format="ci8" Height="32" Width="24" Offset="0x5D00" TlutOffset="0x5300"/><!--Unused so hard to verify-->
+        <Texture Name="gLinkChildLowerBootTex" OutName="link_child_lower_boot" Format="ci8" Width="16" Height="16" Offset="0x5C00" TlutOffset="0x5300"/>
+        <Texture Name="gLinkChildUnusedBootTex" OutName="link_child_unused_boot" Format="ci8" Width="24" Height="32" Offset="0x5D00" TlutOffset="0x5300"/><!--Unused so hard to verify-->
         <Texture Name="gLinkChildBootTex" OutName="link_child_boot" Format="ci8" Width="32" Height="32" Offset="0x6000" TlutOffset="0x5300"/>
         <Texture Name="gLinkChildWaistTex" OutName="link_child_waist" Format="i8" Width="32" Height="32" Offset="0x6400"/>
         <Texture Name="gLinkChildBeltTex" OutName="link_child_belt" Format="ci8" Width="8" Height="16" Offset="0x6800" TlutOffset="0x5300"/>
         <Texture Name="gLinkChildBeltClaspTex" OutName="link_child_belt_clasp" Format="ci8" Width="32" Height="16" Offset="0x6880" TlutOffset="0x5300"/>
         <Texture Name="gLinkChildFairyOcarinaTex" OutName="link_child_fairy_ocarina" Format="rgba16" Width="32" Height="16" Offset="0x6E08"/>
-        <Texture Name="gLinkChildDekuShieldBackTex" OutName="link_child_deku_shield_back" Format="rgba16" Height="32" Width="32" Offset="0x7688"/>
+        <Texture Name="gLinkChildDekuShieldBackTex" OutName="link_child_deku_shield_back" Format="rgba16" Width="32" Height="32" Offset="0x7688"/>
         <Texture Name="gLinkChildDekuShieldFrontTex" OutName="link_child_deku_shield_front" Format="rgba16" Width="32" Height="64" Offset="0x7E88"/>
-        <Texture Name="gLinkChildHylianShieldBackTex" OutName="link_child_hylian_shield_back" Format="rgba16" Height="32" Width="16" Offset="0x8E88"/>
+        <Texture Name="gLinkChildHylianShieldBackTex" OutName="link_child_hylian_shield_back" Format="rgba16" Width="16" Height="32" Offset="0x8E88"/>
         <Texture Name="gLinkChildSlingshotTex" OutName="link_child_slingshot" Format="rgba16" Width="16" Height="32" Offset="0x9288"/>
         <Texture Name="gLinkChildSlingshotSeedTex" OutName="link_child_slingshot_seed" Format="rgba16" Width="32" Height="32" Offset="0x9688"/>
         <Texture Name="gLinkChildHandTex" OutName="link_child_hand" Format="ci8" Width="16" Height="16" Offset="0xA1F0" TlutOffset="0x9E88"/>
-        <Texture Name="gLinkChildKokiriSwordSheathTex" OutName="link_child_kokiri_sword_sheath" Format="ci8" Height="16" Width="16" Offset="0xA2F0" TlutOffset="0x9F10"/>
+        <Texture Name="gLinkChildKokiriSwordSheathTex" OutName="link_child_kokiri_sword_sheath" Format="ci8" Width="16" Height="16" Offset="0xA2F0" TlutOffset="0x9F10"/>
         <Texture Name="gLinkChildSwordJewelTex" OutName="link_child_sword_jewel" Format="ci8" Width="32" Height="16" Offset="0xA3F0" TlutOffset="0xA118"/>
-        <Texture Name="gLinkChildMasterSwordPommelTex" OutName="link_child_master_sword_pommel" Format="ci8" Height="16" Width="16" Offset="0xA5F0" TlutOffset="0x9F10"/>
-        <Texture Name="gLinkChildMasterSwordGuardTex" OutName="link_child_master_sword_guard" Format="ci8" Height="32" Width="32" Offset="0xA6F0" TlutOffset="0x9F10"/>
-        <Texture Name="gLinkChildMasterSwordEmblemTex" OutName="link_child_master_sword_emblem" Format="ci8" Height="16" Width="16" Offset="0xAAF0" TlutOffset="0x9F10"/>
+        <Texture Name="gLinkChildMasterSwordPommelTex" OutName="link_child_master_sword_pommel" Format="ci8" Width="16" Height="16" Offset="0xA5F0" TlutOffset="0x9F10"/>
+        <Texture Name="gLinkChildMasterSwordGuardTex" OutName="link_child_master_sword_guard" Format="ci8" Width="32" Height="32" Offset="0xA6F0" TlutOffset="0x9F10"/>
+        <Texture Name="gLinkChildMasterSwordEmblemTex" OutName="link_child_master_sword_emblem" Format="ci8" Width="16" Height="16" Offset="0xAAF0" TlutOffset="0x9F10"/>
         <Texture Name="gLinkChildGoronBraceletTex" OutName="link_child_goron_bracelet" Format="rgba16" Width="8" Height="8" Offset="0x7208"/>
         <Texture Name="gLinkChildGoronSymbolTex" OutName="link_child_goron_symbol" Format="ia16" Width="16" Height="32" Offset="0x7288"/>
 
diff --git a/assets/xml/objects/object_md.xml b/assets/xml/objects/object_md.xml
index 96f6adde2..0c80fb780 100644
--- a/assets/xml/objects/object_md.xml
+++ b/assets/xml/objects/object_md.xml
@@ -4,22 +4,22 @@
         <Skeleton Name="gMidoSkel" Type="Flex" LimbType="Standard" Offset="0x7FB8"/>
 
         <!-- Mido Limbs -->
-        <Limb Name="gMidoRootLimb" Type="Standard" Offset="0x7EB8"/>
-        <Limb Name="gMidoWaistLimb" Type="Standard" Offset="0x7EC4"/>
-        <Limb Name="gMidoLeftThighLimb" Type="Standard" Offset="0x7ED0"/>
-        <Limb Name="gMidoLeftLegLimb" Type="Standard" Offset="0x7EDC"/>
-        <Limb Name="gMidoLeftFootLimb" Type="Standard" Offset="0x7EE8"/>
-        <Limb Name="gMidoRightThighLimb" Type="Standard" Offset="0x7EF4"/>
-        <Limb Name="gMidoRightLegLimb" Type="Standard" Offset="0x7F00"/>
-        <Limb Name="gMidoRightFootLimb" Type="Standard" Offset="0x7F0C"/>
-        <Limb Name="gMidoTorsoLimb" Type="Standard" Offset="0x7F18"/>
-        <Limb Name="gMidoLeftUpperArmLimb" Type="Standard" Offset="0x7F24"/>
-        <Limb Name="gMidoLeftForearmLimb" Type="Standard" Offset="0x7F30"/>
-        <Limb Name="gMidoLeftHandLimb" Type="Standard" Offset="0x7F3C"/>
-        <Limb Name="gMidoRightUpperArmLimb" Type="Standard" Offset="0x7F48"/>
-        <Limb Name="gMidoRightForearmLimb" Type="Standard" Offset="0x7F54"/>
-        <Limb Name="gMidoRightHandLimb" Type="Standard" Offset="0x7F60"/>
-        <Limb Name="gMidoHeadLimb" Type="Standard" Offset="0x7F6C"/>
+        <Limb Name="gMidoRootLimb" LimbType="Standard" Offset="0x7EB8"/>
+        <Limb Name="gMidoWaistLimb" LimbType="Standard" Offset="0x7EC4"/>
+        <Limb Name="gMidoLeftThighLimb" LimbType="Standard" Offset="0x7ED0"/>
+        <Limb Name="gMidoLeftLegLimb" LimbType="Standard" Offset="0x7EDC"/>
+        <Limb Name="gMidoLeftFootLimb" LimbType="Standard" Offset="0x7EE8"/>
+        <Limb Name="gMidoRightThighLimb" LimbType="Standard" Offset="0x7EF4"/>
+        <Limb Name="gMidoRightLegLimb" LimbType="Standard" Offset="0x7F00"/>
+        <Limb Name="gMidoRightFootLimb" LimbType="Standard" Offset="0x7F0C"/>
+        <Limb Name="gMidoTorsoLimb" LimbType="Standard" Offset="0x7F18"/>
+        <Limb Name="gMidoLeftUpperArmLimb" LimbType="Standard" Offset="0x7F24"/>
+        <Limb Name="gMidoLeftForearmLimb" LimbType="Standard" Offset="0x7F30"/>
+        <Limb Name="gMidoLeftHandLimb" LimbType="Standard" Offset="0x7F3C"/>
+        <Limb Name="gMidoRightUpperArmLimb" LimbType="Standard" Offset="0x7F48"/>
+        <Limb Name="gMidoRightForearmLimb" LimbType="Standard" Offset="0x7F54"/>
+        <Limb Name="gMidoRightHandLimb" LimbType="Standard" Offset="0x7F60"/>
+        <Limb Name="gMidoHeadLimb" LimbType="Standard" Offset="0x7F6C"/>
 
         <!-- Mido Limb DisplayLists -->
         <DList Name="gMidoWaistDL" Offset="0x4218"/>
diff --git a/assets/xml/objects/object_mizu_objects.xml b/assets/xml/objects/object_mizu_objects.xml
index de3bdf636..1abd73bc0 100644
--- a/assets/xml/objects/object_mizu_objects.xml
+++ b/assets/xml/objects/object_mizu_objects.xml
@@ -20,7 +20,7 @@
         <DList Name="gObjectMizuObjectsBwallDL_002390" Offset="0x2390"/>
         <Collision Name="gObjectMizuObjectsBwallCol_0025A4" Offset="0x25A4"/>
 
-        <Texture Name="object_mizu_objects_Tex_0035C0" OutName="tex_000035C0" Format="rgba16" Width="32" Height="64" Offset="0x35C0" />
+        <Texture Name="object_mizu_objects_Tex_0035C0" OutName="tex_000035C0" Format="rgba16" Width="32" Height="64" Offset="0x35C0"/>
 
         <DList Name="gWaterTempleDoorDL_0048B0" Offset="0x48B0"/>
         <DList Name="gWaterTempleDoorLeftDL" Offset="0x4958"/>
diff --git a/assets/xml/objects/object_mori_objects.xml b/assets/xml/objects/object_mori_objects.xml
index bc63d2ed3..c81fea92e 100644
--- a/assets/xml/objects/object_mori_objects.xml
+++ b/assets/xml/objects/object_mori_objects.xml
@@ -1,9 +1,9 @@
 <Root>
     <File Name="object_mori_objects" Segment="6">
-        <Texture Name="gMoriHashiraTLUT" OutName="hashira_palette" Width="112" Height="1" Format="rgba16" Offset="0x0000"/>
-        <Texture Name="gMoriHashiraTex" OutName="hashira" Width="32" Height="32" Format="ci8" Offset="0x00E0" TlutOffset="0x0000"/>
-        <Texture Name="gMoriHashigoClaspTLUT" OutName="hashigo_clasp_palette" Width="112" Height="1" Format="rgba16" Offset="0x3810"/>
-        <Texture Name="gMoriHashigoClaspTex" OutName="hashigo_clasp" Width="32" Height="32" Format="ci8" Offset="0x38F0" TlutOffset="0x3810"/>
+        <Texture Name="gMoriHashiraTLUT" OutName="hashira_palette" Format="rgba16" Width="112" Height="1" Offset="0x0000"/>
+        <Texture Name="gMoriHashiraTex" OutName="hashira" Format="ci8" Width="32" Height="32" Offset="0x00E0" TlutOffset="0x0000"/>
+        <Texture Name="gMoriHashigoClaspTLUT" OutName="hashigo_clasp_palette" Format="rgba16" Width="112" Height="1" Offset="0x3810"/>
+        <Texture Name="gMoriHashigoClaspTex" OutName="hashigo_clasp" Format="ci8" Width="32" Height="32" Offset="0x38F0" TlutOffset="0x3810"/>
         <Collision Name="gMoriBigstCol" Offset="0x221C"/>
         <DList Name="gMoriBigstDL" Offset="0x1E50"/>
         <Collision Name="gMoriElevatorCol" Offset="0x35F8"/>
diff --git a/assets/xml/objects/object_ms.xml b/assets/xml/objects/object_ms.xml
index 14dfbc71d..a87d0e6b3 100644
--- a/assets/xml/objects/object_ms.xml
+++ b/assets/xml/objects/object_ms.xml
@@ -4,14 +4,14 @@
         <Skeleton Name="gBeanSalesmanSkel" Type="Flex" LimbType="Standard" Offset="0x3DC0"/>
         
         <!-- Bean Salesman Limbs -->
-        <Limb Name="gBeanSalesmanRootLimb" Type="Standard" Offset="0x3D40"/>
-        <Limb Name="gBeanSalesmanLeftUpperArmLimb" Type="Standard" Offset="0x3D4C"/>
-        <Limb Name="gBeanSalesmanLeftForearmLimb" Type="Standard" Offset="0x3D58"/>
-        <Limb Name="gBeanSalesmanLeftHandLimb" Type="Standard" Offset="0x3D64"/>
-        <Limb Name="gBeanSalesmanHeadLimb" Type="Standard" Offset="0x3D70"/>
-        <Limb Name="gBeanSalesmanMouthLimb" Type="Standard" Offset="0x3D7C"/>
-        <Limb Name="gBeanSalesmanBodyLimb" Type="Standard" Offset="0x3D88"/>
-        <Limb Name="gBeanSalesmanBeanbagLimb" Type="Standard" Offset="0x3D94"/>
+        <Limb Name="gBeanSalesmanRootLimb" LimbType="Standard" Offset="0x3D40"/>
+        <Limb Name="gBeanSalesmanLeftUpperArmLimb" LimbType="Standard" Offset="0x3D4C"/>
+        <Limb Name="gBeanSalesmanLeftForearmLimb" LimbType="Standard" Offset="0x3D58"/>
+        <Limb Name="gBeanSalesmanLeftHandLimb" LimbType="Standard" Offset="0x3D64"/>
+        <Limb Name="gBeanSalesmanHeadLimb" LimbType="Standard" Offset="0x3D70"/>
+        <Limb Name="gBeanSalesmanMouthLimb" LimbType="Standard" Offset="0x3D7C"/>
+        <Limb Name="gBeanSalesmanBodyLimb" LimbType="Standard" Offset="0x3D88"/>
+        <Limb Name="gBeanSalesmanBeanbagLimb" LimbType="Standard" Offset="0x3D94"/>
 
         <!-- Bean Salesman Limb DisplayLists -->
         <DList Name="gBeanSalesmanLeftUpperArmDL" Offset="0x2E58"/>
diff --git a/assets/xml/objects/object_nb.xml b/assets/xml/objects/object_nb.xml
index c4b560cc0..74de9e285 100644
--- a/assets/xml/objects/object_nb.xml
+++ b/assets/xml/objects/object_nb.xml
@@ -5,24 +5,24 @@
         <Skeleton Name="gNabooruSkel" Type="Flex" LimbType="Standard" Offset="0x181C8"/>
 
         <!-- Nabooru Limbs -->
-        <Limb Name="gNabooruRootLimb" Type="Standard" Offset="0x180A8"/>
-        <Limb Name="gNabooruLeftThighLimb" Type="Standard" Offset="0x180B4"/>
-        <Limb Name="gNabooruLeftShinLimb" Type="Standard" Offset="0x180C0"/>
-        <Limb Name="gNabooruLeftFootLimb" Type="Standard" Offset="0x180CC"/>
-        <Limb Name="gNabooruRightThighLimb" Type="Standard" Offset="0x180D8"/>
-        <Limb Name="gNabooruRightShinLimb" Type="Standard" Offset="0x180E4"/>
-        <Limb Name="gNabooruRightFootLimb" Type="Standard" Offset="0x180F0"/>
-        <Limb Name="gNabooruTorsoLimb" Type="Standard" Offset="0x180FC"/>
-        <Limb Name="gNabooruLeftUpperArmLimb" Type="Standard" Offset="0x18108"/>
-        <Limb Name="gNabooruLeftForearmLimb" Type="Standard" Offset="0x18114"/>
-        <Limb Name="gNabooruLeftHandLimb" Type="Standard" Offset="0x18120"/>
-        <Limb Name="gNabooruRightUpperArmLimb" Type="Standard" Offset="0x1812C"/>
-        <Limb Name="gNabooruRightForearmLimb" Type="Standard" Offset="0x18138"/>
-        <Limb Name="gNabooruRightHandLimb" Type="Standard" Offset="0x18144"/>
-        <Limb Name="gNabooruHeadLimb" Type="Standard" Offset="0x18150"/>
-        <Limb Name="gNabooruBlankLimb" Type="Standard" Offset="0x1815C"/>
-        <Limb Name="gNabooruPonytailLimb" Type="Standard" Offset="0x18168"/>
-        <Limb Name="gNabooruWaistLimb" Type="Standard" Offset="0x18174"/>
+        <Limb Name="gNabooruRootLimb" LimbType="Standard" Offset="0x180A8"/>
+        <Limb Name="gNabooruLeftThighLimb" LimbType="Standard" Offset="0x180B4"/>
+        <Limb Name="gNabooruLeftShinLimb" LimbType="Standard" Offset="0x180C0"/>
+        <Limb Name="gNabooruLeftFootLimb" LimbType="Standard" Offset="0x180CC"/>
+        <Limb Name="gNabooruRightThighLimb" LimbType="Standard" Offset="0x180D8"/>
+        <Limb Name="gNabooruRightShinLimb" LimbType="Standard" Offset="0x180E4"/>
+        <Limb Name="gNabooruRightFootLimb" LimbType="Standard" Offset="0x180F0"/>
+        <Limb Name="gNabooruTorsoLimb" LimbType="Standard" Offset="0x180FC"/>
+        <Limb Name="gNabooruLeftUpperArmLimb" LimbType="Standard" Offset="0x18108"/>
+        <Limb Name="gNabooruLeftForearmLimb" LimbType="Standard" Offset="0x18114"/>
+        <Limb Name="gNabooruLeftHandLimb" LimbType="Standard" Offset="0x18120"/>
+        <Limb Name="gNabooruRightUpperArmLimb" LimbType="Standard" Offset="0x1812C"/>
+        <Limb Name="gNabooruRightForearmLimb" LimbType="Standard" Offset="0x18138"/>
+        <Limb Name="gNabooruRightHandLimb" LimbType="Standard" Offset="0x18144"/>
+        <Limb Name="gNabooruHeadLimb" LimbType="Standard" Offset="0x18150"/>
+        <Limb Name="gNabooruBlankLimb" LimbType="Standard" Offset="0x1815C"/>
+        <Limb Name="gNabooruPonytailLimb" LimbType="Standard" Offset="0x18168"/>
+        <Limb Name="gNabooruWaistLimb" LimbType="Standard" Offset="0x18174"/>
 
         <!-- Nabooru Limb DisplayLists -->
         <DList Name="gNabooruHeadMouthOpenDL" Offset="0x13158"/>
diff --git a/assets/xml/objects/object_niw.xml b/assets/xml/objects/object_niw.xml
index 59e61ff58..a74cbe7da 100644
--- a/assets/xml/objects/object_niw.xml
+++ b/assets/xml/objects/object_niw.xml
@@ -4,21 +4,21 @@
         <Skeleton Name="gCuccoSkel" Type="Flex" LimbType="Standard" Offset="0x2530"/>
 
         <!-- Cucco Limbs -->
-        <Limb Name="gCuccoRootLimb" Type="Standard" Offset="0x2440"/>
-        <Limb Name="gCuccoLimb_244C" Type="Standard" Offset="0x244C"/>
-        <Limb Name="gCuccoLimb_2458" Type="Standard" Offset="0x2458"/>
-        <Limb Name="gCuccoTailAndUndersideLimb" Type="Standard" Offset="0x2464"/>
-        <Limb Name="gCuccoLeftFootRootLimb" Type="Standard" Offset="0x2470"/>
-        <Limb Name="gCuccoLeftFootLimb" Type="Standard" Offset="0x247C"/>
-        <Limb Name="gCuccoLeftWingRootLimb" Type="Standard" Offset="0x2488"/>
-        <Limb Name="gCuccoLeftWingLimb" Type="Standard" Offset="0x2494"/>
-        <Limb Name="gCuccoRightFootRootLimb" Type="Standard" Offset="0x24A0"/>
-        <Limb Name="gCuccoRightFootLimb" Type="Standard" Offset="0x24AC"/>
-        <Limb Name="gCuccoRightWingRootLimb" Type="Standard" Offset="0x24B8"/>
-        <Limb Name="gCuccoRightWingLimb" Type="Standard" Offset="0x24C4"/>
-        <Limb Name="gCuccoUpperBodyRootLimb" Type="Standard" Offset="0x24D0"/>
-        <Limb Name="gCuccoNeckLimb" Type="Standard" Offset="0x24DC"/>
-        <Limb Name="gCuccoHeadLimb" Type="Standard" Offset="0x24E8"/>
+        <Limb Name="gCuccoRootLimb" LimbType="Standard" Offset="0x2440"/>
+        <Limb Name="gCuccoLimb_244C" LimbType="Standard" Offset="0x244C"/>
+        <Limb Name="gCuccoLimb_2458" LimbType="Standard" Offset="0x2458"/>
+        <Limb Name="gCuccoTailAndUndersideLimb" LimbType="Standard" Offset="0x2464"/>
+        <Limb Name="gCuccoLeftFootRootLimb" LimbType="Standard" Offset="0x2470"/>
+        <Limb Name="gCuccoLeftFootLimb" LimbType="Standard" Offset="0x247C"/>
+        <Limb Name="gCuccoLeftWingRootLimb" LimbType="Standard" Offset="0x2488"/>
+        <Limb Name="gCuccoLeftWingLimb" LimbType="Standard" Offset="0x2494"/>
+        <Limb Name="gCuccoRightFootRootLimb" LimbType="Standard" Offset="0x24A0"/>
+        <Limb Name="gCuccoRightFootLimb" LimbType="Standard" Offset="0x24AC"/>
+        <Limb Name="gCuccoRightWingRootLimb" LimbType="Standard" Offset="0x24B8"/>
+        <Limb Name="gCuccoRightWingLimb" LimbType="Standard" Offset="0x24C4"/>
+        <Limb Name="gCuccoUpperBodyRootLimb" LimbType="Standard" Offset="0x24D0"/>
+        <Limb Name="gCuccoNeckLimb" LimbType="Standard" Offset="0x24DC"/>
+        <Limb Name="gCuccoHeadLimb" LimbType="Standard" Offset="0x24E8"/>
 
         <!-- Cucco Limb DisplayLists -->
         <DList Name="gCuccoTailAndUndersideDL" Offset="0x0DF0"/>
diff --git a/assets/xml/objects/object_oA11.xml b/assets/xml/objects/object_oA11.xml
index 652d93156..92ae474b6 100644
--- a/assets/xml/objects/object_oA11.xml
+++ b/assets/xml/objects/object_oA11.xml
@@ -3,64 +3,64 @@
         <!-- The commented limbs references dlists past this object size, making ZAPD crash. -->
         <!-- This object is not used in-game. -->
 
-        <Limb Name="object_oA11_Limb_000000" LimbType="Standard" Offset="0x0" />
-        <Limb Name="object_oA11_Limb_00000C" LimbType="Standard" Offset="0xC" />
-        <Limb Name="object_oA11_Limb_000018" LimbType="Standard" Offset="0x18" />
-        <Limb Name="object_oA11_Limb_000024" LimbType="Standard" Offset="0x24" />
-        <Limb Name="object_oA11_Limb_000030" LimbType="Standard" Offset="0x30" />
-        <Limb Name="object_oA11_Limb_00003C" LimbType="Standard" Offset="0x3C" />
-        <Limb Name="object_oA11_Limb_000048" LimbType="Standard" Offset="0x48" />
-        <Limb Name="object_oA11_Limb_000054" LimbType="Standard" Offset="0x54" />
+        <Limb Name="object_oA11_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oA11_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oA11_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oA11_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oA11_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oA11_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oA11_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oA11_Limb_000054" LimbType="Standard" Offset="0x54"/>
         <!--
-        <Limb Name="object_oA11_Limb_000060" LimbType="Standard" Offset="0x60" />
-        <Limb Name="object_oA11_Limb_00006C" LimbType="Standard" Offset="0x6C" />
-        <Limb Name="object_oA11_Limb_00006C" LimbType="Standard" Offset="0x6C" />
-        <Limb Name="object_oA11_Limb_000078" LimbType="Standard" Offset="0x78" />
+        <Limb Name="object_oA11_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oA11_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oA11_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oA11_Limb_000078" LimbType="Standard" Offset="0x78"/>
         -->
-        <Limb Name="object_oA11_Limb_000084" LimbType="Standard" Offset="0x84" />
-        <Limb Name="object_oA11_Limb_000090" LimbType="Standard" Offset="0x90" />
-        <Limb Name="object_oA11_Limb_00009C" LimbType="Standard" Offset="0x9C" />
-        <Limb Name="object_oA11_Limb_0000A8" LimbType="Standard" Offset="0xA8" />
+        <Limb Name="object_oA11_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oA11_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oA11_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oA11_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
         <!--
-        <Limb Name="object_oA11_Limb_0000B4" LimbType="Standard" Offset="0xB4" />
-        <Limb Name="object_oA11_Limb_0000C0" LimbType="Standard" Offset="0xC0" />
-        <Limb Name="object_oA11_Limb_0000CC" LimbType="Standard" Offset="0xCC" />
-        <Limb Name="object_oA11_Limb_0000D8" LimbType="Standard" Offset="0xD8" />
+        <Limb Name="object_oA11_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oA11_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oA11_Limb_0000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oA11_Limb_0000D8" LimbType="Standard" Offset="0xD8"/>
         -->
-        <Limb Name="object_oA11_Limb_0000E4" LimbType="Standard" Offset="0xE4" />
-        <Limb Name="object_oA11_Limb_0000F0" LimbType="Standard" Offset="0xF0" />
-        <Limb Name="object_oA11_Limb_0000FC" LimbType="Standard" Offset="0xFC" />
+        <Limb Name="object_oA11_Limb_0000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oA11_Limb_0000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oA11_Limb_0000FC" LimbType="Standard" Offset="0xFC"/>
         <!--
-        <Limb Name="object_oA11_Limb_000108" LimbType="Standard" Offset="0x108" />
+        <Limb Name="object_oA11_Limb_000108" LimbType="Standard" Offset="0x108"/>
         -->
-        <Limb Name="object_oA11_Limb_000114" LimbType="Standard" Offset="0x114" />
-        <Limb Name="object_oA11_Limb_000120" LimbType="Standard" Offset="0x120" />
-        <Limb Name="object_oA11_Limb_00012C" LimbType="Standard" Offset="0x12C" />
-        <Limb Name="object_oA11_Limb_000138" LimbType="Standard" Offset="0x138" />
-        <Limb Name="object_oA11_Limb_000144" LimbType="Standard" Offset="0x144" />
-        <Limb Name="object_oA11_Limb_000150" LimbType="Standard" Offset="0x150" />
-        <Limb Name="object_oA11_Limb_00015C" LimbType="Standard" Offset="0x15C" />
-        <Limb Name="object_oA11_Limb_000168" LimbType="Standard" Offset="0x168" />
-        <Limb Name="object_oA11_Limb_000174" LimbType="Standard" Offset="0x174" />
-        <Limb Name="object_oA11_Limb_000180" LimbType="Standard" Offset="0x180" />
-        <Limb Name="object_oA11_Limb_00018C" LimbType="Standard" Offset="0x18C" />
-        <Limb Name="object_oA11_Limb_000198" LimbType="Standard" Offset="0x198" />
-        <Limb Name="object_oA11_Limb_0001A4" LimbType="Standard" Offset="0x1A4" />
-        <Limb Name="object_oA11_Limb_0001B0" LimbType="Standard" Offset="0x1B0" />
-        <Limb Name="object_oA11_Limb_0001BC" LimbType="Standard" Offset="0x1BC" />
+        <Limb Name="object_oA11_Limb_000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oA11_Limb_000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oA11_Limb_00012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oA11_Limb_000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oA11_Limb_000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oA11_Limb_000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oA11_Limb_00015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oA11_Limb_000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oA11_Limb_000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oA11_Limb_000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oA11_Limb_00018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oA11_Limb_000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oA11_Limb_0001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oA11_Limb_0001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oA11_Limb_0001BC" LimbType="Standard" Offset="0x1BC"/>
         <!--
-        <Skeleton Name="object_oA11_Skel_000260" Type="Normal" LimbType="Standard" Offset="0x260" />
+        <Skeleton Name="object_oA11_Skel_000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
         -->
-        <DList Name="object_oA11_DL_000A58" Offset="0xA58" />
-        <DList Name="object_oA11_DL_000BA8" Offset="0xBA8" />
-        <DList Name="object_oA11_DL_000C40" Offset="0xC40" />
-        <DList Name="object_oA11_DL_000D28" Offset="0xD28" />
-        <DList Name="object_oA11_DL_000DD0" Offset="0xDD0" />
-        <DList Name="object_oA11_DL_000EF0" Offset="0xEF0" />
-        <DList Name="object_oA11_DL_000FD8" Offset="0xFD8" />
-        <Texture Name="object_oA11_Tex_001080" OutName="tex_00001080" Format="rgba16" Width="8" Height="8" Offset="0x1080" />
-        <Texture Name="object_oA11_Tex_001100" OutName="tex_00001100" Format="i4" Width="16" Height="8" Offset="0x1100" />
-        <Texture Name="object_oA11_Tex_001140" OutName="tex_00001140" Format="rgba16" Width="16" Height="32" Offset="0x1140" />
-        <Texture Name="object_oA11_Tex_001540" OutName="tex_00001540" Format="rgba16" Width="8" Height="8" Offset="0x1540" />
+        <DList Name="object_oA11_DL_000A58" Offset="0xA58"/>
+        <DList Name="object_oA11_DL_000BA8" Offset="0xBA8"/>
+        <DList Name="object_oA11_DL_000C40" Offset="0xC40"/>
+        <DList Name="object_oA11_DL_000D28" Offset="0xD28"/>
+        <DList Name="object_oA11_DL_000DD0" Offset="0xDD0"/>
+        <DList Name="object_oA11_DL_000EF0" Offset="0xEF0"/>
+        <DList Name="object_oA11_DL_000FD8" Offset="0xFD8"/>
+        <Texture Name="object_oA11_Tex_001080" OutName="tex_00001080" Format="rgba16" Width="8" Height="8" Offset="0x1080"/>
+        <Texture Name="object_oA11_Tex_001100" OutName="tex_00001100" Format="i4" Width="16" Height="8" Offset="0x1100"/>
+        <Texture Name="object_oA11_Tex_001140" OutName="tex_00001140" Format="rgba16" Width="16" Height="32" Offset="0x1140"/>
+        <Texture Name="object_oA11_Tex_001540" OutName="tex_00001540" Format="rgba16" Width="8" Height="8" Offset="0x1540"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_oB2.xml b/assets/xml/objects/object_oB2.xml
index 32e60fd1c..230783cea 100644
--- a/assets/xml/objects/object_oB2.xml
+++ b/assets/xml/objects/object_oB2.xml
@@ -3,74 +3,74 @@
         <!-- The commented limbs references dlists in a wrong offset, making ZAPD crash. -->
         <!-- This object is not used in-game. -->
 
-        <Limb Name="object_oB2_Limb_000000" LimbType="Standard" Offset="0x0" />
-        <Limb Name="object_oB2_Limb_00000C" LimbType="Standard" Offset="0xC" />
-        <Limb Name="object_oB2_Limb_000018" LimbType="Standard" Offset="0x18" />
-        <Limb Name="object_oB2_Limb_000024" LimbType="Standard" Offset="0x24" />
-        <Limb Name="object_oB2_Limb_000030" LimbType="Standard" Offset="0x30" />
-        <Limb Name="object_oB2_Limb_00003C" LimbType="Standard" Offset="0x3C" />
-        <Limb Name="object_oB2_Limb_000048" LimbType="Standard" Offset="0x48" />
-        <Limb Name="object_oB2_Limb_000054" LimbType="Standard" Offset="0x54" />
+        <Limb Name="object_oB2_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oB2_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oB2_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oB2_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oB2_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oB2_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oB2_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oB2_Limb_000054" LimbType="Standard" Offset="0x54"/>
         <!--
-        <Limb Name="object_oB2_Limb_000060" LimbType="Standard" Offset="0x60" />
-        <Limb Name="object_oB2_Limb_00006C" LimbType="Standard" Offset="0x6C" />
-        <Limb Name="object_oB2_Limb_000078" LimbType="Standard" Offset="0x78" />
+        <Limb Name="object_oB2_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oB2_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oB2_Limb_000078" LimbType="Standard" Offset="0x78"/>
         -->
-        <Limb Name="object_oB2_Limb_000084" LimbType="Standard" Offset="0x84" />
-        <Limb Name="object_oB2_Limb_000090" LimbType="Standard" Offset="0x90" />
-        <Limb Name="object_oB2_Limb_00009C" LimbType="Standard" Offset="0x9C" />
-        <Limb Name="object_oB2_Limb_0000A8" LimbType="Standard" Offset="0xA8" />
+        <Limb Name="object_oB2_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oB2_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oB2_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oB2_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
         <!--
-        <Limb Name="object_oB2_Limb_0000B4" LimbType="Standard" Offset="0xB4" />
-        <Limb Name="object_oB2_Limb_0000C0" LimbType="Standard" Offset="0xC0" />
-        <Limb Name="object_oB2_Limb_0000CC" LimbType="Standard" Offset="0xCC" />
-        <Limb Name="object_oB2_Limb_0000D8" LimbType="Standard" Offset="0xD8" />
+        <Limb Name="object_oB2_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oB2_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oB2_Limb_0000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oB2_Limb_0000D8" LimbType="Standard" Offset="0xD8"/>
         -->
-        <Limb Name="object_oB2_Limb_0000E4" LimbType="Standard" Offset="0xE4" />
-        <Limb Name="object_oB2_Limb_0000F0" LimbType="Standard" Offset="0xF0" />
-        <Limb Name="object_oB2_Limb_0000FC" LimbType="Standard" Offset="0xFC" />
+        <Limb Name="object_oB2_Limb_0000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oB2_Limb_0000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oB2_Limb_0000FC" LimbType="Standard" Offset="0xFC"/>
         <!--
-        <Limb Name="object_oB2_Limb_000108" LimbType="Standard" Offset="0x108" />
+        <Limb Name="object_oB2_Limb_000108" LimbType="Standard" Offset="0x108"/>
         -->
-        <Limb Name="object_oB2_Limb_000114" LimbType="Standard" Offset="0x114" />
-        <Limb Name="object_oB2_Limb_000120" LimbType="Standard" Offset="0x120" />
-        <Limb Name="object_oB2_Limb_00012C" LimbType="Standard" Offset="0x12C" />
-        <Limb Name="object_oB2_Limb_000138" LimbType="Standard" Offset="0x138" />
+        <Limb Name="object_oB2_Limb_000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oB2_Limb_000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oB2_Limb_00012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oB2_Limb_000138" LimbType="Standard" Offset="0x138"/>
         <!--
-        <Limb Name="object_oB2_Limb_000144" LimbType="Standard" Offset="0x144" />
-        <Limb Name="object_oB2_Limb_000150" LimbType="Standard" Offset="0x150" />
-        <Limb Name="object_oB2_Limb_00015C" LimbType="Standard" Offset="0x15C" />
+        <Limb Name="object_oB2_Limb_000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oB2_Limb_000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oB2_Limb_00015C" LimbType="Standard" Offset="0x15C"/>
         -->
-        <Limb Name="object_oB2_Limb_000168" LimbType="Standard" Offset="0x168" />
-        <Limb Name="object_oB2_Limb_000174" LimbType="Standard" Offset="0x174" />
-        <Limb Name="object_oB2_Limb_000180" LimbType="Standard" Offset="0x180" />
-        <Limb Name="object_oB2_Limb_00018C" LimbType="Standard" Offset="0x18C" />
+        <Limb Name="object_oB2_Limb_000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oB2_Limb_000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oB2_Limb_000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oB2_Limb_00018C" LimbType="Standard" Offset="0x18C"/>
         <!--
-        <Limb Name="object_oB2_Limb_000198" LimbType="Standard" Offset="0x198" />
-        <Limb Name="object_oB2_Limb_0001A4" LimbType="Standard" Offset="0x1A4" />
-        <Limb Name="object_oB2_Limb_0001B0" LimbType="Standard" Offset="0x1B0" />
-        <Limb Name="object_oB2_Limb_0001BC" LimbType="Standard" Offset="0x1BC" />
+        <Limb Name="object_oB2_Limb_000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oB2_Limb_0001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oB2_Limb_0001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oB2_Limb_0001BC" LimbType="Standard" Offset="0x1BC"/>
         -->
         <!--
-        <Skeleton Name="object_oB2_Skel_000260" Type="Normal" LimbType="Standard" Offset="0x260" />
+        <Skeleton Name="object_oB2_Skel_000260" Type="Normal" LimbType="Standard" Offset="0x260"/>
         -->
-        <DList Name="object_oB2_DL_001F68" Offset="0x1F68" />
-        <DList Name="object_oB2_DL_0021D0" Offset="0x21D0" />
-        <DList Name="object_oB2_DL_002450" Offset="0x2450" />
-        <DList Name="object_oB2_DL_0025B8" Offset="0x25B8" />
-        <DList Name="object_oB2_DL_002678" Offset="0x2678" />
-        <DList Name="object_oB2_DL_002758" Offset="0x2758" />
-        <DList Name="object_oB2_DL_0028B8" Offset="0x28B8" />
-        <DList Name="object_oB2_DL_002978" Offset="0x2978" />
-        <Texture Name="object_oB2_Tex_002A58" OutName="tex_00002A58" Format="rgba16" Width="16" Height="16" Offset="0x2A58" />
-        <Texture Name="object_oB2_Tex_002C58" OutName="tex_00002C58" Format="rgba16" Width="8" Height="8" Offset="0x2C58" />
-        <Texture Name="object_oB2_Tex_002CD8" OutName="tex_00002CD8" Format="rgba16" Width="32" Height="16" Offset="0x2CD8" />
-        <Texture Name="object_oB2_Tex_0030D8" OutName="tex_000030D8" Format="rgba16" Width="16" Height="8" Offset="0x30D8" />
-        <Texture Name="object_oB2_Tex_0031D8" OutName="tex_000031D8" Format="rgba16" Width="32" Height="32" Offset="0x31D8" />
-        <Texture Name="object_oB2_Tex_0039D8" OutName="tex_000039D8" Format="rgba16" Width="16" Height="16" Offset="0x39D8" />
-        <Texture Name="object_oB2_Tex_003BD8" OutName="tex_00003BD8" Format="rgba16" Width="8" Height="8" Offset="0x3BD8" />
-        <Texture Name="object_oB2_Tex_003C58" OutName="tex_00003C58" Format="rgba16" Width="16" Height="16" Offset="0x3C58" />
-        <Texture Name="object_oB2_Tex_003E58" OutName="tex_00003E58" Format="rgba16" Width="16" Height="16" Offset="0x3E58" />
-        <Texture Name="object_oB2_Tex_004058" OutName="tex_00004058" Format="rgba16" Width="8" Height="8" Offset="0x4058" />
+        <DList Name="object_oB2_DL_001F68" Offset="0x1F68"/>
+        <DList Name="object_oB2_DL_0021D0" Offset="0x21D0"/>
+        <DList Name="object_oB2_DL_002450" Offset="0x2450"/>
+        <DList Name="object_oB2_DL_0025B8" Offset="0x25B8"/>
+        <DList Name="object_oB2_DL_002678" Offset="0x2678"/>
+        <DList Name="object_oB2_DL_002758" Offset="0x2758"/>
+        <DList Name="object_oB2_DL_0028B8" Offset="0x28B8"/>
+        <DList Name="object_oB2_DL_002978" Offset="0x2978"/>
+        <Texture Name="object_oB2_Tex_002A58" OutName="tex_00002A58" Format="rgba16" Width="16" Height="16" Offset="0x2A58"/>
+        <Texture Name="object_oB2_Tex_002C58" OutName="tex_00002C58" Format="rgba16" Width="8" Height="8" Offset="0x2C58"/>
+        <Texture Name="object_oB2_Tex_002CD8" OutName="tex_00002CD8" Format="rgba16" Width="32" Height="16" Offset="0x2CD8"/>
+        <Texture Name="object_oB2_Tex_0030D8" OutName="tex_000030D8" Format="rgba16" Width="16" Height="8" Offset="0x30D8"/>
+        <Texture Name="object_oB2_Tex_0031D8" OutName="tex_000031D8" Format="rgba16" Width="32" Height="32" Offset="0x31D8"/>
+        <Texture Name="object_oB2_Tex_0039D8" OutName="tex_000039D8" Format="rgba16" Width="16" Height="16" Offset="0x39D8"/>
+        <Texture Name="object_oB2_Tex_003BD8" OutName="tex_00003BD8" Format="rgba16" Width="8" Height="8" Offset="0x3BD8"/>
+        <Texture Name="object_oB2_Tex_003C58" OutName="tex_00003C58" Format="rgba16" Width="16" Height="16" Offset="0x3C58"/>
+        <Texture Name="object_oB2_Tex_003E58" OutName="tex_00003E58" Format="rgba16" Width="16" Height="16" Offset="0x3E58"/>
+        <Texture Name="object_oB2_Tex_004058" OutName="tex_00004058" Format="rgba16" Width="8" Height="8" Offset="0x4058"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_oE1s.xml b/assets/xml/objects/object_oE1s.xml
index 2409ad311..faf6ab734 100644
--- a/assets/xml/objects/object_oE1s.xml
+++ b/assets/xml/objects/object_oE1s.xml
@@ -1,50 +1,50 @@
 <Root>
     <File Name="object_oE1s" Segment="6">
-        <Animation Name="object_oE1s_Anim_00007C" Offset="0x7C" />
-        <Limb Name="object_oE1s_Limb_000090" LimbType="Standard" Offset="0x90" />
-        <Limb Name="object_oE1s_Limb_00009C" LimbType="Standard" Offset="0x9C" />
-        <Limb Name="object_oE1s_Limb_0000A8" LimbType="Standard" Offset="0xA8" />
-        <Limb Name="object_oE1s_Limb_0000B4" LimbType="Standard" Offset="0xB4" />
-        <Limb Name="object_oE1s_Limb_0000C0" LimbType="Standard" Offset="0xC0" />
-        <Limb Name="object_oE1s_Limb_0000CC" LimbType="Standard" Offset="0xCC" />
-        <Limb Name="object_oE1s_Limb_0000D8" LimbType="Standard" Offset="0xD8" />
-        <Limb Name="object_oE1s_Limb_0000E4" LimbType="Standard" Offset="0xE4" />
-        <Limb Name="object_oE1s_Limb_0000F0" LimbType="Standard" Offset="0xF0" />
-        <Limb Name="object_oE1s_Limb_0000FC" LimbType="Standard" Offset="0xFC" />
-        <Limb Name="object_oE1s_Limb_000108" LimbType="Standard" Offset="0x108" />
-        <Limb Name="object_oE1s_Limb_000114" LimbType="Standard" Offset="0x114" />
-        <Limb Name="object_oE1s_Limb_000120" LimbType="Standard" Offset="0x120" />
-        <Limb Name="object_oE1s_Limb_00012C" LimbType="Standard" Offset="0x12C" />
-        <Limb Name="object_oE1s_Limb_000138" LimbType="Standard" Offset="0x138" />
-        <Limb Name="object_oE1s_Limb_000144" LimbType="Standard" Offset="0x144" />
-        <Skeleton Name="object_oE1s_Skel_000190" Type="Flex" LimbType="Standard" Offset="0x190" />
+        <Animation Name="object_oE1s_Anim_00007C" Offset="0x7C"/>
+        <Limb Name="object_oE1s_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oE1s_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oE1s_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oE1s_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oE1s_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oE1s_Limb_0000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oE1s_Limb_0000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oE1s_Limb_0000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oE1s_Limb_0000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oE1s_Limb_0000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oE1s_Limb_000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oE1s_Limb_000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oE1s_Limb_000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oE1s_Limb_00012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oE1s_Limb_000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oE1s_Limb_000144" LimbType="Standard" Offset="0x144"/>
+        <Skeleton Name="object_oE1s_Skel_000190" Type="Flex" LimbType="Standard" Offset="0x190"/>
         <!--Blob Name="object_oE1s_Blob_00019C" Size="0x204" Offset="0x19C" /-->
-        <Texture Name="object_oE1s_TLUT_0003A0" OutName="tlut_000003A0" Format="rgba16" Width="108" Height="1" Offset="0x3A0" />
+        <Texture Name="object_oE1s_TLUT_0003A0" OutName="tlut_000003A0" Format="rgba16" Width="108" Height="1" Offset="0x3A0"/>
         <!--Blob Name="object_oE1s_Blob_0005A0" Size="0x2D8" Offset="0x5A0" /-->
         <Texture Name="object_oE1s_Tex_000878" OutName="tex_00000878" Format="ci8" Width="8" Height="8" Offset="0x878"  TlutOffset="0x3A0"/>
-        <Texture Name="object_oE1s_Tex_0008B8" OutName="tex_000008B8" Format="rgba16" Width="16" Height="32" Offset="0x8B8" />
-        <Texture Name="object_oE1s_Tex_000CB8" OutName="tex_00000CB8" Format="rgba16" Width="32" Height="32" Offset="0xCB8" />
+        <Texture Name="object_oE1s_Tex_0008B8" OutName="tex_000008B8" Format="rgba16" Width="16" Height="32" Offset="0x8B8"/>
+        <Texture Name="object_oE1s_Tex_000CB8" OutName="tex_00000CB8" Format="rgba16" Width="32" Height="32" Offset="0xCB8"/>
         <Texture Name="object_oE1s_Tex_0014B8" OutName="tex_000014B8" Format="ci8" Width="16" Height="16" Offset="0x14B8"  TlutOffset="0x3A0"/>
-        <Texture Name="object_oE1s_Tex_0015B8" OutName="tex_000015B8" Format="i4" Width="16" Height="8" Offset="0x15B8" />
-        <Blob Name="object_oE1s_Blob_0015F8" Size="0x400" Offset="0x15F8" />
-        <Texture Name="object_oE1s_Tex_0019F8" OutName="tex_000019F8" Format="i4" Width="16" Height="16" Offset="0x19F8" />
-        <Texture Name="object_oE1s_Tex_001A78" OutName="tex_00001A78" Format="rgba16" Width="16" Height="8" Offset="0x1A78" />
+        <Texture Name="object_oE1s_Tex_0015B8" OutName="tex_000015B8" Format="i4" Width="16" Height="8" Offset="0x15B8"/>
+        <Blob Name="object_oE1s_Blob_0015F8" Size="0x400" Offset="0x15F8"/>
+        <Texture Name="object_oE1s_Tex_0019F8" OutName="tex_000019F8" Format="i4" Width="16" Height="16" Offset="0x19F8"/>
+        <Texture Name="object_oE1s_Tex_001A78" OutName="tex_00001A78" Format="rgba16" Width="16" Height="8" Offset="0x1A78"/>
         <Texture Name="object_oE1s_Tex_001B78" OutName="tex_00001B78" Format="ci8" Width="16" Height="16" Offset="0x1B78"  TlutOffset="0x3A0"/>
-        <Blob Name="object_oE1s_Blob_001C78" Size="0x400" Offset="0x1C78" />
-        <DList Name="object_oE1s_DL_004D98" Offset="0x4D98" />
-        <DList Name="object_oE1s_DL_005010" Offset="0x5010" />
-        <DList Name="object_oE1s_DL_005150" Offset="0x5150" />
-        <DList Name="object_oE1s_DL_005620" Offset="0x5620" />
-        <DList Name="object_oE1s_DL_005808" Offset="0x5808" />
-        <DList Name="object_oE1s_DL_005970" Offset="0x5970" />
-        <DList Name="object_oE1s_DL_005AE8" Offset="0x5AE8" />
-        <DList Name="object_oE1s_DL_005BA0" Offset="0x5BA0" />
-        <DList Name="object_oE1s_DL_005CF0" Offset="0x5CF0" />
-        <DList Name="object_oE1s_DL_005DC0" Offset="0x5DC0" />
-        <DList Name="object_oE1s_DL_005FA8" Offset="0x5FA8" />
-        <DList Name="object_oE1s_DL_006110" Offset="0x6110" />
-        <DList Name="object_oE1s_DL_006288" Offset="0x6288" />
-        <DList Name="object_oE1s_DL_006340" Offset="0x6340" />
-        <DList Name="object_oE1s_DL_006490" Offset="0x6490" />
+        <Blob Name="object_oE1s_Blob_001C78" Size="0x400" Offset="0x1C78"/>
+        <DList Name="object_oE1s_DL_004D98" Offset="0x4D98"/>
+        <DList Name="object_oE1s_DL_005010" Offset="0x5010"/>
+        <DList Name="object_oE1s_DL_005150" Offset="0x5150"/>
+        <DList Name="object_oE1s_DL_005620" Offset="0x5620"/>
+        <DList Name="object_oE1s_DL_005808" Offset="0x5808"/>
+        <DList Name="object_oE1s_DL_005970" Offset="0x5970"/>
+        <DList Name="object_oE1s_DL_005AE8" Offset="0x5AE8"/>
+        <DList Name="object_oE1s_DL_005BA0" Offset="0x5BA0"/>
+        <DList Name="object_oE1s_DL_005CF0" Offset="0x5CF0"/>
+        <DList Name="object_oE1s_DL_005DC0" Offset="0x5DC0"/>
+        <DList Name="object_oE1s_DL_005FA8" Offset="0x5FA8"/>
+        <DList Name="object_oE1s_DL_006110" Offset="0x6110"/>
+        <DList Name="object_oE1s_DL_006288" Offset="0x6288"/>
+        <DList Name="object_oE1s_DL_006340" Offset="0x6340"/>
+        <DList Name="object_oE1s_DL_006490" Offset="0x6490"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_oE5.xml b/assets/xml/objects/object_oE5.xml
index b5bd5b6e5..f5edf745a 100644
--- a/assets/xml/objects/object_oE5.xml
+++ b/assets/xml/objects/object_oE5.xml
@@ -1,64 +1,64 @@
 <Root>
     <File Name="object_oE5" Segment="6">
-        <!--<Limb Name="object_oE5_Limb_000000" LimbType="Standard" Offset="0x0" />
-        <Limb Name="object_oE5_Limb_00000C" LimbType="Standard" Offset="0xC" />
-        <Limb Name="object_oE5_Limb_000018" LimbType="Standard" Offset="0x18" />
-        <Limb Name="object_oE5_Limb_000024" LimbType="Standard" Offset="0x24" />
-        <Limb Name="object_oE5_Limb_000030" LimbType="Standard" Offset="0x30" />
-        <Limb Name="object_oE5_Limb_00003C" LimbType="Standard" Offset="0x3C" />
-        <Limb Name="object_oE5_Limb_000048" LimbType="Standard" Offset="0x48" />
-        <Limb Name="object_oE5_Limb_000054" LimbType="Standard" Offset="0x54" />
-        <Limb Name="object_oE5_Limb_000060" LimbType="Standard" Offset="0x60" />
-        <Limb Name="object_oE5_Limb_00006C" LimbType="Standard" Offset="0x6C" />
-        <Limb Name="object_oE5_Limb_000078" LimbType="Standard" Offset="0x78" />
-        <Limb Name="object_oE5_Limb_000084" LimbType="Standard" Offset="0x84" />
-        <Limb Name="object_oE5_Limb_000090" LimbType="Standard" Offset="0x90" />
-        <Limb Name="object_oE5_Limb_00009C" LimbType="Standard" Offset="0x9C" />
-        <Limb Name="object_oE5_Limb_0000A8" LimbType="Standard" Offset="0xA8" />
-        <Limb Name="object_oE5_Limb_0000B4" LimbType="Standard" Offset="0xB4" />
-        <Limb Name="object_oE5_Limb_0000C0" LimbType="Standard" Offset="0xC0" />
-        <Limb Name="object_oE5_Limb_0000CC" LimbType="Standard" Offset="0xCC" />
-        <Limb Name="object_oE5_Limb_0000D8" LimbType="Standard" Offset="0xD8" />
-        <Limb Name="object_oE5_Limb_0000E4" LimbType="Standard" Offset="0xE4" />
-        <Limb Name="object_oE5_Limb_0000F0" LimbType="Standard" Offset="0xF0" />
-        <Limb Name="object_oE5_Limb_0000FC" LimbType="Standard" Offset="0xFC" />
-        <Limb Name="object_oE5_Limb_000108" LimbType="Standard" Offset="0x108" />
-        <Limb Name="object_oE5_Limb_000114" LimbType="Standard" Offset="0x114" />
-        <Limb Name="object_oE5_Limb_000120" LimbType="Standard" Offset="0x120" />
-        <Limb Name="object_oE5_Limb_00012C" LimbType="Standard" Offset="0x12C" />
-        <Limb Name="object_oE5_Limb_000138" LimbType="Standard" Offset="0x138" />
-        <Limb Name="object_oE5_Limb_000144" LimbType="Standard" Offset="0x144" />
-        <Limb Name="object_oE5_Limb_000150" LimbType="Standard" Offset="0x150" />
-        <Limb Name="object_oE5_Limb_00015C" LimbType="Standard" Offset="0x15C" />
-        <Limb Name="object_oE5_Limb_000168" LimbType="Standard" Offset="0x168" />
-        <Limb Name="object_oE5_Limb_000174" LimbType="Standard" Offset="0x174" />
-        <Limb Name="object_oE5_Limb_000180" LimbType="Standard" Offset="0x180" />
-        <Limb Name="object_oE5_Limb_00018C" LimbType="Standard" Offset="0x18C" />
-        <Limb Name="object_oE5_Limb_000198" LimbType="Standard" Offset="0x198" />
-        <Limb Name="object_oE5_Limb_0001A4" LimbType="Standard" Offset="0x1A4" />
-        <Limb Name="object_oE5_Limb_0001B0" LimbType="Standard" Offset="0x1B0" />
-        <Limb Name="object_oE5_Limb_0001BC" LimbType="Standard" Offset="0x1BC" />
-        <Skeleton Name="object_oE5_Skel_000260" Type="Normal" LimbType="Standard" Offset="0x260" />-->
-        <DList Name="object_oE5_DL_0024E8" Offset="0x24E8" />
-        <DList Name="object_oE5_DL_002690" Offset="0x2690" />
-        <DList Name="object_oE5_DL_002C60" Offset="0x2C60" />
-        <DList Name="object_oE5_DL_002E10" Offset="0x2E10" />
-        <DList Name="object_oE5_DL_002F00" Offset="0x2F00" />
-        <DList Name="object_oE5_DL_003050" Offset="0x3050" />
-        <DList Name="object_oE5_DL_003200" Offset="0x3200" />
-        <DList Name="object_oE5_DL_0032F0" Offset="0x32F0" />
-        <Texture Name="object_oE5_TLUT_003440" OutName="tlut_00003440" Format="rgba16" Width="16" Height="16" Offset="0x3440" />
+        <!--<Limb Name="object_oE5_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oE5_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oE5_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oE5_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oE5_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oE5_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oE5_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oE5_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oE5_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oE5_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oE5_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oE5_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oE5_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oE5_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oE5_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oE5_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oE5_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
+        <Limb Name="object_oE5_Limb_0000CC" LimbType="Standard" Offset="0xCC"/>
+        <Limb Name="object_oE5_Limb_0000D8" LimbType="Standard" Offset="0xD8"/>
+        <Limb Name="object_oE5_Limb_0000E4" LimbType="Standard" Offset="0xE4"/>
+        <Limb Name="object_oE5_Limb_0000F0" LimbType="Standard" Offset="0xF0"/>
+        <Limb Name="object_oE5_Limb_0000FC" LimbType="Standard" Offset="0xFC"/>
+        <Limb Name="object_oE5_Limb_000108" LimbType="Standard" Offset="0x108"/>
+        <Limb Name="object_oE5_Limb_000114" LimbType="Standard" Offset="0x114"/>
+        <Limb Name="object_oE5_Limb_000120" LimbType="Standard" Offset="0x120"/>
+        <Limb Name="object_oE5_Limb_00012C" LimbType="Standard" Offset="0x12C"/>
+        <Limb Name="object_oE5_Limb_000138" LimbType="Standard" Offset="0x138"/>
+        <Limb Name="object_oE5_Limb_000144" LimbType="Standard" Offset="0x144"/>
+        <Limb Name="object_oE5_Limb_000150" LimbType="Standard" Offset="0x150"/>
+        <Limb Name="object_oE5_Limb_00015C" LimbType="Standard" Offset="0x15C"/>
+        <Limb Name="object_oE5_Limb_000168" LimbType="Standard" Offset="0x168"/>
+        <Limb Name="object_oE5_Limb_000174" LimbType="Standard" Offset="0x174"/>
+        <Limb Name="object_oE5_Limb_000180" LimbType="Standard" Offset="0x180"/>
+        <Limb Name="object_oE5_Limb_00018C" LimbType="Standard" Offset="0x18C"/>
+        <Limb Name="object_oE5_Limb_000198" LimbType="Standard" Offset="0x198"/>
+        <Limb Name="object_oE5_Limb_0001A4" LimbType="Standard" Offset="0x1A4"/>
+        <Limb Name="object_oE5_Limb_0001B0" LimbType="Standard" Offset="0x1B0"/>
+        <Limb Name="object_oE5_Limb_0001BC" LimbType="Standard" Offset="0x1BC"/>
+        <Skeleton Name="object_oE5_Skel_000260" Type="Normal" LimbType="Standard" Offset="0x260"/>-->
+        <DList Name="object_oE5_DL_0024E8" Offset="0x24E8"/>
+        <DList Name="object_oE5_DL_002690" Offset="0x2690"/>
+        <DList Name="object_oE5_DL_002C60" Offset="0x2C60"/>
+        <DList Name="object_oE5_DL_002E10" Offset="0x2E10"/>
+        <DList Name="object_oE5_DL_002F00" Offset="0x2F00"/>
+        <DList Name="object_oE5_DL_003050" Offset="0x3050"/>
+        <DList Name="object_oE5_DL_003200" Offset="0x3200"/>
+        <DList Name="object_oE5_DL_0032F0" Offset="0x32F0"/>
+        <Texture Name="object_oE5_TLUT_003440" OutName="tlut_00003440" Format="rgba16" Width="16" Height="16" Offset="0x3440"/>
         <Texture Name="object_oE5_Tex_003640" OutName="tex_00003640" Format="ci8" Width="32" Height="32" Offset="0x3640"  TlutOffset="0x3440"/>
-        <Blob Name="object_oE5_Blob_003A40" Size="0x800" Offset="0x3A40" />
-        <Texture Name="object_oE5_TLUT_004240" OutName="tlut_00004240" Format="rgba16" Width="16" Height="16" Offset="0x4240" />
+        <Blob Name="object_oE5_Blob_003A40" Size="0x800" Offset="0x3A40"/>
+        <Texture Name="object_oE5_TLUT_004240" OutName="tlut_00004240" Format="rgba16" Width="16" Height="16" Offset="0x4240"/>
         <Texture Name="object_oE5_Tex_004440" OutName="tex_00004440" Format="ci8" Width="8" Height="8" Offset="0x4440"  TlutOffset="0x4240"/>
         <Texture Name="object_oE5_Tex_004480" OutName="tex_00004480" Format="ci8" Width="16" Height="16" Offset="0x4480"  TlutOffset="0x4240"/>
         <Texture Name="object_oE5_Tex_004580" OutName="tex_00004580" Format="ci8" Width="16" Height="16" Offset="0x4580"  TlutOffset="0x4240"/>
-        <Texture Name="object_oE5_Tex_004680" OutName="tex_00004680" Format="rgba16" Width="32" Height="16" Offset="0x4680" />
-        <Texture Name="object_oE5_Tex_004A80" OutName="tex_00004A80" Format="rgba16" Width="8" Height="16" Offset="0x4A80" />
-        <Texture Name="object_oE5_Tex_004B80" OutName="tex_00004B80" Format="i4" Width="16" Height="8" Offset="0x4B80" />
-        <Texture Name="object_oE5_Tex_004BC0" OutName="tex_00004BC0" Format="rgba16" Width="32" Height="32" Offset="0x4BC0" />
-        <Texture Name="object_oE5_Tex_0053C0" OutName="tex_000053C0" Format="rgba16" Width="16" Height="8" Offset="0x53C0" />
-        <Texture Name="object_oE5_Tex_0054C0" OutName="tex_000054C0" Format="i4" Width="16" Height="32" Offset="0x54C0" />
+        <Texture Name="object_oE5_Tex_004680" OutName="tex_00004680" Format="rgba16" Width="32" Height="16" Offset="0x4680"/>
+        <Texture Name="object_oE5_Tex_004A80" OutName="tex_00004A80" Format="rgba16" Width="8" Height="16" Offset="0x4A80"/>
+        <Texture Name="object_oE5_Tex_004B80" OutName="tex_00004B80" Format="i4" Width="16" Height="8" Offset="0x4B80"/>
+        <Texture Name="object_oE5_Tex_004BC0" OutName="tex_00004BC0" Format="rgba16" Width="32" Height="32" Offset="0x4BC0"/>
+        <Texture Name="object_oE5_Tex_0053C0" OutName="tex_000053C0" Format="rgba16" Width="16" Height="8" Offset="0x53C0"/>
+        <Texture Name="object_oE5_Tex_0054C0" OutName="tex_000054C0" Format="i4" Width="16" Height="32" Offset="0x54C0"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_oF1s.xml b/assets/xml/objects/object_oF1s.xml
index 5a8b80d79..11359eff5 100644
--- a/assets/xml/objects/object_oF1s.xml
+++ b/assets/xml/objects/object_oF1s.xml
@@ -5,65 +5,65 @@
 
         <!-- The textures used by these limbs aren't 64-bit aligned, so this won't compile to a matching ROM. -->
         <!-- 
-        <Limb Name="object_oF1s_Limb_000000" LimbType="Standard" Offset="0x0" />
-        <Limb Name="object_oF1s_Limb_00000C" LimbType="Standard" Offset="0xC" />
-        <Limb Name="object_oF1s_Limb_000018" LimbType="Standard" Offset="0x18" />
-        <Limb Name="object_oF1s_Limb_000024" LimbType="Standard" Offset="0x24" />
-        <Limb Name="object_oF1s_Limb_000030" LimbType="Standard" Offset="0x30" />
-        <Limb Name="object_oF1s_Limb_00003C" LimbType="Standard" Offset="0x3C" />
-        <Limb Name="object_oF1s_Limb_000048" LimbType="Standard" Offset="0x48" />
-        <Limb Name="object_oF1s_Limb_000054" LimbType="Standard" Offset="0x54" />
-        <Limb Name="object_oF1s_Limb_000060" LimbType="Standard" Offset="0x60" />
-        <Limb Name="object_oF1s_Limb_00006C" LimbType="Standard" Offset="0x6C" />
-        <Limb Name="object_oF1s_Limb_000078" LimbType="Standard" Offset="0x78" />
-        <Limb Name="object_oF1s_Limb_000084" LimbType="Standard" Offset="0x84" />
-        <Limb Name="object_oF1s_Limb_000090" LimbType="Standard" Offset="0x90" />
-        <Limb Name="object_oF1s_Limb_00009C" LimbType="Standard" Offset="0x9C" />
-        <Limb Name="object_oF1s_Limb_0000A8" LimbType="Standard" Offset="0xA8" />
-        <Limb Name="object_oF1s_Limb_0000B4" LimbType="Standard" Offset="0xB4" />
-        <Limb Name="object_oF1s_Limb_0000C0" LimbType="Standard" Offset="0xC0" />
+        <Limb Name="object_oF1s_Limb_000000" LimbType="Standard" Offset="0x0"/>
+        <Limb Name="object_oF1s_Limb_00000C" LimbType="Standard" Offset="0xC"/>
+        <Limb Name="object_oF1s_Limb_000018" LimbType="Standard" Offset="0x18"/>
+        <Limb Name="object_oF1s_Limb_000024" LimbType="Standard" Offset="0x24"/>
+        <Limb Name="object_oF1s_Limb_000030" LimbType="Standard" Offset="0x30"/>
+        <Limb Name="object_oF1s_Limb_00003C" LimbType="Standard" Offset="0x3C"/>
+        <Limb Name="object_oF1s_Limb_000048" LimbType="Standard" Offset="0x48"/>
+        <Limb Name="object_oF1s_Limb_000054" LimbType="Standard" Offset="0x54"/>
+        <Limb Name="object_oF1s_Limb_000060" LimbType="Standard" Offset="0x60"/>
+        <Limb Name="object_oF1s_Limb_00006C" LimbType="Standard" Offset="0x6C"/>
+        <Limb Name="object_oF1s_Limb_000078" LimbType="Standard" Offset="0x78"/>
+        <Limb Name="object_oF1s_Limb_000084" LimbType="Standard" Offset="0x84"/>
+        <Limb Name="object_oF1s_Limb_000090" LimbType="Standard" Offset="0x90"/>
+        <Limb Name="object_oF1s_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
+        <Limb Name="object_oF1s_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
+        <Limb Name="object_oF1s_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
+        <Limb Name="object_oF1s_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
         -->
 
         <!--
-        <Skeleton Name="object_oF1s_Skel_000110" Type="Flex" LimbType="Standard" Offset="0x110" />
+        <Skeleton Name="object_oF1s_Skel_000110" Type="Flex" LimbType="Standard" Offset="0x110"/>
         -->
 
         <!-- 32-bit aligned textures. -->
         <!--
-        <Texture Name="object_oF1s_TLUT_00011C" OutName="tlut_0000011C" Format="rgba16" Width="216" Height="1" Offset="0x11C" />
-        <Blob Name="object_oF1s_Blob_00031C" Size="0x1A0" Offset="0x31C" />
-        <Texture Name="object_oF1s_Tex_0004BC" OutName="tex_000004BC" Format="ci8" Width="32" Height="32" Offset="0x4BC" />
-        <Texture Name="object_oF1s_Tex_0008BC" OutName="tex_000008BC" Format="rgba16" Width="64" Height="32" Offset="0x8BC" />
-        <Texture Name="object_oF1s_Tex_0018BC" OutName="tex_000018BC" Format="ci8" Width="8" Height="8" Offset="0x18BC" />
-        <Texture Name="object_oF1s_Tex_0018FC" OutName="tex_000018FC" Format="ci8" Width="16" Height="16" Offset="0x18FC" />
-        <Texture Name="object_oF1s_Tex_0019FC" OutName="tex_000019FC" Format="ci8" Width="16" Height="16" Offset="0x19FC" />
-        <Texture Name="object_oF1s_Tex_001AFC" OutName="tex_00001AFC" Format="ci8" Width="8" Height="16" Offset="0x1AFC" />
-        <Texture Name="object_oF1s_Tex_001B7C" OutName="tex_00001B7C" Format="ci8" Width="32" Height="32" Offset="0x1B7C" />
-        <Texture Name="object_oF1s_Tex_001F7C" OutName="tex_00001F7C" Format="ci8" Width="32" Height="16" Offset="0x1F7C" />
-        <Blob Name="object_oF1s_Blob_00217C" Size="0x400" Offset="0x217C" />
-        <Texture Name="object_oF1s_Tex_00257C" OutName="tex_0000257C" Format="ci8" Width="8" Height="8" Offset="0x257C" />
-        <Texture Name="object_oF1s_Tex_0025BC" OutName="tex_000025BC" Format="ci8" Width="32" Height="32" Offset="0x25BC" />
-        <Blob Name="object_oF1s_Blob_0029BC" Size="0x400" Offset="0x29BC" />
-        <Texture Name="object_oF1s_Tex_002DBC" OutName="tex_00002DBC" Format="ci8" Width="32" Height="64" Offset="0x2DBC" />
+        <Texture Name="object_oF1s_TLUT_00011C" OutName="tlut_0000011C" Format="rgba16" Width="216" Height="1" Offset="0x11C"/>
+        <Blob Name="object_oF1s_Blob_00031C" Size="0x1A0" Offset="0x31C"/>
+        <Texture Name="object_oF1s_Tex_0004BC" OutName="tex_000004BC" Format="ci8" Width="32" Height="32" Offset="0x4BC"/>
+        <Texture Name="object_oF1s_Tex_0008BC" OutName="tex_000008BC" Format="rgba16" Width="64" Height="32" Offset="0x8BC"/>
+        <Texture Name="object_oF1s_Tex_0018BC" OutName="tex_000018BC" Format="ci8" Width="8" Height="8" Offset="0x18BC"/>
+        <Texture Name="object_oF1s_Tex_0018FC" OutName="tex_000018FC" Format="ci8" Width="16" Height="16" Offset="0x18FC"/>
+        <Texture Name="object_oF1s_Tex_0019FC" OutName="tex_000019FC" Format="ci8" Width="16" Height="16" Offset="0x19FC"/>
+        <Texture Name="object_oF1s_Tex_001AFC" OutName="tex_00001AFC" Format="ci8" Width="8" Height="16" Offset="0x1AFC"/>
+        <Texture Name="object_oF1s_Tex_001B7C" OutName="tex_00001B7C" Format="ci8" Width="32" Height="32" Offset="0x1B7C"/>
+        <Texture Name="object_oF1s_Tex_001F7C" OutName="tex_00001F7C" Format="ci8" Width="32" Height="16" Offset="0x1F7C"/>
+        <Blob Name="object_oF1s_Blob_00217C" Size="0x400" Offset="0x217C"/>
+        <Texture Name="object_oF1s_Tex_00257C" OutName="tex_0000257C" Format="ci8" Width="8" Height="8" Offset="0x257C"/>
+        <Texture Name="object_oF1s_Tex_0025BC" OutName="tex_000025BC" Format="ci8" Width="32" Height="32" Offset="0x25BC"/>
+        <Blob Name="object_oF1s_Blob_0029BC" Size="0x400" Offset="0x29BC"/>
+        <Texture Name="object_oF1s_Tex_002DBC" OutName="tex_00002DBC" Format="ci8" Width="32" Height="64" Offset="0x2DBC"/>
         -->
 
         <!--
-        <DList Name="object_oF1s_DL_006A40" Offset="0x6A40" />
-        <DList Name="object_oF1s_DL_006DE8" Offset="0x6DE8" />
-        <DList Name="object_oF1s_DL_006FF8" Offset="0x6FF8" />
-        <DList Name="object_oF1s_DL_0071C8" Offset="0x71C8" />
-        <DList Name="object_oF1s_DL_007328" Offset="0x7328" />
-        <DList Name="object_oF1s_DL_007548" Offset="0x7548" />
-        <DList Name="object_oF1s_DL_007748" Offset="0x7748" />
-        <DList Name="object_oF1s_DL_007880" Offset="0x7880" />
-        <DList Name="object_oF1s_DL_007A40" Offset="0x7A40" />
-        <DList Name="object_oF1s_DL_007C10" Offset="0x7C10" />
-        <DList Name="object_oF1s_DL_007D70" Offset="0x7D70" />
-        <DList Name="object_oF1s_DL_007F90" Offset="0x7F90" />
-        <DList Name="object_oF1s_DL_008190" Offset="0x8190" />
-        <DList Name="object_oF1s_DL_0082C8" Offset="0x82C8" />
-        <DList Name="object_oF1s_DL_008488" Offset="0x8488" />
-        <DList Name="object_oF1s_DL_0084E0" Offset="0x84E0" />
+        <DList Name="object_oF1s_DL_006A40" Offset="0x6A40"/>
+        <DList Name="object_oF1s_DL_006DE8" Offset="0x6DE8"/>
+        <DList Name="object_oF1s_DL_006FF8" Offset="0x6FF8"/>
+        <DList Name="object_oF1s_DL_0071C8" Offset="0x71C8"/>
+        <DList Name="object_oF1s_DL_007328" Offset="0x7328"/>
+        <DList Name="object_oF1s_DL_007548" Offset="0x7548"/>
+        <DList Name="object_oF1s_DL_007748" Offset="0x7748"/>
+        <DList Name="object_oF1s_DL_007880" Offset="0x7880"/>
+        <DList Name="object_oF1s_DL_007A40" Offset="0x7A40"/>
+        <DList Name="object_oF1s_DL_007C10" Offset="0x7C10"/>
+        <DList Name="object_oF1s_DL_007D70" Offset="0x7D70"/>
+        <DList Name="object_oF1s_DL_007F90" Offset="0x7F90"/>
+        <DList Name="object_oF1s_DL_008190" Offset="0x8190"/>
+        <DList Name="object_oF1s_DL_0082C8" Offset="0x82C8"/>
+        <DList Name="object_oF1s_DL_008488" Offset="0x8488"/>
+        <DList Name="object_oF1s_DL_0084E0" Offset="0x84E0"/>
         -->
     </File>
 </Root>
diff --git a/assets/xml/objects/object_owl.xml b/assets/xml/objects/object_owl.xml
index 25ad7f46d..fdc64b3aa 100644
--- a/assets/xml/objects/object_owl.xml
+++ b/assets/xml/objects/object_owl.xml
@@ -4,26 +4,26 @@
         <Skeleton Name="gOwlFlyingSkel" Type="Flex" LimbType="Standard" Offset="0xC0E8"/>
 
         <!-- Default Owl Limbs -->
-        <Limb Name="gOwlRootLimb" Type="Standard" Offset="0xBFA8"/>
-        <Limb Name="gOwlNeckLimb" Type="Standard" Offset="0xBFB4"/>
-        <Limb Name="gOwlHeadLimb" Type="Standard" Offset="0xBFC0"/>
-        <Limb Name="gOwlRightEyebrowLimb" Type="Standard" Offset="0xBFCC"/>
-        <Limb Name="gOwlLeftEyebrowLimb" Type="Standard" Offset="0xBFD8"/>
-        <Limb Name="gOwlLowerLeftWingLimb" Type="Standard" Offset="0xBFE4"/>
-        <Limb Name="gOwlMiddleLeftWing1Limb" Type="Standard" Offset="0xBFF0"/>
-        <Limb Name="gOwlMiddleLeftWing2Limb" Type="Standard" Offset="0xBFFC"/>
-        <Limb Name="gOwlUpperLeftWingLimb" Type="Standard" Offset="0xC008"/>
-        <Limb Name="gOwlLowerRightWingLimb" Type="Standard" Offset="0xC014"/>
-        <Limb Name="gOwlMiddleRightWing1Limb" Type="Standard" Offset="0xC020"/>
-        <Limb Name="gOwlMiddleRightWing2Limb" Type="Standard" Offset="0xC02C"/>
-        <Limb Name="gOwlUpperRightWingLimb" Type="Standard" Offset="0xC038"/>
-        <Limb Name="gOwlUpperRightLegLimb" Type="Standard" Offset="0xC044"/>
-        <Limb Name="gOwlLowerRightLegLimb" Type="Standard" Offset="0xC050"/>
-        <Limb Name="gOwlRightClawLimb" Type="Standard" Offset="0xC05C"/>
-        <Limb Name="gOwlUpperLeftLegLimb" Type="Standard" Offset="0xC068"/>
-        <Limb Name="gOwlLowerLeftLegLimb" Type="Standard" Offset="0xC074"/>
-        <Limb Name="gOwlLeftClawLimb" Type="Standard" Offset="0xC080"/>
-        <Limb Name="gOwlTailLimb" Type="Standard" Offset="0xC08C"/>
+        <Limb Name="gOwlRootLimb" LimbType="Standard" Offset="0xBFA8"/>
+        <Limb Name="gOwlNeckLimb" LimbType="Standard" Offset="0xBFB4"/>
+        <Limb Name="gOwlHeadLimb" LimbType="Standard" Offset="0xBFC0"/>
+        <Limb Name="gOwlRightEyebrowLimb" LimbType="Standard" Offset="0xBFCC"/>
+        <Limb Name="gOwlLeftEyebrowLimb" LimbType="Standard" Offset="0xBFD8"/>
+        <Limb Name="gOwlLowerLeftWingLimb" LimbType="Standard" Offset="0xBFE4"/>
+        <Limb Name="gOwlMiddleLeftWing1Limb" LimbType="Standard" Offset="0xBFF0"/>
+        <Limb Name="gOwlMiddleLeftWing2Limb" LimbType="Standard" Offset="0xBFFC"/>
+        <Limb Name="gOwlUpperLeftWingLimb" LimbType="Standard" Offset="0xC008"/>
+        <Limb Name="gOwlLowerRightWingLimb" LimbType="Standard" Offset="0xC014"/>
+        <Limb Name="gOwlMiddleRightWing1Limb" LimbType="Standard" Offset="0xC020"/>
+        <Limb Name="gOwlMiddleRightWing2Limb" LimbType="Standard" Offset="0xC02C"/>
+        <Limb Name="gOwlUpperRightWingLimb" LimbType="Standard" Offset="0xC038"/>
+        <Limb Name="gOwlUpperRightLegLimb" LimbType="Standard" Offset="0xC044"/>
+        <Limb Name="gOwlLowerRightLegLimb" LimbType="Standard" Offset="0xC050"/>
+        <Limb Name="gOwlRightClawLimb" LimbType="Standard" Offset="0xC05C"/>
+        <Limb Name="gOwlUpperLeftLegLimb" LimbType="Standard" Offset="0xC068"/>
+        <Limb Name="gOwlLowerLeftLegLimb" LimbType="Standard" Offset="0xC074"/>
+        <Limb Name="gOwlLeftClawLimb" LimbType="Standard" Offset="0xC080"/>
+        <Limb Name="gOwlTailLimb" LimbType="Standard" Offset="0xC08C"/>
 
         <!-- Default Owl Limb DisplayLists -->
         <DList Name="gOwlTorsoDL" Offset="0x4B40"/>
diff --git a/assets/xml/objects/object_peehat.xml b/assets/xml/objects/object_peehat.xml
index 31036330f..42ee66cde 100644
--- a/assets/xml/objects/object_peehat.xml
+++ b/assets/xml/objects/object_peehat.xml
@@ -4,29 +4,29 @@
         <Skeleton Name="gPeehatSkel" Type="Normal" LimbType="Standard" Offset="0x1C80"/>
 
         <!-- Peehat Limbs -->
-        <Limb Name="gPeehatRootLimb" Type="Standard" Offset="0x1B10"/>
-        <Limb Name="gPeehatBodyRootLimb" Type="Standard" Offset="0x1B1C"/>
-        <Limb Name="gPeehatBodyLimb" Type="Standard" Offset="0x1B28"/>
-        <Limb Name="gPeehatWingStructureRootLimb" Type="Standard" Offset="0x1B34"/>
-        <Limb Name="gPeehatWing1RootLimb" Type="Standard" Offset="0x1B40"/>
-        <Limb Name="gPeehatLimb_1B4C" Type="Standard" Offset="0x1B4C"/>
-        <Limb Name="gPeehatWing1Limb" Type="Standard" Offset="0x1B58"/>
-        <Limb Name="gPeehatWing2RootLimb" Type="Standard" Offset="0x1B64"/>
-        <Limb Name="gPeehatLimb_1B70" Type="Standard" Offset="0x1B70"/>
-        <Limb Name="gPeehatWing2Limb" Type="Standard" Offset="0x1B7C"/>
-        <Limb Name="gPeehatWing3RootLimb" Type="Standard" Offset="0x1B88"/>
-        <Limb Name="gPeehatLimb_1B94" Type="Standard" Offset="0x1B94"/>
-        <Limb Name="gPeehatWing3Limb" Type="Standard" Offset="0x1BA0"/>
-        <Limb Name="gPeehatWing4RootLimb" Type="Standard" Offset="0x1BAC"/>
-        <Limb Name="gPeehatLimb_1BB8" Type="Standard" Offset="0x1BB8"/>
-        <Limb Name="gPeehatWing4Limb" Type="Standard" Offset="0x1BC4"/>
-        <Limb Name="gPeehatWing5RootLimb" Type="Standard" Offset="0x1BD0"/>
-        <Limb Name="gPeehatLimb_1BDC" Type="Standard" Offset="0x1BDC"/>
-        <Limb Name="gPeehatWing5Limb" Type="Standard" Offset="0x1BE8"/>
-        <Limb Name="gPeehatWing6RootLimb" Type="Standard" Offset="0x1BF4"/>
-        <Limb Name="gPeehatLimb_1C00" Type="Standard" Offset="0x1C00"/>
-        <Limb Name="gPeehatWing6Limb" Type="Standard" Offset="0x1C0C"/>
-        <Limb Name="gPeehatTopLimb" Type="Standard" Offset="0x1C18"/>
+        <Limb Name="gPeehatRootLimb" LimbType="Standard" Offset="0x1B10"/>
+        <Limb Name="gPeehatBodyRootLimb" LimbType="Standard" Offset="0x1B1C"/>
+        <Limb Name="gPeehatBodyLimb" LimbType="Standard" Offset="0x1B28"/>
+        <Limb Name="gPeehatWingStructureRootLimb" LimbType="Standard" Offset="0x1B34"/>
+        <Limb Name="gPeehatWing1RootLimb" LimbType="Standard" Offset="0x1B40"/>
+        <Limb Name="gPeehatLimb_1B4C" LimbType="Standard" Offset="0x1B4C"/>
+        <Limb Name="gPeehatWing1Limb" LimbType="Standard" Offset="0x1B58"/>
+        <Limb Name="gPeehatWing2RootLimb" LimbType="Standard" Offset="0x1B64"/>
+        <Limb Name="gPeehatLimb_1B70" LimbType="Standard" Offset="0x1B70"/>
+        <Limb Name="gPeehatWing2Limb" LimbType="Standard" Offset="0x1B7C"/>
+        <Limb Name="gPeehatWing3RootLimb" LimbType="Standard" Offset="0x1B88"/>
+        <Limb Name="gPeehatLimb_1B94" LimbType="Standard" Offset="0x1B94"/>
+        <Limb Name="gPeehatWing3Limb" LimbType="Standard" Offset="0x1BA0"/>
+        <Limb Name="gPeehatWing4RootLimb" LimbType="Standard" Offset="0x1BAC"/>
+        <Limb Name="gPeehatLimb_1BB8" LimbType="Standard" Offset="0x1BB8"/>
+        <Limb Name="gPeehatWing4Limb" LimbType="Standard" Offset="0x1BC4"/>
+        <Limb Name="gPeehatWing5RootLimb" LimbType="Standard" Offset="0x1BD0"/>
+        <Limb Name="gPeehatLimb_1BDC" LimbType="Standard" Offset="0x1BDC"/>
+        <Limb Name="gPeehatWing5Limb" LimbType="Standard" Offset="0x1BE8"/>
+        <Limb Name="gPeehatWing6RootLimb" LimbType="Standard" Offset="0x1BF4"/>
+        <Limb Name="gPeehatLimb_1C00" LimbType="Standard" Offset="0x1C00"/>
+        <Limb Name="gPeehatWing6Limb" LimbType="Standard" Offset="0x1C0C"/>
+        <Limb Name="gPeehatTopLimb" LimbType="Standard" Offset="0x1C18"/>
 
         <!-- Peehat Limb DisplayLists -->
         <DList Name="gPeehatBodyDL" Offset="0x12F0"/>
diff --git a/assets/xml/objects/object_po_field.xml b/assets/xml/objects/object_po_field.xml
index 73b5dd07e..10b402e2c 100644
--- a/assets/xml/objects/object_po_field.xml
+++ b/assets/xml/objects/object_po_field.xml
@@ -6,8 +6,8 @@
         <Animation Name="gPoeFieldFloatAnim" Offset="0x0924"/>
         <Animation Name="gPoeFieldAppearAnim" Offset="0x0F9C"/>
         <Animation Name="gPoeFieldDisappearAnim" Offset="0x1360"/>
-        <Texture Name="gBigPoeSoulTex" Offset="0x1370" OutName="big_poe_soul" Format="i8" Width="32" Height="64"/>
-        <Texture Name="gPoeFieldSoulTex" Offset="0x1B70" OutName="poe_field_soul" Format="i8" Width="32" Height="64"/>
+        <Texture Name="gBigPoeSoulTex" OutName="big_poe_soul" Format="i8" Width="32" Height="64" Offset="0x1370"/>
+        <Texture Name="gPoeFieldSoulTex" OutName="poe_field_soul" Format="i8" Width="32" Height="64" Offset="0x1B70"/>
         <DList Name="gPoeFieldSoulDL" Offset="0x23B0"/>
         <DList Name="gPoeFieldLanternDL" Offset="0x4BA0"/>
         <DList Name="gPoeFieldLanternTopDL" Offset="0x4CC0"/>
diff --git a/assets/xml/objects/object_ru2.xml b/assets/xml/objects/object_ru2.xml
index 2a2b785d2..2a8d70af3 100644
--- a/assets/xml/objects/object_ru2.xml
+++ b/assets/xml/objects/object_ru2.xml
@@ -4,28 +4,28 @@
         <Skeleton Name="gAdultRutoSkel" Type="Flex" LimbType="Standard" Offset="0xC700"/>
 
         <!-- Adult Ruto Limbs -->
-        <Limb Name="gAdultRutoRootLimb" Type="Standard" Offset="0xC5A0"/>
-        <Limb Name="gAdultRutoLeftThighLimb" Type="Standard" Offset="0xC5AC"/>
-        <Limb Name="gAdultRutoLeftLegLimb" Type="Standard" Offset="0xC5B8"/>
-        <Limb Name="gAdultRutoLeftFootLimb" Type="Standard" Offset="0xC5C4"/>
-        <Limb Name="gAdultRutoLeftTailLimb" Type="Standard" Offset="0xC5D0"/>
-        <Limb Name="gAdultRutoRightThighLimb" Type="Standard" Offset="0xC5DC"/>
-        <Limb Name="gAdultRutoRightLegLimb" Type="Standard" Offset="0xC5E8"/>
-        <Limb Name="gAdultRutoRightFootLimb" Type="Standard" Offset="0xC5F4"/>
-        <Limb Name="gAdultRutoRightTailLimb" Type="Standard" Offset="0xC600"/>
-        <Limb Name="gAdultRutoTorsoLimb" Type="Standard" Offset="0xC60C"/>
-        <Limb Name="gAdultRutoLeftUpperArmLimb" Type="Standard" Offset="0xC618"/>
-        <Limb Name="gAdultRutoLeftUpperWingLimb" Type="Standard" Offset="0xC624"/>
-        <Limb Name="gAdultRutoLeftLowerWingLimb" Type="Standard" Offset="0xC630"/>
-        <Limb Name="gAdultRutoLeftForearmLimb" Type="Standard" Offset="0xC63C"/>
-        <Limb Name="gAdultRutoLeftHandLimb" Type="Standard" Offset="0xC648"/>
-        <Limb Name="gAdultRutoRightUpperArmLimb" Type="Standard" Offset="0xC654"/>
-        <Limb Name="gAdultRutoRightUpperWingLimb" Type="Standard" Offset="0xC660"/>
-        <Limb Name="gAdultRutoRightLowerWingLimb" Type="Standard" Offset="0xC66C"/>
-        <Limb Name="gAdultRutoRightForearmLimb" Type="Standard" Offset="0xC678"/>
-        <Limb Name="gAdultRutoRightHandLimb" Type="Standard" Offset="0xC684"/>
-        <Limb Name="gAdultRutoHeadLimb" Type="Standard" Offset="0xC690"/>
-        <Limb Name="gAdultRutoWaistLimb" Type="Standard" Offset="0xC69C"/>
+        <Limb Name="gAdultRutoRootLimb" LimbType="Standard" Offset="0xC5A0"/>
+        <Limb Name="gAdultRutoLeftThighLimb" LimbType="Standard" Offset="0xC5AC"/>
+        <Limb Name="gAdultRutoLeftLegLimb" LimbType="Standard" Offset="0xC5B8"/>
+        <Limb Name="gAdultRutoLeftFootLimb" LimbType="Standard" Offset="0xC5C4"/>
+        <Limb Name="gAdultRutoLeftTailLimb" LimbType="Standard" Offset="0xC5D0"/>
+        <Limb Name="gAdultRutoRightThighLimb" LimbType="Standard" Offset="0xC5DC"/>
+        <Limb Name="gAdultRutoRightLegLimb" LimbType="Standard" Offset="0xC5E8"/>
+        <Limb Name="gAdultRutoRightFootLimb" LimbType="Standard" Offset="0xC5F4"/>
+        <Limb Name="gAdultRutoRightTailLimb" LimbType="Standard" Offset="0xC600"/>
+        <Limb Name="gAdultRutoTorsoLimb" LimbType="Standard" Offset="0xC60C"/>
+        <Limb Name="gAdultRutoLeftUpperArmLimb" LimbType="Standard" Offset="0xC618"/>
+        <Limb Name="gAdultRutoLeftUpperWingLimb" LimbType="Standard" Offset="0xC624"/>
+        <Limb Name="gAdultRutoLeftLowerWingLimb" LimbType="Standard" Offset="0xC630"/>
+        <Limb Name="gAdultRutoLeftForearmLimb" LimbType="Standard" Offset="0xC63C"/>
+        <Limb Name="gAdultRutoLeftHandLimb" LimbType="Standard" Offset="0xC648"/>
+        <Limb Name="gAdultRutoRightUpperArmLimb" LimbType="Standard" Offset="0xC654"/>
+        <Limb Name="gAdultRutoRightUpperWingLimb" LimbType="Standard" Offset="0xC660"/>
+        <Limb Name="gAdultRutoRightLowerWingLimb" LimbType="Standard" Offset="0xC66C"/>
+        <Limb Name="gAdultRutoRightForearmLimb" LimbType="Standard" Offset="0xC678"/>
+        <Limb Name="gAdultRutoRightHandLimb" LimbType="Standard" Offset="0xC684"/>
+        <Limb Name="gAdultRutoHeadLimb" LimbType="Standard" Offset="0xC690"/>
+        <Limb Name="gAdultRutoWaistLimb" LimbType="Standard" Offset="0xC69C"/>
 
         <!-- Adult Ruto Limb DisplayLists -->
         <DList Name="gAdultRutoLeftThighDL" Offset="0xB8E0"/>
diff --git a/assets/xml/objects/object_shopnuts.xml b/assets/xml/objects/object_shopnuts.xml
index cbfe9f512..a4e12e38a 100644
--- a/assets/xml/objects/object_shopnuts.xml
+++ b/assets/xml/objects/object_shopnuts.xml
@@ -4,23 +4,23 @@
         <Skeleton Name="gBusinessScrubSkel" Type="Flex" LimbType="Standard" Offset="0x41A8"/>
 
         <!-- Business Scrub Limbs -->
-        <Limb Name="gBusinessScrubRootLimb" Type="Standard" Offset="0x4098"/>
-        <Limb Name="gBusinessScrubLeftThighLimb" Type="Standard" Offset="0x40A4"/>
-        <Limb Name="gBusinessScrubLeftShinLimb" Type="Standard" Offset="0x40B0"/>
-        <Limb Name="gBusinessScrubLeftFootLimb" Type="Standard" Offset="0x40BC"/>
-        <Limb Name="gBusinessScrubRightThighLimb" Type="Standard" Offset="0x40C8"/>
-        <Limb Name="gBusinessScrubRightShinLimb" Type="Standard" Offset="0x40D4"/>
-        <Limb Name="gBusinessScrubRightFootLimb" Type="Standard" Offset="0x40E0"/>
-        <Limb Name="gBusinessScrubTopLeafLimb" Type="Standard" Offset="0x40EC"/>
-        <Limb Name="gBusinessScrubNoseLimb" Type="Standard" Offset="0x40F8"/>
-        <Limb Name="gBusinessScrubLeftUpperArmLimb" Type="Standard" Offset="0x4104"/>
-        <Limb Name="gBusinessScrubLeftForearmLimb" Type="Standard" Offset="0x4110"/>
-        <Limb Name="gBusinessScrubLeftHandLimb" Type="Standard" Offset="0x411C"/>
-        <Limb Name="gBusinessScrubRightUpperArmLimb" Type="Standard" Offset="0x4128"/>
-        <Limb Name="gBusinessScrubRightForearmLimb" Type="Standard" Offset="0x4134"/>
-        <Limb Name="gBusinessScrubRightHandLimb" Type="Standard" Offset="0x4140"/>
-        <Limb Name="gBusinessScrubEyesLimb" Type="Standard" Offset="0x414C"/>
-        <Limb Name="gBusinessScrubBodyLimb" Type="Standard" Offset="0x4158"/>
+        <Limb Name="gBusinessScrubRootLimb" LimbType="Standard" Offset="0x4098"/>
+        <Limb Name="gBusinessScrubLeftThighLimb" LimbType="Standard" Offset="0x40A4"/>
+        <Limb Name="gBusinessScrubLeftShinLimb" LimbType="Standard" Offset="0x40B0"/>
+        <Limb Name="gBusinessScrubLeftFootLimb" LimbType="Standard" Offset="0x40BC"/>
+        <Limb Name="gBusinessScrubRightThighLimb" LimbType="Standard" Offset="0x40C8"/>
+        <Limb Name="gBusinessScrubRightShinLimb" LimbType="Standard" Offset="0x40D4"/>
+        <Limb Name="gBusinessScrubRightFootLimb" LimbType="Standard" Offset="0x40E0"/>
+        <Limb Name="gBusinessScrubTopLeafLimb" LimbType="Standard" Offset="0x40EC"/>
+        <Limb Name="gBusinessScrubNoseLimb" LimbType="Standard" Offset="0x40F8"/>
+        <Limb Name="gBusinessScrubLeftUpperArmLimb" LimbType="Standard" Offset="0x4104"/>
+        <Limb Name="gBusinessScrubLeftForearmLimb" LimbType="Standard" Offset="0x4110"/>
+        <Limb Name="gBusinessScrubLeftHandLimb" LimbType="Standard" Offset="0x411C"/>
+        <Limb Name="gBusinessScrubRightUpperArmLimb" LimbType="Standard" Offset="0x4128"/>
+        <Limb Name="gBusinessScrubRightForearmLimb" LimbType="Standard" Offset="0x4134"/>
+        <Limb Name="gBusinessScrubRightHandLimb" LimbType="Standard" Offset="0x4140"/>
+        <Limb Name="gBusinessScrubEyesLimb" LimbType="Standard" Offset="0x414C"/>
+        <Limb Name="gBusinessScrubBodyLimb" LimbType="Standard" Offset="0x4158"/>
 
         <!-- Business Scrub Limb DisplayLists -->
         <DList Name="gBusinessScrubRootLeafDL" Offset="0x3C80"/>
diff --git a/assets/xml/objects/object_sk2.xml b/assets/xml/objects/object_sk2.xml
index 4980b4ff5..f2e7ef6d8 100644
--- a/assets/xml/objects/object_sk2.xml
+++ b/assets/xml/objects/object_sk2.xml
@@ -1,130 +1,130 @@
 <Root>
     <File Name="object_sk2" Segment="6">
         <!-- Stalfos DLists -->
-        <DList Name="gStalfosSkullDL" Offset="0x53D0" />
-        <DList Name="gStalfosUpperCoreDL" Offset="0x5720" />
-        <DList Name="gStalfosRightUpperArmDL" Offset="0x57B8" />
-        <DList Name="gStalfosLowerCoreDL" Offset="0x5890" />
-        <DList Name="gStalfosRightThighDL" Offset="0x5970" />
-        <DList Name="gStalfosRightHandDL" Offset="0x5A18" />
-        <DList Name="gStalfosChestDL" Offset="0x5AD8" />
-        <DList Name="gStalfosJawDL" Offset="0x5B90" />
-        <DList Name="gStalfosUpperNeckDL" Offset="0x5C78" />
-        <DList Name="gStalfosLowerNeckDL" Offset="0x5D08" />
-        <DList Name="gStalfosShieldDL" Offset="0x5DA0" />
-        <DList Name="gStalfosWaistDL" Offset="0x5EA0" />
-        <DList Name="gStalfosRightLowerLegDL" Offset="0x5FA8" />
-        <DList Name="gStalfosRightForearmDL" Offset="0x6110" />
-        <DList Name="gStalfosRightFootDL" Offset="0x6208" />
-        <DList Name="gStalfosRightShoulderArmorDL" Offset="0x6308" />
-        <DList Name="gStalfosLeftUpperArmDL" Offset="0x63D8" />
-        <DList Name="gStalfosLeftShoulderArmorDL" Offset="0x64B0" />
-        <DList Name="gStalfosLeftFootDL" Offset="0x6580" />
-        <DList Name="gStalfosLeftForearmDL" Offset="0x6680" />
-        <DList Name="gStalfosLeftLowerLegDL" Offset="0x6778" />
-        <DList Name="gStalfosLeftThighDL" Offset="0x68E0" />
-        <DList Name="gStalfosLeftHandDL" Offset="0x6988" />
-        <DList Name="gStalfosSwordDL" Offset="0x6A48" />
+        <DList Name="gStalfosSkullDL" Offset="0x53D0"/>
+        <DList Name="gStalfosUpperCoreDL" Offset="0x5720"/>
+        <DList Name="gStalfosRightUpperArmDL" Offset="0x57B8"/>
+        <DList Name="gStalfosLowerCoreDL" Offset="0x5890"/>
+        <DList Name="gStalfosRightThighDL" Offset="0x5970"/>
+        <DList Name="gStalfosRightHandDL" Offset="0x5A18"/>
+        <DList Name="gStalfosChestDL" Offset="0x5AD8"/>
+        <DList Name="gStalfosJawDL" Offset="0x5B90"/>
+        <DList Name="gStalfosUpperNeckDL" Offset="0x5C78"/>
+        <DList Name="gStalfosLowerNeckDL" Offset="0x5D08"/>
+        <DList Name="gStalfosShieldDL" Offset="0x5DA0"/>
+        <DList Name="gStalfosWaistDL" Offset="0x5EA0"/>
+        <DList Name="gStalfosRightLowerLegDL" Offset="0x5FA8"/>
+        <DList Name="gStalfosRightForearmDL" Offset="0x6110"/>
+        <DList Name="gStalfosRightFootDL" Offset="0x6208"/>
+        <DList Name="gStalfosRightShoulderArmorDL" Offset="0x6308"/>
+        <DList Name="gStalfosLeftUpperArmDL" Offset="0x63D8"/>
+        <DList Name="gStalfosLeftShoulderArmorDL" Offset="0x64B0"/>
+        <DList Name="gStalfosLeftFootDL" Offset="0x6580"/>
+        <DList Name="gStalfosLeftForearmDL" Offset="0x6680"/>
+        <DList Name="gStalfosLeftLowerLegDL" Offset="0x6778"/>
+        <DList Name="gStalfosLeftThighDL" Offset="0x68E0"/>
+        <DList Name="gStalfosLeftHandDL" Offset="0x6988"/>
+        <DList Name="gStalfosSwordDL" Offset="0x6A48"/>
 
         <!-- Stalfos textures -->
-        <Texture Name="gStalfosEyeSocketTex" OutName="stalfos_eye_socket" Format="rgba16" Width="16" Height="16" Offset="0x6BA8" />
-        <Texture Name="gStalfosEyeTex" OutName="stalfos_eye" Format="rgba16" Width="8" Height="8" Offset="0x6DA8" />
-        <Texture Name="gStalfosBoneGradientTex" OutName="stalfos_bone_gradient" Format="rgba16" Width="4" Height="4" Offset="0x6E28" />
-        <Texture Name="gStalfosNostrilTex" OutName="stalfos_nostril" Format="rgba16" Width="8" Height="8" Offset="0x6E48" />
-        <Texture Name="gStalfosBoneDetailTex" OutName="stalfos_bone_detail" Format="rgba16" Width="8" Height="8" Offset="0x6EC8" />
-        <Texture Name="gStalfosRibTex" OutName="stalfos_rib" Format="rgba16" Width="16" Height="16" Offset="0x6F48" />
-        <Texture Name="gStalfosTrousersSideTex" OutName="stalfos_trousers_side" Format="rgba16" Width="16" Height="16" Offset="0x7148" />
-        <Texture Name="gStalfosShieldTex" OutName="stalfos_shield_tex" Format="rgba16" Width="16" Height="16" Offset="0x7348" />
+        <Texture Name="gStalfosEyeSocketTex" OutName="stalfos_eye_socket" Format="rgba16" Width="16" Height="16" Offset="0x6BA8"/>
+        <Texture Name="gStalfosEyeTex" OutName="stalfos_eye" Format="rgba16" Width="8" Height="8" Offset="0x6DA8"/>
+        <Texture Name="gStalfosBoneGradientTex" OutName="stalfos_bone_gradient" Format="rgba16" Width="4" Height="4" Offset="0x6E28"/>
+        <Texture Name="gStalfosNostrilTex" OutName="stalfos_nostril" Format="rgba16" Width="8" Height="8" Offset="0x6E48"/>
+        <Texture Name="gStalfosBoneDetailTex" OutName="stalfos_bone_detail" Format="rgba16" Width="8" Height="8" Offset="0x6EC8"/>
+        <Texture Name="gStalfosRibTex" OutName="stalfos_rib" Format="rgba16" Width="16" Height="16" Offset="0x6F48"/>
+        <Texture Name="gStalfosTrousersSideTex" OutName="stalfos_trousers_side" Format="rgba16" Width="16" Height="16" Offset="0x7148"/>
+        <Texture Name="gStalfosShieldTex" OutName="stalfos_shield_tex" Format="rgba16" Width="16" Height="16" Offset="0x7348"/>
         <!-- Also used for shoulder armor, helm and sword hilt -->
-        <Texture Name="gStalfosLimbArmorTex" OutName="stalfos_limb_armor_tex" Format="rgba16" Width="16" Height="16" Offset="0x7548" />
-        <Texture Name="gStalfosArmorBackTex" OutName="stalfos_armor_back" Format="rgba16" Width="8" Height="8" Offset="0x7748" />
-        <Texture Name="gStalfosSwordBladeTex" OutName="stalfos_sword_blade" Format="rgba16" Width="4" Height="4" Offset="0x77C8" />
-        <Texture Name="gStalfosTrousersTopTex" OutName="stalfos_trousers_top" Format="rgba16" Width="8" Height="8" Offset="0x77E8" />
+        <Texture Name="gStalfosLimbArmorTex" OutName="stalfos_limb_armor_tex" Format="rgba16" Width="16" Height="16" Offset="0x7548"/>
+        <Texture Name="gStalfosArmorBackTex" OutName="stalfos_armor_back" Format="rgba16" Width="8" Height="8" Offset="0x7748"/>
+        <Texture Name="gStalfosSwordBladeTex" OutName="stalfos_sword_blade" Format="rgba16" Width="4" Height="4" Offset="0x77C8"/>
+        <Texture Name="gStalfosTrousersTopTex" OutName="stalfos_trousers_top" Format="rgba16" Width="8" Height="8" Offset="0x77E8"/>
 
         <!-- Stalfos limbs and skeleton -->
-        <Limb Name="gStalfosRootLimb" LimbType="Standard" Offset="0x7868" />
-        <Limb Name="gStalfosUpperBodyRootLimb" LimbType="Standard" Offset="0x7874" />
-        <Limb Name="gStalfosLowerCoreRootLimb" LimbType="Standard" Offset="0x7880" />
-        <Limb Name="gStalfosUpperCoreRootLimb" LimbType="Standard" Offset="0x788C" />
-        <Limb Name="gStalfosLowerNeckRootLimb" LimbType="Standard" Offset="0x7898" />
-        <Limb Name="gStalfosSkullRootLimb" LimbType="Standard" Offset="0x78A4" />
-        <Limb Name="gStalfosLimb7Limb" LimbType="Standard" Offset="0x78B0" />
-        <Limb Name="gStalfosLimb8Limb" LimbType="Standard" Offset="0x78BC" />
-        <Limb Name="gStalfosJawRootLimb" LimbType="Standard" Offset="0x78C8" />
-        <Limb Name="gStalfosJawLimb" LimbType="Standard" Offset="0x78D4" />
-        <Limb Name="gStalfosSkullLimb" LimbType="Standard" Offset="0x78E0" />
-        <Limb Name="gStalfosUpperNeckLimb" LimbType="Standard" Offset="0x78EC" />
-        <Limb Name="gStalfosLowerNeckLimb" LimbType="Standard" Offset="0x78F8" />
-        <Limb Name="gStalfosUpperCoreLimb" LimbType="Standard" Offset="0x7904" />
-        <Limb Name="gStalfosChestLimb" LimbType="Standard" Offset="0x7910" />
-        <Limb Name="gStalfosRightShoulderRootLimb" LimbType="Standard" Offset="0x791C" />
-        <Limb Name="gStalfosRightShoulderArmorRootLimb" LimbType="Standard" Offset="0x7928" />
-        <Limb Name="gStalfosRightShoulderArmorLimb" LimbType="Standard" Offset="0x7934" />
-        <Limb Name="gStalfosLeftShoulderRootLimb" LimbType="Standard" Offset="0x7940" />
-        <Limb Name="gStalfosLeftShoulderArmorRootLimb" LimbType="Standard" Offset="0x794C" />
-        <Limb Name="gStalfosLeftShoulderArmorLimb" LimbType="Standard" Offset="0x7958" />
-        <Limb Name="gStalfosLeftArmRootLimb" LimbType="Standard" Offset="0x7964" />
-        <Limb Name="gStalfosLeftUpperArmRootLimb" LimbType="Standard" Offset="0x7970" />
-        <Limb Name="gStalfosLeftForearmRootLimb" LimbType="Standard" Offset="0x797C" />
-        <Limb Name="gStalfosLeftHandRootLimb" LimbType="Standard" Offset="0x7988" />
-        <Limb Name="gStalfosLeftHandLimb" LimbType="Standard" Offset="0x7994" />
-        <Limb Name="gStalfosShieldLimb" LimbType="Standard" Offset="0x79A0" />
-        <Limb Name="gStalfosLeftForearmLimb" LimbType="Standard" Offset="0x79AC" />
-        <Limb Name="gStalfosLeftUpperArmLimb" LimbType="Standard" Offset="0x79B8" />
-        <Limb Name="gStalfosRightArmRootLimb" LimbType="Standard" Offset="0x79C4" />
-        <Limb Name="gStalfosRightUpperArmRootLimb" LimbType="Standard" Offset="0x79D0" />
-        <Limb Name="gStalfosRightForearmRootLimb" LimbType="Standard" Offset="0x79DC" />
-        <Limb Name="gStalfosRightHandRootLimb" LimbType="Standard" Offset="0x79E8" />
-        <Limb Name="gStalfosSwordLimb" LimbType="Standard" Offset="0x79F4" />
-        <Limb Name="gStalfosRightHandLimb" LimbType="Standard" Offset="0x7A00" />
-        <Limb Name="gStalfosRightForearmLimb" LimbType="Standard" Offset="0x7A0C" />
-        <Limb Name="gStalfosRightUpperArmLimb" LimbType="Standard" Offset="0x7A18" />
-        <Limb Name="gStalfosLowerCoreLimb" LimbType="Standard" Offset="0x7A24" />
-        <Limb Name="gStalfosLowerBodyRootLimb" LimbType="Standard" Offset="0x7A30" />
-        <Limb Name="gStalfosWaistRootLimb" LimbType="Standard" Offset="0x7A3C" />
-        <Limb Name="gStalfosLegsRootLimb" LimbType="Standard" Offset="0x7A48" />
-        <Limb Name="gStalfosLeftLegRootLimb" LimbType="Standard" Offset="0x7A54" />
-        <Limb Name="gStalfosLeftThighRootLimb" LimbType="Standard" Offset="0x7A60" />
-        <Limb Name="gStalfosLeftLowerLegRootLimb" LimbType="Standard" Offset="0x7A6C" />
-        <Limb Name="gStalfosLeftAnkleRootLimb" LimbType="Standard" Offset="0x7A78" />
-        <Limb Name="gStalfosLeftAnkleLimb" LimbType="Standard" Offset="0x7A84" />
-        <Limb Name="gStalfosLeftFootRootLimb" LimbType="Standard" Offset="0x7A90" />
-        <Limb Name="gStalfosLeftFootLimb" LimbType="Standard" Offset="0x7A9C" />
-        <Limb Name="gStalfosLeftLowerLegLimb" LimbType="Standard" Offset="0x7AA8" />
-        <Limb Name="gStalfosLeftThighLimb" LimbType="Standard" Offset="0x7AB4" />
-        <Limb Name="gStalfosRightLegRootLimb" LimbType="Standard" Offset="0x7AC0" />
-        <Limb Name="gStalfosRightThighRootLimb" LimbType="Standard" Offset="0x7ACC" />
-        <Limb Name="gStalfosRightLowerLegRootLimb" LimbType="Standard" Offset="0x7AD8" />
-        <Limb Name="gStalfosRightAnkleRootLimb" LimbType="Standard" Offset="0x7AE4" />
-        <Limb Name="gStalfosRightAnkleLimb" LimbType="Standard" Offset="0x7AF0" />
-        <Limb Name="gStalfosRightFootRootLimb" LimbType="Standard" Offset="0x7AFC" />
-        <Limb Name="gStalfosRightFootLimb" LimbType="Standard" Offset="0x7B08" />
-        <Limb Name="gStalfosRightLowerLegLimb" LimbType="Standard" Offset="0x7B14" />
-        <Limb Name="gStalfosRightThighLimb" LimbType="Standard" Offset="0x7B20" />
-        <Limb Name="gStalfosWaistLimb" LimbType="Standard" Offset="0x7B2C" />
-        <Skeleton Name="gStalfosSkel" Type="Normal" LimbType="Standard" Offset="0x7C28" />
+        <Limb Name="gStalfosRootLimb" LimbType="Standard" Offset="0x7868"/>
+        <Limb Name="gStalfosUpperBodyRootLimb" LimbType="Standard" Offset="0x7874"/>
+        <Limb Name="gStalfosLowerCoreRootLimb" LimbType="Standard" Offset="0x7880"/>
+        <Limb Name="gStalfosUpperCoreRootLimb" LimbType="Standard" Offset="0x788C"/>
+        <Limb Name="gStalfosLowerNeckRootLimb" LimbType="Standard" Offset="0x7898"/>
+        <Limb Name="gStalfosSkullRootLimb" LimbType="Standard" Offset="0x78A4"/>
+        <Limb Name="gStalfosLimb7Limb" LimbType="Standard" Offset="0x78B0"/>
+        <Limb Name="gStalfosLimb8Limb" LimbType="Standard" Offset="0x78BC"/>
+        <Limb Name="gStalfosJawRootLimb" LimbType="Standard" Offset="0x78C8"/>
+        <Limb Name="gStalfosJawLimb" LimbType="Standard" Offset="0x78D4"/>
+        <Limb Name="gStalfosSkullLimb" LimbType="Standard" Offset="0x78E0"/>
+        <Limb Name="gStalfosUpperNeckLimb" LimbType="Standard" Offset="0x78EC"/>
+        <Limb Name="gStalfosLowerNeckLimb" LimbType="Standard" Offset="0x78F8"/>
+        <Limb Name="gStalfosUpperCoreLimb" LimbType="Standard" Offset="0x7904"/>
+        <Limb Name="gStalfosChestLimb" LimbType="Standard" Offset="0x7910"/>
+        <Limb Name="gStalfosRightShoulderRootLimb" LimbType="Standard" Offset="0x791C"/>
+        <Limb Name="gStalfosRightShoulderArmorRootLimb" LimbType="Standard" Offset="0x7928"/>
+        <Limb Name="gStalfosRightShoulderArmorLimb" LimbType="Standard" Offset="0x7934"/>
+        <Limb Name="gStalfosLeftShoulderRootLimb" LimbType="Standard" Offset="0x7940"/>
+        <Limb Name="gStalfosLeftShoulderArmorRootLimb" LimbType="Standard" Offset="0x794C"/>
+        <Limb Name="gStalfosLeftShoulderArmorLimb" LimbType="Standard" Offset="0x7958"/>
+        <Limb Name="gStalfosLeftArmRootLimb" LimbType="Standard" Offset="0x7964"/>
+        <Limb Name="gStalfosLeftUpperArmRootLimb" LimbType="Standard" Offset="0x7970"/>
+        <Limb Name="gStalfosLeftForearmRootLimb" LimbType="Standard" Offset="0x797C"/>
+        <Limb Name="gStalfosLeftHandRootLimb" LimbType="Standard" Offset="0x7988"/>
+        <Limb Name="gStalfosLeftHandLimb" LimbType="Standard" Offset="0x7994"/>
+        <Limb Name="gStalfosShieldLimb" LimbType="Standard" Offset="0x79A0"/>
+        <Limb Name="gStalfosLeftForearmLimb" LimbType="Standard" Offset="0x79AC"/>
+        <Limb Name="gStalfosLeftUpperArmLimb" LimbType="Standard" Offset="0x79B8"/>
+        <Limb Name="gStalfosRightArmRootLimb" LimbType="Standard" Offset="0x79C4"/>
+        <Limb Name="gStalfosRightUpperArmRootLimb" LimbType="Standard" Offset="0x79D0"/>
+        <Limb Name="gStalfosRightForearmRootLimb" LimbType="Standard" Offset="0x79DC"/>
+        <Limb Name="gStalfosRightHandRootLimb" LimbType="Standard" Offset="0x79E8"/>
+        <Limb Name="gStalfosSwordLimb" LimbType="Standard" Offset="0x79F4"/>
+        <Limb Name="gStalfosRightHandLimb" LimbType="Standard" Offset="0x7A00"/>
+        <Limb Name="gStalfosRightForearmLimb" LimbType="Standard" Offset="0x7A0C"/>
+        <Limb Name="gStalfosRightUpperArmLimb" LimbType="Standard" Offset="0x7A18"/>
+        <Limb Name="gStalfosLowerCoreLimb" LimbType="Standard" Offset="0x7A24"/>
+        <Limb Name="gStalfosLowerBodyRootLimb" LimbType="Standard" Offset="0x7A30"/>
+        <Limb Name="gStalfosWaistRootLimb" LimbType="Standard" Offset="0x7A3C"/>
+        <Limb Name="gStalfosLegsRootLimb" LimbType="Standard" Offset="0x7A48"/>
+        <Limb Name="gStalfosLeftLegRootLimb" LimbType="Standard" Offset="0x7A54"/>
+        <Limb Name="gStalfosLeftThighRootLimb" LimbType="Standard" Offset="0x7A60"/>
+        <Limb Name="gStalfosLeftLowerLegRootLimb" LimbType="Standard" Offset="0x7A6C"/>
+        <Limb Name="gStalfosLeftAnkleRootLimb" LimbType="Standard" Offset="0x7A78"/>
+        <Limb Name="gStalfosLeftAnkleLimb" LimbType="Standard" Offset="0x7A84"/>
+        <Limb Name="gStalfosLeftFootRootLimb" LimbType="Standard" Offset="0x7A90"/>
+        <Limb Name="gStalfosLeftFootLimb" LimbType="Standard" Offset="0x7A9C"/>
+        <Limb Name="gStalfosLeftLowerLegLimb" LimbType="Standard" Offset="0x7AA8"/>
+        <Limb Name="gStalfosLeftThighLimb" LimbType="Standard" Offset="0x7AB4"/>
+        <Limb Name="gStalfosRightLegRootLimb" LimbType="Standard" Offset="0x7AC0"/>
+        <Limb Name="gStalfosRightThighRootLimb" LimbType="Standard" Offset="0x7ACC"/>
+        <Limb Name="gStalfosRightLowerLegRootLimb" LimbType="Standard" Offset="0x7AD8"/>
+        <Limb Name="gStalfosRightAnkleRootLimb" LimbType="Standard" Offset="0x7AE4"/>
+        <Limb Name="gStalfosRightAnkleLimb" LimbType="Standard" Offset="0x7AF0"/>
+        <Limb Name="gStalfosRightFootRootLimb" LimbType="Standard" Offset="0x7AFC"/>
+        <Limb Name="gStalfosRightFootLimb" LimbType="Standard" Offset="0x7B08"/>
+        <Limb Name="gStalfosRightLowerLegLimb" LimbType="Standard" Offset="0x7B14"/>
+        <Limb Name="gStalfosRightThighLimb" LimbType="Standard" Offset="0x7B20"/>
+        <Limb Name="gStalfosWaistLimb" LimbType="Standard" Offset="0x7B2C"/>
+        <Skeleton Name="gStalfosSkel" Type="Normal" LimbType="Standard" Offset="0x7C28"/>
 
         <!-- Stalfos Animations -->
-        <Animation Name="gStalfosFlinchFromHitBehindAnim" Offset="0x444" />
-        <Animation Name="gStalfosFallOverBackwardsAnim" Offset="0x1420" />
-        <Animation Name="gStalfosJumpBackwardsAnim" Offset="0x1978" />
-        <Animation Name="gStalfosBlockWithShieldAnim" Offset="0x1C20" />
-        <Animation Name="gStalfosStandAttentionAnim" Offset="0x2188" /><!-- Unused -->
-        <Animation Name="gStalfosFastAdvanceAnim" Offset="0x26D4" />
-        <Animation Name="gStalfosMiddleGuardAnim" Offset="0x316C" />
-        <Animation Name="gStalfosSlowAdvanceAnim" Offset="0x81B4" />
-        <Animation Name="gStalfosFlinchFromHitFrontAnim" Offset="0x8604" />
-        <Animation Name="gStalfosFallOverForwardsAnim" Offset="0x9A90" />
-        <Animation Name="gStalfosLeapAnim" Offset="0x9E50" /><!-- Unused -->
-        <Animation Name="gStalfosJumpAnim" Offset="0xA324" />
-        <Animation Name="gStalfosJumpslashAnim" Offset="0xA99C" />
-        <Animation Name="gStalfosDownSlashAnim" Offset="0xB00C" />
-        <Animation Name="gStalfosRecoverFromDownSlashAnim" Offset="0xB4E4" />
-        <Animation Name="gStalfosUpSlashAnim" Offset="0xBE4C" />
-        <Animation Name="gStalfosLandFromLeapAnim" Offset="0xC438" />
-        <Animation Name="gStalfosLaughAnim" Offset="0xC8A0" /><!-- Unused -->
-        <Animation Name="gStalfosLookAroundAnim" Offset="0xDCF0" /><!-- Unused -->
-        <Animation Name="gStalfosSidestepAnim" Offset="0xE2B0" />
-        <Animation Name="gStalfosReleaseAttentionAnim" Offset="0xE7E4" /><!-- Unused -->
+        <Animation Name="gStalfosFlinchFromHitBehindAnim" Offset="0x444"/>
+        <Animation Name="gStalfosFallOverBackwardsAnim" Offset="0x1420"/>
+        <Animation Name="gStalfosJumpBackwardsAnim" Offset="0x1978"/>
+        <Animation Name="gStalfosBlockWithShieldAnim" Offset="0x1C20"/>
+        <Animation Name="gStalfosStandAttentionAnim" Offset="0x2188"/><!-- Unused -->
+        <Animation Name="gStalfosFastAdvanceAnim" Offset="0x26D4"/>
+        <Animation Name="gStalfosMiddleGuardAnim" Offset="0x316C"/>
+        <Animation Name="gStalfosSlowAdvanceAnim" Offset="0x81B4"/>
+        <Animation Name="gStalfosFlinchFromHitFrontAnim" Offset="0x8604"/>
+        <Animation Name="gStalfosFallOverForwardsAnim" Offset="0x9A90"/>
+        <Animation Name="gStalfosLeapAnim" Offset="0x9E50"/><!-- Unused -->
+        <Animation Name="gStalfosJumpAnim" Offset="0xA324"/>
+        <Animation Name="gStalfosJumpslashAnim" Offset="0xA99C"/>
+        <Animation Name="gStalfosDownSlashAnim" Offset="0xB00C"/>
+        <Animation Name="gStalfosRecoverFromDownSlashAnim" Offset="0xB4E4"/>
+        <Animation Name="gStalfosUpSlashAnim" Offset="0xBE4C"/>
+        <Animation Name="gStalfosLandFromLeapAnim" Offset="0xC438"/>
+        <Animation Name="gStalfosLaughAnim" Offset="0xC8A0"/><!-- Unused -->
+        <Animation Name="gStalfosLookAroundAnim" Offset="0xDCF0"/><!-- Unused -->
+        <Animation Name="gStalfosSidestepAnim" Offset="0xE2B0"/>
+        <Animation Name="gStalfosReleaseAttentionAnim" Offset="0xE7E4"/><!-- Unused -->
     </File>
 </Root>
diff --git a/assets/xml/objects/object_skb.xml b/assets/xml/objects/object_skb.xml
index 06e0b1051..5b5efb484 100644
--- a/assets/xml/objects/object_skb.xml
+++ b/assets/xml/objects/object_skb.xml
@@ -4,25 +4,25 @@
         <Skeleton Name="gStalchildSkel" Type="Normal" LimbType="Standard" Offset="0x41F8"/>
 
         <!-- Stalchild Limbs -->
-        <Limb Name="gStalchildRootLimb" Type="Standard" Offset="0x40C8"/>
-        <Limb Name="gStalchildWaistLimb" Type="Standard" Offset="0x40D4"/>
-        <Limb Name="gStalchildRoot2Limb" Type="Standard" Offset="0x40E0"/>
-        <Limb Name="gStalchildRightFemurLimb" Type="Standard" Offset="0x40EC"/>
-        <Limb Name="gStalchildRightShinLimb" Type="Standard" Offset="0x40F8"/>
-        <Limb Name="gStalchildRightFootLimb" Type="Standard" Offset="0x4104"/>
-        <Limb Name="gStalchildLeftFemurLimb" Type="Standard" Offset="0x4110"/>
-        <Limb Name="gStalchildLeftShinLimb" Type="Standard" Offset="0x411C"/>
-        <Limb Name="gStalchildLeftFootLimb" Type="Standard" Offset="0x4128"/>
-        <Limb Name="gStalchildRibCageLimb" Type="Standard" Offset="0x4134"/>
-        <Limb Name="gStalchildHeadLimb" Type="Standard" Offset="0x4140"/>
-        <Limb Name="gStalchildJawLimb" Type="Standard" Offset="0x414C"/>
-        <Limb Name="gStalchildRightHumerusLimb" Type="Standard" Offset="0x4158"/>
-        <Limb Name="gStalchildRightForearmLimb" Type="Standard" Offset="0x4164"/>
-        <Limb Name="gStalchildRightHandLimb" Type="Standard" Offset="0x4170"/>
-        <Limb Name="gStalchildLeftHumerusLimb" Type="Standard" Offset="0x417C"/>
-        <Limb Name="gStalchildLeftForearmLimb" Type="Standard" Offset="0x4188"/>
-        <Limb Name="gStalchildLeftHandLimb" Type="Standard" Offset="0x4194"/>
-        <Limb Name="gStalchildSpineLimb" Type="Standard" Offset="0x41A0"/>
+        <Limb Name="gStalchildRootLimb" LimbType="Standard" Offset="0x40C8"/>
+        <Limb Name="gStalchildWaistLimb" LimbType="Standard" Offset="0x40D4"/>
+        <Limb Name="gStalchildRoot2Limb" LimbType="Standard" Offset="0x40E0"/>
+        <Limb Name="gStalchildRightFemurLimb" LimbType="Standard" Offset="0x40EC"/>
+        <Limb Name="gStalchildRightShinLimb" LimbType="Standard" Offset="0x40F8"/>
+        <Limb Name="gStalchildRightFootLimb" LimbType="Standard" Offset="0x4104"/>
+        <Limb Name="gStalchildLeftFemurLimb" LimbType="Standard" Offset="0x4110"/>
+        <Limb Name="gStalchildLeftShinLimb" LimbType="Standard" Offset="0x411C"/>
+        <Limb Name="gStalchildLeftFootLimb" LimbType="Standard" Offset="0x4128"/>
+        <Limb Name="gStalchildRibCageLimb" LimbType="Standard" Offset="0x4134"/>
+        <Limb Name="gStalchildHeadLimb" LimbType="Standard" Offset="0x4140"/>
+        <Limb Name="gStalchildJawLimb" LimbType="Standard" Offset="0x414C"/>
+        <Limb Name="gStalchildRightHumerusLimb" LimbType="Standard" Offset="0x4158"/>
+        <Limb Name="gStalchildRightForearmLimb" LimbType="Standard" Offset="0x4164"/>
+        <Limb Name="gStalchildRightHandLimb" LimbType="Standard" Offset="0x4170"/>
+        <Limb Name="gStalchildLeftHumerusLimb" LimbType="Standard" Offset="0x417C"/>
+        <Limb Name="gStalchildLeftForearmLimb" LimbType="Standard" Offset="0x4188"/>
+        <Limb Name="gStalchildLeftHandLimb" LimbType="Standard" Offset="0x4194"/>
+        <Limb Name="gStalchildSpineLimb" LimbType="Standard" Offset="0x41A0"/>
 
         <!-- Stalchild DisplayLists -->
         <DList Name="gStalchildHeadDL" Offset="0x3230"/>
diff --git a/assets/xml/objects/object_spot01_objects2.xml b/assets/xml/objects/object_spot01_objects2.xml
index 3758e2a6c..36741a949 100644
--- a/assets/xml/objects/object_spot01_objects2.xml
+++ b/assets/xml/objects/object_spot01_objects2.xml
@@ -1,6 +1,6 @@
 <Root>
     <File Name="object_spot01_objects2" Segment="6" >
         <!-- Seems to be empty -->
-        <Blob Name="object_spot01_objects2_Blob_000000" Size="0x10" Offset="0x0" />
+        <Blob Name="object_spot01_objects2_Blob_000000" Size="0x10" Offset="0x0"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_ta.xml b/assets/xml/objects/object_ta.xml
index 1fd9f315f..5e446bf5c 100644
--- a/assets/xml/objects/object_ta.xml
+++ b/assets/xml/objects/object_ta.xml
@@ -45,7 +45,7 @@
         <Texture Name="gTalonHeadSkinTex" OutName="head_skin" Format="ci8" Width="8" Height="8" Offset="0x6DC0" TlutOffset="0x6AC0"/>
         <Texture Name="gTalonEarTex" OutName="ear" Format="ci8" Width="8" Height="8" Offset="0x6E00" TlutOffset="0x6AC0"/>
         <Texture Name="gTalonFaceHairTex" OutName="face_hair" Format="ci8" Width="8" Height="16" Offset="0x6E40" TlutOffset="0x6AC0"/>
-        <Texture Name="gTalonRedTex" OutName="red" Format="ci8" Width="8" Height="8" TlutOffset="0x6AC0" Offset="0x7AC0"/>
+        <Texture Name="gTalonRedTex" OutName="red" Format="ci8" Width="8" Height="8" Offset="0x7AC0" TlutOffset="0x6AC0"/>
         <Texture Name="gTalonHeadHairTex" OutName="head_hair" Format="ci8" Width="16" Height="32" Offset="0x7B00" TlutOffset="0x6AC0"/> <!-- Not clear where this is used -->
         <Texture Name="gTalonBootSideTex" OutName="boot_side" Format="ci8" Width="16" Height="16" Offset="0x7D00" TlutOffset="0x6AC0"/>
         <Texture Name="gTalonBootTopTex" OutName="boot_top" Format="ci8" Width="16" Height="16" Offset="0x7E00" TlutOffset="0x6AC0"/>
diff --git a/assets/xml/objects/object_tk.xml b/assets/xml/objects/object_tk.xml
index 781cb3138..6869280e6 100644
--- a/assets/xml/objects/object_tk.xml
+++ b/assets/xml/objects/object_tk.xml
@@ -4,9 +4,9 @@
         <Animation Name="gDampeWalkAnim" Offset="0x1FA8"/>
         <Animation Name="gDampeRestAnim" Offset="0x2F84"/>
         <Animation Name="gDampeFloatAnim" Offset="0x3768"/>
-        <Texture Name="gDampeEyeOpenTex" Offset="0x3B40" OutName="dampe_eye_open" Format="rgba16" Width="32" Height="32"/>
-        <Texture Name="gDampeEyeHalfTex" Offset="0x4340" OutName="dampe_eye_half_open" Format="rgba16" Width="32" Height="32"/>
-        <Texture Name="gDampeEyeClosedTex" Offset="0x4B40" OutName="dampe_eye_closed" Format="rgba16" Width="32" Height="32"/>
+        <Texture Name="gDampeEyeOpenTex" OutName="dampe_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x3B40"/>
+        <Texture Name="gDampeEyeHalfTex" OutName="dampe_eye_half_open" Format="rgba16" Width="32" Height="32" Offset="0x4340"/>
+        <Texture Name="gDampeEyeClosedTex" OutName="dampe_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x4B40"/>
         <Texture Name="gDampeUnkTex" OutName="dampe_unk" Format="ci8" Width="16" Height="16" Offset="0x5540"/>
         <DList Name="gDampeShovelDL" Offset="0xACE0"/>
         <DList Name="gDampeLanternDL" Offset="0xB838"/>
diff --git a/assets/xml/objects/object_toki_objects.xml b/assets/xml/objects/object_toki_objects.xml
index 3d7135ca8..cd07e60d2 100644
--- a/assets/xml/objects/object_toki_objects.xml
+++ b/assets/xml/objects/object_toki_objects.xml
@@ -1,25 +1,25 @@
 <Root>
     <File Name="object_toki_objects" Segment="6">
-        <Texture Name="object_toki_objects_Tex_000000" OutName="tex_000000" Format="i8" Width="32" Height="64" Offset="0x0" />
-        <DList Name="object_toki_objects_DL_000880" Offset="0x880" />
-        <DList Name="object_toki_objects_DL_0009C0" Offset="0x9C0" />
-        <Texture Name="object_toki_objects_Tex_000A30" OutName="tex_000A30" Format="rgba16" Width="16" Height="16" Offset="0xA30" />
-        <Texture Name="object_toki_objects_Tex_000C30" OutName="tex_000C30" Format="rgba16" Width="32" Height="32" Offset="0xC30" />
-        <DList Name="object_toki_objects_DL_001BD0" Offset="0x1BD0" />
-        <DList Name="object_toki_objects_DL_0028E0" Offset="0x28E0" />
-        <Texture Name="object_toki_objects_Tex_002DC0" OutName="tex_002DC0" Format="rgba16" Width="32" Height="32" Offset="0x2DC0" />
-        <Texture Name="object_toki_objects_Tex_0035C0" OutName="tex_0035C0" Format="ia8" Width="64" Height="32" Offset="0x35C0" />
-        <Texture Name="object_toki_objects_Tex_003DC0" OutName="tex_003DC0" Format="rgba16" Width="32" Height="32" Offset="0x3DC0" />
-        <Texture Name="object_toki_objects_Tex_0045C0" OutName="tex_0045C0" Format="i4" Width="64" Height="128" Offset="0x45C0" />
-        <Texture Name="object_toki_objects_Tex_0055C0" OutName="tex_0055C0" Format="rgba16" Width="32" Height="64" Offset="0x55C0" />
-        <Blob Name="object_toki_objects_Blob_0065C0" Size="0xA00" Offset="0x65C0" />
-        <Texture Name="object_toki_objects_Tex_006FC0" OutName="tex_006FC0" Format="rgba16" Width="16" Height="16" Offset="0x6FC0" />
-        <DList Name="object_toki_objects_DL_007440" Offset="0x7440" /> <!-- Door of Time left -->
-        <DList Name="object_toki_objects_DL_007578" Offset="0x7578" /> <!-- Door of Time right -->
+        <Texture Name="object_toki_objects_Tex_000000" OutName="tex_000000" Format="i8" Width="32" Height="64" Offset="0x0"/>
+        <DList Name="object_toki_objects_DL_000880" Offset="0x880"/>
+        <DList Name="object_toki_objects_DL_0009C0" Offset="0x9C0"/>
+        <Texture Name="object_toki_objects_Tex_000A30" OutName="tex_000A30" Format="rgba16" Width="16" Height="16" Offset="0xA30"/>
+        <Texture Name="object_toki_objects_Tex_000C30" OutName="tex_000C30" Format="rgba16" Width="32" Height="32" Offset="0xC30"/>
+        <DList Name="object_toki_objects_DL_001BD0" Offset="0x1BD0"/>
+        <DList Name="object_toki_objects_DL_0028E0" Offset="0x28E0"/>
+        <Texture Name="object_toki_objects_Tex_002DC0" OutName="tex_002DC0" Format="rgba16" Width="32" Height="32" Offset="0x2DC0"/>
+        <Texture Name="object_toki_objects_Tex_0035C0" OutName="tex_0035C0" Format="ia8" Width="64" Height="32" Offset="0x35C0"/>
+        <Texture Name="object_toki_objects_Tex_003DC0" OutName="tex_003DC0" Format="rgba16" Width="32" Height="32" Offset="0x3DC0"/>
+        <Texture Name="object_toki_objects_Tex_0045C0" OutName="tex_0045C0" Format="i4" Width="64" Height="128" Offset="0x45C0"/>
+        <Texture Name="object_toki_objects_Tex_0055C0" OutName="tex_0055C0" Format="rgba16" Width="32" Height="64" Offset="0x55C0"/>
+        <Blob Name="object_toki_objects_Blob_0065C0" Size="0xA00" Offset="0x65C0"/>
+        <Texture Name="object_toki_objects_Tex_006FC0" OutName="tex_006FC0" Format="rgba16" Width="16" Height="16" Offset="0x6FC0"/>
+        <DList Name="object_toki_objects_DL_007440" Offset="0x7440"/> <!-- Door of Time left -->
+        <DList Name="object_toki_objects_DL_007578" Offset="0x7578"/> <!-- Door of Time right -->
         <Collision Name="gDoorTokiCol" Offset="0x7888"/>
-        <DList Name="object_toki_objects_DL_007E20" Offset="0x7E20" />
-        <DList Name="object_toki_objects_DL_007EE0" Offset="0x7EE0" />
-        <DList Name="object_toki_objects_DL_008190" Offset="0x8190" />
-        <DList Name="object_toki_objects_DL_008390" Offset="0x8390" /> <!-- light plane -->
+        <DList Name="object_toki_objects_DL_007E20" Offset="0x7E20"/>
+        <DList Name="object_toki_objects_DL_007EE0" Offset="0x7EE0"/>
+        <DList Name="object_toki_objects_DL_008190" Offset="0x8190"/>
+        <DList Name="object_toki_objects_DL_008390" Offset="0x8390"/> <!-- light plane -->
     </File>
 </Root>
diff --git a/assets/xml/objects/object_tw.xml b/assets/xml/objects/object_tw.xml
index 291f4676d..be4115b2c 100644
--- a/assets/xml/objects/object_tw.xml
+++ b/assets/xml/objects/object_tw.xml
@@ -1,330 +1,330 @@
 <Root>
     <File Name="object_tw" Segment="6">
-        <Animation Name="object_tw_Anim_0004A4" Offset="0x4A4" />
-        <Animation Name="object_tw_Anim_000AAC" Offset="0xAAC" />
-        <Animation Name="object_tw_Anim_0012A4" Offset="0x12A4" />
-        <Animation Name="object_tw_Anim_0017E0" Offset="0x17E0" />
-        <Animation Name="object_tw_Anim_001D10" Offset="0x1D10" />
-        <Animation Name="object_tw_Anim_00230C" Offset="0x230C" />
-        <Animation Name="object_tw_Anim_003614" Offset="0x3614" />
-        <Animation Name="object_tw_Anim_003E34" Offset="0x3E34" />
-        <Animation Name="object_tw_Anim_004548" Offset="0x4548" />
-        <Animation Name="object_tw_Anim_00578C" Offset="0x578C" />
-        <Animation Name="object_tw_Anim_006530" Offset="0x6530" />
-        <Animation Name="object_tw_Anim_006F28" Offset="0x6F28" />
-        <Limb Name="object_tw_Limb_006F40" LimbType="Standard" Offset="0x6F40" />
-        <Limb Name="object_tw_Limb_006F4C" LimbType="Standard" Offset="0x6F4C" />
-        <Limb Name="object_tw_Limb_006F58" LimbType="Standard" Offset="0x6F58" />
-        <Limb Name="object_tw_Limb_006F64" LimbType="Standard" Offset="0x6F64" />
-        <Limb Name="object_tw_Limb_006F70" LimbType="Standard" Offset="0x6F70" />
-        <Limb Name="object_tw_Limb_006F7C" LimbType="Standard" Offset="0x6F7C" />
-        <Limb Name="object_tw_Limb_006F88" LimbType="Standard" Offset="0x6F88" />
-        <Limb Name="object_tw_Limb_006F94" LimbType="Standard" Offset="0x6F94" />
-        <Limb Name="object_tw_Limb_006FA0" LimbType="Standard" Offset="0x6FA0" />
-        <Limb Name="object_tw_Limb_006FAC" LimbType="Standard" Offset="0x6FAC" />
-        <Limb Name="object_tw_Limb_006FB8" LimbType="Standard" Offset="0x6FB8" />
-        <Limb Name="object_tw_Limb_006FC4" LimbType="Standard" Offset="0x6FC4" />
-        <Limb Name="object_tw_Limb_006FD0" LimbType="Standard" Offset="0x6FD0" />
-        <Limb Name="object_tw_Limb_006FDC" LimbType="Standard" Offset="0x6FDC" />
-        <Limb Name="object_tw_Limb_006FE8" LimbType="Standard" Offset="0x6FE8" />
-        <Limb Name="object_tw_Limb_006FF4" LimbType="Standard" Offset="0x6FF4" />
-        <Limb Name="object_tw_Limb_007000" LimbType="Standard" Offset="0x7000" />
-        <Limb Name="object_tw_Limb_00700C" LimbType="Standard" Offset="0x700C" />
-        <Limb Name="object_tw_Limb_007018" LimbType="Standard" Offset="0x7018" />
-        <Limb Name="object_tw_Limb_007024" LimbType="Standard" Offset="0x7024" />
-        <Limb Name="object_tw_Limb_007030" LimbType="Standard" Offset="0x7030" />
-        <Limb Name="object_tw_Limb_00703C" LimbType="Standard" Offset="0x703C" />
-        <Limb Name="object_tw_Limb_007048" LimbType="Standard" Offset="0x7048" />
-        <Limb Name="object_tw_Limb_007054" LimbType="Standard" Offset="0x7054" />
-        <Limb Name="object_tw_Limb_007060" LimbType="Standard" Offset="0x7060" />
-        <Limb Name="object_tw_Limb_00706C" LimbType="Standard" Offset="0x706C" />
-        <Skeleton Name="object_tw_Skel_0070E0" Type="Flex" LimbType="Standard" Offset="0x70E0" />
-        <Animation Name="object_tw_Anim_007688" Offset="0x7688" />
-        <Animation Name="object_tw_Anim_007CA8" Offset="0x7CA8" />
-        <Animation Name="object_tw_Anim_0088C8" Offset="0x88C8" />
-        <Animation Name="object_tw_Anim_009398" Offset="0x9398" />
-        <Animation Name="object_tw_Anim_00947C" Offset="0x947C" />
+        <Animation Name="object_tw_Anim_0004A4" Offset="0x4A4"/>
+        <Animation Name="object_tw_Anim_000AAC" Offset="0xAAC"/>
+        <Animation Name="object_tw_Anim_0012A4" Offset="0x12A4"/>
+        <Animation Name="object_tw_Anim_0017E0" Offset="0x17E0"/>
+        <Animation Name="object_tw_Anim_001D10" Offset="0x1D10"/>
+        <Animation Name="object_tw_Anim_00230C" Offset="0x230C"/>
+        <Animation Name="object_tw_Anim_003614" Offset="0x3614"/>
+        <Animation Name="object_tw_Anim_003E34" Offset="0x3E34"/>
+        <Animation Name="object_tw_Anim_004548" Offset="0x4548"/>
+        <Animation Name="object_tw_Anim_00578C" Offset="0x578C"/>
+        <Animation Name="object_tw_Anim_006530" Offset="0x6530"/>
+        <Animation Name="object_tw_Anim_006F28" Offset="0x6F28"/>
+        <Limb Name="object_tw_Limb_006F40" LimbType="Standard" Offset="0x6F40"/>
+        <Limb Name="object_tw_Limb_006F4C" LimbType="Standard" Offset="0x6F4C"/>
+        <Limb Name="object_tw_Limb_006F58" LimbType="Standard" Offset="0x6F58"/>
+        <Limb Name="object_tw_Limb_006F64" LimbType="Standard" Offset="0x6F64"/>
+        <Limb Name="object_tw_Limb_006F70" LimbType="Standard" Offset="0x6F70"/>
+        <Limb Name="object_tw_Limb_006F7C" LimbType="Standard" Offset="0x6F7C"/>
+        <Limb Name="object_tw_Limb_006F88" LimbType="Standard" Offset="0x6F88"/>
+        <Limb Name="object_tw_Limb_006F94" LimbType="Standard" Offset="0x6F94"/>
+        <Limb Name="object_tw_Limb_006FA0" LimbType="Standard" Offset="0x6FA0"/>
+        <Limb Name="object_tw_Limb_006FAC" LimbType="Standard" Offset="0x6FAC"/>
+        <Limb Name="object_tw_Limb_006FB8" LimbType="Standard" Offset="0x6FB8"/>
+        <Limb Name="object_tw_Limb_006FC4" LimbType="Standard" Offset="0x6FC4"/>
+        <Limb Name="object_tw_Limb_006FD0" LimbType="Standard" Offset="0x6FD0"/>
+        <Limb Name="object_tw_Limb_006FDC" LimbType="Standard" Offset="0x6FDC"/>
+        <Limb Name="object_tw_Limb_006FE8" LimbType="Standard" Offset="0x6FE8"/>
+        <Limb Name="object_tw_Limb_006FF4" LimbType="Standard" Offset="0x6FF4"/>
+        <Limb Name="object_tw_Limb_007000" LimbType="Standard" Offset="0x7000"/>
+        <Limb Name="object_tw_Limb_00700C" LimbType="Standard" Offset="0x700C"/>
+        <Limb Name="object_tw_Limb_007018" LimbType="Standard" Offset="0x7018"/>
+        <Limb Name="object_tw_Limb_007024" LimbType="Standard" Offset="0x7024"/>
+        <Limb Name="object_tw_Limb_007030" LimbType="Standard" Offset="0x7030"/>
+        <Limb Name="object_tw_Limb_00703C" LimbType="Standard" Offset="0x703C"/>
+        <Limb Name="object_tw_Limb_007048" LimbType="Standard" Offset="0x7048"/>
+        <Limb Name="object_tw_Limb_007054" LimbType="Standard" Offset="0x7054"/>
+        <Limb Name="object_tw_Limb_007060" LimbType="Standard" Offset="0x7060"/>
+        <Limb Name="object_tw_Limb_00706C" LimbType="Standard" Offset="0x706C"/>
+        <Skeleton Name="object_tw_Skel_0070E0" Type="Flex" LimbType="Standard" Offset="0x70E0"/>
+        <Animation Name="object_tw_Anim_007688" Offset="0x7688"/>
+        <Animation Name="object_tw_Anim_007CA8" Offset="0x7CA8"/>
+        <Animation Name="object_tw_Anim_0088C8" Offset="0x88C8"/>
+        <Animation Name="object_tw_Anim_009398" Offset="0x9398"/>
+        <Animation Name="object_tw_Anim_00947C" Offset="0x947C"/>
         <!--Blob Name="object_tw_Blob_00948C" Size="0x4" Offset="0x948C" /-->
-        <Texture Name="object_tw_TLUT_009490" OutName="tlut_009490" Format="rgba16" Width="53" Height="4" Offset="0x9490" />
-        <Texture Name="object_tw_Tex_009638" OutName="tex_009638" Format="rgba16" Width="32" Height="32" Offset="0x9638" />
-        <Texture Name="object_tw_Tex_009E38" OutName="tex_009E38" Format="rgba16" Width="16" Height="16" Offset="0x9E38" />
-        <Texture Name="object_tw_Tex_00A038" OutName="tex_00A038" Format="rgba16" Width="16" Height="16" Offset="0xA038" />
-        <Texture Name="object_tw_Tex_00A238" OutName="tex_00A238" Format="rgba16" Width="16" Height="16" Offset="0xA238" />
+        <Texture Name="object_tw_TLUT_009490" OutName="tlut_009490" Format="rgba16" Width="53" Height="4" Offset="0x9490"/>
+        <Texture Name="object_tw_Tex_009638" OutName="tex_009638" Format="rgba16" Width="32" Height="32" Offset="0x9638"/>
+        <Texture Name="object_tw_Tex_009E38" OutName="tex_009E38" Format="rgba16" Width="16" Height="16" Offset="0x9E38"/>
+        <Texture Name="object_tw_Tex_00A038" OutName="tex_00A038" Format="rgba16" Width="16" Height="16" Offset="0xA038"/>
+        <Texture Name="object_tw_Tex_00A238" OutName="tex_00A238" Format="rgba16" Width="16" Height="16" Offset="0xA238"/>
         <!--Blob Name="object_tw_Blob_00A438" Size="0x400" Offset="0xA438" /-->
         <Texture Name="object_tw_Tex_00A838" OutName="tex_00A838" Format="ci8" Width="16" Height="8" Offset="0xA838"  TlutOffset="0x9490"/>
         <Texture Name="object_tw_Tex_00A8B8" OutName="tex_00A8B8" Format="ci8" Width="8" Height="8" Offset="0xA8B8"  TlutOffset="0x9490"/>
-        <Texture Name="object_tw_Tex_00A8F8" OutName="tex_00A8F8" Format="rgba16" Width="8" Height="32" Offset="0xA8F8" />
+        <Texture Name="object_tw_Tex_00A8F8" OutName="tex_00A8F8" Format="rgba16" Width="8" Height="32" Offset="0xA8F8"/>
         <Texture Name="object_tw_Tex_00AAF8" OutName="tex_00AAF8" Format="ci8" Width="8" Height="8" Offset="0xAAF8"  TlutOffset="0x9490"/>
         <Texture Name="object_tw_Tex_00AB38" OutName="tex_00AB38" Format="ci8" Width="8" Height="16" Offset="0xAB38"  TlutOffset="0x9490"/>
-        <Texture Name="object_tw_Tex_00ABB8" OutName="tex_00ABB8" Format="rgba16" Width="8" Height="8" Offset="0xABB8" />
-        <Texture Name="object_tw_Tex_00AC38" OutName="tex_00AC38" Format="rgba16" Width="16" Height="32" Offset="0xAC38" />
-        <Texture Name="object_tw_Tex_00B038" OutName="tex_00B038" Format="rgba16" Width="16" Height="8" Offset="0xB038" />
-        <Texture Name="object_tw_Tex_00B138" OutName="tex_00B138" Format="rgba16" Width="8" Height="8" Offset="0xB138" />
+        <Texture Name="object_tw_Tex_00ABB8" OutName="tex_00ABB8" Format="rgba16" Width="8" Height="8" Offset="0xABB8"/>
+        <Texture Name="object_tw_Tex_00AC38" OutName="tex_00AC38" Format="rgba16" Width="16" Height="32" Offset="0xAC38"/>
+        <Texture Name="object_tw_Tex_00B038" OutName="tex_00B038" Format="rgba16" Width="16" Height="8" Offset="0xB038"/>
+        <Texture Name="object_tw_Tex_00B138" OutName="tex_00B138" Format="rgba16" Width="8" Height="8" Offset="0xB138"/>
         <Texture Name="object_tw_Tex_00B1B8" OutName="tex_00B1B8" Format="ci8" Width="8" Height="8" Offset="0xB1B8"  TlutOffset="0x9490"/>
         <Texture Name="object_tw_Tex_00B1F8" OutName="tex_00B1F8" Format="ci8" Width="8" Height="8" Offset="0xB1F8"  TlutOffset="0x9490"/>
         <!--Blob Name="object_tw_Blob_00B238" Size="0x800" Offset="0xB238" /-->
-        <Texture Name="object_tw_Tex_00BA38" OutName="tex_00BA38" Format="i8" Width="32" Height="32" Offset="0xBA38" />
-        <Texture Name="object_tw_Tex_00BE38" OutName="tex_00BE38" Format="i4" Width="32" Height="64" Offset="0xBE38" />
-        <Texture Name="object_tw_Tex_00C238" OutName="tex_00C238" Format="rgba16" Width="32" Height="32" Offset="0xC238" />
-        <Texture Name="object_tw_Tex_00CA38" OutName="tex_00CA38" Format="rgba16" Width="8" Height="8" Offset="0xCA38" />
-        <Texture Name="object_tw_Tex_00CAB8" OutName="tex_00CAB8" Format="rgba16" Width="16" Height="16" Offset="0xCAB8" />
-        <DList Name="object_tw_DL_0110A8" Offset="0x110A8" />
-        <DList Name="object_tw_DL_0116A0" Offset="0x116A0" />
-        <DList Name="object_tw_DL_011C98" Offset="0x11C98" />
-        <DList Name="object_tw_DL_011E28" Offset="0x11E28" />
-        <DList Name="object_tw_DL_011FB8" Offset="0x11FB8" />
-        <DList Name="object_tw_DL_012018" Offset="0x12018" />
-        <DList Name="object_tw_DL_0120C8" Offset="0x120C8" />
-        <DList Name="object_tw_DL_012178" Offset="0x12178" />
-        <DList Name="object_tw_DL_012210" Offset="0x12210" />
-        <DList Name="object_tw_DL_0122A8" Offset="0x122A8" />
-        <DList Name="object_tw_DL_012410" Offset="0x12410" />
-        <DList Name="object_tw_DL_012578" Offset="0x12578" />
-        <DList Name="object_tw_DL_0126E0" Offset="0x126E0" />
-        <DList Name="object_tw_DL_012848" Offset="0x12848" />
-        <DList Name="object_tw_DL_0128E0" Offset="0x128E0" />
-        <DList Name="object_tw_DL_012978" Offset="0x12978" />
-        <DList Name="object_tw_DL_012A28" Offset="0x12A28" />
-        <DList Name="object_tw_DL_012AD8" Offset="0x12AD8" />
-        <DList Name="object_tw_DL_012B38" Offset="0x12B38" />
-        <DList Name="object_tw_DL_012CE0" Offset="0x12CE0" />
-        <DList Name="object_tw_DL_013310" Offset="0x13310" />
-        <DList Name="object_tw_DL_0134B8" Offset="0x134B8" />
-        <DList Name="object_tw_DL_013AE8" Offset="0x13AE8" />
-        <DList Name="object_tw_DL_013D68" Offset="0x13D68" />
-        <DList Name="object_tw_DL_013E98" Offset="0x13E98" />
-        <DList Name="object_tw_DL_013F98" Offset="0x13F98" />
-        <DList Name="object_tw_DL_014070" Offset="0x14070" />
-        <DList Name="object_tw_DL_014158" Offset="0x14158" />
+        <Texture Name="object_tw_Tex_00BA38" OutName="tex_00BA38" Format="i8" Width="32" Height="32" Offset="0xBA38"/>
+        <Texture Name="object_tw_Tex_00BE38" OutName="tex_00BE38" Format="i4" Width="32" Height="64" Offset="0xBE38"/>
+        <Texture Name="object_tw_Tex_00C238" OutName="tex_00C238" Format="rgba16" Width="32" Height="32" Offset="0xC238"/>
+        <Texture Name="object_tw_Tex_00CA38" OutName="tex_00CA38" Format="rgba16" Width="8" Height="8" Offset="0xCA38"/>
+        <Texture Name="object_tw_Tex_00CAB8" OutName="tex_00CAB8" Format="rgba16" Width="16" Height="16" Offset="0xCAB8"/>
+        <DList Name="object_tw_DL_0110A8" Offset="0x110A8"/>
+        <DList Name="object_tw_DL_0116A0" Offset="0x116A0"/>
+        <DList Name="object_tw_DL_011C98" Offset="0x11C98"/>
+        <DList Name="object_tw_DL_011E28" Offset="0x11E28"/>
+        <DList Name="object_tw_DL_011FB8" Offset="0x11FB8"/>
+        <DList Name="object_tw_DL_012018" Offset="0x12018"/>
+        <DList Name="object_tw_DL_0120C8" Offset="0x120C8"/>
+        <DList Name="object_tw_DL_012178" Offset="0x12178"/>
+        <DList Name="object_tw_DL_012210" Offset="0x12210"/>
+        <DList Name="object_tw_DL_0122A8" Offset="0x122A8"/>
+        <DList Name="object_tw_DL_012410" Offset="0x12410"/>
+        <DList Name="object_tw_DL_012578" Offset="0x12578"/>
+        <DList Name="object_tw_DL_0126E0" Offset="0x126E0"/>
+        <DList Name="object_tw_DL_012848" Offset="0x12848"/>
+        <DList Name="object_tw_DL_0128E0" Offset="0x128E0"/>
+        <DList Name="object_tw_DL_012978" Offset="0x12978"/>
+        <DList Name="object_tw_DL_012A28" Offset="0x12A28"/>
+        <DList Name="object_tw_DL_012AD8" Offset="0x12AD8"/>
+        <DList Name="object_tw_DL_012B38" Offset="0x12B38"/>
+        <DList Name="object_tw_DL_012CE0" Offset="0x12CE0"/>
+        <DList Name="object_tw_DL_013310" Offset="0x13310"/>
+        <DList Name="object_tw_DL_0134B8" Offset="0x134B8"/>
+        <DList Name="object_tw_DL_013AE8" Offset="0x13AE8"/>
+        <DList Name="object_tw_DL_013D68" Offset="0x13D68"/>
+        <DList Name="object_tw_DL_013E98" Offset="0x13E98"/>
+        <DList Name="object_tw_DL_013F98" Offset="0x13F98"/>
+        <DList Name="object_tw_DL_014070" Offset="0x14070"/>
+        <DList Name="object_tw_DL_014158" Offset="0x14158"/>
         <!--Blob Name="object_tw_Blob_015200" Size="0x60" Offset="0x15200" /-->
-        <DList Name="object_tw_DL_015440" Offset="0x15440" />
-        <DList Name="object_tw_DL_015538" Offset="0x15538" />
-        <DList Name="object_tw_DL_015648" Offset="0x15648" />
-        <DList Name="object_tw_DL_015740" Offset="0x15740" />
-        <DList Name="object_tw_DL_015850" Offset="0x15850" />
-        <DList Name="object_tw_DL_015990" Offset="0x15990" />
-        <DList Name="object_tw_DL_015B10" Offset="0x15B10" />
-        <DList Name="object_tw_DL_015C30" Offset="0x15C30" />
-        <DList Name="object_tw_DL_015D58" Offset="0x15D58" />
-        <DList Name="object_tw_DL_015E78" Offset="0x15E78" />
-        <DList Name="object_tw_DL_015FF8" Offset="0x15FF8" />
-        <DList Name="object_tw_DL_016118" Offset="0x16118" />
-        <DList Name="object_tw_DL_016240" Offset="0x16240" />
-        <DList Name="object_tw_DL_016360" Offset="0x16360" />
-        <DList Name="object_tw_DL_0164C0" Offset="0x164C0" />
-        <DList Name="object_tw_DL_0164C8" Offset="0x164C8" />
-        <DList Name="object_tw_DL_0164D0" Offset="0x164D0" />
-        <Texture Name="object_tw_Tex_016650" OutName="tex_016650" Format="rgba16" Width="8" Height="8" Offset="0x16650" />
-        <Texture Name="object_tw_Tex_0166D0" OutName="tex_0166D0" Format="rgba16" Width="4" Height="8" Offset="0x166D0" />
+        <DList Name="object_tw_DL_015440" Offset="0x15440"/>
+        <DList Name="object_tw_DL_015538" Offset="0x15538"/>
+        <DList Name="object_tw_DL_015648" Offset="0x15648"/>
+        <DList Name="object_tw_DL_015740" Offset="0x15740"/>
+        <DList Name="object_tw_DL_015850" Offset="0x15850"/>
+        <DList Name="object_tw_DL_015990" Offset="0x15990"/>
+        <DList Name="object_tw_DL_015B10" Offset="0x15B10"/>
+        <DList Name="object_tw_DL_015C30" Offset="0x15C30"/>
+        <DList Name="object_tw_DL_015D58" Offset="0x15D58"/>
+        <DList Name="object_tw_DL_015E78" Offset="0x15E78"/>
+        <DList Name="object_tw_DL_015FF8" Offset="0x15FF8"/>
+        <DList Name="object_tw_DL_016118" Offset="0x16118"/>
+        <DList Name="object_tw_DL_016240" Offset="0x16240"/>
+        <DList Name="object_tw_DL_016360" Offset="0x16360"/>
+        <DList Name="object_tw_DL_0164C0" Offset="0x164C0"/>
+        <DList Name="object_tw_DL_0164C8" Offset="0x164C8"/>
+        <DList Name="object_tw_DL_0164D0" Offset="0x164D0"/>
+        <Texture Name="object_tw_Tex_016650" OutName="tex_016650" Format="rgba16" Width="8" Height="8" Offset="0x16650"/>
+        <Texture Name="object_tw_Tex_0166D0" OutName="tex_0166D0" Format="rgba16" Width="4" Height="8" Offset="0x166D0"/>
         <!--Blob Name="object_tw_Blob_0176D0" Size="0x60" Offset="0x176D0" /-->
-        <DList Name="object_tw_DL_017910" Offset="0x17910" />
-        <DList Name="object_tw_DL_017A08" Offset="0x17A08" />
-        <DList Name="object_tw_DL_017B18" Offset="0x17B18" />
-        <DList Name="object_tw_DL_017C10" Offset="0x17C10" />
-        <DList Name="object_tw_DL_017D20" Offset="0x17D20" />
-        <DList Name="object_tw_DL_017E60" Offset="0x17E60" />
-        <DList Name="object_tw_DL_017FE0" Offset="0x17FE0" />
-        <DList Name="object_tw_DL_018100" Offset="0x18100" />
-        <DList Name="object_tw_DL_018228" Offset="0x18228" />
-        <DList Name="object_tw_DL_018348" Offset="0x18348" />
-        <DList Name="object_tw_DL_0184C8" Offset="0x184C8" />
-        <DList Name="object_tw_DL_0185E8" Offset="0x185E8" />
-        <DList Name="object_tw_DL_018710" Offset="0x18710" />
-        <DList Name="object_tw_DL_018830" Offset="0x18830" />
-        <DList Name="object_tw_DL_018990" Offset="0x18990" />
-        <DList Name="object_tw_DL_018998" Offset="0x18998" />
-        <DList Name="object_tw_DL_0189A0" Offset="0x189A0" />
-        <Texture Name="object_tw_Tex_018B20" OutName="tex_018B20" Format="rgba16" Width="4" Height="8" Offset="0x18B20" />
-        <Texture Name="object_tw_Tex_018B60" OutName="tex_018B60" Format="i4" Width="32" Height="64" Offset="0x18B60" />
-        <DList Name="object_tw_DL_018FC0" Offset="0x18FC0" /> <!-- Koume Ground Smoke -->
-        <Texture Name="object_tw_Tex_019078" OutName="tex_019078" Format="i8" Width="32" Height="32" Offset="0x19078" />
-        <Texture Name="object_tw_Tex_019478" OutName="tex_019478" Format="i4" Width="32" Height="64" Offset="0x19478" />
-        <DList Name="object_tw_DL_019938" Offset="0x19938" /> <!-- koume Ground Flame -->
-        <Texture Name="object_tw_Tex_019A20" OutName="tex_019A20" Format="i4" Width="32" Height="32" Offset="0x19A20" />
-        <DList Name="object_tw_DL_019D40" Offset="0x19D40" /> <!-- Koume Ground Crater -->
-        <Texture Name="object_tw_Tex_019E00" OutName="tex_019E00" Format="i4" Width="32" Height="64" Offset="0x19E00" />
-        <Texture Name="object_tw_Tex_01A200" OutName="tex_01A200" Format="i4" Width="32" Height="32" Offset="0x1A200" />
-        <DList Name="object_tw_DL_01A430" Offset="0x1A430" />
-        <DList Name="object_tw_DL_01A528" Offset="0x1A528" />
-        <DList Name="object_tw_DL_01A5A8" Offset="0x1A5A8" />
-        <Texture Name="object_tw_Tex_01A5C0" OutName="tex_01A5C0" Format="i8" Width="16" Height="16" Offset="0x1A5C0" />
-        <DList Name="object_tw_DL_01A790" Offset="0x1A790" />
-        <DList Name="object_tw_DL_01A8A0" Offset="0x1A8A0" />
-        <DList Name="object_tw_DL_01A998" Offset="0x1A998" />
-        <DList Name="object_tw_DL_01AA50" Offset="0x1AA50" />
-        <DList Name="object_tw_DL_01AB00" Offset="0x1AB00" />
-        <Texture Name="object_tw_Tex_01AB20" OutName="tex_01AB20" Format="i8" Width="64" Height="64" Offset="0x1AB20" />
+        <DList Name="object_tw_DL_017910" Offset="0x17910"/>
+        <DList Name="object_tw_DL_017A08" Offset="0x17A08"/>
+        <DList Name="object_tw_DL_017B18" Offset="0x17B18"/>
+        <DList Name="object_tw_DL_017C10" Offset="0x17C10"/>
+        <DList Name="object_tw_DL_017D20" Offset="0x17D20"/>
+        <DList Name="object_tw_DL_017E60" Offset="0x17E60"/>
+        <DList Name="object_tw_DL_017FE0" Offset="0x17FE0"/>
+        <DList Name="object_tw_DL_018100" Offset="0x18100"/>
+        <DList Name="object_tw_DL_018228" Offset="0x18228"/>
+        <DList Name="object_tw_DL_018348" Offset="0x18348"/>
+        <DList Name="object_tw_DL_0184C8" Offset="0x184C8"/>
+        <DList Name="object_tw_DL_0185E8" Offset="0x185E8"/>
+        <DList Name="object_tw_DL_018710" Offset="0x18710"/>
+        <DList Name="object_tw_DL_018830" Offset="0x18830"/>
+        <DList Name="object_tw_DL_018990" Offset="0x18990"/>
+        <DList Name="object_tw_DL_018998" Offset="0x18998"/>
+        <DList Name="object_tw_DL_0189A0" Offset="0x189A0"/>
+        <Texture Name="object_tw_Tex_018B20" OutName="tex_018B20" Format="rgba16" Width="4" Height="8" Offset="0x18B20"/>
+        <Texture Name="object_tw_Tex_018B60" OutName="tex_018B60" Format="i4" Width="32" Height="64" Offset="0x18B60"/>
+        <DList Name="object_tw_DL_018FC0" Offset="0x18FC0"/> <!-- Koume Ground Smoke -->
+        <Texture Name="object_tw_Tex_019078" OutName="tex_019078" Format="i8" Width="32" Height="32" Offset="0x19078"/>
+        <Texture Name="object_tw_Tex_019478" OutName="tex_019478" Format="i4" Width="32" Height="64" Offset="0x19478"/>
+        <DList Name="object_tw_DL_019938" Offset="0x19938"/> <!-- koume Ground Flame -->
+        <Texture Name="object_tw_Tex_019A20" OutName="tex_019A20" Format="i4" Width="32" Height="32" Offset="0x19A20"/>
+        <DList Name="object_tw_DL_019D40" Offset="0x19D40"/> <!-- Koume Ground Crater -->
+        <Texture Name="object_tw_Tex_019E00" OutName="tex_019E00" Format="i4" Width="32" Height="64" Offset="0x19E00"/>
+        <Texture Name="object_tw_Tex_01A200" OutName="tex_01A200" Format="i4" Width="32" Height="32" Offset="0x1A200"/>
+        <DList Name="object_tw_DL_01A430" Offset="0x1A430"/>
+        <DList Name="object_tw_DL_01A528" Offset="0x1A528"/>
+        <DList Name="object_tw_DL_01A5A8" Offset="0x1A5A8"/>
+        <Texture Name="object_tw_Tex_01A5C0" OutName="tex_01A5C0" Format="i8" Width="16" Height="16" Offset="0x1A5C0"/>
+        <DList Name="object_tw_DL_01A790" Offset="0x1A790"/>
+        <DList Name="object_tw_DL_01A8A0" Offset="0x1A8A0"/>
+        <DList Name="object_tw_DL_01A998" Offset="0x1A998"/>
+        <DList Name="object_tw_DL_01AA50" Offset="0x1AA50"/>
+        <DList Name="object_tw_DL_01AB00" Offset="0x1AB00"/>
+        <Texture Name="object_tw_Tex_01AB20" OutName="tex_01AB20" Format="i8" Width="64" Height="64" Offset="0x1AB20"/>
         <!--Blob Name="object_tw_Blob_01BB20" Size="0x40" Offset="0x1BB20" /-->
-        <DList Name="object_tw_DL_01BC00" Offset="0x1BC00" />
-        <Texture Name="object_tw_Tex_01BCA0" OutName="tex_01BCA0" Format="i4" Width="32" Height="64" Offset="0x1BCA0" />
-        <Texture Name="object_tw_Tex_01C0A0" OutName="tex_01C0A0" Format="i4" Width="16" Height="16" Offset="0x1C0A0" />
-        <DList Name="object_tw_DL_01C1C0" Offset="0x1C1C0" />
-        <Texture Name="object_tw_Tex_01C2A0" OutName="tex_01C2A0" Format="i4" Width="32" Height="64" Offset="0x1C2A0" />
-        <Texture Name="object_tw_Tex_01C6A0" OutName="tex_01C6A0" Format="i4" Width="64" Height="64" Offset="0x1C6A0" />
-        <DList Name="object_tw_DL_01CEE0" Offset="0x1CEE0" />
-        <Texture Name="object_tw_Tex_01CFA8" OutName="tex_01CFA8" Format="i4" Width="32" Height="64" Offset="0x1CFA8" />
-        <Texture Name="object_tw_Tex_01D3A8" OutName="tex_01D3A8" Format="i4" Width="64" Height="64" Offset="0x1D3A8" />
-        <DList Name="object_tw_DL_01DBE8" Offset="0x1DBE8" />
-        <DList Name="object_tw_DL_01DDF0" Offset="0x1DDF0" />
-        <DList Name="object_tw_DL_01E020" Offset="0x1E020" />
-        <DList Name="object_tw_DL_01E0E0" Offset="0x1E0E0" />
-        <DList Name="object_tw_DL_01E2C0" Offset="0x1E2C0" />
-        <DList Name="object_tw_DL_01E3A0" Offset="0x1E3A0" />
-        <Texture Name="object_tw_Tex_01E430" OutName="tex_01E430" Format="i4" Width="32" Height="32" Offset="0x1E430" />
-        <DList Name="object_tw_DL_01E9F0" Offset="0x1E9F0" />
-        <Texture Name="object_tw_Tex_01EB28" OutName="tex_01EB28" Format="i8" Width="16" Height="16" Offset="0x1EB28" />
-        <DList Name="object_tw_DL_01EC68" Offset="0x1EC68" />
-        <Texture Name="object_tw_Tex_01ECF0" OutName="tex_01ECF0" Format="i4" Width="16" Height="16" Offset="0x1ECF0" />
-        <DList Name="object_tw_DL_01EEB0" Offset="0x1EEB0" />
-        <DList Name="object_tw_DL_01F238" Offset="0x1F238" />
-        <DList Name="object_tw_DL_01F390" Offset="0x1F390" />
-        <DList Name="object_tw_DL_01F608" Offset="0x1F608" />
-        <Limb Name="object_tw_Limb_01F6E8" LimbType="Standard" Offset="0x1F6E8" />
-        <Limb Name="object_tw_Limb_01F6F4" LimbType="Standard" Offset="0x1F6F4" />
-        <Limb Name="object_tw_Limb_01F700" LimbType="Standard" Offset="0x1F700" />
-        <Limb Name="object_tw_Limb_01F70C" LimbType="Standard" Offset="0x1F70C" />
-        <Limb Name="object_tw_Limb_01F718" LimbType="Standard" Offset="0x1F718" />
-        <Limb Name="object_tw_Limb_01F724" LimbType="Standard" Offset="0x1F724" />
-        <Limb Name="object_tw_Limb_01F730" LimbType="Standard" Offset="0x1F730" />
-        <Limb Name="object_tw_Limb_01F73C" LimbType="Standard" Offset="0x1F73C" />
-        <Limb Name="object_tw_Limb_01F748" LimbType="Standard" Offset="0x1F748" />
-        <Limb Name="object_tw_Limb_01F754" LimbType="Standard" Offset="0x1F754" />
-        <Limb Name="object_tw_Limb_01F760" LimbType="Standard" Offset="0x1F760" />
-        <Limb Name="object_tw_Limb_01F76C" LimbType="Standard" Offset="0x1F76C" />
-        <Limb Name="object_tw_Limb_01F778" LimbType="Standard" Offset="0x1F778" />
-        <Limb Name="object_tw_Limb_01F784" LimbType="Standard" Offset="0x1F784" />
-        <Limb Name="object_tw_Limb_01F790" LimbType="Standard" Offset="0x1F790" />
-        <Limb Name="object_tw_Limb_01F79C" LimbType="Standard" Offset="0x1F79C" />
-        <Limb Name="object_tw_Limb_01F7A8" LimbType="Standard" Offset="0x1F7A8" />
-        <Limb Name="object_tw_Limb_01F7B4" LimbType="Standard" Offset="0x1F7B4" />
-        <Limb Name="object_tw_Limb_01F7C0" LimbType="Standard" Offset="0x1F7C0" />
-        <Limb Name="object_tw_Limb_01F7CC" LimbType="Standard" Offset="0x1F7CC" />
-        <Limb Name="object_tw_Limb_01F7D8" LimbType="Standard" Offset="0x1F7D8" />
-        <Limb Name="object_tw_Limb_01F7E4" LimbType="Standard" Offset="0x1F7E4" />
-        <Limb Name="object_tw_Limb_01F7F0" LimbType="Standard" Offset="0x1F7F0" />
-        <Limb Name="object_tw_Limb_01F7FC" LimbType="Standard" Offset="0x1F7FC" />
-        <Limb Name="object_tw_Limb_01F808" LimbType="Standard" Offset="0x1F808" />
-        <Limb Name="object_tw_Limb_01F814" LimbType="Standard" Offset="0x1F814" />
-        <Skeleton Name="object_tw_Skel_01F888" Type="Flex" LimbType="Standard" Offset="0x1F888" />
-        <Animation Name="object_tw_Anim_0216DC" Offset="0x216DC" />
-        <Animation Name="object_tw_Anim_022700" Offset="0x22700" />
-        <Animation Name="object_tw_Anim_023750" Offset="0x23750" />
-        <Animation Name="object_tw_Anim_024374" Offset="0x24374" />
-        <Animation Name="object_tw_Anim_0244B4" Offset="0x244B4" />
-        <Texture Name="object_tw_Tex_0244D0" OutName="tex_0244D0" Format="rgba16" Width="4" Height="8" Offset="0x244D0" />
-        <Texture Name="object_tw_Tex_024510" OutName="tex_024510" Format="rgba16" Width="16" Height="16" Offset="0x24510" />
-        <Texture Name="object_tw_Tex_024710" OutName="tex_024710" Format="rgba16" Width="16" Height="16" Offset="0x24710" />
-        <Texture Name="object_tw_Tex_024910" OutName="tex_024910" Format="rgba16" Width="16" Height="16" Offset="0x24910" />
-        <Texture Name="object_tw_Tex_024B10" OutName="tex_024B10" Format="rgba16" Width="16" Height="16" Offset="0x24B10" />
-        <DList Name="object_tw_DL_027720" Offset="0x27720" />
-        <DList Name="object_tw_DL_027820" Offset="0x27820" />
-        <DList Name="object_tw_DL_027970" Offset="0x27970" />
-        <DList Name="object_tw_DL_027A60" Offset="0x27A60" />
-        <DList Name="object_tw_DL_027B78" Offset="0x27B78" />
-        <DList Name="object_tw_DL_027C98" Offset="0x27C98" />
-        <DList Name="object_tw_DL_027DE8" Offset="0x27DE8" />
-        <DList Name="object_tw_DL_027EE0" Offset="0x27EE0" />
-        <DList Name="object_tw_DL_027FE8" Offset="0x27FE8" />
-        <DList Name="object_tw_DL_028100" Offset="0x28100" />
-        <DList Name="object_tw_DL_028220" Offset="0x28220" />
-        <DList Name="object_tw_DL_028370" Offset="0x28370" />
-        <DList Name="object_tw_DL_028468" Offset="0x28468" />
-        <DList Name="object_tw_DL_028570" Offset="0x28570" />
-        <DList Name="object_tw_DL_028668" Offset="0x28668" />
-        <DList Name="object_tw_DL_028778" Offset="0x28778" />
-        <DList Name="object_tw_DL_028870" Offset="0x28870" />
-        <DList Name="object_tw_DL_028980" Offset="0x28980" />
-        <DList Name="object_tw_DL_028B78" Offset="0x28B78" />
-        <DList Name="object_tw_DL_028D70" Offset="0x28D70" />
-        <DList Name="object_tw_DL_029268" Offset="0x29268" />
-        <DList Name="object_tw_DL_0293E0" Offset="0x293E0" />
-        <DList Name="object_tw_DL_029530" Offset="0x29530" />
-        <DList Name="object_tw_DL_029620" Offset="0x29620" />
-        <DList Name="object_tw_DL_029738" Offset="0x29738" />
-        <DList Name="object_tw_DL_029900" Offset="0x29900" />
-        <DList Name="object_tw_DL_0299F8" Offset="0x299F8" />
-        <DList Name="object_tw_DL_029B10" Offset="0x29B10" />
-        <Texture Name="object_tw_TLUT_029E50" OutName="tlut_029E50" Format="rgba16" Width="29" Height="8" Offset="0x29E50" />
-        <Texture Name="object_tw_TLUT_02A020" OutName="tlut_02A020" Format="rgba16" Width="16" Height="16" Offset="0x2A020" />
+        <DList Name="object_tw_DL_01BC00" Offset="0x1BC00"/>
+        <Texture Name="object_tw_Tex_01BCA0" OutName="tex_01BCA0" Format="i4" Width="32" Height="64" Offset="0x1BCA0"/>
+        <Texture Name="object_tw_Tex_01C0A0" OutName="tex_01C0A0" Format="i4" Width="16" Height="16" Offset="0x1C0A0"/>
+        <DList Name="object_tw_DL_01C1C0" Offset="0x1C1C0"/>
+        <Texture Name="object_tw_Tex_01C2A0" OutName="tex_01C2A0" Format="i4" Width="32" Height="64" Offset="0x1C2A0"/>
+        <Texture Name="object_tw_Tex_01C6A0" OutName="tex_01C6A0" Format="i4" Width="64" Height="64" Offset="0x1C6A0"/>
+        <DList Name="object_tw_DL_01CEE0" Offset="0x1CEE0"/>
+        <Texture Name="object_tw_Tex_01CFA8" OutName="tex_01CFA8" Format="i4" Width="32" Height="64" Offset="0x1CFA8"/>
+        <Texture Name="object_tw_Tex_01D3A8" OutName="tex_01D3A8" Format="i4" Width="64" Height="64" Offset="0x1D3A8"/>
+        <DList Name="object_tw_DL_01DBE8" Offset="0x1DBE8"/>
+        <DList Name="object_tw_DL_01DDF0" Offset="0x1DDF0"/>
+        <DList Name="object_tw_DL_01E020" Offset="0x1E020"/>
+        <DList Name="object_tw_DL_01E0E0" Offset="0x1E0E0"/>
+        <DList Name="object_tw_DL_01E2C0" Offset="0x1E2C0"/>
+        <DList Name="object_tw_DL_01E3A0" Offset="0x1E3A0"/>
+        <Texture Name="object_tw_Tex_01E430" OutName="tex_01E430" Format="i4" Width="32" Height="32" Offset="0x1E430"/>
+        <DList Name="object_tw_DL_01E9F0" Offset="0x1E9F0"/>
+        <Texture Name="object_tw_Tex_01EB28" OutName="tex_01EB28" Format="i8" Width="16" Height="16" Offset="0x1EB28"/>
+        <DList Name="object_tw_DL_01EC68" Offset="0x1EC68"/>
+        <Texture Name="object_tw_Tex_01ECF0" OutName="tex_01ECF0" Format="i4" Width="16" Height="16" Offset="0x1ECF0"/>
+        <DList Name="object_tw_DL_01EEB0" Offset="0x1EEB0"/>
+        <DList Name="object_tw_DL_01F238" Offset="0x1F238"/>
+        <DList Name="object_tw_DL_01F390" Offset="0x1F390"/>
+        <DList Name="object_tw_DL_01F608" Offset="0x1F608"/>
+        <Limb Name="object_tw_Limb_01F6E8" LimbType="Standard" Offset="0x1F6E8"/>
+        <Limb Name="object_tw_Limb_01F6F4" LimbType="Standard" Offset="0x1F6F4"/>
+        <Limb Name="object_tw_Limb_01F700" LimbType="Standard" Offset="0x1F700"/>
+        <Limb Name="object_tw_Limb_01F70C" LimbType="Standard" Offset="0x1F70C"/>
+        <Limb Name="object_tw_Limb_01F718" LimbType="Standard" Offset="0x1F718"/>
+        <Limb Name="object_tw_Limb_01F724" LimbType="Standard" Offset="0x1F724"/>
+        <Limb Name="object_tw_Limb_01F730" LimbType="Standard" Offset="0x1F730"/>
+        <Limb Name="object_tw_Limb_01F73C" LimbType="Standard" Offset="0x1F73C"/>
+        <Limb Name="object_tw_Limb_01F748" LimbType="Standard" Offset="0x1F748"/>
+        <Limb Name="object_tw_Limb_01F754" LimbType="Standard" Offset="0x1F754"/>
+        <Limb Name="object_tw_Limb_01F760" LimbType="Standard" Offset="0x1F760"/>
+        <Limb Name="object_tw_Limb_01F76C" LimbType="Standard" Offset="0x1F76C"/>
+        <Limb Name="object_tw_Limb_01F778" LimbType="Standard" Offset="0x1F778"/>
+        <Limb Name="object_tw_Limb_01F784" LimbType="Standard" Offset="0x1F784"/>
+        <Limb Name="object_tw_Limb_01F790" LimbType="Standard" Offset="0x1F790"/>
+        <Limb Name="object_tw_Limb_01F79C" LimbType="Standard" Offset="0x1F79C"/>
+        <Limb Name="object_tw_Limb_01F7A8" LimbType="Standard" Offset="0x1F7A8"/>
+        <Limb Name="object_tw_Limb_01F7B4" LimbType="Standard" Offset="0x1F7B4"/>
+        <Limb Name="object_tw_Limb_01F7C0" LimbType="Standard" Offset="0x1F7C0"/>
+        <Limb Name="object_tw_Limb_01F7CC" LimbType="Standard" Offset="0x1F7CC"/>
+        <Limb Name="object_tw_Limb_01F7D8" LimbType="Standard" Offset="0x1F7D8"/>
+        <Limb Name="object_tw_Limb_01F7E4" LimbType="Standard" Offset="0x1F7E4"/>
+        <Limb Name="object_tw_Limb_01F7F0" LimbType="Standard" Offset="0x1F7F0"/>
+        <Limb Name="object_tw_Limb_01F7FC" LimbType="Standard" Offset="0x1F7FC"/>
+        <Limb Name="object_tw_Limb_01F808" LimbType="Standard" Offset="0x1F808"/>
+        <Limb Name="object_tw_Limb_01F814" LimbType="Standard" Offset="0x1F814"/>
+        <Skeleton Name="object_tw_Skel_01F888" Type="Flex" LimbType="Standard" Offset="0x1F888"/>
+        <Animation Name="object_tw_Anim_0216DC" Offset="0x216DC"/>
+        <Animation Name="object_tw_Anim_022700" Offset="0x22700"/>
+        <Animation Name="object_tw_Anim_023750" Offset="0x23750"/>
+        <Animation Name="object_tw_Anim_024374" Offset="0x24374"/>
+        <Animation Name="object_tw_Anim_0244B4" Offset="0x244B4"/>
+        <Texture Name="object_tw_Tex_0244D0" OutName="tex_0244D0" Format="rgba16" Width="4" Height="8" Offset="0x244D0"/>
+        <Texture Name="object_tw_Tex_024510" OutName="tex_024510" Format="rgba16" Width="16" Height="16" Offset="0x24510"/>
+        <Texture Name="object_tw_Tex_024710" OutName="tex_024710" Format="rgba16" Width="16" Height="16" Offset="0x24710"/>
+        <Texture Name="object_tw_Tex_024910" OutName="tex_024910" Format="rgba16" Width="16" Height="16" Offset="0x24910"/>
+        <Texture Name="object_tw_Tex_024B10" OutName="tex_024B10" Format="rgba16" Width="16" Height="16" Offset="0x24B10"/>
+        <DList Name="object_tw_DL_027720" Offset="0x27720"/>
+        <DList Name="object_tw_DL_027820" Offset="0x27820"/>
+        <DList Name="object_tw_DL_027970" Offset="0x27970"/>
+        <DList Name="object_tw_DL_027A60" Offset="0x27A60"/>
+        <DList Name="object_tw_DL_027B78" Offset="0x27B78"/>
+        <DList Name="object_tw_DL_027C98" Offset="0x27C98"/>
+        <DList Name="object_tw_DL_027DE8" Offset="0x27DE8"/>
+        <DList Name="object_tw_DL_027EE0" Offset="0x27EE0"/>
+        <DList Name="object_tw_DL_027FE8" Offset="0x27FE8"/>
+        <DList Name="object_tw_DL_028100" Offset="0x28100"/>
+        <DList Name="object_tw_DL_028220" Offset="0x28220"/>
+        <DList Name="object_tw_DL_028370" Offset="0x28370"/>
+        <DList Name="object_tw_DL_028468" Offset="0x28468"/>
+        <DList Name="object_tw_DL_028570" Offset="0x28570"/>
+        <DList Name="object_tw_DL_028668" Offset="0x28668"/>
+        <DList Name="object_tw_DL_028778" Offset="0x28778"/>
+        <DList Name="object_tw_DL_028870" Offset="0x28870"/>
+        <DList Name="object_tw_DL_028980" Offset="0x28980"/>
+        <DList Name="object_tw_DL_028B78" Offset="0x28B78"/>
+        <DList Name="object_tw_DL_028D70" Offset="0x28D70"/>
+        <DList Name="object_tw_DL_029268" Offset="0x29268"/>
+        <DList Name="object_tw_DL_0293E0" Offset="0x293E0"/>
+        <DList Name="object_tw_DL_029530" Offset="0x29530"/>
+        <DList Name="object_tw_DL_029620" Offset="0x29620"/>
+        <DList Name="object_tw_DL_029738" Offset="0x29738"/>
+        <DList Name="object_tw_DL_029900" Offset="0x29900"/>
+        <DList Name="object_tw_DL_0299F8" Offset="0x299F8"/>
+        <DList Name="object_tw_DL_029B10" Offset="0x29B10"/>
+        <Texture Name="object_tw_TLUT_029E50" OutName="tlut_029E50" Format="rgba16" Width="29" Height="8" Offset="0x29E50"/>
+        <Texture Name="object_tw_TLUT_02A020" OutName="tlut_02A020" Format="rgba16" Width="16" Height="16" Offset="0x2A020"/>
         <!--Blob Name="object_tw_Blob_02A220" Size="0x650" Offset="0x2A220" /-->
         <Texture Name="object_tw_Tex_02A870" OutName="tex_02A870" Format="ci8" Width="16" Height="16" Offset="0x2A870"  TlutOffset="0x29e50"/>
-        <Texture Name="object_tw_Tex_02A970" OutName="tex_02A970" Format="rgba16" Width="8" Height="4" Offset="0x2A970" />
+        <Texture Name="object_tw_Tex_02A970" OutName="tex_02A970" Format="rgba16" Width="8" Height="4" Offset="0x2A970"/>
         <!--Blob Name="object_tw_Blob_02A9B0" Size="0x400" Offset="0x2A9B0" /-->
-        <Texture Name="object_tw_Tex_02ADB0" OutName="tex_02ADB0" Format="i8" Width="8" Height="8" Offset="0x2ADB0" />
+        <Texture Name="object_tw_Tex_02ADB0" OutName="tex_02ADB0" Format="i8" Width="8" Height="8" Offset="0x2ADB0"/>
         <Texture Name="object_tw_Tex_02ADF0" OutName="tex_02ADF0" Format="ci8" Width="8" Height="8" Offset="0x2ADF0"  TlutOffset="0x2A020"/>
         <Texture Name="object_tw_Tex_02AE30" OutName="tex_02AE30" Format="ci8" Width="16" Height="16" Offset="0x2AE30"  TlutOffset="0x29e50"/>
         <Texture Name="object_tw_Tex_02AF30" OutName="tex_02AF30" Format="ci8" Width="8" Height="16" Offset="0x2AF30"  TlutOffset="0x2A020"/>
-        <DList Name="object_tw_DL_02CAF0" Offset="0x2CAF0" />
-        <DList Name="object_tw_DL_02CB50" Offset="0x2CB50" />
-        <DList Name="object_tw_DL_02CBB0" Offset="0x2CBB0" />
-        <DList Name="object_tw_DL_02D320" Offset="0x2D320" />
-        <DList Name="object_tw_DL_02D4A0" Offset="0x2D4A0" />
-        <DList Name="object_tw_DL_02D5D8" Offset="0x2D5D8" />
-        <DList Name="object_tw_DL_02D710" Offset="0x2D710" />
-        <DList Name="object_tw_DL_02D890" Offset="0x2D890" />
-        <DList Name="object_tw_DL_02D940" Offset="0x2D940" />
-        <DList Name="object_tw_DL_02D9F0" Offset="0x2D9F0" />
-        <DList Name="object_tw_DL_02DAE0" Offset="0x2DAE0" />
-        <DList Name="object_tw_DL_02DBC8" Offset="0x2DBC8" />
-        <DList Name="object_tw_DL_02DCB8" Offset="0x2DCB8" />
-        <DList Name="object_tw_DL_02DDD8" Offset="0x2DDD8" />
-        <DList Name="object_tw_DL_02DEB0" Offset="0x2DEB0" />
-        <DList Name="object_tw_DL_02DFB0" Offset="0x2DFB0" />
-        <DList Name="object_tw_DL_02E098" Offset="0x2E098" />
-        <Blob Name="object_tw_Blob_02E170" Size="0x3C00" Offset="0x2E170" /> <!-- boss title card -->
-        <Limb Name="object_tw_Limb_031D70" LimbType="Standard" Offset="0x31D70" />
-        <Limb Name="object_tw_Limb_031D7C" LimbType="Standard" Offset="0x31D7C" />
-        <Limb Name="object_tw_Limb_031D88" LimbType="Standard" Offset="0x31D88" />
-        <Limb Name="object_tw_Limb_031D94" LimbType="Standard" Offset="0x31D94" />
-        <Limb Name="object_tw_Limb_031DA0" LimbType="Standard" Offset="0x31DA0" />
-        <Limb Name="object_tw_Limb_031DAC" LimbType="Standard" Offset="0x31DAC" />
-        <Limb Name="object_tw_Limb_031DB8" LimbType="Standard" Offset="0x31DB8" />
-        <Limb Name="object_tw_Limb_031DC4" LimbType="Standard" Offset="0x31DC4" />
-        <Limb Name="object_tw_Limb_031DD0" LimbType="Standard" Offset="0x31DD0" />
-        <Limb Name="object_tw_Limb_031DDC" LimbType="Standard" Offset="0x31DDC" />
-        <Limb Name="object_tw_Limb_031DE8" LimbType="Standard" Offset="0x31DE8" />
-        <Limb Name="object_tw_Limb_031DF4" LimbType="Standard" Offset="0x31DF4" />
-        <Limb Name="object_tw_Limb_031E00" LimbType="Standard" Offset="0x31E00" />
-        <Limb Name="object_tw_Limb_031E0C" LimbType="Standard" Offset="0x31E0C" />
-        <Limb Name="object_tw_Limb_031E18" LimbType="Standard" Offset="0x31E18" />
-        <Limb Name="object_tw_Limb_031E24" LimbType="Standard" Offset="0x31E24" />
-        <Limb Name="object_tw_Limb_031E30" LimbType="Standard" Offset="0x31E30" />
-        <Limb Name="object_tw_Limb_031E3C" LimbType="Standard" Offset="0x31E3C" />
-        <Limb Name="object_tw_Limb_031E48" LimbType="Standard" Offset="0x31E48" />
-        <Limb Name="object_tw_Limb_031E54" LimbType="Standard" Offset="0x31E54" />
-        <Limb Name="object_tw_Limb_031E60" LimbType="Standard" Offset="0x31E60" />
-        <Limb Name="object_tw_Limb_031E6C" LimbType="Standard" Offset="0x31E6C" />
-        <Limb Name="object_tw_Limb_031E78" LimbType="Standard" Offset="0x31E78" />
-        <Limb Name="object_tw_Limb_031E84" LimbType="Standard" Offset="0x31E84" />
-        <Limb Name="object_tw_Limb_031E90" LimbType="Standard" Offset="0x31E90" />
-        <Limb Name="object_tw_Limb_031E9C" LimbType="Standard" Offset="0x31E9C" />
-        <Limb Name="object_tw_Limb_031EA8" LimbType="Standard" Offset="0x31EA8" />
-        <Limb Name="object_tw_Limb_031EB4" LimbType="Standard" Offset="0x31EB4" />
-        <Limb Name="object_tw_Limb_031EC0" LimbType="Standard" Offset="0x31EC0" />
-        <Limb Name="object_tw_Limb_031ECC" LimbType="Standard" Offset="0x31ECC" />
-        <Limb Name="object_tw_Limb_031ED8" LimbType="Standard" Offset="0x31ED8" />
-        <Limb Name="object_tw_Limb_031EE4" LimbType="Standard" Offset="0x31EE4" />
-        <Limb Name="object_tw_Limb_031EF0" LimbType="Standard" Offset="0x31EF0" />
-        <Limb Name="object_tw_Limb_031EFC" LimbType="Standard" Offset="0x31EFC" />
-        <Limb Name="object_tw_Limb_031F08" LimbType="Standard" Offset="0x31F08" />
-        <Limb Name="object_tw_Limb_031F14" LimbType="Standard" Offset="0x31F14" />
-        <Limb Name="object_tw_Limb_031F20" LimbType="Standard" Offset="0x31F20" />
-        <Limb Name="object_tw_Limb_031F2C" LimbType="Standard" Offset="0x31F2C" />
-        <Limb Name="object_tw_Limb_031F38" LimbType="Standard" Offset="0x31F38" />
-        <Limb Name="object_tw_Limb_031F44" LimbType="Standard" Offset="0x31F44" />
-        <Limb Name="object_tw_Limb_031F50" LimbType="Standard" Offset="0x31F50" />
-        <Limb Name="object_tw_Limb_031F5C" LimbType="Standard" Offset="0x31F5C" />
-        <Limb Name="object_tw_Limb_031F68" LimbType="Standard" Offset="0x31F68" />
-        <Skeleton Name="object_tw_Skel_032020" Type="Flex" LimbType="Standard" Offset="0x32020" />
-        <Animation Name="object_tw_Anim_032BF8" Offset="0x32BF8" />
-        <Animation Name="object_tw_Anim_0338F0" Offset="0x338F0" />
-        <Animation Name="object_tw_Anim_0343B4" Offset="0x343B4" />
-        <Animation Name="object_tw_Anim_035030" Offset="0x35030" />
-        <Animation Name="object_tw_Anim_035988" Offset="0x35988" />
-        <Animation Name="object_tw_Anim_036FBC" Offset="0x36FBC" />
-        <Animation Name="object_tw_Anim_038E2C" Offset="0x38E2C" />
-        <Animation Name="object_tw_Anim_03A2D0" Offset="0x3A2D0" />
-        <DList Name="object_tw_DL_03A680" Offset="0x3A680" />
-        <Texture Name="object_tw_Tex_03A7B0" OutName="tex_03A7B0" Format="rgba16" Width="32" Height="32" Offset="0x3A7B0" />
+        <DList Name="object_tw_DL_02CAF0" Offset="0x2CAF0"/>
+        <DList Name="object_tw_DL_02CB50" Offset="0x2CB50"/>
+        <DList Name="object_tw_DL_02CBB0" Offset="0x2CBB0"/>
+        <DList Name="object_tw_DL_02D320" Offset="0x2D320"/>
+        <DList Name="object_tw_DL_02D4A0" Offset="0x2D4A0"/>
+        <DList Name="object_tw_DL_02D5D8" Offset="0x2D5D8"/>
+        <DList Name="object_tw_DL_02D710" Offset="0x2D710"/>
+        <DList Name="object_tw_DL_02D890" Offset="0x2D890"/>
+        <DList Name="object_tw_DL_02D940" Offset="0x2D940"/>
+        <DList Name="object_tw_DL_02D9F0" Offset="0x2D9F0"/>
+        <DList Name="object_tw_DL_02DAE0" Offset="0x2DAE0"/>
+        <DList Name="object_tw_DL_02DBC8" Offset="0x2DBC8"/>
+        <DList Name="object_tw_DL_02DCB8" Offset="0x2DCB8"/>
+        <DList Name="object_tw_DL_02DDD8" Offset="0x2DDD8"/>
+        <DList Name="object_tw_DL_02DEB0" Offset="0x2DEB0"/>
+        <DList Name="object_tw_DL_02DFB0" Offset="0x2DFB0"/>
+        <DList Name="object_tw_DL_02E098" Offset="0x2E098"/>
+        <Blob Name="object_tw_Blob_02E170" Size="0x3C00" Offset="0x2E170"/> <!-- boss title card -->
+        <Limb Name="object_tw_Limb_031D70" LimbType="Standard" Offset="0x31D70"/>
+        <Limb Name="object_tw_Limb_031D7C" LimbType="Standard" Offset="0x31D7C"/>
+        <Limb Name="object_tw_Limb_031D88" LimbType="Standard" Offset="0x31D88"/>
+        <Limb Name="object_tw_Limb_031D94" LimbType="Standard" Offset="0x31D94"/>
+        <Limb Name="object_tw_Limb_031DA0" LimbType="Standard" Offset="0x31DA0"/>
+        <Limb Name="object_tw_Limb_031DAC" LimbType="Standard" Offset="0x31DAC"/>
+        <Limb Name="object_tw_Limb_031DB8" LimbType="Standard" Offset="0x31DB8"/>
+        <Limb Name="object_tw_Limb_031DC4" LimbType="Standard" Offset="0x31DC4"/>
+        <Limb Name="object_tw_Limb_031DD0" LimbType="Standard" Offset="0x31DD0"/>
+        <Limb Name="object_tw_Limb_031DDC" LimbType="Standard" Offset="0x31DDC"/>
+        <Limb Name="object_tw_Limb_031DE8" LimbType="Standard" Offset="0x31DE8"/>
+        <Limb Name="object_tw_Limb_031DF4" LimbType="Standard" Offset="0x31DF4"/>
+        <Limb Name="object_tw_Limb_031E00" LimbType="Standard" Offset="0x31E00"/>
+        <Limb Name="object_tw_Limb_031E0C" LimbType="Standard" Offset="0x31E0C"/>
+        <Limb Name="object_tw_Limb_031E18" LimbType="Standard" Offset="0x31E18"/>
+        <Limb Name="object_tw_Limb_031E24" LimbType="Standard" Offset="0x31E24"/>
+        <Limb Name="object_tw_Limb_031E30" LimbType="Standard" Offset="0x31E30"/>
+        <Limb Name="object_tw_Limb_031E3C" LimbType="Standard" Offset="0x31E3C"/>
+        <Limb Name="object_tw_Limb_031E48" LimbType="Standard" Offset="0x31E48"/>
+        <Limb Name="object_tw_Limb_031E54" LimbType="Standard" Offset="0x31E54"/>
+        <Limb Name="object_tw_Limb_031E60" LimbType="Standard" Offset="0x31E60"/>
+        <Limb Name="object_tw_Limb_031E6C" LimbType="Standard" Offset="0x31E6C"/>
+        <Limb Name="object_tw_Limb_031E78" LimbType="Standard" Offset="0x31E78"/>
+        <Limb Name="object_tw_Limb_031E84" LimbType="Standard" Offset="0x31E84"/>
+        <Limb Name="object_tw_Limb_031E90" LimbType="Standard" Offset="0x31E90"/>
+        <Limb Name="object_tw_Limb_031E9C" LimbType="Standard" Offset="0x31E9C"/>
+        <Limb Name="object_tw_Limb_031EA8" LimbType="Standard" Offset="0x31EA8"/>
+        <Limb Name="object_tw_Limb_031EB4" LimbType="Standard" Offset="0x31EB4"/>
+        <Limb Name="object_tw_Limb_031EC0" LimbType="Standard" Offset="0x31EC0"/>
+        <Limb Name="object_tw_Limb_031ECC" LimbType="Standard" Offset="0x31ECC"/>
+        <Limb Name="object_tw_Limb_031ED8" LimbType="Standard" Offset="0x31ED8"/>
+        <Limb Name="object_tw_Limb_031EE4" LimbType="Standard" Offset="0x31EE4"/>
+        <Limb Name="object_tw_Limb_031EF0" LimbType="Standard" Offset="0x31EF0"/>
+        <Limb Name="object_tw_Limb_031EFC" LimbType="Standard" Offset="0x31EFC"/>
+        <Limb Name="object_tw_Limb_031F08" LimbType="Standard" Offset="0x31F08"/>
+        <Limb Name="object_tw_Limb_031F14" LimbType="Standard" Offset="0x31F14"/>
+        <Limb Name="object_tw_Limb_031F20" LimbType="Standard" Offset="0x31F20"/>
+        <Limb Name="object_tw_Limb_031F2C" LimbType="Standard" Offset="0x31F2C"/>
+        <Limb Name="object_tw_Limb_031F38" LimbType="Standard" Offset="0x31F38"/>
+        <Limb Name="object_tw_Limb_031F44" LimbType="Standard" Offset="0x31F44"/>
+        <Limb Name="object_tw_Limb_031F50" LimbType="Standard" Offset="0x31F50"/>
+        <Limb Name="object_tw_Limb_031F5C" LimbType="Standard" Offset="0x31F5C"/>
+        <Limb Name="object_tw_Limb_031F68" LimbType="Standard" Offset="0x31F68"/>
+        <Skeleton Name="object_tw_Skel_032020" Type="Flex" LimbType="Standard" Offset="0x32020"/>
+        <Animation Name="object_tw_Anim_032BF8" Offset="0x32BF8"/>
+        <Animation Name="object_tw_Anim_0338F0" Offset="0x338F0"/>
+        <Animation Name="object_tw_Anim_0343B4" Offset="0x343B4"/>
+        <Animation Name="object_tw_Anim_035030" Offset="0x35030"/>
+        <Animation Name="object_tw_Anim_035988" Offset="0x35988"/>
+        <Animation Name="object_tw_Anim_036FBC" Offset="0x36FBC"/>
+        <Animation Name="object_tw_Anim_038E2C" Offset="0x38E2C"/>
+        <Animation Name="object_tw_Anim_03A2D0" Offset="0x3A2D0"/>
+        <DList Name="object_tw_DL_03A680" Offset="0x3A680"/>
+        <Texture Name="object_tw_Tex_03A7B0" OutName="tex_03A7B0" Format="rgba16" Width="32" Height="32" Offset="0x3A7B0"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_vali.xml b/assets/xml/objects/object_vali.xml
index 359a962ec..2bab5efaa 100644
--- a/assets/xml/objects/object_vali.xml
+++ b/assets/xml/objects/object_vali.xml
@@ -30,34 +30,34 @@
         <Texture Name="gBariInnerHoodTex" OutName="bari_inner_hood" Format="ia16" Width="32" Height="32" Offset="0x3E88"/>
 
         <!-- Bari Limbs and Skeleton -->
-        <Limb Name="gBariNucleusBaseLimb" Type="Standard" Offset="0x4688"/>
-        <Limb Name="gBariNucleusLimb" Type="Standard" Offset="0x4694"/>
-        <Limb Name="gBariRightMandibleBaseBaseLimb" Type="Standard" Offset="0x46A0"/>
-        <Limb Name="gBariRightMandibleBaseLimb" Type="Standard" Offset="0x46AC"/>
-        <Limb Name="gBariRightMandibleLimb" Type="Standard" Offset="0x46B8"/>
-        <Limb Name="gBariLeftMandibleBaseBaseLimb" Type="Standard" Offset="0x46C4"/>
-        <Limb Name="gBariLeftMandibleBaseLimb" Type="Standard" Offset="0x46D0"/>
-        <Limb Name="gBariLeftMandibleLimb" Type="Standard" Offset="0x46DC"/>
-        <Limb Name="gBariLeftArmBaseLimb" Type="Standard" Offset="0x46E8"/>
-        <Limb Name="gBariLeftUpperArmBaseLimb" Type="Standard" Offset="0x46F4"/>
-        <Limb Name="gBariLeftForearmBaseLimb" Type="Standard" Offset="0x4700"/>
-        <Limb Name="gBariLeftClawBodyBaseLimb" Type="Standard" Offset="0x470C"/>
-        <Limb Name="gBariLeftClawTipBaseLimb" Type="Standard" Offset="0x4718"/>
-        <Limb Name="gBariLeftClawTipLimb" Type="Standard" Offset="0x4724"/>
-        <Limb Name="gBariLeftClawBodyLimb" Type="Standard" Offset="0x4730"/>
-        <Limb Name="gBariLeftForearmLimb" Type="Standard" Offset="0x473C"/>
-        <Limb Name="gBariLeftUpperArmLimb" Type="Standard" Offset="0x4748"/>
-        <Limb Name="gBariRightArmBaseLimb" Type="Standard" Offset="0x4754"/>
-        <Limb Name="gBariRightUpperArmBaseLimb" Type="Standard" Offset="0x4760"/>
-        <Limb Name="gBariRightForearmBaseLimb" Type="Standard" Offset="0x476C"/>
-        <Limb Name="gBariRightClawBodyBaseLimb" Type="Standard" Offset="0x4778"/>
-        <Limb Name="gBariRightClawTipBaseLimb" Type="Standard" Offset="0x4784"/>
-        <Limb Name="gBariRightClawTipLimb" Type="Standard" Offset="0x4790"/>
-        <Limb Name="gBariRightClawBodyLimb" Type="Standard" Offset="0x479C"/>
-        <Limb Name="gBariRightForearmLimb" Type="Standard" Offset="0x47A8"/>
-        <Limb Name="gBariRightUpperArmLimb" Type="Standard" Offset="0x47B4"/>
-        <Limb Name="gBariInnerHoodLimb" Type="Standard" Offset="0x47C0"/>
-        <Limb Name="gBariOuterHoodLimb" Type="Standard" Offset="0x47CC"/>
+        <Limb Name="gBariNucleusBaseLimb" LimbType="Standard" Offset="0x4688"/>
+        <Limb Name="gBariNucleusLimb" LimbType="Standard" Offset="0x4694"/>
+        <Limb Name="gBariRightMandibleBaseBaseLimb" LimbType="Standard" Offset="0x46A0"/>
+        <Limb Name="gBariRightMandibleBaseLimb" LimbType="Standard" Offset="0x46AC"/>
+        <Limb Name="gBariRightMandibleLimb" LimbType="Standard" Offset="0x46B8"/>
+        <Limb Name="gBariLeftMandibleBaseBaseLimb" LimbType="Standard" Offset="0x46C4"/>
+        <Limb Name="gBariLeftMandibleBaseLimb" LimbType="Standard" Offset="0x46D0"/>
+        <Limb Name="gBariLeftMandibleLimb" LimbType="Standard" Offset="0x46DC"/>
+        <Limb Name="gBariLeftArmBaseLimb" LimbType="Standard" Offset="0x46E8"/>
+        <Limb Name="gBariLeftUpperArmBaseLimb" LimbType="Standard" Offset="0x46F4"/>
+        <Limb Name="gBariLeftForearmBaseLimb" LimbType="Standard" Offset="0x4700"/>
+        <Limb Name="gBariLeftClawBodyBaseLimb" LimbType="Standard" Offset="0x470C"/>
+        <Limb Name="gBariLeftClawTipBaseLimb" LimbType="Standard" Offset="0x4718"/>
+        <Limb Name="gBariLeftClawTipLimb" LimbType="Standard" Offset="0x4724"/>
+        <Limb Name="gBariLeftClawBodyLimb" LimbType="Standard" Offset="0x4730"/>
+        <Limb Name="gBariLeftForearmLimb" LimbType="Standard" Offset="0x473C"/>
+        <Limb Name="gBariLeftUpperArmLimb" LimbType="Standard" Offset="0x4748"/>
+        <Limb Name="gBariRightArmBaseLimb" LimbType="Standard" Offset="0x4754"/>
+        <Limb Name="gBariRightUpperArmBaseLimb" LimbType="Standard" Offset="0x4760"/>
+        <Limb Name="gBariRightForearmBaseLimb" LimbType="Standard" Offset="0x476C"/>
+        <Limb Name="gBariRightClawBodyBaseLimb" LimbType="Standard" Offset="0x4778"/>
+        <Limb Name="gBariRightClawTipBaseLimb" LimbType="Standard" Offset="0x4784"/>
+        <Limb Name="gBariRightClawTipLimb" LimbType="Standard" Offset="0x4790"/>
+        <Limb Name="gBariRightClawBodyLimb" LimbType="Standard" Offset="0x479C"/>
+        <Limb Name="gBariRightForearmLimb" LimbType="Standard" Offset="0x47A8"/>
+        <Limb Name="gBariRightUpperArmLimb" LimbType="Standard" Offset="0x47B4"/>
+        <Limb Name="gBariInnerHoodLimb" LimbType="Standard" Offset="0x47C0"/>
+        <Limb Name="gBariOuterHoodLimb" LimbType="Standard" Offset="0x47CC"/>
         <Skeleton Name="gBariSkel" Type="Normal" LimbType="Standard" Offset="0x4848"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_vm.xml b/assets/xml/objects/object_vm.xml
index 94a5fc348..c5b949b36 100644
--- a/assets/xml/objects/object_vm.xml
+++ b/assets/xml/objects/object_vm.xml
@@ -4,16 +4,16 @@
         <Skeleton Name="gBeamosSkel" Type="Normal" LimbType="Standard" Offset="0x3F60"/>
 
         <!-- Beamos Skeleton Limbs -->
-        <Limb Name="gBeamosRootLimb" Type="Standard" Offset="0x3EC0"/>
-        <Limb Name="gBeamosLimb_3ECC" Type="Standard" Offset="0x3ECC"/>
-        <Limb Name="gBeamosLimb_3ED8" Type="Standard" Offset="0x3ED8"/>
-        <Limb Name="gBeamosLimb_3EE4" Type="Standard" Offset="0x3EE4"/>
-        <Limb Name="gBeamosTopEyelidLimb" Type="Standard" Offset="0x3EF0"/>
-        <Limb Name="gBeamosLimb_3EFC" Type="Standard" Offset="0x3EFC"/>
-        <Limb Name="gBeamosLimb_3F08" Type="Standard" Offset="0x3F08"/>
-        <Limb Name="gBeamosBottomEyelidLimb" Type="Standard" Offset="0x3F14"/>
-        <Limb Name="gBeamosEyeLimb" Type="Standard" Offset="0x3F20"/>
-        <Limb Name="gBeamosBodyLimb" Type="Standard" Offset="0x3F2C"/>
+        <Limb Name="gBeamosRootLimb" LimbType="Standard" Offset="0x3EC0"/>
+        <Limb Name="gBeamosLimb_3ECC" LimbType="Standard" Offset="0x3ECC"/>
+        <Limb Name="gBeamosLimb_3ED8" LimbType="Standard" Offset="0x3ED8"/>
+        <Limb Name="gBeamosLimb_3EE4" LimbType="Standard" Offset="0x3EE4"/>
+        <Limb Name="gBeamosTopEyelidLimb" LimbType="Standard" Offset="0x3EF0"/>
+        <Limb Name="gBeamosLimb_3EFC" LimbType="Standard" Offset="0x3EFC"/>
+        <Limb Name="gBeamosLimb_3F08" LimbType="Standard" Offset="0x3F08"/>
+        <Limb Name="gBeamosBottomEyelidLimb" LimbType="Standard" Offset="0x3F14"/>
+        <Limb Name="gBeamosEyeLimb" LimbType="Standard" Offset="0x3F20"/>
+        <Limb Name="gBeamosBodyLimb" LimbType="Standard" Offset="0x3F2C"/>
 
         <!-- Beamos Limb DisplayLists -->
         <DList Name="gBeamosTopEyelidDL" Offset="0x22B0"/>
diff --git a/assets/xml/objects/object_warp1.xml b/assets/xml/objects/object_warp1.xml
index 9320a1bc2..1497d7a10 100644
--- a/assets/xml/objects/object_warp1.xml
+++ b/assets/xml/objects/object_warp1.xml
@@ -13,27 +13,27 @@
         <DList Name="gWarp1DL_001A48" Offset="0x1A48"/>
         <DList Name="gWarp1DL_001AD0" Offset="0x1AD0"/>
         <Texture Name="gWarpCrystalTex" OutName="warp_crystal_tex" Format="i8" Width="64" Height="64" Offset="0x1B58"/>
-        <Limb Name="gWarpCrystalLimb_002B58" Type="Standard" Offset="0x2B58"/>
-        <Limb Name="gWarpCrystalLimb_002B64" Type="Standard" Offset="0x2B64"/>
-        <Limb Name="gWarpCrystalLimb_002B70" Type="Standard" Offset="0x2B70"/>
-        <Limb Name="gWarpCrystalLimb_002B7C" Type="Standard" Offset="0x2B7C"/>
-        <Limb Name="gWarpCrystalLimb_002B88" Type="Standard" Offset="0x2B88"/>
-        <Limb Name="gWarpCrystalLimb_002B94" Type="Standard" Offset="0x2B94"/>
-        <Limb Name="gWarpCrystalLimb_002BA0" Type="Standard" Offset="0x2BA0"/>
-        <Limb Name="gWarpCrystalLimb_002BAC" Type="Standard" Offset="0x2BAC"/>
-        <Limb Name="gWarpCrystalLimb_002BB8" Type="Standard" Offset="0x2BB8"/>
-        <Limb Name="gWarpCrystalLimb_002BC4" Type="Standard" Offset="0x2BC4"/>
-        <Limb Name="gWarpCrystalLimb_002BD0" Type="Standard" Offset="0x2BD0"/>
-        <Limb Name="gWarpCrystalLimb_002BDC" Type="Standard" Offset="0x2BDC"/>
-        <Limb Name="gWarpCrystalLimb_002BE8" Type="Standard" Offset="0x2BE8"/>
-        <Limb Name="gWarpCrystalLimb_002BF4" Type="Standard" Offset="0x2BF4"/>
-        <Limb Name="gWarpCrystalLimb_002C00" Type="Standard" Offset="0x2C00"/>
-        <Limb Name="gWarpCrystalLimb_002C0C" Type="Standard" Offset="0x2C0C"/>
-        <Limb Name="gWarpCrystalLimb_002C18" Type="Standard" Offset="0x2C18"/>
-        <Limb Name="gWarpCrystalLimb_002C24" Type="Standard" Offset="0x2C24"/>
-        <Limb Name="gWarpCrystalLimb_002C30" Type="Standard" Offset="0x2C30"/>
-        <Limb Name="gWarpCrystalLimb_002C3C" Type="Standard" Offset="0x2C3C"/>
-        <Limb Name="gWarpCrystalLimb_002C48" Type="Standard" Offset="0x2C48"/>
+        <Limb Name="gWarpCrystalLimb_002B58" LimbType="Standard" Offset="0x2B58"/>
+        <Limb Name="gWarpCrystalLimb_002B64" LimbType="Standard" Offset="0x2B64"/>
+        <Limb Name="gWarpCrystalLimb_002B70" LimbType="Standard" Offset="0x2B70"/>
+        <Limb Name="gWarpCrystalLimb_002B7C" LimbType="Standard" Offset="0x2B7C"/>
+        <Limb Name="gWarpCrystalLimb_002B88" LimbType="Standard" Offset="0x2B88"/>
+        <Limb Name="gWarpCrystalLimb_002B94" LimbType="Standard" Offset="0x2B94"/>
+        <Limb Name="gWarpCrystalLimb_002BA0" LimbType="Standard" Offset="0x2BA0"/>
+        <Limb Name="gWarpCrystalLimb_002BAC" LimbType="Standard" Offset="0x2BAC"/>
+        <Limb Name="gWarpCrystalLimb_002BB8" LimbType="Standard" Offset="0x2BB8"/>
+        <Limb Name="gWarpCrystalLimb_002BC4" LimbType="Standard" Offset="0x2BC4"/>
+        <Limb Name="gWarpCrystalLimb_002BD0" LimbType="Standard" Offset="0x2BD0"/>
+        <Limb Name="gWarpCrystalLimb_002BDC" LimbType="Standard" Offset="0x2BDC"/>
+        <Limb Name="gWarpCrystalLimb_002BE8" LimbType="Standard" Offset="0x2BE8"/>
+        <Limb Name="gWarpCrystalLimb_002BF4" LimbType="Standard" Offset="0x2BF4"/>
+        <Limb Name="gWarpCrystalLimb_002C00" LimbType="Standard" Offset="0x2C00"/>
+        <Limb Name="gWarpCrystalLimb_002C0C" LimbType="Standard" Offset="0x2C0C"/>
+        <Limb Name="gWarpCrystalLimb_002C18" LimbType="Standard" Offset="0x2C18"/>
+        <Limb Name="gWarpCrystalLimb_002C24" LimbType="Standard" Offset="0x2C24"/>
+        <Limb Name="gWarpCrystalLimb_002C30" LimbType="Standard" Offset="0x2C30"/>
+        <Limb Name="gWarpCrystalLimb_002C3C" LimbType="Standard" Offset="0x2C3C"/>
+        <Limb Name="gWarpCrystalLimb_002C48" LimbType="Standard" Offset="0x2C48"/>
         <Skeleton Name="gWarpCrystalSkel" Type="Normal" LimbType="Standard" Offset="0x2CA8"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_zl1.xml b/assets/xml/objects/object_zl1.xml
index f808e1c54..c7082a3db 100644
--- a/assets/xml/objects/object_zl1.xml
+++ b/assets/xml/objects/object_zl1.xml
@@ -4,23 +4,23 @@
         <Skeleton Name="gChildZelda1Skel" Type="Flex" LimbType="Standard" Offset="0xF5D8"/>
 
         <!-- Child Zelda 1 Limbs -->
-        <Limb Name="gChildZelda1RootLimb" Type="Standard" Offset="0xF4C8"/>
-        <Limb Name="gChildZelda1WaistLimb" Type="Standard" Offset="0xF4D4"/>
-        <Limb Name="gChildZelda1LeftLegLimb" Type="Standard" Offset="0xF4E0"/>
-        <Limb Name="gChildZelda1LeftFootLimb" Type="Standard" Offset="0xF4EC"/>
-        <Limb Name="gChildZelda1RightLegLimb" Type="Standard" Offset="0xF4F8"/>
-        <Limb Name="gChildZelda1RightFootLimb" Type="Standard" Offset="0xF504"/>
-        <Limb Name="gChildZelda1Dress1Limb" Type="Standard" Offset="0xF510"/>
-        <Limb Name="gChildZelda1Dress2Limb" Type="Standard" Offset="0xF51C"/>
-        <Limb Name="gChildZelda1Dress3Limb" Type="Standard" Offset="0xF528"/>
-        <Limb Name="gChildZelda1TorsoLimb" Type="Standard" Offset="0xF534"/>
-        <Limb Name="gChildZelda1LeftUpperArmLimb" Type="Standard" Offset="0xF540"/>
-        <Limb Name="gChildZelda1LeftForearmLimb" Type="Standard" Offset="0xF54C"/>
-        <Limb Name="gChildZelda1LeftHandLimb" Type="Standard" Offset="0xF558"/>
-        <Limb Name="gChildZelda1RightUpperArmLimb" Type="Standard" Offset="0xF564"/>
-        <Limb Name="gChildZelda1RightForearmLimb" Type="Standard" Offset="0xF570"/>
-        <Limb Name="gChildZelda1RightHandLimb" Type="Standard" Offset="0xF57C"/>
-        <Limb Name="gChildZelda1HeadLimb" Type="Standard" Offset="0xF588"/>
+        <Limb Name="gChildZelda1RootLimb" LimbType="Standard" Offset="0xF4C8"/>
+        <Limb Name="gChildZelda1WaistLimb" LimbType="Standard" Offset="0xF4D4"/>
+        <Limb Name="gChildZelda1LeftLegLimb" LimbType="Standard" Offset="0xF4E0"/>
+        <Limb Name="gChildZelda1LeftFootLimb" LimbType="Standard" Offset="0xF4EC"/>
+        <Limb Name="gChildZelda1RightLegLimb" LimbType="Standard" Offset="0xF4F8"/>
+        <Limb Name="gChildZelda1RightFootLimb" LimbType="Standard" Offset="0xF504"/>
+        <Limb Name="gChildZelda1Dress1Limb" LimbType="Standard" Offset="0xF510"/>
+        <Limb Name="gChildZelda1Dress2Limb" LimbType="Standard" Offset="0xF51C"/>
+        <Limb Name="gChildZelda1Dress3Limb" LimbType="Standard" Offset="0xF528"/>
+        <Limb Name="gChildZelda1TorsoLimb" LimbType="Standard" Offset="0xF534"/>
+        <Limb Name="gChildZelda1LeftUpperArmLimb" LimbType="Standard" Offset="0xF540"/>
+        <Limb Name="gChildZelda1LeftForearmLimb" LimbType="Standard" Offset="0xF54C"/>
+        <Limb Name="gChildZelda1LeftHandLimb" LimbType="Standard" Offset="0xF558"/>
+        <Limb Name="gChildZelda1RightUpperArmLimb" LimbType="Standard" Offset="0xF564"/>
+        <Limb Name="gChildZelda1RightForearmLimb" LimbType="Standard" Offset="0xF570"/>
+        <Limb Name="gChildZelda1RightHandLimb" LimbType="Standard" Offset="0xF57C"/>
+        <Limb Name="gChildZelda1HeadLimb" LimbType="Standard" Offset="0xF588"/>
 
         <!-- Child Zelda 1 Limb DisplayLists -->
         <DList Name="gChildZelda1WaistDL" Offset="0x6008"/>
diff --git a/assets/xml/overlays/ovl_Bg_Ganon_Otyuka.xml b/assets/xml/overlays/ovl_Bg_Ganon_Otyuka.xml
index e74cd4d7b..871c97b40 100644
--- a/assets/xml/overlays/ovl_Bg_Ganon_Otyuka.xml
+++ b/assets/xml/overlays/ovl_Bg_Ganon_Otyuka.xml
@@ -18,7 +18,7 @@
         </Array>
         <DList Name="sPlatformSideDL" Offset="0x1B40"/>
 
-        <Texture Name="sFlashTex" Format="i8" OutName="flash_tex" Width="32" Height="64" Offset="0x1B58"/>
+        <Texture Name="sFlashTex" OutName="flash_tex" Format="i8" Width="32" Height="64" Offset="0x1B58"/>
         <Array Name="sFlashVtx" Count="8" Offset="0x2358">
             <Vtx/>
         </Array>
diff --git a/assets/xml/overlays/ovl_Magic_Wind.xml b/assets/xml/overlays/ovl_Magic_Wind.xml
index 3e3c6fee4..8fc20ce1b 100644
--- a/assets/xml/overlays/ovl_Magic_Wind.xml
+++ b/assets/xml/overlays/ovl_Magic_Wind.xml
@@ -2,9 +2,9 @@
     <File Name="ovl_Magic_Wind" BaseAddress="0x80B8B100" RangeStart="0x780" RangeEnd="0x1C98">
         <Skeleton Name="sSkel" Type="Curve" LimbType="Curve" Offset="0x1C90"/>
         <CurveAnimation Name="sAnim" SkelOffset="0x1C90" Offset="0x1C50"/>
-        <Limb Name="sRootLimb" Type="Curve" Offset="0x1C60"/>
-        <Limb Name="sInnerCylinderLimb" Type="Curve" Offset="0x1C6C"/>
-        <Limb Name="sOuterCylinderLimb" Type="Curve" Offset="0x1C78"/>
+        <Limb Name="sRootLimb" LimbType="Curve" Offset="0x1C60"/>
+        <Limb Name="sInnerCylinderLimb" LimbType="Curve" Offset="0x1C6C"/>
+        <Limb Name="sOuterCylinderLimb" LimbType="Curve" Offset="0x1C78"/>
         <Array Name="sCylinderVtx" Count="36" Offset="0x780">
             <Vtx/>
         </Array>
diff --git a/assets/xml/scenes/dungeons/ddan.xml b/assets/xml/scenes/dungeons/ddan.xml
index b8946653b..f6572b9f8 100644
--- a/assets/xml/scenes/dungeons/ddan.xml
+++ b/assets/xml/scenes/dungeons/ddan.xml
@@ -4,14 +4,14 @@
         <Texture Name="gDCNightEntranceTex" OutName="night_entrance" Format="ci8" Width="32" Height="64" Offset="0x13378" TlutOffset="0x11D70"/>
 
         <!-- these need to have TLUTs extract from room 0 at 0x11290-->
-        <Texture Name="gDCLavaFloor1Tex" OutName="Lava_floor_1" Format="ci8" Width="32" Height="32" Offset="0x11F78" />
-        <Texture Name="gDCLavaFloor2Tex" OutName="Lava_floor_2" Format="ci8" Width="32" Height="32" Offset="0x14778" />
-        <Texture Name="gDCLavaFloor3Tex" OutName="Lava_floor_3" Format="ci8" Width="32" Height="32" Offset="0x14378" />
-        <Texture Name="gDCLavaFloor4Tex" OutName="Lava_floor_4" Format="ci8" Width="32" Height="32" Offset="0x13F78" />
-        <Texture Name="gDCLavaFloor5Tex" OutName="Lava_floor_5" Format="ci8" Width="32" Height="32" Offset="0x14B78" />
-        <Texture Name="gDCLavaFloor6Tex" OutName="Lava_floor_6" Format="ci8" Width="32" Height="32" Offset="0x13B78" />
-        <Texture Name="gDCLavaFloor7Tex" OutName="Lava_floor_7" Format="ci8" Width="32" Height="32" Offset="0x12F78" />
-        <Texture Name="gDCLavaFloor8Tex" OutName="Lava_floor_8" Format="ci8" Width="32" Height="32" Offset="0x12B78" />
+        <Texture Name="gDCLavaFloor1Tex" OutName="Lava_floor_1" Format="ci8" Width="32" Height="32" Offset="0x11F78"/>
+        <Texture Name="gDCLavaFloor2Tex" OutName="Lava_floor_2" Format="ci8" Width="32" Height="32" Offset="0x14778"/>
+        <Texture Name="gDCLavaFloor3Tex" OutName="Lava_floor_3" Format="ci8" Width="32" Height="32" Offset="0x14378"/>
+        <Texture Name="gDCLavaFloor4Tex" OutName="Lava_floor_4" Format="ci8" Width="32" Height="32" Offset="0x13F78"/>
+        <Texture Name="gDCLavaFloor5Tex" OutName="Lava_floor_5" Format="ci8" Width="32" Height="32" Offset="0x14B78"/>
+        <Texture Name="gDCLavaFloor6Tex" OutName="Lava_floor_6" Format="ci8" Width="32" Height="32" Offset="0x13B78"/>
+        <Texture Name="gDCLavaFloor7Tex" OutName="Lava_floor_7" Format="ci8" Width="32" Height="32" Offset="0x12F78"/>
+        <Texture Name="gDCLavaFloor8Tex" OutName="Lava_floor_8" Format="ci8" Width="32" Height="32" Offset="0x12B78"/>
         
         <Cutscene Name="gDcOpeningCs" Offset="0x14F80"/>
         <Scene Name="ddan_scene" Offset="0x0"/>
diff --git a/assets/xml/scenes/indoors/miharigoya.xml b/assets/xml/scenes/indoors/miharigoya.xml
index 99b3a8d29..41ff2db9f 100644
--- a/assets/xml/scenes/indoors/miharigoya.xml
+++ b/assets/xml/scenes/indoors/miharigoya.xml
@@ -1,13 +1,13 @@
 <Root>
     <File Name="miharigoya_scene" Segment="2">
-        <Texture Name="gGuardHouseOutSideView2NightTex" OutName="view_2_night" Format="rgba16" Width="64" Height="32" Offset="0x1350" />
-        <Texture Name="gGuardHouseOutSideView2DayTex" OutName="view_2_day" Format="rgba16" Width="64" Height="32" Offset="0x2350" />
-        <Texture Name="gGuardHouseOutSideView1NightTex" OutName="view_1_night" Format="rgba16" Width="64" Height="32" Offset="0x3550" />
-        <Texture Name="gGuardHouseOutSideView1DayTex" OutName="view_1_day" Format="rgba16" Width="64" Height="32" Offset="0x6550" />
+        <Texture Name="gGuardHouseOutSideView2NightTex" OutName="view_2_night" Format="rgba16" Width="64" Height="32" Offset="0x1350"/>
+        <Texture Name="gGuardHouseOutSideView2DayTex" OutName="view_2_day" Format="rgba16" Width="64" Height="32" Offset="0x2350"/>
+        <Texture Name="gGuardHouseOutSideView1NightTex" OutName="view_1_night" Format="rgba16" Width="64" Height="32" Offset="0x3550"/>
+        <Texture Name="gGuardHouseOutSideView1DayTex" OutName="view_1_day" Format="rgba16" Width="64" Height="32" Offset="0x6550"/>
         <Scene Name="miharigoya_scene" Offset="0x0"/>
     </File>
     <File Name="miharigoya_room_0" Segment="3">
-        <Blob Name="gMiharigoyaBlob_0038D8" Offset="0x38D8" Size="0x68"/>
+        <Blob Name="gMiharigoyaBlob_0038D8" Size="0x68" Offset="0x38D8"/>
         <Room Name="miharigoya_room_0" Offset="0x0"/>
         <DList Name="gMiharigoyaDL_003DA0" Offset="0x3DA0"/>
     </File>
diff --git a/docs/tutorial/object_decomp_example.md b/docs/tutorial/object_decomp_example.md
index 052305ab5..38b863c19 100644
--- a/docs/tutorial/object_decomp_example.md
+++ b/docs/tutorial/object_decomp_example.md
@@ -227,16 +227,16 @@ Therefore, we end up with the following:
         <DList Name="gChuGirlRightHandDL" Offset="0x3968"/>
 
         <!-- Bombchu Bowling Girl limbs -->
-        <Limb Name="gChuGirlWaistLimb" Type="Standard" Offset="0x6E10"/>
-        <Limb Name="gChuGirlTorsoLimb" Type="Standard" Offset="0x6E1C"/>
-        <Limb Name="gChuGirlNeckLimb" Type="Standard" Offset="0x6E28"/>
-        <Limb Name="gChuGirlHeadLimb" Type="Standard" Offset="0x6E34"/>
-        <Limb Name="gChuGirlLeftUpperArmLimb" Type="Standard" Offset="0x6E40"/>
-        <Limb Name="gChuGirlLeftForearmLimb" Type="Standard" Offset="0x6E4C"/>
-        <Limb Name="gChuGirlLeftHandLimb" Type="Standard" Offset="0x6E58"/>
-        <Limb Name="gChuGirlRightUpperArmLimb" Type="Standard" Offset="0x6E64"/>
-        <Limb Name="gChuGirlRightForearmLimb" Type="Standard" Offset="0x6E70"/>
-        <Limb Name="gChuGirlRightHandLimb" Type="Standard" Offset="0x6E7C"/>
+        <Limb Name="gChuGirlWaistLimb" LimbType="Standard" Offset="0x6E10"/>
+        <Limb Name="gChuGirlTorsoLimb" LimbType="Standard" Offset="0x6E1C"/>
+        <Limb Name="gChuGirlNeckLimb" LimbType="Standard" Offset="0x6E28"/>
+        <Limb Name="gChuGirlHeadLimb" LimbType="Standard" Offset="0x6E34"/>
+        <Limb Name="gChuGirlLeftUpperArmLimb" LimbType="Standard" Offset="0x6E40"/>
+        <Limb Name="gChuGirlLeftForearmLimb" LimbType="Standard" Offset="0x6E4C"/>
+        <Limb Name="gChuGirlLeftHandLimb" LimbType="Standard" Offset="0x6E58"/>
+        <Limb Name="gChuGirlRightUpperArmLimb" LimbType="Standard" Offset="0x6E64"/>
+        <Limb Name="gChuGirlRightForearmLimb" LimbType="Standard" Offset="0x6E70"/>
+        <Limb Name="gChuGirlRightHandLimb" LimbType="Standard" Offset="0x6E7C"/>
 
         <!-- Bombchu Bowling Girl limb textures -->
         <Texture Name="gChuGirlMouthTex" OutName="chu_girl_mouth" Format="rgba16" Width="32" Height="32" Offset="0x5910"/>