ARG_NICKNAME_0

This commit is contained in:
Kermalis 2023-09-24 20:21:13 -04:00
parent e5dfd4f08a
commit 90a51e6ef6
4 changed files with 6 additions and 7 deletions

View File

@ -277,6 +277,7 @@ ARG_POKEMON_5 = 24 6D 35 @ $m5
ARG_POKEMON_6 = 24 6D 36 @ $m6
ARG_POKEMON_7 = 24 6D 37 @ $m7
ARG_POKEMON_8 = 24 6D 38 @ $m8
ARG_NICKNAME_0 = 24 6E 30 @ $n0
@ TEXT MACROS
@

View File

@ -316,13 +316,13 @@ gUnknown_81163E4: @ 81163E4
.global gUnknown_81163F0
gUnknown_81163F0: @ 81163F0
.string "{CENTER_ALIGN}However{COMMA} $n0{APOSTROPHE}s team\n"
.string "{CENTER_ALIGN}However{COMMA} {ARG_NICKNAME_0}{APOSTROPHE}s team\n"
.string "{CENTER_ALIGN}had too much money already...\0"
.align 2,0
.global gUnknown_811642C
gUnknown_811642C: @ 811642C
.string "{CENTER_ALIGN}However{COMMA} $n0{APOSTROPHE}s team\n"
.string "{CENTER_ALIGN}However{COMMA} {ARG_NICKNAME_0}{APOSTROPHE}s team\n"
.string "{CENTER_ALIGN}had too many items already...\0"
.align 2,0
.string "pksdir0\0"

View File

@ -1,7 +1,5 @@
ALIGNED(4) static const u8 sFill[] = _("pksdir0");
// TODO: Add "$n0" to charmap
static const UnkTextStruct2 sUnknown_80DC9E8 = {
0, 0, 0, 0,
3,
@ -81,8 +79,8 @@ ALIGNED(4) static const u8 sLetUsBegin[] = _(
"{CENTER_ALIGN}Let us begin.");
ALIGNED(4) static const u8 sFmtChangedAppearance[] = _(
"{CENTER_ALIGN}...{WAIT_PRESS}$n0 is undergoing changes...{EXTRA_MSG}"
"{CENTER_ALIGN}$n0{APOSTROPHE}s appearance changed...{EXTRA_MSG}");
"{CENTER_ALIGN}...{WAIT_PRESS}{ARG_NICKNAME_0} is undergoing changes...{EXTRA_MSG}"
"{CENTER_ALIGN}{ARG_NICKNAME_0}{APOSTROPHE}s appearance changed...{EXTRA_MSG}");
ALIGNED(4) static const u8 sFmtEvolved[] = _(
"{CENTER_ALIGN}It evolved from {COLOR_1 GREEN}{ARG_POKEMON_0}{END_COLOR_TEXT_1}\n"

View File

@ -8,7 +8,7 @@ static const UnkTextStruct2 sUnknown_80E0760 = {
};
ALIGNED(4) static const u8 sReceivedBonslyDoll[] = _(
"{CENTER_ALIGN}{COLOR_1 YELLOW_5}$n0{END_COLOR_TEXT_1} received the {COLOR_1 GREEN_2}Bonsly Doll{END_COLOR_TEXT_1}!\n"
"{CENTER_ALIGN}{COLOR_1 YELLOW_5}{ARG_NICKNAME_0}{END_COLOR_TEXT_1} received the {COLOR_1 GREEN_2}Bonsly Doll{END_COLOR_TEXT_1}!\n"
"{CENTER_ALIGN}It has been placed outside your\n"
"{CENTER_ALIGN}rescue team base.");
ALIGNED(4) static const u8 sGoTrain[] = _("Go Train");