mirror/Starship
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Starship synced 2026-09-03 02:53:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use SF3DS BGM names, some other audio-related cleanup. (#235)

Browse Source 
* remember to undo mods

* bgm macros
This commit is contained in:
petrie911
2024-05-08 10:32:05 -05:00
committed by GitHub
parent a864e5ebe2
commit 182eb5c65a
43 changed files with 824 additions and 801 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/fox_360.c
+1 -1
View File
@@ -490,7 +490,7 @@ void ActorAllRange_UpdateStarWolfEvents(Actor* this) {
if ((gCurrentLevel == LEVEL_VENOM_2) || (gCurrentLevel == LEVEL_BOLSE)) {
gPlayer[0].camRoll = 20.0f;
}
AUDIO_PLAY_BGM(SEQ_ID_STAR_WOLF | SEQ_FLAG);
AUDIO_PLAY_BGM(NA_BGM_STARWOLF);
AllRange_ClearRadio();
if ((gCurrentLevel == LEVEL_FORTUNA) || (gCurrentLevel == LEVEL_VENOM_2)) {
gPlayer[0].cam.eye.x = 4500.0f;
src/engine/fox_beam.c
+1 -1
View File
@@ -2245,7 +2245,7 @@ void PlayerShot_UpdateShot(PlayerShot* shot, s32 index) {
}
}
Object_Kill(&shot->obj, shot->sfxSource);
func_effect_8007A6F0(&shot->obj.pos, NA_SE_SPREAD_EXPLSION);
func_effect_8007A6F0(&shot->obj.pos, NA_SE_SPREAD_EXPLOSION);
} else if (gCurrentLevel == LEVEL_AQUAS) {
Aquas_801ABA40(shot);
} else {
src/engine/fox_boss.c
+2 -4
View File
@@ -3,10 +3,8 @@
s32 gBossFrameCount;
s32 D_boss_800C9E90[] = {
SEQ_ID_CO_BOSS_1 | SEQ_FLAG, SEQ_ID_ME_BOSS | SEQ_FLAG, SEQ_ID_SX_BOSS | SEQ_FLAG, SEQ_ID_A6_BOSS | SEQ_FLAG,
SEQ_ID_A6_BOSS | SEQ_FLAG, SEQ_ID_SY_BOSS | SEQ_FLAG, SEQ_ID_VE_BOSS | SEQ_FLAG, SEQ_ID_SO_BOSS | SEQ_FLAG,
SEQ_ID_ZO_BOSS | SEQ_FLAG, SEQ_ID_VE_BOSS | SEQ_FLAG, SEQ_ID_CO_BOSS_1 | SEQ_FLAG, SEQ_ID_MA_BOSS | SEQ_FLAG,
SEQ_ID_TI_BOSS | SEQ_FLAG, SEQ_ID_AQ_BOSS | SEQ_FLAG,
NA_BGM_BOSS_CO, NA_BGM_BOSS_ME, NA_BGM_BOSS_SX, NA_BGM_BOSS_A6, NA_BGM_BOSS_SB, NA_BGM_BOSS_SY, NA_BGM_BOSS_VE,
NA_BGM_BOSS_SO, NA_BGM_BOSS_ZO, NA_BGM_BOSS_VE, NA_BGM_BOSS_CO, NA_BGM_BOSS_MA, NA_BGM_BOSS_TI, NA_BGM_BOSS_AQ,
};
s32 PAD_boss_C9EC4[14] = { 0 };
src/engine/fox_demo.c
+3 -3
View File
@@ -617,7 +617,7 @@ void Cutscene_EnterWarpZone(Player* player) {
if (player->csTimer == 30) {
gStarCount = 300;
AUDIO_PLAY_BGM(SEQ_ID_WARP_ZONE | SEQ_FLAG);
AUDIO_PLAY_BGM(NA_BGM_STAGE_WZ);
}
if (player->csTimer == 0) {
@@ -813,7 +813,7 @@ void Cutscene_AllRangeMode(Player* player) {
gChangeTo360 = true;
if (gCurrentLevel == LEVEL_VENOM_ANDROSS) {
Radio_PlayMessage(gMsg_ID_19466, RCID_FOX);
AUDIO_PLAY_BGM(SEQ_ID_AND_BRAIN | SEQ_FLAG);
AUDIO_PLAY_BGM(NA_BGM_ANDROSS_BRAIN);
} else if (gCurrentLevel != LEVEL_TRAINING) {
Radio_PlayMessage(gMsg_ID_20180, RCID_FOX);
if (gCurrentLevel == LEVEL_SECTOR_Y) {
@@ -1403,7 +1403,7 @@ void Cutscene_LevelComplete(Player* player) {
Player_FloorCheck(player);
} else {
if (gCsFrameCount == 170) {
AUDIO_PLAY_BGM(SEQ_ID_GOOD_END);
AUDIO_PLAY_BGM(NA_BGM_COURSE_CLEAR);
}
Cutscene_CoComplete2(player);
Player_FloorCheck(player);
src/engine/fox_effect.c
+1 -1
View File
@@ -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(NA_SE_EN_CLBOSS_BEAM, effect->sfxSource, 4);
AUDIO_PLAY_SFX(NA_SE_EN_A6BOSS_BEAM, effect->sfxSource, 4);
break;
case 11:
src/engine/fox_enmy2.c
+2 -2
View File
@@ -1174,10 +1174,10 @@ void ActorEvent_ProcessScript(ActorEvent* this) {
if (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_ACTIVE) {
if (this->unk_0B4 == EVID_86) {
Audio_PlayFanfare(SEQ_ID_KATT, 20, 10, 10);
Audio_PlayFanfare(NA_BGM_KATT, 20, 10, 10);
}
if (this->unk_0B4 == EVID_85) {
Audio_PlayFanfare(SEQ_ID_BILL, 20, 10, 10);
Audio_PlayFanfare(NA_BGM_BILL, 20, 10, 10);
}
}
src/engine/fox_hud.c
+3 -3
View File
@@ -5091,7 +5091,7 @@ void HUD_AquasStart(Player* player) {
Aquas_801BDF14();
AUDIO_PLAY_BGM(SEQ_ID_INTRO_45);
AUDIO_PLAY_BGM(NA_BGM_START_DEMO_M);
case 3:
gFillScreenAlphaStep = 16;
@@ -5264,7 +5264,7 @@ void HUD_AquasStart(Player* player) {
gLoadLevelObjects = 1;
SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 50);
SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 50);
AUDIO_PLAY_BGM(SEQ_ID_AQUAS);
AUDIO_PLAY_BGM(NA_BGM_STAGE_AQ);
}
Aquas_801AC8A8(player->pos.x + RAND_FLOAT_CENTERED(10.0f), player->pos.y + RAND_FLOAT_CENTERED(10.0f),
@@ -5880,7 +5880,7 @@ void HUD_AquasComplete(Player* player) {
break;
case 400:
AUDIO_PLAY_BGM(SEQ_ID_GOOD_END);
AUDIO_PLAY_BGM(NA_BGM_COURSE_CLEAR);
break;
case 440:
src/engine/fox_play.c
+9 -9
View File
@@ -2564,7 +2564,7 @@ void Play_Init(void) {
D_ctx_80177C70 = 0;
gTeamHelpActor = NULL;
gTeamHelpTimer = 0;
Audio_KillSfxById(NA_SE_OB_ROOT_EXPLOSION1);
Audio_KillSfxById(NA_SE_OB_ROUTE_EXPLOSION1);
Audio_KillSfxById(NA_SE_DEMO_SIREN);
Memory_FreeAll();
gTraining360MsgTimer = gTraining360MsgIndex = gShowBossHealth = gStarWolfMsgTimer = gAllRangeWingRepairTimer =
@@ -4357,24 +4357,24 @@ void Player_Setup(Player* playerx) {
player->unk_234 = 1;
switch (gCurrentLevel) {
case LEVEL_CORNERIA:
AUDIO_PLAY_BGM(SEQ_ID_CO_INTRO);
AUDIO_PLAY_BGM(NA_BGM_START_DEMO);
break;
case LEVEL_METEO:
AUDIO_PLAY_BGM(SEQ_ID_ME_INTRO);
AUDIO_PLAY_BGM(NA_BGM_ME_START_DEMO);
break;
case LEVEL_FORTUNA:
case LEVEL_BOLSE:
case LEVEL_VENOM_2:
AUDIO_PLAY_BGM(SEQ_ID_INTRO_51);
AUDIO_PLAY_BGM(NA_BGM_FO_START_DEMO);
break;
case LEVEL_VENOM_1:
AUDIO_PLAY_BGM(SEQ_ID_VENOM_1 | SEQ_FLAG);
AUDIO_PLAY_BGM(NA_BGM_STAGE_VE1);
break;
case LEVEL_KATINA:
AUDIO_PLAY_BGM(SEQ_ID_INTRO_51);
AUDIO_PLAY_BGM(NA_BGM_KA_START_DEMO);
break;
case LEVEL_TITANIA:
AUDIO_PLAY_BGM(SEQ_ID_INTRO_45);
AUDIO_PLAY_BGM(NA_BGM_START_DEMO_M);
break;
case LEVEL_ZONESS:
case LEVEL_SECTOR_X:
@@ -4382,7 +4382,7 @@ void Player_Setup(Player* playerx) {
case LEVEL_TRAINING:
case LEVEL_MACBETH:
default:
AUDIO_PLAY_BGM(SEQ_ID_INTRO_44);
AUDIO_PLAY_BGM(NA_BGM_START_DEMO_S);
break;
case LEVEL_AREA_6:
case LEVEL_SECTOR_Y:
@@ -5115,7 +5115,7 @@ void Player_Down(Player* player) {
if (!gVersusMode) {
SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 1);
SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 1);
AUDIO_PLAY_BGM(SEQ_ID_DEATH);
AUDIO_PLAY_BGM(NA_BGM_PLAYER_DOWN);
}
if (gCurrentLevel == LEVEL_SOLAR) {
Audio_KillSfxById(NA_SE_OVERHEAT_ALARM);
src/engine/fox_tank.c
+1 -1
View File
@@ -330,7 +330,7 @@ void func_tank_800444BC(Player* player) {
}
if (gTiStartLandmaster != 0) {
gTiStartLandmaster = 0;
AUDIO_PLAY_BGM(SEQ_ID_TITANIA | SEQ_FLAG);
AUDIO_PLAY_BGM(NA_BGM_STAGE_TI);
Audio_StartPlayerNoise(0);
}
src/engine/fox_versus.c
+3 -3
View File
@@ -1529,7 +1529,7 @@ bool Versus_Update(void) {
case 4:
if ((sStartVsHurryBgm == 1) && (sVsHurryBgmPlaying == 0)) {
AUDIO_PLAY_BGM(SEQ_ID_VS_HURRY | SEQ_FLAG);
AUDIO_PLAY_BGM(NA_BGM_BATTLE_LAST);
sVsHurryBgmPlaying = 1;
}
@@ -1566,11 +1566,11 @@ bool Versus_Update(void) {
case 2:
case 3:
AUDIO_PLAY_BGM(SEQ_ID_GOOD_END);
AUDIO_PLAY_BGM(NA_BGM_COURSE_CLEAR);
break;
case 99:
AUDIO_PLAY_BGM(SEQ_ID_BAD_END);
AUDIO_PLAY_BGM(NA_BGM_COURSE_FAILURE);
break;
default: