Game-Decompilation/2ship2harkinian
1
0
Fork 0
mirror of https://github.com/HarbourMasters/2ship2harkinian.git synced 2024-11-27 16:20:34 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Cleanup object syms (#546)

Browse Source 
* First

* Part2

* Save now or forever hold your peace

* Part3

* Building

* OK

* Cleanup

* Merge

* PR

* PR

* Merge

* PR

* PR

* Use oyu

* Use names

* TexturePtr
This commit is contained in:
Maide 2022-01-22 18:30:32 +00:00 committed by GitHub
parent 2a913635a4
commit 7ed396f09e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
216 changed files with 1960 additions and 4802 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
assets/xml/objects/gameplay_dangeon_keep.xml
View File

@ -50,8 +50,8 @@
<Texture Name="gameplay_dangeon_keep_Tex_0162C0" OutName="tex_0162C0" Format="i8" Width="64" Height="64" Offset="0x162C0" />
<Texture Name="gameplay_dangeon_keep_Tex_0172C0" OutName="tex_0172C0" Format="rgba16" Width="32" Height="32" Offset="0x172C0" />
<Texture Name="gameplay_dangeon_keep_Tex_017AC0" OutName="tex_017AC0" Format="ia16" Width="4" Height="4" Offset="0x17AC0" />
<DList Name="gameplay_dangeon_keep_DL_017EA0" Offset="0x17EA0" />
<DList Name="gameplay_dangeon_keep_DL_018090" Offset="0x18090" />
<DList Name="gameplay_dangeon_keep_DL_017EA0" Offset="0x17EA0" /> <!-- pot displaylist -->
<DList Name="gameplay_dangeon_keep_DL_018090" Offset="0x18090" /> <!-- pot break shard displaylist -->
<DList Name="gameplay_dangeon_keep_DL_0182A0" Offset="0x182A0" />
<DList Name="gameplay_dangeon_keep_DL_0182A8" Offset="0x182A8" />
<Texture Name="gameplay_dangeon_keep_Tex_018350" OutName="tex_018350" Format="i8" Width="64" Height="64" Offset="0x18350" />

40
assets/xml/objects/gameplay_keep.xml
View File

@ -898,7 +898,7 @@
<Animation Name="gameplay_keep_Anim_022FF0" Offset="0x22FF0" />
<Collision Name="gameplay_keep_Colheader_023100" Offset="0x23100" />
<DList Name="gameplay_keep_DL_023130" Offset="0x23130" />
<DList Name="gameplay_keep_DL_023210" Offset="0x23210" />
<DList Name="gOwlStatueWhiteFlashDL" Offset="0x23210" />
<DList Name="gameplay_keep_DL_023288" Offset="0x23288" />
<DList Name="gameplay_keep_DL_023348" Offset="0x23348" />
<DList Name="gameplay_keep_DL_0233B8" Offset="0x233B8" />
@ -996,7 +996,7 @@
<Skeleton Name="gameplay_keep_Skel_02F028" Type="Flex" LimbType="Standard" Offset="0x2F028" />
<Animation Name="gameplay_keep_Anim_02F0EC" Offset="0x2F0EC" />
<Texture Name="gameplay_keep_Tex_02F100" OutName="tex_02F100" Format="i8" Width="64" Height="64" Offset="0x2F100" />
<DList Name="gameplay_keep_DL_030100" Offset="0x30100" />
<DList Name="gameplay_keep_DL_030100" Offset="0x30100" /> <!-- Floor shockwave ring -->
<DList Name="gameplay_keep_DL_0301B0" Offset="0x301B0" />
<Texture Name="gameplay_keep_Tex_030270" OutName="tex_030270" Format="ia8" Width="32" Height="32" Offset="0x30270" />
<Texture Name="gameplay_keep_Tex_030670" OutName="tex_030670" Format="ia8" Width="32" Height="32" Offset="0x30670" />
@ -1038,15 +1038,15 @@
<Texture Name="gameplay_keep_Tex_0367B0" OutName="tex_0367B0" Format="i8" Width="64" Height="64" Offset="0x367B0" />
<DList Name="gameplay_keep_DL_0377B0" Offset="0x377B0" />
<DList Name="gameplay_keep_DL_037850" Offset="0x37850" />
<Texture Name="gameplay_keep_Tex_0378F0" OutName="tex_0378F0" Format="i8" Width="32" Height="40" Offset="0x378F0" />
<Texture Name="gameplay_keep_Tex_037DF0" OutName="tex_037DF0" Format="i8" Width="32" Height="40" Offset="0x37DF0" />
<Texture Name="gameplay_keep_Tex_0382F0" OutName="tex_0382F0" Format="i8" Width="32" Height="40" Offset="0x382F0" />
<Texture Name="gameplay_keep_Tex_0387F0" OutName="tex_0387F0" Format="i8" Width="32" Height="40" Offset="0x387F0" />
<Texture Name="gameplay_keep_Tex_038CF0" OutName="tex_038CF0" Format="i8" Width="32" Height="40" Offset="0x38CF0" />
<Texture Name="gameplay_keep_Tex_0391F0" OutName="tex_0391F0" Format="i8" Width="32" Height="40" Offset="0x391F0" />
<Texture Name="gameplay_keep_Tex_0396F0" OutName="tex_0396F0" Format="i8" Width="32" Height="40" Offset="0x396F0" />
<Texture Name="gameplay_keep_Tex_039BF0" OutName="tex_039BF0" Format="i8" Width="32" Height="40" Offset="0x39BF0" />
<DList Name="gameplay_keep_DL_03A0F0" Offset="0x3A0F0" />
<Texture Name="gExplosionSplashTex1" OutName="tex_0378F0" Format="i8" Width="32" Height="40" Offset="0x378F0" />
<Texture Name="gExplosionSplashTex2" OutName="tex_037DF0" Format="i8" Width="32" Height="40" Offset="0x37DF0" />
<Texture Name="gExplosionSplashTex3" OutName="tex_0382F0" Format="i8" Width="32" Height="40" Offset="0x382F0" />
<Texture Name="gExplosionSplashTex4" OutName="tex_0387F0" Format="i8" Width="32" Height="40" Offset="0x387F0" />
<Texture Name="gExplosionSplashTex5" OutName="tex_038CF0" Format="i8" Width="32" Height="40" Offset="0x38CF0" />
<Texture Name="gExplosionSplashTex6" OutName="tex_0391F0" Format="i8" Width="32" Height="40" Offset="0x391F0" />
<Texture Name="gExplosionSplashTex7" OutName="tex_0396F0" Format="i8" Width="32" Height="40" Offset="0x396F0" />
<Texture Name="gExplosionSplashTex8" OutName="tex_039BF0" Format="i8" Width="32" Height="40" Offset="0x39BF0" />
<DList Name="gExplosionSplashDL" Offset="0x3A0F0" />
<Texture Name="gameplay_keep_Tex_03A190" OutName="tex_03A190" Format="ia8" Width="32" Height="32" Offset="0x3A190" />
<Texture Name="gameplay_keep_Tex_03A590" OutName="tex_03A590" Format="ia8" Width="32" Height="32" Offset="0x3A590" />
<Texture Name="gameplay_keep_Tex_03A990" OutName="tex_03A990" Format="ia8" Width="32" Height="32" Offset="0x3A990" />
@ -1319,7 +1319,7 @@
<Texture Name="gameplay_keep_Tex_07A310" OutName="tex_07A310" Format="i4" Width="64" Height="31" Offset="0x7A310" />
<Texture Name="gameplay_keep_Tex_07A6F0" OutName="tex_07A6F0" Format="i4" Width="64" Height="16" Offset="0x7A6F0" />
<Texture Name="gameplay_keep_Tex_07A8F0" OutName="tex_07A8F0" Format="i4" Width="64" Height="17" Offset="0x7A8F0" />
<DList Name="gameplay_keep_DL_07AB10" Offset="0x7AB10" />
<DList Name="gameplay_keep_DL_07AB10" Offset="0x7AB10" /> <!-- sun (sparkles when small) displaylist -->
<DList Name="gameplay_keep_DL_07AB58" Offset="0x7AB58" />
<DList Name="gameplay_keep_DL_07AB70" Offset="0x7AB70" />
<DList Name="gZTargetLockOnTriangleDL" Offset="0x7AE00" />
@ -1399,14 +1399,14 @@
<Texture Name="gameplay_keep_Tex_08CEE0" OutName="tex_08CEE0" Format="ci8" Width="32" Height="32" Offset="0x8CEE0" />
<Texture Name="gameplay_keep_Tex_08D2E0" OutName="tex_08D2E0" Format="rgba16" Width="8" Height="16" Offset="0x8D2E0" />
<Texture Name="gameplay_keep_Tex_08D3E0" OutName="tex_08D3E0" Format="i8" Width="64" Height="32" Offset="0x8D3E0" />
<Texture Name="gameplay_keep_Tex_08DBE0" OutName="tex_08DBE0" Format="i8" Width="32" Height="32" Offset="0x8DBE0" />
<Texture Name="gameplay_keep_Tex_08DFE0" OutName="tex_08DFE0" Format="i8" Width="32" Height="32" Offset="0x8DFE0" />
<Texture Name="gameplay_keep_Tex_08E3E0" OutName="tex_08E3E0" Format="i8" Width="32" Height="32" Offset="0x8E3E0" />
<Texture Name="gameplay_keep_Tex_08E7E0" OutName="tex_08E7E0" Format="i8" Width="32" Height="32" Offset="0x8E7E0" />
<Texture Name="gameplay_keep_Tex_08EBE0" OutName="tex_08EBE0" Format="i8" Width="32" Height="32" Offset="0x8EBE0" />
<Texture Name="gameplay_keep_Tex_08EFE0" OutName="tex_08EFE0" Format="i8" Width="32" Height="32" Offset="0x8EFE0" />
<Texture Name="gameplay_keep_Tex_08F3E0" OutName="tex_08F3E0" Format="i8" Width="32" Height="32" Offset="0x8F3E0" />
<Texture Name="gameplay_keep_Tex_08F7E0" OutName="tex_08F7E0" Format="i8" Width="32" Height="32" Offset="0x8F7E0" />
<Texture Name="gDust1Tex" OutName="tex_08DBE0" Format="i8" Width="32" Height="32" Offset="0x8DBE0" />
<Texture Name="gDust2Tex" OutName="tex_08DFE0" Format="i8" Width="32" Height="32" Offset="0x8DFE0" />
<Texture Name="gDust3Tex" OutName="tex_08E3E0" Format="i8" Width="32" Height="32" Offset="0x8E3E0" />
<Texture Name="gDust4Tex" OutName="tex_08E7E0" Format="i8" Width="32" Height="32" Offset="0x8E7E0" />
<Texture Name="gDust5Tex" OutName="tex_08EBE0" Format="i8" Width="32" Height="32" Offset="0x8EBE0" />
<Texture Name="gDust6Tex" OutName="tex_08EFE0" Format="i8" Width="32" Height="32" Offset="0x8EFE0" />
<Texture Name="gDust7Tex" OutName="tex_08F3E0" Format="i8" Width="32" Height="32" Offset="0x8F3E0" />
<Texture Name="gDust8Tex" OutName="tex_08F7E0" Format="i8" Width="32" Height="32" Offset="0x8F7E0" />
<Texture Name="gameplay_keep_Tex_08FBE0" OutName="tex_08FBE0" Format="i8" Width="32" Height="64" Offset="0x8FBE0" />
<Texture Name="gameplay_keep_Tex_0903E0" OutName="tex_0903E0" Format="i8" Width="32" Height="64" Offset="0x903E0" />
<Texture Name="gameplay_keep_Tex_090BE0" OutName="tex_090BE0" Format="i8" Width="32" Height="64" Offset="0x90BE0" />

7
assets/xml/objects/object_ani.xml
View File

@ -42,13 +42,14 @@
<Texture Name="object_ani_Tex_0060D8" OutName="tex_0060D8" Format="i8" Width="8" Height="8" Offset="0x60D8" />
<Texture Name="object_ani_Tex_006118" OutName="tex_006118" Format="ci8" Width="16" Height="16" Offset="0x6118" />
<Texture Name="object_ani_Tex_006218" OutName="tex_006218" Format="ci8" Width="16" Height="16" Offset="0x6218" />
<Texture Name="object_ani_TLUT_006318" OutName="tlut_006318" Format="rgba16" Width="16" Height="16" Offset="0x6318" />
<!-- <Blob Name="object_ani_Blob_006518" Size="0x380" Offset="0x6518" /> -->
<Texture Name="object_ani_Tex_006318" OutName="tlut_006318" Format="rgba16" Width="192" Height="1" Offset="0x6318" />
<Texture Name="object_ani_Tex_006498" OutName="tex_006498" Format="ci8" TlutOffset="0x6318" Width="32" Height="32" Offset="0x6498" />
<Texture Name="object_ani_Tex_006898" OutName="tex_006898" Format="ci8" Width="16" Height="16" Offset="0x6898" />
<Texture Name="object_ani_Tex_006998" OutName="tex_006998" Format="ci8" Width="8" Height="8" Offset="0x6998" />
<Texture Name="object_ani_Tex_0069D8" OutName="tex_0069D8" Format="ci8" Width="8" Height="8" Offset="0x69D8" />
<Texture Name="object_ani_Tex_006A18" OutName="tex_006A18" Format="ci8" Width="16" Height="16" Offset="0x6A18" />
<!-- <Blob Name="object_ani_Blob_006B18" Size="0x800" Offset="0x6B18" /> -->
<Texture Name="object_ani_Tex_006B18" OutName="tex_006B18" Format="ci8" TlutOffset="0x6318" Width="32" Height="32" Offset="0x6B18" />
<Texture Name="object_ani_Tex_006F18" OutName="tex_006F18" Format="ci8" TlutOffset="0x6318" Width="32" Height="32" Offset="0x6F18" />
<DList Name="object_ani_DL_007B58" Offset="0x7B58" />
<Animation Name="object_ani_Anim_009220" Offset="0x9220" />
<Animation Name="object_ani_Anim_009734" Offset="0x9734" />

4
assets/xml/objects/object_bg.xml
View File

@ -74,7 +74,9 @@
<DList Name="object_bg_DL_00F350" Offset="0xF350" />
<DList Name="object_bg_DL_00F4E8" Offset="0xF4E8" />
<Texture Name="object_bg_TLUT_00F6F0" OutName="tlut_00F6F0" Format="rgba16" Width="16" Height="16" Offset="0xF6F0" />
<!-- <Blob Name="object_bg_Blob_00F8F0" Size="0xC00" Offset="0xF8F0" /> -->
<Texture Name="object_bg_Tex_00F8F0" OutName="tex_00F8F0" Format="ci8" Width="32" Height="32" Offset="0xF8F0" />
<Texture Name="object_bg_Tex_00FCF0" OutName="tex_00FCF0" Format="ci8" Width="32" Height="32" Offset="0xFCF0" />
<Texture Name="object_bg_Tex_0100F0" OutName="tex_0100F0" Format="ci8" Width="32" Height="32" Offset="0x100F0" />
<Texture Name="object_bg_Tex_0104F0" OutName="tex_0104F0" Format="ci8" Width="16" Height="32" Offset="0x104F0" />
<Texture Name="object_bg_Tex_0106F0" OutName="tex_0106F0" Format="ci8" Width="16" Height="16" Offset="0x106F0" />
<Texture Name="object_bg_Tex_0107F0" OutName="tex_0107F0" Format="ci8" Width="64" Height="32" Offset="0x107F0" />

5
assets/xml/objects/object_bji.xml
View File

@ -31,10 +31,11 @@
<Texture Name="object_bji_Tex_004870" OutName="tex_004870" Format="ci8" Width="8" Height="8" Offset="0x4870" />
<Texture Name="object_bji_Tex_0048B0" OutName="tex_0048B0" Format="ci8" Width="16" Height="16" Offset="0x48B0" />
<Texture Name="object_bji_Tex_0049B0" OutName="tex_0049B0" Format="ci8" Width="8" Height="8" Offset="0x49B0" />
<!-- <Blob Name="object_bji_Blob_0049F0" Size="0x400" Offset="0x49F0" /> -->
<Texture Name="object_bji_Tex_0049F0" OutName="tex_0049F0" Format="ci8" Width="32" Height="32" Offset="0x49F0" />
<Texture Name="object_bji_Tex_004DF0" OutName="tex_004DF0" Format="ci8" Width="8" Height="8" Offset="0x4DF0" />
<Texture Name="object_bji_Tex_004E30" OutName="tex_004E30" Format="ci8" Width="8" Height="8" Offset="0x4E30" />
<!-- <Blob Name="object_bji_Blob_004E70" Size="0x82C" Offset="0x4E70" /> -->
<Texture Name="object_bji_Tex_004E70" OutName="tex_004E70" Format="ci8" Width="32" Height="32" Offset="0x4E70" />
<Texture Name="object_bji_Tex_005270" OutName="tex_005270" Format="ci8" Width="32" Height="32" Offset="0x5270" />
<Limb Name="object_bji_Standardlimb_00569C" Type="Standard" Offset="0x569C" />
<Limb Name="object_bji_Standardlimb_0056A8" Type="Standard" Offset="0x56A8" />
<Limb Name="object_bji_Standardlimb_0056B4" Type="Standard" Offset="0x56B4" />

14
assets/xml/objects/object_boj.xml
View File

@ -3,16 +3,16 @@
<Animation Name="object_boj_Anim_00041C" Offset="0x41C" />
<Animation Name="object_boj_Anim_0004D0" Offset="0x4D0" />
<Animation Name="object_boj_Anim_00071C" Offset="0x71C" />
<Animation Name="object_boj_Anim_0008C0" Offset="0x8C0" />
<Animation Name="object_boj_Anim_000AC4" Offset="0xAC4" />
<Animation Name="object_boj_Anim_0008C0" Offset="0x8C0" /> <!-- object_ginko_floorsmacking_anim -->
<Animation Name="object_boj_Anim_000AC4" Offset="0xAC4" /> <!-- object_ginko_advertising_anim -->
<Animation Name="object_boj_Anim_001494" Offset="0x1494" />
<Animation Name="object_boj_Anim_001908" Offset="0x1908" />
<Animation Name="object_boj_Anim_002734" Offset="0x2734" />
<Animation Name="object_boj_Anim_0033B0" Offset="0x33B0" />
<Animation Name="object_boj_Anim_004078" Offset="0x4078" />
<Animation Name="object_boj_Anim_0043F0" Offset="0x43F0" />
<Animation Name="object_boj_Anim_004A7C" Offset="0x4A7C" />
<Animation Name="object_boj_Anim_004F40" Offset="0x4F40" />
<Animation Name="object_boj_Anim_0043F0" Offset="0x43F0" /> <!-- object_ginko_sitting_anim -->
<Animation Name="object_boj_Anim_004A7C" Offset="0x4A7C" /> <!-- object_ginko_amazed_anim -->
<Animation Name="object_boj_Anim_004F40" Offset="0x4F40" /> <!-- object_ginko_stamp_reach_anim -->
<Animation Name="object_boj_Anim_005CE4" Offset="0x5CE4" />
<Animation Name="object_boj_Anim_005D9C" Offset="0x5D9C" />
<Texture Name="object_boj_TLUT_005DB0" OutName="tlut_005DB0" Format="rgba16" Width="16" Height="16" Offset="0x5DB0" />
@ -49,7 +49,7 @@
<Texture Name="object_boj_Tex_009E00" OutName="tex_009E00" Format="ci8" Width="16" Height="16" Offset="0x9E00" />
<Texture Name="object_boj_Tex_009F00" OutName="tex_009F00" Format="ci8" Width="16" Height="16" Offset="0x9F00" />
<DList Name="object_boj_DL_00AF90" Offset="0xAF90" />
<DList Name="object_boj_DL_00B1D8" Offset="0xB1D8" />
<DList Name="object_boj_DL_00B1D8" Offset="0xB1D8" /> <!-- object_ginko_limb15_dlist -->
<DList Name="object_boj_DL_00B3E8" Offset="0xB3E8" />
<DList Name="object_boj_DL_00B660" Offset="0xB660" />
<DList Name="object_boj_DL_00B878" Offset="0xB878" />
@ -73,7 +73,7 @@
<Limb Name="object_boj_Standardlimb_00C1E0" Type="Standard" Offset="0xC1E0" />
<Limb Name="object_boj_Standardlimb_00C1EC" Type="Standard" Offset="0xC1EC" />
<Limb Name="object_boj_Standardlimb_00C1F8" Type="Standard" Offset="0xC1F8" />
<Skeleton Name="object_boj_Skel_00C240" Type="Flex" LimbType="Standard" Offset="0xC240" />
<Skeleton Name="object_boj_Skel_00C240" Type="Flex" LimbType="Standard" Offset="0xC240" /> <!-- object_ginko_skeleton -->
<Animation Name="object_boj_Anim_00DED8" Offset="0xDED8" />
<Animation Name="object_boj_Anim_00F920" Offset="0xF920" />
<Animation Name="object_boj_Anim_00FC1C" Offset="0xFC1C" />

6
assets/xml/objects/object_boss02.xml
View File

@ -8,7 +8,7 @@
<Texture Name="object_boss02_TLUT_000340" OutName="tlut_000340" Format="rgba16" Width="4" Height="4" Offset="0x340" />
<Texture Name="object_boss02_TLUT_000360" OutName="tlut_000360" Format="rgba16" Width="4" Height="4" Offset="0x360" />
<Texture Name="object_boss02_TLUT_000380" OutName="tlut_000380" Format="rgba16" Width="4" Height="4" Offset="0x380" />
<!-- <Blob Name="object_boss02_Blob_0003A0" Size="0x800" Offset="0x3A0" /> -->
<Texture Name="object_boss02_Tex_0003A0" OutName="tex_0003A0" Format="ci4" Width="64" Height="64" Offset="0x3A0" />
<Texture Name="object_boss02_Tex_000BA0" OutName="tex_000BA0" Format="rgba16" Width="32" Height="32" Offset="0xBA0" />
<Texture Name="object_boss02_Tex_0013A0" OutName="tex_0013A0" Format="ci4" Width="64" Height="64" Offset="0x13A0" />
<Texture Name="object_boss02_Tex_001BA0" OutName="tex_001BA0" Format="ci4" Width="64" Height="64" Offset="0x1BA0" />
@ -17,7 +17,7 @@
<Texture Name="object_boss02_Tex_002FA0" OutName="tex_002FA0" Format="ci4" Width="64" Height="64" Offset="0x2FA0" />
<Texture Name="object_boss02_Tex_0037A0" OutName="tex_0037A0" Format="rgba16" Width="16" Height="16" Offset="0x37A0" />
<Texture Name="object_boss02_Tex_0039A0" OutName="tex_0039A0" Format="rgba16" Width="32" Height="32" Offset="0x39A0" />
<!-- <Blob Name="object_boss02_Blob_0041A0" Size="0x810" Offset="0x41A0" /> -->
<Texture Name="object_boss02_Tex_0041A0" OutName="tex_0041A0" Format="ci4" Width="64" Height="64" Offset="0x41A0" />
<Animation Name="object_boss02_Anim_004A1C" Offset="0x4A1C" />
<DList Name="object_boss02_DL_006160" Offset="0x6160" />
<DList Name="object_boss02_DL_006820" Offset="0x6820" />
@ -33,7 +33,7 @@
<DList Name="object_boss02_DL_007D18" Offset="0x7D18" />
<Texture Name="object_boss02_TLUT_007E30" OutName="tlut_007E30" Format="rgba16" Width="4" Height="4" Offset="0x7E30" />
<Texture Name="object_boss02_Tex_007E50" OutName="tex_007E50" Format="ci4" Width="64" Height="64" Offset="0x7E50" />
<!-- <Blob Name="object_boss02_Blob_008650" Size="0x1400" Offset="0x8650" /> -->
<Texture Name="object_boss02_Tex_008650" OutName="tex_008650" Format="ia8" Width="128" Height="40" Offset="0x8650" />
<Limb Name="object_boss02_Standardlimb_009A50" Type="Standard" Offset="0x9A50" />
<Limb Name="object_boss02_Standardlimb_009A5C" Type="Standard" Offset="0x9A5C" />
<Limb Name="object_boss02_Standardlimb_009A68" Type="Standard" Offset="0x9A68" />

2
assets/xml/objects/object_boss_hakugin.xml
View File

@ -33,7 +33,7 @@
<DList Name="object_boss_hakugin_DL_010500" Offset="0x10500" />
<Texture Name="object_boss_hakugin_Tex_010560" OutName="tex_010560" Format="rgba16" Width="36" Height="36" Offset="0x10560" />
<DList Name="object_boss_hakugin_DL_011100" Offset="0x11100" />
<DList Name="object_boss_hakugin_DL_011178" Offset="0x11178" />
<DList Name="object_boss_hakugin_DL_011178" Offset="0x11178" /> <!-- Stalactite -->
<DList Name="object_boss_hakugin_DL_011208" Offset="0x11208" />
<DList Name="object_boss_hakugin_DL_011278" Offset="0x11278" />
<Texture Name="object_boss_hakugin_Tex_011290" OutName="tex_011290" Format="i4" Width="32" Height="96" Offset="0x11290" />

12
assets/xml/objects/object_cow.xml
View File

@ -1,6 +1,6 @@
<Root>
<File Name="object_cow" Segment="6">
<Animation Name="object_cow_Anim_0001CC" Offset="0x1CC" />
<Animation Name="gCowBodyChewAnim" Offset="0x1CC" />
<DList Name="object_cow_DL_001A80" Offset="0x1A80" />
<DList Name="object_cow_DL_001FE8" Offset="0x1FE8" />
<DList Name="object_cow_DL_002368" Offset="0x2368" />
@ -19,9 +19,9 @@
<Limb Name="object_cow_Standardlimb_003FD8" Type="Standard" Offset="0x3FD8" />
<Limb Name="object_cow_Standardlimb_003FE4" Type="Standard" Offset="0x3FE4" />
<Limb Name="object_cow_Standardlimb_003FF0" Type="Standard" Offset="0x3FF0" />
<Skeleton Name="object_cow_Skel_004010" Type="Flex" LimbType="Standard" Offset="0x4010" />
<Animation Name="object_cow_Anim_004264" Offset="0x4264" />
<Animation Name="object_cow_Anim_004348" Offset="0x4348" />
<Skeleton Name="gCowBodySkel" Type="Flex" LimbType="Standard" Offset="0x4010" />
<Animation Name="gCowBodyMoveHeadAnim" Offset="0x4264" />
<Animation Name="gCowTailIdleAnim" Offset="0x4348" />
<DList Name="object_cow_DL_0046F0" Offset="0x46F0" />
<DList Name="object_cow_DL_0047D0" Offset="0x47D0" />
<DList Name="object_cow_DL_0048D0" Offset="0x48D0" />
@ -32,7 +32,7 @@
<Limb Name="object_cow_Standardlimb_004BF8" Type="Standard" Offset="0x4BF8" />
<Limb Name="object_cow_Standardlimb_004C04" Type="Standard" Offset="0x4C04" />
<Limb Name="object_cow_Standardlimb_004C10" Type="Standard" Offset="0x4C10" />
<Skeleton Name="object_cow_Skel_004C30" Type="Flex" LimbType="Standard" Offset="0x4C30" />
<Animation Name="object_cow_Anim_004E98" Offset="0x4E98" />
<Skeleton Name="gCowTailSkel" Type="Flex" LimbType="Standard" Offset="0x4C30" />
<Animation Name="gCowTailSwishAnim" Offset="0x4E98" />
</File>
</Root>

4
assets/xml/objects/object_dnk.xml
View File

@ -9,7 +9,9 @@
<Texture Name="object_dnk_Tex_001380" OutName="tex_001380" Format="rgba16" Width="16" Height="16" Offset="0x1380" />
<Texture Name="object_dnk_Tex_001580" OutName="tex_001580" Format="rgba16" Width="8" Height="8" Offset="0x1580" />
<Texture Name="object_dnk_Tex_001600" OutName="tex_001600" Format="rgba16" Width="8" Height="8" Offset="0x1600" />
<!-- <Blob Name="object_dnk_Blob_001680" Size="0x180" Offset="0x1680" /> -->
<Texture Name="object_dnk_Tex_001680" OutName="tex_001680" Format="rgba16" Width="8" Height="8" Offset="0x1680" />
<Texture Name="object_dnk_Tex_001700" OutName="tex_001700" Format="rgba16" Width="8" Height="8" Offset="0x1700" />
<Texture Name="object_dnk_Tex_001780" OutName="tex_001780" Format="rgba16" Width="8" Height="8" Offset="0x1780" />
<DList Name="object_dnk_DL_001DD0" Offset="0x1DD0" />
<DList Name="object_dnk_DL_001E58" Offset="0x1E58" />
<DList Name="object_dnk_DL_001E68" Offset="0x1E68" />

5
assets/xml/objects/object_dnp.xml
View File

@ -52,7 +52,10 @@
<Texture Name="object_dnp_Tex_00F5D0" OutName="tex_00F5D0" Format="rgba16" Width="16" Height="16" Offset="0xF5D0" />
<Texture Name="object_dnp_Tex_00F7D0" OutName="tex_00F7D0" Format="rgba16" Width="32" Height="32" Offset="0xF7D0" />
<Texture Name="object_dnp_Tex_00FFD0" OutName="tex_00FFD0" Format="rgba16" Width="16" Height="32" Offset="0xFFD0" />
<!-- <Blob Name="object_dnp_Blob_0103D0" Size="0x800" Offset="0x103D0" /> -->
<Texture Name="object_dnp_Tex_0103D0" OutName="tex_0103D0" Format="rgba16" Width="16" Height="16" Offset="0x103D0" />
<Texture Name="object_dnp_Tex_0105D0" OutName="tex_0105D0" Format="rgba16" Width="16" Height="16" Offset="0x105D0" />
<Texture Name="object_dnp_Tex_0107D0" OutName="tex_0107D0" Format="rgba16" Width="16" Height="16" Offset="0x107D0" />
<Texture Name="object_dnp_Tex_0109D0" OutName="tex_0109D0" Format="rgba16" Width="16" Height="16" Offset="0x109D0" />
<Limb Name="object_dnp_Standardlimb_010BD0" Type="Standard" Offset="0x10BD0" />
<Limb Name="object_dnp_Standardlimb_010BDC" Type="Standard" Offset="0x10BDC" />
<Limb Name="object_dnp_Standardlimb_010BE8" Type="Standard" Offset="0x10BE8" />

4
assets/xml/objects/object_dns.xml
View File

@ -21,7 +21,9 @@
<Texture Name="object_dns_Tex_001E68" OutName="tex_001E68" Format="rgba16" Width="32" Height="32" Offset="0x1E68" />
<Texture Name="object_dns_Tex_002668" OutName="tex_002668" Format="rgba16" Width="16" Height="16" Offset="0x2668" />
<Texture Name="object_dns_Tex_002868" OutName="tex_002868" Format="rgba16" Width="8" Height="8" Offset="0x2868" />
<!-- <Blob Name="object_dns_Blob_0028E8" Size="0x180" Offset="0x28E8" /> -->
<Texture Name="object_dns_Tex_0028E8" OutName="tex_0028E8" Format="rgba16" Width="8" Height="8" Offset="0x28E8" />
<Texture Name="object_dns_Tex_002968" OutName="tex_002968" Format="rgba16" Width="8" Height="8" Offset="0x2968" />
<Texture Name="object_dns_Tex_0029E8" OutName="tex_0029E8" Format="rgba16" Width="8" Height="8" Offset="0x29E8" />
<DList Name="object_dns_DL_002C48" Offset="0x2C48" />
<Limb Name="object_dns_Standardlimb_002D18" Type="Standard" Offset="0x2D18" />
<Limb Name="object_dns_Standardlimb_002D24" Type="Standard" Offset="0x2D24" />

3
assets/xml/objects/object_dy_obj.xml
View File

@ -15,6 +15,9 @@
<Texture Name="object_dy_obj_Tex_00D240" OutName="tex_00D240" Format="i4" Width="32" Height="32" Offset="0xD240" />
<Texture Name="object_dy_obj_Tex_00D440" OutName="tex_00D440" Format="i8" Width="16" Height="16" Offset="0xD440" />
<Texture Name="object_dy_obj_Tex_00D540" OutName="tex_00D540" Format="i8" Width="32" Height="64" Offset="0xD540" />
<Array Name="object_dy_obj_Vtx_00DD40" Count="27" Offset="0xDD40">
<Vtx/>
</Array>
<DList Name="object_dy_obj_DL_00DEF0" Offset="0xDEF0" />
<DList Name="object_dy_obj_DL_013810" Offset="0x13810" />
<DList Name="object_dy_obj_DL_013928" Offset="0x13928" />

12
assets/xml/objects/object_f52_obj.xml
View File

@ -1,11 +1,11 @@
<Root>
<File Name="object_f52_obj" Segment="6">
<DList Name="object_f52_obj_DL_000570" Offset="0x570" />
<DList Name="object_f52_obj_DL_000698" Offset="0x698" />
<DList Name="object_f52_obj_DL_0007A8" Offset="0x7A8" />
<DList Name="object_f52_obj_DL_000840" Offset="0x840" />
<DList Name="object_f52_obj_DL_0008D0" Offset="0x8D0" />
<DList Name="object_f52_obj_DL_000960" Offset="0x960" />
<DList Name="object_f52_obj_DL_000570" Offset="0x570" /> <!-- Bell post -->
<DList Name="object_f52_obj_DL_000698" Offset="0x698" /> <!-- Bell -->
<DList Name="object_f52_obj_DL_0007A8" Offset="0x7A8" /> <!-- Bell Base -->
<DList Name="object_f52_obj_DL_000840" Offset="0x840" /> <!-- Bell Shadow -->
<DList Name="object_f52_obj_DL_0008D0" Offset="0x8D0" /> <!-- Bell Hook -->
<DList Name="object_f52_obj_DL_000960" Offset="0x960" /> <!-- Bell Designs -->
<Texture Name="object_f52_obj_Tex_000A10" OutName="tex_000A10" Format="rgba16" Width="32" Height="16" Offset="0xA10" />
<Texture Name="object_f52_obj_Tex_000E10" OutName="tex_000E10" Format="ia16" Width="16" Height="16" Offset="0xE10" />
<Texture Name="object_f52_obj_Tex_001010" OutName="tex_001010" Format="rgba16" Width="32" Height="16" Offset="0x1010" />

