diff options
Diffstat (limited to 'mm/src/code')
| -rw-r--r-- | mm/src/code/z_actor.c | 6 | ||||
| -rw-r--r-- | mm/src/code/z_parameter.c | 13 |
2 files changed, 12 insertions, 7 deletions
diff --git a/mm/src/code/z_actor.c b/mm/src/code/z_actor.c index 8c86e337e..6fed8a875 100644 --- a/mm/src/code/z_actor.c +++ b/mm/src/code/z_actor.c @@ -2486,8 +2486,10 @@ void Player_PlaySfx(Player* player, u16 sfxId) { if (player->currentMask == PLAYER_MASK_GIANT) { Audio_PlaySfx_AtPosWithPresetLowFreqAndHighReverb(&player->actor.projectedPos, sfxId); } else { - AudioSfx_PlaySfx(sfxId, &player->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, - &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); + if (GameInteractor_Should(VB_LINK_VOICE_PITCH_MULTIPLIER, true, &sfxId)) { + AudioSfx_PlaySfx(sfxId, &player->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, + &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); + } } } diff --git a/mm/src/code/z_parameter.c b/mm/src/code/z_parameter.c index f18287569..9cea7ffce 100644 --- a/mm/src/code/z_parameter.c +++ b/mm/src/code/z_parameter.c @@ -5091,12 +5091,15 @@ void Interface_SetTatlCall(PlayState* play, u16 tatlCallState) { if (((tatlCallState == TATL_STATE_2A) || (tatlCallState == TATL_STATE_2B)) && !interfaceCtx->tatlCalling && (play->csCtx.state == CS_STATE_IDLE)) { - if (tatlCallState == TATL_STATE_2B) { - Audio_PlaySfx(NA_SE_VO_NAVY_CALL); - } - if (tatlCallState == TATL_STATE_2A) { - Audio_PlaySfx_AtPosWithReverb(&gSfxDefaultPos, NA_SE_VO_NA_HELLO_2, 0x20); + if (GameInteractor_Should(VB_PLAY_TATL_CALL_AUDIO, true)) { + if (tatlCallState == TATL_STATE_2B) { + Audio_PlaySfx(NA_SE_VO_NAVY_CALL); + } + if (tatlCallState == TATL_STATE_2A) { + Audio_PlaySfx_AtPosWithReverb(&gSfxDefaultPos, NA_SE_VO_NA_HELLO_2, 0x20); + } } + interfaceCtx->tatlCalling = true; sCUpInvisible = 0; sCUpTimer = 10; |