Leahnaya/pokeplatinum
1
0
Fork 0
mirror of https://github.com/pret/pokeplatinum.git synced 2026-10-01 22:09:43 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename summary mode constants that could be better

Browse Source
This commit is contained in:
RavePossum
2024-11-25 14:56:26 -05:00
parent c9977faf53
commit ff412fbe76
5 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/applications/pokemon_summary_screen/main.h
View File

@@ -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 {

10
src/applications/pokemon_summary_screen/main.c
View File

@@ -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;
}

2
src/applications/pokemon_summary_screen/subscreen.c
View File

@@ -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;
}

10
src/applications/pokemon_summary_screen/window.c
View File

@@ -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;
}

4
src/unk_020989DC.c
View File

@@ -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;