3
assets/xml/objects/object_fr.xml
View File

@ -11,7 +11,8 @@
<Texture Name="object_fr_Tex_004BA0" OutName="tex_004BA0" Format="rgba16" Width="16" Height="16" Offset="0x4BA0" />
<Texture Name="object_fr_Tex_004DA0" OutName="tex_004DA0" Format="rgba16" Width="32" Height="32" Offset="0x4DA0" />
<Texture Name="object_fr_Tex_0055A0" OutName="tex_0055A0" Format="i8" Width="32" Height="32" Offset="0x55A0" />
<!-- <Blob Name="object_fr_Blob_0059A0" Size="0x400" Offset="0x59A0" /> -->
<Texture Name="object_fr_Tex_0059A0" OutName="tex_0059A0" Format="rgba16" Width="16" Height="16" Offset="0x59A0" />
<Texture Name="object_fr_Tex_005BA0" OutName="tex_005BA0" Format="rgba16" Width="16" Height="16" Offset="0x5BA0" />
<Texture Name="object_fr_Tex_005DA0" OutName="tex_005DA0" Format="ia16" Width="32" Height="32" Offset="0x5DA0" />
<Texture Name="object_fr_Tex_0065A0" OutName="tex_0065A0" Format="ia16" Width="32" Height="32" Offset="0x65A0" />
<DList Name="object_fr_DL_008EC0" Offset="0x8EC0" />

9
assets/xml/objects/object_fsn.xml
View File

@ -31,13 +31,15 @@
<Texture Name="object_fsn_Tex_0056C0" OutName="tex_0056C0" Format="rgba16" Width="16" Height="16" Offset="0x56C0" />
<Texture Name="object_fsn_Tex_0058C0" OutName="tex_0058C0" Format="rgba16" Width="16" Height="16" Offset="0x58C0" />
<Texture Name="object_fsn_Tex_005AC0" OutName="tex_005AC0" Format="ci8" Width="16" Height="16" Offset="0x5AC0" />
<!-- <Blob Name="object_fsn_Blob_005BC0" Size="0x400" Offset="0x5BC0" /> -->
<Texture Name="object_fsn_Tex_005BC0" OutName="tex_005BC0" Format="ci8" Width="32" Height="32" Offset="0x5BC0" />
<Texture Name="object_fsn_Tex_005FC0" OutName="tex_005FC0" Format="ci8" Width="8" Height="8" Offset="0x5FC0" />
<Texture Name="object_fsn_Tex_006000" OutName="tex_006000" Format="ci8" Width="16" Height="16" Offset="0x6000" />
<Texture Name="object_fsn_Tex_006100" OutName="tex_006100" Format="ci8" Width="32" Height="32" Offset="0x6100" />
<Texture Name="object_fsn_Tex_006500" OutName="tex_006500" Format="ci8" Width="8" Height="8" Offset="0x6500" />
<Texture Name="object_fsn_Tex_006540" OutName="tex_006540" Format="rgba16" Width="32" Height="32" Offset="0x6540" />
<!-- <Blob Name="object_fsn_Blob_006D40" Size="0x4C98" Offset="0x6D40" /> -->
<Texture Name="object_fsn_Tex_006D40" OutName="tex_006D40" Format="ci8" Width="32" Height="32" Offset="0x6D40" />
<Texture Name="object_fsn_Tex_007140" OutName="tex_007140" Format="ci8" Width="32" Height="32" Offset="0x7140" />
<!-- <Blob Name="object_fsn_Blob_007540" Size="0x4498" Offset="0x7540" /> -->
<Animation Name="object_fsn_Anim_00B9D8" Offset="0xB9D8" />
<Animation Name="object_fsn_Anim_00C26C" Offset="0xC26C" />
<Animation Name="object_fsn_Anim_00C58C" Offset="0xC58C" />
@ -53,7 +55,8 @@
<!-- <Blob Name="object_fsn_Blob_00FB30" Size="0x3040" Offset="0xFB30" /> -->
<Animation Name="object_fsn_Anim_012C34" Offset="0x12C34" />
<Animation Name="object_fsn_Anim_0131FC" Offset="0x131FC" />
<!-- <Blob Name="object_fsn_Blob_01320C" Size="0x124" Offset="0x1320C" /> -->
<LimbTable Name="object_fsn_LimbTable_0132DC" LimbType="Standard" Count="17" Offset="0x132DC"/> <!-- object_fsn_Skel_013320 specifies 18 limbs but only 17 exist, ZAPD breaks if this is not specified manually -->
<Skeleton Name="object_fsn_Skel_013320" Type="Flex" LimbType="Standard" Offset="0x13320" />
<Animation Name="object_fsn_Anim_0138B0" Offset="0x138B0" />
<Animation Name="object_fsn_Anim_01430C" Offset="0x1430C" />
</File>

5
assets/xml/objects/object_fu.xml
View File

@ -27,7 +27,10 @@
<Texture Name="object_fu_Tex_0056E0" OutName="tex_0056E0" Format="ci8" Width="32" Height="32" Offset="0x56E0" />
<Texture Name="object_fu_Tex_005AE0" OutName="tex_005AE0" Format="ci8" Width="32" Height="32" Offset="0x5AE0" />
<Texture Name="object_fu_Tex_005EE0" OutName="tex_005EE0" Format="ci8" Width="8" Height="8" Offset="0x5EE0" />
<!-- <Blob Name="object_fu_Blob_005F20" Size="0xC00" Offset="0x5F20" /> -->
<Texture Name="object_fu_Tex_005F20" OutName="tex_005F20" Format="ci8" Width="32" Height="32" Offset="0x5F20" />
<Texture Name="object_fu_Tex_006320" OutName="tex_006320" Format="ci8" Width="32" Height="32" Offset="0x6320" />
<Texture Name="object_fu_Tex_006720" OutName="tex_006720" Format="ci8" Width="32" Height="16" Offset="0x6720" />
<Texture Name="object_fu_Tex_006920" OutName="tex_006920" Format="ci8" Width="32" Height="16" Offset="0x6920" />
<Texture Name="object_fu_Tex_006B20" OutName="tex_006B20" Format="ci8" Width="8" Height="16" Offset="0x6B20" />
<Limb Name="object_fu_Standardlimb_006BA0" Type="Standard" Offset="0x6BA0" />
<Limb Name="object_fu_Standardlimb_006BAC" Type="Standard" Offset="0x6BAC" />

10
assets/xml/objects/object_hanareyama_obj.xml
View File

@ -1,7 +1,6 @@
<Root>
<File Name="object_hanareyama_obj" Segment="6">
<!-- <Blob Name="object_hanareyama_obj_Blob_000000" Size="0x8" Offset="0x0" /> -->
<DList Name="object_hanareyama_obj_DL_000008" Offset="0x8" />
<DList Name="object_hanareyama_obj_DL_000000" Offset="0x0" />
<DList Name="object_hanareyama_obj_DL_000020" Offset="0x20" />
<DList Name="object_hanareyama_obj_DL_000D70" Offset="0xD70" />
<DList Name="object_hanareyama_obj_DL_000E30" Offset="0xE30" />
@ -59,7 +58,12 @@
<DList Name="object_hanareyama_obj_DL_003578" Offset="0x3578" />
<Texture Name="object_hanareyama_obj_Tex_003638" OutName="tex_003638" Format="i4" Width="64" Height="64" Offset="0x3638" />
<Texture Name="object_hanareyama_obj_Tex_003E38" OutName="tex_003E38" Format="rgba16" Width="32" Height="32" Offset="0x3E38" />
<!-- <Blob Name="object_hanareyama_obj_Blob_004638" Size="0x228" Offset="0x4638" /> -->
<Array Name="object_hanareyama_obj_DLArray_004638" Count="54" Offset="0x4638">
<Pointer Type="Gfx"/>
</Array>
<Array Name="object_hanareyama_obj_Vec_004710" Count="54" Offset="0x4710">
<Vector Type="s16" Dimensions="3" />
</Array>
<Collision Name="object_hanareyama_obj_Colheader_004D8C" Offset="0x4D8C" />
</File>
</Root>

9
assets/xml/objects/object_in.xml
View File

@ -6,8 +6,8 @@
<TextureAnimation Name="object_in_Matanimheader_001C30" Offset="0x1C30" />
<Animation Name="object_in_Anim_001D10" Offset="0x1D10" />
<!-- <Blob Name="object_in_Blob_001D20" Size="0x1738" Offset="0x1D20" /> -->
<!-- <Texture Name="object_in_TLUT_003458" OutName="tlut_003458" Format="rgba16" Width="16" Height="16" Offset="0x3458" /> -->
<!-- <Blob Name="object_in_Blob_003658" Size="0x388" Offset="0x3658" /> -->
<Texture Name="object_in_Tex_003520" OutName="tex_003520" Format="ci8" Width="8" Height="8" Offset="0x3520" />
<Texture Name="object_in_Tex_0035E0" OutName="tex_0035E0" Format="ci8" Width="32" Height="32" Offset="0x35E0" />
<Texture Name="object_in_Tex_0039E0" OutName="tex_0039E0" Format="rgba16" Width="16" Height="16" Offset="0x39E0" />
<Texture Name="object_in_Tex_003BE0" OutName="tex_003BE0" Format="ci8" Width="16" Height="16" Offset="0x3BE0" />
<Texture Name="object_in_Tex_003CE0" OutName="tex_003CE0" Format="ci8" Width="16" Height="16" Offset="0x3CE0" />
@ -17,9 +17,10 @@
<Texture Name="object_in_Tex_004120" OutName="tex_004120" Format="rgba16" Width="8" Height="16" Offset="0x4120" />
<Texture Name="object_in_Tex_004220" OutName="tex_004220" Format="ci8" Width="8" Height="16" Offset="0x4220" />
<Texture Name="object_in_Tex_0042A0" OutName="tex_0042A0" Format="ci8" Width="16" Height="16" Offset="0x42A0" />
<!-- <Blob Name="object_in_Blob_0043A0" Size="0x440" Offset="0x43A0" /> -->
<Texture Name="object_in_Tex_0043E0" OutName="tex_0043E0" Format="ci8" Width="32" Height="32" Offset="0x43E0" />
<Texture Name="object_in_Tex_0047E0" OutName="tex_0047E0" Format="ci8" Width="8" Height="8" Offset="0x47E0" />
<!-- <Blob Name="object_in_Blob_004820" Size="0x800" Offset="0x4820" /> -->
<Texture Name="object_in_Tex_004820" OutName="tex_004820" Format="ci8" Width="32" Height="32" Offset="0x4820" />
<Texture Name="object_in_Tex_004C20" OutName="tex_004C20" Format="ci8" Width="32" Height="32" Offset="0x4C20" />
<DList Name="object_in_DL_006780" Offset="0x6780" />
<DList Name="object_in_DL_0073E8" Offset="0x73E8" />
<DList Name="object_in_DL_007510" Offset="0x7510" />

10
assets/xml/objects/object_in2.xml
View File

@ -21,15 +21,15 @@
<DList Name="object_in2_DL_004AF8" Offset="0x4AF8" />
<Texture Name="object_in2_Tex_004C28" OutName="tex_004C28" Format="rgba16" Width="16" Height="16" Offset="0x4C28" />
<Texture Name="object_in2_TLUT_004E28" OutName="tlut_004E28" Format="rgba16" Width="16" Height="16" Offset="0x4E28" />
<!-- <Blob Name="object_in2_Blob_005028" Size="0x400" Offset="0x5028" /> -->
<Texture Name="object_in2_Tex_005028" OutName="tex_005028" Format="ci8" Width="32" Height="32" Offset="0x5028" />
<Texture Name="object_in2_Tex_005428" OutName="tex_005428" Format="ci8" Width="8" Height="8" Offset="0x5428" />
<Texture Name="object_in2_Tex_005468" OutName="tex_005468" Format="ci8" Width="8" Height="8" Offset="0x5468" />
<!-- <Blob Name="object_in2_Blob_0054A8" Size="0x400" Offset="0x54A8" /> -->
<Texture Name="object_in2_Tex_0054A8" OutName="tex_0054A8" Format="ci8" Width="32" Height="32" Offset="0x54A8" />
<Texture Name="object_in2_Tex_0058A8" OutName="tex_0058A8" Format="rgba16" Width="16" Height="16" Offset="0x58A8" />
<Texture Name="object_in2_Tex_005AA8" OutName="tex_005AA8" Format="ci8" Width="16" Height="16" Offset="0x5AA8" />
<Texture Name="object_in2_Tex_005BA8" OutName="tex_005BA8" Format="ci8" Width="16" Height="16" Offset="0x5BA8" />
<Texture Name="object_in2_Tex_005CA8" OutName="tex_005CA8" Format="i8" Width="8" Height="8" Offset="0x5CA8" />
<!-- <Blob Name="object_in2_Blob_005CE8" Size="0x400" Offset="0x5CE8" /> -->
<Texture Name="object_in2_Tex_005CE8" OutName="tex_005CE8" Format="ci8" Width="32" Height="32" Offset="0x5CE8" />
<Texture Name="object_in2_Tex_0060E8" OutName="tex_0060E8" Format="ci8" Width="16" Height="32" Offset="0x60E8" />
<Texture Name="object_in2_Tex_0062E8" OutName="tex_0062E8" Format="ci8" Width="16" Height="16" Offset="0x62E8" />
<Texture Name="object_in2_Tex_0063E8" OutName="tex_0063E8" Format="ci8" Width="8" Height="8" Offset="0x63E8" />
@ -37,9 +37,9 @@
<Texture Name="object_in2_Tex_006528" OutName="tex_006528" Format="ci8" Width="16" Height="16" Offset="0x6528" />
<Texture Name="object_in2_Tex_006628" OutName="tex_006628" Format="i8" Width="16" Height="16" Offset="0x6628" />
<Texture Name="object_in2_Tex_006728" OutName="tex_006728" Format="i8" Width="16" Height="16" Offset="0x6728" />
<!-- <Blob Name="object_in2_Blob_006828" Size="0x400" Offset="0x6828" /> -->
<Texture Name="object_in2_Tex_006828" OutName="tex_006828" Format="ci8" Width="32" Height="32" Offset="0x6828" />
<Texture Name="object_in2_Tex_006C28" OutName="tex_006C28" Format="ci8" Width="8" Height="8" Offset="0x6C28" />
<!-- <Blob Name="object_in2_Blob_006C68" Size="0x400" Offset="0x6C68" /> -->
<Texture Name="object_in2_Tex_006C68" OutName="tex_006C68" Format="ci8" Width="32" Height="32" Offset="0x6C68" />
<Texture Name="object_in2_Tex_007068" OutName="tex_007068" Format="ci8" Width="8" Height="8" Offset="0x7068" />
<DList Name="object_in2_DL_007198" Offset="0x7198" />
<DList Name="object_in2_DL_0071A0" Offset="0x71A0" />

4
assets/xml/objects/object_jg.xml
View File

@ -94,7 +94,7 @@
<Limb Name="object_jg_Standardlimb_01AF50" Type="Standard" Offset="0x1AF50" />
<Limb Name="object_jg_Standardlimb_01AF5C" Type="Standard" Offset="0x1AF5C" />
<Skeleton Name="object_jg_Skel_01AFF0" Type="Flex" LimbType="Standard" Offset="0x1AFF0" />
<Animation Name="object_jg_Anim_01B1E8" Offset="0x1B1E8" />
<!-- <Blob Name="object_jg_Blob_01B1F8" Size="0x28" Offset="0x1B1F8" /> -->
<Animation Name="gGoronElderDrumAnim" Offset="0x1B1E8" />
<Skeleton Name="gGoronElderDrumSkel" Type="Normal" LimbType="Standard" Offset="0x1B210" />
</File>
</Root>

4
assets/xml/objects/object_lightswitch.xml
View File

@ -3,7 +3,9 @@
<DList Name="object_lightswitch_DL_000260" Offset="0x260" />
<DList Name="object_lightswitch_DL_000398" Offset="0x398" />
<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_000420" Format="rgba16" Width="32" Height="32" Offset="0x420" />
<Texture Name="object_lightswitch_Tex_000C20" OutName="tex_000C20" Format="rgba16" Width="32" Height="32" Offset="0xC20" />
<Texture Name="object_lightswitch_Tex_001420" OutName="tex_001420" Format="rgba16" Width="32" Height="32" Offset="0x1420" />
<Texture Name="object_lightswitch_Tex_001C20" OutName="tex_001C20" Format="rgba16" Width="32" Height="32" Offset="0x1C20" />
</File>
</Root>

16
assets/xml/objects/object_ma1.xml
View File

@ -1,13 +1,13 @@
<Root>
<File Name="object_ma1" Segment="6">
<DList Name="object_ma1_DL_0003B0" Offset="0x3B0" />
<DList Name="object_ma1_DL_0003B0" Offset="0x3B0" /> <!-- Bow -->
<Texture Name="object_ma1_TLUT_0005E0" OutName="tlut_0005E0" Format="rgba16" Width="16" Height="16" Offset="0x5E0" />
<Texture Name="object_ma1_Tex_0007E0" OutName="tex_0007E0" Format="ci8" Width="16" Height="16" Offset="0x7E0" />
<Texture Name="object_ma1_Tex_0008E0" OutName="tex_0008E0" Format="ci8" Width="8" Height="8" Offset="0x8E0" />
<DList Name="object_ma1_DL_000A20" Offset="0xA20" />
<DList Name="object_ma1_DL_000A20" Offset="0xA20" /> <!-- Box -->
<Texture Name="object_ma1_Tex_000AD0" OutName="tex_000AD0" Format="rgba16" Width="32" Height="64" Offset="0xAD0" />
<Animation Name="object_ma1_Anim_002A8C" Offset="0x2A8C" />
<DList Name="object_ma1_DL_0043A0" Offset="0x43A0" />
<DList Name="object_ma1_DL_0043A0" Offset="0x43A0" /> <!-- Sleeping -->
<Texture Name="object_ma1_TLUT_004CF8" OutName="tlut_004CF8" Format="rgba16" Width="16" Height="16" Offset="0x4CF8" />
<Texture Name="object_ma1_Tex_004EF8" OutName="tex_004EF8" Format="ci8" Width="16" Height="16" Offset="0x4EF8" />
<Texture Name="object_ma1_Tex_004FF8" OutName="tex_004FF8" Format="ci8" Width="8" Height="8" Offset="0x4FF8" />
@ -54,7 +54,15 @@
<Texture Name="object_ma1_Tex_00FA48" OutName="tex_00FA48" Format="ci8" Width="16" Height="16" Offset="0xFA48" />
<Texture Name="object_ma1_Tex_00FB48" OutName="tex_00FB48" Format="ci8" Width="64" Height="16" Offset="0xFB48" />
<Texture Name="object_ma1_Tex_00FF48" OutName="tex_00FF48" Format="ci8" Width="8" Height="16" Offset="0xFF48" />
<!-- <Blob Name="object_ma1_Blob_00FFC8" Size="0x3800" Offset="0xFFC8" /> -->
<Texture Name="object_ma1_Tex_00FFC8" OutName="tex_00FFC8" Format="rgba16" Width="32" Height="32" Offset="0xFFC8" />
<Texture Name="object_ma1_Tex_0107C8" OutName="tex_0107C8" Format="rgba16" Width="32" Height="32" Offset="0x107C8" />
<Texture Name="object_ma1_Tex_010FC8" OutName="tex_010FC8" Format="rgba16" Width="32" Height="32" Offset="0x10FC8" />
<Texture Name="object_ma1_Tex_0117C8" OutName="tex_0117C8" Format="rgba16" Width="32" Height="32" Offset="0x117C8" />
<Texture Name="object_ma1_Tex_011FC8" OutName="tex_011FC8" Format="rgba16" Width="32" Height="32" Offset="0x11FC8" />
<Texture Name="object_ma1_Tex_0127C8" OutName="tex_0127C8" Format="rgba16" Width="32" Height="16" Offset="0x127C8" />
<Texture Name="object_ma1_Tex_012BC8" OutName="tex_012BC8" Format="rgba16" Width="32" Height="16" Offset="0x12BC8" />
<Texture Name="object_ma1_Tex_012FC8" OutName="tex_012FC8" Format="rgba16" Width="32" Height="16" Offset="0x12FC8" />
<Texture Name="object_ma1_Tex_0133C8" OutName="tex_0133C8" Format="rgba16" Width="32" Height="16" Offset="0x133C8" />
<Limb Name="object_ma1_Standardlimb_0137C8" Type="Standard" Offset="0x137C8" />
<Limb Name="object_ma1_Standardlimb_0137D4" Type="Standard" Offset="0x137D4" />
<Limb Name="object_ma1_Standardlimb_0137E0" Type="Standard" Offset="0x137E0" />

13
assets/xml/objects/object_ma2.xml
View File

@ -6,7 +6,7 @@
<Animation Name="object_ma2_Anim_003D54" Offset="0x3D54" />
<Animation Name="object_ma2_Anim_004370" Offset="0x4370" />
<Animation Name="object_ma2_Anim_005314" Offset="0x5314" />
<DList Name="object_ma2_DL_005430" Offset="0x5430" />
<DList Name="gCremiaWoodenBox" Offset="0x5430" />
<Texture Name="object_ma2_Tex_0054E0" OutName="tex_0054E0" Format="rgba16" Width="32" Height="64" Offset="0x54E0" />
<Animation Name="object_ma2_Anim_0070EC" Offset="0x70EC" />
<Animation Name="object_ma2_Anim_007E28" Offset="0x7E28" />
@ -48,7 +48,16 @@
<Texture Name="object_ma2_Tex_0113D8" OutName="tex_0113D8" Format="ci8" Width="16" Height="16" Offset="0x113D8" />
<Texture Name="object_ma2_Tex_0114D8" OutName="tex_0114D8" Format="rgba16" Width="16" Height="32" Offset="0x114D8" />
<Texture Name="object_ma2_Tex_0118D8" OutName="tex_0118D8" Format="rgba16" Width="16" Height="16" Offset="0x118D8" />
<!-- <Blob Name="object_ma2_Blob_011AD8" Size="0x4000" Offset="0x11AD8" /> -->
<Texture Name="object_ma2_Tex_011AD8" OutName="tex_011AD8" Format="rgba16" Width="32" Height="32" Offset="0x11AD8" />
<Texture Name="object_ma2_Tex_0122D8" OutName="tex_0122D8" Format="rgba16" Width="32" Height="32" Offset="0x122D8" />
<Texture Name="object_ma2_Tex_012AD8" OutName="tex_012AD8" Format="rgba16" Width="32" Height="32" Offset="0x12AD8" />
<Texture Name="object_ma2_Tex_0132D8" OutName="tex_0132D8" Format="rgba16" Width="32" Height="32" Offset="0x132D8" />
<Texture Name="object_ma2_Tex_013AD8" OutName="tex_013AD8" Format="rgba16" Width="32" Height="32" Offset="0x13AD8" />
<Texture Name="object_ma2_Tex_0142D8" OutName="tex_0142D8" Format="rgba16" Width="32" Height="32" Offset="0x142D8" />
<Texture Name="object_ma2_Tex_014AD8" OutName="tex_014AD8" Format="rgba16" Width="32" Height="16" Offset="0x14AD8" />
<Texture Name="object_ma2_Tex_014ED8" OutName="tex_014ED8" Format="rgba16" Width="32" Height="16" Offset="0x14ED8" />
<Texture Name="object_ma2_Tex_0152D8" OutName="tex_0152D8" Format="rgba16" Width="32" Height="16" Offset="0x152D8" />
<Texture Name="object_ma2_Tex_0156D8" OutName="tex_0156D8" Format="rgba16" Width="32" Height="16" Offset="0x156D8" />
<Limb Name="object_ma2_Standardlimb_015AD8" Type="Standard" Offset="0x15AD8" />
<Limb Name="object_ma2_Standardlimb_015AE4" Type="Standard" Offset="0x15AE4" />
<Limb Name="object_ma2_Standardlimb_015AF0" Type="Standard" Offset="0x15AF0" />

2
assets/xml/objects/object_mbar_obj.xml
View File

@ -5,6 +5,6 @@
<Texture Name="object_mbar_obj_Tex_000408" OutName="tex_000408" Format="i8" Width="32" Height="64" Offset="0x408" />
<Texture Name="object_mbar_obj_Tex_000C08" OutName="tex_000C08" Format="i8" Width="32" Height="32" Offset="0xC08" />
<Texture Name="object_mbar_obj_Tex_001008" OutName="tex_001008" Format="ia16" Width="16" Height="64" Offset="0x1008" />
<!-- <Blob Name="object_mbar_obj_Blob_001808" Size="0x1D8" Offset="0x1808" /> -->
<Collision Name="object_mbar_obj_Colheader_0019B4" Offset="0x19B4" />
</File>
</Root>

3
assets/xml/objects/object_mm.xml
View File

@ -12,7 +12,8 @@
<Texture Name="object_mm_Tex_002510" OutName="tex_002510" Format="ci8" Width="8" Height="8" Offset="0x2510" />
<Texture Name="object_mm_Tex_002550" OutName="tex_002550" Format="ci8" Width="16" Height="16" Offset="0x2550" />
<Texture Name="object_mm_Tex_002650" OutName="tex_002650" Format="ci8" Width="16" Height="16" Offset="0x2650" />
<!-- <Blob Name="object_mm_Blob_002750" Size="0x400" Offset="0x2750" /> -->
<Texture Name="object_mm_Tex_002750" OutName="tex_002750" Format="ci8" Width="32" Height="16" Offset="0x2750" />
<Texture Name="object_mm_Tex_002950" OutName="tex_002950" Format="ci8" Width="32" Height="16" Offset="0x2950" />
<Texture Name="object_mm_Tex_002B50" OutName="tex_002B50" Format="ci8" Width="16" Height="16" Offset="0x2B50" />
<Texture Name="object_mm_Tex_002C50" OutName="tex_002C50" Format="ci8" Width="32" Height="16" Offset="0x2C50" />
<Texture Name="object_mm_Tex_002E50" OutName="tex_002E50" Format="ci8" Width="16" Height="16" Offset="0x2E50" />

4
assets/xml/objects/object_niw.xml
View File

@ -16,8 +16,8 @@
<Texture Name="object_niw_Tex_001880" OutName="tex_001880" Format="rgba16" Width="32" Height="32" Offset="0x1880" />
<Texture Name="object_niw_Tex_002080" OutName="tex_002080" Format="rgba16" Width="8" Height="16" Offset="0x2080" />
<Texture Name="object_niw_Tex_002180" OutName="tex_002180" Format="rgba16" Width="16" Height="16" Offset="0x2180" />
<DList Name="object_niw_DL_0023B0" Offset="0x23B0" />
<DList Name="object_niw_DL_002428" Offset="0x2428" />
<DList Name="gNiwFeatherMaterialDL" Offset="0x23B0" />
<DList Name="gNiwFeatherDL" Offset="0x2428" />
<Limb Name="object_niw_Standardlimb_002440" Type="Standard" Offset="0x2440" />
<Limb Name="object_niw_Standardlimb_00244C" Type="Standard" Offset="0x244C" />
<Limb Name="object_niw_Standardlimb_002458" Type="Standard" Offset="0x2458" />

2
assets/xml/objects/object_obj_milk_bin.xml
View File

@ -1,6 +1,6 @@
<Root>
<File Name="object_obj_milk_bin" Segment="6">
<DList Name="object_obj_milk_bin_DL_0004B0" Offset="0x4B0" />
<DList Name="gMilkBinMilkJarDL" Offset="0x4B0" />
<Texture Name="object_obj_milk_bin_TLUT_0007C0" OutName="tlut_0007C0" Format="rgba16" Width="16" Height="16" Offset="0x7C0" />
<Texture Name="object_obj_milk_bin_Tex_0009C0" OutName="tex_0009C0" Format="ci8" Width="8" Height="8" Offset="0x9C0" />
<Texture Name="object_obj_milk_bin_Tex_000A00" OutName="tex_000A00" Format="ci8" Width="32" Height="64" Offset="0xA00" />

4
assets/xml/objects/object_owl.xml
View File

@ -29,7 +29,9 @@
<Texture Name="object_owl_Tex_0076B8" OutName="tex_0076B8" Format="rgba16" Width="32" Height="32" Offset="0x76B8" />
<Texture Name="object_owl_Tex_007EB8" OutName="tex_007EB8" Format="rgba16" Width="32" Height="32" Offset="0x7EB8" />
<Texture Name="object_owl_Tex_0086B8" OutName="tex_0086B8" Format="rgba16" Width="32" Height="32" Offset="0x86B8" />
<!-- <Blob Name="object_owl_Blob_008EB8" Size="0xC00" Offset="0x8EB8" /> -->
<Texture Name="object_owl_Tex_008EB8" OutName="tex_008EB8" Format="ci8" Width="32" Height="32" Offset="0x8EB8" />
<Texture Name="object_owl_Tex_0092B8" OutName="tex_0092B8" Format="ci8" Width="32" Height="32" Offset="0x92B8" />
<Texture Name="object_owl_Tex_0096B8" OutName="tex_0096B8" Format="ci8" Width="32" Height="32" Offset="0x96B8" />
<Texture Name="object_owl_Tex_009AB8" OutName="tex_009AB8" Format="rgba16" Width="32" Height="32" Offset="0x9AB8" />
<Texture Name="object_owl_Tex_00A2B8" OutName="tex_00A2B8" Format="rgba16" Width="16" Height="16" Offset="0xA2B8" />
<Texture Name="object_owl_Tex_00A4B8" OutName="tex_00A4B8" Format="rgba16" Width="64" Height="32" Offset="0xA4B8" />

2
assets/xml/objects/object_oyu.xml
View File

@ -4,6 +4,6 @@
<DList Name="object_oyu_DL_000158" Offset="0x158" />
<Texture Name="object_oyu_Tex_000160" OutName="tex_000160" Format="rgba16" Width="32" Height="32" Offset="0x160" />
<TextureAnimation Name="object_oyu_Matanimheader_000968" Offset="0x968" />
<!-- <Blob Name="object_oyu_Blob_000970" Size="0x50" Offset="0x970" /> -->
<Collision Name="object_oyu_Colheader_000988" Offset="0x988" />
</File>
</Root>

20
assets/xml/objects/object_pamera.xml
View File

@ -26,7 +26,13 @@
<Texture Name="object_pamera_Tex_0063E8" OutName="tex_0063E8" Format="ci8" Width="16" Height="16" Offset="0x63E8" />
<Texture Name="object_pamera_Tex_0064E8" OutName="tex_0064E8" Format="ci8" Width="16" Height="16" Offset="0x64E8" />
<Texture Name="object_pamera_Tex_0065E8" OutName="tex_0065E8" Format="ci8" Width="16" Height="16" Offset="0x65E8" />
<!-- <Blob Name="object_pamera_Blob_0066E8" Size="0x1600" Offset="0x66E8" /> -->
<Texture Name="object_pamera_Tex_0066E8" OutName="tex_0066E8" Format="ci8" Width="32" Height="32" Offset="0x66E8" />
<Texture Name="object_pamera_Tex_006AE8" OutName="tex_006AE8" Format="ci8" Width="32" Height="32" Offset="0x6AE8" />
<Texture Name="object_pamera_Tex_006EE8" OutName="tex_006EE8" Format="ci8" Width="32" Height="32" Offset="0x6EE8" />
<Texture Name="object_pamera_Tex_0072E8" OutName="tex_0072E8" Format="ci8" Width="16" Height="16" Offset="0x72E8" />
<Texture Name="object_pamera_Tex_0073E8" OutName="tex_0073E8" Format="ci8" Width="16" Height="16" Offset="0x73E8" />
<Texture Name="object_pamera_Tex_0074E8" OutName="tex_0074E8" Format="ci8" Width="32" Height="32" Offset="0x74E8" />
<Texture Name="object_pamera_Tex_0078E8" OutName="tex_0078E8" Format="ci8" Width="32" Height="32" Offset="0x78E8" />
<Texture Name="object_pamera_Tex_007CE8" OutName="tex_007CE8" Format="ci8" Width="16" Height="16" Offset="0x7CE8" />
<Texture Name="object_pamera_Tex_007DE8" OutName="tex_007DE8" Format="ci8" Width="32" Height="16" Offset="0x7DE8" />
<Texture Name="object_pamera_Tex_007FE8" OutName="tex_007FE8" Format="ci8" Width="16" Height="16" Offset="0x7FE8" />
@ -55,17 +61,17 @@
<Limb Name="object_pamera_Standardlimb_0083D8" Type="Standard" Offset="0x83D8" />
<Limb Name="object_pamera_Standardlimb_0083E4" Type="Standard" Offset="0x83E4" />
<Skeleton Name="object_pamera_Skel_008448" Type="Flex" LimbType="Standard" Offset="0x8448" />
<Animation Name="object_pamera_Anim_008AE0" Offset="0x8AE0" />
<Animation Name="object_pamera_Anim_008AE0" Offset="0x8AE0" /> <!-- Pamela Walking -->
<Animation Name="object_pamera_Anim_008E38" Offset="0x8E38" />
<Animation Name="object_pamera_Anim_009870" Offset="0x9870" />
<Animation Name="object_pamera_Anim_009F54" Offset="0x9F54" />
<Animation Name="object_pamera_Anim_00A844" Offset="0xA844" />
<Animation Name="object_pamera_Anim_009F54" Offset="0x9F54" /> <!-- HoldBack En_Hgo -->
<Animation Name="object_pamera_Anim_00A844" Offset="0xA844" /> <!-- Pamela Looking down the well -->
<Animation Name="object_pamera_Anim_00B0C4" Offset="0xB0C4" />
<Animation Name="object_pamera_Anim_00B5B0" Offset="0xB5B0" />
<Animation Name="object_pamera_Anim_00BCC4" Offset="0xBCC4" />
<Animation Name="object_pamera_Anim_00B5B0" Offset="0xB5B0" /> <!-- PushBack En_Hgo -->
<Animation Name="object_pamera_Anim_00BCC4" Offset="0xBCC4" /> <!-- Defend En_Hgo -->
<Animation Name="object_pamera_Anim_00C9F4" Offset="0xC9F4" />
<Animation Name="object_pamera_Anim_00D0F0" Offset="0xD0F0" />
<Animation Name="object_pamera_Anim_00D9DC" Offset="0xD9DC" />
<Animation Name="object_pamera_Anim_00E16C" Offset="0xE16C" />
<Animation Name="object_pamera_Anim_00E16C" Offset="0xE16C" /> <!-- Hugging En_Hg -->
</File>
</Root>

