ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-28 22:33:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use STR_CONV constants

Browse Source
This commit is contained in:
GriffinR 2019-09-30 15:43:44 -04:00
parent 3d9bad5558
commit 5325835ee7
21 changed files with 99 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/battle_message.c
View File

@ -2759,7 +2759,7 @@ static void ExpandBattleTextBuffPlaceholders(const u8 *src, u8 *dst)
value = T1_READ_32(&src[srcID + 3]); value = T1_READ_32(&src[srcID + 3]);
break; break;
} }
ConvertIntToDecimalStringN(dst, value, 0, src[srcID + 2]); ConvertIntToDecimalStringN(dst, value, STR_CONV_MODE_LEFT_ALIGN, src[srcID + 2]);
srcID += src[srcID + 1] + 3; srcID += src[srcID + 1] + 3;
break; break;
case B_BUFF_MOVE: // move name case B_BUFF_MOVE: // move name

2
src/battle_script_commands.c
View File

@ -8524,7 +8524,7 @@ static void atkAD_tryspiteppreduce(void)
PREPARE_MOVE_BUFFER(gBattleTextBuff1, gLastMoves[gBattlerTarget]) PREPARE_MOVE_BUFFER(gBattleTextBuff1, gLastMoves[gBattlerTarget])
ConvertIntToDecimalStringN(gBattleTextBuff2, ppToDeduct, 0, 1); ConvertIntToDecimalStringN(gBattleTextBuff2, ppToDeduct, STR_CONV_MODE_LEFT_ALIGN, 1);
PREPARE_BYTE_NUMBER_BUFFER(gBattleTextBuff2, 1, ppToDeduct) PREPARE_BYTE_NUMBER_BUFFER(gBattleTextBuff2, 1, ppToDeduct)

6
src/berry_tag_screen.c
View File

@ -401,7 +401,7 @@ static void PrintAllBerryData(void)
static void PrintBerryNumberAndName(void) static void PrintBerryNumberAndName(void)
{ {
const struct Berry *berry = GetBerryInfo(sBerryTag->berryId); const struct Berry *berry = GetBerryInfo(sBerryTag->berryId);
ConvertIntToDecimalStringN(gStringVar1, sBerryTag->berryId, 2, 2); ConvertIntToDecimalStringN(gStringVar1, sBerryTag->berryId, STR_CONV_MODE_LEADING_ZEROS, 2);
StringCopy(gStringVar2, berry->name); StringCopy(gStringVar2, berry->name);
StringExpandPlaceholders(gStringVar4, gText_UnkF908Var1Var2); StringExpandPlaceholders(gStringVar4, gText_UnkF908Var1Var2);
PrintTextInBerryTagScreen(WIN_BERRY_NAME, gStringVar4, 0, 1, 0, 0); PrintTextInBerryTagScreen(WIN_BERRY_NAME, gStringVar4, 0, 1, 0, 0);
@ -421,8 +421,8 @@ static void PrintBerrySize(void)
fraction = (inches % 100) / 10; fraction = (inches % 100) / 10;
inches /= 100; inches /= 100;
ConvertIntToDecimalStringN(gStringVar1, inches, 0, 2); ConvertIntToDecimalStringN(gStringVar1, inches, STR_CONV_MODE_LEFT_ALIGN, 2);
ConvertIntToDecimalStringN(gStringVar2, fraction, 0, 2); ConvertIntToDecimalStringN(gStringVar2, fraction, STR_CONV_MODE_LEFT_ALIGN, 2);
StringExpandPlaceholders(gStringVar4, gText_Var1DotVar2); StringExpandPlaceholders(gStringVar4, gText_Var1DotVar2);
AddTextPrinterParameterized(WIN_SIZE_FIRM, 1, gStringVar4, 0x28, 1, 0, NULL); AddTextPrinterParameterized(WIN_SIZE_FIRM, 1, gStringVar4, 0x28, 1, 0, NULL);
} }

8
src/field_specials.c
View File

@ -1621,20 +1621,20 @@ void BufferLottoTicketNumber(void)
else if (gSpecialVar_Result >= 1000) else if (gSpecialVar_Result >= 1000)
{ {
gStringVar1[0] = CHAR_0; gStringVar1[0] = CHAR_0;
ConvertIntToDecimalStringN(gStringVar1 + 1, gSpecialVar_Result, 0, CountDigits(gSpecialVar_Result)); ConvertIntToDecimalStringN(gStringVar1 + 1, gSpecialVar_Result, STR_CONV_MODE_LEFT_ALIGN, CountDigits(gSpecialVar_Result));
} }
else if (gSpecialVar_Result >= 100) else if (gSpecialVar_Result >= 100)
{ {
gStringVar1[0] = CHAR_0; gStringVar1[0] = CHAR_0;
gStringVar1[1] = CHAR_0; gStringVar1[1] = CHAR_0;
ConvertIntToDecimalStringN(gStringVar1 + 2, gSpecialVar_Result, 0, CountDigits(gSpecialVar_Result)); ConvertIntToDecimalStringN(gStringVar1 + 2, gSpecialVar_Result, STR_CONV_MODE_LEFT_ALIGN, CountDigits(gSpecialVar_Result));
} }
else if (gSpecialVar_Result >= 10) else if (gSpecialVar_Result >= 10)
{ {
gStringVar1[0] = CHAR_0; gStringVar1[0] = CHAR_0;
gStringVar1[1] = CHAR_0; gStringVar1[1] = CHAR_0;
gStringVar1[2] = CHAR_0; gStringVar1[2] = CHAR_0;
ConvertIntToDecimalStringN(gStringVar1 + 3, gSpecialVar_Result, 0, CountDigits(gSpecialVar_Result)); ConvertIntToDecimalStringN(gStringVar1 + 3, gSpecialVar_Result, STR_CONV_MODE_LEFT_ALIGN, CountDigits(gSpecialVar_Result));
} }
else else
{ {
@ -1642,7 +1642,7 @@ void BufferLottoTicketNumber(void)
gStringVar1[1] = CHAR_0; gStringVar1[1] = CHAR_0;
gStringVar1[2] = CHAR_0; gStringVar1[2] = CHAR_0;
gStringVar1[3] = CHAR_0; gStringVar1[3] = CHAR_0;
ConvertIntToDecimalStringN(gStringVar1 + 4, gSpecialVar_Result, 0, CountDigits(gSpecialVar_Result)); ConvertIntToDecimalStringN(gStringVar1 + 4, gSpecialVar_Result, STR_CONV_MODE_LEFT_ALIGN, CountDigits(gSpecialVar_Result));
} }
} }

30
src/item_menu.c
View File

