mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-06-20 23:51:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Audio Sfx Functions Decompiled and Documented (code_8019AF00.c) (#1242)

Browse Source 
* sfx decomp and docs

* function headers

* namefixer

* oops

* better sfx name

* PR review

* namefixer

* PR review

* float

* namefixer

* namefixer

* namefixer

* PR Suggestions
This commit is contained in:
engineer124
2023-06-21 13:13:51 +10:00
committed by GitHub
parent 7194936203
commit 9c0fc94fe3
256 changed files with 1837 additions and 1401 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/audio/code_8019AF00.c
+426 -55
View File
@@ -63,7 +63,7 @@ typedef struct {
s32 AudioOcarina_MemoryGameNextNote(void);
void AudioSfx_ProcessSfxSettings(void);
void func_8019FEDC(void);
void Audio_UpdateSfxVolumeTransition(void);
void Audio_StepFreqLerp(FreqLerp* lerp);
s32 Audio_SetGanonsTowerBgmVolume(u8 targetVolume);
@@ -71,7 +71,7 @@ s32 Audio_SetGanonsTowerBgmVolume(u8 targetVolume);
void Audio_StartMorningSceneSequence(u16 seqId);
void Audio_StartSceneSequence(u16 seqId);
void Audio_PlaySequenceWithSeqPlayerIO(s8 seqPlayerIndex, u16 seqId, u8 fadeInDuration, s8 ioPort, u8 ioData);
void func_801A4428(u8 reverbIndex);
void Audio_SetSfxReverbIndexExceptOcarinaBank(u8 reverbIndex);
void func_801A3038(void);
void Audio_PlayAmbience(u8 ambienceId);
void Audio_SetSfxVolumeExceptSystemAndOcarinaBanks(u8 volume);
@@ -210,7 +210,7 @@ u16 sSfxVolumeDuration = 0;
// System Data
s8 sSoundMode = SOUNDMODE_STEREO;
s8 sAudioIsWindowOpen = false;
s8 sAudioPauseMenuOpenOrClose = SFX_PAUSE_MENU_CLOSE;
s8 sAudioCutsceneFlag = false;
s8 sSpecReverb = 0;
s8 sAudioEnvReverb = 0;
@@ -3638,7 +3638,7 @@ void Audio_Update(void) {
Audio_UpdateRiverSoundVolumes();
Audio_UpdateSceneSequenceResumePoint();
func_801A312C();
func_8019FEDC();
Audio_UpdateSfxVolumeTransition();
func_801A1E0C();
func_801A1904();
func_801A2090();
@@ -3654,10 +3654,10 @@ void Audio_Update(void) {
}
}
void Audio_Noop4(s32 arg0) {
void Audio_Noop4(UNK_TYPE arg0) {
}
void Audio_Noop5(s32 arg0, s32 arg1) {
void Audio_Noop5(UNK_TYPE arg0, UNK_TYPE arg1) {
}
/**
@@ -4111,17 +4111,39 @@ void AudioSfx_ResetSfxChannelState(void) {
sAudioCodeReverb = 0;
}
#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/play_sound.s")
void Audio_PlaySfx(u16 sfxId) {
AudioSfx_PlaySfx(sfxId, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
&gSfxDefaultReverb);
if (sfxId == NA_SE_OC_TELOP_IMPACT) {
Audio_SetSequenceMode(SEQ_MODE_DEFAULT);
}
}
#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019F128.s")
void Audio_PlaySfx_2(u16 sfxId) {
AudioSfx_PlaySfx(sfxId, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
&gSfxDefaultReverb);
}
#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019F170.s")
/**
* Bends the pitch of the sfx by a little under two semitones and adds reverb
*/
void Audio_PlaySfx_AtPosWithPresetLowFreqAndHighReverb(Vec3f* pos, u16 sfxId) {
AudioSfx_PlaySfx(sfxId, pos, 4, &sTwoSemitonesLoweredFreq, &gSfxDefaultFreqAndVolScale, &sSfxIncreasedReverb);
}
#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/Audio_PlaySfxAtPos.s")
void Audio_PlaySfx_AtPos(Vec3f* pos, u16 sfxId) {
AudioSfx_PlaySfx(sfxId, pos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
}
#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019F208.s")
void Audio_PlaySfx_MessageDecide(void) {
Audio_PlaySfx(NA_SE_SY_DECIDE);
AudioSfx_StopById(NA_SE_SY_MESSAGE_PASS);
}
#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019F230.s")
void Audio_PlaySfx_MessageCancel(void) {
Audio_PlaySfx(NA_SE_SY_CANCEL);
AudioSfx_StopById(NA_SE_SY_MESSAGE_PASS);
}
SfxSettings* AudioSfx_AddSfxSetting(Vec3f* pos) {
SfxSettings* sfxSettings;
@@ -4163,8 +4185,8 @@ void AudioSfx_ProcessSfxSettings(void) {
while (sfxSettingsFlags != 0) {
bankId = BANK_ENV;
if ((sfxSettingsFlags & (1 << sfxSettingIndex))) {
if ((sfxSettingsFlags & (1 << sfxSettingIndex))) {
found = false;
while ((bankId <= BANK_ENEMY) && !found) {
entryIndex = gSfxBanks[bankId]->next;
@@ -4193,11 +4215,43 @@ void AudioSfx_ProcessSfxSettings(void) {
}
}
#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019F420.s")
/**
* Used for Gyorg and Bigslime
*/
void Audio_PlaySfx_Underwater(Vec3f* pos, u16 sfxId) {
if ((sfxId == NA_SE_EN_KONB_JUMP_OLD) || (sfxId == NA_SE_EN_KONB_SINK_OLD)) {
AudioSfx_PlaySfx(sfxId, pos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
} else {
AudioSfx_PlaySfx(sfxId, pos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
&gUnderwaterSfxReverbAdd);
}
}
#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019F4AC.s")
/**
* Used only for eating the goron sirloin by the goron with Don Gero's Mask
*/
void Audio_PlaySfx_WithSfxSettingsReverb(Vec3f* pos, u16 sfxId) {
SfxSettings* sfxSettings;
#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019F540.s")
if ((sfxId == NA_SE_EN_KONB_JUMP_OLD) || (sfxId == NA_SE_EN_KONB_SINK_OLD)) {
AudioSfx_PlaySfx(sfxId, pos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
} else {
sfxSettings = AudioSfx_AddSfxSetting(pos);
if (sfxSettings != NULL) {
AudioSfx_PlaySfx(sfxId, pos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
&sfxSettings->reverbAdd);
}
}
}
void Audio_SetSfxUnderwaterReverb(s8 isUnderwaterReverbActivated) {
if (isUnderwaterReverbActivated) {
gUnderwaterSfxReverbAdd = -0x80;
} else {
gUnderwaterSfxReverbAdd = 0;
}
}
void AudioSfx_LowerSfxSettingsReverb(Vec3f* pos, s8 isReverbLowered) {
SfxSettings* sfxSettings = AudioSfx_AddSfxSetting(pos);
@@ -4211,46 +4265,246 @@ void AudioSfx_LowerSfxSettingsReverb(Vec3f* pos, s8 isReverbLowered) {
}
}
#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019F5AC.s")
f32 Audio_SetSyncedSfxFreqAndVolume(f32 freqVolParam) {
f32 ret = 1.0f;
#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019F638.s")
if (freqVolParam > 6.0f) {
sSfxSyncedVolume = 1.0f;
sSfxSyncedFreq = 1.1f;
} else {
ret = freqVolParam / 6.0f;
sSfxSyncedVolume = ret * (1.0f - 0.775f) + 0.775f;
sSfxSyncedFreq = (ret * 0.2f) + 0.9f;
}
#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019F780.s")
return ret;
}
#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019F7D8.s")
/**
* Adjusts both frequency and volume based on a single parameter "freqVolParam"
* When freqVolParam >= 6.0f, frequency is increased to 1.1f and volume remains fixed at 1.0f
* For every -1.0f taken from freqVolParam (eg. 5.0f, 4.0f, 3.0f...):
* - volume will decrease by 0.0375f
* - frequency will decrease by 0.0333333f
*/
void Audio_PlaySfx_AtPosForMetalEffectsWithSyncedFreqAndVolume(Vec3f* pos, u16 sfxId, f32 freqVolParam) {
f32 sp2C;
f32 phi_f0;
u8 phi_v0;
u16 metalSfxId = NA_SE_NONE;
#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019F830.s")
sp2C = Audio_SetSyncedSfxFreqAndVolume(freqVolParam);
AudioSfx_PlaySfx(sfxId, pos, 4, &sSfxSyncedFreq, &sSfxSyncedVolume, &gSfxDefaultReverb);
#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019F88C.s")
if ((sfxId & 0xF0) == 0xB0) {
// Crawlspaces (unused remnant of OoT)
phi_f0 = 0.3f;
phi_v0 = true;
sp2C = 1.0f;
} else {
phi_f0 = 1.1f;
phi_v0 = gAudioCtx.audioRandom & 1;
}
#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019F900.s")
if (phi_f0 < freqVolParam) {
if (phi_v0) {
if ((sfxId & 0x1FF) < 0x80) {
metalSfxId = NA_SE_PL_METALEFFECT_KID;
} else if ((sfxId & 0x1FF) < 0xF0) {
metalSfxId = NA_SE_PL_METALEFFECT_ADULT;
}
#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019FA18.s")
if (metalSfxId != NA_SE_NONE) {
sSfxSyncedVolumeForMetalEffects = (sp2C * 0.7) + 0.3;
AudioSfx_PlaySfx(metalSfxId, pos, 4, &sSfxSyncedFreq, &sSfxSyncedVolumeForMetalEffects,
&gSfxDefaultReverb);
}
}
}
}
#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019FAD8.s")
/**
* Adjusts both frequency and volume based on a single parameter "freqVolParam"
* When freqVolParam >= 6.0f, frequency is increased to 1.1f and volume remains fixed at 1.0f
* For every -1.0f taken from freqVolParam (eg. 5.0f, 4.0f, 3.0f...):
* - volume will decrease by 0.0375f
* - frequency will decrease by 0.0333333f
*/
void Audio_PlaySfx_AtPosWithSyncedFreqAndVolume(Vec3f* pos, u16 sfxId, f32 freqVolParam) {
Audio_SetSyncedSfxFreqAndVolume(freqVolParam);
AudioSfx_PlaySfx(sfxId, pos, 4, &sSfxSyncedFreq, &sSfxSyncedVolume, &gSfxDefaultReverb);
}
#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019FB0C.s")
void Audio_PlaySfx_GiantsMaskUnused(Vec3f* pos, u16 sfxId) {
AudioSfx_PlaySfx(sfxId | 0xE0, pos, 4, &sGiantsMaskFreq, &gSfxDefaultFreqAndVolScale, &sGiantsMaskReverbAdd);
}
#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019FC20.s")
void Audio_PlaySfx_GiantsMask(Vec3f* pos, u16 sfxId) {
AudioSfx_PlaySfx((sfxId & 0x681F) + 0x20, pos, 4, &sGiantsMaskFreq, &gSfxDefaultFreqAndVolScale,
&sGiantsMaskReverbAdd);
}
#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019FCB8.s")
void Audio_PlaySfx_Randomized(Vec3f* pos, u16 baseSfxId, u8 randLim) {
u8 offset = AudioThread_NextRandom() % randLim;
#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019FD90.s")
AudioSfx_PlaySfx(baseSfxId + offset, pos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
&gSfxDefaultReverb);
}
#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019FDC8.s")
/**
* Plays increasingly high-pitched sword charging sfx as Player charges up the sword
*/
void Audio_PlaySfx_SwordCharge(Vec3f* pos, u8 chargeLevel) {
chargeLevel %= 4U;
if (chargeLevel != sPrevChargeLevel) {
sCurChargeLevelSfxFreq = sChargeLevelsSfxFreq[chargeLevel];
switch (chargeLevel) {
case 1:
AudioSfx_PlaySfx(NA_SE_PL_SWORD_CHARGE, pos, 4, &sCurChargeLevelSfxFreq, &gSfxDefaultFreqAndVolScale,
&gSfxDefaultReverb);
break;
#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019FE1C.s")
case 2:
AudioSfx_PlaySfx(NA_SE_PL_SWORD_CHARGE, pos, 4, &sCurChargeLevelSfxFreq, &gSfxDefaultFreqAndVolScale,
&gSfxDefaultReverb);
break;
#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019FE74.s")
default:
break;
}
sPrevChargeLevel = chargeLevel;
}
#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019FEDC.s")
if (chargeLevel != 0) {
AudioSfx_PlaySfx(NA_SE_IT_SWORD_CHARGE - SFX_FLAG, pos, 4, &sCurChargeLevelSfxFreq, &gSfxDefaultFreqAndVolScale,
&gSfxDefaultReverb);
}
}
#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019FF38.s")
void Audio_PlaySfx_AtPosWithFreqAndVolume(Vec3f* pos, u16 sfxId, f32 freqScale, f32* volume) {
SfxSettings* sfxSettings = AudioSfx_AddSfxSetting(pos);
f32* freqScaleAdj;
if (sfxSettings != NULL) {
freqScaleAdj = &sfxSettings->freqScale;
if (freqScale < 0.75f) {
*freqScaleAdj = ((freqScale / 0.75f) * 0.25f) + 0.5f;
} else {
*freqScaleAdj = freqScale;
}
if (*freqScaleAdj > 0.5f) {
AudioSfx_PlaySfx(sfxId, pos, 4, freqScaleAdj, volume, &gSfxDefaultReverb);
}
}
}
void Audio_PlaySfx_AtPosWithFreq(Vec3f* pos, u16 sfxId, f32 freqScale) {
Audio_PlaySfx_AtPosWithFreqAndVolume(pos, sfxId, freqScale, &gSfxDefaultFreqAndVolScale);
}
void Audio_PlaySfx_AtPosWithFreqAndChannelIO(Vec3f* pos, u16 sfxId, f32 freqScale, u8 arg3) {
if (freqScale > 1.0f) {
freqScale = 1.0f;
}
AudioSfx_SetChannelIO(pos, sfxId, (arg3 - (u32)(freqScale * arg3)) & 0xFF);
Audio_PlaySfx_AtPosWithFreq(pos, sfxId, freqScale);
}
void Audio_PlaySfx_WaterWheel(Vec3f* pos, u16 sfxId) {
u8 isWaterWheelSfxNotPlaying = false;
switch (sfxId) {
case NA_SE_EV_DUMMY_WATER_WHEEL_LR - SFX_FLAG:
if (!AudioSfx_IsPlaying(NA_SE_EV_BIG_WATER_WHEEL_LR - SFX_FLAG)) {
isWaterWheelSfxNotPlaying = true;
}
break;
case NA_SE_EV_DUMMY_WATER_WHEEL_RR - SFX_FLAG:
if (!AudioSfx_IsPlaying(NA_SE_EV_BIG_WATER_WHEEL_RR - SFX_FLAG)) {
isWaterWheelSfxNotPlaying = true;
}
break;
default:
break;
}
if (isWaterWheelSfxNotPlaying) {
AudioSfx_SetChannelIO(pos, sfxId, 0);
Audio_PlaySfx_AtPosWithFreqAndVolume(pos, sfxId, 1.0f, &sWaterWheelVolume);
}
}
/**
* at timerShiftedLerp == 1: use sSfxTimerLerpRange1
* at timerShiftedLerp == 2: use sSfxTimerLerpRange2
*
* sSfxAdjustedFreq was modified in OoT, but remains 1.0f in MM
*
* Used for "NA_SE_IT_DEKUNUTS_FLOWER_ROLL" and "NA_SE_IT_FISHING_REEL_SLOW"
*/
void Audio_PlaySfx_AtPosWithTimer(Vec3f* pos, u16 sfxId, f32 timerShiftedLerp) {
sSfxTimer--;
if (sSfxTimer == 0) {
AudioSfx_PlaySfx(sfxId, pos, 4, &sSfxAdjustedFreq, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
if (timerShiftedLerp > 2.0f) {
timerShiftedLerp = 2.0f;
}
// Linear interpolation between "sSfxTimerLerpRange1" and "sSfxTimerLerpRange2" from lerp factor
// (timerShiftedLerp - 1.0f)
sSfxTimer = (s8)((sSfxTimerLerpRange1 - sSfxTimerLerpRange2) * (1.0f - timerShiftedLerp)) + sSfxTimerLerpRange1;
}
}
void Audio_SetSfxTimerLerpInterval(s8 timerLerpRange1, s8 timerLerpRange2) {
sSfxTimer = 1;
sSfxTimerLerpRange2 = timerLerpRange2;
sSfxTimerLerpRange1 = timerLerpRange1;
}
void Audio_PlaySfx_AtPosWithReverb(Vec3f* pos, u16 sfxId, s8 reverbAdd) {
sSfxCustomReverb = reverbAdd;
AudioSfx_PlaySfx(sfxId, pos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &sSfxCustomReverb);
}
void Audio_PlaySfx_AtPosWithVolume(Vec3f* pos, u16 sfxId, f32 volume) {
gSfxVolume = volume;
AudioSfx_PlaySfx(sfxId, pos, 4, &gSfxDefaultFreqAndVolScale, &gSfxVolume, &gSfxDefaultReverb);
}
void Audio_SetSfxVolumeTransition(f32* volume, f32 volumeTarget, u16 duration) {
sSfxVolumeCur = volume;
sSfxVolumeTarget = volumeTarget;
sSfxVolumeDuration = duration;
sSfxVolumeRate = (*sSfxVolumeCur - sSfxVolumeTarget) / sSfxVolumeDuration;
}
// Part of audio update (runs every frame)
void Audio_UpdateSfxVolumeTransition(void) {
if (sSfxVolumeDuration != 0) {
sSfxVolumeDuration--;
if (sSfxVolumeDuration == 0) {
*sSfxVolumeCur = sSfxVolumeTarget;
} else {
*sSfxVolumeCur -= sSfxVolumeRate;
}
}
}
void Audio_PlaySfx_FishingReel(f32 timerShiftedLerp) {
Audio_PlaySfx_AtPosWithTimer(&gSfxDefaultPos, NA_SE_IT_FISHING_REEL_SLOW - SFX_FLAG, timerShiftedLerp);
Audio_PlaySfx_AtPosWithFreq(&gSfxDefaultPos, 0, (0.15f * timerShiftedLerp) + 1.4f);
}
/**
* Used for EnRiverSound
*/
void Audio_PlaySfxForRiver(Vec3f* pos, f32 freqScale) {
void Audio_PlaySfx_River(Vec3f* pos, f32 freqScale) {
if (!AudioSfx_IsPlaying(NA_SE_EV_RIVER_STREAM - SFX_FLAG)) {
sRiverFreqScaleLerp.value = freqScale;
} else if (freqScale != sRiverFreqScaleLerp.value) {
@@ -4266,7 +4520,7 @@ void Audio_PlaySfxForRiver(Vec3f* pos, f32 freqScale) {
* Unused remnant of OoT's EnRiverSound
* Used for Zora's River Waterfall
*/
void Audio_PlaySfxForWaterfall(Vec3f* pos, f32 freqScale) {
void Audio_PlaySfx_Waterfall(Vec3f* pos, f32 freqScale) {
if (!AudioSfx_IsPlaying(NA_SE_EV_WATER_WALL_BIG - SFX_FLAG)) {
sWaterfallFreqScaleLerp.value = freqScale;
} else if (freqScale != sWaterfallFreqScaleLerp.value) {
@@ -4292,10 +4546,14 @@ void Audio_StepFreqLerp(FreqLerp* lerp) {
}
}
f32 sBigBellsVolume[8] = {
f32 sBigBellsVolume[] = {
1.0f, 0.9f, 0.8f, 0.7f, 0.6f, 0.5f, 0.4f, 0.3f,
};
#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A0124.s")
void Audio_PlaySfx_BigBells(Vec3f* pos, u8 volumeIndex) {
AudioSfx_PlaySfx(NA_SE_EV_SIGNAL_BIGBELL, pos, 4, &gSfxDefaultFreqAndVolScale, &sBigBellsVolume[volumeIndex & 7],
&gSfxDefaultReverb);
}
void Audio_SetBgmVolumeOff(void) {
AudioSeq_SetVolumeScale(SEQ_PLAYER_BGM_MAIN, VOL_SCALE_INDEX_FANFARE, 0, 10);
@@ -4420,7 +4678,7 @@ void Audio_UpdateRiverSoundVolumes(void) {
sRiverSoundMainBgmRestore = true;
}
sRiverSoundMainBgmLower = false;
} else if ((sRiverSoundMainBgmRestore == true) && !sAudioIsWindowOpen) {
} else if ((sRiverSoundMainBgmRestore == true) && (sAudioPauseMenuOpenOrClose == SFX_PAUSE_MENU_CLOSE)) {
// restores the volume every frame
AudioSeq_SetVolumeScale(SEQ_PLAYER_BGM_MAIN, VOL_SCALE_INDEX_BGM_MAIN, 0x7F, 10);
sRiverSoundMainBgmCurrentVol = 0x7F;
@@ -4436,11 +4694,24 @@ void Audio_UpdateRiverSoundVolumes(void) {
}
}
#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A0554.s")
// Unused remnant of OoT
void Audio_PlaySfx_IncreasinglyTransposed(Vec3f* pos, s16 sfxId, u8* semitones) {
AudioSfx_PlaySfx(sfxId, pos, 4, &gPitchFrequencies[semitones[sAudioIncreasingTranspose] + 39],
&gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
if (sAudioIncreasingTranspose < 15) {
sAudioIncreasingTranspose++;
}
}
#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A05E4.s")
// Unused remnant of OoT
void Audio_ResetIncreasingTranspose(void) {
sAudioIncreasingTranspose = 0;
}
#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A05F0.s")
// Unused remnant of OoT
void Audio_PlaySfx_Transposed(Vec3f* pos, u16 sfxId, s8 semitone) {
AudioSfx_PlaySfx(sfxId, pos, 4, &gPitchFrequencies[semitone + 39], &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
}
void AudioSfx_SetChannelIO(Vec3f* pos, u16 sfxId, u8 ioData) {
u8 channelIndex = 0;
@@ -4464,9 +4735,32 @@ void AudioSfx_SetChannelIO(Vec3f* pos, u16 sfxId, u8 ioData) {
}
}
#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A0810.s")
/**
* Plays sfx and sets ioData to io port 6 if the sfx is active
*/
void Audio_PlaySfx_AtPosWithChannelIO(Vec3f* pos, u16 sfxId, u8 ioData) {
AudioSfx_SetChannelIO(pos, sfxId, ioData);
AudioSfx_PlaySfx(sfxId, pos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
}
#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A0868.s")
/**
* Plays sfx and sets ioData to io port 6
*/
void Audio_PlaySfx_AtPosWithAllChannelsIO(Vec3f* pos, u16 sfxId, u8 ioData) {
u8 channelIndex = 0;
u8 i;
u8 bankId = SFX_BANK_SHIFT(sfxId);
for (i = 0; i < bankId; i++) {
channelIndex += gChannelsPerBank[gSfxChannelLayout][i];
}
for (i = 0; i < gChannelsPerBank[gSfxChannelLayout][bankId]; i++) {
AUDIOCMD_CHANNEL_SET_IO(SEQ_PLAYER_SFX, channelIndex++, 6, ioData);
}
AudioSfx_PlaySfx(sfxId, pos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
}
/**
* Unused remnant of OoT's EnRiverSound (func_800F4E30)
@@ -5030,7 +5324,16 @@ void Audio_UpdateEnemyBgmVolume(f32 dist) {
#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A3AC0.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A3AEC.s")
void Audio_PlaySfx_PauseMenuOpenOrClose(u8 pauseMenuOpenOrClose) {
sAudioPauseMenuOpenOrClose = pauseMenuOpenOrClose;
if (pauseMenuOpenOrClose != SFX_PAUSE_MENU_CLOSE) {
Audio_PlaySfx(NA_SE_SY_WIN_OPEN);
AUDIOCMD_GLOBAL_MUTE(AUDIOCMD_ALL_SEQPLAYERS);
} else {
Audio_PlaySfx(NA_SE_SY_WIN_CLOSE);
AUDIOCMD_GLOBAL_UNMUTE(AUDIOCMD_ALL_SEQPLAYERS, false);
}
}
#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A3B48.s")
@@ -5040,7 +5343,19 @@ void Audio_UpdateEnemyBgmVolume(f32 dist) {
#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A3CF4.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A3D54.s")
/**
* Possibly a test for surround sound
* Unused
*/
void Audio_PlaySfx_SurroundSoundTest(void) {
s32 val = 0;
if (sSoundMode == SOUNDMODE_SURROUND_EXTERNAL) {
val = 2;
}
Audio_PlaySfx_AtPosWithAllChannelsIO(&gSfxDefaultPos, NA_SE_SY_SOUT_DEMO, val);
}
#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A3D98.s")
@@ -5052,11 +5367,21 @@ void Audio_SetCutsceneFlag(s8 flag) {
sAudioCutsceneFlag = flag;
}
#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A3F6C.s")
void Audio_PlaySfx_IfNotInCutsceneImpl(u16 sfxId, Vec3f* pos, u8 token, f32* freqScale, f32* volume, s8* reverbAdd) {
if (!sAudioCutsceneFlag) {
AudioSfx_PlaySfx(sfxId, pos, token, freqScale, volume, reverbAdd);
}
}
#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A3FB4.s")
void Audio_PlaySfx_IfNotInCutscene(u16 sfxId) {
Audio_PlaySfx_IfNotInCutsceneImpl(sfxId, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
&gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
}
#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A3FFC.s")
// Unused
void Audio_MuteSfxAndAmbienceSeqExceptOcarinaAndSystem(u8 muteOnlySfxAndAmbienceSeq) {
sMuteOnlySfxAndAmbienceSeq = muteOnlySfxAndAmbienceSeq;
}
#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/Audio_SetSpec.s")
@@ -5066,7 +5391,13 @@ void Audio_SetCutsceneFlag(s8 flag) {
#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A41F8.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A429C.s")
/**
* The flag 0xFF makes the sequence process SkipTicks and SkipForwardSequence
* Unused
*/
void Audio_StartSfxPlayer(void) {
AudioSeq_StartSequence(SEQ_PLAYER_SFX, NA_BGM_GENERAL_SFX, 0xFF, 5);
}
#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A42C8.s")
@@ -5074,9 +5405,34 @@ void Audio_SetCutsceneFlag(s8 flag) {
#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A4348.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/Audio_SetSfxVolumeExceptSystemAndOcarinaBanks.s")
void Audio_SetSfxVolumeExceptSystemAndOcarinaBanks(u8 volume) {
u8 channelIndex;
#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A4428.s")
if (!sAllPlayersMutedExceptOcaAndSys) {
for (channelIndex = 0; channelIndex < SEQ_NUM_CHANNELS; channelIndex++) {
switch (channelIndex) {
case SFX_CHANNEL_SYSTEM0:
case SFX_CHANNEL_SYSTEM1:
case SFX_CHANNEL_OCARINA:
break;
default:
SEQCMD_SET_CHANNEL_VOLUME(SEQ_PLAYER_SFX, channelIndex, 10, volume);
break;
}
}
}
}
void Audio_SetSfxReverbIndexExceptOcarinaBank(u8 reverbIndex) {
u8 channelIndex;
for (channelIndex = 0; channelIndex < SEQ_NUM_CHANNELS; channelIndex++) {
if (channelIndex != SFX_CHANNEL_OCARINA) {
AUDIOCMD_CHANNEL_SET_REVERB_INDEX(SEQ_PLAYER_SFX, channelIndex, reverbIndex);
}
}
}
#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/Audio_PreNMI.s")
@@ -5089,10 +5445,25 @@ void Audio_ResetData(void);
#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A46F8.s")
f32 sSfxOriginalPos[] = { 0.0f, 0.0f, 0.0f };
#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A4748.s")
// used for z_obj_sound and z_en_gk
void Audio_PlaySfx_AtFixedPos(Vec3f* pos, u16 sfxId) {
static Vec3f sSfxOriginalPos[] = { 0.0f, 0.0f, 0.0f };
s32 i;
f32* dstPos = (f32*)&sSfxOriginalPos;
f32* srcPos = (f32*)pos;
#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A479C.s")
// Vec3f copy
for (i = 0; i < 3; i++) {
dstPos[i] = srcPos[i];
}
Audio_PlaySfx_AtPos(sSfxOriginalPos, sfxId);
}
void Audio_PlaySfx_AtPosWithVolumeTransition(Vec3f* pos, u16 sfxId, u16 duration) {
Audio_PlaySfx_AtPosWithVolume(pos, sfxId, 0.0f);
Audio_SetSfxVolumeTransition(&gSfxVolume, 1.0f, duration);
}
void Audio_SetAmbienceChannelIO(u8 channelIndexRange, u8 ioPort, u8 ioData) {
u8 firstChannelIndex;
src/audio/sfx.c
+2 -2
View File
@@ -198,7 +198,7 @@ void AudioSfx_RemoveMatchingRequests(u8 aspect, SfxBankEntry* entry) {
}
if (remove) {
req->sfxId = 0;
req->sfxId = NA_SE_NONE;
}
}
}
@@ -214,7 +214,7 @@ void AudioSfx_ProcessRequest(void) {
u8 evictImportance;
u8 evictIndex = 0x80;
if (req->sfxId == 0) {
if (req->sfxId == NA_SE_NONE) {
return;
}
src/code/z_actor.c
+72 -45
View File
@@ -32,6 +32,20 @@ extern s16 D_801ED8DC; // 2 funcs
extern Mtx D_801ED8E0; // 1 func
extern Actor* D_801ED920; // 2 funcs. 1 out of z_actor
#define ACTOR_AUDIO_FLAG_SFX_ACTOR_POS (1 << 0)
#define ACTOR_AUDIO_FLAG_SFX_CENTERED_1 (1 << 1)
#define ACTOR_AUDIO_FLAG_SFX_CENTERED_2 (1 << 2)
#define ACTOR_AUDIO_FLAG_SFX_CENTERED_3 (1 << 3)
#define ACTOR_AUDIO_FLAG_SFX_TIMER (1 << 4)
#define ACTOR_AUDIO_FLAG_SEQ_KAMARO_DANCE (1 << 5)
#define ACTOR_AUDIO_FLAG_SEQ_MUSIC_BOX_HOUSE (1 << 6)
#define ACTOR_AUDIO_FLAG_SFX_ALL \
(ACTOR_AUDIO_FLAG_SFX_TIMER | ACTOR_AUDIO_FLAG_SFX_CENTERED_3 | ACTOR_AUDIO_FLAG_SFX_CENTERED_2 | \
ACTOR_AUDIO_FLAG_SFX_CENTERED_1 | ACTOR_AUDIO_FLAG_SFX_ACTOR_POS)
#define ACTOR_AUDIO_FLAG_SEQ_ALL (ACTOR_AUDIO_FLAG_SEQ_MUSIC_BOX_HOUSE | ACTOR_AUDIO_FLAG_SEQ_KAMARO_DANCE)
#define ACTOR_AUDIO_FLAG_ALL (ACTOR_AUDIO_FLAG_SFX_ALL | ACTOR_AUDIO_FLAG_SEQ_ALL)
// Internal forward declarations
void Actor_KillAllOnHalfDayChange(PlayState* play, ActorContext* actorCtx);
Actor* Actor_SpawnEntry(ActorContext* actorCtx, ActorEntry* actorEntry, PlayState* play);
@@ -663,7 +677,7 @@ void func_800B5814(TargetContext* targetCtx, Player* player, Actor* actor, GameS
sfxId =
CHECK_FLAG_ALL(actor->flags, ACTOR_FLAG_4 | ACTOR_FLAG_1) ? NA_SE_SY_LOCK_ON : NA_SE_SY_LOCK_ON_HUMAN;
play_sound(sfxId);
Audio_PlaySfx(sfxId);
}
targetCtx->targetCenterPos.x = actor->world.pos.x;
@@ -2164,7 +2178,7 @@ void func_800B8E1C(PlayState* play, Actor* actor, f32 arg2, s16 arg3, f32 arg4)
*/
void Player_PlaySfx(Player* player, u16 sfxId) {
if (player->currentMask == PLAYER_MASK_GIANT) {
func_8019F170(&player->actor.projectedPos, sfxId);
Audio_PlaySfx_AtPosWithPresetLowFreqAndHighReverb(&player->actor.projectedPos, sfxId);
} else {
AudioSfx_PlaySfx(sfxId, &player->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
&gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
@@ -2175,10 +2189,10 @@ void Player_PlaySfx(Player* player, u16 sfxId) {
* Play a sound effect at the actor's position
*/
void Actor_PlaySfx(Actor* actor, u16 sfxId) {
Audio_PlaySfxAtPos(&actor->projectedPos, sfxId);
Audio_PlaySfx_AtPos(&actor->projectedPos, sfxId);
}
void func_800B8EF4(PlayState* play, Actor* actor) {
void Actor_PlaySfx_SurfaceBomb(PlayState* play, Actor* actor) {
SurfaceSfxOffset surfaceSfxOffset;
if (actor->bgCheckFlags & BGCHECKFLAG_WATER) {
@@ -2191,41 +2205,53 @@ void func_800B8EF4(PlayState* play, Actor* actor) {
surfaceSfxOffset = SurfaceType_GetSfxOffset(&play->colCtx, actor->floorPoly, actor->floorBgId);
}
Audio_PlaySfxAtPos(&actor->projectedPos, NA_SE_EV_BOMB_BOUND);
Audio_PlaySfxAtPos(&actor->projectedPos, NA_SE_PL_WALK_GROUND + surfaceSfxOffset);
Audio_PlaySfx_AtPos(&actor->projectedPos, NA_SE_EV_BOMB_BOUND);
Audio_PlaySfx_AtPos(&actor->projectedPos, NA_SE_PL_WALK_GROUND + surfaceSfxOffset);
}
void func_800B8F98(Actor* actor, u16 sfxId) {
/**
* Play a sfx at the center of the screen using the shared audioFlag system
*/
void Actor_PlaySfx_FlaggedCentered1(Actor* actor, u16 sfxId) {
actor->sfxId = sfxId;
actor->audioFlags &= ~(0x10 | 0x08 | 0x04 | 0x02 | 0x01);
actor->audioFlags |= 0x02;
actor->audioFlags &= ~ACTOR_AUDIO_FLAG_SFX_ALL;
actor->audioFlags |= ACTOR_AUDIO_FLAG_SFX_CENTERED_1;
}
void func_800B8FC0(Actor* actor, u16 sfxId) {
/**
* Play a sfx at the center of the screen using the shared audioFlag system
*/
void Actor_PlaySfx_FlaggedCentered2(Actor* actor, u16 sfxId) {
actor->sfxId = sfxId;
actor->audioFlags &= ~(0x10 | 0x08 | 0x04 | 0x02 | 0x01);
actor->audioFlags |= 4;
actor->audioFlags &= ~ACTOR_AUDIO_FLAG_SFX_ALL;
actor->audioFlags |= ACTOR_AUDIO_FLAG_SFX_CENTERED_2;
}
void func_800B8FE8(Actor* actor, u16 sfxId) {
/**
* Play a sfx at the center of the screen using the shared audioFlag system
*/
void Actor_PlaySfx_FlaggedCentered3(Actor* actor, u16 sfxId) {
actor->sfxId = sfxId;
actor->audioFlags &= ~(0x10 | 0x08 | 0x04 | 0x02 | 0x01);
actor->audioFlags |= 0x08;
actor->audioFlags &= ~ACTOR_AUDIO_FLAG_SFX_ALL;
actor->audioFlags |= ACTOR_AUDIO_FLAG_SFX_CENTERED_3;
}
void func_800B9010(Actor* actor, u16 sfxId) {
/**
* Play a sfx at the actor's position using the shared audioFlag system
*/
void Actor_PlaySfx_Flagged(Actor* actor, u16 sfxId) {
actor->sfxId = sfxId;
actor->audioFlags &= ~(0x10 | 0x08 | 0x04 | 0x02 | 0x01);
actor->audioFlags |= 0x01;
actor->audioFlags &= ~ACTOR_AUDIO_FLAG_SFX_ALL;
actor->audioFlags |= ACTOR_AUDIO_FLAG_SFX_ACTOR_POS;
}
void func_800B9038(Actor* actor, s32 timer) {
actor->audioFlags &= ~(0x10 | 0x08 | 0x04 | 0x02 | 0x01);
actor->audioFlags |= 0x10;
void Actor_PlaySfx_FlaggedTimer(Actor* actor, s32 timer) {
actor->audioFlags &= ~ACTOR_AUDIO_FLAG_SFX_ALL;
actor->audioFlags |= ACTOR_AUDIO_FLAG_SFX_TIMER;
// The sfxId here are not actually sound effects, but instead this is data that gets sent into
// the io ports of the music macro language (func_801A0810 / Audio_PlaySfxAtPosWithSoundScriptIO is
// the function that it's used for)
// the io ports of the music macro language (Audio_PlaySfx_AtPosWithChannelIO / Audio_PlaySfxAtPosWithSoundScriptIO
// is the function that it's used for)
if (timer < 40) {
actor->sfxId = 3;
} else if (timer < 100) {
@@ -2235,12 +2261,12 @@ void func_800B9038(Actor* actor, s32 timer) {
}
}
void func_800B9084(Actor* actor) {
actor->audioFlags |= 0x20;
void Actor_PlaySeq_FlaggedKamaroDance(Actor* actor) {
actor->audioFlags |= ACTOR_AUDIO_FLAG_SEQ_KAMARO_DANCE;
}
void func_800B9098(Actor* actor) {
actor->audioFlags |= 0x40;
void Actor_PlaySeq_FlaggedMusicBoxHouse(Actor* actor) {
actor->audioFlags |= ACTOR_AUDIO_FLAG_SEQ_MUSIC_BOX_HOUSE;
}
s32 func_800B90AC(PlayState* play, Actor* actor, CollisionPoly* polygon, s32 bgId, Vec3f* arg4) {
@@ -2368,7 +2394,7 @@ Actor* Actor_UpdateActor(UpdateActor_Params* params) {
}
actor->sfxId = 0;
actor->audioFlags &= ~0x7F;
actor->audioFlags &= ~ACTOR_AUDIO_FLAG_ALL;
if (actor->init != NULL) {
if (Object_IsLoaded(&play->objectCtx, actor->objBankIndex)) {
@@ -2545,7 +2571,7 @@ void Actor_UpdateAll(PlayState* play, ActorContext* actorCtx) {
actor = NULL;
if (actorCtx->targetContext.unk4B != 0) {
actorCtx->targetContext.unk4B = 0;
play_sound(NA_SE_SY_LOCK_OFF);
Audio_PlaySfx(NA_SE_SY_LOCK_OFF);
}
}
@@ -2630,31 +2656,32 @@ void Actor_Draw(PlayState* play, Actor* actor) {
CLOSE_DISPS(play->state.gfxCtx);
}
void func_800B9D1C(Actor* actor) {
void Actor_UpdateFlaggedAudio(Actor* actor) {
s32 sfxId = actor->sfxId;
if (sfxId != 0) {
if (actor->audioFlags & 2) {
if (sfxId != NA_SE_NONE) {
if (actor->audioFlags & ACTOR_AUDIO_FLAG_SFX_CENTERED_1) {
AudioSfx_PlaySfx(sfxId, &actor->projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
&gSfxDefaultReverb);
} else if (actor->audioFlags & 4) {
play_sound(sfxId);
} else if (actor->audioFlags & 8) {
func_8019F128(sfxId);
} else if (actor->audioFlags & 0x10) {
func_801A0810(&gSfxDefaultPos, NA_SE_SY_TIMER - SFX_FLAG, (sfxId - 1));
} else if (actor->audioFlags & 1) {
Audio_PlaySfxAtPos(&actor->projectedPos, sfxId);
} else if (actor->audioFlags & ACTOR_AUDIO_FLAG_SFX_CENTERED_2) {
Audio_PlaySfx(sfxId);
} else if (actor->audioFlags & ACTOR_AUDIO_FLAG_SFX_CENTERED_3) {
Audio_PlaySfx_2(sfxId);
} else if (actor->audioFlags & ACTOR_AUDIO_FLAG_SFX_TIMER) {
Audio_PlaySfx_AtPosWithChannelIO(&gSfxDefaultPos, NA_SE_SY_TIMER - SFX_FLAG, (sfxId - 1));
} else if (actor->audioFlags & ACTOR_AUDIO_FLAG_SFX_ACTOR_POS) {
Audio_PlaySfx_AtPos(&actor->projectedPos, sfxId);
}
}
if (sfxId) {}
//! FAKE:
if (sfxId != NA_SE_NONE) {}
if (actor->audioFlags & 0x40) {
if (actor->audioFlags & ACTOR_AUDIO_FLAG_SEQ_MUSIC_BOX_HOUSE) {
func_801A1FB4(SEQ_PLAYER_BGM_SUB, &actor->projectedPos, NA_BGM_MUSIC_BOX_HOUSE, 1500.0f);
}
if (actor->audioFlags & 0x20) {
if (actor->audioFlags & ACTOR_AUDIO_FLAG_SEQ_KAMARO_DANCE) {
func_801A1FB4(SEQ_PLAYER_BGM_MAIN, &actor->projectedPos, NA_BGM_KAMARO_DANCE, 900.0f);
}
}
@@ -2866,8 +2893,8 @@ void Actor_DrawAll(PlayState* play, ActorContext* actorCtx) {
SkinMatrix_Vec3fMtxFMultXYZW(&play->viewProjectionMtxF, &actor->world.pos, &actor->projectedPos,
&actor->projectedW);
if (actor->audioFlags & 0x7F) {
func_800B9D1C(actor);
if (actor->audioFlags & ACTOR_AUDIO_FLAG_ALL) {
Actor_UpdateFlaggedAudio(actor);
}
if (func_800BA2D8(play, actor)) {
src/code/z_camera.c
+6 -6
View File
@@ -7403,7 +7403,7 @@ void Camera_EarthquakeDay3(Camera* camera) {
if (sEarthquakeTimer != 0) {
sEarthquakeTimer--;
func_8019F128(NA_SE_SY_EARTHQUAKE_OUTDOOR - SFX_FLAG);
Audio_PlaySfx_2(NA_SE_SY_EARTHQUAKE_OUTDOOR - SFX_FLAG);
}
}
}
@@ -7869,24 +7869,24 @@ s32 Camera_ChangeModeFlags(Camera* camera, s16 mode, u8 forceChange) {
if (camera->status == CAM_STATUS_ACTIVE) {
switch (sModeChangeFlags) {
case CAM_CHANGE_MODE_0:
play_sound(0);
Audio_PlaySfx(0);
break;
case CAM_CHANGE_MODE_1:
if (camera->play->roomCtx.curRoom.behaviorType1 == ROOM_BEHAVIOR_TYPE1_1) {
play_sound(NA_SE_SY_ATTENTION_URGENCY);
Audio_PlaySfx(NA_SE_SY_ATTENTION_URGENCY);
} else {
play_sound(NA_SE_SY_ATTENTION_ON);
Audio_PlaySfx(NA_SE_SY_ATTENTION_ON);
}
break;
case CAM_CHANGE_MODE_BATTLE:
play_sound(NA_SE_SY_ATTENTION_URGENCY);
Audio_PlaySfx(NA_SE_SY_ATTENTION_URGENCY);
break;
case CAM_CHANGE_MODE_FOLLOW_TARGET:
play_sound(NA_SE_SY_ATTENTION_ON);
Audio_PlaySfx(NA_SE_SY_ATTENTION_ON);
break;
default:
src/code/z_collision_check.c
+16 -16
View File
@@ -1534,9 +1534,9 @@ void CollisionCheck_HitSolid(PlayState* play, ColliderInfo* info, Collider* coll
if ((flags == TOUCH_SFX_NORMAL) && (collider->colType != COLTYPE_METAL)) {
EffectSsHitmark_SpawnFixedScale(play, 0, hitPos);
if (collider->actor == NULL) {
play_sound(NA_SE_IT_SHIELD_BOUND);
Audio_PlaySfx(NA_SE_IT_SHIELD_BOUND);
} else {
Audio_PlaySfxAtPos(&collider->actor->projectedPos, NA_SE_IT_SHIELD_BOUND);
Audio_PlaySfx_AtPos(&collider->actor->projectedPos, NA_SE_IT_SHIELD_BOUND);
}
} else if (flags == TOUCH_SFX_NORMAL) {
EffectSsHitmark_SpawnFixedScale(play, 3, hitPos);
@@ -1548,16 +1548,16 @@ void CollisionCheck_HitSolid(PlayState* play, ColliderInfo* info, Collider* coll
} else if (flags == TOUCH_SFX_HARD) {
EffectSsHitmark_SpawnFixedScale(play, 0, hitPos);
if (collider->actor == NULL) {
play_sound(NA_SE_IT_SHIELD_BOUND);
Audio_PlaySfx(NA_SE_IT_SHIELD_BOUND);
} else {
Audio_PlaySfxAtPos(&collider->actor->projectedPos, NA_SE_IT_SHIELD_BOUND);
Audio_PlaySfx_AtPos(&collider->actor->projectedPos, NA_SE_IT_SHIELD_BOUND);
}
} else if (flags == TOUCH_SFX_WOOD) {
EffectSsHitmark_SpawnFixedScale(play, 1, hitPos);
if (collider->actor == NULL) {
play_sound(NA_SE_IT_REFLECTION_WOOD);
Audio_PlaySfx(NA_SE_IT_REFLECTION_WOOD);
} else {
Audio_PlaySfxAtPos(&collider->actor->projectedPos, NA_SE_IT_REFLECTION_WOOD);
Audio_PlaySfx_AtPos(&collider->actor->projectedPos, NA_SE_IT_REFLECTION_WOOD);
}
}
}
@@ -1568,13 +1568,13 @@ void CollisionCheck_HitSolid(PlayState* play, ColliderInfo* info, Collider* coll
s32 CollisionCheck_SwordHitAudio(Collider* at, ColliderInfo* acInfo) {
if ((at->actor != NULL) && (at->actor->category == ACTORCAT_PLAYER)) {
if (acInfo->elemType == ELEMTYPE_UNK0) {
Audio_PlaySfxAtPos(&at->actor->projectedPos, NA_SE_IT_SWORD_STRIKE);
Audio_PlaySfx_AtPos(&at->actor->projectedPos, NA_SE_IT_SWORD_STRIKE);
} else if (acInfo->elemType == ELEMTYPE_UNK1) {
Audio_PlaySfxAtPos(&at->actor->projectedPos, NA_SE_IT_SWORD_STRIKE_HARD);
Audio_PlaySfx_AtPos(&at->actor->projectedPos, NA_SE_IT_SWORD_STRIKE_HARD);
} else if (acInfo->elemType == ELEMTYPE_UNK2) {
Audio_PlaySfxAtPos(&at->actor->projectedPos, 0);
Audio_PlaySfx_AtPos(&at->actor->projectedPos, 0);
} else if (acInfo->elemType == ELEMTYPE_UNK3) {
Audio_PlaySfxAtPos(&at->actor->projectedPos, 0);
Audio_PlaySfx_AtPos(&at->actor->projectedPos, 0);
}
}
return 1;
@@ -1614,7 +1614,7 @@ void CollisionCheck_HitEffects(PlayState* play, Collider* at, ColliderInfo* atIn
} else if (sHitInfo[ac->colType].effect == HIT_WOOD) {
if (at->actor == NULL) {
CollisionCheck_SpawnShieldParticles(play, hitPos);
play_sound(NA_SE_IT_REFLECTION_WOOD);
Audio_PlaySfx(NA_SE_IT_REFLECTION_WOOD);
} else {
CollisionCheck_SpawnShieldParticlesWood(play, hitPos, &at->actor->projectedPos);
}
@@ -1627,9 +1627,9 @@ void CollisionCheck_HitEffects(PlayState* play, Collider* at, ColliderInfo* atIn
} else {
EffectSsHitmark_SpawnFixedScale(play, 0, hitPos);
if (ac->actor == NULL) {
play_sound(NA_SE_IT_SHIELD_BOUND);
Audio_PlaySfx(NA_SE_IT_SHIELD_BOUND);
} else {
Audio_PlaySfxAtPos(&ac->actor->projectedPos, NA_SE_IT_SHIELD_BOUND);
Audio_PlaySfx_AtPos(&ac->actor->projectedPos, NA_SE_IT_SHIELD_BOUND);
}
}
}
@@ -3873,7 +3873,7 @@ void CollisionCheck_SpawnShieldParticles(PlayState* play, Vec3f* v) {
*/
void CollisionCheck_SpawnShieldParticlesMetal(PlayState* play, Vec3f* v) {
CollisionCheck_SpawnShieldParticles(play, v);
play_sound(NA_SE_IT_SHIELD_REFLECT_SW);
Audio_PlaySfx(NA_SE_IT_SHIELD_REFLECT_SW);
}
/**
@@ -3881,7 +3881,7 @@ void CollisionCheck_SpawnShieldParticlesMetal(PlayState* play, Vec3f* v) {
*/
void CollisionCheck_SpawnShieldParticlesMetalSound(PlayState* play, Vec3f* v, Vec3f* pos) {
CollisionCheck_SpawnShieldParticles(play, v);
Audio_PlaySfxAtPos(pos, NA_SE_IT_SHIELD_REFLECT_SW);
Audio_PlaySfx_AtPos(pos, NA_SE_IT_SHIELD_REFLECT_SW);
}
/**
@@ -3921,7 +3921,7 @@ void CollisionCheck_SpawnShieldParticlesWood(PlayState* play, Vec3f* v, Vec3f* p
shieldParticleInitWood.lightPoint.z = shieldParticleInitWood.position.z;
Effect_Add(play, &effectIndex, EFFECT_SHIELD_PARTICLE, 0, 1, &shieldParticleInitWood);
Audio_PlaySfxAtPos(pos, NA_SE_IT_REFLECTION_WOOD);
Audio_PlaySfx_AtPos(pos, NA_SE_IT_REFLECTION_WOOD);
}
/**
src/code/z_demo.c
+9 -11
View File
@@ -199,7 +199,7 @@ void CutsceneCmd_Misc(PlayState* play, CutsceneContext* csCtx, CsCmdMisc* cmd) {
break;
case CS_MISC_EARTHQUAKE_MEDIUM:
func_8019F128(NA_SE_EV_EARTHQUAKE_LAST - SFX_FLAG);
Audio_PlaySfx_2(NA_SE_EV_EARTHQUAKE_LAST - SFX_FLAG);
if (isFirstFrame) {
sCutsceneQuakeIndex = Quake_Request(GET_ACTIVE_CAM(play), QUAKE_TYPE_6);
Quake_SetSpeed(sCutsceneQuakeIndex, 22000);
@@ -260,7 +260,7 @@ void CutsceneCmd_Misc(PlayState* play, CutsceneContext* csCtx, CsCmdMisc* cmd) {
if (isFirstFrame) {
play->envCtx.sandstormState = 1;
}
func_8019F128(NA_SE_EV_SAND_STORM - SFX_FLAG);
Audio_PlaySfx_2(NA_SE_EV_SAND_STORM - SFX_FLAG);
break;
case CS_MISC_SUNSSONG_START:
@@ -307,7 +307,7 @@ void CutsceneCmd_Misc(PlayState* play, CutsceneContext* csCtx, CsCmdMisc* cmd) {
break;
case CS_MISC_EARTHQUAKE_STRONG:
func_8019F128(NA_SE_EV_EARTHQUAKE_LAST2 - SFX_FLAG);
Audio_PlaySfx_2(NA_SE_EV_EARTHQUAKE_LAST2 - SFX_FLAG);
if (isFirstFrame) {
sCutsceneQuakeIndex = Quake_Request(GET_ACTIVE_CAM(play), QUAKE_TYPE_6);
Quake_SetSpeed(sCutsceneQuakeIndex, 30000);
@@ -368,7 +368,7 @@ void CutsceneCmd_Misc(PlayState* play, CutsceneContext* csCtx, CsCmdMisc* cmd) {
break;
case CS_MISC_EARTHQUAKE_WEAK:
func_8019F128(NA_SE_EV_EARTHQUAKE_LAST - SFX_FLAG);
Audio_PlaySfx_2(NA_SE_EV_EARTHQUAKE_LAST - SFX_FLAG);
if (isFirstFrame) {
sCutsceneQuakeIndex = Quake_Request(GET_ACTIVE_CAM(play), QUAKE_TYPE_6);
Quake_SetSpeed(sCutsceneQuakeIndex, 22000);
@@ -442,15 +442,13 @@ void CutsceneCmd_StartAmbience(PlayState* play, CutsceneContext* csCtx, CsCmdSta
void Cutscene_SetSfxReverbIndexTo2(PlayState* play, CutsceneContext* csCtx, CsCmdSfxReverbIndexTo2* cmd) {
if (csCtx->curFrame == cmd->startFrame) {
// Audio_SetSfxReverbIndexExceptOcarinaBank
func_801A4428(2);
Audio_SetSfxReverbIndexExceptOcarinaBank(2);
}
}
void Cutscene_SetSfxReverbIndexTo1(PlayState* play, CutsceneContext* csCtx, CsCmdSfxReverbIndexTo1* cmd) {
if (csCtx->curFrame == cmd->startFrame) {
// Audio_SetSfxReverbIndexExceptOcarinaBank
func_801A4428(1);
Audio_SetSfxReverbIndexExceptOcarinaBank(1);
}
}
@@ -840,7 +838,7 @@ void CutsceneCmd_Transition(PlayState* play, CutsceneContext* csCtx, CsCmdTransi
if (cmd->type == CS_TRANS_GRAY_FILL_IN) {
play->envCtx.screenFillColor[3] = 255.0f * lerp;
if (lerp == 0.0f) {
func_8019F128(NA_SE_EV_S_STONE_FLASH);
Audio_PlaySfx_2(NA_SE_EV_S_STONE_FLASH);
}
} else {
play->envCtx.screenFillColor[3] = (1.0f - lerp) * 255.0f;
@@ -1064,7 +1062,7 @@ void CutsceneCmd_Text(PlayState* play, CutsceneContext* csCtx, CsCmdText* cmd) {
if (play->msgCtx.choiceIndex == 0) {
if (cmd->textId == 0x33BD) {
// Gorman Track: do you understand?
func_8019F230();
Audio_PlaySfx_MessageCancel();
}
if (cmd->altTextId1 != 0xFFFF) {
@@ -1082,7 +1080,7 @@ void CutsceneCmd_Text(PlayState* play, CutsceneContext* csCtx, CsCmdText* cmd) {
} else {
if (cmd->textId == 0x33BD) {
// Gorman Track: do you understand?
func_8019F208();
Audio_PlaySfx_MessageDecide();
}
if (cmd->altTextId2 != 0xFFFF) {
src/code/z_en_item00.c
+2 -2
View File
@@ -670,7 +670,7 @@ void EnItem00_Update(Actor* thisx, PlayState* play) {
}
if ((this->actor.params <= ITEM00_RUPEE_RED) || (this->actor.params == ITEM00_RUPEE_HUGE)) {
play_sound(NA_SE_SY_GET_RUPY);
Audio_PlaySfx(NA_SE_SY_GET_RUPY);
} else if (getItemId != GI_NONE) {
if (Actor_HasParent(&this->actor, play)) {
Flags_SetCollectible(play, this->collectibleFlag);
@@ -678,7 +678,7 @@ void EnItem00_Update(Actor* thisx, PlayState* play) {
}
return;
} else {
play_sound(NA_SE_SY_GET_ITEM);
Audio_PlaySfx(NA_SE_SY_GET_ITEM);
}
Flags_SetCollectible(play, this->collectibleFlag);
src/code/z_eventmgr.c
+2 -2
View File
@@ -216,11 +216,11 @@ void CutsceneManager_End(void) {
switch (csEntry->endSfx) {
case CS_END_SFX_TRE_BOX_APPEAR:
play_sound(NA_SE_SY_TRE_BOX_APPEAR);
Audio_PlaySfx(NA_SE_SY_TRE_BOX_APPEAR);
break;
case CS_END_SFX_CORRECT_CHIME:
play_sound(NA_SE_SY_CORRECT_CHIME);
Audio_PlaySfx(NA_SE_SY_CORRECT_CHIME);
break;
default: // CS_END_SFX_NONE
src/code/z_kaleido_setup.c
+1 -1
View File
@@ -114,7 +114,7 @@ void KaleidoSetup_Update(PlayState* play) {
if (ShrinkWindow_Letterbox_GetSizeTarget() != 0) {
ShrinkWindow_Letterbox_SetSizeTarget(0);
}
func_801A3AEC(1);
Audio_PlaySfx_PauseMenuOpenOrClose(SFX_PAUSE_MENU_OPEN);
}
}
}
src/code/z_lib.c
+7 -6
View File
@@ -639,16 +639,17 @@ void Color_RGBA8_Copy(Color_RGBA8* dst, Color_RGBA8* src) {
dst->a = src->a;
}
void func_801000A4(u16 sfxId) {
play_sound(sfxId);
void Lib_PlaySfx(u16 sfxId) {
Audio_PlaySfx(sfxId);
}
void func_801000CC(u16 sfxId) {
func_8019F128(sfxId);
void Lib_PlaySfx_2(u16 sfxId) {
Audio_PlaySfx_2(sfxId);
}
void Lib_PlaySfxAtPos(Vec3f* pos, u16 sfxId) {
Audio_PlaySfxAtPos(pos, sfxId);
// Unused
void Lib_PlaySfx_AtPos(Vec3f* pos, u16 sfxId) {
Audio_PlaySfx_AtPos(pos, sfxId);
}
void Lib_Vec3f_TranslateAndRotateY(Vec3f* translation, s16 rotAngle, Vec3f* src, Vec3f* dst) {
src/code/z_lifemeter.c
+1 -1
View File
@@ -407,7 +407,7 @@ void LifeMeter_UpdateSizeAndBeep(PlayState* play) {
interfaceCtx->lifeSizeChangeDirection = 0;
if (!Player_InCsMode(play) && (play->pauseCtx.state == PAUSE_STATE_OFF) &&
(play->pauseCtx.debugEditor == DEBUG_EDITOR_NONE) && LifeMeter_IsCritical() && !Play_InCsMode(play)) {
play_sound(NA_SE_SY_HITPOINT_ALARM);
Audio_PlaySfx(NA_SE_SY_HITPOINT_ALARM);
}
}
} else {
src/code/z_map_exp.c
+2 -2
View File
@@ -230,9 +230,9 @@ void Map_Update(PlayState* play) {
if ((play->pauseCtx.state <= PAUSE_STATE_OPENING_2) && (CHECK_BTN_ALL(controller->press.button, BTN_L)) &&
!Play_InCsMode(play) && !func_80106530(play)) {
if (!R_MINIMAP_DISABLED) {
play_sound(NA_SE_SY_CAMERA_ZOOM_UP);
Audio_PlaySfx(NA_SE_SY_CAMERA_ZOOM_UP);
} else {
play_sound(NA_SE_SY_CAMERA_ZOOM_DOWN);
Audio_PlaySfx(NA_SE_SY_CAMERA_ZOOM_DOWN);
}
R_MINIMAP_DISABLED ^= 1;
src/code/z_message.c
+6 -6
View File
@@ -93,13 +93,13 @@ s32 Message_ShouldAdvance(PlayState* play) {
if ((msgCtx->unk12020 == 0x10) || (msgCtx->unk12020 == 0x11)) {
if (CHECK_BTN_ALL(controller->press.button, BTN_A)) {
play_sound(NA_SE_SY_MESSAGE_PASS);
Audio_PlaySfx(NA_SE_SY_MESSAGE_PASS);
}
return CHECK_BTN_ALL(controller->press.button, BTN_A);
} else {
if (CHECK_BTN_ALL(controller->press.button, BTN_A) || CHECK_BTN_ALL(controller->press.button, BTN_B) ||
CHECK_BTN_ALL(controller->press.button, BTN_CUP)) {
play_sound(NA_SE_SY_MESSAGE_PASS);
Audio_PlaySfx(NA_SE_SY_MESSAGE_PASS);
}
return CHECK_BTN_ALL(controller->press.button, BTN_A) || CHECK_BTN_ALL(controller->press.button, BTN_B) ||
CHECK_BTN_ALL(controller->press.button, BTN_CUP);
@@ -125,7 +125,7 @@ void Message_CloseTextbox(PlayState* play) {
msgCtx->stateTimer = 2;
msgCtx->msgMode = 0x43;
msgCtx->unk12020 = 0;
play_sound(NA_SE_NONE);
Audio_PlaySfx(NA_SE_NONE);
}
}
@@ -147,7 +147,7 @@ void func_80148B98(PlayState* play, u8 arg1) {
if (msgCtx->choiceIndex > 128) {
msgCtx->choiceIndex = 0;
} else {
play_sound(NA_SE_SY_CURSOR);
Audio_PlaySfx(NA_SE_SY_CURSOR);
}
return;
} else if ((curInput->rel.stick_y < -29) && held == 0) {
@@ -156,7 +156,7 @@ void func_80148B98(PlayState* play, u8 arg1) {
if (msgCtx->choiceIndex > arg1) {
msgCtx->choiceIndex = arg1;
} else {
play_sound(NA_SE_SY_CURSOR);
Audio_PlaySfx(NA_SE_SY_CURSOR);
}
return;
} else {
@@ -422,7 +422,7 @@ u32 func_80151C9C(PlayState* play) {
Message_ContinueTextbox(
play, sBombersNotebookEventMessages
[msgCtx->bombersNotebookEventQueue[msgCtx->bombersNotebookEventQueueCount]]);
play_sound(NA_SE_SY_SCHEDULE_WRITE);
Audio_PlaySfx(NA_SE_SY_SCHEDULE_WRITE);
return true;
}
}
src/code/z_parameter.c
+23 -23
View File
@@ -2331,7 +2331,7 @@ void Interface_UpdateButtonsPart1(PlayState* play) {
} else if (CHECK_BTN_ALL(CONTROLLER1(&play->state)->press.button, BTN_A) || (func_801A5100() == 1)) {
if (!(CHECK_EVENTINF(EVENTINF_41)) ||
((CHECK_EVENTINF(EVENTINF_41)) && (CutsceneManager_GetCurrentCsId() == CS_ID_NONE))) {
play_sound(NA_SE_SY_CAMERA_SHUTTER);
Audio_PlaySfx(NA_SE_SY_CAMERA_SHUTTER);
SREG(89) = 1;
play->haltAllActors = true;
sPictoState = PICTO_BOX_STATE_SETUP_PHOTO;
@@ -2344,13 +2344,13 @@ void Interface_UpdateButtonsPart1(PlayState* play) {
player->stateFlags1 &= ~PLAYER_STATE1_200;
Message_CloseTextbox(play);
if (play->msgCtx.choiceIndex != 0) {
func_8019F230();
Audio_PlaySfx_MessageCancel();
func_80115844(play, DO_ACTION_STOP);
Interface_SetHudVisibility(HUD_VISIBILITY_A_B);
sPictoState = PICTO_BOX_STATE_LENS;
REMOVE_QUEST_ITEM(QUEST_PICTOGRAPH);
} else {
func_8019F208();
Audio_PlaySfx_MessageDecide();
interfaceCtx->unk_222 = interfaceCtx->unk_224 = 0;
restoreHudVisibility = true;
Interface_SetHudVisibility(HUD_VISIBILITY_ALL);
@@ -3250,7 +3250,7 @@ void func_80115428(InterfaceContext* interfaceCtx, u16 doAction, s16 loadOffset)
*/
s32 Health_ChangeBy(PlayState* play, s16 healthChange) {
if (healthChange > 0) {
play_sound(NA_SE_SY_HP_RECOVER);
Audio_PlaySfx(NA_SE_SY_HP_RECOVER);
} else if (gSaveContext.save.saveInfo.playerData.doubleDefense && (healthChange < 0)) {
healthChange >>= 1;
}
@@ -3369,7 +3369,7 @@ s32 Magic_Consume(PlayState* play, s16 magicToConsume, s16 type) {
// Not enough magic available to consume
if ((gSaveContext.save.saveInfo.playerData.magic - magicToConsume) < 0) {
if (gSaveContext.magicCapacity != 0) {
play_sound(NA_SE_SY_ERROR);
Audio_PlaySfx(NA_SE_SY_ERROR);
}
return false;
}
@@ -3390,7 +3390,7 @@ s32 Magic_Consume(PlayState* play, s16 magicToConsume, s16 type) {
gSaveContext.magicState = MAGIC_STATE_CONSUME_SETUP;
return true;
} else {
play_sound(NA_SE_SY_ERROR);
Audio_PlaySfx(NA_SE_SY_ERROR);
return false;
}
@@ -3409,7 +3409,7 @@ s32 Magic_Consume(PlayState* play, s16 magicToConsume, s16 type) {
gSaveContext.magicState = MAGIC_STATE_METER_FLASH_3;
return true;
} else {
play_sound(NA_SE_SY_ERROR);
Audio_PlaySfx(NA_SE_SY_ERROR);
return false;
}
@@ -3440,7 +3440,7 @@ s32 Magic_Consume(PlayState* play, s16 magicToConsume, s16 type) {
gSaveContext.magicState = MAGIC_STATE_METER_FLASH_2;
return true;
} else {
play_sound(NA_SE_SY_ERROR);
Audio_PlaySfx(NA_SE_SY_ERROR);
return false;
}
@@ -3484,7 +3484,7 @@ s32 Magic_Consume(PlayState* play, s16 magicToConsume, s16 type) {
gSaveContext.save.saveInfo.playerData.magic -= magicToConsume;
return true;
} else {
play_sound(NA_SE_SY_ERROR);
Audio_PlaySfx(NA_SE_SY_ERROR);
return false;
}
}
@@ -3495,7 +3495,7 @@ s32 Magic_Consume(PlayState* play, s16 magicToConsume, s16 type) {
void Magic_UpdateAddRequest(void) {
if (gSaveContext.isMagicRequested) {
gSaveContext.save.saveInfo.playerData.magic += 4;
play_sound(NA_SE_SY_GAUGE_UP - SFX_FLAG);
Audio_PlaySfx(NA_SE_SY_GAUGE_UP - SFX_FLAG);
if (((void)0, gSaveContext.save.saveInfo.playerData.magic) >= ((void)0, gSaveContext.magicCapacity)) {
gSaveContext.save.saveInfo.playerData.magic = gSaveContext.magicCapacity;
@@ -3599,7 +3599,7 @@ void Magic_Update(PlayState* play) {
gSaveContext.save.saveInfo.playerData.magic += 0x10;
if ((gSaveContext.gameMode == GAMEMODE_NORMAL) && (gSaveContext.sceneLayer < 4)) {
play_sound(NA_SE_SY_GAUGE_UP - SFX_FLAG);
Audio_PlaySfx(NA_SE_SY_GAUGE_UP - SFX_FLAG);
}
if (((void)0, gSaveContext.save.saveInfo.playerData.magic) >= ((void)0, gSaveContext.magicFillTarget)) {
@@ -3655,7 +3655,7 @@ void Magic_Update(PlayState* play) {
!play->actorCtx.lensActive) {
// Deactivate Lens of Truth and set magic state to idle
play->actorCtx.lensActive = false;
play_sound(NA_SE_SY_GLASSMODE_OFF);
Audio_PlaySfx(NA_SE_SY_GLASSMODE_OFF);
gSaveContext.magicState = MAGIC_STATE_IDLE;
sMagicMeterOutlinePrimRed = sMagicMeterOutlinePrimGreen = sMagicMeterOutlinePrimBlue = 255;
break;
@@ -5761,16 +5761,16 @@ void Interface_DrawTimers(PlayState* play) {
// Use seconds to determine when to beep
if (gSaveContext.timerCurTimes[sTimerId] > SECONDS_TO_TIMER(60)) {
if ((sTimerBeepSfxSeconds != sTimerDigits[4]) && (sTimerDigits[4] == 1)) {
play_sound(NA_SE_SY_MESSAGE_WOMAN);
Audio_PlaySfx(NA_SE_SY_MESSAGE_WOMAN);
sTimerBeepSfxSeconds = sTimerDigits[4];
}
} else if (gSaveContext.timerCurTimes[sTimerId] > SECONDS_TO_TIMER(10)) {
if ((sTimerBeepSfxSeconds != sTimerDigits[4]) && ((sTimerDigits[4] % 2) != 0)) {
play_sound(NA_SE_SY_WARNING_COUNT_N);
Audio_PlaySfx(NA_SE_SY_WARNING_COUNT_N);
sTimerBeepSfxSeconds = sTimerDigits[4];
}
} else if (sTimerBeepSfxSeconds != sTimerDigits[4]) {
play_sound(NA_SE_SY_WARNING_COUNT_E);
Audio_PlaySfx(NA_SE_SY_WARNING_COUNT_E);
sTimerBeepSfxSeconds = sTimerDigits[4];
}
} else { // TIMER_COUNT_UP
@@ -5814,7 +5814,7 @@ void Interface_DrawTimers(PlayState* play) {
(gSaveContext.save.entrance == ENTRANCE(ROMANI_RANCH, 0))) {
if ((gSaveContext.timerCurTimes[sTimerId] > SECONDS_TO_TIMER(110)) &&
(sTimerBeepSfxSeconds != sTimerDigits[4])) {
play_sound(NA_SE_SY_WARNING_COUNT_E);
Audio_PlaySfx(NA_SE_SY_WARNING_COUNT_E);
sTimerBeepSfxSeconds = sTimerDigits[4];
}
} else if (CHECK_EVENTINF(EVENTINF_34) && (play->sceneId == SCENE_DEKUTES)) {
@@ -5822,7 +5822,7 @@ void Interface_DrawTimers(PlayState* play) {
(gSaveContext.save.saveInfo.dekuPlaygroundHighScores[CURRENT_DAY - 1] -
SECONDS_TO_TIMER(9))) &&
(sTimerBeepSfxSeconds != sTimerDigits[4])) {
play_sound(NA_SE_SY_WARNING_COUNT_E);
Audio_PlaySfx(NA_SE_SY_WARNING_COUNT_E);
sTimerBeepSfxSeconds = sTimerDigits[4];
}
}
@@ -6716,7 +6716,7 @@ void Interface_Update(PlayState* play) {
gSaveContext.save.saveInfo.playerData.health += 4;
if ((gSaveContext.save.saveInfo.playerData.health & 0xF) < 4) {
play_sound(NA_SE_SY_HP_RECOVER);
Audio_PlaySfx(NA_SE_SY_HP_RECOVER);
}
if (((void)0, gSaveContext.save.saveInfo.playerData.health) >=
@@ -6749,7 +6749,7 @@ void Interface_Update(PlayState* play) {
if (gSaveContext.save.saveInfo.playerData.rupees < CUR_CAPACITY(UPG_WALLET)) {
gSaveContext.rupeeAccumulator--;
gSaveContext.save.saveInfo.playerData.rupees++;
play_sound(NA_SE_SY_RUPY_COUNT);
Audio_PlaySfx(NA_SE_SY_RUPY_COUNT);
} else {
// Max rupees
gSaveContext.save.saveInfo.playerData.rupees = CUR_CAPACITY(UPG_WALLET);
@@ -6762,11 +6762,11 @@ void Interface_Update(PlayState* play) {
if (gSaveContext.save.saveInfo.playerData.rupees < 0) {
gSaveContext.save.saveInfo.playerData.rupees = 0;
}
play_sound(NA_SE_SY_RUPY_COUNT);
Audio_PlaySfx(NA_SE_SY_RUPY_COUNT);
} else {
gSaveContext.rupeeAccumulator++;
gSaveContext.save.saveInfo.playerData.rupees--;
play_sound(NA_SE_SY_RUPY_COUNT);
Audio_PlaySfx(NA_SE_SY_RUPY_COUNT);
}
} else {
gSaveContext.rupeeAccumulator = 0;
@@ -6799,9 +6799,9 @@ void Interface_Update(PlayState* play) {
interfaceCtx->minigameState++;
if (interfaceCtx->minigameState == MINIGAME_STATE_COUNTDOWN_GO) {
interfaceCtx->minigameCountdownScale = 160;
play_sound(NA_SE_SY_START_SHOT);
Audio_PlaySfx(NA_SE_SY_START_SHOT);
} else {
play_sound(NA_SE_SY_WARNING_COUNT_E);
Audio_PlaySfx(NA_SE_SY_WARNING_COUNT_E);
}
break;
src/code/z_play.c
+3 -3
View File
@@ -824,7 +824,7 @@ void Play_UpdateTransition(PlayState* this) {
break;
case TRANS_MODE_SANDSTORM:
func_8019F128(NA_SE_EV_SAND_STORM - SFX_FLAG);
Audio_PlaySfx_2(NA_SE_EV_SAND_STORM - SFX_FLAG);
if (this->transitionTrigger == TRANS_TRIGGER_END) {
if (this->envCtx.sandstormPrimA < 110) {
gTransitionTileState = TRANS_TILE_OFF;
@@ -859,7 +859,7 @@ void Play_UpdateTransition(PlayState* this) {
break;
case TRANS_MODE_SANDSTORM_END:
func_8019F128(NA_SE_EV_SAND_STORM - SFX_FLAG);
Audio_PlaySfx_2(NA_SE_EV_SAND_STORM - SFX_FLAG);
if (this->transitionTrigger == TRANS_TRIGGER_END) {
if (this->envCtx.sandstormPrimA <= 0) {
@@ -1064,7 +1064,7 @@ void Play_Update(PlayState* this) {
this->msgCtx.msgMode = 0;
this->msgCtx.currentTextId = 0;
this->msgCtx.stateTimer = 0;
play_sound(NA_SE_SY_CANCEL);
Audio_PlaySfx(NA_SE_SY_CANCEL);
}
if (sBombersNotebookOpen) {
BombersNotebook_Update(this, &sBombersNotebook, this->state.input);
src/code/z_play_hireso.c
+8 -8
View File
@@ -1223,13 +1223,13 @@ void BombersNotebook_Update(PlayState* play, BombersNotebook* this, Input* input
while (true) {
cursorEntryScan -= BOMBERS_NOTEBOOK_ENTRY_SIZE;
if (cursorEntryScan == 0) {
play_sound(NA_SE_SY_ERROR);
Audio_PlaySfx(NA_SE_SY_ERROR);
break;
}
if (CHECK_WEEKEVENTREG(gBombersNotebookWeekEventFlags[BOMBERS_NOTEBOOK_ENTRY_GET_EVENT(
this->cursorPageRow + this->cursorPage,
cursorEntryScan - BOMBERS_NOTEBOOK_ENTRY_SIZE)])) {
play_sound(NA_SE_SY_ERROR);
Audio_PlaySfx(NA_SE_SY_ERROR);
break;
}
}
@@ -1238,7 +1238,7 @@ void BombersNotebook_Update(PlayState* play, BombersNotebook* this, Input* input
if (CHECK_WEEKEVENTREG(gBombersNotebookWeekEventFlags[BOMBERS_NOTEBOOK_ENTRY_GET_EVENT(
this->cursorPageRow + this->cursorPage,
cursorEntryScan - BOMBERS_NOTEBOOK_ENTRY_SIZE)])) {
play_sound(NA_SE_SY_CURSOR);
Audio_PlaySfx(NA_SE_SY_CURSOR);
break;
}
}
@@ -1250,7 +1250,7 @@ void BombersNotebook_Update(PlayState* play, BombersNotebook* this, Input* input
if (CHECK_WEEKEVENTREG(gBombersNotebookWeekEventFlags[BOMBERS_NOTEBOOK_ENTRY_GET_EVENT(
this->cursorPageRow + this->cursorPage,
cursorEntryScan - BOMBERS_NOTEBOOK_ENTRY_SIZE)])) {
play_sound(NA_SE_SY_CURSOR);
Audio_PlaySfx(NA_SE_SY_CURSOR);
break;
}
} while (cursorEntryScan != 0);
@@ -1276,7 +1276,7 @@ void BombersNotebook_Update(PlayState* play, BombersNotebook* this, Input* input
if (stickAdjY < -30) {
if (this->cursorPageRow < 3) {
play_sound(NA_SE_SY_CURSOR);
Audio_PlaySfx(NA_SE_SY_CURSOR);
this->cursorEntry = 0;
this->cursorPageRow++;
} else if (this->cursorPage < (BOMBERS_NOTEBOOK_PERSON_MAX - 4)) {
@@ -1290,11 +1290,11 @@ void BombersNotebook_Update(PlayState* play, BombersNotebook* this, Input* input
}
} else if (stickAdjY > 30) {
if (this->cursorPageRow > 0) {
play_sound(NA_SE_SY_CURSOR);
Audio_PlaySfx(NA_SE_SY_CURSOR);
this->cursorEntry = 0;
this->cursorPageRow--;
} else if (this->cursorPage != 0) {
play_sound(NA_SE_SY_CURSOR);
Audio_PlaySfx(NA_SE_SY_CURSOR);
this->cursorPage--;
if (sStickYRepeatState == 1) {
this->scrollAmount = 24;
@@ -1308,7 +1308,7 @@ void BombersNotebook_Update(PlayState* play, BombersNotebook* this, Input* input
} else if (this->scrollAmount < 0) {
this->scrollOffset += this->scrollAmount;
if (ABS_ALT(this->scrollOffset) >= 48) {
play_sound(NA_SE_SY_CURSOR);
Audio_PlaySfx(NA_SE_SY_CURSOR);
this->scrollOffset = 0;
this->scrollAmount = 0;
this->cursorPage++;
src/code/z_player_lib.c
+1 -1
View File
@@ -637,7 +637,7 @@ PlayerItemAction func_80123810(PlayState* play) {
Interface_SetHudVisibility(play->msgCtx.unk_120BC);
if ((itemId >= ITEM_FD) || ((itemAction = play->unk_18794(play, player, itemId)) <= PLAYER_IA_MINUS1)) {
play_sound(NA_SE_SY_ERROR);
Audio_PlaySfx(NA_SE_SY_ERROR);
return PLAYER_IA_MINUS1;
} else {
s32 pad;
src/code/z_sound_source.c
+2 -2
View File
@@ -21,7 +21,7 @@ void SoundSource_UpdateAll(PlayState* play) {
} else {
SkinMatrix_Vec3fMtxFMultXYZ(&play->viewProjectionMtxF, &source->worldPos, &source->projectedPos);
if (source->playSfxEachFrame) {
Audio_PlaySfxAtPos(&source->projectedPos, source->sfxId);
Audio_PlaySfx_AtPos(&source->projectedPos, source->sfxId);
}
}
}
@@ -64,7 +64,7 @@ void SoundSource_Add(PlayState* play, Vec3f* worldPos, u32 duration, u16 sfxId,
source->sfxId = sfxId;
SkinMatrix_Vec3fMtxFMultXYZ(&play->viewProjectionMtxF, &source->worldPos, &source->projectedPos);
Audio_PlaySfxAtPos(&source->projectedPos, sfxId);
Audio_PlaySfx_AtPos(&source->projectedPos, sfxId);
}
void SoundSource_PlaySfxAtFixedWorldPos(PlayState* play, Vec3f* worldPos, u32 duration, u16 sfxId) {
src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c
+4 -4
View File
@@ -135,7 +135,7 @@ void ArmsHook_Shoot(ArmsHook* this, PlayState* play) {
return;
}
func_800B8F98(&player->actor, NA_SE_IT_HOOKSHOT_CHAIN - SFX_FLAG);
Actor_PlaySfx_FlaggedCentered1(&player->actor, NA_SE_IT_HOOKSHOT_CHAIN - SFX_FLAG);
ArmsHook_CheckForCancel(this);
if ((this->timer != 0) && (this->collider.base.atFlags & AT_HIT) &&
@@ -151,7 +151,7 @@ void ArmsHook_Shoot(ArmsHook* this, PlayState* play) {
}
}
this->timer = 0;
Audio_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_IT_HOOKSHOT_STICK_CRE);
Audio_PlaySfx_AtPos(&this->actor.projectedPos, NA_SE_IT_HOOKSHOT_STICK_CRE);
return;
}
@@ -260,10 +260,10 @@ void ArmsHook_Shoot(ArmsHook* this, PlayState* play) {
ArmsHook_AttachHookToActor(this, &dynaPolyActor->actor);
}
func_808C1154(this);
Audio_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_IT_HOOKSHOT_STICK_OBJ);
Audio_PlaySfx_AtPos(&this->actor.projectedPos, NA_SE_IT_HOOKSHOT_STICK_OBJ);
} else {
CollisionCheck_SpawnShieldParticlesMetal(play, &this->actor.world.pos);
Audio_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_IT_HOOKSHOT_REFLECT);
Audio_PlaySfx_AtPos(&this->actor.projectedPos, NA_SE_IT_HOOKSHOT_REFLECT);
}
} else if (CHECK_BTN_ANY(CONTROLLER1(&play->state)->press.button,
BTN_A | BTN_B | BTN_R | BTN_CUP | BTN_CLEFT | BTN_CRIGHT | BTN_CDOWN)) {
src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c
+1 -1
View File
@@ -100,7 +100,7 @@ void FireArrow_ChargeAndWait(ArrowFire* this, PlayState* play) {
this->actor.world.pos = arrow->actor.world.pos;
this->actor.shape.rot = arrow->actor.shape.rot;
func_800B9010(&this->actor, NA_SE_PL_ARROW_CHARGE_FIRE - SFX_FLAG);
Actor_PlaySfx_Flagged(&this->actor, NA_SE_PL_ARROW_CHARGE_FIRE - SFX_FLAG);
// if arrow has no parent, player has fired the arrow
if (arrow->actor.parent == NULL) {
src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c
+1 -1
View File
@@ -76,7 +76,7 @@ void ArrowIce_Charge(ArrowIce* this, PlayState* play) {
this->actor.world.pos = arrow->actor.world.pos;
this->actor.shape.rot = arrow->actor.shape.rot;
func_800B9010(&this->actor, NA_SE_PL_ARROW_CHARGE_ICE - SFX_FLAG);
Actor_PlaySfx_Flagged(&this->actor, NA_SE_PL_ARROW_CHARGE_ICE - SFX_FLAG);
// if arrow has no parent, player has fired the arrow
if (arrow->actor.parent == NULL) {
src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c
+1 -1
View File
@@ -75,7 +75,7 @@ void ArrowLight_Charge(ArrowLight* this, PlayState* play) {
this->actor.world.pos = arrow->actor.world.pos;
this->actor.shape.rot = arrow->actor.shape.rot;
func_800B9010(&this->actor, NA_SE_PL_ARROW_CHARGE_LIGHT - SFX_FLAG);
Actor_PlaySfx_Flagged(&this->actor, NA_SE_PL_ARROW_CHARGE_LIGHT - SFX_FLAG);
if (arrow->actor.parent == NULL) {
this->firedPos = this->actor.world.pos;
this->radius = 10;
src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c
+1 -1
View File
@@ -291,7 +291,7 @@ void func_808B78A4(BgBreakwall* this, PlayState* play) {
void func_808B78DC(BgBreakwall* this, PlayState* play) {
Actor_SetScale(&this->dyna.actor, 3.5f);
func_800B9010(&this->dyna.actor, NA_SE_EV_TORNADE - SFX_FLAG);
Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_EV_TORNADE - SFX_FLAG);
}
void func_808B7914(BgBreakwall* this, PlayState* play) {
src/overlays/actors/ovl_Bg_Crace_Movebg/z_bg_crace_movebg.c
+3 -3
View File
@@ -171,7 +171,7 @@ void BgCraceMovebg_OpeningDoor_SetupOpen(BgCraceMovebg* this, PlayState* play) {
* Silde open, then do nothing.
*/
void BgCraceMovebg_OpeningDoor_Open(BgCraceMovebg* this, PlayState* play) {
func_800B9010(&this->dyna.actor, NA_SE_EV_STONEDOOR_OPEN_S - SFX_FLAG);
Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_EV_STONEDOOR_OPEN_S - SFX_FLAG);
Math_SmoothStepToF(&this->doorHeight, this->targetDoorHeight, 2.0f, this->openSpeed, 0.01f);
this->dyna.actor.world.pos.y = this->dyna.actor.home.pos.y + this->doorHeight;
if (this->doorHeight == this->targetDoorHeight) {
@@ -330,12 +330,12 @@ void BgCraceMovebg_ClosingDoor_Close(BgCraceMovebg* this, PlayState* play) {
!Flags_GetSwitch(play, BG_CRACE_MOVEBG_GET_SWITCH_FLAG(&this->dyna.actor) + 1)) {
play->haltAllActors = true;
func_80169FDC(&play->state);
play_sound(NA_SE_OC_ABYSS);
Audio_PlaySfx(NA_SE_OC_ABYSS);
}
BgCraceMovebg_ClosingDoor_SetupDoNothing(this, play);
} else {
func_800B9010(&this->dyna.actor, NA_SE_EV_STONEDOOR_CLOSE_S - SFX_FLAG);
Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_EV_STONEDOOR_CLOSE_S - SFX_FLAG);
}
}
src/overlays/actors/ovl_Bg_Ctower_Gear/z_bg_ctower_gear.c
+1 -1
View File
@@ -153,7 +153,7 @@ void BgCtowerGear_Update(Actor* thisx, PlayState* play) {
this->dyna.actor.shape.rot.x -= 0x1F4;
} else if (type == BGCTOWERGEAR_CENTER_COG) {
this->dyna.actor.shape.rot.y += 0x1F4;
func_800B9010(&this->dyna.actor, NA_SE_EV_WINDMILL_LEVEL - SFX_FLAG);
Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_EV_WINDMILL_LEVEL - SFX_FLAG);
} else if (type == BGCTOWERGEAR_WATER_WHEEL) {
this->dyna.actor.shape.rot.z -= 0x1F4;
BgCtowerGear_Splash(this, play);
src/overlays/actors/ovl_Bg_Ctower_Rot/z_bg_ctower_rot.c
+2 -2
View File
@@ -89,7 +89,7 @@ void BgCtowerRot_CorridorRotate(BgCtowerRot* this, PlayState* play) {
this->dyna.actor.shape.rot.z = rotZ * 16.384f;
if (play->csCtx.curFrame == 132) {
play_sound(NA_SE_SY_SPIRAL_DASH);
Audio_PlaySfx(NA_SE_SY_SPIRAL_DASH);
}
}
@@ -104,7 +104,7 @@ void BgCtowerRot_DoorClose(BgCtowerRot* this, PlayState* play) {
}
this->actionFunc = BgCtowerRot_DoorDoNothing;
} else if (this->dyna.actor.params == BGCTOWERROT_STONE_DOOR_MAIN) {
func_800B9010(&this->dyna.actor, NA_SE_EV_STONE_STATUE_OPEN - SFX_FLAG);
Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_EV_STONE_STATUE_OPEN - SFX_FLAG);
}
this->dyna.actor.world.pos.x =
this->dyna.actor.home.pos.x + (Math_SinS(this->dyna.actor.world.rot.y) * this->timer);
src/overlays/actors/ovl_Bg_Dblue_Balance/z_bg_dblue_balance.c
+3 -2
View File
@@ -476,7 +476,7 @@ void func_80B82DE0(BgDblueBalance* this, PlayState* play) {
phi_f2 = 1.0f;
}
func_8019FAD8(&this->dyna.actor.projectedPos, NA_SE_EV_SEESAW_INCLINE - SFX_FLAG, phi_f2 + 1.0f);
Audio_PlaySfx_AtPosWithFreq(&this->dyna.actor.projectedPos, NA_SE_EV_SEESAW_INCLINE - SFX_FLAG, phi_f2 + 1.0f);
actor->shape.rot.z += this->unk_178;
if (this->dyna.actor.shape.rot.z > 0x1C71) {
@@ -691,7 +691,8 @@ void func_80B83758(Actor* thisx, PlayState* play) {
temp_f0 = this->unk_178 * 0.002f;
temp_f0 = CLAMP(temp_f0, 0.0f, 1.0f);
}
func_8019FB0C(&this->dyna.actor.projectedPos, NA_SE_EV_SMALL_WATER_WHEEL - SFX_FLAG, temp_f0, 0x20);
Audio_PlaySfx_AtPosWithFreqAndChannelIO(&this->dyna.actor.projectedPos, NA_SE_EV_SMALL_WATER_WHEEL - SFX_FLAG,
temp_f0, 0x20);
}
if (this->dyna.actor.flags & ACTOR_FLAG_40) {
src/overlays/actors/ovl_Bg_Dblue_Movebg/z_bg_dblue_movebg.c
+10 -8
View File
@@ -432,11 +432,11 @@ void func_80A2A444(BgDblueMovebg* this, PlayState* play) {
}
if (!(this->unk_174 & 1) && (this->unk_172 & 1)) {
func_801000CC(NA_SE_EV_PIPE_STREAM_START);
Lib_PlaySfx_2(NA_SE_EV_PIPE_STREAM_START);
}
func_80A2A670(this, play);
} else {
func_800B9010(&this->dyna.actor, NA_SE_EV_COCK_SWITCH_ROLL - SFX_FLAG);
Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_EV_COCK_SWITCH_ROLL - SFX_FLAG);
}
}
@@ -533,14 +533,14 @@ void func_80A2A7F8(BgDblueMovebg* this, PlayState* play) {
}
if (!(this->unk_174 & 1) && (this->unk_172 & 1)) {
func_801000CC(NA_SE_EV_PIPE_STREAM_START);
Lib_PlaySfx_2(NA_SE_EV_PIPE_STREAM_START);
}
this->unk_174 = this->unk_172;
this->unk_1D0 = 17;
this->actionFunc = func_80A2AAB8;
} else {
func_800B9010(&this->dyna.actor, NA_SE_EV_COCK_SWITCH_ROLL - SFX_FLAG);
Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_EV_COCK_SWITCH_ROLL - SFX_FLAG);
}
}
@@ -739,9 +739,9 @@ void func_80A2B274(Actor* thisx, PlayState* play) {
temp_v1 = D_80A2B96C[func_80A29A80(play, this->unk_1C0, this->unk_1BC)];
if (temp_v1 != 0) {
if (temp_v1 > 0) {
func_8019FC20(&this->dyna.actor.projectedPos, NA_SE_EV_DUMMY_WATER_WHEEL_RR - SFX_FLAG);
Audio_PlaySfx_WaterWheel(&this->dyna.actor.projectedPos, NA_SE_EV_DUMMY_WATER_WHEEL_RR - SFX_FLAG);
} else {
func_8019FC20(&this->dyna.actor.projectedPos, NA_SE_EV_DUMMY_WATER_WHEEL_LR - SFX_FLAG);
Audio_PlaySfx_WaterWheel(&this->dyna.actor.projectedPos, NA_SE_EV_DUMMY_WATER_WHEEL_LR - SFX_FLAG);
}
}
}
@@ -856,9 +856,11 @@ void BgDblueMovebg_Draw(Actor* thisx, PlayState* play2) {
if ((this->unk_160 == 9) || (this->unk_160 == 8)) {
if (this->unk_1CC >= 0) {
func_8019FB0C(&this->unk_1A8, NA_SE_EV_BIG_WATER_WHEEL_RR - SFX_FLAG, this->unk_1D4, 32);
Audio_PlaySfx_AtPosWithFreqAndChannelIO(&this->unk_1A8, NA_SE_EV_BIG_WATER_WHEEL_RR - SFX_FLAG,
this->unk_1D4, 32);
} else {
func_8019FB0C(&this->unk_1A8, NA_SE_EV_BIG_WATER_WHEEL_LR - SFX_FLAG, this->unk_1D4, 32);
Audio_PlaySfx_AtPosWithFreqAndChannelIO(&this->unk_1A8, NA_SE_EV_BIG_WATER_WHEEL_LR - SFX_FLAG,
this->unk_1D4, 32);
}
}
}
src/overlays/actors/ovl_Bg_Dblue_Waterfall/z_bg_dblue_waterfall.c
+2 -2
View File
@@ -531,7 +531,7 @@ void func_80B84BCC(BgDblueWaterfall* this, PlayState* play) {
}
}
func_800B9010(&this->actor, NA_SE_EV_ICE_FREEZE - SFX_FLAG);
Actor_PlaySfx_Flagged(&this->actor, NA_SE_EV_ICE_FREEZE - SFX_FLAG);
} else {
if (this->unk_1A3) {
CutsceneManager_Stop(this->csId);
@@ -570,7 +570,7 @@ void func_80B84F20(BgDblueWaterfall* this, PlayState* play) {
this->unk_19F = 0;
}
func_800B9010(&this->actor, NA_SE_EV_ICE_MELT_LEVEL - SFX_FLAG);
Actor_PlaySfx_Flagged(&this->actor, NA_SE_EV_ICE_MELT_LEVEL - SFX_FLAG);
} else {
if (this->unk_1A3) {
CutsceneManager_Stop(this->csId);
src/overlays/actors/ovl_Bg_F40_Block/z_bg_f40_block.c
+3 -3
View File
@@ -292,17 +292,17 @@ void func_80BC4228(BgF40Block* this, PlayState* play) {
switch (this->unk_168) {
case 0:
case 3:
func_800B9010(&this->dyna.actor, NA_SE_EV_IKANA_BLOCK_MOVE_X - SFX_FLAG);
Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_EV_IKANA_BLOCK_MOVE_X - SFX_FLAG);
break;
case 1:
case 4:
func_800B9010(&this->dyna.actor, NA_SE_EV_IKANA_BLOCK_MOVE_Y - SFX_FLAG);
Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_EV_IKANA_BLOCK_MOVE_Y - SFX_FLAG);
break;
case 2:
case 5:
func_800B9010(&this->dyna.actor, NA_SE_EV_IKANA_BLOCK_MOVE_Z - SFX_FLAG);
Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_EV_IKANA_BLOCK_MOVE_Z - SFX_FLAG);
break;
}
}
src/overlays/actors/ovl_Bg_Fire_Wall/z_bg_fire_wall.c
+1 -1
View File
@@ -182,7 +182,7 @@ void BgFireWall_Update(Actor* thisx, PlayState* play2) {
}
}
if (this->actionFunc == func_809AC6C0) {
func_800B9010(&this->actor, NA_SE_EV_FIRE_PLATE - SFX_FLAG);
Actor_PlaySfx_Flagged(&this->actor, NA_SE_EV_FIRE_PLATE - SFX_FLAG);
if ((this->unk_14C == 0) || ((this->unk_14C != 0) && (this->actor.xzDistToPlayer < 240.0f))) {
func_809AC7F8(this, play);
CollisionCheck_SetAT(play, &play->colChkCtx, &this->collider.base);
src/overlays/actors/ovl_Bg_Fu_Kaiten/z_bg_fu_kaiten.c
+1 -1
View File
@@ -56,7 +56,7 @@ void BgFuKaiten_UpdateRotation(BgFuKaiten* this) {
this->dyna.actor.shape.rot.y += this->rotationSpeed;
if (this->rotationSpeed > 0) {
f0 = this->rotationSpeed * 0.002f;
func_8019FAD8(&this->dyna.actor.projectedPos, NA_SE_EV_WOOD_GEAR - SFX_FLAG, f0);
Audio_PlaySfx_AtPosWithFreq(&this->dyna.actor.projectedPos, NA_SE_EV_WOOD_GEAR - SFX_FLAG, f0);
}
}
src/overlays/actors/ovl_Bg_Fu_Mizu/z_bg_fu_mizu.c
+2 -2
View File
@@ -75,9 +75,9 @@ void BgFuMizu_Update(Actor* thisx, PlayState* play) {
}
if (Math_SmoothStepToF(&this->dyna.actor.world.pos.y, heightTarget, 0.05f, 1.0f, 0.5f) > 1.0f) {
if (this->unk_160 == 1) {
func_800B9010(&this->dyna.actor, NA_SE_EV_WATER_LEVEL_DOWN_FIX - SFX_FLAG);
Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_EV_WATER_LEVEL_DOWN_FIX - SFX_FLAG);
} else {
func_800B9010(&this->dyna.actor, NA_SE_EV_WATER_LEVEL_DOWN_FIX - SFX_FLAG);
Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_EV_WATER_LEVEL_DOWN_FIX - SFX_FLAG);
}
}
}
src/overlays/actors/ovl_Bg_Goron_Oyu/z_bg_goron_oyu.c
+1 -1
View File
@@ -74,7 +74,7 @@ void func_80B40160(BgGoronOyu* this, PlayState* play) {
func_80B40080(this);
}
Audio_PlaySfxAtPos(&D_80B40780, NA_SE_EV_WATER_LEVEL_DOWN - SFX_FLAG);
Audio_PlaySfx_AtPos(&D_80B40780, NA_SE_EV_WATER_LEVEL_DOWN - SFX_FLAG);
}
void func_80B401F8(BgGoronOyu* this, PlayState* play) {
src/overlays/actors/ovl_Bg_Haka_Curtain/z_bg_haka_curtain.c
+1 -1
View File
@@ -110,7 +110,7 @@ void func_80B6DD9C(BgHakaCurtain* this, PlayState* play) {
func_80B6DE80(this);
return;
}
func_800B9010(&this->dyna.actor, NA_SE_EV_CURTAIN_DOWN - SFX_FLAG);
Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_EV_CURTAIN_DOWN - SFX_FLAG);
}
void func_80B6DE80(BgHakaCurtain* this) {
src/overlays/actors/ovl_Bg_Hakugin_Elvpole/z_bg_hakugin_elvpole.c
+1 -1
View File
@@ -99,7 +99,7 @@ void func_80ABD92C(BgHakuginElvpole* this, PlayState* play) {
this->unk_15C++;
this->dyna.actor.world.pos.x = (Math_SinS(this->unk_15C * 0x2000) * var_fv1) + this->dyna.actor.home.pos.x;
this->dyna.actor.world.pos.z = (Math_CosS(this->unk_15C * 0x2000) * var_fv1) + this->dyna.actor.home.pos.z;
func_800B9010(&this->dyna.actor, NA_SE_EV_PLATE_LIFT_LEVEL - SFX_FLAG);
Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_EV_PLATE_LIFT_LEVEL - SFX_FLAG);
} else {
this->unk_15C = 0;
}
src/overlays/actors/ovl_Bg_Hakugin_Post/z_bg_hakugin_post.c
+7 -7
View File
@@ -492,7 +492,7 @@ void func_80A9BD24(BgHakuginPost* this, PlayState* play, BgHakuginPostUnkStruct*
} else if (unkStruct->unk_0000[i].unk_34 == 3) {
if (Math3D_XZLengthSquared(unkStruct->unk_0000[i].unk_14.x, unkStruct->unk_0000[i].unk_14.z) > 278784.03f) {
func_80A9B554(this, play, unkStruct, &unkStruct->unk_0000[i]);
func_8019F128(NA_SE_EV_GLASSBROKEN_IMPACT);
Audio_PlaySfx_2(NA_SE_EV_GLASSBROKEN_IMPACT);
unkStruct->unk_0000[i].unk_34 = 4;
unkStruct->unk_0000[i].unk_30 = 30;
}
@@ -528,7 +528,7 @@ void func_80A9C058(BgHakuginPost* this, PlayState* play, BgHakuginPostUnkStruct*
Quake_SetDuration(quakeIndex, 12);
if (this->unk_179 <= 0) {
func_8019F128(NA_SE_EV_STONEDOOR_STOP);
Audio_PlaySfx_2(NA_SE_EV_STONEDOOR_STOP);
this->unk_179 = 40;
}
break;
@@ -799,10 +799,10 @@ void func_80A9CD14(BgHakuginPost* this, PlayState* play) {
this->unk_16C += temp_f12;
if (this->unk_168 <= this->unk_16C) {
BgHakuginPost_RequestQuakeAndRumble(this, play);
func_8019F128(NA_SE_EV_STONEDOOR_STOP);
Audio_PlaySfx_2(NA_SE_EV_STONEDOOR_STOP);
func_80A9CE00(this);
} else {
func_800B8FE8(&this->dyna.actor, NA_SE_EV_ICE_PILLAR_RISING - SFX_FLAG);
Actor_PlaySfx_FlaggedCentered3(&this->dyna.actor, NA_SE_EV_ICE_PILLAR_RISING - SFX_FLAG);
}
}
@@ -840,7 +840,7 @@ void func_80A9CE1C(BgHakuginPost* this, PlayState* play) {
D_80A9E028.unk_0000[i].unk_28 = ((s16)(player->actor.shape.rot.y - temp) / 3) + temp;
D_80A9E028.unk_0000[i].unk_34 = 2;
Player_PlaySfx(player, NA_SE_IT_HAMMER_HIT);
func_8019F128(NA_SE_EV_SLIDE_DOOR_OPEN);
Audio_PlaySfx_2(NA_SE_EV_SLIDE_DOOR_OPEN);
Flags_SetSwitch(play, D_80A9E028.unk_0000[i].unk_2E);
this->unk_178 = 20;
func_80A9D2C4(this, func_80A9CE00, D_80A9E028.unk_0000[i].unk_14.y + 50.0f, D_80A9E028.unk_0000[i].csId,
@@ -877,10 +877,10 @@ void func_80A9D0B4(BgHakuginPost* this, PlayState* play) {
func_80A9B160(&D_80A9E028, play);
this->unk_16C = this->unk_164;
BgHakuginPost_RequestQuakeAndRumble(this, play);
func_8019F128(NA_SE_EV_STONEDOOR_STOP);
Audio_PlaySfx_2(NA_SE_EV_STONEDOOR_STOP);
func_80A9CC84(this);
} else {
func_800B8FE8(&this->dyna.actor, NA_SE_EV_ICE_PILLAR_FALL - SFX_FLAG);
Actor_PlaySfx_FlaggedCentered3(&this->dyna.actor, NA_SE_EV_ICE_PILLAR_FALL - SFX_FLAG);
}
}
src/overlays/actors/ovl_Bg_Hakugin_Switch/z_bg_hakugin_switch.c
+2 -2
View File
@@ -109,7 +109,7 @@ void func_80B15790(BgHakuginSwitch* this, u16 sfxId) {
void func_80B157C4(BgHakuginSwitch* this, u16 arg1) {
if (this->unk_1B2 <= 0) {
func_800B9010(&this->dyna.actor, arg1);
Actor_PlaySfx_Flagged(&this->dyna.actor, arg1);
}
}
@@ -254,7 +254,7 @@ void func_80B15B74(BgHakuginSwitch* this, PlayState* play) {
if (this->unk_1B0 > 0) {
this->unk_1B0--;
if (sp38->unk_14 & 8) {
func_800B9038(&this->dyna.actor, this->unk_1B0);
Actor_PlaySfx_FlaggedTimer(&this->dyna.actor, this->unk_1B0);
if (this->unk_1B0 == 0) {
sp24 = true;
sp20 = sp28;
src/overlays/actors/ovl_Bg_Ikana_Block/z_bg_ikana_block.c
+1 -1
View File
@@ -306,7 +306,7 @@ void func_80B7F290(BgIkanaBlock* this, PlayState* play) {
func_80B7F360(this);
}
} else {
func_800B9010(&this->dyna.actor, NA_SE_EV_ROCK_SLIDE - SFX_FLAG);
Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_EV_ROCK_SLIDE - SFX_FLAG);
}
}
src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/z_bg_ikana_rotaryroom.c
+4 -4
View File
@@ -652,7 +652,7 @@ void func_80B814B8(BgIkanaRotaryroom* this, PlayState* play) {
func_80169EFC(&play->state);
Player_PlaySfx(player, NA_SE_VO_LI_TAKEN_AWAY + player->ageProperties->voiceSfxIdOffset);
play->haltAllActors = true;
play_sound(NA_SE_OC_ABYSS);
Audio_PlaySfx(NA_SE_OC_ABYSS);
this->actionFunc = NULL;
}
} else {
@@ -813,7 +813,7 @@ void func_80B81A80(Actor* thisx, PlayState* play) {
s32 i;
BgIkanaRotaryroomStruct1* ptr;
func_800B9010(thisx, NA_SE_EV_EARTHQUAKE - SFX_FLAG);
Actor_PlaySfx_Flagged(thisx, NA_SE_EV_EARTHQUAKE - SFX_FLAG);
this->unk_584--;
if (this->unk_584 <= 0) {
@@ -850,7 +850,7 @@ void func_80B81BA0(Actor* thisx, PlayState* play) {
s32 sp30 = 0;
s32 i;
func_800B9010(&this->dyna.actor, NA_SE_EV_EARTHQUAKE - SFX_FLAG);
Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_EV_EARTHQUAKE - SFX_FLAG);
if (this->unk_584 > 0) {
this->unk_584--;
@@ -921,7 +921,7 @@ void func_80B81DC8(Actor* thisx, PlayState* play) {
BgIkanaRotaryroom* this = THIS;
if (this->unk_584 > 10) {
func_800B9010(&this->dyna.actor, NA_SE_EV_EARTHQUAKE - SFX_FLAG);
Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_EV_EARTHQUAKE - SFX_FLAG);
}
this->unk_584--;
src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.c
+2 -2
View File
@@ -163,7 +163,7 @@ void func_80C0ABA8(BgIkninSusceil* this, PlayState* play) {
Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_BIGWALL_BOUND);
func_80C0AC74(this);
} else {
func_800B9010(&this->dyna.actor, NA_SE_EV_ICE_PILLAR_FALL - SFX_FLAG);
Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_EV_ICE_PILLAR_FALL - SFX_FLAG);
}
}
@@ -205,7 +205,7 @@ void func_80C0AD64(BgIkninSusceil* this, PlayState* play) {
CutsceneManager_Stop(this->dyna.actor.csId);
func_80C0AB14(this);
} else {
func_800B9010(&this->dyna.actor, NA_SE_EV_ICE_PILLAR_RISING - SFX_FLAG);
Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_EV_ICE_PILLAR_RISING - SFX_FLAG);
}
}
src/overlays/actors/ovl_Bg_Iknv_Doukutu/z_bg_iknv_doukutu.c
+1 -1
View File
@@ -131,7 +131,7 @@ void func_80BD7250(BgIknvDoukutu* this, PlayState* play) {
this->dyna.actor.world.pos.y = temp_fv0;
this->actionFunc = func_80BD73D0;
}
func_8019F128(NA_SE_EV_WATER_LEVEL_DOWN - SFX_FLAG);
Audio_PlaySfx_2(NA_SE_EV_WATER_LEVEL_DOWN - SFX_FLAG);
}
void func_80BD72BC(BgIknvDoukutu* this, PlayState* play) {
src/overlays/actors/ovl_Bg_Iknv_Obj/z_bg_iknv_obj.c
+4 -4
View File
@@ -127,13 +127,13 @@ s32 func_80BD7CEC(BgIknvObj* this) {
void BgIknvObj_UpdateWaterwheel(BgIknvObj* this, PlayState* play) {
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_14_04)) {
this->dyna.actor.shape.rot.z -= 0x64;
func_800B9098(&this->dyna.actor);
func_800B9010(&this->dyna.actor, NA_SE_EV_WOOD_WATER_WHEEL - SFX_FLAG);
Actor_PlaySeq_FlaggedMusicBoxHouse(&this->dyna.actor);
Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_EV_WOOD_WATER_WHEEL - SFX_FLAG);
}
if ((play->csCtx.state != CS_STATE_IDLE) && (gSaveContext.sceneLayer == 1) && (play->csCtx.scriptIndex == 4) &&
(play->csCtx.curFrame == 1495)) {
func_8019F128(NA_SE_EV_DOOR_UNLOCK);
Audio_PlaySfx_2(NA_SE_EV_DOOR_UNLOCK);
}
}
@@ -146,7 +146,7 @@ s32 func_80BD7E0C(BgIknvObj* this, s16 targetRotation, PlayState* play) {
if ((play->gameplayFrames % 2) != 0) {
this->dyna.actor.shape.yOffset = 5.0f;
}
func_800B9010(&this->dyna.actor, NA_SE_EV_STONEDOOR_OPEN_S - SFX_FLAG);
Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_EV_STONEDOOR_OPEN_S - SFX_FLAG);
return false;
}
Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_STONEDOOR_STOP);
src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c
+4 -4
View File
@@ -284,14 +284,14 @@ void func_809543D4(BgIngate* this, PlayState* play) {
this->unk160 &= ~0x4;
this->actionFunc = func_809541B8;
Environment_StartTime();
func_8019F208();
Audio_PlaySfx_MessageDecide();
} else {
if (this->timePath != NULL) {
this->timePath = &play->setupPathList[this->timePath->additionalPathIndex];
}
func_80953F14(this, play);
CLEAR_WEEKEVENTREG(WEEKEVENTREG_90_40);
func_8019F230();
Audio_PlaySfx_MessageCancel();
}
Message_CloseTextbox(play);
break;
@@ -299,13 +299,13 @@ void func_809543D4(BgIngate* this, PlayState* play) {
if (play->msgCtx.choiceIndex == 0) {
func_80953EA4(this, play);
CLEAR_WEEKEVENTREG(WEEKEVENTREG_90_40);
func_8019F208();
Audio_PlaySfx_MessageDecide();
} else {
func_800B7298(play, &this->dyna.actor, PLAYER_CSMODE_END);
this->unk160 &= ~0x4;
this->actionFunc = func_809541B8;
Environment_StartTime();
func_8019F230();
Audio_PlaySfx_MessageCancel();
}
Message_CloseTextbox(play);
break;
src/overlays/actors/ovl_Bg_Kin2_Fence/z_bg_kin2_fence.c
+2 -2
View File
@@ -189,11 +189,11 @@ void BgKin2Fence_HandleMaskCode(BgKin2Fence* this, PlayState* play) {
if (hitMask >= 0) {
nextMask = (s8)gSaveContext.save.saveInfo.spiderHouseMaskOrder[this->masksHit];
if (hitMask == nextMask) {
play_sound(NA_SE_SY_TRE_BOX_APPEAR);
Audio_PlaySfx(NA_SE_SY_TRE_BOX_APPEAR);
this->masksHit += 1;
BgKin2Fence_SpawnEyeSparkles(this, play, nextMask);
} else {
play_sound(NA_SE_SY_ERROR);
Audio_PlaySfx(NA_SE_SY_ERROR);
this->masksHit = 0;
}
}
src/overlays/actors/ovl_Bg_Kin2_Picture/z_bg_kin2_picture.c
+1 -1
View File
@@ -105,7 +105,7 @@ void BgKin2Picture_SpawnSkulltula(BgKin2Picture* this, PlayState* play2) {
Actor_Spawn(&play->actorCtx, play, ACTOR_EN_SW, this->dyna.actor.home.pos.x,
this->dyna.actor.home.pos.y + 23.0f, this->dyna.actor.home.pos.z, 0,
this->dyna.actor.home.rot.y, 0, skulltulaSpawnParams)) {
play_sound(NA_SE_SY_TRE_BOX_APPEAR);
Audio_PlaySfx(NA_SE_SY_TRE_BOX_APPEAR);
}
}
}
src/overlays/actors/ovl_Bg_Kin2_Shelf/z_bg_kin2_shelf.c
+2 -2
View File
@@ -307,7 +307,7 @@ void func_80B70230(BgKin2Shelf* this, PlayState* play) {
this->dyna.actor.world.pos.z = ((Math_CosS(sp36) * phi_f20) * D_80B70750[sp40]) + this->dyna.actor.home.pos.z;
if (this->unk_166 != 0) {
play_sound(NA_SE_SY_TRE_BOX_APPEAR);
Audio_PlaySfx(NA_SE_SY_TRE_BOX_APPEAR);
}
func_80B700A8(this);
} else {
@@ -353,7 +353,7 @@ void func_80B704B4(BgKin2Shelf* this, PlayState* play) {
this->dyna.actor.world.pos.z = ((Math_CosS(sp36) * temp_f20) * D_80B70758[sp40]) + this->dyna.actor.home.pos.z;
if (this->unk_167 != 0) {
play_sound(NA_SE_SY_TRE_BOX_APPEAR);
Audio_PlaySfx(NA_SE_SY_TRE_BOX_APPEAR);
}
func_80B700A8(this);
} else {
src/overlays/actors/ovl_Bg_Numa_Hana/z_bg_numa_hana.c
+4 -4
View File
@@ -252,7 +252,7 @@ void BgNumaHana_UnfoldInnerPetals(BgNumaHana* this, PlayState* play) {
this->transitionTimer++;
}
} else {
func_800B9010(&this->dyna.actor, NA_SE_EV_FLOWERPETAL_MOVE - SFX_FLAG);
Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_EV_FLOWERPETAL_MOVE - SFX_FLAG);
}
BgNumaHana_UpdateSettleRotation(&this->settleZRotation, &this->settleAngle, &this->settleScale, 20.0f);
@@ -284,7 +284,7 @@ void BgNumaHana_UnfoldOuterPetals(BgNumaHana* this, PlayState* play) {
this->transitionTimer++;
}
} else {
func_800B9010(&this->dyna.actor, NA_SE_EV_FLOWERPETAL_MOVE - SFX_FLAG);
Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_EV_FLOWERPETAL_MOVE - SFX_FLAG);
}
BgNumaHana_UpdateSettleRotation(&this->settleZRotation, &this->settleAngle, &this->settleScale, 7.0f);
@@ -332,7 +332,7 @@ void BgNumaHana_RaiseFlower(BgNumaHana* this, PlayState* play) {
}
BgNumaHana_UpdatePetalPosRots(this);
func_800B9010(&this->dyna.actor, NA_SE_EV_FLOWER_ROLLING - SFX_FLAG);
Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_EV_FLOWER_ROLLING - SFX_FLAG);
}
void BgNumaHana_SetupOpenedIdle(BgNumaHana* this) {
@@ -346,7 +346,7 @@ void BgNumaHana_OpenedIdle(BgNumaHana* this, PlayState* play) {
this->dyna.actor.shape.rot.y += this->flowerRotationalVelocity;
this->petalZRotation = this->innerPetalZRotation + this->settleZRotation;
BgNumaHana_UpdatePetalPosRots(this);
func_800B9010(&this->dyna.actor, NA_SE_EV_FLOWER_ROLLING - SFX_FLAG);
Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_EV_FLOWER_ROLLING - SFX_FLAG);
}
void BgNumaHana_Update(Actor* thisx, PlayState* play) {
src/overlays/actors/ovl_Bg_Spout_Fire/z_bg_spout_fire.c
+1 -1
View File
@@ -179,7 +179,7 @@ void BgSpoutFire_Update(Actor* thisx, PlayState* play) {
func_80A60E08(this, play);
CollisionCheck_SetAT(play, &play->colChkCtx, &this->collider.base);
CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base);
func_800B9010(&this->actor, NA_SE_EV_FIRE_PLATE - SFX_FLAG);
Actor_PlaySfx_Flagged(&this->actor, NA_SE_EV_FIRE_PLATE - SFX_FLAG);
}
}
src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c
+1 -1
View File
@@ -49,7 +49,7 @@ void func_80919F30(BgUmajump* this, PlayState* play) {
void BgUmajump_StopCutscene(BgUmajump* this, PlayState* play) {
if ((play->csCtx.curFrame >= 6) && !this->hasSoundPlayed) {
this->hasSoundPlayed = true;
play_sound(NA_SE_EV_KID_HORSE_NEIGH);
Audio_PlaySfx(NA_SE_EV_KID_HORSE_NEIGH);
}
if (play->csCtx.state == CS_STATE_IDLE) {
src/overlays/actors/ovl_Boss_02/z_boss_02.c
+8 -8
View File
@@ -938,7 +938,7 @@ void func_809DAB78(Boss02* this, PlayState* play) {
this->unk_0152 = 0;
sTwinmoldStatic->unk_1D20 = 102;
sTwinmoldStatic->subCamAtVel = 0.0f;
play_sound(NA_SE_EN_INBOSS_DEAD_PRE2_OLD);
Audio_PlaySfx(NA_SE_EN_INBOSS_DEAD_PRE2_OLD);
} else if (!(this->unk_0146[1] & 0xF) && (Rand_ZeroOne() < 0.5f)) {
Actor_PlaySfx(&this->actor, NA_SE_EN_INBOSS_DAMAGE_OLD);
}
@@ -955,7 +955,7 @@ void func_809DAB78(Boss02* this, PlayState* play) {
}
Boss02_SpawnEffectFlash(play->specialEffects, &this->unk_147C[this->unk_1678]);
play_sound(NA_SE_EV_EXPLOSION);
Audio_PlaySfx(NA_SE_EV_EXPLOSION);
this->unk_1678--;
if (this->unk_1678 <= 0) {
@@ -1005,7 +1005,7 @@ void func_809DAB78(Boss02* this, PlayState* play) {
sTwinmoldStatic->unk_1D1C = 0;
sTwinmoldStatic->unk_0146[0] = 15;
sTwinmoldStatic->unk_0150 = 0;
play_sound(NA_SE_EV_LIGHTNING);
Audio_PlaySfx(NA_SE_EV_LIGHTNING);
for (i = 0; i < 30; i++) {
Boss02_SpawnEffectFragment(play->specialEffects, &this->unk_0170);
@@ -1077,7 +1077,7 @@ void func_809DBFB4(Boss02* this, PlayState* play) {
Actor_PlaySfx(&this->actor, NA_SE_EN_INBOSS_DAMAGE_OLD);
this->unk_015C = 1;
} else {
Audio_PlaySfxAtPos(&this->unk_167C, NA_SE_EN_INBOSS_DAMAGE_OLD);
Audio_PlaySfx_AtPos(&this->unk_167C, NA_SE_EN_INBOSS_DAMAGE_OLD);
this->unk_015C = 10;
}
@@ -1671,7 +1671,7 @@ void func_809DD934(Boss02* this, PlayState* play) {
label1:
if (this->unk_1D14 >= 50) {
if (this->unk_1D14 == (u32)(BREG(43) + 60)) {
play_sound(NA_SE_PL_TRANSFORM_GIANT);
Audio_PlaySfx(NA_SE_PL_TRANSFORM_GIANT);
}
Math_ApproachF(&this->unk_1D64, 200.0f, 0.1f, this->subCamAtVel * 640.0f);
Math_ApproachF(&this->unk_1D6C, 273.0f, 0.1f, this->subCamAtVel * 150.0f);
@@ -1722,7 +1722,7 @@ void func_809DD934(Boss02* this, PlayState* play) {
label2:
if (this->unk_1D14 != 0) {
if (this->unk_1D14 == (u32)(BREG(44) + 10)) {
play_sound(NA_SE_PL_TRANSFORM_NORAML);
Audio_PlaySfx(NA_SE_PL_TRANSFORM_NORAML);
}
Math_ApproachF(&this->unk_1D64, 60.0f, 0.1f, this->subCamAtVel * 640.0f);
Math_ApproachF(&this->unk_1D6C, 23.0f, 0.1f, this->subCamAtVel * 150.0f);
@@ -1986,7 +1986,7 @@ void func_809DD934(Boss02* this, PlayState* play) {
this->unk_1D7A = 0;
func_809DA1D0(play, 255, 255, 255, 0);
this->unk_1D78 = 2;
play_sound(NA_SE_SY_TRANSFORM_MASK_FLASH);
Audio_PlaySfx(NA_SE_SY_TRANSFORM_MASK_FLASH);
case 2:
this->unk_1D7A += 40;
@@ -2079,7 +2079,7 @@ void func_809DEAC4(Boss02* this, PlayState* play) {
sp58 = (Math_SinS(this->unk_0150) * (BREG(19) + 5)) * 0.1f;
Matrix_RotateZF(Math_SinS(this->unk_1D1C * 0x3000) * ((KREG(28) * 0.001f) + 0.017f), MTXMODE_NEW);
Matrix_MultVecY(1.0f, &this->subCamUp);
func_8019F128(NA_SE_EV_EARTHQUAKE_LAST - SFX_FLAG);
Audio_PlaySfx_2(NA_SE_EV_EARTHQUAKE_LAST - SFX_FLAG);
}
if (this->unk_1D1C == 20) {
src/overlays/actors/ovl_Boss_03/z_boss_03.c
+5 -5
View File
@@ -121,7 +121,7 @@ GyorgEffect sGyorgEffects[GYORG_EFFECT_COUNT];
Boss03* sGyorgBossInstance;
void Boss03_PlayUnderwaterSfx(Vec3f* projectedPos, u16 sfxId) {
func_8019F420(projectedPos, sfxId);
Audio_PlaySfx_Underwater(projectedPos, sfxId);
}
/* Start of SpawnEffect section */
@@ -1051,7 +1051,7 @@ void Boss03_Charge(Boss03* this, PlayState* play) {
// Attack platform
if (this->actor.bgCheckFlags & BGCHECKFLAG_WALL) {
play_sound(NA_SE_IT_BIG_BOMB_EXPLOSION);
Audio_PlaySfx(NA_SE_IT_BIG_BOMB_EXPLOSION);
Actor_RequestQuakeAndRumble(&this->actor, play, 20, 15);
Actor_Spawn(&play->actorCtx, play, ACTOR_EN_WATER_EFFECT, 0.0f, this->waterHeight, 0.0f, 0, 0, 0x96,
ENWATEREFFECT_TYPE_GYORG_SHOCKWAVE);
@@ -1772,7 +1772,7 @@ void Boss03_Stunned(Boss03* this, PlayState* play) {
this->actor.gravity = -2.0f;
Actor_MoveWithGravity(&this->actor);
if (this->actor.bgCheckFlags & BGCHECKFLAG_GROUND_TOUCH) {
play_sound(NA_SE_IT_WALL_HIT_HARD);
Audio_PlaySfx(NA_SE_IT_WALL_HIT_HARD);
Actor_RequestQuakeAndRumble(&this->actor, play, 10, 10);
}
} else {
@@ -2114,9 +2114,9 @@ void Boss03_Update(Actor* thisx, PlayState* play2) {
this->prevPlayerPos = player->actor.world.pos;
if (this->waterHeight < this->actor.world.pos.y) {
func_8019F540(0);
Audio_SetSfxUnderwaterReverb(false);
} else {
func_8019F540(1);
Audio_SetSfxUnderwaterReverb(true);
}
if (this->unk_280 != 0) {
src/overlays/actors/ovl_Boss_04/z_boss_04.c
+2 -2
View File
@@ -324,7 +324,7 @@ void func_809EC568(Boss04* this, PlayState* play) {
Math_ApproachF(&this->subCamAt.y, this->actor.world.pos.y, 0.5f, 1000.0f);
Math_ApproachF(&this->subCamAt.z, this->actor.world.pos.z, 0.5f, 1000.0f);
if (this->actor.bgCheckFlags & BGCHECKFLAG_GROUND_TOUCH) {
play_sound(NA_SE_IT_BIG_BOMB_EXPLOSION);
Audio_PlaySfx(NA_SE_IT_BIG_BOMB_EXPLOSION);
this->unk_6F4 = 15;
this->unk_708 = 13;
this->unk_704 = 0;
@@ -480,7 +480,7 @@ void func_809ECF58(Boss04* this, PlayState* play) {
this->actor.speed = 0.0f;
if (this->actor.bgCheckFlags & BGCHECKFLAG_WALL) {
play_sound(NA_SE_IT_BIG_BOMB_EXPLOSION);
Audio_PlaySfx(NA_SE_IT_BIG_BOMB_EXPLOSION);
Actor_RequestQuakeAndRumble(&this->actor, play, 15, 10);
this->unk_6F4 = 15;
sp3C.x = this->actor.focus.pos.x;
src/overlays/actors/ovl_Boss_06/z_boss_06.c
+4 -4
View File
@@ -163,7 +163,7 @@ void func_809F23CC(Boss06* this) {
if ((this->unk_1C9 == 0) && (D_809F4970->unk_68A == 0)) {
if (this->actor.colChkInfo.damageEffect == 2) {
func_809F24A8(this);
play_sound(NA_SE_SY_TRE_BOX_APPEAR);
Audio_PlaySfx(NA_SE_SY_TRE_BOX_APPEAR);
this->unk_1B0 = -(this->actor.world.pos.x - this->collider.info.bumper.hitPos.x);
this->unk_1BC = this->unk_1B0 * 0.35f;
@@ -229,7 +229,7 @@ void func_809F24C8(Boss06* this, PlayState* play) {
}
if (this->unk_1CA >= 30) {
play_sound(NA_SE_EV_S_STONE_FLASH);
Audio_PlaySfx(NA_SE_EV_S_STONE_FLASH);
}
if (this->unk_1CA >= 60) {
@@ -376,7 +376,7 @@ void func_809F2C44(Boss06* this, PlayState* play) {
}
if ((this->unk_1E4 > 0.1f) && ENBOSS06_GET_PARAMS(&this->actor) == 0) {
play_sound(NA_SE_EV_CURTAIN_DOWN - SFX_FLAG);
Audio_PlaySfx(NA_SE_EV_CURTAIN_DOWN - SFX_FLAG);
}
}
@@ -453,7 +453,7 @@ void Boss06_Update(Actor* thisx, PlayState* play) {
}
if ((this->unk_1C8 != 0) && (this->unk_1C8 != 0)) {
play_sound(NA_SE_EV_FIRE_PLATE - SFX_FLAG);
Audio_PlaySfx(NA_SE_EV_FIRE_PLATE - SFX_FLAG);
this->unk_1CC += 0.6f;
this->unk_1D0 += 0.1f;
this->unk_1D4 += 0.0200000014156f;
src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c
+2 -2
View File
@@ -210,7 +210,7 @@ void func_808CDBDC(DemoEffect* this, PlayState* play) {
this->actor.scale.x = scale;
this->actor.scale.z = scale;
func_808CDAD0(alphaScale);
func_800B8FE8(&this->actor, NA_SE_EV_TIMETRIP_LIGHT - SFX_FLAG);
Actor_PlaySfx_FlaggedCentered3(&this->actor, NA_SE_EV_TIMETRIP_LIGHT - SFX_FLAG);
} else {
func_808CDAD0(1.0f);
Actor_Kill(&this->actor);
@@ -218,7 +218,7 @@ void func_808CDBDC(DemoEffect* this, PlayState* play) {
}
void func_808CDCEC(DemoEffect* this, PlayState* play) {
func_800B8FE8(&this->actor, NA_SE_EV_TIMETRIP_LIGHT - SFX_FLAG);
Actor_PlaySfx_FlaggedCentered3(&this->actor, NA_SE_EV_TIMETRIP_LIGHT - SFX_FLAG);
if (SkelCurve_Update(play, &this->skelCurve)) {
SkelCurve_SetAnim(&this->skelCurve, &object_efc_tw_CurveAnim_000050, 1.0f, 60.0f, 59.0f, 0.0f);
src/overlays/actors/ovl_Demo_Moonend/z_demo_moonend.c
+2 -2
View File
@@ -89,7 +89,7 @@ void func_80C17B60(DemoMoonend* this, PlayState* play) {
}
}
if (this->cueId == 2) {
func_800B9010(&this->actor, NA_SE_EV_RAINBOW - SFX_FLAG);
Actor_PlaySfx_Flagged(&this->actor, NA_SE_EV_RAINBOW - SFX_FLAG);
}
} else {
this->actor.draw = NULL;
@@ -127,7 +127,7 @@ void func_80C17C48(DemoMoonend* this, PlayState* play) {
}
}
if (this->actor.home.rot.z != 0) {
func_800B9010(&this->actor, NA_SE_EV_EARTHQUAKE_LAST2 - SFX_FLAG);
Actor_PlaySfx_Flagged(&this->actor, NA_SE_EV_EARTHQUAKE_LAST2 - SFX_FLAG);
}
} else {
this->actor.draw = NULL;
src/overlays/actors/ovl_Demo_Syoten/z_demo_syoten.c
+2 -2
View File
@@ -224,7 +224,7 @@ void func_80C16A74(DemoSyoten* this, PlayState* play) {
func_80183DE0(&this->unk_144);
if (Cutscene_IsCueInChannel(play, this->cueType)) {
if ((play->csCtx.curFrame >= 160) && (play->csCtx.curFrame < 322)) {
func_800B9010(&this->actor, NA_SE_EV_IKANA_SOUL_LV - SFX_FLAG);
Actor_PlaySfx_Flagged(&this->actor, NA_SE_EV_IKANA_SOUL_LV - SFX_FLAG);
} else if (play->csCtx.curFrame == 322) {
Actor_PlaySfx(&this->actor, NA_SE_EV_IKANA_SOUL_TRANSFORM);
}
@@ -392,7 +392,7 @@ void func_80C16EAC(DemoSyoten* this, PlayState* play) {
if (this->unk_3D8 > 1.0f) {
this->unk_3D8 = 1.0f;
}
func_800B9010(&this->actor, NA_SE_EV_IKANA_PURIFICATION - SFX_FLAG);
Actor_PlaySfx_Flagged(&this->actor, NA_SE_EV_IKANA_PURIFICATION - SFX_FLAG);
}
} else {
this->actor.draw = NULL;
src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c
+1 -1
View File
@@ -127,7 +127,7 @@ void DemoTreLgt_Animate(DemoTreLgt* this, PlayState* play) {
if (curFrame > 30.0f) {
if (!(this->status & 1)) {
this->status |= 1;
Audio_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_EV_TRE_BOX_FLASH);
Audio_PlaySfx_AtPos(&this->actor.projectedPos, NA_SE_EV_TRE_BOX_FLASH);
}
}
if (SkelCurve_Update(play, &this->skelCurve)) {
src/overlays/actors/ovl_Dm_Char01/z_dm_char01.c
+1 -1
View File
@@ -168,7 +168,7 @@ void func_80AA8698(DmChar01* this, PlayState* play) {
(player2->actor.world.pos.x < 40.0f) && (player2->actor.world.pos.z > 1000.0f) &&
(player2->actor.world.pos.z < 1078.0f)) {
if (!D_80AAAAB4) {
play_sound(NA_SE_SY_TRE_BOX_APPEAR);
Audio_PlaySfx(NA_SE_SY_TRE_BOX_APPEAR);
D_80AAAAB4 = true;
}
} else {
src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c
+1 -1
View File
@@ -258,7 +258,7 @@ void DmChar08_WaitForSong(DmChar08* this, PlayState* play) {
((player2->actor.world.pos.x > -5780.0f) && (player2->actor.world.pos.x < -5385.0f) &&
(player2->actor.world.pos.z > 1120.0f) && (player2->actor.world.pos.z < 2100.0f))) {
if (!sSuccessSoundAlreadyPlayed) {
play_sound(NA_SE_SY_TRE_BOX_APPEAR);
Audio_PlaySfx(NA_SE_SY_TRE_BOX_APPEAR);
sSuccessSoundAlreadyPlayed = true;
}
} else {
src/overlays/actors/ovl_Dm_Opstage/z_dm_opstage.c
+1 -1
View File
@@ -98,7 +98,7 @@ void DmOpstage_Update(Actor* thisx, PlayState* play) {
if ((play->sceneId == SCENE_SPOT00) && (gSaveContext.sceneLayer == 0) && (play->csCtx.curFrame == 480)) {
// This actor is responsible for playing the fairy sound during the exposition in the intro,
// during the transition to Lost Woods, before Ocarina gets stolen.
func_8019F128(NA_SE_EV_NAVY_FLY_REBIRTH);
Audio_PlaySfx_2(NA_SE_EV_NAVY_FLY_REBIRTH);
}
}
src/overlays/actors/ovl_Dm_Stk/z_dm_stk.c
+13 -13
View File
@@ -428,7 +428,7 @@ void DmStk_PlaySfxForIntroCutsceneFirstPart(DmStk* this, PlayState* play) {
*/
void DmStk_PlaySfxForTitleCutscene(DmStk* this, PlayState* play) {
if (play->csCtx.curFrame == 535) {
func_8019F128(NA_SE_EV_CLOCK_TOWER_BELL);
Audio_PlaySfx_2(NA_SE_EV_CLOCK_TOWER_BELL);
}
}
@@ -492,12 +492,12 @@ void DmStk_PlaySfxForObtainingMajorasMaskCutscene(DmStk* this, PlayState* play)
void DmStk_PlaySfxForCurseCutsceneFirstPart(DmStk* this, PlayState* play) {
switch (play->csCtx.curFrame) {
case 415:
func_801A479C(&this->actor.projectedPos, NA_SE_EN_STALKIDS_FLOAT, 100);
Audio_PlaySfx_AtPosWithVolumeTransition(&this->actor.projectedPos, NA_SE_EN_STALKIDS_FLOAT, 100);
break;
case 785:
func_8019F128(NA_SE_SY_STALKIDS_PSYCHO);
func_8019FE74(&gSfxVolume, 0.0f, 150);
Audio_PlaySfx_2(NA_SE_SY_STALKIDS_PSYCHO);
Audio_SetSfxVolumeTransition(&gSfxVolume, 0.0f, 150);
break;
case 560:
@@ -520,7 +520,7 @@ void DmStk_PlaySfxForCurseCutsceneSecondPart(DmStk* this, PlayState* play) {
switch (play->csCtx.curFrame) {
case 10:
func_801A479C(&this->actor.projectedPos, NA_SE_EN_STALKIDS_FLOAT, 50);
Audio_PlaySfx_AtPosWithVolumeTransition(&this->actor.projectedPos, NA_SE_EN_STALKIDS_FLOAT, 50);
break;
case 71:
@@ -532,7 +532,7 @@ void DmStk_PlaySfxForCurseCutsceneSecondPart(DmStk* this, PlayState* play) {
break;
case 650:
func_8019FE74(&gSfxVolume, 0.0f, 80);
Audio_SetSfxVolumeTransition(&gSfxVolume, 0.0f, 80);
break;
case 265:
@@ -573,7 +573,7 @@ void DmStk_PlaySfxForClockTowerIntroCutsceneVersion1(DmStk* this, PlayState* pla
switch (play->csCtx.curFrame) {
case 140:
func_801A479C(&this->actor.projectedPos, NA_SE_EN_STALKIDS_FLOAT, 80);
Audio_PlaySfx_AtPosWithVolumeTransition(&this->actor.projectedPos, NA_SE_EN_STALKIDS_FLOAT, 80);
break;
case 258:
@@ -762,7 +762,7 @@ void DmStk_PlaySfxForClockTowerIntroCutsceneVersion2(DmStk* this, PlayState* pla
switch (play->csCtx.curFrame) {
case 40:
func_801A479C(&this->actor.projectedPos, NA_SE_EN_STALKIDS_FLOAT, 80);
Audio_PlaySfx_AtPosWithVolumeTransition(&this->actor.projectedPos, NA_SE_EN_STALKIDS_FLOAT, 80);
break;
case 234:
@@ -805,7 +805,7 @@ void DmStk_PlaySfxForCutsceneAfterPlayingOathToOrder(DmStk* this, PlayState* pla
switch (play->csCtx.curFrame) {
case 64:
Audio_PlaySfxAtPos(&this->oathToOrderCutsceneVoicePos, NA_SE_EN_STAL06_SURPRISED);
Audio_PlaySfx_AtPos(&this->oathToOrderCutsceneVoicePos, NA_SE_EN_STAL06_SURPRISED);
break;
case 327:
@@ -825,11 +825,11 @@ void DmStk_PlaySfxForCutsceneAfterPlayingOathToOrder(DmStk* this, PlayState* pla
case 486:
Actor_PlaySfx(&this->actor, NA_SE_EN_STALKIDS_MASK_OFF);
Audio_PlaySfxAtPos(&this->oathToOrderCutsceneVoicePos, NA_SE_EN_STAL08_CRY_BIG);
Audio_PlaySfx_AtPos(&this->oathToOrderCutsceneVoicePos, NA_SE_EN_STAL08_CRY_BIG);
break;
case 496:
Audio_PlaySfxAtPos(&this->oathToOrderCutsceneVoicePos, NA_SE_EN_STAL09_SCREAM);
Audio_PlaySfx_AtPos(&this->oathToOrderCutsceneVoicePos, NA_SE_EN_STAL09_SCREAM);
break;
case 590:
@@ -841,7 +841,7 @@ void DmStk_PlaySfxForCutsceneAfterPlayingOathToOrder(DmStk* this, PlayState* pla
break;
case 594:
Audio_PlaySfxAtPos(&this->oathToOrderCutsceneVoicePos, NA_SE_EN_STAL24_SCREAM2);
Audio_PlaySfx_AtPos(&this->oathToOrderCutsceneVoicePos, NA_SE_EN_STAL24_SCREAM2);
break;
default:
@@ -865,7 +865,7 @@ void DmStk_PlaySfxForCutsceneAfterPlayingOathToOrder(DmStk* this, PlayState* pla
}
if (play->csCtx.curFrame >= 290) {
func_8019F128(NA_SE_EV_KYOJIN_VOICE_SUCCESS - SFX_FLAG);
Audio_PlaySfx_2(NA_SE_EV_KYOJIN_VOICE_SUCCESS - SFX_FLAG);
}
}
src/overlays/actors/ovl_Door_Ana/z_door_ana.c
+1 -1
View File
@@ -119,7 +119,7 @@ void DoorAna_WaitClosed(DoorAna* this, PlayState* play) {
if (grottoIsOpen) {
DOORANA_SET_TYPE(&this->actor, DOORANA_TYPE_VISIBLE);
DoorAna_SetupAction(this, DoorAna_WaitOpen);
play_sound(NA_SE_SY_CORRECT_CHIME);
Audio_PlaySfx(NA_SE_SY_CORRECT_CHIME);
}
Actor_SetClosestSecretDistance(&this->actor, play);
src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c
+2 -2
View File
@@ -429,7 +429,7 @@ s32 func_808A1340(DoorShutter* this, PlayState* play) {
s32 pad;
if (this->unk_163 == 7) {
func_800B9010(&this->slidingDoor.dyna.actor, NA_SE_EV_IKANA_DOOR_OPEN - SFX_FLAG);
Actor_PlaySfx_Flagged(&this->slidingDoor.dyna.actor, NA_SE_EV_IKANA_DOOR_OPEN - SFX_FLAG);
}
Lib_Vec3f_TranslateAndRotateY(&this->slidingDoor.dyna.actor.home.pos, this->slidingDoor.dyna.actor.shape.rot.y,
@@ -589,7 +589,7 @@ void func_808A1884(DoorShutter* this, PlayState* play) {
s32 func_808A1A70(DoorShutter* this) {
if (this->unk_163 == 7) {
if (this->unk_163 == 7) {
func_800B9010(&this->slidingDoor.dyna.actor, NA_SE_EV_IKANA_DOOR_CLOSE - SFX_FLAG);
Actor_PlaySfx_Flagged(&this->slidingDoor.dyna.actor, NA_SE_EV_IKANA_DOOR_CLOSE - SFX_FLAG);
}
Math_StepToF(&this->slidingDoor.dyna.actor.velocity.y, 5.0f, 0.5f);
src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c
+2 -2
View File
@@ -360,14 +360,14 @@ void func_808B93A0(DoorWarp1* this, PlayState* play) {
if ((Message_GetState(&play->msgCtx) == TEXT_STATE_CHOICE) && Message_ShouldAdvance(play)) {
Message_CloseTextbox(play);
if (play->msgCtx.choiceIndex == 0) {
func_8019F208();
Audio_PlaySfx_MessageDecide();
func_800B7298(play, &this->dyna.actor, PLAYER_CSMODE_9);
player->unk_3A0.x = this->dyna.actor.world.pos.x;
player->unk_3A0.z = this->dyna.actor.world.pos.z;
this->unk_1CA = 1;
DoorWarp1_SetupAction(this, func_808B9524);
} else {
func_8019F230();
Audio_PlaySfx_MessageCancel();
func_800B7298(play, &this->dyna.actor, PLAYER_CSMODE_END);
DoorWarp1_SetupAction(this, func_808B94A4);
}
src/overlays/actors/ovl_Eff_Zoraband/z_eff_zoraband.c
+1 -1
View File
@@ -55,7 +55,7 @@ void EffZoraband_MikauFadeOut(EffZoraband* this, PlayState* play) {
}
}
if ((this->actor.home.rot.z != 0) && (this->actor.draw != NULL)) {
func_800B9010(&this->actor, NA_SE_EV_UFO_LIGHT_BEAM - SFX_FLAG);
Actor_PlaySfx_Flagged(&this->actor, NA_SE_EV_UFO_LIGHT_BEAM - SFX_FLAG);
}
if (this->stateFlags & 2) {
if (this->alpha < 240) {
src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.c
+30 -30
View File
@@ -411,22 +411,22 @@ void func_80BED3BC(EnAkindonuts* this, PlayState* play) {
switch (func_80BED208(this)) {
case 0:
play_sound(NA_SE_SY_ERROR);
Audio_PlaySfx(NA_SE_SY_ERROR);
this->unk_33C = 0x15EC;
break;
case 1:
play_sound(NA_SE_SY_ERROR);
Audio_PlaySfx(NA_SE_SY_ERROR);
this->unk_33C = 0x15ED;
break;
case 2:
play_sound(NA_SE_SY_ERROR);
Audio_PlaySfx(NA_SE_SY_ERROR);
this->unk_33C = 0x15EE;
break;
case 3:
func_8019F208();
Audio_PlaySfx_MessageDecide();
this->unk_32C &= ~0x1;
this->unk_32C |= 0x40;
play->msgCtx.msgMode = 0x43;
@@ -494,22 +494,22 @@ void func_80BED680(EnAkindonuts* this, PlayState* play) {
switch (func_80BED208(this)) {
case 0:
play_sound(NA_SE_SY_ERROR);
Audio_PlaySfx(NA_SE_SY_ERROR);
this->unk_33C = 0x15EC;
break;
case 1:
play_sound(NA_SE_SY_ERROR);
Audio_PlaySfx(NA_SE_SY_ERROR);
this->unk_33C = 0x15ED;
break;
case 2:
play_sound(NA_SE_SY_ERROR);
Audio_PlaySfx(NA_SE_SY_ERROR);
this->unk_33C = 0x15EE;
break;
case 3:
func_8019F208();
Audio_PlaySfx_MessageDecide();
this->unk_32C |= 0x40;
this->unk_32C &= ~0x1;
play->msgCtx.msgMode = 0x43;
@@ -589,22 +589,22 @@ void func_80BED8A4(EnAkindonuts* this, PlayState* play) {
switch (func_80BED27C(this)) {
case 2:
play_sound(NA_SE_SY_ERROR);
Audio_PlaySfx(NA_SE_SY_ERROR);
this->unk_33C = 0x1601;
break;
case 0:
play_sound(NA_SE_SY_ERROR);
Audio_PlaySfx(NA_SE_SY_ERROR);
this->unk_33C = 0x1602;
break;
case 1:
play_sound(NA_SE_SY_ERROR);
Audio_PlaySfx(NA_SE_SY_ERROR);
this->unk_33C = 0x1603;
break;
case 3:
func_8019F208();
Audio_PlaySfx_MessageDecide();
this->unk_32C |= 0x40;
this->unk_32C &= ~0x1;
play->msgCtx.msgMode = 0x43;
@@ -672,22 +672,22 @@ void func_80BEDB88(EnAkindonuts* this, PlayState* play) {
switch (func_80BED27C(this)) {
case 2:
play_sound(NA_SE_SY_ERROR);
Audio_PlaySfx(NA_SE_SY_ERROR);
this->unk_33C = 0x1601;
break;
case 0:
play_sound(NA_SE_SY_ERROR);
Audio_PlaySfx(NA_SE_SY_ERROR);
this->unk_33C = 0x1602;
break;
case 1:
play_sound(NA_SE_SY_ERROR);
Audio_PlaySfx(NA_SE_SY_ERROR);
this->unk_33C = 0x1603;
break;
case 3:
func_8019F208();
Audio_PlaySfx_MessageDecide();
this->unk_32C |= 0x40;
this->unk_32C &= ~0x1;
play->msgCtx.msgMode = 0x43;
@@ -767,17 +767,17 @@ void func_80BEDDAC(EnAkindonuts* this, PlayState* play) {
switch (func_80BED2FC(this)) {
case 2:
play_sound(NA_SE_SY_ERROR);
Audio_PlaySfx(NA_SE_SY_ERROR);
this->unk_33C = 0x1613;
break;
case 1:
play_sound(NA_SE_SY_ERROR);
Audio_PlaySfx(NA_SE_SY_ERROR);
this->unk_33C = 0x15ED;
break;
case 3:
func_8019F208();
Audio_PlaySfx_MessageDecide();
this->unk_32C |= 0x40;
this->unk_32C &= ~0x1;
play->msgCtx.msgMode = 0x43;
@@ -845,17 +845,17 @@ void func_80BEE070(EnAkindonuts* this, PlayState* play) {
switch (func_80BED2FC(this)) {
case 2:
play_sound(NA_SE_SY_ERROR);
Audio_PlaySfx(NA_SE_SY_ERROR);
this->unk_33C = 0x1613;
break;
case 1:
play_sound(NA_SE_SY_ERROR);
Audio_PlaySfx(NA_SE_SY_ERROR);
this->unk_33C = 0x15ED;
break;
case 3:
func_8019F208();
Audio_PlaySfx_MessageDecide();
this->unk_32C |= 0x40;
this->unk_32C &= ~0x1;
play->msgCtx.msgMode = 0x43;
@@ -928,17 +928,17 @@ void func_80BEE274(EnAkindonuts* this, PlayState* play) {
switch (func_80BED35C(this)) {
case 2:
play_sound(NA_SE_SY_ERROR);
Audio_PlaySfx(NA_SE_SY_ERROR);
this->unk_33C = 0x1613;
break;
case 1:
play_sound(NA_SE_SY_ERROR);
Audio_PlaySfx(NA_SE_SY_ERROR);
this->unk_33C = 0x15ED;
break;
case 3:
func_8019F208();
Audio_PlaySfx_MessageDecide();
this->unk_32C |= 0x40;
this->unk_32C &= ~0x1;
play->msgCtx.msgMode = 0x43;
@@ -1006,17 +1006,17 @@ void func_80BEE530(EnAkindonuts* this, PlayState* play) {
switch (func_80BED35C(this)) {
case 2:
play_sound(NA_SE_SY_ERROR);
Audio_PlaySfx(NA_SE_SY_ERROR);
this->unk_33C = 0x1613;
break;
case 1:
play_sound(NA_SE_SY_ERROR);
Audio_PlaySfx(NA_SE_SY_ERROR);
this->unk_33C = 0x15ED;
break;
case 3:
func_8019F208();
Audio_PlaySfx_MessageDecide();
this->unk_32C |= 0x40;
this->unk_32C &= ~0x1;
play->msgCtx.msgMode = 0x43;
@@ -1277,7 +1277,7 @@ void func_80BEEFA8(EnAkindonuts* this, PlayState* play) {
break;
case 1:
func_8019F230();
Audio_PlaySfx_MessageCancel();
this->unk_32C |= 0x10;
this->unk_2DC(this, play);
break;
@@ -1642,7 +1642,7 @@ void EnAkindonuts_Update(Actor* thisx, PlayState* play) {
this->actionFunc(this, play);
if (this->unk_32C & 0x80) {
func_800B9010(&this->actor, NA_SE_EN_AKINDO_FLY - SFX_FLAG);
Actor_PlaySfx_Flagged(&this->actor, NA_SE_EN_AKINDO_FLY - SFX_FLAG);
}
func_80BECC7C(this, play);
}
src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.c
+5 -5
View File
@@ -496,11 +496,11 @@ void EnAob01_BeforeRace_RespondToPlayAgainQuestion(EnAob01* this, PlayState* pla
switch (play->msgCtx.choiceIndex) {
case 0:
if (gSaveContext.save.saveInfo.playerData.rupees < 10) {
play_sound(NA_SE_SY_ERROR);
Audio_PlaySfx(NA_SE_SY_ERROR);
this->textId = 0x3524; // You can't play if you can't pay!
Message_StartTextbox(play, this->textId, &this->actor);
} else {
func_8019F208();
Audio_PlaySfx_MessageDecide();
this->stateFlags |= ENAOB01_FLAG_PLAYER_TOLD_TO_PICK_A_DOG;
this->stateFlags |= ENAOB01_FLAG_CONVERSATION_OVER;
this->textId = 0x3522; // Bring me the fastest dog!
@@ -510,7 +510,7 @@ void EnAob01_BeforeRace_RespondToPlayAgainQuestion(EnAob01* this, PlayState* pla
break;
case 1:
func_8019F230();
Audio_PlaySfx_MessageCancel();
this->textId = 0x3535; // Really?
Message_StartTextbox(play, this->textId, &this->actor);
break;
@@ -655,13 +655,13 @@ void EnAob01_BeforeRace_Talk(EnAob01* this, PlayState* play) {
this->stateFlags &= ~ENAOB01_FLAG_LAUGH;
switch (play->msgCtx.choiceIndex) {
case 0:
func_8019F208();
Audio_PlaySfx_MessageDecide();
this->stateFlags |= ENAOB01_FLAG_PLAYER_CONFIRMED_CHOICE;
EnAob01_BeforeRace_HandleConversation(this, play);
break;
case 1:
func_8019F230();
Audio_PlaySfx_MessageCancel();
EnAob01_BeforeRace_HandleConversation(this, play);
break;
}
src/overlays/actors/ovl_En_Arrow/z_en_arrow.c
+2 -2
View File
@@ -155,7 +155,7 @@ void func_8088A594(EnArrow* this, PlayState* play) {
if (this->actor.parent != NULL) {
if (this->actor.params == ARROW_TYPE_DEKU_BUBBLE) {
if (Math_SmoothStepToF(&this->bubble.unk_144, 16.0f, 0.07f, 1.8f, 0.0f) > 0.5f) {
func_800B9010(&this->actor, NA_SE_PL_DEKUNUTS_BUBLE_BREATH - SFX_FLAG);
Actor_PlaySfx_Flagged(&this->actor, NA_SE_PL_DEKUNUTS_BUBLE_BREATH - SFX_FLAG);
return;
}
@@ -449,7 +449,7 @@ void func_8088ACE0(EnArrow* this, PlayState* play) {
func_8088A514(this);
}
func_800B9010(&this->actor, NA_SE_IT_DEKUNUTS_BUBLE_SHOT_LEVEL - SFX_FLAG);
Actor_PlaySfx_Flagged(&this->actor, NA_SE_IT_DEKUNUTS_BUBLE_SHOT_LEVEL - SFX_FLAG);
} else if (this->unk_260 < 7) {
this->actor.gravity = -0.4f;
}
src/overlays/actors/ovl_En_Az/z_en_az.c
+20 -20
View File
@@ -590,7 +590,7 @@ void func_80A95CEC(EnAz* this, PlayState* play) {
this->actor.shape.rot.y = this->actor.world.rot.y;
this->actor.draw = EnAz_Draw;
Actor_MoveWithGravity(&this->actor);
func_800B9010(&this->actor, NA_SE_EV_HONEYCOMB_FALL - SFX_FLAG);
Actor_PlaySfx_Flagged(&this->actor, NA_SE_EV_HONEYCOMB_FALL - SFX_FLAG);
} else {
if (this->actor.bgCheckFlags & BGCHECKFLAG_GROUND_TOUCH) {
Actor_PlaySfx(&this->actor, NA_SE_EN_GERUDOFT_DOWN);
@@ -628,7 +628,7 @@ void func_80A95E88(EnAz* this, PlayState* play) {
Actor_PlaySfx(&this->actor, NA_SE_EV_BEAVER_SWIM_HAND);
}
} else {
func_800B9010(&this->actor, NA_SE_EV_BEAVER_SWIM_MOTOR - SFX_FLAG);
Actor_PlaySfx_Flagged(&this->actor, NA_SE_EV_BEAVER_SWIM_MOTOR - SFX_FLAG);
}
}
if (!(this->unk_374 & 0x2000)) {
@@ -655,7 +655,7 @@ void func_80A95FE8(EnAz* this, PlayState* play) {
CutsceneManager_Queue(this->csIdList[0]);
}
if (Actor_WorldDistXYZToPoint(&this->actor, &this->actor.home.pos) > 20.0f) {
func_800B9010(&this->actor, NA_SE_EV_BEAVER_SWIM_MOTOR - SFX_FLAG);
Actor_PlaySfx_Flagged(&this->actor, NA_SE_EV_BEAVER_SWIM_MOTOR - SFX_FLAG);
func_800BE33C(&this->actor.world.pos, &this->actor.home.pos, &this->actor.world.rot, false);
Math_SmoothStepToS(&this->actor.shape.rot.x, this->actor.world.rot.x, 3, 0xE38, 0x38E);
Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.world.rot.y, 3, 0xE38, 0x38E);
@@ -726,12 +726,12 @@ s32 func_80A9617C(EnAz* this, PlayState* play) {
break;
case 0x10D2:
if (play->msgCtx.choiceIndex == 0) {
func_8019F208();
Audio_PlaySfx_MessageDecide();
this->actor.textId = 0x10D6;
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimationInfo,
BEAVER_ANIM_TALK_WAVE_ARMS, &this->animIndex);
} else {
func_8019F230();
Audio_PlaySfx_MessageCancel();
this->actor.textId = 0x10D3;
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimationInfo, BEAVER_ANIM_BOW,
&this->animIndex);
@@ -760,7 +760,7 @@ s32 func_80A9617C(EnAz* this, PlayState* play) {
break;
case 0x10D8:
if (play->msgCtx.choiceIndex == 0) {
func_8019F208();
Audio_PlaySfx_MessageDecide();
switch (this->unk_2FA) {
case 2:
this->unk_2FA = 1;
@@ -777,7 +777,7 @@ s32 func_80A9617C(EnAz* this, PlayState* play) {
}
ret = 0;
} else {
func_8019F230();
Audio_PlaySfx_MessageCancel();
this->actor.textId = 0x10D9;
}
break;
@@ -796,12 +796,12 @@ s32 func_80A9617C(EnAz* this, PlayState* play) {
break;
case 0x10DB:
if (play->msgCtx.choiceIndex == 0) {
func_8019F208();
Audio_PlaySfx_MessageDecide();
play->msgCtx.msgMode = 0x44;
this->unk_2FA = 1;
ret = 0;
} else {
func_8019F230();
Audio_PlaySfx_MessageCancel();
this->actor.textId = 0x10DC;
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimationInfo, BEAVER_ANIM_BOW,
&this->animIndex);
@@ -850,10 +850,10 @@ s32 func_80A9617C(EnAz* this, PlayState* play) {
break;
case 0x10E5:
if (play->msgCtx.choiceIndex == 0) {
func_8019F208();
Audio_PlaySfx_MessageDecide();
this->actor.textId = 0x10E8;
} else {
func_8019F230();
Audio_PlaySfx_MessageCancel();
this->actor.textId = 0x10E6;
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimationInfo, BEAVER_ANIM_TALK_TO_LEFT,
&this->animIndex);
@@ -895,7 +895,7 @@ s32 func_80A9617C(EnAz* this, PlayState* play) {
case 0x10EB:
if (play->msgCtx.choiceIndex == 0) {
play->msgCtx.msgMode = 0x44;
func_8019F208();
Audio_PlaySfx_MessageDecide();
switch (this->unk_2FA) {
case 4:
this->unk_2FA = 3;
@@ -911,7 +911,7 @@ s32 func_80A9617C(EnAz* this, PlayState* play) {
}
ret = 0;
} else {
func_8019F230();
Audio_PlaySfx_MessageCancel();
this->actor.textId = 0x10EC;
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimationInfo, BEAVER_ANIM_LAUGH_LEFT,
&this->animIndex);
@@ -992,7 +992,7 @@ s32 func_80A9617C(EnAz* this, PlayState* play) {
break;
case 0x10F8:
if (play->msgCtx.choiceIndex == 0) {
func_8019F208();
Audio_PlaySfx_MessageDecide();
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_25_01)) {
this->actor.textId = 0x1107;
} else {
@@ -1001,7 +1001,7 @@ s32 func_80A9617C(EnAz* this, PlayState* play) {
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimationInfo,
BEAVER_ANIM_TALK_WAVE_ARMS, &this->animIndex);
} else {
func_8019F230();
Audio_PlaySfx_MessageCancel();
this->actor.textId = 0x10F9;
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimationInfo, BEAVER_ANIM_BOW,
&this->animIndex);
@@ -1044,7 +1044,7 @@ s32 func_80A9617C(EnAz* this, PlayState* play) {
break;
case 0x10FE:
if (play->msgCtx.choiceIndex == 0) {
func_8019F208();
Audio_PlaySfx_MessageDecide();
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_25_01)) {
this->actor.textId = 0x1108;
} else {
@@ -1053,7 +1053,7 @@ s32 func_80A9617C(EnAz* this, PlayState* play) {
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimationInfo, BEAVER_ANIM_TALK,
&this->animIndex);
} else {
func_8019F230();
Audio_PlaySfx_MessageCancel();
this->actor.textId = 0x10FF;
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimationInfo, BEAVER_ANIM_TALK_TO_LEFT,
&this->animIndex);
@@ -1425,13 +1425,13 @@ void func_80A97AB4(EnAz* this, PlayState* play) {
break;
case 0x10D8:
if (play->msgCtx.choiceIndex == 0) {
func_8019F208();
Audio_PlaySfx_MessageDecide();
play->msgCtx.msgMode = 0x44;
func_800FD750(NA_BGM_TIMED_MINI_GAME);
func_80A94AB8(this, play, 1);
func_80A979DC(this, play);
} else {
func_8019F230();
Audio_PlaySfx_MessageCancel();
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_24_04)) {
CLEAR_WEEKEVENTREG(WEEKEVENTREG_24_04);
}
@@ -1578,7 +1578,7 @@ void func_80A97F9C(EnAz* this, PlayState* play) {
Actor_PlaySfx(&this->actor, NA_SE_EV_BEAVER_SWIM_HAND);
}
} else {
func_800B9010(&this->actor, NA_SE_EV_BEAVER_SWIM_MOTOR - SFX_FLAG);
Actor_PlaySfx_Flagged(&this->actor, NA_SE_EV_BEAVER_SWIM_MOTOR - SFX_FLAG);
}
}
SkelAnime_Update(&this->skelAnime);
src/overlays/actors/ovl_En_Bat/z_en_bat.c
+1 -1
View File
@@ -514,7 +514,7 @@ void EnBat_Update(Actor* thisx, PlayState* play) {
this->drawDmgEffScale = (this->drawDmgEffAlpha + 1.0f) * 0.225f;
this->drawDmgEffScale = CLAMP_MAX(this->drawDmgEffScale, 0.45f);
} else if (!Math_StepToF(&this->drawDmgEffFrozenSteamScale, 0.45f, 0.45f / 40.0f)) {
func_800B9010(&this->actor, NA_SE_EV_ICE_FREEZE - SFX_FLAG);
Actor_PlaySfx_Flagged(&this->actor, NA_SE_EV_ICE_FREEZE - SFX_FLAG);
}
}
}
src/overlays/actors/ovl_En_Bb/z_en_bb.c
+1 -1
View File
@@ -615,7 +615,7 @@ void EnBb_Update(Actor* thisx, PlayState* play) {
this->drawDmgEffScale = (this->drawDmgEffAlpha + 1.0f) * 0.2f;
this->drawDmgEffScale = CLAMP_MAX(this->drawDmgEffScale, 0.4f);
} else if (!Math_StepToF(&this->drawDmgEffFrozenSteamScale, 0.4f, 0.01f)) {
func_800B9010(&this->actor, NA_SE_EV_ICE_FREEZE - SFX_FLAG);
Actor_PlaySfx_Flagged(&this->actor, NA_SE_EV_ICE_FREEZE - SFX_FLAG);
}
}
}
src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.c
+2 -2
View File
@@ -226,7 +226,7 @@ void EnBbfall_PlaySfx(EnBbfall* this) {
Actor_PlaySfx(&this->actor, NA_SE_EN_BUBLE_MOUTH);
}
func_800B9010(&this->actor, NA_SE_EN_BUBLEFALL_FIRE - SFX_FLAG);
Actor_PlaySfx_Flagged(&this->actor, NA_SE_EN_BUBLEFALL_FIRE - SFX_FLAG);
}
/**
@@ -648,7 +648,7 @@ void EnBbfall_Update(Actor* thisx, PlayState* play) {
this->drawDmgEffScale = (this->drawDmgEffAlpha + 1.0f) * 0.2f;
this->drawDmgEffScale = CLAMP_MAX(this->drawDmgEffScale, 0.4f);
} else if (!Math_StepToF(&this->drawDmgEffFrozenSteamScale, 0.4f, 0.01f)) {
func_800B9010(&this->actor, NA_SE_EV_ICE_FREEZE - SFX_FLAG);
Actor_PlaySfx_Flagged(&this->actor, NA_SE_EV_ICE_FREEZE - SFX_FLAG);
}
}
}
src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c
+1 -1
View File
@@ -552,7 +552,7 @@ void EnBigokuta_Update(Actor* thisx, PlayState* play) {
this->drawDmgEffScale = (this->drawDmgEffAlpha + 1.0f) * 0.6f;
this->drawDmgEffScale = CLAMP_MAX(this->drawDmgEffScale, 1.2f);
} else if (!Math_StepToF(&this->drawDmgEffFrozenSteamScale, 1.2f, 0.030000001f)) {
func_800B9010(&this->picto.actor, NA_SE_EV_ICE_FREEZE - SFX_FLAG);
Actor_PlaySfx_Flagged(&this->picto.actor, NA_SE_EV_ICE_FREEZE - SFX_FLAG);
}
}
}
src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.c
+2 -2
View File
@@ -492,7 +492,7 @@ void func_80A286C0(EnBigpamet* this) {
void func_80A28708(EnBigpamet* this, PlayState* play) {
this->unk_29E--;
this->actor.shape.rot.y += 0x3B00;
func_800B9010(&this->actor, NA_SE_EN_B_PAMET_ROLL - SFX_FLAG);
Actor_PlaySfx_Flagged(&this->actor, NA_SE_EN_B_PAMET_ROLL - SFX_FLAG);
if (this->unk_29E == 0) {
func_80A28760(this);
}
@@ -523,7 +523,7 @@ void func_80A287E8(EnBigpamet* this, PlayState* play) {
s16 quakeIndex;
this->actor.shape.rot.y += 0x3B00;
func_800B9010(&this->actor, NA_SE_EN_B_PAMET_ROLL - SFX_FLAG);
Actor_PlaySfx_Flagged(&this->actor, NA_SE_EN_B_PAMET_ROLL - SFX_FLAG);
this->unk_29E++;
this->unk_29E = CLAMP_MAX(this->unk_29E, 20);
if (this->collider.base.atFlags & AT_HIT) {
src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c
+2 -2
View File
@@ -556,7 +556,7 @@ void EnBigpo_IdleFlying(EnBigpo* this, PlayState* play) {
Math_StepToF(&this->savedHeight, player->actor.world.pos.y + 100.0f, 1.5f);
this->actor.world.pos.y = (Math_SinF(this->hoverHeightCycleTimer * (M_PI / 20)) * 10.0f) + this->savedHeight;
Math_StepToF(&this->actor.speed, 3.0f, 0.2f);
func_800B9010(&this->actor, NA_SE_EN_PO_FLY - SFX_FLAG);
Actor_PlaySfx_Flagged(&this->actor, NA_SE_EN_PO_FLY - SFX_FLAG);
if (Actor_WorldDistXZToPoint(&this->actor, &this->actor.home.pos) > 300.0f) {
this->unk208 = Actor_WorldYawTowardPoint(&this->actor, &this->actor.home.pos);
}
@@ -720,7 +720,7 @@ void EnBigpo_BurnAwayDeath(EnBigpo* this, PlayState* play) {
}
if (this->idleTimer < 18) {
func_800B9010(&this->actor, NA_SE_EN_COMMON_EXTINCT_LEV - SFX_FLAG); // burning sfx
Actor_PlaySfx_Flagged(&this->actor, NA_SE_EN_COMMON_EXTINCT_LEV - SFX_FLAG); // burning sfx
}
if (this->idleTimer == 18) {
Actor_PlaySfx(&this->actor, NA_SE_EN_WIZ_DISAPPEAR);
src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c
+8 -8
View File
@@ -895,14 +895,14 @@ void EnBigslime_SetTargetVtxFromPreFrozen(EnBigslime* this) {
* Plays the standard Gekko sound effects without reverb
*/
void EnBigslime_GekkoSfxOutsideBigslime(EnBigslime* this, u16 sfxId) {
Audio_PlaySfxAtPos(&this->gekkoProjectedPos, sfxId);
Audio_PlaySfx_AtPos(&this->gekkoProjectedPos, sfxId);
}
/**
* Adds reverb to Gekko sound effects when enclosed by bigslime
*/
void EnBigslime_GekkoSfxInsideBigslime(EnBigslime* this, u16 sfxId) {
func_8019F420(&this->gekkoProjectedPos, sfxId);
Audio_PlaySfx_Underwater(&this->gekkoProjectedPos, sfxId);
}
void EnBigslime_GekkoFreeze(EnBigslime* this) {
@@ -1633,7 +1633,7 @@ void EnBigslime_AttackPlayerInBigslime(EnBigslime* this, PlayState* play) {
Animation_PlayOnce(&this->skelAnime, sGekkoAttackAnimations[((s32)Rand_ZeroFloat(3.0f) % 3)]);
}
func_800B9010(&this->actor, NA_SE_EN_B_SLIME_PUNCH_MOVE - SFX_FLAG);
Actor_PlaySfx_Flagged(&this->actor, NA_SE_EN_B_SLIME_PUNCH_MOVE - SFX_FLAG);
}
/**
@@ -1897,7 +1897,7 @@ void EnBigslime_Freeze(EnBigslime* this, PlayState* play) {
sBigslimeTargetVtx[vtxIceUpdate - 4].n.a = sBigslimeTargetVtx[vtxIceUpdate].n.a;
}
func_800B9010(&this->actor, NA_SE_EV_ICE_FREEZE - SFX_FLAG);
Actor_PlaySfx_Flagged(&this->actor, NA_SE_EV_ICE_FREEZE - SFX_FLAG);
if (this->actor.bgCheckFlags & BGCHECKFLAG_GROUND_TOUCH) {
if (this->freezeTimer == 0) {
EnBigslime_BreakIntoMinislime(this, play);
@@ -1980,7 +1980,7 @@ void EnBigslime_Melt(EnBigslime* this, PlayState* play) {
EffectSsIceSmoke_Spawn(play, &iceSmokePos, &iceSmokeVelocity, &gZeroVec3f, 600);
}
func_800B9010(&this->actor, NA_SE_EV_ICE_MELT_LEVEL - SFX_FLAG);
Actor_PlaySfx_Flagged(&this->actor, NA_SE_EV_ICE_MELT_LEVEL - SFX_FLAG);
for (i = 159; i >= 0; i--) {
sBigslimeTargetVtx[i + 2].n.a = sBigslimeTargetVtx[i].n.a;
}
@@ -2764,7 +2764,7 @@ void EnBigslime_UpdateEffects(EnBigslime* this) {
this->gekkoDrawDmgEffScale = 0.375f * (this->gekkoDrawDmgEffAlpha + 1.0f);
this->gekkoDrawDmgEffScale = CLAMP_MAX(this->gekkoDrawDmgEffScale, 0.75f);
} else if (!Math_StepToF(&this->gekkoDrawDmgEffFrozenSteamScale, 0.75f, 0.01875f)) {
func_800B9010(&this->actor, NA_SE_EV_ICE_FREEZE - SFX_FLAG);
Actor_PlaySfx_Flagged(&this->actor, NA_SE_EV_ICE_FREEZE - SFX_FLAG);
}
}
}
@@ -2779,7 +2779,7 @@ void EnBigslime_UpdateBigslime(Actor* thisx, PlayState* play) {
play->envCtx.lightSettingOverride = 0xFF;
}
func_8019F540(1);
Audio_SetSfxUnderwaterReverb(true);
this->dynamicVtxState ^= 1;
EnBigslime_DynamicVtxCopyState(this);
this->isAnimUpdate = SkelAnime_Update(&this->skelAnime);
@@ -2824,7 +2824,7 @@ void EnBigslime_UpdateGekko(Actor* thisx, PlayState* play) {
play->envCtx.lightSettingOverride = 0xFF;
}
func_8019F540(0);
Audio_SetSfxUnderwaterReverb(false);
this->isAnimUpdate = SkelAnime_Update(&this->skelAnime);
if (this->actionFunc != EnBigslime_PlayCutscene) {
EnBigslime_ApplyDamageEffectGekko(this, play);
src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.c
+2 -2
View File
@@ -207,12 +207,12 @@ void EnBji01_DialogueHandler(EnBji01* this, PlayState* play) {
this->actor.params = SHIKASHI_TYPE_FINISHED_CONVERSATION;
switch (play->msgCtx.choiceIndex) {
case 0:
func_8019F208();
Audio_PlaySfx_MessageDecide();
Message_CloseTextbox(play);
func_809CD634(this, play);
break;
case 1:
func_8019F230();
Audio_PlaySfx_MessageCancel();
switch (gSaveContext.save.playerForm) {
case PLAYER_FORM_DEKU:
Message_ContinueTextbox(play, 0x5F0);
src/overlays/actors/ovl_En_Bom/z_en_bom.c
+4 -4
View File
@@ -493,10 +493,10 @@ void EnBom_Update(Actor* thisx, PlayState* play) {
EffectSsGSpk_SpawnFuse(play, thisx, &effPos, &effVelocity, &effAccel);
}
if (this->isPowderKeg) {
func_801A0810(&thisx->projectedPos, NA_SE_IT_BIG_BOMB_IGNIT - SFX_FLAG,
(this->flashSpeedScale == 7) ? 0
: (this->flashSpeedScale == 3) ? 1
: 2);
Audio_PlaySfx_AtPosWithChannelIO(&thisx->projectedPos, NA_SE_IT_BIG_BOMB_IGNIT - SFX_FLAG,
(this->flashSpeedScale == 7) ? 0
: (this->flashSpeedScale == 3) ? 1
: 2);
} else {
Actor_PlaySfx(thisx, NA_SE_IT_BOMB_IGNIT - SFX_FLAG);
}
src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c
+2 -2
View File
@@ -181,7 +181,7 @@ void EnBomChu_WaitForRelease(EnBomChu* this, PlayState* play) {
this->actor.shape.rot.y = player->actor.shape.rot.y;
this->actor.flags |= ACTOR_FLAG_1;
func_800B8EF4(play, &this->actor);
Actor_PlaySfx_SurfaceBomb(play, &this->actor);
this->isMoving = true;
this->actor.speed = 8.0f;
@@ -313,7 +313,7 @@ void EnBomChu_Move(EnBomChu* this, PlayState* play) {
}
if (this->isMoving) {
func_800B8F98(&this->actor, NA_SE_IT_BOMBCHU_MOVE - SFX_FLAG);
Actor_PlaySfx_FlaggedCentered1(&this->actor, NA_SE_IT_BOMBCHU_MOVE - SFX_FLAG);
}
if (this->actor.speed != 0.0f) {
src/overlays/actors/ovl_En_Bombers/z_en_bombers.c
+4 -4
View File
@@ -347,11 +347,11 @@ void func_80C03FAC(EnBombers* this, PlayState* play) {
sp2A = 1;
} else if (this->actor.textId == 0x740) {
if (play->msgCtx.choiceIndex == 0) {
func_8019F208();
Audio_PlaySfx_MessageDecide();
this->actor.textId = 0x742;
sp2A = 1;
} else {
func_8019F230();
Audio_PlaySfx_MessageCancel();
this->actor.textId = 0x741;
sp2A = 1;
}
@@ -367,11 +367,11 @@ void func_80C03FAC(EnBombers* this, PlayState* play) {
sp2A = 1;
} else if (this->actor.textId == 0x74C) {
if (play->msgCtx.choiceIndex == 1) {
func_8019F230();
Audio_PlaySfx_MessageCancel();
this->actor.textId = 0x737;
sp2A = 1;
} else {
func_8019F208();
Audio_PlaySfx_MessageDecide();
this->actor.textId = 0x74D;
func_80C03824(this, 14, 1.0f);
sp2A = 1;
src/overlays/actors/ovl_En_Bombf/z_en_bombf.c
+1 -1
View File
@@ -239,7 +239,7 @@ void func_808AEE3C(EnBombf* this, PlayState* play) {
Math_SmoothStepToF(&this->actor.speed, 0.0f, 1.0f, 1.5f, 0.0f);
if (this->actor.bgCheckFlags & BGCHECKFLAG_GROUND_TOUCH) {
func_800B8EF4(play, &this->actor);
Actor_PlaySfx_SurfaceBomb(play, &this->actor);
if (this->actor.velocity.y < -6.0f) {
this->actor.velocity.y *= -0.3f;
this->actor.bgCheckFlags &= ~BGCHECKFLAG_GROUND;
src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.c
+3 -3
View File
@@ -598,7 +598,7 @@ void func_80BFF52C(EnBomjima* this, PlayState* play) {
if (play->msgCtx.choiceIndex == 0) {
Player* player = GET_PLAYER(play);
func_8019F208();
Audio_PlaySfx_MessageDecide();
func_80BFE65C(this);
this->unk_28E = 0;
this->unk_29A = 0;
@@ -609,14 +609,14 @@ void func_80BFF52C(EnBomjima* this, PlayState* play) {
this->actor.textId = D_80C00A70[this->unk_2C8];
}
Message_ContinueTextbox(play, this->actor.textId);
play_sound(NA_SE_SY_FOUND);
Audio_PlaySfx(NA_SE_SY_FOUND);
func_80BFE494(this, 15, 1.0f);
this->action = EN_BOMJIMA_ACTION_5;
this->actionFunc = func_80BFF6CC;
} else {
Player* player = GET_PLAYER(play);
func_8019F230();
Audio_PlaySfx_MessageCancel();
func_80BFE65C(this);
this->unk_2C8 = 10;
if (player->transformation == PLAYER_FORM_DEKU) {
src/overlays/actors/ovl_En_Boom/z_en_boom.c
+1 -1
View File
@@ -213,7 +213,7 @@ void func_808A2918(EnBoom* this, PlayState* play) {
Actor_SetSpeeds(&this->actor, 12.0f);
Actor_MoveWithGravity(&this->actor);
func_808A24DC(this, play);
func_800B9010(&this->actor, NA_SE_IT_BOOMERANG_FLY - SFX_FLAG);
Actor_PlaySfx_Flagged(&this->actor, NA_SE_IT_BOOMERANG_FLY - SFX_FLAG);
if ((this->collider.base.atFlags & AT_HIT) && (((this->collider.base.at->id == ACTOR_EN_ITEM00) &&
(this->collider.base.at->params != ITEM00_HEART_CONTAINER) &&
src/overlays/actors/ovl_En_Box/z_en_box.c
+5 -5
View File
@@ -364,7 +364,7 @@ void EnBox_Fall(EnBox* this, PlayState* play) {
this->dyna.actor.world.pos.y = this->dyna.actor.floorHeight;
EnBox_SetupAction(this, EnBox_WaitOpen);
}
Audio_PlaySfxAtPos(&this->dyna.actor.projectedPos, NA_SE_EV_TRE_BOX_BOUND);
Audio_PlaySfx_AtPos(&this->dyna.actor.projectedPos, NA_SE_EV_TRE_BOX_BOUND);
EnBox_SpawnDust(this, play);
}
yDiff = this->dyna.actor.world.pos.y - this->dyna.actor.floorHeight;
@@ -419,7 +419,7 @@ void func_80868AFC(EnBox* this, PlayState* play) {
EnBox_SetupAction(this, func_80868B74);
this->unk_1A0 = 0;
func_80867FBC(&this->unk_1F4, play, (this->movementFlags & ENBOX_MOVE_0x80) != 0);
Audio_PlaySfxAtPos(&this->dyna.actor.projectedPos, NA_SE_EV_TRE_BOX_APPEAR);
Audio_PlaySfx_AtPos(&this->dyna.actor.projectedPos, NA_SE_EV_TRE_BOX_APPEAR);
}
}
@@ -556,8 +556,8 @@ void EnBox_Open(EnBox* this, PlayState* play) {
gSaveContext.save.playerForm == PLAYER_FORM_DEKU ? 15.0f : 90.0f)) {
sfxId = NA_SE_EV_TBOX_OPEN;
}
if (sfxId != 0) {
Audio_PlaySfxAtPos(&this->dyna.actor.projectedPos, sfxId);
if (sfxId != NA_SE_NONE) {
Audio_PlaySfx_AtPos(&this->dyna.actor.projectedPos, sfxId);
}
if (this->skelAnime.jointTable[3].z > 0) {
this->unk_1A8 = (0x7D00 - this->skelAnime.jointTable[3].z) * 0.00006f;
@@ -583,7 +583,7 @@ void EnBox_SpawnIceSmoke(EnBox* this, PlayState* play) {
this->iceSmokeTimer++;
//! @bug sfxId should be NA_SE_EN_MIMICK_BREATH, but uses OoT's sfxId value
func_800B9010(&this->dyna.actor, NA_SE_EN_LAST3_COIL_ATTACK_OLD - SFX_FLAG);
Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_EN_LAST3_COIL_ATTACK_OLD - SFX_FLAG);
if (Rand_ZeroOne() < 0.3f) {
randomf = 2.0f * Rand_ZeroOne() - 1.0f;
pos = this->dyna.actor.world.pos;
src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c
+1 -1
View File
@@ -570,7 +570,7 @@ void EnClearTag_UpdateCamera(EnClearTag* this, PlayState* play) {
this->subCamAt.z = mainCam->at.z;
Message_StartTextbox(play, 0xF, NULL);
this->cameraState = 2;
func_8019FDC8(&gSfxDefaultPos, NA_SE_VO_NA_LISTEN, 0x20);
Audio_PlaySfx_AtPosWithReverb(&gSfxDefaultPos, NA_SE_VO_NA_LISTEN, 0x20);
case 2:
if (player->actor.world.pos.z > 0.0f) {
player->actor.world.pos.z = 290.0f;
src/overlays/actors/ovl_En_Crow/z_en_crow.c
+1 -1
View File
@@ -542,7 +542,7 @@ void EnCrow_Update(Actor* thisx, PlayState* play) {
this->drawDmgEffFrozenSteamScale = this->drawDmgEffFrozenSteamScale;
}
} else if (!Math_StepToF(&this->drawDmgEffScale, 0.5f, 0.5f * 0.025f)) {
func_800B9010(&this->actor, NA_SE_EV_ICE_FREEZE - SFX_FLAG);
Actor_PlaySfx_Flagged(&this->actor, NA_SE_EV_ICE_FREEZE - SFX_FLAG);
}
}
}
src/overlays/actors/ovl_En_Dai/z_en_dai.c
+1 -1
View File
@@ -422,7 +422,7 @@ void func_80B3EEDC(EnDai* this, PlayState* play) {
func_80B3E96C(this, play);
this->unk_A6C = 0;
} else if (this->unk_A6C == 0) {
play_sound(NA_SE_SY_TRE_BOX_APPEAR);
Audio_PlaySfx(NA_SE_SY_TRE_BOX_APPEAR);
this->unk_A6C = 1;
}
}
src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c
+1 -1
View File
@@ -1214,7 +1214,7 @@ void EnDekubaba_Update(Actor* thisx, PlayState* play) {
this->drawDmgEffScale = (this->drawDmgEffAlpha + 1.0f) * 0.375f;
this->drawDmgEffScale = CLAMP_MAX(this->drawDmgEffScale, 0.75f);
} else if (!Math_StepToF(&this->drawDmgEffFrozenSteamScale, 0.75f, 0.75f / 40)) {
func_800B9010(&this->actor, NA_SE_EV_ICE_FREEZE - SFX_FLAG);
Actor_PlaySfx_Flagged(&this->actor, NA_SE_EV_ICE_FREEZE - SFX_FLAG);
}
}
}
src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c
+1 -1
View File
@@ -660,7 +660,7 @@ void EnDekunuts_Update(Actor* thisx, PlayState* play) {
this->drawDmgEffScale = CLAMP_MAX(this->drawDmgEffScale, 0.55f);
} else if ((this->drawDmgEffType == ACTOR_DRAW_DMGEFF_FROZEN_NO_SFX) &&
!Math_StepToF(&this->drawDmgEffFrozenSteamScale, 0.55f, (33.0f / 1600.0f))) {
func_800B9010(&this->actor, NA_SE_EV_ICE_FREEZE - SFX_FLAG);
Actor_PlaySfx_Flagged(&this->actor, NA_SE_EV_ICE_FREEZE - SFX_FLAG);
}
}
}
src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.c
+3 -3
View File
@@ -559,7 +559,7 @@ void func_8089B580(EnDinofos* this, PlayState* play) {
Math_Vec3f_StepTo(&subCam->eye, &this->unk_2BC, 10.0f);
Play_SetCameraAtEye(play, this->subCamId, &this->actor.focus.pos, &subCam->eye);
if (this->skelAnime.curFrame <= 55.0f) {
func_800B9010(&this->actor, NA_SE_EN_DODO_J_FIRE - SFX_FLAG);
Actor_PlaySfx_Flagged(&this->actor, NA_SE_EN_DODO_J_FIRE - SFX_FLAG);
}
}
@@ -1086,7 +1086,7 @@ void func_8089CBEC(EnDinofos* this, PlayState* play) {
sp7C.x = 0.9f * temp_f20;
sp7C.y = Rand_CenteredFloat(0.6f) + 1.4f;
sp7C.z = 0.9f * temp_f22;
func_800B9010(&this->actor, NA_SE_EN_DODO_J_FIRE - SFX_FLAG);
Actor_PlaySfx_Flagged(&this->actor, NA_SE_EN_DODO_J_FIRE - SFX_FLAG);
EffectSsDFire_Spawn(play, &this->limbPos[10], &sp88, &sp7C, 30, 22, 255 - (temp_s0 * 20), 20, 3, 8);
for (end = 6, i = 3; i > 0; i--) {
@@ -1398,7 +1398,7 @@ void EnDinofos_Update(Actor* thisx, PlayState* play2) {
this->drawDmgEffScale = (this->drawDmgEffAlpha + 1.0f) * (11.0f / 40.0f);
this->drawDmgEffScale = CLAMP_MAX(this->drawDmgEffScale, 0.55f);
} else if (!Math_StepToF(&this->drawDmgEffFrozenSteamScale, 0.55f, 0.01375f)) {
func_800B9010(&this->actor, NA_SE_EV_ICE_FREEZE - SFX_FLAG);
Actor_PlaySfx_Flagged(&this->actor, NA_SE_EV_ICE_FREEZE - SFX_FLAG);
}
}
}
src/overlays/actors/ovl_En_Dnk/z_en_dnk.c
+3 -3
View File
@@ -425,11 +425,11 @@ void func_80A52018(Actor* thisx, PlayState* play) {
void func_80A52074(EnDnk* this, PlayState* play) {
switch (play->csCtx.curFrame) {
case 80:
func_8019F128(NA_SE_EN_DEKNUTS_DANCE1);
Audio_PlaySfx_2(NA_SE_EN_DEKNUTS_DANCE1);
break;
case 123:
func_8019F128(NA_SE_EN_DEKNUTS_DANCE2);
Audio_PlaySfx_2(NA_SE_EN_DEKNUTS_DANCE2);
break;
case 438:
@@ -442,7 +442,7 @@ void func_80A52074(EnDnk* this, PlayState* play) {
}
if ((play->csCtx.curFrame >= 198) && (play->csCtx.curFrame < 438)) {
func_8019F128(NA_SE_EN_DEKNUTS_DANCE - SFX_FLAG);
Audio_PlaySfx_2(NA_SE_EN_DEKNUTS_DANCE - SFX_FLAG);
}
}
src/overlays/actors/ovl_En_Dno/z_en_dno.c
+1 -1
View File
@@ -861,7 +861,7 @@ void func_80A730A0(EnDno* this, PlayState* play) {
this->unk_3AE += 1000;
this->actor.shape.rot.y = this->actor.yawTowardsPlayer;
func_80A715DC(this, play);
func_800B9010(&this->actor, NA_SE_EV_BUTLER_FRY - SFX_FLAG);
Actor_PlaySfx_Flagged(&this->actor, NA_SE_EV_BUTLER_FRY - SFX_FLAG);
if (this->actorPath.flags & ACTOR_PATHING_REACHED_END_PERMANENT) {
Math_Vec3f_Copy(&this->actor.world.pos, &this->actorPath.curPoint);
this->actor.speed = 0.0f;
src/overlays/actors/ovl_En_Dns/z_en_dns.c
+1 -1
View File
@@ -402,7 +402,7 @@ void func_8092D1B8(EnDns* this, PlayState* play) {
player->stateFlags1 |= PLAYER_STATE1_20;
this->unk_2C6 |= 0x100;
SubS_UpdateFlags(&this->unk_2C6, 4, 7);
play_sound(NA_SE_SY_FOUND);
Audio_PlaySfx(NA_SE_SY_FOUND);
SET_EVENTINF(EVENTINF_15);
this->unk_2F4 = func_8092CCEC;
func_8092C63C(this, EN_DNS_ANIM_WALK_1);
src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c
+3 -3
View File
@@ -645,7 +645,7 @@ void func_8087784C(EnDodongo* this, PlayState* play) {
}
if (func_8087721C(this)) {
func_800B9010(&this->actor, NA_SE_EN_DODO_J_FIRE - SFX_FLAG);
Actor_PlaySfx_Flagged(&this->actor, NA_SE_EN_DODO_J_FIRE - SFX_FLAG);
frame = this->skelAnime.curFrame - 29.0f;
end = frame >> 1;
if (end > 3) {
@@ -671,7 +671,7 @@ void func_8087784C(EnDodongo* this, PlayState* play) {
EffectSsDFire_Spawn(play, &this->limbPos[0], &D_80879354, &D_80879348, this->unk_334 * 100.0f,
this->unk_334 * 35.0f, 0xFF - (frame * 10), 5, 0, 8);
} else if ((this->skelAnime.curFrame >= 2.0f) && (this->skelAnime.curFrame <= 20.0f)) {
func_800B9010(&this->actor, NA_SE_EN_DODO_J_BREATH - SFX_FLAG);
Actor_PlaySfx_Flagged(&this->actor, NA_SE_EN_DODO_J_BREATH - SFX_FLAG);
}
if (SkelAnime_Update(&this->skelAnime)) {
@@ -1053,7 +1053,7 @@ void EnDodongo_Update(Actor* thisx, PlayState* play2) {
this->drawDmgEffScale = (this->drawDmgEffAlpha + 1.0f) * 0.375f;
this->drawDmgEffScale = (this->drawDmgEffScale > 0.75f) ? 0.75f : this->drawDmgEffScale;
} else if (!Math_StepToF(&this->drawDmgEffFrozenSteamScale, 0.75f, 0.01875f)) {
func_800B9010(&this->actor, NA_SE_EV_ICE_FREEZE - SFX_FLAG);
Actor_PlaySfx_Flagged(&this->actor, NA_SE_EV_ICE_FREEZE - SFX_FLAG);
}
}
}
src/overlays/actors/ovl_En_Elf/z_en_elf.c
+4 -4
View File
@@ -1132,7 +1132,7 @@ void func_8088F214(EnElf* this, PlayState* play) {
}
} else if (this->unk_264 & 8) {
sp34 = 1;
func_800B9010(&this->actor, NA_SE_EV_BELL_ANGER - SFX_FLAG);
Actor_PlaySfx_Flagged(&this->actor, NA_SE_EV_BELL_ANGER - SFX_FLAG);
} else {
arrowPointedActor = play->actorCtx.targetContext.arrowPointedActor;
if (player->stateFlags1 & PLAYER_STATE1_400) {
@@ -1367,11 +1367,11 @@ void func_8088FE64(Actor* thisx, PlayState* play2) {
if (play->msgCtx.currentTextId == 0x202) {
switch (play->msgCtx.choiceIndex) {
case 0:
func_8019F230();
Audio_PlaySfx_MessageCancel();
break;
case 1:
func_8019F208();
Audio_PlaySfx_MessageDecide();
break;
}
}
@@ -1472,7 +1472,7 @@ void func_8089010C(Actor* thisx, PlayState* play) {
}
if (Actor_ProcessTalkRequest(thisx, &play->state)) {
func_8019FDC8(&gSfxDefaultPos, NA_SE_VO_NA_LISTEN, 0x20);
Audio_PlaySfx_AtPosWithReverb(&gSfxDefaultPos, NA_SE_VO_NA_LISTEN, 0x20);
thisx->focus.pos = thisx->world.pos;
if (thisx->textId == QuestHint_GetTatlTextId(play)) {
src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.c
+4 -4
View File
@@ -353,7 +353,7 @@ void func_80A3A0AC(EnElfgrp* this, PlayState* play) {
void func_80A3A0F4(EnElfgrp* this, PlayState* play) {
if (this->unk_144 == 10) {
play_sound(NA_SE_SY_WHITE_OUT_T);
Audio_PlaySfx(NA_SE_SY_WHITE_OUT_T);
if (ENELFGRP_GET(&this->actor) < ENELFGRP_4) {
Actor_Spawn(&play->actorCtx, play, ACTOR_DEMO_EFFECT, this->actor.world.pos.x,
this->actor.world.pos.y + 30.0f, this->actor.world.pos.z, 0, 0, 0,
@@ -365,7 +365,7 @@ void func_80A3A0F4(EnElfgrp* this, PlayState* play) {
}
if ((this->unk_144 > 10) && (this->unk_14A & 1)) {
func_800B9010(&this->actor, NA_SE_EV_FAIRY_GROUP_FRY - SFX_FLAG);
Actor_PlaySfx_Flagged(&this->actor, NA_SE_EV_FAIRY_GROUP_FRY - SFX_FLAG);
}
if (this->unk_144 == 0) {
@@ -381,14 +381,14 @@ void func_80A3A210(EnElfgrp* this, PlayState* play) {
}
if (this->unk_14A & 1) {
func_800B9010(&this->actor, NA_SE_EV_FAIRY_GROUP_FRY - SFX_FLAG);
Actor_PlaySfx_Flagged(&this->actor, NA_SE_EV_FAIRY_GROUP_FRY - SFX_FLAG);
}
}
void func_80A3A274(EnElfgrp* this, PlayState* play) {
if (Cutscene_IsCueInChannel(play, CS_CMD_ACTOR_CUE_100)) {
if (this->unk_14A & 1) {
func_800B9010(&this->actor, NA_SE_PL_CHIBI_FAIRY_HEAL - SFX_FLAG);
Actor_PlaySfx_Flagged(&this->actor, NA_SE_PL_CHIBI_FAIRY_HEAL - SFX_FLAG);
}
switch (play->csCtx.actorCues[Cutscene_GetCueChannel(play, CS_CMD_ACTOR_CUE_100)]->id) {
src/overlays/actors/ovl_En_Elforg/z_en_elforg.c
+3 -3
View File
@@ -404,7 +404,7 @@ void EnElforg_FairyCollected(EnElforg* this, PlayState* play) {
return;
}
func_800B9010(&this->actor, NA_SE_PL_CHIBI_FAIRY_HEAL - SFX_FLAG);
Actor_PlaySfx_Flagged(&this->actor, NA_SE_PL_CHIBI_FAIRY_HEAL - SFX_FLAG);
}
void EnElforg_SetupFairyCollected(EnElforg* this, PlayState* play) {
@@ -435,7 +435,7 @@ void EnElforg_ClockTownFairyCollected(EnElforg* this, PlayState* play) {
return;
}
func_800B9010(&this->actor, NA_SE_PL_CHIBI_FAIRY_HEAL - SFX_FLAG);
Actor_PlaySfx_Flagged(&this->actor, NA_SE_PL_CHIBI_FAIRY_HEAL - SFX_FLAG);
if (CutsceneManager_GetCurrentCsId() != CS_ID_GLOBAL_TALK) {
if (CutsceneManager_IsNext(CS_ID_GLOBAL_TALK)) {
CutsceneManager_Start(CS_ID_GLOBAL_TALK, &this->actor);
@@ -504,7 +504,7 @@ void EnElforg_FreeFloating(EnElforg* this, PlayState* play) {
func_80ACCBB8(this, play);
if (Player_GetMask(play) == PLAYER_MASK_GREAT_FAIRY) {
if (!(this->strayFairyFlags & STRAY_FAIRY_FLAG_GREAT_FAIRYS_MASK_EQUIPPED)) {
play_sound(NA_SE_SY_FAIRY_MASK_SUCCESS);
Audio_PlaySfx(NA_SE_SY_FAIRY_MASK_SUCCESS);
}
this->strayFairyFlags |= STRAY_FAIRY_FLAG_GREAT_FAIRYS_MASK_EQUIPPED;
src/overlays/actors/ovl_En_Fall/z_en_fall.c
+5 -5
View File
@@ -425,7 +425,7 @@ void EnFall_StoppedClosedMouthMoon_PerformCutsceneActions(EnFall* this, PlayStat
break;
}
if (play->csCtx.curFrame >= 1145) {
func_800B9010(&this->actor, NA_SE_EV_FALL_POWER - SFX_FLAG);
Actor_PlaySfx_Flagged(&this->actor, NA_SE_EV_FALL_POWER - SFX_FLAG);
}
break;
@@ -444,7 +444,7 @@ void EnFall_StoppedClosedMouthMoon_PerformCutsceneActions(EnFall* this, PlayStat
break;
}
if (play->csCtx.curFrame >= 650) {
func_800B9010(&this->actor, NA_SE_EV_FALL_POWER - SFX_FLAG);
Actor_PlaySfx_Flagged(&this->actor, NA_SE_EV_FALL_POWER - SFX_FLAG);
}
break;
}
@@ -453,7 +453,7 @@ void EnFall_StoppedClosedMouthMoon_PerformCutsceneActions(EnFall* this, PlayStat
void EnFall_ClockTowerOrTitleScreenMoon_PerformCutsceneActions(EnFall* this, PlayState* play) {
if ((play->csCtx.state != CS_STATE_IDLE) && (play->sceneId == SCENE_OKUJOU)) {
func_800B9010(&this->actor, NA_SE_EV_MOON_FALL - SFX_FLAG);
Actor_PlaySfx_Flagged(&this->actor, NA_SE_EV_MOON_FALL - SFX_FLAG);
}
}
@@ -528,7 +528,7 @@ void EnFall_MoonsTear_Fall(EnFall* this, PlayState* play) {
this->actor.draw = NULL;
this->actionFunc = EnFall_MoonsTear_DoNothing;
} else {
func_800B9010(&this->actor, NA_SE_EV_MOONSTONE_FALL - SFX_FLAG);
Actor_PlaySfx_Flagged(&this->actor, NA_SE_EV_MOONSTONE_FALL - SFX_FLAG);
}
}
}
@@ -627,7 +627,7 @@ void EnFall_Fireball_Update(Actor* thisx, PlayState* play) {
}
if (Cutscene_IsCueInChannel(play, CS_CMD_ACTOR_CUE_450) && (this->fireballAlpha > 0)) {
func_8019F128(NA_SE_EV_MOON_FALL_LAST - SFX_FLAG);
Audio_PlaySfx_2(NA_SE_EV_MOON_FALL_LAST - SFX_FLAG);
}
Actor_SetScale(&this->actor, this->scale * 1.74f);
}
src/overlays/actors/ovl_En_Fall2/z_en_fall2.c
+1 -1
View File
@@ -133,7 +133,7 @@ void func_80C1B9D4(EnFall2* this, PlayState* play) {
}
func_80C1B8F0(this);
if (this->alphaLevel > 0.0f) {
func_800B9010(&this->actor, NA_SE_EV_MOON_LIGHT_PILLAR - SFX_FLAG);
Actor_PlaySfx_Flagged(&this->actor, NA_SE_EV_MOON_LIGHT_PILLAR - SFX_FLAG);
}
} else {
this->actor.draw = NULL;

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