4
assets/xml/objects/object_sek.xml
View File

@ -1,6 +1,6 @@
<Root>
<File Name="object_sek" Segment="6">
<DList Name="object_sek_DL_0001D0" Offset="0x1D0" />
<DList Name="gOwlStatueClosedDL" Offset="0x1D0" />
<Texture Name="object_sek_Tex_0003F0" OutName="tex_0003F0" Format="ci8" Width="32" Height="32" Offset="0x3F0" />
<Texture Name="object_sek_Tex_0007F0" OutName="tex_0007F0" Format="ci8" Width="32" Height="32" Offset="0x7F0" />
<DList Name="object_sek_DL_001110" Offset="0x1110" />
@ -11,7 +11,7 @@
<Texture Name="object_sek_Tex_002410" OutName="tex_002410" Format="ci8" Width="32" Height="32" Offset="0x2410" />
<Texture Name="object_sek_Tex_002810" OutName="tex_002810" Format="ci8" Width="32" Height="32" Offset="0x2810" />
<Texture Name="object_sek_Tex_002C10" OutName="tex_002C10" Format="ci8" Width="32" Height="32" Offset="0x2C10" />
<DList Name="object_sek_DL_003770" Offset="0x3770" />
<DList Name="gOwlStatueOpenedDL" Offset="0x3770" />
<Texture Name="object_sek_Tex_003A70" OutName="tex_003A70" Format="ci8" Width="32" Height="64" Offset="0x3A70" />
<Texture Name="object_sek_Tex_004270" OutName="tex_004270" Format="ci8" Width="32" Height="64" Offset="0x4270" />
</File>

7
assets/xml/objects/object_shn.xml
View File

@ -18,7 +18,9 @@
<Texture Name="object_shn_TLUT_005688" OutName="tlut_005688" Format="rgba16" Width="16" Height="16" Offset="0x5688" />
<Texture Name="object_shn_TLUT_005888" OutName="tlut_005888" Format="rgba16" Width="16" Height="16" Offset="0x5888" />
<Texture Name="object_shn_Tex_005A88" OutName="tex_005A88" Format="ci8" Width="8" Height="8" Offset="0x5A88" />
<!-- <Blob Name="object_shn_Blob_005AC8" Size="0x1800" Offset="0x5AC8" /> -->
<Texture Name="object_shn_Tex_005AC8" OutName="tex_005AC8" Format="rgba16" Width="32" Height="32" Offset="0x5AC8" />
<Texture Name="object_shn_Tex_0062C8" OutName="tex_0062C8" Format="rgba16" Width="32" Height="32" Offset="0x62C8" />
<!-- <Blob Name="object_shn_Blob_006AC8" Size="0x800" Offset="0x6AC8" /> -->
<Texture Name="object_shn_Tex_0072C8" OutName="tex_0072C8" Format="ci8" Width="16" Height="16" Offset="0x72C8" />
<Texture Name="object_shn_Tex_0073C8" OutName="tex_0073C8" Format="ci8" Width="8" Height="8" Offset="0x73C8" />
<Texture Name="object_shn_Tex_007408" OutName="tex_007408" Format="ci8" Width="32" Height="32" Offset="0x7408" />
@ -83,7 +85,8 @@
<DList Name="object_shn_DL_00F2D0" Offset="0xF2D0" />
<Texture Name="object_shn_TLUT_00F790" OutName="tlut_00F790" Format="rgba16" Width="16" Height="16" Offset="0xF790" />
<Texture Name="object_shn_TLUT_00F990" OutName="tlut_00F990" Format="rgba16" Width="16" Height="16" Offset="0xF990" />
<!-- <Blob Name="object_shn_Blob_00FB90" Size="0x1000" Offset="0xFB90" /> -->
<Texture Name="object_shn_Tex_00FB90" OutName="tex_00FB90" Format="rgba16" Width="32" Height="32" Offset="0xFB90" />
<Texture Name="object_shn_Tex_010390" OutName="tex_010390" Format="rgba16" Width="32" Height="32" Offset="0x10390" />
<Texture Name="object_shn_Tex_010B90" OutName="tex_010B90" Format="ci8" Width="32" Height="32" Offset="0x10B90" />
<Texture Name="object_shn_Tex_010F90" OutName="tex_010F90" Format="ci8" Width="8" Height="8" Offset="0x10F90" />
<Texture Name="object_shn_Tex_010FD0" OutName="tex_010FD0" Format="ci8" Width="16" Height="16" Offset="0x10FD0" />

4
assets/xml/objects/object_st.xml
View File

@ -22,8 +22,8 @@
<Texture Name="object_st_Tex_0024D0" OutName="tex_0024D0" Format="rgba16" Width="16" Height="8" Offset="0x24D0" />
<Texture Name="object_st_Tex_0025D0" OutName="tex_0025D0" Format="i4" Width="16" Height="16" Offset="0x25D0" />
<Texture Name="object_st_Tex_002650" OutName="tex_002650" 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" />

6
assets/xml/objects/object_syokudai.xml
View File

@ -1,8 +1,8 @@
<Root>
<File Name="object_syokudai" Segment="6">
<DList Name="object_syokudai_DL_0003A0" Offset="0x3A0" />
<DList Name="object_syokudai_DL_000870" Offset="0x870" />
<DList Name="object_syokudai_DL_000B90" Offset="0xB90" />
<DList Name="gObjectSyokudaiTypeSwitchCausesFlameDL" Offset="0x3A0" />
<DList Name="gObjectSyokudaiTypeNoSwitchDL" Offset="0x870" />
<DList Name="gObjectSyokudaiTypeFlameCausesSwitchDL" Offset="0xB90" />
<Texture Name="object_syokudai_Tex_000C90" OutName="tex_000C90" Format="rgba16" Width="32" Height="32" Offset="0xC90" />
<Texture Name="object_syokudai_Tex_001490" OutName="tex_001490" Format="rgba16" Width="32" Height="64" Offset="0x1490" />
<Texture Name="object_syokudai_Tex_002490" OutName="tex_002490" Format="rgba16" Width="32" Height="32" Offset="0x2490" />

8
assets/xml/objects/object_tite.xml
View File

@ -8,10 +8,14 @@
<Animation Name="object_tite_Anim_000C70" Offset="0xC70" />
<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" /> -->
<Texture Name="object_tite_Tex_001300" OutName="tex_001300" Format="rgba16" Width="16" Height="32" Offset="0x1300" />
<Texture Name="object_tite_Tex_001700" OutName="tex_001700" Format="rgba16" Width="16" Height="16" Offset="0x1700" />
<Texture Name="object_tite_Tex_001900" OutName="tex_001900" Format="rgba16" Width="8" Height="16" Offset="0x1900" />
<Texture Name="object_tite_Tex_001A00" OutName="tex_001A00" Format="rgba16" Width="4" Height="16" Offset="0x1A00" />
<Texture Name="object_tite_Tex_001A80" OutName="tex_001A80" 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_001B00" Format="rgba16" Width="16" Height="32" Offset="0x1B00" />
<Texture Name="object_tite_Tex_001F00" OutName="tex_001F00" Format="rgba16" Width="16" Height="16" Offset="0x1F00" />
<Texture Name="object_tite_Tex_002100" OutName="tex_002100" 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" />

4
assets/xml/objects/object_tk.xml
View File

@ -12,7 +12,9 @@
<Texture Name="object_tk_Tex_004210" OutName="tex_004210" Format="ci8" Width="8" Height="8" Offset="0x4210" />
<Texture Name="object_tk_Tex_004250" OutName="tex_004250" Format="ci8" Width="8" Height="8" Offset="0x4250" />
<Texture Name="object_tk_Tex_004290" OutName="tex_004290" Format="ci8" Width="16" Height="16" Offset="0x4290" />
<!-- <Blob Name="object_tk_Blob_004390" Size="0x1800" Offset="0x4390" /> -->
<Texture Name="object_tk_Tex_004390" OutName="tex_004390" Format="rgba16" Width="32" Height="32" Offset="0x4390" />
<Texture Name="object_tk_Tex_004B90" OutName="tex_004B90" Format="rgba16" Width="32" Height="32" Offset="0x4B90" />
<Texture Name="object_tk_Tex_005390" OutName="tex_005390" Format="rgba16" Width="32" Height="32" Offset="0x5390" />
<Texture Name="object_tk_Tex_005B90" OutName="tex_005B90" Format="ci8" Width="16" Height="16" Offset="0x5B90" />
<Texture Name="object_tk_Tex_005C90" OutName="tex_005C90" Format="ci8" Width="16" Height="16" Offset="0x5C90" />
<!-- <Blob Name="object_tk_Blob_005D90" Size="0x180" Offset="0x5D90" /> -->

2
assets/xml/objects/object_uch.xml
View File

@ -3,7 +3,7 @@
<DList Name="object_uch_DL_000080" Offset="0x80" />
<Texture Name="object_uch_Tex_000130" OutName="tex_000130" Format="i8" Width="32" Height="32" Offset="0x130" />
<TextureAnimation Name="object_uch_Matanimheader_000550" Offset="0x550" />
<!-- <Blob Name="object_uch_Blob_000560" Size="0x10" Offset="0x560" /> -->
<TextureAnimation Name="object_uch_Matanimheader_000560" Offset="0x560" />
<Animation Name="object_uch_Anim_000608" Offset="0x608" />
<Animation Name="object_uch_Anim_0006C8" Offset="0x6C8" />
<DList Name="object_uch_DL_000720" Offset="0x720" />

10
assets/xml/objects/object_wf.xml
View File

@ -5,7 +5,7 @@
<Texture Name="object_wf_Tex_000180" OutName="tex_000180" Format="rgba16" Width="8" Height="8" Offset="0x180" />
<Texture Name="object_wf_Tex_000200" OutName="tex_000200" Format="rgba16" Width="8" Height="8" Offset="0x200" />
<Texture Name="object_wf_Tex_000280" OutName="tex_000280" Format="rgba16" Width="8" Height="8" Offset="0x280" />
<!-- <Blob Name="object_wf_Blob_000300" Size="0x200" Offset="0x300" /> -->
<Texture Name="object_wf_Tex_000300" OutName="tex_000300" Format="rgba16" Width="16" Height="16" Offset="0x300" />
<DList Name="object_wf_DL_001A20" Offset="0x1A20" />
<DList Name="object_wf_DL_001AE8" Offset="0x1AE8" />
<DList Name="object_wf_DL_001BD8" Offset="0x1BD8" />
@ -20,7 +20,8 @@
<DList Name="object_wf_DL_002490" Offset="0x2490" />
<DList Name="object_wf_DL_0025A0" Offset="0x25A0" />
<DList Name="object_wf_DL_0026C8" Offset="0x26C8" />
<!-- <Blob Name="object_wf_Blob_0027D8" Size="0x400" Offset="0x27D8" /> -->
<Texture Name="object_wf_Tex_0027D8" OutName="tex_0027D8" Format="rgba16" Width="16" Height="16" Offset="0x27D8" />
<Texture Name="object_wf_Tex_0029D8" OutName="tex_0029D8" Format="rgba16" Width="16" Height="16" Offset="0x29D8" />
<DList Name="object_wf_DL_003488" Offset="0x3488" />
<DList Name="object_wf_DL_003528" Offset="0x3528" />
<DList Name="object_wf_DL_0035F0" Offset="0x35F0" />
@ -67,13 +68,14 @@
<DList Name="object_wf_DL_007770" Offset="0x7770" />
<DList Name="object_wf_DL_007880" Offset="0x7880" />
<DList Name="object_wf_DL_007998" Offset="0x7998" />
<!-- <Blob Name="object_wf_Blob_007AA8" Size="0x200" Offset="0x7AA8" /> -->
<Texture Name="object_wf_Tex_007AA8" OutName="tex_007AA8" Format="rgba16" Width="16" Height="16" Offset="0x7AA8" />
<Texture Name="object_wf_Tex_007CA8" OutName="tex_007CA8" Format="rgba16" Width="16" Height="32" Offset="0x7CA8" />
<Texture Name="object_wf_Tex_0080A8" OutName="tex_0080A8" Format="rgba16" Width="8" Height="8" Offset="0x80A8" />
<Texture Name="object_wf_Tex_008128" OutName="tex_008128" Format="rgba16" Width="8" Height="8" Offset="0x8128" />
<Texture Name="object_wf_Tex_0081A8" OutName="tex_0081A8" Format="rgba16" Width="8" Height="8" Offset="0x81A8" />
<Texture Name="object_wf_Tex_008228" OutName="tex_008228" Format="rgba16" Width="8" Height="8" Offset="0x8228" />
<!-- <Blob Name="object_wf_Blob_0082A8" Size="0x400" Offset="0x82A8" /> -->
<Texture Name="object_wf_Tex_0082A8" OutName="tex_0082A8" Format="rgba16" Width="16" Height="16" Offset="0x82A8" />
<Texture Name="object_wf_Tex_0084A8" OutName="tex_0084A8" Format="rgba16" Width="16" Height="16" Offset="0x84A8" />
<DList Name="object_wf_DL_008E98" Offset="0x8E98" />
<DList Name="object_wf_DL_008F38" Offset="0x8F38" />
<DList Name="object_wf_DL_009000" Offset="0x9000" />

5
assets/xml/objects/object_zm.xml
View File

@ -28,7 +28,7 @@
<Texture Name="object_zm_Tex_0082A8" OutName="tex_0082A8" Format="ci8" Width="8" Height="8" Offset="0x82A8" />
<Texture Name="object_zm_Tex_0082E8" OutName="tex_0082E8" Format="ci8" Width="32" Height="32" Offset="0x82E8" />
<Texture Name="object_zm_Tex_0086E8" OutName="tex_0086E8" Format="ci8" Width="32" Height="32" Offset="0x86E8" />
<!-- <Blob Name="object_zm_Blob_008AE8" Size="0x400" Offset="0x8AE8" /> -->
<Texture Name="object_zm_Tex_008AE8" OutName="tex_008AE8" Format="ci8" Width="32" Height="32" Offset="0x8AE8" />
<Texture Name="object_zm_Tex_008EE8" OutName="tex_008EE8" Format="ci8" Width="16" Height="16" Offset="0x8EE8" />
<Texture Name="object_zm_Tex_008FE8" OutName="tex_008FE8" Format="rgba16" Width="32" Height="32" Offset="0x8FE8" />
<Texture Name="object_zm_Tex_0097E8" OutName="tex_0097E8" Format="rgba16" Width="8" Height="8" Offset="0x97E8" />
@ -36,7 +36,8 @@
<Texture Name="object_zm_Tex_009968" OutName="tex_009968" Format="ci8" Width="16" Height="16" Offset="0x9968" />
<Texture Name="object_zm_Tex_009A68" OutName="tex_009A68" Format="rgba16" Width="16" Height="16" Offset="0x9A68" />
<Texture Name="object_zm_Tex_009C68" OutName="tex_009C68" Format="ci8" Width="32" Height="32" Offset="0x9C68" />
<!-- <Blob Name="object_zm_Blob_00A068" Size="0x800" Offset="0xA068" /> -->
<Texture Name="object_zm_Tex_00A068" OutName="tex_00A068" Format="ci8" Width="32" Height="32" Offset="0xA068" />
<Texture Name="object_zm_Tex_00A468" OutName="tex_00A468" Format="ci8" Width="32" Height="32" Offset="0xA468" />
<Limb Name="object_zm_Standardlimb_00A868" Type="Standard" Offset="0xA868" />
<Limb Name="object_zm_Standardlimb_00A874" Type="Standard" Offset="0xA874" />
<Limb Name="object_zm_Standardlimb_00A880" Type="Standard" Offset="0xA880" />

4
assets/xml/objects/object_zo.xml
View File

@ -17,7 +17,9 @@
<Texture Name="object_zo_Tex_004460" OutName="tex_004460" Format="ci8" Width="32" Height="32" Offset="0x4460" />
<Texture Name="object_zo_Tex_004860" OutName="tex_004860" Format="ci8" Width="32" Height="64" Offset="0x4860" />
<Texture Name="object_zo_Tex_005060" OutName="tex_005060" Format="ci8" Width="8" Height="8" Offset="0x5060" />
<!-- <Blob Name="object_zo_Blob_0050A0" Size="0x1800" Offset="0x50A0" /> -->
<Texture Name="object_zo_Tex_0050A0" OutName="tex_0050A0" Format="rgba16" Width="32" Height="32" Offset="0x50A0" />
<Texture Name="object_zo_Tex_0058A0" OutName="tex_0058A0" Format="rgba16" Width="32" Height="32" Offset="0x58A0" />
<Texture Name="object_zo_Tex_0060A0" OutName="tex_0060A0" Format="rgba16" Width="32" Height="32" Offset="0x60A0" />
<Texture Name="object_zo_Tex_0068A0" OutName="tex_0068A0" Format="rgba16" Width="32" Height="32" Offset="0x68A0" />
<Texture Name="object_zo_Tex_0070A0" OutName="tex_0070A0" Format="ci8" Width="16" Height="16" Offset="0x70A0" />
<Texture Name="object_zo_Tex_0071A0" OutName="tex_0071A0" Format="ci8" Width="8" Height="8" Offset="0x71A0" />

238
include/variables.h
View File

@ -3635,244 +3635,6 @@ extern u8 D_80780000[0x4600];
extern u8 D_80784600[0x56200];
extern u16 gFramebuffer0[SCREEN_HEIGHT][SCREEN_WIDTH];
// keep objects
extern Gfx D_040008D0[];
extern Gfx D_040032B0[];
extern UNK_TYPE D_0400CF58;
extern UNK_TYPE D_0400CF88;
extern UNK_TYPE D_0400CF98;
extern UNK_TYPE D_0400D0A8;
extern UNK_TYPE D_0400D0B0;
extern UNK_TYPE D_0400D0C8;
extern UNK_TYPE D_0400D100;
extern UNK_TYPE D_0400D218;
extern UNK_TYPE D_0400D220;
extern UNK_TYPE D_0400D228;
extern UNK_TYPE D_0400D2D0;
extern UNK_TYPE D_0400D3E8;
extern UNK_TYPE D_0400D3F8;
extern UNK_TYPE D_0400D488;
extern UNK_TYPE D_0400D490;
extern UNK_TYPE D_0400D500;
extern UNK_TYPE D_0400D520;
extern UNK_TYPE D_0400D568;
extern UNK_TYPE D_0400D638;
extern UNK_TYPE D_0400D660;
extern UNK_TYPE D_0400D698;
extern UNK_TYPE D_0400D728;
extern UNK_TYPE D_0400D9C8;
extern UNK_TYPE D_0400D9D0;
extern UNK_TYPE D_0400DA70;
extern UNK_TYPE D_0400DA88;
extern UNK_TYPE D_0400DAA8;
extern UNK_TYPE D_0400DAC0;
extern UNK_TYPE D_0400DAC8;
extern UNK_TYPE D_0400DAD8;
extern UNK_TYPE D_0400DAE0;
extern UNK_TYPE D_0400DAF0;
extern UNK_TYPE D_0400DB10;
extern UNK_TYPE D_0400DB18;
extern UNK_TYPE D_0400DB30;
extern UNK_TYPE D_0400DBB0;
extern UNK_TYPE D_0400DBE8;
extern UNK_TYPE D_0400DC48;
extern UNK_TYPE D_0400DC50;
extern UNK_TYPE D_0400DCA8;
extern UNK_TYPE D_0400DCD0;
extern UNK_TYPE D_0400DCD8;
extern UNK_TYPE D_0400DCF8;
extern UNK_TYPE D_0400DD30;
extern UNK_TYPE D_0400DD38;
extern UNK_TYPE D_0400DD40;
extern UNK_TYPE D_0400DD50;
extern UNK_TYPE D_0400DD58;
extern UNK_TYPE D_0400DD80;
extern UNK_TYPE D_0400DDB0;
extern UNK_TYPE D_0400DDF8;
extern UNK_TYPE D_0400DE00;
extern UNK_TYPE D_0400DE08;
extern UNK_TYPE D_0400DE10;
extern UNK_TYPE D_0400DE28;
extern UNK_TYPE D_0400DE30;
extern UNK_TYPE D_0400DE58;
extern UNK_TYPE D_0400DE60;
extern UNK_TYPE D_0400DEA0;
extern UNK_TYPE D_0400DEA8;
extern UNK_TYPE D_0400DF78;
extern UNK_TYPE D_0400DF90;
extern UNK_TYPE D_0400DFA0;
extern UNK_TYPE D_0400DFD0;
extern UNK_TYPE D_0400DFE0;
extern UNK_TYPE D_0400DFE8;
extern UNK_TYPE D_0400DFF8;
extern UNK_TYPE D_0400E000;
extern UNK_TYPE D_0400E070;
extern UNK_TYPE D_0400E088;
extern UNK_TYPE D_0400E120;
extern UNK_TYPE D_0400E150;
extern UNK_TYPE D_0400E1F0;
extern UNK_TYPE D_0400E200;
extern UNK_TYPE D_0400E208;
extern UNK_TYPE D_0400E270;
extern UNK_TYPE D_0400E290;
extern UNK_TYPE D_0400E2A8;
extern UNK_TYPE D_0400E2B8;
extern UNK_TYPE D_0400E2C0;
extern UNK_TYPE D_0400E2D0;
extern UNK_TYPE D_0400E2D8;
extern UNK_TYPE D_0400E2E8;
extern UNK_TYPE D_0400E318;
extern UNK_TYPE D_0400E398;
extern UNK_TYPE D_0400E3A0;
extern UNK_TYPE D_0400E3A8;
extern UNK_TYPE D_0400E3C0;
extern UNK_TYPE D_0400E3D8;
extern UNK_TYPE D_0400E408;
extern UNK_TYPE D_0400E410;
extern UNK_TYPE D_0400E418;
extern UNK_TYPE D_04012860;
extern UNK_TYPE D_040128BC;
extern u64 D_04014570[];
extern UNK_TYPE D_04015FA0;
extern UNK_TYPE D_04016360;
extern UNK_TYPE D_0401A4D0;
extern UNK_TYPE D_0401A538;
extern Gfx D_0401A620[];
extern Gfx D_0401C430[];
extern UNK_TYPE D_0401F740;
extern UNK_TYPE D_0401F7C0;
extern UNK_TYPE D_0401F8C0;
extern UNK_TYPE D_0401FA40;
extern UNK_TYPE D_04020BB8;
extern UNK_TYPE D_040221B8;
extern UNK_TYPE D_04023100;
extern UNK_TYPE D_04023130;
extern Gfx D_04023210[];
extern UNK_TYPE D_04023288;
extern Gfx D_04023348[];
extern Gfx D_04023428[];
extern UNK_TYPE D_04025DD0;
extern UNK_TYPE D_040281DC;
extern UNK_TYPE D_04028FEC;
extern AnimationHeader D_04029140;
extern Gfx D_04029CB0[];
extern Gfx D_04029CF0[];
extern UNK_TYPE D_04029D20;
extern Gfx D_0402E510[];
extern AnimationHeader D_0402E65C;
extern AnimationHeader D_0402F0EC;
extern Gfx D_04030100[]; // Floor shockwave ring
extern Gfx D_040301B0[];
extern UNK_TYPE D_04032270;
extern UNK_TYPE D_04035710;
extern UNK_TYPE D_040367B0;
extern UNK_TYPE D_040377B0;
extern UNK_TYPE D_04037850;
extern Gfx D_040378F0[]; // gExplosionSplashTex1
extern Gfx D_04037DF0[]; // gExplosionSplashTex2
extern Gfx D_040382F0[]; // gExplosionSplashTex3
extern Gfx D_040387F0[]; // gExplosionSplashTex4
extern Gfx D_04038CF0[]; // gExplosionSplashTex5
extern Gfx D_040391F0[]; // gExplosionSplashTex6
extern Gfx D_040396F0[]; // gExplosionSplashTex7
extern Gfx D_04039BF0[]; // gExplosionSplashTex8
extern Gfx D_0403A0F0[]; // gExplosionSplashDL
extern UNK_TYPE D_0403C190;
extern UNK_TYPE D_0403F230;
extern UNK_TYPE D_04044300;
extern Gfx D_04048DF0[];
extern UNK_TYPE D_04050D10;
extern Gfx D_04051180[];
extern Gfx D_04051238[];
extern AnimationHeader D_0405140C;
extern Gfx D_040527F0[];
extern Gfx D_040528B0[];
extern Gfx D_04054A90[];
extern u64 D_04054F20[];
extern UNK_TYPE D_04055628;
extern Gfx D_04057B10[];
extern Gfx D_04058BA0[];
extern Gfx D_04089070[];
extern TexturePtr D_0408DBE0[]; // gDust1Tex
extern TexturePtr D_0408DFE0[]; // gDust2Tex
extern TexturePtr D_0408E3E0[]; // gDust3Tex
extern TexturePtr D_0408E7E0[]; // gDust4Tex
extern TexturePtr D_0408EBE0[]; // gDust5Tex
extern TexturePtr D_0408EFE0[]; // gDust6Tex
extern TexturePtr D_0408F3E0[]; // gDust7Tex
extern TexturePtr D_0408F7E0[]; // gDust8Tex
extern UNK_TYPE D_04050550;
extern Gfx D_04050648[];
extern Gfx D_040506E0[];
extern UNK_TYPE D_040510B0;
extern UNK_TYPE D_04054940;
extern Gfx D_0405AAB0[];
extern UNK_TYPE D_0405B6F0;
extern UNK_TYPE D_0405BEF0;
extern UNK_TYPE D_0405C6F0;
extern UNK_TYPE D_0405CEF0;
extern UNK_TYPE D_0405E6F0;
extern Gfx D_0405F6F0[];
extern UNK_TYPE D_0405F7C0;
extern UNK_TYPE D_0405FFC0;
extern UNK_TYPE D_040607C0;
extern UNK_TYPE D_04060FC0;
extern UNK_TYPE D_040617C0;
extern UNK_TYPE D_04061FC0;
extern UNK_TYPE D_04061FE0;
extern UNK_TYPE D_04062000;
extern UNK_TYPE D_04062020;
extern UNK_TYPE D_04062040;
extern UNK_TYPE D_04062060;
extern Gfx D_040622C0[];
extern Gfx D_0406AB30[];
extern UNK_TYPE D_0406B730;
extern UNK_TYPE D_0406BB0C;
extern UNK_TYPE D_0406F380;
extern Gfx D_040706E0[];
extern UNK_TYPE D_04073F00;
extern UNK_TYPE D_04075400;
extern Gfx D_04076BC0[];
extern UNK_TYPE D_04079B10;
extern Gfx D_0407AB10[]; // sun (sparkles when small) displaylist
extern Gfx D_0407AB58[];
extern UNK_TYPE D_0407AFB0;
extern UNK_TYPE D_0407D650;
extern UNK_TYPE D_0407F218;
extern UNK_TYPE D_040815D0;
extern UNK_TYPE D_04081628;
extern UNK_TYPE D_04083534;
extern UNK_TYPE D_04091BE0;
extern UNK_TYPE D_04091CE0;
extern TexturePtr D_04091DE0[];
extern TexturePtr D_04091FE0[];
extern TexturePtr D_040921E0[];
extern TexturePtr D_040923E0[];
extern Gfx D_05000C40[];
extern UNK_TYPE D_05001D20;
extern Gfx D_050061E8[];
extern Gfx D_05006420[];
extern Gfx D_050066B0[];
extern UNK_TYPE D_05007498;
extern Gfx D_05007890[];
extern Gfx D_050078A0[];
extern Gfx D_05007938[];
extern Gfx D_05007980[];
extern UNK_TYPE D_05007E00;
extern UNK_TYPE D_05008018;
extern UNK_TYPE D_050085F0;
extern Gfx D_05017EA0[]; // pot displaylist
extern Gfx D_05018090[]; // pot break shard displaylist
extern UNK_TYPE D_050182A8;
extern UNK_TYPE D_0501B508;
extern UNK_TYPE D_0501C058;
extern Gfx D_0501D980[];
extern Gfx D_050219E0[];
extern UNK_TYPE D_05023008;
extern UNK_TYPE D_0502324C;
// other segments
extern GfxMasterList D_0E000000;
extern Mtx D_01000000;

14
include/z64object.h
View File

