From 44c9eadbc22286207d56e346e5dacb99fc4c5ec0 Mon Sep 17 00:00:00 2001 From: Alejandro Asenjo Nitti <96613413+sonicdcer@users.noreply.github.com> Date: Sun, 5 May 2024 22:07:32 -0300 Subject: 3DS VERSION SfxIds applied to code (#232) * 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 --- src/engine/fox_360.c | 28 ++++++------ src/engine/fox_beam.c | 30 ++++++------- src/engine/fox_demo.c | 56 +++++++++++------------ src/engine/fox_effect.c | 40 ++++++++--------- src/engine/fox_enmy.c | 63 +++++++++++++------------- src/engine/fox_enmy2.c | 116 ++++++++++++++++++++++++------------------------ src/engine/fox_hud.c | 46 +++++++++---------- src/engine/fox_play.c | 100 ++++++++++++++++++++--------------------- src/engine/fox_radio.c | 2 +- src/engine/fox_tank.c | 40 ++++++++--------- src/engine/fox_versus.c | 22 ++++----- 11 files changed, 272 insertions(+), 271 deletions(-) (limited to 'src/engine') diff --git a/src/engine/fox_360.c b/src/engine/fox_360.c index b15a5bb4..46dc224e 100644 --- a/src/engine/fox_360.c +++ b/src/engine/fox_360.c @@ -100,7 +100,7 @@ void AllRange_DrawCountdown(void) { HUD_DrawCountdown(gAllRangeCountdown, gAllRangeCountdownScale); 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 { gRightWingHealth[0] = gLeftWingHealth[0] = 60; } - AUDIO_PLAY_SFX(0x4900200E, gDefaultSfxSource, 4); + AUDIO_PLAY_SFX(NA_SE_SHIELD_RING, gDefaultSfxSource, 4); player->csState++; } break; @@ -211,7 +211,7 @@ void AllRange_GreatFoxRepair(Player* player) { player->baseSpeed = gArwingSpeed; player->csState++; - AUDIO_PLAY_SFX(0x09000002, player->sfxSource, 0); + AUDIO_PLAY_SFX(NA_SE_ARWING_BOOST, player->sfxSource, 0); } break; case 4: @@ -397,12 +397,12 @@ void ActorAllRange_SpawnTeam(void) { } actor->iwork[11] = 1; 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.targetOffset = 0.0f; actor->info.bonus = 0; } 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); if (gCurrentLevel == LEVEL_VENOM_2) { - AUDIO_PLAY_SFX(0x31004006, actor->sfxSource, 4); + AUDIO_PLAY_SFX(NA_SE_EN_WOLF_ENGINE2, actor->sfxSource, 4); } 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.y = -500.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; } else { supplies->obj.pos.x = 0.0f; @@ -886,7 +886,7 @@ void ActorAllRange_ApplyDamage(Actor* this) { this->obj.status = OBJ_DYING; this->fwork[23] = 0.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_0BE = 0; this->timer_04C = RAND_INT(2.9f); @@ -1006,7 +1006,7 @@ void ActorAllRange_ApplyDamage(Actor* this) { } } else { 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[18] = 5; this->iwork[8] = 15; @@ -1022,9 +1022,9 @@ void ActorAllRange_ApplyDamage(Actor* this) { this->iwork[8] = 20; } 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) { - 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); if (this->aiType < AI360_GREAT_FOX) { @@ -1364,7 +1364,7 @@ void ActorAllRange_Update(Actor* this) { this->fwork[29] = 5.0f; this->fwork[7] = 360.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; } gTeamShields[this->aiType] = -1; @@ -2095,7 +2095,7 @@ void ActorAllRange_Update(Actor* this) { this->obj.status = OBJ_DYING; 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_8007A6F0(&this->obj.pos, 0x2903A008); + func_effect_8007A6F0(&this->obj.pos, NA_SE_EN_EXPLOSION_S); } else { this->dmgType = DMG_BEAM; this->damage = 10; diff --git a/src/engine/fox_beam.c b/src/engine/fox_beam.c index fd982d30..c1a2cca0 100644 --- a/src/engine/fox_beam.c +++ b/src/engine/fox_beam.c @@ -69,7 +69,7 @@ void func_beam_80035E78(PlayerShot* shot) { shot->unk_48 * 3.0f, 10); func_effect_8007ADF4(shot->obj.pos.x, gGroundHeight, shot->obj.pos.z, shot->unk_48 * 0.05f, 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 { 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->timer_50 = time; 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, @@ -207,7 +207,7 @@ void func_beam_800366CC(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 yRot, effect->scale2 = scale * 0.5f; effect->timer_50 = 80; 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) { @@ -337,7 +337,7 @@ s32 func_beam_80036874(PlayerShot* shot, f32* hitboxData, Object* obj) { return i + 1; } 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; } @@ -613,7 +613,7 @@ bool func_beam_8003774C(PlayerShot* shot, ObjectId objId, Object* obj) { return false; } 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) { Matrix_RotateY(gCalcMatrix, obj->rot.y * M_DTOR, MTXF_NEW); sp7C.x = sp4C.x - obj->pos.x; @@ -636,7 +636,7 @@ bool func_beam_8003774C(PlayerShot* shot, ObjectId objId, Object* obj) { return false; } 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) { 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; actor->timer_0C2 = 3; 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); } } else { @@ -860,7 +860,7 @@ void func_beam_80038140(PlayerShot* shot) { shot->obj.pos.y += 2.0f * shot->vel.y; shot->obj.pos.z += 2.0f * shot->vel.z; 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); } else { func_beam_80036318(shot); @@ -964,7 +964,7 @@ void func_beam_80038140(PlayerShot* shot) { } else { boss->dmgType = DMG_BEAM; func_beam_80036318(shot); - AUDIO_PLAY_SFX(0x29001062, shot->sfxSource, 4); + AUDIO_PLAY_SFX(NA_SE_EN_BARRIER_REFLECT, shot->sfxSource, 4); } } } else { @@ -978,7 +978,7 @@ void func_beam_80038140(PlayerShot* shot) { } else { boss->dmgType = DMG_BEAM; boss->dmgPart = 100; - AUDIO_PLAY_SFX(0x29121007, shot->sfxSource, 4); + AUDIO_PLAY_SFX(NA_SE_EN_REFLECT, shot->sfxSource, 4); func_beam_80036318(shot); } } @@ -1610,7 +1610,7 @@ void func_beam_8003B55C(PlayerShot* shot, s32 index) { func_beam_80036318(shot); shot->obj.pos.y = gGroundHeight + 2; 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 ((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.z - actor->obj.pos.z) <= var_fa0))) { 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++) { if (gPlayerShots[j].obj.id == PLAYERSHOT_4) { 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[2][shot->sourceId] = gVsLockOnTimers[3][shot->sourceId] = 0; 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++) { if (gPlayerShots[j].obj.id == PLAYERSHOT_4) { Object_Kill(&gPlayerShots[j].obj, gPlayerShots[j].sfxSource); @@ -2085,7 +2085,7 @@ void func_beam_8003CF90(PlayerShot* shot) { shot->unk_48 * 3.0f, 5); func_effect_8007ADF4(shot->obj.pos.x, gGroundHeight, shot->obj.pos.z, shot->unk_48 * 0.05f, 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); } else { @@ -2238,7 +2238,7 @@ void func_beam_8003D54C(PlayerShot* shot, s32 index) { } } 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) { Aquas_801ABA40(shot); } else { diff --git a/src/engine/fox_demo.c b/src/engine/fox_demo.c index 9127e61a..ee4aed90 100644 --- a/src/engine/fox_demo.c +++ b/src/engine/fox_demo.c @@ -174,12 +174,12 @@ void func_demo_80048CC4(Actor* actor, s32 arg1) { Object_SetInfo(&actor->info, actor->obj.id); if (arg1 == 3) { - AUDIO_PLAY_SFX(0x11030010, actor->sfxSource, 0); - AUDIO_PLAY_SFX(0x31024059, actor->sfxSource, 0); + AUDIO_PLAY_SFX(NA_SE_GREATFOX_ENGINE, actor->sfxSource, 0); + AUDIO_PLAY_SFX(NA_SE_GREATFOX_BURNER, actor->sfxSource, 0); actor->unk_0B6 = 1; } else { 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; 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_190 = 5.0f; @@ -357,7 +357,7 @@ void func_demo_80049630(ActorCutscene* this) { case 1: 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->fwork[29] = 5.0f; @@ -411,7 +411,7 @@ void func_demo_80049968(Actor* actor, s32 arg1) { actor->vel.z = gPlayer[0].vel.z; Object_SetInfo(&actor->info, actor->obj.id); 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) { @@ -521,7 +521,7 @@ void Cutscene_EnterWarpZone(Player* player) { 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_190 = 5.0f; } @@ -540,22 +540,22 @@ void Cutscene_EnterWarpZone(Player* player) { if ((player->csTimer == 95) && (gTeamShields[TEAM_ID_FALCO] > 0)) { 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)) { 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)) { 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) { 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_FANFARE, 50); } @@ -588,7 +588,7 @@ void Cutscene_EnterWarpZone(Player* player) { player->unk_234 = 1; gLevelPhase = 1; D_display_800CA230 = 0.15f; - AUDIO_PLAY_SFX(0x11407079, gDefaultSfxSource, 0); + AUDIO_PLAY_SFX(NA_SE_WARP_OUT, gDefaultSfxSource, 0); func_play_800AB334(); } } @@ -737,7 +737,7 @@ void func_demo_8004A700(Actor* actor, s32 arg1) { actor->obj.rot.z = D_demo_800CA074[arg1]; actor->iwork[11] = 1; 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) { @@ -865,11 +865,11 @@ void Cutscene_AllRangeMode(Player* player) { } if (gCsFrameCount == 138) { - AUDIO_PLAY_SFX(0x09000007, player->sfxSource, 0); + AUDIO_PLAY_SFX(NA_SE_WING_OPEN, player->sfxSource, 0); } 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) { @@ -879,7 +879,7 @@ void Cutscene_AllRangeMode(Player* player) { player->unk_194 = 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; @@ -1307,7 +1307,7 @@ void Cutscene_CoComplete2(Player* player) { case 1255: player->csState = 3; 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_FANFARE, 50); break; @@ -1514,7 +1514,7 @@ void Cutscene_UTurn(Player* player) { player->zRotBank = -180.0f; } 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_190 = 7.0f; } @@ -1611,8 +1611,8 @@ void Cutscene_KillPlayer(Player* player) { s32 teamId; Audio_StopPlayerNoise(player->num); - Audio_KillSfxBySourceAndId(player->sfxSource, 0x0900C010); - func_play_800A5FA0(player->sfxSource, 0x0903F004, player->num); + Audio_KillSfxBySourceAndId(player->sfxSource, NA_SE_ARWING_DOWN); + func_play_800A5FA0(player->sfxSource, NA_SE_ARWING_EXPLOSION, player->num); player->state_1C8 = PLAYERSTATE_1C8_NEXT; player->csTimer = 70; player->timer_224 = 20; @@ -1728,7 +1728,7 @@ void func_demo_8004D828(Player* player) { player->vel.y = 10.0f; 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)) { func_enmy_80062C38(player->pos.x, player->pos.z); @@ -1838,7 +1838,7 @@ void func_demo_8004DEF8(Player* player) { player->radioDamageTimer = 0; player->vel.y = 10.0f; player->csState = 1; - func_play_800A6070(player->sfxSource, 0x29000000); + func_play_800A6070(player->sfxSource, NA_SE_EXPLOSION_S); if (gCurrentLevel == LEVEL_CORNERIA) { func_enmy_80062C38(player->pos.x, player->pos.z); } @@ -1949,7 +1949,7 @@ void func_demo_8004E4D4(ActorCutscene* this) { this->state = 2; this->timer_0BC = 50; 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; /* fallthrough */ @@ -1971,7 +1971,7 @@ void func_demo_8004E4D4(ActorCutscene* this) { this->state = 11; this->timer_0BC = 150; 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; /* fallthrough */ case 11: @@ -2026,7 +2026,7 @@ void func_demo_8004E4D4(ActorCutscene* this) { break; case 31: - AUDIO_PLAY_SFX(0x09000002, this->sfxSource, 0); + AUDIO_PLAY_SFX(NA_SE_ARWING_BOOST, this->sfxSource, 0); this->state += 1; this->fwork[29] = 5.0f; /* fallthrough */ @@ -2111,7 +2111,7 @@ void func_demo_8004EBD0(ActorCutscene* this) { if (this->timer_0BC == 0) { this->state++; this->timer_0BC = 10; - func_play_800A6028(this->sfxSource, 0x09000002); + func_play_800A6028(this->sfxSource, NA_SE_ARWING_BOOST); this->fwork[29] = 5.0f; } break; @@ -2183,7 +2183,7 @@ void func_demo_8004F05C(Actor* actor) { case 1: actor->state = 2; 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; case 2: @@ -2402,7 +2402,7 @@ void ActorCutscene_Update(ActorCutscene* this) { this->state = 1; this->timer_0BC = 50; this->iwork[0] = 255; - AUDIO_PLAY_SFX(0x2902F026, this->sfxSource, 0); + AUDIO_PLAY_SFX(NA_SE_EN_BOSS_EXPLOSION, this->sfxSource, 0); } break; diff --git a/src/engine/fox_effect.c b/src/engine/fox_effect.c index a6d9b65c..28b90e71 100644 --- a/src/engine/fox_effect.c +++ b/src/engine/fox_effect.c @@ -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.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); } @@ -952,9 +952,9 @@ void func_effect_8007A5F8(Effect* effect, Vec3f* pos, u32 sfxId) { 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); - if (sfxId == 0x11000055) { + if (sfxId == NA_SE_OB_SMOKE) { effect->timer_50 = 300; } } else { @@ -1198,7 +1198,7 @@ void func_effect_8007B180(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scal effect->unk_44 = 255; effect->scale1 = scale1; 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) { @@ -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--) { if (gEffects[i].obj.status == OBJ_FREE) { 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; } } @@ -2187,7 +2187,7 @@ void func_effect_8007DB70(Effect* effect) { effect->unk_44 = 192; effect->scale2 = 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_8007BFFC(effect->obj.pos.x, effect->obj.pos.y + 30.0f, effect->obj.pos.z, 0.0f, 0.0f, 0.0f, 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) { - AUDIO_PLAY_SFX(0x31000025, effect->sfxSource, 4); + AUDIO_PLAY_SFX(NA_SE_EN_ENERGY_BEAM, effect->sfxSource, 4); } 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->scale2 = 5.0f; } 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 { - 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) { - AUDIO_PLAY_SFX(0x31000025, effect->sfxSource, 4); + AUDIO_PLAY_SFX(NA_SE_EN_ENERGY_BEAM, effect->sfxSource, 4); } 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->scale2 = 5.0f; } 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 { - 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; if (objId == OBJ_EFFECT_355) { - AUDIO_PLAY_SFX(0x31000025, effect->sfxSource, 4); + AUDIO_PLAY_SFX(NA_SE_EN_ENERGY_BEAM, effect->sfxSource, 4); } 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); } @@ -2535,7 +2535,7 @@ void func_effect_8007ED54(Effect* effect, ObjectId objId, f32 xPos, f32 yPos, f3 effect->scale2 = scale2; 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); } @@ -2871,7 +2871,7 @@ void func_effect_8007FE88(Effect* effect) { effect->vel.y = destVelocity.y; effect->vel.z = destVelocity.z; 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)) { @@ -3004,7 +3004,7 @@ void func_effect_8008040C(Effect* effect) { effect->vel.y = destVelocity.y; effect->vel.z = destVelocity.z; 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)) { @@ -3368,7 +3368,7 @@ void func_effect_8008165C(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scal case 10: effect->timer_50 = 10; - AUDIO_PLAY_SFX(0x31405094, effect->sfxSource, 4); + AUDIO_PLAY_SFX(NA_SE_EN_CLBOSS_BEAM, effect->sfxSource, 4); break; 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.z = zPos; - AUDIO_PLAY_SFX(0x2940F026, effect->sfxSource, 4); + AUDIO_PLAY_SFX(NA_SE_EN_STAR_EXPLOSION, effect->sfxSource, 4); gControllerRumbleTimers[0] = 60; break; } @@ -4131,7 +4131,7 @@ void func_effect_80083D2C(f32 xPos, f32 yPos, f32 zPos, f32 srcZ) { 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); if (i == 0) { - AUDIO_PLAY_SFX(0x3103109B, gEffects[j].sfxSource, 4); + AUDIO_PLAY_SFX(NA_SE_EN_MARBLE_BEAM, gEffects[j].sfxSource, 4); } break; } diff --git a/src/engine/fox_enmy.c b/src/engine/fox_enmy.c index 1bebe4a7..ac6ad445 100644 --- a/src/engine/fox_enmy.c +++ b/src/engine/fox_enmy.c @@ -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 }, }; 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) { @@ -1018,13 +1019,13 @@ void Object_Init(s32 index, ObjectId objId) { switch (objId) { 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; case OBJ_ACTOR_234: - AUDIO_PLAY_SFX(0x11030010, gActors[index].sfxSource, 0); + AUDIO_PLAY_SFX(NA_SE_GREATFOX_ENGINE, gActors[index].sfxSource, 0); break; case OBJ_SCENERY_54: - AUDIO_PLAY_SFX(0x11000000, gScenery[index].sfxSource, 0); + AUDIO_PLAY_SFX(NA_SE_FALL, gScenery[index].sfxSource, 0); break; case OBJ_ACTOR_TEAM_BOSS: ActorTeamBoss_Init(&gActors[index]); @@ -1179,7 +1180,7 @@ void Object_Init(s32 index, ObjectId objId) { break; case OBJ_ACTOR_190: 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; case OBJ_ACTOR_192: gActors[index].unk_0C9 = 1; @@ -1231,7 +1232,7 @@ void Object_Init(s32 index, ObjectId objId) { /* fallthrough */ case OBJ_ACTOR_176: 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; case OBJ_BOSS_297: Meteo_Boss297_Init(&gBosses[index]); @@ -1550,7 +1551,7 @@ void func_enmy_800656D4(Actor* actor) { gActors[spC4].dmgType = DMG_BEAM; gActors[spC4].damage = 20; 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); Object_Kill(&actor->obj, actor->sfxSource); } @@ -1601,7 +1602,7 @@ void func_enmy_800656D4(Actor* 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 (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)) { item->unk_50 = 90.0f; - AUDIO_PLAY_SFX(0x4900000C, gDefaultSfxSource, 4); + AUDIO_PLAY_SFX(NA_SE_ITEM_APPEAR, gDefaultSfxSource, 4); item->timer_48 = 1000; 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; @@ -1691,7 +1692,7 @@ void Actor_Despawn(Actor* 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) { if (gTeamShields[TEAM_ID_PEPPY] > 0) { Radio_PlayMessage(gMsg_ID_20261, RCID_PEPPY); @@ -1760,7 +1761,7 @@ void func_enmy_8006654C(Actor* actor) { actor->vel.z = -15.0f; actor->gravity = 0.5f; 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); actor->itemDrop = DROP_SILVER_RING; 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); gHitCount += 3; 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, 5); 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: func_enmy_80066C00(scenery); scenery->state++; - AUDIO_PLAY_SFX(0x2900300F, scenery->sfxSource, 4); + AUDIO_PLAY_SFX(NA_SE_EN_DAMAGE_L, scenery->sfxSource, 4); break; case 2: scenery->vel.x += 0.05f; @@ -1867,7 +1868,7 @@ void func_enmy_80066D5C(Scenery* scenery) { func_enmy_80066A8C(scenery); scenery->state = 0; gCameraShake = 25; - AUDIO_PLAY_SFX(0x19130003, scenery->sfxSource, 4); + AUDIO_PLAY_SFX(NA_SE_EN_METAL_BOUND_M, scenery->sfxSource, 4); } break; case 0: @@ -2007,7 +2008,7 @@ void ActorSupplies_Update(ActorSupplies* this) { this->dmgType = DMG_NONE; this->health -= this->damage; 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); if (((player[0].wings.rightState <= WINGSTATE_BROKEN) || (player[0].wings.leftState <= WINGSTATE_BROKEN)) && (player[0].form != FORM_LANDMASTER)) { @@ -2056,7 +2057,7 @@ void ActorSupplies_Draw(Actor* actor) { } 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) { gRightWingFlashTimer[0] = 1050; gPlayer[0].wings.rightState = WINGSTATE_INTACT; @@ -2077,7 +2078,7 @@ void Item1up_Update(Item1UP* this) { Item_SpinPickup(this); if (this->collected) { 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) { gLifeCount[this->playerNum]++; } @@ -2100,8 +2101,8 @@ void ItemPickup_Update(Item* this) { this->timer_48 = 20; this->unk_50 = 60.0f; gBombCount[this->playerNum]++; - func_enmy_80060F30(gPlayer[this->playerNum].sfxSource, 0x49002005, this->playerNum); - func_enmy_80060F30(gPlayer[this->playerNum].sfxSource, 0x49002006, this->playerNum); + func_enmy_80060F30(gPlayer[this->playerNum].sfxSource, NA_SE_BOMB_GET, this->playerNum); + func_enmy_80060F30(gPlayer[this->playerNum].sfxSource, NA_SE_BOMB_GAUGE_UP, this->playerNum); } break; case OBJ_ITEM_LASERS: @@ -2115,7 +2116,7 @@ void ItemPickup_Update(Item* this) { if (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) { gRightWingHealth[this->playerNum] = gLeftWingHealth[this->playerNum] = 10; } else { @@ -2147,7 +2148,7 @@ void ItemLasers_Update(ItemLasers* this) { this->obj.id = OBJ_ITEM_WING_REPAIR; Object_SetInfo(&this->info, this->obj.id); this->timer_48 = 2000; - AUDIO_PLAY_SFX(0x1900302B, this->sfxSource, 0); + AUDIO_PLAY_SFX(NA_SE_OB_WING, this->sfxSource, 0); } else { ItemPickup_Update(this); } @@ -2167,13 +2168,13 @@ void ItemSupplyRing_Update(Item* this) { this->timer_48 = 50; if (this->obj.id == OBJ_ITEM_SILVER_RING) { 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) { gGoldRingCount[0]++; 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) { - 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) { gLifeCount[this->playerNum]++; } @@ -2182,11 +2183,11 @@ void ItemSupplyRing_Update(Item* this) { gPlayer[this->playerNum].trueZpos, BONUS_TEXT_1UP); } else { 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 { 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)) { @@ -2284,7 +2285,7 @@ void ItemMeteoWarp_Update(ItemMeteoWarp* this) { if (gRingPassCount >= 7) { gPlayer[0].state_1C8 = PLAYERSTATE_1C8_ENTER_WARP_ZONE; gPlayer[0].csState = 0; - AUDIO_PLAY_SFX(0x1900602A, gDefaultSfxSource, 0); + AUDIO_PLAY_SFX(NA_SE_WARP_HOLE, gDefaultSfxSource, 0); gMissionStatus = MISSION_WARP; gLeveLClearStatus[gCurrentLevel] = 1; } @@ -2336,7 +2337,7 @@ void ItemCheckpoint_Update(ItemCheckpoint* this) { for (i = TEAM_ID_FALCO; i <= TEAM_ID_PEPPY; 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; if (this->unk_46 != 0) { 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) { case OBJ_SPRITE_CO_POLE: func_effect_8007D074(this->obj.pos.x, this->obj.pos.y + 160.0f, this->obj.pos.z, 4.0f); diff --git a/src/engine/fox_enmy2.c b/src/engine/fox_enmy2.c index 1b2307e9..333912ac 100644 --- a/src/engine/fox_enmy2.c +++ b/src/engine/fox_enmy2.c @@ -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, this->vel.z, 8.0f, 30); 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; D_ctx_80177850 = 15; } else { this->dmgType = DMG_NONE; 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); } } @@ -277,7 +277,7 @@ void Actor194_Dying(Actor194* this) { 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++; if (this->unk_04A > 15) { @@ -352,7 +352,7 @@ void Scenery42_Update(Scenery_42* this) { if (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->vel.y = 0.0f; } @@ -531,10 +531,10 @@ void Actor189_Update(Actor189* this) { if (this->unk_04A & 4) { switch (this->unk_046) { case 2: - AUDIO_PLAY_SFX(0x19000024, this->sfxSource, 4); + AUDIO_PLAY_SFX(NA_SE_OB_SAND_BOUND_S, this->sfxSource, 4); break; case 25: - AUDIO_PLAY_SFX(0x29003031, this->sfxSource, 4); + AUDIO_PLAY_SFX(NA_SE_EN_BOSS_ATTACK, this->sfxSource, 4); break; } } @@ -628,7 +628,7 @@ void Actor189_Update(Actor189* this) { (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); 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; @@ -639,7 +639,7 @@ void Actor189_Update(Actor189* this) { (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); 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; @@ -660,7 +660,7 @@ void Actor189_Update(Actor189* this) { (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); 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; @@ -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); 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; @@ -743,7 +743,7 @@ void Actor189_Update(Actor189* this) { (this->timer_0BE == 0)) { func_effect_8007D0E0(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, 10.0f); 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)) { if (((this->timer_0BC == 0) || @@ -751,7 +751,7 @@ void Actor189_Update(Actor189* this) { (this->timer_0BE == 0)) { 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); - 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)) { 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, this->vel.z, this->scale * 1.5f, 4); 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 == 3) && ((this->timer_0BC % 8) == 0)) { @@ -1116,7 +1116,7 @@ void ActorEvent_ProcessScript(ActorEvent* this) { gActor194zPos[i][j] = this->obj.pos.z; } 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; } @@ -1173,26 +1173,26 @@ void ActorEvent_ProcessScript(ActorEvent* this) { case EISFX_EN_ENGINE_01: if (!((gCurrentLevel == LEVEL_SOLAR) || (this->unk_0B4 == EVID_6) || ((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; case EISFX_ARWING_ENGINE_FG: - AUDIO_PLAY_SFX(0x3100000C, this->sfxSource, 4); + AUDIO_PLAY_SFX(NA_SE_ARWING_ENGINE_FG, this->sfxSource, 4); break; case EISFX_GREATFOX_ENGINE: - AUDIO_PLAY_SFX(0x11030010, this->sfxSource, 0); + AUDIO_PLAY_SFX(NA_SE_GREATFOX_ENGINE, this->sfxSource, 0); break; 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; case EISFX_OB_WING: - AUDIO_PLAY_SFX(0x1900302B, this->sfxSource, 0); + AUDIO_PLAY_SFX(NA_SE_OB_WING, this->sfxSource, 0); break; case EISFX_EN_ALIEN_FLY: - AUDIO_PLAY_SFX(0x31000014, this->sfxSource, 4); + AUDIO_PLAY_SFX(NA_SE_EN_ALIEN_FLY, this->sfxSource, 4); break; case EISFX_EN_SPACE_SHIP: - AUDIO_PLAY_SFX(0x31000015, this->sfxSource, 4); + AUDIO_PLAY_SFX(NA_SE_EN_SPACE_SHIP, this->sfxSource, 4); break; } @@ -1292,7 +1292,7 @@ void ActorEvent_ProcessScript(ActorEvent* this) { case EV_OPC(EVOP_SET_SURFACE): 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]; this->aiIndex += 2; @@ -1601,7 +1601,7 @@ void ActorEvent_8006EAC4(Effect* effect, f32 xPos, f32 yPos, f32 zPos) { effect->timer_50 = 20; 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) { @@ -1626,7 +1626,7 @@ void ActorEvent_SetupTIMine(Actor* actor, f32 xPos, f32 yPos, f32 zPos) { Object_SetInfo(&actor->info, actor->obj.id); 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) { @@ -1670,18 +1670,18 @@ void Actor_SetupPlayerShot(PlayerShotId objId, PlayerShot* shot, s32 actorId, f3 if (gLevelMode == LEVELMODE_ALL_RANGE) { 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 { - 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) && (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) { shot->sourceId = CS_SHOT_ID; - AUDIO_PLAY_SFX(0x19030037, shot->sfxSource, 0); + AUDIO_PLAY_SFX(NA_SE_GREATFOX_SHOT_DEMO, shot->sfxSource, 0); } 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->unk_44 = 100; 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) { @@ -1752,7 +1752,7 @@ void ActorEvent_8006F140(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scale effect->unk_7A = 18; Object_SetInfo(&effect->info, effect->obj.id); 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) { @@ -1905,7 +1905,7 @@ void ActorEvent_ProcessActions(ActorEvent* this) { this->vel.z, this->scale * 3.0f, 15); Actor_Despawn(this); 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; 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) && (fabsf(this->obj.pos.z - gPlayer[0].trueZpos) < 50.0f)) { func_enmy_80067A40(); - Audio_KillSfxBySourceAndId(this->sfxSource, 0x1900302B); + Audio_KillSfxBySourceAndId(this->sfxSource, NA_SE_OB_WING); Object_Kill(&this->obj, this->sfxSource); } } @@ -2009,10 +2009,10 @@ void ActorEvent_8006FEEC(ActorEvent* this) { this->itemDrop = DROP_NONE; Actor_Despawn(this); 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); } 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_6) && (gCurrentLevel == LEVEL_SOLAR)) { - AUDIO_PLAY_SFX(0x29018036, this->sfxSource, 4); + AUDIO_PLAY_SFX(NA_SE_EN_BIRD_DOWN, this->sfxSource, 4); } else { - AUDIO_PLAY_SFX(0x2903700B, this->sfxSource, 4); + AUDIO_PLAY_SFX(NA_SE_EN_CRASH_DOWN, this->sfxSource, 4); } this->obj.status = OBJ_DYING; @@ -2176,18 +2176,18 @@ void ActorEvent_800701E0(ActorEvent* this) { } 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; func_effect_8007C688(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, 3.0f, 60); } } else { this->timer_0C6 = 20; 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) { - AUDIO_PLAY_SFX(0x2943500F, this->sfxSource, 4); + AUDIO_PLAY_SFX(NA_SE_EN_KNOCK_DOWN, this->sfxSource, 4); } 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)) { @@ -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, 0.2f, 10); 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) { BonusText_Display(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, this->info.bonus); gHitCount += this->info.bonus + 1; D_ctx_80177850 = 15; } } 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)) { - AUDIO_PLAY_SFX(0x2903B009, this->sfxSource, 4); + AUDIO_PLAY_SFX(NA_SE_EN_EXPLOSION_M, this->sfxSource, 4); } this->vel.y -= 0.1f; @@ -2878,9 +2878,9 @@ void ActorEvent_800720E8(ActorEvent* this) { if (this->health <= 0) { this->unk_046 = 1; 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 { - AUDIO_PLAY_SFX(0x2903300E, this->sfxSource, 0); + AUDIO_PLAY_SFX(NA_SE_EN_DAMAGE_S, this->sfxSource, 0); } this->dmgType = DMG_NONE; } @@ -3025,7 +3025,7 @@ void ActorEvent_Update(ActorEvent* this) { this->timer_0C6 = 20; 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) { this->timer_0C6 = 200; @@ -3416,9 +3416,9 @@ void ActorEvent_Update(ActorEvent* this) { (this->unk_0B4 != EVID_49) && (this->unk_0B4 != EVID_50)) { this->dmgType = DMG_NONE; if (gCurrentLevel == LEVEL_METEO) { - AUDIO_PLAY_SFX(0x2902107D, this->sfxSource, 4); + AUDIO_PLAY_SFX(NA_SE_ROCK_REFLECT, this->sfxSource, 4); } 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; if (((gGameFrameCount % 4) == 0)) { 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); func_effect_8007B228(actor->obj.pos.x, sp58, actor->obj.pos.z, 2.0f); actor->timer_0BE = 2; - func_effect_8007A6F0(&actor->obj.pos, 0x2903A008); + func_effect_8007A6F0(&actor->obj.pos, NA_SE_EN_EXPLOSION_S); 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); func_enmy_80062C38(actor->obj.pos.x, actor->obj.pos.z); actor->timer_0BE = 2; - func_effect_8007A6F0(&actor->obj.pos, 0x2903A008); + func_effect_8007A6F0(&actor->obj.pos, NA_SE_EN_EXPLOSION_S); return; } } else { @@ -4264,9 +4264,9 @@ void func_enmy2_800763A4(Actor* actor) { actor->obj.pos.z - actor->vel.z, actor->scale * 3.0f); 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 { - 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)) { @@ -4332,9 +4332,9 @@ void func_enmy2_800763A4(Actor* actor) { actor->timer_0BE = 2; 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 { - 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; 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 { - func_effect_8007A6F0(&actor->obj.pos, 0x2903A008); + func_effect_8007A6F0(&actor->obj.pos, NA_SE_EN_EXPLOSION_S); } } } diff --git a/src/engine/fox_hud.c b/src/engine/fox_hud.c index f229a965..b159dd8a 100644 --- a/src/engine/fox_hud.c +++ b/src/engine/fox_hud.c @@ -795,7 +795,7 @@ void HUD_DrawLevelClearScreen(void) { if ((gLevelClearScreenTimer == 92) || (gLevelClearScreenTimer == 87) || (gLevelClearScreenTimer == 82) || (gLevelClearScreenTimer == 77)) { - AUDIO_PLAY_SFX(0x49008031, gDefaultSfxSource, 4); + AUDIO_PLAY_SFX(NA_SE_MISSION_ACCOMPLISHED, gDefaultSfxSource, 4); } } else { if (gLevelClearScreenTimer <= 100) { @@ -823,9 +823,9 @@ void HUD_DrawLevelClearScreen(void) { if ((gLevelClearScreenTimer == 80) || (gLevelClearScreenTimer == 72) || (gLevelClearScreenTimer == 64) || (gLevelClearScreenTimer == 56)) { if (!boolTemp) { - AUDIO_PLAY_SFX(0x49008034, gDefaultSfxSource, 4); + AUDIO_PLAY_SFX(NA_SE_MISSION_COMPLETE, gDefaultSfxSource, 4); } 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; if (gShowLevelClearStatusScreen == 0) { - Audio_KillSfxById(0x41007012); + Audio_KillSfxById(NA_SE_TEAM_SHIELD_UP); D_801617C0[0] = 0; } @@ -1083,20 +1083,20 @@ void HUD_DrawLevelClearStatusScreen(void) { if (((gTeamShields[TEAM_ID_FALCO] > 0) && (gTeamShields[TEAM_ID_FALCO] < 255)) && ((gTeamShields[TEAM_ID_SLIPPY] > 0) && (gTeamShields[TEAM_ID_SLIPPY] < 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; case 2: if ((D_801617C0[5] == 0) && (D_801617C0[4] == 0)) { - Audio_KillSfxById(0x41007012); + Audio_KillSfxById(NA_SE_TEAM_SHIELD_UP); D_801617C0[0] = 3; D_801617E8[0] = 30; break; } 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) { D_801617C0[5] -= 100; @@ -1135,7 +1135,7 @@ void HUD_DrawLevelClearStatusScreen(void) { if ((D_801617C0[i] == 0) || (temp == 0)) { D_801617C0[4] = 0; - Audio_KillSfxById(0x41007012); + Audio_KillSfxById(NA_SE_TEAM_SHIELD_UP); } } break; @@ -1154,7 +1154,7 @@ void HUD_DrawLevelClearStatusScreen(void) { D_801617C0[0]++; } else { if (((gGameFrameCount % 2) == 0)) { - AUDIO_PLAY_SFX(0x4900C024, gDefaultSfxSource, 4); + AUDIO_PLAY_SFX(NA_SE_ONE_UP, gDefaultSfxSource, 4); D_801617C0[3]++; } } @@ -1429,7 +1429,7 @@ void func_hud_80088970(void) { D_80161838[0] = 0; if (((ret > 0) && (D_80161810[1] == 1)) || ((ret < 0) && (D_80161810[1] == 0))) { 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)) { // clang-format off //! 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 } @@ -2250,7 +2250,7 @@ void func_hud_8008B044(void) { return; } - AUDIO_PLAY_SFX(0x49002018, gDefaultSfxSource, 4); + AUDIO_PLAY_SFX(NA_SE_COMMU_REQUEST, gDefaultSfxSource, 4); if (gCallVoiceParam != 0) { Audio_SetUnkVoiceParam(1); @@ -2263,7 +2263,7 @@ void func_hud_8008B044(void) { D_80161790++; if (D_80161790 >= 7) { if ((D_80161794 % 2) != 0) { - AUDIO_PLAY_SFX(0x49002018, gDefaultSfxSource, 4); + AUDIO_PLAY_SFX(NA_SE_COMMU_REQUEST, gDefaultSfxSource, 4); } D_80161790 = 0; D_80161794++; @@ -2273,7 +2273,7 @@ void func_hud_8008B044(void) { gCallVoiceParam = 0; D_80161790 = 0; D_80161798 = 0; - Audio_KillSfxById(0x49002018); + Audio_KillSfxById(NA_SE_COMMU_REQUEST); } break; } @@ -3074,7 +3074,7 @@ void HUD_DrawBossHealth(void) { if ((gShowBossHealth == 1) && (gTeamShields[TEAM_ID_SLIPPY] > 0)) { 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; } @@ -3719,8 +3719,8 @@ s32 func_hud_80090200(Boss* boss) { switch (boss->swork[1]) { case 0: - AUDIO_PLAY_SFX(0x11000011, boss->sfxSource, 0); - AUDIO_PLAY_SFX(0x3140402E, boss->sfxSource, 0); + AUDIO_PLAY_SFX(NA_SE_EARTHQUAKE, 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_FANFARE, 50); @@ -4302,7 +4302,7 @@ bool func_hud_80091CF8(Actor* actor) { if (actor->iwork[1] != 0) { if (actor->fwork[10] < 0.1f) { 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->iwork[1] = 0; @@ -4351,7 +4351,7 @@ bool func_hud_80091F00(Actor* actor) { } 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); Matrix_RotateY(gCalcMatrix, actor->unk_0F4.y * M_DTOR, MTXF_NEW); @@ -4682,7 +4682,7 @@ void ActorTeamBoss_Init(Actor* actor) { 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)) { Object_Kill(&actor->obj, actor->sfxSource); @@ -4828,7 +4828,7 @@ void func_hud_80093310(void) { if (1) {} this->obj.id = OBJ_ACTOR_CUTSCENE; 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) { @@ -5133,7 +5133,7 @@ void HUD_AquasStart(Player* player) { } 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; } @@ -6055,7 +6055,7 @@ void func_hud_80096A74(Player* player) { player->unk_190 = player->unk_194 = 10.0f; player->csState = 2; D_ctx_80177A48[1] = 400.0f; - AUDIO_PLAY_SFX(0x09004002, player->sfxSource, 0); + AUDIO_PLAY_SFX(NA_SE_ARWING_DASH, player->sfxSource, 0); } break; diff --git a/src/engine/fox_play.c b/src/engine/fox_play.c index 9dad5c5b..fe62bd11 100644 --- a/src/engine/fox_play.c +++ b/src/engine/fox_play.c @@ -255,11 +255,11 @@ void func_play_800A4C40(Player* player) { if ((sp30.y < gGroundHeight + 80.0f) || (sp3C.y < gGroundHeight + 80.0f)) { if (D_play_80161A64 == 0) { D_play_80161A64 = 1; - AUDIO_PLAY_SFX(0x1100000B, player->sfxSource, 0); + AUDIO_PLAY_SFX(NA_SE_SPLASH_LEVEL_S, player->sfxSource, 0); } } else { 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 (gCurrentLevel == LEVEL_SOLAR) { Audio_SetHeatAlarmParams(255, 1); - AUDIO_PLAY_SFX(0x4100C023, gDefaultSfxSource, 4); - Audio_KillSfxBySourceAndId(gPlayer[0].sfxSource, 0x3140807E); + AUDIO_PLAY_SFX(NA_SE_OVERHEAT_ALARM, gDefaultSfxSource, 4); + Audio_KillSfxBySourceAndId(gPlayer[0].sfxSource, NA_SE_OB_MAGMA_BUBBLE); } } else if (gCurrentLevel == LEVEL_AQUAS) { 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; func_effect_8007D0E0(player->hit1.x, player->hit1.y, player->hit1.z, 2.0f); 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) { gAllRangeWingRepairTimer = 1000; } @@ -802,7 +802,7 @@ void Player_DamageWings(Player* player, s32 side, s32 damage) { player->wings.leftState = WINGSTATE_BROKEN; func_effect_8007D0E0(player->hit2.x, player->hit2.y, player->hit2.z, 2.0f); 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) { gAllRangeWingRepairTimer = 1000; } @@ -843,22 +843,22 @@ void Player_ApplyDamage(Player* player, s32 direction, s32 damage) { player->timer_498 = 20; } 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; gShieldAlpha[player->num] = 2.0f; player->damage = 0; } else { if (player->shields != 0) { if (player->shields < 50) { - AUDIO_PLAY_SFX(0x49008011, gDefaultSfxSource, 4); + AUDIO_PLAY_SFX(NA_SE_SHIELD_WARNING1, gDefaultSfxSource, 4); } else if (player->shields < 100) { - AUDIO_PLAY_SFX(0x49008010, gDefaultSfxSource, 4); + AUDIO_PLAY_SFX(NA_SE_SHIELD_WARNING0, gDefaultSfxSource, 4); } } if (damage < 25) { - func_play_800A5FA0(player->sfxSource, 0x0903900E, player->num); + func_play_800A5FA0(player->sfxSource, NA_SE_DAMAGE_S, player->num); } 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); @@ -1661,7 +1661,7 @@ void func_play_800A8BA4(Player* player) { scenery360->obj.rot.y, scenery360->obj.rot.z, 0.0f, 0.0f, 0.0f); if ((temp_v0 != 0) && (temp_v0 < 0)) { if (player->whooshTimer == 0) { - func_effect_8007A6F0(&scenery360->obj.pos, 0x19000001); + func_effect_8007A6F0(&scenery360->obj.pos, NA_SE_PASS); } player->whooshTimer += 2; if (player->whooshTimer >= 4) { @@ -1677,7 +1677,7 @@ void func_play_800A8BA4(Player* player) { if (temp_v0 != 0) { if (temp_v0 < 0) { if (player->whooshTimer == 0) { - func_effect_8007A6F0(&scenery360->obj.pos, 0x19000001); + func_effect_8007A6F0(&scenery360->obj.pos, NA_SE_PASS); } player->whooshTimer += 2; if (player->whooshTimer >= 4) { @@ -1776,7 +1776,7 @@ void func_play_800A8BA4(Player* player) { player->shadowing = 80; } if (player->whooshTimer == 0) { - AUDIO_PLAY_SFX(0x19000001, scenery->sfxSource, 0); + AUDIO_PLAY_SFX(NA_SE_PASS, scenery->sfxSource, 0); } player->whooshTimer += 2; if (player->whooshTimer >= 4) { @@ -1784,7 +1784,7 @@ void func_play_800A8BA4(Player* player) { } } else if (scenery->obj.id == OBJ_SCENERY_54) { 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; if (player->whooshTimer >= 4) { @@ -1880,7 +1880,7 @@ void func_play_800A8BA4(Player* player) { if (temp_v0 != 0) { if (temp_v0 < 0) { if (player->whooshTimer == 0) { - AUDIO_PLAY_SFX(0x19000001, boss->sfxSource, 0); + AUDIO_PLAY_SFX(NA_SE_PASS, boss->sfxSource, 0); } player->whooshTimer += 2; if (player->whooshTimer >= 4) { @@ -1944,11 +1944,11 @@ void func_play_800A8BA4(Player* player) { Radio_PlayMessage(gMsg_ID_5504, RCID_FALCO); } 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) { if (player->whooshTimer == 0) { - AUDIO_PLAY_SFX(0x19000001, actor->sfxSource, 0); + AUDIO_PLAY_SFX(NA_SE_PASS, actor->sfxSource, 0); } player->whooshTimer += 2; if (player->whooshTimer >= 4) { @@ -1981,7 +1981,7 @@ void func_play_800A8BA4(Player* player) { if (temp_v0 != 0) { if (temp_v0 < 0) { if (player->whooshTimer == 0) { - AUDIO_PLAY_SFX(0x19000001, actor->sfxSource, 0); + AUDIO_PLAY_SFX(NA_SE_PASS, actor->sfxSource, 0); } player->whooshTimer += 2; if (player->whooshTimer >= 4) { @@ -2558,8 +2558,8 @@ void Play_Init(void) { D_ctx_80177C70 = 0; gTeamHelpActor = NULL; gTeamHelpTimer = 0; - Audio_KillSfxById(0x11403076); - Audio_KillSfxById(0x49000014); + Audio_KillSfxById(NA_SE_OB_ROOT_EXPLOSION1); + Audio_KillSfxById(NA_SE_DEMO_SIREN); Memory_FreeAll(); gTraining360MsgTimer = gTraining360MsgIndex = gShowBossHealth = gStarWolfMsgTimer = gAllRangeWingRepairTimer = gAllRangeSuppliesSent = 0; @@ -2831,7 +2831,7 @@ void func_play_800ACA40(Player* player) { for (i = 0; i < ARRAY_COUNT(gPlayerShots) - 1; i++) { if (gPlayerShots[i].obj.status == 0) { 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; break; } @@ -2850,7 +2850,7 @@ void func_play_800ACABC(Player* player) { for (i = 0; i < ARRAY_COUNT(gPlayerShots) - 1; i++) { if (gPlayerShots[i].obj.status == 0) { 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; break; } @@ -2862,10 +2862,10 @@ void func_play_800ACABC(Player* player) { if (gPlayerShots[i].obj.status == 0) { func_play_800AC290(player, &gPlayerShots[i], 0.0f, -10.0f, PLAYERSHOT_1, 400.0f / 3.0f); 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; } 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; } break; @@ -2949,7 +2949,7 @@ void func_play_800AD094(Player* player) { for (i = 0; i < ARRAY_COUNT(gPlayerShots); i++) { if (gPlayerShots[i].obj.status == 0) { 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->unk_180 = 10.0f; break; @@ -2988,7 +2988,7 @@ bool func_play_800AD1F4(Player* player) { gChargeTimers[player->num] = 21; } 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) || (player->state_1C8 != PLAYERSTATE_1C8_ACTIVE)) && @@ -3024,7 +3024,7 @@ bool func_play_800AD1F4(Player* player) { } else { 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; return true; } @@ -3041,7 +3041,7 @@ bool func_play_800AD1F4(Player* player) { } else { 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; gControllerRumbleTimers[player->num] = 5; return true; @@ -4666,7 +4666,7 @@ void func_play_800B2574(Player* player) { if ((gInputHold->button & gBoostButton[player->num]) && !(gInputHold->button & gBrakeButton[player->num]) && (player->state_1C8 != PLAYERSTATE_1C8_U_TURN) && !player->boostCooldown) { 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_190 = 5.0f; 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]) && (player->state_1C8 != PLAYERSTATE_1C8_U_TURN) && !player->boostCooldown) { 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])) { gUturnBrakeTimers[gPlayerNum] = 5; } @@ -4818,7 +4818,7 @@ void func_play_800B3010(Player* player) { if (player->boostMeter == 0.0f) { player->unk_194 = 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); player->unk_190 = 2.0f; @@ -4831,7 +4831,7 @@ void func_play_800B3010(Player* player) { } if ((gInputHold->button & gBrakeButton[player->num]) && !player->boostCooldown) { 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); sp2C = 5.0f; @@ -4851,7 +4851,7 @@ void func_play_800B3314(Player* player) { player->gravity = 3.0f; if ((gInputHold->button & Z_TRIG) && !player->boostCooldown) { 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->zRotBank += 4.0f; @@ -4879,7 +4879,7 @@ void func_play_800B3314(Player* player) { } if ((gInputHold->button & R_TRIG) && !player->boostCooldown) { 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->zRotBank -= 4.0f; @@ -5072,7 +5072,7 @@ void Player_UpdateShields(Player* player) { if (player->shields >= Play_GetMaxShields()) { player->shields = Play_GetMaxShields(); 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; } 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); } if (gCurrentLevel == LEVEL_SOLAR) { - Audio_KillSfxById(0x4100C023); + Audio_KillSfxById(NA_SE_OVERHEAT_ALARM); } 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->csState = 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) && ((player->form == FORM_ARWING) || (gVersusMode && (player->form == FORM_LANDMASTER)))) { if (player->cockpitView = 1 - player->cockpitView) { - AUDIO_PLAY_SFX(0x4900002C, gDefaultSfxSource, 4); + AUDIO_PLAY_SFX(NA_SE_VIEW_MOVE_IN, gDefaultSfxSource, 4); } else { - AUDIO_PLAY_SFX(0x4900002D, gDefaultSfxSource, 4); + AUDIO_PLAY_SFX(NA_SE_VIEW_MOVE_OUT, gDefaultSfxSource, 4); if (gLevelMode == LEVELMODE_ON_RAILS) { player->camRoll = 0.0f; } @@ -5400,7 +5400,7 @@ void Player_Update(Player* player) { if (D_ctx_80177E7C == 1) { D_ctx_80177E7C += 1; 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; } } @@ -5484,7 +5484,7 @@ void Player_Update(Player* player) { func_play_800B0F50(player); func_play_800B44C4(player); 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; } else 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].csState = 0; gSceneSetup = 1; - AUDIO_PLAY_SFX(0x1900602A, gDefaultSfxSource, 0); + AUDIO_PLAY_SFX(NA_SE_WARP_HOLE, gDefaultSfxSource, 0); gMissionStatus = MISSION_WARP; gLeveLClearStatus[gCurrentLevel] = 1; } @@ -6263,9 +6263,9 @@ void Play_UpdateLevel(void) { } if (gPlayer[0].heal == 0) { 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) { - 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) && (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_STANDBY)) { if (gShowCrosshairs[0] = 1 - gShowCrosshairs[0]) { - AUDIO_PLAY_SFX(0x49000019, gDefaultSfxSource, 4); + AUDIO_PLAY_SFX(NA_SE_MAP_WINDOW_OPEN, gDefaultSfxSource, 4); } else { - AUDIO_PLAY_SFX(0x4900101A, gDefaultSfxSource, 4); + AUDIO_PLAY_SFX(NA_SE_MAP_WINDOW_CLOSE, gDefaultSfxSource, 4); } } } else { for (i = 0; i < 4; i++) { if ((gControllerPress[i].button & R_TRIG) && (gPlayer[i].form != FORM_ON_FOOT)) { 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 { - func_enmy_80060F30(gPlayer[i].sfxSource, 0x4900101A, i); + func_enmy_80060F30(gPlayer[i].sfxSource, NA_SE_MAP_WINDOW_CLOSE, i); } } } diff --git a/src/engine/fox_radio.c b/src/engine/fox_radio.c index 5089c15b..0840ead8 100644 --- a/src/engine/fox_radio.c +++ b/src/engine/fox_radio.c @@ -628,7 +628,7 @@ void Radio_Draw(void) { if ((gRadioMsgId >= 23000) && (gRadioMsgId < 23033)) { if (gMsgCharIsPrinting) { gRadioMouthTimer = 2; - AUDIO_PLAY_SFX(0x49000017, gDefaultSfxSource, 4); + AUDIO_PLAY_SFX(NA_SE_MESSAGE_MOVE, gDefaultSfxSource, 4); } } else if (ret == 1) { gRadioMouthTimer = 2; diff --git a/src/engine/fox_tank.c b/src/engine/fox_tank.c index 813391e8..45617862 100644 --- a/src/engine/fox_tank.c +++ b/src/engine/fox_tank.c @@ -514,7 +514,7 @@ void func_tank_80045130(Player* player) { player->baseRollRate = 20; player->rollRate = 20; player->sfx.roll = 1; - AUDIO_PLAY_SFX(0x1100000A, player->sfxSource, 0); + AUDIO_PLAY_SFX(NA_SE_TANK_SLIDE, player->sfxSource, 0); } else { player->barrelInputTimerL = 10; } @@ -527,7 +527,7 @@ void func_tank_80045130(Player* player) { player->baseRollRate = -20; player->rollRate = -20; player->sfx.roll = 1; - AUDIO_PLAY_SFX(0x1100000A, player->sfxSource, 0); + AUDIO_PLAY_SFX(NA_SE_TANK_SLIDE, player->sfxSource, 0); } else { player->barrelInputTimerR = 10; } @@ -551,7 +551,7 @@ void func_tank_80045348(Player* player) { sp2E = true; if (D_800C9F24 == 0.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 { player->unk_190 = 2.0f; } @@ -593,13 +593,13 @@ void func_tank_80045678(Player* player) { player->gravity = 3.0f; if (!(gInputHold->button & Z_TRIG)) { - Audio_KillSfxBySourceAndId(player->sfxSource, 0x01008016); - Audio_KillSfxBySourceAndId(player->sfxSource, 0x1100000A); + Audio_KillSfxBySourceAndId(player->sfxSource, NA_SE_TANK_GO_UP); + Audio_KillSfxBySourceAndId(player->sfxSource, NA_SE_TANK_SLIDE); } if ((gInputHold->button & Z_TRIG) && !player->boostCooldown) { D_800C9F14++; 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->zRotBank += 4.0f; @@ -623,13 +623,13 @@ void func_tank_80045678(Player* player) { D_800C9F20 = 0.0f; } if (!(gInputHold->button & R_TRIG)) { - Audio_KillSfxBySourceAndId(player->sfxSource, 0x01008016); - Audio_KillSfxBySourceAndId(player->sfxSource, 0x1100000A); + Audio_KillSfxBySourceAndId(player->sfxSource, NA_SE_TANK_GO_UP); + Audio_KillSfxBySourceAndId(player->sfxSource, NA_SE_TANK_SLIDE); } if ((gInputHold->button & R_TRIG) && !player->boostCooldown) { D_800C9F14++; 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->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 (D_800C9F3C == 0) { D_800C9F3C = 1; - Audio_KillSfxBySourceAndId(player->sfxSource, 0x1100000A); - Audio_KillSfxBySourceAndId(player->sfxSource, 0x01004024); - AUDIO_PLAY_SFX(0x01008016, player->sfxSource, 0); + Audio_KillSfxBySourceAndId(player->sfxSource, NA_SE_TANK_SLIDE); + Audio_KillSfxBySourceAndId(player->sfxSource, NA_SE_TANK_BURNER_HALF); + 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; temp = -gInputPress->stick_y; @@ -742,7 +742,7 @@ void func_tank_80045E7C(Player* player) { } if (player->rollRate == 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)) { @@ -1120,14 +1120,14 @@ void func_tank_80047504(Player* player) { if (player->boostMeter > 90.0f) { player->boostMeter = 90.0f; player->boostCooldown = true; - Audio_KillSfxBySourceAndId(player->sfxSource, 0x01004024); - Audio_KillSfxBySourceAndId(player->sfxSource, 0x01008016); + Audio_KillSfxBySourceAndId(player->sfxSource, NA_SE_TANK_BURNER_HALF); + Audio_KillSfxBySourceAndId(player->sfxSource, NA_SE_TANK_GO_UP); } } else { if (player->boostMeter > 0.0f) { player->boostCooldown = true; - Audio_KillSfxBySourceAndId(player->sfxSource, 0x01004024); - Audio_KillSfxBySourceAndId(player->sfxSource, 0x01008016); + Audio_KillSfxBySourceAndId(player->sfxSource, NA_SE_TANK_BURNER_HALF); + Audio_KillSfxBySourceAndId(player->sfxSource, NA_SE_TANK_GO_UP); } } } 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); if (player->rot.z >= 3.0f) { 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; } @@ -1367,14 +1367,14 @@ void func_tank_800481F4(Player* player) { gLight2BTarget = 20; player->shadowing = 80; if (player->whooshTimer == 0) { - AUDIO_PLAY_SFX(0x19000001, player->sfxSource, 0); + AUDIO_PLAY_SFX(NA_SE_PASS, player->sfxSource, 0); } player->whooshTimer += 2; if (player->whooshTimer >= 4) { player->whooshTimer = 4; } } else if (temp_v0 == -2) { - AUDIO_PLAY_SFX(0x19000001, player->sfxSource, 0); + AUDIO_PLAY_SFX(NA_SE_PASS, player->sfxSource, 0); } } else { Player_ApplyDamage(player, temp_v0, scenery->info.damage); diff --git a/src/engine/fox_versus.c b/src/engine/fox_versus.c index 37d85811..239bbb10 100644 --- a/src/engine/fox_versus.c +++ b/src/engine/fox_versus.c @@ -336,7 +336,7 @@ void func_versus_800BDE44(void) { } else { 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[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 { // clang-format off if (D_versus_80178768[0] == 0) {\ - AUDIO_PLAY_SFX(0x4900D036, gDefaultSfxSource, 4);\ + AUDIO_PLAY_SFX(NA_SE_TIME_OVER, gDefaultSfxSource, 4);\ } // clang-format on 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)) { - AUDIO_PLAY_SFX(0x49000003, gDefaultSfxSource, 4); + AUDIO_PLAY_SFX(NA_SE_DECIDE, gDefaultSfxSource, 4); D_80178780[i] = 2; } if (sUnlockOnFoot && (D_80178780[i] == 0) && ((gControllerPress[i].button & L_CBUTTONS) || (gControllerPress[i].button & D_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; } 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; } @@ -598,10 +598,10 @@ s32 func_versus_800BEF00(void) { if (D_80178794 == 0) { D_80178790--; if (D_80178790 != 0) { - AUDIO_PLAY_SFX(0x49000008, gDefaultSfxSource, 4); + AUDIO_PLAY_SFX(NA_SE_READY, gDefaultSfxSource, 4); ret = 0; } else { - AUDIO_PLAY_SFX(0x49000009, gDefaultSfxSource, 4); + AUDIO_PLAY_SFX(NA_SE_GO, gDefaultSfxSource, 4); ret = 1; } D_80178794 = 30; @@ -1131,7 +1131,7 @@ s32 func_versus_800C07C4(void) { } // 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 return ret; @@ -1257,7 +1257,7 @@ bool func_versus_800C0D10(void) { if (cont == 4) { D_800D4A90 = 2; } else { - AUDIO_PLAY_SFX(0x49004007, gDefaultSfxSource, 4); + AUDIO_PLAY_SFX(NA_SE_COUNT_UP, gDefaultSfxSource, 4); } break; @@ -1308,7 +1308,7 @@ s32 func_versus_800C0E78(void) { bool func_versus_800C107C(s32 playerNum) { D_80178798++; if (D_80178798 == 10) { - AUDIO_PLAY_SFX(0x49004007, gDefaultSfxSource, 4); + AUDIO_PLAY_SFX(NA_SE_COUNT_UP, gDefaultSfxSource, 4); D_801787B8++; D_80178798 = 0; } -- cgit v1.2.3