atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #624 from Wyrserth/master

Browse source 
Use constants for naming screen's pages
This commit is contained in:
Diegoisawesome 2019-04-04 12:44:18 -05:00 committed by GitHub
commit e476a6d02d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/naming_screen.h
View file

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

10
src/naming_screen.c
View file

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