@ -405,7 +405,7 @@ typedef enum {
/* 0x189 */ OBJECT_HANAREYAMA_OBJ,
/* 0x18A */ OBJECT_CRACE_OBJECT,
/* 0x18B */ OBJECT_DNQ,
/* 0x18C */ OBJECT_OBJECT_UNSET_TOKEIDAI,
/* 0x18C */ OBJECT_OBJ_TOKEIDAI,
/* 0x18D */ OBJECT_EG,
/* 0x18E */ OBJECT_TRU,
/* 0x18F */ OBJECT_TRT,
@ -545,13 +545,13 @@ typedef enum {
/* 0x215 */ OBJECT_GI_RESERVE_C_01,
/* 0x216 */ OBJECT_ZOD,
/* 0x217 */ OBJECT_KUMO30,
/* 0x218 */ OBJECT_OBJECT_UNSET_YASI,
/* 0x218 */ OBJECT_OBJ_YASI,
/* 0x219 */ OBJECT_MASK_ROMERNY,
/* 0x21A */ OBJECT_TANRON1,
/* 0x21B */ OBJECT_TANRON2,
/* 0x21C */ OBJECT_TANRON3,
/* 0x21D */ OBJECT_GI_MAGICMUSHROOM,
/* 0x21E */ OBJECT_OBJECT_UNSET_CHAN,
/* 0x21E */ OBJECT_OBJ_CHAN,
/* 0x21F */ OBJECT_GI_MASK10,
/* 0x220 */ OBJECT_ZOS,
/* 0x221 */ OBJECT_MASK_POSTHAT,
@ -589,7 +589,7 @@ typedef enum {
/* 0x241 */ OBJECT_DT,
/* 0x242 */ OBJECT_GI_MASK03,
/* 0x243 */ OBJECT_CHA,
/* 0x244 */ OBJECT_OBJECT_UNSET_DINNER,
/* 0x244 */ OBJECT_OBJ_DINNER,
/* 0x245 */ OBJECT_GI_RESERVE_B_01,
/* 0x246 */ OBJECT_LASTDAY,
/* 0x247 */ OBJECT_BAI,
@ -608,7 +608,7 @@ typedef enum {
/* 0x254 */ OBJECT_GI_STONEMASK,
/* 0x255 */ OBJECT_ZORABAND,
/* 0x256 */ OBJECT_KEPN_KOYA,
/* 0x257 */ OBJECT_OBJECT_UNSET_USIYANE,
/* 0x257 */ OBJECT_OBJ_USIYANE,
/* 0x258 */ OBJECT_GI_MASK05,
/* 0x259 */ OBJECT_GI_MASK11,
/* 0x25A */ OBJECT_GI_MASK20,
@ -618,7 +618,7 @@ typedef enum {
/* 0x25E */ OBJECT_MASK_MEOTO,
/* 0x25F */ OBJECT_MASK_DANCER,
/* 0x260 */ OBJECT_KZSAKU,
/* 0x261 */ OBJECT_OBJECT_UNSET_MILK_BIN,
/* 0x261 */ OBJECT_OBJ_MILK_BIN,
/* 0x262 */ OBJECT_RANDOM_OBJ,
/* 0x263 */ OBJECT_KUJIYA,
/* 0x264 */ OBJECT_KITAN,
@ -636,7 +636,7 @@ typedef enum {
/* 0x270 */ OBJECT_MOONEND,
/* 0x271 */ OBJECT_OB,
/* 0x272 */ OBJECT_GI_BOTTLE_04,
/* 0x273 */ OBJECT_OBJECT_UNSET_DANPEILIFT,
/* 0x273 */ OBJECT_OBJ_DANPEILIFT,
/* 0x274 */ OBJECT_WDOR01,
/* 0x275 */ OBJECT_WDOR02,
/* 0x276 */ OBJECT_WDOR03,

5
src/code/z_eff_blure.c
View File

@ -1,4 +1,5 @@
#include "global.h"
#include "objects/gameplay_keep/gameplay_keep.h"
void EffectBlure_AddVertex(EffectBlure* this, Vec3f* p1, Vec3f* p2) {
EffectBlureElement* elem;
@ -720,8 +721,8 @@ void EffectBlure_SetupSimpleAlt(GraphicsContext* gfxCtx, EffectBlure* this, Vtx*
gDPSetTextureLUT(POLY_XLU_DISP++, G_TT_NONE);
gSPTexture(POLY_XLU_DISP++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON);
gDPLoadTextureBlock(POLY_XLU_DISP++, D_04014570, G_IM_FMT_I, G_IM_SIZ_8b, 64, 32, 0, G_TX_NOMIRROR | G_TX_CLAMP,
G_TX_NOMIRROR | G_TX_WRAP, 6, 5, G_TX_NOLOD, G_TX_NOLOD);
gDPLoadTextureBlock(POLY_XLU_DISP++, gameplay_keep_Tex_014570, G_IM_FMT_I, G_IM_SIZ_8b, 64, 32, 0,
G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_WRAP, 6, 5, G_TX_NOLOD, G_TX_NOLOD);
gDPSetCombineLERP(POLY_XLU_DISP++, TEXEL0, PRIMITIVE, PRIM_LOD_FRAC, TEXEL0, TEXEL0, 0, PRIMITIVE, 0, PRIMITIVE,
ENVIRONMENT, COMBINED, ENVIRONMENT, 0, 0, 0, COMBINED);

5
src/code/z_eff_shield_particle.c
View File

@ -2,6 +2,7 @@
#include "vt.h"
#include "assets/code/eff_shield_particle/eff_shield_particle.c"
#include "objects/gameplay_keep/gameplay_keep.h"
void EffectShieldParticle_Init(void* thisx, void* initParamsx) {
EffectShieldParticle* this = (EffectShieldParticle*)thisx;
@ -154,8 +155,8 @@ void EffectShieldParticle_Draw(void* thisx, GraphicsContext* gfxCtx) {
gDPPipeSync(POLY_XLU_DISP++);
gSPTexture(POLY_XLU_DISP++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON);
gDPLoadTextureBlock(POLY_XLU_DISP++, D_04054F20, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP,
G_TX_NOMIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD);
gDPLoadTextureBlock(POLY_XLU_DISP++, gameplay_keep_Tex_054F20, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD);
gDPSetCombineLERP(POLY_XLU_DISP++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, PRIMITIVE, 0, TEXEL0, 0, 0, 0,
0, COMBINED, 0, 0, 0, COMBINED);

5
src/code/z_eff_spark.c
View File

@ -1,4 +1,5 @@
#include "global.h"
#include "objects/gameplay_keep/gameplay_keep.h"
void EffectSpark_Init(void* thisx, void* initParamsx) {
EffectSpark* this = (EffectSpark*)thisx;
@ -152,8 +153,8 @@ void EffectSpark_Draw(void* thisx, GraphicsContext* gfxCtx) {
gDPPipeSync(POLY_XLU_DISP++);
gSPTexture(POLY_XLU_DISP++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON);
gDPLoadTextureBlock(POLY_XLU_DISP++, D_04054F20, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP,
G_TX_NOMIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD);
gDPLoadTextureBlock(POLY_XLU_DISP++, gameplay_keep_Tex_054F20, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD);
gDPSetCombineMode(POLY_XLU_DISP++, G_CC_SHADEDECALA, G_CC_PASS2);
gDPSetRenderMode(POLY_XLU_DISP++, G_RM_PASS, G_RM_ZB_CLD_SURF2);

3
src/code/z_eff_tire_mark.c
View File

@ -1,4 +1,5 @@
#include "global.h"
#include "objects/gameplay_keep/gameplay_keep.h"
void func_800AE930(CollisionContext* colCtx, EffectTireMark* this, Vec3f* pos, f32 arg3, s16 arg4,
CollisionPoly* colPoly, s32 arg6) {
@ -233,7 +234,7 @@ void EffectTireMark_Draw(void* thisx, GraphicsContext* gfxCtx) {
POLY_OPA_DISP = Gfx_CallSetupDL(POLY_OPA_DISP++, 0x2C);
gDPSetRenderMode(POLY_OPA_DISP++, G_RM_PASS, G_RM_ZB_CLD_SURF2);
gDPLoadTextureBlock(POLY_OPA_DISP++, D_04014570, G_IM_FMT_I, G_IM_SIZ_8b, 64, 32, 0,
gDPLoadTextureBlock(POLY_OPA_DISP++, gameplay_keep_Tex_014570, G_IM_FMT_I, G_IM_SIZ_8b, 64, 32, 0,
G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_WRAP, 6, 5, G_TX_NOLOD, G_TX_NOLOD);
gDPSetCombineLERP(POLY_OPA_DISP++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, COMBINED, 0, 0, 0,

51
src/code/z_en_item00.c
View File

@ -1,4 +1,6 @@
#include "global.h"
#include "objects/gameplay_keep/gameplay_keep.h"
#include "objects/object_gi_hearts/object_gi_hearts.h"
#define FLAGS 0x00000000
@ -693,12 +695,12 @@ void EnItem00_Draw(Actor* thisx, GlobalContext* globalCtx) {
}
}
UNK_PTR D_801ADF30[5] = {
&D_04061FC0, // Green rupee
&D_04061FE0, // Blue rupee
&D_04062000, // Red rupee
&D_04062040, // Orange rupee
&D_04062020 // Purple rupee
TexturePtr D_801ADF30[] = {
gameplay_keep_Tex_061FC0, // Green rupee
gameplay_keep_Tex_061FE0, // Blue rupee
gameplay_keep_Tex_062000, // Red rupee
gameplay_keep_Tex_062040, // Orange rupee
gameplay_keep_Tex_062020 // Purple rupee
};
void EnItem00_DrawRupee(EnItem00* this, GlobalContext* globalCtx) {
@ -720,24 +722,24 @@ void EnItem00_DrawRupee(EnItem00* this, GlobalContext* globalCtx) {
gSPSegment(POLY_OPA_DISP++, 0x08, Lib_SegmentedToVirtual(D_801ADF30[iconNb]));
gSPDisplayList(POLY_OPA_DISP++, &D_040622C0); // TODO symbol
gSPDisplayList(POLY_OPA_DISP++, gameplay_keep_DL_0622C0); // TODO symbol
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
UNK_PTR D_801ADF44[12] = {
&D_0405E6F0, // Heart (Not used)
&D_0405CEF0, // Bombs (A), Bombs (0)
&D_0405BEF0, // Arrows (10)
&D_0405B6F0, // Arrows (30)
&D_0405C6F0, // Arrows (40), Arrows (50)
&D_0405CEF0, // Bombs (B)
&D_040607C0, // Nuts (1), Nuts (10)
&D_04060FC0, // Sticks (1)
&D_040617C0, // Magic (Large)
&D_0405FFC0, // Magic (Small)
TexturePtr D_801ADF44[12] = {
gameplay_keep_Tex_05E6F0, // Heart (Not used)
gameplay_keep_Tex_05CEF0, // Bombs (A), Bombs (0)
gameplay_keep_Tex_05BEF0, // Arrows (10)
gameplay_keep_Tex_05B6F0, // Arrows (30)
gameplay_keep_Tex_05C6F0, // Arrows (40), Arrows (50)
gameplay_keep_Tex_05CEF0, // Bombs (B)
gameplay_keep_Tex_0607C0, // Nuts (1), Nuts (10)
gameplay_keep_Tex_060FC0, // Sticks (1)
gameplay_keep_Tex_0617C0, // Magic (Large)
gameplay_keep_Tex_05FFC0, // Magic (Small)
NULL,
&D_0405F7C0 // Small Key
gameplay_keep_Tex_05F7C0 // Small Key
};
void EnItem00_DrawSprite(EnItem00* this, GlobalContext* globalCtx) {
@ -764,14 +766,11 @@ void EnItem00_DrawSprite(EnItem00* this, GlobalContext* globalCtx) {
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD);
gSPDisplayList(POLY_OPA_DISP++, D_0405F6F0);
gSPDisplayList(POLY_OPA_DISP++, gameplay_keep_DL_05F6F0);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
extern Gfx D_06001290[];
extern Gfx D_06001470[];
void EnItem00_DrawHeartContainer(EnItem00* actor, GlobalContext* globalCtx) {
s32 pad;
s32 pad2;
@ -784,8 +783,8 @@ void EnItem00_DrawHeartContainer(EnItem00* actor, GlobalContext* globalCtx) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD);
gSPDisplayList(POLY_XLU_DISP++, D_06001290);
gSPDisplayList(POLY_XLU_DISP++, D_06001470);
gSPDisplayList(POLY_XLU_DISP++, object_gi_hearts_DL_001290);
gSPDisplayList(POLY_XLU_DISP++, object_gi_hearts_DL_001470);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
@ -801,7 +800,7 @@ void EnItem00_DrawHeartPiece(EnItem00* this, GlobalContext* globalCtx) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD);
gSPDisplayList(POLY_XLU_DISP++, D_0405AAB0);
gSPDisplayList(POLY_XLU_DISP++, gameplay_keep_DL_05AAB0);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}

5
src/code/z_lights.c
View File

@ -1,4 +1,5 @@
#include "global.h"
#include "objects/gameplay_keep/gameplay_keep.h"
void Lights_PointSetInfo(LightInfo* info, s16 x, s16 y, s16 z, u8 r, u8 g, u8 b, s16 radius, s32 type) {
info->type = type;
@ -418,7 +419,7 @@ void Lights_DrawGlow(GlobalContext* globalCtx) {
gDPSetCombineLERP(dl++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE,
0);
gSPDisplayList(dl++, D_04029CB0);
gSPDisplayList(dl++, gameplay_keep_DL_029CB0);
do {
if (light->info->type == LIGHT_POINT_GLOW) {
@ -434,7 +435,7 @@ void Lights_DrawGlow(GlobalContext* globalCtx) {
gSPMatrix(dl++, Matrix_NewMtx(globalCtx->state.gfxCtx),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(dl++, D_04029CF0);
gSPDisplayList(dl++, gameplay_keep_DL_029CF0);
}
}

8
src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c
View File

@ -5,6 +5,8 @@
*/
#include "z_arms_hook.h"
#include "objects/gameplay_keep/gameplay_keep.h"
#include "objects/object_link_child/object_link_child.h"
#define FLAGS 0x00000030
@ -50,8 +52,6 @@ static ColliderQuadInit D_808C1BC0 = {
{ { { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } } },
};
extern Gfx D_0601D960[];
void ArmsHook_SetupAction(ArmsHook* this, ArmsHookActionFunc actionFunc) {
this->actionFunc = actionFunc;
}
@ -323,7 +323,7 @@ void ArmsHook_Draw(Actor* thisx, GlobalContext* globalCtx) {
func_80122868(globalCtx, player);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, D_0601D960);
gSPDisplayList(POLY_OPA_DISP++, object_link_child_DL_01D960);
Matrix_InsertTranslation(this->actor.world.pos.x, this->actor.world.pos.y, this->actor.world.pos.z,
MTXMODE_NEW);
Math_Vec3f_Diff(&player->rightHandWorld.pos, &this->actor.world.pos, &sp68);
@ -334,7 +334,7 @@ void ArmsHook_Draw(Actor* thisx, GlobalContext* globalCtx) {
f0 = sqrtf(SQ(sp68.y) + sp48);
Matrix_Scale(0.015f, 0.015f, f0 * 0.01f, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, D_040008D0);
gSPDisplayList(POLY_OPA_DISP++, gameplay_keep_DL_0008D0);
func_801229A0(globalCtx, player);
CLOSE_DISPS(globalCtx->state.gfxCtx);

19
src/overlays/actors/ovl_Bg_Ctower_Gear/z_bg_ctower_gear.c
View File

@ -5,6 +5,7 @@
*/
#include "z_bg_ctower_gear.h"
#include "objects/object_ctower_rot/object_ctower_rot.h"
#define FLAGS 0x00000010
@ -39,14 +40,6 @@ const ActorInit Bg_Ctower_Gear_InitVars = {
(ActorFunc)BgCtowerGear_Draw,
};
extern Gfx D_06010828[];
extern Gfx D_06015F30[];
extern Gfx D_060160A0[];
extern CollisionHeader D_06016E70;
extern Gfx D_06017018[];
extern Gfx D_06018118[];
extern CollisionHeader D_06018588;
static Vec3f D_80AD3270[] = {
{ -70.0f, -60.0f, 8.0f }, { -60.0f, -60.0f, -9.1f }, { -75.0f, -60.0f, -9.1f }, { -70.0f, -60.0f, -26.2f }
};
@ -75,7 +68,7 @@ static InitChainEntry sInitChainOrgan[] = {
ICHAIN_F32(uncullZoneDownward, 570, ICHAIN_STOP),
};
static Gfx* D_80AD32E8[] = { D_06010828, D_06017018, D_06018118 };
static Gfx* D_80AD32E8[] = { object_ctower_rot_DL_010828, object_ctower_rot_DL_017018, object_ctower_rot_DL_018118 };
void BgCtowerGear_Splash(BgCtowerGear* this, GlobalContext* globalCtx) {
int i;
@ -144,10 +137,10 @@ void BgCtowerGear_Init(Actor* thisx, GlobalContext* globalCtx) {
}
if (type == WATER_WHEEL) {
DynaPolyActor_Init(&this->dyna, 3);
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &D_06018588);
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &object_ctower_rot_Colheader_018588);
} else if (type == ORGAN) {
DynaPolyActor_Init(&this->dyna, 0);
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &D_06016E70);
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &object_ctower_rot_Colheader_016E70);
func_800C62BC(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
}
}
@ -207,9 +200,9 @@ void BgCtowerGear_DrawOrgan(Actor* thisx, GlobalContext* globalCtx) {
OPEN_DISPS(globalCtx->state.gfxCtx);
func_8012C28C(globalCtx->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, D_060160A0);
gSPDisplayList(POLY_OPA_DISP++, object_ctower_rot_DL_0160A0);
func_8012C2DC(globalCtx->state.gfxCtx);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, D_06015F30);
gSPDisplayList(POLY_XLU_DISP++, object_ctower_rot_DL_015F30);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}

20
src/overlays/actors/ovl_Bg_Ctower_Rot/z_bg_ctower_rot.c
View File

@ -5,6 +5,7 @@
*/
#include "z_bg_ctower_rot.h"
#include "objects/object_ctower_rot/object_ctower_rot.h"
#define FLAGS 0x00000030
@ -32,19 +33,12 @@ const ActorInit Bg_Ctower_Rot_InitVars = {
(ActorFunc)BgCtowerRot_Draw,
};
extern Gfx D_060129D0[];
extern Gfx D_06012DA0[];
extern CollisionHeader D_060142E8;
extern Gfx D_06017220[];
extern CollisionHeader D_06017410;
extern Gfx D_060174E0[];
extern CollisionHeader D_06017650;
static InitChainEntry sInitChain[] = {
ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP),
};
static Gfx* bgCtowerRotDlists[] = { D_06012DA0, D_06017220, D_060174E0 };
static Gfx* bgCtowerRotDlists[] = { object_ctower_rot_DL_012DA0, object_ctower_rot_DL_017220,
object_ctower_rot_DL_0174E0 };
void BgCtowerRot_Init(Actor* thisx, GlobalContext* globalCtx) {
BgCtowerRot* this = THIS;
@ -55,16 +49,16 @@ void BgCtowerRot_Init(Actor* thisx, GlobalContext* globalCtx) {
Actor_ProcessInitChain(&this->dyna.actor, sInitChain);
DynaPolyActor_Init(&this->dyna, 1);
if (this->dyna.actor.params == CORRIDOR) {
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &D_060142E8);
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &object_ctower_rot_Colheader_0142E8);
this->actionFunc = BgCtowerRot_CorridorRotate;
return;
}
player = GET_PLAYER(globalCtx);
if (this->dyna.actor.params == MAIN_DOOR) {
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &D_06017410);
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &object_ctower_rot_Colheader_017410);
this->dyna.actor.world.rot.y = this->dyna.actor.shape.rot.y + 0x4000;
} else {
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &D_06017650);
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &object_ctower_rot_Colheader_017650);
this->dyna.actor.world.rot.y = this->dyna.actor.shape.rot.y - 0x4000;
}
Actor_OffsetOfPointInActorCoords(&this->dyna.actor, &offset, &player->actor.world.pos);
@ -161,6 +155,6 @@ void BgCtowerRot_Draw(Actor* thisx, GlobalContext* globalCtx) {
Gfx_DrawDListOpa(globalCtx, bgCtowerRotDlists[this->dyna.actor.params]);
if (this->dyna.actor.params == CORRIDOR) {
Gfx_DrawDListXlu(globalCtx, D_060129D0);
Gfx_DrawDListXlu(globalCtx, object_ctower_rot_DL_0129D0);
}
}

8
src/overlays/actors/ovl_Bg_Fu_Kaiten/z_bg_fu_kaiten.c
View File

@ -5,6 +5,7 @@
*/
#include "z_bg_fu_kaiten.h"
#include "objects/object_fu_kaiten/object_fu_kaiten.h"
#define FLAGS 0x00000030
@ -27,9 +28,6 @@ const ActorInit Bg_Fu_Kaiten_InitVars = {
(ActorFunc)BgFuKaiten_Draw,
};
extern Gfx D_060005D0[];
extern CollisionHeader D_06002D30;
void BgFuKaiten_Init(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgFuKaiten* this = THIS;
@ -37,7 +35,7 @@ void BgFuKaiten_Init(Actor* thisx, GlobalContext* globalCtx) {
Actor_SetScale(thisx, 1.0);
DynaPolyActor_Init(&this->dyna, 3);
CollisionHeader_GetVirtual(&D_06002D30, &header);
CollisionHeader_GetVirtual(&object_fu_kaiten_Colheader_002D30, &header);
this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, header);
this->bounceHeight = 0.0;
@ -82,6 +80,6 @@ void BgFuKaiten_Draw(Actor* thisx, GlobalContext* globalCtx) {
func_8012C28C(globalCtx->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, D_060005D0);
gSPDisplayList(POLY_OPA_DISP++, object_fu_kaiten_DL_0005D0);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}

14
src/overlays/actors/ovl_Bg_Goron_Oyu/z_bg_goron_oyu.c
View File

@ -5,6 +5,7 @@
*/
#include "z_bg_goron_oyu.h"
#include "objects/object_oyu/object_oyu.h"
#define FLAGS 0x00000030
@ -34,11 +35,6 @@ const ActorInit Bg_Goron_Oyu_InitVars = {
(ActorFunc)BgGoronOyu_Draw,
};
extern Gfx D_06000080;
extern Gfx D_06000158;
extern AnimatedMaterial D_06000968;
extern CollisionHeader D_06000988;
void func_80B40080(BgGoronOyu* this) {
this->unk_17E = 1;
this->actionFunc = func_80B400C8;
@ -157,7 +153,7 @@ void BgGoronOyu_Init(Actor* thisx, GlobalContext* globalCtx) {
Actor_SetScale(&this->dyna.actor, 0.1f);
DynaPolyActor_Init(&this->dyna, 1);
CollisionHeader_GetVirtual(&D_06000988, &colHeader);
CollisionHeader_GetVirtual(&object_oyu_Colheader_000988, &colHeader);
this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader);
@ -188,9 +184,9 @@ void BgGoronOyu_Update(Actor* thisx, GlobalContext* globalCtx) {
void BgGoronOyu_Draw(Actor* thisx, GlobalContext* globalCtx) {
OPEN_DISPS(globalCtx->state.gfxCtx);
func_8012C2DC(globalCtx->state.gfxCtx);
AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(&D_06000968));
AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(object_oyu_Matanimheader_000968));
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, &D_06000158);
gSPDisplayList(POLY_XLU_DISP++, &D_06000080);
gSPDisplayList(POLY_XLU_DISP++, &object_oyu_DL_000158);
gSPDisplayList(POLY_XLU_DISP++, &object_oyu_DL_000080);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}

8
src/overlays/actors/ovl_Bg_Haka_Curtain/z_bg_haka_curtain.c
View File

@ -5,6 +5,7 @@
*/
#include "z_bg_haka_curtain.h"
#include "objects/object_haka_obj/object_haka_obj.h"
#define FLAGS 0x00000010
@ -44,15 +45,12 @@ static InitChainEntry sInitChain[] = {
ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP),
};
extern CollisionHeader D_06001588;
extern Gfx D_06001410[];
void BgHakaCurtain_Init(Actor* thisx, GlobalContext* globalCtx) {
BgHakaCurtain* this = THIS;
Actor_ProcessInitChain(&this->dyna.actor, sInitChain);
DynaPolyActor_Init(&this->dyna, 1);
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &D_06001588);
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &object_haka_obj_Colheader_001588);
if (Flags_GetClear(globalCtx, this->dyna.actor.room)) {
func_80B6DE80(this);
return;
@ -137,5 +135,5 @@ void BgHakaCurtain_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void BgHakaCurtain_Draw(Actor* thisx, GlobalContext* globalCtx) {
Gfx_DrawDListOpa(globalCtx, D_06001410);
Gfx_DrawDListOpa(globalCtx, object_haka_obj_DL_001410);
}

8
src/overlays/actors/ovl_Bg_Haka_Tomb/z_bg_haka_tomb.c
View File

@ -5,6 +5,7 @@
*/
#include "z_bg_haka_tomb.h"
#include "objects/object_haka_obj/object_haka_obj.h"
#define FLAGS 0x00000000
@ -22,9 +23,6 @@ void func_80BD6768(BgHakaTomb* this, GlobalContext* globalCtx);
void BgHakaTomb_SetupDoNothing(BgHakaTomb* this);
void BgHakaTomb_DoNothing(BgHakaTomb* this, GlobalContext* globalCtx);
extern CollisionHeader D_06000EE8[];
extern Gfx D_060007B0[];
const ActorInit Bg_Haka_Tomb_InitVars = {
ACTOR_BG_HAKA_TOMB,
ACTORCAT_BG,
@ -48,7 +46,7 @@ void BgHakaTomb_Init(Actor* thisx, GlobalContext* globalCtx) {
Actor_ProcessInitChain(&this->dyna.actor, sInitChain);
DynaPolyActor_Init(&this->dyna, 1);
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, D_06000EE8);
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &object_haka_obj_Colheader_000EE8);
func_8013E3B8(&this->dyna.actor, this->cutscenes, ARRAY_COUNT(this->cutscenes));
func_80BD6624(this);
}
@ -128,5 +126,5 @@ void BgHakaTomb_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void BgHakaTomb_Draw(Actor* thisx, GlobalContext* globalCtx) {
Gfx_DrawDListOpa(globalCtx, D_060007B0);
Gfx_DrawDListOpa(globalCtx, object_haka_obj_DL_0007B0);
}

21
src/overlays/actors/ovl_Bg_Hakugin_Post/z_bg_hakugin_post.c
View File

@ -5,6 +5,7 @@
*/
#include "z_bg_hakugin_post.h"
#include "objects/object_hakugin_obj/object_hakugin_obj.h"
#define FLAGS 0x00000030
@ -32,13 +33,6 @@ void func_80A9D3E4(BgHakuginPost* this);
void func_80A9D434(BgHakuginPost* this, GlobalContext* globalCtx);
void func_80A9D61C(Actor* thisx, GlobalContext* globalCtx);
extern Gfx D_0600C1A8[];
extern Gfx D_0600C568[];
extern Gfx D_0600CA38[];
extern Gfx D_0600CEC8[];
extern Gfx D_0600D098[];
extern CollisionHeader D_0600D3B0;
BgHakuginPostColliders D_80A9DDC0;
BgHakuginPostUnkStruct D_80A9E028;
@ -705,7 +699,7 @@ void BgHakuginPost_Init(Actor* thisx, GlobalContext* globalCtx) {
this->dyna.actor.shape.rot.x = 0;
this->dyna.actor.shape.rot.z = 0;
DynaPolyActor_Init(&this->dyna, 1);
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &D_0600D3B0);
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &object_hakugin_obj_Colheader_00D3B0);
func_80A9B3BC(this, globalCtx);
func_80A9CA94(this);
} else {
@ -996,13 +990,14 @@ void BgHakuginPost_Update(Actor* thisx, GlobalContext* globalCtx) {
void func_80A9D61C(Actor* thisx, GlobalContext* globalCtx) {
static Gfx* D_80A9D900[] = {
D_0600C1A8, D_0600C568, NULL, NULL, D_0600CA38, D_0600CEC8, NULL,
object_hakugin_obj_DL_00C1A8, object_hakugin_obj_DL_00C568, NULL, NULL,
object_hakugin_obj_DL_00CA38, object_hakugin_obj_DL_00CEC8, NULL,
};
static Gfx* D_80A9D91C[] = {
D_0600D098,
D_0600D098,
D_0600D098,
D_0600D098,
object_hakugin_obj_DL_00D098,
object_hakugin_obj_DL_00D098,
object_hakugin_obj_DL_00D098,
object_hakugin_obj_DL_00D098,
};
BgHakuginPost* this = THIS;
BgHakuginPostUnkStruct1* unkStruct1;

8
src/overlays/actors/ovl_Bg_Icicle/z_bg_icicle.c
View File

@ -5,6 +5,7 @@
*/
#include "z_bg_icicle.h"
#include "objects/object_icicle/object_icicle.h"
#define FLAGS 0x00000000
@ -60,9 +61,6 @@ static InitChainEntry sInitChain[] = {
ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP),
};
extern Gfx D_060000D0[];
extern CollisionHeader D_06000294;
void BgIcicle_Init(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgIcicle* this = THIS;
@ -71,7 +69,7 @@ void BgIcicle_Init(Actor* thisx, GlobalContext* globalCtx) {
Actor_ProcessInitChain(thisx, sInitChain);
DynaPolyActor_Init(&this->dyna, 0);
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &D_06000294);
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &object_icicle_Colheader_000294);
Collider_InitAndSetCylinder(globalCtx, &this->collider, thisx, &sCylinderInit);
Collider_UpdateCylinder(thisx, &this->collider);
@ -245,5 +243,5 @@ void BgIcicle_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void BgIcicle_Draw(Actor* thisx, GlobalContext* globalCtx) {
Gfx_DrawDListOpa(globalCtx, D_060000D0);
Gfx_DrawDListOpa(globalCtx, object_icicle_DL_0000D0);
}

8
src/overlays/actors/ovl_Bg_Ikana_Ray/z_bg_ikana_ray.c
View File

@ -5,6 +5,7 @@
*/
#include "z_bg_ikana_ray.h"
#include "objects/object_ikana_obj/object_ikana_obj.h"
#define FLAGS 0x00000000
@ -59,9 +60,6 @@ static InitChainEntry sInitChain[] = {
ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP),
};
extern Gfx D_06001100[];
extern AnimatedMaterial D_06001228[];
void BgIkanaRay_Init(Actor* thisx, GlobalContext* globalCtx) {
BgIkanaRay* this = THIS;
ColliderCylinder* collision = &this->collision;
@ -71,7 +69,7 @@ void BgIkanaRay_Init(Actor* thisx, GlobalContext* globalCtx) {
Collider_SetCylinder(globalCtx, collision, &this->actor, &sCylinderInit);
Collider_UpdateCylinder(&this->actor, &this->collision);
this->animatedTextures = (AnimatedMaterial*)Lib_SegmentedToVirtual(D_06001228);
this->animatedTextures = (AnimatedMaterial*)Lib_SegmentedToVirtual(object_ikana_obj_Matanimheader_001228);
if (Flags_GetSwitch(globalCtx, this->actor.params & 0x7F)) {
BgIkanaRay_SetActivated(this);
@ -119,5 +117,5 @@ void BgIkanaRay_Draw(Actor* thisx, GlobalContext* globalCtx) {
BgIkanaRay* this = THIS;
AnimatedMat_Draw(globalCtx, this->animatedTextures);
Gfx_DrawDListXlu(globalCtx, D_06001100);
Gfx_DrawDListXlu(globalCtx, object_ikana_obj_DL_001100);
}

8
src/overlays/actors/ovl_Bg_Ikana_Shutter/z_bg_ikana_shutter.c
View File

@ -5,6 +5,7 @@
*/
#include "z_bg_ikana_shutter.h"
#include "objects/object_ikana_obj/object_ikana_obj.h"
#define FLAGS 0x00000010
@ -53,9 +54,6 @@ static InitChainEntry sInitChain[] = {
ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP),
};
extern CollisionHeader D_06000F28;
extern Gfx D_06000CE8[];
s32 BgIkanaShutter_AllSwitchesPressed(BgIkanaShutter* this, GlobalContext* globalCtx) {
return Flags_GetSwitch(globalCtx, this->dyna.actor.params & 0x7F) &&
Flags_GetSwitch(globalCtx, (this->dyna.actor.params & 0x7F) + 1) &&
@ -68,7 +66,7 @@ void BgIkanaShutter_Init(Actor* thisx, GlobalContext* globalCtx) {
Actor_ProcessInitChain(&this->dyna.actor, sInitChain);
DynaPolyActor_Init(&this->dyna, 0);
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &D_06000F28);
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &object_ikana_obj_Colheader_000F28);
if (!((this->dyna.actor.params >> 8) & 1)) {
if (BgIkanaShutter_AllSwitchesPressed(this, globalCtx)) {
func_80BD599C(this);
@ -213,5 +211,5 @@ void BgIkanaShutter_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void BgIkanaShutter_Draw(Actor* thisx, GlobalContext* globalCtx) {
Gfx_DrawDListOpa(globalCtx, D_06000CE8);
Gfx_DrawDListOpa(globalCtx, object_ikana_obj_DL_000CE8);
}

11
src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.c
View File

@ -5,6 +5,7 @@
*/
#include "z_bg_iknin_susceil.h"
#include "objects/object_ikninside_obj/object_ikninside_obj.h"
#define FLAGS 0x00000030
@ -26,10 +27,6 @@ void func_80C0AD44(BgIkninSusceil* this);
void func_80C0AD64(BgIkninSusceil* this, GlobalContext* globalCtx);
void func_80C0AE5C(BgIkninSusceil* this, GlobalContext* globalCtx);
extern CollisionHeader D_0600CBAC;
extern AnimatedMaterial D_0600C670;
extern Gfx D_0600C308[];
const ActorInit Bg_Iknin_Susceil_InitVars = {
ACTOR_BG_IKNIN_SUSCEIL,
ACTORCAT_BG,
@ -116,8 +113,8 @@ void BgIkninSusceil_Init(Actor* thisx, GlobalContext* globalCtx) {
Actor_ProcessInitChain(&this->dyna.actor, sInitChain);
DynaPolyActor_Init(&this->dyna, 1);
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &D_0600CBAC);
this->animatedTexture = Lib_SegmentedToVirtual(&D_0600C670);
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &object_ikninside_obj_Colheader_00CBAC);
this->animatedTexture = Lib_SegmentedToVirtual(object_ikninside_obj_Matanimheader_00C670);
func_80C0AC74(this);
}
@ -260,5 +257,5 @@ void BgIkninSusceil_Draw(Actor* thisx, GlobalContext* globalCtx) {
BgIkninSusceil* this = THIS;
AnimatedMat_Draw(globalCtx, this->animatedTexture);
Gfx_DrawDListOpa(globalCtx, D_0600C308);
Gfx_DrawDListOpa(globalCtx, object_ikninside_obj_DL_00C308);
}

17
src/overlays/actors/ovl_Bg_Iknv_Obj/z_bg_iknv_obj.c
View File

@ -5,6 +5,7 @@
*/
#include "z_bg_iknv_obj.h"
#include "objects/object_iknv_obj/object_iknv_obj.h"
#define FLAGS 0x00000010
@ -20,12 +21,6 @@ void BgIknvObj_UpdateWaterwheel(BgIknvObj* this, GlobalContext* globalCtx);
void BgIknvObj_UpdateRaisedDoor(BgIknvObj* this, GlobalContext* globalCtx);
void BgIknvObj_UpdateSakonDoor(BgIknvObj* this, GlobalContext* globalCtx);
extern CollisionHeader D_060119D4;
extern CollisionHeader D_06012CA4;
extern Gfx D_06011880[];
extern Gfx D_060129C8[];
extern Gfx D_06013058[];
const ActorInit Bg_Iknv_Obj_InitVars = {
ACTOR_BG_IKNV_OBJ,
ACTORCAT_BG,
@ -67,24 +62,24 @@ void BgIknvObj_Init(Actor* thisx, GlobalContext* globalCtx) {
this->actionFunc = BgIknvObj_DoNothing;
switch (IKNV_OBJ_TYPE(this)) {
case IKNV_OBJ_WATERWHEEL:
this->displayListPtr = D_06013058;
this->displayListPtr = object_iknv_obj_DL_013058;
this->actionFunc = BgIknvObj_UpdateWaterwheel;
this->dyna.actor.flags |= 0x100000;
this->dyna.actor.flags |= 0x10;
break;
case IKNV_OBJ_RAISED_DOOR:
this->displayListPtr = D_06011880;
this->displayListPtr = object_iknv_obj_DL_011880;
DynaPolyActor_Init(&this->dyna, 0);
CollisionHeader_GetVirtual(&D_060119D4, &colHeader);
CollisionHeader_GetVirtual(&object_iknv_obj_Colheader_0119D4, &colHeader);
this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader);
this->actionFunc = BgIknvObj_UpdateRaisedDoor;
this->dyna.actor.world.pos.y = this->dyna.actor.home.pos.y + 120.0f;
break;
case IKNV_OBJ_SAKON_DOOR:
this->displayListPtr = D_060129C8;
this->displayListPtr = object_iknv_obj_DL_0129C8;
this->actionFunc = BgIknvObj_UpdateSakonDoor;
DynaPolyActor_Init(&this->dyna, 0);
CollisionHeader_GetVirtual(&D_06012CA4, &colHeader);
CollisionHeader_GetVirtual(&object_iknv_obj_Colheader_012CA4, &colHeader);
this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader);
Collider_InitAndSetCylinder(globalCtx, &this->collider, &this->dyna.actor, &sCylinderInit);
Collider_UpdateCylinder(&this->dyna.actor, &this->collider);

13
src/overlays/actors/ovl_Bg_Inibs_Movebg/z_bg_inibs_movebg.c
View File

@ -5,6 +5,7 @@
*/
#include "z_bg_inibs_movebg.h"
#include "objects/object_inibs_object/object_inibs_object.h"
#define FLAGS 0x00000030
@ -26,15 +27,9 @@ const ActorInit Bg_Inibs_Movebg_InitVars = {
(ActorFunc)BgInibsMovebg_Draw,
};
extern Gfx D_06001C10[];
extern Gfx D_06001DC0[];
extern AnimatedMaterial D_06002598;
extern Gfx D_06006140[];
extern Gfx D_060062D8[];
extern AnimatedMaterial D_06006858;
Gfx* D_80B96560[] = { D_060062D8, D_06001DC0 };
Gfx* D_80B96568[] = { D_06006140, D_06001C10 };
AnimatedMaterial* D_80B96570[] = { &D_06006858, &D_06002598 };
Gfx* D_80B96560[] = { object_inibs_object_DL_0062D8, object_inibs_object_DL_001DC0 };
Gfx* D_80B96568[] = { object_inibs_object_DL_006140, object_inibs_object_DL_001C10 };
AnimatedMaterial* D_80B96570[] = { object_inibs_object_Matanimheader_006858, object_inibs_object_Matanimheader_002598 };
static InitChainEntry sInitChain[] = {
ICHAIN_VEC3F_DIV1000(scale, 1000, ICHAIN_STOP),

20
src/overlays/actors/ovl_Bg_Keikoku_Spr/z_bg_keikoku_spr.c
View File

@ -5,6 +5,7 @@
*/
#include "z_bg_keikoku_spr.h"
#include "objects/object_keikoku_obj/object_keikoku_obj.h"
#define FLAGS 0x00000000
@ -34,13 +35,6 @@ static InitChainEntry sInitChain[] = {
ICHAIN_VEC3F_DIV1000(scale, 20, ICHAIN_STOP),
};
extern Gfx D_06000100[];
extern AnimatedMaterial D_060001F8;
extern Gfx D_06000300[];
extern AnimatedMaterial D_060003F8;
extern Gfx D_06000500[];
extern AnimatedMaterial D_060005F8;
void BgKeikokuSpr_Init(Actor* thisx, GlobalContext* globalCtx) {
Actor_ProcessInitChain(thisx, sInitChain);
}
@ -56,13 +50,13 @@ void BgKeikokuSpr_Draw(Actor* thisx, GlobalContext* globalCtx) {
OPEN_DISPS(globalCtx->state.gfxCtx);
AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(&D_060001F8));
AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(object_keikoku_obj_Matanimheader_0001F8));
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, D_06000100);
AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(&D_060003F8));
gSPDisplayList(POLY_XLU_DISP++, D_06000300);
AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(&D_060005F8));
gSPDisplayList(POLY_XLU_DISP++, D_06000500);
gSPDisplayList(POLY_XLU_DISP++, object_keikoku_obj_DL_000100);
AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(object_keikoku_obj_Matanimheader_0003F8));
gSPDisplayList(POLY_XLU_DISP++, object_keikoku_obj_DL_000300);
AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(object_keikoku_obj_Matanimheader_0005F8));
gSPDisplayList(POLY_XLU_DISP++, object_keikoku_obj_DL_000500);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}

8
src/overlays/actors/ovl_Bg_Kin2_Fence/z_bg_kin2_fence.c
View File

@ -5,6 +5,7 @@
*/
#include "z_bg_kin2_fence.h"
#include "objects/object_kin2_obj/object_kin2_obj.h"
#define FLAGS 0x00000010
@ -118,9 +119,6 @@ static InitChainEntry sInitChain[] = {
ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP),
};
extern Gfx D_06000828[];
extern CollisionHeader D_06000908;
s32 BgKin2Fence_CheckHitMask(BgKin2Fence* this) {
ColliderJntSphElement* elements = this->collider.elements;
@ -159,7 +157,7 @@ void BgKin2Fence_Init(Actor* thisx, GlobalContext* globalCtx) {
Actor_ProcessInitChain(&this->dyna.actor, sInitChain);
DynaPolyActor_Init(&this->dyna, 0);
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &D_06000908);
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &object_kin2_obj_Colheader_000908);
Collider_InitJntSph(globalCtx, &this->collider);
Collider_SetJntSph(globalCtx, &this->collider, &this->dyna.actor, &sJntSphInit, this->colliderElements);
Matrix_SetStateRotationAndTranslation(this->dyna.actor.world.pos.x, this->dyna.actor.world.pos.y,
@ -272,5 +270,5 @@ void BgKin2Fence_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void BgKin2Fence_Draw(Actor* thisx, GlobalContext* globalCtx) {
Gfx_DrawDListOpa(globalCtx, D_06000828);
Gfx_DrawDListOpa(globalCtx, object_kin2_obj_DL_000828);
}

27
src/overlays/actors/ovl_Bg_Ladder/z_bg_ladder.c
View File

@ -5,6 +5,7 @@
*/
#include "z_bg_ladder.h"
#include "objects/object_ladder/object_ladder.h"
#define FLAGS 0x00000010
@ -19,16 +20,6 @@ void BgLadder_ActionStartCutscene(BgLadder* this, GlobalContext* globalCtx);
void BgLadder_ActionFadeIn(BgLadder* this, GlobalContext* globalCtx);
void BgLadder_ActionIdle(BgLadder* this, GlobalContext* globalCtx);
extern Gfx D_060000A0[];
extern Gfx D_060002D0[];
extern Gfx D_06000500[];
extern Gfx D_06000730[];
extern CollisionHeader D_060001D8;
extern CollisionHeader D_06000408;
extern CollisionHeader D_06000638;
extern CollisionHeader D_06000868;
const ActorInit Bg_Ladder_InitVars = {
ACTOR_BG_LADDER,
ACTORCAT_PROP,
@ -46,10 +37,10 @@ static InitChainEntry sInitChain[] = {
};
static Gfx* sLadderDLists[] = {
D_060000A0, // 12 Rung
D_060002D0, // 16 Rung
D_06000500, // 20 Rung
D_06000730, // 24 Rung
object_ladder_DL_0000A0, // 12 Rung
object_ladder_DL_0002D0, // 16 Rung
object_ladder_DL_000500, // 20 Rung
object_ladder_DL_000730, // 24 Rung
};
void BgLadder_Init(Actor* thisx, GlobalContext* globalCtx) {
@ -65,13 +56,13 @@ void BgLadder_Init(Actor* thisx, GlobalContext* globalCtx) {
size = thisx->params;
if (size == LADDER_SIZE_12RUNG) {
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &D_060001D8);
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &object_ladder_Colheader_0001D8);
} else if (size == LADDER_SIZE_16RUNG) {
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &D_06000408);
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &object_ladder_Colheader_000408);
} else if (size == LADDER_SIZE_20RUNG) {
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &D_06000638);
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &object_ladder_Colheader_000638);
} else if (size == LADDER_SIZE_24RUNG) {
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &D_06000868);
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &object_ladder_Colheader_000868);
} else {
Actor_MarkForDeath(&this->dyna.actor);
return;

8
src/overlays/actors/ovl_Bg_Lbfshot/z_bg_lbfshot.c
View File

@ -5,6 +5,7 @@
*/
#include "z_bg_lbfshot.h"
#include "objects/object_lbfshot/object_lbfshot.h"
#define FLAGS 0x00000000
@ -30,16 +31,13 @@ static InitChainEntry sInitChain[] = {
ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP),
};
extern CollisionHeader D_060014D8;
extern Gfx D_06000228[];
void BgLbfshot_Init(Actor* thisx, GlobalContext* globalCtx) {
BgLbfshot* this = THIS;
Actor_ProcessInitChain(&this->dyna.actor, sInitChain);
this->dyna.actor.uncullZoneForward = 4000.0f;
DynaPolyActor_Init(&this->dyna, 1);
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &D_060014D8);
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &object_lbfshot_Colheader_0014D8);
}
void BgLbfshot_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgLbfshot* this = THIS;
@ -47,5 +45,5 @@ void BgLbfshot_Destroy(Actor* thisx, GlobalContext* globalCtx) {
DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
}
void BgLbfshot_Draw(Actor* thisx, GlobalContext* globalCtx) {
Gfx_DrawDListOpa(globalCtx, D_06000228);
Gfx_DrawDListOpa(globalCtx, object_lbfshot_DL_000228);
}

8
src/overlays/actors/ovl_Bg_Lotus/z_bg_lotus.c
View File

@ -5,6 +5,7 @@
*/
#include "z_bg_lotus.h"
#include "objects/object_lotus/object_lotus.h"
#define FLAGS 0x00000000
@ -35,9 +36,6 @@ static InitChainEntry sInitChain[] = {
ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP),
};
extern CollisionHeader D_06000A20; // Lilypad collision
extern Gfx D_06000040[]; // Lilypad model
void BgLotus_Init(Actor* thisx, GlobalContext* globalCtx) {
BgLotus* this = THIS;
s32 pad;
@ -45,7 +43,7 @@ void BgLotus_Init(Actor* thisx, GlobalContext* globalCtx) {
Actor_ProcessInitChain(&this->dyna.actor, sInitChain);
DynaPolyActor_Init(&this->dyna, 1);
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &D_06000A20);
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &object_lotus_Colheader_000A20);
this->dyna.actor.floorHeight = BgCheck_EntityRaycastFloor5(&globalCtx->colCtx, &thisx->floorPoly, &bgId,
&this->dyna.actor, &this->dyna.actor.world.pos);
this->timer2 = 96;
@ -173,5 +171,5 @@ void BgLotus_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void BgLotus_Draw(Actor* thisx, GlobalContext* globalCtx) {
Gfx_DrawDListOpa(globalCtx, D_06000040);
Gfx_DrawDListOpa(globalCtx, object_lotus_DL_000040);
}

9
src/overlays/actors/ovl_Bg_Market_Step/z_bg_market_step.c
View File

@ -5,6 +5,7 @@
*/
#include "z_bg_market_step.h"
#include "objects/object_market_obj/object_market_obj.h"
#define FLAGS 0x10000020
@ -26,12 +27,8 @@ static InitChainEntry sInitChain[] = {
ICHAIN_VEC3F_DIV1000(scale, 1000, ICHAIN_STOP),
};
extern Gfx D_0601F050[];
extern Gfx D_06018DA0[];
extern Gfx D_0601EF10[];
extern Gfx D_06018C60[];
Gfx* D_80AF0120[] = { D_0601F050, D_06018DA0 };
Gfx* D_80AF0128[] = { D_0601EF10, D_06018C60 };
Gfx* D_80AF0120[] = { object_market_obj_DL_01F050, object_market_obj_DL_018DA0 };
Gfx* D_80AF0128[] = { object_market_obj_DL_01EF10, object_market_obj_DL_018C60 };
void BgMarketStep_Init(Actor* thisx, GlobalContext* globalCtx) {
BgMarketStep* this = THIS;

8
src/overlays/actors/ovl_Bg_Mbar_Chair/z_bg_mbar_chair.c
View File

@ -5,6 +5,7 @@
*/
#include "z_bg_mbar_chair.h"
#include "objects/object_mbar_obj/object_mbar_obj.h"
#define FLAGS 0x00000000
@ -34,15 +35,12 @@ static InitChainEntry sInitChain[] = {
ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP),
};
extern CollisionHeader D_060019B4;
extern Gfx D_06000288[];
void BgMbarChair_Init(Actor* thisx, GlobalContext* globalCtx) {
BgMbarChair* this = THIS;
Actor_ProcessInitChain(&this->dyna.actor, sInitChain);
DynaPolyActor_Init(&this->dyna, 0);
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &D_060019B4);
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &object_mbar_obj_Colheader_0019B4);
}
void BgMbarChair_Destroy(Actor* thisx, GlobalContext* globalCtx) {
@ -55,5 +53,5 @@ void BgMbarChair_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void BgMbarChair_Draw(Actor* thisx, GlobalContext* globalCtx) {
Gfx_DrawDListOpa(globalCtx, D_06000288);
Gfx_DrawDListOpa(globalCtx, object_mbar_obj_DL_000288);
}

8
src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.c
View File

@ -5,6 +5,7 @@
*/
#include "z_bg_tobira01.h"
#include "objects/object_spot11_obj/object_spot11_obj.h"
#define FLAGS 0x00000030
@ -27,9 +28,6 @@ const ActorInit Bg_Tobira01_InitVars = {
(ActorFunc)BgTobira01_Draw,
};
extern Gfx D_06000088[];
extern CollisionHeader D_060011C0;
void BgTobira01_Open(BgTobira01* this, GlobalContext* globalCtx) {
Player* player = GET_PLAYER(globalCtx);
s16 cutsceneId = this->dyna.actor.cutscene;
@ -80,7 +78,7 @@ void BgTobira01_Init(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
DynaPolyActor_Init(&this->dyna, 1);
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &D_060011C0);
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &object_spot11_obj_Colheader_0011C0);
gSaveContext.weekEventReg[88] &= (u8)~0x40;
Actor_SetScale(&this->dyna.actor, 1.0f);
this->timer2 = gSaveContext.isNight;
@ -107,7 +105,7 @@ void BgTobira01_Draw(Actor* thisx, GlobalContext* globalCtx) {
func_8012C28C(globalCtx->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, D_06000088);
gSPDisplayList(POLY_OPA_DISP++, object_spot11_obj_DL_000088);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}

75
src/overlays/actors/ovl_Boss_02/z_boss_02.c
View File

@ -7,6 +7,8 @@
#include "z_boss_02.h"
#include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h"
#include "overlays/actors/ovl_Item_B_Heart/z_item_b_heart.h"
#include "objects/object_boss02/object_boss02.h"
#include "objects/gameplay_keep/gameplay_keep.h"
#define FLAGS 0x00000035
@ -29,36 +31,6 @@ void func_809DD2F8(GlobalContext* globalCtx);
void func_809DD934(Boss02* this, GlobalContext* globalCtx);
void func_809DEAC4(Boss02* this, GlobalContext* globalCtx);
extern Gfx D_06000230[];
extern Gfx D_060002E0[];
extern UNK_TYPE D_060003A0;
extern UNK_TYPE D_060041A0;
extern UNK_TYPE D_06008650;
extern SkeletonHeader D_06009B10;
extern AnimationHeader D_06009C78;
extern Gfx D_0600ECF0[];
extern Gfx D_0600EF90[];
extern Gfx D_0600F310[];
extern Gfx D_0600F690[];
extern Gfx D_0600FA10[];
extern Gfx D_0600FD90[];
extern Gfx D_06010110[];
extern Gfx D_06010490[];
extern Gfx D_06010810[];
extern Gfx D_06010B90[];
extern Gfx D_06010F10[];
extern Gfx D_06011290[];
extern Gfx D_06011610[];
extern Gfx D_06011990[];
extern Gfx D_06011D10[];
extern Gfx D_06012090[];
extern Gfx D_06012410[];
extern Gfx D_06012790[];
extern Gfx D_06012B10[];
extern Gfx D_06012E90[];
extern Gfx D_06013210[];
extern Gfx D_06013590[];
static u8 D_809E0420;
static u8 D_809E0421;
static u8 D_809E0422;
@ -624,7 +596,8 @@ void Boss02_Init(Actor* thisx, GlobalContext* globalCtx) {
this->actor.colChkInfo.mass = MASS_HEAVY;
this->actor.colChkInfo.health = 20;
Actor_SetScale(&this->actor, 0.01f);
SkelAnime_Init(globalCtx, &this->skelAnime, &D_06009B10, &D_06009C78, this->jointTable, this->morphTable, 13);
SkelAnime_Init(globalCtx, &this->skelAnime, &object_boss02_Skel_009B10, &object_boss02_Anim_009C78,
this->jointTable, this->morphTable, 13);
Collider_InitAndSetJntSph(globalCtx, &this->colliderSphere1, &this->actor, &sJntSphInit1,
this->colliderSphere1Elements);
Collider_InitAndSetJntSph(globalCtx, &this->colliderSphere2, &this->actor, &sJntSphInit2,
@ -663,7 +636,7 @@ void func_809DAA98(Boss02* this, GlobalContext* globalCtx) {
void func_809DAAA8(Boss02* this, GlobalContext* globalCtx) {
this->actionFunc = func_809DAB78;
Animation_MorphToLoop(&this->skelAnime, &D_06009C78, 0.0f);
Animation_MorphToLoop(&this->skelAnime, &object_boss02_Anim_009C78, 0.0f);
if (D_809E042C->unk_1D20 != 0) {
this->unk_0144 = 10;
} else {
@ -1351,9 +1324,12 @@ void func_809DC78C(Actor* thisx, GlobalContext* globalCtx) {
// matrix stuff at the start?
void Boss02_Draw(Actor* thisx, GlobalContext* globalCtx2) {
static Gfx* D_809DFA9C[] = {
D_0600ECF0, D_0600EF90, D_0600F310, D_0600F690, D_0600FA10, D_0600FD90, D_06010110, D_06010490,
D_06010810, D_06010B90, D_06010F10, D_06011290, D_06011610, D_06011990, D_06011D10, D_06012090,
D_06012410, D_06012790, D_06012B10, D_06012E90, D_06013210, D_06013590,
object_boss02_DL_00ECF0, object_boss02_DL_00EF90, object_boss02_DL_00F310, object_boss02_DL_00F690,
object_boss02_DL_00FA10, object_boss02_DL_00FD90, object_boss02_DL_010110, object_boss02_DL_010490,
object_boss02_DL_010810, object_boss02_DL_010B90, object_boss02_DL_010F10, object_boss02_DL_011290,
object_boss02_DL_011610, object_boss02_DL_011990, object_boss02_DL_011D10, object_boss02_DL_012090,
object_boss02_DL_012410, object_boss02_DL_012790, object_boss02_DL_012B10, object_boss02_DL_012E90,
object_boss02_DL_013210, object_boss02_DL_013590,
};
static Vec3f D_809DFAF4 = { -10000.0f, -100000.0f, -100000.0f };
Boss02* this = THIS;
@ -1378,9 +1354,9 @@ void Boss02_Draw(Actor* thisx, GlobalContext* globalCtx2) {
func_8012C28C(globalCtx->state.gfxCtx);
if (this->actor.params == 0) {
gSPSegment(POLY_OPA_DISP++, 0x08, Lib_SegmentedToVirtual(&D_060003A0));
gSPSegment(POLY_OPA_DISP++, 0x08, Lib_SegmentedToVirtual(object_boss02_Tex_0003A0));
} else {
gSPSegment(POLY_OPA_DISP++, 0x08, Lib_SegmentedToVirtual(&D_060041A0));
gSPSegment(POLY_OPA_DISP++, 0x08, Lib_SegmentedToVirtual(object_boss02_Tex_0041A0));
}
gSPSegment(POLY_OPA_DISP++, 0x0D, matrix);
@ -1490,9 +1466,12 @@ void Boss02_Draw(Actor* thisx, GlobalContext* globalCtx2) {
}
#else
static Gfx* D_809DFA9C[] = {
D_0600ECF0, D_0600EF90, D_0600F310, D_0600F690, D_0600FA10, D_0600FD90, D_06010110, D_06010490,
D_06010810, D_06010B90, D_06010F10, D_06011290, D_06011610, D_06011990, D_06011D10, D_06012090,
D_06012410, D_06012790, D_06012B10, D_06012E90, D_06013210, D_06013590,
object_boss02_DL_00ECF0, object_boss02_DL_00EF90, object_boss02_DL_00F310, object_boss02_DL_00F690,
object_boss02_DL_00FA10, object_boss02_DL_00FD90, object_boss02_DL_010110, object_boss02_DL_010490,
object_boss02_DL_010810, object_boss02_DL_010B90, object_boss02_DL_010F10, object_boss02_DL_011290,
object_boss02_DL_011610, object_boss02_DL_011990, object_boss02_DL_011D10, object_boss02_DL_012090,
object_boss02_DL_012410, object_boss02_DL_012790, object_boss02_DL_012B10, object_boss02_DL_012E90,
object_boss02_DL_013210, object_boss02_DL_013590,
};
static Vec3f D_809DFAF4 = { -10000.0f, -100000.0f, -100000.0f };
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Boss_02/Boss02_Draw.s")
@ -1562,7 +1541,7 @@ void func_809DD2F8(GlobalContext* globalCtx) {
for (i = 0; i < ARRAY_COUNT(D_809E0438); i++, effect++) {
if (effect->unk_24 == 1) {
if (!flag) {
gSPDisplayList(POLY_XLU_DISP++, D_06000230);
gSPDisplayList(POLY_XLU_DISP++, object_boss02_DL_000230);
gDPSetEnvColor(POLY_XLU_DISP++, 185, 140, 70, 128);
flag++;
}
@ -1583,7 +1562,7 @@ void func_809DD2F8(GlobalContext* globalCtx) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, D_060002E0);
gSPDisplayList(POLY_XLU_DISP++, object_boss02_DL_0002E0);
}
}
@ -1604,7 +1583,7 @@ void func_809DD2F8(GlobalContext* globalCtx) {
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, D_0401A620);
gSPDisplayList(POLY_OPA_DISP++, gameplay_keep_DL_01A620);
}
}
@ -1612,7 +1591,7 @@ void func_809DD2F8(GlobalContext* globalCtx) {
for (i = 0, flag = false; i < ARRAY_COUNT(D_809E0438); i++, effect++) {
if (effect->unk_24 == 4) {
if (!flag) { //! @bug - dev forgot to set flag to 1, should only apply to first entry?
gSPDisplayList(POLY_XLU_DISP++, D_04023348);
gSPDisplayList(POLY_XLU_DISP++, gameplay_keep_DL_023348);
gDPSetEnvColor(POLY_XLU_DISP++, 255, 0, 0, 128);
}
@ -1624,7 +1603,7 @@ void func_809DD2F8(GlobalContext* globalCtx) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, D_04023428);
gSPDisplayList(POLY_XLU_DISP++, gameplay_keep_DL_023428);
}
}
@ -1632,7 +1611,7 @@ void func_809DD2F8(GlobalContext* globalCtx) {
for (i = 0, flag = false; i < ARRAY_COUNT(D_809E0438); i++, effect++) {
if (effect->unk_24 == 2) {
if (!flag) {
gSPDisplayList(POLY_XLU_DISP++, D_06000230);
gSPDisplayList(POLY_XLU_DISP++, object_boss02_DL_000230);
gDPSetEnvColor(POLY_XLU_DISP++, 30, 30, 30, 128);
flag++;
}
@ -1648,7 +1627,7 @@ void func_809DD2F8(GlobalContext* globalCtx) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, D_060002E0);
gSPDisplayList(POLY_XLU_DISP++, object_boss02_DL_0002E0);
}
}
@ -2178,7 +2157,7 @@ void func_809DEAC4(Boss02* this, GlobalContext* globalCtx) {
if (this->unk_1D1C == (u32)(KREG(92) + 125)) {
TitleCard_InitBossName(&globalCtx->state, &globalCtx->actorCtx.titleCtxt,
Lib_SegmentedToVirtual(&D_06008650), 160, 180, 128, 40);
Lib_SegmentedToVirtual(object_boss02_Tex_008650), 160, 180, 128, 40);
}
if (this->unk_1D1C == (u32)(BREG(27) + 335)) {

18
src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c
View File

@ -5,6 +5,8 @@
*/
#include "z_demo_kankyo.h"
#include "objects/gameplay_keep/gameplay_keep.h"
#include "objects/object_bubble/object_bubble.h"
#define FLAGS 0x00000030
@ -17,10 +19,6 @@ void DemoKankyo_Draw(Actor* thisx, GlobalContext* globalCtx);
void DemoKakyo_MoonSparklesActionFunc(DemoKankyo* this, GlobalContext* globalCtx);
extern Gfx D_0407AB58[];
extern Gfx D_06001000[]; // the bubble display list used by shabom in giants type
extern Gfx D_04023428[];
static u8 sLostWoodsSparklesMutex = false; // make sure only one can exist at once
static s16 sLostWoodsSkyFishParticleNum = 0;
@ -525,8 +523,8 @@ void DemoKakyo_DrawLostWoodsSparkle(Actor* thisx, GlobalContext* globalCtx2) {
POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, 20);
gSPSegment(POLY_XLU_DISP++, 0x08, Lib_SegmentedToVirtual(&D_04079B10));
gSPDisplayList(POLY_XLU_DISP++, D_0407AB10);
gSPSegment(POLY_XLU_DISP++, 0x08, Lib_SegmentedToVirtual(gameplay_keep_Tex_079B10));
gSPDisplayList(POLY_XLU_DISP++, gameplay_keep_DL_07AB10);
for (i = 0; i < globalCtx->envCtx.unk_F2[3]; i++) {
worldPos.x = this->particles[i].posBase.x + this->particles[i].posOffset.x;
@ -593,7 +591,7 @@ void DemoKakyo_DrawLostWoodsSparkle(Actor* thisx, GlobalContext* globalCtx2) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, D_0407AB58);
gSPDisplayList(POLY_XLU_DISP++, gameplay_keep_DL_07AB58);
}
}
@ -657,7 +655,7 @@ void DemoKankyo_DrawMoonAndGiant(Actor* thisx, GlobalContext* globalCtx2) {
break;
}
gSPDisplayList(POLY_XLU_DISP++, &D_04023348);
gSPDisplayList(POLY_XLU_DISP++, &gameplay_keep_DL_023348);
Matrix_InsertMatrix(&globalCtx->billboardMtxF, MTXMODE_APPLY);
@ -667,9 +665,9 @@ void DemoKankyo_DrawMoonAndGiant(Actor* thisx, GlobalContext* globalCtx2) {
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
if (this->actor.params == DEMO_KANKYO_TYPE_GIANTS) {
gSPDisplayList(POLY_XLU_DISP++, D_06001000);
gSPDisplayList(POLY_XLU_DISP++, object_bubble_DL_001000);
} else {
gSPDisplayList(POLY_XLU_DISP++, D_04023428);
gSPDisplayList(POLY_XLU_DISP++, gameplay_keep_DL_023428);
}
}
}

73
src/overlays/actors/ovl_Dm_Char07/z_dm_char07.c
View File

@ -5,6 +5,7 @@
*/
#include "z_dm_char07.h"
#include "objects/object_milkbar/object_milkbar.h"
#define FLAGS 0x00000030
@ -29,24 +30,6 @@ const ActorInit Dm_Char07_InitVars = {
(ActorFunc)DmChar07_Draw,
};
extern Gfx D_06000100[];
extern Gfx D_06000240[];
extern Gfx D_06000650[];
extern Gfx D_06000790[];
extern Gfx D_06000B80[];
extern Gfx D_06000CC0[];
extern Gfx D_060010D0[];
extern Gfx D_06001210[];
extern Gfx D_060015E0[];
extern Gfx D_060016B8[];
extern Gfx D_06002BA0[];
extern Gfx D_06002CD0[];
extern CollisionHeader D_06006688;
extern Gfx D_060076A0[];
extern Gfx D_06007918[];
extern AnimatedMaterial D_060105F8;
extern Gfx D_06010D68[];
void DmChar07_SetupAction(DmChar07* this, DmChar07ActionFunc actionFunc) {
this->actionFunc = actionFunc;
}
@ -62,7 +45,7 @@ void DmChar07_Init(Actor* thisx, GlobalContext* globalCtx) {
Actor_SetScale(&this->dyna.actor, 0.1f);
this->isStage = 1;
DynaPolyActor_Init(&this->dyna, 0);
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &D_06006688);
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &object_milkbar_Colheader_006688);
} else {
Actor_SetScale(&this->dyna.actor, 1.0f);
}
@ -96,36 +79,36 @@ void DmChar07_Draw(Actor* thisx, GlobalContext* globalCtx) {
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
switch (this->dyna.actor.params) {
case DMCHAR07_STAGE:
gSPDisplayList(POLY_OPA_DISP++, D_06002CD0);
gSPDisplayList(POLY_OPA_DISP++, object_milkbar_DL_002CD0);
break;
case DMCHAR07_CREDITS_STAGE:
AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(&D_060105F8));
gSPDisplayList(POLY_OPA_DISP++, D_06007918);
gSPDisplayList(POLY_OPA_DISP++, D_06000240);
gSPDisplayList(POLY_OPA_DISP++, D_06000790);
gSPDisplayList(POLY_OPA_DISP++, D_06000CC0);
gSPDisplayList(POLY_OPA_DISP++, D_06001210);
gSPDisplayList(POLY_OPA_DISP++, D_060016B8);
AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(object_milkbar_Matanimheader_0105F8));
gSPDisplayList(POLY_OPA_DISP++, object_milkbar_DL_007918);
gSPDisplayList(POLY_OPA_DISP++, object_milkbar_DL_000240);
gSPDisplayList(POLY_OPA_DISP++, object_milkbar_DL_000790);
gSPDisplayList(POLY_OPA_DISP++, object_milkbar_DL_000CC0);
gSPDisplayList(POLY_OPA_DISP++, object_milkbar_DL_001210);
gSPDisplayList(POLY_OPA_DISP++, object_milkbar_DL_0016B8);
break;
case DMCHAR07_SPOTLIGHTS:
if (this->spotlightFlags & DMCHAR07_STAGE_RIGHT_SPOTLIGHT) {
gSPDisplayList(POLY_OPA_DISP++, D_06000240);
gSPDisplayList(POLY_OPA_DISP++, object_milkbar_DL_000240);
}
if (this->spotlightFlags & DMCHAR07_UPSTAGE_RIGHT_SPOTLIGHT) {
gSPDisplayList(POLY_OPA_DISP++, D_06000790);
gSPDisplayList(POLY_OPA_DISP++, object_milkbar_DL_000790);
}
if (this->spotlightFlags & DMCHAR07_STAGE_CENTER_SPOTLIGHT) {
gSPDisplayList(POLY_OPA_DISP++, D_06000CC0);
gSPDisplayList(POLY_OPA_DISP++, object_milkbar_DL_000CC0);
}
if (this->spotlightFlags & DMCHAR07_UPSTAGE_LEFT_SPOTLIGHT) {
gSPDisplayList(POLY_OPA_DISP++, D_06001210);
gSPDisplayList(POLY_OPA_DISP++, object_milkbar_DL_001210);
}
if (this->spotlightFlags & DMCHAR07_DOWNSTAGE_CENTER_SPOTLIGHT) {
gSPDisplayList(POLY_OPA_DISP++, D_060016B8);
gSPDisplayList(POLY_OPA_DISP++, object_milkbar_DL_0016B8);
}
break;
case DMCHAR07_DISHES:
gSPDisplayList(POLY_OPA_DISP++, D_06010D68);
gSPDisplayList(POLY_OPA_DISP++, object_milkbar_DL_010D68);
break;
}
@ -133,31 +116,31 @@ void DmChar07_Draw(Actor* thisx, GlobalContext* globalCtx) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
switch (this->dyna.actor.params) {
case DMCHAR07_STAGE:
gSPDisplayList(POLY_XLU_DISP++, D_06002BA0);
gSPDisplayList(POLY_XLU_DISP++, object_milkbar_DL_002BA0);
break;
case DMCHAR07_CREDITS_STAGE:
gSPDisplayList(POLY_XLU_DISP++, D_060076A0);
gSPDisplayList(POLY_XLU_DISP++, D_06000100);
gSPDisplayList(POLY_XLU_DISP++, D_06000650);
gSPDisplayList(POLY_XLU_DISP++, D_06000B80);
gSPDisplayList(POLY_XLU_DISP++, D_060010D0);
gSPDisplayList(POLY_XLU_DISP++, D_060015E0);
gSPDisplayList(POLY_XLU_DISP++, object_milkbar_DL_0076A0);
gSPDisplayList(POLY_XLU_DISP++, object_milkbar_DL_000100);
gSPDisplayList(POLY_XLU_DISP++, object_milkbar_DL_000650);
gSPDisplayList(POLY_XLU_DISP++, object_milkbar_DL_000B80);
gSPDisplayList(POLY_XLU_DISP++, object_milkbar_DL_0010D0);
gSPDisplayList(POLY_XLU_DISP++, object_milkbar_DL_0015E0);
break;
case DMCHAR07_SPOTLIGHTS:
if (this->spotlightFlags & DMCHAR07_STAGE_RIGHT_SPOTLIGHT) {
gSPDisplayList(POLY_OPA_DISP++, D_06000100);
gSPDisplayList(POLY_OPA_DISP++, object_milkbar_DL_000100);
}
if (this->spotlightFlags & DMCHAR07_UPSTAGE_RIGHT_SPOTLIGHT) {
gSPDisplayList(POLY_OPA_DISP++, D_06000650);
gSPDisplayList(POLY_OPA_DISP++, object_milkbar_DL_000650);
}
if (this->spotlightFlags & DMCHAR07_STAGE_CENTER_SPOTLIGHT) {
gSPDisplayList(POLY_OPA_DISP++, D_06000B80);
gSPDisplayList(POLY_OPA_DISP++, object_milkbar_DL_000B80);
}
if (this->spotlightFlags & DMCHAR07_UPSTAGE_LEFT_SPOTLIGHT) {
gSPDisplayList(POLY_OPA_DISP++, D_060010D0);
gSPDisplayList(POLY_OPA_DISP++, object_milkbar_DL_0010D0);
}
if (this->spotlightFlags & DMCHAR07_DOWNSTAGE_CENTER_SPOTLIGHT) {
gSPDisplayList(POLY_OPA_DISP++, D_060015E0);
gSPDisplayList(POLY_OPA_DISP++, object_milkbar_DL_0015E0);
}
break;
case DMCHAR07_DISHES:

9
src/overlays/actors/ovl_Dm_Nb/z_dm_nb.c
View File

@ -5,6 +5,7 @@
*/
#include "z_dm_nb.h"
#include "objects/object_nb/object_nb.h"
#define FLAGS 0x00000009
@ -27,10 +28,7 @@ const ActorInit Dm_Nb_InitVars = {
(ActorFunc)DmNb_Draw,
};
extern AnimationHeader D_06000990;
extern FlexSkeletonHeader D_06008C40;
static ActorAnimationEntryS D_80C1E200[] = { &D_06000990, 1.0f, 0, -1, 0, 0 };
static ActorAnimationEntryS D_80C1E200[] = { &object_nb_Anim_000990, 1.0f, 0, -1, 0, 0 };
s32 func_80C1DED0(DmNb* this, s32 arg1) {
s32 ret = 0;
@ -72,7 +70,8 @@ void DmNb_Init(Actor* thisx, GlobalContext* globalCtx) {
DmNb* this = THIS;
ActorShape_Init(&this->actor.shape, 0.0f, NULL, 0.0f);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06008C40, NULL, this->jointTable, this->morphTable, 8);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_nb_Skel_008C40, NULL, this->jointTable, this->morphTable,
8);
this->unk1F0 = -1;
func_80C1DED0(this, 0);
this->actor.flags &= ~1;

8
src/overlays/actors/ovl_Dm_Sa/z_dm_sa.c
View File

@ -5,6 +5,7 @@
*/
#include "z_dm_sa.h"
#include "objects/object_stk/object_stk.h"
#define FLAGS 0x00000030
@ -29,10 +30,7 @@ const ActorInit Dm_Sa_InitVars = {
(ActorFunc)DmSa_Draw,
};
extern FlexSkeletonHeader D_06013328;
extern AnimationHeader D_0600CC94;
static ActorAnimationEntry D_80A2ED00[] = { { &D_0600CC94, 1.0f, 0, -1.0f, 0, 0 } };
static ActorAnimationEntry D_80A2ED00[] = { { &object_stk_Anim_00CC94, 1.0f, 0, -1.0f, 0, 0 } };
void func_80A2E960(SkelAnime* arg0, ActorAnimationEntry* animations, u16 index) {
f32 frameCount;
@ -54,7 +52,7 @@ void DmSa_Init(Actor* thisx, GlobalContext* globalCtx) {
this->alpha = 0xFF;
this->actor.targetArrowOffset = 3000.0f;
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 24.0f);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06013328, NULL, NULL, NULL, 0);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_stk_Skel_013328, NULL, NULL, NULL, 0);
func_80A2E960(&this->skelAnime, D_80A2ED00, 0);
Actor_SetScale(&this->actor, 0.01f);
this->actionFunc = DmSa_DoNothing;

8
src/overlays/actors/ovl_Dm_Statue/z_dm_statue.c
View File

@ -5,6 +5,7 @@
*/
#include "z_dm_statue.h"
#include "objects/object_smtower/object_smtower.h"
#define FLAGS 0x04000030
@ -27,9 +28,6 @@ const ActorInit Dm_Statue_InitVars = {
(ActorFunc)DmStatue_Draw,
};
extern AnimatedMaterial D_06001788;
extern Gfx D_06000520[];
void DmStatue_Init(Actor* thisx, GlobalContext* globalCtx) {
DmStatue* this = THIS;
@ -43,6 +41,6 @@ void DmStatue_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void DmStatue_Draw(Actor* thisx, GlobalContext* globalCtx) {
AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(&D_06001788));
Gfx_DrawDListXlu(globalCtx, D_06000520);
AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(object_smtower_Matanimheader_001788));
Gfx_DrawDListXlu(globalCtx, object_smtower_DL_000520);
}

221
src/overlays/actors/ovl_Dm_Stk/z_dm_stk.c
View File

@ -5,6 +5,9 @@
*/
#include "z_dm_stk.h"
#include "objects/object_stk/object_stk.h"
#include "objects/object_stk2/object_stk2.h"
#include "objects/object_stk3/object_stk3.h"
#define FLAGS 0x02000030
@ -30,96 +33,6 @@ void func_80AA1C64(DmStk* this, GlobalContext* globalCtx);
void func_80AA2720(DmStk* this, GlobalContext* globalCtx);
void func_80AA27EC(DmStk* this, GlobalContext* globalCtx);
extern AnimationHeader D_0600055C;
extern AnimationHeader D_06001030;
extern AnimationHeader D_0600130C;
extern AnimationHeader D_06001374;
extern AnimationHeader D_06001EDC;
extern AnimationHeader D_06002774;
extern AnimationHeader D_06002CD8;
extern AnimationHeader D_06003068;
extern AnimationHeader D_060035C8;
extern AnimationHeader D_060039F0;
extern AnimationHeader D_06004554;
extern AnimationHeader D_06004580;
extern Gfx D_060046B0[];
extern AnimationHeader D_060049C8;
extern AnimationHeader D_060051C0;
extern Gfx D_060053C0[];
extern Gfx D_06005870[];
extern AnimationHeader D_06005F44;
extern Gfx D_06006BB0[];
extern AnimationHeader D_060070DC;
extern Gfx D_06007840[];
extern Gfx D_060079F0[];
extern Gfx D_060084C0[];
extern UNK_TYPE D_06008658;
extern Gfx D_060087B0[];
extern Gfx D_06008A80[];
extern Gfx D_060090C0[];
extern Gfx D_06009710[];
extern Gfx D_06009AC0[];
extern Gfx D_06009DA0[];
extern Gfx D_0600A530[];
extern Gfx D_0600A5C0[];
extern Gfx D_0600AE30[];
extern Gfx D_0600AEC0[];
extern AnimationHeader D_0600BB2C;
extern AnimationHeader D_0600C270;
extern AnimationHeader D_0600C964;
extern Gfx D_0600CAD0[];
extern AnimationHeader D_0600CBB8;
extern AnimationHeader D_0600D830;
extern AnimationHeader D_0600E6EC;
extern AnimationHeader D_0600EEC0;
extern AnimationHeader D_060101A4;
extern AnimationHeader D_06010B60;
extern AnimationHeader D_060110B4;
extern AnimationHeader D_06011FB0;
extern AnimationHeader D_06012A58;
extern FlexSkeletonHeader D_06013328;
extern AnimationHeader D_060141E4;
extern AnimationHeader D_06014920;
extern AnimationHeader D_06015028;
extern AnimationHeader D_06015C14;
extern AnimationHeader D_06016508;
extern Gfx D_06016620[];
extern AnimationHeader D_06016910;
extern AnimationHeader D_06018ED0;
extern AnimationHeader D_0601AA80;
extern AnimationHeader D_0601C114;
extern AnimationHeader D_0601C21C;
extern AnimationHeader D_0601D008;
extern AnimationHeader D_0601D07C;
extern AnimationHeader D_0601D3D0;
extern AnimationHeader D_0601DDE0;
extern AnimationHeader D_0601EF50;
extern AnimationHeader D_0601F9E4;
extern AnimationHeader D_06020CAC;
extern AnimationHeader D_0602200C;
extern AnimationHeader D_0602336C;
extern AnimationHeader D_060259F4;
extern AnimationHeader D_060266C8;
extern AnimationHeader D_06026CF4;
extern AnimationHeader D_06027CF4;
extern AnimationHeader D_06028F28;
extern AnimationHeader D_06029A04;
extern AnimationHeader D_0602A2D8;
extern AnimationHeader D_0602AD54;
extern AnimationHeader D_0602DC64;
extern AnimationHeader D_0602E9A0;
extern AnimationHeader D_0602FA70;
extern AnimationHeader D_0603021C;
extern AnimationHeader D_06031210;
extern AnimationHeader D_060322FC;
extern AnimationHeader D_06032AE0;
extern AnimationHeader D_0603323C;
extern AnimationHeader D_06034FD8;
extern AnimationHeader D_06036964;
extern AnimationHeader D_06037B94;
extern AnimationHeader D_0603967C;
extern AnimationHeader D_0603A8F8;
const ActorInit Dm_Stk_InitVars = {
ACTOR_DM_STK,
ACTORCAT_ITEMACTION,
@ -190,42 +103,42 @@ static DamageTable sDamageTable = {
};
static ActorAnimationEntry sAnimations[] = {
{ &D_0601C21C, 1.0f, 0.0f, -1.0f, 0, 0.0f }, { &D_0601D3D0, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &D_06001030, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_0601D008, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &D_0601D008, 1.0f, 0.0f, -1.0f, 0, 0.0f }, { &D_06015C14, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &D_060070DC, 1.0f, 0.0f, -1.0f, 0, 0.0f }, { &D_0600D830, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &D_0600055C, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_0600130C, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &D_0600C270, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_0600CBB8, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &D_0601AA80, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_0601D07C, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &D_06016910, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_06018ED0, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &D_0601DDE0, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_0601EF50, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &D_0602DC64, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_0602E9A0, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &D_0602DC64, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_0602E9A0, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &D_060035C8, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_060049C8, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &D_060259F4, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_060266C8, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &D_06026CF4, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_0601C114, 1.0f, 0.0f, -1.0f, 2, 0.0f },
{ &D_06004580, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_06020CAC, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &D_0602200C, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_0602336C, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &D_06002774, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_06003068, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &D_060101A4, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_06010B60, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &D_0602A2D8, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_0601F9E4, 1.0f, 0.0f, -1.0f, 2, 0.0f },
{ &D_06029A04, 1.0f, 0.0f, -1.0f, 0, 0.0f }, { &D_0602AD54, 1.0f, 0.0f, -1.0f, 2, 0.0f },
{ &D_0600BB2C, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_0600C964, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &D_060110B4, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_06011FB0, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &D_06012A58, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_060141E4, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &D_0600E6EC, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_0600EEC0, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &D_06027CF4, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_06028F28, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &D_0603323C, 1.0f, 0.0f, -1.0f, 0, 0.0f }, { &D_06031210, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &D_060322FC, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_06032AE0, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &D_0603021C, 1.0f, 0.0f, -1.0f, 0, 0.0f }, { &D_06036964, 1.0f, 0.0f, -1.0f, 2, 0.0f },
{ &D_06016508, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_06015028, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &D_06014920, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_0602FA70, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &D_06037B94, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_0603967C, 1.0f, 0.0f, -1.0f, 2, 0.0f },
{ &D_0603967C, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_0603A8F8, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &D_06034FD8, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_06005F44, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &D_06002CD8, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_060039F0, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &D_06004554, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_060051C0, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &D_06001374, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &D_06001EDC, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &object_stk_Anim_01C21C, 1.0f, 0.0f, -1.0f, 0, 0.0f }, { &object_stk_Anim_01D3D0, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &object_stk_Anim_001030, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk_Anim_01D008, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &object_stk_Anim_01D008, 1.0f, 0.0f, -1.0f, 0, 0.0f }, { &object_stk_Anim_015C14, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &object_stk2_Anim_0070DC, 1.0f, 0.0f, -1.0f, 0, 0.0f }, { &object_stk2_Anim_00D830, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &object_stk2_Anim_00055C, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk2_Anim_00130C, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &object_stk2_Anim_00C270, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk2_Anim_00CBB8, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &object_stk2_Anim_01AA80, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk2_Anim_01D07C, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &object_stk2_Anim_016910, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk2_Anim_018ED0, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &object_stk2_Anim_01DDE0, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk2_Anim_01EF50, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &object_stk2_Anim_02DC64, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk2_Anim_02E9A0, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &object_stk2_Anim_02DC64, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk2_Anim_02E9A0, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &object_stk2_Anim_0035C8, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk2_Anim_0049C8, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &object_stk2_Anim_0259F4, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk2_Anim_0266C8, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &object_stk2_Anim_026CF4, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk2_Anim_01C114, 1.0f, 0.0f, -1.0f, 2, 0.0f },
{ &object_stk2_Anim_004580, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk2_Anim_020CAC, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &object_stk2_Anim_02200C, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk2_Anim_02336C, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &object_stk_Anim_002774, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk_Anim_003068, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &object_stk2_Anim_0101A4, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk2_Anim_010B60, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &object_stk2_Anim_02A2D8, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk2_Anim_01F9E4, 1.0f, 0.0f, -1.0f, 2, 0.0f },
{ &object_stk2_Anim_029A04, 1.0f, 0.0f, -1.0f, 0, 0.0f }, { &object_stk2_Anim_02AD54, 1.0f, 0.0f, -1.0f, 2, 0.0f },
{ &object_stk_Anim_00BB2C, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk_Anim_00C964, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &object_stk2_Anim_0110B4, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk2_Anim_011FB0, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &object_stk2_Anim_012A58, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk2_Anim_0141E4, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &object_stk2_Anim_00E6EC, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk2_Anim_00EEC0, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &object_stk2_Anim_027CF4, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk2_Anim_028F28, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &object_stk2_Anim_03323C, 1.0f, 0.0f, -1.0f, 0, 0.0f }, { &object_stk2_Anim_031210, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &object_stk2_Anim_0322FC, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk2_Anim_032AE0, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &object_stk2_Anim_03021C, 1.0f, 0.0f, -1.0f, 0, 0.0f }, { &object_stk2_Anim_036964, 1.0f, 0.0f, -1.0f, 2, 0.0f },
{ &object_stk_Anim_016508, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk_Anim_015028, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &object_stk_Anim_014920, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk2_Anim_02FA70, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &object_stk2_Anim_037B94, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk2_Anim_03967C, 1.0f, 0.0f, -1.0f, 2, 0.0f },
{ &object_stk2_Anim_03967C, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk2_Anim_03A8F8, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &object_stk2_Anim_034FD8, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk3_Anim_005F44, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &object_stk3_Anim_002CD8, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk3_Anim_0039F0, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &object_stk3_Anim_004554, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk3_Anim_0051C0, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &object_stk3_Anim_001374, 1.0f, 0.0f, -1.0f, 2, 0.0f }, { &object_stk3_Anim_001EDC, 1.0f, 0.0f, -1.0f, 0, 0.0f },
};
void func_80A9FDB0(DmStk* this, GlobalContext* globalCtx) {
@ -965,7 +878,7 @@ void DmStk_Init(Actor* thisx, GlobalContext* globalCtx) {
this->actor.targetArrowOffset = 1100.0f;
this->unk_334 = 99;
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 24.0f);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06013328, NULL, NULL, NULL, 0);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_stk_Skel_013328, NULL, NULL, NULL, 0);
func_80A9FE3C(this, globalCtx, &this->skelAnime, &sAnimations[this->unk_2E0], 0);
}
@ -1680,11 +1593,11 @@ void DmStk_PostLimbDraw2(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, V
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
if ((this->unk_2E0 == 69) || (this->unk_2E0 == 11) || (this->unk_2E0 == 71)) {
gSPDisplayList(POLY_OPA_DISP++, D_0600AEC0);
gSPDisplayList(POLY_OPA_DISP++, D_0600AE30);
gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_00AEC0);
gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_00AE30);
} else {
gSPDisplayList(POLY_OPA_DISP++, D_0600A5C0);
gSPDisplayList(POLY_OPA_DISP++, D_0600A530);
gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_00A5C0);
gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_00A530);
}
switch (this->unk_32C) {
@ -1699,16 +1612,16 @@ void DmStk_PostLimbDraw2(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, V
}
POLY_OPA_DISP = Gfx_SetFog(POLY_OPA_DISP, this->unk_2E8, this->unk_2EC, this->unk_2F0,
this->unk_2F4, this->unk_2F8, this->unk_2FC);
gSPDisplayList(POLY_OPA_DISP++, D_06006BB0);
gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_006BB0);
POLY_OPA_DISP = func_801660B8(globalCtx, POLY_OPA_DISP);
} else {
gSPDisplayList(POLY_OPA_DISP++, D_06006BB0);
gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_006BB0);
}
break;
case 2:
gSPDisplayList(POLY_OPA_DISP++, D_06006BB0);
gSPDisplayList(POLY_OPA_DISP++, D_06005870);
gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_006BB0);
gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_005870);
if (func_800EE29C(globalCtx, 0x201) &&
(globalCtx->csCtx.npcActions[func_800EE200(globalCtx, 0x201)]->unk0 == 2) && (this->unk_337 >= 0)) {
@ -1718,8 +1631,8 @@ void DmStk_PostLimbDraw2(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, V
gSPSegment(POLY_OPA_DISP++, 0x06, globalCtx->objectCtx.status[this->unk_337].segment);
AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(&D_06008658));
Gfx_DrawDListOpa(globalCtx, D_06007840);
AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(object_stk2_Matanimheader_008658));
Gfx_DrawDListOpa(globalCtx, object_stk2_DL_007840);
gSegments[6] = PHYSICAL_TO_VIRTUAL(globalCtx->objectCtx.status[this->unk_336].segment);
gSPSegment(POLY_OPA_DISP++, 0x06, globalCtx->objectCtx.status[this->unk_336].segment);
@ -1742,20 +1655,20 @@ void DmStk_PostLimbDraw2(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, V
switch (this->unk_32D) {
case 0:
gSPDisplayList(POLY_OPA_DISP++, D_06009AC0);
gSPDisplayList(POLY_OPA_DISP++, D_060046B0);
gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_009AC0);
gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_0046B0);
break;
case 1:
gSPDisplayList(POLY_OPA_DISP++, D_06009710);
gSPDisplayList(POLY_OPA_DISP++, D_060053C0);
gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_009710);
gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_0053C0);
break;
case 3:
gSPDisplayList(POLY_OPA_DISP++, D_06009DA0);
gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_009DA0);
if ((globalCtx->sceneNum == SCENE_LOST_WOODS) && (gSaveContext.sceneSetupIndex == 1)) {
gSPDisplayList(POLY_OPA_DISP++, D_0600CAD0);
gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_00CAD0);
}
break;
@ -1766,7 +1679,7 @@ void DmStk_PostLimbDraw2(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, V
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, D_06006BB0);
gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_006BB0);
break;
}
@ -1783,33 +1696,33 @@ void DmStk_PostLimbDraw2(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, V
break;
case 1:
gSPDisplayList(POLY_OPA_DISP++, D_060084C0);
gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_0084C0);
break;
case 2:
gSPDisplayList(POLY_OPA_DISP++, D_060090C0);
gSPDisplayList(POLY_OPA_DISP++, D_060079F0);
gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_0090C0);
gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_0079F0);
break;
case 3:
if ((globalCtx->sceneNum != SCENE_LOST_WOODS) || (gSaveContext.sceneSetupIndex != 1)) {
gSPDisplayList(POLY_OPA_DISP++, D_0600CAD0);
gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_00CAD0);
}
gSPDisplayList(POLY_OPA_DISP++, D_060090C0);
gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_0090C0);
break;
case 4:
gSPDisplayList(POLY_OPA_DISP++, D_060090C0);
gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_0090C0);
break;
case 6:
gSPDisplayList(POLY_OPA_DISP++, D_06008A80);
gSPDisplayList(POLY_OPA_DISP++, D_06016620);
gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_008A80);
gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_016620);
break;
case 9:
if (this->unk_2E4 == 255) {
gSPDisplayList(POLY_OPA_DISP++, D_060087B0);
gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_0087B0);
}
break;
}
@ -1829,7 +1742,7 @@ void DmStk_Draw(Actor* thisx, GlobalContext* globalCtx) {
if (this->unk_33B != 0) {
if (this->actor.params == 1) {
Gfx_DrawDListOpa(globalCtx, D_06006BB0);
Gfx_DrawDListOpa(globalCtx, object_stk_DL_006BB0);
return;
}

3
src/overlays/actors/ovl_Door_Ana/z_door_ana.c
View File

@ -5,6 +5,7 @@
*/
#include "z_door_ana.h"
#include "objects/gameplay_field_keep/gameplay_field_keep.h"
#define FLAGS 0x02000000
@ -208,5 +209,5 @@ void DoorAna_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void DoorAna_Draw(Actor* thisx, GlobalContext* globalCtx) {
Gfx_DrawDListXlu(globalCtx, D_05000C40);
Gfx_DrawDListXlu(globalCtx, gameplay_field_keep_DL_000C40);
}

35
src/overlays/actors/ovl_Door_Spiral/z_door_spiral.c
View File

@ -5,6 +5,12 @@
*/
#include "z_door_spiral.h"
#include "objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h"
#include "objects/object_numa_obj/object_numa_obj.h"
#include "objects/object_hakugin_obj/object_hakugin_obj.h"
#include "objects/object_ikana_obj/object_ikana_obj.h"
#include "objects/object_ikninside_obj/object_ikninside_obj.h"
#include "objects/object_danpei_object/object_danpei_object.h"
#define FLAGS 0x00000010
@ -77,29 +83,16 @@ const ActorInit Door_Spiral_InitVars = {
(ActorFunc)DoorSpiral_Draw,
};
extern Gfx D_06000590[];
extern Gfx D_060007A8[];
extern Gfx D_06000EA0[];
extern Gfx D_060012C0[];
extern Gfx D_060014C8[];
extern Gfx D_06002110[];
extern Gfx D_06004448[];
extern Gfx D_060051B8[];
extern Gfx D_06006128[];
extern Gfx D_06009278[];
extern Gfx D_06012B70[];
extern Gfx D_06013EA8[];
// Parameters for each staircase, indexed with SpiralType
static SpiralInfo sSpiralInfo[] = {
{ { NULL, NULL }, 0, 130, 12, 50, 15 }, // SPIRAL_OVERWORLD
{ { D_050219E0, D_0501D980 }, 0, 130, 12, 50, 15 }, // SPIRAL_DUNGEON
{ { D_06004448, D_060007A8 }, 0, 130, 12, 50, 15 }, // SPIRAL_WOODFALL_TEMPLE
{ { D_060051B8, D_060014C8 }, 0, 130, 12, 50, 15 }, // SPIRAL_WOODFALL_TEMPLE_ALT
{ { D_06009278, D_06006128 }, 0, 130, 12, 50, 15 }, // SPIRAL_SNOWHEAD_TEMPLE
{ { D_06013EA8, D_06012B70 }, 0, 130, 12, 50, 15 }, // SPIRAL_STONE_TOWER
{ { D_06000EA0, D_06000590 }, 0, 130, 12, 50, 15 }, // SPIRAL_IKANA_CASTLE
{ { D_06002110, D_060012C0 }, 0, 130, 12, 50, 15 }, // SPIRAL_DAMPES_HOUSE
{ { NULL, NULL }, 0, 130, 12, 50, 15 }, // SPIRAL_OVERWORLD
{ { gameplay_dangeon_keep_DL_0219E0, gameplay_dangeon_keep_DL_01D980 }, 0, 130, 12, 50, 15 }, // SPIRAL_DUNGEON
{ { object_numa_obj_DL_004448, object_numa_obj_DL_0007A8 }, 0, 130, 12, 50, 15 }, // SPIRAL_WOODFALL_TEMPLE
{ { object_numa_obj_DL_0051B8, object_numa_obj_DL_0014C8 }, 0, 130, 12, 50, 15 }, // SPIRAL_WOODFALL_TEMPLE_ALT
{ { object_hakugin_obj_DL_009278, object_hakugin_obj_DL_006128 }, 0, 130, 12, 50, 15 }, // SPIRAL_SNOWHEAD_TEMPLE
{ { object_ikana_obj_DL_013EA8, object_ikana_obj_DL_012B70 }, 0, 130, 12, 50, 15 }, // SPIRAL_STONE_TOWER
{ { object_ikninside_obj_DL_000EA0, object_ikninside_obj_DL_000590 }, 0, 130, 12, 50, 15 }, // SPIRAL_IKANA_CASTLE
{ { object_danpei_object_DL_002110, object_danpei_object_DL_0012C0 }, 0, 130, 12, 50, 15 }, // SPIRAL_DAMPES_HOUSE
};
// Defines which object bank a staircase should use, and its index to `sSpiralInfo`

6
src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c
View File

@ -1035,7 +1035,7 @@ void func_808BB4F4(DoorWarp1* this, GlobalContext* globalCtx2) {
Matrix_InsertTranslation(this->dyna.actor.world.pos.x, this->dyna.actor.world.pos.y + this->unk_1A4,
this->dyna.actor.world.pos.z, MTXMODE_NEW);
Matrix_Scale(4.0f, this->unk_1AC, 4.0f, MTXMODE_APPLY);
AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(&object_warp1_Matanimheader_0044D8));
AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(object_warp1_Matanimheader_0044D8));
Gfx_DrawDListXlu(globalCtx, object_warp1_DL_003230);
return;
}
@ -1054,7 +1054,7 @@ void func_808BB4F4(DoorWarp1* this, GlobalContext* globalCtx2) {
MTXMODE_NEW);
Matrix_RotateY(this->dyna.actor.world.rot.y, MTXMODE_APPLY);
Matrix_Scale(1.0f, this->unk_1A8, 1.0f, MTXMODE_APPLY);
AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(&object_warp1_Matanimheader_0057D8));
AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(object_warp1_Matanimheader_0057D8));
OPEN_DISPS(globalCtx->state.gfxCtx);
@ -1066,7 +1066,7 @@ void func_808BB4F4(DoorWarp1* this, GlobalContext* globalCtx2) {
gSPDisplayList(POLY_XLU_DISP++, object_warp1_DL_004690);
gfxCtx = globalCtx->state.gfxCtx;
AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(&object_warp1_Matanimheader_007238));
AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(object_warp1_Matanimheader_007238));
Matrix_InsertTranslation(this->dyna.actor.world.pos.x, this->dyna.actor.world.pos.y, this->dyna.actor.world.pos.z,
MTXMODE_NEW);
Matrix_RotateY(this->dyna.actor.world.rot.y, MTXMODE_APPLY);

