PublicMirrors/Starship
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Starship.git synced 2025-02-03 00:33:55 +03:00
Code Issues Actions 1 Packages Projects Releases 1 Wiki Activity

3DS VERSION SfxIds applied to code (#232)

Browse Source 
* NA_SE_ARWING_BOOST is everywhere

* man, there's just no end of these sfxIds

* NA_SE_GREATFOX_ENGINE everywhere

* NA_SE_OB_DAMAGE_M, another SfxId with massive usage

* massive usage of NA_SE_EN_REFLECT

* massive usage of NA_SE_EN_EXPLOSION_S

* massive usage of NA_SE_EN_EXPLOSION_M

* NA_SE_ARWING_ENGINE_FG

* save progress

* MISSION ACCOMPLISHED
This commit is contained in:
Alejandro Asenjo Nitti 2024-05-05 22:07:32 -03:00 committed by GitHub
parent 65cb9e270e
commit 44c9eadbc2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
41 changed files with 1276 additions and 1258 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/sfx.h
View File

@ -75,7 +75,7 @@ typedef enum SfxBankId {
#define NA_SE_STEP_FALCO 0x09000019 // Unreferenced #define NA_SE_STEP_FALCO 0x09000019 // Unreferenced
#define NA_SE_STEP_PEPPY 0x0900001A // Unreferenced #define NA_SE_STEP_PEPPY 0x0900001A // Unreferenced
#define NA_SE_STEP_SLIPPY 0x0900001B // Unreferenced #define NA_SE_STEP_SLIPPY 0x0900001B // Unreferenced
#define NA_SE_DENO_RUNNING 0x0140001C #define NA_SE_DEMO_RUNNING 0x0140001C
#define NA_SE_LIFT_UP 0x0100001D #define NA_SE_LIFT_UP 0x0100001D
#define NA_SE_ENGINE_START 0x0100001E #define NA_SE_ENGINE_START 0x0100001E
#define NA_SE_VOLUME_TEST 0x0100001F #define NA_SE_VOLUME_TEST 0x0100001F

81
src/audio/audio_general.c
View File

@ -112,9 +112,18 @@ u8 sPlaylistIndex = 255;
s32 sPlaylistTimer = 0; s32 sPlaylistTimer = 0;
u8 sPlaylistCmdIndex = 0; u8 sPlaylistCmdIndex = 0;
u32 sEventSfx[] = { u32 sEventSfx[] = {
0x1903000D, 0x1903000E, 0x19500015, 0x2903A021, 0x4900000C, 0x19122005, 0x1913204A, 0x2900306A, NA_SE_OB_SLIDE_OPEN, NA_SE_OB_SLIDE_CLOSE,
0x29034024, 0x2902306C, 0x19032056, 0x19030057, 0x19033058, 0x19030006, 0x29503032, 0x1903407D, NA_SE_OB_STEELFRAME, NA_SE_OB_HEAVY_BOUND,
0x4900402E, 0x19038072, 0x1903807E, 0x1903807F, 0x19038080, 0x11032081, 0x19031082, NA_SE_ITEM_APPEAR, NA_SE_OB_BLOCK_APPEAR,
NA_SE_OB_ROCKWALL_UP, NA_SE_EN_UNIT_GATHERING,
NA_SE_EN_MOTOR_STOP, NA_SE_EN_MS_DASH,
NA_SE_OB_ROCK_CRASH, NA_SE_OB_ROCK_EYE_OPEN,
NA_SE_OB_SHIP_FALLDOWN, NA_SE_OB_ROCK_BOUND,
NA_SE_OB_SPEAR_PILLAR, NA_SE_OB_PILLER_ROLL,
NA_SE_SEARCHLIGHT_MISS, NA_SE_OB_ROUTEGATE_OPEN_Q,
NA_SE_OB_ROUTEGATE_CLOSE_Q, NA_SE_OB_ROUTEGATE_OPEN_S,
NA_SE_OB_ROUTEGATE_CLOSE_S, NA_SE_OB_LIFT,
NA_SE_OB_PLATE_ROLL,
}; };
SoundTestTrack sSoundTestTracks[] = { SoundTestTrack sSoundTestTracks[] = {
/* 0 */ { SEQ_ID_OPENING, 22, -1 }, /* 0 */ { SEQ_ID_OPENING, 22, -1 },
@ -2068,7 +2077,7 @@ void Audio_UpdateArwingNoise(u8 playerId) {
(sPlayerNoise[playerId].freqMod[2].target - sPlayerNoise[playerId].freqMod[2].value) / 10; (sPlayerNoise[playerId].freqMod[2].target - sPlayerNoise[playerId].freqMod[2].value) / 10;
} }
if (gPlayer[playerId].sfx.roll != 0) { if (gPlayer[playerId].sfx.roll != 0) {
AUDIO_PLAY_SFX(0x09000012, gPlayer[playerId].sfx.srcPos, playerId); AUDIO_PLAY_SFX(NA_SE_ROLLING_AIR, gPlayer[playerId].sfx.srcPos, playerId);
sPlayerNoise[playerId].freqMod[1].target = 1.65f; sPlayerNoise[playerId].freqMod[1].target = 1.65f;
sPlayerNoise[playerId].freqMod[1].timer = 8; sPlayerNoise[playerId].freqMod[1].timer = 8;
sPlayerNoise[playerId].freqMod[1].step = sPlayerNoise[playerId].freqMod[1].step =
@ -2180,7 +2189,7 @@ void Audio_UpdateBlueMarineNoise(u8 playerId) {
sPlayerNoise[playerId].freqMod[2].step = (1.1f - sPlayerNoise[playerId].freqMod[2].value) / 10; sPlayerNoise[playerId].freqMod[2].step = (1.1f - sPlayerNoise[playerId].freqMod[2].value) / 10;
} }
if (gPlayer[playerId].sfx.roll != 0) { if (gPlayer[playerId].sfx.roll != 0) {
AUDIO_PLAY_SFX(0x09000017, gPlayer[playerId].sfx.srcPos, playerId); AUDIO_PLAY_SFX(NA_SE_MAR_ROLLING_AIR, gPlayer[playerId].sfx.srcPos, playerId);
sPlayerNoise[playerId].freqMod[1].timer = 8; sPlayerNoise[playerId].freqMod[1].timer = 8;
sPlayerNoise[playerId].freqMod[1].target = 1.2f; sPlayerNoise[playerId].freqMod[1].target = 1.2f;
sPlayerNoise[playerId].freqMod[1].step = (1.2f - sPlayerNoise[playerId].freqMod[1].value) / 8; sPlayerNoise[playerId].freqMod[1].step = (1.2f - sPlayerNoise[playerId].freqMod[1].value) / 8;
@ -2463,17 +2472,17 @@ void Audio_StartPlayerNoise(u8 playerId) {
switch (sPlayerNoise[playerId].form) { switch (sPlayerNoise[playerId].form) {
case FORM_ARWING: case FORM_ARWING:
if (gPlayer[playerId].sfx.levelType == LEVELTYPE_SPACE) { if (gPlayer[playerId].sfx.levelType == LEVELTYPE_SPACE) {
sfxId = 0x0100F020; sfxId = NA_SE_ARWING_ENGIN_SPC;
} else { } else {
sfxId = 0x0100F005; sfxId = NA_SE_ARWING_ENGIN_GRD;
} }
break; break;
case FORM_LANDMASTER: case FORM_LANDMASTER:
sfxId = 0x0100F006; sfxId = NA_SE_TANK_ENGIN;
break; break;
case FORM_BLUE_MARINE: case FORM_BLUE_MARINE:
sfxId = 0x0100F022; sfxId = NA_SE_MARINE_ENGINE00;
Audio_PlaySfx(0x1100802C, gPlayer[playerId].sfx.srcPos, playerId, &gDefaultMod, &gDefaultMod, Audio_PlaySfx(NA_SE_SUBMARINE_ATM, gPlayer[playerId].sfx.srcPos, playerId, &gDefaultMod, &gDefaultMod,
&sPlayerNoise[playerId].reverbAdd); &sPlayerNoise[playerId].reverbAdd);
break; break;
} }
@ -2489,18 +2498,18 @@ void Audio_StopPlayerNoise(u8 playerId) {
switch (sPlayerNoise[playerId].form) { switch (sPlayerNoise[playerId].form) {
case FORM_ARWING: case FORM_ARWING:
if (gPlayer[playerId].sfx.levelType == LEVELTYPE_SPACE) { if (gPlayer[playerId].sfx.levelType == LEVELTYPE_SPACE) {
sfxId = 0x0100F020; sfxId = NA_SE_ARWING_ENGIN_SPC;
} else { } else {
sfxId = 0x0100F005; sfxId = NA_SE_ARWING_ENGIN_GRD;
} }
Audio_KillSfxBySourceAndId(gPlayer[playerId].sfx.srcPos, 0x1100000B); Audio_KillSfxBySourceAndId(gPlayer[playerId].sfx.srcPos, NA_SE_SPLASH_LEVEL_S);
break; break;
case FORM_LANDMASTER: case FORM_LANDMASTER:
sfxId = 0x0100F006; sfxId = NA_SE_TANK_ENGIN;
break; break;
case FORM_BLUE_MARINE: case FORM_BLUE_MARINE:
sfxId = 0x0100F022; sfxId = NA_SE_MARINE_ENGINE00;
Audio_KillSfxBySourceAndId(gPlayer[playerId].sfx.srcPos, 0x1100802C); Audio_KillSfxBySourceAndId(gPlayer[playerId].sfx.srcPos, NA_SE_SUBMARINE_ATM);
break; break;
} }
sPlayerNoise[playerId].form = FORM_NONE; sPlayerNoise[playerId].form = FORM_NONE;
@ -2527,7 +2536,7 @@ void Audio_InitBombSfx(u8 playerId, u8 type) {
break; break;
} }
if (sBombState[playerId] != 1) { if (sBombState[playerId] != 1) {
Audio_PlaySfx(0x01008008, gPlayer[playerId].sfx.srcPos, playerId, &sBombFreqMod[playerId], &gDefaultMod, Audio_PlaySfx(NA_SE_BOMB_CHARGE, gPlayer[playerId].sfx.srcPos, playerId, &sBombFreqMod[playerId], &gDefaultMod,
&sPlayerNoise[playerId].reverbAdd); &sPlayerNoise[playerId].reverbAdd);
sBombState[playerId] = 1; sBombState[playerId] = 1;
} }
@ -2547,8 +2556,8 @@ void Audio_PlayBombFlightSfx(u8 playerId, f32* sfxSource) {
sBombFreqMod[playerId] = 1.0f; sBombFreqMod[playerId] = 1.0f;
break; break;
} }
Audio_KillSfxBySourceAndId(gPlayer[playerId].sfx.srcPos, 0x01008008); Audio_KillSfxBySourceAndId(gPlayer[playerId].sfx.srcPos, NA_SE_BOMB_CHARGE);
Audio_PlaySfx(0x09001001, sfxSource, playerId, &sBombFreqMod[playerId], &gDefaultMod, Audio_PlaySfx(NA_SE_SMART_BOMB_SHOT, sfxSource, playerId, &sBombFreqMod[playerId], &gDefaultMod,
&sPlayerNoise[playerId].reverbAdd); &sPlayerNoise[playerId].reverbAdd);
sBombState[playerId] = 2; sBombState[playerId] = 2;
} }
@ -2560,30 +2569,30 @@ void Audio_PlayBombExplodeSfx(u8 playerId, f32* sfxSource) {
if (sBombState[playerId] != 0) { if (sBombState[playerId] != 0) {
switch (sBombType[playerId]) { switch (sBombType[playerId]) {
case 1: case 1:
sfxId = 0x0903A00A; sfxId = NA_SE_BOMB_EXPLODE1;
break; break;
case 2: case 2:
sfxId = 0x0901A00B; sfxId = NA_SE_BOMB_EXPLODE2;
break; break;
default: default:
case 0: case 0:
sfxId = 0x0901A009; sfxId = NA_SE_BOMB_EXPLODE0;
break; break;
} }
Audio_KillSfxByTokenAndId(playerId, 0x09001001); Audio_KillSfxByTokenAndId(playerId, NA_SE_SMART_BOMB_SHOT);
AUDIO_PLAY_SFX(sfxId, sfxSource, playerId); AUDIO_PLAY_SFX(sfxId, sfxSource, playerId);
sBombState[playerId] = 0; sBombState[playerId] = 0;
} }
} }
void Audio_StartEngineNoise(f32* sfxSource) { void Audio_StartEngineNoise(f32* sfxSource) {
u32 sfxId = (gPlayer[0].sfx.levelType == LEVELTYPE_SPACE) ? 0x31000040 : 0x3100000C; u32 sfxId = (gPlayer[0].sfx.levelType == LEVELTYPE_SPACE) ? NA_SE_ARWING_ENGINE_FS : NA_SE_ARWING_ENGINE_FG;
AUDIO_PLAY_SFX(sfxId, sfxSource, 0); AUDIO_PLAY_SFX(sfxId, sfxSource, 0);
} }
void Audio_StopEngineNoise(f32* sfxSource) { void Audio_StopEngineNoise(f32* sfxSource) {
u32 sfxId = (gPlayer[0].sfx.levelType == LEVELTYPE_SPACE) ? 0x31000040 : 0x3100000C; u32 sfxId = (gPlayer[0].sfx.levelType == LEVELTYPE_SPACE) ? NA_SE_ARWING_ENGINE_FS : NA_SE_ARWING_ENGINE_FG;
Audio_KillSfxBySourceAndId(sfxSource, sfxId); Audio_KillSfxBySourceAndId(sfxSource, sfxId);
} }
@ -2696,7 +2705,7 @@ void Audio_PlayDeathSequence(void) {
if (sAudioSpecId == AUDIOSPEC_24) { if (sAudioSpecId == AUDIOSPEC_24) {
Audio_ClearVoice(); Audio_ClearVoice();
Audio_PlayMapMenuSfx(0); Audio_PlayMapMenuSfx(0);
AUDIO_PLAY_SFX(0x0903F004, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_ARWING_EXPLOSION, gDefaultSfxSource, 4);
SEQCMD_SET_SEQPLAYER_VOLUME(SEQ_PLAYER_BGM, 5, 30); SEQCMD_SET_SEQPLAYER_VOLUME(SEQ_PLAYER_BGM, 5, 30);
SEQCMD_SETUP_RESTORE_SEQPLAYER_VOLUME(SEQ_PLAYER_FANFARE, SEQ_PLAYER_BGM, 30); SEQCMD_SETUP_RESTORE_SEQPLAYER_VOLUME(SEQ_PLAYER_FANFARE, SEQ_PLAYER_BGM, 30);
SEQCMD_PLAY_SEQUENCE(SEQ_PLAYER_FANFARE, 0, 0, SEQ_ID_DEATH); SEQCMD_PLAY_SEQUENCE(SEQ_PLAYER_FANFARE, 0, 0, SEQ_ID_DEATH);
@ -2705,7 +2714,7 @@ void Audio_PlayDeathSequence(void) {
Audio_KillSfxByBank(i); Audio_KillSfxByBank(i);
} }
AUDIOCMD_GLOBAL_UNMUTE(true); AUDIOCMD_GLOBAL_UNMUTE(true);
AUDIO_PLAY_SFX(0x0903F004, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_ARWING_EXPLOSION, gDefaultSfxSource, 4);
SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 0); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 0);
SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 0); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 0);
SEQCMD_PLAY_SEQUENCE(SEQ_PLAYER_BGM, 0, 0, SEQ_ID_DEATH); SEQCMD_PLAY_SEQUENCE(SEQ_PLAYER_BGM, 0, 0, SEQ_ID_DEATH);
@ -2714,20 +2723,20 @@ void Audio_PlayDeathSequence(void) {
void Audio_PlayPauseSfx(u8 active) { void Audio_PlayPauseSfx(u8 active) {
if (active) { if (active) {
AUDIO_PLAY_SFX(0x4900F000, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_PAUSE_ON, gDefaultSfxSource, 4);
AUDIOCMD_GLOBAL_MUTE(); AUDIOCMD_GLOBAL_MUTE();
} else { } else {
AUDIO_PLAY_SFX(0x4900F000, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_PAUSE_ON, gDefaultSfxSource, 4);
AUDIOCMD_GLOBAL_UNMUTE(false); AUDIOCMD_GLOBAL_UNMUTE(false);
} }
} }
void Audio_PlayMapMenuSfx(u8 active) { void Audio_PlayMapMenuSfx(u8 active) {
if (active) { if (active) {
AUDIO_PLAY_SFX(0x49000019, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_MAP_WINDOW_OPEN, gDefaultSfxSource, 4);
AUDIOCMD_GLOBAL_MUTE(); AUDIOCMD_GLOBAL_MUTE();
} else { } else {
AUDIO_PLAY_SFX(0x4900101A, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_MAP_WINDOW_CLOSE, gDefaultSfxSource, 4);
AUDIOCMD_GLOBAL_UNMUTE(false); AUDIOCMD_GLOBAL_UNMUTE(false);
} }
} }
@ -2765,14 +2774,14 @@ void Audio_PlaySoundTest(u8 enable) {
case false: case false:
AUDIO_PLAY_BGM(SEQ_ID_MENU); AUDIO_PLAY_BGM(SEQ_ID_MENU);
Audio_PlayVoice(1); Audio_PlayVoice(1);
Audio_KillSfxById(0x0100001F); Audio_KillSfxById(NA_SE_VOLUME_TEST);
Audio_KillSfxById(0x0100F005); Audio_KillSfxById(NA_SE_ARWING_ENGIN_GRD);
break; break;
case true: case true:
AUDIO_PLAY_BGM(SEQ_ID_VERSUS); AUDIO_PLAY_BGM(SEQ_ID_VERSUS);
Audio_PlayVoice(2); Audio_PlayVoice(2);
AUDIO_PLAY_SFX(0x0100001F, gDefaultSfxSource, 0); AUDIO_PLAY_SFX(NA_SE_VOLUME_TEST, gDefaultSfxSource, 0);
AUDIO_PLAY_SFX(0x0100F005, gDefaultSfxSource, 0); AUDIO_PLAY_SFX(NA_SE_ARWING_ENGIN_GRD, gDefaultSfxSource, 0);
break; break;
} }
} }
@ -2796,7 +2805,7 @@ void Audio_PlaySoundTestTrack(u8 trackNumber) {
sPlaylistCmdIndex = 0; sPlaylistCmdIndex = 0;
sPlaylistTimer = 0; sPlaylistTimer = 0;
} else if (trackNumber >= 50) { } else if (trackNumber >= 50) {
AUDIO_PLAY_SFX(0x4900100A, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_ERROR, gDefaultSfxSource, 4);
} else { } else {
sPlaylistIndex = 0xFF; sPlaylistIndex = 0xFF;
sp26 = sSoundTestTracks[trackNumber].seqId & 0xFF; sp26 = sSoundTestTracks[trackNumber].seqId & 0xFF;

28
src/engine/fox_360.c
View File

@ -100,7 +100,7 @@ void AllRange_DrawCountdown(void) {
HUD_DrawCountdown(gAllRangeCountdown, gAllRangeCountdownScale); HUD_DrawCountdown(gAllRangeCountdown, gAllRangeCountdownScale);
if ((gAllRangeCountdown[0] == 0) && (seconds != gAllRangeCountdown[1]) && (gAllRangeCountdown[1] < 15)) { if ((gAllRangeCountdown[0] == 0) && (seconds != gAllRangeCountdown[1]) && (gAllRangeCountdown[1] < 15)) {
AUDIO_PLAY_SFX(0x4900C02A, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_COUNTDOWN, gDefaultSfxSource, 4);
} }
} }
} }
@ -198,7 +198,7 @@ void AllRange_GreatFoxRepair(Player* player) {
} else { } else {
gRightWingHealth[0] = gLeftWingHealth[0] = 60; gRightWingHealth[0] = gLeftWingHealth[0] = 60;
} }
AUDIO_PLAY_SFX(0x4900200E, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_SHIELD_RING, gDefaultSfxSource, 4);
player->csState++; player->csState++;
} }
break; break;
@ -211,7 +211,7 @@ void AllRange_GreatFoxRepair(Player* player) {
player->baseSpeed = gArwingSpeed; player->baseSpeed = gArwingSpeed;
player->csState++; player->csState++;
AUDIO_PLAY_SFX(0x09000002, player->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_ARWING_BOOST, player->sfxSource, 0);
} }
break; break;
case 4: case 4:
@ -397,12 +397,12 @@ void ActorAllRange_SpawnTeam(void) {
} }
actor->iwork[11] = 1; actor->iwork[11] = 1;
if (actor->aiType <= AI360_PEPPY) { if (actor->aiType <= AI360_PEPPY) {
AUDIO_PLAY_SFX(0x3100000C, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_ARWING_ENGINE_FG, actor->sfxSource, 4);
actor->info.hitbox = SEGMENTED_TO_VIRTUAL(gTeamHitbox); actor->info.hitbox = SEGMENTED_TO_VIRTUAL(gTeamHitbox);
actor->info.targetOffset = 0.0f; actor->info.targetOffset = 0.0f;
actor->info.bonus = 0; actor->info.bonus = 0;
} else { } else {
AUDIO_PLAY_SFX(0x31000011, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_ENGINE_01, actor->sfxSource, 4);
} }
} }
} }
@ -446,9 +446,9 @@ void ActorAllRange_SpawnStarWolf(void) {
} }
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
if (gCurrentLevel == LEVEL_VENOM_2) { if (gCurrentLevel == LEVEL_VENOM_2) {
AUDIO_PLAY_SFX(0x31004006, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_WOLF_ENGINE2, actor->sfxSource, 4);
} else { } else {
AUDIO_PLAY_SFX(0x31004005, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_WOLF_ENGINE, actor->sfxSource, 4);
} }
} }
} }
@ -657,7 +657,7 @@ void ActorAllRange_SpawnSupplies(Actor* this) {
supplies->obj.pos.x = 200.0f; supplies->obj.pos.x = 200.0f;
supplies->obj.pos.y = -500.0f; supplies->obj.pos.y = -500.0f;
supplies->obj.pos.z = 0.0f; supplies->obj.pos.z = 0.0f;
AUDIO_PLAY_SFX(0x09000002, supplies->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_ARWING_BOOST, supplies->sfxSource, 0);
supplies->timer_0C2 = 50; supplies->timer_0C2 = 50;
} else { } else {
supplies->obj.pos.x = 0.0f; supplies->obj.pos.x = 0.0f;
@ -886,7 +886,7 @@ void ActorAllRange_ApplyDamage(Actor* this) {
this->obj.status = OBJ_DYING; this->obj.status = OBJ_DYING;
this->fwork[23] = 0.0f; this->fwork[23] = 0.0f;
func_effect_8007D2C8(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, 4.0f); func_effect_8007D2C8(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, 4.0f);
AUDIO_PLAY_SFX(0x2903700B, this->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_CRASH_DOWN, this->sfxSource, 4);
this->timer_0C2 = 10; this->timer_0C2 = 10;
this->timer_0BE = 0; this->timer_0BE = 0;
this->timer_04C = RAND_INT(2.9f); this->timer_04C = RAND_INT(2.9f);
@ -1006,7 +1006,7 @@ void ActorAllRange_ApplyDamage(Actor* this) {
} }
} else { } else {
if (var_a1) { if (var_a1) {
AUDIO_PLAY_SFX(0x29001062, this->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_BARRIER_REFLECT, this->sfxSource, 4);
this->iwork[7] = 3; this->iwork[7] = 3;
this->iwork[18] = 5; this->iwork[18] = 5;
this->iwork[8] = 15; this->iwork[8] = 15;
@ -1022,9 +1022,9 @@ void ActorAllRange_ApplyDamage(Actor* this) {
this->iwork[8] = 20; this->iwork[8] = 20;
} }
if (this->aiType == AI360_MISSILE) { if (this->aiType == AI360_MISSILE) {
AUDIO_PLAY_SFX(0x29034003, this->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OB_DAMAGE_M, this->sfxSource, 4);
} else if (this->iwork[7] == 0) { } else if (this->iwork[7] == 0) {
AUDIO_PLAY_SFX(0x2903300E, this->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_DAMAGE_S, this->sfxSource, 4);
} }
func_effect_8007D10C(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, 1.5f); func_effect_8007D10C(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, 1.5f);
if (this->aiType < AI360_GREAT_FOX) { if (this->aiType < AI360_GREAT_FOX) {
@ -1364,7 +1364,7 @@ void ActorAllRange_Update(Actor* this) {
this->fwork[29] = 5.0f; this->fwork[29] = 5.0f;
this->fwork[7] = 360.0f; this->fwork[7] = 360.0f;
this->fwork[8] = 0.0f; this->fwork[8] = 0.0f;
AUDIO_PLAY_SFX(0x09000002, this->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_ARWING_BOOST, this->sfxSource, 0);
this->unk_046 = 0; this->unk_046 = 0;
} }
gTeamShields[this->aiType] = -1; gTeamShields[this->aiType] = -1;
@ -2095,7 +2095,7 @@ void ActorAllRange_Update(Actor* this) {
this->obj.status = OBJ_DYING; this->obj.status = OBJ_DYING;
this->itemDrop = DROP_NONE; this->itemDrop = DROP_NONE;
func_effect_8007BFFC(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, 0.0f, 0.0f, 0.0f, 5.0f, 15); func_effect_8007BFFC(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, 0.0f, 0.0f, 0.0f, 5.0f, 15);
func_effect_8007A6F0(&this->obj.pos, 0x2903A008); func_effect_8007A6F0(&this->obj.pos, NA_SE_EN_EXPLOSION_S);
} else { } else {
this->dmgType = DMG_BEAM; this->dmgType = DMG_BEAM;
this->damage = 10; this->damage = 10;

30
src/engine/fox_beam.c
View File

@ -69,7 +69,7 @@ void func_beam_80035E78(PlayerShot* shot) {
shot->unk_48 * 3.0f, 10); shot->unk_48 * 3.0f, 10);
func_effect_8007ADF4(shot->obj.pos.x, gGroundHeight, shot->obj.pos.z, shot->unk_48 * 0.05f, func_effect_8007ADF4(shot->obj.pos.x, gGroundHeight, shot->obj.pos.z, shot->unk_48 * 0.05f,
shot->unk_48 * 0.5f); shot->unk_48 * 0.5f);
func_effect_8007A6F0(&shot->obj.pos, 0x19000014); func_effect_8007A6F0(&shot->obj.pos, NA_SE_OB_WATER_BOUND_M);
} else { } else {
func_enmy_80062B60(shot->obj.pos.x, shot->obj.pos.z, 0, shot->unk_48 * 3.0f); func_enmy_80062B60(shot->obj.pos.x, shot->obj.pos.z, 0, shot->unk_48 * 3.0f);
} }
@ -177,7 +177,7 @@ void func_beam_80036528(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 yRot,
effect->unk_46 = 80; effect->unk_46 = 80;
effect->timer_50 = time; effect->timer_50 = time;
Object_SetInfo(&effect->info, effect->obj.id); Object_SetInfo(&effect->info, effect->obj.id);
func_play_800A6070(effect->sfxSource, 0x29000000); func_play_800A6070(effect->sfxSource, NA_SE_EXPLOSION_S);
} }
void func_beam_800365E4(f32 xPos, f32 yPos, f32 zPos, f32 arg3, f32 arg4, f32 arg5, f32 yRot, f32 xRot, f32 scale, void func_beam_800365E4(f32 xPos, f32 yPos, f32 zPos, f32 arg3, f32 arg4, f32 arg5, f32 yRot, f32 xRot, f32 scale,
@ -207,7 +207,7 @@ void func_beam_800366CC(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 yRot,
effect->scale2 = scale * 0.5f; effect->scale2 = scale * 0.5f;
effect->timer_50 = 80; effect->timer_50 = 80;
Object_SetInfo(&effect->info, effect->obj.id); Object_SetInfo(&effect->info, effect->obj.id);
func_play_800A6070(effect->sfxSource, 0x29000000); func_play_800A6070(effect->sfxSource, NA_SE_EXPLOSION_S);
} }
void func_beam_80036770(f32 xPos, f32 yPos, f32 zPos, f32 yRot, f32 scale) { void func_beam_80036770(f32 xPos, f32 yPos, f32 zPos, f32 yRot, f32 scale) {
@ -337,7 +337,7 @@ s32 func_beam_80036874(PlayerShot* shot, f32* hitboxData, Object* obj) {
return i + 1; return i + 1;
} }
if (obj->id <= OBJ_SCENERY_160) { if (obj->id <= OBJ_SCENERY_160) {
func_effect_8007A6F0(&shot->obj.pos, 0x29121007); func_effect_8007A6F0(&shot->obj.pos, NA_SE_EN_REFLECT);
} }
return i + 1; return i + 1;
} }
@ -613,7 +613,7 @@ bool func_beam_8003774C(PlayerShot* shot, ObjectId objId, Object* obj) {
return false; return false;
} }
func_beam_80036318(shot); func_beam_80036318(shot);
func_effect_8007A6F0(&shot->obj.pos, 0x29121007); func_effect_8007A6F0(&shot->obj.pos, NA_SE_EN_REFLECT);
if (gCurrentLevel == LEVEL_METEO) { if (gCurrentLevel == LEVEL_METEO) {
Matrix_RotateY(gCalcMatrix, obj->rot.y * M_DTOR, MTXF_NEW); Matrix_RotateY(gCalcMatrix, obj->rot.y * M_DTOR, MTXF_NEW);
sp7C.x = sp4C.x - obj->pos.x; sp7C.x = sp4C.x - obj->pos.x;
@ -636,7 +636,7 @@ bool func_beam_8003774C(PlayerShot* shot, ObjectId objId, Object* obj) {
return false; return false;
} }
func_beam_80036318(shot); func_beam_80036318(shot);
func_effect_8007A6F0(&shot->obj.pos, 0x29121007); func_effect_8007A6F0(&shot->obj.pos, NA_SE_EN_REFLECT);
if (gCurrentLevel == LEVEL_FORTUNA) { if (gCurrentLevel == LEVEL_FORTUNA) {
func_effect_8007BC7C(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f); func_effect_8007BC7C(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f);
func_effect_8007BC7C(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f); func_effect_8007BC7C(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f);
@ -713,7 +713,7 @@ void func_beam_80037CF4(PlayerShot* shot, Actor* actor, s32 hitIndex) {
shot->obj.pos.z += shot->vel.z * 5.0f; shot->obj.pos.z += shot->vel.z * 5.0f;
actor->timer_0C2 = 3; actor->timer_0C2 = 3;
func_effect_80078E50(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 8.0f); func_effect_80078E50(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 8.0f);
AUDIO_PLAY_SFX(0x29121007, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_REFLECT, actor->sfxSource, 4);
func_play_800A668C(D_ctx_8017849C, D_ctx_801784A0, D_ctx_80178498); func_play_800A668C(D_ctx_8017849C, D_ctx_801784A0, D_ctx_80178498);
} }
} else { } else {
@ -860,7 +860,7 @@ void func_beam_80038140(PlayerShot* shot) {
shot->obj.pos.y += 2.0f * shot->vel.y; shot->obj.pos.y += 2.0f * shot->vel.y;
shot->obj.pos.z += 2.0f * shot->vel.z; shot->obj.pos.z += 2.0f * shot->vel.z;
shot->unk_64 = 5; shot->unk_64 = 5;
AUDIO_PLAY_SFX(0x09007011, player->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_ROLLING_REFLECT, player->sfxSource, 0);
func_effect_80078E50(player->pos.x, player->pos.y, player->trueZpos, 8.0f); func_effect_80078E50(player->pos.x, player->pos.y, player->trueZpos, 8.0f);
} else { } else {
func_beam_80036318(shot); func_beam_80036318(shot);
@ -964,7 +964,7 @@ void func_beam_80038140(PlayerShot* shot) {
} else { } else {
boss->dmgType = DMG_BEAM; boss->dmgType = DMG_BEAM;
func_beam_80036318(shot); func_beam_80036318(shot);
AUDIO_PLAY_SFX(0x29001062, shot->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_BARRIER_REFLECT, shot->sfxSource, 4);
} }
} }
} else { } else {
@ -978,7 +978,7 @@ void func_beam_80038140(PlayerShot* shot) {
} else { } else {
boss->dmgType = DMG_BEAM; boss->dmgType = DMG_BEAM;
boss->dmgPart = 100; boss->dmgPart = 100;
AUDIO_PLAY_SFX(0x29121007, shot->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_REFLECT, shot->sfxSource, 4);
func_beam_80036318(shot); func_beam_80036318(shot);
} }
} }
@ -1610,7 +1610,7 @@ void func_beam_8003B55C(PlayerShot* shot, s32 index) {
func_beam_80036318(shot); func_beam_80036318(shot);
shot->obj.pos.y = gGroundHeight + 2; shot->obj.pos.y = gGroundHeight + 2;
if (gCurrentLevel == LEVEL_BOLSE) { if (gCurrentLevel == LEVEL_BOLSE) {
func_effect_8007A6F0(&shot->obj.pos, 0x29121007); func_effect_8007A6F0(&shot->obj.pos, NA_SE_EN_REFLECT);
} }
if ((gCamCount != 4) && (gCurrentLevel != LEVEL_AQUAS)) { if ((gCamCount != 4) && (gCurrentLevel != LEVEL_AQUAS)) {
if ((shot->sourceId == TEAM_ID_FOX) && (gLaserStrength[0] != LASERS_SINGLE) && if ((shot->sourceId == TEAM_ID_FOX) && (gLaserStrength[0] != LASERS_SINGLE) &&
@ -1705,7 +1705,7 @@ bool func_beam_8003BB4C(PlayerShot* shot) {
(fabsf(shot->obj.pos.y - (actor->obj.pos.y + actor->info.targetOffset)) <= var_fa0) && (fabsf(shot->obj.pos.y - (actor->obj.pos.y + actor->info.targetOffset)) <= var_fa0) &&
(fabsf(shot->obj.pos.z - actor->obj.pos.z) <= var_fa0))) { (fabsf(shot->obj.pos.z - actor->obj.pos.z) <= var_fa0))) {
actor->lockOnTimers[shot->sourceId] = 20; actor->lockOnTimers[shot->sourceId] = 20;
func_enmy_80060F30(gPlayer[shot->sourceId].sfxSource, 0x49008027, shot->sourceId); func_enmy_80060F30(gPlayer[shot->sourceId].sfxSource, NA_SE_LOCK_ON, shot->sourceId);
for (j = 0; j < ARRAY_COUNT(gPlayerShots); j++) { for (j = 0; j < ARRAY_COUNT(gPlayerShots); j++) {
if (gPlayerShots[j].obj.id == PLAYERSHOT_4) { if (gPlayerShots[j].obj.id == PLAYERSHOT_4) {
Object_Kill(&gPlayerShots[j].obj, gPlayerShots[j].sfxSource); Object_Kill(&gPlayerShots[j].obj, gPlayerShots[j].sfxSource);
@ -1726,7 +1726,7 @@ bool func_beam_8003BB4C(PlayerShot* shot) {
gVsLockOnTimers[0][shot->sourceId] = gVsLockOnTimers[1][shot->sourceId] = gVsLockOnTimers[0][shot->sourceId] = gVsLockOnTimers[1][shot->sourceId] =
gVsLockOnTimers[2][shot->sourceId] = gVsLockOnTimers[3][shot->sourceId] = 0; gVsLockOnTimers[2][shot->sourceId] = gVsLockOnTimers[3][shot->sourceId] = 0;
gVsLockOnTimers[i][shot->sourceId] = 20; gVsLockOnTimers[i][shot->sourceId] = 20;
func_enmy_80060F30(gPlayer[shot->sourceId].sfxSource, 0x49008027, shot->sourceId); func_enmy_80060F30(gPlayer[shot->sourceId].sfxSource, NA_SE_LOCK_ON, shot->sourceId);
for (j = 0; j < ARRAY_COUNT(gPlayerShots); j++) { for (j = 0; j < ARRAY_COUNT(gPlayerShots); j++) {
if (gPlayerShots[j].obj.id == PLAYERSHOT_4) { if (gPlayerShots[j].obj.id == PLAYERSHOT_4) {
Object_Kill(&gPlayerShots[j].obj, gPlayerShots[j].sfxSource); Object_Kill(&gPlayerShots[j].obj, gPlayerShots[j].sfxSource);
@ -2085,7 +2085,7 @@ void func_beam_8003CF90(PlayerShot* shot) {
shot->unk_48 * 3.0f, 5); shot->unk_48 * 3.0f, 5);
func_effect_8007ADF4(shot->obj.pos.x, gGroundHeight, shot->obj.pos.z, shot->unk_48 * 0.05f, func_effect_8007ADF4(shot->obj.pos.x, gGroundHeight, shot->obj.pos.z, shot->unk_48 * 0.05f,
shot->unk_48 * 0.5f); shot->unk_48 * 0.5f);
func_effect_8007A6F0(&shot->obj.pos, 0x19000014); func_effect_8007A6F0(&shot->obj.pos, NA_SE_OB_WATER_BOUND_M);
} }
func_beam_80036318(shot); func_beam_80036318(shot);
} else { } else {
@ -2238,7 +2238,7 @@ void func_beam_8003D54C(PlayerShot* shot, s32 index) {
} }
} }
Object_Kill(&shot->obj, shot->sfxSource); Object_Kill(&shot->obj, shot->sfxSource);
func_effect_8007A6F0(&shot->obj.pos, 0x0903502E); func_effect_8007A6F0(&shot->obj.pos, NA_SE_SPREAD_EXPLSION);
} else if (gCurrentLevel == LEVEL_AQUAS) { } else if (gCurrentLevel == LEVEL_AQUAS) {
Aquas_801ABA40(shot); Aquas_801ABA40(shot);
} else { } else {

56
src/engine/fox_demo.c
View File

@ -174,12 +174,12 @@ void func_demo_80048CC4(Actor* actor, s32 arg1) {
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
if (arg1 == 3) { if (arg1 == 3) {
AUDIO_PLAY_SFX(0x11030010, actor->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_GREATFOX_ENGINE, actor->sfxSource, 0);
AUDIO_PLAY_SFX(0x31024059, actor->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_GREATFOX_BURNER, actor->sfxSource, 0);
actor->unk_0B6 = 1; actor->unk_0B6 = 1;
} else { } else {
actor->iwork[11] = 1; actor->iwork[11] = 1;
AUDIO_PLAY_SFX(0x3100000C, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_ARWING_ENGINE_FG, actor->sfxSource, 4);
} }
} }
@ -266,7 +266,7 @@ void Cutscene_WarpZoneComplete(Player* player) {
break; break;
case 450: case 450:
AUDIO_PLAY_SFX(0x09000002, player->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_ARWING_BOOST, player->sfxSource, 0);
player->unk_194 = 5.0f; player->unk_194 = 5.0f;
player->unk_190 = 5.0f; player->unk_190 = 5.0f;
@ -357,7 +357,7 @@ void func_demo_80049630(ActorCutscene* this) {
case 1: case 1:
this->state = 2; this->state = 2;
AUDIO_PLAY_SFX(0x09000002, this->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_ARWING_BOOST, this->sfxSource, 0);
this->timer_0BC = 150; this->timer_0BC = 150;
this->fwork[29] = 5.0f; this->fwork[29] = 5.0f;
@ -411,7 +411,7 @@ void func_demo_80049968(Actor* actor, s32 arg1) {
actor->vel.z = gPlayer[0].vel.z; actor->vel.z = gPlayer[0].vel.z;
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
actor->iwork[11] = 1; actor->iwork[11] = 1;
AUDIO_PLAY_SFX(0x3100000C, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_ARWING_ENGINE_FG, actor->sfxSource, 4);
} }
void func_demo_80049A9C(Effect* effect, f32 x, f32 y, f32 z) { void func_demo_80049A9C(Effect* effect, f32 x, f32 y, f32 z) {
@ -521,7 +521,7 @@ void Cutscene_EnterWarpZone(Player* player) {
if (player->csTimer <= 100) { if (player->csTimer <= 100) {
if (player->csTimer == 100) { if (player->csTimer == 100) {
func_play_800A6028(player->sfxSource, 0x0940802A); func_play_800A6028(player->sfxSource, NA_SE_ARWING_WARP_DASH);
player->unk_194 = 5.0f; player->unk_194 = 5.0f;
player->unk_190 = 5.0f; player->unk_190 = 5.0f;
} }
@ -540,22 +540,22 @@ void Cutscene_EnterWarpZone(Player* player) {
if ((player->csTimer == 95) && (gTeamShields[TEAM_ID_FALCO] > 0)) { if ((player->csTimer == 95) && (gTeamShields[TEAM_ID_FALCO] > 0)) {
gActors[0].state = var_v0; gActors[0].state = var_v0;
AUDIO_PLAY_SFX(0x0940802A, gActors[0].sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_ARWING_WARP_DASH, gActors[0].sfxSource, 0);
} }
if ((player->csTimer == 90) && (gTeamShields[TEAM_ID_PEPPY] > 0)) { if ((player->csTimer == 90) && (gTeamShields[TEAM_ID_PEPPY] > 0)) {
gActors[2].state = var_v0; gActors[2].state = var_v0;
AUDIO_PLAY_SFX(0x0940802A, gActors[2].sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_ARWING_WARP_DASH, gActors[2].sfxSource, 0);
} }
if ((player->csTimer == 85) && (gTeamShields[TEAM_ID_SLIPPY] > 0)) { if ((player->csTimer == 85) && (gTeamShields[TEAM_ID_SLIPPY] > 0)) {
gActors[1].state = var_v0; gActors[1].state = var_v0;
AUDIO_PLAY_SFX(0x0940802A, gActors[1].sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_ARWING_WARP_DASH, gActors[1].sfxSource, 0);
} }
if (player->csTimer == 60) { if (player->csTimer == 60) {
gActors[3].state = var_v0; gActors[3].state = var_v0;
AUDIO_PLAY_SFX(0x0940802A, gActors[3].sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_ARWING_WARP_DASH, gActors[3].sfxSource, 0);
SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 50); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 50);
SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 50); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 50);
} }
@ -588,7 +588,7 @@ void Cutscene_EnterWarpZone(Player* player) {
player->unk_234 = 1; player->unk_234 = 1;
gLevelPhase = 1; gLevelPhase = 1;
D_display_800CA230 = 0.15f; D_display_800CA230 = 0.15f;
AUDIO_PLAY_SFX(0x11407079, gDefaultSfxSource, 0); AUDIO_PLAY_SFX(NA_SE_WARP_OUT, gDefaultSfxSource, 0);
func_play_800AB334(); func_play_800AB334();
} }
} }
@ -737,7 +737,7 @@ void func_demo_8004A700(Actor* actor, s32 arg1) {
actor->obj.rot.z = D_demo_800CA074[arg1]; actor->obj.rot.z = D_demo_800CA074[arg1];
actor->iwork[11] = 1; actor->iwork[11] = 1;
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
AUDIO_PLAY_SFX(0x3100000C, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_ARWING_ENGINE_FG, actor->sfxSource, 4);
} }
void func_demo_8004A840(s32 actor) { void func_demo_8004A840(s32 actor) {
@ -865,11 +865,11 @@ void Cutscene_AllRangeMode(Player* player) {
} }
if (gCsFrameCount == 138) { if (gCsFrameCount == 138) {
AUDIO_PLAY_SFX(0x09000007, player->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_WING_OPEN, player->sfxSource, 0);
} }
if (gCsFrameCount == 190) { if (gCsFrameCount == 190) {
AUDIO_PLAY_SFX(0x09000013, player->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_WING_OPEN_END, player->sfxSource, 0);
} }
if (D_ctx_80177A48[1] > 350.0f) { if (D_ctx_80177A48[1] > 350.0f) {
@ -879,7 +879,7 @@ void Cutscene_AllRangeMode(Player* player) {
player->unk_194 = 10.0f; player->unk_194 = 10.0f;
player->unk_190 = 10.0f; player->unk_190 = 10.0f;
AUDIO_PLAY_SFX(0x09000002, player->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_ARWING_BOOST, player->sfxSource, 0);
D_ctx_801779A8[player->num] = 70.0f; D_ctx_801779A8[player->num] = 70.0f;
@ -1307,7 +1307,7 @@ void Cutscene_CoComplete2(Player* player) {
case 1255: case 1255:
player->csState = 3; player->csState = 3;
player->csTimer = 10; player->csTimer = 10;
func_play_800A6028(player->sfxSource, 0x09000002); func_play_800A6028(player->sfxSource, NA_SE_ARWING_BOOST);
SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 50); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 50);
SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 50); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 50);
break; break;
@ -1514,7 +1514,7 @@ void Cutscene_UTurn(Player* player) {
player->zRotBank = -180.0f; player->zRotBank = -180.0f;
} }
player->csState = 3; player->csState = 3;
func_play_800A5FA0(player->sfxSource, 0x09000002, player->num); func_play_800A5FA0(player->sfxSource, NA_SE_ARWING_BOOST, player->num);
player->unk_194 = 7.0f; player->unk_194 = 7.0f;
player->unk_190 = 7.0f; player->unk_190 = 7.0f;
} }
@ -1611,8 +1611,8 @@ void Cutscene_KillPlayer(Player* player) {
s32 teamId; s32 teamId;
Audio_StopPlayerNoise(player->num); Audio_StopPlayerNoise(player->num);
Audio_KillSfxBySourceAndId(player->sfxSource, 0x0900C010); Audio_KillSfxBySourceAndId(player->sfxSource, NA_SE_ARWING_DOWN);
func_play_800A5FA0(player->sfxSource, 0x0903F004, player->num); func_play_800A5FA0(player->sfxSource, NA_SE_ARWING_EXPLOSION, player->num);
player->state_1C8 = PLAYERSTATE_1C8_NEXT; player->state_1C8 = PLAYERSTATE_1C8_NEXT;
player->csTimer = 70; player->csTimer = 70;
player->timer_224 = 20; player->timer_224 = 20;
@ -1728,7 +1728,7 @@ void func_demo_8004D828(Player* player) {
player->vel.y = 10.0f; player->vel.y = 10.0f;
player->csState = 1; player->csState = 1;
func_play_800A6070(player->sfxSource, 0x29000000); func_play_800A6070(player->sfxSource, NA_SE_EXPLOSION_S);
if ((gCurrentLevel == LEVEL_CORNERIA) || (gCurrentLevel == LEVEL_FORTUNA)) { if ((gCurrentLevel == LEVEL_CORNERIA) || (gCurrentLevel == LEVEL_FORTUNA)) {
func_enmy_80062C38(player->pos.x, player->pos.z); func_enmy_80062C38(player->pos.x, player->pos.z);
@ -1838,7 +1838,7 @@ void func_demo_8004DEF8(Player* player) {
player->radioDamageTimer = 0; player->radioDamageTimer = 0;
player->vel.y = 10.0f; player->vel.y = 10.0f;
player->csState = 1; player->csState = 1;
func_play_800A6070(player->sfxSource, 0x29000000); func_play_800A6070(player->sfxSource, NA_SE_EXPLOSION_S);
if (gCurrentLevel == LEVEL_CORNERIA) { if (gCurrentLevel == LEVEL_CORNERIA) {
func_enmy_80062C38(player->pos.x, player->pos.z); func_enmy_80062C38(player->pos.x, player->pos.z);
} }
@ -1949,7 +1949,7 @@ void func_demo_8004E4D4(ActorCutscene* this) {
this->state = 2; this->state = 2;
this->timer_0BC = 50; this->timer_0BC = 50;
this->fwork[9] = 2.0f; this->fwork[9] = 2.0f;
AUDIO_PLAY_SFX(0x09000002, this->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_ARWING_BOOST, this->sfxSource, 0);
this->fwork[29] = 5.0f; this->fwork[29] = 5.0f;
/* fallthrough */ /* fallthrough */
@ -1971,7 +1971,7 @@ void func_demo_8004E4D4(ActorCutscene* this) {
this->state = 11; this->state = 11;
this->timer_0BC = 150; this->timer_0BC = 150;
this->timer_0BE = 40; this->timer_0BE = 40;
AUDIO_PLAY_SFX(0x09000002, this->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_ARWING_BOOST, this->sfxSource, 0);
this->fwork[29] = 5.0f; this->fwork[29] = 5.0f;
/* fallthrough */ /* fallthrough */
case 11: case 11:
@ -2026,7 +2026,7 @@ void func_demo_8004E4D4(ActorCutscene* this) {
break; break;
case 31: case 31:
AUDIO_PLAY_SFX(0x09000002, this->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_ARWING_BOOST, this->sfxSource, 0);
this->state += 1; this->state += 1;
this->fwork[29] = 5.0f; this->fwork[29] = 5.0f;
/* fallthrough */ /* fallthrough */
@ -2111,7 +2111,7 @@ void func_demo_8004EBD0(ActorCutscene* this) {
if (this->timer_0BC == 0) { if (this->timer_0BC == 0) {
this->state++; this->state++;
this->timer_0BC = 10; this->timer_0BC = 10;
func_play_800A6028(this->sfxSource, 0x09000002); func_play_800A6028(this->sfxSource, NA_SE_ARWING_BOOST);
this->fwork[29] = 5.0f; this->fwork[29] = 5.0f;
} }
break; break;
@ -2183,7 +2183,7 @@ void func_demo_8004F05C(Actor* actor) {
case 1: case 1:
actor->state = 2; actor->state = 2;
actor->timer_0BC = 100; actor->timer_0BC = 100;
AUDIO_PLAY_SFX(0x09000002, actor->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_ARWING_BOOST, actor->sfxSource, 0);
actor->fwork[29] = 5.0f; actor->fwork[29] = 5.0f;
case 2: case 2:
@ -2402,7 +2402,7 @@ void ActorCutscene_Update(ActorCutscene* this) {
this->state = 1; this->state = 1;
this->timer_0BC = 50; this->timer_0BC = 50;
this->iwork[0] = 255; this->iwork[0] = 255;
AUDIO_PLAY_SFX(0x2902F026, this->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_EN_BOSS_EXPLOSION, this->sfxSource, 0);
} }
break; break;

40
src/engine/fox_effect.c
View File

@ -925,7 +925,7 @@ void func_effect_8007A4B8(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scal
effect->obj.pos.y = yPos; effect->obj.pos.y = yPos;
effect->obj.pos.z = zPos; effect->obj.pos.z = zPos;
AUDIO_PLAY_SFX(0x2940F026, effect->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_STAR_EXPLOSION, effect->sfxSource, 4);
Object_SetInfo(&effect->info, effect->obj.id); Object_SetInfo(&effect->info, effect->obj.id);
} }
@ -952,9 +952,9 @@ void func_effect_8007A5F8(Effect* effect, Vec3f* pos, u32 sfxId) {
effect->timer_50 = 50; effect->timer_50 = 50;
if ((sfxId == 0x1903400F) || (sfxId == 0x11000055)) { if ((sfxId == NA_SE_OB_EXPLOSION_S) || (sfxId == NA_SE_OB_SMOKE)) {
AUDIO_PLAY_SFX(sfxId, effect->sfxSource, 0); AUDIO_PLAY_SFX(sfxId, effect->sfxSource, 0);
if (sfxId == 0x11000055) { if (sfxId == NA_SE_OB_SMOKE) {
effect->timer_50 = 300; effect->timer_50 = 300;
} }
} else { } else {
@ -1198,7 +1198,7 @@ void func_effect_8007B180(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scal
effect->unk_44 = 255; effect->unk_44 = 255;
effect->scale1 = scale1; effect->scale1 = scale1;
Object_SetInfo(&effect->info, effect->obj.id); Object_SetInfo(&effect->info, effect->obj.id);
AUDIO_PLAY_SFX(0x1100000C, effect->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_SPLASH_LEVEL_L, effect->sfxSource, 0);
} }
void func_effect_8007B228(f32 xPos, f32 yPos, f32 zPos, f32 scale1) { void func_effect_8007B228(f32 xPos, f32 yPos, f32 zPos, f32 scale1) {
@ -1580,7 +1580,7 @@ void func_effect_8007C1AC(f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32
for (i = ARRAY_COUNT(gEffects) - 1; i >= 0; i--) { for (i = ARRAY_COUNT(gEffects) - 1; i >= 0; i--) {
if (gEffects[i].obj.status == OBJ_FREE) { if (gEffects[i].obj.status == OBJ_FREE) {
func_effect_8007BF64(&gEffects[i], xPos, yPos, zPos, xVel, yVel, zVel, scale2, timer50); func_effect_8007BF64(&gEffects[i], xPos, yPos, zPos, xVel, yVel, zVel, scale2, timer50);
func_play_800A6070(gEffects[i].sfxSource, 0x29000000); func_play_800A6070(gEffects[i].sfxSource, NA_SE_EXPLOSION_S);
break; break;
} }
} }
@ -2187,7 +2187,7 @@ void func_effect_8007DB70(Effect* effect) {
effect->unk_44 = 192; effect->unk_44 = 192;
effect->scale2 = 2.5f; effect->scale2 = 2.5f;
effect->scale1 = 2.5f; effect->scale1 = 2.5f;
AUDIO_PLAY_SFX(0x2903B009, effect->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_EXPLOSION_M, effect->sfxSource, 4);
func_effect_8007D0E0(effect->obj.pos.x, effect->obj.pos.y + 30.0f, effect->obj.pos.z, 7.0f); func_effect_8007D0E0(effect->obj.pos.x, effect->obj.pos.y + 30.0f, effect->obj.pos.z, 7.0f);
func_effect_8007BFFC(effect->obj.pos.x, effect->obj.pos.y + 30.0f, effect->obj.pos.z, 0.0f, 0.0f, 0.0f, func_effect_8007BFFC(effect->obj.pos.x, effect->obj.pos.y + 30.0f, effect->obj.pos.z, 0.0f, 0.0f, 0.0f,
4.0f, 5); 4.0f, 5);
@ -2402,7 +2402,7 @@ void func_effect_8007E6B8(Effect* effect, u32 objId, f32 xPos, f32 yPos, f32 zPo
} }
if (objId == OBJ_EFFECT_356) { if (objId == OBJ_EFFECT_356) {
AUDIO_PLAY_SFX(0x31000025, effect->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_ENERGY_BEAM, effect->sfxSource, 4);
} }
if (objId == OBJ_EFFECT_376) { if (objId == OBJ_EFFECT_376) {
@ -2410,9 +2410,9 @@ void func_effect_8007E6B8(Effect* effect, u32 objId, f32 xPos, f32 yPos, f32 zPo
effect->unk_4A = 180; effect->unk_4A = 180;
effect->scale2 = 5.0f; effect->scale2 = 5.0f;
} else if ((objId == OBJ_EFFECT_355) || (objId == OBJ_EFFECT_377)) { } else if ((objId == OBJ_EFFECT_355) || (objId == OBJ_EFFECT_377)) {
AUDIO_PLAY_SFX(0x31000025, effect->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_ENERGY_BEAM, effect->sfxSource, 4);
} else { } else {
AUDIO_PLAY_SFX(0x29002002, effect->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_SHOT_0, effect->sfxSource, 4);
} }
} }
@ -2456,7 +2456,7 @@ void func_effect_8007E93C(Effect* effect, u32 objId, f32 xPos, f32 yPos, f32 zPo
} }
if (objId == OBJ_EFFECT_356) { if (objId == OBJ_EFFECT_356) {
AUDIO_PLAY_SFX(0x31000025, effect->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_ENERGY_BEAM, effect->sfxSource, 4);
} }
if (objId == OBJ_EFFECT_376) { if (objId == OBJ_EFFECT_376) {
@ -2464,9 +2464,9 @@ void func_effect_8007E93C(Effect* effect, u32 objId, f32 xPos, f32 yPos, f32 zPo
effect->unk_4A = 180; effect->unk_4A = 180;
effect->scale2 = 5.0f; effect->scale2 = 5.0f;
} else if ((objId == OBJ_EFFECT_355) || (objId == OBJ_EFFECT_377)) { } else if ((objId == OBJ_EFFECT_355) || (objId == OBJ_EFFECT_377)) {
AUDIO_PLAY_SFX(0x31000025, effect->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_ENERGY_BEAM, effect->sfxSource, 4);
} else { } else {
AUDIO_PLAY_SFX(0x29002002, effect->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_SHOT_0, effect->sfxSource, 4);
} }
} }
@ -2488,9 +2488,9 @@ void func_effect_8007EBB8(Effect* effect, ObjectId objId, f32 xPos, f32 yPos, f3
effect->scale2 = scale2; effect->scale2 = scale2;
if (objId == OBJ_EFFECT_355) { if (objId == OBJ_EFFECT_355) {
AUDIO_PLAY_SFX(0x31000025, effect->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_ENERGY_BEAM, effect->sfxSource, 4);
} else { } else {
AUDIO_PLAY_SFX(0x29002002, effect->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_SHOT_0, effect->sfxSource, 4);
} }
Object_SetInfo(&effect->info, effect->obj.id); Object_SetInfo(&effect->info, effect->obj.id);
} }
@ -2535,7 +2535,7 @@ void func_effect_8007ED54(Effect* effect, ObjectId objId, f32 xPos, f32 yPos, f3
effect->scale2 = scale2; effect->scale2 = scale2;
if (effect->obj.id != OBJ_EFFECT_380) { if (effect->obj.id != OBJ_EFFECT_380) {
AUDIO_PLAY_SFX(0x29002002, effect->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_SHOT_0, effect->sfxSource, 4);
} }
Object_SetInfo(&effect->info, effect->obj.id); Object_SetInfo(&effect->info, effect->obj.id);
} }
@ -2871,7 +2871,7 @@ void func_effect_8007FE88(Effect* effect) {
effect->vel.y = destVelocity.y; effect->vel.y = destVelocity.y;
effect->vel.z = destVelocity.z; effect->vel.z = destVelocity.z;
gPlayer[0].unk_2C4 += 1; gPlayer[0].unk_2C4 += 1;
AUDIO_PLAY_SFX(0x09007011, effect->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_ROLLING_REFLECT, effect->sfxSource, 0);
} }
if ((gPlayer[0].barrelRollAlpha == 0) && (gPlayer[0].timer_498 == 0)) { if ((gPlayer[0].barrelRollAlpha == 0) && (gPlayer[0].timer_498 == 0)) {
@ -3004,7 +3004,7 @@ void func_effect_8008040C(Effect* effect) {
effect->vel.y = destVelocity.y; effect->vel.y = destVelocity.y;
effect->vel.z = destVelocity.z; effect->vel.z = destVelocity.z;
gPlayer[0].unk_2C4++; gPlayer[0].unk_2C4++;
AUDIO_PLAY_SFX(0x09007011, effect->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_ROLLING_REFLECT, effect->sfxSource, 0);
} }
if ((gPlayer[0].barrelRollAlpha == 0) && (gPlayer[0].timer_498 == 0)) { if ((gPlayer[0].barrelRollAlpha == 0) && (gPlayer[0].timer_498 == 0)) {
@ -3368,7 +3368,7 @@ void func_effect_8008165C(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scal
case 10: case 10:
effect->timer_50 = 10; effect->timer_50 = 10;
AUDIO_PLAY_SFX(0x31405094, effect->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_CLBOSS_BEAM, effect->sfxSource, 4);
break; break;
case 11: case 11:
@ -3389,7 +3389,7 @@ void func_effect_8008165C(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scal
effect->obj.pos.y = yPos; effect->obj.pos.y = yPos;
effect->obj.pos.z = zPos; effect->obj.pos.z = zPos;
AUDIO_PLAY_SFX(0x2940F026, effect->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_STAR_EXPLOSION, effect->sfxSource, 4);
gControllerRumbleTimers[0] = 60; gControllerRumbleTimers[0] = 60;
break; break;
} }
@ -4131,7 +4131,7 @@ void func_effect_80083D2C(f32 xPos, f32 yPos, f32 zPos, f32 srcZ) {
if (gEffects[j].obj.status == OBJ_FREE) { if (gEffects[j].obj.status == OBJ_FREE) {
func_effect_80083C70(&gEffects[j], xPos, yPos, zPos, dest.x, dest.y, dest.z, i * 60.0f, i); func_effect_80083C70(&gEffects[j], xPos, yPos, zPos, dest.x, dest.y, dest.z, i * 60.0f, i);
if (i == 0) { if (i == 0) {
AUDIO_PLAY_SFX(0x3103109B, gEffects[j].sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_MARBLE_BEAM, gEffects[j].sfxSource, 4);
} }
break; break;
} }

63
src/engine/fox_enmy.c
View File

@ -69,7 +69,8 @@ static Vec3f D_enmy_800CFF0C[] = {
{ -90.0f, 0.0f, 0.0f }, { 0.0f, 180.0f, 0.0f }, { 90.0f, 0.0f, 0.0f }, { -90.0f, 0.0f, 0.0f }, { 0.0f, 180.0f, 0.0f }, { 90.0f, 0.0f, 0.0f },
}; };
u32 gWarpRingSfx[] = { u32 gWarpRingSfx[] = {
0x19404038, 0x19404139, 0x1940423A, 0x1940433B, 0x1940443C, 0x1940453D, 0x1940463E, 0x1940463E, 0x1940463E, NA_SE_WARP_RING_1, NA_SE_WARP_RING_2, NA_SE_WARP_RING_3, NA_SE_WARP_RING_4, NA_SE_WARP_RING_5,
NA_SE_WARP_RING_6, NA_SE_WARP_RING_7, NA_SE_WARP_RING_7, NA_SE_WARP_RING_7,
}; };
void func_enmy_80060F30(f32* pos, u32 sfxId, s32 shotSource) { void func_enmy_80060F30(f32* pos, u32 sfxId, s32 shotSource) {
@ -1018,13 +1019,13 @@ void Object_Init(s32 index, ObjectId objId) {
switch (objId) { switch (objId) {
case OBJ_SPRITE_CO_SMOKE: case OBJ_SPRITE_CO_SMOKE:
func_effect_8007A6F0(&gSprites[index].obj.pos, 0x11000055); func_effect_8007A6F0(&gSprites[index].obj.pos, NA_SE_OB_SMOKE);
break; break;
case OBJ_ACTOR_234: case OBJ_ACTOR_234:
AUDIO_PLAY_SFX(0x11030010, gActors[index].sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_GREATFOX_ENGINE, gActors[index].sfxSource, 0);
break; break;
case OBJ_SCENERY_54: case OBJ_SCENERY_54:
AUDIO_PLAY_SFX(0x11000000, gScenery[index].sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_FALL, gScenery[index].sfxSource, 0);
break; break;
case OBJ_ACTOR_TEAM_BOSS: case OBJ_ACTOR_TEAM_BOSS:
ActorTeamBoss_Init(&gActors[index]); ActorTeamBoss_Init(&gActors[index]);
@ -1179,7 +1180,7 @@ void Object_Init(s32 index, ObjectId objId) {
break; break;
case OBJ_ACTOR_190: case OBJ_ACTOR_190:
case OBJ_ACTOR_191: case OBJ_ACTOR_191:
AUDIO_PLAY_SFX(0x31000012, gActors[index].sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_MISSILE_ENGINE, gActors[index].sfxSource, 4);
break; break;
case OBJ_ACTOR_192: case OBJ_ACTOR_192:
gActors[index].unk_0C9 = 1; gActors[index].unk_0C9 = 1;
@ -1231,7 +1232,7 @@ void Object_Init(s32 index, ObjectId objId) {
/* fallthrough */ /* fallthrough */
case OBJ_ACTOR_176: case OBJ_ACTOR_176:
gActors[index].health = 24; gActors[index].health = 24;
AUDIO_PLAY_SFX(0x31000016, gActors[index].sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_TANK_RB_ENGINE, gActors[index].sfxSource, 4);
break; break;
case OBJ_BOSS_297: case OBJ_BOSS_297:
Meteo_Boss297_Init(&gBosses[index]); Meteo_Boss297_Init(&gBosses[index]);
@ -1550,7 +1551,7 @@ void func_enmy_800656D4(Actor* actor) {
gActors[spC4].dmgType = DMG_BEAM; gActors[spC4].dmgType = DMG_BEAM;
gActors[spC4].damage = 20; gActors[spC4].damage = 20;
gActors[spC4].dmgSource = DMG_SRC_2; gActors[spC4].dmgSource = DMG_SRC_2;
func_effect_8007A6F0(&actor->obj.pos, 0x2903A008); func_effect_8007A6F0(&actor->obj.pos, NA_SE_EN_EXPLOSION_S);
func_effect_8007D2C8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 5.0f); func_effect_8007D2C8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 5.0f);
Object_Kill(&actor->obj, actor->sfxSource); Object_Kill(&actor->obj, actor->sfxSource);
} }
@ -1601,7 +1602,7 @@ void func_enmy_800656D4(Actor* actor) {
} }
Actor_Despawn(actor); Actor_Despawn(actor);
} }
func_effect_8007A6F0(&actor->obj.pos, 0x2903A008); func_effect_8007A6F0(&actor->obj.pos, NA_SE_EN_EXPLOSION_S);
} }
if (gLevelMode == LEVELMODE_ON_RAILS) { if (gLevelMode == LEVELMODE_ON_RAILS) {
if (fabsf(actor->obj.pos.z - gPlayer[0].trueZpos) < 100.0f) { if (fabsf(actor->obj.pos.z - gPlayer[0].trueZpos) < 100.0f) {
@ -1633,10 +1634,10 @@ void func_enmy_800660F0(Actor* actor) {
} }
if ((item->obj.id >= OBJ_ITEM_GOLD_RING) || (item->obj.id == OBJ_ITEM_1UP)) { if ((item->obj.id >= OBJ_ITEM_GOLD_RING) || (item->obj.id == OBJ_ITEM_1UP)) {
item->unk_50 = 90.0f; item->unk_50 = 90.0f;
AUDIO_PLAY_SFX(0x4900000C, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_ITEM_APPEAR, gDefaultSfxSource, 4);
item->timer_48 = 1000; item->timer_48 = 1000;
if (item->obj.id == OBJ_ITEM_WING_REPAIR) { if (item->obj.id == OBJ_ITEM_WING_REPAIR) {
AUDIO_PLAY_SFX(0x1900302B, item->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_OB_WING, item->sfxSource, 0);
} }
} }
break; break;
@ -1691,7 +1692,7 @@ void Actor_Despawn(Actor* actor) {
} }
} }
func_enmy_800660F0(actor); func_enmy_800660F0(actor);
AUDIO_PLAY_SFX(0x4900000C, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_ITEM_APPEAR, gDefaultSfxSource, 4);
} else if (actor->itemDrop == DROP_TEAM_MESG) { } else if (actor->itemDrop == DROP_TEAM_MESG) {
if (gTeamShields[TEAM_ID_PEPPY] > 0) { if (gTeamShields[TEAM_ID_PEPPY] > 0) {
Radio_PlayMessage(gMsg_ID_20261, RCID_PEPPY); Radio_PlayMessage(gMsg_ID_20261, RCID_PEPPY);
@ -1760,7 +1761,7 @@ void func_enmy_8006654C(Actor* actor) {
actor->vel.z = -15.0f; actor->vel.z = -15.0f;
actor->gravity = 0.5f; actor->gravity = 0.5f;
func_effect_8007D2C8(actor->obj.pos.x, actor->obj.pos.y + 30.0f, actor->obj.pos.z, 13.0f); func_effect_8007D2C8(actor->obj.pos.x, actor->obj.pos.y + 30.0f, actor->obj.pos.z, 13.0f);
AUDIO_PLAY_SFX(0x2903A008, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_EXPLOSION_S, actor->sfxSource, 4);
} }
} }
@ -1775,7 +1776,7 @@ void func_enmy_8006684C(Actor* actor) {
Object_Kill(&actor->obj, actor->sfxSource); Object_Kill(&actor->obj, actor->sfxSource);
actor->itemDrop = DROP_SILVER_RING; actor->itemDrop = DROP_SILVER_RING;
Actor_Despawn(actor); Actor_Despawn(actor);
AUDIO_PLAY_SFX(0x2903B009, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_EXPLOSION_M, actor->sfxSource, 4);
BonusText_Display(actor->obj.pos.x, actor->obj.pos.y + 250.0f, actor->obj.pos.z, 3); BonusText_Display(actor->obj.pos.x, actor->obj.pos.y + 250.0f, actor->obj.pos.z, 3);
gHitCount += 3; gHitCount += 3;
D_ctx_80177850 = 15; D_ctx_80177850 = 15;
@ -1803,7 +1804,7 @@ void func_enmy_800669A0(Actor* actor) {
func_effect_8007BFFC(actor->obj.pos.x, actor->obj.pos.y + 130.0f, actor->obj.pos.z, 0.0f, 0.0f, 0.0f, 4.0f, func_effect_8007BFFC(actor->obj.pos.x, actor->obj.pos.y + 130.0f, actor->obj.pos.z, 0.0f, 0.0f, 0.0f, 4.0f,
5); 5);
actor->timer_0BC = 4; actor->timer_0BC = 4;
func_effect_8007A6F0(&actor->obj.pos, 0x1903400F); func_effect_8007A6F0(&actor->obj.pos, NA_SE_OB_EXPLOSION_S);
} }
} }
} }
@ -1856,7 +1857,7 @@ void func_enmy_80066D5C(Scenery* scenery) {
case 1: case 1:
func_enmy_80066C00(scenery); func_enmy_80066C00(scenery);
scenery->state++; scenery->state++;
AUDIO_PLAY_SFX(0x2900300F, scenery->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_DAMAGE_L, scenery->sfxSource, 4);
break; break;
case 2: case 2:
scenery->vel.x += 0.05f; scenery->vel.x += 0.05f;
@ -1867,7 +1868,7 @@ void func_enmy_80066D5C(Scenery* scenery) {
func_enmy_80066A8C(scenery); func_enmy_80066A8C(scenery);
scenery->state = 0; scenery->state = 0;
gCameraShake = 25; gCameraShake = 25;
AUDIO_PLAY_SFX(0x19130003, scenery->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_METAL_BOUND_M, scenery->sfxSource, 4);
} }
break; break;
case 0: case 0:
@ -2007,7 +2008,7 @@ void ActorSupplies_Update(ActorSupplies* this) {
this->dmgType = DMG_NONE; this->dmgType = DMG_NONE;
this->health -= this->damage; this->health -= this->damage;
if (this->health <= 0) { if (this->health <= 0) {
func_effect_8007A6F0(&this->obj.pos, 0x2903A008); func_effect_8007A6F0(&this->obj.pos, NA_SE_EN_EXPLOSION_S);
func_effect_8007D2C8(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, 5.0f); func_effect_8007D2C8(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, 5.0f);
if (((player[0].wings.rightState <= WINGSTATE_BROKEN) || (player[0].wings.leftState <= WINGSTATE_BROKEN)) && if (((player[0].wings.rightState <= WINGSTATE_BROKEN) || (player[0].wings.leftState <= WINGSTATE_BROKEN)) &&
(player[0].form != FORM_LANDMASTER)) { (player[0].form != FORM_LANDMASTER)) {
@ -2056,7 +2057,7 @@ void ActorSupplies_Draw(Actor* actor) {
} }
void func_enmy_80067A40(void) { void func_enmy_80067A40(void) {
AUDIO_PLAY_SFX(0x09008023, gPlayer[0].sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_WING_REPAIR, gPlayer[0].sfxSource, 0);
if (gPlayer[0].wings.rightState <= WINGSTATE_BROKEN) { if (gPlayer[0].wings.rightState <= WINGSTATE_BROKEN) {
gRightWingFlashTimer[0] = 1050; gRightWingFlashTimer[0] = 1050;
gPlayer[0].wings.rightState = WINGSTATE_INTACT; gPlayer[0].wings.rightState = WINGSTATE_INTACT;
@ -2077,7 +2078,7 @@ void Item1up_Update(Item1UP* this) {
Item_SpinPickup(this); Item_SpinPickup(this);
if (this->collected) { if (this->collected) {
Object_Kill(&this->obj, this->sfxSource); Object_Kill(&this->obj, this->sfxSource);
func_enmy_80060F30(gPlayer[this->playerNum].sfxSource, 0x4900C024, this->playerNum); func_enmy_80060F30(gPlayer[this->playerNum].sfxSource, NA_SE_ONE_UP, this->playerNum);
if (gCurrentLevel != LEVEL_TRAINING) { if (gCurrentLevel != LEVEL_TRAINING) {
gLifeCount[this->playerNum]++; gLifeCount[this->playerNum]++;
} }
@ -2100,8 +2101,8 @@ void ItemPickup_Update(Item* this) {
this->timer_48 = 20; this->timer_48 = 20;
this->unk_50 = 60.0f; this->unk_50 = 60.0f;
gBombCount[this->playerNum]++; gBombCount[this->playerNum]++;
func_enmy_80060F30(gPlayer[this->playerNum].sfxSource, 0x49002005, this->playerNum); func_enmy_80060F30(gPlayer[this->playerNum].sfxSource, NA_SE_BOMB_GET, this->playerNum);
func_enmy_80060F30(gPlayer[this->playerNum].sfxSource, 0x49002006, this->playerNum); func_enmy_80060F30(gPlayer[this->playerNum].sfxSource, NA_SE_BOMB_GAUGE_UP, this->playerNum);
} }
break; break;
case OBJ_ITEM_LASERS: case OBJ_ITEM_LASERS:
@ -2115,7 +2116,7 @@ void ItemPickup_Update(Item* this) {
if (gLaserStrength[this->playerNum] > LASERS_HYPER) { if (gLaserStrength[this->playerNum] > LASERS_HYPER) {
gLaserStrength[this->playerNum] = LASERS_HYPER; gLaserStrength[this->playerNum] = LASERS_HYPER;
} }
func_enmy_80060F30(gPlayer[this->playerNum].sfxSource, 0x49002004, this->playerNum); func_enmy_80060F30(gPlayer[this->playerNum].sfxSource, NA_SE_TWIN_LASER_GET, this->playerNum);
if (gExpertMode) { if (gExpertMode) {
gRightWingHealth[this->playerNum] = gLeftWingHealth[this->playerNum] = 10; gRightWingHealth[this->playerNum] = gLeftWingHealth[this->playerNum] = 10;
} else { } else {
@ -2147,7 +2148,7 @@ void ItemLasers_Update(ItemLasers* this) {
this->obj.id = OBJ_ITEM_WING_REPAIR; this->obj.id = OBJ_ITEM_WING_REPAIR;
Object_SetInfo(&this->info, this->obj.id); Object_SetInfo(&this->info, this->obj.id);
this->timer_48 = 2000; this->timer_48 = 2000;
AUDIO_PLAY_SFX(0x1900302B, this->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_OB_WING, this->sfxSource, 0);
} else { } else {
ItemPickup_Update(this); ItemPickup_Update(this);
} }
@ -2167,13 +2168,13 @@ void ItemSupplyRing_Update(Item* this) {
this->timer_48 = 50; this->timer_48 = 50;
if (this->obj.id == OBJ_ITEM_SILVER_RING) { if (this->obj.id == OBJ_ITEM_SILVER_RING) {
gPlayer[this->playerNum].heal += 32; gPlayer[this->playerNum].heal += 32;
func_enmy_80060F30(gPlayer[this->playerNum].sfxSource, 0x4900200E, this->playerNum); func_enmy_80060F30(gPlayer[this->playerNum].sfxSource, NA_SE_SHIELD_RING, this->playerNum);
} else if (this->obj.id == OBJ_ITEM_GOLD_RING) { } else if (this->obj.id == OBJ_ITEM_GOLD_RING) {
gGoldRingCount[0]++; gGoldRingCount[0]++;
if (gGoldRingCount[0] == 3) { if (gGoldRingCount[0] == 3) {
func_enmy_80060F30(gPlayer[this->playerNum].sfxSource, 0x49008015, this->playerNum); func_enmy_80060F30(gPlayer[this->playerNum].sfxSource, NA_SE_SHIELD_UPGRADE, this->playerNum);
} else if (gGoldRingCount[0] == 6) { } else if (gGoldRingCount[0] == 6) {
func_enmy_80060F30(gPlayer[this->playerNum].sfxSource, 0x4900C024, this->playerNum); func_enmy_80060F30(gPlayer[this->playerNum].sfxSource, NA_SE_ONE_UP, this->playerNum);
if (gCurrentLevel != LEVEL_TRAINING) { if (gCurrentLevel != LEVEL_TRAINING) {
gLifeCount[this->playerNum]++; gLifeCount[this->playerNum]++;
} }
@ -2182,11 +2183,11 @@ void ItemSupplyRing_Update(Item* this) {
gPlayer[this->playerNum].trueZpos, BONUS_TEXT_1UP); gPlayer[this->playerNum].trueZpos, BONUS_TEXT_1UP);
} else { } else {
gPlayer[this->playerNum].heal += 32; gPlayer[this->playerNum].heal += 32;
func_enmy_80060F30(gPlayer[this->playerNum].sfxSource, 0x49003013, this->playerNum); func_enmy_80060F30(gPlayer[this->playerNum].sfxSource, NA_SE_GOLD_RING, this->playerNum);
} }
} else { } else {
gPlayer[this->playerNum].heal += 128; gPlayer[this->playerNum].heal += 128;
func_enmy_80060F30(gPlayer[this->playerNum].sfxSource, 0x4900200D, this->playerNum); func_enmy_80060F30(gPlayer[this->playerNum].sfxSource, NA_SE_SHIELD_RING_M, this->playerNum);
} }
} }
if ((this->obj.id == OBJ_ITEM_GOLD_RING) && (this->timer_48 == 1)) { if ((this->obj.id == OBJ_ITEM_GOLD_RING) && (this->timer_48 == 1)) {
@ -2284,7 +2285,7 @@ void ItemMeteoWarp_Update(ItemMeteoWarp* this) {
if (gRingPassCount >= 7) { if (gRingPassCount >= 7) {
gPlayer[0].state_1C8 = PLAYERSTATE_1C8_ENTER_WARP_ZONE; gPlayer[0].state_1C8 = PLAYERSTATE_1C8_ENTER_WARP_ZONE;
gPlayer[0].csState = 0; gPlayer[0].csState = 0;
AUDIO_PLAY_SFX(0x1900602A, gDefaultSfxSource, 0); AUDIO_PLAY_SFX(NA_SE_WARP_HOLE, gDefaultSfxSource, 0);
gMissionStatus = MISSION_WARP; gMissionStatus = MISSION_WARP;
gLeveLClearStatus[gCurrentLevel] = 1; gLeveLClearStatus[gCurrentLevel] = 1;
} }
@ -2336,7 +2337,7 @@ void ItemCheckpoint_Update(ItemCheckpoint* this) {
for (i = TEAM_ID_FALCO; i <= TEAM_ID_PEPPY; i++) { for (i = TEAM_ID_FALCO; i <= TEAM_ID_PEPPY; i++) {
gSavedTeamShields[i] = gTeamShields[i]; gSavedTeamShields[i] = gTeamShields[i];
} }
AUDIO_PLAY_SFX(0x4900400F, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_CHECKPOINT, gDefaultSfxSource, 4);
} }
} }
} }
@ -2429,7 +2430,7 @@ void Sprite_UpdateDoodad(Sprite* this) {
M_PI; M_PI;
if (this->unk_46 != 0) { if (this->unk_46 != 0) {
this->obj.status = OBJ_FREE; this->obj.status = OBJ_FREE;
func_effect_8007A6F0(&this->obj.pos, 0x1903400F); func_effect_8007A6F0(&this->obj.pos, NA_SE_OB_EXPLOSION_S);
switch (this->obj.id) { switch (this->obj.id) {
case OBJ_SPRITE_CO_POLE: case OBJ_SPRITE_CO_POLE:
func_effect_8007D074(this->obj.pos.x, this->obj.pos.y + 160.0f, this->obj.pos.z, 4.0f); func_effect_8007D074(this->obj.pos.x, this->obj.pos.y + 160.0f, this->obj.pos.z, 4.0f);

116
src/engine/fox_enmy2.c
View File

@ -216,13 +216,13 @@ void Actor202_Update(Actor202* this) {
func_effect_8007BFFC(this->obj.pos.x, this->obj.pos.y + 180.0f, this->obj.pos.z, this->vel.x, this->vel.y, func_effect_8007BFFC(this->obj.pos.x, this->obj.pos.y + 180.0f, this->obj.pos.z, this->vel.x, this->vel.y,
this->vel.z, 8.0f, 30); this->vel.z, 8.0f, 30);
Object_Kill(&this->obj, this->sfxSource); Object_Kill(&this->obj, this->sfxSource);
func_effect_8007A6F0(&this->obj.pos, 0x2903A008); func_effect_8007A6F0(&this->obj.pos, NA_SE_EN_EXPLOSION_S);
gHitCount += this->info.bonus; gHitCount += this->info.bonus;
D_ctx_80177850 = 15; D_ctx_80177850 = 15;
} else { } else {
this->dmgType = DMG_NONE; this->dmgType = DMG_NONE;
this->timer_0C6 = 20; this->timer_0C6 = 20;
AUDIO_PLAY_SFX(0x2903300E, this->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_DAMAGE_S, this->sfxSource, 4);
func_effect_8007D1E0(this->obj.pos.x, this->obj.pos.y + 180.0f, this->obj.pos.z, 5.0f); func_effect_8007D1E0(this->obj.pos.x, this->obj.pos.y + 180.0f, this->obj.pos.z, 5.0f);
} }
} }
@ -277,7 +277,7 @@ void Actor194_Dying(Actor194* this) {
gActor194zPos[this->unk_046][temp_hi], 4.0f); gActor194zPos[this->unk_046][temp_hi], 4.0f);
} }
AUDIO_PLAY_SFX(0x2903B009, this->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_EXPLOSION_M, this->sfxSource, 4);
this->unk_04A++; this->unk_04A++;
if (this->unk_04A > 15) { if (this->unk_04A > 15) {
@ -352,7 +352,7 @@ void Scenery42_Update(Scenery_42* this) {
if (this->obj.pos.y < gGroundHeight + 40.0f) { if (this->obj.pos.y < gGroundHeight + 40.0f) {
this->obj.pos.y = gGroundHeight + 40.0f; this->obj.pos.y = gGroundHeight + 40.0f;
AUDIO_PLAY_SFX(0x19130003, this->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_EN_METAL_BOUND_M, this->sfxSource, 0);
this->state = 2; this->state = 2;
this->vel.y = 0.0f; this->vel.y = 0.0f;
} }
@ -531,10 +531,10 @@ void Actor189_Update(Actor189* this) {
if (this->unk_04A & 4) { if (this->unk_04A & 4) {
switch (this->unk_046) { switch (this->unk_046) {
case 2: case 2:
AUDIO_PLAY_SFX(0x19000024, this->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OB_SAND_BOUND_S, this->sfxSource, 4);
break; break;
case 25: case 25:
AUDIO_PLAY_SFX(0x29003031, this->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_BOSS_ATTACK, this->sfxSource, 4);
break; break;
} }
} }
@ -628,7 +628,7 @@ void Actor189_Update(Actor189* this) {
(this->timer_0BE == 0)) { (this->timer_0BE == 0)) {
func_effect_8007B8F8(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z + 50.0f, this->scale * 10.0f); func_effect_8007B8F8(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z + 50.0f, this->scale * 10.0f);
Object_Kill(&this->obj, this->sfxSource); Object_Kill(&this->obj, this->sfxSource);
func_effect_8007A6F0(&this->obj.pos, 0x2903A008); func_effect_8007A6F0(&this->obj.pos, NA_SE_EN_EXPLOSION_S);
} }
break; break;
@ -639,7 +639,7 @@ void Actor189_Update(Actor189* this) {
(this->timer_0BE == 0)) { (this->timer_0BE == 0)) {
func_effect_8007B8F8(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z + 50.0f, this->scale * 10.0f); func_effect_8007B8F8(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z + 50.0f, this->scale * 10.0f);
Object_Kill(&this->obj, this->sfxSource); Object_Kill(&this->obj, this->sfxSource);
func_effect_8007A6F0(&this->obj.pos, 0x2903A008); func_effect_8007A6F0(&this->obj.pos, NA_SE_EN_EXPLOSION_S);
} }
break; break;
@ -660,7 +660,7 @@ void Actor189_Update(Actor189* this) {
(this->timer_0BE == 0)) { (this->timer_0BE == 0)) {
func_effect_8007B8F8(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z + 50.0f, this->scale * 10.0f); func_effect_8007B8F8(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z + 50.0f, this->scale * 10.0f);
Object_Kill(&this->obj, this->sfxSource); Object_Kill(&this->obj, this->sfxSource);
func_effect_8007A6F0(&this->obj.pos, 0x2903A008); func_effect_8007A6F0(&this->obj.pos, NA_SE_EN_EXPLOSION_S);
} }
break; break;
@ -671,7 +671,7 @@ void Actor189_Update(Actor189* this) {
func_effect_8007B8F8(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z + 70.0f, this->scale * 20.0f); func_effect_8007B8F8(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z + 70.0f, this->scale * 20.0f);
func_effect_8007B8F8(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z + 70.0f, this->scale * 20.0f); func_effect_8007B8F8(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z + 70.0f, this->scale * 20.0f);
Object_Kill(&this->obj, this->sfxSource); Object_Kill(&this->obj, this->sfxSource);
func_effect_8007A6F0(&this->obj.pos, 0x2903A008); func_effect_8007A6F0(&this->obj.pos, NA_SE_EN_EXPLOSION_S);
} }
break; break;
@ -743,7 +743,7 @@ void Actor189_Update(Actor189* this) {
(this->timer_0BE == 0)) { (this->timer_0BE == 0)) {
func_effect_8007D0E0(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, 10.0f); func_effect_8007D0E0(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, 10.0f);
Object_Kill(&this->obj, this->sfxSource); Object_Kill(&this->obj, this->sfxSource);
func_effect_8007A6F0(&this->obj.pos, 0x2903A008); func_effect_8007A6F0(&this->obj.pos, NA_SE_EN_EXPLOSION_S);
} }
} else if (((this->state >= 41) && (this->state < 45)) || (this->state == 59)) { } else if (((this->state >= 41) && (this->state < 45)) || (this->state == 59)) {
if (((this->timer_0BC == 0) || if (((this->timer_0BC == 0) ||
@ -751,7 +751,7 @@ void Actor189_Update(Actor189* this) {
(this->timer_0BE == 0)) { (this->timer_0BE == 0)) {
func_effect_8007D0E0(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, 2.0f * this->scale); func_effect_8007D0E0(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, 2.0f * this->scale);
Object_Kill(&this->obj, this->sfxSource); Object_Kill(&this->obj, this->sfxSource);
func_effect_8007A6F0(&this->obj.pos, 0x2903A008); func_effect_8007A6F0(&this->obj.pos, NA_SE_EN_EXPLOSION_S);
} }
if (func_play_800A73E4(&sp44, &sp40, this->obj.pos.x, this->obj.pos.y, this->obj.pos.z)) { if (func_play_800A73E4(&sp44, &sp40, this->obj.pos.x, this->obj.pos.y, this->obj.pos.z)) {
func_effect_8007B228(this->obj.pos.x, sp44, this->obj.pos.z, 2.0f); func_effect_8007B228(this->obj.pos.x, sp44, this->obj.pos.z, 2.0f);
@ -768,7 +768,7 @@ void Actor189_Update(Actor189* this) {
func_effect_8007BFFC(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, this->vel.x, this->vel.y, func_effect_8007BFFC(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, this->vel.x, this->vel.y,
this->vel.z, this->scale * 1.5f, 4); this->vel.z, this->scale * 1.5f, 4);
Object_Kill(&this->obj, this->sfxSource); Object_Kill(&this->obj, this->sfxSource);
func_effect_8007A6F0(&this->obj.pos, 0x2903A008); func_effect_8007A6F0(&this->obj.pos, NA_SE_EN_EXPLOSION_S);
} }
} else { } else {
if ((this->state == 3) && ((this->timer_0BC % 8) == 0)) { if ((this->state == 3) && ((this->timer_0BC % 8) == 0)) {
@ -1116,7 +1116,7 @@ void ActorEvent_ProcessScript(ActorEvent* this) {
gActor194zPos[i][j] = this->obj.pos.z; gActor194zPos[i][j] = this->obj.pos.z;
} }
if (this->unk_0B4 == EVID_200) { if (this->unk_0B4 == EVID_200) {
AUDIO_PLAY_SFX(0x11032049, this->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_SPACE_SNAKE, this->sfxSource, 4);
} }
break; break;
} }
@ -1173,26 +1173,26 @@ void ActorEvent_ProcessScript(ActorEvent* this) {
case EISFX_EN_ENGINE_01: case EISFX_EN_ENGINE_01:
if (!((gCurrentLevel == LEVEL_SOLAR) || (this->unk_0B4 == EVID_6) || if (!((gCurrentLevel == LEVEL_SOLAR) || (this->unk_0B4 == EVID_6) ||
((gCurrentLevel == LEVEL_CORNERIA) && (this->unk_0B4 == EVID_8)))) { ((gCurrentLevel == LEVEL_CORNERIA) && (this->unk_0B4 == EVID_8)))) {
AUDIO_PLAY_SFX(0x31000011, this->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_ENGINE_01, this->sfxSource, 4);
} }
break; break;
case EISFX_ARWING_ENGINE_FG: case EISFX_ARWING_ENGINE_FG:
AUDIO_PLAY_SFX(0x3100000C, this->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_ARWING_ENGINE_FG, this->sfxSource, 4);
break; break;
case EISFX_GREATFOX_ENGINE: case EISFX_GREATFOX_ENGINE:
AUDIO_PLAY_SFX(0x11030010, this->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_GREATFOX_ENGINE, this->sfxSource, 0);
break; break;
case EISFX_EN_SHIP_ENGINE_S: case EISFX_EN_SHIP_ENGINE_S:
AUDIO_PLAY_SFX(0x31012039, this->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_SHIP_ENGINE_S, this->sfxSource, 4);
break; break;
case EISFX_OB_WING: case EISFX_OB_WING:
AUDIO_PLAY_SFX(0x1900302B, this->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_OB_WING, this->sfxSource, 0);
break; break;
case EISFX_EN_ALIEN_FLY: case EISFX_EN_ALIEN_FLY:
AUDIO_PLAY_SFX(0x31000014, this->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_ALIEN_FLY, this->sfxSource, 4);
break; break;
case EISFX_EN_SPACE_SHIP: case EISFX_EN_SPACE_SHIP:
AUDIO_PLAY_SFX(0x31000015, this->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_SPACE_SHIP, this->sfxSource, 4);
break; break;
} }
@ -1292,7 +1292,7 @@ void ActorEvent_ProcessScript(ActorEvent* this) {
case EV_OPC(EVOP_SET_SURFACE): case EV_OPC(EVOP_SET_SURFACE):
if ((gGroundSurface == SURFACE_WATER) && (actorScript[this->aiIndex + 1] != 2)) { if ((gGroundSurface == SURFACE_WATER) && (actorScript[this->aiIndex + 1] != 2)) {
Audio_KillSfxBySourceAndId(gPlayer[0].sfxSource, 0x1100000B); Audio_KillSfxBySourceAndId(gPlayer[0].sfxSource, NA_SE_SPLASH_LEVEL_S);
} }
gGroundSurface = actorScript[this->aiIndex + 1]; gGroundSurface = actorScript[this->aiIndex + 1];
this->aiIndex += 2; this->aiIndex += 2;
@ -1601,7 +1601,7 @@ void ActorEvent_8006EAC4(Effect* effect, f32 xPos, f32 yPos, f32 zPos) {
effect->timer_50 = 20; effect->timer_50 = 20;
Object_SetInfo(&effect->info, effect->obj.id); Object_SetInfo(&effect->info, effect->obj.id);
AUDIO_PLAY_SFX(0x2900201D, effect->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_FALLING_DOWN, effect->sfxSource, 4);
} }
void ActorEvent_8006EB64(f32 xPos, f32 yPos, f32 zPos) { void ActorEvent_8006EB64(f32 xPos, f32 yPos, f32 zPos) {
@ -1626,7 +1626,7 @@ void ActorEvent_SetupTIMine(Actor* actor, f32 xPos, f32 yPos, f32 zPos) {
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
actor->info.unk_16 = 2; actor->info.unk_16 = 2;
AUDIO_PLAY_SFX(0x2900201D, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_FALLING_DOWN, actor->sfxSource, 4);
} }
void ActorEvent_SpawnTIMine(f32 xPos, f32 yPos, f32 zPos) { void ActorEvent_SpawnTIMine(f32 xPos, f32 yPos, f32 zPos) {
@ -1670,18 +1670,18 @@ void Actor_SetupPlayerShot(PlayerShotId objId, PlayerShot* shot, s32 actorId, f3
if (gLevelMode == LEVELMODE_ALL_RANGE) { if (gLevelMode == LEVELMODE_ALL_RANGE) {
if (actorId + NPC_SHOT_ID <= AI360_PEPPY + NPC_SHOT_ID) { if (actorId + NPC_SHOT_ID <= AI360_PEPPY + NPC_SHOT_ID) {
AUDIO_PLAY_SFX(0x2900000D, shot->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_ARWING_SHOT_F, shot->sfxSource, 4);
} else { } else {
AUDIO_PLAY_SFX(0x29002002, shot->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_SHOT_0, shot->sfxSource, 4);
} }
} else if ((actorId < ARRAY_COUNT(gActors)) && (gActors[actorId].obj.id == OBJ_ACTOR_EVENT) && } else if ((actorId < ARRAY_COUNT(gActors)) && (gActors[actorId].obj.id == OBJ_ACTOR_EVENT) &&
(gActors[actorId].iwork[12] >= TEAM_ID_FALCO)) { (gActors[actorId].iwork[12] >= TEAM_ID_FALCO)) {
AUDIO_PLAY_SFX(0x2900000D, shot->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_ARWING_SHOT_F, shot->sfxSource, 4);
} else if (actorId + NPC_SHOT_ID == CS_SHOT_ID + NPC_SHOT_ID) { } else if (actorId + NPC_SHOT_ID == CS_SHOT_ID + NPC_SHOT_ID) {
shot->sourceId = CS_SHOT_ID; shot->sourceId = CS_SHOT_ID;
AUDIO_PLAY_SFX(0x19030037, shot->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_GREATFOX_SHOT_DEMO, shot->sfxSource, 0);
} else { } else {
AUDIO_PLAY_SFX(0x29002002, shot->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_SHOT_0, shot->sfxSource, 4);
} }
} }
@ -1723,7 +1723,7 @@ void ActorEvent_8006F044(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scale
effect->scale1 = scale1; effect->scale1 = scale1;
effect->unk_44 = 100; effect->unk_44 = 100;
Object_SetInfo(&effect->info, effect->obj.id); Object_SetInfo(&effect->info, effect->obj.id);
func_effect_8007A6F0(&effect->obj.pos, 0x2903B009); func_effect_8007A6F0(&effect->obj.pos, NA_SE_EN_EXPLOSION_M);
} }
void ActorEvent_8006F0D8(f32 xPos, f32 yPos, f32 zPos, f32 scale1) { void ActorEvent_8006F0D8(f32 xPos, f32 yPos, f32 zPos, f32 scale1) {
@ -1752,7 +1752,7 @@ void ActorEvent_8006F140(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scale
effect->unk_7A = 18; effect->unk_7A = 18;
Object_SetInfo(&effect->info, effect->obj.id); Object_SetInfo(&effect->info, effect->obj.id);
effect->info.damage = 40; effect->info.damage = 40;
func_effect_8007A6F0(&effect->obj.pos, 0x2903B009); func_effect_8007A6F0(&effect->obj.pos, NA_SE_EN_EXPLOSION_M);
} }
void ActorEvent_8006F1EC(f32 xPos, f32 yPos, f32 zPos, f32 scale1) { void ActorEvent_8006F1EC(f32 xPos, f32 yPos, f32 zPos, f32 scale1) {
@ -1905,7 +1905,7 @@ void ActorEvent_ProcessActions(ActorEvent* this) {
this->vel.z, this->scale * 3.0f, 15); this->vel.z, this->scale * 3.0f, 15);
Actor_Despawn(this); Actor_Despawn(this);
Object_Kill(&this->obj, this->sfxSource); Object_Kill(&this->obj, this->sfxSource);
func_effect_8007A6F0(&this->obj.pos, 0x2903B009); func_effect_8007A6F0(&this->obj.pos, NA_SE_EN_EXPLOSION_M);
break; break;
case EVACT_DESPAWN: case EVACT_DESPAWN:
@ -1988,7 +1988,7 @@ void ActorEvent_8006FE28(ActorEvent* this) {
if ((fabsf(this->obj.pos.x - gPlayer[0].pos.x) < 100.0f) && (fabsf(this->obj.pos.y - gPlayer[0].pos.y) < 100.0f) && if ((fabsf(this->obj.pos.x - gPlayer[0].pos.x) < 100.0f) && (fabsf(this->obj.pos.y - gPlayer[0].pos.y) < 100.0f) &&
(fabsf(this->obj.pos.z - gPlayer[0].trueZpos) < 50.0f)) { (fabsf(this->obj.pos.z - gPlayer[0].trueZpos) < 50.0f)) {
func_enmy_80067A40(); func_enmy_80067A40();
Audio_KillSfxBySourceAndId(this->sfxSource, 0x1900302B); Audio_KillSfxBySourceAndId(this->sfxSource, NA_SE_OB_WING);
Object_Kill(&this->obj, this->sfxSource); Object_Kill(&this->obj, this->sfxSource);
} }
} }
@ -2009,10 +2009,10 @@ void ActorEvent_8006FEEC(ActorEvent* this) {
this->itemDrop = DROP_NONE; this->itemDrop = DROP_NONE;
Actor_Despawn(this); Actor_Despawn(this);
Object_Kill(&this->obj, this->sfxSource); Object_Kill(&this->obj, this->sfxSource);
func_effect_8007A6F0(&this->obj.pos, 0x29018036); func_effect_8007A6F0(&this->obj.pos, NA_SE_EN_BIRD_DOWN);
func_effect_8007D2C8(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, 4.0f); func_effect_8007D2C8(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, 4.0f);
} else { } else {
AUDIO_PLAY_SFX(0x29033037, this->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_BIRD_DAMAGE, this->sfxSource, 4);
} }
} }
} }
@ -2086,9 +2086,9 @@ void ActorEvent_800701E0(ActorEvent* this) {
if (this->unk_0B4 != EVID_83) { if (this->unk_0B4 != EVID_83) {
if ((this->unk_0B4 == EVID_6) && (gCurrentLevel == LEVEL_SOLAR)) { if ((this->unk_0B4 == EVID_6) && (gCurrentLevel == LEVEL_SOLAR)) {
AUDIO_PLAY_SFX(0x29018036, this->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_BIRD_DOWN, this->sfxSource, 4);
} else { } else {
AUDIO_PLAY_SFX(0x2903700B, this->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_CRASH_DOWN, this->sfxSource, 4);
} }
this->obj.status = OBJ_DYING; this->obj.status = OBJ_DYING;
@ -2176,18 +2176,18 @@ void ActorEvent_800701E0(ActorEvent* this) {
} }
if (this->unk_0B4 == EVID_82) { if (this->unk_0B4 == EVID_82) {
AUDIO_PLAY_SFX(0x11000055, this->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_OB_SMOKE, this->sfxSource, 0);
this->dmgType = DMG_BEAM; this->dmgType = DMG_BEAM;
func_effect_8007C688(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, 3.0f, 60); func_effect_8007C688(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, 3.0f, 60);
} }
} else { } else {
this->timer_0C6 = 20; this->timer_0C6 = 20;
if ((this->unk_0B4 == EVID_6) && (gCurrentLevel == LEVEL_SOLAR)) { if ((this->unk_0B4 == EVID_6) && (gCurrentLevel == LEVEL_SOLAR)) {
AUDIO_PLAY_SFX(0x29033037, this->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_BIRD_DAMAGE, this->sfxSource, 4);
} else if (this->health < 20) { } else if (this->health < 20) {
AUDIO_PLAY_SFX(0x2943500F, this->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_KNOCK_DOWN, this->sfxSource, 4);
} else { } else {
AUDIO_PLAY_SFX(0x2903300E, this->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_DAMAGE_S, this->sfxSource, 4);
} }
if ((this->unk_0B4 != EVID_13) && (this->unk_0B4 != EVID_61) && (this->unk_0B4 != EVID_83)) { if ((this->unk_0B4 != EVID_13) && (this->unk_0B4 != EVID_61) && (this->unk_0B4 != EVID_83)) {
@ -2271,14 +2271,14 @@ void ActorEvent_80070BA8(ActorEvent* this) {
func_effect_8007C120(this->hitPos.x, this->hitPos.y, this->hitPos.z, this->vel.x, this->vel.y, this->vel.z, func_effect_8007C120(this->hitPos.x, this->hitPos.y, this->hitPos.z, this->vel.x, this->vel.y, this->vel.z,
0.2f, 10); 0.2f, 10);
this->health -= this->damage; this->health -= this->damage;
AUDIO_PLAY_SFX(0x29033064, this->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_SPARK_DAMAGE_M, this->sfxSource, 4);
if (this->health <= 0) { if (this->health <= 0) {
BonusText_Display(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, this->info.bonus); BonusText_Display(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, this->info.bonus);
gHitCount += this->info.bonus + 1; gHitCount += this->info.bonus + 1;
D_ctx_80177850 = 15; D_ctx_80177850 = 15;
} }
} else { } else {
AUDIO_PLAY_SFX(0x29121007, this->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_REFLECT, this->sfxSource, 4);
} }
} }
} }
@ -2841,7 +2841,7 @@ void ActorEvent_80071DC0(ActorEvent* this) {
} }
if (((gGameFrameCount % 16) == 0)) { if (((gGameFrameCount % 16) == 0)) {
AUDIO_PLAY_SFX(0x2903B009, this->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_EXPLOSION_M, this->sfxSource, 4);
} }
this->vel.y -= 0.1f; this->vel.y -= 0.1f;
@ -2878,9 +2878,9 @@ void ActorEvent_800720E8(ActorEvent* this) {
if (this->health <= 0) { if (this->health <= 0) {
this->unk_046 = 1; this->unk_046 = 1;
this->info.hitbox = SEGMENTED_TO_VIRTUAL(D_SX_6032408); this->info.hitbox = SEGMENTED_TO_VIRTUAL(D_SX_6032408);
AUDIO_PLAY_SFX(0x1900000D, this->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_OB_GATE_OPEN, this->sfxSource, 0);
} else { } else {
AUDIO_PLAY_SFX(0x2903300E, this->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_EN_DAMAGE_S, this->sfxSource, 0);
} }
this->dmgType = DMG_NONE; this->dmgType = DMG_NONE;
} }
@ -3025,7 +3025,7 @@ void ActorEvent_Update(ActorEvent* this) {
this->timer_0C6 = 20; this->timer_0C6 = 20;
this->health -= this->damage; this->health -= this->damage;
AUDIO_PLAY_SFX(0x29034041, this->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_SNAKE_DAMAGE, this->sfxSource, 4);
if (this->health <= 0) { if (this->health <= 0) {
this->timer_0C6 = 200; this->timer_0C6 = 200;
@ -3416,9 +3416,9 @@ void ActorEvent_Update(ActorEvent* this) {
(this->unk_0B4 != EVID_49) && (this->unk_0B4 != EVID_50)) { (this->unk_0B4 != EVID_49) && (this->unk_0B4 != EVID_50)) {
this->dmgType = DMG_NONE; this->dmgType = DMG_NONE;
if (gCurrentLevel == LEVEL_METEO) { if (gCurrentLevel == LEVEL_METEO) {
AUDIO_PLAY_SFX(0x2902107D, this->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_ROCK_REFLECT, this->sfxSource, 4);
} else { } else {
AUDIO_PLAY_SFX(0x29121007, this->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_REFLECT, this->sfxSource, 4);
} }
} }
@ -3461,7 +3461,7 @@ void ActorEvent_Update(ActorEvent* this) {
spF0 = 350.0f; spF0 = 350.0f;
if (((gGameFrameCount % 4) == 0)) { if (((gGameFrameCount % 4) == 0)) {
ActorEvent_8007240C(this->obj.pos.x, spEC, this->obj.pos.z, this->obj.rot.y); ActorEvent_8007240C(this->obj.pos.x, spEC, this->obj.pos.z, this->obj.rot.y);
AUDIO_PLAY_SFX(0x19800017, this->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_IN_SPLASH_S, this->sfxSource, 4);
} }
} }
@ -4221,7 +4221,7 @@ void func_enmy2_800763A4(Actor* actor) {
actor->scale * 3.0f, 5); actor->scale * 3.0f, 5);
func_effect_8007B228(actor->obj.pos.x, sp58, actor->obj.pos.z, 2.0f); func_effect_8007B228(actor->obj.pos.x, sp58, actor->obj.pos.z, 2.0f);
actor->timer_0BE = 2; actor->timer_0BE = 2;
func_effect_8007A6F0(&actor->obj.pos, 0x2903A008); func_effect_8007A6F0(&actor->obj.pos, NA_SE_EN_EXPLOSION_S);
return; return;
} }
@ -4232,7 +4232,7 @@ void func_enmy2_800763A4(Actor* actor) {
actor->obj.pos.z - actor->vel.z, 0.0f, 0.0f, 0.0f, actor->scale * 4.0f, 20); 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); func_enmy_80062C38(actor->obj.pos.x, actor->obj.pos.z);
actor->timer_0BE = 2; actor->timer_0BE = 2;
func_effect_8007A6F0(&actor->obj.pos, 0x2903A008); func_effect_8007A6F0(&actor->obj.pos, NA_SE_EN_EXPLOSION_S);
return; return;
} }
} else { } else {
@ -4264,9 +4264,9 @@ void func_enmy2_800763A4(Actor* actor) {
actor->obj.pos.z - actor->vel.z, actor->scale * 3.0f); actor->obj.pos.z - actor->vel.z, actor->scale * 3.0f);
if ((actor->obj.id == OBJ_ACTOR_ALLRANGE) && (actor->aiType < AI360_KATT)) { if ((actor->obj.id == OBJ_ACTOR_ALLRANGE) && (actor->aiType < AI360_KATT)) {
func_effect_8007A6F0(&actor->obj.pos, 0x2903B009); func_effect_8007A6F0(&actor->obj.pos, NA_SE_EN_EXPLOSION_M);
} else { } else {
func_effect_8007A6F0(&actor->obj.pos, 0x2903A008); func_effect_8007A6F0(&actor->obj.pos, NA_SE_EN_EXPLOSION_S);
} }
if ((actor->obj.id == OBJ_ACTOR_EVENT) && (actor->unk_0B4 == EVID_2)) { if ((actor->obj.id == OBJ_ACTOR_EVENT) && (actor->unk_0B4 == EVID_2)) {
@ -4332,9 +4332,9 @@ void func_enmy2_800763A4(Actor* actor) {
actor->timer_0BE = 2; actor->timer_0BE = 2;
if ((actor->obj.id == OBJ_ACTOR_ALLRANGE) && (actor->aiType < AI360_KATT)) { if ((actor->obj.id == OBJ_ACTOR_ALLRANGE) && (actor->aiType < AI360_KATT)) {
func_effect_8007A6F0(&actor->obj.pos, 0x2903B009); func_effect_8007A6F0(&actor->obj.pos, NA_SE_EN_EXPLOSION_M);
} else { } else {
func_effect_8007A6F0(&actor->obj.pos, 0x2903A008); func_effect_8007A6F0(&actor->obj.pos, NA_SE_EN_EXPLOSION_S);
} }
} }
} }
@ -4370,9 +4370,9 @@ void func_enmy2_800763A4(Actor* actor) {
actor->timer_0BE = 2; actor->timer_0BE = 2;
if ((actor->obj.id == OBJ_ACTOR_ALLRANGE) && (actor->aiType < AI360_KATT)) { if ((actor->obj.id == OBJ_ACTOR_ALLRANGE) && (actor->aiType < AI360_KATT)) {
func_effect_8007A6F0(&actor->obj.pos, 0x2903B009); func_effect_8007A6F0(&actor->obj.pos, NA_SE_EN_EXPLOSION_M);
} else { } else {
func_effect_8007A6F0(&actor->obj.pos, 0x2903A008); func_effect_8007A6F0(&actor->obj.pos, NA_SE_EN_EXPLOSION_S);
} }
} }
} }

46
src/engine/fox_hud.c
View File

@ -795,7 +795,7 @@ void HUD_DrawLevelClearScreen(void) {
if ((gLevelClearScreenTimer == 92) || (gLevelClearScreenTimer == 87) || (gLevelClearScreenTimer == 82) || if ((gLevelClearScreenTimer == 92) || (gLevelClearScreenTimer == 87) || (gLevelClearScreenTimer == 82) ||
(gLevelClearScreenTimer == 77)) { (gLevelClearScreenTimer == 77)) {
AUDIO_PLAY_SFX(0x49008031, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_MISSION_ACCOMPLISHED, gDefaultSfxSource, 4);
} }
} else { } else {
if (gLevelClearScreenTimer <= 100) { if (gLevelClearScreenTimer <= 100) {
@ -823,9 +823,9 @@ void HUD_DrawLevelClearScreen(void) {
if ((gLevelClearScreenTimer == 80) || (gLevelClearScreenTimer == 72) || (gLevelClearScreenTimer == 64) || if ((gLevelClearScreenTimer == 80) || (gLevelClearScreenTimer == 72) || (gLevelClearScreenTimer == 64) ||
(gLevelClearScreenTimer == 56)) { (gLevelClearScreenTimer == 56)) {
if (!boolTemp) { if (!boolTemp) {
AUDIO_PLAY_SFX(0x49008034, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_MISSION_COMPLETE, gDefaultSfxSource, 4);
} else { } else {
AUDIO_PLAY_SFX(0x49008031, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_MISSION_ACCOMPLISHED, gDefaultSfxSource, 4);
} }
} }
} }
@ -1053,7 +1053,7 @@ void HUD_DrawLevelClearStatusScreen(void) {
f32 y6; f32 y6;
if (gShowLevelClearStatusScreen == 0) { if (gShowLevelClearStatusScreen == 0) {
Audio_KillSfxById(0x41007012); Audio_KillSfxById(NA_SE_TEAM_SHIELD_UP);
D_801617C0[0] = 0; D_801617C0[0] = 0;
} }
@ -1083,20 +1083,20 @@ void HUD_DrawLevelClearStatusScreen(void) {
if (((gTeamShields[TEAM_ID_FALCO] > 0) && (gTeamShields[TEAM_ID_FALCO] < 255)) && if (((gTeamShields[TEAM_ID_FALCO] > 0) && (gTeamShields[TEAM_ID_FALCO] < 255)) &&
((gTeamShields[TEAM_ID_SLIPPY] > 0) && (gTeamShields[TEAM_ID_SLIPPY] < 255)) && ((gTeamShields[TEAM_ID_SLIPPY] > 0) && (gTeamShields[TEAM_ID_SLIPPY] < 255)) &&
((gTeamShields[TEAM_ID_PEPPY] > 0) && (gTeamShields[TEAM_ID_PEPPY] < 255))) { ((gTeamShields[TEAM_ID_PEPPY] > 0) && (gTeamShields[TEAM_ID_PEPPY] < 255))) {
AUDIO_PLAY_SFX(0x41007012, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_TEAM_SHIELD_UP, gDefaultSfxSource, 4);
} }
D_801617C0[0] = 2; D_801617C0[0] = 2;
case 2: case 2:
if ((D_801617C0[5] == 0) && (D_801617C0[4] == 0)) { if ((D_801617C0[5] == 0) && (D_801617C0[4] == 0)) {
Audio_KillSfxById(0x41007012); Audio_KillSfxById(NA_SE_TEAM_SHIELD_UP);
D_801617C0[0] = 3; D_801617C0[0] = 3;
D_801617E8[0] = 30; D_801617E8[0] = 30;
break; break;
} }
if (D_801617C0[5] > 0) { if (D_801617C0[5] > 0) {
AUDIO_PLAY_SFX(0x49004007, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_COUNT_UP, gDefaultSfxSource, 4);
if (D_801617C0[5] >= 100) { if (D_801617C0[5] >= 100) {
D_801617C0[5] -= 100; D_801617C0[5] -= 100;
@ -1135,7 +1135,7 @@ void HUD_DrawLevelClearStatusScreen(void) {
if ((D_801617C0[i] == 0) || (temp == 0)) { if ((D_801617C0[i] == 0) || (temp == 0)) {
D_801617C0[4] = 0; D_801617C0[4] = 0;
Audio_KillSfxById(0x41007012); Audio_KillSfxById(NA_SE_TEAM_SHIELD_UP);
} }
} }
break; break;
@ -1154,7 +1154,7 @@ void HUD_DrawLevelClearStatusScreen(void) {
D_801617C0[0]++; D_801617C0[0]++;
} else { } else {
if (((gGameFrameCount % 2) == 0)) { if (((gGameFrameCount % 2) == 0)) {
AUDIO_PLAY_SFX(0x4900C024, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_ONE_UP, gDefaultSfxSource, 4);
D_801617C0[3]++; D_801617C0[3]++;
} }
} }
@ -1429,7 +1429,7 @@ void func_hud_80088970(void) {
D_80161838[0] = 0; D_80161838[0] = 0;
if (((ret > 0) && (D_80161810[1] == 1)) || ((ret < 0) && (D_80161810[1] == 0))) { if (((ret > 0) && (D_80161810[1] == 1)) || ((ret < 0) && (D_80161810[1] == 0))) {
D_80161810[1] ^= 1; D_80161810[1] ^= 1;
AUDIO_PLAY_SFX(0x49000002, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_CURSOR, gDefaultSfxSource, 4);
} }
} }
@ -1823,7 +1823,7 @@ void func_hud_80089D28(void) {
if ((gb == 10) || (gb == 0)) { if ((gb == 10) || (gb == 0)) {
// clang-format off // clang-format off
//! FAKE: Probably a MACRO //! FAKE: Probably a MACRO
if (1) {AUDIO_PLAY_SFX(0x4900001C, gDefaultSfxSource, 4);} if (1) {AUDIO_PLAY_SFX(NA_SE_MISSILE_ALARM, gDefaultSfxSource, 4);}
// clang-format on // clang-format on
} }
@ -2250,7 +2250,7 @@ void func_hud_8008B044(void) {
return; return;
} }
AUDIO_PLAY_SFX(0x49002018, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_COMMU_REQUEST, gDefaultSfxSource, 4);
if (gCallVoiceParam != 0) { if (gCallVoiceParam != 0) {
Audio_SetUnkVoiceParam(1); Audio_SetUnkVoiceParam(1);
@ -2263,7 +2263,7 @@ void func_hud_8008B044(void) {
D_80161790++; D_80161790++;
if (D_80161790 >= 7) { if (D_80161790 >= 7) {
if ((D_80161794 % 2) != 0) { if ((D_80161794 % 2) != 0) {
AUDIO_PLAY_SFX(0x49002018, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_COMMU_REQUEST, gDefaultSfxSource, 4);
} }
D_80161790 = 0; D_80161790 = 0;
D_80161794++; D_80161794++;
@ -2273,7 +2273,7 @@ void func_hud_8008B044(void) {
gCallVoiceParam = 0; gCallVoiceParam = 0;
D_80161790 = 0; D_80161790 = 0;
D_80161798 = 0; D_80161798 = 0;
Audio_KillSfxById(0x49002018); Audio_KillSfxById(NA_SE_COMMU_REQUEST);
} }
break; break;
} }
@ -3074,7 +3074,7 @@ void HUD_DrawBossHealth(void) {
if ((gShowBossHealth == 1) && (gTeamShields[TEAM_ID_SLIPPY] > 0)) { if ((gShowBossHealth == 1) && (gTeamShields[TEAM_ID_SLIPPY] > 0)) {
if ((gBossHealthBar >= 0) && (D_801616BC == -1.0f)) { if ((gBossHealthBar >= 0) && (D_801616BC == -1.0f)) {
AUDIO_PLAY_SFX(0x4900C028, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_BOSS_GAUGE_OPEN, gDefaultSfxSource, 4);
D_801616BC = 255.0f; D_801616BC = 255.0f;
} }
@ -3719,8 +3719,8 @@ s32 func_hud_80090200(Boss* boss) {
switch (boss->swork[1]) { switch (boss->swork[1]) {
case 0: case 0:
AUDIO_PLAY_SFX(0x11000011, boss->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_EARTHQUAKE, boss->sfxSource, 0);
AUDIO_PLAY_SFX(0x3140402E, boss->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_EXPLOSION_DEMO, boss->sfxSource, 0);
SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 50); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 50);
SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 50); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 50);
@ -4302,7 +4302,7 @@ bool func_hud_80091CF8(Actor* actor) {
if (actor->iwork[1] != 0) { if (actor->iwork[1] != 0) {
if (actor->fwork[10] < 0.1f) { if (actor->fwork[10] < 0.1f) {
actor->fwork[10] = 20.0f; actor->fwork[10] = 20.0f;
AUDIO_PLAY_SFX(0x09000002, actor->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_ARWING_BOOST, actor->sfxSource, 0);
actor->fwork[29] = 5.0f; actor->fwork[29] = 5.0f;
} }
actor->iwork[1] = 0; actor->iwork[1] = 0;
@ -4351,7 +4351,7 @@ bool func_hud_80091F00(Actor* actor) {
} }
actor->timer_0C6 = 20; actor->timer_0C6 = 20;
AUDIO_PLAY_SFX(0x2903300E, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_DAMAGE_S, actor->sfxSource, 4);
func_effect_8007D10C(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 1.5f); func_effect_8007D10C(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 1.5f);
Matrix_RotateY(gCalcMatrix, actor->unk_0F4.y * M_DTOR, MTXF_NEW); Matrix_RotateY(gCalcMatrix, actor->unk_0F4.y * M_DTOR, MTXF_NEW);
@ -4682,7 +4682,7 @@ void ActorTeamBoss_Init(Actor* actor) {
actor->unk_0C9 = 1; actor->unk_0C9 = 1;
} }
AUDIO_PLAY_SFX(0x3100000C, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_ARWING_ENGINE_FG, actor->sfxSource, 4);
if (((s32) (D_hud_800D1970 % 4U) == AI360_SLIPPY) && (gCurrentLevel == LEVEL_SECTOR_X)) { if (((s32) (D_hud_800D1970 % 4U) == AI360_SLIPPY) && (gCurrentLevel == LEVEL_SECTOR_X)) {
Object_Kill(&actor->obj, actor->sfxSource); Object_Kill(&actor->obj, actor->sfxSource);
@ -4828,7 +4828,7 @@ void func_hud_80093310(void) {
if (1) {} if (1) {}
this->obj.id = OBJ_ACTOR_CUTSCENE; this->obj.id = OBJ_ACTOR_CUTSCENE;
Object_SetInfo(&this->info, this->obj.id); Object_SetInfo(&this->info, this->obj.id);
AUDIO_PLAY_SFX(0x11030010, this->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_GREATFOX_ENGINE, this->sfxSource, 0);
} }
void func_hud_800933D8(f32 x, f32 y, f32 z, f32 arg3) { void func_hud_800933D8(f32 x, f32 y, f32 z, f32 arg3) {
@ -5133,7 +5133,7 @@ void HUD_AquasStart(Player* player) {
} }
if (player->csTimer == 774) { if (player->csTimer == 774) {
AUDIO_PLAY_SFX(0x01038026, player->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_MAR_LAUNCH, player->sfxSource, 0);
D_ctx_80177A10[9] = 40; D_ctx_80177A10[9] = 40;
} }
@ -6055,7 +6055,7 @@ void func_hud_80096A74(Player* player) {
player->unk_190 = player->unk_194 = 10.0f; player->unk_190 = player->unk_194 = 10.0f;
player->csState = 2; player->csState = 2;
D_ctx_80177A48[1] = 400.0f; D_ctx_80177A48[1] = 400.0f;
AUDIO_PLAY_SFX(0x09004002, player->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_ARWING_DASH, player->sfxSource, 0);
} }
break; break;

100
src/engine/fox_play.c
View File

@ -255,11 +255,11 @@ void func_play_800A4C40(Player* player) {
if ((sp30.y < gGroundHeight + 80.0f) || (sp3C.y < gGroundHeight + 80.0f)) { if ((sp30.y < gGroundHeight + 80.0f) || (sp3C.y < gGroundHeight + 80.0f)) {
if (D_play_80161A64 == 0) { if (D_play_80161A64 == 0) {
D_play_80161A64 = 1; D_play_80161A64 = 1;
AUDIO_PLAY_SFX(0x1100000B, player->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_SPLASH_LEVEL_S, player->sfxSource, 0);
} }
} else { } else {
D_play_80161A64 = 0; D_play_80161A64 = 0;
Audio_KillSfxBySourceAndId(player->sfxSource, 0x1100000B); Audio_KillSfxBySourceAndId(player->sfxSource, NA_SE_SPLASH_LEVEL_S);
} }
} }
} }
@ -498,8 +498,8 @@ void func_play_800A594C(void) {
if (!D_ctx_8017782C) { if (!D_ctx_8017782C) {
if (gCurrentLevel == LEVEL_SOLAR) { if (gCurrentLevel == LEVEL_SOLAR) {
Audio_SetHeatAlarmParams(255, 1); Audio_SetHeatAlarmParams(255, 1);
AUDIO_PLAY_SFX(0x4100C023, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OVERHEAT_ALARM, gDefaultSfxSource, 4);
Audio_KillSfxBySourceAndId(gPlayer[0].sfxSource, 0x3140807E); Audio_KillSfxBySourceAndId(gPlayer[0].sfxSource, NA_SE_OB_MAGMA_BUBBLE);
} }
} else if (gCurrentLevel == LEVEL_AQUAS) { } else if (gCurrentLevel == LEVEL_AQUAS) {
sEnvironment = SEGMENTED_TO_VIRTUAL(&D_AQ_602E584); sEnvironment = SEGMENTED_TO_VIRTUAL(&D_AQ_602E584);
@ -787,7 +787,7 @@ void Player_DamageWings(Player* player, s32 side, s32 damage) {
player->wings.rightState = WINGSTATE_BROKEN; player->wings.rightState = WINGSTATE_BROKEN;
func_effect_8007D0E0(player->hit1.x, player->hit1.y, player->hit1.z, 2.0f); func_effect_8007D0E0(player->hit1.x, player->hit1.y, player->hit1.z, 2.0f);
gRightWingDebrisTimer[player->num] = 50; gRightWingDebrisTimer[player->num] = 50;
func_play_800A5FA0(player->sfxSource, 0x0900A02C, player->num); func_play_800A5FA0(player->sfxSource, NA_SE_ARWING_WING_BROKEN, player->num);
if (gAllRangeWingRepairTimer == 0) { if (gAllRangeWingRepairTimer == 0) {
gAllRangeWingRepairTimer = 1000; gAllRangeWingRepairTimer = 1000;
} }
@ -802,7 +802,7 @@ void Player_DamageWings(Player* player, s32 side, s32 damage) {
player->wings.leftState = WINGSTATE_BROKEN; player->wings.leftState = WINGSTATE_BROKEN;
func_effect_8007D0E0(player->hit2.x, player->hit2.y, player->hit2.z, 2.0f); func_effect_8007D0E0(player->hit2.x, player->hit2.y, player->hit2.z, 2.0f);
gLeftWingDebrisTimer[player->num] = 50; gLeftWingDebrisTimer[player->num] = 50;
func_play_800A5FA0(player->sfxSource, 0x0900A02C, player->num); func_play_800A5FA0(player->sfxSource, NA_SE_ARWING_WING_BROKEN, player->num);
if (gAllRangeWingRepairTimer == 0) { if (gAllRangeWingRepairTimer == 0) {
gAllRangeWingRepairTimer = 1000; gAllRangeWingRepairTimer = 1000;
} }
@ -843,22 +843,22 @@ void Player_ApplyDamage(Player* player, s32 direction, s32 damage) {
player->timer_498 = 20; player->timer_498 = 20;
} }
if (gHasShield[player->num]) { if (gHasShield[player->num]) {
func_play_800A5FA0(player->sfxSource, 0x0903900E, player->num); func_play_800A5FA0(player->sfxSource, NA_SE_DAMAGE_S, player->num);
gShieldTimer[player->num] = 5; gShieldTimer[player->num] = 5;
gShieldAlpha[player->num] = 2.0f; gShieldAlpha[player->num] = 2.0f;
player->damage = 0; player->damage = 0;
} else { } else {
if (player->shields != 0) { if (player->shields != 0) {
if (player->shields < 50) { if (player->shields < 50) {
AUDIO_PLAY_SFX(0x49008011, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_SHIELD_WARNING1, gDefaultSfxSource, 4);
} else if (player->shields < 100) { } else if (player->shields < 100) {
AUDIO_PLAY_SFX(0x49008010, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_SHIELD_WARNING0, gDefaultSfxSource, 4);
} }
} }
if (damage < 25) { if (damage < 25) {
func_play_800A5FA0(player->sfxSource, 0x0903900E, player->num); func_play_800A5FA0(player->sfxSource, NA_SE_DAMAGE_S, player->num);
} else { } else {
func_play_800A5FA0(player->sfxSource, 0x0903A00F, player->num); func_play_800A5FA0(player->sfxSource, NA_SE_DAMAGE_L, player->num);
} }
} }
Matrix_RotateY(gCalcMatrix, player->yRot_114 * M_DTOR, MTXF_NEW); Matrix_RotateY(gCalcMatrix, player->yRot_114 * M_DTOR, MTXF_NEW);
@ -1661,7 +1661,7 @@ void func_play_800A8BA4(Player* player) {
scenery360->obj.rot.y, scenery360->obj.rot.z, 0.0f, 0.0f, 0.0f); scenery360->obj.rot.y, scenery360->obj.rot.z, 0.0f, 0.0f, 0.0f);
if ((temp_v0 != 0) && (temp_v0 < 0)) { if ((temp_v0 != 0) && (temp_v0 < 0)) {
if (player->whooshTimer == 0) { if (player->whooshTimer == 0) {
func_effect_8007A6F0(&scenery360->obj.pos, 0x19000001); func_effect_8007A6F0(&scenery360->obj.pos, NA_SE_PASS);
} }
player->whooshTimer += 2; player->whooshTimer += 2;
if (player->whooshTimer >= 4) { if (player->whooshTimer >= 4) {
@ -1677,7 +1677,7 @@ void func_play_800A8BA4(Player* player) {
if (temp_v0 != 0) { if (temp_v0 != 0) {
if (temp_v0 < 0) { if (temp_v0 < 0) {
if (player->whooshTimer == 0) { if (player->whooshTimer == 0) {
func_effect_8007A6F0(&scenery360->obj.pos, 0x19000001); func_effect_8007A6F0(&scenery360->obj.pos, NA_SE_PASS);
} }
player->whooshTimer += 2; player->whooshTimer += 2;
if (player->whooshTimer >= 4) { if (player->whooshTimer >= 4) {
@ -1776,7 +1776,7 @@ void func_play_800A8BA4(Player* player) {
player->shadowing = 80; player->shadowing = 80;
} }
if (player->whooshTimer == 0) { if (player->whooshTimer == 0) {
AUDIO_PLAY_SFX(0x19000001, scenery->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_PASS, scenery->sfxSource, 0);
} }
player->whooshTimer += 2; player->whooshTimer += 2;
if (player->whooshTimer >= 4) { if (player->whooshTimer >= 4) {
@ -1784,7 +1784,7 @@ void func_play_800A8BA4(Player* player) {
} }
} else if (scenery->obj.id == OBJ_SCENERY_54) { } else if (scenery->obj.id == OBJ_SCENERY_54) {
if (player->whooshTimer == 0) { if (player->whooshTimer == 0) {
AUDIO_PLAY_SFX(0x19832019, scenery->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_IN_SPLASH_L, scenery->sfxSource, 0);
} }
player->whooshTimer += 2; player->whooshTimer += 2;
if (player->whooshTimer >= 4) { if (player->whooshTimer >= 4) {
@ -1880,7 +1880,7 @@ void func_play_800A8BA4(Player* player) {
if (temp_v0 != 0) { if (temp_v0 != 0) {
if (temp_v0 < 0) { if (temp_v0 < 0) {
if (player->whooshTimer == 0) { if (player->whooshTimer == 0) {
AUDIO_PLAY_SFX(0x19000001, boss->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_PASS, boss->sfxSource, 0);
} }
player->whooshTimer += 2; player->whooshTimer += 2;
if (player->whooshTimer >= 4) { if (player->whooshTimer >= 4) {
@ -1944,11 +1944,11 @@ void func_play_800A8BA4(Player* player) {
Radio_PlayMessage(gMsg_ID_5504, RCID_FALCO); Radio_PlayMessage(gMsg_ID_5504, RCID_FALCO);
} }
AUDIO_PLAY_SFX(gWarpRingSfx[gRingPassCount], gPlayer[0].sfxSource, 0); AUDIO_PLAY_SFX(gWarpRingSfx[gRingPassCount], gPlayer[0].sfxSource, 0);
AUDIO_PLAY_SFX(0x49008025, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_RING_PASS, gDefaultSfxSource, 4);
} }
} else if (temp_v0 < 0) { } else if (temp_v0 < 0) {
if (player->whooshTimer == 0) { if (player->whooshTimer == 0) {
AUDIO_PLAY_SFX(0x19000001, actor->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_PASS, actor->sfxSource, 0);
} }
player->whooshTimer += 2; player->whooshTimer += 2;
if (player->whooshTimer >= 4) { if (player->whooshTimer >= 4) {
@ -1981,7 +1981,7 @@ void func_play_800A8BA4(Player* player) {
if (temp_v0 != 0) { if (temp_v0 != 0) {
if (temp_v0 < 0) { if (temp_v0 < 0) {
if (player->whooshTimer == 0) { if (player->whooshTimer == 0) {
AUDIO_PLAY_SFX(0x19000001, actor->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_PASS, actor->sfxSource, 0);
} }
player->whooshTimer += 2; player->whooshTimer += 2;
if (player->whooshTimer >= 4) { if (player->whooshTimer >= 4) {
@ -2558,8 +2558,8 @@ void Play_Init(void) {
D_ctx_80177C70 = 0; D_ctx_80177C70 = 0;
gTeamHelpActor = NULL; gTeamHelpActor = NULL;
gTeamHelpTimer = 0; gTeamHelpTimer = 0;
Audio_KillSfxById(0x11403076); Audio_KillSfxById(NA_SE_OB_ROOT_EXPLOSION1);
Audio_KillSfxById(0x49000014); Audio_KillSfxById(NA_SE_DEMO_SIREN);
Memory_FreeAll(); Memory_FreeAll();
gTraining360MsgTimer = gTraining360MsgIndex = gShowBossHealth = gStarWolfMsgTimer = gAllRangeWingRepairTimer = gTraining360MsgTimer = gTraining360MsgIndex = gShowBossHealth = gStarWolfMsgTimer = gAllRangeWingRepairTimer =
gAllRangeSuppliesSent = 0; gAllRangeSuppliesSent = 0;
@ -2831,7 +2831,7 @@ void func_play_800ACA40(Player* player) {
for (i = 0; i < ARRAY_COUNT(gPlayerShots) - 1; i++) { for (i = 0; i < ARRAY_COUNT(gPlayerShots) - 1; i++) {
if (gPlayerShots[i].obj.status == 0) { if (gPlayerShots[i].obj.status == 0) {
func_play_800AC650(player, &gPlayerShots[i], PLAYERSHOT_5, 100.0f); func_play_800AC650(player, &gPlayerShots[i], PLAYERSHOT_5, 100.0f);
func_play_800A5FA0(player->sfxSource, 0x09000014, player->num); func_play_800A5FA0(player->sfxSource, NA_SE_TANK_SHOT, player->num);
player->unk_1A0 = 2; player->unk_1A0 = 2;
break; break;
} }
@ -2850,7 +2850,7 @@ void func_play_800ACABC(Player* player) {
for (i = 0; i < ARRAY_COUNT(gPlayerShots) - 1; i++) { for (i = 0; i < ARRAY_COUNT(gPlayerShots) - 1; i++) {
if (gPlayerShots[i].obj.status == 0) { if (gPlayerShots[i].obj.status == 0) {
func_play_800AC290(player, &gPlayerShots[i], 0.0f, 0.0f, PLAYERSHOT_0, 400.0f / 3.0f); func_play_800AC290(player, &gPlayerShots[i], 0.0f, 0.0f, PLAYERSHOT_0, 400.0f / 3.0f);
func_play_800A5FA0(player->sfxSource, 0x09400000, player->num); func_play_800A5FA0(player->sfxSource, NA_SE_ARWING_SHOT, player->num);
gMuzzleFlashScale[player->num] = 0.5f; gMuzzleFlashScale[player->num] = 0.5f;
break; break;
} }
@ -2862,10 +2862,10 @@ void func_play_800ACABC(Player* player) {
if (gPlayerShots[i].obj.status == 0) { if (gPlayerShots[i].obj.status == 0) {
func_play_800AC290(player, &gPlayerShots[i], 0.0f, -10.0f, PLAYERSHOT_1, 400.0f / 3.0f); func_play_800AC290(player, &gPlayerShots[i], 0.0f, -10.0f, PLAYERSHOT_1, 400.0f / 3.0f);
if (laser == LASERS_TWIN) { if (laser == LASERS_TWIN) {
func_play_800A5FA0(player->sfxSource, 0x0940800C, player->num); func_play_800A5FA0(player->sfxSource, NA_SE_ARWING_TWIN_LASER, player->num);
gMuzzleFlashScale[player->num] = 0.5f; gMuzzleFlashScale[player->num] = 0.5f;
} else { } else {
func_play_800A5FA0(player->sfxSource, 0x0940802B, player->num); func_play_800A5FA0(player->sfxSource, NA_SE_ARWING_TWIN_LASER2, player->num);
gMuzzleFlashScale[player->num] = 0.75f; gMuzzleFlashScale[player->num] = 0.75f;
} }
break; break;
@ -2949,7 +2949,7 @@ void func_play_800AD094(Player* player) {
for (i = 0; i < ARRAY_COUNT(gPlayerShots); i++) { for (i = 0; i < ARRAY_COUNT(gPlayerShots); i++) {
if (gPlayerShots[i].obj.status == 0) { if (gPlayerShots[i].obj.status == 0) {
func_play_800ACDC0(player, &gPlayerShots[i], PLAYERSHOT_6); func_play_800ACDC0(player, &gPlayerShots[i], PLAYERSHOT_6);
func_play_800A5FA0(player->sfxSource, 0x09000014, player->num); func_play_800A5FA0(player->sfxSource, NA_SE_TANK_SHOT, player->num);
player->csTimer = 2; player->csTimer = 2;
player->unk_180 = 10.0f; player->unk_180 = 10.0f;
break; break;
@ -2988,7 +2988,7 @@ bool func_play_800AD1F4(Player* player) {
gChargeTimers[player->num] = 21; gChargeTimers[player->num] = 21;
} }
if (gChargeTimers[player->num] == 20) { if (gChargeTimers[player->num] == 20) {
func_enmy_80060F30(player->sfxSource, 0x0900302D, player->num); func_enmy_80060F30(player->sfxSource, NA_SE_LOCK_SEARCH, player->num);
} }
if ((!(gInputHold->button & R_TRIG) || !(gInputHold->button & Z_TRIG) || (player->form != FORM_ARWING) || if ((!(gInputHold->button & R_TRIG) || !(gInputHold->button & Z_TRIG) || (player->form != FORM_ARWING) ||
(player->state_1C8 != PLAYERSTATE_1C8_ACTIVE)) && (player->state_1C8 != PLAYERSTATE_1C8_ACTIVE)) &&
@ -3024,7 +3024,7 @@ bool func_play_800AD1F4(Player* player) {
} else { } else {
func_play_800AC650(player, &gPlayerShots[14 - player->num], PLAYERSHOT_8, 70.0f); func_play_800AC650(player, &gPlayerShots[14 - player->num], PLAYERSHOT_8, 70.0f);
} }
func_enmy_80060F30(player->sfxSource, 0x09007029, player->num); func_enmy_80060F30(player->sfxSource, NA_SE_LOCK_ON_LASER, player->num);
gControllerRumbleTimers[player->num] = 5; gControllerRumbleTimers[player->num] = 5;
return true; return true;
} }
@ -3041,7 +3041,7 @@ bool func_play_800AD1F4(Player* player) {
} else { } else {
func_play_800AC650(player, &gPlayerShots[14 - player->num], PLAYERSHOT_8, 70.0f); func_play_800AC650(player, &gPlayerShots[14 - player->num], PLAYERSHOT_8, 70.0f);
} }
func_enmy_80060F30(player->sfxSource, 0x09007029, player->num); func_enmy_80060F30(player->sfxSource, NA_SE_LOCK_ON_LASER, player->num);
gChargeTimers[player->num] = 0; gChargeTimers[player->num] = 0;
gControllerRumbleTimers[player->num] = 5; gControllerRumbleTimers[player->num] = 5;
return true; return true;
@ -4666,7 +4666,7 @@ void func_play_800B2574(Player* player) {
if ((gInputHold->button & gBoostButton[player->num]) && !(gInputHold->button & gBrakeButton[player->num]) && if ((gInputHold->button & gBoostButton[player->num]) && !(gInputHold->button & gBrakeButton[player->num]) &&
(player->state_1C8 != PLAYERSTATE_1C8_U_TURN) && !player->boostCooldown) { (player->state_1C8 != PLAYERSTATE_1C8_U_TURN) && !player->boostCooldown) {
if (player->boostMeter == 0.0f) { if (player->boostMeter == 0.0f) {
func_play_800A5FA0(player->sfxSource, 0x09000002, player->num); func_play_800A5FA0(player->sfxSource, NA_SE_ARWING_BOOST, player->num);
player->unk_194 = 5.0f; player->unk_194 = 5.0f;
player->unk_190 = 5.0f; player->unk_190 = 5.0f;
if (gBoostButton[player->num] & gInputPress->button) { if (gBoostButton[player->num] & gInputPress->button) {
@ -4760,7 +4760,7 @@ void func_play_800B2C00(Player* player) {
if ((gInputHold->button & gBrakeButton[player->num]) && !(gInputHold->button & gBoostButton[player->num]) && if ((gInputHold->button & gBrakeButton[player->num]) && !(gInputHold->button & gBoostButton[player->num]) &&
(player->state_1C8 != PLAYERSTATE_1C8_U_TURN) && !player->boostCooldown) { (player->state_1C8 != PLAYERSTATE_1C8_U_TURN) && !player->boostCooldown) {
if (player->boostMeter == 0.0f) { if (player->boostMeter == 0.0f) {
func_play_800A5FA0(player->sfxSource, 0x09000003, player->num); func_play_800A5FA0(player->sfxSource, NA_SE_ARWING_BRAKE, player->num);
if ((gLevelMode == LEVELMODE_ALL_RANGE) && (gInputPress->button & gBrakeButton[player->num])) { if ((gLevelMode == LEVELMODE_ALL_RANGE) && (gInputPress->button & gBrakeButton[player->num])) {
gUturnBrakeTimers[gPlayerNum] = 5; gUturnBrakeTimers[gPlayerNum] = 5;
} }
@ -4818,7 +4818,7 @@ void func_play_800B3010(Player* player) {
if (player->boostMeter == 0.0f) { if (player->boostMeter == 0.0f) {
player->unk_194 = 4.0f; player->unk_194 = 4.0f;
player->unk_190 = 4.0f; player->unk_190 = 4.0f;
func_play_800A5FA0(player->sfxSource, 0x09000002, player->num); func_play_800A5FA0(player->sfxSource, NA_SE_ARWING_BOOST, player->num);
} }
Math_SmoothStepToF(&D_ctx_801779A8[player->num], 30.0f, 1.0f, 10.0f, 0.0f); Math_SmoothStepToF(&D_ctx_801779A8[player->num], 30.0f, 1.0f, 10.0f, 0.0f);
player->unk_190 = 2.0f; player->unk_190 = 2.0f;
@ -4831,7 +4831,7 @@ void func_play_800B3010(Player* player) {
} }
if ((gInputHold->button & gBrakeButton[player->num]) && !player->boostCooldown) { if ((gInputHold->button & gBrakeButton[player->num]) && !player->boostCooldown) {
if (player->boostMeter == 0.0f) { if (player->boostMeter == 0.0f) {
func_play_800A5FA0(player->sfxSource, 0x09000003, player->num); func_play_800A5FA0(player->sfxSource, NA_SE_ARWING_BRAKE, player->num);
} }
Math_SmoothStepToF(&D_ctx_801779A8[player->num], 20.0f, 1.0f, 10.0f, 0.0f); Math_SmoothStepToF(&D_ctx_801779A8[player->num], 20.0f, 1.0f, 10.0f, 0.0f);
sp2C = 5.0f; sp2C = 5.0f;
@ -4851,7 +4851,7 @@ void func_play_800B3314(Player* player) {
player->gravity = 3.0f; player->gravity = 3.0f;
if ((gInputHold->button & Z_TRIG) && !player->boostCooldown) { if ((gInputHold->button & Z_TRIG) && !player->boostCooldown) {
if (player->boostMeter == 0.0f) { if (player->boostMeter == 0.0f) {
func_play_800A5FA0(player->sfxSource, 0x09000002, player->num); func_play_800A5FA0(player->sfxSource, NA_SE_ARWING_BOOST, player->num);
} }
player->unk_188 = 0.0f; player->unk_188 = 0.0f;
player->zRotBank += 4.0f; player->zRotBank += 4.0f;
@ -4879,7 +4879,7 @@ void func_play_800B3314(Player* player) {
} }
if ((gInputHold->button & R_TRIG) && !player->boostCooldown) { if ((gInputHold->button & R_TRIG) && !player->boostCooldown) {
if (player->boostMeter == 0.0f) { if (player->boostMeter == 0.0f) {
func_play_800A5FA0(player->sfxSource, 0x09000002, player->num); func_play_800A5FA0(player->sfxSource, NA_SE_ARWING_BOOST, player->num);
} }
player->unk_188 = 0.0f; player->unk_188 = 0.0f;
player->zRotBank -= 4.0f; player->zRotBank -= 4.0f;
@ -5072,7 +5072,7 @@ void Player_UpdateShields(Player* player) {
if (player->shields >= Play_GetMaxShields()) { if (player->shields >= Play_GetMaxShields()) {
player->shields = Play_GetMaxShields(); player->shields = Play_GetMaxShields();
player->heal = 0; player->heal = 0;
Audio_KillSfxById(0x41007012); Audio_KillSfxById(NA_SE_TEAM_SHIELD_UP);
} }
} }
} }
@ -5091,7 +5091,7 @@ void func_play_800B415C(Player* player) {
var_v0 = 16 - 1; var_v0 = 16 - 1;
} }
if ((gGameFrameCount & var_v0) == 0) { if ((gGameFrameCount & var_v0) == 0) {
func_enmy_80060F30(player->sfxSource, 0x49001026, player->num); func_enmy_80060F30(player->sfxSource, NA_SE_SHIELD_BUZZER, player->num);
} }
} }
} }
@ -5107,10 +5107,10 @@ void Player_Down(Player* player) {
AUDIO_PLAY_BGM(SEQ_ID_DEATH); AUDIO_PLAY_BGM(SEQ_ID_DEATH);
} }
if (gCurrentLevel == LEVEL_SOLAR) { if (gCurrentLevel == LEVEL_SOLAR) {
Audio_KillSfxById(0x4100C023); Audio_KillSfxById(NA_SE_OVERHEAT_ALARM);
} }
Audio_StopPlayerNoise(player->num); Audio_StopPlayerNoise(player->num);
func_play_800A5FA0(player->sfxSource, 0x0900C010, player->num); func_play_800A5FA0(player->sfxSource, NA_SE_ARWING_DOWN, player->num);
player->shields = 0; player->shields = 0;
player->csState = 0; player->csState = 0;
player->hitTimer = 0; player->hitTimer = 0;
@ -5368,9 +5368,9 @@ void Player_Update(Player* player) {
if ((!gVersusMode || (D_ctx_80177E7C != 0)) && !player->somersault && (gInputPress->button & U_CBUTTONS) && if ((!gVersusMode || (D_ctx_80177E7C != 0)) && !player->somersault && (gInputPress->button & U_CBUTTONS) &&
((player->form == FORM_ARWING) || (gVersusMode && (player->form == FORM_LANDMASTER)))) { ((player->form == FORM_ARWING) || (gVersusMode && (player->form == FORM_LANDMASTER)))) {
if (player->cockpitView = 1 - player->cockpitView) { if (player->cockpitView = 1 - player->cockpitView) {
AUDIO_PLAY_SFX(0x4900002C, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_VIEW_MOVE_IN, gDefaultSfxSource, 4);
} else { } else {
AUDIO_PLAY_SFX(0x4900002D, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_VIEW_MOVE_OUT, gDefaultSfxSource, 4);
if (gLevelMode == LEVELMODE_ON_RAILS) { if (gLevelMode == LEVELMODE_ON_RAILS) {
player->camRoll = 0.0f; player->camRoll = 0.0f;
} }
@ -5400,7 +5400,7 @@ void Player_Update(Player* player) {
if (D_ctx_80177E7C == 1) { if (D_ctx_80177E7C == 1) {
D_ctx_80177E7C += 1; D_ctx_80177E7C += 1;
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
func_play_800A5FA0(gPlayer[i].sfxSource, 0x09000002, gPlayer[i].num); func_play_800A5FA0(gPlayer[i].sfxSource, NA_SE_ARWING_BOOST, gPlayer[i].num);
gPlayer[i].unk_190 = gPlayer[i].unk_194 = 5.0f; gPlayer[i].unk_190 = gPlayer[i].unk_194 = 5.0f;
} }
} }
@ -5484,7 +5484,7 @@ void Player_Update(Player* player) {
func_play_800B0F50(player); func_play_800B0F50(player);
func_play_800B44C4(player); func_play_800B44C4(player);
func_play_800B7184(player, 1); func_play_800B7184(player, 1);
func_play_800A5FA0(player->sfxSource, 0x09000002, player->num); func_play_800A5FA0(player->sfxSource, NA_SE_ARWING_BOOST, player->num);
player->unk_190 = player->unk_194 = 5.0f; player->unk_190 = player->unk_194 = 5.0f;
} else if (player->unk_288 >= 0) { } else if (player->unk_288 >= 0) {
if (player->unk_288 == 0) { if (player->unk_288 == 0) {
@ -6206,7 +6206,7 @@ void Play_UpdateLevel(void) {
gPlayer[0].state_1C8 = PLAYERSTATE_1C8_ENTER_WARP_ZONE; gPlayer[0].state_1C8 = PLAYERSTATE_1C8_ENTER_WARP_ZONE;
gPlayer[0].csState = 0; gPlayer[0].csState = 0;
gSceneSetup = 1; gSceneSetup = 1;
AUDIO_PLAY_SFX(0x1900602A, gDefaultSfxSource, 0); AUDIO_PLAY_SFX(NA_SE_WARP_HOLE, gDefaultSfxSource, 0);
gMissionStatus = MISSION_WARP; gMissionStatus = MISSION_WARP;
gLeveLClearStatus[gCurrentLevel] = 1; gLeveLClearStatus[gCurrentLevel] = 1;
} }
@ -6263,9 +6263,9 @@ void Play_UpdateLevel(void) {
} }
if (gPlayer[0].heal == 0) { if (gPlayer[0].heal == 0) {
if (gPlayer[0].shields == 50) { if (gPlayer[0].shields == 50) {
AUDIO_PLAY_SFX(0x49008011, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_SHIELD_WARNING1, gDefaultSfxSource, 4);
} else if (gPlayer[0].shields == 100) { } else if (gPlayer[0].shields == 100) {
AUDIO_PLAY_SFX(0x49008010, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_SHIELD_WARNING0, gDefaultSfxSource, 4);
} }
} }
} }
@ -6478,18 +6478,18 @@ void Play_Main(void) {
if ((gControllerPress[gMainController].button & R_TRIG) && (gPlayer[0].form != FORM_BLUE_MARINE) && if ((gControllerPress[gMainController].button & R_TRIG) && (gPlayer[0].form != FORM_BLUE_MARINE) &&
(gPlayer[0].state_1C8 != PLAYERSTATE_1C8_STANDBY)) { (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_STANDBY)) {
if (gShowCrosshairs[0] = 1 - gShowCrosshairs[0]) { if (gShowCrosshairs[0] = 1 - gShowCrosshairs[0]) {
AUDIO_PLAY_SFX(0x49000019, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_MAP_WINDOW_OPEN, gDefaultSfxSource, 4);
} else { } else {
AUDIO_PLAY_SFX(0x4900101A, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_MAP_WINDOW_CLOSE, gDefaultSfxSource, 4);
} }
} }
} else { } else {
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
if ((gControllerPress[i].button & R_TRIG) && (gPlayer[i].form != FORM_ON_FOOT)) { if ((gControllerPress[i].button & R_TRIG) && (gPlayer[i].form != FORM_ON_FOOT)) {
if (gShowCrosshairs[i] = 1 - gShowCrosshairs[i]) { if (gShowCrosshairs[i] = 1 - gShowCrosshairs[i]) {
func_enmy_80060F30(gPlayer[i].sfxSource, 0x49000019, i); func_enmy_80060F30(gPlayer[i].sfxSource, NA_SE_MAP_WINDOW_OPEN, i);
} else { } else {
func_enmy_80060F30(gPlayer[i].sfxSource, 0x4900101A, i); func_enmy_80060F30(gPlayer[i].sfxSource, NA_SE_MAP_WINDOW_CLOSE, i);
} }
} }
} }

2
src/engine/fox_radio.c
View File

@ -628,7 +628,7 @@ void Radio_Draw(void) {
if ((gRadioMsgId >= 23000) && (gRadioMsgId < 23033)) { if ((gRadioMsgId >= 23000) && (gRadioMsgId < 23033)) {
if (gMsgCharIsPrinting) { if (gMsgCharIsPrinting) {
gRadioMouthTimer = 2; gRadioMouthTimer = 2;
AUDIO_PLAY_SFX(0x49000017, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_MESSAGE_MOVE, gDefaultSfxSource, 4);
} }
} else if (ret == 1) { } else if (ret == 1) {
gRadioMouthTimer = 2; gRadioMouthTimer = 2;

40
src/engine/fox_tank.c
View File

@ -514,7 +514,7 @@ void func_tank_80045130(Player* player) {
player->baseRollRate = 20; player->baseRollRate = 20;
player->rollRate = 20; player->rollRate = 20;
player->sfx.roll = 1; player->sfx.roll = 1;
AUDIO_PLAY_SFX(0x1100000A, player->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_TANK_SLIDE, player->sfxSource, 0);
} else { } else {
player->barrelInputTimerL = 10; player->barrelInputTimerL = 10;
} }
@ -527,7 +527,7 @@ void func_tank_80045130(Player* player) {
player->baseRollRate = -20; player->baseRollRate = -20;
player->rollRate = -20; player->rollRate = -20;
player->sfx.roll = 1; player->sfx.roll = 1;
AUDIO_PLAY_SFX(0x1100000A, player->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_TANK_SLIDE, player->sfxSource, 0);
} else { } else {
player->barrelInputTimerR = 10; player->barrelInputTimerR = 10;
} }
@ -551,7 +551,7 @@ void func_tank_80045348(Player* player) {
sp2E = true; sp2E = true;
if (D_800C9F24 == 0.0f) { if (D_800C9F24 == 0.0f) {
player->unk_190 = player->unk_194 = 4.0f; player->unk_190 = player->unk_194 = 4.0f;
AUDIO_PLAY_SFX(0x0900402F, player->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_TANK_DASH, player->sfxSource, 0);
} else { } else {
player->unk_190 = 2.0f; player->unk_190 = 2.0f;
} }
@ -593,13 +593,13 @@ void func_tank_80045678(Player* player) {
player->gravity = 3.0f; player->gravity = 3.0f;
if (!(gInputHold->button & Z_TRIG)) { if (!(gInputHold->button & Z_TRIG)) {
Audio_KillSfxBySourceAndId(player->sfxSource, 0x01008016); Audio_KillSfxBySourceAndId(player->sfxSource, NA_SE_TANK_GO_UP);
Audio_KillSfxBySourceAndId(player->sfxSource, 0x1100000A); Audio_KillSfxBySourceAndId(player->sfxSource, NA_SE_TANK_SLIDE);
} }
if ((gInputHold->button & Z_TRIG) && !player->boostCooldown) { if ((gInputHold->button & Z_TRIG) && !player->boostCooldown) {
D_800C9F14++; D_800C9F14++;
if (D_800C9F20 == 0.0f) { if (D_800C9F20 == 0.0f) {
AUDIO_PLAY_SFX(0x01004024, player->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_TANK_BURNER_HALF, player->sfxSource, 0);
} }
player->unk_188 = 0.0f; player->unk_188 = 0.0f;
player->zRotBank += 4.0f; player->zRotBank += 4.0f;
@ -623,13 +623,13 @@ void func_tank_80045678(Player* player) {
D_800C9F20 = 0.0f; D_800C9F20 = 0.0f;
} }
if (!(gInputHold->button & R_TRIG)) { if (!(gInputHold->button & R_TRIG)) {
Audio_KillSfxBySourceAndId(player->sfxSource, 0x01008016); Audio_KillSfxBySourceAndId(player->sfxSource, NA_SE_TANK_GO_UP);
Audio_KillSfxBySourceAndId(player->sfxSource, 0x1100000A); Audio_KillSfxBySourceAndId(player->sfxSource, NA_SE_TANK_SLIDE);
} }
if ((gInputHold->button & R_TRIG) && !player->boostCooldown) { if ((gInputHold->button & R_TRIG) && !player->boostCooldown) {
D_800C9F14++; D_800C9F14++;
if (player->unk_2C0 == 0.0f) { if (player->unk_2C0 == 0.0f) {
AUDIO_PLAY_SFX(0x01004024, player->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_TANK_BURNER_HALF, player->sfxSource, 0);
} }
player->unk_188 = 0.0f; player->unk_188 = 0.0f;
player->zRotBank -= 4.0f; player->zRotBank -= 4.0f;
@ -656,9 +656,9 @@ void func_tank_80045678(Player* player) {
if ((player->unk_16C > 0.2f) && (player->unk_170 > 0.2f) && (player->radioDamageTimer == 0)) { if ((player->unk_16C > 0.2f) && (player->unk_170 > 0.2f) && (player->radioDamageTimer == 0)) {
if (D_800C9F3C == 0) { if (D_800C9F3C == 0) {
D_800C9F3C = 1; D_800C9F3C = 1;
Audio_KillSfxBySourceAndId(player->sfxSource, 0x1100000A); Audio_KillSfxBySourceAndId(player->sfxSource, NA_SE_TANK_SLIDE);
Audio_KillSfxBySourceAndId(player->sfxSource, 0x01004024); Audio_KillSfxBySourceAndId(player->sfxSource, NA_SE_TANK_BURNER_HALF);
AUDIO_PLAY_SFX(0x01008016, player->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_TANK_GO_UP, player->sfxSource, 0);
} }
player->zRotBank += ((__cosf(gGameFrameCount * M_DTOR * 8.0f) * 10.0f) - player->zRotBank) * 0.1f; player->zRotBank += ((__cosf(gGameFrameCount * M_DTOR * 8.0f) * 10.0f) - player->zRotBank) * 0.1f;
temp = -gInputPress->stick_y; temp = -gInputPress->stick_y;
@ -742,7 +742,7 @@ void func_tank_80045E7C(Player* player) {
} }
if (player->rollRate == 0) { if (player->rollRate == 0) {
player->barrelRoll = 0; player->barrelRoll = 0;
Audio_KillSfxBySourceAndId(player->sfxSource, 0x1100000A); Audio_KillSfxBySourceAndId(player->sfxSource, NA_SE_TANK_SLIDE);
} }
} }
if ((player->timer_1E8 >= 5) && (player->hitTimer == 0) && (player->barrelRoll != 9)) { if ((player->timer_1E8 >= 5) && (player->hitTimer == 0) && (player->barrelRoll != 9)) {
@ -1120,14 +1120,14 @@ void func_tank_80047504(Player* player) {
if (player->boostMeter > 90.0f) { if (player->boostMeter > 90.0f) {
player->boostMeter = 90.0f; player->boostMeter = 90.0f;
player->boostCooldown = true; player->boostCooldown = true;
Audio_KillSfxBySourceAndId(player->sfxSource, 0x01004024); Audio_KillSfxBySourceAndId(player->sfxSource, NA_SE_TANK_BURNER_HALF);
Audio_KillSfxBySourceAndId(player->sfxSource, 0x01008016); Audio_KillSfxBySourceAndId(player->sfxSource, NA_SE_TANK_GO_UP);
} }
} else { } else {
if (player->boostMeter > 0.0f) { if (player->boostMeter > 0.0f) {
player->boostCooldown = true; player->boostCooldown = true;
Audio_KillSfxBySourceAndId(player->sfxSource, 0x01004024); Audio_KillSfxBySourceAndId(player->sfxSource, NA_SE_TANK_BURNER_HALF);
Audio_KillSfxBySourceAndId(player->sfxSource, 0x01008016); Audio_KillSfxBySourceAndId(player->sfxSource, NA_SE_TANK_GO_UP);
} }
} }
} else { } else {
@ -1300,7 +1300,7 @@ void func_tank_80047FBC(Player* player) {
Math_SmoothStepToF(&player->rot.z, -((player->vel.z / 5.0f) * 4.0f), 0.4f, 8.0f, 0.01f); Math_SmoothStepToF(&player->rot.z, -((player->vel.z / 5.0f) * 4.0f), 0.4f, 8.0f, 0.01f);
if (player->rot.z >= 3.0f) { if (player->rot.z >= 3.0f) {
if (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_LEVEL_COMPLETE) { if (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_LEVEL_COMPLETE) {
AUDIO_PLAY_SFX(0x19000065, player->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_RAILWAY_BOUND, player->sfxSource, 0);
} }
D_800C9F08 |= 1; D_800C9F08 |= 1;
} }
@ -1367,14 +1367,14 @@ void func_tank_800481F4(Player* player) {
gLight2BTarget = 20; gLight2BTarget = 20;
player->shadowing = 80; player->shadowing = 80;
if (player->whooshTimer == 0) { if (player->whooshTimer == 0) {
AUDIO_PLAY_SFX(0x19000001, player->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_PASS, player->sfxSource, 0);
} }
player->whooshTimer += 2; player->whooshTimer += 2;
if (player->whooshTimer >= 4) { if (player->whooshTimer >= 4) {
player->whooshTimer = 4; player->whooshTimer = 4;
} }
} else if (temp_v0 == -2) { } else if (temp_v0 == -2) {
AUDIO_PLAY_SFX(0x19000001, player->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_PASS, player->sfxSource, 0);
} }
} else { } else {
Player_ApplyDamage(player, temp_v0, scenery->info.damage); Player_ApplyDamage(player, temp_v0, scenery->info.damage);

22
src/engine/fox_versus.c
View File

@ -336,7 +336,7 @@ void func_versus_800BDE44(void) {
} else { } else {
D_80178810[i] = 0; D_80178810[i] = 0;
} }
AUDIO_PLAY_SFX(0x49004007, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_COUNT_UP, gDefaultSfxSource, 4);
} }
} }
@ -362,12 +362,12 @@ s32 Versus_UpdateTimer(void) {
if (D_versus_80178768[1] >= 0) { if (D_versus_80178768[1] >= 0) {
if ((D_versus_80178768[0] == 0) && (D_versus_80178768[1] < 15) && (D_versus_80178768[1] >= 0)) { if ((D_versus_80178768[0] == 0) && (D_versus_80178768[1] < 15) && (D_versus_80178768[1] >= 0)) {
AUDIO_PLAY_SFX(0x4900C02A, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_COUNTDOWN, gDefaultSfxSource, 4);
} }
} else { } else {
// clang-format off // clang-format off
if (D_versus_80178768[0] == 0) {\ if (D_versus_80178768[0] == 0) {\
AUDIO_PLAY_SFX(0x4900D036, gDefaultSfxSource, 4);\ AUDIO_PLAY_SFX(NA_SE_TIME_OVER, gDefaultSfxSource, 4);\
} }
// clang-format on // clang-format on
D_versus_80178768[1] *= -1; D_versus_80178768[1] *= -1;
@ -463,19 +463,19 @@ s32 func_versus_800BE564(void) {
} }
if (sUnlockLandmaster && (D_80178780[i] == 0) && (gControllerPress[i].button & B_BUTTON)) { if (sUnlockLandmaster && (D_80178780[i] == 0) && (gControllerPress[i].button & B_BUTTON)) {
AUDIO_PLAY_SFX(0x49000003, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_DECIDE, gDefaultSfxSource, 4);
D_80178780[i] = 2; D_80178780[i] = 2;
} }
if (sUnlockOnFoot && (D_80178780[i] == 0) && if (sUnlockOnFoot && (D_80178780[i] == 0) &&
((gControllerPress[i].button & L_CBUTTONS) || (gControllerPress[i].button & D_CBUTTONS) || ((gControllerPress[i].button & L_CBUTTONS) || (gControllerPress[i].button & D_CBUTTONS) ||
(gControllerPress[i].button & U_CBUTTONS) || (gControllerPress[i].button & R_CBUTTONS))) { (gControllerPress[i].button & U_CBUTTONS) || (gControllerPress[i].button & R_CBUTTONS))) {
AUDIO_PLAY_SFX(0x49000003, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_DECIDE, gDefaultSfxSource, 4);
D_80178780[i] = 3; D_80178780[i] = 3;
} }
if ((D_80178780[i] == 0) && (gControllerPress[i].button & A_BUTTON)) { if ((D_80178780[i] == 0) && (gControllerPress[i].button & A_BUTTON)) {
AUDIO_PLAY_SFX(0x49000003, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_DECIDE, gDefaultSfxSource, 4);
D_80178780[i] = 1; D_80178780[i] = 1;
} }
@ -598,10 +598,10 @@ s32 func_versus_800BEF00(void) {
if (D_80178794 == 0) { if (D_80178794 == 0) {
D_80178790--; D_80178790--;
if (D_80178790 != 0) { if (D_80178790 != 0) {
AUDIO_PLAY_SFX(0x49000008, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_READY, gDefaultSfxSource, 4);
ret = 0; ret = 0;
} else { } else {
AUDIO_PLAY_SFX(0x49000009, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_GO, gDefaultSfxSource, 4);
ret = 1; ret = 1;
} }
D_80178794 = 30; D_80178794 = 30;
@ -1131,7 +1131,7 @@ s32 func_versus_800C07C4(void) {
} }
// clang-format off // clang-format off
if (ret != 0) { AUDIO_PLAY_SFX(0x49000002, gDefaultSfxSource, 4); } if (ret != 0) { AUDIO_PLAY_SFX(NA_SE_CURSOR, gDefaultSfxSource, 4); }
// clang-format on // clang-format on
return ret; return ret;
@ -1257,7 +1257,7 @@ bool func_versus_800C0D10(void) {
if (cont == 4) { if (cont == 4) {
D_800D4A90 = 2; D_800D4A90 = 2;
} else { } else {
AUDIO_PLAY_SFX(0x49004007, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_COUNT_UP, gDefaultSfxSource, 4);
} }
break; break;
@ -1308,7 +1308,7 @@ s32 func_versus_800C0E78(void) {
bool func_versus_800C107C(s32 playerNum) { bool func_versus_800C107C(s32 playerNum) {
D_80178798++; D_80178798++;
if (D_80178798 == 10) { if (D_80178798 == 10) {
AUDIO_PLAY_SFX(0x49004007, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_COUNT_UP, gDefaultSfxSource, 4);
D_801787B8++; D_801787B8++;
D_80178798 = 0; D_80178798 = 0;
} }

4
src/mods/sfxjukebox.c
View File

@ -79,7 +79,7 @@ void Option_ExpertSoundUpdate(void) {
sfx |= sfxId & 0xFF; sfx |= sfxId & 0xFF;
if (prevSfx != sfx) { if (prevSfx != sfx) {
AUDIO_PLAY_SFX(0x49000002, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_CURSOR, gDefaultSfxSource, 4);
prevSfx = sfx; prevSfx = sfx;
} }
@ -100,7 +100,7 @@ void Option_ExpertSoundUpdate(void) {
D_menu_801B912C = 0; D_menu_801B912C = 0;
D_menu_801B9244 = 1; D_menu_801B9244 = 1;
} else { } else {
AUDIO_PLAY_SFX(0x4900101D, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_CANCEL, gDefaultSfxSource, 4);
Audio_KillSfxBySource(gDefaultSfxSource); Audio_KillSfxBySource(gDefaultSfxSource);
SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 1); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 1);
SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 1); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 1);

6
src/mods/sfxjukebox2.c
View File

@ -158,7 +158,7 @@ void Jukebox_Update(void) {
} }
if (prevSfx != sfx) { if (prevSfx != sfx) {
AUDIO_PLAY_SFX(0x49000002, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_CURSOR, gDefaultSfxSource, 4);
prevSfx = sfx; prevSfx = sfx;
} }
@ -171,7 +171,7 @@ void Jukebox_Update(void) {
if (contPress->button & B_BUTTON) { if (contPress->button & B_BUTTON) {
if (!D_menu_801B9320) { if (!D_menu_801B9320) {
AUDIO_PLAY_SFX(0x49000021, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_ARWING_CANCEL, gDefaultSfxSource, 4);
AUDIO_PLAY_BGM(SEQ_ID_MENU); AUDIO_PLAY_BGM(SEQ_ID_MENU);
gDrawMode = DRAW_NONE; gDrawMode = DRAW_NONE;
D_menu_801B9124 = 1000; D_menu_801B9124 = 1000;
@ -179,7 +179,7 @@ void Jukebox_Update(void) {
D_menu_801B9244 = 1; D_menu_801B9244 = 1;
return; return;
} else { } else {
AUDIO_PLAY_SFX(0x4900101D, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_CANCEL, gDefaultSfxSource, 4);
Audio_KillSfxBySource(sfxSource); Audio_KillSfxBySource(sfxSource);
SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 1); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 1);
SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 1); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 1);

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

@ -406,12 +406,12 @@ void Ending_8018845C(void);
s32 Ending_80188634(void) { s32 Ending_80188634(void) {
if (gCallTimer != 0) { if (gCallTimer != 0) {
if ((D_ending_80196F90 % 14) == 0) { if ((D_ending_80196F90 % 14) == 0) {
AUDIO_PLAY_SFX(0x49002018, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_COMMU_REQUEST, gDefaultSfxSource, 4);
} }
D_ending_80196F90++; D_ending_80196F90++;
gCallTimer--; gCallTimer--;
if (gCallTimer == 0) { if (gCallTimer == 0) {
Audio_KillSfxById(0x49002018); Audio_KillSfxById(NA_SE_COMMU_REQUEST);
} }
} else { } else {
D_ending_80196F90 = 0; D_ending_80196F90 = 0;
@ -602,7 +602,7 @@ void Ending_80189108(void) {
D_ending_80196D08[4].unk_34 = 0; D_ending_80196D08[4].unk_34 = 0;
D_ending_80196D08[4].unk_38 = 1; D_ending_80196D08[4].unk_38 = 1;
gCsFrameCount = 0; gCsFrameCount = 0;
Audio_KillSfxById(0x49002018); Audio_KillSfxById(NA_SE_COMMU_REQUEST);
D_ending_80196F90 = 0; D_ending_80196F90 = 0;
gCallTimer = 0; gCallTimer = 0;
} }

2
src/overlays/ovl_ending/fox_end2.c
View File

@ -745,7 +745,7 @@ void Ending_80190CF0(u32 arg0, AssetInfo* asset) {
} }
if (arg0 == asset->unk_0C) { if (arg0 == asset->unk_0C) {
AUDIO_PLAY_SFX(0x1940306E, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_VO_ANDORF_LAUGH, gDefaultSfxSource, 4);
} }
RCP_SetupDL(&gMasterDisp, asset->unk_08); RCP_SetupDL(&gMasterDisp, asset->unk_08);

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

@ -117,12 +117,12 @@ void Corneria_Boss292_Init(Boss292* this) {
void Corneria_8018798C(Boss* boss, f32 arg1, f32 arg2, f32 arg3, f32 arg4) { void Corneria_8018798C(Boss* boss, f32 arg1, f32 arg2, f32 arg3, f32 arg4) {
func_effect_8007BFFC(arg1, arg2, arg3, 0.0f, 0.0f, 0.0f, arg4, 30); func_effect_8007BFFC(arg1, arg2, arg3, 0.0f, 0.0f, 0.0f, arg4, 30);
func_effect_8007A6F0(&boss->obj.pos, 0x29034003); func_effect_8007A6F0(&boss->obj.pos, NA_SE_OB_DAMAGE_M);
} }
void Corneria_801879F0(Boss* boss, f32 arg1, f32 arg2, f32 arg3, f32 arg4) { void Corneria_801879F0(Boss* boss, f32 arg1, f32 arg2, f32 arg3, f32 arg4) {
func_effect_8007D1E0(arg1, arg2, arg3, arg4); func_effect_8007D1E0(arg1, arg2, arg3, arg4);
func_effect_8007A6F0(&boss->obj.pos, 0x29034003); func_effect_8007A6F0(&boss->obj.pos, NA_SE_OB_DAMAGE_M);
} }
void Corneria_80187A38(Boss* boss, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5) { void Corneria_80187A38(Boss* boss, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5) {
@ -151,16 +151,16 @@ void Corneria_80187AC8(Boss* boss) {
boss->swork[29] -= boss->damage; boss->swork[29] -= boss->damage;
Corneria_80187A38(boss, D_i1_8019B6D8[62], D_i1_8019B6D8[63], D_i1_8019B6D8[64], 0.2f, 20); Corneria_80187A38(boss, D_i1_8019B6D8[62], D_i1_8019B6D8[63], D_i1_8019B6D8[64], 0.2f, 20);
if (boss->swork[29] < 30) { if (boss->swork[29] < 30) {
func_effect_8007A6F0(&boss->obj.pos, 0x2943500F); func_effect_8007A6F0(&boss->obj.pos, NA_SE_EN_KNOCK_DOWN);
} else { } else {
func_effect_8007A6F0(&boss->obj.pos, 0x29034003); func_effect_8007A6F0(&boss->obj.pos, NA_SE_OB_DAMAGE_M);
} }
Radio_PlayMessage(gMsg_ID_2270, RCID_BOSS_CORNERIA); Radio_PlayMessage(gMsg_ID_2270, RCID_BOSS_CORNERIA);
if (boss->swork[29] <= 0) { if (boss->swork[29] <= 0) {
boss->swork[10] = 1000; boss->swork[10] = 1000;
boss->info.hitbox[1 + 0] = 100000.0f; boss->info.hitbox[1 + 0] = 100000.0f;
Corneria_8018798C(boss, D_i1_8019B6D8[62], D_i1_8019B6D8[63], D_i1_8019B6D8[64], 10.0f); Corneria_8018798C(boss, D_i1_8019B6D8[62], D_i1_8019B6D8[63], D_i1_8019B6D8[64], 10.0f);
AUDIO_PLAY_SFX(0x2940D09A, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_DOWN_IMPACT, boss->sfxSource, 4);
gScreenFlashTimer = 8; gScreenFlashTimer = 8;
if (fabsf(boss->obj.rot.x) < 20.0f) { if (fabsf(boss->obj.rot.x) < 20.0f) {
boss->swork[32] = 1; boss->swork[32] = 1;
@ -229,7 +229,7 @@ void Corneria_80187AC8(Boss* boss) {
Corneria_8018798C(boss, D_i1_8019B6D8[0], D_i1_8019B6D8[1], D_i1_8019B6D8[2], 7.0f); Corneria_8018798C(boss, D_i1_8019B6D8[0], D_i1_8019B6D8[1], D_i1_8019B6D8[2], 7.0f);
} }
} else if ((boss->dmgPart == 4) || (boss->dmgPart == 5)) { } else if ((boss->dmgPart == 4) || (boss->dmgPart == 5)) {
AUDIO_PLAY_SFX(0x2903300E, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_DAMAGE_S, boss->sfxSource, 4);
boss->swork[23] = 200; boss->swork[23] = 200;
if (boss->dmgPart == 4) { if (boss->dmgPart == 4) {
boss->swork[24] -= boss->damage; boss->swork[24] -= boss->damage;
@ -300,7 +300,7 @@ void Corneria_80187AC8(Boss* boss) {
} }
} }
} else { } else {
func_effect_8007A6F0(&boss->obj.pos, 0x29121007); func_effect_8007A6F0(&boss->obj.pos, NA_SE_EN_REFLECT);
} }
} }
@ -454,7 +454,7 @@ void Corneria_80188C7C(Boss* boss) {
if (boss->unk_044 == 0) { if (boss->unk_044 == 0) {
boss->unk_044++; boss->unk_044++;
boss->fwork[12] *= -0.2f; boss->fwork[12] *= -0.2f;
AUDIO_PLAY_SFX(0x19030004, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OB_METAL_BOUND_L, boss->sfxSource, 4);
func_enmy_80062B60(D_i1_8019B6D8[56], D_i1_8019B6D8[58], 0, 30.0f); func_enmy_80062B60(D_i1_8019B6D8[56], D_i1_8019B6D8[58], 0, 30.0f);
boss->swork[18] = 13; boss->swork[18] = 13;
boss->swork[19] = 15; boss->swork[19] = 15;
@ -486,7 +486,7 @@ void Corneria_80188D50(Boss* boss) {
(fabsf(boss->obj.pos.z - gPlayer[0].trueZpos) < 200.0f) && (gPlayer[0].aerobaticPitch > 180.0f)) { (fabsf(boss->obj.pos.z - gPlayer[0].trueZpos) < 200.0f) && (gPlayer[0].aerobaticPitch > 180.0f)) {
boss->swork[36]++; boss->swork[36]++;
D_i1_801997E0 = 20; D_i1_801997E0 = 20;
AUDIO_PLAY_SFX(0x49008025, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_RING_PASS, gDefaultSfxSource, 4);
if ((gTeamShields[TEAM_ID_FALCO] > 0) || (gTeamShields[TEAM_ID_SLIPPY] > 0) || if ((gTeamShields[TEAM_ID_FALCO] > 0) || (gTeamShields[TEAM_ID_SLIPPY] > 0) ||
(gTeamShields[TEAM_ID_PEPPY] > 0)) { (gTeamShields[TEAM_ID_PEPPY] > 0)) {
do { do {
@ -937,7 +937,7 @@ void Corneria_80189058(Boss* boss) {
boss->swork[31] = 0; boss->swork[31] = 0;
} }
if ((boss->state != 0) && ((boss->unk_04C == 0) || (boss->unk_04C == 52))) { if ((boss->state != 0) && ((boss->unk_04C == 0) || (boss->unk_04C == 52))) {
AUDIO_PLAY_SFX(0x29022019, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_HEAVY_WALK, boss->sfxSource, 4);
} }
if (gPlayer[0].somersault && (boss->state != 0)) { if (gPlayer[0].somersault && (boss->state != 0)) {
boss->state = 0; boss->state = 0;
@ -1130,7 +1130,7 @@ void Corneria_8018ACE0(Actor* actor) {
if (actor->dmgType != DMG_NONE) { if (actor->dmgType != DMG_NONE) {
actor->dmgType = DMG_NONE; actor->dmgType = DMG_NONE;
if (actor->dmgPart == 0) { if (actor->dmgPart == 0) {
AUDIO_PLAY_SFX(0x29034003, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OB_DAMAGE_M, actor->sfxSource, 4);
func_effect_8007C120(actor->obj.pos.x, actor->obj.pos.y + 200.0f, actor->obj.pos.z, actor->vel.x, func_effect_8007C120(actor->obj.pos.x, actor->obj.pos.y + 200.0f, actor->obj.pos.z, actor->vel.x,
actor->vel.y, actor->vel.z, 0.1f, 20); actor->vel.y, actor->vel.z, 0.1f, 20);
actor->timer_0C6 = 15; actor->timer_0C6 = 15;
@ -1274,7 +1274,7 @@ void Corneria_8018B15C(Actor* actor) {
scenery->vel.x = sp48.x; scenery->vel.x = sp48.x;
scenery->vel.y = sp48.y; scenery->vel.y = sp48.y;
scenery->vel.z = sp48.z; scenery->vel.z = sp48.z;
AUDIO_PLAY_SFX(0x2902401C, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_THROW, actor->sfxSource, 4);
} }
break; break;
} }
@ -1353,7 +1353,7 @@ void Corneria_8018B58C(Actor* actor) {
actor->obj.pos.z + 50.0f + RAND_FLOAT(50.0f), 3.0f); actor->obj.pos.z + 50.0f + RAND_FLOAT(50.0f), 3.0f);
func_effect_8007C120(actor->obj.pos.x, actor->obj.pos.y + 200.0f, actor->obj.pos.z, actor->vel.x, func_effect_8007C120(actor->obj.pos.x, actor->obj.pos.y + 200.0f, actor->obj.pos.z, actor->vel.x,
actor->vel.y, actor->vel.z, 0.1f, 10); actor->vel.y, actor->vel.z, 0.1f, 10);
AUDIO_PLAY_SFX(0x2903A008, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_EXPLOSION_S, actor->sfxSource, 4);
} }
if (actor->timer_0BC == 0) { if (actor->timer_0BC == 0) {
@ -1379,7 +1379,7 @@ void Corneria_8018B58C(Actor* actor) {
if (actor->timer_0BC == 8) { if (actor->timer_0BC == 8) {
func_effect_8007BFFC(actor->obj.pos.x, actor->obj.pos.y + 200.0f, actor->obj.pos.z + 50.0f, 0.0f, 0.0f, func_effect_8007BFFC(actor->obj.pos.x, actor->obj.pos.y + 200.0f, actor->obj.pos.z + 50.0f, 0.0f, 0.0f,
0.0f, 5.0f, 30); 0.0f, 5.0f, 30);
AUDIO_PLAY_SFX(0x2903B009, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_EXPLOSION_M, actor->sfxSource, 4);
} }
break; break;
case 101: case 101:
@ -1486,7 +1486,7 @@ void Corneria_Boss293_Init(Boss293* this) {
if (fabsf(gPlayer[0].xPath) < 1.0f) { if (fabsf(gPlayer[0].xPath) < 1.0f) {
this->timer_05A = 30000; this->timer_05A = 30000;
this->obj.pos.z = (gPlayer[0].cam.eye.z - gPathProgress) - 2000.0f; this->obj.pos.z = (gPlayer[0].cam.eye.z - gPathProgress) - 2000.0f;
AUDIO_PLAY_SFX(0x31038018, this->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_A_CARRIER_ENGINE, this->sfxSource, 4);
D_i1_8019B6D0 = 0; D_i1_8019B6D0 = 0;
} else { } else {
D_i1_8019B6D0 = 1; D_i1_8019B6D0 = 1;
@ -1495,7 +1495,7 @@ void Corneria_Boss293_Init(Boss293* this) {
this->obj.pos.z = gPlayer[0].trueZpos + 2000.0f; this->obj.pos.z = gPlayer[0].trueZpos + 2000.0f;
this->fwork[7] = this->obj.pos.x; this->fwork[7] = this->obj.pos.x;
this->fwork[5] = 30.0f; this->fwork[5] = 30.0f;
AUDIO_PLAY_SFX(0x31038018, this->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_A_CARRIER_ENGINE, this->sfxSource, 4);
this->swork[10] = 3; this->swork[10] = 3;
this->swork[8] = 3; this->swork[8] = 3;
} }
@ -1640,13 +1640,13 @@ void Corneria_8018C19C(Boss* boss) {
boss->health -= boss->damage; boss->health -= boss->damage;
if (boss->health < 120) { if (boss->health < 120) {
boss->fwork[17] = 2.8f; boss->fwork[17] = 2.8f;
AUDIO_PLAY_SFX(0x2943500F, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_KNOCK_DOWN, boss->sfxSource, 4);
} else { } else {
AUDIO_PLAY_SFX(0x29034003, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OB_DAMAGE_M, boss->sfxSource, 4);
} }
} }
} else { } else {
AUDIO_PLAY_SFX(0x29121007, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_REFLECT, boss->sfxSource, 4);
} }
} }
boss->vel.z = boss->fwork[18]; boss->vel.z = boss->fwork[18];
@ -1763,7 +1763,7 @@ void Corneria_8018C19C(Boss* boss) {
boss->state = boss->swork[0]; boss->state = boss->swork[0];
boss->timer_050 = 60; boss->timer_050 = 60;
boss->fwork[8] = 0.0f; boss->fwork[8] = 0.0f;
AUDIO_PLAY_SFX(0x2940201A, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_HATCH, boss->sfxSource, 4);
} }
break; break;
case 4: case 4:
@ -1775,7 +1775,7 @@ void Corneria_8018C19C(Boss* boss) {
boss->timer_050 = 20; boss->timer_050 = 20;
boss->fwork[8] = 0.0f; boss->fwork[8] = 0.0f;
if (gBosses[1].state == 0) { if (gBosses[1].state == 0) {
AUDIO_PLAY_SFX(0x2940201A, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_HATCH, boss->sfxSource, 4);
} }
if ((boss->swork[5] == 0) && ((gBosses[2].state == 0) || (gBosses[3].state == 0))) { if ((boss->swork[5] == 0) && ((gBosses[2].state == 0) || (gBosses[3].state == 0))) {
Radio_PlayMessage(gMsg_ID_2292, RCID_BOSS_CORNERIA2); Radio_PlayMessage(gMsg_ID_2292, RCID_BOSS_CORNERIA2);
@ -1793,13 +1793,13 @@ void Corneria_8018C19C(Boss* boss) {
boss->fwork[13] = 20.0f; boss->fwork[13] = 20.0f;
if ((boss->fwork[0] > 60.0f) && (gBosses[2].state == 0) && (boss->swork[1] == 0)) { if ((boss->fwork[0] > 60.0f) && (gBosses[2].state == 0) && (boss->swork[1] == 0)) {
Corneria_8018BDD4(boss, sp84[1].x, sp84[1].y + 50.0f, sp84[1].z, 45.0f, 0, 0); Corneria_8018BDD4(boss, sp84[1].x, sp84[1].y + 50.0f, sp84[1].z, 45.0f, 0, 0);
AUDIO_PLAY_SFX(0x2903201B, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_BARREL_SHOT, boss->sfxSource, 4);
Corneria_8018BDD4(boss, sp84[1].x, sp84[1].y - 50.0f, sp84[1].z, 40.0f, 0, 0); Corneria_8018BDD4(boss, sp84[1].x, sp84[1].y - 50.0f, sp84[1].z, 40.0f, 0, 0);
boss->swork[1] = 1; boss->swork[1] = 1;
} }
if ((boss->fwork[1] > 60.0f) && (gBosses[3].state == 0) && (boss->swork[2] == 0)) { if ((boss->fwork[1] > 60.0f) && (gBosses[3].state == 0) && (boss->swork[2] == 0)) {
Corneria_8018BDD4(boss, sp84[2].x, sp84[2].y + 50.0f, sp84[2].z, 35.0f, 0, 0); Corneria_8018BDD4(boss, sp84[2].x, sp84[2].y + 50.0f, sp84[2].z, 35.0f, 0, 0);
AUDIO_PLAY_SFX(0x2903201B, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_BARREL_SHOT, boss->sfxSource, 4);
Corneria_8018BDD4(boss, sp84[2].x, sp84[2].y - 50.0f, sp84[2].z, 30.0f, 0, 0); Corneria_8018BDD4(boss, sp84[2].x, sp84[2].y - 50.0f, sp84[2].z, 30.0f, 0, 0);
boss->swork[2] = 1; boss->swork[2] = 1;
} }
@ -1821,7 +1821,7 @@ void Corneria_8018C19C(Boss* boss) {
boss->swork[4]++; boss->swork[4]++;
boss->swork[4] &= 3; boss->swork[4] &= 3;
if ((gBosses[3].state == 0) && (gBosses[2].state == 0)) { if ((gBosses[3].state == 0) && (gBosses[2].state == 0)) {
AUDIO_PLAY_SFX(0x2940201A, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_HATCH, boss->sfxSource, 4);
} }
} }
break; break;
@ -1847,7 +1847,7 @@ void Corneria_8018C19C(Boss* boss) {
boss->fwork[8] = 0.0f; boss->fwork[8] = 0.0f;
if ((boss->swork[3] != 1) || (boss->swork[3] != 3)) { if ((boss->swork[3] != 1) || (boss->swork[3] != 3)) {
Audio_KillSfxBySourceAndId(boss->sfxSource, 0x31034025); Audio_KillSfxBySourceAndId(boss->sfxSource, NA_SE_EN_ZOBOSS_BEAM);
boss->swork[9] = 0; boss->swork[9] = 0;
} }
} }
@ -1857,7 +1857,7 @@ void Corneria_8018C19C(Boss* boss) {
if ((boss->obj.rot.y < 20.0f) && (boss->obj.rot.y > -20.0f)) { if ((boss->obj.rot.y < 20.0f) && (boss->obj.rot.y > -20.0f)) {
if (boss->swork[9] == 0) { if (boss->swork[9] == 0) {
boss->swork[9]++; boss->swork[9]++;
AUDIO_PLAY_SFX(0x31034025, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_ZOBOSS_BEAM, boss->sfxSource, 4);
if (boss->swork[6] == 0) { if (boss->swork[6] == 0) {
Radio_PlayMessage(gMsg_ID_2293, RCID_BOSS_CORNERIA2); Radio_PlayMessage(gMsg_ID_2293, RCID_BOSS_CORNERIA2);
} }
@ -1895,10 +1895,10 @@ void Corneria_8018C19C(Boss* boss) {
} }
if (boss->health < 2) { if (boss->health < 2) {
gTeamLowHealthMsgTimer = -1; gTeamLowHealthMsgTimer = -1;
Audio_KillSfxBySourceAndId(boss->sfxSource, 0x31034025); Audio_KillSfxBySourceAndId(boss->sfxSource, NA_SE_EN_ZOBOSS_BEAM);
SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 40); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 40);
SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 40); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 40);
AUDIO_PLAY_SFX(0x2940D09A, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_DOWN_IMPACT, boss->sfxSource, 4);
gScreenFlashTimer = 8; gScreenFlashTimer = 8;
gShowBossHealth = false; gShowBossHealth = false;
Radio_PlayMessage(gMsg_ID_2294, RCID_BOSS_CORNERIA2); Radio_PlayMessage(gMsg_ID_2294, RCID_BOSS_CORNERIA2);
@ -2029,7 +2029,7 @@ void Corneria_8018C19C(Boss* boss) {
boss->fwork[16] = 4.0f; boss->fwork[16] = 4.0f;
if ((boss->swork[10] == 0) && (boss->state < 6)) { if ((boss->swork[10] == 0) && (boss->state < 6)) {
boss->fwork[17] = 1.8f; boss->fwork[17] = 1.8f;
AUDIO_PLAY_SFX(0x11020084, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EXPLOSION_DEMO6, boss->sfxSource, 4);
boss->timer_058 = 71; boss->timer_058 = 71;
boss->state = 6; boss->state = 6;
boss->fwork[12] = 0.0f; boss->fwork[12] = 0.0f;
@ -2067,7 +2067,7 @@ void Corneria_8018DDAC(Boss* boss) {
if (boss->health != 0) { if (boss->health != 0) {
boss->timer_05C = 15; boss->timer_05C = 15;
boss->health -= boss->damage; boss->health -= boss->damage;
AUDIO_PLAY_SFX(0x29034003, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OB_DAMAGE_M, boss->sfxSource, 4);
if (boss->health <= 0) { if (boss->health <= 0) {
gBosses[0].swork[8]--; gBosses[0].swork[8]--;
if (gBosses[0].swork[8] != 0) { if (gBosses[0].swork[8] != 0) {
@ -2078,7 +2078,7 @@ void Corneria_8018DDAC(Boss* boss) {
boss->info.cullDistance = 300.0f; boss->info.cullDistance = 300.0f;
gBosses[0].fwork[14] = 25.0f; gBosses[0].fwork[14] = 25.0f;
gBosses[0].fwork[15] = 0.0f; gBosses[0].fwork[15] = 0.0f;
AUDIO_PLAY_SFX(0x2940C027, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_PARTS_BROKEN, boss->sfxSource, 4);
if (gBosses[0].swork[10] != 0) { if (gBosses[0].swork[10] != 0) {
gBosses[0].swork[10]--; gBosses[0].swork[10]--;
} }
@ -2098,7 +2098,7 @@ void Corneria_8018DDAC(Boss* boss) {
} }
} }
} else { } else {
AUDIO_PLAY_SFX(0x29121007, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_REFLECT, boss->sfxSource, 4);
} }
} }
boss->obj.rot.x = gBosses[0].obj.rot.x; boss->obj.rot.x = gBosses[0].obj.rot.x;
@ -2133,7 +2133,7 @@ void Corneria_8018DDAC(Boss* boss) {
boss->swork[0] = 1; boss->swork[0] = 1;
boss->gravity = 0.0f; boss->gravity = 0.0f;
Corneria_8018C0B0(boss); Corneria_8018C0B0(boss);
AUDIO_PLAY_SFX(0x19000014, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OB_WATER_BOUND_M, boss->sfxSource, 4);
} }
} else { } else {
boss->obj.rot.z -= 2.0f; boss->obj.rot.z -= 2.0f;
@ -2160,7 +2160,7 @@ void Corneria_8018E290(Boss* boss) {
if (boss->health != 0) { if (boss->health != 0) {
boss->timer_05C = 15; boss->timer_05C = 15;
boss->health -= boss->damage; boss->health -= boss->damage;
AUDIO_PLAY_SFX(0x29034003, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OB_DAMAGE_M, boss->sfxSource, 4);
if (boss->health <= 0) { if (boss->health <= 0) {
gBosses[0].swork[8]--; gBosses[0].swork[8]--;
if (gBosses[0].swork[8] != 0) { if (gBosses[0].swork[8] != 0) {
@ -2172,7 +2172,7 @@ void Corneria_8018E290(Boss* boss) {
gBosses[0].fwork[15] = 0.0f; gBosses[0].fwork[15] = 0.0f;
gBosses[0].fwork[14] = 335.0f; gBosses[0].fwork[14] = 335.0f;
boss->health = 0; boss->health = 0;
AUDIO_PLAY_SFX(0x2940C027, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_PARTS_BROKEN, boss->sfxSource, 4);
if (gBosses[0].swork[10] != 0) { if (gBosses[0].swork[10] != 0) {
gBosses[0].swork[10]--; gBosses[0].swork[10]--;
} }
@ -2190,7 +2190,7 @@ void Corneria_8018E290(Boss* boss) {
} }
} }
} else { } else {
AUDIO_PLAY_SFX(0x29121007, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_REFLECT, boss->sfxSource, 4);
} }
} }
boss->obj.rot.x = gBosses[0].obj.rot.x; boss->obj.rot.x = gBosses[0].obj.rot.x;
@ -2225,7 +2225,7 @@ void Corneria_8018E290(Boss* boss) {
boss->swork[0] = 1; boss->swork[0] = 1;
boss->gravity = 0.0f; boss->gravity = 0.0f;
Corneria_8018C0B0(boss); Corneria_8018C0B0(boss);
AUDIO_PLAY_SFX(0x19000014, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OB_WATER_BOUND_M, boss->sfxSource, 4);
} }
} else { } else {
boss->obj.rot.z -= 2.0f; boss->obj.rot.z -= 2.0f;
@ -2252,7 +2252,7 @@ void Corneria_8018E76C(Boss* boss) {
if (boss->health != 0) { if (boss->health != 0) {
boss->timer_05C = 15; boss->timer_05C = 15;
boss->health -= boss->damage; boss->health -= boss->damage;
AUDIO_PLAY_SFX(0x29034003, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OB_DAMAGE_M, boss->sfxSource, 4);
if (boss->health <= 0) { if (boss->health <= 0) {
gBosses[0].swork[8]--; gBosses[0].swork[8]--;
if (gBosses[0].swork[8] != 0) { if (gBosses[0].swork[8] != 0) {
@ -2264,7 +2264,7 @@ void Corneria_8018E76C(Boss* boss) {
gBosses[0].fwork[15] = 0.0f; gBosses[0].fwork[15] = 0.0f;
gBosses[0].fwork[14] = 335.0f; gBosses[0].fwork[14] = 335.0f;
boss->health = 0; boss->health = 0;
AUDIO_PLAY_SFX(0x2940C027, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_PARTS_BROKEN, boss->sfxSource, 4);
if (gBosses[0].swork[10] != 0) { if (gBosses[0].swork[10] != 0) {
gBosses[0].swork[10]--; gBosses[0].swork[10]--;
} }
@ -2285,7 +2285,7 @@ void Corneria_8018E76C(Boss* boss) {
} }
} }
} else { } else {
AUDIO_PLAY_SFX(0x29121007, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_REFLECT, boss->sfxSource, 4);
} }
} }
boss->obj.rot.x = gBosses[0].obj.rot.x; boss->obj.rot.x = gBosses[0].obj.rot.x;
@ -2317,7 +2317,7 @@ void Corneria_8018E76C(Boss* boss) {
boss->swork[0] = 1; boss->swork[0] = 1;
boss->gravity = 0.0f; boss->gravity = 0.0f;
Corneria_8018C0B0(boss); Corneria_8018C0B0(boss);
AUDIO_PLAY_SFX(0x19000014, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OB_WATER_BOUND_M, boss->sfxSource, 4);
} }
} else { } else {
boss->obj.rot.z -= 2.0f; boss->obj.rot.z -= 2.0f;
@ -2411,9 +2411,9 @@ void Corneria_8018F044(Scenery* scenery) {
if (scenery->unk_44 >= 3) { if (scenery->unk_44 >= 3) {
scenery->state = 1; scenery->state = 1;
scenery->info.hitbox = SEGMENTED_TO_VIRTUAL(&D_CO_603E924); scenery->info.hitbox = SEGMENTED_TO_VIRTUAL(&D_CO_603E924);
AUDIO_PLAY_SFX(0x1900000D, scenery->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_OB_GATE_OPEN, scenery->sfxSource, 0);
} else { } else {
AUDIO_PLAY_SFX(0x2903300E, scenery->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_EN_DAMAGE_S, scenery->sfxSource, 0);
} }
} }
} }
@ -2548,7 +2548,7 @@ void Corneria_8018F6F8(Actor* actor, s32 arg1) {
actor->unk_0C9 = 1; actor->unk_0C9 = 1;
actor->iwork[11] = 1; actor->iwork[11] = 1;
actor->info.cullDistance = 200.0f; actor->info.cullDistance = 200.0f;
AUDIO_PLAY_SFX(0x3100000C, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_ARWING_ENGINE_FG, actor->sfxSource, 4);
} }
void Corneria_LevelStart(Player* player) { void Corneria_LevelStart(Player* player) {
@ -2695,10 +2695,10 @@ void Corneria_LevelStart(Player* player) {
Radio_PlayMessage(gMsg_ID_2005, RCID_FOX); Radio_PlayMessage(gMsg_ID_2005, RCID_FOX);
} }
if (player->csTimer == 180) { if (player->csTimer == 180) {
AUDIO_PLAY_SFX(0x09000007, player->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_WING_OPEN, player->sfxSource, 0);
} }
if (player->csTimer == 120) { if (player->csTimer == 120) {
AUDIO_PLAY_SFX(0x09000013, player->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_WING_OPEN_END, player->sfxSource, 0);
} }
if ((player->csTimer < 190) && (player->csTimer > 150)) { if ((player->csTimer < 190) && (player->csTimer > 150)) {
Math_SmoothStepToF(&player->wings.unk_24, 2.0f, 0.2f, 0.5f, 0.0f); Math_SmoothStepToF(&player->wings.unk_24, 2.0f, 0.2f, 0.5f, 0.0f);
@ -2887,19 +2887,19 @@ void Corneria_LevelStart(Player* player) {
} }
if (player->csTimer == 70) { if (player->csTimer == 70) {
actor0->state = 1; actor0->state = 1;
func_play_800A6028(player->sfxSource, 0x09000002); func_play_800A6028(player->sfxSource, NA_SE_ARWING_BOOST);
} }
if (player->csTimer == 50) { if (player->csTimer == 50) {
actor1->state = 2; actor1->state = 2;
func_play_800A6028(player->sfxSource, 0x09000002); func_play_800A6028(player->sfxSource, NA_SE_ARWING_BOOST);
} }
if (player->csTimer == 30) { if (player->csTimer == 30) {
actor2->state = 3; actor2->state = 3;
func_play_800A6028(player->sfxSource, 0x09000002); func_play_800A6028(player->sfxSource, NA_SE_ARWING_BOOST);
} }
if (player->csTimer == 0) { if (player->csTimer == 0) {
player->csState = 9; player->csState = 9;
func_play_800A6028(player->sfxSource, 0x09000002); func_play_800A6028(player->sfxSource, NA_SE_ARWING_BOOST);
player->csTimer = 3; player->csTimer = 3;
player->unk_194 = 5.0f; player->unk_194 = 5.0f;
player->unk_190 = 5.0f; player->unk_190 = 5.0f;
@ -3013,7 +3013,7 @@ void Corneria_80190F74(Actor* actor, s32 arg1) {
actor->obj.rot.z = D_i1_80199B2C[arg1]; actor->obj.rot.z = D_i1_80199B2C[arg1];
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
actor->iwork[11] = 1; actor->iwork[11] = 1;
AUDIO_PLAY_SFX(0x3100000C, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_ARWING_ENGINE_FG, actor->sfxSource, 4);
} }
void Corneria_LevelComplete1(Player* player) { void Corneria_LevelComplete1(Player* player) {
@ -3141,7 +3141,7 @@ void Corneria_LevelComplete1(Player* player) {
if (gCsFrameCount == 1270) { if (gCsFrameCount == 1270) {
SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 50); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 50);
SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 50); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 50);
AUDIO_PLAY_SFX(0x09000002, player->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_ARWING_BOOST, player->sfxSource, 0);
player->csState++; player->csState++;
player->baseSpeed = 2.0f; player->baseSpeed = 2.0f;
player->unk_194 = 5.0f; player->unk_194 = 5.0f;
@ -3228,7 +3228,7 @@ void Corneria_LevelComplete1(Player* player) {
gActors[0].state = 1; gActors[0].state = 1;
gActors[0].fwork[9] = 2.0f; gActors[0].fwork[9] = 2.0f;
gActors[0].timer_0BC = 50; gActors[0].timer_0BC = 50;
AUDIO_PLAY_SFX(0x09000002, gActors[0].sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_ARWING_BOOST, gActors[0].sfxSource, 0);
gActors[0].fwork[29] = 5.0f; gActors[0].fwork[29] = 5.0f;
} }
break; break;
@ -3237,7 +3237,7 @@ void Corneria_LevelComplete1(Player* player) {
gActors[1].state = 1; gActors[1].state = 1;
gActors[1].fwork[9] = 2.0f; gActors[1].fwork[9] = 2.0f;
gActors[1].timer_0BC = 50; gActors[1].timer_0BC = 50;
AUDIO_PLAY_SFX(0x09000002, gActors[1].sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_ARWING_BOOST, gActors[1].sfxSource, 0);
gActors[1].fwork[29] = 5.0f; gActors[1].fwork[29] = 5.0f;
} }
break; break;
@ -3246,7 +3246,7 @@ void Corneria_LevelComplete1(Player* player) {
gActors[2].state = 1; gActors[2].state = 1;
gActors[2].fwork[9] = 2.0f; gActors[2].fwork[9] = 2.0f;
gActors[2].timer_0BC = 50; gActors[2].timer_0BC = 50;
AUDIO_PLAY_SFX(0x09000002, gActors[2].sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_ARWING_BOOST, gActors[2].sfxSource, 0);
gActors[2].fwork[29] = 5.0f; gActors[2].fwork[29] = 5.0f;
} }
break; break;

4
src/overlays/ovl_i1/fox_tr.c
View File

@ -31,7 +31,7 @@ void Training_ItemRing_Update(ItemTrainingRing* this) {
if (this->obj.pos.z > (gPlayer[0].trueZpos + var_fv0)) { if (this->obj.pos.z > (gPlayer[0].trueZpos + var_fv0)) {
this->unk_44 = 1; this->unk_44 = 1;
PRINTF("♪:リング未通過音\n"); // Ring not passed sound PRINTF("♪:リング未通過音\n"); // Ring not passed sound
AUDIO_PLAY_SFX(0x4900402F, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_RING_MISS, gDefaultSfxSource, 4);
gRingPassCount = 0; gRingPassCount = 0;
} }
} }
@ -40,7 +40,7 @@ void Training_ItemRing_Update(ItemTrainingRing* this) {
this->timer_48 = 50; this->timer_48 = 50;
this->info.cullDistance = 10000.0f; this->info.cullDistance = 10000.0f;
PRINTF("♪:リング通過音\n"); // Ring passing sound PRINTF("♪:リング通過音\n"); // Ring passing sound
AUDIO_PLAY_SFX(0x49008025, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_RING_PASS, gDefaultSfxSource, 4);
gRingPassCount++; gRingPassCount++;
if ((this->obj.rot.x != 0.0f) && (gRingPassCount >= 100)) { if ((this->obj.rot.x != 0.0f) && (gRingPassCount >= 100)) {
Radio_PlayMessage(gMsg_ID_20330, RCID_ROB64); Radio_PlayMessage(gMsg_ID_20330, RCID_ROB64);

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

@ -204,7 +204,7 @@ void Training_8019949C(void) {
actor->unk_0C9 = actor->iwork[11] = 1; actor->unk_0C9 = actor->iwork[11] = 1;
actor->timer_0C2 = 30; actor->timer_0C2 = 30;
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
AUDIO_PLAY_SFX(0x3100000C, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_ARWING_ENGINE_FG, actor->sfxSource, 4);
if ((i + 10) == 10) { if ((i + 10) == 10) {
actor->aiIndex = AI360_FOX; actor->aiIndex = AI360_FOX;
actor->health = 50; actor->health = 50;

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

@ -341,7 +341,7 @@ void Venom1_80192518(Actor* actor) {
if (actor->dmgType == DMG_BEAM) { if (actor->dmgType == DMG_BEAM) {
actor->dmgType = DMG_NONE; actor->dmgType = DMG_NONE;
func_effect_8007A6F0(&actor->obj.pos, 0x29121007); func_effect_8007A6F0(&actor->obj.pos, NA_SE_EN_REFLECT);
} }
if ((actor->state == 1) || (actor->state == 2) || (actor->state == 3)) { if ((actor->state == 1) || (actor->state == 2) || (actor->state == 3)) {
@ -393,7 +393,7 @@ void Venom1_80192518(Actor* actor) {
} }
actor->timer_0BC = actor->iwork[2]; actor->timer_0BC = actor->iwork[2];
AUDIO_PLAY_SFX(0x1903205B, actor->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_OB_POLE_MOVE, actor->sfxSource, 0);
actor->state = 2; actor->state = 2;
case 2: case 2:
@ -623,7 +623,7 @@ void Venom1_80192CB0(Actor* actor) {
void Venom1_80192CD4(Actor* actor) { void Venom1_80192CD4(Actor* actor) {
if (actor->dmgType == DMG_BEAM) { if (actor->dmgType == DMG_BEAM) {
actor->dmgType = DMG_NONE; actor->dmgType = DMG_NONE;
func_effect_8007A6F0(&actor->obj.pos, 0x29121007); func_effect_8007A6F0(&actor->obj.pos, NA_SE_EN_REFLECT);
} }
if (actor->iwork[1] > 0) { if (actor->iwork[1] > 0) {
@ -651,7 +651,7 @@ void Venom1_80192CD4(Actor* actor) {
Venom1_80192AA4(actor); Venom1_80192AA4(actor);
actor->iwork[1] = 5; actor->iwork[1] = 5;
actor->obj.rot.x = 90.0f; actor->obj.rot.x = 90.0f;
AUDIO_PLAY_SFX(0x1903205C, actor->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_OB_POLE_BOUND, actor->sfxSource, 0);
actor->state++; actor->state++;
} }
break; break;
@ -705,7 +705,7 @@ void Venom1_80192EB0(Actor* actor) {
actor->fwork[1] = 1237.0f - (var_ft4 - actor->obj.pos.y); actor->fwork[1] = 1237.0f - (var_ft4 - actor->obj.pos.y);
actor->obj.pos.y = var_ft4 + 1.0f; actor->obj.pos.y = var_ft4 + 1.0f;
actor->timer_0BC = actor->iwork[1]; actor->timer_0BC = actor->iwork[1];
AUDIO_PLAY_SFX(0x1903205B, actor->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_OB_POLE_MOVE, actor->sfxSource, 0);
actor->state = 2; actor->state = 2;
case 2: case 2:
@ -765,7 +765,7 @@ void Venom1_80192EB0(Actor* actor) {
} }
if (actor->dmgType == DMG_BEAM) { if (actor->dmgType == DMG_BEAM) {
actor->dmgType = DMG_NONE; actor->dmgType = DMG_NONE;
func_effect_8007A6F0(&actor->obj.pos, 0x29121007); func_effect_8007A6F0(&actor->obj.pos, NA_SE_EN_REFLECT);
} }
actor->iwork[0]++; actor->iwork[0]++;
} }
@ -780,11 +780,11 @@ void Venom1_801933DC(Actor* actor) {
if (actor->dmgType == DMG_BEAM) { if (actor->dmgType == DMG_BEAM) {
actor->dmgType = DMG_NONE; actor->dmgType = DMG_NONE;
AUDIO_PLAY_SFX(0x29121007, actor->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_EN_REFLECT, actor->sfxSource, 0);
} }
if ((actor->unk_0B6 == 38) || (actor->unk_0B6 == 58)) { if ((actor->unk_0B6 == 38) || (actor->unk_0B6 == 58)) {
AUDIO_PLAY_SFX(0x1903005A, actor->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_OB_ARM_SWING, actor->sfxSource, 0);
} }
Animation_GetFrameData(&D_VE1_900D098, actor->unk_0B6, actor->vwork); Animation_GetFrameData(&D_VE1_900D098, actor->unk_0B6, actor->vwork);
@ -1262,8 +1262,8 @@ void Venom1_80194398(Boss* boss) {
D_i1_8019B838[is4].unk_02[0] = 16; D_i1_8019B838[is4].unk_02[0] = 16;
D_i1_8019B838[is4].unk_02[1] = D_i1_8019A820[spF4].unk_0C; D_i1_8019B838[is4].unk_02[1] = D_i1_8019A820[spF4].unk_0C;
D_i1_8019B838[is4].unk_7C |= 4; D_i1_8019B838[is4].unk_7C |= 4;
AUDIO_PLAY_SFX(0x2903A008, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_EXPLOSION_S, boss->sfxSource, 4);
AUDIO_PLAY_SFX(0x19030059, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_BMBOSS_BROKEN, boss->sfxSource, 4);
} }
is4 = D_i1_8019A820[spF4].unk_0A; is4 = D_i1_8019A820[spF4].unk_0A;
if (is4 != -1) { if (is4 != -1) {
@ -1549,28 +1549,28 @@ void Venom1_80194398(Boss* boss) {
D_i1_8019B838[is4].unk_02[2] = 15; D_i1_8019B838[is4].unk_02[2] = 15;
if (D_i1_8019B838[is4].unk_00 <= 0) { if (D_i1_8019B838[is4].unk_00 <= 0) {
AUDIO_PLAY_SFX(0x2903A008, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_EXPLOSION_S, boss->sfxSource, 4);
AUDIO_PLAY_SFX(0x19030059, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_BMBOSS_BROKEN, boss->sfxSource, 4);
D_i1_8019B838[is4].unk_00 = -1; D_i1_8019B838[is4].unk_00 = -1;
D_i1_8019B838[is4].unk_02[0] = 16; D_i1_8019B838[is4].unk_02[0] = 16;
D_i1_8019B838[is4].unk_02[1] = 0; D_i1_8019B838[is4].unk_02[1] = 0;
D_i1_8019B838[is4].unk_7C |= 0xC; D_i1_8019B838[is4].unk_7C |= 0xC;
} else { } else {
AUDIO_PLAY_SFX(0x2903300E, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_DAMAGE_S, boss->sfxSource, 4);
if (is4 == 14) { if (is4 == 14) {
D_i1_8019B838[is4].unk_7C |= 8; D_i1_8019B838[is4].unk_7C |= 8;
} }
} }
} else { } else {
AUDIO_PLAY_SFX(0x29121007, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_REFLECT, boss->sfxSource, 4);
} }
} else { } else {
AUDIO_PLAY_SFX(0x29121007, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_REFLECT, boss->sfxSource, 4);
} }
break; break;
case 2: case 2:
if (D_i1_8019A500[boss->dmgPart] == 15) { if (D_i1_8019A500[boss->dmgPart] == 15) {
AUDIO_PLAY_SFX(0x31034064, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_BMBOSS_DAMAGE, boss->sfxSource, 4);
D_i1_8019B838[15].unk_02[2] = 10; D_i1_8019B838[15].unk_02[2] = 10;
D_i1_8019B838[15].unk_02[3] = 0; D_i1_8019B838[15].unk_02[3] = 0;
D_i1_8019B838[15].unk_7C |= 0x80; D_i1_8019B838[15].unk_7C |= 0x80;
@ -1582,12 +1582,12 @@ void Venom1_80194398(Boss* boss) {
gScreenFlashTimer = 8; gScreenFlashTimer = 8;
gTeamLowHealthMsgTimer = -1; gTeamLowHealthMsgTimer = -1;
D_ctx_8017828C = 1; D_ctx_8017828C = 1;
AUDIO_PLAY_SFX(0x2940D09A, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_DOWN_IMPACT, boss->sfxSource, 4);
boss->health = 0; boss->health = 0;
} }
} }
} else { } else {
AUDIO_PLAY_SFX(0x29121007, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_REFLECT, boss->sfxSource, 4);
} }
break; break;
} }
@ -1605,8 +1605,8 @@ void Venom1_80194398(Boss* boss) {
D_i1_8019B838[is4].unk_02[0] = 16; D_i1_8019B838[is4].unk_02[0] = 16;
D_i1_8019B838[is4].unk_02[1] = 0; D_i1_8019B838[is4].unk_02[1] = 0;
D_i1_8019B838[is4].unk_7C |= 0xC; D_i1_8019B838[is4].unk_7C |= 0xC;
AUDIO_PLAY_SFX(0x2903A008, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_EXPLOSION_S, boss->sfxSource, 4);
AUDIO_PLAY_SFX(0x19030059, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_BMBOSS_BROKEN, boss->sfxSource, 4);
} else if (is4 == 14) { } else if (is4 == 14) {
D_i1_8019B838[is4].unk_7C |= 8; D_i1_8019B838[is4].unk_7C |= 8;
} }
@ -1619,7 +1619,7 @@ void Venom1_80194398(Boss* boss) {
if (((gGameFrameCount % 4) == 0) && (boss->timer_05A == 0)) { if (((gGameFrameCount % 4) == 0) && (boss->timer_05A == 0)) {
for (spF4 = 0; spF4 < 33U; spF4++) { for (spF4 = 0; spF4 < 33U; spF4++) {
if ((D_i1_8019A500[spF4] == 15) && (D_i1_8019B7F0[spF4] != 0)) { if ((D_i1_8019A500[spF4] == 15) && (D_i1_8019B7F0[spF4] != 0)) {
AUDIO_PLAY_SFX(0x31034064, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_BMBOSS_DAMAGE, boss->sfxSource, 4);
D_i1_8019B838[15].unk_02[3] = 10; D_i1_8019B838[15].unk_02[3] = 10;
D_i1_8019B838[15].unk_02[4] = 0; D_i1_8019B838[15].unk_02[4] = 0;
D_i1_8019B838[15].unk_7C |= 0x80; D_i1_8019B838[15].unk_7C |= 0x80;
@ -1630,7 +1630,7 @@ void Venom1_80194398(Boss* boss) {
gScreenFlashTimer = 8; gScreenFlashTimer = 8;
gTeamLowHealthMsgTimer = -1; gTeamLowHealthMsgTimer = -1;
D_ctx_8017828C = 1; D_ctx_8017828C = 1;
AUDIO_PLAY_SFX(0x2940D09A, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_DOWN_IMPACT, boss->sfxSource, 4);
boss->health = 0; boss->health = 0;
} }
} }
@ -1721,7 +1721,7 @@ void Venom1_80194398(Boss* boss) {
boss->swork[10] = 16; boss->swork[10] = 16;
gCameraShake = 40; gCameraShake = 40;
boss->swork[23] = RAND_FLOAT(5.0f); boss->swork[23] = RAND_FLOAT(5.0f);
AUDIO_PLAY_SFX(0x29034082, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OB_BMBOSS_LAND, boss->sfxSource, 4);
spB8 = 3; spB8 = 3;
boss->swork[28] = 5; boss->swork[28] = 5;
} }
@ -1787,13 +1787,13 @@ void Venom1_80194398(Boss* boss) {
switch (boss->swork[27]) { switch (boss->swork[27]) {
case 0: case 0:
if (boss->fwork[10] > 14.0f) { if (boss->fwork[10] > 14.0f) {
AUDIO_PLAY_SFX(0x29032080, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OB_BMBOSS_WALK, boss->sfxSource, 4);
boss->swork[27]++; boss->swork[27]++;
} }
break; break;
case 1: case 1:
if (boss->fwork[10] > 45.0f) { if (boss->fwork[10] > 45.0f) {
AUDIO_PLAY_SFX(0x29032080, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OB_BMBOSS_WALK, boss->sfxSource, 4);
boss->swork[27]++; boss->swork[27]++;
} }
break; break;
@ -1832,7 +1832,7 @@ void Venom1_80194398(Boss* boss) {
case 122: case 122:
gCameraShake = 20; gCameraShake = 20;
boss->swork[28] = 7; boss->swork[28] = 7;
AUDIO_PLAY_SFX(0x29405084, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OB_BMBOSS_BOUND, boss->sfxSource, 4);
D_i1_8019B838[2].unk_60 = 5.0f; D_i1_8019B838[2].unk_60 = 5.0f;
D_i1_8019B838[2].unk_7C |= 0x800; D_i1_8019B838[2].unk_7C |= 0x800;
D_i1_8019B838[5].unk_7C |= 0x800; D_i1_8019B838[5].unk_7C |= 0x800;
@ -1848,7 +1848,7 @@ void Venom1_80194398(Boss* boss) {
case 118: case 118:
gCameraShake = 30; gCameraShake = 30;
boss->swork[28] = 7; boss->swork[28] = 7;
AUDIO_PLAY_SFX(0x29405084, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OB_BMBOSS_BOUND, boss->sfxSource, 4);
D_i1_8019B838[8].unk_7C |= 0x800; D_i1_8019B838[8].unk_7C |= 0x800;
D_i1_8019B838[8].unk_60 = 10.0f; D_i1_8019B838[8].unk_60 = 10.0f;
break; break;
@ -1857,11 +1857,11 @@ void Venom1_80194398(Boss* boss) {
break; break;
case 91: case 91:
boss->swork[28] = 7; boss->swork[28] = 7;
AUDIO_PLAY_SFX(0x29405084, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OB_BMBOSS_BOUND, boss->sfxSource, 4);
break; break;
case 78: case 78:
boss->swork[28] = 7; boss->swork[28] = 7;
AUDIO_PLAY_SFX(0x29405084, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OB_BMBOSS_BOUND, boss->sfxSource, 4);
gCameraShake = 20; gCameraShake = 20;
D_i1_8019B838[10].unk_7C |= 0x800; D_i1_8019B838[10].unk_7C |= 0x800;
D_i1_8019B838[10].unk_60 = 10.0f; D_i1_8019B838[10].unk_60 = 10.0f;
@ -1871,7 +1871,7 @@ void Venom1_80194398(Boss* boss) {
break; break;
case 66: case 66:
boss->swork[28] = 7; boss->swork[28] = 7;
AUDIO_PLAY_SFX(0x29405084, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OB_BMBOSS_BOUND, boss->sfxSource, 4);
D_i1_8019B838[11].unk_7C |= 0x20; D_i1_8019B838[11].unk_7C |= 0x20;
break; break;
case 65: case 65:
@ -1913,7 +1913,7 @@ void Venom1_80194398(Boss* boss) {
Boss_AwardBonus(boss); Boss_AwardBonus(boss);
gShowBossHealth = 0; gShowBossHealth = 0;
boss->swork[28] = 9; boss->swork[28] = 9;
AUDIO_PLAY_SFX(0x29405084, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OB_BMBOSS_BOUND, boss->sfxSource, 4);
boss->swork[26] = 1; boss->swork[26] = 1;
boss->info.hitbox = gNoHitbox; boss->info.hitbox = gNoHitbox;
boss->unk_05E = 0; boss->unk_05E = 0;
@ -1938,7 +1938,7 @@ void Venom1_80194398(Boss* boss) {
boss->swork[11] |= 1; boss->swork[11] |= 1;
break; break;
case 1: case 1:
AUDIO_PLAY_SFX(0x31030083, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OB_BMBOSS_ATTACK, boss->sfxSource, 4);
gCameraShake = 40; gCameraShake = 40;
boss->swork[28] = 5; boss->swork[28] = 5;
spB8 = spB4 = 1; spB8 = spB4 = 1;
@ -1956,7 +1956,7 @@ void Venom1_80194398(Boss* boss) {
break; break;
case 1: case 1:
spB4 = 1; spB4 = 1;
AUDIO_PLAY_SFX(0x31030083, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OB_BMBOSS_ATTACK, boss->sfxSource, 4);
gCameraShake = 40; gCameraShake = 40;
boss->swork[28] = 5; boss->swork[28] = 5;
spB8 = 2; spB8 = 2;
@ -2149,7 +2149,7 @@ void Venom1_80194398(Boss* boss) {
} }
break; break;
case 4: case 4:
AUDIO_PLAY_SFX(0x29033081, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OB_BMBOSS_JUMP, boss->sfxSource, 4);
boss->swork[7] = 1; boss->swork[7] = 1;
boss->fwork[10] = 0; boss->fwork[10] = 0;
boss->gravity = 0; boss->gravity = 0;

82
src/overlays/ovl_i2/fox_me.c
View File

@ -46,7 +46,7 @@ Vec3f D_i2_80195610[] = {
void Meteo_80187530(Actor* actor) { void Meteo_80187530(Actor* actor) {
if (actor->dmgType == DMG_BEAM) { if (actor->dmgType == DMG_BEAM) {
actor->dmgType = DMG_NONE; actor->dmgType = DMG_NONE;
func_effect_8007A6F0(&actor->obj.pos, 0x2902107D); func_effect_8007A6F0(&actor->obj.pos, NA_SE_ROCK_REFLECT);
} }
} }
@ -96,7 +96,7 @@ void Meteo_80187650(Actor* actor) {
} }
if (actor->dmgType != DMG_NONE) { if (actor->dmgType != DMG_NONE) {
func_effect_8007A6F0(&actor->obj.pos, 0x2903A008); func_effect_8007A6F0(&actor->obj.pos, NA_SE_EN_EXPLOSION_S);
func_effect_8007D2C8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 10.0f); func_effect_8007D2C8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 10.0f);
Object_Kill(&actor->obj, actor->sfxSource); Object_Kill(&actor->obj, actor->sfxSource);
} }
@ -134,7 +134,7 @@ void Meteo_801877C4(Actor* actor) {
if (actor->dmgType != DMG_NONE) { if (actor->dmgType != DMG_NONE) {
Actor_Despawn(actor); Actor_Despawn(actor);
func_effect_8007A6F0(&actor->obj.pos, 0x2903A008); func_effect_8007A6F0(&actor->obj.pos, NA_SE_EN_EXPLOSION_S);
Object_Kill(&actor->obj, actor->sfxSource); Object_Kill(&actor->obj, actor->sfxSource);
func_effect_8007D0E0(actor->obj.pos.x, actor->obj.pos.y + 30.0f, actor->obj.pos.z, 5.0f); func_effect_8007D0E0(actor->obj.pos.x, actor->obj.pos.y + 30.0f, actor->obj.pos.z, 5.0f);
func_effect_8007BFFC(actor->obj.pos.x, actor->obj.pos.y + 30.0f, actor->obj.pos.z, 0.0f, 0.0f, 0.0f, 3.0f, 10); func_effect_8007BFFC(actor->obj.pos.x, actor->obj.pos.y + 30.0f, actor->obj.pos.z, 0.0f, 0.0f, 0.0f, 3.0f, 10);
@ -157,7 +157,7 @@ void Meteo_8018795C(Actor* actor) {
if (actor->dmgType != DMG_NONE) { if (actor->dmgType != DMG_NONE) {
Actor_Despawn(actor); Actor_Despawn(actor);
func_effect_8007A6F0(&actor->obj.pos, 0x2903A008); func_effect_8007A6F0(&actor->obj.pos, NA_SE_EN_EXPLOSION_S);
Object_Kill(&actor->obj, actor->sfxSource); Object_Kill(&actor->obj, actor->sfxSource);
func_effect_8007D0E0(actor->obj.pos.x - actor->vel.x, actor->obj.pos.y, actor->obj.pos.z - actor->vel.z, 8.0f); func_effect_8007D0E0(actor->obj.pos.x - actor->vel.x, actor->obj.pos.y, actor->obj.pos.z - actor->vel.z, 8.0f);
func_effect_8007BFFC(actor->obj.pos.x - actor->vel.x, actor->obj.pos.y + 30.0f, actor->obj.pos.z - actor->vel.z, func_effect_8007BFFC(actor->obj.pos.x - actor->vel.x, actor->obj.pos.y + 30.0f, actor->obj.pos.z - actor->vel.z,
@ -192,7 +192,7 @@ void Meteo_80187B08(Actor* actor) {
} }
if ((actor->dmgType != DMG_NONE) || (actor->timer_0BC == 0)) { if ((actor->dmgType != DMG_NONE) || (actor->timer_0BC == 0)) {
func_effect_8007A6F0(&actor->obj.pos, 0x2903A008); func_effect_8007A6F0(&actor->obj.pos, NA_SE_EN_EXPLOSION_S);
Object_Kill(&actor->obj, actor->sfxSource); Object_Kill(&actor->obj, actor->sfxSource);
func_effect_8007D0E0(actor->obj.pos.x - actor->vel.x, actor->obj.pos.y, actor->obj.pos.z - actor->vel.z, 8.0f); func_effect_8007D0E0(actor->obj.pos.x - actor->vel.x, actor->obj.pos.y, actor->obj.pos.z - actor->vel.z, 8.0f);
func_effect_8007BFFC(actor->obj.pos.x - actor->vel.x, actor->obj.pos.y + 30.0f, actor->obj.pos.z - actor->vel.z, func_effect_8007BFFC(actor->obj.pos.x - actor->vel.x, actor->obj.pos.y + 30.0f, actor->obj.pos.z - actor->vel.z,
@ -256,7 +256,7 @@ void Meteo_80187E38(f32 x, f32 y, f32 z, f32 arg3) {
for (i = ARRAY_COUNT(gEffects) - 1; i >= 0; i--) { for (i = ARRAY_COUNT(gEffects) - 1; i >= 0; i--) {
if (gEffects[i].obj.status == OBJ_FREE) { if (gEffects[i].obj.status == OBJ_FREE) {
Meteo_80187D98(&gEffects[i], x, y, z, arg3, 0); Meteo_80187D98(&gEffects[i], x, y, z, arg3, 0);
AUDIO_PLAY_SFX(0x31037057, gEffects[i].sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_S_BEAM_SHOT, gEffects[i].sfxSource, 4);
break; break;
} }
} }
@ -304,7 +304,7 @@ void Meteo_80188088(Boss* boss) {
for (i = ARRAY_COUNT(gEffects) - 1; i >= 0; i--) { for (i = ARRAY_COUNT(gEffects) - 1; i >= 0; i--) {
if (gEffects[i].obj.status == OBJ_FREE) { if (gEffects[i].obj.status == OBJ_FREE) {
Meteo_80187FF8(&gEffects[i], boss->obj.pos.x + 700.0f, boss->obj.pos.y, boss->obj.pos.z + 1235.0f); Meteo_80187FF8(&gEffects[i], boss->obj.pos.x + 700.0f, boss->obj.pos.y, boss->obj.pos.z + 1235.0f);
AUDIO_PLAY_SFX(0x19006035, gEffects[i].sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_RNG_BEAM_SHOT, gEffects[i].sfxSource, 4);
break; break;
} }
} }
@ -349,7 +349,7 @@ void Meteo_80188298(f32 x, f32 y, f32 z, f32 zRot) {
for (i = ARRAY_COUNT(gEffects) - 1; i >= 0; i--) { for (i = ARRAY_COUNT(gEffects) - 1; i >= 0; i--) {
if (gEffects[i].obj.status == OBJ_FREE) { if (gEffects[i].obj.status == OBJ_FREE) {
Meteo_801881A8(&gEffects[i], x, y, z, zRot, -1); Meteo_801881A8(&gEffects[i], x, y, z, zRot, -1);
AUDIO_PLAY_SFX(0x3102705C, gEffects[i].sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_GRN_BEAM_SHOT, gEffects[i].sfxSource, 4);
break; break;
} }
} }
@ -395,7 +395,7 @@ void Meteo_80188344(Boss* boss) {
boss->timer_054 = 5; boss->timer_054 = 5;
boss->swork[0] += 32; boss->swork[0] += 32;
Audio_SetTransposeAndPlaySfx(boss->sfxSource, 0x3103605B, boss->unk_04A); Audio_SetTransposeAndPlaySfx(boss->sfxSource, NA_SE_EN_GRN_BEAM_CHARGE, boss->unk_04A);
boss->unk_04A++; boss->unk_04A++;
if (boss->unk_04A >= 8) { if (boss->unk_04A >= 8) {
@ -446,8 +446,8 @@ void Meteo_80188344(Boss* boss) {
boss->info.cullDistance = 1000.0f; boss->info.cullDistance = 1000.0f;
Audio_KillSfxBySourceAndId(boss->sfxSource, 0x3103605B); Audio_KillSfxBySourceAndId(boss->sfxSource, NA_SE_EN_GRN_BEAM_CHARGE);
AUDIO_PLAY_SFX(0x3102405D, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_ASBOSS_SHIELD, boss->sfxSource, 4);
} }
break; break;
@ -531,7 +531,7 @@ void Meteo_Boss297_Init(Boss297* this) {
Object_SetInfo(&gBosses[i].info, gBosses[i].obj.id); Object_SetInfo(&gBosses[i].info, gBosses[i].obj.id);
Radio_PlayMessage(gMsg_ID_3300, RCID_BOSS_METEO); Radio_PlayMessage(gMsg_ID_3300, RCID_BOSS_METEO);
AUDIO_PLAY_SFX(0x3102505A, this->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_BURNER_L, this->sfxSource, 4);
} }
void Meteo_80188B84(Effect* effect, f32 x, f32 y, f32 z, f32 xRot, f32 yRot, f32 arg6, f32 arg7) { void Meteo_80188B84(Effect* effect, f32 x, f32 y, f32 z, f32 xRot, f32 yRot, f32 arg6, f32 arg7) {
@ -722,7 +722,7 @@ void Meteo_801892F0(Boss* boss, s32 arg1) {
Vec3f dest; Vec3f dest;
Vec3f src; Vec3f src;
func_effect_8007A6F0(&boss->obj.pos, 0x2903B009); func_effect_8007A6F0(&boss->obj.pos, NA_SE_EN_EXPLOSION_M);
if (arg1 == 7) { if (arg1 == 7) {
func_effect_8007D2C8(boss->obj.pos.x, boss->obj.pos.y + 330.0f, boss->obj.pos.z + 1020.0f, 15.0f); func_effect_8007D2C8(boss->obj.pos.x, boss->obj.pos.y + 330.0f, boss->obj.pos.z + 1020.0f, 15.0f);
@ -847,27 +847,27 @@ void Meteo_8018978C(Boss* boss) {
if (boss->swork[0] > 5) { if (boss->swork[0] > 5) {
boss->swork[0]--; boss->swork[0]--;
if (boss->swork[0] == 5) { if (boss->swork[0] == 5) {
Audio_KillSfxBySourceAndId(boss->sfxSource, 0x3102505A); Audio_KillSfxBySourceAndId(boss->sfxSource, NA_SE_EN_BURNER_L);
} }
} }
if (boss->swork[1] > 5) { if (boss->swork[1] > 5) {
boss->swork[1] = boss->swork[1] - 1; boss->swork[1] = boss->swork[1] - 1;
if (boss->swork[1] == 5) { if (boss->swork[1] == 5) {
Audio_KillSfxBySourceAndId(boss->sfxSource, 0x3102505A); Audio_KillSfxBySourceAndId(boss->sfxSource, NA_SE_EN_BURNER_L);
} }
} }
if (boss->dmgType != DMG_NONE) { if (boss->dmgType != DMG_NONE) {
boss->dmgType = DMG_NONE; boss->dmgType = DMG_NONE;
if ((boss->dmgPart != 7) && (boss->dmgPart >= 5) && (boss->dmgPart != 5)) { if ((boss->dmgPart != 7) && (boss->dmgPart >= 5) && (boss->dmgPart != 5)) {
AUDIO_PLAY_SFX(0x29121007, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_REFLECT, boss->sfxSource, 4);
} }
if ((boss->state >= 2) && (boss->state < 20)) { if ((boss->state >= 2) && (boss->state < 20)) {
if ((boss->dmgPart < 5) && (boss[0].fwork[17 + boss->dmgPart] > 0.5f)) { if ((boss->dmgPart < 5) && (boss[0].fwork[17 + boss->dmgPart] > 0.5f)) {
if (boss[0].swork[boss->dmgPart + 2] != 0) { if (boss[0].swork[boss->dmgPart + 2] != 0) {
AUDIO_PLAY_SFX(0x29034003, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OB_DAMAGE_M, boss->sfxSource, 4);
boss[0].swork[9 + boss->dmgPart] = 20; boss[0].swork[9 + boss->dmgPart] = 20;
boss[0].swork[2 + boss->dmgPart] -= boss->damage; boss[0].swork[2 + boss->dmgPart] -= boss->damage;
@ -887,14 +887,14 @@ void Meteo_8018978C(Boss* boss) {
} }
} }
} else { } else {
AUDIO_PLAY_SFX(0x29121007, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_REFLECT, boss->sfxSource, 4);
} }
} }
if (boss->state >= 9) { if (boss->state >= 9) {
if (boss->dmgPart == 5) { if (boss->dmgPart == 5) {
if ((boss->swork[7] != 0) && (boss->fwork[22] > 0.8f)) { if ((boss->swork[7] != 0) && (boss->fwork[22] > 0.8f)) {
AUDIO_PLAY_SFX(0x2943500F, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_KNOCK_DOWN, boss->sfxSource, 4);
boss->swork[14] = 20; boss->swork[14] = 20;
boss->swork[7] -= boss->damage; boss->swork[7] -= boss->damage;
if (boss->swork[7] <= 0) { if (boss->swork[7] <= 0) {
@ -902,13 +902,13 @@ void Meteo_8018978C(Boss* boss) {
Meteo_801892F0(boss, boss->dmgPart); Meteo_801892F0(boss, boss->dmgPart);
} }
} else { } else {
AUDIO_PLAY_SFX(0x29121007, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_REFLECT, boss->sfxSource, 4);
} }
} }
if (boss->dmgPart == 7) { if (boss->dmgPart == 7) {
if ((boss->swork[8] != 0) && (boss->fwork[23] > 0.8f)) { if ((boss->swork[8] != 0) && (boss->fwork[23] > 0.8f)) {
AUDIO_PLAY_SFX(0x2943500F, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_KNOCK_DOWN, boss->sfxSource, 4);
boss->swork[15] = 20; boss->swork[15] = 20;
boss->swork[8] -= boss->damage; boss->swork[8] -= boss->damage;
if (boss->swork[8] <= 0) { if (boss->swork[8] <= 0) {
@ -916,7 +916,7 @@ void Meteo_8018978C(Boss* boss) {
Meteo_801892F0(boss, boss->dmgPart); Meteo_801892F0(boss, boss->dmgPart);
} }
} else { } else {
AUDIO_PLAY_SFX(0x29121007, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_REFLECT, boss->sfxSource, 4);
} }
} }
@ -939,7 +939,7 @@ void Meteo_8018978C(Boss* boss) {
SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 50); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 50);
SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 50); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 50);
AUDIO_PLAY_SFX(0x2940D09A, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_DOWN_IMPACT, boss->sfxSource, 4);
gScreenFlashTimer = 8; gScreenFlashTimer = 8;
} }
} }
@ -1043,7 +1043,7 @@ void Meteo_8018978C(Boss* boss) {
objId = OBJ_ACTOR_190; objId = OBJ_ACTOR_190;
} }
AUDIO_PLAY_SFX(0x2903201B, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_BARREL_SHOT, boss->sfxSource, 4);
src.x = 0.0f; src.x = 0.0f;
src.y = 330.0f; src.y = 330.0f;
@ -1146,7 +1146,7 @@ void Meteo_8018978C(Boss* boss) {
boss->timer_052 = 80; boss->timer_052 = 80;
} else if (boss->vel.z < -50.0f) { } else if (boss->vel.z < -50.0f) {
if (boss->swork[0] == 5) { if (boss->swork[0] == 5) {
AUDIO_PLAY_SFX(0x3102505A, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_BURNER_L, boss->sfxSource, 4);
} }
if (boss->swork[0] < 10) { if (boss->swork[0] < 10) {
@ -1193,7 +1193,7 @@ void Meteo_8018978C(Boss* boss) {
if ((boss->timer_050 == 0) && (gBosses[boss->unk_044].state == 2)) { if ((boss->timer_050 == 0) && (gBosses[boss->unk_044].state == 2)) {
boss->fwork[2] = 90.0f; boss->fwork[2] = 90.0f;
boss->timer_050 = D_i2_80195520[var_v0] + 45; boss->timer_050 = D_i2_80195520[var_v0] + 45;
AUDIO_PLAY_SFX(0x19030036, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_SHIELD_ROLL, boss->sfxSource, 4);
} }
if (boss->fwork[2] > 0.0f) { if (boss->fwork[2] > 0.0f) {
@ -1227,7 +1227,7 @@ void Meteo_8018978C(Boss* boss) {
boss->obj.rot.z += ((0.0f - boss->obj.rot.z) * 0.02f); boss->obj.rot.z += ((0.0f - boss->obj.rot.z) * 0.02f);
if (boss->timer_050 == 1) { if (boss->timer_050 == 1) {
AUDIO_PLAY_SFX(0x31016056, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_S_BEAM_CHARGE, boss->sfxSource, 4);
} }
if (boss->timer_050 == 0) { if (boss->timer_050 == 0) {
@ -1278,7 +1278,7 @@ void Meteo_8018978C(Boss* boss) {
} }
if (boss->timer_050 == 0) { if (boss->timer_050 == 0) {
boss->state = 7; boss->state = 7;
AUDIO_PLAY_SFX(0x29038058, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_S_BEAM_END, boss->sfxSource, 4);
} }
Meteo_80189624(); Meteo_80189624();
} }
@ -1343,7 +1343,7 @@ void Meteo_8018978C(Boss* boss) {
if (boss->timer_052 != 0) { if (boss->timer_052 != 0) {
if (boss->swork[0] == 5) { if (boss->swork[0] == 5) {
AUDIO_PLAY_SFX(0x3102505A, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_BURNER_L, boss->sfxSource, 4);
} }
if (boss->swork[0] < 10) { if (boss->swork[0] < 10) {
boss->swork[0] += 2; boss->swork[0] += 2;
@ -1357,7 +1357,7 @@ void Meteo_8018978C(Boss* boss) {
boss->state = 9; boss->state = 9;
boss->timer_050 = 0; boss->timer_050 = 0;
boss->fwork[15] = 8.0f; boss->fwork[15] = 8.0f;
AUDIO_PLAY_SFX(0x11015034, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_RNG_BEAM_CHARGE, boss->sfxSource, 4);
} }
} }
break; break;
@ -1404,7 +1404,7 @@ void Meteo_8018978C(Boss* boss) {
boss->state = 9; boss->state = 9;
boss->timer_050 = 70; boss->timer_050 = 70;
boss->fwork[15] = 8.0f; boss->fwork[15] = 8.0f;
AUDIO_PLAY_SFX(0x11015034, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_RNG_BEAM_CHARGE, boss->sfxSource, 4);
} else if ((boss->timer_050 % 2U) == 1) { } else if ((boss->timer_050 % 2U) == 1) {
Meteo_80188088(boss); Meteo_80188088(boss);
} }
@ -1443,7 +1443,7 @@ void Meteo_8018978C(Boss* boss) {
} }
if (boss->timer_050 == 20) { if (boss->timer_050 == 20) {
func_effect_8007A568(boss->obj.pos.x, boss->obj.pos.y, boss->obj.pos.z, 80.0f); func_effect_8007A568(boss->obj.pos.x, boss->obj.pos.y, boss->obj.pos.z, 80.0f);
AUDIO_PLAY_SFX(0x2940F026, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_STAR_EXPLOSION, boss->sfxSource, 4);
gControllerRumbleTimers[0] = 60; gControllerRumbleTimers[0] = 60;
for (i = 0; i < ARRAY_COUNT(gActors); i++) { for (i = 0; i < ARRAY_COUNT(gActors); i++) {
if (gActors[i].obj.id == OBJ_ACTOR_TEAM_BOSS) { if (gActors[i].obj.id == OBJ_ACTOR_TEAM_BOSS) {
@ -1788,12 +1788,12 @@ void Meteo_8018C77C(Actor* actor, s32 arg1) {
if (actor->unk_0B6 == 0) { if (actor->unk_0B6 == 0) {
actor->iwork[11] = 1; actor->iwork[11] = 1;
AUDIO_PLAY_SFX(0x3100000C, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_ARWING_ENGINE_FG, actor->sfxSource, 4);
return; return;
} }
AUDIO_PLAY_SFX(0x11030010, actor->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_GREATFOX_ENGINE, actor->sfxSource, 0);
AUDIO_PLAY_SFX(0x31024059, actor->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_GREATFOX_BURNER, actor->sfxSource, 0);
} }
void Meteo_8018C8F4(Actor* actor1, Actor* actor2) { void Meteo_8018C8F4(Actor* actor1, Actor* actor2) {
@ -1866,7 +1866,7 @@ void Meteo_8018CCF8(Actor* actor) {
s32 i; s32 i;
s32 j; s32 j;
func_effect_8007A6F0(&actor->obj.pos, 0x2903A008); func_effect_8007A6F0(&actor->obj.pos, NA_SE_EN_EXPLOSION_S);
for (i = 0; i < 25; ++i) { for (i = 0; i < 25; ++i) {
for (j = 0; j < ARRAY_COUNT(gEffects); j++) { for (j = 0; j < ARRAY_COUNT(gEffects); j++) {
@ -2197,12 +2197,12 @@ void Meteo_8018DF08(Actor* actor, s32 idx) {
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
if (idx == 3) { if (idx == 3) {
AUDIO_PLAY_SFX(0x11030010, actor->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_GREATFOX_ENGINE, actor->sfxSource, 0);
AUDIO_PLAY_SFX(0x31024059, actor->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_GREATFOX_BURNER, actor->sfxSource, 0);
actor->unk_0B6 = 1; actor->unk_0B6 = 1;
} else { } else {
actor->iwork[11] = 1; actor->iwork[11] = 1;
AUDIO_PLAY_SFX(0x3100000C, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_ARWING_ENGINE_FG, actor->sfxSource, 4);
} }
} }
@ -2431,7 +2431,7 @@ void Meteo_LevelComplete(Player* player) {
break; break;
case 1390: case 1390:
AUDIO_PLAY_SFX(0x09000002, player->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_ARWING_BOOST, player->sfxSource, 0);
player->unk_194 = 5.0f; player->unk_194 = 5.0f;
player->unk_190 = 5.0f; player->unk_190 = 5.0f;
break; break;
@ -2494,7 +2494,7 @@ void Meteo_8018ED9C(Actor* actor) {
case 1: case 1:
actor->state = 2; actor->state = 2;
AUDIO_PLAY_SFX(0x09000002, actor->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_ARWING_BOOST, actor->sfxSource, 0);
actor->timer_0BC = 150; actor->timer_0BC = 150;
actor->fwork[29] = 5.0f; actor->fwork[29] = 5.0f;

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

@ -99,7 +99,7 @@ void SectorX_8018F330(Actor* actor) {
actor->vel.y = -10.0f; actor->vel.y = -10.0f;
actor->vel.z = 30.0f; actor->vel.z = 30.0f;
Radio_PlayMessage(gMsg_ID_4111, RCID_SLIPPY); Radio_PlayMessage(gMsg_ID_4111, RCID_SLIPPY);
func_effect_8007A6F0(&actor->obj.pos, 0x2903A008); func_effect_8007A6F0(&actor->obj.pos, NA_SE_EN_EXPLOSION_S);
gBosses[0].swork[6] = 0; gBosses[0].swork[6] = 0;
gTeamShields[TEAM_ID_SLIPPY] = -2; gTeamShields[TEAM_ID_SLIPPY] = -2;
gPlayer[0].state_1C8 = PLAYERSTATE_1C8_STANDBY; gPlayer[0].state_1C8 = PLAYERSTATE_1C8_STANDBY;
@ -229,7 +229,7 @@ void SectorX_8018FBBC(Vec3f* pos) {
(actor->scale < 0.0f) && (actor->scale < 0.0f) &&
Object_CheckHitboxCollision(pos, actor->info.hitbox, &actor->obj, actor->vwork[29].x, actor->vwork[29].y, Object_CheckHitboxCollision(pos, actor->info.hitbox, &actor->obj, actor->vwork[29].x, actor->vwork[29].y,
actor->vwork[29].z + actor->unk_0F4.z)) { actor->vwork[29].z + actor->unk_0F4.z)) {
func_play_800A6028(actor->sfxSource, 0x09000004); func_play_800A6028(actor->sfxSource, NA_SE_SLIPPY_HIT);
actor->state = 1000; actor->state = 1000;
xRot = Math_Atan2F(actor->obj.pos.x - pos->x, actor->obj.pos.z - pos->z); xRot = Math_Atan2F(actor->obj.pos.x - pos->x, actor->obj.pos.z - pos->z);
yRot = -Math_Atan2F(actor->obj.pos.y - pos->y, yRot = -Math_Atan2F(actor->obj.pos.y - pos->y,
@ -275,7 +275,7 @@ void SectorX_8018FE38(Boss* boss) {
} }
if (boss->dmgType == DMG_BEAM) { if (boss->dmgType == DMG_BEAM) {
boss->dmgType = DMG_NONE; boss->dmgType = DMG_NONE;
func_effect_8007A6F0(&boss->obj.pos, 0x29121007); func_effect_8007A6F0(&boss->obj.pos, NA_SE_EN_REFLECT);
} }
} }
@ -397,7 +397,7 @@ void SectorX_80190078(Boss* boss) {
boss->dmgType = DMG_NONE; boss->dmgType = DMG_NONE;
if (boss->swork[0] == 1) { if (boss->swork[0] == 1) {
if ((boss->dmgPart == 0) && ((boss->fwork[4] < 45.0f) || (boss->fwork[4] > 315.0f))) { if ((boss->dmgPart == 0) && ((boss->fwork[4] < 45.0f) || (boss->fwork[4] > 315.0f))) {
AUDIO_PLAY_SFX(0x2903300E, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_DAMAGE_S, boss->sfxSource, 4);
boss->swork[3] -= boss->damage; boss->swork[3] -= boss->damage;
boss->timer_054 = 20; boss->timer_054 = 20;
func_effect_8007C120(boss->obj.pos.x, boss->obj.pos.y + 334.0f, -237.0f + boss->obj.pos.z, boss->vel.x, func_effect_8007C120(boss->obj.pos.x, boss->obj.pos.y + 334.0f, -237.0f + boss->obj.pos.z, boss->vel.x,
@ -413,7 +413,7 @@ void SectorX_80190078(Boss* boss) {
func_play_800A69F8(4, boss->obj.pos.x, boss->obj.pos.y + 334.0f, -237.0f + boss->obj.pos.z); func_play_800A69F8(4, boss->obj.pos.x, boss->obj.pos.y + 334.0f, -237.0f + boss->obj.pos.z);
} }
func_effect_8007A6F0(&boss->obj.pos, 0x2940C00A); func_effect_8007A6F0(&boss->obj.pos, NA_SE_EN_EXPLOSION_L);
boss->state = 7; boss->state = 7;
boss->timer_050 = 80; boss->timer_050 = 80;
boss->swork[0] = 0; boss->swork[0] = 0;
@ -424,8 +424,8 @@ void SectorX_80190078(Boss* boss) {
boss->swork[4] = 1; boss->swork[4] = 1;
boss->health = 1; boss->health = 1;
boss->swork[7] = 1; boss->swork[7] = 1;
Audio_KillSfxBySourceAndId(D_i2_80195D88, 0x31032061); Audio_KillSfxBySourceAndId(D_i2_80195D88, NA_SE_EN_SZMIS_ENGINE);
Audio_KillSfxBySourceAndId(D_i2_80195D98, 0x31032061); Audio_KillSfxBySourceAndId(D_i2_80195D98, NA_SE_EN_SZMIS_ENGINE);
boss->info.hitbox = SEGMENTED_TO_VIRTUAL(D_SX_603265C); boss->info.hitbox = SEGMENTED_TO_VIRTUAL(D_SX_603265C);
SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 1); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 1);
SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 1); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 1);
@ -433,17 +433,17 @@ void SectorX_80190078(Boss* boss) {
gScreenFlashTimer = 5; gScreenFlashTimer = 5;
} }
} else { } else {
func_effect_8007A6F0(&boss->obj.pos, 0x29121007); func_effect_8007A6F0(&boss->obj.pos, NA_SE_EN_REFLECT);
} }
} else { } else {
func_effect_8007A6F0(&boss->obj.pos, 0x29121007); func_effect_8007A6F0(&boss->obj.pos, NA_SE_EN_REFLECT);
} }
if (boss->swork[0] == 2) { if (boss->swork[0] == 2) {
if (boss->dmgPart == 0) { if (boss->dmgPart == 0) {
boss->health -= boss->damage; boss->health -= boss->damage;
AUDIO_PLAY_SFX(0x2903300E, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_DAMAGE_S, boss->sfxSource, 4);
if (boss->health <= 0) { if (boss->health <= 0) {
gTeamLowHealthMsgTimer = -1; gTeamLowHealthMsgTimer = -1;
@ -467,7 +467,7 @@ void SectorX_80190078(Boss* boss) {
boss->swork[4] = 2; boss->swork[4] = 2;
AUDIO_PLAY_SFX(0x2940D09A, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_DOWN_IMPACT, boss->sfxSource, 4);
gScreenFlashTimer = 8; gScreenFlashTimer = 8;
SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 1); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 1);
@ -481,7 +481,7 @@ void SectorX_80190078(Boss* boss) {
func_effect_8007C120(boss->obj.pos.x, boss->obj.pos.y, boss->obj.pos.z, boss->vel.x, boss->vel.y, func_effect_8007C120(boss->obj.pos.x, boss->obj.pos.y, boss->obj.pos.z, boss->vel.x, boss->vel.y,
boss->vel.z, 0.2f, 10); boss->vel.z, 0.2f, 10);
} else { } else {
func_effect_8007A6F0(&boss->obj.pos, 0x29121007); func_effect_8007A6F0(&boss->obj.pos, NA_SE_EN_REFLECT);
} }
} }
} }
@ -489,8 +489,8 @@ void SectorX_80190078(Boss* boss) {
if (((boss->state != 8) && (boss->state != 20)) && (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_ACTIVE)) { if (((boss->state != 8) && (boss->state != 20)) && (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_ACTIVE)) {
boss->state = 8; boss->state = 8;
boss->fwork[0] = 0.0f; boss->fwork[0] = 0.0f;
Audio_KillSfxBySourceAndId(D_i2_80195D88, 0x31032061); Audio_KillSfxBySourceAndId(D_i2_80195D88, NA_SE_EN_SZMIS_ENGINE);
Audio_KillSfxBySourceAndId(D_i2_80195D98, 0x31032061); Audio_KillSfxBySourceAndId(D_i2_80195D98, NA_SE_EN_SZMIS_ENGINE);
} }
boss->vel.z = -20.0f; boss->vel.z = -20.0f;
@ -521,7 +521,7 @@ void SectorX_80190078(Boss* boss) {
case 90: case 90:
if ((boss->timer_050 == 110) || (boss->timer_050 == 66)) { if ((boss->timer_050 == 110) || (boss->timer_050 == 66)) {
AUDIO_PLAY_SFX(0x29433022, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_COMBINE, boss->sfxSource, 4);
} }
if (fabsf(Math_SmoothStepToF(&boss->fwork[16], 0.0f, 0.1f, 10.0f, 0)) < 8.0f) { if (fabsf(Math_SmoothStepToF(&boss->fwork[16], 0.0f, 0.1f, 10.0f, 0)) < 8.0f) {
@ -543,7 +543,7 @@ void SectorX_80190078(Boss* boss) {
if (boss->timer_050 == 0) { if (boss->timer_050 == 0) {
boss->state = 100; boss->state = 100;
boss->fwork[0] = 0.0f; boss->fwork[0] = 0.0f;
AUDIO_PLAY_SFX(0x29400023, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_MOTOR_ROLL, boss->sfxSource, 4);
} }
boss->fwork[43] = boss->fwork[44] = 5.0f; boss->fwork[43] = boss->fwork[44] = 5.0f;
boss->fwork[42] = 30.0f; boss->fwork[42] = 30.0f;
@ -562,7 +562,7 @@ void SectorX_80190078(Boss* boss) {
boss->unk_04C = 0; boss->unk_04C = 0;
boss->state = 1; boss->state = 1;
boss->fwork[0] = 0.0f; boss->fwork[0] = 0.0f;
AUDIO_PLAY_SFX(0x29402024, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_UNIT_COMBINE, boss->sfxSource, 4);
} }
boss->fwork[43] = boss->fwork[44] = 5.0f; boss->fwork[43] = boss->fwork[44] = 5.0f;
@ -609,7 +609,7 @@ void SectorX_80190078(Boss* boss) {
} }
if (boss->unk_04C == 60) { if (boss->unk_04C == 60) {
AUDIO_PLAY_SFX(0x2902401C, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_THROW, boss->sfxSource, 4);
boss->fwork[42] = 0.0f; boss->fwork[42] = 0.0f;
} }
@ -645,7 +645,7 @@ void SectorX_80190078(Boss* boss) {
} }
if (boss->unk_04C == 60) { if (boss->unk_04C == 60) {
AUDIO_PLAY_SFX(0x2902401C, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_THROW, boss->sfxSource, 4);
boss->fwork[42] = 0.0f; boss->fwork[42] = 0.0f;
} }
@ -703,14 +703,14 @@ void SectorX_80190078(Boss* boss) {
sp74.z = boss->fwork[10] + boss->obj.pos.z; sp74.z = boss->fwork[10] + boss->obj.pos.z;
func_edisplay_8005F0E8(D_i2_80195D88, &sp74); func_edisplay_8005F0E8(D_i2_80195D88, &sp74);
AUDIO_PLAY_SFX(0x31032061, D_i2_80195D88, 4); AUDIO_PLAY_SFX(NA_SE_EN_SZMIS_ENGINE, D_i2_80195D88, 4);
sp74.x = boss->fwork[11] + boss->obj.pos.x; sp74.x = boss->fwork[11] + boss->obj.pos.x;
sp74.y = boss->fwork[12] + boss->obj.pos.y; sp74.y = boss->fwork[12] + boss->obj.pos.y;
sp74.z = boss->fwork[13] + boss->obj.pos.z; sp74.z = boss->fwork[13] + boss->obj.pos.z;
func_edisplay_8005F0E8(D_i2_80195D98, &sp74); func_edisplay_8005F0E8(D_i2_80195D98, &sp74);
AUDIO_PLAY_SFX(0x31032061, D_i2_80195D98, 4); AUDIO_PLAY_SFX(NA_SE_EN_SZMIS_ENGINE, D_i2_80195D98, 4);
Math_SmoothStepToF(&boss->fwork[27], 30.0f, 0.05f, 1.0f, 0); Math_SmoothStepToF(&boss->fwork[27], 30.0f, 0.05f, 1.0f, 0);
Math_SmoothStepToF(&boss->fwork[28], -30.0f, 0.05f, 1.0f, 0); Math_SmoothStepToF(&boss->fwork[28], -30.0f, 0.05f, 1.0f, 0);
@ -785,15 +785,15 @@ void SectorX_80190078(Boss* boss) {
case 6: // Arms come back to robot case 6: // Arms come back to robot
if ((boss->timer_050 == 20) || (boss->timer_050 == 30)) { if ((boss->timer_050 == 20) || (boss->timer_050 == 30)) {
AUDIO_PLAY_SFX(0x29433022, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_COMBINE, boss->sfxSource, 4);
} }
if (boss->timer_050 == 0) { if (boss->timer_050 == 0) {
boss->unk_04C = 0; boss->unk_04C = 0;
boss->state = 1; boss->state = 1;
boss->swork[1] = 1; boss->swork[1] = 1;
Audio_KillSfxBySourceAndId(D_i2_80195D88, 0x31032061); Audio_KillSfxBySourceAndId(D_i2_80195D88, NA_SE_EN_SZMIS_ENGINE);
Audio_KillSfxBySourceAndId(D_i2_80195D98, 0x31032061); Audio_KillSfxBySourceAndId(D_i2_80195D98, NA_SE_EN_SZMIS_ENGINE);
boss->fwork[0] = 0.0f; boss->fwork[0] = 0.0f;
boss->fwork[44] = 0.0f; boss->fwork[44] = 0.0f;
boss->fwork[43] = 0.0f; boss->fwork[43] = 0.0f;
@ -893,7 +893,7 @@ void SectorX_80190078(Boss* boss) {
} }
} }
if (boss->unk_04C == 60) { if (boss->unk_04C == 60) {
AUDIO_PLAY_SFX(0x2902401C, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_THROW, boss->sfxSource, 4);
} }
} else if (boss->timer_050 == 1) { } else if (boss->timer_050 == 1) {
Radio_PlayMessage(gMsg_ID_20267, RCID_PEPPY); Radio_PlayMessage(gMsg_ID_20267, RCID_PEPPY);
@ -928,7 +928,7 @@ void SectorX_80190078(Boss* boss) {
if (boss->unk_04C == 70) { if (boss->unk_04C == 70) {
SectorX_8018FA04(boss->fwork[11] + boss->obj.pos.x, boss->fwork[12] + boss->obj.pos.y, SectorX_8018FA04(boss->fwork[11] + boss->obj.pos.x, boss->fwork[12] + boss->obj.pos.y,
boss->fwork[13] + boss->obj.pos.z); boss->fwork[13] + boss->obj.pos.z);
AUDIO_PLAY_SFX(0x2902401C, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_THROW, boss->sfxSource, 4);
} }
break; break;
@ -944,7 +944,7 @@ void SectorX_80190078(Boss* boss) {
boss->unk_04C++; boss->unk_04C++;
if ((boss->unk_04C % 16) == 0) { if ((boss->unk_04C % 16) == 0) {
AUDIO_PLAY_SFX(0x2902401C, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_THROW, boss->sfxSource, 4);
} }
if (boss->unk_04C >= Animation_GetFrameCount(&D_SX_60158C4)) { if (boss->unk_04C >= Animation_GetFrameCount(&D_SX_60158C4)) {
@ -983,13 +983,13 @@ void SectorX_80190078(Boss* boss) {
boss->fwork[3] = -1000.0f; boss->fwork[3] = -1000.0f;
boss->fwork[1] = -2500.0f; boss->fwork[1] = -2500.0f;
if ((gGameFrameCount % 16) == 0) { if ((gGameFrameCount % 16) == 0) {
AUDIO_PLAY_SFX(0x2902401C, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_THROW, boss->sfxSource, 4);
} }
} else if (boss->timer_050 > 100) { } else if (boss->timer_050 > 100) {
boss->fwork[3] = 0; boss->fwork[3] = 0;
boss->fwork[1] = -500.0f; boss->fwork[1] = -500.0f;
if (((gGameFrameCount % 16) == 0)) { if (((gGameFrameCount % 16) == 0)) {
AUDIO_PLAY_SFX(0x2902401C, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_THROW, boss->sfxSource, 4);
} }
} else { } else {
boss->fwork[3] = 0; boss->fwork[3] = 0;
@ -1422,7 +1422,7 @@ void SectorX_80193800(Actor* actor, s32 arg1) {
actor->obj.rot.x = 15.0f; actor->obj.rot.x = 15.0f;
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
AUDIO_PLAY_SFX(0x31000011, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_ENGINE_01, actor->sfxSource, 4);
} }
void SectorX_801938D8(Actor* actor, s32 arg1) { void SectorX_801938D8(Actor* actor, s32 arg1) {
@ -1442,8 +1442,8 @@ void SectorX_801938D8(Actor* actor, s32 arg1) {
actor->obj.rot.z = -20.0f; actor->obj.rot.z = -20.0f;
} }
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
AUDIO_PLAY_SFX(0x3100000C, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_ARWING_ENGINE_FG, actor->sfxSource, 4);
AUDIO_PLAY_SFX(0x09000002, actor->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_ARWING_BOOST, actor->sfxSource, 0);
} }
void SectorX_LevelStart(Player* player) { void SectorX_LevelStart(Player* player) {
@ -1505,7 +1505,7 @@ void SectorX_LevelStart(Player* player) {
for (i = 0; i < 20; i++) { for (i = 0; i < 20; i++) {
func_effect_80079618(gActors[5].obj.pos.x, gActors[5].obj.pos.y, gActors[5].obj.pos.z, 0.5f); func_effect_80079618(gActors[5].obj.pos.x, gActors[5].obj.pos.y, gActors[5].obj.pos.z, 0.5f);
} }
func_effect_8007A6F0(&gActors[5].obj.pos, 0x2903B009); func_effect_8007A6F0(&gActors[5].obj.pos, NA_SE_EN_EXPLOSION_M);
player->csState += 1; player->csState += 1;
D_ctx_80177A48[0] = 0.1f; D_ctx_80177A48[0] = 0.1f;
} }
@ -1522,7 +1522,7 @@ void SectorX_LevelStart(Player* player) {
player->baseSpeed = 30.0f; player->baseSpeed = 30.0f;
player->rot.z = -80.0f; player->rot.z = -80.0f;
player->rot.x = -20.0f; player->rot.x = -20.0f;
AUDIO_PLAY_SFX(0x09000002, player->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_ARWING_BOOST, player->sfxSource, 0);
for (i = 6; i < 10; i++) { for (i = 6; i < 10; i++) {
Object_Kill(&gActors[i].obj, gActors[i].sfxSource); Object_Kill(&gActors[i].obj, gActors[i].sfxSource);
} }
@ -1669,7 +1669,7 @@ void SectorX_801944D4(Actor* actor, s32 arg1) {
actor->obj.rot.z = D_i2_80195770[arg1]; actor->obj.rot.z = D_i2_80195770[arg1];
actor->iwork[11] = 1; actor->iwork[11] = 1;
actor->iwork[14] = D_i2_8019577C[arg1]; actor->iwork[14] = D_i2_8019577C[arg1];
AUDIO_PLAY_SFX(0x3100000C, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_ARWING_ENGINE_FG, actor->sfxSource, 4);
} }
} }
@ -1801,7 +1801,7 @@ void SectorX_LevelComplete(Player* player) {
case 920: case 920:
gActors[1].iwork[14] = gActors[2].iwork[14] = gActors[3].iwork[14] = 0; gActors[1].iwork[14] = gActors[2].iwork[14] = gActors[3].iwork[14] = 0;
SectorX_801944D4(&gActors[0], 3); SectorX_801944D4(&gActors[0], 3);
AUDIO_PLAY_SFX(0x11030010, gActors[0].sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_GREATFOX_ENGINE, gActors[0].sfxSource, 0);
break; break;
case 1050: case 1050:
@ -1819,7 +1819,7 @@ void SectorX_LevelComplete(Player* player) {
case 1160: case 1160:
SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 50); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 50);
SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 50); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 50);
AUDIO_PLAY_SFX(0x09000002, player->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_ARWING_BOOST, player->sfxSource, 0);
player->csState = 2; player->csState = 2;
player->csTimer = 40; player->csTimer = 40;
player->unk_194 = 5.0f; player->unk_194 = 5.0f;

96
src/overlays/ovl_i3/fox_a6.c
View File

@ -439,8 +439,8 @@ f32 D_i3_801BF494[12] = {
void Area6_80187530(Actor* actor, f32 xPos, f32 yPos, f32 zPos, f32 fwork6, f32 xRot, f32 yRot, s32 timer0BC, void Area6_80187530(Actor* actor, f32 xPos, f32 yPos, f32 zPos, f32 fwork6, f32 xRot, f32 yRot, s32 timer0BC,
s32 unk0B4) { s32 unk0B4) {
(void) "おん\n"; PRINTF("おん\n"); // On
(void) "おふ\n"; PRINTF("おふ\n"); // Off
Actor_Initialize(actor); Actor_Initialize(actor);
actor->obj.status = OBJ_INIT; actor->obj.status = OBJ_INIT;
actor->obj.id = OBJ_ACTOR_191; actor->obj.id = OBJ_ACTOR_191;
@ -454,7 +454,7 @@ void Area6_80187530(Actor* actor, f32 xPos, f32 yPos, f32 zPos, f32 fwork6, f32
actor->unk_0B4 = unk0B4; actor->unk_0B4 = unk0B4;
actor->fwork[5] = fwork6; actor->fwork[5] = fwork6;
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
func_effect_8007A6F0(&actor->obj.pos, 0x2903201B); func_effect_8007A6F0(&actor->obj.pos, NA_SE_EN_BARREL_SHOT);
} }
void Area6_801875E4(f32 xPos, f32 yPos, f32 zPos, f32 fwork6, f32 xRot, f32 yRot, s32 timer0BC, s32 unk0B4) { void Area6_801875E4(f32 xPos, f32 yPos, f32 zPos, f32 fwork6, f32 xRot, f32 yRot, s32 timer0BC, s32 unk0B4) {
@ -526,7 +526,7 @@ void Area6_BossA6_Init(BossA6* this) {
A6_HIT_1(this, 0)->x.size = A6_HIT_1(this, 1)->x.size = A6_HIT_1(this, 2)->x.size = 153.0f; A6_HIT_1(this, 0)->x.size = A6_HIT_1(this, 1)->x.size = A6_HIT_1(this, 2)->x.size = 153.0f;
SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 40); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 40);
SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 40); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 40);
AUDIO_PLAY_SFX(0x11002050, this->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_SHIELD_ROLL_LEVEL, this->sfxSource, 4);
} }
void Area6_80187944(Boss* bossA6) { void Area6_80187944(Boss* bossA6) {
@ -571,9 +571,9 @@ void Area6_80187944(Boss* bossA6) {
bossA6->health -= bossA6->damage; bossA6->health -= bossA6->damage;
if (bossA6->health < 390) { if (bossA6->health < 390) {
AUDIO_PLAY_SFX(0x2943500F, bossA6->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_KNOCK_DOWN, bossA6->sfxSource, 4);
} else { } else {
AUDIO_PLAY_SFX(0x29034003, bossA6->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OB_DAMAGE_M, bossA6->sfxSource, 4);
} }
if (bossA6->health <= 0) { if (bossA6->health <= 0) {
@ -585,7 +585,7 @@ void Area6_80187944(Boss* bossA6) {
D_bg_8015F984 = (gPathProgress * 0.00004f) + 0.5f; D_bg_8015F984 = (gPathProgress * 0.00004f) + 0.5f;
AUDIO_PLAY_SFX(0x2940D09A, bossA6->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_DOWN_IMPACT, bossA6->sfxSource, 4);
gShowBossHealth = 0; gShowBossHealth = 0;
@ -612,8 +612,8 @@ void Area6_80187944(Boss* bossA6) {
bossA6->swork[A6_SWK_33 + 0] = bossA6->swork[A6_SWK_33 + 1] = bossA6->swork[A6_SWK_33 + 2] = 0; bossA6->swork[A6_SWK_33 + 0] = bossA6->swork[A6_SWK_33 + 1] = bossA6->swork[A6_SWK_33 + 2] = 0;
gScreenFlashTimer = 4; gScreenFlashTimer = 4;
bossA6->state = 11; bossA6->state = 11;
AUDIO_PLAY_SFX(0x2940C00A, bossA6->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_EXPLOSION_L, bossA6->sfxSource, 4);
AUDIO_PLAY_SFX(0x3143402E, bossA6->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EXPLOSION_DEMO5, bossA6->sfxSource, 4);
} }
} }
@ -627,7 +627,7 @@ void Area6_80187944(Boss* bossA6) {
Area6_8018A2C4(bossA6); Area6_8018A2C4(bossA6);
} }
if (bossA6->dmgPart >= 7) { if (bossA6->dmgPart >= 7) {
AUDIO_PLAY_SFX(0x29121007, bossA6->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_REFLECT, bossA6->sfxSource, 4);
} }
} }
@ -821,7 +821,7 @@ void Area6_80187944(Boss* bossA6) {
if (D_i3_801C22F0.unk_24 < 1.0f) { if (D_i3_801C22F0.unk_24 < 1.0f) {
D_i3_801C22F0.unk_24 = 0.0f; D_i3_801C22F0.unk_24 = 0.0f;
Audio_KillSfxBySource(bossA6->sfxSource); Audio_KillSfxBySource(bossA6->sfxSource);
AUDIO_PLAY_SFX(0x19004051, bossA6->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_SHIELD_ROLL_STOP, bossA6->sfxSource, 4);
bossA6->timer_050 = 20; bossA6->timer_050 = 20;
bossA6->obj.pos.z = gPlayer[0].cam.eye.z - gPathProgress + bossA6->fwork[A6_FWK_3]; bossA6->obj.pos.z = gPlayer[0].cam.eye.z - gPathProgress + bossA6->fwork[A6_FWK_3];
bossA6->fwork[A6_FWK_6] = bossA6->obj.pos.x = gPlayer[0].cam.eye.x; bossA6->fwork[A6_FWK_6] = bossA6->obj.pos.x = gPlayer[0].cam.eye.x;
@ -831,7 +831,7 @@ void Area6_80187944(Boss* bossA6) {
bossA6->vel.y = 0.0f; bossA6->vel.y = 0.0f;
bossA6->vel.z = -40.0f; bossA6->vel.z = -40.0f;
AUDIO_PLAY_SFX(0x39408092, bossA6->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_WARP_OUT, bossA6->sfxSource, 4);
} }
} }
break; break;
@ -843,7 +843,7 @@ void Area6_80187944(Boss* bossA6) {
if (bossA6->obj.rot.z < 1.0f) { if (bossA6->obj.rot.z < 1.0f) {
if (D_i3_801C2250[A6_BSS_27] == 0) { if (D_i3_801C2250[A6_BSS_27] == 0) {
AUDIO_PLAY_SFX(0x39408091, bossA6->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_WARP_IN, bossA6->sfxSource, 4);
D_i3_801C2250[A6_BSS_27] = 1; D_i3_801C2250[A6_BSS_27] = 1;
} }
bossA6->obj.rot.z = 0.0f; bossA6->obj.rot.z = 0.0f;
@ -879,7 +879,7 @@ void Area6_80187944(Boss* bossA6) {
bossA6->timer_050 = 50; bossA6->timer_050 = 50;
bossA6->state = 2; bossA6->state = 2;
D_i3_801C2250[A6_BSS_8] = 0; D_i3_801C2250[A6_BSS_8] = 0;
AUDIO_PLAY_SFX(0x39408092, bossA6->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_WARP_OUT, bossA6->sfxSource, 4);
} }
} }
break; break;
@ -943,7 +943,7 @@ void Area6_80187944(Boss* bossA6) {
if ((D_i3_801C2250[A6_BSS_6] == 0) || (D_i3_801C2250[A6_BSS_0] == 0)) { if ((D_i3_801C2250[A6_BSS_6] == 0) || (D_i3_801C2250[A6_BSS_0] == 0)) {
bossA6->fwork[A6_FWK_1] = 90.0f; bossA6->fwork[A6_FWK_1] = 90.0f;
bossA6->fwork[A6_FWK_2] = 2.0f; bossA6->fwork[A6_FWK_2] = 2.0f;
AUDIO_PLAY_SFX(0x31404066, bossA6->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_COVER_OPEN, bossA6->sfxSource, 4);
bossA6->info.hitbox = SEGMENTED_TO_VIRTUAL(D_A6_6028578); bossA6->info.hitbox = SEGMENTED_TO_VIRTUAL(D_A6_6028578);
D_i3_801C2250[A6_BSS_7] = 0; D_i3_801C2250[A6_BSS_7] = 0;
} }
@ -955,7 +955,7 @@ void Area6_80187944(Boss* bossA6) {
if (bossA6->timer_050 == 1) { if (bossA6->timer_050 == 1) {
Audio_KillSfxBySource(bossA6->sfxSource); Audio_KillSfxBySource(bossA6->sfxSource);
if (D_i3_801C2250[A6_BSS_7] == 0) { if (D_i3_801C2250[A6_BSS_7] == 0) {
AUDIO_PLAY_SFX(0x31008069, bossA6->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_ENERGY_BALL, bossA6->sfxSource, 4);
D_i3_801C2250[A6_BSS_7] = 1; D_i3_801C2250[A6_BSS_7] = 1;
} }
} }
@ -988,7 +988,7 @@ void Area6_80187944(Boss* bossA6) {
bossA6->info.hitbox = SEGMENTED_TO_VIRTUAL(D_A6_6028454); bossA6->info.hitbox = SEGMENTED_TO_VIRTUAL(D_A6_6028454);
D_i3_801C2250[A6_BSS_6] = 1; D_i3_801C2250[A6_BSS_6] = 1;
Audio_KillSfxBySource(bossA6->sfxSource); Audio_KillSfxBySource(bossA6->sfxSource);
AUDIO_PLAY_SFX(0x31404067, bossA6->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_COVER_CLOSE, bossA6->sfxSource, 4);
bossA6->swork[A6_SWK_30 + 0] = bossA6->swork[A6_SWK_30 + 1] = bossA6->swork[A6_SWK_30 + 2] = 0; bossA6->swork[A6_SWK_30 + 0] = bossA6->swork[A6_SWK_30 + 1] = bossA6->swork[A6_SWK_30 + 2] = 0;
} else if (bossA6->swork[A6_SWK_30 + 0] == 0) { } else if (bossA6->swork[A6_SWK_30 + 0] == 0) {
Area6_8018A1B0(bossA6, 0); Area6_8018A1B0(bossA6, 0);
@ -1008,7 +1008,7 @@ void Area6_80187944(Boss* bossA6) {
} }
bossA6->fwork[A6_FWK_3] = RAND_FLOAT_CENTERED(1000.0f) + -3700.0f; bossA6->fwork[A6_FWK_3] = RAND_FLOAT_CENTERED(1000.0f) + -3700.0f;
if (D_i3_801C2250[A6_BSS_28] == 0) { if (D_i3_801C2250[A6_BSS_28] == 0) {
AUDIO_PLAY_SFX(0x39404068, bossA6->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_COVER_MOVE_STOP, bossA6->sfxSource, 4);
} }
} }
@ -1041,7 +1041,7 @@ void Area6_80187944(Boss* bossA6) {
bossA6->fwork[A6_FWK_8] = bossA6->fwork[A6_FWK_9] = 0; bossA6->fwork[A6_FWK_8] = bossA6->fwork[A6_FWK_9] = 0;
bossA6->fwork[A6_FWK_2] = 2.0f; bossA6->fwork[A6_FWK_2] = 2.0f;
AUDIO_PLAY_SFX(0x31404066, bossA6->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_COVER_OPEN, bossA6->sfxSource, 4);
bossA6->info.hitbox = SEGMENTED_TO_VIRTUAL(D_A6_6028578); bossA6->info.hitbox = SEGMENTED_TO_VIRTUAL(D_A6_6028578);
@ -1068,7 +1068,7 @@ void Area6_80187944(Boss* bossA6) {
case 5: case 5:
if (bossA6->timer_050 == 1) { if (bossA6->timer_050 == 1) {
Area6_80187704(); Area6_80187704();
AUDIO_PLAY_SFX(0x39033093, bossA6->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_CLBOSS_CHARGE, bossA6->sfxSource, 4);
D_i3_801C2250[A6_BSS_33] = 120; D_i3_801C2250[A6_BSS_33] = 120;
} }
@ -1144,14 +1144,14 @@ void Area6_80187944(Boss* bossA6) {
bossA6->timer_052 = 300; bossA6->timer_052 = 300;
bossA6->timer_054 = 0; bossA6->timer_054 = 0;
bossA6->state = 9; bossA6->state = 9;
AUDIO_PLAY_SFX(0x11002050, bossA6->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_SHIELD_ROLL_LEVEL, bossA6->sfxSource, 4);
} }
break; break;
case 9: case 9:
if (bossA6->timer_052 == 0) { if (bossA6->timer_052 == 0) {
Audio_KillSfxBySource(bossA6->sfxSource); Audio_KillSfxBySource(bossA6->sfxSource);
AUDIO_PLAY_SFX(0x19004051, bossA6->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_SHIELD_ROLL_STOP, bossA6->sfxSource, 4);
bossA6->timer_054 = 0; bossA6->timer_054 = 0;
bossA6->state = 10; bossA6->state = 10;
} else { } else {
@ -1347,19 +1347,19 @@ void Area6_8018A2C4(Boss* bossA6) {
sp58.x = D_i3_801BF334[0]; sp58.x = D_i3_801BF334[0];
sp58.y = D_i3_801BF3C4[0]; sp58.y = D_i3_801BF3C4[0];
sp58.z = bossA6->obj.pos.z; sp58.z = bossA6->obj.pos.z;
func_effect_8007A6F0(&sp58, 0x29034003); func_effect_8007A6F0(&sp58, NA_SE_OB_DAMAGE_M);
} }
if (i == 1) { if (i == 1) {
sp58.x = D_i3_801BF364[0]; sp58.x = D_i3_801BF364[0];
sp58.y = D_i3_801BF3F4[0]; sp58.y = D_i3_801BF3F4[0];
sp58.z = bossA6->obj.pos.z; sp58.z = bossA6->obj.pos.z;
func_effect_8007A6F0(&sp58, 0x29034003); func_effect_8007A6F0(&sp58, NA_SE_OB_DAMAGE_M);
} }
if (i == 2) { if (i == 2) {
sp58.x = D_i3_801BF394[0]; sp58.x = D_i3_801BF394[0];
sp58.y = D_i3_801BF424[0]; sp58.y = D_i3_801BF424[0];
sp58.z = bossA6->obj.pos.z; sp58.z = bossA6->obj.pos.z;
func_effect_8007A6F0(&sp58, 0x29034003); func_effect_8007A6F0(&sp58, NA_SE_OB_DAMAGE_M);
} }
if (bossA6->swork[A6_SWK_33 + i] < 0) { if (bossA6->swork[A6_SWK_33 + i] < 0) {
bossA6->swork[A6_SWK_33 + i] = 0; bossA6->swork[A6_SWK_33 + i] = 0;
@ -1604,19 +1604,19 @@ void Area6_8018A464(Boss* bossA6, s32 arg1) {
spE0.x = D_i3_801BF334[0]; spE0.x = D_i3_801BF334[0];
spE0.y = D_i3_801BF3C4[0]; spE0.y = D_i3_801BF3C4[0];
spE0.z = bossA6->obj.pos.z; spE0.z = bossA6->obj.pos.z;
func_effect_8007A6F0(&spE0, 0x29034065); func_effect_8007A6F0(&spE0, NA_SE_EN_ARM_SWING);
} }
if (arg1 == 1) { if (arg1 == 1) {
spE0.x = D_i3_801BF364[0]; spE0.x = D_i3_801BF364[0];
spE0.y = D_i3_801BF3F4[0]; spE0.y = D_i3_801BF3F4[0];
spE0.z = bossA6->obj.pos.z; spE0.z = bossA6->obj.pos.z;
func_effect_8007A6F0(&spE0, 0x29034065); func_effect_8007A6F0(&spE0, NA_SE_EN_ARM_SWING);
} }
if (arg1 == 2) { if (arg1 == 2) {
spE0.x = D_i3_801BF394[0]; spE0.x = D_i3_801BF394[0];
spE0.y = D_i3_801BF424[0]; spE0.y = D_i3_801BF424[0];
spE0.z = bossA6->obj.pos.z; spE0.z = bossA6->obj.pos.z;
func_effect_8007A6F0(&spE0, 0x29034065); func_effect_8007A6F0(&spE0, NA_SE_EN_ARM_SWING);
} }
bossA6->swork[A6_SWK_18 + arg1] = 2; bossA6->swork[A6_SWK_18 + arg1] = 2;
} }
@ -1727,7 +1727,7 @@ void Area6_8018B9BC(Boss* bossA6) {
D_i3_801C2250[A6_BSS_25] = 20; D_i3_801C2250[A6_BSS_25] = 20;
} }
} }
AUDIO_PLAY_SFX(0x29033064, bossA6->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_SPARK_DAMAGE_M, bossA6->sfxSource, 4);
if (bossA6->swork[A6_SWK_0 + j] <= 0) { if (bossA6->swork[A6_SWK_0 + j] <= 0) {
bossA6->swork[A6_SWK_0 + j] = 0; bossA6->swork[A6_SWK_0 + j] = 0;
Matrix_MultVec3f(gCalcMatrix, &bossA6->vwork[A6_VWK_1 + i], &sp94); Matrix_MultVec3f(gCalcMatrix, &bossA6->vwork[A6_VWK_1 + i], &sp94);
@ -1736,7 +1736,7 @@ void Area6_8018B9BC(Boss* bossA6) {
sp88.x = bossA6->obj.pos.x + sp94.x; sp88.x = bossA6->obj.pos.x + sp94.x;
sp88.y = bossA6->obj.pos.y + sp94.y; sp88.y = bossA6->obj.pos.y + sp94.y;
sp88.z = bossA6->obj.pos.z + sp94.z; sp88.z = bossA6->obj.pos.z + sp94.z;
func_effect_8007A6F0(&sp88, 0x2903B009); func_effect_8007A6F0(&sp88, NA_SE_EN_EXPLOSION_M);
func_effect_8007C120(bossA6->obj.pos.x, bossA6->obj.pos.y, bossA6->obj.pos.z + 150.0f, func_effect_8007C120(bossA6->obj.pos.x, bossA6->obj.pos.y, bossA6->obj.pos.z + 150.0f,
bossA6->vel.x, bossA6->vel.y, bossA6->vel.z, 0.2f, 50); bossA6->vel.x, bossA6->vel.y, bossA6->vel.z, 0.2f, 50);
} }
@ -1936,7 +1936,7 @@ void Area6_8018C54C(Boss* bossA6) {
spB8.z = bossA6->obj.pos.z + spC4.z; spB8.z = bossA6->obj.pos.z + spC4.z;
if ((!bossA6) && (!bossA6)) {} // fake if ((!bossA6) && (!bossA6)) {} // fake
if (D_i3_801C2250[A6_BSS_26] == 0) { if (D_i3_801C2250[A6_BSS_26] == 0) {
func_effect_8007A6F0(&spB8, 0x2903B009); func_effect_8007A6F0(&spB8, NA_SE_EN_EXPLOSION_M);
} }
D_i3_801C2250[A6_BSS_26]++; D_i3_801C2250[A6_BSS_26]++;
D_i3_801C2250[A6_BSS_26] &= 1; D_i3_801C2250[A6_BSS_26] &= 1;
@ -1995,7 +1995,7 @@ void Area6_8018C54C(Boss* bossA6) {
if (bossA6->swork[A6_SWK_25] != 0) { if (bossA6->swork[A6_SWK_25] != 0) {
j = bossA6->swork[A6_SWK_25] - 1; j = bossA6->swork[A6_SWK_25] - 1;
if ((bossA6->timer_058 != 0) && !(bossA6->timer_058 & 3)) { if ((bossA6->timer_058 != 0) && !(bossA6->timer_058 & 3)) {
AUDIO_PLAY_SFX(0x29034003, bossA6->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OB_DAMAGE_M, bossA6->sfxSource, 4);
} }
if (bossA6->timer_058 == 1) { if (bossA6->timer_058 == 1) {
if (bossA6->swork[A6_SWK_25] == 2) { if (bossA6->swork[A6_SWK_25] == 2) {
@ -2085,7 +2085,7 @@ void Area6_8018D3CC(s32 arg0, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel,
gPlayerShots[i].unk_64 = 150; gPlayerShots[i].unk_64 = 150;
gPlayerShots[i].sourceId = CS_SHOT_ID; gPlayerShots[i].sourceId = CS_SHOT_ID;
AUDIO_PLAY_SFX(0x2900000D, gPlayerShots[i].sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_ARWING_SHOT_F, gPlayerShots[i].sfxSource, 4);
break; break;
} }
} }
@ -2101,7 +2101,7 @@ void Area6_8018D4E0(Actor* actor) {
for (i = 0; i < 15; i++) { for (i = 0; i < 15; i++) {
func_effect_800794CC(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 1.0f); func_effect_800794CC(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 1.0f);
} }
func_effect_8007A6F0(&actor->obj.pos, 0x2903B009); func_effect_8007A6F0(&actor->obj.pos, NA_SE_EN_EXPLOSION_M);
} }
void Area6_8018D5C8(void) { void Area6_8018D5C8(void) {
@ -2117,7 +2117,7 @@ void Area6_8018D5C8(void) {
gActors[i].fwork[0] = 0.0f; gActors[i].fwork[0] = 0.0f;
gActors[i].obj.id = OBJ_ACTOR_CUTSCENE; gActors[i].obj.id = OBJ_ACTOR_CUTSCENE;
Object_SetInfo(&gActors[i].info, gActors[i].obj.id); Object_SetInfo(&gActors[i].info, gActors[i].obj.id);
AUDIO_PLAY_SFX(0x11030010, gActors[i].sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_GREATFOX_ENGINE, gActors[i].sfxSource, 0);
} }
void Area6_8018D694(Actor* actor, s32 arg1) { void Area6_8018D694(Actor* actor, s32 arg1) {
@ -2141,7 +2141,7 @@ void Area6_8018D694(Actor* actor, s32 arg1) {
actor->fwork[8] = RAND_FLOAT_SEEDED(360.0f); actor->fwork[8] = RAND_FLOAT_SEEDED(360.0f);
actor->fwork[9] = RAND_FLOAT_SEEDED(360.0f); actor->fwork[9] = RAND_FLOAT_SEEDED(360.0f);
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
AUDIO_PLAY_SFX(0x31000011, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_ENGINE_01, actor->sfxSource, 4);
} }
void Area6_8018D804(Actor* actor, s32 arg1) { void Area6_8018D804(Actor* actor, s32 arg1) {
@ -2162,7 +2162,7 @@ void Area6_8018D804(Actor* actor, s32 arg1) {
actor->iwork[11] = 1; actor->iwork[11] = 1;
actor->fwork[0] = 0.0f; actor->fwork[0] = 0.0f;
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
AUDIO_PLAY_SFX(0x3100000C, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_ARWING_ENGINE_FG, actor->sfxSource, 4);
} }
void Area6_8018D920(Vec3f* pos) { void Area6_8018D920(Vec3f* pos) {
@ -2215,7 +2215,7 @@ void Area6_8018DA58(Actor* actor) {
case 11: case 11:
case 16: case 16:
actor->state++; actor->state++;
AUDIO_PLAY_SFX(0x09000002, actor->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_ARWING_BOOST, actor->sfxSource, 0);
actor->fwork[29] = 5.0f; actor->fwork[29] = 5.0f;
/* fallthrough */ /* fallthrough */
case 7: case 7:
@ -2363,7 +2363,7 @@ void Area6_LevelStart(Player* player) {
if (gCsFrameCount == 460) { if (gCsFrameCount == 460) {
player->unk_190 = 2.0f; player->unk_190 = 2.0f;
player->unk_194 = 5.0f; player->unk_194 = 5.0f;
AUDIO_PLAY_SFX(0x09000002, player->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_ARWING_BOOST, player->sfxSource, 0);
} }
if (gCsFrameCount >= 460) { if (gCsFrameCount >= 460) {
Math_SmoothStepToF(&player->baseSpeed, 50.0f, 0.1f, 3.0f, 0.01f); Math_SmoothStepToF(&player->baseSpeed, 50.0f, 0.1f, 3.0f, 0.01f);
@ -2507,8 +2507,8 @@ void Area6_8018EB3C(Actor* actor) {
actor->state = 100; actor->state = 100;
actor->fwork[0] = 0.0f; actor->fwork[0] = 0.0f;
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
AUDIO_PLAY_SFX(0x11030010, actor->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_GREATFOX_ENGINE, actor->sfxSource, 0);
AUDIO_PLAY_SFX(0x31024059, actor->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_GREATFOX_BURNER, actor->sfxSource, 0);
} }
void Area6_8018EC38(Actor* actor, s32 arg1) { void Area6_8018EC38(Actor* actor, s32 arg1) {
@ -2533,7 +2533,7 @@ void Area6_8018EC38(Actor* actor, s32 arg1) {
actor->iwork[14] = arg1 + 2; actor->iwork[14] = arg1 + 2;
} }
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
AUDIO_PLAY_SFX(0x3100000C, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_ARWING_ENGINE_FG, actor->sfxSource, 4);
} }
} }
@ -2556,7 +2556,7 @@ void Area6_LevelComplete(Player* player) {
player->unk_194 = 5.0f; player->unk_194 = 5.0f;
player->unk_190 = 2.0f; player->unk_190 = 2.0f;
player->baseSpeed = 60.0f; player->baseSpeed = 60.0f;
AUDIO_PLAY_SFX(0x09000002, player->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_ARWING_BOOST, player->sfxSource, 0);
D_ctx_80177A48[3] = 0.0f; D_ctx_80177A48[3] = 0.0f;
/* fallthrough */ /* fallthrough */
case 1: case 1:
@ -2618,7 +2618,7 @@ void Area6_LevelComplete(Player* player) {
gFillScreenRed = gFillScreenGreen = gFillScreenBlue = gFillScreenAlpha = 0; gFillScreenRed = gFillScreenGreen = gFillScreenBlue = gFillScreenAlpha = 0;
} }
if ((gCsFrameCount == 146) || (gCsFrameCount == 150)) { if ((gCsFrameCount == 146) || (gCsFrameCount == 150)) {
AUDIO_PLAY_SFX(0x2940F026, gActors[5].sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_STAR_EXPLOSION, gActors[5].sfxSource, 4);
} }
if (gCsFrameCount > 146) { if (gCsFrameCount > 146) {
actor4->iwork[3] -= 4; actor4->iwork[3] -= 4;
@ -2723,7 +2723,7 @@ void Area6_LevelComplete(Player* player) {
Object_Kill(&gActors[0].obj, gActors[0].sfxSource); Object_Kill(&gActors[0].obj, gActors[0].sfxSource);
player->unk_190 = 2.0f; player->unk_190 = 2.0f;
player->unk_194 = 5.0f; player->unk_194 = 5.0f;
AUDIO_PLAY_SFX(0x09000002, player->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_ARWING_BOOST, player->sfxSource, 0);
} }
if (gCsFrameCount >= 1090) { if (gCsFrameCount >= 1090) {
gFillScreenRed = gFillScreenGreen = gFillScreenBlue = 0; gFillScreenRed = gFillScreenGreen = gFillScreenBlue = 0;
@ -2774,15 +2774,15 @@ void Area6_LevelComplete(Player* player) {
break; break;
case 1070: case 1070:
gActors[1].fwork[29] = 5.0f; gActors[1].fwork[29] = 5.0f;
AUDIO_PLAY_SFX(0x09000002, gActors[1].sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_ARWING_BOOST, gActors[1].sfxSource, 0);
break; break;
case 1072: case 1072:
gActors[2].fwork[29] = 5.0f; gActors[2].fwork[29] = 5.0f;
AUDIO_PLAY_SFX(0x09000002, gActors[2].sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_ARWING_BOOST, gActors[2].sfxSource, 0);
break; break;
case 1074: case 1074:
gActors[3].fwork[29] = 5.0f; gActors[3].fwork[29] = 5.0f;
AUDIO_PLAY_SFX(0x09000002, gActors[3].sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_ARWING_BOOST, gActors[3].sfxSource, 0);
break; break;
} }
if (gCsFrameCount >= 1070) { if (gCsFrameCount >= 1070) {

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

@ -621,7 +621,7 @@ void Aquas_801A9ED0(Player* player) {
} }
} }
if ((sp8C != D_i3_801C4190[4]) && (D_i3_801C41B8[5] == 3.0f)) { if ((sp8C != D_i3_801C4190[4]) && (D_i3_801C41B8[5] == 3.0f)) {
AUDIO_PLAY_SFX(0x4900001B, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_MAR_LOCKON, gDefaultSfxSource, 4);
D_i3_801C41B8[5] = 20.0f; D_i3_801C41B8[5] = 20.0f;
} }
} }
@ -924,7 +924,7 @@ void Aquas_801AACF8(Player* player) {
sp58 = 0.0f; sp58 = 0.0f;
gPlayerTurnRate = 2.0f; gPlayerTurnRate = 2.0f;
if (D_i3_801C4190[7] == 0) { if (D_i3_801C4190[7] == 0) {
AUDIO_PLAY_SFX(0x09404028, player->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_MAR_BOUND, player->sfxSource, 0);
D_i3_801C4190[7] = 1; D_i3_801C4190[7] = 1;
} }
} }
@ -1177,7 +1177,7 @@ void Aquas_801AC09C(Player* player) {
for (i = 15, shot = &gPlayerShots[15]; i < ARRAY_COUNT(gPlayerShots); i++, shot++) { for (i = 15, shot = &gPlayerShots[15]; i < ARRAY_COUNT(gPlayerShots); i++, shot++) {
if (shot->obj.status == OBJ_FREE) { if (shot->obj.status == OBJ_FREE) {
func_play_800AC290(player, shot, 0.0f, 0.0f, PLAYERSHOT_8, 50.0f); func_play_800AC290(player, shot, 0.0f, 0.0f, PLAYERSHOT_8, 50.0f);
AUDIO_PLAY_SFX(0x01000025, shot->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_MAR_BOMB_SHOT, shot->sfxSource, 0);
D_i3_801C4190[5] = i + 1; D_i3_801C4190[5] = i + 1;
D_i3_801C4454 = 300; D_i3_801C4454 = 300;
D_i3_801C4458 = -100.0f; D_i3_801C4458 = -100.0f;
@ -1195,9 +1195,9 @@ void Aquas_801AC18C(Player* player) {
if (gPlayerShots[i].obj.status == OBJ_FREE) { if (gPlayerShots[i].obj.status == OBJ_FREE) {
func_play_800AC290(player, &gPlayerShots[i], 0.0f, -10.0f, PLAYERSHOT_0, 120.0f); func_play_800AC290(player, &gPlayerShots[i], 0.0f, -10.0f, PLAYERSHOT_0, 120.0f);
if (gLaserStrength[gPlayerNum] == LASERS_SINGLE) { if (gLaserStrength[gPlayerNum] == LASERS_SINGLE) {
AUDIO_PLAY_SFX(0x09400021, gPlayerShots[i].sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_MAR_SHOT, gPlayerShots[i].sfxSource, 0);
} else { } else {
AUDIO_PLAY_SFX(0x09400027, gPlayerShots[i].sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_MAR_TWIN_LASER, gPlayerShots[i].sfxSource, 0);
} }
break; break;
} }
@ -1271,7 +1271,7 @@ void Aquas_801AC274(Player* player) {
} }
if ((D_i3_801C4190[0] != temp) && (D_i3_801C41B8[5] == 3.0f)) { if ((D_i3_801C4190[0] != temp) && (D_i3_801C41B8[5] == 3.0f)) {
AUDIO_PLAY_SFX(0x4900001B, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_MAR_LOCKON, gDefaultSfxSource, 4);
D_i3_801C41B8[5] = 20.0f; D_i3_801C41B8[5] = 20.0f;
} }
if (D_i3_801C4190[0] != 0) { if (D_i3_801C4190[0] != 0) {
@ -1478,7 +1478,7 @@ void Aquas_801ACE50(Player* player) {
if ((gBoostButton[player->num] & gInputHold->button) && (player->unk_230 == 0) && if ((gBoostButton[player->num] & gInputHold->button) && (player->unk_230 == 0) &&
(player->state_1C8 != PLAYERSTATE_1C8_U_TURN) && (player->boostCooldown == 0)) { (player->state_1C8 != PLAYERSTATE_1C8_U_TURN) && (player->boostCooldown == 0)) {
if (player->boostMeter == 0) { if (player->boostMeter == 0) {
AUDIO_PLAY_SFX(0x09004030, player->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_MARINE_BOOST, player->sfxSource, 4);
} }
player->boostMeter += 3.0f; player->boostMeter += 3.0f;
if (player->boostMeter > 90.0f) { if (player->boostMeter > 90.0f) {
@ -1518,7 +1518,7 @@ void Aquas_801AD328(Player* player) {
if ((gBrakeButton[player->num] & gInputHold->button) && (player->unk_230 == 0) && if ((gBrakeButton[player->num] & gInputHold->button) && (player->unk_230 == 0) &&
(player->state_1C8 != PLAYERSTATE_1C8_U_TURN) && (player->boostCooldown == 0)) { (player->state_1C8 != PLAYERSTATE_1C8_U_TURN) && (player->boostCooldown == 0)) {
if (player->boostMeter == 0) { if (player->boostMeter == 0) {
AUDIO_PLAY_SFX(0x09004031, player->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_MARINE_BRAKE, player->sfxSource, 4);
} }
player->boostMeter += 3.0f; player->boostMeter += 3.0f;
if (player->boostMeter > 90.0f) { if (player->boostMeter > 90.0f) {
@ -1619,7 +1619,7 @@ void Aquas_801AD6C0(Actor* actor) {
actor->unk_0F4.z = Math_ModF(actor->unk_0F4.z, 360.0f); actor->unk_0F4.z = Math_ModF(actor->unk_0F4.z, 360.0f);
} else { } else {
actor->health = 30; actor->health = 30;
AUDIO_PLAY_SFX(0x31000047, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_SANADA_SWIM, actor->sfxSource, 4);
actor->state++; actor->state++;
} }
break; break;
@ -1630,14 +1630,14 @@ void Aquas_801AD6C0(Actor* actor) {
actor->dmgType = DMG_NONE; actor->dmgType = DMG_NONE;
actor->timer_0C6 = 15; actor->timer_0C6 = 15;
actor->health -= actor->damage; actor->health -= actor->damage;
AUDIO_PLAY_SFX(0x29034045, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_SANADA_DAMAGE, actor->sfxSource, 4);
if (actor->health <= 0) { if (actor->health <= 0) {
actor->timer_0C2 = 30000; actor->timer_0C2 = 30000;
actor->state = 2; actor->state = 2;
actor->vel.y = 0.0f; actor->vel.y = 0.0f;
actor->vel.x = 0.0f; actor->vel.x = 0.0f;
actor->vel.z = 0.0f; actor->vel.z = 0.0f;
AUDIO_PLAY_SFX(0x2902A046, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_SANADA_DOWN, actor->sfxSource, 4);
} }
} }
} }
@ -1728,7 +1728,7 @@ void Aquas_801AD6C0(Actor* actor) {
} }
actor->timer_0BC = 4; actor->timer_0BC = 4;
func_effect_8007D0E0(D_i3_801C27C0->pos.x, D_i3_801C27C0->pos.y, D_i3_801C27C0->pos.z, 3.0f); func_effect_8007D0E0(D_i3_801C27C0->pos.x, D_i3_801C27C0->pos.y, D_i3_801C27C0->pos.z, 3.0f);
AUDIO_PLAY_SFX(0x29018049, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_SEA_EXPLOSION_S, actor->sfxSource, 4);
} }
break; break;
} }
@ -1857,7 +1857,7 @@ void Aquas_801AE3D8(Actor* actor) {
actor->timer_0C6 = 30; actor->timer_0C6 = 30;
actor->iwork[1] = 0; actor->iwork[1] = 0;
D_i3_801C4308[79] -= 5.0f; D_i3_801C4308[79] -= 5.0f;
AUDIO_PLAY_SFX(0x29036050, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_KAIBASHIRA_DAMEGE, actor->sfxSource, 4);
if (D_i3_801C4308[79] <= -28.0f) { if (D_i3_801C4308[79] <= -28.0f) {
D_i3_801C4308[79] = -28.0f; D_i3_801C4308[79] = -28.0f;
@ -1893,7 +1893,7 @@ void Aquas_801AE3D8(Actor* actor) {
actor->health = 0; actor->health = 0;
actor->timer_0C6 = 300; actor->timer_0C6 = 300;
actor->fwork[2] = actor->scale; actor->fwork[2] = actor->scale;
AUDIO_PLAY_SFX(0x19000033, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_WT_DISAPPEAR_L, actor->sfxSource, 4);
actor->state++; actor->state++;
} }
} }
@ -2124,7 +2124,7 @@ void Aquas_801AFA5C(Actor* actor) {
if ((gBosses[0].state >= 10) && (actor->health != 0) && (actor->damage == 31)) { if ((gBosses[0].state >= 10) && (actor->health != 0) && (actor->damage == 31)) {
actor->timer_0BE = 70; actor->timer_0BE = 70;
actor->health -= actor->damage; actor->health -= actor->damage;
AUDIO_PLAY_SFX(0x2903604C, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_WT_DAMAGE_S, actor->sfxSource, 4);
if (actor->timer_0C6 == 0) { if (actor->timer_0C6 == 0) {
actor->timer_0C6 = 70; actor->timer_0C6 = 70;
} }
@ -2192,7 +2192,7 @@ void Aquas_801AFA5C(Actor* actor) {
i = -1; i = -1;
} }
if ((actor->iwork[1] == 13) && (i < 0)) { if ((actor->iwork[1] == 13) && (i < 0)) {
AUDIO_PLAY_SFX(0x29022048, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_SANADA_APPEAR, actor->sfxSource, 4);
for (i = 0, sp48 = gActors; i < ARRAY_COUNT(gActors); i++, sp48++) { for (i = 0, sp48 = gActors; i < ARRAY_COUNT(gActors); i++, sp48++) {
if (sp48->obj.status == OBJ_FREE) { if (sp48->obj.status == OBJ_FREE) {
Actor_Initialize(sp48); Actor_Initialize(sp48);
@ -2243,7 +2243,7 @@ void Aquas_801AFA5C(Actor* actor) {
actor->state = 5; actor->state = 5;
actor->vel.y = 10.0f; actor->vel.y = 10.0f;
actor->vel.z = 5.0f; actor->vel.z = 5.0f;
AUDIO_PLAY_SFX(0x1902102F, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_WT_BROKEN, actor->sfxSource, 4);
break; break;
case 5: case 5:
if (actor->obj.pos.y > (gGroundHeight + 70.0f)) { if (actor->obj.pos.y > (gGroundHeight + 70.0f)) {
@ -2274,10 +2274,10 @@ void Aquas_801AFA5C(Actor* actor) {
} }
if (actor->vel.z != 0) { if (actor->vel.z != 0) {
actor->vel.y = actor->vel.z = 0.0f; actor->vel.y = actor->vel.z = 0.0f;
AUDIO_PLAY_SFX(0x19402031, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_WT_BOUND_M, actor->sfxSource, 4);
} }
if (actor->timer_0C0 == 1) { if (actor->timer_0C0 == 1) {
AUDIO_PLAY_SFX(0x19003030, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_WT_DISAPPEAR_S, actor->sfxSource, 4);
} }
if (actor->timer_0C0 == 0) { if (actor->timer_0C0 == 0) {
if (actor->timer_0BE == 0) { if (actor->timer_0BE == 0) {
@ -2402,7 +2402,7 @@ void Aquas_801B0B60(Actor* actor) {
Object_Kill(&actor->obj, actor->sfxSource); Object_Kill(&actor->obj, actor->sfxSource);
func_effect_800815DC(); func_effect_800815DC();
func_effect_8007D0E0(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z + 50.0f, 5.0f); func_effect_8007D0E0(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z + 50.0f, 5.0f);
func_effect_8007A6F0(&actor->obj.pos, 0x29018049); func_effect_8007A6F0(&actor->obj.pos, NA_SE_EN_SEA_EXPLOSION_S);
break; break;
} }
if (((gGameFrameCount % 16) == 0)) { if (((gGameFrameCount % 16) == 0)) {
@ -2500,7 +2500,7 @@ void Aquas_BossAq_Init(BossAQ* this) {
this->info.hitbox[119] = 1028.0f; this->info.hitbox[119] = 1028.0f;
this->info.hitbox[169] = 800.0f; this->info.hitbox[169] = 800.0f;
this->swork[AQ_SWK_8] = this->swork[AQ_SWK_9] = 2; this->swork[AQ_SWK_8] = this->swork[AQ_SWK_9] = 2;
AUDIO_PLAY_SFX(0x3140904D, this->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_SHELL_BEAT, this->sfxSource, 4);
} }
// OBJ_BOSS_AQ action // OBJ_BOSS_AQ action
@ -2565,7 +2565,7 @@ void Aquas_801B134C(Boss* bossAQ) {
D_i3_801C4308[12] = D_i3_801C4308[13] = 0.0f; D_i3_801C4308[12] = D_i3_801C4308[13] = 0.0f;
bossAQ->timer_056 = 20; bossAQ->timer_056 = 20;
bossAQ->state = 2; bossAQ->state = 2;
AUDIO_PLAY_SFX(0x1900002E, bossAQ->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_BUBBLE_UP, bossAQ->sfxSource, 0);
} }
break; break;
case 2: case 2:
@ -2655,7 +2655,7 @@ void Aquas_801B134C(Boss* bossAQ) {
break; break;
case 14: case 14:
if (bossAQ->timer_056 == 58) { if (bossAQ->timer_056 == 58) {
AUDIO_PLAY_SFX(0x29408055, bossAQ->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_SHELL_FILLOPEN, bossAQ->sfxSource, 4);
} }
if ((bossAQ->timer_056 == 0) && (D_i3_801C4308[12] <= -44.0f)) { if ((bossAQ->timer_056 == 0) && (D_i3_801C4308[12] <= -44.0f)) {
bossAQ->swork[AQ_SWK_2] = bossAQ->swork[AQ_SWK_3] = 20; bossAQ->swork[AQ_SWK_2] = bossAQ->swork[AQ_SWK_3] = 20;
@ -2794,7 +2794,7 @@ void Aquas_801B134C(Boss* bossAQ) {
bossAQ->timer_052 = 0; bossAQ->timer_052 = 0;
bossAQ->swork[AQ_SWK_19] = 500; bossAQ->swork[AQ_SWK_19] = 500;
D_i3_801C4308[79] = 0.0f; D_i3_801C4308[79] = 0.0f;
AUDIO_PLAY_SFX(0x29408054, bossAQ->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_SHELL_CLOSE, bossAQ->sfxSource, 4);
if (bossAQ->state < 14) { if (bossAQ->state < 14) {
for (i3 = 0, actor = gActors; i3 < ARRAY_COUNT(gActors); i3++, actor++) { for (i3 = 0, actor = gActors; i3 < ARRAY_COUNT(gActors); i3++, actor++) {
if ((actor->obj.id == OBJ_ACTOR_260) && (actor->obj.status == OBJ_ACTIVE)) { if ((actor->obj.id == OBJ_ACTOR_260) && (actor->obj.status == OBJ_ACTIVE)) {
@ -2804,7 +2804,7 @@ void Aquas_801B134C(Boss* bossAQ) {
bossAQ->timer_058 = 30; bossAQ->timer_058 = 30;
bossAQ->swork[AQ_SWK_0] = 4; bossAQ->swork[AQ_SWK_0] = 4;
gCameraShake = 50; gCameraShake = 50;
AUDIO_PLAY_SFX(0x1900002D, bossAQ->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_WATER_PRESSURE, bossAQ->sfxSource, 0);
func_enmy_80062B60(bossAQ->obj.pos.x, bossAQ->obj.pos.z + 800.0f, 0, 100.0f); func_enmy_80062B60(bossAQ->obj.pos.x, bossAQ->obj.pos.z + 800.0f, 0, 100.0f);
var_fs3 = 80.0f; var_fs3 = 80.0f;
for (i2 = 0; i2 < 3; i2++, var_fs3 += 10.0f) { for (i2 = 0; i2 < 3; i2++, var_fs3 += 10.0f) {
@ -2853,26 +2853,26 @@ void Aquas_801B134C(Boss* bossAQ) {
D_i3_801C42A0[22] = 0; D_i3_801C42A0[22] = 0;
bossAQ->swork[AQ_SWK_12]--; bossAQ->swork[AQ_SWK_12]--;
bossAQ->swork[AQ_SWK_13] = 70; bossAQ->swork[AQ_SWK_13] = 70;
AUDIO_PLAY_SFX(0x2940604C, bossAQ->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_EYEFILM_DAMAGE, bossAQ->sfxSource, 4);
} }
} else if (bossAQ->state >= 10) { } else if (bossAQ->state >= 10) {
AUDIO_PLAY_SFX(0x29121007, bossAQ->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_REFLECT, bossAQ->sfxSource, 4);
} }
break; break;
case 14: case 14:
if (bossAQ->damage == 31) { if (bossAQ->damage == 31) {
if (D_i3_801C42A0[23] != 0) { if (D_i3_801C42A0[23] != 0) {
AUDIO_PLAY_SFX(0x29121007, bossAQ->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_REFLECT, bossAQ->sfxSource, 4);
} else if ((bossAQ->state >= 15) && (bossAQ->swork[AQ_SWK_8] != 0)) { } else if ((bossAQ->state >= 15) && (bossAQ->swork[AQ_SWK_8] != 0)) {
D_i3_801C42A0[1] = 50; D_i3_801C42A0[1] = 50;
sBossAQlimbTimers[AQ_LIMB_7] = 50; sBossAQlimbTimers[AQ_LIMB_7] = 50;
bossAQ->swork[AQ_SWK_8]--; bossAQ->swork[AQ_SWK_8]--;
AUDIO_PLAY_SFX(0x2903604C, bossAQ->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_WT_DAMAGE_S, bossAQ->sfxSource, 4);
if (bossAQ->swork[AQ_SWK_8] == 0) { if (bossAQ->swork[AQ_SWK_8] == 0) {
spD4.x = D_i3_801C4308[73]; spD4.x = D_i3_801C4308[73];
spD4.y = D_i3_801C4308[74]; spD4.y = D_i3_801C4308[74];
spD4.z = D_i3_801C4308[75]; // 74? spD4.z = D_i3_801C4308[75]; // 74?
func_effect_8007A6F0(&spD4, 0x19000033); func_effect_8007A6F0(&spD4, NA_SE_EN_WT_DISAPPEAR_L);
bossAQ->swork[AQ_SWK_10] = 250.0f + RAND_FLOAT(50.0f); bossAQ->swork[AQ_SWK_10] = 250.0f + RAND_FLOAT(50.0f);
} }
} }
@ -2881,17 +2881,17 @@ void Aquas_801B134C(Boss* bossAQ) {
case 15: case 15:
if (bossAQ->damage == 31) { if (bossAQ->damage == 31) {
if (D_i3_801C42A0[23] != 0) { if (D_i3_801C42A0[23] != 0) {
AUDIO_PLAY_SFX(0x29121007, bossAQ->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_REFLECT, bossAQ->sfxSource, 4);
} else if ((bossAQ->state >= 15) && (bossAQ->swork[AQ_SWK_9] != 0)) { } else if ((bossAQ->state >= 15) && (bossAQ->swork[AQ_SWK_9] != 0)) {
D_i3_801C42A0[2] = 50; D_i3_801C42A0[2] = 50;
sBossAQlimbTimers[AQ_LIMB_8] = 50; sBossAQlimbTimers[AQ_LIMB_8] = 50;
bossAQ->swork[AQ_SWK_9]--; bossAQ->swork[AQ_SWK_9]--;
AUDIO_PLAY_SFX(0x2903604C, bossAQ->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_WT_DAMAGE_S, bossAQ->sfxSource, 4);
if (bossAQ->swork[AQ_SWK_9] == 0) { if (bossAQ->swork[AQ_SWK_9] == 0) {
spD4.x = D_i3_801C4308[76]; spD4.x = D_i3_801C4308[76];
spD4.y = D_i3_801C4308[77]; // 76? spD4.y = D_i3_801C4308[77]; // 76?
spD4.z = D_i3_801C4308[78]; spD4.z = D_i3_801C4308[78];
func_effect_8007A6F0(&spD4, 0x19000033); func_effect_8007A6F0(&spD4, NA_SE_EN_WT_DISAPPEAR_L);
bossAQ->swork[AQ_SWK_11] = 250.0f + RAND_FLOAT(50.0f); bossAQ->swork[AQ_SWK_11] = 250.0f + RAND_FLOAT(50.0f);
} }
} }
@ -2900,7 +2900,7 @@ void Aquas_801B134C(Boss* bossAQ) {
case 16: case 16:
if (bossAQ->damage == 31) { if (bossAQ->damage == 31) {
if (D_i3_801C42A0[23] != 0) { if (D_i3_801C42A0[23] != 0) {
AUDIO_PLAY_SFX(0x29121007, bossAQ->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_REFLECT, bossAQ->sfxSource, 4);
} else if (bossAQ->state >= 15) { } else if (bossAQ->state >= 15) {
D_i3_801C42A0[4] = 75; D_i3_801C42A0[4] = 75;
} }
@ -2909,7 +2909,7 @@ void Aquas_801B134C(Boss* bossAQ) {
case 17: case 17:
if (bossAQ->damage == 31) { if (bossAQ->damage == 31) {
if (D_i3_801C42A0[23] != 0) { if (D_i3_801C42A0[23] != 0) {
AUDIO_PLAY_SFX(0x29121007, bossAQ->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_REFLECT, bossAQ->sfxSource, 4);
} else if (bossAQ->state >= 15) { } else if (bossAQ->state >= 15) {
D_i3_801C42A0[5] = 75; D_i3_801C42A0[5] = 75;
} }
@ -2919,7 +2919,7 @@ void Aquas_801B134C(Boss* bossAQ) {
if ((bossAQ->damage == 31) && (bossAQ->swork[AQ_SWK_1] != 2) && (bossAQ->swork[AQ_SWK_12] == 0) && if ((bossAQ->damage == 31) && (bossAQ->swork[AQ_SWK_1] != 2) && (bossAQ->swork[AQ_SWK_12] == 0) &&
(bossAQ->state == 15) && (bossAQ->health != 0)) { (bossAQ->state == 15) && (bossAQ->health != 0)) {
if (D_i3_801C42A0[23] != 0) { if (D_i3_801C42A0[23] != 0) {
AUDIO_PLAY_SFX(0x29121007, bossAQ->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_REFLECT, bossAQ->sfxSource, 4);
} else { } else {
for (i7 = 0; i7 < AQ_LIMB_MAX; i7++) { for (i7 = 0; i7 < AQ_LIMB_MAX; i7++) {
sBossAQlimbTimers[i7] = 50; sBossAQlimbTimers[i7] = 50;
@ -2929,7 +2929,7 @@ void Aquas_801B134C(Boss* bossAQ) {
bossAQ->swork[AQ_SWK_13] = 40; bossAQ->swork[AQ_SWK_13] = 40;
bossAQ->swork[AQ_SWK_1] = 2; bossAQ->swork[AQ_SWK_1] = 2;
AUDIO_PLAY_SFX(0x2940804E, bossAQ->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_SHELL_DAMAGE, bossAQ->sfxSource, 4);
bossAQ->health -= bossAQ->damage; bossAQ->health -= bossAQ->damage;
if ((bossAQ->swork[AQ_SWK_25] == 0) || (bossAQ->swork[AQ_SWK_25] == 2)) { if ((bossAQ->swork[AQ_SWK_25] == 0) || (bossAQ->swork[AQ_SWK_25] == 2)) {
Radio_PlayMessage(gMsg_ID_7086, RCID_SLIPPY); Radio_PlayMessage(gMsg_ID_7086, RCID_SLIPPY);
@ -2955,7 +2955,7 @@ void Aquas_801B134C(Boss* bossAQ) {
bossAQ->swork[AQ_SWK_13] = 40; bossAQ->swork[AQ_SWK_13] = 40;
bossAQ->swork[AQ_SWK_1] = 2; bossAQ->swork[AQ_SWK_1] = 2;
bossAQ->timer_056 = 50; bossAQ->timer_056 = 50;
AUDIO_PLAY_SFX(0x2940A04F, bossAQ->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_SHELL_DOWN, bossAQ->sfxSource, 4);
gShowBossHealth = false; gShowBossHealth = false;
bossAQ->state = 16; bossAQ->state = 16;
} }
@ -2966,14 +2966,14 @@ void Aquas_801B134C(Boss* bossAQ) {
case 20: case 20:
if (bossAQ->damage == 31) { if (bossAQ->damage == 31) {
if (D_i3_801C42A0[23] != 0) { if (D_i3_801C42A0[23] != 0) {
AUDIO_PLAY_SFX(0x29121007, bossAQ->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_REFLECT, bossAQ->sfxSource, 4);
} else if (bossAQ->state >= 15) { } else if (bossAQ->state >= 15) {
D_i3_801C42A0[6] = 50; D_i3_801C42A0[6] = 50;
} }
} }
break; break;
default: default:
AUDIO_PLAY_SFX(0x29121007, bossAQ->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_REFLECT, bossAQ->sfxSource, 4);
break; break;
} }
} }
@ -3124,7 +3124,7 @@ void Aquas_801B134C(Boss* bossAQ) {
spD4.x = D_i3_801C4308[73 + 3 * i7]; spD4.x = D_i3_801C4308[73 + 3 * i7];
spD4.y = D_i3_801C4308[74 + 3 * i7]; spD4.y = D_i3_801C4308[74 + 3 * i7];
spD4.z = D_i3_801C4308[75 + 3 * i7]; spD4.z = D_i3_801C4308[75 + 3 * i7];
func_effect_8007A6F0(&spD4, 0x2903404B); func_effect_8007A6F0(&spD4, NA_SE_EN_P_BALL_SHOT);
i2 = 0; i2 = 0;
for (i3 = 0; i2 <= i && i3 < ARRAY_COUNT(gActors); i3++) { for (i3 = 0; i2 <= i && i3 < ARRAY_COUNT(gActors); i3++) {
if ((gActors[i3].obj.status == OBJ_FREE) && (i3 < ARRAY_COUNT(gActors))) { if ((gActors[i3].obj.status == OBJ_FREE) && (i3 < ARRAY_COUNT(gActors))) {
@ -3226,7 +3226,7 @@ void Aquas_801B134C(Boss* bossAQ) {
Math_SmoothStepToF(&D_i3_801C4308[61], 0.0f, 0.3f, 0.5f, 0.0f); Math_SmoothStepToF(&D_i3_801C4308[61], 0.0f, 0.3f, 0.5f, 0.0f);
bossAQ->info.hitbox[119] = -10000.0f; bossAQ->info.hitbox[119] = -10000.0f;
if (bossAQ->swork[AQ_SWK_13] == 1) { if (bossAQ->swork[AQ_SWK_13] == 1) {
AUDIO_PLAY_SFX(0x29409051, bossAQ->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_EYEFILM_REVIVAL, bossAQ->sfxSource, 4);
} }
} else if ((bossAQ->health != 0) || (bossAQ->state < 16)) { } else if ((bossAQ->health != 0) || (bossAQ->state < 16)) {
Math_SmoothStepToF(&D_i3_801C4308[54], 1.0f, 0.3f, 0.5f, 0.0f); Math_SmoothStepToF(&D_i3_801C4308[54], 1.0f, 0.3f, 0.5f, 0.0f);
@ -3256,7 +3256,7 @@ void Aquas_801B134C(Boss* bossAQ) {
spD4.x = D_i3_801C4308[73 + 3 * i3]; spD4.x = D_i3_801C4308[73 + 3 * i3];
spD4.y = D_i3_801C4308[74 + 3 * i3]; spD4.y = D_i3_801C4308[74 + 3 * i3];
spD4.z = D_i3_801C4308[75 + 3 * i3]; spD4.z = D_i3_801C4308[75 + 3 * i3];
func_effect_8007A6F0(&spD4, 0x29400052); func_effect_8007A6F0(&spD4, NA_SE_EN_P_GUN_APPEAR);
} }
if ((fabsf(D_i3_801C4308[10]) <= 3.0f) || (bossAQ->swork[AQ_SWK_10 + i3] == 0)) { if ((fabsf(D_i3_801C4308[10]) <= 3.0f) || (bossAQ->swork[AQ_SWK_10 + i3] == 0)) {
Math_SmoothStepToF(&D_i3_801C4308[52 + i3], 1.0f, 0.1f, 0.5f, 0.0f); Math_SmoothStepToF(&D_i3_801C4308[52 + i3], 1.0f, 0.1f, 0.5f, 0.0f);
@ -3673,7 +3673,7 @@ void Aquas_801B50E8(Actor* actor) {
} }
actor->health = 0; actor->health = 0;
actor->state = 7; actor->state = 7;
func_effect_8007A6F0(&actor->obj.pos, 0x29038090); func_effect_8007A6F0(&actor->obj.pos, NA_SE_EN_AC_ZAKO_DOWN);
} }
switch (actor->state) { switch (actor->state) {
@ -3998,8 +3998,8 @@ void Aquas_801B638C(Actor* actor) {
Actor_Despawn(actor); Actor_Despawn(actor);
Object_Kill(&actor->obj, actor->sfxSource); Object_Kill(&actor->obj, actor->sfxSource);
AUDIO_PLAY_SFX(0x1903001D, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OB_MINI_BOMB, actor->sfxSource, 4);
func_effect_8007A6F0(&actor->obj.pos, 0x29038090); func_effect_8007A6F0(&actor->obj.pos, NA_SE_EN_AC_ZAKO_DOWN);
} }
actor->fwork[5] = (actor->obj.pos.y * 0.01f) + 2.5f; actor->fwork[5] = (actor->obj.pos.y * 0.01f) + 2.5f;
@ -4120,7 +4120,7 @@ void Aquas_801B638C(Actor* actor) {
if ((actor->health != 0) && (actor->dmgPart == 0)) { if ((actor->health != 0) && (actor->dmgPart == 0)) {
actor->health -= actor->damage; actor->health -= actor->damage;
actor->timer_0C6 = 30; actor->timer_0C6 = 30;
AUDIO_PLAY_SFX(0x2903408F, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_AC_ZAKO_DAMAGE, actor->sfxSource, 4);
if (actor->health <= 0) { if (actor->health <= 0) {
actor->health = 0; actor->health = 0;
BonusText_Display(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z + 200.0f, 3); BonusText_Display(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z + 200.0f, 3);
@ -4173,7 +4173,7 @@ void Aquas_801B6FF8(Actor* actor) {
func_effect_8007D0E0(actor->vwork[i].x, actor->vwork[i].y, actor->vwork[i].z + 100.0f, 6.0f); func_effect_8007D0E0(actor->vwork[i].x, actor->vwork[i].y, actor->vwork[i].z + 100.0f, 6.0f);
} }
Object_Kill(&actor->obj, actor->sfxSource); Object_Kill(&actor->obj, actor->sfxSource);
func_effect_8007A6F0(&actor->obj.pos, 0x29038090); func_effect_8007A6F0(&actor->obj.pos, NA_SE_EN_AC_ZAKO_DOWN);
} }
switch (actor->state) { switch (actor->state) {
@ -4255,7 +4255,7 @@ void Aquas_801B6FF8(Actor* actor) {
actor->hitPos.y + RAND_FLOAT_CENTERED(70.0f), actor->hitPos.y + RAND_FLOAT_CENTERED(70.0f),
actor->hitPos.z + RAND_FLOAT_CENTERED(70.0f), 1.0f, 1); actor->hitPos.z + RAND_FLOAT_CENTERED(70.0f), 1.0f, 1);
} }
AUDIO_PLAY_SFX(0x2903408F, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_AC_ZAKO_DAMAGE, actor->sfxSource, 4);
if (actor->health <= -100) { if (actor->health <= -100) {
actor->health = -100; actor->health = -100;
BonusText_Display(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z + 200.0f, 3); BonusText_Display(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z + 200.0f, 3);
@ -4419,7 +4419,7 @@ void Aquas_801B7C78(Actor* actor) {
actor->itemDrop = DROP_SILVER_RING_25p; actor->itemDrop = DROP_SILVER_RING_25p;
Actor_Despawn(actor); Actor_Despawn(actor);
Object_Kill(&actor->obj, actor->sfxSource); Object_Kill(&actor->obj, actor->sfxSource);
func_effect_8007A6F0(&actor->obj.pos, 0x29038090); func_effect_8007A6F0(&actor->obj.pos, NA_SE_EN_AC_ZAKO_DOWN);
} }
if (actor->state != 6) { if (actor->state != 6) {
@ -4508,7 +4508,7 @@ void Aquas_801B7C78(Actor* actor) {
1; 1;
} }
actor->timer_0C0 = 10; actor->timer_0C0 = 10;
AUDIO_PLAY_SFX(0x2900208D, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_WT_SPARK_CHARGE, actor->sfxSource, 4);
actor->state = 4; actor->state = 4;
} }
break; break;
@ -4552,7 +4552,7 @@ void Aquas_801B7C78(Actor* actor) {
effect->unk_44 = 2; effect->unk_44 = 2;
effect->timer_50 = 100; effect->timer_50 = 100;
actor->iwork[3] = 0; actor->iwork[3] = 0;
AUDIO_PLAY_SFX(0x2900308C, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_WT_THROW, actor->sfxSource, 4);
} else { } else {
effect->obj.pos.x = actor->vwork[21].x; effect->obj.pos.x = actor->vwork[21].x;
effect->obj.pos.y = actor->vwork[21].y; effect->obj.pos.y = actor->vwork[21].y;
@ -4668,7 +4668,7 @@ void Aquas_801B7C78(Actor* actor) {
actor->info.bonus = 1; actor->info.bonus = 1;
actor->timer_0C6 = 30; actor->timer_0C6 = 30;
actor->health -= actor->damage; actor->health -= actor->damage;
AUDIO_PLAY_SFX(0x2903408F, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_AC_ZAKO_DAMAGE, actor->sfxSource, 4);
} else { } else {
actor->timer_0BC = 50; actor->timer_0BC = 50;
} }
@ -4834,7 +4834,7 @@ void Aquas_801B91A4(Actor* actor) {
func_effect_800815DC(); func_effect_800815DC();
func_effect_8007D0E0(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 5.0f); func_effect_8007D0E0(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 5.0f);
func_effect_8007A6F0(&actor->obj.pos, 0x29038090); func_effect_8007A6F0(&actor->obj.pos, NA_SE_EN_AC_ZAKO_DOWN);
} }
switch (actor->state) { switch (actor->state) {
@ -4963,7 +4963,7 @@ void Aquas_801B91A4(Actor* actor) {
if ((actor->health != 0) && (actor->state != 0)) { if ((actor->health != 0) && (actor->state != 0)) {
actor->timer_0C6 = 15; actor->timer_0C6 = 15;
actor->health -= actor->damage; actor->health -= actor->damage;
AUDIO_PLAY_SFX(0x2903408F, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_AC_ZAKO_DAMAGE, actor->sfxSource, 4);
if (actor->health <= 0) { if (actor->health <= 0) {
actor->health = 0; actor->health = 0;
if (actor->scale > 1.0f) { if (actor->scale > 1.0f) {
@ -5167,7 +5167,7 @@ void Aquas_801BA6A4(Actor* actor) {
actor->vel.x = SIN_DEG(actor->fwork[1]) * 10.0f; actor->vel.x = SIN_DEG(actor->fwork[1]) * 10.0f;
if (actor->obj.pos.y < (gGroundHeight + 30.0f)) { if (actor->obj.pos.y < (gGroundHeight + 30.0f)) {
AUDIO_PLAY_SFX(0x19400007, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OB_AC_ROCK_BOUND, actor->sfxSource, 4);
actor->iwork[1] = 1; actor->iwork[1] = 1;
actor->vel.x = actor->vel.y = actor->vel.z = 0.0f; actor->vel.x = actor->vel.y = actor->vel.z = 0.0f;
actor->gravity = 0.0f; actor->gravity = 0.0f;
@ -5196,7 +5196,7 @@ void Aquas_801BA6A4(Actor* actor) {
actor->vel.y = 0.0f; actor->vel.y = 0.0f;
} }
actor->iwork[1] = 1; actor->iwork[1] = 1;
AUDIO_PLAY_SFX(0x19400007, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OB_AC_ROCK_BOUND, actor->sfxSource, 4);
func_effect_8007B8F8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z + 100.0f, func_effect_8007B8F8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z + 100.0f,
actor->scale * 30.0f); actor->scale * 30.0f);
} }
@ -5245,7 +5245,7 @@ void Aquas_801BA6A4(Actor* actor) {
func_effect_8007BC7C(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z + 130.0f, actor->scale * 30.0f); func_effect_8007BC7C(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z + 130.0f, actor->scale * 30.0f);
func_effect_8007BC7C(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z + 130.0f, actor->scale * 30.0f); func_effect_8007BC7C(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z + 130.0f, actor->scale * 30.0f);
Object_Kill(&actor->obj, actor->sfxSource); Object_Kill(&actor->obj, actor->sfxSource);
func_effect_8007A6F0(&actor->obj.pos, 0x2903A008); func_effect_8007A6F0(&actor->obj.pos, NA_SE_EN_EXPLOSION_S);
} }
} }
} }
@ -5552,7 +5552,7 @@ void Aquas_801BB79C(Actor* actor) {
} }
} }
if (((gGameFrameCount % 8) == 0)) { if (((gGameFrameCount % 8) == 0)) {
func_effect_8007A6F0(&sp70->obj.pos, 0x3100208E); func_effect_8007A6F0(&sp70->obj.pos, NA_SE_EN_WT_SPARK_BEAM);
} }
Aquas_801A92EC(actor, sp70->obj.pos.x, sp70->obj.pos.y, sp70->obj.pos.z, actor->iwork[13], i); Aquas_801A92EC(actor, sp70->obj.pos.x, sp70->obj.pos.y, sp70->obj.pos.z, actor->iwork[13], i);
@ -5586,7 +5586,7 @@ void Aquas_801BB79C(Actor* actor) {
} }
} }
if (((gGameFrameCount % 4) == 0)) { if (((gGameFrameCount % 4) == 0)) {
func_effect_8007A6F0(&sp6C->obj.pos, 0x3100208E); func_effect_8007A6F0(&sp6C->obj.pos, NA_SE_EN_WT_SPARK_BEAM);
} }
Aquas_801A92EC(actor, sp6C->obj.pos.x, sp6C->obj.pos.y, sp6C->obj.pos.z, actor->iwork[13] + 1, i); Aquas_801A92EC(actor, sp6C->obj.pos.x, sp6C->obj.pos.y, sp6C->obj.pos.z, actor->iwork[13] + 1, i);
@ -5621,7 +5621,7 @@ void Aquas_801BB79C(Actor* actor) {
} }
} }
if (((gGameFrameCount % 16) == 0)) { if (((gGameFrameCount % 16) == 0)) {
func_effect_8007A6F0(&sp70->obj.pos, 0x3100208E); func_effect_8007A6F0(&sp70->obj.pos, NA_SE_EN_WT_SPARK_BEAM);
} }
Aquas_801A92EC(actor, sp70->obj.pos.x, sp70->obj.pos.y, sp70->obj.pos.z, actor->iwork[13] + 2, i); Aquas_801A92EC(actor, sp70->obj.pos.x, sp70->obj.pos.y, sp70->obj.pos.z, actor->iwork[13] + 2, i);
@ -5740,7 +5740,7 @@ void Aquas_801BB79C(Actor* actor) {
if (actor->dmgType != DMG_NONE) { if (actor->dmgType != DMG_NONE) {
actor->dmgType = DMG_NONE; actor->dmgType = DMG_NONE;
AUDIO_PLAY_SFX(0x2903408F, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_AC_ZAKO_DAMAGE, actor->sfxSource, 4);
if (actor->damage != 31) { if (actor->damage != 31) {
actor->timer_0C0 = actor->timer_0C6 = 40; actor->timer_0C0 = actor->timer_0C6 = 40;
} else { } else {
@ -5886,7 +5886,7 @@ void Aquas_801BC9A0(Actor* actor) {
actor->dmgType = DMG_NONE; actor->dmgType = DMG_NONE;
if ((actor->health != 0) && (actor->iwork[3] == 0) && (actor->damage == 31)) { if ((actor->health != 0) && (actor->iwork[3] == 0) && (actor->damage == 31)) {
actor->health -= actor->damage; actor->health -= actor->damage;
AUDIO_PLAY_SFX(0x2903B009, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_EXPLOSION_M, actor->sfxSource, 4);
if (actor->health <= 0) { if (actor->health <= 0) {
actor->health = 0; actor->health = 0;
actor->state = 3; actor->state = 3;
@ -5965,7 +5965,7 @@ void Aquas_801BC9A0(Actor* actor) {
actor->itemDrop = D_i3_801C04C4[actor->iwork[1]]; actor->itemDrop = D_i3_801C04C4[actor->iwork[1]];
Actor_Despawn(actor); Actor_Despawn(actor);
Object_Kill(&actor->obj, actor->sfxSource); Object_Kill(&actor->obj, actor->sfxSource);
func_effect_8007A6F0(&actor->obj.pos, 0x19021078); func_effect_8007A6F0(&actor->obj.pos, NA_SE_OB_AC_PILLAR_BROKE);
} }
break; break;
@ -5981,7 +5981,7 @@ void Aquas_801BC9A0(Actor* actor) {
if ((actor->obj.pos.y < (gGroundHeight + 30.0f)) && (actor->iwork[2] == 0)) { if ((actor->obj.pos.y < (gGroundHeight + 30.0f)) && (actor->iwork[2] == 0)) {
actor->iwork[2] = 1; actor->iwork[2] = 1;
actor->vel.x = actor->vel.y = actor->vel.z = actor->gravity = 0.0f; actor->vel.x = actor->vel.y = actor->vel.z = actor->gravity = 0.0f;
func_effect_8007A6F0(&actor->obj.pos, 0x19400007); func_effect_8007A6F0(&actor->obj.pos, NA_SE_OB_AC_ROCK_BOUND);
for (j = 0; j < 6; j++) { for (j = 0; j < 6; j++) {
func_effect_8007B8F8(actor->obj.pos.x + RAND_FLOAT_CENTERED(100.0f), func_effect_8007B8F8(actor->obj.pos.x + RAND_FLOAT_CENTERED(100.0f),
actor->obj.pos.y + RAND_RANGE(-9.0f, 21.0f), actor->obj.pos.y + RAND_RANGE(-9.0f, 21.0f),
@ -6086,7 +6086,7 @@ void Aquas_801BD54C(Actor* actor) {
if (fabsf(actor->fwork[5] - actor->obj.pos.z) >= var_fs0) { if (fabsf(actor->fwork[5] - actor->obj.pos.z) >= var_fs0) {
actor->state = 3; actor->state = 3;
if (actor->iwork[0] == 0) { if (actor->iwork[0] == 0) {
AUDIO_PLAY_SFX(0x19400077, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OB_FISH_AWAY, actor->sfxSource, 4);
} }
} else { } else {
// needed to match // needed to match

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

@ -253,7 +253,7 @@ void Solar_8019EA7C(Actor* actor) {
if ((actor->unk_046 == 0) || (actor->unk_046 == 1)) { if ((actor->unk_046 == 0) || (actor->unk_046 == 1)) {
actor->unk_046 = 3; actor->unk_046 = 3;
func_edisplay_8005F0E8(actor->sfxSource, &actor->obj.pos); func_edisplay_8005F0E8(actor->sfxSource, &actor->obj.pos);
AUDIO_PLAY_SFX(0x11002052, actor->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_OB_MAGMA_WAVE, actor->sfxSource, 0);
} }
if (func_play_800A73E4(&sp34, &sp30, actor->obj.pos.x, -100.0f, actor->obj.pos.z)) { if (func_play_800A73E4(&sp34, &sp30, actor->obj.pos.x, -100.0f, actor->obj.pos.z)) {
D_ctx_801782EC[sp30] = actor->fwork[0]; D_ctx_801782EC[sp30] = actor->fwork[0];
@ -295,7 +295,7 @@ void Solar_8019EA7C(Actor* actor) {
} }
switch (actor->dmgType) { switch (actor->dmgType) {
case 3: case 3:
Solar_801A8DB8(&actor->obj.pos, 0x11002052, actor->vel.z); Solar_801A8DB8(&actor->obj.pos, NA_SE_OB_MAGMA_WAVE, actor->vel.z);
/* fallthrough */ /* fallthrough */
case 2: case 2:
Object_Kill(&actor->obj, actor->sfxSource); Object_Kill(&actor->obj, actor->sfxSource);
@ -307,23 +307,30 @@ void Solar_8019EF30(Actor* actor, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yV
Actor_Initialize(actor); Actor_Initialize(actor);
actor->obj.status = OBJ_ACTIVE; actor->obj.status = OBJ_ACTIVE;
actor->obj.id = OBJ_ACTOR_275; actor->obj.id = OBJ_ACTOR_275;
if (Rand_ZeroOne() < 0.1f) { if (Rand_ZeroOne() < 0.1f) {
actor->obj.id = OBJ_ACTOR_276; actor->obj.id = OBJ_ACTOR_276;
} }
actor->obj.pos.x = xPos; actor->obj.pos.x = xPos;
actor->obj.pos.y = yPos; actor->obj.pos.y = yPos;
actor->obj.pos.z = zPos; actor->obj.pos.z = zPos;
actor->unk_0F4.x = RAND_FLOAT(360.0f); actor->unk_0F4.x = RAND_FLOAT(360.0f);
actor->vel.x = xVel; actor->vel.x = xVel;
actor->vel.y = yVel; actor->vel.y = yVel;
actor->vel.z = zVel; actor->vel.z = zVel;
actor->state = 2; actor->state = 2;
actor->timer_0C2 = 8; actor->timer_0C2 = 8;
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
if (gBossActive != 0) { if (gBossActive != 0) {
actor->info.bonus = 0; actor->info.bonus = 0;
} }
AUDIO_PLAY_SFX(0x29000071, actor->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_OB_SNROCK_APPEAR, actor->sfxSource, 0);
} }
void Solar_8019F038(f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel) { void Solar_8019F038(f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel) {
@ -354,7 +361,7 @@ void Solar_8019F0B0(Actor* actor, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yV
if (gBossActive != 0) { if (gBossActive != 0) {
actor->info.bonus = 0; actor->info.bonus = 0;
} }
AUDIO_PLAY_SFX(0x29000071, actor->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_OB_SNROCK_APPEAR, actor->sfxSource, 0);
} }
void Solar_8019F194(f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel) { void Solar_8019F194(f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel) {
@ -419,13 +426,13 @@ void Solar_8019F20C(Actor* actor) {
RAND_FLOAT(10.0f) + 10.0f, 0.0f, actor->scale * 5.0f, 1); RAND_FLOAT(10.0f) + 10.0f, 0.0f, actor->scale * 5.0f, 1);
} }
actor->timer_0C2 = 5; actor->timer_0C2 = 5;
AUDIO_PLAY_SFX(0x29000071, actor->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_OB_SNROCK_APPEAR, actor->sfxSource, 0);
break; break;
case 2: case 2:
actor->gravity = 0.5f; actor->gravity = 0.5f;
if (func_play_800A73E4(&sp8C, &sp88, actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z)) { if (func_play_800A73E4(&sp8C, &sp88, actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z)) {
Object_Kill(&actor->obj, actor->sfxSource); Object_Kill(&actor->obj, actor->sfxSource);
func_effect_8007A6F0(&actor->obj.pos, 0x29000072); func_effect_8007A6F0(&actor->obj.pos, NA_SE_OB_SNROCK_DISAPPEAR);
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
Solar_8019E9F4(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, D_i3_801BF8E0[i], Solar_8019E9F4(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, D_i3_801BF8E0[i],
RAND_FLOAT(10.0f) + 10.0f, 0.0f, actor->scale * 5.0f, 1); RAND_FLOAT(10.0f) + 10.0f, 0.0f, actor->scale * 5.0f, 1);
@ -462,7 +469,7 @@ void Solar_8019F20C(Actor* actor) {
Solar_8019E9F4(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, RAND_FLOAT_CENTERED(30.0f), Solar_8019E9F4(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, RAND_FLOAT_CENTERED(30.0f),
RAND_FLOAT_CENTERED(30.0f), 0.0f, (RAND_FLOAT(2.0f) + 2.0f) * actor->scale, 1); RAND_FLOAT_CENTERED(30.0f), 0.0f, (RAND_FLOAT(2.0f) + 2.0f) * actor->scale, 1);
} }
func_effect_8007A6F0(&actor->obj.pos, 0x2903A008); func_effect_8007A6F0(&actor->obj.pos, NA_SE_EN_EXPLOSION_S);
} }
break; break;
} }
@ -659,7 +666,7 @@ void Solar_801A003C(Actor* actor) {
actor->timer_0BE = 50; actor->timer_0BE = 50;
actor->unk_04E = 0; actor->unk_04E = 0;
func_edisplay_8005F0E8(actor->sfxSource, &actor->obj.pos); func_edisplay_8005F0E8(actor->sfxSource, &actor->obj.pos);
AUDIO_PLAY_SFX(0x19035053, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_OUT_PROMINENCE, actor->sfxSource, 4);
} }
break; break;
} }
@ -700,7 +707,7 @@ void Solar_801A0120(Effect* effect) {
if (func_play_800A73E4(&sp5C, &sp4C, effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z)) { if (func_play_800A73E4(&sp5C, &sp4C, effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z)) {
effect->unk_48 = 1; effect->unk_48 = 1;
if (effect->scale2 == 20.0f) { if (effect->scale2 == 20.0f) {
AUDIO_PLAY_SFX(0x19035054, effect->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_IN_PROMINENCE, effect->sfxSource, 4);
} }
} else { } else {
effect->unk_48 = 0; effect->unk_48 = 0;
@ -771,7 +778,7 @@ void Solar_801A0120(Effect* effect) {
if (func_play_800A73E4(&sp5C, &sp4C, effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z)) { if (func_play_800A73E4(&sp5C, &sp4C, effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z)) {
effect->unk_48 = 1; effect->unk_48 = 1;
if (effect->scale2 == 20.0f) { if (effect->scale2 == 20.0f) {
AUDIO_PLAY_SFX(0x19035054, effect->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_IN_PROMINENCE, effect->sfxSource, 4);
} }
} else { } else {
effect->unk_48 = 0; effect->unk_48 = 0;
@ -801,12 +808,12 @@ void Solar_801A0120(Effect* effect) {
if (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_LEVEL_COMPLETE) { if (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_LEVEL_COMPLETE) {
func_effect_8007A774(&gPlayer[0], effect, effect->scale2 * 18.0f); func_effect_8007A774(&gPlayer[0], effect, effect->scale2 * 18.0f);
if ((effect->unk_4C == 0) && ((effect->scale2 >= 9.8f) || (effect->scale2 <= 4.4f))) { if ((effect->unk_4C == 0) && ((effect->scale2 >= 9.8f) || (effect->scale2 <= 4.4f))) {
AUDIO_PLAY_SFX(0x31033078, effect->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_SNBOSS_BREATH, effect->sfxSource, 4);
} }
} else { } else {
effect->vel.z += 65.0f; effect->vel.z += 65.0f;
if (fabsf(gBosses[0].obj.pos.z - effect->obj.pos.z) >= 2000.0f) { if (fabsf(gBosses[0].obj.pos.z - effect->obj.pos.z) >= 2000.0f) {
Audio_KillSfxBySourceAndId(effect->sfxSource, 0x31033078); Audio_KillSfxBySourceAndId(effect->sfxSource, NA_SE_EN_SNBOSS_BREATH);
} }
} }
break; break;
@ -825,10 +832,10 @@ void Solar_801A0120(Effect* effect) {
if (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_LEVEL_COMPLETE) { if (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_LEVEL_COMPLETE) {
func_effect_8007A774(&gPlayer[0], effect, effect->scale2 * 18.0f); func_effect_8007A774(&gPlayer[0], effect, effect->scale2 * 18.0f);
if ((effect->unk_4C == 0) && ((effect->scale2 >= 9.8f) || (effect->scale2 <= 4.4f))) { if ((effect->unk_4C == 0) && ((effect->scale2 >= 9.8f) || (effect->scale2 <= 4.4f))) {
AUDIO_PLAY_SFX(0x31033078, effect->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_SNBOSS_BREATH, effect->sfxSource, 4);
} }
} else if (fabsf(gBosses[0].obj.pos.z - effect->obj.pos.z) >= 2000.0f) { } else if (fabsf(gBosses[0].obj.pos.z - effect->obj.pos.z) >= 2000.0f) {
Audio_KillSfxBySourceAndId(effect->sfxSource, 0x31033078); Audio_KillSfxBySourceAndId(effect->sfxSource, NA_SE_EN_SNBOSS_BREATH);
} }
break; break;
} }
@ -930,7 +937,7 @@ void Solar_801A0DF8(f32 xPos, f32 zPos, f32 yRot, s32 index, f32 yPos) {
gActors[sp2C].unk_04E = 0; gActors[sp2C].unk_04E = 0;
gActors[sp2C].obj.pos.y = -1.0f * yPos; gActors[sp2C].obj.pos.y = -1.0f * yPos;
func_edisplay_8005F0E8(gActors[sp2C].sfxSource, &gActors[sp2C].obj.pos); func_edisplay_8005F0E8(gActors[sp2C].sfxSource, &gActors[sp2C].obj.pos);
AUDIO_PLAY_SFX(0x19035053, gActors[sp2C].sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_OUT_PROMINENCE, gActors[sp2C].sfxSource, 4);
} }
} }
@ -949,7 +956,7 @@ void Solar_801A0FD4(Actor* actor, s32 index) {
actor->obj.rot.x = 0.0f; actor->obj.rot.x = 0.0f;
actor->obj.rot.y = 180.0f; actor->obj.rot.y = 180.0f;
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
AUDIO_PLAY_SFX(0x3100000C, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_ARWING_ENGINE_FG, actor->sfxSource, 4);
} }
} }
@ -988,7 +995,7 @@ void Solar_LevelStart(Player* player) {
gFillScreenAlpha = 255; gFillScreenAlpha = 255;
gFillScreenAlphaTarget = 0; gFillScreenAlphaTarget = 0;
Solar_801A0DF8(-750.0f, -2600.0f, 300.0f, 2, 1.0f); Solar_801A0DF8(-750.0f, -2600.0f, 300.0f, 2, 1.0f);
AUDIO_PLAY_SFX(0x3140807E, player->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_OB_MAGMA_BUBBLE, player->sfxSource, 0);
break; break;
case 1: case 1:
gPathTexScroll += 30.0f; gPathTexScroll += 30.0f;
@ -1048,7 +1055,7 @@ void Solar_LevelStart(Player* player) {
Solar_801A0FD4(&gActors[2], 2); Solar_801A0FD4(&gActors[2], 2);
gCsCamAtZ = -3000.0f; gCsCamAtZ = -3000.0f;
gCsCamEyeZ = -3400.0f; gCsCamEyeZ = -3400.0f;
Audio_KillSfxBySourceAndId(player->sfxSource, 0x3140807E); Audio_KillSfxBySourceAndId(player->sfxSource, NA_SE_OB_MAGMA_BUBBLE);
AUDIO_PLAY_BGM(SEQ_ID_INTRO_51); AUDIO_PLAY_BGM(SEQ_ID_INTRO_51);
func_display_80057814(player); func_display_80057814(player);
Audio_StartPlayerNoise(gPlayerNum); Audio_StartPlayerNoise(gPlayerNum);
@ -1083,7 +1090,7 @@ void Solar_LevelStart(Player* player) {
RAND_FLOAT_CENTERED(2000.0f) + 500.0f + gPathProgress, RAND_FLOAT(20.0f) + 20.0f); RAND_FLOAT_CENTERED(2000.0f) + 500.0f + gPathProgress, RAND_FLOAT(20.0f) + 20.0f);
} }
if (gCsFrameCount == 615) { if (gCsFrameCount == 615) {
func_play_800A6028(player->sfxSource, 0x09000002); func_play_800A6028(player->sfxSource, NA_SE_ARWING_BOOST);
gActors[0].fwork[29] = gActors[1].fwork[29] = gActors[2].fwork[29] = 5.0f; gActors[0].fwork[29] = gActors[1].fwork[29] = gActors[2].fwork[29] = 5.0f;
gActors[0].state = 3; gActors[0].state = 3;
gActors[1].state = 2; gActors[1].state = 2;
@ -1129,7 +1136,7 @@ void Solar_LevelStart(Player* player) {
D_ctx_80177950 = 1.0f; D_ctx_80177950 = 1.0f;
Audio_SetHeatAlarmParams(255, 3); Audio_SetHeatAlarmParams(255, 3);
AUDIO_PLAY_SFX(0x4100C023, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OVERHEAT_ALARM, gDefaultSfxSource, 4);
gLoadLevelObjects = 1; gLoadLevelObjects = 1;
gFillScreenAlphaTarget = 0; gFillScreenAlphaTarget = 0;
player->csTimer = 15; player->csTimer = 15;
@ -1263,7 +1270,7 @@ void Solar_801A1F80(Boss* bossSO) {
} }
if (gBossFrameCount == 60) { if (gBossFrameCount == 60) {
gActors[10].dmgType = DMG_COLLISION; gActors[10].dmgType = DMG_COLLISION;
AUDIO_PLAY_SFX(0x19036053, bossSO->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_OUT_MAGMA, bossSO->sfxSource, 4);
} }
if (bossSO->timer_050 == 100) { if (bossSO->timer_050 == 100) {
bossSO->unk_04C = 0; bossSO->unk_04C = 0;
@ -1324,10 +1331,10 @@ void Solar_801A23F4(Boss* bossSO) {
} }
if (bossSO->unk_04C == 29) { if (bossSO->unk_04C == 29) {
func_edisplay_8005F0E8(bossSO->sfxSource, &bossSO->obj.pos); func_edisplay_8005F0E8(bossSO->sfxSource, &bossSO->obj.pos);
AUDIO_PLAY_SFX(0x19035053, bossSO->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_OUT_PROMINENCE, bossSO->sfxSource, 4);
} }
if (bossSO->unk_04C == 80) { if (bossSO->unk_04C == 80) {
AUDIO_PLAY_SFX(0x29432077, bossSO->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_SNBOSS_SWING, bossSO->sfxSource, 4);
} }
if (bossSO->unk_04C >= 94) { if (bossSO->unk_04C >= 94) {
bossSO->info.hitbox[38] = 220.0f; bossSO->info.hitbox[38] = 220.0f;
@ -1351,10 +1358,10 @@ void Solar_801A23F4(Boss* bossSO) {
} }
if (bossSO->unk_04C == 10) { if (bossSO->unk_04C == 10) {
func_edisplay_8005F0E8(bossSO->sfxSource, &bossSO->obj.pos); func_edisplay_8005F0E8(bossSO->sfxSource, &bossSO->obj.pos);
AUDIO_PLAY_SFX(0x19035053, bossSO->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_OUT_PROMINENCE, bossSO->sfxSource, 4);
} }
if (bossSO->unk_04C == 50) { if (bossSO->unk_04C == 50) {
AUDIO_PLAY_SFX(0x29432077, bossSO->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_SNBOSS_SWING, bossSO->sfxSource, 4);
} }
if (bossSO->unk_04C >= 85) { if (bossSO->unk_04C >= 85) {
bossSO->info.hitbox[20] = 220.0f; bossSO->info.hitbox[20] = 220.0f;
@ -1404,10 +1411,10 @@ void Solar_801A23F4(Boss* bossSO) {
} }
if (bossSO->obj.rot.y >= 360.0f) { if (bossSO->obj.rot.y >= 360.0f) {
bossSO->obj.rot.y -= 360.0f; bossSO->obj.rot.y -= 360.0f;
AUDIO_PLAY_SFX(0x39033079, bossSO->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_SNBOSS_ROLL, bossSO->sfxSource, 4);
} }
if (bossSO->unk_04C == 1) { if (bossSO->unk_04C == 1) {
AUDIO_PLAY_SFX(0x39033079, bossSO->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_SNBOSS_ROLL, bossSO->sfxSource, 4);
} }
if (bossSO->unk_04C >= 100) { if (bossSO->unk_04C >= 100) {
Math_SmoothStepToAngle(&bossSO->obj.rot.y, 0.0f, 1.0f, 2.0f, 1.0f); Math_SmoothStepToAngle(&bossSO->obj.rot.y, 0.0f, 1.0f, 2.0f, 1.0f);
@ -1443,10 +1450,10 @@ void Solar_801A23F4(Boss* bossSO) {
} }
if (bossSO->unk_04C == 5) { if (bossSO->unk_04C == 5) {
func_edisplay_8005F0E8(bossSO->sfxSource, &bossSO->obj.pos); func_edisplay_8005F0E8(bossSO->sfxSource, &bossSO->obj.pos);
AUDIO_PLAY_SFX(0x19035053, bossSO->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_OUT_PROMINENCE, bossSO->sfxSource, 4);
} }
if (bossSO->unk_04C == 20) { if (bossSO->unk_04C == 20) {
AUDIO_PLAY_SFX(0x29432077, bossSO->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_SNBOSS_SWING, bossSO->sfxSource, 4);
} }
if (bossSO->unk_04C > 36) { if (bossSO->unk_04C > 36) {
bossSO->info.hitbox[20] = 220.0f; bossSO->info.hitbox[20] = 220.0f;
@ -1494,7 +1501,7 @@ void Solar_801A2C98(Boss* bossSO) {
} }
if (bossSO->unk_04C == 20) { if (bossSO->unk_04C == 20) {
gActors[10].dmgType = DMG_COLLISION; gActors[10].dmgType = DMG_COLLISION;
AUDIO_PLAY_SFX(0x19036054, bossSO->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_IN_MAGMA, bossSO->sfxSource, 4);
} }
if (bossSO->unk_04C == 0) { if (bossSO->unk_04C == 0) {
bossSO->state++; bossSO->state++;
@ -1528,7 +1535,7 @@ void Solar_801A2C98(Boss* bossSO) {
} }
if (bossSO->swork[SO_SWK_11] == 50) { if (bossSO->swork[SO_SWK_11] == 50) {
gActors[9].dmgType = DMG_COLLISION; gActors[9].dmgType = DMG_COLLISION;
AUDIO_PLAY_SFX(0x19036053, bossSO->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_OUT_MAGMA, bossSO->sfxSource, 4);
} }
} }
} }
@ -1555,7 +1562,7 @@ void Solar_801A3128(Boss* bossSO) {
} }
if (bossSO->unk_04C == 40) { if (bossSO->unk_04C == 40) {
gActors[10].dmgType = DMG_COLLISION; gActors[10].dmgType = DMG_COLLISION;
AUDIO_PLAY_SFX(0x19036054, bossSO->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_IN_MAGMA, bossSO->sfxSource, 4);
} }
if (bossSO->unk_04C == 0) { if (bossSO->unk_04C == 0) {
bossSO->state++; bossSO->state++;
@ -1605,7 +1612,7 @@ void Solar_801A3128(Boss* bossSO) {
} }
if (bossSO->swork[SO_SWK_11] == 50) { if (bossSO->swork[SO_SWK_11] == 50) {
gActors[9].dmgType = DMG_COLLISION; gActors[9].dmgType = DMG_COLLISION;
AUDIO_PLAY_SFX(0x19036053, bossSO->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_OUT_MAGMA, bossSO->sfxSource, 4);
} }
} }
} }
@ -1647,10 +1654,10 @@ void Solar_801A3510(Boss* bossSO) {
} }
if (bossSO->unk_04C == 29) { if (bossSO->unk_04C == 29) {
func_edisplay_8005F0E8(bossSO->sfxSource, &bossSO->obj.pos); func_edisplay_8005F0E8(bossSO->sfxSource, &bossSO->obj.pos);
AUDIO_PLAY_SFX(0x19035053, bossSO->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_OUT_PROMINENCE, bossSO->sfxSource, 4);
} }
if (bossSO->unk_04C == 80) { if (bossSO->unk_04C == 80) {
AUDIO_PLAY_SFX(0x29432077, bossSO->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_SNBOSS_SWING, bossSO->sfxSource, 4);
} }
if (bossSO->unk_04C == 94) { if (bossSO->unk_04C == 94) {
Solar_801A0DF8(bossSO->fwork[SO_FWK_13], bossSO->fwork[SO_FWK_15], RAND_FLOAT_CENTERED(60.0f), 4, 2.0f); Solar_801A0DF8(bossSO->fwork[SO_FWK_13], bossSO->fwork[SO_FWK_15], RAND_FLOAT_CENTERED(60.0f), 4, 2.0f);
@ -1665,10 +1672,10 @@ void Solar_801A3510(Boss* bossSO) {
Math_SmoothStepToAngle(&bossSO->obj.rot.x, 20.0f, 0.1f, 10.0f, 0.1f); Math_SmoothStepToAngle(&bossSO->obj.rot.x, 20.0f, 0.1f, 10.0f, 0.1f);
if (bossSO->unk_04C == 10) { if (bossSO->unk_04C == 10) {
func_edisplay_8005F0E8(bossSO->sfxSource, &bossSO->obj.pos); func_edisplay_8005F0E8(bossSO->sfxSource, &bossSO->obj.pos);
AUDIO_PLAY_SFX(0x19035053, bossSO->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_OUT_PROMINENCE, bossSO->sfxSource, 4);
} }
if (bossSO->unk_04C == 50) { if (bossSO->unk_04C == 50) {
AUDIO_PLAY_SFX(0x29432077, bossSO->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_SNBOSS_SWING, bossSO->sfxSource, 4);
} }
if (bossSO->unk_04C == 60) { if (bossSO->unk_04C == 60) {
Solar_801A0D90(bossSO->obj.pos.x, bossSO->obj.pos.z + 1600.0f, 80.0f, 2); Solar_801A0D90(bossSO->obj.pos.x, bossSO->obj.pos.z + 1600.0f, 80.0f, 2);
@ -1696,7 +1703,7 @@ void Solar_801A3510(Boss* bossSO) {
break; break;
case 8: case 8:
if (bossSO->unk_04C == 65) { if (bossSO->unk_04C == 65) {
AUDIO_PLAY_SFX(0x31033078, bossSO->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_SNBOSS_BREATH, bossSO->sfxSource, 4);
bossSO->timer_050 = 30; bossSO->timer_050 = 30;
} }
if (bossSO->timer_050 != 0) { if (bossSO->timer_050 != 0) {
@ -1709,7 +1716,7 @@ void Solar_801A3510(Boss* bossSO) {
bossSO->fwork[SO_FWK_6] + 300.0f); bossSO->fwork[SO_FWK_6] + 300.0f);
} }
if (bossSO->unk_04C == 75) { if (bossSO->unk_04C == 75) {
Audio_KillSfxBySourceAndId(bossSO->sfxSource, 0x31033078); Audio_KillSfxBySourceAndId(bossSO->sfxSource, NA_SE_EN_SNBOSS_BREATH);
} }
if (bossSO->unk_04C == 99) { if (bossSO->unk_04C == 99) {
bossSO->swork[SO_SWK_1] = 5; bossSO->swork[SO_SWK_1] = 5;
@ -1719,7 +1726,7 @@ void Solar_801A3510(Boss* bossSO) {
case 9: case 9:
bossSO->unk_04C++; bossSO->unk_04C++;
if (bossSO->unk_04C == 66) { if (bossSO->unk_04C == 66) {
AUDIO_PLAY_SFX(0x31033078, bossSO->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_SNBOSS_BREATH, bossSO->sfxSource, 4);
bossSO->timer_050 = 30; bossSO->timer_050 = 30;
} }
if (bossSO->timer_050 != 0) { if (bossSO->timer_050 != 0) {
@ -1734,7 +1741,7 @@ void Solar_801A3510(Boss* bossSO) {
bossSO->fwork[SO_FWK_6] + 300.0f); bossSO->fwork[SO_FWK_6] + 300.0f);
} }
if (bossSO->unk_04C == 76) { if (bossSO->unk_04C == 76) {
Audio_KillSfxBySourceAndId(bossSO->sfxSource, 0x31033078); Audio_KillSfxBySourceAndId(bossSO->sfxSource, NA_SE_EN_SNBOSS_BREATH);
} }
if (bossSO->unk_04C >= 99) { if (bossSO->unk_04C >= 99) {
Solar_801A30CC(bossSO); Solar_801A30CC(bossSO);
@ -1760,13 +1767,13 @@ void Solar_801A3C4C(Boss* bossSO) {
bossSO->swork[SO_SWK_10] = 20; bossSO->swork[SO_SWK_10] = 20;
if (bossSO->health > 0.0f) { if (bossSO->health > 0.0f) {
AUDIO_PLAY_SFX(0x29433074, bossSO->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_SNBOSS_DAMAGE, bossSO->sfxSource, 4);
} }
if (bossSO) {} if (bossSO) {}
} }
bossSO->timer_058 = 20; bossSO->timer_058 = 20;
if ((bossSO->dmgPart >= 1) && (bossSO->dmgPart <= 3) && (bossSO->swork[SO_SWK_2] != 0)) { if ((bossSO->dmgPart >= 1) && (bossSO->dmgPart <= 3) && (bossSO->swork[SO_SWK_2] != 0)) {
AUDIO_PLAY_SFX(0x29433074, bossSO->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_SNBOSS_DAMAGE, bossSO->sfxSource, 4);
bossSO->swork[SO_SWK_2] -= bossSO->damage; bossSO->swork[SO_SWK_2] -= bossSO->damage;
if (bossSO->swork[SO_SWK_2] < 0) { if (bossSO->swork[SO_SWK_2] < 0) {
bossSO->swork[SO_SWK_2] = 0; bossSO->swork[SO_SWK_2] = 0;
@ -1782,7 +1789,7 @@ void Solar_801A3C4C(Boss* bossSO) {
} }
} }
if ((bossSO->dmgPart >= 4) && (bossSO->dmgPart <= 6) && (bossSO->swork[SO_SWK_3] != 0)) { if ((bossSO->dmgPart >= 4) && (bossSO->dmgPart <= 6) && (bossSO->swork[SO_SWK_3] != 0)) {
AUDIO_PLAY_SFX(0x29433074, bossSO->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_SNBOSS_DAMAGE, bossSO->sfxSource, 4);
bossSO->swork[SO_SWK_3] -= bossSO->damage; bossSO->swork[SO_SWK_3] -= bossSO->damage;
if (bossSO->swork[SO_SWK_3] < 0) { if (bossSO->swork[SO_SWK_3] < 0) {
bossSO->swork[SO_SWK_3] = 0; bossSO->swork[SO_SWK_3] = 0;
@ -1813,8 +1820,8 @@ void Solar_801A3C4C(Boss* bossSO) {
gControllerRumbleTimers[gMainController] = 10; gControllerRumbleTimers[gMainController] = 10;
SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 1); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 1);
SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 1); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 1);
Audio_KillSfxById(0x4100C023); Audio_KillSfxById(NA_SE_OVERHEAT_ALARM);
AUDIO_PLAY_SFX(0x2940D09A, bossSO->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_DOWN_IMPACT, bossSO->sfxSource, 4);
if (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_ACTIVE) { if (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_ACTIVE) {
gPlayer[0].state_1C8 = PLAYERSTATE_1C8_LEVEL_COMPLETE; gPlayer[0].state_1C8 = PLAYERSTATE_1C8_LEVEL_COMPLETE;
gPlayer[0].csTimer = 0; gPlayer[0].csTimer = 0;
@ -1875,7 +1882,7 @@ void Solar_801A4214(Boss* bossSO) {
bossSO->unk_04C = 50; bossSO->unk_04C = 50;
bossSO->state++; bossSO->state++;
gShowBossHealth = false; gShowBossHealth = false;
AUDIO_PLAY_SFX(0x39439076, bossSO->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_SNBOSS_DOWN, bossSO->sfxSource, 4);
Solar_801A1E14(bossSO->fwork[SO_FWK_4], bossSO->fwork[SO_FWK_5] + 300.0f, bossSO->fwork[SO_FWK_6], Solar_801A1E14(bossSO->fwork[SO_FWK_4], bossSO->fwork[SO_FWK_5] + 300.0f, bossSO->fwork[SO_FWK_6],
bossSO->fwork[SO_FWK_1], bossSO->fwork[SO_FWK_2], 73.0f, RAND_FLOAT_CENTERED(50.0f), bossSO->fwork[SO_FWK_1], bossSO->fwork[SO_FWK_2], 73.0f, RAND_FLOAT_CENTERED(50.0f),
80.0f, 40.0f, 8); 80.0f, 40.0f, 8);
@ -1938,7 +1945,7 @@ void Solar_801A4214(Boss* bossSO) {
D_i3_801C2768[13] = 0.0f; D_i3_801C2768[13] = 0.0f;
} }
if (gCsFrameCount == 230) { if (gCsFrameCount == 230) {
AUDIO_PLAY_SFX(0x2940F026, gActors[5].sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_STAR_EXPLOSION, gActors[5].sfxSource, 4);
D_ctx_801779A8[gMainController] = 120.0f; D_ctx_801779A8[gMainController] = 120.0f;
} }
if (gCsFrameCount == 250) { if (gCsFrameCount == 250) {
@ -1965,7 +1972,7 @@ void Solar_801A4214(Boss* bossSO) {
void Solar_801A48B8(Boss* bossSO) { void Solar_801A48B8(Boss* bossSO) {
s32 i; s32 i;
AUDIO_PLAY_SFX(0x29434075, bossSO->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_SNBOSS_BROKEN, bossSO->sfxSource, 4);
gControllerRumbleFlags[gMainController] = 1; gControllerRumbleFlags[gMainController] = 1;
gControllerRumbleTimers[gMainController] = 10; gControllerRumbleTimers[gMainController] = 10;
if (bossSO->swork[SO_SWK_0] != 6) { if (bossSO->swork[SO_SWK_0] != 6) {
@ -2020,11 +2027,11 @@ void Solar_801A4A34(Boss* bossSO) {
} }
switch (bossSO->unk_04C) { switch (bossSO->unk_04C) {
case 30: case 30:
AUDIO_PLAY_SFX(0x29433074, bossSO->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_SNBOSS_DAMAGE, bossSO->sfxSource, 4);
/* fallthrough */ /* fallthrough */
case 35: case 35:
case 97: case 97:
AUDIO_PLAY_SFX(0x29434075, bossSO->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_SNBOSS_BROKEN, bossSO->sfxSource, 4);
break; break;
} }
if (bossSO->unk_04C == 119) { if (bossSO->unk_04C == 119) {
@ -2064,13 +2071,13 @@ void Solar_801A4EF8(Boss* bossSO) {
bossSO->unk_04C = 56; bossSO->unk_04C = 56;
} }
if (bossSO->obj.rot.y == 0.0f) { if (bossSO->obj.rot.y == 0.0f) {
AUDIO_PLAY_SFX(0x39033079, bossSO->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_SNBOSS_ROLL, bossSO->sfxSource, 4);
} }
bossSO->fwork[SO_FWK_31] += 0.5f; bossSO->fwork[SO_FWK_31] += 0.5f;
bossSO->obj.rot.y += bossSO->fwork[SO_FWK_31]; bossSO->obj.rot.y += bossSO->fwork[SO_FWK_31];
if (bossSO->obj.rot.y >= 360.0f) { if (bossSO->obj.rot.y >= 360.0f) {
bossSO->obj.rot.y -= 360.0f; bossSO->obj.rot.y -= 360.0f;
AUDIO_PLAY_SFX(0x39033079, bossSO->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_SNBOSS_ROLL, bossSO->sfxSource, 4);
} }
bossSO->unk_078.y = bossSO->obj.rot.y; bossSO->unk_078.y = bossSO->obj.rot.y;
break; break;
@ -2079,7 +2086,7 @@ void Solar_801A4EF8(Boss* bossSO) {
bossSO->unk_04C = 56; bossSO->unk_04C = 56;
if (bossSO->obj.rot.y >= 360.0f) { if (bossSO->obj.rot.y >= 360.0f) {
bossSO->obj.rot.y -= 360.0f; bossSO->obj.rot.y -= 360.0f;
AUDIO_PLAY_SFX(0x39033079, bossSO->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_SNBOSS_ROLL, bossSO->sfxSource, 4);
} }
if (bossSO->swork[SO_SWK_11] <= 45) { if (bossSO->swork[SO_SWK_11] <= 45) {
Math_SmoothStepToF(&bossSO->obj.pos.y, -1000.0f, 0.1f, 20.0f, 0.1f); Math_SmoothStepToF(&bossSO->obj.pos.y, -1000.0f, 0.1f, 20.0f, 0.1f);
@ -2127,7 +2134,7 @@ void Solar_801A4EF8(Boss* bossSO) {
bossSO->unk_04C = 98; bossSO->unk_04C = 98;
bossSO->unk_078.y += bossSO->fwork[SO_FWK_31]; bossSO->unk_078.y += bossSO->fwork[SO_FWK_31];
if (bossSO->swork[SO_SWK_11] == 170) { if (bossSO->swork[SO_SWK_11] == 170) {
AUDIO_PLAY_SFX(0x29432073, bossSO->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_SNBOSS_CRY, bossSO->sfxSource, 4);
bossSO->obj.pos.y = -500.0f; bossSO->obj.pos.y = -500.0f;
gActors[9].dmgType = DMG_EXPLOSION; gActors[9].dmgType = DMG_EXPLOSION;
} }
@ -2373,7 +2380,7 @@ void Solar_801A5B3C(Boss* bossSO) {
case 0: case 0:
bossSO->unk_04C++; bossSO->unk_04C++;
if (bossSO->unk_04C == 75) { if (bossSO->unk_04C == 75) {
AUDIO_PLAY_SFX(0x29432073, bossSO->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_SNBOSS_CRY, bossSO->sfxSource, 4);
} }
if (bossSO->unk_04C >= Animation_GetFrameCount(&D_SO_601388C)) { if (bossSO->unk_04C >= Animation_GetFrameCount(&D_SO_601388C)) {
if (bossSO->health != 0) { if (bossSO->health != 0) {
@ -2419,7 +2426,7 @@ void Solar_801A5B3C(Boss* bossSO) {
case 9: case 9:
bossSO->unk_04C++; bossSO->unk_04C++;
if ((bossSO->unk_04C == 45) && (bossSO->health != 0)) { if ((bossSO->unk_04C == 45) && (bossSO->health != 0)) {
AUDIO_PLAY_SFX(0x29432073, bossSO->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_SNBOSS_CRY, bossSO->sfxSource, 4);
} }
if (bossSO->unk_04C >= Animation_GetFrameCount(&D_SO_6012C00)) { if (bossSO->unk_04C >= Animation_GetFrameCount(&D_SO_6012C00)) {
bossSO->unk_04C = 0; bossSO->unk_04C = 0;
@ -2476,7 +2483,7 @@ void Solar_801A5B3C(Boss* bossSO) {
Math_SmoothStepToVec3fArray(sp50, bossSO->vwork, 1, sp1BC, bossSO->fwork[SO_FWK_0], 100.0f, 0.0f); Math_SmoothStepToVec3fArray(sp50, bossSO->vwork, 1, sp1BC, bossSO->fwork[SO_FWK_0], 100.0f, 0.0f);
if ((bossSO->dmgType != DMG_NONE) && (bossSO->health > 0)) { if ((bossSO->dmgType != DMG_NONE) && (bossSO->health > 0)) {
bossSO->dmgType = DMG_NONE; bossSO->dmgType = DMG_NONE;
AUDIO_PLAY_SFX(0x29121007, bossSO->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_REFLECT, bossSO->sfxSource, 4);
if (!((bossSO->swork[SO_SWK_0] == 0) || (bossSO->swork[SO_SWK_0] == 2) || (bossSO->swork[SO_SWK_0] == 3) || if (!((bossSO->swork[SO_SWK_0] == 0) || (bossSO->swork[SO_SWK_0] == 2) || (bossSO->swork[SO_SWK_0] == 3) ||
(bossSO->swork[SO_SWK_0] == 6) || ((bossSO->swork[SO_SWK_0] == 7) && (bossSO->state == 2)))) { (bossSO->swork[SO_SWK_0] == 6) || ((bossSO->swork[SO_SWK_0] == 7) && (bossSO->state == 2)))) {
Solar_801A3C4C(bossSO); Solar_801A3C4C(bossSO);
@ -2796,7 +2803,7 @@ void Solar_801A7750(void) {
actor->state = 1; actor->state = 1;
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
actor->iwork[11] = 1; actor->iwork[11] = 1;
AUDIO_PLAY_SFX(0x3100000C, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_ARWING_ENGINE_FG, actor->sfxSource, 4);
} }
} }
@ -3079,7 +3086,7 @@ void Solar_LevelComplete(Player* player) {
gShowLevelClearStatusScreen = 0; gShowLevelClearStatusScreen = 0;
break; break;
case 1460: case 1460:
AUDIO_PLAY_SFX(0x09000002, player->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_ARWING_BOOST, player->sfxSource, 0);
player->unk_190 = player->unk_194 = 5.0f; player->unk_190 = player->unk_194 = 5.0f;
break; break;
case 1400: case 1400:
@ -3144,7 +3151,7 @@ void Solar_801A8BE8(Actor* actor) {
break; break;
case 2: case 2:
actor->state = 3; actor->state = 3;
AUDIO_PLAY_SFX(0x09000002, actor->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_ARWING_BOOST, actor->sfxSource, 0);
actor->fwork[29] = 5.0f; actor->fwork[29] = 5.0f;
/* fallthrough */ /* fallthrough */
case 3: case 3:

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

@ -648,7 +648,7 @@ void Zoness_801904CC(Actor* actor) {
Actor_Despawn(actor); Actor_Despawn(actor);
Object_Kill(&actor->obj, actor->sfxSource); Object_Kill(&actor->obj, actor->sfxSource);
func_effect_8007D0E0(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 4.0f); func_effect_8007D0E0(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 4.0f);
func_effect_8007A6F0(&actor->obj.pos, 0x29018036); func_effect_8007A6F0(&actor->obj.pos, NA_SE_EN_BIRD_DOWN);
break; break;
} }
actor->unk_0B6++; actor->unk_0B6++;
@ -660,7 +660,7 @@ void Zoness_801904CC(Actor* actor) {
if (actor->state > 0) { if (actor->state > 0) {
actor->timer_0C6 = 15; actor->timer_0C6 = 15;
actor->health -= actor->damage; actor->health -= actor->damage;
AUDIO_PLAY_SFX(0x29033037, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_BIRD_DAMAGE, actor->sfxSource, 4);
if (actor->health <= 0) { if (actor->health <= 0) {
actor->health = 0; actor->health = 0;
actor->state = 1; actor->state = 1;
@ -725,16 +725,16 @@ void Zoness_80190A00(Actor* actor) {
func_play_800A73E4(&sp2C, &sp28, actor->obj.pos.x, actor->obj.pos.y - 50.0f, actor->obj.pos.z)) { func_play_800A73E4(&sp2C, &sp28, actor->obj.pos.x, actor->obj.pos.y - 50.0f, actor->obj.pos.z)) {
func_effect_8008377C(actor->obj.pos.x, sp2C, actor->obj.pos.z + 150.0f, 0.0f, 1.7f); func_effect_8008377C(actor->obj.pos.x, sp2C, actor->obj.pos.z + 150.0f, 0.0f, 1.7f);
if (actor->vel.y >= 0.0f) { if (actor->vel.y >= 0.0f) {
AUDIO_PLAY_SFX(0x1983201A, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OUT_SPLASH_L, actor->sfxSource, 4);
} else { } else {
AUDIO_PLAY_SFX(0x19832019, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_IN_SPLASH_L, actor->sfxSource, 4);
} }
actor->timer_0C0 = 30; actor->timer_0C0 = 30;
} }
Zoness_80190790(actor); Zoness_80190790(actor);
if (actor->dmgType != DMG_NONE) { if (actor->dmgType != DMG_NONE) {
actor->dmgType = DMG_NONE; actor->dmgType = DMG_NONE;
AUDIO_PLAY_SFX(0x29121007, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_REFLECT, actor->sfxSource, 4);
} }
} }
@ -872,9 +872,9 @@ void Zoness_80191010(Actor* actor) {
if (func_play_800A73E4(&sp7C, &sp70, actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z) && if (func_play_800A73E4(&sp7C, &sp70, actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z) &&
(actor->iwork[0] < 2) && (actor->timer_0C0 == 0)) { (actor->iwork[0] < 2) && (actor->timer_0C0 == 0)) {
if (var_fs0 == 5.0f) { if (var_fs0 == 5.0f) {
AUDIO_PLAY_SFX(0x1983201A, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OUT_SPLASH_L, actor->sfxSource, 4);
} else { } else {
AUDIO_PLAY_SFX(0x19832019, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_IN_SPLASH_L, actor->sfxSource, 4);
} }
actor->timer_0C0 = 10; actor->timer_0C0 = 10;
actor->iwork[0] += 1; actor->iwork[0] += 1;
@ -889,9 +889,9 @@ void Zoness_80191010(Actor* actor) {
actor->itemDrop = DROP_SILVER_RING_25p; actor->itemDrop = DROP_SILVER_RING_25p;
Actor_Despawn(actor); Actor_Despawn(actor);
func_effect_8007D0E0(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 3.0f); func_effect_8007D0E0(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 3.0f);
AUDIO_PLAY_SFX(0x2903A008, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_EXPLOSION_S, actor->sfxSource, 4);
Object_Kill(&actor->obj, actor->sfxSource); Object_Kill(&actor->obj, actor->sfxSource);
func_effect_8007A6F0(&actor->obj.pos, 0x29018036); func_effect_8007A6F0(&actor->obj.pos, NA_SE_EN_BIRD_DOWN);
break; break;
} }
if ((actor->dmgType != DMG_NONE) && (actor->health != 0)) { if ((actor->dmgType != DMG_NONE) && (actor->health != 0)) {
@ -957,12 +957,12 @@ void Zoness_80191680(Actor* actor) {
actor->dmgType = DMG_NONE; actor->dmgType = DMG_NONE;
actor->timer_0C6 = 15; actor->timer_0C6 = 15;
actor->health -= actor->damage; actor->health -= actor->damage;
AUDIO_PLAY_SFX(0x29033037, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_BIRD_DAMAGE, actor->sfxSource, 4);
if (actor->health <= 0) { if (actor->health <= 0) {
actor->health = actor->itemDrop = 0; actor->health = actor->itemDrop = 0;
Actor_Despawn(actor); Actor_Despawn(actor);
actor->state = 1; actor->state = 1;
AUDIO_PLAY_SFX(0x29018036, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_BIRD_DOWN, actor->sfxSource, 4);
} }
} }
actor->unk_0B6++; actor->unk_0B6++;
@ -1040,14 +1040,14 @@ void Zoness_80191BC4(Actor* actor) {
if ((actor->vel.y != 0.0f) && (actor->iwork[1] == 0)) { if ((actor->vel.y != 0.0f) && (actor->iwork[1] == 0)) {
actor->iwork[1] = 1; actor->iwork[1] = 1;
AUDIO_PLAY_SFX(0x2900201D, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_FALLING_DOWN, actor->sfxSource, 4);
} }
if (func_play_800A73E4(&sp4C, &sp48, actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z) && (actor->state == 0)) { if (func_play_800A73E4(&sp4C, &sp48, actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z) && (actor->state == 0)) {
func_effect_8007B344(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 20.0f, 7); func_effect_8007B344(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 20.0f, 7);
func_effect_8007C120(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 0.0f, 0.0f, 0.0f, 0.5f, 50); func_effect_8007C120(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 0.0f, 0.0f, 0.0f, 0.5f, 50);
Object_Kill(&actor->obj, actor->sfxSource); Object_Kill(&actor->obj, actor->sfxSource);
actor->iwork[0] = 0; actor->iwork[0] = 0;
func_effect_8007A6F0(&actor->obj.pos, 0x1903001D); func_effect_8007A6F0(&actor->obj.pos, NA_SE_OB_MINI_BOMB);
} }
actor->fwork[0] += 10.0f; actor->fwork[0] += 10.0f;
Zoness_8018FF50(actor); Zoness_8018FF50(actor);
@ -1137,9 +1137,9 @@ void Zoness_80192094(Actor* actor) {
func_effect_8008377C(actor->obj.pos.x, spB8, actor->obj.pos.z + 100.0f, 0.0f, 1.5f); func_effect_8008377C(actor->obj.pos.x, spB8, actor->obj.pos.z + 100.0f, 0.0f, 1.5f);
actor->iwork[0] += 1; actor->iwork[0] += 1;
if (actor->vel.y >= 0.0f) { if (actor->vel.y >= 0.0f) {
AUDIO_PLAY_SFX(0x1983201A, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OUT_SPLASH_L, actor->sfxSource, 4);
} else { } else {
AUDIO_PLAY_SFX(0x19832019, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_IN_SPLASH_L, actor->sfxSource, 4);
} }
} }
switch (actor->state) { switch (actor->state) {
@ -1319,17 +1319,18 @@ void Zoness_80192834(Actor* actor) {
Actor_Despawn(actor); Actor_Despawn(actor);
Object_Kill(&actor->obj, actor->sfxSource); Object_Kill(&actor->obj, actor->sfxSource);
func_effect_8007D0E0(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 3.0f); func_effect_8007D0E0(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 3.0f);
func_effect_8007A6F0(&actor->obj.pos, 0x29018036); func_effect_8007A6F0(&actor->obj.pos, NA_SE_EN_BIRD_DOWN);
break; break;
} }
if ((actor->iwork[0] == 0) && if ((actor->iwork[0] == 0) &&
(func_play_800A73E4(&sp74, &sp70, actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z) != 0)) { (func_play_800A73E4(&sp74, &sp70, actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z) != 0)) {
actor->iwork[0]++; actor->iwork[0]++;
func_effect_8008377C(actor->obj.pos.x, sp74, actor->obj.pos.z, 0.0f, 0.7f); func_effect_8008377C(actor->obj.pos.x, sp74, actor->obj.pos.z, 0.0f, 0.7f);
if (actor->vel.y >= 0.0f) { if (actor->vel.y >= 0.0f) {
AUDIO_PLAY_SFX(0x1983201A, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OUT_SPLASH_L, actor->sfxSource, 4);
} else { } else {
AUDIO_PLAY_SFX(0x19832019, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_IN_SPLASH_L, actor->sfxSource, 4);
} }
} }
} }
@ -1447,7 +1448,7 @@ void Zoness_80192E64(Actor* actor) {
actor->state = 3; actor->state = 3;
} }
} else { } else {
AUDIO_PLAY_SFX(0x29121007, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_REFLECT, actor->sfxSource, 4);
} }
actor->dmgType = DMG_NONE; actor->dmgType = DMG_NONE;
} }
@ -2100,9 +2101,9 @@ void Zoness_80194A84(Boss* bossZO) {
} }
func_effect_8008377C(sZoFwork[ZO_BSF_43_X], sp134, sZoFwork[ZO_BSF_43_Z] + 100.0f, sp100, spFC); func_effect_8008377C(sZoFwork[ZO_BSF_43_X], sp134, sZoFwork[ZO_BSF_43_Z] + 100.0f, sp100, spFC);
if (bossZO->timer_050 == 43) { if (bossZO->timer_050 == 43) {
AUDIO_PLAY_SFX(0x1983201A, bossZO->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OUT_SPLASH_L, bossZO->sfxSource, 4);
} else { } else {
AUDIO_PLAY_SFX(0x19832019, bossZO->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_IN_SPLASH_L, bossZO->sfxSource, 4);
} }
bossZO->swork[ZO_SWK_12]++; bossZO->swork[ZO_SWK_12]++;
} }
@ -2721,7 +2722,7 @@ void Zoness_80194A84(Boss* bossZO) {
dmgType = bossZO->dmgType; dmgType = bossZO->dmgType;
bossZO->dmgType = DMG_NONE; bossZO->dmgType = DMG_NONE;
if (dmgType == DMG_BEAM) { if (dmgType == DMG_BEAM) {
AUDIO_PLAY_SFX(0x29121007, bossZO->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_REFLECT, bossZO->sfxSource, 4);
} }
switch (bossZO->dmgPart) { switch (bossZO->dmgPart) {
case 0: case 0:
@ -2747,7 +2748,7 @@ void Zoness_80194A84(Boss* bossZO) {
spD8.x = sZoFwork[ZO_BSF_29_X]; spD8.x = sZoFwork[ZO_BSF_29_X];
spD8.y = sZoFwork[ZO_BSF_29_Y]; spD8.y = sZoFwork[ZO_BSF_29_Y];
spD8.z = sZoFwork[ZO_BSF_29_Z]; spD8.z = sZoFwork[ZO_BSF_29_Z];
func_effect_8007A6F0(&spD8, 0x2903A008); func_effect_8007A6F0(&spD8, NA_SE_EN_EXPLOSION_S);
} }
} }
break; break;
@ -2762,7 +2763,7 @@ void Zoness_80194A84(Boss* bossZO) {
spD8.x = sZoFwork[ZO_BSF_32_X]; spD8.x = sZoFwork[ZO_BSF_32_X];
spD8.y = sZoFwork[ZO_BSF_32_Y]; spD8.y = sZoFwork[ZO_BSF_32_Y];
spD8.z = sZoFwork[ZO_BSF_32_Z]; spD8.z = sZoFwork[ZO_BSF_32_Z];
func_effect_8007A6F0(&spD8, 0x2903A008); func_effect_8007A6F0(&spD8, NA_SE_EN_EXPLOSION_S);
} }
} }
break; break;
@ -2777,7 +2778,7 @@ void Zoness_80194A84(Boss* bossZO) {
spD8.x = sZoFwork[ZO_BSF_29_X]; spD8.x = sZoFwork[ZO_BSF_29_X];
spD8.y = sZoFwork[ZO_BSF_29_Y]; spD8.y = sZoFwork[ZO_BSF_29_Y];
spD8.z = sZoFwork[ZO_BSF_29_Z]; spD8.z = sZoFwork[ZO_BSF_29_Z];
func_effect_8007A6F0(&spD8, 0x2903A008); func_effect_8007A6F0(&spD8, NA_SE_EN_EXPLOSION_S);
} }
} }
if ((sZoSwork[ZO_BSS_10] != 0) && (bossZO->state == 3) && (dmgType == DMG_BOMB) && if ((sZoSwork[ZO_BSS_10] != 0) && (bossZO->state == 3) && (dmgType == DMG_BOMB) &&
@ -2790,7 +2791,7 @@ void Zoness_80194A84(Boss* bossZO) {
spD8.x = sZoFwork[ZO_BSF_32_X]; spD8.x = sZoFwork[ZO_BSF_32_X];
spD8.y = sZoFwork[ZO_BSF_32_Y]; spD8.y = sZoFwork[ZO_BSF_32_Y];
spD8.z = sZoFwork[ZO_BSF_32_Z]; spD8.z = sZoFwork[ZO_BSF_32_Z];
func_effect_8007A6F0(&spD8, 0x2903A008); func_effect_8007A6F0(&spD8, NA_SE_EN_EXPLOSION_S);
} }
} }
/* fallthrough */ /* fallthrough */
@ -2801,19 +2802,19 @@ void Zoness_80194A84(Boss* bossZO) {
sZoLimbTimers[ZO_LIMB_25] = sZoLimbTimers[ZO_LIMB_36] = 15; sZoLimbTimers[ZO_LIMB_25] = sZoLimbTimers[ZO_LIMB_36] = 15;
bossZO->health -= bossZO->damage; bossZO->health -= bossZO->damage;
if (bossZO->health < 150) { if (bossZO->health < 150) {
AUDIO_PLAY_SFX(0x2943500F, bossZO->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_KNOCK_DOWN, bossZO->sfxSource, 4);
} else { } else {
AUDIO_PLAY_SFX(0x29034003, bossZO->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OB_DAMAGE_M, bossZO->sfxSource, 4);
} }
if (bossZO->health <= 0) { if (bossZO->health <= 0) {
gTeamLowHealthMsgTimer = -1; gTeamLowHealthMsgTimer = -1;
SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 40); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 40);
SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 40); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 40);
Audio_KillSfxBySource(bossZO->sfxSource); Audio_KillSfxBySource(bossZO->sfxSource);
AUDIO_PLAY_SFX(0x2940D09A, bossZO->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_DOWN_IMPACT, bossZO->sfxSource, 4);
sZoSwork[ZO_BSS_8] = bossZO->health = sZoSwork[ZO_BSS_24] = 0; sZoSwork[ZO_BSS_8] = bossZO->health = sZoSwork[ZO_BSS_24] = 0;
bossZO->timer_050 = 100; bossZO->timer_050 = 100;
AUDIO_PLAY_SFX(0x2940D09A, bossZO->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_DOWN_IMPACT, bossZO->sfxSource, 4);
sZoFwork[ZO_BSF_27] = 20.0f; sZoFwork[ZO_BSF_27] = 20.0f;
sZoFwork[ZO_BSF_26] = 50.0f; sZoFwork[ZO_BSF_26] = 50.0f;
sZoFwork[ZO_BSF_28] = -2600.0f; sZoFwork[ZO_BSF_28] = -2600.0f;
@ -2835,7 +2836,7 @@ void Zoness_80194A84(Boss* bossZO) {
spD8.x = sZoFwork[ZO_BSF_52_X]; spD8.x = sZoFwork[ZO_BSF_52_X];
spD8.y = sZoFwork[ZO_BSF_52_Y]; spD8.y = sZoFwork[ZO_BSF_52_Y];
spD8.z = sZoFwork[ZO_BSF_52_Z]; spD8.z = sZoFwork[ZO_BSF_52_Z];
func_effect_8007A6F0(&spD8, 0x2940983C); func_effect_8007A6F0(&spD8, NA_SE_EN_SINK_PARTS);
} }
} }
break; break;
@ -2857,7 +2858,7 @@ void Zoness_80194A84(Boss* bossZO) {
spD8.x = sZoFwork[ZO_BSF_106_X]; spD8.x = sZoFwork[ZO_BSF_106_X];
spD8.y = sZoFwork[ZO_BSF_106_Y]; spD8.y = sZoFwork[ZO_BSF_106_Y];
spD8.z = sZoFwork[ZO_BSF_106_Z]; spD8.z = sZoFwork[ZO_BSF_106_Z];
func_effect_8007A6F0(&spD8, 0x2940983C); func_effect_8007A6F0(&spD8, NA_SE_EN_SINK_PARTS);
sZoSwork[ZO_BSS_16] = 0; sZoSwork[ZO_BSS_16] = 0;
ZO_HIT_8(bossZO, 0)->z.offset = ZO_HIT_10(bossZO, 0)->z.offset = 100000.0f; ZO_HIT_8(bossZO, 0)->z.offset = ZO_HIT_10(bossZO, 0)->z.offset = 100000.0f;
bossZO->state = 4; bossZO->state = 4;
@ -2883,7 +2884,7 @@ void Zoness_80194A84(Boss* bossZO) {
spCC.x = sZoFwork[ZO_BSF_109_X]; spCC.x = sZoFwork[ZO_BSF_109_X];
spCC.y = sZoFwork[ZO_BSF_109_Y]; spCC.y = sZoFwork[ZO_BSF_109_Y];
spCC.z = sZoFwork[ZO_BSF_109_Z]; spCC.z = sZoFwork[ZO_BSF_109_Z];
func_effect_8007A6F0(&spCC, 0x2940983C); func_effect_8007A6F0(&spCC, NA_SE_EN_SINK_PARTS);
sZoSwork[ZO_BSS_16] = 0; sZoSwork[ZO_BSS_16] = 0;
ZO_HIT_8(bossZO, 1)->z.offset = ZO_HIT_10(bossZO, 1)->z.offset = 100000.0f; ZO_HIT_8(bossZO, 1)->z.offset = ZO_HIT_10(bossZO, 1)->z.offset = 100000.0f;
bossZO->state = 4; bossZO->state = 4;
@ -2956,29 +2957,29 @@ void Zoness_80194A84(Boss* bossZO) {
spCC.y = sZoFwork[ZO_BSF_109_Y]; spCC.y = sZoFwork[ZO_BSF_109_Y];
spCC.z = sZoFwork[ZO_BSF_109_Z]; spCC.z = sZoFwork[ZO_BSF_109_Z];
if ((sZoSwork[ZO_BSS_53] & 1) && (sZoSwork[ZO_BSS_11] != 0)) { if ((sZoSwork[ZO_BSS_53] & 1) && (sZoSwork[ZO_BSS_11] != 0)) {
func_effect_8007A6F0(&spD8, 0x29034003); func_effect_8007A6F0(&spD8, NA_SE_OB_DAMAGE_M);
} }
if ((sZoSwork[ZO_BSS_54] & 1) && (sZoSwork[ZO_BSS_12] != 0)) { if ((sZoSwork[ZO_BSS_54] & 1) && (sZoSwork[ZO_BSS_12] != 0)) {
func_effect_8007A6F0(&spCC, 0x29034003); func_effect_8007A6F0(&spCC, NA_SE_OB_DAMAGE_M);
} }
} }
if (sZoSwork[ZO_BSS_50] & 1) { if (sZoSwork[ZO_BSS_50] & 1) {
spD8.x = sZoFwork[ZO_BSF_29_X]; spD8.x = sZoFwork[ZO_BSF_29_X];
spD8.y = sZoFwork[ZO_BSF_29_Y]; spD8.y = sZoFwork[ZO_BSF_29_Y];
spD8.z = sZoFwork[ZO_BSF_29_Z]; spD8.z = sZoFwork[ZO_BSF_29_Z];
func_effect_8007A6F0(&spD8, 0x2903300E); func_effect_8007A6F0(&spD8, NA_SE_EN_DAMAGE_S);
} }
if (sZoSwork[ZO_BSS_51] & 1) { if (sZoSwork[ZO_BSS_51] & 1) {
spD8.x = sZoFwork[ZO_BSF_32_X]; spD8.x = sZoFwork[ZO_BSF_32_X];
spD8.y = sZoFwork[ZO_BSF_32_Y]; spD8.y = sZoFwork[ZO_BSF_32_Y];
spD8.z = sZoFwork[ZO_BSF_32_Z]; spD8.z = sZoFwork[ZO_BSF_32_Z];
func_effect_8007A6F0(&spD8, 0x2903300E); func_effect_8007A6F0(&spD8, NA_SE_EN_DAMAGE_S);
} }
if (sZoSwork[ZO_BSS_52] & 1) { if (sZoSwork[ZO_BSS_52] & 1) {
spD8.x = sZoFwork[ZO_BSF_52_X]; spD8.x = sZoFwork[ZO_BSF_52_X];
spD8.y = sZoFwork[ZO_BSF_52_Y]; spD8.y = sZoFwork[ZO_BSF_52_Y];
spD8.z = sZoFwork[ZO_BSF_52_Z]; spD8.z = sZoFwork[ZO_BSF_52_Z];
func_effect_8007A6F0(&spD8, 0x29034003); func_effect_8007A6F0(&spD8, NA_SE_OB_DAMAGE_M);
} }
if (func_play_800A73E4(&sp134, &sp130, bossZO->obj.pos.x, bossZO->obj.pos.y - 500.0f, bossZO->obj.pos.z) != 0) { if (func_play_800A73E4(&sp134, &sp130, bossZO->obj.pos.x, bossZO->obj.pos.y - 500.0f, bossZO->obj.pos.z) != 0) {
Math_SmoothStepToF(&bossZO->obj.pos.y, sp134 - 20.0f, 0.1f, bossZO->fwork[ZO_FWK_4], 0.0f); Math_SmoothStepToF(&bossZO->obj.pos.y, sp134 - 20.0f, 0.1f, bossZO->fwork[ZO_FWK_4], 0.0f);
@ -3071,7 +3072,7 @@ void Zoness_801986FC(Boss* bossZO, s32 arg1, f32 xOff, f32 yOff, f32 zOff, f32 y
newActor->vel.z = bossZO->vel.z + sp54.z; newActor->vel.z = bossZO->vel.z + sp54.z;
Object_SetInfo(&newActor->info, newActor->obj.id); Object_SetInfo(&newActor->info, newActor->obj.id);
sZoFwork[ZO_BSF_35 + arg1] = 40.0f; sZoFwork[ZO_BSF_35 + arg1] = 40.0f;
AUDIO_PLAY_SFX(0x2903203B, bossZO->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_S_BALL_SHOT, bossZO->sfxSource, 4);
for (sp50 = 0; sp50 < 4; sp50++) { for (sp50 = 0; sp50 < 4; sp50++) {
Zoness_80193C5C(newActor->obj.pos.x + (sp54.x * 4.3f), newActor->obj.pos.y + (sp54.y * 4.3f), Zoness_80193C5C(newActor->obj.pos.x + (sp54.x * 4.3f), newActor->obj.pos.y + (sp54.y * 4.3f),
newActor->obj.pos.z + (sp54.z * 4.3f) + 100.0f, 30.0f); newActor->obj.pos.z + (sp54.z * 4.3f) + 100.0f, 30.0f);
@ -3112,7 +3113,7 @@ void Zoness_801989FC(Boss* bossZO) {
newActor->vel.x = sp64.x; newActor->vel.x = sp64.x;
newActor->vel.z = bossZO->vel.z + sp64.z; newActor->vel.z = bossZO->vel.z + sp64.z;
Object_SetInfo(&newActor->info, newActor->obj.id); Object_SetInfo(&newActor->info, newActor->obj.id);
AUDIO_PLAY_SFX(0x2903101B, bossZO->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_MISSILE_SHOT, bossZO->sfxSource, 4);
break; break;
} }
} }
@ -3128,7 +3129,7 @@ void Zoness_80198BE8(Boss* bossZO, s32 arg1) {
if ((sZoSwork[ZO_BSS_2 + arg1] == 0) && (sZoSwork[ZO_BSS_39 + arg1] == 0)) { if ((sZoSwork[ZO_BSS_2 + arg1] == 0) && (sZoSwork[ZO_BSS_39 + arg1] == 0)) {
if ((arg1 == 0) && (sZoSwork[ZO_BSS_41] == 0)) { if ((arg1 == 0) && (sZoSwork[ZO_BSS_41] == 0)) {
AUDIO_PLAY_SFX(0x31034025, bossZO->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_ZOBOSS_BEAM, bossZO->sfxSource, 4);
} }
sZoSwork[ZO_BSS_2 + arg1] = 2; sZoSwork[ZO_BSS_2 + arg1] = 2;
sZoSwork[ZO_BSS_41 + arg1]++; sZoSwork[ZO_BSS_41 + arg1]++;
@ -3136,7 +3137,7 @@ void Zoness_80198BE8(Boss* bossZO, s32 arg1) {
sZoSwork[ZO_BSS_41 + arg1] = 0; sZoSwork[ZO_BSS_41 + arg1] = 0;
sZoSwork[ZO_BSS_39 + arg1] = 30; sZoSwork[ZO_BSS_39 + arg1] = 30;
if (arg1 == 1) { if (arg1 == 1) {
Audio_KillSfxBySourceAndId(bossZO->sfxSource, 0x31034025); Audio_KillSfxBySourceAndId(bossZO->sfxSource, NA_SE_EN_ZOBOSS_BEAM);
} }
} }
for (var_s1 = 0, effect = gEffects; var_s1 < 100; var_s1++, effect++) { for (var_s1 = 0, effect = gEffects; var_s1 < 100; var_s1++, effect++) {
@ -3270,7 +3271,7 @@ void Zoness_80199394(Boss* bossZO, s32 arg1) {
bossZO->timer_050 = 20; bossZO->timer_050 = 20;
sZoFwork[ZO_BSF_17 + arg1] = sZoFwork[ZO_BSF_77] = 0.0f; sZoFwork[ZO_BSF_17 + arg1] = sZoFwork[ZO_BSF_77] = 0.0f;
sZoSwork[ZO_BSS_16] = 3; sZoSwork[ZO_BSS_16] = 3;
AUDIO_PLAY_SFX(0x29433022, bossZO->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_COMBINE, bossZO->sfxSource, 4);
} }
void Zoness_80199470(Boss* bossZO, s32 arg1) { void Zoness_80199470(Boss* bossZO, s32 arg1) {
@ -3326,7 +3327,7 @@ void Zoness_8019969C(Actor* actor) {
actor->obj.pos.z -= 100.0f; actor->obj.pos.z -= 100.0f;
Actor_Despawn(actor); Actor_Despawn(actor);
Object_Kill(&actor->obj, actor->sfxSource); Object_Kill(&actor->obj, actor->sfxSource);
func_effect_8007A6F0(&actor->obj.pos, 0x2903A008); func_effect_8007A6F0(&actor->obj.pos, NA_SE_EN_EXPLOSION_S);
} }
actor->dmgType = DMG_NONE; actor->dmgType = DMG_NONE;
} }
@ -3397,7 +3398,7 @@ void Zoness_80199A28(Actor* actor) {
(actor->iwork[1] == 0)) { (actor->iwork[1] == 0)) {
func_effect_8008377C(actor->obj.pos.x, sp3C, actor->obj.pos.z, 0.0f, 0.5f); func_effect_8008377C(actor->obj.pos.x, sp3C, actor->obj.pos.z, 0.0f, 0.5f);
actor->iwork[1]++; actor->iwork[1]++;
AUDIO_PLAY_SFX(0x19000020, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_ON_SPLASH_S, actor->sfxSource, 4);
} }
Math_SmoothStepToF(&actor->vel.y, -60.0f, 0.5f, 5.0f, 0.00001f); Math_SmoothStepToF(&actor->vel.y, -60.0f, 0.5f, 5.0f, 0.00001f);
if (actor->obj.pos.y < -30.0f) { if (actor->obj.pos.y < -30.0f) {
@ -3427,12 +3428,12 @@ void Zoness_80199A28(Actor* actor) {
actor->obj.pos.y += 200.0f; actor->obj.pos.y += 200.0f;
Actor_Despawn(actor); Actor_Despawn(actor);
Object_Kill(&actor->obj, actor->sfxSource); Object_Kill(&actor->obj, actor->sfxSource);
func_effect_8007A6F0(&actor->obj.pos, 0x1903400F); func_effect_8007A6F0(&actor->obj.pos, NA_SE_OB_EXPLOSION_S);
} else { } else {
if ((fabsf(actor->obj.pos.z - gPlayer[0].trueZpos) < 800.0f) || (actor->dmgType != DMG_NONE)) { if ((fabsf(actor->obj.pos.z - gPlayer[0].trueZpos) < 800.0f) || (actor->dmgType != DMG_NONE)) {
Zoness_801999CC(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z); Zoness_801999CC(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z);
Object_Kill(&actor->obj, actor->sfxSource); Object_Kill(&actor->obj, actor->sfxSource);
func_effect_8007A6F0(&actor->obj.pos, 0x2903B009); func_effect_8007A6F0(&actor->obj.pos, NA_SE_EN_EXPLOSION_M);
} }
} }
break; break;
@ -3478,12 +3479,12 @@ void Zoness_80199F10(Actor* actor) {
switch (sZoSwork[ZO_BSS_16]) { /* switch 1; irregular */ switch (sZoSwork[ZO_BSS_16]) { /* switch 1; irregular */
case 1: case 1:
actor->fwork[1] = sZoFwork[ZO_BSF_68_Y] - sZoFwork[ZO_BSF_60_Y]; actor->fwork[1] = sZoFwork[ZO_BSF_68_Y] - sZoFwork[ZO_BSF_60_Y];
AUDIO_PLAY_SFX(0x3100503E, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_PULL_CHAIN1, actor->sfxSource, 4);
actor->state++; actor->state++;
break; break;
case 2: case 2:
actor->fwork[1] = sZoFwork[ZO_BSF_71_Y] - sZoFwork[ZO_BSF_60_Y]; actor->fwork[1] = sZoFwork[ZO_BSF_71_Y] - sZoFwork[ZO_BSF_60_Y];
AUDIO_PLAY_SFX(0x3100503E, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_PULL_CHAIN1, actor->sfxSource, 4);
actor->state++; actor->state++;
break; break;
} }
@ -3517,7 +3518,7 @@ void Zoness_80199F10(Actor* actor) {
} }
if (actor->dmgType != DMG_NONE) { if (actor->dmgType != DMG_NONE) {
if (actor->dmgType == DMG_BEAM) { if (actor->dmgType == DMG_BEAM) {
AUDIO_PLAY_SFX(0x29121007, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_REFLECT, actor->sfxSource, 4);
} }
actor->dmgType = DMG_NONE; actor->dmgType = DMG_NONE;
} }
@ -3617,7 +3618,7 @@ void Zoness_8019A5D4(Actor* actor) {
actor->timer_0BC = (s32) ((fabsf(sZoFwork[ZO_BSF_28] - -2600.0f) / 100.0f) + 30.0f); actor->timer_0BC = (s32) ((fabsf(sZoFwork[ZO_BSF_28] - -2600.0f) / 100.0f) + 30.0f);
actor->timer_0C0 = 3; actor->timer_0C0 = 3;
AUDIO_PLAY_SFX(0x2900403D, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_M_BALL_SHOT, actor->sfxSource, 4);
actor->state++; actor->state++;
} }
break; break;
@ -3633,7 +3634,7 @@ void Zoness_8019A5D4(Actor* actor) {
actor->fwork[5] = actor->vel.y * -3.0f; actor->fwork[5] = actor->vel.y * -3.0f;
if (actor->obj.pos.y < -150.0f) { if (actor->obj.pos.y < -150.0f) {
actor->gravity = 0.0f; actor->gravity = 0.0f;
AUDIO_PLAY_SFX(0x19003021, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_PULL_CHAIN0, actor->sfxSource, 4);
actor->state++; actor->state++;
} }
} }
@ -3657,7 +3658,7 @@ void Zoness_8019A5D4(Actor* actor) {
if (Object_CheckHitboxCollision(&actor->obj.pos, gBosses[0].info.hitbox, &gBosses[0].obj, 0.0f, 0.0f, if (Object_CheckHitboxCollision(&actor->obj.pos, gBosses[0].info.hitbox, &gBosses[0].obj, 0.0f, 0.0f,
0.0f) != 0) { 0.0f) != 0) {
actor->fwork[6] = 50.0f; actor->fwork[6] = 50.0f;
AUDIO_PLAY_SFX(0x19030003, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OB_METAL_BOUND_M, actor->sfxSource, 4);
} }
actor->vel.z += actor->fwork[6] * 0.8f; actor->vel.z += actor->fwork[6] * 0.8f;
actor->vel.y += actor->fwork[6] * 1.4f; actor->vel.y += actor->fwork[6] * 1.4f;
@ -3668,7 +3669,7 @@ void Zoness_8019A5D4(Actor* actor) {
if ((sp4C <= 30.0f) && (sp48 <= 30.0f)) { if ((sp4C <= 30.0f) && (sp48 <= 30.0f)) {
actor->state = 0; actor->state = 0;
Audio_KillSfxBySource(actor->sfxSource); Audio_KillSfxBySource(actor->sfxSource);
AUDIO_PLAY_SFX(0x29433022, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_COMBINE, actor->sfxSource, 4);
actor->timer_0BC = 40; actor->timer_0BC = 40;
sZoFwork[ZO_BSF_74] = sZoFwork[ZO_BSF_75] = 0.0f; sZoFwork[ZO_BSF_74] = sZoFwork[ZO_BSF_75] = 0.0f;
sZoSwork[ZO_BSS_19] = 1; sZoSwork[ZO_BSS_19] = 1;
@ -3679,7 +3680,7 @@ void Zoness_8019A5D4(Actor* actor) {
Zoness_8018FF50(actor); Zoness_8018FF50(actor);
if (actor->dmgType != DMG_NONE) { if (actor->dmgType != DMG_NONE) {
if (actor->dmgType == DMG_BEAM) { if (actor->dmgType == DMG_BEAM) {
AUDIO_PLAY_SFX(0x29121007, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_REFLECT, actor->sfxSource, 4);
} }
actor->dmgType = DMG_NONE; actor->dmgType = DMG_NONE;
} }
@ -3688,9 +3689,9 @@ void Zoness_8019A5D4(Actor* actor) {
func_effect_8008377C(actor->obj.pos.x, sp44, actor->obj.pos.z, 0.0f, 0.7f); func_effect_8008377C(actor->obj.pos.x, sp44, actor->obj.pos.z, 0.0f, 0.7f);
actor->iwork[0]++; actor->iwork[0]++;
if (actor->vel.y >= 0.0f) { if (actor->vel.y >= 0.0f) {
AUDIO_PLAY_SFX(0x1983201A, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OUT_SPLASH_L, actor->sfxSource, 4);
} else { } else {
AUDIO_PLAY_SFX(0x19832019, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_IN_SPLASH_L, actor->sfxSource, 4);
} }
} }
} }
@ -3851,7 +3852,7 @@ void Zoness_8019B1F0(Actor* actor) {
} }
} }
actor->obj.rot.x = 0.0f; actor->obj.rot.x = 0.0f;
AUDIO_PLAY_SFX(0x3100203A, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_SHIP_ENGINE_L, actor->sfxSource, 4);
} }
void Zoness_8019B548(Actor* actor) { void Zoness_8019B548(Actor* actor) {
@ -3924,7 +3925,7 @@ void Zoness_8019B854(Actor* actor) {
actor->dmgType = DMG_NONE; actor->dmgType = DMG_NONE;
actor->timer_0C6 = 15; actor->timer_0C6 = 15;
actor->health -= actor->damage; actor->health -= actor->damage;
AUDIO_PLAY_SFX(0x2903300E, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_DAMAGE_S, actor->sfxSource, 4);
} }
switch (actor->state) { switch (actor->state) {
case 0: case 0:
@ -3972,7 +3973,7 @@ void Zoness_8019B854(Actor* actor) {
Actor_Despawn(actor); Actor_Despawn(actor);
} }
Object_Kill(&actor->obj, actor->sfxSource); Object_Kill(&actor->obj, actor->sfxSource);
func_effect_8007A6F0(&actor->obj.pos, 0x1903901C); func_effect_8007A6F0(&actor->obj.pos, NA_SE_OB_BROKEN_BOX);
break; break;
} }
} }
@ -4076,7 +4077,7 @@ void Zoness_8019BE48(Actor* actor) {
func_effect_8008377C(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 5.0f, 0.7f); func_effect_8008377C(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 5.0f, 0.7f);
func_effect_8007D0E0(actor->obj.pos.x, actor->obj.pos.y + 50.0f, actor->obj.pos.z, 5.0f); func_effect_8007D0E0(actor->obj.pos.x, actor->obj.pos.y + 50.0f, actor->obj.pos.z, 5.0f);
Object_Kill(&actor->obj, actor->sfxSource); Object_Kill(&actor->obj, actor->sfxSource);
func_effect_8007A6F0(&actor->obj.pos, 0x29038033); func_effect_8007A6F0(&actor->obj.pos, NA_SE_EN_WT_EXPLOSION_S);
break; break;
} }
if ((actor->state < 2) && if ((actor->state < 2) &&
@ -4158,7 +4159,7 @@ void Zoness_8019C454(Actor* actor) {
Math_SmoothStepToAngle(&actor->fwork[6], 10.0f, 0.1f, 1.0f, 0.01f); Math_SmoothStepToAngle(&actor->fwork[6], 10.0f, 0.1f, 1.0f, 0.01f);
Math_SmoothStepToAngle(&actor->obj.rot.y, actor->fwork[5], 1.0f, actor->fwork[6], 0.01f); Math_SmoothStepToAngle(&actor->obj.rot.y, actor->fwork[5], 1.0f, actor->fwork[6], 0.01f);
if (actor->fwork[5] != actor->obj.rot.y) { if (actor->fwork[5] != actor->obj.rot.y) {
AUDIO_PLAY_SFX(0x1900001B, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OB_CRAME_MOTOR, actor->sfxSource, 4);
} }
if (1) {} if (1) {}
} }
@ -4386,15 +4387,15 @@ void Zoness_8019D15C(Actor* actor) {
if (actor->dmgType != DMG_NONE) { if (actor->dmgType != DMG_NONE) {
actor->dmgType = DMG_NONE; actor->dmgType = DMG_NONE;
if (actor->dmgPart < 2) { if (actor->dmgPart < 2) {
AUDIO_PLAY_SFX(0x1903001E, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OB_WT_WHEEL_ROLL, actor->sfxSource, 4);
if ((actor->obj.pos.y + 268.0f) < actor->hitPos.y) { if ((actor->obj.pos.y + 268.0f) < actor->hitPos.y) {
actor->fwork[1] = 20.0f; actor->fwork[1] = 20.0f;
} else { } else {
actor->fwork[1] = -20.0f; actor->fwork[1] = -20.0f;
} }
AUDIO_PLAY_SFX(0x1903001F, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OB_WALL_UP, actor->sfxSource, 4);
} else { } else {
AUDIO_PLAY_SFX(0x29121007, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_REFLECT, actor->sfxSource, 4);
} }
} }
if (actor->unk_046 != 0) { if (actor->unk_046 != 0) {
@ -4718,7 +4719,7 @@ void Zoness_LevelComplete(Player* player) {
gShowLevelClearStatusScreen = 0; gShowLevelClearStatusScreen = 0;
break; break;
case 1180: case 1180:
AUDIO_PLAY_SFX(0x09000002, player->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_ARWING_BOOST, player->sfxSource, 0);
player->unk_190 = player->unk_194 = 5.0f; player->unk_190 = player->unk_194 = 5.0f;
break; break;
case 1240: case 1240:
@ -4792,7 +4793,7 @@ void Zoness_8019E5F0(Actor* actor) {
break; break;
case 2: case 2:
actor->state = 3; actor->state = 3;
AUDIO_PLAY_SFX(0x09000002, actor->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_ARWING_BOOST, actor->sfxSource, 0);
actor->fwork[29] = 5.0f; actor->fwork[29] = 5.0f;
/* fallthrough */ /* fallthrough */
case 3: case 3:

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

@ -114,7 +114,7 @@ void Bolse_8018BD60(Actor* this) {
actor->itemDrop = DROP_SILVER_RING_50p; actor->itemDrop = DROP_SILVER_RING_50p;
actor->aiType = i; actor->aiType = i;
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
AUDIO_PLAY_SFX(0x3100000C, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_ARWING_ENGINE_FG, actor->sfxSource, 4);
break; break;
} }
} }
@ -142,7 +142,7 @@ void Bolse_SpawnEnemies(Actor* this, s32 count) {
} else { } else {
enemy->obj.pos.x = D_i4_8019EEE4[this->unk_04E]; enemy->obj.pos.x = D_i4_8019EEE4[this->unk_04E];
enemy->obj.pos.y = 50.0f; enemy->obj.pos.y = 50.0f;
AUDIO_PLAY_SFX(0x2903305F, enemy->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_PASS, enemy->sfxSource, 4);
enemy->timer_0BC = 5; enemy->timer_0BC = 5;
enemy->timer_0C2 = 100; enemy->timer_0C2 = 100;
enemy->unk_0F4.x = 90.0f; enemy->unk_0F4.x = 90.0f;
@ -184,7 +184,7 @@ void Bolse_SpawnEnemies(Actor* this, s32 count) {
} }
Object_SetInfo(&enemy->info, enemy->obj.id); Object_SetInfo(&enemy->info, enemy->obj.id);
AUDIO_PLAY_SFX(0x3100000C, enemy->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_ARWING_ENGINE_FG, enemy->sfxSource, 4);
this->unk_04E++; this->unk_04E++;
if (this->unk_04E >= 5) { if (this->unk_04E >= 5) {
@ -269,8 +269,8 @@ void Bolse_UpdateEventHandler(Actor* this) {
} }
AllRange_ClearRadio(); AllRange_ClearRadio();
this->state = 6; this->state = 6;
AUDIO_PLAY_SFX(0x31009063, this->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_EN_ANDORF_EXPLOSION, this->sfxSource, 0);
AUDIO_PLAY_SFX(0x2940D09A, this->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_DOWN_IMPACT, this->sfxSource, 4);
gScreenFlashTimer = 8; gScreenFlashTimer = 8;
for (actor = &gActors[10], i = 0; i < 20; i++, actor++) { for (actor = &gActors[10], i = 0; i < 20; i++, actor++) {
@ -620,7 +620,7 @@ bool Bolse_8018D278(Actor* actor) {
} }
} }
func_effect_8007A6F0(&actor->obj.pos, 0x2903A008); func_effect_8007A6F0(&actor->obj.pos, NA_SE_EN_EXPLOSION_S);
actor->itemDrop = DROP_SILVER_RING; actor->itemDrop = DROP_SILVER_RING;
@ -698,7 +698,7 @@ bool Bolse_8018D584(Actor* actor) {
if ((actor->dmgPart < 2) && (actor->state == 0)) { if ((actor->dmgPart < 2) && (actor->state == 0)) {
actor->timer_0C6 = 20; actor->timer_0C6 = 20;
actor->dmgType = DMG_NONE; actor->dmgType = DMG_NONE;
AUDIO_PLAY_SFX(0x29024003, actor->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_EN_DAMAGE_M, actor->sfxSource, 0);
actor->health += actor->damage; actor->health += actor->damage;
if (actor->health < 100) { if (actor->health < 100) {
@ -723,10 +723,10 @@ bool Bolse_8018D584(Actor* actor) {
func_effect_8007B344(actor->obj.pos.x, actor->obj.pos.y + 730.0f, actor->obj.pos.z, 10.0f, 5); func_effect_8007B344(actor->obj.pos.x, actor->obj.pos.y + 730.0f, actor->obj.pos.z, 10.0f, 5);
actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_BO_6011BA4); actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_BO_6011BA4);
Audio_KillSfxBySourceAndId(actor->sfxSource, 0x11000028); Audio_KillSfxBySourceAndId(actor->sfxSource, NA_SE_OB_SPARK_BEAM);
AUDIO_PLAY_SFX(0x2903B009, actor->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_EN_EXPLOSION_M, actor->sfxSource, 0);
} else { } else {
func_effect_8007A6F0(&actor->obj.pos, 0x29121007); func_effect_8007A6F0(&actor->obj.pos, NA_SE_EN_REFLECT);
} }
return true; return true;
@ -1039,7 +1039,7 @@ void Bolse_8018EAEC(Actor* actor, s32 index) {
actor->unk_0F4.y = D_i4_8019F018[index]; actor->unk_0F4.y = D_i4_8019F018[index];
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
actor->iwork[11] = 1; actor->iwork[11] = 1;
AUDIO_PLAY_SFX(0x3100000C, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_ARWING_ENGINE_FG, actor->sfxSource, 4);
} }
void Bolse_8018EC1C(void) { void Bolse_8018EC1C(void) {
@ -1087,7 +1087,7 @@ void Bolse_8018ED44(void) {
actor->unk_0B6 = 31; actor->unk_0B6 = 31;
actor->vel.z = 200.0f; actor->vel.z = 200.0f;
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
AUDIO_PLAY_SFX(0x29002002, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_SHOT_0, actor->sfxSource, 4);
break; break;
} }
} }
@ -1111,7 +1111,7 @@ void Bolse_8018EE4C(f32 x, f32 y) {
actor->obj.rot.z = RAND_FLOAT_CENTERED(120.0f); actor->obj.rot.z = RAND_FLOAT_CENTERED(120.0f);
actor->unk_0F4.z = RAND_FLOAT_CENTERED(1.0f); actor->unk_0F4.z = RAND_FLOAT_CENTERED(1.0f);
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
AUDIO_PLAY_SFX(0x29002002, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_SHOT_0, actor->sfxSource, 4);
break; break;
} }
} }
@ -1353,7 +1353,7 @@ void Bolse_8018F83C(Actor* actor, s32 arg1) {
actor->vel.z = -gPlayer[0].baseSpeed; actor->vel.z = -gPlayer[0].baseSpeed;
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
actor->iwork[11] = 1; actor->iwork[11] = 1;
AUDIO_PLAY_SFX(0x3100000C, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_ARWING_ENGINE_FG, actor->sfxSource, 4);
} }
void Bolse_LevelComplete(Player* player) { void Bolse_LevelComplete(Player* player) {
@ -1385,7 +1385,7 @@ void Bolse_LevelComplete(Player* player) {
if (player->csTimer == 0) { if (player->csTimer == 0) {
player->csState = 1; player->csState = 1;
player->csTimer = 200; player->csTimer = 200;
AUDIO_PLAY_SFX(0x09000002, player->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_ARWING_BOOST, player->sfxSource, 0);
player->unk_194 = 5.0f; player->unk_194 = 5.0f;
player->unk_190 = 5.0f; player->unk_190 = 5.0f;
gProjectFar = 30000.0f; gProjectFar = 30000.0f;
@ -1453,7 +1453,7 @@ void Bolse_LevelComplete(Player* player) {
gGroundHeight = -10000.0f; gGroundHeight = -10000.0f;
player->unk_240 = 1; player->unk_240 = 1;
player->wings.modelId = 1; player->wings.modelId = 1;
AUDIO_PLAY_SFX(0x31009063, actor50->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_EN_ANDORF_EXPLOSION, actor50->sfxSource, 0);
Audio_StartPlayerNoise(0); Audio_StartPlayerNoise(0);
} }
break; break;
@ -1501,7 +1501,7 @@ void Bolse_LevelComplete(Player* player) {
case 95: case 95:
Audio_KillSfxBySource(actor50->sfxSource); Audio_KillSfxBySource(actor50->sfxSource);
AUDIO_PLAY_SFX(0x2902F026, gActors[0].sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_EN_BOSS_EXPLOSION, gActors[0].sfxSource, 0);
for (i = 0; i < ARRAY_COUNT(gEffects); i++) { for (i = 0; i < ARRAY_COUNT(gEffects); i++) {
Object_Kill(&gEffects[i].obj, gEffects[i].sfxSource); Object_Kill(&gEffects[i].obj, gEffects[i].sfxSource);
@ -1605,7 +1605,7 @@ void Bolse_LevelComplete(Player* player) {
player->csTimer = 50; player->csTimer = 50;
player->unk_194 = 5.0f; player->unk_194 = 5.0f;
player->unk_190 = 5.0f; player->unk_190 = 5.0f;
AUDIO_PLAY_SFX(0x09000002, player->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_ARWING_BOOST, player->sfxSource, 0);
break; break;
} }
break; break;
@ -1759,7 +1759,7 @@ void Bolse_80190D98(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 xRot, f32
effect->vel.y = dest.y; effect->vel.y = dest.y;
effect->vel.z = dest.z; effect->vel.z = dest.z;
effect->timer_50 = 60; effect->timer_50 = 60;
AUDIO_PLAY_SFX(0x31000013, effect->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_LONG_BEAM, effect->sfxSource, 4);
Object_SetInfo(&effect->info, effect->obj.id); Object_SetInfo(&effect->info, effect->obj.id);
} }
@ -1876,7 +1876,7 @@ void Bolse_801912FC(Boss* boss) {
boss->state = 2; boss->state = 2;
Radio_PlayMessage(gMsg_ID_11150, RCID_PEPPY); Radio_PlayMessage(gMsg_ID_11150, RCID_PEPPY);
boss->timer_050 = 1000; boss->timer_050 = 1000;
AUDIO_PLAY_SFX(0x19034041, boss->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_BO_CORE_APPEAR, boss->sfxSource, 0);
} }
break; break;
@ -1887,7 +1887,7 @@ void Bolse_801912FC(Boss* boss) {
if (boss->timer_050 == 1) { if (boss->timer_050 == 1) {
boss->timer_050 = 2000; boss->timer_050 = 2000;
Radio_PlayMessage(gMsg_ID_11160, RCID_PEPPY); Radio_PlayMessage(gMsg_ID_11160, RCID_PEPPY);
Audio_KillSfxBySourceAndId(boss->sfxSource, 0x19034041); Audio_KillSfxBySourceAndId(boss->sfxSource, NA_SE_BO_CORE_APPEAR);
} }
break; break;
@ -1918,7 +1918,7 @@ void Bolse_801912FC(Boss* boss) {
boss->swork[boss->dmgPart] -= boss->damage; boss->swork[boss->dmgPart] -= boss->damage;
if (boss->swork[boss->dmgPart] <= 0) { if (boss->swork[boss->dmgPart] <= 0) {
boss->swork[24 + boss->dmgPart] = 30; boss->swork[24 + boss->dmgPart] = 30;
AUDIO_PLAY_SFX(0x2903B009, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_EXPLOSION_M, boss->sfxSource, 4);
boss->swork[36]--; boss->swork[36]--;
if (boss->swork[36] <= 0) { if (boss->swork[36] <= 0) {
boss->state = 10; boss->state = 10;
@ -1929,7 +1929,7 @@ void Bolse_801912FC(Boss* boss) {
boss->obj.pos.y -= 300.0f; boss->obj.pos.y -= 300.0f;
} else { } else {
boss->swork[12 + boss->dmgPart] = 20; boss->swork[12 + boss->dmgPart] = 20;
AUDIO_PLAY_SFX(0x29034003, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OB_DAMAGE_M, boss->sfxSource, 4);
} }
} }
} }
@ -2064,7 +2064,7 @@ void Bolse_80191BAC(Boss* boss) {
Math_SmoothStepToF(&gBosses[0].fwork[1], 0.0f, 1.0f, 0.01f, 0.001f); Math_SmoothStepToF(&gBosses[0].fwork[1], 0.0f, 1.0f, 0.01f, 0.001f);
if (boss->timer_052 == 0) { if (boss->timer_052 == 0) {
boss->state = 2; boss->state = 2;
AUDIO_PLAY_SFX(0x19401048, boss->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_OB_BARRIER_RELEASE, boss->sfxSource, 0);
} }
break; break;
} }
@ -2135,7 +2135,7 @@ void Bolse_80191ED8(void) {
actor->obj.status = OBJ_INIT; actor->obj.status = OBJ_INIT;
actor->obj.id = gLevelObjects[i].id; actor->obj.id = gLevelObjects[i].id;
if ((actor->obj.id == OBJ_ACTOR_271) && (gAllRangeCheckpoint == 0)) { if ((actor->obj.id == OBJ_ACTOR_271) && (gAllRangeCheckpoint == 0)) {
AUDIO_PLAY_SFX(0x11000028, actor->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_OB_SPARK_BEAM, actor->sfxSource, 0);
} }
actor->fwork[10] = actor->obj.pos.x = gLevelObjects[i].xPos; actor->fwork[10] = actor->obj.pos.x = gLevelObjects[i].xPos;
actor->fwork[11] = actor->obj.pos.y = gLevelObjects[i].yPos; actor->fwork[11] = actor->obj.pos.y = gLevelObjects[i].yPos;

34
src/overlays/ovl_i4/fox_fo.c
View File

@ -57,7 +57,7 @@ void Fortuna_801875F0(Actor* actor) {
actorPtr->unk_0C9 = actorPtr->iwork[11] = 1; actorPtr->unk_0C9 = actorPtr->iwork[11] = 1;
actorPtr->itemDrop = DROP_SILVER_RING_50p; actorPtr->itemDrop = DROP_SILVER_RING_50p;
Object_SetInfo(&actorPtr->info, actorPtr->obj.id); Object_SetInfo(&actorPtr->info, actorPtr->obj.id);
AUDIO_PLAY_SFX(0x31000011, actorPtr->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_ENGINE_01, actorPtr->sfxSource, 4);
break; break;
} }
} }
@ -88,7 +88,7 @@ void Fortuna_80187884(Actor* actor, f32 xPos, f32 yPos, f32 zPos, f32 arg4) {
actor->iwork[11] = 1; actor->iwork[11] = 1;
actor->unk_0F4.x = 0.0f; actor->unk_0F4.x = 0.0f;
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
AUDIO_PLAY_SFX(0x31004005, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_WOLF_ENGINE, actor->sfxSource, 4);
} }
Vec3f D_i4_8019EDF8[] = { { -300.0f, 1000.0f, 13000.0f }, { 300.0f, 700.0f, 14000.0f }, { 1000.0f, 300.0f, 0.0f } }; Vec3f D_i4_8019EDF8[] = { { -300.0f, 1000.0f, 13000.0f }, { 300.0f, 700.0f, 14000.0f }, { 1000.0f, 300.0f, 0.0f } };
@ -134,7 +134,7 @@ void Fortuna_UpdateEvents(Actor* actor) {
} }
if (gAllRangeEventTimer == 7000) { if (gAllRangeEventTimer == 7000) {
AUDIO_PLAY_SFX(0x11030016, gBosses[0].sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EXPLOSION_DEMO2, gBosses[0].sfxSource, 4);
AllRange_ClearRadio(); AllRange_ClearRadio();
Radio_PlayMessage(gMsg_ID_9390, RCID_ROB64); Radio_PlayMessage(gMsg_ID_9390, RCID_ROB64);
gAllRangeCountdownScale = 1.0f; gAllRangeCountdownScale = 1.0f;
@ -207,7 +207,7 @@ void Fortuna_UpdateEvents(Actor* actor) {
gPlayer[0].csTimer = 50; gPlayer[0].csTimer = 50;
player->unk_190 = 5.0f; player->unk_190 = 5.0f;
player->unk_194 = 5.0f; player->unk_194 = 5.0f;
AUDIO_PLAY_SFX(0x09000002, player->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_ARWING_BOOST, player->sfxSource, 0);
SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 30); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 30);
SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 30); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 30);
} else { } else {
@ -496,7 +496,7 @@ void Fortuna_80188AD0(Actor* actor) {
actor->info.targetOffset = 0.0f; actor->info.targetOffset = 0.0f;
actor->lockOnTimers[TEAM_ID_FOX] = 0; actor->lockOnTimers[TEAM_ID_FOX] = 0;
actor->info.bonus = 0; actor->info.bonus = 0;
AUDIO_PLAY_SFX(0x2903B009, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_EXPLOSION_M, actor->sfxSource, 4);
} }
} }
@ -619,14 +619,14 @@ void Fortuna_801890EC(Actor* actor, s32 arg1) {
if (arg1 < 3) { if (arg1 < 3) {
actor->iwork[11] = 1; actor->iwork[11] = 1;
AUDIO_PLAY_SFX(0x3100000C, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_ARWING_ENGINE_FG, actor->sfxSource, 4);
} else { } else {
actor->obj.pos.z = -9500.0f; actor->obj.pos.z = -9500.0f;
actor->unk_0B6 = 1; actor->unk_0B6 = 1;
actor->vel.z = 22.0f; actor->vel.z = 22.0f;
AUDIO_PLAY_SFX(0x11030010, actor->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_GREATFOX_ENGINE, actor->sfxSource, 0);
AUDIO_PLAY_SFX(0x31024059, actor->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_GREATFOX_BURNER, actor->sfxSource, 0);
} }
} }
@ -726,7 +726,7 @@ void Fortuna_LevelComplete(Player* player) {
} }
player->unk_194 = 5.0f; player->unk_194 = 5.0f;
player->unk_190 = 5.0f; player->unk_190 = 5.0f;
AUDIO_PLAY_SFX(0x09000002, player->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_ARWING_BOOST, player->sfxSource, 0);
} }
break; break;
@ -1021,7 +1021,7 @@ void Fortuna_LevelComplete(Player* player) {
D_ctx_80177A48[4] = 1.0f; D_ctx_80177A48[4] = 1.0f;
actor2->vel.y = 0.1f; actor2->vel.y = 0.1f;
actor1->vel.y = 0.1f; actor1->vel.y = 0.1f;
AUDIO_PLAY_SFX(0x09000002, player->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_ARWING_BOOST, player->sfxSource, 0);
player->unk_194 = 5.0f; player->unk_194 = 5.0f;
player->unk_190 = 5.0f; player->unk_190 = 5.0f;
SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 50); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 50);
@ -1041,7 +1041,7 @@ void Fortuna_LevelComplete(Player* player) {
if (gTeamShields[TEAM_ID_FALCO] > 0) { if (gTeamShields[TEAM_ID_FALCO] > 0) {
if (player->csTimer == 980) { if (player->csTimer == 980) {
AUDIO_PLAY_SFX(0x09000002, actor3->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_ARWING_BOOST, actor3->sfxSource, 0);
actor3->vel.y = 1.0f; actor3->vel.y = 1.0f;
actor3->fwork[29] = 5.0f; actor3->fwork[29] = 5.0f;
} }
@ -1054,7 +1054,7 @@ void Fortuna_LevelComplete(Player* player) {
} }
if ((gTeamShields[TEAM_ID_PEPPY] > 0) && (player->csTimer == 960)) { if ((gTeamShields[TEAM_ID_PEPPY] > 0) && (player->csTimer == 960)) {
AUDIO_PLAY_SFX(0x09000002, actor2->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_ARWING_BOOST, actor2->sfxSource, 0);
actor2->vel.y = 1.0f; actor2->vel.y = 1.0f;
actor2->fwork[29] = 5.0f; actor2->fwork[29] = 5.0f;
} }
@ -1068,7 +1068,7 @@ void Fortuna_LevelComplete(Player* player) {
if (gTeamShields[TEAM_ID_SLIPPY] > 0) { if (gTeamShields[TEAM_ID_SLIPPY] > 0) {
if (player->csTimer == 940) { if (player->csTimer == 940) {
AUDIO_PLAY_SFX(0x09000002, actor1->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_ARWING_BOOST, actor1->sfxSource, 0);
actor1->vel.y = 1.0f; actor1->vel.y = 1.0f;
actor1->fwork[29] = 5.0f; actor1->fwork[29] = 5.0f;
} }
@ -1278,7 +1278,7 @@ void Fortuna_LevelComplete(Player* player) {
case 1240: case 1240:
if (gTeamShields[TEAM_ID_FALCO] > 0) { if (gTeamShields[TEAM_ID_FALCO] > 0) {
AUDIO_PLAY_SFX(0x09000002, actor3->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_ARWING_BOOST, actor3->sfxSource, 0);
actor3->fwork[29] = 5.0f; actor3->fwork[29] = 5.0f;
actor3->iwork[11] = 2; actor3->iwork[11] = 2;
} }
@ -1286,7 +1286,7 @@ void Fortuna_LevelComplete(Player* player) {
case 1260: case 1260:
if (gTeamShields[TEAM_ID_SLIPPY] > 0) { if (gTeamShields[TEAM_ID_SLIPPY] > 0) {
AUDIO_PLAY_SFX(0x09000002, actor1->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_ARWING_BOOST, actor1->sfxSource, 0);
actor1->fwork[29] = 5.0f; actor1->fwork[29] = 5.0f;
actor1->iwork[11] = 2; actor1->iwork[11] = 2;
} }
@ -1294,7 +1294,7 @@ void Fortuna_LevelComplete(Player* player) {
case 1280: case 1280:
if (gTeamShields[TEAM_ID_PEPPY] > 0) { if (gTeamShields[TEAM_ID_PEPPY] > 0) {
AUDIO_PLAY_SFX(0x09000002, actor2->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_ARWING_BOOST, actor2->sfxSource, 0);
actor2->fwork[29] = 5.0f; actor2->fwork[29] = 5.0f;
actor2->iwork[11] = 2; actor2->iwork[11] = 2;
} }
@ -1302,7 +1302,7 @@ void Fortuna_LevelComplete(Player* player) {
break; break;
case 1300: case 1300:
AUDIO_PLAY_SFX(0x09000002, player->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_ARWING_BOOST, player->sfxSource, 0);
player->unk_190 = 2.0f; player->unk_190 = 2.0f;
player->unk_194 = 5.0f; player->unk_194 = 5.0f;
break; break;

72
src/overlays/ovl_i4/fox_ka.c
View File

@ -321,7 +321,7 @@ void Katina_StartCutsceneUpdate(void) {
actor->unk_0C9 = 1; actor->unk_0C9 = 1;
actor->iwork[KA_ACTOR_IWORK_11] = 1; actor->iwork[KA_ACTOR_IWORK_11] = 1;
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
AUDIO_PLAY_SFX(0x31000011, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_ENGINE_01, actor->sfxSource, 4);
} }
} }
} }
@ -474,7 +474,7 @@ void Katina_LevelStart(Player* player) {
func_effect_800794CC(gActors[5].obj.pos.x, gActors[5].obj.pos.y, gActors[5].obj.pos.z, 1.0f); func_effect_800794CC(gActors[5].obj.pos.x, gActors[5].obj.pos.y, gActors[5].obj.pos.z, 1.0f);
} }
func_effect_8007A6F0(&gActors[5].obj.pos, 0x2903B009); func_effect_8007A6F0(&gActors[5].obj.pos, NA_SE_EN_EXPLOSION_M);
break; break;
case 47: case 47:
@ -568,7 +568,7 @@ void Katina_BaseUpdate(Frontlinebase* this) {
if (this->dmgType != DMG_NONE) { if (this->dmgType != DMG_NONE) {
this->dmgType = DMG_NONE; this->dmgType = DMG_NONE;
AUDIO_PLAY_SFX(0x29121007, this->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_REFLECT, this->sfxSource, 4);
} }
} }
@ -617,7 +617,7 @@ void Katina_Hatch_Destroy(Saucerer* this, s32 hatchIdx) {
pos.y = this->obj.pos.y + (this->vwork[hatchIdx + 1].y * 1.3f); pos.y = this->obj.pos.y + (this->vwork[hatchIdx + 1].y * 1.3f);
pos.z = this->obj.pos.z + (this->vwork[hatchIdx + 1].z * 1.3f); pos.z = this->obj.pos.z + (this->vwork[hatchIdx + 1].z * 1.3f);
func_effect_8007A6F0(&pos, 0x2903B009); func_effect_8007A6F0(&pos, NA_SE_EN_EXPLOSION_M);
this->swork[BOSS_HATCH_DESTROY_COUNT]++; this->swork[BOSS_HATCH_DESTROY_COUNT]++;
@ -655,7 +655,7 @@ void Katina_BossHandleDamage(Saucerer* this) {
sfxSource.y = (this->vwork[1 + this->dmgPart].y * 1.3f) + this->obj.pos.y; sfxSource.y = (this->vwork[1 + this->dmgPart].y * 1.3f) + this->obj.pos.y;
sfxSource.z = (this->vwork[1 + this->dmgPart].z * 1.3f) + this->obj.pos.z; sfxSource.z = (this->vwork[1 + this->dmgPart].z * 1.3f) + this->obj.pos.z;
func_effect_8007A6F0(&sfxSource, 0x29034003); func_effect_8007A6F0(&sfxSource, NA_SE_OB_DAMAGE_M);
if (this->swork[10 + this->dmgPart] <= 0) { if (this->swork[10 + this->dmgPart] <= 0) {
this->swork[10 + this->dmgPart] = 0; this->swork[10 + this->dmgPart] = 0;
@ -673,9 +673,9 @@ void Katina_BossHandleDamage(Saucerer* this) {
this->swork[BOSS_CORE_HP] -= this->damage; this->swork[BOSS_CORE_HP] -= this->damage;
if (this->swork[BOSS_CORE_HP] < 100) { if (this->swork[BOSS_CORE_HP] < 100) {
func_effect_8007A6F0(&this->obj.pos, 0x2943500F); func_effect_8007A6F0(&this->obj.pos, NA_SE_EN_KNOCK_DOWN);
} else { } else {
func_effect_8007A6F0(&this->obj.pos, 0x29034003); func_effect_8007A6F0(&this->obj.pos, NA_SE_OB_DAMAGE_M);
} }
if (this->swork[BOSS_CORE_HP] <= 0) { if (this->swork[BOSS_CORE_HP] <= 0) {
@ -700,7 +700,7 @@ void Katina_BossHandleDamage(Saucerer* this) {
this->obj.pos.z + dest.z, 1.6f); this->obj.pos.z + dest.z, 1.6f);
} }
AUDIO_PLAY_SFX(0x2940D09A, this->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_DOWN_IMPACT, this->sfxSource, 4);
gScreenFlashTimer = 8; gScreenFlashTimer = 8;
this->state = 20; this->state = 20;
@ -790,7 +790,7 @@ void Katina_BossSpawnEnemies(Saucerer* this, Vec3f* pos, f32 arg2) {
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
AUDIO_PLAY_SFX(0x2903305F, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_PASS, actor->sfxSource, 4);
actor->info.action = (ObjectFunc) Katina_EnemyUpdate; actor->info.action = (ObjectFunc) Katina_EnemyUpdate;
actor->info.draw = (ObjectFunc) Katina_EnemyDraw; actor->info.draw = (ObjectFunc) Katina_EnemyDraw;
@ -873,7 +873,7 @@ void Katina_BossUpdate(Saucerer* this) {
this->unk_05E = 1; this->unk_05E = 1;
AUDIO_PLAY_SFX(0x11000011, this->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_EARTHQUAKE, this->sfxSource, 0);
D_i4_801A0548 = 100.0f; D_i4_801A0548 = 100.0f;
D_i4_801A0544 = 100.0f; D_i4_801A0544 = 100.0f;
@ -887,7 +887,7 @@ void Katina_BossUpdate(Saucerer* this) {
Radio_PlayMessage(gMsg_ID_18030, RCID_BILL); Radio_PlayMessage(gMsg_ID_18030, RCID_BILL);
AUDIO_PLAY_SFX(0x11037025, this->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_KT_UFO_ENGINE, this->sfxSource, 0);
} }
} }
break; break;
@ -994,7 +994,7 @@ void Katina_BossUpdate(Saucerer* this) {
if (this->timer_050 == 0) { if (this->timer_050 == 0) {
this->state++; this->state++;
this->timer_050 = 60; this->timer_050 = 60;
AUDIO_PLAY_SFX(0x1903203F, this->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_KT_UFO_HATCH_OPEN, this->sfxSource, 0);
this->fwork[BOSS_HATCH_1_ANGLE_TARGET] = 30.0f; this->fwork[BOSS_HATCH_1_ANGLE_TARGET] = 30.0f;
this->fwork[BOSS_HATCH_2_ANGLE_TARGET] = 30.0f; this->fwork[BOSS_HATCH_2_ANGLE_TARGET] = 30.0f;
this->fwork[BOSS_HATCH_3_ANGLE_TARGET] = 30.0f; this->fwork[BOSS_HATCH_3_ANGLE_TARGET] = 30.0f;
@ -1010,7 +1010,7 @@ void Katina_BossUpdate(Saucerer* this) {
this->state++; this->state++;
this->timer_050 = 100; this->timer_050 = 100;
this->timer_052 = 310; this->timer_052 = 310;
AUDIO_PLAY_SFX(0x19034042, this->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_KT_UFO_HATCH_STOP, this->sfxSource, 0);
} }
break; break;
@ -1028,7 +1028,7 @@ void Katina_BossUpdate(Saucerer* this) {
} }
if (this->timer_052 == 0) { if (this->timer_052 == 0) {
AUDIO_PLAY_SFX(0x19032040, this->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_KT_UFO_HATCH_CLOSE, this->sfxSource, 0);
this->state++; this->state++;
@ -1067,7 +1067,7 @@ void Katina_BossUpdate(Saucerer* this) {
*/ */
case 6: case 6:
if (this->timer_052 == 1) { if (this->timer_052 == 1) {
AUDIO_PLAY_SFX(0x19034042, this->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_KT_UFO_HATCH_STOP, this->sfxSource, 0);
} }
if (this->timer_050 == 0) { if (this->timer_050 == 0) {
@ -1082,7 +1082,7 @@ void Katina_BossUpdate(Saucerer* this) {
this->state = 7; this->state = 7;
this->timer_050 = 300; this->timer_050 = 300;
AUDIO_PLAY_SFX(0x1903203F, this->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_KT_UFO_HATCH_OPEN, this->sfxSource, 0);
this->fwork[BOSS_Y_ROT_SPEED_TARGET] = 0.0f; this->fwork[BOSS_Y_ROT_SPEED_TARGET] = 0.0f;
this->fwork[BOSS_HATCH_4_ANGLE_TARGET] = 30.0f; this->fwork[BOSS_HATCH_4_ANGLE_TARGET] = 30.0f;
@ -1106,7 +1106,7 @@ void Katina_BossUpdate(Saucerer* this) {
} }
if (this->timer_050 == 240) { if (this->timer_050 == 240) {
AUDIO_PLAY_SFX(0x19034042, this->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_KT_UFO_HATCH_STOP, this->sfxSource, 0);
} }
if (this->timer_050 == 0) { if (this->timer_050 == 0) {
@ -1117,7 +1117,7 @@ void Katina_BossUpdate(Saucerer* this) {
this->fwork[BOSS_HATCH_1_ANGLE_TARGET] = 0.0f; this->fwork[BOSS_HATCH_1_ANGLE_TARGET] = 0.0f;
this->timer_056 = 1920; this->timer_056 = 1920;
this->timer_052 = 70; this->timer_052 = 70;
AUDIO_PLAY_SFX(0x19032040, this->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_KT_UFO_HATCH_CLOSE, this->sfxSource, 0);
} }
break; break;
@ -1127,8 +1127,8 @@ void Katina_BossUpdate(Saucerer* this) {
case 10: case 10:
if (this->timer_050 == 0) { if (this->timer_050 == 0) {
this->fwork[BOSS_CORE_TARGET_LEVEL] = 200.0f; this->fwork[BOSS_CORE_TARGET_LEVEL] = 200.0f;
AUDIO_PLAY_SFX(0x19032041, this->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_KT_UFO_CORE_OPEN, this->sfxSource, 0);
Audio_KillSfxBySourceAndId(this->sfxSource, 0x11037025); Audio_KillSfxBySourceAndId(this->sfxSource, NA_SE_KT_UFO_ENGINE);
this->state = 11; this->state = 11;
this->timer_050 = 100; this->timer_050 = 100;
Radio_PlayMessage(gMsg_ID_18050, RCID_BILL); Radio_PlayMessage(gMsg_ID_18050, RCID_BILL);
@ -1145,11 +1145,11 @@ void Katina_BossUpdate(Saucerer* this) {
*/ */
case 11: case 11:
if (this->timer_050 == 0) { if (this->timer_050 == 0) {
AUDIO_PLAY_SFX(0x19034042, this->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_KT_UFO_HATCH_STOP, this->sfxSource, 0);
this->state = 12; this->state = 12;
this->timer_050 = 1928; this->timer_050 = 1928;
Radio_PlayMessage(gMsg_ID_18055, RCID_BILL); Radio_PlayMessage(gMsg_ID_18055, RCID_BILL);
AUDIO_PLAY_SFX(0x11034043, this->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_KT_UFO_LONG_CHARGE, this->sfxSource, 0);
} }
break; break;
@ -1252,8 +1252,8 @@ void Katina_BossUpdate(Saucerer* this) {
D_i4_801A0558 = 50.0f; D_i4_801A0558 = 50.0f;
D_i4_801A0554 = 50.0f; D_i4_801A0554 = 50.0f;
Audio_KillSfxBySourceAndId(this->sfxSource, 0x11034043); Audio_KillSfxBySourceAndId(this->sfxSource, NA_SE_KT_UFO_LONG_CHARGE);
AUDIO_PLAY_SFX(0x19406044, this->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_KT_UFO_LAST_CHARGE, this->sfxSource, 0);
} }
break; break;
@ -1309,7 +1309,7 @@ void Katina_BossUpdate(Saucerer* this) {
i = gGameFrameCount % 64U; i = gGameFrameCount % 64U;
Object_Kill(&gEffects[i].obj, gEffects[i].sfxSource); Object_Kill(&gEffects[i].obj, gEffects[i].sfxSource);
func_effect_8007B344(this->obj.pos.x, this->obj.pos.y - 600.0f, this->obj.pos.z, 90.0f, 0); func_effect_8007B344(this->obj.pos.x, this->obj.pos.y - 600.0f, this->obj.pos.z, 90.0f, 0);
AUDIO_PLAY_SFX(0x1140B045, this->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_KT_UFO_BEAM, this->sfxSource, 0);
} }
if (this->timer_052 == 690) { if (this->timer_052 == 690) {
@ -1353,7 +1353,7 @@ void Katina_BossUpdate(Saucerer* this) {
gBosses[KA_BOSS_BASE].state = 1; gBosses[KA_BOSS_BASE].state = 1;
this->state = 18; this->state = 18;
this->timer_050 = 50; this->timer_050 = 50;
AUDIO_PLAY_SFX(0x11038046, this->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_EXPLOSION_DEMO3, this->sfxSource, 0);
} }
break; break;
@ -1419,7 +1419,7 @@ void Katina_BossUpdate(Saucerer* this) {
this->obj.pos.x = -4000.0f; this->obj.pos.x = -4000.0f;
this->unk_078.z = 7.0f; this->unk_078.z = 7.0f;
AUDIO_PLAY_SFX(0x11404016, this->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_KT_UFO_FALLING, this->sfxSource, 0);
for (i = 0; i < ARRAY_COUNT(gEffects); i++) { for (i = 0; i < ARRAY_COUNT(gEffects); i++) {
Object_Kill(&gEffects[i].obj, gEffects[i].sfxSource); Object_Kill(&gEffects[i].obj, gEffects[i].sfxSource);
@ -1437,7 +1437,7 @@ void Katina_BossUpdate(Saucerer* this) {
this->obj.pos.z += this->unk_078.z; this->obj.pos.z += this->unk_078.z;
if (this->timer_050 == 820) { if (this->timer_050 == 820) {
AUDIO_PLAY_SFX(0x19408047, this->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_KT_UFO_BOUND, this->sfxSource, 0);
} }
if (this->timer_050 > 820) { if (this->timer_050 > 820) {
@ -1719,7 +1719,7 @@ void Katina_SFTeamMissionAccomUpdate(ActorCutscene* this, s32 idx) {
this->iwork[KA_ACTOR_IWORK_11] = 1; this->iwork[KA_ACTOR_IWORK_11] = 1;
AUDIO_PLAY_SFX(0x3100000C, this->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_ARWING_ENGINE_FG, this->sfxSource, 4);
} }
/** /**
@ -1745,7 +1745,7 @@ void Katina_SFTeamFleeUpdate(ActorCutscene* this, s32 idx) {
this->iwork[KA_ACTOR_IWORK_11] = 1; this->iwork[KA_ACTOR_IWORK_11] = 1;
AUDIO_PLAY_SFX(0x3100000C, this->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_ARWING_ENGINE_FG, this->sfxSource, 4);
} }
/** /**
@ -1792,7 +1792,7 @@ void Katina_SFTeam_LevelComplete_Update(void) {
actor->iwork[KA_ACTOR_IWORK_11] = 1; actor->iwork[KA_ACTOR_IWORK_11] = 1;
AUDIO_PLAY_SFX(0x3100000C, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_ARWING_ENGINE_FG, actor->sfxSource, 4);
} }
} }
} }
@ -1994,7 +1994,7 @@ void Katina_LevelComplete(Player* player) {
break; break;
case 1010: case 1010:
AUDIO_PLAY_SFX(0x09000002, &player->sfxSource[0], 0); AUDIO_PLAY_SFX(NA_SE_ARWING_BOOST, &player->sfxSource[0], 0);
player->unk_190 = player->unk_194 = 5.0f; player->unk_190 = player->unk_194 = 5.0f;
break; break;
@ -2118,7 +2118,7 @@ void Katina_SFTeamFlyTowardsCamera(ActorCutscene* this) {
case 2: case 2:
this->state = 3; this->state = 3;
AUDIO_PLAY_SFX(0x09000002, this->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_ARWING_BOOST, this->sfxSource, 0);
this->fwork[KA_ACTOR_FWORK_29] = 5.0f; this->fwork[KA_ACTOR_FWORK_29] = 5.0f;
case 3: case 3:
@ -2216,7 +2216,7 @@ void Katina_801981F8(Actor* this) {
if (actor->unk_0B6 == 1) { if (actor->unk_0B6 == 1) {
actor->info.targetOffset = 0.0f; actor->info.targetOffset = 0.0f;
actor->info.bonus = 0; actor->info.bonus = 0;
AUDIO_PLAY_SFX(0x3100000C, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_ARWING_ENGINE_FG, actor->sfxSource, 4);
} }
actor->info.action = (ObjectFunc) Katina_EnemyUpdate; actor->info.action = (ObjectFunc) Katina_EnemyUpdate;
actor->info.draw = (ObjectFunc) Katina_EnemyDraw; actor->info.draw = (ObjectFunc) Katina_EnemyDraw;
@ -2251,7 +2251,7 @@ void Katina_BillFighterInit(void) {
actor->info.targetOffset = 0.0f; actor->info.targetOffset = 0.0f;
actor->info.bonus = 0; actor->info.bonus = 0;
AUDIO_PLAY_SFX(0x3100000C, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_ARWING_ENGINE_FG, actor->sfxSource, 4);
} }
void Katina_UpdateEvents(ActorAllRange* this) { void Katina_UpdateEvents(ActorAllRange* this) {
@ -2273,7 +2273,7 @@ void Katina_UpdateEvents(ActorAllRange* this) {
gBosses[KA_BOSS_MOTHERSHIP].obj.pos.z = 0.0f; gBosses[KA_BOSS_MOTHERSHIP].obj.pos.z = 0.0f;
gBosses[KA_BOSS_MOTHERSHIP].obj.pos.y = 2000.0f; gBosses[KA_BOSS_MOTHERSHIP].obj.pos.y = 2000.0f;
AUDIO_PLAY_SFX(0x11037025, gBosses[KA_BOSS_MOTHERSHIP].sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_KT_UFO_ENGINE, gBosses[KA_BOSS_MOTHERSHIP].sfxSource, 0);
gAllRangeEventTimer = 20000; gAllRangeEventTimer = 20000;

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

@ -33,7 +33,7 @@ void SectorZ_80199900(Actor* actor, s32 arg1) {
gScreenFlashTimer = 8; gScreenFlashTimer = 8;
Object_Kill(&actor->obj, actor->sfxSource); Object_Kill(&actor->obj, actor->sfxSource);
func_effect_8007A6F0(&actor->obj.pos, 0x2903A060); func_effect_8007A6F0(&actor->obj.pos, NA_SE_EN_MS_EXPLOSION_S);
for (i = 0; i < 20; i++) { for (i = 0; i < 20; i++) {
func_effect_800794CC(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 1.0f); func_effect_800794CC(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 1.0f);
@ -52,8 +52,8 @@ void SectorZ_80199900(Actor* actor, s32 arg1) {
gPlayer[0].csState = 1000; gPlayer[0].csState = 1000;
gActors[0].state = 6; gActors[0].state = 6;
gPlayer[0].csTimer = 30; gPlayer[0].csTimer = 30;
AUDIO_PLAY_SFX(0x11030010, gActors[0].sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_GREATFOX_ENGINE, gActors[0].sfxSource, 0);
AUDIO_PLAY_SFX(0x31024059, gActors[0].sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_GREATFOX_BURNER, gActors[0].sfxSource, 0);
SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 1); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 1);
SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 1); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 1);
} }
@ -200,7 +200,7 @@ void SectorZ_80199FCC(Actor* actor, s32 arg1) {
actor->fwork[1] = 25.0f; actor->fwork[1] = 25.0f;
actor->fwork[29] = 2.0f; actor->fwork[29] = 2.0f;
AUDIO_PLAY_SFX(0x3103A061, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_PUNCH_ENGINE, actor->sfxSource, 4);
} }
void SectorZ_8019A0F8(Actor* actor, s32 arg1) { void SectorZ_8019A0F8(Actor* actor, s32 arg1) {
@ -247,7 +247,7 @@ void SectorZ_8019A1D0(void) {
actor->info.targetOffset = 0.0f; actor->info.targetOffset = 0.0f;
AUDIO_PLAY_SFX(0x31000011, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_ENGINE_01, actor->sfxSource, 4);
} }
void SectorZ_8019A2F4(Actor* actor) { void SectorZ_8019A2F4(Actor* actor) {
@ -386,7 +386,7 @@ void SectorZ_8019A3E8(Actor* actor) {
actorPtr->itemDrop = DROP_SILVER_RING_50p; actorPtr->itemDrop = DROP_SILVER_RING_50p;
actorPtr->timer_0C2 = 30; actorPtr->timer_0C2 = 30;
Object_SetInfo(&actorPtr->info, actorPtr->obj.id); Object_SetInfo(&actorPtr->info, actorPtr->obj.id);
AUDIO_PLAY_SFX(0x31000011, actorPtr->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_ENGINE_01, actorPtr->sfxSource, 4);
actor->unk_04E++; actor->unk_04E++;
break; break;
} }
@ -580,7 +580,7 @@ void SectorZ_UpdateEvents(Actor* actor) {
gFillScreenAlpha = gFillScreenAlphaTarget = 0; gFillScreenAlpha = gFillScreenAlphaTarget = 0;
switch (actor->timer_0BC) { switch (actor->timer_0BC) {
case 9800: case 9800:
AUDIO_PLAY_SFX(0x09000002, gActors[10].sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_ARWING_BOOST, gActors[10].sfxSource, 0);
gActors[10].fwork[29] = 12.0f; gActors[10].fwork[29] = 12.0f;
break; break;
@ -688,7 +688,7 @@ void SectorZ_8019B568(void) {
actor->unk_0B6 = 1; actor->unk_0B6 = 1;
actor->vel.x = -20.0f; actor->vel.x = -20.0f;
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
AUDIO_PLAY_SFX(0x11030010, actor->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_GREATFOX_ENGINE, actor->sfxSource, 0);
} }
Vec3f D_i4_8019F57C[] = { Vec3f D_i4_8019F57C[] = {
{ 150.0f, 150.0f, 50.0f }, { -150.0f, -150.0f, 50.0f }, { -150.0f, 150.0f, 50.0f }, { 150.0f, -150.0f, 50.0f } { 150.0f, 150.0f, 50.0f }, { -150.0f, -150.0f, 50.0f }, { -150.0f, 150.0f, 50.0f }, { 150.0f, -150.0f, 50.0f }
@ -715,7 +715,7 @@ void SectorZ_8019B630(Actor* actor, s32 index) {
actor->unk_0B6 = 26; actor->unk_0B6 = 26;
actor->iwork[11] = 1; actor->iwork[11] = 1;
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
AUDIO_PLAY_SFX(0x31000011, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_ENGINE_01, actor->sfxSource, 4);
} }
Vec3f D_i4_8019F5BC[] = { Vec3f D_i4_8019F5BC[] = {
@ -738,8 +738,8 @@ void SectorZ_8019B75C(Actor* actor, s32 arg1) {
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
AUDIO_PLAY_SFX(0x3100000C, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_ARWING_ENGINE_FG, actor->sfxSource, 4);
AUDIO_PLAY_SFX(0x09000002, actor->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_ARWING_BOOST, actor->sfxSource, 0);
actor->fwork[29] = 5.0f; actor->fwork[29] = 5.0f;
} }
@ -768,7 +768,7 @@ void SectorZ_8019B888(void) {
actor->unk_0F4.y = 270.0f; actor->unk_0F4.y = 270.0f;
actor->health = 255; actor->health = 255;
actor->iwork[11] = 1; actor->iwork[11] = 1;
AUDIO_PLAY_SFX(0x3100000C, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_ARWING_ENGINE_FG, actor->sfxSource, 4);
actor->info.hitbox = SEGMENTED_TO_VIRTUAL(gTeamHitbox); actor->info.hitbox = SEGMENTED_TO_VIRTUAL(gTeamHitbox);
actor->info.unk_16 = 0; actor->info.unk_16 = 0;
actor->info.targetOffset = 0.0f; actor->info.targetOffset = 0.0f;
@ -929,7 +929,7 @@ void SectorZ_LevelStart(Player* player) {
} }
if (gCsFrameCount == 820) { if (gCsFrameCount == 820) {
Audio_KillSfxById(0x49000014); Audio_KillSfxById(NA_SE_DEMO_SIREN);
player->state_1C8 = PLAYERSTATE_1C8_ACTIVE; player->state_1C8 = PLAYERSTATE_1C8_ACTIVE;
player->unk_01C = player->unk_018 = player->unk_014 = 0.f; player->unk_01C = player->unk_018 = player->unk_014 = 0.f;
AUDIO_PLAY_BGM(gBgmSeqId); AUDIO_PLAY_BGM(gBgmSeqId);
@ -940,7 +940,7 @@ void SectorZ_LevelStart(Player* player) {
switch (gCsFrameCount) { switch (gCsFrameCount) {
case 20: case 20:
AUDIO_PLAY_SFX(0x49000014, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_DEMO_SIREN, gDefaultSfxSource, 4);
break; break;
case 330: case 330:
@ -994,7 +994,7 @@ void SectorZ_LevelStart(Player* player) {
player->yRot_114 = 90.0f; player->yRot_114 = 90.0f;
player->baseSpeed = gArwingSpeed; player->baseSpeed = gArwingSpeed;
player->unk_234 = 1; player->unk_234 = 1;
AUDIO_PLAY_SFX(0x09000002, player->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_ARWING_BOOST, player->sfxSource, 0);
break; break;
} }
@ -1054,13 +1054,13 @@ void SectorZ_8019C574(Actor* actor, s32 index) {
if (index < 3) { if (index < 3) {
actor->iwork[11] = 1; actor->iwork[11] = 1;
AUDIO_PLAY_SFX(0x3100000C, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_ARWING_ENGINE_FG, actor->sfxSource, 4);
} else { } else {
actor->unk_0B6 = 1; actor->unk_0B6 = 1;
actor->fwork[0] = 20.0f; actor->fwork[0] = 20.0f;
AUDIO_PLAY_SFX(0x11030010, actor->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_GREATFOX_ENGINE, actor->sfxSource, 0);
AUDIO_PLAY_SFX(0x31024059, actor->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_GREATFOX_BURNER, actor->sfxSource, 0);
} }
} }
@ -1090,7 +1090,7 @@ void SectorZ_8019C70C(void) {
actor->timer_0BC = 130; actor->timer_0BC = 130;
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
AUDIO_PLAY_SFX(0x3100000C, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_ARWING_ENGINE_FG, actor->sfxSource, 4);
} }
void SectorZ_LevelComplete(Player* player) { void SectorZ_LevelComplete(Player* player) {
@ -1118,7 +1118,7 @@ void SectorZ_LevelComplete(Player* player) {
if (player->csTimer == 0) { if (player->csTimer == 0) {
player->csState = 1001; player->csState = 1001;
player->csTimer = 100; player->csTimer = 100;
AUDIO_PLAY_SFX(0x09000002, player->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_ARWING_BOOST, player->sfxSource, 0);
player->unk_194 = 5.0f; player->unk_194 = 5.0f;
player->unk_190 = 5.0f; player->unk_190 = 5.0f;
gProjectFar = 30000.0f; gProjectFar = 30000.0f;
@ -1188,7 +1188,7 @@ void SectorZ_LevelComplete(Player* player) {
for (i = 0; i < ARRAY_COUNT(gActors); i++) { for (i = 0; i < ARRAY_COUNT(gActors); i++) {
Object_Kill(&gActors[i].obj, gActors[i].sfxSource); Object_Kill(&gActors[i].obj, gActors[i].sfxSource);
} }
AUDIO_PLAY_SFX(0x31024059, boss0->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_GREATFOX_BURNER, boss0->sfxSource, 0);
break; break;
case 1: case 1:
@ -1515,7 +1515,7 @@ void SectorZ_LevelComplete(Player* player) {
break; break;
case 2510: case 2510:
AUDIO_PLAY_SFX(0x09000002, player->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_ARWING_BOOST, player->sfxSource, 0);
player->unk_190 = player->unk_194 = 5.0f; player->unk_190 = player->unk_194 = 5.0f;
break; break;
@ -1579,7 +1579,7 @@ void SectorZ_8019DD20(Actor* actor) {
switch (actor->state) { switch (actor->state) {
case 1: case 1:
actor->state = 2; actor->state = 2;
AUDIO_PLAY_SFX(0x09000002, actor->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_ARWING_BOOST, actor->sfxSource, 0);
actor->fwork[29] = 5.0f; actor->fwork[29] = 5.0f;
case 2: case 2:
@ -1621,7 +1621,7 @@ void SectorZ_8019DD20(Actor* actor) {
break; break;
case 430: case 430:
AUDIO_PLAY_SFX(0x09000002, actor->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_ARWING_BOOST, actor->sfxSource, 0);
actor->fwork[29] = 8.0f; actor->fwork[29] = 8.0f;
break; break;
@ -1681,7 +1681,7 @@ void SectorZ_8019E234(Actor* actor) {
actor->timer_0C6 = 20; actor->timer_0C6 = 20;
actor->dmgType = DMG_NONE; actor->dmgType = DMG_NONE;
actor->health -= actor->damage; actor->health -= actor->damage;
AUDIO_PLAY_SFX(0x2903300E, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_DAMAGE_S, actor->sfxSource, 4);
if (actor->health <= 0) { if (actor->health <= 0) {
func_effect_8007BFFC(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 0.0f, 0.0f, 0.0f, 5.0f, 10); func_effect_8007BFFC(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 0.0f, 0.0f, 0.0f, 5.0f, 10);
Actor_Despawn(actor); Actor_Despawn(actor);
@ -1692,7 +1692,7 @@ void SectorZ_8019E234(Actor* actor) {
func_effect_800794CC(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 1.0f); func_effect_800794CC(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 1.0f);
} }
Object_Kill(&actor->obj, actor->sfxSource); Object_Kill(&actor->obj, actor->sfxSource);
func_effect_8007A6F0(&actor->obj.pos, 0x1903400F); func_effect_8007A6F0(&actor->obj.pos, NA_SE_OB_EXPLOSION_S);
} }
} }
} }
@ -1724,7 +1724,7 @@ void SectorZ_8019E454(Boss* boss) {
boss->timer_050 = 10; boss->timer_050 = 10;
boss->timer_052 = 60; boss->timer_052 = 60;
boss->state = 1; boss->state = 1;
AUDIO_PLAY_SFX(0x1900404F, boss->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_OB_BROKEN_SPARK_L, boss->sfxSource, 0);
} }
if (boss->timer_050 == 1) { if (boss->timer_050 == 1) {
@ -1857,5 +1857,5 @@ void SectorZ_8019EA68(void) {
boss->obj.id = OBJ_BOSS_313; boss->obj.id = OBJ_BOSS_313;
Object_SetInfo(&boss->info, boss->obj.id); Object_SetInfo(&boss->info, boss->obj.id);
AUDIO_PLAY_SFX(0x11030010, boss->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_GREATFOX_ENGINE, boss->sfxSource, 0);
} }

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

@ -449,7 +449,7 @@ void Macbeth_8019A198(Actor* actor) {
} else { } else {
Audio_SetSfxSpeedModulation(actor->vel.z); Audio_SetSfxSpeedModulation(actor->vel.z);
} }
Audio_PlaySfxModulated(actor->sfxSource, 0x31078085); Audio_PlaySfxModulated(actor->sfxSource, NA_SE_EN_FREIGHT_TRAIN);
D_i5_801BE310 = actor->iwork[5]; D_i5_801BE310 = actor->iwork[5];
} }
D_i5_801BA1E0 = actor->obj.pos.z; D_i5_801BA1E0 = actor->obj.pos.z;
@ -478,7 +478,7 @@ void Macbeth_8019A2F4(Actor* actor) {
} }
D_MA_801BE2F0[0] = var_a0; D_MA_801BE2F0[0] = var_a0;
if (D_i5_801BA1E4 != D_i5_801BA1EC[var_a0 - 1].unk_04) { if (D_i5_801BA1E4 != D_i5_801BA1EC[var_a0 - 1].unk_04) {
AUDIO_PLAY_SFX(0x1940205E, actor->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_OB_CONNECT_CUT, actor->sfxSource, 0);
} }
D_i5_801BA1E4 = D_i5_801BA1EC[var_a0 - 1].unk_04; D_i5_801BA1E4 = D_i5_801BA1EC[var_a0 - 1].unk_04;
var_fa1 = D_i5_801BA1EC[var_a0 - 1].unk_08; var_fa1 = D_i5_801BA1EC[var_a0 - 1].unk_08;
@ -595,7 +595,7 @@ void Macbeth_8019A8C8(Actor* actor, s16 arg1) {
RAND_FLOAT(360.0f), RAND_FLOAT_CENTERED(30.0f), RAND_FLOAT_CENTERED(30.0f), RAND_FLOAT(360.0f), RAND_FLOAT_CENTERED(30.0f), RAND_FLOAT_CENTERED(30.0f),
RAND_FLOAT_CENTERED(30.0f), (s32) (RAND_FLOAT(50.0f) + 70.0f), arg1, RAND_FLOAT(0.8f) + 0.3f); RAND_FLOAT_CENTERED(30.0f), (s32) (RAND_FLOAT(50.0f) + 70.0f), arg1, RAND_FLOAT(0.8f) + 0.3f);
} }
AUDIO_PLAY_SFX(0x2940C00A, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_EXPLOSION_L, actor->sfxSource, 4);
} }
void Macbeth_8019AF34(Actor* actor) { void Macbeth_8019AF34(Actor* actor) {
@ -624,7 +624,7 @@ void Macbeth_8019AF34(Actor* actor) {
RAND_FLOAT(360.0f), RAND_FLOAT_CENTERED(30.0f), RAND_FLOAT_CENTERED(30.0f), RAND_FLOAT(360.0f), RAND_FLOAT_CENTERED(30.0f), RAND_FLOAT_CENTERED(30.0f),
RAND_FLOAT_CENTERED(30.0f), (s32) (RAND_FLOAT(50.0f) + 70.0f), 1, RAND_FLOAT(0.8f) + 0.3f); RAND_FLOAT_CENTERED(30.0f), (s32) (RAND_FLOAT(50.0f) + 70.0f), 1, RAND_FLOAT(0.8f) + 0.3f);
} }
AUDIO_PLAY_SFX(0x2940C00A, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_EXPLOSION_L, actor->sfxSource, 4);
} }
void Macbeth_8019B580(Actor* actor, s32* arg1) { void Macbeth_8019B580(Actor* actor, s32* arg1) {
@ -725,7 +725,7 @@ void Macbeth_8019BE50(Actor* actor) {
RAND_FLOAT(360.0f), RAND_FLOAT_CENTERED(30.0f), RAND_FLOAT_CENTERED(30.0f), RAND_FLOAT(360.0f), RAND_FLOAT_CENTERED(30.0f), RAND_FLOAT_CENTERED(30.0f),
RAND_FLOAT_CENTERED(30.0f), (s32) (RAND_FLOAT(50.0f) + 70.0f), 0, RAND_FLOAT(0.8f) + 0.3f); RAND_FLOAT_CENTERED(30.0f), (s32) (RAND_FLOAT(50.0f) + 70.0f), 0, RAND_FLOAT(0.8f) + 0.3f);
} }
func_effect_8007A6F0(&actor->obj.pos, 0x2940C00A); func_effect_8007A6F0(&actor->obj.pos, NA_SE_EN_EXPLOSION_L);
gHitCount++; gHitCount++;
} }
@ -733,7 +733,7 @@ bool Macbeth_8019C4EC(Actor* actor) {
if (actor->dmgType != DMG_NONE) { if (actor->dmgType != DMG_NONE) {
actor->dmgType = DMG_NONE; actor->dmgType = DMG_NONE;
if (actor->dmgPart == 1) { if (actor->dmgPart == 1) {
AUDIO_PLAY_SFX(0x29034003, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OB_DAMAGE_M, actor->sfxSource, 4);
actor->dmgType = DMG_NONE; actor->dmgType = DMG_NONE;
actor->iwork[7] = 15; actor->iwork[7] = 15;
D_i5_801BE320[22] = 0; D_i5_801BE320[22] = 0;
@ -741,7 +741,7 @@ bool Macbeth_8019C4EC(Actor* actor) {
D_i5_801BE320[21] = 2; D_i5_801BE320[21] = 2;
return true; return true;
} }
AUDIO_PLAY_SFX(0x29121007, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_REFLECT, actor->sfxSource, 4);
} }
return false; return false;
@ -811,7 +811,7 @@ void Macbeth_8019C778(Actor* actor) {
break; break;
case 1: case 1:
if (actor->timer_0BC == 1) { if (actor->timer_0BC == 1) {
AUDIO_PLAY_SFX(0x1900000D, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OB_GATE_OPEN, actor->sfxSource, 4);
} }
if (actor->timer_0BC <= 0) { if (actor->timer_0BC <= 0) {
Math_SmoothStepToF(&actor->fwork[2], -60.0f, 0.4f, 10.0f, 0.01f); Math_SmoothStepToF(&actor->fwork[2], -60.0f, 0.4f, 10.0f, 0.01f);
@ -823,7 +823,7 @@ void Macbeth_8019C778(Actor* actor) {
actor->timer_0BC = 200; actor->timer_0BC = 200;
D_i5_801BE320[19] = 0; D_i5_801BE320[19] = 0;
actor->state++; actor->state++;
AUDIO_PLAY_SFX(0x1900000E, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OB_GATE_CLOSE, actor->sfxSource, 4);
} }
} }
break; break;
@ -832,7 +832,7 @@ void Macbeth_8019C778(Actor* actor) {
if ((actor->timer_0BC <= 0) && (D_i5_801BE320[25] == 1)) { if ((actor->timer_0BC <= 0) && (D_i5_801BE320[25] == 1)) {
actor->timer_0BC = 60; actor->timer_0BC = 60;
actor->state++; actor->state++;
AUDIO_PLAY_SFX(0x1900000D, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OB_GATE_OPEN, actor->sfxSource, 4);
} }
break; break;
case 3: case 3:
@ -845,7 +845,7 @@ void Macbeth_8019C778(Actor* actor) {
D_i5_801BE320[30] = 0; D_i5_801BE320[30] = 0;
D_i5_801BE320[25] = 0; D_i5_801BE320[25] = 0;
} }
AUDIO_PLAY_SFX(0x1900000E, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OB_GATE_CLOSE, actor->sfxSource, 4);
} }
if (actor->timer_0BC <= 0) { if (actor->timer_0BC <= 0) {
D_i5_801BE320[30]++; D_i5_801BE320[30]++;
@ -855,7 +855,7 @@ void Macbeth_8019C778(Actor* actor) {
} }
actor->timer_0BC = 100; actor->timer_0BC = 100;
actor->state--; actor->state--;
AUDIO_PLAY_SFX(0x1900000E, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OB_GATE_CLOSE, actor->sfxSource, 4);
} }
if (actor->timer_0BC == 30) { if (actor->timer_0BC == 30) {
Macbeth_8019C5B8(actor); Macbeth_8019C5B8(actor);
@ -893,15 +893,15 @@ void Macbeth_8019C778(Actor* actor) {
gMissionStatus = MISSION_COMPLETE; gMissionStatus = MISSION_COMPLETE;
} }
actor->state++; actor->state++;
Audio_KillSfxBySourceAndId(gPlayer[0].sfxSource, 0x1100000A); Audio_KillSfxBySourceAndId(gPlayer[0].sfxSource, NA_SE_TANK_SLIDE);
Audio_KillSfxBySourceAndId(gPlayer[0].sfxSource, 0x01004024); Audio_KillSfxBySourceAndId(gPlayer[0].sfxSource, NA_SE_TANK_BURNER_HALF);
} }
break; break;
} }
if (actor->dmgType != DMG_NONE) { if (actor->dmgType != DMG_NONE) {
actor->dmgType = DMG_NONE; actor->dmgType = DMG_NONE;
AUDIO_PLAY_SFX(0x29121007, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_REFLECT, actor->sfxSource, 4);
} }
if (D_i5_801BE320[4] > 0) { if (D_i5_801BE320[4] > 0) {
@ -1124,7 +1124,7 @@ void Macbeth_8019D910(Actor* actor, s32* arg1, s32* arg2, s32 arg3, f32 arg4, f3
if (((actor->dmgType != DMG_NONE) && (arg3 == actor->dmgPart)) || if (((actor->dmgType != DMG_NONE) && (arg3 == actor->dmgPart)) ||
((D_MA_801BE2F0[1] - 1 == actor->iwork[5]) && (actor->iwork[5] < D_MA_801BE2F0[3])) || ((D_MA_801BE2F0[1] - 1 == actor->iwork[5]) && (actor->iwork[5] < D_MA_801BE2F0[3])) ||
(((D_MA_801BE2F0[1] + 1) == actor->iwork[5]) && (D_MA_801BE2F0[3] < actor->iwork[5]))) { (((D_MA_801BE2F0[1] + 1) == actor->iwork[5]) && (D_MA_801BE2F0[3] < actor->iwork[5]))) {
AUDIO_PLAY_SFX(0x29034003, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OB_DAMAGE_M, actor->sfxSource, 4);
actor->dmgType = DMG_NONE; actor->dmgType = DMG_NONE;
func_effect_8007C120(actor->obj.pos.x + arg4, actor->obj.pos.y + 200.0f, actor->obj.pos.z + arg5, func_effect_8007C120(actor->obj.pos.x + arg4, actor->obj.pos.y + 200.0f, actor->obj.pos.z + arg5,
actor->vel.x, actor->vel.y, actor->vel.z, 0.15f, 20); actor->vel.x, actor->vel.y, actor->vel.z, 0.15f, 20);
@ -1137,7 +1137,7 @@ void Macbeth_8019D910(Actor* actor, s32* arg1, s32* arg2, s32 arg3, f32 arg4, f3
} }
} else if ((actor->dmgType != DMG_NONE) && (actor->dmgPart == 0)) { } else if ((actor->dmgType != DMG_NONE) && (actor->dmgPart == 0)) {
actor->dmgType = DMG_NONE; actor->dmgType = DMG_NONE;
AUDIO_PLAY_SFX(0x29121007, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_REFLECT, actor->sfxSource, 4);
} }
break; break;
case 1: case 1:
@ -1152,7 +1152,7 @@ void Macbeth_8019D910(Actor* actor, s32* arg1, s32* arg2, s32 arg3, f32 arg4, f3
RAND_FLOAT_CENTERED(30.0f), (s32) (RAND_FLOAT(50.0f) + 70.0f), 3, (RAND_FLOAT(0.8f) + 0.3f) * 2.0f); RAND_FLOAT_CENTERED(30.0f), (s32) (RAND_FLOAT(50.0f) + 70.0f), 3, (RAND_FLOAT(0.8f) + 0.3f) * 2.0f);
} }
AUDIO_PLAY_SFX(0x2903B009, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_EXPLOSION_M, actor->sfxSource, 4);
*arg7 = 1; *arg7 = 1;
*arg2 = 20; *arg2 = 20;
(*arg1)++; (*arg1)++;
@ -1162,7 +1162,7 @@ void Macbeth_8019D910(Actor* actor, s32* arg1, s32* arg2, s32 arg3, f32 arg4, f3
((D_MA_801BE2F0[1] - 1 == actor->iwork[5]) && (actor->iwork[5] < D_MA_801BE2F0[3])) || ((D_MA_801BE2F0[1] - 1 == actor->iwork[5]) && (actor->iwork[5] < D_MA_801BE2F0[3])) ||
(((D_MA_801BE2F0[1] + 1) == actor->iwork[5]) && (D_MA_801BE2F0[3] < actor->iwork[5])) || (((D_MA_801BE2F0[1] + 1) == actor->iwork[5]) && (D_MA_801BE2F0[3] < actor->iwork[5])) ||
((actor->obj.id == OBJ_ACTOR_209) && (arg3 == 2))) { ((actor->obj.id == OBJ_ACTOR_209) && (arg3 == 2))) {
AUDIO_PLAY_SFX(0x29034003, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OB_DAMAGE_M, actor->sfxSource, 4);
actor->dmgType = DMG_NONE; actor->dmgType = DMG_NONE;
func_effect_8007C120(actor->obj.pos.x + arg4, actor->obj.pos.y + 200.0f, actor->obj.pos.z + arg5, func_effect_8007C120(actor->obj.pos.x + arg4, actor->obj.pos.y + 200.0f, actor->obj.pos.z + arg5,
actor->vel.x, actor->vel.y, actor->vel.z, 0.15f, 20); actor->vel.x, actor->vel.y, actor->vel.z, 0.15f, 20);
@ -1177,7 +1177,7 @@ void Macbeth_8019D910(Actor* actor, s32* arg1, s32* arg2, s32 arg3, f32 arg4, f3
} }
} else if ((actor->dmgType != DMG_NONE) && (actor->dmgPart == 0)) { } else if ((actor->dmgType != DMG_NONE) && (actor->dmgPart == 0)) {
actor->dmgType = DMG_NONE; actor->dmgType = DMG_NONE;
AUDIO_PLAY_SFX(0x29121007, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_REFLECT, actor->sfxSource, 4);
} }
break; break;
case 3: case 3:
@ -1193,7 +1193,7 @@ void Macbeth_8019D910(Actor* actor, s32* arg1, s32* arg2, s32 arg3, f32 arg4, f3
(s32) (RAND_FLOAT(50.0f) + 70.0f), 2, (RAND_FLOAT(0.8f) + 0.3f) * 1.5f); (s32) (RAND_FLOAT(50.0f) + 70.0f), 2, (RAND_FLOAT(0.8f) + 0.3f) * 1.5f);
} }
} }
AUDIO_PLAY_SFX(0x2903B009, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_EXPLOSION_M, actor->sfxSource, 4);
*arg7 = 2; *arg7 = 2;
var_v0 = arg3; var_v0 = arg3;
if (var_v0 == 3) { if (var_v0 == 3) {
@ -1290,7 +1290,7 @@ void Macbeth_8019E624(Actor* actor, s32* arg1, s32* arg2, s32 arg3, f32 arg4, f3
if (((actor->dmgType != DMG_NONE) && (arg3 == actor->dmgPart)) || if (((actor->dmgType != DMG_NONE) && (arg3 == actor->dmgPart)) ||
((D_MA_801BE2F0[1] - 1 == actor->iwork[5]) && (actor->iwork[5] < D_MA_801BE2F0[3])) || ((D_MA_801BE2F0[1] - 1 == actor->iwork[5]) && (actor->iwork[5] < D_MA_801BE2F0[3])) ||
(((D_MA_801BE2F0[1] + 1) == actor->iwork[5]) && (D_MA_801BE2F0[3] < actor->iwork[5]))) { (((D_MA_801BE2F0[1] + 1) == actor->iwork[5]) && (D_MA_801BE2F0[3] < actor->iwork[5]))) {
AUDIO_PLAY_SFX(0x29034003, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OB_DAMAGE_M, actor->sfxSource, 4);
actor->dmgType = DMG_NONE; actor->dmgType = DMG_NONE;
func_effect_8007C120(actor->obj.pos.x + arg4, actor->obj.pos.y + 200.0f, actor->obj.pos.z + arg5, func_effect_8007C120(actor->obj.pos.x + arg4, actor->obj.pos.y + 200.0f, actor->obj.pos.z + arg5,
actor->vel.x, actor->vel.y, actor->vel.z, 0.15f, 10); actor->vel.x, actor->vel.y, actor->vel.z, 0.15f, 10);
@ -1303,7 +1303,7 @@ void Macbeth_8019E624(Actor* actor, s32* arg1, s32* arg2, s32 arg3, f32 arg4, f3
} }
} else if (actor->dmgType != DMG_NONE) { } else if (actor->dmgType != DMG_NONE) {
actor->dmgType = DMG_NONE; actor->dmgType = DMG_NONE;
AUDIO_PLAY_SFX(0x29121007, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_REFLECT, actor->sfxSource, 4);
} }
Macbeth_8019B580(actor, arg2); Macbeth_8019B580(actor, arg2);
break; break;
@ -1317,7 +1317,7 @@ void Macbeth_8019E624(Actor* actor, s32* arg1, s32* arg2, s32 arg3, f32 arg4, f3
if (((actor->dmgType != DMG_NONE) && (arg3 == actor->dmgPart)) || if (((actor->dmgType != DMG_NONE) && (arg3 == actor->dmgPart)) ||
((D_MA_801BE2F0[1] - 1 == actor->iwork[5]) && (actor->iwork[5] < D_MA_801BE2F0[3])) || ((D_MA_801BE2F0[1] - 1 == actor->iwork[5]) && (actor->iwork[5] < D_MA_801BE2F0[3])) ||
(((D_MA_801BE2F0[1] + 1) == actor->iwork[5]) && (D_MA_801BE2F0[3] < actor->iwork[5]))) { (((D_MA_801BE2F0[1] + 1) == actor->iwork[5]) && (D_MA_801BE2F0[3] < actor->iwork[5]))) {
AUDIO_PLAY_SFX(0x29034003, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OB_DAMAGE_M, actor->sfxSource, 4);
actor->dmgType = DMG_NONE; actor->dmgType = DMG_NONE;
func_effect_8007C120(actor->obj.pos.x + arg4, actor->obj.pos.y + 200.0f, actor->obj.pos.z + arg5, func_effect_8007C120(actor->obj.pos.x + arg4, actor->obj.pos.y + 200.0f, actor->obj.pos.z + arg5,
actor->vel.x, actor->vel.y, actor->vel.z, 0.2f, 10); actor->vel.x, actor->vel.y, actor->vel.z, 0.2f, 10);
@ -1332,7 +1332,7 @@ void Macbeth_8019E624(Actor* actor, s32* arg1, s32* arg2, s32 arg3, f32 arg4, f3
} else { } else {
if (actor->dmgType != DMG_NONE) { if (actor->dmgType != DMG_NONE) {
actor->dmgType = DMG_NONE; actor->dmgType = DMG_NONE;
AUDIO_PLAY_SFX(0x29121007, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_REFLECT, actor->sfxSource, 4);
} }
} }
break; break;
@ -1396,7 +1396,7 @@ void Macbeth_8019EBF8(Actor* actor, s32* arg1, s32* arg2, s32 arg3, f32 arg4, f3
if (((actor->dmgType != DMG_NONE) && (arg3 == actor->dmgPart)) || if (((actor->dmgType != DMG_NONE) && (arg3 == actor->dmgPart)) ||
((D_MA_801BE2F0[1] - 1 == actor->iwork[5]) && (actor->iwork[5] < D_MA_801BE2F0[3])) || ((D_MA_801BE2F0[1] - 1 == actor->iwork[5]) && (actor->iwork[5] < D_MA_801BE2F0[3])) ||
(((D_MA_801BE2F0[1] + 1) == actor->iwork[5]) && (D_MA_801BE2F0[3] < actor->iwork[5]))) { (((D_MA_801BE2F0[1] + 1) == actor->iwork[5]) && (D_MA_801BE2F0[3] < actor->iwork[5]))) {
AUDIO_PLAY_SFX(0x29034003, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OB_DAMAGE_M, actor->sfxSource, 4);
actor->dmgType = DMG_NONE; actor->dmgType = DMG_NONE;
func_effect_8007C120(actor->obj.pos.x + arg4, actor->obj.pos.y + 200.0f, actor->obj.pos.z + arg5, func_effect_8007C120(actor->obj.pos.x + arg4, actor->obj.pos.y + 200.0f, actor->obj.pos.z + arg5,
actor->vel.x, actor->vel.y, actor->vel.z, 0.15f, 10); actor->vel.x, actor->vel.y, actor->vel.z, 0.15f, 10);
@ -1410,7 +1410,7 @@ void Macbeth_8019EBF8(Actor* actor, s32* arg1, s32* arg2, s32 arg3, f32 arg4, f3
} }
} else if (actor->dmgType != DMG_NONE) { } else if (actor->dmgType != DMG_NONE) {
actor->dmgType = DMG_NONE; actor->dmgType = DMG_NONE;
AUDIO_PLAY_SFX(0x29121007, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_REFLECT, actor->sfxSource, 4);
} }
Macbeth_8019B580(actor, arg2); Macbeth_8019B580(actor, arg2);
return; return;
@ -1556,7 +1556,7 @@ void Macbeth_8019F164(Actor* actor) {
if (sp44 != 0) { if (sp44 != 0) {
sp60.x -= 60.0f; sp60.x -= 60.0f;
func_effect_8007EE68(OBJ_EFFECT_378, &sp60, &sp54, &sp48, &D_i5_801BA714, 1.0f); func_effect_8007EE68(OBJ_EFFECT_378, &sp60, &sp54, &sp48, &D_i5_801BA714, 1.0f);
AUDIO_PLAY_SFX(0x2903101B, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_MISSILE_SHOT, actor->sfxSource, 4);
actor->iwork[4]++; actor->iwork[4]++;
} else if ((D_i5_801BE310 == actor->iwork[5]) || } else if ((D_i5_801BE310 == actor->iwork[5]) ||
((gPlayer[0].pos.x - actor->obj.pos.x > 300.0f) && ((gPlayer[0].pos.x - actor->obj.pos.x > 300.0f) &&
@ -1568,7 +1568,7 @@ void Macbeth_8019F164(Actor* actor) {
(actor->health != 0)) { (actor->health != 0)) {
sp60.x -= 60.0f; sp60.x -= 60.0f;
func_effect_8007EE68(OBJ_EFFECT_378, &sp60, &sp54, &sp48, &D_i5_801BA714, 1.0f); func_effect_8007EE68(OBJ_EFFECT_378, &sp60, &sp54, &sp48, &D_i5_801BA714, 1.0f);
AUDIO_PLAY_SFX(0x2903101B, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_MISSILE_SHOT, actor->sfxSource, 4);
actor->iwork[4]++; actor->iwork[4]++;
} }
} }
@ -1591,7 +1591,7 @@ void Macbeth_8019F164(Actor* actor) {
case 3: case 3:
if ((actor->timer_0BC == 0) && (actor->health != 0)) { if ((actor->timer_0BC == 0) && (actor->health != 0)) {
func_effect_8007EE68(OBJ_EFFECT_378, &sp60, &sp54, &sp48, &D_i5_801BA714, 1.0f); func_effect_8007EE68(OBJ_EFFECT_378, &sp60, &sp54, &sp48, &D_i5_801BA714, 1.0f);
AUDIO_PLAY_SFX(0x2903101B, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_MISSILE_SHOT, actor->sfxSource, 4);
actor->iwork[4]++; actor->iwork[4]++;
} }
break; break;
@ -1614,7 +1614,7 @@ void Macbeth_8019F164(Actor* actor) {
if ((actor->timer_0BC == 0) && (actor->health != 0)) { if ((actor->timer_0BC == 0) && (actor->health != 0)) {
sp60.x += 60.0f; sp60.x += 60.0f;
func_effect_8007EE68(OBJ_EFFECT_378, &sp60, &sp54, &sp48, &D_i5_801BA714, 1.0f); func_effect_8007EE68(OBJ_EFFECT_378, &sp60, &sp54, &sp48, &D_i5_801BA714, 1.0f);
AUDIO_PLAY_SFX(0x2903101B, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_MISSILE_SHOT, actor->sfxSource, 4);
actor->iwork[4]++; actor->iwork[4]++;
} }
break; break;
@ -1644,7 +1644,7 @@ void Macbeth_8019FC54(Actor* actor, s32* arg1, s32* arg2, s32 arg3, s32 arg4, f3
if (((actor->dmgType != DMG_NONE) && (actor->dmgPart >= arg3) && (arg4 >= actor->dmgPart)) || if (((actor->dmgType != DMG_NONE) && (actor->dmgPart >= arg3) && (arg4 >= actor->dmgPart)) ||
((D_MA_801BE2F0[1] - 1 == actor->iwork[5]) && (actor->iwork[5] < D_MA_801BE2F0[3])) || ((D_MA_801BE2F0[1] - 1 == actor->iwork[5]) && (actor->iwork[5] < D_MA_801BE2F0[3])) ||
(((D_MA_801BE2F0[1] + 1) == actor->iwork[5]) && (D_MA_801BE2F0[3] < actor->iwork[5]))) { (((D_MA_801BE2F0[1] + 1) == actor->iwork[5]) && (D_MA_801BE2F0[3] < actor->iwork[5]))) {
AUDIO_PLAY_SFX(0x29034003, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OB_DAMAGE_M, actor->sfxSource, 4);
actor->dmgType = DMG_NONE; actor->dmgType = DMG_NONE;
func_effect_8007C120(actor->obj.pos.x + arg5, actor->obj.pos.y + 200.0f, actor->obj.pos.z + arg6, func_effect_8007C120(actor->obj.pos.x + arg5, actor->obj.pos.y + 200.0f, actor->obj.pos.z + arg6,
actor->vel.x, actor->vel.y, actor->vel.z, 0.15f, 10); actor->vel.x, actor->vel.y, actor->vel.z, 0.15f, 10);
@ -1661,7 +1661,7 @@ void Macbeth_8019FC54(Actor* actor, s32* arg1, s32* arg2, s32 arg3, s32 arg4, f3
} }
} else if (actor->dmgType != DMG_NONE) { } else if (actor->dmgType != DMG_NONE) {
actor->dmgType = DMG_NONE; actor->dmgType = DMG_NONE;
AUDIO_PLAY_SFX(0x29121007, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_REFLECT, actor->sfxSource, 4);
} }
Macbeth_8019B580(actor, arg2); Macbeth_8019B580(actor, arg2);
break; break;
@ -1948,13 +1948,13 @@ void Macbeth_801A0BD8(Scenery* scenery) {
break; break;
case 1: case 1:
if (scenery->timer_4C == 1) { if (scenery->timer_4C == 1) {
AUDIO_PLAY_SFX(0x01004024, gPlayer[0].sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_TANK_BURNER_HALF, gPlayer[0].sfxSource, 0);
} }
if (scenery->timer_4C <= 0) { if (scenery->timer_4C <= 0) {
Math_SmoothStepToF(&scenery->vel.x, 1751.0f, 0.2f, 80.0f, 1.0f); Math_SmoothStepToF(&scenery->vel.x, 1751.0f, 0.2f, 80.0f, 1.0f);
if (scenery->vel.x >= 1750.0) { if (scenery->vel.x >= 1750.0) {
AUDIO_PLAY_SFX(0x1940807B, scenery->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_OB_POINT_SWITCH, scenery->sfxSource, 0);
Audio_KillSfxBySourceAndId(gPlayer[0].sfxSource, 0x01004024); Audio_KillSfxBySourceAndId(gPlayer[0].sfxSource, NA_SE_TANK_BURNER_HALF);
scenery->timer_4C = 5; scenery->timer_4C = 5;
scenery->state = 2; scenery->state = 2;
} }
@ -2469,7 +2469,7 @@ void Macbeth_801A2DD8(Scenery* scenery) {
} }
break; break;
case 1: case 1:
func_effect_8007A6F0(&scenery->obj.pos, 0x2903B009); func_effect_8007A6F0(&scenery->obj.pos, NA_SE_EN_EXPLOSION_M);
gControllerRumbleFlags[gMainController] = 1; gControllerRumbleFlags[gMainController] = 1;
gControllerRumbleTimers[gMainController] = 15; gControllerRumbleTimers[gMainController] = 15;
for (i = 0; i < 6; i++) { for (i = 0; i < 6; i++) {
@ -2785,14 +2785,14 @@ void Macbeth_801A3E98(Actor* actor) {
case 0: case 0:
if ((actor->dmgType != DMG_NONE) && (actor->dmgType != DMG_COLLISION)) { if ((actor->dmgType != DMG_NONE) && (actor->dmgType != DMG_COLLISION)) {
actor->dmgType = DMG_NONE; actor->dmgType = DMG_NONE;
AUDIO_PLAY_SFX(0x1903205F, actor->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_OB_MC_SWITCH_ON, actor->sfxSource, 0);
actor->state = 1; actor->state = 1;
} }
break; break;
case 1: case 1:
Math_SmoothStepToF(&actor->fwork[1], -181.0f, 0.6f, 20.0f, 0.0f); Math_SmoothStepToF(&actor->fwork[1], -181.0f, 0.6f, 20.0f, 0.0f);
if (actor->fwork[1] <= -180.0f) { if (actor->fwork[1] <= -180.0f) {
AUDIO_PLAY_SFX(0x19033008, actor->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_OB_MC_SWITCH_UP, actor->sfxSource, 0);
actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_MA_603648C); actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_MA_603648C);
actor->iwork[0] = 2; actor->iwork[0] = 2;
actor->state = 2; actor->state = 2;
@ -2813,16 +2813,16 @@ void Macbeth_801A3E98(Actor* actor) {
break; break;
} }
if (actor->dmgType != DMG_NONE) { if (actor->dmgType != DMG_NONE) {
AUDIO_PLAY_SFX(0x29121007, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_REFLECT, actor->sfxSource, 4);
actor->dmgType = DMG_NONE; actor->dmgType = DMG_NONE;
} }
Math_SmoothStepToF(&actor->fwork[0], 30.0f, 0.4f, 10.0f, 0.0f); Math_SmoothStepToF(&actor->fwork[0], 30.0f, 0.4f, 10.0f, 0.0f);
Math_SmoothStepToF(&actor->fwork[4], 30.0f, 0.4f, 10.0f, 0.0f); Math_SmoothStepToF(&actor->fwork[4], 30.0f, 0.4f, 10.0f, 0.0f);
if (actor->fwork[0] < 31.0f) { if (actor->fwork[0] < 31.0f) {
if (actor->state >= 3) { if (actor->state >= 3) {
AUDIO_PLAY_SFX(0x19020060, actor->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_OB_MC_SWITCH_GRN, actor->sfxSource, 0);
} else { } else {
AUDIO_PLAY_SFX(0x19020061, actor->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_OB_MC_SWITCH_RED, actor->sfxSource, 0);
} }
actor->fwork[0] = 255.0f; actor->fwork[0] = 255.0f;
actor->fwork[4] = 170.0f; actor->fwork[4] = 170.0f;
@ -2896,7 +2896,7 @@ void Macbeth_801A46A0(Actor* actor) {
Math_SmoothStepToF(&actor->gravity, 5.0f, 0.08f, 1.0f, 0.0f); Math_SmoothStepToF(&actor->gravity, 5.0f, 0.08f, 1.0f, 0.0f);
if (actor->obj.pos.y < 80.0f) { if (actor->obj.pos.y < 80.0f) {
if (actor->unk_046 != 0) { if (actor->unk_046 != 0) {
AUDIO_PLAY_SFX(0x19030006, actor->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_OB_ROCK_BOUND, actor->sfxSource, 0);
actor->obj.pos.y = 80.0f; actor->obj.pos.y = 80.0f;
if (actor->vel.y < 0) { if (actor->vel.y < 0) {
actor->vel.y = -actor->vel.y * (actor->unk_046 * 0.07f); actor->vel.y = -actor->vel.y * (actor->unk_046 * 0.07f);
@ -2947,11 +2947,11 @@ void Macbeth_801A46A0(Actor* actor) {
void Macbeth_801A49B8(Actor* actor) { void Macbeth_801A49B8(Actor* actor) {
if (actor->dmgType != DMG_NONE) { if (actor->dmgType != DMG_NONE) {
AUDIO_PLAY_SFX(0x29024003, actor->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_EN_DAMAGE_M, actor->sfxSource, 0);
actor->timer_0C6 = 15; actor->timer_0C6 = 15;
actor->health -= actor->damage; actor->health -= actor->damage;
if (actor->health <= 0) { if (actor->health <= 0) {
func_effect_8007A6F0(&actor->obj.pos, 0x2903B009); func_effect_8007A6F0(&actor->obj.pos, NA_SE_EN_EXPLOSION_M);
gHitCount++; gHitCount++;
actor->state = 2; actor->state = 2;
} }
@ -3047,13 +3047,13 @@ void Macbeth_801A4B24(Actor* actor) {
gMissionStatus = MISSION_ACCOMPLISHED; gMissionStatus = MISSION_ACCOMPLISHED;
actor->timer_0BC = 5; actor->timer_0BC = 5;
actor->state = 6; actor->state = 6;
Audio_KillSfxBySourceAndId(gPlayer[0].sfxSource, 0x1100000A); Audio_KillSfxBySourceAndId(gPlayer[0].sfxSource, NA_SE_TANK_SLIDE);
Audio_KillSfxBySourceAndId(gPlayer[0].sfxSource, 0x01004024); Audio_KillSfxBySourceAndId(gPlayer[0].sfxSource, NA_SE_TANK_BURNER_HALF);
} }
break; break;
case 6: case 6:
if (actor->timer_0BC == 1) { if (actor->timer_0BC == 1) {
AUDIO_PLAY_SFX(0x1940405D, actor->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_OB_HEAVY_SWITCH, actor->sfxSource, 0);
} }
if (actor->timer_0BC == 0) { if (actor->timer_0BC == 0) {
Math_SmoothStepToF(&actor->fwork[7], -41.0f, 0.2f, 5.0f, 0.01f); Math_SmoothStepToF(&actor->fwork[7], -41.0f, 0.2f, 5.0f, 0.01f);
@ -3072,7 +3072,7 @@ void Macbeth_801A4B24(Actor* actor) {
} }
if (actor->dmgType != DMG_NONE) { if (actor->dmgType != DMG_NONE) {
actor->dmgType = DMG_NONE; actor->dmgType = DMG_NONE;
AUDIO_PLAY_SFX(0x29121007, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_REFLECT, actor->sfxSource, 4);
} }
Math_SmoothStepToF(&actor->fwork[0], 30, 0.4f, actor->fwork[1], 0.0f); Math_SmoothStepToF(&actor->fwork[0], 30, 0.4f, actor->fwork[1], 0.0f);
Math_SmoothStepToF(&actor->fwork[4], 30, 0.4f, actor->fwork[1], 0.0f); Math_SmoothStepToF(&actor->fwork[4], 30, 0.4f, actor->fwork[1], 0.0f);
@ -3192,7 +3192,7 @@ void Macbeth_801A57D0(Effect* effect) {
effect->vel.x = sp44.x; effect->vel.x = sp44.x;
effect->vel.y = sp44.y; effect->vel.y = sp44.y;
effect->vel.z = sp44.z; effect->vel.z = sp44.z;
AUDIO_PLAY_SFX(0x09007011, effect->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_ROLLING_REFLECT, effect->sfxSource, 4);
} }
if ((gPlayer[0].barrelRollAlpha == 0) && (gPlayer[0].timer_498 == 0)) { if ((gPlayer[0].barrelRollAlpha == 0) && (gPlayer[0].timer_498 == 0)) {
Player_ApplyDamage(&gPlayer[0], 0, effect->info.damage); Player_ApplyDamage(&gPlayer[0], 0, effect->info.damage);
@ -3282,14 +3282,14 @@ void Macbeth_801A5E54(Actor* actor) {
} }
if ((D_i5_801BA1E0 - actor->obj.pos.z) < -800.0f) { if ((D_i5_801BA1E0 - actor->obj.pos.z) < -800.0f) {
if (actor->iwork[0] == 0) { if (actor->iwork[0] == 0) {
AUDIO_PLAY_SFX(0x11001063, actor->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_OB_SIDE_GATE_CLOSE, actor->sfxSource, 0);
actor->iwork[0]++; actor->iwork[0]++;
} }
Math_SmoothStepToF(&actor->obj.pos.x, actor->fwork[0] + (actor->fwork[2] * 400.0f), 0.1f, 4.0f, 0.01f); Math_SmoothStepToF(&actor->obj.pos.x, actor->fwork[0] + (actor->fwork[2] * 400.0f), 0.1f, 4.0f, 0.01f);
} }
if (actor->dmgType != DMG_NONE) { if (actor->dmgType != DMG_NONE) {
actor->dmgType = DMG_NONE; actor->dmgType = DMG_NONE;
AUDIO_PLAY_SFX(0x29121007, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_REFLECT, actor->sfxSource, 4);
} }
} }
@ -3306,14 +3306,14 @@ void Macbeth_801A5FD0(Actor* actor) {
} }
if (gPlayer[0].trueZpos - actor->obj.pos.z < actor->fwork[2]) { if (gPlayer[0].trueZpos - actor->obj.pos.z < actor->fwork[2]) {
if (actor->iwork[0] == 0) { if (actor->iwork[0] == 0) {
AUDIO_PLAY_SFX(0x19001062, actor->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_OB_POST_UP, actor->sfxSource, 0);
actor->iwork[0] += 1; actor->iwork[0] += 1;
} }
Math_SmoothStepToF(&actor->obj.pos.y, actor->fwork[1] + 356.0f, 0.4f, 20.0f, 0.01f); Math_SmoothStepToF(&actor->obj.pos.y, actor->fwork[1] + 356.0f, 0.4f, 20.0f, 0.01f);
} }
if (actor->dmgType != DMG_NONE) { if (actor->dmgType != DMG_NONE) {
actor->dmgType = DMG_NONE; actor->dmgType = DMG_NONE;
AUDIO_PLAY_SFX(0x29121007, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_REFLECT, actor->sfxSource, 4);
} }
} }
@ -3337,14 +3337,14 @@ void Macbeth_801A6144(Actor* actor) {
if (actor->dmgType != DMG_NONE) { if (actor->dmgType != DMG_NONE) {
func_effect_8007C120(actor->obj.pos.x, actor->obj.pos.y + 100.0f, actor->obj.pos.z, actor->vel.x, func_effect_8007C120(actor->obj.pos.x, actor->obj.pos.y + 100.0f, actor->obj.pos.z, actor->vel.x,
actor->vel.y, actor->vel.z, 0.15f, 20); actor->vel.y, actor->vel.z, 0.15f, 20);
AUDIO_PLAY_SFX(0x2903300E, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_DAMAGE_S, actor->sfxSource, 4);
actor->health -= actor->damage; actor->health -= actor->damage;
actor->timer_0C6 = 15; actor->timer_0C6 = 15;
if ((gPlayer[0].trueZpos - 20.0f) < actor->obj.pos.z) { if ((gPlayer[0].trueZpos - 20.0f) < actor->obj.pos.z) {
actor->health = 0; actor->health = 0;
} }
if (actor->health <= 0) { if (actor->health <= 0) {
AUDIO_PLAY_SFX(0x2903B009, actor->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_EN_EXPLOSION_M, actor->sfxSource, 0);
func_effect_8007BFFC(actor->obj.pos.x, actor->obj.pos.y + 100.0f, actor->obj.pos.z, 0.0f, 0.0f, func_effect_8007BFFC(actor->obj.pos.x, actor->obj.pos.y + 100.0f, actor->obj.pos.z, 0.0f, 0.0f,
0.0f, 14.0f, 5); 0.0f, 14.0f, 5);
for (i = 0; i < 20; i++) { for (i = 0; i < 20; i++) {
@ -3917,7 +3917,7 @@ void Macbeth_801A7E7C(Actor* actor) {
D_i5_801BE320[2] = 5; D_i5_801BE320[2] = 5;
D_i5_801BE320[31] = 30; D_i5_801BE320[31] = 30;
actor->timer_0BC = 100; actor->timer_0BC = 100;
AUDIO_PLAY_SFX(0x19022067, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_MCBOSS_CHARGE0, actor->sfxSource, 4);
actor->state = 12; actor->state = 12;
} }
} else if ((D_i5_801BE320[26] != 0) && (D_i5_801BE320[10] > 0)) { } else if ((D_i5_801BE320[26] != 0) && (D_i5_801BE320[10] > 0)) {
@ -3987,7 +3987,7 @@ void Macbeth_801A7E7C(Actor* actor) {
D_i5_801BE320[3] = (s16) (D_i5_801BE320[3] + 1); D_i5_801BE320[3] = (s16) (D_i5_801BE320[3] + 1);
if ((D_i5_801BE320[3] == 26) && (D_i5_801BE320[10] > 0)) { if ((D_i5_801BE320[3] == 26) && (D_i5_801BE320[10] > 0)) {
actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_MA_6036818); actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_MA_6036818);
AUDIO_PLAY_SFX(0x2902405E, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_CATCH, actor->sfxSource, 4);
} }
} else { } else {
actor->info.hitbox = SEGMENTED_TO_VIRTUAL(gNoHitbox); actor->info.hitbox = SEGMENTED_TO_VIRTUAL(gNoHitbox);
@ -4035,7 +4035,7 @@ void Macbeth_801A7E7C(Actor* actor) {
case 8: case 8:
Macbeth_8019A198(actor); Macbeth_8019A198(actor);
if (((gGameFrameCount % 16) == 0)) { if (((gGameFrameCount % 16) == 0)) {
AUDIO_PLAY_SFX(0x29036099, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_MCBOSS_RAGE, actor->sfxSource, 4);
} }
Macbeth_801A74C4(actor); Macbeth_801A74C4(actor);
Macbeth_801A6984(actor); Macbeth_801A6984(actor);
@ -4066,7 +4066,7 @@ void Macbeth_801A7E7C(Actor* actor) {
SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 1); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 1);
SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 1); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 1);
gFillScreenRed = gFillScreenGreen = gFillScreenBlue = gFillScreenAlpha = 255; gFillScreenRed = gFillScreenGreen = gFillScreenBlue = gFillScreenAlpha = 255;
AUDIO_PLAY_SFX(0x2940D09A, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_DOWN_IMPACT, actor->sfxSource, 4);
Radio_PlayMessage(gMsg_ID_17450, RCID_BOSS_MACBETH); Radio_PlayMessage(gMsg_ID_17450, RCID_BOSS_MACBETH);
func_effect_8007D2C8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 10.0f); func_effect_8007D2C8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 10.0f);
Macbeth_801AD624(actor->vwork[2].x, actor->vwork[2].y, actor->vwork[2].z, Macbeth_801AD624(actor->vwork[2].x, actor->vwork[2].y, actor->vwork[2].z,
@ -4084,9 +4084,9 @@ void Macbeth_801A7E7C(Actor* actor) {
D_i5_801BE368[13] = 30.0f; D_i5_801BE368[13] = 30.0f;
if (D_i5_801BE320[29] > 0) { if (D_i5_801BE320[29] > 0) {
if (D_i5_801BE320[29] > 100) { if (D_i5_801BE320[29] > 100) {
AUDIO_PLAY_SFX(0x29034003, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OB_DAMAGE_M, actor->sfxSource, 4);
} else { } else {
AUDIO_PLAY_SFX(0x2943500F, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_KNOCK_DOWN, actor->sfxSource, 4);
} }
} }
} }
@ -4235,7 +4235,7 @@ void Macbeth_801A7E7C(Actor* actor) {
Macbeth_801A72DC(actor); Macbeth_801A72DC(actor);
Macbeth_801A6984(actor); Macbeth_801A6984(actor);
if (D_i5_801BE320[9] <= 0) { if (D_i5_801BE320[9] <= 0) {
Audio_KillSfxBySourceAndId(actor->sfxSource, 0x19022067); Audio_KillSfxBySourceAndId(actor->sfxSource, NA_SE_EN_MCBOSS_CHARGE0);
actor->state = 14; actor->state = 14;
actor->vel.y = -20.0f; actor->vel.y = -20.0f;
} }
@ -4255,7 +4255,7 @@ void Macbeth_801A7E7C(Actor* actor) {
} }
} }
if (actor->timer_0BC == 0) { if (actor->timer_0BC == 0) {
Audio_KillSfxBySourceAndId(actor->sfxSource, 0x19022067); Audio_KillSfxBySourceAndId(actor->sfxSource, NA_SE_EN_MCBOSS_CHARGE0);
D_i5_801BE320[3] = 0; D_i5_801BE320[3] = 0;
D_i5_801BE320[2] = 6; D_i5_801BE320[2] = 6;
D_i5_801BE320[31] = 30; D_i5_801BE320[31] = 30;
@ -4277,7 +4277,7 @@ void Macbeth_801A7E7C(Actor* actor) {
D_i5_801BE320[5] = 0; D_i5_801BE320[5] = 0;
D_i5_801BE320[7] = 0; D_i5_801BE320[7] = 0;
if (actor->timer_0BC == 60) { if (actor->timer_0BC == 60) {
AUDIO_PLAY_SFX(0x19023068, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_MCBOSS_SHOT0, actor->sfxSource, 4);
D_i5_801BE320[24] = 0; D_i5_801BE320[24] = 0;
spC6 = RAND_INT(5.0f); spC6 = RAND_INT(5.0f);
@ -4334,7 +4334,7 @@ void Macbeth_801A7E7C(Actor* actor) {
Macbeth_801A6984(actor); Macbeth_801A6984(actor);
if (actor->timer_0BC < 100) { if (actor->timer_0BC < 100) {
if (actor->timer_0BC == 98) { if (actor->timer_0BC == 98) {
AUDIO_PLAY_SFX(0x19022069, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_MCBOSS_PLATECHARGE, actor->sfxSource, 4);
} }
Matrix_RotateY(gCalcMatrix, RAND_FLOAT(2.0f) * (M_DTOR * 180.0f), MTXF_NEW); Matrix_RotateY(gCalcMatrix, RAND_FLOAT(2.0f) * (M_DTOR * 180.0f), MTXF_NEW);
sp360.x = 0.0f; sp360.x = 0.0f;
@ -4366,7 +4366,7 @@ void Macbeth_801A7E7C(Actor* actor) {
} }
actor->timer_0BC = D_i5_801BE320[27]; actor->timer_0BC = D_i5_801BE320[27];
actor->state = 16; actor->state = 16;
Audio_KillSfxBySourceAndId(actor->sfxSource, 0x19022069); Audio_KillSfxBySourceAndId(actor->sfxSource, NA_SE_EN_MCBOSS_PLATECHARGE);
} }
break; break;
case 16: case 16:
@ -4384,9 +4384,9 @@ void Macbeth_801A7E7C(Actor* actor) {
if (actor->timer_0BC < (D_i5_801BE320[27] - 40)) { if (actor->timer_0BC < (D_i5_801BE320[27] - 40)) {
if ((actor->timer_0BC + 42) == D_i5_801BE320[27]) { if ((actor->timer_0BC + 42) == D_i5_801BE320[27]) {
actor->sfxSource[0] = actor->vwork[2].x; actor->sfxSource[0] = actor->vwork[2].x;
AUDIO_PLAY_SFX(0x19006035, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_RNG_BEAM_SHOT, actor->sfxSource, 4);
actor->sfxSource[0] = actor->vwork[4].x; actor->sfxSource[0] = actor->vwork[4].x;
AUDIO_PLAY_SFX(0x19006035, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_RNG_BEAM_SHOT, actor->sfxSource, 4);
actor->sfxSource[0] = actor->obj.pos.x; actor->sfxSource[0] = actor->obj.pos.x;
} }
if (((gGameFrameCount % 2) == 0) && (D_i5_801BE320[15] == 0)) { if (((gGameFrameCount % 2) == 0) && (D_i5_801BE320[15] == 0)) {
@ -4452,7 +4452,7 @@ void Macbeth_801A7E7C(Actor* actor) {
Macbeth_801A78B0(actor); Macbeth_801A78B0(actor);
} }
if (actor->timer_0BC == 0) { if (actor->timer_0BC == 0) {
Audio_KillSfxBySourceAndId(actor->sfxSource, 0x19006035); Audio_KillSfxBySourceAndId(actor->sfxSource, NA_SE_EN_RNG_BEAM_SHOT);
actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_MA_603677C); actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_MA_603677C);
D_i5_801BE320[3] = 0; D_i5_801BE320[3] = 0;
D_i5_801BE320[2] = 1; D_i5_801BE320[2] = 1;
@ -4525,7 +4525,7 @@ void Macbeth_801A7E7C(Actor* actor) {
RAND_FLOAT_CENTERED(10.0f), (s32) (RAND_FLOAT(50.0f) + 70.0f), 11, 1.0f); RAND_FLOAT_CENTERED(10.0f), (s32) (RAND_FLOAT(50.0f) + 70.0f), 11, 1.0f);
gControllerRumbleFlags[gMainController] = 1; gControllerRumbleFlags[gMainController] = 1;
gControllerRumbleTimers[gMainController] = 15; gControllerRumbleTimers[gMainController] = 15;
AUDIO_PLAY_SFX(0x2940C00A, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_EXPLOSION_L, actor->sfxSource, 4);
actor->state = 21; actor->state = 21;
} }
break; break;
@ -4538,7 +4538,7 @@ void Macbeth_801A7E7C(Actor* actor) {
if ((actor->dmgType != DMG_NONE) && (actor->state >= 2)) { if ((actor->dmgType != DMG_NONE) && (actor->state >= 2)) {
actor->dmgType = DMG_NONE; actor->dmgType = DMG_NONE;
if ((actor->dmgPart == 0) && (D_i5_801BE320[9] > 0) && ((gPlayer[0].trueZpos - actor->obj.pos.z) > 200.0f)) { if ((actor->dmgPart == 0) && (D_i5_801BE320[9] > 0) && ((gPlayer[0].trueZpos - actor->obj.pos.z) > 200.0f)) {
AUDIO_PLAY_SFX(0x2903300E, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_DAMAGE_S, actor->sfxSource, 4);
actor->iwork[7] = 15; actor->iwork[7] = 15;
D_i5_801BE320[9] -= actor->damage; D_i5_801BE320[9] -= actor->damage;
Macbeth_801AD624(actor->obj.pos.x, actor->obj.pos.y + 80, actor->obj.pos.z + 50.0f, Macbeth_801AD624(actor->obj.pos.x, actor->obj.pos.y + 80, actor->obj.pos.z + 50.0f,
@ -4547,7 +4547,7 @@ void Macbeth_801A7E7C(Actor* actor) {
RAND_FLOAT_CENTERED(30.0f), RAND_FLOAT_CENTERED(30.0f), (s32) (RAND_FLOAT(50.0f) + 70.0f), RAND_FLOAT_CENTERED(30.0f), RAND_FLOAT_CENTERED(30.0f), (s32) (RAND_FLOAT(50.0f) + 70.0f),
3, RAND_FLOAT(1.0f)); 3, RAND_FLOAT(1.0f));
if (D_i5_801BE320[9] <= 0) { if (D_i5_801BE320[9] <= 0) {
AUDIO_PLAY_SFX(0x2903B009, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_EXPLOSION_M, actor->sfxSource, 4);
func_effect_8007D2C8(actor->obj.pos.x, actor->obj.pos.y + 80.0f, actor->obj.pos.z + 50.0f, 5.0f); func_effect_8007D2C8(actor->obj.pos.x, actor->obj.pos.y + 80.0f, actor->obj.pos.z + 50.0f, 5.0f);
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
Macbeth_801AD624(actor->obj.pos.x, actor->obj.pos.y + 80.0f, actor->obj.pos.z + 50.0f, Macbeth_801AD624(actor->obj.pos.x, actor->obj.pos.y + 80.0f, actor->obj.pos.z + 50.0f,
@ -4564,7 +4564,7 @@ void Macbeth_801A7E7C(Actor* actor) {
} }
} else if ((actor->dmgPart == 1) && (D_i5_801BE320[10] > 0) && } else if ((actor->dmgPart == 1) && (D_i5_801BE320[10] > 0) &&
((gPlayer[0].trueZpos - actor->obj.pos.z) > 200.0f)) { ((gPlayer[0].trueZpos - actor->obj.pos.z) > 200.0f)) {
AUDIO_PLAY_SFX(0x2903300E, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_DAMAGE_S, actor->sfxSource, 4);
actor->iwork[8] = 16; actor->iwork[8] = 16;
D_i5_801BE320[10] -= actor->damage; D_i5_801BE320[10] -= actor->damage;
Macbeth_801AD624(actor->obj.pos.x, actor->obj.pos.y - 30.0f, actor->obj.pos.z, RAND_FLOAT_CENTERED(10.0f), Macbeth_801AD624(actor->obj.pos.x, actor->obj.pos.y - 30.0f, actor->obj.pos.z, RAND_FLOAT_CENTERED(10.0f),
@ -4572,7 +4572,7 @@ void Macbeth_801A7E7C(Actor* actor) {
RAND_FLOAT(360.0f), RAND_FLOAT_CENTERED(30.0f), RAND_FLOAT_CENTERED(30.0f), RAND_FLOAT(360.0f), RAND_FLOAT_CENTERED(30.0f), RAND_FLOAT_CENTERED(30.0f),
RAND_FLOAT_CENTERED(30.0f), (s32) (RAND_FLOAT(50.0f) + 70.0f), 3, RAND_FLOAT(1.0f)); RAND_FLOAT_CENTERED(30.0f), (s32) (RAND_FLOAT(50.0f) + 70.0f), 3, RAND_FLOAT(1.0f));
if (D_i5_801BE320[10] <= 0) { if (D_i5_801BE320[10] <= 0) {
AUDIO_PLAY_SFX(0x2903B009, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_EXPLOSION_M, actor->sfxSource, 4);
func_effect_8007D2C8(actor->obj.pos.x, actor->obj.pos.y - 30.0f, actor->obj.pos.z, 6.0f); func_effect_8007D2C8(actor->obj.pos.x, actor->obj.pos.y - 30.0f, actor->obj.pos.z, 6.0f);
for (i = 0; i < 10; i++) { for (i = 0; i < 10; i++) {
@ -4589,7 +4589,7 @@ void Macbeth_801A7E7C(Actor* actor) {
(s32) (RAND_FLOAT(50.0f) + 70.0f), 9, 1.0f); (s32) (RAND_FLOAT(50.0f) + 70.0f), 9, 1.0f);
} }
} else { } else {
AUDIO_PLAY_SFX(0x29121007, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_REFLECT, actor->sfxSource, 4);
} }
} }
if (D_i5_801BE320[4] != 0) { if (D_i5_801BE320[4] != 0) {
@ -4870,7 +4870,7 @@ void Macbeth_801AC438(Actor* actor) {
Macbeth_8019A728(actor); Macbeth_8019A728(actor);
if (actor->iwork[1] != 0) { if (actor->iwork[1] != 0) {
Radio_PlayMessage(gMsg_ID_17420, RCID_BOSS_MACBETH); Radio_PlayMessage(gMsg_ID_17420, RCID_BOSS_MACBETH);
AUDIO_PLAY_SFX(0x19034066, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_MCBOSS_HATCH, actor->sfxSource, 4);
actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_MA_6035A94); actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_MA_6035A94);
actor->state += 1; actor->state += 1;
} }
@ -4885,7 +4885,7 @@ void Macbeth_801AC438(Actor* actor) {
} }
if (actor->dmgType != DMG_NONE) { if (actor->dmgType != DMG_NONE) {
actor->dmgType = DMG_NONE; actor->dmgType = DMG_NONE;
AUDIO_PLAY_SFX(0x29121007, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_REFLECT, actor->sfxSource, 4);
} }
} }
@ -4913,7 +4913,7 @@ void Macbeth_801AC6B4(Actor* actor) {
actor->obj.pos.z = 0.0f; actor->obj.pos.z = 0.0f;
actor->obj.rot.y = 180.0f; actor->obj.rot.y = 180.0f;
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
AUDIO_PLAY_SFX(0x11030010, actor->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_GREATFOX_ENGINE, actor->sfxSource, 0);
actor->unk_0B6 = 1; actor->unk_0B6 = 1;
} }
@ -5219,7 +5219,7 @@ void Macbeth_801AD6F0(Actor* actor) {
actor->unk_046 = 192; actor->unk_046 = 192;
actor->scale = 2.5f; actor->scale = 2.5f;
actor->fwork[0] = 2.5f; actor->fwork[0] = 2.5f;
AUDIO_PLAY_SFX(0x2903B009, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_EXPLOSION_M, actor->sfxSource, 4);
func_effect_8007D0E0(actor->obj.pos.x, actor->obj.pos.y + 30.0f, actor->obj.pos.z, 7.0f); func_effect_8007D0E0(actor->obj.pos.x, actor->obj.pos.y + 30.0f, actor->obj.pos.z, 7.0f);
func_effect_8007BFFC(actor->obj.pos.x, actor->obj.pos.y + 30.0f, actor->obj.pos.z, 0.0f, 0.0f, 0.0f, func_effect_8007BFFC(actor->obj.pos.x, actor->obj.pos.y + 30.0f, actor->obj.pos.z, 0.0f, 0.0f, 0.0f,
4.0f, 5); 4.0f, 5);
@ -5289,7 +5289,7 @@ void Macbeth_801ADC08(Actor* actor, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32
actor->vel.z = zVel; actor->vel.z = zVel;
actor->timer_0BC = 0; actor->timer_0BC = 0;
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
AUDIO_PLAY_SFX(0x2900201D, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_FALLING_DOWN, actor->sfxSource, 4);
} }
void Macbeth_801ADCEC(f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel) { void Macbeth_801ADCEC(f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel) {
@ -5347,7 +5347,7 @@ void Macbeth_801ADD68(Actor* actor) {
} }
if ((Object_CheckCollision(actor->index, &actor->obj.pos, &sp3C, 1) != 0) || if ((Object_CheckCollision(actor->index, &actor->obj.pos, &sp3C, 1) != 0) ||
(actor->obj.pos.y < (gGroundHeight + 200.0f))) { (actor->obj.pos.y < (gGroundHeight + 200.0f))) {
AUDIO_PLAY_SFX(0x19032064, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OB_SPEAR_STICK, actor->sfxSource, 4);
gControllerRumbleFlags[gMainController] = 1; gControllerRumbleFlags[gMainController] = 1;
gControllerRumbleTimers[gMainController] = 5; gControllerRumbleTimers[gMainController] = 5;
actor->vel.x = 0.0f; actor->vel.x = 0.0f;
@ -5378,7 +5378,7 @@ void Macbeth_801ADD68(Actor* actor) {
actor->health -= actor->damage; actor->health -= actor->damage;
if (actor->health <= 0) { if (actor->health <= 0) {
func_effect_8007A6F0(&actor->obj.pos, 0x2903A008); func_effect_8007A6F0(&actor->obj.pos, NA_SE_EN_EXPLOSION_S);
func_effect_8007D2C8(actor->obj.pos.x + RAND_FLOAT_CENTERED(20.0f), actor->obj.pos.y - 200.0f, func_effect_8007D2C8(actor->obj.pos.x + RAND_FLOAT_CENTERED(20.0f), actor->obj.pos.y - 200.0f,
actor->obj.pos.z, 8.0f); actor->obj.pos.z, 8.0f);
func_effect_8007D2C8(actor->obj.pos.x + RAND_FLOAT_CENTERED(20.0f), actor->obj.pos.y, func_effect_8007D2C8(actor->obj.pos.x + RAND_FLOAT_CENTERED(20.0f), actor->obj.pos.y,
@ -5389,7 +5389,7 @@ void Macbeth_801ADD68(Actor* actor) {
actor->obj.pos.z, 7.0f); actor->obj.pos.z, 7.0f);
Object_Kill(&actor->obj, actor->sfxSource); Object_Kill(&actor->obj, actor->sfxSource);
} else { } else {
AUDIO_PLAY_SFX(0x2903300E, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_DAMAGE_S, actor->sfxSource, 4);
} }
} }
break; break;
@ -5451,7 +5451,7 @@ void Macbeth_801AE4CC(Actor* actor, f32 xPos, f32 yPos, f32 zPos, f32 arg4, f32
} }
actor->health = 30; actor->health = 30;
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
AUDIO_PLAY_SFX(0x2900201D, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_FALLING_DOWN, actor->sfxSource, 4);
} }
void Macbeth_801AE610(f32 xPos, f32 yPos, f32 zPos, f32 arg3, f32 yVel, f32 arg5, s16 arg6) { void Macbeth_801AE610(f32 xPos, f32 yPos, f32 zPos, f32 arg3, f32 yVel, f32 arg5, s16 arg6) {
@ -5585,7 +5585,7 @@ void Macbeth_801AEC04(Actor* actor) {
} }
actor->state = 1; actor->state = 1;
actor->timer_0BC = 200; actor->timer_0BC = 200;
AUDIO_PLAY_SFX(0x11000028, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OB_SPARK_BEAM, actor->sfxSource, 4);
} }
break; break;
case 1: case 1:
@ -5614,12 +5614,12 @@ void Macbeth_801AEC04(Actor* actor) {
actor->fwork[1] = 32.0f; actor->fwork[1] = 32.0f;
} }
if ((actor->dmgType != DMG_NONE) && (actor->dmgPart == 0)) { if ((actor->dmgType != DMG_NONE) && (actor->dmgPart == 0)) {
AUDIO_PLAY_SFX(0x2903300E, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_DAMAGE_S, actor->sfxSource, 4);
actor->dmgType = DMG_NONE; actor->dmgType = DMG_NONE;
actor->health -= actor->damage; actor->health -= actor->damage;
actor->timer_0C6 = 15; actor->timer_0C6 = 15;
if (actor->health <= 0) { if (actor->health <= 0) {
func_effect_8007A6F0(&actor->obj.pos, 0x29000000); func_effect_8007A6F0(&actor->obj.pos, NA_SE_EXPLOSION_S);
func_effect_8007D2C8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 8.0f); func_effect_8007D2C8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 8.0f);
Object_Kill(&actor->obj, actor->sfxSource); Object_Kill(&actor->obj, actor->sfxSource);
} }
@ -5654,7 +5654,7 @@ void Macbeth_801AF134(Actor* actor, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32
actor->fwork[0] = 1.0f; actor->fwork[0] = 1.0f;
actor->fwork[2] = 1.0f; actor->fwork[2] = 1.0f;
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
AUDIO_PLAY_SFX(0x2900201D, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_FALLING_DOWN, actor->sfxSource, 4);
} }
void Macbeth_801AF200(f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel) { void Macbeth_801AF200(f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel) {
@ -5697,12 +5697,12 @@ void Macbeth_801AF27C(Actor* actor, s32 arg1) {
actor->unk_0C9 = 1; actor->unk_0C9 = 1;
actor->fwork[3] = D_i5_801BA820[arg1]; actor->fwork[3] = D_i5_801BA820[arg1];
actor->state = 30; actor->state = 30;
AUDIO_PLAY_SFX(0x3100000C, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_ARWING_ENGINE_FG, actor->sfxSource, 4);
} else { } else {
actor->unk_0B6 = 1; actor->unk_0B6 = 1;
actor->state = 21; actor->state = 21;
actor->obj.rot.z = 32.5f; actor->obj.rot.z = 32.5f;
AUDIO_PLAY_SFX(0x11030010, actor->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_GREATFOX_ENGINE, actor->sfxSource, 0);
actor->fwork[9] = 20.0f; actor->fwork[9] = 20.0f;
} }
} }
@ -5734,7 +5734,7 @@ void Macbeth_801AF44C(void) {
actor->state = 15; actor->state = 15;
actor->fwork[3] = D_i5_801BA820[4]; actor->fwork[3] = D_i5_801BA820[4];
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
AUDIO_PLAY_SFX(0x3100000C, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_ARWING_ENGINE_FG, actor->sfxSource, 4);
} }
static Vec3f D_i5_801BA834[2] = { static Vec3f D_i5_801BA834[2] = {
@ -5955,8 +5955,8 @@ void Macbeth_LevelComplete2(Player* player) {
player->cam.at.z = gCsCamAtZ = 1900.0f; player->cam.at.z = gCsCamAtZ = 1900.0f;
player->yRot_114 = 0.0f; player->yRot_114 = 0.0f;
D_i5_801BA1DC = -100.0f; D_i5_801BA1DC = -100.0f;
Audio_KillSfxById(0x31078085); Audio_KillSfxById(NA_SE_EN_FREIGHT_TRAIN);
AUDIO_PLAY_SFX(0x31408095, gActors[D_i5_801BE314].sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_TRAIN_BREAK, gActors[D_i5_801BE314].sfxSource, 4);
D_i5_801BE313 = 0; D_i5_801BE313 = 0;
} }
break; break;
@ -6051,8 +6051,8 @@ void Macbeth_LevelComplete2(Player* player) {
gPathProgress = player->zPath; gPathProgress = player->zPath;
gPathTexScroll += player->zPathVel; gPathTexScroll += player->zPathVel;
if (gCsFrameCount == 630) { if (gCsFrameCount == 630) {
Audio_KillSfxBySourceAndId(gActors[D_i5_801BE314].sfxSource, 0x31408095); Audio_KillSfxBySourceAndId(gActors[D_i5_801BE314].sfxSource, NA_SE_EN_TRAIN_BREAK);
AUDIO_PLAY_SFX(0x2940C00A, gActors[D_i5_801BE314].sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_EXPLOSION_L, gActors[D_i5_801BE314].sfxSource, 4);
player->csState++; player->csState++;
player->vel.z = 0.0f; player->vel.z = 0.0f;
player->zPathVel = 0.0f; player->zPathVel = 0.0f;
@ -6203,7 +6203,7 @@ void Macbeth_LevelComplete2(Player* player) {
gFillScreenRed = gFillScreenGreen = gFillScreenBlue = 255; gFillScreenRed = gFillScreenGreen = gFillScreenBlue = 255;
gFillScreenAlphaTarget = 255; gFillScreenAlphaTarget = 255;
gFillScreenAlphaStep = 20; gFillScreenAlphaStep = 20;
AUDIO_PLAY_SFX(0x2940F026, gActors[D_i5_801BE314].sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_STAR_EXPLOSION, gActors[D_i5_801BE314].sfxSource, 4);
gBossActive = gLoadLevelObjects = 0; gBossActive = gLoadLevelObjects = 0;
} }
if (gCsFrameCount == 940) { if (gCsFrameCount == 940) {
@ -6425,7 +6425,7 @@ void Macbeth_LevelComplete2(Player* player) {
gProjectFar = 30000.0f; gProjectFar = 30000.0f;
player->unk_240 = 1; player->unk_240 = 1;
Audio_StopPlayerNoise(0); Audio_StopPlayerNoise(0);
AUDIO_PLAY_SFX(0x01008016, player->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_TANK_GO_UP, player->sfxSource, 0);
break; break;
case 2310: case 2310:
gActors[3].state++; gActors[3].state++;
@ -6499,7 +6499,7 @@ void Macbeth_801B28BC(Actor* actor) {
Math_SmoothStepToF(&actor->obj.pos.z, actor->fwork[2] + player->trueZpos, 0.03f, 10.0f, 0.0f); Math_SmoothStepToF(&actor->obj.pos.z, actor->fwork[2] + player->trueZpos, 0.03f, 10.0f, 0.0f);
break; break;
case 11: case 11:
AUDIO_PLAY_SFX(0x09000002, actor->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_ARWING_BOOST, actor->sfxSource, 0);
actor->timer_0BC = 10; actor->timer_0BC = 10;
actor->state++; actor->state++;
actor->fwork[29] = 5.0f; actor->fwork[29] = 5.0f;
@ -6555,7 +6555,7 @@ void Macbeth_801B28BC(Actor* actor) {
Math_SmoothStepToAngle(&actor->obj.rot.z, 62.0f, 1.0f, 0.5f, 0); Math_SmoothStepToAngle(&actor->obj.rot.z, 62.0f, 1.0f, 0.5f, 0);
if (actor->fwork[0] > 180.0f) { if (actor->fwork[0] > 180.0f) {
actor->state++; actor->state++;
AUDIO_PLAY_SFX(0x09000002, actor->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_ARWING_BOOST, actor->sfxSource, 0);
actor->timer_0BC = 160; actor->timer_0BC = 160;
actor->fwork[29] = 5.0f; actor->fwork[29] = 5.0f;
} }
@ -6608,7 +6608,7 @@ void Macbeth_801B28BC(Actor* actor) {
Math_SmoothStepToF(&actor->obj.pos.z, actor->fwork[2] + player->trueZpos, 0.03f, 10.0f, 0.0f); Math_SmoothStepToF(&actor->obj.pos.z, actor->fwork[2] + player->trueZpos, 0.03f, 10.0f, 0.0f);
break; break;
case 31: case 31:
AUDIO_PLAY_SFX(0x09000002, actor->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_ARWING_BOOST, actor->sfxSource, 0);
actor->unk_0C9 = 0; actor->unk_0C9 = 0;
actor->timer_0BC = 20; actor->timer_0BC = 20;
actor->state++; actor->state++;
@ -6665,12 +6665,12 @@ void Macbeth_801B3554(Actor* actor, s32 arg1) {
actor->unk_0C9 = 1; actor->unk_0C9 = 1;
actor->fwork[3] = D_i5_801BA8F0[arg1]; actor->fwork[3] = D_i5_801BA8F0[arg1];
actor->state = 30; actor->state = 30;
AUDIO_PLAY_SFX(0x3100000C, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_ARWING_ENGINE_FG, actor->sfxSource, 4);
return; return;
} }
actor->unk_0B6 = 1; actor->unk_0B6 = 1;
actor->state = 20; actor->state = 20;
AUDIO_PLAY_SFX(0x11030010, actor->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_GREATFOX_ENGINE, actor->sfxSource, 0);
actor->fwork[9] = 20.0f; actor->fwork[9] = 20.0f;
} }
@ -6701,7 +6701,7 @@ void Macbeth_801B3718(void) {
actor->state = 10; actor->state = 10;
actor->fwork[3] = D_i5_801BA900; actor->fwork[3] = D_i5_801BA900;
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
AUDIO_PLAY_SFX(0x3100000C, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_ARWING_ENGINE_FG, actor->sfxSource, 4);
} }
void Macbeth_801B38E0(void) { void Macbeth_801B38E0(void) {

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

@ -228,7 +228,7 @@ void Titania_801895B8(Actor* actor) {
switch (actor->state) { switch (actor->state) {
case 0: case 0:
AUDIO_PLAY_SFX(0x31000017, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_TANK_ENGINE, actor->sfxSource, 4);
if (actor->obj.rot.z > 1.0f) { if (actor->obj.rot.z > 1.0f) {
actor->iwork[0] = 1; actor->iwork[0] = 1;
} }
@ -315,7 +315,7 @@ void Titania_801895B8(Actor* actor) {
func_effect_8007D2C8(actor->obj.pos.x, actor->obj.pos.y + 30.0f, actor->obj.pos.z, 8.0f); func_effect_8007D2C8(actor->obj.pos.x, actor->obj.pos.y + 30.0f, actor->obj.pos.z, 8.0f);
func_effect_8007C120(actor->obj.pos.x, actor->obj.pos.y + 30.0f, actor->obj.pos.z, actor->vel.x, actor->vel.y, func_effect_8007C120(actor->obj.pos.x, actor->obj.pos.y + 30.0f, actor->obj.pos.z, actor->vel.x, actor->vel.y,
actor->vel.z, 0.1f, 30); actor->vel.z, 0.1f, 30);
func_effect_8007A6F0(&actor->obj.pos, 0x2903A008); func_effect_8007A6F0(&actor->obj.pos, NA_SE_EN_EXPLOSION_S);
Object_Kill(&actor->obj, actor->sfxSource); Object_Kill(&actor->obj, actor->sfxSource);
} }
} }
@ -359,7 +359,7 @@ void Titania_80189CC8(Actor* actor) {
actor->health -= actor->damage; actor->health -= actor->damage;
if (actor->health <= 0) { if (actor->health <= 0) {
actor->health = 0; actor->health = 0;
AUDIO_PLAY_SFX(0x2903A008, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_EXPLOSION_S, actor->sfxSource, 4);
actor->lockOnTimers[TEAM_ID_FOX] = actor->itemDrop = 0; actor->lockOnTimers[TEAM_ID_FOX] = actor->itemDrop = 0;
actor->info.targetOffset = 0.0f; actor->info.targetOffset = 0.0f;
Actor_Despawn(actor); Actor_Despawn(actor);
@ -419,7 +419,7 @@ void Titania_80189CC8(Actor* actor) {
} }
} }
} else if (((gGameFrameCount % 8) == 0) && (Rand_ZeroOne() < 0.5f)) { } else if (((gGameFrameCount % 8) == 0) && (Rand_ZeroOne() < 0.5f)) {
AUDIO_PLAY_SFX(0x11000027, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_BROKEN_SPARK, actor->sfxSource, 4);
func_effect_8007C120(actor->fwork[0], actor->fwork[1], actor->fwork[2], 0.0f, 0.0f, 0.0f, 0.1f, 7); func_effect_8007C120(actor->fwork[0], actor->fwork[1], actor->fwork[2], 0.0f, 0.0f, 0.0f, 0.1f, 7);
actor->timer_0C6 = 4; actor->timer_0C6 = 4;
} }
@ -503,7 +503,7 @@ void Titania_8018A544(Actor* actor) {
actor->health += actor->damage; actor->health += actor->damage;
if (actor->scale == 1.0f) { if (actor->scale == 1.0f) {
if (actor->health >= 10) { if (actor->health >= 10) {
func_effect_8007A6F0(&actor->obj.pos, 0x1903400F); func_effect_8007A6F0(&actor->obj.pos, NA_SE_OB_EXPLOSION_S);
if ((Actor*) actor->iwork[0] != NULL) { if ((Actor*) actor->iwork[0] != NULL) {
((Actor*) actor->iwork[0])->iwork[actor->iwork[1]] = 0; ((Actor*) actor->iwork[0])->iwork[actor->iwork[1]] = 0;
} }
@ -550,7 +550,7 @@ void Titania_8018A544(Actor* actor) {
actor->obj.pos.y = sp44 + temp_fv1; actor->obj.pos.y = sp44 + temp_fv1;
if (actor->unk_046 == 0) { if (actor->unk_046 == 0) {
if (actor->vel.y < -6.0f) { if (actor->vel.y < -6.0f) {
AUDIO_PLAY_SFX(0x19020006, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OB_BOUND_M, actor->sfxSource, 4);
} }
if (actor->vel.y < 0.0f) { if (actor->vel.y < 0.0f) {
actor->vel.y = -actor->vel.y * 0.2f; actor->vel.y = -actor->vel.y * 0.2f;
@ -610,7 +610,7 @@ void Titania_8018AB44(Actor* actor) {
actor->gravity = 1.0f; actor->gravity = 1.0f;
Ground_801B6E20(actor->obj.pos.x, actor->obj.pos.z + gPathProgress, &sp3C, &sp34, &sp38); Ground_801B6E20(actor->obj.pos.x, actor->obj.pos.z + gPathProgress, &sp3C, &sp34, &sp38);
if (actor->obj.pos.y <= (sp34 + 3.0f)) { if (actor->obj.pos.y <= (sp34 + 3.0f)) {
AUDIO_PLAY_SFX(0x19000024, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OB_SAND_BOUND_S, actor->sfxSource, 4);
actor->obj.pos.y = sp34 + 3.0f; actor->obj.pos.y = sp34 + 3.0f;
actor->obj.rot.x = sp3C * (M_RTOD); actor->obj.rot.x = sp3C * (M_RTOD);
actor->obj.rot.z = sp38 * (M_RTOD); actor->obj.rot.z = sp38 * (M_RTOD);
@ -626,7 +626,7 @@ void Titania_8018AB44(Actor* actor) {
switch (actor->dmgType) { switch (actor->dmgType) {
case 1: case 1:
AUDIO_PLAY_SFX(0x29022086, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_MCBOSS_REFLECT, actor->sfxSource, 4);
break; break;
case 2: case 2:
@ -634,12 +634,12 @@ void Titania_8018AB44(Actor* actor) {
Actor_Despawn(actor); Actor_Despawn(actor);
actor->info.bonus = 0; actor->info.bonus = 0;
func_effect_8007D2C8(actor->obj.pos.x, actor->obj.pos.y + 10.0f, actor->obj.pos.z, 6.0f); func_effect_8007D2C8(actor->obj.pos.x, actor->obj.pos.y + 10.0f, actor->obj.pos.z, 6.0f);
func_effect_8007A6F0(&actor->obj.pos, 0x2903B009); func_effect_8007A6F0(&actor->obj.pos, NA_SE_EN_EXPLOSION_M);
Object_Kill(&actor->obj, actor->sfxSource); Object_Kill(&actor->obj, actor->sfxSource);
break; break;
case 3: case 3:
func_effect_8007A6F0(&actor->obj.pos, 0x2903B009); func_effect_8007A6F0(&actor->obj.pos, NA_SE_EN_EXPLOSION_M);
func_effect_8007D2C8(actor->obj.pos.x, actor->obj.pos.y + 50.0f, actor->obj.pos.z, (10.0f / 3.0f)); func_effect_8007D2C8(actor->obj.pos.x, actor->obj.pos.y + 50.0f, actor->obj.pos.z, (10.0f / 3.0f));
gPlayer[0].vel.y = 20.0f; gPlayer[0].vel.y = 20.0f;
gPlayer[0].pos.y += 15.0f; gPlayer[0].pos.y += 15.0f;
@ -830,7 +830,7 @@ void Titania_8018B268(Actor* actor) {
sp38->vel.y = 0.0f; sp38->vel.y = 0.0f;
sp38->vel.z = 0.0f; sp38->vel.z = 0.0f;
} else if (actor->unk_0B6 == 57) { } else if (actor->unk_0B6 == 57) {
AUDIO_PLAY_SFX(0x29000028, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_THROW_S, actor->sfxSource, 4);
src.x = 0.0f; src.x = 0.0f;
src.y = actor->fwork[1]; src.y = actor->fwork[1];
src.z = 20.0f; src.z = 20.0f;
@ -953,7 +953,7 @@ void Titania_8018B9D0(Actor* actor) {
if (actor->timer_0BE == 7) { if (actor->timer_0BE == 7) {
actor->iwork[0] = 2; actor->iwork[0] = 2;
AUDIO_PLAY_SFX(0x19000032, actor->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_OB_BOMB_ALARM_LAST, actor->sfxSource, 0);
} }
if (actor->timer_0BE == 0) { if (actor->timer_0BE == 0) {
@ -963,7 +963,7 @@ void Titania_8018B9D0(Actor* actor) {
} else if (temp_fa1 < SQ(600.0f)) { } else if (temp_fa1 < SQ(600.0f)) {
actor->timer_0BE = 0; actor->timer_0BE = 0;
if (actor->timer_0BC == 0) { if (actor->timer_0BC == 0) {
AUDIO_PLAY_SFX(0x19000029, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OB_BOMB_ALARM, actor->sfxSource, 4);
actor->iwork[0] = 1 - actor->iwork[0]; actor->iwork[0] = 1 - actor->iwork[0];
actor->timer_0BC = 5; actor->timer_0BC = 5;
} }
@ -995,7 +995,7 @@ void Titania_8018B9D0(Actor* actor) {
if (actor->vel.y <= 0.0f) { if (actor->vel.y <= 0.0f) {
actor->itemDrop = DROP_NONE; actor->itemDrop = DROP_NONE;
Actor_Despawn(actor); Actor_Despawn(actor);
func_effect_8007A6F0(&actor->obj.pos, 0x2903B009); func_effect_8007A6F0(&actor->obj.pos, NA_SE_EN_EXPLOSION_M);
func_effect_8007D2C8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 10.0f); func_effect_8007D2C8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 10.0f);
Object_Kill(&actor->obj, actor->sfxSource); Object_Kill(&actor->obj, actor->sfxSource);
} }
@ -1019,7 +1019,7 @@ void Titania_8018B9D0(Actor* actor) {
actor->obj.rot.x = (var_fa0 / 130.0f) * 90.0f; actor->obj.rot.x = (var_fa0 / 130.0f) * 90.0f;
if (actor->dmgType == DMG_BEAM) { if (actor->dmgType == DMG_BEAM) {
AUDIO_PLAY_SFX(0x19020008, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_METALBOMB_REFLECT, actor->sfxSource, 4);
sp44 = actor->obj.pos.x - actor->hitPos.x; sp44 = actor->obj.pos.x - actor->hitPos.x;
sp40 = fabsf(sp44); sp40 = fabsf(sp44);
actor->dmgType = DMG_NONE; actor->dmgType = DMG_NONE;
@ -1247,7 +1247,7 @@ void Titania_8018C72C(Actor* actor) {
f32 sp30; f32 sp30;
actor->state = 8; actor->state = 8;
AUDIO_PLAY_SFX(0x29030098, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_KANI_STOP, actor->sfxSource, 4);
for (i = 0; i < 9; i++) { for (i = 0; i < 9; i++) {
D_i5_801BD738[actor->iwork[0]][i].unk_18 |= 2; D_i5_801BD738[actor->iwork[0]][i].unk_18 |= 2;
@ -1304,7 +1304,7 @@ void Titania_8018C8A8(Actor* actor) {
if ((actor->health > 0) && (actor->dmgPart >= 0) && (actor->dmgPart < 3)) { if ((actor->health > 0) && (actor->dmgPart >= 0) && (actor->dmgPart < 3)) {
actor->iwork[5] = 10; actor->iwork[5] = 10;
if (actor->state == 4) { if (actor->state == 4) {
Audio_KillSfxBySourceAndId(actor->sfxSource, 0x31030043); Audio_KillSfxBySourceAndId(actor->sfxSource, NA_SE_EN_KANI_MOTOR);
actor->timer_0BC = 20; actor->timer_0BC = 20;
actor->fwork[24] = 1.0f; actor->fwork[24] = 1.0f;
actor->fwork[23] = actor->unk_0B6; actor->fwork[23] = actor->unk_0B6;
@ -1320,17 +1320,17 @@ void Titania_8018C8A8(Actor* actor) {
actor->unk_0B6 = 0; actor->unk_0B6 = 0;
actor->fwork[15] = 0.0f; actor->fwork[15] = 0.0f;
} else { } else {
AUDIO_PLAY_SFX(0x29034041, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_SNAKE_DAMAGE, actor->sfxSource, 4);
} }
} else if (actor->dmgType == DMG_BEAM) { } else if (actor->dmgType == DMG_BEAM) {
func_effect_8007A6F0(&actor->obj.pos, 0x29121007); func_effect_8007A6F0(&actor->obj.pos, NA_SE_EN_REFLECT);
} }
actor->dmgType = DMG_NONE; actor->dmgType = DMG_NONE;
} }
switch (actor->state) { switch (actor->state) {
case 0: case 0:
AUDIO_PLAY_SFX(0x29023020, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_HEAVY_JUMP, actor->sfxSource, 4);
actor->unk_0F4.y = actor->obj.rot.y; actor->unk_0F4.y = actor->obj.rot.y;
actor->obj.rot.y = 180.0f; actor->obj.rot.y = 180.0f;
actor->obj.pos.y += 125.0f; actor->obj.pos.y += 125.0f;
@ -1357,7 +1357,7 @@ void Titania_8018C8A8(Actor* actor) {
Math_SmoothStepToAngle(&actor->obj.rot.y, actor->unk_0F4.y, 0.2f, 10.0f, 0.01f); Math_SmoothStepToAngle(&actor->obj.rot.y, actor->unk_0F4.y, 0.2f, 10.0f, 0.01f);
} }
if ((actor->obj.pos.y + actor->fwork[7] + actor->fwork[26]) <= sp9C) { if ((actor->obj.pos.y + actor->fwork[7] + actor->fwork[26]) <= sp9C) {
AUDIO_PLAY_SFX(0x29034021, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_HEAVY_BOUND, actor->sfxSource, 4);
actor->fwork[16] = actor->obj.pos.y = sp9C; actor->fwork[16] = actor->obj.pos.y = sp9C;
actor->unk_0F4.x = spA0 * M_RTOD; actor->unk_0F4.x = spA0 * M_RTOD;
actor->unk_0F4.z = sp98 * M_RTOD; actor->unk_0F4.z = sp98 * M_RTOD;
@ -1418,7 +1418,7 @@ void Titania_8018C8A8(Actor* actor) {
if (actor->timer_0BC == 0) { if (actor->timer_0BC == 0) {
actor->timer_0BC = 15; actor->timer_0BC = 15;
actor->state++; actor->state++;
AUDIO_PLAY_SFX(0x31030043, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_KANI_MOTOR, actor->sfxSource, 4);
} }
Math_SmoothStepToF(&actor->fwork[26], -60.0f, actor->fwork[15], 500.0f, 0.01f); Math_SmoothStepToF(&actor->fwork[26], -60.0f, actor->fwork[15], 500.0f, 0.01f);
break; break;
@ -1456,7 +1456,7 @@ void Titania_8018C8A8(Actor* actor) {
if (actor->timer_0BC == 0) { if (actor->timer_0BC == 0) {
if (((actor->unk_0B6 == 40) || (actor->unk_0B6 == 80)) && (actor->timer_0BC == 0)) { if (((actor->unk_0B6 == 40) || (actor->unk_0B6 == 80)) && (actor->timer_0BC == 0)) {
AUDIO_PLAY_SFX(0x2902201F, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_HEAVY_WALK1, actor->sfxSource, 4);
} }
Math_SmoothStepToF(&actor->fwork[15], 1.0f, 0.7f, 0.1f, 0.01f); Math_SmoothStepToF(&actor->fwork[15], 1.0f, 0.7f, 0.1f, 0.01f);
actor->unk_0B6++; actor->unk_0B6++;
@ -1478,7 +1478,7 @@ void Titania_8018C8A8(Actor* actor) {
} }
actor->unk_0B6 = actor->fwork[23]; actor->unk_0B6 = actor->fwork[23];
if (actor->timer_0BC == 1) { if (actor->timer_0BC == 1) {
AUDIO_PLAY_SFX(0x31030043, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_KANI_MOTOR, actor->sfxSource, 4);
} }
} }
@ -1497,7 +1497,7 @@ void Titania_8018C8A8(Actor* actor) {
actor->unk_0B6 = 0; actor->unk_0B6 = 0;
actor->timer_0BC = 30; actor->timer_0BC = 30;
actor->fwork[15] = 0.0f; actor->fwork[15] = 0.0f;
AUDIO_PLAY_SFX(0x29030098, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_KANI_STOP, actor->sfxSource, 4);
} }
break; break;
@ -1552,7 +1552,7 @@ void Titania_8018C8A8(Actor* actor) {
Matrix_MultVec3f(gCalcMatrix, (Vec3f*) &actor->fwork[6], &sp158); Matrix_MultVec3f(gCalcMatrix, (Vec3f*) &actor->fwork[6], &sp158);
func_effect_8007A900(actor->obj.pos.x + sp158.x, actor->obj.pos.y + sp158.y, actor->obj.pos.z + sp158.z, func_effect_8007A900(actor->obj.pos.x + sp158.x, actor->obj.pos.y + sp158.y, actor->obj.pos.z + sp158.z,
20.0f, 255, 8, 0); 20.0f, 255, 8, 0);
AUDIO_PLAY_SFX(0x19030003, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OB_METAL_BOUND_M, actor->sfxSource, 4);
} }
if ((actor->timer_0BC % 8) == 0) { if ((actor->timer_0BC % 8) == 0) {
@ -1591,7 +1591,7 @@ void Titania_8018C8A8(Actor* actor) {
for (i = 0; i < 9U; i++) { for (i = 0; i < 9U; i++) {
D_i5_801BD738[actor->iwork[0]][i].unk_18 |= 1; D_i5_801BD738[actor->iwork[0]][i].unk_18 |= 1;
} }
AUDIO_PLAY_SFX(0x2940C00A, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_EXPLOSION_L, actor->sfxSource, 4);
gCameraShake = 20; gCameraShake = 20;
gControllerRumbleTimers[0] = 16; gControllerRumbleTimers[0] = 16;
Matrix_RotateY(gCalcMatrix, actor->obj.rot.y * M_DTOR, MTXF_NEW); Matrix_RotateY(gCalcMatrix, actor->obj.rot.y * M_DTOR, MTXF_NEW);
@ -1842,7 +1842,7 @@ void Titania_8018E5F8(Actor* actor) {
actor->iwork[7] = (s32) (spA4 / 200.0f); actor->iwork[7] = (s32) (spA4 / 200.0f);
actor->iwork[8] = (s32) ((5000.0f - spA4) / 714.0f); actor->iwork[8] = (s32) ((5000.0f - spA4) / 714.0f);
} }
AUDIO_PLAY_SFX(0x19130003, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_METAL_BOUND_M, actor->sfxSource, 4);
actor->vel.y = 0.0f; actor->vel.y = 0.0f;
actor->gravity = 0.0f; actor->gravity = 0.0f;
actor->obj.pos.y = 94.0f + sp7C; actor->obj.pos.y = 94.0f + sp7C;
@ -1957,7 +1957,7 @@ void Titania_8018E5F8(Actor* actor) {
temp_v0_4->obj.pos.z = sp54; temp_v0_4->obj.pos.z = sp54;
temp_v0_4->timer_50 = 2; temp_v0_4->timer_50 = 2;
actor->iwork[5] = (uintptr_t) temp_v0_4; actor->iwork[5] = (uintptr_t) temp_v0_4;
AUDIO_PLAY_SFX(0x3100001E, temp_v0_4->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_LASER_BEAM, temp_v0_4->sfxSource, 4);
} }
} else { } else {
temp_v0_3->obj.pos.x = sp5C; temp_v0_3->obj.pos.x = sp5C;
@ -2002,7 +2002,7 @@ void Titania_Cactus_Update(Sprite* sprite) {
if (sprite->unk_46 != 0) { if (sprite->unk_46 != 0) {
func_effect_8007D074(sprite->obj.pos.x, sprite->obj.pos.y + 96.0f, sprite->obj.pos.z, 4.0f); func_effect_8007D074(sprite->obj.pos.x, sprite->obj.pos.y + 96.0f, sprite->obj.pos.z, 4.0f);
sprite->obj.status = OBJ_FREE; sprite->obj.status = OBJ_FREE;
func_effect_8007A6F0(&sprite->obj.pos, 0x1903400F); func_effect_8007A6F0(&sprite->obj.pos, NA_SE_OB_EXPLOSION_S);
} }
} }
@ -2103,7 +2103,7 @@ void Titania_8018F4D8(Scenery* scenery) {
gControllerRumbleTimers[0] = 7; gControllerRumbleTimers[0] = 7;
gCameraShake = 12; gCameraShake = 12;
Titania_8018F134(scenery); Titania_8018F134(scenery);
AUDIO_PLAY_SFX(0x19130003, scenery->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_METAL_BOUND_M, scenery->sfxSource, 4);
} }
break; break;
case 1: case 1:
@ -2113,7 +2113,7 @@ void Titania_8018F4D8(Scenery* scenery) {
gControllerRumbleTimers[0] = 7; gControllerRumbleTimers[0] = 7;
gCameraShake = 12; gCameraShake = 12;
Titania_8018F134(scenery); Titania_8018F134(scenery);
AUDIO_PLAY_SFX(0x19130003, scenery->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_METAL_BOUND_M, scenery->sfxSource, 4);
scenery->state++; scenery->state++;
} }
break; break;
@ -2124,7 +2124,7 @@ void Titania_8018F4D8(Scenery* scenery) {
gControllerRumbleTimers[0] = 7; gControllerRumbleTimers[0] = 7;
gCameraShake = 12; gCameraShake = 12;
Titania_8018F134(scenery); Titania_8018F134(scenery);
AUDIO_PLAY_SFX(0x19130003, scenery->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_METAL_BOUND_M, scenery->sfxSource, 4);
scenery->state++; scenery->state++;
} }
break; break;
@ -3133,15 +3133,15 @@ void Titania_80192118(Boss* boss) {
switch (D_i5_801B8C0C[boss->dmgPart]) { switch (D_i5_801B8C0C[boss->dmgPart]) {
case 0: case 0:
D_i5_801BBEF0[30] = 15; D_i5_801BBEF0[30] = 15;
AUDIO_PLAY_SFX(0x2903300E, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_DAMAGE_S, boss->sfxSource, 4);
break; break;
case 1: case 1:
D_i5_801BBEF0[33] = 15; D_i5_801BBEF0[33] = 15;
AUDIO_PLAY_SFX(0x2903300E, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_DAMAGE_S, boss->sfxSource, 4);
break; break;
case 2: case 2:
D_i5_801BBEF0[34] = 15; D_i5_801BBEF0[34] = 15;
AUDIO_PLAY_SFX(0x2903300E, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_DAMAGE_S, boss->sfxSource, 4);
break; break;
} }
} }
@ -3196,7 +3196,7 @@ void Titania_80192118(Boss* boss) {
sp54.x = (boss->obj.pos.x + D_i5_801BBEF4[39]) + D_i5_801BBEF4[68]; sp54.x = (boss->obj.pos.x + D_i5_801BBEF4[39]) + D_i5_801BBEF4[68];
sp54.y = 0.0f; sp54.y = 0.0f;
sp54.z = (boss->obj.pos.z + D_i5_801BBEF4[41]) + D_i5_801BBEF4[70]; sp54.z = (boss->obj.pos.z + D_i5_801BBEF4[41]) + D_i5_801BBEF4[70];
func_effect_8007A6F0(&sp54, 0x29403031); func_effect_8007A6F0(&sp54, NA_SE_EN_SAND_BOUND_M);
boss->swork[39] = 5; boss->swork[39] = 5;
gCameraShake = 5; gCameraShake = 5;
} }
@ -3204,7 +3204,7 @@ void Titania_80192118(Boss* boss) {
sp54.x = (boss->obj.pos.x + D_i5_801BBEF4[42]) + D_i5_801BBEF4[71]; sp54.x = (boss->obj.pos.x + D_i5_801BBEF4[42]) + D_i5_801BBEF4[71];
sp54.y = 0.0f; sp54.y = 0.0f;
sp54.z = (boss->obj.pos.z + D_i5_801BBEF4[44]) + D_i5_801BBEF4[73]; sp54.z = (boss->obj.pos.z + D_i5_801BBEF4[44]) + D_i5_801BBEF4[73];
func_effect_8007A6F0(&sp54, 0x29403031); func_effect_8007A6F0(&sp54, NA_SE_EN_SAND_BOUND_M);
boss->swork[39] = 5; boss->swork[39] = 5;
gCameraShake = 5; gCameraShake = 5;
} }
@ -3214,19 +3214,19 @@ void Titania_80192118(Boss* boss) {
D_i5_801BBEF0[30] = 15; D_i5_801BBEF0[30] = 15;
D_i5_801BBEF0[27] -= boss->damage; D_i5_801BBEF0[27] -= boss->damage;
AUDIO_PLAY_SFX(0x2903300E, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_DAMAGE_S, boss->sfxSource, 4);
break; break;
case 1: case 1:
D_i5_801BBEF0[33] = 15; D_i5_801BBEF0[33] = 15;
D_i5_801BBEF0[27] -= boss->damage; D_i5_801BBEF0[27] -= boss->damage;
AUDIO_PLAY_SFX(0x2903300E, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_DAMAGE_S, boss->sfxSource, 4);
break; break;
case 2: case 2:
D_i5_801BBEF0[34] = 15; D_i5_801BBEF0[34] = 15;
D_i5_801BBEF0[27] -= boss->damage; D_i5_801BBEF0[27] -= boss->damage;
AUDIO_PLAY_SFX(0x2903300E, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_DAMAGE_S, boss->sfxSource, 4);
break; break;
} }
boss->dmgType = DMG_NONE; boss->dmgType = DMG_NONE;
@ -3371,8 +3371,8 @@ void Titania_80192118(Boss* boss) {
D_i5_801BBEF4[53] = -350.0f; D_i5_801BBEF4[53] = -350.0f;
D_i5_801BBEF4[63] = 0.0f; D_i5_801BBEF4[63] = 0.0f;
D_i5_801BBEF4[55] = D_i5_801BBEF4[63]; D_i5_801BBEF4[55] = D_i5_801BBEF4[63];
AUDIO_PLAY_SFX(0x2900502A, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_APPEAR_SAND, boss->sfxSource, 4);
AUDIO_PLAY_SFX(0x2940802C, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_TIBOSS_DM_CRY, boss->sfxSource, 4);
boss->swork[1] = 4; boss->swork[1] = 4;
boss->timer_050 = 120; boss->timer_050 = 120;
D_i5_801BBEF0[22] = 0; D_i5_801BBEF0[22] = 0;
@ -3724,7 +3724,7 @@ void Titania_80193DF0(Boss* boss) {
} }
} }
D_i5_801BBF00[i].unk_26 = 4; D_i5_801BBF00[i].unk_26 = 4;
AUDIO_PLAY_SFX(0x2903B009, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_EXPLOSION_M, boss->sfxSource, 4);
} }
} }
if (boss->fwork[38] != 0.0f) { if (boss->fwork[38] != 0.0f) {
@ -3822,7 +3822,7 @@ void Titania_80193DF0(Boss* boss) {
if ((boss->state >= 7) && (boss->state < 14) && (boss->dmgType == DMG_BEAM) && if ((boss->state >= 7) && (boss->state < 14) && (boss->dmgType == DMG_BEAM) &&
(D_i5_801BAA78[D_i5_801B7904[boss->dmgPart]] == 2) && (D_i5_801BBEF0[8] == 0)) { (D_i5_801BAA78[D_i5_801B7904[boss->dmgPart]] == 2) && (D_i5_801BBEF0[8] == 0)) {
AUDIO_PLAY_SFX(0x29121007, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_REFLECT, boss->sfxSource, 4);
boss->dmgType = DMG_NONE; boss->dmgType = DMG_NONE;
} }
if ((boss->state >= 7) && (boss->state < 14)) { if ((boss->state >= 7) && (boss->state < 14)) {
@ -3836,7 +3836,7 @@ void Titania_80193DF0(Boss* boss) {
} }
if (D_i5_801BAA78[D_i5_801B7904[boss->dmgPart]] != 0) { if (D_i5_801BAA78[D_i5_801B7904[boss->dmgPart]] != 0) {
AUDIO_PLAY_SFX(0x2940802C, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_TIBOSS_DM_CRY, boss->sfxSource, 4);
boss->swork[D_i5_801BAA78[D_i5_801B7904[boss->dmgPart]] + 4] = 20; boss->swork[D_i5_801BAA78[D_i5_801B7904[boss->dmgPart]] + 4] = 20;
if (boss->swork[D_i5_801BAA78[D_i5_801B7904[boss->dmgPart]] + 8] > 0) { if (boss->swork[D_i5_801BAA78[D_i5_801B7904[boss->dmgPart]] + 8] > 0) {
boss->swork[D_i5_801BAA78[D_i5_801B7904[boss->dmgPart]] + 8] -= boss->damage; boss->swork[D_i5_801BAA78[D_i5_801B7904[boss->dmgPart]] + 8] -= boss->damage;
@ -3868,9 +3868,9 @@ void Titania_80193DF0(Boss* boss) {
gTeamLowHealthMsgTimer = -1; gTeamLowHealthMsgTimer = -1;
boss->swork[21] = 0; boss->swork[21] = 0;
gScreenFlashTimer = 8; gScreenFlashTimer = 8;
AUDIO_PLAY_SFX(0x2940D09A, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_DOWN_IMPACT, boss->sfxSource, 4);
} else { } else {
AUDIO_PLAY_SFX(0x2940802C, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_TIBOSS_DM_CRY, boss->sfxSource, 4);
if (boss->swork[21] <= 10) { if (boss->swork[21] <= 10) {
D_i5_801BBEF0[1] = 15; D_i5_801BBEF0[1] = 15;
@ -3887,7 +3887,7 @@ void Titania_80193DF0(Boss* boss) {
boss->swork[37] |= 4; boss->swork[37] |= 4;
D_i5_801BBEF0[43] = 0; D_i5_801BBEF0[43] = 0;
} else { } else {
AUDIO_PLAY_SFX(0x29121007, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_REFLECT, boss->sfxSource, 4);
} }
} }
if ((boss->dmgType == DMG_BOMB) && (boss->dmgPart == 1) && (D_i5_801BBEF0[8] == 0)) { if ((boss->dmgType == DMG_BOMB) && (boss->dmgPart == 1) && (D_i5_801BBEF0[8] == 0)) {
@ -3900,7 +3900,7 @@ void Titania_80193DF0(Boss* boss) {
case 1: case 1:
case 2: case 2:
case 3: case 3:
AUDIO_PLAY_SFX(0x2940802C, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_TIBOSS_DM_CRY, boss->sfxSource, 4);
boss->swork[boss->dmgPart + 5] = 20; boss->swork[boss->dmgPart + 5] = 20;
if (boss->swork[boss->dmgPart + 9] <= 0) { if (boss->swork[boss->dmgPart + 9] <= 0) {
break; break;
@ -3930,15 +3930,15 @@ void Titania_80193DF0(Boss* boss) {
break; break;
case 4: case 4:
if ((gBossHealthBar > 0) && (boss->swork[29] != 0) && (boss->swork[21] > 0)) { if ((gBossHealthBar > 0) && (boss->swork[29] != 0) && (boss->swork[21] > 0)) {
AUDIO_PLAY_SFX(0x2940802C, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_TIBOSS_DM_CRY, boss->sfxSource, 4);
boss->swork[21] -= boss->damage; boss->swork[21] -= boss->damage;
if (boss->swork[21] <= 0) { if (boss->swork[21] <= 0) {
boss->swork[21] = 0; boss->swork[21] = 0;
gScreenFlashTimer = 8; gScreenFlashTimer = 8;
gTeamLowHealthMsgTimer = -1; gTeamLowHealthMsgTimer = -1;
AUDIO_PLAY_SFX(0x2940D09A, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_DOWN_IMPACT, boss->sfxSource, 4);
} else { } else {
AUDIO_PLAY_SFX(0x2940802C, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_TIBOSS_DM_CRY, boss->sfxSource, 4);
if (boss->swork[21] < 11) { if (boss->swork[21] < 11) {
D_i5_801BBEF0[1] = 15; D_i5_801BBEF0[1] = 15;
@ -3974,8 +3974,8 @@ void Titania_80193DF0(Boss* boss) {
D_i5_801BBEF4[2] = 0.0f; D_i5_801BBEF4[2] = 0.0f;
D_i5_801BBEF4[1] = 20.0f; D_i5_801BBEF4[1] = 20.0f;
boss->swork[28]++; boss->swork[28]++;
AUDIO_PLAY_SFX(0x2900803F, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_HEART_OPEN, boss->sfxSource, 4);
AUDIO_PLAY_SFX(0x11003023, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_HEARTBEAT, boss->sfxSource, 4);
break; break;
case 3: case 3:
D_i5_801BBEF4[2] += D_i5_801BBEF4[1]; D_i5_801BBEF4[2] += D_i5_801BBEF4[1];
@ -3987,7 +3987,7 @@ void Titania_80193DF0(Boss* boss) {
D_i5_801BBEF4[4] = 20.0f; D_i5_801BBEF4[4] = 20.0f;
boss->swork[29] = 1; boss->swork[29] = 1;
boss->swork[37] |= 1; boss->swork[37] |= 1;
AUDIO_PLAY_SFX(0x2903300E, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_DAMAGE_S, boss->sfxSource, 4);
} }
break; break;
case 4: case 4:
@ -4017,14 +4017,14 @@ void Titania_80193DF0(Boss* boss) {
D_i5_801BBEF4[2] += D_i5_801BBEF4[1]; D_i5_801BBEF4[2] += D_i5_801BBEF4[1];
D_i5_801BBEF4[1] -= 3.0; D_i5_801BBEF4[1] -= 3.0;
if (D_i5_801BBEF4[2] <= 0.0f) { if (D_i5_801BBEF4[2] <= 0.0f) {
Audio_KillSfxBySourceAndId(boss->sfxSource, 0x11003023); Audio_KillSfxBySourceAndId(boss->sfxSource, NA_SE_EN_HEARTBEAT);
boss->swork[29] = 0; boss->swork[29] = 0;
D_i5_801BBEF4[2] = 0.0f; D_i5_801BBEF4[2] = 0.0f;
boss->swork[28]++; boss->swork[28]++;
} }
break; break;
case 8: case 8:
AUDIO_PLAY_SFX(0x11033022, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_GATHER_PARTS, boss->sfxSource, 4);
for (i = 0; i < 33; i++) { for (i = 0; i < 33; i++) {
actor = func_game_800A3608(OBJ_ACTOR_189); actor = func_game_800A3608(OBJ_ACTOR_189);
@ -4190,7 +4190,7 @@ void Titania_80193DF0(Boss* boss) {
case 6: case 6:
boss->fwork[47] = (f32) boss->unk_04C / (f32) (Animation_GetFrameCount(&D_TI_900FC4C) * 2); boss->fwork[47] = (f32) boss->unk_04C / (f32) (Animation_GetFrameCount(&D_TI_900FC4C) * 2);
if ((boss->unk_04C == 0) || (boss->unk_04C == 68) || (boss->unk_04C == 96) || (boss->unk_04C == 149)) { if ((boss->unk_04C == 0) || (boss->unk_04C == 68) || (boss->unk_04C == 96) || (boss->unk_04C == 149)) {
AUDIO_PLAY_SFX(0x2900502A, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_APPEAR_SAND, boss->sfxSource, 4);
} }
temp_f = gPlayer[0].trueZpos - boss->obj.pos.z - 530.0f; temp_f = gPlayer[0].trueZpos - boss->obj.pos.z - 530.0f;
if (temp_f < 0.0f) { if (temp_f < 0.0f) {
@ -4222,7 +4222,7 @@ void Titania_80193DF0(Boss* boss) {
Math_SmoothStepToVec3fArray(D_i5_801BC978, D_i5_801BCDC8, 1, 92, boss->fwork[0], 360.0f, 0.01f); Math_SmoothStepToVec3fArray(D_i5_801BC978, D_i5_801BCDC8, 1, 92, boss->fwork[0], 360.0f, 0.01f);
boss->unk_04C++; boss->unk_04C++;
if (boss->unk_04C >= (Animation_GetFrameCount(&D_TI_900FC4C) * 2)) { if (boss->unk_04C >= (Animation_GetFrameCount(&D_TI_900FC4C) * 2)) {
AUDIO_PLAY_SFX(0x2940702B, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_TIBOSS_AT_CRY, boss->sfxSource, 4);
gPlayer[0].unk_19C = 0; gPlayer[0].unk_19C = 0;
boss->unk_04C = 0; boss->unk_04C = 0;
boss->fwork[48] = 0; boss->fwork[48] = 0;
@ -4300,7 +4300,7 @@ void Titania_80193DF0(Boss* boss) {
D_i5_801BBEF4[12] = 0.0f; D_i5_801BBEF4[12] = 0.0f;
} }
if ((boss->unk_04C == 22) || (boss->unk_04C == 80)) { if ((boss->unk_04C == 22) || (boss->unk_04C == 80)) {
AUDIO_PLAY_SFX(0x2940702B, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_TIBOSS_AT_CRY, boss->sfxSource, 4);
} }
if (((boss->unk_04C >= 0) && (boss->unk_04C < 18)) || ((boss->unk_04C >= 62) && (boss->unk_04C < 80))) { if (((boss->unk_04C >= 0) && (boss->unk_04C < 18)) || ((boss->unk_04C >= 62) && (boss->unk_04C < 80))) {
D_i5_801BBEF4[12] = D_i5_801BBEF4[12] =
@ -4315,7 +4315,7 @@ void Titania_80193DF0(Boss* boss) {
func_effect_8007A900(spD4.x, 0.0f, spD4.z, 10.0f, 255, 8, 0); func_effect_8007A900(spD4.x, 0.0f, spD4.z, 10.0f, 255, 8, 0);
} }
if (boss->unk_04C == 38) { if (boss->unk_04C == 38) {
func_effect_8007A6F0(&spD4, 0x29403031); func_effect_8007A6F0(&spD4, NA_SE_EN_SAND_BOUND_M);
boss->swork[39] = 5; boss->swork[39] = 5;
gCameraShake = 20; gCameraShake = 20;
} }
@ -4328,7 +4328,7 @@ void Titania_80193DF0(Boss* boss) {
func_effect_8007A900(spD4.x, 0.0f, spD4.z, 10.0f, 255, 8, 0); func_effect_8007A900(spD4.x, 0.0f, spD4.z, 10.0f, 255, 8, 0);
} }
if (boss->unk_04C == 98) { if (boss->unk_04C == 98) {
func_effect_8007A6F0(&spD4, 0x29403031); func_effect_8007A6F0(&spD4, NA_SE_EN_SAND_BOUND_M);
boss->swork[39] = 5; boss->swork[39] = 5;
gCameraShake = 20; gCameraShake = 20;
} }
@ -4369,7 +4369,7 @@ void Titania_80193DF0(Boss* boss) {
D_i5_801BBEF0[17]--; D_i5_801BBEF0[17]--;
} }
if (boss->unk_04C == 0) { if (boss->unk_04C == 0) {
AUDIO_PLAY_SFX(0x39435830, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_BOSS_CHARGE, boss->sfxSource, 4);
} }
if (boss->unk_04C == 15) { if (boss->unk_04C == 15) {
D_i5_801BBEF0[16] = 25; D_i5_801BBEF0[16] = 25;
@ -4387,7 +4387,7 @@ void Titania_80193DF0(Boss* boss) {
// pad = boss->unk_04C == 45; // pad = boss->unk_04C == 45;
if (boss->unk_04C == 45) { if (boss->unk_04C == 45) {
AUDIO_PLAY_SFX(0x3143102F, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_BOSS_BEAM0, boss->sfxSource, 4);
boss->swork[32] = 0; boss->swork[32] = 0;
boss->fwork[42] = 0.0f; boss->fwork[42] = 0.0f;
boss->fwork[41] = 40.0f; boss->fwork[41] = 40.0f;
@ -4415,7 +4415,7 @@ void Titania_80193DF0(Boss* boss) {
} }
boss->swork[32] = 0; boss->swork[32] = 0;
Audio_KillSfxBySourceAndId(boss->sfxSource, 0x3143102F); Audio_KillSfxBySourceAndId(boss->sfxSource, NA_SE_EN_BOSS_BEAM0);
boss->swork[25] = 0; boss->swork[25] = 0;
boss->fwork[41] = 0.0f; boss->fwork[41] = 0.0f;
boss->fwork[42] = 0.0f; boss->fwork[42] = 0.0f;
@ -4488,7 +4488,7 @@ void Titania_80193DF0(Boss* boss) {
boss->fwork[41] = 0.0f; boss->fwork[41] = 0.0f;
boss->fwork[42] = 0.0f; boss->fwork[42] = 0.0f;
boss->swork[24] = 0; boss->swork[24] = 0;
Audio_KillSfxBySourceAndId(boss->sfxSource, 0x39435830); Audio_KillSfxBySourceAndId(boss->sfxSource, NA_SE_EN_BOSS_CHARGE);
} }
} }
Math_SmoothStepToF(&boss->fwork[0], 0.5f, 1.0f, 0.02f, 0.0f); Math_SmoothStepToF(&boss->fwork[0], 0.5f, 1.0f, 0.02f, 0.0f);
@ -4530,7 +4530,7 @@ void Titania_80193DF0(Boss* boss) {
} }
D_i5_801BBEF0[6] = 2; D_i5_801BBEF0[6] = 2;
if (boss->unk_04C == 30) { if (boss->unk_04C == 30) {
Audio_KillSfxBySourceAndId(boss->sfxSource, 0x11003023); Audio_KillSfxBySourceAndId(boss->sfxSource, NA_SE_EN_HEARTBEAT);
D_i5_801BBEF0[7] = 0; D_i5_801BBEF0[7] = 0;
boss->obj.status = OBJ_DYING; boss->obj.status = OBJ_DYING;
D_i5_801BBEF4[12] = 0.0f; D_i5_801BBEF4[12] = 0.0f;
@ -4647,11 +4647,11 @@ void Titania_80193DF0(Boss* boss) {
boss->swork[1] = 13; boss->swork[1] = 13;
boss->unk_04C = 0; boss->unk_04C = 0;
if (boss->swork[25] != 0) { if (boss->swork[25] != 0) {
Audio_KillSfxBySourceAndId(boss->sfxSource, 0x3143102F); Audio_KillSfxBySourceAndId(boss->sfxSource, NA_SE_EN_BOSS_BEAM0);
boss->swork[25] = 0; boss->swork[25] = 0;
} }
if (boss->swork[24] != 0) { if (boss->swork[24] != 0) {
Audio_KillSfxBySourceAndId(boss->sfxSource, 0x39435830); Audio_KillSfxBySourceAndId(boss->sfxSource, NA_SE_EN_BOSS_CHARGE);
boss->swork[24] = 0; boss->swork[24] = 0;
} }
} }
@ -4692,14 +4692,14 @@ void Titania_80193DF0(Boss* boss) {
} }
} }
if ((boss->state == 6) && ((boss->unk_04C == 134) || (boss->unk_04C == 188))) { if ((boss->state == 6) && ((boss->unk_04C == 134) || (boss->unk_04C == 188))) {
AUDIO_PLAY_SFX(0x29406029, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_HEAVY_WALK2, boss->sfxSource, 4);
boss->swork[39] = 4; boss->swork[39] = 4;
gCameraShake = 7; gCameraShake = 7;
} }
if (boss->state >= 7) { if (boss->state >= 7) {
if (((boss->fwork[15] > 0.0f) && (boss->fwork[9] <= 0.0f)) || if (((boss->fwork[15] > 0.0f) && (boss->fwork[9] <= 0.0f)) ||
((boss->fwork[12] > 0.0f) && (boss->fwork[6] <= 0.0f))) { ((boss->fwork[12] > 0.0f) && (boss->fwork[6] <= 0.0f))) {
AUDIO_PLAY_SFX(0x29406029, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_HEAVY_WALK2, boss->sfxSource, 4);
if (boss->state == 12) { if (boss->state == 12) {
boss->swork[39] = 4; boss->swork[39] = 4;
gCameraShake = 20; gCameraShake = 20;
@ -4732,7 +4732,7 @@ void Titania_80197A94(Boss* boss) {
boss->swork[38]++; boss->swork[38]++;
if ((boss->dmgType != DMG_NONE) && if ((boss->dmgType != DMG_NONE) &&
(((boss->state >= 0) && (boss->state <= 1)) || ((boss->state >= 4) && (boss->state <= 6)))) { (((boss->state >= 0) && (boss->state <= 1)) || ((boss->state >= 4) && (boss->state <= 6)))) {
AUDIO_PLAY_SFX(0x29121007, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_REFLECT, boss->sfxSource, 4);
boss->dmgType = DMG_NONE; boss->dmgType = DMG_NONE;
} }
if ((gPlayer[0].grounded != 0) && (boss->swork[39] > 0)) { if ((gPlayer[0].grounded != 0) && (boss->swork[39] > 0)) {
@ -4907,7 +4907,7 @@ void Titania_80197A94(Boss* boss) {
sp3C.x = boss->fwork[29] + boss->obj.pos.x; sp3C.x = boss->fwork[29] + boss->obj.pos.x;
sp3C.y = boss->fwork[30] + boss->obj.pos.y; sp3C.y = boss->fwork[30] + boss->obj.pos.y;
sp3C.z = boss->fwork[31] + boss->obj.pos.z; sp3C.z = boss->fwork[31] + boss->obj.pos.z;
func_effect_8007A6F0(&sp3C, 0x09004002); func_effect_8007A6F0(&sp3C, NA_SE_ARWING_DASH);
D_i5_801BBEF0[49] = D_i5_801B8D54[RAND_INT(4.0f)]; D_i5_801BBEF0[49] = D_i5_801B8D54[RAND_INT(4.0f)];
D_i5_801BBEF4[74] = RAND_FLOAT(0.4f) + 0.9f; D_i5_801BBEF4[74] = RAND_FLOAT(0.4f) + 0.9f;
D_i5_801BBEF4[75] = 0.6f; D_i5_801BBEF4[75] = 0.6f;
@ -5167,7 +5167,7 @@ void Titania_801990DC(Boss* boss) {
Actor* actor; Actor* actor;
if (boss->unk_044 == 0) { if (boss->unk_044 == 0) {
AUDIO_PLAY_SFX(0x2940902D, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_TIBOSS_DW_CRY, boss->sfxSource, 4);
SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 50); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 50);
SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 50); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 50);
func_effect_8007A568(boss->obj.pos.x, boss->obj.pos.y + 250.0f, boss->obj.pos.z, 40.0f); func_effect_8007A568(boss->obj.pos.x, boss->obj.pos.y + 250.0f, boss->obj.pos.z, 40.0f);

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

@ -19,7 +19,7 @@ void Titania_80187530(Actor* actor) {
actor->obj.rot.y = 180.0f; actor->obj.rot.y = 180.0f;
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
AUDIO_PLAY_SFX(0x11030010, actor->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_GREATFOX_ENGINE, actor->sfxSource, 0);
actor->unk_0B6 = 1; actor->unk_0B6 = 1;
} }
@ -35,7 +35,7 @@ void Titania_801875D0(Actor* actor, s32 arg1) {
actor->obj.rot.y = 180.0f; actor->obj.rot.y = 180.0f;
actor->iwork[11] = 1; actor->iwork[11] = 1;
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
AUDIO_PLAY_SFX(0x3100000C, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_ARWING_ENGINE_FG, actor->sfxSource, 4);
} }
void Titania_LevelStart(Player* player) { void Titania_LevelStart(Player* player) {
@ -94,7 +94,7 @@ void Titania_LevelStart(Player* player) {
if (gCsFrameCount == 430) { if (gCsFrameCount == 430) {
player->csState = 2; player->csState = 2;
player->csTimer = 10; player->csTimer = 10;
AUDIO_PLAY_SFX(0x09000002, player->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_ARWING_BOOST, player->sfxSource, 0);
} }
gCsCamAtX = player->pos.x; gCsCamAtX = player->pos.x;
gCsCamAtY = player->pos.y; gCsCamAtY = player->pos.y;
@ -206,7 +206,7 @@ void Titania_LevelStart(Player* player) {
if (D_ctx_80177A10[0] == 0) { if (D_ctx_80177A10[0] == 0) {
D_ctx_80177A10[0]++; D_ctx_80177A10[0]++;
AUDIO_PLAY_SFX(0x01008016, player->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_TANK_GO_UP, player->sfxSource, 0);
} }
} }
@ -229,7 +229,7 @@ void Titania_LevelStart(Player* player) {
func_play_800A594C(); func_play_800A594C();
D_ctx_8017782C = 0; D_ctx_8017782C = 0;
if ((gControllerHold[player->num].button & Z_TRIG) && (gControllerHold[player->num].button & R_TRIG)) { if ((gControllerHold[player->num].button & Z_TRIG) && (gControllerHold[player->num].button & R_TRIG)) {
Audio_KillSfxBySourceAndId(player->sfxSource, 0x01008016); Audio_KillSfxBySourceAndId(player->sfxSource, NA_SE_TANK_GO_UP);
} }
} }
break; break;
@ -274,11 +274,11 @@ void Titania_80188108(Actor* actor, s32 arg1) {
actor->unk_0C9 = 1; actor->unk_0C9 = 1;
actor->fwork[3] = D_i5_801B7348[arg1]; actor->fwork[3] = D_i5_801B7348[arg1];
actor->state = 30; actor->state = 30;
AUDIO_PLAY_SFX(0x3100000C, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_ARWING_ENGINE_FG, actor->sfxSource, 4);
} else { } else {
actor->unk_0B6 = 1; actor->unk_0B6 = 1;
actor->state = 20; actor->state = 20;
AUDIO_PLAY_SFX(0x11030010, actor->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_GREATFOX_ENGINE, actor->sfxSource, 0);
actor->fwork[9] = 20.0f; actor->fwork[9] = 20.0f;
} }
} }
@ -314,7 +314,7 @@ void Titania_LevelComplete(Player* player) {
Titania_80188108(&gActors[2], 2); Titania_80188108(&gActors[2], 2);
} }
Audio_KillSfxBySourceAndId(player->sfxSource, 0x01004024); Audio_KillSfxBySourceAndId(player->sfxSource, NA_SE_TANK_BURNER_HALF);
case 1: case 1:
Math_SmoothStepToF(D_ctx_80177A48, 0.1f, 1.0f, 0.01f, 0.0f); Math_SmoothStepToF(D_ctx_80177A48, 0.1f, 1.0f, 0.01f, 0.0f);
@ -501,7 +501,7 @@ void Titania_LevelComplete(Player* player) {
gProjectFar = 30000.0f; gProjectFar = 30000.0f;
player->unk_240 = 1; player->unk_240 = 1;
Audio_StopPlayerNoise(0); Audio_StopPlayerNoise(0);
AUDIO_PLAY_SFX(0x01008016, player->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_TANK_GO_UP, player->sfxSource, 0);
break; break;
} }

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

@ -317,7 +317,7 @@ void Andross_80188468(void) {
actor->iwork[14] = 1; actor->iwork[14] = 1;
actor->obj.id = OBJ_ACTOR_199; actor->obj.id = OBJ_ACTOR_199;
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
AUDIO_PLAY_SFX(0x3100000C, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_ARWING_ENGINE_FG, actor->sfxSource, 4);
} }
void Andross_80188528(Actor* actor) { void Andross_80188528(Actor* actor) {
@ -325,7 +325,7 @@ void Andross_80188528(Actor* actor) {
Math_SmoothStepToF(&actor->vel.y, 0.0f, 0.2f, 0.5f, 0.0f); Math_SmoothStepToF(&actor->vel.y, 0.0f, 0.2f, 0.5f, 0.0f);
Math_SmoothStepToF(&actor->vel.z, 0.0f, 0.2f, 0.5f, 0.0f); Math_SmoothStepToF(&actor->vel.z, 0.0f, 0.2f, 0.5f, 0.0f);
if (actor->dmgType != DMG_NONE) { if (actor->dmgType != DMG_NONE) {
func_effect_8007A6F0(&actor->obj.pos, 0x2903A008); func_effect_8007A6F0(&actor->obj.pos, NA_SE_EN_EXPLOSION_S);
Object_Kill(&actor->obj, actor->sfxSource); Object_Kill(&actor->obj, actor->sfxSource);
func_effect_8007B344(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 3.0f, 5); func_effect_8007B344(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 3.0f, 5);
} else if (actor->timer_0BC == 0) { } else if (actor->timer_0BC == 0) {
@ -394,7 +394,7 @@ void Andross_801888F4(Actor* actor) {
func_effect_800794CC(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 1.0f); func_effect_800794CC(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 1.0f);
} }
func_effect_8007A6F0(&actor->obj.pos, 0x2903B009); func_effect_8007A6F0(&actor->obj.pos, NA_SE_EN_EXPLOSION_M);
Object_Kill(&actor->obj, actor->sfxSource); Object_Kill(&actor->obj, actor->sfxSource);
BonusText_Display(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 5); BonusText_Display(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 5);
gHitCount += 6; gHitCount += 6;
@ -420,11 +420,11 @@ void Andross_80188A4C(Boss* boss) {
if (boss->swork[4] == 0) { if (boss->swork[4] == 0) {
boss->swork[2] = 10; boss->swork[2] = 10;
boss->swork[3] = 15; boss->swork[3] = 15;
AUDIO_PLAY_SFX(0x2943500F, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_KNOCK_DOWN, boss->sfxSource, 4);
boss->health -= boss->damage; boss->health -= boss->damage;
if ((boss->health != 0) && (boss->health <= 0)) { if ((boss->health != 0) && (boss->health <= 0)) {
gScreenFlashTimer = 8; gScreenFlashTimer = 8;
AUDIO_PLAY_SFX(0x2940D09A, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_DOWN_IMPACT, boss->sfxSource, 4);
Boss_AwardBonus(boss); Boss_AwardBonus(boss);
gPlayer[0].state_1C8 = PLAYERSTATE_1C8_STANDBY; gPlayer[0].state_1C8 = PLAYERSTATE_1C8_STANDBY;
boss->state = 20; boss->state = 20;
@ -434,8 +434,8 @@ void Andross_80188A4C(Boss* boss) {
D_ctx_80177A48[0] = 0.0f; D_ctx_80177A48[0] = 0.0f;
D_ctx_80177A48[1] = 0.1f; D_ctx_80177A48[1] = 0.1f;
gCsFrameCount = 0; gCsFrameCount = 0;
Audio_KillSfxBySourceAndId(boss->sfxSource, 0x11034074); Audio_KillSfxBySourceAndId(boss->sfxSource, NA_SE_EN_ANDORF_BRAIN);
Audio_KillSfxBySourceAndId(boss->sfxSource, 0x31408097); Audio_KillSfxBySourceAndId(boss->sfxSource, NA_SE_EN_ANDORF_CATCH);
SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 1); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 1);
SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 1); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 1);
} }
@ -450,7 +450,7 @@ void Andross_80188A4C(Boss* boss) {
boss->timer_050 = 50; boss->timer_050 = 50;
boss->fwork[3] = gPlayer[0].pos.x; boss->fwork[3] = gPlayer[0].pos.x;
boss->fwork[5] = gPlayer[0].trueZpos; boss->fwork[5] = gPlayer[0].trueZpos;
AUDIO_PLAY_SFX(0x2940B096, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_ANDORF_WARP, boss->sfxSource, 4);
} }
} }
break; break;
@ -638,7 +638,7 @@ void Andross_80189470(Actor* actor) {
if ((gPlayer[0].state_1C8 == PLAYERSTATE_1C8_ACTIVE) && (fabsf(actor->obj.pos.x - gPlayer[0].pos.x) < 500.0f) && if ((gPlayer[0].state_1C8 == PLAYERSTATE_1C8_ACTIVE) && (fabsf(actor->obj.pos.x - gPlayer[0].pos.x) < 500.0f) &&
(fabsf(actor->obj.pos.z - gPlayer[0].trueZpos) < 500.0f)) { (fabsf(actor->obj.pos.z - gPlayer[0].trueZpos) < 500.0f)) {
Audio_KillSfxById(0x11403076); Audio_KillSfxById(NA_SE_OB_ROOT_EXPLOSION1);
Audio_SetEnvSfxReverb(0); Audio_SetEnvSfxReverb(0);
gCurrentLevel = LEVEL_VENOM_2; gCurrentLevel = LEVEL_VENOM_2;
gLevelPhase = 1; gLevelPhase = 1;
@ -775,7 +775,7 @@ void Andross_80189B70(Boss* boss) {
(fabsf(boss->obj.pos.z - gPlayer[0].trueZpos) < 300.0f) && (boss->state < 11) && (boss->timer_05A == 0)) { (fabsf(boss->obj.pos.z - gPlayer[0].trueZpos) < 300.0f) && (boss->state < 11) && (boss->timer_05A == 0)) {
boss->state = 11; boss->state = 11;
boss->timer_050 = 150; boss->timer_050 = 150;
AUDIO_PLAY_SFX(0x31408097, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_ANDORF_CATCH, boss->sfxSource, 4);
} }
switch (boss->state) { switch (boss->state) {
@ -787,7 +787,7 @@ void Andross_80189B70(Boss* boss) {
Andross_80189098(boss); Andross_80189098(boss);
boss->swork[5] = 300; boss->swork[5] = 300;
boss->state++; boss->state++;
AUDIO_PLAY_SFX(0x11034074, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_ANDORF_BRAIN, boss->sfxSource, 4);
boss->fwork[21] = 255.0f; boss->fwork[21] = 255.0f;
boss->fwork[22] = 255.0f; boss->fwork[22] = 255.0f;
boss->fwork[23] = 0.0f; boss->fwork[23] = 0.0f;
@ -858,7 +858,7 @@ void Andross_80189B70(Boss* boss) {
gPlayer[0].cockpitView = true; gPlayer[0].cockpitView = true;
Math_SmoothStepToF(&D_display_800CA230, 0.15f, 0.2f, 0.004f, 0.0f); Math_SmoothStepToF(&D_display_800CA230, 0.15f, 0.2f, 0.004f, 0.0f);
if (boss->timer_050 == 120) { if (boss->timer_050 == 120) {
AUDIO_PLAY_SFX(0x1940306E, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_VO_ANDORF_LAUGH, boss->sfxSource, 4);
} }
if (boss->timer_050 == 0) { if (boss->timer_050 == 0) {
gPlayer[0].baseSpeed = gArwingSpeed; gPlayer[0].baseSpeed = gArwingSpeed;
@ -872,7 +872,7 @@ void Andross_80189B70(Boss* boss) {
} else { } else {
boss->state = 3; boss->state = 3;
} }
Audio_KillSfxBySourceAndId(boss->sfxSource, 0x31408097); Audio_KillSfxBySourceAndId(boss->sfxSource, NA_SE_EN_ANDORF_CATCH);
} }
break; break;
case 3: case 3:
@ -899,7 +899,7 @@ void Andross_80189B70(Boss* boss) {
boss->obj.pos.z = boss->fwork[5] + sp64.z; boss->obj.pos.z = boss->fwork[5] + sp64.z;
boss->unk_078.y = Math_RadToDeg(Math_Atan2F(xDisplacement, zDisplacement)); boss->unk_078.y = Math_RadToDeg(Math_Atan2F(xDisplacement, zDisplacement));
boss->state = 13; boss->state = 13;
AUDIO_PLAY_SFX(0x1940306E, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_VO_ANDORF_LAUGH, boss->sfxSource, 4);
boss->timer_054 = 90; boss->timer_054 = 90;
} }
break; break;
@ -1021,7 +1021,7 @@ void Andross_80189B70(Boss* boss) {
func_play_800B7184(gPlayer, 1); func_play_800B7184(gPlayer, 1);
Audio_StartPlayerNoise(0); Audio_StartPlayerNoise(0);
AUDIO_PLAY_BGM(D_boss_800C9E90[gCurrentLevel]); AUDIO_PLAY_BGM(D_boss_800C9E90[gCurrentLevel]);
AUDIO_PLAY_SFX(0x11403076, gDefaultSfxSource, 0); AUDIO_PLAY_SFX(NA_SE_OB_ROOT_EXPLOSION1, gDefaultSfxSource, 0);
D_ctx_80177CA4 = gHitCount; D_ctx_80177CA4 = gHitCount;
break; break;
@ -1118,10 +1118,10 @@ void Andross_80189B70(Boss* boss) {
if (boss->swork[5] != 0) { if (boss->swork[5] != 0) {
boss->swork[5]--; boss->swork[5]--;
if (boss->swork[5] == 0) { if (boss->swork[5] == 0) {
AUDIO_PLAY_SFX(0x11032075, gActors[10].sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_ANDORF_EYE, gActors[10].sfxSource, 4);
AUDIO_PLAY_SFX(0x11032075, gActors[11].sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_ANDORF_EYE, gActors[11].sfxSource, 4);
AUDIO_PLAY_SFX(0x3103108B, gActors[10].sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_ANDORF_SPARK, gActors[10].sfxSource, 4);
AUDIO_PLAY_SFX(0x3103108B, gActors[11].sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_ANDORF_SPARK, gActors[11].sfxSource, 4);
} }
gActors[10].obj.pos.x = boss->obj.pos.x + 200.0f; gActors[10].obj.pos.x = boss->obj.pos.x + 200.0f;
gActors[10].obj.pos.y = boss->obj.pos.y - 200.0f; gActors[10].obj.pos.y = boss->obj.pos.y - 200.0f;
@ -1478,7 +1478,7 @@ void Andross_8018CAD4(Effect* effect) {
func_effect_8007A774(&gPlayer[0], effect, 100.0f); func_effect_8007A774(&gPlayer[0], effect, 100.0f);
if (effect->unk_44 != 0) { if (effect->unk_44 != 0) {
func_effect_8007D0E0(effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z, 10.0f); func_effect_8007D0E0(effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z, 10.0f);
func_effect_8007A6F0(&effect->obj.pos, 0x2903A008); func_effect_8007A6F0(&effect->obj.pos, NA_SE_EN_EXPLOSION_S);
Object_Kill(&effect->obj, effect->sfxSource); Object_Kill(&effect->obj, effect->sfxSource);
} }
} }
@ -1488,7 +1488,7 @@ void Andross_8018CAD4(Effect* effect) {
func_effect_8007A774(&gPlayer[0], effect, 100.0f); func_effect_8007A774(&gPlayer[0], effect, 100.0f);
if (effect->unk_44 != 0) { if (effect->unk_44 != 0) {
func_effect_8007D0E0(effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z, 10.0f); func_effect_8007D0E0(effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z, 10.0f);
func_effect_8007A6F0(&effect->obj.pos, 0x2903A008); func_effect_8007A6F0(&effect->obj.pos, NA_SE_EN_EXPLOSION_S);
Object_Kill(&effect->obj, effect->sfxSource); Object_Kill(&effect->obj, effect->sfxSource);
if (Rand_ZeroOne() < 0.1f) { if (Rand_ZeroOne() < 0.1f) {
item = gItems; item = gItems;
@ -1593,10 +1593,10 @@ void Andross_8018D2B0(Boss* boss) {
if ((boss->state == 9) || (boss->state == 10)) { if ((boss->state == 9) || (boss->state == 10)) {
if (boss->health <= 0) { if (boss->health <= 0) {
gScreenFlashTimer = 8; gScreenFlashTimer = 8;
AUDIO_PLAY_SFX(0x2940D09A, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_DOWN_IMPACT, boss->sfxSource, 4);
AUDIO_PLAY_SFX(0x31009063, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_ANDORF_EXPLOSION, boss->sfxSource, 4);
AUDIO_PLAY_SFX(0x19403070, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_VO_ANDORF_DEATH, boss->sfxSource, 4);
Audio_KillSfxBySourceAndId(boss->sfxSource, 0x11030073); Audio_KillSfxBySourceAndId(boss->sfxSource, NA_SE_EN_ANDORF_ROBOT);
SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 1); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 1);
SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 1); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 1);
boss->state = 31; boss->state = 31;
@ -1604,12 +1604,12 @@ void Andross_8018D2B0(Boss* boss) {
gPlayer[0].state_1C8 = PLAYERSTATE_1C8_LEVEL_COMPLETE; gPlayer[0].state_1C8 = PLAYERSTATE_1C8_LEVEL_COMPLETE;
gPlayer[0].csState = 0; gPlayer[0].csState = 0;
} else if (boss->health < 50) { } else if (boss->health < 50) {
AUDIO_PLAY_SFX(0x2943500F, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_KNOCK_DOWN, boss->sfxSource, 4);
} else { } else {
AUDIO_PLAY_SFX(0x29034003, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OB_DAMAGE_M, boss->sfxSource, 4);
} }
} else if (boss->health <= 0) { } else if (boss->health <= 0) {
AUDIO_PLAY_SFX(0x19403070, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_VO_ANDORF_DEATH, boss->sfxSource, 4);
SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 1); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 1);
SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 1); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 1);
if (gLevelPhase == 0) { if (gLevelPhase == 0) {
@ -1622,7 +1622,7 @@ void Andross_8018D2B0(Boss* boss) {
gCsFrameCount = 0; gCsFrameCount = 0;
boss->timer_05C = 100; boss->timer_05C = 100;
} else { } else {
AUDIO_PLAY_SFX(0x29034003, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OB_DAMAGE_M, boss->sfxSource, 4);
} }
} }
} }
@ -1632,14 +1632,14 @@ void Andross_8018D2B0(Boss* boss) {
if (boss->state < 11) { if (boss->state < 11) {
boss->swork[6] -= boss->damage; boss->swork[6] -= boss->damage;
boss->swork[0] = 30; boss->swork[0] = 30;
AUDIO_PLAY_SFX(0x29034003, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OB_DAMAGE_M, boss->sfxSource, 4);
if (boss->swork[6] <= 0) { if (boss->swork[6] <= 0) {
boss->swork[6] = 100; boss->swork[6] = 100;
boss->state = 12; boss->state = 12;
boss->timer_050 = 120; boss->timer_050 = 120;
boss->unk_04C = 0; boss->unk_04C = 0;
boss->fwork[9] = 0.0f; boss->fwork[9] = 0.0f;
AUDIO_PLAY_SFX(0x1940306F, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_VO_ANDORF_GROAN, boss->sfxSource, 4);
} }
} }
break; break;
@ -1647,14 +1647,14 @@ void Andross_8018D2B0(Boss* boss) {
if (boss->state < 12) { if (boss->state < 12) {
boss->swork[6] -= boss->damage; boss->swork[6] -= boss->damage;
boss->swork[1] = 30; boss->swork[1] = 30;
AUDIO_PLAY_SFX(0x29034003, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OB_DAMAGE_M, boss->sfxSource, 4);
if (boss->swork[6] <= 0) { if (boss->swork[6] <= 0) {
boss->swork[6] = 100; boss->swork[6] = 100;
boss->state = 13; boss->state = 13;
boss->timer_050 = 120; boss->timer_050 = 120;
boss->unk_04C = 0; boss->unk_04C = 0;
boss->fwork[9] = 0.0f; boss->fwork[9] = 0.0f;
AUDIO_PLAY_SFX(0x1940306F, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_VO_ANDORF_GROAN, boss->sfxSource, 4);
} }
} }
break; break;
@ -1678,9 +1678,9 @@ void Andross_8018D2B0(Boss* boss) {
RAND_FLOAT(1.0f) + 1.0f); RAND_FLOAT(1.0f) + 1.0f);
} }
func_effect_8007B344(boss->vwork[0].x, boss->vwork[0].y, boss->vwork[0].z, 20.0f, 5); func_effect_8007B344(boss->vwork[0].x, boss->vwork[0].y, boss->vwork[0].z, 20.0f, 5);
func_effect_8007A6F0(&sp68, 0x2903B009); func_effect_8007A6F0(&sp68, NA_SE_EN_EXPLOSION_M);
} else { } else {
func_effect_8007A6F0(&sp68, 0x29034003); func_effect_8007A6F0(&sp68, NA_SE_OB_DAMAGE_M);
} }
} else { } else {
sp68.x = boss->vwork[1].x; sp68.x = boss->vwork[1].x;
@ -1698,9 +1698,9 @@ void Andross_8018D2B0(Boss* boss) {
RAND_FLOAT(1.0f) + 1.0f); RAND_FLOAT(1.0f) + 1.0f);
} }
func_effect_8007B344(boss->vwork[1].x, boss->vwork[1].y, boss->vwork[1].z, 20.0f, 5); func_effect_8007B344(boss->vwork[1].x, boss->vwork[1].y, boss->vwork[1].z, 20.0f, 5);
func_effect_8007A6F0(&sp68, 0x2903B009); func_effect_8007A6F0(&sp68, NA_SE_EN_EXPLOSION_M);
} else { } else {
func_effect_8007A6F0(&sp68, 0x29034003); func_effect_8007A6F0(&sp68, NA_SE_OB_DAMAGE_M);
} }
} }
} }
@ -1758,7 +1758,7 @@ void Andross_8018DA94(Boss* boss, Vec3f* arg1) {
RAND_FLOAT(0.5f) + 1.0f); RAND_FLOAT(0.5f) + 1.0f);
} }
func_effect_8007B344(arg1->x, arg1->y, arg1->z, 10.0f, 5); func_effect_8007B344(arg1->x, arg1->y, arg1->z, 10.0f, 5);
AUDIO_PLAY_SFX(0x2903B009, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_EXPLOSION_M, boss->sfxSource, 4);
} }
static f32 D_i6_801A67B8[] = { 0.0f, 0.0f, 0.0f }; static f32 D_i6_801A67B8[] = { 0.0f, 0.0f, 0.0f };
@ -1899,7 +1899,7 @@ void Andross_8018DBF0(Boss* boss) {
case 1: case 1:
boss->timer_05A = 100; boss->timer_05A = 100;
if (boss->timer_054 == 65) { if (boss->timer_054 == 65) {
AUDIO_PLAY_SFX(0x1940306E, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_VO_ANDORF_LAUGH, boss->sfxSource, 4);
} }
if (boss->timer_050 != 0) { if (boss->timer_050 != 0) {
boss->fwork[6] = -3000.0f; boss->fwork[6] = -3000.0f;
@ -1969,7 +1969,7 @@ void Andross_8018DBF0(Boss* boss) {
boss->fwork[0] = player->pos.x; boss->fwork[0] = player->pos.x;
boss->fwork[3] = player->pos.y + 1000.0f; boss->fwork[3] = player->pos.y + 1000.0f;
if (boss->unk_04C == 60) { if (boss->unk_04C == 60) {
AUDIO_PLAY_SFX(0x1940306A, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_VO_ANDORF_PUNCH, boss->sfxSource, 4);
} }
if (boss->unk_04C > 60) { if (boss->unk_04C > 60) {
if (boss->unk_04C == 76) { if (boss->unk_04C == 76) {
@ -2017,7 +2017,7 @@ void Andross_8018DBF0(Boss* boss) {
boss->fwork[0] = player->pos.x; boss->fwork[0] = player->pos.x;
boss->fwork[3] = player->pos.y; boss->fwork[3] = player->pos.y;
if (boss->unk_04C == 55) { if (boss->unk_04C == 55) {
AUDIO_PLAY_SFX(0x1940306A, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_VO_ANDORF_PUNCH, boss->sfxSource, 4);
} }
if (boss->unk_04C > 55) { if (boss->unk_04C > 55) {
boss->fwork[6] = -1500.0f; boss->fwork[6] = -1500.0f;
@ -2072,7 +2072,7 @@ void Andross_8018DBF0(Boss* boss) {
Math_SmoothStepToF(&boss->fwork[1], 2.0f, 1.0f, 1.0f, 0); Math_SmoothStepToF(&boss->fwork[1], 2.0f, 1.0f, 1.0f, 0);
Math_SmoothStepToF(&boss->fwork[4], 2.0f, 1.0f, 1.0f, 0); Math_SmoothStepToF(&boss->fwork[4], 2.0f, 1.0f, 1.0f, 0);
if (boss->unk_04C == 5) { if (boss->unk_04C == 5) {
AUDIO_PLAY_SFX(0x1940306B, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_VO_ANDORF_SLAP, boss->sfxSource, 4);
} }
boss->swork[7] = 1; boss->swork[7] = 1;
boss->fwork[14] = 100.0f; boss->fwork[14] = 100.0f;
@ -2090,7 +2090,7 @@ void Andross_8018DBF0(Boss* boss) {
Andross_8018D9C0(boss); Andross_8018D9C0(boss);
} else { } else {
if (boss->timer_050 == 1) { if (boss->timer_050 == 1) {
AUDIO_PLAY_SFX(0x1940306C, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_VO_ANDORF_WHAND, boss->sfxSource, 4);
} }
if (boss->timer_050 != 0) { if (boss->timer_050 != 0) {
boss->fwork[6] = -4000.0f; boss->fwork[6] = -4000.0f;
@ -2135,7 +2135,7 @@ void Andross_8018DBF0(Boss* boss) {
Andross_8018D9C0(boss); Andross_8018D9C0(boss);
} else { } else {
if (boss->unk_04C == 48) { if (boss->unk_04C == 48) {
AUDIO_PLAY_SFX(0x3103108B, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_ANDORF_SPARK, boss->sfxSource, 4);
} }
if (boss->unk_04C > 48) { if (boss->unk_04C > 48) {
Andross_8018D0D8(boss); Andross_8018D0D8(boss);
@ -2268,10 +2268,10 @@ void Andross_8018DBF0(Boss* boss) {
boss->fwork[3] = 0.0f; boss->fwork[3] = 0.0f;
Math_SmoothStepToF(&boss->fwork[9], 1.0f, 1.0f, 0.01f, 0); Math_SmoothStepToF(&boss->fwork[9], 1.0f, 1.0f, 0.01f, 0);
if (boss->unk_04C == 15) { if (boss->unk_04C == 15) {
AUDIO_PLAY_SFX(0x29022088, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_ANDORF_BITE0, boss->sfxSource, 4);
} }
if ((boss->unk_04C > 35) && (boss->unk_04C < 150) && ((boss->unk_04C % 32) == 0)) { if ((boss->unk_04C > 35) && (boss->unk_04C < 150) && ((boss->unk_04C % 32) == 0)) {
AUDIO_PLAY_SFX(0x29022089, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_ANDORF_BITE1, boss->sfxSource, 4);
if (player->state_1C8 == PLAYERSTATE_1C8_ANDROSS_MOUTH) { if (player->state_1C8 == PLAYERSTATE_1C8_ANDROSS_MOUTH) {
gControllerRumbleTimers[0] = 10; gControllerRumbleTimers[0] = 10;
} }
@ -2329,7 +2329,7 @@ void Andross_8018DBF0(Boss* boss) {
limbCount = Animation_GetFrameData(&D_ANDROSS_C023B54, boss->unk_04C, spD0); limbCount = Animation_GetFrameData(&D_ANDROSS_C023B54, boss->unk_04C, spD0);
Math_SmoothStepToVec3fArray(spD0, D_i6_801A7F80, 1, limbCount, boss->fwork[9], 100.0f, 0.0f); Math_SmoothStepToVec3fArray(spD0, D_i6_801A7F80, 1, limbCount, boss->fwork[9], 100.0f, 0.0f);
if (boss->unk_04C == 10) { if (boss->unk_04C == 10) {
AUDIO_PLAY_SFX(0x3140208A, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_ANDORF_VOMIT, boss->sfxSource, 4);
} }
if ((boss->unk_04C == 13) && (player->state_1C8 == PLAYERSTATE_1C8_ANDROSS_MOUTH)) { if ((boss->unk_04C == 13) && (player->state_1C8 == PLAYERSTATE_1C8_ANDROSS_MOUTH)) {
player->unk_234 = 1; player->unk_234 = 1;
@ -2391,7 +2391,7 @@ void Andross_8018DBF0(Boss* boss) {
boss->fwork[9] = 0.2f; boss->fwork[9] = 0.2f;
boss->unk_04C = 0; boss->unk_04C = 0;
boss->swork[8] = 2; boss->swork[8] = 2;
AUDIO_PLAY_SFX(0x1940306D, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_VO_ANDORF_CHOKE, boss->sfxSource, 4);
break; break;
} }
} }
@ -2436,7 +2436,7 @@ void Andross_8018DBF0(Boss* boss) {
Math_SmoothStepToF(&boss->fwork[7], 20.0f, 0.1f, 0.1f, 0); Math_SmoothStepToF(&boss->fwork[7], 20.0f, 0.1f, 0.1f, 0);
Math_SmoothStepToF(&boss->fwork[9], 1.0f, 1.0f, 0.01f, 0); Math_SmoothStepToF(&boss->fwork[9], 1.0f, 1.0f, 0.01f, 0);
if (boss->unk_04C == 10) { if (boss->unk_04C == 10) {
AUDIO_PLAY_SFX(0x31022087, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_ANDORF_BREATH, boss->sfxSource, 4);
} }
boss->unk_04C++; boss->unk_04C++;
if (boss->unk_04C >= Animation_GetFrameCount(&D_ANDROSS_C0240D0)) { if (boss->unk_04C >= Animation_GetFrameCount(&D_ANDROSS_C0240D0)) {
@ -2484,7 +2484,7 @@ void Andross_8018DBF0(Boss* boss) {
boss->unk_044 = 2; boss->unk_044 = 2;
boss->timer_050 = 70; boss->timer_050 = 70;
boss->fwork[9] = 0.0f; boss->fwork[9] = 0.0f;
AUDIO_PLAY_SFX(0x1940307C, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_VO_ANDORF_EXCITE, boss->sfxSource, 4);
} }
if (boss->timer_050 == 15) { if (boss->timer_050 == 15) {
boss->swork[10] = 80; boss->swork[10] = 80;
@ -2581,7 +2581,7 @@ void Andross_8018DBF0(Boss* boss) {
boss->health = 100; boss->health = 100;
boss->timer_050 = 50; boss->timer_050 = 50;
boss->fwork[9] = 0.0f; boss->fwork[9] = 0.0f;
AUDIO_PLAY_SFX(0x11030073, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_ANDORF_ROBOT, boss->sfxSource, 4);
AUDIO_PLAY_BGM(SEQ_ID_AND_BOSS | SEQ_FLAG); AUDIO_PLAY_BGM(SEQ_ID_AND_BOSS | SEQ_FLAG);
break; break;
} }
@ -2729,7 +2729,7 @@ void Andross_8018DBF0(Boss* boss) {
Andross_8018DA94(boss, &boss->vwork[17]); Andross_8018DA94(boss, &boss->vwork[17]);
break; break;
case 173: case 173:
func_effect_8007A6F0(&boss->obj.pos, 0x2940C00A); func_effect_8007A6F0(&boss->obj.pos, NA_SE_EN_EXPLOSION_L);
func_effect_8007B344(boss->obj.pos.x, boss->obj.pos.y, boss->obj.pos.z, 100.0f, 4); func_effect_8007B344(boss->obj.pos.x, boss->obj.pos.y, boss->obj.pos.z, 100.0f, 4);
break; break;
case 180: case 180:
@ -2793,10 +2793,10 @@ void Andross_8018DBF0(Boss* boss) {
boss->info.hitbox[9] = boss->vwork[3].y - boss->obj.pos.y; boss->info.hitbox[9] = boss->vwork[3].y - boss->obj.pos.y;
boss->info.hitbox[11] = boss->vwork[3].x - boss->obj.pos.x; boss->info.hitbox[11] = boss->vwork[3].x - boss->obj.pos.x;
if ((initialstate == 17) && (boss->state != 17)) { if ((initialstate == 17) && (boss->state != 17)) {
Audio_KillSfxBySourceAndId(boss->sfxSource, 0x31022087); Audio_KillSfxBySourceAndId(boss->sfxSource, NA_SE_EN_ANDORF_BREATH);
} }
if ((initialstate == 7) && (boss->state != 7)) { if ((initialstate == 7) && (boss->state != 7)) {
Audio_KillSfxBySourceAndId(boss->sfxSource, 0x3103108B); Audio_KillSfxBySourceAndId(boss->sfxSource, NA_SE_EN_ANDORF_SPARK);
} }
} }
@ -3211,7 +3211,7 @@ void Andross_80192E94(Actor* actor) {
actor->vwork[0].z = actor->obj.pos.z; actor->vwork[0].z = actor->obj.pos.z;
actor->health = 30; actor->health = 30;
actor->unk_0F4.z = actor->obj.rot.z; actor->unk_0F4.z = actor->obj.rot.z;
AUDIO_PLAY_SFX(0x11000028, actor->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_OB_SPARK_BEAM, actor->sfxSource, 0);
break; break;
case 1: case 1:
otherActor = gActors; otherActor = gActors;
@ -3252,7 +3252,7 @@ void Andross_80192E94(Actor* actor) {
RAND_FLOAT_CENTERED(10.0f) + actor->obj.pos.y, actor->obj.pos.z, RAND_FLOAT_CENTERED(10.0f) + actor->obj.pos.y, actor->obj.pos.z,
RAND_FLOAT(0.5f) + 0.5f); RAND_FLOAT(0.5f) + 0.5f);
} }
func_effect_8007A6F0(&actor->obj.pos, 0x2903A008); func_effect_8007A6F0(&actor->obj.pos, NA_SE_EN_EXPLOSION_S);
Object_Kill(&actor->obj, actor->sfxSource); Object_Kill(&actor->obj, actor->sfxSource);
} }
} }
@ -3428,8 +3428,8 @@ void Andross_801939A0(s32 actorIndex) {
actor->unk_0B6 = 1000; actor->unk_0B6 = 1000;
} }
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
AUDIO_PLAY_SFX(0x3100000C, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_ARWING_ENGINE_FG, actor->sfxSource, 4);
AUDIO_PLAY_SFX(0x09000002, actor->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_ARWING_BOOST, actor->sfxSource, 0);
} }
static Vec3f D_i6_801A6878[4] = { static Vec3f D_i6_801A6878[4] = {
@ -3452,13 +3452,13 @@ void Andross_80193AE4(s32 actorIndex) {
if (actorIndex == 0) { if (actorIndex == 0) {
actor->state = 200; actor->state = 200;
actor->unk_0B6 = 1; actor->unk_0B6 = 1;
AUDIO_PLAY_SFX(0x11030010, actor->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_GREATFOX_ENGINE, actor->sfxSource, 0);
} else { } else {
actor->iwork[11] = 1; actor->iwork[11] = 1;
actor->fwork[7] = RAND_FLOAT(360.0f); actor->fwork[7] = RAND_FLOAT(360.0f);
actor->fwork[8] = RAND_FLOAT(360.0f); actor->fwork[8] = RAND_FLOAT(360.0f);
actor->state = 100; actor->state = 100;
AUDIO_PLAY_SFX(0x3100000C, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_ARWING_ENGINE_FG, actor->sfxSource, 4);
} }
} }
@ -3519,7 +3519,7 @@ void Andross_80193C4C(Player* player) {
switch (gCsFrameCount) { switch (gCsFrameCount) {
case 80: case 80:
func_effect_8007A568(boss->obj.pos.x, boss->obj.pos.y, boss->obj.pos.z, 40.0f); func_effect_8007A568(boss->obj.pos.x, boss->obj.pos.y, boss->obj.pos.z, 40.0f);
func_effect_8007A6F0(&boss->obj.pos, 0x2940C00A); func_effect_8007A6F0(&boss->obj.pos, NA_SE_EN_EXPLOSION_L);
/* fallthrough */ /* fallthrough */
case 85: case 85:
case 90: case 90:
@ -3531,7 +3531,7 @@ void Andross_80193C4C(Player* player) {
break; break;
case 111: case 111:
player->csState = 2; player->csState = 2;
AUDIO_PLAY_SFX(0x09000002, player->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_ARWING_BOOST, player->sfxSource, 0);
player->unk_190 = player->unk_194 = 7.0f; player->unk_190 = player->unk_194 = 7.0f;
D_ctx_80177A48[0] = 0.0f; D_ctx_80177A48[0] = 0.0f;
D_ctx_80177A48[1] = 0.0f; D_ctx_80177A48[1] = 0.0f;
@ -3554,7 +3554,7 @@ void Andross_80193C4C(Player* player) {
sp68.y = RAND_FLOAT_CENTERED(150.0f); sp68.y = RAND_FLOAT_CENTERED(150.0f);
sp68.z = 0.0f; sp68.z = 0.0f;
if (gCsFrameCount == 50) { if (gCsFrameCount == 50) {
AUDIO_PLAY_SFX(0x11403071, player->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_OB_ROOT_EXPLOSION0, player->sfxSource, 0);
Audio_SetEnvSfxReverb(0); Audio_SetEnvSfxReverb(0);
} }
if (gCsFrameCount > 40) { if (gCsFrameCount > 40) {
@ -3629,10 +3629,10 @@ void Andross_80193C4C(Player* player) {
} }
break; break;
case 150: case 150:
AUDIO_PLAY_SFX(0x1900602A, gDefaultSfxSource, 0); AUDIO_PLAY_SFX(NA_SE_WARP_HOLE, gDefaultSfxSource, 0);
break; break;
case 340: case 340:
Audio_KillSfxBySourceAndId(player->sfxSource, 0x11403071); Audio_KillSfxBySourceAndId(player->sfxSource, NA_SE_OB_ROOT_EXPLOSION0);
Audio_SetEnvSfxReverb(0); Audio_SetEnvSfxReverb(0);
gVenomHardClear = 0; gVenomHardClear = 0;
gBlurAlpha = 255; gBlurAlpha = 255;
@ -3681,7 +3681,7 @@ void Andross_80193C4C(Player* player) {
} }
if (gCsFrameCount == 40) { if (gCsFrameCount == 40) {
Andross_801939A0(10); Andross_801939A0(10);
AUDIO_PLAY_SFX(0x2940F026, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_STAR_EXPLOSION, boss->sfxSource, 4);
gCameraShake = 30; gCameraShake = 30;
gSceneSetup = 1; gSceneSetup = 1;
gControllerRumbleTimers[0] = 30; gControllerRumbleTimers[0] = 30;

120
src/overlays/ovl_i6/fox_sy.c
View File

@ -41,7 +41,7 @@ void SectorY_80197B30(Actor* actor, s32 timer) {
actor->timer_04C = timer; actor->timer_04C = timer;
actor->iwork[11] = 1; actor->iwork[11] = 1;
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
AUDIO_PLAY_SFX(0x3100000C, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_ARWING_ENGINE_FG, actor->sfxSource, 4);
} }
void SectorY_80197C64(Effect* effect) { void SectorY_80197C64(Effect* effect) {
@ -185,7 +185,7 @@ void SectorY_80198244(Boss* boss) {
} }
boss->fwork[10] = 181.0f; boss->fwork[10] = 181.0f;
boss->fwork[34] = 2.8f; boss->fwork[34] = 2.8f;
AUDIO_PLAY_SFX(0x2902306C, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_MS_DASH, boss->sfxSource, 4);
} }
void SectorY_801983E4(Boss* boss) { void SectorY_801983E4(Boss* boss) {
@ -323,7 +323,7 @@ void SectorY_80198ABC(Boss* boss) {
boss->fwork[41] = 1.8f; boss->fwork[41] = 1.8f;
} }
} }
AUDIO_PLAY_SFX(0x2902306C, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_MS_DASH, boss->sfxSource, 4);
switch (D_ctx_80177A10[8]) { switch (D_ctx_80177A10[8]) {
case 0: case 0:
@ -436,7 +436,7 @@ void SectorY_80198F5C(Boss* boss) {
} }
gPlayer[0].yRot_114 = 0.0f; gPlayer[0].yRot_114 = 0.0f;
} }
AUDIO_PLAY_SFX(0x2940D09A, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_DOWN_IMPACT, boss->sfxSource, 4);
SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 30); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 30);
SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 30); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 30);
return; return;
@ -486,11 +486,11 @@ void SectorY_80198F5C(Boss* boss) {
} }
} else { } else {
if (boss->index != 0) { if (boss->index != 0) {
AUDIO_PLAY_SFX(0x2903300E, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_DAMAGE_S, boss->sfxSource, 4);
} else if (boss->health > 70) { } else if (boss->health > 70) {
AUDIO_PLAY_SFX(0x29034003, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OB_DAMAGE_M, boss->sfxSource, 4);
} else { } else {
AUDIO_PLAY_SFX(0x2943500F, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_KNOCK_DOWN, boss->sfxSource, 4);
} }
if ((gBosses[1].obj.status == OBJ_FREE) && (gBosses[2].obj.status == OBJ_FREE)) { if ((gBosses[1].obj.status == OBJ_FREE) && (gBosses[2].obj.status == OBJ_FREE)) {
@ -545,7 +545,7 @@ void SectorY_80199438(Boss* boss) {
gHitCount += 4; gHitCount += 4;
} }
if (boss->timer_058 == 50) { if (boss->timer_058 == 50) {
AUDIO_PLAY_SFX(0x2903A060, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_MS_EXPLOSION_S, boss->sfxSource, 4);
gControllerRumbleFlags[gMainController] = 1; gControllerRumbleFlags[gMainController] = 1;
gControllerRumbleTimers[gMainController] = 20; gControllerRumbleTimers[gMainController] = 20;
D_ctx_80177850 = 15; D_ctx_80177850 = 15;
@ -635,7 +635,7 @@ void SectorY_80199438(Boss* boss) {
} }
func_effect_8007D2C8(boss->obj.pos.x, boss->obj.pos.y, boss->obj.pos.z + 30.0f, 4.0f); func_effect_8007D2C8(boss->obj.pos.x, boss->obj.pos.y, boss->obj.pos.z + 30.0f, 4.0f);
boss->info.hitbox = SEGMENTED_TO_VIRTUAL(D_SY_6034304); boss->info.hitbox = SEGMENTED_TO_VIRTUAL(D_SY_6034304);
AUDIO_PLAY_SFX(0x2903A06F, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_MS_SHIELD_BROKEN, boss->sfxSource, 4);
} }
} }
if (boss->health <= 80) { if (boss->health <= 80) {
@ -708,7 +708,7 @@ void SectorY_80199DAC(Boss* boss) {
boss->fwork[12] = 320.0f; boss->fwork[12] = 320.0f;
if (boss->timer_056 == 0) { if (boss->timer_056 == 0) {
boss->timer_056 = 51; boss->timer_056 = 51;
AUDIO_PLAY_SFX(0x2902306C, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_MS_DASH, boss->sfxSource, 4);
} }
} }
} else { } else {
@ -764,7 +764,7 @@ void SectorY_8019A434(Boss* boss) {
boss->fwork[13] = COS_DEG(boss->unk_078.y) * boss->fwork[45]; boss->fwork[13] = COS_DEG(boss->unk_078.y) * boss->fwork[45];
boss->fwork[12] = 30.0f; boss->fwork[12] = 30.0f;
boss->fwork[10] = 181.0f; boss->fwork[10] = 181.0f;
AUDIO_PLAY_SFX(0x19031003, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_MS_LAND, boss->sfxSource, 4);
} }
void SectorY_8019A520(Boss* boss) { void SectorY_8019A520(Boss* boss) {
@ -785,7 +785,7 @@ void SectorY_8019A520(Boss* boss) {
} }
if ((boss->unk_04C == 0) || (boss->unk_04C == 27)) { if ((boss->unk_04C == 0) || (boss->unk_04C == 27)) {
AUDIO_PLAY_SFX(0x29022019, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_HEAVY_WALK, boss->sfxSource, 4);
} }
} }
@ -806,7 +806,7 @@ void SectorY_8019A66C(Boss* boss) {
} }
if (boss->timer_056 == 60) { if (boss->timer_056 == 60) {
AUDIO_PLAY_SFX(0x2902306C, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_MS_DASH, boss->sfxSource, 4);
boss->fwork[34] = 4.5f; boss->fwork[34] = 4.5f;
if (Rand_ZeroOne() > 0.5f) { if (Rand_ZeroOne() > 0.5f) {
AllRange_PlayMessage(gMsg_ID_14330, RCID_BOSS_SECTORY); AllRange_PlayMessage(gMsg_ID_14330, RCID_BOSS_SECTORY);
@ -860,7 +860,7 @@ void SectorY_8019A898(Boss* boss) {
Math_SmoothStepToAngle(&boss->unk_078.y, yAngle1, 0.1f, 2.0f, 0.1f); Math_SmoothStepToAngle(&boss->unk_078.y, yAngle1, 0.1f, 2.0f, 0.1f);
boss->fwork[0] = 1.0f; boss->fwork[0] = 1.0f;
if ((boss->unk_04C == 0) || (boss->unk_04C == 27)) { if ((boss->unk_04C == 0) || (boss->unk_04C == 27)) {
AUDIO_PLAY_SFX(0x29022019, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_HEAVY_WALK, boss->sfxSource, 4);
} }
} else { } else {
boss->timer_056 = 0; boss->timer_056 = 0;
@ -923,9 +923,9 @@ void SectorY_8019AAF0(Boss* boss) {
if (boss->unk_04C >= boss->swork[32] - 29) { if (boss->unk_04C >= boss->swork[32] - 29) {
if (boss->unk_04C == boss->swork[32] - 29) { if (boss->unk_04C == boss->swork[32] - 29) {
if (boss->swork[31] == 11) { if (boss->swork[31] == 11) {
AUDIO_PLAY_SFX(0x2903401C, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_MS_PUNCH, boss->sfxSource, 4);
} else { } else {
AUDIO_PLAY_SFX(0x2902306D, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_MS_KICK, boss->sfxSource, 4);
} }
} }
@ -1006,7 +1006,7 @@ void SectorY_8019AEEC(Boss* boss) {
} }
if (boss->obj.pos.y == 0.0f) { if (boss->obj.pos.y == 0.0f) {
AUDIO_PLAY_SFX(0x0100001D, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_LIFT_UP, gDefaultSfxSource, 4);
} }
Math_SmoothStepToF(&boss->obj.pos.y, 365.0f, 0.1f, 5.0f, 0.1f); Math_SmoothStepToF(&boss->obj.pos.y, 365.0f, 0.1f, 5.0f, 0.1f);
@ -1019,7 +1019,7 @@ void SectorY_8019AEEC(Boss* boss) {
} }
if (boss->obj.pos.y == 365.0f) { if (boss->obj.pos.y == 365.0f) {
AUDIO_PLAY_SFX(0x09002013, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_LIFT_UP_END, gDefaultSfxSource, 4);
boss->timer_050 = 20; boss->timer_050 = 20;
boss->timer_056 = 135; boss->timer_056 = 135;
} }
@ -1036,7 +1036,7 @@ void SectorY_8019AEEC(Boss* boss) {
} }
if (boss->timer_056 == 95) { if (boss->timer_056 == 95) {
AUDIO_PLAY_SFX(0x3102505A, gActors[59].sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_BURNER_L, gActors[59].sfxSource, 4);
} }
if (boss->timer_056 < 96) { if (boss->timer_056 < 96) {
Math_SmoothStepToF(&gActors[59].fwork[0], 0.0f, 0.1f, 0.2f, 0.05f); Math_SmoothStepToF(&gActors[59].fwork[0], 0.0f, 0.1f, 0.2f, 0.05f);
@ -1053,7 +1053,7 @@ void SectorY_8019AEEC(Boss* boss) {
D_i6_801A8440[0] = boss->sfxSource[0]; D_i6_801A8440[0] = boss->sfxSource[0];
D_i6_801A8440[1] = boss->sfxSource[1]; D_i6_801A8440[1] = boss->sfxSource[1];
D_i6_801A8440[2] = -500.0f; D_i6_801A8440[2] = -500.0f;
AUDIO_PLAY_SFX(0x2902306C, D_i6_801A8440, 4); AUDIO_PLAY_SFX(NA_SE_EN_MS_DASH, D_i6_801A8440, 4);
Audio_KillSfxBySource(gActors[59].sfxSource); Audio_KillSfxBySource(gActors[59].sfxSource);
boss->fwork[34] = 4.5f; boss->fwork[34] = 4.5f;
gActors[59].vel.z = -40.0f; gActors[59].vel.z = -40.0f;
@ -1256,9 +1256,9 @@ void SectorY_8019BC14(Boss* boss) {
gPlayer[0].trueZpos = gPlayer[0].pos.z = sp44; gPlayer[0].trueZpos = gPlayer[0].pos.z = sp44;
if (boss->index == 0) { if (boss->index == 0) {
AUDIO_PLAY_SFX(0x2901306E, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_MS_SHOT_L, boss->sfxSource, 4);
} else { } else {
AUDIO_PLAY_SFX(0x2900306B, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_MS_SHOT_S, boss->sfxSource, 4);
} }
} }
} }
@ -1357,11 +1357,11 @@ void SectorY_8019C194(Boss* boss, f32 zSpeed, f32 xSpeed) {
if (sp2C > 0.0f) { if (sp2C > 0.0f) {
if (boss->fwork[41] == 0.0f) { if (boss->fwork[41] == 0.0f) {
boss->fwork[41] = ABS(sp2C * 0.01f) + 0.8f; boss->fwork[41] = ABS(sp2C * 0.01f) + 0.8f;
AUDIO_PLAY_SFX(0x09000003, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_ARWING_BRAKE, boss->sfxSource, 4);
} }
} else if (boss->fwork[42] == 0.0f) { } else if (boss->fwork[42] == 0.0f) {
boss->fwork[42] = ABS(sp2C * 0.01f) + 0.8f; boss->fwork[42] = ABS(sp2C * 0.01f) + 0.8f;
AUDIO_PLAY_SFX(0x09000003, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_ARWING_BRAKE, boss->sfxSource, 4);
} }
} }
} }
@ -1616,7 +1616,7 @@ void SectorY_8019C888(Boss* boss) {
if (boss->dmgPart == 0) { if (boss->dmgPart == 0) {
if (boss->swork[25] == 0) { if (boss->swork[25] == 0) {
boss->swork[24] = 15; boss->swork[24] = 15;
AUDIO_PLAY_SFX(0x29121007, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_REFLECT, boss->sfxSource, 4);
} else { } else {
SectorY_80198F5C(boss); SectorY_80198F5C(boss);
} }
@ -2023,7 +2023,7 @@ void SectorY_8019EB80(void) {
actor->scale = 0.125f; actor->scale = 0.125f;
} }
actor->iwork[11] = 1; actor->iwork[11] = 1;
AUDIO_PLAY_SFX(0x3100000C, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_ARWING_ENGINE_FG, actor->sfxSource, 4);
} }
} }
@ -2166,10 +2166,10 @@ void SectorY_LevelComplete(Player* player) {
} }
if (gCsFrameCount == 343) { if (gCsFrameCount == 343) {
AUDIO_PLAY_SFX(0x09000007, player->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_WING_OPEN, player->sfxSource, 0);
} }
if (gCsFrameCount == 395) { if (gCsFrameCount == 395) {
AUDIO_PLAY_SFX(0x09000013, player->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_WING_OPEN_END, player->sfxSource, 0);
} }
D_ctx_80177A48[1] += D_ctx_80177A48[2]; D_ctx_80177A48[1] += D_ctx_80177A48[2];
@ -2312,7 +2312,7 @@ void SectorY_LevelComplete(Player* player) {
break; break;
case 1440: case 1440:
AUDIO_PLAY_SFX(0x09000002, player->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_ARWING_BOOST, player->sfxSource, 0);
player->unk_194 = 5.0f; player->unk_194 = 5.0f;
player->unk_190 = 5.0f; player->unk_190 = 5.0f;
SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 50); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 50);
@ -2383,7 +2383,7 @@ void SectorY_8019FF00(Actor* actor) {
case 2: case 2:
actor->state = 3; actor->state = 3;
AUDIO_PLAY_SFX(0x09000002, actor->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_ARWING_BOOST, actor->sfxSource, 0);
actor->fwork[29] = 5.0f; actor->fwork[29] = 5.0f;
/* fallthrough */ /* fallthrough */
case 3: case 3:
@ -2412,7 +2412,7 @@ void SectorY_8019FF00(Actor* actor) {
} else { } else {
if (gCsFrameCount == 540) { if (gCsFrameCount == 540) {
actor->fwork[29] = 3.8f; actor->fwork[29] = 3.8f;
AUDIO_PLAY_SFX(0x09000002, actor->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_ARWING_BOOST, actor->sfxSource, 0);
} }
Math_SmoothStepToF(&actor->obj.pos.x, 230.0f, 1.0f, 13.0f, 0.0f); Math_SmoothStepToF(&actor->obj.pos.x, 230.0f, 1.0f, 13.0f, 0.0f);
} }
@ -2423,7 +2423,7 @@ void SectorY_8019FF00(Actor* actor) {
if (gCsFrameCount >= 535) { if (gCsFrameCount >= 535) {
if (gCsFrameCount == 535) { if (gCsFrameCount == 535) {
actor->fwork[29] = 3.8f; actor->fwork[29] = 3.8f;
AUDIO_PLAY_SFX(0x09000002, actor->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_ARWING_BOOST, actor->sfxSource, 0);
} }
Math_SmoothStepToF(&actor->obj.pos.x, -1000.0f, 1.0f, 20.0f, 0.0f); Math_SmoothStepToF(&actor->obj.pos.x, -1000.0f, 1.0f, 20.0f, 0.0f);
Math_SmoothStepToAngle(&actor->unk_0F4.z, 45.0f, 1.0f, 4.0f, 0.0f); Math_SmoothStepToAngle(&actor->unk_0F4.z, 45.0f, 1.0f, 4.0f, 0.0f);
@ -2439,7 +2439,7 @@ void SectorY_8019FF00(Actor* actor) {
if (gCsFrameCount >= 525) { if (gCsFrameCount >= 525) {
if (gCsFrameCount == 525) { if (gCsFrameCount == 525) {
actor->fwork[29] = 3.8f; actor->fwork[29] = 3.8f;
AUDIO_PLAY_SFX(0x09000002, actor->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_ARWING_BOOST, actor->sfxSource, 0);
} }
Math_SmoothStepToF(&actor->obj.pos.x, 1500.0f, 1.0f, 20.0f, 0.0f); Math_SmoothStepToF(&actor->obj.pos.x, 1500.0f, 1.0f, 20.0f, 0.0f);
Math_SmoothStepToAngle(&actor->unk_0F4.z, 315.0f, 1.0f, 2.0f, 0.0f); Math_SmoothStepToAngle(&actor->unk_0F4.z, 315.0f, 1.0f, 2.0f, 0.0f);
@ -2550,8 +2550,8 @@ void SectorY_801A06A4(Actor* actor, s32 arg1) {
actor->state = arg1 + 7; actor->state = arg1 + 7;
actor->iwork[11] = 1; actor->iwork[11] = 1;
Object_SetInfo(&actor->info, actor->obj.id); Object_SetInfo(&actor->info, actor->obj.id);
AUDIO_PLAY_SFX(0x3100000C, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_ARWING_ENGINE_FG, actor->sfxSource, 4);
AUDIO_PLAY_SFX(0x09000002, actor->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_ARWING_BOOST, actor->sfxSource, 0);
} }
} }
@ -2587,7 +2587,7 @@ void SectorY_801A07FC(Actor* actor0, Actor* actor1) {
actor1->obj.rot.x = actor0->obj.rot.x; actor1->obj.rot.x = actor0->obj.rot.x;
actor1->obj.rot.y = actor0->obj.rot.y; actor1->obj.rot.y = actor0->obj.rot.y;
actor1->unk_0B6 = 42; actor1->unk_0B6 = 42;
AUDIO_PLAY_SFX(0x2900306B, actor1->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_MS_SHOT_S, actor1->sfxSource, 4);
} }
void SectorY_801A0A08(Actor* actor, f32 xPos, f32 yPos, f32 zPos, f32 arg4) { void SectorY_801A0A08(Actor* actor, f32 xPos, f32 yPos, f32 zPos, f32 arg4) {
@ -2602,7 +2602,7 @@ void SectorY_801A0A08(Actor* actor, f32 xPos, f32 yPos, f32 zPos, f32 arg4) {
actor->timer_0BC = 35; actor->timer_0BC = 35;
actor->iwork[0] = 255; actor->iwork[0] = 255;
actor->unk_0B6 = 43; actor->unk_0B6 = 43;
AUDIO_PLAY_SFX(0x2900306B, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_MS_SHOT_S, actor->sfxSource, 4);
} }
void SectorY_801A0AC0(Player* player) { void SectorY_801A0AC0(Player* player) {
@ -2817,14 +2817,14 @@ void SectorY_801A0AC0(Player* player) {
func_effect_8007BFFC(gActors[11].obj.pos.x, gActors[11].obj.pos.y, gActors[11].obj.pos.z, func_effect_8007BFFC(gActors[11].obj.pos.x, gActors[11].obj.pos.y, gActors[11].obj.pos.z,
gActors[11].vel.x, gActors[11].vel.y, gActors[11].vel.z, 8, 10); gActors[11].vel.x, gActors[11].vel.y, gActors[11].vel.z, 8, 10);
func_effect_8007B344(gActors[11].obj.pos.x, gActors[11].obj.pos.y, gActors[11].obj.pos.z, 8, 5); func_effect_8007B344(gActors[11].obj.pos.x, gActors[11].obj.pos.y, gActors[11].obj.pos.z, 8, 5);
AUDIO_PLAY_SFX(0x2903A060, gActors[11].sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_MS_EXPLOSION_S, gActors[11].sfxSource, 4);
break; break;
case 188: case 188:
gActors[5].fwork[0] = gActors[6].fwork[0] = gActors[7].fwork[0] = 3.8f; gActors[5].fwork[0] = gActors[6].fwork[0] = gActors[7].fwork[0] = 3.8f;
AUDIO_PLAY_SFX(0x2902306C, gActors[5].sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_MS_DASH, gActors[5].sfxSource, 4);
AUDIO_PLAY_SFX(0x2902306C, gActors[6].sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_MS_DASH, gActors[6].sfxSource, 4);
AUDIO_PLAY_SFX(0x2902306C, gActors[7].sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_MS_DASH, gActors[7].sfxSource, 4);
break; break;
case 150: case 150:
@ -2838,12 +2838,12 @@ void SectorY_801A0AC0(Player* player) {
case 155: case 155:
gActors[7].fwork[0] = 3.8f; gActors[7].fwork[0] = 3.8f;
AUDIO_PLAY_SFX(0x2902306C, gActors[7].sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_MS_DASH, gActors[7].sfxSource, 4);
break; break;
case 163: case 163:
gActors[6].fwork[0] = 3.8f; gActors[6].fwork[0] = 3.8f;
AUDIO_PLAY_SFX(0x2902306C, gActors[6].sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_MS_DASH, gActors[6].sfxSource, 4);
break; break;
case 240: case 240:
@ -2855,7 +2855,7 @@ void SectorY_801A0AC0(Player* player) {
gActors[9].iwork[5] = 0; gActors[9].iwork[5] = 0;
gActors[9].iwork[6] = 255; gActors[9].iwork[6] = 255;
gActors[9].iwork[7] = 100; gActors[9].iwork[7] = 100;
AUDIO_PLAY_SFX(0x2940F026, gActors[5].sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_STAR_EXPLOSION, gActors[5].sfxSource, 4);
D_ctx_801779A8[gMainController] = 100.0f; D_ctx_801779A8[gMainController] = 100.0f;
break; break;
@ -2924,7 +2924,7 @@ void SectorY_801A0AC0(Player* player) {
gActors[5].iwork[4] = gActors[6].iwork[4] = gActors[7].iwork[4] = 1; gActors[5].iwork[4] = gActors[6].iwork[4] = gActors[7].iwork[4] = 1;
gActors[5].fwork[5] = gActors[6].fwork[5] = gActors[7].fwork[5] = 80.0f; gActors[5].fwork[5] = gActors[6].fwork[5] = gActors[7].fwork[5] = 80.0f;
gActors[6].fwork[1] = 60.0f; gActors[6].fwork[1] = 60.0f;
AUDIO_PLAY_SFX(0x31000011, gActors[5].sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_ENGINE_01, gActors[5].sfxSource, 4);
} }
if ((gCsFrameCount >= 285) && (gActors[9].iwork[3] != 0)) { if ((gCsFrameCount >= 285) && (gActors[9].iwork[3] != 0)) {
gActors[9].iwork[3] -= 5; gActors[9].iwork[3] -= 5;
@ -3027,12 +3027,12 @@ void SectorY_801A0AC0(Player* player) {
switch (gCsFrameCount) { switch (gCsFrameCount) {
case 340: case 340:
gActors[5].fwork[0] = 1.8f; gActors[5].fwork[0] = 1.8f;
AUDIO_PLAY_SFX(0x2902306C, gActors[5].sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_MS_DASH, gActors[5].sfxSource, 4);
break; break;
case 350: case 350:
gActors[6].fwork[0] = 1.8f; gActors[6].fwork[0] = 1.8f;
AUDIO_PLAY_SFX(0x2902306C, gActors[6].sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_MS_DASH, gActors[6].sfxSource, 4);
break; break;
case 370: case 370:
@ -3079,7 +3079,7 @@ void SectorY_801A0AC0(Player* player) {
if (gCsFrameCount >= 390) { if (gCsFrameCount >= 390) {
if (gActors[6].iwork[4] != 0) { if (gActors[6].iwork[4] != 0) {
gActors[6].fwork[0] = 1.8f; gActors[6].fwork[0] = 1.8f;
AUDIO_PLAY_SFX(0x2902306C, gActors[6].sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_MS_DASH, gActors[6].sfxSource, 4);
gActors[6].obj.rot.x = (gActors[6].obj.rot.x - 2.0f); gActors[6].obj.rot.x = (gActors[6].obj.rot.x - 2.0f);
if (gActors[6].obj.rot.x <= 320.0f) { if (gActors[6].obj.rot.x <= 320.0f) {
gActors[6].iwork[4] = 0; gActors[6].iwork[4] = 0;
@ -3098,7 +3098,7 @@ void SectorY_801A0AC0(Player* player) {
gActors[6].obj.rot.y = (gActors[6].obj.rot.y + 6.0f); gActors[6].obj.rot.y = (gActors[6].obj.rot.y + 6.0f);
if (gActors[6].obj.rot.y > 230.0f) { if (gActors[6].obj.rot.y > 230.0f) {
gActors[6].fwork[0] = 2.8f; gActors[6].fwork[0] = 2.8f;
AUDIO_PLAY_SFX(0x2902306C, gActors[6].sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_MS_DASH, gActors[6].sfxSource, 4);
} }
} }
} }
@ -3142,7 +3142,7 @@ void SectorY_801A0AC0(Player* player) {
gActors[7].obj.rot.y = (gActors[7].obj.rot.y + 6.0f); gActors[7].obj.rot.y = (gActors[7].obj.rot.y + 6.0f);
if (gActors[7].obj.rot.y > 230.0f) { if (gActors[7].obj.rot.y > 230.0f) {
gActors[7].fwork[0] = 2.8f; gActors[7].fwork[0] = 2.8f;
AUDIO_PLAY_SFX(0x2902306C, gActors[7].sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_MS_DASH, gActors[7].sfxSource, 4);
} }
} }
} }
@ -3174,7 +3174,7 @@ void SectorY_801A0AC0(Player* player) {
gActors[5].obj.rot.y += 7.0f; gActors[5].obj.rot.y += 7.0f;
if (gActors[5].obj.rot.y > 174.0f) { if (gActors[5].obj.rot.y > 174.0f) {
gActors[5].fwork[0] = 2.8f; gActors[5].fwork[0] = 2.8f;
AUDIO_PLAY_SFX(0x2902306C, gActors[5].sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_MS_DASH, gActors[5].sfxSource, 4);
} }
} }
@ -3226,7 +3226,7 @@ void SectorY_801A0AC0(Player* player) {
Object_Kill(&gActors[10].obj, gActors[10].sfxSource); Object_Kill(&gActors[10].obj, gActors[10].sfxSource);
SectorY_801A07FC(&gActors[5], &gActors[10]); SectorY_801A07FC(&gActors[5], &gActors[10]);
gActors[7].fwork[0] = 1.8f; gActors[7].fwork[0] = 1.8f;
AUDIO_PLAY_SFX(0x2902306C, gActors[7].sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_MS_DASH, gActors[7].sfxSource, 4);
break; break;
case 458: case 458:
@ -3255,7 +3255,7 @@ void SectorY_801A0AC0(Player* player) {
case 545: case 545:
player->unk_194 = 10.0f; player->unk_194 = 10.0f;
player->unk_190 = 10.0f; player->unk_190 = 10.0f;
AUDIO_PLAY_SFX(0x09000002, player->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_ARWING_BOOST, player->sfxSource, 0);
gControllerRumbleFlags[gMainController] = 1; gControllerRumbleFlags[gMainController] = 1;
gControllerRumbleTimers[gMainController] = 5; gControllerRumbleTimers[gMainController] = 5;
break; break;
@ -3271,7 +3271,7 @@ void SectorY_801A0AC0(Player* player) {
gActors[5].obj.rot.y = gActors[6].obj.rot.y = 180.0f; gActors[5].obj.rot.y = gActors[6].obj.rot.y = 180.0f;
gActors[7].obj.rot.y = 140.0f; gActors[7].obj.rot.y = 140.0f;
gActors[5].fwork[0] = 2.8f; gActors[5].fwork[0] = 2.8f;
AUDIO_PLAY_SFX(0x2902306C, gActors[5].sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_MS_DASH, gActors[5].sfxSource, 4);
player->csState++; player->csState++;
break; break;
} }
@ -3557,7 +3557,7 @@ void SectorY_Actor204_Update(Actor204* this) {
func_effect_8007F11C(OBJ_EFFECT_354, this->fwork[16], this->fwork[17], this->fwork[18], 100.0f); func_effect_8007F11C(OBJ_EFFECT_354, this->fwork[16], this->fwork[17], this->fwork[18], 100.0f);
gPlayer[0].pos.x = sp1E4; gPlayer[0].pos.x = sp1E4;
gPlayer[0].pos.y = sp1E0; gPlayer[0].pos.y = sp1E0;
AUDIO_PLAY_SFX(0x2900306B, this->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_MS_SHOT_S, this->sfxSource, 4);
} }
this->unk_048 = 0; this->unk_048 = 0;
} }
@ -3618,7 +3618,7 @@ void SectorY_Actor204_Update(Actor204* this) {
func_effect_8007BFFC(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, this->vel.x, this->vel.y, func_effect_8007BFFC(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, this->vel.x, this->vel.y,
this->vel.z, 8.0f, 10); this->vel.z, 8.0f, 10);
func_effect_8007B344(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, 8.0f, 5); func_effect_8007B344(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, 8.0f, 5);
AUDIO_PLAY_SFX(0x2903A060, this->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_MS_EXPLOSION_S, this->sfxSource, 4);
} }
if (this->timer_0BE == 0) { if (this->timer_0BE == 0) {
@ -3724,10 +3724,10 @@ void SectorY_Actor204_Update(Actor204* this) {
this->dmgType = DMG_NONE; this->dmgType = DMG_NONE;
if (this->dmgPart == 0) { if (this->dmgPart == 0) {
this->iwork[18] = 15; this->iwork[18] = 15;
AUDIO_PLAY_SFX(0x29121007, this->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_REFLECT, this->sfxSource, 4);
} else { } else {
AUDIO_PLAY_SFX(0x2903300E, this->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_DAMAGE_S, this->sfxSource, 4);
this->timer_0C6 = 15; this->timer_0C6 = 15;
func_effect_8007C120(this->hitPos.x, this->hitPos.y, this->hitPos.z, this->vel.x, this->vel.y, this->vel.z, func_effect_8007C120(this->hitPos.x, this->hitPos.y, this->hitPos.z, this->vel.x, this->vel.y, this->vel.z,
0.1f, 10); 0.1f, 10);
@ -3828,7 +3828,7 @@ void SectorY_801A4E44(Scenery* scenery) {
Vec3f sp30; Vec3f sp30;
if (scenery->state == 0) { if (scenery->state == 0) {
AUDIO_PLAY_SFX(0x1900404F, scenery->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OB_BROKEN_SPARK_L, scenery->sfxSource, 4);
scenery->state++; scenery->state++;
} }
if (((gGameFrameCount % 4) == 0)) { if (((gGameFrameCount % 4) == 0)) {
@ -3867,7 +3867,7 @@ void SectorY_801A52B8(Scenery* scenery) {
Vec3f sp38; Vec3f sp38;
if (scenery->state == 0) { if (scenery->state == 0) {
AUDIO_PLAY_SFX(0x1900404F, scenery->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OB_BROKEN_SPARK_L, scenery->sfxSource, 4);
scenery->state++; scenery->state++;
} }

2
src/overlays/ovl_i6/fox_turret.c
View File

@ -61,7 +61,7 @@ void Turret_801A581C(Player* player, f32 xOffset) {
for (i = 0; i < ARRAY_COUNT(gPlayerShots); i++) { for (i = 0; i < ARRAY_COUNT(gPlayerShots); i++) {
if (gPlayerShots[i].obj.status == 0) { if (gPlayerShots[i].obj.status == 0) {
Turret_801A5560(player, &gPlayerShots[i], xOffset, -100.0f, 200.0f, PLAYERSHOT_9, 100.0f); Turret_801A5560(player, &gPlayerShots[i], xOffset, -100.0f, 200.0f, PLAYERSHOT_9, 100.0f);
func_play_800A6028(gPlayerShots[i].sfxSource, 0x09000000); func_play_800A6028(gPlayerShots[i].sfxSource, NA_SE_TURRET_SHOT);
break; break;
} }
} }

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

@ -367,7 +367,7 @@ void Venom2_LevelComplete(Player* player) {
if (player->xRot_120 >= 180.0f) { if (player->xRot_120 >= 180.0f) {
player->xRot_120 -= 360.0f; player->xRot_120 -= 360.0f;
} }
AUDIO_PLAY_SFX(0x09000002, player->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_ARWING_BOOST, player->sfxSource, 0);
player->unk_194 = 5.0f; player->unk_194 = 5.0f;
player->unk_190 = 5.0f; player->unk_190 = 5.0f;
gCsFrameCount = 0; gCsFrameCount = 0;
@ -396,7 +396,7 @@ void Venom2_LevelComplete(Player* player) {
} }
if (gCsFrameCount == 105) { if (gCsFrameCount == 105) {
AUDIO_PLAY_SFX(0x09000002, player->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_ARWING_BOOST, player->sfxSource, 0);
player->unk_194 = 5.0f; player->unk_194 = 5.0f;
player->unk_190 = 5.0f; player->unk_190 = 5.0f;
} }

56
src/overlays/ovl_menu/fox_map.c
View File

@ -2134,7 +2134,7 @@ void Map_801A0954(void) {
if (gControllerPress[gMainController].button & START_BUTTON) { if (gControllerPress[gMainController].button & START_BUTTON) {
AUDIO_PLAY_BGM(SEQ_ID_WORLD_MAP); AUDIO_PLAY_BGM(SEQ_ID_WORLD_MAP);
AUDIO_PLAY_SFX(0x4900001F, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_MAP_MOVE_STOP, gDefaultSfxSource, 4);
for (planetId = 0; planetId < PLANET_MAX; planetId++) { for (planetId = 0; planetId < PLANET_MAX; planetId++) {
if ((planetId == PLANET_SECTOR_Z) || (planetId == PLANET_SECTOR_X) || (planetId == PLANET_SECTOR_Y)) { if ((planetId == PLANET_SECTOR_Z) || (planetId == PLANET_SECTOR_X) || (planetId == PLANET_SECTOR_Y)) {
@ -2346,7 +2346,7 @@ void Map_801A1528(void) {
} }
if (temp == 0.0f) { if (temp == 0.0f) {
AUDIO_PLAY_SFX(0x4900001F, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_MAP_MOVE_STOP, gDefaultSfxSource, 4);
D_menu_801CD948 = 0; D_menu_801CD948 = 0;
D_menu_801CD97C = 1; D_menu_801CD97C = 1;
D_menu_801CD944 = 3; D_menu_801CD944 = 3;
@ -2355,7 +2355,7 @@ void Map_801A1528(void) {
} }
if (gControllerPress[gMainController].button & START_BUTTON) { if (gControllerPress[gMainController].button & START_BUTTON) {
AUDIO_PLAY_SFX(0x4900001F, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_MAP_MOVE_STOP, gDefaultSfxSource, 4);
for (planetId = 0; planetId < PLANET_MAX; planetId++) { for (planetId = 0; planetId < PLANET_MAX; planetId++) {
if ((planetId == PLANET_SECTOR_Z) || (planetId == PLANET_SECTOR_X) || (planetId == PLANET_SECTOR_Y)) { if ((planetId == PLANET_SECTOR_Z) || (planetId == PLANET_SECTOR_X) || (planetId == PLANET_SECTOR_Y)) {
@ -2463,9 +2463,9 @@ void Map_801A1C14(void) {
if (sCurrentPlanetId == PLANET_CORNERIA) { if (sCurrentPlanetId == PLANET_CORNERIA) {
gFillScreenAlpha = 0; gFillScreenAlpha = 0;
D_menu_801CD948 = 10; D_menu_801CD948 = 10;
AUDIO_PLAY_SFX(0x0940A00B, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_BACKUP_CLEAR, gDefaultSfxSource, 4);
} else { } else {
AUDIO_PLAY_SFX(0x19003012, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_MAP_ZOOM_START, gDefaultSfxSource, 4);
D_menu_801CD948++; D_menu_801CD948++;
} }
} else { } else {
@ -2481,7 +2481,7 @@ void Map_801A1C14(void) {
case 10: case 10:
if (D_menu_801CEB34 == 4) { if (D_menu_801CEB34 == 4) {
AUDIO_PLAY_SFX(0x19003012, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_MAP_ZOOM_START, gDefaultSfxSource, 4);
D_menu_801CD948 = 2; D_menu_801CD948 = 2;
} }
break; break;
@ -2489,7 +2489,7 @@ void Map_801A1C14(void) {
case 2: case 2:
Map_801A2674(); Map_801A2674();
if ((D_menu_801CD9FC == D_menu_801CDA50.z) && (D_menu_801CD9D8 == 0)) { if ((D_menu_801CD9FC == D_menu_801CDA50.z) && (D_menu_801CD9D8 == 0)) {
AUDIO_PLAY_SFX(0x19004013, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_MAP_ZOOM_END, gDefaultSfxSource, 4);
D_menu_801CD9D8 = 1; D_menu_801CD9D8 = 1;
if (sCurrentPlanetId == PLANET_CORNERIA) { if (sCurrentPlanetId == PLANET_CORNERIA) {
D_menu_801CEB48[0] = true; D_menu_801CEB48[0] = true;
@ -2909,9 +2909,9 @@ void Map_801A2EB8(void) {
if (D_menu_801CD9C4 == 30) { if (D_menu_801CD9C4 == 30) {
if (sPrevMissionStatus == MISSION_WARP) { if (sPrevMissionStatus == MISSION_WARP) {
AUDIO_PLAY_SFX(0x0900802A, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_MAP_ARWING_WARP_DASH, gDefaultSfxSource, 4);
} else { } else {
AUDIO_PLAY_SFX(0x09000032, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_MAP_ARWING_DASH, gDefaultSfxSource, 4);
} }
} }
@ -2979,7 +2979,7 @@ void Map_801A2EB8(void) {
} }
if ((D_menu_801CEED8 == 4) && (D_menu_801CEEDC == 0.0f)) { if ((D_menu_801CEED8 == 4) && (D_menu_801CEEDC == 0.0f)) {
AUDIO_PLAY_SFX(0x19000026, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_MAP_ZOOM_OUT, gDefaultSfxSource, 4);
} }
if ((D_menu_801CEED8 == 5) && (D_menu_801CEEDC == 0.0f)) { if ((D_menu_801CEED8 == 5) && (D_menu_801CEEDC == 0.0f)) {
@ -3137,7 +3137,7 @@ void Map_801A36A8(void) {
} }
if (gControllerPress[gMainController].button & (A_BUTTON | START_BUTTON)) { if (gControllerPress[gMainController].button & (A_BUTTON | START_BUTTON)) {
AUDIO_PLAY_SFX(0x49000003, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_DECIDE, gDefaultSfxSource, 4);
D_menu_801CD948 = 3; D_menu_801CD948 = 3;
} }
} }
@ -3592,7 +3592,7 @@ void Map_801A4D7C(void) {
if (gControllerPress[gMainController].button & A_BUTTON) { if (gControllerPress[gMainController].button & A_BUTTON) {
Audio_PlayMapMenuSfx(0); Audio_PlayMapMenuSfx(0);
AUDIO_PLAY_SFX(0x49000003, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_DECIDE, gDefaultSfxSource, 4);
D_menu_801CF000[D_menu_801CEFDC] = 10; D_menu_801CF000[D_menu_801CEFDC] = 10;
if (((sPrevMissionStatus != MISSION_COMPLETE) && (D_menu_801CEFDC == 2)) || if (((sPrevMissionStatus != MISSION_COMPLETE) && (D_menu_801CEFDC == 2)) ||
@ -3784,7 +3784,7 @@ bool Map_801A5770(void) {
} }
if (ret) { if (ret) {
AUDIO_PLAY_SFX(0x49000002, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_CURSOR, gDefaultSfxSource, 4);
} }
return ret; return ret;
@ -3945,7 +3945,7 @@ void Map_801A5E80(void) {
case 1: case 1:
if ((gControllerPress[gMainController].button & START_BUTTON) && !(D_menu_801CD9A8)) { if ((gControllerPress[gMainController].button & START_BUTTON) && !(D_menu_801CD9A8)) {
Audio_KillSfxById(0x4100001E); Audio_KillSfxById(NA_SE_COMPUTER_NOISE);
Audio_ClearVoice(); Audio_ClearVoice();
D_menu_801CF018 = 0; D_menu_801CF018 = 0;
D_menu_801B8280 = 2; D_menu_801B8280 = 2;
@ -3994,7 +3994,7 @@ void Map_801A5E80(void) {
case 4: case 4:
if (D_menu_801CD9B8 == 0) { if (D_menu_801CD9B8 == 0) {
AUDIO_PLAY_SFX(0x49002016, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_GOOD_LUCK, gDefaultSfxSource, 4);
D_menu_801CD9B8 = 75; D_menu_801CD9B8 = 75;
D_menu_801B8280++; D_menu_801B8280++;
} }
@ -4260,11 +4260,11 @@ s32 Map_GetPathId(PlanetId start, PlanetId end) {
} }
void Map_801A659C(void) { void Map_801A659C(void) {
Audio_KillSfxById(0x1100004C); Audio_KillSfxById(NA_SE_MAP_MOVE);
Audio_KillSfxById(0x1100204C); Audio_KillSfxById(NA_SE_MAP_ROLL);
if (sCurrentPlanetId != PLANET_CORNERIA) { if (sCurrentPlanetId != PLANET_CORNERIA) {
AUDIO_PLAY_SFX(0x49000003, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_DECIDE, gDefaultSfxSource, 4);
} }
D_menu_801CEFC8 = 0; D_menu_801CEFC8 = 0;
@ -4925,7 +4925,7 @@ void Map_801A809C(PlanetId planetId) {
D_menu_801CD998 += 8; D_menu_801CD998 += 8;
if (D_menu_801CD998 == 8) { if (D_menu_801CD998 == 8) {
AUDIO_PLAY_SFX(0x49008030, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_GET_EMBLEM, gDefaultSfxSource, 4);
} }
if (D_menu_801CD998 >= 255) { if (D_menu_801CD998 >= 255) {
@ -5838,7 +5838,7 @@ void Map_801AB300(void) {
D_menu_801CEA74 = 255; D_menu_801CEA74 = 255;
gRadioTextBoxScaleY = 1.3f; gRadioTextBoxScaleY = 1.3f;
AUDIO_PLAY_SFX(0x4100001E, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_COMPUTER_NOISE, gDefaultSfxSource, 4);
Audio_PlayVoice(Message_IdFromPtr(gRadioMsg)); Audio_PlayVoice(Message_IdFromPtr(gRadioMsg));
gRadioStateTimer = Message_GetCharCount(gRadioMsg) * 2; gRadioStateTimer = Message_GetCharCount(gRadioMsg) * 2;
@ -5920,7 +5920,7 @@ void Map_801AB300(void) {
case 6: case 6:
if (gRadioStateTimer == 0) { if (gRadioStateTimer == 0) {
Audio_KillSfxById(0x4100001E); Audio_KillSfxById(NA_SE_COMPUTER_NOISE);
Audio_PlayVoice(0); Audio_PlayVoice(0);
gRadioTextBoxScaleY = 0.0f; gRadioTextBoxScaleY = 0.0f;
D_menu_801CF018++; D_menu_801CF018++;
@ -6359,7 +6359,7 @@ void Map_801AC9A0(s32 index) {
switch (gPlanetPathStatus[index]) { switch (gPlanetPathStatus[index]) {
case 1: case 1:
AUDIO_PLAY_SFX(0x1900404D, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_MAP_LINE_DRAW, gDefaultSfxSource, 4);
gPlanetPathStatus[index] = 11; gPlanetPathStatus[index] = 11;
break; break;
@ -6367,7 +6367,7 @@ void Map_801AC9A0(s32 index) {
Math_SmoothStepToF(&gTexturedLines[index].zScale, target, 0.1f, 100.0f, 4.0f); Math_SmoothStepToF(&gTexturedLines[index].zScale, target, 0.1f, 100.0f, 4.0f);
gTexturedLines[index].alpha = 255; gTexturedLines[index].alpha = 255;
if (gTexturedLines[index].zScale == target) { if (gTexturedLines[index].zScale == target) {
Audio_KillSfxById(0x1900404D); Audio_KillSfxById(NA_SE_MAP_LINE_DRAW);
gPlanetPathStatus[index] = 4; gPlanetPathStatus[index] = 4;
} }
break; break;
@ -6581,7 +6581,7 @@ void Map_801AD11C(void) {
if (gControllerPress[gMainController].button & START_BUTTON) { if (gControllerPress[gMainController].button & START_BUTTON) {
if (D_menu_801CD944 == 3 && D_game_80161A34 == 7) { if (D_menu_801CD944 == 3 && D_game_80161A34 == 7) {
if (D_menu_801CEFD0) { if (D_menu_801CEFD0) {
AUDIO_PLAY_SFX(0x4900100A, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_ERROR, gDefaultSfxSource, 4);
} else { } else {
Audio_PlayMapMenuSfx(1); Audio_PlayMapMenuSfx(1);
D_menu_801CEFC4 = 1; D_menu_801CEFC4 = 1;
@ -6626,14 +6626,14 @@ void Map_801AD11C(void) {
} }
if (D_menu_801CF014 == 0 && var_a3 == 1) { if (D_menu_801CF014 == 0 && var_a3 == 1) {
Audio_PlaySfxModulated(gDefaultSfxSource, 0x1100204C); Audio_PlaySfxModulated(gDefaultSfxSource, NA_SE_MAP_ROLL);
D_menu_801CF014 = 1; D_menu_801CF014 = 1;
} }
if ((D_menu_801CF014 == 1) && (var_a3 == 0) && (y == 0.0f) && (x == 0.0f)) { if ((D_menu_801CF014 == 1) && (var_a3 == 0) && (y == 0.0f) && (x == 0.0f)) {
var_a1 = 0; var_a1 = 0;
var_a2 = 0; var_a2 = 0;
Audio_KillSfxById(0x1100204C); Audio_KillSfxById(NA_SE_MAP_ROLL);
D_menu_801CF014 = 0; D_menu_801CF014 = 0;
} }
@ -6680,12 +6680,12 @@ void Map_801AD11C(void) {
} }
if ((D_menu_801CF010 == 0) && (var_t0 == 1)) { if ((D_menu_801CF010 == 0) && (var_t0 == 1)) {
AUDIO_PLAY_SFX(0x1100004C, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_MAP_MOVE, gDefaultSfxSource, 4);
D_menu_801CF010 = 1; D_menu_801CF010 = 1;
} }
if ((D_menu_801CF010 == 1) && (var_t0 == 0)) { if ((D_menu_801CF010 == 1) && (var_t0 == 0)) {
Audio_KillSfxById(0x1100004C); Audio_KillSfxById(NA_SE_MAP_MOVE);
D_menu_801CF010 = 0; D_menu_801CF010 = 0;
} }
} }

104
src/overlays/ovl_menu/fox_option.c
View File

@ -922,13 +922,13 @@ void Option_MainMenuUpdate(void) {
temp1 = temp1 =
Option_8019C418(&D_menu_801B91A4, OPTION_COUNT - 1, 1, 0, 20, 5, 4, gMainController, &D_menu_801B9180); Option_8019C418(&D_menu_801B91A4, OPTION_COUNT - 1, 1, 0, 20, 5, 4, gMainController, &D_menu_801B9180);
// clang-format off // clang-format off
if (temp1 != 0) { AUDIO_PLAY_SFX(0x49000022, gDefaultSfxSource, 4); } if (temp1 != 0) { AUDIO_PLAY_SFX(NA_SE_ARWING_CURSOR, gDefaultSfxSource, 4); }
// clang-format on // clang-format on
if ((D_menu_801B91A4 == 0) && (D_menu_801B91C8 != 0)) { if ((D_menu_801B91A4 == 0) && (D_menu_801B91C8 != 0)) {
temp2 = Option_8019C418(&D_menu_801B91B0, 1, 0, 0, 20, 5, 4, gMainController, &D_menu_801B9190); temp2 = Option_8019C418(&D_menu_801B91B0, 1, 0, 0, 20, 5, 4, gMainController, &D_menu_801B9190);
if (temp2 != 0) { if (temp2 != 0) {
AUDIO_PLAY_SFX(0x49000022, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_ARWING_CURSOR, gDefaultSfxSource, 4);
if (D_menu_801B91B0) { if (D_menu_801B91B0) {
sOptionCardList[0].unk_00.unk_08 = D_OPT_8004C50; sOptionCardList[0].unk_00.unk_08 = D_OPT_8004C50;
sOptionCardList[0].unk_00.unk_10 = 80; sOptionCardList[0].unk_00.unk_10 = 80;
@ -948,7 +948,7 @@ void Option_MainMenuUpdate(void) {
if ((D_menu_801B91A4 == 4) && (D_menu_801B91C8 != 0)) { if ((D_menu_801B91A4 == 4) && (D_menu_801B91C8 != 0)) {
temp2 = Option_8019C418(&D_menu_801B91AC, 1, 0, 0, 20, 5, 4, gMainController, &D_menu_801B9198); temp2 = Option_8019C418(&D_menu_801B91AC, 1, 0, 0, 20, 5, 4, gMainController, &D_menu_801B9198);
if (temp2 != 0) { if (temp2 != 0) {
AUDIO_PLAY_SFX(0x49000022, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_ARWING_CURSOR, gDefaultSfxSource, 4);
if (D_menu_801B91AC) { if (D_menu_801B91AC) {
sOptionCardList[4].unk_00.unk_08 = D_OPT_8004C50; sOptionCardList[4].unk_00.unk_08 = D_OPT_8004C50;
sOptionCardList[4].unk_00.unk_10 = 80; sOptionCardList[4].unk_00.unk_10 = 80;
@ -966,13 +966,13 @@ void Option_MainMenuUpdate(void) {
} }
if (gControllerPress[gMainController].button & (A_BUTTON | START_BUTTON)) { if (gControllerPress[gMainController].button & (A_BUTTON | START_BUTTON)) {
AUDIO_PLAY_SFX(0x49000020, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_ARWING_DECIDE, gDefaultSfxSource, 4);
D_menu_801B9208 = sOptionCardPosY[D_menu_801B91A4]; D_menu_801B9208 = sOptionCardPosY[D_menu_801B91A4];
D_menu_801B91BC = 0; D_menu_801B91BC = 0;
D_menu_801B912C = 11; D_menu_801B912C = 11;
} }
if (gControllerPress[gMainController].button & B_BUTTON) { if (gControllerPress[gMainController].button & B_BUTTON) {
AUDIO_PLAY_SFX(0x49000021, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_ARWING_CANCEL, gDefaultSfxSource, 4);
D_menu_801B8284 = 0; D_menu_801B8284 = 0;
D_menu_801B8280 = 1; D_menu_801B8280 = 1;
D_menu_801B912C = 100; D_menu_801B912C = 100;
@ -1191,18 +1191,18 @@ void Option_VersusUpdate(void) {
case 1: case 1:
// clang-format off // clang-format off
if (Option_8019C418(&D_menu_801B91A8, 2, 1, 0, 20, 5, 4, gMainController, &D_menu_801B9188)) { AUDIO_PLAY_SFX(0x49000022, gDefaultSfxSource, 4); } if (Option_8019C418(&D_menu_801B91A8, 2, 1, 0, 20, 5, 4, gMainController, &D_menu_801B9188)) { AUDIO_PLAY_SFX(NA_SE_ARWING_CURSOR, gDefaultSfxSource, 4); }
// clang-format on // clang-format on
if (gControllerPress[gMainController].button & (A_BUTTON | START_BUTTON)) { if (gControllerPress[gMainController].button & (A_BUTTON | START_BUTTON)) {
AUDIO_PLAY_SFX(0x49000020, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_ARWING_DECIDE, gDefaultSfxSource, 4);
D_menu_801B9208 = D_menu_801AEF84[D_menu_801B91A8]; D_menu_801B9208 = D_menu_801AEF84[D_menu_801B91A8];
D_menu_801B91BC = 0; D_menu_801B91BC = 0;
D_menu_801B912C = 11; D_menu_801B912C = 11;
} }
if (gControllerPress[gMainController].button & B_BUTTON) { if (gControllerPress[gMainController].button & B_BUTTON) {
AUDIO_PLAY_SFX(0x49000021, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_ARWING_CANCEL, gDefaultSfxSource, 4);
D_menu_801B912C = 0; D_menu_801B912C = 0;
D_menu_801B9124 = 1000; D_menu_801B9124 = 1000;
gDrawMode = DRAW_NONE; gDrawMode = DRAW_NONE;
@ -1370,7 +1370,7 @@ void Option_SoundUpdate(void) {
temp = Option_8019C418(&D_menu_801B9288, 3, 1, 0, 20, 5, 4, gMainController, &D_menu_801B9250); temp = Option_8019C418(&D_menu_801B9288, 3, 1, 0, 20, 5, 4, gMainController, &D_menu_801B9250);
if (temp != 0) { if (temp != 0) {
D_menu_801B9270[sp34] = 255.0f; D_menu_801B9270[sp34] = 255.0f;
AUDIO_PLAY_SFX(0x49000002, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_CURSOR, gDefaultSfxSource, 4);
} }
if (D_menu_801B9288 == 0) { if (D_menu_801B9288 == 0) {
@ -1386,12 +1386,12 @@ void Option_SoundUpdate(void) {
} }
if (gControllerPress[gMainController].button & A_BUTTON) { if (gControllerPress[gMainController].button & A_BUTTON) {
AUDIO_PLAY_SFX(0x49000003, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_DECIDE, gDefaultSfxSource, 4);
D_menu_801B9288 = (D_menu_801B9288 + 1) % 4U; D_menu_801B9288 = (D_menu_801B9288 + 1) % 4U;
} }
if (gControllerPress[gMainController].button & B_BUTTON) { if (gControllerPress[gMainController].button & B_BUTTON) {
AUDIO_PLAY_SFX(0x49000021, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_ARWING_CANCEL, gDefaultSfxSource, 4);
if (D_menu_801B9284 == 1) { if (D_menu_801B9284 == 1) {
D_menu_801B9284 = 0; D_menu_801B9284 = 0;
Audio_PlaySoundTest(D_menu_801B9284); Audio_PlaySoundTest(D_menu_801B9284);
@ -1409,7 +1409,7 @@ void Option_80194AEC(void) {
s32 pad; s32 pad;
if (Option_8019C418(&sp3C, 2, 0, 0, 20, 5, 4, gMainController, &D_menu_801B9260)) { if (Option_8019C418(&sp3C, 2, 0, 0, 20, 5, 4, gMainController, &D_menu_801B9260)) {
AUDIO_PLAY_SFX(0x49000002, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_CURSOR, gDefaultSfxSource, 4);
gOptionSoundMode = sp3C; gOptionSoundMode = sp3C;
if (gOptionSoundMode >= OPTIONSOUND_MAX) { if (gOptionSoundMode >= OPTIONSOUND_MAX) {
gOptionSoundMode = OPTIONSOUND_STEREO; gOptionSoundMode = OPTIONSOUND_STEREO;
@ -1673,7 +1673,7 @@ void Option_ExpertSoundUpdate(void) {
#endif #endif
if (Option_8019C66C(&sp28, 0.0f, 49.0f, &D_menu_801B9290) != 0) { if (Option_8019C66C(&sp28, 0.0f, 49.0f, &D_menu_801B9290) != 0) {
AUDIO_PLAY_SFX(0x49000002, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_CURSOR, gDefaultSfxSource, 4);
D_menu_801B931C = sp28; D_menu_801B931C = sp28;
} }
@ -1684,14 +1684,14 @@ void Option_ExpertSoundUpdate(void) {
if (gControllerPress[gMainController].button & B_BUTTON) { if (gControllerPress[gMainController].button & B_BUTTON) {
if (!D_menu_801B9320) { if (!D_menu_801B9320) {
AUDIO_PLAY_SFX(0x49000021, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_ARWING_CANCEL, gDefaultSfxSource, 4);
AUDIO_PLAY_BGM(SEQ_ID_MENU); AUDIO_PLAY_BGM(SEQ_ID_MENU);
gDrawMode = DRAW_NONE; gDrawMode = DRAW_NONE;
D_menu_801B9124 = 1000; D_menu_801B9124 = 1000;
D_menu_801B912C = 0; D_menu_801B912C = 0;
D_menu_801B9244 = 1; D_menu_801B9244 = 1;
} else { } else {
AUDIO_PLAY_SFX(0x4900101D, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_CANCEL, gDefaultSfxSource, 4);
SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 1); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 1);
SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 1); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 1);
D_menu_801B9320 = false; D_menu_801B9320 = false;
@ -1869,7 +1869,7 @@ void Option_DataUpdate(void) {
case 1: case 1:
D_menu_801B91CC = 2; D_menu_801B91CC = 2;
AUDIO_PLAY_SFX(0x0940A00B, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_BACKUP_CLEAR, gDefaultSfxSource, 4);
D_ctx_801779A8[gMainController] = 50.0f; D_ctx_801779A8[gMainController] = 50.0f;
D_ctx_80177990[gMainController] = 0; D_ctx_80177990[gMainController] = 0;
break; break;
@ -1922,36 +1922,36 @@ void Option_DataUpdate(void) {
void Option_8019669C(void) { void Option_8019669C(void) {
if ((D_menu_801B91CC == 0) || (D_menu_801B91CC == 1)) { if ((D_menu_801B91CC == 0) || (D_menu_801B91CC == 1)) {
if (Option_8019C5A0(&D_menu_801B91C0) != 0) { if (Option_8019C5A0(&D_menu_801B91C0) != 0) {
AUDIO_PLAY_SFX(0x49000002, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_CURSOR, gDefaultSfxSource, 4);
} }
if (1) {} if (1) {}
} }
if (gControllerPress[gMainController].button & A_BUTTON) { if (gControllerPress[gMainController].button & A_BUTTON) {
if (D_menu_801B91CC == 3) { if (D_menu_801B91CC == 3) {
AUDIO_PLAY_SFX(0x49000021, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_ARWING_CANCEL, gDefaultSfxSource, 4);
D_menu_801B912C = 3; D_menu_801B912C = 3;
} else { } else {
D_menu_801B9330[D_menu_801B91C0] = 10; D_menu_801B9330[D_menu_801B91C0] = 10;
if (D_menu_801B91C0 == 0) { if (D_menu_801B91C0 == 0) {
if (D_menu_801B91CC == 1) { if (D_menu_801B91CC == 1) {
AUDIO_PLAY_SFX(0x49000003, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_DECIDE, gDefaultSfxSource, 4);
D_menu_801B912C = 2; D_menu_801B912C = 2;
} else { } else {
AUDIO_PLAY_SFX(0x49000021, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_ARWING_CANCEL, gDefaultSfxSource, 4);
D_menu_801B912C = 3; D_menu_801B912C = 3;
} }
} else { } else {
AUDIO_PLAY_SFX(0x49000003, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_DECIDE, gDefaultSfxSource, 4);
D_menu_801B912C = 4; D_menu_801B912C = 4;
} }
} }
} else if (gControllerPress[gMainController].button & B_BUTTON) { } else if (gControllerPress[gMainController].button & B_BUTTON) {
if (D_menu_801B91CC == 1) { if (D_menu_801B91CC == 1) {
AUDIO_PLAY_SFX(0x4900101D, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_CANCEL, gDefaultSfxSource, 4);
D_menu_801B912C = 2; D_menu_801B912C = 2;
} else { } else {
AUDIO_PLAY_SFX(0x49000021, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_ARWING_CANCEL, gDefaultSfxSource, 4);
D_menu_801B912C = 3; D_menu_801B912C = 3;
} }
} }
@ -2080,7 +2080,7 @@ void Option_RankingUpdate(void) {
Option_80196FC4(); Option_80196FC4();
if (gControllerPress[gMainController].button & B_BUTTON) { if (gControllerPress[gMainController].button & B_BUTTON) {
AUDIO_PLAY_SFX(0x49000021, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_ARWING_CANCEL, gDefaultSfxSource, 4);
gDrawMode = DRAW_NONE; gDrawMode = DRAW_NONE;
D_menu_801B9124 = 1000; D_menu_801B9124 = 1000;
D_menu_801B912C = 0; D_menu_801B912C = 0;
@ -2095,7 +2095,7 @@ void Option_RankingDraw(void) {
void Option_80196FC4(void) { void Option_80196FC4(void) {
if (gControllerPress[gMainController].button & A_BUTTON) { if (gControllerPress[gMainController].button & A_BUTTON) {
AUDIO_PLAY_SFX(0x49000003, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_DECIDE, gDefaultSfxSource, 4);
D_menu_801B93E0 ^= 1; D_menu_801B93E0 ^= 1;
} }
@ -2109,7 +2109,7 @@ void Option_80196FC4(void) {
void Option_80197074(void) { void Option_80197074(void) {
if (Option_8019C418(&D_menu_801B93E4, 9, 1, 0, 20, 5, 4, gMainController, &D_menu_801B9400)) { if (Option_8019C418(&D_menu_801B93E4, 9, 1, 0, 20, 5, 4, gMainController, &D_menu_801B9400)) {
AUDIO_PLAY_SFX(0x49000002, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_CURSOR, gDefaultSfxSource, 4);
D_menu_801B91D4 = 114.0f - D_menu_801B93E4 * 130.0f; D_menu_801B91D4 = 114.0f - D_menu_801B93E4 * 130.0f;
D_menu_801B91DC = 114.0f - D_menu_801B93E4 * 130.0f; D_menu_801B91DC = 114.0f - D_menu_801B93E4 * 130.0f;
D_menu_801B91D8 = -6.0f + D_menu_801B93E4 * 130.0f; D_menu_801B91D8 = -6.0f + D_menu_801B93E4 * 130.0f;
@ -2126,7 +2126,7 @@ void Option_8019715C(void) {
if (D_menu_801B91D0 != 0) { if (D_menu_801B91D0 != 0) {
if (Option_8019C418(&D_menu_801B93E4, 9, 1, 1, 20, 2, 9, gMainController, &D_menu_801B9408) != 0.00f) { if (Option_8019C418(&D_menu_801B93E4, 9, 1, 1, 20, 2, 9, gMainController, &D_menu_801B9408) != 0.00f) {
AUDIO_PLAY_SFX(0x49000002, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_CURSOR, gDefaultSfxSource, 4);
D_menu_801B91DC = 114.0f - D_menu_801B93E4 * 130.0f; D_menu_801B91DC = 114.0f - D_menu_801B93E4 * 130.0f;
D_menu_801B91E0 = -6.0f + D_menu_801B93E4 * 130.0f; D_menu_801B91E0 = -6.0f + D_menu_801B93E4 * 130.0f;
D_menu_801B91D0 = 0; D_menu_801B91D0 = 0;
@ -2696,19 +2696,19 @@ void Option_8019949C(void) {
if (!(D_menu_801B93C4 & (1 << i))) { if (!(D_menu_801B93C4 & (1 << i))) {
Option_8019C824(&D_menu_801B9358[i]); Option_8019C824(&D_menu_801B9358[i]);
if (Option_8019C418(&D_menu_801AED3C[i], 2, 0, 0, 20, 2, 4, i, &D_menu_801B93A0[i])) { if (Option_8019C418(&D_menu_801AED3C[i], 2, 0, 0, 20, 2, 4, i, &D_menu_801B93A0[i])) {
AUDIO_PLAY_SFX(0x49000002, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_CURSOR, gDefaultSfxSource, 4);
} }
} }
if (gControllerPress[i].button & A_BUTTON) { if (gControllerPress[i].button & A_BUTTON) {
if (D_menu_801B93C4 == 15) { if (D_menu_801B93C4 == 15) {
AUDIO_PLAY_SFX(0x49000003, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_DECIDE, gDefaultSfxSource, 4);
D_menu_801B91EC = 10; D_menu_801B91EC = 10;
D_menu_801B912C++; D_menu_801B912C++;
break; break;
} else { } else {
if (!(D_menu_801B93C4 & (1 << i))) { if (!(D_menu_801B93C4 & (1 << i))) {
AUDIO_PLAY_SFX(0x49000003, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_DECIDE, gDefaultSfxSource, 4);
gHandicap[i] = D_menu_801AED3C[i]; gHandicap[i] = D_menu_801AED3C[i];
D_menu_801B9358[i] = 255.0f; D_menu_801B9358[i] = 255.0f;
D_menu_801B9348[i] = 10; D_menu_801B9348[i] = 10;
@ -2719,11 +2719,11 @@ void Option_8019949C(void) {
if (gControllerPress[i].button & B_BUTTON) { if (gControllerPress[i].button & B_BUTTON) {
if (D_menu_801B93C4 & (1 << i)) { if (D_menu_801B93C4 & (1 << i)) {
AUDIO_PLAY_SFX(0x4900101D, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_CANCEL, gDefaultSfxSource, 4);
D_menu_801B93C4 &= (1 << i) ^ 15; D_menu_801B93C4 &= (1 << i) ^ 15;
} else { } else {
AUDIO_PLAY_BGM(SEQ_ID_MENU); AUDIO_PLAY_BGM(SEQ_ID_MENU);
AUDIO_PLAY_SFX(0x49000021, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_ARWING_CANCEL, gDefaultSfxSource, 4);
Option_8019B8A0(2); Option_8019B8A0(2);
D_menu_801B9248 = 1; D_menu_801B9248 = 1;
break; break;
@ -3028,19 +3028,19 @@ void Option_8019A2E0(void) {
} }
if (Option_8019C418(&D_menu_801B93D4, 4, 0, 0, 20, 2, 4, i, &D_menu_801B9380[i])) { if (Option_8019C418(&D_menu_801B93D4, 4, 0, 0, 20, 2, 4, i, &D_menu_801B9380[i])) {
AUDIO_PLAY_SFX(0x49000002, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_CURSOR, gDefaultSfxSource, 4);
gVsPointsToWin = D_menu_801B93D4 + 1; gVsPointsToWin = D_menu_801B93D4 + 1;
} }
if (gControllerPress[i].button & A_BUTTON) { if (gControllerPress[i].button & A_BUTTON) {
AUDIO_PLAY_SFX(0x49000003, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_DECIDE, gDefaultSfxSource, 4);
Option_8019A080(); Option_8019A080();
D_menu_801B936C = 10; D_menu_801B936C = 10;
break; break;
} }
if (gControllerPress[i].button & B_BUTTON) { if (gControllerPress[i].button & B_BUTTON) {
AUDIO_PLAY_SFX(0x4900101D, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_CANCEL, gDefaultSfxSource, 4);
D_menu_801B9124 = D_menu_801B93D0; D_menu_801B9124 = D_menu_801B93D0;
D_menu_801B91C4 = 0; D_menu_801B91C4 = 0;
Option_InitEntry(); Option_InitEntry();
@ -3068,20 +3068,20 @@ void Option_8019A4DC(void) {
} }
if (Option_8019C418(&D_menu_801B93DC, 4, 0, 0, 20, 2, 4, i, &D_menu_801B9380[i])) { if (Option_8019C418(&D_menu_801B93DC, 4, 0, 0, 20, 2, 4, i, &D_menu_801B9380[i])) {
AUDIO_PLAY_SFX(0x49000002, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_CURSOR, gDefaultSfxSource, 4);
D_menu_801B9340 = D_menu_801B93DC; D_menu_801B9340 = D_menu_801B93DC;
gVsTimeTrialLimit = D_menu_801B93DC; gVsTimeTrialLimit = D_menu_801B93DC;
} }
if (gControllerPress[i].button & A_BUTTON) { if (gControllerPress[i].button & A_BUTTON) {
AUDIO_PLAY_SFX(0x49000003, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_DECIDE, gDefaultSfxSource, 4);
Option_8019A080(); Option_8019A080();
D_menu_801B937C = 10; D_menu_801B937C = 10;
break; break;
} }
if (gControllerPress[i].button & B_BUTTON) { if (gControllerPress[i].button & B_BUTTON) {
AUDIO_PLAY_SFX(0x4900101D, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_CANCEL, gDefaultSfxSource, 4);
D_menu_801B9124 = D_menu_801B93D0; D_menu_801B9124 = D_menu_801B93D0;
D_menu_801B91C4 = 0; D_menu_801B91C4 = 0;
Option_InitEntry(); Option_InitEntry();
@ -3109,12 +3109,12 @@ void Option_8019A6DC(void) {
continue; continue;
} }
if (Option_8019C418(&D_menu_801B93D8, 1, 0, 1, 20, 2, 4, i, &D_menu_801B9380[i])) { if (Option_8019C418(&D_menu_801B93D8, 1, 0, 1, 20, 2, 4, i, &D_menu_801B9380[i])) {
AUDIO_PLAY_SFX(0x49000002, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_CURSOR, gDefaultSfxSource, 4);
D_game_80161A28 = D_menu_801B93D8; D_game_80161A28 = D_menu_801B93D8;
} }
if (gControllerPress[i].button & A_BUTTON) { if (gControllerPress[i].button & A_BUTTON) {
AUDIO_PLAY_SFX(0x49000003, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_DECIDE, gDefaultSfxSource, 4);
if (D_game_80161A28 == 0) { if (D_game_80161A28 == 0) {
gVersusStage = VS_STAGE_CORNERIA; gVersusStage = VS_STAGE_CORNERIA;
if (D_menu_801B93D0 == 30) { if (D_menu_801B93D0 == 30) {
@ -3130,7 +3130,7 @@ void Option_8019A6DC(void) {
} }
if (gControllerPress[i].button & B_BUTTON) { if (gControllerPress[i].button & B_BUTTON) {
AUDIO_PLAY_SFX(0x4900101D, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_CANCEL, gDefaultSfxSource, 4);
if (D_menu_801B93D0 == 20) { if (D_menu_801B93D0 == 20) {
D_menu_801B9124 = D_menu_801B93D0; D_menu_801B9124 = D_menu_801B93D0;
D_menu_801B91C4 = 0; D_menu_801B91C4 = 0;
@ -3165,13 +3165,13 @@ void Option_8019A954(void) {
} }
if (gControllerPress[i].button & A_BUTTON) { if (gControllerPress[i].button & A_BUTTON) {
AUDIO_PLAY_SFX(0x49000003, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_DECIDE, gDefaultSfxSource, 4);
D_menu_801B91EC = 10; D_menu_801B91EC = 10;
break; break;
} }
if (gControllerPress[i].button & B_BUTTON) { if (gControllerPress[i].button & B_BUTTON) {
AUDIO_PLAY_SFX(0x4900101D, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_CANCEL, gDefaultSfxSource, 4);
Option_8019A080(); Option_8019A080();
D_menu_801B933C = 0; D_menu_801B933C = 0;
D_menu_801B91F0 = 0; D_menu_801B91F0 = 0;
@ -3827,7 +3827,7 @@ bool Option_8019C66C(f32* arg0, f32 arg1, f32 arg2, UnkStruct_D_menu_801B9250* a
temp2 = *arg0; temp2 = *arg0;
if ((s32) temp2 != (s32) temp) { if ((s32) temp2 != (s32) temp) {
AUDIO_PLAY_SFX(0x49004007, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_COUNT_UP, gDefaultSfxSource, 4);
var_a2 = true; var_a2 = true;
} }
@ -3986,7 +3986,7 @@ void Option_8019CD54(void) {
if (D_menu_801B9138 == 0) { if (D_menu_801B9138 == 0) {
if (Option_8019C418(&D_menu_801B90A0[D_menu_801B9098], 36, 0, 0, 50, 5, 10, gMainController, if (Option_8019C418(&D_menu_801B90A0[D_menu_801B9098], 36, 0, 0, 50, 5, 10, gMainController,
&D_menu_801B9160[D_menu_801B9098])) { &D_menu_801B9160[D_menu_801B9098])) {
AUDIO_PLAY_SFX(0x49000002, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_CURSOR, gDefaultSfxSource, 4);
D_menu_801B9150[D_menu_801B9098][0] = D_menu_801AEF5C[D_menu_801B90A0[D_menu_801B9098]]; D_menu_801B9150[D_menu_801B9098][0] = D_menu_801AEF5C[D_menu_801B90A0[D_menu_801B9098]];
D_menu_801B90D0[D_menu_801B9098] = 0.0f; D_menu_801B90D0[D_menu_801B9098] = 0.0f;
D_menu_801B9100[D_menu_801B9098] = 0.0f; D_menu_801B9100[D_menu_801B9098] = 0.0f;
@ -3996,7 +3996,7 @@ void Option_8019CD54(void) {
if (gControllerPress[gMainController].button & A_BUTTON) { if (gControllerPress[gMainController].button & A_BUTTON) {
D_menu_801B90D0[D_menu_801B9098] = 0.0f; D_menu_801B90D0[D_menu_801B9098] = 0.0f;
if (D_menu_801B9138 != 0) { if (D_menu_801B9138 != 0) {
AUDIO_PLAY_SFX(0x49000003, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_DECIDE, gDefaultSfxSource, 4);
D_menu_801B9140[0] = 10; D_menu_801B9140[0] = 10;
D_menu_801B9140[1] = 10; D_menu_801B9140[1] = 10;
D_menu_801B9140[2] = 10; D_menu_801B9140[2] = 10;
@ -4006,7 +4006,7 @@ void Option_8019CD54(void) {
} else { } else {
if (D_menu_801B9098 < 3) { if (D_menu_801B9098 < 3) {
AUDIO_PLAY_SFX(0x49000003, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_DECIDE, gDefaultSfxSource, 4);
D_menu_801B90D0[D_menu_801B9098] = 0.0f; D_menu_801B90D0[D_menu_801B9098] = 0.0f;
D_menu_801B9140[D_menu_801B9098] = 15; D_menu_801B9140[D_menu_801B9098] = 15;
D_menu_801B9128 = 1; D_menu_801B9128 = 1;
@ -4016,7 +4016,7 @@ void Option_8019CD54(void) {
} }
if ((gControllerPress[gMainController].button & B_BUTTON) && (D_menu_801B9098 != 0)) { if ((gControllerPress[gMainController].button & B_BUTTON) && (D_menu_801B9098 != 0)) {
AUDIO_PLAY_SFX(0x4900101D, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_CANCEL, gDefaultSfxSource, 4);
if (D_menu_801B9138 != 0) { if (D_menu_801B9138 != 0) {
D_menu_801B9138 = 0; D_menu_801B9138 = 0;
} }
@ -4358,7 +4358,7 @@ void Option_8019DE74(void) {
if (gControllerPress[gMainController].button & (START_BUTTON | A_BUTTON | B_BUTTON | D_CBUTTONS | L_CBUTTONS | if (gControllerPress[gMainController].button & (START_BUTTON | A_BUTTON | B_BUTTON | D_CBUTTONS | L_CBUTTONS |
U_CBUTTONS)) { // START, A, B, C-UP, C-LEFT, C-DOWN U_CBUTTONS)) { // START, A, B, C-UP, C-LEFT, C-DOWN
AUDIO_PLAY_SFX(0x49000003, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_DECIDE, gDefaultSfxSource, 4);
gDrawMode = DRAW_NONE; gDrawMode = DRAW_NONE;
D_menu_801B912C = 0; D_menu_801B912C = 0;
@ -4401,10 +4401,10 @@ void Option_InvoiceUpdate(void) {
case 1: case 1:
if (D_menu_801B9178 == 0) { if (D_menu_801B9178 == 0) {
if (((gTotalHits * 64) >= 50000) && ((gTotalHits * 64) < 70000)) { if (((gTotalHits * 64) >= 50000) && ((gTotalHits * 64) < 70000)) {
AUDIO_PLAY_SFX(0x49000032, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_VO_PEPPER_CONSENT, gDefaultSfxSource, 4);
} }
if ((gTotalHits * 64) >= 70000) { if ((gTotalHits * 64) >= 70000) {
AUDIO_PLAY_SFX(0x49000033, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_VO_PEPPER_SURPRISE, gDefaultSfxSource, 4);
} }
D_menu_801B9178 = 20; D_menu_801B9178 = 20;
D_menu_801B912C++; D_menu_801B912C++;
@ -4415,7 +4415,7 @@ void Option_InvoiceUpdate(void) {
if ((D_menu_801B9178 == 0) && if ((D_menu_801B9178 == 0) &&
(gControllerPress[gMainController].button & (gControllerPress[gMainController].button &
(START_BUTTON | A_BUTTON | B_BUTTON | D_CBUTTONS | L_CBUTTONS | U_CBUTTONS))) { (START_BUTTON | A_BUTTON | B_BUTTON | D_CBUTTONS | L_CBUTTONS | U_CBUTTONS))) {
AUDIO_PLAY_SFX(0x19031083, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_STARFOX_SEAL, gDefaultSfxSource, 4);
D_menu_801B9090 = 1; D_menu_801B9090 = 1;
D_menu_801B9178 = 60; D_menu_801B9178 = 60;
D_menu_801B912C++; D_menu_801B912C++;

52
src/overlays/ovl_menu/fox_title.c
View File

@ -1103,8 +1103,8 @@ void Title_8018994C(void) {
} }
if (D_menu_801B82B8 == 638) { if (D_menu_801B82B8 == 638) {
AUDIO_PLAY_SFX(0x11030010, D_menu_801B8658.unk_24, 0); AUDIO_PLAY_SFX(NA_SE_GREATFOX_ENGINE, D_menu_801B8658.unk_24, 0);
AUDIO_PLAY_SFX(0x31024059, D_menu_801B8658.unk_24, 0); AUDIO_PLAY_SFX(NA_SE_GREATFOX_BURNER, D_menu_801B8658.unk_24, 0);
Radio_PlayMessage(gMsg_ID_60, RCID_ROB64_TITLE); Radio_PlayMessage(gMsg_ID_60, RCID_ROB64_TITLE);
} }
@ -1175,8 +1175,8 @@ void Title_8018994C(void) {
} }
if (gFillScreenAlpha == 255) { if (gFillScreenAlpha == 255) {
Audio_KillSfxBySourceAndId(D_menu_801B8658.unk_24, 0x11030010); Audio_KillSfxBySourceAndId(D_menu_801B8658.unk_24, NA_SE_GREATFOX_ENGINE);
Audio_KillSfxBySourceAndId(D_menu_801B8658.unk_24, 0x31024059); Audio_KillSfxBySourceAndId(D_menu_801B8658.unk_24, NA_SE_GREATFOX_BURNER);
D_menu_801B82C0 = 0; D_menu_801B82C0 = 0;
@ -1328,8 +1328,8 @@ void Title_8018A644(void) {
switch (D_menu_801B82C0) { switch (D_menu_801B82C0) {
case 0: case 0:
Title_8018A338(); Title_8018A338();
AUDIO_PLAY_SFX(0x49000014, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_DEMO_SIREN, gDefaultSfxSource, 4);
AUDIO_PLAY_SFX(0x0140001C, D_menu_801B84D8, 0); AUDIO_PLAY_SFX(NA_SE_DEMO_RUNNING, D_menu_801B84D8, 0);
D_menu_801B82B4 = 0; D_menu_801B82B4 = 0;
D_menu_801B82C8 = 0.0f; D_menu_801B82C8 = 0.0f;
@ -1374,8 +1374,8 @@ void Title_8018A644(void) {
} }
if (D_menu_801B7BEC == 795) { if (D_menu_801B7BEC == 795) {
Audio_KillSfxById(0x49000014); Audio_KillSfxById(NA_SE_DEMO_SIREN);
Audio_KillSfxBySourceAndId(D_menu_801B84D8, 0x0140001C); Audio_KillSfxBySourceAndId(D_menu_801B84D8, NA_SE_DEMO_RUNNING);
D_menu_801B82C0 = 0; D_menu_801B82C0 = 0;
@ -1492,8 +1492,8 @@ void Title_8018ACEC(void) {
switch (D_menu_801B82C0) { switch (D_menu_801B82C0) {
case 0: case 0:
Title_8018ABC0(); Title_8018ABC0();
AUDIO_PLAY_SFX(0x11030010, D_menu_801B8658.unk_24, 0); AUDIO_PLAY_SFX(NA_SE_GREATFOX_ENGINE, D_menu_801B8658.unk_24, 0);
AUDIO_PLAY_SFX(0x31024059, D_menu_801B8658.unk_24, 0); AUDIO_PLAY_SFX(NA_SE_GREATFOX_BURNER, D_menu_801B8658.unk_24, 0);
D_menu_801B82CC = 0.01f; D_menu_801B82CC = 0.01f;
D_menu_801B82B4 = 0; D_menu_801B82B4 = 0;
@ -1513,8 +1513,8 @@ void Title_8018ACEC(void) {
} }
if (gFillScreenAlpha == 255) { if (gFillScreenAlpha == 255) {
Audio_KillSfxBySourceAndId(D_menu_801B8658.unk_24, 0x11030010); Audio_KillSfxBySourceAndId(D_menu_801B8658.unk_24, NA_SE_GREATFOX_ENGINE);
Audio_KillSfxBySourceAndId(D_menu_801B8658.unk_24, 0x31024059); Audio_KillSfxBySourceAndId(D_menu_801B8658.unk_24, NA_SE_GREATFOX_BURNER);
gDrawMode = DRAW_NONE; gDrawMode = DRAW_NONE;
@ -1669,7 +1669,7 @@ void Title_8018B5C4(void) {
case 10: case 10:
if (D_menu_801B82A8 == 0) { if (D_menu_801B82A8 == 0) {
AUDIO_PLAY_SFX(0x0100001D, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_LIFT_UP, gDefaultSfxSource, 4);
D_menu_801B82B4 = 0; D_menu_801B82B4 = 0;
D_menu_801B82C0 = 1; D_menu_801B82C0 = 1;
} }
@ -1684,7 +1684,7 @@ void Title_8018B5C4(void) {
D_menu_801B9048 -= 0.41f; D_menu_801B9048 -= 0.41f;
if (D_menu_801B9048 < 0.0f) { if (D_menu_801B9048 < 0.0f) {
D_menu_801B9048 = 0.0f; D_menu_801B9048 = 0.0f;
AUDIO_PLAY_SFX(0x09002013, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_LIFT_UP_END, gDefaultSfxSource, 4);
} }
} }
@ -1698,7 +1698,7 @@ void Title_8018B5C4(void) {
} }
if (D_menu_801B84E8[i].unk_38 == 1) { if (D_menu_801B84E8[i].unk_38 == 1) {
AUDIO_PLAY_SFX(0x1950107A, D_menu_801B84E8[i].unk_50, 0); AUDIO_PLAY_SFX(NA_SE_ARWING_HATCH, D_menu_801B84E8[i].unk_50, 0);
}; };
if (D_menu_801B84E8[i].unk_38 == 0) { if (D_menu_801B84E8[i].unk_38 == 0) {
@ -1707,7 +1707,7 @@ void Title_8018B5C4(void) {
0.01f); 0.01f);
D_menu_801B84E8[i].unk_10 *= 1.04f; D_menu_801B84E8[i].unk_10 *= 1.04f;
if (temp[i] == 0.0f) { if (temp[i] == 0.0f) {
Audio_KillSfxBySourceAndId(D_menu_801B84E8[i].unk_50, 0x1950107A); Audio_KillSfxBySourceAndId(D_menu_801B84E8[i].unk_50, NA_SE_ARWING_HATCH);
} }
} }
} }
@ -1733,7 +1733,7 @@ void Title_8018B5C4(void) {
if (D_menu_801B82B4 == 226) { if (D_menu_801B82B4 == 226) {
D_menu_801B7BF0 = 0; D_menu_801B7BF0 = 0;
AUDIO_PLAY_SFX(0x0100001E, D_menu_801B84E8[3].unk_50, 0); AUDIO_PLAY_SFX(NA_SE_ENGINE_START, D_menu_801B84E8[3].unk_50, 0);
D_menu_801B86BC = 105.0f; D_menu_801B86BC = 105.0f;
D_menu_801B86C0 = 0.0f; D_menu_801B86C0 = 0.0f;
@ -1826,8 +1826,8 @@ void Title_8018B5C4(void) {
case 3: case 3:
if (D_menu_801B82A8 == 0) { if (D_menu_801B82A8 == 0) {
Audio_KillSfxBySourceAndId(D_menu_801B84E8[3].unk_50, 0x0100001E); Audio_KillSfxBySourceAndId(D_menu_801B84E8[3].unk_50, NA_SE_ENGINE_START);
AUDIO_PLAY_SFX(0x09000002, D_menu_801B84E8[3].unk_50, 0); AUDIO_PLAY_SFX(NA_SE_ARWING_BOOST, D_menu_801B84E8[3].unk_50, 0);
D_menu_801B82A8 = 4; D_menu_801B82A8 = 4;
@ -2015,8 +2015,8 @@ void Title_8018C644(void) {
switch (D_menu_801B82C0) { switch (D_menu_801B82C0) {
case 0: case 0:
AUDIO_PLAY_SFX(0x11030010, D_menu_801B8658.unk_24, 0); AUDIO_PLAY_SFX(NA_SE_GREATFOX_ENGINE, D_menu_801B8658.unk_24, 0);
AUDIO_PLAY_SFX(0x31024059, D_menu_801B8658.unk_24, 0); AUDIO_PLAY_SFX(NA_SE_GREATFOX_BURNER, D_menu_801B8658.unk_24, 0);
Title_8018C1C0(); Title_8018C1C0();
@ -2043,7 +2043,7 @@ void Title_8018C644(void) {
D_menu_801B84E8[i].unk_38--; D_menu_801B84E8[i].unk_38--;
} else { } else {
if (D_menu_801B84E8[i].unk_38 == 0) { if (D_menu_801B84E8[i].unk_38 == 0) {
AUDIO_PLAY_SFX(0x19000001, D_menu_801B84E8[i].unk_50, 0); AUDIO_PLAY_SFX(NA_SE_PASS, D_menu_801B84E8[i].unk_50, 0);
D_menu_801B84E8[i].unk_38 = -1; D_menu_801B84E8[i].unk_38 = -1;
D_menu_801B84E8[i].unk_4C = 1; D_menu_801B84E8[i].unk_4C = 1;
} }
@ -2079,8 +2079,8 @@ void Title_8018C644(void) {
} }
if (gFillScreenAlpha == 255) { if (gFillScreenAlpha == 255) {
Audio_KillSfxBySourceAndId(D_menu_801B8658.unk_24, 0x11030010); Audio_KillSfxBySourceAndId(D_menu_801B8658.unk_24, NA_SE_GREATFOX_ENGINE);
Audio_KillSfxBySourceAndId(D_menu_801B8658.unk_24, 0x31024059); Audio_KillSfxBySourceAndId(D_menu_801B8658.unk_24, NA_SE_GREATFOX_BURNER);
D_menu_801B82C0++; D_menu_801B82C0++;
} }
Title_801912A0(); Title_801912A0();
@ -3205,7 +3205,7 @@ void Title_80190EA4(void) {
if (gControllerPress[gMainController].button & if (gControllerPress[gMainController].button &
(START_BUTTON | A_BUTTON | B_BUTTON | D_CBUTTONS | L_CBUTTONS | U_CBUTTONS | (START_BUTTON | A_BUTTON | B_BUTTON | D_CBUTTONS | L_CBUTTONS | U_CBUTTONS |
R_CBUTTONS)) { // START, A, B, C-left, C-Down, C-Up, C-Right R_CBUTTONS)) { // START, A, B, C-left, C-Down, C-Up, C-Right
AUDIO_PLAY_SFX(0x49000003, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_DECIDE, gDefaultSfxSource, 4);
D_menu_801B8284 = 0; D_menu_801B8284 = 0;
D_menu_801B8280 = 1; D_menu_801B8280 = 1;
gControllerLock = 30; gControllerLock = 30;
@ -3237,7 +3237,7 @@ void Title_80190FD0(void) {
if (((gControllerPress[gMainController].button & START_BUTTON) || if (((gControllerPress[gMainController].button & START_BUTTON) ||
(gControllerPress[gMainController].button & A_BUTTON)) && (gControllerPress[gMainController].button & A_BUTTON)) &&
(D_menu_801B8280 == 0)) { (D_menu_801B8280 == 0)) {
AUDIO_PLAY_SFX(0x49000003, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_DECIDE, gDefaultSfxSource, 4);
SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 30); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 30);
SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 30); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 30);
D_menu_801B8284 = 0; D_menu_801B8284 = 0;