dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #823 from GriffinRichards/constants-strconv

Browse Source 
Use STR_CONV constants
This commit is contained in:
PikalaxALT
2019-10-02 09:18:48 -04:00
committed by GitHub
parent 301822603e c5cb45991b
commit 9317d114a9
21 changed files with 108 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/match_call.c
+5 -5
View File
@@ -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,8 +1976,8 @@ 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, gBirchDexRatingText_AreYouCurious);
str[0] = CHAR_PROMPT_CLEAR;
@@ -1994,8 +1994,8 @@ 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);
ConvertIntToDecimalStringN(gStringVar1, numSeen, STR_CONV_MODE_LEFT_ALIGN, 3);
ConvertIntToDecimalStringN(gStringVar2, numCaught, STR_CONV_MODE_LEFT_ALIGN, 3);
StringExpandPlaceholders(str, gBirchDexRatingText_OnANationwideBasis);
}