From ff412fbe765ed81122feee6a1403e28ed67293e1 Mon Sep 17 00:00:00 2001 From: RavePossum Date: Mon, 25 Nov 2024 14:56:26 -0500 Subject: [PATCH] Rename summary mode constants that could be better --- include/applications/pokemon_summary_screen/main.h | 4 ++-- src/applications/pokemon_summary_screen/main.c | 10 +++++----- src/applications/pokemon_summary_screen/subscreen.c | 2 +- src/applications/pokemon_summary_screen/window.c | 10 +++++----- src/unk_020989DC.c | 4 ++-- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/include/applications/pokemon_summary_screen/main.h b/include/applications/pokemon_summary_screen/main.h index 5573a86c4a..a1a5552bbe 100644 --- a/include/applications/pokemon_summary_screen/main.h +++ b/include/applications/pokemon_summary_screen/main.h @@ -30,8 +30,8 @@ enum SummaryMode { SUMMARY_MODE_NORMAL = 0, SUMMARY_MODE_LOCK_MOVES, SUMMARY_MODE_SELECT_MOVE, - SUMMARY_MODE_POFFIN, - SUMMARY_MODE_CONDITION, + SUMMARY_MODE_FEED_POFFIN, + SUMMARY_MODE_SHOW_CONDITION_CHANGE, }; enum SummaryPage { diff --git a/src/applications/pokemon_summary_screen/main.c b/src/applications/pokemon_summary_screen/main.c index 0f6879d0fd..cc23b40921 100644 --- a/src/applications/pokemon_summary_screen/main.c +++ b/src/applications/pokemon_summary_screen/main.c @@ -569,7 +569,7 @@ static int WaitSummaryScreenTransition(PokemonSummaryScreen *summaryScreen) if (summaryScreen->data->mode == SUMMARY_MODE_SELECT_MOVE) { return SUMMARY_STATE_LEARN_MOVE; - } else if (summaryScreen->data->mode == SUMMARY_MODE_CONDITION) { + } else if (summaryScreen->data->mode == SUMMARY_MODE_SHOW_CONDITION_CHANGE) { return SUMMARY_STATE_SETUP_POFFIN_FEED; } else { return SUMMARY_STATE_HANDLE_INPUT; @@ -613,7 +613,7 @@ static int HandleInput_Main(PokemonSummaryScreen *summaryScreen) } if (JOY_NEW(PAD_BUTTON_A)) { - if (summaryScreen->data->mode == SUMMARY_MODE_POFFIN && summaryScreen->page == SUMMARY_MODE_CONDITION) { + if (summaryScreen->data->mode == SUMMARY_MODE_FEED_POFFIN && summaryScreen->page == SUMMARY_MODE_SHOW_CONDITION_CHANGE) { Sound_PlayEffect(SEQ_SE_DP_DECIDE); return TryFeedPoffin(summaryScreen); } @@ -1201,8 +1201,8 @@ static void SetupInitialPageGfx(PokemonSummaryScreen *summaryScreen) case SUMMARY_MODE_SELECT_MOVE: summaryScreen->page = SUMMARY_PAGE_BATTLE_MOVES; break; - case SUMMARY_MODE_POFFIN: - case SUMMARY_MODE_CONDITION: + case SUMMARY_MODE_FEED_POFFIN: + case SUMMARY_MODE_SHOW_CONDITION_CHANGE: summaryScreen->page = SUMMARY_PAGE_CONDITION; break; } @@ -1523,7 +1523,7 @@ static s8 TryAdvanceSummaryMonIndex(PokemonSummaryScreen *summaryScreen, s8 delt static BOOL CanAdvanceToEgg(PokemonSummaryScreen *summaryScreen) { - if (summaryScreen->data->mode == SUMMARY_MODE_POFFIN) { + if (summaryScreen->data->mode == SUMMARY_MODE_FEED_POFFIN) { return FALSE; } diff --git a/src/applications/pokemon_summary_screen/subscreen.c b/src/applications/pokemon_summary_screen/subscreen.c index b7ec21d1ea..e10d2573db 100644 --- a/src/applications/pokemon_summary_screen/subscreen.c +++ b/src/applications/pokemon_summary_screen/subscreen.c @@ -102,7 +102,7 @@ void PokemonSummaryScreen_SetSubscreenType(PokemonSummaryScreen *summaryScreen) } break; case SUMMARY_MODE_SELECT_MOVE: - case SUMMARY_MODE_POFFIN: + case SUMMARY_MODE_FEED_POFFIN: default: summaryScreen->subscreenType = SUMMARY_SUBSCREEN_TYPE_NO_BUTTONS; } diff --git a/src/applications/pokemon_summary_screen/window.c b/src/applications/pokemon_summary_screen/window.c index 8790a46632..727fbbc757 100644 --- a/src/applications/pokemon_summary_screen/window.c +++ b/src/applications/pokemon_summary_screen/window.c @@ -767,7 +767,7 @@ void PokemonSummaryScreen_AddExtraWindows(PokemonSummaryScreen *summaryScreen) case SUMMARY_PAGE_CONDITION: case SUMMARY_PAGE_EXIT: // the exit page shows the "favorite food" condition extra window when feeding poffins - if (summaryScreen->data->mode != SUMMARY_MODE_POFFIN && summaryScreen->data->mode != SUMMARY_MODE_CONDITION) { + if (summaryScreen->data->mode != SUMMARY_MODE_FEED_POFFIN && summaryScreen->data->mode != SUMMARY_MODE_SHOW_CONDITION_CHANGE) { return; } @@ -798,7 +798,7 @@ void PokemonSummaryScreen_RemoveExtraWindows(PokemonSummaryScreen *summaryScreen case SUMMARY_PAGE_CONDITION: case SUMMARY_PAGE_EXIT: // the exit page shows the "favorite food" condition extra window when feeding poffins - if (summaryScreen->data->mode != SUMMARY_MODE_POFFIN && summaryScreen->data->mode != SUMMARY_MODE_CONDITION) { + if (summaryScreen->data->mode != SUMMARY_MODE_FEED_POFFIN && summaryScreen->data->mode != SUMMARY_MODE_SHOW_CONDITION_CHANGE) { return; } break; @@ -1198,7 +1198,7 @@ static void DrawConditionPageWindows(PokemonSummaryScreen *summaryScreen) Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[SUMMARY_WINDOW_LABEL_CONDITION]); Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[SUMMARY_WINDOW_LABEL_SHEEN]); - if (summaryScreen->data->mode != SUMMARY_MODE_POFFIN && summaryScreen->data->mode != SUMMARY_MODE_CONDITION) { + if (summaryScreen->data->mode != SUMMARY_MODE_FEED_POFFIN && summaryScreen->data->mode != SUMMARY_MODE_SHOW_CONDITION_CHANGE) { return; } @@ -1209,7 +1209,7 @@ static void DrawConditionPageWindows(PokemonSummaryScreen *summaryScreen) Text_AddPrinterWithParamsAndColor(&summaryScreen->extraWindows[SUMMARY_WINDOW_FAVORITE_FOOD], FONT_SYSTEM, summaryScreen->strbuf, 0, 16, TEXT_SPEED_NO_TRANSFER, SUMMARY_TEXT_BLACK, NULL); Window_ScheduleCopyToVRAM(&summaryScreen->extraWindows[SUMMARY_WINDOW_FAVORITE_FOOD]); - if (summaryScreen->data->mode == SUMMARY_MODE_POFFIN) { + if (summaryScreen->data->mode == SUMMARY_MODE_FEED_POFFIN) { Window_FillTilemap(&summaryScreen->extraWindows[SUMMARY_WINDOW_POFFIN_BUTTON_PROMPT], 0); MessageLoader_GetStrbuf(summaryScreen->msgLoader, summary_poffin_feed_ok, summaryScreen->strbuf); PrintStrbufToWindow(summaryScreen, &summaryScreen->extraWindows[SUMMARY_WINDOW_POFFIN_BUTTON_PROMPT], SUMMARY_TEXT_WHITE, ALIGN_LEFT); @@ -1297,7 +1297,7 @@ static void DrawExitPageWindows(PokemonSummaryScreen *summaryScreen) PokemonSummaryScreen_UpdateAButtonSprite(summaryScreen, &summaryScreen->staticWindows[SUMMARY_WINDOW_BUTTON_PROMPT]); // the exit page shows the "favorite food" condition extra window when feeding poffins - if (summaryScreen->data->mode != SUMMARY_MODE_POFFIN && summaryScreen->data->mode != SUMMARY_MODE_CONDITION) { + if (summaryScreen->data->mode != SUMMARY_MODE_FEED_POFFIN && summaryScreen->data->mode != SUMMARY_MODE_SHOW_CONDITION_CHANGE) { return; } diff --git a/src/unk_020989DC.c b/src/unk_020989DC.c index 5fae39fcd8..d6cba5bed9 100644 --- a/src/unk_020989DC.c +++ b/src/unk_020989DC.c @@ -327,7 +327,7 @@ static int sub_02098CB0(UnkStruct_02098BE4 *param0) v2->pos = v0; v2->max = Party_GetCurrentCount(v2->monData); v2->move = 0; - v2->mode = SUMMARY_MODE_POFFIN; + v2->mode = SUMMARY_MODE_FEED_POFFIN; v2->showContest = TRUE; v2->chatotCry = NULL; @@ -426,7 +426,7 @@ static int sub_02098E0C(UnkStruct_02098BE4 *param0) v1->pos = param0->unk_08; v1->max = Party_GetCurrentCount(v1->monData); v1->move = 0; - v1->mode = SUMMARY_MODE_CONDITION; + v1->mode = SUMMARY_MODE_SHOW_CONDITION_CHANGE; v1->poffin = v2; v1->showContest = TRUE; v1->chatotCry = NULL;