PublicMirrors/Starship
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Starship.git synced 2025-01-23 21:45:00 +03:00
Code Issues Actions Packages Projects Releases 1 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
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
43 changed files with 824 additions and 801 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.vscode/settings.json vendored
View File

@ -142,7 +142,8 @@
"compare": "c", "compare": "c",
"os_motor.h": "c", "os_motor.h": "c",
"os_pfs.h": "c", "os_pfs.h": "c",
"semaphore": "c" "semaphore": "c",
"bgm.h": "c"
}, },
"C_Cpp_Runner.msvcBatchPath": "" "C_Cpp_Runner.msvcBatchPath": ""
} }

171
include/bgm.h Normal file
View File

@ -0,0 +1,171 @@
#ifndef BGM_H
#define BGM_H
#include "sys.h"
void Audio_SetBgmParam(s8 bgmParam);
void Audio_PlaySequence(u8 seqPlayId, u16 seqId, u8 fadeinTime, u8 bgmParam);
void Audio_PlayFanfare(u16 seqId, u8 bgmVolume, u8 bgmFadeoutTime, u8 bgmFadeinTime);
void Audio_PlayDeathSequence(void);
void Audio_PlaySoundTest(u8 enable);
void Audio_PlaySequenceDistorted(u8 seqPlayId, u16 seqId, u16 distortion, u8 fadeinTime, u8 unused);
void Audio_PlaySoundTestTrack(u8 trackNumber);
void Audio_PlayBgm(u16 seqId);
#define AUDIO_PLAY_BGM(seqId) Audio_PlaySequence(SEQ_PLAYER_BGM, (seqId), 0, -1)
typedef enum BgmSeqIds {
/* 0 */ SEQ_ID_SFX,
/* 1 */ SEQ_ID_VOICE,
/* 2 */ SEQ_ID_CORNERIA,
/* 3 */ SEQ_ID_METEO,
/* 4 */ SEQ_ID_TITANIA,
/* 5 */ SEQ_ID_SECTOR_X,
/* 6 */ SEQ_ID_ZONESS,
/* 7 */ SEQ_ID_AREA_6,
/* 8 */ SEQ_ID_VENOM_1,
/* 9 */ SEQ_ID_SECTOR_Y,
/* 10 */ SEQ_ID_FORTUNA,
/* 11 */ SEQ_ID_SOLAR,
/* 12 */ SEQ_ID_BOLSE,
/* 13 */ SEQ_ID_KATINA,
/* 14 */ SEQ_ID_AQUAS,
/* 15 */ SEQ_ID_SECTOR_Z,
/* 16 */ SEQ_ID_MACBETH,
/* 17 */ SEQ_ID_ANDROSS,
/* 18 */ SEQ_ID_BOSS_CO_1,
/* 19 */ SEQ_ID_BOSS_ME,
/* 20 */ SEQ_ID_BOSS_TI,
/* 21 */ SEQ_ID_BOSS_SX,
/* 22 */ SEQ_ID_BOSS_ZO,
/* 23 */ SEQ_ID_BOSS_A6,
/* 24 */ SEQ_ID_BOSS_VE,
/* 25 */ SEQ_ID_BOSS_SY,
/* 26 */ SEQ_ID_UNK_26,
/* 27 */ SEQ_ID_BOSS_SO,
/* 28 */ SEQ_ID_BOSS_BO,
/* 29 */ SEQ_ID_BOSS_KA,
/* 30 */ SEQ_ID_BOSS_AQ,
/* 31 */ SEQ_ID_BOSS_SZ,
/* 32 */ SEQ_ID_BOSS_MA,
/* 33 */ SEQ_ID_BOSS_ANDROSS,
/* 34 */ SEQ_ID_TITLE,
/* 35 */ SEQ_ID_OPENING,
/* 36 */ SEQ_ID_MENU,
/* 37 */ SEQ_ID_CO_INTRO,
/* 38 */ SEQ_ID_GOOD_END,
/* 39 */ SEQ_ID_DEATH,
/* 40 */ SEQ_ID_GAME_OVER,
/* 41 */ SEQ_ID_UNK_41,
/* 42 */ SEQ_ID_STAFF_ROLL,
/* 43 */ SEQ_ID_STAR_WOLF,
/* 44 */ SEQ_ID_INTRO_S,
/* 45 */ SEQ_ID_INTRO_M,
/* 46 */ SEQ_ID_VERSUS,
/* 47 */ SEQ_ID_VS_HURRY,
/* 48 */ SEQ_ID_BOSS_CO_2,
/* 49 */ SEQ_ID_BAD_END,
/* 50 */ SEQ_ID_ME_INTRO,
/* 51 */ SEQ_ID_INTRO_51,
/* 52 */ SEQ_ID_UNK_52,
/* 53 */ SEQ_ID_UNK_53,
/* 54 */ SEQ_ID_KATT,
/* 55 */ SEQ_ID_BILL,
/* 56 */ SEQ_ID_VS_MENU,
/* 57 */ SEQ_ID_UNK_57,
/* 58 */ SEQ_ID_WARP_ZONE,
/* 59 */ SEQ_ID_UNK_59,
/* 60 */ SEQ_ID_WORLD_MAP,
/* 61 */ SEQ_ID_AND_BRAIN,
/* 62 */ SEQ_ID_TO_ANDROSS,
/* 63 */ SEQ_ID_TRAINING,
/* 64 */ SEQ_ID_VE_CLEAR,
/* 65 */ SEQ_ID_BOSS_RESUME,
/* 66 */ SEQ_ID_MAX,
/* -1 */ SEQ_ID_NONE = 0xFFFF,
} BgmSeqIds;
#define SEQ_FLAG 0x8000
#define NA_BGM_SE (SEQ_ID_SFX)
#define NA_BGM_VO (SEQ_ID_VOICE)
#define NA_BGM_STAGE_CO (SEQ_ID_CORNERIA | SEQ_FLAG)
#define NA_BGM_STAGE_ME (SEQ_ID_METEO | SEQ_FLAG)
#define NA_BGM_STAGE_TI (SEQ_ID_TITANIA | SEQ_FLAG)
#define NA_BGM_STAGE_SX (SEQ_ID_SECTOR_X | SEQ_FLAG)
#define NA_BGM_STAGE_ZO (SEQ_ID_ZONESS | SEQ_FLAG)
#define NA_BGM_STAGE_A6 (SEQ_ID_AREA_6 | SEQ_FLAG)
#define NA_BGM_STAGE_SB (SEQ_ID_AREA_6 | SEQ_FLAG)
#define NA_BGM_STAGE_VE1 (SEQ_ID_VENOM_1 | SEQ_FLAG)
#define NA_BGM_STAGE_SY (SEQ_ID_SECTOR_Y | SEQ_FLAG)
#define NA_BGM_STAGE_FO (SEQ_ID_FORTUNA | SEQ_FLAG)
#define NA_BGM_STAGE_SO (SEQ_ID_SOLAR | SEQ_FLAG)
#define NA_BGM_STAGE_BO (SEQ_ID_BOLSE | SEQ_FLAG)
#define NA_BGM_STAGE_KA (SEQ_ID_KATINA | SEQ_FLAG)
#define NA_BGM_STAGE_AQ (SEQ_ID_AQUAS)
#define NA_BGM_STAGE_SZ (SEQ_ID_SECTOR_Z | SEQ_FLAG)
#define NA_BGM_STAGE_MA (SEQ_ID_MACBETH | SEQ_FLAG)
#define NA_BGM_STAGE_ANDROSS (SEQ_ID_ANDROSS | SEQ_FLAG)
#define NA_BGM_BOSS_CO (SEQ_ID_BOSS_CO_1 | SEQ_FLAG)
#define NA_BGM_BOSS_ME (SEQ_ID_BOSS_ME | SEQ_FLAG)
#define NA_BGM_BOSS_TI (SEQ_ID_BOSS_TI | SEQ_FLAG)
#define NA_BGM_BOSS_SX (SEQ_ID_BOSS_SX | SEQ_FLAG)
#define NA_BGM_BOSS_ZO (SEQ_ID_BOSS_ZO | SEQ_FLAG)
#define NA_BGM_BOSS_A6 (SEQ_ID_BOSS_A6 | SEQ_FLAG)
#define NA_BGM_BOSS_SB (SEQ_ID_BOSS_A6 | SEQ_FLAG)
#define NA_BGM_BOSS_VE (SEQ_ID_BOSS_VE | SEQ_FLAG)
#define NA_BGM_BOSS_SY (SEQ_ID_BOSS_SY | SEQ_FLAG)
#define NA_BGM_BOSS_FO (SEQ_ID_UNK_26 | SEQ_FLAG)
#define NA_BGM_BOSS_SO (SEQ_ID_BOSS_SO | SEQ_FLAG)
#define NA_BGM_BOSS_BO (SEQ_ID_BOSS_BO | SEQ_FLAG)
#define NA_BGM_BOSS_KA (SEQ_ID_BOSS_KA | SEQ_FLAG)
#define NA_BGM_BOSS_AQ (SEQ_ID_BOSS_AQ | SEQ_FLAG)
#define NA_BGM_BOSS_SZ (SEQ_ID_BOSS_SZ | SEQ_FLAG)
#define NA_BGM_BOSS_MA (SEQ_ID_BOSS_MA | SEQ_FLAG)
#define NA_BGM_BOSS_ANDROSS (SEQ_ID_BOSS_ANDROSS | SEQ_FLAG)
#define NA_BGM_TITLE (SEQ_ID_TITLE)
#define NA_BGM_OPENING (SEQ_ID_OPENING)
#define NA_BGM_SELECT (SEQ_ID_MENU)
#define NA_BGM_RANKING (SEQ_ID_MENU)
#define NA_BGM_START_DEMO (SEQ_ID_CO_INTRO)
#define NA_BGM_COURSE_CLEAR (SEQ_ID_GOOD_END)
#define NA_BGM_PLAYER_DOWN (SEQ_ID_DEATH)
#define NA_BGM_GAME_OVER (SEQ_ID_GAME_OVER)
#define NA_BGM_END_DEMO (SEQ_ID_UNK_41)
#define NA_BGM_STAFF_ROLL (SEQ_ID_STAFF_ROLL)
#define NA_BGM_STARWOLF (SEQ_ID_STAR_WOLF | SEQ_FLAG)
#define NA_BGM_START_DEMO_S (SEQ_ID_INTRO_S)
#define NA_BGM_START_DEMO_M (SEQ_ID_INTRO_M)
#define NA_BGM_VOLUME_TEST (SEQ_ID_VERSUS)
#define NA_BGM_BATTLE (SEQ_ID_VERSUS | SEQ_FLAG)
#define NA_BGM_VS_00 (SEQ_ID_VERSUS | SEQ_FLAG)
#define NA_BGM_VS_01 (SEQ_ID_VERSUS | SEQ_FLAG)
#define NA_BGM_VS_02 (SEQ_ID_VERSUS | SEQ_FLAG)
#define NA_BGM_BATTLE_LAST (SEQ_ID_VS_HURRY | SEQ_FLAG)
#define NA_BGM_BOSS_A_CARRIER (SEQ_ID_BOSS_CO_2 | SEQ_FLAG)
#define NA_BGM_COURSE_FAILURE (SEQ_ID_BAD_END)
#define NA_BGM_ME_START_DEMO (SEQ_ID_ME_INTRO)
#define NA_BGM_FO_START_DEMO (SEQ_ID_INTRO_51)
#define NA_BGM_A6_START_DEMO (SEQ_ID_INTRO_51)
#define NA_BGM_BO_START_DEMO (SEQ_ID_INTRO_51)
#define NA_BGM_SO_START_DEMO (SEQ_ID_INTRO_51)
#define NA_BGM_KA_START_DEMO (SEQ_ID_INTRO_51)
#define NA_BGM_SZ_START_DEMO (SEQ_ID_INTRO_51)
#define NA_BGM_AQ_START_DEMO (SEQ_ID_UNK_52)
#define NA_BGM_VE_START_DEMO (SEQ_ID_UNK_53)
#define NA_BGM_KATT (SEQ_ID_KATT)
#define NA_BGM_BILL (SEQ_ID_BILL)
#define NA_BGM_VS_SELECT (SEQ_ID_VS_MENU)
#define NA_BGM_VS_RESULT (SEQ_ID_UNK_57)
#define NA_BGM_STAGE_WZ (SEQ_ID_WARP_ZONE | SEQ_FLAG)
#define NA_BGM_STAGE_AT (SEQ_ID_WARP_ZONE | SEQ_FLAG)
#define NA_BGM_STAGE_SS (SEQ_ID_WARP_ZONE | SEQ_FLAG)
#define NA_BGM_STAGE_BM3 (SEQ_ID_UNK_59 | SEQ_FLAG)
#define NA_BGM_MAP (SEQ_ID_WORLD_MAP)
#define NA_BGM_ANDROSS_BRAIN (SEQ_ID_AND_BRAIN | SEQ_FLAG)
#define NA_BGM_DASH_INTO_BASE (SEQ_ID_TO_ANDROSS | SEQ_FLAG)
#define NA_BGM_TRAINING (SEQ_ID_TRAINING | SEQ_FLAG)
#define NA_BGM_ALL_CLEAR (SEQ_ID_VE_CLEAR | SEQ_FLAG)
#define NA_BGM_REAL_BOSS (SEQ_ID_BOSS_RESUME | SEQ_FLAG)
#endif

6
include/prevent_context_reordering.h
View File

@ -1,15 +1,15 @@
#ifndef PREVENT_CONTEXT_REORDERING_H #ifndef PREVENT_CONTEXT_REORDERING_H
#define PREVENT_CONTEXT_REORDERING_H #define PREVENT_CONTEXT_REORDERING_H
extern int Dummyhalf; // extern int Dummyhalf;
// struct Dummy0 {int x;}; // struct Dummy0 {int x;};
// struct Dummy1 {int x;}; // struct Dummy1 {int x;};
// struct Dummy2 {int x;}; // struct Dummy2 {int x;};
// struct Dummy3 {int x;}; // struct Dummy3 {int x;};
// struct Dummy4 {int x;}; // struct Dummy4 {int x;};
// struct Dummy5 {int x;}; // struct Dummy5 {int x;};
// struct Dummy6 {int x;}; struct Dummy6 {int x;};
// struct Dummy7 {int x;}; struct Dummy7 {int x;};
struct Dummy8 {int x;}; struct Dummy8 {int x;};
struct Dummy9 {int x;}; struct Dummy9 {int x;};
struct Dummy10 {int x;}; struct Dummy10 {int x;};

175
include/sf64audio_external.h
View File