@ -790,17 +790,17 @@ void GetItemName(s8 *dest, u16 itemId)
StringCopy(gStringVar2, gMoveNames[ItemIdToBattleMoveId(itemId)]); StringCopy(gStringVar2, gMoveNames[ItemIdToBattleMoveId(itemId)]);
if (itemId >= ITEM_HM01) if (itemId >= ITEM_HM01)
{ {
ConvertIntToDecimalStringN(gStringVar1, itemId - ITEM_HM01 + 1, 2, 1); ConvertIntToDecimalStringN(gStringVar1, itemId - ITEM_HM01 + 1, STR_CONV_MODE_LEADING_ZEROS, 1);
StringExpandPlaceholders(dest, gText_ClearTo11Var1Clear5Var2); StringExpandPlaceholders(dest, gText_ClearTo11Var1Clear5Var2);
} }
else else
{ {
ConvertIntToDecimalStringN(gStringVar1, itemId - ITEM_TM01 + 1, 2, 2); ConvertIntToDecimalStringN(gStringVar1, itemId - ITEM_TM01 + 1, STR_CONV_MODE_LEADING_ZEROS, 2);
StringExpandPlaceholders(dest, gText_UnkF908Var1Clear7Var2); StringExpandPlaceholders(dest, gText_UnkF908Var1Clear7Var2);
} }
break; break;
case BERRIES_POCKET: case BERRIES_POCKET:
ConvertIntToDecimalStringN(gStringVar1, itemId - ITEM_CHERI_BERRY + 1, 2, 2); ConvertIntToDecimalStringN(gStringVar1, itemId - ITEM_CHERI_BERRY + 1, STR_CONV_MODE_LEADING_ZEROS, 2);
CopyItemName(itemId, gStringVar2); CopyItemName(itemId, gStringVar2);
StringExpandPlaceholders(dest, gText_UnkF908Var1Clear7Var2); StringExpandPlaceholders(dest, gText_UnkF908Var1Clear7Var2);
break; break;
@ -851,14 +851,14 @@ void PrintItemQuantityPlusGFX(u8 rboxId, s32 item_index_in_pocket, u8 a)
BlitBitmapToWindow(rboxId, gBagMenuHMIcon_Gfx, 8, a - 1, 16, 16); BlitBitmapToWindow(rboxId, gBagMenuHMIcon_Gfx, 8, a - 1, 16, 16);
if (gBagPositionStruct.pocket == BERRIES_POCKET) if (gBagPositionStruct.pocket == BERRIES_POCKET)
{ {
ConvertIntToDecimalStringN(gStringVar1, itemQuantity, 1, 3); ConvertIntToDecimalStringN(gStringVar1, itemQuantity, STR_CONV_MODE_RIGHT_ALIGN, 3);
StringExpandPlaceholders(gStringVar4, gText_xVar1); StringExpandPlaceholders(gStringVar4, gText_xVar1);
offset = GetStringRightAlignXOffset(7, gStringVar4, 0x77); offset = GetStringRightAlignXOffset(7, gStringVar4, 0x77);
BagMenu_Print(rboxId, 7, gStringVar4, offset, a, 0, 0, -1, 0); BagMenu_Print(rboxId, 7, gStringVar4, offset, a, 0, 0, -1, 0);
} }
else if (gBagPositionStruct.pocket != KEYITEMS_POCKET && (unique = ItemId_GetImportance(itemId)) == FALSE) else if (gBagPositionStruct.pocket != KEYITEMS_POCKET && (unique = ItemId_GetImportance(itemId)) == FALSE)
{ {
ConvertIntToDecimalStringN(gStringVar1, itemQuantity, 1, 2); ConvertIntToDecimalStringN(gStringVar1, itemQuantity, STR_CONV_MODE_RIGHT_ALIGN, 2);
StringExpandPlaceholders(gStringVar4, gText_xVar1); StringExpandPlaceholders(gStringVar4, gText_xVar1);
offset = GetStringRightAlignXOffset(7, gStringVar4, 0x77); offset = GetStringRightAlignXOffset(7, gStringVar4, 0x77);
BagMenu_Print(rboxId, 7, gStringVar4, offset, a, unique, unique, -1, unique); BagMenu_Print(rboxId, 7, gStringVar4, offset, a, unique, unique, -1, unique);
@ -1056,7 +1056,7 @@ void sub_81ABC3C(u8 a)
void PrintItemDepositAmount(u8 a, s16 b) void PrintItemDepositAmount(u8 a, s16 b)
{ {
u8 r3 = (gBagPositionStruct.pocket == BERRIES_POCKET) ? 3 : 2; u8 r3 = (gBagPositionStruct.pocket == BERRIES_POCKET) ? 3 : 2;
ConvertIntToDecimalStringN(gStringVar1, b, 2, r3); ConvertIntToDecimalStringN(gStringVar1, b, STR_CONV_MODE_LEADING_ZEROS, r3);
StringExpandPlaceholders(gStringVar4, gText_xVar1); StringExpandPlaceholders(gStringVar4, gText_xVar1);
AddTextPrinterParameterized(a, 1, gStringVar4, GetStringCenterAlignXOffset(1, gStringVar4, 0x28), 2, 0, 0); AddTextPrinterParameterized(a, 1, gStringVar4, GetStringCenterAlignXOffset(1, gStringVar4, 0x28), 2, 0, 0);
} }
@ -1064,7 +1064,7 @@ void PrintItemDepositAmount(u8 a, s16 b)
void sub_81ABCC0(int a, int b, int c) void sub_81ABCC0(int a, int b, int c)
{ {
u8 r3 = (gBagPositionStruct.pocket == BERRIES_POCKET) ? 3 : 2; u8 r3 = (gBagPositionStruct.pocket == BERRIES_POCKET) ? 3 : 2;
ConvertIntToDecimalStringN(gStringVar1, b, 2, r3); ConvertIntToDecimalStringN(gStringVar1, b, STR_CONV_MODE_LEADING_ZEROS, r3);
StringExpandPlaceholders(gStringVar4, gText_xVar1); StringExpandPlaceholders(gStringVar4, gText_xVar1);
AddTextPrinterParameterized(a, 1, gStringVar4, 0, 1, -1, 0); AddTextPrinterParameterized(a, 1, gStringVar4, 0, 1, -1, 0);
PrintMoneyAmount(a, 0x26, 1, c, 0); PrintMoneyAmount(a, 0x26, 1, c, 0);
@ -1682,7 +1682,7 @@ void BagMenu_TossItems(u8 taskId)
s16* data = gTasks[taskId].data; s16* data = gTasks[taskId].data;
CopyItemName(gSpecialVar_ItemId, gStringVar1); CopyItemName(gSpecialVar_ItemId, gStringVar1);
ConvertIntToDecimalStringN(gStringVar2, data[8], 0, 3); ConvertIntToDecimalStringN(gStringVar2, data[8], STR_CONV_MODE_LEFT_ALIGN, 3);
StringExpandPlaceholders(gStringVar4, gText_ConfirmTossItems); StringExpandPlaceholders(gStringVar4, gText_ConfirmTossItems);
FillWindowPixelBuffer(1, PIXEL_FILL(0)); FillWindowPixelBuffer(1, PIXEL_FILL(0));
BagMenu_Print(1, 1, gStringVar4, 3, 1, 0, 0, 0, 0); BagMenu_Print(1, 1, gStringVar4, 3, 1, 0, 0, 0, 0);
@ -1725,7 +1725,7 @@ void BagMenu_ConfirmToss(u8 taskId)
s16* data = gTasks[taskId].data; s16* data = gTasks[taskId].data;
CopyItemName(gSpecialVar_ItemId, gStringVar1); CopyItemName(gSpecialVar_ItemId, gStringVar1);
ConvertIntToDecimalStringN(gStringVar2, data[8], 0, 3); ConvertIntToDecimalStringN(gStringVar2, data[8], STR_CONV_MODE_LEFT_ALIGN, 3);
StringExpandPlaceholders(gStringVar4, gText_ThrewAwayVar2Var1s); StringExpandPlaceholders(gStringVar4, gText_ThrewAwayVar2Var1s);
FillWindowPixelBuffer(1, PIXEL_FILL(0)); FillWindowPixelBuffer(1, PIXEL_FILL(0));
BagMenu_Print(1, 1, gStringVar4, 3, 1, 0, 0, 0, 0); BagMenu_Print(1, 1, gStringVar4, 3, 1, 0, 0, 0, 0);
@ -1936,7 +1936,7 @@ void sub_81AD680(u8 taskId)
{ {
s16* data = gTasks[taskId].data; s16* data = gTasks[taskId].data;
ConvertIntToDecimalStringN(gStringVar1, (ItemId_GetPrice(gSpecialVar_ItemId) / 2) * data[8], 0, 6); ConvertIntToDecimalStringN(gStringVar1, (ItemId_GetPrice(gSpecialVar_ItemId) / 2) * data[8], STR_CONV_MODE_LEFT_ALIGN, 6);
StringExpandPlaceholders(gStringVar4, gText_ICanPayVar1); StringExpandPlaceholders(gStringVar4, gText_ICanPayVar1);
DisplayItemMessage(taskId, 1, gStringVar4, sub_81AD6E4); DisplayItemMessage(taskId, 1, gStringVar4, sub_81AD6E4);
} }
@ -1996,7 +1996,7 @@ void BagMenu_ConfirmSell(u8 taskId)
s16* data = gTasks[taskId].data; s16* data = gTasks[taskId].data;
CopyItemName(gSpecialVar_ItemId, gStringVar2); CopyItemName(gSpecialVar_ItemId, gStringVar2);
ConvertIntToDecimalStringN(gStringVar1, (ItemId_GetPrice(gSpecialVar_ItemId) / 2) * data[8], 0, 6); ConvertIntToDecimalStringN(gStringVar1, (ItemId_GetPrice(gSpecialVar_ItemId) / 2) * data[8], STR_CONV_MODE_LEFT_ALIGN, 6);
StringExpandPlaceholders(gStringVar4, gText_TurnedOverVar1ForVar2); StringExpandPlaceholders(gStringVar4, gText_TurnedOverVar1ForVar2);
DisplayItemMessage(taskId, 1, gStringVar4, sub_81AD8C8); DisplayItemMessage(taskId, 1, gStringVar4, sub_81AD8C8);
} }
@ -2087,7 +2087,7 @@ void sub_81ADB14(u8 taskId)
else if (AddPCItem(gSpecialVar_ItemId, data[8]) == TRUE) else if (AddPCItem(gSpecialVar_ItemId, data[8]) == TRUE)
{ {
CopyItemName(gSpecialVar_ItemId, gStringVar1); CopyItemName(gSpecialVar_ItemId, gStringVar1);
ConvertIntToDecimalStringN(gStringVar2, data[8], 0, 3); ConvertIntToDecimalStringN(gStringVar2, data[8], STR_CONV_MODE_LEFT_ALIGN, 3);
StringExpandPlaceholders(gStringVar4, gText_DepositedVar2Var1s); StringExpandPlaceholders(gStringVar4, gText_DepositedVar2Var1s);
BagMenu_Print(1, 1, gStringVar4, 3, 1, 0, 0, 0, 0); BagMenu_Print(1, 1, gStringVar4, 3, 1, 0, 0, 0, 0);
gTasks[taskId].func = Task_ActuallyToss; gTasks[taskId].func = Task_ActuallyToss;
@ -2398,7 +2398,7 @@ void PrintTMHMMoveData(u16 itemId)
} }
else else
{ {
ConvertIntToDecimalStringN(gStringVar1, gBattleMoves[moveId].power, 1, 3); ConvertIntToDecimalStringN(gStringVar1, gBattleMoves[moveId].power, STR_CONV_MODE_RIGHT_ALIGN, 3);
text = gStringVar1; text = gStringVar1;
} }
BagMenu_Print(4, 1, text, 7, 12, 0, 0, -1, 4); BagMenu_Print(4, 1, text, 7, 12, 0, 0, -1, 4);
@ -2408,11 +2408,11 @@ void PrintTMHMMoveData(u16 itemId)
} }
else else
{ {
ConvertIntToDecimalStringN(gStringVar1, gBattleMoves[moveId].accuracy, 1, 3); ConvertIntToDecimalStringN(gStringVar1, gBattleMoves[moveId].accuracy, STR_CONV_MODE_RIGHT_ALIGN, 3);
text = gStringVar1; text = gStringVar1;
} }
BagMenu_Print(4, 1, text, 7, 24, 0, 0, -1, 4); BagMenu_Print(4, 1, text, 7, 24, 0, 0, -1, 4);
ConvertIntToDecimalStringN(gStringVar1, gBattleMoves[moveId].pp, 1, 3); ConvertIntToDecimalStringN(gStringVar1, gBattleMoves[moveId].pp, STR_CONV_MODE_RIGHT_ALIGN, 3);
BagMenu_Print(4, 1, gStringVar1, 7, 36, 0, 0, -1, 4); BagMenu_Print(4, 1, gStringVar1, 7, 36, 0, 0, -1, 4);
CopyWindowToVram(4, 2); CopyWindowToVram(4, 2);
} }

