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

More audio cleanup.

Browse Source
This commit is contained in:
DaMarkov 2022-02-28 01:38:15 +01:00 committed by Blake Warner
parent 2455953e46
commit fd3a63b3b6
70 changed files with 370 additions and 377 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/audiomgr.h
View File

@ -28,6 +28,6 @@ struct AudioMgr {
/* 0x00E8 */ OSThread unk_E8;
}; // size = 0x298
extern Vec3f D_801333D4;
extern Vec3f gAudioDefaultPos;
extern f32 D_801333E0;
extern s8 gReverbAdd2;

4
include/def/audio.h
View File

@ -47,7 +47,7 @@ void Audio_SetSequenceMode(u8 seqMode);
void Audio_SetSoundProperties(u8 bankId, u8 entryIdx, u8 channelIdx);
void func_800ECC04(u16);
void func_800EE824(void);
void func_800F3054(void);
void Audio_UpdateAll(void);
void func_800F3F3C(u8);
void func_800F4010(Vec3f* pos, u16 sfxId, f32);
void func_800F4138(Vec3f* pos, u16 sfxId, f32);
@ -61,7 +61,7 @@ void func_800F47BC(void);
void func_800F47FC(void);
void func_800F483C(u8 targetVol, u8 volFadeTimer);
void func_800F4870(u8);
void func_800F4A54(u8);
void Audio_RequestBgmVolumeChange(u8);
void func_800F4C58(Vec3f* pos, u16 sfxId, u8);
void func_800F4E30(Vec3f* pos, f32);
void Audio_PlaySequence2(u16 seqId);

2
include/def/audio_bank.h
View File

@ -7,7 +7,7 @@ struct SoundBankEntry;
extern char D_80133390[];
extern char D_80133398[];
extern Vec3f D_801333D4;
extern Vec3f gAudioDefaultPos;
extern f32 D_801333E0;
extern s8 gReverbAdd2;
extern u8 D_801333F0;

2
include/def/audio_command.h
View File

@ -11,6 +11,6 @@ s32 Audio_IsCommandNotIssued(u32 arg0, u32 arg1);
void func_800FA174(u8);
void func_800FA18C(u8, u8);
void func_800FA3DC(void);
u8 func_800FAD34(void);
u8 Audio_SyncIfNeeded(void);
void Audio_ResetPlayers(void);
void Audio_ResetVolume(void);

2
include/def/audio_rsp.h
View File

@ -12,7 +12,7 @@ s32 Audio_ScheduleProcessCmds(void);
AudioTask* func_800E4FE0(void);
u32 func_800E5E20(u32* arg0);
u8* func_800E5E84(s32 arg0, u32* arg1);
s32 func_800E5EDC(void);
s32 Audio_Sync(void);
s32 func_800E5F88(s32 arg0);
s32 func_800E6680(void);
u32 osGetCount(void);

4
include/z64audio.h
View File

@ -1211,7 +1211,7 @@ extern u8* gFrogsSongPtr;
extern char D_80133390[];
extern char D_80133398[];
extern u8 gSfxChannelLayout;
extern Vec3f D_801333D4;
extern Vec3f gAudioDefaultPos;
extern f32 D_801333E0;
extern s8 gReverbAdd2;
extern u8 D_801333F0;
@ -1219,7 +1219,7 @@ extern u8 gAudioSfxSwapOff;
extern u8 gAudioDisable;
extern u8 D_8013340C;
extern u8 gAudioSpecId;
extern u8 D_80133418;
extern u8 gAudioSyncMode;

110
src/code/audio.cpp
View File

