diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2017-09-17 23:42:43 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-17 23:42:43 -0400 |
| commit | abe72dca47f73231e45f778e6ceafe2e3b7f4158 (patch) | |
| tree | c3e4c4594198930a6adcadd9c6fd7d55bd330979 /src | |
| parent | 16f2e40576b29fd85366305b4165da3aff4aef0e (diff) | |
| parent | 74bda5b68088f08220cf3f1b9791e5900a6a9877 (diff) | |
Merge branch 'master' into sub_81700F8
Diffstat (limited to 'src')
| -rw-r--r-- | src/coins.c | 4 | ||||
| -rw-r--r-- | src/pokemon_2.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/coins.c b/src/coins.c index f43b5b336..84a79f5f2 100644 --- a/src/coins.c +++ b/src/coins.c @@ -14,14 +14,14 @@ extern void SetWindowTemplateFields(struct WindowTemplate* template, u8 priority extern void SetWindowBorderStyle(u8 windowId, bool8 copyToVram, s16 tileStart, s8 palette); extern void sub_819746C(u8 windowId, bool8 copyToVram); -extern const u8 gOtherText_Coins2[]; +extern const u8 gText_Coins[]; void PrintCoinsString(u32 coinAmount) { u32 xAlign; ConvertIntToDecimalStringN(gStringVar1, coinAmount, STR_CONV_MODE_RIGHT_ALIGN, 4); - StringExpandPlaceholders(gStringVar4, gOtherText_Coins2); + StringExpandPlaceholders(gStringVar4, gText_Coins); xAlign = GetStringRightAlignXOffset(1, gStringVar4, 0x40); PrintTextOnWindow(sCoinsWindowId, 1, gStringVar4, xAlign, 1, 0, NULL); diff --git a/src/pokemon_2.c b/src/pokemon_2.c index 9549a6dcd..30e788874 100644 --- a/src/pokemon_2.c +++ b/src/pokemon_2.c @@ -32,7 +32,7 @@ extern const union AnimCmd* const * const gUnknown_08309AAC[]; extern const union AnimCmd* const * const gUnknown_08305D0C[]; extern const union AnimCmd* const * const gUnknown_0830536C[]; extern const u8 gBadEggNickname[]; -extern const u8 gEggNickname[]; +extern const u8 gText_EggNickname[]; extern u8 GetBankSide(u8 bank); extern u8 GetBankByPlayerAI(u8 bank); @@ -416,7 +416,7 @@ u32 GetBoxMonData(struct BoxPokemon *boxMon, s32 field, u8 *data) } else if (boxMon->isEgg) { - StringCopy(data, gEggNickname); + StringCopy(data, gText_EggNickname); retVal = StringLength(data); } else if (boxMon->language == LANGUAGE_JAPANESE) |