@ -4,12 +4,31 @@
#include "sys.h" #include "sys.h"
#include "audioseq_cmd.h" #include "audioseq_cmd.h"
#include "sfx.h" #include "sfx.h"
#include "bgm.h"
void Audio_PlayVoice(s32 msgId);
void Audio_PlayVoiceWithoutBGM(u32 msgId);
void Audio_ClearVoice(void);
s32 Audio_GetCurrentVoice(void);
s32 Audio_GetCurrentVoiceStatus(void);
void Audio_SetUnkVoiceParam(u8 unkVoiceParam);
u8* Audio_UpdateFrequencyAnalysis(void);
void Audio_SetVolume(u8 audioType, u8 volume);
void Audio_FadeOutAll(u8 fadeoutTime);
void Audio_SetAudioSpec(u8 unused, u16 specParam);
#define AUDIO_PLAY_SFX(sfxId, srcPos, token) (Audio_PlaySfx((sfxId),(srcPos),(token),&gDefaultMod,&gDefaultMod,&gDefaultReverb))
#define AUDIO_PLAY_BGM(seqId) Audio_PlaySequence(SEQ_PLAYER_BGM, (seqId), 0, -1)
#define AUDIO_SET_SPEC(sfxLayout, spec) Audio_SetAudioSpec(0, ((sfxLayout) << 8) | (spec)) #define AUDIO_SET_SPEC(sfxLayout, spec) Audio_SetAudioSpec(0, ((sfxLayout) << 8) | (spec))
#define AUDIO_SET_SPEC_ALT(sfxLayout, spec) Audio_SetAudioSpec((sfxLayout), ((sfxLayout) << 8) | (spec)) #define AUDIO_SET_SPEC_ALT(sfxLayout, spec) Audio_SetAudioSpec((sfxLayout), ((sfxLayout) << 8) | (spec))
// used by sys or related
void AudioLoad_Init(void);
void Audio_dummy_80016A50(void);
void Audio_InitSounds(void);
void Audio_Update(void);
SPTask* AudioThread_CreateTask(void);
void AudioThread_PreNMIReset(void);
typedef enum AudioType { typedef enum AudioType {
/* 0 */ AUDIO_TYPE_MUSIC, /* 0 */ AUDIO_TYPE_MUSIC,
/* 1 */ AUDIO_TYPE_VOICE, /* 1 */ AUDIO_TYPE_VOICE,
@ -17,6 +36,20 @@ typedef enum AudioType {
/* 3 */ AUDIO_TYPE_MAX, /* 3 */ AUDIO_TYPE_MAX,
} AudioType; } AudioType;
typedef enum {
/* 0 */ SOUNDMODE_STEREO,
/* 1 */ SOUNDMODE_HEADSET,
/* 2 */ SOUNDMODE_SURROUND,
/* 3 */ SOUNDMODE_MONO
} SoundMode;
typedef enum OptionSoundMode {
/* 0 */ OPTIONSOUND_STEREO,
/* 1 */ OPTIONSOUND_MONO,
/* 2 */ OPTIONSOUND_HEADSET,
/* 3 */ OPTIONSOUND_MAX,
} OptionSoundMode;
typedef enum { typedef enum {
/* 0 */ SFXCHAN_0, /* 0 */ SFXCHAN_0,
/* 1 */ SFXCHAN_1, /* 1 */ SFXCHAN_1,
@ -56,142 +89,4 @@ typedef enum {
/* 28 */ AUDIOSPEC_28, /* 28 */ AUDIOSPEC_28,
} AudioSpecID; } AudioSpecID;
typedef enum {
/* 0 */ SOUNDMODE_STEREO,
/* 1 */ SOUNDMODE_HEADSET,
/* 2 */ SOUNDMODE_SURROUND,
/* 3 */ SOUNDMODE_MONO
} SoundMode;
typedef enum BgmSeqIds {
/* 0 */ SEQ_ID_SFX,
/* 1 */ SEQ_ID_VOICE,
/* 2 */ SEQ_ID_CORNERIA,
/* 3 */ SEQ_ID_METEO,
/* 4 */ SEQ_ID_TITANIA,
/* 5 */ SEQ_ID_SECTOR_X,
/* 6 */ SEQ_ID_ZONESS,
/* 7 */ SEQ_ID_AREA_6,
/* 8 */ SEQ_ID_VENOM_1,
/* 9 */ SEQ_ID_SECTOR_Y,
/* 10 */ SEQ_ID_FORTUNA,
/* 11 */ SEQ_ID_SOLAR,
/* 12 */ SEQ_ID_BOLSE,
/* 13 */ SEQ_ID_KATINA,
/* 14 */ SEQ_ID_AQUAS,
/* 15 */ SEQ_ID_SECTOR_Z,
/* 16 */ SEQ_ID_MACBETH,
/* 17 */ SEQ_ID_ANDROSS,
/* 18 */ SEQ_ID_CO_BOSS_1,
/* 19 */ SEQ_ID_ME_BOSS,
/* 20 */ SEQ_ID_TI_BOSS,
/* 21 */ SEQ_ID_SX_BOSS,
/* 22 */ SEQ_ID_ZO_BOSS,
/* 23 */ SEQ_ID_A6_BOSS,
/* 24 */ SEQ_ID_VE_BOSS,
/* 25 */ SEQ_ID_SY_BOSS,
/* 26 */ SEQ_ID_UNK_26,
/* 27 */ SEQ_ID_SO_BOSS,
/* 28 */ SEQ_ID_BO_BOSS,
/* 29 */ SEQ_ID_KA_BOSS,
/* 30 */ SEQ_ID_AQ_BOSS,
/* 31 */ SEQ_ID_SZ_BOSS,
/* 32 */ SEQ_ID_MA_BOSS,
/* 33 */ SEQ_ID_AND_BOSS,
/* 34 */ SEQ_ID_TITLE,
/* 35 */ SEQ_ID_OPENING,
/* 36 */ SEQ_ID_MENU,
/* 37 */ SEQ_ID_CO_INTRO,
/* 38 */ SEQ_ID_GOOD_END,
/* 39 */ SEQ_ID_DEATH,
/* 40 */ SEQ_ID_GAME_OVER,
/* 41 */ SEQ_ID_UNK_41,
/* 42 */ SEQ_ID_ENDING,
/* 43 */ SEQ_ID_STAR_WOLF,
/* 44 */ SEQ_ID_INTRO_44,
/* 45 */ SEQ_ID_INTRO_45,
/* 46 */ SEQ_ID_VERSUS,
/* 47 */ SEQ_ID_VS_HURRY,
/* 48 */ SEQ_ID_CO_BOSS_2,
/* 49 */ SEQ_ID_BAD_END,
/* 50 */ SEQ_ID_ME_INTRO,
/* 51 */ SEQ_ID_INTRO_51,
/* 52 */ SEQ_ID_UNK_52,
/* 53 */ SEQ_ID_UNK_53,
/* 54 */ SEQ_ID_KATT,
/* 55 */ SEQ_ID_BILL,
/* 56 */ SEQ_ID_VS_MENU,
/* 57 */ SEQ_ID_UNK_57,
/* 58 */ SEQ_ID_WARP_ZONE,
/* 59 */ SEQ_ID_UNK_59,
/* 60 */ SEQ_ID_WORLD_MAP,
/* 61 */ SEQ_ID_AND_BRAIN,
/* 62 */ SEQ_ID_TO_ANDROSS,
/* 63 */ SEQ_ID_TRAINING,
/* 64 */ SEQ_ID_VE_CLEAR,
/* 65 */ SEQ_ID_BOSS_RESUME,
/* 66 */ SEQ_ID_MAX,
/* -1 */ SEQ_ID_NONE = 0xFFFF,
} BgmSeqIds;
#define SEQ_FLAG 0x8000
extern f32 gDefaultSfxSource[];
extern f32 gDefaultMod;
extern s8 gDefaultReverb;
void Audio_PlaySfx(u32 sfxId, f32* sfxSource, u8 token, f32* freqMod, f32* volMod, s8* reverbAdd);
void Audio_KillSfxByBank(u8 bankId);
void Audio_StopSfxByBankAndSource(u8 bankId, f32* sfxSource);
void Audio_KillSfxByBankAndSource(u8 bankId, f32* sfxSource);
void Audio_KillSfxBySource(f32* sfxSource);
void Audio_KillSfxBySourceAndId(f32* sfxSource, u32 sfxId);
void Audio_KillSfxByTokenAndId(u8 token, u32 sfxId);
void Audio_KillSfxById(u32 sfxId);
void Audio_PlayVoice(s32 msgId);
void Audio_PlayVoiceWithoutBGM(u32 msgId);
void Audio_ClearVoice(void);
s32 Audio_GetCurrentVoice(void);
s32 Audio_GetCurrentVoiceStatus(void);
void Audio_SetUnkVoiceParam(u8 unkVoiceParam);
u8* Audio_UpdateFrequencyAnalysis(void);
void Audio_StartPlayerNoise(u8 playerId);
void Audio_StopPlayerNoise(u8 playerId);
void Audio_InitBombSfx(u8 playerId, u8 type);
void Audio_PlayBombFlightSfx(u8 playerId, f32* sfxSource);
void Audio_PlayBombExplodeSfx(u8 playerId, f32* sfxSource);
void Audio_StopEngineNoise(f32* sfxSource);
void Audio_SetSfxSpeedModulation(f32 vel);
void Audio_SetTransposeAndPlaySfx(f32* sfxSource, u32 sfxId, u8 semitones);
void Audio_SetModulationAndPlaySfx(f32* sfxSource, u32 sfxId, f32 freqMod);
void Audio_PlaySfxModulated(f32* sfxSource, u32 sfxId);
void Audio_SetSfxMapModulation(u8 fMod);
void Audio_SetHeatAlarmParams(u8 shields, u8 heightParam);
void Audio_PlayEventSfx(f32* sfxSource, u16 eventSfxId);
void Audio_StopEventSfx(f32* sfxSource, u16 eventSfxId);
void Audio_SetEnvSfxReverb(s8 reverb);
void Audio_SetBgmParam(s8 bgmParam);
void Audio_PlaySequence(u8 seqPlayId, u16 seqId, u8 fadeinTime, u8 bgmParam);
void Audio_PlayFanfare(u16 seqId, u8 bgmVolume, u8 bgmFadeoutTime, u8 bgmFadeinTime);
void Audio_PlayDeathSequence(void);
void Audio_PlayPauseSfx(u8 active);
void Audio_PlayMapMenuSfx(u8 active);
void Audio_SetVolume(u8 audioType, u8 volume);
void Audio_PlaySoundTest(u8 enable);
void Audio_PlaySequenceDistorted(u8 seqPlayId, u16 seqId, u16 distortion, u8 fadeinTime, u8 unused);
void Audio_PlaySoundTestTrack(u8 trackNumber);
void Audio_FadeOutAll(u8 fadeoutTime);
void Audio_KillAllSfx(void);
void Audio_SetAudioSpec(u8 unused, u16 specParam);
void Audio_PlayBgm(u16 seqId);
// used by sys or related
void AudioLoad_Init(void);
void Audio_dummy_80016A50(void);
void Audio_InitSounds(void);
void Audio_Update(void);
SPTask* AudioThread_CreateTask(void);
void AudioThread_PreNMIReset(void);
#endif #endif

175
include/sfx.h
View File

@ -1,6 +1,41 @@
#ifndef SFX_H #ifndef SFX_H
#define SFX_H #define SFX_H
#include "sys.h"
extern f32 gDefaultSfxSource[];
extern f32 gDefaultMod;
extern s8 gDefaultReverb;
void Audio_PlaySfx(u32 sfxId, f32* sfxSource, u8 token, f32* freqMod, f32* volMod, s8* reverbAdd);
void Audio_KillSfxByBank(u8 bankId);
void Audio_StopSfxByBankAndSource(u8 bankId, f32* sfxSource);
void Audio_KillSfxByBankAndSource(u8 bankId, f32* sfxSource);
void Audio_KillSfxBySource(f32* sfxSource);
void Audio_KillSfxBySourceAndId(f32* sfxSource, u32 sfxId);
void Audio_KillSfxByTokenAndId(u8 token, u32 sfxId);
void Audio_KillSfxById(u32 sfxId);
void Audio_StartPlayerNoise(u8 playerId);
void Audio_StopPlayerNoise(u8 playerId);
void Audio_InitBombSfx(u8 playerId, u8 type);
void Audio_PlayBombFlightSfx(u8 playerId, f32* sfxSource);
void Audio_PlayBombExplodeSfx(u8 playerId, f32* sfxSource);
void Audio_StopEngineNoise(f32* sfxSource);
void Audio_SetSfxSpeedModulation(f32 vel);
void Audio_SetTransposeAndPlaySfx(f32* sfxSource, u32 sfxId, u8 semitones);
void Audio_SetModulationAndPlaySfx(f32* sfxSource, u32 sfxId, f32 freqMod);
void Audio_PlaySfxModulated(f32* sfxSource, u32 sfxId);
void Audio_SetSfxMapModulation(u8 fMod);
void Audio_SetHeatAlarmParams(u8 shields, u8 heightParam);
void Audio_PlayEventSfx(f32* sfxSource, u16 eventSfxId);
void Audio_StopEventSfx(f32* sfxSource, u16 eventSfxId);
void Audio_SetEnvSfxReverb(s8 reverb);
void Audio_PlayPauseSfx(u8 active);
void Audio_PlayMapMenuSfx(u8 active);
void Audio_KillAllSfx(void);
#define AUDIO_PLAY_SFX(sfxId, srcPos, token) (Audio_PlaySfx((sfxId),(srcPos),(token),&gDefaultMod,&gDefaultMod,&gDefaultReverb))
#define SFX_FLAG_18 (1 << 18) // makes distance ignore z position? probably more #define SFX_FLAG_18 (1 << 18) // makes distance ignore z position? probably more
#define SFX_FLAG_19 (1 << 19) #define SFX_FLAG_19 (1 << 19)
#define SFX_FLAG_20 (1 << 20) // make priority ignore distance #define SFX_FLAG_20 (1 << 20) // make priority ignore distance
@ -94,7 +129,7 @@ typedef enum SfxBankId {
#define NA_SE_ARWING_TWIN_LASER2 0x0940802B #define NA_SE_ARWING_TWIN_LASER2 0x0940802B
#define NA_SE_ARWING_WING_BROKEN 0x0900A02C #define NA_SE_ARWING_WING_BROKEN 0x0900A02C
#define NA_SE_LOCK_SEARCH 0x0900302D // Charge shot charge #define NA_SE_LOCK_SEARCH 0x0900302D // Charge shot charge
#define NA_SE_SPREAD_EXPLSION 0x0903502E // Charge shot/torpedo explode #define NA_SE_SPREAD_EXPLOSION 0x0903502E // Charge shot/torpedo explode
#define NA_SE_TANK_DASH 0x0900402F #define NA_SE_TANK_DASH 0x0900402F
#define NA_SE_MARINE_BOOST 0x09004030 #define NA_SE_MARINE_BOOST 0x09004030
#define NA_SE_MARINE_BRAKE 0x09004031 #define NA_SE_MARINE_BRAKE 0x09004031
@ -110,9 +145,9 @@ typedef enum SfxBankId {
#define NA_SE_OB_BLOCK_APPEAR 0x19122005 #define NA_SE_OB_BLOCK_APPEAR 0x19122005
#define NA_SE_OB_BOUND_M 0x19020006 #define NA_SE_OB_BOUND_M 0x19020006
#define NA_SE_OB_ROCK_BOUND 0x19030006 #define NA_SE_OB_ROCK_BOUND 0x19030006
#define NA_SE_OB_AC_ROCK_BOUND 0x19400007 #define NA_SE_OB_AQ_ROCK_BOUND 0x19400007
#define NA_SE_METALBOMB_REFLECT 0x19020008 #define NA_SE_METALBOMB_REFLECT 0x19020008
#define NA_SE_OB_MC_SWITCH_UP 0x19033008 #define NA_SE_OB_MA_SWITCH_UP 0x19033008
#define NA_SE_METALBOMB_BOUND 0x19030009 // Unreferenced. #define NA_SE_METALBOMB_BOUND 0x19030009 // Unreferenced.
#define NA_SE_TANK_SLIDE 0x1100000A #define NA_SE_TANK_SLIDE 0x1100000A
#define NA_SE_SPLASH_LEVEL_S 0x1100000B #define NA_SE_SPLASH_LEVEL_S 0x1100000B
@ -129,7 +164,7 @@ typedef enum SfxBankId {
#define NA_SE_OB_WATER_BOUND_M 0x19000014 #define NA_SE_OB_WATER_BOUND_M 0x19000014
#define NA_SE_OB_STEELFRAME 0x19500015 #define NA_SE_OB_STEELFRAME 0x19500015
#define NA_SE_EXPLOSION_DEMO2 0x11030016 #define NA_SE_EXPLOSION_DEMO2 0x11030016
#define NA_SE_KT_UFO_FALLING 0x11404016 #define NA_SE_KA_UFO_FALLING 0x11404016
#define NA_SE_IN_SPLASH_S 0x19800017 #define NA_SE_IN_SPLASH_S 0x19800017
#define NA_SE_OUT_SPLASH_S 0x19800018 // Unreferenced. #define NA_SE_OUT_SPLASH_S 0x19800018 // Unreferenced.
#define NA_SE_IN_SPLASH_L 0x19832019 #define NA_SE_IN_SPLASH_L 0x19832019
@ -144,7 +179,7 @@ typedef enum SfxBankId {
#define NA_SE_EN_GATHER_PARTS 0x11033022 #define NA_SE_EN_GATHER_PARTS 0x11033022
#define NA_SE_EN_HEARTBEAT 0x11003023 #define NA_SE_EN_HEARTBEAT 0x11003023
#define NA_SE_OB_SAND_BOUND_S 0x19000024 #define NA_SE_OB_SAND_BOUND_S 0x19000024
#define NA_SE_KT_UFO_ENGINE 0x11037025 #define NA_SE_KA_UFO_ENGINE 0x11037025
#define NA_SE_MAP_ZOOM_OUT 0x19000026 #define NA_SE_MAP_ZOOM_OUT 0x19000026
#define NA_SE_EN_BROKEN_SPARK 0x11000027 #define NA_SE_EN_BROKEN_SPARK 0x11000027
#define NA_SE_OB_SPARK_BEAM 0x11000028 #define NA_SE_OB_SPARK_BEAM 0x11000028
@ -170,16 +205,16 @@ typedef enum SfxBankId {
#define NA_SE_WARP_RING_5 0x1940443C #define NA_SE_WARP_RING_5 0x1940443C
#define NA_SE_WARP_RING_6 0x1940453D #define NA_SE_WARP_RING_6 0x1940453D
#define NA_SE_WARP_RING_7 0x1940463E #define NA_SE_WARP_RING_7 0x1940463E
#define NA_SE_KT_UFO_HATCH_OPEN 0x1903203F #define NA_SE_KA_UFO_HATCH_OPEN 0x1903203F
#define NA_SE_KT_UFO_HATCH_CLOSE 0x19032040 #define NA_SE_KA_UFO_HATCH_CLOSE 0x19032040
#define NA_SE_KT_UFO_CORE_OPEN 0x19032041 #define NA_SE_KA_UFO_CORE_OPEN 0x19032041
#define NA_SE_BO_CORE_APPEAR 0x19034041 #define NA_SE_BO_CORE_APPEAR 0x19034041
#define NA_SE_KT_UFO_HATCH_STOP 0x19034042 #define NA_SE_KA_UFO_HATCH_STOP 0x19034042
#define NA_SE_KT_UFO_LONG_CHARGE 0x11034043 #define NA_SE_KA_UFO_LONG_CHARGE 0x11034043
#define NA_SE_KT_UFO_LAST_CHARGE 0x19406044 #define NA_SE_KA_UFO_LAST_CHARGE 0x19406044
#define NA_SE_KT_UFO_BEAM 0x1140B045 #define NA_SE_KA_UFO_BEAM 0x1140B045
#define NA_SE_EXPLOSION_DEMO3 0x11038046 #define NA_SE_EXPLOSION_DEMO3 0x11038046
#define NA_SE_KT_UFO_BOUND 0x19408047 #define NA_SE_KA_UFO_BOUND 0x19408047
#define NA_SE_OB_BARRIER_RELEASE 0x19401048 #define NA_SE_OB_BARRIER_RELEASE 0x19401048
#define NA_SE_EN_SPACE_SNAKE 0x11032049 #define NA_SE_EN_SPACE_SNAKE 0x11032049
#define NA_SE_OB_ROCKWALL_UP 0x1913204A #define NA_SE_OB_ROCKWALL_UP 0x1913204A
@ -200,43 +235,43 @@ typedef enum SfxBankId {
#define NA_SE_OB_ROCK_CRASH 0x19032056 #define NA_SE_OB_ROCK_CRASH 0x19032056
#define NA_SE_OB_ROCK_EYE_OPEN 0x19030057 #define NA_SE_OB_ROCK_EYE_OPEN 0x19030057
#define NA_SE_OB_SHIP_FALLDOWN 0x19033058 #define NA_SE_OB_SHIP_FALLDOWN 0x19033058
#define NA_SE_EN_BMBOSS_BROKEN 0x19030059 #define NA_SE_EN_VEBOSS_BROKEN 0x19030059
#define NA_SE_OB_ARM_SWING 0x1903005A #define NA_SE_OB_ARM_SWING 0x1903005A
#define NA_SE_OB_POLE_MOVE 0x1903205B #define NA_SE_OB_POLE_MOVE 0x1903205B
#define NA_SE_OB_POLE_BOUND 0x1903205C #define NA_SE_OB_POLE_BOUND 0x1903205C
#define NA_SE_OB_HEAVY_SWITCH 0x1940405D #define NA_SE_OB_HEAVY_SWITCH 0x1940405D
#define NA_SE_OB_CONNECT_CUT 0x1940205E #define NA_SE_OB_CONNECT_CUT 0x1940205E
#define NA_SE_OB_MC_SWITCH_ON 0x1903205F #define NA_SE_OB_MA_SWITCH_ON 0x1903205F
#define NA_SE_OB_MC_SWITCH_GRN 0x19020060 #define NA_SE_OB_MA_SWITCH_GRN 0x19020060
#define NA_SE_OB_MC_SWITCH_RED 0x19020061 #define NA_SE_OB_MA_SWITCH_RED 0x19020061
#define NA_SE_OB_POST_UP 0x19001062 #define NA_SE_OB_POST_UP 0x19001062
#define NA_SE_OB_SIDE_GATE_CLOSE 0x11001063 #define NA_SE_OB_SIDE_GATE_CLOSE 0x11001063
#define NA_SE_OB_SPEAR_STICK 0x19032064 #define NA_SE_OB_SPEAR_STICK 0x19032064
#define NA_SE_RAILWAY_BOUND 0x19000065 #define NA_SE_RAILWAY_BOUND 0x19000065
#define NA_SE_EN_MCBOSS_HATCH 0x19034066 #define NA_SE_EN_MABOSS_HATCH 0x19034066
#define NA_SE_EN_MCBOSS_CHARGE0 0x19022067 #define NA_SE_EN_MABOSS_CHARGE0 0x19022067
#define NA_SE_EN_MCBOSS_SHOT0 0x19023068 #define NA_SE_EN_MABOSS_SHOT0 0x19023068
#define NA_SE_EN_MCBOSS_PLATECHARGE 0x19022069 #define NA_SE_EN_MABOSS_PLATECHARGE 0x19022069
#define NA_SE_VO_ANDORF_PUNCH 0x1940306A #define NA_SE_VO_ANDROSS_PUNCH 0x1940306A
#define NA_SE_VO_ANDORF_SLAP 0x1940306B #define NA_SE_VO_ANDROSS_SLAP 0x1940306B
#define NA_SE_VO_ANDORF_WHAND 0x1940306C #define NA_SE_VO_ANDROSS_WHAND 0x1940306C
#define NA_SE_VO_ANDORF_CHOKE 0x1940306D #define NA_SE_VO_ANDROSS_CHOKE 0x1940306D
#define NA_SE_VO_ANDORF_LAUGH 0x1940306E #define NA_SE_VO_ANDROSS_LAUGH 0x1940306E
#define NA_SE_VO_ANDORF_GROAN 0x1940306F #define NA_SE_VO_ANDROSS_GROAN 0x1940306F
#define NA_SE_VO_ANDORF_DEATH 0x19403070 #define NA_SE_VO_ANDROSS_DEATH 0x19403070
#define NA_SE_OB_ROOT_EXPLOSION0 0x11403071 #define NA_SE_OB_ROUTE_EXPLOSION0 0x11403071
#define NA_SE_OB_ROUTEGATE_OPEN_Q 0x19038072 #define NA_SE_OB_ROUTEGATE_OPEN_Q 0x19038072
#define NA_SE_EN_ANDORF_ROBOT 0x11030073 #define NA_SE_EN_ANDROSS_ROBOT 0x11030073
#define NA_SE_EN_ANDORF_BRAIN 0x11034074 #define NA_SE_EN_ANDROSS_BRAIN 0x11034074
#define NA_SE_EN_ANDORF_EYE 0x11032075 #define NA_SE_EN_ANDROSS_EYE 0x11032075
#define NA_SE_OB_ROOT_EXPLOSION1 0x11403076 #define NA_SE_OB_ROUTE_EXPLOSION1 0x11403076
#define NA_SE_OB_FISH_AWAY 0x19400077 #define NA_SE_OB_FISH_AWAY 0x19400077
#define NA_SE_OB_AC_PILLAR_BROKE 0x19021078 #define NA_SE_OB_AQ_PILLAR_BROKE 0x19021078
#define NA_SE_WARP_OUT 0x11407079 #define NA_SE_WARP_OUT 0x11407079
#define NA_SE_ARWING_HATCH 0x1950107A #define NA_SE_ARWING_HATCH 0x1950107A
#define NA_SE_OB_POINT_SWITCH 0x1940807B #define NA_SE_OB_POINT_SWITCH 0x1940807B
#define NA_SE_VO_ANDORF_EXCITE 0x1940307C #define NA_SE_VO_ANDROSS_EXCITE 0x1940307C
#define NA_SE_OB_PILLER_ROLL 0x1903407D #define NA_SE_OB_PILLAR_ROLL 0x1903407D
#define NA_SE_OB_ROUTEGATE_CLOSE_Q 0x1903807E #define NA_SE_OB_ROUTEGATE_CLOSE_Q 0x1903807E
#define NA_SE_OB_ROUTEGATE_OPEN_S 0x1903807F #define NA_SE_OB_ROUTEGATE_OPEN_S 0x1903807F
#define NA_SE_OB_ROUTEGATE_CLOSE_S 0x19038080 // events that play this are unused #define NA_SE_OB_ROUTEGATE_CLOSE_S 0x19038080 // events that play this are unused
@ -349,16 +384,16 @@ typedef enum SfxBankId {
#define NA_SE_EN_BURNER_L 0x3102505A #define NA_SE_EN_BURNER_L 0x3102505A
#define NA_SE_EN_GRN_BEAM_CHARGE 0x3103605B #define NA_SE_EN_GRN_BEAM_CHARGE 0x3103605B
#define NA_SE_EN_GRN_BEAM_SHOT 0x3102705C #define NA_SE_EN_GRN_BEAM_SHOT 0x3102705C
#define NA_SE_EN_ASBOSS_SHIELD 0x3102405D #define NA_SE_EN_MEBOSS_SHIELD 0x3102405D
#define NA_SE_EN_CATCH 0x2902405E #define NA_SE_EN_CATCH 0x2902405E
#define NA_SE_EN_PASS 0x2903305F #define NA_SE_EN_PASS 0x2903305F
#define NA_SE_EN_MS_EXPLOSION_S 0x2903A060 #define NA_SE_EN_MS_EXPLOSION_S 0x2903A060
#define NA_SE_EN_SZMIS_ENGINE 0x31032061 #define NA_SE_EN_SZMIS_ENGINE 0x31032061
#define NA_SE_EN_PUNCH_ENGINE 0x3103A061 #define NA_SE_EN_PUNCH_ENGINE 0x3103A061
#define NA_SE_EN_BARRIER_REFLECT 0x29001062 #define NA_SE_EN_BARRIER_REFLECT 0x29001062
#define NA_SE_EN_ANDORF_EXPLOSION 0x31009063 #define NA_SE_EN_ANDROSS_EXPLOSION 0x31009063
#define NA_SE_EN_SPARK_DAMAGE_M 0x29033064 #define NA_SE_EN_SPARK_DAMAGE_M 0x29033064
#define NA_SE_EN_BMBOSS_DAMAGE 0x31034064 #define NA_SE_EN_VEBOSS_DAMAGE 0x31034064
#define NA_SE_EN_ARM_SWING 0x29034065 #define NA_SE_EN_ARM_SWING 0x29034065
#define NA_SE_EN_COVER_OPEN 0x31404066 #define NA_SE_EN_COVER_OPEN 0x31404066
#define NA_SE_EN_COVER_CLOSE 0x31404067 #define NA_SE_EN_COVER_CLOSE 0x31404067
@ -371,47 +406,47 @@ typedef enum SfxBankId {
#define NA_SE_EN_MS_SHOT_L 0x2901306E #define NA_SE_EN_MS_SHOT_L 0x2901306E
#define NA_SE_EN_MS_SHIELD_BROKEN 0x2903A06F #define NA_SE_EN_MS_SHIELD_BROKEN 0x2903A06F
#define NA_SE_EN_MS_EXPLOSION_L 0x29000070 // Unreferenced. #define NA_SE_EN_MS_EXPLOSION_L 0x29000070 // Unreferenced.
#define NA_SE_OB_SNROCK_APPEAR 0x29000071 #define NA_SE_OB_SOROCK_APPEAR 0x29000071
#define NA_SE_OB_SNROCK_DISAPPEAR 0x29000072 #define NA_SE_OB_SOROCK_DISAPPEAR 0x29000072
#define NA_SE_EN_SNBOSS_CRY 0x29432073 #define NA_SE_EN_SOBOSS_CRY 0x29432073
#define NA_SE_EN_SNBOSS_DAMAGE 0x29433074 #define NA_SE_EN_SOBOSS_DAMAGE 0x29433074
#define NA_SE_EN_SNBOSS_BROKEN 0x29434075 #define NA_SE_EN_SOBOSS_BROKEN 0x29434075
#define NA_SE_EN_SNBOSS_DOWN 0x39439076 #define NA_SE_EN_SOBOSS_DOWN 0x39439076
#define NA_SE_EN_SNBOSS_SWING 0x29432077 #define NA_SE_EN_SOBOSS_SWING 0x29432077
#define NA_SE_EN_SNBOSS_BREATH 0x31033078 #define NA_SE_EN_SOBOSS_BREATH 0x31033078
#define NA_SE_EN_SNBOSS_ROLL 0x39033079 #define NA_SE_EN_SOBOSS_ROLL 0x39033079
#define NA_SE_EN_ANGLER_DAMAGE 0x2900007A // Unreferenced. #define NA_SE_EN_ANGLER_DAMAGE 0x2900007A // Unreferenced.
#define NA_SE_EN_ANGLER_DOWN 0x2900007B // Unreferenced. #define NA_SE_EN_ANGLER_DOWN 0x2900007B // Unreferenced.
#define NA_SE_UNK_7C 0x2100007C // Unreferenced. Sounds like many small explosions #define NA_SE_BANK2_UNK_7C 0x2100007C // Unreferenced. Sounds like many small explosions
#define NA_SE_ROCK_REFLECT 0x2902107D #define NA_SE_ROCK_REFLECT 0x2902107D
#define NA_SE_OB_MAGMA_BUBBLE 0x3140807E #define NA_SE_OB_MAGMA_BUBBLE 0x3140807E
#define NA_SE_UNK_7F 0x2900007F // Unreferenced. Sounds like an impact #define NA_SE_BANK2_UNK_7F 0x2900007F // Unreferenced. Sounds like an impact
#define NA_SE_OB_BMBOSS_WALK 0x29032080 #define NA_SE_OB_VEBOSS_WALK 0x29032080
#define NA_SE_OB_BMBOSS_JUMP 0x29033081 #define NA_SE_OB_VEBOSS_JUMP 0x29033081
#define NA_SE_OB_BMBOSS_LAND 0x29034082 #define NA_SE_OB_VEBOSS_LAND 0x29034082
#define NA_SE_OB_BMBOSS_ATTACK 0x31030083 #define NA_SE_OB_VEBOSS_ATTACK 0x31030083
#define NA_SE_OB_BMBOSS_BOUND 0x29405084 #define NA_SE_OB_VEBOSS_BOUND 0x29405084
#define NA_SE_EN_FREIGHT_TRAIN 0x31078085 #define NA_SE_EN_FREIGHT_TRAIN 0x31078085
#define NA_SE_EN_MCBOSS_REFLECT 0x29022086 #define NA_SE_EN_MABOSS_REFLECT 0x29022086
#define NA_SE_EN_ANDORF_BREATH 0x31022087 #define NA_SE_EN_ANDROSS_BREATH 0x31022087
#define NA_SE_EN_ANDORF_BITE0 0x29022088 #define NA_SE_EN_ANDROSS_BITE0 0x29022088
#define NA_SE_EN_ANDORF_BITE1 0x29022089 #define NA_SE_EN_ANDROSS_BITE1 0x29022089
#define NA_SE_EN_ANDORF_VOMIT 0x3140208A #define NA_SE_EN_ANDROSS_VOMIT 0x3140208A
#define NA_SE_EN_ANDORF_SPARK 0x3103108B #define NA_SE_EN_ANDROSS_SPARK 0x3103108B
#define NA_SE_EN_WT_THROW 0x2900308C #define NA_SE_EN_WT_THROW 0x2900308C
#define NA_SE_EN_WT_SPARK_CHARGE 0x2900208D #define NA_SE_EN_WT_SPARK_CHARGE 0x2900208D
#define NA_SE_EN_WT_SPARK_BEAM 0x3100208E #define NA_SE_EN_WT_SPARK_BEAM 0x3100208E
#define NA_SE_EN_AC_ZAKO_DAMAGE 0x2903408F #define NA_SE_EN_AQ_ZAKO_DAMAGE 0x2903408F
#define NA_SE_EN_AC_ZAKO_DOWN 0x29038090 #define NA_SE_EN_AQ_ZAKO_DOWN 0x29038090
#define NA_SE_EN_WARP_IN 0x39408091 #define NA_SE_EN_WARP_IN 0x39408091
#define NA_SE_EN_WARP_OUT 0x39408092 #define NA_SE_EN_WARP_OUT 0x39408092
#define NA_SE_EN_CLBOSS_CHARGE 0x39033093 #define NA_SE_EN_A6BOSS_CHARGE 0x39033093
#define NA_SE_EN_CLBOSS_BEAM 0x31405094 #define NA_SE_EN_A6BOSS_BEAM 0x31405094
#define NA_SE_EN_TRAIN_BREAK 0x31408095 #define NA_SE_EN_TRAIN_BREAK 0x31408095
#define NA_SE_EN_ANDORF_WARP 0x2940B096 #define NA_SE_EN_ANDROSS_WARP 0x2940B096
#define NA_SE_EN_ANDORF_CATCH 0x31408097 #define NA_SE_EN_ANDROSS_CATCH 0x31408097
#define NA_SE_EN_KANI_STOP 0x29030098 #define NA_SE_EN_KANI_STOP 0x29030098
#define NA_SE_EN_MCBOSS_RAGE 0x29036099 #define NA_SE_EN_MABOSS_RAGE 0x29036099
#define NA_SE_EN_DOWN_IMPACT 0x2940D09A #define NA_SE_EN_DOWN_IMPACT 0x2940D09A
#define NA_SE_EN_MARBLE_BEAM 0x3103109B #define NA_SE_EN_MARBLE_BEAM 0x3103109B
@ -456,7 +491,7 @@ typedef enum SfxBankId {
#define NA_SE_SHIELD_BUZZER 0x49001026 #define NA_SE_SHIELD_BUZZER 0x49001026
#define NA_SE_LOCK_ON 0x49008027 #define NA_SE_LOCK_ON 0x49008027
#define NA_SE_BOSS_GAUGE_OPEN 0x4900C028 #define NA_SE_BOSS_GAUGE_OPEN 0x4900C028
#define NA_SE_UNK_1 0x40000029 // Unreferenced. Sounds like an item collect jingle #define NA_SE_BANK4_UNK_1 0x40000029 // Unreferenced. Sounds like an item collect jingle
#define NA_SE_COUNTDOWN 0x4900C02A #define NA_SE_COUNTDOWN 0x4900C02A
#define NA_SE_VIEW_SITCHW_ON 0x4000002B // Unreferenced. Related to D_ctx_80177C70? #define NA_SE_VIEW_SITCHW_ON 0x4000002B // Unreferenced. Related to D_ctx_80177C70?
#define NA_SE_VIEW_MOVE_IN 0x4900002C #define NA_SE_VIEW_MOVE_IN 0x4900002C
@ -468,7 +503,7 @@ typedef enum SfxBankId {
#define NA_SE_VO_PEPPER_CONSENT 0x49000032 // This is ONE steep bill, but it's worth it. #define NA_SE_VO_PEPPER_CONSENT 0x49000032 // This is ONE steep bill, but it's worth it.
#define NA_SE_VO_PEPPER_SURPRISE 0x49000033 // WHAT?! #define NA_SE_VO_PEPPER_SURPRISE 0x49000033 // WHAT?!
#define NA_SE_MISSION_COMPLETE 0x49008034 #define NA_SE_MISSION_COMPLETE 0x49008034
#define NA_SE_UNK_2 0x40000035 // Unreferenced. Hard to make out what it is #define NA_SE_BANL4_UNK_2 0x40000035 // Unreferenced. Hard to make out what it is
#define NA_SE_TIME_OVER 0x4900D036 #define NA_SE_TIME_OVER 0x4900D036
#endif #endif

7
include/sys.h
View File

@ -65,11 +65,4 @@ typedef enum OptionState {
OPTION_UPDATE OPTION_UPDATE
} OptionState; } OptionState;
typedef enum OptionSoundMode {
OPTIONSOUND_STEREO,
OPTIONSOUND_MONO,
OPTIONSOUND_HEADSET,
OPTIONSOUND_MAX,
} OptionSoundMode;
#endif #endif

621
src/audio/audio_general.c
View File

@ -119,176 +119,151 @@ u32 sEventSfx[] = {
NA_SE_EN_MOTOR_STOP, NA_SE_EN_MS_DASH, NA_SE_EN_MOTOR_STOP, NA_SE_EN_MS_DASH,
NA_SE_OB_ROCK_CRASH, NA_SE_OB_ROCK_EYE_OPEN, NA_SE_OB_ROCK_CRASH, NA_SE_OB_ROCK_EYE_OPEN,
NA_SE_OB_SHIP_FALLDOWN, NA_SE_OB_ROCK_BOUND, NA_SE_OB_SHIP_FALLDOWN, NA_SE_OB_ROCK_BOUND,
NA_SE_OB_SPEAR_PILLAR, NA_SE_OB_PILLER_ROLL, NA_SE_OB_SPEAR_PILLAR, NA_SE_OB_PILLAR_ROLL,
NA_SE_SEARCHLIGHT_MISS, NA_SE_OB_ROUTEGATE_OPEN_Q, 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_Q, NA_SE_OB_ROUTEGATE_OPEN_S,
NA_SE_OB_ROUTEGATE_CLOSE_S, NA_SE_OB_LIFT, NA_SE_OB_ROUTEGATE_CLOSE_S, NA_SE_OB_LIFT,
NA_SE_OB_PLATE_ROLL, NA_SE_OB_PLATE_ROLL,
}; };
SoundTestTrack sSoundTestTracks[] = { SoundTestTrack sSoundTestTracks[] = {
/* 0 */ { SEQ_ID_OPENING, 22, -1 }, /* 0 */ { NA_BGM_OPENING, 22, -1 },
/* 1 */ { SEQ_ID_TITLE, 23, -1 }, /* 1 */ { NA_BGM_TITLE, 23, -1 },
/* 2 */ { SEQ_ID_MENU, 23, -1 }, /* 2 */ { NA_BGM_SELECT, 23, -1 },
/* 3 */ { SEQ_ID_WORLD_MAP, 280, -1 }, /* 3 */ { NA_BGM_MAP, 280, -1 },
/* 4 */ { SEQ_ID_CO_INTRO, 0, -1 }, /* 4 */ { NA_BGM_START_DEMO, 0, -1 },
/* 5 */ { SEQ_ID_INTRO_44, 1, -1 }, /* 5 */ { NA_BGM_START_DEMO_S, 1, -1 },
/* 6 */ { SEQ_ID_INTRO_45, 1, -1 }, /* 6 */ { NA_BGM_START_DEMO_M, 1, -1 },
/* 7 */ { SEQ_ID_ME_INTRO, 1, -1 }, /* 7 */ { NA_BGM_ME_START_DEMO, 1, -1 },
/* 8 */ { SEQ_ID_INTRO_51, 8, -1 }, /* 8 */ { NA_BGM_FO_START_DEMO, 8, -1 },
/* 9 */ { SEQ_ID_CORNERIA | SEQ_FLAG, 0, -1 }, /* 9 */ { NA_BGM_STAGE_CO, 0, -1 },
/* 10 */ { SEQ_ID_METEO | SEQ_FLAG, 1, -1 }, /* 10 */ { NA_BGM_STAGE_ME, 1, -1 },
/* 11 */ { SEQ_ID_TITANIA | SEQ_FLAG, 2, -1 }, /* 11 */ { NA_BGM_STAGE_TI, 2, -1 },
/* 12 */ { SEQ_ID_SECTOR_X | SEQ_FLAG, 3, -1 }, /* 12 */ { NA_BGM_STAGE_SX, 3, -1 },
/* 13 */ { SEQ_ID_ZONESS | SEQ_FLAG, 4, -1 }, /* 13 */ { NA_BGM_STAGE_ZO, 4, -1 },
/* 14 */ { SEQ_ID_AREA_6 | SEQ_FLAG, 5, -1 }, /* 14 */ { NA_BGM_STAGE_A6, 5, -1 },
/* 15 */ { SEQ_ID_VENOM_1 | SEQ_FLAG, 6, -1 }, /* 15 */ { NA_BGM_STAGE_VE1, 6, -1 },
/* 16 */ { SEQ_ID_SECTOR_Y | SEQ_FLAG, 7, -1 }, /* 16 */ { NA_BGM_STAGE_SY, 7, -1 },
/* 17 */ { SEQ_ID_FORTUNA | SEQ_FLAG, 8, -1 }, /* 17 */ { NA_BGM_STAGE_FO, 8, -1 },
/* 18 */ { SEQ_ID_BOLSE | SEQ_FLAG, 10, -1 }, /* 18 */ { NA_BGM_STAGE_BO, 10, -1 },
/* 19 */ { SEQ_ID_KATINA | SEQ_FLAG, 11, -1 }, /* 19 */ { NA_BGM_STAGE_KA, 11, -1 },
/* 20 */ { SEQ_ID_AQUAS, 12, -1 }, /* 20 */ { NA_BGM_STAGE_AQ, 12, -1 },
/* 21 */ { SEQ_ID_WARP_ZONE | SEQ_FLAG, 1, -1 }, /* 21 */ { NA_BGM_STAGE_WZ, 1, -1 },
/* 22 */ { SEQ_ID_KATT, 13, -1 }, /* 22 */ { NA_BGM_KATT, 13, -1 },
/* 23 */ { SEQ_ID_BILL, 11, -1 }, /* 23 */ { NA_BGM_BILL, 11, -1 },
/* 24 */ { SEQ_ID_CO_BOSS_1 | SEQ_FLAG, 0, -1 }, /* 24 */ { NA_BGM_BOSS_CO, 0, -1 },
/* 25 */ { SEQ_ID_ME_BOSS | SEQ_FLAG, 1, 0 }, /* 25 */ { NA_BGM_BOSS_ME, 1, 0 },
/* 26 */ { SEQ_ID_ME_BOSS | SEQ_FLAG, 1, -1 }, /* 26 */ { NA_BGM_BOSS_ME, 1, -1 },
/* 27 */ { SEQ_ID_BOSS_RESUME | SEQ_FLAG, 7, -1 }, /* 27 */ { NA_BGM_REAL_BOSS, 7, -1 },
/* 28 */ { SEQ_ID_BO_BOSS | SEQ_FLAG, 10, -1 }, /* 28 */ { NA_BGM_BOSS_BO, 10, -1 },
/* 29 */ { SEQ_ID_STAR_WOLF | SEQ_FLAG, 6, -1 }, /* 29 */ { NA_BGM_STARWOLF, 6, -1 },
/* 30 */ { SEQ_ID_GOOD_END, 0, -1 }, /* 30 */ { NA_BGM_COURSE_CLEAR, 0, -1 },
/* 31 */ { SEQ_ID_BAD_END, 0, -1 }, /* 31 */ { NA_BGM_COURSE_FAILURE, 0, -1 },
/* 32 */ { SEQ_ID_DEATH, 0, -1 }, /* 32 */ { NA_BGM_PLAYER_DOWN, 0, -1 },
/* 33 */ { SEQ_ID_GAME_OVER, 25, -1 }, /* 33 */ { NA_BGM_GAME_OVER, 25, -1 },
/* 34 */ { SEQ_ID_TRAINING | SEQ_FLAG, 28, -1 }, /* 34 */ { NA_BGM_TRAINING, 28, -1 },
/* 35 */ { SEQ_ID_VERSUS | SEQ_FLAG, 784, -1 }, /* 35 */ { NA_BGM_BATTLE, 784, -1 },
/* 36 */ { SEQ_ID_VS_HURRY | SEQ_FLAG, 785, -1 }, /* 36 */ { NA_BGM_BATTLE_LAST, 785, -1 },
/* 37 */ { SEQ_ID_VS_MENU, 23, -1 }, /* 37 */ { NA_BGM_VS_SELECT, 23, -1 },
/* 38 */ { SEQ_ID_TO_ANDROSS | SEQ_FLAG, 6, 0 }, /* 38 */ { NA_BGM_DASH_INTO_BASE, 6, 0 },
/* 39 */ { SEQ_ID_ANDROSS | SEQ_FLAG, 23, -1 }, /* 39 */ { NA_BGM_STAGE_ANDROSS, 23, -1 },
/* 40 */ { SEQ_ID_AND_BOSS | SEQ_FLAG, 6, 0 }, /* 40 */ { NA_BGM_BOSS_ANDROSS, 6, 0 },
/* 41 */ { SEQ_ID_AND_BOSS | SEQ_FLAG, 6, -1 }, /* 41 */ { NA_BGM_BOSS_ANDROSS, 6, -1 },
/* 42 */ { SEQ_ID_AND_BRAIN | SEQ_FLAG, 6, -1 }, /* 42 */ { NA_BGM_ANDROSS_BRAIN, 6, -1 },
/* 43 */ { SEQ_ID_VE_CLEAR | SEQ_FLAG, 6, -1 }, /* 43 */ { NA_BGM_ALL_CLEAR, 6, -1 },
/* 44 */ { SEQ_ID_ENDING, 27, -1 }, /* 44 */ { NA_BGM_STAFF_ROLL, 27, -1 },
}; };
PlaylistCmd sPlaylists[][100] = { PlaylistCmd sPlaylists[][100] = {
{ {
{ 0, 0, SEQ_ID_CO_INTRO, 0, 255, 1620 }, { 0, 0, NA_BGM_START_DEMO, 0, 255, 1620 }, { 0, 0, NA_BGM_STAGE_CO, 0, 255, 2490 },
{ 0, 0, SEQ_ID_CORNERIA | SEQ_FLAG, 0, 255, 2490 }, { 1, 0, NA_BGM_STAGE_CO, 50, 255, 50 }, { 0, 0, NA_BGM_BOSS_CO, 0, 255, 1600 },
{ 1, 0, SEQ_ID_CORNERIA | SEQ_FLAG, 50, 255, 50 }, { 1, 0, NA_BGM_BOSS_CO, 1, 255, 50 }, { 0, 0, NA_BGM_COURSE_CLEAR, 0, 255, 1091 },
{ 0, 0, SEQ_ID_CO_BOSS_1 | SEQ_FLAG, 0, 255, 1600 }, { 1, 0, NA_BGM_COURSE_CLEAR, 100, 255, 100 }, { 0, 0, NA_BGM_ME_START_DEMO, 0, 255, 838 },
{ 1, 0, SEQ_ID_CO_BOSS_1 | SEQ_FLAG, 1, 255, 50 }, { 0, 0, NA_BGM_STAGE_ME, 0, 255, 1584 }, { 1, 0, NA_BGM_STAGE_ME, 50, 255, 50 },
{ 0, 0, SEQ_ID_GOOD_END, 0, 255, 1091 }, { 0, 0, NA_BGM_BOSS_ME, 0, 0, 1620 }, { 1, 0, NA_BGM_BOSS_ME, 1, 255, 50 },
{ 1, 0, SEQ_ID_GOOD_END, 100, 255, 100 }, { 0, 0, NA_BGM_REAL_BOSS, 0, 255, 1620 }, { 1, 0, NA_BGM_REAL_BOSS, 1, 255, 50 },
{ 0, 0, SEQ_ID_ME_INTRO, 0, 255, 838 }, { 0, 0, NA_BGM_COURSE_CLEAR, 0, 255, 1091 }, { 1, 0, NA_BGM_COURSE_CLEAR, 100, 255, 100 },
{ 0, 0, SEQ_ID_METEO | SEQ_FLAG, 0, 255, 1584 }, { 0, 0, NA_BGM_FO_START_DEMO, 0, 255, 241 }, { 0, 0, NA_BGM_STAGE_FO, 0, 255, 1632 },
{ 1, 0, SEQ_ID_METEO | SEQ_FLAG, 50, 255, 50 }, { 1, 0, NA_BGM_STAGE_FO, 100, 255, 100 }, { 0, 0, NA_BGM_STARWOLF, 0, 255, 2120 },
{ 0, 0, SEQ_ID_ME_BOSS | SEQ_FLAG, 0, 0, 1620 }, { 0, 0, NA_BGM_STAGE_FO, 0, 0, 450 }, { 1, 0, NA_BGM_STAGE_FO, 50, 255, 200 },
{ 1, 0, SEQ_ID_ME_BOSS | SEQ_FLAG, 1, 255, 50 }, { 0, 0, NA_BGM_COURSE_FAILURE, 0, 255, 1604 }, { 1, 0, NA_BGM_COURSE_FAILURE, 100, 255, 100 },
{ 0, 0, SEQ_ID_BOSS_RESUME | SEQ_FLAG, 0, 255, 1620 }, { 0, 0, NA_BGM_START_DEMO_S, 0, 255, 242 }, { 0, 0, NA_BGM_STAGE_SX, 0, 255, 2291 },
{ 1, 0, SEQ_ID_BOSS_RESUME | SEQ_FLAG, 1, 255, 50 }, { 1, 0, NA_BGM_STAGE_SX, 50, 255, 100 }, { 0, 0, NA_BGM_BOSS_SX, 0, 255, 1600 },
{ 0, 0, SEQ_ID_GOOD_END, 0, 255, 1091 }, { 1, 0, NA_BGM_BOSS_SX, 1, 255, 50 }, { 2, 0, NA_BGM_BOSS_SX, 0, 255, 1600 },
{ 1, 0, SEQ_ID_GOOD_END, 100, 255, 100 }, { 1, 0, NA_BGM_BOSS_SX, 1, 255, 50 }, { 0, 0, NA_BGM_COURSE_CLEAR, 0, 255, 1091 },
{ 0, 0, SEQ_ID_INTRO_51, 0, 255, 241 }, { 1, 0, NA_BGM_COURSE_CLEAR, 100, 255, 100 }, { 0, 0, NA_BGM_START_DEMO_M, 0, 255, 542 },
{ 0, 0, SEQ_ID_FORTUNA | SEQ_FLAG, 0, 255, 1632 }, { 0, 0, NA_BGM_STAGE_TI, 0, 255, 1920 }, { 1, 0, NA_BGM_STAGE_TI, 50, 255, 50 },
{ 1, 0, SEQ_ID_FORTUNA | SEQ_FLAG, 100, 255, 100 }, { 0, 0, NA_BGM_BOSS_TI, 0, 255, 1600 }, { 1, 0, NA_BGM_BOSS_TI, 1, 255, 50 },
{ 0, 0, SEQ_ID_STAR_WOLF | SEQ_FLAG, 0, 255, 2120 }, { 0, 0, NA_BGM_COURSE_CLEAR, 0, 255, 1091 }, { 1, 0, NA_BGM_COURSE_CLEAR, 100, 255, 100 },
{ 0, 0, SEQ_ID_FORTUNA | SEQ_FLAG, 0, 0, 450 }, { 0, 0, NA_BGM_BO_START_DEMO, 0, 255, 241 }, { 0, 0, NA_BGM_STAGE_BO, 0, 255, 1177 },
{ 1, 0, SEQ_ID_FORTUNA | SEQ_FLAG, 50, 255, 200 }, { 1, 0, NA_BGM_STAGE_BO, 100, 255, 100 }, { 0, 0, NA_BGM_BOSS_BO, 0, 255, 1115 },
{ 0, 0, SEQ_ID_BAD_END, 0, 255, 1604 }, { 1, 0, NA_BGM_BOSS_BO, 50, 255, 50 }, { 0, 0, NA_BGM_STARWOLF, 0, 255, 2120 },
{ 1, 0, SEQ_ID_BAD_END, 100, 255, 100 }, { 1, 0, NA_BGM_STARWOLF, 1, 255, 50 }, { 0, 0, NA_BGM_PLAYER_DOWN, 0, 255, 150 },
{ 0, 0, SEQ_ID_INTRO_44, 0, 255, 242 }, { 0, 0, NA_BGM_GAME_OVER, 0, 255, 1020 }, { 1, 0, NA_BGM_GAME_OVER, 100, 255, 100 },
{ 0, 0, SEQ_ID_SECTOR_X | SEQ_FLAG, 0, 255, 2291 }, { 255, 0, NA_BGM_STAGE_CO, 50, 255, 50 },
{ 1, 0, SEQ_ID_SECTOR_X | SEQ_FLAG, 50, 255, 100 },
{ 0, 0, SEQ_ID_SX_BOSS | SEQ_FLAG, 0, 255, 1600 },
{ 1, 0, SEQ_ID_SX_BOSS | SEQ_FLAG, 1, 255, 50 },
{ 2, 0, SEQ_ID_SX_BOSS | SEQ_FLAG, 0, 255, 1600 },
{ 1, 0, SEQ_ID_SX_BOSS | SEQ_FLAG, 1, 255, 50 },
{ 0, 0, SEQ_ID_GOOD_END, 0, 255, 1091 },
{ 1, 0, SEQ_ID_GOOD_END, 100, 255, 100 },
{ 0, 0, SEQ_ID_INTRO_45, 0, 255, 542 },
{ 0, 0, SEQ_ID_TITANIA | SEQ_FLAG, 0, 255, 1920 },
{ 1, 0, SEQ_ID_TITANIA | SEQ_FLAG, 50, 255, 50 },
{ 0, 0, SEQ_ID_TI_BOSS | SEQ_FLAG, 0, 255, 1600 },
{ 1, 0, SEQ_ID_TI_BOSS | SEQ_FLAG, 1, 255, 50 },
{ 0, 0, SEQ_ID_GOOD_END, 0, 255, 1091 },
{ 1, 0, SEQ_ID_GOOD_END, 100, 255, 100 },
{ 0, 0, SEQ_ID_INTRO_51, 0, 255, 241 },
{ 0, 0, SEQ_ID_BOLSE | SEQ_FLAG, 0, 255, 1177 },
{ 1, 0, SEQ_ID_BOLSE | SEQ_FLAG, 100, 255, 100 },
{ 0, 0, SEQ_ID_BO_BOSS | SEQ_FLAG, 0, 255, 1115 },
{ 1, 0, SEQ_ID_BO_BOSS | SEQ_FLAG, 50, 255, 50 },
{ 0, 0, SEQ_ID_STAR_WOLF | SEQ_FLAG, 0, 255, 2120 },
{ 1, 0, SEQ_ID_STAR_WOLF | SEQ_FLAG, 1, 255, 50 },
{ 0, 0, SEQ_ID_DEATH, 0, 255, 150 },
{ 0, 0, SEQ_ID_GAME_OVER, 0, 255, 1020 },
{ 1, 0, SEQ_ID_GAME_OVER, 100, 255, 100 },
{ 255, 0, SEQ_ID_CORNERIA | SEQ_FLAG, 50, 255, 50 },
}, },
{ {
{ 0, 0, SEQ_ID_CO_INTRO, 0, 255, 1620 }, { 0, 0, NA_BGM_START_DEMO, 0, 255, 1620 },
{ 0, 0, SEQ_ID_CORNERIA | SEQ_FLAG, 0, 255, 2490 }, { 0, 0, NA_BGM_STAGE_CO, 0, 255, 2490 },
{ 1, 0, SEQ_ID_CORNERIA | SEQ_FLAG, 50, 255, 50 }, { 1, 0, NA_BGM_STAGE_CO, 50, 255, 50 },
{ 0, 0, SEQ_ID_CO_BOSS_2 | SEQ_FLAG, 0, 255, 1620 }, { 0, 0, NA_BGM_BOSS_A_CARRIER, 0, 255, 1620 },
{ 1, 0, SEQ_ID_CO_BOSS_2 | SEQ_FLAG, 1, 255, 50 }, { 1, 0, NA_BGM_BOSS_A_CARRIER, 1, 255, 50 },
{ 0, 0, SEQ_ID_GOOD_END, 0, 255, 1091 }, { 0, 0, NA_BGM_COURSE_CLEAR, 0, 255, 1091 },
{ 1, 0, SEQ_ID_GOOD_END, 100, 255, 100 }, { 1, 0, NA_BGM_COURSE_CLEAR, 100, 255, 100 },
{ 0, 0, SEQ_ID_INTRO_44, 0, 255, 242 }, { 0, 0, NA_BGM_START_DEMO_S, 0, 255, 242 },
{ 0, 0, SEQ_ID_SECTOR_Y | SEQ_FLAG, 0, 255, 2096 }, { 0, 0, NA_BGM_STAGE_SY, 0, 255, 2096 },
{ 1, 0, SEQ_ID_SECTOR_Y | SEQ_FLAG, 50, 255, 50 }, { 1, 0, NA_BGM_STAGE_SY, 50, 255, 50 },
{ 0, 0, SEQ_ID_SY_BOSS | SEQ_FLAG, 0, 2, 1600 }, { 0, 0, NA_BGM_BOSS_SY, 0, 2, 1600 },
{ 1, 0, SEQ_ID_SY_BOSS | SEQ_FLAG, 1, 255, 50 }, { 1, 0, NA_BGM_BOSS_SY, 1, 255, 50 },
{ 0, 0, SEQ_ID_BOSS_RESUME | SEQ_FLAG, 0, 255, 1600 }, { 0, 0, NA_BGM_REAL_BOSS, 0, 255, 1600 },
{ 1, 0, SEQ_ID_BOSS_RESUME | SEQ_FLAG, 1, 255, 50 }, { 1, 0, NA_BGM_REAL_BOSS, 1, 255, 50 },
{ 0, 0, SEQ_ID_GOOD_END, 0, 255, 1091 }, { 0, 0, NA_BGM_COURSE_CLEAR, 0, 255, 1091 },
{ 1, 0, SEQ_ID_GOOD_END, 100, 255, 100 }, { 1, 0, NA_BGM_COURSE_CLEAR, 100, 255, 100 },
{ 0, 0, SEQ_ID_INTRO_51, 0, 255, 241 }, { 0, 0, NA_BGM_KA_START_DEMO, 0, 255, 241 },
{ 0, 0, SEQ_ID_KATINA | SEQ_FLAG, 0, 255, 2184 }, { 0, 0, NA_BGM_STAGE_KA, 0, 255, 2184 },
{ 1, 0, SEQ_ID_KATINA | SEQ_FLAG, 1, 255, 100 }, { 1, 0, NA_BGM_STAGE_KA, 1, 255, 100 },
{ 0, 0, SEQ_ID_KA_BOSS | SEQ_FLAG, 0, 1, 1115 }, { 0, 0, NA_BGM_BOSS_KA, 0, 1, 1115 },
{ 1, 0, SEQ_ID_KA_BOSS | SEQ_FLAG, 50, 255, 100 }, { 1, 0, NA_BGM_BOSS_KA, 50, 255, 100 },
{ 0, 0, SEQ_ID_GOOD_END, 0, 255, 1091 }, { 0, 0, NA_BGM_COURSE_CLEAR, 0, 255, 1091 },
{ 1, 0, SEQ_ID_GOOD_END, 100, 255, 100 }, { 1, 0, NA_BGM_COURSE_CLEAR, 100, 255, 100 },
{ 0, 0, SEQ_ID_INTRO_51, 0, 255, 250 }, { 0, 0, NA_BGM_SO_START_DEMO, 0, 255, 250 },
{ 0, 0, SEQ_ID_SOLAR | SEQ_FLAG, 0, 255, 1096 }, { 0, 0, NA_BGM_STAGE_SO, 0, 255, 1096 },
{ 3, 0, SEQ_ID_BILL, 0, 255, 1000 }, { 3, 0, NA_BGM_BILL, 0, 255, 1000 },
{ 1, 0, SEQ_ID_SOLAR | SEQ_FLAG, 50, 255, 50 }, { 1, 0, NA_BGM_STAGE_SO, 50, 255, 50 },
{ 0, 0, SEQ_ID_SO_BOSS | SEQ_FLAG, 0, 255, 1600 }, { 0, 0, NA_BGM_BOSS_SO, 0, 255, 1600 },
{ 1, 0, SEQ_ID_SO_BOSS | SEQ_FLAG, 1, 255, 50 }, { 1, 0, NA_BGM_BOSS_SO, 1, 255, 50 },
{ 0, 0, SEQ_ID_GOOD_END, 0, 255, 1091 }, { 0, 0, NA_BGM_COURSE_CLEAR, 0, 255, 1091 },
{ 1, 0, SEQ_ID_GOOD_END, 100, 255, 100 }, { 1, 0, NA_BGM_COURSE_CLEAR, 100, 255, 100 },
{ 0, 0, SEQ_ID_INTRO_44, 0, 255, 260 }, { 0, 0, NA_BGM_START_DEMO_S, 0, 255, 260 },
{ 0, 0, SEQ_ID_MACBETH | SEQ_FLAG, 0, 255, 1920 }, { 0, 0, NA_BGM_STAGE_MA, 0, 255, 1920 },
{ 1, 0, SEQ_ID_MACBETH | SEQ_FLAG, 50, 255, 50 }, { 1, 0, NA_BGM_STAGE_MA, 50, 255, 50 },
{ 0, 0, SEQ_ID_MA_BOSS | SEQ_FLAG, 0, 255, 1600 }, { 0, 0, NA_BGM_BOSS_MA, 0, 255, 1600 },
{ 1, 0, SEQ_ID_MA_BOSS | SEQ_FLAG, 1, 255, 50 }, { 1, 0, NA_BGM_BOSS_MA, 1, 255, 50 },
{ 0, 0, SEQ_ID_GOOD_END, 0, 255, 1091 }, { 0, 0, NA_BGM_COURSE_CLEAR, 0, 255, 1091 },
{ 1, 0, SEQ_ID_GOOD_END, 100, 255, 100 }, { 1, 0, NA_BGM_COURSE_CLEAR, 100, 255, 100 },
{ 0, 0, SEQ_ID_INTRO_51, 0, 255, 241 }, { 0, 0, NA_BGM_BO_START_DEMO, 0, 255, 241 },
{ 0, 0, SEQ_ID_BOLSE | SEQ_FLAG, 0, 255, 1177 }, { 0, 0, NA_BGM_STAGE_BO, 0, 255, 1177 },
{ 1, 0, SEQ_ID_BOLSE | SEQ_FLAG, 100, 255, 100 }, { 1, 0, NA_BGM_STAGE_BO, 100, 255, 100 },
{ 0, 0, SEQ_ID_BO_BOSS | SEQ_FLAG, 0, 255, 1115 }, { 0, 0, NA_BGM_BOSS_BO, 0, 255, 1115 },
{ 1, 0, SEQ_ID_BO_BOSS | SEQ_FLAG, 50, 255, 50 }, { 1, 0, NA_BGM_BOSS_BO, 50, 255, 50 },
{ 0, 0, SEQ_ID_STAR_WOLF | SEQ_FLAG, 0, 255, 2120 }, { 0, 0, NA_BGM_STARWOLF, 0, 255, 2120 },
{ 1, 0, SEQ_ID_STAR_WOLF | SEQ_FLAG, 1, 255, 50 }, { 1, 0, NA_BGM_STARWOLF, 1, 255, 50 },
{ 0, 0, SEQ_ID_GOOD_END, 0, 255, 1091 }, { 0, 0, NA_BGM_COURSE_CLEAR, 0, 255, 1091 },
{ 1, 0, SEQ_ID_GOOD_END, 100, 255, 100 }, { 1, 0, NA_BGM_COURSE_CLEAR, 100, 255, 100 },
{ 0, 0, SEQ_ID_VENOM_1 | SEQ_FLAG, 0, 255, 1671 }, { 0, 0, NA_BGM_STAGE_VE1, 0, 255, 1671 },
{ 1, 0, SEQ_ID_VENOM_1 | SEQ_FLAG, 50, 255, 50 }, { 1, 0, NA_BGM_STAGE_VE1, 50, 255, 50 },
{ 0, 0, SEQ_ID_VE_BOSS | SEQ_FLAG, 0, 255, 1600 }, { 0, 0, NA_BGM_BOSS_VE, 0, 255, 1600 },
{ 1, 0, SEQ_ID_VE_BOSS | SEQ_FLAG, 1, 255, 50 }, { 1, 0, NA_BGM_BOSS_VE, 1, 255, 50 },
{ 0, 0, SEQ_ID_TO_ANDROSS | SEQ_FLAG, 0, 0, 176 }, { 0, 0, NA_BGM_DASH_INTO_BASE, 0, 0, 176 },
{ 0, 0, SEQ_ID_ANDROSS | SEQ_FLAG, 0, 255, 588 }, { 0, 0, NA_BGM_STAGE_ANDROSS, 0, 255, 588 },
{ 0, 0, SEQ_ID_AND_BOSS | SEQ_FLAG, 0, 0, 2420 }, { 0, 0, NA_BGM_BOSS_ANDROSS, 0, 0, 2420 },
{ 1, 0, SEQ_ID_AND_BOSS | SEQ_FLAG, 10, 255, 50 }, { 1, 0, NA_BGM_BOSS_ANDROSS, 10, 255, 50 },
{ 0, 0, SEQ_ID_AND_BOSS | SEQ_FLAG, 0, 255, 1200 }, { 0, 0, NA_BGM_BOSS_ANDROSS, 0, 255, 1200 },
{ 1, 0, SEQ_ID_AND_BOSS | SEQ_FLAG, 1, 255, 150 }, { 1, 0, NA_BGM_BOSS_ANDROSS, 1, 255, 150 },
{ 0, 0, SEQ_ID_VE_CLEAR | SEQ_FLAG, 0, 255, 1091 }, { 0, 0, NA_BGM_ALL_CLEAR, 0, 255, 1091 },
{ 1, 0, SEQ_ID_VE_CLEAR | SEQ_FLAG, 80, 255, 160 }, { 1, 0, NA_BGM_ALL_CLEAR, 80, 255, 160 },
{ 0, 0, SEQ_ID_ENDING, 0, 255, 9500 }, { 0, 0, NA_BGM_STAFF_ROLL, 0, 255, 9500 },
{ 255, 0, SEQ_ID_CORNERIA | SEQ_FLAG, 50, 255, 50 }, { 255, 0, NA_BGM_STAGE_CO, 50, 255, 50 },
{ 0 }, { 0 },
{ 0 }, { 0 },
{ 0 }, { 0 },
@ -330,190 +305,140 @@ PlaylistCmd sPlaylists[][100] = {
{ 0 }, { 0 },
}, },
{ {
{ 0, 0, SEQ_ID_CO_INTRO, 0, 255, 1620 }, { 0, 0, NA_BGM_START_DEMO, 0, 255, 1620 }, { 0, 0, NA_BGM_STAGE_CO, 0, 255, 2490 },
{ 0, 0, SEQ_ID_CORNERIA | SEQ_FLAG, 0, 255, 2490 }, { 1, 0, NA_BGM_STAGE_CO, 50, 255, 50 }, { 0, 0, NA_BGM_BOSS_A_CARRIER, 0, 255, 1620 },
{ 1, 0, SEQ_ID_CORNERIA | SEQ_FLAG, 50, 255, 50 }, { 1, 0, NA_BGM_BOSS_A_CARRIER, 1, 255, 50 }, { 0, 0, NA_BGM_COURSE_CLEAR, 0, 255, 1091 },
{ 0, 0, SEQ_ID_CO_BOSS_2 | SEQ_FLAG, 0, 255, 1620 }, { 1, 0, NA_BGM_COURSE_CLEAR, 100, 255, 100 }, { 0, 0, NA_BGM_START_DEMO_S, 0, 255, 260 },
{ 1, 0, SEQ_ID_CO_BOSS_2 | SEQ_FLAG, 1, 255, 50 }, { 0, 0, NA_BGM_STAGE_SY, 0, 255, 2096 }, { 1, 0, NA_BGM_STAGE_SY, 50, 255, 50 },
{ 0, 0, SEQ_ID_GOOD_END, 0, 255, 1091 }, { 0, 0, NA_BGM_BOSS_SY, 0, 2, 1590 }, { 1, 0, NA_BGM_BOSS_SY, 1, 255, 50 },
{ 1, 0, SEQ_ID_GOOD_END, 100, 255, 100 }, { 0, 0, NA_BGM_REAL_BOSS, 0, 255, 1600 }, { 1, 0, NA_BGM_REAL_BOSS, 1, 255, 50 },
{ 0, 0, SEQ_ID_INTRO_44, 0, 255, 260 }, { 0, 0, NA_BGM_COURSE_CLEAR, 0, 255, 1091 }, { 1, 0, NA_BGM_COURSE_CLEAR, 100, 255, 100 },
{ 0, 0, SEQ_ID_SECTOR_Y | SEQ_FLAG, 0, 255, 2096 }, { 0, 0, NA_BGM_START_DEMO_S, 0, 255, 260 }, { 0, 0, NA_BGM_STAGE_AQ, 0, 255, 2400 },
{ 1, 0, SEQ_ID_SECTOR_Y | SEQ_FLAG, 50, 255, 50 }, { 1, 0, NA_BGM_STAGE_AQ, 150, 255, 200 }, { 0, 0, NA_BGM_BOSS_AQ, 0, 1, 1590 },
{ 0, 0, SEQ_ID_SY_BOSS | SEQ_FLAG, 0, 2, 1590 }, { 1, 0, NA_BGM_BOSS_AQ, 1, 255, 50 }, { 0, 0, NA_BGM_COURSE_CLEAR, 0, 255, 1091 },
{ 1, 0, SEQ_ID_SY_BOSS | SEQ_FLAG, 1, 255, 50 }, { 1, 0, NA_BGM_COURSE_CLEAR, 100, 255, 100 }, { 0, 0, NA_BGM_START_DEMO_S, 0, 255, 260 },
{ 0, 0, SEQ_ID_BOSS_RESUME | SEQ_FLAG, 0, 255, 1600 }, { 0, 0, NA_BGM_STAGE_ZO, 0, 255, 1005 }, { 3, 0, NA_BGM_KATT, 0, 255, 1000 },
{ 1, 0, SEQ_ID_BOSS_RESUME | SEQ_FLAG, 1, 255, 50 }, { 1, 0, NA_BGM_STAGE_ZO, 50, 255, 100 }, { 0, 0, NA_BGM_BOSS_ZO, 0, 255, 1600 },
{ 0, 0, SEQ_ID_GOOD_END, 0, 255, 1091 }, { 1, 0, NA_BGM_BOSS_ZO, 1, 255, 50 }, { 0, 0, NA_BGM_COURSE_CLEAR, 0, 255, 1091 },
{ 1, 0, SEQ_ID_GOOD_END, 100, 255, 100 }, { 1, 0, NA_BGM_COURSE_CLEAR, 100, 255, 100 }, { 0, 0, NA_BGM_SZ_START_DEMO, 0, 255, 241 },
{ 0, 0, SEQ_ID_INTRO_44, 0, 255, 260 }, { 0, 0, NA_BGM_STAGE_SZ, 0, 255, 1632 }, { 1, 0, NA_BGM_STAGE_SZ, 50, 255, 100 },
{ 0, 0, SEQ_ID_AQUAS, 0, 255, 2400 }, { 0, 0, NA_BGM_BOSS_SZ, 0, 1, 1310 }, { 3, 0, NA_BGM_KATT, 0, 255, 500 },
{ 1, 0, SEQ_ID_AQUAS, 150, 255, 200 }, { 1, 0, NA_BGM_BOSS_SZ, 1, 255, 50 }, { 0, 0, NA_BGM_COURSE_CLEAR, 0, 255, 1091 },
{ 0, 0, SEQ_ID_AQ_BOSS | SEQ_FLAG, 0, 1, 1590 }, { 1, 0, NA_BGM_COURSE_CLEAR, 100, 255, 100 }, { 0, 0, NA_BGM_A6_START_DEMO, 0, 255, 241 },
{ 1, 0, SEQ_ID_AQ_BOSS | SEQ_FLAG, 1, 255, 50 }, { 0, 0, NA_BGM_STAGE_A6, 0, 255, 1906 }, { 1, 0, NA_BGM_STAGE_A6, 50, 255, 100 },
{ 0, 0, SEQ_ID_GOOD_END, 0, 255, 1091 }, { 0, 0, NA_BGM_BOSS_A6, 0, 1, 1590 }, { 1, 0, NA_BGM_BOSS_A6, 1, 255, 50 },
{ 1, 0, SEQ_ID_GOOD_END, 100, 255, 100 }, { 0, 0, NA_BGM_COURSE_CLEAR, 0, 255, 1091 }, { 1, 0, NA_BGM_COURSE_CLEAR, 100, 255, 100 },
{ 0, 0, SEQ_ID_INTRO_44, 0, 255, 260 }, { 0, 0, NA_BGM_STARWOLF, 0, 255, 2120 }, { 1, 0, NA_BGM_STARWOLF, 30, 255, 150 },
{ 0, 0, SEQ_ID_ZONESS | SEQ_FLAG, 0, 255, 1005 }, { 0, 0, NA_BGM_DASH_INTO_BASE, 0, 0, 176 }, { 0, 0, NA_BGM_STAGE_ANDROSS, 0, 255, 588 },
{ 3, 0, SEQ_ID_KATT, 0, 255, 1000 }, { 0, 0, NA_BGM_BOSS_ANDROSS, 0, 0, 2392 }, { 1, 0, NA_BGM_BOSS_ANDROSS, 10, 255, 50 },
{ 1, 0, SEQ_ID_ZONESS | SEQ_FLAG, 50, 255, 100 }, { 0, 0, NA_BGM_ANDROSS_BRAIN, 0, 255, 1700 }, { 1, 0, NA_BGM_BOSS_ANDROSS, 10, 255, 250 },
{ 0, 0, SEQ_ID_ZO_BOSS | SEQ_FLAG, 0, 255, 1600 }, { 0, 0, NA_BGM_BOSS_A6, 0, 255, 1600 }, { 1, 0, NA_BGM_BOSS_A6, 1, 255, 50 },
{ 1, 0, SEQ_ID_ZO_BOSS | SEQ_FLAG, 1, 255, 50 }, { 0, 0, NA_BGM_ALL_CLEAR, 0, 255, 1091 }, { 1, 0, NA_BGM_ALL_CLEAR, 80, 255, 160 },
{ 0, 0, SEQ_ID_GOOD_END, 0, 255, 1091 }, { 0, 0, NA_BGM_STAFF_ROLL, 0, 255, 9250 }, { 255, 0, NA_BGM_STAGE_CO, 50, 255, 50 },
{ 1, 0, SEQ_ID_GOOD_END, 100, 255, 100 },
{ 0, 0, SEQ_ID_INTRO_51, 0, 255, 241 },
{ 0, 0, SEQ_ID_SECTOR_Z | SEQ_FLAG, 0, 255, 1632 },
{ 1, 0, SEQ_ID_SECTOR_Z | SEQ_FLAG, 50, 255, 100 },
{ 0, 0, SEQ_ID_SZ_BOSS | SEQ_FLAG, 0, 1, 1310 },
{ 3, 0, SEQ_ID_KATT, 0, 255, 500 },
{ 1, 0, SEQ_ID_SZ_BOSS | SEQ_FLAG, 1, 255, 50 },
{ 0, 0, SEQ_ID_GOOD_END, 0, 255, 1091 },
{ 1, 0, SEQ_ID_GOOD_END, 100, 255, 100 },
{ 0, 0, SEQ_ID_INTRO_51, 0, 255, 241 },
{ 0, 0, SEQ_ID_AREA_6 | SEQ_FLAG, 0, 255, 1906 },
{ 1, 0, SEQ_ID_AREA_6 | SEQ_FLAG, 50, 255, 100 },
{ 0, 0, SEQ_ID_A6_BOSS | SEQ_FLAG, 0, 1, 1590 },
{ 1, 0, SEQ_ID_A6_BOSS | SEQ_FLAG, 1, 255, 50 },
{ 0, 0, SEQ_ID_GOOD_END, 0, 255, 1091 },
{ 1, 0, SEQ_ID_GOOD_END, 100, 255, 100 },
{ 0, 0, SEQ_ID_STAR_WOLF | SEQ_FLAG, 0, 255, 2120 },
{ 1, 0, SEQ_ID_STAR_WOLF | SEQ_FLAG, 30, 255, 150 },
{ 0, 0, SEQ_ID_TO_ANDROSS | SEQ_FLAG, 0, 0, 176 },
{ 0, 0, SEQ_ID_ANDROSS | SEQ_FLAG, 0, 255, 588 },
{ 0, 0, SEQ_ID_AND_BOSS | SEQ_FLAG, 0, 0, 2392 },
{ 1, 0, SEQ_ID_AND_BOSS | SEQ_FLAG, 10, 255, 50 },
{ 0, 0, SEQ_ID_AND_BRAIN | SEQ_FLAG, 0, 255, 1700 },
{ 1, 0, SEQ_ID_AND_BOSS | SEQ_FLAG, 10, 255, 250 },
{ 0, 0, SEQ_ID_A6_BOSS | SEQ_FLAG, 0, 255, 1600 },
{ 1, 0, SEQ_ID_A6_BOSS | SEQ_FLAG, 1, 255, 50 },
{ 0, 0, SEQ_ID_VE_CLEAR | SEQ_FLAG, 0, 255, 1091 },
{ 1, 0, SEQ_ID_VE_CLEAR | SEQ_FLAG, 80, 255, 160 },
{ 0, 0, SEQ_ID_ENDING, 0, 255, 9250 },
{ 255, 0, SEQ_ID_CORNERIA | SEQ_FLAG, 50, 255, 50 },
}, },
{ {
{ 0, 0, SEQ_ID_CO_INTRO, 0, 255, 1620 }, { 0, 0, NA_BGM_START_DEMO, 0, 255, 1620 }, { 0, 0, NA_BGM_STAGE_CO, 0, 255, 2490 },
{ 0, 0, SEQ_ID_CORNERIA | SEQ_FLAG, 0, 255, 2490 }, { 1, 0, NA_BGM_STAGE_CO, 50, 255, 50 }, { 0, 0, NA_BGM_BOSS_CO, 0, 255, 1600 },
{ 1, 0, SEQ_ID_CORNERIA | SEQ_FLAG, 50, 255, 50 }, { 1, 0, NA_BGM_BOSS_CO, 1, 255, 50 }, { 0, 0, NA_BGM_COURSE_CLEAR, 0, 255, 1091 },
{ 0, 0, SEQ_ID_CO_BOSS_1 | SEQ_FLAG, 0, 255, 1600 }, { 1, 0, NA_BGM_COURSE_CLEAR, 100, 255, 100 }, { 0, 0, NA_BGM_ME_START_DEMO, 0, 255, 838 },
{ 1, 0, SEQ_ID_CO_BOSS_1 | SEQ_FLAG, 1, 255, 50 }, { 0, 0, NA_BGM_STAGE_ME, 0, 255, 1584 }, { 1, 0, NA_BGM_STAGE_ME, 150, 255, 150 },
{ 0, 0, SEQ_ID_GOOD_END, 0, 255, 1091 }, { 0, 0, NA_BGM_STAGE_WZ, 0, 255, 1635 }, { 1, 0, NA_BGM_STAGE_WZ, 150, 255, 150 },
{ 1, 0, SEQ_ID_GOOD_END, 100, 255, 100 }, { 0, 0, NA_BGM_KA_START_DEMO, 0, 255, 241 }, { 0, 0, NA_BGM_STAGE_KA, 0, 255, 2184 },
{ 0, 0, SEQ_ID_ME_INTRO, 0, 255, 838 }, { 1, 0, NA_BGM_STAGE_KA, 1, 255, 100 }, { 0, 0, NA_BGM_BOSS_KA, 0, 1, 1115 },
{ 0, 0, SEQ_ID_METEO | SEQ_FLAG, 0, 255, 1584 }, { 1, 0, NA_BGM_BOSS_KA, 50, 255, 100 }, { 0, 0, NA_BGM_COURSE_FAILURE, 0, 255, 1604 },
{ 1, 0, SEQ_ID_METEO | SEQ_FLAG, 150, 255, 150 }, { 1, 0, NA_BGM_COURSE_FAILURE, 100, 255, 100 }, { 0, 0, NA_BGM_START_DEMO_S, 0, 255, 242 },
{ 0, 0, SEQ_ID_WARP_ZONE | SEQ_FLAG, 0, 255, 1635 }, { 0, 0, NA_BGM_STAGE_SX, 0, 255, 1291 }, { 3, 0, NA_BGM_BILL, 0, 255, 1000 },
{ 1, 0, SEQ_ID_WARP_ZONE | SEQ_FLAG, 150, 255, 150 }, { 1, 0, NA_BGM_STAGE_SX, 50, 255, 100 }, { 0, 0, NA_BGM_STAGE_WZ, 0, 255, 1635 },
{ 0, 0, SEQ_ID_INTRO_51, 0, 255, 241 }, { 1, 0, NA_BGM_STAGE_WZ, 150, 255, 150 }, { 0, 0, NA_BGM_SZ_START_DEMO, 0, 255, 241 },
{ 0, 0, SEQ_ID_KATINA | SEQ_FLAG, 0, 255, 2184 }, { 0, 0, NA_BGM_STAGE_SZ, 0, 255, 1632 }, { 1, 0, NA_BGM_STAGE_SZ, 50, 255, 100 },
{ 1, 0, SEQ_ID_KATINA | SEQ_FLAG, 1, 255, 100 }, { 0, 0, NA_BGM_BOSS_SZ, 0, 1, 1115 }, { 1, 0, NA_BGM_BOSS_SZ, 1, 255, 50 },
{ 0, 0, SEQ_ID_KA_BOSS | SEQ_FLAG, 0, 1, 1115 }, { 0, 0, NA_BGM_COURSE_CLEAR, 0, 255, 1091 }, { 1, 0, NA_BGM_COURSE_CLEAR, 100, 255, 100 },
{ 1, 0, SEQ_ID_KA_BOSS | SEQ_FLAG, 50, 255, 100 }, { 0, 0, NA_BGM_A6_START_DEMO, 0, 255, 241 }, { 0, 0, NA_BGM_STAGE_A6, 0, 255, 1906 },
{ 0, 0, SEQ_ID_BAD_END, 0, 255, 1604 }, { 1, 0, NA_BGM_STAGE_A6, 50, 255, 100 }, { 0, 0, NA_BGM_BOSS_A6, 0, 1, 1590 },
{ 1, 0, SEQ_ID_BAD_END, 100, 255, 100 }, { 1, 0, NA_BGM_BOSS_A6, 1, 255, 50 }, { 0, 0, NA_BGM_PLAYER_DOWN, 0, 255, 150 },
{ 0, 0, SEQ_ID_INTRO_44, 0, 255, 242 }, { 0, 0, NA_BGM_GAME_OVER, 0, 255, 1020 }, { 1, 0, NA_BGM_GAME_OVER, 100, 255, 100 },
{ 0, 0, SEQ_ID_SECTOR_X | SEQ_FLAG, 0, 255, 1291 }, { 255, 0, NA_BGM_STAGE_CO, 50, 255, 50 },
{ 3, 0, SEQ_ID_BILL, 0, 255, 1000 },
{ 1, 0, SEQ_ID_SECTOR_X | SEQ_FLAG, 50, 255, 100 },
{ 0, 0, SEQ_ID_WARP_ZONE | SEQ_FLAG, 0, 255, 1635 },
{ 1, 0, SEQ_ID_WARP_ZONE | SEQ_FLAG, 150, 255, 150 },
{ 0, 0, SEQ_ID_INTRO_51, 0, 255, 241 },
{ 0, 0, SEQ_ID_SECTOR_Z | SEQ_FLAG, 0, 255, 1632 },
{ 1, 0, SEQ_ID_SECTOR_Z | SEQ_FLAG, 50, 255, 100 },
{ 0, 0, SEQ_ID_SZ_BOSS | SEQ_FLAG, 0, 1, 1115 },
{ 1, 0, SEQ_ID_SZ_BOSS | SEQ_FLAG, 1, 255, 50 },
{ 0, 0, SEQ_ID_GOOD_END, 0, 255, 1091 },
{ 1, 0, SEQ_ID_GOOD_END, 100, 255, 100 },
{ 0, 0, SEQ_ID_INTRO_51, 0, 255, 241 },
{ 0, 0, SEQ_ID_AREA_6 | SEQ_FLAG, 0, 255, 1906 },
{ 1, 0, SEQ_ID_AREA_6 | SEQ_FLAG, 50, 255, 100 },
{ 0, 0, SEQ_ID_A6_BOSS | SEQ_FLAG, 0, 1, 1590 },
{ 1, 0, SEQ_ID_A6_BOSS | SEQ_FLAG, 1, 255, 50 },
{ 0, 0, SEQ_ID_DEATH, 0, 255, 150 },
{ 0, 0, SEQ_ID_GAME_OVER, 0, 255, 1020 },
{ 1, 0, SEQ_ID_GAME_OVER, 100, 255, 100 },
{ 255, 0, SEQ_ID_CORNERIA | SEQ_FLAG, 50, 255, 50 },
}, },
{ {
{ 0, 0, SEQ_ID_OPENING, 0, 255, 2926 }, { 0, 0, NA_BGM_OPENING, 0, 255, 2926 },
{ 0, 0, SEQ_ID_TITLE, 0, 255, 1251 }, { 0, 0, NA_BGM_TITLE, 0, 255, 1251 },
{ 1, 0, SEQ_ID_TITLE, 200, 255, 200 }, { 1, 0, NA_BGM_TITLE, 200, 255, 200 },
{ 0, 0, SEQ_ID_MENU, 0, 255, 1636 }, { 0, 0, NA_BGM_SELECT, 0, 255, 1636 },
{ 1, 0, SEQ_ID_MENU, 200, 255, 200 }, { 1, 0, NA_BGM_SELECT, 200, 255, 200 },
{ 0, 0, SEQ_ID_WORLD_MAP, 0, 255, 1560 }, { 0, 0, NA_BGM_MAP, 0, 255, 1560 },
{ 1, 0, SEQ_ID_WORLD_MAP, 200, 255, 200 }, { 1, 0, NA_BGM_MAP, 200, 255, 200 },
{ 0, 0, SEQ_ID_CO_INTRO, 0, 255, 1618 }, { 0, 0, NA_BGM_START_DEMO, 0, 255, 1618 },
{ 0, 0, SEQ_ID_INTRO_44, 0, 255, 242 }, { 0, 0, NA_BGM_START_DEMO_S, 0, 255, 242 },
{ 0, 0, SEQ_ID_INTRO_45, 0, 255, 582 }, { 0, 0, NA_BGM_START_DEMO_M, 0, 255, 582 },
{ 0, 0, SEQ_ID_ME_INTRO, 0, 255, 868 }, { 0, 0, NA_BGM_ME_START_DEMO, 0, 255, 868 },
{ 0, 0, SEQ_ID_INTRO_51, 0, 255, 281 }, { 0, 0, NA_BGM_FO_START_DEMO, 0, 255, 281 },
{ 0, 0, SEQ_ID_CORNERIA | SEQ_FLAG, 0, 255, 2490 }, { 0, 0, NA_BGM_STAGE_CO, 0, 255, 2490 },
{ 1, 0, SEQ_ID_CORNERIA | SEQ_FLAG, 200, 255, 200 }, { 1, 0, NA_BGM_STAGE_CO, 200, 255, 200 },
{ 0, 0, SEQ_ID_METEO | SEQ_FLAG, 0, 255, 1584 }, { 0, 0, NA_BGM_STAGE_ME, 0, 255, 1584 },
{ 1, 0, SEQ_ID_METEO | SEQ_FLAG, 200, 255, 200 }, { 1, 0, NA_BGM_STAGE_ME, 200, 255, 200 },
{ 0, 0, SEQ_ID_TITANIA | SEQ_FLAG, 0, 255, 1920 }, { 0, 0, NA_BGM_STAGE_TI, 0, 255, 1920 },
{ 1, 0, SEQ_ID_TITANIA | SEQ_FLAG, 200, 255, 200 }, { 1, 0, NA_BGM_STAGE_TI, 200, 255, 200 },
{ 0, 0, SEQ_ID_SECTOR_X | SEQ_FLAG, 0, 255, 2290 }, { 0, 0, NA_BGM_STAGE_SX, 0, 255, 2290 },
{ 1, 0, SEQ_ID_SECTOR_X | SEQ_FLAG, 200, 255, 200 }, { 1, 0, NA_BGM_STAGE_SX, 200, 255, 200 },
{ 0, 0, SEQ_ID_ZONESS | SEQ_FLAG, 0, 255, 2005 }, { 0, 0, NA_BGM_STAGE_ZO, 0, 255, 2005 },
{ 1, 0, SEQ_ID_ZONESS | SEQ_FLAG, 200, 255, 200 }, { 1, 0, NA_BGM_STAGE_ZO, 200, 255, 200 },
{ 0, 0, SEQ_ID_AREA_6 | SEQ_FLAG, 0, 255, 1905 }, { 0, 0, NA_BGM_STAGE_A6, 0, 255, 1905 },
{ 1, 0, SEQ_ID_AREA_6 | SEQ_FLAG, 200, 255, 200 }, { 1, 0, NA_BGM_STAGE_A6, 200, 255, 200 },
{ 0, 0, SEQ_ID_VENOM_1 | SEQ_FLAG, 0, 255, 1671 }, { 0, 0, NA_BGM_STAGE_VE1, 0, 255, 1671 },
{ 1, 0, SEQ_ID_VENOM_1 | SEQ_FLAG, 200, 255, 200 }, { 1, 0, NA_BGM_STAGE_VE1, 200, 255, 200 },
{ 0, 0, SEQ_ID_SECTOR_Y | SEQ_FLAG, 0, 255, 2095 }, { 0, 0, NA_BGM_STAGE_SY, 0, 255, 2095 },
{ 1, 0, SEQ_ID_SECTOR_Y | SEQ_FLAG, 200, 255, 200 }, { 1, 0, NA_BGM_STAGE_SY, 200, 255, 200 },
{ 0, 0, SEQ_ID_FORTUNA | SEQ_FLAG, 0, 255, 1632 }, { 0, 0, NA_BGM_STAGE_FO, 0, 255, 1632 },
{ 1, 0, SEQ_ID_FORTUNA | SEQ_FLAG, 200, 255, 200 }, { 1, 0, NA_BGM_STAGE_FO, 200, 255, 200 },
{ 0, 0, SEQ_ID_KATINA | SEQ_FLAG, 0, 255, 2184 }, { 0, 0, NA_BGM_STAGE_KA, 0, 255, 2184 },
{ 1, 0, SEQ_ID_KATINA | SEQ_FLAG, 200, 255, 200 }, { 1, 0, NA_BGM_STAGE_KA, 200, 255, 200 },
{ 0, 0, SEQ_ID_AQUAS, 0, 255, 2400 }, { 0, 0, NA_BGM_STAGE_AQ, 0, 255, 2400 },
{ 1, 0, SEQ_ID_AQUAS, 200, 255, 200 }, { 1, 0, NA_BGM_STAGE_AQ, 200, 255, 200 },
{ 0, 0, SEQ_ID_WARP_ZONE | SEQ_FLAG, 0, 255, 1635 }, { 0, 0, NA_BGM_STAGE_WZ, 0, 255, 1635 },
{ 1, 0, SEQ_ID_WARP_ZONE | SEQ_FLAG, 200, 255, 200 }, { 1, 0, NA_BGM_STAGE_WZ, 200, 255, 200 },
{ 0, 0, SEQ_ID_KATT, 0, 255, 389 }, { 0, 0, NA_BGM_KATT, 0, 255, 389 },
{ 0, 0, SEQ_ID_BILL, 0, 255, 268 }, { 0, 0, NA_BGM_BILL, 0, 255, 268 },
{ 0, 0, SEQ_ID_CO_BOSS_1 | SEQ_FLAG, 0, 255, 1598 }, { 0, 0, NA_BGM_BOSS_CO, 0, 255, 1598 },
{ 1, 0, SEQ_ID_CO_BOSS_1 | SEQ_FLAG, 200, 255, 200 }, { 1, 0, NA_BGM_BOSS_CO, 200, 255, 200 },
{ 0, 0, SEQ_ID_ME_BOSS | SEQ_FLAG, 0, 0, 1470 }, { 0, 0, NA_BGM_BOSS_ME, 0, 0, 1470 },
{ 1, 0, SEQ_ID_ME_BOSS | SEQ_FLAG, 200, 255, 200 }, { 1, 0, NA_BGM_BOSS_ME, 200, 255, 200 },
{ 0, 0, SEQ_ID_ME_BOSS | SEQ_FLAG, 0, 255, 1470 }, { 0, 0, NA_BGM_BOSS_ME, 0, 255, 1470 },
{ 1, 0, SEQ_ID_ME_BOSS | SEQ_FLAG, 200, 255, 200 }, { 1, 0, NA_BGM_BOSS_ME, 200, 255, 200 },
{ 0, 0, SEQ_ID_BOSS_RESUME | SEQ_FLAG, 0, 255, 1311 }, { 0, 0, NA_BGM_REAL_BOSS, 0, 255, 1311 },
{ 1, 0, SEQ_ID_BOSS_RESUME | SEQ_FLAG, 200, 255, 200 }, { 1, 0, NA_BGM_REAL_BOSS, 200, 255, 200 },
{ 0, 0, SEQ_ID_BO_BOSS | SEQ_FLAG, 0, 255, 1115 }, { 0, 0, NA_BGM_BOSS_BO, 0, 255, 1115 },
{ 1, 0, SEQ_ID_BO_BOSS | SEQ_FLAG, 200, 255, 200 }, { 1, 0, NA_BGM_BOSS_BO, 200, 255, 200 },
{ 0, 0, SEQ_ID_STAR_WOLF | SEQ_FLAG, 0, 255, 2120 }, { 0, 0, NA_BGM_STARWOLF, 0, 255, 2120 },
{ 1, 0, SEQ_ID_STAR_WOLF | SEQ_FLAG, 200, 255, 200 }, { 1, 0, NA_BGM_STARWOLF, 200, 255, 200 },
{ 0, 0, SEQ_ID_GOOD_END, 0, 255, 1091 }, { 0, 0, NA_BGM_COURSE_CLEAR, 0, 255, 1091 },
{ 1, 0, SEQ_ID_GOOD_END, 200, 255, 200 }, { 1, 0, NA_BGM_COURSE_CLEAR, 200, 255, 200 },
{ 0, 0, SEQ_ID_BAD_END, 0, 255, 1604 }, { 0, 0, NA_BGM_COURSE_FAILURE, 0, 255, 1604 },
{ 1, 0, SEQ_ID_BAD_END, 200, 255, 200 }, { 1, 0, NA_BGM_COURSE_FAILURE, 200, 255, 200 },
{ 0, 0, SEQ_ID_DEATH, 0, 255, 200 }, { 0, 0, NA_BGM_PLAYER_DOWN, 0, 255, 200 },
{ 0, 0, SEQ_ID_GAME_OVER, 0, 255, 1020 }, { 0, 0, NA_BGM_GAME_OVER, 0, 255, 1020 },
{ 1, 0, SEQ_ID_GAME_OVER, 200, 255, 200 }, { 1, 0, NA_BGM_GAME_OVER, 200, 255, 200 },
{ 0, 0, SEQ_ID_TRAINING | SEQ_FLAG, 0, 255, 900 }, { 0, 0, NA_BGM_TRAINING, 0, 255, 900 },
{ 1, 0, SEQ_ID_TRAINING | SEQ_FLAG, 200, 255, 200 }, { 1, 0, NA_BGM_TRAINING, 200, 255, 200 },
{ 0, 0, SEQ_ID_VS_MENU, 0, 255, 665 }, { 0, 0, NA_BGM_VS_SELECT, 0, 255, 665 },
{ 1, 0, SEQ_ID_VS_MENU, 200, 255, 200 }, { 1, 0, NA_BGM_VS_SELECT, 200, 255, 200 },
{ 0, 0, SEQ_ID_VERSUS | SEQ_FLAG, 0, 255, 1647 }, { 0, 0, NA_BGM_BATTLE, 0, 255, 1647 },
{ 1, 0, SEQ_ID_VERSUS | SEQ_FLAG, 200, 255, 200 }, { 1, 0, NA_BGM_BATTLE, 200, 255, 200 },
{ 0, 0, SEQ_ID_VS_HURRY | SEQ_FLAG, 0, 255, 1667 }, { 0, 0, NA_BGM_BATTLE_LAST, 0, 255, 1667 },
{ 1, 0, SEQ_ID_VS_HURRY | SEQ_FLAG, 200, 255, 200 }, { 1, 0, NA_BGM_BATTLE_LAST, 200, 255, 200 },
{ 0, 0, SEQ_ID_TO_ANDROSS | SEQ_FLAG, 0, 0, 176 }, { 0, 0, NA_BGM_DASH_INTO_BASE, 0, 0, 176 },
{ 0, 0, SEQ_ID_ANDROSS | SEQ_FLAG, 0, 255, 588 }, { 0, 0, NA_BGM_STAGE_ANDROSS, 0, 255, 588 },
{ 1, 0, SEQ_ID_ANDROSS | SEQ_FLAG, 200, 255, 200 }, { 1, 0, NA_BGM_STAGE_ANDROSS, 200, 255, 200 },
{ 0, 0, SEQ_ID_AND_BOSS | SEQ_FLAG, 0, 0, 2391 }, { 0, 0, NA_BGM_BOSS_ANDROSS, 0, 0, 2391 },
{ 1, 0, SEQ_ID_AND_BOSS | SEQ_FLAG, 200, 255, 200 }, { 1, 0, NA_BGM_BOSS_ANDROSS, 200, 255, 200 },
{ 0, 0, SEQ_ID_AND_BOSS | SEQ_FLAG, 0, 255, 2391 }, { 0, 0, NA_BGM_BOSS_ANDROSS, 0, 255, 2391 },
{ 1, 0, SEQ_ID_AND_BOSS | SEQ_FLAG, 200, 255, 200 }, { 1, 0, NA_BGM_BOSS_ANDROSS, 200, 255, 200 },
{ 0, 0, SEQ_ID_AND_BRAIN | SEQ_FLAG, 0, 255, 1700 }, { 0, 0, NA_BGM_ANDROSS_BRAIN, 0, 255, 1700 },
{ 1, 0, SEQ_ID_AND_BRAIN | SEQ_FLAG, 200, 255, 200 }, { 1, 0, NA_BGM_ANDROSS_BRAIN, 200, 255, 200 },
{ 0, 0, SEQ_ID_VE_CLEAR | SEQ_FLAG, 0, 255, 1459 }, { 0, 0, NA_BGM_ALL_CLEAR, 0, 255, 1459 },
{ 1, 0, SEQ_ID_VE_CLEAR | SEQ_FLAG, 200, 255, 200 }, { 1, 0, NA_BGM_ALL_CLEAR, 200, 255, 200 },
{ 0, 0, SEQ_ID_ENDING, 0, 255, 9250 }, { 0, 0, NA_BGM_STAFF_ROLL, 0, 255, 9250 },
{ 1, 0, SEQ_ID_ENDING, 200, 255, 200 }, { 1, 0, NA_BGM_STAFF_ROLL, 200, 255, 200 },
{ 255, 0, SEQ_ID_CORNERIA | SEQ_FLAG, 50, 255, 50 }, { 255, 0, NA_BGM_STAGE_CO, 50, 255, 50 },
}, },
}; };
@ -763,7 +688,7 @@ void Audio_LoadInstruments(void) {
void Audio_LoadAquasSequence(void) { void Audio_LoadAquasSequence(void) {
if (sAudioSpecId == AUDIOSPEC_12) { if (sAudioSpecId == AUDIOSPEC_12) {
AUDIOCMD_GLOBAL_SYNC_LOAD_SEQ_PARTS(SEQ_ID_AQUAS, 0); AUDIOCMD_GLOBAL_SYNC_LOAD_SEQ_PARTS(NA_BGM_STAGE_AQ, 0);
} }
} }
@ -2692,7 +2617,7 @@ void Audio_PlaySequence(u8 seqPlayId, u16 seqId, u8 fadeinTime, u8 bgmParam) {
} }
void Audio_PlayFanfare(u16 seqId, u8 bgmVolume, u8 bgmFadeoutTime, u8 bgmFadeinTime) { void Audio_PlayFanfare(u16 seqId, u8 bgmVolume, u8 bgmFadeoutTime, u8 bgmFadeinTime) {
if (Audio_GetActiveSeqId(SEQ_PLAYER_BGM) != SEQ_ID_DEATH) { if (Audio_GetActiveSeqId(SEQ_PLAYER_BGM) != NA_BGM_PLAYER_DOWN) {
Audio_SetSequenceFade(SEQ_PLAYER_BGM, 1, bgmVolume, bgmFadeoutTime); Audio_SetSequenceFade(SEQ_PLAYER_BGM, 1, bgmVolume, bgmFadeoutTime);
SEQCMD_SETUP_RESTORE_SEQPLAYER_VOLUME(SEQ_PLAYER_FANFARE, SEQ_PLAYER_BGM, bgmFadeinTime); SEQCMD_SETUP_RESTORE_SEQPLAYER_VOLUME(SEQ_PLAYER_FANFARE, SEQ_PLAYER_BGM, bgmFadeinTime);
SEQCMD_PLAY_SEQUENCE(SEQ_PLAYER_FANFARE, 0, 0, seqId); SEQCMD_PLAY_SEQUENCE(SEQ_PLAYER_FANFARE, 0, 0, seqId);
@ -2708,7 +2633,7 @@ void Audio_PlayDeathSequence(void) {
AUDIO_PLAY_SFX(NA_SE_ARWING_EXPLOSION, 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, NA_BGM_PLAYER_DOWN);
} else { } else {
for (i = 0; i < 5; i++) { for (i = 0; i < 5; i++) {
Audio_KillSfxByBank(i); Audio_KillSfxByBank(i);
@ -2717,7 +2642,7 @@ void Audio_PlayDeathSequence(void) {
AUDIO_PLAY_SFX(NA_SE_ARWING_EXPLOSION, 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, NA_BGM_PLAYER_DOWN);
} }
} }
@ -2772,13 +2697,13 @@ void Audio_SetVolume(u8 audioType, u8 volume) {
void Audio_PlaySoundTest(u8 enable) { void Audio_PlaySoundTest(u8 enable) {
switch (enable) { switch (enable) {
case false: case false:
AUDIO_PLAY_BGM(SEQ_ID_MENU); AUDIO_PLAY_BGM(NA_BGM_SELECT);
Audio_PlayVoice(1); Audio_PlayVoice(1);
Audio_KillSfxById(NA_SE_VOLUME_TEST); Audio_KillSfxById(NA_SE_VOLUME_TEST);
Audio_KillSfxById(NA_SE_ARWING_ENGIN_GRD); Audio_KillSfxById(NA_SE_ARWING_ENGIN_GRD);
break; break;
case true: case true:
AUDIO_PLAY_BGM(SEQ_ID_VERSUS); AUDIO_PLAY_BGM(NA_BGM_VOLUME_TEST);
Audio_PlayVoice(2); Audio_PlayVoice(2);
AUDIO_PLAY_SFX(NA_SE_VOLUME_TEST, gDefaultSfxSource, 0); AUDIO_PLAY_SFX(NA_SE_VOLUME_TEST, gDefaultSfxSource, 0);
AUDIO_PLAY_SFX(NA_SE_ARWING_ENGIN_GRD, gDefaultSfxSource, 0); AUDIO_PLAY_SFX(NA_SE_ARWING_ENGIN_GRD, gDefaultSfxSource, 0);
@ -2848,8 +2773,8 @@ void Audio_InitSounds(void) {
Audio_ResetSfxChannelState(); Audio_ResetSfxChannelState();
Audio_ResetActiveSequencesAndVolume(); Audio_ResetActiveSequencesAndVolume();
Audio_ResetSfx(); Audio_ResetSfx();
Audio_StartSequence(SEQ_PLAYER_VOICE, SEQ_ID_VOICE, 0xFF, 1); Audio_StartSequence(SEQ_PLAYER_VOICE, NA_BGM_VO, 0xFF, 1);
Audio_StartSequence(SEQ_PLAYER_SFX, SEQ_ID_SFX, 0xFF, 10); Audio_StartSequence(SEQ_PLAYER_SFX, NA_BGM_SE, 0xFF, 10);
} }
void Audio_RestartSeqPlayers(void) { void Audio_RestartSeqPlayers(void) {
@ -2857,13 +2782,13 @@ void Audio_RestartSeqPlayers(void) {
s32 pad2; s32 pad2;
u16 fadeIn = 1; u16 fadeIn = 1;
Audio_StartSequence(SEQ_PLAYER_VOICE, SEQ_ID_VOICE, 0xFF, 1); Audio_StartSequence(SEQ_PLAYER_VOICE, NA_BGM_VO, 0xFF, 1);
if (sAudioSpecId == AUDIOSPEC_12) { if (sAudioSpecId == AUDIOSPEC_12) {
fadeIn = 360; fadeIn = 360;
} else if (sAudioSpecId < AUDIOSPEC_23) { } else if (sAudioSpecId < AUDIOSPEC_23) {
fadeIn = 90; fadeIn = 90;
} }
Audio_StartSequence(SEQ_PLAYER_SFX, SEQ_ID_SFX, 0xFF, fadeIn); Audio_StartSequence(SEQ_PLAYER_SFX, NA_BGM_SE, 0xFF, fadeIn);
Audio_LoadInstruments(); Audio_LoadInstruments();
Audio_LoadAquasSequence(); Audio_LoadAquasSequence();
SEQCMD_SET_SEQPLAYER_VOLUME(SEQ_PLAYER_SFX, 0, 127); SEQCMD_SET_SEQPLAYER_VOLUME(SEQ_PLAYER_SFX, 0, 127);

16
src/audio/audio_tables.c
View File

@ -38,13 +38,13 @@ AudioTableEntry gSeqTableInitEntries[66] = {
{ 0x18D70, 0xD40, 2, 3, 0, 0, 0 }, { SEQ_ID_FORTUNA, 0, 2, 3, 0, 0, 0 }, { 0x18D70, 0xD40, 2, 3, 0, 0, 0 }, { SEQ_ID_FORTUNA, 0, 2, 3, 0, 0, 0 },
{ SEQ_ID_TITANIA, 0, 2, 3, 0, 0, 0 }, { 0x19AB0, 0x7F0, 2, 3, 0, 0, 0 }, { SEQ_ID_TITANIA, 0, 2, 3, 0, 0, 0 }, { 0x19AB0, 0x7F0, 2, 3, 0, 0, 0 },
{ 0x1A2A0, 0x1440, 2, 3, 0, 0, 0 }, { 0x1B6E0, 0x1B20, 2, 3, 0, 0, 0 }, { 0x1A2A0, 0x1440, 2, 3, 0, 0, 0 }, { 0x1B6E0, 0x1B20, 2, 3, 0, 0, 0 },
{ SEQ_ID_ME_BOSS, 0, 2, 3, 0, 0, 0 }, { SEQ_ID_CO_BOSS_1, 0, 2, 3, 0, 0, 0 }, { SEQ_ID_BOSS_ME, 0, 2, 3, 0, 0, 0 }, { SEQ_ID_BOSS_CO_1, 0, 2, 3, 0, 0, 0 },
{ SEQ_ID_CO_BOSS_1, 0, 2, 3, 0, 0, 0 }, { SEQ_ID_ME_BOSS, 0, 2, 3, 0, 0, 0 }, { SEQ_ID_BOSS_CO_1, 0, 2, 3, 0, 0, 0 }, { SEQ_ID_BOSS_ME, 0, 2, 3, 0, 0, 0 },
{ SEQ_ID_ME_BOSS, 0, 2, 3, 0, 0, 0 }, { 0x1D200, 0x1B30, 2, 3, 0, 0, 0 }, { SEQ_ID_BOSS_ME, 0, 2, 3, 0, 0, 0 }, { 0x1D200, 0x1B30, 2, 3, 0, 0, 0 },
{ SEQ_ID_CO_BOSS_1, 0, 2, 3, 0, 0, 0 }, { SEQ_ID_ME_BOSS, 0, 2, 3, 0, 0, 0 }, { SEQ_ID_BOSS_CO_1, 0, 2, 3, 0, 0, 0 }, { SEQ_ID_BOSS_ME, 0, 2, 3, 0, 0, 0 },
{ 0x1ED30, 0x10B0, 2, 3, 0, 0, 0 }, { SEQ_ID_BO_BOSS, 0, 2, 3, 0, 0, 0 }, { 0x1ED30, 0x10B0, 2, 3, 0, 0, 0 }, { SEQ_ID_BOSS_BO, 0, 2, 3, 0, 0, 0 },
{ SEQ_ID_ME_BOSS, 0, 2, 3, 0, 0, 0 }, { SEQ_ID_BO_BOSS, 0, 2, 3, 0, 0, 0 }, { SEQ_ID_BOSS_ME, 0, 2, 3, 0, 0, 0 }, { SEQ_ID_BOSS_BO, 0, 2, 3, 0, 0, 0 },
{ SEQ_ID_ME_BOSS, 0, 2, 3, 0, 0, 0 }, { 0x1FDE0, 0x1410, 2, 3, 0, 0, 0 }, { SEQ_ID_BOSS_ME, 0, 2, 3, 0, 0, 0 }, { 0x1FDE0, 0x1410, 2, 3, 0, 0, 0 },
{ 0x211F0, 0xF30, 2, 3, 0, 0, 0 }, { 0x22120, 0x2B30, 2, 3, 0, 0, 0 }, { 0x211F0, 0xF30, 2, 3, 0, 0, 0 }, { 0x22120, 0x2B30, 2, 3, 0, 0, 0 },
{ 0x24C50, 0x7F0, 2, 3, 0, 0, 0 }, { 0x25440, 0x13B0, 2, 3, 0, 0, 0 }, { 0x24C50, 0x7F0, 2, 3, 0, 0, 0 }, { 0x25440, 0x13B0, 2, 3, 0, 0, 0 },
{ 0x267F0, 0xC70, 2, 3, 0, 0, 0 }, { 0x27460, 0x180, 2, 3, 0, 0, 0 }, { 0x267F0, 0xC70, 2, 3, 0, 0, 0 }, { 0x27460, 0x180, 2, 3, 0, 0, 0 },
@ -52,7 +52,7 @@ AudioTableEntry gSeqTableInitEntries[66] = {
{ 0x27BA0, 0x4E40, 2, 3, 0, 0, 0 }, { 0x2C9E0, 0x14E0, 2, 3, 0, 0, 0 }, { 0x27BA0, 0x4E40, 2, 3, 0, 0, 0 }, { 0x2C9E0, 0x14E0, 2, 3, 0, 0, 0 },
{ 0x2DEC0, 0x400, 2, 3, 0, 0, 0 }, { 0x2E2C0, 0x800, 2, 3, 0, 0, 0 }, { 0x2DEC0, 0x400, 2, 3, 0, 0, 0 }, { 0x2E2C0, 0x800, 2, 3, 0, 0, 0 },
{ 0x2EAC0, 0x1AB0, 2, 3, 0, 0, 0 }, { 0x30570, 0x1AA0, 2, 3, 0, 0, 0 }, { 0x2EAC0, 0x1AB0, 2, 3, 0, 0, 0 }, { 0x30570, 0x1AA0, 2, 3, 0, 0, 0 },
{ SEQ_ID_ME_BOSS, 0, 2, 3, 0, 0, 0 }, { 0x32010, 0x1370, 2, 3, 0, 0, 0 }, { SEQ_ID_BOSS_ME, 0, 2, 3, 0, 0, 0 }, { 0x32010, 0x1370, 2, 3, 0, 0, 0 },
{ 0x33380, 0xB80, 2, 3, 0, 0, 0 }, { 0x33F00, 0x5C0, 2, 3, 0, 0, 0 }, { 0x33380, 0xB80, 2, 3, 0, 0, 0 }, { 0x33F00, 0x5C0, 2, 3, 0, 0, 0 },
{ SEQ_ID_CO_INTRO, 0, 2, 3, 0, 0, 0 }, { SEQ_ID_CO_INTRO, 0, 2, 3, 0, 0, 0 }, { SEQ_ID_CO_INTRO, 0, 2, 3, 0, 0, 0 }, { SEQ_ID_CO_INTRO, 0, 2, 3, 0, 0, 0 },
{ 0x344C0, 0x550, 2, 3, 0, 0, 0 }, { 0x34A10, 0x360, 2, 3, 0, 0, 0 }, { 0x344C0, 0x550, 2, 3, 0, 0, 0 }, { 0x34A10, 0x360, 2, 3, 0, 0, 0 },

2
src/engine/fox_360.c
View File

@ -490,7 +490,7 @@ void ActorAllRange_UpdateStarWolfEvents(Actor* this) {
if ((gCurrentLevel == LEVEL_VENOM_2) || (gCurrentLevel == LEVEL_BOLSE)) { if ((gCurrentLevel == LEVEL_VENOM_2) || (gCurrentLevel == LEVEL_BOLSE)) {
gPlayer[0].camRoll = 20.0f; gPlayer[0].camRoll = 20.0f;
} }
AUDIO_PLAY_BGM(SEQ_ID_STAR_WOLF | SEQ_FLAG); AUDIO_PLAY_BGM(NA_BGM_STARWOLF);
AllRange_ClearRadio(); AllRange_ClearRadio();
if ((gCurrentLevel == LEVEL_FORTUNA) || (gCurrentLevel == LEVEL_VENOM_2)) { if ((gCurrentLevel == LEVEL_FORTUNA) || (gCurrentLevel == LEVEL_VENOM_2)) {
gPlayer[0].cam.eye.x = 4500.0f; gPlayer[0].cam.eye.x = 4500.0f;

2
src/engine/fox_beam.c
View File

@ -2245,7 +2245,7 @@ void PlayerShot_UpdateShot(PlayerShot* shot, s32 index) {
} }
} }
Object_Kill(&shot->obj, shot->sfxSource); 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) { } else if (gCurrentLevel == LEVEL_AQUAS) {
Aquas_801ABA40(shot); Aquas_801ABA40(shot);
} else { } else {

6
src/engine/fox_boss.c
View File

@ -3,10 +3,8 @@
s32 gBossFrameCount; s32 gBossFrameCount;
s32 D_boss_800C9E90[] = { 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, 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,
SEQ_ID_A6_BOSS | SEQ_FLAG, SEQ_ID_SY_BOSS | SEQ_FLAG, SEQ_ID_VE_BOSS | SEQ_FLAG, SEQ_ID_SO_BOSS | SEQ_FLAG, 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,
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,
}; };
s32 PAD_boss_C9EC4[14] = { 0 }; s32 PAD_boss_C9EC4[14] = { 0 };

6
src/engine/fox_demo.c
View File

@ -617,7 +617,7 @@ void Cutscene_EnterWarpZone(Player* player) {
if (player->csTimer == 30) { if (player->csTimer == 30) {
gStarCount = 300; gStarCount = 300;
AUDIO_PLAY_BGM(SEQ_ID_WARP_ZONE | SEQ_FLAG); AUDIO_PLAY_BGM(NA_BGM_STAGE_WZ);
} }
if (player->csTimer == 0) { if (player->csTimer == 0) {
@ -813,7 +813,7 @@ void Cutscene_AllRangeMode(Player* player) {
gChangeTo360 = true; gChangeTo360 = true;
if (gCurrentLevel == LEVEL_VENOM_ANDROSS) { if (gCurrentLevel == LEVEL_VENOM_ANDROSS) {
Radio_PlayMessage(gMsg_ID_19466, RCID_FOX); 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) { } else if (gCurrentLevel != LEVEL_TRAINING) {
Radio_PlayMessage(gMsg_ID_20180, RCID_FOX); Radio_PlayMessage(gMsg_ID_20180, RCID_FOX);
if (gCurrentLevel == LEVEL_SECTOR_Y) { if (gCurrentLevel == LEVEL_SECTOR_Y) {
@ -1403,7 +1403,7 @@ void Cutscene_LevelComplete(Player* player) {
Player_FloorCheck(player); Player_FloorCheck(player);
} else { } else {
if (gCsFrameCount == 170) { if (gCsFrameCount == 170) {
AUDIO_PLAY_BGM(SEQ_ID_GOOD_END); AUDIO_PLAY_BGM(NA_BGM_COURSE_CLEAR);
} }
Cutscene_CoComplete2(player); Cutscene_CoComplete2(player);
Player_FloorCheck(player); Player_FloorCheck(player);

2
src/engine/fox_effect.c
View File

@ -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(NA_SE_EN_CLBOSS_BEAM, effect->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_A6BOSS_BEAM, effect->sfxSource, 4);
break; break;
case 11: case 11:

4
src/engine/fox_enmy2.c
View File

@ -1174,10 +1174,10 @@ void ActorEvent_ProcessScript(ActorEvent* this) {
if (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_ACTIVE) { if (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_ACTIVE) {
if (this->unk_0B4 == EVID_86) { 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) { if (this->unk_0B4 == EVID_85) {
Audio_PlayFanfare(SEQ_ID_BILL, 20, 10, 10); Audio_PlayFanfare(NA_BGM_BILL, 20, 10, 10);
} }
} }

6
src/engine/fox_hud.c
View File

@ -5091,7 +5091,7 @@ void HUD_AquasStart(Player* player) {
Aquas_801BDF14(); Aquas_801BDF14();
AUDIO_PLAY_BGM(SEQ_ID_INTRO_45); AUDIO_PLAY_BGM(NA_BGM_START_DEMO_M);
case 3: case 3:
gFillScreenAlphaStep = 16; gFillScreenAlphaStep = 16;
@ -5264,7 +5264,7 @@ void HUD_AquasStart(Player* player) {
gLoadLevelObjects = 1; gLoadLevelObjects = 1;
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_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), 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; break;
case 400: case 400:
AUDIO_PLAY_BGM(SEQ_ID_GOOD_END); AUDIO_PLAY_BGM(NA_BGM_COURSE_CLEAR);
break; break;
case 440: case 440:

18
src/engine/fox_play.c
View File

@ -2564,7 +2564,7 @@ void Play_Init(void) {
D_ctx_80177C70 = 0; D_ctx_80177C70 = 0;
gTeamHelpActor = NULL; gTeamHelpActor = NULL;
gTeamHelpTimer = 0; gTeamHelpTimer = 0;
Audio_KillSfxById(NA_SE_OB_ROOT_EXPLOSION1); Audio_KillSfxById(NA_SE_OB_ROUTE_EXPLOSION1);
Audio_KillSfxById(NA_SE_DEMO_SIREN); Audio_KillSfxById(NA_SE_DEMO_SIREN);
Memory_FreeAll(); Memory_FreeAll();
gTraining360MsgTimer = gTraining360MsgIndex = gShowBossHealth = gStarWolfMsgTimer = gAllRangeWingRepairTimer = gTraining360MsgTimer = gTraining360MsgIndex = gShowBossHealth = gStarWolfMsgTimer = gAllRangeWingRepairTimer =
@ -4357,24 +4357,24 @@ void Player_Setup(Player* playerx) {
player->unk_234 = 1; player->unk_234 = 1;
switch (gCurrentLevel) { switch (gCurrentLevel) {
case LEVEL_CORNERIA: case LEVEL_CORNERIA:
AUDIO_PLAY_BGM(SEQ_ID_CO_INTRO); AUDIO_PLAY_BGM(NA_BGM_START_DEMO);
break; break;
case LEVEL_METEO: case LEVEL_METEO:
AUDIO_PLAY_BGM(SEQ_ID_ME_INTRO); AUDIO_PLAY_BGM(NA_BGM_ME_START_DEMO);
break; break;
case LEVEL_FORTUNA: case LEVEL_FORTUNA:
case LEVEL_BOLSE: case LEVEL_BOLSE:
case LEVEL_VENOM_2: case LEVEL_VENOM_2:
AUDIO_PLAY_BGM(SEQ_ID_INTRO_51); AUDIO_PLAY_BGM(NA_BGM_FO_START_DEMO);
break; break;
case LEVEL_VENOM_1: case LEVEL_VENOM_1:
AUDIO_PLAY_BGM(SEQ_ID_VENOM_1 | SEQ_FLAG); AUDIO_PLAY_BGM(NA_BGM_STAGE_VE1);
break; break;
case LEVEL_KATINA: case LEVEL_KATINA:
AUDIO_PLAY_BGM(SEQ_ID_INTRO_51); AUDIO_PLAY_BGM(NA_BGM_KA_START_DEMO);
break; break;
case LEVEL_TITANIA: case LEVEL_TITANIA:
AUDIO_PLAY_BGM(SEQ_ID_INTRO_45); AUDIO_PLAY_BGM(NA_BGM_START_DEMO_M);
break; break;
case LEVEL_ZONESS: case LEVEL_ZONESS:
case LEVEL_SECTOR_X: case LEVEL_SECTOR_X:
@ -4382,7 +4382,7 @@ void Player_Setup(Player* playerx) {
case LEVEL_TRAINING: case LEVEL_TRAINING:
case LEVEL_MACBETH: case LEVEL_MACBETH:
default: default:
AUDIO_PLAY_BGM(SEQ_ID_INTRO_44); AUDIO_PLAY_BGM(NA_BGM_START_DEMO_S);
break; break;
case LEVEL_AREA_6: case LEVEL_AREA_6:
case LEVEL_SECTOR_Y: case LEVEL_SECTOR_Y:
@ -5115,7 +5115,7 @@ void Player_Down(Player* player) {
if (!gVersusMode) { if (!gVersusMode) {
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_PLAY_BGM(SEQ_ID_DEATH); AUDIO_PLAY_BGM(NA_BGM_PLAYER_DOWN);
} }
if (gCurrentLevel == LEVEL_SOLAR) { if (gCurrentLevel == LEVEL_SOLAR) {
Audio_KillSfxById(NA_SE_OVERHEAT_ALARM); Audio_KillSfxById(NA_SE_OVERHEAT_ALARM);

2
src/engine/fox_tank.c
View File

@ -330,7 +330,7 @@ void func_tank_800444BC(Player* player) {
} }
if (gTiStartLandmaster != 0) { if (gTiStartLandmaster != 0) {
gTiStartLandmaster = 0; gTiStartLandmaster = 0;
AUDIO_PLAY_BGM(SEQ_ID_TITANIA | SEQ_FLAG); AUDIO_PLAY_BGM(NA_BGM_STAGE_TI);
Audio_StartPlayerNoise(0); Audio_StartPlayerNoise(0);
} }

6
src/engine/fox_versus.c
View File

@ -1529,7 +1529,7 @@ bool Versus_Update(void) {
case 4: case 4:
if ((sStartVsHurryBgm == 1) && (sVsHurryBgmPlaying == 0)) { if ((sStartVsHurryBgm == 1) && (sVsHurryBgmPlaying == 0)) {
AUDIO_PLAY_BGM(SEQ_ID_VS_HURRY | SEQ_FLAG); AUDIO_PLAY_BGM(NA_BGM_BATTLE_LAST);
sVsHurryBgmPlaying = 1; sVsHurryBgmPlaying = 1;
} }
@ -1566,11 +1566,11 @@ bool Versus_Update(void) {
case 2: case 2:
case 3: case 3:
AUDIO_PLAY_BGM(SEQ_ID_GOOD_END); AUDIO_PLAY_BGM(NA_BGM_COURSE_CLEAR);
break; break;
case 99: case 99:
AUDIO_PLAY_BGM(SEQ_ID_BAD_END); AUDIO_PLAY_BGM(NA_BGM_COURSE_FAILURE);
break; break;
default: default:

5
src/mods/levelselect.c
View File

@ -83,6 +83,8 @@ void Map_LevelSelect(void) {
Graphics_DisplaySmallText(80, 210, 1.0f, 1.0f, "WARP ZONE"); Graphics_DisplaySmallText(80, 210, 1.0f, 1.0f, "WARP ZONE");
} else if (sCurrentPlanetId == PLANET_VENOM) { } else if (sCurrentPlanetId == PLANET_VENOM) {
Graphics_DisplaySmallText(80, 210, 1.0f, 1.0f, "ANDROSS"); Graphics_DisplaySmallText(80, 210, 1.0f, 1.0f, "ANDROSS");
} else if (sCurrentPlanetId == PLANET_AREA_6) {
Graphics_DisplaySmallText(80, 210, 1.0f, 1.0f, "UNKNOWN 4");
} }
} }
} }
@ -96,6 +98,9 @@ void Map_LevelSelect(void) {
gCurrentLevel = LEVEL_VENOM_2; gCurrentLevel = LEVEL_VENOM_2;
} }
} }
if (startOption && (sCurrentPlanetId == PLANET_AREA_6)) {
gCurrentLevel = LEVEL_UNK_4;
}
Map_801A61B4(gCurrentLevel); Map_801A61B4(gCurrentLevel);
D_menu_801B8280 = 0; D_menu_801B8280 = 0;
D_menu_801CD968 = 0; D_menu_801CD968 = 0;

2
src/mods/sfxjukebox.c
View File

@ -94,7 +94,7 @@ 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_BGM(SEQ_ID_MENU); AUDIO_PLAY_BGM(NA_BGM_SELECT);
gDrawMode = DRAW_NONE; gDrawMode = DRAW_NONE;
D_menu_801B9124 = 1000; D_menu_801B9124 = 1000;
D_menu_801B912C = 0; D_menu_801B912C = 0;

2
src/mods/sfxjukebox2.c
View File

@ -172,7 +172,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(NA_SE_ARWING_CANCEL, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_ARWING_CANCEL, gDefaultSfxSource, 4);
AUDIO_PLAY_BGM(SEQ_ID_MENU); AUDIO_PLAY_BGM(NA_BGM_SELECT);
gDrawMode = DRAW_NONE; gDrawMode = DRAW_NONE;
D_menu_801B9124 = 1000; D_menu_801B9124 = 1000;
D_menu_801B912C = 0; D_menu_801B912C = 0;

4
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(NA_SE_VO_ANDORF_LAUGH, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_VO_ANDROSS_LAUGH, gDefaultSfxSource, 4);
} }
RCP_SetupDL(&gMasterDisp, asset->unk_08); RCP_SetupDL(&gMasterDisp, asset->unk_08);
@ -1081,7 +1081,7 @@ void Ending_801926D4(void) {
} else { } else {
D_ending_80198590.rightState = D_ending_80198590.leftState = WINGSTATE_INTACT; D_ending_80198590.rightState = D_ending_80198590.leftState = WINGSTATE_INTACT;
} }
AUDIO_PLAY_BGM(SEQ_ID_ENDING); AUDIO_PLAY_BGM(NA_BGM_STAFF_ROLL);
} }
if ((2790 <= D_ending_80192E70) && (D_ending_80192E70 < 3000)) { if ((2790 <= D_ending_80192E70) && (D_ending_80192E70 < 3000)) {

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

@ -1730,7 +1730,7 @@ void Corneria_8018C19C(Boss* boss) {
boss->fwork[6] = 800.0f; boss->fwork[6] = 800.0f;
boss->fwork[3] = gPlayer[0].cam.eye.z - gPathProgress - 2500.0f; boss->fwork[3] = gPlayer[0].cam.eye.z - gPathProgress - 2500.0f;
boss->fwork[18] = -gArwingSpeed; boss->fwork[18] = -gArwingSpeed;
AUDIO_PLAY_BGM(SEQ_ID_CO_BOSS_2 | SEQ_FLAG); AUDIO_PLAY_BGM(NA_BGM_BOSS_A_CARRIER);
boss->timer_050 = 40; boss->timer_050 = 40;
} }
break; break;
@ -3182,7 +3182,7 @@ void Corneria_LevelComplete1(Player* player) {
gShowLevelClearStatusScreen = 0; gShowLevelClearStatusScreen = 0;
break; break;
case 240: case 240:
AUDIO_PLAY_BGM(SEQ_ID_GOOD_END); AUDIO_PLAY_BGM(NA_BGM_COURSE_CLEAR);
break; break;
case 330: case 330:
gLevelClearScreenTimer = 100; gLevelClearScreenTimer = 100;

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

@ -857,7 +857,7 @@ void Venom1_Boss319_Init(Boss319* this) {
} }
this->swork[29] = this->swork[30] = var_v0 + 100; this->swork[29] = this->swork[30] = var_v0 + 100;
Animation_GetFrameData(D_i1_8019ACD4[this->swork[5]], 0, this->vwork); Animation_GetFrameData(D_i1_8019ACD4[this->swork[5]], 0, this->vwork);
AUDIO_PLAY_BGM(SEQ_ID_VE_BOSS | SEQ_FLAG); AUDIO_PLAY_BGM(NA_BGM_BOSS_VE);
} }
bool Venom1_801937F4(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* thisx) { bool Venom1_801937F4(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* thisx) {
@ -1263,7 +1263,7 @@ void Venom1_Boss_Update(Boss* boss) {
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(NA_SE_EN_EXPLOSION_S, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_EXPLOSION_S, boss->sfxSource, 4);
AUDIO_PLAY_SFX(NA_SE_EN_BMBOSS_BROKEN, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_VEBOSS_BROKEN, boss->sfxSource, 4);
} }
is4 = D_i1_8019A820[spF4].unk_0A; is4 = D_i1_8019A820[spF4].unk_0A;
if (is4 != -1) { if (is4 != -1) {
@ -1550,7 +1550,7 @@ void Venom1_Boss_Update(Boss* boss) {
if (D_i1_8019B838[is4].unk_00 <= 0) { if (D_i1_8019B838[is4].unk_00 <= 0) {
AUDIO_PLAY_SFX(NA_SE_EN_EXPLOSION_S, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_EXPLOSION_S, boss->sfxSource, 4);
AUDIO_PLAY_SFX(NA_SE_EN_BMBOSS_BROKEN, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_VEBOSS_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;
@ -1570,7 +1570,7 @@ void Venom1_Boss_Update(Boss* boss) {
break; break;
case 2: case 2:
if (D_i1_8019A500[boss->dmgPart] == 15) { if (D_i1_8019A500[boss->dmgPart] == 15) {
AUDIO_PLAY_SFX(NA_SE_EN_BMBOSS_DAMAGE, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_VEBOSS_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;
@ -1606,7 +1606,7 @@ void Venom1_Boss_Update(Boss* boss) {
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(NA_SE_EN_EXPLOSION_S, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_EXPLOSION_S, boss->sfxSource, 4);
AUDIO_PLAY_SFX(NA_SE_EN_BMBOSS_BROKEN, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_VEBOSS_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_Boss_Update(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(NA_SE_EN_BMBOSS_DAMAGE, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_VEBOSS_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;
@ -1721,7 +1721,7 @@ void Venom1_Boss_Update(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(NA_SE_OB_BMBOSS_LAND, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OB_VEBOSS_LAND, boss->sfxSource, 4);
spB8 = 3; spB8 = 3;
boss->swork[28] = 5; boss->swork[28] = 5;
} }
@ -1787,13 +1787,13 @@ void Venom1_Boss_Update(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(NA_SE_OB_BMBOSS_WALK, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OB_VEBOSS_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(NA_SE_OB_BMBOSS_WALK, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OB_VEBOSS_WALK, boss->sfxSource, 4);
boss->swork[27]++; boss->swork[27]++;
} }
break; break;
@ -1832,7 +1832,7 @@ void Venom1_Boss_Update(Boss* boss) {
case 122: case 122:
gCameraShake = 20; gCameraShake = 20;
boss->swork[28] = 7; boss->swork[28] = 7;
AUDIO_PLAY_SFX(NA_SE_OB_BMBOSS_BOUND, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OB_VEBOSS_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_Boss_Update(Boss* boss) {
case 118: case 118:
gCameraShake = 30; gCameraShake = 30;
boss->swork[28] = 7; boss->swork[28] = 7;
AUDIO_PLAY_SFX(NA_SE_OB_BMBOSS_BOUND, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OB_VEBOSS_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_Boss_Update(Boss* boss) {
break; break;
case 91: case 91:
boss->swork[28] = 7; boss->swork[28] = 7;
AUDIO_PLAY_SFX(NA_SE_OB_BMBOSS_BOUND, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OB_VEBOSS_BOUND, boss->sfxSource, 4);
break; break;
case 78: case 78:
boss->swork[28] = 7; boss->swork[28] = 7;
AUDIO_PLAY_SFX(NA_SE_OB_BMBOSS_BOUND, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OB_VEBOSS_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_Boss_Update(Boss* boss) {
break; break;
case 66: case 66:
boss->swork[28] = 7; boss->swork[28] = 7;
AUDIO_PLAY_SFX(NA_SE_OB_BMBOSS_BOUND, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OB_VEBOSS_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_Boss_Update(Boss* boss) {
Boss_AwardBonus(boss); Boss_AwardBonus(boss);
gShowBossHealth = 0; gShowBossHealth = 0;
boss->swork[28] = 9; boss->swork[28] = 9;
AUDIO_PLAY_SFX(NA_SE_OB_BMBOSS_BOUND, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OB_VEBOSS_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_Boss_Update(Boss* boss) {
boss->swork[11] |= 1; boss->swork[11] |= 1;
break; break;
case 1: case 1:
AUDIO_PLAY_SFX(NA_SE_OB_BMBOSS_ATTACK, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OB_VEBOSS_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_Boss_Update(Boss* boss) {
break; break;
case 1: case 1:
spB4 = 1; spB4 = 1;
AUDIO_PLAY_SFX(NA_SE_OB_BMBOSS_ATTACK, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OB_VEBOSS_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_Boss_Update(Boss* boss) {
} }
break; break;
case 4: case 4:
AUDIO_PLAY_SFX(NA_SE_OB_BMBOSS_JUMP, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OB_VEBOSS_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;

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

@ -447,7 +447,7 @@ void Meteo_80188344(Boss* boss) {
boss->info.cullDistance = 1000.0f; boss->info.cullDistance = 1000.0f;
Audio_KillSfxBySourceAndId(boss->sfxSource, NA_SE_EN_GRN_BEAM_CHARGE); Audio_KillSfxBySourceAndId(boss->sfxSource, NA_SE_EN_GRN_BEAM_CHARGE);
AUDIO_PLAY_SFX(NA_SE_EN_ASBOSS_SHIELD, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_MEBOSS_SHIELD, boss->sfxSource, 4);
} }
break; break;
@ -1326,7 +1326,7 @@ void Meteo_8018978C(Boss* boss) {
} }
if (gCsFrameCount == 400) { if (gCsFrameCount == 400) {
AUDIO_PLAY_BGM(SEQ_ID_BOSS_RESUME | SEQ_FLAG); AUDIO_PLAY_BGM(NA_BGM_REAL_BOSS);
if (gTeamShields[TEAM_ID_FALCO] > 0) { if (gTeamShields[TEAM_ID_FALCO] > 0) {
Radio_PlayMessage(gMsg_ID_3345, RCID_BOSS_METEO); Radio_PlayMessage(gMsg_ID_3345, RCID_BOSS_METEO);
} else { } else {
@ -2274,7 +2274,7 @@ void Meteo_LevelComplete(Player* player) {
Math_SmoothStepToF(&D_ctx_80177A48[3], 1.0f, 1.0f, 0.01f, 0.0f); Math_SmoothStepToF(&D_ctx_80177A48[3], 1.0f, 1.0f, 0.01f, 0.0f);
} }
if (player->csTimer == 50) { if (player->csTimer == 50) {
AUDIO_PLAY_BGM(SEQ_ID_GOOD_END); AUDIO_PLAY_BGM(NA_BGM_COURSE_CLEAR);
} }
Math_SmoothStepToF(&D_ctx_80177A48[1], 1080.0f, 0.01f, D_ctx_80177A48[3], 0.0f); Math_SmoothStepToF(&D_ctx_80177A48[1], 1080.0f, 0.01f, D_ctx_80177A48[3], 0.0f);

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

@ -1787,7 +1787,7 @@ void SectorX_LevelComplete(Player* player) {
break; break;
case 30: case 30:
AUDIO_PLAY_BGM(SEQ_ID_GOOD_END); AUDIO_PLAY_BGM(NA_BGM_COURSE_CLEAR);
break; break;
case 60: case 60:

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

@ -1050,7 +1050,7 @@ void Area6_Boss_Update(Boss* bossA6) {
bossA6->state = 3; bossA6->state = 3;
if (D_i3_801C2250[A6_BSS_6] == 0) { if (D_i3_801C2250[A6_BSS_6] == 0) {
AUDIO_PLAY_BGM(SEQ_ID_A6_BOSS | SEQ_FLAG); AUDIO_PLAY_BGM(NA_BGM_BOSS_A6);
} }
} }
} else if (bossA6->swork[A6_SWK_38] != 0) { } else if (bossA6->swork[A6_SWK_38] != 0) {
@ -1068,7 +1068,7 @@ void Area6_Boss_Update(Boss* bossA6) {
case 5: case 5:
if (bossA6->timer_050 == 1) { if (bossA6->timer_050 == 1) {
Area6_80187704(); Area6_80187704();
AUDIO_PLAY_SFX(NA_SE_EN_CLBOSS_CHARGE, bossA6->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_A6BOSS_CHARGE, bossA6->sfxSource, 4);
D_i3_801C2250[A6_BSS_33] = 120; D_i3_801C2250[A6_BSS_33] = 120;
} }
@ -2381,14 +2381,14 @@ void Area6_LevelStart(Player* player) {
player->csState = 0; player->csState = 0;
player->csTimer = 0; player->csTimer = 0;
AUDIO_PLAY_BGM(SEQ_ID_AREA_6 | SEQ_FLAG); AUDIO_PLAY_BGM(NA_BGM_STAGE_A6);
player->state_1C8 = PLAYERSTATE_1C8_ACTIVE; player->state_1C8 = PLAYERSTATE_1C8_ACTIVE;
} }
break; break;
} }
switch (gCsFrameCount) { switch (gCsFrameCount) {
case 280: case 280:
AUDIO_PLAY_BGM(SEQ_ID_INTRO_51); AUDIO_PLAY_BGM(NA_BGM_A6_START_DEMO);
break; break;
case 40: case 40:
Radio_PlayMessage(gMsg_ID_7005, RCID_CAIMAN_AREA6); Radio_PlayMessage(gMsg_ID_7005, RCID_CAIMAN_AREA6);
@ -2758,7 +2758,7 @@ void Area6_LevelComplete(Player* player) {
} }
switch (gCsFrameCount) { switch (gCsFrameCount) {
case 380: case 380:
AUDIO_PLAY_BGM(SEQ_ID_GOOD_END); AUDIO_PLAY_BGM(NA_BGM_COURSE_CLEAR);
break; break;
case 550: case 550:
gLevelClearScreenTimer = 100; gLevelClearScreenTimer = 100;

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

@ -2555,7 +2555,7 @@ void Aquas_Boss_Update(Boss* bossAQ) {
if (fabsf(bossAQ->obj.pos.z - gPlayer[0].trueZpos) <= 3000.0f) { if (fabsf(bossAQ->obj.pos.z - gPlayer[0].trueZpos) <= 3000.0f) {
D_i3_801C4190[6] = 1; D_i3_801C4190[6] = 1;
bossAQ->timer_056 = 20; bossAQ->timer_056 = 20;
Audio_PlaySequence(SEQ_PLAYER_BGM, SEQ_ID_AQ_BOSS | SEQ_FLAG, 0, 1); Audio_PlaySequence(SEQ_PLAYER_BGM, NA_BGM_BOSS_AQ, 0, 1);
bossAQ->state = 1; bossAQ->state = 1;
} }
break; break;
@ -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, NA_SE_EN_AC_ZAKO_DOWN); func_effect_8007A6F0(&actor->obj.pos, NA_SE_EN_AQ_ZAKO_DOWN);
} }
switch (actor->state) { switch (actor->state) {
@ -3999,7 +3999,7 @@ 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(NA_SE_OB_MINI_BOMB, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OB_MINI_BOMB, actor->sfxSource, 4);
func_effect_8007A6F0(&actor->obj.pos, NA_SE_EN_AC_ZAKO_DOWN); func_effect_8007A6F0(&actor->obj.pos, NA_SE_EN_AQ_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(NA_SE_EN_AC_ZAKO_DAMAGE, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_AQ_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, NA_SE_EN_AC_ZAKO_DOWN); func_effect_8007A6F0(&actor->obj.pos, NA_SE_EN_AQ_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(NA_SE_EN_AC_ZAKO_DAMAGE, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_AQ_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, NA_SE_EN_AC_ZAKO_DOWN); func_effect_8007A6F0(&actor->obj.pos, NA_SE_EN_AQ_ZAKO_DOWN);
} }
if (actor->state != 6) { if (actor->state != 6) {
@ -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(NA_SE_EN_AC_ZAKO_DAMAGE, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_AQ_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, NA_SE_EN_AC_ZAKO_DOWN); func_effect_8007A6F0(&actor->obj.pos, NA_SE_EN_AQ_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(NA_SE_EN_AC_ZAKO_DAMAGE, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_AQ_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(NA_SE_OB_AC_ROCK_BOUND, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OB_AQ_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(NA_SE_OB_AC_ROCK_BOUND, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_OB_AQ_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);
} }
@ -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(NA_SE_EN_AC_ZAKO_DAMAGE, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_AQ_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 {
@ -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, NA_SE_OB_AC_PILLAR_BROKE); func_effect_8007A6F0(&actor->obj.pos, NA_SE_OB_AQ_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, NA_SE_OB_AC_ROCK_BOUND); func_effect_8007A6F0(&actor->obj.pos, NA_SE_OB_AQ_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),

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

@ -330,7 +330,7 @@ void Solar_8019EF30(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(NA_SE_OB_SNROCK_APPEAR, actor->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_OB_SOROCK_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) {
@ -361,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(NA_SE_OB_SNROCK_APPEAR, actor->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_OB_SOROCK_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) {
@ -426,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(NA_SE_OB_SNROCK_APPEAR, actor->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_OB_SOROCK_APPEAR, actor->sfxSource, 0);
break; break;
case 2: case 2:
actor->gravity = 0.5f; actor->gravity = 0.5f;
if (Play_CheckDynaFloorCollision(&sp8C, &sp88, actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z)) { if (Play_CheckDynaFloorCollision(&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, NA_SE_OB_SNROCK_DISAPPEAR); func_effect_8007A6F0(&actor->obj.pos, NA_SE_OB_SOROCK_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);
@ -808,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(NA_SE_EN_SNBOSS_BREATH, effect->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_SOBOSS_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, NA_SE_EN_SNBOSS_BREATH); Audio_KillSfxBySourceAndId(effect->sfxSource, NA_SE_EN_SOBOSS_BREATH);
} }
} }
break; break;
@ -832,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(NA_SE_EN_SNBOSS_BREATH, effect->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_SOBOSS_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, NA_SE_EN_SNBOSS_BREATH); Audio_KillSfxBySourceAndId(effect->sfxSource, NA_SE_EN_SOBOSS_BREATH);
} }
break; break;
} }
@ -1056,7 +1056,7 @@ void Solar_LevelStart(Player* player) {
gCsCamAtZ = -3000.0f; gCsCamAtZ = -3000.0f;
gCsCamEyeZ = -3400.0f; gCsCamEyeZ = -3400.0f;
Audio_KillSfxBySourceAndId(player->sfxSource, NA_SE_OB_MAGMA_BUBBLE); Audio_KillSfxBySourceAndId(player->sfxSource, NA_SE_OB_MAGMA_BUBBLE);
AUDIO_PLAY_BGM(SEQ_ID_INTRO_51); AUDIO_PLAY_BGM(NA_BGM_SO_START_DEMO);
func_display_80057814(player); func_display_80057814(player);
Audio_StartPlayerNoise(gPlayerNum); Audio_StartPlayerNoise(gPlayerNum);
D_ctx_80177A48[0] = 0.01f; D_ctx_80177A48[0] = 0.01f;
@ -1117,7 +1117,7 @@ void Solar_LevelStart(Player* player) {
gFillScreenRed = gFillScreenGreen = gFillScreenBlue = 255; gFillScreenRed = gFillScreenGreen = gFillScreenBlue = 255;
} }
if (gFillScreenAlpha == 255) { if (gFillScreenAlpha == 255) {
AUDIO_PLAY_BGM(SEQ_ID_SOLAR | SEQ_FLAG); AUDIO_PLAY_BGM(NA_BGM_STAGE_SO);
player->pos.z = 0.0f; player->pos.z = 0.0f;
player->baseSpeed = gArwingSpeed; player->baseSpeed = gArwingSpeed;
Play_ClearObjectData(); Play_ClearObjectData();
@ -1263,7 +1263,7 @@ void Solar_801A1F80(Boss* bossSO) {
gFogBlue--; gFogBlue--;
} }
if (gBossFrameCount == 30) { if (gBossFrameCount == 30) {
AUDIO_PLAY_BGM(SEQ_ID_SO_BOSS | SEQ_FLAG); AUDIO_PLAY_BGM(NA_BGM_BOSS_SO);
} }
if (gBossFrameCount <= 60) { if (gBossFrameCount <= 60) {
Math_SmoothStepToF(&D_ctx_801779A8[gMainController], 120.0f, 1.0f, 3.5f, 0.0f); Math_SmoothStepToF(&D_ctx_801779A8[gMainController], 120.0f, 1.0f, 3.5f, 0.0f);
@ -1334,7 +1334,7 @@ void Solar_801A23F4(Boss* bossSO) {
AUDIO_PLAY_SFX(NA_SE_EN_OUT_PROMINENCE, 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(NA_SE_EN_SNBOSS_SWING, bossSO->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_SOBOSS_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;
@ -1361,7 +1361,7 @@ void Solar_801A23F4(Boss* bossSO) {
AUDIO_PLAY_SFX(NA_SE_EN_OUT_PROMINENCE, 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(NA_SE_EN_SNBOSS_SWING, bossSO->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_SOBOSS_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;
@ -1411,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(NA_SE_EN_SNBOSS_ROLL, bossSO->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_SOBOSS_ROLL, bossSO->sfxSource, 4);
} }
if (bossSO->unk_04C == 1) { if (bossSO->unk_04C == 1) {
AUDIO_PLAY_SFX(NA_SE_EN_SNBOSS_ROLL, bossSO->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_SOBOSS_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);
@ -1453,7 +1453,7 @@ void Solar_801A23F4(Boss* bossSO) {
AUDIO_PLAY_SFX(NA_SE_EN_OUT_PROMINENCE, 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(NA_SE_EN_SNBOSS_SWING, bossSO->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_SOBOSS_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;
@ -1657,7 +1657,7 @@ void Solar_801A3510(Boss* bossSO) {
AUDIO_PLAY_SFX(NA_SE_EN_OUT_PROMINENCE, 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(NA_SE_EN_SNBOSS_SWING, bossSO->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_SOBOSS_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);
@ -1675,7 +1675,7 @@ void Solar_801A3510(Boss* bossSO) {
AUDIO_PLAY_SFX(NA_SE_EN_OUT_PROMINENCE, 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(NA_SE_EN_SNBOSS_SWING, bossSO->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_SOBOSS_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);
@ -1703,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(NA_SE_EN_SNBOSS_BREATH, bossSO->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_SOBOSS_BREATH, bossSO->sfxSource, 4);
bossSO->timer_050 = 30; bossSO->timer_050 = 30;
} }
if (bossSO->timer_050 != 0) { if (bossSO->timer_050 != 0) {
@ -1716,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, NA_SE_EN_SNBOSS_BREATH); Audio_KillSfxBySourceAndId(bossSO->sfxSource, NA_SE_EN_SOBOSS_BREATH);
} }
if (bossSO->unk_04C == 99) { if (bossSO->unk_04C == 99) {
bossSO->swork[SO_SWK_1] = 5; bossSO->swork[SO_SWK_1] = 5;
@ -1726,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(NA_SE_EN_SNBOSS_BREATH, bossSO->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_SOBOSS_BREATH, bossSO->sfxSource, 4);
bossSO->timer_050 = 30; bossSO->timer_050 = 30;
} }
if (bossSO->timer_050 != 0) { if (bossSO->timer_050 != 0) {
@ -1741,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, NA_SE_EN_SNBOSS_BREATH); Audio_KillSfxBySourceAndId(bossSO->sfxSource, NA_SE_EN_SOBOSS_BREATH);
} }
if (bossSO->unk_04C >= 99) { if (bossSO->unk_04C >= 99) {
Solar_801A30CC(bossSO); Solar_801A30CC(bossSO);
@ -1767,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(NA_SE_EN_SNBOSS_DAMAGE, bossSO->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_SOBOSS_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(NA_SE_EN_SNBOSS_DAMAGE, bossSO->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_SOBOSS_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;
@ -1789,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(NA_SE_EN_SNBOSS_DAMAGE, bossSO->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_SOBOSS_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;
@ -1882,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(NA_SE_EN_SNBOSS_DOWN, bossSO->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_SOBOSS_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);
@ -1972,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(NA_SE_EN_SNBOSS_BROKEN, bossSO->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_SOBOSS_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) {
@ -2027,11 +2027,11 @@ void Solar_801A4A34(Boss* bossSO) {
} }
switch (bossSO->unk_04C) { switch (bossSO->unk_04C) {
case 30: case 30:
AUDIO_PLAY_SFX(NA_SE_EN_SNBOSS_DAMAGE, bossSO->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_SOBOSS_DAMAGE, bossSO->sfxSource, 4);
/* fallthrough */ /* fallthrough */
case 35: case 35:
case 97: case 97:
AUDIO_PLAY_SFX(NA_SE_EN_SNBOSS_BROKEN, bossSO->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_SOBOSS_BROKEN, bossSO->sfxSource, 4);
break; break;
} }
if (bossSO->unk_04C == 119) { if (bossSO->unk_04C == 119) {
@ -2071,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(NA_SE_EN_SNBOSS_ROLL, bossSO->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_SOBOSS_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(NA_SE_EN_SNBOSS_ROLL, bossSO->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_SOBOSS_ROLL, bossSO->sfxSource, 4);
} }
bossSO->unk_078.y = bossSO->obj.rot.y; bossSO->unk_078.y = bossSO->obj.rot.y;
break; break;
@ -2086,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(NA_SE_EN_SNBOSS_ROLL, bossSO->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_SOBOSS_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);
@ -2134,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(NA_SE_EN_SNBOSS_CRY, bossSO->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_SOBOSS_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;
} }
@ -2383,7 +2383,7 @@ void Solar_Boss_Update(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(NA_SE_EN_SNBOSS_CRY, bossSO->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_SOBOSS_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) {
@ -2429,7 +2429,7 @@ void Solar_Boss_Update(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(NA_SE_EN_SNBOSS_CRY, bossSO->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_SOBOSS_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;
@ -2905,7 +2905,7 @@ void Solar_LevelComplete(Player* player) {
player->csState++; player->csState++;
player->wings.modelId = 1; player->wings.modelId = 1;
Audio_StartPlayerNoise(0); Audio_StartPlayerNoise(0);
AUDIO_PLAY_BGM(SEQ_ID_GOOD_END); AUDIO_PLAY_BGM(NA_BGM_COURSE_CLEAR);
D_ctx_80177A98 = 1; D_ctx_80177A98 = 1;
Play_ClearObjectData(); Play_ClearObjectData();
D_ctx_80177A48[1] = 0.0f; D_ctx_80177A48[1] = 0.0f;

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

@ -2095,7 +2095,7 @@ void Zoness_Boss_Update(Boss* bossZO) {
sp100 = 5.0f; sp100 = 5.0f;
spFC = 3.0f; spFC = 3.0f;
if (sZoSwork[ZO_BSS_55] == 0) { if (sZoSwork[ZO_BSS_55] == 0) {
AUDIO_PLAY_BGM(SEQ_ID_ZO_BOSS | SEQ_FLAG); AUDIO_PLAY_BGM(NA_BGM_BOSS_ZO);
sZoSwork[ZO_BSS_55] = 1; sZoSwork[ZO_BSS_55] = 1;
} }
func_effect_8008377C(sZoFwork[ZO_BSF_43_X], sp134, sZoFwork[ZO_BSF_43_Z] + 100.0f, 5.0f, 3.0f); func_effect_8008377C(sZoFwork[ZO_BSF_43_X], sp134, sZoFwork[ZO_BSF_43_Z] + 100.0f, 5.0f, 3.0f);
@ -4484,7 +4484,7 @@ void Zoness_LevelStart(Player* player) {
} }
gControllerHold[gMainController].button = sp2C; gControllerHold[gMainController].button = sp2C;
if (gCsFrameCount >= 270) { if (gCsFrameCount >= 270) {
AUDIO_PLAY_BGM(SEQ_ID_ZONESS | SEQ_FLAG); AUDIO_PLAY_BGM(NA_BGM_STAGE_ZO);
gLevelStartStatusScreenTimer = 80; gLevelStartStatusScreenTimer = 80;
player->state_1C8 = PLAYERSTATE_1C8_ACTIVE; player->state_1C8 = PLAYERSTATE_1C8_ACTIVE;
player->csState = 0; player->csState = 0;
@ -4582,7 +4582,7 @@ void Zoness_LevelComplete(Player* player) {
player->pos.z = -(gPathProgress + 1500.0f); player->pos.z = -(gPathProgress + 1500.0f);
player->csState++; player->csState++;
Audio_StartPlayerNoise(0); Audio_StartPlayerNoise(0);
AUDIO_PLAY_BGM(SEQ_ID_GOOD_END); AUDIO_PLAY_BGM(NA_BGM_COURSE_CLEAR);
D_ctx_80177A98 = 1; D_ctx_80177A98 = 1;
Play_ClearObjectData(); Play_ClearObjectData();
Solar_801A7750(); Solar_801A7750();

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

@ -269,7 +269,7 @@ void Bolse_UpdateEventHandler(Actor* this) {
} }
AllRange_ClearRadio(); AllRange_ClearRadio();
this->state = 6; this->state = 6;
AUDIO_PLAY_SFX(NA_SE_EN_ANDORF_EXPLOSION, this->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_EN_ANDROSS_EXPLOSION, this->sfxSource, 0);
AUDIO_PLAY_SFX(NA_SE_EN_DOWN_IMPACT, this->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_DOWN_IMPACT, this->sfxSource, 4);
gScreenFlashTimer = 8; gScreenFlashTimer = 8;
@ -286,7 +286,7 @@ void Bolse_UpdateEventHandler(Actor* this) {
this->state = 10; this->state = 10;
this->timer_0BC = 150; this->timer_0BC = 150;
gPlayer[0].state_1C8 = PLAYERSTATE_1C8_STANDBY; gPlayer[0].state_1C8 = PLAYERSTATE_1C8_STANDBY;
AUDIO_PLAY_BGM(SEQ_ID_BO_BOSS | SEQ_FLAG); AUDIO_PLAY_BGM(NA_BGM_BOSS_BO);
AllRange_ClearRadio(); AllRange_ClearRadio();
gPlayer[0].cam.eye.x = 400.0f; gPlayer[0].cam.eye.x = 400.0f;
gPlayer[0].cam.eye.y = 50.0f; gPlayer[0].cam.eye.y = 50.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(NA_SE_EN_ANDORF_EXPLOSION, actor50->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_EN_ANDROSS_EXPLOSION, actor50->sfxSource, 0);
Audio_StartPlayerNoise(0); Audio_StartPlayerNoise(0);
} }
break; break;
@ -1492,7 +1492,7 @@ void Bolse_LevelComplete(Player* player) {
switch (gCsFrameCount) { switch (gCsFrameCount) {
case 160: case 160:
AUDIO_PLAY_BGM(SEQ_ID_GOOD_END); AUDIO_PLAY_BGM(NA_BGM_COURSE_CLEAR);
break; break;
case 92: case 92:

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

@ -150,7 +150,7 @@ void Fortuna_UpdateEvents(Actor* actor) {
if (gAllRangeEventTimer == 8540) { if (gAllRangeEventTimer == 8540) {
Radio_PlayMessage(gMsg_ID_9400, RCID_ROB64); Radio_PlayMessage(gMsg_ID_9400, RCID_ROB64);
Audio_PlaySequence(SEQ_PLAYER_BGM, SEQ_ID_FORTUNA | SEQ_FLAG, 0, 0); Audio_PlaySequence(SEQ_PLAYER_BGM, NA_BGM_STAGE_FO, 0, 0);
gActors[1].aiIndex = gActors[2].aiIndex = gActors[3].aiIndex = gActors[4].aiIndex = gActors[5].aiIndex = gActors[1].aiIndex = gActors[2].aiIndex = gActors[3].aiIndex = gActors[4].aiIndex = gActors[5].aiIndex =
gActors[6].aiIndex = gActors[7].aiIndex = -1; gActors[6].aiIndex = gActors[7].aiIndex = -1;
} }
@ -872,9 +872,9 @@ void Fortuna_LevelComplete(Player* player) {
if (gCsFrameCount == 200) { if (gCsFrameCount == 200) {
if (gMissionStatus == MISSION_COMPLETE) { if (gMissionStatus == MISSION_COMPLETE) {
AUDIO_PLAY_BGM(SEQ_ID_BAD_END); AUDIO_PLAY_BGM(NA_BGM_COURSE_FAILURE);
} else { } else {
AUDIO_PLAY_BGM(SEQ_ID_GOOD_END); AUDIO_PLAY_BGM(NA_BGM_COURSE_CLEAR);
} }
} }
@ -1192,7 +1192,7 @@ void Fortuna_LevelComplete(Player* player) {
switch (gCsFrameCount) { switch (gCsFrameCount) {
case 140: case 140:
AUDIO_PLAY_BGM(SEQ_ID_GOOD_END); AUDIO_PLAY_BGM(NA_BGM_COURSE_CLEAR);
break; break;
case 450: case 450:
gLevelClearScreenTimer = 100; gLevelClearScreenTimer = 100;

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

@ -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(NA_SE_KT_UFO_ENGINE, this->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_KA_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(NA_SE_KT_UFO_HATCH_OPEN, this->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_KA_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(NA_SE_KT_UFO_HATCH_STOP, this->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_KA_UFO_HATCH_STOP, this->sfxSource, 0);
} }
break; break;
@ -1020,7 +1020,7 @@ void Katina_BossUpdate(Saucerer* this) {
*/ */
case 5: case 5:
if (this->timer_050 == 1) { if (this->timer_050 == 1) {
AUDIO_PLAY_BGM(SEQ_ID_KA_BOSS | SEQ_FLAG); AUDIO_PLAY_BGM(NA_BGM_BOSS_KA);
} }
if ((this->timer_050 == 0) && ((this->timer_052 % 16) == 0)) { if ((this->timer_050 == 0) && ((this->timer_052 % 16) == 0)) {
@ -1028,7 +1028,7 @@ void Katina_BossUpdate(Saucerer* this) {
} }
if (this->timer_052 == 0) { if (this->timer_052 == 0) {
AUDIO_PLAY_SFX(NA_SE_KT_UFO_HATCH_CLOSE, this->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_KA_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(NA_SE_KT_UFO_HATCH_STOP, this->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_KA_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(NA_SE_KT_UFO_HATCH_OPEN, this->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_KA_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(NA_SE_KT_UFO_HATCH_STOP, this->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_KA_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(NA_SE_KT_UFO_HATCH_CLOSE, this->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_KA_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(NA_SE_KT_UFO_CORE_OPEN, this->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_KA_UFO_CORE_OPEN, this->sfxSource, 0);
Audio_KillSfxBySourceAndId(this->sfxSource, NA_SE_KT_UFO_ENGINE); Audio_KillSfxBySourceAndId(this->sfxSource, NA_SE_KA_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(NA_SE_KT_UFO_HATCH_STOP, this->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_KA_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(NA_SE_KT_UFO_LONG_CHARGE, this->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_KA_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, NA_SE_KT_UFO_LONG_CHARGE); Audio_KillSfxBySourceAndId(this->sfxSource, NA_SE_KA_UFO_LONG_CHARGE);
AUDIO_PLAY_SFX(NA_SE_KT_UFO_LAST_CHARGE, this->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_KA_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(NA_SE_KT_UFO_BEAM, this->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_KA_UFO_BEAM, this->sfxSource, 0);
} }
if (this->timer_052 == 690) { if (this->timer_052 == 690) {
@ -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(NA_SE_KT_UFO_FALLING, this->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_KA_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(NA_SE_KT_UFO_BOUND, this->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_KA_UFO_BOUND, this->sfxSource, 0);
} }
if (this->timer_050 > 820) { if (this->timer_050 > 820) {
@ -1914,9 +1914,9 @@ void Katina_LevelComplete(Player* player) {
Audio_StartPlayerNoise(0); Audio_StartPlayerNoise(0);
if (gMissionStatus != MISSION_COMPLETE) { if (gMissionStatus != MISSION_COMPLETE) {
AUDIO_PLAY_BGM(SEQ_ID_GOOD_END); AUDIO_PLAY_BGM(NA_BGM_COURSE_CLEAR);
} else { } else {
AUDIO_PLAY_BGM(SEQ_ID_BAD_END); AUDIO_PLAY_BGM(NA_BGM_COURSE_FAILURE);
} }
D_ctx_80177A98 = 0; D_ctx_80177A98 = 0;
@ -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(NA_SE_KT_UFO_ENGINE, gBosses[KA_BOSS_MOTHERSHIP].sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_KA_UFO_ENGINE, gBosses[KA_BOSS_MOTHERSHIP].sfxSource, 0);
gAllRangeEventTimer = 20000; gAllRangeEventTimer = 20000;
@ -2281,7 +2281,7 @@ void Katina_UpdateEvents(ActorAllRange* this) {
gKaKilledAlly = 1; gKaKilledAlly = 1;
AUDIO_PLAY_BGM(SEQ_ID_KA_BOSS | SEQ_FLAG); AUDIO_PLAY_BGM(NA_BGM_BOSS_KA);
} }
Katina_BillFighterInit(); Katina_BillFighterInit();

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

@ -258,7 +258,7 @@ void SectorZ_8019A2F4(Actor* actor) {
actor->state = 3; actor->state = 3;
gPlayer[0].state_1C8 = PLAYERSTATE_1C8_STANDBY; gPlayer[0].state_1C8 = PLAYERSTATE_1C8_STANDBY;
Audio_PlayFanfare(SEQ_ID_KATT, 20, 10, 10); Audio_PlayFanfare(NA_BGM_KATT, 20, 10, 10);
AllRange_ClearRadio(); AllRange_ClearRadio();
gPlayer[0].cam.eye.x = 250.0f; gPlayer[0].cam.eye.x = 250.0f;
@ -443,7 +443,7 @@ void SectorZ_8019A3E8(Actor* actor) {
actor->timer_0BC = 10000; actor->timer_0BC = 10000;
gFillScreenAlpha = gFillScreenAlphaTarget = 255; gFillScreenAlpha = gFillScreenAlphaTarget = 255;
gFillScreenRed = gFillScreenGreen = gFillScreenBlue = 0; gFillScreenRed = gFillScreenGreen = gFillScreenBlue = 0;
AUDIO_PLAY_BGM(SEQ_ID_SZ_BOSS | SEQ_FLAG); AUDIO_PLAY_BGM(NA_BGM_BOSS_SZ);
break; break;
} }
@ -875,7 +875,7 @@ void SectorZ_LevelStart(Player* player) {
player->pos.y = actor->obj.pos.y - 480.0f; player->pos.y = actor->obj.pos.y - 480.0f;
player->pos.z = actor->obj.pos.z; player->pos.z = actor->obj.pos.z;
AUDIO_PLAY_BGM(SEQ_ID_INTRO_51); AUDIO_PLAY_BGM(NA_BGM_SZ_START_DEMO);
} }
break; break;
@ -1204,7 +1204,7 @@ void SectorZ_LevelComplete(Player* player) {
Math_SmoothStepToF(&boss0->fwork[3], 0.7f, 1.0f, 0.7f, 0.0f); Math_SmoothStepToF(&boss0->fwork[3], 0.7f, 1.0f, 0.7f, 0.0f);
if ((gCsFrameCount == 100) && gGreatFoxIntact) { if ((gCsFrameCount == 100) && gGreatFoxIntact) {
AUDIO_PLAY_BGM(SEQ_ID_GOOD_END); AUDIO_PLAY_BGM(NA_BGM_COURSE_CLEAR);
} }
if ((gCsFrameCount == 210) && gGreatFoxIntact) { if ((gCsFrameCount == 210) && gGreatFoxIntact) {
@ -1487,7 +1487,7 @@ void SectorZ_LevelComplete(Player* player) {
if (gGreatFoxIntact) { if (gGreatFoxIntact) {
gMissionStatus = MISSION_ACCOMPLISHED; gMissionStatus = MISSION_ACCOMPLISHED;
} else { } else {
AUDIO_PLAY_BGM(SEQ_ID_BAD_END); AUDIO_PLAY_BGM(NA_BGM_COURSE_FAILURE);
gMissionStatus = MISSION_COMPLETE; gMissionStatus = MISSION_COMPLETE;
} }
break; break;

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

@ -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(NA_SE_OB_MC_SWITCH_ON, actor->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_OB_MA_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(NA_SE_OB_MC_SWITCH_UP, actor->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_OB_MA_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;
@ -2820,9 +2820,9 @@ void Macbeth_801A3E98(Actor* actor) {
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(NA_SE_OB_MC_SWITCH_GRN, actor->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_OB_MA_SWITCH_GRN, actor->sfxSource, 0);
} else { } else {
AUDIO_PLAY_SFX(NA_SE_OB_MC_SWITCH_RED, actor->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_OB_MA_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;
@ -3813,7 +3813,7 @@ void Macbeth_801A7E7C(Actor* actor) {
Macbeth_8019A830(actor); Macbeth_8019A830(actor);
Macbeth_8019A728(actor); Macbeth_8019A728(actor);
if (actor->iwork[1] != 0) { if (actor->iwork[1] != 0) {
AUDIO_PLAY_BGM(SEQ_ID_MA_BOSS | SEQ_FLAG); AUDIO_PLAY_BGM(NA_BGM_BOSS_MA);
actor->state = 1; actor->state = 1;
} }
Macbeth_801A6984(actor); Macbeth_801A6984(actor);
@ -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(NA_SE_EN_MCBOSS_CHARGE0, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_MABOSS_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)) {
@ -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(NA_SE_EN_MCBOSS_RAGE, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_MABOSS_RAGE, actor->sfxSource, 4);
} }
Macbeth_801A74C4(actor); Macbeth_801A74C4(actor);
Macbeth_801A6984(actor); Macbeth_801A6984(actor);
@ -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, NA_SE_EN_MCBOSS_CHARGE0); Audio_KillSfxBySourceAndId(actor->sfxSource, NA_SE_EN_MABOSS_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, NA_SE_EN_MCBOSS_CHARGE0); Audio_KillSfxBySourceAndId(actor->sfxSource, NA_SE_EN_MABOSS_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(NA_SE_EN_MCBOSS_SHOT0, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_MABOSS_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(NA_SE_EN_MCBOSS_PLATECHARGE, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_MABOSS_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, NA_SE_EN_MCBOSS_PLATECHARGE); Audio_KillSfxBySourceAndId(actor->sfxSource, NA_SE_EN_MABOSS_PLATECHARGE);
} }
break; break;
case 16: case 16:
@ -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(NA_SE_EN_MCBOSS_HATCH, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_MABOSS_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;
} }
@ -5010,7 +5010,7 @@ void Macbeth_LevelStart(Player* player) {
} }
break; break;
case 3: case 3:
AUDIO_PLAY_BGM(SEQ_ID_MACBETH | SEQ_FLAG); AUDIO_PLAY_BGM(NA_BGM_STAGE_MA);
gLevelStartStatusScreenTimer = 50; gLevelStartStatusScreenTimer = 50;
player->state_1C8 = PLAYERSTATE_1C8_ACTIVE; player->state_1C8 = PLAYERSTATE_1C8_ACTIVE;
player->csState = player->csTimer = player->csEventTimer = player->unk_240 = 0; player->csState = player->csTimer = player->csEventTimer = player->unk_240 = 0;
@ -6324,7 +6324,7 @@ void Macbeth_LevelComplete2(Player* player) {
D_ctx_80177A48[5] = 360.0f; D_ctx_80177A48[5] = 360.0f;
break; break;
case 910: case 910:
AUDIO_PLAY_BGM(SEQ_ID_GOOD_END); AUDIO_PLAY_BGM(NA_BGM_COURSE_CLEAR);
break; break;
case 1040: case 1040:
Radio_PlayMessage(gMsg_ID_20010, RCID_FOX); Radio_PlayMessage(gMsg_ID_20010, RCID_FOX);
@ -6914,7 +6914,7 @@ void Macbeth_LevelComplete1(Player* player) {
gShowLevelClearStatusScreen = 0; gShowLevelClearStatusScreen = 0;
break; break;
case 50: case 50:
AUDIO_PLAY_BGM(SEQ_ID_GOOD_END); AUDIO_PLAY_BGM(NA_BGM_COURSE_CLEAR);
break; break;
case 100: case 100:
gLevelClearScreenTimer = 100; gLevelClearScreenTimer = 100;

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

@ -626,7 +626,7 @@ void Titania_8018AB44(Actor* actor) {
switch (actor->dmgType) { switch (actor->dmgType) {
case 1: case 1:
AUDIO_PLAY_SFX(NA_SE_EN_MCBOSS_REFLECT, actor->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_MABOSS_REFLECT, actor->sfxSource, 4);
break; break;
case 2: case 2:
@ -3187,7 +3187,7 @@ void Titania_80192118(Boss* boss) {
D_i5_801BBEF0[38] = 2; D_i5_801BBEF0[38] = 2;
gPlayer[0].unk_19C = 0; gPlayer[0].unk_19C = 0;
boss->swork[1] = 3; boss->swork[1] = 3;
AUDIO_PLAY_BGM(SEQ_ID_TI_BOSS | SEQ_FLAG); AUDIO_PLAY_BGM(NA_BGM_BOSS_TI);
} }
break; break;
case 3: case 3:

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

@ -424,7 +424,7 @@ void Titania_LevelComplete(Player* player) {
break; break;
case 50: case 50:
AUDIO_PLAY_BGM(SEQ_ID_GOOD_END); AUDIO_PLAY_BGM(NA_BGM_COURSE_CLEAR);
break; break;
case 80: case 80:

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

@ -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, NA_SE_EN_ANDORF_BRAIN); Audio_KillSfxBySourceAndId(boss->sfxSource, NA_SE_EN_ANDROSS_BRAIN);
Audio_KillSfxBySourceAndId(boss->sfxSource, NA_SE_EN_ANDORF_CATCH); Audio_KillSfxBySourceAndId(boss->sfxSource, NA_SE_EN_ANDROSS_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(NA_SE_EN_ANDORF_WARP, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_ANDROSS_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(NA_SE_OB_ROOT_EXPLOSION1); Audio_KillSfxById(NA_SE_OB_ROUTE_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(NA_SE_EN_ANDORF_CATCH, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_ANDROSS_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(NA_SE_EN_ANDORF_BRAIN, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_ANDROSS_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(NA_SE_VO_ANDORF_LAUGH, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_VO_ANDROSS_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, NA_SE_EN_ANDORF_CATCH); Audio_KillSfxBySourceAndId(boss->sfxSource, NA_SE_EN_ANDROSS_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(NA_SE_VO_ANDORF_LAUGH, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_VO_ANDROSS_LAUGH, boss->sfxSource, 4);
boss->timer_054 = 90; boss->timer_054 = 90;
} }
break; break;
@ -1021,7 +1021,7 @@ void Andross_80189B70(Boss* boss) {
Camera_Update360(gPlayer, 1); Camera_Update360(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(NA_SE_OB_ROOT_EXPLOSION1, gDefaultSfxSource, 0); AUDIO_PLAY_SFX(NA_SE_OB_ROUTE_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(NA_SE_EN_ANDORF_EYE, gActors[10].sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_ANDROSS_EYE, gActors[10].sfxSource, 4);
AUDIO_PLAY_SFX(NA_SE_EN_ANDORF_EYE, gActors[11].sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_ANDROSS_EYE, gActors[11].sfxSource, 4);
AUDIO_PLAY_SFX(NA_SE_EN_ANDORF_SPARK, gActors[10].sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_ANDROSS_SPARK, gActors[10].sfxSource, 4);
AUDIO_PLAY_SFX(NA_SE_EN_ANDORF_SPARK, gActors[11].sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_ANDROSS_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;
@ -1577,7 +1577,7 @@ void Andross_Boss320_Init(Boss320* this) {
D_ctx_80177AB0 = 1; D_ctx_80177AB0 = 1;
this->info.hitbox[16] = 200.0f; this->info.hitbox[16] = 200.0f;
this->info.hitbox[22] = 200.0f; this->info.hitbox[22] = 200.0f;
Audio_PlaySequence(SEQ_PLAYER_BGM, SEQ_ID_AND_BOSS | SEQ_FLAG, 0, 0); Audio_PlaySequence(SEQ_PLAYER_BGM, NA_BGM_BOSS_ANDROSS, 0, 0);
} }
void Andross_8018D2B0(Boss* boss) { void Andross_8018D2B0(Boss* boss) {
@ -1594,9 +1594,9 @@ void Andross_8018D2B0(Boss* boss) {
if (boss->health <= 0) { if (boss->health <= 0) {
gScreenFlashTimer = 8; gScreenFlashTimer = 8;
AUDIO_PLAY_SFX(NA_SE_EN_DOWN_IMPACT, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_DOWN_IMPACT, boss->sfxSource, 4);
AUDIO_PLAY_SFX(NA_SE_EN_ANDORF_EXPLOSION, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_ANDROSS_EXPLOSION, boss->sfxSource, 4);
AUDIO_PLAY_SFX(NA_SE_VO_ANDORF_DEATH, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_VO_ANDROSS_DEATH, boss->sfxSource, 4);
Audio_KillSfxBySourceAndId(boss->sfxSource, NA_SE_EN_ANDORF_ROBOT); Audio_KillSfxBySourceAndId(boss->sfxSource, NA_SE_EN_ANDROSS_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;
@ -1609,7 +1609,7 @@ void Andross_8018D2B0(Boss* boss) {
AUDIO_PLAY_SFX(NA_SE_OB_DAMAGE_M, 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(NA_SE_VO_ANDORF_DEATH, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_VO_ANDROSS_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) {
@ -1639,7 +1639,7 @@ void Andross_8018D2B0(Boss* boss) {
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(NA_SE_VO_ANDORF_GROAN, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_VO_ANDROSS_GROAN, boss->sfxSource, 4);
} }
} }
break; break;
@ -1654,7 +1654,7 @@ void Andross_8018D2B0(Boss* boss) {
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(NA_SE_VO_ANDORF_GROAN, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_VO_ANDROSS_GROAN, boss->sfxSource, 4);
} }
} }
break; break;
@ -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(NA_SE_VO_ANDORF_LAUGH, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_VO_ANDROSS_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(NA_SE_VO_ANDORF_PUNCH, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_VO_ANDROSS_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(NA_SE_VO_ANDORF_PUNCH, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_VO_ANDROSS_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(NA_SE_VO_ANDORF_SLAP, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_VO_ANDROSS_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(NA_SE_VO_ANDORF_WHAND, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_VO_ANDROSS_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(NA_SE_EN_ANDORF_SPARK, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_ANDROSS_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(NA_SE_EN_ANDORF_BITE0, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_ANDROSS_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(NA_SE_EN_ANDORF_BITE1, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_ANDROSS_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(NA_SE_EN_ANDORF_VOMIT, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_ANDROSS_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(NA_SE_VO_ANDORF_CHOKE, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_VO_ANDROSS_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(NA_SE_EN_ANDORF_BREATH, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_ANDROSS_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(NA_SE_VO_ANDORF_EXCITE, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_VO_ANDROSS_EXCITE, boss->sfxSource, 4);
} }
if (boss->timer_050 == 15) { if (boss->timer_050 == 15) {
boss->swork[10] = 80; boss->swork[10] = 80;
@ -2581,8 +2581,8 @@ 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(NA_SE_EN_ANDORF_ROBOT, boss->sfxSource, 4); AUDIO_PLAY_SFX(NA_SE_EN_ANDROSS_ROBOT, boss->sfxSource, 4);
AUDIO_PLAY_BGM(SEQ_ID_AND_BOSS | SEQ_FLAG); AUDIO_PLAY_BGM(NA_BGM_BOSS_ANDROSS);
break; break;
} }
break; break;
@ -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, NA_SE_EN_ANDORF_BREATH); Audio_KillSfxBySourceAndId(boss->sfxSource, NA_SE_EN_ANDROSS_BREATH);
} }
if ((initialstate == 7) && (boss->state != 7)) { if ((initialstate == 7) && (boss->state != 7)) {
Audio_KillSfxBySourceAndId(boss->sfxSource, NA_SE_EN_ANDORF_SPARK); Audio_KillSfxBySourceAndId(boss->sfxSource, NA_SE_EN_ANDROSS_SPARK);
} }
} }
@ -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(NA_SE_OB_ROOT_EXPLOSION0, player->sfxSource, 0); AUDIO_PLAY_SFX(NA_SE_OB_ROUTE_EXPLOSION0, player->sfxSource, 0);
Audio_SetEnvSfxReverb(0); Audio_SetEnvSfxReverb(0);
} }
if (gCsFrameCount > 40) { if (gCsFrameCount > 40) {
@ -3632,7 +3632,7 @@ void Andross_80193C4C(Player* player) {
AUDIO_PLAY_SFX(NA_SE_WARP_HOLE, gDefaultSfxSource, 0); AUDIO_PLAY_SFX(NA_SE_WARP_HOLE, gDefaultSfxSource, 0);
break; break;
case 340: case 340:
Audio_KillSfxBySourceAndId(player->sfxSource, NA_SE_OB_ROOT_EXPLOSION0); Audio_KillSfxBySourceAndId(player->sfxSource, NA_SE_OB_ROUTE_EXPLOSION0);
Audio_SetEnvSfxReverb(0); Audio_SetEnvSfxReverb(0);
gVenomHardClear = 0; gVenomHardClear = 0;
gBlurAlpha = 255; gBlurAlpha = 255;
@ -3702,7 +3702,7 @@ void Andross_80193C4C(Player* player) {
} }
if (gCsFrameCount == 70) { if (gCsFrameCount == 70) {
AUDIO_PLAY_BGM(SEQ_ID_VE_CLEAR | SEQ_FLAG); AUDIO_PLAY_BGM(NA_BGM_ALL_CLEAR);
} }
if (gCsFrameCount == 150) { if (gCsFrameCount == 150) {
player->csState++; player->csState++;

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

@ -989,7 +989,7 @@ void SectorY_8019AEEC(Boss* boss) {
if ((boss->obj.pos.y != 365.0f) && (boss->swork[21] != 1)) { if ((boss->obj.pos.y != 365.0f) && (boss->swork[21] != 1)) {
if (boss->unk_04A != 0) { if (boss->unk_04A != 0) {
if (boss->unk_04A == 1) { if (boss->unk_04A == 1) {
Audio_PlaySequence(SEQ_PLAYER_BGM, SEQ_ID_BOSS_RESUME | SEQ_FLAG, 0, 0); Audio_PlaySequence(SEQ_PLAYER_BGM, NA_BGM_REAL_BOSS, 0, 0);
boss->unk_04A++; boss->unk_04A++;
gPlayer[0].cam.eye.x = 0.0f; gPlayer[0].cam.eye.x = 0.0f;
gPlayer[0].cam.eye.y = 200.0f; gPlayer[0].cam.eye.y = 200.0f;
@ -2136,7 +2136,7 @@ void SectorY_LevelComplete(Player* player) {
player->pos.z = 0.0f; player->pos.z = 0.0f;
player->csState++; player->csState++;
Audio_StartPlayerNoise(0); Audio_StartPlayerNoise(0);
AUDIO_PLAY_BGM(SEQ_ID_GOOD_END); AUDIO_PLAY_BGM(NA_BGM_COURSE_CLEAR);
D_ctx_80177A98 = 0; D_ctx_80177A98 = 0;
for (i = 0; i < 200; i++) { for (i = 0; i < 200; i++) {
@ -3042,7 +3042,7 @@ void SectorY_801A0AC0(Player* player) {
break; break;
case 360: case 360:
AUDIO_PLAY_BGM(SEQ_ID_INTRO_44); AUDIO_PLAY_BGM(NA_BGM_START_DEMO_S);
break; break;
case 389: case 389:
@ -3349,7 +3349,7 @@ void SectorY_801A0AC0(Player* player) {
D_ctx_80177A48[0] = 1.0f; D_ctx_80177A48[0] = 1.0f;
player->pos.z = player->trueZpos = 0.0f; player->pos.z = player->trueZpos = 0.0f;
player->baseSpeed = gArwingSpeed; player->baseSpeed = gArwingSpeed;
AUDIO_PLAY_BGM(SEQ_ID_SECTOR_Y | SEQ_FLAG); AUDIO_PLAY_BGM(NA_BGM_STAGE_SY);
gLevelStartStatusScreenTimer = 100; gLevelStartStatusScreenTimer = 100;
player->state_1C8 = PLAYERSTATE_1C8_ACTIVE; player->state_1C8 = PLAYERSTATE_1C8_ACTIVE;
player->csState = 0; player->csState = 0;

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

@ -432,7 +432,7 @@ void Venom2_LevelComplete(Player* player) {
} }
if (player->csEventTimer == 150) { if (player->csEventTimer == 150) {
Radio_PlayMessage(gMsg_ID_8215, RCID_FOX); Radio_PlayMessage(gMsg_ID_8215, RCID_FOX);
AUDIO_PLAY_BGM(SEQ_ID_TO_ANDROSS | SEQ_FLAG); AUDIO_PLAY_BGM(NA_BGM_DASH_INTO_BASE);
} }
if (player->csEventTimer == 1) { if (player->csEventTimer == 1) {
if ((gTeamShields[TEAM_ID_SLIPPY] > 0) || (gTeamShields[TEAM_ID_FALCO] > 0) || if ((gTeamShields[TEAM_ID_SLIPPY] > 0) || (gTeamShields[TEAM_ID_FALCO] > 0) ||

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

@ -1363,7 +1363,7 @@ void Map_8019E99C(void) {
D_menu_801CEA6C = 0.0f; D_menu_801CEA6C = 0.0f;
D_menu_801CEA70 = 0.002f; D_menu_801CEA70 = 0.002f;
AUDIO_PLAY_BGM(SEQ_ID_WORLD_MAP); AUDIO_PLAY_BGM(NA_BGM_MAP);
D_menu_801CEFC4 = 0; D_menu_801CEFC4 = 0;
D_menu_801CEFC8 = 0; D_menu_801CEFC8 = 0;
@ -2132,7 +2132,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(NA_BGM_MAP);
AUDIO_PLAY_SFX(NA_SE_MAP_MOVE_STOP, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_MAP_MOVE_STOP, gDefaultSfxSource, 4);
@ -3081,7 +3081,7 @@ void Map_801A36A8(void) {
D_menu_801CF080 = 1.0f; D_menu_801CF080 = 1.0f;
D_menu_801CD948 = 10; D_menu_801CD948 = 10;
AUDIO_PLAY_BGM(SEQ_ID_GAME_OVER); AUDIO_PLAY_BGM(NA_BGM_GAME_OVER);
break; break;
case 10: case 10:

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

@ -544,7 +544,7 @@ void Option_Setup(void) {
D_menu_801B91EC = 0; D_menu_801B91EC = 0;
D_menu_801B9244 = 0; D_menu_801B9244 = 0;
D_menu_801B9248 = 0; D_menu_801B9248 = 0;
AUDIO_PLAY_BGM(SEQ_ID_MENU); AUDIO_PLAY_BGM(NA_BGM_SELECT);
} }
void Option_Main(void) { void Option_Main(void) {
@ -1685,7 +1685,7 @@ 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(NA_SE_ARWING_CANCEL, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_ARWING_CANCEL, gDefaultSfxSource, 4);
AUDIO_PLAY_BGM(SEQ_ID_MENU); AUDIO_PLAY_BGM(NA_BGM_SELECT);
gDrawMode = DRAW_NONE; gDrawMode = DRAW_NONE;
D_menu_801B9124 = 1000; D_menu_801B9124 = 1000;
D_menu_801B912C = 0; D_menu_801B912C = 0;
@ -2641,7 +2641,7 @@ void Option_VersusMenuInit(void) {
s32 i; s32 i;
if (D_menu_801B91C4) { if (D_menu_801B91C4) {
AUDIO_PLAY_BGM(SEQ_ID_VS_MENU); AUDIO_PLAY_BGM(NA_BGM_VS_SELECT);
} }
D_menu_801B93D0 = D_menu_801B9124; D_menu_801B93D0 = D_menu_801B9124;
@ -2722,7 +2722,7 @@ void Option_8019949C(void) {
AUDIO_PLAY_SFX(NA_SE_CANCEL, 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(NA_BGM_SELECT);
AUDIO_PLAY_SFX(NA_SE_ARWING_CANCEL, 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;
@ -3941,7 +3941,7 @@ void Option_8019CBC0(void) {
s32 temp; s32 temp;
s32 i; s32 i;
AUDIO_PLAY_BGM(SEQ_ID_MENU); AUDIO_PLAY_BGM(NA_BGM_SELECT);
gBlurAlpha = 208; gBlurAlpha = 208;
gStarCount = 800; gStarCount = 800;

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

@ -708,7 +708,7 @@ void Title_801881FC(void) {
D_menu_801B86A4 = 0; D_menu_801B86A4 = 0;
D_menu_801B82B0 = 100; D_menu_801B82B0 = 100;
AUDIO_PLAY_BGM(SEQ_ID_TITLE); AUDIO_PLAY_BGM(NA_BGM_TITLE);
} }
void Title_801888E8(void) { void Title_801888E8(void) {
@ -989,7 +989,7 @@ void Title_801894E8(void) {
D_menu_801B7BF0 = 0; D_menu_801B7BF0 = 0;
AUDIO_PLAY_BGM(SEQ_ID_OPENING); AUDIO_PLAY_BGM(NA_BGM_OPENING);
} }
void Title_8018994C(void) { void Title_8018994C(void) {