4
src/item_use.c
View File

@ -623,7 +623,7 @@ void sub_80FDC00(u8 taskId)
void ItemUseOutOfBattle_CoinCase(u8 taskId) void ItemUseOutOfBattle_CoinCase(u8 taskId)
{ {
ConvertIntToDecimalStringN(gStringVar1, GetCoins(), 0, 4); ConvertIntToDecimalStringN(gStringVar1, GetCoins(), STR_CONV_MODE_LEFT_ALIGN, 4);
StringExpandPlaceholders(gStringVar4, gText_CoinCase); StringExpandPlaceholders(gStringVar4, gText_CoinCase);
if (!gTasks[taskId].data[3]) if (!gTasks[taskId].data[3])
@ -638,7 +638,7 @@ void ItemUseOutOfBattle_CoinCase(u8 taskId)
void ItemUseOutOfBattle_PowderJar(u8 taskId) void ItemUseOutOfBattle_PowderJar(u8 taskId)
{ {
ConvertIntToDecimalStringN(gStringVar1, GetBerryPowder(), 0, 5); ConvertIntToDecimalStringN(gStringVar1, GetBerryPowder(), STR_CONV_MODE_LEFT_ALIGN, 5);
StringExpandPlaceholders(gStringVar4, gText_PowderQty); StringExpandPlaceholders(gStringVar4, gText_PowderQty);
if (!gTasks[taskId].data[3]) if (!gTasks[taskId].data[3])

8
src/main_menu.c
View File

@ -2158,9 +2158,9 @@ static void MainMenu_FormatSavegameTime(void)
StringExpandPlaceholders(gStringVar4, gText_ContinueMenuTime); StringExpandPlaceholders(gStringVar4, gText_ContinueMenuTime);
AddTextPrinterParameterized3(2, 1, 0x6C, 17, sTextColor_PlayerGenderColor, -1, gStringVar4); AddTextPrinterParameterized3(2, 1, 0x6C, 17, sTextColor_PlayerGenderColor, -1, gStringVar4);
ptr = ConvertIntToDecimalStringN(str, gSaveBlock2Ptr->playTimeHours, 0, 3); ptr = ConvertIntToDecimalStringN(str, gSaveBlock2Ptr->playTimeHours, STR_CONV_MODE_LEFT_ALIGN, 3);
*ptr = 0xF0; *ptr = 0xF0;
ConvertIntToDecimalStringN(ptr + 1, gSaveBlock2Ptr->playTimeMinutes, 2, 2); ConvertIntToDecimalStringN(ptr + 1, gSaveBlock2Ptr->playTimeMinutes, STR_CONV_MODE_LEADING_ZEROS, 2);
AddTextPrinterParameterized3(2, 1, GetStringRightAlignXOffset(1, str, 0xD0), 17, sTextColor_PlayerGenderColor, -1, str); AddTextPrinterParameterized3(2, 1, GetStringRightAlignXOffset(1, str, 0xD0), 17, sTextColor_PlayerGenderColor, -1, str);
} }
@ -2177,7 +2177,7 @@ static void MainMenu_FormatSavegamePokedex(void)
dexCount = GetHoennPokedexCount(1); dexCount = GetHoennPokedexCount(1);
StringExpandPlaceholders(gStringVar4, gText_ContinueMenuPokedex); StringExpandPlaceholders(gStringVar4, gText_ContinueMenuPokedex);
AddTextPrinterParameterized3(2, 1, 0, 33, sTextColor_PlayerGenderColor, -1, gStringVar4); AddTextPrinterParameterized3(2, 1, 0, 33, sTextColor_PlayerGenderColor, -1, gStringVar4);
ConvertIntToDecimalStringN(str, dexCount, 0, 3); ConvertIntToDecimalStringN(str, dexCount, STR_CONV_MODE_LEFT_ALIGN, 3);
AddTextPrinterParameterized3(2, 1, GetStringRightAlignXOffset(1, str, 100), 33, sTextColor_PlayerGenderColor, -1, str); AddTextPrinterParameterized3(2, 1, GetStringRightAlignXOffset(1, str, 100), 33, sTextColor_PlayerGenderColor, -1, str);
} }
} }
@ -2195,7 +2195,7 @@ static void MainMenu_FormatSavegameBadges(void)
} }
StringExpandPlaceholders(gStringVar4, gText_ContinueMenuBadges); StringExpandPlaceholders(gStringVar4, gText_ContinueMenuBadges);
AddTextPrinterParameterized3(2, 1, 0x6C, 33, sTextColor_PlayerGenderColor, -1, gStringVar4); AddTextPrinterParameterized3(2, 1, 0x6C, 33, sTextColor_PlayerGenderColor, -1, gStringVar4);
ConvertIntToDecimalStringN(str, badgeCount, 2, 1); ConvertIntToDecimalStringN(str, badgeCount, STR_CONV_MODE_LEADING_ZEROS, 1);
AddTextPrinterParameterized3(2, 1, GetStringRightAlignXOffset(1, str, 0xD0), 33, sTextColor_PlayerGenderColor, -1, str); AddTextPrinterParameterized3(2, 1, GetStringRightAlignXOffset(1, str, 0xD0), 33, sTextColor_PlayerGenderColor, -1, str);
} }

10
src/match_call.c
View File