5
src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c
View File

@ -5,6 +5,7 @@
*/
#include "z_eff_dust.h"
#include "objects/gameplay_keep/gameplay_keep.h"
#include "system_malloc.h"
#define FLAGS 0x00000030
@ -295,7 +296,7 @@ void func_80919768(Actor* thisx, GlobalContext* globalCtx2) {
gSPClearGeometryMode(POLY_XLU_DISP++, G_FOG | G_LIGHTING);
gSPDisplayList(POLY_XLU_DISP++, D_04054A90);
gSPDisplayList(POLY_XLU_DISP++, gameplay_keep_DL_054A90);
gSPSetGeometryMode(POLY_XLU_DISP++, G_FOG | G_LIGHTING);
}
@ -351,7 +352,7 @@ void func_809199FC(Actor* thisx, GlobalContext* globalCtx2) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPClearGeometryMode(POLY_XLU_DISP++, G_FOG | G_LIGHTING);
gSPDisplayList(POLY_XLU_DISP++, D_04054A90);
gSPDisplayList(POLY_XLU_DISP++, gameplay_keep_DL_054A90);
gSPSetGeometryMode(POLY_XLU_DISP++, G_FOG | G_LIGHTING);
}

6
src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.c
View File

@ -980,9 +980,9 @@ s32 EnAob01_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLis
Actor* thisx) {
EnAob01* this = THIS;
TexturePtr sp38[] = {
&object_aob_Tex_000658,
&object_aob_Tex_000E58,
&object_aob_Tex_001658,
object_aob_Tex_000658,
object_aob_Tex_000E58,
object_aob_Tex_001658,
};
if (limbIndex == 15) {

11
src/overlays/actors/ovl_En_Baisen/z_en_baisen.c
View File

@ -5,6 +5,7 @@
*/
#include "z_en_baisen.h"
#include "objects/object_bai/object_bai.h"
#define FLAGS 0x00000009
@ -22,11 +23,6 @@ void func_80BE895C(EnBaisen* this, GlobalContext* globalCtx);
void func_80BE8AAC(EnBaisen* this, GlobalContext* globalCtx);
void func_80BE89D8(EnBaisen* this, GlobalContext* globalCtx);
extern FlexSkeletonHeader D_06007908;
extern AnimationHeader D_060011C0;
extern AnimationHeader D_060008B4;
extern AnimationHeader D_06008198;
const ActorInit En_Baisen_InitVars = {
ACTOR_EN_BAISEN,
ACTORCAT_NPC,
@ -61,7 +57,7 @@ static ColliderCylinderInit sCylinderInit = {
static u16 sTextIds[] = { 0x2ABD, 0x2ABB, 0x2AD5, 0x2AD6, 0x2AD7, 0x2AD8, 0x2AC6 };
static AnimationHeader* D_80BE8E4C[] = { &D_060011C0, &D_060008B4, &D_06008198 };
static AnimationHeader* D_80BE8E4C[] = { &object_bai_Anim_0011C0, &object_bai_Anim_0008B4, &object_bai_Anim_008198 };
static u8 animModes[] = { 0, 0 };
@ -69,7 +65,8 @@ void EnBaisen_Init(Actor* thisx, GlobalContext* globalCtx) {
EnBaisen* this = THIS;
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 25.0f);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06007908, &D_060011C0, this->jointTable, this->morphTable, 20);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_bai_Skel_007908, &object_bai_Anim_0011C0, this->jointTable,
this->morphTable, 20);
this->actor.colChkInfo.mass = MASS_IMMOVABLE;
this->paramCopy = this->actor.params;
if (this->actor.params == 0) {

3
src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c
View File

@ -7,6 +7,7 @@
#include "z_en_bigslime.h"
#include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h"
#include "objects/object_bigslime/object_bigslime.h"
#include "objects/gameplay_keep/gameplay_keep.h"
#define FLAGS 0x00000235
@ -3099,7 +3100,7 @@ void EnBigslime_DrawGekko(Actor* thisx, GlobalContext* globalCtx) {
func_800AE5A0(globalCtx);
}
EnBigslime_SetSysMatrix(&gekkoPos, globalCtx, D_04076BC0, this->gekkoScale * (550.0f / 7.0f),
EnBigslime_SetSysMatrix(&gekkoPos, globalCtx, gCircleShadowDL, this->gekkoScale * (550.0f / 7.0f),
this->gekkoScale * (550.0f / 7.0f), 0.0f, 0, 255.0f);
if (this->minislimeState != MINISLIME_INACTIVE_STATE) {

24
src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.c
View File

@ -5,6 +5,7 @@
*/
#include "z_en_bji_01.h"
#include "objects/object_bji/object_bji.h"
#define FLAGS 0x00000019
@ -30,15 +31,6 @@ s32 EnBji01_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLis
Actor* thisx);
void EnBji01_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, Actor* thisx);
extern AnimationHeader D_06000FDC;
extern AnimationHeader D_06005B58;
extern AnimationHeader D_06000AB0;
extern AnimationHeader D_0600066C;
extern void* D_060049F0[];
extern void* D_06004E70[];
extern void* D_06005270[];
extern FlexSkeletonHeader D_0600578C;
const ActorInit En_Bji_01_InitVars = {
ACTOR_EN_BJI_01,
ACTORCAT_NPC,
@ -73,10 +65,10 @@ static ColliderCylinderInit sCylinderInit = {
/* Animations struct */
static struct_80B8E1A8 D_809CDC7C[] = {
{ &D_06000FDC, 1.0f, 0, 0.0f }, /* Looking through telescope */
{ &D_06005B58, 1.0f, 0, 10.0f }, /* Breathing? Unused? */
{ &D_06000AB0, 1.0f, 0, 0.0f }, /* Talking */
{ &D_0600066C, 1.0f, 2, -5.0f }, /* Scratching chin? */
{ &object_bji_Anim_000FDC, 1.0f, 0, 0.0f }, /* Looking through telescope */
{ &object_bji_Anim_005B58, 1.0f, 0, 10.0f }, /* Breathing? Unused? */
{ &object_bji_Anim_000AB0, 1.0f, 0, 0.0f }, /* Talking */
{ &object_bji_Anim_00066C, 1.0f, 2, -5.0f }, /* Scratching chin? */
};
void func_809CCDE0(EnBji01* this, GlobalContext* globalCtx) {
@ -339,8 +331,8 @@ void EnBji01_Init(Actor* thisx, GlobalContext* globalCtx) {
EnBji01* this = THIS;
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 30.0f);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_0600578C, &D_06000FDC, this->jointTable, this->morphTable,
BJI_LIMB_MAX);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_bji_Skel_00578C, &object_bji_Anim_000FDC, this->jointTable,
this->morphTable, BJI_LIMB_MAX);
Collider_InitAndSetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit);
this->actor.colChkInfo.mass = MASS_IMMOVABLE;
@ -442,7 +434,7 @@ void EnBji01_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList,
}
void EnBji01_Draw(Actor* thisx, GlobalContext* globalCtx) {
static TexturePtr sEyeTextures[] = { D_060049F0, D_06004E70, D_06005270 };
static TexturePtr sEyeTextures[] = { object_bji_Tex_0049F0, object_bji_Tex_004E70, object_bji_Tex_005270 };
EnBji01* this = THIS;
OPEN_DISPS(globalCtx->state.gfxCtx);

9
src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.c
View File

@ -1101,13 +1101,12 @@ void EnBomjima_Draw(Actor* thisx, GlobalContext* globalCtx) {
gEnBomjima_D_80C00B18, gEnBomjima_D_80C00B18,
};
static TexturePtr D_80C00B3C[] = {
&object_cs_Tex_00C520,
&object_cs_Tex_00CD20,
&object_cs_Tex_00D520,
object_cs_Tex_00C520,
object_cs_Tex_00CD20,
object_cs_Tex_00D520,
};
static TexturePtr D_80C00B48[] = {
&object_cs_Tex_00E620, &object_cs_Tex_00EA20, &object_cs_Tex_00EE20,
&object_cs_Tex_00DD20, &object_cs_Tex_00F220,
object_cs_Tex_00E620, object_cs_Tex_00EA20, object_cs_Tex_00EE20, object_cs_Tex_00DD20, object_cs_Tex_00F220,
};
EnBomjima* this = THIS;

9
src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.c
View File

@ -897,13 +897,12 @@ void EnBomjimb_Draw(Actor* thisx, GlobalContext* globalCtx) {
gEnBomjimb_D_80C03250, gEnBomjimb_D_80C03250,
};
static TexturePtr D_80C03274[] = {
&object_cs_Tex_00C520,
&object_cs_Tex_00CD20,
&object_cs_Tex_00D520,
object_cs_Tex_00C520,
object_cs_Tex_00CD20,
object_cs_Tex_00D520,
};
static TexturePtr D_80C03280[] = {
&object_cs_Tex_00E620, &object_cs_Tex_00EA20, &object_cs_Tex_00EE20,
&object_cs_Tex_00DD20, &object_cs_Tex_00F220,
object_cs_Tex_00E620, object_cs_Tex_00EA20, object_cs_Tex_00EE20, object_cs_Tex_00DD20, object_cs_Tex_00F220,
};
EnBomjimb* this = THIS;

8
src/overlays/actors/ovl_En_Cha/z_en_cha.c
View File

@ -5,6 +5,7 @@
*/
#include "z_en_cha.h"
#include "objects/object_cha/object_cha.h"
#define FLAGS 0x00000000
@ -49,9 +50,6 @@ static ColliderCylinderInit sCylinderInit = {
{ 10, 40, 0, { 0, 0, 0 } },
};
extern Gfx D_06000710[];
extern Gfx D_06000958[];
void EnCha_Init(Actor* thisx, GlobalContext* globalCtx) {
EnCha* this = THIS;
s32 pad;
@ -117,8 +115,8 @@ void EnCha_Update(Actor* thisx, GlobalContext* globalCtx2) {
void EnCha_Draw(Actor* thisx, GlobalContext* globalCtx) {
EnCha* this = THIS;
Gfx_DrawDListOpa(globalCtx, D_06000710);
Gfx_DrawDListOpa(globalCtx, object_cha_DL_000710);
Matrix_InsertTranslation(-1094.0f, 4950.0f, 9.0f, MTXMODE_APPLY);
Matrix_InsertXRotation_s(this->actor.home.rot.x, MTXMODE_APPLY);
Gfx_DrawDListOpa(globalCtx, D_06000958);
Gfx_DrawDListOpa(globalCtx, object_cha_DL_000958);
}

19
src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c
View File

@ -5,6 +5,7 @@
*/
#include "z_en_clear_tag.h"
#include "objects/gameplay_keep/gameplay_keep.h"
#define FLAGS 0x00000035
@ -81,8 +82,18 @@ static f32 sLightRayMaxScale[] = {
25.0f, 100.0f, 48.0f, 20.0f, 32.0f,
};
static Gfx* sSplashTex[] = {
D_040378F0, D_04037DF0, D_040382F0, D_040387F0, D_04038CF0, D_040391F0, D_040396F0, D_04039BF0, NULL, NULL, NULL,
static TexturePtr sSplashTex[] = {
gExplosionSplashTex1,
gExplosionSplashTex2,
gExplosionSplashTex3,
gExplosionSplashTex4,
gExplosionSplashTex5,
gExplosionSplashTex6,
gExplosionSplashTex7,
gExplosionSplashTex8,
NULL,
NULL,
NULL,
};
#include "overlays/ovl_En_Clear_Tag/ovl_En_Clear_Tag.c"
@ -820,7 +831,7 @@ void EnClearTag_DrawEffects(Actor* thisx, GlobalContext* globalCtx) {
Matrix_SetCurrentState(&mtxF);
Matrix_Scale(effect->scale, 1.0f, effect->scale, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, D_04030100);
gSPDisplayList(POLY_XLU_DISP++, gameplay_keep_DL_030100);
}
}
}
@ -986,7 +997,7 @@ void EnClearTag_DrawEffects(Actor* thisx, GlobalContext* globalCtx) {
Matrix_RotateStateAroundXAxis(effect->rotationX);
Matrix_Scale(effect->scale, effect->scale, effect->scale, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, D_0403A0F0);
gSPDisplayList(POLY_XLU_DISP++, gExplosionSplashDL);
}
}
}

4
src/overlays/actors/ovl_En_Col_Man/z_en_col_man.c
View File

@ -246,7 +246,7 @@ void func_80AFE4AC(Actor* thisx, GlobalContext* globalCtx) {
OPEN_DISPS(globalCtx->state.gfxCtx);
POLY_OPA_DISP = func_801660B8(globalCtx, POLY_OPA_DISP);
POLY_OPA_DISP = func_8012C724(POLY_OPA_DISP);
gSPSegment(POLY_OPA_DISP++, 0x08, Lib_SegmentedToVirtual(&gameplay_keep_Tex_05E6F0));
gSPSegment(POLY_OPA_DISP++, 0x08, Lib_SegmentedToVirtual(gameplay_keep_Tex_05E6F0));
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gameplay_keep_DL_05F6F0);
CLOSE_DISPS(globalCtx->state.gfxCtx);
@ -268,7 +268,7 @@ void func_80AFE650(Actor* thisx, GlobalContext* globalCtx) {
OPEN_DISPS(globalCtx->state.gfxCtx);
POLY_OPA_DISP = func_801660B8(globalCtx, POLY_OPA_DISP);
POLY_OPA_DISP = func_8012C724(POLY_OPA_DISP);
gSPSegment(POLY_OPA_DISP++, 0x08, Lib_SegmentedToVirtual(&gameplay_keep_Tex_05CEF0));
gSPSegment(POLY_OPA_DISP++, 0x08, Lib_SegmentedToVirtual(gameplay_keep_Tex_05CEF0));
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gameplay_keep_DL_05F6F0);
CLOSE_DISPS(globalCtx->state.gfxCtx);

44
src/overlays/actors/ovl_En_Cow/z_en_cow.c
View File

@ -5,6 +5,7 @@
*/
#include "z_en_cow.h"
#include "objects/object_cow/object_cow.h"
#define FLAGS 0x00000009
@ -61,13 +62,6 @@ static ColliderCylinderInit sCylinderInit = {
Vec3f D_8099D63C = { 0.0f, -1300.0f, 1100.0f };
extern AnimationHeader D_060001CC; // gCowBodyChewAnim
extern FlexSkeletonHeader D_06004010; // gCowBodySkel
extern AnimationHeader D_06004264; // gCowBodyMoveHeadAnim
extern AnimationHeader D_06004348; // gCowTailIdleAnim
extern FlexSkeletonHeader D_06004C30; // gCowTailSkel
extern AnimationHeader D_06004E98; // gCowTailSwishAnim
void EnCow_RotatePoint(Vec3f* vec, s16 angle) {
f32 x = (Math_CosS(angle) * vec->x) + (Math_SinS(angle) * vec->z);
@ -113,9 +107,9 @@ void EnCow_Init(Actor* thisx, GlobalContext* globalCtx) {
switch (EN_COW_TYPE(thisx)) {
case EN_COW_TYPE_DEFAULT:
case EN_COW_TYPE_ABDUCTED:
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06004010, NULL, this->jointTable, this->morphTable,
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gCowBodySkel, NULL, this->jointTable, this->morphTable,
COW_LIMB_MAX);
Animation_PlayLoop(&this->skelAnime, &D_060001CC);
Animation_PlayLoop(&this->skelAnime, &gCowBodyChewAnim);
Collider_InitAndSetCylinder(globalCtx, &this->colliders[0], &this->actor, &sCylinderInit);
Collider_InitAndSetCylinder(globalCtx, &this->colliders[1], &this->actor, &sCylinderInit);
@ -141,9 +135,9 @@ void EnCow_Init(Actor* thisx, GlobalContext* globalCtx) {
func_801A5080(4);
break;
case EN_COW_TYPE_TAIL:
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06004C30, NULL, this->jointTable, this->morphTable,
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gCowTailSkel, NULL, this->jointTable, this->morphTable,
COW_LIMB_MAX);
Animation_PlayLoop(&this->skelAnime, &D_06004348);
Animation_PlayLoop(&this->skelAnime, &gCowTailIdleAnim);
this->actor.update = EnCow_UpdateTail;
this->actor.draw = EnCow_DrawTail;
@ -177,13 +171,13 @@ void EnCow_UpdateAnimation(EnCow* this, GlobalContext* globalCtx) {
this->animationTimer--;
} else {
this->animationTimer = Rand_ZeroFloat(500.0f) + 40.0f;
Animation_Change(&this->skelAnime, &D_060001CC, 1.0f, this->skelAnime.curFrame,
Animation_GetLastFrame(&D_060001CC), ANIMMODE_ONCE, 1.0f);
Animation_Change(&this->skelAnime, &gCowBodyChewAnim, 1.0f, this->skelAnime.curFrame,
Animation_GetLastFrame(&gCowBodyChewAnim), ANIMMODE_ONCE, 1.0f);
}
if (this->actor.xzDistToPlayer < 150.0f) {
if (!(this->flags & EN_COW_FLAG_PLAYER_HAS_APPROACHED)) {
this->flags |= EN_COW_FLAG_PLAYER_HAS_APPROACHED;
if (this->skelAnime.animation == &D_060001CC) {
if (this->skelAnime.animation == &gCowBodyChewAnim) {
this->animationTimer = 0;
}
}
@ -320,15 +314,15 @@ void EnCow_DoTail(EnCow* this, GlobalContext* globalCtx) {
this->animationTimer--;
} else {
this->animationTimer = Rand_ZeroFloat(200.0f) + 40.0f;
Animation_Change(&this->skelAnime, &D_06004348, 1.0f, this->skelAnime.curFrame,
Animation_GetLastFrame(&D_06004348), ANIMMODE_ONCE, 1.0f);
Animation_Change(&this->skelAnime, &gCowTailIdleAnim, 1.0f, this->skelAnime.curFrame,
Animation_GetLastFrame(&gCowTailIdleAnim), ANIMMODE_ONCE, 1.0f);
}
if (this->actor.xzDistToPlayer < 150.0f &&
ABS_ALT((s16)(this->actor.yawTowardsPlayer - this->actor.shape.rot.y)) > 25000) {
if (!(this->flags & EN_COW_FLAG_PLAYER_HAS_APPROACHED)) {
this->flags |= EN_COW_FLAG_PLAYER_HAS_APPROACHED;
if (this->skelAnime.animation == &D_06004348) {
if (this->skelAnime.animation == &gCowTailIdleAnim) {
this->animationTimer = 0;
}
}
@ -350,12 +344,12 @@ void EnCow_Update(Actor* thisx, GlobalContext* globalCtx2) {
Actor_UpdateBgCheckInfo(globalCtx, &this->actor, 0.0f, 0.0f, 0.0f, 4);
if (SkelAnime_Update(&this->skelAnime)) {
if (this->skelAnime.animation == &D_060001CC) {
if (this->skelAnime.animation == &gCowBodyChewAnim) {
Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_COW_CRY);
Animation_Change(&this->skelAnime, &D_06004264, 1.0f, 0.0f, Animation_GetLastFrame(&D_06004264),
ANIMMODE_ONCE, 1.0f);
Animation_Change(&this->skelAnime, &gCowBodyMoveHeadAnim, 1.0f, 0.0f,
Animation_GetLastFrame(&gCowBodyMoveHeadAnim), ANIMMODE_ONCE, 1.0f);
} else {
Animation_Change(&this->skelAnime, &D_060001CC, 1.0f, 0.0f, Animation_GetLastFrame(&D_060001CC),
Animation_Change(&this->skelAnime, &gCowBodyChewAnim, 1.0f, 0.0f, Animation_GetLastFrame(&gCowBodyChewAnim),
ANIMMODE_LOOP, 1.0f);
}
}
@ -391,11 +385,11 @@ void EnCow_UpdateTail(Actor* thisx, GlobalContext* globalCtx) {
EnCow* this = THIS;
if (SkelAnime_Update(&this->skelAnime)) {
if (this->skelAnime.animation == &D_06004348) {
Animation_Change(&this->skelAnime, &D_06004E98, 1.0f, 0.0f, Animation_GetLastFrame(&D_06004E98),
ANIMMODE_ONCE, 1.0f);
if (this->skelAnime.animation == &gCowTailIdleAnim) {
Animation_Change(&this->skelAnime, &gCowTailSwishAnim, 1.0f, 0.0f,
Animation_GetLastFrame(&gCowTailSwishAnim), ANIMMODE_ONCE, 1.0f);
} else {
Animation_Change(&this->skelAnime, &D_06004348, 1.0f, 0.0f, Animation_GetLastFrame(&D_06004348),
Animation_Change(&this->skelAnime, &gCowTailIdleAnim, 1.0f, 0.0f, Animation_GetLastFrame(&gCowTailIdleAnim),
ANIMMODE_LOOP, 1.0f);
}
}

51
src/overlays/actors/ovl_En_Dai/z_en_dai.c
View File

@ -5,6 +5,7 @@
*/
#include "z_en_dai.h"
#include "objects/object_dai/object_dai.h"
#define FLAGS 0x02000039
@ -18,24 +19,6 @@ void EnDai_Draw(Actor* thisx, GlobalContext* globalCtx);
void func_80B3F00C(EnDai* this, GlobalContext* globalCtx);
void func_80B3EF90(EnDai* this, GlobalContext* globalCtx);
extern AnimationHeader D_060107B0;
extern AnimationHeader D_06010FB0;
extern AnimationHeader D_060117B0;
extern AnimationHeader D_06010FB0;
extern AnimationHeader D_06011FB0;
extern AnimationHeader D_060127B0;
extern AnimationHeader D_060079E4;
extern AnimationHeader D_06007354;
extern AnimationHeader D_06000CEC;
extern AnimationHeader D_060069DC;
extern AnimationHeader D_0600563C;
extern AnimationHeader D_06002E58;
extern AnimationHeader D_06006590;
extern FlexSkeletonHeader D_060130D0;
extern Gfx D_06000230[];
extern Gfx D_060002E8[];
extern Gfx D_0600C538[];
const ActorInit En_Dai_InitVars = {
ACTOR_EN_DAI,
ACTORCAT_NPC,
@ -87,7 +70,7 @@ void func_80B3E168(EnDaiParticle* particle, GlobalContext* globalCtx2) {
gDPPipeSync(POLY_XLU_DISP++);
if (!isDisplayListSet) {
gSPDisplayList(POLY_XLU_DISP++, D_06000230);
gSPDisplayList(POLY_XLU_DISP++, object_dai_DL_000230);
isDisplayListSet = true;
}
@ -108,7 +91,7 @@ void func_80B3E168(EnDaiParticle* particle, GlobalContext* globalCtx2) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, D_060002E8);
gSPDisplayList(POLY_XLU_DISP++, object_dai_DL_0002E8);
Matrix_StatePop();
}
@ -148,9 +131,11 @@ s32 func_80B3E5B4(EnDai* this, GlobalContext* globalCtx) {
s32 func_80B3E5DC(EnDai* this, s32 arg1) {
static ActorAnimationEntryS D_80B3FBFC[] = {
{ &D_060079E4, 1.0f, 0, -1, 0, 0 }, { &D_060079E4, 1.0f, 0, -1, 0, -4 }, { &D_06007354, 1.0f, 0, -1, 2, -4 },
{ &D_06000CEC, 1.0f, 0, -1, 2, -4 }, { &D_060069DC, 1.0f, 0, -1, 2, -4 }, { &D_0600563C, 1.0f, 0, -1, 2, 0 },
{ &D_0600563C, 1.0f, 0, -1, 2, -4 }, { &D_06002E58, 1.0f, 0, -1, 0, -4 }, { &D_06006590, 1.0f, 0, -1, 2, -4 },
{ &object_dai_Anim_0079E4, 1.0f, 0, -1, 0, 0 }, { &object_dai_Anim_0079E4, 1.0f, 0, -1, 0, -4 },
{ &object_dai_Anim_007354, 1.0f, 0, -1, 2, -4 }, { &object_dai_Anim_000CEC, 1.0f, 0, -1, 2, -4 },
{ &object_dai_Anim_0069DC, 1.0f, 0, -1, 2, -4 }, { &object_dai_Anim_00563C, 1.0f, 0, -1, 2, 0 },
{ &object_dai_Anim_00563C, 1.0f, 0, -1, 2, -4 }, { &object_dai_Anim_002E58, 1.0f, 0, -1, 0, -4 },
{ &object_dai_Anim_006590, 1.0f, 0, -1, 2, -4 },
};
s32 phi_v1 = false;
@ -526,7 +511,8 @@ void EnDai_Init(Actor* thisx, GlobalContext* globalCtx) {
EnDai* this = THIS;
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 0.0f);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_060130D0, NULL, this->jointTable, this->morphTable, 19);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_dai_Skel_0130D0, NULL, this->jointTable, this->morphTable,
19);
this->unk_A70 = -1;
func_80B3E5DC(this, 0);
Actor_SetScale(&this->actor, 0.2f);
@ -647,10 +633,10 @@ void EnDai_TransformLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Actor* thi
}
void func_80B3F78C(EnDai* this, GlobalContext* globalCtx) {
static AnimationHeader* D_80B3FE58[] = {
&D_060107B0, &D_06010FB0, &D_060117B0, &D_06010FB0, &D_06011FB0, &D_060127B0,
static TexturePtr D_80B3FE58[] = {
object_dai_Tex_0107B0, object_dai_Tex_010FB0, object_dai_Tex_0117B0,
object_dai_Tex_010FB0, object_dai_Tex_011FB0, object_dai_Tex_0127B0,
};
s32 pad;
if (globalCtx->actorCtx.unkB != 0) {
@ -676,7 +662,7 @@ void func_80B3F78C(EnDai* this, GlobalContext* globalCtx) {
Matrix_SetCurrentState(&this->unk_18C);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, D_0600C538);
gSPDisplayList(POLY_XLU_DISP++, object_dai_DL_00C538);
}
func_80B3E5B4(this, globalCtx);
@ -685,8 +671,9 @@ void func_80B3F78C(EnDai* this, GlobalContext* globalCtx) {
}
void func_80B3F920(EnDai* this, GlobalContext* globalCtx) {
static AnimationHeader* D_80B3FE70[] = {
&D_060107B0, &D_06010FB0, &D_060117B0, &D_06010FB0, &D_06011FB0, &D_060127B0,
static TexturePtr D_80B3FE70[] = {
object_dai_Tex_0107B0, object_dai_Tex_010FB0, object_dai_Tex_0117B0,
object_dai_Tex_010FB0, object_dai_Tex_011FB0, object_dai_Tex_0127B0,
};
s32 pad;
@ -707,7 +694,7 @@ void func_80B3F920(EnDai* this, GlobalContext* globalCtx) {
Matrix_SetCurrentState(&this->unk_18C);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, D_0600C538);
gSPDisplayList(POLY_OPA_DISP++, object_dai_DL_00C538);
CLOSE_DISPS(globalCtx->state.gfxCtx);
} else {
@ -726,7 +713,7 @@ void func_80B3F920(EnDai* this, GlobalContext* globalCtx) {
Matrix_SetCurrentState(&this->unk_18C);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, D_0600C538);
gSPDisplayList(POLY_XLU_DISP++, object_dai_DL_00C538);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}

43
src/overlays/actors/ovl_En_Daiku/z_en_daiku.c
View File

@ -5,6 +5,7 @@
*/
#include "z_en_daiku.h"
#include "objects/object_daiku/object_daiku.h"
#define FLAGS 0x00000009
@ -20,22 +21,6 @@ void func_80943BC0(EnDaiku* this);
void func_80943BDC(EnDaiku* this, GlobalContext* globalCtx);
void func_809438F8(EnDaiku* this, GlobalContext* globalCtx);
extern AnimationHeader D_06000600;
extern AnimationHeader D_06000C44;
extern AnimationHeader D_06001114;
extern AnimationHeader D_06002FA0;
extern FlexSkeletonHeader D_0600A850;
extern AnimationHeader D_0600ACD0;
extern AnimationHeader D_0600B690;
extern AnimationHeader D_0600BEAC;
extern AnimationHeader D_0600C234;
extern AnimationHeader D_0600C92C;
extern Gfx D_06006D70[];
extern Gfx D_06006E80[];
extern Gfx D_06006FB0[];
extern Gfx D_060070C0[];
extern Gfx D_06008EC8[];
const ActorInit En_Daiku_InitVars = {
ACTOR_EN_DAIKU,
ACTORCAT_NPC,
@ -108,18 +93,18 @@ void EnDaiku_Init(Actor* thisx, GlobalContext* globalCtx) {
this->unk_27E = this->unk_278 * 4 + 4;
case ENDAIKU_PARAMS_FF_1:
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_0600A850, &D_06002FA0, this->jointTable,
this->morphTable, 17);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_daiku_Skel_00A850, &object_daiku_Anim_002FA0,
this->jointTable, this->morphTable, 17);
break;
case ENDAIKU_PARAMS_FF_2:
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_0600A850, &D_0600B690, this->jointTable,
this->morphTable, 17);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_daiku_Skel_00A850, &object_daiku_Anim_00B690,
this->jointTable, this->morphTable, 17);
break;
case ENDAIKU_PARAMS_FF_3:
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_0600A850, &D_06001114, this->jointTable,
this->morphTable, 17);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_daiku_Skel_00A850, &object_daiku_Anim_001114,
this->jointTable, this->morphTable, 17);
break;
}
@ -134,8 +119,9 @@ void EnDaiku_Destroy(Actor* thisx, GlobalContext* globalCtx) {
void func_8094373C(EnDaiku* this, s32 arg1) {
static AnimationHeader* D_809440A4[] = {
&D_06002FA0, &D_0600ACD0, &D_0600C92C, &D_06000C44, &D_0600C234,
&D_06000600, &D_06001114, &D_0600B690, &D_0600BEAC,
&object_daiku_Anim_002FA0, &object_daiku_Anim_00ACD0, &object_daiku_Anim_00C92C,
&object_daiku_Anim_000C44, &object_daiku_Anim_00C234, &object_daiku_Anim_000600,
&object_daiku_Anim_001114, &object_daiku_Anim_00B690, &object_daiku_Anim_00BEAC,
};
static u8 D_809440C8[] = {
0, 0, 0, 0, 2, 0, 0, 2, 2,
@ -309,7 +295,12 @@ s32 EnDaiku_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLis
}
void EnDaiku_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, Actor* thisx) {
static Gfx* D_809440D4[] = { D_060070C0, D_06006FB0, D_06006E80, D_06006D70 };
static Gfx* D_809440D4[] = {
object_daiku_DL_0070C0,
object_daiku_DL_006FB0,
object_daiku_DL_006E80,
object_daiku_DL_006D70,
};
EnDaiku* this = THIS;
OPEN_DISPS(globalCtx->state.gfxCtx);
@ -319,7 +310,7 @@ void EnDaiku_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList,
}
if ((this->unk_278 == ENDAIKU_PARAMS_FF_3) && (limbIndex == 8)) {
gSPDisplayList(POLY_OPA_DISP++, D_06008EC8);
gSPDisplayList(POLY_OPA_DISP++, object_daiku_DL_008EC8);
}
CLOSE_DISPS(globalCtx->state.gfxCtx);

36
src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.c
View File

@ -6,6 +6,8 @@
#include "z_en_daiku2.h"
#include "overlays/actors/ovl_En_Bom/z_en_bom.h"
#include "objects/object_daiku/object_daiku.h"
#include "objects/object_bombiwa/object_bombiwa.h"
#define FLAGS 0x00000009
@ -30,22 +32,6 @@ void func_80BE71D8(EnDaiku2* this, GlobalContext* globalCtx);
void func_80BE7504(EnDaiku2* this, Vec3f* arg1, Vec3f* arg2, Vec3f* arg3, f32 arg4, s16 arg5);
void func_80BE7718(EnDaiku2* this, GlobalContext* globalCtx);
extern AnimationHeader D_06002134;
extern AnimationHeader D_06002FA0;
extern AnimationHeader D_0600ACD0;
extern AnimationHeader D_0600C92C;
extern AnimationHeader D_06000C44;
extern AnimationHeader D_0600C234;
extern AnimationHeader D_06000600;
extern AnimationHeader D_06001114;
extern AnimationHeader D_0600B690;
extern AnimationHeader D_06001A24;
extern AnimationHeader D_0600D328;
extern FlexSkeletonHeader D_0600A850;
extern Gfx D_06009638[];
extern Gfx D_0600A390[];
extern Gfx D_060009E0[];
const ActorInit En_Daiku2_InitVars = {
ACTOR_EN_DAIKU2,
ACTORCAT_NPC,
@ -96,7 +82,8 @@ void EnDaiku2_Init(Actor* thisx, GlobalContext* globalCtx) {
this->actor.colChkInfo.mass = MASS_IMMOVABLE;
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 40.0f);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_0600A850, &D_06002FA0, this->jointTable, this->morphTable, 17);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_daiku_Skel_00A850, &object_daiku_Anim_002FA0,
this->jointTable, this->morphTable, 17);
this->actor.targetMode = 0;
Collider_InitAndSetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit);
this->unk_278 = ENDAIKU2_GET_7F(&this->actor);
@ -135,8 +122,9 @@ void EnDaiku2_Destroy(Actor* thisx, GlobalContext* globalCtx) {
void func_80BE6408(EnDaiku2* this, s32 arg1) {
static AnimationHeader* sAnimations[] = {
&D_06002FA0, &D_0600ACD0, &D_0600C92C, &D_06000C44, &D_0600C234, &D_06000600,
&D_06001114, &D_0600B690, &D_06001A24, &D_06002134, &D_0600D328,
&object_daiku_Anim_002FA0, &object_daiku_Anim_00ACD0, &object_daiku_Anim_00C92C, &object_daiku_Anim_000C44,
&object_daiku_Anim_00C234, &object_daiku_Anim_000600, &object_daiku_Anim_001114, &object_daiku_Anim_00B690,
&object_daiku_Anim_001A24, &object_daiku_Anim_002134, &object_daiku_Anim_00D328,
};
static u8 D_80BE7958[] = {
0, 0, 0, 0, 2, 0, 0, 0, 0, 2, 0,
@ -274,8 +262,8 @@ void func_80BE66E4(EnDaiku2* this, GlobalContext* globalCtx) {
if ((this->unk_276 == 5) || (this->unk_276 == 9)) {
func_80BE6408(this, 10);
} else if ((this->unk_276 == 10) && (this->unk_284 <= sp9C)) {
this->unk_284 = Animation_GetLastFrame(&D_06002134);
Animation_Change(&this->skelAnime, &D_06002134, -1.0f, this->unk_284, 0.0f, 2, -4.0f);
this->unk_284 = Animation_GetLastFrame(&object_daiku_Anim_002134);
Animation_Change(&this->skelAnime, &object_daiku_Anim_002134, -1.0f, this->unk_284, 0.0f, 2, -4.0f);
this->unk_276 = 11;
} else if ((this->unk_276 == 11) && (sp9C <= 0.0f)) {
func_80BE6408(this, 8);
@ -479,11 +467,11 @@ void EnDaiku2_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList,
if (limbIndex == 14) {
Matrix_Scale(this->unk_260, this->unk_260, this->unk_260, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, D_06009638);
gSPDisplayList(POLY_OPA_DISP++, object_daiku_DL_009638);
}
if (limbIndex == 15) {
gSPDisplayList(POLY_OPA_DISP++, D_0600A390);
gSPDisplayList(POLY_OPA_DISP++, object_daiku_DL_00A390);
}
CLOSE_DISPS(globalCtx->state.gfxCtx);
@ -569,7 +557,7 @@ void func_80BE7718(EnDaiku2* this, GlobalContext* globalCtx) {
Matrix_Scale(particle->unk_30, particle->unk_30, particle->unk_30, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, D_060009E0);
gSPDisplayList(POLY_OPA_DISP++, object_bombiwa_DL_0009E0);
Matrix_StatePop();
}

51
src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c
View File

@ -6,6 +6,7 @@
#include "z_en_dekunuts.h"
#include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h"
#include "objects/object_dekunuts/object_dekunuts.h"
#define FLAGS 0x00000005
@ -38,20 +39,6 @@ void func_808BE4D4(EnDekunuts* this, GlobalContext* globalCtx);
void func_808BE680(EnDekunuts* this);
void func_808BE6C4(EnDekunuts* this, GlobalContext* globalCtx);
extern AnimationHeader D_06000168;
extern Gfx D_06001E50[];
extern Gfx D_06001F50[];
extern SkeletonHeader D_06002468;
extern AnimationHeader D_0600259C;
extern AnimationHeader D_06002A5C;
extern AnimationHeader D_06002BD4;
extern AnimationHeader D_06002DD4;
extern AnimationHeader D_06002FA4;
extern AnimationHeader D_06003180;
extern AnimationHeader D_0600326C;
extern AnimationHeader D_060033E4;
extern AnimationHeader D_06003780;
const ActorInit En_Dekunuts_InitVars = {
ACTOR_EN_DEKUNUTS,
ACTORCAT_ENEMY,
@ -132,7 +119,8 @@ void EnDekunuts_Init(Actor* thisx, GlobalContext* globalCtx) {
Actor_ProcessInitChain(&this->actor, sInitChain);
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 35.0f);
SkelAnime_Init(globalCtx, &this->skelAnime, &D_06002468, &D_0600326C, this->jointTable, this->morphTable, 10);
SkelAnime_Init(globalCtx, &this->skelAnime, &object_dekunuts_Skel_002468, &object_dekunuts_Anim_00326C,
this->jointTable, this->morphTable, 10);
Collider_InitAndSetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit);
CollisionCheck_SetInfo(&this->actor.colChkInfo, &sDamageTable, &sColChkInfoInit);
this->unk_194 = ENDEKUNUTS_GET_FF00(&this->actor);
@ -178,7 +166,7 @@ void func_808BD3B4(EnDekunuts* this, GlobalContext* globalCtx) {
}
void func_808BD428(EnDekunuts* this) {
Animation_PlayOnceSetSpeed(&this->skelAnime, &D_06003180, 0.0f);
Animation_PlayOnceSetSpeed(&this->skelAnime, &object_dekunuts_Anim_003180, 0.0f);
this->unk_190 = Rand_S16Offset(100, 50);
this->collider.dim.height = 5;
Math_Vec3f_Copy(&this->actor.world.pos, &this->actor.home.pos);
@ -233,7 +221,7 @@ void func_808BD49C(EnDekunuts* this, GlobalContext* globalCtx) {
}
void func_808BD78C(EnDekunuts* this) {
Animation_PlayLoop(&this->skelAnime, &D_06002FA4);
Animation_PlayLoop(&this->skelAnime, &object_dekunuts_Anim_002FA4);
this->unk_190 = 2;
this->actionFunc = func_808BD7D4;
}
@ -253,7 +241,7 @@ void func_808BD7D4(EnDekunuts* this, GlobalContext* globalCtx) {
}
void func_808BD870(EnDekunuts* this) {
Animation_MorphToLoop(&this->skelAnime, &D_0600326C, -3.0f);
Animation_MorphToLoop(&this->skelAnime, &object_dekunuts_Anim_00326C, -3.0f);
if (this->actionFunc == func_808BDA4C) {
this->unk_190 = 4098;
} else {
@ -292,7 +280,7 @@ void func_808BD8D8(EnDekunuts* this, GlobalContext* globalCtx) {
}
void func_808BDA08(EnDekunuts* this) {
Animation_PlayOnce(&this->skelAnime, &D_06000168);
Animation_PlayOnce(&this->skelAnime, &object_dekunuts_Anim_000168);
this->unk_190 = this->unk_194;
this->actionFunc = func_808BDA4C;
}
@ -336,7 +324,7 @@ void func_808BDA4C(EnDekunuts* this, GlobalContext* globalCtx) {
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_NUTS_THROW);
}
} else if ((this->unk_190 >= 2) && Animation_OnFrame(&this->skelAnime, 12.0f)) {
Animation_MorphToPlayOnce(&this->skelAnime, &D_06000168, -3.0f);
Animation_MorphToPlayOnce(&this->skelAnime, &object_dekunuts_Anim_000168, -3.0f);
if (this->unk_190 != 0) {
this->unk_190--;
}
@ -344,14 +332,14 @@ void func_808BDA4C(EnDekunuts* this, GlobalContext* globalCtx) {
}
void func_808BDC9C(EnDekunuts* this) {
Animation_MorphToPlayOnce(&this->skelAnime, &D_06002A5C, -5.0f);
Animation_MorphToPlayOnce(&this->skelAnime, &object_dekunuts_Anim_002A5C, -5.0f);
this->unk_190 = 0;
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_NUTS_DOWN);
this->actionFunc = func_808BDD54;
}
void func_808BDCF0(EnDekunuts* this) {
Animation_MorphToPlayOnce(&this->skelAnime, &D_06002A5C, -5.0f);
Animation_MorphToPlayOnce(&this->skelAnime, &object_dekunuts_Anim_002A5C, -5.0f);
this->collider.base.acFlags &= ~AC_ON;
this->unk_190 = 80;
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_NUTS_DOWN);
@ -379,7 +367,7 @@ void func_808BDD54(EnDekunuts* this, GlobalContext* globalCtx) {
}
void func_808BDE7C(EnDekunuts* this) {
Animation_MorphToPlayOnce(&this->skelAnime, &D_06002DD4, -3.0f);
Animation_MorphToPlayOnce(&this->skelAnime, &object_dekunuts_Anim_002DD4, -3.0f);
this->collider.dim.height = 37;
this->actor.colChkInfo.mass = 50;
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_NUTS_DAMAGE);
@ -399,7 +387,7 @@ void func_808BDEF8(EnDekunuts* this, GlobalContext* globalCtx) {
}
void func_808BDF60(EnDekunuts* this) {
Animation_PlayLoop(&this->skelAnime, &D_06003780);
Animation_PlayLoop(&this->skelAnime, &object_dekunuts_Anim_003780);
this->unk_190 = 2;
this->unk_18C = 0;
this->collider.base.acFlags |= AC_ON;
@ -456,7 +444,7 @@ void func_808BDFB8(EnDekunuts* this, GlobalContext* globalCtx) {
}
void func_808BE1CC(EnDekunuts* this) {
Animation_PlayLoop(&this->skelAnime, &D_060033E4);
Animation_PlayLoop(&this->skelAnime, &object_dekunuts_Anim_0033E4);
this->unk_190 = 3;
this->actor.speedXZ = 0.0f;
if (this->unk_18D != 0) {
@ -479,7 +467,7 @@ void func_808BE22C(EnDekunuts* this, GlobalContext* globalCtx) {
}
void func_808BE294(EnDekunuts* this, s32 arg1) {
Animation_MorphToPlayOnce(&this->skelAnime, &D_0600259C, -3.0f);
Animation_MorphToPlayOnce(&this->skelAnime, &object_dekunuts_Anim_00259C, -3.0f);
if (this->actor.params == ENDEKUNUTS_GET_FF00_0) {
this->actor.speedXZ = 10.0f;
if (arg1 != 0) {
@ -492,7 +480,7 @@ void func_808BE294(EnDekunuts* this, s32 arg1) {
this->actionFunc = func_808BE358;
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_NUTS_DAMAGE);
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_CUTBODY);
Actor_SetColorFilter(&this->actor, 0x4000, 255, 0, Animation_GetLastFrame(&D_0600259C));
Actor_SetColorFilter(&this->actor, 0x4000, 255, 0, Animation_GetLastFrame(&object_dekunuts_Anim_00259C));
}
void func_808BE358(EnDekunuts* this, GlobalContext* globalCtx) {
@ -531,7 +519,7 @@ void func_808BE3FC(EnDekunuts* this, GlobalContext* globalCtx) {
}
void func_808BE484(EnDekunuts* this) {
Animation_PlayOnce(&this->skelAnime, &D_06002BD4);
Animation_PlayOnce(&this->skelAnime, &object_dekunuts_Anim_002BD4);
this->actionFunc = func_808BE4D4;
this->actor.speedXZ = 0.0f;
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_NUTS_DEAD);
@ -554,13 +542,14 @@ void func_808BE4D4(EnDekunuts* this, GlobalContext* globalCtx) {
Item_DropCollectibleRandom(globalCtx, &this->actor, &this->actor.world.pos, 0xE0);
Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_OBJ_ETCETERA, this->actor.home.pos.x, this->actor.home.pos.y,
this->actor.home.pos.z, 0, this->actor.home.rot.y, 0, 0x80);
EffectSsHahen_SpawnBurst(globalCtx, &this->actor.home.pos, 6.0f, 0, 6, 2, 15, 64, 10, D_06001F50);
EffectSsHahen_SpawnBurst(globalCtx, &this->actor.home.pos, 6.0f, 0, 6, 2, 15, 64, 10,
object_dekunuts_DL_001F50);
Actor_MarkForDeath(&this->actor);
}
}
void func_808BE680(EnDekunuts* this) {
Animation_MorphToLoop(&this->skelAnime, &D_0600326C, -3.0f);
Animation_MorphToLoop(&this->skelAnime, &object_dekunuts_Anim_00326C, -3.0f);
this->actionFunc = func_808BE6C4;
}
@ -748,7 +737,7 @@ void EnDekunuts_Draw(Actor* thisx, GlobalContext* globalCtx) {
if (this->actor.colorFilterTimer != 0) {
func_800AE5A0(globalCtx);
}
Gfx_DrawDListOpa(globalCtx, D_06001E50);
Gfx_DrawDListOpa(globalCtx, object_dekunuts_DL_001E50);
func_800BE680(globalCtx, &this->actor, this->unk_21C, 8, this->unk_214, this->unk_218, this->unk_210,
this->unk_18E);
}

29
src/overlays/actors/ovl_En_Dg/z_en_dg.c
View File

@ -5,6 +5,7 @@
*/
#include "z_en_dg.h"
#include "objects/object_dog/object_dog.h"
#define FLAGS 0x00800019
@ -36,17 +37,6 @@ void func_8098BB10(EnDg* this, GlobalContext* globalCtx);
void func_8098BBEC(EnDg* this, GlobalContext* globalCtx);
void func_8098BC54(EnDg* this, GlobalContext* globalCtx);
extern AnimationHeader D_06000998;
extern AnimationHeader D_06001048;
extern AnimationHeader D_06001348;
extern AnimationHeader D_06001560;
extern AnimationHeader D_060017C0;
extern AnimationHeader D_06001A84;
extern AnimationHeader D_06001BD8;
extern AnimationHeader D_06001FB0;
extern AnimationHeader D_060021C8;
extern FlexSkeletonHeader D_060080F0;
const ActorInit En_Dg_InitVars = {
ACTOR_EN_DG,
ACTORCAT_ENEMY,
@ -140,12 +130,14 @@ static DamageTable sDamageTable = {
};
static ActorAnimationEntryS sAnimations[] = {
{ &D_060021C8, 1.0f, 0, -1, 0, 0 }, { &D_060021C8, 1.0f, 0, -1, 0, -6 }, { &D_06001BD8, 1.0f, 0, -1, 0, 0 },
{ &D_06000998, 1.0f, 0, -1, 0, -6 }, { &D_06001FB0, 1.0f, 0, -1, 2, -6 }, { &D_06001FB0, 1.0f, 0, -1, 4, -6 },
{ &D_06001048, 1.0f, 0, -1, 2, -6 }, { &D_06001348, 1.0f, 0, -1, 0, -6 }, { &D_06001048, 1.0f, 0, 27, 2, -6 },
{ &D_06001048, 1.0f, 28, -1, 2, -6 }, { &D_06001048, 1.0f, 54, 54, 2, -6 }, { &D_060021C8, -1.5f, -1, 0, 0, -6 },
{ &D_06001560, 1.0f, 0, -1, 2, 0 }, { &D_06001A84, 1.2f, 0, -1, 2, 0 }, { &D_060017C0, 1.2f, 0, -1, 2, 0 },
{ &D_060021C8, 0.5f, 0, -1, 0, 0 },
{ &object_dog_Anim_0021C8, 1.0f, 0, -1, 0, 0 }, { &object_dog_Anim_0021C8, 1.0f, 0, -1, 0, -6 },
{ &object_dog_Anim_001BD8, 1.0f, 0, -1, 0, 0 }, { &object_dog_Anim_000998, 1.0f, 0, -1, 0, -6 },
{ &object_dog_Anim_001FB0, 1.0f, 0, -1, 2, -6 }, { &object_dog_Anim_001FB0, 1.0f, 0, -1, 4, -6 },
{ &object_dog_Anim_001048, 1.0f, 0, -1, 2, -6 }, { &object_dog_Anim_001348, 1.0f, 0, -1, 0, -6 },
{ &object_dog_Anim_001048, 1.0f, 0, 27, 2, -6 }, { &object_dog_Anim_001048, 1.0f, 28, -1, 2, -6 },
{ &object_dog_Anim_001048, 1.0f, 54, 54, 2, -6 }, { &object_dog_Anim_0021C8, -1.5f, -1, 0, 0, -6 },
{ &object_dog_Anim_001560, 1.0f, 0, -1, 2, 0 }, { &object_dog_Anim_001A84, 1.2f, 0, -1, 2, 0 },
{ &object_dog_Anim_0017C0, 1.2f, 0, -1, 2, 0 }, { &object_dog_Anim_0021C8, 0.5f, 0, -1, 0, 0 },
};
static InitChainEntry sInitChain[] = {
@ -1116,7 +1108,8 @@ void EnDg_Init(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 24.0f);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_060080F0, NULL, this->jointTable, this->morphTable, 13);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_dog_Skel_0080F0, NULL, this->jointTable, this->morphTable,
13);
Collider_InitCylinder(globalCtx, &this->collider);
Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit);
CollisionCheck_SetInfo2(&this->actor.colChkInfo, &sDamageTable, &sColChkInfoInit);

81
src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.c
View File

@ -5,6 +5,7 @@
*/
#include "z_en_dinofos.h"
#include "objects/object_dinofos/object_dinofos.h"
#define FLAGS 0x00000435
@ -56,25 +57,6 @@ void func_8089C398(EnDinofos* this);
void func_8089C164(EnDinofos* this);
void func_8089C244(EnDinofos* this);
extern FlexSkeletonHeader D_06009570;
extern AnimationHeader D_06002E40;
extern AnimationHeader D_060025B4;
extern AnimationHeader D_06000580;
extern AnimationHeader D_06001CCC;
extern AnimationHeader D_0600ABD0;
extern AnimationHeader D_0600D62C;
extern AnimationHeader D_06001040;
extern AnimationHeader D_060013C0;
extern AnimationHeader D_060017B8;
extern AnimationHeader D_0600C974;
extern AnimationHeader D_06009B70;
extern AnimationHeader D_06000AF0;
extern AnimationHeader D_0600D21C;
extern Gfx D_06008E30[];
extern Gfx D_06009030[];
extern Gfx D_06009230[];
extern Gfx D_06009030[];
const ActorInit En_Dinofos_InitVars = {
ACTOR_EN_DINOFOS,
ACTORCAT_ENEMY,
@ -259,11 +241,11 @@ static DamageTable sDamageTable = {
static CollisionCheckInfoInit sColChkInfoInit = { 4, 40, 100, 80 };
static Gfx* D_8089E33C[] = {
D_06008E30,
D_06009030,
D_06009230,
D_06009030,
static TexturePtr D_8089E33C[] = {
object_dinofos_Tex_008E30,
object_dinofos_Tex_009030,
object_dinofos_Tex_009230,
object_dinofos_Tex_009030,
};
static s16 D_8089E34C = -1;
@ -293,7 +275,8 @@ void EnDinofos_Init(Actor* thisx, GlobalContext* globalCtx) {
this->colliderJntSphElement);
Collider_InitAndSetQuad(globalCtx, &this->colliderQuad, &this->actor, &sQuadInit);
CollisionCheck_SetInfo(&this->actor.colChkInfo, &sDamageTable, &sColChkInfoInit);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06009570, &D_06002E40, this->jointTable, this->morphTable, 21);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_dinofos_Skel_009570, &object_dinofos_Anim_002E40,
this->jointTable, this->morphTable, 21);
if (D_8089E364 == 0) {
for (i = 0; i < ARRAY_COUNT(D_8089E33C); i++) {
@ -483,8 +466,9 @@ void func_8089B100(EnDinofos* this, GlobalContext* globalCtx) {
Player* player = GET_PLAYER(globalCtx);
Vec3f sp3C;
Animation_Change(&this->skelAnime, &D_06001CCC, 1.0f, Animation_GetLastFrame(&D_06001CCC),
Animation_GetLastFrame(&D_06001CCC), 2, 0.0f);
Animation_Change(&this->skelAnime, &object_dinofos_Anim_001CCC, 1.0f,
Animation_GetLastFrame(&object_dinofos_Anim_001CCC),
Animation_GetLastFrame(&object_dinofos_Anim_001CCC), 2, 0.0f);
func_800BE33C(&camera->eye, &camera->at, &this->unk_29A, true);
Math_Vec3f_Diff(&this->actor.world.pos, &player->actor.world.pos, &sp3C);
this->unk_2BC.x = player->actor.world.pos.x + (0.4f * sp3C.x);
@ -549,7 +533,7 @@ void func_8089B4A4(EnDinofos* this) {
if (this->unk_290 < 10) {
func_801A2E54(NA_BGM_MINI_BOSS);
}
Animation_PlayOnce(&this->skelAnime, &D_0600C974);
Animation_PlayOnce(&this->skelAnime, &object_dinofos_Anim_00C974);
this->unk_2BC.x = (Math_SinS(this->actor.shape.rot.y + 0x200) * 123.0f) + this->actor.world.pos.x;
this->unk_2BC.y = this->actor.floorHeight + 11.0f;
this->unk_2BC.z = (Math_CosS(this->actor.shape.rot.y + 0x200) * 123.0f) + this->actor.world.pos.z;
@ -589,7 +573,7 @@ void func_8089B580(EnDinofos* this, GlobalContext* globalCtx) {
}
void func_8089B6E8(EnDinofos* this) {
Animation_MorphToPlayOnce(&this->skelAnime, &D_06009B70, -3.0f);
Animation_MorphToPlayOnce(&this->skelAnime, &object_dinofos_Anim_009B70, -3.0f);
this->actionFunc = func_8089B72C;
}
@ -607,7 +591,7 @@ void func_8089B72C(EnDinofos* this, GlobalContext* globalCtx) {
}
void func_8089B7B0(EnDinofos* this) {
Animation_MorphToLoop(&this->skelAnime, &D_06002E40, -4.0f);
Animation_MorphToLoop(&this->skelAnime, &object_dinofos_Anim_002E40, -4.0f);
this->unk_290 = (s32)Rand_ZeroFloat(20.0f) + 40;
this->unk_292 = 30;
this->actor.speedXZ = 0.0f;
@ -635,7 +619,7 @@ void func_8089B8B0(EnDinofos* this, GlobalContext* globalCtx) {
f32 phi_f0;
if (this->actionFunc != func_8089B98C) {
Animation_MorphToLoop(&this->skelAnime, &D_06000580, -4.0f);
Animation_MorphToLoop(&this->skelAnime, &object_dinofos_Anim_000580, -4.0f);
if (Actor_OtherIsTargeted(globalCtx, &this->actor)) {
phi_f0 = 170.0f;
} else {
@ -690,7 +674,7 @@ void func_8089B98C(EnDinofos* this, GlobalContext* globalCtx) {
void func_8089BAC0(EnDinofos* this) {
if (this->actionFunc != func_8089BB60) {
Animation_MorphToLoop(&this->skelAnime, &D_06000580, -4.0f);
Animation_MorphToLoop(&this->skelAnime, &object_dinofos_Anim_000580, -4.0f);
this->actor.speedXZ = 0.0f;
}
if (BINANG_SUB(this->actor.yawTowardsPlayer, this->actor.shape.rot.y) > 0) {
@ -731,8 +715,8 @@ void func_8089BBB4(EnDinofos* this, GlobalContext* globalCtx) {
if (this->actionFunc == func_8089D1E0) {
this->skelAnime.playSpeed = this->actor.speedXZ * 0.166666671634f;
} else {
Animation_Change(&this->skelAnime, &D_0600D62C, this->actor.speedXZ * 0.166666671634f, 0.0f, 0.0f, 0,
-4.0f);
Animation_Change(&this->skelAnime, &object_dinofos_Anim_00D62C, this->actor.speedXZ * 0.166666671634f, 0.0f,
0.0f, 0, -4.0f);
}
this->actor.world.rot.y = BINANG_ADD(this->actor.shape.rot.y, 0x4000);
@ -811,10 +795,10 @@ void func_8089BD28(EnDinofos* this, GlobalContext* globalCtx) {
void func_8089C024(EnDinofos* this, s32 arg1) {
if (arg1 == 0) {
Animation_MorphToPlayOnce(&this->skelAnime, &D_06001CCC, 2.0f);
Animation_MorphToPlayOnce(&this->skelAnime, &object_dinofos_Anim_001CCC, 2.0f);
func_8089AD70(this);
} else {
Animation_MorphToPlayOnce(&this->skelAnime, &D_06001CCC, -1.0f);
Animation_MorphToPlayOnce(&this->skelAnime, &object_dinofos_Anim_001CCC, -1.0f);
if ((arg1 == 2) || (arg1 == 3)) {
this->colliderJntSph.base.acFlags &= ~AC_ON;
func_8089AD70(this);
@ -878,10 +862,10 @@ void func_8089C2A8(EnDinofos* this, GlobalContext* globalCtx) {
SkelAnime_Update(&this->skelAnime);
this->unk_290++;
Math_ScaledStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsPlayer, 0x1800);
if ((this->actor.velocity.y < 0.0f) && (this->skelAnime.animation == &D_06001CCC)) {
if ((this->actor.velocity.y < 0.0f) && (this->skelAnime.animation == &object_dinofos_Anim_001CCC)) {
this->colliderQuad.base.atFlags |= AT_ON;
this->colliderJntSph.base.acFlags |= AC_ON;
Animation_Change(&this->skelAnime, &D_060025B4, 1.0f, 7.0f, 13.0f, 2, -2.0f);
Animation_Change(&this->skelAnime, &object_dinofos_Anim_0025B4, 1.0f, 7.0f, 13.0f, 2, -2.0f);
}
if (this->actor.bgCheckFlags & 1) {
@ -892,9 +876,9 @@ void func_8089C2A8(EnDinofos* this, GlobalContext* globalCtx) {
void func_8089C398(EnDinofos* this) {
if (this->actionFunc != func_8089C2A8) {
Animation_PlayOnce(&this->skelAnime, &D_06000AF0);
Animation_PlayOnce(&this->skelAnime, &object_dinofos_Anim_000AF0);
} else {
this->skelAnime.endFrame = Animation_GetLastFrame(&D_060025B4);
this->skelAnime.endFrame = Animation_GetLastFrame(&object_dinofos_Anim_0025B4);
}
if (this->actor.speedXZ < 0.0f) {
@ -921,7 +905,7 @@ void func_8089C44C(EnDinofos* this, GlobalContext* globalCtx) {
}
void func_8089C4F8(EnDinofos* this) {
Animation_PlayOnce(&this->skelAnime, &D_060025B4);
Animation_PlayOnce(&this->skelAnime, &object_dinofos_Anim_0025B4);
this->colliderQuad.base.atFlags &= ~AT_BOUNCED;
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_RIZA_CRY);
this->unk_290 = 0;
@ -952,7 +936,7 @@ void func_8089C56C(EnDinofos* this, GlobalContext* globalCtx) {
}
void func_8089C690(EnDinofos* this) {
Animation_Change(&this->skelAnime, &D_060025B4, -1.0f, this->skelAnime.curFrame, 0.0f, 2, 0.0f);
Animation_Change(&this->skelAnime, &object_dinofos_Anim_0025B4, -1.0f, this->skelAnime.curFrame, 0.0f, 2, 0.0f);
this->colliderQuad.base.atFlags &= ~(AT_ON | AT_BOUNCED);
if (this->actionFunc != func_8089C2A8) {
this->actor.world.rot.y = this->actor.shape.rot.y;
@ -1002,7 +986,7 @@ void func_8089C7B8(EnDinofos* this, GlobalContext* globalCtx) {
}
void func_8089C87C(EnDinofos* this, s32 arg1) {
Animation_PlayOnce(&this->skelAnime, &D_0600D21C);
Animation_PlayOnce(&this->skelAnime, &object_dinofos_Anim_00D21C);
func_800BE5CC(&this->actor, &this->colliderJntSph, arg1);
this->actor.shape.rot.y = BINANG_ROT180(this->actor.world.rot.y);
this->actor.speedXZ = 10.0f;
@ -1035,7 +1019,7 @@ void func_8089C938(EnDinofos* this, GlobalContext* globalCtx) {
}
void func_8089CA14(EnDinofos* this) {
Animation_MorphToPlayOnce(&this->skelAnime, &D_06001040, -5.0f);
Animation_MorphToPlayOnce(&this->skelAnime, &object_dinofos_Anim_001040, -5.0f);
this->colliderJntSph.base.acFlags |= AC_ON;
this->actor.speedXZ = 0.0f;
this->actor.world.rot.y = this->actor.shape.rot.y;
@ -1056,7 +1040,7 @@ void func_8089CB10(EnDinofos* this, GlobalContext* globalCtx) {
s32 i;
Sphere16* worldSphere;
Animation_PlayLoop(&this->skelAnime, &D_060013C0);
Animation_PlayLoop(&this->skelAnime, &object_dinofos_Anim_0013C0);
this->unk_290 = 20;
this->actor.speedXZ = 0.0f;
this->colliderJntSph.base.atFlags |= AT_ON;
@ -1128,7 +1112,7 @@ void func_8089CBEC(EnDinofos* this, GlobalContext* globalCtx) {
}
void func_8089CF00(EnDinofos* this, GlobalContext* globalCtx) {
Animation_PlayOnce(&this->skelAnime, &D_060017B8);
Animation_PlayOnce(&this->skelAnime, &object_dinofos_Anim_0017B8);
this->colliderJntSph.base.atFlags &= ~AT_ON;
if (globalCtx->sceneNum == SCENE_MITURIN) {
globalCtx->envCtx.unk_C3 = 255;
@ -1143,7 +1127,7 @@ void func_8089CF70(EnDinofos* this, GlobalContext* globalCtx) {
}
void func_8089CFAC(EnDinofos* this) {
Animation_PlayOnce(&this->skelAnime, &D_0600ABD0);
Animation_PlayOnce(&this->skelAnime, &object_dinofos_Anim_00ABD0);
this->actor.flags &= ~1;
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_RIZA_DEAD);
this->actor.speedXZ = 0.0f;
@ -1183,7 +1167,8 @@ void func_8089D11C(EnDinofos* this, s16 arg1) {
} else {
this->actor.speedXZ = 15.0f;
}
Animation_Change(&this->skelAnime, &D_0600D62C, this->actor.speedXZ * (1.0f / 7.5f), 0.0f, 0.0f, 0, -4.0f);
Animation_Change(&this->skelAnime, &object_dinofos_Anim_00D62C, this->actor.speedXZ * (1.0f / 7.5f), 0.0f, 0.0f, 0,
-4.0f);
this->actor.world.rot.y = BINANG_ADD(this->actor.shape.rot.y, 0x4000);
this->unk_292 = 10;
this->unk_2A4 = 0.0f;

22
src/overlays/actors/ovl_En_Dnb/z_en_dnb.c
View File

@ -5,6 +5,8 @@
*/
#include "z_en_dnb.h"
#include "objects/object_hanareyama_obj/object_hanareyama_obj.h"
#include "objects/gameplay_keep/gameplay_keep.h"
#define FLAGS 0x000000B0
@ -19,12 +21,6 @@ s32 func_80A507C0(EnDnbUnkStruct* arg0, Vec3f arg1, Vec3f arg2, u8 arg3, f32 arg
s32 func_80A5086C(EnDnbUnkStruct* arg0);
s32 func_80A50950(EnDnbUnkStruct* arg0, GlobalContext* globalCtx);
extern Gfx D_06000000[];
extern Gfx D_06000020[];
extern Gfx D_06004638[];
extern Vec3s D_06004710[];
extern CollisionHeader D_06004D8C;
const ActorInit En_Dnb_InitVars = {
ACTOR_EN_DNB,
ACTORCAT_BG,
@ -109,9 +105,9 @@ void EnDnb_Init(Actor* thisx, GlobalContext* globalCtx) {
s16* alloc;
DynaPolyActor_Init(&this->dyna, 1);
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &D_06004D8C);
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &object_hanareyama_obj_Colheader_004D8C);
alloc = (s16*)Lib_SegmentedToVirtual(D_06004710);
alloc = (s16*)Lib_SegmentedToVirtual(object_hanareyama_obj_Vec_004710);
for (i = 0; i < ARRAY_COUNT(this->particles); i++) {
func_80A4FDD0(&this->particles[i], this, alloc, i);
}
@ -156,7 +152,7 @@ void EnDnb_Update(Actor* thisx, GlobalContext* globalCtx) {
void func_80A50510(EnDnb* this, GlobalContext* globalCtx) {
s32 i;
Gfx** gfx = Lib_SegmentedToVirtual(D_06004638);
Gfx** gfx = Lib_SegmentedToVirtual(object_hanareyama_obj_DLArray_004638);
OPEN_DISPS(globalCtx->state.gfxCtx);
@ -181,7 +177,7 @@ void func_80A50510(EnDnb* this, GlobalContext* globalCtx) {
void func_80A5063C(EnDnb* this, GlobalContext* globalCtx) {
s32 i;
Gfx** gfx = Lib_SegmentedToVirtual(D_06004638);
Gfx** gfx = Lib_SegmentedToVirtual(object_hanareyama_obj_DLArray_004638);
OPEN_DISPS(globalCtx->state.gfxCtx);
@ -259,7 +255,7 @@ s32 func_80A5086C(EnDnbUnkStruct* arg0) {
s32 func_80A50950(EnDnbUnkStruct* arg0, GlobalContext* globalCtx2) {
static TexturePtr D_80A50CBC[] = {
D_0408F7E0, D_0408F3E0, D_0408EFE0, D_0408EBE0, D_0408E7E0, D_0408E3E0, D_0408DFE0, D_0408DBE0,
gDust8Tex, gDust7Tex, gDust6Tex, gDust5Tex, gDust4Tex, gDust3Tex, gDust2Tex, gDust1Tex,
};
GlobalContext* globalCtx = globalCtx2;
s32 isGfxSetup = false;
@ -275,7 +271,7 @@ s32 func_80A50950(EnDnbUnkStruct* arg0, GlobalContext* globalCtx2) {
if (arg0->isEnabled == 1) {
if (!isGfxSetup) {
POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, 0);
gSPDisplayList(POLY_XLU_DISP++, D_06000000);
gSPDisplayList(POLY_XLU_DISP++, object_hanareyama_obj_DL_000000);
gDPSetEnvColor(POLY_XLU_DISP++, 255, 255, 255, 0);
isGfxSetup = true;
}
@ -294,7 +290,7 @@ s32 func_80A50950(EnDnbUnkStruct* arg0, GlobalContext* globalCtx2) {
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
idx = (arg0->unk_01 / (f32)arg0->unk_02) * 8.0f;
gSPSegment(POLY_XLU_DISP++, 0x08, Lib_SegmentedToVirtual(D_80A50CBC[idx]));
gSPDisplayList(POLY_XLU_DISP++, D_06000020);
gSPDisplayList(POLY_XLU_DISP++, object_hanareyama_obj_DL_000020);
Matrix_StatePop();
sp5C += 1;

85
src/overlays/actors/ovl_En_Dnk/z_en_dnk.c
View File

@ -5,6 +5,9 @@
*/
#include "z_en_dnk.h"
#include "objects/object_dnk/object_dnk.h"
#include "objects/object_hintnuts/object_hintnuts.h"
#include "objects/object_dekunuts/object_dekunuts.h"
#define FLAGS 0x00000009
@ -19,39 +22,6 @@ void EnDnk_DoNothing(EnDnk* this, GlobalContext* globalCtx);
void func_80A52018(Actor* thisx, GlobalContext* globalCtx);
void func_80A52134(EnDnk* this, GlobalContext* globalCtx);
extern AnimationHeader D_06000168;
extern AnimationHeader D_0600031C;
extern AnimationHeader D_06000430;
extern AnimationHeader D_060006CC;
extern AnimationHeader D_06000894;
extern AnimationHeader D_06000B70;
extern UNK_PTR D_06001680[];
extern UNK_PTR D_06001700[];
extern UNK_PTR D_06001780[];
extern SkeletonHeader D_060023B8;
extern SkeletonHeader D_06002468;
extern AnimationHeader D_060024CC;
extern AnimationHeader D_0600259C;
extern AnimationHeader D_060026C4;
extern SkeletonHeader D_06002848;
extern AnimationHeader D_06002894;
extern AnimationHeader D_06002950;
extern AnimationHeader D_060029BC;
extern AnimationHeader D_06002A08;
extern AnimationHeader D_06002A5C;
extern AnimationHeader D_06002B6C;
extern AnimationHeader D_06002B90;
extern AnimationHeader D_06002BD4;
extern AnimationHeader D_06002DD4;
extern AnimationHeader D_06002E84;
extern AnimationHeader D_06002F7C;
extern AnimationHeader D_06002FA4;
extern AnimationHeader D_06003128;
extern AnimationHeader D_06003180;
extern AnimationHeader D_0600326C;
extern AnimationHeader D_060033E4;
extern AnimationHeader D_06003780;
static s16 D_80A521A0 = 0;
const ActorInit En_Dnk_InitVars = {
@ -124,18 +94,24 @@ static DamageTable sDamageTable = {
};
static ActorAnimationEntryS sAnimations[] = {
{ &D_06000B70, 1.0f, 0, -1, 2, 0 }, { &D_06000B70, 1.0f, 0, -1, 2, -4 }, { &D_06002A08, 1.0f, 0, -1, 0, -4 },
{ &D_0600031C, 1.0f, 0, -1, 0, -4 }, { &D_06000430, 1.0f, -1, -1, 2, 0 }, { &D_06000430, 1.0f, 0, -1, 2, -4 },
{ &D_06000894, 1.0f, 0, -1, 2, -4 }, { &D_06002B6C, 1.0f, 0, -1, 0, 0 }, { &D_06002B6C, 1.0f, 0, -1, 0, -4 },
{ &D_060006CC, 1.0f, 0, -1, 0, -4 }, { &D_06000168, 1.0f, 0, -1, 2, -4 }, { &D_060024CC, 1.0f, -1, -1, 2, 0 },
{ &D_060024CC, 1.0f, 0, -1, 2, -4 }, { &D_060026C4, 1.0f, 0, -1, 2, -4 }, { &D_06002894, 1.0f, 0, -1, 2, -4 },
{ &D_06002B90, 1.0f, 0, -1, 2, -4 }, { &D_06002F7C, 1.0f, 0, -1, 0, 0 }, { &D_06002F7C, 1.0f, 0, -1, 0, -4 },
{ &D_06003128, 1.0f, 0, -1, 0, 0 }, { &D_06003128, 1.0f, 0, -1, 0, -4 }, { &D_060029BC, 1.0f, 0, -1, 0, -4 },
{ &D_06002E84, 1.0f, 0, -1, 0, -4 }, { &D_06000168, 1.0f, 0, -1, 0, -4 }, { &D_0600259C, 1.0f, 0, -1, 2, -4 },
{ &D_06002A5C, 1.0f, 0, -1, 2, 0 }, { &D_06002A5C, 1.0f, 0, -1, 2, -4 }, { &D_06002BD4, 1.0f, 0, -1, 2, -4 },
{ &D_06002DD4, 1.0f, 0, -1, 2, -4 }, { &D_06002FA4, 1.0f, 0, -1, 0, -4 }, { &D_06003180, 1.0f, 0, -1, 2, -4 },
{ &D_0600326C, 1.0f, 0, -1, 0, 0 }, { &D_0600326C, 1.0f, 0, -1, 0, -4 }, { &D_060033E4, 1.0f, 0, -1, 0, -4 },
{ &D_06003780, 1.0f, 0, -1, 0, 0 }, { &D_06003780, 1.0f, 0, -1, 0, -4 }, { &D_06002950, 1.0f, 0, -1, 0, 0 },
{ &object_dnk_Anim_000B70, 1.0f, 0, -1, 2, 0 }, { &object_dnk_Anim_000B70, 1.0f, 0, -1, 2, -4 },
{ &object_dnk_Anim_002A08, 1.0f, 0, -1, 0, -4 }, { &object_dnk_Anim_00031C, 1.0f, 0, -1, 0, -4 },
{ &object_dnk_Anim_000430, 1.0f, -1, -1, 2, 0 }, { &object_dnk_Anim_000430, 1.0f, 0, -1, 2, -4 },
{ &object_dnk_Anim_000894, 1.0f, 0, -1, 2, -4 }, { &object_dnk_Anim_002B6C, 1.0f, 0, -1, 0, 0 },
{ &object_dnk_Anim_002B6C, 1.0f, 0, -1, 0, -4 }, { &object_dnk_Anim_0006CC, 1.0f, 0, -1, 0, -4 },
{ &object_hintnuts_Anim_000168, 1.0f, 0, -1, 2, -4 }, { &object_hintnuts_Anim_0024CC, 1.0f, -1, -1, 2, 0 },
{ &object_hintnuts_Anim_0024CC, 1.0f, 0, -1, 2, -4 }, { &object_hintnuts_Anim_0026C4, 1.0f, 0, -1, 2, -4 },
{ &object_hintnuts_Anim_002894, 1.0f, 0, -1, 2, -4 }, { &object_hintnuts_Anim_002B90, 1.0f, 0, -1, 2, -4 },
{ &object_hintnuts_Anim_002F7C, 1.0f, 0, -1, 0, 0 }, { &object_hintnuts_Anim_002F7C, 1.0f, 0, -1, 0, -4 },
{ &object_hintnuts_Anim_003128, 1.0f, 0, -1, 0, 0 }, { &object_hintnuts_Anim_003128, 1.0f, 0, -1, 0, -4 },
{ &object_hintnuts_Anim_0029BC, 1.0f, 0, -1, 0, -4 }, { &object_hintnuts_Anim_002E84, 1.0f, 0, -1, 0, -4 },
{ &object_dekunuts_Anim_000168, 1.0f, 0, -1, 0, -4 }, { &object_dekunuts_Anim_00259C, 1.0f, 0, -1, 2, -4 },
{ &object_dekunuts_Anim_002A5C, 1.0f, 0, -1, 2, 0 }, { &object_dekunuts_Anim_002A5C, 1.0f, 0, -1, 2, -4 },
{ &object_dekunuts_Anim_002BD4, 1.0f, 0, -1, 2, -4 }, { &object_dekunuts_Anim_002DD4, 1.0f, 0, -1, 2, -4 },
{ &object_dekunuts_Anim_002FA4, 1.0f, 0, -1, 0, -4 }, { &object_dekunuts_Anim_003180, 1.0f, 0, -1, 2, -4 },
{ &object_dekunuts_Anim_00326C, 1.0f, 0, -1, 0, 0 }, { &object_dekunuts_Anim_00326C, 1.0f, 0, -1, 0, -4 },
{ &object_dekunuts_Anim_0033E4, 1.0f, 0, -1, 0, -4 }, { &object_dekunuts_Anim_003780, 1.0f, 0, -1, 0, 0 },
{ &object_dekunuts_Anim_003780, 1.0f, 0, -1, 0, -4 }, { &object_dekunuts_Anim_002950, 1.0f, 0, -1, 0, 0 },
};
s32 func_80A514F0(SkelAnime* skelAnime, s16 animIndex) {
@ -144,7 +120,7 @@ s32 func_80A514F0(SkelAnime* skelAnime, s16 animIndex) {
s32 sp30 = false;
if (animIndex >= 0) {
if (animIndex < 36) {
if (animIndex < ARRAY_COUNT(sAnimations)) {
sp30 = true;
frameCount = sAnimations[animIndex].frameCount;
if (frameCount < 0) {
@ -184,17 +160,20 @@ void func_80A51648(EnDnk* this, GlobalContext* globalCtx) {
switch (ENDNK_GET_3(&this->actor)) {
case ENDNK_GET_3_0:
SkelAnime_Init(globalCtx, &this->skelAnime, &D_06002848, NULL, this->jointTable, this->morphTable, 11);
SkelAnime_Init(globalCtx, &this->skelAnime, &object_dnk_Skel_002848, NULL, this->jointTable,
this->morphTable, 11);
func_80A514F0(&this->skelAnime, 7);
break;
case ENDNK_GET_3_1:
SkelAnime_Init(globalCtx, &this->skelAnime, &D_060023B8, NULL, this->jointTable, this->morphTable, 10);
SkelAnime_Init(globalCtx, &this->skelAnime, &object_hintnuts_Skel_0023B8.sh, NULL, this->jointTable,
this->morphTable, 10);
func_80A514F0(&this->skelAnime, 18);
break;
case ENDNK_GET_3_2:
SkelAnime_Init(globalCtx, &this->skelAnime, &D_06002468, NULL, this->jointTable, this->morphTable, 10);
SkelAnime_Init(globalCtx, &this->skelAnime, &object_dekunuts_Skel_002468, NULL, this->jointTable,
this->morphTable, 10);
func_80A514F0(&this->skelAnime, 35);
break;
}
@ -328,10 +307,10 @@ void func_80A51AA4(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s*
}
void func_80A51CB8(EnDnk* this, GlobalContext* globalCtx) {
static UNK_PTR D_80A5245C[] = {
D_06001680,
D_06001700,
D_06001780,
static TexturePtr D_80A5245C[] = {
object_dnk_Tex_001680,
object_dnk_Tex_001700,
object_dnk_Tex_001780,
};
s32 pad;

Some files were not shown because too many files have changed in this diff Show More