PublicMirrors/Starship
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Starship.git synced 2025-01-23 13:35:11 +03:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity

actor docs

Browse Source
This commit is contained in:
Alejandro Javier Asenjo Nitti 2024-08-15 11:54:53 -03:00
parent 92ccdeb991
commit a1134c296a
59 changed files with 542 additions and 514 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
assets/yaml/jp/rev0/ast_7_ti_1.yaml
View File

@ -152,14 +152,14 @@ aTiDelphorDL:
D_TI1_7009B58: D_TI1_7009B58:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x07009B58, symbol: D_TI1_7009B58 } { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x07009B58, symbol: D_TI1_7009B58 }
D_TI1_7009D60: aTi1Bomb1DL:
{ type: GFX, offset: 0x7009D60, symbol: D_TI1_7009D60 } { type: GFX, offset: 0x7009D60, symbol: aTi1Bomb1DL }
D_TI1_700A190: D_TI1_700A190:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0700A190, symbol: D_TI1_700A190 } { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0700A190, symbol: D_TI1_700A190 }
aTi1BombDL: aTi1Bomb2DL:
{ type: GFX, offset: 0x700A990, symbol: aTi1BombDL } { type: GFX, offset: 0x700A990, symbol: aTi1Bomb2DL }
D_TI1_700AAD8: D_TI1_700AAD8:
{ type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 16, offset: 0x700AAD8, symbol: D_TI1_700AAD8, tlut: 0x700AB58 } { type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 16, offset: 0x700AAD8, symbol: D_TI1_700AAD8, tlut: 0x700AB58 }
@ -182,8 +182,8 @@ D_TI1_700B5B8:
D_TI1_700B7B8: D_TI1_700B7B8:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x0700B7B8, symbol: D_TI1_700B7B8 } { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x0700B7B8, symbol: D_TI1_700B7B8 }
D_TI1_700B9C0: aTi1FekudaGun1DL:
{ type: GFX, offset: 0x700B9C0, symbol: D_TI1_700B9C0 } { type: GFX, offset: 0x700B9C0, symbol: aTi1FekudaGun1DL }
D_TI1_700BB10: D_TI1_700BB10:
{ type: GFX, offset: 0x700BB10, symbol: D_TI1_700BB10 } { type: GFX, offset: 0x700BB10, symbol: D_TI1_700BB10 }
@ -197,8 +197,8 @@ D_TI1_700BFB0:
D_TI1_700C3B0: D_TI1_700C3B0:
{ type: TEXTURE, ctype: u16, format: TLUT, colors: 128, offset: 0x0700C3B0, symbol: D_TI1_700C3B0 } { type: TEXTURE, ctype: u16, format: TLUT, colors: 128, offset: 0x0700C3B0, symbol: D_TI1_700C3B0 }
D_TI1_700C4B0: aTi1FekudaDL:
{ type: GFX, offset: 0x700C4B0, symbol: D_TI1_700C4B0 } { type: GFX, offset: 0x700C4B0, symbol: aTi1FekudaDL }
aTi1DesertRoverAnim: aTi1DesertRoverAnim:
{ type: SF64:ANIM, offset: 0x700C8D8, symbol: aTi1DesertRoverAnim } { type: SF64:ANIM, offset: 0x700C8D8, symbol: aTi1DesertRoverAnim }
@ -206,8 +206,8 @@ aTi1DesertRoverAnim:
aTi1DesertRoverSkel: aTi1DesertRoverSkel:
{ type: SF64:SKELETON, offset: 0x700C964, symbol: aTi1DesertRoverSkel } { type: SF64:SKELETON, offset: 0x700C964, symbol: aTi1DesertRoverSkel }
D_TI1_700C980: aTi1FekudaGun2DL:
{ type: GFX, offset: 0x700C980, symbol: D_TI1_700C980 } { type: GFX, offset: 0x700C980, symbol: aTi1FekudaGun2DL }
D_TI1_700CAF4: D_TI1_700CAF4:
{ type: SF64:ANIM, offset: 0x700CAF4, symbol: D_TI1_700CAF4} { type: SF64:ANIM, offset: 0x700CAF4, symbol: D_TI1_700CAF4}
@ -215,8 +215,8 @@ D_TI1_700CAF4:
D_TI1_700CB60: D_TI1_700CB60:
{type: SF64:SKELETON, offset: 0x700CB60, symbol: D_TI1_700CB60} {type: SF64:SKELETON, offset: 0x700CB60, symbol: D_TI1_700CB60}
D_TI1_700D534: aTiRascoAnim:
{ type: SF64:ANIM, offset: 0x700D534, symbol: D_TI1_700D534 } { type: SF64:ANIM, offset: 0x700D534, symbol: aTiRascoAnim }
aTiRascoSkel: aTiRascoSkel:
{type: SF64:SKELETON, offset: 0x700D700, symbol: aTiRascoSkel} {type: SF64:SKELETON, offset: 0x700D700, symbol: aTiRascoSkel}
@ -257,8 +257,8 @@ D_TI1_700E030:
D_TI1_700E1E8: D_TI1_700E1E8:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x0700E1E8, symbol: D_TI1_700E1E8 } { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x0700E1E8, symbol: D_TI1_700E1E8 }
D_TI1_700E3F0: aTiBoulderDL:
{ type: GFX, offset: 0x700E3F0, symbol: D_TI1_700E3F0 } { type: GFX, offset: 0x700E3F0, symbol: aTiBoulderDL }
D_TI1_700E858: D_TI1_700E858:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x0700E858, symbol: D_TI1_700E858 } { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x0700E858, symbol: D_TI1_700E858 }

40
assets/yaml/jp/rev0/ast_aquas.yaml
View File

@ -16,11 +16,11 @@
D_AQ_6000000: D_AQ_6000000:
{ type: TEXTURE, ctype: u8, format: IA8, width: 96, height: 13, offset: 0x6000000, symbol: D_AQ_6000000 } { type: TEXTURE, ctype: u8, format: IA8, width: 96, height: 13, offset: 0x6000000, symbol: D_AQ_6000000 }
D_AQ_6000AE4: aAqSquidAnim:
{ type: SF64:ANIM, offset: 0x6000AE4, symbol: D_AQ_6000AE4 } { type: SF64:ANIM, offset: 0x6000AE4, symbol: aAqSquidAnim }
D_AQ_6000DB0: aAqSquidSkel:
{ type: SF64:SKELETON, offset: 0x6000DB0, symbol: D_AQ_6000DB0 } { type: SF64:SKELETON, offset: 0x6000DB0, symbol: aAqSquidSkel }
D_AQ_6000E10: D_AQ_6000E10:
{ type: GFX, offset: 0x6000E10, symbol: D_AQ_6000E10 } { type: GFX, offset: 0x6000E10, symbol: D_AQ_6000E10 }
@ -28,11 +28,11 @@ D_AQ_6000E10:
D_AQ_6001130: D_AQ_6001130:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6001130, symbol: D_AQ_6001130 } { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6001130, symbol: D_AQ_6001130 }
D_AQ_6002628: aAqAnglerFishAnim:
{ type: SF64:ANIM, offset: 0x6002628, symbol: D_AQ_6002628 } { type: SF64:ANIM, offset: 0x6002628, symbol: aAqAnglerFishAnim }
D_AQ_6002874: aAqAnglerFishSkel:
{ type: SF64:SKELETON, offset: 0x6002874, symbol: D_AQ_6002874 } { type: SF64:SKELETON, offset: 0x6002874, symbol: aAqAnglerFishSkel }
# #
aAqOysterDL: aAqOysterDL:
@ -65,11 +65,11 @@ D_AQ_6004DB0:
D_AQ_60050F0: D_AQ_60050F0:
{ type: GFX, offset: 0x60050F0, symbol: D_AQ_60050F0 } { type: GFX, offset: 0x60050F0, symbol: D_AQ_60050F0 }
D_AQ_6005954: aAqSculpinAnim:
{ type: SF64:ANIM, offset: 0x6005954, symbol: D_AQ_6005954 } { type: SF64:ANIM, offset: 0x6005954, symbol: aAqSculpinAnim }
D_AQ_6005A80: aAqSculpinSkel:
{ type: SF64:SKELETON, offset: 0x6005A80, symbol: D_AQ_6005A80 } { type: SF64:SKELETON, offset: 0x6005A80, symbol: aAqSculpinSkel }
D_AQ_6006160: D_AQ_6006160:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6006160, symbol: D_AQ_6006160 } { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6006160, symbol: D_AQ_6006160 }
@ -413,8 +413,8 @@ D_AQ_601FD70:
D_AQ_6020A40: D_AQ_6020A40:
{ type: SF64:ANIM, offset: 0x6020A40, symbol: D_AQ_6020A40 } { type: SF64:ANIM, offset: 0x6020A40, symbol: D_AQ_6020A40 }
D_AQ_6020C6C: aAqSeaweedSkel:
{ type: SF64:SKELETON, offset: 0x6020C6C, symbol: D_AQ_6020C6C } { type: SF64:SKELETON, offset: 0x6020C6C, symbol: aAqSeaweedSkel }
D_AQ_6021058: D_AQ_6021058:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6021058, symbol: D_AQ_6021058 } { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6021058, symbol: D_AQ_6021058 }
@ -488,14 +488,14 @@ aAqPearlDL:
D_AQ_6024F80: D_AQ_6024F80:
{ type: SF64:ANIM, offset: 0x6024F80, symbol: D_AQ_6024F80 } { type: SF64:ANIM, offset: 0x6024F80, symbol: D_AQ_6024F80 }
D_AQ_602512C: aAqGaroaSkel:
{ type: SF64:SKELETON, offset: 0x602512C, symbol: D_AQ_602512C } { type: SF64:SKELETON, offset: 0x602512C, symbol: aAqGaroaSkel }
D_AQ_60260EC: aAqSpindlyFishAnim:
{ type: SF64:ANIM, offset: 0x60260EC, symbol: D_AQ_60260EC } { type: SF64:ANIM, offset: 0x60260EC, symbol: aAqSpindlyFishAnim }
D_AQ_60263F8: aAqSpindlyFishSkel:
{ type: SF64:SKELETON, offset: 0x60263F8, symbol: D_AQ_60263F8 } { type: SF64:SKELETON, offset: 0x60263F8, symbol: aAqSpindlyFishSkel }
D_AQ_6026460: D_AQ_6026460:
{ type: GFX, offset: 0x6026460, symbol: D_AQ_6026460 } { type: GFX, offset: 0x6026460, symbol: D_AQ_6026460 }

8
assets/yaml/jp/rev0/ast_bolse.yaml
View File

@ -25,11 +25,11 @@ D_BO_6000D80:
D_BO_6001908: D_BO_6001908:
{ type: TEXTURE, format: RGBA16, offset: 0x6001908, width: 16, height: 16, ctype: u16, symbol: D_BO_6001908 } { type: TEXTURE, format: RGBA16, offset: 0x6001908, width: 16, height: 16, ctype: u16, symbol: D_BO_6001908 }
D_BO_6001C64: aBoBaseCoreAnim:
{ type: SF64:ANIM, offset: 0x6001C64, symbol: D_BO_6001C64 } { type: SF64:ANIM, offset: 0x6001C64, symbol: aBoBaseCoreAnim }
D_BO_6001FB0: aBoBaseCoreSkel:
{ type: SF64:SKELETON, offset: 0x6001FB0, symbol: D_BO_6001FB0 } { type: SF64:SKELETON, offset: 0x6001FB0, symbol: aBoBaseCoreSkel }
D_BO_6002020: D_BO_6002020:
{ type: GFX, offset: 0x6002020, symbol: D_BO_6002020 } { type: GFX, offset: 0x6002020, symbol: D_BO_6002020 }

4
assets/yaml/jp/rev0/ast_common.yaml
View File

@ -494,8 +494,8 @@ D_1017698:
D_1017798: D_1017798:
{ type: TEXTURE, format: TLUT, colors: 16, offset: 0x1017798, ctype: u16, symbol: D_1017798 } { type: TEXTURE, format: TLUT, colors: 16, offset: 0x1017798, ctype: u16, symbol: D_1017798 }
D_10177C0: aActorSuppliesDL:
{ type: GFX, offset: 0x10177C0, symbol: D_10177C0 } { type: GFX, offset: 0x10177C0, symbol: aActorSuppliesDL }
D_1017A38: D_1017A38:
{ type: TEXTURE, format: RGBA16, width: 32, height: 32, ctype: u16, offset: 0x1017A38, symbol: D_1017A38 } { type: TEXTURE, format: RGBA16, width: 32, height: 32, ctype: u16, offset: 0x1017A38, symbol: D_1017A38 }

16
assets/yaml/jp/rev0/ast_corneria.yaml
View File

@ -240,8 +240,8 @@ aCoArch1DL:
D_CO_6020760: D_CO_6020760:
{ type: GFX, offset: 0x6020760, symbol: D_CO_6020760 } { type: GFX, offset: 0x6020760, symbol: D_CO_6020760 }
D_CO_6020B40: aCoRadarDL:
{ type: GFX, offset: 0x6020B40, symbol: D_CO_6020B40 } { type: GFX, offset: 0x6020B40, symbol: aCoRadarDL }
D_CO_6021188: D_CO_6021188:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06021188, symbol: D_CO_6021188 } { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06021188, symbol: D_CO_6021188 }
@ -279,11 +279,11 @@ D_CO_6028260:
D_CO_6028A60: D_CO_6028A60:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06028A60, symbol: D_CO_6028A60 } { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06028A60, symbol: D_CO_6028A60 }
D_CO_6029528: aCoSkibotAnim:
{ type: SF64:ANIM, offset: 0x6029528, symbol: D_CO_6029528 } { type: SF64:ANIM, offset: 0x6029528, symbol: aCoSkibotAnim }
D_CO_6029674: aCoSkibotSkel:
{ type: SF64:SKELETON, offset: 0x6029674, symbol: D_CO_6029674 } { type: SF64:SKELETON, offset: 0x6029674, symbol: aCoSkibotSkel }
aCoGaruda1Anim: aCoGaruda1Anim:
{ type: SF64:ANIM, offset: 0x602991C, symbol: aCoGaruda1Anim } { type: SF64:ANIM, offset: 0x602991C, symbol: aCoGaruda1Anim }
@ -306,8 +306,8 @@ aCoDoorsSkel:
aCoGrangaWalkingAnim: aCoGrangaWalkingAnim:
{ type: SF64:ANIM, offset: 0x602BC18, symbol: aCoGrangaWalkingAnim } { type: SF64:ANIM, offset: 0x602BC18, symbol: aCoGrangaWalkingAnim }
D_CO_602BE64: aCoGrangaSkel:
{ type: SF64:SKELETON, offset: 0x602BE64, symbol: D_CO_602BE64 } { type: SF64:SKELETON, offset: 0x602BE64, symbol: aCoGrangaSkel }
aCoGrangaStationaryAnim: aCoGrangaStationaryAnim:
{ type: SF64:ANIM, offset: 0x602C0D0, symbol: aCoGrangaStationaryAnim } { type: SF64:ANIM, offset: 0x602C0D0, symbol: aCoGrangaStationaryAnim }

12
assets/yaml/jp/rev0/ast_enmy_space.yaml
View File

@ -14,8 +14,8 @@ D_ENMY_SPACE_4000080:
D_ENMY_SPACE_400014C: D_ENMY_SPACE_400014C:
{ type: SF64:SKELETON, offset: 0x400014C, symbol: D_ENMY_SPACE_400014C } { type: SF64:SKELETON, offset: 0x400014C, symbol: D_ENMY_SPACE_400014C }
D_ENMY_SPACE_4000170: aEnmySpMeMora1DL:
{ type: GFX, offset: 0x4000170, symbol: D_ENMY_SPACE_4000170 } { type: GFX, offset: 0x4000170, symbol: aEnmySpMeMora1DL }
D_ENMY_SPACE_4000650: D_ENMY_SPACE_4000650:
{ type: GFX, offset: 0x4000650, symbol: D_ENMY_SPACE_4000650 } { type: GFX, offset: 0x4000650, symbol: D_ENMY_SPACE_4000650 }
@ -89,8 +89,8 @@ D_ENMY_SPACE_4007870:
D_ENMY_SPACE_4006FE8: D_ENMY_SPACE_4006FE8:
{ type: TEXTURE, format: RGBA16, offset: 0x4006FE8, width: 32, height: 32, ctype: u16, symbol: D_ENMY_SPACE_4006FE8 } { type: TEXTURE, format: RGBA16, offset: 0x4006FE8, width: 32, height: 32, ctype: u16, symbol: D_ENMY_SPACE_4006FE8 }
D_ENMY_SPACE_40084D0: aEnmySpMeMora2DL:
{ type: GFX, offset: 0x40084D0, symbol: D_ENMY_SPACE_40084D0 } { type: GFX, offset: 0x40084D0, symbol: aEnmySpMeMora2DL }
D_ENMY_SPACE_4008550: D_ENMY_SPACE_4008550:
{ type: TEXTURE, format: RGBA16, offset: 0x04008550, width: 32, height: 32, ctype: u16, symbol: D_ENMY_SPACE_4008550 } { type: TEXTURE, format: RGBA16, offset: 0x04008550, width: 32, height: 32, ctype: u16, symbol: D_ENMY_SPACE_4008550 }
@ -116,8 +116,8 @@ D_ENMY_SPACE_400A30C:
D_ENMY_SPACE_400A398: D_ENMY_SPACE_400A398:
{ type: SF64:SKELETON, offset: 0x400A398, symbol: D_ENMY_SPACE_400A398 } { type: SF64:SKELETON, offset: 0x400A398, symbol: D_ENMY_SPACE_400A398 }
D_ENMY_SPACE_400A630: aEnmySpMeMora3DL:
{ type: GFX, offset: 0x400A630, symbol: D_ENMY_SPACE_400A630 } { type: GFX, offset: 0x400A630, symbol: aEnmySpMeMora3DL }
D_ENMY_SPACE_400AAE0: D_ENMY_SPACE_400AAE0:

8
assets/yaml/jp/rev0/ast_fortuna.yaml
View File

@ -32,8 +32,8 @@ D_FO_6002090:
D_FO_6002890: D_FO_6002890:
{ type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x6002890, ctype: u16, symbol: D_FO_6002890 } { type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x6002890, ctype: u16, symbol: D_FO_6002890 }
D_FO_6003090: aFoBaseDL2:
{ type: GFX, offset: 0x6003090, symbol: D_FO_6003090 } { type: GFX, offset: 0x6003090, symbol: aFoBaseDL2 }
D_FO_6003EC0: D_FO_6003EC0:
{ type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x6003EC0, ctype: u16, symbol: D_FO_6003EC0 } { type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x6003EC0, ctype: u16, symbol: D_FO_6003EC0 }
@ -131,8 +131,8 @@ D_FO_600B5C0:
D_FO_600C5C0: D_FO_600C5C0:
{ type: TEXTURE, format: RGBA16, width: 64, height: 32, offset: 0x600C5C0, ctype: u16, symbol: D_FO_600C5C0 } { type: TEXTURE, format: RGBA16, width: 64, height: 32, offset: 0x600C5C0, ctype: u16, symbol: D_FO_600C5C0 }
D_FO_600D5C0: aFoBaseDL1:
{ type: GFX, offset: 0x600D5C0, symbol: D_FO_600D5C0 } { type: GFX, offset: 0x600D5C0, symbol: aFoBaseDL1 }
D_FO_600D7E8: D_FO_600D7E8:
{ type: TEXTURE, format: RGBA16, width: 16, height: 16, offset: 0x600D7E8, ctype: u16, symbol: D_FO_600D7E8 } { type: TEXTURE, format: RGBA16, width: 16, height: 16, offset: 0x600D7E8, ctype: u16, symbol: D_FO_600D7E8 }

8
assets/yaml/jp/rev0/ast_great_fox.yaml
View File

@ -9,8 +9,8 @@
- '#include "sf64object.h"' - '#include "sf64object.h"'
# Great Fox Model # Great Fox Model
D_GREAT_FOX_E000000: aGreatFoxIntactDL:
{ type: GFX, offset: 0xE000000, symbol: D_GREAT_FOX_E000000 } { type: GFX, offset: 0xE000000, symbol: aGreatFoxIntactDL }
D_GREAT_FOX_E0094B0: D_GREAT_FOX_E0094B0:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0E0094B0, symbol: D_GREAT_FOX_E0094B0 } { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0E0094B0, symbol: D_GREAT_FOX_E0094B0 }
@ -50,8 +50,8 @@ D_GREAT_FOX_E007430:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 8, height: 8, offset: 0x0E007430, symbol: D_GREAT_FOX_E007430 } { type: TEXTURE, ctype: u16, format: RGBA16, width: 8, height: 8, offset: 0x0E007430, symbol: D_GREAT_FOX_E007430 }
# Great Fox Model (damaged) # Great Fox Model (damaged)
D_GREAT_FOX_E003AB0: aGreatFoxDamagedDL:
{ type: GFX, offset: 0xE003AB0, symbol: D_GREAT_FOX_E003AB0 } { type: GFX, offset: 0xE003AB0, symbol: aGreatFoxDamagedDL }
D_GREAT_FOX_E0074B0: D_GREAT_FOX_E0074B0:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x0E0074B0, symbol: D_GREAT_FOX_E0074B0 } { type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x0E0074B0, symbol: D_GREAT_FOX_E0074B0 }

8
assets/yaml/jp/rev0/ast_macbeth.yaml
View File

@ -433,8 +433,8 @@ D_MA_6019220:
D_MA_60192B0: D_MA_60192B0:
{type: TEXTURE, format: RGBA16, ctype: u16, width: 64, height: 32, offset: 0x60192B0, symbol: D_MA_60192B0} {type: TEXTURE, format: RGBA16, ctype: u16, width: 64, height: 32, offset: 0x60192B0, symbol: D_MA_60192B0}
D_MA_601A2B0: aMaBoulderDL:
{type: GFX, offset: 0x601A2B0, symbol: D_MA_601A2B0} {type: GFX, offset: 0x601A2B0, symbol: aMaBoulderDL}
D_MA_601A5E8: D_MA_601A5E8:
{ type: TEXTURE, format: CI8, ctype: u8, width: 16, height: 16, offset: 0x601A5E8, symbol: D_MA_601A5E8, tlut: 0x601A6E8} { type: TEXTURE, format: CI8, ctype: u8, width: 16, height: 16, offset: 0x601A5E8, symbol: D_MA_601A5E8, tlut: 0x601A6E8}
@ -904,8 +904,8 @@ aMaProximityLightHitbox:
aMaBarrierHitbox: aMaBarrierHitbox:
{type: SF64:HITBOX, offset: 0x6036728, symbol: aMaBarrierHitbox} {type: SF64:HITBOX, offset: 0x6036728, symbol: aMaBarrierHitbox}
aMaActor219Hitbox: aMaFallingBoulderHitbox:
{type: SF64:HITBOX, offset: 0x6036744, symbol: aMaActor219Hitbox} {type: SF64:HITBOX, offset: 0x6036744, symbol: aMaFallingBoulderHitbox}
aMaFloor6Hitbox: aMaFloor6Hitbox:
{type: SF64:HITBOX, offset: 0x6036760, symbol: aMaFloor6Hitbox} {type: SF64:HITBOX, offset: 0x6036760, symbol: aMaFloor6Hitbox}

12
assets/yaml/jp/rev0/ast_meteo.yaml
View File

@ -182,11 +182,11 @@ D_ME_601C8E0:
D_ME_601D800: D_ME_601D800:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0x0601D800, symbol: D_ME_601D800 } { type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0x0601D800, symbol: D_ME_601D800 }
D_ME_601E8C4: aMeHopBotAnim:
{ type: SF64:ANIM, offset: 0x601E8C4, symbol: D_ME_601E8C4 } { type: SF64:ANIM, offset: 0x601E8C4, symbol: aMeHopBotAnim }
D_ME_601E9D0: aMeHopBotSkel:
{ type: SF64:SKELETON, offset: 0x601E9D0, symbol: D_ME_601E9D0 } { type: SF64:SKELETON, offset: 0x601E9D0, symbol: aMeHopBotSkel }
# Beta Meteo background, unused # Beta Meteo background, unused
D_ME_601EA00: D_ME_601EA00:
@ -253,8 +253,8 @@ aMeMolarRockDL:
{ type: GFX, offset: 0x06024B60, symbol: aMeMolarRockDL } { type: GFX, offset: 0x06024B60, symbol: aMeMolarRockDL }
# Unused Meteo Ball # Unused Meteo Ball
D_ME_6025B50: aMeMeteoBallDL:
{ type: GFX, offset: 0x06025B50, symbol: D_ME_6025B50 } { type: GFX, offset: 0x06025B50, symbol: aMeMeteoBallDL }
D_ME_6025350: D_ME_6025350:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6025350, symbol: D_ME_6025350 } { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6025350, symbol: D_ME_6025350 }

4
assets/yaml/jp/rev0/ast_sector_x.yaml
View File

@ -186,8 +186,8 @@ D_SX_601C690:
D_SX_60206DC: D_SX_60206DC:
{ type: SF64:ANIM, offset: 0x60206DC, symbol: D_SX_60206DC } { type: SF64:ANIM, offset: 0x60206DC, symbol: D_SX_60206DC }
D_SX_6020C68: aSxSpyborgSkel:
{ type: SF64:SKELETON, offset: 0x6020C68, symbol: D_SX_6020C68 } { type: SF64:SKELETON, offset: 0x6020C68, symbol: aSxSpyborgSkel }
D_SX_6020D20: D_SX_6020D20:
{ type: GFX, offset: 0x6020D20, symbol: D_SX_6020D20 } { type: GFX, offset: 0x6020D20, symbol: D_SX_6020D20 }

4
assets/yaml/jp/rev0/ast_sector_z.yaml
View File