@ -1743,7 +1743,7 @@ static void PopulateBattleFrontierStreak(int matchCallId, u8 *destStr)
i++; i++;
} }
ConvertIntToDecimalStringN(destStr, gBattleFrontierStreakInfo.streak, 0, i); ConvertIntToDecimalStringN(destStr, gBattleFrontierStreakInfo.streak, STR_CONV_MODE_LEFT_ALIGN, i);
} }
static const u16 sBadgeFlags[] = static const u16 sBadgeFlags[] =
@ -1976,8 +1976,8 @@ void sub_8197080(u8 *destStr)
numSeen = GetHoennPokedexCount(FLAG_GET_SEEN); numSeen = GetHoennPokedexCount(FLAG_GET_SEEN);
numCaught = GetHoennPokedexCount(FLAG_GET_CAUGHT); numCaught = GetHoennPokedexCount(FLAG_GET_CAUGHT);
ConvertIntToDecimalStringN(gStringVar1, numSeen, 0, 3); ConvertIntToDecimalStringN(gStringVar1, numSeen, STR_CONV_MODE_LEFT_ALIGN, 3);
ConvertIntToDecimalStringN(gStringVar2, numCaught, 0, 3); ConvertIntToDecimalStringN(gStringVar2, numCaught, STR_CONV_MODE_LEFT_ALIGN, 3);
dexRatingLevel = GetPokedexRatingLevel(numCaught); dexRatingLevel = GetPokedexRatingLevel(numCaught);
str = StringCopy(buffer, gBirchDexRatingText_AreYouCurious); str = StringCopy(buffer, gBirchDexRatingText_AreYouCurious);
str[0] = CHAR_PROMPT_CLEAR; str[0] = CHAR_PROMPT_CLEAR;
@ -1994,8 +1994,8 @@ void sub_8197080(u8 *destStr)
str++; str++;
numSeen = GetNationalPokedexCount(FLAG_GET_SEEN); numSeen = GetNationalPokedexCount(FLAG_GET_SEEN);
numCaught = GetNationalPokedexCount(FLAG_GET_CAUGHT); numCaught = GetNationalPokedexCount(FLAG_GET_CAUGHT);
ConvertIntToDecimalStringN(gStringVar1, numSeen, 0, 3); ConvertIntToDecimalStringN(gStringVar1, numSeen, STR_CONV_MODE_LEFT_ALIGN, 3);
ConvertIntToDecimalStringN(gStringVar2, numCaught, 0, 3); ConvertIntToDecimalStringN(gStringVar2, numCaught, STR_CONV_MODE_LEFT_ALIGN, 3);
StringExpandPlaceholders(str, gBirchDexRatingText_OnANationwideBasis); StringExpandPlaceholders(str, gBirchDexRatingText_OnANationwideBasis);
} }

2
src/mauville_old_man.c
View File

@ -1132,7 +1132,7 @@ static void StorytellerDisplayStory(u32 player)
{ {
u8 stat = sStorytellerPtr->gameStatIDs[player]; u8 stat = sStorytellerPtr->gameStatIDs[player];
ConvertIntToDecimalStringN(gStringVar1, StorytellerGetRecordedTrainerStat(player), 0, 10); ConvertIntToDecimalStringN(gStringVar1, StorytellerGetRecordedTrainerStat(player), STR_CONV_MODE_LEFT_ALIGN, 10);
StringCopy(gStringVar2, GetStoryActionByStat(stat)); StringCopy(gStringVar2, GetStoryActionByStat(stat));
GetStoryByStattellerPlayerName(player, gStringVar3); GetStoryByStattellerPlayerName(player, gStringVar3);
ConvertInternationalString(gStringVar3, sStorytellerPtr->language[player]); ConvertInternationalString(gStringVar3, sStorytellerPtr->language[player]);

8
src/menu.c
View File

@ -2148,15 +2148,15 @@ void sub_819A344(u8 a0, u8 *dest, u8 color)
break; break;
case 1: case 1:
if (IsNationalPokedexEnabled()) if (IsNationalPokedexEnabled())
string = ConvertIntToDecimalStringN(string, GetNationalPokedexCount(1), 0, 3); string = ConvertIntToDecimalStringN(string, GetNationalPokedexCount(1), STR_CONV_MODE_LEFT_ALIGN, 3);
else else
string = ConvertIntToDecimalStringN(string, GetHoennPokedexCount(1), 0, 3); string = ConvertIntToDecimalStringN(string, GetHoennPokedexCount(1), STR_CONV_MODE_LEFT_ALIGN, 3);
*string = EOS; *string = EOS;
break; break;
case 2: case 2:
string = ConvertIntToDecimalStringN(string, gSaveBlock2Ptr->playTimeHours, 0, 3); string = ConvertIntToDecimalStringN(string, gSaveBlock2Ptr->playTimeHours, STR_CONV_MODE_LEFT_ALIGN, 3);
*(string++) = CHAR_COLON; *(string++) = CHAR_COLON;
ConvertIntToDecimalStringN(string, gSaveBlock2Ptr->playTimeMinutes, 2, 2); ConvertIntToDecimalStringN(string, gSaveBlock2Ptr->playTimeMinutes, STR_CONV_MODE_LEADING_ZEROS, 2);
break; break;
case 3: case 3:
sub_81245DC(string, gMapHeader.regionMapSectionId); sub_81245DC(string, gMapHeader.regionMapSectionId);

6
src/menu_specialized.c
View File

@ -761,7 +761,7 @@ static void MoveRelearnerLoadBattleMoveDescription(u32 chosenMove)
AddTextPrinterParameterized(0, 1, str, 4, 0x19, TEXT_SPEED_FF, NULL); AddTextPrinterParameterized(0, 1, str, 4, 0x19, TEXT_SPEED_FF, NULL);
x = 4 + GetStringWidth(1, gText_MoveRelearnerPP, 0); x = 4 + GetStringWidth(1, gText_MoveRelearnerPP, 0);
ConvertIntToDecimalStringN(buffer, move->pp, 0, 2); ConvertIntToDecimalStringN(buffer, move->pp, STR_CONV_MODE_LEFT_ALIGN, 2);
AddTextPrinterParameterized(0, 1, buffer, x, 0x29, TEXT_SPEED_FF, NULL); AddTextPrinterParameterized(0, 1, buffer, x, 0x29, TEXT_SPEED_FF, NULL);
if (move->power < 2) if (move->power < 2)
@ -770,7 +770,7 @@ static void MoveRelearnerLoadBattleMoveDescription(u32 chosenMove)
} }
else else
{ {
ConvertIntToDecimalStringN(buffer, move->power, 0, 3); ConvertIntToDecimalStringN(buffer, move->power, STR_CONV_MODE_LEFT_ALIGN, 3);
str = buffer; str = buffer;
} }
AddTextPrinterParameterized(0, 1, str, 0x6A, 0x19, TEXT_SPEED_FF, NULL); AddTextPrinterParameterized(0, 1, str, 0x6A, 0x19, TEXT_SPEED_FF, NULL);
@ -781,7 +781,7 @@ static void MoveRelearnerLoadBattleMoveDescription(u32 chosenMove)
} }
else else
{ {
ConvertIntToDecimalStringN(buffer, move->accuracy, 0, 3); ConvertIntToDecimalStringN(buffer, move->accuracy, STR_CONV_MODE_LEFT_ALIGN, 3);
str = buffer; str = buffer;
} }
AddTextPrinterParameterized(0, 1, str, 0x6A, 0x29, TEXT_SPEED_FF, NULL); AddTextPrinterParameterized(0, 1, str, 0x6A, 0x29, TEXT_SPEED_FF, NULL);

14
src/party_menu.c
View File

