diff --git a/include/z64.h b/include/z64.h index 4ba99c34dd..377ab5152b 100644 --- a/include/z64.h +++ b/include/z64.h @@ -789,7 +789,7 @@ typedef enum { /* 7 */ PAUSE_MAIN_STATE_7, /* 8 */ PAUSE_MAIN_STATE_IDLE_CURSOR_ON_SONG, /* 9 */ PAUSE_MAIN_STATE_SONG_PLAYBACK_START -} PauseMainSubState; +} PauseMainState; typedef enum { /* 0 */ PAUSE_SAVE_PROMPT_STATE_APPEARING, @@ -837,7 +837,7 @@ typedef struct { /* 0x01D4 */ u16 state; /* 0x01D6 */ u16 debugState; /* 0x01D8 */ Vec3f eye; - /* 0x01E4 */ u16 mainSubState; + /* 0x01E4 */ u16 mainState; /* 0x01E6 */ u16 nextPageMode; // (2 * prev pageIndex) + (scroll left ? 1 : 0) /* 0x01E8 */ u16 pageIndex; // "kscp_pos" /* 0x01EA */ u16 switchPageTimer; diff --git a/src/code/z_kaleido_scope_call.c b/src/code/z_kaleido_scope_call.c index e7a2e147e7..a99e03e206 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) { HREG(80) = 7; HREG(82) = 3; R_PAUSE_BG_PRERENDER_STATE = PAUSE_BG_PRERENDER_DRAW; - pauseCtx->mainSubState = PAUSE_MAIN_STATE_IDLE; + pauseCtx->mainState = PAUSE_MAIN_STATE_IDLE; pauseCtx->savePromptSubState = PAUSE_SAVE_PROMPT_STATE_APPEARING; pauseCtx->state = (pauseCtx->state & 0xFFFF) + 1; // PAUSE_STATE_WAIT_BG_PRERENDER } @@ -70,7 +70,7 @@ void KaleidoScopeCall_Update(PlayState* play) { HREG(80) = 7; HREG(82) = 3; R_PAUSE_BG_PRERENDER_STATE = PAUSE_BG_PRERENDER_DRAW; - pauseCtx->mainSubState = PAUSE_MAIN_STATE_IDLE; + pauseCtx->mainState = PAUSE_MAIN_STATE_IDLE; pauseCtx->savePromptSubState = PAUSE_SAVE_PROMPT_STATE_APPEARING; 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 65bb76cffb..42e18613a3 100644 --- a/src/code/z_kaleido_setup.c +++ b/src/code/z_kaleido_setup.c @@ -62,7 +62,7 @@ void KaleidoSetup_Update(PlayState* play) { R_PAUSE_CURSOR_RIGHT_X = 155; pauseCtx->switchPageTimer = 0; - pauseCtx->mainSubState = PAUSE_MAIN_STATE_SWITCHING_PAGE; // irrelevant + pauseCtx->mainState = PAUSE_MAIN_STATE_SWITCHING_PAGE; // irrelevant if (R_START_LABEL_DD(0) == 0) { // Never reached, unused, and the data would be wrong anyway @@ -105,7 +105,7 @@ void KaleidoSetup_Init(PlayState* play) { pauseCtx->debugState = 0; pauseCtx->alpha = 0; pauseCtx->switchPageTimer = 0; - pauseCtx->mainSubState = PAUSE_MAIN_STATE_IDLE; + pauseCtx->mainState = PAUSE_MAIN_STATE_IDLE; pauseCtx->nextPageMode = 0; pauseCtx->pageIndex = PAUSE_ITEM; diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c index 77350c034b..9fae42c2fc 100644 --- a/src/code/z_parameter.c +++ b/src/code/z_parameter.c @@ -3323,7 +3323,7 @@ void Interface_Draw(PlayState* play) { func_8008A994(interfaceCtx); - if ((pauseCtx->state == PAUSE_STATE_MAIN) && (pauseCtx->mainSubState == PAUSE_MAIN_STATE_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); diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c index 86b3301862..ffaec24c8b 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c @@ -115,9 +115,9 @@ void KaleidoScope_DrawQuestStatus(PlayState* play, GraphicsContext* gfxCtx) { OPEN_DISPS(gfxCtx, "../z_kaleido_collect.c", 248); - if ((!pauseCtx->mainSubState /* PAUSE_MAIN_STATE_IDLE */ || - (pauseCtx->mainSubState == PAUSE_MAIN_STATE_SONG_PLAYER_PLAYING) || - (pauseCtx->mainSubState == PAUSE_MAIN_STATE_IDLE_CURSOR_ON_SONG)) && + if ((!pauseCtx->mainState /* PAUSE_MAIN_STATE_IDLE */ || + (pauseCtx->mainState == PAUSE_MAIN_STATE_SONG_PLAYER_PLAYING) || + (pauseCtx->mainState == PAUSE_MAIN_STATE_IDLE_CURSOR_ON_SONG)) && (pauseCtx->pageIndex == PAUSE_QUEST)) { pauseCtx->cursorColorSet = 0; @@ -138,7 +138,7 @@ void KaleidoScope_DrawQuestStatus(PlayState* play, GraphicsContext* gfxCtx) { nextCursorPoint = sCursorPointLinks[i][2]; if (nextCursorPoint == CURSOR_TO_LEFT) { KaleidoScope_MoveCursorToSpecialPos(play, PAUSE_CURSOR_PAGE_LEFT); - pauseCtx->mainSubState = PAUSE_MAIN_STATE_IDLE; + pauseCtx->mainState = PAUSE_MAIN_STATE_IDLE; } else { while (nextCursorPoint >= 0) { if ((s16)KaleidoScope_UpdateQuestStatusPoint(pauseCtx, nextCursorPoint)) { @@ -152,7 +152,7 @@ void KaleidoScope_DrawQuestStatus(PlayState* play, GraphicsContext* gfxCtx) { nextCursorPoint = sCursorPointLinks[i][3]; if (nextCursorPoint == CURSOR_TO_RIGHT) { KaleidoScope_MoveCursorToSpecialPos(play, PAUSE_CURSOR_PAGE_RIGHT); - pauseCtx->mainSubState = PAUSE_MAIN_STATE_IDLE; + pauseCtx->mainState = PAUSE_MAIN_STATE_IDLE; } else { while (nextCursorPoint >= 0) { if ((s16)KaleidoScope_UpdateQuestStatusPoint(pauseCtx, nextCursorPoint)) { @@ -185,7 +185,7 @@ void KaleidoScope_DrawQuestStatus(PlayState* play, GraphicsContext* gfxCtx) { // if the cursor point changed if (pauseCtx->cursorPoint[PAUSE_QUEST] != i) { - pauseCtx->mainSubState = PAUSE_MAIN_STATE_IDLE; + pauseCtx->mainState = PAUSE_MAIN_STATE_IDLE; Audio_PlaySfxGeneral(NA_SE_SY_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); } @@ -232,7 +232,7 @@ void KaleidoScope_DrawQuestStatus(PlayState* play, GraphicsContext* gfxCtx) { // Handle part of the ocarina songs playback - if ((pauseCtx->state == PAUSE_STATE_MAIN) && (pauseCtx->mainSubState == PAUSE_MAIN_STATE_IDLE) && + if ((pauseCtx->state == PAUSE_STATE_MAIN) && (pauseCtx->mainState == PAUSE_MAIN_STATE_IDLE) && (pauseCtx->cursorSpecialPos == 0)) { if ((cursor >= QUEST_SONG_MINUET) && (cursor < QUEST_KOKIRI_EMERALD)) { if (CHECK_QUEST_ITEM(pauseCtx->cursorPoint[PAUSE_QUEST])) { @@ -265,24 +265,24 @@ void KaleidoScope_DrawQuestStatus(PlayState* play, GraphicsContext* gfxCtx) { R_PAUSE_SONG_OCA_BTN_Y(OCARINA_BTN_C_LEFT) = -46; R_PAUSE_SONG_OCA_BTN_Y(OCARINA_BTN_C_UP) = -41; - pauseCtx->mainSubState = PAUSE_MAIN_STATE_IDLE_CURSOR_ON_SONG; + pauseCtx->mainState = PAUSE_MAIN_STATE_IDLE_CURSOR_ON_SONG; // Stop having the player play a song as done above AudioOcarina_SetInstrument(OCARINA_INSTRUMENT_OFF); } } - } else if (pauseCtx->mainSubState == PAUSE_MAIN_STATE_SONG_PLAYER_PLAYING) { + } else if (pauseCtx->mainState == PAUSE_MAIN_STATE_SONG_PLAYER_PLAYING) { // Abort having the player play the song if the stick is moved if ((pauseCtx->stickAdjX != 0) || (pauseCtx->stickAdjY != 0)) { - pauseCtx->mainSubState = PAUSE_MAIN_STATE_IDLE; + pauseCtx->mainState = PAUSE_MAIN_STATE_IDLE; AudioOcarina_SetInstrument(OCARINA_INSTRUMENT_OFF); } - } else if (pauseCtx->mainSubState == PAUSE_MAIN_STATE_IDLE_CURSOR_ON_SONG) { + } else if (pauseCtx->mainState == PAUSE_MAIN_STATE_IDLE_CURSOR_ON_SONG) { if (CHECK_BTN_ALL(input->press.button, BTN_A) && (cursor >= QUEST_SONG_MINUET) && (cursor < QUEST_KOKIRI_EMERALD)) { - pauseCtx->mainSubState = PAUSE_MAIN_STATE_SONG_PLAYBACK_START; + pauseCtx->mainState = PAUSE_MAIN_STATE_SONG_PLAYBACK_START; sPlaybackSongStartDelayTimer = 10; } @@ -343,7 +343,7 @@ void KaleidoScope_DrawQuestStatus(PlayState* play, GraphicsContext* gfxCtx) { } } - } else if (pauseCtx->mainSubState == PAUSE_MAIN_STATE_SONG_PLAYBACK_START) { + } else if (pauseCtx->mainState == PAUSE_MAIN_STATE_SONG_PLAYBACK_START) { // After a short delay, start playing the selected song back to the player pauseCtx->cursorColorSet = 8; @@ -367,7 +367,7 @@ void KaleidoScope_DrawQuestStatus(PlayState* play, GraphicsContext* gfxCtx) { pauseCtx->ocarinaSongIdx = gOcarinaSongItemMap[cursor - QUEST_SONG_MINUET]; AudioOcarina_SetPlaybackSong(pauseCtx->ocarinaSongIdx + 1, 1); - pauseCtx->mainSubState = PAUSE_MAIN_STATE_SONG_PLAYBACK; + pauseCtx->mainState = PAUSE_MAIN_STATE_SONG_PLAYBACK; pauseCtx->ocarinaStaff = AudioOcarina_GetPlaybackStaff(); pauseCtx->ocarinaStaff->pos = 0; @@ -569,24 +569,24 @@ void KaleidoScope_DrawQuestStatus(PlayState* play, GraphicsContext* gfxCtx) { // Update cursor color if ((pauseCtx->cursorSpecialPos == 0) && (cursor >= QUEST_SONG_MINUET) && (cursor < QUEST_KOKIRI_EMERALD)) { - if ((pauseCtx->mainSubState < PAUSE_MAIN_STATE_3) /* PAUSE_MAIN_STATE_IDLE, PAUSE_MAIN_STATE_SWITCHING_PAGE, + if ((pauseCtx->mainState < PAUSE_MAIN_STATE_3) /* PAUSE_MAIN_STATE_IDLE, PAUSE_MAIN_STATE_SWITCHING_PAGE, PAUSE_MAIN_STATE_SONG_PLAYBACK */ - || (pauseCtx->mainSubState == PAUSE_MAIN_STATE_SONG_PLAYER_PLAYING) || - (pauseCtx->mainSubState == PAUSE_MAIN_STATE_IDLE_CURSOR_ON_SONG)) { + || (pauseCtx->mainState == PAUSE_MAIN_STATE_SONG_PLAYER_PLAYING) || + (pauseCtx->mainState == PAUSE_MAIN_STATE_IDLE_CURSOR_ON_SONG)) { if (pauseCtx->cursorItem[pauseCtx->pageIndex] != PAUSE_ITEM_NONE) { pauseCtx->cursorColorSet = 8; // PAUSE_MAIN_STATE_SONG_PLAYBACK, PAUSE_MAIN_STATE_3, // PAUSE_MAIN_STATE_SONG_PLAYER_PLAYING_INIT, PAUSE_MAIN_STATE_SONG_PLAYER_PLAYING, // PAUSE_MAIN_STATE_SONG_PLAYER_PLAYING_DONE - if ((pauseCtx->mainSubState >= PAUSE_MAIN_STATE_SONG_PLAYBACK) && - (pauseCtx->mainSubState < PAUSE_MAIN_STATE_7)) { + if ((pauseCtx->mainState >= PAUSE_MAIN_STATE_SONG_PLAYBACK) && + (pauseCtx->mainState < PAUSE_MAIN_STATE_7)) { pauseCtx->cursorColorSet = 0; } } } } - if (pauseCtx->mainSubState == PAUSE_MAIN_STATE_SONG_PLAYBACK) { + if (pauseCtx->mainState == PAUSE_MAIN_STATE_SONG_PLAYBACK) { // Draw ocarina buttons as the song playback progresses // QUAD_QUEST_SONG_NOTE_A1 up to QUAD_QUEST_SONG_NOTE_A8 @@ -634,12 +634,12 @@ void KaleidoScope_DrawQuestStatus(PlayState* play, GraphicsContext* gfxCtx) { gSP1Quadrangle(POLY_OPA_DISP++, 0, 2, 3, 1, 0); } } - } else if (((pauseCtx->mainSubState >= PAUSE_MAIN_STATE_SONG_PLAYER_PLAYING_INIT) && - (pauseCtx->mainSubState <= PAUSE_MAIN_STATE_SONG_PLAYER_PLAYING_DONE) + } else if (((pauseCtx->mainState >= PAUSE_MAIN_STATE_SONG_PLAYER_PLAYING_INIT) && + (pauseCtx->mainState <= PAUSE_MAIN_STATE_SONG_PLAYER_PLAYING_DONE) /* PAUSE_MAIN_STATE_SONG_PLAYER_PLAYING_INIT, PAUSE_MAIN_STATE_SONG_PLAYER_PLAYING, PAUSE_MAIN_STATE_SONG_PLAYER_PLAYING_DONE */ ) || - (pauseCtx->mainSubState == PAUSE_MAIN_STATE_IDLE_CURSOR_ON_SONG)) { + (pauseCtx->mainState == PAUSE_MAIN_STATE_IDLE_CURSOR_ON_SONG)) { // Draw the buttons for playing a song // QUAD_QUEST_SONG_NOTE_A1 up to QUAD_QUEST_SONG_NOTE_A8 @@ -657,7 +657,7 @@ void KaleidoScope_DrawQuestStatus(PlayState* play, GraphicsContext* gfxCtx) { gDPPipeSync(POLY_OPA_DISP++); - if (pauseCtx->mainSubState == PAUSE_MAIN_STATE_IDLE_CURSOR_ON_SONG) { + if (pauseCtx->mainState == PAUSE_MAIN_STATE_IDLE_CURSOR_ON_SONG) { if (gOcarinaSongButtons[stepGreen].buttonsIndex[i] == OCARINA_BTN_A) { gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 80, 255, 150, 200); } else { @@ -680,7 +680,7 @@ void KaleidoScope_DrawQuestStatus(PlayState* play, GraphicsContext* gfxCtx) { gSP1Quadrangle(POLY_OPA_DISP++, 0, 2, 3, 1, 0); } - if (pauseCtx->mainSubState != PAUSE_MAIN_STATE_IDLE_CURSOR_ON_SONG) { + if (pauseCtx->mainState != PAUSE_MAIN_STATE_IDLE_CURSOR_ON_SONG) { // Draw the buttons colored as the player plays the song // QUAD_QUEST_SONG_NOTE_B1 up to QUAD_QUEST_SONG_NOTE_B8 @@ -736,7 +736,7 @@ void KaleidoScope_DrawQuestStatus(PlayState* play, GraphicsContext* gfxCtx) { gSP1Quadrangle(POLY_OPA_DISP++, 0, 2, 3, 1, 0); } - if (pauseCtx->mainSubState == PAUSE_MAIN_STATE_SONG_PLAYER_PLAYING_INIT) { + if (pauseCtx->mainState == PAUSE_MAIN_STATE_SONG_PLAYER_PLAYING_INIT) { for (i = 0; i < SONG_MAX_LENGTH; i++) { sPlayedSongBtns[i] = OCARINA_BTN_INVALID; sPlayedSongBtnsAlpha[i] = 0; @@ -749,7 +749,7 @@ void KaleidoScope_DrawQuestStatus(PlayState* play, GraphicsContext* gfxCtx) { pauseCtx->ocarinaStaff->pos = 0; pauseCtx->ocarinaStaff->state = 0xFE; - pauseCtx->mainSubState = PAUSE_MAIN_STATE_SONG_PLAYER_PLAYING; + pauseCtx->mainState = PAUSE_MAIN_STATE_SONG_PLAYER_PLAYING; } } } diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c index abe99effe7..c3f8096e58 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c @@ -150,7 +150,7 @@ void KaleidoScope_DrawEquipment(PlayState* play) { } } - if ((pauseCtx->state == PAUSE_STATE_MAIN) && (pauseCtx->mainSubState == PAUSE_MAIN_STATE_IDLE) && + if ((pauseCtx->state == PAUSE_STATE_MAIN) && (pauseCtx->mainState == PAUSE_MAIN_STATE_IDLE) && (pauseCtx->pageIndex == PAUSE_EQUIP)) { oldCursorPoint = pauseCtx->cursorPoint[PAUSE_EQUIP]; pauseCtx->cursorColorSet = 0; @@ -465,7 +465,7 @@ void KaleidoScope_DrawEquipment(PlayState* play) { KaleidoScope_SetCursorVtx(pauseCtx, cursorSlot * 4, pauseCtx->equipVtx); if ((pauseCtx->cursorSpecialPos == 0) && (cursorItem != PAUSE_ITEM_NONE) && - (pauseCtx->state == PAUSE_STATE_MAIN) && (pauseCtx->mainSubState == PAUSE_MAIN_STATE_IDLE) && + (pauseCtx->state == PAUSE_STATE_MAIN) && (pauseCtx->mainState == PAUSE_MAIN_STATE_IDLE) && CHECK_BTN_ALL(input->press.button, BTN_A) && (pauseCtx->cursorX[PAUSE_EQUIP] != 0)) { if (CHECK_AGE_REQ_EQUIP(pauseCtx->cursorY[PAUSE_EQUIP], pauseCtx->cursorX[PAUSE_EQUIP])) { @@ -493,7 +493,7 @@ void KaleidoScope_DrawEquipment(PlayState* play) { Audio_PlaySfxGeneral(NA_SE_SY_DECIDE, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); - pauseCtx->mainSubState = PAUSE_MAIN_STATE_7; + pauseCtx->mainState = PAUSE_MAIN_STATE_7; sEquipTimer = 10; } else { Audio_PlaySfxGeneral(NA_SE_SY_ERROR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, @@ -505,13 +505,13 @@ void KaleidoScope_DrawEquipment(PlayState* play) { Audio_PlaySfxGeneral(NA_SE_SY_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); } - } else if ((pauseCtx->mainSubState == PAUSE_MAIN_STATE_7) && (pauseCtx->pageIndex == PAUSE_EQUIP)) { + } else if ((pauseCtx->mainState == PAUSE_MAIN_STATE_7) && (pauseCtx->pageIndex == PAUSE_EQUIP)) { KaleidoScope_SetCursorVtx(pauseCtx, pauseCtx->cursorSlot[PAUSE_EQUIP] * 4, pauseCtx->equipVtx); pauseCtx->cursorColorSet = 8; sEquipTimer--; if (sEquipTimer == 0) { - pauseCtx->mainSubState = PAUSE_MAIN_STATE_IDLE; + pauseCtx->mainState = PAUSE_MAIN_STATE_IDLE; } } @@ -578,11 +578,11 @@ void KaleidoScope_DrawEquipment(PlayState* play) { KaleidoScope_DrawPlayerWork(play); - if ((pauseCtx->mainSubState == PAUSE_MAIN_STATE_7) && (sEquipTimer == 10)) { + if ((pauseCtx->mainState == PAUSE_MAIN_STATE_7) && (sEquipTimer == 10)) { KaleidoScope_SetupPlayerPreRender(play); } - if ((pauseCtx->mainSubState == PAUSE_MAIN_STATE_7) && (sEquipTimer == 9)) { + if ((pauseCtx->mainState == PAUSE_MAIN_STATE_7) && (sEquipTimer == 9)) { //! @bug: This function shouldn't take any arguments KaleidoScope_ProcessPlayerPreRender(play); } diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c index 248ebd4ca8..deeeb80057 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c @@ -103,7 +103,7 @@ void KaleidoScope_DrawItemSelect(PlayState* play) { pauseCtx->cursorColorSet = 0; pauseCtx->nameColorSet = 0; - if ((pauseCtx->state == PAUSE_STATE_MAIN) && (pauseCtx->mainSubState == PAUSE_MAIN_STATE_IDLE) && + if ((pauseCtx->state == PAUSE_STATE_MAIN) && (pauseCtx->mainState == PAUSE_MAIN_STATE_IDLE) && (pauseCtx->pageIndex == PAUSE_ITEM)) { moveCursorResult = 0; oldCursorPoint = pauseCtx->cursorPoint[PAUSE_ITEM]; @@ -346,7 +346,7 @@ void KaleidoScope_DrawItemSelect(PlayState* play) { KaleidoScope_SetCursorVtx(pauseCtx, index, pauseCtx->itemVtx); if ((pauseCtx->debugState == 0) && (pauseCtx->state == PAUSE_STATE_MAIN) && - (pauseCtx->mainSubState == PAUSE_MAIN_STATE_IDLE)) { + (pauseCtx->mainState == PAUSE_MAIN_STATE_IDLE)) { if (CHECK_BTN_ANY(input->press.button, BTN_CLEFT | BTN_CDOWN | BTN_CRIGHT)) { if (CHECK_AGE_REQ_SLOT(cursorSlot) && (cursorItem != ITEM_SOLD_OUT)) { if (CHECK_BTN_ALL(input->press.button, BTN_CLEFT)) { @@ -359,7 +359,7 @@ void KaleidoScope_DrawItemSelect(PlayState* play) { pauseCtx->equipTargetItem = cursorItem; pauseCtx->equipTargetSlot = cursorSlot; - pauseCtx->mainSubState = PAUSE_MAIN_STATE_3; + pauseCtx->mainState = PAUSE_MAIN_STATE_3; pauseCtx->equipAnimX = pauseCtx->itemVtx[index].v.ob[0] * 10; pauseCtx->equipAnimY = pauseCtx->itemVtx[index].v.ob[1] * 10; pauseCtx->equipAnimAlpha = 255; @@ -408,7 +408,7 @@ void KaleidoScope_DrawItemSelect(PlayState* play) { Audio_PlaySfxGeneral(NA_SE_SY_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); } - } else if ((pauseCtx->mainSubState == PAUSE_MAIN_STATE_3) && (pauseCtx->pageIndex == PAUSE_ITEM)) { + } else if ((pauseCtx->mainState == PAUSE_MAIN_STATE_3) && (pauseCtx->pageIndex == PAUSE_ITEM)) { KaleidoScope_SetCursorVtx(pauseCtx, cursorSlot * 4, pauseCtx->itemVtx); pauseCtx->cursorColorSet = 4; } @@ -432,7 +432,7 @@ void KaleidoScope_DrawItemSelect(PlayState* play) { gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 255, 255, pauseCtx->alpha); if (gSaveContext.inventory.items[i] != ITEM_NONE) { - if ((pauseCtx->mainSubState == PAUSE_MAIN_STATE_IDLE) && (pauseCtx->pageIndex == PAUSE_ITEM) && + if ((pauseCtx->mainState == PAUSE_MAIN_STATE_IDLE) && (pauseCtx->pageIndex == PAUSE_ITEM) && (pauseCtx->cursorSpecialPos == 0)) { if (CHECK_AGE_REQ_SLOT(i)) { if ((sEquipState == 2) && (i == 3)) { @@ -802,7 +802,7 @@ void KaleidoScope_UpdateItemEquip(PlayState* play) { gSaveContext.equips.cButtonSlots[2]); } - pauseCtx->mainSubState = PAUSE_MAIN_STATE_IDLE; + pauseCtx->mainState = PAUSE_MAIN_STATE_IDLE; sEquipMoveTimer = 10; WREG(90) = 320; WREG(87) = WREG(91); diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_map_PAL.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_map_PAL.c index 04bc3574e7..d3336e5570 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_map_PAL.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_map_PAL.c @@ -46,7 +46,7 @@ void KaleidoScope_DrawDungeonMap(PlayState* play, GraphicsContext* gfxCtx) { OPEN_DISPS(gfxCtx, "../z_kaleido_map_PAL.c", 123); - if ((pauseCtx->state == PAUSE_STATE_MAIN) && (pauseCtx->mainSubState == PAUSE_MAIN_STATE_IDLE) && + if ((pauseCtx->state == PAUSE_STATE_MAIN) && (pauseCtx->mainState == PAUSE_MAIN_STATE_IDLE) && (pauseCtx->pageIndex == PAUSE_MAP)) { pauseCtx->cursorColorSet = 0; oldCursorPoint = pauseCtx->cursorPoint[PAUSE_MAP]; @@ -411,7 +411,7 @@ void KaleidoScope_DrawWorldMap(PlayState* play, GraphicsContext* gfxCtx) { OPEN_DISPS(gfxCtx, "../z_kaleido_map_PAL.c", 556); - if ((pauseCtx->state == PAUSE_STATE_MAIN) && (pauseCtx->mainSubState == PAUSE_MAIN_STATE_IDLE) && + if ((pauseCtx->state == PAUSE_STATE_MAIN) && (pauseCtx->mainState == PAUSE_MAIN_STATE_IDLE) && (pauseCtx->pageIndex == PAUSE_MAP)) { pauseCtx->cursorColorSet = 0; oldCursorPoint = pauseCtx->cursorPoint[PAUSE_WORLD_MAP]; diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c index 7abc6b0a56..11b8b43c70 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c @@ -775,7 +775,7 @@ void KaleidoScope_SetDefaultCursor(PlayState* play) { #define SWITCH_PAGE_RIGHT_PT 2 void KaleidoScope_SwitchPage(PauseContext* pauseCtx, u8 pt) { - pauseCtx->mainSubState = PAUSE_MAIN_STATE_SWITCHING_PAGE; + pauseCtx->mainState = PAUSE_MAIN_STATE_SWITCHING_PAGE; pauseCtx->switchPageTimer = 0; if (!pt) { // SWITCH_PAGE_LEFT_PT @@ -844,9 +844,9 @@ void KaleidoScope_DrawCursor(PlayState* play, u16 pageIndex) { OPEN_DISPS(play->state.gfxCtx, "../z_kaleido_scope_PAL.c", 955); - temp = pauseCtx->mainSubState; // fake? + temp = pauseCtx->mainState; // fake? - if ((((pauseCtx->mainSubState == PAUSE_MAIN_STATE_IDLE) || (temp == PAUSE_MAIN_STATE_IDLE_CURSOR_ON_SONG)) && + if ((((pauseCtx->mainState == PAUSE_MAIN_STATE_IDLE) || (temp == PAUSE_MAIN_STATE_IDLE_CURSOR_ON_SONG)) && (pauseCtx->state == PAUSE_STATE_MAIN)) || ((pauseCtx->pageIndex == PAUSE_QUEST) && ((temp < PAUSE_MAIN_STATE_3) /* PAUSE_MAIN_STATE_IDLE, PAUSE_MAIN_STATE_SWITCHING_PAGE, @@ -1526,7 +1526,7 @@ void KaleidoScope_DrawInfoPanel(PlayState* play) { pauseCtx->infoPanelVtx[5].v.ob[0] = pauseCtx->infoPanelVtx[7].v.ob[0] = pauseCtx->infoPanelVtx[4].v.ob[0] + 72; - if ((pauseCtx->cursorSpecialPos == PAUSE_CURSOR_PAGE_LEFT) && (pauseCtx->mainSubState == PAUSE_MAIN_STATE_IDLE)) { + if ((pauseCtx->cursorSpecialPos == PAUSE_CURSOR_PAGE_LEFT) && (pauseCtx->mainState == PAUSE_MAIN_STATE_IDLE)) { pauseCtx->infoPanelVtx[8].v.ob[0] = pauseCtx->infoPanelVtx[10].v.ob[0] = R_PAUSE_CURSOR_LEFT_X; pauseCtx->infoPanelVtx[9].v.ob[0] = pauseCtx->infoPanelVtx[11].v.ob[0] = pauseCtx->infoPanelVtx[8].v.ob[0] + 24; @@ -1546,7 +1546,7 @@ void KaleidoScope_DrawInfoPanel(PlayState* play) { pauseCtx->infoPanelVtx[8].v.ob[1] - 26; } - if ((pauseCtx->cursorSpecialPos == PAUSE_CURSOR_PAGE_RIGHT) && (pauseCtx->mainSubState == PAUSE_MAIN_STATE_IDLE)) { + if ((pauseCtx->cursorSpecialPos == PAUSE_CURSOR_PAGE_RIGHT) && (pauseCtx->mainState == PAUSE_MAIN_STATE_IDLE)) { pauseCtx->infoPanelVtx[12].v.ob[0] = pauseCtx->infoPanelVtx[14].v.ob[0] = R_PAUSE_CURSOR_RIGHT_X; pauseCtx->infoPanelVtx[13].v.ob[0] = pauseCtx->infoPanelVtx[15].v.ob[0] = @@ -1587,7 +1587,7 @@ void KaleidoScope_DrawInfoPanel(PlayState* play) { gSPDisplayList(POLY_OPA_DISP++, gItemNamePanelDL); - if ((pauseCtx->cursorSpecialPos == PAUSE_CURSOR_PAGE_LEFT) && (pauseCtx->mainSubState == PAUSE_MAIN_STATE_IDLE)) { + if ((pauseCtx->cursorSpecialPos == PAUSE_CURSOR_PAGE_LEFT) && (pauseCtx->mainState == PAUSE_MAIN_STATE_IDLE)) { gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, sCursorLeftRightSelectedPrimRed, sCursorLeftRightSelectedPrimGreen, sCursorLeftRightSelectedPrimBlue, sCursorLeftRightSelectedPrimAlpha); } @@ -1596,7 +1596,7 @@ void KaleidoScope_DrawInfoPanel(PlayState* play) { gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 180, 210, 255, 220); - if ((pauseCtx->cursorSpecialPos == PAUSE_CURSOR_PAGE_RIGHT) && (pauseCtx->mainSubState == PAUSE_MAIN_STATE_IDLE)) { + if ((pauseCtx->cursorSpecialPos == PAUSE_CURSOR_PAGE_RIGHT) && (pauseCtx->mainState == PAUSE_MAIN_STATE_IDLE)) { gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, sCursorLeftRightSelectedPrimRed, sCursorLeftRightSelectedPrimGreen, sCursorLeftRightSelectedPrimBlue, sCursorLeftRightSelectedPrimAlpha); } @@ -1624,24 +1624,23 @@ void KaleidoScope_DrawInfoPanel(PlayState* play) { if ((pauseCtx->state == PAUSE_STATE_MAIN) && (pauseCtx->namedItem != PAUSE_ITEM_NONE) && (pauseCtx->nameDisplayTimer < R_PAUSE_NAME_DISPLAY_TIMER_THRESHOLD_) && - (!pauseCtx->mainSubState /* PAUSE_MAIN_STATE_IDLE */ || - (pauseCtx->mainSubState == PAUSE_MAIN_STATE_SONG_PLAYBACK) || - ((pauseCtx->mainSubState >= PAUSE_MAIN_STATE_SONG_PLAYER_PLAYING_INIT) && - (pauseCtx->mainSubState <= PAUSE_MAIN_STATE_7) + (!pauseCtx->mainState /* PAUSE_MAIN_STATE_IDLE */ || (pauseCtx->mainState == PAUSE_MAIN_STATE_SONG_PLAYBACK) || + ((pauseCtx->mainState >= PAUSE_MAIN_STATE_SONG_PLAYER_PLAYING_INIT) && + (pauseCtx->mainState <= PAUSE_MAIN_STATE_7) /* PAUSE_MAIN_STATE_SONG_PLAYER_PLAYING_INIT, PAUSE_MAIN_STATE_SONG_PLAYER_PLAYING, PAUSE_MAIN_STATE_SONG_PLAYER_PLAYING_DONE, PAUSE_MAIN_STATE_7 */ ) || - (pauseCtx->mainSubState == PAUSE_MAIN_STATE_IDLE_CURSOR_ON_SONG)) && + (pauseCtx->mainState == PAUSE_MAIN_STATE_IDLE_CURSOR_ON_SONG)) && (pauseCtx->cursorSpecialPos == 0)) { - if (!pauseCtx->mainSubState /* PAUSE_MAIN_STATE_IDLE */ || - (pauseCtx->mainSubState == PAUSE_MAIN_STATE_SONG_PLAYBACK) || - ((pauseCtx->mainSubState >= PAUSE_MAIN_STATE_SONG_PLAYER_PLAYING_INIT) && - (pauseCtx->mainSubState <= PAUSE_MAIN_STATE_7) + if (!pauseCtx->mainState /* PAUSE_MAIN_STATE_IDLE */ || + (pauseCtx->mainState == PAUSE_MAIN_STATE_SONG_PLAYBACK) || + ((pauseCtx->mainState >= PAUSE_MAIN_STATE_SONG_PLAYER_PLAYING_INIT) && + (pauseCtx->mainState <= PAUSE_MAIN_STATE_7) /* PAUSE_MAIN_STATE_SONG_PLAYER_PLAYING_INIT, PAUSE_MAIN_STATE_SONG_PLAYER_PLAYING, PAUSE_MAIN_STATE_SONG_PLAYER_PLAYING_DONE, PAUSE_MAIN_STATE_7 */ ) || - (pauseCtx->mainSubState == PAUSE_MAIN_STATE_IDLE_CURSOR_ON_SONG)) { + (pauseCtx->mainState == PAUSE_MAIN_STATE_IDLE_CURSOR_ON_SONG)) { pauseCtx->infoPanelVtx[16].v.ob[0] = pauseCtx->infoPanelVtx[18].v.ob[0] = -63; @@ -1702,10 +1701,10 @@ void KaleidoScope_DrawInfoPanel(PlayState* play) { KaleidoScope_DrawQuadTextureRGBA32(play->state.gfxCtx, gGoldSkulltulaIconTex, 24, 24, 0); } } - } else if ((pauseCtx->mainSubState < PAUSE_MAIN_STATE_3) /* PAUSE_MAIN_STATE_IDLE, PAUSE_MAIN_STATE_SWITCHING_PAGE, + } else if ((pauseCtx->mainState < PAUSE_MAIN_STATE_3) /* PAUSE_MAIN_STATE_IDLE, PAUSE_MAIN_STATE_SWITCHING_PAGE, PAUSE_MAIN_STATE_SONG_PLAYBACK */ - || (pauseCtx->mainSubState == PAUSE_MAIN_STATE_7) || - (pauseCtx->mainSubState == PAUSE_MAIN_STATE_IDLE_CURSOR_ON_SONG)) { + || (pauseCtx->mainState == PAUSE_MAIN_STATE_7) || + (pauseCtx->mainState == PAUSE_MAIN_STATE_IDLE_CURSOR_ON_SONG)) { pauseCtx->infoPanelVtx[20].v.ob[1] = pauseCtx->infoPanelVtx[21].v.ob[1] = y; pauseCtx->infoPanelVtx[22].v.ob[1] = pauseCtx->infoPanelVtx[23].v.ob[1] = @@ -1741,7 +1740,7 @@ void KaleidoScope_DrawInfoPanel(PlayState* play) { KaleidoScope_QuadTextureIA8(POLY_OPA_DISP, D_8082AD60_toDecideTextTextures_[gSaveContext.language], D_8082ADE0_toDecideTextWidth_[gSaveContext.language], 16, 4); } else if (pauseCtx->cursorSpecialPos != 0) { - if ((pauseCtx->state == PAUSE_STATE_MAIN) && (pauseCtx->mainSubState == PAUSE_MAIN_STATE_IDLE)) { + if ((pauseCtx->state == PAUSE_STATE_MAIN) && (pauseCtx->mainState == PAUSE_MAIN_STATE_IDLE)) { pauseCtx->infoPanelVtx[16].v.ob[0] = pauseCtx->infoPanelVtx[18].v.ob[0] = -63; pauseCtx->infoPanelVtx[17].v.ob[0] = pauseCtx->infoPanelVtx[19].v.ob[0] = @@ -1907,7 +1906,7 @@ void KaleidoScope_UpdateNamePanel(PlayState* play) { } else if (pauseCtx->nameColorSet == 0) { if (((pauseCtx->pageIndex == PAUSE_QUEST) && (pauseCtx->cursorSlot[PAUSE_QUEST] >= QUEST_SONG_MINUET) && (pauseCtx->cursorSlot[PAUSE_QUEST] < QUEST_KOKIRI_EMERALD) && - (pauseCtx->mainSubState == PAUSE_MAIN_STATE_IDLE_CURSOR_ON_SONG)) || + (pauseCtx->mainState == PAUSE_MAIN_STATE_IDLE_CURSOR_ON_SONG)) || (pauseCtx->pageIndex == PAUSE_ITEM) || ((pauseCtx->pageIndex == PAUSE_EQUIP) && (pauseCtx->cursorX[PAUSE_EQUIP] != 0))) { if (pauseCtx->namedItem != ITEM_SOLD_OUT) { @@ -1951,7 +1950,7 @@ void KaleidoScope_UpdateSwitchPage(PlayState* play, Input* input) { if (pauseCtx->switchPageTimer == (4 * 16)) { pauseCtx->switchPageTimer = 0; pauseCtx->pageIndex = sPageSwitchNextPageIndex[pauseCtx->nextPageMode]; - pauseCtx->mainSubState = PAUSE_MAIN_STATE_IDLE; + pauseCtx->mainState = PAUSE_MAIN_STATE_IDLE; } } } @@ -3053,7 +3052,7 @@ void KaleidoScope_UpdateOpening(PlayState* play) { pauseCtx->pageIndex = sPageSwitchNextPageIndex[pauseCtx->nextPageMode]; - pauseCtx->mainSubState = PAUSE_MAIN_STATE_IDLE; + pauseCtx->mainState = PAUSE_MAIN_STATE_IDLE; pauseCtx->state++; // PAUSE_STATE_MAIN pauseCtx->alpha = 255; @@ -3186,7 +3185,7 @@ void KaleidoScope_UpdateDungeonMap(PlayState* play) { } void KaleidoScope_Update(PlayState* play) { - static s16 sMainSubStateAfterSongPlayerPlayingDone = PAUSE_MAIN_STATE_IDLE; + static s16 sMainStateAfterSongPlayerPlayingDone = PAUSE_MAIN_STATE_IDLE; static s16 sDelayTimer = 10; static s16 sTimer_ = 0; PauseContext* pauseCtx = &play->pauseCtx; @@ -3214,8 +3213,8 @@ void KaleidoScope_Update(PlayState* play) { PAUSE_STATE_15, PAUSE_STATE_16, PAUSE_STATE_17, PAUSE_STATE_CLOSING */ ))) { - if ((!pauseCtx->mainSubState /* PAUSE_MAIN_STATE_IDLE */ || - (pauseCtx->mainSubState == PAUSE_MAIN_STATE_IDLE_CURSOR_ON_SONG)) && + if ((!pauseCtx->mainState /* PAUSE_MAIN_STATE_IDLE */ || + (pauseCtx->mainState == PAUSE_MAIN_STATE_IDLE_CURSOR_ON_SONG)) && (pauseCtx->state == PAUSE_STATE_MAIN)) { pauseCtx->stickAdjX = input->rel.stick_x; @@ -3224,10 +3223,10 @@ void KaleidoScope_Update(PlayState* play) { KaleidoScope_UpdateCursorSize(play); KaleidoScope_HandlePageToggles(pauseCtx, input); } else if ((pauseCtx->pageIndex == PAUSE_QUEST) && - ((pauseCtx->mainSubState < PAUSE_MAIN_STATE_3 + ((pauseCtx->mainState < PAUSE_MAIN_STATE_3 /* PAUSE_MAIN_STATE_IDLE, PAUSE_MAIN_STATE_SWITCHING_PAGE, PAUSE_MAIN_STATE_SONG_PLAYBACK */ ) || - (pauseCtx->mainSubState == PAUSE_MAIN_STATE_SONG_PLAYER_PLAYING))) { + (pauseCtx->mainState == PAUSE_MAIN_STATE_SONG_PLAYER_PLAYING))) { KaleidoScope_UpdateCursorSize(play); } @@ -3646,7 +3645,7 @@ void KaleidoScope_Update(PlayState* play) { break; case PAUSE_STATE_MAIN: - switch (pauseCtx->mainSubState) { + switch (pauseCtx->mainState) { case PAUSE_MAIN_STATE_IDLE: if (CHECK_BTN_ALL(input->press.button, BTN_START)) { Interface_SetDoAction(play, DO_ACTION_NONE); @@ -3676,7 +3675,7 @@ void KaleidoScope_Update(PlayState* play) { pauseCtx->ocarinaStaff = AudioOcarina_GetPlaybackStaff(); if (pauseCtx->ocarinaStaff->state == 0) { // Song playback is finished - pauseCtx->mainSubState = PAUSE_MAIN_STATE_SONG_PLAYER_PLAYING_INIT; + pauseCtx->mainState = PAUSE_MAIN_STATE_SONG_PLAYER_PLAYING_INIT; AudioOcarina_SetInstrument(OCARINA_INSTRUMENT_OFF); } break; @@ -3697,11 +3696,11 @@ void KaleidoScope_Update(PlayState* play) { pauseCtx->state = PAUSE_STATE_CLOSING; R_PAUSE_OFFSET_VERTICAL = -6240; func_800F64E0(0); - pauseCtx->mainSubState = PAUSE_MAIN_STATE_IDLE; + pauseCtx->mainState = PAUSE_MAIN_STATE_IDLE; break; } else if (CHECK_BTN_ALL(input->press.button, BTN_B)) { AudioOcarina_SetInstrument(OCARINA_INSTRUMENT_OFF); - pauseCtx->mainSubState = PAUSE_MAIN_STATE_IDLE; + pauseCtx->mainState = PAUSE_MAIN_STATE_IDLE; pauseCtx->nextPageMode = 0; pauseCtx->promptChoice = 0; Audio_PlaySfxGeneral(NA_SE_SY_DECIDE, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, @@ -3719,26 +3718,26 @@ void KaleidoScope_Update(PlayState* play) { Audio_PlaySfxGeneral(NA_SE_SY_TRE_BOX_APPEAR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); - sMainSubStateAfterSongPlayerPlayingDone = PAUSE_MAIN_STATE_IDLE; + sMainStateAfterSongPlayerPlayingDone = PAUSE_MAIN_STATE_IDLE; sDelayTimer = 30; - pauseCtx->mainSubState = PAUSE_MAIN_STATE_SONG_PLAYER_PLAYING_DONE; + pauseCtx->mainState = PAUSE_MAIN_STATE_SONG_PLAYER_PLAYING_DONE; } else if (pauseCtx->ocarinaStaff->state == 0xFF) { // The player failed to play the song Audio_PlaySfxGeneral(NA_SE_SY_OCARINA_ERROR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); - sMainSubStateAfterSongPlayerPlayingDone = PAUSE_MAIN_STATE_SONG_PLAYER_PLAYING_INIT; + sMainStateAfterSongPlayerPlayingDone = PAUSE_MAIN_STATE_SONG_PLAYER_PLAYING_INIT; sDelayTimer = 20; - pauseCtx->mainSubState = PAUSE_MAIN_STATE_SONG_PLAYER_PLAYING_DONE; + pauseCtx->mainState = PAUSE_MAIN_STATE_SONG_PLAYER_PLAYING_DONE; } break; case PAUSE_MAIN_STATE_SONG_PLAYER_PLAYING_DONE: sDelayTimer--; if (sDelayTimer == 0) { - pauseCtx->mainSubState = sMainSubStateAfterSongPlayerPlayingDone; - if (pauseCtx->mainSubState == PAUSE_MAIN_STATE_IDLE) { + pauseCtx->mainState = sMainStateAfterSongPlayerPlayingDone; + if (pauseCtx->mainState == PAUSE_MAIN_STATE_IDLE) { AudioOcarina_SetInstrument(OCARINA_INSTRUMENT_OFF); } } @@ -3754,10 +3753,10 @@ void KaleidoScope_Update(PlayState* play) { pauseCtx->state = PAUSE_STATE_CLOSING; R_PAUSE_OFFSET_VERTICAL = -6240; func_800F64E0(0); - pauseCtx->mainSubState = PAUSE_MAIN_STATE_IDLE; + pauseCtx->mainState = PAUSE_MAIN_STATE_IDLE; } else if (CHECK_BTN_ALL(input->press.button, BTN_B)) { AudioOcarina_SetInstrument(OCARINA_INSTRUMENT_OFF); - pauseCtx->mainSubState = PAUSE_MAIN_STATE_IDLE; + pauseCtx->mainState = PAUSE_MAIN_STATE_IDLE; pauseCtx->nextPageMode = 0; pauseCtx->promptChoice = 0; Audio_PlaySfxGeneral(NA_SE_SY_DECIDE, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, @@ -3776,7 +3775,7 @@ void KaleidoScope_Update(PlayState* play) { break; default: - pauseCtx->mainSubState = PAUSE_MAIN_STATE_IDLE; + pauseCtx->mainState = PAUSE_MAIN_STATE_IDLE; break; } break; @@ -3890,7 +3889,7 @@ void KaleidoScope_Update(PlayState* play) { pauseCtx->rollRotPageItem = pauseCtx->rollRotPageEquip = pauseCtx->rollRotPageMap = pauseCtx->rollRotPageQuest = 160.0f; pauseCtx->namedItem = PAUSE_ITEM_NONE; - pauseCtx->mainSubState = PAUSE_MAIN_STATE_IDLE; + pauseCtx->mainState = PAUSE_MAIN_STATE_IDLE; pauseCtx->rollRotSavePrompt_ = -434.0f; } break;