MGislv/ooot
1
0
Fork 0
mirror of https://github.com/blawar/ooot.git synced 2024-06-25 22:09:34 +00:00
Code Releases Wiki Activity

Added documentation for audio.cpp

Browse Source
This commit is contained in:
DaMarkov 2022-02-28 00:01:16 +01:00 committed by Blake Warner
parent 67fd7264bb
commit 6dc0e758b4
109 changed files with 771 additions and 804 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/audiomgr.h
View File

@ -30,4 +30,4 @@ struct AudioMgr {
extern Vec3f D_801333D4;
extern f32 D_801333E0;
extern s8 D_801333E8;
extern s8 gReverbAdd2;

12
include/def/audio.h
View File

@ -51,7 +51,7 @@ void func_800F3054(void);
void func_800F3F3C(u8);
void func_800F4010(Vec3f* pos, u16 sfxId, f32);
void func_800F4138(Vec3f* pos, u16 sfxId, f32);
void func_800F4190(Vec3f* pos, u16 sfxId);
void Audio_PlaySoundWithPos(Vec3f* pos, u16 sfxId);
void func_800F4254(Vec3f* pos, u8 arg1);
void func_800F436C(Vec3f*, u16 sfxId, f32 arg2);
void func_800F4414(Vec3f*, u16 sfxId, f32 arg2);
@ -64,11 +64,11 @@ void func_800F4870(u8);
void func_800F4A54(u8);
void func_800F4C58(Vec3f* pos, u16 sfxId, u8);
void func_800F4E30(Vec3f* pos, f32);
void func_800F5510(u16 seqId);
void Audio_PlaySequence2(u16 seqId);
void Audio_PlaySequence(u16 seqId);
void func_800F5718(void);
void func_800F574C(f32 arg0, u8 arg2);
void func_800F5918(void);
void Audio_PlayWindmill(void);
void Audio_PlayFanfare(f32 arg0, u8 arg2);
void Audio_UpdateTempo(void);
void func_800F595C(u16);
void func_800F59E8(u16);
s32 func_800F5A58(u8);
@ -76,7 +76,7 @@ void func_800F5ACC(u16 bgmID);
void func_800F5B58(void);
void func_800F5BF0(u8 arg0);
void func_800F5C2C(void);
void func_800F5E18(u8 playerIdx, u16 seqId, u8 fadeTimer, s8 arg3, s8 arg4);
void Audio_SendStartSequence(u8 playerIdx, u16 seqId, u8 fadeTimer, s8 arg3, s8 arg4);
void func_800F6268(f32 dist, u16);
void func_800F64E0(u8 arg0);
void func_800F6584(u8 arg0);

12
include/def/audio_bank.h
View File

@ -1,6 +1,6 @@
#pragma once
struct Vec3f;
struct unk_D_8016E750;
struct AudioPlayer;
struct ActiveSound;
struct AudioContext;
struct SoundBankEntry;
@ -9,10 +9,10 @@ extern char D_80133390[];
extern char D_80133398[];
extern Vec3f D_801333D4;
extern f32 D_801333E0;
extern s8 D_801333E8;
extern s8 gReverbAdd2;
extern u8 D_801333F0;
extern u8 D_8016E348[4];
extern unk_D_8016E750 D_8016E750[4];
extern u8 gAudioPlayerInfoNum[4];
extern AudioPlayer gAudioPlayers[4];
extern ActiveSound gActiveSounds[7][3]; // MAX_CHANNELS_PER_BANK = 3
extern AudioContext gAudioContext;
extern u8 gAudioSfxSwapMode[10];
@ -40,6 +40,6 @@ void Audio_StopSfxByPos(Vec3f*);
void Audio_StopSfxByPosAndBank(u8, Vec3f*);
void Audio_StopSfxByPosAndId(Vec3f* pos, u16 sfxId);
void Audio_StopSfxByTokenAndId(u8, u16);
void func_800F8884(u8, Vec3f*);
void func_800F8F88(void);
void Audio_StopByBankIDAndPos(u8, Vec3f*);
void Audio_UpdateActiveSounds(void);
void Audio_StopAllBanks(void);

8
include/def/audio_command.h
View File

@ -4,10 +4,10 @@ void Audio_ProcessSeqCmd(u32);
void Audio_ProcessSeqCmds(void);
void Audio_QueueSeqCmd(u32 bgmID);
void Audio_SetVolScale(u8 playerIdx, u8 scaleIdx, u8 targetVol, u8 volFadeTimer);
void func_800F9280(u8 playerIdx, u8 seqId, u8 arg2, u16 fadeTimer);
void func_800F9474(u8, u16);
u16 func_800FA0B4(u8 a0);
s32 func_800FA11C(u32 arg0, u32 arg1);
void Audio_PlaySequenceInternal(u8 playerIdx, u8 seqId, u8 arg2, u16 fadeTimer);
void Audio_SendDisableSequence(u8, u16);
u16 Audio_GetSequenceBeingPlayed(u8 a0);
s32 Audio_IsCommandNotIssued(u32 arg0, u32 arg1);
void func_800FA174(u8);
void func_800FA18C(u8, u8);
void func_800FA3DC(void);

4
include/variables.h
View File

@ -203,9 +203,9 @@ extern u8 gSoundBankMuted[];
extern u16 gAudioSfxSwapSource[10];
extern u16 gAudioSfxSwapTarget[10];
extern u8 gAudioSfxSwapMode[10];
extern u8 D_8016E348[4];
extern u8 gAudioPlayerInfoNum[4];
extern u32 sAudioSeqCmds[0x100];
extern unk_D_8016E750 D_8016E750[4];
extern AudioPlayer gAudioPlayers[4];
extern AudioContext gAudioContext;
extern void(*D_801755D0)(void);

12
include/z64audio.h
View File

@ -1036,7 +1036,7 @@ struct unk_50_s {
/* 0x1C */ u16 unk_1C;
}; // size = 0x20
struct unk_D_8016E750 {
struct AudioPlayer {
/* 0x000 */ f32 volCur;
/* 0x004 */ f32 volTarget;
/* 0x008 */ f32 unk_08;
@ -1057,7 +1057,7 @@ struct unk_D_8016E750 {
/* 0x050 */ unk_50_s unk_50[0x10];
/* 0x250 */ u16 unk_250;
/* 0x252 */ u16 unk_252;
/* 0x254 */ u16 unk_254;
/* 0x254 */ u16 seqAndFlags;
/* 0x256 */ u16 unk_256;
/* 0x258 */ u16 unk_258;
/* 0x25C */ u32 unk_25C;
@ -1213,10 +1213,10 @@ extern char D_80133398[];
extern u8 gSfxChannelLayout;
extern Vec3f D_801333D4;
extern f32 D_801333E0;
extern s8 D_801333E8;
extern s8 gReverbAdd2;
extern u8 D_801333F0;
extern u8 gAudioSfxSwapOff;
extern u8 D_80133408;
extern u8 gAudioDisable;
extern u8 D_8013340C;
extern u8 gAudioSpecId;
extern u8 D_80133418;
@ -1236,9 +1236,9 @@ extern u8 gSoundBankMuted[];
extern u16 gAudioSfxSwapSource[10];
extern u16 gAudioSfxSwapTarget[10];
extern u8 gAudioSfxSwapMode[10];
extern u8 D_8016E348[4];
extern u8 gAudioPlayerInfoNum[4];
extern u32 sAudioSeqCmds[0x100];
extern unk_D_8016E750 D_8016E750[4];
extern AudioPlayer gAudioPlayers[4];
extern AudioContext gAudioContext;
extern void(*D_801755D0)(void);

179
src/code/audio.cpp
View File

@ -120,7 +120,7 @@ u8 gUsedChannelsPerBank[4][7] = {
};
f32 D_801305B0 = 0.7950898f;
s8 D_801305B4 = 35;
s8 gReverbAdd = 35;
s8 D_801305B8 = 20;
s8 D_801305BC = 30;
s8 D_801305C0 = 20;
@ -727,7 +727,7 @@ s32 sAudioUpdateTaskEnd;
void PadMgr_RequestPadData(PadMgr* padmgr, Input* inputs, s32 mode);
void Audio_StepFreqLerp(FreqLerp* lerp);
void func_800F56A8(void);
void Audio_UpdateScriptIO(void);
void func_800F6FB4(u8);
s32 Audio_SetGanonDistVol(u8 targetVol);
@ -1093,7 +1093,7 @@ void func_800ED458(s32 arg0) {
if ((sCurOcarinaBtnVal != 0xFF) && (sPrevOcarinaNoteVal != sCurOcarinaBtnVal)) {
Audio_QueueCmdS8(CHAN_UPD_SCRIPT_IO << 24 | SEQ_PLAYER_SFX << 16 | 0xD07, D_80130F10 - 1);
Audio_QueueCmdS8(CHAN_UPD_SCRIPT_IO << 24 | SEQ_PLAYER_SFX << 16 | 0xD05, sCurOcarinaBtnVal);
Audio_PlaySoundGeneral(NA_SE_OC_OCARINA, &D_801333D4, 4, &D_80130F24, &D_80130F28, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_OC_OCARINA, &D_801333D4, 4, &D_80130F24, &D_80130F28, &gReverbAdd2);
} else if ((sPrevOcarinaNoteVal != 0xFF) && (sCurOcarinaBtnVal == 0xFF)) {
Audio_StopSfxById(NA_SE_OC_OCARINA);
}
@ -1230,7 +1230,7 @@ void Audio_OcaPlayback(void) {
Audio_QueueCmdS8(CHAN_UPD_SCRIPT_IO << 24 | SEQ_PLAYER_SFX << 16 | 0xD07, D_80130F10 - 1);
Audio_QueueCmdS8(CHAN_UPD_SCRIPT_IO << 24 | SEQ_PLAYER_SFX << 16 | 0xD05, sDisplayedNoteValue & 0x3F);
Audio_PlaySoundGeneral(NA_SE_OC_OCARINA, &D_801333D4, 4, &sNormalizedNotePlaybackTone,
&sNormalizedNotePlaybackVolume, &D_801333E8);
&sNormalizedNotePlaybackVolume, &gReverbAdd2);
} else {
Audio_StopSfxById(NA_SE_OC_OCARINA);
}
@ -1758,7 +1758,7 @@ void AudioDebug_ProcessInput_SndCont(void) {
case 2:
case 3:
Audio_PlaySoundGeneral(((sAudioSndContWork[2] << 12) & 0xFFFF) + sAudioSndContWork[3] + SFX_FLAG,
&D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
&D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
break;
case 4:
Audio_SetSettings(sAudioSndContWork[sAudioSndContSel]);
@ -1803,14 +1803,12 @@ void AudioDebug_ProcessInput_SndCont(void) {
if (CHECK_BTN_ANY(sDebugPadPress, BTN_CDOWN)) {
if (sAudioSndContSel == 0) {
if (1) {}
func_800F595C(sAudioSndContWork[sAudioSndContSel]);
}
}
if (CHECK_BTN_ANY(sDebugPadPress, BTN_CRIGHT)) {
if (sAudioSndContSel == 0) {
if (1) {}
func_800F5ACC(sAudioSndContWork[sAudioSndContSel]);
}
}
@ -2159,7 +2157,7 @@ void AudioDebug_ProcessInput_SfxParamChg(void) {
if (CHECK_BTN_ANY(sDebugPadPress, BTN_A)) {
sfx = (u16)(sAudioSfxParamChgWork[0] << 12) + sAudioSfxParamChgWork[1] + SFX_FLAG;
Audio_PlaySoundGeneral(sfx, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(sfx, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
if (CHECK_BTN_ANY(sDebugPadPress, BTN_B)) {
@ -2238,7 +2236,7 @@ void AudioDebug_ProcessInput(void) {
if (CHECK_BTN_ANY(sDebugPadPress, BTN_A)) {
sAudioSndContWork[5] ^= 1;
Audio_SeqCmdE01(SEQ_PLAYER_BGM_MAIN, sAudioSndContWork[5]);
if (func_800FA0B4(SEQ_PLAYER_BGM_MAIN) != NA_BGM_NATURE_AMBIENCE) {
if (Audio_GetSequenceBeingPlayed(SEQ_PLAYER_BGM_MAIN) != NA_BGM_NATURE_AMBIENCE) {
Audio_SeqDisablePlayer(SEQ_PLAYER_BGM_MAIN, 0);
}
Audio_SeqDisablePlayer(SEQ_PLAYER_FANFARE, 0);
@ -2298,14 +2296,14 @@ void func_800F3054(void) {
Audio_StepFreqLerp(&sRiverFreqScaleLerp);
Audio_StepFreqLerp(&sWaterfallFreqScaleLerp);
func_800F4A70();
func_800F56A8();
Audio_UpdateScriptIO();
func_800F5CF8();
if (gAudioSpecId == 7) {
Audio_ClearSariaBgm();
}
Audio_ProcessSoundRequests();
Audio_ProcessSeqCmds();
func_800F8F88();
Audio_UpdateActiveSounds();
func_800FA3DC();
AudioDebug_SetInput();
AudioDebug_ProcessInput();
@ -2315,12 +2313,6 @@ void func_800F3054(void) {
}
}
void func_800F3138(UNK_TYPE arg0) {
}
void func_800F3140(UNK_TYPE arg0, UNK_TYPE arg1) {
}
void func_800F314C(s8 arg0) {
Audio_QueueCmdS32(CHAN_LOAD_UKN_82 << 24 | SEQ_PLAYER_BGM_MAIN << 16 | (((u8)arg0 & 0xFF) << 8), 1);
}
@ -2710,7 +2702,7 @@ void func_800F4010(Vec3f* pos, u16 sfxId, f32 arg2) {
D_80131C8C = arg2;
sp24 = func_800F3F84(arg2);
Audio_PlaySoundGeneral(sfxId, pos, 4, &D_8016B7B0, &D_8016B7A8, &D_801333E8);
Audio_PlaySoundGeneral(sfxId, pos, 4, &D_8016B7B0, &D_8016B7A8, &gReverbAdd2);
if ((sfxId & 0xF0) == 0xB0) {
phi_f0 = 0.3f;
@ -2728,22 +2720,22 @@ void func_800F4010(Vec3f* pos, u16 sfxId, f32 arg2) {
sfxId2 = NA_SE_PL_METALEFFECT_KID;
}
D_8016B7AC = (sp24 * 0.7) + 0.3;
Audio_PlaySoundGeneral(sfxId2, pos, 4, &D_8016B7B0, &D_8016B7AC, &D_801333E8);
Audio_PlaySoundGeneral(sfxId2, pos, 4, &D_8016B7B0, &D_8016B7AC, &gReverbAdd2);
}
}
void func_800F4138(Vec3f* pos, u16 sfxId, f32 arg2) {
func_800F3F84(arg2);
Audio_PlaySoundGeneral(sfxId, pos, 4, &D_8016B7B0, &D_8016B7A8, &D_801333E8);
Audio_PlaySoundGeneral(sfxId, pos, 4, &D_8016B7B0, &D_8016B7A8, &gReverbAdd2);
}
void func_800F4190(Vec3f* pos, u16 sfxId) {
Audio_PlaySoundGeneral(sfxId, pos, 4, &D_801305B0, &D_801333E0, &D_801305B4);
void Audio_PlaySoundWithPos(Vec3f* pos, u16 sfxId) {
Audio_PlaySoundGeneral(sfxId, pos, 4, &D_801305B0, &D_801333E0, &gReverbAdd);
}
void Audio_PlaySoundRandom(Vec3f* pos, u16 baseSfxId, u8 randLim) {
u8 offset = Audio_NextRandom() % randLim;
Audio_PlaySoundGeneral(baseSfxId + offset, pos, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(baseSfxId + offset, pos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
void func_800F4254(Vec3f* pos, u8 level) {
@ -2752,10 +2744,10 @@ void func_800F4254(Vec3f* pos, u8 level) {
D_801305F4 = D_801305E4[level];
switch (level) {
case 1:
Audio_PlaySoundGeneral(NA_SE_PL_SWORD_CHARGE, pos, 4, &D_801305F4, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_PL_SWORD_CHARGE, pos, 4, &D_801305F4, &D_801333E0, &gReverbAdd2);
break;
case 2:
Audio_PlaySoundGeneral(NA_SE_PL_SWORD_CHARGE, pos, 4, &D_801305F4, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_PL_SWORD_CHARGE, pos, 4, &D_801305F4, &D_801333E0, &gReverbAdd2);
break;
}
@ -2763,7 +2755,7 @@ void func_800F4254(Vec3f* pos, u8 level) {
}
if (level != 0) {
Audio_PlaySoundGeneral(NA_SE_IT_SWORD_CHARGE - SFX_FLAG, pos, 4, &D_801305F4, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_IT_SWORD_CHARGE - SFX_FLAG, pos, 4, &D_801305F4, &D_801333E0, &gReverbAdd2);
}
}
@ -2775,14 +2767,14 @@ void func_800F436C(Vec3f* pos, u16 sfxId, f32 arg2) {
}
if (D_8016B7D8 > 0.5f) {
Audio_PlaySoundGeneral(sfxId, pos, 4, &D_8016B7D8, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(sfxId, pos, 4, &D_8016B7D8, &D_801333E0, &gReverbAdd2);
}
}
void func_800F4414(Vec3f* pos, u16 sfxId, f32 arg2) {
D_801305B8--;
if (D_801305B8 == 0) {
Audio_PlaySoundGeneral(sfxId, pos, 4, &D_8016B7D8, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(sfxId, pos, 4, &D_8016B7D8, &D_801333E0, &gReverbAdd2);
if (arg2 > 2.0f) {
arg2 = 2.0f;
@ -2804,7 +2796,7 @@ void func_800F4524(Vec3f* pos, u16 sfxId, s8 arg2) {
void func_800F4578(Vec3f* pos, u16 sfxId, f32 arg2) {
D_8016B7E0 = arg2;
Audio_PlaySoundGeneral(sfxId, pos, 4, &D_801333E0, &D_8016B7E0, &D_801333E8);
Audio_PlaySoundGeneral(sfxId, pos, 4, &D_801333E0, &D_8016B7E0, &gReverbAdd2);
}
void func_800F45D0(f32 arg0) {
@ -2821,7 +2813,7 @@ void Audio_PlaySoundRiver(Vec3f* pos, f32 freqScale) {
sRiverFreqScaleLerp.step = (sRiverFreqScaleLerp.target - sRiverFreqScaleLerp.value) / 40;
}
Audio_PlaySoundGeneral(NA_SE_EV_RIVER_STREAM - SFX_FLAG, pos, 4, &sRiverFreqScaleLerp.value, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
}
void Audio_PlaySoundWaterfall(Vec3f* pos, f32 freqScale) {
@ -2833,7 +2825,7 @@ void Audio_PlaySoundWaterfall(Vec3f* pos, f32 freqScale) {
sWaterfallFreqScaleLerp.step = (sWaterfallFreqScaleLerp.target - sWaterfallFreqScaleLerp.value) / 40;
}
Audio_PlaySoundGeneral(NA_SE_EV_WATER_WALL_BIG - SFX_FLAG, pos, 4, &sWaterfallFreqScaleLerp.value,
&sWaterfallFreqScaleLerp.value, &D_801333E8);
&sWaterfallFreqScaleLerp.value, &gReverbAdd2);
}
void Audio_StepFreqLerp(FreqLerp* lerp) {
@ -2948,7 +2940,7 @@ void func_800F4A70(void) {
void Audio_PlaySoundIncreasinglyTransposed(Vec3f* pos, s16 sfxId, u8* semitones) {
Audio_PlaySoundGeneral(sfxId, pos, 4, &gNoteFrequencies[semitones[sAudioIncreasingTranspose] + 39], &D_801333E0,
&D_801333E8);
&gReverbAdd2);
if (sAudioIncreasingTranspose < 15) {
sAudioIncreasingTranspose++;
@ -2960,7 +2952,7 @@ void Audio_ResetIncreasingTranspose(void) {
}
void Audio_PlaySoundTransposed(Vec3f* pos, u16 sfxId, s8 semitone) {
Audio_PlaySoundGeneral(sfxId, pos, 4, &gNoteFrequencies[semitone + 39], &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(sfxId, pos, 4, &gNoteFrequencies[semitone + 39], &D_801333E0, &gReverbAdd2);
}
void func_800F4C58(Vec3f* pos, u16 sfxId, u8 arg2) {
@ -2980,7 +2972,7 @@ void func_800F4C58(Vec3f* pos, u16 sfxId, u8 arg2) {
}
phi_s1++;
}
Audio_PlaySoundGeneral(sfxId, pos, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(sfxId, pos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
void func_800F4E30(Vec3f* pos, f32 arg1) {
@ -3048,8 +3040,8 @@ void Audio_SplitBgmChannels(s8 volSplit) {
u8 channelIdx;
u8 i;
if ((func_800FA0B4(SEQ_PLAYER_FANFARE) == NA_BGM_DISABLED) &&
(func_800FA0B4(SEQ_PLAYER_BGM_SUB) != NA_BGM_LONLON)) {
if ((Audio_GetSequenceBeingPlayed(SEQ_PLAYER_FANFARE) == NA_BGM_DISABLED) &&
(Audio_GetSequenceBeingPlayed(SEQ_PLAYER_BGM_SUB) != NA_BGM_LONLON)) {
for (i = 0; i < ARRAY_COUNT(bgmPlayers); i++) {
if (i == 0) {
// Main Bgm SeqPlayer
@ -3096,7 +3088,7 @@ void Audio_PlaySariaBgm(Vec3f* pos, u16 seqId, u16 distMax) {
dist = sqrtf(SQ(pos->z) + SQ(pos->x));
if (sSariaBgmPtr == NULL) {
sSariaBgmPtr = pos;
func_800F5E18(SEQ_PLAYER_BGM_SUB, seqId, 0, 7, 2);
Audio_SendStartSequence(SEQ_PLAYER_BGM_SUB, seqId, 0, 7, 2);
} else {
prevDist = sqrtf(SQ(sSariaBgmPtr->z) + SQ(sSariaBgmPtr->x));
if (dist < prevDist) {
@ -3132,18 +3124,18 @@ void Audio_ClearSariaBgm2(void) {
sSariaBgmPtr = NULL;
}
void func_800F5510(u16 seqId) {
void Audio_PlaySequence2(u16 seqId) {
Audio_PlaySequence(seqId);
func_800F5E18(SEQ_PLAYER_BGM_MAIN, seqId, 0, 0, 1);
Audio_SendStartSequence(SEQ_PLAYER_BGM_MAIN, seqId, 0, 0, 1);
}
void Audio_PlaySequence(u16 seqId) {
u8 sp27 = 0;
u16 nv;
if (func_800FA0B4(SEQ_PLAYER_BGM_MAIN) != NA_BGM_WINDMILL) {
if (func_800FA0B4(SEQ_PLAYER_BGM_SUB) == NA_BGM_LONLON) {
func_800F9474(SEQ_PLAYER_BGM_SUB, 0);
if (Audio_GetSequenceBeingPlayed(SEQ_PLAYER_BGM_MAIN) != NA_BGM_WINDMILL) {
if (Audio_GetSequenceBeingPlayed(SEQ_PLAYER_BGM_SUB) == NA_BGM_LONLON) {
Audio_SendDisableSequence(SEQ_PLAYER_BGM_SUB, 0);
Audio_QueueCmdS32(QUEUE_FINISHED << 24, 0);
}
@ -3153,12 +3145,12 @@ void Audio_PlaySequence(u16 seqId) {
sp27 = 0x1E;
}
func_800F5E18(SEQ_PLAYER_BGM_MAIN, seqId, sp27, 7, D_8013062C);
Audio_SendStartSequence(SEQ_PLAYER_BGM_MAIN, seqId, sp27, 7, D_8013062C);
D_8013062C = 0;
} else {
nv = (sSeqFlags[(seqId & 0xFF) & 0xFF] & 0x40) ? 1 : 0xFF;
func_800F5E18(SEQ_PLAYER_BGM_MAIN, seqId, 0, 7, nv);
Audio_SendStartSequence(SEQ_PLAYER_BGM_MAIN, seqId, 0, 7, nv);
if (!(sSeqFlags[seqId] & 0x20)) {
D_8013062C = 0xC0;
}
@ -3167,13 +3159,10 @@ void Audio_PlaySequence(u16 seqId) {
}
}
void func_800F56A8(void) {
u16 temp_v0;
u8 bvar;
temp_v0 = func_800FA0B4(SEQ_PLAYER_BGM_MAIN);
bvar = temp_v0 & 0xFF;
if ((temp_v0 != NA_BGM_DISABLED) && (sSeqFlags[bvar] & 0x10)) {
void Audio_UpdateScriptIO(void) {
u16 seqAndFlags = Audio_GetSequenceBeingPlayed(SEQ_PLAYER_BGM_MAIN);
u8 seq = seqAndFlags & 0xFF;
if ((seqAndFlags != NA_BGM_DISABLED) && (sSeqFlags[seq] & 0x10)) {
if (D_8013062C != 0xC0) {
D_8013062C = gAudioContext.seqPlayers[SEQ_PLAYER_BGM_MAIN].soundScriptIO[3];
} else {
@ -3182,13 +3171,13 @@ void func_800F56A8(void) {
}
}
void func_800F5718(void) {
if (func_800FA0B4(SEQ_PLAYER_BGM_MAIN) != NA_BGM_WINDMILL) {
void Audio_PlayWindmill(void) {
if (Audio_GetSequenceBeingPlayed(SEQ_PLAYER_BGM_MAIN) != NA_BGM_WINDMILL) {
Audio_StartSeq(SEQ_PLAYER_BGM_MAIN, 0, NA_BGM_WINDMILL);
}
}
void func_800F574C(f32 arg0, u8 arg2) {
void Audio_PlayFanfare(f32 arg0, u8 arg2) {
if (arg0 == 1.0f) {
Audio_SeqUpdateTempo2(SEQ_PLAYER_BGM_MAIN, arg2, 0);
} else {
@ -3197,8 +3186,8 @@ void func_800F574C(f32 arg0, u8 arg2) {
Audio_SeqStartWithSetup(SEQ_PLAYER_FANFARE, 0xA0, arg2, arg0 * 100.0f);
}
void func_800F5918(void) {
if (func_800FA0B4(SEQ_PLAYER_BGM_MAIN) == NA_BGM_MINI_GAME_2 && func_800FA11C(0, 0xF0000000)) {
void Audio_UpdateTempo(void) {
if (Audio_GetSequenceBeingPlayed(SEQ_PLAYER_BGM_MAIN) == NA_BGM_MINI_GAME_2 && Audio_IsCommandNotIssued(0, 0xF0000000)) {
Audio_SeqUpdateTempo(SEQ_PLAYER_BGM_MAIN, 5, 0, 0xD2);
}
}
@ -3212,7 +3201,7 @@ void func_800F595C(u16 arg0) {
Audio_StartSeq(SEQ_PLAYER_FANFARE, 0, arg0);
} else {
func_800F5E18(SEQ_PLAYER_BGM_MAIN, arg0, 0, 7, -1);
Audio_SendStartSequence(SEQ_PLAYER_BGM_MAIN, arg0, 0, 7, -1);
Audio_SeqDisablePlayer(SEQ_PLAYER_FANFARE, 0);
}
}
@ -3238,7 +3227,7 @@ s32 func_800F5A58(u8 arg0) {
phi_a1 = 1;
}
if (arg0 == (u8)func_800FA0B4(phi_a1)) {
if (arg0 == (u8)Audio_GetSequenceBeingPlayed(phi_a1)) {
return 1;
} else {
return 0;
@ -3248,7 +3237,7 @@ s32 func_800F5A58(u8 arg0) {
void func_800F5ACC(u16 seqId) {
u16 temp_v0;
temp_v0 = func_800FA0B4(SEQ_PLAYER_BGM_MAIN);
temp_v0 = Audio_GetSequenceBeingPlayed(SEQ_PLAYER_BGM_MAIN);
if ((temp_v0 & 0xFF) != NA_BGM_GANON_TOWER && (temp_v0 & 0xFF) != NA_BGM_ESCAPE && temp_v0 != seqId) {
Audio_SetSequenceMode(SEQ_MODE_IGNORE);
if (temp_v0 != NA_BGM_DISABLED) {
@ -3261,8 +3250,8 @@ void func_800F5ACC(u16 seqId) {
}
void func_800F5B58(void) {
if ((func_800FA0B4(SEQ_PLAYER_BGM_MAIN) != NA_BGM_DISABLED) && (D_80130628 != NA_BGM_DISABLED) &&
(sSeqFlags[func_800FA0B4(SEQ_PLAYER_BGM_MAIN) & 0xFF] & 8)) {
if ((Audio_GetSequenceBeingPlayed(SEQ_PLAYER_BGM_MAIN) != NA_BGM_DISABLED) && (D_80130628 != NA_BGM_DISABLED) &&
(sSeqFlags[Audio_GetSequenceBeingPlayed(SEQ_PLAYER_BGM_MAIN) & 0xFF] & 8)) {
if (D_80130628 == NA_BGM_DISABLED) {
Audio_SeqDisablePlayer(SEQ_PLAYER_BGM_MAIN, 0);
} else {
@ -3275,7 +3264,7 @@ void func_800F5B58(void) {
void func_800F5BF0(u8 arg0) {
u16 temp_v0;
temp_v0 = func_800FA0B4(SEQ_PLAYER_BGM_MAIN);
temp_v0 = Audio_GetSequenceBeingPlayed(SEQ_PLAYER_BGM_MAIN);
if (temp_v0 != NA_BGM_NATURE_AMBIENCE) {
D_80130628 = temp_v0;
}
@ -3295,7 +3284,7 @@ void Audio_PlayFanfare(u16 seqId) {
u8* sp1C;
u8* sp18;
sp26 = func_800FA0B4(SEQ_PLAYER_FANFARE);
sp26 = Audio_GetSequenceBeingPlayed(SEQ_PLAYER_FANFARE);
sp1C = func_800E5E84(sp26 & 0xFF, &sp20);
sp18 = func_800E5E84(seqId & 0xFF, &sp20);
if ((sp26 == NA_BGM_DISABLED) || (*sp1C == *sp18)) {
@ -3317,9 +3306,9 @@ void func_800F5CF8(void) {
if (D_8016B9F4 == 0) {
Audio_QueueCmdS32(CHAN_LOAD_POP_CACHE << 24, SEQUENCE_TABLE);
Audio_QueueCmdS32(CHAN_LOAD_POP_CACHE << 24, FONT_TABLE);
func_800FA0B4(SEQ_PLAYER_BGM_MAIN);
sp26 = func_800FA0B4(SEQ_PLAYER_FANFARE);
sp22 = func_800FA0B4(SEQ_PLAYER_BGM_SUB);
Audio_GetSequenceBeingPlayed(SEQ_PLAYER_BGM_MAIN);
sp26 = Audio_GetSequenceBeingPlayed(SEQ_PLAYER_FANFARE);
sp22 = Audio_GetSequenceBeingPlayed(SEQ_PLAYER_BGM_SUB);
if (sp26 == NA_BGM_DISABLED) {
Audio_SetVolScale(SEQ_PLAYER_BGM_MAIN, 1, 0, 5);
Audio_SetVolScale(SEQ_PLAYER_BGM_SUB, 1, 0, 5);
@ -3339,7 +3328,7 @@ void func_800F5CF8(void) {
}
}
void func_800F5E18(u8 playerIdx, u16 seqId, u8 fadeTimer, s8 arg3, s8 arg4) {
void Audio_SendStartSequence(u8 playerIdx, u16 seqId, u8 fadeTimer, s8 arg3, s8 arg4) {
Audio_SeqSetIoPortGlobal(playerIdx, arg3, arg4);
Audio_StartSeq(playerIdx, fadeTimer, seqId);
}
@ -3355,9 +3344,9 @@ void Audio_SetSequenceMode(u8 seqMode) {
seqMode = SEQ_MODE_IGNORE;
}
seqId = D_8016E750[SEQ_PLAYER_BGM_MAIN].unk_254;
seqId = gAudioPlayers[SEQ_PLAYER_BGM_MAIN].seqAndFlags;
if (seqId == NA_BGM_FIELD_LOGIC && func_800FA0B4(SEQ_PLAYER_BGM_SUB) == (NA_BGM_ENEMY | 0x800)) {
if (seqId == NA_BGM_FIELD_LOGIC && Audio_GetSequenceBeingPlayed(SEQ_PLAYER_BGM_SUB) == (NA_BGM_ENEMY | 0x800)) {
seqMode = SEQ_MODE_IGNORE;
}
@ -3366,10 +3355,10 @@ void Audio_SetSequenceMode(u8 seqMode) {
if (seqMode != (sPrevSeqMode & 0x7F)) {
if (seqMode == SEQ_MODE_ENEMY) {
// Start playing enemy bgm
if (D_8016E750[SEQ_PLAYER_BGM_SUB].volScales[1] - sAudioEnemyVol < 0) {
volumeFadeInTimer = -(D_8016E750[SEQ_PLAYER_BGM_SUB].volScales[1] - sAudioEnemyVol);
if (gAudioPlayers[SEQ_PLAYER_BGM_SUB].volScales[1] - sAudioEnemyVol < 0) {
volumeFadeInTimer = -(gAudioPlayers[SEQ_PLAYER_BGM_SUB].volScales[1] - sAudioEnemyVol);
} else {
volumeFadeInTimer = D_8016E750[SEQ_PLAYER_BGM_SUB].volScales[1] - sAudioEnemyVol;
volumeFadeInTimer = gAudioPlayers[SEQ_PLAYER_BGM_SUB].volScales[1] - sAudioEnemyVol;
}
Audio_SetVolScale(SEQ_PLAYER_BGM_SUB, 3, sAudioEnemyVol, volumeFadeInTimer);
@ -3432,11 +3421,11 @@ void Audio_SetBgmEnemyVolume(f32 dist) {
sAudioEnemyVol = ((350.0f - adjDist) * 127.0f) / 350.0f;
Audio_SetVolScale(SEQ_PLAYER_BGM_SUB, 3, sAudioEnemyVol, 10);
if (D_8016E750[SEQ_PLAYER_BGM_MAIN].unk_254 != NA_BGM_NATURE_AMBIENCE) {
if (gAudioPlayers[SEQ_PLAYER_BGM_MAIN].seqAndFlags != NA_BGM_NATURE_AMBIENCE) {
Audio_SetVolScale(SEQ_PLAYER_BGM_MAIN, 3, (0x7F - sAudioEnemyVol), 10);
}
}
if (D_8016E750[SEQ_PLAYER_BGM_MAIN].unk_254 != NA_BGM_NATURE_AMBIENCE) {
if (gAudioPlayers[SEQ_PLAYER_BGM_MAIN].seqAndFlags != NA_BGM_NATURE_AMBIENCE) {
Audio_SplitBgmChannels(sAudioEnemyVol);
}
}
@ -3451,7 +3440,7 @@ void func_800F6268(f32 dist, u16 arg1) {
sAudioHasMalonBgm = true;
sAudioMalonBgmDist = dist;
if (D_8016B9F2 == 0) {
temp_a0 = (s8)(func_800FA0B4(SEQ_PLAYER_BGM_MAIN) & 0xFF);
temp_a0 = (s8)(Audio_GetSequenceBeingPlayed(SEQ_PLAYER_BGM_MAIN) & 0xFF);
if (temp_a0 == (arg1 & 0xFF)) {
if ((arg1 & 0xFF) == NA_BGM_LONLON) {
@ -3471,9 +3460,9 @@ void func_800F6268(f32 dist, u16 arg1) {
}
}
} else if ((temp_a0 == NA_BGM_NATURE_AMBIENCE) && ((arg1 & 0xFF) == NA_BGM_LONLON)) {
temp_a0 = (s8)(func_800FA0B4(SEQ_PLAYER_BGM_SUB) & 0xFF);
temp_a0 = (s8)(Audio_GetSequenceBeingPlayed(SEQ_PLAYER_BGM_SUB) & 0xFF);
if ((temp_a0 != (arg1 & 0xFF)) && (D_8016B9D8 < 10)) {
func_800F5E18(SEQ_PLAYER_BGM_SUB, NA_BGM_LONLON, 0, 0, 0);
Audio_SendStartSequence(SEQ_PLAYER_BGM_SUB, NA_BGM_LONLON, 0, 0, 0);
Audio_SeqSetChannelStopMask(SEQ_PLAYER_BGM_SUB, 0xFFFC);
D_8016B9D8 = 10;
}
@ -3499,10 +3488,10 @@ void func_800F6268(f32 dist, u16 arg1) {
void func_800F64E0(u8 arg0) {
D_80130608 = arg0;
if (arg0 != 0) {
Audio_PlaySoundGeneral(NA_SE_SY_WIN_OPEN, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_WIN_OPEN, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Audio_QueueCmdS32(CHAN_LOAD_UKN_F1 << 24, 0);
} else {
Audio_PlaySoundGeneral(NA_SE_SY_WIN_CLOSE, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_WIN_CLOSE, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Audio_QueueCmdS32(CHAN_LOAD_UKN_F2 << 24, 0);
}
}
@ -3512,10 +3501,10 @@ void func_800F6584(u8 arg0) {
u16 sp34;
D_8016B9F2 = arg0;
if ((func_800FA0B4(SEQ_PLAYER_BGM_MAIN) & 0xFF) == NA_BGM_LONLON) {
if ((Audio_GetSequenceBeingPlayed(SEQ_PLAYER_BGM_MAIN) & 0xFF) == NA_BGM_LONLON) {
playerIdx = SEQ_PLAYER_BGM_MAIN;
sp34 = 0;
} else if ((func_800FA0B4(SEQ_PLAYER_BGM_SUB) & 0xFF) == NA_BGM_LONLON) {
} else if ((Audio_GetSequenceBeingPlayed(SEQ_PLAYER_BGM_SUB) & 0xFF) == NA_BGM_LONLON) {
playerIdx = SEQ_PLAYER_BGM_SUB;
sp34 = 0xFFFC;
} else {
@ -3530,7 +3519,7 @@ void func_800F6584(u8 arg0) {
}
} else {
if (playerIdx == SEQ_PLAYER_BGM_SUB) {
func_800F5E18(SEQ_PLAYER_BGM_SUB, NA_BGM_LONLON, 0, 0, 0);
Audio_SendStartSequence(SEQ_PLAYER_BGM_SUB, NA_BGM_LONLON, 0, 0, 0);
}
Audio_SeqSetTransVolScale(playerIdx, 1, 0, 0x7F);
Audio_SeqSetTransVolScale(playerIdx, 1, 1, 0x7F);
@ -3580,7 +3569,7 @@ void Audio_SetBaseFilter(u8 filter) {
if (filter == 0) {
Audio_StopSfxById(NA_SE_PL_IN_BUBBLE);
} else if (sAudioBaseFilter == 0) {
Audio_PlaySoundGeneral(NA_SE_PL_IN_BUBBLE, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_PL_IN_BUBBLE, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
}
sAudioBaseFilter = filter;
@ -3593,7 +3582,7 @@ void Audio_SetExtraFilter(u8 filter) {
sAudioExtraFilter2 = filter;
sAudioExtraFilter = filter;
if (D_8016E750[SEQ_PLAYER_BGM_MAIN].unk_254 == NA_BGM_NATURE_AMBIENCE) {
if (gAudioPlayers[SEQ_PLAYER_BGM_MAIN].seqAndFlags == NA_BGM_NATURE_AMBIENCE) {
for (i = 0; i < 16; i++) {
t = i;
// CHAN_UPD_SCRIPT_IO (seq player 0, all channels, slot 6)
@ -3613,7 +3602,7 @@ void Audio_PlaySoundGeneralIfNotInCutscene(u16 sfxId, Vec3f* pos, u8 arg2, f32*
}
void Audio_PlaySoundIfNotInCutscene(u16 sfxId) {
Audio_PlaySoundGeneralIfNotInCutscene(sfxId, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneralIfNotInCutscene(sfxId, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
void func_800F6964(u16 arg0) {
@ -3653,7 +3642,7 @@ void func_800F6AB0(u16 arg0) {
}
void func_800F6B3C(void) {
func_800F9280(SEQ_PLAYER_SFX, 0, 0xFF, 5);
Audio_PlaySequenceInternal(SEQ_PLAYER_SFX, 0, 0xFF, 5);
}
void Audio_DisableAllSeq(void) {
@ -3717,13 +3706,13 @@ void func_800F6D58(u8 arg0, u8 arg1, u8 arg2) {
u8 temp_a0;
u8 i;
if ((D_8016E750[SEQ_PLAYER_BGM_MAIN].unk_254 != NA_BGM_NATURE_AMBIENCE) && func_800FA11C(1, 0xF00000FF)) {
if ((gAudioPlayers[SEQ_PLAYER_BGM_MAIN].seqAndFlags != NA_BGM_NATURE_AMBIENCE) && Audio_IsCommandNotIssued(1, 0xF00000FF)) {
sAudioNatureFailed = 1;
return;
}
if (((arg0 << 8) + arg1) == 0x101) {
if (func_800FA0B4(SEQ_PLAYER_BGM_SUB) != NA_BGM_LONLON) {
if (Audio_GetSequenceBeingPlayed(SEQ_PLAYER_BGM_SUB) != NA_BGM_LONLON) {
D_8016B9D8 = 0;
}
}
@ -3743,7 +3732,7 @@ void func_800F6E7C(u16 arg0, u16 arg1) {
u8 i;
u32 t;
if (func_800FA0B4(SEQ_PLAYER_BGM_MAIN) == NA_BGM_WINDMILL) {
if (Audio_GetSequenceBeingPlayed(SEQ_PLAYER_BGM_MAIN) == NA_BGM_WINDMILL) {
func_800F3F3C(0xF);
return;
}
@ -3753,7 +3742,7 @@ void func_800F6E7C(u16 arg0, u16 arg1) {
Audio_SetVolScale(SEQ_PLAYER_BGM_MAIN, 0, 0x7F, 1);
i = 0;
if (D_80133408 != 0) {
if (gAudioDisable != 0) {
i = 1;
Audio_SeqCmdE01(SEQ_PLAYER_BGM_MAIN, 0);
}
@ -3777,8 +3766,8 @@ void func_800F6FB4(u8 arg0) {
u8 b1;
u8 b2;
if ((D_8016E750[SEQ_PLAYER_BGM_MAIN].unk_254 == NA_BGM_DISABLED) ||
!(sSeqFlags[((u8)D_8016E750[SEQ_PLAYER_BGM_MAIN].unk_254) & 0xFF] & 0x80)) {
if ((gAudioPlayers[SEQ_PLAYER_BGM_MAIN].seqAndFlags == NA_BGM_DISABLED) ||
!(sSeqFlags[((u8)gAudioPlayers[SEQ_PLAYER_BGM_MAIN].seqAndFlags) & 0xFF] & 0x80)) {
func_800F6E7C(D_801306DC[arg0].unk_00, D_801306DC[arg0].unk_02);
while ((D_801306DC[arg0].unk_04[i] != 0xFF) && (i < 100)) {
// Probably a fake match, using Audio_SeqSetIoPortMasked doesn't work.
@ -3802,11 +3791,11 @@ void Audio_InitSound(void) {
Audio_ResetSfxChannelState();
func_800FAEB4();
Audio_ResetSounds();
func_800F9280(SEQ_PLAYER_SFX, 0, 0x70, 10);
Audio_PlaySequenceInternal(SEQ_PLAYER_SFX, 0, 0x70, 10);
}
void func_800F7170(void) {
func_800F9280(SEQ_PLAYER_SFX, 0, 0x70, 1);
Audio_PlaySequenceInternal(SEQ_PLAYER_SFX, 0, 0x70, 1);
Audio_QueueCmdS32(CHAN_LOAD_UKN_F2 << 24, 1);
Audio_ScheduleProcessCmds();
Audio_QueueCmdS32(QUEUE_FINISHED << 24, 0);
@ -3826,5 +3815,5 @@ void func_800F7208(void) {
Audio_QueueCmdS32(CHAN_LOAD_UKN_F2 << 24, 1);
func_800F6C34();
Audio_ResetSfxChannelState();
func_800F9280(SEQ_PLAYER_SFX, 0, 0x70, 1);
Audio_PlaySequenceInternal(SEQ_PLAYER_SFX, 0, 0x70, 1);
}

17
src/code/audioMgr.cpp
View File

@ -21,10 +21,6 @@ static AudioMgr* g_audioMgr = NULL;
void AudioMgr_HandleRetrace(AudioMgr* audioMgr);
void func_800C3C80(AudioMgr* audioMgr) {
return;
}
void AudioMgr_HandleRetraceNULL() {
AudioMgr_HandleRetrace(NULL);
}
@ -45,15 +41,6 @@ void AudioMgr_HandleRetrace(AudioMgr* audioMgr) {
return;
}
void AudioMgr_HandlePRENMI(AudioMgr* audioMgr) {
}
void AudioMgr_ThreadEntry(void* arg0) {
}
void AudioMgr_Unlock(AudioMgr* audioMgr) {
}
void audio_int()
{
/*
@ -105,10 +92,6 @@ void audio_int()
static AudioTask* g_currentAudioTask = nullptr;
void bah()
{
}
void audio_thread()
{
SREG(20);

33
src/code/audio_bank.cpp
View File

@ -55,17 +55,12 @@ static u8 sSoundBankUnused[7];
static u8 sCurSfxPlayerChannelIdx;
static UnusedBankLerp sUnusedBankLerp[7];
u8 D_8012D200[] = {
0, 1, 2, 3, 4, 5, 6,
};
void Audio_StopAllBanks(void)
{
s32 i;
for(i = 0; (i < ARRAY_COUNT(D_8012D200)) & 0xFFFFFFFF; i++)
for(s32 i = 0; i < 7; i++)
{
Audio_StopSfxByBank(D_8012D200[i]);
Audio_StopSfxByBank(i);
}
}
@ -75,9 +70,9 @@ u8 gSoundBankMuted[0x100];
u16 gAudioSfxSwapSource[10];
u16 gAudioSfxSwapTarget[10];
u8 gAudioSfxSwapMode[10];
u8 D_8016E348[4];
u8 gAudioPlayerInfoNum[4];
u32 sAudioSeqCmds[0x100];
unk_D_8016E750 D_8016E750[4];
AudioPlayer gAudioPlayers[4];
AudioContext gAudioContext;
// data
@ -108,7 +103,7 @@ u8 sBankSizes[ARRAY_COUNT(gSoundBanks)] = {
u8 gSfxChannelLayout = 0;
u16 D_801333D0 = 0;
u16 gMutedChannels = 0;
Vec3f D_801333D4 = { 0.0f, 0.0f, 0.0f }; // default pos
@ -116,7 +111,7 @@ f32 D_801333E0 = 1.0f; // default freqScale
s32 D_801333E4 = 0; // unused
s8 D_801333E8 = 0; // default reverbAdd
s8 gReverbAdd2 = 0; // default reverbAdd
s32 D_801333EC = 0; // unused
@ -140,14 +135,14 @@ void Audio_SetSoundBanksMute(u16 muteMask) {
}
void Audio_QueueSeqCmdMute(u8 channelIdx) {
D_801333D0 |= (1 << channelIdx);
gMutedChannels |= (1 << channelIdx);
Audio_SetVolScale(SEQ_PLAYER_BGM_MAIN, 2, 0x40, 0xF);
Audio_SetVolScale(SEQ_PLAYER_BGM_SUB, 2, 0x40, 0xF);
}
void Audio_ClearBGMMute(u8 channelIdx) {
D_801333D0 &= ((1 << channelIdx) ^ 0xFFFF);
if (D_801333D0 == 0) {
gMutedChannels &= ((1 << channelIdx) ^ 0xFFFF);
if (gMutedChannels == 0) {
Audio_SetVolScale(SEQ_PLAYER_BGM_MAIN, 2, 0x7F, 0xF);
Audio_SetVolScale(SEQ_PLAYER_BGM_SUB, 2, 0x7F, 0xF);
}
@ -599,7 +594,7 @@ void Audio_StopSfxByBank(u8 bankId) {
Audio_RemoveMatchingSoundRequests(0, &cmp);
}
void func_800F8884(u8 bankId, Vec3f* pos) {
void Audio_StopByBankIDAndPos(u8 bankId, Vec3f* pos) {
SoundBankEntry* entry;
u8 entryIndex = gSoundBanks[bankId][0].next;
u8 prevEntryIndex = 0;
@ -623,7 +618,7 @@ void func_800F8884(u8 bankId, Vec3f* pos) {
void Audio_StopSfxByPosAndBank(u8 bankId, Vec3f* pos) {
SoundBankEntry cmp;
func_800F8884(bankId, pos);
Audio_StopByBankIDAndPos(bankId, pos);
cmp.sfxId = bankId << 12;
cmp.posX = &pos->x;
Audio_RemoveMatchingSoundRequests(1, &cmp);
@ -634,7 +629,7 @@ void Audio_StopSfxByPos(Vec3f* pos) {
SoundBankEntry cmp;
for (i = 0; i < ARRAY_COUNT(gSoundBanks); i++) {
func_800F8884(i, pos);
Audio_StopByBankIDAndPos(i, pos);
}
cmp.posX = &pos->x;
Audio_RemoveMatchingSoundRequests(2, &cmp);
@ -746,7 +741,7 @@ void Audio_StepUnusedBankLerp(u8 bankId) {
}
}
void func_800F8F88(void) {
void Audio_UpdateActiveSounds(void) {
u8 bankId;
if (IS_SEQUENCE_CHANNEL_VALID(gAudioContext.seqPlayers[SEQ_PLAYER_SFX].channels[0])) {
@ -780,7 +775,7 @@ void Audio_ResetSounds(void) {
sSoundRequestWriteIndex = 0;
sSoundRequestReadIndex = 0;
D_801333D0 = 0;
gMutedChannels = 0;
for (bankId = 0; bankId < ARRAY_COUNT(gSoundBanks); bankId++) {
sSoundBankListEnd[bankId] = 0;
sSoundBankFreeListStart[bankId] = 1;

356
src/code/audio_command.cpp
View File

@ -11,7 +11,7 @@
u8 sSeqCmdWrPos = 0;
u8 sSeqCmdRdPos = 0;
u8 D_80133408 = 0;
u8 gAudioDisable = 0;
u8 D_8013340C = 1;
u8 D_80133410[] = {0, 1, 2, 3};
u8 gAudioSpecId = 0;
@ -29,14 +29,14 @@ u8 D_80133418 = 0;
#define Audio_SetVolScaleNow(playerIdx, volFadeTimer, volScale) \
Audio_ProcessSeqCmd(0x40000000 | ((u8)playerIdx << 24) | ((u8)volFadeTimer << 16) | ((u8)(volScale * 127.0f)));
void func_800F9280(u8 playerIdx, u8 seqId, u8 arg2, u16 fadeTimer) {
void Audio_PlaySequenceInternal(u8 playerIdx, u8 seqId, u8 seqFlags, u16 fadeTimer) {
u8 i;
u16 dur;
s32 pad;
if (D_80133408 == 0 || playerIdx == SEQ_PLAYER_SFX) {
arg2 &= 0x7F;
if (arg2 == 0x7F) {
if (gAudioDisable == 0 || playerIdx == SEQ_PLAYER_SFX) {
seqFlags &= 0x7F;
if (seqFlags == 0x7F) {
dur = (fadeTimer >> 3) * 60 * gAudioContext.audioBufferParameters.updatesPerFrame;
Audio_QueueCmdS32(CHAN_LOAD_UKN_85 << 24 | _SHIFTL(playerIdx, 16, 8) | _SHIFTL(seqId, 8, 8), dur);
} else {
@ -44,33 +44,33 @@ void func_800F9280(u8 playerIdx, u8 seqId, u8 arg2, u16 fadeTimer) {
(fadeTimer * (u16)gAudioContext.audioBufferParameters.updatesPerFrame) / 4);
}
D_8016E750[playerIdx].unk_254 = seqId | (arg2 << 8);
D_8016E750[playerIdx].unk_256 = seqId | (arg2 << 8);
gAudioPlayers[playerIdx].seqAndFlags = seqId | (seqFlags << 8);
gAudioPlayers[playerIdx].unk_256 = seqId | (seqFlags << 8);
if (D_8016E750[playerIdx].volCur != 1.0f) {
Audio_QueueCmdF32(SEQ_CMD_UKN_41 << 24 | _SHIFTL(playerIdx, 16, 8), D_8016E750[playerIdx].volCur);
if (gAudioPlayers[playerIdx].volCur != 1.0f) {
Audio_QueueCmdF32(SEQ_CMD_UKN_41 << 24 | _SHIFTL(playerIdx, 16, 8), gAudioPlayers[playerIdx].volCur);
}
D_8016E750[playerIdx].unk_28 = 0;
D_8016E750[playerIdx].unk_18 = 0;
D_8016E750[playerIdx].unk_14 = 0;
gAudioPlayers[playerIdx].unk_28 = 0;
gAudioPlayers[playerIdx].unk_18 = 0;
gAudioPlayers[playerIdx].unk_14 = 0;
for (i = 0; i < 0x10; i++) {
D_8016E750[playerIdx].unk_50[i].unk_00 = 1.0f;
D_8016E750[playerIdx].unk_50[i].unk_0C = 0;
D_8016E750[playerIdx].unk_50[i].unk_10 = 1.0f;
D_8016E750[playerIdx].unk_50[i].unk_1C = 0;
gAudioPlayers[playerIdx].unk_50[i].unk_00 = 1.0f;
gAudioPlayers[playerIdx].unk_50[i].unk_0C = 0;
gAudioPlayers[playerIdx].unk_50[i].unk_10 = 1.0f;
gAudioPlayers[playerIdx].unk_50[i].unk_1C = 0;
}
D_8016E750[playerIdx].unk_250 = 0;
D_8016E750[playerIdx].unk_252 = 0;
gAudioPlayers[playerIdx].unk_250 = 0;
gAudioPlayers[playerIdx].unk_252 = 0;
}
}
void func_800F9474(u8 playerIdx, u16 arg1) {
void Audio_SendDisableSequence(u8 playerIdx, u16 arg1) {
Audio_QueueCmdS32(CHAN_LOAD_DISABLE_SEQUENCE << 24 | ((u8)playerIdx << 16),
(arg1 * (u16)gAudioContext.audioBufferParameters.updatesPerFrame) / 4);
D_8016E750[playerIdx].unk_254 = NA_BGM_DISABLED;
gAudioPlayers[playerIdx].seqAndFlags = NA_BGM_DISABLED;
}
typedef enum {
@ -95,10 +95,10 @@ typedef enum {
typedef struct {
u8 unk_0;
u8 unk_1; // importance?
} Struct_8016E320;
} AudioPlayerInfo;
#define MAX_PLAYERS 4
Struct_8016E320 D_8016E320[MAX_PLAYERS][5]; // sorted by unk_1, descending
AudioPlayerInfo gAudioPlayerInfo[MAX_PLAYERS][5]; // sorted by unk_1, descending
void Audio_ProcessSeqCmd(u32 cmd) {
s32 pad[2];
@ -134,15 +134,15 @@ void Audio_ProcessSeqCmd(u32 cmd) {
seqId = cmd & 0xFF;
seqArgs = (cmd & 0xFF00) >> 8;
fadeTimer = (cmd & 0xFF0000) >> 13;
if ((D_8016E750[playerIdx].unk_260 == 0) && (seqArgs < 0x80)) {
func_800F9280(playerIdx, seqId, seqArgs, fadeTimer);
if ((gAudioPlayers[playerIdx].unk_260 == 0) && (seqArgs < 0x80)) {
Audio_PlaySequenceInternal(playerIdx, seqId, seqArgs, fadeTimer);
}
break;
case AUDIO_CMD_DISABLE_PLAYER:
// disable seq player
fadeTimer = (cmd & 0xFF0000) >> 13;
func_800F9474(playerIdx, fadeTimer);
Audio_SendDisableSequence(playerIdx, fadeTimer);
break;
case AUDIO_CMD_SEQUENCE_QUEUE:
@ -151,35 +151,35 @@ void Audio_ProcessSeqCmd(u32 cmd) {
seqArgs = (cmd & 0xFF00) >> 8;
fadeTimer = (cmd & 0xFF0000) >> 13;
new_var = seqArgs;
for (i = 0; i < D_8016E348[playerIdx]; i++) {
if (D_8016E320[playerIdx][i].unk_0 == seqId) {
for (i = 0; i < gAudioPlayerInfoNum[playerIdx]; i++) {
if (gAudioPlayerInfo[playerIdx][i].unk_0 == seqId) {
if (i == 0) {
func_800F9280(playerIdx, seqId, seqArgs, fadeTimer);
Audio_PlaySequenceInternal(playerIdx, seqId, seqArgs, fadeTimer);
}
return;
}
}
found = D_8016E348[playerIdx];
for (i = 0; i < D_8016E348[playerIdx]; i++) {
if (D_8016E320[playerIdx][i].unk_1 <= new_var) {
found = gAudioPlayerInfoNum[playerIdx];
for (i = 0; i < gAudioPlayerInfoNum[playerIdx]; i++) {
if (gAudioPlayerInfo[playerIdx][i].unk_1 <= new_var) {
found = i;
i = D_8016E348[playerIdx]; // "break;"
i = gAudioPlayerInfoNum[playerIdx]; // "break;"
}
}
if (D_8016E348[playerIdx] < 5) {
D_8016E348[playerIdx]++;
if (gAudioPlayerInfoNum[playerIdx] < 5) {
gAudioPlayerInfoNum[playerIdx]++;
}
for (i = D_8016E348[playerIdx] - 1; i != found; i--) {
D_8016E320[playerIdx][i].unk_1 = D_8016E320[playerIdx][i - 1].unk_1;
D_8016E320[playerIdx][i].unk_0 = D_8016E320[playerIdx][i - 1].unk_0;
for (i = gAudioPlayerInfoNum[playerIdx] - 1; i != found; i--) {
gAudioPlayerInfo[playerIdx][i].unk_1 = gAudioPlayerInfo[playerIdx][i - 1].unk_1;
gAudioPlayerInfo[playerIdx][i].unk_0 = gAudioPlayerInfo[playerIdx][i - 1].unk_0;
}
D_8016E320[playerIdx][found].unk_1 = seqArgs;
D_8016E320[playerIdx][found].unk_0 = seqId;
gAudioPlayerInfo[playerIdx][found].unk_1 = seqArgs;
gAudioPlayerInfo[playerIdx][found].unk_0 = seqId;
if (found == 0) {
func_800F9280(playerIdx, seqId, seqArgs, fadeTimer);
Audio_PlaySequenceInternal(playerIdx, seqId, seqArgs, fadeTimer);
}
break;
@ -188,26 +188,26 @@ void Audio_ProcessSeqCmd(u32 cmd) {
seqId = cmd & 0xFF;
fadeTimer = (cmd & 0xFF0000) >> 13;
found = D_8016E348[playerIdx];
for (i = 0; i < D_8016E348[playerIdx]; i++) {
if (D_8016E320[playerIdx][i].unk_0 == seqId) {
found = gAudioPlayerInfoNum[playerIdx];
for (i = 0; i < gAudioPlayerInfoNum[playerIdx]; i++) {
if (gAudioPlayerInfo[playerIdx][i].unk_0 == seqId) {
found = i;
i = D_8016E348[playerIdx]; // "break;"
i = gAudioPlayerInfoNum[playerIdx]; // "break;"
}
}
if (found != D_8016E348[playerIdx]) {
for (i = found; i < D_8016E348[playerIdx] - 1; i++) {
D_8016E320[playerIdx][i].unk_1 = D_8016E320[playerIdx][i + 1].unk_1;
D_8016E320[playerIdx][i].unk_0 = D_8016E320[playerIdx][i + 1].unk_0;
if (found != gAudioPlayerInfoNum[playerIdx]) {
for (i = found; i < gAudioPlayerInfoNum[playerIdx] - 1; i++) {
gAudioPlayerInfo[playerIdx][i].unk_1 = gAudioPlayerInfo[playerIdx][i + 1].unk_1;
gAudioPlayerInfo[playerIdx][i].unk_0 = gAudioPlayerInfo[playerIdx][i + 1].unk_0;
}
D_8016E348[playerIdx]--;
gAudioPlayerInfoNum[playerIdx]--;
}
if (found == 0) {
func_800F9474(playerIdx, fadeTimer);
if (D_8016E348[playerIdx] != 0) {
func_800F9280(playerIdx, D_8016E320[playerIdx][0].unk_0, D_8016E320[playerIdx][0].unk_1, fadeTimer);
Audio_SendDisableSequence(playerIdx, fadeTimer);
if (gAudioPlayerInfoNum[playerIdx] != 0) {
Audio_PlaySequenceInternal(playerIdx, gAudioPlayerInfo[playerIdx][0].unk_0, gAudioPlayerInfo[playerIdx][0].unk_1, fadeTimer);
}
}
break;
@ -219,11 +219,11 @@ void Audio_ProcessSeqCmd(u32 cmd) {
if (duration == 0) {
duration++;
}
D_8016E750[playerIdx].volTarget = (f32)val / 127.0f;
if (D_8016E750[playerIdx].volCur != D_8016E750[playerIdx].volTarget) {
D_8016E750[playerIdx].unk_08 =
(D_8016E750[playerIdx].volCur - D_8016E750[playerIdx].volTarget) / (f32)duration;
D_8016E750[playerIdx].unk_0C = duration;
gAudioPlayers[playerIdx].volTarget = (f32)val / 127.0f;
if (gAudioPlayers[playerIdx].volCur != gAudioPlayers[playerIdx].volTarget) {
gAudioPlayers[playerIdx].unk_08 =
(gAudioPlayers[playerIdx].volCur - gAudioPlayers[playerIdx].volTarget) / (f32)duration;
gAudioPlayers[playerIdx].unk_0C = duration;
}
break;
@ -236,12 +236,12 @@ void Audio_ProcessSeqCmd(u32 cmd) {
}
freqScale = (f32)val / 1000.0f;
for (i = 0; i < 16; i++) {
D_8016E750[playerIdx].unk_50[i].unk_14 = freqScale;
D_8016E750[playerIdx].unk_50[i].unk_1C = duration;
D_8016E750[playerIdx].unk_50[i].unk_18 =
(D_8016E750[playerIdx].unk_50[i].unk_10 - freqScale) / (f32)duration;
gAudioPlayers[playerIdx].unk_50[i].unk_14 = freqScale;
gAudioPlayers[playerIdx].unk_50[i].unk_1C = duration;
gAudioPlayers[playerIdx].unk_50[i].unk_18 =
(gAudioPlayers[playerIdx].unk_50[i].unk_10 - freqScale) / (f32)duration;
}
D_8016E750[playerIdx].unk_250 = 0xFFFF;
gAudioPlayers[playerIdx].unk_250 = 0xFFFF;
break;
case AUDIO_CMD_SEQUENCE_TRANS_FREQ_SCALE:
@ -253,11 +253,11 @@ void Audio_ProcessSeqCmd(u32 cmd) {
duration++;
}
freqScale = (f32)val / 1000.0f;
D_8016E750[playerIdx].unk_50[chanIdx].unk_14 = freqScale;
D_8016E750[playerIdx].unk_50[chanIdx].unk_18 =
(D_8016E750[playerIdx].unk_50[chanIdx].unk_10 - freqScale) / (f32)duration;
D_8016E750[playerIdx].unk_50[chanIdx].unk_1C = duration;
D_8016E750[playerIdx].unk_250 |= 1 << chanIdx;
gAudioPlayers[playerIdx].unk_50[chanIdx].unk_14 = freqScale;
gAudioPlayers[playerIdx].unk_50[chanIdx].unk_18 =
(gAudioPlayers[playerIdx].unk_50[chanIdx].unk_10 - freqScale) / (f32)duration;
gAudioPlayers[playerIdx].unk_50[chanIdx].unk_1C = duration;
gAudioPlayers[playerIdx].unk_250 |= 1 << chanIdx;
break;
case AUDIO_CMD_SEQUENCE_TRANS_VOL_SCALE:
@ -268,13 +268,13 @@ void Audio_ProcessSeqCmd(u32 cmd) {
if (duration == 0) {
duration++;
}
D_8016E750[playerIdx].unk_50[chanIdx].unk_04 = (f32)val / 127.0f;
if (D_8016E750[playerIdx].unk_50[chanIdx].unk_00 != D_8016E750[playerIdx].unk_50[chanIdx].unk_04) {
D_8016E750[playerIdx].unk_50[chanIdx].unk_08 =
(D_8016E750[playerIdx].unk_50[chanIdx].unk_00 - D_8016E750[playerIdx].unk_50[chanIdx].unk_04) /
gAudioPlayers[playerIdx].unk_50[chanIdx].unk_04 = (f32)val / 127.0f;
if (gAudioPlayers[playerIdx].unk_50[chanIdx].unk_00 != gAudioPlayers[playerIdx].unk_50[chanIdx].unk_04) {
gAudioPlayers[playerIdx].unk_50[chanIdx].unk_08 =
(gAudioPlayers[playerIdx].unk_50[chanIdx].unk_00 - gAudioPlayers[playerIdx].unk_50[chanIdx].unk_04) /
(f32)duration;
D_8016E750[playerIdx].unk_50[chanIdx].unk_0C = duration;
D_8016E750[playerIdx].unk_252 |= 1 << chanIdx;
gAudioPlayers[playerIdx].unk_50[chanIdx].unk_0C = duration;
gAudioPlayers[playerIdx].unk_252 |= 1 << chanIdx;
}
break;
@ -290,7 +290,7 @@ void Audio_ProcessSeqCmd(u32 cmd) {
chanIdx = (cmd & 0xF00) >> 8;
port = (cmd & 0xFF0000) >> 16;
val = cmd & 0xFF;
if ((D_8016E750[playerIdx].unk_258 & (1 << chanIdx)) == 0) {
if ((gAudioPlayers[playerIdx].unk_258 & (1 << chanIdx)) == 0) {
Audio_QueueCmdS8(CHAN_UPD_SCRIPT_IO << 24 | _SHIFTL(playerIdx, 16, 8) | _SHIFTL(chanIdx, 8, 8) | _SHIFTL(port, 0, 8),
val);
}
@ -298,7 +298,7 @@ void Audio_ProcessSeqCmd(u32 cmd) {
case AUDIO_CMD_SET_IO_PORT_MASK:
// set channel mask for command 0x8
D_8016E750[playerIdx].unk_258 = cmd & 0xFFFF;
gAudioPlayers[playerIdx].unk_258 = cmd & 0xFFFF;
break;
case AUDIO_CMD_SET_CHANNEL_STOP_MASK:
@ -320,22 +320,22 @@ void Audio_ProcessSeqCmd(u32 cmd) {
case AUDIO_CMD_UPDATE_TEMPO:
// update tempo
D_8016E750[playerIdx].unk_14 = cmd;
gAudioPlayers[playerIdx].unk_14 = cmd;
break;
case AUDIO_CMD_SEQUENCE_START_WITH_SETUP:
// start sequence with setup commands
subOp = (cmd & 0xF00000) >> 20;
if (subOp != 0xF) {
if (D_8016E750[playerIdx].unk_4D < 7) {
found = D_8016E750[playerIdx].unk_4D++;
if (gAudioPlayers[playerIdx].unk_4D < 7) {
found = gAudioPlayers[playerIdx].unk_4D++;
if (found < 8) {
D_8016E750[playerIdx].unk_2C[found] = cmd;
D_8016E750[playerIdx].unk_4C = 2;
gAudioPlayers[playerIdx].unk_2C[found] = cmd;
gAudioPlayers[playerIdx].unk_4C = 2;
}
}
} else {
D_8016E750[playerIdx].unk_4D = 0;
gAudioPlayers[playerIdx].unk_4D = 0;
}
break;
@ -349,7 +349,7 @@ void Audio_ProcessSeqCmd(u32 cmd) {
break;
case 1:
// set sequence starting disabled?
D_80133408 = val & 1;
gAudioDisable = val & 1;
break;
}
break;
@ -377,14 +377,14 @@ void Audio_ProcessSeqCmds(void) {
}
}
u16 func_800FA0B4(u8 playerIdx) {
u16 Audio_GetSequenceBeingPlayed(u8 playerIdx) {
if (!gAudioContext.seqPlayers[playerIdx].enabled) {
return NA_BGM_DISABLED;
}
return D_8016E750[playerIdx].unk_254;
return gAudioPlayers[playerIdx].seqAndFlags;
}
s32 func_800FA11C(u32 arg0, u32 arg1) {
s32 Audio_IsCommandNotIssued(u32 arg0, u32 arg1) {
u8 i;
for (i = sSeqCmdRdPos; i != sSeqCmdWrPos; i++) {
@ -397,17 +397,17 @@ s32 func_800FA11C(u32 arg0, u32 arg1) {
}
void func_800FA174(u8 playerIdx) {
D_8016E348[playerIdx] = 0;
gAudioPlayerInfoNum[playerIdx] = 0;
}
void func_800FA18C(u8 playerIdx, u8 arg1) {
u8 i;
for (i = 0; i < D_8016E750[playerIdx].unk_4D; i++) {
u8 unkb = (D_8016E750[playerIdx].unk_2C[i] & 0xF00000) >> 20;
for (i = 0; i < gAudioPlayers[playerIdx].unk_4D; i++) {
u8 unkb = (gAudioPlayers[playerIdx].unk_2C[i] & 0xF00000) >> 20;
if (unkb == arg1) {
D_8016E750[playerIdx].unk_2C[i] = 0xFF000000;
gAudioPlayers[playerIdx].unk_2C[i] = 0xFF000000;
}
}
}
@ -416,14 +416,14 @@ void Audio_SetVolScale(u8 playerIdx, u8 scaleIdx, u8 targetVol, u8 volFadeTimer)
f32 volScale;
u8 i;
D_8016E750[playerIdx].volScales[scaleIdx] = targetVol & 0x7F;
gAudioPlayers[playerIdx].volScales[scaleIdx] = targetVol & 0x7F;
if (volFadeTimer != 0) {
D_8016E750[playerIdx].fadeVolUpdate = 1;
D_8016E750[playerIdx].volFadeTimer = volFadeTimer;
gAudioPlayers[playerIdx].fadeVolUpdate = 1;
gAudioPlayers[playerIdx].volFadeTimer = volFadeTimer;
} else {
for (i = 0, volScale = 1.0f; i < 4; i++) {
volScale *= D_8016E750[playerIdx].volScales[i] / 127.0f;
volScale *= gAudioPlayers[playerIdx].volScales[i] / 127.0f;
}
Audio_SetVolScaleNow(playerIdx, volFadeTimer, volScale);
@ -449,41 +449,41 @@ void func_800FA3DC(void) {
u8 k;
for (playerIdx = 0; playerIdx < 4; playerIdx++) {
if (D_8016E750[playerIdx].unk_260 != 0) {
if (gAudioPlayers[playerIdx].unk_260 != 0) {
switch (func_800E5E20(&dummy)) {
case 1:
case 2:
case 3:
case 4:
D_8016E750[playerIdx].unk_260 = 0;
Audio_ProcessSeqCmd(D_8016E750[playerIdx].unk_25C);
gAudioPlayers[playerIdx].unk_260 = 0;
Audio_ProcessSeqCmd(gAudioPlayers[playerIdx].unk_25C);
break;
}
}
if (D_8016E750[playerIdx].fadeVolUpdate) {
if (gAudioPlayers[playerIdx].fadeVolUpdate) {
phi_f0 = 1.0f;
for (j = 0; j < 4; j++) {
phi_f0 *= (D_8016E750[playerIdx].volScales[j] / 127.0f);
phi_f0 *= (gAudioPlayers[playerIdx].volScales[j] / 127.0f);
}
Audio_SeqCmd_Trans_Volume(playerIdx, D_8016E750[playerIdx].volFadeTimer, (u8)(phi_f0 * 127.0f));
D_8016E750[playerIdx].fadeVolUpdate = 0;
Audio_SeqCmd_Trans_Volume(playerIdx, gAudioPlayers[playerIdx].volFadeTimer, (u8)(phi_f0 * 127.0f));
gAudioPlayers[playerIdx].fadeVolUpdate = 0;
}
if (D_8016E750[playerIdx].unk_0C != 0) {
D_8016E750[playerIdx].unk_0C--;
if (gAudioPlayers[playerIdx].unk_0C != 0) {
gAudioPlayers[playerIdx].unk_0C--;
if (D_8016E750[playerIdx].unk_0C != 0) {
D_8016E750[playerIdx].volCur = D_8016E750[playerIdx].volCur - D_8016E750[playerIdx].unk_08;
if (gAudioPlayers[playerIdx].unk_0C != 0) {
gAudioPlayers[playerIdx].volCur = gAudioPlayers[playerIdx].volCur - gAudioPlayers[playerIdx].unk_08;
} else {
D_8016E750[playerIdx].volCur = D_8016E750[playerIdx].volTarget;
gAudioPlayers[playerIdx].volCur = gAudioPlayers[playerIdx].volTarget;
}
Audio_QueueCmdF32(SEQ_CMD_UKN_41 << 24 | _SHIFTL(playerIdx, 16, 8), D_8016E750[playerIdx].volCur);
Audio_QueueCmdF32(SEQ_CMD_UKN_41 << 24 | _SHIFTL(playerIdx, 16, 8), gAudioPlayers[playerIdx].volCur);
}
if (D_8016E750[playerIdx].unk_14 != 0) {
temp_a1 = D_8016E750[playerIdx].unk_14;
if (gAudioPlayers[playerIdx].unk_14 != 0) {
temp_a1 = gAudioPlayers[playerIdx].unk_14;
phi_t0 = (temp_a1 & 0xFF0000) >> 15;
phi_a2 = temp_a1 & 0xFFF;
if (phi_t0 == 0) {
@ -506,8 +506,8 @@ void func_800FA3DC(void) {
phi_a2 = temp_lo * (phi_a2 / 100.0f);
break;
case 4:
if (D_8016E750[playerIdx].unk_18) {
phi_a2 = D_8016E750[playerIdx].unk_18;
if (gAudioPlayers[playerIdx].unk_18) {
phi_a2 = gAudioPlayers[playerIdx].unk_18;
} else {
phi_a2 = temp_lo;
}
@ -518,71 +518,71 @@ void func_800FA3DC(void) {
phi_a2 = 300;
}
if (D_8016E750[playerIdx].unk_18 == 0) {
D_8016E750[playerIdx].unk_18 = temp_lo;
if (gAudioPlayers[playerIdx].unk_18 == 0) {
gAudioPlayers[playerIdx].unk_18 = temp_lo;
}
D_8016E750[playerIdx].unk_20 = phi_a2;
D_8016E750[playerIdx].tempo = gAudioContext.seqPlayers[playerIdx].tempo / 0x30;
D_8016E750[playerIdx].unk_24 = (D_8016E750[playerIdx].tempo - D_8016E750[playerIdx].unk_20) / phi_t0;
D_8016E750[playerIdx].unk_28 = phi_t0;
D_8016E750[playerIdx].unk_14 = 0;
gAudioPlayers[playerIdx].unk_20 = phi_a2;
gAudioPlayers[playerIdx].tempo = gAudioContext.seqPlayers[playerIdx].tempo / 0x30;
gAudioPlayers[playerIdx].unk_24 = (gAudioPlayers[playerIdx].tempo - gAudioPlayers[playerIdx].unk_20) / phi_t0;
gAudioPlayers[playerIdx].unk_28 = phi_t0;
gAudioPlayers[playerIdx].unk_14 = 0;
}
}
if (D_8016E750[playerIdx].unk_28 != 0) {
D_8016E750[playerIdx].unk_28--;
if (D_8016E750[playerIdx].unk_28 != 0) {
D_8016E750[playerIdx].tempo = D_8016E750[playerIdx].tempo - D_8016E750[playerIdx].unk_24;
if (gAudioPlayers[playerIdx].unk_28 != 0) {
gAudioPlayers[playerIdx].unk_28--;
if (gAudioPlayers[playerIdx].unk_28 != 0) {
gAudioPlayers[playerIdx].tempo = gAudioPlayers[playerIdx].tempo - gAudioPlayers[playerIdx].unk_24;
} else {
D_8016E750[playerIdx].tempo = D_8016E750[playerIdx].unk_20;
gAudioPlayers[playerIdx].tempo = gAudioPlayers[playerIdx].unk_20;
}
// set tempo
Audio_QueueCmdS32(SEQ_CMD_SET_TEMPO << 24 | _SHIFTL(playerIdx, 16, 8), D_8016E750[playerIdx].tempo);
Audio_QueueCmdS32(SEQ_CMD_SET_TEMPO << 24 | _SHIFTL(playerIdx, 16, 8), gAudioPlayers[playerIdx].tempo);
}
if (D_8016E750[playerIdx].unk_252 != 0) {
if (gAudioPlayers[playerIdx].unk_252 != 0) {
for (k = 0; k < 0x10; k++) {
if (D_8016E750[playerIdx].unk_50[k].unk_0C != 0) {
D_8016E750[playerIdx].unk_50[k].unk_0C--;
if (D_8016E750[playerIdx].unk_50[k].unk_0C != 0) {
D_8016E750[playerIdx].unk_50[k].unk_00 -= D_8016E750[playerIdx].unk_50[k].unk_08;
if (gAudioPlayers[playerIdx].unk_50[k].unk_0C != 0) {
gAudioPlayers[playerIdx].unk_50[k].unk_0C--;
if (gAudioPlayers[playerIdx].unk_50[k].unk_0C != 0) {
gAudioPlayers[playerIdx].unk_50[k].unk_00 -= gAudioPlayers[playerIdx].unk_50[k].unk_08;
} else {
D_8016E750[playerIdx].unk_50[k].unk_00 = D_8016E750[playerIdx].unk_50[k].unk_04;
D_8016E750[playerIdx].unk_252 ^= (1 << k);
gAudioPlayers[playerIdx].unk_50[k].unk_00 = gAudioPlayers[playerIdx].unk_50[k].unk_04;
gAudioPlayers[playerIdx].unk_252 ^= (1 << k);
}
// CHAN_UPD_VOL_SCALE (playerIdx = seq, k = chan)
Audio_QueueCmdF32(CHAN_UPD_VOL_SCALE << 24 | _SHIFTL(playerIdx, 16, 8) | _SHIFTL(k, 8, 8),
D_8016E750[playerIdx].unk_50[k].unk_00);
gAudioPlayers[playerIdx].unk_50[k].unk_00);
}
}
}
if (D_8016E750[playerIdx].unk_250 != 0) {
if (gAudioPlayers[playerIdx].unk_250 != 0) {
for (k = 0; k < 0x10; k++) {
if (D_8016E750[playerIdx].unk_50[k].unk_1C != 0) {
D_8016E750[playerIdx].unk_50[k].unk_1C--;
if (D_8016E750[playerIdx].unk_50[k].unk_1C != 0) {
D_8016E750[playerIdx].unk_50[k].unk_10 -= D_8016E750[playerIdx].unk_50[k].unk_18;
if (gAudioPlayers[playerIdx].unk_50[k].unk_1C != 0) {
gAudioPlayers[playerIdx].unk_50[k].unk_1C--;
if (gAudioPlayers[playerIdx].unk_50[k].unk_1C != 0) {
gAudioPlayers[playerIdx].unk_50[k].unk_10 -= gAudioPlayers[playerIdx].unk_50[k].unk_18;
} else {
D_8016E750[playerIdx].unk_50[k].unk_10 = D_8016E750[playerIdx].unk_50[k].unk_14;
D_8016E750[playerIdx].unk_250 ^= (1 << k);
gAudioPlayers[playerIdx].unk_50[k].unk_10 = gAudioPlayers[playerIdx].unk_50[k].unk_14;
gAudioPlayers[playerIdx].unk_250 ^= (1 << k);
}
// CHAN_UPD_FREQ_SCALE
Audio_QueueCmdF32(CHAN_UPD_FREQ_SCALE << 24 | _SHIFTL(playerIdx, 16, 8) | _SHIFTL(k, 8, 8),
D_8016E750[playerIdx].unk_50[k].unk_10);
gAudioPlayers[playerIdx].unk_50[k].unk_10);
}
}
}
if (D_8016E750[playerIdx].unk_4D != 0) {
if (func_800FA11C(0xF0000000, 0xF0000000) == 0) {
D_8016E750[playerIdx].unk_4D = 0;
if (gAudioPlayers[playerIdx].unk_4D != 0) {
if (Audio_IsCommandNotIssued(0xF0000000, 0xF0000000) == 0) {
gAudioPlayers[playerIdx].unk_4D = 0;
return;
}
if (D_8016E750[playerIdx].unk_4C != 0) {
D_8016E750[playerIdx].unk_4C--;
if (gAudioPlayers[playerIdx].unk_4C != 0) {
gAudioPlayers[playerIdx].unk_4C--;
continue;
}
@ -590,28 +590,28 @@ void func_800FA3DC(void) {
continue;
}
for (j = 0; j < D_8016E750[playerIdx].unk_4D; j++) {
temp_a0 = (D_8016E750[playerIdx].unk_2C[j] & 0x00F00000) >> 20;
temp_s1 = (D_8016E750[playerIdx].unk_2C[j] & 0x000F0000) >> 16;
temp_s0_3 = (D_8016E750[playerIdx].unk_2C[j] & 0xFF00) >> 8;
temp_a3_3 = D_8016E750[playerIdx].unk_2C[j] & 0xFF;
for (j = 0; j < gAudioPlayers[playerIdx].unk_4D; j++) {
temp_a0 = (gAudioPlayers[playerIdx].unk_2C[j] & 0x00F00000) >> 20;
temp_s1 = (gAudioPlayers[playerIdx].unk_2C[j] & 0x000F0000) >> 16;
temp_s0_3 = (gAudioPlayers[playerIdx].unk_2C[j] & 0xFF00) >> 8;
temp_a3_3 = gAudioPlayers[playerIdx].unk_2C[j] & 0xFF;
switch (temp_a0) {
case 0:
Audio_SetVolScale(temp_s1, 1, 0x7F, temp_a3_3);
break;
case 7:
if (D_8016E348[playerIdx] == temp_a3_3) {
if (gAudioPlayerInfoNum[playerIdx] == temp_a3_3) {
Audio_SetVolScale(temp_s1, 1, 0x7F, temp_s0_3);
}
break;
case 1:
Audio_SeqCmd3(playerIdx, D_8016E750[playerIdx].unk_254);
Audio_SeqCmd3(playerIdx, gAudioPlayers[playerIdx].seqAndFlags);
break;
case 2:
Audio_StartSeq(temp_s1, 1, D_8016E750[temp_s1].unk_254);
D_8016E750[temp_s1].fadeVolUpdate = 1;
D_8016E750[temp_s1].volScales[1] = 0x7F;
Audio_StartSeq(temp_s1, 1, gAudioPlayers[temp_s1].seqAndFlags);
gAudioPlayers[temp_s1].fadeVolUpdate = 1;
gAudioPlayers[temp_s1].volScales[1] = 0x7F;
break;
case 3:
Audio_SeqCmdB30(temp_s1, temp_s0_3, temp_a3_3);
@ -620,13 +620,13 @@ void func_800FA3DC(void) {
Audio_SeqUpdateTempo2(temp_s1, temp_a3_3, 0);
break;
case 5:
temp_v1 = D_8016E750[playerIdx].unk_2C[j] & 0xFFFF;
Audio_StartSeq(temp_s1, D_8016E750[temp_s1].unk_4E, temp_v1);
temp_v1 = gAudioPlayers[playerIdx].unk_2C[j] & 0xFFFF;
Audio_StartSeq(temp_s1, gAudioPlayers[temp_s1].unk_4E, temp_v1);
Audio_SetVolScale(temp_s1, 1, 0x7F, 0);
D_8016E750[temp_s1].unk_4E = 0;
gAudioPlayers[temp_s1].unk_4E = 0;
break;
case 6:
D_8016E750[playerIdx].unk_4E = temp_s0_3;
gAudioPlayers[playerIdx].unk_4E = temp_s0_3;
break;
case 8:
Audio_SetVolScale(temp_s1, temp_s0_3, 0x7F, temp_a3_3);
@ -643,7 +643,7 @@ void func_800FA3DC(void) {
}
break;
case 9:
temp_v1 = D_8016E750[playerIdx].unk_2C[j] & 0xFFFF;
temp_v1 = gAudioPlayers[playerIdx].unk_2C[j] & 0xFFFF;
Audio_SeqSetChannelStopMask(temp_s1, temp_v1);
break;
case 10:
@ -652,7 +652,7 @@ void func_800FA3DC(void) {
}
}
D_8016E750[playerIdx].unk_4D = 0;
gAudioPlayers[playerIdx].unk_4D = 0;
}
}
}
@ -680,22 +680,22 @@ void func_800FADF8(void) {
u8 playerIdx, j;
for (playerIdx = 0; playerIdx < 4; playerIdx++) {
D_8016E348[playerIdx] = 0;
D_8016E750[playerIdx].unk_254 = NA_BGM_DISABLED;
D_8016E750[playerIdx].unk_256 = NA_BGM_DISABLED;
D_8016E750[playerIdx].unk_28 = 0;
D_8016E750[playerIdx].unk_18 = 0;
D_8016E750[playerIdx].unk_14 = 0;
D_8016E750[playerIdx].unk_258 = 0;
D_8016E750[playerIdx].unk_4D = 0;
D_8016E750[playerIdx].unk_4E = 0;
D_8016E750[playerIdx].unk_250 = 0;
D_8016E750[playerIdx].unk_252 = 0;
gAudioPlayerInfoNum[playerIdx] = 0;
gAudioPlayers[playerIdx].seqAndFlags = NA_BGM_DISABLED;
gAudioPlayers[playerIdx].unk_256 = NA_BGM_DISABLED;
gAudioPlayers[playerIdx].unk_28 = 0;
gAudioPlayers[playerIdx].unk_18 = 0;
gAudioPlayers[playerIdx].unk_14 = 0;
gAudioPlayers[playerIdx].unk_258 = 0;
gAudioPlayers[playerIdx].unk_4D = 0;
gAudioPlayers[playerIdx].unk_4E = 0;
gAudioPlayers[playerIdx].unk_250 = 0;
gAudioPlayers[playerIdx].unk_252 = 0;
for (j = 0; j < 4; j++) {
D_8016E750[playerIdx].volScales[j] = 0x7F;
gAudioPlayers[playerIdx].volScales[j] = 0x7F;
}
D_8016E750[playerIdx].volFadeTimer = 1;
D_8016E750[playerIdx].fadeVolUpdate = 1;
gAudioPlayers[playerIdx].volFadeTimer = 1;
gAudioPlayers[playerIdx].fadeVolUpdate = 1;
}
}
@ -703,11 +703,11 @@ void func_800FAEB4(void) {
u8 playerIdx, j;
for (playerIdx = 0; playerIdx < 4; playerIdx++) {
D_8016E750[playerIdx].volCur = 1.0f;
D_8016E750[playerIdx].unk_0C = 0;
D_8016E750[playerIdx].fadeVolUpdate = 0;
gAudioPlayers[playerIdx].volCur = 1.0f;
gAudioPlayers[playerIdx].unk_0C = 0;
gAudioPlayers[playerIdx].fadeVolUpdate = 0;
for (j = 0; j < 4; j++) {
D_8016E750[playerIdx].volScales[j] = 0x7F;
gAudioPlayers[playerIdx].volScales[j] = 0x7F;
}
}
func_800FADF8();

2
src/code/code_8006BA00.cpp
View File

@ -61,5 +61,5 @@ void Audio_PlaySoundAtPosition(GlobalContext* globalCtx, Vec3f* pos, s32 duratio
source->countdown = duration;
SkinMatrix_Vec3fMtxFMultXYZ(&globalCtx->viewProjectionMtxF, &source->originPos, &source->relativePos);
Audio_PlaySoundGeneral(sfxId, &source->relativePos, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(sfxId, &source->relativePos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}

96
src/code/db_camera.cpp
View File

@ -383,7 +383,7 @@ void func_800B44E0(DbCamera* dbCamera, Camera* cam) {
if (dbCamera->sub.nPoints < 6) {
if (sDbCamAnim.unk_0A != 0) {
Audio_PlaySoundGeneral(NA_SE_SY_ERROR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_ERROR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
sDbCamAnim.unk_0A = 0;
}
func_8006376C(0x11, 0x17, 3, D_8012CEE0[0]);
@ -397,7 +397,7 @@ void func_800B44E0(DbCamera* dbCamera, Camera* cam) {
!func_800BB2B4(&sDbCamAnim.lookAtPos, &sDbCamAnim.roll, &sDbCamAnim.fov, dbCamera->sub.lookAt,
&sDbCamAnim.keyframe, &sDbCamAnim.curFrame) &&
sDbCamAnim.unk_0A == 1) {
Audio_PlaySoundGeneral(NA_SE_SY_HP_RECOVER, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_HP_RECOVER, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
sDbCamAnim.unk_04++;
if (dbCamera->sub.nFrames > 0 && dbCamera->sub.nFrames < sDbCamAnim.unk_04) {
@ -625,7 +625,7 @@ void DbCamera_Update(DbCamera* dbCamera, Camera* cam) {
dbCamera->unk_40 = -1;
dbCamera->sub.demoCtrlActionIdx = 0;
sDbCamAnim.unk_0A = 0;
Audio_PlaySoundGeneral(NA_SE_SY_LOCK_ON, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_LOCK_ON, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
} else if (dbCamera->unk_38 == -1) {
dbCamera->unk_38 = 1;
} else {
@ -945,22 +945,22 @@ void DbCamera_Update(DbCamera* dbCamera, Camera* cam) {
dbCamera->unk_1C.z = 0.0f;
dbCamera->unk_1C.y = 1.0f;
} else if (dbCamera->sub.unk_08 == 2) {
Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
dbCamera->sub.unk_08 = 0;
func_800B41DC(dbCamera, dbCamera->sub.unkIdx, cam);
} else {
if (CHECK_BTN_ALL(sGlobalCtx->state.input[2].press.button, BTN_R) &&
CHECK_BTN_ALL(sGlobalCtx->state.input[2].cur.button, BTN_L)) {
Audio_PlaySoundGeneral(NA_SE_SY_CANCEL, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_CANCEL, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
dbCamera->sub.nPoints = dbCamera->sub.unkIdx + 1;
func_800B4088(dbCamera, cam);
} else if (CHECK_BTN_ALL(sGlobalCtx->state.input[2].press.button, BTN_R)) {
if (dbCamera->sub.unkIdx == 0x80) {
Audio_PlaySoundGeneral(NA_SE_SY_ERROR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_ERROR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
} else {
Audio_PlaySoundGeneral(NA_SE_IT_SWORD_PUTAWAY, &D_801333D4, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
func_800B42C0(dbCamera, cam);
if (dbCamera->sub.unkIdx == (dbCamera->sub.nPoints - 1)) {
dbCamera->sub.unkIdx++;
@ -1012,7 +1012,7 @@ void DbCamera_Update(DbCamera* dbCamera, Camera* cam) {
} else {
if (CHECK_BTN_ALL(sGlobalCtx->state.input[2].press.button, BTN_CRIGHT) &&
CHECK_BTN_ALL(sGlobalCtx->state.input[2].cur.button, BTN_L)) {
Audio_PlaySoundGeneral(NA_SE_SY_GET_RUPY, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_GET_RUPY, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
osSyncPrintf("@@@\n@@@\n@@@/* *** spline point data ** start here *** */\n@@@\n");
DbCamera_PrintPoints("Lookat", dbCamera->sub.nPoints, dbCamera->sub.lookAt);
DbCamera_PrintPoints("Position", dbCamera->sub.nPoints, dbCamera->sub.position);
@ -1021,13 +1021,13 @@ void DbCamera_Update(DbCamera* dbCamera, Camera* cam) {
osSyncPrintf("@@@static short Mode = %d;\n@@@\n", dbCamera->sub.mode);
osSyncPrintf("@@@\n@@@\n@@@/* *** spline point data ** finish! *** */\n@@@\n");
} else if (CHECK_BTN_ALL(sGlobalCtx->state.input[2].press.button, BTN_CLEFT)) {
Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
dbCamera->sub.unk_08 = (dbCamera->sub.unk_08 + 1) % 3;
}
if (CHECK_BTN_ALL(sGlobalCtx->state.input[2].press.button, BTN_CUP) &&
CHECK_BTN_ALL(sGlobalCtx->state.input[2].cur.button, BTN_L)) {
Audio_PlaySoundGeneral(NA_SE_IT_SWORD_IMPACT, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_IT_SWORD_IMPACT, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
if (dbCamera->sub.unkIdx > 0) {
dbCamera->sub.unkIdx--;
} else {
@ -1036,7 +1036,7 @@ void DbCamera_Update(DbCamera* dbCamera, Camera* cam) {
} else {
if (CHECK_BTN_ALL(sGlobalCtx->state.input[2].press.button, BTN_CUP)) {
Audio_PlaySoundGeneral(NA_SE_IT_SWORD_IMPACT, &D_801333D4, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
if (dbCamera->sub.unkIdx > 0) {
dbCamera->sub.unkIdx--;
} else {
@ -1057,7 +1057,7 @@ void DbCamera_Update(DbCamera* dbCamera, Camera* cam) {
}
if (CHECK_BTN_ALL(sGlobalCtx->state.input[2].cur.button, BTN_L) &&
CHECK_BTN_ALL(sGlobalCtx->state.input[2].press.button, BTN_CDOWN)) {
Audio_PlaySoundGeneral(NA_SE_IT_SWORD_IMPACT, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_IT_SWORD_IMPACT, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
if (dbCamera->sub.unkIdx < (dbCamera->sub.nPoints - 1)) {
dbCamera->sub.unkIdx++;
} else {
@ -1066,7 +1066,7 @@ void DbCamera_Update(DbCamera* dbCamera, Camera* cam) {
} else {
if (CHECK_BTN_ALL(sGlobalCtx->state.input[2].press.button, BTN_CDOWN)) {
Audio_PlaySoundGeneral(NA_SE_IT_SWORD_IMPACT, &D_801333D4, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
if (dbCamera->sub.unkIdx < (dbCamera->sub.nPoints - 1)) {
dbCamera->sub.unkIdx++;
} else {
@ -1140,7 +1140,7 @@ void DbCamera_Update(DbCamera* dbCamera, Camera* cam) {
dbCamera->unk_3C = true;
if (CHECK_BTN_ALL(sGlobalCtx->state.input[2].press.button, BTN_DUP)) {
Audio_PlaySoundGeneral(NA_SE_SY_ATTENTION_ON, &D_801333D4, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
if (dbCamera->sub.unk_0A == 0) {
dbCamera->sub.unk_0A = 5;
} else {
@ -1149,7 +1149,7 @@ void DbCamera_Update(DbCamera* dbCamera, Camera* cam) {
}
if (CHECK_BTN_ALL(sGlobalCtx->state.input[2].press.button, BTN_DDOWN)) {
Audio_PlaySoundGeneral(NA_SE_SY_ATTENTION_ON, &D_801333D4, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
if (dbCamera->sub.unk_0A == 5) {
dbCamera->sub.unk_0A = 0;
} else {
@ -1158,7 +1158,7 @@ void DbCamera_Update(DbCamera* dbCamera, Camera* cam) {
}
if (CHECK_BTN_ALL(sGlobalCtx->state.input[2].press.button, BTN_DLEFT)) {
Audio_PlaySoundGeneral(NA_SE_SY_ATTENTION_ON, &D_801333D4, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
switch (dbCamera->sub.unk_0A) {
case 1:
if (CHECK_BTN_ALL(sGlobalCtx->state.input[2].cur.button, BTN_L)) {
@ -1208,7 +1208,7 @@ void DbCamera_Update(DbCamera* dbCamera, Camera* cam) {
if (CHECK_BTN_ALL(sGlobalCtx->state.input[2].cur.button, BTN_DLEFT)) {
if ((D_8012D10C++ % 5) == 0) {
Audio_PlaySoundGeneral(NA_SE_SY_ATTENTION_ON, &D_801333D4, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
}
switch (dbCamera->sub.unk_0A) {
@ -1246,7 +1246,7 @@ void DbCamera_Update(DbCamera* dbCamera, Camera* cam) {
if (CHECK_BTN_ALL(sGlobalCtx->state.input[2].press.button, BTN_DRIGHT)) {
Audio_PlaySoundGeneral(NA_SE_SY_ATTENTION_ON, &D_801333D4, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
switch (dbCamera->sub.unk_0A) {
case 1:
@ -1295,7 +1295,7 @@ void DbCamera_Update(DbCamera* dbCamera, Camera* cam) {
if (CHECK_BTN_ALL(sGlobalCtx->state.input[2].cur.button, BTN_DRIGHT)) {
if ((D_8012D10C++ % 5) == 0) {
Audio_PlaySoundGeneral(NA_SE_SY_ATTENTION_ON, &D_801333D4, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
}
switch (dbCamera->sub.unk_0A) {
@ -1430,7 +1430,7 @@ void DbCamera_Update(DbCamera* dbCamera, Camera* cam) {
dbCamera->fov = 60.0f;
dbCamera->rollDegrees = dbCamera->roll * 1.40625f;
if (CHECK_BTN_ALL(sGlobalCtx->state.input[2].press.button, BTN_CLEFT)) {
Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
dbCamera->unk_78 = (dbCamera->unk_78 + 1) % 3;
dbCamera->unk_38 = -1;
}
@ -1696,7 +1696,7 @@ void DbCamera_DrawSlotLetters(char* str, s16 y, s16 x, s32 colorId) {
void DbCamera_PrintAllCuts(Camera* cam) {
s32 i;
Audio_PlaySoundGeneral(NA_SE_SY_GET_RUPY, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_GET_RUPY, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
osSyncPrintf("@@@\n@@@\n@@@/* ****** spline point data ** start here ***** */\n@@@\n");
for (i = 0; i < ARRAY_COUNT(sDbCameraCuts) - 1; i++) {
@ -1844,7 +1844,7 @@ s32 DbCamera_UpdateDemoControl(DbCamera* dbCamera, Camera* cam) {
if (CHECK_BTN_ALL(sGlobalCtx->state.input[2].press.button, BTN_DLEFT) ||
CHECK_BTN_ALL(sGlobalCtx->state.input[2].press.button, BTN_DRIGHT)) {
Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &D_801333D4, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
dbCamera->sub.demoCtrlToggleSwitch ^= 1;
}
#ifndef NO_UB
@ -1860,11 +1860,11 @@ s32 DbCamera_UpdateDemoControl(DbCamera* dbCamera, Camera* cam) {
if (CHECK_BTN_ALL(sGlobalCtx->state.input[2].press.button, BTN_A)) {
if (dbCamera->sub.demoCtrlToggleSwitch == 0) {
Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &D_801333D4, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
dbCamera->sub.demoCtrlMenu++;
} else {
Audio_PlaySoundGeneral(NA_SE_SY_CANCEL, &D_801333D4, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
dbCamera->sub.demoCtrlMenu = 0;
}
}
@ -1882,7 +1882,7 @@ s32 DbCamera_UpdateDemoControl(DbCamera* dbCamera, Camera* cam) {
}
}
if (CHECK_BTN_ALL(sGlobalCtx->state.input[2].press.button, BTN_B)) {
Audio_PlaySoundGeneral(NA_SE_SY_CANCEL, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_CANCEL, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
dbCamera->sub.demoCtrlMenu = 0;
return 1;
}
@ -1922,7 +1922,7 @@ s32 DbCamera_UpdateDemoControl(DbCamera* dbCamera, Camera* cam) {
if (CHECK_BTN_ALL(sGlobalCtx->state.input[2].press.button, BTN_A) ||
CHECK_BTN_ALL(sGlobalCtx->state.input[2].press.button, BTN_B)) {
Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
if (dbCamera->sub.demoCtrlMenu == DEMO_CTRL_MENU(ACTION_LOAD, MENU_SUCCESS)) {
dbCamera->sub.demoCtrlActionIdx = ACTION_E;
}
@ -1946,7 +1946,7 @@ s32 DbCamera_UpdateDemoControl(DbCamera* dbCamera, Camera* cam) {
if (CHECK_BTN_ALL(sGlobalCtx->state.input[2].press.button, BTN_A) ||
CHECK_BTN_ALL(sGlobalCtx->state.input[2].press.button, BTN_B)) {
Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
dbCamera->sub.demoCtrlMenu -= 9;
}
block_2:
@ -1981,7 +1981,7 @@ s32 DbCamera_UpdateDemoControl(DbCamera* dbCamera, Camera* cam) {
if (CHECK_BTN_ALL(sGlobalCtx->state.input[2].press.button, BTN_DRIGHT)) {
Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &D_801333D4, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
if (sCurFileIdx >= 4) {
sCurFileIdx = 0;
} else {
@ -1998,7 +1998,7 @@ s32 DbCamera_UpdateDemoControl(DbCamera* dbCamera, Camera* cam) {
}
if (CHECK_BTN_ALL(sGlobalCtx->state.input[2].press.button, BTN_DLEFT)) {
Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &D_801333D4, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
if (sCurFileIdx <= 0) {
sCurFileIdx = 4;
} else {
@ -2041,24 +2041,24 @@ s32 DbCamera_UpdateDemoControl(DbCamera* dbCamera, Camera* cam) {
if (CHECK_BTN_ALL(sGlobalCtx->state.input[2].press.button, BTN_DUP)) {
Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &D_801333D4, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
dbCamera->sub.demoCtrlActionIdx = (dbCamera->sub.demoCtrlActionIdx - 1) % 4u;
}
if (CHECK_BTN_ALL(sGlobalCtx->state.input[2].press.button, BTN_DDOWN)) {
Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &D_801333D4, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
dbCamera->sub.demoCtrlActionIdx = (dbCamera->sub.demoCtrlActionIdx + 1) % 4u;
}
if (CHECK_BTN_ALL(sGlobalCtx->state.input[2].press.button, BTN_A)) {
Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &D_801333D4, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
dbCamera->sub.demoCtrlToggleSwitch = 0;
dbCamera->sub.demoCtrlMenu = DEMO_CTRL_MENU(dbCamera->sub.demoCtrlActionIdx, MENU_INFO);
}
if (CHECK_BTN_ALL(sGlobalCtx->state.input[2].press.button, BTN_B)) {
Audio_PlaySoundGeneral(NA_SE_SY_CANCEL, &D_801333D4, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
dbCamera->sub.demoCtrlActionIdx = ACTION_E;
return 1;
}
@ -2071,7 +2071,7 @@ s32 DbCamera_UpdateDemoControl(DbCamera* dbCamera, Camera* cam) {
CHECK_BTN_ALL(sGlobalCtx->state.input[2].press.button, BTN_DDOWN)) {
Audio_PlaySoundGeneral(NA_SE_SY_CANCEL, &D_801333D4, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
dbCamera->sub.demoCtrlActionIdx = ACTION_E;
}
return 2;
@ -2083,13 +2083,13 @@ s32 DbCamera_UpdateDemoControl(DbCamera* dbCamera, Camera* cam) {
default: {
if (CHECK_BTN_ALL(sGlobalCtx->state.input[2].press.button, BTN_DUP)) {
Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
dbCamera->sub.demoCtrlMenu = DEMO_CTRL_MENU(ACTION_E, MENU_INFO);
dbCamera->sub.demoCtrlActionIdx = (dbCamera->sub.demoCtrlActionIdx - 1) % 4u;
sCurFileIdx = 0;
}
if (CHECK_BTN_ALL(sGlobalCtx->state.input[2].press.button, BTN_DDOWN)) {
Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
dbCamera->sub.demoCtrlMenu = DEMO_CTRL_MENU(ACTION_E, MENU_INFO);
dbCamera->sub.demoCtrlActionIdx = (dbCamera->sub.demoCtrlActionIdx + 1) % 4u;
sCurFileIdx = 0;
@ -2128,7 +2128,7 @@ s32 DbCamera_UpdateDemoControl(DbCamera* dbCamera, Camera* cam) {
if (func_800B91B0(cam, dbCamera) == 0) {
Interface_ChangeAlpha(2);
ShrinkWindow_SetVal(0);
Audio_PlaySoundGeneral(NA_SE_SY_GET_RUPY, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_GET_RUPY, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
OLib_Vec3fDiffToVecSphGeo(&sp5C, &dbCamera->eye, &dbCamera->at);
DbCamera_CalcUpFromPitchYawRoll(&dbCamera->unk_1C, sp5C.pitch, sp5C.yaw,
@ -2146,7 +2146,7 @@ s32 DbCamera_UpdateDemoControl(DbCamera* dbCamera, Camera* cam) {
sDbCamAnim.unk_0A = 1;
sDbCamAnim.unk_0C = 0;
D_8016110C = 0;
Audio_PlaySoundGeneral(NA_SE_SY_HP_RECOVER, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_HP_RECOVER, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
if (CHECK_BTN_ALL(sGlobalCtx->state.input[2].press.button, BTN_L)) {
@ -2163,14 +2163,14 @@ s32 DbCamera_UpdateDemoControl(DbCamera* dbCamera, Camera* cam) {
switch (sp74[sCurFileIdx]) {
case '?':
Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &D_801333D4, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
sDbCameraCuts[idx1] = sDbCameraCuts[idx2];
sp74[sCurFileIdx] = '?'; // useless
DbCamera_ResetCut(idx2, false);
break;
case '-':
Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &D_801333D4, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
sp64 = sDbCameraCuts[idx2];
if (sLastFileIdx < sCurFileIdx) {
@ -2193,7 +2193,7 @@ s32 DbCamera_UpdateDemoControl(DbCamera* dbCamera, Camera* cam) {
break;
default:
Audio_PlaySoundGeneral(NA_SE_SY_ERROR, &D_801333D4, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
break;
}
}
@ -2202,7 +2202,7 @@ s32 DbCamera_UpdateDemoControl(DbCamera* dbCamera, Camera* cam) {
if (CHECK_BTN_ALL(sGlobalCtx->state.input[2].press.button, BTN_A)) {
if (sp74[sCurFileIdx] == '?') {
Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
sp74[sCurFileIdx] = DbCamera_InitCut(idx1, &dbCamera->sub);
if (sp74[sCurFileIdx] == '?') {
func_8006376C(0xF, 0x18, 7, D_8012CF48);
@ -2212,7 +2212,7 @@ s32 DbCamera_UpdateDemoControl(DbCamera* dbCamera, Camera* cam) {
if (CHECK_BTN_ALL(sGlobalCtx->state.input[2].press.button, BTN_B)) {
if (sp74[sCurFileIdx] != '?' && sp74[sCurFileIdx] != '-') {
Audio_PlaySoundGeneral(NA_SE_SY_CANCEL, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_CANCEL, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
sp74[sCurFileIdx] = '?';
DbCamera_ResetCut(idx1, true);
}
@ -2220,7 +2220,7 @@ s32 DbCamera_UpdateDemoControl(DbCamera* dbCamera, Camera* cam) {
if (CHECK_BTN_ALL(sGlobalCtx->state.input[2].press.button, BTN_R)) {
if (sp74[sCurFileIdx] != '?' && sp74[sCurFileIdx] != '-') {
Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
for (i = 0; i < sDbCameraCuts[idx1].nPoints; i++) {
dbCamera->sub.lookAt[i] = sDbCameraCuts[idx1].lookAt[i];
@ -2242,7 +2242,7 @@ s32 DbCamera_UpdateDemoControl(DbCamera* dbCamera, Camera* cam) {
}
if (CHECK_BTN_ALL(sGlobalCtx->state.input[2].press.button, BTN_DRIGHT)) {
Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
if (sCurFileIdx == 0x1E) {
sCurFileIdx = 0;
} else {
@ -2250,7 +2250,7 @@ s32 DbCamera_UpdateDemoControl(DbCamera* dbCamera, Camera* cam) {
}
}
if (CHECK_BTN_ALL(sGlobalCtx->state.input[2].press.button, BTN_DLEFT)) {
Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
sCurFileIdx = (sCurFileIdx == 0) ? 0x1E : sCurFileIdx - 1;
}
@ -2264,7 +2264,7 @@ s32 DbCamera_UpdateDemoControl(DbCamera* dbCamera, Camera* cam) {
DbCamera_PrintAllCuts(cam);
} else if (CHECK_BTN_ALL(sGlobalCtx->state.input[2].cur.button, BTN_L) &&
CHECK_BTN_ALL(sGlobalCtx->state.input[2].press.button, BTN_CLEFT)) {
Audio_PlaySoundGeneral(NA_SE_SY_GET_RUPY, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_GET_RUPY, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
for (i = 0; i < ARRAY_COUNT(sDbCameraCuts) - 1; i++) {
if (sDbCameraCuts[i].nPoints != 0) {
osSyncPrintf("\n@@@ /* CUT [%d]\t*/", i);
@ -2280,7 +2280,7 @@ s32 DbCamera_UpdateDemoControl(DbCamera* dbCamera, Camera* cam) {
Interface_ChangeAlpha(50);
ShrinkWindow_SetVal(0x20);
D_8016110C = 0;
Audio_PlaySoundGeneral(NA_SE_SY_HP_RECOVER, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_HP_RECOVER, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
func_8006376C(4, 7, 5, D_8012CF50[0]);

8
src/code/z_actor.cpp
View File

@ -1729,7 +1729,7 @@ void func_8002F7A0(GlobalContext* globalCtx, Actor* actor, f32 arg2, s16 arg3, f
}
void func_8002F7DC(Actor* actor, u16 sfxId) {
Audio_PlaySoundGeneral(sfxId, &actor->projectedPos, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(sfxId, &actor->projectedPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
void Audio_PlayActorSound2(Actor* actor, u16 sfxId) {
@ -2264,7 +2264,7 @@ void Actor_Draw(GlobalContext* globalCtx, Actor* actor) {
void func_80030ED8(Actor* actor) {
if (actor->flags & ACTOR_FLAG_19) {
Audio_PlaySoundGeneral(actor->sfx, &actor->projectedPos, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(actor->sfx, &actor->projectedPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
} else if (actor->flags & ACTOR_FLAG_20) {
func_80078884(actor->sfx);
} else if (actor->flags & ACTOR_FLAG_21) {
@ -4967,7 +4967,7 @@ void func_80036E50(u16 textId, s16 arg1) {
return;
case 0x1033:
Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &D_801333D4, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
Flags_SetEventChkInf(0x4);
Flags_SetInfTable(0xE);
return;
@ -5430,7 +5430,7 @@ s32 func_80037CB8(GlobalContext* globalCtx, Actor* actor, s16 arg2) {
case TEXT_STATE_CHOICE:
case TEXT_STATE_EVENT:
if (Message_ShouldAdvance(globalCtx) && func_80037C94(globalCtx, actor, arg2)) {
Audio_PlaySoundGeneral(NA_SE_SY_CANCEL, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_CANCEL, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
msgCtx->msgMode = MSGMODE_TEXT_CLOSING;
ret = true;
}

32
src/code/z_collision_check.cpp
View File

@ -1588,10 +1588,10 @@ void CollisionCheck_HitSolid(GlobalContext* globalCtx, ColliderInfo* info, Colli
if (flags == TOUCH_SFX_NORMAL && collider->colType != COLTYPE_METAL) {
EffectSsHitMark_SpawnFixedScale(globalCtx, EFFECT_HITMARK_WHITE, hitPos);
if (collider->actor == NULL) {
Audio_PlaySoundGeneral(NA_SE_IT_SHIELD_BOUND, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_IT_SHIELD_BOUND, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
} else {
Audio_PlaySoundGeneral(NA_SE_IT_SHIELD_BOUND, &collider->actor->projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
}
} else if (flags == TOUCH_SFX_NORMAL) { // collider->colType == COLTYPE_METAL
EffectSsHitMark_SpawnFixedScale(globalCtx, EFFECT_HITMARK_METAL, hitPos);
@ -1603,18 +1603,18 @@ void CollisionCheck_HitSolid(GlobalContext* globalCtx, ColliderInfo* info, Colli
} else if (flags == TOUCH_SFX_HARD) {
EffectSsHitMark_SpawnFixedScale(globalCtx, EFFECT_HITMARK_WHITE, hitPos);
if (collider->actor == NULL) {
Audio_PlaySoundGeneral(NA_SE_IT_SHIELD_BOUND, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_IT_SHIELD_BOUND, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
} else {
Audio_PlaySoundGeneral(NA_SE_IT_SHIELD_BOUND, &collider->actor->projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
}
} else if (flags == TOUCH_SFX_WOOD) {
EffectSsHitMark_SpawnFixedScale(globalCtx, EFFECT_HITMARK_DUST, hitPos);
if (collider->actor == NULL) {
Audio_PlaySoundGeneral(NA_SE_IT_REFLECTION_WOOD, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_IT_REFLECTION_WOOD, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
} else {
Audio_PlaySoundGeneral(NA_SE_IT_REFLECTION_WOOD, &collider->actor->projectedPos, 4, &D_801333E0,
&D_801333E0, &D_801333E8);
&D_801333E0, &gReverbAdd2);
}
}
}
@ -1626,16 +1626,16 @@ s32 CollisionCheck_SwordHitAudio(Collider* at, ColliderInfo* acInfo) {
if (at->actor != NULL && at->actor->category == ACTORCAT_PLAYER) {
if (acInfo->elemType == ELEMTYPE_UNK0) {
Audio_PlaySoundGeneral(NA_SE_IT_SWORD_STRIKE, &at->actor->projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
} else if (acInfo->elemType == ELEMTYPE_UNK1) {
Audio_PlaySoundGeneral(NA_SE_IT_SWORD_STRIKE_HARD, &at->actor->projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
} else if (acInfo->elemType == ELEMTYPE_UNK2) {
Audio_PlaySoundGeneral(NA_SE_PL_WALK_GROUND - SFX_FLAG, &at->actor->projectedPos, 4, &D_801333E0,
&D_801333E0, &D_801333E8);
&D_801333E0, &gReverbAdd2);
} else if (acInfo->elemType == ELEMTYPE_UNK3) {
Audio_PlaySoundGeneral(NA_SE_PL_WALK_GROUND - SFX_FLAG, &at->actor->projectedPos, 4, &D_801333E0,
&D_801333E0, &D_801333E8);
&D_801333E0, &gReverbAdd2);
}
}
return 1;
@ -1672,7 +1672,7 @@ void CollisionCheck_HitEffects(GlobalContext* globalCtx, Collider* at, ColliderI
} else if (sHitInfo[ac->colType].effect == HIT_WOOD) {
if (at->actor == NULL) {
CollisionCheck_SpawnShieldParticles(globalCtx, hitPos);
Audio_PlaySoundGeneral(NA_SE_IT_REFLECTION_WOOD, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_IT_REFLECTION_WOOD, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
} else {
CollisionCheck_SpawnShieldParticlesWood(globalCtx, hitPos, &at->actor->projectedPos);
}
@ -1685,10 +1685,10 @@ void CollisionCheck_HitEffects(GlobalContext* globalCtx, Collider* at, ColliderI
} else {
EffectSsHitMark_SpawnFixedScale(globalCtx, EFFECT_HITMARK_WHITE, hitPos);
if (ac->actor == NULL) {
Audio_PlaySoundGeneral(NA_SE_IT_SHIELD_BOUND, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_IT_SHIELD_BOUND, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
} else {
Audio_PlaySoundGeneral(NA_SE_IT_SHIELD_BOUND, &ac->actor->projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
}
}
}
@ -3437,7 +3437,7 @@ void CollisionCheck_SpawnShieldParticles(GlobalContext* globalCtx, Vec3f* v) {
*/
void CollisionCheck_SpawnShieldParticlesMetal(GlobalContext* globalCtx, Vec3f* v) {
CollisionCheck_SpawnShieldParticles(globalCtx, v);
Audio_PlaySoundGeneral(NA_SE_IT_SHIELD_REFLECT_SW, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_IT_SHIELD_REFLECT_SW, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
/**
@ -3445,7 +3445,7 @@ void CollisionCheck_SpawnShieldParticlesMetal(GlobalContext* globalCtx, Vec3f* v
*/
void CollisionCheck_SpawnShieldParticlesMetalSound(GlobalContext* globalCtx, Vec3f* v, Vec3f* pos) {
CollisionCheck_SpawnShieldParticles(globalCtx, v);
Audio_PlaySoundGeneral(NA_SE_IT_SHIELD_REFLECT_SW, pos, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_IT_SHIELD_REFLECT_SW, pos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
/**
@ -3485,7 +3485,7 @@ void CollisionCheck_SpawnShieldParticlesWood(GlobalContext* globalCtx, Vec3f* v,
initWood.lightPoint.z = initWood.position.z;
Effect_Add(globalCtx, &effectIndex, EFFECT_SHIELD_PARTICLE, 0, 1, &initWood);
Audio_PlaySoundGeneral(NA_SE_IT_REFLECTION_WOOD, actorPos, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_IT_REFLECTION_WOOD, actorPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
/**

6
src/code/z_demo.cpp
View File

@ -531,7 +531,7 @@ void Cutscene_Command_Terminator(GlobalContext* globalCtx, CutsceneContext* csCt
CHECK_BTN_ALL(globalCtx->state.input[0].press.button, BTN_B) ||
CHECK_BTN_ALL(globalCtx->state.input[0].press.button, BTN_START)) &&
(gSaveContext.fileNum != 0xFEDC) && (globalCtx->sceneLoadFlag == 0)) {
Audio_PlaySoundGeneral(NA_SE_SY_PIECE_OF_HEART, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_PIECE_OF_HEART, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
temp = 1;
}
@ -1284,12 +1284,12 @@ void Cutscene_Command_TransitionFX(GlobalContext* globalCtx, CutsceneContext* cs
globalCtx->envCtx.screenFillColor[3] = 255.0f * temp;
if ((temp == 0.0f) && (gSaveContext.entranceIndex == 0x006B)) {
Audio_PlaySoundGeneral(NA_SE_SY_WHITE_OUT_S, &D_801333D4, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
} else if ((temp == 0.0f) &&
((gSaveContext.entranceIndex == 0x0053) || (gSaveContext.entranceIndex == 0x0138) ||
(gSaveContext.entranceIndex == 0x0371))) {
Audio_PlaySoundGeneral(NA_SE_EV_WHITE_OUT, &D_801333D4, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
} else if ((temp == 0.0f) && (globalCtx->sceneNum == SCENE_GANONTIKA)) {
func_800788CC(NA_SE_EV_WHITE_OUT);
}

4
src/code/z_en_item00.cpp
View File

@ -928,7 +928,7 @@ void EnItem00_Update(Actor* pthisx, GlobalContext* globalCtx) {
}
if ((*params <= ITEM00_RUPEE_RED) || (*params == ITEM00_RUPEE_ORANGE)) {
Audio_PlaySoundGeneral(NA_SE_SY_GET_RUPY, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_GET_RUPY, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
} else if (getItemId != GI_NONE) {
if (Actor_HasParent(&pthis->actor, globalCtx)) {
Flags_SetCollectible(globalCtx, pthis->collectibleFlag);
@ -936,7 +936,7 @@ void EnItem00_Update(Actor* pthisx, GlobalContext* globalCtx) {
}
return;
} else {
Audio_PlaySoundGeneral(NA_SE_SY_GET_ITEM, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_GET_ITEM, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
Flags_SetCollectible(globalCtx, pthis->collectibleFlag);

4
src/code/z_fbdemo_circle.cpp
View File

@ -96,7 +96,7 @@ void TransitionCircle_Start(void* thisx) {
} else {
pthis->texY = 0x1F4;
if (pthis->effect == 2) {
Audio_PlaySoundGeneral(NA_SE_OC_SECRET_WARP_OUT, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_OC_SECRET_WARP_OUT, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
}
guPerspective(&pthis->projection, &pthis->normal, 60.0f, (4.0f / 3.0f), 10.0f, 12800.0f, 1.0f);
@ -121,7 +121,7 @@ void TransitionCircle_Update(void* thisx, s32 updateRate) {
if (pthis->unk_14 != 0) {
if (pthis->texY == 0) {
if (pthis->effect == 2) {
Audio_PlaySoundGeneral(NA_SE_OC_SECRET_WARP_IN, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_OC_SECRET_WARP_IN, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
}
pthis->texY += pthis->step * 3 / updateRate;

4
src/code/z_kankyo.cpp
View File

@ -2030,7 +2030,7 @@ void func_80075B44(GlobalContext* globalCtx) {
func_800F6D58(86, 1, 0);
if (globalCtx->envCtx.unk_EE[0] == 0 && globalCtx->envCtx.unk_F2[0] == 0) {
osSyncPrintf("\n\n\nNa_StartMorinigBgm\n\n");
func_800F5510(globalCtx->sequenceCtx.seqId);
Audio_PlaySequence2(globalCtx->sequenceCtx.seqId);
}
globalCtx->envCtx.unk_E0++;
break;
@ -2472,7 +2472,7 @@ void func_80077684(GlobalContext* globalCtx) {
func_800F6D58(14, 1, 0);
func_800F6D58(15, 1, 0);
if (func_800FA0B4(SEQ_PLAYER_BGM_MAIN) == NA_BGM_NATURE_AMBIENCE) {
if (Audio_GetSequenceBeingPlayed(SEQ_PLAYER_BGM_MAIN) == NA_BGM_NATURE_AMBIENCE) {
gSaveContext.seqId = NA_BGM_NATURE_SFX_RAIN;
func_800758AC(globalCtx);
}

6
src/code/z_lib.cpp
View File

@ -582,13 +582,13 @@ void Color_RGBA8_Copy(Color_RGBA8* dst, Color_RGBA8* src) {
}
void func_80078884(u16 sfxId) {
Audio_PlaySoundGeneral(sfxId, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(sfxId, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
void func_800788CC(u16 sfxId) {
Audio_PlaySoundGeneral(sfxId, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(sfxId, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
void func_80078914(Vec3f* arg0, u16 sfxId) {
Audio_PlaySoundGeneral(sfxId, arg0, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(sfxId, arg0, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}

8
src/code/z_map_exp.cpp
View File

@ -425,9 +425,9 @@ void Minimap_Draw(GlobalContext* globalCtx) {
osSyncPrintf("Game_play_demo_mode_check=%d\n", Gameplay_InCsMode(globalCtx));
// clang-format off
if (!R_MINIMAP_DISABLED) { Audio_PlaySoundGeneral(NA_SE_SY_CAMERA_ZOOM_UP, &D_801333D4, 4,
&D_801333E0, &D_801333E0, &D_801333E8); }
&D_801333E0, &D_801333E0, &gReverbAdd2); }
else { Audio_PlaySoundGeneral(NA_SE_SY_CAMERA_ZOOM_DOWN, &D_801333D4, 4,
&D_801333E0, &D_801333E0, &D_801333E8); }
&D_801333E0, &D_801333E0, &gReverbAdd2); }
// clang-format on
R_MINIMAP_DISABLED ^= 1;
}
@ -505,9 +505,9 @@ void Minimap_Draw(GlobalContext* globalCtx) {
if (CHECK_BTN_ALL(globalCtx->state.input[0].press.button, BTN_L) && !Gameplay_InCsMode(globalCtx)) {
// clang-format off
if (!R_MINIMAP_DISABLED) { Audio_PlaySoundGeneral(NA_SE_SY_CAMERA_ZOOM_UP, &D_801333D4, 4,
&D_801333E0, &D_801333E0, &D_801333E8); }
&D_801333E0, &D_801333E0, &gReverbAdd2); }
else { Audio_PlaySoundGeneral(NA_SE_SY_CAMERA_ZOOM_DOWN, &D_801333D4, 4,
&D_801333E0, &D_801333E0, &D_801333E8); }
&D_801333E0, &D_801333E0, &gReverbAdd2); }
// clang-format on
R_MINIMAP_DISABLED ^= 1;
}

72
src/code/z_message_PAL.cpp
View File

@ -215,7 +215,7 @@ u8 Message_ShouldAdvance(GlobalContext* globalCtx) {
if (CHECK_BTN_ALL(input->press.button, BTN_A) || CHECK_BTN_ALL(input->press.button, BTN_B) ||
CHECK_BTN_ALL(input->press.button, BTN_CUP)) {
Audio_PlaySoundGeneral(NA_SE_SY_MESSAGE_PASS, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_MESSAGE_PASS, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
return CHECK_BTN_ALL(input->press.button, BTN_A) || CHECK_BTN_ALL(input->press.button, BTN_B) ||
CHECK_BTN_ALL(input->press.button, BTN_CUP);
@ -239,7 +239,7 @@ void Message_CloseTextbox(GlobalContext* globalCtx) {
msgCtx->stateTimer = 2;
msgCtx->msgMode = MSGMODE_TEXT_CLOSING;
msgCtx->textboxEndType = TEXTBOX_ENDTYPE_DEFAULT;
Audio_PlaySoundGeneral(0, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(0, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
}
@ -254,7 +254,7 @@ void Message_HandleChoiceSelection(GlobalContext* globalCtx, u8 numChoices) {
if (msgCtx->choiceIndex > 128) {
msgCtx->choiceIndex = 0;
} else {
Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
} else if (input->rel.stick_y <= -30 && !sAnalogStickHeld) {
sAnalogStickHeld = true;
@ -262,7 +262,7 @@ void Message_HandleChoiceSelection(GlobalContext* globalCtx, u8 numChoices) {
if (msgCtx->choiceIndex > numChoices) {
msgCtx->choiceIndex = numChoices;
} else {
Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
} else if (ABS(input->rel.stick_y) < 30) {
sAnalogStickHeld = false;
@ -736,7 +736,7 @@ u16 Message_DrawItemIcon(GlobalContext* globalCtx, u16 itemId, Gfx** p, u16 i) {
MessageContext* msgCtx = &globalCtx->msgCtx;
// clang-format off
if (msgCtx->msgMode == MSGMODE_TEXT_DISPLAYING) { Audio_PlaySoundGeneral(0, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); }
if (msgCtx->msgMode == MSGMODE_TEXT_DISPLAYING) { Audio_PlaySoundGeneral(0, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2); }
// clang-format on
gDPPipeSync(gfx++);
@ -887,7 +887,7 @@ void Message_DrawText(GlobalContext* globalCtx, Gfx** gfxP) {
case MESSAGE_BOX_BREAK:
if (msgCtx->msgMode == MSGMODE_TEXT_DISPLAYING) {
if (!sTextboxSkipped) {
Audio_PlaySoundGeneral(0, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(0, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
msgCtx->msgMode = MSGMODE_TEXT_AWAIT_NEXT;
Font_LoadMessageBoxIcon(font, TEXTBOX_ICON_TRIANGLE);
} else {
@ -904,7 +904,7 @@ void Message_DrawText(GlobalContext* globalCtx, Gfx** gfxP) {
case MESSAGE_TEXTID:
msgCtx->textboxEndType = TEXTBOX_ENDTYPE_HAS_NEXT;
if (msgCtx->msgMode == MSGMODE_TEXT_DISPLAYING) {
Audio_PlaySoundGeneral(0, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(0, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
msgCtx->msgMode = MSGMODE_TEXT_DONE;
Font_LoadMessageBoxIcon(font, TEXTBOX_ICON_TRIANGLE);
}
@ -974,7 +974,7 @@ void Message_DrawText(GlobalContext* globalCtx, Gfx** gfxP) {
osSyncPrintf("サウンド（ＳＥ）\n");
sfxHi = msgCtx->msgBufDecoded[i + 1] << 8;
Audio_PlaySoundGeneral(sfxHi | msgCtx->msgBufDecoded[i + 2], &D_801333D4, 4, &D_801333E0,
&D_801333E0, &D_801333E8);
&D_801333E0, &gReverbAdd2);
}
i += 2;
break;
@ -983,7 +983,7 @@ void Message_DrawText(GlobalContext* globalCtx, Gfx** gfxP) {
break;
case MESSAGE_BACKGROUND:
// clang-format off
if (msgCtx->msgMode == MSGMODE_TEXT_DISPLAYING) { Audio_PlaySoundGeneral(0, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); }
if (msgCtx->msgMode == MSGMODE_TEXT_DISPLAYING) { Audio_PlaySoundGeneral(0, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2); }
// clang-format on
gDPPipeSync(gfx++);
gDPSetCombineMode(gfx++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM);
@ -1066,7 +1066,7 @@ void Message_DrawText(GlobalContext* globalCtx, Gfx** gfxP) {
msgCtx->msgMode = MSGMODE_TEXT_DONE;
if (msgCtx->textboxEndType == TEXTBOX_ENDTYPE_DEFAULT) {
Audio_PlaySoundGeneral(NA_SE_SY_MESSAGE_END, &D_801333D4, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
Font_LoadMessageBoxIcon(font, TEXTBOX_ICON_SQUARE);
if (globalCtx->csCtx.state == 0) {
Interface_SetDoAction(globalCtx, DO_ACTION_RETURN);
@ -1096,7 +1096,7 @@ void Message_DrawText(GlobalContext* globalCtx, Gfx** gfxP) {
return;
case MESSAGE_PERSISTENT:
if (msgCtx->msgMode == MSGMODE_TEXT_DISPLAYING) {
Audio_PlaySoundGeneral(0, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(0, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
msgCtx->msgMode = MSGMODE_TEXT_DONE;
msgCtx->textboxEndType = TEXTBOX_ENDTYPE_PERSISTENT;
}
@ -1107,14 +1107,14 @@ void Message_DrawText(GlobalContext* globalCtx, Gfx** gfxP) {
msgCtx->msgMode = MSGMODE_TEXT_DONE;
msgCtx->textboxEndType = TEXTBOX_ENDTYPE_EVENT;
Font_LoadMessageBoxIcon(font, TEXTBOX_ICON_TRIANGLE);
Audio_PlaySoundGeneral(NA_SE_SY_MESSAGE_END, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_MESSAGE_END, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
*gfxP = gfx;
return;
default:
if (msgCtx->msgMode == MSGMODE_TEXT_DISPLAYING && i + 1 == msgCtx->textDrawPos &&
msgCtx->textDelayTimer == msgCtx->textDelay) {
Audio_PlaySoundGeneral(0, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(0, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
Message_DrawTextChar(globalCtx, &font->charTexBuf[charTexIdx], &gfx);
charTexIdx += FONT_CHAR_TEX_SIZE;
@ -1752,7 +1752,7 @@ void Message_StartOcarina(GlobalContext* globalCtx, u16 ocarinaActionId) {
osSyncPrintf("ocarina_set 000000000000000000 = %d\n", ocarinaActionId);
msgCtx->ocarinaAction = ocarinaActionId;
if (ocarinaActionId >= OCARINA_ACTION_CHECK_SARIA && ocarinaActionId <= OCARINA_ACTION_CHECK_STORMS) {
Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
if (ocarinaActionId == OCARINA_ACTION_SCARECROW_PLAYBACK) {
Message_OpenText(globalCtx, 0x86F); // Ocarina
@ -2081,7 +2081,7 @@ void Message_DrawMain(GlobalContext* globalCtx, Gfx** p) {
msgCtx->ocarinaStaff->state == OCARINA_SONG_SCARECROW) {
Audio_OcaSetInstrument(0);
Audio_PlaySoundGeneral(NA_SE_SY_OCARINA_ERROR, &D_801333D4, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
msgCtx->msgMode = MSGMODE_OCARINA_STARTING;
} else {
// "Ocarina_Flog Correct Example Performance"
@ -2091,14 +2091,14 @@ void Message_DrawMain(GlobalContext* globalCtx, Gfx** p) {
msgCtx->textBoxType = TEXTBOX_TYPE_OCARINA;
msgCtx->stateTimer = 10;
Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &D_801333D4, 4, &D_801333E0,
&D_801333E0, &D_801333E8);
&D_801333E0, &gReverbAdd2);
Interface_ChangeAlpha(1);
}
} else if (msgCtx->ocarinaAction == OCARINA_ACTION_CHECK_SCARECROW) {
if (msgCtx->ocarinaStaff->state < OCARINA_SONG_SCARECROW) {
Audio_OcaSetInstrument(0);
Audio_PlaySoundGeneral(NA_SE_SY_OCARINA_ERROR, &D_801333D4, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
msgCtx->stateTimer = 10;
msgCtx->msgMode = MSGMODE_OCARINA_FAIL;
} else {
@ -2109,7 +2109,7 @@ void Message_DrawMain(GlobalContext* globalCtx, Gfx** p) {
msgCtx->textBoxType = TEXTBOX_TYPE_OCARINA;
msgCtx->stateTimer = 10;
Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &D_801333D4, 4, &D_801333E0,
&D_801333E0, &D_801333E8);
&D_801333E0, &gReverbAdd2);
Interface_ChangeAlpha(1);
}
} else if (msgCtx->ocarinaAction == OCARINA_ACTION_FREE_PLAY) {
@ -2120,22 +2120,22 @@ void Message_DrawMain(GlobalContext* globalCtx, Gfx** p) {
msgCtx->textBoxType = TEXTBOX_TYPE_OCARINA;
msgCtx->stateTimer = 10;
Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &D_801333D4, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
} else {
Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &D_801333D4, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
}
Interface_ChangeAlpha(1);
} else {
Audio_OcaSetInstrument(0);
Audio_PlaySoundGeneral(NA_SE_SY_OCARINA_ERROR, &D_801333D4, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
msgCtx->msgMode = MSGMODE_OCARINA_STARTING;
}
} else if (msgCtx->ocarinaStaff->state == 0xFF) {
Audio_OcaSetInstrument(0);
Audio_PlaySoundGeneral(NA_SE_SY_OCARINA_ERROR, &D_801333D4, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
msgCtx->stateTimer = 10;
msgCtx->msgMode = MSGMODE_OCARINA_FAIL;
} else if (CHECK_BTN_ALL(globalCtx->state.input[0].press.button, BTN_B)) {
@ -2511,10 +2511,10 @@ void Message_DrawMain(GlobalContext* globalCtx, Gfx** p) {
osSyncPrintf(VT_RST);
msgCtx->stateTimer = 20;
Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &D_801333D4, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
} else if (msgCtx->ocarinaStaff->state == 0xFF) {
Audio_PlaySoundGeneral(NA_SE_SY_OCARINA_ERROR, &D_801333D4, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
msgCtx->stateTimer = 10;
msgCtx->msgMode = MSGMODE_SONG_PLAYBACK_FAIL;
}
@ -2566,7 +2566,7 @@ void Message_DrawMain(GlobalContext* globalCtx, Gfx** p) {
gSaveContext.scarecrowCustomSongSet = true;
}
Audio_PlaySoundGeneral(NA_SE_SY_OCARINA_ERROR, &D_801333D4, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
osSyncPrintf("aaaaaaaaaaaaaa\n");
Audio_OcaSetRecordingState(0);
msgCtx->stateTimer = 10;
@ -2636,7 +2636,7 @@ void Message_DrawMain(GlobalContext* globalCtx, Gfx** p) {
gSaveContext.scarecrowSpawnSongSet = true;
msgCtx->msgMode = MSGMODE_SCARECROW_RECORDING_DONE;
Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &D_801333D4, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
osSyncPrintf(VT_FGCOL(YELLOW));
osSyncPrintf("\n====================================================================\n");
MemCopy(gSaveContext.scarecrowSpawnSong, gScarecrowSpawnSongPtr,
@ -2652,7 +2652,7 @@ void Message_DrawMain(GlobalContext* globalCtx, Gfx** p) {
osSyncPrintf("すでに存在する曲吹いた！！！ \n");
Audio_OcaSetRecordingState(0);
Audio_PlaySoundGeneral(NA_SE_SY_OCARINA_ERROR, &D_801333D4, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
Message_CloseTextbox(globalCtx);
msgCtx->msgMode = MSGMODE_SCARECROW_RECORDING_FAILED;
}
@ -2678,7 +2678,7 @@ void Message_DrawMain(GlobalContext* globalCtx, Gfx** p) {
case MSGMODE_MEMORY_GAME_LEFT_SKULLKID_PLAYING:
case MSGMODE_MEMORY_GAME_RIGHT_SKULLKID_PLAYING:
Audio_PlaySoundGeneral(NA_SE_SY_METRONOME_LV - SFX_FLAG, &D_801333D4, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
msgCtx->ocarinaStaff = Audio_OcaGetDisplayingStaff();
if (msgCtx->ocarinaStaff->pos && sOcarinaNoteBufPos == msgCtx->ocarinaStaff->pos - 1) {
sOcarinaNoteBuf[msgCtx->ocarinaStaff->pos - 1] = msgCtx->ocarinaStaff->noteIdx;
@ -2689,10 +2689,10 @@ void Message_DrawMain(GlobalContext* globalCtx, Gfx** p) {
if (msgCtx->ocarinaStaff->state == 0) {
if (msgCtx->msgMode == MSGMODE_MEMORY_GAME_LEFT_SKULLKID_PLAYING) {
Audio_PlaySoundGeneral(NA_SE_SY_METRONOME, &D_801333D4, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
} else {
Audio_PlaySoundGeneral(NA_SE_SY_METRONOME_2, &D_801333D4, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
}
msgCtx->msgMode++;
}
@ -2711,7 +2711,7 @@ void Message_DrawMain(GlobalContext* globalCtx, Gfx** p) {
break;
case MSGMODE_MEMORY_GAME_PLAYER_PLAYING:
Audio_PlaySoundGeneral(NA_SE_SY_METRONOME_LV - SFX_FLAG, &D_801333D4, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
msgCtx->ocarinaStaff = Audio_OcaGetPlayingStaff();
if (msgCtx->ocarinaStaff->pos && sOcarinaNoteBufPos == msgCtx->ocarinaStaff->pos - 1) {
sOcarinaNoteBuf[msgCtx->ocarinaStaff->pos - 1] = msgCtx->ocarinaStaff->noteIdx;
@ -2723,13 +2723,13 @@ void Message_DrawMain(GlobalContext* globalCtx, Gfx** p) {
osSyncPrintf("輪唱失敗！！！！！！！！！\n");
Audio_OcaSetInstrument(0);
Audio_PlaySoundGeneral(NA_SE_SY_OCARINA_ERROR, &D_801333D4, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
msgCtx->stateTimer = 10;
globalCtx->msgCtx.ocarinaMode = OCARINA_MODE_03;
} else if (msgCtx->ocarinaStaff->state == 0xD) {
// "Musical round succeeded！！！！！！！！！"
osSyncPrintf("輪唱成功！！！！！！！！！\n");
Audio_PlaySoundGeneral(NA_SE_SY_GET_ITEM, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_GET_ITEM, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
msgCtx->msgMode = MSGMODE_MEMORY_GAME_ROUND_SUCCESS;
msgCtx->stateTimer = 30;
}
@ -2746,7 +2746,7 @@ void Message_DrawMain(GlobalContext* globalCtx, Gfx** p) {
if (msgCtx->stateTimer == 0) {
if (Audio_OcaMemoryGameGenNote() != 1) {
Audio_PlaySoundGeneral(NA_SE_SY_METRONOME, &D_801333D4, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
msgCtx->ocarinaStaff = Audio_OcaGetPlayingStaff();
msgCtx->ocarinaStaff->pos = sOcarinaNoteBufPos = 0;
Message_ResetOcarinaNoteState();
@ -3191,10 +3191,10 @@ void Message_Update(GlobalContext* globalCtx) {
osSyncPrintf("select=%d\n", msgCtx->textboxEndType);
if (msgCtx->textboxEndType == TEXTBOX_ENDTYPE_HAS_NEXT) {
Audio_PlaySoundGeneral(NA_SE_SY_MESSAGE_PASS, &D_801333D4, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
Message_ContinueTextbox(globalCtx, sNextTextId);
} else {
Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Message_CloseTextbox(globalCtx);
}
}

42
src/code/z_parameter.cpp
View File

@ -2141,7 +2141,7 @@ void Interface_SetNaviCall(GlobalContext* globalCtx, u16 naviCallState) {
(globalCtx->csCtx.state == CS_STATE_IDLE)) {
// clang-format off
if (naviCallState == 0x1E) { Audio_PlaySoundGeneral(NA_SE_VO_NAVY_CALL, &D_801333D4, 4,
&D_801333E0, &D_801333E0, &D_801333E8); }
&D_801333E0, &D_801333E0, &gReverbAdd2); }
// clang-format on
if (naviCallState == 0x1D) {
@ -2184,7 +2184,7 @@ s32 Health_ChangeBy(GlobalContext* globalCtx, s16 healthChange) {
// clang-format off
if (healthChange > 0) { Audio_PlaySoundGeneral(NA_SE_SY_HP_RECOVER, &D_801333D4, 4,
&D_801333E0, &D_801333E0, &D_801333E8);
&D_801333E0, &D_801333E0, &gReverbAdd2);
} else if ((gSaveContext.doubleDefense != 0) && (healthChange < 0)) {
healthChange >>= 1;
osSyncPrintf("Heart decrease halved!!＝%d\n", healthChange); // "Heart decrease halved!!＝%d"
@ -2312,7 +2312,7 @@ s32 func_80087708(GlobalContext* globalCtx, s16 arg1, s16 arg2) {
if ((arg2 != 5) && (gSaveContext.magic - arg1) < 0) {
if (gSaveContext.unk_13F4 != 0) {
Audio_PlaySoundGeneral(NA_SE_SY_ERROR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_ERROR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
return 0;
}
@ -2328,7 +2328,7 @@ s32 func_80087708(GlobalContext* globalCtx, s16 arg1, s16 arg2) {
gSaveContext.unk_13F0 = 1;
return 1;
} else {
Audio_PlaySoundGeneral(NA_SE_SY_ERROR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_ERROR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
return 0;
}
case 1:
@ -2340,7 +2340,7 @@ s32 func_80087708(GlobalContext* globalCtx, s16 arg1, s16 arg2) {
gSaveContext.unk_13F0 = 6;
return 1;
} else {
Audio_PlaySoundGeneral(NA_SE_SY_ERROR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_ERROR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
return 0;
}
case 3:
@ -2368,7 +2368,7 @@ s32 func_80087708(GlobalContext* globalCtx, s16 arg1, s16 arg2) {
gSaveContext.unk_13F0 = 4;
return 1;
} else {
Audio_PlaySoundGeneral(NA_SE_SY_ERROR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_ERROR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
return 0;
}
case 5:
@ -2430,7 +2430,7 @@ void Interface_UpdateMagicBar(GlobalContext* globalCtx) {
if (gSaveContext.gameMode == 0 && gSaveContext.sceneSetupIndex < 4) {
Audio_PlaySoundGeneral(NA_SE_SY_GAUGE_UP - SFX_FLAG, &D_801333D4, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
}
// "Storage MAGIC_NOW=%d (%d)"
@ -2512,7 +2512,7 @@ void Interface_UpdateMagicBar(GlobalContext* globalCtx) {
(globalCtx->actorCtx.unk_03 == 0)) {
globalCtx->actorCtx.unk_03 = 0;
Audio_PlaySoundGeneral(NA_SE_SY_GLASSMODE_OFF, &D_801333D4, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
gSaveContext.unk_13F0 = 0;
sMagicBorderR = sMagicBorderG = sMagicBorderB = 255;
break;
@ -2563,7 +2563,7 @@ void Interface_UpdateMagicBar(GlobalContext* globalCtx) {
case 10:
gSaveContext.magic += 4;
Audio_PlaySoundGeneral(NA_SE_SY_GAUGE_UP - SFX_FLAG, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_GAUGE_UP - SFX_FLAG, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
if (gSaveContext.magic >= gSaveContext.unk_13F8) {
gSaveContext.magic = gSaveContext.unk_13F8;
gSaveContext.unk_13F0 = gSaveContext.unk_13F2;
@ -3550,16 +3550,16 @@ void Interface_Draw(GlobalContext* globalCtx) {
} else if (gSaveContext.timer1Value > 60) {
if (timerDigits[4] == 1) {
Audio_PlaySoundGeneral(NA_SE_SY_MESSAGE_WOMAN, &D_801333D4, 4, &D_801333E0,
&D_801333E0, &D_801333E8);
&D_801333E0, &gReverbAdd2);
}
} else if (gSaveContext.timer1Value >= 11) {
if (timerDigits[4] & 1) {
Audio_PlaySoundGeneral(NA_SE_SY_WARNING_COUNT_N, &D_801333D4, 4, &D_801333E0,
&D_801333E0, &D_801333E8);
&D_801333E0, &gReverbAdd2);
}
} else {
Audio_PlaySoundGeneral(NA_SE_SY_WARNING_COUNT_E, &D_801333D4, 4, &D_801333E0,
&D_801333E0, &D_801333E8);
&D_801333E0, &gReverbAdd2);
}
}
}
@ -3607,7 +3607,7 @@ void Interface_Draw(GlobalContext* globalCtx) {
gSaveContext.timer1State = 15;
} else {
Audio_PlaySoundGeneral(NA_SE_SY_WARNING_COUNT_N, &D_801333D4, 4, &D_801333E0,
&D_801333E0, &D_801333E8);
&D_801333E0, &gReverbAdd2);
}
}
}
@ -3725,16 +3725,16 @@ void Interface_Draw(GlobalContext* globalCtx) {
} else if (gSaveContext.timer2Value > 60) {
if (timerDigits[4] == 1) {
Audio_PlaySoundGeneral(NA_SE_SY_MESSAGE_WOMAN, &D_801333D4, 4,
&D_801333E0, &D_801333E0, &D_801333E8);
&D_801333E0, &D_801333E0, &gReverbAdd2);
}
} else if (gSaveContext.timer2Value > 10) {
if ((timerDigits[4] & 1)) {
Audio_PlaySoundGeneral(NA_SE_SY_WARNING_COUNT_N, &D_801333D4, 4,
&D_801333E0, &D_801333E0, &D_801333E8);
&D_801333E0, &D_801333E0, &gReverbAdd2);
}
} else {
Audio_PlaySoundGeneral(NA_SE_SY_WARNING_COUNT_E, &D_801333D4, 4,
&D_801333E0, &D_801333E0, &D_801333E8);
&D_801333E0, &D_801333E0, &gReverbAdd2);
}
} else {
gSaveContext.timer2Value++;
@ -3749,7 +3749,7 @@ void Interface_Draw(GlobalContext* globalCtx) {
if ((gSaveContext.timer2Value % 60) == 0) {
Audio_PlaySoundGeneral(NA_SE_SY_WARNING_COUNT_N, &D_801333D4, 4, &D_801333E0,
&D_801333E0, &D_801333E8);
&D_801333E0, &gReverbAdd2);
}
}
}
@ -3984,7 +3984,7 @@ void Interface_Update(GlobalContext* globalCtx) {
gSaveContext.health += 4;
if ((gSaveContext.health & 0xF) < 4) {
Audio_PlaySoundGeneral(NA_SE_SY_HP_RECOVER, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_HP_RECOVER, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
osSyncPrintf("now_life=%d max_life=%d\n", gSaveContext.health, gSaveContext.healthCapacity);
@ -4021,7 +4021,7 @@ void Interface_Update(GlobalContext* globalCtx) {
if (gSaveContext.rupees < CUR_CAPACITY(UPG_WALLET)) {
gSaveContext.rupeeAccumulator--;
gSaveContext.rupees++;
Audio_PlaySoundGeneral(NA_SE_SY_RUPY_COUNT, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_RUPY_COUNT, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
} else {
// "Rupee Amount MAX = %d"
osSyncPrintf("Rupee Amount MAX = %d\n", CUR_CAPACITY(UPG_WALLET));
@ -4037,11 +4037,11 @@ void Interface_Update(GlobalContext* globalCtx) {
gSaveContext.rupees = 0;
}
Audio_PlaySoundGeneral(NA_SE_SY_RUPY_COUNT, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_RUPY_COUNT, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
} else {
gSaveContext.rupeeAccumulator++;
gSaveContext.rupees--;
Audio_PlaySoundGeneral(NA_SE_SY_RUPY_COUNT, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_RUPY_COUNT, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
} else {
gSaveContext.rupeeAccumulator = 0;

8
src/code/z_play.cpp
View File

@ -106,7 +106,7 @@ void func_800BC490(GlobalContext* globalCtx, s16 point) {
if ((YREG(15) != 0x10) && (gSaveContext.cutsceneIndex < 0xFFF0)) {
Audio_PlaySoundGeneral((point == 1) ? NA_SE_SY_CAMERA_ZOOM_DOWN : NA_SE_SY_CAMERA_ZOOM_UP, &D_801333D4, 4,
&D_801333E0, &D_801333E0, &D_801333E8);
&D_801333E0, &D_801333E0, &gReverbAdd2);
}
func_800BC450(globalCtx);
@ -781,7 +781,7 @@ void Gameplay_Update(GlobalContext* globalCtx) {
case 13:
Audio_PlaySoundGeneral(NA_SE_EV_SAND_STORM - SFX_FLAG, &D_801333D4, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
if (globalCtx->sceneLoadFlag == -0x14) {
if (globalCtx->envCtx.sandstormPrimA < 110) {
gTrnsnUnkState = 0;
@ -815,7 +815,7 @@ void Gameplay_Update(GlobalContext* globalCtx) {
case 15:
Audio_PlaySoundGeneral(NA_SE_EV_SAND_STORM - SFX_FLAG, &D_801333D4, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
if (globalCtx->sceneLoadFlag == -0x14) {
if (globalCtx->envCtx.sandstormPrimA <= 0) {
gTrnsnUnkState = 0;
@ -1002,7 +1002,7 @@ void Gameplay_Update(GlobalContext* globalCtx) {
// "Changing viewpoint is prohibited during the cutscene"
osSyncPrintf(VT_FGCOL(CYAN) "デモ中につき視点変更を禁止しております\n" VT_RST);
} else if (YREG(15) == 0x10) {
Audio_PlaySoundGeneral(NA_SE_SY_ERROR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_ERROR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
} else {
func_800BC490(globalCtx, globalCtx->unk_1242B ^ 3);
}

6
src/overlays/actors/ovl_Arms_Hook/z_arms_hook.cpp
View File

@ -197,7 +197,7 @@ void ArmsHook_Shoot(ArmsHook* pthis, GlobalContext* globalCtx) {
}
pthis->timer = 0;
Audio_PlaySoundGeneral(NA_SE_IT_ARROW_STICK_CRE, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
} else if (DECRT(pthis->timer) == 0) {
grabbed = pthis->grabbed;
if (grabbed != NULL) {
@ -290,11 +290,11 @@ void ArmsHook_Shoot(ArmsHook* pthis, GlobalContext* globalCtx) {
}
func_80865044(pthis);
Audio_PlaySoundGeneral(NA_SE_IT_HOOKSHOT_STICK_OBJ, &pthis->actor.projectedPos, 4, &D_801333E0,
&D_801333E0, &D_801333E8);
&D_801333E0, &gReverbAdd2);
} else {
CollisionCheck_SpawnShieldParticlesMetal(globalCtx, &pthis->actor.world.pos);
Audio_PlaySoundGeneral(NA_SE_IT_HOOKSHOT_REFLECT, &pthis->actor.projectedPos, 4, &D_801333E0,
&D_801333E0, &D_801333E8);
&D_801333E0, &gReverbAdd2);
}
} else if (CHECK_BTN_ANY(globalCtx->state.input[0].press.button,
(BTN_A | BTN_B | BTN_R | BTN_CUP | BTN_CLEFT | BTN_CRIGHT | BTN_CDOWN))) {

4
src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.cpp
View File

@ -264,12 +264,12 @@ void BgBreakwall_Wait(BgBreakwall* pthis, GlobalContext* globalCtx) {
Flags_SetEventChkInf(0xB0);
Cutscene_SetSegment(globalCtx, gDcOpeningCs);
gSaveContext.cutsceneTrigger = 1;
Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
func_8002DF54(globalCtx, NULL, 0x31);
}
if (pthis->dyna.actor.params < 0) {
Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
Actor_Kill(&pthis->dyna.actor);

2
src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.cpp
View File

@ -187,7 +187,7 @@ void BgDdanKd_LowerStairs(BgDdanKd* pthis, GlobalContext* globalCtx) {
}
Camera_AddQuake(&globalCtx->mainCamera, 0, effectStrength * 0.6f, 3);
Audio_PlaySoundGeneral(NA_SE_EV_PILLAR_SINK - SFX_FLAG, &pthis->dyna.actor.projectedPos, 4, &D_801333E0,
&D_801333E0, &D_801333E8);
&D_801333E0, &gReverbAdd2);
}
}

10
src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.cpp
View File

@ -174,16 +174,16 @@ void BgDodoago_WaitExplosives(BgDodoago* pthis, GlobalContext* globalCtx) {
((globalCtx->roomCtx.unk_74[BGDODOAGO_EYE_RIGHT] == 255) && (pthis->state == BGDODOAGO_EYE_LEFT))) {
Flags_SetSwitch(globalCtx, pthis->dyna.actor.params & 0x3F);
pthis->state = 0;
Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
BgDodoago_SetupAction(pthis, BgDodoago_OpenJaw);
OnePointCutscene_Init(globalCtx, 3380, 160, &pthis->dyna.actor, MAIN_CAM);
} else if (globalCtx->roomCtx.unk_74[pthis->state] == 0) {
OnePointCutscene_Init(globalCtx, 3065, 40, &pthis->dyna.actor, MAIN_CAM);
BgDodoago_SetupAction(pthis, BgDodoago_LightOneEye);
Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
} else {
OnePointCutscene_Init(globalCtx, 3065, 20, &pthis->dyna.actor, MAIN_CAM);
Audio_PlaySoundGeneral(NA_SE_SY_ERROR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_ERROR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
sTimer += 30;
return;
}
@ -262,10 +262,10 @@ void BgDodoago_OpenJaw(BgDodoago* pthis, GlobalContext* globalCtx) {
if (Math_SmoothStepToS(&pthis->dyna.actor.shape.rot.x, 0x1333, 110 - pthis->state, 0x3E8, 0x32) == 0) {
BgDodoago_SetupAction(pthis, BgDodoago_DoNothing);
Audio_PlaySoundGeneral(NA_SE_EV_STONE_BOUND, &pthis->dyna.actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
} else {
Audio_PlaySoundGeneral(NA_SE_EV_STONE_STATUE_OPEN - SFX_FLAG, &pthis->dyna.actor.projectedPos, 4, &D_801333E0,
&D_801333E0, &D_801333E8);
&D_801333E0, &gReverbAdd2);
}
}

4
src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.cpp
View File

@ -228,10 +228,10 @@ void BgGanonOtyuka_Fall(BgGanonOtyuka* pthis, GlobalContext* globalCtx) {
} else {
if (pthis->dropTimer == 1) {
Audio_PlaySoundGeneral(NA_SE_EV_STONEDOOR_STOP, &pthis->dyna.actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
} else {
Audio_PlaySoundGeneral(NA_SE_EV_BLOCKSINK - SFX_FLAG, &pthis->dyna.actor.projectedPos, 4, &D_801333E0,
&D_801333E0, &D_801333E8);
&D_801333E0, &gReverbAdd2);
}
Math_ApproachF(&pthis->dyna.actor.world.pos.y, -1000.0f, 1.0f, pthis->dyna.actor.speedXZ);
Math_ApproachF(&pthis->dyna.actor.speedXZ, 100.0f, 1.0f, 0.1f);

4
src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.cpp
View File

@ -132,7 +132,7 @@ void BgGndDarkmeiro_UpdateBlockTimer(BgGndDarkmeiro* pthis, GlobalContext* globa
} else {
pthis->actionFlags |= 4;
pthis->timer1 = 304;
Audio_PlaySoundGeneral(NA_SE_EV_RED_EYE, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_EV_RED_EYE, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
}
@ -147,7 +147,7 @@ void BgGndDarkmeiro_UpdateBlockTimer(BgGndDarkmeiro* pthis, GlobalContext* globa
} else {
pthis->actionFlags |= 8;
pthis->timer2 = 304;
Audio_PlaySoundGeneral(NA_SE_EV_RED_EYE, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_EV_RED_EYE, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
}

2
src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.cpp
View File

@ -183,7 +183,7 @@ void func_8087B284(BgGndSoulmeiro* pthis, GlobalContext* globalCtx) {
if (!Flags_GetSwitch(globalCtx, (pthis->actor.params >> 8) & 0x3F)) {
pthis->actor.draw = BgGndSoulmeiro_Draw;
if (pthis->collider.base.acFlags & AC_HIT) {
Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
pthis->unk_198 = 40;
pthis->actionFunc = func_8087AF38;
} else {

2
src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.cpp
View File

@ -487,7 +487,7 @@ void BgMizuBwall_Idle(BgMizuBwall* pthis, GlobalContext* globalCtx) {
pthis->dList = NULL;
BgMizuBwall_SpawnDebris(pthis, globalCtx);
Audio_PlayActorSound2(&pthis->dyna.actor, NA_SE_EV_WALL_BROKEN);
Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
pthis->actionFunc = BgMizuBwall_Break;
} else if (pthis->dyna.actor.xzDistToPlayer < 600.0f) {
CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &pthis->collider.base);

2
src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.cpp
View File

@ -72,7 +72,7 @@ void BgRelayObjects_Init(Actor* thisx, GlobalContext* globalCtx) {
} else {
thisx->world.rot.y = 0x80;
}
func_800F5718();
Audio_PlayWindmill();
thisx->room = -1;
thisx->flags |= ACTOR_FLAG_5;
if (D_808A9508 & 2) {

2
src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.cpp
View File

@ -64,7 +64,7 @@ void func_808ABB84(BgSpot01Idomizu* pthis, GlobalContext* globalCtx) {
globalCtx->colCtx.colHeader->waterBoxes[0].ySurface = pthis->actor.world.pos.y;
if (pthis->waterHeight < pthis->actor.world.pos.y) {
Audio_PlaySoundGeneral(NA_SE_EV_WATER_LEVEL_DOWN - SFX_FLAG, &D_801333D4, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
}
Math_ApproachF(&pthis->actor.world.pos.y, pthis->waterHeight, 1.0f, 2.0f);
}

2
src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.cpp
View File

@ -317,7 +317,7 @@ void BgSpot06Objects_LockWait(BgSpot06Objects* pthis, GlobalContext* globalCtx)
EffectSsGSplash_Spawn(globalCtx, &pthis->dyna.actor.world.pos, NULL, NULL, 1, 700);
pthis->collider.elements->dim.worldSphere.radius = 45;
pthis->actionFunc = BgSpot06Objects_LockPullOutward;
Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Flags_SetSwitch(globalCtx, pthis->switchFlag);
OnePointCutscene_Init(globalCtx, 4120, 170, &pthis->dyna.actor, MAIN_CAM);
} else {

4
src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.cpp
View File

@ -115,7 +115,7 @@ void func_808BC65C(BgTreemouth* pthis, GlobalContext* globalCtx) {
if (npcAction->action == 2) {
BgTreemouth_SetupAction(pthis, func_808BC80C);
} else if (npcAction->action == 3) {
Audio_PlaySoundGeneral(NA_SE_EV_WOODDOOR_OPEN, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_EV_WOODDOOR_OPEN, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
BgTreemouth_SetupAction(pthis, func_808BC6F8);
}
}
@ -219,7 +219,7 @@ void func_808BCAF0(BgTreemouth* pthis, GlobalContext* globalCtx) {
if (npcAction->action == 2) {
BgTreemouth_SetupAction(pthis, func_808BC80C);
} else if (npcAction->action == 3) {
Audio_PlaySoundGeneral(NA_SE_EV_WOODDOOR_OPEN, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_EV_WOODDOOR_OPEN, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
BgTreemouth_SetupAction(pthis, func_808BC6F8);
}
}

2
src/overlays/actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.cpp
View File

@ -100,7 +100,7 @@ void BgVbSima_Update(Actor* thisx, GlobalContext* globalCtx) {
pthis->dyna.actor.shape.rot.x = (s16)Math_SinS(pthis->shakeTimer * 0x7000) * 0x37;
pthis->dyna.actor.shape.rot.z = (s16)Math_SinS(pthis->shakeTimer * 0x5000) * 0x37;
Audio_PlaySoundGeneral(NA_SE_EV_BLOCKSINK - SFX_FLAG, &pthis->dyna.actor.projectedPos, 4, &D_801333E0,
&D_801333E0, &D_801333E8);
&D_801333E0, &gReverbAdd2);
} else if (signal == VBSIMA_KILL) {
Actor_Kill(&pthis->dyna.actor);
}

2
src/overlays/actors/ovl_Bg_Zg/z_bg_zg.cpp
View File

@ -66,7 +66,7 @@ void BgZg_Destroy(Actor* thisx, GlobalContext* globalCtx) {
void func_808C0C50(BgZg* pthis) {
Audio_PlaySoundGeneral(NA_SE_EV_METALDOOR_OPEN, &pthis->dyna.actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
}
s32 func_808C0C98(BgZg* pthis, GlobalContext* globalCtx) {

24
src/overlays/actors/ovl_Boss_Fd/z_boss_fd.cpp
View File

@ -400,7 +400,7 @@ void BossFd_Fly(BossFd* pthis, GlobalContext* globalCtx) {
}
if (pthis->timers[0] < 50) {
Audio_PlaySoundGeneral(NA_SE_EN_DODO_K_ROLL - SFX_FLAG, &pthis->actor.projectedPos, 4, &D_801333E0,
&D_801333E0, &D_801333E8);
&D_801333E0, &gReverbAdd2);
pthis->camData.yMod = Math_CosS(pthis->work[BFD_MOVE_TIMER] * 0x8000) * pthis->camData.shake;
Math_ApproachF(&pthis->camData.shake, 2.0f, 1.0f, 0.8 * 0.01f);
}
@ -421,7 +421,7 @@ void BossFd_Fly(BossFd* pthis, GlobalContext* globalCtx) {
pthis->camData.yMod = Math_CosS(pthis->work[BFD_MOVE_TIMER] * 0x8000) * pthis->camData.shake;
Math_ApproachF(&pthis->camData.shake, 2.0f, 1.0f, 0.8 * 0.01f);
Audio_PlaySoundGeneral(NA_SE_EN_DODO_K_ROLL - SFX_FLAG, &pthis->actor.projectedPos, 4, &D_801333E0,
&D_801333E0, &D_801333E8);
&D_801333E0, &gReverbAdd2);
if (pthis->timers[0] == 0) {
pthis->introState = BFD_CS_COLLAPSE;
pthis->camData.nextEye.x = player2->actor.world.pos.x + 100.0f + 300.0f;
@ -442,7 +442,7 @@ void BossFd_Fly(BossFd* pthis, GlobalContext* globalCtx) {
pthis->camData.yMod = Math_CosS(pthis->work[BFD_MOVE_TIMER] * 0x8000) * pthis->camData.shake;
Math_ApproachF(&pthis->camData.shake, 2.0f, 1.0f, 0.8 * 0.01f);
Audio_PlaySoundGeneral(NA_SE_EN_DODO_K_ROLL - SFX_FLAG, &pthis->actor.projectedPos, 4, &D_801333E0,
&D_801333E0, &D_801333E8);
&D_801333E0, &gReverbAdd2);
if (pthis->timers[0] == 100) {
pthis->platformSignal = VBSIMA_COLLAPSE;
}
@ -479,7 +479,7 @@ void BossFd_Fly(BossFd* pthis, GlobalContext* globalCtx) {
osSyncPrintf("WAY_SPD Z = %f\n", pthis->camData.atVel.z);
if ((pthis->timers[3] > 190) && !(gSaveContext.eventChkInf[7] & 8)) {
Audio_PlaySoundGeneral(NA_SE_EN_DODO_K_ROLL - SFX_FLAG, &pthis->actor.projectedPos, 4, &D_801333E0,
&D_801333E0, &D_801333E8);
&D_801333E0, &gReverbAdd2);
}
if (pthis->timers[3] == 190) {
pthis->camData.atMaxVel.x = pthis->camData.atMaxVel.y = pthis->camData.atMaxVel.z = 0.05f;
@ -686,7 +686,7 @@ void BossFd_Fly(BossFd* pthis, GlobalContext* globalCtx) {
pthis->fwork[BFD_CEILING_BOUNCE] = -18384.0f;
pthis->timers[1] = 10;
Audio_PlaySoundGeneral(NA_SE_EV_EXPLOSION, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
func_80033E1C(globalCtx, 3, 0xA, 0x7530);
pthis->work[BFD_ROCK_TIMER] = 300;
}
@ -786,7 +786,7 @@ void BossFd_Fly(BossFd* pthis, GlobalContext* globalCtx) {
sp150 = 1;
if (pthis->work[BFD_MOVE_TIMER] & 0x1C) {
Audio_PlaySoundGeneral(NA_SE_EN_VALVAISA_BURN - SFX_FLAG, &pthis->actor.projectedPos, 4, &D_801333E0,
&D_801333E0, &D_801333E8);
&D_801333E0, &gReverbAdd2);
}
for (i1 = 0; i1 < sp150; i1++) {
if (sp150) { // Needed for matching
@ -859,7 +859,7 @@ void BossFd_Fly(BossFd* pthis, GlobalContext* globalCtx) {
pthis->timers[1] = 60;
pthis->work[BFD_CAM_SHAKE_TIMER] = 20;
Audio_PlaySoundGeneral(NA_SE_EN_VALVAISA_LAND2, &pthis->actor.projectedPos, 4, &D_801333E0,
&D_801333E0, &D_801333E8);
&D_801333E0, &gReverbAdd2);
func_8002DF54(globalCtx, &pthis->actor, 5);
for (i1 = 0; i1 < 15; i1++) {
Vec3f sp144 = { 0.0f, 0.0f, 0.0f };
@ -901,7 +901,7 @@ void BossFd_Fly(BossFd* pthis, GlobalContext* globalCtx) {
Vec3f sp108 = { 0.0f, 0.03f, 0.0f };
Audio_PlaySoundGeneral(NA_SE_EN_GOMA_LAST - SFX_FLAG, &pthis->actor.projectedPos, 4, &D_801333E0,
&D_801333E0, &D_801333E8);
&D_801333E0, &gReverbAdd2);
sp120.x = Rand_CenteredFloat(40.0f) + pthis->actor.world.pos.x;
sp120.y = (Rand_CenteredFloat(10.0f) + pthis->actor.world.pos.y) - 10.0f;
@ -1143,7 +1143,7 @@ void BossFd_Effects(BossFd* pthis, GlobalContext* globalCtx) {
if (pthis->work[BFD_ROAR_TIMER] != 0) {
if (pthis->work[BFD_ROAR_TIMER] == 37) {
Audio_PlaySoundGeneral(NA_SE_EN_VALVAISA_ROAR, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
}
jawAngle = 6000.0f;
jawSpeed = 1300.0f;
@ -1164,7 +1164,7 @@ void BossFd_Effects(BossFd* pthis, GlobalContext* globalCtx) {
s32 pad;
Audio_PlaySoundGeneral(NA_SE_EN_VALVAISA_APPEAR - SFX_FLAG, &pthis->actor.projectedPos, 4, &D_801333E0,
&D_801333E0, &D_801333E8);
&D_801333E0, &gReverbAdd2);
if (pthis->work[BFD_SPLASH_TIMER] != 0) {
pthis->work[BFD_SPLASH_TIMER]--;
if ((pthis->actor.colChkInfo.health == 0) ||
@ -1242,7 +1242,7 @@ void BossFd_Effects(BossFd* pthis, GlobalContext* globalCtx) {
spawnSpeed2.z = 30.0f;
Audio_PlaySoundGeneral(NA_SE_EN_VALVAISA_FIRE - SFX_FLAG, &sFireAudioVec, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
spawnPos2 = pthis->headPos;
spawnAngleY = (pthis->actor.world.rot.y / (f32)0x8000) * M_PI;
@ -1305,7 +1305,7 @@ void BossFd_CollisionCheck(BossFd* pthis, GlobalContext* globalCtx) {
pthis->work[BFD_DAMAGE_FLASH_TIMER] = 10;
pthis->work[BFD_INVINC_TIMER] = 20;
Audio_PlaySoundGeneral(NA_SE_EN_VALVAISA_DAMAGE1, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
}
}

4
src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.cpp
View File

@ -3971,7 +3971,7 @@ void BossGanon_LightBall_Update(Actor* thisx, GlobalContext* globalCtx2) {
if ((hitWithBottle == false) && (acHitInfo->toucher.dmgFlags & 0x100000)) {
spBA = 2;
Audio_PlaySoundGeneral(NA_SE_IT_SHIELD_REFLECT_MG, &player->actor.projectedPos, 4, &D_801333E0,
&D_801333E0, &D_801333E8);
&D_801333E0, &gReverbAdd2);
Rumble_Shake(pthis->actor.xyzDistToPlayerSq, 0xFF, 0x14, 0x96);
} else {
spBA = 1;
@ -3981,7 +3981,7 @@ void BossGanon_LightBall_Update(Actor* thisx, GlobalContext* globalCtx2) {
pthis->unk_1A4++;
pthis->timers[1] = 2;
Audio_PlaySoundGeneral(NA_SE_IT_SWORD_REFLECT_MG, &player->actor.projectedPos, 4, &D_801333E0,
&D_801333E0, &D_801333E8);
&D_801333E0, &gReverbAdd2);
Rumble_Shake(pthis->actor.xyzDistToPlayerSq, 0xB4, 0x14, 0x64);
if (hitWithBottle == false) {

2
src/overlays/actors/ovl_Boss_Mo/z_boss_mo.cpp
View File

@ -1234,7 +1234,7 @@ void BossMo_Tentacle(BossMo* pthis, GlobalContext* globalCtx) {
pthis->work[MO_TENT_ACTION_STATE] = MO_TENT_GRAB;
func_80078914(&pthis->tentTipPos, NA_SE_EN_MOFER_CATCH);
Audio_PlaySoundGeneral(NA_SE_VO_LI_DAMAGE_S, &player->actor.projectedPos, 4, &D_801333E0,
&D_801333E0, &D_801333E8);
&D_801333E0, &gReverbAdd2);
} else {
pthis->work[MO_TENT_ACTION_STATE] = MO_TENT_READY;
pthis->tentMaxAngle = .001f;

12
src/overlays/actors/ovl_Boss_Tw/z_boss_tw.cpp
View File

@ -1156,10 +1156,10 @@ void BossTw_ShootBeam(BossTw* pthis, GlobalContext* globalCtx) {
if (pthis->actor.params == 1) {
Audio_PlaySoundGeneral(NA_SE_EN_TWINROBA_SHOOT_FIRE - SFX_FLAG, &pthis->unk_54C, 4, &D_801333E0,
&D_801333E0, &D_801333E8);
&D_801333E0, &gReverbAdd2);
} else {
Audio_PlaySoundGeneral(NA_SE_EN_TWINROBA_SHOOT_FREEZE - SFX_FLAG, &pthis->unk_54C, 4, &D_801333E0,
&D_801333E0, &D_801333E8);
&D_801333E0, &gReverbAdd2);
}
break;
@ -1186,14 +1186,14 @@ void BossTw_ShootBeam(BossTw* pthis, GlobalContext* globalCtx) {
if (pthis->actor.params == 1) {
Audio_PlaySoundGeneral(NA_SE_EN_TWINROBA_SHOOT_FIRE - SFX_FLAG, &pthis->unk_558, 4U, &D_801333E0,
&D_801333E0, &D_801333E8);
&D_801333E0, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_EN_TWINROBA_REFL_FIRE - SFX_FLAG, &pthis->unk_558, 4, &D_801333E0,
&D_801333E0, &D_801333E8);
&D_801333E0, &gReverbAdd2);
} else {
Audio_PlaySoundGeneral(NA_SE_EN_TWINROBA_SHOOT_FREEZE - SFX_FLAG, &pthis->unk_558, 4, &D_801333E0,
&D_801333E0, &D_801333E8);
&D_801333E0, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_EN_TWINROBA_REFL_FREEZE - SFX_FLAG, &pthis->unk_558, 4, &D_801333E0,
&D_801333E0, &D_801333E8);
&D_801333E0, &gReverbAdd2);
}
break;
}

2
src/overlays/actors/ovl_Boss_Va/z_boss_va.cpp
View File

@ -3842,7 +3842,7 @@ void BossVa_SpawnTumor(GlobalContext* globalCtx, BossVaEffect* effect, BossVa* p
effect->scale = 0.0f;
if (((i % 4) == 0) || (mode == 2)) {
Audio_PlaySoundGeneral(NA_SE_EN_BALINADE_BREAK, &effect->pos, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_EN_BALINADE_BREAK, &effect->pos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
break;
}

6
src/overlays/actors/ovl_Demo_Du/z_demo_du.cpp
View File

@ -342,7 +342,7 @@ void DemoDu_CsPlaySfx_DaruniaHitsLink(GlobalContext* globalCtx) {
func_80078914(&player->actor.projectedPos, NA_SE_EN_DARUNIA_HIT_LINK);
Audio_PlaySoundGeneral(NA_SE_VO_LI_DAMAGE_S_KID, &player->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
}
// Cutscene: Darunia gives Link the Goron's Ruby.
@ -357,7 +357,7 @@ void DemoDu_CsPlaySfx_LinkEscapeFromGorons(GlobalContext* globalCtx) {
Player* player = GET_PLAYER(globalCtx);
Audio_PlaySoundGeneral(NA_SE_VO_LI_FALL_L_KID, &player->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
}
}
@ -368,7 +368,7 @@ void DemoDu_CsPlaySfx_LinkSurprised(GlobalContext* globalCtx) {
Player* player = GET_PLAYER(globalCtx);
Audio_PlaySoundGeneral(NA_SE_VO_LI_SURPRISE_KID, &player->actor.projectedPos, 4U, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
}
}

2
src/overlays/actors/ovl_Demo_Ext/z_demo_ext.cpp
View File

@ -44,7 +44,7 @@ void DemoExt_Init(Actor* thisx, GlobalContext* globalCtx) {
void DemoExt_PlayVortexSFX(DemoExt* pthis) {
if (pthis->alphaTimer <= (kREG(35) + 40.0f) - 15.0f) {
Audio_PlaySoundGeneral(NA_SE_EV_FANTOM_WARP_L - SFX_FLAG, &pthis->actor.projectedPos, 4, &D_801333E0,
&D_801333E0, &D_801333E8);
&D_801333E0, &gReverbAdd2);
}
}

8
src/overlays/actors/ovl_Demo_Ik/z_demo_ik.cpp
View File

@ -108,19 +108,19 @@ void DemoIk_Type1PlaySound(DemoIk* pthis) {
case 0:
if (Animation_OnFrame(&pthis->skelAnime, 5.0f)) {
Audio_PlaySoundGeneral(NA_SE_EN_IRONNACK_ARMOR_LAND1_DEMO, &pthis->actor.projectedPos, 4, &D_801333E0,
&D_801333E0, &D_801333E8);
&D_801333E0, &gReverbAdd2);
}
break;
case 1:
if (Animation_OnFrame(&pthis->skelAnime, 10.0f)) {
Audio_PlaySoundGeneral(NA_SE_EN_IRONNACK_ARMOR_LAND3_DEMO, &pthis->actor.projectedPos, 4, &D_801333E0,
&D_801333E0, &D_801333E8);
&D_801333E0, &gReverbAdd2);
}
break;
case 2:
if (Animation_OnFrame(&pthis->skelAnime, 9.0f)) {
Audio_PlaySoundGeneral(NA_SE_EN_IRONNACK_ARMOR_LAND2_DEMO, &pthis->actor.projectedPos, 4, &D_801333E0,
&D_801333E0, &D_801333E8);
&D_801333E0, &gReverbAdd2);
}
break;
}
@ -337,7 +337,7 @@ void DemoIk_Type2Init(DemoIk* pthis, GlobalContext* globalCtx) {
void DemoIk_Type2PlaySoundOnFrame(DemoIk* pthis, f32 frame) {
if (Animation_OnFrame(&pthis->skelAnime, frame)) {
Audio_PlaySoundGeneral(NA_SE_EN_IRONNACK_ARMOR_OFF_DEMO, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
}
}

2
src/overlays/actors/ovl_Demo_Im/z_demo_im.cpp
View File

@ -738,7 +738,7 @@ void func_80986570(DemoIm* pthis, GlobalContext* globalCtx) {
u32 sfxId = SFX_FLAG;
sfxId += SurfaceType_GetSfx(&globalCtx->colCtx, pthis->actor.floorPoly, pthis->actor.floorBgId);
Audio_PlaySoundGeneral(sfxId, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(sfxId, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
}

4
src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.cpp
View File

@ -297,7 +297,7 @@ void DemoKankyo_Init(Actor* thisx, GlobalContext* globalCtx) {
pthis->sparkleCounter = 0;
pthis->actor.scale.x = pthis->actor.scale.y = pthis->actor.scale.z = 1.0f;
if (pthis->actor.params == DEMOKANKYO_WARP_OUT) {
Audio_PlaySoundGeneral(NA_SE_EV_SARIA_MELODY, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_EV_SARIA_MELODY, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
break;
case DEMOKANKYO_SPARKLES:
@ -837,7 +837,7 @@ void DemoKankyo_DrawWarpSparkles(Actor* thisx, GlobalContext* globalCtx) {
}
} else {
Audio_PlaySoundGeneral(NA_SE_EV_LINK_WARP_OUT - SFX_FLAG, &D_801333D4, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
if (func_800BB2B4(&camPos, &sWarpRoll_90, &sWarpFoV_90, sWarpInCameraPoints, &pthis->unk_150[i].unk_20,
&pthis->unk_150[i].unk_1C) != 0) {
pthis->unk_150[i].unk_22++;

2
src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.cpp
View File

@ -121,7 +121,7 @@ void func_80993848(DemoTreLgt* pthis, GlobalContext* globalCtx) {
if ((currentFrame > 30.0f) && !(pthis->status & 1)) {
pthis->status |= 1;
Audio_PlaySoundGeneral(NA_SE_EV_TRE_BOX_FLASH, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
}
if (SkelCurve_Update(globalCtx, &pthis->skelCurve)) {
Actor_Kill(&pthis->actor);

2
src/overlays/actors/ovl_Door_Ana/z_door_ana.cpp
View File

@ -130,7 +130,7 @@ void DoorAna_WaitClosed(DoorAna* pthis, GlobalContext* globalCtx) {
if (openGrotto) {
pthis->actor.params &= ~0x0300;
DoorAna_SetupAction(pthis, DoorAna_WaitOpen);
Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
func_8002F5F0(&pthis->actor, globalCtx);
}

6
src/overlays/actors/ovl_Door_Warp1/z_door_warp1.cpp
View File

@ -483,7 +483,7 @@ void DoorWarp1_ChildWarpIdle(DoorWarp1* pthis, GlobalContext* globalCtx) {
player = GET_PLAYER(globalCtx);
Audio_PlaySoundGeneral(NA_SE_EV_LINK_WARP, &player->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
OnePointCutscene_Init(globalCtx, 0x25E7, 999, &pthis->actor, MAIN_CAM);
func_8002DF54(globalCtx, &pthis->actor, 10);
@ -595,7 +595,7 @@ void func_80999EE0(DoorWarp1* pthis, GlobalContext* globalCtx) {
void func_80999FE4(DoorWarp1* pthis, GlobalContext* globalCtx) {
if (Message_GetState(&globalCtx->msgCtx) == TEXT_STATE_NONE) {
Audio_PlaySoundGeneral(NA_SE_EV_LINK_WARP, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_EV_LINK_WARP, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
OnePointCutscene_Init(globalCtx, 0x25E9, 999, &pthis->actor, MAIN_CAM);
Gameplay_CopyCamera(globalCtx, -1, sRutoWarpSubCamId);
Gameplay_ChangeCameraStatus(globalCtx, sRutoWarpSubCamId, CAM_STAT_WAIT);
@ -681,7 +681,7 @@ void func_8099A508(DoorWarp1* pthis, GlobalContext* globalCtx) {
pthis->unk_1B2--;
return;
}
Audio_PlaySoundGeneral(NA_SE_EV_LINK_WARP, &player->actor.projectedPos, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_EV_LINK_WARP, &player->actor.projectedPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Animation_ChangeImpl(&pthis->skelAnime, &gWarpCrystalAnim, 1.0f, Animation_GetLastFrame(&gWarpCrystalAnim),
Animation_GetLastFrame(&gWarpCrystalAnim), ANIMMODE_ONCE, 40.0f, 1);

2
src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.cpp
View File

@ -150,7 +150,7 @@ void func_809BC598(EnBdfire* pthis, GlobalContext* globalCtx) {
phi_v1_2 = 0;
if (pthis->actor.params == 0) {
Audio_PlaySoundGeneral(NA_SE_EN_DODO_K_FIRE - SFX_FLAG, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
}
Math_SmoothStepToF(&pthis->actor.scale.x, pthis->unk_188, 0.3f, 0.5f, 0.0f);
Actor_SetScale(&pthis->actor, pthis->actor.scale.x);

6
src/overlays/actors/ovl_En_Box/z_en_box.cpp
View File

@ -268,7 +268,7 @@ void EnBox_Fall(EnBox* pthis, GlobalContext* globalCtx) {
OnePointCutscene_EndCutscene(globalCtx, pthis->unk_1AC);
}
Audio_PlaySoundGeneral(NA_SE_EV_COFFIN_CAP_BOUND, &pthis->dyna.actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
EnBox_SpawnDust(pthis, globalCtx);
}
yDiff = pthis->dyna.actor.world.pos.y - pthis->dyna.actor.floorHeight;
@ -378,7 +378,7 @@ void EnBox_AppearInit(EnBox* pthis, GlobalContext* globalCtx) {
Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_DEMO_KANKYO, pthis->dyna.actor.home.pos.x,
pthis->dyna.actor.home.pos.y, pthis->dyna.actor.home.pos.z, 0, 0, 0, 0x0011);
Audio_PlaySoundGeneral(NA_SE_EV_TRE_BOX_APPEAR, &pthis->dyna.actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
}
}
@ -480,7 +480,7 @@ void EnBox_Open(EnBox* pthis, GlobalContext* globalCtx) {
}
if (sfxId != 0) {
Audio_PlaySoundGeneral(sfxId, &pthis->dyna.actor.projectedPos, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(sfxId, &pthis->dyna.actor.projectedPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
if (pthis->skelanime.jointTable[3].z > 0) {

2
src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.cpp
View File

@ -517,7 +517,7 @@ void EnDivingGame_Update(Actor* thisx, GlobalContext* globalCtx2) {
if (1) {}
if (gSaveContext.timer1Value == 10) {
func_800F5918();
Audio_UpdateTempo();
}
if (pthis->eyeTimer == 0) {
pthis->eyeTimer = 2;

2
src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.cpp
View File

@ -173,7 +173,7 @@ void EnDntDemo_Judge(EnDntDemo* pthis, GlobalContext* globalCtx) {
case PLAYER_MASK_TRUTH:
if (!(gSaveContext.itemGetInf[1] & 0x8000) && (Player_GetMask(globalCtx) != PLAYER_MASK_SKULL)) {
Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &D_801333D4, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
pthis->prize = DNT_PRIZE_NUTS;
pthis->leader->stageSignal = DNT_LEADER_SIGNAL_UP;
reaction = DNT_SIGNAL_LOOK;

2
src/overlays/actors/ovl_En_Ds/z_en_ds.cpp
View File

@ -224,7 +224,7 @@ void EnDs_Wait(EnDs* pthis, GlobalContext* globalCtx) {
if (Actor_ProcessTalkRequest(&pthis->actor, globalCtx)) {
if (func_8002F368(globalCtx) == EXCH_ITEM_ODD_MUSHROOM) {
Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
player->actor.textId = 0x504A;
pthis->actionFunc = EnDs_OfferOddPotion;
} else if (gSaveContext.itemGetInf[3] & 1) {

2
src/overlays/actors/ovl_En_Du/z_en_du.cpp
View File

@ -361,7 +361,7 @@ void func_809FE4A4(EnDu* pthis, GlobalContext* globalCtx) {
EnDu_SetupAction(pthis, func_809FE890);
globalCtx->msgCtx.ocarinaMode = OCARINA_MODE_04;
} else if (globalCtx->msgCtx.ocarinaMode == OCARINA_MODE_03) {
Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
globalCtx->csCtx.segment = SEGMENTED_TO_VIRTUAL(gGoronCityDaruniaCorrectCs);
gSaveContext.cutsceneTrigger = 1;
pthis->unk_1E8 = 0;

8
src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.cpp
View File

@ -496,7 +496,7 @@ void EnFhgFire_EnergyBall(EnFhgFire* pthis, GlobalContext* globalCtx) {
if (!canBottleReflect2 && (hurtbox->toucher.dmgFlags & 0x00100000)) {
killMode = BALL_IMPACT;
Audio_PlaySoundGeneral(NA_SE_IT_SHIELD_REFLECT_MG, &player->actor.projectedPos, 4, &D_801333E0,
&D_801333E0, &D_801333E8);
&D_801333E0, &gReverbAdd2);
Rumble_Shake(pthis->actor.xyzDistToPlayerSq, 0xFF, 0x14, 0x96);
} else {
if (bossGnd->flyMode == GND_FLY_NEUTRAL) {
@ -525,7 +525,7 @@ void EnFhgFire_EnergyBall(EnFhgFire* pthis, GlobalContext* globalCtx) {
pthis->work[FHGFIRE_FIRE_MODE] = FHGFIRE_LIGHT_BLUE;
pthis->work[FHGFIRE_FX_TIMER] = 2;
Audio_PlaySoundGeneral(NA_SE_IT_SWORD_REFLECT_MG, &player->actor.projectedPos, 4, &D_801333E0,
&D_801333E0, &D_801333E8);
&D_801333E0, &gReverbAdd2);
Rumble_Shake(pthis->actor.xyzDistToPlayerSq, 0xB4, 0x14, 0x64);
}
} else if (sqrtf(SQ(dxL) + SQ(dyL) + SQ(dzL)) <= 25.0f) {
@ -557,9 +557,9 @@ void EnFhgFire_EnergyBall(EnFhgFire* pthis, GlobalContext* globalCtx) {
killMode = BALL_IMPACT;
bossGnd->returnCount = pthis->work[FHGFIRE_RETURN_COUNT] + 1;
Audio_PlaySoundGeneral(NA_SE_EN_FANTOM_HIT_THUNDER, &bossGnd->actor.projectedPos, 4,
&D_801333E0, &D_801333E0, &D_801333E8);
&D_801333E0, &D_801333E0, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_EN_FANTOM_DAMAGE, &bossGnd->actor.projectedPos, 4, &D_801333E0,
&D_801333E0, &D_801333E8);
&D_801333E0, &gReverbAdd2);
}
}
break;

2
src/overlays/actors/ovl_En_GeldB/z_en_geldb.cpp
View File

@ -1401,7 +1401,7 @@ void EnGeldB_CollisionCheck(EnGeldB* pthis, GlobalContext* globalCtx) {
key->actor.world.rot.y = Math_Vec3f_Yaw(&key->actor.world.pos, &pthis->actor.home.pos);
key->actor.speedXZ = 6.0f;
Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &D_801333D4, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
}
}
EnGeldB_SetupDefeated(pthis);

8
src/overlays/actors/ovl_En_Go/z_en_go.cpp
View File

@ -781,7 +781,7 @@ void EnGo_FireGenericActionFunc(EnGo* pthis, GlobalContext* globalCtx) {
void EnGo_CurledUp(EnGo* pthis, GlobalContext* globalCtx) {
if ((DECR(pthis->unk_210) == 0) && EnGo_IsCameraModified(pthis, globalCtx)) {
Audio_PlaySoundGeneral(NA_SE_EN_GOLON_WAKE_UP, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
pthis->skelAnime.playSpeed = 0.1f;
pthis->skelAnime.playSpeed *= (pthis->actor.params & 0xF0) == 0x90 ? 0.5f : 1.0f;
@ -816,7 +816,7 @@ void EnGo_WakeUp(EnGo* pthis, GlobalContext* globalCtx) {
if (DECR(pthis->unk_212) == 0) {
Audio_PlaySoundGeneral(NA_SE_EN_GOLON_SIT_DOWN, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
EnGo_SetupAction(pthis, func_80A405CC);
} else if (!EnGo_IsCameraModified(pthis, globalCtx)) {
EnGo_ReverseAnimation(pthis);
@ -835,7 +835,7 @@ void func_80A40494(EnGo* pthis, GlobalContext* globalCtx) {
if (!(frame >= 0.0f)) {
Audio_PlaySoundGeneral(NA_SE_EN_DODO_M_GND, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
EnGo_SpawnDust(pthis, 10, 0.4f, 0.1f, 16, 26.0f, 2.0f);
EnGo_ReverseAnimation(pthis);
pthis->skelAnime.playSpeed = 0.0f;
@ -927,7 +927,7 @@ void func_80A408D8(EnGo* pthis, GlobalContext* globalCtx) {
} else if (EnGo_IsCameraModified(pthis, globalCtx)) {
EnGo_ReverseAnimation(pthis);
Audio_PlaySoundGeneral(NA_SE_EN_GOLON_SIT_DOWN, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
pthis->skelAnime.playSpeed = 0.0f;
EnGo_SetupAction(pthis, func_80A405CC);
}

4
src/overlays/actors/ovl_En_Go2/z_en_go2.cpp
View File

@ -610,7 +610,7 @@ s16 EnGo2_GetStateGoronDmtBiggoron(GlobalContext* globalCtx, EnGo2* pthis) {
case 0x3054:
if (dialogState == TEXT_STATE_NONE) {
Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &D_801333D4, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
}
}
return 1;
@ -882,7 +882,7 @@ s32 func_80A44AB0(EnGo2* pthis, GlobalContext* globalCtx) {
return false;
} else {
if (pthis->collider.base.acFlags & 2) {
Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
pthis->actor.flags &= ~ACTOR_FLAG_24;
pthis->collider.base.acFlags &= ~0x2;
EnGo2_StopRolling(pthis, globalCtx);

2
src/overlays/actors/ovl_En_Goma/z_en_goma.cpp
View File

@ -445,7 +445,7 @@ void EnGoma_Dead(EnGoma* pthis, GlobalContext* globalCtx) {
parent->childrenGohmaState[pthis->actor.params] = -1;
}
Audio_PlaySoundGeneral(NA_SE_EN_EXTINCT, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_EN_EXTINCT, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Actor_Kill(&pthis->actor);
Item_DropCollectibleRandom(globalCtx, NULL, &pthis->actor.world.pos, 0x30);
}

4
src/overlays/actors/ovl_En_Gs/z_en_gs.cpp
View File

@ -349,13 +349,13 @@ void func_80A4ED34(EnGs* pthis, GlobalContext* globalCtx) {
Color_RGBA8_Copy(&pthis->flashColor, &flashRed_42);
if ((pthis->unk_200 % 20) == 7) {
Audio_PlaySoundGeneral(NA_SE_SY_WARNING_COUNT_E, &D_801333D4, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
}
} else {
Color_RGBA8_Copy(&pthis->flashColor, &flashBlue_42);
if ((pthis->unk_200 % 20) == 7) {
Audio_PlaySoundGeneral(NA_SE_SY_WARNING_COUNT_N, &D_801333D4, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
}
}
}

88
src/overlays/actors/ovl_En_Horse/z_en_horse.cpp
View File

@ -602,7 +602,7 @@ void EnHorse_PlayWalkingSound(EnHorse* pthis) {
}
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_WALK, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
if (++pthis->soundTimer > 1) {
pthis->soundTimer = 0;
}
@ -610,11 +610,11 @@ void EnHorse_PlayWalkingSound(EnHorse* pthis) {
}
void EnHorse_PlayTrottingSound(EnHorse* pthis) {
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_RUN, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_RUN, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
void EnHorse_PlayGallopingSound(EnHorse* pthis) {
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_RUN, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_RUN, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
f32 EnHorse_SlopeSpeedMultiplier(EnHorse* pthis, GlobalContext* globalCtx) {
@ -650,12 +650,12 @@ void EnHorse_IdleAnimSounds(EnHorse* pthis, GlobalContext* globalCtx) {
!(pthis->stateFlags & ENHORSE_SANDDUST_SOUND)) {
pthis->stateFlags |= ENHORSE_SANDDUST_SOUND;
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_SANDDUST, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
} else if (pthis->animationIdx == ENHORSE_ANIM_REARING && pthis->curFrame > 25.0f &&
!(pthis->stateFlags & ENHORSE_LAND2_SOUND)) {
pthis->stateFlags |= ENHORSE_LAND2_SOUND;
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_LAND2, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
}
}
@ -1070,7 +1070,7 @@ void EnHorse_StartMountedIdle(EnHorse* pthis) {
if (!(pthis->stateFlags & ENHORSE_SANDDUST_SOUND)) {
pthis->stateFlags |= ENHORSE_SANDDUST_SOUND;
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_SANDDUST, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
}
}
curFrame = pthis->skin.skelAnime.curFrame;
@ -1122,7 +1122,7 @@ void EnHorse_MountedIdleWhinney(EnHorse* pthis) {
Animation_GetLastFrame(sAnimationHeaders[pthis->type][pthis->animationIdx]), ANIMMODE_ONCE, -3.0f);
pthis->unk_21C = pthis->unk_228;
if (pthis->stateFlags & ENHORSE_DRAW) {
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_GROAN, &pthis->unk_21C, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_GROAN, &pthis->unk_21C, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
}
@ -1394,7 +1394,7 @@ void EnHorse_StartRearing(EnHorse* pthis) {
pthis->stateFlags &= ~ENHORSE_LAND2_SOUND;
pthis->unk_21C = pthis->unk_228;
if (pthis->stateFlags & ENHORSE_DRAW) {
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &pthis->unk_21C, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &pthis->unk_21C, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
Rumble_Shake(0.0f, 180, 20, 100);
Animation_Change(&pthis->skin.skelAnime, sAnimationHeaders[pthis->type][pthis->animationIdx], 1.0f, 0.0f,
@ -1410,7 +1410,7 @@ void EnHorse_MountedRearing(EnHorse* pthis, GlobalContext* globalCtx) {
if (!(pthis->stateFlags & ENHORSE_LAND2_SOUND)) {
pthis->stateFlags |= ENHORSE_LAND2_SOUND;
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_LAND2, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
Rumble_Shake(0, 180, 20, 100);
}
}
@ -1443,7 +1443,7 @@ void EnHorse_StartBraking(EnHorse* pthis, GlobalContext* globalCtx) {
pthis->action = ENHORSE_ACT_STOPPING;
pthis->animationIdx = ENHORSE_ANIM_STOPPING;
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_SLIP, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_SLIP, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Animation_Change(&pthis->skin.skelAnime, sAnimationHeaders[pthis->type][pthis->animationIdx], 1.5f, 0.0f,
Animation_GetLastFrame(sAnimationHeaders[pthis->type][pthis->animationIdx]), ANIMMODE_ONCE, -3.0f);
@ -1464,7 +1464,7 @@ void EnHorse_Stopping(EnHorse* pthis, GlobalContext* globalCtx) {
if (Rand_ZeroOne() > 0.5) {
pthis->unk_21C = pthis->unk_228;
if (pthis->stateFlags & ENHORSE_DRAW) {
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &pthis->unk_21C, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &pthis->unk_21C, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
Rumble_Shake(0.0f, 180, 20, 100);
pthis->stateFlags &= ~ENHORSE_STOPPING_NEIGH_SOUND;
@ -1595,7 +1595,7 @@ void EnHorse_StartLowJump(EnHorse* pthis, GlobalContext* globalCtx) {
y = jointTable->y;
pthis->riderPos.y -= y * 0.01f;
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_JUMP, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_JUMP, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Rumble_Shake(0.0f, 170, 10, 10);
}
@ -1630,7 +1630,7 @@ void EnHorse_LowJump(EnHorse* pthis, GlobalContext* globalCtx) {
if (SkelAnime_Update(&pthis->skin.skelAnime) ||
(curFrame > 17.0f && pthis->actor.world.pos.y < pthis->actor.floorHeight - pthis->actor.velocity.y + 80.0f)) {
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_LAND, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
Rumble_Shake(0.0f, 255, 10, 80);
pthis->stateFlags &= ~ENHORSE_JUMPING;
pthis->actor.gravity = -3.5f;
@ -1669,7 +1669,7 @@ void EnHorse_StartHighJump(EnHorse* pthis, GlobalContext* globalCtx) {
pthis->riderPos.y -= y * 0.01f;
pthis->stateFlags |= ENHORSE_CALC_RIDER_POS;
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_JUMP, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_JUMP, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Rumble_Shake(0.0f, 170, 10, 10);
}
@ -1705,7 +1705,7 @@ void EnHorse_HighJump(EnHorse* pthis, GlobalContext* globalCtx) {
if (SkelAnime_Update(&pthis->skin.skelAnime) ||
(curFrame > 23.0f && pthis->actor.world.pos.y < pthis->actor.floorHeight - pthis->actor.velocity.y + 80.0f)) {
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_LAND, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
Rumble_Shake(0.0f, 255, 10, 80);
pthis->stateFlags &= ~ENHORSE_JUMPING;
pthis->actor.gravity = -3.5f;
@ -1734,7 +1734,7 @@ void EnHorse_Inactive(EnHorse* pthis, GlobalContext* globalCtx2) {
DREG(53) = 0;
if (EnHorse_Spawn(pthis, globalCtx) != 0) {
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
pthis->stateFlags &= ~ENHORSE_INACTIVE;
gSaveContext.horseData.scene = globalCtx->sceneNum;
@ -1767,12 +1767,12 @@ void EnHorse_PlayIdleAnimation(EnHorse* pthis, s32 anim, f32 morphFrames, f32 st
} else if (pthis->animationIdx == ENHORSE_ANIM_WHINNEY) {
pthis->unk_21C = pthis->unk_228;
if (pthis->stateFlags & ENHORSE_DRAW) {
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_GROAN, &pthis->unk_21C, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_GROAN, &pthis->unk_21C, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
} else if (pthis->animationIdx == ENHORSE_ANIM_REARING) {
pthis->unk_21C = pthis->unk_228;
if (pthis->stateFlags & ENHORSE_DRAW) {
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &pthis->unk_21C, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &pthis->unk_21C, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
pthis->stateFlags &= ~ENHORSE_LAND2_SOUND;
}
@ -1808,7 +1808,7 @@ void EnHorse_Idle(EnHorse* pthis, GlobalContext* globalCtx) {
if (!func_80A5BBBC(globalCtx, pthis, &pthis->actor.world.pos)) {
if (EnHorse_Spawn(pthis, globalCtx)) {
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
pthis->followTimer = 0;
EnHorse_SetFollowAnimation(pthis, globalCtx);
Camera_SetParam(globalCtx->cameraPtrs[0], 8, pthis);
@ -1817,7 +1817,7 @@ void EnHorse_Idle(EnHorse* pthis, GlobalContext* globalCtx) {
}
} else {
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
pthis->followTimer = 0;
EnHorse_StartMovingAnimation(pthis, 6, -3.0f, 0.0f);
}
@ -1927,7 +1927,7 @@ void EnHorse_FollowPlayer(EnHorse* pthis, GlobalContext* globalCtx) {
if (!(pthis->stateFlags & ENHORSE_LAND2_SOUND)) {
pthis->stateFlags |= ENHORSE_LAND2_SOUND;
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_LAND2, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
}
}
} else {
@ -1954,7 +1954,7 @@ void EnHorse_FollowPlayer(EnHorse* pthis, GlobalContext* globalCtx) {
pthis->unk_21C = pthis->unk_228;
if (pthis->stateFlags & ENHORSE_DRAW) {
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &pthis->unk_21C, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &pthis->unk_21C, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
}
@ -1982,7 +1982,7 @@ void EnHorse_InitIngoHorse(EnHorse* pthis) {
EnHorse_UpdateIngoHorseAnim(pthis);
pthis->unk_21C = pthis->unk_228;
if (pthis->stateFlags & ENHORSE_DRAW) {
Audio_PlaySoundGeneral(NA_SE_IT_INGO_HORSE_NEIGH, &pthis->unk_21C, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_IT_INGO_HORSE_NEIGH, &pthis->unk_21C, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
}
@ -2035,10 +2035,10 @@ void EnHorse_UpdateIngoHorseAnim(EnHorse* pthis) {
animSpeed = pthis->actor.speedXZ * 0.5f;
} else if (pthis->animationIdx == ENHORSE_ANIM_TROT) {
animSpeed = pthis->actor.speedXZ * 0.25f;
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_RUN, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_RUN, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
} else if (pthis->animationIdx == ENHORSE_ANIM_GALLOP) {
animSpeed = pthis->actor.speedXZ * 0.2f;
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_RUN, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_RUN, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
} else {
animSpeed = 1.0f;
}
@ -2154,7 +2154,7 @@ void EnHorse_CsPlayHighJumpAnim(EnHorse* pthis, GlobalContext* globalCtx) {
pthis->riderPos.y -= y * 0.01f;
pthis->stateFlags |= ENHORSE_CALC_RIDER_POS;
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_JUMP, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_JUMP, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Rumble_Shake(0.0f, 170, 10, 10);
}
@ -2199,7 +2199,7 @@ void EnHorse_CsJump(EnHorse* pthis, GlobalContext* globalCtx, CsCmdActorAction*
pthis->cutsceneFlags |= 1;
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_LAND, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
Rumble_Shake(0.0f, 255, 10, 80);
pthis->stateFlags &= ~ENHORSE_JUMPING;
pthis->actor.gravity = -3.5f;
@ -2223,7 +2223,7 @@ void EnHorse_CsRearingInit(EnHorse* pthis, GlobalContext* globalCtx, CsCmdActorA
pthis->stateFlags &= ~ENHORSE_LAND2_SOUND;
pthis->unk_21C = pthis->unk_228;
if (pthis->stateFlags & ENHORSE_DRAW) {
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &pthis->unk_21C, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &pthis->unk_21C, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
Animation_Change(&pthis->skin.skelAnime, sAnimationHeaders[pthis->type][pthis->animationIdx], 1.0f, 0.0f,
Animation_GetLastFrame(sAnimationHeaders[pthis->type][pthis->animationIdx]), ANIMMODE_ONCE, -3.0f);
@ -2235,7 +2235,7 @@ void EnHorse_CsRearing(EnHorse* pthis, GlobalContext* globalCtx, CsCmdActorActio
if (!(pthis->stateFlags & ENHORSE_LAND2_SOUND)) {
pthis->stateFlags |= ENHORSE_LAND2_SOUND;
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_LAND2, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
}
}
if (SkelAnime_Update(&pthis->skin.skelAnime)) {
@ -2302,7 +2302,7 @@ void EnHorse_CsWarpRearingInit(EnHorse* pthis, GlobalContext* globalCtx, CsCmdAc
pthis->stateFlags &= ~ENHORSE_LAND2_SOUND;
pthis->unk_21C = pthis->unk_228;
if (pthis->stateFlags & ENHORSE_DRAW) {
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &pthis->unk_21C, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &pthis->unk_21C, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
Animation_Change(&pthis->skin.skelAnime, sAnimationHeaders[pthis->type][pthis->animationIdx], 1.0f, 0.0f,
Animation_GetLastFrame(sAnimationHeaders[pthis->type][pthis->animationIdx]), ANIMMODE_ONCE, -3.0f);
@ -2314,7 +2314,7 @@ void EnHorse_CsWarpRearing(EnHorse* pthis, GlobalContext* globalCtx, CsCmdActorA
if (!(pthis->stateFlags & ENHORSE_LAND2_SOUND)) {
pthis->stateFlags |= ENHORSE_LAND2_SOUND;
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_LAND2, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
}
}
if (SkelAnime_Update(&pthis->skin.skelAnime)) {
@ -2465,11 +2465,11 @@ void EnHorse_UpdateHbaAnim(EnHorse* pthis) {
animSpeed = pthis->actor.speedXZ * 0.5f;
} else if (pthis->animationIdx == ENHORSE_ANIM_TROT) {
animSpeed = pthis->actor.speedXZ * 0.25f;
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_RUN, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_RUN, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Rumble_Shake(0.0f, 60, 8, 255);
} else if (pthis->animationIdx == ENHORSE_ANIM_GALLOP) {
animSpeed = pthis->actor.speedXZ * 0.2f;
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_RUN, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_RUN, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Rumble_Shake(0.0f, 120, 8, 255);
} else {
animSpeed = 1.0f;
@ -2572,7 +2572,7 @@ void EnHorse_FleePlayer(EnHorse* pthis, GlobalContext* globalCtx) {
if (DREG(53) || pthis->type == HORSE_HNI) {
EnHorse_StartIdleRidable(pthis);
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
}
distToHome = Math3D_Vec3f_DistXYZ(&pthis->actor.home.pos, &pthis->actor.world.pos);
@ -2683,7 +2683,7 @@ void EnHorse_FleePlayer(EnHorse* pthis, GlobalContext* globalCtx) {
pthis->unk_21C = pthis->unk_228;
if (pthis->stateFlags & ENHORSE_DRAW) {
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_GROAN, &pthis->unk_21C, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
}
}
Animation_Change(&pthis->skin.skelAnime, sAnimationHeaders[pthis->type][pthis->animationIdx], 1.0f, 0.0f,
@ -2739,9 +2739,9 @@ void EnHorse_BridgeJumpInit(EnHorse* pthis, GlobalContext* globalCtx) {
Animation_GetLastFrame(sAnimationHeaders[pthis->type][pthis->animationIdx]), ANIMMODE_ONCE, -3.0f);
pthis->unk_21C = pthis->unk_228;
if (pthis->stateFlags & ENHORSE_DRAW) {
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &pthis->unk_21C, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &pthis->unk_21C, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_JUMP, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_JUMP, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Rumble_Shake(0.0f, 170, 10, 10);
pthis->postDrawFunc = NULL;
}
@ -2791,7 +2791,7 @@ void EnHorse_CheckBridgeJumpLanding(EnHorse* pthis, GlobalContext* globalCtx) {
func_80028A54(globalCtx, 25.0f, &pthis->actor.world.pos);
EnHorse_JumpLanding(pthis, globalCtx);
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_LAND, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
Rumble_Shake(0.0f, 255, 10, 80);
}
}
@ -3131,7 +3131,7 @@ void EnHorse_UpdateBgCheckInfo(EnHorse* pthis, GlobalContext* globalCtx) {
if (pthis->actor.speedXZ > 4.0f) {
pthis->actor.speedXZ -= 1.0f;
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_SANDDUST, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
}
}
@ -3337,7 +3337,7 @@ void EnHorse_CheckBoost(EnHorse* thisx, GlobalContext* globalCtx2) {
if (pthis->stateFlags & ENHORSE_DRAW) {
if (Rand_ZeroOne() < 0.1f) {
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &pthis->unk_21C, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
}
}
}
@ -3354,7 +3354,7 @@ void EnHorse_RegenBoost(EnHorse* pthis, GlobalContext* globalCtx) {
pthis->numBoosts = pthis->numBoosts + 1;
if (!EN_HORSE_CHECK_4(pthis)) {
Audio_PlaySoundGeneral(NA_SE_SY_CARROT_RECOVER, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_CARROT_RECOVER, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
if (pthis->numBoosts < 6) {
@ -3370,7 +3370,7 @@ void EnHorse_RegenBoost(EnHorse* pthis, GlobalContext* globalCtx) {
pthis->numBoosts = 6;
if (!EN_HORSE_CHECK_4(pthis)) {
Audio_PlaySoundGeneral(NA_SE_SY_CARROT_RECOVER, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_CARROT_RECOVER, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
}
}
@ -3378,7 +3378,7 @@ void EnHorse_RegenBoost(EnHorse* pthis, GlobalContext* globalCtx) {
if (pthis->boostTimer == 8 && Rand_ZeroOne() < 0.25f) {
pthis->unk_21C = pthis->unk_228;
if (pthis->stateFlags & ENHORSE_DRAW) {
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &pthis->unk_21C, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &pthis->unk_21C, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
}
globalCtx->interfaceCtx.numHorseBoosts = pthis->numBoosts;
@ -3519,7 +3519,7 @@ void EnHorse_Update(Actor* thisx, GlobalContext* globalCtx2) {
if (pthis->jntSph.base.acFlags & 2) {
pthis->unk_21C = pthis->unk_228;
if (pthis->stateFlags & ENHORSE_DRAW) {
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &pthis->unk_21C, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &pthis->unk_21C, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
}
if (pthis->action != ENHORSE_ACT_INGO_RACE) {

10
src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.cpp
View File

@ -152,7 +152,7 @@ s32 EnHorseGameCheck_UpdateIngoRace(EnHorseGameCheckBase* base, GlobalContext* g
ingoHorse->inRace = 1;
pthis->startFlags |= INGORACE_INGO_MOVE;
Audio_PlaySoundGeneral(NA_SE_SY_START_SHOT, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_START_SHOT, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
pthis->startTimer++;
@ -184,7 +184,7 @@ s32 EnHorseGameCheck_UpdateIngoRace(EnHorseGameCheckBase* base, GlobalContext* g
pthis->result = INGORACE_PLAYER_WIN;
pthis->finishTimer = 55;
Audio_QueueSeqCmd(SEQ_PLAYER_BGM_MAIN << 24 | NA_BGM_HORSE_GOAL);
Audio_PlaySoundGeneral(NA_SE_SY_START_SHOT, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_START_SHOT, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
for (i = 0; i < 3; i++) {
pthis->playerCheck[i] = 0;
@ -199,7 +199,7 @@ s32 EnHorseGameCheck_UpdateIngoRace(EnHorseGameCheckBase* base, GlobalContext* g
pthis->finishTimer = 70;
ingoHorse->stateFlags |= ENHORSE_INGO_WON;
Audio_QueueSeqCmd(SEQ_PLAYER_BGM_MAIN << 24 | NA_BGM_HORSE_GOAL);
Audio_PlaySoundGeneral(NA_SE_SY_START_SHOT, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_START_SHOT, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
for (i = 0; i < 3; i++) {
pthis->ingoCheck[i] = 0;
@ -335,7 +335,7 @@ s32 EnHorseGameCheck_UpdateMalonRace(EnHorseGameCheckBase* base, GlobalContext*
horse->inRace = 1;
} else if ((pthis->startTimer > 81) && !(pthis->raceFlags & MALONRACE_START_SFX)) {
pthis->raceFlags |= MALONRACE_START_SFX;
Audio_PlaySoundGeneral(NA_SE_SY_START_SHOT, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_START_SHOT, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
pthis->startTimer++;
@ -377,7 +377,7 @@ s32 EnHorseGameCheck_UpdateMalonRace(EnHorseGameCheckBase* base, GlobalContext*
} else if (pthis->fenceCheck[15] == 1) {
pthis->lapCount = 2;
Audio_QueueSeqCmd(SEQ_PLAYER_BGM_MAIN << 24 | NA_BGM_HORSE_GOAL);
Audio_PlaySoundGeneral(NA_SE_SY_START_SHOT, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_START_SHOT, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
pthis->result = MALONRACE_SUCCESS;
pthis->finishTimer = 70;
gSaveContext.timer1State = 0xF;

6
src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.cpp
View File

@ -166,7 +166,7 @@ void func_80A68870(EnHorseGanon* pthis) {
if ((pthis->skin.skelAnime.curFrame > D_80A692B8[pthis->soundCount]) &&
(pthis->soundCount != 0 || !(pthis->skin.skelAnime.curFrame > D_80A692B8[1]))) {
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_WALK, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
pthis->soundCount++;
if (pthis->soundCount >= 2) {
@ -246,10 +246,10 @@ void func_80A68B20(EnHorseGanon* pthis) {
sp30 = pthis->actor.speedXZ / 3.0f;
} else if (pthis->currentAnimation == 3) {
sp30 = pthis->actor.speedXZ / 5.0f;
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_RUN, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_RUN, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
} else if (pthis->currentAnimation == 4) {
sp30 = pthis->actor.speedXZ / 7.0f;
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_RUN, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_RUN, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
} else {
sp30 = 1.0f;
}

12
src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.cpp
View File

@ -108,7 +108,7 @@ void func_80A693D0(EnHorseLinkChild* pthis) {
if ((pthis->skin.skelAnime.curFrame > D_80A6AF5C_34[pthis->unk_1F0]) &&
!((pthis->unk_1F0 == 0) && (pthis->skin.skelAnime.curFrame > D_80A6AF5C_34[1]))) {
Audio_PlaySoundGeneral(NA_SE_EV_KID_HORSE_WALK, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
pthis->unk_1F0++;
if (pthis->unk_1F0 >= ARRAY_COUNT(D_80A6AF5C_34)) {
pthis->unk_1F0 = 0;
@ -122,14 +122,14 @@ void func_80A6948C(EnHorseLinkChild* pthis) {
} else if (pthis->skin.skelAnime.curFrame == 0.0f) {
if ((pthis->animationIdx == 3) || (pthis->animationIdx == 4)) {
Audio_PlaySoundGeneral(NA_SE_EV_KID_HORSE_RUN, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
} else if (pthis->animationIdx == 1) {
if (Rand_ZeroOne() > 0.5f) {
Audio_PlaySoundGeneral(NA_SE_EV_KID_HORSE_GROAN, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
} else {
Audio_PlaySoundGeneral(NA_SE_EV_KID_HORSE_NEIGH, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
}
}
}
@ -371,7 +371,7 @@ void func_80A6A068(EnHorseLinkChild* pthis, GlobalContext* globalCtx) {
if (gSaveContext.entranceIndex == 0x2AE) {
Audio_PlaySoundGeneral(NA_SE_EV_KID_HORSE_NEIGH, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
func_80A6A724(pthis);
return;
}
@ -463,7 +463,7 @@ void func_80A6A5A4(EnHorseLinkChild* pthis, GlobalContext* globalCtx) {
if (DREG(53) != 0) {
DREG(53) = 0;
Audio_PlaySoundGeneral(NA_SE_EV_KID_HORSE_NEIGH, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
func_80A6A724(pthis);
} else {
pthis->actor.speedXZ = 0.0f;

34
src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.cpp
View File

@ -160,7 +160,7 @@ void func_80A6B250(EnHorseNormal* pthis) {
if (D_80A6D4C0_50[pthis->unk_200] < pthis->skin.skelAnime.curFrame &&
((pthis->unk_200 != 0) || !(D_80A6D4C0_50[1] < pthis->skin.skelAnime.curFrame))) {
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_WALK, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
pthis->unk_200++;
if (pthis->unk_200 >= ARRAY_COUNT(D_80A6D4C0_50)) {
pthis->unk_200 = 0;
@ -351,9 +351,9 @@ void func_80A6BC48(EnHorseNormal* pthis) {
void func_80A6BCEC(EnHorseNormal* pthis) {
if (pthis->animationIdx == 5) {
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_RUN, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_RUN, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
} else if (pthis->animationIdx == 6) {
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_RUN, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_RUN, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
}
@ -363,11 +363,11 @@ void func_80A6BD7C(EnHorseNormal* pthis) {
if (pthis->animationIdx == 0 && frame > 28.0f && !(pthis->unk_1E4 & 1)) {
pthis->unk_1E4 |= 1;
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_SANDDUST, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
} else if (pthis->animationIdx == 3 && frame > 25.0f && !(pthis->unk_1E4 & 2)) {
pthis->unk_1E4 |= 2;
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_LAND2, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
}
}
@ -434,9 +434,9 @@ void EnHorseNormal_Wander(EnHorseNormal* pthis, GlobalContext* globalCtx) {
pthis->unk_1E4 &= ~1;
pthis->unk_1E4 &= ~2;
if (phi_t0 == 1) {
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_GROAN, &pthis->unk_204, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_GROAN, &pthis->unk_204, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
} else if (phi_t0 == 3) {
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &pthis->unk_204, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &pthis->unk_204, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
} else {
func_80A6BCEC(pthis);
}
@ -463,9 +463,9 @@ void EnHorseNormal_Wander(EnHorseNormal* pthis, GlobalContext* globalCtx) {
pthis->unk_1E4 &= ~1;
pthis->unk_1E4 &= ~2;
if (phi_t0 == 1) {
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_GROAN, &pthis->unk_204, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_GROAN, &pthis->unk_204, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
} else if (phi_t0 == 3) {
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &pthis->unk_204, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &pthis->unk_204, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
} else {
func_80A6BCEC(pthis);
}
@ -500,10 +500,10 @@ void EnHorseNormal_Wait(EnHorseNormal* pthis, GlobalContext* globalCtx) {
pthis->animationIdx = 0;
} else if (rand < 0.8f) {
pthis->animationIdx = 1;
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_GROAN, &pthis->unk_204, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_GROAN, &pthis->unk_204, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
} else {
pthis->animationIdx = 3;
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &pthis->unk_204, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &pthis->unk_204, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
Animation_Change(&pthis->skin.skelAnime, sAnimations[pthis->animationIdx], func_80A6B30C(pthis), 0.0f,
@ -534,11 +534,11 @@ void EnHorseNormal_WaitClone(EnHorseNormal* pthis, GlobalContext* globalCtx) {
} else if (rand < 0.8f) {
pthis->animationIdx = 1;
pthis->unk_1E4 |= 0x20;
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_GROAN, &pthis->unk_204, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_GROAN, &pthis->unk_204, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
} else {
pthis->animationIdx = 3;
pthis->unk_1E4 |= 0x20;
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &pthis->unk_204, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &pthis->unk_204, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
Animation_Change(&pthis->skin.skelAnime, sAnimations[pthis->animationIdx], func_80A6B30C(pthis), 0.0f,
@ -625,16 +625,16 @@ void func_80A6CC88(GlobalContext* globalCtx, EnHorseNormal* pthis, Vec3f* arg2)
if (pthis->animationIdx == 0 && curFrame > 28.0f && !(pthis->unk_1E4 & 8)) {
pthis->unk_1E4 |= 8;
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_SANDDUST, &pthis->unk_1E8, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_SANDDUST, &pthis->unk_1E8, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
} else if (pthis->animationIdx == 3 && curFrame > 25.0f && !(pthis->unk_1E4 & 0x10)) {
pthis->unk_1E4 |= 0x10;
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_LAND2, &pthis->unk_1E8, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_LAND2, &pthis->unk_1E8, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
} else if (pthis->animationIdx == 3 && pthis->unk_1E4 & 0x20) {
pthis->unk_1E4 &= ~0x20;
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &pthis->unk_1F4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &pthis->unk_1F4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
} else if (pthis->animationIdx == 1 && pthis->unk_1E4 & 0x20) {
pthis->unk_1E4 &= ~0x20;
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_GROAN, &pthis->unk_1F4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_GROAN, &pthis->unk_1F4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
}

2
src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.cpp
View File

@ -209,7 +209,7 @@ void func_80A6DD14(EnHorseZelda* pthis) {
pthis->action = 1;
pthis->animationIndex = 0;
sp34 = pthis->actor.speedXZ / 6.0f;
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_RUN, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_RUN, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Animation_Change(&pthis->skin.skelAnime, sAnimationHeaders[pthis->animationIndex],
splaySpeeds[pthis->animationIndex] * sp34 * 1.5f, 0.0f,
Animation_GetLastFrame(sAnimationHeaders[pthis->animationIndex]), ANIMMODE_ONCE, 0.0f);

2
src/overlays/actors/ovl_En_Hy/z_en_hy.cpp
View File

@ -493,7 +493,7 @@ s16 func_80A70058(GlobalContext* globalCtx, Actor* thisx) {
case 0x709F:
if (!pthis->unk_215) {
Audio_PlaySoundGeneral(pthis->actor.textId == 0x709F ? NA_SE_SY_CORRECT_CHIME : NA_SE_SY_ERROR,
&D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
&D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
pthis->unk_215 = true;
}
break;

18
src/overlays/actors/ovl_En_Ik/z_en_ik.cpp
View File

@ -1001,28 +1001,28 @@ void EnIk_StartMusic(void) {
void func_80A76C14(EnIk* pthis) {
if (Animation_OnFrame(&pthis->skelAnime, 1.0f)) {
Audio_PlaySoundGeneral(NA_SE_EN_IRONNACK_WAKEUP, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
} else if (Animation_OnFrame(&pthis->skelAnime, 33.0f)) {
Audio_PlaySoundGeneral(NA_SE_EN_IRONNACK_WALK, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
} else if (Animation_OnFrame(&pthis->skelAnime, 68.0f) || Animation_OnFrame(&pthis->skelAnime, 80.0f)) {
Audio_PlaySoundGeneral(NA_SE_EN_IRONNACK_ARMOR_DEMO, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
} else if (Animation_OnFrame(&pthis->skelAnime, 107.0f)) {
Audio_PlaySoundGeneral(NA_SE_EN_IRONNACK_FINGER_DEMO, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
} else if (Animation_OnFrame(&pthis->skelAnime, 156.0f)) {
Audio_PlaySoundGeneral(NA_SE_EN_IRONNACK_ARMOR_DEMO, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
} else if (Animation_OnFrame(&pthis->skelAnime, 188.0f)) {
Audio_PlaySoundGeneral(NA_SE_EN_IRONNACK_WAVE_DEMO, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
}
}
void func_80A76DDC(EnIk* pthis, GlobalContext* globalCtx, Vec3f* pos) {
Audio_PlaySoundGeneral(NA_SE_EN_TWINROBA_TRANSFORM, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
}
void func_80A76E2C(EnIk* pthis, GlobalContext* globalCtx, Vec3f* pos) {
@ -1121,7 +1121,7 @@ void func_80A77264(EnIk* pthis, GlobalContext* globalCtx, s32 arg2) {
void func_80A772A4(EnIk* pthis) {
Audio_PlaySoundGeneral(NA_SE_EN_IRONNACK_STAGGER_DEMO, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
}
void func_80A772EC(EnIk* pthis, GlobalContext* globalCtx) {
@ -1129,7 +1129,7 @@ void func_80A772EC(EnIk* pthis, GlobalContext* globalCtx) {
f32 wDest;
SkinMatrix_Vec3fMtxFMultXYZW(&globalCtx->viewProjectionMtxF, &pthis->actor.world.pos, &D_80A78FA0_126, &wDest);
Audio_PlaySoundGeneral(NA_SE_EN_IRONNACK_DEAD, &D_80A78FA0_126, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_EN_IRONNACK_DEAD, &D_80A78FA0_126, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
void func_80A7735C(EnIk* pthis, GlobalContext* globalCtx) {

8
src/overlays/actors/ovl_En_In/z_en_in.cpp
View File

@ -632,10 +632,10 @@ void func_80A7A304(EnIn* pthis, GlobalContext* globalCtx) {
pthis->animationIdx %= 8;
pthis->unk_1E8 = pthis->animationIdx;
if (pthis->animationIdx == 3 || pthis->animationIdx == 4) {
Audio_PlaySoundGeneral(NA_SE_IT_LASH, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_IT_LASH, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
if (Rand_ZeroOne() < 0.3f) {
Audio_PlaySoundGeneral(NA_SE_IT_INGO_HORSE_NEIGH, &pthis->actor.projectedPos, 4, &D_801333E0,
&D_801333E0, &D_801333E8);
&D_801333E0, &gReverbAdd2);
}
}
Animation_Change(&pthis->skelAnime, D_80A7B918[pthis->animationIdx], 1.0f, 0.0f,
@ -668,7 +668,7 @@ void func_80A7A568(EnIn* pthis, GlobalContext* globalCtx) {
gSaveContext.infTable[10] |= 0x800;
}
if (gSaveContext.timer1State == 10) {
Audio_PlaySoundGeneral(NA_SE_SY_FOUND, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_FOUND, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
func_80A79C78(pthis, globalCtx);
pthis->actionFunc = func_80A7B024;
gSaveContext.timer1State = 0;
@ -686,7 +686,7 @@ void func_80A7A568(EnIn* pthis, GlobalContext* globalCtx) {
phi_a2 = 2;
phi_a3 = 2;
} else {
Audio_PlaySoundGeneral(NA_SE_SY_FOUND, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_FOUND, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
if (!(gSaveContext.eventChkInf[1] & 0x800)) {
if (gSaveContext.infTable[10] & 0x800) {
gSaveContext.eventChkInf[1] |= 0x800;

2
src/overlays/actors/ovl_En_Kanban/z_en_kanban.cpp
View File

@ -692,7 +692,7 @@ void EnKanban_Update(Actor* thisx, GlobalContext* globalCtx2) {
pthis->actionState = ENKANBAN_REPAIR;
pthis->bounceX = 1;
Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &D_801333D4, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
}
break;
}

2
src/overlays/actors/ovl_En_Ko/z_en_ko.cpp
View File

@ -490,7 +490,7 @@ s16 func_80A97738(GlobalContext* globalCtx, Actor* thisx) {
case 0x10B8:
if (pthis->unk_210 == 0) {
Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &D_801333D4, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
pthis->unk_210 = 1;
}
}

4
src/overlays/actors/ovl_En_Kz/z_en_kz.cpp
View File

@ -157,11 +157,11 @@ s16 func_80A9C6C0(GlobalContext* globalCtx, Actor* thisx) {
if (pthis->actor.textId != 0x4014) {
if (pthis->actor.textId == 0x401B && !pthis->sfxPlayed) {
Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &D_801333D4, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
pthis->sfxPlayed = true;
}
} else if (!pthis->sfxPlayed) {
Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
pthis->sfxPlayed = true;
}
break;

4
src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.cpp
View File

@ -89,7 +89,7 @@ void EnLightbox_Update(Actor* thisx, GlobalContext* globalCtx) {
if (thisx->bgCheckFlags & 8) {
thisx->world.rot.y = (thisx->world.rot.y + thisx->wallYaw) - thisx->world.rot.y;
Audio_PlaySoundGeneral(NA_SE_EV_BOMB_BOUND, &thisx->projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
thisx->speedXZ *= 0.7f;
thisx->bgCheckFlags &= ~0x8;
}
@ -101,7 +101,7 @@ void EnLightbox_Update(Actor* thisx, GlobalContext* globalCtx) {
Math_StepToF(&thisx->speedXZ, 0, IREG(58) / 100.0f);
if ((thisx->bgCheckFlags & 2) && (thisx->velocity.y < IREG(59) / 100.0f)) {
Audio_PlaySoundGeneral(NA_SE_EV_BOMB_BOUND, &thisx->projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
thisx->velocity.y *= IREG(60) / 100.0f;
thisx->bgCheckFlags &= ~0x1;
} else {

16
src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.cpp
View File

@ -108,9 +108,9 @@ void EnMThunder_Init(Actor* thisx, GlobalContext* globalCtx2) {
(((pthis->actor.params & 0xFF00) >> 8) &&
!(func_80087708(globalCtx, (pthis->actor.params & 0xFF00) >> 8, 0)))) {
Audio_PlaySoundGeneral(NA_SE_IT_ROLLING_CUT, &player->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_IT_SWORD_SWING_HARD, &player->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
Actor_Kill(&pthis->actor);
return;
}
@ -123,7 +123,7 @@ void EnMThunder_Init(Actor* thisx, GlobalContext* globalCtx2) {
func_80A9EFE0(pthis, func_80A9F9B4);
pthis->unk_1C4 = 8;
Audio_PlaySoundGeneral(NA_SE_IT_ROLLING_CUT_LV1, &player->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
pthis->unk_1AC = 1.0f;
} else {
func_80A9EFE0(pthis, func_80A9F408);
@ -153,9 +153,9 @@ void func_80A9F350(EnMThunder* pthis, GlobalContext* globalCtx) {
if (player->stateFlags2 & 0x20000) {
if (player->swordAnimation >= 0x18) {
Audio_PlaySoundGeneral(NA_SE_IT_ROLLING_CUT, &player->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_IT_SWORD_SWING_HARD, &player->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
}
Actor_Kill(&pthis->actor);
@ -203,9 +203,9 @@ void func_80A9F408(EnMThunder* pthis, GlobalContext* globalCtx) {
if (player->unk_858 <= 0.15f) {
if ((player->unk_858 >= 0.1f) && (player->swordAnimation >= 0x18)) {
Audio_PlaySoundGeneral(NA_SE_IT_ROLLING_CUT, &player->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_IT_SWORD_SWING_HARD, &player->actor.projectedPos, 4, &D_801333E0,
&D_801333E0, &D_801333E8);
&D_801333E0, &gReverbAdd2);
}
Actor_Kill(&pthis->actor);
return;
@ -227,7 +227,7 @@ void func_80A9F408(EnMThunder* pthis, GlobalContext* globalCtx) {
func_80A9EFE0(pthis, func_80A9F9B4);
pthis->unk_1C4 = 8;
Audio_PlaySoundGeneral(sSfxIds[pthis->unk_1C6], &player->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
pthis->unk_1AC = 1.0f;
return;
}

2
src/overlays/actors/ovl_En_Ma2/z_en_ma2.cpp
View File

@ -294,7 +294,7 @@ void func_80AA20E4(EnMa2* pthis, GlobalContext* globalCtx) {
pthis->actionFunc = func_80AA204C;
globalCtx->msgCtx.ocarinaMode = OCARINA_MODE_04;
} else if (globalCtx->msgCtx.ocarinaMode == OCARINA_MODE_03) {
Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
pthis->unk_208 = 0x1E;
gSaveContext.infTable[8] |= 0x4000;
pthis->actionFunc = func_80AA21C8;

4
src/overlays/actors/ovl_En_Mag/z_en_mag.cpp
View File

@ -152,7 +152,7 @@ void EnMag_Update(Actor* thisx, GlobalContext* globalCtx) {
CHECK_BTN_ALL(globalCtx->state.input[0].press.button, BTN_A) ||
CHECK_BTN_ALL(globalCtx->state.input[0].press.button, BTN_B)) {
Audio_PlaySoundGeneral(NA_SE_SY_PIECE_OF_HEART, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_PIECE_OF_HEART, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
pthis->mainAlpha = 210;
pthis->subAlpha = 255;
@ -192,7 +192,7 @@ void EnMag_Update(Actor* thisx, GlobalContext* globalCtx) {
Audio_SetCutsceneFlag(0);
Audio_PlaySoundGeneral(NA_SE_SY_PIECE_OF_HEART, &D_801333D4, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
gSaveContext.gameMode = 2;
globalCtx->sceneLoadFlag = 20;

2
src/overlays/actors/ovl_En_Md/z_en_md.cpp
View File

@ -761,7 +761,7 @@ void func_80AABC10(EnMd* pthis, GlobalContext* globalCtx) {
pthis->actionFunc = func_80AAB948;
globalCtx->msgCtx.ocarinaMode = OCARINA_MODE_04;
} else if (globalCtx->msgCtx.ocarinaMode == OCARINA_MODE_03) {
Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
pthis->actor.textId = 0x1067;
func_8002F2CC(&pthis->actor, globalCtx, pthis->collider.dim.radius + 30.0f);

2
src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.cpp
View File

@ -104,7 +104,7 @@ void EnOkarinaEffect_ManageStorm(EnOkarinaEffect* pthis, GlobalContext* globalCt
globalCtx->envCtx.unk_F2[0] = 0;
if (globalCtx->csCtx.state == CS_STATE_IDLE) {
func_80077684(globalCtx);
} else if (func_800FA0B4(SEQ_PLAYER_BGM_MAIN) == NA_BGM_NATURE_AMBIENCE) {
} else if (Audio_GetSequenceBeingPlayed(SEQ_PLAYER_BGM_MAIN) == NA_BGM_NATURE_AMBIENCE) {
func_800F6D58(0xF, 1, 0);
func_800F6D58(0xE, 1, 0);
}

2
src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.cpp
View File

@ -254,7 +254,7 @@ void func_80ABF4C8(EnOkarinaTag* pthis, GlobalContext* globalCtx) {
case 2:
globalCtx->csCtx.segment = D_80ABF9D0;
gSaveContext.cutsceneTrigger = 1;
func_800F574C(1.18921f, 0x5A);
Audio_PlayFanfare(1.18921f, 0x5A);
break;
case 4:
globalCtx->csCtx.segment = D_80ABFB40;

2
src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.cpp
View File

@ -83,7 +83,7 @@ void EnPubox_Update(Actor* thisx, GlobalContext* globalCtx) {
Math_SmoothStepToF(&thisx->speedXZ, 0.0f, 1.0f, 1.0f, 0.0f);
if (thisx->speedXZ != 0.0f) {
Audio_PlaySoundGeneral(NA_SE_EV_ROCK_SLIDE - SFX_FLAG, &thisx->projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
}
pthis->dyna.unk_154 = 0.0f;
pthis->dyna.unk_150 = 0.0f;

4
src/overlays/actors/ovl_En_Ru1/z_en_ru1.cpp
View File

@ -611,7 +611,7 @@ void func_80AEBC30(GlobalContext* globalCtx) {
if (globalCtx->csCtx.frames == 0xCD) {
player = GET_PLAYER(globalCtx);
Audio_PlaySoundGeneral(NA_SE_EV_DIVE_INTO_WATER, &player->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
}
}
@ -1216,7 +1216,7 @@ void func_80AED520(EnRu1* pthis, GlobalContext* globalCtx) {
Player* player = GET_PLAYER(globalCtx);
Audio_PlaySoundGeneral(NA_SE_PL_PULL_UP_RUTO, &player->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
func_80078914(&pthis->actor.projectedPos, NA_SE_VO_RT_LIFT);
}

2
src/overlays/actors/ovl_En_Sa/z_en_sa.cpp
View File

@ -654,7 +654,7 @@ void func_80AF68E4(EnSa* pthis, GlobalContext* globalCtx) {
}
if (phi_v0 == 0) {
Audio_PlaySoundGeneral(NA_SE_PL_WALK_GROUND, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
pthis->unk_20C = 8;
}
}

4
src/overlays/actors/ovl_En_Sw/z_en_sw.cpp
View File

@ -284,7 +284,7 @@ void EnSw_Init(Actor* thisx, GlobalContext* globalCtx) {
}
if (((thisx->params & 0xE000) >> 0xD) >= 3) {
Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
switch ((thisx->params & 0xE000) >> 0xD) {
@ -627,7 +627,7 @@ void func_80B0D878(EnSw* pthis, GlobalContext* globalCtx) {
pthis->actor.shape.rot = pthis->actor.world.rot;
if ((pthis->unk_394 == 0) && (pthis->unk_392 == 0)) {
Audio_PlaySoundGeneral(NA_SE_SY_KINSTA_MARK_APPEAR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_KINSTA_MARK_APPEAR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
x = (pthis->unk_364.x * 10.0f);
y = (pthis->unk_364.y * 10.0f);
z = (pthis->unk_364.z * 10.0f);

2
src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.cpp
View File

@ -470,7 +470,7 @@ void func_80B12460(EnSyatekiNiw* pthis, GlobalContext* globalCtx) {
if ((pthis->unk_25A == 0) && ((player->actor.world.pos.z - 30.0f) < pthis->actor.world.pos.z)) {
Audio_PlaySoundGeneral(NA_SE_VO_LI_DOWN, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
pthis->unk_25E = 0x14;
pthis->unk_29A = 6;
pthis->actor.speedXZ = 0.0f;

2
src/overlays/actors/ovl_En_Ta/z_en_ta.cpp
View File

@ -766,7 +766,7 @@ void func_80B154FC(EnTa* pthis, GlobalContext* globalCtx) {
}
if (gSaveContext.timer1Value == 10) {
func_800F5918();
Audio_UpdateTempo();
}
if (gSaveContext.timer1Value == 0 && !Gameplay_InCsMode(globalCtx)) {

2
src/overlays/actors/ovl_En_Tk/z_en_tk.cpp
View File

@ -654,7 +654,7 @@ void EnTk_Dig(EnTk* pthis, GlobalContext* globalCtx) {
Audio_PlayActorSound2(&pthis->actor, NA_SE_SY_ERROR);
} else if (pthis->currentReward == 4) {
/* Heart piece */
Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
} else {
/* Rupee */
Audio_PlayActorSound2(&pthis->actor, NA_SE_SY_TRE_BOX_APPEAR);

4
src/overlays/actors/ovl_En_Torch2/z_en_torch2.cpp
View File

@ -348,7 +348,7 @@ void EnTorch2_Update(Actor* thisx, GlobalContext* globalCtx2) {
EnTorch2_SwingSword(globalCtx, input, pthis);
sSwordJumpState++;
} else if (sSwordJumpTimer == 19) {
func_800F4190(&pthis->actor.projectedPos, NA_SE_VO_LI_AUTO_JUMP);
Audio_PlaySoundWithPos(&pthis->actor.projectedPos, NA_SE_VO_LI_AUTO_JUMP);
}
}
} else {
@ -656,7 +656,7 @@ void EnTorch2_Update(Actor* thisx, GlobalContext* globalCtx2) {
}
if (staggerThreshold < sStaggerCount) {
pthis->skelAnime.playSpeed *= 0.6f;
func_800F4190(&pthis->actor.projectedPos, NA_SE_PL_DAMAGE);
Audio_PlaySoundWithPos(&pthis->actor.projectedPos, NA_SE_PL_DAMAGE);
sStaggerTimer = 0;
sStaggerCount = 0;
}

10
src/overlays/actors/ovl_En_Tp/z_en_tp.cpp
View File

@ -246,7 +246,7 @@ void EnTp_Head_ApproachPlayer(EnTp* pthis, GlobalContext* globalCtx) {
Math_SmoothStepToF(&pthis->actor.world.pos.y, player->actor.world.pos.y + 30.0f, 1.0f, 0.5f, 0.0f);
Audio_PlaySoundGeneral(NA_SE_EN_TAIL_FLY - SFX_FLAG, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
if (pthis->collider.base.atFlags & AT_HIT) {
pthis->collider.base.atFlags &= ~AT_HIT;
@ -383,7 +383,7 @@ void EnTp_Head_TakeOff(EnTp* pthis, GlobalContext* globalCtx) {
Math_SmoothStepToF(&pthis->actor.world.pos.y, player->actor.world.pos.y + 85.0f + pthis->horizontalVariation, 1.0f,
pthis->actor.speedXZ * 0.25f, 0.0f);
Audio_PlaySoundGeneral(NA_SE_EN_TAIL_FLY - SFX_FLAG, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
if (pthis->collider.base.atFlags & AT_HIT) {
pthis->collider.base.atFlags &= ~AT_HIT;
@ -481,7 +481,7 @@ void EnTp_Head_Wait(EnTp* pthis, GlobalContext* globalCtx) {
if (pthis->actor.world.pos.y != pthis->actor.home.pos.y) {
Audio_PlaySoundGeneral(NA_SE_EN_TAIL_FLY - SFX_FLAG, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
}
}
@ -548,7 +548,7 @@ void EnTp_Head_BurrowReturnHome(EnTp* pthis, GlobalContext* globalCtx) {
if (pthis->actor.world.pos.y != pthis->actor.home.pos.y) {
Audio_PlaySoundGeneral(NA_SE_EN_TAIL_FLY - SFX_FLAG, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
}
if (closeToFloor && ((globalCtx->gameplayFrames & 1) != 0)) {
@ -691,7 +691,7 @@ void EnTp_Update(Actor* thisx, GlobalContext* globalCtx) {
if (pthis->actor.shape.rot.z == 0) {
Audio_PlaySoundGeneral(NA_SE_EN_TAIL_CRY, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
}
if (pthis->actionIndex >= TAILPASARAN_ACTION_TAIL_FOLLOWHEAD) {

2
src/overlays/actors/ovl_En_Tr/z_en_tr.cpp
View File

@ -141,7 +141,7 @@ void EnTr_CrySpellcast(EnTr* pthis, GlobalContext* globalCtx) {
// Both cry in the title screen cutscene, but only Kotake in the in-game cutscene
if ((pthis->actor.params != TR_KOUME) || (gSaveContext.sceneSetupIndex == 6)) {
Audio_PlaySoundGeneral(NA_SE_EN_TWINROBA_SHOOT_VOICE, &D_801333D4, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
}
}

4
src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.cpp
View File

@ -149,7 +149,7 @@ void EnVbBall_UpdateBones(EnVbBall* pthis, GlobalContext* globalCtx) {
pthis->actor.velocity.y *= -0.5f;
if (pthis->actor.params & 1) {
Audio_PlaySoundGeneral(NA_SE_EN_VALVAISA_LAND, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
}
for (i = 0; i < 10; i++) {
Vec3f dustVel = { 0.0f, 0.0f, 0.0f };
@ -234,7 +234,7 @@ void EnVbBall_Update(Actor* thisx, GlobalContext* globalCtx2) {
if (newActor != NULL) {
if ((i == 0) && (pthis->actor.params == 100)) {
Audio_PlaySoundGeneral(NA_SE_EN_VALVAISA_ROCK, &newActor->actor.projectedPos, 4,
&D_801333E0, &D_801333E0, &D_801333E8);
&D_801333E0, &D_801333E0, &gReverbAdd2);
}
newActor->actor.parent = pthis->actor.parent;
newActor->actor.velocity = spawnOffset;

10
src/overlays/actors/ovl_En_Viewer/z_en_viewer.cpp
View File

@ -252,7 +252,7 @@ void EnViewer_UpdateImpl(EnViewer* pthis, GlobalContext* globalCtx) {
case 380:
case 409:
case 438:
Audio_PlaySoundGeneral(NA_SE_SY_DEMO_CUT, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_DEMO_CUT, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
break;
}
}
@ -270,7 +270,7 @@ void EnViewer_UpdateImpl(EnViewer* pthis, GlobalContext* globalCtx) {
}
if (globalCtx->csCtx.frames == 960) {
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_GROAN, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
}
} else if (type == ENVIEWER_TYPE_6_HORSE_GANONDORF) {
if (gSaveContext.sceneSetupIndex == 5 || gSaveContext.sceneSetupIndex == 10) {
@ -456,7 +456,7 @@ void EnViewer_UpdateImpl(EnViewer* pthis, GlobalContext* globalCtx) {
case 0:
if (globalCtx->csCtx.state != CS_STATE_IDLE && globalCtx->csCtx.npcActions[1] != NULL &&
globalCtx->csCtx.npcActions[1]->action == 7) {
Audio_PlaySoundGeneral(NA_SE_EN_GANON_LAUGH, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_EN_GANON_LAUGH, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Animation_MorphToPlayOnce(&pthis->skin.skelAnime, &object_gndd_Anim_004534, -5.0f);
pthis->state++;
}
@ -751,7 +751,7 @@ void EnViewer_UpdatePosition(EnViewer* pthis, GlobalContext* globalCtx) {
if (!sHorseSfxPlayed) {
sHorseSfxPlayed = true;
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
}
Audio_PlayActorSound2(&pthis->actor, NA_SE_EV_HORSE_RUN_LEVEL - SFX_FLAG);
}
@ -798,7 +798,7 @@ void EnViewer_UpdatePosition(EnViewer* pthis, GlobalContext* globalCtx) {
}
}
if (type == ENVIEWER_TYPE_5_GANONDORF) {
Audio_PlaySoundGeneral(NA_SE_EV_BURNING - SFX_FLAG, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_EV_BURNING - SFX_FLAG, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
EnViewer_DrawFireEffects(pthis, globalCtx);
}
}

2
src/overlays/actors/ovl_En_Zl3/z_en_zl3.cpp
View File

@ -2593,7 +2593,7 @@ void func_80B59828(EnZl3* pthis, GlobalContext* globalCtx) {
void func_80B59A80(EnZl3* pthis, GlobalContext* globalCtx) {
if (func_80B59768(pthis, globalCtx)) {
Audio_PlaySoundGeneral(NA_SE_OC_REVENGE, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_OC_REVENGE, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
}

2
src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.cpp
View File

@ -84,7 +84,7 @@ void func_80B9D0B0(ObjRoomtimer* pthis, GlobalContext* globalCtx) {
Actor_Kill(&pthis->actor);
} else {
if ((pthis->actor.params != 0x3FF) && (gSaveContext.timer1Value == 0)) {
Audio_PlaySoundGeneral(NA_SE_OC_ABYSS, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_OC_ABYSS, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Gameplay_TriggerVoidOut(globalCtx);
Actor_Kill(&pthis->actor);
}

4
src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.cpp
View File

@ -207,7 +207,7 @@ void ObjSyokudai_Update(Actor* thisx, GlobalContext* globalCtx2) {
if (player->unk_860 == 0) {
player->unk_860 = 210;
Audio_PlaySoundGeneral(NA_SE_EV_FLAME_IGNITION, &pthis->actor.projectedPos, 4, &D_801333E0,
&D_801333E0, &D_801333E8);
&D_801333E0, &gReverbAdd2);
} else if (player->unk_860 < 200) {
player->unk_860 = 200;
}
@ -244,7 +244,7 @@ void ObjSyokudai_Update(Actor* thisx, GlobalContext* globalCtx2) {
}
}
Audio_PlaySoundGeneral(NA_SE_EV_FLAME_IGNITION, &pthis->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
&gReverbAdd2);
}
}
}

4
src/overlays/actors/ovl_player_actor/z_player.cpp
View File

@ -1254,7 +1254,7 @@ void func_80832698(Player* pthis, u16 sfxId) {
if (pthis->actor.category == ACTORCAT_PLAYER) {
func_8002F7DC(&pthis->actor, sfxId + pthis->ageProperties->unk_92);
} else {
func_800F4190(&pthis->actor.projectedPos, sfxId);
Audio_PlaySoundWithPos(&pthis->actor.projectedPos, sfxId);
}
}
@ -11762,7 +11762,7 @@ s32 func_8084DFF4(GlobalContext* globalCtx, Player* pthis) {
((pthis->getItemId >= GI_RUPEE_PURPLE) && (pthis->getItemId <= GI_RUPEE_GOLD)) ||
((pthis->getItemId >= GI_RUPEE_GREEN_LOSE) && (pthis->getItemId <= GI_RUPEE_PURPLE_LOSE)) ||
(pthis->getItemId == GI_HEART)) {
Audio_PlaySoundGeneral(NA_SE_SY_GET_BOXITEM, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_GET_BOXITEM, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
} else {
if ((pthis->getItemId == GI_HEART_CONTAINER_2) || (pthis->getItemId == GI_HEART_CONTAINER) ||
((pthis->getItemId == GI_HEART_PIECE) &&

2
src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.cpp
View File

@ -138,6 +138,6 @@ void EffectSsDeadDb_Update(GlobalContext* globalCtx, u32 index, EffectSs* pthis)
if (pthis->rPlaySound && (pthis->rTextIdx == 1)) {
SkinMatrix_Vec3fMtxFMultXYZW(&globalCtx->viewProjectionMtxF, &pthis->pos, &pthis->vec, &w);
Audio_PlaySoundGeneral(NA_SE_EN_EXTINCT, &pthis->vec, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_EN_EXTINCT, &pthis->vec, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
}

2
src/overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.cpp
View File

@ -48,5 +48,5 @@ void EffectSsDeadSound_Update(GlobalContext* globalCtx, u32 index, EffectSs* pth
return;
}
Audio_PlaySoundGeneral(pthis->rSfxId, &pthis->pos, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(pthis->rSfxId, &pthis->pos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}

26
src/overlays/gamestates/ovl_file_choose/z_file_choose.cpp
View File

@ -215,7 +215,7 @@ void FileChoose_UpdateMainMenu(GameState* pthisx) {
GET_NEWF(sramCtx, pthis->buttonIndex, 4), GET_NEWF(sramCtx, pthis->buttonIndex, 5));
if (!SLOT_OCCUPIED(sramCtx, pthis->buttonIndex)) {
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
pthis->configMode = CM_ROTATE_TO_NAME_ENTRY;
pthis->kbdButton = FS_KBD_BTN_NONE;
pthis->charPage = FS_CHAR_PAGE_ENG;
@ -228,18 +228,18 @@ void FileChoose_UpdateMainMenu(GameState* pthisx) {
pthis->nameEntryBoxAlpha = 0;
MemCopy(&pthis->fileNames[pthis->buttonIndex][0], &emptyName, 8);
} else if (pthis->n64ddFlags[pthis->buttonIndex] == pthis->n64ddFlag) {
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
pthis->actionTimer = 8;
pthis->selectMode = SM_FADE_MAIN_TO_SELECT;
pthis->selectedFileIndex = pthis->buttonIndex;
pthis->menuMode = FS_MENU_MODE_SELECT;
pthis->nextTitleLabel = FS_TITLE_OPEN_FILE;
} else if (!pthis->n64ddFlags[pthis->buttonIndex]) {
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_ERROR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_ERROR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
} else {
if (pthis->warningLabel == FS_WARNING_NONE) {
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
pthis->prevConfigMode = pthis->configMode;
if (pthis->buttonIndex == FS_BTN_MAIN_COPY) {
@ -260,12 +260,12 @@ void FileChoose_UpdateMainMenu(GameState* pthisx) {
pthis->actionTimer = 8;
} else {
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_ERROR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_ERROR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
}
} else {
if (ABS(pthis->stickRelY) > 30) {
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
if (pthis->stickRelY > 30) {
pthis->buttonIndex--;
@ -1354,18 +1354,18 @@ void FileChoose_ConfirmFile(GameState* pthisx) {
if (CHECK_BTN_ALL(input->press.button, BTN_START) || (CHECK_BTN_ALL(input->press.button, BTN_A))) {
if (pthis->confirmButtonIndex == FS_BTN_CONFIRM_YES) {
Rumble_Shake(300.0f, 180, 20, 100);
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
pthis->selectMode = SM_FADE_OUT;
func_800F6964(0xF);
} else {
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CLOSE, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CLOSE, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
pthis->selectMode++;
}
} else if (CHECK_BTN_ALL(input->press.button, BTN_B)) {
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CLOSE, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CLOSE, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
pthis->selectMode++;
} else if (ABS(pthis->stickRelY) >= 30) {
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
pthis->confirmButtonIndex ^= 1;
}
}
@ -1470,14 +1470,14 @@ void FileChoose_LoadGame(GameState* pthisx) {
s32 pad;
if (pthis->buttonIndex == FS_BTN_SELECT_FILE_1) {
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
gSaveContext.fileNum = pthis->buttonIndex;
Sram_OpenSave(&pthis->sramCtx);
gSaveContext.gameMode = 0;
SET_NEXT_GAMESTATE(&pthis->state, Select_Init, SelectContext);
pthis->state.running = false;
} else {
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
gSaveContext.fileNum = pthis->buttonIndex;
Sram_OpenSave(&pthis->sramCtx);
gSaveContext.gameMode = 0;
@ -1923,5 +1923,5 @@ void FileChoose_Init(GameState* pthisx) {
FileChoose_InitContext(&pthis->state);
Font_LoadOrderedFont(&pthis->font);
Audio_QueueSeqCmd(0xF << 28 | SEQ_PLAYER_BGM_MAIN << 24 | 0xA);
func_800F5E18(SEQ_PLAYER_BGM_MAIN, NA_BGM_FILE_SELECT, 0, 7, 1);
Audio_SendStartSequence(SEQ_PLAYER_BGM_MAIN, NA_BGM_FILE_SELECT, 0, 7, 1);
}

Some files were not shown because too many files have changed in this diff Show More