From e8eb909b12bed0b1c23ba3657040adc384c790d3 Mon Sep 17 00:00:00 2001 From: Dragorn421 Date: Mon, 29 Aug 2022 12:39:04 +0200 Subject: [PATCH] cleanup/finalize known main substates names --- include/regs.h | 2 +- include/z64.h | 16 +-- src/code/z_construct.c | 2 +- src/code/z_kaleido_scope_call.c | 4 +- src/code/z_kaleido_setup.c | 5 +- .../ovl_kaleido_scope/z_kaleido_collect.c | 65 +++++---- .../ovl_kaleido_scope/z_kaleido_equipment.c | 6 +- .../misc/ovl_kaleido_scope/z_kaleido_item.c | 8 +- .../ovl_kaleido_scope/z_kaleido_map_PAL.c | 4 +- .../ovl_kaleido_scope/z_kaleido_scope_PAL.c | 124 +++++++++--------- 10 files changed, 114 insertions(+), 122 deletions(-) diff --git a/include/regs.h b/include/regs.h index 4414a59a82..0bdeb4baea 100644 --- a/include/regs.h +++ b/include/regs.h @@ -82,7 +82,7 @@ #define R_C_UP_ICON_X YREG(88) #define R_C_UP_ICON_Y YREG(89) #define R_MAGIC_FILL_COLOR(i) ZREG(0 + (i)) -#define R_PAUSE_PAGE_CHANGE_FRAME_ADVANCE_ON ZREG(13) +#define R_PAUSE_SWITCH_PAGE_FRAME_ADVANCE_ON ZREG(13) #define R_PAUSE_CURSOR_L_R_SELECTED_PRIM_TIMER ZREG(28) #define R_C_BTN_COLOR(i) ZREG(39 + (i)) #define R_B_BTN_COLOR(i) ZREG(43 + (i)) diff --git a/include/z64.h b/include/z64.h index cea0081336..69eed04ddc 100644 --- a/include/z64.h +++ b/include/z64.h @@ -766,16 +766,16 @@ typedef enum { // Sub-states of PAUSE_STATE_MAIN typedef enum { - /* 0 */ PAUSE_MAIN_STATE_0_IDLE_, - /* 1 */ PAUSE_MAIN_STATE_1_SWITCH_PAGE_, - /* 2 */ PAUSE_MAIN_STATE_2_PLAYBACK_SONG_, + /* 0 */ PAUSE_MAIN_STATE_IDLE, + /* 1 */ PAUSE_MAIN_STATE_SWITCHING_PAGE, + /* 2 */ PAUSE_MAIN_STATE_SONG_PLAYBACK, /* 3 */ PAUSE_MAIN_STATE_3, - /* 4 */ PAUSE_MAIN_STATE_4_PLAYER_PLAYING_SONG_INIT_, - /* 5 */ PAUSE_MAIN_STATE_5_PLAYER_PLAYING_SONG_, - /* 6 */ PAUSE_MAIN_STATE_6_PLAYER_PLAYING_SONG_DONE_, + /* 4 */ PAUSE_MAIN_STATE_SONG_PLAYER_PLAYING_INIT, + /* 5 */ PAUSE_MAIN_STATE_SONG_PLAYER_PLAYING, + /* 6 */ PAUSE_MAIN_STATE_SONG_PLAYER_PLAYING_DONE, /* 7 */ PAUSE_MAIN_STATE_7, - /* 8 */ PAUSE_MAIN_STATE_8_IDLE_CURSOR_ON_SONG_, - /* 9 */ PAUSE_MAIN_STATE_9_PLAYBACK_SONG_START_ + /* 8 */ PAUSE_MAIN_STATE_IDLE_CURSOR_ON_SONG, + /* 9 */ PAUSE_MAIN_STATE_SONG_PLAYBACK_START } PauseMainSubState; typedef enum { diff --git a/src/code/z_construct.c b/src/code/z_construct.c index 21dbdd41fd..486130f601 100644 --- a/src/code/z_construct.c +++ b/src/code/z_construct.c @@ -270,7 +270,7 @@ void func_80111070(void) { ZREG(10) = 200; ZREG(11) = 0; ZREG(12) = 200; - R_PAUSE_PAGE_CHANGE_FRAME_ADVANCE_ON = false; + R_PAUSE_SWITCH_PAGE_FRAME_ADVANCE_ON = false; ZREG(14) = 110; ZREG(15) = 56; ZREG(16) = 1; diff --git a/src/code/z_kaleido_scope_call.c b/src/code/z_kaleido_scope_call.c index 21fca259a2..066ce25272 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_0_IDLE_; + pauseCtx->mainSubState = PAUSE_MAIN_STATE_IDLE; pauseCtx->unk_1EC_ps7_ = PAUSE_S7_0; 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_0_IDLE_; + pauseCtx->mainSubState = PAUSE_MAIN_STATE_IDLE; pauseCtx->unk_1EC_ps7_ = PAUSE_S7_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 b7f5afe549..a26b68cef6 100644 --- a/src/code/z_kaleido_setup.c +++ b/src/code/z_kaleido_setup.c @@ -42,8 +42,7 @@ void KaleidoSetup_Update(PlayState* play) { R_PAUSE_CURSOR_RIGHT_X = 155; pauseCtx->unk_1EA_OpenMenuAndPageSwitchTimer__ = 0; - pauseCtx->mainSubState = PAUSE_MAIN_STATE_1_SWITCH_PAGE_; // irrelevant? reset in PAUSE_STATE_WAIT_LETTERBOX - // by KaleidoScopeCall_Update + pauseCtx->mainSubState = PAUSE_MAIN_STATE_SWITCHING_PAGE; // irrelevant if (R_START_LABEL_DD(0) == 0) { pauseCtx->eye.x = sKaleidoSetupEyeX0[pauseCtx->pageIndex]; @@ -83,7 +82,7 @@ void KaleidoSetup_Init(PlayState* play) { pauseCtx->debugState = 0; pauseCtx->alpha = 0; pauseCtx->unk_1EA_OpenMenuAndPageSwitchTimer__ = 0; - pauseCtx->mainSubState = PAUSE_MAIN_STATE_0_IDLE_; + pauseCtx->mainSubState = PAUSE_MAIN_STATE_IDLE; pauseCtx->mode = 0; pauseCtx->pageIndex = PAUSE_ITEM; 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 54a79f3593..07c6527fa0 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_0_IDLE_ */ || - (pauseCtx->mainSubState == PAUSE_MAIN_STATE_5_PLAYER_PLAYING_SONG_) || - (pauseCtx->mainSubState == PAUSE_MAIN_STATE_8_IDLE_CURSOR_ON_SONG_)) && + if ((!pauseCtx->mainSubState /* PAUSE_MAIN_STATE_IDLE */ || + (pauseCtx->mainSubState == PAUSE_MAIN_STATE_SONG_PLAYER_PLAYING) || + (pauseCtx->mainSubState == 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_0_IDLE_; + pauseCtx->mainSubState = 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_0_IDLE_; + pauseCtx->mainSubState = 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_0_IDLE_; + pauseCtx->mainSubState = 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_0_IDLE_) && + if ((pauseCtx->state == PAUSE_STATE_MAIN) && (pauseCtx->mainSubState == 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_8_IDLE_CURSOR_ON_SONG_; + pauseCtx->mainSubState = 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_5_PLAYER_PLAYING_SONG_) { + } else if (pauseCtx->mainSubState == PAUSE_MAIN_STATE_SONG_PLAYER_PLAYING) { // Abort having the player play the song if the stick is moved if ((pauseCtx->stickRelX != 0) || (pauseCtx->stickRelY != 0)) { - pauseCtx->mainSubState = PAUSE_MAIN_STATE_0_IDLE_; + pauseCtx->mainSubState = PAUSE_MAIN_STATE_IDLE; AudioOcarina_SetInstrument(OCARINA_INSTRUMENT_OFF); } - } else if (pauseCtx->mainSubState == PAUSE_MAIN_STATE_8_IDLE_CURSOR_ON_SONG_) { + } else if (pauseCtx->mainSubState == 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_9_PLAYBACK_SONG_START_; + pauseCtx->mainSubState = 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_9_PLAYBACK_SONG_START_) { + } else if (pauseCtx->mainSubState == 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_2_PLAYBACK_SONG_; + pauseCtx->mainSubState = PAUSE_MAIN_STATE_SONG_PLAYBACK; pauseCtx->ocarinaStaff = AudioOcarina_GetPlaybackStaff(); pauseCtx->ocarinaStaff->pos = 0; @@ -569,17 +569,16 @@ 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_0_IDLE_, PAUSE_MAIN_STATE_1_SWITCH_PAGE_, - PAUSE_MAIN_STATE_2_PLAYBACK_SONG_ */ - || (pauseCtx->mainSubState == PAUSE_MAIN_STATE_5_PLAYER_PLAYING_SONG_) || - (pauseCtx->mainSubState == PAUSE_MAIN_STATE_8_IDLE_CURSOR_ON_SONG_)) { + if ((pauseCtx->mainSubState < 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)) { if (pauseCtx->cursorItem[pauseCtx->pageIndex] != PAUSE_ITEM_NONE) { pauseCtx->cursorColorSet = 8; - // PAUSE_MAIN_STATE_2_PLAYBACK_SONG_, PAUSE_MAIN_STATE_3, - // PAUSE_MAIN_STATE_4_PLAYER_PLAYING_SONG_INIT_, PAUSE_MAIN_STATE_5_PLAYER_PLAYING_SONG_, - // PAUSE_MAIN_STATE_6_PLAYER_PLAYING_SONG_DONE_ - if ((pauseCtx->mainSubState >= PAUSE_MAIN_STATE_2_PLAYBACK_SONG_) && + // 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)) { pauseCtx->cursorColorSet = 0; } @@ -587,7 +586,7 @@ void KaleidoScope_DrawQuestStatus(PlayState* play, GraphicsContext* gfxCtx) { } } - if (pauseCtx->mainSubState == PAUSE_MAIN_STATE_2_PLAYBACK_SONG_) { + if (pauseCtx->mainSubState == PAUSE_MAIN_STATE_SONG_PLAYBACK) { // Draw ocarina buttons as the song playback progresses pauseCtx->ocarinaStaff = AudioOcarina_GetPlaybackStaff(); @@ -634,12 +633,12 @@ void KaleidoScope_DrawQuestStatus(PlayState* play, GraphicsContext* gfxCtx) { gSP1Quadrangle(POLY_OPA_DISP++, 0, 2, 3, 1, 0); } } - } else if (((pauseCtx->mainSubState >= PAUSE_MAIN_STATE_4_PLAYER_PLAYING_SONG_INIT_) && - (pauseCtx->mainSubState <= PAUSE_MAIN_STATE_6_PLAYER_PLAYING_SONG_DONE_) - /* PAUSE_MAIN_STATE_4_PLAYER_PLAYING_SONG_INIT_, PAUSE_MAIN_STATE_5_PLAYER_PLAYING_SONG_, - PAUSE_MAIN_STATE_6_PLAYER_PLAYING_SONG_DONE_ */ + } else if (((pauseCtx->mainSubState >= PAUSE_MAIN_STATE_SONG_PLAYER_PLAYING_INIT) && + (pauseCtx->mainSubState <= 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_8_IDLE_CURSOR_ON_SONG_)) { + (pauseCtx->mainSubState == PAUSE_MAIN_STATE_IDLE_CURSOR_ON_SONG)) { // Draw the buttons for playing a song stepGreen = pauseCtx->ocarinaSongIdx; @@ -654,7 +653,7 @@ void KaleidoScope_DrawQuestStatus(PlayState* play, GraphicsContext* gfxCtx) { gDPPipeSync(POLY_OPA_DISP++); - if (pauseCtx->mainSubState == PAUSE_MAIN_STATE_8_IDLE_CURSOR_ON_SONG_) { + if (pauseCtx->mainSubState == 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 { @@ -677,7 +676,7 @@ void KaleidoScope_DrawQuestStatus(PlayState* play, GraphicsContext* gfxCtx) { gSP1Quadrangle(POLY_OPA_DISP++, 0, 2, 3, 1, 0); } - if (pauseCtx->mainSubState != PAUSE_MAIN_STATE_8_IDLE_CURSOR_ON_SONG_) { + if (pauseCtx->mainSubState != PAUSE_MAIN_STATE_IDLE_CURSOR_ON_SONG) { // Draw the buttons colored as the player plays the song pauseCtx->ocarinaStaff = AudioOcarina_GetPlayingStaff(); @@ -732,7 +731,7 @@ void KaleidoScope_DrawQuestStatus(PlayState* play, GraphicsContext* gfxCtx) { gSP1Quadrangle(POLY_OPA_DISP++, 0, 2, 3, 1, 0); } - if (pauseCtx->mainSubState == PAUSE_MAIN_STATE_4_PLAYER_PLAYING_SONG_INIT_) { + if (pauseCtx->mainSubState == PAUSE_MAIN_STATE_SONG_PLAYER_PLAYING_INIT) { for (i = 0; i < SONG_MAX_LENGTH; i++) { sPlayedSongBtns[i] = OCARINA_BTN_INVALID; sPlayedSongBtnsAlpha[i] = 0; @@ -745,7 +744,7 @@ void KaleidoScope_DrawQuestStatus(PlayState* play, GraphicsContext* gfxCtx) { pauseCtx->ocarinaStaff->pos = 0; pauseCtx->ocarinaStaff->state = 0xFE; - pauseCtx->mainSubState = PAUSE_MAIN_STATE_5_PLAYER_PLAYING_SONG_; + pauseCtx->mainSubState = 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 2b6fb131ea..38d26f8524 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_0_IDLE_) && + if ((pauseCtx->state == PAUSE_STATE_MAIN) && (pauseCtx->mainSubState == PAUSE_MAIN_STATE_IDLE) && (pauseCtx->pageIndex == PAUSE_EQUIP)) { oldCursorPoint = pauseCtx->cursorPoint[PAUSE_EQUIP]; pauseCtx->cursorColorSet = 0; @@ -467,7 +467,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_0_IDLE_) && + (pauseCtx->state == PAUSE_STATE_MAIN) && (pauseCtx->mainSubState == PAUSE_MAIN_STATE_IDLE) && CHECK_BTN_ALL(input->press.button, BTN_A) && (pauseCtx->cursorX[PAUSE_EQUIP] != 0)) { if ((gEquipAgeReqs[pauseCtx->cursorY[PAUSE_EQUIP]][pauseCtx->cursorX[PAUSE_EQUIP]] == 9) || @@ -515,7 +515,7 @@ void KaleidoScope_DrawEquipment(PlayState* play) { sEquipTimer--; if (sEquipTimer == 0) { - pauseCtx->mainSubState = PAUSE_MAIN_STATE_0_IDLE_; + pauseCtx->mainSubState = PAUSE_MAIN_STATE_IDLE; } } 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 8a563c758f..560d71b44b 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_0_IDLE_) && + if ((pauseCtx->state == PAUSE_STATE_MAIN) && (pauseCtx->mainSubState == 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_0_IDLE_)) { + (pauseCtx->mainSubState == PAUSE_MAIN_STATE_IDLE)) { if (CHECK_BTN_ANY(input->press.button, BTN_CLEFT | BTN_CDOWN | BTN_CRIGHT)) { if (((gSlotAgeReqs[cursorSlot] == 9) || (gSlotAgeReqs[cursorSlot] == ((void)0, gSaveContext.linkAge))) && @@ -434,7 +434,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_0_IDLE_) && (pauseCtx->pageIndex == PAUSE_ITEM) && + if ((pauseCtx->mainSubState == PAUSE_MAIN_STATE_IDLE) && (pauseCtx->pageIndex == PAUSE_ITEM) && (pauseCtx->cursorSpecialPos == 0)) { if ((gSlotAgeReqs[i] == 9) || (gSlotAgeReqs[i] == ((void)0, gSaveContext.linkAge))) { if ((sEquipState == 2) && (i == 3)) { @@ -804,7 +804,7 @@ void KaleidoScope_UpdateItemEquip(PlayState* play) { gSaveContext.equips.cButtonSlots[2]); } - pauseCtx->mainSubState = PAUSE_MAIN_STATE_0_IDLE_; + pauseCtx->mainSubState = 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 4d7b19b603..8acf05eb70 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_0_IDLE_) && + if ((pauseCtx->state == PAUSE_STATE_MAIN) && (pauseCtx->mainSubState == 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_0_IDLE_) && + if ((pauseCtx->state == PAUSE_STATE_MAIN) && (pauseCtx->mainSubState == 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 e8bc61ef07..43c09604b9 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 @@ -388,7 +388,7 @@ void KaleidoScope_SetDefaultCursor(PlayState* play) { } void KaleidoScope_SwitchPage(PauseContext* pauseCtx, u8 pt) { - pauseCtx->mainSubState = PAUSE_MAIN_STATE_1_SWITCH_PAGE_; + pauseCtx->mainSubState = PAUSE_MAIN_STATE_SWITCHING_PAGE; pauseCtx->unk_1EA_OpenMenuAndPageSwitchTimer__ = 0; if (!pt) { // pt == 0, scroll left @@ -459,12 +459,12 @@ void KaleidoScope_DrawCursor(PlayState* play, u16 pageIndex) { temp = pauseCtx->mainSubState; - if ((((pauseCtx->mainSubState == PAUSE_MAIN_STATE_0_IDLE_) || (temp == PAUSE_MAIN_STATE_8_IDLE_CURSOR_ON_SONG_)) && + if ((((pauseCtx->mainSubState == 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_0_IDLE_, PAUSE_MAIN_STATE_1_SWITCH_PAGE_, - PAUSE_MAIN_STATE_2_PLAYBACK_SONG_ */ - || (temp == PAUSE_MAIN_STATE_5_PLAYER_PLAYING_SONG_) || (temp == PAUSE_MAIN_STATE_8_IDLE_CURSOR_ON_SONG_)))) { + ((temp < PAUSE_MAIN_STATE_3) /* PAUSE_MAIN_STATE_IDLE, PAUSE_MAIN_STATE_SWITCHING_PAGE, + PAUSE_MAIN_STATE_SONG_PLAYBACK */ + || (temp == PAUSE_MAIN_STATE_SONG_PLAYER_PLAYING) || (temp == PAUSE_MAIN_STATE_IDLE_CURSOR_ON_SONG)))) { if (pauseCtx->pageIndex == pageIndex) { s16 i; @@ -1114,8 +1114,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_0_IDLE_)) { + if ((pauseCtx->cursorSpecialPos == PAUSE_CURSOR_PAGE_LEFT) && (pauseCtx->mainSubState == 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; @@ -1135,8 +1134,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_0_IDLE_)) { + if ((pauseCtx->cursorSpecialPos == PAUSE_CURSOR_PAGE_RIGHT) && (pauseCtx->mainSubState == 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] = @@ -1177,8 +1175,7 @@ void KaleidoScope_DrawInfoPanel(PlayState* play) { gSPDisplayList(POLY_OPA_DISP++, gItemNamePanelDL); - if ((pauseCtx->cursorSpecialPos == PAUSE_CURSOR_PAGE_LEFT) && - (pauseCtx->mainSubState == PAUSE_MAIN_STATE_0_IDLE_)) { + if ((pauseCtx->cursorSpecialPos == PAUSE_CURSOR_PAGE_LEFT) && (pauseCtx->mainSubState == PAUSE_MAIN_STATE_IDLE)) { gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, sCursorLeftRightSelectedPrimRed, sCursorLeftRightSelectedPrimGreen, sCursorLeftRightSelectedPrimBlue, sCursorLeftRightSelectedPrimAlpha); } @@ -1187,8 +1184,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_0_IDLE_)) { + if ((pauseCtx->cursorSpecialPos == PAUSE_CURSOR_PAGE_RIGHT) && (pauseCtx->mainSubState == PAUSE_MAIN_STATE_IDLE)) { gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, sCursorLeftRightSelectedPrimRed, sCursorLeftRightSelectedPrimGreen, sCursorLeftRightSelectedPrimBlue, sCursorLeftRightSelectedPrimAlpha); } @@ -1216,23 +1212,22 @@ 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_0_IDLE_ */ || - (pauseCtx->mainSubState == PAUSE_MAIN_STATE_2_PLAYBACK_SONG_) || - ((pauseCtx->mainSubState >= PAUSE_MAIN_STATE_4_PLAYER_PLAYING_SONG_INIT_) && - (pauseCtx->mainSubState <= PAUSE_MAIN_STATE_7)) /* PAUSE_MAIN_STATE_4_PLAYER_PLAYING_SONG_INIT_, - PAUSE_MAIN_STATE_5_PLAYER_PLAYING_SONG_, - PAUSE_MAIN_STATE_6_PLAYER_PLAYING_SONG_DONE_, PAUSE_MAIN_STATE_7 */ - || (pauseCtx->mainSubState == PAUSE_MAIN_STATE_8_IDLE_CURSOR_ON_SONG_)) && + (!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)) /* 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->cursorSpecialPos == 0)) { - if (!pauseCtx->mainSubState /* PAUSE_MAIN_STATE_0_IDLE_ */ || - (pauseCtx->mainSubState == PAUSE_MAIN_STATE_2_PLAYBACK_SONG_) || - ((pauseCtx->mainSubState >= PAUSE_MAIN_STATE_4_PLAYER_PLAYING_SONG_INIT_) && - (pauseCtx->mainSubState <= - PAUSE_MAIN_STATE_7)) /* PAUSE_MAIN_STATE_4_PLAYER_PLAYING_SONG_INIT_, - PAUSE_MAIN_STATE_5_PLAYER_PLAYING_SONG_, PAUSE_MAIN_STATE_6_PLAYER_PLAYING_SONG_DONE_, - PAUSE_MAIN_STATE_7 */ - || (pauseCtx->mainSubState == PAUSE_MAIN_STATE_8_IDLE_CURSOR_ON_SONG_)) { + 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)) /* 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->infoPanelVtx[16].v.ob[0] = pauseCtx->infoPanelVtx[18].v.ob[0] = -63; @@ -1293,11 +1288,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_0_IDLE_, PAUSE_MAIN_STATE_1_SWITCH_PAGE_, - PAUSE_MAIN_STATE_2_PLAYBACK_SONG_ */ + } else if ((pauseCtx->mainSubState < 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_8_IDLE_CURSOR_ON_SONG_)) { + (pauseCtx->mainSubState == 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] = @@ -1333,7 +1327,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_0_IDLE_)) { + if ((pauseCtx->state == PAUSE_STATE_MAIN) && (pauseCtx->mainSubState == 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] = @@ -1499,7 +1493,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_8_IDLE_CURSOR_ON_SONG_)) || + (pauseCtx->mainSubState == 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) { @@ -1516,12 +1510,12 @@ void KaleidoScope_UpdateNamePanel(PlayState* play) { } } -void KaleidoScope_UpdateSwitchPage_(PlayState* play, Input* input) { +void KaleidoScope_UpdateSwitchPage(PlayState* play, Input* input) { PauseContext* pauseCtx = &play->pauseCtx; s32 frameAdvanceFreeze = false; s32 mode; - if (R_PAUSE_PAGE_CHANGE_FRAME_ADVANCE_ON && !CHECK_BTN_ALL(input->press.button, BTN_L)) { + if (R_PAUSE_SWITCH_PAGE_FRAME_ADVANCE_ON && !CHECK_BTN_ALL(input->press.button, BTN_L)) { frameAdvanceFreeze = true; } @@ -1543,7 +1537,7 @@ void KaleidoScope_UpdateSwitchPage_(PlayState* play, Input* input) { if (pauseCtx->unk_1EA_OpenMenuAndPageSwitchTimer__ == 64) { pauseCtx->unk_1EA_OpenMenuAndPageSwitchTimer__ = 0; pauseCtx->pageIndex = D_8082ABEC_modeToNewPageIndex_[pauseCtx->mode]; - pauseCtx->mainSubState = PAUSE_MAIN_STATE_0_IDLE_; + pauseCtx->mainSubState = PAUSE_MAIN_STATE_IDLE; } } } @@ -2510,7 +2504,7 @@ void KaleidoScope_UpdateOpening_(PlayState* play) { pauseCtx->pageIndex = D_8082ABEC_modeToNewPageIndex_[pauseCtx->mode]; - pauseCtx->mainSubState = PAUSE_MAIN_STATE_0_IDLE_; + pauseCtx->mainSubState = PAUSE_MAIN_STATE_IDLE; pauseCtx->state++; // PAUSE_STATE_OPENING_2 or PAUSE_STATE_MAIN pauseCtx->alpha = 255; @@ -2642,7 +2636,7 @@ void KaleidoScope_UpdateDungeonMap(PlayState* play) { } void KaleidoScope_Update(PlayState* play) { - static s16 D_8082B258_sState66NextState_ = PAUSE_MAIN_STATE_0_IDLE_; + static s16 D_8082B258_sState66NextState_ = PAUSE_MAIN_STATE_IDLE; static s16 D_8082B25C_sState66NextStateTimer_ = 10; static s16 sTimer_D_8082B260 = 0; PauseContext* pauseCtx = &play->pauseCtx; @@ -2670,8 +2664,8 @@ void KaleidoScope_Update(PlayState* play) { PAUSE_STATE_15, PAUSE_STATE_16, PAUSE_STATE_17, PAUSE_STATE_CLOSING */ ))) { - if ((!pauseCtx->mainSubState /* PAUSE_MAIN_STATE_0_IDLE_ */ || - (pauseCtx->mainSubState == PAUSE_MAIN_STATE_8_IDLE_CURSOR_ON_SONG_)) && + if ((!pauseCtx->mainSubState /* PAUSE_MAIN_STATE_IDLE */ || + (pauseCtx->mainSubState == PAUSE_MAIN_STATE_IDLE_CURSOR_ON_SONG)) && (pauseCtx->state == PAUSE_STATE_MAIN)) { pauseCtx->stickRelX = input->rel.stick_x; @@ -2681,9 +2675,9 @@ void KaleidoScope_Update(PlayState* play) { KaleidoScope_HandlePageToggles(pauseCtx, input); } else if ((pauseCtx->pageIndex == PAUSE_QUEST) && ((pauseCtx->mainSubState < - PAUSE_MAIN_STATE_3) /* PAUSE_MAIN_STATE_0_IDLE_, PAUSE_MAIN_STATE_1_SWITCH_PAGE_, - PAUSE_MAIN_STATE_2_PLAYBACK_SONG_ */ - || (pauseCtx->mainSubState == PAUSE_MAIN_STATE_5_PLAYER_PLAYING_SONG_))) { + 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))) { KaleidoScope_UpdateCursorSize(play); } @@ -3101,7 +3095,7 @@ void KaleidoScope_Update(PlayState* play) { case PAUSE_STATE_MAIN: switch (pauseCtx->mainSubState) { - case PAUSE_MAIN_STATE_0_IDLE_: + case PAUSE_MAIN_STATE_IDLE: if (CHECK_BTN_ALL(input->press.button, BTN_START)) { Interface_SetDoAction(play, DO_ACTION_NONE); pauseCtx->state = PAUSE_STATE_CLOSING; @@ -3122,15 +3116,15 @@ void KaleidoScope_Update(PlayState* play) { } break; - case PAUSE_MAIN_STATE_1_SWITCH_PAGE_: - KaleidoScope_UpdateSwitchPage_(play, &play->state.input[0]); + case PAUSE_MAIN_STATE_SWITCHING_PAGE: + KaleidoScope_UpdateSwitchPage(play, &play->state.input[0]); break; - case PAUSE_MAIN_STATE_2_PLAYBACK_SONG_: + case PAUSE_MAIN_STATE_SONG_PLAYBACK: pauseCtx->ocarinaStaff = AudioOcarina_GetPlaybackStaff(); if (pauseCtx->ocarinaStaff->state == 0) { // Song playback is finished - pauseCtx->mainSubState = PAUSE_MAIN_STATE_4_PLAYER_PLAYING_SONG_INIT_; + pauseCtx->mainSubState = PAUSE_MAIN_STATE_SONG_PLAYER_PLAYING_INIT; AudioOcarina_SetInstrument(OCARINA_INSTRUMENT_OFF); } break; @@ -3139,10 +3133,10 @@ void KaleidoScope_Update(PlayState* play) { KaleidoScope_UpdateItemEquip(play); break; - case PAUSE_MAIN_STATE_4_PLAYER_PLAYING_SONG_INIT_: + case PAUSE_MAIN_STATE_SONG_PLAYER_PLAYING_INIT: break; - case PAUSE_MAIN_STATE_5_PLAYER_PLAYING_SONG_: + case PAUSE_MAIN_STATE_SONG_PLAYER_PLAYING: pauseCtx->ocarinaStaff = AudioOcarina_GetPlayingStaff(); if (CHECK_BTN_ALL(input->press.button, BTN_START)) { @@ -3151,11 +3145,11 @@ void KaleidoScope_Update(PlayState* play) { pauseCtx->state = PAUSE_STATE_CLOSING; R_PAUSE_OFFSET_VERTICAL = -6240; func_800F64E0(0); - pauseCtx->mainSubState = PAUSE_MAIN_STATE_0_IDLE_; + pauseCtx->mainSubState = 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_0_IDLE_; + pauseCtx->mainSubState = PAUSE_MAIN_STATE_IDLE; pauseCtx->mode = 0; pauseCtx->promptChoice = 0; Audio_PlaySfxGeneral(NA_SE_SY_DECIDE, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, @@ -3173,26 +3167,26 @@ void KaleidoScope_Update(PlayState* play) { Audio_PlaySfxGeneral(NA_SE_SY_TRE_BOX_APPEAR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); - D_8082B258_sState66NextState_ = PAUSE_MAIN_STATE_0_IDLE_; + D_8082B258_sState66NextState_ = PAUSE_MAIN_STATE_IDLE; D_8082B25C_sState66NextStateTimer_ = 30; - pauseCtx->mainSubState = PAUSE_MAIN_STATE_6_PLAYER_PLAYING_SONG_DONE_; + pauseCtx->mainSubState = 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); - D_8082B258_sState66NextState_ = PAUSE_MAIN_STATE_4_PLAYER_PLAYING_SONG_INIT_; + D_8082B258_sState66NextState_ = PAUSE_MAIN_STATE_SONG_PLAYER_PLAYING_INIT; D_8082B25C_sState66NextStateTimer_ = 20; - pauseCtx->mainSubState = PAUSE_MAIN_STATE_6_PLAYER_PLAYING_SONG_DONE_; + pauseCtx->mainSubState = PAUSE_MAIN_STATE_SONG_PLAYER_PLAYING_DONE; } break; - case PAUSE_MAIN_STATE_6_PLAYER_PLAYING_SONG_DONE_: + case PAUSE_MAIN_STATE_SONG_PLAYER_PLAYING_DONE: D_8082B25C_sState66NextStateTimer_--; if (D_8082B25C_sState66NextStateTimer_ == 0) { pauseCtx->mainSubState = D_8082B258_sState66NextState_; - if (pauseCtx->mainSubState == PAUSE_MAIN_STATE_0_IDLE_) { + if (pauseCtx->mainSubState == PAUSE_MAIN_STATE_IDLE) { AudioOcarina_SetInstrument(OCARINA_INSTRUMENT_OFF); } } @@ -3201,17 +3195,17 @@ void KaleidoScope_Update(PlayState* play) { case PAUSE_MAIN_STATE_7: break; - case PAUSE_MAIN_STATE_8_IDLE_CURSOR_ON_SONG_: + case PAUSE_MAIN_STATE_IDLE_CURSOR_ON_SONG: if (CHECK_BTN_ALL(input->press.button, BTN_START)) { AudioOcarina_SetInstrument(OCARINA_INSTRUMENT_OFF); Interface_SetDoAction(play, DO_ACTION_NONE); pauseCtx->state = PAUSE_STATE_CLOSING; R_PAUSE_OFFSET_VERTICAL = -6240; func_800F64E0(0); - pauseCtx->mainSubState = PAUSE_MAIN_STATE_0_IDLE_; + pauseCtx->mainSubState = PAUSE_MAIN_STATE_IDLE; } else if (CHECK_BTN_ALL(input->press.button, BTN_B)) { AudioOcarina_SetInstrument(OCARINA_INSTRUMENT_OFF); - pauseCtx->mainSubState = PAUSE_MAIN_STATE_0_IDLE_; + pauseCtx->mainSubState = PAUSE_MAIN_STATE_IDLE; pauseCtx->mode = 0; pauseCtx->promptChoice = 0; Audio_PlaySfxGeneral(NA_SE_SY_DECIDE, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, @@ -3226,11 +3220,11 @@ void KaleidoScope_Update(PlayState* play) { } break; - case PAUSE_MAIN_STATE_9_PLAYBACK_SONG_START_: + case PAUSE_MAIN_STATE_SONG_PLAYBACK_START: break; default: - pauseCtx->mainSubState = PAUSE_MAIN_STATE_0_IDLE_; + pauseCtx->mainSubState = PAUSE_MAIN_STATE_IDLE; break; } break; @@ -3332,7 +3326,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_0_IDLE_; + pauseCtx->mainSubState = PAUSE_MAIN_STATE_IDLE; pauseCtx->rollRotSavePromptPage_unk_204 = -434.0f; } break;