diff options
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/padmgr.c | 3 | ||||
| -rw-r--r-- | src/code/z_parameter.c | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/code/padmgr.c b/src/code/padmgr.c index 1b75721cb..230102459 100644 --- a/src/code/padmgr.c +++ b/src/code/padmgr.c @@ -35,6 +35,7 @@ #include "PR/controller.h" #include "PR/os_motor.h" #include "fault.h" +#include "z64voice.h" extern FaultMgr gFaultMgr; @@ -527,7 +528,7 @@ void PadMgr_InitVoice(void) { } else { sPadMgrInstance->ctrlrType[i] = PADMGR_CONT_VOICE; sVoiceInitStatus = VOICE_INIT_SUCCESS; - func_801A4EB0(); + AudioVoice_Noop(); } } } diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c index cf7fbd1e3..f3077da95 100644 --- a/src/code/z_parameter.c +++ b/src/code/z_parameter.c @@ -3,6 +3,7 @@ #include "sys_cfb.h" #include "z64snap.h" #include "z64view.h" +#include "z64voice.h" #include "archives/icon_item_static/icon_item_static_yar.h" #include "interface/parameter_static/parameter_static.h" #include "interface/do_action_static/do_action_static.h" @@ -2345,7 +2346,8 @@ void Interface_UpdateButtonsPart1(PlayState* play) { interfaceCtx->unk_222 = interfaceCtx->unk_224 = 0; restoreHudVisibility = true; sPictoState = PICTO_BOX_STATE_OFF; - } else if (CHECK_BTN_ALL(CONTROLLER1(&play->state)->press.button, BTN_A) || (func_801A5100() == 1)) { + } else if (CHECK_BTN_ALL(CONTROLLER1(&play->state)->press.button, BTN_A) || + (AudioVoice_GetWord() == VOICE_WORD_ID_CHEESE)) { if (!CHECK_EVENTINF(EVENTINF_41) || (CHECK_EVENTINF(EVENTINF_41) && (CutsceneManager_GetCurrentCsId() == CS_ID_NONE))) { Audio_PlaySfx(NA_SE_SY_CAMERA_SHUTTER); |