@ -97,8 +97,8 @@ D_SZ_6004558:
D_SZ_6004570: D_SZ_6004570:
{ type: GFX, offset: 0x6004570, symbol: D_SZ_6004570 } { type: GFX, offset: 0x6004570, symbol: D_SZ_6004570 }
aSZSpaceJunk4DL: aSzSpaceJunk4DL:
{ type: GFX, offset: 0x60045E0, symbol: aSZSpaceJunk4DL } { type: GFX, offset: 0x60045E0, symbol: aSzSpaceJunk4DL }
D_SZ_60047E0: D_SZ_60047E0:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x60047E0, symbol: D_SZ_60047E0 } { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x60047E0, symbol: D_SZ_60047E0 }

12
assets/yaml/jp/rev0/ast_solar.yaml
View File

@ -127,8 +127,8 @@ D_SO_60151A0:
D_SO_6015810: D_SO_6015810:
{ type: GFX, offset: 0x6015810, symbol: D_SO_6015810} { type: GFX, offset: 0x6015810, symbol: D_SO_6015810}
D_SO_6016CF0: aSoRock3DL:
{ type: GFX, offset: 0x6016CF0, symbol: D_SO_6016CF0} { type: GFX, offset: 0x6016CF0, symbol: aSoRock3DL}
D_SO_6016F08: D_SO_6016F08:
{ type: TEXTURE, ctype: u8, format: CI8, width: 16, height: 16, offset: 0x6016F08, symbol: D_SO_6016F08} { type: TEXTURE, ctype: u8, format: CI8, width: 16, height: 16, offset: 0x6016F08, symbol: D_SO_6016F08}
@ -136,8 +136,8 @@ D_SO_6016F08:
D_SO_6017008: D_SO_6017008:
{ type: TEXTURE, ctype: u16, format: TLUT, colors: 64, offset: 0x6017008, symbol: D_SO_6017008} { type: TEXTURE, ctype: u16, format: TLUT, colors: 64, offset: 0x6017008, symbol: D_SO_6017008}
D_SO_6017090: aSoRock2DL:
{ type: GFX, offset: 0x6017090, symbol: D_SO_6017090} { type: GFX, offset: 0x6017090, symbol: aSoRock2DL}
D_SO_6017200: D_SO_6017200:
{ type: TEXTURE, ctype: u8, format: CI8, width: 16, height: 16, offset: 0x6017200, symbol: D_SO_6017200} { type: TEXTURE, ctype: u8, format: CI8, width: 16, height: 16, offset: 0x6017200, symbol: D_SO_6017200}
@ -145,8 +145,8 @@ D_SO_6017200:
D_SO_6017300: D_SO_6017300:
{ type: TEXTURE, ctype: u16, format: TLUT, colors: 56, offset: 0x6017300, symbol: D_SO_6017300} { type: TEXTURE, ctype: u16, format: TLUT, colors: 56, offset: 0x6017300, symbol: D_SO_6017300}
D_SO_6017370: aSoRock1DL:
{ type: GFX, offset: 0x6017370, symbol: D_SO_6017370} { type: GFX, offset: 0x6017370, symbol: aSoRock1DL}
D_SO_60174E0: D_SO_60174E0:
{ type: TEXTURE, ctype: u8, format: CI8, width: 8, height: 8, offset: 0x60174E0, symbol: D_SO_60174E0} { type: TEXTURE, ctype: u8, format: CI8, width: 8, height: 8, offset: 0x60174E0, symbol: D_SO_60174E0}

4
assets/yaml/jp/rev0/ast_ve1_boss.yaml
View File

@ -95,8 +95,8 @@ D_VE1_900C700:
aVe1MonkeyStatueAnim: aVe1MonkeyStatueAnim:
{type: SF64:ANIM, offset: 0x900D098, symbol: aVe1MonkeyStatueAnim} {type: SF64:ANIM, offset: 0x900D098, symbol: aVe1MonkeyStatueAnim}
D_VE1_900D164: aVe1MonkeyStatueSkel:
{type: SF64:SKELETON, offset: 0x900D164, symbol: D_VE1_900D164} {type: SF64:SKELETON, offset: 0x900D164, symbol: aVe1MonkeyStatueSkel}
D_VE1_900D180: D_VE1_900D180:
{type: GFX, offset: 0x900D180, symbol: D_VE1_900D180} {type: GFX, offset: 0x900D180, symbol: D_VE1_900D180}

16
assets/yaml/jp/rev0/ast_venom_2.yaml
View File

@ -66,8 +66,8 @@ D_VE2_6006E20:
D_VE2_6007650: D_VE2_6007650:
{ type: GFX, offset: 0x6007650, symbol: D_VE2_6007650 } { type: GFX, offset: 0x6007650, symbol: D_VE2_6007650 }
D_VE2_6007E20: aAndLaserEmitterDL:
{ type: GFX, offset: 0x6007E20, symbol: D_VE2_6007E20 } { type: GFX, offset: 0x6007E20, symbol: aAndLaserEmitterDL }
D_VE2_6008170: D_VE2_6008170:
{ type: TEXTURE, format: RGBA16, width: 16, height: 16, offset: 0x6008170, ctype: u16, symbol: D_VE2_6008170 } { type: TEXTURE, format: RGBA16, width: 16, height: 16, offset: 0x6008170, ctype: u16, symbol: D_VE2_6008170 }
@ -78,8 +78,8 @@ aVe2TowerDL:
D_VE2_6008AF8: D_VE2_6008AF8:
{ type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x6008AF8, ctype: u16, symbol: D_VE2_6008AF8 } { type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x6008AF8, ctype: u16, symbol: D_VE2_6008AF8 }
D_VE2_6009300: aAndBrainWasteDL:
{ type: GFX, offset: 0x6009300, symbol: D_VE2_6009300 } { type: GFX, offset: 0x6009300, symbol: aAndBrainWasteDL }
D_VE2_6009390: D_VE2_6009390:
{ type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x6009390, ctype: u16, symbol: D_VE2_6009390 } { type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x6009390, ctype: u16, symbol: D_VE2_6009390 }
@ -180,11 +180,11 @@ D_VE2_6014658:
D_VE2_6014844: D_VE2_6014844:
{ type: SF64:SKELETON, offset: 0x6014844, symbol: D_VE2_6014844 } { type: SF64:SKELETON, offset: 0x6014844, symbol: D_VE2_6014844 }
D_VE2_6014904: aVe2BaseAnim:
{ type: SF64:ANIM, offset: 0x6014904, symbol: D_VE2_6014904 } { type: SF64:ANIM, offset: 0x6014904, symbol: aVe2BaseAnim }
D_VE2_60149D0: aVe2BaseSkel:
{ type: SF64:SKELETON, offset: 0x60149D0, symbol: D_VE2_60149D0 } { type: SF64:SKELETON, offset: 0x60149D0, symbol: aVe2BaseSkel }
D_VE2_6014D50: D_VE2_6014D50:
{ type: SF64:ENVIRONMENT, offset: 0x6014D50, symbol: D_VE2_6014D50 } { type: SF64:ENVIRONMENT, offset: 0x6014D50, symbol: D_VE2_6014D50 }

24
assets/yaml/jp/rev0/ast_zoness.yaml
View File

@ -24,8 +24,8 @@ D_ZO_6000E98:
D_ZO_6001098: D_ZO_6001098:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x6001098, symbol: D_ZO_6001098} { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x6001098, symbol: D_ZO_6001098}
D_ZO_60012A0: aZoDodoraHeadDL:
{ type: GFX, offset: 0x60012A0, symbol: D_ZO_60012A0} { type: GFX, offset: 0x60012A0, symbol: aZoDodoraHeadDL}
D_ZO_6001810: D_ZO_6001810:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6001810, symbol: D_ZO_6001810} { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6001810, symbol: D_ZO_6001810}
@ -135,11 +135,11 @@ D_ZO_600C780:
D_ZO_600D990: D_ZO_600D990:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x600D990, symbol: D_ZO_600D990} { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x600D990, symbol: D_ZO_600D990}
D_ZO_600E5EC: aZoBirdAnim:
{ type: SF64:ANIM, offset: 0x600E5EC, symbol: D_ZO_600E5EC} { type: SF64:ANIM, offset: 0x600E5EC, symbol: aZoBirdAnim}
D_ZO_600E7D8: aZoBirdSkel:
{ type: SF64:SKELETON, offset: 0x600E7D8, symbol: D_ZO_600E7D8} { type: SF64:SKELETON, offset: 0x600E7D8, symbol: aZoBirdSkel}
aZoOilRig3DL: aZoOilRig3DL:
{ type: GFX, offset: 0x600E820, symbol: aZoOilRig3DL} { type: GFX, offset: 0x600E820, symbol: aZoOilRig3DL}
@ -273,8 +273,8 @@ D_ZO_6019738:
D_ZO_601996C: D_ZO_601996C:
{ type: SF64:ANIM, offset: 0x601996C, symbol: D_ZO_601996C} { type: SF64:ANIM, offset: 0x601996C, symbol: D_ZO_601996C}
D_ZO_6019E18: aZoSarumarineSkel:
{ type: SF64:SKELETON, offset: 0x6019E18, symbol: D_ZO_6019E18} { type: SF64:SKELETON, offset: 0x6019E18, symbol: aZoSarumarineSkel}
D_ZO_6019EB0: D_ZO_6019EB0:
{ type: GFX, offset: 0x6019EB0, symbol: D_ZO_6019EB0} { type: GFX, offset: 0x6019EB0, symbol: D_ZO_6019EB0}
@ -450,14 +450,14 @@ D_ZO_6023488:
D_ZO_6023690: D_ZO_6023690:
{ type: GFX, offset: 0x6023690, symbol: D_ZO_6023690} { type: GFX, offset: 0x6023690, symbol: D_ZO_6023690}
D_ZO_6023730: aZoDodoraTailDL:
{ type: GFX, offset: 0x6023730, symbol: D_ZO_6023730} { type: GFX, offset: 0x6023730, symbol: aZoDodoraTailDL}
D_ZO_60237E0: D_ZO_60237E0:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x60237E0, symbol: D_ZO_60237E0} { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x60237E0, symbol: D_ZO_60237E0}
D_ZO_60239E0: aZoDodoraBodyDL:
{ type: GFX, offset: 0x60239E0, symbol: D_ZO_60239E0} { type: GFX, offset: 0x60239E0, symbol: aZoDodoraBodyDL}
D_ZO_6023D50: D_ZO_6023D50:
{ type: GFX, offset: 0x6023D50, symbol: D_ZO_6023D50} { type: GFX, offset: 0x6023D50, symbol: D_ZO_6023D50}

28
assets/yaml/us/rev1/ast_7_ti_1.yaml
View File

@ -152,14 +152,14 @@ aTiDelphorDL:
D_TI1_7009B58: D_TI1_7009B58:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x07009B58, symbol: D_TI1_7009B58 } { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x07009B58, symbol: D_TI1_7009B58 }
D_TI1_7009D60: aTi1Bomb1DL:
{ type: GFX, offset: 0x7009D60, symbol: D_TI1_7009D60 } { type: GFX, offset: 0x7009D60, symbol: aTi1Bomb1DL }
D_TI1_700A190: D_TI1_700A190:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0700A190, symbol: D_TI1_700A190 } { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0700A190, symbol: D_TI1_700A190 }
aTi1BombDL: aTi1Bomb2DL:
{ type: GFX, offset: 0x700A990, symbol: aTi1BombDL } { type: GFX, offset: 0x700A990, symbol: aTi1Bomb2DL }
D_TI1_700AAD8: D_TI1_700AAD8:
{ type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 16, offset: 0x700AAD8, symbol: D_TI1_700AAD8, tlut: 0x700AB58 } { type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 16, offset: 0x700AAD8, symbol: D_TI1_700AAD8, tlut: 0x700AB58 }
@ -182,8 +182,8 @@ D_TI1_700B5B8:
D_TI1_700B7B8: D_TI1_700B7B8:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x0700B7B8, symbol: D_TI1_700B7B8 } { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x0700B7B8, symbol: D_TI1_700B7B8 }
D_TI1_700B9C0: aTi1FekudaGun1DL:
{ type: GFX, offset: 0x700B9C0, symbol: D_TI1_700B9C0 } { type: GFX, offset: 0x700B9C0, symbol: aTi1FekudaGun1DL }
D_TI1_700BB10: D_TI1_700BB10:
{ type: GFX, offset: 0x700BB10, symbol: D_TI1_700BB10 } { type: GFX, offset: 0x700BB10, symbol: D_TI1_700BB10 }
@ -197,8 +197,8 @@ D_TI1_700BFB0:
D_TI1_700C3B0: D_TI1_700C3B0:
{ type: TEXTURE, ctype: u16, format: TLUT, colors: 128, offset: 0x0700C3B0, symbol: D_TI1_700C3B0 } { type: TEXTURE, ctype: u16, format: TLUT, colors: 128, offset: 0x0700C3B0, symbol: D_TI1_700C3B0 }
D_TI1_700C4B0: aTi1FekudaDL:
{ type: GFX, offset: 0x700C4B0, symbol: D_TI1_700C4B0 } { type: GFX, offset: 0x700C4B0, symbol: aTi1FekudaDL }
aTi1DesertRoverAnim: aTi1DesertRoverAnim:
{ type: SF64:ANIM, offset: 0x700C8D8, symbol: aTi1DesertRoverAnim } { type: SF64:ANIM, offset: 0x700C8D8, symbol: aTi1DesertRoverAnim }
@ -206,8 +206,8 @@ aTi1DesertRoverAnim:
aTi1DesertRoverSkel: aTi1DesertRoverSkel:
{ type: SF64:SKELETON, offset: 0x700C964, symbol: aTi1DesertRoverSkel } { type: SF64:SKELETON, offset: 0x700C964, symbol: aTi1DesertRoverSkel }
D_TI1_700C980: aTi1FekudaGun2DL:
{ type: GFX, offset: 0x700C980, symbol: D_TI1_700C980 } { type: GFX, offset: 0x700C980, symbol: aTi1FekudaGun2DL }
D_TI1_700CAF4: D_TI1_700CAF4:
{ type: SF64:ANIM, offset: 0x700CAF4, symbol: D_TI1_700CAF4} { type: SF64:ANIM, offset: 0x700CAF4, symbol: D_TI1_700CAF4}
@ -215,8 +215,8 @@ D_TI1_700CAF4:
D_TI1_700CB60: D_TI1_700CB60:
{type: SF64:SKELETON, offset: 0x700CB60, symbol: D_TI1_700CB60} {type: SF64:SKELETON, offset: 0x700CB60, symbol: D_TI1_700CB60}
D_TI1_700D534: aTiRascoAnim:
{ type: SF64:ANIM, offset: 0x700D534, symbol: D_TI1_700D534 } { type: SF64:ANIM, offset: 0x700D534, symbol: aTiRascoAnim }
aTiRascoSkel: aTiRascoSkel:
{type: SF64:SKELETON, offset: 0x700D700, symbol: aTiRascoSkel} {type: SF64:SKELETON, offset: 0x700D700, symbol: aTiRascoSkel}
@ -257,8 +257,8 @@ D_TI1_700E030:
D_TI1_700E1E8: D_TI1_700E1E8:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x0700E1E8, symbol: D_TI1_700E1E8 } { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x0700E1E8, symbol: D_TI1_700E1E8 }
D_TI1_700E3F0: aTiBoulderDL:
{ type: GFX, offset: 0x700E3F0, symbol: D_TI1_700E3F0 } { type: GFX, offset: 0x700E3F0, symbol: aTiBoulderDL }
D_TI1_700E858: D_TI1_700E858:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x0700E858, symbol: D_TI1_700E858 } { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x0700E858, symbol: D_TI1_700E858 }

40
assets/yaml/us/rev1/ast_aquas.yaml
View File

@ -16,11 +16,11 @@
D_AQ_6000000: D_AQ_6000000:
{ type: TEXTURE, ctype: u8, format: IA8, width: 96, height: 13, offset: 0x6000000, symbol: D_AQ_6000000 } { type: TEXTURE, ctype: u8, format: IA8, width: 96, height: 13, offset: 0x6000000, symbol: D_AQ_6000000 }
D_AQ_6000AE4: aAqSquidAnim:
{ type: SF64:ANIM, offset: 0x6000AE4, symbol: D_AQ_6000AE4 } { type: SF64:ANIM, offset: 0x6000AE4, symbol: aAqSquidAnim }
D_AQ_6000DB0: aAqSquidSkel:
{ type: SF64:SKELETON, offset: 0x6000DB0, symbol: D_AQ_6000DB0 } { type: SF64:SKELETON, offset: 0x6000DB0, symbol: aAqSquidSkel }
D_AQ_6000E10: D_AQ_6000E10:
{ type: GFX, offset: 0x6000E10, symbol: D_AQ_6000E10 } { type: GFX, offset: 0x6000E10, symbol: D_AQ_6000E10 }
@ -28,11 +28,11 @@ D_AQ_6000E10:
D_AQ_6001130: D_AQ_6001130:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6001130, symbol: D_AQ_6001130 } { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6001130, symbol: D_AQ_6001130 }
D_AQ_6002628: aAqAnglerFishAnim:
{ type: SF64:ANIM, offset: 0x6002628, symbol: D_AQ_6002628 } { type: SF64:ANIM, offset: 0x6002628, symbol: aAqAnglerFishAnim }
D_AQ_6002874: aAqAnglerFishSkel:
{ type: SF64:SKELETON, offset: 0x6002874, symbol: D_AQ_6002874 } { type: SF64:SKELETON, offset: 0x6002874, symbol: aAqAnglerFishSkel }
# #
aAqOysterDL: aAqOysterDL:
@ -65,11 +65,11 @@ D_AQ_6004DB0:
D_AQ_60050F0: D_AQ_60050F0:
{ type: GFX, offset: 0x60050F0, symbol: D_AQ_60050F0 } { type: GFX, offset: 0x60050F0, symbol: D_AQ_60050F0 }
D_AQ_6005954: aAqSculpinAnim:
{ type: SF64:ANIM, offset: 0x6005954, symbol: D_AQ_6005954 } { type: SF64:ANIM, offset: 0x6005954, symbol: aAqSculpinAnim }
D_AQ_6005A80: aAqSculpinSkel:
{ type: SF64:SKELETON, offset: 0x6005A80, symbol: D_AQ_6005A80 } { type: SF64:SKELETON, offset: 0x6005A80, symbol: aAqSculpinSkel }
D_AQ_6006160: D_AQ_6006160:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6006160, symbol: D_AQ_6006160 } { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6006160, symbol: D_AQ_6006160 }
@ -413,8 +413,8 @@ D_AQ_601FD70:
D_AQ_6020A40: D_AQ_6020A40:
{ type: SF64:ANIM, offset: 0x6020A40, symbol: D_AQ_6020A40 } { type: SF64:ANIM, offset: 0x6020A40, symbol: D_AQ_6020A40 }
D_AQ_6020C6C: aAqSeaweedSkel:
{ type: SF64:SKELETON, offset: 0x6020C6C, symbol: D_AQ_6020C6C } { type: SF64:SKELETON, offset: 0x6020C6C, symbol: aAqSeaweedSkel }
D_AQ_6021058: D_AQ_6021058:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6021058, symbol: D_AQ_6021058 } { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6021058, symbol: D_AQ_6021058 }
@ -488,14 +488,14 @@ aAqPearlDL:
D_AQ_6024F80: D_AQ_6024F80:
{ type: SF64:ANIM, offset: 0x6024F80, symbol: D_AQ_6024F80 } { type: SF64:ANIM, offset: 0x6024F80, symbol: D_AQ_6024F80 }
D_AQ_602512C: aAqGaroaSkel:
{ type: SF64:SKELETON, offset: 0x602512C, symbol: D_AQ_602512C } { type: SF64:SKELETON, offset: 0x602512C, symbol: aAqGaroaSkel }
D_AQ_60260EC: aAqSpindlyFishAnim:
{ type: SF64:ANIM, offset: 0x60260EC, symbol: D_AQ_60260EC } { type: SF64:ANIM, offset: 0x60260EC, symbol: aAqSpindlyFishAnim }
D_AQ_60263F8: aAqSpindlyFishSkel:
{ type: SF64:SKELETON, offset: 0x60263F8, symbol: D_AQ_60263F8 } { type: SF64:SKELETON, offset: 0x60263F8, symbol: aAqSpindlyFishSkel }
D_AQ_6026460: D_AQ_6026460:
{ type: GFX, offset: 0x6026460, symbol: D_AQ_6026460 } { type: GFX, offset: 0x6026460, symbol: D_AQ_6026460 }

8
assets/yaml/us/rev1/ast_bolse.yaml
View File

@ -25,11 +25,11 @@ D_BO_6000D80:
D_BO_6001908: D_BO_6001908:
{ type: TEXTURE, format: RGBA16, offset: 0x6001908, width: 16, height: 16, ctype: u16, symbol: D_BO_6001908 } { type: TEXTURE, format: RGBA16, offset: 0x6001908, width: 16, height: 16, ctype: u16, symbol: D_BO_6001908 }
D_BO_6001C64: aBoBaseCoreAnim:
{ type: SF64:ANIM, offset: 0x6001C64, symbol: D_BO_6001C64 } { type: SF64:ANIM, offset: 0x6001C64, symbol: aBoBaseCoreAnim }
D_BO_6001FB0: aBoBaseCoreSkel:
{ type: SF64:SKELETON, offset: 0x6001FB0, symbol: D_BO_6001FB0 } { type: SF64:SKELETON, offset: 0x6001FB0, symbol: aBoBaseCoreSkel }
D_BO_6002020: D_BO_6002020:
{ type: GFX, offset: 0x6002020, symbol: D_BO_6002020 } { type: GFX, offset: 0x6002020, symbol: D_BO_6002020 }

4
assets/yaml/us/rev1/ast_common.yaml
View File

@ -494,8 +494,8 @@ D_1017698:
D_1017798: D_1017798:
{ type: TEXTURE, format: TLUT, colors: 16, offset: 0x1017798, ctype: u16, symbol: D_1017798 } { type: TEXTURE, format: TLUT, colors: 16, offset: 0x1017798, ctype: u16, symbol: D_1017798 }
D_10177C0: aActorSuppliesDL:
{ type: GFX, offset: 0x10177C0, symbol: D_10177C0 } { type: GFX, offset: 0x10177C0, symbol: aActorSuppliesDL }
D_1017A38: D_1017A38:
{ type: TEXTURE, format: RGBA16, width: 32, height: 32, ctype: u16, offset: 0x1017A38, symbol: D_1017A38 } { type: TEXTURE, format: RGBA16, width: 32, height: 32, ctype: u16, offset: 0x1017A38, symbol: D_1017A38 }

16
assets/yaml/us/rev1/ast_corneria.yaml
View File

@ -240,8 +240,8 @@ aCoArch1DL:
D_CO_6020760: D_CO_6020760:
{ type: GFX, offset: 0x6020760, symbol: D_CO_6020760 } { type: GFX, offset: 0x6020760, symbol: D_CO_6020760 }
D_CO_6020B40: aCoRadarDL:
{ type: GFX, offset: 0x6020B40, symbol: D_CO_6020B40 } { type: GFX, offset: 0x6020B40, symbol: aCoRadarDL }
D_CO_6021188: D_CO_6021188:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06021188, symbol: D_CO_6021188 } { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06021188, symbol: D_CO_6021188 }
@ -279,11 +279,11 @@ D_CO_6028260:
D_CO_6028A60: D_CO_6028A60:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06028A60, symbol: D_CO_6028A60 } { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06028A60, symbol: D_CO_6028A60 }
D_CO_6029528: aCoSkibotAnim:
{ type: SF64:ANIM, offset: 0x6029528, symbol: D_CO_6029528 } { type: SF64:ANIM, offset: 0x6029528, symbol: aCoSkibotAnim }
D_CO_6029674: aCoSkibotSkel:
{ type: SF64:SKELETON, offset: 0x6029674, symbol: D_CO_6029674 } { type: SF64:SKELETON, offset: 0x6029674, symbol: aCoSkibotSkel }
aCoGaruda1Anim: aCoGaruda1Anim:
{ type: SF64:ANIM, offset: 0x602991C, symbol: aCoGaruda1Anim } { type: SF64:ANIM, offset: 0x602991C, symbol: aCoGaruda1Anim }
@ -306,8 +306,8 @@ aCoDoorsSkel:
aCoGrangaWalkingAnim: aCoGrangaWalkingAnim:
{ type: SF64:ANIM, offset: 0x602BC18, symbol: aCoGrangaWalkingAnim } { type: SF64:ANIM, offset: 0x602BC18, symbol: aCoGrangaWalkingAnim }
D_CO_602BE64: aCoGrangaSkel:
{ type: SF64:SKELETON, offset: 0x602BE64, symbol: D_CO_602BE64 } { type: SF64:SKELETON, offset: 0x602BE64, symbol: aCoGrangaSkel }
aCoGrangaStationaryAnim: aCoGrangaStationaryAnim:
{ type: SF64:ANIM, offset: 0x602C0D0, symbol: aCoGrangaStationaryAnim } { type: SF64:ANIM, offset: 0x602C0D0, symbol: aCoGrangaStationaryAnim }

12
assets/yaml/us/rev1/ast_enmy_space.yaml
View File