@ -2918,7 +2918,7 @@ static void sub_81B1E60(u8 taskId)
if (data[3] == 0 || data[0] == 0 || data[0] == data[1]) if (data[3] == 0 || data[0] == 0 || data[0] == data[1])
{ {
if (data[0] > data[5]) if (data[0] > data[5])
ConvertIntToDecimalStringN(gStringVar2, data[0] - data[5], 0, 3); ConvertIntToDecimalStringN(gStringVar2, data[0] - data[5], STR_CONV_MODE_LEFT_ALIGN, 3);
SwitchTaskToFollowupFunc(taskId); SwitchTaskToFollowupFunc(taskId);
} }
} }
@ -3412,7 +3412,7 @@ static void DisplayPartyPokemonLevelCheck(struct Pokemon *mon, struct Struct203C
static void DisplayPartyPokemonLevel(u8 level, struct Struct203CEDC *ptr) static void DisplayPartyPokemonLevel(u8 level, struct Struct203CEDC *ptr)
{ {
ConvertIntToDecimalStringN(gStringVar2, level, 0, 3); ConvertIntToDecimalStringN(gStringVar2, level, STR_CONV_MODE_LEFT_ALIGN, 3);
StringCopy(gStringVar1, gText_LevelSymbol); StringCopy(gStringVar1, gText_LevelSymbol);
StringAppend(gStringVar1, gStringVar2); StringAppend(gStringVar1, gStringVar2);
DisplayPartyPokemonBarDetail(ptr->windowId, gStringVar1, 0, &ptr->unk0->unk4[4]); DisplayPartyPokemonBarDetail(ptr->windowId, gStringVar1, 0, &ptr->unk0->unk4[4]);
@ -3464,7 +3464,7 @@ static void DisplayPartyPokemonHPCheck(struct Pokemon *mon, struct Struct203CEDC
static void DisplayPartyPokemonHP(u16 hp, struct Struct203CEDC *ptr) static void DisplayPartyPokemonHP(u16 hp, struct Struct203CEDC *ptr)
{ {
u8 *strOut = ConvertIntToDecimalStringN(gStringVar1, hp, 1, 3); u8 *strOut = ConvertIntToDecimalStringN(gStringVar1, hp, STR_CONV_MODE_RIGHT_ALIGN, 3);
strOut[0] = CHAR_SLASH; strOut[0] = CHAR_SLASH;
strOut[1] = EOS; strOut[1] = EOS;
@ -3485,7 +3485,7 @@ static void DisplayPartyPokemonMaxHPCheck(struct Pokemon *mon, struct Struct203C
static void DisplayPartyPokemonMaxHP(u16 maxhp, struct Struct203CEDC *ptr) static void DisplayPartyPokemonMaxHP(u16 maxhp, struct Struct203CEDC *ptr)
{ {
ConvertIntToDecimalStringN(gStringVar2, maxhp, 1, 3); ConvertIntToDecimalStringN(gStringVar2, maxhp, STR_CONV_MODE_RIGHT_ALIGN, 3);
StringCopy(gStringVar1, gText_Slash); StringCopy(gStringVar1, gText_Slash);
StringAppend(gStringVar1, gStringVar2); StringAppend(gStringVar1, gStringVar2);
DisplayPartyPokemonBarDetail(ptr->windowId, gStringVar1, 0, &ptr->unk0->unk4[16]); DisplayPartyPokemonBarDetail(ptr->windowId, gStringVar1, 0, &ptr->unk0->unk4[16]);
@ -4580,7 +4580,7 @@ static void CursorCb_Enter(u8 taskId)
return; return;
} }
} }
ConvertIntToDecimalStringN(gStringVar1, unk, 0, 1); ConvertIntToDecimalStringN(gStringVar1, unk, STR_CONV_MODE_LEFT_ALIGN, 1);
StringExpandPlaceholders(gStringVar4, gText_NoMoreThanVar1Pkmn); StringExpandPlaceholders(gStringVar4, gText_NoMoreThanVar1Pkmn);
PlaySE(SE_HAZURE); PlaySE(SE_HAZURE);
sub_81B1B5C(gStringVar4, 1); sub_81B1B5C(gStringVar4, 1);
@ -6004,7 +6004,7 @@ void dp05_rare_candy(u8 taskId, TaskFunc task)
sub_81B754C(gUnknown_0203CEC8.slotId, mon); sub_81B754C(gUnknown_0203CEC8.slotId, mon);
RemoveBagItem(gSpecialVar_ItemId, 1); RemoveBagItem(gSpecialVar_ItemId, 1);
GetMonNickname(mon, gStringVar1); GetMonNickname(mon, gStringVar1);
ConvertIntToDecimalStringN(gStringVar2, GetMonData(mon, MON_DATA_LEVEL), 0, 3); ConvertIntToDecimalStringN(gStringVar2, GetMonData(mon, MON_DATA_LEVEL), STR_CONV_MODE_LEFT_ALIGN, 3);
StringExpandPlaceholders(gStringVar4, gText_PkmnElevatedToLvVar2); StringExpandPlaceholders(gStringVar4, gText_PkmnElevatedToLvVar2);
sub_81B1B5C(gStringVar4, 1); sub_81B1B5C(gStringVar4, 1);
schedule_bg_copy_tilemap_to_vram(2); schedule_bg_copy_tilemap_to_vram(2);
@ -6634,7 +6634,7 @@ static u8 sub_81B865C(void)
{ {
if (unk == 1) if (unk == 1)
return 14; return 14;
ConvertIntToDecimalStringN(gStringVar1, unk, 0, 1); ConvertIntToDecimalStringN(gStringVar1, unk, STR_CONV_MODE_LEFT_ALIGN, 1);
return 17; return 17;
} }

2
src/pokedex.c
View File

@ -3889,7 +3889,7 @@ void sub_80C020C(u32 num, u32 value, u32 c, u32 d)
value = NationalToHoennOrder(num); value = NationalToHoennOrder(num);
else else
value = num; value = num;
ConvertIntToDecimalStringN(StringCopy(str, gText_UnkCtrlF908Clear01), value, 2, 3); ConvertIntToDecimalStringN(StringCopy(str, gText_UnkCtrlF908Clear01), value, STR_CONV_MODE_LEADING_ZEROS, 3);
sub_80BE8DC(str, 0x60, 0x19); sub_80BE8DC(str, 0x60, 0x19);
natNum = NationalPokedexNumToSpecies(num); natNum = NationalPokedexNumToSpecies(num);
if (natNum) if (natNum)

4
src/pokemon_size_record.c
View File

@ -100,9 +100,9 @@ static void FormatMonSizeRecord(u8 *string, u32 size)
size = (double)(size * 10) / (CM_PER_INCH * 10); size = (double)(size * 10) / (CM_PER_INCH * 10);
#endif #endif
string = ConvertIntToDecimalStringN(string, size / 10, 0, 8); string = ConvertIntToDecimalStringN(string, size / 10, STR_CONV_MODE_LEFT_ALIGN, 8);
string = StringAppend(string, gText_DecimalPoint); string = StringAppend(string, gText_DecimalPoint);
ConvertIntToDecimalStringN(string, size % 10, 0, 1); ConvertIntToDecimalStringN(string, size % 10, STR_CONV_MODE_LEFT_ALIGN, 1);
} }
static u8 CompareMonSize(u16 species, u16 *sizeRecord) static u8 CompareMonSize(u16 species, u16 *sizeRecord)

2
src/pokemon_storage_system.c
View File

@ -2107,7 +2107,7 @@ static void sub_80C7BE4(void)
center = GetStringCenterAlignXOffset(1, boxName, 64); center = GetStringCenterAlignXOffset(1, boxName, 64);
AddTextPrinterParameterized3(windowId, 1, center, 1, gUnknown_08571734, TEXT_SPEED_FF, boxName); AddTextPrinterParameterized3(windowId, 1, center, 1, gUnknown_08571734, TEXT_SPEED_FF, boxName);
ConvertIntToDecimalStringN(text, nPokemonInBox, 1, 2); ConvertIntToDecimalStringN(text, nPokemonInBox, STR_CONV_MODE_RIGHT_ALIGN, 2);
StringAppend(text, gUnknown_08571737); StringAppend(text, gUnknown_08571737);
center = GetStringCenterAlignXOffset(1, text, 64); center = GetStringCenterAlignXOffset(1, text, 64);
AddTextPrinterParameterized3(windowId, 1, center, 17, gUnknown_08571734, TEXT_SPEED_FF, text); AddTextPrinterParameterized3(windowId, 1, center, 17, gUnknown_08571734, TEXT_SPEED_FF, text);

38
src/pokemon_summary_screen.c
View File

@ -2716,7 +2716,7 @@ static void PrintNotEggInfo(void)
if (dexNum != 0xFFFF) if (dexNum != 0xFFFF)
{ {
StringCopy(gStringVar1, &gText_UnkCtrlF908Clear01[0]); StringCopy(gStringVar1, &gText_UnkCtrlF908Clear01[0]);
ConvertIntToDecimalStringN(gStringVar2, dexNum, 2, 3); ConvertIntToDecimalStringN(gStringVar2, dexNum, STR_CONV_MODE_LEADING_ZEROS, 3);
StringAppend(gStringVar1, gStringVar2); StringAppend(gStringVar1, gStringVar2);
if (!IsMonShiny(mon)) if (!IsMonShiny(mon))
{ {
@ -2739,7 +2739,7 @@ static void PrintNotEggInfo(void)
SetDexNumberColor(TRUE); SetDexNumberColor(TRUE);
} }
StringCopy(gStringVar1, &gText_LevelSymbol[0]); StringCopy(gStringVar1, &gText_LevelSymbol[0]);
ConvertIntToDecimalStringN(gStringVar2, summary->level, 0, 3); ConvertIntToDecimalStringN(gStringVar2, summary->level, STR_CONV_MODE_LEFT_ALIGN, 3);
StringAppend(gStringVar1, gStringVar2); StringAppend(gStringVar1, gStringVar2);
SummaryScreen_PrintTextOnWindow(PSS_LABEL_WINDOW_PORTRAIT_SPECIES, gStringVar1, 0x18, 17, 0, 1); SummaryScreen_PrintTextOnWindow(PSS_LABEL_WINDOW_PORTRAIT_SPECIES, gStringVar1, 0x18, 17, 0, 1);
GetMonNickname(mon, gStringVar1); GetMonNickname(mon, gStringVar1);
@ -3054,7 +3054,7 @@ static void PrintMonOTID(void)
int xPos; int xPos;
if (InBattleFactory() != TRUE && InSlateportBattleTent() != TRUE) if (InBattleFactory() != TRUE && InSlateportBattleTent() != TRUE)
{ {
ConvertIntToDecimalStringN(StringCopy(gStringVar1, gText_UnkCtrlF907F908), (u16)sMonSummaryScreen->summary.OTID, 2, 5); ConvertIntToDecimalStringN(StringCopy(gStringVar1, gText_UnkCtrlF907F908), (u16)sMonSummaryScreen->summary.OTID, STR_CONV_MODE_LEADING_ZEROS, 5);
xPos = GetStringRightAlignXOffset(1, gStringVar1, 56); xPos = GetStringRightAlignXOffset(1, gStringVar1, 56);
SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(sPageInfoTemplate, PSS_DATA_WINDOW_INFO_ID), gStringVar1, xPos, 1, 0, 1); SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(sPageInfoTemplate, PSS_DATA_WINDOW_INFO_ID), gStringVar1, xPos, 1, 0, 1);
} }
@ -3141,7 +3141,7 @@ static void GetMetLevelString(u8 *output)
u8 level = sMonSummaryScreen->summary.metLevel; u8 level = sMonSummaryScreen->summary.metLevel;
if (level == 0) if (level == 0)
level = EGG_HATCH_LEVEL; level = EGG_HATCH_LEVEL;
ConvertIntToDecimalStringN(output, level, 0, 3); ConvertIntToDecimalStringN(output, level, STR_CONV_MODE_LEFT_ALIGN, 3);
DynamicPlaceholderTextUtil_SetPlaceholderPtr(3, output); DynamicPlaceholderTextUtil_SetPlaceholderPtr(3, output);
} }
@ -3336,7 +3336,7 @@ static void PrintRibbonCount(void)
} }
else else
{ {
ConvertIntToDecimalStringN(gStringVar1, sMonSummaryScreen->summary.ribbonCount, 1, 2); ConvertIntToDecimalStringN(gStringVar1, sMonSummaryScreen->summary.ribbonCount, STR_CONV_MODE_RIGHT_ALIGN, 2);
StringExpandPlaceholders(gStringVar4, gText_RibbonsVar1); StringExpandPlaceholders(gStringVar4, gText_RibbonsVar1);
text = gStringVar4; text = gStringVar4;
} }
@ -3352,10 +3352,10 @@ static void BufferLeftColumnStats(void)
u8 *attackString = Alloc(8); u8 *attackString = Alloc(8);
u8 *defenseString = Alloc(8); u8 *defenseString = Alloc(8);
ConvertIntToDecimalStringN(currentHPString, sMonSummaryScreen->summary.currentHP, 1, 3); ConvertIntToDecimalStringN(currentHPString, sMonSummaryScreen->summary.currentHP, STR_CONV_MODE_RIGHT_ALIGN, 3);
ConvertIntToDecimalStringN(maxHPString, sMonSummaryScreen->summary.maxHP, 1, 3); ConvertIntToDecimalStringN(maxHPString, sMonSummaryScreen->summary.maxHP, STR_CONV_MODE_RIGHT_ALIGN, 3);
ConvertIntToDecimalStringN(attackString, sMonSummaryScreen->summary.atk, 1, 7); ConvertIntToDecimalStringN(attackString, sMonSummaryScreen->summary.atk, STR_CONV_MODE_RIGHT_ALIGN, 7);
ConvertIntToDecimalStringN(defenseString, sMonSummaryScreen->summary.def, 1, 7); ConvertIntToDecimalStringN(defenseString, sMonSummaryScreen->summary.def, STR_CONV_MODE_RIGHT_ALIGN, 7);
DynamicPlaceholderTextUtil_Reset(); DynamicPlaceholderTextUtil_Reset();
DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, currentHPString); DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, currentHPString);
@ -3377,9 +3377,9 @@ static void PrintLeftColumnStats(void)
static void BufferRightColumnStats(void) static void BufferRightColumnStats(void)
{ {
ConvertIntToDecimalStringN(gStringVar1, sMonSummaryScreen->summary.spatk, 1, 3); ConvertIntToDecimalStringN(gStringVar1, sMonSummaryScreen->summary.spatk, STR_CONV_MODE_RIGHT_ALIGN, 3);
ConvertIntToDecimalStringN(gStringVar2, sMonSummaryScreen->summary.spdef, 1, 3); ConvertIntToDecimalStringN(gStringVar2, sMonSummaryScreen->summary.spdef, STR_CONV_MODE_RIGHT_ALIGN, 3);
ConvertIntToDecimalStringN(gStringVar3, sMonSummaryScreen->summary.speed, 1, 3); ConvertIntToDecimalStringN(gStringVar3, sMonSummaryScreen->summary.speed, STR_CONV_MODE_RIGHT_ALIGN, 3);
DynamicPlaceholderTextUtil_Reset(); DynamicPlaceholderTextUtil_Reset();
DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gStringVar1); DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gStringVar1);
@ -3400,7 +3400,7 @@ static void PrintExpPointsNextLevel(void)
int offset; int offset;
u32 expToNextLevel; u32 expToNextLevel;
ConvertIntToDecimalStringN(gStringVar1, sum->exp, 1, 7); ConvertIntToDecimalStringN(gStringVar1, sum->exp, STR_CONV_MODE_RIGHT_ALIGN, 7);
offset = GetStringRightAlignXOffset(1, gStringVar1, 42) + 2; offset = GetStringRightAlignXOffset(1, gStringVar1, 42) + 2;
SummaryScreen_PrintTextOnWindow(windowId, gStringVar1, offset, 1, 0, 0); SummaryScreen_PrintTextOnWindow(windowId, gStringVar1, offset, 1, 0, 0);
@ -3409,7 +3409,7 @@ static void PrintExpPointsNextLevel(void)
else else
expToNextLevel = 0; expToNextLevel = 0;
ConvertIntToDecimalStringN(gStringVar1, expToNextLevel, 1, 6); ConvertIntToDecimalStringN(gStringVar1, expToNextLevel, STR_CONV_MODE_RIGHT_ALIGN, 6);
offset = GetStringRightAlignXOffset(1, gStringVar1, 42) + 2; offset = GetStringRightAlignXOffset(1, gStringVar1, 42) + 2;
SummaryScreen_PrintTextOnWindow(windowId, gStringVar1, offset, 17, 0, 0); SummaryScreen_PrintTextOnWindow(windowId, gStringVar1, offset, 17, 0, 0);
} }
@ -3496,8 +3496,8 @@ static void PrintMoveNameAndPP(u8 moveIndex)
{ {
pp = CalculatePPWithBonus(move, summaryStruct->summary.ppBonuses, moveIndex); pp = CalculatePPWithBonus(move, summaryStruct->summary.ppBonuses, moveIndex);
SummaryScreen_PrintTextOnWindow(moveNameWindowId, gMoveNames[move], 0, moveIndex * 16 + 1, 0, 1); SummaryScreen_PrintTextOnWindow(moveNameWindowId, gMoveNames[move], 0, moveIndex * 16 + 1, 0, 1);
ConvertIntToDecimalStringN(gStringVar1, summaryStruct->summary.pp[moveIndex], 1, 2); ConvertIntToDecimalStringN(gStringVar1, summaryStruct->summary.pp[moveIndex], STR_CONV_MODE_RIGHT_ALIGN, 2);
ConvertIntToDecimalStringN(gStringVar2, pp, 1, 2); ConvertIntToDecimalStringN(gStringVar2, pp, STR_CONV_MODE_RIGHT_ALIGN, 2);
DynamicPlaceholderTextUtil_Reset(); DynamicPlaceholderTextUtil_Reset();
DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gStringVar1); DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gStringVar1);
DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, gStringVar2); DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, gStringVar2);
@ -3530,7 +3530,7 @@ static void PrintMovePowerAndAccuracy(u16 moveIndex)
} }
else else
{ {
ConvertIntToDecimalStringN(gStringVar1, gBattleMoves[moveIndex].power, 1, 3); ConvertIntToDecimalStringN(gStringVar1, gBattleMoves[moveIndex].power, STR_CONV_MODE_RIGHT_ALIGN, 3);
text = gStringVar1; text = gStringVar1;
} }
@ -3542,7 +3542,7 @@ static void PrintMovePowerAndAccuracy(u16 moveIndex)
} }
else else
{ {
ConvertIntToDecimalStringN(gStringVar1, gBattleMoves[moveIndex].accuracy, 1, 3); ConvertIntToDecimalStringN(gStringVar1, gBattleMoves[moveIndex].accuracy, STR_CONV_MODE_RIGHT_ALIGN, 3);
text = gStringVar1; text = gStringVar1;
} }
@ -3660,7 +3660,7 @@ static void PrintNewMoveDetailsOrCancelText(void)
else else
SummaryScreen_PrintTextOnWindow(windowId1, gMoveNames[move], 0, 65, 0, 5); SummaryScreen_PrintTextOnWindow(windowId1, gMoveNames[move], 0, 65, 0, 5);
ConvertIntToDecimalStringN(gStringVar1, gBattleMoves[move].pp, 1, 2); ConvertIntToDecimalStringN(gStringVar1, gBattleMoves[move].pp, STR_CONV_MODE_RIGHT_ALIGN, 2);
DynamicPlaceholderTextUtil_Reset(); DynamicPlaceholderTextUtil_Reset();
DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gStringVar1); DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gStringVar1);
DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, gStringVar1); DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, gStringVar1);

