diff options
| author | Dragorn421 <Dragorn421@users.noreply.github.com> | 2021-08-22 17:52:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-22 11:52:02 -0400 |
| commit | 5e071a014d4facda391d5373fb8694c8ebbf2803 (patch) | |
| tree | 66c6a82210f7b9474d5ef7045b215837027aaa65 /assets/xml/objects | |
| parent | 743f42f651c0f32bf2492acd720d6da3e66f6465 (diff) | |
Symbol cleanup (#897)
* symbol cleanup
* run formatter
* run formatter
* remove duplicate z_demo_ik symbols
* run formatter
Diffstat (limited to 'assets/xml/objects')
37 files changed, 119 insertions, 80 deletions
diff --git a/assets/xml/objects/object_brob.xml b/assets/xml/objects/object_brob.xml index 8e805b87a..718dcd561 100644 --- a/assets/xml/objects/object_brob.xml +++ b/assets/xml/objects/object_brob.xml @@ -20,6 +20,6 @@ <Animation Name="object_brob_Anim_001678" Offset="0x1678"/> <Animation Name="object_brob_Anim_001750" Offset="0x1750"/> <Animation Name="object_brob_Anim_001958" Offset="0x1958"/> - <Blob Name="object_brob_Blob_001968" Size="0x138" Offset="0x1968"/> + <Collision Name="object_brob_Col_001A70" Offset="0x1A70"/> </File> </Root> diff --git a/assets/xml/objects/object_bw.xml b/assets/xml/objects/object_bw.xml index e61e30ab3..712d4b495 100644 --- a/assets/xml/objects/object_bw.xml +++ b/assets/xml/objects/object_bw.xml @@ -24,6 +24,6 @@ <Limb Name="object_bw_Limb_0020B8" LimbType="Standard" Offset="0x20B8"/> <Skeleton Name="object_bw_Skel_0020F0" Type="Normal" LimbType="Standard" Offset="0x20F0"/> <Animation Name="object_bw_Anim_0021A0" Offset="0x21A0"/> - <Blob Name="object_bw_Blob_0021B0" Size="0xB0" Offset="0x21B0"/> + <Animation Name="object_bw_Anim_002250" Offset="0x2250"/> </File> </Root> diff --git a/assets/xml/objects/object_d_elevator.xml b/assets/xml/objects/object_d_elevator.xml index b94620339..6be59c154 100644 --- a/assets/xml/objects/object_d_elevator.xml +++ b/assets/xml/objects/object_d_elevator.xml @@ -1,7 +1,7 @@ <Root> <File Name="object_d_elevator" Segment="6"> <DList Name="object_d_elevator_DL_000180" Offset="0x180"/> - <Blob Name="object_d_elevator_Blob_000260" Size="0x130" Offset="0x260"/> + <Collision Name="object_d_elevator_Col_000360" Offset="0x360"/> <Texture Name="object_d_elevator_Tex_000390" OutName="tex_00000390" Format="i8" Width="64" Height="64" Offset="0x390"/> </File> </Root> diff --git a/assets/xml/objects/object_dekujr.xml b/assets/xml/objects/object_dekujr.xml index e4141a50b..e906bf61c 100644 --- a/assets/xml/objects/object_dekujr.xml +++ b/assets/xml/objects/object_dekujr.xml @@ -7,7 +7,7 @@ <Texture Name="object_dekujr_Tex_001600" OutName="tex_00001600" Format="ia8" Width="8" Height="8" Offset="0x1600"/> <Texture Name="object_dekujr_Tex_001640" OutName="tex_00001640" Format="ia8" Width="64" Height="64" Offset="0x1640"/> <Texture Name="object_dekujr_Tex_002640" OutName="tex_00002640" Format="ia16" Width="32" Height="16" Offset="0x2640"/> - <DList Name="object_dekujr_DL_0030D0" Offset="0x30D0"/> - <DList Name="object_dekujr_DL_0032D8" Offset="0x32D8"/> + <DList Name="object_dekujr_DL_0030D0" Offset="0x30D0"/> <!-- dekujr body --> + <DList Name="object_dekujr_DL_0032D8" Offset="0x32D8"/> <!-- dekujr face and shadow --> </File> </Root> diff --git a/assets/xml/objects/object_demo_6k.xml b/assets/xml/objects/object_demo_6k.xml index aef9f90ef..73058d5e4 100644 --- a/assets/xml/objects/object_demo_6k.xml +++ b/assets/xml/objects/object_demo_6k.xml @@ -5,6 +5,9 @@ <Texture Name="object_demo_6k_Tex_0010D0" OutName="tex_000010D0" Format="i8" Width="16" Height="128" Offset="0x10D0"/> <DList Name="object_demo_6k_DL_0022B0" Offset="0x22B0"/> <Texture Name="object_demo_6k_Tex_0025E0" OutName="tex_000025E0" Format="i8" Width="64" Height="64" Offset="0x25E0"/> + <Array Name="object_demo_6kVtx_0035E0" Count="63" Offset="0x35E0"> + <Vtx/> + </Array> <DList Name="object_demo_6k_DL_0039D0" Offset="0x39D0"/> </File> </Root> diff --git a/assets/xml/objects/object_door_killer.xml b/assets/xml/objects/object_door_killer.xml index 41cd4f8d1..8da96881f 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"/> - <Blob Name="object_door_killer_Blob_001B28" Size="0xB8" Offset="0x1B28"/> + <Skeleton Name="object_door_killer_Skel_001BC8" Type="Flex" LimbType="Standard" Offset="0x1BC8" /> </File> </Root> diff --git a/assets/xml/objects/object_fr.xml b/assets/xml/objects/object_fr.xml index c8533dd6b..5935f371d 100644 --- a/assets/xml/objects/object_fr.xml +++ b/assets/xml/objects/object_fr.xml @@ -1,7 +1,7 @@ <Root> <File Name="object_fr" Segment="6"> - <Animation Name="object_fr_Anim_0007BC" Offset="0x7BC"/> - <Animation Name="object_fr_Anim_0011C0" Offset="0x11C0"/> + <Animation Name="object_fr_Anim_0007BC" Offset="0x7BC"/> <!-- Frog Jumping --> + <Animation Name="object_fr_Anim_0011C0" Offset="0x11C0"/> <!-- Frog Landing --> <Animation Name="object_fr_Anim_001534" Offset="0x1534"/> <Texture Name="object_fr_Tex_001550" OutName="tex_00001550" Format="rgba16" Width="32" Height="32" Offset="0x1550"/> <Blob Name="object_fr_Blob_001D50" Size="0x1D50" Offset="0x1D50"/> diff --git a/assets/xml/objects/object_ganon.xml b/assets/xml/objects/object_ganon.xml index b880161b2..21da569a4 100644 --- a/assets/xml/objects/object_ganon.xml +++ b/assets/xml/objects/object_ganon.xml @@ -51,7 +51,8 @@ <Texture Name="object_ganon_Tex_00A260" OutName="tex_0000A260" Format="rgba16" Width="16" Height="16" Offset="0xA260"/> <Texture Name="object_ganon_Tex_00A460" OutName="tex_0000A460" Format="ci8" Width="8" Height="8" Offset="0xA460"/> <Texture Name="object_ganon_Tex_00A4A0" OutName="tex_0000A4A0" Format="ci8" Width="8" Height="8" Offset="0xA4A0"/> - <Blob Name="object_ganon_Blob_00A4E0" Size="0x800" Offset="0xA4E0"/> + <Texture Name="object_ganon_Tex_00A4E0" OutName="tex_0000A4E0" Format="rgba16" Width="32" Height="16" Offset="0xA4E0"/> + <Blob Name="object_ganon_Blob_00A8E0" Size="0x400" Offset="0xA8E0"/> <DList Name="object_ganon_DL_00BE90" Offset="0xBE90"/> <DList Name="object_ganon_DL_00BF40" Offset="0xBF40"/> <DList Name="object_ganon_DL_00C048" Offset="0xC048"/> diff --git a/assets/xml/objects/object_gndd.xml b/assets/xml/objects/object_gndd.xml index fc76de6a6..96e264c34 100644 --- a/assets/xml/objects/object_gndd.xml +++ b/assets/xml/objects/object_gndd.xml @@ -42,7 +42,9 @@ <Texture Name="object_gndd_Tex_00EF38" OutName="tex_0000EF38" Format="rgba16" Width="16" Height="16" Offset="0xEF38"/> <Texture Name="object_gndd_Tex_00F138" OutName="tex_0000F138" Format="rgba16" Width="4" Height="8" Offset="0xF138"/> <Texture Name="object_gndd_Tex_00F178" OutName="tex_0000F178" Format="ci8" Width="32" Height="16" Offset="0xF178"/> - <Blob Name="object_gndd_Blob_00F378" Size="0x600" Offset="0xF378"/> + <Texture Name="object_gndd_Tex_00F378" OutName="tex_0000F378" Format="ci8" Width="32" Height="16" Offset="0xF378"/> + <Texture Name="object_gndd_Tex_00F578" OutName="tex_0000F578" Format="ci8" Width="32" Height="16" Offset="0xF578"/> + <Texture Name="object_gndd_Tex_00F778" OutName="tex_0000F778" Format="ci8" Width="32" Height="16" Offset="0xF778"/> <Texture Name="object_gndd_Tex_00F978" OutName="tex_0000F978" Format="rgba16" Width="16" Height="16" Offset="0xF978"/> <Texture Name="object_gndd_Tex_00FB78" OutName="tex_0000FB78" Format="rgba16" Width="8" Height="16" Offset="0xFB78"/> <Texture Name="object_gndd_Tex_00FC78" OutName="tex_0000FC78" Format="rgba16" Width="8" Height="8" Offset="0xFC78"/> diff --git a/assets/xml/objects/object_haka_objects.xml b/assets/xml/objects/object_haka_objects.xml index d76cb3b7c..237ff2f27 100644 --- a/assets/xml/objects/object_haka_objects.xml +++ b/assets/xml/objects/object_haka_objects.xml @@ -1,7 +1,7 @@ <Root> <File Name="object_haka_objects" Segment="6"> <DList Name="object_haka_objects_DL_000040" Offset="0x40"/> - <Blob Name="object_haka_objects_Blob_0000D0" Size="0x80" Offset="0xD0"/> + <Collision Name="object_haka_objects_Col_000118" Offset="0x118"/> <DList Name="object_haka_objects_DL_001120" Offset="0x1120"/> <DList Name="object_haka_objects_DL_0018F0" Offset="0x18F0"/> <DList Name="object_haka_objects_DL_002ED0" Offset="0x2ED0"/> @@ -19,39 +19,39 @@ <DList Name="object_haka_objects_DL_004B70" Offset="0x4B70"/> <Blob Name="object_haka_objects_Blob_004C40" Size="0xB0" Offset="0x4C40"/> <DList Name="object_haka_objects_DL_005000" Offset="0x5000"/> - <Blob Name="object_haka_objects_Blob_005130" Size="0x230" Offset="0x5130"/> + <Collision Name="object_haka_objects_Col_005334" Offset="0x5334"/> <DList Name="object_haka_objects_DL_005A70" Offset="0x5A70"/> <DList Name="object_haka_objects_DL_005CE0" Offset="0x5CE0"/> - <Blob Name="object_haka_objects_Blob_005DB8" Size="0xA8" Offset="0x5DB8"/> + <Collision Name="object_haka_objects_Col_005E30" Offset="0x5E30"/> <DList Name="object_haka_objects_DL_0064E0" Offset="0x64E0"/> - <Blob Name="object_haka_objects_Blob_0067C8" Size="0x7D8" Offset="0x67C8"/> + <Collision Name="object_haka_objects_Col_006F70" Offset="0x6F70"/> <DList Name="object_haka_objects_DL_0072C0" Offset="0x72C0"/> <DList Name="object_haka_objects_DL_007610" Offset="0x7610"/> <DList Name="object_haka_objects_DL_007EF0" Offset="0x7EF0"/> - <Blob Name="object_haka_objects_Blob_008148" Size="0xB8" Offset="0x8148"/> + <Collision Name="object_haka_objects_Col_0081D0" Offset="0x81D0"/> <DList Name="object_haka_objects_DL_008A20" Offset="0x8A20"/> - <Blob Name="object_haka_objects_Blob_008C90" Size="0xB0" Offset="0x8C90"/> + <Collision Name="object_haka_objects_Col_008D10" Offset="0x8D10"/> <DList Name="object_haka_objects_DL_008EB0" Offset="0x8EB0"/> - <Blob Name="object_haka_objects_Blob_009038" Size="0x168" Offset="0x9038"/> + <Collision Name="object_haka_objects_Col_009168" Offset="0x9168"/> <DList Name="object_haka_objects_DL_009860" Offset="0x9860"/> - <Blob Name="object_haka_objects_Blob_009AC0" Size="0x240" Offset="0x9AC0"/> + <Collision Name="object_haka_objects_Col_009CD0" Offset="0x9CD0"/> <DList Name="object_haka_objects_DL_00A1A0" Offset="0xA1A0"/> - <Blob Name="object_haka_objects_Blob_00A460" Size="0x3C0" Offset="0xA460"/> + <Collision Name="object_haka_objects_Col_00A7F4" Offset="0xA7F4"/> <DList Name="object_haka_objects_DL_00A860" Offset="0xA860"/> - <Blob Name="object_haka_objects_Blob_00A8F0" Size="0x80" Offset="0xA8F0"/> + <Collision Name="object_haka_objects_Col_00A938" Offset="0xA938"/> <DList Name="object_haka_objects_DL_00BF20" Offset="0xBF20"/> <DList Name="object_haka_objects_DL_00D330" Offset="0xD330"/> - <Blob Name="object_haka_objects_Blob_00DA88" Size="0x9B8" Offset="0xDA88"/> + <Collision Name="object_haka_objects_Col_00E408" Offset="0xE408"/> <DList Name="object_haka_objects_DL_00E910" Offset="0xE910"/> - <Blob Name="object_haka_objects_Blob_00EA40" Size="0x370" Offset="0xEA40"/> + <Collision Name="object_haka_objects_Col_00ED7C" Offset="0xED7C"/> <DList Name="object_haka_objects_DL_00F1B0" Offset="0xF1B0"/> <DList Name="object_haka_objects_DL_00FE40" Offset="0xFE40"/> - <Blob Name="object_haka_objects_Blob_010168" Size="0x788" Offset="0x10168"/> + <Collision Name="object_haka_objects_Col_0108B8" Offset="0x108B8"/> <DList Name="object_haka_objects_DL_010A10" Offset="0x10A10"/> <DList Name="object_haka_objects_DL_010C10" Offset="0x10C10"/> - <Blob Name="object_haka_objects_Blob_010CF0" Size="0x150" Offset="0x10CF0"/> + <Collision Name="object_haka_objects_Col_010E10" Offset="0x10E10"/> <DList Name="object_haka_objects_DL_012270" Offset="0x12270"/> - <Blob Name="object_haka_objects_Blob_012AA0" Size="0x750" Offset="0x12AA0"/> + <Collision Name="object_haka_objects_Col_0131C4" Offset="0x131C4"/> <Texture Name="object_haka_objects_Tex_0131F0" OutName="tex_000131F0" Format="ia8" Width="32" Height="32" Offset="0x131F0"/> <Texture Name="object_haka_objects_Tex_0135F0" OutName="tex_000135F0" Format="rgba16" Width="32" Height="32" Offset="0x135F0"/> <Texture Name="object_haka_objects_Tex_013DF0" OutName="tex_00013DF0" Format="rgba16" Width="32" Height="32" Offset="0x13DF0"/> diff --git a/assets/xml/objects/object_ice_objects.xml b/assets/xml/objects/object_ice_objects.xml index ee8fb94ce..a4e2e9b12 100644 --- a/assets/xml/objects/object_ice_objects.xml +++ b/assets/xml/objects/object_ice_objects.xml @@ -1,17 +1,18 @@ <Root> <File Name="object_ice_objects" Segment="6"> <DList Name="object_ice_objects_DL_000190" Offset="0x190"/> - <Blob Name="object_ice_objects_Blob_0002B8" Size="0x168" Offset="0x2B8"/> + <Collision Name="object_ice_objects_Col_0003F0" Offset="0x3F0"/> <DList Name="object_ice_objects_DL_0006F0" Offset="0x6F0"/> <DList Name="object_ice_objects_DL_0012A0" Offset="0x12A0"/> - <Blob Name="object_ice_objects_Blob_001520" Size="0x730" Offset="0x1520"/> + <Collision Name="object_ice_objects_Col_001C1C" Offset="0x1C1C"/> <DList Name="object_ice_objects_DL_001D10" Offset="0x1D10"/> <DList Name="object_ice_objects_DL_0021F0" Offset="0x21F0"/> <DList Name="object_ice_objects_DL_0023D0" Offset="0x23D0"/> - <Blob Name="object_ice_objects_Blob_002470" Size="0x150" Offset="0x2470"/> + <Collision Name="object_ice_objects_Col_002594" Offset="0x2594"/> <DList Name="object_ice_objects_DL_002640" Offset="0x2640"/> <DList Name="object_ice_objects_DL_002740" Offset="0x2740"/> - <Blob Name="object_ice_objects_Blob_0027D8" Size="0x178" Offset="0x27D8"/> + <Collision Name="object_ice_objects_Col_002854" Offset="0x2854"/> + <Collision Name="object_ice_objects_Col_002920" Offset="0x2920"/> <Texture Name="object_ice_objects_Tex_002950" OutName="tex_00002950" Format="rgba16" Width="32" Height="32" Offset="0x2950"/> <Texture Name="object_ice_objects_Tex_003150" OutName="tex_00003150" Format="i8" Width="32" Height="128" Offset="0x3150"/> <Texture Name="object_ice_objects_Tex_004150" OutName="tex_00004150" Format="rgba16" Width="32" Height="32" Offset="0x4150"/> diff --git a/assets/xml/objects/object_im.xml b/assets/xml/objects/object_im.xml index e261066fd..707269caf 100644 --- a/assets/xml/objects/object_im.xml +++ b/assets/xml/objects/object_im.xml @@ -30,8 +30,8 @@ <DList Name="object_im_DL_006BB8" Offset="0x6BB8"/> <DList Name="object_im_DL_006D70" Offset="0x6D70"/> <Texture Name="object_im_Tex_006F40" OutName="tex_00006F40" Format="rgba16" Width="16" Height="16" Offset="0x6F40"/> - <Texture Name="object_im_TLUT_007140" OutName="tlut_00007140" Format="rgba16" Width="16" Height="16" Offset="0x7140"/> - <Blob Name="object_im_Blob_007340" Size="0x2D0" Offset="0x7340"/> + <Texture Name="object_im_TLUT_007140" OutName="tlut_00007140" Format="rgba16" Width="8" Height="13" Offset="0x7140"/> + <Texture Name="object_im_Tex_007210" OutName="tex_00007210" Format="ci8" Width="32" Height="32" Offset="0x7210"/> <Texture Name="object_im_Tex_007610" OutName="tex_00007610" Format="ci8" Width="16" Height="16" Offset="0x7610"/> <Texture Name="object_im_Tex_007710" OutName="tex_00007710" Format="ci8" Width="8" Height="8" Offset="0x7710"/> <Texture Name="object_im_Tex_007750" OutName="tex_00007750" Format="rgba16" Width="8" Height="8" Offset="0x7750"/> diff --git a/assets/xml/objects/object_in.xml b/assets/xml/objects/object_in.xml index 7b788efd0..66295f90d 100644 --- a/assets/xml/objects/object_in.xml +++ b/assets/xml/objects/object_in.xml @@ -18,7 +18,8 @@ <Texture Name="object_in_Tex_0031D0" OutName="tex_000031D0" Format="ci8" Width="8" Height="8" Offset="0x31D0"/> <!-- <Blob Name="object_in_Blob_003210" Size="0x1F8" Offset="0x3210"/> --> <Texture Name="object_in_TLUT_003408" OutName="tlut_00003408" Format="rgba16" Width="100" Height="1" Offset="0x3408"/> - <!-- <Blob Name="object_in_Blob_003608" Size="0x388" Offset="0x3608" /> --> + <Texture Name="object_in_Tex_0034D0" OutName="tex_000034D0" Format="ci8" Width="8" Height="8" Offset="0x34D0"/> + <Texture Name="object_in_Tex_003590" OutName="tex_00003590" Format="ci8" Width="32" Height="32" Offset="0x3590"/> <Texture Name="object_in_Tex_003990" OutName="tex_00003990" Format="rgba16" Width="16" Height="16" Offset="0x3990"/> <Texture Name="object_in_Tex_003B90" OutName="tex_00003B90" Format="ci8" Width="16" Height="16" Offset="0x3B90"/> <Texture Name="object_in_Tex_003C90" OutName="tex_00003C90" Format="ci8" Width="16" Height="16" Offset="0x3C90"/> @@ -28,9 +29,11 @@ <Texture Name="object_in_Tex_0040D0" OutName="tex_000040D0" Format="rgba16" Width="8" Height="16" Offset="0x40D0"/> <Texture Name="object_in_Tex_0041D0" OutName="tex_000041D0" Format="ci8" Width="8" Height="16" Offset="0x41D0"/> <Texture Name="object_in_Tex_004250" OutName="tex_00004250" Format="ci8" Width="16" Height="16" Offset="0x4250"/> - <Blob Name="object_in_Blob_004350" Size="0x440" Offset="0x4350"/> + <Texture Name="object_in_Tex_004350" OutName="tex_00004350" Format="ci8" Width="8" Height="8" Offset="0x4350"/> + <Texture Name="object_in_Tex_004390" OutName="tex_00004390" Format="ci8" Width="32" Height="32" Offset="0x4390"/> <Texture Name="object_in_Tex_004790" OutName="tex_00004790" Format="ci8" Width="8" Height="8" Offset="0x4790"/> - <Blob Name="object_in_Blob_0047D0" Size="0x800" Offset="0x47D0"/> + <Texture Name="object_in_Tex_0047D0" OutName="tex_000047D0" Format="ci8" Width="32" Height="32" Offset="0x47D0"/> + <Texture Name="object_in_Tex_004BD0" OutName="tex_00004BD0" Format="ci8" Width="32" Height="32" Offset="0x4BD0"/> <DList Name="object_in_DL_006730" Offset="0x6730"/> <DList Name="object_in_DL_007398" Offset="0x7398"/> <DList Name="object_in_DL_0074C0" Offset="0x74C0"/> diff --git a/assets/xml/objects/object_kingdodongo.xml b/assets/xml/objects/object_kingdodongo.xml index 970a6fe05..d2c01e878 100644 --- a/assets/xml/objects/object_kingdodongo.xml +++ b/assets/xml/objects/object_kingdodongo.xml @@ -48,7 +48,7 @@ <Texture Name="object_kingdodongo_Tex_016D90" OutName="tex_00016D90" Format="rgba16" Width="8" Height="8" Offset="0x16D90"/> <Texture Name="object_kingdodongo_Tex_016E10" OutName="tex_00016E10" Format="rgba16" Width="32" Height="16" Offset="0x16E10"/> <Texture Name="object_kingdodongo_Tex_017210" OutName="tex_00017210" Format="rgba16" Width="8" Height="32" Offset="0x17210"/> - <Blob Name="object_kingdodongo_Blob_017410" Size="0x3C00" Offset="0x17410"/> + <Blob Name="object_kingdodongo_Blob_017410" Size="0x3C00" Offset="0x17410"/> <!-- title card texture --> <Limb Name="object_kingdodongo_Limb_01B010" LimbType="Standard" Offset="0x1B010"/> <Limb Name="object_kingdodongo_Limb_01B01C" LimbType="Standard" Offset="0x1B01C"/> <Limb Name="object_kingdodongo_Limb_01B028" LimbType="Standard" Offset="0x1B028"/> diff --git a/assets/xml/objects/object_kz.xml b/assets/xml/objects/object_kz.xml index 3c745bfff..a0e5dccd5 100644 --- a/assets/xml/objects/object_kz.xml +++ b/assets/xml/objects/object_kz.xml @@ -3,13 +3,16 @@ <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_Tex_000970" OutName="tex_000970" Format="rgba16" Width="16" Height="16" Offset="0x970" /> + <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"/> <Texture Name="object_kz_Tex_0013F0" OutName="tex_0013F0" Format="ci8" Width="8" Height="8" Offset="0x13F0" TlutOffset="0x770"/> <Texture Name="object_kz_Tex_001430" OutName="tex_001430" Format="ci8" Width="8" Height="8" Offset="0x1430" TlutOffset="0x770"/> - <Blob Name="object_kz_Blob_001470" Size="0x1000" Offset="0x1470" /> + <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" /> <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"/> diff --git a/assets/xml/objects/object_lightbox.xml b/assets/xml/objects/object_lightbox.xml index bc11405fb..552a79d7c 100644 --- a/assets/xml/objects/object_lightbox.xml +++ b/assets/xml/objects/object_lightbox.xml @@ -10,6 +10,6 @@ <DList Name="object_lightbox_DL_000B70" Offset="0xB70"/> <Texture Name="object_lightbox_Tex_000E10" OutName="tex_00000E10" Format="rgba16" Width="32" Height="32" Offset="0xE10"/> <Texture Name="object_lightbox_Tex_001610" OutName="tex_00001610" Format="rgba16" Width="32" Height="32" Offset="0x1610"/> - <Blob Name="object_lightbox_Blob_001E10" Size="0x130" Offset="0x1E10"/> + <Collision Name="object_lightbox_Col_001F10" Offset="0x1F10"/> </File> </Root> diff --git a/assets/xml/objects/object_lightswitch.xml b/assets/xml/objects/object_lightswitch.xml index 241500e7e..cfd5dcfb4 100644 --- a/assets/xml/objects/object_lightswitch.xml +++ b/assets/xml/objects/object_lightswitch.xml @@ -1,9 +1,14 @@ <Root> <File Name="object_lightswitch" Segment="6"> + <!-- face, uses rgba16 32x32 texture at 0x08000000, branches to dlist 0x09000000, uses env color --> <DList Name="object_lightswitch_DL_000260" Offset="0x260"/> + <!-- flame ring, branches to dlist 0x09000000, uses env color --> <DList Name="object_lightswitch_DL_000398" Offset="0x398"/> + <!-- a square, geometry only --> <DList Name="object_lightswitch_DL_000408" Offset="0x408"/> - <Blob Name="object_lightswitch_Blob_000420" Size="0x1800" Offset="0x420"/> + <Texture Name="object_lightswitch_Tex_000420" OutName="tex_00000420" Format="rgba16" Width="32" Height="32" Offset="0x420"/> <!-- eyes open --> + <Texture Name="object_lightswitch_Tex_000C20" OutName="tex_00000C20" Format="rgba16" Width="32" Height="32" Offset="0xC20"/> <!-- eyes closed --> + <Texture Name="object_lightswitch_Tex_001420" OutName="tex_00001420" Format="rgba16" Width="32" Height="32" Offset="0x1420"/> <!-- eyes open, smiling --> <Texture Name="object_lightswitch_Tex_001C20" OutName="tex_00001C20" Format="rgba16" Width="32" Height="32" Offset="0x1C20"/> </File> </Root> diff --git a/assets/xml/objects/object_ma2.xml b/assets/xml/objects/object_ma2.xml index 6951763a8..7c1286645 100644 --- a/assets/xml/objects/object_ma2.xml +++ b/assets/xml/objects/object_ma2.xml @@ -17,11 +17,14 @@ <Texture Name="object_ma2_Tex_0021F0" OutName="tex_000021F0" Format="rgba16" Width="8" Height="8" Offset="0x21F0"/> <Texture Name="object_ma2_Tex_002270" OutName="tex_00002270" Format="rgba16" Width="16" Height="16" Offset="0x2270"/> <Texture Name="object_ma2_Tex_002470" OutName="tex_00002470" Format="ci8" Width="16" Height="16" Offset="0x2470"/> - <Blob Name="object_ma2_Blob_002570" Size="0x600" Offset="0x2570"/> + <Texture Name="object_ma2_Tex_002570" OutName="tex_00002570" Format="ci8" Width="32" Height="32" Offset="0x2570"/> + <Blob Name="object_ma2_Blob_002970" Size="0x200" Offset="0x2970"/> <Texture Name="object_ma2_Tex_002B70" OutName="tex_00002B70" Format="rgba16" Width="8" Height="16" Offset="0x2B70"/> - <Blob Name="object_ma2_Blob_002C70" Size="0x800" Offset="0x2C70"/> + <Texture Name="object_ma2_Tex_002C70" OutName="tex_00002C70" Format="ci8" Width="32" Height="32" Offset="0x2C70"/> + <Texture Name="object_ma2_Tex_003070" OutName="tex_00003070" Format="ci8" Width="32" Height="32" Offset="0x3070"/> <Texture Name="object_ma2_Tex_003470" OutName="tex_00003470" Format="rgba16" Width="8" Height="16" Offset="0x3470"/> - <Blob Name="object_ma2_Blob_003570" Size="0x400" Offset="0x3570"/> + <Blob Name="object_ma2_Blob_003570" Size="0x200" Offset="0x3570"/> + <Texture Name="object_ma2_Tex_003770" OutName="tex_00003770" Format="ci8" Width="32" Height="16" Offset="0x3770"/> <DList Name="object_ma2_DL_004BE0" Offset="0x4BE0"/> <DList Name="object_ma2_DL_005420" Offset="0x5420"/> <DList Name="object_ma2_DL_007568" Offset="0x7568"/> @@ -60,6 +63,6 @@ <Skeleton Name="object_ma2_Skel_008D90" Type="Flex" LimbType="Standard" Offset="0x8D90"/> <Animation Name="object_ma2_Anim_0092F0" Offset="0x92F0"/> <Animation Name="object_ma2_Anim_0093BC" Offset="0x93BC"/> - <Blob Name="object_ma2_Blob_0093CC" Size="0xB24" Offset="0x93CC"/> + <Animation Name="object_ma2_Anim_009EE0" Offset="0x9EE0"/> </File> </Root> diff --git a/assets/xml/objects/object_mizu_objects.xml b/assets/xml/objects/object_mizu_objects.xml index 904288449..de3bdf636 100644 --- a/assets/xml/objects/object_mizu_objects.xml +++ b/assets/xml/objects/object_mizu_objects.xml @@ -19,7 +19,9 @@ <DList Name="gObjectMizuObjectsBwallDL_002090" Offset="0x2090"/> <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" /> + <DList Name="gWaterTempleDoorDL_0048B0" Offset="0x48B0"/> <DList Name="gWaterTempleDoorLeftDL" Offset="0x4958"/> <DList Name="gWaterTempleDoorRightDL" Offset="0x4A10"/> diff --git a/assets/xml/objects/object_mori_hineri1.xml b/assets/xml/objects/object_mori_hineri1.xml index c86047131..517c02780 100644 --- a/assets/xml/objects/object_mori_hineri1.xml +++ b/assets/xml/objects/object_mori_hineri1.xml @@ -1,6 +1,6 @@ <Root> <File Name="object_mori_hineri1" Segment="6"> <DList Name="object_mori_hineri1_DL_0024E0" Offset="0x24E0"/> - <Blob Name="object_mori_hineri1_Blob_0043B0" Size="0x1140" Offset="0x43B0"/> + <Collision Name="object_mori_hineri1_Col_0054B8" Offset="0x54B8"/> </File> </Root> diff --git a/assets/xml/objects/object_mori_hineri1a.xml b/assets/xml/objects/object_mori_hineri1a.xml index ac1e44696..fb20482dd 100644 --- a/assets/xml/objects/object_mori_hineri1a.xml +++ b/assets/xml/objects/object_mori_hineri1a.xml @@ -1,6 +1,6 @@ <Root> <File Name="object_mori_hineri1a" Segment="6"> <DList Name="object_mori_hineri1a_DL_001980" Offset="0x1980"/> - <Blob Name="object_mori_hineri1a_Blob_0028D8" Size="0xBE8" Offset="0x28D8"/> + <Collision Name="object_mori_hineri1a_Col_003490" Offset="0x3490"/> </File> </Root> diff --git a/assets/xml/objects/object_mori_hineri2.xml b/assets/xml/objects/object_mori_hineri2.xml index 2c9bfe44f..a23d9060c 100644 --- a/assets/xml/objects/object_mori_hineri2.xml +++ b/assets/xml/objects/object_mori_hineri2.xml @@ -1,6 +1,6 @@ <Root> <File Name="object_mori_hineri2" Segment="6"> <DList Name="object_mori_hineri2_DL_0020F0" Offset="0x20F0"/> - <Blob Name="object_mori_hineri2_Blob_0032B0" Size="0x1150" Offset="0x32B0"/> + <Collision Name="object_mori_hineri2_Col_0043D0" Offset="0x43D0"/> </File> </Root> diff --git a/assets/xml/objects/object_mori_hineri2a.xml b/assets/xml/objects/object_mori_hineri2a.xml index 14e22992c..282fd267f 100644 --- a/assets/xml/objects/object_mori_hineri2a.xml +++ b/assets/xml/objects/object_mori_hineri2a.xml @@ -1,6 +1,6 @@ <Root> <File Name="object_mori_hineri2a" Segment="6"> <DList Name="object_mori_hineri2a_DL_002B70" Offset="0x2B70"/> - <Blob Name="object_mori_hineri2a_Blob_004BB8" Size="0x14F8" Offset="0x4BB8"/> + <Collision Name="object_mori_hineri2a_Col_006078" Offset="0x6078"/> </File> </Root> diff --git a/assets/xml/objects/object_reeba.xml b/assets/xml/objects/object_reeba.xml index 4e103cb3f..32c697bd9 100644 --- a/assets/xml/objects/object_reeba.xml +++ b/assets/xml/objects/object_reeba.xml @@ -22,6 +22,6 @@ <Texture Name="object_reeba_Tex_000CD8" OutName="tex_00000CD8" Format="rgba16" Width="8" Height="16" Offset="0xCD8"/> <Texture Name="object_reeba_Tex_000DD8" OutName="tex_00000DD8" Format="rgba16" Width="32" Height="32" Offset="0xDD8"/> <Texture Name="object_reeba_Tex_0015D8" OutName="tex_000015D8" Format="rgba16" Width="32" Height="32" Offset="0x15D8"/> - <Blob Name="object_reeba_Blob_001DD8" Size="0x118" Offset="0x1DD8"/> + <Skeleton Name="object_reeba_Skel_001EE8" Type="Normal" LimbType="Standard" Offset="0x1EE8"/> </File> </Root> diff --git a/assets/xml/objects/object_rl.xml b/assets/xml/objects/object_rl.xml index c7d10022a..fa423e529 100644 --- a/assets/xml/objects/object_rl.xml +++ b/assets/xml/objects/object_rl.xml @@ -17,7 +17,8 @@ <Texture Name="object_rl_Tex_003620" OutName="tex_00003620" Format="ci8" Width="32" Height="16" Offset="0x3620"/> <Texture Name="object_rl_Tex_003820" OutName="tex_00003820" Format="ci8" Width="16" Height="16" Offset="0x3820"/> <Texture Name="object_rl_Tex_003920" OutName="tex_00003920" Format="ci8" Width="8" Height="8" Offset="0x3920"/> - <Blob Name="object_rl_Blob_003960" Size="0x400" Offset="0x3960"/> + <Texture Name="object_rl_Tex_003960" OutName="tex_00003960" Format="ci8" Width="32" Height="16" Offset="0x3960"/> + <Texture Name="object_rl_Tex_003B60" OutName="tex_00003B60" Format="ci8" Width="32" Height="16" Offset="0x3B60"/> <Texture Name="object_rl_Tex_003D60" OutName="tex_00003D60" Format="ci8" Width="8" Height="8" Offset="0x3D60"/> <Texture Name="object_rl_Tex_003DA0" OutName="tex_00003DA0" Format="ci8" Width="16" Height="16" Offset="0x3DA0"/> <DList Name="object_rl_DL_005220" Offset="0x5220"/> diff --git a/assets/xml/objects/object_siofuki.xml b/assets/xml/objects/object_siofuki.xml index 453bc9474..a23240a72 100644 --- a/assets/xml/objects/object_siofuki.xml +++ b/assets/xml/objects/object_siofuki.xml @@ -2,6 +2,6 @@ <File Name="object_siofuki" Segment="6"> <Texture Name="object_siofuki_Tex_000000" OutName="tex_00000000" Format="i4" Width="64" Height="64" Offset="0x0"/> <DList Name="object_siofuki_DL_000B70" Offset="0xB70"/> - <Blob Name="object_siofuki_Blob_000D30" Size="0x80" Offset="0xD30"/> + <Collision Name="object_siofuki_Col_000D78" Offset="0xD78"/> </File> </Root> diff --git a/assets/xml/objects/object_spot01_matoyab.xml b/assets/xml/objects/object_spot01_matoyab.xml index 1564f0e86..720f50cd3 100644 --- a/assets/xml/objects/object_spot01_matoyab.xml +++ b/assets/xml/objects/object_spot01_matoyab.xml @@ -1,5 +1,7 @@ <Root> <File Name="object_spot01_matoyab" Segment="6"> + <Collision Name="object_spot01_matoyab_col" Offset="0x1C58"/> + <!-- Kakariko Guard Gate --> <DList Name="gKakarikoGuardGateDL" Offset="0x1CD0"/> <Texture Name="gKakarikoGuardGateMetalSidebarDL" OutName="guard_gate_metal_sidebar" Format="rgba16" Width="8" Height="64" Offset="0x1DE0"/> diff --git a/assets/xml/objects/object_spot02_objects.xml b/assets/xml/objects/object_spot02_objects.xml index 1e8b44d07..28452bf5a 100644 --- a/assets/xml/objects/object_spot02_objects.xml +++ b/assets/xml/objects/object_spot02_objects.xml @@ -8,12 +8,12 @@ <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"/> - <Blob Name="object_spot02_objects_Blob_012890" Size="0x80" Offset="0x12890"/> + <Collision Name="object_spot02_objects_Col_0128D8" Offset="0x128D8"/> <DList Name="object_spot02_objects_DL_012A50" Offset="0x12A50"/> - <Blob Name="object_spot02_objects_Blob_012B28" Size="0xA8" Offset="0x12B28"/> + <Collision Name="object_spot02_objects_Col_012BA4" Offset="0x12BA4"/> <DList Name="object_spot02_objects_DL_012D30" Offset="0x12D30"/> <DList Name="object_spot02_objects_DL_0130B0" Offset="0x130B0"/> - <Blob Name="object_spot02_objects_Blob_013220" Size="0x200" Offset="0x13220"/> + <Collision Name="object_spot02_objects_Col_0133EC" Offset="0x133EC"/> <Texture Name="object_spot02_objects_Tex_013420" OutName="tex_00013420" Format="i4" Width="32" Height="64" Offset="0x13420"/> <Texture Name="object_spot02_objects_Tex_013820" OutName="tex_00013820" Format="rgba16" Width="32" Height="32" Offset="0x13820"/> <Texture Name="object_spot02_objects_Tex_014020" OutName="tex_00014020" Format="rgba16" Width="32" Height="32" Offset="0x14020"/> diff --git a/assets/xml/objects/object_spot03_object.xml b/assets/xml/objects/object_spot03_object.xml index 7f77013d2..f182e7d99 100644 --- a/assets/xml/objects/object_spot03_object.xml +++ b/assets/xml/objects/object_spot03_object.xml @@ -1,10 +1,15 @@ <Root> <File Name="object_spot03_object" Segment="6"> <Texture Name="object_spot03_object_Tex_000000" OutName="tex_00000000" Format="i4" Width="64" Height="64" Offset="0x0"/> - <Blob Name="object_spot03_object_Blob_000800" Size="0x320" Offset="0x800"/> + <Array Name="object_spot03_object_Vtx_000800" Count="25" Offset="0x800"> + <Vtx/> + </Array> + <Array Name="object_spot03_object_Vtx_000990" Count="25" Offset="0x990"> + <Vtx/> + </Array> <DList Name="object_spot03_object_DL_000B20" Offset="0xB20"/> <DList Name="object_spot03_object_DL_000BC0" Offset="0xBC0"/> - <Blob Name="object_spot03_object_Blob_000C48" Size="0x88" Offset="0xC48"/> + <Collision Name="object_spot03_object_Col_000C98" Offset="0xC98"/> <Texture Name="object_spot03_object_Tex_000CD0" OutName="tex_00000CD0" Format="i4" Width="64" Height="64" Offset="0xCD0"/> <DList Name="object_spot03_object_DL_001580" Offset="0x1580"/> </File> diff --git a/assets/xml/objects/object_spot05_objects.xml b/assets/xml/objects/object_spot05_objects.xml index 1e49c5a57..6e7079149 100644 --- a/assets/xml/objects/object_spot05_objects.xml +++ b/assets/xml/objects/object_spot05_objects.xml @@ -2,9 +2,9 @@ <File Name="object_spot05_objects" Segment="6"> <Texture Name="object_spot05_objects_Tex_000000" OutName="tex_00000000" Format="rgba16" Width="32" Height="32" Offset="0x0"/> <DList Name="object_spot05_objects_DL_000840" Offset="0x840"/> - <Blob Name="object_spot05_objects_Blob_0008D0" Size="0x80" Offset="0x8D0"/> + <Collision Name="object_spot05_objects_Col_000918" Offset="0x918"/> <Texture Name="object_spot05_objects_Tex_000950" OutName="tex_00000950" Format="rgba16" Width="16" Height="64" Offset="0x950"/> <DList Name="object_spot05_objects_DL_001190" Offset="0x1190"/> - <Blob Name="object_spot05_objects_Blob_001220" Size="0xD0" Offset="0x1220"/> + <Collision Name="object_spot05_objects_Col_0012C0" Offset="0x12C0"/> </File> </Root> diff --git a/assets/xml/objects/object_spot07_object.xml b/assets/xml/objects/object_spot07_object.xml index 6623a564c..fce169032 100644 --- a/assets/xml/objects/object_spot07_object.xml +++ b/assets/xml/objects/object_spot07_object.xml @@ -6,12 +6,12 @@ <Texture Name="object_spot07_object_Tex_000EE0" OutName="tex_00000EE0" Format="ci4" Width="32" Height="128" Offset="0xEE0"/> <DList Name="object_spot07_object_DL_001CF0" Offset="0x1CF0"/> <DList Name="object_spot07_object_DL_001F68" Offset="0x1F68"/> - <Blob Name="object_spot07_object_Blob_0020F0" Size="0x4D0" Offset="0x20F0"/> + <Collision Name="object_spot07_object_Col_002590" Offset="0x2590"/> <Texture Name="object_spot07_object_TLUT_0025C0" OutName="tlut_000025C0" Format="rgba16" Width="4" Height="4" Offset="0x25C0"/> <Texture Name="object_spot07_object_Tex_0025E0" OutName="tex_000025E0" Format="ci4" Width="32" Height="128" Offset="0x25E0"/> <DList Name="object_spot07_object_DL_003210" Offset="0x3210"/> <DList Name="object_spot07_object_DL_0032D8" Offset="0x32D8"/> - <Blob Name="object_spot07_object_Blob_003588" Size="0x3A8" Offset="0x3588"/> + <Collision Name="object_spot07_object_Col_0038FC" Offset="0x38FC"/> <Texture Name="object_spot07_object_Tex_003930" OutName="tex_00003930" Format="rgba16" Width="32" Height="32" Offset="0x3930"/> <Texture Name="object_spot07_object_Tex_004130" OutName="tex_00004130" Format="i4" Width="64" Height="64" Offset="0x4130"/> <Texture Name="object_spot07_object_Tex_004930" OutName="tex_00004930" Format="i4" Width="32" Height="128" Offset="0x4930"/> diff --git a/assets/xml/objects/object_st.xml b/assets/xml/objects/object_st.xml index 653e19a56..fe617cf14 100644 --- a/assets/xml/objects/object_st.xml +++ b/assets/xml/objects/object_st.xml @@ -22,8 +22,8 @@ <Texture Name="object_st_Tex_0024D0" OutName="tex_000024D0" Format="rgba16" Width="16" Height="8" Offset="0x24D0"/> <Texture Name="object_st_Tex_0025D0" OutName="tex_000025D0" Format="i4" Width="16" Height="16" Offset="0x25D0"/> <Texture Name="object_st_Tex_002650" OutName="tex_00002650" Format="rgba16" Width="8" Height="8" Offset="0x2650"/> - <Blob Name="object_st_Blob_003C50" Size="0x358" Offset="0x3C50"/> - <DList Name="object_st_DL_003FA8" Offset="0x3FA8"/> + <Blob Name="object_st_Blob_003C50" Size="0x360" Offset="0x3C50"/> + <DList Name="object_st_DL_003FB0" Offset="0x3FB0"/> <DList Name="object_st_DL_0043D8" Offset="0x43D8"/> <DList Name="object_st_DL_0045C0" Offset="0x45C0"/> <DList Name="object_st_DL_004658" Offset="0x4658"/> diff --git a/assets/xml/objects/object_ta.xml b/assets/xml/objects/object_ta.xml index cbc90d953..595e4aa0d 100644 --- a/assets/xml/objects/object_ta.xml +++ b/assets/xml/objects/object_ta.xml @@ -18,12 +18,15 @@ <Texture Name="object_ta_Tex_006DC0" OutName="tex_00006DC0" Format="ci8" Width="8" Height="8" Offset="0x6DC0"/> <Texture Name="object_ta_Tex_006E00" OutName="tex_00006E00" Format="ci8" Width="8" Height="8" Offset="0x6E00"/> <Texture Name="object_ta_Tex_006E40" OutName="tex_00006E40" Format="ci8" Width="8" Height="16" Offset="0x6E40"/> - <Blob Name="object_ta_Blob_006EC0" Size="0xC40" Offset="0x6EC0"/> + <Texture Name="object_ta_Tex_006EC0" OutName="tex_00006EC0" Format="ci8" Width="32" Height="32" Offset="0x6EC0"/> + <Texture Name="object_ta_Tex_0072C0" OutName="tex_000072C0" Format="ci8" Width="32" Height="32" Offset="0x72C0"/> + <Texture Name="object_ta_Tex_0076C0" OutName="tex_000076C0" Format="ci8" Width="32" Height="32" Offset="0x76C0"/> + <Texture Name="object_ta_Tex_007AC0" OutName="tex_00007AC0" Format="ci8" Width="8" Height="8" Offset="0x7AC0"/> <Texture Name="object_ta_Tex_007B00" OutName="tex_00007B00" Format="ci8" Width="16" Height="32" Offset="0x7B00"/> <Texture Name="object_ta_Tex_007D00" OutName="tex_00007D00" Format="ci8" Width="16" Height="16" Offset="0x7D00"/> <Texture Name="object_ta_Tex_007E00" OutName="tex_00007E00" Format="ci8" Width="16" Height="16" Offset="0x7E00"/> <Texture Name="object_ta_Tex_007F00" OutName="tex_00007F00" Format="ci8" Width="8" Height="16" Offset="0x7F00"/> - <Blob Name="object_ta_Blob_007F80" Size="0x400" Offset="0x7F80"/> + <Texture Name="object_ta_Tex_007F80" OutName="tex_00007F80" Format="ci8" Width="32" Height="32" Offset="0x7F80"/> <DList Name="object_ta_DL_0096D0" Offset="0x96D0"/> <DList Name="object_ta_DL_00A2F8" Offset="0xA2F8"/> <DList Name="object_ta_DL_00A498" Offset="0xA498"/> diff --git a/assets/xml/objects/object_tite.xml b/assets/xml/objects/object_tite.xml index f8c9ecab4..1be65c495 100644 --- a/assets/xml/objects/object_tite.xml +++ b/assets/xml/objects/object_tite.xml @@ -3,15 +3,20 @@ <Animation Name="object_tite_Anim_0001D4" Offset="0x1D4"/> <Animation Name="object_tite_Anim_0004F8" Offset="0x4F8"/> <Animation Name="object_tite_Anim_00069C" Offset="0x69C"/> - <Animation Name="object_tite_Anim_00083C" Offset="0x83C"/> - <Animation Name="object_tite_Anim_000A14" Offset="0xA14"/> - <Animation Name="object_tite_Anim_000C70" Offset="0xC70"/> + <Animation Name="object_tite_Anim_00083C" Offset="0x83C"/> <!-- Lunge (6 frames) --> + <Animation Name="object_tite_Anim_000A14" Offset="0xA14"/> <!-- Turning (8 frames) --> + <Animation Name="object_tite_Anim_000C70" Offset="0xC70"/> <!-- Jump / travelling to player (11 frames) --> <Animation Name="object_tite_Anim_000F50" Offset="0xF50"/> - <Animation Name="object_tite_Anim_0012E4" Offset="0x12E4"/> - <Blob Name="object_tite_Blob_0012F4" Size="0x70C" Offset="0x12F4"/> + <Animation Name="object_tite_Anim_0012E4" Offset="0x12E4"/> <!-- Idle (14 frames) --> + <Blob Name="object_tite_Blob_0012F4" Size="0xC" Offset="0x12F4"/> + <Texture Name="object_tite_Tex_001300" OutName="tex_00001300" Format="rgba16" Width="16" Height="32" Offset="0x1300"/> + <Texture Name="object_tite_Tex_001700" OutName="tex_00001700" Format="rgba16" Width="16" Height="16" Offset="0x1700"/> + <Texture Name="object_tite_Tex_001900" OutName="tex_00001900" Format="rgba16" Width="8" Height="16" Offset="0x1900"/> <Texture Name="object_tite_Tex_001A00" OutName="tex_00001A00" Format="rgba16" Width="4" Height="16" Offset="0x1A00"/> <Texture Name="object_tite_Tex_001A80" OutName="tex_00001A80" Format="rgba16" Width="8" Height="8" Offset="0x1A80"/> - <Blob Name="object_tite_Blob_001B00" Size="0x700" Offset="0x1B00"/> + <Texture Name="object_tite_Tex_001B00" OutName="tex_00001B00" Format="rgba16" Width="16" Height="32" Offset="0x1B00"/> + <Texture Name="object_tite_Tex_001F00" OutName="tex_00001F00" Format="rgba16" Width="16" Height="16" Offset="0x1F00"/> + <Texture Name="object_tite_Tex_002100" OutName="tex_00002100" Format="rgba16" Width="8" Height="16" Offset="0x2100"/> <DList Name="object_tite_DL_002FF0" Offset="0x2FF0"/> <DList Name="object_tite_DL_003160" Offset="0x3160"/> <DList Name="object_tite_DL_003290" Offset="0x3290"/> diff --git a/assets/xml/objects/object_toki_objects.xml b/assets/xml/objects/object_toki_objects.xml index 76ba2030c..3a688d732 100644 --- a/assets/xml/objects/object_toki_objects.xml +++ b/assets/xml/objects/object_toki_objects.xml @@ -16,7 +16,7 @@ <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" /> <DList Name="object_toki_objects_DL_007578" Offset="0x7578" /> - <Blob Name="object_toki_objects_Blob_0076B0" Size="0x210" Offset="0x76B0" /> + <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" /> diff --git a/assets/xml/objects/object_tr.xml b/assets/xml/objects/object_tr.xml index cb2f3391f..fbac8018c 100644 --- a/assets/xml/objects/object_tr.xml +++ b/assets/xml/objects/object_tr.xml @@ -1,12 +1,12 @@ <Root> <File Name="object_tr" Segment="6"> <Animation Name="object_tr_Anim_000BFC" Offset="0xBFC"/> - <Animation Name="object_tr_Anim_0013CC" Offset="0x13CC"/> - <Animation Name="object_tr_Anim_001CDC" Offset="0x1CDC"/> + <Animation Name="object_tr_Anim_0013CC" Offset="0x13CC"/> <!-- Looking over right shoulder --> + <Animation Name="object_tr_Anim_001CDC" Offset="0x1CDC"/> <!-- Standing, broom in left hand --> <Animation Name="object_tr_Anim_002BC4" Offset="0x2BC4"/> - <Animation Name="object_tr_Anim_0035CC" Offset="0x35CC"/> - <Animation Name="object_tr_Anim_003FC8" Offset="0x3FC8"/> - <Animation Name="object_tr_Anim_0049C8" Offset="0x49C8"/> + <Animation Name="object_tr_Anim_0035CC" Offset="0x35CC"/> <!-- Looking over left shoulder --> + <Animation Name="object_tr_Anim_003FC8" Offset="0x3FC8"/> <!-- Standing, broom over right shoulder --> + <Animation Name="object_tr_Anim_0049C8" Offset="0x49C8"/> <!-- Floating on broom --> <Animation Name="object_tr_Anim_005308" Offset="0x5308"/> <Blob Name="object_tr_Blob_0062E0" Size="0x60" Offset="0x62E0"/> <DList Name="object_tr_DL_006520" Offset="0x6520"/> diff --git a/assets/xml/objects/object_tw.xml b/assets/xml/objects/object_tw.xml index c774df493..291f4676d 100644 --- a/assets/xml/objects/object_tw.xml +++ b/assets/xml/objects/object_tw.xml @@ -136,12 +136,12 @@ <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" /> + <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" /> + <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" /> + <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" /> @@ -271,7 +271,7 @@ <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" /--> + <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" /> |