@ -14,8 +14,8 @@ D_ENMY_SPACE_4000080:
D_ENMY_SPACE_400014C: D_ENMY_SPACE_400014C:
{ type: SF64:SKELETON, offset: 0x400014C, symbol: D_ENMY_SPACE_400014C } { type: SF64:SKELETON, offset: 0x400014C, symbol: D_ENMY_SPACE_400014C }
D_ENMY_SPACE_4000170: aEnmySpMeMora1DL:
{ type: GFX, offset: 0x4000170, symbol: D_ENMY_SPACE_4000170 } { type: GFX, offset: 0x4000170, symbol: aEnmySpMeMora1DL }
D_ENMY_SPACE_4000650: D_ENMY_SPACE_4000650:
{ type: GFX, offset: 0x4000650, symbol: D_ENMY_SPACE_4000650 } { type: GFX, offset: 0x4000650, symbol: D_ENMY_SPACE_4000650 }
@ -89,8 +89,8 @@ D_ENMY_SPACE_4007870:
D_ENMY_SPACE_4006FE8: D_ENMY_SPACE_4006FE8:
{ type: TEXTURE, format: RGBA16, offset: 0x4006FE8, width: 32, height: 32, ctype: u16, symbol: D_ENMY_SPACE_4006FE8 } { type: TEXTURE, format: RGBA16, offset: 0x4006FE8, width: 32, height: 32, ctype: u16, symbol: D_ENMY_SPACE_4006FE8 }
D_ENMY_SPACE_40084D0: aEnmySpMeMora2DL:
{ type: GFX, offset: 0x40084D0, symbol: D_ENMY_SPACE_40084D0 } { type: GFX, offset: 0x40084D0, symbol: aEnmySpMeMora2DL }
D_ENMY_SPACE_4008550: D_ENMY_SPACE_4008550:
{ type: TEXTURE, format: RGBA16, offset: 0x04008550, width: 32, height: 32, ctype: u16, symbol: D_ENMY_SPACE_4008550 } { type: TEXTURE, format: RGBA16, offset: 0x04008550, width: 32, height: 32, ctype: u16, symbol: D_ENMY_SPACE_4008550 }
@ -116,8 +116,8 @@ D_ENMY_SPACE_400A30C:
D_ENMY_SPACE_400A398: D_ENMY_SPACE_400A398:
{ type: SF64:SKELETON, offset: 0x400A398, symbol: D_ENMY_SPACE_400A398 } { type: SF64:SKELETON, offset: 0x400A398, symbol: D_ENMY_SPACE_400A398 }
D_ENMY_SPACE_400A630: aEnmySpMeMora3DL:
{ type: GFX, offset: 0x400A630, symbol: D_ENMY_SPACE_400A630 } { type: GFX, offset: 0x400A630, symbol: aEnmySpMeMora3DL }
D_ENMY_SPACE_400AAE0: D_ENMY_SPACE_400AAE0:

8
assets/yaml/us/rev1/ast_fortuna.yaml
View File

@ -32,8 +32,8 @@ D_FO_6002090:
D_FO_6002890: D_FO_6002890:
{ type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x6002890, ctype: u16, symbol: D_FO_6002890 } { type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x6002890, ctype: u16, symbol: D_FO_6002890 }
D_FO_6003090: aFoBaseDL2:
{ type: GFX, offset: 0x6003090, symbol: D_FO_6003090 } { type: GFX, offset: 0x6003090, symbol: aFoBaseDL2 }
D_FO_6003EC0: D_FO_6003EC0:
{ type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x6003EC0, ctype: u16, symbol: D_FO_6003EC0 } { type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x6003EC0, ctype: u16, symbol: D_FO_6003EC0 }
@ -131,8 +131,8 @@ D_FO_600B5C0:
D_FO_600C5C0: D_FO_600C5C0:
{ type: TEXTURE, format: RGBA16, width: 64, height: 32, offset: 0x600C5C0, ctype: u16, symbol: D_FO_600C5C0 } { type: TEXTURE, format: RGBA16, width: 64, height: 32, offset: 0x600C5C0, ctype: u16, symbol: D_FO_600C5C0 }
D_FO_600D5C0: aFoBaseDL1:
{ type: GFX, offset: 0x600D5C0, symbol: D_FO_600D5C0 } { type: GFX, offset: 0x600D5C0, symbol: aFoBaseDL1 }
D_FO_600D7E8: D_FO_600D7E8:
{ type: TEXTURE, format: RGBA16, width: 16, height: 16, offset: 0x600D7E8, ctype: u16, symbol: D_FO_600D7E8 } { type: TEXTURE, format: RGBA16, width: 16, height: 16, offset: 0x600D7E8, ctype: u16, symbol: D_FO_600D7E8 }

8
assets/yaml/us/rev1/ast_great_fox.yaml
View File

@ -9,8 +9,8 @@
- '#include "sf64object.h"' - '#include "sf64object.h"'
# Great Fox Model # Great Fox Model
D_GREAT_FOX_E000000: aGreatFoxIntactDL:
{ type: GFX, offset: 0xE000000, symbol: D_GREAT_FOX_E000000 } { type: GFX, offset: 0xE000000, symbol: aGreatFoxIntactDL }
D_GREAT_FOX_E0094B0: D_GREAT_FOX_E0094B0:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0E0094B0, symbol: D_GREAT_FOX_E0094B0 } { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0E0094B0, symbol: D_GREAT_FOX_E0094B0 }
@ -50,8 +50,8 @@ D_GREAT_FOX_E007430:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 8, height: 8, offset: 0x0E007430, symbol: D_GREAT_FOX_E007430 } { type: TEXTURE, ctype: u16, format: RGBA16, width: 8, height: 8, offset: 0x0E007430, symbol: D_GREAT_FOX_E007430 }
# Great Fox Model (damaged) # Great Fox Model (damaged)
D_GREAT_FOX_E003AB0: aGreatFoxDamagedDL:
{ type: GFX, offset: 0xE003AB0, symbol: D_GREAT_FOX_E003AB0 } { type: GFX, offset: 0xE003AB0, symbol: aGreatFoxDamagedDL }
D_GREAT_FOX_E0074B0: D_GREAT_FOX_E0074B0:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x0E0074B0, symbol: D_GREAT_FOX_E0074B0 } { type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x0E0074B0, symbol: D_GREAT_FOX_E0074B0 }

8
assets/yaml/us/rev1/ast_macbeth.yaml
View File

@ -433,8 +433,8 @@ D_MA_6019220:
D_MA_60192B0: D_MA_60192B0:
{type: TEXTURE, format: RGBA16, ctype: u16, width: 64, height: 32, offset: 0x60192B0, symbol: D_MA_60192B0} {type: TEXTURE, format: RGBA16, ctype: u16, width: 64, height: 32, offset: 0x60192B0, symbol: D_MA_60192B0}
D_MA_601A2B0: aMaBoulderDL:
{type: GFX, offset: 0x601A2B0, symbol: D_MA_601A2B0} {type: GFX, offset: 0x601A2B0, symbol: aMaBoulderDL}
D_MA_601A5E8: D_MA_601A5E8:
{ type: TEXTURE, format: CI8, ctype: u8, width: 16, height: 16, offset: 0x601A5E8, symbol: D_MA_601A5E8, tlut: 0x601A6E8} { type: TEXTURE, format: CI8, ctype: u8, width: 16, height: 16, offset: 0x601A5E8, symbol: D_MA_601A5E8, tlut: 0x601A6E8}
@ -904,8 +904,8 @@ aMaProximityLightHitbox:
aMaBarrierHitbox: aMaBarrierHitbox:
{type: SF64:HITBOX, offset: 0x6036728, symbol: aMaBarrierHitbox} {type: SF64:HITBOX, offset: 0x6036728, symbol: aMaBarrierHitbox}
aMaActor219Hitbox: aMaFallingBoulderHitbox:
{type: SF64:HITBOX, offset: 0x6036744, symbol: aMaActor219Hitbox} {type: SF64:HITBOX, offset: 0x6036744, symbol: aMaFallingBoulderHitbox}
aMaFloor6Hitbox: aMaFloor6Hitbox:
{type: SF64:HITBOX, offset: 0x6036760, symbol: aMaFloor6Hitbox} {type: SF64:HITBOX, offset: 0x6036760, symbol: aMaFloor6Hitbox}

12
assets/yaml/us/rev1/ast_meteo.yaml
View File

@ -182,11 +182,11 @@ D_ME_601C8E0:
D_ME_601D800: D_ME_601D800:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0x0601D800, symbol: D_ME_601D800 } { type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0x0601D800, symbol: D_ME_601D800 }
D_ME_601E8C4: aMeHopBotAnim:
{ type: SF64:ANIM, offset: 0x601E8C4, symbol: D_ME_601E8C4 } { type: SF64:ANIM, offset: 0x601E8C4, symbol: aMeHopBotAnim }
D_ME_601E9D0: aMeHopBotSkel:
{ type: SF64:SKELETON, offset: 0x601E9D0, symbol: D_ME_601E9D0 } { type: SF64:SKELETON, offset: 0x601E9D0, symbol: aMeHopBotSkel }
# Beta Meteo background, unused # Beta Meteo background, unused
D_ME_601EA00: D_ME_601EA00:
@ -253,8 +253,8 @@ aMeMolarRockDL:
{ type: GFX, offset: 0x06024B60, symbol: aMeMolarRockDL } { type: GFX, offset: 0x06024B60, symbol: aMeMolarRockDL }
# Unused Meteo Ball # Unused Meteo Ball
D_ME_6025B50: aMeMeteoBallDL:
{ type: GFX, offset: 0x06025B50, symbol: D_ME_6025B50 } { type: GFX, offset: 0x06025B50, symbol: aMeMeteoBallDL }
D_ME_6025350: D_ME_6025350:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6025350, symbol: D_ME_6025350 } { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6025350, symbol: D_ME_6025350 }

4
assets/yaml/us/rev1/ast_sector_x.yaml
View File

@ -186,8 +186,8 @@ D_SX_601C690:
D_SX_60206DC: D_SX_60206DC:
{ type: SF64:ANIM, offset: 0x60206DC, symbol: D_SX_60206DC } { type: SF64:ANIM, offset: 0x60206DC, symbol: D_SX_60206DC }
D_SX_6020C68: aSxSpyborgSkel:
{ type: SF64:SKELETON, offset: 0x6020C68, symbol: D_SX_6020C68 } { type: SF64:SKELETON, offset: 0x6020C68, symbol: aSxSpyborgSkel }
D_SX_6020D20: D_SX_6020D20:
{ type: GFX, offset: 0x6020D20, symbol: D_SX_6020D20 } { type: GFX, offset: 0x6020D20, symbol: D_SX_6020D20 }

4
assets/yaml/us/rev1/ast_sector_z.yaml
View File

@ -97,8 +97,8 @@ D_SZ_6004558:
D_SZ_6004570: D_SZ_6004570:
{ type: GFX, offset: 0x6004570, symbol: D_SZ_6004570 } { type: GFX, offset: 0x6004570, symbol: D_SZ_6004570 }
aSZSpaceJunk4DL: aSzSpaceJunk4DL:
{ type: GFX, offset: 0x60045E0, symbol: aSZSpaceJunk4DL } { type: GFX, offset: 0x60045E0, symbol: aSzSpaceJunk4DL }
D_SZ_60047E0: D_SZ_60047E0:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x60047E0, symbol: D_SZ_60047E0 } { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x60047E0, symbol: D_SZ_60047E0 }

12
assets/yaml/us/rev1/ast_solar.yaml
View File

@ -127,8 +127,8 @@ D_SO_60151A0:
D_SO_6015810: D_SO_6015810:
{ type: GFX, offset: 0x6015810, symbol: D_SO_6015810} { type: GFX, offset: 0x6015810, symbol: D_SO_6015810}
D_SO_6016CF0: aSoRock3DL:
{ type: GFX, offset: 0x6016CF0, symbol: D_SO_6016CF0} { type: GFX, offset: 0x6016CF0, symbol: aSoRock3DL}
D_SO_6016F08: D_SO_6016F08:
{ type: TEXTURE, ctype: u8, format: CI8, width: 16, height: 16, offset: 0x6016F08, symbol: D_SO_6016F08} { type: TEXTURE, ctype: u8, format: CI8, width: 16, height: 16, offset: 0x6016F08, symbol: D_SO_6016F08}
@ -136,8 +136,8 @@ D_SO_6016F08:
D_SO_6017008: D_SO_6017008:
{ type: TEXTURE, ctype: u16, format: TLUT, colors: 64, offset: 0x6017008, symbol: D_SO_6017008} { type: TEXTURE, ctype: u16, format: TLUT, colors: 64, offset: 0x6017008, symbol: D_SO_6017008}
D_SO_6017090: aSoRock2DL:
{ type: GFX, offset: 0x6017090, symbol: D_SO_6017090} { type: GFX, offset: 0x6017090, symbol: aSoRock2DL}
D_SO_6017200: D_SO_6017200:
{ type: TEXTURE, ctype: u8, format: CI8, width: 16, height: 16, offset: 0x6017200, symbol: D_SO_6017200} { type: TEXTURE, ctype: u8, format: CI8, width: 16, height: 16, offset: 0x6017200, symbol: D_SO_6017200}
@ -145,8 +145,8 @@ D_SO_6017200:
D_SO_6017300: D_SO_6017300:
{ type: TEXTURE, ctype: u16, format: TLUT, colors: 56, offset: 0x6017300, symbol: D_SO_6017300} { type: TEXTURE, ctype: u16, format: TLUT, colors: 56, offset: 0x6017300, symbol: D_SO_6017300}
D_SO_6017370: aSoRock1DL:
{ type: GFX, offset: 0x6017370, symbol: D_SO_6017370} { type: GFX, offset: 0x6017370, symbol: aSoRock1DL}
D_SO_60174E0: D_SO_60174E0:
{ type: TEXTURE, ctype: u8, format: CI8, width: 8, height: 8, offset: 0x60174E0, symbol: D_SO_60174E0} { type: TEXTURE, ctype: u8, format: CI8, width: 8, height: 8, offset: 0x60174E0, symbol: D_SO_60174E0}

4
assets/yaml/us/rev1/ast_ve1_boss.yaml
View File

@ -95,8 +95,8 @@ D_VE1_900C700:
aVe1MonkeyStatueAnim: aVe1MonkeyStatueAnim:
{type: SF64:ANIM, offset: 0x900D098, symbol: aVe1MonkeyStatueAnim} {type: SF64:ANIM, offset: 0x900D098, symbol: aVe1MonkeyStatueAnim}
D_VE1_900D164: aVe1MonkeyStatueSkel:
{type: SF64:SKELETON, offset: 0x900D164, symbol: D_VE1_900D164} {type: SF64:SKELETON, offset: 0x900D164, symbol: aVe1MonkeyStatueSkel}
D_VE1_900D180: D_VE1_900D180:
{type: GFX, offset: 0x900D180, symbol: D_VE1_900D180} {type: GFX, offset: 0x900D180, symbol: D_VE1_900D180}

16
assets/yaml/us/rev1/ast_venom_2.yaml
View File

@ -66,8 +66,8 @@ D_VE2_6006E20:
D_VE2_6007650: D_VE2_6007650:
{ type: GFX, offset: 0x6007650, symbol: D_VE2_6007650 } { type: GFX, offset: 0x6007650, symbol: D_VE2_6007650 }
D_VE2_6007E20: aAndLaserEmitterDL:
{ type: GFX, offset: 0x6007E20, symbol: D_VE2_6007E20 } { type: GFX, offset: 0x6007E20, symbol: aAndLaserEmitterDL }
D_VE2_6008170: D_VE2_6008170:
{ type: TEXTURE, format: RGBA16, width: 16, height: 16, offset: 0x6008170, ctype: u16, symbol: D_VE2_6008170 } { type: TEXTURE, format: RGBA16, width: 16, height: 16, offset: 0x6008170, ctype: u16, symbol: D_VE2_6008170 }
@ -78,8 +78,8 @@ aVe2TowerDL:
D_VE2_6008AF8: D_VE2_6008AF8:
{ type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x6008AF8, ctype: u16, symbol: D_VE2_6008AF8 } { type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x6008AF8, ctype: u16, symbol: D_VE2_6008AF8 }
D_VE2_6009300: aAndBrainWasteDL:
{ type: GFX, offset: 0x6009300, symbol: D_VE2_6009300 } { type: GFX, offset: 0x6009300, symbol: aAndBrainWasteDL }
D_VE2_6009390: D_VE2_6009390:
{ type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x6009390, ctype: u16, symbol: D_VE2_6009390 } { type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x6009390, ctype: u16, symbol: D_VE2_6009390 }
@ -180,11 +180,11 @@ D_VE2_6014658:
D_VE2_6014844: D_VE2_6014844:
{ type: SF64:SKELETON, offset: 0x6014844, symbol: D_VE2_6014844 } { type: SF64:SKELETON, offset: 0x6014844, symbol: D_VE2_6014844 }
D_VE2_6014904: aVe2BaseAnim:
{ type: SF64:ANIM, offset: 0x6014904, symbol: D_VE2_6014904 } { type: SF64:ANIM, offset: 0x6014904, symbol: aVe2BaseAnim }
D_VE2_60149D0: aVe2BaseSkel:
{ type: SF64:SKELETON, offset: 0x60149D0, symbol: D_VE2_60149D0 } { type: SF64:SKELETON, offset: 0x60149D0, symbol: aVe2BaseSkel }
D_VE2_6014D50: D_VE2_6014D50:
{ type: SF64:ENVIRONMENT, offset: 0x6014D50, symbol: D_VE2_6014D50 } { type: SF64:ENVIRONMENT, offset: 0x6014D50, symbol: D_VE2_6014D50 }

24
assets/yaml/us/rev1/ast_zoness.yaml
View File

@ -24,8 +24,8 @@ D_ZO_6000E98:
D_ZO_6001098: D_ZO_6001098:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x6001098, symbol: D_ZO_6001098} { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x6001098, symbol: D_ZO_6001098}
D_ZO_60012A0: aZoDodoraHeadDL:
{ type: GFX, offset: 0x60012A0, symbol: D_ZO_60012A0} { type: GFX, offset: 0x60012A0, symbol: aZoDodoraHeadDL}
D_ZO_6001810: D_ZO_6001810:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6001810, symbol: D_ZO_6001810} { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6001810, symbol: D_ZO_6001810}
@ -135,11 +135,11 @@ D_ZO_600C780:
D_ZO_600D990: D_ZO_600D990:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x600D990, symbol: D_ZO_600D990} { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x600D990, symbol: D_ZO_600D990}
D_ZO_600E5EC: aZoBirdAnim:
{ type: SF64:ANIM, offset: 0x600E5EC, symbol: D_ZO_600E5EC} { type: SF64:ANIM, offset: 0x600E5EC, symbol: aZoBirdAnim}
D_ZO_600E7D8: aZoBirdSkel:
{ type: SF64:SKELETON, offset: 0x600E7D8, symbol: D_ZO_600E7D8} { type: SF64:SKELETON, offset: 0x600E7D8, symbol: aZoBirdSkel}
aZoOilRig3DL: aZoOilRig3DL:
{ type: GFX, offset: 0x600E820, symbol: aZoOilRig3DL} { type: GFX, offset: 0x600E820, symbol: aZoOilRig3DL}
@ -273,8 +273,8 @@ D_ZO_6019738:
D_ZO_601996C: D_ZO_601996C:
{ type: SF64:ANIM, offset: 0x601996C, symbol: D_ZO_601996C} { type: SF64:ANIM, offset: 0x601996C, symbol: D_ZO_601996C}
D_ZO_6019E18: aZoSarumarineSkel:
{ type: SF64:SKELETON, offset: 0x6019E18, symbol: D_ZO_6019E18} { type: SF64:SKELETON, offset: 0x6019E18, symbol: aZoSarumarineSkel}
D_ZO_6019EB0: D_ZO_6019EB0:
{ type: GFX, offset: 0x6019EB0, symbol: D_ZO_6019EB0} { type: GFX, offset: 0x6019EB0, symbol: D_ZO_6019EB0}
@ -450,14 +450,14 @@ D_ZO_6023488:
D_ZO_6023690: D_ZO_6023690:
{ type: GFX, offset: 0x6023690, symbol: D_ZO_6023690} { type: GFX, offset: 0x6023690, symbol: D_ZO_6023690}
D_ZO_6023730: aZoDodoraTailDL:
{ type: GFX, offset: 0x6023730, symbol: D_ZO_6023730} { type: GFX, offset: 0x6023730, symbol: aZoDodoraTailDL}
D_ZO_60237E0: D_ZO_60237E0:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x60237E0, symbol: D_ZO_60237E0} { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x60237E0, symbol: D_ZO_60237E0}
D_ZO_60239E0: aZoDodoraBodyDL:
{ type: GFX, offset: 0x60239E0, symbol: D_ZO_60239E0} { type: GFX, offset: 0x60239E0, symbol: aZoDodoraBodyDL}
D_ZO_6023D50: D_ZO_6023D50:
{ type: GFX, offset: 0x6023D50, symbol: D_ZO_6023D50} { type: GFX, offset: 0x6023D50, symbol: D_ZO_6023D50}

8
include/functions.h
View File

@ -101,7 +101,7 @@ void AndJamesTrigger_Draw(Actor*);
void Graphics_SetScaleMtx(f32); void Graphics_SetScaleMtx(f32);
void Sprite168_Draw(Sprite*); void Sprite168_Draw(Sprite*);
void MeteoBall_Draw(Actor*); void MeteoBall_Draw(Actor*);
void ActorHopBot_Draw(Actor*); void MeHopBot_Draw(Actor*);
void MeteoTunnel_Draw(Scenery*); void MeteoTunnel_Draw(Scenery*);
void Scenery_DrawTitaniaBones(Scenery*); void Scenery_DrawTitaniaBones(Scenery*);
void CoIBeam_Draw(Scenery*); void CoIBeam_Draw(Scenery*);
@ -113,7 +113,7 @@ void CoBuilding10_Draw(Scenery*);
void ActorDebris_Draw(Actor*); void ActorDebris_Draw(Actor*);
void Actor_DrawEngineAndContrails(Actor*); void Actor_DrawEngineAndContrails(Actor*);
void Actor_DrawEngineGlow(Actor*, s32); void Actor_DrawEngineGlow(Actor*, s32);
void func_edisplay_8005B388(Actor*); void ActorTeamArwing_Draw(Actor*);
void MeMolarRock_Draw(Actor*); void MeMolarRock_Draw(Actor*);
void MeMeteor2_Draw(MeMeteor2*); void MeMeteor2_Draw(MeMeteor2*);
void MeLaserCannon1_Draw(MeLaserCannon1*); void MeLaserCannon1_Draw(MeLaserCannon1*);
@ -214,7 +214,7 @@ void Actor237_Update(Actor*);
void Actor237_Draw(Actor*); void Actor237_Draw(Actor*);
void CoWaterfall_Update(Scenery*); void CoWaterfall_Update(Scenery*);
void MeteoBall_Update(Actor*); void MeteoBall_Update(Actor*);
void ActorHopBot_Update(Actor*); void MeHopBot_Update(Actor*);
void MeMora_Update(Actor*); void MeMora_Update(Actor*);
void MeMora_Dying(Actor*); void MeMora_Dying(Actor*);
void MeMora_Draw(Actor*); void MeMora_Draw(Actor*);
@ -452,7 +452,7 @@ void Play_PlaySfxNoPlayer(f32* , u32 );
void Play_ClearObjectData(void); void Play_ClearObjectData(void);
void Play_SpawnDebris(s32 , f32 , f32 , f32 ); void Play_SpawnDebris(s32 , f32 , f32 , f32 );
void Player_ApplyDamage(Player* player, s32 direction, s32 damage); void Player_ApplyDamage(Player* player, s32 direction, s32 damage);
bool Play_CheckDynaFloorCollision(f32* , s32* , f32 xPos, f32 yPos, f32 zPos); bool Play_CheckDynaFloorCollision(f32* floorHeight, s32* triangleIndex, f32 xPos, f32 yPos, f32 zPos);
bool Play_CheckSingleHitbox(Hitbox* hitbox, f32 , f32 , f32 , f32 , f32 , f32 ); bool Play_CheckSingleHitbox(Hitbox* hitbox, f32 , f32 , f32 , f32 , f32 , f32 );
void Player_CollisionCheck(Player* player); void Player_CollisionCheck(Player* player);
void Player_FloorCheck(Player* player); void Player_FloorCheck(Player* player);

4
include/i5.h
View File

@ -115,8 +115,8 @@ void Macbeth_MaVerticalLockBar_Draw(Actor*);
void Macbeth_MaBarrier_Update(Actor*); void Macbeth_MaBarrier_Update(Actor*);
void Macbeth_MaBarrier_Draw(Actor*); void Macbeth_MaBarrier_Draw(Actor*);
void Macbeth_MaProximityLight_Draw(Scenery*); void Macbeth_MaProximityLight_Draw(Scenery*);
void Macbeth_Actor219_Update(Actor*); void Macbeth_MaFallingBoulder_Update(Actor*);
void Macbeth_Actor219_Draw(Actor*); void Macbeth_MaFallingBoulder_Draw(Actor*);
void Macbeth_Actor207_Update(Actor*); void Macbeth_Actor207_Update(Actor*);
void Macbeth_Actor207_Draw(Actor*); void Macbeth_Actor207_Draw(Actor*);
void Macbeth_MaTrainCar1_Update(Actor*); void Macbeth_MaTrainCar1_Update(Actor*);

4
include/i6.h
View File

@ -40,8 +40,8 @@ void Turret_Update(Player*);
void Turret_UpdateCamera(Player*); void Turret_UpdateCamera(Player*);
void Turret_Draw(Player *); void Turret_Draw(Player *);
void Andross_Actor199_Update(Actor*); void Andross_ActorTeamArwing_Update(Actor*);
void Andross_Actor199_Draw(Actor*); void Andross_ActorTeamArwing_Draw(Actor*);
void Andross_AndBrainWaste_Update(Actor*); void Andross_AndBrainWaste_Update(Actor*);
void Andross_AndBrainWaste_Draw(Actor*); void Andross_AndBrainWaste_Draw(Actor*);
void Andross_AndBossTimer_Update(Actor*); void Andross_AndBossTimer_Update(Actor*);

16
include/sf64object.h
View File

