Symbol cleanup 4 (#1050)

* Replace some hardcoded constants with proper asset symbols

* Remove Blob which turned out to be a texture

5 files changed, 28 insertions, 15 deletions

diff --git a/assets/xml/objects/object_bwall.xml b/assets/xml/objects/object_bwall.xml
index bc1605813..d4f43ddc1 100644
--- a/assets/xml/objects/object_bwall.xml
+++ b/assets/xml/objects/object_bwall.xml
@@ -1,7 +1,7 @@
 <Root>
     <File Name="object_bwall" Segment="6">
         <DList Name="object_bwall_DL_000040" Offset="0x40"/>
-        <Blob Name="object_bwall_Blob_0000D0" Size="0x80" Offset="0xD0"/>
+        <Collision Name="object_bwall_Col_000118" Offset="0x118"/>
         <Texture Name="object_bwall_Tex_000150" OutName="tex_00000150" Format="rgba16" Width="32" Height="64" Offset="0x150"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_haka_objects.xml b/assets/xml/objects/object_haka_objects.xml
index 237ff2f27..3ca6d27c0 100644
--- a/assets/xml/objects/object_haka_objects.xml
+++ b/assets/xml/objects/object_haka_objects.xml
@@ -7,17 +7,17 @@
         <DList Name="object_haka_objects_DL_002ED0" Offset="0x2ED0"/>
         <DList Name="object_haka_objects_DL_003CF0" Offset="0x3CF0"/>
         <DList Name="object_haka_objects_DL_0040F0" Offset="0x40F0"/>
-        <Blob Name="object_haka_objects_Blob_0042A8" Size="0xB8" Offset="0x42A8"/>
+        <Collision Name="object_haka_objects_Col_004330" Offset="0x4330"/>
         <DList Name="object_haka_objects_DL_0043B0" Offset="0x43B0"/>
-        <Blob Name="object_haka_objects_Blob_004448" Size="0xB8" Offset="0x4448"/>
+        <Collision Name="object_haka_objects_Col_0044D0" Offset="0x44D0"/>
         <DList Name="object_haka_objects_DL_0045A0" Offset="0x45A0"/>
-        <Blob Name="object_haka_objects_Blob_004688" Size="0x128" Offset="0x4688"/>
+        <Collision Name="object_haka_objects_Col_004780" Offset="0x4780"/>
         <DList Name="object_haka_objects_DL_0047F0" Offset="0x47F0"/>
-        <Blob Name="object_haka_objects_Blob_0048C0" Size="0xB0" Offset="0x48C0"/>
+        <Collision Name="object_haka_objects_Col_004940" Offset="0x4940"/>
         <DList Name="object_haka_objects_DL_0049B0" Offset="0x49B0"/>
-        <Blob Name="object_haka_objects_Blob_004A80" Size="0xB0" Offset="0x4A80"/>
+        <Collision Name="object_haka_objects_Col_004B00" Offset="0x4B00"/>
         <DList Name="object_haka_objects_DL_004B70" Offset="0x4B70"/>
-        <Blob Name="object_haka_objects_Blob_004C40" Size="0xB0" Offset="0x4C40"/>
+        <Collision Name="object_haka_objects_Col_004CC0" Offset="0x4CC0"/>
         <DList Name="object_haka_objects_DL_005000" Offset="0x5000"/>
         <Collision Name="object_haka_objects_Col_005334" Offset="0x5334"/>
         <DList Name="object_haka_objects_DL_005A70" Offset="0x5A70"/>
diff --git a/assets/xml/objects/object_kingdodongo.xml b/assets/xml/objects/object_kingdodongo.xml
index d2c01e878..158cfb4d3 100644
--- a/assets/xml/objects/object_kingdodongo.xml
+++ b/assets/xml/objects/object_kingdodongo.xml
@@ -104,9 +104,9 @@
         <DList Name="object_kingdodongo_DL_01D950" Offset="0x1D950"/><!--Blob Name="object_kingdodongo_Blob_01D9F0" Size="0x8000" Offset="0x1D9F0" /-->
         <DList Name="object_kingdodongo_DL_0259F0" Offset="0x259F0"/>
         <DList Name="object_kingdodongo_DL_025A90" Offset="0x25A90"/>
-        <Blob Name="object_kingdodongo_Blob_025B30" Size="0x60" Offset="0x25B30"/>
+        <Collision Name="object_kingdodongo_Col_025B64" Offset="0x25B64"/>
         <DList Name="object_kingdodongo_DL_025BD0" Offset="0x25BD0"/>
         <Texture Name="object_kingdodongo_Tex_025C58" OutName="tex_00025C58" Format="rgba16" Width="32" Height="32" Offset="0x25C58"/>
-        <Blob Name="object_kingdodongo_Blob_026458" Size="0xA888" Offset="0x26458"/>
+        <Collision Name="object_kingdodongo_Col_0264A8" Offset="0x264A8"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_spot02_objects.xml b/assets/xml/objects/object_spot02_objects.xml
index 978b7cba8..65f45ff51 100644
--- a/assets/xml/objects/object_spot02_objects.xml
+++ b/assets/xml/objects/object_spot02_objects.xml
@@ -5,7 +5,6 @@
         <DList Name="object_spot02_objects_DL_0013F0" Offset="0x13F0"/>
         <Blob Name="object_spot02_objects_Blob_0015D8" Size="0x0008" Offset="0x15D8"/>
         <DList Name="object_spot02_objects_DL_009620" Offset="0x9620"/>
-        <Blob Name="object_spot02_objects_Blob_0096A8" Size="0x9008" Offset="0x96A8"/>
         <DList Name="object_spot02_objects_DL_0126F0" Offset="0x126F0"/>
         <DList Name="object_spot02_objects_DL_0127C0" Offset="0x127C0"/>
         <Collision Name="object_spot02_objects_Col_0128D8" Offset="0x128D8"/>
@@ -29,5 +28,17 @@
         <Texture Name="gEffSunGraveSpark6Tex" OutName="eff_sun_grave_spark_6" Format="i8" Width="64" Height="64" Offset="0x65E0"/>
         <Texture Name="gEffSunGraveSpark7Tex" OutName="eff_sun_grave_spark_7" Format="i8" Width="64" Height="64" Offset="0x75E0"/>
         <Texture Name="gEffSunGraveSpark8Tex" OutName="eff_sun_grave_spark_8" Format="i8" Width="64" Height="64" Offset="0x85E0"/>
+        <Texture Name="object_spot02_objects_Tex_0096B0" OutName="tex_000096B0" Format="i8" Width="32" Height="96" Offset="0x96B0"/>
+        <Texture Name="object_spot02_objects_Tex_00A2B0" OutName="tex_0000A2B0" Format="i8" Width="32" Height="96" Offset="0xA2B0"/>
+        <Texture Name="object_spot02_objects_Tex_00AEB0" OutName="tex_0000AEB0" Format="i8" Width="32" Height="96" Offset="0xAEB0"/>
+        <Texture Name="object_spot02_objects_Tex_00BAB0" OutName="tex_0000BAB0" Format="i8" Width="32" Height="96" Offset="0xBAB0"/>
+        <Texture Name="object_spot02_objects_Tex_00C6B0" OutName="tex_0000C6B0" Format="i8" Width="32" Height="96" Offset="0xC6B0"/>
+        <Texture Name="object_spot02_objects_Tex_00D2B0" OutName="tex_0000D2B0" Format="i8" Width="32" Height="96" Offset="0xD2B0"/>
+        <Texture Name="object_spot02_objects_Tex_00DEB0" OutName="tex_0000DEB0" Format="i8" Width="32" Height="96" Offset="0xDEB0"/>
+        <Texture Name="object_spot02_objects_Tex_00EAB0" OutName="tex_0000EAB0" Format="i8" Width="32" Height="96" Offset="0xEAB0"/>
+        <Texture Name="object_spot02_objects_Tex_00F6B0" OutName="tex_0000F6B0" Format="i8" Width="32" Height="96" Offset="0xF6B0"/>
+        <Texture Name="object_spot02_objects_Tex_0102B0" OutName="tex_000102B0" Format="i8" Width="32" Height="96" Offset="0x102B0"/>
+        <Texture Name="object_spot02_objects_Tex_010EB0" OutName="tex_00010EB0" Format="i8" Width="32" Height="96" Offset="0x10EB0"/>
+        <Texture Name="object_spot02_objects_Tex_011AB0" OutName="tex_00011AB0" Format="i8" Width="32" Height="96" Offset="0x11AB0"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_tw.xml b/assets/xml/objects/object_tw.xml
index be4115b2c..bb471aee5 100644
--- a/assets/xml/objects/object_tw.xml
+++ b/assets/xml/objects/object_tw.xml
@@ -50,7 +50,7 @@
         <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_00A438" OutName="tex_00A438" Format="ci8" Width="32" Height="32" Offset="0xA438" TlutOffset="0x9490"/>
         <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"/>
@@ -62,7 +62,8 @@
         <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_00B238" OutName="tex_00B238" Format="ci8" Width="32" Height="32" Offset="0xB238" TlutOffset="0x9490"/>
+        <Texture Name="object_tw_Tex_00B638" OutName="tex_00B638" Format="ci8" Width="32" Height="32" Offset="0xB638" TlutOffset="0x9490"/>
         <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"/>
@@ -206,6 +207,7 @@
         <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"/>
+        <Texture Name="object_tw_Tex_02A070" OutName="tex_02A070" Format="ci8" Width="32" Height="32" Offset="0x2A070" TlutOffset="0x29E50"/>
         <Animation Name="object_tw_Anim_0216DC" Offset="0x216DC"/>
         <Animation Name="object_tw_Anim_022700" Offset="0x22700"/>
         <Animation Name="object_tw_Anim_023750" Offset="0x23750"/>
@@ -245,11 +247,11 @@
         <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_TLUT_02A020" OutName="tlut_02A020" Format="rgba16" Width="8" Height="5" Offset="0x2A020"/>
+        <Texture Name="object_tw_Tex_02A470" OutName="tex_02A470" Format="ci8" Width="32" Height="32" Offset="0x2A470" TlutOffset="0x29E50"/>
         <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"/>
-        <!--Blob Name="object_tw_Blob_02A9B0" Size="0x400" Offset="0x2A9B0" /-->
+        <Texture Name="object_tw_Tex_02A9B0" OutName="tex_02A9B0" Format="ci8" Width="32" Height="32" Offset="0x2A9B0" TlutOffset="0x29E50"/>
         <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"/>