diff options
| author | YamaArashi <shadow962@live.com> | 2016-06-05 15:47:57 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2016-06-05 15:47:57 -0700 |
| commit | 255cd5afad496b1ad57a467483edaf06dd18193a (patch) | |
| tree | bf0faf52fe5d4d9985e6b24b8a25a416f5623efe | |
| parent | c254a2ea8a3027ac26c8369e466663d3e33b60dd (diff) | |
kun/chan
| -rw-r--r-- | charmap.txt | 2 | ||||
| -rw-r--r-- | data/data2.s | 8 | ||||
| -rw-r--r-- | src/string_util.c | 14 |
3 files changed, 12 insertions, 12 deletions
diff --git a/charmap.txt b/charmap.txt index 4993f8d9d..2e7c0a9a3 100644 --- a/charmap.txt +++ b/charmap.txt @@ -325,7 +325,7 @@ PLAYER = FD 01 STR_VAR_1 = FD 02 STR_VAR_2 = FD 03 STR_VAR_3 = FD 04 -@ unknown (FD 05) +KUN_CHAN = FD 05 RIVAL = FD 06 @ version-dependent strings VERSION = FD 07 @ "RUBY" / "SAPPHIRE" diff --git a/data/data2.s b/data/data2.s index 4e171b5ce..044e694d6 100644 --- a/data/data2.s +++ b/data/data2.s @@ -8430,12 +8430,12 @@ gUnknown_0840D288: @ 840D288 gExpandedPlaceholder_Empty: @ 840DC80 .string "$" - .global gExpandedPlaceholder_MaleEmpty -gExpandedPlaceholder_MaleEmpty: @ 840DC81 + .global gExpandedPlaceholder_Kun +gExpandedPlaceholder_Kun: @ 840DC81 .string "$" - .global gExpandedPlaceholder_FemaleEmpty -gExpandedPlaceholder_FemaleEmpty: @ 840DC82 + .global gExpandedPlaceholder_Chan +gExpandedPlaceholder_Chan: @ 840DC82 .string "$" .global gExpandedPlaceholder_Sapphire diff --git a/src/string_util.c b/src/string_util.c index 514e7031f..cbcaff766 100644 --- a/src/string_util.c +++ b/src/string_util.c @@ -9,7 +9,7 @@ static u8 *ExpandPlaceholder_PlayerName(void); static u8 *ExpandPlaceholder_StringVar1(void); static u8 *ExpandPlaceholder_StringVar2(void); static u8 *ExpandPlaceholder_StringVar3(void); -static u8 *ExpandPlaceholder_UnknownString(void); +static u8 *ExpandPlaceholder_KunChan(void); static u8 *ExpandPlaceholder_RivalName(void); static u8 *ExpandPlaceholder_Version(void); static u8 *ExpandPlaceholder_EvilTeam(void); @@ -52,7 +52,7 @@ static const ExpandPlaceholderFunc sExpandPlaceholderFuncs[] = ExpandPlaceholder_StringVar1, ExpandPlaceholder_StringVar2, ExpandPlaceholder_StringVar3, - ExpandPlaceholder_UnknownString, + ExpandPlaceholder_KunChan, ExpandPlaceholder_RivalName, ExpandPlaceholder_Version, ExpandPlaceholder_EvilTeam, @@ -64,8 +64,8 @@ static const ExpandPlaceholderFunc sExpandPlaceholderFuncs[] = }; extern u8 gExpandedPlaceholder_Empty[]; -extern u8 gExpandedPlaceholder_MaleEmpty[]; -extern u8 gExpandedPlaceholder_FemaleEmpty[]; +extern u8 gExpandedPlaceholder_Kun[]; +extern u8 gExpandedPlaceholder_Chan[]; extern u8 gExpandedPlaceholder_Sapphire[]; extern u8 gExpandedPlaceholder_Ruby[]; extern u8 gExpandedPlaceholder_Aqua[]; @@ -498,12 +498,12 @@ u8 *ExpandPlaceholder_StringVar3(void) return gStringVar3; } -u8 *ExpandPlaceholder_UnknownString(void) +u8 *ExpandPlaceholder_KunChan(void) { if (gSaveBlock2.playerGender == MALE) - return gExpandedPlaceholder_MaleEmpty; + return gExpandedPlaceholder_Kun; else - return gExpandedPlaceholder_FemaleEmpty; + return gExpandedPlaceholder_Chan; } u8 *ExpandPlaceholder_RivalName(void) |