From fefeb369dd19172d5eb419f8c8373cfb10d59d19 Mon Sep 17 00:00:00 2001 From: Dragorn421 Date: Fri, 22 Sep 2023 20:48:09 +0200 Subject: Name the main pause state and add placeholder enum for main (sub)states (#1551) --- src/code/z_kaleido_scope_call.c | 4 ++-- src/code/z_kaleido_setup.c | 4 ++-- src/code/z_parameter.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/code') diff --git a/src/code/z_kaleido_scope_call.c b/src/code/z_kaleido_scope_call.c index 4278b12ef..c61eb3354 100644 --- a/src/code/z_kaleido_scope_call.c +++ b/src/code/z_kaleido_scope_call.c @@ -62,7 +62,7 @@ void KaleidoScopeCall_Update(PlayState* play) { R_HREG_MODE = HREG_MODE_UCODE_DISAS; R_UCODE_DISAS_LOG_MODE = 3; R_PAUSE_BG_PRERENDER_STATE = PAUSE_BG_PRERENDER_SETUP; - pauseCtx->unk_1E4 = 0; + pauseCtx->mainState = PAUSE_MAIN_STATE_IDLE; pauseCtx->unk_1EC = 0; pauseCtx->state = (pauseCtx->state & 0xFFFF) + 1; // PAUSE_STATE_WAIT_BG_PRERENDER } @@ -70,7 +70,7 @@ void KaleidoScopeCall_Update(PlayState* play) { R_HREG_MODE = HREG_MODE_UCODE_DISAS; R_UCODE_DISAS_LOG_MODE = 3; R_PAUSE_BG_PRERENDER_STATE = PAUSE_BG_PRERENDER_SETUP; - pauseCtx->unk_1E4 = 0; + pauseCtx->mainState = PAUSE_MAIN_STATE_IDLE; pauseCtx->unk_1EC = 0; pauseCtx->state = (pauseCtx->state & 0xFFFF) + 1; // PAUSE_STATE_9 } else if ((pauseCtx->state == PAUSE_STATE_WAIT_BG_PRERENDER) || (pauseCtx->state == PAUSE_STATE_9)) { diff --git a/src/code/z_kaleido_setup.c b/src/code/z_kaleido_setup.c index 554282ba1..9f264378b 100644 --- a/src/code/z_kaleido_setup.c +++ b/src/code/z_kaleido_setup.c @@ -31,7 +31,7 @@ void KaleidoSetup_Update(PlayState* play) { WREG(17) = 155; pauseCtx->unk_1EA = 0; - pauseCtx->unk_1E4 = 1; + pauseCtx->mainState = PAUSE_MAIN_STATE_1; if (ZREG(48) == 0) { pauseCtx->eye.x = sKaleidoSetupEyeX0[pauseCtx->pageIndex]; @@ -71,7 +71,7 @@ void KaleidoSetup_Init(PlayState* play) { pauseCtx->debugState = 0; pauseCtx->alpha = 0; pauseCtx->unk_1EA = 0; - pauseCtx->unk_1E4 = 0; + pauseCtx->mainState = PAUSE_MAIN_STATE_IDLE; pauseCtx->mode = 0; pauseCtx->pageIndex = PAUSE_ITEM; diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c index 28a7ef06e..86687ca92 100644 --- a/src/code/z_parameter.c +++ b/src/code/z_parameter.c @@ -3371,7 +3371,7 @@ void Interface_Draw(PlayState* play) { func_8008A994(interfaceCtx); - if ((pauseCtx->state == PAUSE_STATE_6) && (pauseCtx->unk_1E4 == 3)) { + if ((pauseCtx->state == PAUSE_STATE_MAIN) && (pauseCtx->mainState == PAUSE_MAIN_STATE_3)) { // Inventory Equip Effects gSPSegment(OVERLAY_DISP++, 0x08, pauseCtx->iconItemSegment); Gfx_SetupDL_42Overlay(play->state.gfxCtx); -- cgit v1.2.3