diff options
| author | Alejandro Javier Asenjo Nitti <alejandro.asenjo88@gmail.com> | 2023-10-31 21:38:51 -0300 |
|---|---|---|
| committer | Alejandro Javier Asenjo Nitti <alejandro.asenjo88@gmail.com> | 2023-10-31 21:38:51 -0300 |
| commit | 2f1abc1ff3ceb2988590f70d2281fa91c081e81d (patch) | |
| tree | f8321254b88a1d310a2447c69fed9ae7afa14f75 /src/code | |
| parent | c20f9d94d372df6ae944832249fae783a3f2f4a2 (diff) | |
| parent | e01a7c2ac77f72b4c44be7044aa37b28064f9505 (diff) | |
Merge branch 'zret' of github.com:HarbourMasters/mm into zret
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/padmgr.c | 1 | ||||
| -rw-r--r-- | src/code/sys_cfb.c | 1 | ||||
| -rw-r--r-- | src/code/z_parameter.c | 4 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/code/padmgr.c b/src/code/padmgr.c index 1b75721cb..056103dde 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; diff --git a/src/code/sys_cfb.c b/src/code/sys_cfb.c index 32600643a..383a35cc9 100644 --- a/src/code/sys_cfb.c +++ b/src/code/sys_cfb.c @@ -1,4 +1,3 @@ -#include "prevent_bss_reordering.h" #include "z64.h" #include "regs.h" #include "functions.h" diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c index 4f553860b..1ad8135a5 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); |