diff options
Diffstat (limited to 'src/match_call.c')
| -rw-r--r-- | src/match_call.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/match_call.c b/src/match_call.c index 4b0134d2c..646b14cea 100644 --- a/src/match_call.c +++ b/src/match_call.c @@ -1,5 +1,5 @@ #include "global.h" -#include "alloc.h" +#include "malloc.h" #include "battle.h" #include "battle_setup.h" #include "bg.h" @@ -965,9 +965,9 @@ static const struct MatchCallText *const sMatchCallGeneralTopics[] = sMatchCallBattlePyramidTexts, }; -extern const u8 gUnknown_082A5C9C[]; -extern const u8 gUnknown_082A5D2C[]; -extern const u8 gUnknown_082A633D[]; +extern const u8 gBirchDexRatingText_AreYouCurious[]; +extern const u8 gBirchDexRatingText_SoYouveSeenAndCaught[]; +extern const u8 gBirchDexRatingText_OnANationwideBasis[]; void InitMatchCallCounters(void) { @@ -1743,7 +1743,7 @@ static void PopulateBattleFrontierStreak(int matchCallId, u8 *destStr) i++; } - ConvertIntToDecimalStringN(destStr, gBattleFrontierStreakInfo.streak, 0, i); + ConvertIntToDecimalStringN(destStr, gBattleFrontierStreakInfo.streak, STR_CONV_MODE_LEFT_ALIGN, i); } static const u16 sBadgeFlags[] = @@ -1976,13 +1976,13 @@ void sub_8197080(u8 *destStr) numSeen = GetHoennPokedexCount(FLAG_GET_SEEN); numCaught = GetHoennPokedexCount(FLAG_GET_CAUGHT); - ConvertIntToDecimalStringN(gStringVar1, numSeen, 0, 3); - ConvertIntToDecimalStringN(gStringVar2, numCaught, 0, 3); + ConvertIntToDecimalStringN(gStringVar1, numSeen, STR_CONV_MODE_LEFT_ALIGN, 3); + ConvertIntToDecimalStringN(gStringVar2, numCaught, STR_CONV_MODE_LEFT_ALIGN, 3); dexRatingLevel = GetPokedexRatingLevel(numCaught); - str = StringCopy(buffer, gUnknown_082A5C9C); + str = StringCopy(buffer, gBirchDexRatingText_AreYouCurious); str[0] = CHAR_PROMPT_CLEAR; str++; - str = StringCopy(str, gUnknown_082A5D2C); + str = StringCopy(str, gBirchDexRatingText_SoYouveSeenAndCaught); str[0] = CHAR_PROMPT_CLEAR; str++; StringCopy(str, sBirchDexRatingTexts[dexRatingLevel]); @@ -1994,9 +1994,9 @@ void sub_8197080(u8 *destStr) str++; numSeen = GetNationalPokedexCount(FLAG_GET_SEEN); numCaught = GetNationalPokedexCount(FLAG_GET_CAUGHT); - ConvertIntToDecimalStringN(gStringVar1, numSeen, 0, 3); - ConvertIntToDecimalStringN(gStringVar2, numCaught, 0, 3); - StringExpandPlaceholders(str, gUnknown_082A633D); + ConvertIntToDecimalStringN(gStringVar1, numSeen, STR_CONV_MODE_LEFT_ALIGN, 3); + ConvertIntToDecimalStringN(gStringVar2, numCaught, STR_CONV_MODE_LEFT_ALIGN, 3); + StringExpandPlaceholders(str, gBirchDexRatingText_OnANationwideBasis); } Free(buffer); |