diff options
| author | Alejandro Asenjo Nitti <96613413+sonicdcer@users.noreply.github.com> | 2024-08-24 19:36:53 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-24 19:36:53 -0300 |
| commit | e82019fa2bd527bca3a9dad48175a6b8f2a1fee7 (patch) | |
| tree | da9bba80666743402ec29c7219c53f526a98a01a | |
| parent | 669fff8759859306d6ca8ae71f40073a934a188f (diff) | |
Actor Docs (#270)
* Docs
* actor timer_04C -> work_04C
* Actor & Boss unk_04A -> work_04A
* actor & boss unk_048 -> work_048
* actor & boss unk_046 -> work_046
* boss unk_044 -> work_044
* actor event docs
* ActorEvent docs
* name all Event Actor IDs
* EVID names in EventActorInfo comments
* refactor EVC_PASSED_ALL_RINGS by @inspectredc
* clarification comment
* some option docs
* audio enums and macros
* some audio renamings
95 files changed, 2128 insertions, 1962 deletions
diff --git a/assets/yaml/jp/rev0/ast_7_ti_1.yaml b/assets/yaml/jp/rev0/ast_7_ti_1.yaml index 75a2ee61..b80991f5 100644 --- a/assets/yaml/jp/rev0/ast_7_ti_1.yaml +++ b/assets/yaml/jp/rev0/ast_7_ti_1.yaml @@ -209,11 +209,11 @@ aTi1DesertRoverSkel: aTi1FekudaGun2DL: { type: GFX, offset: 0x700C980, symbol: aTi1FekudaGun2DL } -D_TI1_700CAF4: - { type: SF64:ANIM, offset: 0x700CAF4, symbol: D_TI1_700CAF4} +aTiBomberAnim: + { type: SF64:ANIM, offset: 0x700CAF4, symbol: aTiBomberAnim} -D_TI1_700CB60: - {type: SF64:SKELETON, offset: 0x700CB60, symbol: D_TI1_700CB60} +aTiBomberSkel: + {type: SF64:SKELETON, offset: 0x700CB60, symbol: aTiBomberSkel} aTiRascoAnim: { type: SF64:ANIM, offset: 0x700D534, symbol: aTiRascoAnim } diff --git a/assets/yaml/jp/rev0/ast_allies.yaml b/assets/yaml/jp/rev0/ast_allies.yaml index 57a24582..9ccff794 100644 --- a/assets/yaml/jp/rev0/ast_allies.yaml +++ b/assets/yaml/jp/rev0/ast_allies.yaml @@ -59,8 +59,8 @@ D_D0098B0: D_D009938: { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 16, offset: 0x0D009938, symbol: D_D009938 } -D_D009A40: - { type: GFX, offset: 0xD009A40, symbol: D_D009A40 } +aKattShipDL: + { type: GFX, offset: 0xD009A40, symbol: aKattShipDL } D_D00A3B8: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0D00A3B8, symbol: D_D00A3B8 } @@ -97,8 +97,8 @@ aJamesMarkTex: aJamesMarkTLUT: { type: TEXTURE, ctype: u16, format: TLUT, colors: 8, offset: 0xD00B870, symbol: aJamesMarkTLUT } -D_D00B880: - { type: GFX, offset: 0xD00B880, symbol: D_D00B880 } +aBillShipDL: + { type: GFX, offset: 0xD00B880, symbol: aBillShipDL } ast_allies_seg13_vtx_BB70: { type: VTX, count: 144, offset: 0xD00BB70, symbol: ast_allies_seg13_vtx_BB70 } diff --git a/assets/yaml/jp/rev0/ast_aquas.yaml b/assets/yaml/jp/rev0/ast_aquas.yaml index 7140515e..ac9b2f32 100644 --- a/assets/yaml/jp/rev0/ast_aquas.yaml +++ b/assets/yaml/jp/rev0/ast_aquas.yaml @@ -22,8 +22,8 @@ aAqSquidAnim: aAqSquidSkel: { type: SF64:SKELETON, offset: 0x6000DB0, symbol: aAqSquidSkel } -D_AQ_6000E10: - { type: GFX, offset: 0x6000E10, symbol: D_AQ_6000E10 } +aAqShellDL: + { type: GFX, offset: 0x6000E10, symbol: aAqShellDL } D_AQ_6001130: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6001130, symbol: D_AQ_6001130 } @@ -98,8 +98,8 @@ D_AQ_6003FF0: D_AQ_6008168: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6008168, symbol: D_AQ_6008168 } -D_AQ_6008970: - { type: GFX, offset: 0x6008970, symbol: D_AQ_6008970 } +aAqStarfishDL: + { type: GFX, offset: 0x6008970, symbol: aAqStarfishDL } D_AQ_6008EC8: { type: TEXTURE, ctype: u8, format: CI8, width: 16, height: 16, offset: 0x6008EC8, symbol: D_AQ_6008EC8, tlut: 0x6008FC8 } @@ -659,14 +659,14 @@ D_AQ_60308B8: aBoss301Hitbox: { type: SF64:HITBOX, offset: 0x6030B10, symbol: aBoss301Hitbox } -D_AQ_6030B14_f32: - { type: SF64:HITBOX, offset: 0x6030B14, symbol: D_AQ_6030B14_f32 } +aAqShellHitbox: + { type: SF64:HITBOX, offset: 0x6030B14, symbol: aAqShellHitbox } -D_AQ_6030B30: - { type: SF64:HITBOX, offset: 0x6030B30, symbol: D_AQ_6030B30 } +aAqStarfishHitbox: + { type: SF64:HITBOX, offset: 0x6030B30, symbol: aAqStarfishHitbox } -D_AQ_6030B4C: - { type: SF64:HITBOX, offset: 0x6030B4C, symbol: D_AQ_6030B4C } +aAqOysterEvHitbox: + { type: SF64:HITBOX, offset: 0x6030B4C, symbol: aAqOysterEvHitbox } D_AQ_6030B68: { type: SF64:HITBOX, offset: 0x6030B68, symbol: D_AQ_6030B68 } diff --git a/assets/yaml/jp/rev0/ast_area_6.yaml b/assets/yaml/jp/rev0/ast_area_6.yaml index fe99d8e0..9b35795e 100644 --- a/assets/yaml/jp/rev0/ast_area_6.yaml +++ b/assets/yaml/jp/rev0/ast_area_6.yaml @@ -57,8 +57,8 @@ D_A6_6009718: D_A6_6009B18: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06009B18, symbol: D_A6_6009B18 } -D_A6_600E0C0: - { type: GFX, offset: 0x600E0C0, symbol: D_A6_600E0C0 } +aA6UmbraStationDL: + { type: GFX, offset: 0x600E0C0, symbol: aA6UmbraStationDL } D_A6_600EBE8: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 16, offset: 0x0600EBE8, symbol: D_A6_600EBE8 } @@ -96,8 +96,8 @@ D_A6_6012550: D_A6_6012840: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06012840, symbol: D_A6_6012840 } -D_A6_6012A40: - { type: GFX, offset: 0x6012A40, symbol: D_A6_6012A40 } +aA6HarlockFrigateDL: + { type: GFX, offset: 0x6012A40, symbol: aA6HarlockFrigateDL } D_A6_6013CD8: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06013CD8, symbol: D_A6_6013CD8 } @@ -117,8 +117,8 @@ D_A6_6015CD8: D_A6_6015EE0: { type: GFX, offset: 0x6015EE0, symbol: D_A6_6015EE0 } -D_A6_6016190: - { type: GFX, offset: 0x6016190, symbol: D_A6_6016190 } +aA6ZeramClassCruiserDL: + { type: GFX, offset: 0x6016190, symbol: aA6ZeramClassCruiserDL } D_A6_6017120: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06017120, symbol: D_A6_6017120 } @@ -150,8 +150,8 @@ D_A6_6018994: D_A6_6018BA0: { type: SF64:SKELETON, offset: 0x6018BA0, symbol: D_A6_6018BA0 } -D_A6_6018BF0: - { type: GFX, offset: 0x6018BF0, symbol: D_A6_6018BF0 } +aA6NinjinMissileDL: + { type: GFX, offset: 0x6018BF0, symbol: aA6NinjinMissileDL } D_A6_6019130: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06019130, symbol: D_A6_6019130 } @@ -162,8 +162,8 @@ D_A6_6019330: D_A6_6019530: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06019530, symbol: D_A6_6019530 } -D_A6_6019730: - { type: GFX, offset: 0x6019730, symbol: D_A6_6019730 } +aA6RocketDL: + { type: GFX, offset: 0x6019730, symbol: aA6RocketDL } D_A6_6019B20: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06019B20, symbol: D_A6_6019B20 } @@ -174,8 +174,8 @@ D_A6_6019D20: D_A6_6019F20: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06019F20, symbol: D_A6_6019F20 } -D_A6_601A120: - { type: GFX, offset: 0x601A120, symbol: D_A6_601A120 } +aA6SpaceMineDL: + { type: GFX, offset: 0x601A120, symbol: aA6SpaceMineDL } D_A6_601A220: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0601A220, symbol: D_A6_601A220 } @@ -228,14 +228,14 @@ D_A6_6023F64: D_A6_6027F50: { type: SF64:SCRIPT, offset: 0x6027F50, symbol: D_A6_6027F50} -D_A6_60280E0: - { type: SF64:HITBOX, offset: 0x60280E0, symbol: D_A6_60280E0 } +aA6UmbraStationHitbox: + { type: SF64:HITBOX, offset: 0x60280E0, symbol: aA6UmbraStationHitbox } -D_A6_6028254: - { type: SF64:HITBOX, offset: 0x6028254, symbol: D_A6_6028254 } +aA6HarlockFrigateHitbox: + { type: SF64:HITBOX, offset: 0x6028254, symbol: aA6HarlockFrigateHitbox } -D_A6_60282A0: - { type: SF64:HITBOX, offset: 0x60282A0, symbol: D_A6_60282A0 } +aA6ZeramClassCruiserHitbox: + { type: SF64:HITBOX, offset: 0x60282A0, symbol: aA6ZeramClassCruiserHitbox } aA6GorgonHitbox: { type: SF64:HITBOX, offset: 0x6028454, symbol: aA6GorgonHitbox } diff --git a/assets/yaml/jp/rev0/ast_common.yaml b/assets/yaml/jp/rev0/ast_common.yaml index c35f3bba..7d8d20ff 100644 --- a/assets/yaml/jp/rev0/ast_common.yaml +++ b/assets/yaml/jp/rev0/ast_common.yaml @@ -980,8 +980,8 @@ D_1031EC0: D_1032578: { type: TEXTURE, format: RGBA16, width: 16, height: 16, ctype: u16, offset: 0x1032578, symbol: D_1032578 } -D_1032780: - { type: GFX, offset: 0x1032780, symbol: D_1032780 } +aArwingShadowDL: + { type: GFX, offset: 0x1032780, symbol: aArwingShadowDL } D_1032808: { type: TEXTURE, format: IA8, width: 32, height: 32, ctype: u8, offset: 0x1032808, symbol: D_1032808 } diff --git a/assets/yaml/jp/rev0/ast_corneria.yaml b/assets/yaml/jp/rev0/ast_corneria.yaml index a037337a..b53b86c7 100644 --- a/assets/yaml/jp/rev0/ast_corneria.yaml +++ b/assets/yaml/jp/rev0/ast_corneria.yaml @@ -111,8 +111,8 @@ aCoHighway5DL: D_CO_6011790: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06011790, symbol: D_CO_6011790 } -D_CO_6011F90: - { type: GFX, offset: 0x6011F90, symbol: D_CO_6011F90 } +aCoCornerianFighterDL: + { type: GFX, offset: 0x6011F90, symbol: aCoCornerianFighterDL } D_CO_6012640: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06012640, symbol: D_CO_6012640 } diff --git a/assets/yaml/jp/rev0/ast_enmy_planet.yaml b/assets/yaml/jp/rev0/ast_enmy_planet.yaml index 87e949c1..9b595a75 100644 --- a/assets/yaml/jp/rev0/ast_enmy_planet.yaml +++ b/assets/yaml/jp/rev0/ast_enmy_planet.yaml @@ -15,14 +15,14 @@ D_ENMY_PLANET_4000290: ast_enmy_planet_seg4_vtx_8F8: { type: VTX, count: 90, offset: 0x40008F8, symbol: ast_enmy_planet_seg4_vtx_8F8 } -D_ENMY_PLANET_40001A4: - { type: SF64:ANIM, offset: 0x40001A4, symbol: D_ENMY_PLANET_40001A4 } +aTripodAnim: + { type: SF64:ANIM, offset: 0x40001A4, symbol: aTripodAnim } -D_ENMY_PLANET_4000270: - { type: SF64:SKELETON, offset: 0x4000270, symbol: D_ENMY_PLANET_4000270 } +aTripodSkel: + { type: SF64:SKELETON, offset: 0x4000270, symbol: aTripodSkel } -D_ENMY_PLANET_4000710: - { type: GFX, offset: 0x4000710, symbol: D_ENMY_PLANET_4000710 } +aVenomTankDL: + { type: GFX, offset: 0x4000710, symbol: aVenomTankDL } D_ENMY_PLANET_4001298: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x04001298, symbol: D_ENMY_PLANET_4001298 } @@ -60,11 +60,11 @@ D_ENMY_PLANET_4004538: D_ENMY_PLANET_4004D38: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x04004D38, symbol: D_ENMY_PLANET_4004D38 } -D_ENMY_PLANET_40057AC: - { type: SF64:ANIM, offset: 0x40057AC, symbol: D_ENMY_PLANET_40057AC } +aFirebirdAnim: + { type: SF64:ANIM, offset: 0x40057AC, symbol: aFirebirdAnim } -D_ENMY_PLANET_40058B8: - { type: SF64:SKELETON, offset: 0x40058B8, symbol: D_ENMY_PLANET_40058B8 } +aFirebirdSkel: + { type: SF64:SKELETON, offset: 0x40058B8, symbol: aFirebirdSkel } D_ENMY_PLANET_4005E78: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x04005E78, symbol: D_ENMY_PLANET_4005E78 } @@ -81,17 +81,17 @@ D_ENMY_PLANET_40064E8: D_ENMY_PLANET_40066E8: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x040066E8, symbol: D_ENMY_PLANET_40066E8 } -D_ENMY_PLANET_40068F0: - { type: GFX, offset: 0x40068F0, symbol: D_ENMY_PLANET_40068F0 } +aVenomFighter1DL: + { type: GFX, offset: 0x40068F0, symbol: aVenomFighter1DL } -D_ENMY_PLANET_4006E90: - { type: GFX, offset: 0x4006E90, symbol: D_ENMY_PLANET_4006E90 } +aVenomFighter2DL: + { type: GFX, offset: 0x4006E90, symbol: aVenomFighter2DL } -D_ENMY_PLANET_40073C0: - { type: GFX, offset: 0x40073C0, symbol: D_ENMY_PLANET_40073C0 } +aGrangaFighter1DL: + { type: GFX, offset: 0x40073C0, symbol: aGrangaFighter1DL } -D_ENMY_PLANET_4007AF0: - { type: GFX, offset: 0x4007AF0, symbol: D_ENMY_PLANET_4007AF0 } +aGrangaFighter2DL: + { type: GFX, offset: 0x4007AF0, symbol: aGrangaFighter2DL } D_ENMY_PLANET_4008100: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x04008100, symbol: D_ENMY_PLANET_4008100 } @@ -108,5 +108,5 @@ D_ENMY_PLANET_4008FF8: D_ENMY_PLANET_4008F70: { type: GFX, offset: 0x4008F70, symbol: D_ENMY_PLANET_4008F70 } -D_ENMY_PLANET_4009800: - { type: GFX, offset: 0x4009800, symbol: D_ENMY_PLANET_4009800 } +aSpyEyeDL: + { type: GFX, offset: 0x4009800, symbol: aSpyEyeDL } diff --git a/assets/yaml/jp/rev0/ast_enmy_space.yaml b/assets/yaml/jp/rev0/ast_enmy_space.yaml index af0fd04e..0ba24a61 100644 --- a/assets/yaml/jp/rev0/ast_enmy_space.yaml +++ b/assets/yaml/jp/rev0/ast_enmy_space.yaml @@ -8,26 +8,26 @@ - '#include "gfx.h"' - '#include "sf64object.h"' -D_ENMY_SPACE_4000080: - { type: SF64:ANIM, offset: 0x4000080, symbol: D_ENMY_SPACE_4000080 } +aKillerBeeAnim: + { type: SF64:ANIM, offset: 0x4000080, symbol: aKillerBeeAnim } -D_ENMY_SPACE_400014C: - { type: SF64:SKELETON, offset: 0x400014C, symbol: D_ENMY_SPACE_400014C } +aKillerBeeSkel: + { type: SF64:SKELETON, offset: 0x400014C, symbol: aKillerBeeSkel } aEnmySpMeMora1DL: { type: GFX, offset: 0x4000170, symbol: aEnmySpMeMora1DL } -D_ENMY_SPACE_4000650: - { type: GFX, offset: 0x4000650, symbol: D_ENMY_SPACE_4000650 } +aSpiderDL: + { type: GFX, offset: 0x4000650, symbol: aSpiderDL } -D_ENMY_SPACE_4000EC0: - { type: GFX, offset: 0x4000EC0, symbol: D_ENMY_SPACE_4000EC0 } +aGammaOnDL: + { type: GFX, offset: 0x4000EC0, symbol: aGammaOnDL } D_ENMY_SPACE_4001108: { type: TEXTURE, format: RGBA16, offset: 0x4001108, width: 16, height: 16, ctype: u16, symbol: D_ENMY_SPACE_4001108 } -D_ENMY_SPACE_4001310: - { type: GFX, offset: 0x4001310, symbol: D_ENMY_SPACE_4001310 } +aAttacker2DL: + { type: GFX, offset: 0x4001310, symbol: aAttacker2DL } D_ENMY_SPACE_4001A30: { type: TEXTURE, format: RGBA16, offset: 0x4001A30, width: 16, height: 16, ctype: u16, symbol: D_ENMY_SPACE_4001A30 } @@ -95,11 +95,11 @@ aEnmySpMeMora2DL: D_ENMY_SPACE_4008550: { type: TEXTURE, format: RGBA16, offset: 0x04008550, width: 32, height: 32, ctype: u16, symbol: D_ENMY_SPACE_4008550 } -D_ENMY_SPACE_4008D50: - { type: GFX, offset: 0x4008D50, symbol: D_ENMY_SPACE_4008D50 } +aGammaOffDL: + { type: GFX, offset: 0x4008D50, symbol: aGammaOffDL } -D_ENMY_SPACE_4008FA0: - { type: GFX, offset: 0x4008FA0, symbol: D_ENMY_SPACE_4008FA0 } +aVenomFighter3DL: + { type: GFX, offset: 0x4008FA0, symbol: aVenomFighter3DL } D_ENMY_SPACE_40096B8: { type: TEXTURE, format: RGBA16, offset: 0x040096B8, width: 16, height: 16, ctype: u16, symbol: D_ENMY_SPACE_40096B8 } @@ -110,25 +110,25 @@ D_ENMY_SPACE_40098B8: D_ENMY_SPACE_4009AB8: { type: TEXTURE, format: RGBA16, offset: 0x04009AB8, width: 32, height: 32, ctype: u16, symbol: D_ENMY_SPACE_4009AB8 } -D_ENMY_SPACE_400A30C: - { type: SF64:ANIM, offset: 0x400A30C, symbol: D_ENMY_SPACE_400A30C } +aCruiserGunAnim: + { type: SF64:ANIM, offset: 0x400A30C, symbol: aCruiserGunAnim } -D_ENMY_SPACE_400A398: - { type: SF64:SKELETON, offset: 0x400A398, symbol: D_ENMY_SPACE_400A398 } +aCruiserGunSkel: + { type: SF64:SKELETON, offset: 0x400A398, symbol: aCruiserGunSkel } aEnmySpMeMora3DL: { type: GFX, offset: 0x400A630, symbol: aEnmySpMeMora3DL } -D_ENMY_SPACE_400AAE0: - { type: GFX, offset: 0x400AAE0, symbol: D_ENMY_SPACE_400AAE0 } +aCommanderDL: + { type: GFX, offset: 0x400AAE0, symbol: aCommanderDL } -D_ENMY_SPACE_400B390: - { type: GFX, offset: 0x400B390, symbol: D_ENMY_SPACE_400B390 } +aAttacker3DL: + { type: GFX, offset: 0x400B390, symbol: aAttacker3DL } -D_ENMY_SPACE_400BD20: - { type: GFX, offset: 0x400BD20, symbol: D_ENMY_SPACE_400BD20 } +aAttacker1DL: + { type: GFX, offset: 0x400BD20, symbol: aAttacker1DL } # size = 0xC510
\ No newline at end of file diff --git a/assets/yaml/jp/rev0/ast_fortuna.yaml b/assets/yaml/jp/rev0/ast_fortuna.yaml index 5e9c029f..23b03d8a 100644 --- a/assets/yaml/jp/rev0/ast_fortuna.yaml +++ b/assets/yaml/jp/rev0/ast_fortuna.yaml @@ -110,8 +110,8 @@ D_FO_6008150: D_FO_6009070: { type: TEXTURE, format: RGBA16, width: 44, height: 44, offset: 0x6009070, ctype: u16, symbol: D_FO_6009070 } -D_FO_6009F90: - { type: GFX, offset: 0x6009F90, symbol: D_FO_6009F90 } +aFoEnemyShadowDL: + { type: GFX, offset: 0x6009F90, symbol: aFoEnemyShadowDL } D_FO_600A018: { type: TEXTURE, format: IA8, width: 32, height: 32, offset: 0x600A018, ctype: u8, symbol: D_FO_600A018 } diff --git a/assets/yaml/jp/rev0/ast_katina.yaml b/assets/yaml/jp/rev0/ast_katina.yaml index 6ec0a0a3..293c4a92 100644 --- a/assets/yaml/jp/rev0/ast_katina.yaml +++ b/assets/yaml/jp/rev0/ast_katina.yaml @@ -109,14 +109,14 @@ aDestroyedHatch4DL: aDestroyedHatch3DL: { type: GFX, offset: 0x600D4E0, symbol: aDestroyedHatch3DL } -D_KA_600D730: - { type: GFX, offset: 0x600D730, symbol: D_KA_600D730 } +aKaCornerianFighterShadowDL: + { type: GFX, offset: 0x600D730, symbol: aKaCornerianFighterShadowDL } D_KA_600D7B8: { type: TEXTURE, format: IA8, width: 32, height: 32, offset: 0x600D7B8, ctype: u8, symbol: D_KA_600D7B8 } -D_KA_600DBC0: - { type: GFX, offset: 0x600DBC0, symbol: D_KA_600DBC0 } +aKaEnemyShadowDL: + { type: GFX, offset: 0x600DBC0, symbol: aKaEnemyShadowDL } D_KA_600DC48: { type: TEXTURE, format: IA8, width: 32, height: 32, offset: 0x600DC48, ctype: u8, symbol: D_KA_600DC48 } diff --git a/assets/yaml/jp/rev0/ast_macbeth.yaml b/assets/yaml/jp/rev0/ast_macbeth.yaml index 2209552e..f455462c 100644 --- a/assets/yaml/jp/rev0/ast_macbeth.yaml +++ b/assets/yaml/jp/rev0/ast_macbeth.yaml @@ -61,8 +61,8 @@ D_MA_60026F8: D_MA_60027F8: { type: TEXTURE, format: TLUT, ctype: u16, colors: 72, offset: 0x60027F8, symbol: D_MA_60027F8} -D_MA_6002890: - {type: GFX, offset: 0x6002890, symbol: D_MA_6002890} +aMaGuillotine2DL: + {type: GFX, offset: 0x6002890, symbol: aMaGuillotine2DL} D_MA_6002C20: { type: TEXTURE, format: CI8, ctype: u8, width: 32, height: 16, offset: 0x6002C20, symbol: D_MA_6002C20, tlut: 0x6002E20} @@ -238,8 +238,8 @@ D_MA_600AE18: D_MA_600AE98: { type: TEXTURE, format: TLUT, ctype: u16, colors: 80, offset: 0x600AE98, symbol: D_MA_600AE98} -aMaGuillotineDL: - {type: GFX, offset: 0x600AF40, symbol: aMaGuillotineDL} +aMaGuillotine1DL: + {type: GFX, offset: 0x600AF40, symbol: aMaGuillotine1DL} D_MA_600B2E0: { type: TEXTURE, format: RGBA16, ctype: u16, width: 32, height: 64, offset: 0x600B2E0, symbol: D_MA_600B2E0} @@ -274,8 +274,8 @@ D_MA_600D878: D_MA_600D978: { type: TEXTURE, format: TLUT, ctype: u16, colors: 72, offset: 0x600D978, symbol: D_MA_600D978} -D_MA_600DA10: - {type: GFX, offset: 0x600DA10, symbol: D_MA_600DA10} +aMaLaserTurretDL: + {type: GFX, offset: 0x600DA10, symbol: aMaLaserTurretDL} D_MA_600DF60: { type: TEXTURE, format: CI8, ctype: u8, width: 32, height: 32, offset: 0x600DF60, symbol: D_MA_600DF60, tlut: 0x600E360} @@ -478,8 +478,8 @@ aMaTowerTopDL: D_MA_601C170: {type: GFX, offset: 0x601C170, symbol: D_MA_601C170} -D_MA_601C520: - {type: GFX, offset: 0x601C520, symbol: D_MA_601C520} +aMaRailroadCartDL: + {type: GFX, offset: 0x601C520, symbol: aMaRailroadCartDL} D_MA_601D188: {type: SF64:ANIM, offset: 0x601D188, symbol: D_MA_601D188} @@ -922,8 +922,8 @@ aMaGuillotineHousingHitbox: aMaGuillotineHitbox: {type: SF64:HITBOX, offset: 0x60368E0, symbol: aMaGuillotineHitbox} -D_MA_60368FC: - {type: SF64:HITBOX, offset: 0x60368FC, symbol: D_MA_60368FC} +aMaRailroadCartHitbox: + {type: SF64:HITBOX, offset: 0x60368FC, symbol: aMaRailroadCartHitbox} aMaBombDropHitbox: {type: SF64:HITBOX, offset: 0x6036930, symbol: aMaBombDropHitbox} diff --git a/assets/yaml/jp/rev0/ast_map.yaml b/assets/yaml/jp/rev0/ast_map.yaml index 6f4f4692..070fee15 100644 --- a/assets/yaml/jp/rev0/ast_map.yaml +++ b/assets/yaml/jp/rev0/ast_map.yaml @@ -409,8 +409,8 @@ D_MAP_604A8D8: { type: TEXTURE, ctype: u16, format: TLUT, colors: 136, offset: 0x0604A8D8, symbol: D_MAP_604A8D8 } # Arwing Model, used in the map. -D_MAP_604A9F0: - { type: GFX, offset: 0x604A9F0, symbol: D_MAP_604A9F0 } +aMapArwingDL: + { type: GFX, offset: 0x604A9F0, symbol: aMapArwingDL } ast_map_seg6_vtx_4AD50: { type: VTX, offset: 0x604AD50, count: 124, symbol: ast_map_seg6_vtx_4AD50 } diff --git a/assets/yaml/jp/rev0/ast_meteo.yaml b/assets/yaml/jp/rev0/ast_meteo.yaml index c6bd7384..d06d59ca 100644 --- a/assets/yaml/jp/rev0/ast_meteo.yaml +++ b/assets/yaml/jp/rev0/ast_meteo.yaml @@ -62,8 +62,8 @@ D_ME_60080C0: D_ME_6008A18: { type: TEXTURE, ctype: u16, format: RGBA16, width: 8, height: 8, offset: 0x06008A18, symbol: D_ME_6008A18 } -D_ME_6008AA0: - { type: GFX, offset: 0x6008AA0, symbol: D_ME_6008AA0 } +aMeFlipBot1DL: + { type: GFX, offset: 0x6008AA0, symbol: aMeFlipBot1DL } D_ME_6009228: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06009228, symbol: D_ME_6009228 } @@ -74,35 +74,35 @@ D_ME_6009A28: D_ME_6009C28: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06009C28, symbol: D_ME_6009C28 } -D_ME_6009E30: - { type: GFX, offset: 0x6009E30, symbol: D_ME_6009E30 } +aMeFlipBot2DL: + { type: GFX, offset: 0x6009E30, symbol: aMeFlipBot2DL } -D_ME_6009F50: - { type: GFX, offset: 0x6009F50, symbol: D_ME_6009F50 } +aMeBigMeteorDL: + { type: GFX, offset: 0x6009F50, symbol: aMeBigMeteorDL } -D_ME_600AC70: - { type: GFX, offset: 0x600AC70, symbol: D_ME_600AC70 } +aMeMeteor7DL: + { type: GFX, offset: 0x600AC70, symbol: aMeMeteor7DL } D_ME_600B540: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0600B540, symbol: D_ME_600B540 } -D_ME_600BD40: - { type: GFX, offset: 0x600BD40, symbol: D_ME_600BD40 } +aMeSecretMarker2DL: + { type: GFX, offset: 0x600BD40, symbol: aMeSecretMarker2DL } D_ME_600BF30: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x0600BF30, symbol: D_ME_600BF30 } -D_ME_600C130: - { type: GFX, offset: 0x600C130, symbol: D_ME_600C130 } +aMeRockGull2DL: + { type: GFX, offset: 0x600C130, symbol: aMeRockGull2DL } -D_ME_600C2A0: - { type: GFX, offset: 0x600C2A0, symbol: D_ME_600C2A0 } +aMeMeteor6DL: + { type: GFX, offset: 0x600C2A0, symbol: aMeMeteor6DL } -D_ME_600C740: - { type: GFX, offset: 0x600C740, symbol: D_ME_600C740 } +aMeRockGull3DL: + { type: GFX, offset: 0x600C740, symbol: aMeRockGull3DL } -D_ME_600CAA0: - { type: GFX, offset: 0x600CAA0, symbol: D_ME_600CAA0 } +aMeRockGull1DL: + { type: GFX, offset: 0x600CAA0, symbol: aMeRockGull1DL } aMeMeteorShower3DL: { type: GFX, offset: 0x600CD60, symbol: aMeMeteorShower3DL } @@ -149,20 +149,20 @@ D_ME_60172C8: aMeMeteorShower1DL: { type: GFX, offset: 0x06017AD0, symbol: aMeMeteorShower1DL } -D_ME_6017B60: - { type: GFX, offset: 0x06017B60, symbol: D_ME_6017B60 } +aMeMeteor3DL: + { type: GFX, offset: 0x06017B60, symbol: aMeMeteor3DL } aMeLaserCannon2DL: { type: GFX, offset: 0x06018450, symbol: aMeLaserCannon2DL } -D_ME_6018960: - { type: GFX, offset: 0x06018960, symbol: D_ME_6018960 } +aMeMeteor5DL: + { type: GFX, offset: 0x06018960, symbol: aMeMeteor5DL } -aMeMeteorDL: - { type: GFX, offset: 0x06018C00, symbol: aMeMeteorDL } +aMeMeteor1DL: + { type: GFX, offset: 0x06018C00, symbol: aMeMeteor1DL } -D_ME_6019430: - { type: GFX, offset: 0x06019430, symbol: D_ME_6019430 } +aMeMeteor4DL: + { type: GFX, offset: 0x06019430, symbol: aMeMeteor4DL } D_ME_6019880: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06019880, symbol: D_ME_6019880 } @@ -170,8 +170,8 @@ D_ME_6019880: D_ME_601A080: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0601A080, symbol: D_ME_601A080 } -D_ME_601A880: - { type: GFX, offset: 0x0601A880, symbol: D_ME_601A880 } +aMeSecretMarker1DL: + { type: GFX, offset: 0x0601A880, symbol: aMeSecretMarker1DL } aMeMeteoTunnelDL: { type: GFX, offset: 0x0601AE40, symbol: aMeMeteoTunnelDL } @@ -195,8 +195,8 @@ D_ME_601EA00: D_ME_601EA98: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0601EA98, symbol: D_ME_601EA98 } -D_ME_601F2A0: - { type: GFX, offset: 0x0601F2A0, symbol: D_ME_601F2A0 } +aMeMeteor2DL: + { type: GFX, offset: 0x0601F2A0, symbol: aMeMeteor2DL } D_ME_601F778: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0601F778, symbol: D_ME_601F778 } @@ -280,8 +280,8 @@ D_ME_602B148: D_ME_602F3AC: { type: SF64:SCRIPT, offset: 0x602F3AC, symbol: D_ME_602F3AC } -D_ME_602F604: - { type: SF64:HITBOX, offset: 0x602F604, symbol: D_ME_602F604 } +aMeFlipBotHitbox: + { type: SF64:HITBOX, offset: 0x602F604, symbol: aMeFlipBotHitbox } D_ME_602F638: { type: SF64:HITBOX, offset: 0x602F638, symbol: D_ME_602F638 } diff --git a/assets/yaml/jp/rev0/ast_sector_x.yaml b/assets/yaml/jp/rev0/ast_sector_x.yaml index 6cef80a6..88bf0b54 100644 --- a/assets/yaml/jp/rev0/ast_sector_x.yaml +++ b/assets/yaml/jp/rev0/ast_sector_x.yaml @@ -16,8 +16,8 @@ D_SX_6000000: { type: TEXTURE, ctype: u8, format: IA8, width: 176, height: 12, offset: 0x6000000, symbol: D_SX_6000000 } -D_SX_6000840: - { type: GFX, offset: 0x6000840, symbol: D_SX_6000840 } +aSxSpaceMineDL: + { type: GFX, offset: 0x6000840, symbol: aSxSpaceMineDL } # Flying mine D_SX_60008C0: @@ -30,14 +30,14 @@ D_SX_60010C0: D_SX_6001150: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6001150, symbol: D_SX_6001150 } -D_SX_6001950: - { type: GFX, offset: 0x6001950, symbol: D_SX_6001950 } +aSxLaserDestroyedDL: + { type: GFX, offset: 0x6001950, symbol: aSxLaserDestroyedDL } D_SX_6001AD8: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x6001AD8, symbol: D_SX_6001AD8 } -D_SX_6001CE0: - { type: GFX, offset: 0x6001CE0, symbol: D_SX_6001CE0 } +aSxWatchPostDL: + { type: GFX, offset: 0x6001CE0, symbol: aSxWatchPostDL } D_SX_60020C0: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x60020C0, symbol: D_SX_60020C0 } @@ -75,8 +75,8 @@ D_SX_6004EE8: D_SX_6005EE8: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6005EE8, symbol: D_SX_6005EE8 } -D_SX_60066F0: - { type: GFX, offset: 0x60066F0, symbol: D_SX_60066F0 } +aSxLaserDL: + { type: GFX, offset: 0x60066F0, symbol: aSxLaserDL } D_SX_6006810: { type: GFX, offset: 0x6006810, symbol: D_SX_6006810 } @@ -102,8 +102,8 @@ D_SX_6009548: D_SX_6009748: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x6009748, symbol: D_SX_6009748 } -D_SX_6009950: - { type: GFX, offset: 0x6009950, symbol: D_SX_6009950 } +aSxBaseFloor1DL: + { type: GFX, offset: 0x6009950, symbol: aSxBaseFloor1DL } D_SX_6009C30: { type: GFX, offset: 0x6009C30, symbol: D_SX_6009C30 } @@ -117,8 +117,8 @@ D_SX_6009FF8: D_SX_600A2D4: { type: SF64:ANIM, offset: 0x600A2D4, symbol: D_SX_600A2D4 } -D_SX_600A2E0: - { type: GFX, offset: 0x600A2E0, symbol: D_SX_600A2E0 } +aSxBaseWall3DL: + { type: GFX, offset: 0x600A2E0, symbol: aSxBaseWall3DL } D_SX_600A570: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x600A570, symbol: D_SX_600A570 } @@ -126,17 +126,17 @@ D_SX_600A570: D_SX_600AD70: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x600AD70, symbol: D_SX_600AD70 } -D_SX_600AF70: - { type: GFX, offset: 0x600AF70, symbol: D_SX_600AF70 } +aSxBaseWall1DL: + { type: GFX, offset: 0x600AF70, symbol: aSxBaseWall1DL } -D_SX_600B2B0: - { type: GFX, offset: 0x600B2B0, symbol: D_SX_600B2B0 } +aSxBaseWall2DL: + { type: GFX, offset: 0x600B2B0, symbol: aSxBaseWall2DL } -D_SX_600B540: - { type: GFX, offset: 0x600B540, symbol: D_SX_600B540 } +aSxBaseWall4DL: + { type: GFX, offset: 0x600B540, symbol: aSxBaseWall4DL } -D_SX_600B830: - { type: GFX, offset: 0x600B830, symbol: D_SX_600B830 } +aSxBorzoiFighterDL: + { type: GFX, offset: 0x600B830, symbol: aSxBorzoiFighterDL } D_SX_600C000: { type: GFX, offset: 0x600C000, symbol: D_SX_600C000 } @@ -189,8 +189,8 @@ D_SX_60206DC: aSxSpyborgSkel: { type: SF64:SKELETON, offset: 0x6020C68, symbol: aSxSpyborgSkel } -D_SX_6020D20: - { type: GFX, offset: 0x6020D20, symbol: D_SX_6020D20 } +aSxBaseWallTile1DL: + { type: GFX, offset: 0x6020D20, symbol: aSxBaseWallTile1DL } # Spyborg Radio D_SX_6020FB0: @@ -199,20 +199,20 @@ D_SX_6020FB0: D_SX_6021ED0: { type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0x06021ED0, symbol: D_SX_6021ED0 } -D_SX_6022DF0: - { type: GFX, offset: 0x6022DF0, symbol: D_SX_6022DF0 } +aSxCanineDL: + { type: GFX, offset: 0x6022DF0, symbol: aSxCanineDL } -D_SX_6023500: - { type: GFX, offset: 0x6023500, symbol: D_SX_6023500 } +aSxSpyEyeDL: + { type: GFX, offset: 0x6023500, symbol: aSxSpyEyeDL } D_SX_6023C30: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06023C30, symbol: D_SX_6023C30 } -D_SX_6023E30: - { type: GFX, offset: 0x6023E30, symbol: D_SX_6023E30 } +aSxBaseDebris2DL: + { type: GFX, offset: 0x6023E30, symbol: aSxBaseDebris2DL } -D_SX_60285F0: - { type: GFX, offset: 0x60285F0, symbol: D_SX_60285F0 } +aSxBaseDebris1DL: + { type: GFX, offset: 0x60285F0, symbol: aSxBaseDebris1DL } D_SX_6029098: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06029098, symbol: D_SX_6029098 } @@ -241,8 +241,8 @@ D_SX_60320D0: D_SX_6032328: { type: SF64:HITBOX, offset: 0x6032328, symbol: D_SX_6032328 } -D_SX_603238C: - { type: SF64:HITBOX, offset: 0x603238C, symbol: D_SX_603238C } +aSxWarpGateHitbox: + { type: SF64:HITBOX, offset: 0x603238C, symbol: aSxWarpGateHitbox } D_SX_6032408: { type: SF64:HITBOX, offset: 0x6032408, symbol: D_SX_6032408 } @@ -256,20 +256,20 @@ aSxSpyborgRightArmHitbox: aSxSpyborgHitbox: { type: SF64:HITBOX, offset: 0x6032550, symbol: aSxSpyborgHitbox } -D_SX_603285C: - { type: SF64:HITBOX, offset: 0x603285C, symbol: D_SX_603285C } +aSxLaserHitbox: + { type: SF64:HITBOX, offset: 0x603285C, symbol: aSxLaserHitbox } -D_SX_6032878: - { type: SF64:HITBOX, offset: 0x6032878, symbol: D_SX_6032878 } +aSxBaseFloor1Hitbox: + { type: SF64:HITBOX, offset: 0x6032878, symbol: aSxBaseFloor1Hitbox } -D_SX_6032894: - { type: SF64:HITBOX, offset: 0x6032894, symbol: D_SX_6032894 } +aSxBaseWall2Hitbox: + { type: SF64:HITBOX, offset: 0x6032894, symbol: aSxBaseWall2Hitbox } -D_SX_60328B0: - { type: SF64:HITBOX, offset: 0x60328B0, symbol: D_SX_60328B0 } +aSxBaseWall3Hitbox: + { type: SF64:HITBOX, offset: 0x60328B0, symbol: aSxBaseWall3Hitbox } -D_SX_60328CC: - { type: SF64:HITBOX, offset: 0x60328CC, symbol: D_SX_60328CC } +aSxBaseWallTile1Hitbox: + { type: SF64:HITBOX, offset: 0x60328CC, symbol: aSxBaseWallTile1Hitbox } D_SX_603265C: { type: SF64:HITBOX, offset: 0x603265C, symbol: D_SX_603265C } @@ -277,22 +277,22 @@ D_SX_603265C: D_SX_6032768: { type: SF64:HITBOX, offset: 0x6032768, symbol: D_SX_6032768 } -D_SX_60328E8: - { type: SF64:HITBOX, offset: 0x60328E8, symbol: D_SX_60328E8 } +aSxBaseWall4Hitbox: + { type: SF64:HITBOX, offset: 0x60328E8, symbol: aSxBaseWall4Hitbox } -D_SX_6032904: - { type: SF64:HITBOX, offset: 0x6032904, symbol: D_SX_6032904 } +aSxBaseWall1Hitbox: + { type: SF64:HITBOX, offset: 0x6032904, symbol: aSxBaseWall1Hitbox } -D_SX_6032938: - { type: SF64:HITBOX, offset: 0x6032938, symbol: D_SX_6032938 } +aSxWatchPostHitbox: + { type: SF64:HITBOX, offset: 0x6032938, symbol: aSxWatchPostHitbox } -D_SX_6032954: - { type: SF64:HITBOX, offset: 0x6032954, symbol: D_SX_6032954 } +aSxSpaceMineHitbox: + { type: SF64:HITBOX, offset: 0x6032954, symbol: aSxSpaceMineHitbox } -D_SX_6032970: - { type: SF64:HITBOX, offset: 0x6032970, symbol: D_SX_6032970 } +aSxBaseDebris2Hitbox: + { type: SF64:HITBOX, offset: 0x6032970, symbol: aSxBaseDebris2Hitbox } -D_SX_603298C: - { type: SF64:HITBOX, offset: 0x603298C, symbol: D_SX_603298C } +aSxBaseDebris1Hitbox: + { type: SF64:HITBOX, offset: 0x603298C, symbol: aSxBaseDebris1Hitbox } # size = 0x32AC0
\ No newline at end of file diff --git a/assets/yaml/jp/rev0/ast_sector_y.yaml b/assets/yaml/jp/rev0/ast_sector_y.yaml index 4e0ef4dd..097b11cb 100644 --- a/assets/yaml/jp/rev0/ast_sector_y.yaml +++ b/assets/yaml/jp/rev0/ast_sector_y.yaml @@ -116,11 +116,11 @@ D_SY_60119D8: D_SY_60132A0: { type: GFX, offset: 0x60132A0, symbol: D_SY_60132A0 } -D_SY_6015D60: - { type: GFX, offset: 0x6015D60, symbol: D_SY_6015D60 } +aSyRobot4DL: + { type: GFX, offset: 0x6015D60, symbol: aSyRobot4DL } -D_SY_601F3D0: - { type: GFX, offset: 0x601F3D0, symbol: D_SY_601F3D0 } +aSySaruzinDL: + { type: GFX, offset: 0x601F3D0, symbol: aSySaruzinDL } D_SY_60121E0: { type: GFX, offset: 0x60121E0, symbol: D_SY_60121E0 } @@ -158,8 +158,8 @@ D_SY_6015960: D_SY_6015B60: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06015B60, symbol: D_SY_6015B60 } -aSyShipProjectileDL: - { type: GFX, offset: 0x60188D0, symbol: aSyShipProjectileDL } +aSyShipMissileDL: + { type: GFX, offset: 0x60188D0, symbol: aSyShipMissileDL } D_SY_60183B0: { type: GFX, offset: 0x60183B0, symbol: D_SY_60183B0 } @@ -170,8 +170,8 @@ D_SY_6018F30: D_SY_6019E50: { type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0x06019E50, symbol: D_SY_6019E50 } -D_SY_601AD70: - { type: GFX, offset: 0x601AD70, symbol: D_SY_601AD70 } +aSyDebrisDL: + { type: GFX, offset: 0x601AD70, symbol: aSyDebrisDL } D_SY_601AE08: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0601AE08, symbol: D_SY_601AE08 } @@ -194,11 +194,11 @@ aSyShip2DL: D_SY_601F3B8: { type: SF64:ANIM, offset: 0x601F3B8, symbol: D_SY_601F3B8 } -D_SY_60205D0: - { type: GFX, offset: 0x60205D0, symbol: D_SY_60205D0 } +aSyLaserTurretDL: + { type: GFX, offset: 0x60205D0, symbol: aSyLaserTurretDL } -D_SY_60209F0: - { type: GFX, offset: 0x60209F0, symbol: D_SY_60209F0 } +aSyRobotSpriteFrontDL: + { type: GFX, offset: 0x60209F0, symbol: aSyRobotSpriteFrontDL } D_SY_6020B08: { type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x06020B08, symbol: D_SY_6020B08 } @@ -206,8 +206,8 @@ D_SY_6020B08: D_SY_6021B08: { type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x06021B08, symbol: D_SY_6021B08 } -D_SY_6022B10: - { type: GFX, offset: 0x6022B10, symbol: D_SY_6022B10 } +aSyRobotSpriteSideDL: + { type: GFX, offset: 0x6022B10, symbol: aSyRobotSpriteSideDL } D_SY_6022C28: { type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x06022C28, symbol: D_SY_6022C28 } @@ -314,8 +314,8 @@ aSyRobotHitbox: D_SY_60340C0: { type: SF64:HITBOX, offset: 0x60340C0, symbol: D_SY_60340C0 } -D_SY_6034124: - { type: SF64:HITBOX, offset: 0x6034124, symbol: D_SY_6034124 } +aSyRobot4Hitbox: + { type: SF64:HITBOX, offset: 0x6034124, symbol: aSyRobot4Hitbox } D_SY_60341A8: { type: SF64:HITBOX, offset: 0x60341A8, symbol: D_SY_60341A8 } @@ -332,8 +332,8 @@ D_SY_6034304: aSyScenery156Hitbox: { type: SF64:HITBOX, offset: 0x6034368, symbol: aSyScenery156Hitbox } -D_SY_603445C: - { type: SF64:HITBOX, offset: 0x603445C, symbol: D_SY_603445C } +aSyLaserTurretHitbox: + { type: SF64:HITBOX, offset: 0x603445C, symbol: aSyLaserTurretHitbox } aSyShip1Hitbox: { type: SF64:HITBOX, offset: 0x6034478, symbol: aSyShip1Hitbox } @@ -356,7 +356,7 @@ aSyShipWindowsHitbox: aSyShip4DestroyedHitbox: { type: SF64:HITBOX, offset: 0x60347F0, symbol: aSyShip4DestroyedHitbox } -aSyShipProjectileHitbox: - { type: SF64:HITBOX, offset: 0x603486C, symbol: aSyShipProjectileHitbox } +aSyShipMissileHitbox: + { type: SF64:HITBOX, offset: 0x603486C, symbol: aSyShipMissileHitbox } # size = 0x34890
\ No newline at end of file diff --git a/assets/yaml/jp/rev0/ast_sector_z.yaml b/assets/yaml/jp/rev0/ast_sector_z.yaml index 112044ad..12c21624 100644 --- a/assets/yaml/jp/rev0/ast_sector_z.yaml +++ b/assets/yaml/jp/rev0/ast_sector_z.yaml @@ -142,8 +142,8 @@ D_SZ_6006BD8: D_SZ_6006CD8: { type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x06006CD8, symbol: D_SZ_6006CD8 } -D_SZ_6006D64: - { type: SF64:ANIM, offset: 0x6006D64, symbol: D_SZ_6006D64 } +aSzMissileAnim: + { type: SF64:ANIM, offset: 0x6006D64, symbol: aSzMissileAnim } aSzMissileSkel: { type: SF64:SKELETON, offset: 0x6006E50, symbol: aSzMissileSkel } diff --git a/assets/yaml/jp/rev0/ast_solar.yaml b/assets/yaml/jp/rev0/ast_solar.yaml index d5c5aa0a..88b2b591 100644 --- a/assets/yaml/jp/rev0/ast_solar.yaml +++ b/assets/yaml/jp/rev0/ast_solar.yaml @@ -31,11 +31,11 @@ D_SO_6004500: D_SO_6005710: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6005710, symbol: D_SO_6005710} -D_SO_600636C: - { type: SF64:ANIM, offset: 0x600636C, symbol: D_SO_600636C} +aSoGoreAnim: + { type: SF64:ANIM, offset: 0x600636C, symbol: aSoGoreAnim} -D_SO_6006558: - { type: SF64:SKELETON, offset: 0x6006558, symbol: D_SO_6006558} +aSoGoreSkel: + { type: SF64:SKELETON, offset: 0x6006558, symbol: aSoGoreSkel} D_SO_6006DD8: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6006DD8, symbol: D_SO_6006DD8} diff --git a/assets/yaml/jp/rev0/ast_star_wolf.yaml b/assets/yaml/jp/rev0/ast_star_wolf.yaml index d7225ceb..e6e12660 100644 --- a/assets/yaml/jp/rev0/ast_star_wolf.yaml +++ b/assets/yaml/jp/rev0/ast_star_wolf.yaml @@ -56,8 +56,8 @@ D_STAR_WOLF_F00D3C0: D_STAR_WOLF_F00E2E0: { type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0x0F00E2E0, symbol: D_STAR_WOLF_F00E2E0 } -D_STAR_WOLF_F00F200: - { type: GFX, offset: 0xF00F200, symbol: D_STAR_WOLF_F00F200 } +aStarWolfStandardShipDL: + { type: GFX, offset: 0xF00F200, symbol: aStarWolfStandardShipDL } D_STAR_WOLF_F0101D0: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x0F0101D0, symbol: D_STAR_WOLF_F0101D0 } @@ -68,8 +68,8 @@ D_STAR_WOLF_F011E80: D_STAR_WOLF_F011680: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0F011680, symbol: D_STAR_WOLF_F011680 } -D_STAR_WOLF_F0103D0: - { type: GFX, offset: 0xF0103D0, symbol: D_STAR_WOLF_F0103D0 } +aStarWolfUpgradedShipDL: + { type: GFX, offset: 0xF0103D0, symbol: aStarWolfUpgradedShipDL } D_STAR_WOLF_F011F00: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0F011F00, symbol: D_STAR_WOLF_F011F00 } @@ -89,14 +89,14 @@ D_STAR_WOLF_F013180: D_STAR_WOLF_F013980: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0F013980, symbol: D_STAR_WOLF_F013980 } -D_STAR_WOLF_F014180: - { type: GFX, offset: 0xF014180, symbol: D_STAR_WOLF_F014180 } +aStarWolfRadarMarkDL: + { type: GFX, offset: 0xF014180, symbol: aStarWolfRadarMarkDL } D_STAR_WOLF_F014208: { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 16, offset: 0x0F014208, symbol: D_STAR_WOLF_F014208 } -D_STAR_WOLF_F014310: - { type: GFX, offset: 0xF014310, symbol: D_STAR_WOLF_F014310 } +aStarWolfShadowDL: + { type: GFX, offset: 0xF014310, symbol: aStarWolfShadowDL } -D_STAR_WOLF_F014398: - { type: TEXTURE, ctype: u8, format: IA8, width: 32, height: 32, offset: 0x0F014398, symbol: D_STAR_WOLF_F014398 } +aStarWolfShadowTex: + { type: TEXTURE, ctype: u8, format: IA8, width: 32, height: 32, offset: 0x0F014398, symbol: aStarWolfShadowTex } diff --git a/assets/yaml/jp/rev0/ast_training.yaml b/assets/yaml/jp/rev0/ast_training.yaml index 8c2f5bc9..4fda0b1c 100644 --- a/assets/yaml/jp/rev0/ast_training.yaml +++ b/assets/yaml/jp/rev0/ast_training.yaml @@ -25,8 +25,8 @@ D_TR_6000900: D_TR_6001820: { type: TEXTURE, format: RGBA16, offset: 0x6001820, width: 44, height: 44, ctype: u16, symbol: D_TR_6001820 } -D_TR_6002740: - { type: GFX, offset: 0x6002740, symbol: D_TR_6002740 } +aTrBarrierDL: + { type: GFX, offset: 0x6002740, symbol: aTrBarrierDL } D_TR_60028F0: { type: TEXTURE, format: RGBA16, offset: 0x060028F0, width: 32, height: 32, ctype: u16, symbol: D_TR_60028F0 } @@ -82,7 +82,7 @@ aTrBuildingHitbox: aItemTrainingRingHitbox: { type: SF64:HITBOX, offset: 0x6009CFC, symbol: aItemTrainingRingHitbox } -D_TR_6009D18: - { type: SF64:HITBOX, offset: 0x6009D18, symbol: D_TR_6009D18 } +aTrBarrierHitbox: + { type: SF64:HITBOX, offset: 0x6009D18, symbol: aTrBarrierHitbox } # size = 0x9D40
\ No newline at end of file diff --git a/assets/yaml/jp/rev0/ast_ve1_boss.yaml b/assets/yaml/jp/rev0/ast_ve1_boss.yaml index 436fc334..ff054630 100644 --- a/assets/yaml/jp/rev0/ast_ve1_boss.yaml +++ b/assets/yaml/jp/rev0/ast_ve1_boss.yaml @@ -29,8 +29,8 @@ D_VE1_90012F0: D_VE1_9002CD8: {type: SF64:ANIM, offset: 0x9002CD8, symbol: D_VE1_9002CD8} -D_VE1_9002CF0: - {type: GFX, offset: 0x9002CF0, symbol: D_VE1_9002CF0} +aVe1BlockerDL: + {type: GFX, offset: 0x9002CF0, symbol: aVe1BlockerDL} D_VE1_9002F30: {type: TEXTURE, ctype: u8, format: CI8, width: 32, height: 32, offset: 0x9002F30, symbol: D_VE1_9002F30, tlut: 0x9003330} @@ -113,8 +113,8 @@ D_VE1_900DF20: D_VE1_900DFB8: {type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x900DFB8, symbol: D_VE1_900DFB8} -D_VE1_900EFC0: - {type: GFX, offset: 0x900EFC0, symbol: D_VE1_900EFC0} +aVe1TempleBgDL: + {type: GFX, offset: 0x900EFC0, symbol: aVe1TempleBgDL} aVe1TempleInterior2DL: {type: GFX, offset: 0x900F060, symbol: aVe1TempleInterior2DL} @@ -128,14 +128,14 @@ D_VE1_9010FC4: D_VE1_9010FD0: {type: GFX, offset: 0x9010FD0, symbol: D_VE1_9010FD0} -D_VE1_9011200: - {type: GFX, offset: 0x9011200, symbol: D_VE1_9011200} +aVe1PillarDL: + {type: GFX, offset: 0x9011200, symbol: aVe1PillarDL} D_VE1_9011980: {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x9011980, symbol: D_VE1_9011980} -D_VE1_9012180: - {type: GFX, offset: 0x9012180, symbol: D_VE1_9012180} +aVe1Pillar5DL: + {type: GFX, offset: 0x9012180, symbol: aVe1Pillar5DL} D_VE1_90123C0: {type: TEXTURE, ctype: u8, format: CI8, width: 32, height: 16, offset: 0x90123C0, symbol: D_VE1_90123C0, tlut: 0x90125C0} diff --git a/assets/yaml/jp/rev0/ast_venom_1.yaml b/assets/yaml/jp/rev0/ast_venom_1.yaml index 777321f2..1655355a 100644 --- a/assets/yaml/jp/rev0/ast_venom_1.yaml +++ b/assets/yaml/jp/rev0/ast_venom_1.yaml @@ -25,8 +25,8 @@ D_VE1_6000D80: D_VE1_6001B80: { type: TEXTURE, format: IA8, width: 128, height: 19, offset: 0x6001B80, ctype: u8, symbol: D_VE1_6001B80 } -D_VE1_6002500: - { type: GFX, offset: 0x6002500, symbol: D_VE1_6002500 } +aVe1EnemyGateDL: + { type: GFX, offset: 0x6002500, symbol: aVe1EnemyGateDL } D_VE1_60029F8: { type: TEXTURE, format: CI8, width: 8, height: 16, offset: 0x60029F8, tlut: 0x6002A78, ctype: u8, symbol: D_VE1_60029F8 } @@ -52,11 +52,11 @@ aVe1WatchPostDL: D_VE1_6003B10: { type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x6003B10, ctype: u16, symbol: D_VE1_6003B10 } -D_VE1_6004310: - { type: GFX, offset: 0x6004310, symbol: D_VE1_6004310 } +aVe1EnemyGateDoorLeftDL: + { type: GFX, offset: 0x6004310, symbol: aVe1EnemyGateDoorLeftDL } -D_VE1_60043F0: - { type: GFX, offset: 0x60043F0, symbol: D_VE1_60043F0 } +aVe1EnemyGateDoorRightDL: + { type: GFX, offset: 0x60043F0, symbol: aVe1EnemyGateDoorRightDL } D_VE1_60044D0: { type: TEXTURE, format: CI8, width: 16, height: 16, offset: 0x60044D0, tlut: 0x60045D0, ctype: u8, symbol: D_VE1_60044D0 } @@ -124,8 +124,8 @@ D_VE1_601B1E4: D_VE1_6010088: { type: SF64:OBJECT_INIT, offset: 0x6010088, symbol: D_VE1_6010088 } -D_VE1_601B43C: - { type: SF64:HITBOX, offset: 0x601B43C, symbol: D_VE1_601B43C } +aVe1Pillar5Hitbox: + { type: SF64:HITBOX, offset: 0x601B43C, symbol: aVe1Pillar5Hitbox } D_VE1_601B474: { type: SF64:HITBOX, offset: 0x601B474, symbol: D_VE1_601B474 } @@ -178,5 +178,5 @@ aVe1Pillar4Hitbox: aVe1MonkeyStatueHitbox: { type: SF64:HITBOX, offset: 0x601B8D8, symbol: aVe1MonkeyStatueHitbox } -D_VE1_601B944: - { type: SF64:HITBOX, offset: 0x601B944, symbol: D_VE1_601B944 }
\ No newline at end of file +aVe1EnemyGateHitbox: + { type: SF64:HITBOX, offset: 0x601B944, symbol: aVe1EnemyGateHitbox }
\ No newline at end of file diff --git a/assets/yaml/jp/rev0/ast_venom_2.yaml b/assets/yaml/jp/rev0/ast_venom_2.yaml index c1f15a4b..3146fc88 100644 --- a/assets/yaml/jp/rev0/ast_venom_2.yaml +++ b/assets/yaml/jp/rev0/ast_venom_2.yaml @@ -174,11 +174,11 @@ D_VE2_60114A0: D_VE2_6013AF8: { type: TEXTURE, format: RGBA16, width: 16, height: 16, offset: 0x6013AF8, ctype: u16, symbol: D_VE2_6013AF8 } -D_VE2_6014658: - { type: SF64:ANIM, offset: 0x6014658, symbol: D_VE2_6014658 } +aVe2AndrossGateAnim: + { type: SF64:ANIM, offset: 0x6014658, symbol: aVe2AndrossGateAnim } -D_VE2_6014844: - { type: SF64:SKELETON, offset: 0x6014844, symbol: D_VE2_6014844 } +aVe2AndrossGateSkel: + { type: SF64:SKELETON, offset: 0x6014844, symbol: aVe2AndrossGateSkel } aVe2BaseAnim: { type: SF64:ANIM, offset: 0x6014904, symbol: aVe2BaseAnim } diff --git a/assets/yaml/jp/rev0/ast_warp_zone.yaml b/assets/yaml/jp/rev0/ast_warp_zone.yaml index 87af0cb6..d7ce93c7 100644 --- a/assets/yaml/jp/rev0/ast_warp_zone.yaml +++ b/assets/yaml/jp/rev0/ast_warp_zone.yaml @@ -8,14 +8,14 @@ - '#include "gfx.h"' - '#include "sf64object.h"' -D_WZ_7000000: - { type: GFX, offset: 0x7000000, symbol: D_WZ_7000000 } +aWzSxEnemy1DL: + { type: GFX, offset: 0x7000000, symbol: aWzSxEnemy1DL } -D_WZ_7000280: - { type: GFX, offset: 0x7000280, symbol: D_WZ_7000280 } +aWzGateDL: + { type: GFX, offset: 0x7000280, symbol: aWzGateDL } -D_WZ_70008F0: - { type: GFX, offset: 0x70008F0, symbol: D_WZ_70008F0 } +aWzMeteor2DL: + { type: GFX, offset: 0x70008F0, symbol: aWzMeteor2DL } D_WZ_7000260: { type: TEXTURE, ctype: u16, format: RGBA16, width: 4, height: 4, offset: 0x7000260, symbol: D_WZ_7000260 } @@ -26,14 +26,14 @@ D_WZ_7000A30: D_WZ_7000C30: { type: TEXTURE, ctype: u16, format: TLUT, colors: 8, offset: 0x7000C30, symbol: D_WZ_7000C30 } -D_WZ_7000C40: - { type: GFX, offset: 0x7000C40, symbol: D_WZ_7000C40 } +aWzPillar1DL: + { type: GFX, offset: 0x7000C40, symbol: aWzPillar1DL } -D_WZ_7000E80: - { type: GFX, offset: 0x7000E80, symbol: D_WZ_7000E80 } +aWzMeteor1DL: + { type: GFX, offset: 0x7000E80, symbol: aWzMeteor1DL } -D_WZ_70010E0: - { type: GFX, offset: 0x70010E0, symbol: D_WZ_70010E0 } +aWzPillar2DL: + { type: GFX, offset: 0x70010E0, symbol: aWzPillar2DL } D_WZ_7001540: { type: GFX, offset: 0x7001540, symbol: D_WZ_7001540 } diff --git a/assets/yaml/jp/rev0/ast_zoness.yaml b/assets/yaml/jp/rev0/ast_zoness.yaml index f61f560b..129ddaf9 100644 --- a/assets/yaml/jp/rev0/ast_zoness.yaml +++ b/assets/yaml/jp/rev0/ast_zoness.yaml @@ -84,8 +84,8 @@ D_ZO_6004A70: D_ZO_6004B00: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x6004B00, symbol: D_ZO_6004B00} -D_ZO_6004D00: - { type: GFX, offset: 0x6004D00, symbol: D_ZO_6004D00} +aZoPatrolBoatDL: + { type: GFX, offset: 0x6004D00, symbol: aZoPatrolBoatDL} D_ZO_6005958: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x6005958, symbol: D_ZO_6005958} @@ -351,11 +351,11 @@ D_ZO_601F420: D_ZO_601F620: { type: GFX, offset: 0x601F620, symbol: D_ZO_601F620} -D_ZO_601F874: - { type: SF64:ANIM, offset: 0x601F874, symbol: D_ZO_601F874} +aZoSarumarinePeriscopeAnim: + { type: SF64:ANIM, offset: 0x601F874, symbol: aZoSarumarinePeriscopeAnim} -D_ZO_601F920: - { type: SF64:SKELETON, offset: 0x601F920, symbol: D_ZO_601F920} +aZoSarumarinePeriscopeSkel: + { type: SF64:SKELETON, offset: 0x601F920, symbol: aZoSarumarinePeriscopeSkel} D_ZO_601F940: { type: GFX, offset: 0x601F940, symbol: D_ZO_601F940} @@ -535,8 +535,8 @@ D_ZO_602C028: aZoSarumarineHitbox: { type: SF64:HITBOX, offset: 0x602C044, symbol: aZoSarumarineHitbox} -D_ZO_602C1A0: - { type: SF64:HITBOX, offset: 0x602C1A0, symbol: D_ZO_602C1A0} +aZoSarumarinePeriscopeHitbox: + { type: SF64:HITBOX, offset: 0x602C1A0, symbol: aZoSarumarinePeriscopeHitbox} aZoCargoShipHitbox: { type: SF64:HITBOX, offset: 0x602C1D4, symbol: aZoCargoShipHitbox} diff --git a/assets/yaml/us/rev1/ast_7_ti_1.yaml b/assets/yaml/us/rev1/ast_7_ti_1.yaml index c755070c..318224f2 100644 --- a/assets/yaml/us/rev1/ast_7_ti_1.yaml +++ b/assets/yaml/us/rev1/ast_7_ti_1.yaml @@ -209,11 +209,11 @@ aTi1DesertRoverSkel: aTi1FekudaGun2DL: { type: GFX, offset: 0x700C980, symbol: aTi1FekudaGun2DL } -D_TI1_700CAF4: - { type: SF64:ANIM, offset: 0x700CAF4, symbol: D_TI1_700CAF4} +aTiBomberAnim: + { type: SF64:ANIM, offset: 0x700CAF4, symbol: aTiBomberAnim} -D_TI1_700CB60: - {type: SF64:SKELETON, offset: 0x700CB60, symbol: D_TI1_700CB60} +aTiBomberSkel: + {type: SF64:SKELETON, offset: 0x700CB60, symbol: aTiBomberSkel} aTiRascoAnim: { type: SF64:ANIM, offset: 0x700D534, symbol: aTiRascoAnim } diff --git a/assets/yaml/us/rev1/ast_allies.yaml b/assets/yaml/us/rev1/ast_allies.yaml index d4997d4b..c22d8734 100644 --- a/assets/yaml/us/rev1/ast_allies.yaml +++ b/assets/yaml/us/rev1/ast_allies.yaml @@ -59,8 +59,8 @@ D_D0098B0: D_D009938: { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 16, offset: 0x0D009938, symbol: D_D009938 } -D_D009A40: - { type: GFX, offset: 0xD009A40, symbol: D_D009A40 } +aKattShipDL: + { type: GFX, offset: 0xD009A40, symbol: aKattShipDL } D_D00A3B8: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0D00A3B8, symbol: D_D00A3B8 } @@ -97,8 +97,8 @@ aJamesMarkTex: aJamesMarkTLUT: { type: TEXTURE, ctype: u16, format: TLUT, colors: 8, offset: 0xD00B870, symbol: aJamesMarkTLUT } -D_D00B880: - { type: GFX, offset: 0xD00B880, symbol: D_D00B880 } +aBillShipDL: + { type: GFX, offset: 0xD00B880, symbol: aBillShipDL } ast_allies_seg13_vtx_BB70: { type: VTX, count: 144, offset: 0xD00BB70, symbol: ast_allies_seg13_vtx_BB70 } diff --git a/assets/yaml/us/rev1/ast_aquas.yaml b/assets/yaml/us/rev1/ast_aquas.yaml index b45cb0cd..32e9bdf2 100644 --- a/assets/yaml/us/rev1/ast_aquas.yaml +++ b/assets/yaml/us/rev1/ast_aquas.yaml @@ -22,8 +22,8 @@ aAqSquidAnim: aAqSquidSkel: { type: SF64:SKELETON, offset: 0x6000DB0, symbol: aAqSquidSkel } -D_AQ_6000E10: - { type: GFX, offset: 0x6000E10, symbol: D_AQ_6000E10 } +aAqShellDL: + { type: GFX, offset: 0x6000E10, symbol: aAqShellDL } D_AQ_6001130: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6001130, symbol: D_AQ_6001130 } @@ -98,8 +98,8 @@ D_AQ_6003FF0: D_AQ_6008168: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6008168, symbol: D_AQ_6008168 } -D_AQ_6008970: - { type: GFX, offset: 0x6008970, symbol: D_AQ_6008970 } +aAqStarfishDL: + { type: GFX, offset: 0x6008970, symbol: aAqStarfishDL } D_AQ_6008EC8: { type: TEXTURE, ctype: u8, format: CI8, width: 16, height: 16, offset: 0x6008EC8, symbol: D_AQ_6008EC8, tlut: 0x6008FC8 } @@ -659,14 +659,14 @@ D_AQ_60308B8: aBoss301Hitbox: { type: SF64:HITBOX, offset: 0x6030B10, symbol: aBoss301Hitbox } -D_AQ_6030B14_f32: - { type: SF64:HITBOX, offset: 0x6030B14, symbol: D_AQ_6030B14_f32 } +aAqShellHitbox: + { type: SF64:HITBOX, offset: 0x6030B14, symbol: aAqShellHitbox } -D_AQ_6030B30: - { type: SF64:HITBOX, offset: 0x6030B30, symbol: D_AQ_6030B30 } +aAqStarfishHitbox: + { type: SF64:HITBOX, offset: 0x6030B30, symbol: aAqStarfishHitbox } -D_AQ_6030B4C: - { type: SF64:HITBOX, offset: 0x6030B4C, symbol: D_AQ_6030B4C } +aAqOysterEvHitbox: + { type: SF64:HITBOX, offset: 0x6030B4C, symbol: aAqOysterEvHitbox } D_AQ_6030B68: { type: SF64:HITBOX, offset: 0x6030B68, symbol: D_AQ_6030B68 } diff --git a/assets/yaml/us/rev1/ast_area_6.yaml b/assets/yaml/us/rev1/ast_area_6.yaml index e673f924..7ff0e0cf 100644 --- a/assets/yaml/us/rev1/ast_area_6.yaml +++ b/assets/yaml/us/rev1/ast_area_6.yaml @@ -57,8 +57,8 @@ D_A6_6009718: D_A6_6009B18: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06009B18, symbol: D_A6_6009B18 } -D_A6_600E0C0: - { type: GFX, offset: 0x600E0C0, symbol: D_A6_600E0C0 } +aA6UmbraStationDL: + { type: GFX, offset: 0x600E0C0, symbol: aA6UmbraStationDL } D_A6_600EBE8: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 16, offset: 0x0600EBE8, symbol: D_A6_600EBE8 } @@ -96,8 +96,8 @@ D_A6_6012550: D_A6_6012840: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06012840, symbol: D_A6_6012840 } -D_A6_6012A40: - { type: GFX, offset: 0x6012A40, symbol: D_A6_6012A40 } +aA6HarlockFrigateDL: + { type: GFX, offset: 0x6012A40, symbol: aA6HarlockFrigateDL } D_A6_6013CD8: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06013CD8, symbol: D_A6_6013CD8 } @@ -117,8 +117,8 @@ D_A6_6015CD8: D_A6_6015EE0: { type: GFX, offset: 0x6015EE0, symbol: D_A6_6015EE0 } -D_A6_6016190: - { type: GFX, offset: 0x6016190, symbol: D_A6_6016190 } +aA6ZeramClassCruiserDL: + { type: GFX, offset: 0x6016190, symbol: aA6ZeramClassCruiserDL } D_A6_6017120: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06017120, symbol: D_A6_6017120 } @@ -150,8 +150,8 @@ D_A6_6018994: D_A6_6018BA0: { type: SF64:SKELETON, offset: 0x6018BA0, symbol: D_A6_6018BA0 } -D_A6_6018BF0: - { type: GFX, offset: 0x6018BF0, symbol: D_A6_6018BF0 } +aA6NinjinMissileDL: + { type: GFX, offset: 0x6018BF0, symbol: aA6NinjinMissileDL } D_A6_6019130: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06019130, symbol: D_A6_6019130 } @@ -162,8 +162,8 @@ D_A6_6019330: D_A6_6019530: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06019530, symbol: D_A6_6019530 } -D_A6_6019730: - { type: GFX, offset: 0x6019730, symbol: D_A6_6019730 } +aA6RocketDL: + { type: GFX, offset: 0x6019730, symbol: aA6RocketDL } D_A6_6019B20: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06019B20, symbol: D_A6_6019B20 } @@ -174,8 +174,8 @@ D_A6_6019D20: D_A6_6019F20: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06019F20, symbol: D_A6_6019F20 } -D_A6_601A120: - { type: GFX, offset: 0x601A120, symbol: D_A6_601A120 } +aA6SpaceMineDL: + { type: GFX, offset: 0x601A120, symbol: aA6SpaceMineDL } D_A6_601A220: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0601A220, symbol: D_A6_601A220 } @@ -228,14 +228,14 @@ D_A6_6023F64: D_A6_6027F50: { type: SF64:SCRIPT, offset: 0x6027F50, symbol: D_A6_6027F50} -D_A6_60280E0: - { type: SF64:HITBOX, offset: 0x60280E0, symbol: D_A6_60280E0 } +aA6UmbraStationHitbox: + { type: SF64:HITBOX, offset: 0x60280E0, symbol: aA6UmbraStationHitbox } -D_A6_6028254: - { type: SF64:HITBOX, offset: 0x6028254, symbol: D_A6_6028254 } +aA6HarlockFrigateHitbox: + { type: SF64:HITBOX, offset: 0x6028254, symbol: aA6HarlockFrigateHitbox } -D_A6_60282A0: - { type: SF64:HITBOX, offset: 0x60282A0, symbol: D_A6_60282A0 } +aA6ZeramClassCruiserHitbox: + { type: SF64:HITBOX, offset: 0x60282A0, symbol: aA6ZeramClassCruiserHitbox } aA6GorgonHitbox: { type: SF64:HITBOX, offset: 0x6028454, symbol: aA6GorgonHitbox } diff --git a/assets/yaml/us/rev1/ast_common.yaml b/assets/yaml/us/rev1/ast_common.yaml index 81a615f3..3372ef0e 100644 --- a/assets/yaml/us/rev1/ast_common.yaml +++ b/assets/yaml/us/rev1/ast_common.yaml @@ -980,8 +980,8 @@ D_1031EC0: D_1032578: { type: TEXTURE, format: RGBA16, width: 16, height: 16, ctype: u16, offset: 0x1032578, symbol: D_1032578 } -D_1032780: - { type: GFX, offset: 0x1032780, symbol: D_1032780 } +aArwingShadowDL: + { type: GFX, offset: 0x1032780, symbol: aArwingShadowDL } D_1032808: { type: TEXTURE, format: IA8, width: 32, height: 32, ctype: u8, offset: 0x1032808, symbol: D_1032808 } diff --git a/assets/yaml/us/rev1/ast_corneria.yaml b/assets/yaml/us/rev1/ast_corneria.yaml index 424a0f8c..2cc6ece2 100644 --- a/assets/yaml/us/rev1/ast_corneria.yaml +++ b/assets/yaml/us/rev1/ast_corneria.yaml @@ -111,8 +111,8 @@ aCoHighway5DL: D_CO_6011790: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06011790, symbol: D_CO_6011790 } -D_CO_6011F90: - { type: GFX, offset: 0x6011F90, symbol: D_CO_6011F90 } +aCoCornerianFighterDL: + { type: GFX, offset: 0x6011F90, symbol: aCoCornerianFighterDL } D_CO_6012640: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06012640, symbol: D_CO_6012640 } diff --git a/assets/yaml/us/rev1/ast_enmy_planet.yaml b/assets/yaml/us/rev1/ast_enmy_planet.yaml index 9ea49f50..e74507f8 100644 --- a/assets/yaml/us/rev1/ast_enmy_planet.yaml +++ b/assets/yaml/us/rev1/ast_enmy_planet.yaml @@ -15,14 +15,14 @@ D_ENMY_PLANET_4000290: ast_enmy_planet_seg4_vtx_8F8: { type: VTX, count: 90, offset: 0x40008F8, symbol: ast_enmy_planet_seg4_vtx_8F8 } -D_ENMY_PLANET_40001A4: - { type: SF64:ANIM, offset: 0x40001A4, symbol: D_ENMY_PLANET_40001A4 } +aTripodAnim: + { type: SF64:ANIM, offset: 0x40001A4, symbol: aTripodAnim } -D_ENMY_PLANET_4000270: - { type: SF64:SKELETON, offset: 0x4000270, symbol: D_ENMY_PLANET_4000270 } +aTripodSkel: + { type: SF64:SKELETON, offset: 0x4000270, symbol: aTripodSkel } -D_ENMY_PLANET_4000710: - { type: GFX, offset: 0x4000710, symbol: D_ENMY_PLANET_4000710 } +aVenomTankDL: + { type: GFX, offset: 0x4000710, symbol: aVenomTankDL } D_ENMY_PLANET_4001298: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x04001298, symbol: D_ENMY_PLANET_4001298 } @@ -60,11 +60,11 @@ D_ENMY_PLANET_4004538: D_ENMY_PLANET_4004D38: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x04004D38, symbol: D_ENMY_PLANET_4004D38 } -D_ENMY_PLANET_40057AC: - { type: SF64:ANIM, offset: 0x40057AC, symbol: D_ENMY_PLANET_40057AC } +aFirebirdAnim: + { type: SF64:ANIM, offset: 0x40057AC, symbol: aFirebirdAnim } -D_ENMY_PLANET_40058B8: - { type: SF64:SKELETON, offset: 0x40058B8, symbol: D_ENMY_PLANET_40058B8 } +aFirebirdSkel: + { type: SF64:SKELETON, offset: 0x40058B8, symbol: aFirebirdSkel } D_ENMY_PLANET_4005E78: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x04005E78, symbol: D_ENMY_PLANET_4005E78 } @@ -81,17 +81,17 @@ D_ENMY_PLANET_40064E8: D_ENMY_PLANET_40066E8: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x040066E8, symbol: D_ENMY_PLANET_40066E8 } -D_ENMY_PLANET_40068F0: - { type: GFX, offset: 0x40068F0, symbol: D_ENMY_PLANET_40068F0 } +aVenomFighter1DL: + { type: GFX, offset: 0x40068F0, symbol: aVenomFighter1DL } -D_ENMY_PLANET_4006E90: - { type: GFX, offset: 0x4006E90, symbol: D_ENMY_PLANET_4006E90 } +aVenomFighter2DL: + { type: GFX, offset: 0x4006E90, symbol: aVenomFighter2DL } -D_ENMY_PLANET_40073C0: - { type: GFX, offset: 0x40073C0, symbol: D_ENMY_PLANET_40073C0 } +aGrangaFighter1DL: + { type: GFX, offset: 0x40073C0, symbol: aGrangaFighter1DL } -D_ENMY_PLANET_4007AF0: - { type: GFX, offset: 0x4007AF0, symbol: D_ENMY_PLANET_4007AF0 } +aGrangaFighter2DL: + { type: GFX, offset: 0x4007AF0, symbol: aGrangaFighter2DL } D_ENMY_PLANET_4008100: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x04008100, symbol: D_ENMY_PLANET_4008100 } @@ -108,5 +108,5 @@ D_ENMY_PLANET_4008FF8: D_ENMY_PLANET_4008F70: { type: GFX, offset: 0x4008F70, symbol: D_ENMY_PLANET_4008F70 } -D_ENMY_PLANET_4009800: - { type: GFX, offset: 0x4009800, symbol: D_ENMY_PLANET_4009800 } +aSpyEyeDL: + { type: GFX, offset: 0x4009800, symbol: aSpyEyeDL } diff --git a/assets/yaml/us/rev1/ast_enmy_space.yaml b/assets/yaml/us/rev1/ast_enmy_space.yaml index 0b4663af..959efde9 100644 --- a/assets/yaml/us/rev1/ast_enmy_space.yaml +++ b/assets/yaml/us/rev1/ast_enmy_space.yaml @@ -8,26 +8,26 @@ - '#include "gfx.h"' - '#include "sf64object.h"' -D_ENMY_SPACE_4000080: - { type: SF64:ANIM, offset: 0x4000080, symbol: D_ENMY_SPACE_4000080 } +aKillerBeeAnim: + { type: SF64:ANIM, offset: 0x4000080, symbol: aKillerBeeAnim } -D_ENMY_SPACE_400014C: - { type: SF64:SKELETON, offset: 0x400014C, symbol: D_ENMY_SPACE_400014C } +aKillerBeeSkel: + { type: SF64:SKELETON, offset: 0x400014C, symbol: aKillerBeeSkel } aEnmySpMeMora1DL: { type: GFX, offset: 0x4000170, symbol: aEnmySpMeMora1DL } -D_ENMY_SPACE_4000650: - { type: GFX, offset: 0x4000650, symbol: D_ENMY_SPACE_4000650 } +aSpiderDL: + { type: GFX, offset: 0x4000650, symbol: aSpiderDL } -D_ENMY_SPACE_4000EC0: - { type: GFX, offset: 0x4000EC0, symbol: D_ENMY_SPACE_4000EC0 } +aGammaOnDL: + { type: GFX, offset: 0x4000EC0, symbol: aGammaOnDL } D_ENMY_SPACE_4001108: { type: TEXTURE, format: RGBA16, offset: 0x4001108, width: 16, height: 16, ctype: u16, symbol: D_ENMY_SPACE_4001108 } -D_ENMY_SPACE_4001310: - { type: GFX, offset: 0x4001310, symbol: D_ENMY_SPACE_4001310 } +aAttacker2DL: + { type: GFX, offset: 0x4001310, symbol: aAttacker2DL } D_ENMY_SPACE_4001A30: { type: TEXTURE, format: RGBA16, offset: 0x4001A30, width: 16, height: 16, ctype: u16, symbol: D_ENMY_SPACE_4001A30 } @@ -95,11 +95,11 @@ aEnmySpMeMora2DL: D_ENMY_SPACE_4008550: { type: TEXTURE, format: RGBA16, offset: 0x04008550, width: 32, height: 32, ctype: u16, symbol: D_ENMY_SPACE_4008550 } -D_ENMY_SPACE_4008D50: - { type: GFX, offset: 0x4008D50, symbol: D_ENMY_SPACE_4008D50 } +aGammaOffDL: + { type: GFX, offset: 0x4008D50, symbol: aGammaOffDL } -D_ENMY_SPACE_4008FA0: - { type: GFX, offset: 0x4008FA0, symbol: D_ENMY_SPACE_4008FA0 } +aVenomFighter3DL: + { type: GFX, offset: 0x4008FA0, symbol: aVenomFighter3DL } D_ENMY_SPACE_40096B8: { type: TEXTURE, format: RGBA16, offset: 0x040096B8, width: 16, height: 16, ctype: u16, symbol: D_ENMY_SPACE_40096B8 } @@ -110,25 +110,25 @@ D_ENMY_SPACE_40098B8: D_ENMY_SPACE_4009AB8: { type: TEXTURE, format: RGBA16, offset: 0x04009AB8, width: 32, height: 32, ctype: u16, symbol: D_ENMY_SPACE_4009AB8 } -D_ENMY_SPACE_400A30C: - { type: SF64:ANIM, offset: 0x400A30C, symbol: D_ENMY_SPACE_400A30C } +aCruiserGunAnim: + { type: SF64:ANIM, offset: 0x400A30C, symbol: aCruiserGunAnim } -D_ENMY_SPACE_400A398: - { type: SF64:SKELETON, offset: 0x400A398, symbol: D_ENMY_SPACE_400A398 } +aCruiserGunSkel: + { type: SF64:SKELETON, offset: 0x400A398, symbol: aCruiserGunSkel } aEnmySpMeMora3DL: { type: GFX, offset: 0x400A630, symbol: aEnmySpMeMora3DL } -D_ENMY_SPACE_400AAE0: - { type: GFX, offset: 0x400AAE0, symbol: D_ENMY_SPACE_400AAE0 } +aCommanderDL: + { type: GFX, offset: 0x400AAE0, symbol: aCommanderDL } -D_ENMY_SPACE_400B390: - { type: GFX, offset: 0x400B390, symbol: D_ENMY_SPACE_400B390 } +aAttacker3DL: + { type: GFX, offset: 0x400B390, symbol: aAttacker3DL } -D_ENMY_SPACE_400BD20: - { type: GFX, offset: 0x400BD20, symbol: D_ENMY_SPACE_400BD20 } +aAttacker1DL: + { type: GFX, offset: 0x400BD20, symbol: aAttacker1DL } # size = 0xC510
\ No newline at end of file diff --git a/assets/yaml/us/rev1/ast_fortuna.yaml b/assets/yaml/us/rev1/ast_fortuna.yaml index 81adb759..9c931460 100644 --- a/assets/yaml/us/rev1/ast_fortuna.yaml +++ b/assets/yaml/us/rev1/ast_fortuna.yaml @@ -110,8 +110,8 @@ D_FO_6008150: D_FO_6009070: { type: TEXTURE, format: RGBA16, width: 44, height: 44, offset: 0x6009070, ctype: u16, symbol: D_FO_6009070 } -D_FO_6009F90: - { type: GFX, offset: 0x6009F90, symbol: D_FO_6009F90 } +aFoEnemyShadowDL: + { type: GFX, offset: 0x6009F90, symbol: aFoEnemyShadowDL } D_FO_600A018: { type: TEXTURE, format: IA8, width: 32, height: 32, offset: 0x600A018, ctype: u8, symbol: D_FO_600A018 } diff --git a/assets/yaml/us/rev1/ast_katina.yaml b/assets/yaml/us/rev1/ast_katina.yaml index 6198381e..7a1a7729 100644 --- a/assets/yaml/us/rev1/ast_katina.yaml +++ b/assets/yaml/us/rev1/ast_katina.yaml @@ -109,14 +109,14 @@ aDestroyedHatch4DL: aDestroyedHatch3DL: { type: GFX, offset: 0x600D4E0, symbol: aDestroyedHatch3DL } -D_KA_600D730: - { type: GFX, offset: 0x600D730, symbol: D_KA_600D730 } +aKaCornerianFighterShadowDL: + { type: GFX, offset: 0x600D730, symbol: aKaCornerianFighterShadowDL } D_KA_600D7B8: { type: TEXTURE, format: IA8, width: 32, height: 32, offset: 0x600D7B8, ctype: u8, symbol: D_KA_600D7B8 } -D_KA_600DBC0: - { type: GFX, offset: 0x600DBC0, symbol: D_KA_600DBC0 } +aKaEnemyShadowDL: + { type: GFX, offset: 0x600DBC0, symbol: aKaEnemyShadowDL } D_KA_600DC48: { type: TEXTURE, format: IA8, width: 32, height: 32, offset: 0x600DC48, ctype: u8, symbol: D_KA_600DC48 } diff --git a/assets/yaml/us/rev1/ast_macbeth.yaml b/assets/yaml/us/rev1/ast_macbeth.yaml index 771ccfef..6f435c7b 100644 --- a/assets/yaml/us/rev1/ast_macbeth.yaml +++ b/assets/yaml/us/rev1/ast_macbeth.yaml @@ -61,8 +61,8 @@ D_MA_60026F8: D_MA_60027F8: { type: TEXTURE, format: TLUT, ctype: u16, colors: 72, offset: 0x60027F8, symbol: D_MA_60027F8} -D_MA_6002890: - {type: GFX, offset: 0x6002890, symbol: D_MA_6002890} +aMaGuillotine2DL: + {type: GFX, offset: 0x6002890, symbol: aMaGuillotine2DL} D_MA_6002C20: { type: TEXTURE, format: CI8, ctype: u8, width: 32, height: 16, offset: 0x6002C20, symbol: D_MA_6002C20, tlut: 0x6002E20} @@ -238,8 +238,8 @@ D_MA_600AE18: D_MA_600AE98: { type: TEXTURE, format: TLUT, ctype: u16, colors: 80, offset: 0x600AE98, symbol: D_MA_600AE98} -aMaGuillotineDL: - {type: GFX, offset: 0x600AF40, symbol: aMaGuillotineDL} +aMaGuillotine1DL: + {type: GFX, offset: 0x600AF40, symbol: aMaGuillotine1DL} D_MA_600B2E0: { type: TEXTURE, format: RGBA16, ctype: u16, width: 32, height: 64, offset: 0x600B2E0, symbol: D_MA_600B2E0} @@ -274,8 +274,8 @@ D_MA_600D878: D_MA_600D978: { type: TEXTURE, format: TLUT, ctype: u16, colors: 72, offset: 0x600D978, symbol: D_MA_600D978} -D_MA_600DA10: - {type: GFX, offset: 0x600DA10, symbol: D_MA_600DA10} +aMaLaserTurretDL: + {type: GFX, offset: 0x600DA10, symbol: aMaLaserTurretDL} D_MA_600DF60: { type: TEXTURE, format: CI8, ctype: u8, width: 32, height: 32, offset: 0x600DF60, symbol: D_MA_600DF60, tlut: 0x600E360} @@ -478,8 +478,8 @@ aMaTowerTopDL: D_MA_601C170: {type: GFX, offset: 0x601C170, symbol: D_MA_601C170} -D_MA_601C520: - {type: GFX, offset: 0x601C520, symbol: D_MA_601C520} +aMaRailroadCartDL: + {type: GFX, offset: 0x601C520, symbol: aMaRailroadCartDL} D_MA_601D188: {type: SF64:ANIM, offset: 0x601D188, symbol: D_MA_601D188} @@ -922,8 +922,8 @@ aMaGuillotineHousingHitbox: aMaGuillotineHitbox: {type: SF64:HITBOX, offset: 0x60368E0, symbol: aMaGuillotineHitbox} -D_MA_60368FC: - {type: SF64:HITBOX, offset: 0x60368FC, symbol: D_MA_60368FC} +aMaRailroadCartHitbox: + {type: SF64:HITBOX, offset: 0x60368FC, symbol: aMaRailroadCartHitbox} aMaBombDropHitbox: {type: SF64:HITBOX, offset: 0x6036930, symbol: aMaBombDropHitbox} diff --git a/assets/yaml/us/rev1/ast_map.yaml b/assets/yaml/us/rev1/ast_map.yaml index a77becb0..d920225d 100644 --- a/assets/yaml/us/rev1/ast_map.yaml +++ b/assets/yaml/us/rev1/ast_map.yaml @@ -412,8 +412,8 @@ D_MAP_604A8D8: { type: TEXTURE, ctype: u16, format: TLUT, colors: 136, offset: 0x0604A8D8, symbol: D_MAP_604A8D8 } # Arwing Model, used in the map. -D_MAP_604A9F0: - { type: GFX, offset: 0x604A9F0, symbol: D_MAP_604A9F0 } +aMapArwingDL: + { type: GFX, offset: 0x604A9F0, symbol: aMapArwingDL } ast_map_seg6_vtx_4AD50: { type: VTX, offset: 0x604AD50, count: 124, symbol: ast_map_seg6_vtx_4AD50 } diff --git a/assets/yaml/us/rev1/ast_meteo.yaml b/assets/yaml/us/rev1/ast_meteo.yaml index 88d29573..9d364b6b 100644 --- a/assets/yaml/us/rev1/ast_meteo.yaml +++ b/assets/yaml/us/rev1/ast_meteo.yaml @@ -62,8 +62,8 @@ D_ME_60080C0: D_ME_6008A18: { type: TEXTURE, ctype: u16, format: RGBA16, width: 8, height: 8, offset: 0x06008A18, symbol: D_ME_6008A18 } -D_ME_6008AA0: - { type: GFX, offset: 0x6008AA0, symbol: D_ME_6008AA0 } +aMeFlipBot1DL: + { type: GFX, offset: 0x6008AA0, symbol: aMeFlipBot1DL } D_ME_6009228: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06009228, symbol: D_ME_6009228 } @@ -74,35 +74,35 @@ D_ME_6009A28: D_ME_6009C28: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06009C28, symbol: D_ME_6009C28 } -D_ME_6009E30: - { type: GFX, offset: 0x6009E30, symbol: D_ME_6009E30 } +aMeFlipBot2DL: + { type: GFX, offset: 0x6009E30, symbol: aMeFlipBot2DL } -D_ME_6009F50: - { type: GFX, offset: 0x6009F50, symbol: D_ME_6009F50 } +aMeBigMeteorDL: + { type: GFX, offset: 0x6009F50, symbol: aMeBigMeteorDL } -D_ME_600AC70: - { type: GFX, offset: 0x600AC70, symbol: D_ME_600AC70 } +aMeMeteor7DL: + { type: GFX, offset: 0x600AC70, symbol: aMeMeteor7DL } D_ME_600B540: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0600B540, symbol: D_ME_600B540 } -D_ME_600BD40: - { type: GFX, offset: 0x600BD40, symbol: D_ME_600BD40 } +aMeSecretMarker2DL: + { type: GFX, offset: 0x600BD40, symbol: aMeSecretMarker2DL } D_ME_600BF30: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x0600BF30, symbol: D_ME_600BF30 } -D_ME_600C130: - { type: GFX, offset: 0x600C130, symbol: D_ME_600C130 } +aMeRockGull2DL: + { type: GFX, offset: 0x600C130, symbol: aMeRockGull2DL } -D_ME_600C2A0: - { type: GFX, offset: 0x600C2A0, symbol: D_ME_600C2A0 } +aMeMeteor6DL: + { type: GFX, offset: 0x600C2A0, symbol: aMeMeteor6DL } -D_ME_600C740: - { type: GFX, offset: 0x600C740, symbol: D_ME_600C740 } +aMeRockGull3DL: + { type: GFX, offset: 0x600C740, symbol: aMeRockGull3DL } -D_ME_600CAA0: - { type: GFX, offset: 0x600CAA0, symbol: D_ME_600CAA0 } +aMeRockGull1DL: + { type: GFX, offset: 0x600CAA0, symbol: aMeRockGull1DL } aMeMeteorShower3DL: { type: GFX, offset: 0x600CD60, symbol: aMeMeteorShower3DL } @@ -149,20 +149,20 @@ D_ME_60172C8: aMeMeteorShower1DL: { type: GFX, offset: 0x06017AD0, symbol: aMeMeteorShower1DL } -D_ME_6017B60: - { type: GFX, offset: 0x06017B60, symbol: D_ME_6017B60 } +aMeMeteor3DL: + { type: GFX, offset: 0x06017B60, symbol: aMeMeteor3DL } aMeLaserCannon2DL: { type: GFX, offset: 0x06018450, symbol: aMeLaserCannon2DL } -D_ME_6018960: - { type: GFX, offset: 0x06018960, symbol: D_ME_6018960 } +aMeMeteor5DL: + { type: GFX, offset: 0x06018960, symbol: aMeMeteor5DL } -aMeMeteorDL: - { type: GFX, offset: 0x06018C00, symbol: aMeMeteorDL } +aMeMeteor1DL: + { type: GFX, offset: 0x06018C00, symbol: aMeMeteor1DL } -D_ME_6019430: - { type: GFX, offset: 0x06019430, symbol: D_ME_6019430 } +aMeMeteor4DL: + { type: GFX, offset: 0x06019430, symbol: aMeMeteor4DL } D_ME_6019880: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06019880, symbol: D_ME_6019880 } @@ -170,8 +170,8 @@ D_ME_6019880: D_ME_601A080: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0601A080, symbol: D_ME_601A080 } -D_ME_601A880: - { type: GFX, offset: 0x0601A880, symbol: D_ME_601A880 } +aMeSecretMarker1DL: + { type: GFX, offset: 0x0601A880, symbol: aMeSecretMarker1DL } aMeMeteoTunnelDL: { type: GFX, offset: 0x0601AE40, symbol: aMeMeteoTunnelDL } @@ -195,8 +195,8 @@ D_ME_601EA00: D_ME_601EA98: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0601EA98, symbol: D_ME_601EA98 } -D_ME_601F2A0: - { type: GFX, offset: 0x0601F2A0, symbol: D_ME_601F2A0 } +aMeMeteor2DL: + { type: GFX, offset: 0x0601F2A0, symbol: aMeMeteor2DL } D_ME_601F778: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0601F778, symbol: D_ME_601F778 } @@ -280,8 +280,8 @@ D_ME_602B148: D_ME_602F3AC: { type: SF64:SCRIPT, offset: 0x602F3AC, symbol: D_ME_602F3AC } -D_ME_602F604: - { type: SF64:HITBOX, offset: 0x602F604, symbol: D_ME_602F604 } +aMeFlipBotHitbox: + { type: SF64:HITBOX, offset: 0x602F604, symbol: aMeFlipBotHitbox } D_ME_602F638: { type: SF64:HITBOX, offset: 0x602F638, symbol: D_ME_602F638 } diff --git a/assets/yaml/us/rev1/ast_sector_x.yaml b/assets/yaml/us/rev1/ast_sector_x.yaml index 9faf8795..e36aea16 100644 --- a/assets/yaml/us/rev1/ast_sector_x.yaml +++ b/assets/yaml/us/rev1/ast_sector_x.yaml @@ -16,8 +16,8 @@ D_SX_6000000: { type: TEXTURE, ctype: u8, format: IA8, width: 176, height: 12, offset: 0x6000000, symbol: D_SX_6000000 } -D_SX_6000840: - { type: GFX, offset: 0x6000840, symbol: D_SX_6000840 } +aSxSpaceMineDL: + { type: GFX, offset: 0x6000840, symbol: aSxSpaceMineDL } # Flying mine D_SX_60008C0: @@ -30,14 +30,14 @@ D_SX_60010C0: D_SX_6001150: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6001150, symbol: D_SX_6001150 } -D_SX_6001950: - { type: GFX, offset: 0x6001950, symbol: D_SX_6001950 } +aSxLaserDestroyedDL: + { type: GFX, offset: 0x6001950, symbol: aSxLaserDestroyedDL } D_SX_6001AD8: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x6001AD8, symbol: D_SX_6001AD8 } -D_SX_6001CE0: - { type: GFX, offset: 0x6001CE0, symbol: D_SX_6001CE0 } +aSxWatchPostDL: + { type: GFX, offset: 0x6001CE0, symbol: aSxWatchPostDL } D_SX_60020C0: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x60020C0, symbol: D_SX_60020C0 } @@ -75,8 +75,8 @@ D_SX_6004EE8: D_SX_6005EE8: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6005EE8, symbol: D_SX_6005EE8 } -D_SX_60066F0: - { type: GFX, offset: 0x60066F0, symbol: D_SX_60066F0 } +aSxLaserDL: + { type: GFX, offset: 0x60066F0, symbol: aSxLaserDL } D_SX_6006810: { type: GFX, offset: 0x6006810, symbol: D_SX_6006810 } @@ -102,8 +102,8 @@ D_SX_6009548: D_SX_6009748: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x6009748, symbol: D_SX_6009748 } -D_SX_6009950: - { type: GFX, offset: 0x6009950, symbol: D_SX_6009950 } +aSxBaseFloor1DL: + { type: GFX, offset: 0x6009950, symbol: aSxBaseFloor1DL } D_SX_6009C30: { type: GFX, offset: 0x6009C30, symbol: D_SX_6009C30 } @@ -117,8 +117,8 @@ D_SX_6009FF8: D_SX_600A2D4: { type: SF64:ANIM, offset: 0x600A2D4, symbol: D_SX_600A2D4 } -D_SX_600A2E0: - { type: GFX, offset: 0x600A2E0, symbol: D_SX_600A2E0 } +aSxBaseWall3DL: + { type: GFX, offset: 0x600A2E0, symbol: aSxBaseWall3DL } D_SX_600A570: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x600A570, symbol: D_SX_600A570 } @@ -126,17 +126,17 @@ D_SX_600A570: D_SX_600AD70: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x600AD70, symbol: D_SX_600AD70 } -D_SX_600AF70: - { type: GFX, offset: 0x600AF70, symbol: D_SX_600AF70 } +aSxBaseWall1DL: + { type: GFX, offset: 0x600AF70, symbol: aSxBaseWall1DL } -D_SX_600B2B0: - { type: GFX, offset: 0x600B2B0, symbol: D_SX_600B2B0 } +aSxBaseWall2DL: + { type: GFX, offset: 0x600B2B0, symbol: aSxBaseWall2DL } -D_SX_600B540: - { type: GFX, offset: 0x600B540, symbol: D_SX_600B540 } +aSxBaseWall4DL: + { type: GFX, offset: 0x600B540, symbol: aSxBaseWall4DL } -D_SX_600B830: - { type: GFX, offset: 0x600B830, symbol: D_SX_600B830 } +aSxBorzoiFighterDL: + { type: GFX, offset: 0x600B830, symbol: aSxBorzoiFighterDL } D_SX_600C000: { type: GFX, offset: 0x600C000, symbol: D_SX_600C000 } @@ -189,8 +189,8 @@ D_SX_60206DC: aSxSpyborgSkel: { type: SF64:SKELETON, offset: 0x6020C68, symbol: aSxSpyborgSkel } -D_SX_6020D20: - { type: GFX, offset: 0x6020D20, symbol: D_SX_6020D20 } +aSxBaseWallTile1DL: + { type: GFX, offset: 0x6020D20, symbol: aSxBaseWallTile1DL } # Spyborg Radio D_SX_6020FB0: @@ -199,20 +199,20 @@ D_SX_6020FB0: D_SX_6021ED0: { type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0x06021ED0, symbol: D_SX_6021ED0 } -D_SX_6022DF0: - { type: GFX, offset: 0x6022DF0, symbol: D_SX_6022DF0 } +aSxCanineDL: + { type: GFX, offset: 0x6022DF0, symbol: aSxCanineDL } -D_SX_6023500: - { type: GFX, offset: 0x6023500, symbol: D_SX_6023500 } +aSxSpyEyeDL: + { type: GFX, offset: 0x6023500, symbol: aSxSpyEyeDL } D_SX_6023C30: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06023C30, symbol: D_SX_6023C30 } -D_SX_6023E30: - { type: GFX, offset: 0x6023E30, symbol: D_SX_6023E30 } +aSxBaseDebris2DL: + { type: GFX, offset: 0x6023E30, symbol: aSxBaseDebris2DL } -D_SX_60285F0: - { type: GFX, offset: 0x60285F0, symbol: D_SX_60285F0 } +aSxBaseDebris1DL: + { type: GFX, offset: 0x60285F0, symbol: aSxBaseDebris1DL } D_SX_6029098: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06029098, symbol: D_SX_6029098 } @@ -241,8 +241,8 @@ D_SX_60320D0: D_SX_6032328: { type: SF64:HITBOX, offset: 0x6032328, symbol: D_SX_6032328 } -D_SX_603238C: - { type: SF64:HITBOX, offset: 0x603238C, symbol: D_SX_603238C } +aSxWarpGateHitbox: + { type: SF64:HITBOX, offset: 0x603238C, symbol: aSxWarpGateHitbox } D_SX_6032408: { type: SF64:HITBOX, offset: 0x6032408, symbol: D_SX_6032408 } @@ -256,20 +256,20 @@ aSxSpyborgRightArmHitbox: aSxSpyborgHitbox: { type: SF64:HITBOX, offset: 0x6032550, symbol: aSxSpyborgHitbox } -D_SX_603285C: - { type: SF64:HITBOX, offset: 0x603285C, symbol: D_SX_603285C } +aSxLaserHitbox: + { type: SF64:HITBOX, offset: 0x603285C, symbol: aSxLaserHitbox } -D_SX_6032878: - { type: SF64:HITBOX, offset: 0x6032878, symbol: D_SX_6032878 } +aSxBaseFloor1Hitbox: + { type: SF64:HITBOX, offset: 0x6032878, symbol: aSxBaseFloor1Hitbox } -D_SX_6032894: - { type: SF64:HITBOX, offset: 0x6032894, symbol: D_SX_6032894 } +aSxBaseWall2Hitbox: + { type: SF64:HITBOX, offset: 0x6032894, symbol: aSxBaseWall2Hitbox } -D_SX_60328B0: - { type: SF64:HITBOX, offset: 0x60328B0, symbol: D_SX_60328B0 } +aSxBaseWall3Hitbox: + { type: SF64:HITBOX, offset: 0x60328B0, symbol: aSxBaseWall3Hitbox } -D_SX_60328CC: - { type: SF64:HITBOX, offset: 0x60328CC, symbol: D_SX_60328CC } +aSxBaseWallTile1Hitbox: + { type: SF64:HITBOX, offset: 0x60328CC, symbol: aSxBaseWallTile1Hitbox } D_SX_603265C: { type: SF64:HITBOX, offset: 0x603265C, symbol: D_SX_603265C } @@ -277,22 +277,22 @@ D_SX_603265C: D_SX_6032768: { type: SF64:HITBOX, offset: 0x6032768, symbol: D_SX_6032768 } -D_SX_60328E8: - { type: SF64:HITBOX, offset: 0x60328E8, symbol: D_SX_60328E8 } +aSxBaseWall4Hitbox: + { type: SF64:HITBOX, offset: 0x60328E8, symbol: aSxBaseWall4Hitbox } -D_SX_6032904: - { type: SF64:HITBOX, offset: 0x6032904, symbol: D_SX_6032904 } +aSxBaseWall1Hitbox: + { type: SF64:HITBOX, offset: 0x6032904, symbol: aSxBaseWall1Hitbox } -D_SX_6032938: - { type: SF64:HITBOX, offset: 0x6032938, symbol: D_SX_6032938 } +aSxWatchPostHitbox: + { type: SF64:HITBOX, offset: 0x6032938, symbol: aSxWatchPostHitbox } -D_SX_6032954: - { type: SF64:HITBOX, offset: 0x6032954, symbol: D_SX_6032954 } +aSxSpaceMineHitbox: + { type: SF64:HITBOX, offset: 0x6032954, symbol: aSxSpaceMineHitbox } -D_SX_6032970: - { type: SF64:HITBOX, offset: 0x6032970, symbol: D_SX_6032970 } +aSxBaseDebris2Hitbox: + { type: SF64:HITBOX, offset: 0x6032970, symbol: aSxBaseDebris2Hitbox } -D_SX_603298C: - { type: SF64:HITBOX, offset: 0x603298C, symbol: D_SX_603298C } +aSxBaseDebris1Hitbox: + { type: SF64:HITBOX, offset: 0x603298C, symbol: aSxBaseDebris1Hitbox } # size = 0x32AC0
\ No newline at end of file diff --git a/assets/yaml/us/rev1/ast_sector_y.yaml b/assets/yaml/us/rev1/ast_sector_y.yaml index 3e107fe7..3039dccc 100644 --- a/assets/yaml/us/rev1/ast_sector_y.yaml +++ b/assets/yaml/us/rev1/ast_sector_y.yaml @@ -116,11 +116,11 @@ D_SY_60119D8: D_SY_60132A0: { type: GFX, offset: 0x60132A0, symbol: D_SY_60132A0 } -D_SY_6015D60: - { type: GFX, offset: 0x6015D60, symbol: D_SY_6015D60 } +aSyRobot4DL: + { type: GFX, offset: 0x6015D60, symbol: aSyRobot4DL } -D_SY_601F3D0: - { type: GFX, offset: 0x601F3D0, symbol: D_SY_601F3D0 } +aSySaruzinDL: + { type: GFX, offset: 0x601F3D0, symbol: aSySaruzinDL } D_SY_60121E0: { type: GFX, offset: 0x60121E0, symbol: D_SY_60121E0 } @@ -158,8 +158,8 @@ D_SY_6015960: D_SY_6015B60: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06015B60, symbol: D_SY_6015B60 } -aSyShipProjectileDL: - { type: GFX, offset: 0x60188D0, symbol: aSyShipProjectileDL } +aSyShipMissileDL: + { type: GFX, offset: 0x60188D0, symbol: aSyShipMissileDL } D_SY_60183B0: { type: GFX, offset: 0x60183B0, symbol: D_SY_60183B0 } @@ -170,8 +170,8 @@ D_SY_6018F30: D_SY_6019E50: { type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0x06019E50, symbol: D_SY_6019E50 } -D_SY_601AD70: - { type: GFX, offset: 0x601AD70, symbol: D_SY_601AD70 } +aSyDebrisDL: + { type: GFX, offset: 0x601AD70, symbol: aSyDebrisDL } D_SY_601AE08: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0601AE08, symbol: D_SY_601AE08 } @@ -194,11 +194,11 @@ aSyShip2DL: D_SY_601F3B8: { type: SF64:ANIM, offset: 0x601F3B8, symbol: D_SY_601F3B8 } -D_SY_60205D0: - { type: GFX, offset: 0x60205D0, symbol: D_SY_60205D0 } +aSyLaserTurretDL: + { type: GFX, offset: 0x60205D0, symbol: aSyLaserTurretDL } -D_SY_60209F0: - { type: GFX, offset: 0x60209F0, symbol: D_SY_60209F0 } +aSyRobotSpriteFrontDL: + { type: GFX, offset: 0x60209F0, symbol: aSyRobotSpriteFrontDL } D_SY_6020B08: { type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x06020B08, symbol: D_SY_6020B08 } @@ -206,8 +206,8 @@ D_SY_6020B08: D_SY_6021B08: { type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x06021B08, symbol: D_SY_6021B08 } -D_SY_6022B10: - { type: GFX, offset: 0x6022B10, symbol: D_SY_6022B10 } +aSyRobotSpriteSideDL: + { type: GFX, offset: 0x6022B10, symbol: aSyRobotSpriteSideDL } D_SY_6022C28: { type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x06022C28, symbol: D_SY_6022C28 } @@ -314,8 +314,8 @@ aSyRobotHitbox: D_SY_60340C0: { type: SF64:HITBOX, offset: 0x60340C0, symbol: D_SY_60340C0 } -D_SY_6034124: - { type: SF64:HITBOX, offset: 0x6034124, symbol: D_SY_6034124 } +aSyRobot4Hitbox: + { type: SF64:HITBOX, offset: 0x6034124, symbol: aSyRobot4Hitbox } D_SY_60341A8: { type: SF64:HITBOX, offset: 0x60341A8, symbol: D_SY_60341A8 } @@ -332,8 +332,8 @@ D_SY_6034304: aSyScenery156Hitbox: { type: SF64:HITBOX, offset: 0x6034368, symbol: aSyScenery156Hitbox } -D_SY_603445C: - { type: SF64:HITBOX, offset: 0x603445C, symbol: D_SY_603445C } +aSyLaserTurretHitbox: + { type: SF64:HITBOX, offset: 0x603445C, symbol: aSyLaserTurretHitbox } aSyShip1Hitbox: { type: SF64:HITBOX, offset: 0x6034478, symbol: aSyShip1Hitbox } @@ -356,7 +356,7 @@ aSyShipWindowsHitbox: aSyShip4DestroyedHitbox: { type: SF64:HITBOX, offset: 0x60347F0, symbol: aSyShip4DestroyedHitbox } -aSyShipProjectileHitbox: - { type: SF64:HITBOX, offset: 0x603486C, symbol: aSyShipProjectileHitbox } +aSyShipMissileHitbox: + { type: SF64:HITBOX, offset: 0x603486C, symbol: aSyShipMissileHitbox } # size = 0x34890
\ No newline at end of file diff --git a/assets/yaml/us/rev1/ast_sector_z.yaml b/assets/yaml/us/rev1/ast_sector_z.yaml index c8eb2fec..9dde3d7c 100644 --- a/assets/yaml/us/rev1/ast_sector_z.yaml +++ b/assets/yaml/us/rev1/ast_sector_z.yaml @@ -142,8 +142,8 @@ D_SZ_6006BD8: D_SZ_6006CD8: { type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x06006CD8, symbol: D_SZ_6006CD8 } -D_SZ_6006D64: - { type: SF64:ANIM, offset: 0x6006D64, symbol: D_SZ_6006D64 } +aSzMissileAnim: + { type: SF64:ANIM, offset: 0x6006D64, symbol: aSzMissileAnim } aSzMissileSkel: { type: SF64:SKELETON, offset: 0x6006E50, symbol: aSzMissileSkel } diff --git a/assets/yaml/us/rev1/ast_solar.yaml b/assets/yaml/us/rev1/ast_solar.yaml index edd4f615..a6e5ee0e 100644 --- a/assets/yaml/us/rev1/ast_solar.yaml +++ b/assets/yaml/us/rev1/ast_solar.yaml @@ -31,11 +31,11 @@ D_SO_6004500: D_SO_6005710: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6005710, symbol: D_SO_6005710} -D_SO_600636C: - { type: SF64:ANIM, offset: 0x600636C, symbol: D_SO_600636C} +aSoGoreAnim: + { type: SF64:ANIM, offset: 0x600636C, symbol: aSoGoreAnim} -D_SO_6006558: - { type: SF64:SKELETON, offset: 0x6006558, symbol: D_SO_6006558} +aSoGoreSkel: + { type: SF64:SKELETON, offset: 0x6006558, symbol: aSoGoreSkel} D_SO_6006DD8: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6006DD8, symbol: D_SO_6006DD8} diff --git a/assets/yaml/us/rev1/ast_star_wolf.yaml b/assets/yaml/us/rev1/ast_star_wolf.yaml index 3bdb8ae4..763aaa05 100644 --- a/assets/yaml/us/rev1/ast_star_wolf.yaml +++ b/assets/yaml/us/rev1/ast_star_wolf.yaml @@ -56,8 +56,8 @@ D_STAR_WOLF_F00D3C0: D_STAR_WOLF_F00E2E0: { type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0x0F00E2E0, symbol: D_STAR_WOLF_F00E2E0 } -D_STAR_WOLF_F00F200: - { type: GFX, offset: 0xF00F200, symbol: D_STAR_WOLF_F00F200 } +aStarWolfStandardShipDL: + { type: GFX, offset: 0xF00F200, symbol: aStarWolfStandardShipDL } D_STAR_WOLF_F0101D0: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x0F0101D0, symbol: D_STAR_WOLF_F0101D0 } @@ -68,8 +68,8 @@ D_STAR_WOLF_F011E80: D_STAR_WOLF_F011680: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0F011680, symbol: D_STAR_WOLF_F011680 } -D_STAR_WOLF_F0103D0: - { type: GFX, offset: 0xF0103D0, symbol: D_STAR_WOLF_F0103D0 } +aStarWolfUpgradedShipDL: + { type: GFX, offset: 0xF0103D0, symbol: aStarWolfUpgradedShipDL } D_STAR_WOLF_F011F00: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0F011F00, symbol: D_STAR_WOLF_F011F00 } @@ -89,14 +89,16 @@ D_STAR_WOLF_F013180: D_STAR_WOLF_F013980: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0F013980, symbol: D_STAR_WOLF_F013980 } -D_STAR_WOLF_F014180: - { type: GFX, offset: 0xF014180, symbol: D_STAR_WOLF_F014180 } +# Star Wolf Radar mark +aStarWolfRadarMarkDL: + { type: GFX, offset: 0xF014180, symbol: aStarWolfRadarMarkDL } D_STAR_WOLF_F014208: { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 16, offset: 0x0F014208, symbol: D_STAR_WOLF_F014208 } -D_STAR_WOLF_F014310: - { type: GFX, offset: 0xF014310, symbol: D_STAR_WOLF_F014310 } +# Star Wolf Shadow +aStarWolfShadowDL: + { type: GFX, offset: 0xF014310, symbol: aStarWolfShadowDL } -D_STAR_WOLF_F014398: - { type: TEXTURE, ctype: u8, format: IA8, width: 32, height: 32, offset: 0x0F014398, symbol: D_STAR_WOLF_F014398 } +aStarWolfShadowTex: + { type: TEXTURE, ctype: u8, format: IA8, width: 32, height: 32, offset: 0x0F014398, symbol: aStarWolfShadowTex } diff --git a/assets/yaml/us/rev1/ast_training.yaml b/assets/yaml/us/rev1/ast_training.yaml index 3fe0e9fb..7c57f02e 100644 --- a/assets/yaml/us/rev1/ast_training.yaml +++ b/assets/yaml/us/rev1/ast_training.yaml @@ -25,8 +25,8 @@ D_TR_6000900: D_TR_6001820: { type: TEXTURE, format: RGBA16, offset: 0x6001820, width: 44, height: 44, ctype: u16, symbol: D_TR_6001820 } -D_TR_6002740: - { type: GFX, offset: 0x6002740, symbol: D_TR_6002740 } +aTrBarrierDL: + { type: GFX, offset: 0x6002740, symbol: aTrBarrierDL } D_TR_60028F0: { type: TEXTURE, format: RGBA16, offset: 0x060028F0, width: 32, height: 32, ctype: u16, symbol: D_TR_60028F0 } @@ -82,7 +82,7 @@ aTrBuildingHitbox: aItemTrainingRingHitbox: { type: SF64:HITBOX, offset: 0x6009CFC, symbol: aItemTrainingRingHitbox } -D_TR_6009D18: - { type: SF64:HITBOX, offset: 0x6009D18, symbol: D_TR_6009D18 } +aTrBarrierHitbox: + { type: SF64:HITBOX, offset: 0x6009D18, symbol: aTrBarrierHitbox } # size = 0x9D40
\ No newline at end of file diff --git a/assets/yaml/us/rev1/ast_ve1_boss.yaml b/assets/yaml/us/rev1/ast_ve1_boss.yaml index 0be1c082..30a4d03e 100644 --- a/assets/yaml/us/rev1/ast_ve1_boss.yaml +++ b/assets/yaml/us/rev1/ast_ve1_boss.yaml @@ -29,8 +29,8 @@ D_VE1_90012F0: D_VE1_9002CD8: {type: SF64:ANIM, offset: 0x9002CD8, symbol: D_VE1_9002CD8} -D_VE1_9002CF0: - {type: GFX, offset: 0x9002CF0, symbol: D_VE1_9002CF0} +aVe1BlockerDL: + {type: GFX, offset: 0x9002CF0, symbol: aVe1BlockerDL} D_VE1_9002F30: {type: TEXTURE, ctype: u8, format: CI8, width: 32, height: 32, offset: 0x9002F30, symbol: D_VE1_9002F30, tlut: 0x9003330} @@ -113,8 +113,8 @@ D_VE1_900DF20: D_VE1_900DFB8: {type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x900DFB8, symbol: D_VE1_900DFB8} -D_VE1_900EFC0: - {type: GFX, offset: 0x900EFC0, symbol: D_VE1_900EFC0} +aVe1TempleBgDL: + {type: GFX, offset: 0x900EFC0, symbol: aVe1TempleBgDL} aVe1TempleInterior2DL: {type: GFX, offset: 0x900F060, symbol: aVe1TempleInterior2DL} @@ -128,14 +128,14 @@ D_VE1_9010FC4: D_VE1_9010FD0: {type: GFX, offset: 0x9010FD0, symbol: D_VE1_9010FD0} -D_VE1_9011200: - {type: GFX, offset: 0x9011200, symbol: D_VE1_9011200} +aVe1PillarDL: + {type: GFX, offset: 0x9011200, symbol: aVe1PillarDL} D_VE1_9011980: {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x9011980, symbol: D_VE1_9011980} -D_VE1_9012180: - {type: GFX, offset: 0x9012180, symbol: D_VE1_9012180} +aVe1Pillar5DL: + {type: GFX, offset: 0x9012180, symbol: aVe1Pillar5DL} D_VE1_90123C0: {type: TEXTURE, ctype: u8, format: CI8, width: 32, height: 16, offset: 0x90123C0, symbol: D_VE1_90123C0, tlut: 0x90125C0} diff --git a/assets/yaml/us/rev1/ast_venom_1.yaml b/assets/yaml/us/rev1/ast_venom_1.yaml index 2b67e7ba..95fc884a 100644 --- a/assets/yaml/us/rev1/ast_venom_1.yaml +++ b/assets/yaml/us/rev1/ast_venom_1.yaml @@ -25,8 +25,8 @@ D_VE1_6000D80: D_VE1_6001B80: { type: TEXTURE, format: IA8, width: 128, height: 19, offset: 0x6001B80, ctype: u8, symbol: D_VE1_6001B80 } -D_VE1_6002500: - { type: GFX, offset: 0x6002500, symbol: D_VE1_6002500 } +aVe1EnemyGateDL: + { type: GFX, offset: 0x6002500, symbol: aVe1EnemyGateDL } D_VE1_60029F8: { type: TEXTURE, format: CI8, width: 8, height: 16, offset: 0x60029F8, tlut: 0x6002A78, ctype: u8, symbol: D_VE1_60029F8 } @@ -52,11 +52,11 @@ aVe1WatchPostDL: D_VE1_6003B10: { type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x6003B10, ctype: u16, symbol: D_VE1_6003B10 } -D_VE1_6004310: - { type: GFX, offset: 0x6004310, symbol: D_VE1_6004310 } +aVe1EnemyGateDoorLeftDL: + { type: GFX, offset: 0x6004310, symbol: aVe1EnemyGateDoorLeftDL } -D_VE1_60043F0: - { type: GFX, offset: 0x60043F0, symbol: D_VE1_60043F0 } +aVe1EnemyGateDoorRightDL: + { type: GFX, offset: 0x60043F0, symbol: aVe1EnemyGateDoorRightDL } D_VE1_60044D0: { type: TEXTURE, format: CI8, width: 16, height: 16, offset: 0x60044D0, tlut: 0x60045D0, ctype: u8, symbol: D_VE1_60044D0 } @@ -124,8 +124,8 @@ D_VE1_601B1E4: D_VE1_6010088: { type: SF64:OBJECT_INIT, offset: 0x6010088, symbol: D_VE1_6010088 } -D_VE1_601B43C: - { type: SF64:HITBOX, offset: 0x601B43C, symbol: D_VE1_601B43C } +aVe1Pillar5Hitbox: + { type: SF64:HITBOX, offset: 0x601B43C, symbol: aVe1Pillar5Hitbox } D_VE1_601B474: { type: SF64:HITBOX, offset: 0x601B474, symbol: D_VE1_601B474 } @@ -178,5 +178,5 @@ aVe1Pillar4Hitbox: aVe1MonkeyStatueHitbox: { type: SF64:HITBOX, offset: 0x601B8D8, symbol: aVe1MonkeyStatueHitbox } -D_VE1_601B944: - { type: SF64:HITBOX, offset: 0x601B944, symbol: D_VE1_601B944 }
\ No newline at end of file +aVe1EnemyGateHitbox: + { type: SF64:HITBOX, offset: 0x601B944, symbol: aVe1EnemyGateHitbox }
\ No newline at end of file diff --git a/assets/yaml/us/rev1/ast_venom_2.yaml b/assets/yaml/us/rev1/ast_venom_2.yaml index 92e8061f..f3246b04 100644 --- a/assets/yaml/us/rev1/ast_venom_2.yaml +++ b/assets/yaml/us/rev1/ast_venom_2.yaml @@ -174,11 +174,11 @@ D_VE2_60114A0: D_VE2_6013AF8: { type: TEXTURE, format: RGBA16, width: 16, height: 16, offset: 0x6013AF8, ctype: u16, symbol: D_VE2_6013AF8 } -D_VE2_6014658: - { type: SF64:ANIM, offset: 0x6014658, symbol: D_VE2_6014658 } +aVe2AndrossGateAnim: + { type: SF64:ANIM, offset: 0x6014658, symbol: aVe2AndrossGateAnim } -D_VE2_6014844: - { type: SF64:SKELETON, offset: 0x6014844, symbol: D_VE2_6014844 } +aVe2AndrossGateSkel: + { type: SF64:SKELETON, offset: 0x6014844, symbol: aVe2AndrossGateSkel } aVe2BaseAnim: { type: SF64:ANIM, offset: 0x6014904, symbol: aVe2BaseAnim } diff --git a/assets/yaml/us/rev1/ast_warp_zone.yaml b/assets/yaml/us/rev1/ast_warp_zone.yaml index 67dc362d..21a650b6 100644 --- a/assets/yaml/us/rev1/ast_warp_zone.yaml +++ b/assets/yaml/us/rev1/ast_warp_zone.yaml @@ -8,14 +8,14 @@ - '#include "gfx.h"' - '#include "sf64object.h"' -D_WZ_7000000: - { type: GFX, offset: 0x7000000, symbol: D_WZ_7000000 } +aWzSxEnemy1DL: + { type: GFX, offset: 0x7000000, symbol: aWzSxEnemy1DL } -D_WZ_7000280: - { type: GFX, offset: 0x7000280, symbol: D_WZ_7000280 } +aWzGateDL: + { type: GFX, offset: 0x7000280, symbol: aWzGateDL } -D_WZ_70008F0: - { type: GFX, offset: 0x70008F0, symbol: D_WZ_70008F0 } +aWzMeteor2DL: + { type: GFX, offset: 0x70008F0, symbol: aWzMeteor2DL } D_WZ_7000260: { type: TEXTURE, ctype: u16, format: RGBA16, width: 4, height: 4, offset: 0x7000260, symbol: D_WZ_7000260 } @@ -26,14 +26,14 @@ D_WZ_7000A30: D_WZ_7000C30: { type: TEXTURE, ctype: u16, format: TLUT, colors: 8, offset: 0x7000C30, symbol: D_WZ_7000C30 } -D_WZ_7000C40: - { type: GFX, offset: 0x7000C40, symbol: D_WZ_7000C40 } +aWzPillar1DL: + { type: GFX, offset: 0x7000C40, symbol: aWzPillar1DL } -D_WZ_7000E80: - { type: GFX, offset: 0x7000E80, symbol: D_WZ_7000E80 } +aWzMeteor1DL: + { type: GFX, offset: 0x7000E80, symbol: aWzMeteor1DL } -D_WZ_70010E0: - { type: GFX, offset: 0x70010E0, symbol: D_WZ_70010E0 } +aWzPillar2DL: + { type: GFX, offset: 0x70010E0, symbol: aWzPillar2DL } D_WZ_7001540: { type: GFX, offset: 0x7001540, symbol: D_WZ_7001540 } diff --git a/assets/yaml/us/rev1/ast_zoness.yaml b/assets/yaml/us/rev1/ast_zoness.yaml index c2dda637..15b5e989 100644 --- a/assets/yaml/us/rev1/ast_zoness.yaml +++ b/assets/yaml/us/rev1/ast_zoness.yaml @@ -84,8 +84,8 @@ D_ZO_6004A70: D_ZO_6004B00: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x6004B00, symbol: D_ZO_6004B00} -D_ZO_6004D00: - { type: GFX, offset: 0x6004D00, symbol: D_ZO_6004D00} +aZoPatrolBoatDL: + { type: GFX, offset: 0x6004D00, symbol: aZoPatrolBoatDL} D_ZO_6005958: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x6005958, symbol: D_ZO_6005958} @@ -351,11 +351,11 @@ D_ZO_601F420: D_ZO_601F620: { type: GFX, offset: 0x601F620, symbol: D_ZO_601F620} -D_ZO_601F874: - { type: SF64:ANIM, offset: 0x601F874, symbol: D_ZO_601F874} +aZoSarumarinePeriscopeAnim: + { type: SF64:ANIM, offset: 0x601F874, symbol: aZoSarumarinePeriscopeAnim} -D_ZO_601F920: - { type: SF64:SKELETON, offset: 0x601F920, symbol: D_ZO_601F920} +aZoSarumarinePeriscopeSkel: + { type: SF64:SKELETON, offset: 0x601F920, symbol: aZoSarumarinePeriscopeSkel} D_ZO_601F940: { type: GFX, offset: 0x601F940, symbol: D_ZO_601F940} @@ -535,8 +535,8 @@ D_ZO_602C028: aZoSarumarineHitbox: { type: SF64:HITBOX, offset: 0x602C044, symbol: aZoSarumarineHitbox} -D_ZO_602C1A0: - { type: SF64:HITBOX, offset: 0x602C1A0, symbol: D_ZO_602C1A0} +aZoSarumarinePeriscopeHitbox: + { type: SF64:HITBOX, offset: 0x602C1A0, symbol: aZoSarumarinePeriscopeHitbox} aZoCargoShipHitbox: { type: SF64:HITBOX, offset: 0x602C1D4, symbol: aZoCargoShipHitbox} diff --git a/include/fox_option.h b/include/fox_option.h index cefc10c5..46a4c6c5 100644 --- a/include/fox_option.h +++ b/include/fox_option.h @@ -3,46 +3,43 @@ #include "global.h" -//! TODO: RENAME. Member names inferred by Option_DrawCardLabel. typedef struct { - /* 0x00 */ s32 unk_00; // type + /* 0x00 */ s32 type; /* 0x04 */ s32 unk_04; - /* 0x08 */ void* unk_08; // texture - /* 0x0C */ u16* unk_0C; // palette - /* 0x10 */ s32 unk_10; // width - /* 0x14 */ s32 unk_14; // height - /* 0x18 */ f32 unk_18; // xPos - /* 0x1C */ f32 unk_1C; // yPos - /* 0x20 */ f32 unk_20; // xScale - /* 0x24 */ f32 unk_24; // yScale - /* 0x28 */ s32 unk_28; // red - /* 0x2C */ s32 unk_2C; // green - /* 0x30 */ s32 unk_30; // blue - /* 0x34 */ s32 unk_34; // alpha + /* 0x08 */ void* texture; + /* 0x0C */ u16* palette; + /* 0x10 */ s32 width; + /* 0x14 */ s32 height; + /* 0x18 */ f32 xPos; + /* 0x1C */ f32 yPos; + /* 0x20 */ f32 xScale; + /* 0x24 */ f32 yScale; + /* 0x28 */ s32 red; + /* 0x2C */ s32 green; + /* 0x30 */ s32 blue; + /* 0x34 */ s32 alpha; } OptionTexture; // size = 0x38 -//! TODO: RENAME. Member names inferred by Option_DrawMenuCard typedef struct { - /* 0x00 */ f32 unk_00; // x - /* 0x04 */ f32 unk_04; // y - /* 0x08 */ f32 unk_08; // z - /* 0x0C */ f32 unk_0C; // xScale - /* 0x10 */ f32 unk_10; // yScale + /* 0x00 */ f32 x; + /* 0x04 */ f32 y; + /* 0x08 */ f32 z; + /* 0x0C */ f32 xScale; + /* 0x10 */ f32 yScale; } MenuContext_38; // size = 0x14 -//! TODO: RENAME. Member names inferred by Option_DrawMenuArwing typedef struct { - /* 0x0 */ f32 unk_0; // x - /* 0x4 */ f32 unk_4; // y - /* 0x8 */ f32 unk_8; // range + /* 0x0 */ f32 x; + /* 0x4 */ f32 y; + /* 0x8 */ f32 range; } ArwingPosition; // size = 0xC typedef struct { /* 0x00 */ OptionTexture unk_00; /* 0x38 */ MenuContext_38 unk_38; /* 0x4C */ ArwingPosition unk_4C; - /* 0x58 */ s32 unk_58; - /* 0x5C */ s32 unk_5C; + /* 0x58 */ bool unk_58; + /* 0x5C */ bool unk_5C; } OptionEntry; // size = 0x60 typedef struct { @@ -57,22 +54,22 @@ typedef struct { } UnkStruct_D_menu_801B9250; typedef enum OptionId { - OPTION_MAIN_MENU = 1000, - OPTION_VERSUS_STAGE = 2000, - OPTION_MAP = 0, - OPTION_TRAINING = 1, - OPTION_VERSUS = 2, - OPTION_RANKING = 3, - OPTION_SOUND = 4, - OPTION_DATA = 5, - OPTION_EXPERT_SOUND = 6, - OPTION_POINT_MATCH = 10, - OPTION_BR_MATCH = 20, - OPTION_TT_MATCH = 30, - OPTION_NAME = 200, - OPTION_SCORE = 300, - OPTION_INVOICE = 400, - OPTION_MAX, + /* 1000 */ OPTION_MAIN_MENU = 1000, + /* 2000 */ OPTION_VERSUS_STAGE = 2000, + /* 0 */ OPTION_MAP = 0, + /* 1 */ OPTION_TRAINING = 1, + /* 2 */ OPTION_VERSUS = 2, + /* 3 */ OPTION_RANKING = 3, + /* 4 */ OPTION_SOUND = 4, + /* 5 */ OPTION_DATA = 5, + /* 6 */ OPTION_EXPERT_SOUND = 6, + /* 10 */ OPTION_POINT_MATCH = 10, + /* 20 */ OPTION_BR_MATCH = 20, + /* 30 */ OPTION_TT_MATCH = 30, + /* 200 */ OPTION_NAME = 200, + /* 300 */ OPTION_SCORE = 300, + /* 400 */ OPTION_INVOICE = 400, + /* 401 */ OPTION_MAX, } OptionId; #define OPTION_COUNT ARRAY_COUNT(sOptionCardList) @@ -81,7 +78,7 @@ extern u8* D_menu_801B68B0[]; extern u8* D_menu_801B68D4[]; extern s32 D_menu_801B8220[]; // total hits ranking? see Option_80197DE4 -extern s32 D_menu_801B827C; // engine +extern s32 D_menu_801B827C; // engine extern s32 D_menu_801B8280; extern s32 D_menu_801B8284; extern s32 D_menu_801B8288; @@ -98,7 +95,7 @@ extern u8 D_menu_801C9010[96 * 96]; extern u8 D_menu_801CB410[96 * 96]; void Title_UpdateEntry(void); - s32 Title_80187ABC(void); +s32 Title_80187ABC(void); void Title_80187B00(void); void Title_80187E28(void); void Title_801888E8(void); @@ -194,14 +191,15 @@ void Option_8019B8A0(s32 arg0); void Option_8019B8C8(void); void Option_DrawMenuLabel(void); void Option_DrawMenuCard(MenuContext_38 arg0); -void Option_DrawMenuArwing(ArwingPosition arg0); -void Option_8019BC44(f32, f32, f32, f32, f32, f32); +void Option_DrawMenuArwing(ArwingPosition arwing); +void Option_DrawArwing(f32, f32, f32, f32, f32, f32); void Option_8019BDF0(void); -void Option_8019BE7C(f32, f32, f32, f32 *, f32 *, f32 *); +void Option_8019BE7C(f32, f32, f32, f32*, f32*, f32*); void Option_8019BF34(void); void Option_8019C04C(void); -void Option_DrawCardLabel(OptionTexture arg0); -bool Option_8019C418(s32* arg0, s32 arg1, bool arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, UnkStruct_D_menu_801B9250* arg8); +void Option_DrawCardLabel(OptionTexture tex); +bool Option_8019C418(s32* arg0, s32 arg1, bool arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, + UnkStruct_D_menu_801B9250* arg8); s32 Option_8019C5A0(s32*); bool Option_8019C66C(f32* arg0, f32 arg1, f32 arg2, UnkStruct_D_menu_801B9250* arg3); void Option_8019C824(f32*); diff --git a/include/functions.h b/include/functions.h index 0754d9dc..8e603aa7 100644 --- a/include/functions.h +++ b/include/functions.h @@ -87,7 +87,7 @@ void Cutscene_DrawGreatFox(void); // fox_display void Display_ArwingWings(ArwingInfo*); -void Display_DrawEngineGlow(s32); +void Display_DrawEngineGlow(EngineGlowColor); void Display_SetupPlayerSfxPos(Player*); void Display_Update(void); @@ -112,7 +112,7 @@ void CoBuilding9_Draw(Scenery*); void CoBuilding10_Draw(Scenery*); void ActorDebris_Draw(Actor*); void Actor_DrawEngineAndContrails(Actor*); -void Actor_DrawEngineGlow(Actor*, s32); +void Actor_DrawEngineGlow(Actor*, EngineGlowColor); void ActorTeamArwing_Draw(Actor*); void MeMolarRock_Draw(Actor*); void MeMeteor2_Draw(MeMeteor2*); diff --git a/include/i6.h b/include/i6.h index a7c7f6c1..30d820e2 100644 --- a/include/i6.h +++ b/include/i6.h @@ -22,7 +22,7 @@ void SectorY_LevelComplete(Player*); void SectorY_8019FF00(Actor*); void SectorY_801A0AC0(Player*); -void Andross_8018769C(Actor*); +void Andross_Gate_Draw(Actor*); void OvlI6_CallFunction(u32 mode, void* ptr); void Andross_801878A8(void); void Andross_801888F4(Actor *); diff --git a/include/prevent_context_reordering.h b/include/prevent_context_reordering.h index a8176f1f..c0d50d89 100644 --- a/include/prevent_context_reordering.h +++ b/include/prevent_context_reordering.h @@ -1,7 +1,7 @@ #ifndef PREVENT_CONTEXT_REORDERING_H #define PREVENT_CONTEXT_REORDERING_H -// extern int Dummyhalf; +extern int Dummyhalf; // struct Dummy0 {int x;}; // struct Dummy1 {int x;}; // struct Dummy2 {int x;}; @@ -14,8 +14,8 @@ // struct Dummy9 {int x;}; // struct Dummy10 {int x;}; // struct Dummy11 {int x;}; -struct Dummy12 {int x;}; -struct Dummy13 {int x;}; +// struct Dummy12 {int x;}; +// struct Dummy13 {int x;}; struct Dummy14 {int x;}; struct Dummy15 {int x;}; struct Dummy16 {int x;}; diff --git a/include/sf64event.h b/include/sf64event.h index 264ad4a7..6e12fa46 100644 --- a/include/sf64event.h +++ b/include/sf64event.h @@ -1,3 +1,32 @@ +/** + * Glossary: + * EVID: Event ID + * EVACT: Event Action + * EVOP: Event Opcode + * EVC: Event Condition + * EVSTATE: Event State + * + * Level Prefixes: + * CO: Corneria + * ME: Meteo + * SX: Sector X + * SY: Sector Y + * SZ: Sector Z + * KA: Katina + * AQ: Aquas + * A6: Area 6 + * FO: Fortuna + * SO: Solar + * MA: Macbeth + * TI: Titania + * BO: Bolse + * ZO: Zoness + * VE1: Venom 1 + * VE2: Venom 2 + * AND: Venom Andross + * WZ: Warpzone + */ + #ifndef SF64_EVENT #define SF64_EVENT @@ -300,118 +329,118 @@ typedef enum EventAction { /* 16 */ EVACT_16, /* 17 */ EVACT_17, /* 18 */ EVACT_GFOX_COVER_FIRE, - /* 19 */ EVACT_19, + /* 19 */ EVACT_19, // projectile ring used by bee enemies } EventAction; typedef enum EventActorId { - /* 0 */ EVID_0, - /* 1 */ EVID_1, - /* 2 */ EVID_SLIPPY_METEO, - /* 3 */ EVID_3, - /* 4 */ EVID_4, - /* 5 */ EVID_5, - /* 6 */ EVID_6, - /* 7 */ EVID_7, - /* 8 */ EVID_8, - /* 9 */ EVID_9, - /* 10 */ EVID_10, - /* 11 */ EVID_11, - /* 12 */ EVID_12, - /* 13 */ EVID_13, - /* 14 */ EVID_14, - /* 15 */ EVID_15, - /* 16 */ EVID_16, - /* 17 */ EVID_17, - /* 18 */ EVID_18, - /* 19 */ EVID_19, - /* 20 */ EVID_20, - /* 21 */ EVID_A6_MISSILE, + /* 0 */ EVID_VENOM_FIGHTER_1, + /* 1 */ EVID_VENOM_FIGHTER_2, + /* 2 */ EVID_ME_SLIPPY, + /* 3 */ EVID_SPY_EYE, // jp name: Sunfish II + /* 4 */ EVID_GRANGA_FIGHTER_1, // jp name: Dragon + /* 5 */ EVID_GRANGA_FIGHTER_2, // jp name: Dragon II + /* 6 */ EVID_FIREBIRD, // Handles Firebird from Corneria and Gore from Solar + /* 7 */ EVID_CORNERIAN_FIGHTER, // Seems unused? + /* 8 */ EVID_VENOM_TANK, + /* 9 */ EVID_TRIPOD, // jp name: Butterfly + /* 10 */ EVID_ATTACKER_1, + /* 11 */ EVID_ATTACKER_2, + /* 12 */ EVID_ATTACKER_3, + /* 13 */ EVID_ME_METEOR_1, + /* 14 */ EVID_ME_METEOR_2, + /* 15 */ EVID_COMMANDER, + /* 16 */ EVID_SPIDER, + /* 17 */ EVID_ZERAM_CLASS_CRUISER, + /* 18 */ EVID_SX_SPY_EYE, // jp name: Sunfish I + /* 19 */ EVID_SX_CANINE, + /* 20 */ EVID_SPACE_MINE, + /* 21 */ EVID_A6_NINJIN_MISSILE, /* 22 */ EVID_A6_ROCKET, - /* 23 */ EVID_23, - /* 24 */ EVID_24, - /* 25 */ EVID_25, - /* 26 */ EVID_26, - /* 27 */ EVID_27, - /* 28 */ EVID_28, - /* 29 */ EVID_29, - /* 30 */ EVID_30, - /* 31 */ EVID_31, - /* 32 */ EVID_32, - /* 33 */ EVID_33, - /* 34 */ EVID_34, - /* 35 */ EVID_35, - /* 36 */ EVID_36, - /* 37 */ EVID_37, + /* 23 */ EVID_VENOM_FIGHTER_3, + /* 24 */ EVID_SX_BASE_DEBRIS_1, + /* 25 */ EVID_SX_BASE_WALL_1, + /* 26 */ EVID_SX_BASE_DEBRIS_2, + /* 27 */ EVID_SX_LASER, + /* 28 */ EVID_SX_WATCH_POST, // Invented name + /* 29 */ EVID_SX_SPACE_MINE, + /* 30 */ EVID_A6_HARLOCK_FRIGATE, + /* 31 */ EVID_A6_UMBRA_STATION, + /* 32 */ EVID_SX_BASE_FLOOR_1, + /* 33 */ EVID_CRUISER_GUN, // Guns located on Zeram-class Cruisers + /* 34 */ EVID_SX_BASE_WALL_2, + /* 35 */ EVID_SX_BASE_WALL_3, + /* 36 */ EVID_TI_BOMBER, // Bird-like ship that drops land mines + /* 37 */ EVID_SX_BORZOI_FIGHTER, /* 38 */ EVID_SX_WARP_GATE, - /* 39 */ EVID_39, + /* 39 */ EVID_SX_BASE_WALL_TILE_1, /* 40 */ EVID_EVENT_HANDLER, - /* 41 */ EVID_41, - /* 42 */ EVID_42, + /* 41 */ EVID_SY_SHIP_1, + /* 42 */ EVID_SY_SHIP_2, /* 43 */ EVID_TEAMMATE, - /* 44 */ EVID_44, - /* 45 */ EVID_45, - /* 46 */ EVID_46, - /* 47 */ EVID_47, - /* 48 */ EVID_48, - /* 49 */ EVID_49, - /* 50 */ EVID_50, - /* 51 */ EVID_51, - /* 52 */ EVID_52, - /* 53 */ EVID_53, - /* 54 */ EVID_54, - /* 55 */ EVID_55, - /* 56 */ EVID_56, - /* 57 */ EVID_57, - /* 58 */ EVID_58, - /* 59 */ EVID_59, - /* 60 */ EVID_60, - /* 61 */ EVID_61, - /* 62 */ EVID_62, - /* 63 */ EVID_63, - /* 64 */ EVID_64, - /* 65 */ EVID_65, - /* 66 */ EVID_66, - /* 67 */ EVID_METEO_PYRAMID_SHIP, - /* 68 */ EVID_68, - /* 69 */ EVID_69, - /* 70 */ EVID_70, - /* 71 */ EVID_WING_REPAIR, - /* 72 */ EVID_72, - /* 73 */ EVID_73, - /* 74 */ EVID_74, - /* 75 */ EVID_75, - /* 76 */ EVID_76, - /* 77 */ EVID_77, + /* 44 */ EVID_SY_SHIP_3, + /* 45 */ EVID_ME_METEOR_3, + /* 46 */ EVID_ZO_PATROL_BOAT, + /* 47 */ EVID_ME_SECRET_MARKER_1, // Metal spheres that mark secret items. Invented name + /* 48 */ EVID_SY_ROBOT_1, + /* 49 */ EVID_SY_ROBOT_2, + /* 50 */ EVID_SY_ROBOT_3, + /* 51 */ EVID_SY_ROBOT_4, // Unclear as to whether it's used or not, only it's hitbox gets used in code + /* 52 */ EVID_SARUMARINE_PERISCOPE, + /* 53 */ EVID_SX_BASE_WALL_4, + /* 54 */ EVID_GAMMA_ON, // Andross Army Gamma-Off Formation Leader (Orange Andross Fighter) + /* 55 */ EVID_GAMMA_OFF, // Blue Andross Fighter + /* 56 */ EVID_TI_GREAT_FOX, // Great Fox that flees after the intro cutscene + /* 57 */ EVID_SY_SHIP_3_2, // Another variant of EVID_SY_SHIP_3 without a hitbox, seems unused? + /* 58 */ EVID_SY_SARUZIN, // flagship of Sector Y, base of the Shogun Boss + /* 59 */ EVID_SY_ROBOT_SPRITE_SIDE, // Robot sprites that appear in Sector Y's background, side variant + /* 60 */ EVID_SY_ROBOT_SPRITE_FRONT, // Robot sprites that appear in Sector Y's background, front variant + /* 61 */ EVID_ME_METEOR_4, + /* 62 */ EVID_ME_METEOR_5, + /* 63 */ EVID_ME_BIG_METEOR, // Big meteor that bounces in Meteo + /* 64 */ EVID_ME_ROCK_GULL, // Enemy laser turret inside a meteorite + /* 65 */ EVID_ME_METEOR_6, + /* 66 */ EVID_ME_SECRET_MARKER_2, // Metal spheres that mark secret items. Invented name + /* 67 */ EVID_ME_FLIP_BOT, + /* 68 */ EVID_SY_LASER_TURRET, + /* 69 */ EVID_SY_SHIP_DESTROYED, + /* 70 */ EVID_SY_DEBRIS, // Sprite portraying small pieces of debris. Seems unused + /* 71 */ EVID_ITEM_WING_REPAIR, + /* 72 */ EVID_SY_SHIP_WINDOWS, + /* 73 */ EVID_SY_SHIP_4, + /* 74 */ EVID_SY_SHIP_4_DESTROYED, + /* 75 */ EVID_SY_SHIP_2_SPRITE, // Unused + /* 76 */ EVID_SY_SHIP_3_SPRITE, // Unused + /* 77 */ EVID_SY_SHIP_MISSILE, /* 78 */ EVID_SUPPLY_CRATE, - /* 79 */ EVID_79, - /* 80 */ EVID_80, - /* 81 */ EVID_81, - /* 82 */ EVID_82, - /* 83 */ EVID_AQ_CLAM, - /* 84 */ EVID_84, + /* 79 */ EVID_ZO_BIRD, + /* 80 */ EVID_VE1_PILLAR, + /* 81 */ EVID_VE1_BLOCKER, + /* 82 */ EVID_MA_LASER_TURRET, + /* 83 */ EVID_AQ_OYSTER, + /* 84 */ EVID_VE1_PILLAR_5, /* 85 */ EVID_BILL, /* 86 */ EVID_KATT, - /* 87 */ EVID_87, + /* 87 */ EVID_VE1_TEMPLE_BG, // Background used inside Venom 1 temple to hide drawing popup /* 88 */ EVID_AQ_STARFISH, - /* 89 */ EVID_89, - /* 90 */ EVID_90, - /* 91 */ EVID_91, - /* 92 */ EVID_92, - /* 93 */ EVID_93, - /* 94 */ EVID_94, - /* 95 */ EVID_95, - /* 96 */ EVID_96, - /* 97 */ EVID_97, - /* 98 */ EVID_98, - /* 99 */ EVID_99, - /* 100 */ EVID_100, - /* 101 */ EVID_101, + /* 89 */ EVID_AQ_SHELL, + /* 90 */ EVID_MA_RAILROAD_CART, + /* 91 */ EVID_MA_GUILLOTINE_1, + /* 92 */ EVID_WZ_PILLAR_1, + /* 93 */ EVID_WZ_PILLAR_2, + /* 94 */ EVID_WZ_METEOR_1, + /* 95 */ EVID_WZ_METEOR_2, + /* 96 */ EVID_WZ_GATE, + /* 97 */ EVID_ME_METEOR_7, + /* 98 */ EVID_MA_BOULDER, + /* 99 */ EVID_VE1_ENEMY_GATE, // Gate in Venom 1 for outcoming enemies + /* 100 */ EVID_ENEMY_GATE_DOOR_RIGHT, + /* 101 */ EVID_ENEMY_GATE_DOOR_LEFT, /* 102 */ EVID_TR_BARRIER, /* 103 */ EVID_ANDROSS_GATE, /* 104 */ EVID_ANDROSS_GATE_2, /* 105 */ EVID_SX_WARP_ENMY, /* 106 */ EVID_KILLER_BEE, - /* 107 */ EVID_MA_SHOT_GATE, + /* 107 */ EVID_MA_GUILLOTINE_2, // Variant of the Macbeth Guillotine that can be shot at to be opened /* 200 */ EVID_200 = 200, /* 300 */ EVID_300 = 300, /* 4095*/ EVID_FFF = 4095, diff --git a/include/sf64level.h b/include/sf64level.h index 186f0676..1891ae8d 100644 --- a/include/sf64level.h +++ b/include/sf64level.h @@ -8,8 +8,6 @@ typedef enum LevelType { /* 0 */ LEVELTYPE_PLANET, /* 1 */ LEVELTYPE_SPACE, - /* 2 */ LEVELTYPE_UNK2, - /* 3 */ LEVELTYPE_UNK3, } LevelType; typedef enum MissionStatus { diff --git a/include/sf64object.h b/include/sf64object.h index 6b396c61..ec5bb7d3 100644 --- a/include/sf64object.h +++ b/include/sf64object.h @@ -227,10 +227,10 @@ typedef struct Boss { /* 0x000 */ Object obj; /* 0x01C */ ObjectInfo info; /* 0x040 */ s32 index; - /* 0x044 */ s16 unk_044; - /* 0x046 */ s16 unk_046; - /* 0x048 */ s16 unk_048; - /* 0x04A */ s16 unk_04A; + /* 0x044 */ s16 work_044; + /* 0x046 */ s16 work_046; + /* 0x048 */ s16 work_048; + /* 0x04A */ s16 work_04A; /* 0x04C */ s16 animFrame; /* 0x04E */ s16 state; /* 0x050 */ s16 timer_050; @@ -268,10 +268,10 @@ typedef struct Actor { /* 0x01C */ ObjectInfo info; /* 0x040 */ s32 index; /* 0x044 */ u8 itemDrop; - /* 0x046 */ s16 unk_046; - /* 0x048 */ s16 unk_048; - /* 0x04A */ s16 unk_04A; - /* 0x04C */ s16 timer_04C; + /* 0x046 */ s16 work_046; + /* 0x048 */ s16 work_048; + /* 0x04A */ s16 work_04A; + /* 0x04C */ s16 work_04C; /* 0x04E */ s16 counter_04E; /* 0x050 */ s32 iwork[25]; /* 0x0B4 */ s16 eventType; @@ -421,7 +421,7 @@ typedef enum ObjectId { /* 112 */ OBJ_SCENERY_SY_SHIP_2_DESTROYED, /* 113 */ OBJ_SPRITE_SY_SHIP_2, // Unused /* 114 */ OBJ_SPRITE_SY_SHIP_3, // Unused - /* 115 */ OBJ_SCENERY_SY_SHIP_PROJECTILE, + /* 115 */ OBJ_SCENERY_SY_SHIP_MISSILE, /* 116 */ OBJ_SCENERY_SY_SHIP_WINDOWS, /* 117 */ OBJ_SCENERY_AQ_CORAL_REEF_1, /* 118 */ OBJ_SCENERY_AQ_TUNNEL_1, @@ -623,7 +623,7 @@ typedef enum ObjectId { /* 314 */ OBJ_BOSS_SY_SHOGUN, /* 315 */ OBJ_BOSS_SO_VULKAIN, /* 316 */ OBJ_BOSS_KA_SAUCERER, - /* 317 */ OBJ_BOSS_KA_FLBASE, + /* 317 */ OBJ_BOSS_KA_FLBASE, // Katina FrontLine Base /* 318 */ OBJ_BOSS_AQ_BACOON, /* 319 */ OBJ_BOSS_VE1_GOLEMECH, /* 320 */ OBJ_BOSS_AND_ANDROSS, diff --git a/include/sf64player.h b/include/sf64player.h index 0ac36061..511141fb 100644 --- a/include/sf64player.h +++ b/include/sf64player.h @@ -51,6 +51,13 @@ typedef enum DrawMode { /* 9 */ DRAW_MAX, } DrawMode; +typedef enum EngineGlowColor { + /* 0 */ EG_RED, + /* 1 */ EG_BLUE, + /* 2 */ EG_GREEN, + /* 3 */ EG_ORANGE +} EngineGlowColor; + typedef enum LevelMode { /* 0 */ LEVELMODE_ON_RAILS, /* 1 */ LEVELMODE_ALL_RANGE, diff --git a/include/variables.h b/include/variables.h index a0019f4e..502bdb6a 100644 --- a/include/variables.h +++ b/include/variables.h @@ -43,10 +43,10 @@ extern f32 gActorMissileSeekHitbox[]; extern f32 gMeMoraHitbox[]; extern f32 gTeamHitbox[]; extern f32 gActorAllRangeHItbox[]; -extern f32 gWarpZoneEvent94Hitbox[]; -extern f32 gWarpZoneEvent96Hitbox[]; -extern f32 gWarpZoneEvent92Hitbox[]; -extern f32 gWarpZoneEvent93Hitbox[]; +extern f32 aWzMeteor1Hitbox[]; +extern f32 aWzGateHitbox[]; +extern f32 aWzPillar1Hitbox[]; +extern f32 aWzPillar2Hitbox[]; extern ObjectInfo gObjectInfo[]; extern f32* D_edata_800CF964[]; diff --git a/linker_scripts/eu/rev0/symbol_addrs_assets.txt b/linker_scripts/eu/rev0/symbol_addrs_assets.txt index 1b309c0d..192ed16c 100644 --- a/linker_scripts/eu/rev0/symbol_addrs_assets.txt +++ b/linker_scripts/eu/rev0/symbol_addrs_assets.txt @@ -1007,8 +1007,8 @@ D_D006B50 = 0xD006B50; D_D007A70 = 0xD007A70; D_D008990 = 0xD008990; D_D0098B0 = 0xD0098B0; -D_D009A40 = 0xD009A40; -D_D00B880 = 0xD00B880; +aKattShipDL = 0xD009A40; +aBillShipDL = 0xD00B880; D_E000000 = 0xE000000; D_E003AB0 = 0xE003AB0; D_E00DFB0 = 0xE00DFB0; diff --git a/linker_scripts/eu/rev0/undefined_syms.ld b/linker_scripts/eu/rev0/undefined_syms.ld index 1b309c0d..192ed16c 100644 --- a/linker_scripts/eu/rev0/undefined_syms.ld +++ b/linker_scripts/eu/rev0/undefined_syms.ld @@ -1007,8 +1007,8 @@ D_D006B50 = 0xD006B50; D_D007A70 = 0xD007A70; D_D008990 = 0xD008990; D_D0098B0 = 0xD0098B0; -D_D009A40 = 0xD009A40; -D_D00B880 = 0xD00B880; +aKattShipDL = 0xD009A40; +aBillShipDL = 0xD00B880; D_E000000 = 0xE000000; D_E003AB0 = 0xE003AB0; D_E00DFB0 = 0xE00DFB0; diff --git a/src/audio/audio_heap.c b/src/audio/audio_heap.c index f19b6b21..9d6ca238 100644 --- a/src/audio/audio_heap.c +++ b/src/audio/audio_heap.c @@ -137,7 +137,7 @@ void* AudioHeap_Alloc(AudioAllocPool* pool, u32 size) { u32 aligned = ALIGN16(size); u8* ramAddr = pool->curRamAddr; - if (pool->startRamAddr + pool->size >= pool->curRamAddr + aligned) { + if ((pool->startRamAddr + pool->size) >= (pool->curRamAddr + aligned)) { pool->curRamAddr += aligned; } else { return NULL; diff --git a/src/audio/audio_load.c b/src/audio/audio_load.c index 641e2fbb..7b5a2216 100644 --- a/src/audio/audio_load.c +++ b/src/audio/audio_load.c @@ -214,6 +214,7 @@ void AudioLoad_InitSampleDmaBuffers(s32 numNotes) { gSampleDmaReuseQueue2WrPos = gSampleDmaCount - gSampleDmaListSize1; } +// Updates the audiotable entries with their absolute ROM addresses void AudioLoad_InitTable(AudioTable* table, u8* romAddr, u16 unkMediumParam) { s32 i; @@ -259,7 +260,7 @@ void AudioLoad_SyncLoadSeqParts(s32 seqId, s32 flags) { s32 AudioLoad_SyncLoadSample(Sample* sample, s32 fontId) { u8* sampleAddr; - if ((sample->isRelocated == 1) && (sample->medium != 0)) { + if ((sample->isRelocated == true) && (sample->medium != MEDIUM_RAM)) { sampleAddr = AudioHeap_AllocPersistentSampleCache(sample->size, fontId, sample->sampleAddr, sample->medium); if (sampleAddr == NULL) { return -1; @@ -486,6 +487,7 @@ void* AudioLoad_SyncLoadFont(s32 fontId) { if (didAllocate == 1) { AudioLoad_RelocateFontAndPreloadSamples(fontId, fontData, &relocInfo, AUDIOLOAD_SYNC); } + return fontData; } @@ -649,13 +651,14 @@ void AudioLoad_RelocateFont(s32 fontId, u32 fontBaseAddr, void* relocData) { } } } + for (i = 1; i <= numInstruments; i++) { if (fontDataPtrs[i] != 0) { fontDataPtrs[i] += fontBaseAddr; instrument = fontDataPtrs[i]; - if (instrument->isRelocated == 0) { + if (!instrument->isRelocated) { if (instrument->normalRangeLo != 0) { AudioLoad_RelocateSample(&instrument->lowPitchTunedSample, fontBaseAddr, relocData); } @@ -669,6 +672,7 @@ void AudioLoad_RelocateFont(s32 fontId, u32 fontBaseAddr, void* relocData) { } } } + gSoundFontList[fontId].drums = fontDataPtrs[0]; gSoundFontList[fontId].instruments = (u32) &fontDataPtrs[1]; } @@ -723,7 +727,7 @@ s32 AudioLoad_Dma(OSIoMesg* mesg, u32 priority, s32 direction, u32 devAddr, void return 0; } - if (size & 0xF) { + if (size % 16) { size = ALIGN16(size); } @@ -763,19 +767,19 @@ void* AudioLoad_AsyncLoadInner(s32 tableType, s32 id, s32 nChunks, s32 retData, switch (tableType) { case SEQUENCE_TABLE: - if (gSeqLoadStatus[id] == 1) { + if (gSeqLoadStatus[id] == LOAD_STATUS_IN_PROGRESS) { return NULL; } break; case FONT_TABLE: - if (gFontLoadStatus[id] == 1) { + if (gFontLoadStatus[id] == LOAD_STATUS_IN_PROGRESS) { return NULL; } break; case SAMPLE_TABLE: - if (gSampleFontLoadStatus[id] == 1) { + if (gSampleFontLoadStatus[id] == LOAD_STATUS_IN_PROGRESS) { return NULL; } break; @@ -783,7 +787,7 @@ void* AudioLoad_AsyncLoadInner(s32 tableType, s32 id, s32 nChunks, s32 retData, ramAddr = AudioLoad_SearchCaches(tableType, id); if (ramAddr != NULL) { - loadStatus = 2; + loadStatus = LOAD_STATUS_COMPLETE; osSendMesg(retQueue, (OSMesg) (retData << 0x18), OS_MESG_NOBLOCK); } else { table = AudioLoad_GetLoadTable(tableType); @@ -792,7 +796,7 @@ void* AudioLoad_AsyncLoadInner(s32 tableType, s32 id, s32 nChunks, s32 retData, medium = table->entries[id].medium; cachePolicy = table->entries[id].cachePolicy; romAddr = table->entries[id].romAddr; - loadStatus = 2; + loadStatus = LOAD_STATUS_COMPLETE; switch (cachePolicy) { case CACHEPOLICY_0: @@ -800,7 +804,7 @@ void* AudioLoad_AsyncLoadInner(s32 tableType, s32 id, s32 nChunks, s32 retData, if (ramAddr == NULL) { return ramAddr; } - loadStatus = 5; + loadStatus = LOAD_STATUS_PERMANENTLY_LOADED; break; case CACHEPOLICY_1: @@ -827,7 +831,7 @@ void* AudioLoad_AsyncLoadInner(s32 tableType, s32 id, s32 nChunks, s32 retData, } AudioLoad_StartAsyncLoad(romAddr, ramAddr, size, medium, nChunks, retQueue, (retData << 0x18) | (tableType << 0x10) | (id << 8) | loadStatus); - loadStatus = 1; + loadStatus = LOAD_STATUS_IN_PROGRESS; } switch (tableType) { @@ -892,21 +896,22 @@ void AudioLoad_Init(void) { *clearContext++ = 0; } + // 1000 is a conversion from seconds to milliseconds switch (osTvType) { case OS_TV_PAL: - gMaxTempoTvTypeFactors = 20.03042f; - gRefreshRate = 50; + gMaxTempoTvTypeFactors = 1000 * REFRESH_RATE_DEVIATION_PAL / REFRESH_RATE_PAL; + gRefreshRate = REFRESH_RATE_PAL; break; case OS_TV_MPAL: - gMaxTempoTvTypeFactors = 16.546f; - gRefreshRate = 60; + gMaxTempoTvTypeFactors = 1000 * REFRESH_RATE_DEVIATION_MPAL / REFRESH_RATE_MPAL; + gRefreshRate = REFRESH_RATE_MPAL; break; - default: case OS_TV_NTSC: - gMaxTempoTvTypeFactors = 16.713f; - gRefreshRate = 60; + default: + gMaxTempoTvTypeFactors = 1000 * REFRESH_RATE_DEVIATION_NTSC / REFRESH_RATE_NTSC; + gRefreshRate = REFRESH_RATE_NTSC; break; } @@ -940,6 +945,7 @@ void AudioLoad_Init(void) { gAiBuffers[i][j] = 0; } } + gAudioSpecId = AUDIOSPEC_0; gAudioResetStep = 1; AudioHeap_ResetStep(); @@ -977,6 +983,7 @@ void AudioLoad_Init(void) { static const char devstr38[] = "Entry--- %d %d\n"; static const char devstr39[] = "---Block LPS here\n"; static const char devstr40[] = "===Block LPS end\n"; + s32 AudioLoad_SlowLoadSample(s32 fontId, u8 instId, s8* status) { Sample* sample; AudioSlowLoad* slowLoad; @@ -995,10 +1002,13 @@ s32 AudioLoad_SlowLoadSample(s32 fontId, u8 instId, s8* status) { if (slowLoad->state == SLOW_LOAD_DONE) { slowLoad->state = SLOW_LOAD_WAITING; } + slowLoad->sample = *sample; slowLoad->status = status; + slowLoad->curRamAddr = AudioHeap_AllocTemporarySampleCache(sample->size, fontId, sample->sampleAddr, sample->medium); + if (slowLoad->curRamAddr == NULL) { if ((sample->medium == MEDIUM_UNK) || (sample->codec == 2)) { *status = SLOW_LOAD_STATUS_0; @@ -1008,6 +1018,7 @@ s32 AudioLoad_SlowLoadSample(s32 fontId, u8 instId, s8* status) { return -1; } } + slowLoad->state = SLOW_LOAD_START; slowLoad->bytesRemaining = ALIGN16(sample->size); slowLoad->ramAddr = slowLoad->curRamAddr; @@ -1016,6 +1027,7 @@ s32 AudioLoad_SlowLoadSample(s32 fontId, u8 instId, s8* status) { slowLoad->seqOrFontId = fontId; slowLoad->instId = instId; gSlowLoads.unk_00 ^= 1; + return 0; } diff --git a/src/audio/audio_seqplayer.c b/src/audio/audio_seqplayer.c index 524d96eb..2c4851df 100644 --- a/src/audio/audio_seqplayer.c +++ b/src/audio/audio_seqplayer.c @@ -1399,11 +1399,14 @@ void func_800168BC(void) { gSeqChannels[i].layers[j] = NULL; } } + func_8001463C(); + for (i = 0; i < ARRAY_COUNT(gSeqLayers); i++) { gSeqLayers[i].channel = NULL; gSeqLayers[i].enabled = false; } + for (i = 0; i < ARRAY_COUNT(gSeqPlayers); i++) { for (j = 0; j < 16; j++) { gSeqPlayers[i].channels[j] = &gSeqChannelNone; diff --git a/src/audio/audio_synthesis.c b/src/audio/audio_synthesis.c index 99eb52ad..de98438f 100644 --- a/src/audio/audio_synthesis.c +++ b/src/audio/audio_synthesis.c @@ -513,7 +513,7 @@ void func_80009504(s16* arg0, UnkStruct_800097A8* arg1) { func_80008364(D_80145D48, D_80146148, 8, D_80146548); - for (i = 0; i < 0x100; i++) { + for (i = 0; i < 256; i++) { if (D_80145D48[i] > 32767.0f) { D_80145D48[i] = 32767.0f; } @@ -537,6 +537,7 @@ s32 func_8000967C(s32 length, s16* ramAddr, UnkStruct_800097A8* arg2) { for (i = 0; i < arg2->unk_4; i++) { ramAddr[i] = temp_t7[i]; } + var_s1 = arg2->unk_4; temp_t0 = (length - arg2->unk_4 + 0xFF) / 256; arg2->unk_4 = (temp_t0 * 256) + arg2->unk_4 - length; @@ -545,6 +546,7 @@ s32 func_8000967C(s32 length, s16* ramAddr, UnkStruct_800097A8* arg2) { func_80009504(&ramAddr[var_s1], arg2); var_s1 += 0x100; } + for (i = 0; i < arg2->unk_4; i++) { temp_t7[i] = ramAddr[length + i]; } @@ -568,10 +570,13 @@ u8* func_800097A8(Sample* sample, s32 length, u32 flags, UnkStruct_800097A8* arg arg3->unk_14->sizeUnused = 0; } } + if (gSampleDmaReuseQueue1RdPos != gSampleDmaReuseQueue1WrPos) { sp1C = &gSampleDmas[gSampleDmaReuseQueue1[gSampleDmaReuseQueue1RdPos++]]; } - if (1) {} + + if (1) {} //! FAKE + sp1C->ttl = 2; sp1C->devAddr = sample->sampleAddr; sp1C->sizeUnused = length * 2; @@ -635,6 +640,7 @@ Acmd* func_80009B64(Acmd* aList, s32* cmdCount, s16* aiBufStart, s32 aiBufLen) { func_8001678C(i - 1); func_80009AAC(gAudioBufferParams.ticksPerUpdate - i); } + aiBufPtr = (s32*) aiBufStart; for (i = gAudioBufferParams.ticksPerUpdate; i > 0; i--) { if (i == 1) { @@ -646,22 +652,27 @@ Acmd* func_80009B64(Acmd* aList, s32* cmdCount, s16* aiBufStart, s32 aiBufLen) { } else { chunkLen = gAudioBufferParams.samplesPerTick; } + for (j = 0; j < gNumSynthReverbs; j++) { if (gSynthReverbs[j].useReverb) { func_800080C0(chunkLen, gAudioBufferParams.ticksPerUpdate - i, j); } } + aCmdPtr = func_8000A25C((s16*) aiBufPtr, chunkLen, aCmdPtr, gAudioBufferParams.ticksPerUpdate - i); aiBufLen -= chunkLen; aiBufPtr += chunkLen; } + for (j = 0; j < gNumSynthReverbs; j++) { if (gSynthReverbs[j].framesToIgnore != 0) { gSynthReverbs[j].framesToIgnore--; } gSynthReverbs[j].curFrame ^= 1; } + *cmdCount = aCmdPtr - aList; + return aCmdPtr; } @@ -715,6 +726,7 @@ Acmd* func_8000A128(Acmd* aList, s16 reverbIndex, s16 updateIndex) { aList = func_80009984(aList, sp24->lengthA + 0xC90, 0, sp24->lengthB, reverbIndex); } break; + default: aSaveBuffer(aList++, 0xC90, OS_K0_TO_PHYSICAL(gSynthReverbs[reverbIndex] @@ -724,6 +736,7 @@ Acmd* func_8000A128(Acmd* aList, s16 reverbIndex, s16 updateIndex) { gSynthReverbs[reverbIndex].resampleFlags = 0; break; } + return aList; } @@ -731,61 +744,66 @@ Acmd* func_8000A25C(s16* aiBuf, s32 aiBufLen, Acmd* aList, s32 updateIndex) { u8 sp84[0x3C]; NoteSubEu* temp_v0; s16 var_s2; - s16 var_s3; - s32 var_s1; + s16 i; + s32 j; var_s2 = 0; if (gNumSynthReverbs == 0) { - if (gSynthReverbs[var_s3].useReverb) {} // fake? - for (var_s1 = 0; var_s1 < gNumNotes; var_s1++) { - if (gNoteSubsEu[gNumNotes * updateIndex + var_s1].bitField0.enabled) { - sp84[var_s2++] = var_s1; + if (gSynthReverbs[i].useReverb) {} // fake? + for (j = 0; j < gNumNotes; j++) { + if (gNoteSubsEu[gNumNotes * updateIndex + j].bitField0.enabled) { + sp84[var_s2++] = j; } } } else { - for (var_s3 = 0; var_s3 < gNumSynthReverbs; var_s3++) { - for (var_s1 = 0; var_s1 < gNumNotes; var_s1++) { - temp_v0 = &gNoteSubsEu[gNumNotes * updateIndex + var_s1]; - if (temp_v0->bitField0.enabled && (temp_v0->bitField1.reverbIndex == var_s3)) { - sp84[var_s2++] = var_s1; + for (i = 0; i < gNumSynthReverbs; i++) { + for (j = 0; j < gNumNotes; j++) { + temp_v0 = &gNoteSubsEu[gNumNotes * updateIndex + j]; + if (temp_v0->bitField0.enabled && (temp_v0->bitField1.reverbIndex == i)) { + sp84[var_s2++] = j; } } } - for (var_s1 = 0; var_s1 < gNumNotes; var_s1++) { - temp_v0 = &gNoteSubsEu[gNumNotes * updateIndex + var_s1]; + for (j = 0; j < gNumNotes; j++) { + temp_v0 = &gNoteSubsEu[gNumNotes * updateIndex + j]; if (temp_v0->bitField0.enabled && (temp_v0->bitField1.reverbIndex >= gNumSynthReverbs)) { - sp84[var_s2++] = var_s1; + sp84[var_s2++] = j; } } } + aClearBuffer(aList++, 0x990, 0x300); - var_s1 = 0; - for (var_s3 = 0; var_s3 < gNumSynthReverbs; var_s3++) { - D_8014C1B2 = gSynthReverbs[var_s3].useReverb; + + j = 0; + for (i = 0; i < gNumSynthReverbs; i++) { + D_8014C1B2 = gSynthReverbs[i].useReverb; if (D_8014C1B2) { - aList = func_80009D78(aList, aiBufLen, var_s3, updateIndex); + aList = func_80009D78(aList, aiBufLen, i, updateIndex); } - while (var_s1 < var_s2) { - if (var_s3 != gNoteSubsEu[updateIndex * gNumNotes + sp84[var_s1]].bitField1.reverbIndex) { + while (j < var_s2) { + if (i != gNoteSubsEu[updateIndex * gNumNotes + sp84[j]].bitField1.reverbIndex) { break; } - aList = func_8000A700(sp84[var_s1], &gNoteSubsEu[updateIndex * gNumNotes + sp84[var_s1]], - &gNotes[sp84[var_s1]].synthesisState, aiBuf, aiBufLen, aList, updateIndex); - var_s1++; + aList = func_8000A700(sp84[j], &gNoteSubsEu[updateIndex * gNumNotes + sp84[j]], + &gNotes[sp84[j]].synthesisState, aiBuf, aiBufLen, aList, updateIndex); + j++; } - if (gSynthReverbs[var_s3].useReverb) { - aList = func_8000A128(aList, var_s3, updateIndex); + if (gSynthReverbs[i].useReverb) { + aList = func_8000A128(aList, i, updateIndex); } } - while (var_s1 < var_s2) { - aList = func_8000A700(sp84[var_s1], &gNoteSubsEu[updateIndex * gNumNotes + sp84[var_s1]], - &gNotes[sp84[var_s1]].synthesisState, aiBuf, aiBufLen, aList, updateIndex); - var_s1++; + + while (j < var_s2) { + aList = func_8000A700(sp84[j], &gNoteSubsEu[updateIndex * gNumNotes + sp84[j]], &gNotes[sp84[j]].synthesisState, + aiBuf, aiBufLen, aList, updateIndex); + j++; } - var_s1 = aiBufLen * 2; - aSetBuffer(aList++, 0, 0, 0x450, var_s1); + + j = aiBufLen * 2; + aSetBuffer(aList++, 0, 0, 0x450, j); aInterleave(aList++, 0, 0x990, 0xB10, 0); - aSaveBuffer(aList++, 0x450, OS_K0_TO_PHYSICAL(aiBuf), var_s1 * 2); + aSaveBuffer(aList++, 0x450, OS_K0_TO_PHYSICAL(aiBuf), j * 2); + return aList; } @@ -1209,8 +1227,10 @@ Acmd* func_8000B51C(Acmd* aList, NoteSubEu* noteSub, NoteSynthesisState* synthSt } else { var_a2 = 0; } + synthState->curVolLeft = temp_t1 + (var_t0 * (aiBufLen >> 3)); synthState->curVolRight = temp_t2 + (var_a3 * (aiBufLen >> 3)); + if (noteSub->bitField0.usesHeadsetPanEffects) { aClearBuffer(aList++, 0x650, 0x180); aEnvSetup1(aList++, (temp_a1 & 0x7F), var_a2, var_t0, var_a3); @@ -1255,6 +1275,7 @@ Acmd* func_8000B98C(Acmd* aList, NoteSubEu* noteSub, NoteSynthesisState* synthSt var_v1 = synthState->prevHaasEffectLeftDelaySize; synthState->prevHaasEffectLeftDelaySize = var_a1; break; + case 2: var_t0 = 0xB10; var_a1 = noteSub->rightDelaySize; @@ -1262,9 +1283,11 @@ Acmd* func_8000B98C(Acmd* aList, NoteSubEu* noteSub, NoteSynthesisState* synthSt var_v1 = synthState->prevHaasEffectRightDelaySize; synthState->prevHaasEffectRightDelaySize = var_a1; break; + default: return aList; } + if (flags != 1) { if (var_a1 != var_v1) { temp = (((size << 0xF) / 2) - 1) / ((size + var_a1 - var_v1 - 2) / 2); @@ -1289,6 +1312,8 @@ Acmd* func_8000B98C(Acmd* aList, NoteSubEu* noteSub, NoteSynthesisState* synthSt aSaveBuffer(aList++, size + 0x650, OS_K0_TO_PHYSICAL(synthState->synthesisBuffers->panSamplesBuffer), ALIGN16(var_a1)); } + aAddMixer(aList++, ALIGN64(size), 0x650, var_t0, 0x7FFF); + return aList; } diff --git a/src/audio/audio_thread.c b/src/audio/audio_thread.c index 93e95988..dfa3cfe1 100644 --- a/src/audio/audio_thread.c +++ b/src/audio/audio_thread.c @@ -57,26 +57,33 @@ SPTask* AudioThread_CreateTask(void) { if ((gAudioTaskCountQ % gAudioBufferParams.count) != 0) { return gWaitingAudioTask; } + osSendMesg(gAudioTaskStartQueue, (OSMesg) gAudioTaskCountQ, OS_MESG_NOBLOCK); + gAudioTaskIndexQ ^= 1; gCurAiBuffIndex++; gCurAiBuffIndex %= 3; aiBuffIndex = (gCurAiBuffIndex + 1) % 3; aiSamplesLeft = osAiGetLength() / 4; + if ((gAudioResetTimer < 16) && (gAiBuffLengths[aiBuffIndex] != 0)) { osAiSetNextBuffer(gAiBuffers[aiBuffIndex], gAiBuffLengths[aiBuffIndex] * 4); } - if (gCurAudioFrameDmaCount && gCurAudioFrameDmaCount) {} + + if (gCurAudioFrameDmaCount && gCurAudioFrameDmaCount) {} //! FAKE ? + gCurAudioFrameDmaCount = 0; AudioLoad_DecreaseSampleDmaTtls(); AudioLoad_ProcessLoads(gAudioResetStep); + if (MQ_GET_MESG(gAudioSpecQueue, &specId)) { if (gAudioResetStep == 0) { gAudioResetStep = 5; } gAudioSpecId = specId; } + if ((gAudioResetStep != 0) && (AudioHeap_ResetStep() == 0)) { if (gAudioResetStep == 0) { osSendMesg(gAudioResetQueue, (OSMesg) (s32) gAudioSpecId, OS_MESG_NOBLOCK); @@ -84,12 +91,14 @@ SPTask* AudioThread_CreateTask(void) { gWaitingAudioTask = NULL; return NULL; } + if (gAudioResetTimer > 16) { return NULL; } if (gAudioResetTimer != 0) { gAudioResetTimer++; } + gAudioCurTask = &gAudioRspTasks[gAudioTaskIndexQ]; gCurAbiCmdBuffer = gAbiCmdBuffs[gAudioTaskIndexQ]; aiBuffIndex = gCurAiBuffIndex; diff --git a/src/engine/fox_360.c b/src/engine/fox_360.c index 8cb0499d..161fafb0 100644 --- a/src/engine/fox_360.c +++ b/src/engine/fox_360.c @@ -295,8 +295,8 @@ void ActorAllRange_SetShadowData(Actor* this) { Vec3f temp1; f32 temp4; f32 temp5; - Vec3f spE4; - Vec3f spD8; + Vec3f src; + Vec3f dest; Vec3f spCC; Vec3f spC0; Vec3f spB4; @@ -306,6 +306,7 @@ void ActorAllRange_SetShadowData(Actor* this) { s32 pad[2]; this->fwork[25] = this->fwork[26] = this->fwork[28] = this->fwork[27] = 0.0f; + if (this->drawShadow && (gLevelMode == LEVELMODE_ALL_RANGE) && (gLevelType == LEVELTYPE_PLANET)) { for (i = 0, scenery360 = gScenery360; i < 200; i++, scenery360++) { if ((scenery360->obj.status == OBJ_ACTIVE) && @@ -321,17 +322,17 @@ void ActorAllRange_SetShadowData(Actor* this) { temp4 = scenery360->obj.rot.y; Matrix_RotateY(gCalcMatrix, -temp4 * M_DTOR, MTXF_NEW); - spE4.x = this->obj.pos.x - temp1.x; - spE4.y = 0.0f; - spE4.z = this->obj.pos.z - temp1.z; - Matrix_MultVec3fNoTranslate(gCalcMatrix, &spE4, &spD8); + src.x = this->obj.pos.x - temp1.x; + src.y = 0.0f; + src.z = this->obj.pos.z - temp1.z; + Matrix_MultVec3fNoTranslate(gCalcMatrix, &src, &dest); spC0.x = temp1.x; spC0.y = temp1.y; - spCC.x = spD8.x + temp1.x; + spCC.x = dest.x + temp1.x; spC0.z = temp1.z; // fake? weird ordering - spCC.y = spD8.y + temp1.y; - spCC.z = spD8.z + temp1.z; + spCC.y = dest.y + temp1.y; + spCC.z = dest.z + temp1.z; if ((scenery360->obj.id == OBJ_SCENERY_FO_MOUNTAIN_2) || (scenery360->obj.id == OBJ_SCENERY_FO_MOUNTAIN_3)) { @@ -618,7 +619,11 @@ void ActorAllRange_UpdateEnemyEvents(Actor* this) { ActorAllRange* enemy2; s32 j; +#ifdef AVOID_UB + for (j = 0, enemy2 = &gActors[AI360_ENEMY]; j < 50; j++, enemy2++) { +#else for (j = 0, enemy2 = &gActors[AI360_ENEMY]; j <= 50; j++, enemy2++) { // bug? should be < +#endif if ((enemy2->obj.status == OBJ_ACTIVE) && (enemy2->state == STATE360_2) && (enemy2->aiIndex == enemy->aiIndex)) { return; @@ -742,7 +747,14 @@ void ActorAllRange_UpdateEvents(Actor* this) { ActorAllRange_SpawnSupplies(this); } -s32 func_360_800301F4(Actor* this) { +/** + * Checks whether an actor is close to Scenery objects or Bosses in Space Levels. + * Return values: + * 1: Object nearby is found below the actor + * -1: Object nearby is found above the actor + * 0: No objects found + */ +s32 ActorAllRange_CheckObjectNearbySpace(Actor* this) { Boss* boss; f32 temp_ft4; f32 temp_ft5; @@ -775,6 +787,7 @@ s32 func_360_800301F4(Actor* this) { } boss = &gBosses[0]; + // Check if the actor is close to the Great Fox in Sector Z. if ((gCurrentLevel == LEVEL_SECTOR_Z) && (fabsf(boss->obj.pos.x - (this->obj.pos.x + temp_ft4)) < 2000.0f) && (fabsf(boss->obj.pos.z - (this->obj.pos.z + temp_ft5)) < 2000.0f)) { if (fabsf(boss->obj.pos.y - this->obj.pos.y) < 1500.0f) { @@ -788,15 +801,22 @@ s32 func_360_800301F4(Actor* this) { return 0; } -s32 func_360_8003049C(ActorAllRange* this) { +/** + * Checks whether an actor is close to Scenery objects or specific Bosses. + * Return values: + * 1: Object nearby is found below the actor + * -1: Object nearby is found above the actor + * 0: No objects found + */ +s32 ActorAllRange_CheckObjectNearby(ActorAllRange* this) { Scenery360* scenery360; s32 i; - f32 sp44; - f32 sp40; - f32 sp3C; - f32 temp_fa0; - f32 temp_ft4; - f32 var_ft5; + f32 distThreshold; + f32 sinRotY; + f32 cosRotY; + f32 xOffset; + f32 zOffset; + f32 yDistThreshold; Boss* boss = &gBosses[0]; s32 pad[4]; @@ -805,45 +825,45 @@ s32 func_360_8003049C(ActorAllRange* this) { } if ((gLevelType == LEVELTYPE_SPACE) && (gCurrentLevel != LEVEL_BOLSE)) { - return func_360_800301F4(this); + return ActorAllRange_CheckObjectNearbySpace(this); } - sp40 = SIN_DEG(this->obj.rot.y); - sp3C = COS_DEG(this->obj.rot.y); + sinRotY = SIN_DEG(this->obj.rot.y); + cosRotY = COS_DEG(this->obj.rot.y); - temp_fa0 = this->fwork[9] * 10.0f + (sp40 * 650.0f); - temp_ft4 = this->fwork[9] * 10.0f + (sp3C * 650.0f); + xOffset = this->fwork[9] * 10.0f + (sinRotY * 650.0f); + zOffset = this->fwork[9] * 10.0f + (cosRotY * 650.0f); if (gLevelMode == LEVELMODE_ALL_RANGE) { for (i = 0, scenery360 = gScenery360; i < 200; i++, scenery360++) { if ((scenery360->obj.status == OBJ_ACTIVE) && - (fabsf(scenery360->obj.pos.x - (this->obj.pos.x + temp_fa0)) < 1200.0f) && - (fabsf(scenery360->obj.pos.z - (this->obj.pos.z + temp_ft4)) < 1200.0f) && (this->obj.pos.y < 650.0f)) { + (fabsf(scenery360->obj.pos.x - (this->obj.pos.x + xOffset)) < 1200.0f) && + (fabsf(scenery360->obj.pos.z - (this->obj.pos.z + zOffset)) < 1200.0f) && (this->obj.pos.y < 650.0f)) { return 1; } } } - sp44 = 1200.0f; - var_ft5 = 650.0f; + distThreshold = 1200.0f; + yDistThreshold = 650.0f; - if (this->aiType < AI360_KATT) { - var_ft5 = 720.0f; + if (this->aiType <= AI360_ANDREW) { + yDistThreshold = 720.0f; } if (boss->obj.id == OBJ_BOSS_CO_CARRIER) { - var_ft5 = 350.0f; + yDistThreshold = 350.0f; } else if (boss->obj.id == OBJ_BOSS_BO_BASE) { - sp44 = 2000.0f; - var_ft5 = 750.0f; + distThreshold = 2000.0f; + yDistThreshold = 750.0f; } else if (boss->obj.id == OBJ_BOSS_KA_FLBASE) { - sp44 = 1500.0f; - var_ft5 = 700.0f; + distThreshold = 1500.0f; + yDistThreshold = 700.0f; } - if ((fabsf(boss->obj.pos.x - (this->obj.pos.x + temp_fa0)) < sp44) && - (fabsf(boss->obj.pos.z - (this->obj.pos.z + temp_ft4)) < sp44) && - (fabsf(boss->obj.pos.y - this->obj.pos.y) < var_ft5)) { + if ((fabsf(boss->obj.pos.x - (this->obj.pos.x + xOffset)) < distThreshold) && + (fabsf(boss->obj.pos.z - (this->obj.pos.z + zOffset)) < distThreshold) && + (fabsf(boss->obj.pos.y - this->obj.pos.y) < yDistThreshold)) { return 1; } else { return 0; @@ -945,7 +965,7 @@ void ActorAllRange_ApplyDamage(ActorAllRange* this) { this->timer_0C2 = 10; this->timer_0BE = 0; - this->timer_04C = RAND_INT(2.9f); + this->work_04C = RAND_INT(2.9f); switch (RAND_INT(4.0f)) { case 0: @@ -1262,7 +1282,7 @@ static Vec3f sSectorZRetreatPath[6] = { void ActorAllRange_Update(ActorAllRange* this) { u8 sp10F; - s32 sp108; + s32 objectNearby; s32 sp104; s32 temp_v0_27; RadarMark* radarMark; @@ -1336,7 +1356,7 @@ void ActorAllRange_Update(ActorAllRange* this) { if (this->rot_0F4.x > 180.0f) { this->rot_0F4.x -= 360.0f; } - this->unk_046 = 0; + this->work_046 = 0; break; case STATE360_9: @@ -1462,7 +1482,7 @@ void ActorAllRange_Update(ActorAllRange* this) { this->fwork[7] = 360.0f; this->fwork[8] = 0.0f; AUDIO_PLAY_SFX(NA_SE_ARWING_BOOST, this->sfxSource, 0); - this->unk_046 = 0; + this->work_046 = 0; } gTeamShields[this->aiType] = -1; gTeamDamage[this->aiType] = 0; @@ -1479,13 +1499,13 @@ void ActorAllRange_Update(ActorAllRange* this) { gTeamShields[this->aiType] = -1; gTeamDamage[this->aiType] = 0; if (gCurrentLevel == LEVEL_SECTOR_Z) { - this->fwork[4] = sSectorZRetreatPath[this->unk_046].x; - this->fwork[5] = sSectorZRetreatPath[this->unk_046].y; - this->fwork[6] = sSectorZRetreatPath[this->unk_046].z; - if ((fabsf(this->obj.pos.x - sSectorZRetreatPath[this->unk_046].x) < 800.0f) && - (fabsf(this->obj.pos.z - sSectorZRetreatPath[this->unk_046].z) < 800.0f)) { - this->unk_046++; - if (this->unk_046 >= 4) { + this->fwork[4] = sSectorZRetreatPath[this->work_046].x; + this->fwork[5] = sSectorZRetreatPath[this->work_046].y; + this->fwork[6] = sSectorZRetreatPath[this->work_046].z; + if ((fabsf(this->obj.pos.x - sSectorZRetreatPath[this->work_046].x) < 800.0f) && + (fabsf(this->obj.pos.z - sSectorZRetreatPath[this->work_046].z) < 800.0f)) { + this->work_046++; + if (this->work_046 >= 4) { Object_Kill(&this->obj, this->sfxSource); } } @@ -1989,7 +2009,7 @@ void ActorAllRange_Update(ActorAllRange* this) { Math_SmoothStepToAngle(&this->obj.rot.z, 5.0f, 0.1f, 3.0f, 0.01f); } - switch (this->unk_046) { + switch (this->work_046) { case 0: Math_SmoothStepToF(&this->rot_0F4.x, 200.0f, 0.1f, 6.0f, 0.0001f); if (this->rot_0F4.x > 190.0f) { @@ -2003,7 +2023,7 @@ void ActorAllRange_Update(ActorAllRange* this) { this->obj.rot.z -= 360.0f; } this->timer_0BC = 40; - this->unk_046++; + this->work_046++; } this->obj.pos.y -= 3.0f; break; @@ -2057,12 +2077,12 @@ void ActorAllRange_Update(ActorAllRange* this) { spD8 = this->fwork[20]; spD4 = this->fwork[19]; - sp108 = 0; + objectNearby = 0; if (sp104 == 1) { if (this->aiType < AI360_GREAT_FOX) { - sp108 = func_360_8003049C(this); - if ((sp108 != 0) && (this->aiType < AI360_ENEMY) && (this->timer_0BE == 0) && + objectNearby = ActorAllRange_CheckObjectNearby(this); + if ((objectNearby != 0) && (this->aiType < AI360_ENEMY) && (this->timer_0BE == 0) && ((this->fwork[7] < 0.01f) || (this->fwork[7] > 359.9f))) { this->timer_0BE = RAND_INT(200.0f) + 200; if (Rand_ZeroOne() < 0.5f) { @@ -2075,11 +2095,11 @@ void ActorAllRange_Update(ActorAllRange* this) { } } - if (sp108 != 0) { + if (objectNearby != 0) { if ((this->aiType < AI360_ENEMY) || (gCurrentLevel != LEVEL_FORTUNA)) { - spD8 += 40.0f * sp108; + spD8 += 40.0f * objectNearby; } else { - spD8 += 20.0f * sp108; + spD8 += 20.0f * objectNearby; } if (spD8 >= 360.0f) { spD8 -= 360.0f; @@ -2277,9 +2297,9 @@ void ActorAllRange_Update(ActorAllRange* this) { if (gCurrentLevel == LEVEL_FORTUNA) { ActorAllRange_SetShadowData(this); } else if (gCurrentLevel == LEVEL_VENOM_ANDROSS) { - this->unk_04A++; - if (this->unk_04A >= Animation_GetFrameCount(&D_VE2_600C200)) { - this->unk_04A = 0; + this->work_04A++; + if (this->work_04A >= Animation_GetFrameCount(&D_VE2_600C200)) { + this->work_04A = 0; } } @@ -2404,35 +2424,35 @@ void ActorAllRange_Draw(ActorAllRange* this) { case AI360_PIGMA: case AI360_ANDREW: if (gCurrentLevel == LEVEL_VENOM_2) { - gSPDisplayList(gMasterDisp++, D_STAR_WOLF_F0103D0); + gSPDisplayList(gMasterDisp++, aStarWolfUpgradedShipDL); Matrix_Push(&gGfxMatrix); Matrix_Translate(gGfxMatrix, 30.0f, 0.0f, -60.0f, MTXF_APPLY); - Actor_DrawEngineGlow(this, 2); + Actor_DrawEngineGlow(this, EG_GREEN); Matrix_Pop(&gGfxMatrix); Matrix_Push(&gGfxMatrix); Matrix_Translate(gGfxMatrix, -30.0f, 0.0f, -60.0f, MTXF_APPLY); - Actor_DrawEngineGlow(this, 2); + Actor_DrawEngineGlow(this, EG_GREEN); Matrix_Pop(&gGfxMatrix); ActorAllRange_DrawBarrelRoll(this); ActorAllRange_DrawShield(this); } else { - gSPDisplayList(gMasterDisp++, D_STAR_WOLF_F00F200); + gSPDisplayList(gMasterDisp++, aStarWolfStandardShipDL); Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -60.0f, MTXF_APPLY); if (gCurrentLevel == LEVEL_BOLSE) { - Actor_DrawEngineGlow(this, 3); + Actor_DrawEngineGlow(this, EG_ORANGE); } else { - Actor_DrawEngineGlow(this, 2); + Actor_DrawEngineGlow(this, EG_GREEN); } } break; case AI360_KATT: - gSPDisplayList(gMasterDisp++, D_D009A40); + gSPDisplayList(gMasterDisp++, aKattShipDL); Actor_DrawEngineAndContrails(this); break; case AI360_BILL: - gSPDisplayList(gMasterDisp++, D_D00B880); + gSPDisplayList(gMasterDisp++, aBillShipDL); Actor_DrawEngineAndContrails(this); break; @@ -2443,12 +2463,12 @@ void ActorAllRange_Draw(ActorAllRange* this) { break; case AI360_MISSILE: - Animation_GetFrameData(&D_SZ_6006D64, 0, jointTable); + Animation_GetFrameData(&aSzMissileAnim, 0, jointTable); Animation_DrawSkeleton(3, aSzMissileSkel, jointTable, ActorAllRange_MissileOverrideLimbDraw, NULL, this, gCalcMatrix); Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -400.0f, MTXF_APPLY); Matrix_Scale(gGfxMatrix, this->fwork[29], this->fwork[29], this->fwork[29], MTXF_APPLY); - Actor_DrawEngineGlow(this, 3); + Actor_DrawEngineGlow(this, EG_ORANGE); break; default: @@ -2458,7 +2478,7 @@ void ActorAllRange_Draw(ActorAllRange* this) { gSPDisplayList(gMasterDisp++, D_FO_6006BE0); Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -100.0f, MTXF_APPLY); Matrix_Scale(gGfxMatrix, 1.5f, 1.5f, 1.5f, MTXF_APPLY); - Actor_DrawEngineGlow(this, 2); + Actor_DrawEngineGlow(this, EG_GREEN); } else if (gCurrentLevel == LEVEL_KATINA) { switch (this->animFrame) { case 0: @@ -2467,7 +2487,7 @@ void ActorAllRange_Draw(ActorAllRange* this) { case 1: gSPDisplayList(gMasterDisp++, aKaCornerianFighterDL); Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -60.0f, MTXF_APPLY); - Actor_DrawEngineGlow(this, 0); + Actor_DrawEngineGlow(this, EG_RED); break; case 3: gSPDisplayList(gMasterDisp++, aKaEnemy1DL); @@ -2478,29 +2498,29 @@ void ActorAllRange_Draw(ActorAllRange* this) { } else if (gCurrentLevel == LEVEL_SECTOR_Z) { gSPDisplayList(gMasterDisp++, D_SZ_6004FE0); Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -60.0f, MTXF_APPLY); - Actor_DrawEngineGlow(this, 2); + Actor_DrawEngineGlow(this, EG_GREEN); } else if (gCurrentLevel == LEVEL_BOLSE) { gSPDisplayList(gMasterDisp++, D_BO_6008770); Matrix_Push(&gGfxMatrix); Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -60.0f, MTXF_APPLY); - Actor_DrawEngineGlow(this, 2); + Actor_DrawEngineGlow(this, EG_GREEN); Matrix_Pop(&gGfxMatrix); ActorAllRange_DrawShield(this); } else if (gCurrentLevel == LEVEL_VENOM_ANDROSS) { - Animation_GetFrameData(&D_VE2_600C200, this->unk_04A, this->vwork); + Animation_GetFrameData(&D_VE2_600C200, this->work_04A, this->vwork); Matrix_Scale(gGfxMatrix, 10.0f, 10.0f, 10.0f, MTXF_APPLY); Animation_DrawSkeleton(0, D_VE2_600C2AC, this->vwork, NULL, NULL, this, &gIdentityMatrix); } else if (gCurrentLevel == LEVEL_VERSUS) { gSPDisplayList(gMasterDisp++, D_versus_3015740); } else if (gCurrentLevel == LEVEL_TRAINING) { if (this->aiIndex == AI360_FOX) { - gSPDisplayList(gMasterDisp++, D_STAR_WOLF_F00F200); + gSPDisplayList(gMasterDisp++, aStarWolfStandardShipDL); Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -60.0f, MTXF_APPLY); - Actor_DrawEngineGlow(this, 3); + Actor_DrawEngineGlow(this, EG_ORANGE); } else { - gSPDisplayList(gMasterDisp++, D_ENMY_PLANET_40068F0); + gSPDisplayList(gMasterDisp++, aVenomFighter1DL); Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -60.0f, MTXF_APPLY); - Actor_DrawEngineGlow(this, 2); + Actor_DrawEngineGlow(this, EG_GREEN); } } break; diff --git a/src/engine/fox_beam.c b/src/engine/fox_beam.c index 0c27fc28..48feefa0 100644 --- a/src/engine/fox_beam.c +++ b/src/engine/fox_beam.c @@ -126,9 +126,11 @@ void PlayerShot_Impact(PlayerShot* shot) { Object_Kill(&shot->obj, shot->sfxSource); return; } + shot->obj.pos.z = gShotHitPosZ; // strange order on the globals shot->obj.pos.y = gShotHitPosY; shot->obj.pos.x = gShotHitPosX; + if ((shot->obj.id == PLAYERSHOT_BOMB) || ((gCurrentLevel != LEVEL_AQUAS) && (shot->obj.id == PLAYERSHOT_LOCK_ON) && (shot->unk_5C != 0))) { if (shot->obj.id == PLAYERSHOT_LOCK_ON) { @@ -138,10 +140,13 @@ void PlayerShot_Impact(PlayerShot* shot) { PlayerShot_ExplodeBomb(shot); } else if (shot->obj.id == PLAYERSHOT_LOCK_ON) { shot->scale = 7.5f; + for (i = 0; i < ARRAY_COUNT(gActors); i++) { gActors[i].lockOnTimers[shot->sourceId] = 0; } + shot->vel.x = shot->vel.y = shot->vel.z = 0.0f; + if (gCurrentLevel == LEVEL_AQUAS) { gLight3R = gLight3G = gLight3B = 0; Effect_Effect384_Spawn(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 10.0f, 4); @@ -195,7 +200,7 @@ void PlayerShot_SpawnEffect344(f32 xPos, f32 yPos, f32 zPos, f32 arg3, f32 arg4, } } -void PlayerShot_SetupEffect345(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 yRot, f32 scale) { +void PlayerShot_LaserMark1_Setup(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 yRot, f32 scale) { Effect_Initialize(effect); effect->obj.status = OBJ_INIT; effect->obj.id = OBJ_EFFECT_LASER_MARK_1; @@ -216,7 +221,7 @@ void PlayerShot_HitGround(f32 xPos, f32 yPos, f32 zPos, f32 yRot, f32 scale) { (gCurrentLevel != LEVEL_TRAINING) && (gCurrentLevel != LEVEL_SOLAR) && (gCurrentLevel != LEVEL_ZONESS)) { for (i = 0; i < 50; i++) { if (gEffects[i].obj.status == OBJ_FREE) { - PlayerShot_SetupEffect345(&gEffects[i], xPos, yPos, zPos, yRot, scale); + PlayerShot_LaserMark1_Setup(&gEffects[i], xPos, yPos, zPos, yRot, scale); func_effect_8007D10C(xPos, yPos, zPos, 2.0f); break; } @@ -363,6 +368,7 @@ s32 PlayerShot_CheckEventHitbox(PlayerShot* shot, Actor* actor) { (fabsf(shot->obj.pos.y - actor->obj.pos.y) < 2000.0f) && (fabsf(shot->obj.pos.x - actor->obj.pos.x) < 2000.0f)) { hitboxData = actor->info.hitbox; + count = *hitboxData++; if (count != 0) { xySizeMod = 0.0f; @@ -373,6 +379,7 @@ s32 PlayerShot_CheckEventHitbox(PlayerShot* shot, Actor* actor) { xySizeMod += 30.0f; } } + for (i = 0; i < count; i++, hitboxData += 6) { if (actor->info.unk_16 == 1) { shotPx = shot->obj.pos.x; @@ -394,7 +401,7 @@ s32 PlayerShot_CheckEventHitbox(PlayerShot* shot, Actor* actor) { } if (((actor->vwork[29].z != 0.0f) || (actor->vwork[29].x != 0.0f) || (actor->rot_0F4.z != 0.0f) || (actor->vwork[29].y != 0.0f)) && - (actor->eventType != EVID_31)) { + (actor->eventType != EVID_A6_UMBRA_STATION)) { Matrix_RotateZ(gCalcMatrix, -(actor->vwork[29].z + actor->rot_0F4.z) * M_DTOR, MTXF_APPLY); Matrix_RotateX(gCalcMatrix, -actor->vwork[29].x * M_DTOR, MTXF_APPLY); Matrix_RotateY(gCalcMatrix, -actor->vwork[29].y * M_DTOR, MTXF_APPLY); @@ -407,6 +414,7 @@ s32 PlayerShot_CheckEventHitbox(PlayerShot* shot, Actor* actor) { shotPy = actor->obj.pos.y + sp70.y; shotPz = actor->obj.pos.z + sp70.z; } + hitbox = (Hitbox*) hitboxData; if ((fabsf(hitbox->z.offset + actor->obj.pos.z - shotPz) < (hitbox->z.size + 50.0f)) && (fabsf(hitbox->x.offset + actor->obj.pos.x - shotPx) < (hitbox->x.size + xySizeMod)) && @@ -687,10 +695,10 @@ void PlayerShot_ApplyDamageToActor(PlayerShot* shot, Actor* actor, s32 hitIndex) actor->hitPos.y = shot->obj.pos.y; actor->hitPos.z = shot->obj.pos.z; if (((actor->obj.id == OBJ_ACTOR_EVENT) && (actor->dmgPart == 0) && - ((actor->eventType == EVID_48) || (actor->eventType == EVID_49) || (actor->eventType == EVID_50))) || + ((actor->eventType == EVID_SY_ROBOT_1) || (actor->eventType == EVID_SY_ROBOT_2) || + (actor->eventType == EVID_SY_ROBOT_3))) || ((actor->obj.id == OBJ_ACTOR_ALLRANGE) && (actor->fwork[23] > 1.0f)) || - ((actor->obj.id == OBJ_ACTOR_EVENT) && (actor->dmgPart == 0) && - (actor->eventType == EVID_METEO_PYRAMID_SHIP)) || + ((actor->obj.id == OBJ_ACTOR_EVENT) && (actor->dmgPart == 0) && (actor->eventType == EVID_ME_FLIP_BOT)) || ((actor->obj.id == OBJ_ACTOR_AQ_SCULPIN) && (shot->obj.id != PLAYERSHOT_LOCK_ON) && ((actor->state < 3) || (actor->state >= 5))) || ((actor->obj.id == OBJ_ACTOR_AQ_GAROA) && (shot->obj.id != PLAYERSHOT_LOCK_ON) && (actor->timer_0BC != 0))) { @@ -767,13 +775,13 @@ void PlayerShot_CollisionCheck(PlayerShot* shot) { } break; case OBJ_ACTOR_EVENT: - if (actor->eventType == EVID_42) { + if (actor->eventType == EVID_SY_SHIP_2) { if (PlayerShot_CheckPolyCollision(shot, ACTOR_EVENT_ID, &actor->obj)) { actor->dmgType = DMG_BEAM; actor->dmgPart = shot->sourceId; return; } - } else if (actor->eventType == EVID_63) { + } else if (actor->eventType == EVID_ME_BIG_METEOR) { test.x = fabsf(actor->obj.pos.x - shot->obj.pos.x); test.y = fabsf(actor->obj.pos.y - shot->obj.pos.y); test.z = fabsf(actor->obj.pos.z - shot->obj.pos.z); @@ -1929,7 +1937,7 @@ void PlayerShot_ApplyExplosionDamage(PlayerShot* shot, s32 damage) { actor->obj.status = OBJ_DYING; actor->timer_0BC = RAND_INT(15.0f) + 10; actor->timer_0BE = 0; - actor->timer_04C = 4; + actor->work_04C = 4; actor->obj.rot.x = Math_ModF(actor->obj.rot.x, 360.0f); if (actor->info.bonus != 0) { shot->bonus++; @@ -2267,12 +2275,14 @@ void PlayerShot_Update(PlayerShot* shot) { switch (shot->obj.status) { case SHOT_FREE: break; + case SHOT_ACTIVE: ticks = 1; switch (shot->obj.id) { case PLAYERSHOT_GFOX_LASER: ticks = 4; break; + case PLAYERSHOT_SINGLE_LASER: case PLAYERSHOT_TWIN_LASER: if ((shot->unk_58 == 0) || (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_LEVEL_INTRO)) { @@ -2281,10 +2291,12 @@ void PlayerShot_Update(PlayerShot* shot) { ticks = 3; } break; + case PLAYERSHOT_TANK: ticks = 2; break; } + for (i = 0; i < ticks && (shot->obj.status == SHOT_ACTIVE); i++) { if (shot->timer > 0) { shot->timer--; @@ -2295,6 +2307,7 @@ void PlayerShot_Update(PlayerShot* shot) { PlayerShot_UpdateShot(shot, i); } break; + case SHOT_HITMARK: PlayerShot_UpdateHitmark(shot); break; diff --git a/src/engine/fox_demo.c b/src/engine/fox_demo.c index fe973584..88ff4c93 100644 --- a/src/engine/fox_demo.c +++ b/src/engine/fox_demo.c @@ -90,6 +90,7 @@ void func_demo_80048CC4(ActorCutscene* this, s32 index) { this->rot_0F4.y = 0.0f; this->rot_0F4.z = D_demo_800C9F90[index]; + Object_SetInfo(&this->info, this->obj.id); if (index == 3) { @@ -103,8 +104,8 @@ void func_demo_80048CC4(ActorCutscene* this, s32 index) { } void Cutscene_WarpZoneComplete(Player* player) { - Vec3f sp5C; - Vec3f sp50; + Vec3f src; + Vec3f dest; s32 pad[2]; f32 temp_ft3; f32 temp_ret; @@ -140,10 +141,10 @@ void Cutscene_WarpZoneComplete(Player* player) { Math_SmoothStepToF(&player->baseSpeed, 0.0f, 1.0f, 0.5f, 0.0f); Matrix_RotateX(gCalcMatrix, -5.0f * M_DTOR, MTXF_NEW); Matrix_RotateY(gCalcMatrix, D_ctx_80177A48[1] * M_DTOR, MTXF_APPLY); - sp5C.x = 0.0f; - sp5C.y = 0.0f; - sp5C.z = 300.0f; - Matrix_MultVec3f(gCalcMatrix, &sp5C, &sp50); + src.x = 0.0f; + src.y = 0.0f; + src.z = 300.0f; + Matrix_MultVec3f(gCalcMatrix, &src, &dest); gCsCamAtX = player->pos.x; gCsCamAtY = player->pos.y; gCsCamAtZ = player->trueZpos + gPathProgress; @@ -221,9 +222,9 @@ void Cutscene_WarpZoneComplete(Player* player) { } } } else { - gCsCamEyeX = player->pos.x + sp50.x; - gCsCamEyeY = player->pos.y + sp50.y; - gCsCamEyeZ = player->trueZpos + gPathProgress + sp50.z; + gCsCamEyeX = player->pos.x + dest.x; + gCsCamEyeY = player->pos.y + dest.y; + gCsCamEyeZ = player->trueZpos + gPathProgress + dest.z; } break; @@ -238,14 +239,14 @@ void Cutscene_WarpZoneComplete(Player* player) { Matrix_RotateY(gCalcMatrix, (player->rot.y + 180.0f) * M_DTOR, MTXF_NEW); Matrix_RotateX(gCalcMatrix, -((player->rot.x + player->aerobaticPitch) * M_DTOR), MTXF_APPLY); - sp5C.x = 0.0f; - sp5C.y = 0.0f; - sp5C.z = player->baseSpeed + player->boostSpeed; + src.x = 0.0f; + src.y = 0.0f; + src.z = player->baseSpeed + player->boostSpeed; - Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp5C, &sp50); - player->vel.x = sp50.x; - player->vel.z = sp50.z; - player->vel.y = sp50.y; + Matrix_MultVec3fNoTranslate(gCalcMatrix, &src, &dest); + player->vel.x = dest.x; + player->vel.z = dest.z; + player->vel.y = dest.y; player->pos.x += player->vel.x; player->pos.y += player->vel.y; @@ -267,8 +268,8 @@ static Vec3f D_demo_800C9FA0[] = { }; void func_demo_80049630(ActorCutscene* this) { - Vec3f sp3C; - Vec3f sp30; + Vec3f src; + Vec3f dest; switch (this->state) { case 0: @@ -300,15 +301,15 @@ void func_demo_80049630(ActorCutscene* this) { Matrix_RotateY(gCalcMatrix, (this->rot_0F4.y + 180.0f) * M_DTOR, MTXF_NEW); Matrix_RotateX(gCalcMatrix, -(this->rot_0F4.x * M_DTOR), MTXF_APPLY); - sp3C.x = 0.0f; - sp3C.y = 0.0f; - sp3C.z = this->fwork[0]; + src.x = 0.0f; + src.y = 0.0f; + src.z = this->fwork[0]; - Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp3C, &sp30); + Matrix_MultVec3fNoTranslate(gCalcMatrix, &src, &dest); - this->vel.x = sp30.x; - this->vel.y = sp30.y; - this->vel.z = sp30.z; + this->vel.x = dest.x; + this->vel.y = dest.y; + this->vel.z = dest.z; this->obj.rot.x = -this->rot_0F4.x; this->obj.rot.y = this->rot_0F4.y + 180.0f; @@ -2526,10 +2527,10 @@ void ActorCutscene_Draw(ActorCutscene* this) { switch (this->animFrame) { case 1000: RCP_SetupDL(&gMasterDisp, SETUPDL_45); - gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, this->unk_046); + gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, this->work_046); gSPDisplayList(gMasterDisp++, D_ENMY_PLANET_40018A0); - if (this->unk_046 > 50) { + if (this->work_046 > 50) { Actor_DrawEngineAndContrails(this); } break; @@ -2568,11 +2569,11 @@ void ActorCutscene_Draw(ActorCutscene* this) { break; case 20: - gSPDisplayList(gMasterDisp++, D_ENMY_SPACE_400AAE0); + gSPDisplayList(gMasterDisp++, aCommanderDL); break; case 24: - gSPDisplayList(gMasterDisp++, D_D009A40); + gSPDisplayList(gMasterDisp++, aKattShipDL); Actor_DrawEngineAndContrails(this); break; @@ -2587,19 +2588,19 @@ void ActorCutscene_Draw(ActorCutscene* this) { case 26: gSPDisplayList(gMasterDisp++, D_SZ_6004FE0); Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -60.0f, MTXF_APPLY); - Actor_DrawEngineGlow(this, 2); + Actor_DrawEngineGlow(this, EG_GREEN); break; case 28: - gSPDisplayList(gMasterDisp++, D_ENMY_SPACE_400AAE0); + gSPDisplayList(gMasterDisp++, aCommanderDL); Matrix_Translate(gGfxMatrix, 0.f, 0.f, -60.0f, MTXF_APPLY); - Actor_DrawEngineGlow(this, 2); + Actor_DrawEngineGlow(this, EG_GREEN); break; case 30: Display_SetSecondLight(&this->obj.pos); - if (this->unk_046 != 0) { + if (this->work_046 != 0) { RCP_SetupDL(&gMasterDisp, SETUPDL_55); gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK); Rand_SetSeed(1, 29000, 9876); @@ -2729,12 +2730,12 @@ void ActorCutscene_Draw(ActorCutscene* this) { case 33: if ((this->index == 3) && (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_LEVEL_COMPLETE)) { - gSPDisplayList(gMasterDisp++, D_D00B880); + gSPDisplayList(gMasterDisp++, aBillShipDL); } else { gSPDisplayList(gMasterDisp++, aKaCornerianFighterDL); } Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -60.0f, MTXF_APPLY); - Actor_DrawEngineGlow(this, 0); + Actor_DrawEngineGlow(this, EG_RED); break; case 34: diff --git a/src/engine/fox_display.c b/src/engine/fox_display.c index 38ead565..91014a98 100644 --- a/src/engine/fox_display.c +++ b/src/engine/fox_display.c @@ -780,7 +780,7 @@ void Display_PlayerShadow_Draw(Player* player) { Matrix_Scale(gGfxMatrix, 1.5f * 1.67f, 1.5f, 1.5f * 1.67f, MTXF_APPLY); Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, 30.0f, MTXF_APPLY); Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_1032780); + gSPDisplayList(gMasterDisp++, aArwingShadowDL); break; case FORM_LANDMASTER: @@ -815,21 +815,21 @@ void Display_PlayerShadow_Draw(Player* player) { } } -void Display_DrawEngineGlow(s32 levelType) { +void Display_DrawEngineGlow(EngineGlowColor color) { RCP_SetupDL(&gMasterDisp, SETUPDL_67); gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 255); - switch (levelType) { - case LEVELTYPE_PLANET: + switch (color) { + case EG_RED: gDPSetEnvColor(gMasterDisp++, 255, 0, 0, 255); break; - case LEVELTYPE_SPACE: + case EG_BLUE: gDPSetEnvColor(gMasterDisp++, 0, 0, 255, 255); break; - case LEVELTYPE_UNK2: + case EG_GREEN: gDPSetEnvColor(gMasterDisp++, 0, 255, 0, 255); break; - case LEVELTYPE_UNK3: + case EG_ORANGE: gDPSetEnvColor(gMasterDisp++, 255, 64, 0, 255); break; } diff --git a/src/engine/fox_edata_info.c b/src/engine/fox_edata_info.c index a070fe3c..a5dc6c08 100644 --- a/src/engine/fox_edata_info.c +++ b/src/engine/fox_edata_info.c @@ -1,3 +1,26 @@ +/** + * Glossary: + * + * Level Prefixes: + * CO: Corneria + * ME: Meteo + * SX: Sector X + * SY: Sector Y + * SZ: Sector Z + * KA: Katina + * AQ: Aquas + * A6: Area 6 + * FO: Fortuna + * SO: Solar + * MA: Macbeth + * TI: Titania + * BO: Bolse + * ZO: Zoness + * VE1: Venom 1 + * VE2: Venom 2 + * AND: Venom Andross + */ + #include "global.h" #include "assets/ast_versus.h" @@ -77,17 +100,17 @@ f32 gTeamHitbox[] = { f32 gActorAllRangeHItbox[] = { 1.0f, 0.0f, 40.0f, 0.0f, 40.0f, 0.0f, 40.0f, }; -f32 gWarpZoneEvent94Hitbox[] = { +f32 aWzMeteor1Hitbox[] = { 1.0f, 0.0f, 140.0f, 0.0f, 170.0f, 0.0f, 140.0f, }; -f32 gWarpZoneEvent96Hitbox[] = { +f32 aWzGateHitbox[] = { 4.0f, 0.0f, 140.0f, -675.0f, 140.0f, 0.0f, 810.0f, 0.0f, 140.0f, 675.0f, 140.0f, 0.0f, 810.0f, 0.0f, 140.0f, 0.0f, 810.0f, 675.0f, 140.0f, 0.0f, 140.0f, 0.0f, 810.0f, -675.0f, 140.0f, }; -f32 gWarpZoneEvent92Hitbox[] = { +f32 aWzPillar1Hitbox[] = { 1.0f, 0.0f, 140.0f, 0.0f, 140.0f, 0.0f, 1800.0f, }; -f32 gWarpZoneEvent93Hitbox[] = { +f32 aWzPillar2Hitbox[] = { 2.0f, 0.0f, 140.0f, 0.0f, 140.0f, 0.0f, 1800.0f, 1.0f, 141.0f, 1.0f, 1800.0f, 1.0f, 140.0f, }; @@ -157,7 +180,7 @@ ObjectInfo gObjectInfo[] = { /* OBJ_SCENERY_MA_TOWER, */ {(void*) Macbeth_MaTower_Draw, 1, (ObjectFunc) NULL, aMaTowerHitbox, 200.0f, 0, 0, 5, 0, 0.0f, 0 }, /* OBJ_SCENERY_MA_WALL_1, */ {(void*) aMaWall1DL, 0, (ObjectFunc) NULL, gNoHitbox, 1500.0f, 0, 0, 0, 0, 0.0f, 0 }, /* OBJ_SCENERY_GUILLOTINE_HOUSING, */ {(void*) aMaGuillotineHousingDL, 0, (ObjectFunc) NULL, aMaGuillotineHousingHitbox, 500.0f, 0, 0, 5, 0, 0.0f, 0 }, - /* OBJ_SCENERY_MA_GUILLOTINE, */ {(void*) aMaGuillotineDL, 0, (ObjectFunc) NULL, aMaGuillotineHitbox, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_SCENERY_MA_GUILLOTINE, */ {(void*) aMaGuillotine1DL, 0, (ObjectFunc) NULL, aMaGuillotineHitbox, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, /* OBJ_SCENERY_MA_PROXIMITY_LIGHT, */ {(void*) Macbeth_MaProximityLight_Draw, 1, (ObjectFunc) NULL, aMaProximityLightHitbox, 400.0f, 0, 0, 0, 0, 0.0f, 0 }, /* OBJ_SCENERY_MA_WALL_2, */ {(void*) aMaWall2DL, 0, (ObjectFunc) NULL, aMaWall2Hitbox, 2500.0f, 0, 0, 5, 0, 0.0f, 0 }, /* OBJ_SCENERY_MA_WALL_3, */ {(void*) aMaWall3DL, 0, (ObjectFunc) NULL, aMaWall3Hitbox, 2000.0f, 0, 0, 5, 0, 0.0f, 0 }, @@ -208,7 +231,7 @@ ObjectInfo gObjectInfo[] = { /* OBJ_SCENERY_SY_SHIP_2_DESTROYED */ {(void*) aSyShip4DestroyedDL, 0, (ObjectFunc) SectorY_SyShip4Destroyed_Update, aSyShip4DestroyedHitbox, 4000.0f, 0, 0, 41, 0, 0.0f, 0 }, /* OBJ_SPRITE_SY_SHIP_2 */ {(void*) aSyShip2SpriteDL, 0, (ObjectFunc) NULL, gNoHitbox, 2000.0f, 0, 0, 40, 0, 0.0f, 0 }, /* OBJ_SPRITE_SY_SHIP_3 */ {(void*) aSyShip3SpriteDL, 0, (ObjectFunc) NULL, gNoHitbox, 2000.0f, 0, 0, 40, 0, 0.0f, 0 }, - /* OBJ_SCENERY_SY_SHIP_PROJECTILE */ {(void*) aSyShipProjectileDL, 0, (ObjectFunc) NULL, aSyShipProjectileHitbox, 2000.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_SCENERY_SY_SHIP_MISSILE */ {(void*) aSyShipMissileDL, 0, (ObjectFunc) NULL, aSyShipMissileHitbox, 2000.0f, 0, 0, 40, 0, 0.0f, 0 }, /* OBJ_SCENERY_SY_SHIP_WINDOWS */ {(void*) aSyShipWindowsDL, 0, (ObjectFunc) NULL, aSyShipWindowsHitbox, 2000.0f, 0, 0, 40, 0, 0.0f, 0 }, /* OBJ_SCENERY_AQ_CORAL_REEF_1 */ {(void*) aAqCoralReef1DL, 0, (ObjectFunc) NULL, aAqCoralReef1Hitbox, 2000.0f, 0, 0, 40, 0, 0.0f, 0 }, /* OBJ_SCENERY_AQ_TUNNEL_1 */ {(void*) aAqTunnel1DL, 0, (ObjectFunc) NULL, aAqTunnel1Hitbox, 2000.0f, 0, 0, 41, 0, 0.0f, 0 }, @@ -274,7 +297,7 @@ ObjectInfo gObjectInfo[] = { /* OBJ_ACTOR_CO_GARUDA_3 */ {(void*) Corneria_CoGaruda3_Draw, 2, (ObjectFunc) Corneria_CoGaruda3_Update, CoGarudaHitbox, 500.0f, 0, 0, 39, 1, 200.0f, 1 }, /* OBJ_ACTOR_CO_GARUDA_DESTROY */ {(void*) Corneria_CoGarudaDestroy_Draw, 2, (ObjectFunc) Corneria_CoGarudaDestroy_Update, aCoGarudaDestroyHitbox, 500.0f, 0, 0, 39, 1, 0.0f, 1 }, /* OBJ_ACTOR_ME_MOLAR_ROCK */ {(void*) MeMolarRock_Draw, 1, (ObjectFunc) MeMolarRock_Update, gNoHitbox, 1000.0f, 0, 0, 39, 0, 0.0f, 1 }, - /* OBJ_ACTOR_ME_METEOR_1 */ {(void*) aMeMeteorDL, 0, (ObjectFunc) Meteo_MeMeteor1_Update, aMeMeteor1Hitbox, 200.0f, 0, 0, 39, 0, 1.0f, 1 }, + /* OBJ_ACTOR_ME_METEOR_1 */ {(void*) aMeMeteor1DL, 0, (ObjectFunc) Meteo_MeMeteor1_Update, aMeMeteor1Hitbox, 200.0f, 0, 0, 39, 0, 1.0f, 1 }, /* OBJ_ACTOR_ME_METEOR_2 */ {(void*) MeMeteor2_Draw, 1, (ObjectFunc) Meteo_MeMeteor2_Update, aMeMeteor2Hitbox, 100.0f, 0, 1, 39, 0, 1.0f, 1 }, /* OBJ_ACTOR_ME_METEOR_SHOWER_1 */ {(void*) Meteo_MeMeteorShower1_Draw, 1, (ObjectFunc) Meteo_MeteorShower_Update, gNoHitbox, 100.0f, 0, 1, 39, 0, 0.0f, 1 }, /* OBJ_ACTOR_ME_METEOR_SHOWER_2 */ {(void*) Meteo_MeMeteorShower2_Draw, 1, (ObjectFunc) Meteo_MeteorShower_Update, gNoHitbox, 100.0f, 0, 1, 39, 0, 0.0f, 1 }, diff --git a/src/engine/fox_edisplay.c b/src/engine/fox_edisplay.c index 8ebda74c..ded922f6 100644 --- a/src/engine/fox_edisplay.c +++ b/src/engine/fox_edisplay.c @@ -92,9 +92,9 @@ f32 D_edisplay_800CFA2C[] = { void MeHopBot_Draw(MeHopBot* this) { Vec3f sp30[30]; - f32 temp = D_edisplay_800CF9B0[this->animFrame] - 114.0f; + f32 yTrans = D_edisplay_800CF9B0[this->animFrame] - 114.0f; - Matrix_Translate(gGfxMatrix, 0.f, -temp, 0.0f, MTXF_APPLY); + Matrix_Translate(gGfxMatrix, 0.f, -yTrans, 0.0f, MTXF_APPLY); Matrix_SetGfxMtx(&gMasterDisp); Animation_GetFrameData(&aMeHopBotAnim, this->animFrame, sp30); Animation_DrawSkeleton(1, aMeHopBotSkel, sp30, NULL, MeHopBot_PostLimbDraw, &this->index, &gIdentityMatrix); @@ -104,11 +104,11 @@ void MeteoTunnel_Draw(MeTunnel* this) { gSPDisplayList(gMasterDisp++, aMeMeteoTunnelDL); } -void Scenery_DrawTitaniaBones(Scenery* scenery) { - if (scenery->obj.id == OBJ_SCENERY_TI_SKULL) { +void Scenery_DrawTitaniaBones(Scenery* this) { + if (this->obj.id == OBJ_SCENERY_TI_SKULL) { gSPDisplayList(gMasterDisp++, D_TI1_7007350); } else { - Graphics_SetScaleMtx(D_edisplay_800CFA2C[scenery->obj.id - 29]); + Graphics_SetScaleMtx(D_edisplay_800CFA2C[this->obj.id - 29]); gSPDisplayList(gMasterDisp++, D_TI1_700BB10); } } @@ -282,12 +282,12 @@ void ActorDebris_Draw(ActorDebris* this) { case 39: gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK); - gSPDisplayList(gMasterDisp++, D_edisplay_800CFAC4[this->unk_048]); + gSPDisplayList(gMasterDisp++, D_edisplay_800CFAC4[this->work_048]); break; case 40: gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 255); - switch (this->unk_048) { + switch (this->work_048) { case 0: break; case 1: @@ -304,7 +304,7 @@ void ActorDebris_Draw(ActorDebris* this) { } if (gCurrentLevel != LEVEL_SOLAR) { - gSPDisplayList(gMasterDisp++, D_TI_801B769C[this->unk_046]); + gSPDisplayList(gMasterDisp++, D_TI_801B769C[this->work_046]); } else { if (gBosses[0].fwork[3] < 4800.0f) { RCP_SetupDL(&gMasterDisp, SETUPDL_30); @@ -316,28 +316,28 @@ void ActorDebris_Draw(ActorDebris* this) { gSPFogPosition(gMasterDisp++, gFogNear, gFogFar); } Graphics_SetScaleMtx(this->scale); - gSPDisplayList(gMasterDisp++, D_edisplay_800CFB40[this->unk_046]); + gSPDisplayList(gMasterDisp++, D_edisplay_800CFB40[this->work_046]); } break; case 41: Graphics_SetScaleMtx(this->scale); - gSPDisplayList(gMasterDisp++, D_edisplay_800CFADC[this->unk_048]); + gSPDisplayList(gMasterDisp++, D_edisplay_800CFADC[this->work_048]); break; case 42: Graphics_SetScaleMtx(this->scale); - gSPDisplayList(gMasterDisp++, D_edisplay_800CFB08[this->unk_048]); + gSPDisplayList(gMasterDisp++, D_edisplay_800CFB08[this->work_048]); break; case 43: Graphics_SetScaleMtx(this->scale); - gSPDisplayList(gMasterDisp++, D_edisplay_800CFB14[this->unk_048]); + gSPDisplayList(gMasterDisp++, D_edisplay_800CFB14[this->work_048]); break; case 44: Graphics_SetScaleMtx(this->scale); - gSPDisplayList(gMasterDisp++, D_edisplay_800CFB28[this->unk_048]); + gSPDisplayList(gMasterDisp++, D_edisplay_800CFB28[this->work_048]); break; case 45: @@ -345,25 +345,25 @@ void ActorDebris_Draw(ActorDebris* this) { break; case 46: - if ((this->unk_048 == 2) || (this->unk_048 == 3) || (this->unk_048 == 4)) { + if ((this->work_048 == 2) || (this->work_048 == 3) || (this->work_048 == 4)) { RCP_SetupDL(&gMasterDisp, SETUPDL_33); } gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK); - gSPDisplayList(gMasterDisp++, D_TI_801B7584[this->unk_048]); + gSPDisplayList(gMasterDisp++, D_TI_801B7584[this->work_048]); break; case 47: - gSPDisplayList(gMasterDisp++, D_TI_801B7608[this->unk_048]); + gSPDisplayList(gMasterDisp++, D_TI_801B7608[this->work_048]); break; case 48: Graphics_SetScaleMtx(this->scale); - gSPDisplayList(gMasterDisp++, D_edisplay_800CFB64[this->unk_048]); + gSPDisplayList(gMasterDisp++, D_edisplay_800CFB64[this->work_048]); break; case 49: Graphics_SetScaleMtx(this->scale); - gSPDisplayList(gMasterDisp++, D_edisplay_800CFB88[this->unk_048]); + gSPDisplayList(gMasterDisp++, D_edisplay_800CFB88[this->work_048]); break; case 50: @@ -401,27 +401,27 @@ void ActorDebris_Draw(ActorDebris* this) { case 51: Graphics_SetScaleMtx(this->scale); - gSPDisplayList(gMasterDisp++, D_edisplay_800CFBA8[this->unk_048]); + gSPDisplayList(gMasterDisp++, D_edisplay_800CFBA8[this->work_048]); break; case 52: Graphics_SetScaleMtx(this->scale); - gSPDisplayList(gMasterDisp++, D_edisplay_800CFBE4[this->unk_048]); + gSPDisplayList(gMasterDisp++, D_edisplay_800CFBE4[this->work_048]); break; case 53: Graphics_SetScaleMtx(this->scale); - gSPDisplayList(gMasterDisp++, D_edisplay_800CFC0C[this->unk_048]); + gSPDisplayList(gMasterDisp++, D_edisplay_800CFC0C[this->work_048]); break; case 54: Graphics_SetScaleMtx(this->scale); - gSPDisplayList(gMasterDisp++, D_edisplay_800CFC40[this->unk_048]); + gSPDisplayList(gMasterDisp++, D_edisplay_800CFC40[this->work_048]); break; case 55: Graphics_SetScaleMtx(this->scale); - gSPDisplayList(gMasterDisp++, D_edisplay_800CFC50[this->unk_048]); + gSPDisplayList(gMasterDisp++, D_edisplay_800CFC50[this->work_048]); break; case 56: @@ -429,7 +429,7 @@ void ActorDebris_Draw(ActorDebris* this) { RCP_SetupDL(&gMasterDisp, SETUPDL_41); Matrix_SetGfxMtx(&gMasterDisp); gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 191, 255, 223, 255); - gSPDisplayList(gMasterDisp++, D_edisplay_800CFC64[this->unk_048]); + gSPDisplayList(gMasterDisp++, D_edisplay_800CFC64[this->work_048]); break; case 58: @@ -441,7 +441,7 @@ void ActorDebris_Draw(ActorDebris* this) { case 59: Graphics_SetScaleMtx(this->scale); Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_edisplay_800CFC7C[this->unk_048]); + gSPDisplayList(gMasterDisp++, D_edisplay_800CFC7C[this->work_048]); break; case 70: @@ -449,7 +449,7 @@ void ActorDebris_Draw(ActorDebris* this) { break; case 57: - gSPDisplayList(gMasterDisp++, D_VE1_8019A008[this->unk_048]); + gSPDisplayList(gMasterDisp++, D_VE1_8019A008[this->work_048]); break; default: @@ -467,7 +467,7 @@ void Actor_DrawEngineAndContrails(Actor* this) { f32 sp5C; f32 temp1; f32 sp54; - s32 pad[5]; // fake? seems like a lot of padding + s32 pad[5]; if ((this->iwork[11] != 0) && (this->obj.status == OBJ_ACTIVE)) { temp1 = 652.5f * 0.001f; // 0.65250003f; @@ -527,7 +527,7 @@ f32 D_edisplay_800CFCA0[] = { 1.7f, 1.8f, 2.0f, 3.0f, 3.0f, 3.0f, 3.0f, 3.0f, }; -void Actor_DrawEngineGlow(Actor* actor, s32 levelType) { +void Actor_DrawEngineGlow(Actor* actor, EngineGlowColor color) { f32 scale; if ((actor->iwork[11] != 0) && (actor->obj.status == OBJ_ACTIVE)) { @@ -545,7 +545,7 @@ void Actor_DrawEngineGlow(Actor* actor, s32 levelType) { Matrix_RotateY(gGfxMatrix, -actor->obj.rot.y * M_DTOR, MTXF_APPLY); Matrix_RotateY(gGfxMatrix, -gPlayer[gPlayerNum].camYaw, MTXF_APPLY); Matrix_SetGfxMtx(&gMasterDisp); - Display_DrawEngineGlow(levelType); + Display_DrawEngineGlow(color); Matrix_Pop(&gGfxMatrix); } } @@ -609,14 +609,14 @@ void MeMolarRock_Draw(MeMolarRock* this) { } void MeMeteor2_Draw(MeMeteor2* this) { - RCP_SetupDL_29(this->unk_046, gFogGreen, gFogBlue, gFogAlpha, this->unk_048, gFogFar); + RCP_SetupDL_29(this->work_046, gFogGreen, gFogBlue, gFogAlpha, this->work_048, gFogFar); Matrix_Scale(gGfxMatrix, 0.5f, 0.5f, 0.5f, MTXF_APPLY); Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, aMeMeteorDL); + gSPDisplayList(gMasterDisp++, aMeMeteor1DL); } void MeLaserCannon1_Draw(MeLaserCannon1* this) { - RCP_SetupDL_29(this->unk_046, gFogGreen, gFogBlue, gFogAlpha, this->unk_048, gFogFar); + RCP_SetupDL_29(this->work_046, gFogGreen, gFogBlue, gFogAlpha, this->work_048, gFogFar); gSPDisplayList(gMasterDisp++, aMeLaserCannon1DL); } @@ -630,9 +630,9 @@ void ActorMissileSeek_Draw(Actor* missile) { case 1: if (gCurrentLevel == LEVEL_AREA_6) { - gSPDisplayList(gMasterDisp++, D_ENMY_SPACE_400B390); + gSPDisplayList(gMasterDisp++, aAttacker3DL); } else { - gSPDisplayList(gMasterDisp++, D_ENMY_PLANET_4007AF0); + gSPDisplayList(gMasterDisp++, aGrangaFighter2DL); } break; } @@ -645,7 +645,7 @@ void ActorMissileSeek_Draw(Actor* missile) { Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -60.0f, MTXF_APPLY); missile->iwork[11] = 1; Matrix_Scale(gGfxMatrix, scale, scale, scale, MTXF_APPLY); - Actor_DrawEngineGlow(missile, 2); + Actor_DrawEngineGlow(missile, EG_GREEN); } void CoSkibot_Draw(CoSkibot* this) { @@ -689,14 +689,14 @@ void Object_SetShadowDL(ObjectId objId, s32 index) { case OBJ_ACTOR_TEAM_BOSS: case OBJ_ACTOR_EVENT: switch (gActors[index].eventType) { - case EVID_3: + case EVID_SPY_EYE: Matrix_Scale(gGfxMatrix, 2.3f, 0.0f, 2.3f, MTXF_APPLY); Matrix_RotateX(gGfxMatrix, M_PI / 2, MTXF_APPLY); Matrix_SetGfxMtx(&gMasterDisp); gSPDisplayList(gMasterDisp++, D_102A010); break; - case EVID_81: + case EVID_VE1_BLOCKER: RCP_SetupDL(&gMasterDisp, SETUPDL_48); gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 0, 0, 0, 255); gDPSetEnvColor(gMasterDisp++, 0, 0, 0, 255); @@ -715,7 +715,7 @@ void Object_SetShadowDL(ObjectId objId, s32 index) { Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, 30.0f, MTXF_APPLY); Matrix_SetGfxMtx(&gMasterDisp); gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK); - gSPDisplayList(gMasterDisp++, D_1032780); + gSPDisplayList(gMasterDisp++, aArwingShadowDL); break; } break; @@ -1084,7 +1084,7 @@ void Actor_DrawOnRails(Actor* this) { this->obj.pos.y += gCameraShakeY; func_edisplay_8005D008(&this->obj, this->info.drawType); this->obj.pos.y -= gCameraShakeY; - } else if ((this->obj.id == OBJ_ACTOR_EVENT) && (this->eventType != EVID_31)) { + } else if ((this->obj.id == OBJ_ACTOR_EVENT) && (this->eventType != EVID_A6_UMBRA_STATION)) { func_edisplay_8005D3CC(&this->obj, this->vwork[29].x, this->vwork[29].y, this->vwork[29].z + this->rot_0F4.z, this->info.drawType); } else { @@ -1383,37 +1383,37 @@ void Item_Draw(Item* this, s32 arg1) { } } -void ActorAllRange_DrawShadow(Actor* actor) { - Matrix_Translate(gGfxMatrix, actor->obj.pos.x, actor->fwork[25] + 3.0f, actor->obj.pos.z, MTXF_APPLY); +void ActorAllRange_DrawShadow(ActorAllRange* this) { + Matrix_Translate(gGfxMatrix, this->obj.pos.x, this->fwork[25] + 3.0f, this->obj.pos.z, MTXF_APPLY); if (gCurrentLevel == LEVEL_FORTUNA) { - Matrix_RotateY(gGfxMatrix, actor->fwork[27], MTXF_APPLY); - Matrix_RotateX(gGfxMatrix, actor->fwork[26], MTXF_APPLY); - Matrix_RotateZ(gGfxMatrix, actor->fwork[28], MTXF_APPLY); - Matrix_RotateY(gGfxMatrix, -actor->fwork[27], MTXF_APPLY); + Matrix_RotateY(gGfxMatrix, this->fwork[27], MTXF_APPLY); + Matrix_RotateX(gGfxMatrix, this->fwork[26], MTXF_APPLY); + Matrix_RotateZ(gGfxMatrix, this->fwork[28], MTXF_APPLY); + Matrix_RotateY(gGfxMatrix, -this->fwork[27], MTXF_APPLY); } Matrix_Scale(gGfxMatrix, 1.4f, 0.0f, 1.4f, MTXF_APPLY); - Matrix_RotateY(gGfxMatrix, (actor->obj.rot.y + 180.0f) * M_DTOR, MTXF_APPLY); - Matrix_RotateZ(gGfxMatrix, actor->obj.rot.z * M_DTOR, MTXF_APPLY); + Matrix_RotateY(gGfxMatrix, (this->obj.rot.y + 180.0f) * M_DTOR, MTXF_APPLY); + Matrix_RotateZ(gGfxMatrix, this->obj.rot.z * M_DTOR, MTXF_APPLY); Matrix_SetGfxMtx(&gMasterDisp); - if (actor->aiType <= AI360_PEPPY) { + if (this->aiType <= AI360_PEPPY) { Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, 30.0f, MTXF_APPLY); Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_1032780); + gSPDisplayList(gMasterDisp++, aArwingShadowDL); } else if (gCurrentLevel == LEVEL_KATINA) { - if ((actor->animFrame == 1) || (actor->animFrame == 2)) { - gSPDisplayList(gMasterDisp++, D_KA_600D730); + if ((this->animFrame == 1) || (this->animFrame == 2)) { + gSPDisplayList(gMasterDisp++, aKaCornerianFighterShadowDL); } else { - gSPDisplayList(gMasterDisp++, D_KA_600DBC0); + gSPDisplayList(gMasterDisp++, aKaEnemyShadowDL); } - } else if ((actor->aiType <= AI360_ANDREW) || (gCurrentLevel != LEVEL_FORTUNA)) { - gSPDisplayList(gMasterDisp++, D_STAR_WOLF_F014310); + } else if ((this->aiType <= AI360_ANDREW) || (gCurrentLevel != LEVEL_FORTUNA)) { + gSPDisplayList(gMasterDisp++, aStarWolfShadowDL); } else if (gCurrentLevel == LEVEL_FORTUNA) { - gSPDisplayList(gMasterDisp++, D_FO_6009F90); + gSPDisplayList(gMasterDisp++, aFoEnemyShadowDL); } else { - gSPDisplayList(gMasterDisp++, D_STAR_WOLF_F014310); + gSPDisplayList(gMasterDisp++, aStarWolfShadowDL); } } @@ -1810,7 +1810,7 @@ void Object_DrawAll(s32 arg0) { Lights_SetOneLight(&gMasterDisp, -60, -60, 60, 150, 150, 150, 20, 20, 20); - for (i = 0, item = gItems; i < ARRAY_COUNT(gItems); i++, item++) { + for (i = 0, item = &gItems[0]; i < ARRAY_COUNT(gItems); i++, item++) { if (item->obj.status >= OBJ_ACTIVE) { Matrix_Push(&gGfxMatrix); RCP_SetupDL(&gMasterDisp, SETUPDL_29); @@ -1831,7 +1831,7 @@ void Effect_DrawAll(s32 arg0) { RCP_SetupDL(&gMasterDisp, SETUPDL_64); - for (i = 0, effect = gEffects; i < ARRAY_COUNT(gEffects); i++, effect++) { + for (i = 0, effect = &gEffects[0]; i < ARRAY_COUNT(gEffects); i++, effect++) { if (effect->obj.status >= OBJ_ACTIVE) { if (effect->info.unk_14 == 1) { effect->obj.rot.y = RAD_TO_DEG(-gPlayer[gPlayerNum].camYaw); @@ -1856,7 +1856,7 @@ void Effect_DrawAll(s32 arg0) { } } - for (i = 0, boss = gBosses; i < ARRAY_COUNT(gBosses); i++, boss++) { + for (i = 0, boss = &gBosses[0]; i < ARRAY_COUNT(gBosses); i++, boss++) { if ((boss->obj.status >= OBJ_ACTIVE) && (boss->obj.id == OBJ_BOSS_BO_BASE_SHIELD)) { if ((boss->timer_05C % 2) == 0) { RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); diff --git a/src/engine/fox_effect.c b/src/engine/fox_effect.c index 80db07cb..474cf117 100644 --- a/src/engine/fox_effect.c +++ b/src/engine/fox_effect.c @@ -3915,7 +3915,7 @@ void Effect_Effect395_Draw(Effect395* this) { case 3: RCP_SetupDL_60(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); - gSPDisplayList(gMasterDisp++, D_A6_601A120); + gSPDisplayList(gMasterDisp++, aA6SpaceMineDL); break; case 4: diff --git a/src/engine/fox_enmy.c b/src/engine/fox_enmy.c index 6d9d1f9e..345b04d9 100644 --- a/src/engine/fox_enmy.c +++ b/src/engine/fox_enmy.c @@ -1179,8 +1179,8 @@ void Object_Init(s32 index, ObjectId objId) { break; case OBJ_ACTOR_ME_METEOR_2: case OBJ_ACTOR_ME_LASER_CANNON_1: - gActors[index].unk_046 = gFogRed; - gActors[index].unk_048 = gFogNear; + gActors[index].work_046 = gFogRed; + gActors[index].work_048 = gFogNear; gActors[index].obj.rot.x = RAND_FLOAT(360.0f); gActors[index].obj.rot.y = RAND_FLOAT(360.0f); break; @@ -1218,11 +1218,11 @@ void Object_Init(s32 index, ObjectId objId) { } break; case OBJ_ACTOR_ME_MORA: - gActors[index].unk_046 = 100; + gActors[index].work_046 = 100; for (i = 0; i < 2; i++) { if (gMeMoraStatus[i] == 0) { gMeMoraStatus[i] = 1; - gActors[index].unk_046 = i; + gActors[index].work_046 = i; for (j = 0; j < 100; j++) { gMeMoraYpos[i][j] = gActors[index].obj.pos.y; gMeMoraZpos[i][j] = gActors[index].obj.pos.z; @@ -1230,7 +1230,7 @@ void Object_Init(s32 index, ObjectId objId) { break; } } - if (gActors[index].unk_046 == 100) { + if (gActors[index].work_046 == 100) { gActors[index].obj.status = OBJ_FREE; } break; @@ -1425,8 +1425,8 @@ void func_enmy_80065380(MeMeteor2* this, f32 xPos, f32 yPos, f32 zPos, f32 arg4, this->obj.pos.x = xPos; this->obj.pos.y = yPos; this->obj.pos.z = zPos; - this->unk_046 = 255; - this->unk_048 = 900; + this->work_046 = 255; + this->work_048 = 900; this->obj.rot.z = RAND_FLOAT(360.0f); this->obj.rot.y = RAND_FLOAT(360.0f); Object_SetInfo(&this->info, this->obj.id); @@ -2658,7 +2658,7 @@ void Actor_Move(Actor* this) { var_fv0 = 4000.0f; if ((this->obj.id == OBJ_ACTOR_ZO_DODORA) || (gCurrentLevel == LEVEL_MACBETH) || - ((this->obj.id == OBJ_ACTOR_EVENT) && (this->eventType == EVID_56))) { + ((this->obj.id == OBJ_ACTOR_EVENT) && (this->eventType == EVID_TI_GREAT_FOX))) { var_fv0 = 8000.0f; } else if (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_ENTER_WARP_ZONE) { var_fv0 = 100000.0f; @@ -2680,13 +2680,13 @@ void Actor_Move(Actor* this) { break; case OBJ_ACTOR_ME_MORA: - gMeMoraStatus[this->unk_046] = 0; + gMeMoraStatus[this->work_046] = 0; break; case OBJ_ACTOR_EVENT: if ((this->eventType >= EVID_200) && (this->eventType < EVID_300)) { - gMeMoraStatus[this->unk_046] = 0; - } else if ((this->eventType == EVID_SX_WARP_GATE) && (this->unk_046 != 2)) { + gMeMoraStatus[this->work_046] = 0; + } else if ((this->eventType == EVID_SX_WARP_GATE) && (this->work_046 != 2)) { gRingPassCount = -1; } break; diff --git a/src/engine/fox_enmy2.c b/src/engine/fox_enmy2.c index b3548bb5..0a935802 100644 --- a/src/engine/fox_enmy2.c +++ b/src/engine/fox_enmy2.c @@ -77,7 +77,7 @@ void Actor237_Draw(Actor237* this) { /* Unimplemented */ } -void Obj54_8006A984(Effect* this, f32 xPos, f32 yPos, f32 zPos) { +void Obj54_8006A984(Effect365* this, f32 xPos, f32 yPos, f32 zPos) { Effect_Initialize(this); this->obj.status = OBJ_INIT; this->obj.id = OBJ_EFFECT_365; @@ -256,12 +256,12 @@ void MeMora_Dying(MeMora* this) { this->counter_04E = 0; } - gMeMoraXpos[this->unk_046][this->counter_04E] = this->obj.pos.x; - gMeMoraYpos[this->unk_046][this->counter_04E] = this->obj.pos.y; - gMeMoraZpos[this->unk_046][this->counter_04E] = this->obj.pos.z; - gMeMoraXrot[this->unk_046][this->counter_04E] = this->obj.rot.x; - gMeMoraYrot[this->unk_046][this->counter_04E] = this->obj.rot.y; - gMeMoraZrot[this->unk_046][this->counter_04E] = this->obj.rot.z; + gMeMoraXpos[this->work_046][this->counter_04E] = this->obj.pos.x; + gMeMoraYpos[this->work_046][this->counter_04E] = this->obj.pos.y; + gMeMoraZpos[this->work_046][this->counter_04E] = this->obj.pos.z; + gMeMoraXrot[this->work_046][this->counter_04E] = this->obj.rot.x; + gMeMoraYrot[this->work_046][this->counter_04E] = this->obj.rot.y; + gMeMoraZrot[this->work_046][this->counter_04E] = this->obj.rot.z; this->obj.rot.x -= 10.0f; this->obj.rot.y += 3.0f; @@ -274,21 +274,21 @@ void MeMora_Dying(MeMora* this) { this->vel.z = sp34.z; if ((this->timer_0BC == 0) && ((gGameFrameCount % 4) == 0)) { - index = (D_800CFF94[this->unk_04A] + this->counter_04E) % 100; - if (this->unk_04A == 0) { - func_effect_8007D2C8(gMeMoraXpos[this->unk_046][index], gMeMoraYpos[this->unk_046][index], - gMeMoraZpos[this->unk_046][index], 7.0f); + index = (D_800CFF94[this->work_04A] + this->counter_04E) % 100; + if (this->work_04A == 0) { + func_effect_8007D2C8(gMeMoraXpos[this->work_046][index], gMeMoraYpos[this->work_046][index], + gMeMoraZpos[this->work_046][index], 7.0f); } else { - func_effect_8007D2C8(gMeMoraXpos[this->unk_046][index], gMeMoraYpos[this->unk_046][index], - gMeMoraZpos[this->unk_046][index], 4.0f); + func_effect_8007D2C8(gMeMoraXpos[this->work_046][index], gMeMoraYpos[this->work_046][index], + gMeMoraZpos[this->work_046][index], 4.0f); } AUDIO_PLAY_SFX(NA_SE_EN_EXPLOSION_M, this->sfxSource, 4); - this->unk_04A++; + this->work_04A++; - if (this->unk_04A > 15) { + if (this->work_04A > 15) { Object_Kill(&this->obj, this->sfxSource); - gMeMoraStatus[this->unk_046] = 0; + gMeMoraStatus[this->work_046] = 0; gHitCount += this->info.bonus; D_ctx_80177850 = 15; } @@ -338,11 +338,11 @@ void MeMora_Draw(MeMora* this) { s16 i; s16 j; - for (i = this->unk_04A; i < ARRAY_COUNT(D_800CFF94); i++) { + for (i = this->work_04A; i < ARRAY_COUNT(D_800CFF94); i++) { j = (D_800CFF94[i] + this->counter_04E) % 100; - 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], - gMeMoraZrot[this->unk_046][j], gMeMoraPartIdx[i], gMeMoraScale[i], this->timer_0C6 % 2U); + Memora_DrawParts(this, gMeMoraXpos[this->work_046][j], gMeMoraYpos[this->work_046][j], + gMeMoraZpos[this->work_046][j], gMeMoraXrot[this->work_046][j], gMeMoraYrot[this->work_046][j], + gMeMoraZrot[this->work_046][j], gMeMoraPartIdx[i], gMeMoraScale[i], this->timer_0C6 % 2U); } } @@ -409,18 +409,18 @@ void CoMoleMissile_Update(CoMoleMissile* this) { break; case 1: - switch (this->unk_046) { + switch (this->work_046) { case 0: this->fwork[0] += 2.0f; if (this->fwork[0] > 10.0f) { - this->unk_046 = 1; + this->work_046 = 1; } break; case 1: this->fwork[0] -= 2.0f; if (this->fwork[0] < -10.0f) { - this->unk_046 = 0; + this->work_046 = 0; } break; } @@ -548,7 +548,7 @@ void ActorDebris_Update(ActorDebris* this) { switch (this->state) { case 40: - if (this->unk_04A & 4) { + if (this->work_04A & 4) { this->obj.pos.x = gPlayer[0].pos.x + this->fwork[3]; this->obj.pos.z = gPlayer[0].trueZpos + this->fwork[4]; } @@ -557,7 +557,7 @@ void ActorDebris_Update(ActorDebris* this) { this->obj.rot.y += this->fwork[1]; this->obj.rot.z += this->fwork[2]; - if (((this->unk_04A % 2U) == 1) && ((this->timer_0BC & 3) == 0)) { + if (((this->work_04A % 2U) == 1) && ((this->timer_0BC & 3) == 0)) { func_effect_8007D0E0(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, this->scale); } @@ -571,8 +571,8 @@ void ActorDebris_Update(ActorDebris* this) { this->vel.z = 0.0f; this->gravity = 0.0f; } else { - if (this->unk_04A & 4) { - switch (this->unk_046) { + if (this->work_04A & 4) { + switch (this->work_046) { case 2: AUDIO_PLAY_SFX(NA_SE_OB_SAND_BOUND_S, this->sfxSource, 4); break; @@ -588,14 +588,14 @@ void ActorDebris_Update(ActorDebris* this) { this->obj.pos.y = 0.0f; this->iwork[0]++; if (this->vel.y < 0.0f) { - if (this->unk_04A & 2) { + if (this->work_04A & 2) { this->vel.y = this->vel.y * -0.05f; } else { this->vel.y = this->vel.y * -0.3f; } } } - this->unk_04A &= ~4; + this->work_04A &= ~4; } break; @@ -653,7 +653,7 @@ void ActorDebris_Update(ActorDebris* this) { } if (this->iwork[2] == 1) { - if ((this->iwork[1] == 1) && ((this->unk_048 == 8) || (this->unk_048 == 9))) { + if ((this->iwork[1] == 1) && ((this->work_048 == 8) || (this->work_048 == 9))) { func_effect_8007D2C8(this->obj.pos.x, sp48 + 20.0f, this->obj.pos.z, 8.0f); } Object_Kill(&this->obj, this->sfxSource); @@ -687,8 +687,8 @@ void ActorDebris_Update(ActorDebris* this) { break; case 58: - if (this->unk_046 == 0) { - this->unk_046++; + if (this->work_046 == 0) { + this->work_046++; this->fwork[0] = RAND_FLOAT_CENTERED(30.0f); this->fwork[1] = RAND_FLOAT_CENTERED(30.0f); this->fwork[2] = RAND_FLOAT_CENTERED(30.0f); @@ -762,8 +762,8 @@ void ActorDebris_Update(ActorDebris* this) { break; default: - if (this->unk_046 == 0) { - this->unk_046++; + if (this->work_046 == 0) { + this->work_046++; this->fwork[10] = RAND_FLOAT_CENTERED(30.0f); this->fwork[11] = RAND_FLOAT_CENTERED(30.0f); this->fwork[12] = RAND_FLOAT_CENTERED(30.0f); @@ -943,118 +943,121 @@ typedef struct { /* 0x1C */ u8 bonus; } EventActorInfo; // size = 0x20 +// clang-format off + static EventActorInfo sEventActorInfo[108] = { - /* 0 */ { D_ENMY_PLANET_40068F0, gCubeHitbox100, 1.0f, 100.0f, 3000.0f, 1, 0, EISFX_EN_ENGINE_01, 0, 1.0f, 1 }, - /* 1 */ { D_ENMY_PLANET_4006E90, gCubeHitbox100, 1.0f, 100.0f, 3000.0f, 1, 0, EISFX_EN_ENGINE_01, 0, 1.0f, 1 }, - /* 2 */ { NULL, gCubeHitbox100, 1.0f, 20000.0f, 3000.0f, 1, 0, EISFX_ARWING_ENGINE_FG, 0, 0.0f, 0 }, - /* 3 */ { D_ENMY_PLANET_4009800, gCubeHitbox100, 1.5f, 100.0f, 3000.0f, 1, 0, EISFX_NONE, 0, 1.0f, 1 }, - /* 4 */ { D_ENMY_PLANET_40073C0, gCubeHitbox100, 1.0f, 100.0f, 3000.0f, 1, 0, EISFX_EN_ENGINE_01, 0, 1.0f, 1 }, - /* 5 */ { D_ENMY_PLANET_4007AF0, gCubeHitbox100, 1.0f, 100.0f, 3000.0f, 1, 0, EISFX_EN_ENGINE_01, 0, 1.0f, 1 }, - /* 6 */ { NULL, gCubeHitbox100, 1.0f, 100.0f, 3000.0f, 1, 0, EISFX_NONE, 0, 1.0f, 1 }, - /* 7 */ { D_CO_6011F90, gCubeHitbox100, 1.0f, 100.0f, 3000.0f, 1, 0, EISFX_EN_ENGINE_01, 0, 0.0f, 1 }, - /* 8 */ { D_ENMY_PLANET_4000710, gCubeHitbox100, 1.0f, 100.0f, 3000.0f, 2, 0, EISFX_EN_ENGINE_01, 1, 1.0f, 1 }, - /* 9 */ { NULL, gCubeHitbox100, 1.5f, 100.0f, 3000.0f, 1, 0, EISFX_EN_ALIEN_FLY, 0, 1.0f, 1 }, - /* 10 */ { D_ENMY_SPACE_400BD20, gCubeHitbox200, 2.0f, 100.0f, 3000.0f, 1, 0, EISFX_EN_ENGINE_01, 0, 1.0f, 1 }, - /* 11 */ { D_ENMY_SPACE_4001310, gCubeHitbox100, 1.5f, 100.0f, 3000.0f, 1, 0, EISFX_EN_ALIEN_FLY, 0, 1.0f, 1 }, - /* 12 */ { D_ENMY_SPACE_400B390, gCubeHitbox100, 2.0f, 100.0f, 3000.0f, 1, 0, EISFX_EN_ENGINE_01, 0, 1.0f, 1 }, - /* 13 */ { aMeMeteorDL, gCubeHitbox100, 2.5f, 100.0f, 3000.0f, 1, 0, EISFX_EN_ENGINE_01, 0, 1.0f, 1 }, - /* 14 */ { D_ME_601F2A0, gCubeHitbox400, 7.0f, 100.0f, 3000.0f, 1, 0, EISFX_EN_ENGINE_01, 0, 1.0f, 1 }, - /* 15 */ { D_ENMY_SPACE_400AAE0, gCubeHitbox100, 1.5f, 100.0f, 3000.0f, 1, 0, EISFX_EN_ENGINE_01, 0, 1.0f, 1 }, - /* 16 */ { D_ENMY_SPACE_4000650, gCubeHitbox100, 1.5f, 100.0f, 3000.0f, 1, 0, EISFX_EN_ALIEN_FLY, 0, 1.0f, 1 }, - /* 17 */ { D_A6_6016190, D_A6_60282A0, -2.0f, 2100.0f, 3000.0f, 0, 0, EISFX_EN_SPACE_SHIP, 0, 0.0f, 5 }, - /* 18 */ { D_SX_6023500, gCubeHitbox200, 2.0f, 100.0f, 3000.0f, 1, 0, EISFX_EN_ENGINE_01, 0, 1.0f, 1 }, - /* 19 */ { D_SX_6022DF0, gCubeHitbox100, 1.5f, 100.0f, 3000.0f, 1, 0, EISFX_EN_ENGINE_01, 0, 1.0f, 1 }, - /* 20 */ { NULL, gCubeHitbox100, 1.0f, 100.0f, 3000.0f, 2, 1, EISFX_EN_ENGINE_01, 0, 0.0f, 1 }, - /* 21 */ { NULL, gCubeHitbox200, 2.0f, 100.0f, 3000.0f, 1, 0, EISFX_EN_ENGINE_01, 0, 0.0f, 1 }, - /* 22 */ { NULL, gCubeHitbox100, 1.5f, 100.0f, 3000.0f, 1, 0, EISFX_EN_ENGINE_01, 0, 0.0f, 1 }, - /* 23 */ { D_ENMY_SPACE_4008FA0, gCubeHitbox100, 1.5f, 100.0f, 3000.0f, 1, 0, EISFX_EN_ENGINE_01, 0, 1.0f, 1 }, - /* 24 */ { D_SX_60285F0, D_SX_603298C, -1.0f, 2100.0f, 3001.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 }, - /* 25 */ { D_SX_600AF70, D_SX_6032904, -1.0f, 2100.0f, 3001.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 }, - /* 26 */ { D_SX_6023E30, D_SX_6032970, -1.0f, 2100.0f, 3001.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 }, - /* 27 */ { NULL, D_SX_603285C, 2.5f, 100.0f, 3000.0f, 2, 0, EISFX_NONE, 0, 1.0f, 1 }, - /* 28 */ { D_SX_6001CE0, D_SX_6032938, 3.0f, 100.0f, 3000.0f, 2, 0, EISFX_NONE, 0, 1.0f, 1 }, - /* 29 */ { D_SX_6000840, D_SX_6032954, 1.0f, 100.0f, 3000.0f, 2, 1, EISFX_NONE, 0, 1.0f, 1 }, - /* 30 */ { D_A6_6012A40, D_A6_6028254, -2.0f, 2100.0f, 3001.0f, 0, 0, EISFX_EN_SPACE_SHIP, 0, 0.0f, 2 }, - /* 31 */ { NULL, D_A6_60280E0, -2.0f, 2100.0f, 3001.0f, 0, 0, EISFX_NONE, 0, 0.0f, 3 }, - /* 32 */ { D_SX_6009950, D_SX_6032878, -1.0f, 2100.0f, 3001.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 }, - /* 33 */ { NULL, gCubeHitbox200, 2.0f, 100.0f, 3000.0f, 1, 0, EISFX_NONE, 0, 0.0f, 1 }, - /* 34 */ { D_SX_600B2B0, D_SX_6032894, -1.0f, 2100.0f, 3001.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 }, - /* 35 */ { D_SX_600A2E0, D_SX_60328B0, -1.0f, 2100.0f, 3001.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 }, - /* 36 */ { NULL, gCubeHitbox400, 2.0f, 200.0f, 3000.0f, 1, 0, EISFX_EN_ENGINE_01, 0, 1.0f, 1 }, - /* 37 */ { D_SX_600B830, gCubeHitbox100, 1.5f, 100.0f, 3000.0f, 1, 0, EISFX_EN_ENGINE_01, 0, 1.0f, 1 }, - /* 38 */ { NULL, D_SX_603238C, 1.0f, 500.0f, 3000.0f, 1, 0, EISFX_NONE, 0, 0.0f, 1 }, - /* 39 */ { D_SX_6020D20, D_SX_60328CC, -1.0f, 2100.0f, 3001.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 }, - /* 40 */ { NULL, gNoHitbox, 1.0f, 100.0f, 3001.0f, 2, 0, EISFX_NONE, 0, 0.0f, 1 }, - /* 41 */ { aSyShip1DL, aSyShip1Hitbox, -1.0f, 10000.0f, 3001.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 }, - /* 42 */ { aSyShip2DL, aSyShip2Hitbox, -1.0f, 10000.0f, 3001.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 }, - /* 43 */ { NULL, gCubeHitbox100, 1.0f, 20000.0f, 3000.0f, 1, 0, EISFX_ARWING_ENGINE_FG, 0, 0.0f, 0 }, - /* 44 */ { aSyShip3DL, aSyShip3Hitbox, -1.0f, 10000.0f, 3001.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 }, - /* 45 */ { D_ME_6017B60, gCubeHitbox200, -1.0f, 300.0f, 3001.0f, 0, 0, EISFX_NONE, 0, 1.0f, 1 }, - /* 46 */ { D_ZO_6004D00, gCubeHitbox200, 1.0f, 100.0f, 3000.0f, 1, 0, EISFX_EN_SHIP_ENGINE_S, 0, 1.0f, 1 }, - /* 47 */ { D_ME_601A880, gCubeHitbox100, -1.0f, 100.0f, 3000.0f, 1, 0, EISFX_NONE, 0, 0.0f, 1 }, - /* 48 */ { NULL, aSyRobotHitbox, 0.3f, 100.0f, 3000.0f, 0, 0, EISFX_EN_ENGINE_01, 0, 1.0f, 1 }, - /* 49 */ { NULL, aSyRobotHitbox, 0.3f, 100.0f, 3000.0f, 0, 0, EISFX_EN_ENGINE_01, 0, 1.0f, 1 }, - /* 50 */ { NULL, aSyRobotHitbox, 0.3f, 100.0f, 3000.0f, 0, 0, EISFX_EN_ENGINE_01, 0, 1.0f, 1 }, - /* 51 */ { D_SY_6015D60, D_SY_6034124, 2.0f, 100.0f, 3000.0f, 0, 0, EISFX_EN_ENGINE_01, 0, 1.0f, 1 }, - /* 52 */ { NULL, D_ZO_602C1A0, -1.0f, 1000.0f, 3000.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 }, - /* 53 */ { D_SX_600B540, D_SX_60328E8, -1.0f, 2100.0f, 3001.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 }, - /* 54 */ { D_ENMY_SPACE_4000EC0, gCubeHitbox100, 1.5f, 100.0f, 3000.0f, 1, 0, EISFX_EN_ENGINE_01, 0, 1.0f, 1 }, - /* 55 */ { D_ENMY_SPACE_4008D50, gCubeHitbox100, 1.5f, 100.0f, 3000.0f, 1, 0, EISFX_EN_ENGINE_01, 0, 1.0f, 1 }, - /* 56 */ { NULL, gNoHitbox, -1.0f, 2000.0f, 3000.0f, 0, 0, EISFX_GREATFOX_ENGINE, 0, 0.0f, 1 }, - /* 57 */ { aSyShip3DL, gNoHitbox, -1.0f, 10000.0f, 3001.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 }, - /* 58 */ { D_SY_601F3D0, gNoHitbox, -1.0f, 10000.0f, 3001.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 }, - /* 59 */ { D_SY_6022B10, gNoHitbox, 2.0f, 100.0f, 3000.0f, 0, 0, EISFX_EN_ENGINE_01, 0, 0.0f, 1 }, - /* 60 */ { D_SY_60209F0, gNoHitbox, 2.0f, 100.0f, 3000.0f, 0, 0, EISFX_EN_ENGINE_01, 0, 0.0f, 1 }, - /* 61 */ { D_ME_6019430, gCubeHitbox200, 2.5f, 100.0f, 3000.0f, 1, 0, EISFX_NONE, 0, 1.0f, 1 }, - /* 62 */ { D_ME_6018960, gCubeHitbox100, 2.5f, 100.0f, 3000.0f, 1, 0, EISFX_NONE, 0, 1.0f, 1 }, - /* 63 */ { D_ME_6009F50, gNoHitbox, -1.0f, 100.0f, 3000.0f, 1, 0, EISFX_NONE, 0, 0.0f, 1 }, - /* 64 */ { NULL, gCubeHitbox200, 3.0f, 100.0f, 3000.0f, 1, 0, EISFX_NONE, 0, 1.0f, 1 }, - /* 65 */ { D_ME_600C2A0, gCubeHitbox200, -1.0f, 100.0f, 8000.0f, 1, 0, EISFX_NONE, 0, 0.0f, 1 }, - /* 66 */ { D_ME_600BD40, gCubeHitbox100, -1.0f, 100.0f, 8000.0f, 1, 0, EISFX_NONE, 0, 0.0f, 1 }, - /* 67 */ { NULL, D_ME_602F604, 3.0f, 100.0f, 3000.0f, 2, 0, EISFX_EN_ENGINE_01, 0, 1.0f, 1 }, - /* 68 */ { D_SY_60205D0, D_SY_603445C, 3.0f, 100.0f, 3000.0f, 1, 0, EISFX_NONE, 0, 1.0f, 1 }, - /* 69 */ { aSyShip3DestroyedDL, aSyShip3DestroyedHitbox, -1.0f, 10000.0f, 3001.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 }, - /* 70 */ { D_SY_601AD70, gNoHitbox, 4.0f, 100.0f, 3000.0f, 0, 0, EISFX_EN_ENGINE_01, 0, 0.0f, 1 }, - /* 71 */ { aArwingItemLasersDL, gNoHitbox, 1.0f, 100.0f, 3000.0f, 2, 0, EISFX_OB_WING, 0, 0.0f, 1 }, - /* 72 */ { aSyShipWindowsDL, aSyShipWindowsHitbox, 3.0f, 100.0f, 3000.0f, 1, 0, EISFX_NONE, 0, 0.0f, 1 }, - /* 73 */ { aSyShip4DL, aSyShip4Hitbox, -1.0f, 10000.0f, 3001.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 }, - /* 74 */ { aSyShip4DestroyedDL, aSyShip4DestroyedHitbox, -1.0f, 10000.0f, 3001.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 }, - /* 75 */ { aSyShip2SpriteDL, gNoHitbox, -1.0f, 10000.0f, 3001.0f, 0, 0, EISFX_EN_ENGINE_01, 0, 0.0f, 1 }, - /* 76 */ { aSyShip3SpriteDL, gNoHitbox, -1.0f, 10000.0f, 3001.0f, 0, 0, EISFX_EN_ENGINE_01, 0, 0.0f, 1 }, - /* 77 */ - { aSyShipProjectileDL, aSyShipProjectileHitbox, 3.0f, 100.0f, 3001.0f, 0, 0, EISFX_EN_ENGINE_01, 0, 0.0f, 1 }, - /* 78 */ { NULL, gCubeHitbox150, 1.0f, 100.0f, 3000.0f, 2, 0, EISFX_NONE, 0, 1.0f, 0 }, - /* 79 */ { NULL, aZoBirdHitbox, 1.0f, 100.0f, 3000.0f, 0, 0, EISFX_NONE, 0, 1.0f, 1 }, - /* 80 */ { NULL, D_VE1_601B474, -1.0f, 100.0f, 3000.0f, 2, 0, EISFX_NONE, 0, 0.0f, 1 }, - /* 81 */ { NULL, gNoHitbox, -1.0f, 100.0f, 3000.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 }, - /* 82 */ { NULL, gCubeHitbox100, 2.0f, 100.0f, 3000.0f, 1, 0, EISFX_EN_ENGINE_01, 0, 1.0f, 1 }, - /* 83 */ { NULL, D_AQ_6030B4C, 1.0f, 100.0f, 3000.0f, 2, 0, EISFX_NONE, 0, 60.0f, 1 }, - /* 84 */ { D_VE1_9012180, D_VE1_601B43C, -1.0f, 100.0f, 3000.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 }, - /* 85 */ { NULL, gCubeHitbox100, 1.0f, 20000.0f, 3000.0f, 1, 0, EISFX_ARWING_ENGINE_FG, 0, 0.0f, 0 }, - /* 86 */ { NULL, gCubeHitbox100, 1.0f, 20000.0f, 3000.0f, 1, 0, EISFX_ARWING_ENGINE_FG, 0, 0.0f, 0 }, - /* 87 */ { D_VE1_900EFC0, gNoHitbox, 1.0f, 100.0f, 3000.0f, 1, 1, EISFX_NONE, 0, 0.0f, 1 }, - /* 88 */ { NULL, D_AQ_6030B30, 1.0f, 100.0f, 3000.0f, 1, 0, EISFX_NONE, 0, 1.0f, 1 }, - /* 89 */ { NULL, D_AQ_6030B14_f32, 1.0f, 100.0f, 3000.0f, 1, 0, EISFX_NONE, 0, 1.0f, 1 }, - /* 90 */ { D_MA_601C520, D_MA_60368FC, 1.0f, 100.0f, 3000.0f, 1, 0, EISFX_NONE, 0, 0.0f, 1 }, - /* 91 */ { aMaGuillotineDL, aMaGuillotineHitbox, -1.0f, 100.0f, 3000.0f, 1, 0, EISFX_NONE, 0, 0.0f, 1 }, - /* 92 */ { D_WZ_7000C40, gWarpZoneEvent92Hitbox, -1.0f, 2100.0f, 3001.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 }, - /* 93 */ { D_WZ_70010E0, gWarpZoneEvent93Hitbox, -1.0f, 2100.0f, 3001.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 }, - /* 94 */ { D_WZ_7000E80, gWarpZoneEvent94Hitbox, 2.5f, 100.0f, 3000.0f, 1, 0, EISFX_NONE, 0, 1.0f, 1 }, - /* 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 }, - /* 97 */ { D_ME_600AC70, gCubeHitbox100, -1.0f, 100.0f, 3000.0f, 1, 0, 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 }, - /* 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 }, - /* 102 */ { D_TR_6002740, D_TR_6009D18, -1.0f, 100.0f, 3000.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 }, - /* 103 */ { NULL, gNoHitbox, -1.0f, 500.0f, 3000.0f, 0, 0, EISFX_NONE, 0, 0.0f, 0 }, - /* 104 */ { NULL, gNoHitbox, -1.0f, 500.0f, 3000.0f, 0, 0, EISFX_NONE, 0, 0.0f, 0 }, - /* 105 */ { NULL, gCubeHitbox200, 1.0f, 100.0f, 3000.0f, 0, 0, EISFX_NONE, 0, 1.0f, 1 }, - /* 106 */ { NULL, gCubeHitbox100, 1.0f, 100.0f, 3000.0f, 0, 0, EISFX_EN_ALIEN_FLY, 0, 0.0f, 0 }, - /* 107 */ { D_MA_6002890, aMaGuillotineHitbox, -1.0f, 100.0f, 3000.0f, 1, 0, EISFX_NONE, 0, 0.0f, 1 }, + /* EVID_VENOM_FIGHTER_1 */ { aVenomFighter1DL, gCubeHitbox100, 1.0f, 100.0f, 3000.0f, 1, 0, EISFX_EN_ENGINE_01, 0, 1.0f, 1 }, + /* EVID_VENOM_FIGHTER_2 */ { aVenomFighter2DL, gCubeHitbox100, 1.0f, 100.0f, 3000.0f, 1, 0, EISFX_EN_ENGINE_01, 0, 1.0f, 1 }, + /* EVID_VENOM_FIGHTER_2 */ { NULL, gCubeHitbox100, 1.0f, 20000.0f, 3000.0f, 1, 0, EISFX_ARWING_ENGINE_FG, 0, 0.0f, 0 }, + /* EVID_ME_SLIPPY */ { aSpyEyeDL, gCubeHitbox100, 1.5f, 100.0f, 3000.0f, 1, 0, EISFX_NONE, 0, 1.0f, 1 }, + /* EVID_SPY_EYE */ { aGrangaFighter1DL, gCubeHitbox100, 1.0f, 100.0f, 3000.0f, 1, 0, EISFX_EN_ENGINE_01, 0, 1.0f, 1 }, + /* EVID_GRANGA_FIGHTER_2 */ { aGrangaFighter2DL, gCubeHitbox100, 1.0f, 100.0f, 3000.0f, 1, 0, EISFX_EN_ENGINE_01, 0, 1.0f, 1 }, + /* EVID_FIREBIRD */ { NULL, gCubeHitbox100, 1.0f, 100.0f, 3000.0f, 1, 0, EISFX_NONE, 0, 1.0f, 1 }, + /* EVID_CORNERIAN_FIGHTER */ { aCoCornerianFighterDL, gCubeHitbox100, 1.0f, 100.0f, 3000.0f, 1, 0, EISFX_EN_ENGINE_01, 0, 0.0f, 1 }, + /* EVID_VENOM_TANK */ { aVenomTankDL, gCubeHitbox100, 1.0f, 100.0f, 3000.0f, 2, 0, EISFX_EN_ENGINE_01, 1, 1.0f, 1 }, + /* EVID_TRIPOD */ { NULL, gCubeHitbox100, 1.5f, 100.0f, 3000.0f, 1, 0, EISFX_EN_ALIEN_FLY, 0, 1.0f, 1 }, + /* EVID_ATTACKER_1 */ { aAttacker1DL, gCubeHitbox200, 2.0f, 100.0f, 3000.0f, 1, 0, EISFX_EN_ENGINE_01, 0, 1.0f, 1 }, + /* EVID_ATTACKER_2 */ { aAttacker2DL, gCubeHitbox100, 1.5f, 100.0f, 3000.0f, 1, 0, EISFX_EN_ALIEN_FLY, 0, 1.0f, 1 }, + /* EVID_ATTACKER_3 */ { aAttacker3DL, gCubeHitbox100, 2.0f, 100.0f, 3000.0f, 1, 0, EISFX_EN_ENGINE_01, 0, 1.0f, 1 }, + /* EVID_ME_METEOR_1 */ { aMeMeteor1DL, gCubeHitbox100, 2.5f, 100.0f, 3000.0f, 1, 0, EISFX_EN_ENGINE_01, 0, 1.0f, 1 }, + /* EVID_ME_METEOR_2 */ { aMeMeteor2DL, gCubeHitbox400, 7.0f, 100.0f, 3000.0f, 1, 0, EISFX_EN_ENGINE_01, 0, 1.0f, 1 }, + /* EVID_COMMANDER */ { aCommanderDL, gCubeHitbox100, 1.5f, 100.0f, 3000.0f, 1, 0, EISFX_EN_ENGINE_01, 0, 1.0f, 1 }, + /* EVID_SPIDER */ { aSpiderDL, gCubeHitbox100, 1.5f, 100.0f, 3000.0f, 1, 0, EISFX_EN_ALIEN_FLY, 0, 1.0f, 1 }, + /* EVID_ZERAM_CLASS_CRUISER */ { aA6ZeramClassCruiserDL, aA6ZeramClassCruiserHitbox, -2.0f, 2100.0f, 3000.0f, 0, 0, EISFX_EN_SPACE_SHIP, 0, 0.0f, 5 }, + /* EVID_SX_SPY_EYE */ { aSxSpyEyeDL, gCubeHitbox200, 2.0f, 100.0f, 3000.0f, 1, 0, EISFX_EN_ENGINE_01, 0, 1.0f, 1 }, + /* EVID_SX_CANINE */ { aSxCanineDL, gCubeHitbox100, 1.5f, 100.0f, 3000.0f, 1, 0, EISFX_EN_ENGINE_01, 0, 1.0f, 1 }, + /* EVID_SPACE_MINE */ { NULL, gCubeHitbox100, 1.0f, 100.0f, 3000.0f, 2, 1, EISFX_EN_ENGINE_01, 0, 0.0f, 1 }, + /* EVID_A6_NINJIN_MISSILE */ { NULL, gCubeHitbox200, 2.0f, 100.0f, 3000.0f, 1, 0, EISFX_EN_ENGINE_01, 0, 0.0f, 1 }, + /* EVID_A6_ROCKET */ { NULL, gCubeHitbox100, 1.5f, 100.0f, 3000.0f, 1, 0, EISFX_EN_ENGINE_01, 0, 0.0f, 1 }, + /* EVID_VENOM_FIGHTER_3 */ { aVenomFighter3DL, gCubeHitbox100, 1.5f, 100.0f, 3000.0f, 1, 0, EISFX_EN_ENGINE_01, 0, 1.0f, 1 }, + /* EVID_SX_BASE_DEBRIS_1 */ { aSxBaseDebris1DL, aSxBaseDebris1Hitbox, -1.0f, 2100.0f, 3001.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 }, + /* EVID_SX_BASE_WALL_1 */ { aSxBaseWall1DL, aSxBaseWall1Hitbox, -1.0f, 2100.0f, 3001.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 }, + /* EVID_SX_BASE_DEBRIS_2 */ { aSxBaseDebris2DL, aSxBaseDebris2Hitbox, -1.0f, 2100.0f, 3001.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 }, + /* EVID_SX_LASER */ { NULL, aSxLaserHitbox, 2.5f, 100.0f, 3000.0f, 2, 0, EISFX_NONE, 0, 1.0f, 1 }, + /* EVID_SX_WATCH_POST */ { aSxWatchPostDL, aSxWatchPostHitbox, 3.0f, 100.0f, 3000.0f, 2, 0, EISFX_NONE, 0, 1.0f, 1 }, + /* EVID_SX_SPACE_MINE */ { aSxSpaceMineDL, aSxSpaceMineHitbox, 1.0f, 100.0f, 3000.0f, 2, 1, EISFX_NONE, 0, 1.0f, 1 }, + /* EVID_A6_HARLOCK_FRIGATE */ { aA6HarlockFrigateDL, aA6HarlockFrigateHitbox, -2.0f, 2100.0f, 3001.0f, 0, 0, EISFX_EN_SPACE_SHIP, 0, 0.0f, 2 }, + /* EVID_A6_UMBRA_STATION */ { NULL, aA6UmbraStationHitbox, -2.0f, 2100.0f, 3001.0f, 0, 0, EISFX_NONE, 0, 0.0f, 3 }, + /* EVID_SX_BASE_FLOOR_1 */ { aSxBaseFloor1DL, aSxBaseFloor1Hitbox, -1.0f, 2100.0f, 3001.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 }, + /* EVID_CRUISER_GUN */ { NULL, gCubeHitbox200, 2.0f, 100.0f, 3000.0f, 1, 0, EISFX_NONE, 0, 0.0f, 1 }, + /* EVID_SX_BASE_WALL_2 */ { aSxBaseWall2DL, aSxBaseWall2Hitbox, -1.0f, 2100.0f, 3001.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 }, + /* EVID_SX_BASE_WALL_3 */ { aSxBaseWall3DL, aSxBaseWall3Hitbox, -1.0f, 2100.0f, 3001.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 }, + /* EVID_TI_BOMBER */ { NULL, gCubeHitbox400, 2.0f, 200.0f, 3000.0f, 1, 0, EISFX_EN_ENGINE_01, 0, 1.0f, 1 }, + /* EVID_SX_BORZOI_FIGHTER */ { aSxBorzoiFighterDL, gCubeHitbox100, 1.5f, 100.0f, 3000.0f, 1, 0, EISFX_EN_ENGINE_01, 0, 1.0f, 1 }, + /* EVID_SX_WARP_GATE */ { NULL, aSxWarpGateHitbox, 1.0f, 500.0f, 3000.0f, 1, 0, EISFX_NONE, 0, 0.0f, 1 }, + /* EVID_SX_BASE_WALL_TILE_1 */ { aSxBaseWallTile1DL, aSxBaseWallTile1Hitbox, -1.0f, 2100.0f, 3001.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 }, + /* EVID_EVENT_HANDLER */ { NULL, gNoHitbox, 1.0f, 100.0f, 3001.0f, 2, 0, EISFX_NONE, 0, 0.0f, 1 }, + /* EVID_SY_SHIP_1 */ { aSyShip1DL, aSyShip1Hitbox, -1.0f, 10000.0f, 3001.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 }, + /* EVID_SY_SHIP_2 */ { aSyShip2DL, aSyShip2Hitbox, -1.0f, 10000.0f, 3001.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 }, + /* EVID_TEAMMATE */ { NULL, gCubeHitbox100, 1.0f, 20000.0f, 3000.0f, 1, 0, EISFX_ARWING_ENGINE_FG, 0, 0.0f, 0 }, + /* EVID_SY_SHIP_3 */ { aSyShip3DL, aSyShip3Hitbox, -1.0f, 10000.0f, 3001.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 }, + /* EVID_ME_METEOR_3 */ { aMeMeteor3DL, gCubeHitbox200, -1.0f, 300.0f, 3001.0f, 0, 0, EISFX_NONE, 0, 1.0f, 1 }, + /* EVID_ZO_PATROL_BOAT */ { aZoPatrolBoatDL, gCubeHitbox200, 1.0f, 100.0f, 3000.0f, 1, 0, EISFX_EN_SHIP_ENGINE_S, 0, 1.0f, 1 }, + /* EVID_ME_SECRET_MARKER_1 */ { aMeSecretMarker1DL, gCubeHitbox100, -1.0f, 100.0f, 3000.0f, 1, 0, EISFX_NONE, 0, 0.0f, 1 }, + /* EVID_SY_ROBOT_1 */ { NULL, aSyRobotHitbox, 0.3f, 100.0f, 3000.0f, 0, 0, EISFX_EN_ENGINE_01, 0, 1.0f, 1 }, + /* EVID_SY_ROBOT_2 */ { NULL, aSyRobotHitbox, 0.3f, 100.0f, 3000.0f, 0, 0, EISFX_EN_ENGINE_01, 0, 1.0f, 1 }, + /* EVID_SY_ROBOT_3 */ { NULL, aSyRobotHitbox, 0.3f, 100.0f, 3000.0f, 0, 0, EISFX_EN_ENGINE_01, 0, 1.0f, 1 }, + /* EVID_SY_ROBOT_4 */ { aSyRobot4DL, aSyRobot4Hitbox, 2.0f, 100.0f, 3000.0f, 0, 0, EISFX_EN_ENGINE_01, 0, 1.0f, 1 }, + /* EVID_SARUMARINE_PERISCOPE */ { NULL, aZoSarumarinePeriscopeHitbox, -1.0f, 1000.0f, 3000.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 }, + /* EVID_SX_BASE_WALL_4 */ { aSxBaseWall4DL, aSxBaseWall4Hitbox, -1.0f, 2100.0f, 3001.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 }, + /* EVID_GAMMA_ON */ { aGammaOnDL, gCubeHitbox100, 1.5f, 100.0f, 3000.0f, 1, 0, EISFX_EN_ENGINE_01, 0, 1.0f, 1 }, + /* EVID_GAMMA_OFF */ { aGammaOffDL, gCubeHitbox100, 1.5f, 100.0f, 3000.0f, 1, 0, EISFX_EN_ENGINE_01, 0, 1.0f, 1 }, + /* EVID_TI_GREAT_FOX */ { NULL, gNoHitbox, -1.0f, 2000.0f, 3000.0f, 0, 0, EISFX_GREATFOX_ENGINE, 0, 0.0f, 1 }, + /* EVID_SY_SHIP_3_2 */ { aSyShip3DL, gNoHitbox, -1.0f, 10000.0f, 3001.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 }, + /* EVID_SY_SARUZIN */ { aSySaruzinDL, gNoHitbox, -1.0f, 10000.0f, 3001.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 }, + /* EVID_SY_ROBOT_SPRITE_SIDE */ { aSyRobotSpriteSideDL, gNoHitbox, 2.0f, 100.0f, 3000.0f, 0, 0, EISFX_EN_ENGINE_01, 0, 0.0f, 1 }, + /* EVID_SY_ROBOT_SPRITE_FRONT */ { aSyRobotSpriteFrontDL, gNoHitbox, 2.0f, 100.0f, 3000.0f, 0, 0, EISFX_EN_ENGINE_01, 0, 0.0f, 1 }, + /* EVID_ME_METEOR_4 */ { aMeMeteor4DL, gCubeHitbox200, 2.5f, 100.0f, 3000.0f, 1, 0, EISFX_NONE, 0, 1.0f, 1 }, + /* EVID_ME_METEOR_5 */ { aMeMeteor5DL, gCubeHitbox100, 2.5f, 100.0f, 3000.0f, 1, 0, EISFX_NONE, 0, 1.0f, 1 }, + /* EVID_ME_BIG_METEOR */ { aMeBigMeteorDL, gNoHitbox, -1.0f, 100.0f, 3000.0f, 1, 0, EISFX_NONE, 0, 0.0f, 1 }, + /* EVID_ME_ROCK_GULL */ { NULL, gCubeHitbox200, 3.0f, 100.0f, 3000.0f, 1, 0, EISFX_NONE, 0, 1.0f, 1 }, + /* EVID_ME_METEOR_6 */ { aMeMeteor6DL, gCubeHitbox200, -1.0f, 100.0f, 8000.0f, 1, 0, EISFX_NONE, 0, 0.0f, 1 }, + /* EVID_ME_SECRET_MARKER_2 */ { aMeSecretMarker2DL, gCubeHitbox100, -1.0f, 100.0f, 8000.0f, 1, 0, EISFX_NONE, 0, 0.0f, 1 }, + /* EVID_ME_FLIP_BOT */ { NULL, aMeFlipBotHitbox, 3.0f, 100.0f, 3000.0f, 2, 0, EISFX_EN_ENGINE_01, 0, 1.0f, 1 }, + /* EVID_SY_LASER_TURRET */ { aSyLaserTurretDL, aSyLaserTurretHitbox, 3.0f, 100.0f, 3000.0f, 1, 0, EISFX_NONE, 0, 1.0f, 1 }, + /* EVID_SY_SHIP_DESTROYED */ { aSyShip3DestroyedDL, aSyShip3DestroyedHitbox, -1.0f, 10000.0f, 3001.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 }, + /* EVID_SY_DEBRIS */ { aSyDebrisDL, gNoHitbox, 4.0f, 100.0f, 3000.0f, 0, 0, EISFX_EN_ENGINE_01, 0, 0.0f, 1 }, + /* EVID_ITEM_WING_REPAIR */ { aArwingItemLasersDL, gNoHitbox, 1.0f, 100.0f, 3000.0f, 2, 0, EISFX_OB_WING, 0, 0.0f, 1 }, + /* EVID_SY_SHIP_WINDOWS */ { aSyShipWindowsDL, aSyShipWindowsHitbox, 3.0f, 100.0f, 3000.0f, 1, 0, EISFX_NONE, 0, 0.0f, 1 }, + /* EVID_SY_SHIP_4 */ { aSyShip4DL, aSyShip4Hitbox, -1.0f, 10000.0f, 3001.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 }, + /* EVID_SY_SHIP_4_DESTROYED */ { aSyShip4DestroyedDL, aSyShip4DestroyedHitbox, -1.0f, 10000.0f, 3001.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 }, + /* EVID_SY_SHIP_2_SPRITE */ { aSyShip2SpriteDL, gNoHitbox, -1.0f, 10000.0f, 3001.0f, 0, 0, EISFX_EN_ENGINE_01, 0, 0.0f, 1 }, + /* EVID_SY_SHIP_3_SPRITE */ { aSyShip3SpriteDL, gNoHitbox, -1.0f, 10000.0f, 3001.0f, 0, 0, EISFX_EN_ENGINE_01, 0, 0.0f, 1 }, + /* EVID_SY_SHIP_MISSILE */ { aSyShipMissileDL, aSyShipMissileHitbox, 3.0f, 100.0f, 3001.0f, 0, 0, EISFX_EN_ENGINE_01, 0, 0.0f, 1 }, + /* EVID_SUPPLY_CRATE */ { NULL, gCubeHitbox150, 1.0f, 100.0f, 3000.0f, 2, 0, EISFX_NONE, 0, 1.0f, 0 }, + /* EVID_ZO_BIRD */ { NULL, aZoBirdHitbox, 1.0f, 100.0f, 3000.0f, 0, 0, EISFX_NONE, 0, 1.0f, 1 }, + /* EVID_VE1_PILLAR */ { NULL, D_VE1_601B474, -1.0f, 100.0f, 3000.0f, 2, 0, EISFX_NONE, 0, 0.0f, 1 }, + /* EVID_VE1_BLOCKER */ { NULL, gNoHitbox, -1.0f, 100.0f, 3000.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 }, + /* EVID_MA_LASER_TURRET */ { NULL, gCubeHitbox100, 2.0f, 100.0f, 3000.0f, 1, 0, EISFX_EN_ENGINE_01, 0, 1.0f, 1 }, + /* EVID_AQ_OYSTER */ { NULL, aAqOysterEvHitbox, 1.0f, 100.0f, 3000.0f, 2, 0, EISFX_NONE, 0, 60.0f, 1 }, + /* EVID_VE1_PILLAR_5 */ { aVe1Pillar5DL, aVe1Pillar5Hitbox, -1.0f, 100.0f, 3000.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 }, + /* EVID_BILL */ { NULL, gCubeHitbox100, 1.0f, 20000.0f, 3000.0f, 1, 0, EISFX_ARWING_ENGINE_FG, 0, 0.0f, 0 }, + /* EVID_KATT */ { NULL, gCubeHitbox100, 1.0f, 20000.0f, 3000.0f, 1, 0, EISFX_ARWING_ENGINE_FG, 0, 0.0f, 0 }, + /* EVID_VE1_TEMPLE_BG */ { aVe1TempleBgDL, gNoHitbox, 1.0f, 100.0f, 3000.0f, 1, 1, EISFX_NONE, 0, 0.0f, 1 }, + /* EVID_AQ_STARFISH */ { NULL, aAqStarfishHitbox, 1.0f, 100.0f, 3000.0f, 1, 0, EISFX_NONE, 0, 1.0f, 1 }, + /* EVID_AQ_SHELL */ { NULL, aAqShellHitbox, 1.0f, 100.0f, 3000.0f, 1, 0, EISFX_NONE, 0, 1.0f, 1 }, + /* EVID_MA_RAILROAD_CART */ { aMaRailroadCartDL, aMaRailroadCartHitbox, 1.0f, 100.0f, 3000.0f, 1, 0, EISFX_NONE, 0, 0.0f, 1 }, + /* EVID_MA_GUILLOTINE_1 */ { aMaGuillotine1DL, aMaGuillotineHitbox, -1.0f, 100.0f, 3000.0f, 1, 0, EISFX_NONE, 0, 0.0f, 1 }, + /* EVID_WZ_PILLAR_1 */ { aWzPillar1DL, aWzPillar1Hitbox, -1.0f, 2100.0f, 3001.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 }, + /* EVID_WZ_PILLAR_2 */ { aWzPillar2DL, aWzPillar2Hitbox, -1.0f, 2100.0f, 3001.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 }, + /* EVID_WZ_METEOR_1 */ { aWzMeteor1DL, aWzMeteor1Hitbox, 2.5f, 100.0f, 3000.0f, 1, 0, EISFX_NONE, 0, 1.0f, 1 }, + /* EVID_WZ_METEOR_2 */ { aWzMeteor2DL, gCubeHitbox100, -1.0f, 100.0f, 8000.0f, 1, 0, EISFX_NONE, 0, 0.0f, 0 }, + /* EVID_WZ_GATE */ { aWzGateDL, aWzGateHitbox, -1.0f, 1000.0f, 3000.0f, 1, 0, EISFX_NONE, 0, 0.0f, 0 }, + /* EVID_ME_METEOR_7 */ { aMeMeteor7DL, gCubeHitbox100, -1.0f, 100.0f, 3000.0f, 1, 0, EISFX_NONE, 0, 0.0f, 1 }, + /* EVID_MA_BOULDER */ { aMaBoulderDL, aMaBoulderHitbox, 1.0f, 100.0f, 3000.0f, 1, 1, EISFX_NONE, 0, 0.0f, 1 }, + /* EVID_VE1_ENEMY_GATE */ { aVe1EnemyGateDL, aVe1EnemyGateHitbox, -1.0f, 100.0f, 3000.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 }, + /* EVID_ENEMY_GATE_DOOR_RIGHT */ { aVe1EnemyGateDoorRightDL, gNoHitbox, -1.0f, 100.0f, 3000.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 }, + /* EVID_ENEMY_GATE_DOOR_LEFT */ { aVe1EnemyGateDoorLeftDL, gNoHitbox, -1.0f, 100.0f, 3000.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 }, + /* EVID_TR_BARRIER */ { aTrBarrierDL, aTrBarrierHitbox, -1.0f, 100.0f, 3000.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 }, + /* EVID_ANDROSS_GATE */ { NULL, gNoHitbox, -1.0f, 500.0f, 3000.0f, 0, 0, EISFX_NONE, 0, 0.0f, 0 }, + /* EVID_ANDROSS_GATE_2 */ { NULL, gNoHitbox, -1.0f, 500.0f, 3000.0f, 0, 0, EISFX_NONE, 0, 0.0f, 0 }, + /* EVID_SX_WARP_ENMY */ { NULL, gCubeHitbox200, 1.0f, 100.0f, 3000.0f, 0, 0, EISFX_NONE, 0, 1.0f, 1 }, + /* EVID_KILLER_BEE */ { NULL, gCubeHitbox100, 1.0f, 100.0f, 3000.0f, 0, 0, EISFX_EN_ALIEN_FLY, 0, 0.0f, 0 }, + /* EVID_MA_GUILLOTINE_2 */ { aMaGuillotine2DL, aMaGuillotineHitbox, -1.0f, 100.0f, 3000.0f, 1, 0, EISFX_NONE, 0, 0.0f, 1 }, }; +// clang-format on + static Color_RGBA32 sEventTexLineColors[6] = { // could be in-function { 255, 255, 255, 255 }, { 160, 160, 255, 255 }, { 80, 80, 255, 255 }, @@ -1139,9 +1142,9 @@ void ActorEvent_ProcessScript(ActorEvent* this) { this->fwork[11] = 0.0f; this->fwork[12] = 0.0f; - if ((this->eventType == EVID_64) || (this->eventType == EVID_81)) { + if ((this->eventType == EVID_ME_ROCK_GULL) || (this->eventType == EVID_VE1_BLOCKER)) { this->fwork[15] = 0.0f; - } else if (this->eventType == EVID_79) { + } else if (this->eventType == EVID_ZO_BIRD) { this->info.drawType = 2; } @@ -1149,14 +1152,14 @@ void ActorEvent_ProcessScript(ActorEvent* this) { this->aiIndex += 2; if ((this->eventType >= EVID_200) && (this->eventType < EVID_300)) { - this->unk_046 = 100; + this->work_046 = 100; this->info.hitbox = gCubeHitbox200; this->info.targetOffset = 1.0f; for (i = 0; i < 2; i++) { if (gMeMoraStatus[i] == 0) { gMeMoraStatus[i] = 1; - this->unk_046 = i; + this->work_046 = i; for (j = 0; j < 100; j++) { gMeMoraYpos[i][j] = this->obj.pos.y; gMeMoraZpos[i][j] = this->obj.pos.z; @@ -1168,17 +1171,17 @@ void ActorEvent_ProcessScript(ActorEvent* this) { } } - if (this->unk_046 == 100) { + if (this->work_046 == 100) { Object_Kill(&this->obj, this->sfxSource); } } - if ((this->eventType == EVID_SLIPPY_METEO) || (this->eventType == EVID_TEAMMATE)) { + if ((this->eventType == EVID_ME_SLIPPY) || (this->eventType == EVID_TEAMMATE)) { this->drawShadow = true; this->iwork[11] = 1; } - if (this->eventType == EVID_81) { + if (this->eventType == EVID_VE1_BLOCKER) { this->drawShadow = true; } @@ -1196,7 +1199,7 @@ void ActorEvent_ProcessScript(ActorEvent* this) { } if (this->eventType == EVID_ANDROSS_GATE_2) { - this->animFrame = Animation_GetFrameCount(&D_VE2_6014658) - 1; + this->animFrame = Animation_GetFrameCount(&aVe2AndrossGateAnim) - 1; } if (this->eventType < EVID_200) { @@ -1217,8 +1220,8 @@ void ActorEvent_ProcessScript(ActorEvent* this) { switch (sEventActorInfo[this->eventType].sfx) { case EISFX_EN_ENGINE_01: - if (!((gCurrentLevel == LEVEL_SOLAR) || (this->eventType == EVID_6) || - ((gCurrentLevel == LEVEL_CORNERIA) && (this->eventType == EVID_8)))) { + if (!((gCurrentLevel == LEVEL_SOLAR) || (this->eventType == EVID_FIREBIRD) || + ((gCurrentLevel == LEVEL_CORNERIA) && (this->eventType == EVID_VENOM_TANK)))) { AUDIO_PLAY_SFX(NA_SE_EN_ENGINE_01, this->sfxSource, 4); } break; @@ -1248,7 +1251,7 @@ void ActorEvent_ProcessScript(ActorEvent* this) { if (this->info.unk_16 == 0) { this->obj.rot.z = this->fwork[23] = this->rot_0F4.z; - if (this->eventType != EVID_31) { + if (this->eventType != EVID_A6_UMBRA_STATION) { this->rot_0F4.z = 0.0f; } } @@ -1301,13 +1304,13 @@ void ActorEvent_ProcessScript(ActorEvent* this) { break; } - this->unk_048 = actorScript[this->aiIndex + 1]; + this->work_048 = actorScript[this->aiIndex + 1]; - if (this->unk_048 == EVACT_3) { - this->timer_04C = 4; + if (this->work_048 == EVACT_3) { + this->work_04C = 4; } - if (this->unk_048 == EVACT_TI_DROP_MINE) { + if (this->work_048 == EVACT_TI_DROP_MINE) { this->timer_0BE = 50; } @@ -1838,16 +1841,17 @@ void ActorEvent_ProcessActions(ActorEvent* this) { Vec3f sp6C; Sprite* sprite; - if ((gPlayer[0].state_1C8 == PLAYERSTATE_1C8_ACTIVE) && (this->eventType != EVID_52) && + if ((gPlayer[0].state_1C8 == PLAYERSTATE_1C8_ACTIVE) && (this->eventType != EVID_SARUMARINE_PERISCOPE) && (this->eventType != EVID_ANDROSS_GATE) && (this->eventType != EVID_ANDROSS_GATE_2) && - (this->eventType != EVID_48) && (this->eventType != EVID_49) && (this->eventType != EVID_50)) { - switch (this->unk_048) { + (this->eventType != EVID_SY_ROBOT_1) && (this->eventType != EVID_SY_ROBOT_2) && + (this->eventType != EVID_SY_ROBOT_3)) { + switch (this->work_048) { case EVACT_NONE: break; case EVACT_1: // shoot forward ActorEvent_8006F254(this); - this->unk_048 = EVACT_NONE; + this->work_048 = EVACT_NONE; break; case EVACT_2: // shoot at player @@ -1855,7 +1859,7 @@ void ActorEvent_ProcessActions(ActorEvent* this) { Effect_EnemyLaser(OBJ_EFFECT_ENEMY_LASER_1, this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, gEnemyShotSpeed); } - this->unk_048 = EVACT_NONE; + this->work_048 = EVACT_NONE; break; case EVACT_3: // ally shoots forward @@ -1870,16 +1874,16 @@ void ActorEvent_ProcessActions(ActorEvent* this) { sp6C.y, sp6C.z, this->rot_0F4.x, this->rot_0F4.y, this->vwork[29].z + this->rot_0F4.z); this->timer_0C2 = 2; - this->timer_04C--; - if (this->timer_04C <= 0) { - this->unk_048 = EVACT_NONE; + this->work_04C--; + if (this->work_04C <= 0) { + this->work_048 = EVACT_NONE; } } break; case EVACT_4: // shoot blue energy balls ActorEvent_SpawnEffect374(this->obj.pos.x, this->obj.pos.y - 20.0f, this->obj.pos.z); - this->unk_048 = EVACT_NONE; + this->work_048 = EVACT_NONE; break; case EVACT_5: @@ -1898,7 +1902,7 @@ void ActorEvent_ProcessActions(ActorEvent* this) { this->obj.pos.z + sp6C.z, this->obj.rot.x, this->obj.rot.y, this->obj.rot.z, this->vwork[29].x, this->vwork[29].y, this->vwork[29].z + this->rot_0F4.z, sp6C.x, sp6C.y, sp6C.z, 1.0f); - this->unk_048 = EVACT_NONE; + this->work_048 = EVACT_NONE; break; case EVACT_6: @@ -1906,14 +1910,14 @@ void ActorEvent_ProcessActions(ActorEvent* this) { Effect_EnemyLaser(OBJ_EFFECT_355, this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, gEnemyShotSpeed); } - this->unk_048 = EVACT_NONE; + this->work_048 = EVACT_NONE; break; case EVACT_7: if (this->obj.pos.z < (gPlayer[0].trueZpos - 600.0f)) { Effect_EnemyLaser(OBJ_EFFECT_356, this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, 60.0f); } - this->unk_048 = EVACT_NONE; + this->work_048 = EVACT_NONE; break; case EVACT_8: @@ -1925,7 +1929,7 @@ void ActorEvent_ProcessActions(ActorEvent* this) { gEnemyShotSpeed); gPlayer[0].pos.x = sp6C.x; gPlayer[0].pos.y = sp6C.y; - this->unk_048 = EVACT_NONE; + this->work_048 = EVACT_NONE; break; case EVACT_9: @@ -1970,7 +1974,7 @@ void ActorEvent_ProcessActions(ActorEvent* this) { ActorEvent_SpawnTIMine(this->obj.pos.x, this->obj.pos.y - 50.0f, this->obj.pos.z); } if (this->timer_0BE == 0) { - this->unk_048 = EVACT_NONE; + this->work_048 = EVACT_NONE; } break; @@ -1979,7 +1983,7 @@ void ActorEvent_ProcessActions(ActorEvent* this) { this->obj.pos.z + 220.0f, gEnemyShotSpeed); Effect_EnemyLaser(OBJ_EFFECT_ENEMY_LASER_1, this->obj.pos.x - 190.0f, this->obj.pos.y + 90.0f, this->obj.pos.z + 220.0f, gEnemyShotSpeed); - this->unk_048 = EVACT_NONE; + this->work_048 = EVACT_NONE; break; case EVACT_17: @@ -1987,7 +1991,7 @@ void ActorEvent_ProcessActions(ActorEvent* this) { func_effect_8007F20C(OBJ_EFFECT_ENEMY_LASER_1, this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, gEnemyShotSpeed); } - this->unk_048 = EVACT_NONE; + this->work_048 = EVACT_NONE; break; case EVACT_GFOX_COVER_FIRE: @@ -2019,12 +2023,12 @@ void ActorEvent_ProcessActions(ActorEvent* this) { } } - this->unk_048 = EVACT_NONE; + this->work_048 = EVACT_NONE; break; case EVACT_19: // projectile ring used by bee enemies func_effect_80083D2C(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, 40.0f); - this->unk_048 = EVACT_NONE; + this->work_048 = EVACT_NONE; break; } } @@ -2100,23 +2104,23 @@ void ActorEvent_800701E0(ActorEvent* this) { if (ActorEvent_800700A4(this)) { return; } - if ((this->dmgType != DMG_NONE) && (this->eventType == EVID_METEO_PYRAMID_SHIP) && (this->dmgPart == 0)) { + if ((this->dmgType != DMG_NONE) && (this->eventType == EVID_ME_FLIP_BOT) && (this->dmgPart == 0)) { this->dmgType = DMG_NONE; } - if ((this->dmgType != DMG_NONE) && (this->eventType == EVID_AQ_CLAM) && (this->timer_0C2 >= 2)) { + if ((this->dmgType != DMG_NONE) && (this->eventType == EVID_AQ_OYSTER) && (this->timer_0C2 >= 2)) { this->dmgType = DMG_NONE; } if ((this->dmgType != DMG_NONE) && - (((this->eventType == EVID_64) && (this->dmgPart == 2)) || (this->eventType != EVID_64))) { + (((this->eventType == EVID_ME_ROCK_GULL) && (this->dmgPart == 2)) || (this->eventType != EVID_ME_ROCK_GULL))) { if (this->iwork[12] >= TEAM_ID_KATT) { this->damage = 0; } if ((this->iwork[12] >= TEAM_ID_FALCO) && (this->iwork[12] <= TEAM_ID_PEPPY)) { gTeamShields[this->iwork[12]] -= this->damage; - } else if ((this->eventType == EVID_AQ_CLAM) && ((this->damage == 30) || (this->damage == 31))) { + } else if ((this->eventType == EVID_AQ_OYSTER) && ((this->damage == 30) || (this->damage == 31))) { this->health = 0; } else { this->health -= this->damage; @@ -2130,8 +2134,8 @@ void ActorEvent_800701E0(ActorEvent* this) { D_ctx_80177850 = 15; } - if (this->eventType != EVID_AQ_CLAM) { - if ((this->eventType == EVID_6) && (gCurrentLevel == LEVEL_SOLAR)) { + if (this->eventType != EVID_AQ_OYSTER) { + if ((this->eventType == EVID_FIREBIRD) && (gCurrentLevel == LEVEL_SOLAR)) { AUDIO_PLAY_SFX(NA_SE_EN_BIRD_DOWN, this->sfxSource, 4); } else { AUDIO_PLAY_SFX(NA_SE_EN_CRASH_DOWN, this->sfxSource, 4); @@ -2145,23 +2149,24 @@ void ActorEvent_800701E0(ActorEvent* this) { } if (((Rand_ZeroOne() < chance) || (this->iwork[12] != 0)) && (this->info.unk_14 == 0) && - (this->eventType != EVID_13) && (this->eventType != EVID_14) && (this->eventType != EVID_61) && - (this->damage <= 30) && (this->eventType != EVID_62) && (this->eventType != EVID_64) && - (this->eventType != EVID_72) && (this->eventType != EVID_68)) { + (this->eventType != EVID_ME_METEOR_1) && (this->eventType != EVID_ME_METEOR_2) && + (this->eventType != EVID_ME_METEOR_4) && (this->damage <= 30) && + (this->eventType != EVID_ME_METEOR_5) && (this->eventType != EVID_ME_ROCK_GULL) && + (this->eventType != EVID_SY_SHIP_WINDOWS) && (this->eventType != EVID_SY_LASER_TURRET)) { func_effect_8007D2C8(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, this->scale * 4.0f); this->dmgType = DMG_NONE; } this->timer_0C2 = 10; this->timer_0BE = 0; - this->unk_046 = 255; - this->unk_048 = 900; + this->work_046 = 255; + this->work_048 = 900; this->drawShadow = true; if (gLevelType == LEVELTYPE_PLANET) { - this->timer_04C = RAND_INT(2.9f); - if (this->eventType == EVID_SLIPPY_METEO) { - this->timer_04C = 1; + this->work_04C = RAND_INT(2.9f); + if (this->eventType == EVID_ME_SLIPPY) { + this->work_04C = 1; if (this->obj.pos.x < this->hitPos.x) { Play_SpawnDebris(1, this->obj.pos.x + 20.0f, this->obj.pos.y, this->obj.pos.z); this->fwork[17] = 777.0f; @@ -2185,20 +2190,20 @@ void ActorEvent_800701E0(ActorEvent* this) { } } - if (this->eventType == EVID_90) { - this->timer_04C = 999; + if (this->eventType == EVID_MA_RAILROAD_CART) { + this->work_04C = 999; } } else { switch (this->eventType) { - case EVID_13: + case EVID_ME_METEOR_1: func_enmy_800654E4(&this->obj); break; - case EVID_61: + case EVID_ME_METEOR_4: Meteo_Effect346_Spawn(this); break; - case EVID_27: + case EVID_SX_LASER: this->obj.pos.y -= this->vel.y; this->obj.status = OBJ_ACTIVE; func_effect_8007D0E0(this->obj.pos.x - this->vel.x, this->obj.pos.y + 30.0f, @@ -2212,7 +2217,7 @@ void ActorEvent_800701E0(ActorEvent* this) { default: this->timer_0BC = 35; - this->timer_04C = 2; + this->work_04C = 2; this->vel.y = RAND_FLOAT_CENTERED(20.0f); this->vel.x = RAND_FLOAT_CENTERED(20.0f); this->vel.z = 0.0f; @@ -2221,14 +2226,14 @@ void ActorEvent_800701E0(ActorEvent* this) { } } - if (this->eventType == EVID_82) { + if (this->eventType == EVID_MA_LASER_TURRET) { AUDIO_PLAY_SFX(NA_SE_OB_SMOKE, this->sfxSource, 0); this->dmgType = DMG_BEAM; Effect_Effect387_Spawn(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, 3.0f, 60); } } else { this->timer_0C6 = 20; - if ((this->eventType == EVID_6) && (gCurrentLevel == LEVEL_SOLAR)) { + if ((this->eventType == EVID_FIREBIRD) && (gCurrentLevel == LEVEL_SOLAR)) { AUDIO_PLAY_SFX(NA_SE_EN_BIRD_DAMAGE, this->sfxSource, 4); } else if (this->health < 20) { AUDIO_PLAY_SFX(NA_SE_EN_KNOCK_DOWN, this->sfxSource, 4); @@ -2236,12 +2241,13 @@ void ActorEvent_800701E0(ActorEvent* this) { AUDIO_PLAY_SFX(NA_SE_EN_DAMAGE_S, this->sfxSource, 4); } - if ((this->eventType != EVID_13) && (this->eventType != EVID_61) && (this->eventType != EVID_AQ_CLAM)) { + if ((this->eventType != EVID_ME_METEOR_1) && (this->eventType != EVID_ME_METEOR_4) && + (this->eventType != EVID_AQ_OYSTER)) { func_effect_8007D10C(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, this->scale * 1.5f); } if (((gLevelMode == LEVELMODE_ALL_RANGE) || (gLevelMode == LEVELMODE_TURRET)) && - (this->eventType != EVID_A6_MISSILE) && (this->eventType != EVID_23)) { + (this->eventType != EVID_A6_NINJIN_MISSILE) && (this->eventType != EVID_VENOM_FIGHTER_3)) { this->fwork[13] = 20.0f; if (this->obj.pos.x < this->hitPos.x) { this->fwork[13] *= -1.0f; @@ -2297,12 +2303,12 @@ void ActorEvent_800701E0(ActorEvent* this) { this->obj.status = OBJ_DYING; this->obj.pos.z -= this->vel.z; this->dmgType = DMG_BEAM; - if (this->eventType == EVID_13) { + if (this->eventType == EVID_ME_METEOR_1) { this->obj.id = OBJ_ACTOR_ME_METEOR_2; func_enmy_800654E4(&this->obj); } - if (this->eventType == EVID_61) { + if (this->eventType == EVID_ME_METEOR_4) { Meteo_Effect346_Spawn(this); } } @@ -2312,7 +2318,8 @@ void ActorEvent_800701E0(ActorEvent* this) { void ActorEvent_80070BA8(ActorEvent* this) { if (this->dmgType != DMG_NONE) { this->dmgType = DMG_NONE; - if ((this->eventType != EVID_17) || ((this->eventType == EVID_17) && (this->dmgPart == 0))) { + if ((this->eventType != EVID_ZERAM_CLASS_CRUISER) || + ((this->eventType == EVID_ZERAM_CLASS_CRUISER) && (this->dmgPart == 0))) { this->timer_0C6 = 10; Effect_Effect390_Spawn(this->hitPos.x, this->hitPos.y, this->hitPos.z, this->vel.x, this->vel.y, this->vel.z, 0.2f, 10); @@ -2346,13 +2353,13 @@ void ActorEvent_TriggerBranch(ActorEvent* this) { void ActorEvent_ProcessTriggers(ActorEvent* this) { s32 i; - s32 var_v1 = 0; - s32 var_v1_4; + s32 teamAliveCount = 0; + s32 ringRequirement; Actor* otherActor; for (i = TEAM_ID_FALCO; i <= TEAM_ID_PEPPY; i++) { if (gTeamShields[i] > 0) { - var_v1++; + teamAliveCount++; } } @@ -2375,25 +2382,25 @@ void ActorEvent_ProcessTriggers(ActorEvent* this) { break; case EVC_TEAM_COUNT_3: - if (var_v1 == 3) { + if (teamAliveCount == 3) { ActorEvent_TriggerBranch(this); } break; case EVC_TEAM_COUNT_2: - if (var_v1 == 2) { + if (teamAliveCount == 2) { ActorEvent_TriggerBranch(this); } break; case EVC_TEAM_COUNT_1: - if (var_v1 == 1) { + if (teamAliveCount == 1) { ActorEvent_TriggerBranch(this); } break; case EVC_TEAM_COUNT_0: - if (var_v1 == 0) { + if (teamAliveCount == 0) { ActorEvent_TriggerBranch(this); } break; @@ -2654,26 +2661,29 @@ void ActorEvent_ProcessTriggers(ActorEvent* this) { break; case EVC_PASSED_ALL_RINGS: - var_v1_4 = 7; + ringRequirement = 7; switch (gCurrentLevel) { case LEVEL_CORNERIA: break; case LEVEL_SECTOR_X: - var_v1_4 = 4; + ringRequirement = 4; break; case LEVEL_TITANIA: - var_v1_4 = 9; + ringRequirement = 9; break; } - if (!((gCurrentLevel == LEVEL_CORNERIA) && (gTeamShields[TEAM_ID_FALCO] <= 0)) && - (gRingPassCount >= var_v1_4)) { - ActorEvent_TriggerBranch(this); + // Abort if Falco is dead or the requirement is not met. + if (((gCurrentLevel == LEVEL_CORNERIA) && (gTeamShields[TEAM_ID_FALCO] <= 0)) || + (gRingPassCount < ringRequirement)) { + break; } + + ActorEvent_TriggerBranch(this); break; case EVC_ATTACK_GROUP_CLEARED: - 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_DYING) || (otherActor->obj.status == OBJ_FREE)) && (otherActor->iwork[15] == this->iwork[15]) && (otherActor->iwork[16] != 0)) { ActorEvent_TriggerBranch(this); @@ -2862,17 +2872,17 @@ void ActorEvent_80071DC0(ActorEvent* this) { Matrix_RotateX(gCalcMatrix, this->obj.rot.x * M_DTOR, MTXF_APPLY); Matrix_RotateZ(gCalcMatrix, this->obj.rot.z * M_DTOR, MTXF_APPLY); - if (this->eventType == EVID_30) { + if (this->eventType == EVID_A6_HARLOCK_FRIGATE) { rInd = RAND_FLOAT(ARRAY_COUNT(D_800D1074) - 1.1f); // off by 1 error? Matrix_MultVec3fNoTranslate(gCalcMatrix, &D_800D1074[rInd], &sp38); } - if (this->eventType == EVID_17) { + if (this->eventType == EVID_ZERAM_CLASS_CRUISER) { rInd = RAND_FLOAT(ARRAY_COUNT(D_800D0DD4) - 0.1f); Matrix_MultVec3fNoTranslate(gCalcMatrix, &D_800D0DD4[rInd], &sp38); } - if (this->eventType == EVID_31) { + if (this->eventType == EVID_A6_UMBRA_STATION) { rInd = RAND_FLOAT(ARRAY_COUNT(D_800D1194) - 0.1f); Matrix_MultVec3fNoTranslate(gCalcMatrix, &D_800D1194[rInd], &sp38); } @@ -2902,7 +2912,7 @@ void ActorEvent_80071DC0(ActorEvent* this) { } void ActorEvent_800720E8(ActorEvent* this) { - switch (this->unk_046) { + switch (this->work_046) { case 0: if (this->dmgType != DMG_NONE) { if (this->dmgType == DMG_EXPLOSION) { @@ -2923,7 +2933,7 @@ void ActorEvent_800720E8(ActorEvent* this) { } if (this->health <= 0) { - this->unk_046 = 1; + this->work_046 = 1; this->info.hitbox = SEGMENTED_TO_VIRTUAL(D_SX_6032408); AUDIO_PLAY_SFX(NA_SE_OB_GATE_OPEN, this->sfxSource, 0); } else { @@ -2982,8 +2992,8 @@ void ActorEvent_SpawnEffect365(f32 xPos, f32 yPos, f32 zPos, f32 yRot) { void ActorEvent_80072474(ActorEvent* this) { f32 var_fv1; - if (this->unk_048 != EVACT_NONE) { - switch (this->unk_048) { + if (this->work_048 != EVACT_NONE) { + switch (this->work_048) { case EVACT_1: this->fwork[16] = 45.0f; break; @@ -2997,7 +3007,7 @@ void ActorEvent_80072474(ActorEvent* this) { this->iwork[15] = 0; break; } - this->unk_048 = EVACT_NONE; + this->work_048 = EVACT_NONE; } if (this->iwork[15] != 0) { @@ -3046,7 +3056,8 @@ void ActorEvent_Update(ActorEvent* this) { } return; } - if (((this->eventType == EVID_17) || (this->eventType == EVID_30) || (this->eventType == EVID_31)) && + if (((this->eventType == EVID_ZERAM_CLASS_CRUISER) || (this->eventType == EVID_A6_HARLOCK_FRIGATE) || + (this->eventType == EVID_A6_UMBRA_STATION)) && (this->health <= 0)) { ActorEvent_80071DC0(this); return; @@ -3061,12 +3072,12 @@ void ActorEvent_Update(ActorEvent* this) { this->counter_04E = 0; } - gMeMoraXpos[this->unk_046][this->counter_04E] = this->obj.pos.x; - gMeMoraYpos[this->unk_046][this->counter_04E] = this->obj.pos.y; - gMeMoraZpos[this->unk_046][this->counter_04E] = this->obj.pos.z; - gMeMoraXrot[this->unk_046][this->counter_04E] = this->obj.rot.x; - gMeMoraYrot[this->unk_046][this->counter_04E] = this->obj.rot.y; - gMeMoraZrot[this->unk_046][this->counter_04E] = this->obj.rot.z; + gMeMoraXpos[this->work_046][this->counter_04E] = this->obj.pos.x; + gMeMoraYpos[this->work_046][this->counter_04E] = this->obj.pos.y; + gMeMoraZpos[this->work_046][this->counter_04E] = this->obj.pos.z; + gMeMoraXrot[this->work_046][this->counter_04E] = this->obj.rot.x; + gMeMoraYrot[this->work_046][this->counter_04E] = this->obj.rot.y; + gMeMoraZrot[this->work_046][this->counter_04E] = this->obj.rot.z; if (this->dmgType != DMG_NONE) { this->dmgType = DMG_NONE; @@ -3086,7 +3097,7 @@ void ActorEvent_Update(ActorEvent* this) { } } - if ((this->eventType == EVID_27) && (this->timer_0C2 != 0)) { + if ((this->eventType == EVID_SX_LASER) && (this->timer_0C2 != 0)) { this->state = EVSTATE_READY; } @@ -3109,7 +3120,7 @@ void ActorEvent_Update(ActorEvent* this) { spEC = this->obj.pos.y; spE8 = this->obj.pos.z; - if ((this->eventType == EVID_33) || (this->eventType == EVID_68)) { + if ((this->eventType == EVID_CRUISER_GUN) || (this->eventType == EVID_SY_LASER_TURRET)) { Matrix_RotateZ(gCalcMatrix, -(this->vwork[29].z + this->rot_0F4.z) * M_DTOR, MTXF_NEW); Matrix_RotateX(gCalcMatrix, -this->vwork[29].x * M_DTOR, MTXF_APPLY); Matrix_RotateY(gCalcMatrix, -this->vwork[29].y * M_DTOR, MTXF_APPLY); @@ -3164,7 +3175,7 @@ void ActorEvent_Update(ActorEvent* this) { Matrix_MultVec3fNoTranslate(gCalcMatrix, &spB8, &spAC); - if (this->eventType == EVID_68) { + if (this->eventType == EVID_SY_LASER_TURRET) { var_fv0 = 80.0f; } else { var_fv0 = 0.0f; @@ -3398,10 +3409,12 @@ void ActorEvent_Update(ActorEvent* this) { } if (this->fwork[10] > 0.0f) { - if ((this->eventType == EVID_13) || (this->eventType == EVID_14) || (this->eventType == EVID_61) || - (this->eventType == EVID_62) || (this->eventType == EVID_63) || (this->eventType == EVID_64) || - (this->eventType == EVID_65) || (this->eventType == EVID_66) || (this->eventType == EVID_94) || - (this->eventType == EVID_95) || (this->eventType == EVID_97)) { + if ((this->eventType == EVID_ME_METEOR_1) || (this->eventType == EVID_ME_METEOR_2) || + (this->eventType == EVID_ME_METEOR_4) || (this->eventType == EVID_ME_METEOR_5) || + (this->eventType == EVID_ME_BIG_METEOR) || (this->eventType == EVID_ME_ROCK_GULL) || + (this->eventType == EVID_ME_METEOR_6) || (this->eventType == EVID_ME_SECRET_MARKER_2) || + (this->eventType == EVID_WZ_METEOR_1) || (this->eventType == EVID_WZ_METEOR_2) || + (this->eventType == EVID_ME_METEOR_7)) { this->obj.rot.y -= this->fwork[11] * this->fwork[12]; this->obj.rot.x += this->fwork[11] * this->fwork[12]; } else { @@ -3460,8 +3473,8 @@ void ActorEvent_Update(ActorEvent* this) { if (this->scale <= -1.999f) { ActorEvent_80070BA8(this); } else { - if ((this->dmgType == DMG_BEAM) && (this->scale < 0.5f) && (this->eventType != EVID_48) && - (this->eventType != EVID_49) && (this->eventType != EVID_50)) { + if ((this->dmgType == DMG_BEAM) && (this->scale < 0.5f) && (this->eventType != EVID_SY_ROBOT_1) && + (this->eventType != EVID_SY_ROBOT_2) && (this->eventType != EVID_SY_ROBOT_3)) { this->dmgType = DMG_NONE; if (gCurrentLevel == LEVEL_METEO) { AUDIO_PLAY_SFX(NA_SE_ROCK_REFLECT, this->sfxSource, 4); @@ -3472,10 +3485,10 @@ void ActorEvent_Update(ActorEvent* this) { if ((this->eventType < EVID_200) && (this->eventType != EVID_SUPPLY_CRATE) && (this->scale >= 0.5f)) { switch (this->eventType) { - case EVID_WING_REPAIR: + case EVID_ITEM_WING_REPAIR: ActorEvent_8006FE28(this); break; - case EVID_79: + case EVID_ZO_BIRD: ActorEvent_8006FEEC(this); break; default: @@ -3486,11 +3499,11 @@ void ActorEvent_Update(ActorEvent* this) { } } switch (this->eventType) { - case EVID_92: - case EVID_93: - case EVID_94: - case EVID_95: - case EVID_96: + case EVID_WZ_PILLAR_1: + case EVID_WZ_PILLAR_2: + case EVID_WZ_METEOR_1: + case EVID_WZ_METEOR_2: + case EVID_WZ_GATE: if ((gGameFrameCount % 8) == 0) { this->fwork[18] = RAND_FLOAT(255.0f); this->fwork[19] = RAND_FLOAT(255.0f); @@ -3501,7 +3514,7 @@ void ActorEvent_Update(ActorEvent* this) { Math_SmoothStepToF(&this->fwork[17], this->fwork[20], 1.0f, 10.0f, 0.0f); break; - case EVID_46: + case EVID_ZO_PATROL_BOAT: if (Play_CheckDynaFloorCollision(&spEC, &spFC, this->obj.pos.x, -100.0f, this->obj.pos.z)) { spF0 = 10.0f; @@ -3526,38 +3539,38 @@ void ActorEvent_Update(ActorEvent* this) { this->obj.rot.y = this->rot_0F4.y; break; - case EVID_31: + case EVID_A6_UMBRA_STATION: this->obj.rot.z = gGameFrameCount; break; - case EVID_A6_MISSILE: + case EVID_A6_NINJIN_MISSILE: case EVID_A6_ROCKET: this->obj.rot.z = gGameFrameCount * 3.0f; break; - case EVID_3: + case EVID_SPY_EYE: this->drawShadow = true; this->obj.rot.y -= 10.0f; break; - case EVID_6: + case EVID_FIREBIRD: this->animFrame++; if (gCurrentLevel == LEVEL_SOLAR) { - if (this->animFrame >= Animation_GetFrameCount(&D_SO_600636C)) { + if (this->animFrame >= Animation_GetFrameCount(&aSoGoreAnim)) { this->animFrame = 0; } if ((gGameFrameCount % 3) == 0) { Solar_8019E9F4(this->obj.pos.x, this->obj.pos.y - 20, this->obj.pos.z - 180.0f, 0.0f, RAND_FLOAT(20.0f) * -1.0f, 0.0f, 4.0f, 2); } - } else if (this->animFrame >= Animation_GetFrameCount(&D_ENMY_PLANET_40057AC)) { + } else if (this->animFrame >= Animation_GetFrameCount(&aFirebirdAnim)) { this->animFrame = 0; } break; - case EVID_9: + case EVID_TRIPOD: this->animFrame++; - if (this->animFrame >= Animation_GetFrameCount(&D_ENMY_PLANET_40001A4)) { + if (this->animFrame >= Animation_GetFrameCount(&aTripodAnim)) { this->animFrame = 0; } if (this->iwork[6] == 0) { @@ -3565,13 +3578,13 @@ void ActorEvent_Update(ActorEvent* this) { } break; - case EVID_48: - case EVID_49: - case EVID_50: + case EVID_SY_ROBOT_1: + case EVID_SY_ROBOT_2: + case EVID_SY_ROBOT_3: SectorY_SyRobot_Update(this); break; - case EVID_52: + case EVID_SARUMARINE_PERISCOPE: ActorEvent_80072474(this); break; @@ -3579,7 +3592,7 @@ void ActorEvent_Update(ActorEvent* this) { ActorSupplies_Update(this); break; - case EVID_79: + case EVID_ZO_BIRD: if (this->timer_0C4 == 0) { this->animFrame++; if (Animation_GetFrameCount(&aZoBirdAnim) < this->animFrame) { @@ -3588,14 +3601,14 @@ void ActorEvent_Update(ActorEvent* this) { } break; - case EVID_80: { + case EVID_VE1_PILLAR: { Effect* effect; Vec3f sp90; Vec3f sp84; Vec3f sp78; s32 sp74; - switch (this->unk_046) { + switch (this->work_046) { case 1: break; @@ -3631,7 +3644,7 @@ void ActorEvent_Update(ActorEvent* this) { effect->unk_60.z = RAND_FLOAT_CENTERED(1.0f) + 5.0f; } } - this->unk_046++; + this->work_046++; } break; } @@ -3695,29 +3708,29 @@ void ActorEvent_Update(ActorEvent* this) { } } break; - case EVID_81: + case EVID_VE1_BLOCKER: Math_SmoothStepToF(&this->fwork[15], 1.0f, 0.1f, 0.1f, 0.001f); if (this->fwork[15] > 0.5f) { this->info.hitbox = SEGMENTED_TO_VIRTUAL(D_VE1_601B4C4); } - if (this->unk_046 == 0) { + if (this->work_046 == 0) { this->fwork[16] += 4.0f; if (this->fwork[16] >= 100.0f) { - this->unk_046 = 1; + this->work_046 = 1; this->fwork[16] = 100.0f; } } else { this->fwork[16] -= 4.0f; if (this->fwork[16] <= 0.0f) { - this->unk_046 = 0; + this->work_046 = 0; this->fwork[16] = 0.0f; } } break; - case EVID_AQ_CLAM: + case EVID_AQ_OYSTER: if (this->health <= 0) { if (this->animFrame == 20) { spD4 = this->obj.pos.z; @@ -3750,17 +3763,17 @@ void ActorEvent_Update(ActorEvent* this) { break; case EVID_AQ_STARFISH: - if (this->unk_04A == 0) { - this->unk_046 += 4; - if (this->unk_046 >= 255) { - this->unk_046 = 255; - this->unk_04A = 1; + if (this->work_04A == 0) { + this->work_046 += 4; + if (this->work_046 >= 255) { + this->work_046 = 255; + this->work_04A = 1; } } else { - this->unk_046 -= 4; - if (this->unk_046 <= 0) { - this->unk_046 = 0; - this->unk_04A = 0; + this->work_046 -= 4; + if (this->work_046 <= 0) { + this->work_046 = 0; + this->work_04A = 0; } } break; @@ -3832,13 +3845,13 @@ bool ActorEvent_OverrideLimbDraw2(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* } void ActorEvent_DrawEVID_SX_WARP_GATE(ActorEvent* this) { - Vec3f sp30[10]; + Vec3f frameTable[10]; - Animation_GetFrameData(&D_SX_6013820, 0, sp30); - sp30[6].y += this->fwork[15]; - sp30[5].z += this->fwork[16] + (s32) ((this->timer_0BE >> 2) % 2U); - sp30[4].z -= this->fwork[16] + (s32) ((this->timer_0BE >> 2) % 2U); - Animation_DrawSkeleton(1, D_SX_601390C, sp30, ActorEvent_OverrideLimbDraw2, NULL, this, &gIdentityMatrix); + Animation_GetFrameData(&D_SX_6013820, 0, frameTable); + frameTable[6].y += this->fwork[15]; + frameTable[5].z += this->fwork[16] + (s32) ((this->timer_0BE >> 2) % 2U); + frameTable[4].z -= this->fwork[16] + (s32) ((this->timer_0BE >> 2) % 2U); + Animation_DrawSkeleton(1, D_SX_601390C, frameTable, ActorEvent_OverrideLimbDraw2, NULL, this, &gIdentityMatrix); } bool ActorEvent_OverrideLimbDraw3(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* thisx) { @@ -3852,31 +3865,33 @@ bool ActorEvent_OverrideLimbDraw3(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* s32 SyShipDebris_Draw(SyShipDebris* this) { RCP_SetupDL(&gMasterDisp, SETUPDL_60); - gSPDisplayList(gMasterDisp++, D_SY_601AD70); + gSPDisplayList(gMasterDisp++, aSyDebrisDL); RCP_SetupDL(&gMasterDisp, SETUPDL_64); return 0; } void ActorEvent_Draw(ActorEvent* this) { - Vec3f sp114[31]; + s32 pad2[3]; + Vec3f frameTable[30]; f32 sp40; - s16 temp_s0; + s16 savedState; s32 pad; - if (this->timer_0C6 && (this->eventType != EVID_90) && (this->eventType != EVID_68) && - (this->eventType != EVID_72)) { - if ((this->eventType != EVID_13) && (this->eventType != EVID_14) && (this->eventType != EVID_61) && - (this->eventType != EVID_62) && (this->eventType != EVID_AQ_CLAM) && (this->eventType != EVID_98) && - (this->scale > 0.5f) && (this->timer_0C6 >= 9) && ((this->timer_0C6 & 3) == 0) && - (gPlayState != PLAY_PAUSE)) { + if (this->timer_0C6 && (this->eventType != EVID_MA_RAILROAD_CART) && (this->eventType != EVID_SY_LASER_TURRET) && + (this->eventType != EVID_SY_SHIP_WINDOWS)) { + if ((this->eventType != EVID_ME_METEOR_1) && (this->eventType != EVID_ME_METEOR_2) && + (this->eventType != EVID_ME_METEOR_4) && (this->eventType != EVID_ME_METEOR_5) && + (this->eventType != EVID_AQ_OYSTER) && (this->eventType != EVID_MA_BOULDER) && (this->scale > 0.5f) && + (this->timer_0C6 >= 9) && ((this->timer_0C6 & 3) == 0) && (gPlayState != PLAY_PAUSE)) { Effect_Effect390_Spawn(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, this->vel.x, this->vel.y, this->vel.z, this->scale * 0.07f, 3); } - if ((this->eventType != EVID_A6_MISSILE) && (this->eventType != EVID_23) && (this->eventType != EVID_79) && - (this->eventType != EVID_AQ_CLAM) && (this->eventType != EVID_27) && (this->eventType != EVID_51) && - (this->eventType != EVID_13) && (this->eventType != EVID_72) && (this->eventType != EVID_28) && - (this->scale > 0.5f)) { + if ((this->eventType != EVID_A6_NINJIN_MISSILE) && (this->eventType != EVID_VENOM_FIGHTER_3) && + (this->eventType != EVID_ZO_BIRD) && (this->eventType != EVID_AQ_OYSTER) && + (this->eventType != EVID_SX_LASER) && (this->eventType != EVID_SY_ROBOT_4) && + (this->eventType != EVID_ME_METEOR_1) && (this->eventType != EVID_SY_SHIP_WINDOWS) && + (this->eventType != EVID_SX_WATCH_POST) && (this->scale > 0.5f)) { sp40 = SIN_DEG(this->timer_0C6 * 400.0f) * this->timer_0C6; Matrix_RotateY(gGfxMatrix, M_DTOR * sp40, MTXF_APPLY); Matrix_RotateX(gGfxMatrix, M_DTOR * sp40, MTXF_APPLY); @@ -3890,10 +3905,11 @@ void ActorEvent_Draw(ActorEvent* this) { gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 0, 0, 255); } - if ((this->eventType == EVID_29) || (this->eventType == EVID_59) || (this->eventType == EVID_60)) { + if ((this->eventType == EVID_SX_SPACE_MINE) || (this->eventType == EVID_SY_ROBOT_SPRITE_SIDE) || + (this->eventType == EVID_SY_ROBOT_SPRITE_FRONT)) { RCP_SetupDL_60(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); - } else if ((this->eventType == EVID_82) || (this->eventType == EVID_90) || - ((this->eventType == EVID_6) && (gCurrentLevel == LEVEL_SOLAR))) { + } else if ((this->eventType == EVID_MA_LASER_TURRET) || (this->eventType == EVID_MA_RAILROAD_CART) || + ((this->eventType == EVID_FIREBIRD) && (gCurrentLevel == LEVEL_SOLAR))) { if ((this->timer_0C6 % 2) == 0) { RCP_SetupDL(&gMasterDisp, SETUPDL_57); } else { @@ -3902,11 +3918,11 @@ void ActorEvent_Draw(ActorEvent* this) { } switch (this->eventType) { - case EVID_92: - case EVID_93: - case EVID_94: - case EVID_95: - case EVID_96: + case EVID_WZ_PILLAR_1: + case EVID_WZ_PILLAR_2: + case EVID_WZ_METEOR_1: + case EVID_WZ_METEOR_2: + case EVID_WZ_GATE: RCP_SetupDL(&gMasterDisp, SETUPDL_34); gDPSetTextureFilter(gMasterDisp++, G_TF_POINT); gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, (s32) this->fwork[15], (s32) this->fwork[16], @@ -3921,16 +3937,16 @@ void ActorEvent_Draw(ActorEvent* this) { } switch (this->eventType) { - case EVID_56: + case EVID_TI_GREAT_FOX: Cutscene_DrawGreatFox(); break; - case EVID_0: + case EVID_VENOM_FIGHTER_1: this->iwork[11] = 1; Actor_DrawEngineAndContrails(this); break; - case EVID_SLIPPY_METEO: + case EVID_ME_SLIPPY: this->fwork[15] -= this->fwork[15] * 0.1f; this->fwork[26] -= this->fwork[26] * 0.1f; this->fwork[16] -= this->fwork[16] * 0.1f; @@ -3957,76 +3973,76 @@ void ActorEvent_Draw(ActorEvent* this) { Actor_DrawEngineAndContrails(this); break; - case EVID_5: + case EVID_GRANGA_FIGHTER_2: this->iwork[11] = 1; Actor_DrawEngineAndContrails(this); break; - case EVID_6: + case EVID_FIREBIRD: if (gCurrentLevel == LEVEL_SOLAR) { gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK); - Animation_GetFrameData(&D_SO_600636C, this->animFrame, sp114); - Animation_DrawSkeleton(1, D_SO_6006558, sp114, NULL, NULL, this, &gIdentityMatrix); + Animation_GetFrameData(&aSoGoreAnim, this->animFrame, frameTable); + Animation_DrawSkeleton(1, aSoGoreSkel, frameTable, NULL, NULL, this, &gIdentityMatrix); gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK); } else { - Animation_GetFrameData(&D_ENMY_PLANET_40057AC, this->animFrame, sp114); - Animation_DrawSkeleton(1, D_ENMY_PLANET_40058B8, sp114, NULL, NULL, this, &gIdentityMatrix); + Animation_GetFrameData(&aFirebirdAnim, this->animFrame, frameTable); + Animation_DrawSkeleton(1, aFirebirdSkel, frameTable, NULL, NULL, this, &gIdentityMatrix); } break; - case EVID_7: + case EVID_CORNERIAN_FIGHTER: this->iwork[11] = 1; Actor_DrawEngineAndContrails(this); break; - case EVID_9: + case EVID_TRIPOD: Matrix_Translate(gGfxMatrix, 0.0f, -30.0f, 0.0f, MTXF_APPLY); - Animation_GetFrameData(&D_ENMY_PLANET_40001A4, this->animFrame, sp114); - Animation_DrawSkeleton(1, D_ENMY_PLANET_4000270, sp114, NULL, NULL, this, &gIdentityMatrix); + Animation_GetFrameData(&aTripodAnim, this->animFrame, frameTable); + Animation_DrawSkeleton(1, aTripodSkel, frameTable, NULL, NULL, this, &gIdentityMatrix); break; - case EVID_18: + case EVID_SX_SPY_EYE: if (this->fwork[0] > 0.1f) { this->iwork[11] = 1; Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -30.0f, MTXF_APPLY); Matrix_Scale(gGfxMatrix, 2.5f, 2.5f, 2.5f, MTXF_APPLY); - Actor_DrawEngineGlow(this, 2); + Actor_DrawEngineGlow(this, EG_GREEN); } break; - case EVID_19: + case EVID_SX_CANINE: if (this->fwork[0] > 0.1f) { this->iwork[11] = 1; Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -30.0f, MTXF_APPLY); Matrix_Scale(gGfxMatrix, 2.5f, 2.5f, 2.5f, MTXF_APPLY); - Actor_DrawEngineGlow(this, 2); + Actor_DrawEngineGlow(this, EG_GREEN); } break; - case EVID_20: + case EVID_SPACE_MINE: RCP_SetupDL_60(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); - gSPDisplayList(gMasterDisp++, D_A6_601A120); + gSPDisplayList(gMasterDisp++, aA6SpaceMineDL); break; - case EVID_A6_MISSILE: + case EVID_A6_NINJIN_MISSILE: gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK); - gSPDisplayList(gMasterDisp++, D_A6_6018BF0); + gSPDisplayList(gMasterDisp++, aA6NinjinMissileDL); gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK); Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -30.0f, MTXF_APPLY); this->iwork[11] = 1; - Actor_DrawEngineGlow(this, 2); + Actor_DrawEngineGlow(this, EG_GREEN); break; case EVID_A6_ROCKET: gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK); - gSPDisplayList(gMasterDisp++, D_A6_6019730); + gSPDisplayList(gMasterDisp++, aA6RocketDL); gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK); Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -30.0f, MTXF_APPLY); this->iwork[11] = 1; - Actor_DrawEngineGlow(this, 2); + Actor_DrawEngineGlow(this, EG_GREEN); break; - case EVID_27: + case EVID_SX_LASER: if (this->timer_0C2 != 0) { if (((this->timer_0C2 & 3) == 0) && (gPlayState != PLAY_PAUSE)) { func_effect_8007D0E0(RAND_FLOAT_CENTERED(200.0f) + this->obj.pos.x, @@ -4036,148 +4052,149 @@ void ActorEvent_Draw(ActorEvent* this) { } RCP_SetupDL(&gMasterDisp, SETUPDL_57); gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK); - gSPDisplayList(gMasterDisp++, D_SX_6001950); + gSPDisplayList(gMasterDisp++, aSxLaserDestroyedDL); } else { - gSPDisplayList(gMasterDisp++, D_SX_60066F0); + gSPDisplayList(gMasterDisp++, aSxLaserDL); } break; - case EVID_31: + case EVID_A6_UMBRA_STATION: Matrix_RotateX(gGfxMatrix, M_PI / 2, MTXF_APPLY); Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_A6_600E0C0); + gSPDisplayList(gMasterDisp++, aA6UmbraStationDL); break; - case EVID_33: - Animation_GetFrameData(&D_ENMY_SPACE_400A30C, this->animFrame, sp114); + case EVID_CRUISER_GUN: + Animation_GetFrameData(&aCruiserGunAnim, this->animFrame, frameTable); Matrix_RotateY(gGfxMatrix, M_PI, MTXF_APPLY); Matrix_Scale(gGfxMatrix, 1.5f, 1.5f, 1.5f, MTXF_APPLY); - Animation_DrawSkeleton(1, D_ENMY_SPACE_400A398, sp114, ActorEvent_OverrideLimbDraw1, NULL, this, + Animation_DrawSkeleton(1, aCruiserGunSkel, frameTable, ActorEvent_OverrideLimbDraw1, NULL, this, &gIdentityMatrix); Math_SmoothStepToF(&this->fwork[16], 0.0f, 0.3f, 2.0f, 0.0001f); break; - case EVID_36: - Animation_GetFrameData(&D_TI1_700CAF4, this->animFrame, sp114); - sp114[2].z += this->fwork[15]; - Animation_DrawSkeleton(1, D_TI1_700CB60, sp114, NULL, NULL, this, &gIdentityMatrix); + case EVID_TI_BOMBER: + Animation_GetFrameData(&aTiBomberAnim, this->animFrame, frameTable); + frameTable[2].z += this->fwork[15]; + Animation_DrawSkeleton(1, aTiBomberSkel, frameTable, NULL, NULL, this, &gIdentityMatrix); break; case EVID_SX_WARP_GATE: ActorEvent_DrawEVID_SX_WARP_GATE(this); break; - case EVID_48: - case EVID_49: - case EVID_50: + case EVID_SY_ROBOT_1: + case EVID_SY_ROBOT_2: + case EVID_SY_ROBOT_3: SectorY_SyRobot_Draw(this); break; - case EVID_52: - Animation_GetFrameData(&D_ZO_601F874, this->animFrame, sp114); - sp114[2].z -= this->fwork[15]; + case EVID_SARUMARINE_PERISCOPE: + Animation_GetFrameData(&aZoSarumarinePeriscopeAnim, this->animFrame, frameTable); + frameTable[2].z -= this->fwork[15]; gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK); Matrix_Scale(gGfxMatrix, 2.6f, 2.6f, 2.6f, MTXF_APPLY); - Animation_DrawSkeleton(1, D_ZO_601F920, sp114, NULL, NULL, this, &gIdentityMatrix); + Animation_DrawSkeleton(1, aZoSarumarinePeriscopeSkel, frameTable, NULL, NULL, this, + &gIdentityMatrix); gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK); break; - case EVID_64: + case EVID_ME_ROCK_GULL: Matrix_Push(&gGfxMatrix); Matrix_RotateX(gGfxMatrix, this->rot_0F4.x * M_DTOR, MTXF_APPLY); Matrix_RotateY(gGfxMatrix, this->rot_0F4.y * M_DTOR, MTXF_APPLY); Matrix_Push(&gGfxMatrix); Matrix_Translate(gGfxMatrix, 0.0f, this->fwork[15], 0.0f, MTXF_APPLY); Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_ME_600CAA0); + gSPDisplayList(gMasterDisp++, aMeRockGull1DL); Matrix_Pop(&gGfxMatrix); - gSPDisplayList(gMasterDisp++, D_ME_600C130); + gSPDisplayList(gMasterDisp++, aMeRockGull2DL); Matrix_Translate(gGfxMatrix, 0.0f, -this->fwork[15], 0.0f, MTXF_APPLY); Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_ME_600C740); + gSPDisplayList(gMasterDisp++, aMeRockGull3DL); Matrix_Pop(&gGfxMatrix); break; - case EVID_METEO_PYRAMID_SHIP: - gSPDisplayList(gMasterDisp++, D_ME_6008AA0); + case EVID_ME_FLIP_BOT: + gSPDisplayList(gMasterDisp++, aMeFlipBot1DL); RCP_SetupDL(&gMasterDisp, SETUPDL_53); - gSPDisplayList(gMasterDisp++, D_ME_6009E30); + gSPDisplayList(gMasterDisp++, aMeFlipBot2DL); break; case EVID_SUPPLY_CRATE: ActorSupplies_Draw(this); break; - case EVID_79: - temp_s0 = this->state; - this->state = 2; // actor 235 state + case EVID_ZO_BIRD: + savedState = this->state; + this->state = 2; Zoness_ZoBird_Draw(this); - this->state = temp_s0; + this->state = savedState; break; - case EVID_80: + case EVID_VE1_PILLAR: Matrix_Scale(gGfxMatrix, 0.6f, 0.6f, 0.6f, MTXF_APPLY); Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_VE1_9011200); + gSPDisplayList(gMasterDisp++, aVe1PillarDL); break; - case EVID_81: + case EVID_VE1_BLOCKER: if (this->fwork[15] > 0.001f) { Matrix_Scale(gGfxMatrix, this->fwork[15], this->fwork[15], this->fwork[15], MTXF_APPLY); Matrix_SetGfxMtx(&gMasterDisp); Texture_BlendRGBA16(this->fwork[16], 16 * 11, D_VE1_9003890, D_VE1_9003DF0, D_VE1_9003330); - gSPDisplayList(gMasterDisp++, D_VE1_9002CF0); + gSPDisplayList(gMasterDisp++, aVe1BlockerDL); } break; - case EVID_82: + case EVID_MA_LASER_TURRET: gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK); - gSPDisplayList(gMasterDisp++, D_MA_600DA10); + gSPDisplayList(gMasterDisp++, aMaLaserTurretDL); gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK); break; - case EVID_AQ_CLAM: + case EVID_AQ_OYSTER: Matrix_Scale(gGfxMatrix, 3.0f, 3.0f, 3.0f, MTXF_APPLY); - Animation_GetFrameData(&aAqOysterAnim, this->animFrame, sp114); - Animation_DrawSkeleton(1, aAqOysterSkel, sp114, NULL, NULL, this, &gIdentityMatrix); + Animation_GetFrameData(&aAqOysterAnim, this->animFrame, frameTable); + Animation_DrawSkeleton(1, aAqOysterSkel, frameTable, NULL, NULL, this, &gIdentityMatrix); break; case EVID_BILL: - gSPDisplayList(gMasterDisp++, D_D00B880); + gSPDisplayList(gMasterDisp++, aBillShipDL); Actor_DrawEngineAndContrails(this); break; case EVID_KATT: - gSPDisplayList(gMasterDisp++, D_D009A40); + gSPDisplayList(gMasterDisp++, aKattShipDL); Actor_DrawEngineAndContrails(this); break; case EVID_AQ_STARFISH: RCP_SetupDL(&gMasterDisp, SETUPDL_22); - gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, this->unk_046, this->unk_046, this->unk_046, 255); - gSPDisplayList(gMasterDisp++, D_AQ_6008970); + gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, this->work_046, this->work_046, this->work_046, 255); + gSPDisplayList(gMasterDisp++, aAqStarfishDL); break; - case EVID_89: + case EVID_AQ_SHELL: RCP_SetupDL(&gMasterDisp, SETUPDL_21); - gSPDisplayList(gMasterDisp++, D_AQ_6000E10); + gSPDisplayList(gMasterDisp++, aAqShellDL); break; case EVID_ANDROSS_GATE: case EVID_ANDROSS_GATE_2: - Andross_8018769C(this); + Andross_Gate_Draw(this); break; case EVID_SX_WARP_ENMY: RCP_SetupDL(&gMasterDisp, SETUPDL_35); gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 0, 0, 0, 143); gDPSetEnvColor(gMasterDisp++, 0, 0, 0, 0); - gSPDisplayList(gMasterDisp++, D_WZ_7000000); + gSPDisplayList(gMasterDisp++, aWzSxEnemy1DL); break; case EVID_KILLER_BEE: - Animation_GetFrameData(&D_ENMY_SPACE_4000080, this->animFrame, sp114); - Animation_DrawSkeleton(1, D_ENMY_SPACE_400014C, sp114, NULL, NULL, this, &gIdentityMatrix); + Animation_GetFrameData(&aKillerBeeAnim, this->animFrame, frameTable); + Animation_DrawSkeleton(1, aKillerBeeSkel, frameTable, NULL, NULL, this, &gIdentityMatrix); break; case EVID_FFF: @@ -4186,261 +4203,263 @@ void ActorEvent_Draw(ActorEvent* this) { } if ((gReflectY > 0) && ((this->iwork[12] >= TEAM_ID_FALCO) && (this->iwork[12] < TEAM_ID_MAX))) { - Vec3f sp58 = { 0.0f, 0.0f, 0.0f }; + Vec3f src = { 0.0f, 0.0f, 0.0f }; if ((this->iwork[12] == TEAM_ID_KATT) || (this->iwork[12] == TEAM_ID_BILL)) { - Matrix_MultVec3f(gGfxMatrix, &sp58, &gTeamArrowsViewPos[this->iwork[12] + 4]); + Matrix_MultVec3f(gGfxMatrix, &src, &gTeamArrowsViewPos[this->iwork[12] + 4]); } else { - Matrix_MultVec3f(gGfxMatrix, &sp58, &gTeamArrowsViewPos[this->iwork[12]]); + Matrix_MultVec3f(gGfxMatrix, &src, &gTeamArrowsViewPos[this->iwork[12]]); } } break; } } -void func_enmy2_800763A4(Actor* actor) { - s32 var_s0; +void func_enmy2_800763A4(Actor* this) { + s32 i; s32 sp60; - s32 sp5C; - f32 sp58; - Vec3f sp4C; + s32 triangleIndex; + f32 floorHeight; + Vec3f vel; s32 pad; - if (actor->eventType == EVID_27) { - actor->obj.pos.y -= actor->vel.y; - actor->obj.status = OBJ_ACTIVE; - func_effect_8007D0E0(actor->obj.pos.x - actor->vel.x, actor->obj.pos.y + 30.0f, actor->obj.pos.z - actor->vel.z, - actor->scale * 5.0f); - actor->timer_0C2 = 10000; + if (this->eventType == EVID_SX_LASER) { + this->obj.pos.y -= this->vel.y; + this->obj.status = OBJ_ACTIVE; + func_effect_8007D0E0(this->obj.pos.x - this->vel.x, this->obj.pos.y + 30.0f, this->obj.pos.z - this->vel.z, + this->scale * 5.0f); + this->timer_0C2 = 10000; return; } - if (actor->timer_0BE != 0) { - actor->vel.z = 0.0f; - actor->vel.x = 0.0f; - actor->vel.y = 0.0f; + if (this->timer_0BE != 0) { + this->vel.z = 0.0f; + this->vel.x = 0.0f; + this->vel.y = 0.0f; - if (actor->timer_0BE == 1) { - Object_Kill(&actor->obj, actor->sfxSource); - Actor_Despawn(actor); + if (this->timer_0BE == 1) { + Object_Kill(&this->obj, this->sfxSource); + Actor_Despawn(this); if (gLevelMode == LEVELMODE_ALL_RANGE) { - D_ctx_80177F20[actor->index + 1] = actor->obj.pos.x; - D_ctx_80178028[actor->index + 1] = actor->obj.pos.z; - D_ctx_80178130[actor->index + 1] = 1001.0f; + D_ctx_80177F20[this->index + 1] = this->obj.pos.x; + D_ctx_80178028[this->index + 1] = this->obj.pos.z; + D_ctx_80178130[this->index + 1] = 1001.0f; } return; } } else { if ((gLevelType == LEVELTYPE_PLANET) || (gCurrentLevel == LEVEL_BOLSE)) { - actor->gravity = 0.4f; + this->gravity = 0.4f; } - switch (actor->timer_04C) { + + switch (this->work_04C) { case 0: case 1: - if ((actor->index % 2) != 0) { - actor->obj.rot.z -= 8.0f; + if ((this->index % 2) != 0) { + this->obj.rot.z -= 8.0f; } else { - actor->obj.rot.z += 8.0f; + this->obj.rot.z += 8.0f; } break; case 2: - actor->obj.rot.y += 5.0f; - actor->obj.rot.x += 7.3f; + this->obj.rot.y += 5.0f; + this->obj.rot.x += 7.3f; break; case 3: - actor->obj.rot.y += 6.0f; - actor->obj.rot.x += 18.3f; - actor->gravity = 0.7f; + this->obj.rot.y += 6.0f; + this->obj.rot.x += 18.3f; + this->gravity = 0.7f; break; case 4: - actor->obj.rot.x += (-90.0f - actor->obj.rot.x) * 0.1f; + this->obj.rot.x += (-90.0f - this->obj.rot.x) * 0.1f; break; } - if (((actor->timer_0BC % 4U) == 1) && (actor->eventType != EVID_13) && (actor->eventType != EVID_61)) { - func_effect_8007D24C(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 2.2f); + if (((this->timer_0BC % 4U) == 1) && (this->eventType != EVID_ME_METEOR_1) && + (this->eventType != EVID_ME_METEOR_4)) { + func_effect_8007D24C(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, 2.2f); } - if (gUseDynaFloor && - Play_CheckDynaFloorCollision(&sp58, &sp5C, actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z)) { - Effect386_Spawn1(actor->obj.pos.x, sp58 + 20.0f, actor->obj.pos.z, 0.0f, 0.0f, 0.0f, actor->scale * 3.0f, - 5); - Effect_Effect381_Spawn(actor->obj.pos.x, sp58, actor->obj.pos.z, 2.0f); - actor->timer_0BE = 2; - Effect_SpawnTimedSfxAtPos(&actor->obj.pos, NA_SE_EN_EXPLOSION_S); + if (gUseDynaFloor && Play_CheckDynaFloorCollision(&floorHeight, &triangleIndex, this->obj.pos.x, + this->obj.pos.y, this->obj.pos.z)) { + Effect386_Spawn1(this->obj.pos.x, floorHeight + 20.0f, this->obj.pos.z, 0.0f, 0.0f, 0.0f, + this->scale * 3.0f, 5); + Effect_Effect381_Spawn(this->obj.pos.x, floorHeight, this->obj.pos.z, 2.0f); + this->timer_0BE = 2; + Effect_SpawnTimedSfxAtPos(&this->obj.pos, NA_SE_EN_EXPLOSION_S); return; } if (gGroundType == 4) { - if (Ground_801B6AEC(actor->obj.pos.x, actor->obj.pos.y - 10.0f, actor->obj.pos.z + gPathProgress) != 0) { - func_effect_8007D2C8(actor->obj.pos.x, actor->obj.pos.y + 20.0f, actor->obj.pos.z, actor->scale * 6.0f); - Effect386_Spawn1(actor->obj.pos.x - actor->vel.x, actor->obj.pos.y + 30.0f, - actor->obj.pos.z - actor->vel.z, 0.0f, 0.0f, 0.0f, actor->scale * 4.0f, 20); - func_enmy_80062C38(actor->obj.pos.x, actor->obj.pos.z); - actor->timer_0BE = 2; - Effect_SpawnTimedSfxAtPos(&actor->obj.pos, NA_SE_EN_EXPLOSION_S); + if (Ground_801B6AEC(this->obj.pos.x, this->obj.pos.y - 10.0f, this->obj.pos.z + gPathProgress) != 0) { + func_effect_8007D2C8(this->obj.pos.x, this->obj.pos.y + 20.0f, this->obj.pos.z, this->scale * 6.0f); + Effect386_Spawn1(this->obj.pos.x - this->vel.x, this->obj.pos.y + 30.0f, this->obj.pos.z - this->vel.z, + 0.0f, 0.0f, 0.0f, this->scale * 4.0f, 20); + func_enmy_80062C38(this->obj.pos.x, this->obj.pos.z); + this->timer_0BE = 2; + Effect_SpawnTimedSfxAtPos(&this->obj.pos, NA_SE_EN_EXPLOSION_S); return; } } else { - sp4C.x = actor->vel.x; - sp4C.y = actor->vel.y; - sp4C.z = actor->vel.z; + vel.x = this->vel.x; + vel.y = this->vel.y; + vel.z = this->vel.z; - sp60 = Object_CheckCollision(actor->index, &actor->obj.pos, &sp4C, 0); + sp60 = Object_CheckCollision(this->index, &this->obj.pos, &vel, 0); - if ((sp60 != 0) || (actor->obj.pos.y < (gGroundHeight + 30.0f))) { - if ((Rand_ZeroOne() < 0.5f) && (actor->timer_04C < 3) && (gLevelType == LEVELTYPE_PLANET) && + if ((sp60 != 0) || (this->obj.pos.y < (gGroundHeight + 30.0f))) { + if ((Rand_ZeroOne() < 0.5f) && (this->work_04C < 3) && (gLevelType == LEVELTYPE_PLANET) && (sp60 != 999) && (gGroundSurface != SURFACE_WATER) && - ((actor->vel.z < -20.0f) || (actor->vel.z > 0.0f))) { + ((this->vel.z < -20.0f) || (this->vel.z > 0.0f))) { if (gCurrentLevel == LEVEL_FORTUNA) { - func_enmy2_8006BF7C(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z - actor->vel.z); - func_enmy_80062C38(actor->obj.pos.x, actor->obj.pos.z); + func_enmy2_8006BF7C(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z - this->vel.z); + func_enmy_80062C38(this->obj.pos.x, this->obj.pos.z); } - actor->obj.pos.y -= actor->vel.y; - actor->vel.y = RAND_FLOAT(10.0f); - actor->timer_04C = 3; + this->obj.pos.y -= this->vel.y; + this->vel.y = RAND_FLOAT(10.0f); + this->work_04C = 3; if (gLevelMode == LEVELMODE_ALL_RANGE) { - func_effect_8007D2C8(actor->obj.pos.x - actor->vel.x, actor->obj.pos.y, - actor->obj.pos.z - actor->vel.z, actor->scale * 3.0f); + func_effect_8007D2C8(this->obj.pos.x - this->vel.x, this->obj.pos.y, + this->obj.pos.z - this->vel.z, this->scale * 3.0f); } - func_effect_8007D2C8(actor->obj.pos.x - actor->vel.x, actor->obj.pos.y, - actor->obj.pos.z - actor->vel.z, actor->scale * 3.0f); + func_effect_8007D2C8(this->obj.pos.x - this->vel.x, this->obj.pos.y, this->obj.pos.z - this->vel.z, + this->scale * 3.0f); - if ((actor->obj.id == OBJ_ACTOR_ALLRANGE) && (actor->aiType < AI360_KATT)) { - Effect_SpawnTimedSfxAtPos(&actor->obj.pos, NA_SE_EN_EXPLOSION_M); + if ((this->obj.id == OBJ_ACTOR_ALLRANGE) && (this->aiType < AI360_KATT)) { + Effect_SpawnTimedSfxAtPos(&this->obj.pos, NA_SE_EN_EXPLOSION_M); } else { - Effect_SpawnTimedSfxAtPos(&actor->obj.pos, NA_SE_EN_EXPLOSION_S); + Effect_SpawnTimedSfxAtPos(&this->obj.pos, NA_SE_EN_EXPLOSION_S); } - if ((actor->obj.id == OBJ_ACTOR_EVENT) && (actor->eventType == EVID_SLIPPY_METEO)) { - if (actor->fwork[17] < 360.0f) { - Play_SpawnDebris(1, actor->obj.pos.x + 20.0f, actor->obj.pos.y, actor->obj.pos.z); - actor->fwork[17] = 777.0f; + if ((this->obj.id == OBJ_ACTOR_EVENT) && (this->eventType == EVID_ME_SLIPPY)) { + if (this->fwork[17] < 360.0f) { + Play_SpawnDebris(1, this->obj.pos.x + 20.0f, this->obj.pos.y, this->obj.pos.z); + this->fwork[17] = 777.0f; } - if (actor->fwork[18] < 360.0f) { - Play_SpawnDebris(0, actor->obj.pos.x - 20.0f, actor->obj.pos.y, actor->obj.pos.z); - actor->fwork[18] = 777.0f; + if (this->fwork[18] < 360.0f) { + Play_SpawnDebris(0, this->obj.pos.x - 20.0f, this->obj.pos.y, this->obj.pos.z); + this->fwork[18] = 777.0f; } } } else { - if ((actor->obj.pos.y < (gGroundHeight + 30.0f)) && (gLevelType == LEVELTYPE_PLANET)) { - actor->vel.z = 0.0f; + if ((this->obj.pos.y < (gGroundHeight + 30.0f)) && (gLevelType == LEVELTYPE_PLANET)) { + this->vel.z = 0.0f; if (gGroundSurface == SURFACE_WATER) { - Effect_Effect367_Spawn(actor->obj.pos.x, gGroundHeight + 2.0f, actor->obj.pos.z, 3.0f, - 20.0f, 0); - Effect_Effect367_Spawn(actor->obj.pos.x, gGroundHeight + 2.0f, actor->obj.pos.z, 3.0f, - 20.0f, 10); - Effect_Effect367_Spawn(actor->obj.pos.x, gGroundHeight + 2.0f, actor->obj.pos.z, 3.0f, - 20.0f, 20); - Effect_Effect372_Spawn2(actor->obj.pos.x, gGroundHeight, actor->obj.pos.z, 0.1f, 3.0f); + Effect_Effect367_Spawn(this->obj.pos.x, gGroundHeight + 2.0f, this->obj.pos.z, 3.0f, 20.0f, + 0); + Effect_Effect367_Spawn(this->obj.pos.x, gGroundHeight + 2.0f, this->obj.pos.z, 3.0f, 20.0f, + 10); + Effect_Effect367_Spawn(this->obj.pos.x, gGroundHeight + 2.0f, this->obj.pos.z, 3.0f, 20.0f, + 20); + Effect_Effect372_Spawn2(this->obj.pos.x, gGroundHeight, this->obj.pos.z, 0.1f, 3.0f); } else { - PlayerShot_SpawnEffect344(actor->obj.pos.x, 3.0f, actor->obj.pos.z, actor->obj.pos.x, - actor->obj.pos.z, 0.0f, 0.0f, 90.0f, 6.5f, 0, 0); + PlayerShot_SpawnEffect344(this->obj.pos.x, 3.0f, this->obj.pos.z, this->obj.pos.x, + this->obj.pos.z, 0.0f, 0.0f, 90.0f, 6.5f, 0, 0); } - Effect_Effect390_Spawn(actor->obj.pos.x, 20.0f, actor->obj.pos.z, 0.0f, 0.0f, 0.0f, - actor->scale * 0.05f, 30); + Effect_Effect390_Spawn(this->obj.pos.x, 20.0f, this->obj.pos.z, 0.0f, 0.0f, 0.0f, + this->scale * 0.05f, 30); if ((gCurrentLevel == LEVEL_FORTUNA) || (gCurrentLevel == LEVEL_VENOM_2)) { - Effect_Effect387_Spawn(actor->obj.pos.x, gGroundHeight + 30.0f, actor->obj.pos.z, 3.0f, 60); + Effect_Effect387_Spawn(this->obj.pos.x, gGroundHeight + 30.0f, this->obj.pos.z, 3.0f, 60); if (gCurrentLevel == LEVEL_FORTUNA) { - func_enmy_80062C38(actor->obj.pos.x, actor->obj.pos.z); + func_enmy_80062C38(this->obj.pos.x, this->obj.pos.z); } } } - actor->obj.pos.y -= actor->vel.y; - func_effect_8007D0E0(actor->obj.pos.x - actor->vel.x, actor->obj.pos.y + 30.0f, - actor->obj.pos.z - actor->vel.z, actor->scale * 5.0f); + this->obj.pos.y -= this->vel.y; + func_effect_8007D0E0(this->obj.pos.x - this->vel.x, this->obj.pos.y + 30.0f, + this->obj.pos.z - this->vel.z, this->scale * 5.0f); if (gLevelMode == LEVELMODE_ALL_RANGE) { - Effect386_Spawn1(actor->obj.pos.x, actor->obj.pos.y + 30.0f, actor->obj.pos.z, actor->vel.x, - 10.0f, actor->vel.z, actor->scale * 3.0f, 20); + Effect386_Spawn1(this->obj.pos.x, this->obj.pos.y + 30.0f, this->obj.pos.z, this->vel.x, 10.0f, + this->vel.z, this->scale * 3.0f, 20); if (sp60 == 999) { - Effect_Effect387_Spawn(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, - actor->scale * 3.0f, 70); + Effect_Effect387_Spawn(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, + this->scale * 3.0f, 70); } - for (var_s0 = 0; var_s0 < 4; var_s0++) { + for (i = 0; i < 4; i++) { if (Rand_ZeroOne() < 0.7f) { if (gCurrentLevel == LEVEL_FORTUNA) { - Play_SpawnDebris(4, actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z); + Play_SpawnDebris(4, this->obj.pos.x, this->obj.pos.y, this->obj.pos.z); } else { - Effect_Effect357_Spawn50(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, - 1.0f); + Effect_Effect357_Spawn50(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, 1.0f); } } } } else { - Effect386_Spawn1(actor->obj.pos.x - actor->vel.x, actor->obj.pos.y + 30.0f, - (actor->obj.pos.z - actor->vel.z) + 48.0f, 0.0f, 0.0f, 0.0f, - actor->scale * 3.0f, 5); + Effect386_Spawn1(this->obj.pos.x - this->vel.x, this->obj.pos.y + 30.0f, + (this->obj.pos.z - this->vel.z) + 48.0f, 0.0f, 0.0f, 0.0f, this->scale * 3.0f, + 5); } - actor->timer_0BE = 2; + this->timer_0BE = 2; - if ((actor->obj.id == OBJ_ACTOR_ALLRANGE) && (actor->aiType < AI360_KATT)) { - Effect_SpawnTimedSfxAtPos(&actor->obj.pos, NA_SE_EN_EXPLOSION_M); + if ((this->obj.id == OBJ_ACTOR_ALLRANGE) && (this->aiType < AI360_KATT)) { + Effect_SpawnTimedSfxAtPos(&this->obj.pos, NA_SE_EN_EXPLOSION_M); } else { - Effect_SpawnTimedSfxAtPos(&actor->obj.pos, NA_SE_EN_EXPLOSION_S); + Effect_SpawnTimedSfxAtPos(&this->obj.pos, NA_SE_EN_EXPLOSION_S); } } } } - if ((actor->dmgType != DMG_NONE) || (actor->timer_0BC == 0) || - ((actor->itemDrop != DROP_NONE) && (actor->obj.id != OBJ_ACTOR_ALLRANGE))) { + if ((this->dmgType != DMG_NONE) || (this->timer_0BC == 0) || + ((this->itemDrop != DROP_NONE) && (this->obj.id != OBJ_ACTOR_ALLRANGE))) { if (gLevelMode == LEVELMODE_ALL_RANGE) { - for (var_s0 = 0; var_s0 < 4; var_s0++) { + for (i = 0; i < 4; i++) { if (Rand_ZeroOne() < 0.7f) { if (gCurrentLevel == LEVEL_FORTUNA) { - Play_SpawnDebris(4, actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z); + Play_SpawnDebris(4, this->obj.pos.x, this->obj.pos.y, this->obj.pos.z); } else { - Effect_Effect357_Spawn50(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 1.0f); + Effect_Effect357_Spawn50(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, 1.0f); } } } - Effect386_Spawn1(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, actor->vel.x, actor->vel.y, - actor->vel.z, 5.0f, 15); - func_effect_8007D0E0(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z - actor->vel.z, 8.0f); + Effect386_Spawn1(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, this->vel.x, this->vel.y, + this->vel.z, 5.0f, 15); + func_effect_8007D0E0(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z - this->vel.z, 8.0f); } else { - if ((actor->eventType != EVID_13) && (actor->eventType != EVID_61)) { - func_effect_8007D0E0(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z - actor->vel.z, - actor->scale * 5.0f); + if ((this->eventType != EVID_ME_METEOR_1) && (this->eventType != EVID_ME_METEOR_4)) { + func_effect_8007D0E0(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z - this->vel.z, + this->scale * 5.0f); } - if (actor->eventType == EVID_36) { - Effect386_Spawn1(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, actor->vel.x, actor->vel.y, - actor->vel.z, 5.0f, 15); + if (this->eventType == EVID_TI_BOMBER) { + Effect386_Spawn1(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, this->vel.x, this->vel.y, + this->vel.z, 5.0f, 15); } } - actor->timer_0BE = 2; + this->timer_0BE = 2; - if ((actor->obj.id == OBJ_ACTOR_ALLRANGE) && (actor->aiType < AI360_KATT)) { - Effect_SpawnTimedSfxAtPos(&actor->obj.pos, NA_SE_EN_EXPLOSION_M); + if ((this->obj.id == OBJ_ACTOR_ALLRANGE) && (this->aiType < AI360_KATT)) { + Effect_SpawnTimedSfxAtPos(&this->obj.pos, NA_SE_EN_EXPLOSION_M); } else { - Effect_SpawnTimedSfxAtPos(&actor->obj.pos, NA_SE_EN_EXPLOSION_S); + Effect_SpawnTimedSfxAtPos(&this->obj.pos, NA_SE_EN_EXPLOSION_S); } } } if (gLevelMode == LEVELMODE_ALL_RANGE) { - D_ctx_80177F20[actor->index + 1] = actor->obj.pos.x; - D_ctx_80178028[actor->index + 1] = actor->obj.pos.z; - D_ctx_80178130[actor->index + 1] = actor->rot_0F4.y + 180.0f; + D_ctx_80177F20[this->index + 1] = this->obj.pos.x; + D_ctx_80178028[this->index + 1] = this->obj.pos.z; + D_ctx_80178130[this->index + 1] = this->rot_0F4.y + 180.0f; } - if (actor->obj.id == OBJ_ACTOR_ALLRANGE) { - ActorAllRange_SetShadowData(actor); + if (this->obj.id == OBJ_ACTOR_ALLRANGE) { + ActorAllRange_SetShadowData(this); } } void ActorEvent_Dying(ActorEvent* this) { - if ((this->eventType == EVID_48) || (this->eventType == EVID_49) || (this->eventType == EVID_50)) { + if ((this->eventType == EVID_SY_ROBOT_1) || (this->eventType == EVID_SY_ROBOT_2) || + (this->eventType == EVID_SY_ROBOT_3)) { SectorY_SyRobot_Update(this); } else { func_enmy2_800763A4(this); diff --git a/src/engine/fox_hud.c b/src/engine/fox_hud.c index 825ce5a7..8d1dec54 100644 --- a/src/engine/fox_hud.c +++ b/src/engine/fox_hud.c @@ -1778,7 +1778,7 @@ void func_hud_80089AF4(void) { gDPSetPrimColor(gMasterDisp++, 0, 0, 0, 0, 0, 255); Matrix_Scale(gGfxMatrix, 54.0f, 54.0f, 1.0f, MTXF_APPLY); Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_STAR_WOLF_F014180); + gSPDisplayList(gMasterDisp++, aStarWolfRadarMarkDL); } void func_hud_80089B94(void) { @@ -2461,7 +2461,7 @@ s32 func_hud_8008B774(void) { (gCurrentLevel == LEVEL_SECTOR_Y))) { for (i = 0; i < ARRAY_COUNT(gActors); i++) { if ((gActors[i].obj.status == OBJ_ACTIVE) && (gActors[i].iwork[12] == temp)) { - if ((gActors[i].eventType == EVID_SLIPPY_METEO) || (gActors[i].eventType == EVID_TEAMMATE) || + if ((gActors[i].eventType == EVID_ME_SLIPPY) || (gActors[i].eventType == EVID_TEAMMATE) || ((gActors[i].obj.id == OBJ_ACTOR_TEAM_BOSS) && ((gActors[i].aiType == AI360_FALCO) || (gActors[i].aiType == AI360_SLIPPY) || (gActors[i].aiType == AI360_PEPPY)))) { @@ -4525,7 +4525,7 @@ bool func_hud_800927A0(ActorTeamBoss* this) { bool ret = false; if (this->iwork[11] == 0) { - this->unk_046 = 0; + this->work_046 = 0; this->iwork[11] = 1; this->iwork[1] = 1; this->vwork[29].x = this->obj.rot.x; @@ -4537,22 +4537,22 @@ bool func_hud_800927A0(ActorTeamBoss* this) { Math_SmoothStepToAngle(&this->vwork[29].x, 0.0f, 0.1f, 5.0f, 0.0f); sp50 = Math_RadToDeg(Math_Atan2F(0.0f - this->obj.pos.x, 0.0f - this->obj.pos.z)); - switch (this->unk_046) { + switch (this->work_046) { case 0: - if (this->unk_04A != 0) { + if (this->work_04A != 0) { this->timer_0BC = 30; } else { this->timer_0BC = 10; } - this->unk_046 = 1; + this->work_046 = 1; if (this->fwork[19] > 180.0f) { this->fwork[19] = this->fwork[19] - 360.0f; } case 1: if (this->timer_0BC == 0) { - this->unk_046 = 2; - if (this->unk_04A != 0) { + this->work_046 = 2; + if (this->work_04A != 0) { this->timer_0BC = 80; } else { this->timer_0BC = 60; @@ -4589,7 +4589,7 @@ bool func_hud_800927A0(ActorTeamBoss* this) { this->fwork[20] = -180.0f; } this->iwork[1] = 1; - this->unk_046 = 3; + this->work_046 = 3; } this->fwork[28] -= 0.2f; break; @@ -4607,7 +4607,7 @@ bool func_hud_800927A0(ActorTeamBoss* this) { Math_SmoothStepToF(&this->fwork[16], -sp54, 0.3f, 100.0f, 0.0f); Math_SmoothStepToF(&this->fwork[27], -sp54, 0.3f, 100.0f, 0.0f); - if (this->unk_04A != 0) { + if (this->work_04A != 0) { Math_SmoothStepToAngle(&this->rot_0F4.y, sp50, 0.1f, 2.0f, 0.0f); } @@ -4622,7 +4622,7 @@ bool func_hud_800927A0(ActorTeamBoss* this) { if (this->timer_0BC == 0) { ret = true; this->iwork[11] = 0; - this->unk_046 = 0; + this->work_046 = 0; this->fwork[28] = 0.0f; this->fwork[20] = 0.0f; this->fwork[29] = 1.0f; @@ -4689,7 +4689,7 @@ void ActorTeamBoss_Update(ActorTeamBoss* this) { this->health = gTeamShields[this->aiType]; - switch (this->unk_048) { + switch (this->work_048) { case 0: func_hud_800914FC(this); func_hud_80091864(this); @@ -4724,29 +4724,29 @@ void ActorTeamBoss_Update(ActorTeamBoss* this) { if ((this->iwork[10] != 0) && (gLevelMode == LEVELMODE_ALL_RANGE) && (this->iwork[9] == 0) && (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_LEVEL_COMPLETE)) { - this->unk_048 = 2; - this->unk_04A = 0; + this->work_048 = 2; + this->work_04A = 0; } if ((gLevelMode == LEVELMODE_ALL_RANGE) && (fabsf(this->obj.pos.x > var_fv1) || fabsf(this->obj.pos.z > var_fv1)) && (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_LEVEL_COMPLETE)) { - this->unk_048 = 2; - this->unk_04A = 1; + this->work_048 = 2; + this->work_04A = 1; } break; case 1: if (func_hud_800924E0(this) != 0) { - this->unk_048 = 0; + this->work_048 = 0; this->iwork[9] = RAND_INT(30.0f) + 90; } break; case 2: if (func_hud_800927A0(this) != 0) { - this->unk_04A = 0; - this->unk_048 = this->unk_04A; + this->work_04A = 0; + this->work_048 = this->work_04A; this->iwork[9] = RAND_INT(30.0f) + 90; } break; diff --git a/src/engine/fox_play.c b/src/engine/fox_play.c index 1605f40c..b49886e4 100644 --- a/src/engine/fox_play.c +++ b/src/engine/fox_play.c @@ -2035,14 +2035,14 @@ void Player_CollisionCheck(Player* player) { Player_ApplyDamage(player, temp_v0, actor->info.damage); } } else if (actor->obj.id == OBJ_ACTOR_EVENT) { - if (actor->eventType == EVID_42) { + if (actor->eventType == EVID_SY_SHIP_2) { temp_v0 = Player_CheckPolyCollision(player, ACTOR_EVENT_ID, actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, actor->obj.rot.x, actor->obj.rot.y, actor->obj.rot.z); if (temp_v0 != 0) { Player_ApplyDamage(player, temp_v0, actor->info.damage); } - } else if (actor->eventType == EVID_63) { + } else if (actor->eventType == EVID_ME_BIG_METEOR) { spfD4.x = fabsf(actor->obj.pos.x - player->pos.x); spfD4.y = fabsf(actor->obj.pos.y - player->pos.y); spfD4.z = fabsf(actor->obj.pos.z - player->trueZpos); @@ -2059,7 +2059,7 @@ void Player_CollisionCheck(Player* player) { if ((temp_v0 < 0) && (actor->eventType == EVID_SX_WARP_GATE)) { actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_SX_6032328); if (gRingPassCount >= 0) { - actor->unk_046 = 2; + actor->work_046 = 2; gRingPassCount++; if (gRingPassCount == 3) { Radio_PlayMessage(gMsg_ID_5504, RCID_FALCO); diff --git a/src/mods/sfxjukebox.c b/src/mods/sfxjukebox.c index b7d3d728..20ef358b 100644 --- a/src/mods/sfxjukebox.c +++ b/src/mods/sfxjukebox.c @@ -4,7 +4,7 @@ #include "sf64audio_provisional.h" extern s32 spectrumAnalyzerMode; -extern bool D_menu_801B9320; +extern bool sMusicPlaying; extern s32 D_menu_801B9244; extern OptionId D_menu_801B9124; extern s32 D_menu_801B912C; @@ -163,11 +163,11 @@ void Jukebox_Update(void) { SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 1); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 1); AUDIO_PLAY_SFX(sfx, sfxSource, 4); - D_menu_801B9320 = true; + sMusicPlaying = true; } if (contPress->button & B_BUTTON) { - if (!D_menu_801B9320) { + if (!sMusicPlaying) { AUDIO_PLAY_SFX(NA_SE_ARWING_CANCEL, gDefaultSfxSource, 4); AUDIO_PLAY_BGM(NA_BGM_SELECT); gDrawMode = DRAW_NONE; @@ -180,7 +180,7 @@ void Jukebox_Update(void) { Audio_KillSfxBySource(sfxSource); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 1); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 1); - D_menu_801B9320 = false; + sMusicPlaying = false; } } diff --git a/src/mods/spawner.c b/src/mods/spawner.c index b7cb964d..142fb6c0 100644 --- a/src/mods/spawner.c +++ b/src/mods/spawner.c @@ -345,7 +345,7 @@ void Spawner(void) { sObjType++; switch (sObjType) { case OBJ_SPAWN_EVENT: - sObjId = EVID_0; + sObjId = EVID_VENOM_FIGHTER_1; break; case OBJ_SPAWN_SCENERY: sObjId = OBJ_SCENERY_CO_STONE_ARCH; diff --git a/src/overlays/ovl_ending/fox_end1.c b/src/overlays/ovl_ending/fox_end1.c index 9d8a5832..24aee6be 100644 --- a/src/overlays/ovl_ending/fox_end1.c +++ b/src/overlays/ovl_ending/fox_end1.c @@ -1470,7 +1470,7 @@ void Ending_8018B6D8(Actor* actor, s32 arg1) { actor->iwork[1] = 100; actor->fwork[0] = 30.0f; actor->iwork[0] = sp20[arg1]; - actor->unk_046 = arg1; + actor->work_046 = arg1; } void Ending_8018B860(void) { @@ -1843,7 +1843,7 @@ void Ending_8018C21C(void) { Matrix_RotateX(gGfxMatrix, gActors[i].obj.rot.x * M_DTOR, MTXF_APPLY); Matrix_RotateZ(gGfxMatrix, gActors[i].obj.rot.z * M_DTOR, MTXF_APPLY); Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_D00B880); + gSPDisplayList(gMasterDisp++, aBillShipDL); Matrix_Push(&gGfxMatrix); RCP_SetupDL(&gMasterDisp, SETUPDL_49); gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 64); @@ -1857,7 +1857,7 @@ void Ending_8018C21C(void) { spE4 = gActors[i].fwork[1]; RCP_SetupDL(&gMasterDisp, SETUPDL_41); - switch (gActors[i].unk_046) { + switch (gActors[i].work_046) { case 0: gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 200, 0, 0, gActors[i].iwork[1]); break; diff --git a/src/overlays/ovl_ending/fox_end2.c b/src/overlays/ovl_ending/fox_end2.c index dd652136..6c37abed 100644 --- a/src/overlays/ovl_ending/fox_end2.c +++ b/src/overlays/ovl_ending/fox_end2.c @@ -554,7 +554,7 @@ void Ending_8018F64C(u32 arg0, AssetInfo* asset) { } Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_D009A40); + gSPDisplayList(gMasterDisp++, aKattShipDL); RCP_SetupDL(&gMasterDisp, SETUPDL_67); Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -60.0f, MTXF_APPLY); @@ -621,7 +621,7 @@ void Ending_8018FC60(u32 arg0, AssetInfo* asset) { } Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_D00B880); + gSPDisplayList(gMasterDisp++, aBillShipDL); RCP_SetupDL(&gMasterDisp, SETUPDL_67); Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -50.0f, MTXF_APPLY); diff --git a/src/overlays/ovl_i1/fox_co.c b/src/overlays/ovl_i1/fox_co.c index 74a0ae9a..4dff00a7 100644 --- a/src/overlays/ovl_i1/fox_co.c +++ b/src/overlays/ovl_i1/fox_co.c @@ -516,8 +516,8 @@ void Corneria_CoGranga_DecideNextAction(CoGranga* this) { } void Corneria_80188C7C(CoGranga* this) { - if (this->unk_044 == 0) { - this->unk_044++; + if (this->work_044 == 0) { + this->work_044++; this->fwork[GRANGA_FWK_12] *= -0.2f; AUDIO_PLAY_SFX(NA_SE_OB_METAL_BOUND_L, this->sfxSource, 4); func_enmy_80062B60(sCoGrangaWork[GRANGA_WORK_56], sCoGrangaWork[GRANGA_WORK_58], 0, 30.0f); diff --git a/src/overlays/ovl_i1/fox_ve1.c b/src/overlays/ovl_i1/fox_ve1.c index 91a0dc57..045259ff 100644 --- a/src/overlays/ovl_i1/fox_ve1.c +++ b/src/overlays/ovl_i1/fox_ve1.c @@ -1424,7 +1424,7 @@ void Venom1_Ve1Golemech_Update(Ve1Golemech* this) { actor->obj.rot.z = D_i1_8019B838[spF4].unk_30[0].z; actor->state = 57; actor->iwork[0] = 0; - actor->unk_048 = spF4; + actor->work_048 = spF4; if (this->swork[25] == 0) { actor->vel.x = RAND_FLOAT_CENTERED(5.0f); actor->vel.y = 10.0f + RAND_FLOAT_CENTERED(2.0f); diff --git a/src/overlays/ovl_i2/fox_me.c b/src/overlays/ovl_i2/fox_me.c index 7807287e..c0aab937 100644 --- a/src/overlays/ovl_i2/fox_me.c +++ b/src/overlays/ovl_i2/fox_me.c @@ -80,15 +80,15 @@ void Meteo_MeMeteor2_Update(MeMeteor2* this) { this->obj.rot.y += 1.7f; this->obj.rot.x += 3.3f; - this->unk_046 -= 15; + this->work_046 -= 15; - if (this->unk_046 < 0) { - this->unk_046 = 0; + if (this->work_046 < 0) { + this->work_046 = 0; } - this->unk_048 += 8; - if (this->unk_048 > 995) { - this->unk_048 = 995; + this->work_048 += 8; + if (this->work_048 > 995) { + this->work_048 = 995; } if ((this->timer_0BC % 4U) == 1) { @@ -175,15 +175,15 @@ void Meteo_80187B08(MeLaserCannon1* this) { this->obj.rot.y += 7.0f; this->obj.rot.x += 3.3f; - this->unk_046 -= 11; + this->work_046 -= 11; - if (this->unk_046 < 0) { - this->unk_046 = 0; + if (this->work_046 < 0) { + this->work_046 = 0; } - this->unk_048 += 4; - if (this->unk_048 > 995) { - this->unk_048 = 995; + this->work_048 += 4; + if (this->work_048 > 995) { + this->work_048 = 995; } if ((this->timer_0BC % 4) == 0) { @@ -199,7 +199,8 @@ void Meteo_80187B08(MeLaserCannon1* this) { } } -void Meteo_80187C68(Actor* this, f32 x, f32 y, f32 z, f32 arg4, f32 xRot, f32 yRot, s32 timerBC, s32 arg8, s32 objId) { +void Meteo_80187C68(Actor* this, f32 x, f32 y, f32 z, f32 arg4, f32 xRot, f32 yRot, s32 timerBC, s32 eventType, + s32 objId) { Actor_Initialize(this); this->obj.status = OBJ_INIT; this->obj.id = objId; @@ -213,7 +214,7 @@ void Meteo_80187C68(Actor* this, f32 x, f32 y, f32 z, f32 arg4, f32 xRot, f32 yR this->timer_0BC = timerBC; this->timer_0BE = 20; - this->eventType = arg8; + this->eventType = eventType; this->fwork[5] = arg4; Object_SetInfo(&this->info, this->obj.id); } @@ -394,15 +395,15 @@ void Meteo_MeCrusherShield_Update(MeCrusherShield* this) { this->timer_054 = 5; this->swork[0] += 32; - Audio_SetTransposeAndPlaySfx(this->sfxSource, NA_SE_EN_GRN_BEAM_CHARGE, this->unk_04A); + Audio_SetTransposeAndPlaySfx(this->sfxSource, NA_SE_EN_GRN_BEAM_CHARGE, this->work_04A); - this->unk_04A++; - if (this->unk_04A > 7) { - this->unk_04A = 7; + this->work_04A++; + if (this->work_04A > 7) { + this->work_04A = 7; } if (this->swork[0] >= 255) { - this->unk_04A = 0; + this->work_04A = 0; Audio_KillSfxBySource(this->sfxSource); @@ -520,7 +521,7 @@ void Meteo_MeCrusher_Init(MeCrusher* this) { this->fwork[9] = -3000.0f; this->fwork[15] = 8.0f; - i = this->unk_044 = 1; + i = this->work_044 = 1; Boss_Initialize(&gBosses[i]); @@ -1109,7 +1110,7 @@ void Meteo_MeCrusher_Update(MeCrusher* this) { if (this->fwork[0] >= 0.0f) { this->state = 2; this->timer_050 = 50; - gBosses[this->unk_044].state = 1; + gBosses[this->work_044].state = 1; } } @@ -1165,7 +1166,7 @@ void Meteo_MeCrusher_Update(MeCrusher* this) { } } - if (gBosses[this->unk_044].state < 3) { + if (gBosses[this->work_044].state < 3) { var_v0 = 0; if (this->swork[2] == 0) { var_v0 = 1; @@ -1184,14 +1185,14 @@ void Meteo_MeCrusher_Update(MeCrusher* this) { this->obj.rot.z += 0.1f; } if (var_v0 == 4) { - gBosses[this->unk_044].state = 3; + gBosses[this->work_044].state = 3; this->state = 4; this->timer_050 = 250; this->timer_05A = 30; this->fwork[10] = 0; } - if ((this->timer_050 == 0) && (gBosses[this->unk_044].state == 2)) { + if ((this->timer_050 == 0) && (gBosses[this->work_044].state == 2)) { this->fwork[2] = 90.0f; this->timer_050 = D_i2_80195520[var_v0] + 45; AUDIO_PLAY_SFX(NA_SE_EN_SHIELD_ROLL, this->sfxSource, 4); @@ -1199,7 +1200,7 @@ void Meteo_MeCrusher_Update(MeCrusher* this) { if (this->fwork[2] > 0.0f) { this->fwork[2] -= 2.0f; - gBosses[this->unk_044].rot_078.z -= 2.0f; + gBosses[this->work_044].rot_078.z -= 2.0f; } } diff --git a/src/overlays/ovl_i2/fox_sx.c b/src/overlays/ovl_i2/fox_sx.c index cb616ac2..da46ca18 100644 --- a/src/overlays/ovl_i2/fox_sx.c +++ b/src/overlays/ovl_i2/fox_sx.c @@ -168,7 +168,7 @@ void SectorX_SxSlippy_Update(SxSlippy* this) { void SectorX_SxSlippy_Draw(SxSlippy* this) { switch (this->animFrame) { case 0: - gSPDisplayList(gMasterDisp++, D_SX_6020D20); + gSPDisplayList(gMasterDisp++, aSxBaseWallTile1DL); break; case 1: @@ -210,7 +210,7 @@ void SectorX_8018FA04(f32 x, f32 y, f32 z) { actor->obj.pos.y = y; actor->obj.pos.z = z; Object_SetInfo(&actor->info, actor->obj.id); - actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_SX_60328CC); + actor->info.hitbox = SEGMENTED_TO_VIRTUAL(aSxBaseWallTile1Hitbox); xRot = Math_Atan2F(gPlayer[0].pos.x - x, gPlayer[0].trueZpos - z); pad = sqrtf(SQ(gPlayer[0].pos.x - x) + SQ(gPlayer[0].trueZpos - z)); yRot = -Math_Atan2F(gPlayer[0].pos.y - y, pad); diff --git a/src/overlays/ovl_i3/fox_aq.c b/src/overlays/ovl_i3/fox_aq.c index 58ed5123..9709ce67 100644 --- a/src/overlays/ovl_i3/fox_aq.c +++ b/src/overlays/ovl_i3/fox_aq.c @@ -344,7 +344,7 @@ void Aquas_SetupDebris(ActorDebris* this, Vec3f* pos, Vec3f* rot, f32 xVel, f32 this->obj.id = OBJ_ACTOR_DEBRIS; this->state = state; this->scale = scale; - this->unk_048 = unk48; + this->work_048 = unk48; this->obj.pos = *pos; this->obj.rot = *rot; this->vel.x = xVel; diff --git a/src/overlays/ovl_i3/fox_so.c b/src/overlays/ovl_i3/fox_so.c index c42de722..df8bd2d2 100644 --- a/src/overlays/ovl_i3/fox_so.c +++ b/src/overlays/ovl_i3/fox_so.c @@ -257,8 +257,8 @@ void Solar_SoWave_Update(SoWave* this) { } } - if ((this->unk_046 == 0) || (this->unk_046 == 1)) { - this->unk_046 = 3; + if ((this->work_046 == 0) || (this->work_046 == 1)) { + this->work_046 = 3; Object_SetSfxSourceToPos(this->sfxSource, &this->obj.pos); AUDIO_PLAY_SFX(NA_SE_OB_MAGMA_WAVE, this->sfxSource, 0); } @@ -947,7 +947,7 @@ void Solar_801A0CEC(SoWave* this, f32 xPos, f32 zPos, f32 zVel, s32 unkB8) { this->obj.pos.x = xPos; this->obj.pos.z = zPos; - this->unk_046 = 1; + this->work_046 = 1; this->state = unkB8; this->vel.z = zVel; this->fwork[1] = zVel; @@ -1288,8 +1288,8 @@ void Solar_801A1CD8(ActorDebris* this, f32 xPos, f32 yPos, f32 zPos, f32 xRot, f this->obj.id = OBJ_ACTOR_DEBRIS; this->state = 40; - this->unk_046 = unk46; - this->unk_04A = 3; + this->work_046 = unk46; + this->work_04A = 3; this->obj.pos.x = xPos; this->obj.pos.y = yPos; @@ -1801,7 +1801,7 @@ void Solar_801A3128(SoVulkain* this) { void Solar_801A3468(SoVulkain* this) { this->swork[SO_SWK_0] = 4; - this->unk_048 = 0; + this->work_048 = 0; if ((this->swork[SO_SWK_2] != 0) || (this->swork[SO_SWK_3] != 0)) { if (this->swork[SO_SWK_3] != 0) { @@ -1811,7 +1811,7 @@ void Solar_801A3468(SoVulkain* this) { } } else { if (Rand_ZeroOne() >= 0.5f) { - this->unk_048 = 1; + this->work_048 = 1; this->swork[SO_SWK_1] = 5; } else { this->timer_050 = 0; @@ -1885,7 +1885,7 @@ void Solar_801A3510(SoVulkain* this) { } } - if ((this->unk_048 != 0) && (this->animFrame == 68)) { + if ((this->work_048 != 0) && (this->animFrame == 68)) { this->swork[SO_SWK_1] = 9; this->fwork[SO_FWK_0] = 0.01f; this->animFrame = 20; diff --git a/src/overlays/ovl_i3/fox_zo.c b/src/overlays/ovl_i3/fox_zo.c index aacc4f55..2db978e3 100644 --- a/src/overlays/ovl_i3/fox_zo.c +++ b/src/overlays/ovl_i3/fox_zo.c @@ -488,7 +488,7 @@ void Zoness_ActorDebris_Setup(ActorDebris* this, Vec3f* pos, Vec3f* rot, f32 xVe this->state = state; this->scale = scale; - this->unk_048 = unk48; + this->work_048 = unk48; this->obj.pos = *pos; this->obj.rot = *rot; this->vel.x = xVel; @@ -755,7 +755,7 @@ void Zoness_ZoDodora_Draw2(ZoDodora* this) { s32 k; PosRot* zoDodoraPosRots; - for (i = this->unk_04A = 0; i < 20; i++, hitbox++) { + for (i = this->work_04A = 0; i < 20; i++, hitbox++) { k = (D_i3_801BF56C[i] + this->counter_04E) % 200; zoDodoraPosRots = &gZoDodoraPosRots[k]; @@ -960,7 +960,7 @@ void Zoness_ZGull_Update(ZGull* this) { } this->animFrame++; - if (this->animFrame >= Animation_GetFrameCount(&D_ENMY_PLANET_40057AC)) { + if (this->animFrame >= Animation_GetFrameCount(&aFirebirdAnim)) { this->animFrame = 0; } @@ -1035,8 +1035,8 @@ void Zoness_ZGull_Update(ZGull* this) { } void Zoness_ZGull_Draw(ZGull* this) { - Animation_GetFrameData(&D_ENMY_PLANET_40057AC, this->animFrame, this->vwork); - Animation_DrawSkeleton(1, D_ENMY_PLANET_40058B8, this->vwork, NULL, NULL, &this->index, &gIdentityMatrix); + Animation_GetFrameData(&aFirebirdAnim, this->animFrame, this->vwork); + Animation_DrawSkeleton(1, aFirebirdSkel, this->vwork, NULL, NULL, &this->index, &gIdentityMatrix); } void Zoness_ZoEnergyBall_Init2(ZoEnergyBall* this) { @@ -4620,7 +4620,7 @@ void Zoness_ZoBarrier_Init(ZoBarrier* this) { gActors[i].state = 1; - this->unk_046 = i + 1; + this->work_046 = i + 1; Object_SetInfo(&gActors[i].info, gActors[i].obj.id); gActors[i].info.hitbox = SEGMENTED_TO_VIRTUAL(D_ZO_602C028); break; @@ -4647,8 +4647,8 @@ void Zoness_ZoBarrier_Update(ZoBarrier* this) { } } - if (this->unk_046 != 0) { - otherActor = &gActors[this->unk_046 - 1]; + if (this->work_046 != 0) { + otherActor = &gActors[this->work_046 - 1]; otherActor->obj.pos.y += this->fwork[1] * 0.3f; if (otherActor->obj.pos.y > this->fwork[2] + 370.0f) { otherActor->obj.pos.y = this->fwork[2] + 370.0f; diff --git a/src/overlays/ovl_i4/fox_bo.c b/src/overlays/ovl_i4/fox_bo.c index 36a93e7b..9fe5a6b2 100644 --- a/src/overlays/ovl_i4/fox_bo.c +++ b/src/overlays/ovl_i4/fox_bo.c @@ -1537,7 +1537,7 @@ void Bolse_LevelComplete(Player* player) { actor50->obj.pos.y - RAND_FLOAT(2000.0f), RAND_FLOAT_CENTERED(300.0f) + actor50->obj.pos.z, 5.11f); }; - actor50->unk_046 = 1; + actor50->work_046 = 1; break; case 235: @@ -1673,7 +1673,7 @@ void Bolse_LevelComplete(Player* player) { break; } - if (actor50->unk_046 != 0) { + if (actor50->work_046 != 0) { Math_SmoothStepToF(&actor50->fwork[20], 3.0f, 0.03f, 0.01f, 0); if ((gGameFrameCount % 2U) == 0) { Effect_Effect389_Spawn( diff --git a/src/overlays/ovl_i4/fox_ka.c b/src/overlays/ovl_i4/fox_ka.c index 47b05099..620430d8 100644 --- a/src/overlays/ovl_i4/fox_ka.c +++ b/src/overlays/ovl_i4/fox_ka.c @@ -2652,7 +2652,7 @@ void Katina_EnemyDraw(ActorAllRange* this) { case 1: gSPDisplayList(gMasterDisp++, aKaCornerianFighterDL); Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -60.0f, MTXF_APPLY); - Actor_DrawEngineGlow(this, 0); + Actor_DrawEngineGlow(this, EG_RED); break; } } diff --git a/src/overlays/ovl_i5/fox_ma.c b/src/overlays/ovl_i5/fox_ma.c index 6190f0bb..2d514076 100644 --- a/src/overlays/ovl_i5/fox_ma.c +++ b/src/overlays/ovl_i5/fox_ma.c @@ -1227,7 +1227,7 @@ void Macbeth_MaBoulder_Setup(MaBoulder* this, f32 xPos, f32 yPos, f32 zPos, f32 this->timer_0BE = 20; this->fwork[0] = arg4; this->vel.z = zVel; - this->unk_046 = arg9; + this->work_046 = arg9; Object_SetInfo(&this->info, this->obj.id); } @@ -3111,7 +3111,7 @@ bool Macbeth_801A3C20(f32 arg0) { void Macbeth_MaMaRailroadSwitch_Init(MaRailroadSwitch* this) { this->state = 0; - this->unk_046 = D_i5_801BA1D8; + this->work_046 = D_i5_801BA1D8; D_i5_801BA1D8++; } @@ -3144,7 +3144,7 @@ void Macbeth_MaRailroadSwitch_Update(MaRailroadSwitch* this) { Math_SmoothStepToF(&this->fwork[2], 41.0f, 0.6f, 8.0f, 0.0f); if (this->fwork[2] >= 40.0f) { this->state = 3; - D_i5_801BE308[this->unk_046] = 1; + D_i5_801BE308[this->work_046] = 1; } } else { this->iwork[0]--; @@ -3222,12 +3222,12 @@ void Macbeth_MaRailroadSwitch_Draw(MaRailroadSwitch* this) { void Macbeth_MaBoulder_Init(MaBoulder* this) { this->gravity = 0; - this->unk_04A = this->unk_046; + this->work_04A = this->work_046; this->health = 60; if (this->fwork[0] < 0.0f) { - this->unk_048 = 0; + this->work_048 = 0; } else { - this->unk_048 = 1; + this->work_048 = 1; } } @@ -3243,17 +3243,17 @@ void Macbeth_MaBoulder_Update(MaBoulder* this) { Math_SmoothStepToF(&this->gravity, 5.0f, 0.08f, 1.0f, 0.0f); if (this->obj.pos.y < 80.0f) { - if (this->unk_046 != 0) { + if (this->work_046 != 0) { AUDIO_PLAY_SFX(NA_SE_OB_ROCK_BOUND, this->sfxSource, 0); this->obj.pos.y = 80.0f; if (this->vel.y < 0) { - this->vel.y = -this->vel.y * (this->unk_046 * 0.07f); + this->vel.y = -this->vel.y * (this->work_046 * 0.07f); } this->fwork[0] /= 1.2f + RAND_FLOAT(1.0f) / 2; - this->unk_046--; + this->work_046--; this->vel.z /= 1.5f; - if (this->unk_046 == 0) { + if (this->work_046 == 0) { this->timer_0BE = RAND_INT(30.0f); } } else { @@ -3266,19 +3266,19 @@ void Macbeth_MaBoulder_Update(MaBoulder* this) { } } - if (this->unk_048 != 0) { + if (this->work_048 != 0) { this->obj.rot.z -= 0.5f * this->vel.x; } else { this->obj.rot.z -= 0.5f * this->vel.x; } - if (this->unk_046 != this->unk_04A) { + if (this->work_046 != this->work_04A) { this->obj.rot.x = this->obj.rot.x + (0.1 * this->vel.z); } } - if (this->unk_046 == 7) { - if (this->unk_048 != 0) { + if (this->work_046 == 7) { + if (this->work_048 != 0) { this->obj.rot.z -= 1.0f; } else { this->obj.rot.z += 1.0f; @@ -5835,7 +5835,7 @@ void Macbeth_MaBombDrop_Update(MaBombDrop* this) { this->state = 1; this->timer_0BC = 200; - this->unk_046 = 192; + this->work_046 = 192; this->scale = 2.5f; this->fwork[0] = 2.5f; @@ -5858,8 +5858,8 @@ void Macbeth_MaBombDrop_Update(MaBombDrop* this) { this->scale += ((20.0f - this->scale) * 0.1f); if (this->scale > 19.0f) { this->fwork[0] -= 0.3f; - this->unk_046 -= 20; - if (this->unk_046 < 0) { + this->work_046 -= 20; + if (this->work_046 < 0) { Object_Kill(&this->obj, this->sfxSource); } } diff --git a/src/overlays/ovl_i5/fox_ti.c b/src/overlays/ovl_i5/fox_ti.c index 92915301..9a72a1aa 100644 --- a/src/overlays/ovl_i5/fox_ti.c +++ b/src/overlays/ovl_i5/fox_ti.c @@ -529,7 +529,7 @@ void Titania_TiBoulder_Update(TiBoulder* this) { } } - if (this->unk_046 == 2) { + if (this->work_046 == 2) { this->gravity = 0.0f; Ground_801B6E20(this->obj.pos.x, this->obj.pos.z + gPathProgress, &sp4C, &sp44, &sp48); this->fwork[0] = sp4C; @@ -546,10 +546,10 @@ void Titania_TiBoulder_Update(TiBoulder* this) { temp_fv1 = (this->scale * 50.0f); if (this->obj.pos.y > sp44 + temp_fv1) { - this->unk_046 = 0; + this->work_046 = 0; } else { this->obj.pos.y = sp44 + temp_fv1; - if (this->unk_046 == 0) { + if (this->work_046 == 0) { if (this->vel.y < -6.0f) { AUDIO_PLAY_SFX(NA_SE_OB_BOUND_M, this->sfxSource, 4); } @@ -561,7 +561,7 @@ void Titania_TiBoulder_Update(TiBoulder* this) { if (this->vel.y < 10.0f) { this->vel.y = 0.0f; } - this->unk_046 = 1; + this->work_046 = 1; } else { if ((s32) sp48 == 0) { this->vel.x *= 0.9; @@ -692,7 +692,7 @@ void Titania_TiRasco_Init(TiRasco* this) { actorPtr->obj.pos.x = this->obj.pos.x + sp68[k].x; actorPtr->obj.pos.y = this->obj.pos.y + sp68[k].y; actorPtr->obj.pos.z = this->obj.pos.z + sp68[k].z; - actorPtr->unk_046 = 2; + actorPtr->work_046 = 2; actorPtr->iwork[0] = (uintptr_t) this; actorPtr->iwork[1] = k; Object_SetInfo(&actorPtr->info, actorPtr->obj.id); @@ -800,7 +800,7 @@ void Titania_TiRasco_Update(Actor* this) { Matrix_RotateY(gCalcMatrix, this->obj.rot.y * M_DTOR, MTXF_NEW); if ((this->animFrame >= 26) && (this->animFrame <= 53) && (sp3C != NULL)) { if (this->animFrame == 26) { - sp3C->unk_046 = 2; + sp3C->work_046 = 2; sp3C->vel.x = 0.0f; sp3C->vel.y = 0.0f; sp3C->vel.z = 0.0f; @@ -812,7 +812,7 @@ void Titania_TiRasco_Update(Actor* this) { sp3C->vel.x = dest.x; sp3C->vel.y = dest.y; sp3C->vel.z = dest.z; - sp3C->unk_046 = 0; + sp3C->work_046 = 0; sp3C->iwork[0] = (uintptr_t) NULL; this->iwork[0] = (uintptr_t) NULL; } @@ -827,7 +827,7 @@ void Titania_TiRasco_Update(Actor* this) { if ((this->animFrame >= 26) && (this->animFrame <= 57) && (sp38 != NULL)) { if (this->animFrame == 26) { - sp38->unk_046 = 2; + sp38->work_046 = 2; sp38->vel.x = 0.0f; sp38->vel.y = 0.0f; sp38->vel.z = 0.0f; @@ -840,7 +840,7 @@ void Titania_TiRasco_Update(Actor* this) { sp38->vel.x = dest.x; sp38->vel.y = dest.y; sp38->vel.z = dest.z; - sp38->unk_046 = 0; + sp38->work_046 = 0; sp38->iwork[0] = (uintptr_t) NULL; this->iwork[1] = (uintptr_t) NULL; } @@ -894,7 +894,7 @@ void Titania_TiRasco_Dying(TiRasco* this) { if (actorPtr != NULL) { actorPtr->obj.status = OBJ_ACTIVE; actorPtr->state = 46; - actorPtr->unk_048 = i; + actorPtr->work_048 = i; Matrix_MultVec3f(gCalcMatrix, &var_s1->pos, &sp70); actorPtr->obj.pos.x = this->obj.pos.x + sp70.x; actorPtr->obj.pos.y = this->obj.pos.y + sp70.y; @@ -916,12 +916,12 @@ void Titania_TiRasco_Dying(TiRasco* this) { if (actorPtr != NULL) { actorPtr->iwork[0] = (uintptr_t) NULL; this->iwork[0] = (uintptr_t) NULL; - actorPtr->unk_046 = 0; + actorPtr->work_046 = 0; } actorPtr = (Actor*) this->iwork[1]; if (actorPtr != NULL) { - actorPtr->unk_046 = 0; + actorPtr->work_046 = 0; actorPtr->iwork[0] = (uintptr_t) NULL; this->iwork[1] = (uintptr_t) NULL; } @@ -1611,7 +1611,7 @@ void Titania_TiDesertCrawler_Update(TiDesertCrawler* this) { actorPtr = Game_SpawnActor(OBJ_ACTOR_DEBRIS); if ((actorPtr != NULL) && D_i5_801B7630[i][1] == 1) { actorPtr->state = 47; - actorPtr->unk_048 = i; + actorPtr->work_048 = i; Matrix_MultVec3f(gCalcMatrix, &var_s1->unk_00.pos, &sp158); actorPtr->obj.pos.x = this->obj.pos.x + sp158.x; actorPtr->obj.pos.y = this->obj.pos.y + sp158.y; @@ -1647,7 +1647,7 @@ void Titania_TiDesertCrawler_Update(TiDesertCrawler* this) { actorPtr = Game_SpawnActor(OBJ_ACTOR_DEBRIS); if (actorPtr != NULL) { actorPtr->state = 47; - actorPtr->unk_048 = 9; + actorPtr->work_048 = 9; Matrix_MultVec3f(gCalcMatrix, &var_s1->unk_00.pos, &sp158); actorPtr->obj.pos.x = this->obj.pos.x + sp158.x; actorPtr->obj.pos.y = this->obj.pos.y + sp158.y; @@ -3836,8 +3836,8 @@ void Titania_80193DF0(TiGoras* this) { actor = Game_SpawnActor(OBJ_ACTOR_DEBRIS); if (actor != NULL) { actor->state = 40; - actor->unk_046 = D_i5_801B7770[i][5]; - actor->unk_048 = D_i5_801B7770[i][1]; + actor->work_046 = D_i5_801B7770[i][5]; + actor->work_048 = D_i5_801B7770[i][1]; if (D_i5_801B7770[i][0] == 85) { actor->fwork[0] = 5.0f; actor->fwork[1] = 5.0f; @@ -4215,8 +4215,8 @@ void Titania_80193DF0(TiGoras* this) { actor->obj.pos.y = 0.0f; actor->obj.pos.z = this->obj.pos.z + 2000.0f; actor->info.cullDistance = 5000.0f; - actor->unk_046 = D_i5_801B7770[D_i5_801B8198[i].unk_00][5]; - actor->unk_048 = D_i5_801B7770[D_i5_801B8198[i].unk_00][1]; + actor->work_046 = D_i5_801B7770[D_i5_801B8198[i].unk_00][5]; + actor->work_048 = D_i5_801B7770[D_i5_801B8198[i].unk_00][1]; D_i5_801B8198[i].unk_0C = D_i5_801B8198[i].unk_04; actor->vel.z = this->vel.z; D_i5_801BBF00[D_i5_801B8198[i].unk_00].unk_26 |= 1; @@ -4778,7 +4778,7 @@ void Titania_80193DF0(TiGoras* this) { this->obj.status = OBJ_DYING; D_i5_801BBEF4[12] = 0.0f; this->fwork[35] = 0.0f; - this->unk_044 = 0; + this->work_044 = 0; this->timer_050 = 280; D_i5_801BBEF0[16] = 0; D_i5_801BBEF0[17] = 0; @@ -5477,7 +5477,7 @@ void Titania_801990DC(TiGoras* this) { Vec3f sp60; Actor* actor; - if (this->unk_044 == 0) { + if (this->work_044 == 0) { AUDIO_PLAY_SFX(NA_SE_EN_TIBOSS_DW_CRY, this->sfxSource, 4); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 50); @@ -5501,8 +5501,8 @@ void Titania_801990DC(TiGoras* this) { if (actor != NULL) { actor->state = 40; - actor->unk_046 = D_i5_801B7770[i][5]; - actor->unk_048 = D_i5_801B7770[i][1]; + actor->work_046 = D_i5_801B7770[i][5]; + actor->work_048 = D_i5_801B7770[i][1]; Matrix_RotateY(gCalcMatrix, this->obj.rot.y * M_DTOR, MTXF_NEW); Matrix_MultVec3f(gCalcMatrix, &D_i5_801BBF00[i].unk_00.pos, &sp60); @@ -5536,7 +5536,7 @@ void Titania_801990DC(TiGoras* this) { D_i5_801BBF00[i].unk_26 = 4; } } - this->unk_044 = 1; + this->work_044 = 1; } else { this->obj.pos.z = gPlayer[0].pos.z; } @@ -5550,9 +5550,9 @@ void Titania_801990DC(TiGoras* this) { actor->state = 40; - actor->unk_046 = 25; - actor->unk_048 = 0; - actor->unk_04A = 4 | 2; + actor->work_046 = 25; + actor->work_048 = 0; + actor->work_04A = 4 | 2; actor->fwork[3] = 0.0f; actor->fwork[4] = -200.0f; @@ -5577,9 +5577,9 @@ void Titania_801990DC(TiGoras* this) { actor->state = 40; - actor->unk_046 = 2; - actor->unk_048 = 1; - actor->unk_04A = 4 | 2; + actor->work_046 = 2; + actor->work_048 = 1; + actor->work_04A = 4 | 2; actor->iwork[1] = (s32) 1; actor->fwork[3] = -150.0f; @@ -5604,9 +5604,9 @@ void Titania_801990DC(TiGoras* this) { actor->state = 40; - actor->unk_046 = 2; - actor->unk_048 = 1; - actor->unk_04A = 4 | 2; + actor->work_046 = 2; + actor->work_048 = 1; + actor->work_04A = 4 | 2; actor->iwork[1] = 2; actor->fwork[3] = 100.0f; diff --git a/src/overlays/ovl_i6/fox_andross.c b/src/overlays/ovl_i6/fox_andross.c index ffb856b0..09eecb5b 100644 --- a/src/overlays/ovl_i6/fox_andross.c +++ b/src/overlays/ovl_i6/fox_andross.c @@ -32,14 +32,14 @@ void Andross_80193710(void); void Andross_80187530(ActorEvent* this) { s32 index; - switch (this->unk_048) { + switch (this->work_048) { case 0: break; case 1: this->animFrame += (s32) this->fwork[22]; - if (this->animFrame >= Animation_GetFrameCount(&D_VE2_6014658)) { - this->animFrame = Animation_GetFrameCount(&D_VE2_6014658) - 1; + if (this->animFrame >= Animation_GetFrameCount(&aVe2AndrossGateAnim)) { + this->animFrame = Animation_GetFrameCount(&aVe2AndrossGateAnim) - 1; } break; @@ -59,18 +59,19 @@ void Andross_80187530(ActorEvent* this) { this->obj.rot.z = D_Andross_801A7F68; } -bool Andross_8018767C(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* thisx) { +bool Andross_Gate_OverrideLimbDraw(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* thisx) { if (limbIndex == 13) { *dList = NULL; } return 0; } -void Andross_8018769C(ActorEvent* this) { +void Andross_Gate_Draw(ActorEvent* this) { Vec3f frameTable[20]; - Animation_GetFrameData(&D_VE2_6014658, this->animFrame, frameTable); - Animation_DrawSkeleton(1, D_VE2_6014844, frameTable, Andross_8018767C, NULL, NULL, &gIdentityMatrix); + Animation_GetFrameData(&aVe2AndrossGateAnim, this->animFrame, frameTable); + Animation_DrawSkeleton(1, aVe2AndrossGateSkel, frameTable, Andross_Gate_OverrideLimbDraw, NULL, NULL, + &gIdentityMatrix); } void Andross_801876FC(void) { @@ -2545,7 +2546,7 @@ void Andross_AndAndross_Update(AndAndross* this) { if ((this->animFrame == 45) && (this->swork[8] == 2)) { this->state = 18; this->animFrame = 0; - this->unk_044 = 0; + this->work_044 = 0; this->timer_050 = 40; this->fwork[9] = 0.0f; } @@ -2739,13 +2740,13 @@ void Andross_AndAndross_Update(AndAndross* this) { Math_SmoothStepToF(&this->fwork[9], 1.0f, 1.0f, 0.05f, 0); - switch (this->unk_044) { + switch (this->work_044) { case 0: if (this->timer_050 != 0) { limbCount = Animation_GetFrameData(&D_ANDROSS_C00DE48, 45, spD0); Math_SmoothStepToVec3fArray(spD0, D_i6_801A7F80, 1, limbCount, this->fwork[9], 100.0f, 0.0f); } else { - this->unk_044 = 1; + this->work_044 = 1; this->timer_050 = 30; this->swork[9] = 20; this->fwork[9] = 0.0f; @@ -2759,7 +2760,7 @@ void Andross_AndAndross_Update(AndAndross* this) { limbCount = Animation_GetFrameData(&D_ANDROSS_C017430, 0, spD0); Math_SmoothStepToVec3fArray(spD0, D_i6_801A7F80, 1, limbCount, this->fwork[9], 100.0f, 0.0f); } else { - this->unk_044 = 2; + this->work_044 = 2; this->timer_050 = 70; this->fwork[9] = 0.0f; AUDIO_PLAY_SFX(NA_SE_VO_ANDROSS_EXCITE, this->sfxSource, 4); @@ -3661,8 +3662,8 @@ void Andross_AndDoor_Update(AndDoor* this) { this->info.hitbox[17] = -130.0f - (this->unk_44 * 1.6f); this->info.hitbox[27] = -130.0f - (this->unk_44 * 1.6f); this->unk_44 += 2; - if (this->unk_44 >= Animation_GetFrameCount(&D_VE2_6014658)) { - this->unk_44 = Animation_GetFrameCount(&D_VE2_6014658) - 1; + if (this->unk_44 >= Animation_GetFrameCount(&aVe2AndrossGateAnim)) { + this->unk_44 = Animation_GetFrameCount(&aVe2AndrossGateAnim) - 1; } break; } @@ -3679,8 +3680,8 @@ bool Andross_801934EC(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* void Andross_AndDoor_Draw(AndDoor* this) { Vec3f frameTable[20]; - Animation_GetFrameData(&D_VE2_6014658, this->unk_44, frameTable); - Animation_DrawSkeleton(1, D_VE2_6014844, frameTable, Andross_801934EC, NULL, NULL, &gIdentityMatrix); + Animation_GetFrameData(&aVe2AndrossGateAnim, this->unk_44, frameTable); + Animation_DrawSkeleton(1, aVe2AndrossGateSkel, frameTable, Andross_801934EC, NULL, NULL, &gIdentityMatrix); } void Andross_AndPassage_Update(AndPassage* this) { @@ -3701,11 +3702,11 @@ bool Andross_801935B4(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* void Andross_AndPassage_Draw(AndPassage* this) { Vec3f frameTable[20]; - Animation_GetFrameData(&D_VE2_6014658, this->unk_44, frameTable); + Animation_GetFrameData(&aVe2AndrossGateAnim, this->unk_44, frameTable); if (gLevelMode == LEVELMODE_ALL_RANGE) { gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK); } - Animation_DrawSkeleton(1, D_VE2_6014844, frameTable, Andross_801935B4, NULL, NULL, &gIdentityMatrix); + Animation_DrawSkeleton(1, aVe2AndrossGateSkel, frameTable, Andross_801935B4, NULL, NULL, &gIdentityMatrix); } void Andross_AndPassage_Setup(AndPassage* this, f32 xPos, f32 yPos, f32 zPos, s32 arg4) { @@ -3791,7 +3792,7 @@ void Andross_801939A0(s32 actorIndex) { } if (actorIndex == 1) { actor->state = 1; - actor->unk_046 = 255; + actor->work_046 = 255; actor->animFrame = 1000; } @@ -4442,9 +4443,9 @@ void Andross_80195E44(ActorCutscene* this) { case 2: Math_SmoothStepToF(&this->rot_0F4.x, 180.0f, 0.1f, 1.0f, 0.0f); Math_SmoothStepToF(&this->rot_0F4.y, 200.0f, 0.1f, 1.0f, 0.0f); - this->unk_046 -= 5; - if (this->unk_046 < 0) { - this->unk_046 = 0; + this->work_046 -= 5; + if (this->work_046 < 0) { + this->work_046 = 0; Object_Kill(&this->obj, this->sfxSource); } break; diff --git a/src/overlays/ovl_i6/fox_sy.c b/src/overlays/ovl_i6/fox_sy.c index 9e719808..1b94f002 100644 --- a/src/overlays/ovl_i6/fox_sy.c +++ b/src/overlays/ovl_i6/fox_sy.c @@ -49,7 +49,7 @@ void SectorY_80197B30(ActorCutscene* this, s32 timer) { this->obj.rot.z = gPlayer[0].rot.z; this->state = 5; - this->timer_04C = timer; + this->work_04C = timer; this->iwork[11] = 1; Object_SetInfo(&this->info, this->obj.id); AUDIO_PLAY_SFX(NA_SE_ARWING_ENGINE_FG, this->sfxSource, 4); @@ -625,8 +625,8 @@ void SectorY_80199438(SyShogun* this) { if (this->index != 0) { Object_Kill(&gActors[D_ctx_80177A10[9]].obj, gActors[D_ctx_80177A10[9]].sfxSource); if ((gBosses[1].obj.status == OBJ_FREE) || (gBosses[2].obj.status == OBJ_FREE)) { - gBosses[0].unk_04A = 1; - gScenery360[0].info.dList = D_SY_601F3D0; + gBosses[0].work_04A = 1; + gScenery360[0].info.dList = aSySaruzinDL; gScenery360[0].info.drawType = 0; } else { gPlayer[0].state_1C8 = PLAYERSTATE_1C8_ACTIVE; @@ -1002,15 +1002,15 @@ void SectorY_8019AEC0(SyShogun* this) { this->vel.x = 0.0f; this->vel.y = 0.0f; this->vel.z = 0.0f; - this->unk_044 = 0; + this->work_044 = 0; } void SectorY_8019AEEC(SyShogun* this) { if ((this->obj.pos.y != 365.0f) && (this->swork[21] != 1)) { - if (this->unk_04A != 0) { - if (this->unk_04A == 1) { + if (this->work_04A != 0) { + if (this->work_04A == 1) { Audio_PlaySequence(SEQ_PLAYER_BGM, NA_BGM_REAL_BOSS, 0, 0); - this->unk_04A++; + this->work_04A++; gPlayer[0].cam.eye.x = 0.0f; gPlayer[0].cam.eye.y = 200.0f; gPlayer[0].cam.eye.z = -20000.0f; @@ -1696,7 +1696,7 @@ void SectorY_SyShogun_Update(SyShogun* this) { if ((gBossFrameCount >= 350) || (this->swork[34] != 0)) { if (this->swork[34] != 0) { gBossHealthBar = this->health * 1.7f; - } else if (gBosses[0].unk_04A == 0) { + } else if (gBosses[0].work_04A == 0) { gBossHealthBar = (gBosses[1].health + gBosses[2].health) * 1.275f; } } @@ -2027,9 +2027,9 @@ void SectorY_8019EB80(void) { s32 actorCount; if (gHitCount >= 100) { - actorCount = 9; + actorCount = 9; // Teammates + Cornerian ships } else { - actorCount = 2; + actorCount = 2; // Teammates only } Rand_SetSeed(1, 29100, 9786); @@ -2437,8 +2437,8 @@ void SectorY_8019FF00(ActorCutscene* this) { case 5: Math_SmoothStepToF(&this->rot_0F4.x, 0.0f, 0.1f, 5.0f, 0.0f); - x = this->obj.pos.x - gBosses[this->timer_04C].obj.pos.x; - z = this->obj.pos.z - gBosses[this->timer_04C].obj.pos.z; + x = this->obj.pos.x - gBosses[this->work_04C].obj.pos.x; + z = this->obj.pos.z - gBosses[this->work_04C].obj.pos.z; Math_SmoothStepToAngle( &this->rot_0F4.z, Math_SmoothStepToAngle(&this->rot_0F4.y, Math_RadToDeg(Math_Atan2F(x, z)), 0.5f, 2.0f, 0.0001f) * 30.0f, @@ -3496,74 +3496,74 @@ void SectorY_SyRobot_Update(SyRobot* this) { this->iwork[18]--; } - if ((this->unk_048 != 0) && (this->unk_046 != 3)) { - switch (this->unk_048) { + if ((this->work_048 != 0) && (this->work_046 != 3)) { + switch (this->work_048) { case 1: - this->unk_046 = 1; + this->work_046 = 1; this->timer_0BE = 50; this->iwork[19] = 0; break; case 2: - this->unk_046 = 1; + this->work_046 = 1; this->timer_0BE = 20; this->iwork[19] = 0; break; case 3: - this->unk_046 = 2; + this->work_046 = 2; this->animFrame = 0; break; case 4: - this->unk_046 = 0; + this->work_046 = 0; this->animFrame = 0; break; case 8: - this->unk_046 = 1; + this->work_046 = 1; this->timer_0BE = 50; this->iwork[19] = 1; break; case 9: - this->unk_046 = 1; + this->work_046 = 1; this->timer_0BE = 20; this->iwork[19] = 1; break; case 10: - this->unk_046 = 1; + this->work_046 = 1; this->timer_0BE = 50; this->iwork[19] = -1; break; case 11: - this->unk_046 = 1; + this->work_046 = 1; this->timer_0BE = 20; this->iwork[19] = -1; break; case 6: - this->unk_046 = 4; + this->work_046 = 4; this->animFrame = 0; break; case 5: - this->unk_046 = 5; + this->work_046 = 5; this->animFrame = Animation_GetFrameCount(&D_SY_602B778) - 1; break; case 7: - this->unk_046 = 6; + this->work_046 = 6; this->animFrame = Animation_GetFrameCount(&D_SY_602B778) - 1; break; } - this->unk_048 = 0; + this->work_048 = 0; this->fwork[15] = 0.0f; } - switch (this->unk_046) { + switch (this->work_046) { case 0: i = this->iwork[17]; if (i != 0) { @@ -3612,12 +3612,12 @@ void SectorY_SyRobot_Update(SyRobot* this) { gPlayer[0].pos.y = sp1E0; AUDIO_PLAY_SFX(NA_SE_EN_MS_SHOT_S, this->sfxSource, 4); } - this->unk_048 = 0; + this->work_048 = 0; } if (this->timer_0BE == 0) { this->animFrame = 0; - this->unk_046 = 0; + this->work_046 = 0; this->fwork[15] = 0.0f; } break; @@ -3632,7 +3632,7 @@ void SectorY_SyRobot_Update(SyRobot* this) { case 4: this->animFrame++; if (this->animFrame >= (Animation_GetFrameCount(&D_SY_602B778) - 1)) { - this->unk_046 = 0; + this->work_046 = 0; this->iwork[17] = 0; this->fwork[15] = 0.0f; } @@ -3644,12 +3644,12 @@ void SectorY_SyRobot_Update(SyRobot* this) { this->animFrame--; if (this->animFrame < 8) { this->fwork[15] = 0.1f; - if (this->unk_046 == 5) { + if (this->work_046 == 5) { this->iwork[17] = 1; } else { this->iwork[17] = 2; } - this->unk_046 = 0; + this->work_046 = 0; } sp4C = Animation_GetFrameData(&D_SY_602B778, this->animFrame, sp68); break; @@ -3686,7 +3686,7 @@ void SectorY_SyRobot_Update(SyRobot* this) { break; } - if ((this->unk_046 == 1) || (this->unk_046 == 2)) { + if ((this->work_046 == 1) || (this->work_046 == 2)) { Matrix_RotateZ(gCalcMatrix, -this->vwork[29].z * M_DTOR, MTXF_NEW); Matrix_RotateX(gCalcMatrix, -this->vwork[29].x * M_DTOR, MTXF_APPLY); Matrix_RotateY(gCalcMatrix, -this->vwork[29].y * M_DTOR, MTXF_APPLY); @@ -3740,7 +3740,7 @@ void SectorY_SyRobot_Update(SyRobot* this) { Math_SmoothStepToAngle(&this->fwork[29], sp1D8, 0.2f, 5.0f, 0.0f); Math_SmoothStepToVec3fArray(sp68, this->vwork, 1, sp4C, this->fwork[15], 100.0f, 0.0f); - if ((this->unk_046 == 6) || (this->unk_046 == 5)) { + if ((this->work_046 == 6) || (this->work_046 == 5)) { Math_SmoothStepToF(&this->fwork[15], 0.3f, 1.0f, 0.05f, 0.0f); } else { Math_SmoothStepToF(&this->fwork[15], 0.2f, 1.0f, 0.015f, 0.0f); @@ -3754,23 +3754,23 @@ void SectorY_SyRobot_Update(SyRobot* this) { } this->info.hitbox = SEGMENTED_TO_VIRTUAL(aSyRobotHitbox); - if (this->unk_046 == 1) { + if (this->work_046 == 1) { this->info.hitbox = SEGMENTED_TO_VIRTUAL(D_SY_603421C); } i = this->iwork[17]; if (i != 0) { if (i == 1) { - this->info.hitbox = SEGMENTED_TO_VIRTUAL(D_SY_6034124); + this->info.hitbox = SEGMENTED_TO_VIRTUAL(aSyRobot4Hitbox); } else if (i == 2) { this->info.hitbox = SEGMENTED_TO_VIRTUAL(D_SY_60341A8); } } - if (this->unk_046 == 2) { + if (this->work_046 == 2) { this->info.hitbox = SEGMENTED_TO_VIRTUAL(D_SY_60340C0); } - if ((this->dmgType != DMG_NONE) && (this->unk_046 != 3)) { + if ((this->dmgType != DMG_NONE) && (this->work_046 != 3)) { if (this->dmgType == DMG_EXPLOSION) { this->dmgPart = 1; @@ -3788,8 +3788,8 @@ void SectorY_SyRobot_Update(SyRobot* this) { this->health -= this->damage; if (this->health <= 0) { - this->unk_046 = 3; - this->unk_048 = 0; + this->work_046 = 3; + this->work_048 = 0; this->animFrame = 0; this->timer_0BE = 50; this->fwork[15] = 0.0f; @@ -3828,7 +3828,7 @@ bool SectorY_SyRobot_OverrideLimbDraw(s32 limbIndex, Gfx** dList, Vec3f* pos, Ve if (limbIndex == 17) { rot->x += actor->fwork[28]; rot->y -= actor->fwork[29]; - if (actor->eventType == EVID_48) { + if (actor->eventType == EVID_SY_ROBOT_1) { *dList = D_SY_6014BD0; } } diff --git a/src/overlays/ovl_menu/fox_map.c b/src/overlays/ovl_menu/fox_map.c index 76e07b7f..4a81f05f 100644 --- a/src/overlays/ovl_menu/fox_map.c +++ b/src/overlays/ovl_menu/fox_map.c @@ -6254,7 +6254,7 @@ void Map_801AC530(s32 index) { Lights_SetOneLight(&gMasterDisp, dirX, dirY, dirZ, 50, 50, 40, 0, 0, 0); - gSPDisplayList(gMasterDisp++, D_MAP_604A9F0); + gSPDisplayList(gMasterDisp++, aMapArwingDL); Matrix_Pop(&gGfxMatrix); } diff --git a/src/overlays/ovl_menu/fox_option.c b/src/overlays/ovl_menu/fox_option.c index 7e5073a0..8487f7ec 100644 --- a/src/overlays/ovl_menu/fox_option.c +++ b/src/overlays/ovl_menu/fox_option.c @@ -93,12 +93,12 @@ f32 D_menu_801B921C; f32 D_menu_801B9220; f32 D_menu_801B9224; f32 D_menu_801B9228; -s32 D_menu_801B922C; -s32 D_menu_801B9230; -s32 D_menu_801B9234; -s32 D_menu_801B9238; -s32 D_menu_801B923C; -s32 D_menu_801B9240; +s32 sArwingLightColR; // colR +s32 sArwingLightColG; // colG +s32 sArwingLightColB; // colB +s32 sArwingLightAmbR; // ambR +s32 sArwingLightAmbG; // ambG +s32 sArwingLightAmbB; // ambB s32 D_menu_801B9244; s32 D_menu_801B9248; u8 D_menu_801B924C; @@ -113,7 +113,7 @@ UnkStruct_D_menu_801B9250 D_menu_801B9290; f32 D_menu_801B9298[32]; s32 spectrumAnalyzerMode; s32 D_menu_801B931C; -bool D_menu_801B9320; // MusicPlaying status in the expert sound options +bool sMusicPlaying; // MusicPlaying status in the expert sound options extern s32 BSS_PAD_0; s32 D_menu_801B9330[2]; s32 D_menu_801B933C; @@ -156,11 +156,11 @@ struct BssPad1 { // struct BssPad4 {int x;}; extern s32 BSS_PAD_2; -static f32 sOptionCardPosY[] = { 60.0f, 36.0f, 12.0f, -12.0f, -36.0f, -60.0f }; // D_menu_801AE570 -static f32 sOptionCardTextPosX[] = { 124.0f, 118.0f, 145.0f, 125.0f, 133.0f, 118.0f }; // D_menu_801AE588 -static f32 sOptionCardTextPosY[] = { 54.0f, 78.0f, 103.0f, 126.0f, 151.0f, 175.0f }; // D_menu_801AE5A0 -static f32 sOptionCardCurTextPosX[] = { 124.0f, 118.0f, 145.0f, 125.0f, 133.0f, 118.0f }; // D_menu_801AE5B8 -static f32 sOptionCardCurTextPosY[] = { 54.0f, 78.0f, 103.0f, 126.0f, 151.0f, 175.0f }; // D_menu_801AE5D0 +static f32 sOptionCardPosY[] = { 60.0f, 36.0f, 12.0f, -12.0f, -36.0f, -60.0f }; +static f32 sOptionCardTextPosX[] = { 124.0f, 118.0f, 145.0f, 125.0f, 133.0f, 118.0f }; +static f32 sOptionCardTextPosY[] = { 54.0f, 78.0f, 103.0f, 126.0f, 151.0f, 175.0f }; +static f32 sOptionCardCurTextPosX[] = { 124.0f, 118.0f, 145.0f, 125.0f, 133.0f, 118.0f }; +static f32 sOptionCardCurTextPosY[] = { 54.0f, 78.0f, 103.0f, 126.0f, 151.0f, 175.0f }; static f32 D_menu_801AE5E8[] = { 124.0f, 125.0f }; static f32 D_menu_801AE5F0[] = { 54.0f, 55.0f }; static f32 D_menu_801AE5F8[] = { 133.0f, 125.0f }; @@ -376,12 +376,12 @@ void Option_Setup(void) { #endif gVIsPerFrame = 2; - sOptionCardList[0].unk_00.unk_08 = D_OPT_8003B50; - sOptionCardList[0].unk_00.unk_10 = 72; - sOptionCardList[0].unk_00.unk_14 = 12; - sOptionCardList[4].unk_00.unk_08 = D_OPT_80046B0; - sOptionCardList[4].unk_00.unk_10 = 64; - sOptionCardList[4].unk_00.unk_14 = 10; + sOptionCardList[0].unk_00.texture = D_OPT_8003B50; + sOptionCardList[0].unk_00.width = 72; + sOptionCardList[0].unk_00.height = 12; + sOptionCardList[4].unk_00.texture = D_OPT_80046B0; + sOptionCardList[4].unk_00.width = 64; + sOptionCardList[4].unk_00.height = 10; for (i = 0; i < OPTION_COUNT; i++) { sOptionCardCurTextPosX[i] = sOptionCardTextPosX[i]; @@ -474,30 +474,30 @@ void Option_Setup(void) { if (i == 2) { continue; } - sOptionCardList[i].unk_38.unk_0C = 0.01f; - sOptionCardList[i].unk_38.unk_10 = 0.21f; - sOptionCardList[i].unk_38.unk_04 = sOptionCardPosY[i]; - sOptionCardList[i].unk_38.unk_00 = 0.0f; - sOptionCardList[i].unk_38.unk_08 = 0.0f; - sOptionCardList[i].unk_5C = 0; - - sOptionCardList[i].unk_00.unk_20 = 0.01f; - sOptionCardList[i].unk_00.unk_24 = 1.0f; - sOptionCardList[i].unk_00.unk_18 = 158.0f; - sOptionCardList[i].unk_00.unk_1C = sOptionCardCurTextPosY[i]; - sOptionCardList[i].unk_58 = 0; + sOptionCardList[i].unk_38.xScale = 0.01f; + sOptionCardList[i].unk_38.yScale = 0.21f; + sOptionCardList[i].unk_38.y = sOptionCardPosY[i]; + sOptionCardList[i].unk_38.x = 0.0f; + sOptionCardList[i].unk_38.z = 0.0f; + sOptionCardList[i].unk_5C = false; + + sOptionCardList[i].unk_00.xScale = 0.01f; + sOptionCardList[i].unk_00.yScale = 1.0f; + sOptionCardList[i].unk_00.xPos = 158.0f; + sOptionCardList[i].unk_00.yPos = sOptionCardCurTextPosY[i]; + sOptionCardList[i].unk_58 = false; } - sOptionCardList[2].unk_38.unk_00 = 0.0f; - sOptionCardList[2].unk_38.unk_08 = 0.0f; - sOptionCardList[2].unk_38.unk_04 = 90.0f; - sOptionCardList[2].unk_38.unk_0C = 0.4f; - sOptionCardList[2].unk_38.unk_10 = 0.21f; - sOptionCardList[2].unk_5C = 1; - sOptionCardList[2].unk_00.unk_20 = 1.0f; - sOptionCardList[2].unk_00.unk_24 = 1.0f; - sOptionCardList[2].unk_00.unk_18 = 145.0f; - sOptionCardList[2].unk_00.unk_1C = 25.0f; - sOptionCardList[2].unk_58 = 1; + sOptionCardList[2].unk_38.x = 0.0f; + sOptionCardList[2].unk_38.z = 0.0f; + sOptionCardList[2].unk_38.y = 90.0f; + sOptionCardList[2].unk_38.xScale = 0.4f; + sOptionCardList[2].unk_38.yScale = 0.21f; + sOptionCardList[2].unk_5C = true; + sOptionCardList[2].unk_00.xScale = 1.0f; + sOptionCardList[2].unk_00.yScale = 1.0f; + sOptionCardList[2].unk_00.xPos = 145.0f; + sOptionCardList[2].unk_00.yPos = 25.0f; + sOptionCardList[2].unk_58 = true; D_menu_801B9124 = OPTION_VERSUS; } else { @@ -527,12 +527,12 @@ void Option_Setup(void) { D_menu_801B9224 = -80.0f; D_menu_801B9228 = 0.0f; - D_menu_801B922C = 225; - D_menu_801B9230 = 225; - D_menu_801B9234 = 225; - D_menu_801B9238 = 30; - D_menu_801B923C = 30; - D_menu_801B9240 = 30; + sArwingLightColR = 225; + sArwingLightColG = 225; + sArwingLightColB = 225; + sArwingLightAmbR = 30; + sArwingLightAmbG = 30; + sArwingLightAmbB = 30; D_menu_801B91F8 = 0.1f; D_menu_801B91F4 = -130.0f; @@ -826,26 +826,26 @@ void Option_801929F0(void) { if (D_menu_801B9244 == 0) { D_menu_801B91BC = 1; for (i = 0; i < OPTION_COUNT; i++) { - sOptionCardList[i].unk_00.unk_18 = sOptionCardCurTextPosX[i]; - sOptionCardList[i].unk_00.unk_1C = sOptionCardCurTextPosY[i]; - sOptionCardList[i].unk_00.unk_20 = 1.0f; - sOptionCardList[i].unk_00.unk_24 = 1.0f; - sOptionCardList[i].unk_58 = 1; - - sOptionCardList[i].unk_38.unk_0C = 0.4f; - sOptionCardList[i].unk_38.unk_10 = 0.21f; - sOptionCardList[i].unk_38.unk_04 = sOptionCardPosY[i]; - sOptionCardList[i].unk_38.unk_08 = 0.0f; - sOptionCardList[i].unk_5C = 1; + sOptionCardList[i].unk_00.xPos = sOptionCardCurTextPosX[i]; + sOptionCardList[i].unk_00.yPos = sOptionCardCurTextPosY[i]; + sOptionCardList[i].unk_00.xScale = 1.0f; + sOptionCardList[i].unk_00.yScale = 1.0f; + sOptionCardList[i].unk_58 = true; + + sOptionCardList[i].unk_38.xScale = 0.4f; + sOptionCardList[i].unk_38.yScale = 0.21f; + sOptionCardList[i].unk_38.y = sOptionCardPosY[i]; + sOptionCardList[i].unk_38.z = 0.0f; + sOptionCardList[i].unk_5C = true; } } else { D_menu_801B91BC = 0; for (i = 0; i < OPTION_COUNT; i++) { - sOptionCardList[i].unk_00.unk_24 = 1.0f; - sOptionCardList[i].unk_38.unk_10 = 0.21f; - sOptionCardList[i].unk_38.unk_08 = 0.0f; - sOptionCardList[i].unk_5C = 1; - sOptionCardList[i].unk_58 = 1; + sOptionCardList[i].unk_00.yScale = 1.0f; + sOptionCardList[i].unk_38.yScale = 0.21f; + sOptionCardList[i].unk_38.z = 0.0f; + sOptionCardList[i].unk_5C = true; + sOptionCardList[i].unk_58 = true; } } @@ -881,32 +881,32 @@ void Option_MainMenuUpdate(void) { case 1000: for (i = 0; i < OPTION_COUNT; i++) { - if (sOptionCardList[i].unk_38.unk_0C < 0.4f) { - sOptionCardList[i].unk_38.unk_0C += 0.04f; - if (sOptionCardList[i].unk_38.unk_0C > 0.4f) { - sOptionCardList[i].unk_38.unk_0C = 0.4f; + if (sOptionCardList[i].unk_38.xScale < 0.4f) { + sOptionCardList[i].unk_38.xScale += 0.04f; + if (sOptionCardList[i].unk_38.xScale > 0.4f) { + sOptionCardList[i].unk_38.xScale = 0.4f; } } - if (sOptionCardList[i].unk_00.unk_20 < 1.0f) { - sOptionCardList[i].unk_00.unk_20 += 0.1f; - if (sOptionCardList[i].unk_00.unk_20 > 1.0f) { - sOptionCardList[i].unk_00.unk_20 = 1.0f; + if (sOptionCardList[i].unk_00.xScale < 1.0f) { + sOptionCardList[i].unk_00.xScale += 0.1f; + if (sOptionCardList[i].unk_00.xScale > 1.0f) { + sOptionCardList[i].unk_00.xScale = 1.0f; } } - Math_SmoothStepToF(&sOptionCardList[i].unk_00.unk_1C, sOptionCardCurTextPosY[i], 0.15f, 100.0f, 0.1f); - Math_SmoothStepToF(&sOptionCardList[i].unk_38.unk_04, sOptionCardPosY[i], 0.15f, 100.0f, 0.1f); - Math_SmoothStepToF(&sOptionCardList[i].unk_00.unk_18, sOptionCardCurTextPosX[i], 0.2f, - D_menu_801AE620[i], 0.1f); + Math_SmoothStepToF(&sOptionCardList[i].unk_00.yPos, sOptionCardCurTextPosY[i], 0.15f, 100.0f, 0.1f); + Math_SmoothStepToF(&sOptionCardList[i].unk_38.y, sOptionCardPosY[i], 0.15f, 100.0f, 0.1f); + Math_SmoothStepToF(&sOptionCardList[i].unk_00.xPos, sOptionCardCurTextPosX[i], 0.2f, D_menu_801AE620[i], + 0.1f); } gBlurAlpha += 4; - if (sOptionCardList[D_menu_801B91A4].unk_38.unk_04 == sOptionCardPosY[D_menu_801B91A4]) { + if (sOptionCardList[D_menu_801B91A4].unk_38.y == sOptionCardPosY[D_menu_801B91A4]) { for (i = 0; i < OPTION_COUNT; i++) { - sOptionCardList[i].unk_00.unk_20 = 1.0f; - sOptionCardList[i].unk_00.unk_18 = sOptionCardCurTextPosX[i]; - sOptionCardList[i].unk_00.unk_1C = sOptionCardCurTextPosY[i]; + sOptionCardList[i].unk_00.xScale = 1.0f; + sOptionCardList[i].unk_00.xPos = sOptionCardCurTextPosX[i]; + sOptionCardList[i].unk_00.yPos = sOptionCardCurTextPosY[i]; } D_menu_801B91BC = 1; gBlurAlpha = 255; @@ -925,17 +925,17 @@ void Option_MainMenuUpdate(void) { Option_8019C418(&D_menu_801B91B0, 1, 0, 0, 20, 5, 4, gMainController, &D_menu_801B9190)) { AUDIO_PLAY_SFX(NA_SE_ARWING_CURSOR, gDefaultSfxSource, 4); if (D_menu_801B91B0) { - sOptionCardList[0].unk_00.unk_08 = D_OPT_8004C50; - sOptionCardList[0].unk_00.unk_10 = 80; - sOptionCardList[0].unk_00.unk_14 = 12; - sOptionCardList[0].unk_00.unk_18 = 125.0f; - sOptionCardList[0].unk_00.unk_1C = 55.0f; + sOptionCardList[0].unk_00.texture = D_OPT_8004C50; + sOptionCardList[0].unk_00.width = 80; + sOptionCardList[0].unk_00.height = 12; + sOptionCardList[0].unk_00.xPos = 125.0f; + sOptionCardList[0].unk_00.yPos = 55.0f; } else { - sOptionCardList[0].unk_00.unk_08 = D_OPT_8003B50; - sOptionCardList[0].unk_00.unk_10 = 72; - sOptionCardList[0].unk_00.unk_14 = 12; - sOptionCardList[0].unk_00.unk_18 = 124.0f; - sOptionCardList[0].unk_00.unk_1C = 54.0f; + sOptionCardList[0].unk_00.texture = D_OPT_8003B50; + sOptionCardList[0].unk_00.width = 72; + sOptionCardList[0].unk_00.height = 12; + sOptionCardList[0].unk_00.xPos = 124.0f; + sOptionCardList[0].unk_00.yPos = 54.0f; } gExpertMode = D_menu_801B91B0; } @@ -944,17 +944,17 @@ void Option_MainMenuUpdate(void) { Option_8019C418(&D_menu_801B91AC, 1, 0, 0, 20, 5, 4, gMainController, &D_menu_801B9198)) { AUDIO_PLAY_SFX(NA_SE_ARWING_CURSOR, gDefaultSfxSource, 4); if (D_menu_801B91AC) { - sOptionCardList[4].unk_00.unk_08 = D_OPT_8004C50; - sOptionCardList[4].unk_00.unk_10 = 80; - sOptionCardList[4].unk_00.unk_14 = 12; - sOptionCardList[4].unk_00.unk_18 = 125.0f; - sOptionCardList[4].unk_00.unk_1C = 151.0f; + sOptionCardList[4].unk_00.texture = D_OPT_8004C50; + sOptionCardList[4].unk_00.width = 80; + sOptionCardList[4].unk_00.height = 12; + sOptionCardList[4].unk_00.xPos = 125.0f; + sOptionCardList[4].unk_00.yPos = 151.0f; } else { - sOptionCardList[4].unk_00.unk_08 = D_OPT_80046B0; - sOptionCardList[4].unk_00.unk_10 = 64; - sOptionCardList[4].unk_00.unk_14 = 10; - sOptionCardList[4].unk_00.unk_18 = 133.0f; - sOptionCardList[4].unk_00.unk_1C = 151.0f; + sOptionCardList[4].unk_00.texture = D_OPT_80046B0; + sOptionCardList[4].unk_00.width = 64; + sOptionCardList[4].unk_00.height = 10; + sOptionCardList[4].unk_00.xPos = 133.0f; + sOptionCardList[4].unk_00.yPos = 151.0f; } } @@ -975,22 +975,22 @@ void Option_MainMenuUpdate(void) { case 11: gBlurAlpha = 16; D_menu_801B9178 = 3; - sOptionCardList[D_menu_801B91A4].unk_38.unk_0C -= 0.01f; - sOptionCardList[D_menu_801B91A4].unk_38.unk_10 -= 0.01f; - sOptionCardList[D_menu_801B91A4].unk_00.unk_20 -= 0.1f; - sOptionCardList[D_menu_801B91A4].unk_00.unk_24 -= 0.1f; - sOptionCardList[D_menu_801B91A4].unk_00.unk_18 += 4.0f; + sOptionCardList[D_menu_801B91A4].unk_38.xScale -= 0.01f; + sOptionCardList[D_menu_801B91A4].unk_38.yScale -= 0.01f; + sOptionCardList[D_menu_801B91A4].unk_00.xScale -= 0.1f; + sOptionCardList[D_menu_801B91A4].unk_00.yScale -= 0.1f; + sOptionCardList[D_menu_801B91A4].unk_00.xPos += 4.0f; D_menu_801B917C = 3; D_menu_801B912C++; break; case 12: if (D_menu_801B9178 == 1) { - sOptionCardList[D_menu_801B91A4].unk_38.unk_0C += 0.01f; - sOptionCardList[D_menu_801B91A4].unk_38.unk_10 += 0.01f; - sOptionCardList[D_menu_801B91A4].unk_00.unk_20 += 0.1f; - sOptionCardList[D_menu_801B91A4].unk_00.unk_24 += 0.1f; - sOptionCardList[D_menu_801B91A4].unk_00.unk_18 -= 4.0f; + sOptionCardList[D_menu_801B91A4].unk_38.xScale += 0.01f; + sOptionCardList[D_menu_801B91A4].unk_38.yScale += 0.01f; + sOptionCardList[D_menu_801B91A4].unk_00.xScale += 0.1f; + sOptionCardList[D_menu_801B91A4].unk_00.yScale += 0.1f; + sOptionCardList[D_menu_801B91A4].unk_00.xPos -= 4.0f; D_menu_801B9214 = 1; } @@ -999,13 +999,13 @@ void Option_MainMenuUpdate(void) { continue; } - if (sOptionCardList[i].unk_38.unk_0C > 0.01f) { - sOptionCardList[i].unk_38.unk_0C -= 0.05f; - sOptionCardList[i].unk_00.unk_20 -= 0.19f; - Math_SmoothStepToF(&sOptionCardList[i].unk_00.unk_18, 158.0f, 0.2f, D_menu_801AE608[i], 0.1f); + if (sOptionCardList[i].unk_38.xScale > 0.01f) { + sOptionCardList[i].unk_38.xScale -= 0.05f; + sOptionCardList[i].unk_00.xScale -= 0.19f; + Math_SmoothStepToF(&sOptionCardList[i].unk_00.xPos, 158.0f, 0.2f, D_menu_801AE608[i], 0.1f); } else { - sOptionCardList[i].unk_5C = 0; - sOptionCardList[i].unk_58 = 0; + sOptionCardList[i].unk_5C = false; + sOptionCardList[i].unk_58 = false; } } @@ -1018,13 +1018,13 @@ void Option_MainMenuUpdate(void) { var_fs1 = 120.0f; } - Math_SmoothStepToF(&sOptionCardList[D_menu_801B91A4].unk_00.unk_1C, var_fs0, 0.25f, 100.0f, 0.1f); - Math_SmoothStepToF(&sOptionCardList[D_menu_801B91A4].unk_38.unk_04, var_fs1, 0.25f, 100.0f, 0.1f); + Math_SmoothStepToF(&sOptionCardList[D_menu_801B91A4].unk_00.yPos, var_fs0, 0.25f, 100.0f, 0.1f); + Math_SmoothStepToF(&sOptionCardList[D_menu_801B91A4].unk_38.y, var_fs1, 0.25f, 100.0f, 0.1f); gBlurAlpha += 4; - if ((sOptionCardList[D_menu_801B91A4].unk_00.unk_1C == var_fs0) && - (sOptionCardList[D_menu_801B91A4].unk_38.unk_04 == var_fs1)) { + if ((sOptionCardList[D_menu_801B91A4].unk_00.yPos == var_fs0) && + (sOptionCardList[D_menu_801B91A4].unk_38.y == var_fs1)) { gBlurAlpha += 255; D_menu_801B9124 = D_menu_801B91A4; @@ -1070,7 +1070,7 @@ void Option_MainMenuDraw(void) { Matrix_Pop(&gGfxMatrix); for (i = 0; i < OPTION_COUNT; i++) { - if (!(sOptionCardList[i].unk_58) || (sOptionCardList[i].unk_00.unk_20) <= 0.0f) { + if (!(sOptionCardList[i].unk_58) || (sOptionCardList[i].unk_00.xScale) <= 0.0f) { continue; } if ((i == 0) && D_menu_801B91C8 && ((D_menu_801B912C == 0) || (D_menu_801B912C == 1))) { @@ -1096,26 +1096,26 @@ void Option_80193B04(void) { D_menu_801B91BC = 1; for (i = 0; i < 3; i++) { - sOptionVSCardList[i].unk_00.unk_18 = D_menu_801AEF90[i]; - sOptionVSCardList[i].unk_00.unk_1C = D_menu_801AEF9C[i]; - sOptionVSCardList[i].unk_00.unk_20 = 1.0f; - sOptionVSCardList[i].unk_00.unk_24 = 1.0f; - sOptionVSCardList[i].unk_58 = 1; - sOptionVSCardList[i].unk_38.unk_0C = 0.4f; - sOptionVSCardList[i].unk_38.unk_10 = 0.21f; - sOptionVSCardList[i].unk_38.unk_04 = D_menu_801AEF84[i]; - sOptionVSCardList[i].unk_38.unk_08 = 0.0f; - sOptionVSCardList[i].unk_5C = 1; + sOptionVSCardList[i].unk_00.xPos = D_menu_801AEF90[i]; + sOptionVSCardList[i].unk_00.yPos = D_menu_801AEF9C[i]; + sOptionVSCardList[i].unk_00.xScale = 1.0f; + sOptionVSCardList[i].unk_00.yScale = 1.0f; + sOptionVSCardList[i].unk_58 = true; + sOptionVSCardList[i].unk_38.xScale = 0.4f; + sOptionVSCardList[i].unk_38.yScale = 0.21f; + sOptionVSCardList[i].unk_38.y = D_menu_801AEF84[i]; + sOptionVSCardList[i].unk_38.z = 0.0f; + sOptionVSCardList[i].unk_5C = true; } } else { D_menu_801B91BC = 0; for (i = 0; i < 3; i++) { - sOptionVSCardList[i].unk_00.unk_24 = 1.0f; - sOptionVSCardList[i].unk_38.unk_10 = 0.21f; - sOptionVSCardList[i].unk_38.unk_08 = 0.0f; - sOptionVSCardList[i].unk_58 = 1; - sOptionVSCardList[i].unk_5C = 1; + sOptionVSCardList[i].unk_00.yScale = 1.0f; + sOptionVSCardList[i].unk_38.yScale = 0.21f; + sOptionVSCardList[i].unk_38.z = 0.0f; + sOptionVSCardList[i].unk_58 = true; + sOptionVSCardList[i].unk_5C = true; } } @@ -1141,39 +1141,39 @@ void Option_VersusUpdate(void) { case 1000: for (i = 0; i < 3; i++) { - if (sOptionVSCardList[i].unk_38.unk_0C < 0.4f) { - sOptionVSCardList[i].unk_38.unk_0C += 0.04f; - if (sOptionVSCardList[i].unk_38.unk_0C > 0.4f) { - sOptionVSCardList[i].unk_38.unk_0C = 0.4f; + if (sOptionVSCardList[i].unk_38.xScale < 0.4f) { + sOptionVSCardList[i].unk_38.xScale += 0.04f; + if (sOptionVSCardList[i].unk_38.xScale > 0.4f) { + sOptionVSCardList[i].unk_38.xScale = 0.4f; } } - if (sOptionVSCardList[i].unk_00.unk_20 < 1.0f) { - sOptionVSCardList[i].unk_00.unk_20 += 0.15f; - if (sOptionVSCardList[i].unk_00.unk_20 > 1.0f) { - sOptionVSCardList[i].unk_00.unk_20 = 1.0f; + if (sOptionVSCardList[i].unk_00.xScale < 1.0f) { + sOptionVSCardList[i].unk_00.xScale += 0.15f; + if (sOptionVSCardList[i].unk_00.xScale > 1.0f) { + sOptionVSCardList[i].unk_00.xScale = 1.0f; } } - Math_SmoothStepToF(&sOptionVSCardList[i].unk_38.unk_04, D_menu_801AEF84[i], 0.15f, 100.0f, 0.1f); - Math_SmoothStepToF(&sOptionVSCardList[i].unk_00.unk_18, D_menu_801AEF90[i], 0.2f, 3.1f, 0.1f); - Math_SmoothStepToF(&sOptionVSCardList[i].unk_00.unk_1C, D_menu_801AEF9C[i], 0.15f, 100.0f, 0.1f); + Math_SmoothStepToF(&sOptionVSCardList[i].unk_38.y, D_menu_801AEF84[i], 0.15f, 100.0f, 0.1f); + Math_SmoothStepToF(&sOptionVSCardList[i].unk_00.xPos, D_menu_801AEF90[i], 0.2f, 3.1f, 0.1f); + Math_SmoothStepToF(&sOptionVSCardList[i].unk_00.yPos, D_menu_801AEF9C[i], 0.15f, 100.0f, 0.1f); } - Math_SmoothStepToF(&sOptionCardList[D_menu_801B91A4].unk_00.unk_1C, 25.0f, 0.25f, 100.0f, 0.1f); - Math_SmoothStepToF(&sOptionCardList[D_menu_801B91A4].unk_38.unk_04, 90.0f, 0.25f, 100.0f, 0.1f); + Math_SmoothStepToF(&sOptionCardList[D_menu_801B91A4].unk_00.yPos, 25.0f, 0.25f, 100.0f, 0.1f); + Math_SmoothStepToF(&sOptionCardList[D_menu_801B91A4].unk_38.y, 90.0f, 0.25f, 100.0f, 0.1f); gBlurAlpha += 4; - if (sOptionVSCardList[D_menu_801B91A8].unk_38.unk_04 == D_menu_801AEF84[D_menu_801B91A8]) { + if (sOptionVSCardList[D_menu_801B91A8].unk_38.y == D_menu_801AEF84[D_menu_801B91A8]) { for (i = 0; i < 3; i++) { - sOptionVSCardList[i].unk_00.unk_20 = 1.0f; - sOptionVSCardList[i].unk_00.unk_1C = D_menu_801AEF9C[i]; - sOptionVSCardList[i].unk_00.unk_18 = D_menu_801AEF90[i]; + sOptionVSCardList[i].unk_00.xScale = 1.0f; + sOptionVSCardList[i].unk_00.yPos = D_menu_801AEF9C[i]; + sOptionVSCardList[i].unk_00.xPos = D_menu_801AEF90[i]; } - sOptionCardList[D_menu_801B91A4].unk_00.unk_1C = 25.0f; - sOptionCardList[D_menu_801B91A4].unk_38.unk_04 = 90.0f; + sOptionCardList[D_menu_801B91A4].unk_00.yPos = 25.0f; + sOptionCardList[D_menu_801B91A4].unk_38.y = 90.0f; D_menu_801B91BC = 1; gBlurAlpha = 255; D_menu_801B912C = 1; @@ -1206,22 +1206,22 @@ void Option_VersusUpdate(void) { case 11: gBlurAlpha = 16; D_menu_801B9178 = 5; - sOptionVSCardList[D_menu_801B91A8].unk_38.unk_0C -= 0.01f; - sOptionVSCardList[D_menu_801B91A8].unk_38.unk_10 -= 0.01f; - sOptionVSCardList[D_menu_801B91A8].unk_00.unk_20 -= 0.1f; - sOptionVSCardList[D_menu_801B91A8].unk_00.unk_24 -= 0.1f; - sOptionVSCardList[D_menu_801B91A8].unk_00.unk_18 += 4.0f; + sOptionVSCardList[D_menu_801B91A8].unk_38.xScale -= 0.01f; + sOptionVSCardList[D_menu_801B91A8].unk_38.yScale -= 0.01f; + sOptionVSCardList[D_menu_801B91A8].unk_00.xScale -= 0.1f; + sOptionVSCardList[D_menu_801B91A8].unk_00.yScale -= 0.1f; + sOptionVSCardList[D_menu_801B91A8].unk_00.xPos += 4.0f; D_menu_801B917C = 5; D_menu_801B912C++; break; case 12: if (D_menu_801B9178 == 1) { - sOptionVSCardList[D_menu_801B91A8].unk_38.unk_0C += 0.01f; - sOptionVSCardList[D_menu_801B91A8].unk_38.unk_10 += 0.01f; - sOptionVSCardList[D_menu_801B91A8].unk_00.unk_20 += 0.1f; - sOptionVSCardList[D_menu_801B91A8].unk_00.unk_24 += 0.1f; - sOptionVSCardList[D_menu_801B91A8].unk_00.unk_18 -= 4.0f; + sOptionVSCardList[D_menu_801B91A8].unk_38.xScale += 0.01f; + sOptionVSCardList[D_menu_801B91A8].unk_38.yScale += 0.01f; + sOptionVSCardList[D_menu_801B91A8].unk_00.xScale += 0.1f; + sOptionVSCardList[D_menu_801B91A8].unk_00.yScale += 0.1f; + sOptionVSCardList[D_menu_801B91A8].unk_00.xPos -= 4.0f; D_menu_801B9214 = 1; } @@ -1230,13 +1230,13 @@ void Option_VersusUpdate(void) { continue; } - if (sOptionVSCardList[i].unk_38.unk_0C > 0.01f) { - sOptionVSCardList[i].unk_38.unk_0C -= 0.05f; - sOptionVSCardList[i].unk_00.unk_20 -= 0.19f; - Math_SmoothStepToF(&sOptionVSCardList[i].unk_00.unk_18, 158.0f, 0.2f, D_menu_801AE608[i + 1], 0.1f); + if (sOptionVSCardList[i].unk_38.xScale > 0.01f) { + sOptionVSCardList[i].unk_38.xScale -= 0.05f; + sOptionVSCardList[i].unk_00.xScale -= 0.19f; + Math_SmoothStepToF(&sOptionVSCardList[i].unk_00.xPos, 158.0f, 0.2f, D_menu_801AE608[i + 1], 0.1f); } else { - sOptionVSCardList[i].unk_5C = 0; - sOptionVSCardList[i].unk_58 = 0; + sOptionVSCardList[i].unk_5C = false; + sOptionVSCardList[i].unk_58 = false; } } @@ -1247,15 +1247,15 @@ void Option_VersusUpdate(void) { var_fs0 = 131.0f; } - Math_SmoothStepToF(&sOptionVSCardList[D_menu_801B91A8].unk_00.unk_1C, var_fs0, 0.25f, 100.0f, 0.1f); - Math_SmoothStepToF(&sOptionVSCardList[D_menu_801B91A8].unk_38.unk_04, -15.5f, 0.25f, 100.0f, 0.1f); - Math_SmoothStepToF(&sOptionCardList[D_menu_801B91A4].unk_00.unk_1C, -10.0f, 0.35f, 100.0f, 0.1f); - Math_SmoothStepToF(&sOptionCardList[D_menu_801B91A4].unk_38.unk_04, 150.0f, 0.35f, 100.0f, 0.1f); + Math_SmoothStepToF(&sOptionVSCardList[D_menu_801B91A8].unk_00.yPos, var_fs0, 0.25f, 100.0f, 0.1f); + Math_SmoothStepToF(&sOptionVSCardList[D_menu_801B91A8].unk_38.y, -15.5f, 0.25f, 100.0f, 0.1f); + Math_SmoothStepToF(&sOptionCardList[D_menu_801B91A4].unk_00.yPos, -10.0f, 0.35f, 100.0f, 0.1f); + Math_SmoothStepToF(&sOptionCardList[D_menu_801B91A4].unk_38.y, 150.0f, 0.35f, 100.0f, 0.1f); gBlurAlpha += 4; - if ((var_fs0 == sOptionVSCardList[D_menu_801B91A8].unk_00.unk_1C) && - (sOptionVSCardList[D_menu_801B91A8].unk_38.unk_04 == -15.5f)) { + if ((var_fs0 == sOptionVSCardList[D_menu_801B91A8].unk_00.yPos) && + (sOptionVSCardList[D_menu_801B91A8].unk_38.y == -15.5f)) { gBlurAlpha += 255; D_menu_801B9124 = (D_menu_801B91A8 + 1) * 10; gVsMatchType = D_menu_801B91A8; @@ -1274,7 +1274,7 @@ void Option_VersusDraw(void) { Option_8019BDF0(); for (i = 0; i < 3; i++) { - if (sOptionVSCardList[i].unk_5C != 0) { + if (sOptionVSCardList[i].unk_5C) { Option_DrawMenuCard(sOptionVSCardList[i].unk_38); } } @@ -1283,7 +1283,7 @@ void Option_VersusDraw(void) { Matrix_Pop(&gGfxMatrix); for (i = 0; i < 3; i++) { - if ((sOptionVSCardList[i].unk_58 != 0) && !(sOptionVSCardList[i].unk_00.unk_20 <= 0.0f)) { + if ((sOptionVSCardList[i].unk_58) && !(sOptionVSCardList[i].unk_00.xScale <= 0.0f)) { Option_DrawCardLabel(sOptionVSCardList[i].unk_00); } } @@ -1322,9 +1322,9 @@ void Option_SoundInit(void) { Audio_SetVolume(AUDIO_TYPE_VOICE, gVolumeSettings[AUDIO_TYPE_VOICE]); Audio_SetVolume(AUDIO_TYPE_SFX, gVolumeSettings[AUDIO_TYPE_SFX]); - D_menu_801AEB48[0].unk_18 = gVolumeSettings[AUDIO_TYPE_MUSIC] + 146.0f; - D_menu_801AEB48[1].unk_18 = gVolumeSettings[AUDIO_TYPE_VOICE] + 146.0f; - D_menu_801AEB48[2].unk_18 = gVolumeSettings[AUDIO_TYPE_SFX] + 146.0f; + D_menu_801AEB48[0].xPos = gVolumeSettings[AUDIO_TYPE_MUSIC] + 146.0f; + D_menu_801AEB48[1].xPos = gVolumeSettings[AUDIO_TYPE_VOICE] + 146.0f; + D_menu_801AEB48[2].xPos = gVolumeSettings[AUDIO_TYPE_SFX] + 146.0f; D_menu_801B9288 = 0; D_menu_801B9284 = 0; @@ -1414,8 +1414,8 @@ void Option_80194BD0(void) { D_menu_801B924C = D_menu_801AE99C[D_menu_801B9288 - 1]; - if (Option_8019C66C(&(D_menu_801AEB48[D_menu_801B9288 - 1].unk_18), 146.0f, 245.0f, &D_menu_801B9268)) { - var_v1 = D_menu_801AEB48[D_menu_801B9288 - 1].unk_18 - 146.0f; + if (Option_8019C66C(&(D_menu_801AEB48[D_menu_801B9288 - 1].xPos), 146.0f, 245.0f, &D_menu_801B9268)) { + var_v1 = D_menu_801AEB48[D_menu_801B9288 - 1].xPos - 146.0f; gVolumeSettings[D_menu_801B9288 - 1] = var_v1; @@ -1534,9 +1534,9 @@ void Option_801952B4(void) { } for (i = 2; i < 4; i++) { - D_menu_801AE9C0[i].unk_20 += 0.02f; - D_menu_801AE9C0[i].unk_24 += 0.02f; - D_menu_801AE9C0[i].unk_18 -= 0.1f; + D_menu_801AE9C0[i].xScale += 0.02f; + D_menu_801AE9C0[i].yScale += 0.02f; + D_menu_801AE9C0[i].xPos -= 0.1f; } D_menu_801B9178 = 2; @@ -1546,9 +1546,9 @@ void Option_801952B4(void) { case 2: if (D_menu_801B9178 == 0) { for (i = 2; i < 4; i++) { - D_menu_801AE9C0[i].unk_20 -= 0.02f; - D_menu_801AE9C0[i].unk_24 -= 0.02f; - D_menu_801AE9C0[i].unk_18 += 0.1f; + D_menu_801AE9C0[i].xScale -= 0.02f; + D_menu_801AE9C0[i].yScale -= 0.02f; + D_menu_801AE9C0[i].xPos += 0.1f; } D_menu_801B914C++; } @@ -1564,10 +1564,10 @@ void Option_801952B4(void) { case 0: if (D_menu_801B917C == 0) { for (i = 0; i < 4; i++) { - D_menu_801AE9C0[i].unk_20 += 0.08f; - D_menu_801AE9C0[i].unk_24 += 0.08f; - D_menu_801AE9C0[i].unk_18 -= 0.4f; - D_menu_801AE9C0[i].unk_1C -= 0.4f; + D_menu_801AE9C0[i].xScale += 0.08f; + D_menu_801AE9C0[i].yScale += 0.08f; + D_menu_801AE9C0[i].xPos -= 0.4f; + D_menu_801AE9C0[i].yPos -= 0.4f; } D_menu_801B917C = 2; @@ -1579,10 +1579,10 @@ void Option_801952B4(void) { if (D_menu_801B917C == 0) { for (i = 0; i < 4; i++) { - D_menu_801AE9C0[i].unk_20 -= 0.08f; - D_menu_801AE9C0[i].unk_24 -= 0.08f; - D_menu_801AE9C0[i].unk_18 += 0.4f; - D_menu_801AE9C0[i].unk_1C += 0.4f; + D_menu_801AE9C0[i].xScale -= 0.08f; + D_menu_801AE9C0[i].yScale -= 0.08f; + D_menu_801AE9C0[i].xPos += 0.4f; + D_menu_801AE9C0[i].yPos += 0.4f; } D_menu_801B917C = 2; @@ -1600,10 +1600,10 @@ void Option_801952B4(void) { } else { for (i = 0; i < 4; i++) { - D_menu_801AE9C0[i].unk_20 = 1.0f; - D_menu_801AE9C0[i].unk_24 = 1.0f; - D_menu_801AE9C0[i].unk_18 = D_menu_801AE9A0[i]; - D_menu_801AE9C0[i].unk_1C = D_menu_801AE9B0[i]; + D_menu_801AE9C0[i].xScale = 1.0f; + D_menu_801AE9C0[i].yScale = 1.0f; + D_menu_801AE9C0[i].xPos = D_menu_801AE9A0[i]; + D_menu_801AE9C0[i].yPos = D_menu_801AE9B0[i]; } } @@ -1628,7 +1628,7 @@ void Option_ExpertSoundInit(void) { D_menu_801B9290.unk_4 = 0; spectrumAnalyzerMode = 0; - D_menu_801B9320 = 0; + sMusicPlaying = false; // clang-format off for (i = 0; i < 32; i++) { D_menu_801B9298[i] = 0.0f; } @@ -1661,11 +1661,11 @@ void Option_ExpertSoundUpdate(void) { if (gControllerPress[gMainController].button & A_BUTTON) { Audio_PlaySoundTestTrack(D_menu_801B931C); - D_menu_801B9320 = true; + sMusicPlaying = true; } if (gControllerPress[gMainController].button & B_BUTTON) { - if (!D_menu_801B9320) { + if (!sMusicPlaying) { AUDIO_PLAY_SFX(NA_SE_ARWING_CANCEL, gDefaultSfxSource, 4); AUDIO_PLAY_BGM(NA_BGM_SELECT); gDrawMode = DRAW_NONE; @@ -1676,7 +1676,7 @@ void Option_ExpertSoundUpdate(void) { AUDIO_PLAY_SFX(NA_SE_CANCEL, gDefaultSfxSource, 4); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 1); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 1); - D_menu_801B9320 = false; + sMusicPlaying = false; } } @@ -1750,7 +1750,7 @@ void Option_ExpertSoundDraw(void) { D_menu_801AF034[i], D_menu_801AF044[i]); } - if (D_menu_801B9320 != 0) { + if (sMusicPlaying) { temp_v0_4 = Audio_UpdateFrequencyAnalysis(); var_fv1 = 60.0f; @@ -1874,12 +1874,12 @@ void Option_DataUpdate(void) { gExpertMode = false; - sOptionCardList[0].unk_00.unk_08 = D_OPT_8003B50; - sOptionCardList[0].unk_00.unk_10 = 72; - sOptionCardList[0].unk_00.unk_14 = 12; - sOptionCardList[4].unk_00.unk_08 = D_OPT_80046B0; - sOptionCardList[4].unk_00.unk_10 = 64; - sOptionCardList[4].unk_00.unk_14 = 10; + sOptionCardList[0].unk_00.texture = D_OPT_8003B50; + sOptionCardList[0].unk_00.width = 72; + sOptionCardList[0].unk_00.height = 12; + sOptionCardList[4].unk_00.texture = D_OPT_80046B0; + sOptionCardList[4].unk_00.width = 64; + sOptionCardList[4].unk_00.height = 10; for (i = 0; i < OPTION_COUNT; i++) { sOptionCardCurTextPosX[i] = sOptionCardTextPosX[i]; @@ -2343,18 +2343,15 @@ void Option_801982B0(s32 arg0, s32 arg1, f32 arg2, f32 arg3, s32 arg4) { if ((arg3 > 30.0f) && (arg3 < 200.0f)) { RCP_SetupDL(&gMasterDisp, SETUPDL_76); if (arg1 < 6) { - b = 255; - g = 255; - r = 255; + r = g = b = 255; + if (arg1 < (arg4 - 1)) { start = gSaveFile.save.data.unk_5E[arg0][arg1].unk_8 & 0xF; end = gSaveFile.save.data.unk_5E[arg0][arg1 + 1].unk_8 & 0xF; temp_v0 = Option_80199284(start, end); - g = 255; - b = 255; - r = 255; + r = g = b = 255; switch (temp_v0) { case 0: @@ -2395,24 +2392,24 @@ void Option_801984D0(s32 arg0, s32 arg1, f32 arg2, f32 arg3) { } } -void Option_80198608(s32 arg0, s32 arg1, f32 arg2, f32 arg3) { - f32 var_fs1; +void Option_80198608(s32 arg0, s32 arg1, f32 xPos, f32 yPos) { + f32 xOffset; s32 sp90[3]; s32 i; - if ((arg3 > 12.0f) && (arg3 < 154.0f)) { + if ((yPos > 12.0f) && (yPos < 154.0f)) { RCP_SetupDL(&gMasterDisp, SETUPDL_83); sp90[0] = gSaveFile.save.data.unk_5E[arg0][arg1].unk_D & 1; sp90[1] = gSaveFile.save.data.unk_5E[arg0][arg1].unk_F & 1; sp90[2] = gSaveFile.save.data.unk_5E[arg0][arg1].unk_E & 1; - for (var_fs1 = 0.0f, i = 0; i < 3; i++, var_fs1 += 9.0f) { + for (xOffset = 0.0f, i = 0; i < 3; i++, xOffset += 9.0f) { if (sp90[i] == 0) { continue; } gDPSetPrimColor(gMasterDisp++, 0, 0, D_menu_801AF0D0[i], D_menu_801AF0DC[i], D_menu_801AF0E8[i], 255); - Graphics_DisplaySmallText(arg2 + var_fs1 - 1.0f, arg3 + 24.0f + 8.0f + 1.0f, 1.0f, 1.0f, + Graphics_DisplaySmallText(xPos + xOffset - 1.0f, yPos + 24.0f + 8.0f + 1.0f, 1.0f, 1.0f, D_menu_801AF0C4[i]); } } @@ -2434,9 +2431,9 @@ void Option_8019882C(s32 arg0, s32 arg1, f32 arg2, f32 arg3) { } void Option_8019896C(s32 arg0, f32 y, s32 arg2) { - static f32 D_menu_801AF130 = 0.0f; - static f32 D_menu_801AF134 = -121.0f; - static f32 D_menu_801AF138 = 40.1f; + static f32 zAngle = 0.0f; + static f32 xStart = -121.0f; + static f32 xAdvance = 40.1f; s32 i; PlanetId planet; s32 spFC; @@ -2451,7 +2448,7 @@ void Option_8019896C(s32 arg0, f32 y, s32 arg2) { Lib_InitOrtho(&gMasterDisp); spFC = gSaveFile.save.data.unk_4A[arg0]; - for (x = D_menu_801AF134, i = 0; i < arg2; i++, x += D_menu_801AF138) { + for (x = xStart, i = 0; i < arg2; i++, x += xAdvance) { planet = gSaveFile.save.data.unk_5E[arg0][i].unk_8 & 0xF; switch (planet) { @@ -2463,7 +2460,7 @@ void Option_8019896C(s32 arg0, f32 y, s32 arg2) { Matrix_Push(&gGfxMatrix); Matrix_Translate(gGfxMatrix, x, y, 0.0f, MTXF_APPLY); - Matrix_RotateZ(gGfxMatrix, M_DTOR * D_menu_801AF130, MTXF_APPLY); + Matrix_RotateZ(gGfxMatrix, M_DTOR * zAngle, MTXF_APPLY); Matrix_Scale(gGfxMatrix, 0.3f, 0.3f, 0.3f, MTXF_APPLY); Matrix_SetGfxMtx(&gMasterDisp); @@ -2583,7 +2580,7 @@ void Option_8019896C(s32 arg0, f32 y, s32 arg2) { Option_80192738(); - D_menu_801AF130 += 0.1f; + zAngle += 0.1f; Lib_InitPerspective(&gMasterDisp); } @@ -2624,8 +2621,8 @@ void Option_VersusMenuInit(void) { D_menu_801B93D0 = D_menu_801B9124; if (D_game_800D2870) { - sOptionCardList[1].unk_00.unk_1C = 129.0f; - sOptionCardList[1].unk_38.unk_04 = -7.5f; + sOptionCardList[1].unk_00.yPos = 129.0f; + sOptionCardList[1].unk_38.y = -7.5f; } gVsPointsToWin = 3; @@ -3479,8 +3476,8 @@ void Option_DrawMenuCard(MenuContext_38 arg0) { Matrix_Push(&gGfxMatrix); - Matrix_Translate(gGfxMatrix, arg0.unk_00, arg0.unk_04, arg0.unk_08, MTXF_APPLY); - Matrix_Scale(gGfxMatrix, arg0.unk_0C, arg0.unk_10, 1.0f, MTXF_APPLY); + Matrix_Translate(gGfxMatrix, arg0.x, arg0.y, arg0.z, MTXF_APPLY); + Matrix_Scale(gGfxMatrix, arg0.xScale, arg0.yScale, 1.0f, MTXF_APPLY); Matrix_RotateX(gGfxMatrix, M_DTOR * 90.0f, MTXF_APPLY); Matrix_SetGfxMtx(&gMasterDisp); @@ -3492,36 +3489,36 @@ void Option_DrawMenuCard(MenuContext_38 arg0) { Lib_InitPerspective(&gMasterDisp); } -void Option_DrawMenuArwing(ArwingPosition arg0) { +void Option_DrawMenuArwing(ArwingPosition arwing) { if (D_menu_801B91BC != 0) { - Option_8019BC44(arg0.unk_0, arg0.unk_4, D_menu_801B91F4, D_menu_801B9200, 90.0f, D_menu_801B91F8); - Option_8019BC44(arg0.unk_0 + arg0.unk_8, arg0.unk_4, D_menu_801B91F4, D_menu_801B91FC, -90.0f, D_menu_801B91F8); + Option_DrawArwing(arwing.x, arwing.y, D_menu_801B91F4, D_menu_801B9200, 90.0f, D_menu_801B91F8); + Option_DrawArwing(arwing.x + arwing.range, arwing.y, D_menu_801B91F4, D_menu_801B91FC, -90.0f, D_menu_801B91F8); } } -void Option_8019BC44(f32 x, f32 y, f32 arg2, f32 arg3, f32 arg4, f32 arg5) { - f32 sp44; - f32 sp40; - f32 sp3C; +void Option_DrawArwing(f32 x, f32 y, f32 z, f32 yRot, f32 zRot, f32 scale) { + f32 dirX; + f32 dirY; + f32 dirZ; - Option_8019BE7C(D_menu_801B9224, D_menu_801B9228, 100.0f, &sp44, &sp40, &sp3C); + Option_8019BE7C(D_menu_801B9224, D_menu_801B9228, 100.0f, &dirX, &dirY, &dirZ); - Lights_SetOneLight(&gMasterDisp, sp44, sp40, sp3C, D_menu_801B922C, D_menu_801B9230, D_menu_801B9234, - D_menu_801B9238, D_menu_801B923C, D_menu_801B9240); + Lights_SetOneLight(&gMasterDisp, dirX, dirY, dirZ, sArwingLightColR, sArwingLightColG, sArwingLightColB, + sArwingLightAmbR, sArwingLightAmbG, sArwingLightAmbB); Matrix_Push(&gGfxMatrix); - Matrix_Translate(gGfxMatrix, x, y, arg2, MTXF_APPLY); + Matrix_Translate(gGfxMatrix, x, y, z, MTXF_APPLY); - Matrix_Scale(gGfxMatrix, arg5, arg5, arg5, MTXF_APPLY); - Matrix_RotateZ(gGfxMatrix, M_DTOR * arg4, MTXF_APPLY); - Matrix_RotateY(gGfxMatrix, M_DTOR * arg3, MTXF_APPLY); + Matrix_Scale(gGfxMatrix, scale, scale, scale, MTXF_APPLY); + Matrix_RotateZ(gGfxMatrix, M_DTOR * zRot, MTXF_APPLY); + Matrix_RotateY(gGfxMatrix, M_DTOR * yRot, MTXF_APPLY); Matrix_SetGfxMtx(&gMasterDisp); RCP_SetupDL_55(); - gSPDisplayList(gMasterDisp++, D_MAP_604A9F0); + gSPDisplayList(gMasterDisp++, aMapArwingDL); Matrix_Pop(&gGfxMatrix); } @@ -3532,21 +3529,21 @@ void Option_8019BDF0(void) { MTXF_APPLY); } -void Option_8019BE7C(f32 arg0, f32 arg1, f32 arg2, f32* arg3, f32* arg4, f32* arg5) { - Vec3f sp24; - Vec3f sp18; +void Option_8019BE7C(f32 xRot, f32 yRot, f32 arg2, f32* arg3, f32* arg4, f32* arg5) { + Vec3f dest; + Vec3f src; - sp18.x = 0.0f; - sp18.y = 0.0f; - sp18.z = arg2; + src.x = 0.0f; + src.y = 0.0f; + src.z = arg2; - Matrix_RotateY(gCalcMatrix, M_DTOR * arg1, MTXF_NEW); - Matrix_RotateX(gCalcMatrix, M_DTOR * arg0, MTXF_APPLY); - Matrix_MultVec3f(gCalcMatrix, &sp18, &sp24); + Matrix_RotateY(gCalcMatrix, M_DTOR * yRot, MTXF_NEW); + Matrix_RotateX(gCalcMatrix, M_DTOR * xRot, MTXF_APPLY); + Matrix_MultVec3f(gCalcMatrix, &src, &dest); - *arg3 = sp24.x; - *arg4 = sp24.y; - *arg5 = sp24.z; + *arg3 = dest.x; + *arg4 = dest.y; + *arg5 = dest.z; } void Option_8019BF34(void) { @@ -3595,35 +3592,37 @@ void Option_8019C04C(void) { Lib_InitPerspective(&gMasterDisp); } -void Option_DrawCardLabel(OptionTexture arg0) { - if (!(arg0.unk_20 <= 0.0f) && !(arg0.unk_24 <= 0.0f)) { - switch (arg0.unk_00) { +//! TODO: Enum for Texture types + +void Option_DrawCardLabel(OptionTexture tex) { + if (!(tex.xScale <= 0.0f) && !(tex.yScale <= 0.0f)) { + switch (tex.type) { case 1: RCP_SetupDL(&gMasterDisp, SETUPDL_78); - gDPSetPrimColor(gMasterDisp++, 0, 0, arg0.unk_28, arg0.unk_2C, arg0.unk_30, arg0.unk_34); - TextureRect_CI4(&gMasterDisp, arg0.unk_08, arg0.unk_0C, arg0.unk_10, arg0.unk_14, arg0.unk_18, - arg0.unk_1C, arg0.unk_20, arg0.unk_24); + gDPSetPrimColor(gMasterDisp++, 0, 0, tex.red, tex.green, tex.blue, tex.alpha); + TextureRect_CI4(&gMasterDisp, tex.texture, tex.palette, tex.width, tex.height, tex.xPos, tex.yPos, + tex.xScale, tex.yScale); break; case 2: RCP_SetupDL(&gMasterDisp, SETUPDL_78); - gDPSetPrimColor(gMasterDisp++, 0, 0, arg0.unk_28, arg0.unk_2C, arg0.unk_30, arg0.unk_34); - TextureRect_CI8(&gMasterDisp, arg0.unk_08, arg0.unk_0C, arg0.unk_10, arg0.unk_14, arg0.unk_18, - arg0.unk_1C, arg0.unk_20, arg0.unk_24); + gDPSetPrimColor(gMasterDisp++, 0, 0, tex.red, tex.green, tex.blue, tex.alpha); + TextureRect_CI8(&gMasterDisp, tex.texture, tex.palette, tex.width, tex.height, tex.xPos, tex.yPos, + tex.xScale, tex.yScale); break; case 0: RCP_SetupDL(&gMasterDisp, SETUPDL_76); - gDPSetPrimColor(gMasterDisp++, 0, 0, arg0.unk_28, arg0.unk_2C, arg0.unk_30, arg0.unk_34); - TextureRect_IA8(&gMasterDisp, arg0.unk_08, arg0.unk_10, arg0.unk_14, arg0.unk_18, arg0.unk_1C, - arg0.unk_20, arg0.unk_24); + gDPSetPrimColor(gMasterDisp++, 0, 0, tex.red, tex.green, tex.blue, tex.alpha); + TextureRect_IA8(&gMasterDisp, tex.texture, tex.width, tex.height, tex.xPos, tex.yPos, tex.xScale, + tex.yScale); break; case 3: RCP_SetupDL(&gMasterDisp, SETUPDL_76); - gDPSetPrimColor(gMasterDisp++, 0, 0, arg0.unk_28, arg0.unk_2C, arg0.unk_30, arg0.unk_34); - TextureRect_RGBA16(&gMasterDisp, arg0.unk_08, arg0.unk_10, arg0.unk_14, arg0.unk_18, arg0.unk_1C, - arg0.unk_20, arg0.unk_24); + gDPSetPrimColor(gMasterDisp++, 0, 0, tex.red, tex.green, tex.blue, tex.alpha); + TextureRect_RGBA16(&gMasterDisp, tex.texture, tex.width, tex.height, tex.xPos, tex.yPos, tex.xScale, + tex.yScale); break; } } @@ -4125,7 +4124,8 @@ void Option_8019D624(void) { s32 i; s32 j; s32 var_t2; - s32 var_a3, var_a0; + s32 var_a3; + s32 var_a0; s32 var_a1; u8 sp142[11][3]; u8 sp122[11]; @@ -4305,15 +4305,15 @@ void Option_8019DD44(void) { D_menu_801B91D4 = 114.0f - D_menu_801B93E4 * 130.0f; D_menu_801B91D8 = -6.0f + D_menu_801B93E4 * 130.0f; - sOptionCardList[3].unk_00.unk_18 = sOptionCardCurTextPosX[3]; - sOptionCardList[3].unk_00.unk_1C = 23.0f; - sOptionCardList[3].unk_00.unk_20 = 1.0f; - sOptionCardList[3].unk_00.unk_24 = 1.0f; - sOptionCardList[3].unk_58 = 1; - sOptionCardList[3].unk_38.unk_04 = 90.0f; - sOptionCardList[3].unk_38.unk_0C = 0.4f; - sOptionCardList[3].unk_38.unk_10 = 0.21f; - sOptionCardList[3].unk_5C = 1; + sOptionCardList[3].unk_00.xPos = sOptionCardCurTextPosX[3]; + sOptionCardList[3].unk_00.yPos = 23.0f; + sOptionCardList[3].unk_00.xScale = 1.0f; + sOptionCardList[3].unk_00.yScale = 1.0f; + sOptionCardList[3].unk_58 = true; + sOptionCardList[3].unk_38.y = 90.0f; + sOptionCardList[3].unk_38.xScale = 0.4f; + sOptionCardList[3].unk_38.yScale = 0.21f; + sOptionCardList[3].unk_5C = true; D_menu_801B912C++; break; diff --git a/src/sys/sys_main.c b/src/sys/sys_main.c index b3527876..8feb1455 100644 --- a/src/sys/sys_main.c +++ b/src/sys/sys_main.c @@ -105,6 +105,7 @@ void Audio_ThreadEntry(void* arg0) { AudioLoad_Init(); Audio_InitSounds(); + task = AudioThread_CreateTask(); if (task != NULL) { task->mesgQueue = &gAudioTaskMesgQueue; @@ -112,6 +113,7 @@ void Audio_ThreadEntry(void* arg0) { osWritebackDCacheAll(); osSendMesg(&gTaskMesgQueue, task, OS_MESG_NOBLOCK); } + while (true) { task = AudioThread_CreateTask(); if (task != NULL) { @@ -120,6 +122,7 @@ void Audio_ThreadEntry(void* arg0) { osWritebackDCacheAll(); } MQ_GET_MESG(&gAudioTaskMesgQueue, NULL); + if (task != NULL) { osSendMesg(&gTaskMesgQueue, task, OS_MESG_NOBLOCK); } @@ -176,6 +179,7 @@ void Main_SetVIMode(void) { (gControllerHold[3].button & R_TRIG) && (gControllerHold[3].button & Z_TRIG)) { sGammaMode = 1 - sGammaMode; } + switch (osTvType) { case OS_TV_PAL: osViSetMode(&osViModePalLan1); @@ -188,6 +192,7 @@ void Main_SetVIMode(void) { osViSetMode(&osViModeNtscLan1); break; } + if (sGammaMode != 0) { osViSetSpecialFeatures(OS_VI_DITHER_FILTER_ON | OS_VI_DIVOT_OFF | OS_VI_GAMMA_ON | OS_VI_GAMMA_DITHER_ON); } else { |