Use constants for naming screen's pages.

This commit is contained in:
Wyrserth 2019-03-23 21:52:58 +01:00
parent cd192e303d
commit 6566a49beb
2 changed files with 6 additions and 6 deletions

View File

@ -59,9 +59,9 @@ struct NamingScreenData {
enum
{
PAGE_OTHERS,
PAGE_UPPER,
PAGE_LOWER,
PAGE_OTHERS,
};
enum

View File

@ -449,7 +449,7 @@ static u8 sub_80E3274(void)
static bool8 MainState_BeginFadeIn(void)
{
sub_80E4CF8(3, gUnknown_08DD4544);
gNamingScreenData->currentPage = 1;
gNamingScreenData->currentPage = PAGE_UPPER;
sub_80E4CF8(2, gUnknown_08DD46E0);
sub_80E4CF8(1, gUnknown_08DD4620);
sub_80E4DE4(gNamingScreenData->windows[1], 0);
@ -1856,7 +1856,7 @@ static const struct NamingScreenTemplate playerNamingScreenTemplate =
.maxChars = 7,
.iconFunction = 1,
.addGenderIcon = 0,
.initialPage = 1,
.initialPage = PAGE_UPPER,
.unused = 35,
.title = gText_YourName,
};
@ -1867,7 +1867,7 @@ static const struct NamingScreenTemplate pcBoxNamingTemplate =
.maxChars = 8,
.iconFunction = 2,
.addGenderIcon = 0,
.initialPage = 1,
.initialPage = PAGE_UPPER,
.unused = 19,
.title = gText_BoxName,
};
@ -1878,7 +1878,7 @@ static const struct NamingScreenTemplate monNamingScreenTemplate =
.maxChars = 10,
.iconFunction = 3,
.addGenderIcon = 1,
.initialPage = 1,
.initialPage = PAGE_UPPER,
.unused = 35,
.title = gText_PkmnsNickname,
};
@ -1889,7 +1889,7 @@ static const struct NamingScreenTemplate wandaWordsScreenTemplate =
.maxChars = 15,
.iconFunction = 4,
.addGenderIcon = 0,
.initialPage = 1,
.initialPage = PAGE_UPPER,
.unused = 11,
.title = gText_TellHimTheWords,
};