summaryrefslogtreecommitdiff
path: root/src/code/z_kaleido_setup.c
diff options
context:
space:
mode:
authorfig02 <fig02srl@gmail.com>2022-05-17 18:41:50 -0400
committerGitHub <noreply@github.com>2022-05-18 00:41:50 +0200
commitaadb5f9c474e9f5773bb78bcfdd5cbedeed5169c (patch)
tree2c15152e6a6254df3eccb7b498c4f4e442ef49ec /src/code/z_kaleido_setup.c
parentf6c472ae5e53575af5f0fd0f92ddc03c37ff0cf7 (diff)
Gameplay_ -> Play_ and this (#1229)
Diffstat (limited to 'src/code/z_kaleido_setup.c')
-rw-r--r--src/code/z_kaleido_setup.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/code/z_kaleido_setup.c b/src/code/z_kaleido_setup.c
index 3a6713f9c..cb05b520e 100644
--- a/src/code/z_kaleido_setup.c
+++ b/src/code/z_kaleido_setup.c
@@ -14,9 +14,9 @@ void KaleidoSetup_Update(GlobalContext* globalCtx) {
if (pauseCtx->state == 0 && pauseCtx->debugState == 0 && globalCtx->gameOverCtx.state == GAMEOVER_INACTIVE &&
globalCtx->transitionTrigger == TRANS_TRIGGER_OFF && globalCtx->transitionMode == TRANS_MODE_OFF &&
- gSaveContext.cutsceneIndex < 0xFFF0 && gSaveContext.nextCutsceneIndex < 0xFFF0 &&
- !Gameplay_InCsMode(globalCtx) && globalCtx->shootingGalleryStatus <= 1 && gSaveContext.unk_13F0 != 8 &&
- gSaveContext.unk_13F0 != 9 && (globalCtx->sceneNum != SCENE_BOWLING || !Flags_GetSwitch(globalCtx, 0x38))) {
+ gSaveContext.cutsceneIndex < 0xFFF0 && gSaveContext.nextCutsceneIndex < 0xFFF0 && !Play_InCsMode(globalCtx) &&
+ globalCtx->shootingGalleryStatus <= 1 && gSaveContext.unk_13F0 != 8 && gSaveContext.unk_13F0 != 9 &&
+ (globalCtx->sceneNum != SCENE_BOWLING || !Flags_GetSwitch(globalCtx, 0x38))) {
if (CHECK_BTN_ALL(input->cur.button, BTN_L) && CHECK_BTN_ALL(input->press.button, BTN_CUP)) {
if (BREG(0)) {