diff options
| author | iheemskerk <ivanheemskerk@gmail.com> | 2022-05-21 13:16:48 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-21 13:16:48 -0400 |
| commit | 0b2c264a6093cd5af0390d8b475da20e393fa502 (patch) | |
| tree | b38ca9bf09127de9a447ea8a1a08b0edc5853d0b /soh/src/code | |
| parent | 09933377219f602f33a0f8538f5a09fe1b652a6a (diff) | |
Add toggle to disable navi call voice audio (#336)
Co-authored-by: genegrey <pulicave@gmail.com>
Diffstat (limited to 'soh/src/code')
| -rw-r--r-- | soh/src/code/z_parameter.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/soh/src/code/z_parameter.c b/soh/src/code/z_parameter.c index 8c901ed8a..dcfcdb05b 100644 --- a/soh/src/code/z_parameter.c +++ b/soh/src/code/z_parameter.c @@ -2164,13 +2164,15 @@ void Interface_SetNaviCall(GlobalContext* globalCtx, u16 naviCallState) { if (((naviCallState == 0x1D) || (naviCallState == 0x1E)) && !interfaceCtx->naviCalling && (globalCtx->csCtx.state == CS_STATE_IDLE)) { - // clang-format off - if (naviCallState == 0x1E) { Audio_PlaySoundGeneral(NA_SE_VO_NAVY_CALL, &D_801333D4, 4, - &D_801333E0, &D_801333E0, &D_801333E8); } - // clang-format on + if (!CVar_GetS32("gDisableNaviCallAudio", 0)) { + // clang-format off + if (naviCallState == 0x1E) { Audio_PlaySoundGeneral(NA_SE_VO_NAVY_CALL, &D_801333D4, 4, + &D_801333E0, &D_801333E0, &D_801333E8); } + // clang-format on - if (naviCallState == 0x1D) { - func_800F4524(&D_801333D4, NA_SE_VO_NA_HELLO_2, 32); + if (naviCallState == 0x1D) { + func_800F4524(&D_801333D4, NA_SE_VO_NA_HELLO_2, 32); + } } interfaceCtx->naviCalling = 1; |