mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-12 10:54:44 +00:00
Code Issues Projects Releases Wiki Activity

Cleanup symbols 7 (#1073)

Browse source 
* Cleanup symbols, mostly from non-matching objects

* ZAPD supports unaligned textures!

* Uncomment `object_oF1s`
This commit is contained in:
Dragorn421 2022-01-18 00:50:18 +01:00 • committed by GitHub
parent 0a48548da7
commit 2a4fb604fb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 85 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

14
assets/xml/objects/object_ahg.xml
View file

@ -1,7 +1,6 @@
<Root>
<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. -->
<!--
<!-- The textures used by these limbs aren't 64-bit aligned -->
<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"/>
@ -17,28 +16,24 @@
<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"/>
-->
<!-- 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_00057C" OutName="tex_0000057C" Format="ci8" Width="16" Height="16" Offset="0x57C" TlutOffset="0xFC"/>
<Texture Name="object_ahg_Tex_00067C" OutName="tex_0000067C" Format="ci8" Width="16" Height="16" Offset="0x67C" TlutOffset="0xFC"/>
<Texture Name="object_ahg_Tex_00077C" OutName="tex_0000077C" Format="ci8" Width="16" Height="16" Offset="0x77C" TlutOffset="0xFC"/>
<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"/>
@ -54,7 +49,6 @@
<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"/>

14
assets/xml/objects/object_bji.xml
View file

@ -1,7 +1,6 @@
<Root>
<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. -->
<!--
<!-- The textures used by these limbs aren't 64-bit aligned -->
<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"/>
@ -17,14 +16,10 @@
<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"/>
-->
<!-- 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"/>
@ -32,11 +27,11 @@
<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_0005FC" OutName="tex_000005FC" Format="ci8" Width="32" Height="32" Offset="0x5FC" TlutOffset="0xFC"/>
<Texture Name="object_bji_Tex_0009FC" OutName="tex_000009FC" Format="ci8" Width="32" Height="32" Offset="0x9FC" TlutOffset="0xFC"/>
<Texture Name="object_bji_Tex_000DFC" OutName="tex_00000DFC" Format="ci8" Width="32" Height="32" Offset="0xDFC" TlutOffset="0xFC"/>
<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"/>
@ -52,7 +47,6 @@
<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"/>

12
assets/xml/objects/object_boj.xml
View file

@ -1,7 +1,6 @@
<Root>
<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. -->
<!--
<!-- The textures used by these limbs aren't 64-bit aligned -->
<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"/>
@ -17,20 +16,18 @@
<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"/>
-->
<!-- 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_0005FC" OutName="tex_000005FC" Format="ci8" Width="16" Height="16" Offset="0x5FC" TlutOffset="0xFC"/>
<Texture Name="object_boj_Tex_0006FC" OutName="tex_000006FC" Format="ci8" Width="16" Height="16" Offset="0x6FC" TlutOffset="0xFC"/>
<Texture Name="object_boj_Tex_0007FC" OutName="tex_000007FC" Format="ci8" Width="16" Height="16" Offset="0x7FC" TlutOffset="0xFC"/>
<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"/>
@ -50,7 +47,6 @@
<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"/>

10
assets/xml/objects/object_cne.xml
View file

@ -1,7 +1,6 @@
<Root>
<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. -->
<!--
<!-- The textures used by these limbs aren't 64-bit aligned -->
<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"/>
@ -17,14 +16,10 @@
<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"/>
-->
<!-- 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"/>
@ -33,9 +28,7 @@
<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"/>
@ -51,7 +44,6 @@
<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"/>

14
assets/xml/objects/object_oF1s.xml
View file

@ -1,10 +1,6 @@
<Root>
<File Name="object_oF1s" Segment="6">
<!-- This blob was added just to ensure the object will be extracted. Should be removed in the future. -->
<Blob Name="g_oF1sBlob_000000" Size="0x10" Offset="0x0"/>
<!-- The textures used by these limbs aren't 64-bit aligned, so this won't compile to a matching ROM. -->
<!--
<!-- The textures used by these limbs aren't 64-bit aligned -->
<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"/>
@ -22,16 +18,11 @@
<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"/>
-->
<!-- 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"/>
@ -45,9 +36,7 @@
<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"/>
@ -64,6 +53,5 @@
<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>