8
src/reset_rtc_screen.c
View File

@ -300,19 +300,19 @@ static void PrintTime(u8 windowId, u8 x, u8 y, u16 days, u8 hours, u8 minutes, u
{ {
u8 *dest = gStringVar4; u8 *dest = gStringVar4;
ConvertIntToDecimalStringN(gStringVar1, days, 1, 4); ConvertIntToDecimalStringN(gStringVar1, days, STR_CONV_MODE_RIGHT_ALIGN, 4);
dest = StringCopy(dest, gStringVar1); dest = StringCopy(dest, gStringVar1);
dest = StringCopy(dest, gText_Day); dest = StringCopy(dest, gText_Day);
ConvertIntToDecimalStringN(gStringVar1, hours, 1, 3); ConvertIntToDecimalStringN(gStringVar1, hours, STR_CONV_MODE_RIGHT_ALIGN, 3);
dest = StringCopy(dest, gStringVar1); dest = StringCopy(dest, gStringVar1);
dest = StringCopy(dest, gText_Colon3); dest = StringCopy(dest, gText_Colon3);
ConvertIntToDecimalStringN(gStringVar1, minutes, 2, 2); ConvertIntToDecimalStringN(gStringVar1, minutes, STR_CONV_MODE_LEADING_ZEROS, 2);
dest = StringCopy(dest, gStringVar1); dest = StringCopy(dest, gStringVar1);
dest = StringCopy(dest, gText_Colon3); dest = StringCopy(dest, gText_Colon3);
ConvertIntToDecimalStringN(gStringVar1, seconds, 2, 2); ConvertIntToDecimalStringN(gStringVar1, seconds, STR_CONV_MODE_LEADING_ZEROS, 2);
dest = StringCopy(dest, gStringVar1); dest = StringCopy(dest, gStringVar1);
AddTextPrinterParameterized(windowId, 1, gStringVar4, x, y, TEXT_SPEED_FF, NULL); AddTextPrinterParameterized(windowId, 1, gStringVar4, x, y, TEXT_SPEED_FF, NULL);

2
src/roulette.c
View File

@ -3134,7 +3134,7 @@ static void Task_Roulette_0(u8 taskId)
s32 temp; s32 temp;
PrintCoinsString(gTasks[taskId].data[13]); PrintCoinsString(gTasks[taskId].data[13]);
temp = gUnknown_085B6344[(gSpecialVar_0x8004 & 1) + (gSpecialVar_0x8004 >> 7 << 1)]; temp = gUnknown_085B6344[(gSpecialVar_0x8004 & 1) + (gSpecialVar_0x8004 >> 7 << 1)];
ConvertIntToDecimalStringN(gStringVar1, temp, 2, 1); ConvertIntToDecimalStringN(gStringVar1, temp, STR_CONV_MODE_LEADING_ZEROS, 1);
if (gTasks[taskId].data[13] >= temp) if (gTasks[taskId].data[13] >= temp)
{ {
if ((gSpecialVar_0x8004 & 0x80) && (gSpecialVar_0x8004 & 1)) if ((gSpecialVar_0x8004 & 0x80) && (gSpecialVar_0x8004 & 1))

6
src/scrcmd.c
View File

@ -1612,10 +1612,10 @@ bool8 ScrCmd_buffermovename(struct ScriptContext *ctx)
bool8 ScrCmd_buffernumberstring(struct ScriptContext *ctx) bool8 ScrCmd_buffernumberstring(struct ScriptContext *ctx)
{ {
u8 stringVarIndex = ScriptReadByte(ctx); u8 stringVarIndex = ScriptReadByte(ctx);
u16 v1 = VarGet(ScriptReadHalfword(ctx)); u16 num = VarGet(ScriptReadHalfword(ctx));
u8 v2 = CountDigits(v1); u8 numDigits = CountDigits(num);
ConvertIntToDecimalStringN(sScriptStringVars[stringVarIndex], v1, 0, v2); ConvertIntToDecimalStringN(sScriptStringVars[stringVarIndex], num, STR_CONV_MODE_LEFT_ALIGN, numDigits);
return FALSE; return FALSE;
} }

2
src/shop.c
View File

@ -1147,7 +1147,7 @@ static void BuyMenuPrintItemQuantityAndPrice(u8 taskId)
FillWindowPixelBuffer(4, PIXEL_FILL(1)); FillWindowPixelBuffer(4, PIXEL_FILL(1));
PrintMoneyAmount(4, 38, 1, gShopDataPtr->totalCost, TEXT_SPEED_FF); PrintMoneyAmount(4, 38, 1, gShopDataPtr->totalCost, TEXT_SPEED_FF);
ConvertIntToDecimalStringN(gStringVar1, tItemCount, 2, 2); ConvertIntToDecimalStringN(gStringVar1, tItemCount, STR_CONV_MODE_LEADING_ZEROS, 2);
StringExpandPlaceholders(gStringVar4, gText_xVar1); StringExpandPlaceholders(gStringVar4, gText_xVar1);
BuyMenuPrint(4, gStringVar4, 0, 1, 0, 0); BuyMenuPrint(4, gStringVar4, 0, 1, 0, 0);
} }

34
src/trainer_card.c
View File

@ -1010,7 +1010,7 @@ static void PrintMoneyOnCard(void)
else else
AddTextPrinterParameterized3(1, 1, 16, 57, gUnknown_0856FB0C, TEXT_SPEED_FF, gText_TrainerCardMoney); AddTextPrinterParameterized3(1, 1, 16, 57, gUnknown_0856FB0C, TEXT_SPEED_FF, gText_TrainerCardMoney);
ConvertIntToDecimalStringN(gStringVar1, sData->trainerCard.money, 0, 6); ConvertIntToDecimalStringN(gStringVar1, sData->trainerCard.money, STR_CONV_MODE_LEFT_ALIGN, 6);
StringExpandPlaceholders(gStringVar4, gText_PokedollarVar1); StringExpandPlaceholders(gStringVar4, gText_PokedollarVar1);
if (!sData->isHoenn) if (!sData->isHoenn)
{ {
@ -1043,7 +1043,7 @@ static void PrintPokedexOnCard(void)
AddTextPrinterParameterized3(1, 1, 20, 72, gUnknown_0856FB0C, TEXT_SPEED_FF, gText_TrainerCardPokedex); AddTextPrinterParameterized3(1, 1, 20, 72, gUnknown_0856FB0C, TEXT_SPEED_FF, gText_TrainerCardPokedex);
else else
AddTextPrinterParameterized3(1, 1, 16, 73, gUnknown_0856FB0C, TEXT_SPEED_FF, gText_TrainerCardPokedex); AddTextPrinterParameterized3(1, 1, 16, 73, gUnknown_0856FB0C, TEXT_SPEED_FF, gText_TrainerCardPokedex);
StringCopy(ConvertIntToDecimalStringN(gStringVar4, sData->trainerCard.caughtMonsCount, 0, 3), gText_EmptyString6); StringCopy(ConvertIntToDecimalStringN(gStringVar4, sData->trainerCard.caughtMonsCount, STR_CONV_MODE_LEFT_ALIGN, 3), gText_EmptyString6);
if (!sData->isHoenn) if (!sData->isHoenn)
{ {
xOffset = GetStringRightAlignXOffset(1, gStringVar4, 144); xOffset = GetStringRightAlignXOffset(1, gStringVar4, 144);
@ -1103,12 +1103,12 @@ static void PrintTimeOnCard(void)
r7 -= r10; r7 -= r10;
FillWindowPixelRect(1, PIXEL_FILL(0), r7, r4, r10, 15); FillWindowPixelRect(1, PIXEL_FILL(0), r7, r4, r10, 15);
ConvertIntToDecimalStringN(gStringVar4, hours, 1, 3); ConvertIntToDecimalStringN(gStringVar4, hours, STR_CONV_MODE_RIGHT_ALIGN, 3);
AddTextPrinterParameterized3(1, 1, r7, r4, gUnknown_0856FB0C, TEXT_SPEED_FF, gStringVar4); AddTextPrinterParameterized3(1, 1, r7, r4, gUnknown_0856FB0C, TEXT_SPEED_FF, gStringVar4);
r7 += 18; r7 += 18;
AddTextPrinterParameterized3(1, 1, r7, r4, gUnknown_0856FB40[sData->var_7], TEXT_SPEED_FF, gText_Colon2); AddTextPrinterParameterized3(1, 1, r7, r4, gUnknown_0856FB40[sData->var_7], TEXT_SPEED_FF, gText_Colon2);
r7 += width; r7 += width;
ConvertIntToDecimalStringN(gStringVar4, minutes, 2, 2); ConvertIntToDecimalStringN(gStringVar4, minutes, STR_CONV_MODE_LEADING_ZEROS, 2);
AddTextPrinterParameterized3(1, 1, r7, r4, gUnknown_0856FB0C, TEXT_SPEED_FF, gStringVar4); AddTextPrinterParameterized3(1, 1, r7, r4, gUnknown_0856FB0C, TEXT_SPEED_FF, gStringVar4);
} }
@ -1151,9 +1151,9 @@ static void PrintHofTimeOnCard(void)
{ {
if (sData->hasHofResult) if (sData->hasHofResult)
{ {
ConvertIntToDecimalStringN(gStringVar1, sData->trainerCard.hofDebutHours, 1, 3); ConvertIntToDecimalStringN(gStringVar1, sData->trainerCard.hofDebutHours, STR_CONV_MODE_RIGHT_ALIGN, 3);
ConvertIntToDecimalStringN(gStringVar2, sData->trainerCard.hofDebutMinutes, 2, 2); ConvertIntToDecimalStringN(gStringVar2, sData->trainerCard.hofDebutMinutes, STR_CONV_MODE_LEADING_ZEROS, 2);
ConvertIntToDecimalStringN(gStringVar3, sData->trainerCard.hofDebutSeconds, 2, 2); ConvertIntToDecimalStringN(gStringVar3, sData->trainerCard.hofDebutSeconds, STR_CONV_MODE_LEADING_ZEROS, 2);
StringExpandPlaceholders(sData->var_93, gUnknown_0856FB4C); StringExpandPlaceholders(sData->var_93, gUnknown_0856FB4C);
} }
} }
@ -1180,8 +1180,8 @@ static void PrintLinkResultsNumsOnCard(void)
if (sData->hasLinkResults) if (sData->hasLinkResults)
{ {
StringCopy(sData->var_D9, gUnknown_0856FB5C[sData->cardType]); StringCopy(sData->var_D9, gUnknown_0856FB5C[sData->cardType]);
ConvertIntToDecimalStringN(sData->var_165, sData->trainerCard.linkBattleWins, 0, 4); ConvertIntToDecimalStringN(sData->var_165, sData->trainerCard.linkBattleWins, STR_CONV_MODE_LEFT_ALIGN, 4);
ConvertIntToDecimalStringN(sData->var_1AB, sData->trainerCard.linkBattleLosses, 0, 4); ConvertIntToDecimalStringN(sData->var_1AB, sData->trainerCard.linkBattleLosses, STR_CONV_MODE_LEFT_ALIGN, 4);
} }
} }
@ -1199,7 +1199,7 @@ static void PrintWinsLossesStringOnCard(void)
static void PrintTradesNumOnCard(void) static void PrintTradesNumOnCard(void)
{ {
if (sData->hasTrades) if (sData->hasTrades)
ConvertIntToDecimalStringN(sData->var_237, sData->trainerCard.pokemonTrades, 1, 5); ConvertIntToDecimalStringN(sData->var_237, sData->trainerCard.pokemonTrades, STR_CONV_MODE_RIGHT_ALIGN, 5);
} }
static void PrintTradesStringOnCard(void) static void PrintTradesStringOnCard(void)
@ -1211,7 +1211,7 @@ static void PrintTradesStringOnCard(void)
static void PrintBerryCrushNumOnCard(void) static void PrintBerryCrushNumOnCard(void)
{ {
if (sData->cardType == CARD_TYPE_FRLG && sData->trainerCard.berryCrushPoints) if (sData->cardType == CARD_TYPE_FRLG && sData->trainerCard.berryCrushPoints)
ConvertIntToDecimalStringN(sData->var_2C3, sData->trainerCard.berryCrushPoints, 1, 5); ConvertIntToDecimalStringN(sData->var_2C3, sData->trainerCard.berryCrushPoints, STR_CONV_MODE_RIGHT_ALIGN, 5);
} }
static void PrintBerryCrushStringOnCard(void) static void PrintBerryCrushStringOnCard(void)
@ -1223,7 +1223,7 @@ static void PrintBerryCrushStringOnCard(void)
static void PrintUnionNumOnCard(void) static void PrintUnionNumOnCard(void)
{ {
if (sData->cardType == CARD_TYPE_FRLG && sData->trainerCard.unionRoomNum) if (sData->cardType == CARD_TYPE_FRLG && sData->trainerCard.unionRoomNum)
ConvertIntToDecimalStringN(sData->var_34F, sData->trainerCard.unionRoomNum, 1, 5); ConvertIntToDecimalStringN(sData->var_34F, sData->trainerCard.unionRoomNum, STR_CONV_MODE_RIGHT_ALIGN, 5);
} }
static void PrintUnionStringOnCard(void) static void PrintUnionStringOnCard(void)
@ -1236,7 +1236,7 @@ static void PrintPokeblocksNumOnCard(void)
{ {
if (sData->cardType != CARD_TYPE_FRLG && sData->trainerCard.pokeblocksWithFriends) if (sData->cardType != CARD_TYPE_FRLG && sData->trainerCard.pokeblocksWithFriends)
{ {
ConvertIntToDecimalStringN(gStringVar1, sData->trainerCard.pokeblocksWithFriends, 1, 5); ConvertIntToDecimalStringN(gStringVar1, sData->trainerCard.pokeblocksWithFriends, STR_CONV_MODE_RIGHT_ALIGN, 5);
StringExpandPlaceholders(sData->var_395, gText_Var1DarkGreyShadowLightGrey); StringExpandPlaceholders(sData->var_395, gText_Var1DarkGreyShadowLightGrey);
} }
} }
@ -1250,7 +1250,7 @@ static void PrintPokeblockStringOnCard(void)
static void PrintContestNumOnCard(void) static void PrintContestNumOnCard(void)
{ {
if (sData->cardType != CARD_TYPE_FRLG && sData->trainerCard.contestsWithFriends) if (sData->cardType != CARD_TYPE_FRLG && sData->trainerCard.contestsWithFriends)
ConvertIntToDecimalStringN(sData->var_3DB, sData->trainerCard.contestsWithFriends, 1, 5); ConvertIntToDecimalStringN(sData->var_3DB, sData->trainerCard.contestsWithFriends, STR_CONV_MODE_RIGHT_ALIGN, 5);
} }
static void PrintContestStringOnCard(void) static void PrintContestStringOnCard(void)
@ -1266,15 +1266,15 @@ static void PrintBattleFacilityNumsOnCard(void)
case CARD_TYPE_RS: case CARD_TYPE_RS:
if (sData->hasBattleTowerWins) if (sData->hasBattleTowerWins)
{ {
ConvertIntToDecimalStringN(gStringVar1, sData->trainerCard.battleTowerWins, 1, 4); ConvertIntToDecimalStringN(gStringVar1, sData->trainerCard.battleTowerWins, STR_CONV_MODE_RIGHT_ALIGN, 4);
ConvertIntToDecimalStringN(gStringVar2, sData->trainerCard.battleTowerStraightWins, 1, 4); ConvertIntToDecimalStringN(gStringVar2, sData->trainerCard.battleTowerStraightWins, STR_CONV_MODE_RIGHT_ALIGN, 4);
StringExpandPlaceholders(sData->var_421, gText_WSlashStraightSlash); StringExpandPlaceholders(sData->var_421, gText_WSlashStraightSlash);
} }
break; break;
case CARD_TYPE_EMERALD: case CARD_TYPE_EMERALD:
if (sData->trainerCard.frontierBP) if (sData->trainerCard.frontierBP)
{ {
ConvertIntToDecimalStringN(gStringVar1, sData->trainerCard.frontierBP, 1, 5); ConvertIntToDecimalStringN(gStringVar1, sData->trainerCard.frontierBP, STR_CONV_MODE_RIGHT_ALIGN, 5);
StringExpandPlaceholders(sData->var_421, gText_Var1DarkLightGreyBP); StringExpandPlaceholders(sData->var_421, gText_Var1DarkLightGreyBP);
} }
break; break;