@ -453,7 +453,7 @@ typedef enum ObjectId {
/* 144 */ OBJ_SCENERY_VS_SPACE_JUNK_1, /* 144 */ OBJ_SCENERY_VS_SPACE_JUNK_1,
/* 145 */ OBJ_SCENERY_VS_SPACE_JUNK_2, /* 145 */ OBJ_SCENERY_VS_SPACE_JUNK_2,
/* 146 */ OBJ_SCENERY_VS_SPACE_JUNK_3, /* 146 */ OBJ_SCENERY_VS_SPACE_JUNK_3,
/* 147 */ OBJ_SCENERY_147, /* 147 */ OBJ_SCENERY_LEVEL_OBJECTS, // Level specific scenery objects, used in Andross and Versus
/* 148 */ OBJ_SCENERY_FO_MOUNTAIN_1, /* 148 */ OBJ_SCENERY_FO_MOUNTAIN_1,
/* 149 */ OBJ_SCENERY_FO_MOUNTAIN_2, /* 149 */ OBJ_SCENERY_FO_MOUNTAIN_2,
/* 150 */ OBJ_SCENERY_FO_MOUNTAIN_3, /* 150 */ OBJ_SCENERY_FO_MOUNTAIN_3,
@ -505,11 +505,11 @@ typedef enum ObjectId {
/* 196 */ OBJ_ACTOR_CO_MOLE_MISSILE, /* 196 */ OBJ_ACTOR_CO_MOLE_MISSILE,
/* 197 */ OBJ_ACTOR_ALLRANGE, /* 197 */ OBJ_ACTOR_ALLRANGE,
/* 198 */ OBJ_ACTOR_TEAM_BOSS, /* 198 */ OBJ_ACTOR_TEAM_BOSS,
/* 199 */ OBJ_ACTOR_199, /* 199 */ OBJ_ACTOR_TEAM_ARWING,
/* 200 */ OBJ_ACTOR_EVENT, /* 200 */ OBJ_ACTOR_EVENT,
/* 201 */ OBJ_ACTOR_ME_METEO_BALL, /* 201 */ OBJ_ACTOR_ME_METEO_BALL,
/* 202 */ OBJ_ACTOR_ME_HOPBOT, /* 202 */ OBJ_ACTOR_ME_HOPBOT,
/* 203 */ OBJ_ACTOR_SLIPPY_SX, /* 203 */ OBJ_ACTOR_SX_SLIPPY,
/* 204 */ OBJ_ACTOR_SY_ROBOT, /* 204 */ OBJ_ACTOR_SY_ROBOT,
/* 205 */ OBJ_ACTOR_MA_LOCOMOTIVE, /* 205 */ OBJ_ACTOR_MA_LOCOMOTIVE,
/* 206 */ OBJ_ACTOR_MA_TRAIN_CAR_1, /* 206 */ OBJ_ACTOR_MA_TRAIN_CAR_1,
@ -525,7 +525,7 @@ typedef enum ObjectId {
/* 216 */ OBJ_ACTOR_MA_HORIZONTAL_LOCK_BAR, /* 216 */ OBJ_ACTOR_MA_HORIZONTAL_LOCK_BAR,
/* 217 */ OBJ_ACTOR_MA_VERTICAL_LOCK_BAR, /* 217 */ OBJ_ACTOR_MA_VERTICAL_LOCK_BAR,
/* 218 */ OBJ_ACTOR_MA_BARRIER, /* 218 */ OBJ_ACTOR_MA_BARRIER,
/* 219 */ OBJ_ACTOR_219, /* 219 */ OBJ_ACTOR_MA_FALLING_BOULDER,
/* 220 */ OBJ_ACTOR_MA_BOMBDROP, /* 220 */ OBJ_ACTOR_MA_BOMBDROP,
/* 221 */ OBJ_ACTOR_MA_SPEAR, /* 221 */ OBJ_ACTOR_MA_SPEAR,
/* 222 */ OBJ_ACTOR_MA_SHOCK_BOX, /* 222 */ OBJ_ACTOR_MA_SHOCK_BOX,
@ -1134,10 +1134,10 @@ typedef Actor ActorCutscene;
typedef Actor CoMoleMissile; typedef Actor CoMoleMissile;
typedef Actor ActorAllRange; typedef Actor ActorAllRange;
typedef Actor ActorTeamBoss; // Teammates in a boss battle typedef Actor ActorTeamBoss; // Teammates in a boss battle
typedef Actor Actor199; typedef Actor ActorTeamArwing;
typedef Actor ActorEvent; typedef Actor ActorEvent;
typedef Actor MeteoBall; typedef Actor MeteoBall;
typedef Actor ActorHopBot; typedef Actor MeHopBot;
typedef Actor SxSlippy; typedef Actor SxSlippy;
typedef Actor SyRobot; typedef Actor SyRobot;
typedef Actor MaLocomotive; typedef Actor MaLocomotive;
@ -1154,7 +1154,7 @@ typedef Actor MaBoulder;
typedef Actor MaHorizontalLockBar; typedef Actor MaHorizontalLockBar;
typedef Actor MaVerticalLockBar; typedef Actor MaVerticalLockBar;
typedef Actor MaBarrier; typedef Actor MaBarrier;
typedef Actor Actor219; typedef Actor MaFallingBoulder;
typedef Actor MaBombDrop; typedef Actor MaBombDrop;
typedef Actor MaSpear; typedef Actor MaSpear;
typedef Actor MaShockBox; typedef Actor MaShockBox;
@ -1171,7 +1171,7 @@ typedef Actor TiRasco;
typedef Actor TiFekuda; typedef Actor TiFekuda;
typedef Actor TiGreatFox; typedef Actor TiGreatFox;
typedef Actor ZoBird; typedef Actor ZoBird;
typedef Actor ZoDodora; typedef Actor ZoDodora; // Snake type enemy
typedef Actor Actor237; typedef Actor Actor237;
typedef Actor ZoFish; typedef Actor ZoFish;
typedef Actor ZoDodoraWpCount; typedef Actor ZoDodoraWpCount;

6
linker_scripts/us/rev1/symbol_addrs_assets.txt
View File

@ -55,9 +55,9 @@ gHeadsetPanVolume = 0x800DD280; // size:0x200 type:f32
gStereoPanVolume = 0x800DD480; // size:0x200 type:f32 gStereoPanVolume = 0x800DD480; // size:0x200 type:f32
gDefaultPanVolume = 0x800DD680; // size:0x200 type:f32 gDefaultPanVolume = 0x800DD680; // size:0x200 type:f32
D_AQ_6000AE4 = 0x06000AE4; aAqSquidAnim = 0x06000AE4;
D_AQ_6002628 = 0x06002628; aAqAnglerFishAnim = 0x06002628;
D_AQ_60260EC = 0x060260EC; aAqSpindlyFishAnim = 0x060260EC;
D_AQ_60314AC = 0x060314AC; D_AQ_60314AC = 0x060314AC;
D_TI1_70067C4 = 0x70067C4; D_TI1_70067C4 = 0x70067C4;
aTi1DesertCrawlerSkel = 0x7006990; aTi1DesertCrawlerSkel = 0x7006990;

6
linker_scripts/us/rev1/symbol_addrs_engine.txt
View File

@ -171,8 +171,8 @@ Graphics_SetScaleMtx = 0x8005980C;
Sprite168_Draw = 0x80059850; Sprite168_Draw = 0x80059850;
Object_dummy_800598DC = 0x800598DC; Object_dummy_800598DC = 0x800598DC;
MeteoBall_Draw = 0x800598E8; MeteoBall_Draw = 0x800598E8;
ActorHopBot_PostLimbDraw = 0x800599A4; MeHopBot_PostLimbDraw = 0x800599A4;
ActorHopBot_Draw = 0x80059A24; MeHopBot_Draw = 0x80059A24;
MeteoTunnel_Draw = 0x80059AEC; MeteoTunnel_Draw = 0x80059AEC;
Scenery_DrawTitaniaBones = 0x80059B20; Scenery_DrawTitaniaBones = 0x80059B20;
func_edisplay_80059BB0 = 0x80059BB0; func_edisplay_80059BB0 = 0x80059BB0;
@ -189,7 +189,7 @@ func_edisplay_8005A088 = 0x8005A088;
ActorDebris_Draw = 0x8005A094; ActorDebris_Draw = 0x8005A094;
Actor_DrawEngineAndContrails = 0x8005ADAC; Actor_DrawEngineAndContrails = 0x8005ADAC;
Actor_DrawEngineGlow = 0x8005B1E8; Actor_DrawEngineGlow = 0x8005B1E8;
func_edisplay_8005B388 = 0x8005B388; ActorTeamArwing_Draw = 0x8005B388;
MeMolarRock_Draw = 0x8005B6A4; MeMolarRock_Draw = 0x8005B6A4;
MeMeteor2_Draw = 0x8005B71C; MeMeteor2_Draw = 0x8005B71C;
MeLaserCannon1_Draw = 0x8005B7CC; MeLaserCannon1_Draw = 0x8005B7CC;

2
src/engine/fox_360.c
View File

@ -2394,7 +2394,7 @@ void ActorAllRange_Draw(ActorAllRange* this) {
case AI360_SLIPPY: case AI360_SLIPPY:
case AI360_PEPPY: case AI360_PEPPY:
Matrix_Push(&gGfxMatrix); Matrix_Push(&gGfxMatrix);
func_edisplay_8005B388(this); ActorTeamArwing_Draw(this);
Matrix_Pop(&gGfxMatrix); Matrix_Pop(&gGfxMatrix);
ActorAllRange_DrawBarrelRoll(this); ActorAllRange_DrawBarrelRoll(this);
break; break;

27
src/engine/fox_demo.c
View File

@ -2535,7 +2535,7 @@ void ActorCutscene_Draw(ActorCutscene* this) {
break; break;
case 0: case 0:
func_edisplay_8005B388(this); ActorTeamArwing_Draw(this);
break; break;
case 1: case 1:
@ -2866,7 +2866,7 @@ void ActorCutscene_Draw(ActorCutscene* this) {
case 44: case 44:
Animation_GetFrameData(&D_AQ_6020A40, this->iwork[0], this->vwork); Animation_GetFrameData(&D_AQ_6020A40, this->iwork[0], this->vwork);
gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK); gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
Animation_DrawSkeleton(1, D_AQ_6020C6C, this->vwork, 0, 0, &this->index, &gIdentityMatrix); Animation_DrawSkeleton(1, aAqSeaweedSkel, this->vwork, 0, 0, &this->index, &gIdentityMatrix);
gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK); gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK);
break; break;
@ -2891,18 +2891,18 @@ void Cutscene_DrawGreatFox(void) {
s32 i; s32 i;
s32 j; s32 j;
f32 sp9C[4]; f32 sp9C[4];
Gfx* var_fp; Gfx* dList;
PRINTF("Demo_Time=%d\n"); PRINTF("Demo_Time=%d\n");
PRINTF("Demo_Time=%d\n"); PRINTF("Demo_Time=%d\n");
PRINTF("d Enm->wrk0 %d\n"); PRINTF("d Enm->wrk0 %d\n");
if (gGameState == GSTATE_TITLE) { if (gGameState == GSTATE_TITLE) {
var_fp = D_TITLE_60320E0; dList = D_TITLE_60320E0;
} else if (gGameState == GSTATE_ENDING) { } else if (gGameState == GSTATE_ENDING) {
var_fp = D_END_7010970; dList = D_END_7010970;
} else { } else {
var_fp = D_1024AC0; dList = D_1024AC0;
} }
if (gCurrentLevel == LEVEL_TITANIA) { if (gCurrentLevel == LEVEL_TITANIA) {
@ -2910,18 +2910,20 @@ void Cutscene_DrawGreatFox(void) {
} }
if (gGreatFoxIntact) { if (gGreatFoxIntact) {
gSPDisplayList(gMasterDisp++, D_GREAT_FOX_E000000); gSPDisplayList(gMasterDisp++, aGreatFoxIntactDL);
} else { } else {
gSPDisplayList(gMasterDisp++, D_GREAT_FOX_E003AB0); gSPDisplayList(gMasterDisp++, aGreatFoxDamagedDL);
} }
if ((gCurrentLevel != LEVEL_AQUAS) && if ((gCurrentLevel != LEVEL_AQUAS) &&
((gCurrentLevel != LEVEL_SECTOR_Z) || (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_LEVEL_COMPLETE))) { ((gCurrentLevel != LEVEL_SECTOR_Z) || (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_LEVEL_COMPLETE))) {
RCP_SetupDL_49(); RCP_SetupDL_49();
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
for (i = 0, var_s6_2 = D_demo_800CA0BC; i < ARRAY_COUNT(sp9C); i++, var_s6_2++) { for (i = 0, var_s6_2 = D_demo_800CA0BC; i < ARRAY_COUNT(sp9C); i++, var_s6_2++) {
if ((i != 1) || gGreatFoxIntact) { if ((i != 1) || gGreatFoxIntact) {
sp9C[i] = 0.0f; sp9C[i] = 0.0f;
if (i < 2) { if (i < 2) {
if ((gGameFrameCount & ((64 - 1) & ~(8 - 1))) == 0) { if ((gGameFrameCount & ((64 - 1) & ~(8 - 1))) == 0) {
sp9C[i] = D_demo_800CA170[gGameFrameCount % 8U]; sp9C[i] = D_demo_800CA170[gGameFrameCount % 8U];
@ -2933,11 +2935,12 @@ void Cutscene_DrawGreatFox(void) {
} }
gDPSetEnvColor(gMasterDisp++, 32, 32, 255, 128); gDPSetEnvColor(gMasterDisp++, 32, 32, 255, 128);
} }
Matrix_Push(&gGfxMatrix); Matrix_Push(&gGfxMatrix);
Matrix_Translate(gGfxMatrix, var_s6_2->x, var_s6_2->y, var_s6_2->z, MTXF_APPLY); Matrix_Translate(gGfxMatrix, var_s6_2->x, var_s6_2->y, var_s6_2->z, MTXF_APPLY);
Matrix_Scale(gGfxMatrix, sp9C[i], sp9C[i], 1.0f, MTXF_APPLY); Matrix_Scale(gGfxMatrix, sp9C[i], sp9C[i], 1.0f, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp); Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, var_fp); gSPDisplayList(gMasterDisp++, dList);
Matrix_Pop(&gGfxMatrix); Matrix_Pop(&gGfxMatrix);
} }
} }
@ -2951,14 +2954,14 @@ void Cutscene_DrawGreatFox(void) {
Matrix_Translate(gGfxMatrix, var_s6_2->x, var_s6_2->y, var_s6_2->z, MTXF_APPLY); Matrix_Translate(gGfxMatrix, var_s6_2->x, var_s6_2->y, var_s6_2->z, MTXF_APPLY);
Matrix_Scale(gGfxMatrix, sp9C[i], sp9C[i], 1.0f, MTXF_APPLY); Matrix_Scale(gGfxMatrix, sp9C[i], sp9C[i], 1.0f, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp); Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, var_fp); gSPDisplayList(gMasterDisp++, dList);
for (j = 0; j < 4; j++) { for (j = 0; j < 4; j++) {
Matrix_Push(&gGfxMatrix); Matrix_Push(&gGfxMatrix);
Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, D_demo_800CA1B4[2 * j], MTXF_APPLY); Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, D_demo_800CA1B4[2 * j], MTXF_APPLY);
Matrix_Scale(gGfxMatrix, D_demo_800CA1D4[2 * j], D_demo_800CA1D4[2 * j], 1.0f, MTXF_APPLY); Matrix_Scale(gGfxMatrix, D_demo_800CA1D4[2 * j], D_demo_800CA1D4[2 * j], 1.0f, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp); Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, var_fp); gSPDisplayList(gMasterDisp++, dList);
Matrix_Pop(&gGfxMatrix); Matrix_Pop(&gGfxMatrix);
} }
Matrix_Pop(&gGfxMatrix); Matrix_Pop(&gGfxMatrix);
@ -2971,7 +2974,7 @@ void Cutscene_DrawGreatFox(void) {
Matrix_Scale(gGfxMatrix, D_demo_800CA198[gPlayer[0].csEventTimer], D_demo_800CA198[gPlayer[0].csEventTimer], Matrix_Scale(gGfxMatrix, D_demo_800CA198[gPlayer[0].csEventTimer], D_demo_800CA198[gPlayer[0].csEventTimer],
1.0f, MTXF_APPLY); 1.0f, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp); Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, var_fp); gSPDisplayList(gMasterDisp++, dList);
} }
} }
} }

10
src/engine/fox_edata_info.c
View File

