Address review comments
This commit is contained in:
PikalaxALT
@@ -13,159 +13,6 @@
|
||||
|
||||
.section .rodata
|
||||
|
||||
// easy_chat_2
|
||||
|
||||
gUnknown_847A8D8::
|
||||
.string "{CLEAR 11}A{CLEAR 6}B{CLEAR 6}C{CLEAR 26}D{CLEAR 6}E{CLEAR 6}F{CLEAR 26}others$"
|
||||
|
||||
gUnknown_847A8FA::
|
||||
.string "{CLEAR 11}G{CLEAR 6}H{CLEAR 6}I{CLEAR 26}J{CLEAR 6}K{CLEAR 6}L$"
|
||||
|
||||
gUnknown_847A913::
|
||||
.string "{CLEAR 11}M{CLEAR 6}N{CLEAR 6}O{CLEAR 26}P{CLEAR 6}Q{CLEAR 6}R{CLEAR 6}S{CLEAR 26} $"
|
||||
|
||||
gUnknown_847A934::
|
||||
.string "{CLEAR 11}T{CLEAR 6}U{CLEAR 6}V{CLEAR 26}W{CLEAR 6}X{CLEAR 6}Y{CLEAR 6}Z{CLEAR 26} $"
|
||||
|
||||
// naming_screen
|
||||
|
||||
gText_NamingScreenKeyboard_abcdef::
|
||||
.string "{CLEAR 11}a{CLEAR 6}b{CLEAR 6}c{CLEAR 26}d{CLEAR 6}e{CLEAR 6}f{CLEAR 6} {CLEAR 26}.$"
|
||||
|
||||
gText_NamingScreenKeyboard_ghijkl::
|
||||
.string "{CLEAR 11}g{CLEAR 6}h{CLEAR 7}i{CLEAR 27}j{CLEAR 6}k{CLEAR 6}l{CLEAR 7} {CLEAR 26},$"
|
||||
|
||||
gText_NamingScreenKeyboard_mnopqrs::
|
||||
.string "{CLEAR 11}m{CLEAR 6}n{CLEAR 7}o{CLEAR 26}p{CLEAR 6}q{CLEAR 7}r{CLEAR 6}s{CLEAR 27} $"
|
||||
|
||||
gText_NamingScreenKeyboard_tuvwxyz::
|
||||
.string "{CLEAR 12}t{CLEAR 6}u{CLEAR 6}v{CLEAR 26}w{CLEAR 6}x{CLEAR 6}y{CLEAR 6}z{CLEAR 26} $"
|
||||
|
||||
gText_NamingScreenKeyboard_ABCDEF::
|
||||
.string "{CLEAR 11}A{CLEAR 6}B{CLEAR 6}C{CLEAR 26}D{CLEAR 6}E{CLEAR 6}F{CLEAR 6} {CLEAR 26}.$"
|
||||
|
||||
gText_NamingScreenKeyboard_GHIJKL::
|
||||
.string "{CLEAR 11}G{CLEAR 6}H{CLEAR 6}I{CLEAR 26}J{CLEAR 6}K{CLEAR 6}L{CLEAR 6} {CLEAR 26},$"
|
||||
|
||||
gText_NamingScreenKeyboard_MNOPQRS::
|
||||
.string "{CLEAR 11}M{CLEAR 6}N{CLEAR 6}O{CLEAR 26}P{CLEAR 6}Q{CLEAR 6}R{CLEAR 6}S{CLEAR 26} $"
|
||||
|
||||
gText_NamingScreenKeyboard_TUVWXYZ::
|
||||
.string "{CLEAR 11}T{CLEAR 6}U{CLEAR 6}V{CLEAR 26}W{CLEAR 6}X{CLEAR 6}Y{CLEAR 6}Z{CLEAR 26} $"
|
||||
|
||||
gText_NamingScreenKeyboard_01234::
|
||||
.string "{CLEAR 11}0{CLEAR 16}1{CLEAR 16}2{CLEAR 16}3{CLEAR 16}4{CLEAR 16} $"
|
||||
|
||||
gText_NamingScreenKeyboard_56789::
|
||||
.string "{CLEAR 11}5{CLEAR 16}6{CLEAR 16}7{CLEAR 16}8{CLEAR 16}9{CLEAR 16} $"
|
||||
|
||||
gText_NamingScreenKeyboard_Symbols1::
|
||||
.string "{CLEAR 11}!{CLEAR 16}?{CLEAR 16}♂{CLEAR 16}♀{CLEAR 16}/{CLEAR 16}-$"
|
||||
|
||||
gText_NamingScreenKeyboard_Symbols2::
|
||||
.string "{CLEAR 11}…{CLEAR 16}“{CLEAR 16}”{CLEAR 18}‘{CLEAR 18}'{CLEAR 18} $"
|
||||
|
||||
// union_room_chat
|
||||
|
||||
gText_UnionRoomChatKeyboard_ABCDE::
|
||||
.string "ABCDE$"
|
||||
|
||||
gText_UnionRoomChatKeyboard_FGHIJ::
|
||||
.string "FGHIJ$"
|
||||
|
||||
gText_UnionRoomChatKeyboard_KLMNO::
|
||||
.string "KLMNO$"
|
||||
|
||||
gText_UnionRoomChatKeyboard_PQRST::
|
||||
.string "PQRST$"
|
||||
|
||||
gText_UnionRoomChatKeyboard_UVWXY::
|
||||
.string "UVWXY$"
|
||||
|
||||
gText_UnionRoomChatKeyboard_Z::
|
||||
.string "Z $"
|
||||
|
||||
gText_UnionRoomChatKeyboard_01234Upper::
|
||||
.string "01234$"
|
||||
|
||||
gText_UnionRoomChatKeyboard_56789Upper::
|
||||
.string "56789$"
|
||||
|
||||
gText_UnionRoomChatKeyboard_PunctuationUpper::
|
||||
.string ".,!? $"
|
||||
|
||||
gText_UnionRoomChatKeyboard_SymbolsUpper::
|
||||
.string "-/&… $"
|
||||
|
||||
gText_UnionRoomChatKeyboard_abcde::
|
||||
.string "abcde$"
|
||||
|
||||
gText_UnionRoomChatKeyboard_fghij::
|
||||
.string "fghij$"
|
||||
|
||||
gText_UnionRoomChatKeyboard_klmno::
|
||||
.string "klmno$"
|
||||
|
||||
gText_UnionRoomChatKeyboard_pqrst::
|
||||
.string "pqrst$"
|
||||
|
||||
gText_UnionRoomChatKeyboard_uvwxy::
|
||||
.string "uvwxy$"
|
||||
|
||||
gText_UnionRoomChatKeyboard_z::
|
||||
.string "z $"
|
||||
|
||||
gText_UnionRoomChatKeyboard_01234Lower::
|
||||
.string "01234$"
|
||||
|
||||
gText_UnionRoomChatKeyboard_56789Lower::
|
||||
.string "56789$"
|
||||
|
||||
gText_UnionRoomChatKeyboard_PunctuationLower::
|
||||
.string ".,!? $"
|
||||
|
||||
gText_UnionRoomChatKeyboard_SymbolsLower::
|
||||
.string "-/&… $"
|
||||
|
||||
.string "$"
|
||||
.string "$"
|
||||
.string "$"
|
||||
.string "$"
|
||||
.string "$"
|
||||
.string "$"
|
||||
.string "$"
|
||||
.string "$"
|
||||
|
||||
gText_UnionRoomChatKeyboard_Emoji1::
|
||||
.string "{EXTRA 245}{EXTRA 246}{EXTRA 247}{EXTRA 248}{EXTRA 254}$"
|
||||
|
||||
gText_UnionRoomChatKeyboard_Emoji2::
|
||||
.string "{EXTRA 249}{EXTRA 250}{EXTRA 252}{EXTRA 251}{EXTRA 253}$"
|
||||
|
||||
gText_UnionRoomChatKeyboard_Emoji3::
|
||||
.string "{EXTRA 236}{EXTRA 237}{EXTRA 238}{EXTRA 235}{EXTRA 234}$"
|
||||
|
||||
gText_UnionRoomChatKeyboard_Emoji4::
|
||||
.string "♂♀{EXTRA 212}{EXTRA 213}{EXTRA 211}$"
|
||||
|
||||
gText_UnionRoomChatKeyboard_Emoji5::
|
||||
.string "{EXTRA 216}{EXTRA 217}{EXTRA 242}{EXTRA 243}{EXTRA 244}$"
|
||||
|
||||
gText_UnionRoomChatKeyboard_Emoji6::
|
||||
.string "{EXTRA 218}{EXTRA 241}{EXTRA 224}{EXTRA 226}{EXTRA 227}$"
|
||||
|
||||
gText_UnionRoomChatKeyboard_Emoji7::
|
||||
.string "{EXTRA 240}{EXTRA 239}{EXTRA 225}{EXTRA 214}{EXTRA 215}$"
|
||||
|
||||
gText_UnionRoomChatKeyboard_Emoji8::
|
||||
.string "{EXTRA 228}{EXTRA 229}{EXTRA 230}{EXTRA 231}{EXTRA 232}$"
|
||||
|
||||
gText_UnionRoomChatKeyboard_Emoji9::
|
||||
.string "{EXTRA 233}{EXTRA 220}{EXTRA 221}{EXTRA 222}{EXTRA 209}$"
|
||||
|
||||
gText_UnionRoomChatKeyboard_Emoji10::
|
||||
.string "{EXTRA 210}{EXTRA 208}ょ: $"
|
||||
|
||||
@ 847ABAC
|
||||
.align 2
|
||||
.include "data/trainer_tower/trainers.inc"
|
||||
|
||||
@@ -591,6 +591,7 @@ SECTIONS {
|
||||
src/trainer_tower.o(.rodata);
|
||||
src/minigame_countdown.o(.rodata);
|
||||
src/berry_fix_program.o(.rodata);
|
||||
src/keyboard_text.o(.rodata);
|
||||
data/data_8479668.o(.rodata);
|
||||
|
||||
/* These should not be moved to C files */
|
||||
|
||||
@@ -0,0 +1,61 @@
|
||||
#include "global.h"
|
||||
|
||||
// easy_chat_2
|
||||
const u8 gUnknown_847A8D8[] = _("{CLEAR 11}A{CLEAR 6}B{CLEAR 6}C{CLEAR 26}D{CLEAR 6}E{CLEAR 6}F{CLEAR 26}others");
|
||||
const u8 gUnknown_847A8FA[] = _("{CLEAR 11}G{CLEAR 6}H{CLEAR 6}I{CLEAR 26}J{CLEAR 6}K{CLEAR 6}L");
|
||||
const u8 gUnknown_847A913[] = _("{CLEAR 11}M{CLEAR 6}N{CLEAR 6}O{CLEAR 26}P{CLEAR 6}Q{CLEAR 6}R{CLEAR 6}S{CLEAR 26} ");
|
||||
const u8 gUnknown_847A934[] = _("{CLEAR 11}T{CLEAR 6}U{CLEAR 6}V{CLEAR 26}W{CLEAR 6}X{CLEAR 6}Y{CLEAR 6}Z{CLEAR 26} ");
|
||||
|
||||
// naming_screen
|
||||
const u8 gText_NamingScreenKeyboard_abcdef[] = _("{CLEAR 11}a{CLEAR 6}b{CLEAR 6}c{CLEAR 26}d{CLEAR 6}e{CLEAR 6}f{CLEAR 6} {CLEAR 26}.");
|
||||
const u8 gText_NamingScreenKeyboard_ghijkl[] = _("{CLEAR 11}g{CLEAR 6}h{CLEAR 7}i{CLEAR 27}j{CLEAR 6}k{CLEAR 6}l{CLEAR 7} {CLEAR 26},");
|
||||
const u8 gText_NamingScreenKeyboard_mnopqrs[] = _("{CLEAR 11}m{CLEAR 6}n{CLEAR 7}o{CLEAR 26}p{CLEAR 6}q{CLEAR 7}r{CLEAR 6}s{CLEAR 27} ");
|
||||
const u8 gText_NamingScreenKeyboard_tuvwxyz[] = _("{CLEAR 12}t{CLEAR 6}u{CLEAR 6}v{CLEAR 26}w{CLEAR 6}x{CLEAR 6}y{CLEAR 6}z{CLEAR 26} ");
|
||||
const u8 gText_NamingScreenKeyboard_ABCDEF[] = _("{CLEAR 11}A{CLEAR 6}B{CLEAR 6}C{CLEAR 26}D{CLEAR 6}E{CLEAR 6}F{CLEAR 6} {CLEAR 26}.");
|
||||
const u8 gText_NamingScreenKeyboard_GHIJKL[] = _("{CLEAR 11}G{CLEAR 6}H{CLEAR 6}I{CLEAR 26}J{CLEAR 6}K{CLEAR 6}L{CLEAR 6} {CLEAR 26},");
|
||||
const u8 gText_NamingScreenKeyboard_MNOPQRS[] = _("{CLEAR 11}M{CLEAR 6}N{CLEAR 6}O{CLEAR 26}P{CLEAR 6}Q{CLEAR 6}R{CLEAR 6}S{CLEAR 26} ");
|
||||
const u8 gText_NamingScreenKeyboard_TUVWXYZ[] = _("{CLEAR 11}T{CLEAR 6}U{CLEAR 6}V{CLEAR 26}W{CLEAR 6}X{CLEAR 6}Y{CLEAR 6}Z{CLEAR 26} ");
|
||||
const u8 gText_NamingScreenKeyboard_01234[] = _("{CLEAR 11}0{CLEAR 16}1{CLEAR 16}2{CLEAR 16}3{CLEAR 16}4{CLEAR 16} ");
|
||||
const u8 gText_NamingScreenKeyboard_56789[] = _("{CLEAR 11}5{CLEAR 16}6{CLEAR 16}7{CLEAR 16}8{CLEAR 16}9{CLEAR 16} ");
|
||||
const u8 gText_NamingScreenKeyboard_Symbols1[] = _("{CLEAR 11}!{CLEAR 16}?{CLEAR 16}♂{CLEAR 16}♀{CLEAR 16}/{CLEAR 16}-");
|
||||
const u8 gText_NamingScreenKeyboard_Symbols2[] = _("{CLEAR 11}…{CLEAR 16}“{CLEAR 16}”{CLEAR 18}‘{CLEAR 18}'{CLEAR 18} ");
|
||||
|
||||
// union_room_chat
|
||||
const u8 gText_UnionRoomChatKeyboard_ABCDE[] = _("ABCDE");
|
||||
const u8 gText_UnionRoomChatKeyboard_FGHIJ[] = _("FGHIJ");
|
||||
const u8 gText_UnionRoomChatKeyboard_KLMNO[] = _("KLMNO");
|
||||
const u8 gText_UnionRoomChatKeyboard_PQRST[] = _("PQRST");
|
||||
const u8 gText_UnionRoomChatKeyboard_UVWXY[] = _("UVWXY");
|
||||
const u8 gText_UnionRoomChatKeyboard_Z[] = _("Z ");
|
||||
const u8 gText_UnionRoomChatKeyboard_01234Upper[] = _("01234");
|
||||
const u8 gText_UnionRoomChatKeyboard_56789Upper[] = _("56789");
|
||||
const u8 gText_UnionRoomChatKeyboard_PunctuationUpper[] = _(".,!? ");
|
||||
const u8 gText_UnionRoomChatKeyboard_SymbolsUpper[] = _("-/&… ");
|
||||
const u8 gText_UnionRoomChatKeyboard_abcde[] = _("abcde");
|
||||
const u8 gText_UnionRoomChatKeyboard_fghij[] = _("fghij");
|
||||
const u8 gText_UnionRoomChatKeyboard_klmno[] = _("klmno");
|
||||
const u8 gText_UnionRoomChatKeyboard_pqrst[] = _("pqrst");
|
||||
const u8 gText_UnionRoomChatKeyboard_uvwxy[] = _("uvwxy");
|
||||
const u8 gText_UnionRoomChatKeyboard_z[] = _("z ");
|
||||
const u8 gText_UnionRoomChatKeyboard_01234Lower[] = _("01234");
|
||||
const u8 gText_UnionRoomChatKeyboard_56789Lower[] = _("56789");
|
||||
const u8 gText_UnionRoomChatKeyboard_PunctuationLower[] = _(".,!? ");
|
||||
const u8 gText_UnionRoomChatKeyboard_SymbolsLower[] = _("-/&… ");
|
||||
const u8 gText_BlankString_847AB39[] = _("");
|
||||
const u8 gText_BlankString_847AB3A[] = _("");
|
||||
const u8 gText_BlankString_847AB3B[] = _("");
|
||||
const u8 gText_BlankString_847AB3C[] = _("");
|
||||
const u8 gText_BlankString_847AB3D[] = _("");
|
||||
const u8 gText_BlankString_847AB3E[] = _("");
|
||||
const u8 gText_BlankString_847AB3F[] = _("");
|
||||
const u8 gText_BlankString_847AB40[] = _("");
|
||||
const u8 gText_UnionRoomChatKeyboard_Emoji1[] = _("{EXTRA 245}{EXTRA 246}{EXTRA 247}{EXTRA 248}{EXTRA 254}");
|
||||
const u8 gText_UnionRoomChatKeyboard_Emoji2[] = _("{EXTRA 249}{EXTRA 250}{EXTRA 252}{EXTRA 251}{EXTRA 253}");
|
||||
const u8 gText_UnionRoomChatKeyboard_Emoji3[] = _("{EXTRA 236}{EXTRA 237}{EXTRA 238}{EXTRA 235}{EXTRA 234}");
|
||||
const u8 gText_UnionRoomChatKeyboard_Emoji4[] = _("♂♀{EXTRA 212}{EXTRA 213}{EXTRA 211}");
|
||||
const u8 gText_UnionRoomChatKeyboard_Emoji5[] = _("{EXTRA 216}{EXTRA 217}{EXTRA 242}{EXTRA 243}{EXTRA 244}");
|
||||
const u8 gText_UnionRoomChatKeyboard_Emoji6[] = _("{EXTRA 218}{EXTRA 241}{EXTRA 224}{EXTRA 226}{EXTRA 227}");
|
||||
const u8 gText_UnionRoomChatKeyboard_Emoji7[] = _("{EXTRA 240}{EXTRA 239}{EXTRA 225}{EXTRA 214}{EXTRA 215}");
|
||||
const u8 gText_UnionRoomChatKeyboard_Emoji8[] = _("{EXTRA 228}{EXTRA 229}{EXTRA 230}{EXTRA 231}{EXTRA 232}");
|
||||
const u8 gText_UnionRoomChatKeyboard_Emoji9[] = _("{EXTRA 233}{EXTRA 220}{EXTRA 221}{EXTRA 222}{EXTRA 209}");
|
||||
const u8 gText_UnionRoomChatKeyboard_Emoji10[] = _("{EXTRA 210}{EXTRA 208}ょ: ");
|
||||
+31
-30
@@ -81,7 +81,8 @@ struct NamingScreenTemplate
|
||||
const u8 *title;
|
||||
};
|
||||
|
||||
struct NamingScreenData {
|
||||
struct NamingScreenData
|
||||
{
|
||||
/*0x0*/ u8 tilemapBuffer1[0x800];
|
||||
/*0x800*/ u8 tilemapBuffer2[0x800];
|
||||
/*0x800*/ u8 tilemapBuffer3[0x800];
|
||||
@@ -111,7 +112,7 @@ struct NamingScreenData {
|
||||
|
||||
static EWRAM_DATA struct NamingScreenData * gNamingScreenData = NULL;
|
||||
|
||||
static void C2_NamingScreen(void);
|
||||
static void CB2_NamingScreen(void);
|
||||
static void NamingScreen_Init(void);
|
||||
static void NamingScreen_InitBGs(void);
|
||||
static void sub_809DD60(void);
|
||||
@@ -146,10 +147,10 @@ static void sub_809E898(void);
|
||||
static void CursorInit(void);
|
||||
static void SetCursorPos(s16 x, s16 y);
|
||||
static void GetCursorPos(s16 *xP, s16 *yP);
|
||||
static void MoveCursorToOKButton();
|
||||
static void MoveCursorToOKButton(void);
|
||||
static void sub_809EA0C(u8 a0);
|
||||
static void sub_809EA64(u8 a0);
|
||||
static bool8 IsCursorAnimFinished();
|
||||
static bool8 IsCursorAnimFinished(void);
|
||||
static u8 GetCurrentPageColumnCount(void);
|
||||
static void CreatePageSwitcherSprites(void);
|
||||
static void sub_809EC20(void);
|
||||
@@ -393,11 +394,11 @@ void DoNamingScreen(u8 templateNum, u8 *destBuffer, u16 monSpecies, u16 monGende
|
||||
if (templateNum == 0)
|
||||
StartTimer1();
|
||||
|
||||
SetMainCallback2(C2_NamingScreen);
|
||||
SetMainCallback2(CB2_NamingScreen);
|
||||
}
|
||||
}
|
||||
|
||||
static void C2_NamingScreen(void)
|
||||
static void CB2_NamingScreen(void)
|
||||
{
|
||||
switch (gMain.state)
|
||||
{
|
||||
@@ -1496,13 +1497,13 @@ static void InputState_Enabled(struct Task *task)
|
||||
{
|
||||
task->tKeyboardEvent = 0;
|
||||
|
||||
if (gMain.newKeys & A_BUTTON)
|
||||
if (JOY_NEW(A_BUTTON))
|
||||
task->tKeyboardEvent = KBEVENT_PRESSED_A;
|
||||
else if (gMain.newKeys & B_BUTTON)
|
||||
else if (JOY_NEW(B_BUTTON))
|
||||
task->tKeyboardEvent = KBEVENT_PRESSED_B;
|
||||
else if (gMain.newKeys & SELECT_BUTTON)
|
||||
else if (JOY_NEW(SELECT_BUTTON))
|
||||
task->tKeyboardEvent = KBEVENT_PRESSED_SELECT;
|
||||
else if (gMain.newKeys & START_BUTTON)
|
||||
else if (JOY_NEW(START_BUTTON))
|
||||
task->tKeyboardEvent = KBEVENT_PRESSED_START;
|
||||
else
|
||||
HandleDpadMovement(task);
|
||||
@@ -1536,13 +1537,13 @@ static void HandleDpadMovement(struct Task *task)
|
||||
|
||||
GetCursorPos(&cursorX, &cursorY);
|
||||
dpadDir = 0;
|
||||
if (gMain.newAndRepeatedKeys & DPAD_UP)
|
||||
if (JOY_REPT(DPAD_UP))
|
||||
dpadDir = 1;
|
||||
if (gMain.newAndRepeatedKeys & DPAD_DOWN)
|
||||
if (JOY_REPT(DPAD_DOWN))
|
||||
dpadDir = 2;
|
||||
if (gMain.newAndRepeatedKeys & DPAD_LEFT)
|
||||
if (JOY_REPT(DPAD_LEFT))
|
||||
dpadDir = 3;
|
||||
if (gMain.newAndRepeatedKeys & DPAD_RIGHT)
|
||||
if (JOY_REPT(DPAD_RIGHT))
|
||||
dpadDir = 4;
|
||||
|
||||
//Get new cursor position
|
||||
@@ -1648,14 +1649,14 @@ static void AddGenderIconFunc_No(void)
|
||||
}
|
||||
|
||||
static const u8 sGenderColors[2][3] = {
|
||||
{TEXT_COLOR_TRANSPARENT, TEXT_COLOR_LIGHT_BLUE, TEXT_COLOR_BLUE},
|
||||
{TEXT_COLOR_TRANSPARENT, TEXT_COLOR_LIGHT_RED, TEXT_COLOR_RED}
|
||||
[MALE] = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_LIGHT_BLUE, TEXT_COLOR_BLUE},
|
||||
[FEMALE] = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_LIGHT_RED, TEXT_COLOR_RED}
|
||||
};
|
||||
|
||||
static void AddGenderIconFunc_Yes(void)
|
||||
{
|
||||
u8 genderSymbol[2];
|
||||
bool8 isFemale = FALSE;
|
||||
bool8 gender = MALE;
|
||||
|
||||
StringCopy(genderSymbol, gText_MaleSymbol);
|
||||
|
||||
@@ -1664,9 +1665,9 @@ static void AddGenderIconFunc_Yes(void)
|
||||
if (gNamingScreenData->monGender == MON_FEMALE)
|
||||
{
|
||||
StringCopy(genderSymbol, gText_FemaleSymbol);
|
||||
isFemale = TRUE;
|
||||
gender = FEMALE;
|
||||
}
|
||||
AddTextPrinterParameterized3(gNamingScreenData->windows[2], 2, 0x68, 1, sGenderColors[isFemale], TEXT_SPEED_FF, genderSymbol);
|
||||
AddTextPrinterParameterized3(gNamingScreenData->windows[2], 2, 0x68, 1, sGenderColors[gender], TEXT_SPEED_FF, genderSymbol);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1974,7 +1975,7 @@ static void Debug_DoNamingScreen_Rival(void)
|
||||
// Forward-declared variables
|
||||
//--------------------------------------------------
|
||||
|
||||
static const struct NamingScreenTemplate playerNamingScreenTemplate = {
|
||||
static const struct NamingScreenTemplate sPlayerNamingScreenTemplate = {
|
||||
.copyExistingString = FALSE,
|
||||
.maxChars = PLAYER_NAME_LENGTH,
|
||||
.iconFunction = 1,
|
||||
@@ -1983,7 +1984,7 @@ static const struct NamingScreenTemplate playerNamingScreenTemplate = {
|
||||
.title = gText_YourName,
|
||||
};
|
||||
|
||||
static const struct NamingScreenTemplate pcBoxNamingTemplate = {
|
||||
static const struct NamingScreenTemplate sPcBoxNamingScreenTemplate = {
|
||||
.copyExistingString = FALSE,
|
||||
.maxChars = 8/*BOX_NAME_LENGTH*/,
|
||||
.iconFunction = 2,
|
||||
@@ -1992,7 +1993,7 @@ static const struct NamingScreenTemplate pcBoxNamingTemplate = {
|
||||
.title = gText_BoxName,
|
||||
};
|
||||
|
||||
static const struct NamingScreenTemplate monNamingScreenTemplate = {
|
||||
static const struct NamingScreenTemplate sMonNamingScreenTemplate = {
|
||||
.copyExistingString = FALSE,
|
||||
.maxChars = POKEMON_NAME_LENGTH,
|
||||
.iconFunction = 3,
|
||||
@@ -2001,7 +2002,7 @@ static const struct NamingScreenTemplate monNamingScreenTemplate = {
|
||||
.title = gText_PkmnsNickname,
|
||||
};
|
||||
|
||||
static const struct NamingScreenTemplate rivalNamingScreenTemplate = {
|
||||
static const struct NamingScreenTemplate sRivalNamingScreenTemplate = {
|
||||
.copyExistingString = FALSE,
|
||||
.maxChars = OT_NAME_LENGTH,
|
||||
.iconFunction = 4,
|
||||
@@ -2011,11 +2012,11 @@ static const struct NamingScreenTemplate rivalNamingScreenTemplate = {
|
||||
};
|
||||
|
||||
static const struct NamingScreenTemplate *const sNamingScreenTemplates[] = {
|
||||
&playerNamingScreenTemplate,
|
||||
&pcBoxNamingTemplate,
|
||||
&monNamingScreenTemplate,
|
||||
&monNamingScreenTemplate,
|
||||
&rivalNamingScreenTemplate,
|
||||
&sPlayerNamingScreenTemplate,
|
||||
&sPcBoxNamingScreenTemplate,
|
||||
&sMonNamingScreenTemplate,
|
||||
&sMonNamingScreenTemplate,
|
||||
&sRivalNamingScreenTemplate,
|
||||
};
|
||||
|
||||
static const struct OamData gOamData_858BFEC = {
|
||||
@@ -2384,7 +2385,7 @@ static const struct SpriteSheet gUnknown_83E267C[] = {
|
||||
{gUnknown_8E98F38, 0x080, 0x0009},
|
||||
{gUnknown_8E990D8, 0x020, 0x000A},
|
||||
{gUnknown_8E990F8, 0x020, 0x000B},
|
||||
{NULL}
|
||||
{} // terminator
|
||||
};
|
||||
|
||||
static const struct SpritePalette gUnknown_83E26E4[] = {
|
||||
@@ -2396,5 +2397,5 @@ static const struct SpritePalette gUnknown_83E26E4[] = {
|
||||
{gNamingScreenMenu_Pal + 0x50, 0x0005},
|
||||
{gNamingScreenMenu_Pal + 0x40, 0x0006},
|
||||
{gNamingScreenMenu_Pal + 0x40, 0x0007},
|
||||
{NULL}
|
||||
{} // terminator
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user