ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-25 11:14:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Identification

Browse Source
This commit is contained in:
Diegoisawesome 2018-01-23 23:32:16 -06:00
parent 5784098446
commit b8b0431477
2 changed files with 23 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/naming_screen.h
View File

@ -20,14 +20,12 @@ enum
struct NamingScreenTemplate struct NamingScreenTemplate
{ {
u8 unk0; u8 copyExistingString;
u8 maxChars; u8 maxChars;
u8 iconFunction; u8 iconFunction;
u8 unk3; u8 addGenderIcon;
u8 unk4; //mode? u8 initialPage;
u8 unk5; u8 unused;
u8 unk6;
u8 unk7;
const u8 *title; const u8 *title;
}; };

46
src/naming_screen.c
View File

@ -292,13 +292,13 @@ static void NamingScreen_Init(void)
gNamingScreenData->bgToReveal = 0; gNamingScreenData->bgToReveal = 0;
gNamingScreenData->bgToHide = 1; gNamingScreenData->bgToHide = 1;
gNamingScreenData->template = sNamingScreenTemplates[gNamingScreenData->templateNum]; gNamingScreenData->template = sNamingScreenTemplates[gNamingScreenData->templateNum];
gNamingScreenData->currentPage = gNamingScreenData->template->unk4; gNamingScreenData->currentPage = gNamingScreenData->template->initialPage;
gNamingScreenData->inputCharBaseXPos = (240 - gNamingScreenData->template->maxChars * 8) / 2 + 6; gNamingScreenData->inputCharBaseXPos = (240 - gNamingScreenData->template->maxChars * 8) / 2 + 6;
if (gNamingScreenData->templateNum == 4) if (gNamingScreenData->templateNum == 4)
gNamingScreenData->inputCharBaseXPos += 11; gNamingScreenData->inputCharBaseXPos += 11;
gNamingScreenData->keyRepeatStartDelayCopy = gKeyRepeatStartDelay; gNamingScreenData->keyRepeatStartDelayCopy = gKeyRepeatStartDelay;
memset(gNamingScreenData->textBuffer, 0xFF, sizeof(gNamingScreenData->textBuffer)); memset(gNamingScreenData->textBuffer, 0xFF, sizeof(gNamingScreenData->textBuffer));
if (gNamingScreenData->template->unk0 != 0) if (gNamingScreenData->template->copyExistingString != 0)
StringCopy(gNamingScreenData->textBuffer, gNamingScreenData->destBuffer); StringCopy(gNamingScreenData->textBuffer, gNamingScreenData->destBuffer);
gKeyRepeatStartDelay = 16; gKeyRepeatStartDelay = 16;
} }
@ -1488,7 +1488,7 @@ static void (*const gUnknown_0858BF6C[])(void) =
static void sub_80E498C(void) static void sub_80E498C(void)
{ {
gUnknown_0858BF6C[gNamingScreenData->template->unk3](); gUnknown_0858BF6C[gNamingScreenData->template->addGenderIcon]();
} }
static void TaskDummy3(void) static void TaskDummy3(void)
@ -1824,53 +1824,45 @@ static void sub_80E50EC(void)
static const struct NamingScreenTemplate playerNamingScreenTemplate = static const struct NamingScreenTemplate playerNamingScreenTemplate =
{ {
.unk0 = 0, .copyExistingString = 0,
.maxChars = 7, .maxChars = 7,
.iconFunction = 1, .iconFunction = 1,
.unk3 = 0, .addGenderIcon = 0,
.unk4 = 1, .initialPage = 1,
.unk5 = 35, .unused = 35,
.unk6 = 0,
.unk7 = 0,
.title = gText_YourName, .title = gText_YourName,
}; };
static const struct NamingScreenTemplate pcBoxNamingTemplate = static const struct NamingScreenTemplate pcBoxNamingTemplate =
{ {
.unk0 = 0, .copyExistingString = 0,
.maxChars = 8, .maxChars = 8,
.iconFunction = 2, .iconFunction = 2,
.unk3 = 0, .addGenderIcon = 0,
.unk4 = 1, .initialPage = 1,
.unk5 = 19, .unused = 19,
.unk6 = 0,
.unk7 = 0,
.title = gText_BoxName, .title = gText_BoxName,
}; };
static const struct NamingScreenTemplate monNamingScreenTemplate = static const struct NamingScreenTemplate monNamingScreenTemplate =
{ {
.unk0 = 0, .copyExistingString = 0,
.maxChars = 10, .maxChars = 10,
.iconFunction = 3, .iconFunction = 3,
.unk3 = 1, .addGenderIcon = 1,
.unk4 = 1, .initialPage = 1,
.unk5 = 35, .unused = 35,
.unk6 = 0,
.unk7 = 0,
.title = gText_PkmnsNickname, .title = gText_PkmnsNickname,
}; };
static const struct NamingScreenTemplate wandaWordsScreenTemplate = static const struct NamingScreenTemplate wandaWordsScreenTemplate =
{ {
.unk0 = 1, .copyExistingString = 1,
.maxChars = 15, .maxChars = 15,
.iconFunction = 4, .iconFunction = 4,
.unk3 = 0, .addGenderIcon = 0,
.unk4 = 1, .initialPage = 1,
.unk5 = 11, .unused = 11,
.unk6 = 0,
.unk7 = 0,
.title = gText_TellHimTheWords, .title = gText_TellHimTheWords,
}; };