@ -240,7 +240,7 @@ ObjectInfo gObjectInfo[] = {
/* OBJ_SCENERY_VS_SPACE_JUNK_1 */ {(void*) aVsSpaceJunk1DL, 0, (ObjectFunc) NULL, aVsSpaceJunk1Hitbox, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, /* OBJ_SCENERY_VS_SPACE_JUNK_1 */ {(void*) aVsSpaceJunk1DL, 0, (ObjectFunc) NULL, aVsSpaceJunk1Hitbox, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_SCENERY_VS_SPACE_JUNK_2 */ {(void*) aVsSpaceJunk2DL, 0, (ObjectFunc) NULL, aVsSpaceJunk2Hitbox, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, /* OBJ_SCENERY_VS_SPACE_JUNK_2 */ {(void*) aVsSpaceJunk2DL, 0, (ObjectFunc) NULL, aVsSpaceJunk2Hitbox, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_SCENERY_VS_SPACE_JUNK_3 */ {(void*) aVsSpaceJunk3DL, 0, (ObjectFunc) NULL, aVsSpaceJunk3Hitbox, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, /* OBJ_SCENERY_VS_SPACE_JUNK_3 */ {(void*) aVsSpaceJunk3DL, 0, (ObjectFunc) NULL, aVsSpaceJunk3Hitbox, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_SCENERY_147 */ {(void*) NULL, 0, (ObjectFunc) NULL, gNoHitbox, 0.0f, 0, 0, 0, 0, 0.0f, 0 }, /* OBJ_SCENERY_LEVEL_OBJECTS */ {(void*) NULL, 0, (ObjectFunc) NULL, gNoHitbox, 0.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_SCENERY_FO_MOUNTAIN_1 */ {(void*) aFoMountain1DL, 0, (ObjectFunc) NULL, aFoMountain1Hitbox, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, /* OBJ_SCENERY_FO_MOUNTAIN_1 */ {(void*) aFoMountain1DL, 0, (ObjectFunc) NULL, aFoMountain1Hitbox, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_SCENERY_FO_MOUNTAIN_2 */ {(void*) aFoMountain2DL, 0, (ObjectFunc) NULL, aFoMountain2Hitbox, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, /* OBJ_SCENERY_FO_MOUNTAIN_2 */ {(void*) aFoMountain2DL, 0, (ObjectFunc) NULL, aFoMountain2Hitbox, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_SCENERY_FO_MOUNTAIN_3 */ {(void*) aFoMountain3DL, 0, (ObjectFunc) NULL, aFoMountain3Hitbox, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, /* OBJ_SCENERY_FO_MOUNTAIN_3 */ {(void*) aFoMountain3DL, 0, (ObjectFunc) NULL, aFoMountain3Hitbox, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
@ -292,11 +292,11 @@ ObjectInfo gObjectInfo[] = {
/* OBJ_ACTOR_CO_MOLE_MISSILE */ {(void*) CoMoleMissile_Draw, 1, (ObjectFunc) CoMoleMissile_Update, aCoMoleMissileHitbox, 200.0f, 0, 1, 39, 0, 1.0f, 1 }, /* OBJ_ACTOR_CO_MOLE_MISSILE */ {(void*) CoMoleMissile_Draw, 1, (ObjectFunc) CoMoleMissile_Update, aCoMoleMissileHitbox, 200.0f, 0, 1, 39, 0, 1.0f, 1 },
/* OBJ_ACTOR_ALLRANGE */ {(void*) ActorAllRange_Draw, 1, (ObjectFunc) ActorAllRange_Update, gActorAllRangeHItbox, 20000.0f, 0, 1, 39, 1, 1.0f, 1 }, /* OBJ_ACTOR_ALLRANGE */ {(void*) ActorAllRange_Draw, 1, (ObjectFunc) ActorAllRange_Update, gActorAllRangeHItbox, 20000.0f, 0, 1, 39, 1, 1.0f, 1 },
/* OBJ_ACTOR_TEAM_BOSS */ {(void*) ActorAllRange_Draw, 1, (ObjectFunc) ActorTeamBoss_Update, gTeamHitbox, 20000.0f, 0, 0, 39, 1, 0.0f, 0 }, /* OBJ_ACTOR_TEAM_BOSS */ {(void*) ActorAllRange_Draw, 1, (ObjectFunc) ActorTeamBoss_Update, gTeamHitbox, 20000.0f, 0, 0, 39, 1, 0.0f, 0 },
/* OBJ_ACTOR_199 */ {(void*) Andross_Actor199_Draw, 1, (ObjectFunc) Andross_Actor199_Update, gNoHitbox, 20000.0f, 0, 0, 39, 1, 0.0f, 0 }, /* OBJ_ACTOR_TEAM_ARWING */ {(void*) Andross_ActorTeamArwing_Draw, 1, (ObjectFunc) Andross_ActorTeamArwing_Update, gNoHitbox, 20000.0f, 0, 0, 39, 1, 0.0f, 0 },
/* OBJ_ACTOR_EVENT */ {(void*) ActorEvent_Draw, 1, (ObjectFunc) ActorEvent_Update, gNoHitbox, 2000.0f, 0, 1, 39, 0, 0.0f, 1 }, /* OBJ_ACTOR_EVENT */ {(void*) ActorEvent_Draw, 1, (ObjectFunc) ActorEvent_Update, gNoHitbox, 2000.0f, 0, 1, 39, 0, 0.0f, 1 },
/* OBJ_ACTOR_ME_METEO_BALL */ {(void*) MeteoBall_Draw, 1, (ObjectFunc) MeteoBall_Update, aMeMeteoBallHitbox, 100.0f, 0, 1, 39, 0, 1.0f, 1 }, /* OBJ_ACTOR_ME_METEO_BALL */ {(void*) MeteoBall_Draw, 1, (ObjectFunc) MeteoBall_Update, aMeMeteoBallHitbox, 100.0f, 0, 1, 39, 0, 1.0f, 1 },
/* OBJ_ACTOR_ME_HOPBOT */ {(void*) ActorHopBot_Draw, 1, (ObjectFunc) ActorHopBot_Update, aMeHopBotHitbox, 100.0f, 0, 1, 39, 0, 180.0f, 1 }, /* OBJ_ACTOR_ME_HOPBOT */ {(void*) MeHopBot_Draw, 1, (ObjectFunc) MeHopBot_Update, aMeHopBotHitbox, 100.0f, 0, 1, 39, 0, 180.0f, 1 },
/* OBJ_ACTOR_SLIPPY_SX */ {(void*) SectorX_SxSlippy_Draw, 1, (ObjectFunc) SectorX_SxSlippy_Update, gNoHitbox, 1000.0f, 0, 0, 39, 0, 0.0f, 0 }, /* OBJ_ACTOR_SX_SLIPPY */ {(void*) SectorX_SxSlippy_Draw, 1, (ObjectFunc) SectorX_SxSlippy_Update, gNoHitbox, 1000.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_ACTOR_SY_ROBOT */ {(void*) SectorY_SyRobot_Draw, 1, (ObjectFunc) SectorY_SyRobot_Update, aSyRobotHitbox, 1000.0f, 0, 0, 39, 0, 1.0f, 1 }, /* OBJ_ACTOR_SY_ROBOT */ {(void*) SectorY_SyRobot_Draw, 1, (ObjectFunc) SectorY_SyRobot_Update, aSyRobotHitbox, 1000.0f, 0, 0, 39, 0, 1.0f, 1 },
/* OBJ_ACTOR_MA_LOCOMOTIVE */ {(void*) Macbeth_Train_Draw, 1, (ObjectFunc) Macbeth_MaLocomotive_Update, aMaLocomotiveHitbox, 20000.0f, 0, 0, 40, 1, 0.0f, 0 }, /* OBJ_ACTOR_MA_LOCOMOTIVE */ {(void*) Macbeth_Train_Draw, 1, (ObjectFunc) Macbeth_MaLocomotive_Update, aMaLocomotiveHitbox, 20000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_MA_TRAIN_CAR_1 */ {(void*) Macbeth_Train_Draw, 1, (ObjectFunc) Macbeth_MaTrainCar1_Update, aMaTrainCar1Hitbox, 20000.0f, 0, 0, 40, 1, 0.0f, 0 }, /* OBJ_ACTOR_MA_TRAIN_CAR_1 */ {(void*) Macbeth_Train_Draw, 1, (ObjectFunc) Macbeth_MaTrainCar1_Update, aMaTrainCar1Hitbox, 20000.0f, 0, 0, 40, 1, 0.0f, 0 },
@ -312,7 +312,7 @@ ObjectInfo gObjectInfo[] = {
/* OBJ_ACTOR_MA_HORIZONTAL_LOCK_BAR */ {(void*) Macbeth_MaHorizontalLockBar_Draw, 1, (ObjectFunc) Macbeth_MaHorizontalLockBar_Update, aMaHorizontalLockBarHitbox, 200.0f, 0, 0, 40, 1, 0.0f, 0 }, /* OBJ_ACTOR_MA_HORIZONTAL_LOCK_BAR */ {(void*) Macbeth_MaHorizontalLockBar_Draw, 1, (ObjectFunc) Macbeth_MaHorizontalLockBar_Update, aMaHorizontalLockBarHitbox, 200.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_MA_VERTICAL_LOCK_BAR */ {(void*) Macbeth_MaVerticalLockBar_Draw, 1, (ObjectFunc) Macbeth_MaVerticalLockBar_Update, aMaVerticalLockBarHitbox, 200.0f, 0, 0, 40, 1, 0.0f, 0 }, /* OBJ_ACTOR_MA_VERTICAL_LOCK_BAR */ {(void*) Macbeth_MaVerticalLockBar_Draw, 1, (ObjectFunc) Macbeth_MaVerticalLockBar_Update, aMaVerticalLockBarHitbox, 200.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_MA_BARRIER */ {(void*) Macbeth_MaBarrier_Draw, 1, (ObjectFunc) Macbeth_MaBarrier_Update, aMaBarrierHitbox, 200.0f, 0, 0, 40, 1, 0.0f, 0 }, /* OBJ_ACTOR_MA_BARRIER */ {(void*) Macbeth_MaBarrier_Draw, 1, (ObjectFunc) Macbeth_MaBarrier_Update, aMaBarrierHitbox, 200.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_219 */ {(void*) Macbeth_Actor219_Draw, 1, (ObjectFunc) Macbeth_Actor219_Update, aMaActor219Hitbox, 300.0f, 0, 0, 40, 1, 0.0f, 0 }, /* OBJ_ACTOR_MA_FALLING_BOULDER */ {(void*) Macbeth_MaFallingBoulder_Draw, 1, (ObjectFunc) Macbeth_MaFallingBoulder_Update, aMaFallingBoulderHitbox, 300.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_MA_BOMBDROP */ {(void*) Macbeth_MaBombDrop_Draw, 1, (ObjectFunc) Macbeth_MaBombDrop_Update, aMaBombDropHitbox, 200.0f, 0, 0, 40, 1, 0.0f, 0 }, /* OBJ_ACTOR_MA_BOMBDROP */ {(void*) Macbeth_MaBombDrop_Draw, 1, (ObjectFunc) Macbeth_MaBombDrop_Update, aMaBombDropHitbox, 200.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_MA_SPEAR */ {(void*) Macbeth_MaSpear_Draw, 1, (ObjectFunc) Macbeth_MaSpear_Update, aMaSpearHitbox, 300.0f, 0, 0, 40, 1, 1.0f, 0 }, /* OBJ_ACTOR_MA_SPEAR */ {(void*) Macbeth_MaSpear_Draw, 1, (ObjectFunc) Macbeth_MaSpear_Update, aMaSpearHitbox, 300.0f, 0, 0, 40, 1, 1.0f, 0 },
/* OBJ_ACTOR_MA_SHOCK_BOX */ {(void*) Macbeth_MaShockBox_Draw, 1, (ObjectFunc) Macbeth_MaShockBox_Update, aMaShockBoxHitbox, 300.0f, 0, 0, 40, 1, 1.0f, 0 }, /* OBJ_ACTOR_MA_SHOCK_BOX */ {(void*) Macbeth_MaShockBox_Draw, 1, (ObjectFunc) Macbeth_MaShockBox_Update, aMaShockBoxHitbox, 300.0f, 0, 0, 40, 1, 1.0f, 0 },

63
src/engine/fox_edisplay.c
View File

@ -1,5 +1,6 @@
#include "prevent_bss_reordering.h" #include "prevent_bss_reordering.h"
#include "global.h" #include "global.h"
#include "sf64object.h"
#include "assets/ast_katina.h" #include "assets/ast_katina.h"
#include "assets/ast_venom_1.h" #include "assets/ast_venom_1.h"
#include "assets/ast_venom_2.h" #include "assets/ast_venom_2.h"
@ -26,7 +27,7 @@ Vec3f D_edisplay_801615D0;
Vec3f sViewPos; Vec3f sViewPos;
bool sDrewActor; bool sDrewActor;
Matrix D_edisplay_801615F0; Matrix D_edisplay_801615F0;
ArwingInfo D_edisplay_80161630; ArwingInfo gActorTeamArwing;
char D_edisplay_800CF970[] = "$Id: fox_edisplay.c,v 1.196 1997/05/08 08:31:50 morita Exp $"; char D_edisplay_800CF970[] = "$Id: fox_edisplay.c,v 1.196 1997/05/08 08:31:50 morita Exp $";
@ -62,11 +63,11 @@ void Object_dummy_800598DC(s32 arg0) {
void MeteoBall_Draw(MeteoBall* this) { void MeteoBall_Draw(MeteoBall* this) {
RCP_SetupDL_60(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); RCP_SetupDL_60(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
gSPDisplayList(gMasterDisp++, D_MA_6025B50); gSPDisplayList(gMasterDisp++, aMeMeteoBallDL);
RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
} }
void ActorHopBot_PostLimbDraw(s32 limbIndex, Vec3f* rot, void* index) { void MeHopBot_PostLimbDraw(s32 limbIndex, Vec3f* rot, void* index) {
Vec3f sp24; Vec3f sp24;
Vec3f sp18; Vec3f sp18;
@ -89,14 +90,14 @@ f32 D_edisplay_800CFA2C[] = {
1.0f, 1.0f, 0.95f, 0.9f, 0.85f, 0.8f, 0.75f, 0.7f, 0.65f, 0.6f, 1.0f, 1.0f, 0.95f, 0.9f, 0.85f, 0.8f, 0.75f, 0.7f, 0.65f, 0.6f,
}; };
void ActorHopBot_Draw(ActorHopBot* this) { void MeHopBot_Draw(MeHopBot* this) {
Vec3f sp30[30]; Vec3f sp30[30];
f32 temp = D_edisplay_800CF9B0[this->animFrame] - 114.0f; f32 temp = D_edisplay_800CF9B0[this->animFrame] - 114.0f;
Matrix_Translate(gGfxMatrix, 0.f, -temp, 0.0f, MTXF_APPLY); Matrix_Translate(gGfxMatrix, 0.f, -temp, 0.0f, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp); Matrix_SetGfxMtx(&gMasterDisp);
Animation_GetFrameData(&D_ME_601E8C4, this->animFrame, sp30); Animation_GetFrameData(&aMeHopBotAnim, this->animFrame, sp30);
Animation_DrawSkeleton(1, D_ME_601E9D0, sp30, NULL, ActorHopBot_PostLimbDraw, &this->index, &gIdentityMatrix); Animation_DrawSkeleton(1, aMeHopBotSkel, sp30, NULL, MeHopBot_PostLimbDraw, &this->index, &gIdentityMatrix);
} }
void MeteoTunnel_Draw(MeTunnel* this) { void MeteoTunnel_Draw(MeTunnel* this) {
@ -444,7 +445,7 @@ void ActorDebris_Draw(ActorDebris* this) {
break; break;
case 70: case 70:
gSPDisplayList(gMasterDisp++, D_10177C0); gSPDisplayList(gMasterDisp++, aActorSuppliesDL);
break; break;
case 57: case 57:
@ -549,7 +550,7 @@ void Actor_DrawEngineGlow(Actor* actor, s32 levelType) {
} }
} }
void func_edisplay_8005B388(Actor199* this) { void ActorTeamArwing_Draw(ActorTeamArwing* this) {
Vec3f src = { 0.0f, 0.0f, 0.0f }; Vec3f src = { 0.0f, 0.0f, 0.0f };
Vec3f dest; Vec3f dest;
@ -566,29 +567,31 @@ void func_edisplay_8005B388(Actor199* this) {
(gCurrentLevel == LEVEL_KATINA) && (this->index == 1)) || (gCurrentLevel == LEVEL_KATINA) && (this->index == 1)) ||
((gCurrentLevel == LEVEL_SECTOR_Y) && (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_STANDBY) && ((gCurrentLevel == LEVEL_SECTOR_Y) && (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_STANDBY) &&
(this->state == 5))) { (this->state == 5))) {
D_edisplay_80161630.rightWingState = gPlayer[0].arwing.rightWingState; gActorTeamArwing.rightWingState = gPlayer[0].arwing.rightWingState;
D_edisplay_80161630.leftWingState = gPlayer[0].arwing.leftWingState; gActorTeamArwing.leftWingState = gPlayer[0].arwing.leftWingState;
} else { } else {
D_edisplay_80161630.rightWingState = D_edisplay_80161630.leftWingState = WINGSTATE_INTACT; gActorTeamArwing.rightWingState = gActorTeamArwing.leftWingState = WINGSTATE_INTACT;
} }
} else { } else {
D_edisplay_80161630.rightWingState = D_edisplay_80161630.leftWingState = WINGSTATE_INTACT; gActorTeamArwing.rightWingState = gActorTeamArwing.leftWingState = WINGSTATE_INTACT;
} }
D_edisplay_80161630.upperRightFlapYrot = this->fwork[15];
D_edisplay_80161630.upperLeftFlapYrot = this->fwork[16]; gActorTeamArwing.upperRightFlapYrot = this->fwork[15];
D_edisplay_80161630.bottomRightFlapYrot = this->fwork[26]; gActorTeamArwing.upperLeftFlapYrot = this->fwork[16];
D_edisplay_80161630.bottomLeftFlapYrot = this->fwork[27]; gActorTeamArwing.bottomRightFlapYrot = this->fwork[26];
D_edisplay_80161630.laserGunsYpos = D_edisplay_80161630.laserGunsXpos = D_edisplay_80161630.wingsXrot = gActorTeamArwing.bottomLeftFlapYrot = this->fwork[27];
D_edisplay_80161630.wingsYrot = D_edisplay_80161630.windshieldXrot = D_edisplay_80161630.wingsZrot = 0.0f; gActorTeamArwing.laserGunsYpos = gActorTeamArwing.laserGunsXpos = gActorTeamArwing.wingsXrot =
D_edisplay_80161630.unk_28 = this->fwork[17]; gActorTeamArwing.wingsYrot = gActorTeamArwing.windshieldXrot = gActorTeamArwing.wingsZrot = 0.0f;
D_edisplay_80161630.drawFace = this->iwork[14]; gActorTeamArwing.unk_28 = this->fwork[17];
D_edisplay_80161630.teamFaceXrot = this->fwork[20]; gActorTeamArwing.drawFace = this->iwork[14];
D_edisplay_80161630.teamFaceYrot = this->fwork[19]; gActorTeamArwing.teamFaceXrot = this->fwork[20];
gActorTeamArwing.teamFaceYrot = this->fwork[19];
if (gLevelType == LEVELTYPE_SPACE) { if (gLevelType == LEVELTYPE_SPACE) {
D_edisplay_80161630.upperRightFlapYrot = D_edisplay_80161630.bottomRightFlapYrot = gActorTeamArwing.upperRightFlapYrot = gActorTeamArwing.bottomRightFlapYrot =
D_edisplay_80161630.upperLeftFlapYrot = D_edisplay_80161630.bottomLeftFlapYrot = 0.0f; gActorTeamArwing.upperLeftFlapYrot = gActorTeamArwing.bottomLeftFlapYrot = 0.0f;
} }
Display_ArwingWings(&D_edisplay_80161630); Display_ArwingWings(&gActorTeamArwing);
} else if (gLevelType == LEVELTYPE_PLANET) { } else if (gLevelType == LEVELTYPE_PLANET) {
gSPDisplayList(gMasterDisp++, D_ENMY_PLANET_40018A0); gSPDisplayList(gMasterDisp++, D_ENMY_PLANET_40018A0);
} else if (gPlayer[0].wingPosition == 2) { } else if (gPlayer[0].wingPosition == 2) {
@ -647,8 +650,8 @@ void ActorMissileSeek_Draw(Actor* missile) {
void CoSkibot_Draw(CoSkibot* this) { void CoSkibot_Draw(CoSkibot* this) {
Matrix_Translate(gGfxMatrix, 0.0f, -124.0f, 0.0f, MTXF_APPLY); Matrix_Translate(gGfxMatrix, 0.0f, -124.0f, 0.0f, MTXF_APPLY);
Animation_GetFrameData(&D_CO_6029528, this->animFrame, this->vwork); Animation_GetFrameData(&aCoSkibotAnim, this->animFrame, this->vwork);
Animation_DrawSkeleton(1, D_CO_6029674, this->vwork, NULL, NULL, this, &gIdentityMatrix); Animation_DrawSkeleton(1, aCoSkibotSkel, this->vwork, NULL, NULL, this, &gIdentityMatrix);
} }
void CoRadar_Draw(CoRadar* this) { void CoRadar_Draw(CoRadar* this) {
@ -656,7 +659,7 @@ void CoRadar_Draw(CoRadar* this) {
RCP_SetupDL_27(); RCP_SetupDL_27();
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 0, 0, 255); gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 0, 0, 255);
} }
gSPDisplayList(gMasterDisp++, D_CO_6020B40); gSPDisplayList(gMasterDisp++, aCoRadarDL);
} }
void func_edisplay_8005BAAC(void) { void func_edisplay_8005BAAC(void) {
@ -1095,7 +1098,7 @@ void Actor_DrawOnRails(Actor* this) {
this->info.draw(&this->obj); this->info.draw(&this->obj);
Object_UpdateSfxSource(this->sfxSource); Object_UpdateSfxSource(this->sfxSource);
if (((this->obj.id == OBJ_ACTOR_TEAM_BOSS) || if (((this->obj.id == OBJ_ACTOR_TEAM_BOSS) ||
((this->obj.id == OBJ_ACTOR_SLIPPY_SX) && (this->animFrame > 0))) && ((this->obj.id == OBJ_ACTOR_SX_SLIPPY) && (this->animFrame > 0))) &&
(gReflectY > 0)) { (gReflectY > 0)) {
Matrix_MultVec3f(gGfxMatrix, &sp34, &gTeamArrowsViewPos[this->aiType]); Matrix_MultVec3f(gGfxMatrix, &sp34, &gTeamArrowsViewPos[this->aiType]);
} }
@ -1680,7 +1683,7 @@ void Object_DrawAll(s32 arg0) {
} }
for (i = 0, scenery360 = gScenery360; i < 200; i++, scenery360++) { for (i = 0, scenery360 = gScenery360; i < 200; i++, scenery360++) {
if ((scenery360->obj.status == OBJ_ACTIVE) && (scenery360->obj.id != OBJ_SCENERY_147)) { if ((scenery360->obj.status == OBJ_ACTIVE) && (scenery360->obj.id != OBJ_SCENERY_LEVEL_OBJECTS)) {
if (gCurrentLevel == LEVEL_BOLSE) { if (gCurrentLevel == LEVEL_BOLSE) {
spAC.x = scenery360->sfxSource[0]; spAC.x = scenery360->sfxSource[0];
spAC.y = scenery360->sfxSource[1]; spAC.y = scenery360->sfxSource[1];

4
src/engine/fox_enmy.c
View File

@ -1798,7 +1798,7 @@ void CoSkibot_Update(CoSkibot* this) {
} }
this->animFrame++; this->animFrame++;
if (Animation_GetFrameCount(&D_CO_6029528) < this->animFrame) { if (Animation_GetFrameCount(&aCoSkibotAnim) < this->animFrame) {
this->animFrame = 0; this->animFrame = 0;
} }
@ -2150,7 +2150,7 @@ void ActorSupplies_Draw(Actor* this) {
Matrix_RotateY(gGfxMatrix, D_enmy_800CFF0C[i].y * M_DTOR, MTXF_APPLY); Matrix_RotateY(gGfxMatrix, D_enmy_800CFF0C[i].y * M_DTOR, MTXF_APPLY);
Matrix_RotateX(gGfxMatrix, D_enmy_800CFF0C[i].x * M_DTOR, MTXF_APPLY); Matrix_RotateX(gGfxMatrix, D_enmy_800CFF0C[i].x * M_DTOR, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp); Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_10177C0); gSPDisplayList(gMasterDisp++, aActorSuppliesDL);
Matrix_Pop(&gGfxMatrix); Matrix_Pop(&gGfxMatrix);
} }

43
src/engine/fox_enmy2.c
View File

@ -144,13 +144,16 @@ void MeteoBall_Update(MeteoBall* this) {
sqrtf(SQ(gPlayer[0].cam.eye.z - sp2C) + SQ(gPlayer[0].cam.eye.x - this->obj.pos.x)))); sqrtf(SQ(gPlayer[0].cam.eye.z - sp2C) + SQ(gPlayer[0].cam.eye.x - this->obj.pos.x))));
} }
void ActorHopBot_Update(ActorHopBot* this) { void MeHopBot_Update(MeHopBot* this) {
bool sp34; bool sp34;
this->gravity = 1.5f; this->gravity = 1.5f;
sp34 = false; sp34 = false;
this->obj.rot.y = Math_RadToDeg( this->obj.rot.y = Math_RadToDeg(
Math_Atan2F(gPlayer[gPlayerNum].pos.x - this->obj.pos.x, gPlayer[gPlayerNum].trueZpos - this->obj.pos.z)); Math_Atan2F(gPlayer[gPlayerNum].pos.x - this->obj.pos.x, gPlayer[gPlayerNum].trueZpos - this->obj.pos.z));
if (this->obj.pos.y < -500.0f) { if (this->obj.pos.y < -500.0f) {
this->obj.pos.y = -500.0f; this->obj.pos.y = -500.0f;
this->vel.y = 0.0f; this->vel.y = 0.0f;
@ -237,11 +240,11 @@ void MeMora_Update(MeMora* this) {
static s16 D_800CFF94[16] = { static s16 D_800CFF94[16] = {
0, 98, 96, 94, 92, 90, 88, 86, 84, 82, 80, 78, 76, 74, 72, 70, 0, 98, 96, 94, 92, 90, 88, 86, 84, 82, 80, 78, 76, 74, 72, 70,
}; };
static u8 D_800CFFB4[16] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2 }; static u8 gMeMoraPartIdx[16] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2 };
static f32 D_800CFFC4[16] = { static f32 gMeMoraScale[16] = {
1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 0.99f, 0.98f, 0.94f, 0.88f, 0.8f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 0.99f, 0.98f, 0.94f, 0.88f, 0.8f, 1.0f,
}; };
static Gfx* D_800D0004[3] = { D_ENMY_SPACE_4000170, D_ENMY_SPACE_40084D0, D_ENMY_SPACE_400A630 }; static Gfx* gMemoraPartDL[3] = { aEnmySpMeMora1DL, aEnmySpMeMora2DL, aEnmySpMeMora3DL };
void MeMora_Dying(MeMora* this) { void MeMora_Dying(MeMora* this) {
Vec3f sp34; Vec3f sp34;
@ -292,14 +295,14 @@ void MeMora_Dying(MeMora* this) {
} }
} }
void MeMora_8006B46C(MeMora* this, f32 xTrans, f32 yTrans, f32 zTrans, f32 xRot, f32 yRot, f32 zRot, u8 arg7, f32 scale, void Memora_DrawParts(MeMora* this, f32 xTrans, f32 yTrans, f32 zTrans, f32 xRot, f32 yRot, f32 zRot, u8 partIdx,
s32 arg9) { f32 scale, bool colorFlicker) {
Vec3f sp34 = { 0.0f, 0.0f, 0.0f }; Vec3f src = { 0.0f, 0.0f, 0.0f };
Matrix_Push(&gGfxMatrix); Matrix_Push(&gGfxMatrix);
Matrix_Translate(gGfxMatrix, xTrans, yTrans, zTrans + gPathProgress, MTXF_APPLY); Matrix_Translate(gGfxMatrix, xTrans, yTrans, zTrans + gPathProgress, MTXF_APPLY);
if (arg7 != 1) { if (partIdx != 1) {
Matrix_RotateY(gGfxMatrix, M_DTOR * yRot, MTXF_APPLY); Matrix_RotateY(gGfxMatrix, M_DTOR * yRot, MTXF_APPLY);
Matrix_RotateX(gGfxMatrix, M_DTOR * xRot, MTXF_APPLY); Matrix_RotateX(gGfxMatrix, M_DTOR * xRot, MTXF_APPLY);
Matrix_RotateZ(gGfxMatrix, M_DTOR * zRot, MTXF_APPLY); Matrix_RotateZ(gGfxMatrix, M_DTOR * zRot, MTXF_APPLY);
@ -308,11 +311,11 @@ void MeMora_8006B46C(MeMora* this, f32 xTrans, f32 yTrans, f32 zTrans, f32 xRot,
Matrix_Scale(gGfxMatrix, scale, scale, 1.0f, MTXF_APPLY); Matrix_Scale(gGfxMatrix, scale, scale, 1.0f, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp); Matrix_SetGfxMtx(&gMasterDisp);
if (arg7 != 1) { if (partIdx != 1) {
RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
if ((arg7 == 0) && (this->lockOnTimers[TEAM_ID_FOX] != 0)) { if ((partIdx == 0) && (this->lockOnTimers[TEAM_ID_FOX] != 0)) {
sp34.y += this->info.targetOffset; src.y += this->info.targetOffset;
Matrix_MultVec3f(gGfxMatrix, &sp34, &gLockOnTargetViewPos[TEAM_ID_FOX]); Matrix_MultVec3f(gGfxMatrix, &src, &gLockOnTargetViewPos[TEAM_ID_FOX]);
if (gLockOnTargetViewPos[TEAM_ID_FOX].z > -500.0f) { if (gLockOnTargetViewPos[TEAM_ID_FOX].z > -500.0f) {
this->lockOnTimers[TEAM_ID_FOX] = 0; this->lockOnTimers[TEAM_ID_FOX] = 0;
} }
@ -321,12 +324,12 @@ void MeMora_8006B46C(MeMora* this, f32 xTrans, f32 yTrans, f32 zTrans, f32 xRot,
RCP_SetupDL_60(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); RCP_SetupDL_60(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
} }
if (arg9 != 0) { if (colorFlicker) {
RCP_SetupDL_64(); RCP_SetupDL_64();
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 0, 0, 255); gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 0, 0, 255);
} }
gSPDisplayList(gMasterDisp++, D_800D0004[arg7]); gSPDisplayList(gMasterDisp++, gMemoraPartDL[partIdx]);
Matrix_Pop(&gGfxMatrix); Matrix_Pop(&gGfxMatrix);
RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
} }
@ -337,9 +340,9 @@ void MeMora_Draw(MeMora* this) {
for (i = this->unk_04A; i < ARRAY_COUNT(D_800CFF94); i++) { for (i = this->unk_04A; i < ARRAY_COUNT(D_800CFF94); i++) {
j = (D_800CFF94[i] + this->counter_04E) % 100; j = (D_800CFF94[i] + this->counter_04E) % 100;
MeMora_8006B46C(this, gMeMoraXpos[this->unk_046][j], gMeMoraYpos[this->unk_046][j], Memora_DrawParts(this, gMeMoraXpos[this->unk_046][j], gMeMoraYpos[this->unk_046][j],
gMeMoraZpos[this->unk_046][j], gMeMoraXrot[this->unk_046][j], gMeMoraYrot[this->unk_046][j], gMeMoraZpos[this->unk_046][j], gMeMoraXrot[this->unk_046][j], gMeMoraYrot[this->unk_046][j],
gMeMoraZrot[this->unk_046][j], D_800CFFB4[i], D_800CFFC4[i], this->timer_0C6 % 2U); gMeMoraZrot[this->unk_046][j], gMeMoraPartIdx[i], gMeMoraScale[i], this->timer_0C6 % 2U);
} }
} }
@ -1040,7 +1043,7 @@ static EventActorInfo sEventActorInfo[108] = {
/* 95 */ { D_WZ_70008F0, gCubeHitbox100, -1.0f, 100.0f, 8000.0f, 1, 0, EISFX_NONE, 0, 0.0f, 0 }, /* 95 */ { D_WZ_70008F0, gCubeHitbox100, -1.0f, 100.0f, 8000.0f, 1, 0, EISFX_NONE, 0, 0.0f, 0 },
/* 96 */ { D_WZ_7000280, gWarpZoneEvent96Hitbox, -1.0f, 1000.0f, 3000.0f, 1, 0, EISFX_NONE, 0, 0.0f, 0 }, /* 96 */ { D_WZ_7000280, gWarpZoneEvent96Hitbox, -1.0f, 1000.0f, 3000.0f, 1, 0, EISFX_NONE, 0, 0.0f, 0 },
/* 97 */ { D_ME_600AC70, gCubeHitbox100, -1.0f, 100.0f, 3000.0f, 1, 0, EISFX_NONE, 0, 0.0f, 1 }, /* 97 */ { D_ME_600AC70, gCubeHitbox100, -1.0f, 100.0f, 3000.0f, 1, 0, EISFX_NONE, 0, 0.0f, 1 },
/* 98 */ { D_MA_601A2B0, aMaBoulderHitbox, 1.0f, 100.0f, 3000.0f, 1, 1, EISFX_NONE, 0, 0.0f, 1 }, /* 98 */ { aMaBoulderDL, aMaBoulderHitbox, 1.0f, 100.0f, 3000.0f, 1, 1, EISFX_NONE, 0, 0.0f, 1 },
/* 99 */ { D_VE1_6002500, D_VE1_601B944, -1.0f, 100.0f, 3000.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 }, /* 99 */ { D_VE1_6002500, D_VE1_601B944, -1.0f, 100.0f, 3000.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 },
/* 100 */ { D_VE1_60043F0, gNoHitbox, -1.0f, 100.0f, 3000.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 }, /* 100 */ { D_VE1_60043F0, gNoHitbox, -1.0f, 100.0f, 3000.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 },
/* 101 */ { D_VE1_6004310, gNoHitbox, -1.0f, 100.0f, 3000.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 }, /* 101 */ { D_VE1_6004310, gNoHitbox, -1.0f, 100.0f, 3000.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 },
@ -3579,7 +3582,7 @@ void ActorEvent_Update(ActorEvent* this) {
case EVID_79: case EVID_79:
if (this->timer_0C4 == 0) { if (this->timer_0C4 == 0) {
this->animFrame++; this->animFrame++;
if (Animation_GetFrameCount(&D_ZO_600E5EC) < this->animFrame) { if (Animation_GetFrameCount(&aZoBirdAnim) < this->animFrame) {
this->animFrame = 0; this->animFrame = 0;
} }
} }
@ -3942,7 +3945,7 @@ void ActorEvent_Draw(ActorEvent* this) {
this->fwork[16] += (-this->obj.rot.z * 0.7f - this->fwork[16]) * 0.2f; this->fwork[16] += (-this->obj.rot.z * 0.7f - this->fwork[16]) * 0.2f;
this->fwork[27] += (this->obj.rot.z * 0.7f - this->fwork[27]) * 0.2f; this->fwork[27] += (this->obj.rot.z * 0.7f - this->fwork[27]) * 0.2f;
} }
func_edisplay_8005B388(this); ActorTeamArwing_Draw(this);
break; break;
case EVID_TEAMMATE: case EVID_TEAMMATE:

4
src/engine/fox_hud.c
View File

@ -3649,12 +3649,12 @@ void HUD_Draw(void) {
void HUD_FoBase_Draw(Boss* boss) { void HUD_FoBase_Draw(Boss* boss) {
RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
gSPDisplayList(gMasterDisp++, D_FO_6003090); gSPDisplayList(gMasterDisp++, aFoBaseDL2);
RCP_SetupDL_34(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); RCP_SetupDL_34(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK); gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK);
gDPSetTextureFilter(gMasterDisp++, G_TF_POINT); gDPSetTextureFilter(gMasterDisp++, G_TF_POINT);
gDPSetPrimColor(gMasterDisp++, 0, 0, 0, (s32) boss->fwork[1], (s32) boss->fwork[2], 255); gDPSetPrimColor(gMasterDisp++, 0, 0, 0, (s32) boss->fwork[1], (s32) boss->fwork[2], 255);
gSPDisplayList(gMasterDisp++, D_FO_600D5C0); gSPDisplayList(gMasterDisp++, aFoBaseDL1);
gDPSetTextureFilter(gMasterDisp++, G_TF_BILERP); gDPSetTextureFilter(gMasterDisp++, G_TF_BILERP);
} }

184
src/engine/fox_play.c
View File

@ -325,7 +325,7 @@ void Play_InitVsStage(void) {
if (gLevelObjects[j].id <= OBJ_INVALID) { if (gLevelObjects[j].id <= OBJ_INVALID) {
break; break;
} }
if (gLevelObjects[j].id == OBJ_SCENERY_147) { if (gLevelObjects[j].id == OBJ_SCENERY_LEVEL_OBJECTS) {
Scenery360_Initialize(&gScenery360[i]); Scenery360_Initialize(&gScenery360[i]);
gScenery360[i].obj.status = OBJ_ACTIVE; gScenery360[i].obj.status = OBJ_ACTIVE;
gScenery360[i].obj.id = gLevelObjects[j].id; gScenery360[i].obj.id = gLevelObjects[j].id;
@ -341,7 +341,7 @@ void Play_InitVsStage(void) {
if (gLevelObjects[j].id <= OBJ_INVALID) { if (gLevelObjects[j].id <= OBJ_INVALID) {
break; break;
} }
if (gLevelObjects[j].id != OBJ_SCENERY_147) { if (gLevelObjects[j].id != OBJ_SCENERY_LEVEL_OBJECTS) {
Scenery360_Initialize(&gScenery360[i]); Scenery360_Initialize(&gScenery360[i]);
gScenery360[i].obj.status = OBJ_ACTIVE; gScenery360[i].obj.status = OBJ_ACTIVE;
gScenery360[i].obj.id = gLevelObjects[j].id; gScenery360[i].obj.id = gLevelObjects[j].id;
@ -975,6 +975,7 @@ void Player_ApplyDamage(Player* player, s32 direction, s32 damage) {
player->knockback.x = sp38.x; player->knockback.x = sp38.x;
player->knockback.y = sp38.y; player->knockback.y = sp38.y;
player->knockback.z = sp38.z; player->knockback.z = sp38.z;
if (Rand_ZeroOne() < 0.5f) { if (Rand_ZeroOne() < 0.5f) {
Player_DamageWings(player, 1, 15); Player_DamageWings(player, 1, 15);
} else { } else {
@ -1030,14 +1031,14 @@ void Player_GroundedCollision(Player* player, u32 arg1, f32 arg2, f32 arg3) {
} }
} }
bool Play_CheckDynaFloorCollision(f32* arg0, s32* arg1, f32 xPos, f32 yPos, f32 zPos) { bool Play_CheckDynaFloorCollision(f32* floorHeight, s32* triangleIndex, f32 xPos, f32 yPos, f32 zPos) {
Vtx* spA4; Vtx* vertexData;
u16* spA0; u16* indexData;
s32 sp9C; s32 gridX;
s32 sp98; s32 gridZ;
f32 sp94; f32 modZ;
f32 sp90; f32 modX;
s32 sp8C; s32 vertIndex;
f32 x0; f32 x0;
f32 y0; f32 y0;
f32 z0; f32 z0;
@ -1047,80 +1048,85 @@ bool Play_CheckDynaFloorCollision(f32* arg0, s32* arg1, f32 xPos, f32 yPos, f32
f32 x2; f32 x2;
f32 y2; f32 y2;
f32 z2; f32 z2;
f32 temp1; f32 tempVar;
f32 dz21; f32 deltaZ21;
f32 dx10; f32 deltaX10;
f32 dx21; f32 deltaX21;
f32 dy10; f32 deltaY10;
f32 dy21; f32 deltaY21;
f32 dz10; f32 deltaZ10;
f32 sp48; f32 heightVal;
f32 crz; f32 crossProductX;
f32 cry; f32 crossProductY;
f32 crx; f32 crossProductZ;
switch (gCurrentLevel) { switch (gCurrentLevel) {
case LEVEL_SOLAR: case LEVEL_SOLAR:
spA4 = SEGMENTED_TO_VIRTUAL(D_SO_6001C50); vertexData = SEGMENTED_TO_VIRTUAL(D_SO_6001C50);
spA0 = SEGMENTED_TO_VIRTUAL(D_SO_6022760); indexData = SEGMENTED_TO_VIRTUAL(D_SO_6022760);
break; break;
case LEVEL_ZONESS: case LEVEL_ZONESS:
spA4 = SEGMENTED_TO_VIRTUAL(D_ZO_6009ED0); vertexData = SEGMENTED_TO_VIRTUAL(D_ZO_6009ED0);
spA0 = SEGMENTED_TO_VIRTUAL(D_ZO_602AC50); indexData = SEGMENTED_TO_VIRTUAL(D_ZO_602AC50);
break; break;
default: default:
return false; return false;
} }
sp9C = (s32) ((xPos + 2400.0f) / 300.0f); gridX = (s32) ((xPos + 2400.0f) / 300.0f);
sp98 = (s32) ((zPos + gPathProgress + 1500.0f + 2400.0f) / 300.0f); gridZ = (s32) ((zPos + gPathProgress + 1500.0f + 2400.0f) / 300.0f);
if ((sp9C < 0) || (sp9C >= 16) || (sp98 < 0) || (sp98 >= 16)) { if ((gridX < 0) || (gridX >= 16) || (gridZ < 0) || (gridZ >= 16)) {
return false; return false;
} }
sp90 = Math_ModF(xPos + 2400.0f, 300.0f); modX = Math_ModF(xPos + 2400.0f, 300.0f);
sp94 = Math_ModF(zPos + gPathProgress + 1500.0f + 2400.0f, 300.0f); modZ = Math_ModF(zPos + gPathProgress + 1500.0f + 2400.0f, 300.0f);
sp8C = (sp98 * 17) + sp9C;
x0 = spA4[spA0[sp8C]].n.ob[0] * 3.0f; vertIndex = (gridZ * 17) + gridX;
y0 = spA4[spA0[sp8C]].n.ob[1] * 2.0f;
z0 = spA4[spA0[sp8C]].n.ob[2] * 3.0f;
if (sp90 < sp94) { x0 = vertexData[indexData[vertIndex]].n.ob[0] * 3.0f;
x1 = spA4[spA0[sp8C + 18]].n.ob[0] * 3.0f; y0 = vertexData[indexData[vertIndex]].n.ob[1] * 2.0f;
y1 = spA4[spA0[sp8C + 18]].n.ob[1] * 2.0f; z0 = vertexData[indexData[vertIndex]].n.ob[2] * 3.0f;
z1 = spA4[spA0[sp8C + 18]].n.ob[2] * 3.0f;
x2 = spA4[spA0[sp8C + 17]].n.ob[0] * 3.0f; if (modX < modZ) {
y2 = spA4[spA0[sp8C + 17]].n.ob[1] * 2.0f; x1 = vertexData[indexData[vertIndex + 18]].n.ob[0] * 3.0f;
z2 = spA4[spA0[sp8C + 17]].n.ob[2] * 3.0f; y1 = vertexData[indexData[vertIndex + 18]].n.ob[1] * 2.0f;
z1 = vertexData[indexData[vertIndex + 18]].n.ob[2] * 3.0f;
x2 = vertexData[indexData[vertIndex + 17]].n.ob[0] * 3.0f;
y2 = vertexData[indexData[vertIndex + 17]].n.ob[1] * 2.0f;
z2 = vertexData[indexData[vertIndex + 17]].n.ob[2] * 3.0f;
} else { } else {
x1 = spA4[spA0[sp8C + 1]].n.ob[0] * 3.0f; x1 = vertexData[indexData[vertIndex + 1]].n.ob[0] * 3.0f;
y1 = spA4[spA0[sp8C + 1]].n.ob[1] * 2.0f; y1 = vertexData[indexData[vertIndex + 1]].n.ob[1] * 2.0f;
z1 = spA4[spA0[sp8C + 1]].n.ob[2] * 3.0f; z1 = vertexData[indexData[vertIndex + 1]].n.ob[2] * 3.0f;
x2 = spA4[spA0[sp8C + 18]].n.ob[0] * 3.0f; x2 = vertexData[indexData[vertIndex + 18]].n.ob[0] * 3.0f;
y2 = spA4[spA0[sp8C + 18]].n.ob[1] * 2.0f; y2 = vertexData[indexData[vertIndex + 18]].n.ob[1] * 2.0f;
z2 = spA4[spA0[sp8C + 18]].n.ob[2] * 3.0f; z2 = vertexData[indexData[vertIndex + 18]].n.ob[2] * 3.0f;
} }
dx10 = x1 - x0;
dx21 = x2 - x1;
dy10 = y1 - y0;
dy21 = y2 - y1; deltaX10 = x1 - x0;
dz10 = z1 - z0; deltaX21 = x2 - x1;
dz21 = z2 - z1; deltaY10 = y1 - y0;
deltaY21 = y2 - y1;
deltaZ10 = z1 - z0;
deltaZ21 = z2 - z1;
crx = (dy10 * dz21) - (dz10 * dy21); crossProductX = (deltaY10 * deltaZ21) - (deltaZ10 * deltaY21);
cry = (dz10 * dx21) - (dx10 * dz21); crossProductY = (deltaZ10 * deltaX21) - (deltaX10 * deltaZ21);
crz = (dx10 * dy21) - (dy10 * dx21); crossProductZ = (deltaX10 * deltaY21) - (deltaY10 * deltaX21);
temp1 = -crx * x0 - cry * y0 - crz * z0; tempVar = -crossProductX * x0 - crossProductY * y0 - crossProductZ * z0;
sp48 = (-temp1 - crx * xPos - crz * (zPos + gPathProgress + 1500.0f)) / cry; heightVal = (-tempVar - crossProductX * xPos - crossProductZ * (zPos + gPathProgress + 1500.0f)) / crossProductY;
if (yPos < sp48) {
*arg0 = sp48; if (yPos < heightVal) {
*arg1 = sp8C; *floorHeight = heightVal;
*triangleIndex = vertIndex;
return true; return true;
} }
return false; return false;
} }
@ -1401,7 +1407,7 @@ bool Play_CheckPolyCollision(ObjectId objId, f32 arg1, f32 arg2, f32 arg3, f32 a
case OBJ_SCENERY_VS_SPACE_JUNK_1: case OBJ_SCENERY_VS_SPACE_JUNK_1:
case OBJ_SCENERY_VS_SPACE_JUNK_2: case OBJ_SCENERY_VS_SPACE_JUNK_2:
case OBJ_SCENERY_VS_SPACE_JUNK_3: case OBJ_SCENERY_VS_SPACE_JUNK_3:
case OBJ_SCENERY_147: case OBJ_SCENERY_LEVEL_OBJECTS:
case OBJ_SCENERY_FO_MOUNTAIN_1: case OBJ_SCENERY_FO_MOUNTAIN_1:
case OBJ_SCENERY_CO_BUILDING_9: case OBJ_SCENERY_CO_BUILDING_9:
case OBJ_SCENERY_CO_BUILDING_10: case OBJ_SCENERY_CO_BUILDING_10:
@ -1448,9 +1454,9 @@ bool Play_CheckPolyCollision(ObjectId objId, f32 arg1, f32 arg2, f32 arg3, f32 a
return false; return false;
} }
s32 Player_CheckPolyCollision(Player* player, ObjectId objId, f32 x, f32 y, f32 z, f32 arg5, f32 arg6, f32 arg7) { s32 Player_CheckPolyCollision(Player* player, ObjectId objId, f32 x, f32 y, f32 z, f32 arg5, f32 angle, f32 arg7) {
Vec3f sp84; Vec3f sp84;
Vec3f sp78; Vec3f src;
Vec3f sp6C; Vec3f sp6C;
Vec3f sp60; Vec3f sp60;
Vec3f sp54; Vec3f sp54;
@ -1459,20 +1465,20 @@ s32 Player_CheckPolyCollision(Player* player, ObjectId objId, f32 x, f32 y, f32
sp84.y = y; sp84.y = y;
sp84.z = z; sp84.z = z;
Matrix_RotateY(gCalcMatrix, -arg6 * M_DTOR, MTXF_NEW); Matrix_RotateY(gCalcMatrix, -angle * M_DTOR, MTXF_NEW);
sp78.x = player->vel.x; src.x = player->vel.x;
sp78.y = player->vel.y; src.y = player->vel.y;
sp78.z = player->vel.z; src.z = player->vel.z;
Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp78, &sp54); Matrix_MultVec3fNoTranslate(gCalcMatrix, &src, &sp54);
if ((player->form == FORM_LANDMASTER) || (player->form == FORM_ON_FOOT)) { if ((player->form == FORM_LANDMASTER) || (player->form == FORM_ON_FOOT)) {
sp78.x = player->pos.x - sp84.x; src.x = player->pos.x - sp84.x;
sp78.y = player->pos.y - sp84.y; src.y = player->pos.y - sp84.y;
sp78.z = player->trueZpos - sp84.z; src.z = player->trueZpos - sp84.z;
Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp78, &sp6C); Matrix_MultVec3fNoTranslate(gCalcMatrix, &src, &sp6C);
if (Play_CheckPolyCollision(objId, sp84.x, sp84.y, sp84.z, sp6C.x + sp84.x, sp6C.y + sp84.y, sp6C.z + sp84.z, if (Play_CheckPolyCollision(objId, sp84.x, sp84.y, sp84.z, sp6C.x + sp84.x, sp6C.y + sp84.y, sp6C.z + sp84.z,
&sp60, &sp54)) { &sp60, &sp54)) {
@ -1490,43 +1496,43 @@ s32 Player_CheckPolyCollision(Player* player, ObjectId objId, f32 x, f32 y, f32
} }
} }
sp78.x = player->hit3.x - sp84.x; src.x = player->hit3.x - sp84.x;
sp78.y = player->hit3.y - sp84.y; src.y = player->hit3.y - sp84.y;
sp78.z = player->hit3.z - sp84.z; src.z = player->hit3.z - sp84.z;
Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp78, &sp6C); Matrix_MultVec3fNoTranslate(gCalcMatrix, &src, &sp6C);
if (Play_CheckPolyCollision(objId, sp84.x, sp84.y, sp84.z, sp6C.x + sp84.x, sp6C.y + sp84.y, sp6C.z + sp84.z, &sp60, if (Play_CheckPolyCollision(objId, sp84.x, sp84.y, sp84.z, sp6C.x + sp84.x, sp6C.y + sp84.y, sp6C.z + sp84.z, &sp60,
&sp54)) { &sp54)) {
return 3; return 3;
} }
sp78.x = player->hit4.x - sp84.x; src.x = player->hit4.x - sp84.x;
sp78.y = player->hit4.y - sp84.y; src.y = player->hit4.y - sp84.y;
sp78.z = player->hit4.z - sp84.z; src.z = player->hit4.z - sp84.z;
Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp78, &sp6C); Matrix_MultVec3fNoTranslate(gCalcMatrix, &src, &sp6C);
if (Play_CheckPolyCollision(objId, sp84.x, sp84.y, sp84.z, sp6C.x + sp84.x, sp6C.y + sp84.y, sp6C.z + sp84.z, &sp60, if (Play_CheckPolyCollision(objId, sp84.x, sp84.y, sp84.z, sp6C.x + sp84.x, sp6C.y + sp84.y, sp6C.z + sp84.z, &sp60,
&sp54)) { &sp54)) {
return 4; return 4;
} }
sp78.x = player->hit1.x - sp84.x; src.x = player->hit1.x - sp84.x;
sp78.y = player->hit1.y - sp84.y; src.y = player->hit1.y - sp84.y;
sp78.z = player->hit1.z - sp84.z; src.z = player->hit1.z - sp84.z;
Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp78, &sp6C); Matrix_MultVec3fNoTranslate(gCalcMatrix, &src, &sp6C);
if (Play_CheckPolyCollision(objId, sp84.x, sp84.y, sp84.z, sp6C.x + sp84.x, sp6C.y + sp84.y, sp6C.z + sp84.z, &sp60, if (Play_CheckPolyCollision(objId, sp84.x, sp84.y, sp84.z, sp6C.x + sp84.x, sp6C.y + sp84.y, sp6C.z + sp84.z, &sp60,
&sp54)) { &sp54)) {
return 1; return 1;
} }
sp78.x = player->hit2.x - sp84.x; src.x = player->hit2.x - sp84.x;
sp78.y = player->hit2.y - sp84.y; src.y = player->hit2.y - sp84.y;
sp78.z = player->hit2.z - sp84.z; src.z = player->hit2.z - sp84.z;
Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp78, &sp6C); Matrix_MultVec3fNoTranslate(gCalcMatrix, &src, &sp6C);
if (Play_CheckPolyCollision(objId, sp84.x, sp84.y, sp84.z, sp6C.x + sp84.x, sp6C.y + sp84.y, sp6C.z + sp84.z, &sp60, if (Play_CheckPolyCollision(objId, sp84.x, sp84.y, sp84.z, sp6C.x + sp84.x, sp6C.y + sp84.y, sp6C.z + sp84.z, &sp60,
&sp54)) { &sp54)) {

4
src/overlays/ovl_ending/fox_end1.c
View File

@ -1767,11 +1767,11 @@ void Ending_8018C21C(void) {
Matrix_SetGfxMtx(&gMasterDisp); Matrix_SetGfxMtx(&gMasterDisp);
if (gGreatFoxIntact) { if (gGreatFoxIntact) {
gSPDisplayList(gMasterDisp++, D_GREAT_FOX_E000000); gSPDisplayList(gMasterDisp++, aGreatFoxIntactDL);
} }
if (!gGreatFoxIntact) { if (!gGreatFoxIntact) {
gSPDisplayList(gMasterDisp++, D_GREAT_FOX_E003AB0); gSPDisplayList(gMasterDisp++, aGreatFoxDamagedDL);
} }
RCP_SetupDL(&gMasterDisp, SETUPDL_49); RCP_SetupDL(&gMasterDisp, SETUPDL_49);

2
src/overlays/ovl_i1/fox_co.c
View File

@ -1244,7 +1244,7 @@ void Corneria_CoGranga_PostLimbDraw(s32 limbIndex, Vec3f* rot, void* data) {
void Corneria_CoGranga_Draw(CoGranga* this) { void Corneria_CoGranga_Draw(CoGranga* this) {
Matrix_Translate(gCalcMatrix, 0.0f, 700.0f, 0.0f, MTXF_APPLY); Matrix_Translate(gCalcMatrix, 0.0f, 700.0f, 0.0f, MTXF_APPLY);
Animation_DrawSkeleton(2, D_CO_602BE64, this->vwork, Corneria_CoGranga_OverrideLimbDraw, Animation_DrawSkeleton(2, aCoGrangaSkel, this->vwork, Corneria_CoGranga_OverrideLimbDraw,
Corneria_CoGranga_PostLimbDraw, this, gCalcMatrix); Corneria_CoGranga_PostLimbDraw, this, gCalcMatrix);
Matrix_Pop(&gGfxMatrix); Matrix_Pop(&gGfxMatrix);
Matrix_Push(&gGfxMatrix); Matrix_Push(&gGfxMatrix);

2
src/overlays/ovl_i1/fox_ve1.c
View File

@ -689,7 +689,7 @@ void Venom1_Ve1MonkeyStatue_Update(Ve1MonkeyStatue* this) {
void Venom1_Ve1MonkeyStatue_Draw(Ve1MonkeyStatue* this) { void Venom1_Ve1MonkeyStatue_Draw(Ve1MonkeyStatue* this) {
Matrix_Translate(gGfxMatrix, 0.0f, -488.0f, 0.0f, MTXF_APPLY); Matrix_Translate(gGfxMatrix, 0.0f, -488.0f, 0.0f, MTXF_APPLY);
Animation_DrawSkeleton(0, D_VE1_900D164, this->vwork, NULL, NULL, this, &gIdentityMatrix); Animation_DrawSkeleton(0, aVe1MonkeyStatueSkel, this->vwork, NULL, NULL, this, &gIdentityMatrix);
} }
void Venom1_Ve1Generator_Update(Ve1Generator* this) { void Venom1_Ve1Generator_Update(Ve1Generator* this) {

17
src/overlays/ovl_i2/fox_sx.c
View File

@ -23,7 +23,7 @@ void SectorX_8018F030(void) {
if (actor->obj.status == OBJ_FREE) { if (actor->obj.status == OBJ_FREE) {
Actor_Initialize(actor); Actor_Initialize(actor);
actor->obj.status = OBJ_INIT; actor->obj.status = OBJ_INIT;
actor->obj.id = OBJ_ACTOR_SLIPPY_SX; actor->obj.id = OBJ_ACTOR_SX_SLIPPY;
actor->animFrame = 1; actor->animFrame = 1;
actor->obj.rot.y = 180.0f; actor->obj.rot.y = 180.0f;
actor->obj.pos.x = gPlayer[0].cam.eye.x - 300.0f; actor->obj.pos.x = gPlayer[0].cam.eye.x - 300.0f;
@ -43,7 +43,7 @@ void SectorX_SxSlippy_Setup(void) {
Actor_Initialize(slippy); Actor_Initialize(slippy);
slippy->obj.status = OBJ_INIT; slippy->obj.status = OBJ_INIT;
slippy->obj.id = OBJ_ACTOR_SLIPPY_SX; slippy->obj.id = OBJ_ACTOR_SX_SLIPPY;
slippy->animFrame = -1; slippy->animFrame = -1;
slippy->obj.pos.x = gPlayer[0].cam.eye.x + 3000.0f; slippy->obj.pos.x = gPlayer[0].cam.eye.x + 3000.0f;
@ -174,7 +174,7 @@ void SectorX_SxSlippy_Draw(SxSlippy* this) {
case 1: case 1:
case 2: case 2:
case 10: case 10:
func_edisplay_8005B388(this); ActorTeamArwing_Draw(this);
break; break;
case -1: case -1:
@ -205,7 +205,7 @@ void SectorX_8018FA04(f32 x, f32 y, f32 z) {
if (actor->obj.status == OBJ_FREE) { if (actor->obj.status == OBJ_FREE) {
Actor_Initialize(actor); Actor_Initialize(actor);
actor->obj.status = OBJ_INIT; actor->obj.status = OBJ_INIT;
actor->obj.id = OBJ_ACTOR_SLIPPY_SX; actor->obj.id = OBJ_ACTOR_SX_SLIPPY;
actor->obj.pos.x = x; actor->obj.pos.x = x;
actor->obj.pos.y = y; actor->obj.pos.y = y;
actor->obj.pos.z = z; actor->obj.pos.z = z;
@ -307,7 +307,7 @@ bool SectorX_8018FF40(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void*
} }
void SectorX_SxSpyborgLeftArm_Draw(SxSpyborgLeftArm* this) { void SectorX_SxSpyborgLeftArm_Draw(SxSpyborgLeftArm* this) {
Animation_DrawSkeleton(3, D_SX_6020C68, this->vwork, SectorX_8018FF40, SectorX_SxSpyborg_PostLimbDraw, this, Animation_DrawSkeleton(3, aSxSpyborgSkel, this->vwork, SectorX_8018FF40, SectorX_SxSpyborg_PostLimbDraw, this,
gCalcMatrix); gCalcMatrix);
} }
@ -320,7 +320,7 @@ bool SectorX_8018FFDC(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void*
} }
void SectorX_SxSpyborgRightArm_Draw(SxSpyborgRightArm* this) { void SectorX_SxSpyborgRightArm_Draw(SxSpyborgRightArm* this) {
Animation_DrawSkeleton(3, D_SX_6020C68, this->vwork, SectorX_8018FFDC, SectorX_SxSpyborg_PostLimbDraw, this, Animation_DrawSkeleton(3, aSxSpyborgSkel, this->vwork, SectorX_8018FFDC, SectorX_SxSpyborg_PostLimbDraw, this,
gCalcMatrix); gCalcMatrix);
} }
@ -1103,7 +1103,7 @@ void SectorX_SxSpyborg_Update(SxSpyborg* this) {
D_i2_80195640 = 1; D_i2_80195640 = 1;
Animation_DrawSkeleton(1, D_SX_6020C68, this->vwork, SectorX_SxSpyborg_OverrideLimbDraw, Animation_DrawSkeleton(1, aSxSpyborgSkel, this->vwork, SectorX_SxSpyborg_OverrideLimbDraw,
SectorX_SxSpyborg_PostLimbDraw, this, &gIdentityMatrix); SectorX_SxSpyborg_PostLimbDraw, this, &gIdentityMatrix);
if (((this->swork[1] != 0) && (this->swork[3] > 0)) && ((this->fwork[4] < 45.0f) || (this->fwork[4] > 315.0f))) { if (((this->swork[1] != 0) && (this->swork[3] > 0)) && ((this->fwork[4] < 45.0f) || (this->fwork[4] > 315.0f))) {
@ -1369,7 +1369,8 @@ void SectorX_SxSpyborg_Draw(SxSpyborg* this) {
if (this->swork[5] == 0) { if (this->swork[5] == 0) {
D_i2_80195640 = 0; D_i2_80195640 = 0;
Animation_DrawSkeleton(3, D_SX_6020C68, this->vwork, SectorX_SxSpyborg_OverrideLimbDraw, 0, this, gCalcMatrix); Animation_DrawSkeleton(3, aSxSpyborgSkel, this->vwork, SectorX_SxSpyborg_OverrideLimbDraw, 0, this,
gCalcMatrix);
RCP_SetupDL_64(); RCP_SetupDL_64();
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 96); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 96);

61
src/overlays/ovl_i3/fox_aq.c
View File

@ -3744,15 +3744,13 @@ void Aquas_AqSculpin_Draw(AqSculpin* this) {
Vec3f jointTable[30]; Vec3f jointTable[30];
Matrix_Scale(gCalcMatrix, this->scale, this->scale, this->scale, MTXF_APPLY); Matrix_Scale(gCalcMatrix, this->scale, this->scale, this->scale, MTXF_APPLY);
Animation_GetFrameData(&D_AQ_6005954, this->animFrame, jointTable); Animation_GetFrameData(&aAqSculpinAnim, this->animFrame, jointTable);
Animation_DrawSkeleton(3, D_AQ_6005A80, jointTable, Aquas_AqSculpin_OverrideLimbDraw, Aquas_AqSculpin_PostLimbDraw, Animation_DrawSkeleton(3, aAqSculpinSkel, jointTable, Aquas_AqSculpin_OverrideLimbDraw,
this, gCalcMatrix); Aquas_AqSculpin_PostLimbDraw, this, gCalcMatrix);
} }
f32 D_i3_801C025C[2] = { 120.0f, 0.0f }; f32 D_i3_801C025C[2] = { 120.0f, 0.0f };
s32 D_i3_801C0264[19] = { s32 D_i3_801C0264[19] = { 0, 0, 3, 4, 0, 5, 6, 7, 1, 2, 0, 0, 0, 0, 0, 0, 8, 9, 0 };
0, 0, 3, 4, 0, 5, 6, 7, 1, 2, 0, 0, 0, 0, 0, 0, 8, 9, 0,
};
void Aquas_AqSculpin_Update(AqSculpin* this) { void Aquas_AqSculpin_Update(AqSculpin* this) {
s32 i; s32 i;
@ -3814,10 +3812,12 @@ void Aquas_AqSculpin_Update(AqSculpin* this) {
Math_SmoothStepToF(&this->obj.pos.y, this->fwork[0], 1.0f, D_i3_801C0224[this->iwork[1]], 0); Math_SmoothStepToF(&this->obj.pos.y, this->fwork[0], 1.0f, D_i3_801C0224[this->iwork[1]], 0);
this->fwork[1] += 10.0f; this->fwork[1] += 10.0f;
this->vel.x = COS_DEG(this->fwork[1]) * this->iwork[1] * 0.1f; this->vel.x = COS_DEG(this->fwork[1]) * this->iwork[1] * 0.1f;
if ((this->fwork[0] - 1.0f) <= this->obj.pos.y) { if ((this->fwork[0] - 1.0f) <= this->obj.pos.y) {
this->state = 5; this->state = 5;
} }
if (((gGameFrameCount % 8) == 0)) {
if ((gGameFrameCount % 8) == 0) {
Aquas_Effect366_Spawn(this->obj.pos.x + RAND_FLOAT_CENTERED(100.0f), Aquas_Effect366_Spawn(this->obj.pos.x + RAND_FLOAT_CENTERED(100.0f),
this->obj.pos.y + RAND_FLOAT_CENTERED(100.0f), this->obj.pos.y + RAND_FLOAT_CENTERED(100.0f),
this->obj.pos.z + RAND_FLOAT_CENTERED(100.0f), 1.0f, 1); this->obj.pos.z + RAND_FLOAT_CENTERED(100.0f), 1.0f, 1);
@ -3826,9 +3826,11 @@ void Aquas_AqSculpin_Update(AqSculpin* this) {
case 5: case 5:
this->vel.z = gPlayer[0].vel.z; this->vel.z = gPlayer[0].vel.z;
Math_SmoothStepToF(&this->obj.pos.z, gPlayer[0].trueZpos - 1000.0f, 0.1f, 100.0f, 0); Math_SmoothStepToF(&this->obj.pos.z, gPlayer[0].trueZpos - 1000.0f, 0.1f, 100.0f, 0);
Math_SmoothStepToF(&this->vel.x, 0.0f, 1.0f, 2.0f, 0.001f); Math_SmoothStepToF(&this->vel.x, 0.0f, 1.0f, 2.0f, 0.001f);
Math_SmoothStepToAngle(&this->obj.rot.x, D_i3_801C025C[this->iwork[0]], 1.0f, 20.0f, 0); Math_SmoothStepToAngle(&this->obj.rot.x, D_i3_801C025C[this->iwork[0]], 1.0f, 20.0f, 0);
if (this->obj.rot.x == D_i3_801C025C[this->iwork[0]]) { if (this->obj.rot.x == D_i3_801C025C[this->iwork[0]]) {
this->iwork[0]++; this->iwork[0]++;
if (this->iwork[0] >= 2) { if (this->iwork[0] >= 2) {
@ -3853,7 +3855,8 @@ void Aquas_AqSculpin_Update(AqSculpin* this) {
case 6: case 6:
Math_SmoothStepToAngle(&this->obj.rot.x, this->fwork[3], 1.0f, 5.0f, 0); Math_SmoothStepToAngle(&this->obj.rot.x, this->fwork[3], 1.0f, 5.0f, 0);
Math_SmoothStepToAngle(&this->obj.rot.y, this->fwork[2], 1.0f, 5.0f, 0); Math_SmoothStepToAngle(&this->obj.rot.y, this->fwork[2], 1.0f, 5.0f, 0);
if (((gGameFrameCount % 4) == 0)) {
if ((gGameFrameCount % 4) == 0) {
Aquas_Effect366_Spawn(this->obj.pos.x + RAND_FLOAT_CENTERED(100.0f), Aquas_Effect366_Spawn(this->obj.pos.x + RAND_FLOAT_CENTERED(100.0f),
this->obj.pos.y + RAND_FLOAT_CENTERED(100.0f), this->obj.pos.y + RAND_FLOAT_CENTERED(100.0f),
this->obj.pos.z + RAND_FLOAT_CENTERED(100.0f), 1.0f, 1); this->obj.pos.z + RAND_FLOAT_CENTERED(100.0f), 1.0f, 1);
@ -3880,7 +3883,7 @@ void Aquas_AqSculpin_Update(AqSculpin* this) {
} else { } else {
this->animFrame += 3; this->animFrame += 3;
} }
if (this->animFrame >= Animation_GetFrameCount(&D_AQ_6005954)) { if (this->animFrame >= Animation_GetFrameCount(&aAqSculpinAnim)) {
this->animFrame = 0; this->animFrame = 0;
} }
} }
@ -4037,14 +4040,14 @@ f32 D_i3_801C02C8[2] = { 255.0f, 68.0f };
s32 D_i3_801C02D0[2] = { 70, 100 }; s32 D_i3_801C02D0[2] = { 70, 100 };
void Aquas_AqAnglerFish_Draw(AqAnglerFish* this) { void Aquas_AqAnglerFish_Draw(AqAnglerFish* this) {
Vec3f sp40[30]; Vec3f frameTable[30];
Matrix_Push(&gCalcMatrix); Matrix_Push(&gCalcMatrix);
Matrix_Push(&gGfxMatrix); Matrix_Push(&gGfxMatrix);
Matrix_Scale(gCalcMatrix, this->scale, this->scale, this->scale, MTXF_APPLY); Matrix_Scale(gCalcMatrix, this->scale, this->scale, this->scale, MTXF_APPLY);
Animation_GetFrameData(&D_AQ_6002628, this->animFrame, sp40); Animation_GetFrameData(&aAqAnglerFishAnim, this->animFrame, frameTable);
Animation_DrawSkeleton(3, D_AQ_6002874, sp40, Aquas_AqAnglerFish_OverrideLimbDraw, Aquas_AqAnglerFish_PostLimbDraw, Animation_DrawSkeleton(3, aAqAnglerFishSkel, frameTable, Aquas_AqAnglerFish_OverrideLimbDraw,
this, gCalcMatrix); Aquas_AqAnglerFish_PostLimbDraw, this, gCalcMatrix);
Matrix_Pop(&gGfxMatrix); Matrix_Pop(&gGfxMatrix);
Matrix_Pop(&gCalcMatrix); Matrix_Pop(&gCalcMatrix);
Matrix_Push(&gGfxMatrix); Matrix_Push(&gGfxMatrix);
@ -4127,7 +4130,7 @@ void Aquas_AqAnglerFish_Update(AqAnglerFish* this) {
} }
this->animFrame++; this->animFrame++;
if (this->animFrame >= Animation_GetFrameCount(&D_AQ_6002628)) { if (this->animFrame >= Animation_GetFrameCount(&aAqAnglerFishAnim)) {
this->animFrame = 0; this->animFrame = 0;
} }
@ -4373,7 +4376,7 @@ void Aquas_AqSpindlyFish_Update(AqSpindlyFish* this) {
} }
this->animFrame++; this->animFrame++;
if (Animation_GetFrameCount(&D_AQ_60260EC) < this->animFrame) { if (Animation_GetFrameCount(&aAqSpindlyFishAnim) < this->animFrame) {
this->animFrame = 0; this->animFrame = 0;
} }
@ -4491,15 +4494,15 @@ void Aquas_AqSpindlyFish_PostLimbDraw(s32 limbIndex, Vec3f* rot, void* thisx) {
} }
void Aquas_AqSpindlyFish_Draw(Actor* this) { void Aquas_AqSpindlyFish_Draw(Actor* this) {
Vec3f sp30[30]; Vec3f frameTable[30];
RCP_SetupDL(&gMasterDisp, SETUPDL_57); RCP_SetupDL(&gMasterDisp, SETUPDL_57);
if ((this->timer_0C6 % 2) != 0) { if ((this->timer_0C6 % 2) != 0) {
RCP_SetupDL(&gMasterDisp, SETUPDL_61); RCP_SetupDL(&gMasterDisp, SETUPDL_61);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 0, 0, 255); gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 0, 0, 255);
} }
Animation_GetFrameData(&D_AQ_60260EC, this->animFrame, sp30); Animation_GetFrameData(&aAqSpindlyFishAnim, this->animFrame, frameTable);
Animation_DrawSkeleton(3, D_AQ_60263F8, sp30, Aquas_AqSpindlyFish_OverrideLimbDraw, Animation_DrawSkeleton(3, aAqSpindlyFishSkel, frameTable, Aquas_AqSpindlyFish_OverrideLimbDraw,
Aquas_AqSpindlyFish_PostLimbDraw, this, gCalcMatrix); Aquas_AqSpindlyFish_PostLimbDraw, this, gCalcMatrix);
} }
@ -4935,17 +4938,17 @@ void Aquas_AqGaroa_PostLimbDraw(s32 limbIndex, Vec3f* rot, void* thisx) {
} }
void Aquas_AqGaroa_Draw(AqGaroa* this) { void Aquas_AqGaroa_Draw(AqGaroa* this) {
Vec3f sp30[30]; Vec3f frameTable[30];
if ((this->state >= 3) && (this->state < 5)) { if ((this->state >= 3) && (this->state < 5)) {
Animation_GetFrameData(&D_AQ_602AC28, this->animFrame, sp30); Animation_GetFrameData(&D_AQ_602AC28, this->animFrame, frameTable);
} else { } else {
Animation_GetFrameData(&D_AQ_6024F80, this->animFrame, sp30); Animation_GetFrameData(&D_AQ_6024F80, this->animFrame, frameTable);
} }
Matrix_Translate(gCalcMatrix, 0.0f, -150.0f, 100.0f, MTXF_APPLY); Matrix_Translate(gCalcMatrix, 0.0f, -150.0f, 100.0f, MTXF_APPLY);
Animation_DrawSkeleton(3, D_AQ_602512C, sp30, Aquas_AqGaroa_OverrideLimbDraw, Aquas_AqGaroa_PostLimbDraw, this, Animation_DrawSkeleton(3, aAqGaroaSkel, frameTable, Aquas_AqGaroa_OverrideLimbDraw, Aquas_AqGaroa_PostLimbDraw,
gCalcMatrix); this, gCalcMatrix);
} }
void Aquas_AqSquid_Update(AqSquid* this) { void Aquas_AqSquid_Update(AqSquid* this) {
@ -5028,7 +5031,7 @@ void Aquas_AqSquid_Update(AqSquid* this) {
case 1: case 1:
this->animFrame++; this->animFrame++;
if (this->animFrame >= Animation_GetFrameCount(&D_AQ_6000AE4)) { if (this->animFrame >= Animation_GetFrameCount(&aAqSquidAnim)) {
this->animFrame = 0; this->animFrame = 0;
} }
if (this->animFrame == 36) { if (this->animFrame == 36) {
@ -5076,7 +5079,7 @@ void Aquas_AqSquid_Update(AqSquid* this) {
case 2: case 2:
this->animFrame++; this->animFrame++;
if ((this->animFrame >= Animation_GetFrameCount(&D_AQ_6000AE4)) && (this->fwork[8] < 1.0f)) { if ((this->animFrame >= Animation_GetFrameCount(&aAqSquidAnim)) && (this->fwork[8] < 1.0f)) {
this->animFrame = 0; this->animFrame = 0;
} }
if (this->animFrame == 40) { if (this->animFrame == 40) {
@ -5215,7 +5218,7 @@ void Aquas_AqSquid_PostLimbDraw(s32 limbIndex, Vec3f* rot, void* thisx) {
} }
void Aquas_AqSquid_Draw(AqSquid* this) { void Aquas_AqSquid_Draw(AqSquid* this) {
Vec3f sp40[30]; Vec3f frameTable[30];
RCP_SetupDL(&gMasterDisp, SETUPDL_29); RCP_SetupDL(&gMasterDisp, SETUPDL_29);
if ((this->timer_0C6 % 2) != 0) { if ((this->timer_0C6 % 2) != 0) {
@ -5232,8 +5235,8 @@ void Aquas_AqSquid_Draw(AqSquid* this) {
Matrix_RotateX(gCalcMatrix, (this->obj.rot.x + 90.0f) * M_DTOR, MTXF_APPLY); Matrix_RotateX(gCalcMatrix, (this->obj.rot.x + 90.0f) * M_DTOR, MTXF_APPLY);
} }
Animation_GetFrameData(&D_AQ_6000AE4, this->animFrame, sp40); Animation_GetFrameData(&aAqSquidAnim, this->animFrame, frameTable);
Animation_DrawSkeleton(3, D_AQ_6000DB0, sp40, NULL, Aquas_AqSquid_PostLimbDraw, this, gCalcMatrix); Animation_DrawSkeleton(3, aAqSquidSkel, frameTable, NULL, Aquas_AqSquid_PostLimbDraw, this, gCalcMatrix);
} }
void Aquas_AqSeaweed_Update(AqSeaweed* this) { void Aquas_AqSeaweed_Update(AqSeaweed* this) {
@ -5281,7 +5284,7 @@ void Aquas_AqSeaweed_Update(AqSeaweed* this) {
void Aquas_AqSeaweed_Draw(AqSeaweed* this) { void Aquas_AqSeaweed_Draw(AqSeaweed* this) {
gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK); gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
Animation_DrawSkeleton(1, D_AQ_6020C6C, this->vwork, NULL, NULL, &this->index, &gIdentityMatrix); Animation_DrawSkeleton(1, aAqSeaweedSkel, this->vwork, NULL, NULL, &this->index, &gIdentityMatrix);
gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK); gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK);
} }

6
src/overlays/ovl_i3/fox_so.c
View File

@ -516,7 +516,7 @@ void Solar_SoRock_Draw(SoRock1* this) {
switch (this->obj.id) { switch (this->obj.id) {
case OBJ_ACTOR_SO_ROCK_1: case OBJ_ACTOR_SO_ROCK_1:
gSPDisplayList(gMasterDisp++, D_SO_6017370); gSPDisplayList(gMasterDisp++, aSoRock1DL);
break; break;
case OBJ_ACTOR_SO_ROCK_2: case OBJ_ACTOR_SO_ROCK_2:
@ -524,11 +524,11 @@ void Solar_SoRock_Draw(SoRock1* this) {
RCP_SetupDL(&gMasterDisp, SETUPDL_41); RCP_SetupDL(&gMasterDisp, SETUPDL_41);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 0, 255); gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 0, 255);
} }
gSPDisplayList(gMasterDisp++, D_SO_6017090); gSPDisplayList(gMasterDisp++, aSoRock2DL);
break; break;
case OBJ_ACTOR_SO_ROCK_3: case OBJ_ACTOR_SO_ROCK_3:
gSPDisplayList(gMasterDisp++, D_SO_6016CF0); gSPDisplayList(gMasterDisp++, aSoRock3DL);
break; break;
} }

111
src/overlays/ovl_i3/fox_zo.c
View File

@ -521,53 +521,53 @@ bool Zoness_ZoBird_OverrideLimbDraw(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3
} }
void Zoness_ZoBird_PostLimbDraw(s32 limbIndex, Vec3f* rot, void* thisx) { void Zoness_ZoBird_PostLimbDraw(s32 limbIndex, Vec3f* rot, void* thisx) {
Vec3f sp24 = { 0.0f, 0.0f, 0.0f }; Vec3f src = { 0.0f, 0.0f, 0.0f };
ZoBird* this = (ZoBird*) thisx; ZoBird* this = (ZoBird*) thisx;
if (this->state == 1) { if (this->state == 1) {
switch (limbIndex) { switch (limbIndex) {
case 0: case 0:
Matrix_MultVec3f(gCalcMatrix, &sp24, &this->vwork[0]); Matrix_MultVec3f(gCalcMatrix, &src, &this->vwork[0]);
Matrix_GetYRPAngles(gCalcMatrix, &this->vwork[11]); Matrix_GetYRPAngles(gCalcMatrix, &this->vwork[11]);
break; break;
case 1: case 1:
Matrix_MultVec3f(gCalcMatrix, &sp24, &this->vwork[1]); Matrix_MultVec3f(gCalcMatrix, &src, &this->vwork[1]);
Matrix_GetYRPAngles(gCalcMatrix, &this->vwork[12]); Matrix_GetYRPAngles(gCalcMatrix, &this->vwork[12]);
break; break;
case 2: case 2:
Matrix_MultVec3f(gCalcMatrix, &sp24, &this->vwork[2]); Matrix_MultVec3f(gCalcMatrix, &src, &this->vwork[2]);
Matrix_GetYRPAngles(gCalcMatrix, &this->vwork[13]); Matrix_GetYRPAngles(gCalcMatrix, &this->vwork[13]);
break; break;
case 3: case 3:
Matrix_MultVec3f(gCalcMatrix, &sp24, &this->vwork[3]); Matrix_MultVec3f(gCalcMatrix, &src, &this->vwork[3]);
Matrix_GetYRPAngles(gCalcMatrix, &this->vwork[14]); Matrix_GetYRPAngles(gCalcMatrix, &this->vwork[14]);
break; break;
case 4: case 4:
Matrix_MultVec3f(gCalcMatrix, &sp24, &this->vwork[4]); Matrix_MultVec3f(gCalcMatrix, &src, &this->vwork[4]);
Matrix_GetYRPAngles(gCalcMatrix, &this->vwork[15]); Matrix_GetYRPAngles(gCalcMatrix, &this->vwork[15]);
break; break;
case 5: case 5:
Matrix_MultVec3f(gCalcMatrix, &sp24, &this->vwork[5]); Matrix_MultVec3f(gCalcMatrix, &src, &this->vwork[5]);
Matrix_GetYRPAngles(gCalcMatrix, &this->vwork[16]); Matrix_GetYRPAngles(gCalcMatrix, &this->vwork[16]);
break; break;
case 6: case 6:
Matrix_MultVec3f(gCalcMatrix, &sp24, &this->vwork[6]); Matrix_MultVec3f(gCalcMatrix, &src, &this->vwork[6]);
Matrix_GetYRPAngles(gCalcMatrix, &this->vwork[17]); Matrix_GetYRPAngles(gCalcMatrix, &this->vwork[17]);
break; break;
case 7: case 7:
Matrix_MultVec3f(gCalcMatrix, &sp24, &this->vwork[7]); Matrix_MultVec3f(gCalcMatrix, &src, &this->vwork[7]);
Matrix_GetYRPAngles(gCalcMatrix, &this->vwork[18]); Matrix_GetYRPAngles(gCalcMatrix, &this->vwork[18]);
break; break;
case 8: case 8:
Matrix_MultVec3f(gCalcMatrix, &sp24, &this->vwork[8]); Matrix_MultVec3f(gCalcMatrix, &src, &this->vwork[8]);
Matrix_GetYRPAngles(gCalcMatrix, &this->vwork[19]); Matrix_GetYRPAngles(gCalcMatrix, &this->vwork[19]);
break; break;
case 9: case 9:
Matrix_MultVec3f(gCalcMatrix, &sp24, &this->vwork[9]); Matrix_MultVec3f(gCalcMatrix, &src, &this->vwork[9]);
Matrix_GetYRPAngles(gCalcMatrix, &this->vwork[20]); Matrix_GetYRPAngles(gCalcMatrix, &this->vwork[20]);
break; break;
case 10: case 10:
Matrix_MultVec3f(gCalcMatrix, &sp24, &this->vwork[10]); Matrix_MultVec3f(gCalcMatrix, &src, &this->vwork[10]);
Matrix_GetYRPAngles(gCalcMatrix, &this->vwork[21]); Matrix_GetYRPAngles(gCalcMatrix, &this->vwork[21]);
break; break;
} }
@ -578,9 +578,9 @@ void Zoness_ZoBird_Draw(ZoBird* this) {
Vec3f frameTable[30]; Vec3f frameTable[30];
Matrix_Scale(gCalcMatrix, this->scale, this->scale, this->scale, MTXF_APPLY); Matrix_Scale(gCalcMatrix, this->scale, this->scale, this->scale, MTXF_APPLY);
Animation_GetFrameData(&D_ZO_600E5EC, this->animFrame, frameTable); Animation_GetFrameData(&aZoBirdAnim, this->animFrame, frameTable);
Animation_DrawSkeleton(3, D_ZO_600E7D8, frameTable, Zoness_ZoBird_OverrideLimbDraw, Zoness_ZoBird_PostLimbDraw, Animation_DrawSkeleton(3, aZoBirdSkel, frameTable, Zoness_ZoBird_OverrideLimbDraw, Zoness_ZoBird_PostLimbDraw, this,
this, gCalcMatrix); gCalcMatrix);
} }
void Zoness_ZoBird_Update(ZoBird* this) { void Zoness_ZoBird_Update(ZoBird* this) {
@ -618,7 +618,7 @@ void Zoness_ZoBird_Update(ZoBird* this) {
this->animFrame++; this->animFrame++;
if (Animation_GetFrameCount(&D_ZO_600E5EC) < this->animFrame) { if (Animation_GetFrameCount(&aZoBirdAnim) < this->animFrame) {
this->animFrame = 0; this->animFrame = 0;
} }
@ -638,10 +638,10 @@ void Zoness_ZoBird_Update(ZoBird* this) {
void Zoness_80190790(ZoDodora* this) { void Zoness_80190790(ZoDodora* this) {
s32 pad[2]; s32 pad[2];
f32 temp1; f32 angle;
PosRot* snakePosRot; PosRot* zoDodoraPosRotPtr;
Vec3f sp44; Vec3f src;
Vec3f sp38; Vec3f dest;
s32 i; s32 i;
Actor* otherActor; Actor* otherActor;
@ -656,12 +656,14 @@ void Zoness_80190790(ZoDodora* this) {
this->fwork[1] += 5.0f; this->fwork[1] += 5.0f;
this->rot_0F4.z = SIN_DEG(this->fwork[1]) * 30.0f; this->rot_0F4.z = SIN_DEG(this->fwork[1]) * 30.0f;
for (i = 0, otherActor = gActors; i < ARRAY_COUNT(gActors); i++, otherActor++) { for (i = 0, otherActor = &gActors[0]; i < ARRAY_COUNT(gActors); i++, otherActor++) {
if ((otherActor->obj.status == OBJ_ACTIVE) && (otherActor->obj.id == OBJ_ACTOR_ZO_DODORA_WP_COUNT) && if ((otherActor->obj.status == OBJ_ACTIVE) && (otherActor->obj.id == OBJ_ACTOR_ZO_DODORA_WP_COUNT) &&
(otherActor->iwork[0] == this->iwork[0])) { (otherActor->iwork[0] == this->iwork[0])) {
temp1 = Math_RadToDeg( angle = Math_RadToDeg(
Math_Atan2F(otherActor->obj.pos.x - this->obj.pos.x, otherActor->obj.pos.z - this->obj.pos.z)); Math_Atan2F(otherActor->obj.pos.x - this->obj.pos.x, otherActor->obj.pos.z - this->obj.pos.z));
Math_SmoothStepToAngle(&this->rot_0F4.y, temp1, 0.2f, 3.0f, 0.0f);
Math_SmoothStepToAngle(&this->rot_0F4.y, angle, 0.2f, 3.0f, 0.0f);
if ((fabsf(this->obj.pos.x - otherActor->obj.pos.x) < 500.0f) && if ((fabsf(this->obj.pos.x - otherActor->obj.pos.x) < 500.0f) &&
(fabsf(this->obj.pos.z - otherActor->obj.pos.z) < 500.0f)) { (fabsf(this->obj.pos.z - otherActor->obj.pos.z) < 500.0f)) {
otherActor->obj.status = OBJ_FREE; otherActor->obj.status = OBJ_FREE;
@ -673,22 +675,22 @@ void Zoness_80190790(ZoDodora* this) {
Matrix_RotateY(gCalcMatrix, this->rot_0F4.y * M_DTOR, MTXF_NEW); Matrix_RotateY(gCalcMatrix, this->rot_0F4.y * M_DTOR, MTXF_NEW);
sp44.x = 0.f; src.x = 0.f;
sp44.y = 0.f; src.y = 0.f;
sp44.z = 20.0f; src.z = 20.0f;
Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp44, &sp38); Matrix_MultVec3fNoTranslate(gCalcMatrix, &src, &dest);
this->vel.x = sp38.x; this->vel.x = dest.x;
this->vel.z = sp38.z; this->vel.z = dest.z;
snakePosRot = &gZoDodoraPosRots[this->counter_04E]; zoDodoraPosRotPtr = &gZoDodoraPosRots[this->counter_04E];
snakePosRot->pos.x = this->obj.pos.x; zoDodoraPosRotPtr->pos.x = this->obj.pos.x;
snakePosRot->pos.y = this->obj.pos.y; zoDodoraPosRotPtr->pos.y = this->obj.pos.y;
snakePosRot->pos.z = this->obj.pos.z; zoDodoraPosRotPtr->pos.z = this->obj.pos.z;
snakePosRot->rot.x = this->rot_0F4.x; zoDodoraPosRotPtr->rot.x = this->rot_0F4.x;
snakePosRot->rot.y = this->rot_0F4.y; zoDodoraPosRotPtr->rot.y = this->rot_0F4.y;
snakePosRot->rot.z = this->rot_0F4.z; zoDodoraPosRotPtr->rot.z = this->rot_0F4.z;
} }
void Zoness_ZoDodora_Update(ZoDodora* this) { void Zoness_ZoDodora_Update(ZoDodora* this) {
@ -708,6 +710,7 @@ void Zoness_ZoDodora_Update(ZoDodora* this) {
Zoness_80190790(this); Zoness_80190790(this);
// Invulnerable
if (this->dmgType != DMG_NONE) { if (this->dmgType != DMG_NONE) {
this->dmgType = DMG_NONE; this->dmgType = DMG_NONE;
AUDIO_PLAY_SFX(NA_SE_EN_REFLECT, this->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_REFLECT, this->sfxSource, 4);
@ -717,12 +720,13 @@ void Zoness_ZoDodora_Update(ZoDodora* this) {
s16 D_i3_801BF56C[20] = { s16 D_i3_801BF56C[20] = {
0, 190, 180, 170, 160, 150, 140, 130, 120, 110, 100, 90, 80, 70, 60, 50, 40, 30, 20, 10, 0, 190, 180, 170, 160, 150, 140, 130, 120, 110, 100, 90, 80, 70, 60, 50, 40, 30, 20, 10,
}; };
u8 D_i3_801BF594[20] = { u8 sZoDodoraPartIdx[20] = {
0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2,
}; };
Gfx* D_i3_801BF5A8[3] = { D_ZO_60012A0, D_ZO_60239E0, D_ZO_6023730 }; Gfx* sZoDodoraParts[3] = { aZoDodoraHeadDL, aZoDodoraBodyDL, aZoDodoraTailDL };
void Zoness_80190B4C(f32 xPos, f32 yPos, f32 zPos, f32 xRot, f32 yRot, f32 zRot, u8 arg6, s32 arg7) { void Zoness_ZoDodora_DrawParts(f32 xPos, f32 yPos, f32 zPos, f32 xRot, f32 yRot, f32 zRot, u8 partIdx,
bool colorFlicker) {
Matrix_Push(&gGfxMatrix); Matrix_Push(&gGfxMatrix);
Matrix_Translate(gGfxMatrix, xPos, yPos, zPos + gPathProgress, MTXF_APPLY); Matrix_Translate(gGfxMatrix, xPos, yPos, zPos + gPathProgress, MTXF_APPLY);
Matrix_RotateY(gGfxMatrix, M_DTOR * yRot, MTXF_APPLY); Matrix_RotateY(gGfxMatrix, M_DTOR * yRot, MTXF_APPLY);
@ -732,11 +736,11 @@ void Zoness_80190B4C(f32 xPos, f32 yPos, f32 zPos, f32 xRot, f32 yRot, f32 zRot,
Matrix_SetGfxMtx(&gMasterDisp); Matrix_SetGfxMtx(&gMasterDisp);
RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
if (arg7 != 0) { if (colorFlicker) {
RCP_SetupDL_64(); RCP_SetupDL_64();
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 40, 40, 255, 255); gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 40, 40, 255, 255);
} }
gSPDisplayList(gMasterDisp++, D_i3_801BF5A8[arg6]); gSPDisplayList(gMasterDisp++, sZoDodoraParts[partIdx]);
Matrix_Pop(&gGfxMatrix); Matrix_Pop(&gGfxMatrix);
} }
@ -745,29 +749,32 @@ typedef struct {
Hitbox boxes[1]; Hitbox boxes[1];
} JntHitbox; } JntHitbox;
void Zoness_80190D0C(ZoDodora* this) { void Zoness_ZoDodora_Draw2(ZoDodora* this) {
Hitbox* hitbox = (((JntHitbox*) SEGMENTED_TO_VIRTUAL(aZoDodoraHitbox))->boxes); Hitbox* hitbox = (((JntHitbox*) SEGMENTED_TO_VIRTUAL(aZoDodoraHitbox))->boxes);
s32 i; s32 i;
s32 k; s32 k;
PosRot* temp_s0; PosRot* zoDodoraPosRots;
for (i = this->unk_04A = 0; i < 20; i++, hitbox++) { for (i = this->unk_04A = 0; i < 20; i++, hitbox++) {
k = (D_i3_801BF56C[i] + this->counter_04E) % 200; k = (D_i3_801BF56C[i] + this->counter_04E) % 200;
temp_s0 = &gZoDodoraPosRots[k]; zoDodoraPosRots = &gZoDodoraPosRots[k];
hitbox->z.offset = zoDodoraPosRots->pos.z - this->obj.pos.z;
hitbox->y.offset = zoDodoraPosRots->pos.y - this->obj.pos.y;
hitbox->x.offset = zoDodoraPosRots->pos.x - this->obj.pos.x;
Zoness_ZoDodora_DrawParts(zoDodoraPosRots->pos.x, zoDodoraPosRots->pos.y, zoDodoraPosRots->pos.z,
zoDodoraPosRots->rot.x, zoDodoraPosRots->rot.y, zoDodoraPosRots->rot.z,
sZoDodoraPartIdx[i], this->timer_0C6 % 2U);
hitbox->z.offset = temp_s0->pos.z - this->obj.pos.z;
hitbox->y.offset = temp_s0->pos.y - this->obj.pos.y;
hitbox->x.offset = temp_s0->pos.x - this->obj.pos.x;
Zoness_80190B4C(temp_s0->pos.x, temp_s0->pos.y, temp_s0->pos.z, temp_s0->rot.x, temp_s0->rot.y, temp_s0->rot.z,
D_i3_801BF594[i], this->timer_0C6 % 2U);
if (gPlayState != PLAY_PAUSE) { if (gPlayState != PLAY_PAUSE) {
Math_SmoothStepToF(&temp_s0->pos.y, this->fwork[2], 1.0f, 10.0f, 0.0f); Math_SmoothStepToF(&zoDodoraPosRots->pos.y, this->fwork[2], 1.0f, 10.0f, 0.0f);
} }
} }
} }
void Zoness_ZoDodora_Draw(ZoDodora* this) { void Zoness_ZoDodora_Draw(ZoDodora* this) {
Zoness_80190D0C(this); Zoness_ZoDodora_Draw2(this);
} }
void Zoness_ZoFish_PostLimbDraw(s32 limbIndex, Vec3f* rot, void* thisx) { void Zoness_ZoFish_PostLimbDraw(s32 limbIndex, Vec3f* rot, void* thisx) {
@ -2014,7 +2021,7 @@ void Zoness_ZoSarumarine_PostLimbDraw(s32 limbIndex, Vec3f* rot, void* thisx) {
void Zoness_ZoSarumarine_Draw(ZoSarumarine* this) { void Zoness_ZoSarumarine_Draw(ZoSarumarine* this) {
Matrix_Translate(gCalcMatrix, 0.0f, this->fwork[ZO_FWK_3], 0.0f, MTXF_APPLY); Matrix_Translate(gCalcMatrix, 0.0f, this->fwork[ZO_FWK_3], 0.0f, MTXF_APPLY);
Matrix_Scale(gCalcMatrix, 2.6f, 2.6f, 2.6f, MTXF_APPLY); Matrix_Scale(gCalcMatrix, 2.6f, 2.6f, 2.6f, MTXF_APPLY);
Animation_DrawSkeleton(3, D_ZO_6019E18, this->vwork, Zoness_ZoSarumarine_OverrideLimbDraw, Animation_DrawSkeleton(3, aZoSarumarineSkel, this->vwork, Zoness_ZoSarumarine_OverrideLimbDraw,
Zoness_ZoSarumarine_PostLimbDraw, this, gCalcMatrix); Zoness_ZoSarumarine_PostLimbDraw, this, gCalcMatrix);
} }

6
src/overlays/ovl_i4/fox_bo.c
View File

@ -2040,12 +2040,12 @@ void Bolse_BoBaseCore_PostLimbDraw(s32 index, Vec3f* vec, void* thisx) {
} }
void Bolse_BoBaseCore_Draw(BoBaseCore* this) { void Bolse_BoBaseCore_Draw(BoBaseCore* this) {
Animation_GetFrameData(&D_BO_6001C64, 0, this->vwork); Animation_GetFrameData(&aBoBaseCoreAnim, 0, this->vwork);
if (this->state >= 2) { if (this->state >= 2) {
Animation_DrawSkeleton(3, D_BO_6001FB0, this->vwork, Bolse_BoBaseCore_OverrideLimbDraw, Animation_DrawSkeleton(3, aBoBaseCoreSkel, this->vwork, Bolse_BoBaseCore_OverrideLimbDraw,
Bolse_BoBaseCore_PostLimbDraw, this, gCalcMatrix); Bolse_BoBaseCore_PostLimbDraw, this, gCalcMatrix);
} else { } else {
Animation_DrawSkeleton(3, D_BO_6001FB0, this->vwork, NULL, NULL, this, gCalcMatrix); Animation_DrawSkeleton(3, aBoBaseCoreSkel, this->vwork, NULL, NULL, this, gCalcMatrix);
} }
} }

2
src/overlays/ovl_i4/fox_sz.c
View File

@ -1749,7 +1749,7 @@ void SectorZ_SpaceJunkDraw(SzSpaceJunk* this) {
gSPDisplayList(gMasterDisp++, aSzSpaceJunk2DL); gSPDisplayList(gMasterDisp++, aSzSpaceJunk2DL);
gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK); gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
RCP_SetupDL(&gMasterDisp, SETUPDL_57); RCP_SetupDL(&gMasterDisp, SETUPDL_57);
gSPDisplayList(gMasterDisp++, aSZSpaceJunk4DL); gSPDisplayList(gMasterDisp++, aSzSpaceJunk4DL);
gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK); gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK);
} }

9
src/overlays/ovl_i5/fox_ma.c
View File

@ -1723,7 +1723,7 @@ void Macbeth_8019F164(MaTrainCar6* this) {
sp6C.z = gPlayer[0].trueZpos - 500.0f - this->obj.pos.z; sp6C.z = gPlayer[0].trueZpos - 500.0f - this->obj.pos.z;
for (i = 0; i < ARRAY_COUNT(gActors); i++) { for (i = 0; i < ARRAY_COUNT(gActors); i++) {
if ((gActors[i].obj.id == OBJ_ACTOR_219) && (gActors[i].obj.status == OBJ_ACTIVE)) { if ((gActors[i].obj.id == OBJ_ACTOR_MA_FALLING_BOULDER) && (gActors[i].obj.status == OBJ_ACTIVE)) {
if ((this->obj.pos.z < (gActors[i].obj.pos.z + 3000.0f)) && if ((this->obj.pos.z < (gActors[i].obj.pos.z + 3000.0f)) &&
((gActors[i].obj.pos.z - this->obj.pos.z) < 5000.0f)) { ((gActors[i].obj.pos.z - this->obj.pos.z) < 5000.0f)) {
sp6C.x = gActors[i].obj.pos.x - this->obj.pos.x + this->fwork[25]; sp6C.x = gActors[i].obj.pos.x - this->obj.pos.x + this->fwork[25];
@ -3319,7 +3319,7 @@ void Macbeth_MaBoulder_Draw(MaBoulder* this) {
Matrix_Scale(gGfxMatrix, this->scale, this->scale, this->scale, MTXF_APPLY); Matrix_Scale(gGfxMatrix, this->scale, this->scale, this->scale, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp); Matrix_SetGfxMtx(&gMasterDisp);
} }
gSPDisplayList(gMasterDisp++, D_MA_601A2B0); gSPDisplayList(gMasterDisp++, aMaBoulderDL);
} }
} }
@ -3785,7 +3785,7 @@ void Macbeth_MaProximityLight_Draw(MaProximityLight* this) {
void Macbeth_801A67BC(s32 arg0) { void Macbeth_801A67BC(s32 arg0) {
} }
void Macbeth_Actor219_Update(Actor219* this) { void Macbeth_MaFallingBoulder_Update(MaFallingBoulder* this) {
if ((gPlayer[0].trueZpos - this->obj.pos.z) < -300.0f) { if ((gPlayer[0].trueZpos - this->obj.pos.z) < -300.0f) {
Object_Kill(&this->obj, this->sfxSource); Object_Kill(&this->obj, this->sfxSource);
} }
@ -3804,7 +3804,8 @@ void Macbeth_Actor219_Update(Actor219* this) {
} }
} }
void Macbeth_Actor219_Draw(Actor219* this) { void Macbeth_MaFallingBoulder_Draw(MaFallingBoulder* this) {
/* Unimplemented */
} }
void Macbeth_801A68F8(Actor207* this, s16 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7) { void Macbeth_801A68F8(Actor207* this, s16 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7) {

18
src/overlays/ovl_i5/fox_ti.c
View File

@ -428,15 +428,15 @@ void Titania_TiFekuda_Update(TiFekuda* this) {
} }
void Titania_TiFekuda_Draw(TiFekuda* this) { void Titania_TiFekuda_Draw(TiFekuda* this) {
gSPDisplayList(gMasterDisp++, D_TI1_700C4B0); gSPDisplayList(gMasterDisp++, aTi1FekudaDL);
Matrix_Translate(gGfxMatrix, 0.0f, -50.0f, 178.0f, MTXF_APPLY); Matrix_Translate(gGfxMatrix, 0.0f, -50.0f, 178.0f, MTXF_APPLY);
Matrix_RotateY(gGfxMatrix, this->fwork[4] * M_DTOR, MTXF_APPLY); Matrix_RotateY(gGfxMatrix, this->fwork[4] * M_DTOR, MTXF_APPLY);
Matrix_RotateX(gGfxMatrix, this->fwork[3] * M_DTOR, MTXF_APPLY); Matrix_RotateX(gGfxMatrix, this->fwork[3] * M_DTOR, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp); Matrix_SetGfxMtx(&gMasterDisp);
if (this->health != 0) { if (this->health != 0) {
gSPDisplayList(gMasterDisp++, D_TI1_700B9C0); gSPDisplayList(gMasterDisp++, aTi1FekudaGun1DL);
RCP_SetupDL(&gMasterDisp, SETUPDL_33); RCP_SetupDL(&gMasterDisp, SETUPDL_33);
gSPDisplayList(gMasterDisp++, D_TI1_700C980); gSPDisplayList(gMasterDisp++, aTi1FekudaGun2DL);
} }
} }
@ -598,7 +598,7 @@ void Titania_TiBoulder_Draw(TiBoulder* this) {
Matrix_Scale(gGfxMatrix, this->scale, this->scale, this->scale, MTXF_APPLY); Matrix_Scale(gGfxMatrix, this->scale, this->scale, this->scale, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp); Matrix_SetGfxMtx(&gMasterDisp);
} }
gSPDisplayList(gMasterDisp++, D_TI1_700E3F0); gSPDisplayList(gMasterDisp++, aTiBoulderDL);
} }
void Titania_TiLandmine_Update(TiLandmine* this) { void Titania_TiLandmine_Update(TiLandmine* this) {
@ -853,7 +853,7 @@ void Titania_TiRasco_Update(Actor* this) {
sp38->obj.pos.z = this->obj.pos.z + dest.z; sp38->obj.pos.z = this->obj.pos.z + dest.z;
} }
if (++this->animFrame >= Animation_GetFrameCount(&D_TI1_700D534)) { if (++this->animFrame >= Animation_GetFrameCount(&aTiRascoAnim)) {
this->state++; this->state++;
} }
break; break;
@ -864,7 +864,7 @@ void Titania_TiRasco_Update(Actor* this) {
if (this->health == 0) { if (this->health == 0) {
this->obj.status = OBJ_DYING; this->obj.status = OBJ_DYING;
Animation_GetFrameData(&D_TI1_700D534, this->animFrame, this->vwork); Animation_GetFrameData(&aTiRascoAnim, this->animFrame, this->vwork);
Animation_DrawSkeleton(0, aTiRascoSkel, this->vwork, Titania_8018AFD4, Titania_8018B1B4, this, Animation_DrawSkeleton(0, aTiRascoSkel, this->vwork, Titania_8018AFD4, Titania_8018B1B4, this,
&gIdentityMatrix); &gIdentityMatrix);
func_effect_8007D2C8(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, 10.0f); func_effect_8007D2C8(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, 10.0f);
@ -874,7 +874,7 @@ void Titania_TiRasco_Update(Actor* this) {
} }
void Titania_TiRasco_Draw(TiRasco* this) { void Titania_TiRasco_Draw(TiRasco* this) {
Animation_GetFrameData(&D_TI1_700D534, this->animFrame, this->vwork); Animation_GetFrameData(&aTiRascoAnim, this->animFrame, this->vwork);
Animation_DrawSkeleton(0, aTiRascoSkel, this->vwork, Titania_TiRasco_OverrideLimbDraw, Titania_TiRasco_PostLimbDraw, Animation_DrawSkeleton(0, aTiRascoSkel, this->vwork, Titania_TiRasco_OverrideLimbDraw, Titania_TiRasco_PostLimbDraw,
this, &gIdentityMatrix); this, &gIdentityMatrix);
} }
@ -1057,12 +1057,12 @@ void Titania_TiBomb_Draw(TiBomb* this) {
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 255); gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 255);
Matrix_Scale(gGfxMatrix, 1.5f, 1.5f, 1.5f, MTXF_APPLY); Matrix_Scale(gGfxMatrix, 1.5f, 1.5f, 1.5f, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp); Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_TI1_7009D60); gSPDisplayList(gMasterDisp++, aTi1Bomb1DL);
RCP_SetupDL(&gMasterDisp, SETUPDL_34); RCP_SetupDL(&gMasterDisp, SETUPDL_34);
index = this->iwork[0]; index = this->iwork[0];
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, D_i5_801B75E4[0][index], D_i5_801B75E4[1][index], gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, D_i5_801B75E4[0][index], D_i5_801B75E4[1][index],
D_i5_801B75E4[2][index], 255); D_i5_801B75E4[2][index], 255);
gSPDisplayList(gMasterDisp++, aTi1BombDL); gSPDisplayList(gMasterDisp++, aTi1Bomb2DL);
} }
void Titania_TiDesertCrawler_Init(TiDesertCrawler* this) { void Titania_TiDesertCrawler_Init(TiDesertCrawler* this) {

17
src/overlays/ovl_i6/fox_andross.c
View File

@ -192,7 +192,7 @@ void Andross_80187C5C(void) {
scenery360->obj.pos.z += gLevelObjects[i].zPos2; scenery360->obj.pos.z += gLevelObjects[i].zPos2;
scenery360->obj.pos.y = gLevelObjects[i].yPos; scenery360->obj.pos.y = gLevelObjects[i].yPos;
scenery360->obj.rot.y = gLevelObjects[i].rot.y; scenery360->obj.rot.y = gLevelObjects[i].rot.y;
if (scenery360->obj.id == OBJ_SCENERY_147) { if (scenery360->obj.id == OBJ_SCENERY_LEVEL_OBJECTS) {
scenery360->pathIndex = gLevelObjects[i].rot.z; scenery360->pathIndex = gLevelObjects[i].rot.z;
} }
Object_SetInfo(&scenery360->info, scenery360->obj.id); Object_SetInfo(&scenery360->info, scenery360->obj.id);
@ -240,7 +240,7 @@ void Andross_80187C5C(void) {
} }
} }
void Andross_Actor199_Update(Actor199* this) { void Andross_ActorTeamArwing_Update(ActorTeamArwing* this) {
s32 i; s32 i;
f32 xDisplacement; f32 xDisplacement;
f32 yDisplacement; f32 yDisplacement;
@ -253,7 +253,7 @@ void Andross_Actor199_Update(Actor199* this) {
f32 temp_fv1; f32 temp_fv1;
for (scenery360 = gScenery360, i = 0; i < 200; i++, scenery360++) { for (scenery360 = gScenery360, i = 0; i < 200; i++, scenery360++) {
if ((scenery360->obj.id == OBJ_SCENERY_147) && (scenery360->pathIndex == (u8) this->counter_04E)) { if ((scenery360->obj.id == OBJ_SCENERY_LEVEL_OBJECTS) && (scenery360->pathIndex == (u8) this->counter_04E)) {
this->fwork[3] = scenery360->obj.pos.x; this->fwork[3] = scenery360->obj.pos.x;
this->fwork[4] = scenery360->obj.pos.y; this->fwork[4] = scenery360->obj.pos.y;
this->fwork[5] = scenery360->obj.pos.z; this->fwork[5] = scenery360->obj.pos.z;
@ -289,6 +289,7 @@ void Andross_Actor199_Update(Actor199* this) {
Math_SmoothStepToAngle(&this->rot_0F4.x, Math_SmoothStepToAngle(&this->rot_0F4.x,
Math_RadToDeg(Math_Atan2F(yDisplacement, sqrtf(SQ(xDisplacement) + SQ(zDisplacement)))), Math_RadToDeg(Math_Atan2F(yDisplacement, sqrtf(SQ(xDisplacement) + SQ(zDisplacement)))),
0.1f, this->fwork[2], 0.0f); 0.1f, this->fwork[2], 0.0f);
temp_fv1 = Math_SmoothStepToAngle(&this->rot_0F4.y, yaw, 0.1f, this->fwork[2], 0.0001f) * 40.0f; temp_fv1 = Math_SmoothStepToAngle(&this->rot_0F4.y, yaw, 0.1f, this->fwork[2], 0.0001f) * 40.0f;
if (temp_fv1 < 0.0f) { if (temp_fv1 < 0.0f) {
var_fv0 = temp_fv1 * -1.0f; var_fv0 = temp_fv1 * -1.0f;
@ -314,8 +315,8 @@ void Andross_Actor199_Update(Actor199* this) {
this->vel.z = vel.z; this->vel.z = vel.z;
} }
void Andross_Actor199_Draw(Actor199* this) { void Andross_ActorTeamArwing_Draw(ActorTeamArwing* this) {
func_edisplay_8005B388(this); ActorTeamArwing_Draw(this);
} }
void Andross_80188468(void) { void Andross_80188468(void) {
@ -328,7 +329,7 @@ void Andross_80188468(void) {
actor->obj.pos.z = -11959.0f; actor->obj.pos.z = -11959.0f;
actor->iwork[11] = 1; actor->iwork[11] = 1;
actor->iwork[14] = 1; actor->iwork[14] = 1;
actor->obj.id = OBJ_ACTOR_199; actor->obj.id = OBJ_ACTOR_TEAM_ARWING;
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
AUDIO_PLAY_SFX(NA_SE_ARWING_ENGINE_FG, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_ARWING_ENGINE_FG, actor->sfxSource, 4);
} }
@ -360,7 +361,7 @@ void Andross_AndBrainWaste_Draw(AndBrainWaste* this) {
Matrix_Scale(gGfxMatrix, 1.1f, 0.9f, 1.0f, MTXF_APPLY); Matrix_Scale(gGfxMatrix, 1.1f, 0.9f, 1.0f, MTXF_APPLY);
Matrix_Scale(gGfxMatrix, 3.0f, 3.0f, 1.0f, MTXF_APPLY); Matrix_Scale(gGfxMatrix, 3.0f, 3.0f, 1.0f, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp); Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_VE2_6009300); gSPDisplayList(gMasterDisp++, aAndBrainWasteDL);
} }
void Andross_AndBrainWaste_Setup(AndBrainWaste* this, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel) { void Andross_AndBrainWaste_Setup(AndBrainWaste* this, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel) {
@ -3625,7 +3626,7 @@ void Andross_AndLaserEmitter_Update(AndLaserEmitter* this) {
} }
void Andross_AndLaserEmitter_Draw(AndLaserEmitter* this) { void Andross_AndLaserEmitter_Draw(AndLaserEmitter* this) {
gSPDisplayList(gMasterDisp++, D_VE2_6007E20); gSPDisplayList(gMasterDisp++, aAndLaserEmitterDL);
if (this->timer_0BC != 0) { if (this->timer_0BC != 0) {
f32 scale = 2.5f; f32 scale = 2.5f;

4
src/overlays/ovl_i6/fox_ve2.c
View File

@ -22,8 +22,8 @@ bool Venom2_Ve2Base_OverrideLimbDraw(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec
} }
void Venom2_Ve2Base_Draw(Ve2Base* this) { void Venom2_Ve2Base_Draw(Ve2Base* this) {
Animation_GetFrameData(&D_VE2_6014904, 0, this->vwork); Animation_GetFrameData(&aVe2BaseAnim, 0, this->vwork);
Animation_DrawSkeleton(3, D_VE2_60149D0, this->vwork, Venom2_Ve2Base_OverrideLimbDraw, NULL, this, gCalcMatrix); Animation_DrawSkeleton(3, aVe2BaseSkel, this->vwork, Venom2_Ve2Base_OverrideLimbDraw, NULL, this, gCalcMatrix);
} }
void Venom2_UpdateStarWolfEvents(ActorAllRange* this) { void Venom2_UpdateStarWolfEvents(ActorAllRange* this) {