@ -131,9 +131,9 @@ u8 sPrevChargeLevel = 0;
f32 D_801305E4[4] = { 1.0f, 1.12246f, 1.33484f, 1.33484f }; // 2**({0, 2, 5, 5}/12)
f32 D_801305F4 = 1.0f;
u8 D_801305F8[8] = { 127, 80, 75, 73, 70, 68, 65, 60 };
u8 D_80130600 = 0;
u8 gAudioGanonVolumeDelay = 0;
s8 D_80130604 = 2;
s8 D_80130608 = 0;
s8 gAudioOverwriteBgmVolume = 0;
s8 sAudioCutsceneFlag = 0;
s8 sSpecReverb = 0;
s8 sAudioEnvReverb = 0;
@ -334,7 +334,7 @@ u8 sNotePlaybackVibrato = 0;
s8 sNotePlaybackTone = 0;
f32 sNormalizedNotePlaybackTone = 1.0f;
f32 sNormalizedNotePlaybackVolume = 1.0f;
s32 D_80130F68 = 0;
s32 gAudioLastTaskCount = 0;
u8 sOcarinaNoteValues[5] = { 2, 5, 9, 11, 14 };
u8 sOcaMinigameAppendPos = 0;
u8 sOcaMinigameEndPos = 0;
@ -673,10 +673,10 @@ struct {
s8 str[5];
u16 num;
} sAudioScrPrtBuf[SCROLL_PRINT_BUF_SIZE];
u8 D_8016B8B0;
u8 D_8016B8B1;
u8 D_8016B8B2;
u8 D_8016B8B3;
u8 gAudioBgmVolumeReq;
u8 gAudioBgmVolumeNow;
u8 gAudioChangeBgmVolume;
u8 gAudioChangeBgmVolumeToDefault;
u8 sAudioGanonDistVol;
SfxPlayerState sSfxChannelState[0x10];
@ -691,7 +691,7 @@ u16 gFanfareLastSeqPlayed;
OcarinaStaff sPlayingStaff;
OcarinaStaff sDisplayedStaff;
OcarinaStaff sRecordingStaff;
u32 D_8016BA04;
u32 gAudioCurrentTaskCount;
typedef struct {
s8 x;
s8 y;
@ -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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_OC_OCARINA, &gAudioDefaultPos, 4, &D_80130F24, &D_80130F28, &gReverbAdd2);
} else if ((sPrevOcarinaNoteVal != 0xFF) && (sCurOcarinaBtnVal == 0xFF)) {
Audio_StopSfxById(NA_SE_OC_OCARINA);
}
@ -1163,7 +1163,7 @@ void Audio_OcaPlayback(void) {
if (sStaffPlaybackPos == 0) {
noteTimerStep = 3;
} else {
noteTimerStep = D_8016BA04 - D_80130F68;
noteTimerStep = gAudioCurrentTaskCount - gAudioLastTaskCount;
}
if (noteTimerStep < sNotePlaybackTimer) {
@ -1229,7 +1229,7 @@ void Audio_OcaPlayback(void) {
sStaffPlaybackPos++;
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,
Audio_PlaySoundGeneral(NA_SE_OC_OCARINA, &gAudioDefaultPos, 4, &sNormalizedNotePlaybackTone,
&sNormalizedNotePlaybackVolume, &gReverbAdd2);
} else {
Audio_StopSfxById(NA_SE_OC_OCARINA);
@ -1257,7 +1257,7 @@ void func_800EDD68(u8 arg0) {
song = D_80131BEC;
}
song[sRecordSongPos].noteIdx = D_80131864;
song[sRecordSongPos].unk_02 = D_8016BA04 - D_80131860;
song[sRecordSongPos].unk_02 = gAudioCurrentTaskCount - D_80131860;
song[sRecordSongPos].volume = D_80131868;
song[sRecordSongPos].vibrato = D_8013186C;
song[sRecordSongPos].tone = D_80131870;
@ -1354,7 +1354,7 @@ void Audio_OcaSetRecordingState(u8 recordingState) {
}
if (recordingState != 0) {
D_80131860 = D_8016BA04;
D_80131860 = gAudioCurrentTaskCount;
D_80131864 = 0xFF;
D_80131868 = 0x57;
D_8013186C = 0;
@ -1430,7 +1430,7 @@ OcarinaStaff* Audio_OcaGetDisplayingStaff(void) {
void func_800EE404(void) {
s32 noteChanged;
if ((sRecordingState != 0) && ((D_8016BA04 - D_80131860) >= 3)) {
if ((sRecordingState != 0) && ((gAudioCurrentTaskCount - D_80131860) >= 3)) {
noteChanged = false;
if (D_80131864 != sCurOcarinaBtnVal) {
if (sCurOcarinaBtnVal != 0xFF) {
@ -1461,7 +1461,7 @@ void func_800EE404(void) {
if (noteChanged) {
func_800EDD68(0);
D_80131860 = D_8016BA04;
D_80131860 = gAudioCurrentTaskCount;
}
}
}
@ -1513,8 +1513,8 @@ s32 Audio_OcaMemoryGameGenNote(void) {
}
// input update?
void func_800EE6F4(void) {
D_8016BA04 = gAudioContext.totalTaskCnt;
void Audio_UpdateOcarina(void) {
gAudioCurrentTaskCount = gAudioContext.totalTaskCnt;
if (D_80130F10 != 0) {
if (sOcarinaInpEnabled == 1) {
Audio_GetOcaInput();
@ -1531,7 +1531,7 @@ void func_800EE6F4(void) {
}
Audio_OcaPlayback();
D_80130F68 = D_8016BA04;
gAudioLastTaskCount = gAudioCurrentTaskCount;
if (sPlaybackState == 0) {
func_800EE404();
@ -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, &gReverbAdd2);
&gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
break;
case 4:
Audio_SetSettings(sAudioSndContWork[sAudioSndContSel]);
@ -2157,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, &gReverbAdd2);
Audio_PlaySoundGeneral(sfx, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
if (CHECK_BTN_ANY(sDebugPadPress, BTN_B)) {
@ -2285,17 +2285,17 @@ void AudioDebug_ProcessInput(void) {
D_8013340C = sAudioScrPrtWork[10];
}
void func_800F4A70(void);
void Audio_UpdateBgmVolume(void);
void Audio_UpdateFanfare(void);
void func_800F3054(void) {
if (func_800FAD34() == 0) {
void Audio_UpdateAll(void) {
if (Audio_SyncIfNeeded() == 0) {
sAudioUpdateTaskStart = gAudioContext.totalTaskCnt;
sAudioUpdateStartTime = osGetTime();
func_800EE6F4();
Audio_UpdateOcarina();
Audio_StepFreqLerp(&sRiverFreqScaleLerp);
Audio_StepFreqLerp(&sWaterfallFreqScaleLerp);
func_800F4A70();
Audio_UpdateBgmVolume();
Audio_UpdateScriptIO();
Audio_UpdateFanfare();
if (gAudioSpecId == 7) {
@ -2800,8 +2800,8 @@ void func_800F4578(Vec3f* pos, u16 sfxId, f32 arg2) {
}
void func_800F45D0(f32 arg0) {
func_800F4414(&D_801333D4, NA_SE_IT_FISHING_REEL_SLOW - SFX_FLAG, arg0);
func_800F436C(&D_801333D4, 0, (0.15f * arg0) + 1.4f);
func_800F4414(&gAudioDefaultPos, NA_SE_IT_FISHING_REEL_SLOW - SFX_FLAG, arg0);
func_800F436C(&gAudioDefaultPos, 0, (0.15f * arg0) + 1.4f);
}
void Audio_PlaySoundRiver(Vec3f* pos, f32 freqScale) {
@ -2868,7 +2868,7 @@ void func_800F4870(u8 arg0) {
}
if (arg0 == 7) {
D_80130600 = 2;
gAudioGanonVolumeDelay = 2;
} else {
Audio_SetGanonDistVol(D_801305F8[arg0 & 7]);
}
@ -2911,28 +2911,28 @@ s32 Audio_SetGanonDistVol(u8 targetVol) {
return -1;
}
void func_800F4A54(u8 arg0) {
D_8016B8B0 = arg0;
D_8016B8B2 = 1;
void Audio_RequestBgmVolumeChange(u8 newVolume) {
gAudioBgmVolumeReq = newVolume;
gAudioChangeBgmVolume = 1;
}
void func_800F4A70(void) {
if (D_8016B8B2 == 1) {
if (D_8016B8B1 != D_8016B8B0) {
Audio_SetVolScale(SEQ_PLAYER_BGM_MAIN, 0, D_8016B8B0, 0xA);
D_8016B8B1 = D_8016B8B0;
D_8016B8B3 = 1;
void Audio_UpdateBgmVolume(void) {
if (gAudioChangeBgmVolume == 1) {
if (gAudioBgmVolumeNow != gAudioBgmVolumeReq) {
Audio_SetVolScale(SEQ_PLAYER_BGM_MAIN, 0, gAudioBgmVolumeReq, 0xA);
gAudioBgmVolumeNow = gAudioBgmVolumeReq;
gAudioChangeBgmVolumeToDefault = 1;
}
D_8016B8B2 = 0;
} else if (D_8016B8B3 == 1 && D_80130608 == 0) {
gAudioChangeBgmVolume = 0;
} else if (gAudioChangeBgmVolumeToDefault == 1 && gAudioOverwriteBgmVolume == 0) {
Audio_SetVolScale(SEQ_PLAYER_BGM_MAIN, 0, 0x7F, 0xA);
D_8016B8B1 = 0x7F;
D_8016B8B3 = 0;
gAudioBgmVolumeNow = 0x7F;
gAudioChangeBgmVolumeToDefault = 0;
}
if (D_80130600 != 0) {
D_80130600--;
if (D_80130600 == 0) {
if (gAudioGanonVolumeDelay != 0) {
gAudioGanonVolumeDelay--;
if (gAudioGanonVolumeDelay == 0) {
Audio_SetGanonDistVol(D_801305F8[7]);
}
}
@ -3486,12 +3486,12 @@ void func_800F6268(f32 dist, u16 seqid) {
}
void Audio_PlayKaleido(u8 arg0) {
D_80130608 = arg0;
gAudioOverwriteBgmVolume = arg0;
if (arg0 != 0) {
Audio_PlaySoundGeneral(NA_SE_SY_WIN_OPEN, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_WIN_OPEN, &gAudioDefaultPos, 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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_WIN_CLOSE, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Audio_QueueCmdS32(CHAN_LOAD_UKN_F2 << 24, 0);
}
}
@ -3569,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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_PL_IN_BUBBLE, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
}
sAudioBaseFilter = filter;
@ -3602,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, &gReverbAdd2);
Audio_PlaySoundGeneralIfNotInCutscene(sfxId, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
void Audio_FadeOutMostSFX(u16 fade) {
@ -3679,14 +3679,14 @@ void func_800F6C34(void) {
sRiverFreqScaleLerp.value = 1.0f;
sWaterfallFreqScaleLerp.value = 1.0f;
D_8016B7D8 = 1.0f;
D_8016B8B0 = 0x7F;
D_8016B8B1 = 0x7F;
D_8016B8B2 = 0;
D_8016B8B3 = 0;
gAudioBgmVolumeReq = 0x7F;
gAudioBgmVolumeNow = 0x7F;
gAudioChangeBgmVolume = 0;
gAudioChangeBgmVolumeToDefault = 0;
sAudioGanonDistVol = 0xFF;
D_8016B9D8 = 0;
sSpecReverb = sSpecReverbs[gAudioSpecId];
D_80130608 = 0;
gAudioOverwriteBgmVolume = 0;
D_80130628 = NA_BGM_DISABLED;
Audio_QueueCmdS8(SEQ_CMD_UKN_46 << 24 | SEQ_PLAYER_BGM_MAIN << 16, -1);
sSariaBgmPtr = NULL;
@ -3796,7 +3796,7 @@ void func_800F7170(void) {
}
void func_800F71BC(s32 arg0) {
D_80133418 = 1;
gAudioSyncMode = 1;
func_800F6C34();
func_800EE930();
Audio_ResetSfxChannelState();

4
src/code/audio_bank.cpp
View File

@ -105,7 +105,7 @@ u8 gSfxChannelLayout = 0;
u16 gMutedChannels = 0;
Vec3f D_801333D4 = { 0.0f, 0.0f, 0.0f }; // default pos
Vec3f gAudioDefaultPos = { 0.0f, 0.0f, 0.0f }; // default pos
f32 D_801333E0 = 1.0f; // default freqScale
@ -396,7 +396,7 @@ void Audio_ChooseActiveSounds(u8 bankId) {
} else if (gSoundBanks[bankId][entryIndex].state != SFX_STATE_EMPTY) {
entry = &gSoundBanks[bankId][entryIndex];
if (&D_801333D4.x == entry[0].posX) {
if (&gAudioDefaultPos.x == entry[0].posX) {
entry->dist = 0.0f;
} else {
tempf1 = *entry->posY * 1;

20
src/code/audio_command.cpp
View File

@ -15,7 +15,7 @@ u8 gAudioDisable = 0;
u8 D_8013340C = 1;
u8 D_80133410[] = {0, 1, 2, 3};
u8 gAudioSpecId = 0;
u8 D_80133418 = 0;
u8 gAudioSyncMode = 0;
// TODO: clean up these macros. They are similar to ones in audio.c but without casts.
#define Audio_StartSeq(playerIdx, fadeTimer, seqId) \
@ -657,23 +657,23 @@ void func_800FA3DC(void) {
}
}
u8 func_800FAD34(void) {
if (D_80133418 != 0) {
if (D_80133418 == 1) {
if (func_800E5EDC() == 1) {
D_80133418 = 0;
u8 Audio_SyncIfNeeded(void) {
if (gAudioSyncMode != 0) {
if (gAudioSyncMode == 1) {
if (Audio_Sync() == 1) {
gAudioSyncMode = 0;
Audio_QueueCmdS8(SEQ_CMD_UKN_46 << 24 | 0x00020000, gSfxChannelLayout);
func_800F7170();
}
} else if (D_80133418 == 2) {
while (func_800E5EDC() != 1) {}
D_80133418 = 0;
} else if (gAudioSyncMode == 2) {
while (Audio_Sync() != 1) {}//Wait for audio sync
gAudioSyncMode = 0;
Audio_QueueCmdS8(SEQ_CMD_UKN_46 << 24 | 0x00020000, gSfxChannelLayout);
func_800F7170();
}
}
return D_80133418;
return gAudioSyncMode;
}
void Audio_ResetPlayers(void) {

11
src/code/audio_rsp.cpp
View File

@ -370,14 +370,7 @@ void Audio_QueueCmdU16(u32 opArgs, u16 data) {
}
s32 Audio_ScheduleProcessCmds(void) {
static s32 D_801304E8 = 0;
s32 ret;
if (D_801304E8 < (u8)((gAudioContext.cmdWrPos - gAudioContext.cmdRdPos) + 0x100)) {
D_801304E8 = (u8)((gAudioContext.cmdWrPos - gAudioContext.cmdRdPos) + 0x100);
}
ret =
s32 ret =
osSendMesg(gAudioContext.cmdProcQueueP,
(void*)(((gAudioContext.cmdRdPos & 0xFF) << 8) | (gAudioContext.cmdWrPos & 0xFF)), OS_MESG_NOBLOCK);
if (ret != -1) {
@ -475,7 +468,7 @@ void func_800E5EA4(s32 arg0, u32* arg1, u32* arg2) {
*arg2 = gAudioContext.soundFonts[arg0].sampleBankId2;
}
s32 func_800E5EDC(void) {
s32 Audio_Sync(void) {
s32 pad;
s32 sp18 = 0;

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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_ERROR, &gAudioDefaultPos, 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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_HP_RECOVER, &gAudioDefaultPos, 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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_LOCK_ON, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
} else if (dbCamera->unk_38 == -1) {
dbCamera->unk_38 = 1;
} else {
@ -945,21 +945,21 @@ 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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gAudioDefaultPos, 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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_CANCEL, &gAudioDefaultPos, 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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_ERROR, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
} else {
Audio_PlaySoundGeneral(NA_SE_IT_SWORD_PUTAWAY, &D_801333D4, 4, &D_801333E0, &D_801333E0,
Audio_PlaySoundGeneral(NA_SE_IT_SWORD_PUTAWAY, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0,
&gReverbAdd2);
func_800B42C0(dbCamera, cam);
if (dbCamera->sub.unkIdx == (dbCamera->sub.nPoints - 1)) {
@ -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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_GET_RUPY, &gAudioDefaultPos, 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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gAudioDefaultPos, 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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_IT_SWORD_IMPACT, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
if (dbCamera->sub.unkIdx > 0) {
dbCamera->sub.unkIdx--;
} else {
@ -1035,7 +1035,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,
Audio_PlaySoundGeneral(NA_SE_IT_SWORD_IMPACT, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0,
&gReverbAdd2);
if (dbCamera->sub.unkIdx > 0) {
dbCamera->sub.unkIdx--;
@ -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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_IT_SWORD_IMPACT, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
if (dbCamera->sub.unkIdx < (dbCamera->sub.nPoints - 1)) {
dbCamera->sub.unkIdx++;
} else {
@ -1065,7 +1065,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,
Audio_PlaySoundGeneral(NA_SE_IT_SWORD_IMPACT, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0,
&gReverbAdd2);
if (dbCamera->sub.unkIdx < (dbCamera->sub.nPoints - 1)) {
dbCamera->sub.unkIdx++;
@ -1139,7 +1139,7 @@ void DbCamera_Update(DbCamera* dbCamera, Camera* cam) {
case 1:
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,
Audio_PlaySoundGeneral(NA_SE_SY_ATTENTION_ON, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0,
&gReverbAdd2);
if (dbCamera->sub.unk_0A == 0) {
dbCamera->sub.unk_0A = 5;
@ -1148,7 +1148,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,
Audio_PlaySoundGeneral(NA_SE_SY_ATTENTION_ON, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0,
&gReverbAdd2);
if (dbCamera->sub.unk_0A == 5) {
dbCamera->sub.unk_0A = 0;
@ -1157,7 +1157,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,
Audio_PlaySoundGeneral(NA_SE_SY_ATTENTION_ON, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0,
&gReverbAdd2);
switch (dbCamera->sub.unk_0A) {
case 1:
@ -1207,7 +1207,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,
Audio_PlaySoundGeneral(NA_SE_SY_ATTENTION_ON, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0,
&gReverbAdd2);
}
@ -1245,7 +1245,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,
Audio_PlaySoundGeneral(NA_SE_SY_ATTENTION_ON, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0,
&gReverbAdd2);
switch (dbCamera->sub.unk_0A) {
@ -1294,7 +1294,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,
Audio_PlaySoundGeneral(NA_SE_SY_ATTENTION_ON, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0,
&gReverbAdd2);
}
@ -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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gAudioDefaultPos, 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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_GET_RUPY, &gAudioDefaultPos, 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++) {
@ -1843,7 +1843,7 @@ s32 DbCamera_UpdateDemoControl(DbCamera* dbCamera, Camera* cam) {
if ((1 << sCurFileIdx) & sMempakFiles) {
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,
Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0,
&gReverbAdd2);
dbCamera->sub.demoCtrlToggleSwitch ^= 1;
}
@ -1859,11 +1859,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,
Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0,
&gReverbAdd2);
dbCamera->sub.demoCtrlMenu++;
} else {
Audio_PlaySoundGeneral(NA_SE_SY_CANCEL, &D_801333D4, 4, &D_801333E0, &D_801333E0,
Audio_PlaySoundGeneral(NA_SE_SY_CANCEL, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0,
&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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_CANCEL, &gAudioDefaultPos, 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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &gAudioDefaultPos, 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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
dbCamera->sub.demoCtrlMenu -= 9;
}
block_2:
@ -1980,7 +1980,7 @@ s32 DbCamera_UpdateDemoControl(DbCamera* dbCamera, Camera* cam) {
sp74[i * 2 + 1] = '\0';
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,
Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0,
&gReverbAdd2);
if (sCurFileIdx >= 4) {
sCurFileIdx = 0;
@ -1997,7 +1997,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,
Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0,
&gReverbAdd2);
if (sCurFileIdx <= 0) {
sCurFileIdx = 4;
@ -2040,24 +2040,24 @@ s32 DbCamera_UpdateDemoControl(DbCamera* dbCamera, Camera* cam) {
func_8006376C(0x14, 0x1A, 5, D_8012CF70);
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,
Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0,
&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,
Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0,
&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,
Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0,
&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,
Audio_PlaySoundGeneral(NA_SE_SY_CANCEL, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0,
&gReverbAdd2);
dbCamera->sub.demoCtrlActionIdx = ACTION_E;
return 1;
@ -2070,7 +2070,7 @@ s32 DbCamera_UpdateDemoControl(DbCamera* dbCamera, Camera* cam) {
CHECK_BTN_ALL(sGlobalCtx->state.input[2].press.button, BTN_DUP) ||
CHECK_BTN_ALL(sGlobalCtx->state.input[2].press.button, BTN_DDOWN)) {
Audio_PlaySoundGeneral(NA_SE_SY_CANCEL, &D_801333D4, 4, &D_801333E0, &D_801333E0,
Audio_PlaySoundGeneral(NA_SE_SY_CANCEL, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0,
&gReverbAdd2);
dbCamera->sub.demoCtrlActionIdx = ACTION_E;
}
@ -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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gAudioDefaultPos, 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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gAudioDefaultPos, 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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_GET_RUPY, &gAudioDefaultPos, 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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_HP_RECOVER, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
if (CHECK_BTN_ALL(sGlobalCtx->state.input[2].press.button, BTN_L)) {
@ -2162,14 +2162,14 @@ s32 DbCamera_UpdateDemoControl(DbCamera* dbCamera, Camera* cam) {
if (sLastFileIdx != -1) {
switch (sp74[sCurFileIdx]) {
case '?':
Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &D_801333D4, 4, &D_801333E0, &D_801333E0,
Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0,
&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,
Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0,
&gReverbAdd2);
sp64 = sDbCameraCuts[idx2];
@ -2192,7 +2192,7 @@ s32 DbCamera_UpdateDemoControl(DbCamera* dbCamera, Camera* cam) {
}
break;
default:
Audio_PlaySoundGeneral(NA_SE_SY_ERROR, &D_801333D4, 4, &D_801333E0, &D_801333E0,
Audio_PlaySoundGeneral(NA_SE_SY_ERROR, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0,
&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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &gAudioDefaultPos, 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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_CANCEL, &gAudioDefaultPos, 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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &gAudioDefaultPos, 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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gAudioDefaultPos, 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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gAudioDefaultPos, 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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_GET_RUPY, &gAudioDefaultPos, 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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_HP_RECOVER, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
func_8006376C(4, 7, 5, D_8012CF50[0]);

2
src/code/game.cpp
View File

@ -490,7 +490,7 @@ void GameState_Init(GameState* gameState, GameStateFunc init, GraphicsContext* g
void GameState_Destroy(GameState* gameState) {
osSyncPrintf("game destructor start\n"); // "game destructor start"
Audio_StopAllBanks();
func_800F3054();
Audio_UpdateAll();
//osRecvMesg(&gameState->gfxCtx->queue, NULL, OS_MESG_BLOCK);
LogUtils_CheckNullPointer("this->cleanup", gameState->destroy, "../game.c", 1139);
if (gameState->destroy != NULL) {

2
src/code/graph.cpp
View File

@ -331,7 +331,7 @@ void Graph_Update(GraphicsContext* gfxCtx, GameState* gameState) {
gfxCtx->fbIdx++;
}
func_800F3054();
Audio_UpdateAll();
{
OSTime time = osGetTime();

6
src/code/z_actor.cpp
View File

@ -2270,7 +2270,7 @@ void func_80030ED8(Actor* actor) {
} else if (actor->flags & ACTOR_FLAG_21) {
func_800788CC(actor->sfx);
} else if (actor->flags & ACTOR_FLAG_28) {
func_800F4C58(&D_801333D4, NA_SE_SY_TIMER - SFX_FLAG, (s8)(actor->sfx - 1));
func_800F4C58(&gAudioDefaultPos, NA_SE_SY_TIMER - SFX_FLAG, (s8)(actor->sfx - 1));
} else {
func_80078914(&actor->projectedPos, actor->sfx);
}
@ -4966,7 +4966,7 @@ void func_80036E50(u16 textId, s16 arg1) {
Flags_SetInfTable(0xC);
return;
case 0x1033:
Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &D_801333D4, 4, &D_801333E0, &D_801333E0,
Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0,
&gReverbAdd2);
Flags_SetEventChkInf(0x4);
Flags_SetInfTable(0xE);
@ -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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_CANCEL, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
msgCtx->msgMode = MSGMODE_TEXT_CLOSING;
ret = true;
}

12
src/code/z_collision_check.cpp
View File

@ -1588,7 +1588,7 @@ 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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_IT_SHIELD_BOUND, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
} else {
Audio_PlaySoundGeneral(NA_SE_IT_SHIELD_BOUND, &collider->actor->projectedPos, 4, &D_801333E0, &D_801333E0,
&gReverbAdd2);
@ -1603,7 +1603,7 @@ 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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_IT_SHIELD_BOUND, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
} else {
Audio_PlaySoundGeneral(NA_SE_IT_SHIELD_BOUND, &collider->actor->projectedPos, 4, &D_801333E0, &D_801333E0,
&gReverbAdd2);
@ -1611,7 +1611,7 @@ void CollisionCheck_HitSolid(GlobalContext* globalCtx, ColliderInfo* info, Colli
} 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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_IT_REFLECTION_WOOD, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
} else {
Audio_PlaySoundGeneral(NA_SE_IT_REFLECTION_WOOD, &collider->actor->projectedPos, 4, &D_801333E0,
&D_801333E0, &gReverbAdd2);
@ -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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_IT_REFLECTION_WOOD, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
} else {
CollisionCheck_SpawnShieldParticlesWood(globalCtx, hitPos, &at->actor->projectedPos);
}
@ -1685,7 +1685,7 @@ 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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_IT_SHIELD_BOUND, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
} else {
Audio_PlaySoundGeneral(NA_SE_IT_SHIELD_BOUND, &ac->actor->projectedPos, 4, &D_801333E0, &D_801333E0,
&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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_IT_SHIELD_REFLECT_SW, &gAudioDefaultPos, 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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_PIECE_OF_HEART, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
temp = 1;
}
@ -1283,12 +1283,12 @@ void Cutscene_Command_TransitionFX(GlobalContext* globalCtx, CutsceneContext* cs
if (cmd->base == 1) {
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,
Audio_PlaySoundGeneral(NA_SE_SY_WHITE_OUT_S, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0,
&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,
Audio_PlaySoundGeneral(NA_SE_EV_WHITE_OUT, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0,
&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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_GET_RUPY, &gAudioDefaultPos, 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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_GET_ITEM, &gAudioDefaultPos, 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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_OC_SECRET_WARP_OUT, &gAudioDefaultPos, 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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_OC_SECRET_WARP_IN, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
}
pthis->texY += pthis->step * 3 / updateRate;

4
src/code/z_lib.cpp
View File

@ -582,11 +582,11 @@ 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, &gReverbAdd2);
Audio_PlaySoundGeneral(sfxId, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
void func_800788CC(u16 sfxId) {
Audio_PlaySoundGeneral(sfxId, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Audio_PlaySoundGeneral(sfxId, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
void func_80078914(Vec3f* arg0, u16 sfxId) {

8
src/code/z_map_exp.cpp
View File

@ -424,9 +424,9 @@ void Minimap_Draw(GlobalContext* globalCtx) {
if (CHECK_BTN_ALL(globalCtx->state.input[0].press.button, BTN_L) && !Gameplay_InCsMode(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,
if (!R_MINIMAP_DISABLED) { Audio_PlaySoundGeneral(NA_SE_SY_CAMERA_ZOOM_UP, &gAudioDefaultPos, 4,
&D_801333E0, &D_801333E0, &gReverbAdd2); }
else { Audio_PlaySoundGeneral(NA_SE_SY_CAMERA_ZOOM_DOWN, &D_801333D4, 4,
else { Audio_PlaySoundGeneral(NA_SE_SY_CAMERA_ZOOM_DOWN, &gAudioDefaultPos, 4,
&D_801333E0, &D_801333E0, &gReverbAdd2); }
// clang-format on
R_MINIMAP_DISABLED ^= 1;
@ -504,9 +504,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,
if (!R_MINIMAP_DISABLED) { Audio_PlaySoundGeneral(NA_SE_SY_CAMERA_ZOOM_UP, &gAudioDefaultPos, 4,
&D_801333E0, &D_801333E0, &gReverbAdd2); }
else { Audio_PlaySoundGeneral(NA_SE_SY_CAMERA_ZOOM_DOWN, &D_801333D4, 4,
else { Audio_PlaySoundGeneral(NA_SE_SY_CAMERA_ZOOM_DOWN, &gAudioDefaultPos, 4,
&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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_MESSAGE_PASS, &gAudioDefaultPos, 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, &gReverbAdd2);
Audio_PlaySoundGeneral(0, &gAudioDefaultPos, 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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gAudioDefaultPos, 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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gAudioDefaultPos, 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, &gReverbAdd2); }
if (msgCtx->msgMode == MSGMODE_TEXT_DISPLAYING) { Audio_PlaySoundGeneral(0, &gAudioDefaultPos, 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, &gReverbAdd2);
Audio_PlaySoundGeneral(0, &gAudioDefaultPos, 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, &gReverbAdd2);
Audio_PlaySoundGeneral(0, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
msgCtx->msgMode = MSGMODE_TEXT_DONE;
Font_LoadMessageBoxIcon(font, TEXTBOX_ICON_TRIANGLE);
}
@ -973,7 +973,7 @@ void Message_DrawText(GlobalContext* globalCtx, Gfx** gfxP) {
// "Sound (SE)"
osSyncPrintf("サウンド（ＳＥ）\n");
sfxHi = msgCtx->msgBufDecoded[i + 1] << 8;
Audio_PlaySoundGeneral(sfxHi | msgCtx->msgBufDecoded[i + 2], &D_801333D4, 4, &D_801333E0,
Audio_PlaySoundGeneral(sfxHi | msgCtx->msgBufDecoded[i + 2], &gAudioDefaultPos, 4, &D_801333E0,
&D_801333E0, &gReverbAdd2);
}
i += 2;
@ -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, &gReverbAdd2); }
if (msgCtx->msgMode == MSGMODE_TEXT_DISPLAYING) { Audio_PlaySoundGeneral(0, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2); }
// clang-format on
gDPPipeSync(gfx++);
gDPSetCombineMode(gfx++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM);
@ -1065,7 +1065,7 @@ void Message_DrawText(GlobalContext* globalCtx, Gfx** gfxP) {
if (msgCtx->msgMode == MSGMODE_TEXT_DISPLAYING) {
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,
Audio_PlaySoundGeneral(NA_SE_SY_MESSAGE_END, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0,
&gReverbAdd2);
Font_LoadMessageBoxIcon(font, TEXTBOX_ICON_SQUARE);
if (globalCtx->csCtx.state == 0) {
@ -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, &gReverbAdd2);
Audio_PlaySoundGeneral(0, &gAudioDefaultPos, 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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_MESSAGE_END, &gAudioDefaultPos, 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, &gReverbAdd2);
Audio_PlaySoundGeneral(0, &gAudioDefaultPos, 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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
if (ocarinaActionId == OCARINA_ACTION_SCARECROW_PLAYBACK) {
Message_OpenText(globalCtx, 0x86F); // Ocarina
@ -2080,7 +2080,7 @@ void Message_DrawMain(GlobalContext* globalCtx, Gfx** p) {
if (msgCtx->ocarinaStaff->state < OCARINA_SONG_SARIAS ||
msgCtx->ocarinaStaff->state == OCARINA_SONG_SCARECROW) {
Audio_OcaSetInstrument(0);
Audio_PlaySoundGeneral(NA_SE_SY_OCARINA_ERROR, &D_801333D4, 4, &D_801333E0, &D_801333E0,
Audio_PlaySoundGeneral(NA_SE_SY_OCARINA_ERROR, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0,
&gReverbAdd2);
msgCtx->msgMode = MSGMODE_OCARINA_STARTING;
} else {
@ -2090,14 +2090,14 @@ void Message_DrawMain(GlobalContext* globalCtx, Gfx** p) {
msgCtx->msgMode = MSGMODE_SONG_PLAYED;
msgCtx->textBoxType = TEXTBOX_TYPE_OCARINA;
msgCtx->stateTimer = 10;
Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &D_801333D4, 4, &D_801333E0,
Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &gAudioDefaultPos, 4, &D_801333E0,
&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,
Audio_PlaySoundGeneral(NA_SE_SY_OCARINA_ERROR, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0,
&gReverbAdd2);
msgCtx->stateTimer = 10;
msgCtx->msgMode = MSGMODE_OCARINA_FAIL;
@ -2108,7 +2108,7 @@ void Message_DrawMain(GlobalContext* globalCtx, Gfx** p) {
msgCtx->msgMode = MSGMODE_SONG_PLAYED;
msgCtx->textBoxType = TEXTBOX_TYPE_OCARINA;
msgCtx->stateTimer = 10;
Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &D_801333D4, 4, &D_801333E0,
Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &gAudioDefaultPos, 4, &D_801333E0,
&D_801333E0, &gReverbAdd2);
Interface_ChangeAlpha(1);
}
@ -2119,22 +2119,22 @@ void Message_DrawMain(GlobalContext* globalCtx, Gfx** p) {
msgCtx->msgMode = MSGMODE_SONG_PLAYED;
msgCtx->textBoxType = TEXTBOX_TYPE_OCARINA;
msgCtx->stateTimer = 10;
Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &D_801333D4, 4, &D_801333E0, &D_801333E0,
Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0,
&gReverbAdd2);
} else {
Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &D_801333D4, 4, &D_801333E0, &D_801333E0,
Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0,
&gReverbAdd2);
}
Interface_ChangeAlpha(1);
} else {
Audio_OcaSetInstrument(0);
Audio_PlaySoundGeneral(NA_SE_SY_OCARINA_ERROR, &D_801333D4, 4, &D_801333E0, &D_801333E0,
Audio_PlaySoundGeneral(NA_SE_SY_OCARINA_ERROR, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0,
&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,
Audio_PlaySoundGeneral(NA_SE_SY_OCARINA_ERROR, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0,
&gReverbAdd2);
msgCtx->stateTimer = 10;
msgCtx->msgMode = MSGMODE_OCARINA_FAIL;
@ -2510,10 +2510,10 @@ void Message_DrawMain(GlobalContext* globalCtx, Gfx** p) {
osSyncPrintf("z_message.c 取得メロディ＝%d\n", ITEM_SONG_MINUET + msgCtx->ocarinaStaff->state);
osSyncPrintf(VT_RST);
msgCtx->stateTimer = 20;
Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &D_801333D4, 4, &D_801333E0, &D_801333E0,
Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0,
&gReverbAdd2);
} else if (msgCtx->ocarinaStaff->state == 0xFF) {
Audio_PlaySoundGeneral(NA_SE_SY_OCARINA_ERROR, &D_801333D4, 4, &D_801333E0, &D_801333E0,
Audio_PlaySoundGeneral(NA_SE_SY_OCARINA_ERROR, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0,
&gReverbAdd2);
msgCtx->stateTimer = 10;
msgCtx->msgMode = MSGMODE_SONG_PLAYBACK_FAIL;
@ -2565,7 +2565,7 @@ void Message_DrawMain(GlobalContext* globalCtx, Gfx** p) {
msgCtx->ocarinaStaff->state);
gSaveContext.scarecrowCustomSongSet = true;
}
Audio_PlaySoundGeneral(NA_SE_SY_OCARINA_ERROR, &D_801333D4, 4, &D_801333E0, &D_801333E0,
Audio_PlaySoundGeneral(NA_SE_SY_OCARINA_ERROR, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0,
&gReverbAdd2);
osSyncPrintf("aaaaaaaaaaaaaa\n");
Audio_OcaSetRecordingState(0);
@ -2635,7 +2635,7 @@ void Message_DrawMain(GlobalContext* globalCtx, Gfx** p) {
msgCtx->stateTimer = 20;
gSaveContext.scarecrowSpawnSongSet = true;
msgCtx->msgMode = MSGMODE_SCARECROW_RECORDING_DONE;
Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &D_801333D4, 4, &D_801333E0, &D_801333E0,
Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0,
&gReverbAdd2);
osSyncPrintf(VT_FGCOL(YELLOW));
osSyncPrintf("\n====================================================================\n");
@ -2651,7 +2651,7 @@ void Message_DrawMain(GlobalContext* globalCtx, Gfx** p) {
// "Played an existing song！！！"
osSyncPrintf("すでに存在する曲吹いた！！！ \n");
Audio_OcaSetRecordingState(0);
Audio_PlaySoundGeneral(NA_SE_SY_OCARINA_ERROR, &D_801333D4, 4, &D_801333E0, &D_801333E0,
Audio_PlaySoundGeneral(NA_SE_SY_OCARINA_ERROR, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0,
&gReverbAdd2);
Message_CloseTextbox(globalCtx);
msgCtx->msgMode = MSGMODE_SCARECROW_RECORDING_FAILED;
@ -2677,7 +2677,7 @@ void Message_DrawMain(GlobalContext* globalCtx, Gfx** p) {
break;
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,
Audio_PlaySoundGeneral(NA_SE_SY_METRONOME_LV - SFX_FLAG, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0,
&gReverbAdd2);
msgCtx->ocarinaStaff = Audio_OcaGetDisplayingStaff();
if (msgCtx->ocarinaStaff->pos && sOcarinaNoteBufPos == msgCtx->ocarinaStaff->pos - 1) {
@ -2688,10 +2688,10 @@ void Message_DrawMain(GlobalContext* globalCtx, Gfx** p) {
if (msgCtx->stateTimer == 0) {
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,
Audio_PlaySoundGeneral(NA_SE_SY_METRONOME, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0,
&gReverbAdd2);
} else {
Audio_PlaySoundGeneral(NA_SE_SY_METRONOME_2, &D_801333D4, 4, &D_801333E0, &D_801333E0,
Audio_PlaySoundGeneral(NA_SE_SY_METRONOME_2, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0,
&gReverbAdd2);
}
msgCtx->msgMode++;
@ -2710,7 +2710,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,
Audio_PlaySoundGeneral(NA_SE_SY_METRONOME_LV - SFX_FLAG, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0,
&gReverbAdd2);
msgCtx->ocarinaStaff = Audio_OcaGetPlayingStaff();
if (msgCtx->ocarinaStaff->pos && sOcarinaNoteBufPos == msgCtx->ocarinaStaff->pos - 1) {
@ -2722,14 +2722,14 @@ void Message_DrawMain(GlobalContext* globalCtx, Gfx** p) {
// "Musical round failed！！！！！！！！！"
osSyncPrintf("輪唱失敗！！！！！！！！！\n");
Audio_OcaSetInstrument(0);
Audio_PlaySoundGeneral(NA_SE_SY_OCARINA_ERROR, &D_801333D4, 4, &D_801333E0, &D_801333E0,
Audio_PlaySoundGeneral(NA_SE_SY_OCARINA_ERROR, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0,
&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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_GET_ITEM, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
msgCtx->msgMode = MSGMODE_MEMORY_GAME_ROUND_SUCCESS;
msgCtx->stateTimer = 30;
}
@ -2745,7 +2745,7 @@ void Message_DrawMain(GlobalContext* globalCtx, Gfx** p) {
msgCtx->stateTimer--;
if (msgCtx->stateTimer == 0) {
if (Audio_OcaMemoryGameGenNote() != 1) {
Audio_PlaySoundGeneral(NA_SE_SY_METRONOME, &D_801333D4, 4, &D_801333E0, &D_801333E0,
Audio_PlaySoundGeneral(NA_SE_SY_METRONOME, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0,
&gReverbAdd2);
msgCtx->ocarinaStaff = Audio_OcaGetPlayingStaff();
msgCtx->ocarinaStaff->pos = sOcarinaNoteBufPos = 0;
@ -3190,11 +3190,11 @@ void Message_Update(GlobalContext* globalCtx) {
} else if (Message_ShouldAdvanceSilent(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,
Audio_PlaySoundGeneral(NA_SE_SY_MESSAGE_PASS, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0,
&gReverbAdd2);
Message_ContinueTextbox(globalCtx, sNextTextId);
} else {
Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Message_CloseTextbox(globalCtx);
}
}

44
src/code/z_parameter.cpp
View File

@ -2140,12 +2140,12 @@ void Interface_SetNaviCall(GlobalContext* globalCtx, u16 naviCallState) {
if (((naviCallState == 0x1D) || (naviCallState == 0x1E)) && !interfaceCtx->naviCalling &&
(globalCtx->csCtx.state == CS_STATE_IDLE)) {
// clang-format off
if (naviCallState == 0x1E) { Audio_PlaySoundGeneral(NA_SE_VO_NAVY_CALL, &D_801333D4, 4,
if (naviCallState == 0x1E) { Audio_PlaySoundGeneral(NA_SE_VO_NAVY_CALL, &gAudioDefaultPos, 4,
&D_801333E0, &D_801333E0, &gReverbAdd2); }
// clang-format on
if (naviCallState == 0x1D) {
func_800F4524(&D_801333D4, NA_SE_VO_NA_HELLO_2, 32);
func_800F4524(&gAudioDefaultPos, NA_SE_VO_NA_HELLO_2, 32);
}
interfaceCtx->naviCalling = 1;
@ -2183,7 +2183,7 @@ s32 Health_ChangeBy(GlobalContext* globalCtx, s16 healthChange) {
gSaveContext.healthCapacity);
// clang-format off
if (healthChange > 0) { Audio_PlaySoundGeneral(NA_SE_SY_HP_RECOVER, &D_801333D4, 4,
if (healthChange > 0) { Audio_PlaySoundGeneral(NA_SE_SY_HP_RECOVER, &gAudioDefaultPos, 4,
&D_801333E0, &D_801333E0, &gReverbAdd2);
} else if ((gSaveContext.doubleDefense != 0) && (healthChange < 0)) {
healthChange >>= 1;
@ -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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_ERROR, &gAudioDefaultPos, 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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_ERROR, &gAudioDefaultPos, 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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_ERROR, &gAudioDefaultPos, 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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_ERROR, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
return 0;
}
case 5:
@ -2429,7 +2429,7 @@ void Interface_UpdateMagicBar(GlobalContext* globalCtx) {
gSaveContext.magic += 4;
if (gSaveContext.gameMode == 0 && gSaveContext.sceneSetupIndex < 4) {
Audio_PlaySoundGeneral(NA_SE_SY_GAUGE_UP - SFX_FLAG, &D_801333D4, 4, &D_801333E0, &D_801333E0,
Audio_PlaySoundGeneral(NA_SE_SY_GAUGE_UP - SFX_FLAG, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0,
&gReverbAdd2);
}
@ -2511,7 +2511,7 @@ void Interface_UpdateMagicBar(GlobalContext* globalCtx) {
(gSaveContext.equips.buttonItems[3] != ITEM_LENS)) ||
(globalCtx->actorCtx.unk_03 == 0)) {
globalCtx->actorCtx.unk_03 = 0;
Audio_PlaySoundGeneral(NA_SE_SY_GLASSMODE_OFF, &D_801333D4, 4, &D_801333E0, &D_801333E0,
Audio_PlaySoundGeneral(NA_SE_SY_GLASSMODE_OFF, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0,
&gReverbAdd2);
gSaveContext.unk_13F0 = 0;
sMagicBorderR = sMagicBorderG = sMagicBorderB = 255;
@ -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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_GAUGE_UP - SFX_FLAG, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
if (gSaveContext.magic >= gSaveContext.unk_13F8) {
gSaveContext.magic = gSaveContext.unk_13F8;
gSaveContext.unk_13F0 = gSaveContext.unk_13F2;
@ -3549,16 +3549,16 @@ void Interface_Draw(GlobalContext* globalCtx) {
D_80125A5C = 0;
} else if (gSaveContext.timer1Value > 60) {
if (timerDigits[4] == 1) {
Audio_PlaySoundGeneral(NA_SE_SY_MESSAGE_WOMAN, &D_801333D4, 4, &D_801333E0,
Audio_PlaySoundGeneral(NA_SE_SY_MESSAGE_WOMAN, &gAudioDefaultPos, 4, &D_801333E0,
&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,
Audio_PlaySoundGeneral(NA_SE_SY_WARNING_COUNT_N, &gAudioDefaultPos, 4, &D_801333E0,
&D_801333E0, &gReverbAdd2);
}
} else {
Audio_PlaySoundGeneral(NA_SE_SY_WARNING_COUNT_E, &D_801333D4, 4, &D_801333E0,
Audio_PlaySoundGeneral(NA_SE_SY_WARNING_COUNT_E, &gAudioDefaultPos, 4, &D_801333E0,
&D_801333E0, &gReverbAdd2);
}
}
@ -3606,7 +3606,7 @@ void Interface_Draw(GlobalContext* globalCtx) {
D_8015FFE2 = 40;
gSaveContext.timer1State = 15;
} else {
Audio_PlaySoundGeneral(NA_SE_SY_WARNING_COUNT_N, &D_801333D4, 4, &D_801333E0,
Audio_PlaySoundGeneral(NA_SE_SY_WARNING_COUNT_N, &gAudioDefaultPos, 4, &D_801333E0,
&D_801333E0, &gReverbAdd2);
}
}
@ -3724,16 +3724,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,
Audio_PlaySoundGeneral(NA_SE_SY_MESSAGE_WOMAN, &gAudioDefaultPos, 4,
&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,
Audio_PlaySoundGeneral(NA_SE_SY_WARNING_COUNT_N, &gAudioDefaultPos, 4,
&D_801333E0, &D_801333E0, &gReverbAdd2);
}
} else {
Audio_PlaySoundGeneral(NA_SE_SY_WARNING_COUNT_E, &D_801333D4, 4,
Audio_PlaySoundGeneral(NA_SE_SY_WARNING_COUNT_E, &gAudioDefaultPos, 4,
&D_801333E0, &D_801333E0, &gReverbAdd2);
}
} else {
@ -3748,7 +3748,7 @@ void Interface_Draw(GlobalContext* globalCtx) {
}
if ((gSaveContext.timer2Value % 60) == 0) {
Audio_PlaySoundGeneral(NA_SE_SY_WARNING_COUNT_N, &D_801333D4, 4, &D_801333E0,
Audio_PlaySoundGeneral(NA_SE_SY_WARNING_COUNT_N, &gAudioDefaultPos, 4, &D_801333E0,
&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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_HP_RECOVER, &gAudioDefaultPos, 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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_RUPY_COUNT, &gAudioDefaultPos, 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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_RUPY_COUNT, &gAudioDefaultPos, 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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_RUPY_COUNT, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
} else {
gSaveContext.rupeeAccumulator = 0;

8
src/code/z_play.cpp
View File

@ -105,7 +105,7 @@ void func_800BC490(GlobalContext* globalCtx, s16 point) {
globalCtx->unk_1242B = 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,
Audio_PlaySoundGeneral((point == 1) ? NA_SE_SY_CAMERA_ZOOM_DOWN : NA_SE_SY_CAMERA_ZOOM_UP, &gAudioDefaultPos, 4,
&D_801333E0, &D_801333E0, &gReverbAdd2);
}
@ -780,7 +780,7 @@ void Gameplay_Update(GlobalContext* globalCtx) {
break;
case 13:
Audio_PlaySoundGeneral(NA_SE_EV_SAND_STORM - SFX_FLAG, &D_801333D4, 4, &D_801333E0, &D_801333E0,
Audio_PlaySoundGeneral(NA_SE_EV_SAND_STORM - SFX_FLAG, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0,
&gReverbAdd2);
if (globalCtx->sceneLoadFlag == -0x14) {
if (globalCtx->envCtx.sandstormPrimA < 110) {
@ -814,7 +814,7 @@ void Gameplay_Update(GlobalContext* globalCtx) {
break;
case 15:
Audio_PlaySoundGeneral(NA_SE_EV_SAND_STORM - SFX_FLAG, &D_801333D4, 4, &D_801333E0, &D_801333E0,
Audio_PlaySoundGeneral(NA_SE_EV_SAND_STORM - SFX_FLAG, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0,
&gReverbAdd2);
if (globalCtx->sceneLoadFlag == -0x14) {
if (globalCtx->envCtx.sandstormPrimA <= 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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_ERROR, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
} else {
func_800BC490(globalCtx, globalCtx->unk_1242B ^ 3);
}

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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &gAudioDefaultPos, 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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
Actor_Kill(&pthis->dyna.actor);

6
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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &gAudioDefaultPos, 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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &gAudioDefaultPos, 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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_ERROR, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
sTimer += 30;
return;
}

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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_EV_RED_EYE, &gAudioDefaultPos, 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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_EV_RED_EYE, &gAudioDefaultPos, 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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &gAudioDefaultPos, 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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &gAudioDefaultPos, 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_Spot01_Idomizu/z_bg_spot01_idomizu.cpp
View File

@ -63,7 +63,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,
Audio_PlaySoundGeneral(NA_SE_EV_WATER_LEVEL_DOWN - SFX_FLAG, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0,
&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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &gAudioDefaultPos, 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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_EV_WOODDOOR_OPEN, &gAudioDefaultPos, 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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_EV_WOODDOOR_OPEN, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
BgTreemouth_SetupAction(pthis, func_808BC6F8);
}
}

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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_EV_SARIA_MELODY, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
break;
case DEMOKANKYO_SPARKLES:
@ -836,7 +836,7 @@ void DemoKankyo_DrawWarpSparkles(Actor* thisx, GlobalContext* globalCtx) {
pthis->unk_150[i].unk_22++;
}
} else {
Audio_PlaySoundGeneral(NA_SE_EV_LINK_WARP_OUT - SFX_FLAG, &D_801333D4, 4, &D_801333E0, &D_801333E0,
Audio_PlaySoundGeneral(NA_SE_EV_LINK_WARP_OUT - SFX_FLAG, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0,
&gReverbAdd2);
if (func_800BB2B4(&camPos, &sWarpRoll_90, &sWarpFoV_90, sWarpInCameraPoints, &pthis->unk_150[i].unk_20,
&pthis->unk_150[i].unk_1C) != 0) {

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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
func_8002F5F0(&pthis->actor, globalCtx);
}

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

@ -172,7 +172,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,
Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0,
&gReverbAdd2);
pthis->prize = DNT_PRIZE_NUTS;
pthis->leader->stageSignal = DNT_LEADER_SIGNAL_UP;

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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &gAudioDefaultPos, 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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
globalCtx->csCtx.segment = SEGMENTED_TO_VIRTUAL(gGoronCityDaruniaCorrectCs);
gSaveContext.cutsceneTrigger = 1;
pthis->unk_1E8 = 0;

2
src/overlays/actors/ovl_En_Elf/z_en_elf.cpp
View File

@ -1408,7 +1408,7 @@ void func_80A053F0(Actor* thisx, GlobalContext* globalCtx) {
}
if (Actor_ProcessTalkRequest(thisx, globalCtx)) {
func_800F4524(&D_801333D4, NA_SE_VO_SK_LAUGH, 0x20);
func_800F4524(&gAudioDefaultPos, NA_SE_VO_SK_LAUGH, 0x20);
thisx->focus.pos = thisx->world.pos;
if (thisx->textId == ElfMessage_GetCUpText(globalCtx)) {

2
src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.cpp
View File

@ -226,7 +226,7 @@ void EnGSwitch_SilverRupeeTracker(EnGSwitch* pthis, GlobalContext* globalCtx) {
if (sCollectedCount < 5) {
// "sound?"
osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 音？ ☆☆☆☆☆ %d\n" VT_RST, pthis->noteIndex);
Audio_PlaySoundTransposed(&D_801333D4, NA_SE_EV_FIVE_COUNT_LUPY, majorScale_50[pthis->noteIndex]);
Audio_PlaySoundTransposed(&gAudioDefaultPos, NA_SE_EV_FIVE_COUNT_LUPY, majorScale_50[pthis->noteIndex]);
pthis->noteIndex = sCollectedCount;
}
}

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

@ -1400,7 +1400,7 @@ void EnGeldB_CollisionCheck(EnGeldB* pthis, GlobalContext* globalCtx) {
if (key != NULL) {
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,
Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0,
&gReverbAdd2);
}
}

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

@ -605,11 +605,11 @@ s16 EnGo2_GetStateGoronDmtBiggoron(GlobalContext* globalCtx, EnGo2* pthis) {
}
case 0x3059:
if (dialogState == TEXT_STATE_NONE) {
func_800F4524(&D_801333D4, NA_SE_EN_GOLON_WAKE_UP, 60);
func_800F4524(&gAudioDefaultPos, NA_SE_EN_GOLON_WAKE_UP, 60);
}
case 0x3054:
if (dialogState == TEXT_STATE_NONE) {
Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &D_801333D4, 4, &D_801333E0, &D_801333E0,
Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0,
&gReverbAdd2);
}
}
@ -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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
pthis->actor.flags &= ~ACTOR_FLAG_24;
pthis->collider.base.acFlags &= ~0x2;
EnGo2_StopRolling(pthis, globalCtx);
@ -1265,7 +1265,7 @@ void EnGo2_SitDownAnimation(EnGo2* pthis) {
if ((pthis->actor.params & 0x1F) != GORON_DMT_BIGGORON) {
Audio_PlayActorSound2(&pthis->actor, NA_SE_EN_GOLON_SIT_DOWN);
} else {
func_800F4524(&D_801333D4, NA_SE_EN_GOLON_SIT_DOWN, 60);
func_800F4524(&gAudioDefaultPos, NA_SE_EN_GOLON_SIT_DOWN, 60);
}
}
if (pthis->skelAnime.playSpeed < 0.0f) {
@ -1308,7 +1308,7 @@ void EnGo2_WakeUp(EnGo2* pthis, GlobalContext* globalCtx) {
if ((pthis->actor.params & 0x1F) != GORON_DMT_BIGGORON) {
Audio_PlayActorSound2(&pthis->actor, NA_SE_EN_GOLON_WAKE_UP);
} else {
func_800F4524(&D_801333D4, NA_SE_EN_GOLON_WAKE_UP, 60);
func_800F4524(&gAudioDefaultPos, NA_SE_EN_GOLON_WAKE_UP, 60);
}
}
if ((pthis->actor.params & 0x1F) == GORON_DMT_BIGGORON) {
@ -1492,7 +1492,7 @@ void EnGo2_BiggoronAnimation(EnGo2* pthis) {
(pthis->actor.params & 0x1F) == GORON_DMT_BIGGORON && pthis->unk_194.unk_00 == 0) {
if (DECR(pthis->animTimer) == 0) {
pthis->animTimer = Rand_S16Offset(30, 30);
func_800F4524(&D_801333D4, NA_SE_EN_GOLON_EYE_BIG, 60);
func_800F4524(&gAudioDefaultPos, NA_SE_EN_GOLON_EYE_BIG, 60);
}
}
}
@ -1823,10 +1823,10 @@ void EnGo2_BiggoronEyedrops(EnGo2* pthis, GlobalContext* globalCtx) {
if (DECR(pthis->animTimer)) {
if (pthis->animTimer == 60 || pthis->animTimer == 120) {
func_8005B1A4(GET_ACTIVE_CAM(globalCtx));
func_800F4524(&D_801333D4, NA_SE_EV_GORON_WATER_DROP, 60);
func_800F4524(&gAudioDefaultPos, NA_SE_EV_GORON_WATER_DROP, 60);
}
} else {
func_800F4524(&D_801333D4, NA_SE_EN_GOLON_GOOD_BIG, 60);
func_800F4524(&gAudioDefaultPos, NA_SE_EN_GOLON_GOOD_BIG, 60);
func_80034EC0(&pthis->skelAnime, sAnimations, 6);
Message_ContinueTextbox(globalCtx, 0x305A);
pthis->eyeMouthTexState = 3;

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

@ -348,13 +348,13 @@ void func_80A4ED34(EnGs* pthis, GlobalContext* globalCtx) {
if (pthis->unk_200 < 20) {
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,
Audio_PlaySoundGeneral(NA_SE_SY_WARNING_COUNT_E, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0,
&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,
Audio_PlaySoundGeneral(NA_SE_SY_WARNING_COUNT_N, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0,
&gReverbAdd2);
}
}

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

@ -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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_CARROT_RECOVER, &gAudioDefaultPos, 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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_CARROT_RECOVER, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
}
}

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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_START_SHOT, &gAudioDefaultPos, 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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_START_SHOT, &gAudioDefaultPos, 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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_START_SHOT, &gAudioDefaultPos, 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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_START_SHOT, &gAudioDefaultPos, 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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_START_SHOT, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
pthis->result = MALONRACE_SUCCESS;
pthis->finishTimer = 70;
gSaveContext.timer1State = 0xF;

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, &gReverbAdd2);
&gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
pthis->unk_215 = true;
}
break;

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

@ -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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_FOUND, &gAudioDefaultPos, 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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_FOUND, &gAudioDefaultPos, 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

@ -691,7 +691,7 @@ void EnKanban_Update(Actor* thisx, GlobalContext* globalCtx2) {
(globalCtx->msgCtx.unk_E3F2 == OCARINA_SONG_LULLABY)) {
pthis->actionState = ENKANBAN_REPAIR;
pthis->bounceX = 1;
Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &D_801333D4, 4, &D_801333E0, &D_801333E0,
Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0,
&gReverbAdd2);
}
break;

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

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

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

@ -156,12 +156,12 @@ s16 func_80A9C6C0(GlobalContext* globalCtx, Actor* thisx) {
case TEXT_STATE_DONE_FADING:
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,
Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0,
&gReverbAdd2);
pthis->sfxPlayed = true;
}
} else if (!pthis->sfxPlayed) {
Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
pthis->sfxPlayed = true;
}
break;

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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &gAudioDefaultPos, 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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_PIECE_OF_HEART, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
pthis->mainAlpha = 210;
pthis->subAlpha = 255;
@ -191,7 +191,7 @@ void EnMag_Update(Actor* thisx, GlobalContext* globalCtx) {
if (globalCtx->sceneLoadFlag != 20) {
Audio_SetCutsceneFlag(0);
Audio_PlaySoundGeneral(NA_SE_SY_PIECE_OF_HEART, &D_801333D4, 4, &D_801333E0, &D_801333E0,
Audio_PlaySoundGeneral(NA_SE_SY_PIECE_OF_HEART, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0,
&gReverbAdd2);
gSaveContext.gameMode = 2;

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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &gAudioDefaultPos, 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_River_Sound/z_en_river_sound.cpp
View File

@ -247,7 +247,7 @@ void EnRiverSound_Draw(Actor* thisx, GlobalContext* globalCtx) {
(pthis->actor.params == RS_UNK_5)) {
Audio_PlaySoundRiver(&pthis->actor.projectedPos, soundPitch_23[pthis->soundPitchIndex]);
} else if (pthis->actor.params == RS_UNK_11) {
func_800F4A54(90);
Audio_RequestBgmVolumeChange(90);
} else if (pthis->actor.params == RS_SARIAS_SONG) {
func_800F4E30(&pthis->actor.projectedPos, pthis->actor.xzDistToPlayer);
} else if (pthis->actor.params == RS_UNK_13) {

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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &gAudioDefaultPos, 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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_KINSTA_MARK_APPEAR, &gAudioDefaultPos, 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_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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
} else {
/* Rupee */
Audio_PlayActorSound2(&pthis->actor, NA_SE_SY_TRE_BOX_APPEAR);

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

@ -140,7 +140,7 @@ void EnTr_CrySpellcast(EnTr* pthis, GlobalContext* globalCtx) {
if (pthis->timer == 11) {
// 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,
Audio_PlaySoundGeneral(NA_SE_EN_TWINROBA_SHOOT_VOICE, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0,
&gReverbAdd2);
}
}

6
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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_DEMO_CUT, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
break;
}
}
@ -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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_EN_GANON_LAUGH, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Animation_MorphToPlayOnce(&pthis->skin.skelAnime, &object_gndd_Anim_004534, -5.0f);
pthis->state++;
}
@ -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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_EV_BURNING - SFX_FLAG, &gAudioDefaultPos, 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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_OC_REVENGE, &gAudioDefaultPos, 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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_OC_ABYSS, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Gameplay_TriggerVoidOut(globalCtx);
Actor_Kill(&pthis->actor);
}

2
src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.cpp
View File

@ -240,7 +240,7 @@ void ObjectKankyo_Fairies(ObjectKankyo* pthis, GlobalContext* globalCtx) {
break;
case 583:
func_800F4524(&D_801333D4, NA_SE_VO_NA_HELLO_2, 32);
func_800F4524(&gAudioDefaultPos, NA_SE_VO_NA_HELLO_2, 32);
break;
case 763:

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

@ -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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_GET_BOXITEM, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
} else {
if ((pthis->getItemId == GI_HEART_CONTAINER_2) || (pthis->getItemId == GI_HEART_CONTAINER) ||
((pthis->getItemId == GI_HEART_PIECE) &&

24
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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &gAudioDefaultPos, 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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &gAudioDefaultPos, 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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_ERROR, &gAudioDefaultPos, 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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &gAudioDefaultPos, 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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_ERROR, &gAudioDefaultPos, 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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &gAudioDefaultPos, 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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
pthis->selectMode = SM_FADE_OUT;
Audio_FadeOutMostSFX(0xF);
} else {
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CLOSE, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CLOSE, &gAudioDefaultPos, 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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CLOSE, &gAudioDefaultPos, 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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &gAudioDefaultPos, 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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &gAudioDefaultPos, 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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
gSaveContext.fileNum = pthis->buttonIndex;
Sram_OpenSave(&pthis->sramCtx);
gSaveContext.gameMode = 0;

44
src/overlays/gamestates/ovl_file_choose/z_file_copy_erase.cpp
View File

@ -79,20 +79,20 @@ void FileChoose_SelectCopySource(GameState* thisx) {
pthis->nextTitleLabel = FS_TITLE_SELECT_FILE;
pthis->configMode = CM_COPY_RETURN_MAIN;
pthis->warningLabel = FS_WARNING_NONE;
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CLOSE, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CLOSE, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
} else if (CHECK_BTN_ANY(input->press.button, BTN_A | BTN_START)) {
if (SLOT_OCCUPIED(sramCtx, pthis->buttonIndex)) {
pthis->actionTimer = 8;
pthis->selectedFileIndex = pthis->buttonIndex;
pthis->configMode = CM_SETUP_COPY_DEST_1;
pthis->nextTitleLabel = FS_TITLE_COPY_TO;
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
} else {
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_ERROR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_ERROR, &gAudioDefaultPos, 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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
if (pthis->stickRelY >= 30) {
pthis->buttonIndex--;
@ -190,21 +190,21 @@ void FileChoose_SelectCopyDest(GameState* thisx) {
pthis->nextTitleLabel = FS_TITLE_COPY_FROM;
pthis->actionTimer = 8;
pthis->configMode = CM_EXIT_TO_COPY_SOURCE_1;
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CLOSE, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CLOSE, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
} else if (CHECK_BTN_ANY(input->press.button, BTN_A | BTN_START)) {
if (!SLOT_OCCUPIED(sramCtx, pthis->buttonIndex)) {
pthis->copyDestFileIndex = pthis->buttonIndex;
pthis->nextTitleLabel = FS_TITLE_COPY_CONFIRM;
pthis->actionTimer = 8;
pthis->configMode = CM_SETUP_COPY_CONFIRM_1;
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
} else {
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_ERROR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_ERROR, &gAudioDefaultPos, 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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
if (pthis->stickRelY >= 30) {
pthis->buttonIndex--;
@ -375,7 +375,7 @@ void FileChoose_CopyConfirm(GameState* thisx) {
pthis->actionTimer = 8;
pthis->nextTitleLabel = FS_TITLE_COPY_TO;
pthis->configMode = CM_RETURN_TO_COPY_DEST;
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CLOSE, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CLOSE, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
} else if (CHECK_BTN_ANY(input->press.button, BTN_A | BTN_START)) {
dayTime = gSaveContext.dayTime;
Sram_CopySave(pthis, sramCtx);
@ -385,9 +385,9 @@ void FileChoose_CopyConfirm(GameState* thisx) {
pthis->actionTimer = 8;
pthis->configMode = CM_COPY_ANIM_1;
Rumble_Shake(300.0f, 0xB4, 0x14, 0x64);
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &gAudioDefaultPos, 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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
pthis->buttonIndex ^= 1;
}
}
@ -498,7 +498,7 @@ void FileChoose_CopyAnim3(GameState* thisx) {
if (pthis->actionTimer == 75) {
pthis->connectorAlpha[pthis->copyDestFileIndex] = 255;
Audio_PlaySoundGeneral(NA_SE_EV_DIAMOND_SWITCH, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_EV_DIAMOND_SWITCH, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
pthis->actionTimer--;
@ -508,7 +508,7 @@ void FileChoose_CopyAnim3(GameState* thisx) {
pthis->actionTimer = 8;
pthis->nextTitleLabel = FS_TITLE_SELECT_FILE;
pthis->configMode++;
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
}
}
@ -697,20 +697,20 @@ void FileChoose_EraseSelect(GameState* thisx) {
pthis->nextTitleLabel = FS_TITLE_SELECT_FILE;
pthis->configMode = CM_EXIT_ERASE_TO_MAIN;
pthis->warningLabel = FS_WARNING_NONE;
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CLOSE, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CLOSE, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
} else if (CHECK_BTN_ANY(input->press.button, BTN_A | BTN_START)) {
if (SLOT_OCCUPIED(sramCtx, pthis->buttonIndex)) {
pthis->actionTimer = 8;
pthis->selectedFileIndex = pthis->buttonIndex;
pthis->configMode = CM_SETUP_ERASE_CONFIRM_1;
pthis->nextTitleLabel = FS_TITLE_ERASE_CONFIRM;
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
} else {
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_ERROR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_ERROR, &gAudioDefaultPos, 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, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
if (pthis->stickRelY >= 30) {
pthis->buttonIndex--;
@ -833,17 +833,17 @@ void FileChoose_EraseConfirm(GameState* thisx) {
pthis->nextTitleLabel = FS_TITLE_ERASE_FILE;
pthis->configMode = CM_EXIT_TO_ERASE_SELECT_1;
pthis->actionTimer = 8;
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CLOSE, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CLOSE, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
} else if (CHECK_BTN_ANY(input->press.button, BTN_A | BTN_START)) {
pthis->n64ddFlags[pthis->selectedFileIndex] = pthis->connectorAlpha[pthis->selectedFileIndex] = 0;
Audio_PlaySoundGeneral(NA_SE_EV_DIAMOND_SWITCH, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_EV_DIAMOND_SWITCH, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
pthis->actionTimer = 8;
pthis->configMode = CM_ERASE_ANIM_1;
pthis->nextTitleLabel = FS_TITLE_ERASE_COMPLETE;
Rumble_Shake(200.0f, 0xFF, 0x14, 0x96);
sEraseDelayTimer = 15;
} else if (ABS(pthis->stickRelY) >= 30) {
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
pthis->buttonIndex ^= 1;
}
}
@ -957,7 +957,7 @@ void FileChoose_EraseAnim1(GameState* thisx) {
sEraseDelayTimer--;
if (sEraseDelayTimer == 0) {
Audio_PlaySoundGeneral(NA_SE_OC_ABYSS, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_OC_ABYSS, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
}
}
@ -975,7 +975,7 @@ void FileChoose_EraseAnim2(GameState* thisx) {
pthis->actionTimer = 8;
pthis->nextTitleLabel = FS_TITLE_SELECT_FILE;
pthis->configMode++;
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CLOSE, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CLOSE, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
}

42
src/overlays/gamestates/ovl_file_choose/z_file_nameset_PAL.cpp
View File

@ -360,7 +360,7 @@ void FileChoose_DrawNameEntry(GameState* thisx) {
if (pthis->configMode == CM_NAME_ENTRY) {
if (CHECK_BTN_ALL(input->press.button, BTN_START)) {
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
// place cursor on END button
pthis->kbdY = 5;
pthis->kbdX = 4;
@ -371,7 +371,7 @@ void FileChoose_DrawNameEntry(GameState* thisx) {
}
pthis->fileNames[pthis->buttonIndex][i] = 0x3E;
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_S, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_S, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
} else {
pthis->newFileNameCharCount--;
@ -384,7 +384,7 @@ void FileChoose_DrawNameEntry(GameState* thisx) {
}
pthis->fileNames[pthis->buttonIndex][i] = 0x3E;
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_S, &D_801333D4, 4, &D_801333E0, &D_801333E0,
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_S, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0,
&gReverbAdd2);
}
}
@ -399,7 +399,7 @@ void FileChoose_DrawNameEntry(GameState* thisx) {
font->fontBuf + D_808123F0[pthis->charIndex] * FONT_CHAR_TEX_SIZE, 0);
if (CHECK_BTN_ALL(input->press.button, BTN_A)) {
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_S, &D_801333D4, 4, &D_801333E0, &D_801333E0,
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_S, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0,
&gReverbAdd2);
pthis->fileNames[pthis->buttonIndex][pthis->newFileNameCharCount] = D_808123F0[pthis->charIndex];
pthis->newFileNameCharCount++;
@ -416,7 +416,7 @@ void FileChoose_DrawNameEntry(GameState* thisx) {
}
pthis->fileNames[pthis->buttonIndex][i] = 0x3E;
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_S, &D_801333D4, 4, &D_801333E0, &D_801333E0,
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_S, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0,
&gReverbAdd2);
} else {
pthis->newFileNameCharCount--;
@ -430,7 +430,7 @@ void FileChoose_DrawNameEntry(GameState* thisx) {
}
pthis->fileNames[pthis->buttonIndex][i] = 0x3E;
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_S, &D_801333D4, 4, &D_801333E0, &D_801333E0,
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_S, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0,
&gReverbAdd2);
}
} else if (pthis->kbdButton == FS_KBD_BTN_END) {
@ -444,7 +444,7 @@ void FileChoose_DrawNameEntry(GameState* thisx) {
}
if (validName) {
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &D_801333D4, 4, &D_801333E0, &D_801333E0,
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0,
&gReverbAdd2);
gSaveContext.fileNum = pthis->buttonIndex;
dayTime = ((void)0, gSaveContext.dayTime);
@ -455,21 +455,21 @@ void FileChoose_DrawNameEntry(GameState* thisx) {
pthis->connectorAlpha[pthis->buttonIndex] = 255;
Rumble_Shake(300.0f, 0xB4, 0x14, 0x64);
} else {
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_ERROR, &D_801333D4, 4, &D_801333E0, &D_801333E0,
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_ERROR, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0,
&gReverbAdd2);
}
}
}
if (CHECK_BTN_ALL(input->press.button, BTN_CRIGHT)) {
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
pthis->newFileNameCharCount++;
if (pthis->newFileNameCharCount > 7) {
pthis->newFileNameCharCount = 7;
}
} else if (CHECK_BTN_ALL(input->press.button, BTN_CLEFT)) {
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
pthis->newFileNameCharCount--;
if (pthis->newFileNameCharCount < 0) {
@ -526,7 +526,7 @@ void FileChoose_UpdateKeyboardCursor(GameState* thisx) {
if (pthis->kbdY != 5) {
if (pthis->stickRelX < -30) {
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
pthis->charIndex--;
pthis->kbdX--;
if (pthis->kbdX < 0) {
@ -534,7 +534,7 @@ void FileChoose_UpdateKeyboardCursor(GameState* thisx) {
pthis->charIndex = (pthis->kbdY * 13) + pthis->kbdX;
}
} else if (pthis->stickRelX > 30) {
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
pthis->charIndex++;
pthis->kbdX++;
if (pthis->kbdX > 12) {
@ -544,13 +544,13 @@ void FileChoose_UpdateKeyboardCursor(GameState* thisx) {
}
} else {
if (pthis->stickRelX < -30) {
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
pthis->kbdX--;
if (pthis->kbdX < 3) {
pthis->kbdX = 4;
}
} else if (pthis->stickRelX > 30) {
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
pthis->kbdX++;
if (pthis->kbdX > 4) {
pthis->kbdX = 3;
@ -559,7 +559,7 @@ void FileChoose_UpdateKeyboardCursor(GameState* thisx) {
}
if (pthis->stickRelY > 30) {
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
pthis->kbdY--;
if (pthis->kbdY < 0) {
@ -590,7 +590,7 @@ void FileChoose_UpdateKeyboardCursor(GameState* thisx) {
}
}
} else if (pthis->stickRelY < -30) {
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
pthis->kbdY++;
if (pthis->kbdY > 5) {
@ -668,7 +668,7 @@ void FileChoose_UpdateOptionsMenu(GameState* thisx) {
Input* input = &pthis->state.input[0];
if (CHECK_BTN_ALL(input->press.button, BTN_B)) {
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
pthis->configMode = CM_OPTIONS_TO_MAIN;
sramCtx->readBuff[0] = gSaveContext.audioSetting;
sramCtx->readBuff[1] = gSaveContext.zTargetSetting;
@ -687,7 +687,7 @@ void FileChoose_UpdateOptionsMenu(GameState* thisx) {
}
if (pthis->stickRelX < -30) {
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
if (sSelectedSetting == FS_SETTING_AUDIO) {
gSaveContext.audioSetting--;
@ -700,7 +700,7 @@ void FileChoose_UpdateOptionsMenu(GameState* thisx) {
gSaveContext.zTargetSetting ^= 1;
}
} else if (pthis->stickRelX > 30) {
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
if (sSelectedSetting == FS_SETTING_AUDIO) {
gSaveContext.audioSetting++;
@ -714,10 +714,10 @@ void FileChoose_UpdateOptionsMenu(GameState* thisx) {
}
if ((pthis->stickRelY < -30) || (pthis->stickRelY > 30)) {
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
sSelectedSetting ^= 1;
} else if (CHECK_BTN_ALL(input->press.button, BTN_A)) {
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
sSelectedSetting ^= 1;
}
}

12
src/overlays/gamestates/ovl_select/z_select.cpp
View File

@ -410,13 +410,13 @@ void Select_UpdateMenu(SelectContext* pthis) {
if (pthis->timerUp == 0) {
pthis->timerUp = 20;
pthis->lockUp = true;
Audio_PlaySoundGeneral(NA_SE_IT_SWORD_IMPACT, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_IT_SWORD_IMPACT, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
pthis->verticalInput = FRAMERATE_RATE_SCALED;
}
}
if (CHECK_BTN_ALL(input->cur.button, BTN_CUP) && pthis->timerUp == 0) {
Audio_PlaySoundGeneral(NA_SE_IT_SWORD_IMPACT, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_IT_SWORD_IMPACT, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
pthis->verticalInput = FRAMERATE_RATE_SCALE(R_UPDATE_RATE * 3);
}
@ -427,23 +427,23 @@ void Select_UpdateMenu(SelectContext* pthis) {
if (pthis->timerDown == 0) {
pthis->timerDown = 20;
pthis->lockDown = true;
Audio_PlaySoundGeneral(NA_SE_IT_SWORD_IMPACT, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_IT_SWORD_IMPACT, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
pthis->verticalInput = -FRAMERATE_RATE_SCALED;
}
}
if (CHECK_BTN_ALL(input->cur.button, BTN_CDOWN) && (pthis->timerDown == 0)) {
Audio_PlaySoundGeneral(NA_SE_IT_SWORD_IMPACT, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_IT_SWORD_IMPACT, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
pthis->verticalInput = -FRAMERATE_RATE_SCALE(R_UPDATE_RATE * 3);
}
if (CHECK_BTN_ALL(input->press.button, BTN_CLEFT) || CHECK_BTN_ALL(input->cur.button, BTN_CLEFT)) {
Audio_PlaySoundGeneral(NA_SE_IT_SWORD_IMPACT, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_IT_SWORD_IMPACT, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
pthis->verticalInput = FRAMERATE_RATE_SCALED;
}
if (CHECK_BTN_ALL(input->press.button, BTN_CRIGHT) || CHECK_BTN_ALL(input->cur.button, BTN_CRIGHT)) {
Audio_PlaySoundGeneral(NA_SE_IT_SWORD_IMPACT, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_IT_SWORD_IMPACT, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
pthis->verticalInput = -FRAMERATE_RATE_SCALED;
}
}

6
src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.cpp
View File

@ -144,7 +144,7 @@ void KaleidoScope_DrawQuestStatus(GlobalContext* globalCtx, GraphicsContext* gfx
if (phi_s3 != pauseCtx->cursorPoint[PAUSE_QUEST]) {
pauseCtx->unk_1E4 = 0;
Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
if (pauseCtx->cursorPoint[PAUSE_QUEST] != 0x18) {
@ -228,7 +228,7 @@ void KaleidoScope_DrawQuestStatus(GlobalContext* globalCtx, GraphicsContext* gfx
pauseCtx->cursorSpecialPos = 0;
sp216 = pauseCtx->cursorPoint[PAUSE_QUEST];
KaleidoScope_SetCursorVtx(pauseCtx, sp216 * 4, pauseCtx->questVtx);
Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
if (CHECK_QUEST_ITEM(pauseCtx->cursorPoint[PAUSE_QUEST])) {
phi_s0_2 = pauseCtx->cursorPoint[PAUSE_QUEST] + 0x5A;
} else {
@ -245,7 +245,7 @@ void KaleidoScope_DrawQuestStatus(GlobalContext* globalCtx, GraphicsContext* gfx
pauseCtx->cursorSpecialPos = 0;
sp216 = pauseCtx->cursorPoint[PAUSE_QUEST];
KaleidoScope_SetCursorVtx(pauseCtx, sp216 * 4, pauseCtx->questVtx);
Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
if (CHECK_QUEST_ITEM(pauseCtx->cursorPoint[PAUSE_QUEST])) {
if (pauseCtx->cursorPoint[PAUSE_QUEST] < 6) {
phi_s0_2 = pauseCtx->cursorPoint[PAUSE_QUEST] + 0x66;

10
src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.cpp
View File

@ -310,7 +310,7 @@ void KaleidoScope_DrawEquipment(GlobalContext* globalCtx) {
pauseCtx->nameDisplayTimer = 0;
pauseCtx->cursorSpecialPos = 0;
Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
cursorPoint = cursorX = cursorY = 0;
while (true) {
@ -356,7 +356,7 @@ void KaleidoScope_DrawEquipment(GlobalContext* globalCtx) {
if (pauseCtx->stickRelX < -30) {
pauseCtx->nameDisplayTimer = 0;
pauseCtx->cursorSpecialPos = 0;
Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
cursorPoint = cursorX = 3;
cursorY = 0;
@ -495,16 +495,16 @@ void KaleidoScope_DrawEquipment(GlobalContext* globalCtx) {
Interface_LoadItemIcon1(globalCtx, 0);
}
Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
pauseCtx->unk_1E4 = 7;
sEquipTimer = 10;
} else {
Audio_PlaySoundGeneral(NA_SE_SY_ERROR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_ERROR, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
}
if (oldCursorPoint != pauseCtx->cursorPoint[PAUSE_EQUIP]) {
Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
} else if ((pauseCtx->unk_1E4 == 7) && (pauseCtx->pageIndex == PAUSE_EQUIP)) {
KaleidoScope_SetCursorVtx(pauseCtx, pauseCtx->cursorSlot[PAUSE_EQUIP] * 4, pauseCtx->equipVtx);

14
src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.cpp
View File

@ -217,7 +217,7 @@ void KaleidoScope_DrawItemSelect(GlobalContext* globalCtx) {
pauseCtx->nameDisplayTimer = 0;
pauseCtx->cursorSpecialPos = 0;
Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
cursorPoint = cursorX = cursorY = 0;
while (true) {
@ -251,7 +251,7 @@ void KaleidoScope_DrawItemSelect(GlobalContext* globalCtx) {
pauseCtx->nameDisplayTimer = 0;
pauseCtx->cursorSpecialPos = 0;
Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
cursorPoint = cursorX = 5;
cursorY = 0;
@ -382,18 +382,18 @@ void KaleidoScope_DrawItemSelect(GlobalContext* globalCtx) {
if (pauseCtx->equipTargetItem == ITEM_ARROW_LIGHT) {
index = 2;
}
Audio_PlaySoundGeneral(NA_SE_SY_SET_FIRE_ARROW + index, &D_801333D4, 4, &D_801333E0,
Audio_PlaySoundGeneral(NA_SE_SY_SET_FIRE_ARROW + index, &gAudioDefaultPos, 4, &D_801333E0,
&D_801333E0, &gReverbAdd2);
pauseCtx->equipTargetItem = 0xBF + index;
sEquipState = 0;
pauseCtx->equipAnimAlpha = 0;
sEquipMoveTimer = 6;
} else {
Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &D_801333D4, 4, &D_801333E0, &D_801333E0,
Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0,
&gReverbAdd2);
}
} else {
Audio_PlaySoundGeneral(NA_SE_SY_ERROR, &D_801333D4, 4, &D_801333E0, &D_801333E0,
Audio_PlaySoundGeneral(NA_SE_SY_ERROR, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0,
&gReverbAdd2);
}
}
@ -410,7 +410,7 @@ void KaleidoScope_DrawItemSelect(GlobalContext* globalCtx) {
}
if (oldCursorPoint != pauseCtx->cursorPoint[PAUSE_ITEM]) {
Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
} else if ((pauseCtx->unk_1E4 == 3) && (pauseCtx->pageIndex == PAUSE_ITEM)) {
KaleidoScope_SetCursorVtx(pauseCtx, cursorSlot * 4, pauseCtx->itemVtx);
@ -523,7 +523,7 @@ void KaleidoScope_UpdateItemEquip(GlobalContext* globalCtx) {
WREG(90) = 320;
WREG(87) = WREG(91);
sEquipState++;
Audio_PlaySoundGeneral(NA_SE_SY_SYNTH_MAGIC_ARROW, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_SYNTH_MAGIC_ARROW, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
return;
}

12
src/overlays/misc/ovl_kaleido_scope/z_kaleido_map_PAL.cpp
View File

@ -156,7 +156,7 @@ void KaleidoScope_DrawDungeonMap(GlobalContext* globalCtx, GraphicsContext* gfxC
pauseCtx->cursorX[PAUSE_MAP] = 0;
j = 72 + (pauseCtx->cursorSlot[PAUSE_MAP] * 4);
KaleidoScope_SetCursorVtx(pauseCtx, j, pauseCtx->mapPageVtx);
Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
} else {
if (pauseCtx->stickRelX < -30) {
@ -186,12 +186,12 @@ void KaleidoScope_DrawDungeonMap(GlobalContext* globalCtx, GraphicsContext* gfxC
osSyncPrintf("kscope->cursor_point====%d\n", pauseCtx->cursorPoint[PAUSE_MAP]);
j = 72 + (pauseCtx->cursorSlot[PAUSE_MAP] * 4);
KaleidoScope_SetCursorVtx(pauseCtx, j, pauseCtx->mapPageVtx);
Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
}
if (oldCursorPoint != pauseCtx->cursorPoint[PAUSE_MAP]) {
Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
}
@ -466,7 +466,7 @@ void KaleidoScope_DrawWorldMap(GlobalContext* globalCtx, GraphicsContext* gfxCtx
pauseCtx->cursorItem[PAUSE_MAP] = pauseCtx->cursorPoint[PAUSE_WORLD_MAP];
pauseCtx->cursorSlot[PAUSE_MAP] = pauseCtx->cursorPoint[PAUSE_WORLD_MAP] + 0x1F;
KaleidoScope_SetCursorVtx(pauseCtx, pauseCtx->cursorSlot[PAUSE_MAP] * 4, pauseCtx->mapPageVtx);
Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
D_8082A6D4 = 0;
}
} else {
@ -481,7 +481,7 @@ void KaleidoScope_DrawWorldMap(GlobalContext* globalCtx, GraphicsContext* gfxCtx
pauseCtx->cursorItem[PAUSE_MAP] = pauseCtx->cursorPoint[PAUSE_WORLD_MAP];
pauseCtx->cursorSlot[PAUSE_MAP] = pauseCtx->cursorPoint[PAUSE_WORLD_MAP] + 0x1F;
KaleidoScope_SetCursorVtx(pauseCtx, pauseCtx->cursorSlot[PAUSE_MAP] * 4, pauseCtx->mapPageVtx);
Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
D_8082A6D4 = 0;
}
}
@ -492,7 +492,7 @@ void KaleidoScope_DrawWorldMap(GlobalContext* globalCtx, GraphicsContext* gfxCtx
}
if (oldCursorPoint != pauseCtx->cursorPoint[PAUSE_WORLD_MAP]) {
Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
}

4
src/overlays/misc/ovl_kaleido_scope/z_kaleido_prompt.cpp
View File

@ -13,10 +13,10 @@ void KaleidoScope_UpdatePrompt(GlobalContext* globalCtx) {
if (((pauseCtx->state == 7) && (pauseCtx->unk_1EC == 1)) || (pauseCtx->state == 0xE) || (pauseCtx->state == 0x10)) {
if ((pauseCtx->promptChoice == 0) && (relStickX >= 30)) {
Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
pauseCtx->promptChoice = 4;
} else if ((pauseCtx->promptChoice != 0) && (relStickX <= -30)) {
Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
pauseCtx->promptChoice = 0;
}

26
src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.cpp
View File

@ -368,7 +368,7 @@ void KaleidoScope_MoveCursorToSpecialPos(GlobalContext* globalCtx, u16 specialPo
pauseCtx->cursorSpecialPos = specialPos;
pauseCtx->pageSwitchTimer = 0;
Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
void KaleidoScope_DrawQuadTextureRGBA32(GraphicsContext* gfxCtx, void* texture, u16 width, u16 height, u16 point) {
@ -422,11 +422,11 @@ void KaleidoScope_SwitchPage(PauseContext* pauseCtx, u8 pt) {
if (!pt) {
pauseCtx->mode = pauseCtx->pageIndex * 2 + 1;
Audio_PlaySoundGeneral(NA_SE_SY_WIN_SCROLL_LEFT, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_WIN_SCROLL_LEFT, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
pauseCtx->cursorSpecialPos = PAUSE_CURSOR_PAGE_RIGHT;
} else {
pauseCtx->mode = pauseCtx->pageIndex * 2;
Audio_PlaySoundGeneral(NA_SE_SY_WIN_SCROLL_RIGHT, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_WIN_SCROLL_RIGHT, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
pauseCtx->cursorSpecialPos = PAUSE_CURSOR_PAGE_LEFT;
}
@ -2964,7 +2964,7 @@ void KaleidoScope_Update(GlobalContext* globalCtx) {
} else if (CHECK_BTN_ALL(input->press.button, BTN_B)) {
pauseCtx->mode = 0;
pauseCtx->promptChoice = 0;
Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
gSaveContext.buttonStatus[0] = gSaveContext.buttonStatus[1] = gSaveContext.buttonStatus[2] =
gSaveContext.buttonStatus[3] = BTN_DISABLED;
gSaveContext.buttonStatus[4] = BTN_ENABLED;
@ -3010,7 +3010,7 @@ void KaleidoScope_Update(GlobalContext* globalCtx) {
pauseCtx->unk_1E4 = 0;
pauseCtx->mode = 0;
pauseCtx->promptChoice = 0;
Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
gSaveContext.buttonStatus[0] = gSaveContext.buttonStatus[1] = gSaveContext.buttonStatus[2] =
gSaveContext.buttonStatus[3] = BTN_DISABLED;
gSaveContext.buttonStatus[4] = BTN_ENABLED;
@ -3019,13 +3019,13 @@ void KaleidoScope_Update(GlobalContext* globalCtx) {
pauseCtx->unk_1EC = 0;
pauseCtx->state = 7;
} else if (pauseCtx->ocarinaStaff->state == pauseCtx->ocarinaSongIdx) {
Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &D_801333D4, 4, &D_801333E0, &D_801333E0,
Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0,
&gReverbAdd2);
D_8082B258 = 0;
D_8082B25C = 30;
pauseCtx->unk_1E4 = 6;
} else if (pauseCtx->ocarinaStaff->state == 0xFF) {
Audio_PlaySoundGeneral(NA_SE_SY_OCARINA_ERROR, &D_801333D4, 4, &D_801333E0, &D_801333E0,
Audio_PlaySoundGeneral(NA_SE_SY_OCARINA_ERROR, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0,
&gReverbAdd2);
D_8082B258 = 4;
D_8082B25C = 20;
@ -3059,7 +3059,7 @@ void KaleidoScope_Update(GlobalContext* globalCtx) {
pauseCtx->unk_1E4 = 0;
pauseCtx->mode = 0;
pauseCtx->promptChoice = 0;
Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
gSaveContext.buttonStatus[0] = gSaveContext.buttonStatus[1] = gSaveContext.buttonStatus[2] =
gSaveContext.buttonStatus[3] = BTN_DISABLED;
gSaveContext.buttonStatus[4] = BTN_ENABLED;
@ -3104,7 +3104,7 @@ void KaleidoScope_Update(GlobalContext* globalCtx) {
YREG(8) = pauseCtx->unk_204;
Audio_PlayKaleido(0);
} else {
Audio_PlaySoundGeneral(NA_SE_SY_PIECE_OF_HEART, &D_801333D4, 4, &D_801333E0, &D_801333E0,
Audio_PlaySoundGeneral(NA_SE_SY_PIECE_OF_HEART, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0,
&gReverbAdd2);
Gameplay_SaveSceneFlags(globalCtx);
gSaveContext.savedSceneNum = globalCtx->sceneNum;
@ -3311,11 +3311,11 @@ void KaleidoScope_Update(GlobalContext* globalCtx) {
if (CHECK_BTN_ALL(input->press.button, BTN_A)) {
if (pauseCtx->promptChoice != 0) {
pauseCtx->promptChoice = 0;
Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
pauseCtx->state = 0x10;
gameOverCtx->state++;
} else {
Audio_PlaySoundGeneral(NA_SE_SY_PIECE_OF_HEART, &D_801333D4, 4, &D_801333E0, &D_801333E0,
Audio_PlaySoundGeneral(NA_SE_SY_PIECE_OF_HEART, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0,
&gReverbAdd2);
pauseCtx->promptChoice = 0;
Gameplay_SaveSceneFlags(globalCtx);
@ -3343,7 +3343,7 @@ void KaleidoScope_Update(GlobalContext* globalCtx) {
case 0x10: // GAME OVER - Continue Playing?
if (CHECK_BTN_ALL(input->press.button, BTN_A) || CHECK_BTN_ALL(input->press.button, BTN_START)) {
if (pauseCtx->promptChoice == 0) {
Audio_PlaySoundGeneral(NA_SE_SY_PIECE_OF_HEART, &D_801333D4, 4, &D_801333E0, &D_801333E0,
Audio_PlaySoundGeneral(NA_SE_SY_PIECE_OF_HEART, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0,
&gReverbAdd2);
Gameplay_SaveSceneFlags(globalCtx);
@ -3393,7 +3393,7 @@ void KaleidoScope_Update(GlobalContext* globalCtx) {
break;
}
} else {
Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &D_801333D4, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &gAudioDefaultPos, 4, &D_801333E0, &D_801333E0, &gReverbAdd2);
}
pauseCtx->state = 0x11;