diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2019-04-04 12:44:18 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-04 12:44:18 -0500 |
| commit | e476a6d02d88cb467b7e1d7f8c5b06af7438d738 (patch) | |
| tree | 6eef30b7af72317ada201bc28ca8adc643a68b35 /src | |
| parent | 4fadbaf16153c0160f6ad38dc0053e7ff6db7472 (diff) | |
| parent | 6566a49bebc877e742f8ee325dd659879afe63f3 (diff) | |
Merge pull request #624 from Wyrserth/master
Use constants for naming screen's pages
Diffstat (limited to 'src')
| -rw-r--r-- | src/naming_screen.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/naming_screen.c b/src/naming_screen.c index 3b8ba037c..e43a259e7 100644 --- a/src/naming_screen.c +++ b/src/naming_screen.c @@ -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, }; |