diff options
| author | engineer124 <engineer124engineer124@gmail.com> | 2022-06-20 21:14:44 +1000 |
|---|---|---|
| committer | engineer124 <engineer124engineer124@gmail.com> | 2022-06-20 21:14:44 +1000 |
| commit | e4904450de37de36c1fa3d203d02bf8dfaed152a (patch) | |
| tree | 8a0c65f248cbe1676c46f926a7463631874f8863 /src/code/z_parameter.c | |
| parent | 8df8271d6c84a235d91758d4a25bebd95ccb3c21 (diff) | |
| parent | 37d3934e2c6866185b3ba76bad40224336a7a1f9 (diff) | |
Merge branch 'master' into parameter
Diffstat (limited to 'src/code/z_parameter.c')
| -rw-r--r-- | src/code/z_parameter.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c index 2dc2b15c6..d673ed714 100644 --- a/src/code/z_parameter.c +++ b/src/code/z_parameter.c @@ -2069,13 +2069,14 @@ void func_80111CB4(GlobalContext* globalCtx) { interfaceCtx->unk_222 = interfaceCtx->unk_224; sp28 = true; D_801BF884 = 0; - } else if (CHECK_BTN_ALL(CONTROLLER1(globalCtx)->press.button, BTN_B)) { + } else if (CHECK_BTN_ALL(CONTROLLER1(&globalCtx->state)->press.button, BTN_B)) { globalCtx->actorCtx.unk5 &= ~4; interfaceCtx->unk_224 = 0; interfaceCtx->unk_222 = interfaceCtx->unk_224; sp28 = true; D_801BF884 = 0; - } else if (CHECK_BTN_ALL(CONTROLLER1(globalCtx)->press.button, BTN_A) || (func_801A5100() == 1)) { + } else if (CHECK_BTN_ALL(CONTROLLER1(&globalCtx->state)->press.button, BTN_A) || + (func_801A5100() == 1)) { if (!(gSaveContext.eventInf[4] & 2) || ((gSaveContext.eventInf[4] & 2) && (ActorCutscene_GetCurrentIndex() == -1))) { play_sound(NA_SE_SY_CAMERA_SHUTTER); |