diff --git a/asm/macros/battle_frontier/battle_palace.inc b/asm/macros/battle_frontier/battle_palace.inc index 37c80467a79..e14442f2df8 100644 --- a/asm/macros/battle_frontier/battle_palace.inc +++ b/asm/macros/battle_frontier/battle_palace.inc @@ -31,7 +31,7 @@ special CallBattlePalaceFunction .endm - @ Buffer the opponents intro speech to gStringVar4. Also used by Battle Arena and Factory + @ Buffer the opponents intro speech to gStringVarBuffer. Also used by Battle Arena and Factory .macro palace_getopponentintro setvar VAR_0x8004, BATTLE_PALACE_FUNC_GET_OPPONENT_INTRO special CallBattlePalaceFunction diff --git a/asm/macros/battle_frontier/battle_pike.inc b/asm/macros/battle_frontier/battle_pike.inc index 30f5c88d831..37a2391ae44 100644 --- a/asm/macros/battle_frontier/battle_pike.inc +++ b/asm/macros/battle_frontier/battle_pike.inc @@ -78,7 +78,7 @@ special CallBattlePikeFunction .endm - @ Buffers a message for the lone NPC in the NPC room to gStringVar4 + @ Buffers a message for the lone NPC in the NPC room to gStringVarBuffer .macro pike_getnpcmsg setvar VAR_0x8004, BATTLE_PIKE_FUNC_BUFFER_NPC_MSG special CallBattlePikeFunction @@ -120,7 +120,7 @@ special CallBattlePikeFunction .endm - @ Buffer the opponents battle intro speech to gStringVar4. \trainer 0 for Trainer A, 1 for Trainer B + @ Buffer the opponents battle intro speech to gStringVarBuffer. \trainer 0 for Trainer A, 1 for Trainer B .macro pike_gettrainerintro trainer:req setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_TRAINER_INTRO setvar VAR_0x8005, \trainer diff --git a/asm/macros/event.inc b/asm/macros/event.inc index b8dedb7ffcf..e11ed43641c 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -1492,7 +1492,7 @@ .4byte \text .endm - @ Expands the given text at the pointer (- the relative address set by setvaddress) into gStringVar4 + @ Expands the given text at the pointer (- the relative address set by setvaddress) into gStringVarBuffer .macro vbuffermessage text:req .byte SCR_OP_VBUFFERMESSAGE .4byte \text diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc index 844ec070a60..f1c1b65f4e9 100644 --- a/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc @@ -89,7 +89,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_AnnounceTrainers:: applymovement LOCALID_OPPONENT, BattleFrontier_BattleArenaBattleRoom_Movement_OpponentStepForward waitmovement 0 palace_getopponentintro - msgbox gStringVar4, MSGBOX_DEFAULT + msgbox gStringVarBuffer, MSGBOX_DEFAULT waitmessage call BattleFrontier_BattleArenaBattleRoom_EventScript_DoArenaBattle switch VAR_RESULT diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc index def903b1dfe..16dd87e0b5d 100644 --- a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc @@ -74,7 +74,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_BattleOpponent:: applymovement LOCALID_OPPONENT, BattleFrontier_BattleDomeBattleRoom_Movement_OpponentStepForward waitmovement 0 tower_getopponentintro 0 - msgbox gStringVar4, MSGBOX_DEFAULT + msgbox gStringVarBuffer, MSGBOX_DEFAULT closemessage dome_initopponentparty call BattleFrontier_BattleDomeBattleRoom_EventScript_DoDomeBattle diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc index cf44e3118e9..b8047a9cba1 100644 --- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc @@ -82,7 +82,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_BattleOpponent:: goto_if_ne VAR_TEMP_F, FRONTIER_BRAIN_NOT_READY, BattleFrontier_BattleFactoryBattleRoom_EventScript_BattleNoland palace_getopponentintro lockall - msgbox gStringVar4, MSGBOX_DEFAULT + msgbox gStringVarBuffer, MSGBOX_DEFAULT waitmessage closemessage frontier_set FRONTIER_DATA_RECORD_DISABLED, FALSE diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc index 2e9366d44b8..4d70cde6296 100644 --- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc @@ -60,7 +60,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_NextOpponentEnter:: applymovement LOCALID_OPPONENT, BattleFrontier_BattlePalaceBattleRoom_Movement_OpponentEnter waitmovement 0 palace_getopponentintro - msgbox gStringVar4, MSGBOX_DEFAULT + msgbox gStringVarBuffer, MSGBOX_DEFAULT waitmessage call BattleFrontier_BattlePalaceBattleRoom_EventScript_DoPalaceBattle switch VAR_RESULT diff --git a/data/maps/BattleFrontier_BattlePikeRoomNormal/scripts.inc b/data/maps/BattleFrontier_BattlePikeRoomNormal/scripts.inc index 45f042e4f8f..89cc624d865 100644 --- a/data/maps/BattleFrontier_BattlePikeRoomNormal/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeRoomNormal/scripts.inc @@ -32,7 +32,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_EnterSingleBattleRoom:: applymovement LOCALID_OBJ_0, BattleFrontier_BattlePikeRoomNormal_Movement_ApproachPlayer waitmovement 0 pike_gettrainerintro 0 - msgbox gStringVar4, MSGBOX_DEFAULT + msgbox gStringVarBuffer, MSGBOX_DEFAULT waitmessage closemessage releaseall @@ -62,7 +62,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_EnterHardBattleRoom:: applymovement LOCALID_OBJ_0, BattleFrontier_BattlePikeRoomNormal_Movement_ApproachPlayer waitmovement 0 pike_gettrainerintro 0 - msgbox gStringVar4, MSGBOX_DEFAULT + msgbox gStringVarBuffer, MSGBOX_DEFAULT waitmessage closemessage releaseall @@ -249,13 +249,13 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_EnterDoubleBattleRoom:: applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_PlayerFaceTrainer1 waitmovement 0 pike_gettrainerintro 0 - msgbox gStringVar4, MSGBOX_DEFAULT + msgbox gStringVarBuffer, MSGBOX_DEFAULT closemessage delay 16 applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_PlayerFaceTrainer2 waitmovement 0 pike_gettrainerintro 1 - msgbox gStringVar4, MSGBOX_DEFAULT + msgbox gStringVarBuffer, MSGBOX_DEFAULT closemessage setvar VAR_0x8004, SPECIAL_BATTLE_PIKE_DOUBLE setvar VAR_0x8005, 0 @@ -539,7 +539,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_NormalNPC:: lock faceplayer pike_getnpcmsg - msgbox gStringVar4, MSGBOX_DEFAULT + msgbox gStringVarBuffer, MSGBOX_DEFAULT waitmessage closemessage release diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc index 9b466af3bc1..70cbc9bb1b5 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc @@ -40,7 +40,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_OpponentEnter:: applymovement LOCALID_OPPONENT, BattleFrontier_BattleTowerBattleRoom_Movement_OpponentEnter waitmovement 0 tower_getopponentintro 0 - msgbox gStringVar4, MSGBOX_DEFAULT + msgbox gStringVarBuffer, MSGBOX_DEFAULT waitmessage call BattleFrontier_BattleTowerBattleRoom_EventScript_DoTowerBattle switch VAR_RESULT diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc index e1cb64dda00..bfc536d5690 100644 --- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc @@ -75,12 +75,12 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_OpponentsEnter:: delay 15 applymovement LOCALID_OPPONENT_1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_WalkInPlaceLeft waitmovement 0 - msgbox gStringVar4, MSGBOX_DEFAULT + msgbox gStringVarBuffer, MSGBOX_DEFAULT waitmessage tower_getopponentintro 1 applymovement LOCALID_OPPONENT_2, BattleFrontier_BattleTowerMultiBattleRoom_Movement_WalkInPlaceLeft waitmovement 0 - msgbox gStringVar4, MSGBOX_DEFAULT + msgbox gStringVarBuffer, MSGBOX_DEFAULT waitmessage goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_DoTowerBattle @@ -89,13 +89,13 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_DoOpponentIntrosLink:: delay 15 applymovement LOCALID_OPPONENT_1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_WalkInPlaceLeft waitmovement 0 - messageautoscroll gStringVar4 + messageautoscroll gStringVarBuffer waitmessage delay 48 tower_getopponentintro 1 applymovement LOCALID_OPPONENT_2, BattleFrontier_BattleTowerMultiBattleRoom_Movement_WalkInPlaceLeft waitmovement 0 - messageautoscroll gStringVar4 + messageautoscroll gStringVarBuffer waitmessage delay 48 BattleFrontier_BattleTowerMultiBattleRoom_EventScript_DoTowerBattle:: diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc index 707995daeb1..13ebf9f50df 100644 --- a/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc +++ b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc @@ -54,7 +54,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_NextOpponentEnter:: waitmovement 0 msgbox BattleFrontier_BattleArenaBattleRoom_Text_SetKOTourneyBegin, MSGBOX_DEFAULT battletent_getopponentintro - msgbox gStringVar4, MSGBOX_DEFAULT + msgbox gStringVarBuffer, MSGBOX_DEFAULT waitmessage call BattleFrontier_BattleArenaBattleRoom_EventScript_DoArenaBattle switch VAR_RESULT diff --git a/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc b/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc index 53514bb5e95..2ef3bcb3a1d 100644 --- a/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc +++ b/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc @@ -53,7 +53,7 @@ SlateportCity_BattleTentBattleRoom_EventScript_EnterRoom:: waitmovement 0 battletent_getopponentintro lockall - msgbox gStringVar4, MSGBOX_DEFAULT + msgbox gStringVarBuffer, MSGBOX_DEFAULT waitmessage closemessage special HealPlayerParty diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc index 533eb7cfa51..c7386207492 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc @@ -16,7 +16,7 @@ SootopolisCity_MysteryEventsHouse_B1F_EventScript_BattleVisitingTrainer:: applymovement OBJ_EVENT_ID_PLAYER, SootopolisCity_MysteryEventsHouse_B1F_Movement_PlayerEnterBasement waitmovement 0 special CopyEReaderTrainerGreeting - msgbox gStringVar4, MSGBOX_DEFAULT + msgbox gStringVarBuffer, MSGBOX_DEFAULT closemessage setvar VAR_0x8004, SPECIAL_BATTLE_EREADER setvar VAR_0x8005, 0 diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc index 29008b7c0f4..0b2b2e4c301 100644 --- a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc +++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc @@ -48,7 +48,7 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_NextOpponentEnter:: applymovement LOCALID_OPPONENT, VerdanturfTown_BattleTentBattleRoom_Movement_OpponentEnter waitmovement 0 battletent_getopponentintro - msgbox gStringVar4, MSGBOX_DEFAULT + msgbox gStringVarBuffer, MSGBOX_DEFAULT waitmessage call BattleFrontier_BattlePalaceBattleRoom_EventScript_DoPalaceBattle switch VAR_RESULT diff --git a/include/string_util.h b/include/string_util.h index 0a8a99fb98d..dc91c017f32 100644 --- a/include/string_util.h +++ b/include/string_util.h @@ -4,7 +4,7 @@ extern u8 gStringVar1[0x100]; extern u8 gStringVar2[0x100]; extern u8 gStringVar3[0x100]; -extern u8 gStringVar4[0x3E8]; +extern u8 gStringVarBuffer[0x3E8]; enum StringConvertMode { diff --git a/src/apprentice.c b/src/apprentice.c index 72ab8f24c82..d457e90df57 100644 --- a/src/apprentice.c +++ b/src/apprentice.c @@ -129,7 +129,7 @@ void BufferApprenticeChallengeText(u8 saveApprenticeId) ConvertInternationalString(gStringVar1, gSaveBlock2Ptr->apprentices[saveApprenticeId].language); ConvertIntToDecimalStringN(gStringVar2, gSaveBlock2Ptr->apprentices[saveApprenticeId].number, STR_CONV_MODE_RIGHT_ALIGN, i); challengeText = sApprenticeChallengeTexts[gSaveBlock2Ptr->apprentices[saveApprenticeId].id]; - StringExpandPlaceholders(gStringVar4, challengeText); + StringExpandPlaceholders(gStringVarBuffer, challengeText); } void Apprentice_ScriptContext_Enable(void) @@ -902,7 +902,7 @@ static void PrintApprenticeMessage(void) return; } - StringExpandPlaceholders(gStringVar4, string); + StringExpandPlaceholders(gStringVarBuffer, string); AddTextPrinterForMessage(TRUE); CreateTask(Task_WaitForPrintingMessage, 1); } @@ -1082,7 +1082,7 @@ static void ApprenticeBufferString(void) break; case APPRENTICE_BUFF_WIN_SPEECH: FrontierSpeechToString(gSaveBlock2Ptr->apprentices[0].speechWon); - StringCopy(stringDst, gStringVar4); + StringCopy(stringDst, gStringVarBuffer); break; case APPRENTICE_BUFF_LEAD_MON_SPECIES: speciesArrayId = APPRENTICE_SPECIES_ID(PLAYER_APPRENTICE.leadMonId); diff --git a/src/battle_dome.c b/src/battle_dome.c index 68cae14a6eb..59136742dda 100644 --- a/src/battle_dome.c +++ b/src/battle_dome.c @@ -4928,8 +4928,8 @@ static void DisplayMatchInfoOnCard(u8 flags, u8 matchNo) textPrinter.fgColor = TEXT_DYNAMIC_COLOR_5; textPrinter.bgColor = TEXT_COLOR_TRANSPARENT; textPrinter.shadowColor = TEXT_DYNAMIC_COLOR_4; - StringExpandPlaceholders(gStringVar4, sBattleDomeWinTexts[winStringId]); - textPrinter.currentChar = gStringVar4; + StringExpandPlaceholders(gStringVarBuffer, sBattleDomeWinTexts[winStringId]); + textPrinter.currentChar = gStringVarBuffer; textPrinter.windowId = windowId + WIN_MATCH_WIN_TEXT; textPrinter.fontId = FONT_NORMAL; PutWindowTilemap(windowId + WIN_MATCH_WIN_TEXT); diff --git a/src/battle_factory_screen.c b/src/battle_factory_screen.c index adf241153fd..46fa86adf23 100644 --- a/src/battle_factory_screen.c +++ b/src/battle_factory_screen.c @@ -1884,9 +1884,9 @@ static void Select_PrintMonSpecies(void) FillWindowPixelBuffer(SELECT_WIN_SPECIES, PIXEL_FILL(0)); species = GetMonData(&sFactorySelectScreen->mons[monId].monData, MON_DATA_SPECIES, NULL); - StringCopy(gStringVar4, gSpeciesNames[species]); - x = GetStringRightAlignXOffset(FONT_NORMAL, gStringVar4, 86); - AddTextPrinterParameterized3(SELECT_WIN_SPECIES, FONT_NORMAL, x, 1, sSpeciesNameTextColors, 0, gStringVar4); + StringCopy(gStringVarBuffer, gSpeciesNames[species]); + x = GetStringRightAlignXOffset(FONT_NORMAL, gStringVarBuffer, 86); + AddTextPrinterParameterized3(SELECT_WIN_SPECIES, FONT_NORMAL, x, 1, sSpeciesNameTextColors, 0, gStringVarBuffer); CopyWindowToVram(SELECT_WIN_SPECIES, COPYWIN_GFX); } @@ -3789,9 +3789,9 @@ static void Swap_PrintMonSpecies(void) species = GetMonData(&gPlayerParty[monId], MON_DATA_SPECIES, NULL); else species = GetMonData(&gEnemyParty[monId], MON_DATA_SPECIES, NULL); - StringCopy(gStringVar4, gSpeciesNames[species]); - x = GetStringRightAlignXOffset(FONT_NORMAL, gStringVar4, 86); - AddTextPrinterParameterized3(SWAP_WIN_SPECIES, FONT_NORMAL, x, 1, sSwapSpeciesNameTextColors, 0, gStringVar4); + StringCopy(gStringVarBuffer, gSpeciesNames[species]); + x = GetStringRightAlignXOffset(FONT_NORMAL, gStringVarBuffer, 86); + AddTextPrinterParameterized3(SWAP_WIN_SPECIES, FONT_NORMAL, x, 1, sSwapSpeciesNameTextColors, 0, gStringVarBuffer); CopyWindowToVram(SWAP_WIN_SPECIES, COPYWIN_FULL); } } @@ -3898,9 +3898,9 @@ static void Swap_PrintMonSpeciesAtFade(void) species = GetMonData(&gPlayerParty[monId], MON_DATA_SPECIES, NULL); else species = GetMonData(&gEnemyParty[monId], MON_DATA_SPECIES, NULL); - StringCopy(gStringVar4, gSpeciesNames[species]); - x = GetStringRightAlignXOffset(FONT_NORMAL, gStringVar4, 86); - AddTextPrinterParameterized3(SWAP_WIN_SPECIES_AT_FADE, FONT_NORMAL, x, 1, sSwapSpeciesNameTextColors, 0, gStringVar4); + StringCopy(gStringVarBuffer, gSpeciesNames[species]); + x = GetStringRightAlignXOffset(FONT_NORMAL, gStringVarBuffer, 86); + AddTextPrinterParameterized3(SWAP_WIN_SPECIES_AT_FADE, FONT_NORMAL, x, 1, sSwapSpeciesNameTextColors, 0, gStringVarBuffer); CopyWindowToVram(SWAP_WIN_SPECIES_AT_FADE, COPYWIN_FULL); } } @@ -3925,9 +3925,9 @@ static void Swap_PrintMonSpeciesForTransition(void) species = GetMonData(&gPlayerParty[monId], MON_DATA_SPECIES, NULL); else species = GetMonData(&gEnemyParty[monId], MON_DATA_SPECIES, NULL); - StringCopy(gStringVar4, gSpeciesNames[species]); - x = GetStringRightAlignXOffset(FONT_NORMAL, gStringVar4, 86); - AddTextPrinterParameterized3(SWAP_WIN_SPECIES, FONT_NORMAL, x, 1, sSwapSpeciesNameTextColors, 0, gStringVar4); + StringCopy(gStringVarBuffer, gSpeciesNames[species]); + x = GetStringRightAlignXOffset(FONT_NORMAL, gStringVarBuffer, 86); + AddTextPrinterParameterized3(SWAP_WIN_SPECIES, FONT_NORMAL, x, 1, sSwapSpeciesNameTextColors, 0, gStringVarBuffer); CopyWindowToVram(SWAP_WIN_SPECIES, COPYWIN_FULL); } } diff --git a/src/battle_message.c b/src/battle_message.c index d539bc540dc..1b38c9f8786 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -2601,12 +2601,12 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst) if (gBattleTypeFlags & BATTLE_TYPE_FRONTIER) { CopyFrontierTrainerText(FRONTIER_PLAYER_WON_TEXT, gTrainerBattleOpponent_A); - toCpy = gStringVar4; + toCpy = gStringVarBuffer; } else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER_HILL) { CopyTrainerHillTrainerText(TRAINER_HILL_TEXT_PLAYER_WON, gTrainerBattleOpponent_A); - toCpy = gStringVar4; + toCpy = gStringVarBuffer; } else { @@ -2617,12 +2617,12 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst) if (gBattleTypeFlags & BATTLE_TYPE_FRONTIER) { CopyFrontierTrainerText(FRONTIER_PLAYER_LOST_TEXT, gTrainerBattleOpponent_A); - toCpy = gStringVar4; + toCpy = gStringVarBuffer; } else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER_HILL) { CopyTrainerHillTrainerText(TRAINER_HILL_TEXT_PLAYER_LOST, gTrainerBattleOpponent_A); - toCpy = gStringVar4; + toCpy = gStringVarBuffer; } break; case B_TXT_26: // ? @@ -2698,12 +2698,12 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst) if (gBattleTypeFlags & BATTLE_TYPE_FRONTIER) { CopyFrontierTrainerText(FRONTIER_PLAYER_WON_TEXT, gTrainerBattleOpponent_B); - toCpy = gStringVar4; + toCpy = gStringVarBuffer; } else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER_HILL) { CopyTrainerHillTrainerText(TRAINER_HILL_TEXT_PLAYER_WON, gTrainerBattleOpponent_B); - toCpy = gStringVar4; + toCpy = gStringVarBuffer; } else { @@ -2714,12 +2714,12 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst) if (gBattleTypeFlags & BATTLE_TYPE_FRONTIER) { CopyFrontierTrainerText(FRONTIER_PLAYER_LOST_TEXT, gTrainerBattleOpponent_B); - toCpy = gStringVar4; + toCpy = gStringVarBuffer; } else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER_HILL) { CopyTrainerHillTrainerText(TRAINER_HILL_TEXT_PLAYER_LOST, gTrainerBattleOpponent_B); - toCpy = gStringVar4; + toCpy = gStringVarBuffer; } break; case B_TXT_PARTNER_CLASS: diff --git a/src/battle_pyramid_bag.c b/src/battle_pyramid_bag.c index bf9a7704b10..05264e95701 100644 --- a/src/battle_pyramid_bag.c +++ b/src/battle_pyramid_bag.c @@ -671,9 +671,9 @@ static void PrintItemQuantity(u8 windowId, u32 itemIndex, u8 y) gSaveBlock2Ptr->frontier.pyramidBag.quantity[gSaveBlock2Ptr->frontier.lvlMode][itemIndex], STR_CONV_MODE_RIGHT_ALIGN, 2); - StringExpandPlaceholders(gStringVar4, gText_xVar1); - xAlign = GetStringRightAlignXOffset(FONT_NARROW, gStringVar4, 119); - PyramidBagPrint_Quantity(windowId, gStringVar4, xAlign, y, 0, 0, TEXT_SKIP_DRAW, COLORID_DARK_GRAY); + StringExpandPlaceholders(gStringVarBuffer, gText_xVar1); + xAlign = GetStringRightAlignXOffset(FONT_NARROW, gStringVarBuffer, 119); + PyramidBagPrint_Quantity(windowId, gStringVarBuffer, xAlign, y, 0, 0, TEXT_SKIP_DRAW, COLORID_DARK_GRAY); } static void PrintItemDescription(s32 listMenuId) @@ -686,8 +686,8 @@ static void PrintItemDescription(s32 listMenuId) else { StringCopy(gStringVar1, gPyramidBagMenu_ReturnToStrings[gPyramidBagMenuState.location]); - StringExpandPlaceholders(gStringVar4, gText_ReturnToVar1); - desc = gStringVar4; + StringExpandPlaceholders(gStringVarBuffer, gText_ReturnToVar1); + desc = gStringVarBuffer; } FillWindowPixelBuffer(WIN_INFO, PIXEL_FILL(0)); PyramidBagPrint(WIN_INFO, desc, 3, 0, 0, 1, 0, COLORID_DARK_GRAY); @@ -960,9 +960,9 @@ static void OpenContextMenu(u8 taskId) } CopyItemName(gSpecialVar_ItemId, gStringVar1); - StringExpandPlaceholders(gStringVar4, gText_Var1IsSelected); + StringExpandPlaceholders(gStringVarBuffer, gText_Var1IsSelected); FillWindowPixelBuffer(WIN_INFO, PIXEL_FILL(0)); - PyramidBagPrint(WIN_INFO, gStringVar4, 3, 0, 0, 1, 0, COLORID_DARK_GRAY); + PyramidBagPrint(WIN_INFO, gStringVarBuffer, 3, 0, 0, 1, 0, COLORID_DARK_GRAY); if (gPyramidBagMenu->menuActionsCount == 1) PrintMenuActionText_SingleRow(OpenMenuActionWindowById(MENU_WIN_1x1)); else if (gPyramidBagMenu->menuActionsCount == 2) @@ -1135,9 +1135,9 @@ static void BagAction_Toss(u8 taskId) else { CopyItemName(gSpecialVar_ItemId, gStringVar1); - StringExpandPlaceholders(gStringVar4, gText_TossHowManyVar1s); + StringExpandPlaceholders(gStringVarBuffer, gText_TossHowManyVar1s); FillWindowPixelBuffer(WIN_INFO, PIXEL_FILL(0)); - PyramidBagPrint(WIN_INFO, gStringVar4, 3, 0, 0, 1, 0, COLORID_DARK_GRAY); + PyramidBagPrint(WIN_INFO, gStringVarBuffer, 3, 0, 0, 1, 0, COLORID_DARK_GRAY); ShowNumToToss(); gTasks[taskId].func = Task_ChooseHowManyToToss; } @@ -1149,9 +1149,9 @@ static void AskConfirmToss(u8 taskId) CopyItemName(gSpecialVar_ItemId, gStringVar1); ConvertIntToDecimalStringN(gStringVar2, tNumToToss, STR_CONV_MODE_LEFT_ALIGN, 2); - StringExpandPlaceholders(gStringVar4, gText_ConfirmTossItems); + StringExpandPlaceholders(gStringVarBuffer, gText_ConfirmTossItems); FillWindowPixelBuffer(WIN_INFO, PIXEL_FILL(0)); - PyramidBagPrint(WIN_INFO, gStringVar4, 3, 0, 0, 1, 0, COLORID_DARK_GRAY); + PyramidBagPrint(WIN_INFO, gStringVarBuffer, 3, 0, 0, 1, 0, COLORID_DARK_GRAY); CreatePyramidBagYesNo(taskId, &sYesNoTossFuncions); } @@ -1168,19 +1168,19 @@ static void ShowNumToToss(void) { s32 x; ConvertIntToDecimalStringN(gStringVar1, 1, STR_CONV_MODE_LEADING_ZEROS, 2); - StringExpandPlaceholders(gStringVar4, gText_xVar1); + StringExpandPlaceholders(gStringVarBuffer, gText_xVar1); DrawTossNumberWindow(WIN_TOSS_NUM); - x = GetStringCenterAlignXOffset(FONT_NORMAL, gStringVar4, 0x28); - AddTextPrinterParameterized(WIN_TOSS_NUM, FONT_NORMAL, gStringVar4, x, 2, 0, NULL); + x = GetStringCenterAlignXOffset(FONT_NORMAL, gStringVarBuffer, 0x28); + AddTextPrinterParameterized(WIN_TOSS_NUM, FONT_NORMAL, gStringVarBuffer, x, 2, 0, NULL); } static void UpdateNumToToss(s16 num) { s32 x; ConvertIntToDecimalStringN(gStringVar1, num, STR_CONV_MODE_LEADING_ZEROS, 2); - StringExpandPlaceholders(gStringVar4, gText_xVar1); - x = GetStringCenterAlignXOffset(FONT_NORMAL, gStringVar4, 0x28); - AddTextPrinterParameterized(WIN_TOSS_NUM, FONT_NORMAL, gStringVar4, x, 2, 0, NULL); + StringExpandPlaceholders(gStringVarBuffer, gText_xVar1); + x = GetStringCenterAlignXOffset(FONT_NORMAL, gStringVarBuffer, 0x28); + AddTextPrinterParameterized(WIN_TOSS_NUM, FONT_NORMAL, gStringVarBuffer, x, 2, 0, NULL); } static void Task_ChooseHowManyToToss(u8 taskId) @@ -1217,9 +1217,9 @@ static void TossItem(u8 taskId) CopyItemName(gSpecialVar_ItemId, gStringVar1); ConvertIntToDecimalStringN(gStringVar2, tNumToToss, STR_CONV_MODE_LEFT_ALIGN, 2); - StringExpandPlaceholders(gStringVar4, gText_ThrewAwayVar2Var1s); + StringExpandPlaceholders(gStringVarBuffer, gText_ThrewAwayVar2Var1s); FillWindowPixelBuffer(WIN_INFO, PIXEL_FILL(0)); - PyramidBagPrint(WIN_INFO, gStringVar4, 3, 0, 0, 1, 0, COLORID_DARK_GRAY); + PyramidBagPrint(WIN_INFO, gStringVarBuffer, 3, 0, 0, 1, 0, COLORID_DARK_GRAY); gTasks[taskId].func = Task_TossItem; } @@ -1264,8 +1264,8 @@ static void BagAction_Give(u8 taskId) static void ShowCantHoldMessage(u8 taskId) { CopyItemName(gSpecialVar_ItemId, gStringVar1); - StringExpandPlaceholders(gStringVar4, gText_Var1CantBeHeld); - DisplayItemMessageInBattlePyramid(taskId, gStringVar4, Task_WaitCloseErrorMessage); + StringExpandPlaceholders(gStringVarBuffer, gText_Var1CantBeHeld); + DisplayItemMessageInBattlePyramid(taskId, gStringVarBuffer, Task_WaitCloseErrorMessage); } static void Task_WaitCloseErrorMessage(u8 taskId) @@ -1314,9 +1314,9 @@ static void Task_BeginItemSwap(u8 taskId) gPyramidBagMenu->toSwapPos = tListPos; ListMenuSetUnkIndicatorsStructField(tListTaskId, 0x10, 1); CopyItemName(gSaveBlock2Ptr->frontier.pyramidBag.itemId[gSaveBlock2Ptr->frontier.lvlMode][tListPos], gStringVar1); - StringExpandPlaceholders(gStringVar4, gText_MoveVar1Where); + StringExpandPlaceholders(gStringVarBuffer, gText_MoveVar1Where); FillWindowPixelBuffer(WIN_INFO, PIXEL_FILL(0)); - PyramidBagPrint(WIN_INFO, gStringVar4, 3, 0, 0, 1, 0, COLORID_DARK_GRAY); + PyramidBagPrint(WIN_INFO, gStringVarBuffer, 3, 0, 0, 1, 0, COLORID_DARK_GRAY); PrintSelectorArrow(tListTaskId, COLORID_LIGHT_GRAY); UpdateSwapLinePos(tListPos); gTasks[taskId].func = Task_ItemSwapHandleInput; diff --git a/src/battle_records.c b/src/battle_records.c index edc48d82027..419d6f81af9 100644 --- a/src/battle_records.c +++ b/src/battle_records.c @@ -277,10 +277,10 @@ static void PrintLinkBattleWinsLossesDraws(struct LinkBattleRecord *records) ConvertIntToDecimalStringN(gStringVar1, GetGameStat(GAME_STAT_LINK_BATTLE_WINS), STR_CONV_MODE_LEFT_ALIGN, 4); ConvertIntToDecimalStringN(gStringVar2, GetGameStat(GAME_STAT_LINK_BATTLE_LOSSES), STR_CONV_MODE_LEFT_ALIGN, 4); ConvertIntToDecimalStringN(gStringVar3, GetGameStat(GAME_STAT_LINK_BATTLE_DRAWS), STR_CONV_MODE_LEFT_ALIGN, 4); - StringExpandPlaceholders(gStringVar4, gText_TotalRecordWLD); + StringExpandPlaceholders(gStringVarBuffer, gText_TotalRecordWLD); - x = GetStringCenterAlignXOffset(FONT_NORMAL, gStringVar4, 0xD0); - AddTextPrinterParameterized(gRecordsWindowId, FONT_NORMAL, gStringVar4, x, 0x11, 0, NULL); + x = GetStringCenterAlignXOffset(FONT_NORMAL, gStringVarBuffer, 0xD0); + AddTextPrinterParameterized(gRecordsWindowId, FONT_NORMAL, gStringVarBuffer, x, 0x11, 0, NULL); } static void PrintLinkBattleRecord(struct LinkBattleRecord *record, u8 y, s32 language) @@ -319,14 +319,14 @@ void ShowLinkBattleRecords(void) gRecordsWindowId = AddWindow(&sLinkBattleRecordsWindow); DrawStdWindowFrame(gRecordsWindowId, FALSE); FillWindowPixelBuffer(gRecordsWindowId, PIXEL_FILL(1)); - StringExpandPlaceholders(gStringVar4, gText_PlayersBattleResults); + StringExpandPlaceholders(gStringVarBuffer, gText_PlayersBattleResults); - x = GetStringCenterAlignXOffset(FONT_NORMAL, gStringVar4, 208); - AddTextPrinterParameterized(gRecordsWindowId, FONT_NORMAL, gStringVar4, x, 1, 0, NULL); + x = GetStringCenterAlignXOffset(FONT_NORMAL, gStringVarBuffer, 208); + AddTextPrinterParameterized(gRecordsWindowId, FONT_NORMAL, gStringVarBuffer, x, 1, 0, NULL); PrintLinkBattleWinsLossesDraws(gSaveBlock1Ptr->linkBattleRecords.entries); - StringExpandPlaceholders(gStringVar4, gText_WinLoseDraw); - AddTextPrinterParameterized(gRecordsWindowId, FONT_NORMAL, gStringVar4, 0, 41, 0, NULL); + StringExpandPlaceholders(gStringVarBuffer, gText_WinLoseDraw); + AddTextPrinterParameterized(gRecordsWindowId, FONT_NORMAL, gStringVarBuffer, 0, 41, 0, NULL); for (i = 0; i < LINK_B_RECORDS_COUNT; i++) { diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 1891ea92857..f93b5216c89 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -6079,9 +6079,9 @@ static void DrawLevelUpBannerText(void) monLevel = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_LEVEL); monGender = GetMonGender(&gPlayerParty[gBattleStruct->expGetterMonId]); - GetMonNickname(&gPlayerParty[gBattleStruct->expGetterMonId], gStringVar4); + GetMonNickname(&gPlayerParty[gBattleStruct->expGetterMonId], gStringVarBuffer); - printerTemplate.currentChar = gStringVar4; + printerTemplate.currentChar = gStringVarBuffer; printerTemplate.windowId = B_WIN_LEVEL_UP_BANNER; printerTemplate.fontId = FONT_SMALL; printerTemplate.x = 32; @@ -6097,7 +6097,7 @@ static void DrawLevelUpBannerText(void) AddTextPrinter(&printerTemplate, TEXT_SKIP_DRAW, NULL); - txtPtr = gStringVar4; + txtPtr = gStringVarBuffer; *(txtPtr)++ = CHAR_EXTRA_SYMBOL; *(txtPtr)++ = CHAR_LV_2; diff --git a/src/battle_setup.c b/src/battle_setup.c index ba5cdef0dca..66fab8e826d 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -1522,14 +1522,14 @@ const u8 *GetTrainerALoseText(void) else string = sTrainerADefeatSpeech; - StringExpandPlaceholders(gStringVar4, ReturnEmptyStringIfNull(string)); - return gStringVar4; + StringExpandPlaceholders(gStringVarBuffer, ReturnEmptyStringIfNull(string)); + return gStringVarBuffer; } const u8 *GetTrainerBLoseText(void) { - StringExpandPlaceholders(gStringVar4, ReturnEmptyStringIfNull(sTrainerBDefeatSpeech)); - return gStringVar4; + StringExpandPlaceholders(gStringVarBuffer, ReturnEmptyStringIfNull(sTrainerBDefeatSpeech)); + return gStringVarBuffer; } const u8 *GetTrainerWonSpeech(void) diff --git a/src/battle_tower.c b/src/battle_tower.c index 0420a15f63d..b2a340a7101 100644 --- a/src/battle_tower.c +++ b/src/battle_tower.c @@ -1918,18 +1918,18 @@ static void FillFactoryTentTrainerParty(u16 trainerId, u8 firstMonId) void FrontierSpeechToString(const u16 *words) { - ConvertEasyChatWordsToString(gStringVar4, words, 3, 2); - if (GetStringWidth(FONT_NORMAL, gStringVar4, -1) > 204u) + ConvertEasyChatWordsToString(gStringVarBuffer, words, 3, 2); + if (GetStringWidth(FONT_NORMAL, gStringVarBuffer, -1) > 204u) { s32 i = 0; - ConvertEasyChatWordsToString(gStringVar4, words, 2, 3); - while (gStringVar4[i++] != CHAR_NEWLINE) + ConvertEasyChatWordsToString(gStringVarBuffer, words, 2, 3); + while (gStringVarBuffer[i++] != CHAR_NEWLINE) ; - while (gStringVar4[i] != CHAR_NEWLINE) + while (gStringVarBuffer[i] != CHAR_NEWLINE) i++; - gStringVar4[i] = CHAR_PROMPT_SCROLL; + gStringVarBuffer[i] = CHAR_PROMPT_SCROLL; } } @@ -2936,7 +2936,7 @@ void CopyEReaderTrainerGreeting(void) static void CopyEReaderTrainerFarewellMessage(void) { if (gBattleOutcome == B_OUTCOME_DREW) - gStringVar4[0] = EOS; + gStringVarBuffer[0] = EOS; else if (gBattleOutcome == B_OUTCOME_WON) FrontierSpeechToString(gSaveBlock2Ptr->frontier.ereaderTrainer.farewellPlayerWon); else diff --git a/src/berry_blender.c b/src/berry_blender.c index 5f0e1706077..0bbffab8d0a 100644 --- a/src/berry_blender.c +++ b/src/berry_blender.c @@ -2846,16 +2846,16 @@ static void CB2_CheckPlayAgainLink(void) break; case 1: sBerryBlender->gameEndState = 3; - StringCopy(gStringVar4, gLinkPlayers[sBerryBlender->canceledPlayerId].name); - StringAppend(gStringVar4, sText_ApostropheSPokeblockCaseIsFull); + StringCopy(gStringVarBuffer, gLinkPlayers[sBerryBlender->canceledPlayerId].name); + StringAppend(gStringVarBuffer, sText_ApostropheSPokeblockCaseIsFull); break; case 2: sBerryBlender->gameEndState++; - StringCopy(gStringVar4, gLinkPlayers[sBerryBlender->canceledPlayerId].name); - StringAppend(gStringVar4, sText_HasNoBerriesToPut); + StringCopy(gStringVarBuffer, gLinkPlayers[sBerryBlender->canceledPlayerId].name); + StringAppend(gStringVarBuffer, sText_HasNoBerriesToPut); break; case 3: - if (PrintMessage(&sBerryBlender->textState, gStringVar4, GetPlayerTextSpeedDelay())) + if (PrintMessage(&sBerryBlender->textState, gStringVarBuffer, GetPlayerTextSpeedDelay())) { sBerryBlender->framesToWait = 0; sBerryBlender->gameEndState++; @@ -2954,15 +2954,15 @@ static void CB2_CheckPlayAgainLocal(void) case 1: sBerryBlender->gameEndState = 3; sBerryBlender->textState = 0; - StringCopy(gStringVar4, sText_YourPokeblockCaseIsFull); + StringCopy(gStringVarBuffer, sText_YourPokeblockCaseIsFull); break; case 2: sBerryBlender->gameEndState++; sBerryBlender->textState = 0; - StringCopy(gStringVar4, sText_RunOutOfBerriesForBlending); + StringCopy(gStringVarBuffer, sText_RunOutOfBerriesForBlending); break; case 3: - if (PrintMessage(&sBerryBlender->textState, gStringVar4, GetPlayerTextSpeedDelay())) + if (PrintMessage(&sBerryBlender->textState, gStringVarBuffer, GetPlayerTextSpeedDelay())) sBerryBlender->gameEndState = 9; break; case 9: diff --git a/src/berry_crush.c b/src/berry_crush.c index c7bff2abcdb..a63d3a55d6f 100644 --- a/src/berry_crush.c +++ b/src/berry_crush.c @@ -1620,8 +1620,8 @@ static void PrintResultsText(struct BerryCrushGame * game, u8 page, u8 sp14, u8 playerId = results->playerIdsRanked[page][i]; if (i != 0 && results->stats[page][i] != results->stats[page][i - 1]) ranking = i; - ConvertIntToDecimalStringN(gStringVar4, results->stats[page][i], STR_CONV_MODE_RIGHT_ALIGN, 4); - StringAppend(gStringVar4, sResultsTexts[page]); + ConvertIntToDecimalStringN(gStringVarBuffer, results->stats[page][i], STR_CONV_MODE_RIGHT_ALIGN, 4); + StringAppend(gStringVarBuffer, sResultsTexts[page]); break; case RESULTS_PAGE_RANDOM: playerId = results->playerIdsRanked[page][i]; @@ -1635,7 +1635,7 @@ static void PrintResultsText(struct BerryCrushGame * game, u8 page, u8 sp14, u8 xOffset += sPressingSpeedConversionTable[j]; stat = xOffset / 1000000u; ConvertIntToDecimalStringN(gStringVar2, stat, STR_CONV_MODE_LEADING_ZEROS, 2); - StringExpandPlaceholders(gStringVar4, sResultsTexts[page]); + StringExpandPlaceholders(gStringVarBuffer, sResultsTexts[page]); break; case RESULTS_PAGE_CRUSHING: playerId = i; @@ -1644,19 +1644,19 @@ static void PrintResultsText(struct BerryCrushGame * game, u8 page, u8 sp14, u8 if (j >= LAST_BERRY_INDEX - FIRST_BERRY_INDEX + 2) j = 0; StringCopy(gStringVar1, gBerries[j].name); - StringExpandPlaceholders(gStringVar4, sResultsTexts[page]); + StringExpandPlaceholders(gStringVarBuffer, sResultsTexts[page]); break; } - x = GetStringRightAlignXOffset(FONT_SHORT, gStringVar4, sp14 - 4); - AddTextPrinterParameterized3(game->gfx.resultsWindowId, FONT_SHORT, x, y, sTextColorTable[COLORID_GRAY], 0, gStringVar4); + x = GetStringRightAlignXOffset(FONT_SHORT, gStringVarBuffer, sp14 - 4); + AddTextPrinterParameterized3(game->gfx.resultsWindowId, FONT_SHORT, x, y, sTextColorTable[COLORID_GRAY], 0, gStringVarBuffer); if (playerId == game->localId) StringCopy(gStringVar3, gText_1DotBlueF700); else StringCopy(gStringVar3, gText_1DotF700); gStringVar3[0] = ranking + CHAR_1; DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, game->players[playerId].name); - DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gStringVar3); - AddTextPrinterParameterized3(game->gfx.resultsWindowId, FONT_SHORT, 4, y, sTextColorTable[COLORID_GRAY], 0, gStringVar4); + DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVarBuffer, gStringVar3); + AddTextPrinterParameterized3(game->gfx.resultsWindowId, FONT_SHORT, 4, y, sTextColorTable[COLORID_GRAY], 0, gStringVarBuffer); } } @@ -1680,9 +1680,9 @@ static void PrintCrushingResults(struct BerryCrushGame *game) // Print seconds value ConvertIntToDecimalStringN(gStringVar1, game->gfx.secondsInt, STR_CONV_MODE_LEADING_ZEROS, 2); ConvertIntToDecimalStringN(gStringVar2, game->gfx.secondsFrac, STR_CONV_MODE_LEADING_ZEROS, 2); - StringExpandPlaceholders(gStringVar4, gText_XDotY2); - x -= GetStringWidth(FONT_SHORT, gStringVar4, -1); - AddTextPrinterParameterized3(game->gfx.resultsWindowId, FONT_SHORT, x, y, sTextColorTable[COLORID_GRAY], 0, gStringVar4); + StringExpandPlaceholders(gStringVarBuffer, gText_XDotY2); + x -= GetStringWidth(FONT_SHORT, gStringVarBuffer, -1); + AddTextPrinterParameterized3(game->gfx.resultsWindowId, FONT_SHORT, x, y, sTextColorTable[COLORID_GRAY], 0, gStringVarBuffer); // Print minutes text x -= GetStringWidth(FONT_SHORT, gText_SpaceMin, -1); @@ -1690,9 +1690,9 @@ static void PrintCrushingResults(struct BerryCrushGame *game) // Print minutes value ConvertIntToDecimalStringN(gStringVar1, game->gfx.minutes, STR_CONV_MODE_LEADING_ZEROS, 1); - StringExpandPlaceholders(gStringVar4, gText_StrVar1); - x -= GetStringWidth(FONT_SHORT, gStringVar4, -1); - AddTextPrinterParameterized3(game->gfx.resultsWindowId, FONT_SHORT, x, y, sTextColorTable[COLORID_GRAY], 0, gStringVar4); + StringExpandPlaceholders(gStringVarBuffer, gText_StrVar1); + x -= GetStringWidth(FONT_SHORT, gStringVarBuffer, -1); + AddTextPrinterParameterized3(game->gfx.resultsWindowId, FONT_SHORT, x, y, sTextColorTable[COLORID_GRAY], 0, gStringVarBuffer); // Print pressing speed text y += 14; @@ -1706,12 +1706,12 @@ static void PrintCrushingResults(struct BerryCrushGame *game) pressingSpeedFrac += *(i + sPressingSpeedConversionTable); // It's accessed in a different way here for unknown reason ConvertIntToDecimalStringN(gStringVar1, game->pressingSpeed >> 8, STR_CONV_MODE_RIGHT_ALIGN, 3); ConvertIntToDecimalStringN(gStringVar2, pressingSpeedFrac / 1000000, STR_CONV_MODE_LEADING_ZEROS, 2); - StringExpandPlaceholders(gStringVar4, gText_XDotY3); - x -= GetStringWidth(FONT_SHORT, gStringVar4, -1); + StringExpandPlaceholders(gStringVarBuffer, gText_XDotY3); + x -= GetStringWidth(FONT_SHORT, gStringVarBuffer, -1); if (game->newRecord) - AddTextPrinterParameterized3(game->gfx.resultsWindowId, FONT_SHORT, x, y, sTextColorTable[COLORID_RED], 0, gStringVar4); + AddTextPrinterParameterized3(game->gfx.resultsWindowId, FONT_SHORT, x, y, sTextColorTable[COLORID_RED], 0, gStringVarBuffer); else - AddTextPrinterParameterized3(game->gfx.resultsWindowId, FONT_SHORT, x, y, sTextColorTable[COLORID_GRAY], 0, gStringVar4); + AddTextPrinterParameterized3(game->gfx.resultsWindowId, FONT_SHORT, x, y, sTextColorTable[COLORID_GRAY], 0, gStringVarBuffer); // Print silkiness text y += 14; @@ -1719,9 +1719,9 @@ static void PrintCrushingResults(struct BerryCrushGame *game) // Print silkiness value ConvertIntToDecimalStringN(gStringVar1, results->silkiness, STR_CONV_MODE_RIGHT_ALIGN, 3); - StringExpandPlaceholders(gStringVar4, gText_Var1Percent); - x = 176 - (u8)GetStringWidth(FONT_SHORT, gStringVar4, -1); - AddTextPrinterParameterized3(game->gfx.resultsWindowId, FONT_SHORT, x, y, sTextColorTable[COLORID_GRAY], 0, gStringVar4); + StringExpandPlaceholders(gStringVarBuffer, gText_Var1Percent); + x = 176 - (u8)GetStringWidth(FONT_SHORT, gStringVarBuffer, -1); + AddTextPrinterParameterized3(game->gfx.resultsWindowId, FONT_SHORT, x, y, sTextColorTable[COLORID_GRAY], 0, gStringVarBuffer); } static bool32 OpenResultsWindow(struct BerryCrushGame *game, struct BerryCrushGame_Gfx *gfx) @@ -1819,8 +1819,8 @@ static void Task_ShowRankings(u8 taskId) for (i = 0; i < MAX_RFU_PLAYERS - 1; i++) { ConvertIntToDecimalStringN(gStringVar1, i + 2, STR_CONV_MODE_LEFT_ALIGN, 1); - StringExpandPlaceholders(gStringVar4, gText_Var1Players); - AddTextPrinterParameterized3(tWindowId, FONT_NORMAL, 0, yPos, sTextColorTable[COLORID_GRAY], 0, gStringVar4); + StringExpandPlaceholders(gStringVarBuffer, gText_Var1Players); + AddTextPrinterParameterized3(tWindowId, FONT_NORMAL, 0, yPos, sTextColorTable[COLORID_GRAY], 0, gStringVarBuffer); xPos = 192 - (u8)GetStringWidth(FONT_NORMAL, gText_TimesPerSec, -1); AddTextPrinterParameterized3(tWindowId, FONT_NORMAL, xPos, yPos, sTextColorTable[COLORID_GRAY], 0, gText_TimesPerSec); for (j = 0; j < 8; j++) @@ -1830,9 +1830,9 @@ static void Task_ShowRankings(u8 taskId) } ConvertIntToDecimalStringN(gStringVar1, (u16)tPressingSpeeds(i) >> 8, STR_CONV_MODE_RIGHT_ALIGN, 3); ConvertIntToDecimalStringN(gStringVar2, score / 1000000, STR_CONV_MODE_LEADING_ZEROS, 2); - StringExpandPlaceholders(gStringVar4, gText_XDotY3); - xPos -= GetStringWidth(FONT_NORMAL, gStringVar4, -1); - AddTextPrinterParameterized3(tWindowId, FONT_NORMAL, xPos, yPos, sTextColorTable[COLORID_GRAY], 0, gStringVar4); + StringExpandPlaceholders(gStringVarBuffer, gText_XDotY3); + xPos -= GetStringWidth(FONT_NORMAL, gStringVarBuffer, -1); + AddTextPrinterParameterized3(tWindowId, FONT_NORMAL, xPos, yPos, sTextColorTable[COLORID_GRAY], 0, gStringVarBuffer); yPos += 16; score = 0; } @@ -2252,8 +2252,8 @@ static u32 Cmd_PrintMessage(struct BerryCrushGame *game, u8 *args) DrawDialogueFrame(0, FALSE); if (args[1] & F_MSG_EXPAND) { - StringExpandPlaceholders(gStringVar4, sMessages[args[0]]); - AddTextPrinterParameterized2(0, FONT_NORMAL, gStringVar4, game->textSpeed, 0, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); + StringExpandPlaceholders(gStringVarBuffer, sMessages[args[0]]); + AddTextPrinterParameterized2(0, FONT_NORMAL, gStringVarBuffer, game->textSpeed, 0, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); } else { diff --git a/src/berry_tag_screen.c b/src/berry_tag_screen.c index 415f22e59eb..a7b8156e03d 100644 --- a/src/berry_tag_screen.c +++ b/src/berry_tag_screen.c @@ -405,8 +405,8 @@ static void PrintBerryNumberAndName(void) const struct Berry *berry = GetBerryInfo(sBerryTag->berryId); ConvertIntToDecimalStringN(gStringVar1, sBerryTag->berryId, STR_CONV_MODE_LEADING_ZEROS, 2); StringCopy(gStringVar2, berry->name); - StringExpandPlaceholders(gStringVar4, gText_NumberVar1Var2); - PrintTextInBerryTagScreen(WIN_BERRY_NAME, gStringVar4, 0, 1, 0, 0); + StringExpandPlaceholders(gStringVarBuffer, gText_NumberVar1Var2); + PrintTextInBerryTagScreen(WIN_BERRY_NAME, gStringVarBuffer, 0, 1, 0, 0); } static void PrintBerrySize(void) @@ -425,8 +425,8 @@ static void PrintBerrySize(void) ConvertIntToDecimalStringN(gStringVar1, inches, STR_CONV_MODE_LEFT_ALIGN, 2); ConvertIntToDecimalStringN(gStringVar2, fraction, STR_CONV_MODE_LEFT_ALIGN, 2); - StringExpandPlaceholders(gStringVar4, gText_Var1DotVar2); - AddTextPrinterParameterized(WIN_SIZE_FIRM, FONT_NORMAL, gStringVar4, 0x28, 1, 0, NULL); + StringExpandPlaceholders(gStringVarBuffer, gText_Var1DotVar2); + AddTextPrinterParameterized(WIN_SIZE_FIRM, FONT_NORMAL, gStringVarBuffer, 0x28, 1, 0, NULL); } else { diff --git a/src/cable_club.c b/src/cable_club.c index 5305326589d..4683da759ff 100644 --- a/src/cable_club.c +++ b/src/cable_club.c @@ -98,9 +98,9 @@ static void PrintNumPlayersInLink(u16 windowId, u32 numPlayers) ConvertIntToDecimalStringN(gStringVar1, numPlayers, STR_CONV_MODE_LEFT_ALIGN, 1); SetStandardWindowBorderStyle(windowId, FALSE); - StringExpandPlaceholders(gStringVar4, gText_NumPlayerLink); - xPos = GetStringCenterAlignXOffset(FONT_NORMAL, gStringVar4, 88); - AddTextPrinterParameterized(windowId, FONT_NORMAL, gStringVar4, xPos, 1, TEXT_SKIP_DRAW, NULL); + StringExpandPlaceholders(gStringVarBuffer, gText_NumPlayerLink); + xPos = GetStringCenterAlignXOffset(FONT_NORMAL, gStringVarBuffer, 88); + AddTextPrinterParameterized(windowId, FONT_NORMAL, gStringVarBuffer, xPos, 1, TEXT_SKIP_DRAW, NULL); CopyWindowToVram(windowId, COPYWIN_FULL); } diff --git a/src/coins.c b/src/coins.c index 4c4739999b7..227fcc41c95 100644 --- a/src/coins.c +++ b/src/coins.c @@ -15,10 +15,10 @@ void PrintCoinsString(u32 coinAmount) u32 xAlign; ConvertIntToDecimalStringN(gStringVar1, coinAmount, STR_CONV_MODE_RIGHT_ALIGN, MAX_COIN_DIGITS); - StringExpandPlaceholders(gStringVar4, gText_Coins); + StringExpandPlaceholders(gStringVarBuffer, gText_Coins); - xAlign = GetStringRightAlignXOffset(FONT_NORMAL, gStringVar4, 0x40); - AddTextPrinterParameterized(sCoinsWindowId, FONT_NORMAL, gStringVar4, xAlign, 1, 0, NULL); + xAlign = GetStringRightAlignXOffset(FONT_NORMAL, gStringVarBuffer, 0x40); + AddTextPrinterParameterized(sCoinsWindowId, FONT_NORMAL, gStringVarBuffer, xAlign, 1, 0, NULL); } void ShowCoinsWindow(u32 coinAmount, u8 x, u8 y) diff --git a/src/contest.c b/src/contest.c index c48df493343..892325542f4 100644 --- a/src/contest.c +++ b/src/contest.c @@ -1481,8 +1481,8 @@ static void Task_DisplayAppealNumberText(u8 taskId) else StringCopy(gDisplayedStringBattle, gText_AppealNumButItCantParticipate); ContestClearGeneralTextWindow(); - StringExpandPlaceholders(gStringVar4, gDisplayedStringBattle); - Contest_StartTextPrinter(gStringVar4, TRUE); + StringExpandPlaceholders(gStringVarBuffer, gDisplayedStringBattle); + Contest_StartTextPrinter(gStringVarBuffer, TRUE); gTasks[taskId].data[0]++; } else @@ -1583,8 +1583,8 @@ static void Task_HandleMoveSelectInput(u8 taskId) else StringCopy(gDisplayedStringBattle, gText_AppealNumButItCantParticipate); ContestClearGeneralTextWindow(); - StringExpandPlaceholders(gStringVar4, gDisplayedStringBattle); - Contest_StartTextPrinter(gStringVar4, FALSE); + StringExpandPlaceholders(gStringVarBuffer, gDisplayedStringBattle); + Contest_StartTextPrinter(gStringVarBuffer, FALSE); gBattle_BG0_Y = 0; gBattle_BG2_Y = 0; gTasks[taskId].func = Task_TryShowMoveSelectScreen; @@ -1815,8 +1815,8 @@ static void Task_DoAppeals(u8 taskId) StringCopy(gStringVar2, gMoveNames[eContestantStatus[contestant].currMove]); else StringCopy(gStringVar2, sInvalidContestMoveNames[eContestantStatus[contestant].moveCategory]); - StringExpandPlaceholders(gStringVar4, gText_MonAppealedWithMove); - Contest_StartTextPrinter(gStringVar4, TRUE); + StringExpandPlaceholders(gStringVarBuffer, gText_MonAppealedWithMove); + Contest_StartTextPrinter(gStringVarBuffer, TRUE); gTasks[taskId].tState = APPEALSTATE_WAIT_USED_MOVE_MSG; } return; @@ -2077,8 +2077,8 @@ static void Task_DoAppeals(u8 taskId) { ContestClearGeneralTextWindow(); StringCopy(gStringVar1, gContestMons[contestant].nickname); - StringExpandPlaceholders(gStringVar4, gText_MonCantAppealNextTurn); - Contest_StartTextPrinter(gStringVar4, TRUE); + StringExpandPlaceholders(gStringVarBuffer, gText_MonCantAppealNextTurn); + Contest_StartTextPrinter(gStringVarBuffer, TRUE); } gTasks[taskId].tState = APPEALSTATE_WAIT_SKIP_NEXT_TURN_MSG; } @@ -2119,8 +2119,8 @@ static void Task_DoAppeals(u8 taskId) // Started combo ContestClearGeneralTextWindow(); StringCopy(gStringVar1, gContestMons[contestant].nickname); - StringExpandPlaceholders(gStringVar4, gText_JudgeLookedAtMonExpectantly); - Contest_StartTextPrinter(gStringVar4, TRUE); + StringExpandPlaceholders(gStringVarBuffer, gText_JudgeLookedAtMonExpectantly); + Contest_StartTextPrinter(gStringVarBuffer, TRUE); DoJudgeSpeechBubble(JUDGE_SYMBOL_ONE_EXCLAMATION); gTasks[taskId].tCounter = 0; gTasks[taskId].tState = APPEALSTATE_WAIT_JUDGE_COMBO; @@ -2163,8 +2163,8 @@ static void Task_DoAppeals(u8 taskId) { ContestClearGeneralTextWindow(); StringCopy(gStringVar1, gContestMons[contestant].nickname); - StringExpandPlaceholders(gStringVar4, gText_RepeatedAppeal); - Contest_StartTextPrinter(gStringVar4, TRUE); + StringExpandPlaceholders(gStringVarBuffer, gText_RepeatedAppeal); + Contest_StartTextPrinter(gStringVarBuffer, TRUE); gTasks[taskId].tCounter = 0; DoJudgeSpeechBubble(JUDGE_SYMBOL_SWIRL); gTasks[taskId].tState = APPEALSTATE_WAIT_JUDGE_REPEATED_MOVE; @@ -2228,12 +2228,12 @@ static void Task_DoAppeals(u8 taskId) else { if (r3 < 0) - StringExpandPlaceholders(gStringVar4, gText_MonsXDidntGoOverWell); + StringExpandPlaceholders(gStringVarBuffer, gText_MonsXDidntGoOverWell); else if (r3 > 0 && eContest.applauseLevel <= 4) - StringExpandPlaceholders(gStringVar4, gText_MonsXWentOverGreat); + StringExpandPlaceholders(gStringVarBuffer, gText_MonsXWentOverGreat); else - StringExpandPlaceholders(gStringVar4, gText_MonsXGotTheCrowdGoing); - Contest_StartTextPrinter(gStringVar4, TRUE); + StringExpandPlaceholders(gStringVarBuffer, gText_MonsXGotTheCrowdGoing); + Contest_StartTextPrinter(gStringVarBuffer, TRUE); gTasks[taskId].tCounter = 0; gTasks[taskId].data[11] = 0; if (r3 < 0) @@ -2342,16 +2342,16 @@ static void Task_DoAppeals(u8 taskId) StringCopy(gStringVar3, gContestMons[eContestExcitement.freezer].nickname); StringCopy(gStringVar1, gContestMons[contestant].nickname); StringCopy(gStringVar2, gMoveNames[eContestantStatus[contestant].currMove]); - StringExpandPlaceholders(gStringVar4, gText_CrowdContinuesToWatchMon); - Contest_StartTextPrinter(gStringVar4, TRUE); + StringExpandPlaceholders(gStringVarBuffer, gText_CrowdContinuesToWatchMon); + Contest_StartTextPrinter(gStringVarBuffer, TRUE); gTasks[taskId].tState = APPEALSTATE_PRINT_MON_MOVE_IGNORED_MSG; return; case APPEALSTATE_PRINT_MON_MOVE_IGNORED_MSG: if (!Contest_RunTextPrinters()) { ContestClearGeneralTextWindow(); - StringExpandPlaceholders(gStringVar4, gText_MonsMoveIsIgnored); - Contest_StartTextPrinter(gStringVar4, TRUE); + StringExpandPlaceholders(gStringVarBuffer, gText_MonsMoveIsIgnored); + Contest_StartTextPrinter(gStringVarBuffer, TRUE); gTasks[taskId].tState = APPEALSTATE_WAIT_MON_MOVE_IGNORED_MSG; } return; @@ -2368,8 +2368,8 @@ static void Task_DoAppeals(u8 taskId) StartStopFlashJudgeAttentionEye(contestant); StringCopy(gStringVar1, gContestMons[contestant].nickname); StringCopy(gStringVar2, gMoveNames[eContestantStatus[contestant].currMove]); - StringExpandPlaceholders(gStringVar4, gText_MonWasTooNervousToMove); - Contest_StartTextPrinter(gStringVar4, TRUE); + StringExpandPlaceholders(gStringVarBuffer, gText_MonWasTooNervousToMove); + Contest_StartTextPrinter(gStringVarBuffer, TRUE); gTasks[taskId].tState = APPEALSTATE_WAIT_TOO_NERVOUS_MSG; return; case APPEALSTATE_WAIT_TOO_NERVOUS_MSG: @@ -2412,8 +2412,8 @@ static void Task_DoAppeals(u8 taskId) case APPEALSTATE_PRINT_SKIP_TURN_MSG: ContestClearGeneralTextWindow(); StringCopy(gStringVar1, gContestMons[contestant].nickname); - StringExpandPlaceholders(gStringVar4, gText_MonWasWatchingOthers); - Contest_StartTextPrinter(gStringVar4, TRUE); + StringExpandPlaceholders(gStringVarBuffer, gText_MonWasWatchingOthers); + Contest_StartTextPrinter(gStringVarBuffer, TRUE); gTasks[taskId].tState = APPEALSTATE_WAIT_SKIP_TURN_MSG; return; case APPEALSTATE_WAIT_SKIP_TURN_MSG: @@ -2584,8 +2584,8 @@ static void Task_PrintRoundResultText(u8 taskId) ContestClearGeneralTextWindow(); StringCopy(gStringVar1, gContestMons[gContestPlayerMonIndex].nickname); - StringExpandPlaceholders(gStringVar4, sRoundResultTexts[attention]); - Contest_StartTextPrinter(gStringVar4, TRUE); + StringExpandPlaceholders(gStringVarBuffer, sRoundResultTexts[attention]); + Contest_StartTextPrinter(gStringVarBuffer, TRUE); gTasks[taskId].data[0]++; } else @@ -2677,8 +2677,8 @@ static void Task_EndAppeals(u8 taskId) ContestDebugPrintBitStrings(); } gContestRngValue = gRngValue; - StringExpandPlaceholders(gStringVar4, gText_AllOutOfAppealTime); - Contest_StartTextPrinter(gStringVar4, TRUE); + StringExpandPlaceholders(gStringVarBuffer, gText_AllOutOfAppealTime); + Contest_StartTextPrinter(gStringVarBuffer, TRUE); gTasks[taskId].data[2] = 0; gTasks[taskId].func = Task_WaitForOutOfTimeMsg; } @@ -4578,9 +4578,9 @@ static void PrintAppealMoveResultText(u8 contestant, u8 stringId) StringCopy(gStringVar3, gText_Contest_Hesitancy); else StringCopy(gStringVar3, gText_Contest_Fear); - StringExpandPlaceholders(gStringVar4, sAppealResultTexts[stringId]); + StringExpandPlaceholders(gStringVarBuffer, sAppealResultTexts[stringId]); ContestClearGeneralTextWindow(); - Contest_StartTextPrinter(gStringVar4, TRUE); + Contest_StartTextPrinter(gStringVarBuffer, TRUE); } void MakeContestantNervous(u8 p) diff --git a/src/contest_painting.c b/src/contest_painting.c index c72d0dc6af2..209c57c83be 100644 --- a/src/contest_painting.c +++ b/src/contest_painting.c @@ -297,17 +297,17 @@ static void PrintContestPaintingCaption(u8 contestType, bool8 isForArtist) StringCopy(gStringVar2, gContestPaintingWinner->trainerName); ConvertInternationalContestantName(gStringVar2); StringCopy(gStringVar3, gContestPaintingWinner->monName); - StringExpandPlaceholders(gStringVar4, gContestHallPaintingCaption); + StringExpandPlaceholders(gStringVarBuffer, gContestHallPaintingCaption); } else { // Museum caption StringCopy(gStringVar1, gContestPaintingWinner->monName); - StringExpandPlaceholders(gStringVar4, sMuseumCaptions[category]); + StringExpandPlaceholders(gStringVarBuffer, sMuseumCaptions[category]); } - x = GetStringCenterAlignXOffset(FONT_NORMAL, gStringVar4, 208); - AddTextPrinterParameterized(sWindowId, FONT_NORMAL, gStringVar4, x, 1, 0, 0); + x = GetStringCenterAlignXOffset(FONT_NORMAL, gStringVarBuffer, 208); + AddTextPrinterParameterized(sWindowId, FONT_NORMAL, gStringVarBuffer, x, 1, 0, 0); CopyBgTilemapBufferToVram(1); } diff --git a/src/daycare.c b/src/daycare.c index 5ebe255b392..ad8c4302b9a 100644 --- a/src/daycare.c +++ b/src/daycare.c @@ -1095,7 +1095,7 @@ void SetDaycareCompatibilityString(void) if (relationshipScore == PARENTS_MAX_COMPATIBILITY) whichString = 0; - StringCopy(gStringVar4, sCompatibilityMessages[whichString]); + StringCopy(gStringVarBuffer, sCompatibilityMessages[whichString]); } bool8 NameHasGenderSymbol(const u8 *name, u8 genderRatio) diff --git a/src/decoration.c b/src/decoration.c index 18d6e2e680c..638a62f2319 100644 --- a/src/decoration.c +++ b/src/decoration.c @@ -632,8 +632,8 @@ static void DecorationMenuAction_Decorate(u8 taskId) { if (GetNumOwnedDecorations() == 0) { - StringExpandPlaceholders(gStringVar4, gText_NoDecorations); - DisplayItemMessageOnField(taskId, gStringVar4, ReturnToDecorationActionsAfterInvalidSelection); + StringExpandPlaceholders(gStringVarBuffer, gText_NoDecorations); + DisplayItemMessageOnField(taskId, gStringVarBuffer, ReturnToDecorationActionsAfterInvalidSelection); } else { @@ -647,8 +647,8 @@ static void DecorationMenuAction_PutAway(u8 taskId) { if (!HasDecorationsInUse(taskId)) { - StringExpandPlaceholders(gStringVar4, gText_NoDecorationsInUse); - DisplayItemMessageOnField(taskId, gStringVar4, ReturnToDecorationActionsAfterInvalidSelection); + StringExpandPlaceholders(gStringVarBuffer, gText_NoDecorationsInUse); + DisplayItemMessageOnField(taskId, gStringVarBuffer, ReturnToDecorationActionsAfterInvalidSelection); } else { @@ -664,8 +664,8 @@ static void DecorationMenuAction_Toss(u8 taskId) { if (GetNumOwnedDecorations() == 0) { - StringExpandPlaceholders(gStringVar4, gText_NoDecorations); - DisplayItemMessageOnField(taskId, gStringVar4, ReturnToDecorationActionsAfterInvalidSelection); + StringExpandPlaceholders(gStringVarBuffer, gText_NoDecorations); + DisplayItemMessageOnField(taskId, gStringVarBuffer, ReturnToDecorationActionsAfterInvalidSelection); } else { @@ -749,15 +749,15 @@ static void PrintDecorationCategoryMenuItem(u8 winid, u8 category, u8 x, u8 y, b width = x == 8 ? 104 : 96; y++; - ColorMenuItemString(gStringVar4, disabled); - str = StringLength(gStringVar4) + gStringVar4; + ColorMenuItemString(gStringVarBuffer, disabled); + str = StringLength(gStringVarBuffer) + gStringVarBuffer; StringCopy(str, sDecorationCategoryNames[category]); - AddTextPrinterParameterized(winid, FONT_NORMAL, gStringVar4, x, y, speed, NULL); + AddTextPrinterParameterized(winid, FONT_NORMAL, gStringVarBuffer, x, y, speed, NULL); str = ConvertIntToDecimalStringN(str, GetNumOwnedDecorationsInCategory(category), STR_CONV_MODE_RIGHT_ALIGN, 2); *(str++) = CHAR_SLASH; ConvertIntToDecimalStringN(str, gDecorationInventories[category].size, STR_CONV_MODE_RIGHT_ALIGN, 2); - x = GetStringRightAlignXOffset(FONT_NORMAL, gStringVar4, width); - AddTextPrinterParameterized(winid, FONT_NORMAL, gStringVar4, x, y, speed, NULL); + x = GetStringRightAlignXOffset(FONT_NORMAL, gStringVarBuffer, width); + AddTextPrinterParameterized(winid, FONT_NORMAL, gStringVarBuffer, x, y, speed, NULL); } static void ColorMenuItemString(u8 *str, bool8 disabled) @@ -813,8 +813,8 @@ static void SelectDecorationCategory(u8 taskId) else { RemoveDecorationWindow(WINDOW_DECORATION_CATEGORIES); - StringExpandPlaceholders(gStringVar4, gText_NoDecorations); - DisplayItemMessageOnField(taskId, gStringVar4, ReturnToDecorationCategoriesAfterInvalidSelection); + StringExpandPlaceholders(gStringVarBuffer, gText_NoDecorations); + DisplayItemMessageOnField(taskId, gStringVarBuffer, ReturnToDecorationCategoriesAfterInvalidSelection); } } @@ -1326,8 +1326,8 @@ static void DecorationItemsMenuAction_AttemptPlace(u8 taskId) { if (sDecorationContext.isPlayerRoom == TRUE && sCurDecorationCategory != DECORCAT_DOLL && sCurDecorationCategory != DECORCAT_CUSHION) { - StringExpandPlaceholders(gStringVar4, gText_CantPlaceInRoom); - DisplayItemMessageOnField(taskId, gStringVar4, ReturnToDecorationItemsAfterInvalidSelection); + StringExpandPlaceholders(gStringVarBuffer, gText_CantPlaceInRoom); + DisplayItemMessageOnField(taskId, gStringVarBuffer, ReturnToDecorationItemsAfterInvalidSelection); } else if (IsSelectedDecorInThePC() == TRUE) { @@ -1342,19 +1342,19 @@ static void DecorationItemsMenuAction_AttemptPlace(u8 taskId) ConvertIntToDecimalStringN(gStringVar1, sDecorationContext.size, STR_CONV_MODE_RIGHT_ALIGN, 2); if (sDecorationContext.isPlayerRoom == FALSE) { - StringExpandPlaceholders(gStringVar4, gText_NoMoreDecorations); + StringExpandPlaceholders(gStringVarBuffer, gText_NoMoreDecorations); } else { - StringExpandPlaceholders(gStringVar4, gText_NoMoreDecorations2); + StringExpandPlaceholders(gStringVarBuffer, gText_NoMoreDecorations2); } - DisplayItemMessageOnField(taskId, gStringVar4, ReturnToDecorationItemsAfterInvalidSelection); + DisplayItemMessageOnField(taskId, gStringVarBuffer, ReturnToDecorationItemsAfterInvalidSelection); } } else { - StringExpandPlaceholders(gStringVar4, gText_InUseAlready); - DisplayItemMessageOnField(taskId, gStringVar4, ReturnToDecorationItemsAfterInvalidSelection); + StringExpandPlaceholders(gStringVarBuffer, gText_InUseAlready); + DisplayItemMessageOnField(taskId, gStringVarBuffer, ReturnToDecorationItemsAfterInvalidSelection); } } @@ -1479,8 +1479,8 @@ static void AttemptCancelPlaceDecoration(u8 taskId) gSprites[sDecor_CameraSpriteObjectIdx1].data[7] = 1; gSprites[sDecor_CameraSpriteObjectIdx2].data[7] = 1; ResetCursorMovement(); - StringExpandPlaceholders(gStringVar4, gText_CancelDecorating); - DisplayItemMessageOnField(taskId, gStringVar4, CancelDecoratingPrompt); + StringExpandPlaceholders(gStringVarBuffer, gText_CancelDecorating); + DisplayItemMessageOnField(taskId, gStringVarBuffer, CancelDecoratingPrompt); } static bool8 IsSecretBaseTrainerSpot(u8 behaviorAt, u16 layerType) @@ -1632,14 +1632,14 @@ static void AttemptPlaceDecoration_(u8 taskId) { if (CanPlaceDecoration(taskId, &gDecorations[gCurDecorationItems[gCurDecorationIndex]]) == TRUE) { - StringExpandPlaceholders(gStringVar4, gText_PlaceItHere); - DisplayItemMessageOnField(taskId, gStringVar4, PlaceDecorationPrompt); + StringExpandPlaceholders(gStringVarBuffer, gText_PlaceItHere); + DisplayItemMessageOnField(taskId, gStringVarBuffer, PlaceDecorationPrompt); } else { PlaySE(SE_FAILURE); - StringExpandPlaceholders(gStringVar4, gText_CantBePlacedHere); - DisplayItemMessageOnField(taskId, gStringVar4, CantPlaceDecorationPrompt); + StringExpandPlaceholders(gStringVarBuffer, gText_CantBePlacedHere); + DisplayItemMessageOnField(taskId, gStringVarBuffer, CantPlaceDecorationPrompt); } } @@ -2272,8 +2272,8 @@ static void Task_PutAwayDecoration(u8 taskId) case 3: if (IsWeatherNotFadingIn() == TRUE) { - StringExpandPlaceholders(gStringVar4, gText_DecorationReturnedToPC); - DisplayItemMessageOnField(taskId, gStringVar4, ContinuePuttingAwayDecorationsPrompt); + StringExpandPlaceholders(gStringVarBuffer, gText_DecorationReturnedToPC); + DisplayItemMessageOnField(taskId, gStringVarBuffer, ContinuePuttingAwayDecorationsPrompt); if (gMapHeader.regionMapSectionId == MAPSEC_SECRET_BASE) TryPutSecretBaseVisitOnAir(); } @@ -2366,8 +2366,8 @@ static void AttemptCancelPutAwayDecoration(u8 taskId) ResetCursorMovement(); gSprites[sDecor_CameraSpriteObjectIdx1].invisible = FALSE; gSprites[sDecor_CameraSpriteObjectIdx1].callback = SpriteCallbackDummy; - StringExpandPlaceholders(gStringVar4, gText_StopPuttingAwayDecorations); - DisplayItemMessageOnField(taskId, gStringVar4, StopPuttingAwayDecorationsPrompt); + StringExpandPlaceholders(gStringVarBuffer, gText_StopPuttingAwayDecorations); + DisplayItemMessageOnField(taskId, gStringVarBuffer, StopPuttingAwayDecorationsPrompt); } static void AttemptPutAwayDecoration_(u8 taskId) @@ -2378,8 +2378,8 @@ static void AttemptPutAwayDecoration_(u8 taskId) AttemptMarkDecorUnderCursorForRemoval(taskId); if (sCurDecorSelectedInRearrangement != 0) { - StringExpandPlaceholders(gStringVar4, gText_ReturnDecorationToPC); - DisplayItemMessageOnField(taskId, gStringVar4, ReturnDecorationPrompt); + StringExpandPlaceholders(gStringVarBuffer, gText_ReturnDecorationToPC); + DisplayItemMessageOnField(taskId, gStringVarBuffer, ReturnDecorationPrompt); } else { @@ -2389,13 +2389,13 @@ static void AttemptPutAwayDecoration_(u8 taskId) { gSprites[sDecor_CameraSpriteObjectIdx1].invisible = FALSE; gSprites[sDecor_CameraSpriteObjectIdx1].callback = SpriteCallbackDummy; - StringExpandPlaceholders(gStringVar4, gText_StopPuttingAwayDecorations); - DisplayItemMessageOnField(taskId, gStringVar4, StopPuttingAwayDecorationsPrompt); + StringExpandPlaceholders(gStringVarBuffer, gText_StopPuttingAwayDecorations); + DisplayItemMessageOnField(taskId, gStringVarBuffer, StopPuttingAwayDecorationsPrompt); } else { - StringExpandPlaceholders(gStringVar4, gText_NoDecorationHere); - DisplayItemMessageOnField(taskId, gStringVar4, ContinuePuttingAwayDecorationsPrompt); + StringExpandPlaceholders(gStringVarBuffer, gText_NoDecorationHere); + DisplayItemMessageOnField(taskId, gStringVarBuffer, ContinuePuttingAwayDecorationsPrompt); } } } @@ -2710,13 +2710,13 @@ static void DecorationItemsMenuAction_AttemptToss(u8 taskId) if (IsSelectedDecorInThePC() == TRUE) { StringCopy(gStringVar1, gDecorations[gCurDecorationItems[gCurDecorationIndex]].name); - StringExpandPlaceholders(gStringVar4, gText_DecorationWillBeDiscarded); - DisplayItemMessageOnField(taskId, gStringVar4, TossDecorationPrompt); + StringExpandPlaceholders(gStringVarBuffer, gText_DecorationWillBeDiscarded); + DisplayItemMessageOnField(taskId, gStringVarBuffer, TossDecorationPrompt); } else { - StringExpandPlaceholders(gStringVar4, gText_CantThrowAwayInUse); - DisplayItemMessageOnField(taskId, gStringVar4, ReturnToDecorationItemsAfterInvalidSelection); + StringExpandPlaceholders(gStringVarBuffer, gText_CantThrowAwayInUse); + DisplayItemMessageOnField(taskId, gStringVarBuffer, ReturnToDecorationItemsAfterInvalidSelection); } } @@ -2732,6 +2732,6 @@ static void TossDecoration(u8 taskId) sNumOwnedDecorationsInCurCategory = GetNumOwnedDecorationsInCategory(sCurDecorationCategory); CondenseDecorationsInCategory(sCurDecorationCategory); IdentifyOwnedDecorationsCurrentlyInUseInternal(taskId); - StringExpandPlaceholders(gStringVar4, gText_DecorationThrownAway); - DisplayItemMessageOnField(taskId, gStringVar4, ReturnToDecorationItemsAfterInvalidSelection); + StringExpandPlaceholders(gStringVarBuffer, gText_DecorationThrownAway); + DisplayItemMessageOnField(taskId, gStringVarBuffer, ReturnToDecorationItemsAfterInvalidSelection); } diff --git a/src/diploma.c b/src/diploma.c index 2a188674503..ac6576c1cc0 100644 --- a/src/diploma.c +++ b/src/diploma.c @@ -137,8 +137,8 @@ static void DisplayDiplomaText(void) SetGpuReg(REG_OFFSET_BG1HOFS, 0); StringCopy(gStringVar1, gText_DexHoenn); } - StringExpandPlaceholders(gStringVar4, gText_PokedexDiploma); - PrintDiplomaText(gStringVar4, 0, 1); + StringExpandPlaceholders(gStringVarBuffer, gText_PokedexDiploma); + PrintDiplomaText(gStringVarBuffer, 0, 1); PutWindowTilemap(0); CopyWindowToVram(0, COPYWIN_FULL); } diff --git a/src/dodrio_berry_picking.c b/src/dodrio_berry_picking.c index ce1877c6cd2..f96baffba4d 100644 --- a/src/dodrio_berry_picking.c +++ b/src/dodrio_berry_picking.c @@ -4792,14 +4792,14 @@ static void ShowResults(void) u16 berriesPicked = Min(GetBerryResult(i, j), MAX_BERRIES); u16 maxBerriesPicked = Min(GetHighestBerryResult(j), MAX_BERRIES); - ConvertIntToDecimalStringN(gStringVar4, berriesPicked, STR_CONV_MODE_LEFT_ALIGN, 4); - width = GetStringWidth(FONT_NORMAL, gStringVar4, -1); + ConvertIntToDecimalStringN(gStringVarBuffer, berriesPicked, STR_CONV_MODE_LEFT_ALIGN, 4); + width = GetStringWidth(FONT_NORMAL, gStringVarBuffer, -1); // If player got the most of a berry type, highlight their number in red if (maxBerriesPicked == berriesPicked && maxBerriesPicked != 0) - AddTextPrinterParameterized3(sGfx->windowIds[1], FONT_NORMAL, sResultsXCoords[j] - width, sResultsYCoords[i], sTextColorTable[COLORID_RED], TEXT_SKIP_DRAW, gStringVar4); + AddTextPrinterParameterized3(sGfx->windowIds[1], FONT_NORMAL, sResultsXCoords[j] - width, sResultsYCoords[i], sTextColorTable[COLORID_RED], TEXT_SKIP_DRAW, gStringVarBuffer); else - AddTextPrinterParameterized(sGfx->windowIds[1], FONT_NORMAL, gStringVar4, sResultsXCoords[j] - width, sResultsYCoords[i], TEXT_SKIP_DRAW, NULL); + AddTextPrinterParameterized(sGfx->windowIds[1], FONT_NORMAL, gStringVarBuffer, sResultsXCoords[j] - width, sResultsYCoords[i], TEXT_SKIP_DRAW, NULL); } } CopyWindowToVram(sGfx->windowIds[0], COPYWIN_GFX); @@ -4880,8 +4880,8 @@ static void ShowResults(void) DynamicPlaceholderTextUtil_Reset(); CopyItemName(GetPrizeItemId(), gStringVar1); DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gStringVar1); - DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gText_FirstPlacePrize); - AddTextPrinterParameterized(sGfx->windowIds[1], FONT_NORMAL, gStringVar4, 0, 1, TEXT_SKIP_DRAW, NULL); + DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVarBuffer, gText_FirstPlacePrize); + AddTextPrinterParameterized(sGfx->windowIds[1], FONT_NORMAL, gStringVarBuffer, 0, 1, TEXT_SKIP_DRAW, NULL); prizeState = TryGivePrize(); if (prizeState != PRIZE_RECEIVED && prizeState != NO_PRIZE) { @@ -4889,10 +4889,10 @@ static void ShowResults(void) CopyItemName(GetPrizeItemId(), gStringVar1); DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gStringVar1); if (prizeState == PRIZE_NO_ROOM) - DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gText_CantHoldAnyMore); + DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVarBuffer, gText_CantHoldAnyMore); else if (prizeState == PRIZE_FILLED_BAG) - DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gText_FilledStorageSpace); - AddTextPrinterParameterized(sGfx->windowIds[1], FONT_NORMAL, gStringVar4, 0, 41, TEXT_SKIP_DRAW, NULL); + DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVarBuffer, gText_FilledStorageSpace); + AddTextPrinterParameterized(sGfx->windowIds[1], FONT_NORMAL, gStringVarBuffer, 0, 41, TEXT_SKIP_DRAW, NULL); } CopyWindowToVram(sGfx->windowIds[0], COPYWIN_GFX); CopyWindowToVram(sGfx->windowIds[1], COPYWIN_GFX); diff --git a/src/easy_chat.c b/src/easy_chat.c index 760b07e382f..ebc03460d6e 100644 --- a/src/easy_chat.c +++ b/src/easy_chat.c @@ -5413,8 +5413,8 @@ void ShowEasyChatProfile(void) return; } - ConvertEasyChatWordsToString(gStringVar4, easyChatWords, columns, rows); - ShowFieldAutoScrollMessage(gStringVar4); + ConvertEasyChatWordsToString(gStringVarBuffer, easyChatWords, columns, rows); + ShowFieldAutoScrollMessage(gStringVarBuffer); } // The phrase that a man in Dewford Hall suggests has a "deep link" to the current trendy phrase diff --git a/src/egg_hatch.c b/src/egg_hatch.c index abf1aff841e..7ecb488c83e 100644 --- a/src/egg_hatch.c +++ b/src/egg_hatch.c @@ -652,8 +652,8 @@ static void CB2_EggHatch(void) case 5: // "{mon} hatched from egg" message/fanfare GetMonNickname2(&gPlayerParty[sEggHatchData->eggPartyId], gStringVar1); - StringExpandPlaceholders(gStringVar4, gText_HatchedFromEgg); - EggHatchPrintMessage(sEggHatchData->windowId, gStringVar4, 0, 3, TEXT_SKIP_DRAW); + StringExpandPlaceholders(gStringVarBuffer, gText_HatchedFromEgg); + EggHatchPrintMessage(sEggHatchData->windowId, gStringVarBuffer, 0, 3, TEXT_SKIP_DRAW); PlayFanfare(MUS_EVOLVED); sEggHatchData->state++; PutWindowTilemap(sEggHatchData->windowId); @@ -670,8 +670,8 @@ static void CB2_EggHatch(void) case 8: // Ready the nickname prompt GetMonNickname2(&gPlayerParty[sEggHatchData->eggPartyId], gStringVar1); - StringExpandPlaceholders(gStringVar4, gText_NicknameHatchPrompt); - EggHatchPrintMessage(sEggHatchData->windowId, gStringVar4, 0, 2, 1); + StringExpandPlaceholders(gStringVarBuffer, gText_NicknameHatchPrompt); + EggHatchPrintMessage(sEggHatchData->windowId, gStringVarBuffer, 0, 2, 1); sEggHatchData->state++; break; case 9: diff --git a/src/evolution_scene.c b/src/evolution_scene.c index db28ceb8f24..2e19d7b8a26 100644 --- a/src/evolution_scene.c +++ b/src/evolution_scene.c @@ -660,8 +660,8 @@ static void Task_EvolutionScene(u8 taskId) case EVOSTATE_INTRO_MSG: if (!gPaletteFade.active) { - StringExpandPlaceholders(gStringVar4, gText_PkmnIsEvolving); - BattlePutTextOnWindow(gStringVar4, B_WIN_MSG); + StringExpandPlaceholders(gStringVarBuffer, gText_PkmnIsEvolving); + BattlePutTextOnWindow(gStringVarBuffer, B_WIN_MSG); gTasks[taskId].tState++; } break; @@ -757,8 +757,8 @@ static void Task_EvolutionScene(u8 taskId) case EVOSTATE_SET_MON_EVOLVED: if (IsCryFinished()) { - StringExpandPlaceholders(gStringVar4, gText_CongratsPkmnEvolved); - BattlePutTextOnWindow(gStringVar4, B_WIN_MSG); + StringExpandPlaceholders(gStringVarBuffer, gText_CongratsPkmnEvolved); + BattlePutTextOnWindow(gStringVarBuffer, B_WIN_MSG); PlayBGM(MUS_EVOLVED); gTasks[taskId].tState++; SetMonData(mon, MON_DATA_SPECIES, (void *)(&gTasks[taskId].tPostEvoSpecies)); @@ -839,11 +839,11 @@ static void Task_EvolutionScene(u8 taskId) if (EvoScene_IsMonAnimFinished(sEvoStructPtr->preEvoSpriteId)) { if (gTasks[taskId].tEvoWasStopped) // FRLG auto cancellation - StringExpandPlaceholders(gStringVar4, gText_EllipsisQuestionMark); + StringExpandPlaceholders(gStringVarBuffer, gText_EllipsisQuestionMark); else - StringExpandPlaceholders(gStringVar4, gText_PkmnStoppedEvolving); + StringExpandPlaceholders(gStringVarBuffer, gText_PkmnStoppedEvolving); - BattlePutTextOnWindow(gStringVar4, B_WIN_MSG); + BattlePutTextOnWindow(gStringVarBuffer, B_WIN_MSG); gTasks[taskId].tEvoWasStopped = TRUE; gTasks[taskId].tState = EVOSTATE_TRY_LEARN_MOVE; } @@ -1085,8 +1085,8 @@ static void Task_TradeEvolutionScene(u8 taskId) switch (gTasks[taskId].tState) { case T_EVOSTATE_INTRO_MSG: - StringExpandPlaceholders(gStringVar4, gText_PkmnIsEvolving); - DrawTextOnTradeWindow(0, gStringVar4, 1); + StringExpandPlaceholders(gStringVarBuffer, gText_PkmnIsEvolving); + DrawTextOnTradeWindow(0, gStringVarBuffer, 1); gTasks[taskId].tState++; break; case T_EVOSTATE_INTRO_CRY: @@ -1176,8 +1176,8 @@ static void Task_TradeEvolutionScene(u8 taskId) case T_EVOSTATE_SET_MON_EVOLVED: if (IsCryFinished()) { - StringExpandPlaceholders(gStringVar4, gText_CongratsPkmnEvolved); - DrawTextOnTradeWindow(0, gStringVar4, 1); + StringExpandPlaceholders(gStringVarBuffer, gText_CongratsPkmnEvolved); + DrawTextOnTradeWindow(0, gStringVarBuffer, 1); PlayFanfare(MUS_EVOLVED); gTasks[taskId].tState++; SetMonData(mon, MON_DATA_SPECIES, (&gTasks[taskId].tPostEvoSpecies)); @@ -1243,8 +1243,8 @@ static void Task_TradeEvolutionScene(u8 taskId) case T_EVOSTATE_CANCEL_MSG: if (EvoScene_IsMonAnimFinished(sEvoStructPtr->preEvoSpriteId)) { - StringExpandPlaceholders(gStringVar4, gText_EllipsisQuestionMark); - DrawTextOnTradeWindow(0, gStringVar4, 1); + StringExpandPlaceholders(gStringVarBuffer, gText_EllipsisQuestionMark); + DrawTextOnTradeWindow(0, gStringVarBuffer, 1); gTasks[taskId].tEvoWasStopped = TRUE; gTasks[taskId].tState = T_EVOSTATE_TRY_LEARN_MOVE; } diff --git a/src/field_message_box.c b/src/field_message_box.c index b797e1d3533..010f2d4e252 100755 --- a/src/field_message_box.c +++ b/src/field_message_box.c @@ -81,7 +81,7 @@ bool8 ShowPokenavFieldMessage(const u8 *str) { if (sFieldMessageBoxMode != FIELD_MESSAGE_BOX_HIDDEN) return FALSE; - StringExpandPlaceholders(gStringVar4, str); + StringExpandPlaceholders(gStringVarBuffer, str); CreateTask(Task_HidePokenavMessageWhenDone, 0); StartMatchCallFromScript(str); sFieldMessageBoxMode = FIELD_MESSAGE_BOX_NORMAL; @@ -105,7 +105,7 @@ static bool8 UNUSED ForceShowFieldAutoScrollMessage(const u8 *str) } // Same as ShowFieldMessage, but instead of accepting a -// string arg it just prints whats already in gStringVar4 +// string arg it just prints whats already in gStringVarBuffer bool8 ShowFieldMessageFromBuffer(void) { if (sFieldMessageBoxMode != FIELD_MESSAGE_BOX_HIDDEN) @@ -117,7 +117,7 @@ bool8 ShowFieldMessageFromBuffer(void) static void ExpandStringAndStartDrawFieldMessage(const u8 *str, bool32 allowSkippingDelayWithButtonPress) { - StringExpandPlaceholders(gStringVar4, str); + StringExpandPlaceholders(gStringVarBuffer, str); AddTextPrinterForMessage(allowSkippingDelayWithButtonPress); CreateTask_DrawFieldMessage(); } diff --git a/src/field_specials.c b/src/field_specials.c index 43d07356aa0..b5c9caeff64 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -889,7 +889,7 @@ void PetalburgGymUnlockRoomDoors(void) void ShowFieldMessageStringVar4(void) { - ShowFieldMessage(gStringVar4); + ShowFieldMessage(gStringVarBuffer); } void StorePlayerCoordsInVars(void) diff --git a/src/fldeff_softboiled.c b/src/fldeff_softboiled.c index 3a38f67f023..2be4aedbd24 100644 --- a/src/fldeff_softboiled.c +++ b/src/fldeff_softboiled.c @@ -74,8 +74,8 @@ static void Task_SoftboiledRestoreHealth(u8 taskId) static void Task_DisplayHPRestoredMessage(u8 taskId) { GetMonNickname(&gPlayerParty[gPartyMenu.slotId2], gStringVar1); - StringExpandPlaceholders(gStringVar4, gText_PkmnHPRestoredByVar2); - DisplayPartyMenuMessage(gStringVar4, FALSE); + StringExpandPlaceholders(gStringVarBuffer, gText_PkmnHPRestoredByVar2); + DisplayPartyMenuMessage(gStringVarBuffer, FALSE); ScheduleBgCopyTilemapToVram(2); gTasks[taskId].func = Task_FinishSoftboiled; } diff --git a/src/frontier_pass.c b/src/frontier_pass.c index a351d81ce94..25ca638412c 100644 --- a/src/frontier_pass.c +++ b/src/frontier_pass.c @@ -1167,9 +1167,9 @@ static void ShowAndPrintWindows(void) AddTextPrinterParameterized3(WINDOW_BATTLE_RECORD, FONT_NORMAL, x, 5, sTextColors[0], 0, gText_BattleRecord); AddTextPrinterParameterized3(WINDOW_BATTLE_POINTS, FONT_SMALL_NARROW, 5, 4, sTextColors[0], 0, gText_BattlePoints); - ConvertIntToDecimalStringN(gStringVar4, sPassData->battlePoints, STR_CONV_MODE_LEFT_ALIGN, 5); - x = GetStringRightAlignXOffset(FONT_SMALL_NARROW, gStringVar4, 91); - AddTextPrinterParameterized3(WINDOW_BATTLE_POINTS, FONT_SMALL_NARROW, x, 16, sTextColors[0], 0, gStringVar4); + ConvertIntToDecimalStringN(gStringVarBuffer, sPassData->battlePoints, STR_CONV_MODE_LEFT_ALIGN, 5); + x = GetStringRightAlignXOffset(FONT_SMALL_NARROW, gStringVarBuffer, 91); + AddTextPrinterParameterized3(WINDOW_BATTLE_POINTS, FONT_SMALL_NARROW, x, 16, sTextColors[0], 0, gStringVarBuffer); sPassData->cursorArea = GetCursorAreaFromCoords(sPassData->cursorX - 5, sPassData->cursorY + 5); sPassData->previousCursorArea = CURSOR_AREA_NOTHING; diff --git a/src/frontier_util.c b/src/frontier_util.c index 1858792b4ec..ef06118394d 100644 --- a/src/frontier_util.c +++ b/src/frontier_util.c @@ -984,8 +984,8 @@ static void TowerPrintStreak(const u8 *str, u16 num, u8 x1, u8 x2, u8 y) if (num > MAX_STREAK) num = MAX_STREAK; ConvertIntToDecimalStringN(gStringVar1, num, STR_CONV_MODE_RIGHT_ALIGN, 4); - StringExpandPlaceholders(gStringVar4, gText_WinStreak); - AddTextPrinterParameterized(gRecordsWindowId, FONT_NORMAL, gStringVar4, x2, y, TEXT_SKIP_DRAW, NULL); + StringExpandPlaceholders(gStringVarBuffer, gText_WinStreak); + AddTextPrinterParameterized(gRecordsWindowId, FONT_NORMAL, gStringVarBuffer, x2, y, TEXT_SKIP_DRAW, NULL); } static void TowerPrintRecordStreak(u8 battleMode, u8 lvlMode, u8 x1, u8 x2, u8 y) @@ -1048,15 +1048,15 @@ static void ShowTowerResultsWindow(u8 battleMode) DrawStdWindowFrame(gRecordsWindowId, FALSE); FillWindowPixelBuffer(gRecordsWindowId, PIXEL_FILL(1)); if (battleMode == FRONTIER_MODE_SINGLES) - StringExpandPlaceholders(gStringVar4, gText_SingleBattleRoomResults); + StringExpandPlaceholders(gStringVarBuffer, gText_SingleBattleRoomResults); else if (battleMode == FRONTIER_MODE_DOUBLES) - StringExpandPlaceholders(gStringVar4, gText_DoubleBattleRoomResults); + StringExpandPlaceholders(gStringVarBuffer, gText_DoubleBattleRoomResults); else if (battleMode == FRONTIER_MODE_MULTIS) - StringExpandPlaceholders(gStringVar4, gText_MultiBattleRoomResults); + StringExpandPlaceholders(gStringVarBuffer, gText_MultiBattleRoomResults); else - StringExpandPlaceholders(gStringVar4, gText_LinkMultiBattleRoomResults); + StringExpandPlaceholders(gStringVarBuffer, gText_LinkMultiBattleRoomResults); - PrintAligned(gStringVar4, 2); + PrintAligned(gStringVarBuffer, 2); AddTextPrinterParameterized(gRecordsWindowId, FONT_NORMAL, gText_Lv502, 16, 49, TEXT_SKIP_DRAW, NULL); AddTextPrinterParameterized(gRecordsWindowId, FONT_NORMAL, gText_OpenLv, 16, 97, TEXT_SKIP_DRAW, NULL); PrintHyphens(10); @@ -1082,8 +1082,8 @@ static void PrintTwoStrings(const u8 *str1, const u8 *str2, u16 num, u8 x1, u8 x { AddTextPrinterParameterized(gRecordsWindowId, FONT_NORMAL, str1, x1, y, TEXT_SKIP_DRAW, NULL); ConvertIntToDecimalStringN(gStringVar1, num, STR_CONV_MODE_RIGHT_ALIGN, 4); - StringExpandPlaceholders(gStringVar4, str2); - AddTextPrinterParameterized(gRecordsWindowId, FONT_NORMAL, gStringVar4, x2, y, TEXT_SKIP_DRAW, NULL); + StringExpandPlaceholders(gStringVarBuffer, str2); + AddTextPrinterParameterized(gRecordsWindowId, FONT_NORMAL, gStringVarBuffer, x2, y, TEXT_SKIP_DRAW, NULL); } static void DomePrintPrevOrCurrentStreak(u8 battleMode, u8 lvlMode, u8 x1, u8 x2, u8 y) @@ -1119,11 +1119,11 @@ static void ShowDomeResultsWindow(u8 battleMode) DrawStdWindowFrame(gRecordsWindowId, FALSE); FillWindowPixelBuffer(gRecordsWindowId, PIXEL_FILL(1)); if (battleMode == FRONTIER_MODE_SINGLES) - StringExpandPlaceholders(gStringVar4, gText_SingleBattleTourneyResults); + StringExpandPlaceholders(gStringVarBuffer, gText_SingleBattleTourneyResults); else - StringExpandPlaceholders(gStringVar4, gText_DoubleBattleTourneyResults); + StringExpandPlaceholders(gStringVarBuffer, gText_DoubleBattleTourneyResults); - PrintAligned(gStringVar4, 0); + PrintAligned(gStringVarBuffer, 0); AddTextPrinterParameterized(gRecordsWindowId, FONT_NORMAL, gText_Lv502, 8, 33, TEXT_SKIP_DRAW, NULL); AddTextPrinterParameterized(gRecordsWindowId, FONT_NORMAL, gText_OpenLv, 8, 97, TEXT_SKIP_DRAW, NULL); PrintHyphens(10); @@ -1144,8 +1144,8 @@ static void PalacePrintStreak(const u8 *str, u16 num, u8 x1, u8 x2, u8 y) if (num > MAX_STREAK) num = MAX_STREAK; ConvertIntToDecimalStringN(gStringVar1, num, STR_CONV_MODE_RIGHT_ALIGN, 4); - StringExpandPlaceholders(gStringVar4, gText_WinStreak); - AddTextPrinterParameterized(gRecordsWindowId, FONT_NORMAL, gStringVar4, x2, y, TEXT_SKIP_DRAW, NULL); + StringExpandPlaceholders(gStringVarBuffer, gText_WinStreak); + AddTextPrinterParameterized(gRecordsWindowId, FONT_NORMAL, gStringVarBuffer, x2, y, TEXT_SKIP_DRAW, NULL); } static void PalacePrintRecordStreak(u8 battleMode, u8 lvlMode, u8 x1, u8 x2, u8 y) @@ -1195,11 +1195,11 @@ static void ShowPalaceResultsWindow(u8 battleMode) DrawStdWindowFrame(gRecordsWindowId, FALSE); FillWindowPixelBuffer(gRecordsWindowId, PIXEL_FILL(1)); if (battleMode == FRONTIER_MODE_SINGLES) - StringExpandPlaceholders(gStringVar4, gText_SingleBattleHallResults); + StringExpandPlaceholders(gStringVarBuffer, gText_SingleBattleHallResults); else - StringExpandPlaceholders(gStringVar4, gText_DoubleBattleHallResults); + StringExpandPlaceholders(gStringVarBuffer, gText_DoubleBattleHallResults); - PrintAligned(gStringVar4, 2); + PrintAligned(gStringVarBuffer, 2); AddTextPrinterParameterized(gRecordsWindowId, FONT_NORMAL, gText_Lv502, 16, 49, TEXT_SKIP_DRAW, NULL); AddTextPrinterParameterized(gRecordsWindowId, FONT_NORMAL, gText_OpenLv, 16, 97, TEXT_SKIP_DRAW, NULL); PrintHyphens(10); @@ -1225,8 +1225,8 @@ static void PikePrintCleared(const u8 *str1, const u8 *str2, u16 num, u8 x1, u8 { AddTextPrinterParameterized(gRecordsWindowId, FONT_NORMAL, str1, x1, y, TEXT_SKIP_DRAW, NULL); ConvertIntToDecimalStringN(gStringVar1, num, STR_CONV_MODE_RIGHT_ALIGN, 4); - StringExpandPlaceholders(gStringVar4, str2); - AddTextPrinterParameterized(gRecordsWindowId, FONT_NORMAL, gStringVar4, x2, y, TEXT_SKIP_DRAW, NULL); + StringExpandPlaceholders(gStringVarBuffer, str2); + AddTextPrinterParameterized(gRecordsWindowId, FONT_NORMAL, gStringVarBuffer, x2, y, TEXT_SKIP_DRAW, NULL); } static void PikePrintPrevOrCurrentStreak(u8 lvlMode, u8 x1, u8 x2, u8 y) @@ -1250,8 +1250,8 @@ static void ShowPikeResultsWindow(void) gRecordsWindowId = AddWindow(&sFrontierResultsWindowTemplate); DrawStdWindowFrame(gRecordsWindowId, FALSE); FillWindowPixelBuffer(gRecordsWindowId, PIXEL_FILL(1)); - StringExpandPlaceholders(gStringVar4, gText_BattleChoiceResults); - PrintAligned(gStringVar4, 0); + StringExpandPlaceholders(gStringVarBuffer, gText_BattleChoiceResults); + PrintAligned(gStringVarBuffer, 0); AddTextPrinterParameterized(gRecordsWindowId, FONT_NORMAL, gText_Lv502, 8, 33, TEXT_SKIP_DRAW, NULL); AddTextPrinterParameterized(gRecordsWindowId, FONT_NORMAL, gText_OpenLv, 8, 97, TEXT_SKIP_DRAW, NULL); PrintHyphens(10); @@ -1272,8 +1272,8 @@ static void ArenaPrintStreak(const u8 *str, u16 num, u8 x1, u8 x2, u8 y) if (num > MAX_STREAK) num = MAX_STREAK; ConvertIntToDecimalStringN(gStringVar1, num, STR_CONV_MODE_RIGHT_ALIGN, 4); - StringExpandPlaceholders(gStringVar4, gText_KOsInARow); - AddTextPrinterParameterized(gRecordsWindowId, FONT_NORMAL, gStringVar4, x2, y, TEXT_SKIP_DRAW, NULL); + StringExpandPlaceholders(gStringVarBuffer, gText_KOsInARow); + AddTextPrinterParameterized(gRecordsWindowId, FONT_NORMAL, gStringVarBuffer, x2, y, TEXT_SKIP_DRAW, NULL); } static void ArenaPrintRecordStreak(u8 lvlMode, u8 x1, u8 x2, u8 y) @@ -1313,8 +1313,8 @@ static void ShowArenaResultsWindow(void) DrawStdWindowFrame(gRecordsWindowId, FALSE); FillWindowPixelBuffer(gRecordsWindowId, PIXEL_FILL(1)); PrintHyphens(10); - StringExpandPlaceholders(gStringVar4, gText_SetKOTourneyResults); - PrintAligned(gStringVar4, 2); + StringExpandPlaceholders(gStringVarBuffer, gText_SetKOTourneyResults); + PrintAligned(gStringVarBuffer, 2); AddTextPrinterParameterized(gRecordsWindowId, FONT_NORMAL, gText_Lv502, 16, 49, TEXT_SKIP_DRAW, NULL); AddTextPrinterParameterized(gRecordsWindowId, FONT_NORMAL, gText_OpenLv, 16, 97, TEXT_SKIP_DRAW, NULL); ArenaPrintPrevOrCurrentStreak(FRONTIER_LVL_50, 72, 126, 49); @@ -1332,12 +1332,12 @@ static void FactoryPrintStreak(const u8 *str, u16 num1, u16 num2, u8 x1, u8 x2, if (num1 > MAX_STREAK) num1 = MAX_STREAK; ConvertIntToDecimalStringN(gStringVar1, num1, STR_CONV_MODE_RIGHT_ALIGN, 4); - StringExpandPlaceholders(gStringVar4, gText_WinStreak); - AddTextPrinterParameterized(gRecordsWindowId, FONT_NORMAL, gStringVar4, x2, y, TEXT_SKIP_DRAW, NULL); + StringExpandPlaceholders(gStringVarBuffer, gText_WinStreak); + AddTextPrinterParameterized(gRecordsWindowId, FONT_NORMAL, gStringVarBuffer, x2, y, TEXT_SKIP_DRAW, NULL); ConvertIntToDecimalStringN(gStringVar1, num2, STR_CONV_MODE_RIGHT_ALIGN, 4); - StringExpandPlaceholders(gStringVar4, gText_TimesVar1); - AddTextPrinterParameterized(gRecordsWindowId, FONT_NORMAL, gStringVar4, x3, y, TEXT_SKIP_DRAW, NULL); + StringExpandPlaceholders(gStringVarBuffer, gText_TimesVar1); + AddTextPrinterParameterized(gRecordsWindowId, FONT_NORMAL, gStringVarBuffer, x3, y, TEXT_SKIP_DRAW, NULL); } static void FactoryPrintRecordStreak(u8 battleMode, u8 lvlMode, u8 x1, u8 x2, u8 x3, u8 y) @@ -1399,11 +1399,11 @@ static void ShowFactoryResultsWindow(u8 battleMode) DrawStdWindowFrame(gRecordsWindowId, FALSE); FillWindowPixelBuffer(gRecordsWindowId, PIXEL_FILL(1)); if (battleMode == FRONTIER_MODE_SINGLES) - StringExpandPlaceholders(gStringVar4, gText_BattleSwapSingleResults); + StringExpandPlaceholders(gStringVarBuffer, gText_BattleSwapSingleResults); else - StringExpandPlaceholders(gStringVar4, gText_BattleSwapDoubleResults); + StringExpandPlaceholders(gStringVarBuffer, gText_BattleSwapDoubleResults); - PrintAligned(gStringVar4, 0); + PrintAligned(gStringVarBuffer, 0); AddTextPrinterParameterized(gRecordsWindowId, FONT_NORMAL, gText_Lv502, 8, 33, TEXT_SKIP_DRAW, NULL); AddTextPrinterParameterized(gRecordsWindowId, FONT_NORMAL, gText_RentalSwap, 152, 33, TEXT_SKIP_DRAW, NULL); AddTextPrinterParameterized(gRecordsWindowId, FONT_NORMAL, gText_OpenLv, 8, 97, TEXT_SKIP_DRAW, NULL); @@ -1423,8 +1423,8 @@ static void PyramidPrintStreak(const u8 *str, u16 num, u8 x1, u8 x2, u8 y) if (num > MAX_STREAK) num = MAX_STREAK; ConvertIntToDecimalStringN(gStringVar1, num, STR_CONV_MODE_RIGHT_ALIGN, 4); - StringExpandPlaceholders(gStringVar4, gText_FloorsCleared); - AddTextPrinterParameterized(gRecordsWindowId, FONT_NORMAL, gStringVar4, x2, y, TEXT_SKIP_DRAW, NULL); + StringExpandPlaceholders(gStringVarBuffer, gText_FloorsCleared); + AddTextPrinterParameterized(gRecordsWindowId, FONT_NORMAL, gStringVarBuffer, x2, y, TEXT_SKIP_DRAW, NULL); } static void PyramidPrintRecordStreak(u8 lvlMode, u8 x1, u8 x2, u8 y) @@ -1463,8 +1463,8 @@ static void ShowPyramidResultsWindow(void) gRecordsWindowId = AddWindow(&sFrontierResultsWindowTemplate); DrawStdWindowFrame(gRecordsWindowId, FALSE); FillWindowPixelBuffer(gRecordsWindowId, PIXEL_FILL(1)); - StringExpandPlaceholders(gStringVar4, gText_BattleQuestResults); - PrintAligned(gStringVar4, 2); + StringExpandPlaceholders(gStringVarBuffer, gText_BattleQuestResults); + PrintAligned(gStringVarBuffer, 2); AddTextPrinterParameterized(gRecordsWindowId, FONT_NORMAL, gText_Lv502, 8, 49, TEXT_SKIP_DRAW, NULL); AddTextPrinterParameterized(gRecordsWindowId, FONT_NORMAL, gText_OpenLv, 8, 97, TEXT_SKIP_DRAW, NULL); PrintHyphens(10); @@ -1487,9 +1487,9 @@ static void ShowLinkContestResultsWindow(void) DrawStdWindowFrame(gRecordsWindowId, FALSE); FillWindowPixelBuffer(gRecordsWindowId, PIXEL_FILL(1)); - StringExpandPlaceholders(gStringVar4, gText_LinkContestResults); - x = GetStringCenterAlignXOffset(FONT_NORMAL, gStringVar4, 208); - AddTextPrinterParameterized(gRecordsWindowId, FONT_NORMAL, gStringVar4, x, 1, TEXT_SKIP_DRAW, NULL); + StringExpandPlaceholders(gStringVarBuffer, gText_LinkContestResults); + x = GetStringCenterAlignXOffset(FONT_NORMAL, gStringVarBuffer, 208); + AddTextPrinterParameterized(gRecordsWindowId, FONT_NORMAL, gStringVarBuffer, x, 1, TEXT_SKIP_DRAW, NULL); str = gText_1st; x = GetStringRightAlignXOffset(FONT_NORMAL, str, 38) + 50; @@ -1518,8 +1518,8 @@ static void ShowLinkContestResultsWindow(void) { for (j = 0; j < CONTESTANT_COUNT; j++) { - ConvertIntToDecimalStringN(gStringVar4, gSaveBlock2Ptr->contestLinkResults[i][j], STR_CONV_MODE_RIGHT_ALIGN, 4); - AddTextPrinterParameterized(gRecordsWindowId, FONT_NORMAL, gStringVar4, (j * 38) + 64, (i * 16) + 41, TEXT_SKIP_DRAW, NULL); + ConvertIntToDecimalStringN(gStringVarBuffer, gSaveBlock2Ptr->contestLinkResults[i][j], STR_CONV_MODE_RIGHT_ALIGN, 4); + AddTextPrinterParameterized(gRecordsWindowId, FONT_NORMAL, gStringVarBuffer, (j * 38) + 64, (i * 16) + 41, TEXT_SKIP_DRAW, NULL); } } @@ -2235,8 +2235,8 @@ static void Print1PRecord(s32 position, s32 x, s32 y, struct RankingHall1P *hall if (winStreak > MAX_STREAK) winStreak = MAX_STREAK; ConvertIntToDecimalStringN(gStringVar2, winStreak, STR_CONV_MODE_RIGHT_ALIGN, 4); - StringExpandPlaceholders(gStringVar4, sHallFacilityToRecordsText[hallFacilityId]); - AddTextPrinterParameterized(gRecordsWindowId, FONT_NORMAL, gStringVar4, GetStringRightAlignXOffset(FONT_NORMAL, sHallFacilityToRecordsText[hallFacilityId], 0xC8), (8 * (y + 5 * position)) + 1, TEXT_SKIP_DRAW, NULL); + StringExpandPlaceholders(gStringVarBuffer, sHallFacilityToRecordsText[hallFacilityId]); + AddTextPrinterParameterized(gRecordsWindowId, FONT_NORMAL, gStringVarBuffer, GetStringRightAlignXOffset(FONT_NORMAL, sHallFacilityToRecordsText[hallFacilityId], 0xC8), (8 * (y + 5 * position)) + 1, TEXT_SKIP_DRAW, NULL); } } @@ -2262,8 +2262,8 @@ static void Print2PRecord(s32 position, s32 x, s32 y, struct RankingHall2P *hall if (winStreak > MAX_STREAK) winStreak = MAX_STREAK; ConvertIntToDecimalStringN(gStringVar2, winStreak, STR_CONV_MODE_RIGHT_ALIGN, 4); - StringExpandPlaceholders(gStringVar4, sHallFacilityToRecordsText[RANKING_HALL_TOWER_LINK]); - AddTextPrinterParameterized(gRecordsWindowId, FONT_NORMAL, gStringVar4, GetStringRightAlignXOffset(FONT_NORMAL, sHallFacilityToRecordsText[RANKING_HALL_TOWER_LINK], 0xC8), (8 * (y + 5 * position)) + 1, TEXT_SKIP_DRAW, NULL); + StringExpandPlaceholders(gStringVarBuffer, sHallFacilityToRecordsText[RANKING_HALL_TOWER_LINK]); + AddTextPrinterParameterized(gRecordsWindowId, FONT_NORMAL, gStringVarBuffer, GetStringRightAlignXOffset(FONT_NORMAL, sHallFacilityToRecordsText[RANKING_HALL_TOWER_LINK], 0xC8), (8 * (y + 5 * position)) + 1, TEXT_SKIP_DRAW, NULL); } } @@ -2343,8 +2343,8 @@ static void PrintHallRecords(s32 hallFacilityId, s32 lvlMode) struct RankingHall2P records2P[HALL_RECORDS_COUNT]; StringCopy(gStringVar1, sRecordsWindowChallengeTexts[hallFacilityId][0]); - StringExpandPlaceholders(gStringVar4, sRecordsWindowChallengeTexts[hallFacilityId][1]); - AddTextPrinterParameterized(gRecordsWindowId, FONT_NORMAL, gStringVar4, 0, 1, TEXT_SKIP_DRAW, NULL); + StringExpandPlaceholders(gStringVarBuffer, sRecordsWindowChallengeTexts[hallFacilityId][1]); + AddTextPrinterParameterized(gRecordsWindowId, FONT_NORMAL, gStringVarBuffer, 0, 1, TEXT_SKIP_DRAW, NULL); x = GetStringRightAlignXOffset(FONT_NORMAL, sLevelModeText[lvlMode], DISPLAY_WIDTH - 32); AddTextPrinterParameterized(gRecordsWindowId, FONT_NORMAL, sLevelModeText[lvlMode], x, 1, TEXT_SKIP_DRAW, NULL); if (hallFacilityId == RANKING_HALL_TOWER_LINK) @@ -2623,10 +2623,10 @@ static void CopyFrontierBrainText(bool8 playerWonText) switch (playerWonText) { case FALSE: - StringCopy(gStringVar4, sFrontierBrainPlayerLostTexts[symbol][facility]); + StringCopy(gStringVarBuffer, sFrontierBrainPlayerLostTexts[symbol][facility]); break; case TRUE: - StringCopy(gStringVar4, sFrontierBrainPlayerWonTexts[symbol][facility]); + StringCopy(gStringVarBuffer, sFrontierBrainPlayerWonTexts[symbol][facility]); break; } } diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c index 91850ec72e6..8066c2bf30d 100644 --- a/src/hall_of_fame.c +++ b/src/hall_of_fame.c @@ -942,12 +942,12 @@ static void Task_HofPC_DrawSpritesPrintText(u8 taskId) BlendPalettes(PALETTES_OBJECTS, 0xC, RGB(16, 29, 24)); ConvertIntToDecimalStringN(gStringVar1, gTasks[taskId].tCurrPageNo, STR_CONV_MODE_RIGHT_ALIGN, 3); - StringExpandPlaceholders(gStringVar4, gText_HOFNumber); + StringExpandPlaceholders(gStringVarBuffer, gText_HOFNumber); if (gTasks[taskId].tCurrTeamNo <= 0) - HofPCTopBar_PrintPair(gStringVar4, gText_PickCancel, FALSE, 0, TRUE); + HofPCTopBar_PrintPair(gStringVarBuffer, gText_PickCancel, FALSE, 0, TRUE); else - HofPCTopBar_PrintPair(gStringVar4, gText_PickNextCancel, FALSE, 0, TRUE); + HofPCTopBar_PrintPair(gStringVarBuffer, gText_PickNextCancel, FALSE, 0, TRUE); gTasks[taskId].func = Task_HofPC_PrintMonInfo; } diff --git a/src/item_menu.c b/src/item_menu.c index f0abfcf62a3..dc557a9620c 100755 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -972,17 +972,17 @@ static void BagMenu_ItemPrintCallback(u8 windowId, u32 itemIndex, u8 y) { // Print berry quantity ConvertIntToDecimalStringN(gStringVar1, itemQuantity, STR_CONV_MODE_RIGHT_ALIGN, BERRY_CAPACITY_DIGITS); - StringExpandPlaceholders(gStringVar4, gText_xVar1); - offset = GetStringRightAlignXOffset(FONT_NARROW, gStringVar4, 119); - BagMenu_Print(windowId, FONT_NARROW, gStringVar4, offset, y, 0, 0, TEXT_SKIP_DRAW, COLORID_NORMAL); + StringExpandPlaceholders(gStringVarBuffer, gText_xVar1); + offset = GetStringRightAlignXOffset(FONT_NARROW, gStringVarBuffer, 119); + BagMenu_Print(windowId, FONT_NARROW, gStringVarBuffer, offset, y, 0, 0, TEXT_SKIP_DRAW, COLORID_NORMAL); } else if (gBagPosition.pocket != KEYITEMS_POCKET && ItemId_GetImportance(itemId) == FALSE) { // Print item quantity ConvertIntToDecimalStringN(gStringVar1, itemQuantity, STR_CONV_MODE_RIGHT_ALIGN, BAG_ITEM_CAPACITY_DIGITS); - StringExpandPlaceholders(gStringVar4, gText_xVar1); - offset = GetStringRightAlignXOffset(FONT_NARROW, gStringVar4, 119); - BagMenu_Print(windowId, FONT_NARROW, gStringVar4, offset, y, 0, 0, TEXT_SKIP_DRAW, COLORID_NORMAL); + StringExpandPlaceholders(gStringVarBuffer, gText_xVar1); + offset = GetStringRightAlignXOffset(FONT_NARROW, gStringVarBuffer, 119); + BagMenu_Print(windowId, FONT_NARROW, gStringVarBuffer, offset, y, 0, 0, TEXT_SKIP_DRAW, COLORID_NORMAL); } else { @@ -1004,8 +1004,8 @@ static void PrintItemDescription(int itemIndex) { // Print 'Cancel' description StringCopy(gStringVar1, gBagMenu_ReturnToStrings[gBagPosition.location]); - StringExpandPlaceholders(gStringVar4, gText_ReturnToVar1); - str = gStringVar4; + StringExpandPlaceholders(gStringVarBuffer, gText_ReturnToVar1); + str = gStringVarBuffer; } FillWindowPixelBuffer(WIN_DESCRIPTION, PIXEL_FILL(0)); BagMenu_Print(WIN_DESCRIPTION, FONT_NORMAL, str, 3, 1, 0, 0, 0, COLORID_NORMAL); @@ -1194,8 +1194,8 @@ static void PrintItemQuantity(u8 windowId, s16 quantity) { u8 numDigits = (gBagPosition.pocket == BERRIES_POCKET) ? BERRY_CAPACITY_DIGITS : BAG_ITEM_CAPACITY_DIGITS; ConvertIntToDecimalStringN(gStringVar1, quantity, STR_CONV_MODE_LEADING_ZEROS, numDigits); - StringExpandPlaceholders(gStringVar4, gText_xVar1); - AddTextPrinterParameterized(windowId, FONT_NORMAL, gStringVar4, GetStringCenterAlignXOffset(FONT_NORMAL, gStringVar4, 0x28), 2, 0, 0); + StringExpandPlaceholders(gStringVarBuffer, gText_xVar1); + AddTextPrinterParameterized(windowId, FONT_NORMAL, gStringVarBuffer, GetStringCenterAlignXOffset(FONT_NORMAL, gStringVarBuffer, 0x28), 2, 0, 0); } // Prints the quantity of items to be sold and the amount that would be earned @@ -1203,8 +1203,8 @@ static void PrintItemSoldAmount(int windowId, int numSold, int moneyEarned) { u8 numDigits = (gBagPosition.pocket == BERRIES_POCKET) ? BERRY_CAPACITY_DIGITS : BAG_ITEM_CAPACITY_DIGITS; ConvertIntToDecimalStringN(gStringVar1, numSold, STR_CONV_MODE_LEADING_ZEROS, numDigits); - StringExpandPlaceholders(gStringVar4, gText_xVar1); - AddTextPrinterParameterized(windowId, FONT_NORMAL, gStringVar4, 0, 1, TEXT_SKIP_DRAW, 0); + StringExpandPlaceholders(gStringVarBuffer, gText_xVar1); + AddTextPrinterParameterized(windowId, FONT_NORMAL, gStringVarBuffer, 0, 1, TEXT_SKIP_DRAW, 0); PrintMoneyAmount(windowId, 38, 1, moneyEarned, 0); } @@ -1436,9 +1436,9 @@ static void StartItemSwap(u8 taskId) tListPosition = gBagPosition.scrollPosition[gBagPosition.pocket] + gBagPosition.cursorPosition[gBagPosition.pocket]; gBagMenu->toSwapPos = tListPosition; CopyItemName(BagGetItemIdByPocketPosition(gBagPosition.pocket + 1, tListPosition), gStringVar1); - StringExpandPlaceholders(gStringVar4, gText_MoveVar1Where); + StringExpandPlaceholders(gStringVarBuffer, gText_MoveVar1Where); FillWindowPixelBuffer(WIN_DESCRIPTION, PIXEL_FILL(0)); - BagMenu_Print(WIN_DESCRIPTION, FONT_NORMAL, gStringVar4, 3, 1, 0, 0, 0, COLORID_NORMAL); + BagMenu_Print(WIN_DESCRIPTION, FONT_NORMAL, gStringVarBuffer, 3, 1, 0, 0, 0, COLORID_NORMAL); UpdateItemMenuSwapLinePos(tListPosition); DestroyPocketSwitchArrowPair(); BagMenu_PrintCursor(tListTaskId, COLORID_GRAY_CURSOR); @@ -1651,9 +1651,9 @@ static void OpenContextMenu(u8 taskId) else { CopyItemName(gSpecialVar_ItemId, gStringVar1); - StringExpandPlaceholders(gStringVar4, gText_Var1IsSelected); + StringExpandPlaceholders(gStringVarBuffer, gText_Var1IsSelected); FillWindowPixelBuffer(WIN_DESCRIPTION, PIXEL_FILL(0)); - BagMenu_Print(WIN_DESCRIPTION, FONT_NORMAL, gStringVar4, 3, 1, 0, 0, 0, COLORID_NORMAL); + BagMenu_Print(WIN_DESCRIPTION, FONT_NORMAL, gStringVarBuffer, 3, 1, 0, 0, 0, COLORID_NORMAL); } if (gBagMenu->contextMenuNumItems == 1) PrintContextMenuItems(BagMenu_AddWindow(ITEMWIN_1x1)); @@ -1817,9 +1817,9 @@ static void ItemMenu_Toss(u8 taskId) else { CopyItemName(gSpecialVar_ItemId, gStringVar1); - StringExpandPlaceholders(gStringVar4, gText_TossHowManyVar1s); + StringExpandPlaceholders(gStringVarBuffer, gText_TossHowManyVar1s); FillWindowPixelBuffer(WIN_DESCRIPTION, PIXEL_FILL(0)); - BagMenu_Print(WIN_DESCRIPTION, FONT_NORMAL, gStringVar4, 3, 1, 0, 0, 0, COLORID_NORMAL); + BagMenu_Print(WIN_DESCRIPTION, FONT_NORMAL, gStringVarBuffer, 3, 1, 0, 0, 0, COLORID_NORMAL); AddItemQuantityWindow(ITEMWIN_QUANTITY); gTasks[taskId].func = Task_ChooseHowManyToToss; } @@ -1831,9 +1831,9 @@ static void AskTossItems(u8 taskId) CopyItemName(gSpecialVar_ItemId, gStringVar1); ConvertIntToDecimalStringN(gStringVar2, tItemCount, STR_CONV_MODE_LEFT_ALIGN, MAX_ITEM_DIGITS); - StringExpandPlaceholders(gStringVar4, gText_ConfirmTossItems); + StringExpandPlaceholders(gStringVarBuffer, gText_ConfirmTossItems); FillWindowPixelBuffer(WIN_DESCRIPTION, PIXEL_FILL(0)); - BagMenu_Print(WIN_DESCRIPTION, FONT_NORMAL, gStringVar4, 3, 1, 0, 0, 0, COLORID_NORMAL); + BagMenu_Print(WIN_DESCRIPTION, FONT_NORMAL, gStringVarBuffer, 3, 1, 0, 0, 0, COLORID_NORMAL); BagMenu_YesNo(taskId, ITEMWIN_YESNO_LOW, &sYesNoTossFunctions); } @@ -1874,9 +1874,9 @@ static void ConfirmToss(u8 taskId) CopyItemName(gSpecialVar_ItemId, gStringVar1); ConvertIntToDecimalStringN(gStringVar2, tItemCount, STR_CONV_MODE_LEFT_ALIGN, MAX_ITEM_DIGITS); - StringExpandPlaceholders(gStringVar4, gText_ThrewAwayVar2Var1s); + StringExpandPlaceholders(gStringVarBuffer, gText_ThrewAwayVar2Var1s); FillWindowPixelBuffer(WIN_DESCRIPTION, PIXEL_FILL(0)); - BagMenu_Print(WIN_DESCRIPTION, FONT_NORMAL, gStringVar4, 3, 1, 0, 0, 0, COLORID_NORMAL); + BagMenu_Print(WIN_DESCRIPTION, FONT_NORMAL, gStringVarBuffer, 3, 1, 0, 0, 0, COLORID_NORMAL); gTasks[taskId].func = Task_RemoveItemFromBag; } @@ -1952,8 +1952,8 @@ static void PrintThereIsNoPokemon(u8 taskId) static void PrintItemCantBeHeld(u8 taskId) { CopyItemName(gSpecialVar_ItemId, gStringVar1); - StringExpandPlaceholders(gStringVar4, gText_Var1CantBeHeld); - DisplayItemMessage(taskId, FONT_NORMAL, gStringVar4, HandleErrorMessage); + StringExpandPlaceholders(gStringVarBuffer, gText_Var1CantBeHeld); + DisplayItemMessage(taskId, FONT_NORMAL, gStringVarBuffer, HandleErrorMessage); } static void HandleErrorMessage(u8 taskId) @@ -2006,8 +2006,8 @@ static void Task_ItemContext_GiveToParty(u8 taskId) else if (!IsHoldingItemAllowed(gSpecialVar_ItemId)) { CopyItemName(gSpecialVar_ItemId, gStringVar1); - StringExpandPlaceholders(gStringVar4, gText_Var1CantBeHeldHere); - DisplayItemMessage(taskId, FONT_NORMAL, gStringVar4, HandleErrorMessage); + StringExpandPlaceholders(gStringVarBuffer, gText_Var1CantBeHeldHere); + DisplayItemMessage(taskId, FONT_NORMAL, gStringVarBuffer, HandleErrorMessage); } else if (gBagPosition.pocket != KEYITEMS_POCKET && !ItemId_GetImportance(gSpecialVar_ItemId)) { @@ -2071,8 +2071,8 @@ static void Task_ItemContext_Sell(u8 taskId) if (ItemId_GetPrice(gSpecialVar_ItemId) == 0) { CopyItemName(gSpecialVar_ItemId, gStringVar2); - StringExpandPlaceholders(gStringVar4, gText_CantBuyKeyItem); - DisplayItemMessage(taskId, FONT_NORMAL, gStringVar4, CloseItemMessage); + StringExpandPlaceholders(gStringVarBuffer, gText_CantBuyKeyItem); + DisplayItemMessage(taskId, FONT_NORMAL, gStringVarBuffer, CloseItemMessage); } else { @@ -2085,8 +2085,8 @@ static void Task_ItemContext_Sell(u8 taskId) else { CopyItemName(gSpecialVar_ItemId, gStringVar2); - StringExpandPlaceholders(gStringVar4, gText_HowManyToSell); - DisplayItemMessage(taskId, FONT_NORMAL, gStringVar4, InitSellHowManyInput); + StringExpandPlaceholders(gStringVarBuffer, gText_HowManyToSell); + DisplayItemMessage(taskId, FONT_NORMAL, gStringVarBuffer, InitSellHowManyInput); } } } @@ -2096,8 +2096,8 @@ static void DisplaySellItemPriceAndConfirm(u8 taskId) s16 *data = gTasks[taskId].data; ConvertIntToDecimalStringN(gStringVar1, (ItemId_GetPrice(gSpecialVar_ItemId) / 2) * tItemCount, STR_CONV_MODE_LEFT_ALIGN, 6); - StringExpandPlaceholders(gStringVar4, gText_ICanPayVar1); - DisplayItemMessage(taskId, FONT_NORMAL, gStringVar4, AskSellItems); + StringExpandPlaceholders(gStringVarBuffer, gText_ICanPayVar1); + DisplayItemMessage(taskId, FONT_NORMAL, gStringVarBuffer, AskSellItems); } static void AskSellItems(u8 taskId) @@ -2156,8 +2156,8 @@ static void ConfirmSell(u8 taskId) CopyItemName(gSpecialVar_ItemId, gStringVar2); ConvertIntToDecimalStringN(gStringVar1, (ItemId_GetPrice(gSpecialVar_ItemId) / 2) * tItemCount, STR_CONV_MODE_LEFT_ALIGN, 6); - StringExpandPlaceholders(gStringVar4, gText_TurnedOverVar1ForVar2); - DisplayItemMessage(taskId, FONT_NORMAL, gStringVar4, SellItem); + StringExpandPlaceholders(gStringVarBuffer, gText_TurnedOverVar1ForVar2); + DisplayItemMessage(taskId, FONT_NORMAL, gStringVarBuffer, SellItem); } static void SellItem(u8 taskId) @@ -2201,9 +2201,9 @@ static void Task_ItemContext_Deposit(u8 taskId) else { CopyItemName(gSpecialVar_ItemId, gStringVar1); - StringExpandPlaceholders(gStringVar4, gText_DepositHowManyVar1); + StringExpandPlaceholders(gStringVarBuffer, gText_DepositHowManyVar1); FillWindowPixelBuffer(WIN_DESCRIPTION, PIXEL_FILL(0)); - BagMenu_Print(WIN_DESCRIPTION, FONT_NORMAL, gStringVar4, 3, 1, 0, 0, 0, COLORID_NORMAL); + BagMenu_Print(WIN_DESCRIPTION, FONT_NORMAL, gStringVarBuffer, 3, 1, 0, 0, 0, COLORID_NORMAL); AddItemQuantityWindow(ITEMWIN_QUANTITY); gTasks[taskId].func = Task_ChooseHowManyToDeposit; } @@ -2249,8 +2249,8 @@ static void TryDepositItem(u8 taskId) // Successfully deposited CopyItemName(gSpecialVar_ItemId, gStringVar1); ConvertIntToDecimalStringN(gStringVar2, tItemCount, STR_CONV_MODE_LEFT_ALIGN, MAX_ITEM_DIGITS); - StringExpandPlaceholders(gStringVar4, gText_DepositedVar2Var1s); - BagMenu_Print(WIN_DESCRIPTION, FONT_NORMAL, gStringVar4, 3, 1, 0, 0, 0, COLORID_NORMAL); + StringExpandPlaceholders(gStringVarBuffer, gText_DepositedVar2Var1s); + BagMenu_Print(WIN_DESCRIPTION, FONT_NORMAL, gStringVarBuffer, 3, 1, 0, 0, 0, COLORID_NORMAL); gTasks[taskId].func = Task_RemoveItemFromBag; } else diff --git a/src/item_use.c b/src/item_use.c index 322eaf76c07..846213453d7 100755 --- a/src/item_use.c +++ b/src/item_use.c @@ -141,17 +141,17 @@ static void Task_CallItemUseOnFieldCallback(u8 taskId) static void DisplayCannotUseItemMessage(u8 taskId, bool8 isUsingRegisteredKeyItemOnField, const u8 *str) { - StringExpandPlaceholders(gStringVar4, str); + StringExpandPlaceholders(gStringVarBuffer, str); if (!isUsingRegisteredKeyItemOnField) { if (!InBattlePyramid()) - DisplayItemMessage(taskId, FONT_NORMAL, gStringVar4, CloseItemMessage); + DisplayItemMessage(taskId, FONT_NORMAL, gStringVarBuffer, CloseItemMessage); else DisplayItemMessageInBattlePyramid(taskId, gText_DadsAdvice, Task_CloseBattlePyramidBagMessage); } else { - DisplayItemMessageOnField(taskId, gStringVar4, Task_CloseCantUseKeyItemMessage); + DisplayItemMessageOnField(taskId, gStringVarBuffer, Task_CloseCantUseKeyItemMessage); } } @@ -654,30 +654,30 @@ static void Task_OpenRegisteredPokeblockCase(u8 taskId) void ItemUseOutOfBattle_CoinCase(u8 taskId) { ConvertIntToDecimalStringN(gStringVar1, GetCoins(), STR_CONV_MODE_LEFT_ALIGN, 4); - StringExpandPlaceholders(gStringVar4, gText_CoinCase); + StringExpandPlaceholders(gStringVarBuffer, gText_CoinCase); if (!gTasks[taskId].tUsingRegisteredKeyItem) { - DisplayItemMessage(taskId, FONT_NORMAL, gStringVar4, CloseItemMessage); + DisplayItemMessage(taskId, FONT_NORMAL, gStringVarBuffer, CloseItemMessage); } else { - DisplayItemMessageOnField(taskId, gStringVar4, Task_CloseCantUseKeyItemMessage); + DisplayItemMessageOnField(taskId, gStringVarBuffer, Task_CloseCantUseKeyItemMessage); } } void ItemUseOutOfBattle_PowderJar(u8 taskId) { ConvertIntToDecimalStringN(gStringVar1, GetBerryPowder(), STR_CONV_MODE_LEFT_ALIGN, 5); - StringExpandPlaceholders(gStringVar4, gText_PowderQty); + StringExpandPlaceholders(gStringVarBuffer, gText_PowderQty); if (!gTasks[taskId].tUsingRegisteredKeyItem) { - DisplayItemMessage(taskId, FONT_NORMAL, gStringVar4, CloseItemMessage); + DisplayItemMessage(taskId, FONT_NORMAL, gStringVarBuffer, CloseItemMessage); } else { - DisplayItemMessageOnField(taskId, gStringVar4, Task_CloseCantUseKeyItemMessage); + DisplayItemMessageOnField(taskId, gStringVarBuffer, Task_CloseCantUseKeyItemMessage); } } @@ -805,8 +805,8 @@ static void Task_ShowTMHMContainedMessage(u8 taskId) if (JOY_NEW(A_BUTTON | B_BUTTON)) { StringCopy(gStringVar1, gMoveNames[ItemIdToBattleMoveId(gSpecialVar_ItemId)]); - StringExpandPlaceholders(gStringVar4, gText_TMHMContainedVar1); - DisplayItemMessage(taskId, FONT_NORMAL, gStringVar4, UseTMHMYesNo); + StringExpandPlaceholders(gStringVarBuffer, gText_TMHMContainedVar1); + DisplayItemMessage(taskId, FONT_NORMAL, gStringVarBuffer, UseTMHMYesNo); } } @@ -825,7 +825,7 @@ static void RemoveUsedItem(void) { RemoveBagItem(gSpecialVar_ItemId, 1); CopyItemName(gSpecialVar_ItemId, gStringVar2); - StringExpandPlaceholders(gStringVar4, gText_PlayerUsedVar2); + StringExpandPlaceholders(gStringVarBuffer, gText_PlayerUsedVar2); if (!InBattlePyramid()) { UpdatePocketItemList(ItemId_GetPocket(gSpecialVar_ItemId)); @@ -867,9 +867,9 @@ static void Task_UseRepel(u8 taskId) VarSet(VAR_REPEL_STEP_COUNT, ItemId_GetHoldEffectParam(gSpecialVar_ItemId)); RemoveUsedItem(); if (!InBattlePyramid()) - DisplayItemMessage(taskId, FONT_NORMAL, gStringVar4, CloseItemMessage); + DisplayItemMessage(taskId, FONT_NORMAL, gStringVarBuffer, CloseItemMessage); else - DisplayItemMessageInBattlePyramid(taskId, gStringVar4, Task_CloseBattlePyramidBagMessage); + DisplayItemMessageInBattlePyramid(taskId, gStringVarBuffer, Task_CloseBattlePyramidBagMessage); } } @@ -879,9 +879,9 @@ static void Task_UsedBlackWhiteFlute(u8 taskId) { PlaySE(SE_GLASS_FLUTE); if (!InBattlePyramid()) - DisplayItemMessage(taskId, FONT_NORMAL, gStringVar4, CloseItemMessage); + DisplayItemMessage(taskId, FONT_NORMAL, gStringVarBuffer, CloseItemMessage); else - DisplayItemMessageInBattlePyramid(taskId, gStringVar4, Task_CloseBattlePyramidBagMessage); + DisplayItemMessageInBattlePyramid(taskId, gStringVarBuffer, Task_CloseBattlePyramidBagMessage); } } @@ -892,13 +892,13 @@ void ItemUseOutOfBattle_BlackWhiteFlute(u8 taskId) { FlagSet(FLAG_SYS_ENC_UP_ITEM); FlagClear(FLAG_SYS_ENC_DOWN_ITEM); - StringExpandPlaceholders(gStringVar4, gText_UsedVar2WildLured); + StringExpandPlaceholders(gStringVarBuffer, gText_UsedVar2WildLured); } else { FlagSet(FLAG_SYS_ENC_DOWN_ITEM); FlagClear(FLAG_SYS_ENC_UP_ITEM); - StringExpandPlaceholders(gStringVar4, gText_UsedVar2WildRepelled); + StringExpandPlaceholders(gStringVarBuffer, gText_UsedVar2WildRepelled); } gTasks[taskId].data[8] = 0; gTasks[taskId].func = Task_UsedBlackWhiteFlute; @@ -916,7 +916,7 @@ static void ItemUseOnFieldCB_EscapeRope(u8 taskId) Overworld_ResetStateAfterDigEscRope(); RemoveUsedItem(); gTasks[taskId].data[0] = 0; - DisplayItemMessageOnField(taskId, gStringVar4, Task_UseDigEscapeRopeOnField); + DisplayItemMessageOnField(taskId, gStringVarBuffer, Task_UseDigEscapeRopeOnField); } bool8 CanUseDigOrEscapeRopeOnCurMap(void) @@ -1050,9 +1050,9 @@ void ItemUseInBattle_Escape(u8 taskId) { RemoveUsedItem(); if (!InBattlePyramid()) - DisplayItemMessage(taskId, FONT_NORMAL, gStringVar4, Task_FadeAndCloseBagMenu); + DisplayItemMessage(taskId, FONT_NORMAL, gStringVarBuffer, Task_FadeAndCloseBagMenu); else - DisplayItemMessageInBattlePyramid(taskId, gStringVar4, CloseBattlePyramidBag); + DisplayItemMessageInBattlePyramid(taskId, gStringVarBuffer, CloseBattlePyramidBag); } else { diff --git a/src/main_menu.c b/src/main_menu.c index 10b34728b36..6ac0356040d 100644 --- a/src/main_menu.c +++ b/src/main_menu.c @@ -1334,7 +1334,7 @@ static void Task_NewGameBirchSpeech_WaitForSpriteFadeInWelcome(u8 taskId) PutWindowTilemap(0); CopyWindowToVram(0, COPYWIN_GFX); NewGameBirchSpeech_ClearWindow(0); - StringExpandPlaceholders(gStringVar4, gText_Birch_Welcome); + StringExpandPlaceholders(gStringVarBuffer, gText_Birch_Welcome); AddTextPrinterForMessage(TRUE); gTasks[taskId].func = Task_NewGameBirchSpeech_ThisIsAPokemon; } @@ -1346,7 +1346,7 @@ static void Task_NewGameBirchSpeech_ThisIsAPokemon(u8 taskId) if (!gPaletteFade.active && !RunTextPrintersAndIsPrinter0Active()) { gTasks[taskId].func = Task_NewGameBirchSpeech_MainSpeech; - StringExpandPlaceholders(gStringVar4, gText_ThisIsAPokemon); + StringExpandPlaceholders(gStringVarBuffer, gText_ThisIsAPokemon); AddTextPrinterWithCallbackForMessage(TRUE, NewGameBirchSpeech_WaitForThisIsPokemonText); sBirchSpeechMainTaskId = taskId; } @@ -1356,7 +1356,7 @@ static void Task_NewGameBirchSpeech_MainSpeech(u8 taskId) { if (!RunTextPrintersAndIsPrinter0Active()) { - StringExpandPlaceholders(gStringVar4, gText_Birch_MainSpeech); + StringExpandPlaceholders(gStringVarBuffer, gText_Birch_MainSpeech); AddTextPrinterForMessage(TRUE); gTasks[taskId].func = Task_NewGameBirchSpeech_AndYouAre; } @@ -1411,7 +1411,7 @@ static void Task_NewGameBirchSpeech_AndYouAre(u8 taskId) if (!RunTextPrintersAndIsPrinter0Active()) { sStartedPokeBallTask = FALSE; - StringExpandPlaceholders(gStringVar4, gText_Birch_AndYouAre); + StringExpandPlaceholders(gStringVarBuffer, gText_Birch_AndYouAre); AddTextPrinterForMessage(TRUE); gTasks[taskId].func = Task_NewGameBirchSpeech_StartBirchLotadPlatformFade; } @@ -1483,7 +1483,7 @@ static void Task_NewGameBirchSpeech_WaitForPlayerFadeIn(u8 taskId) static void Task_NewGameBirchSpeech_BoyOrGirl(u8 taskId) { NewGameBirchSpeech_ClearWindow(0); - StringExpandPlaceholders(gStringVar4, gText_Birch_BoyOrGirl); + StringExpandPlaceholders(gStringVarBuffer, gText_Birch_BoyOrGirl); AddTextPrinterForMessage(TRUE); gTasks[taskId].func = Task_NewGameBirchSpeech_WaitToShowGenderMenu; } @@ -1573,7 +1573,7 @@ static void Task_NewGameBirchSpeech_SlideInNewGenderSprite(u8 taskId) static void Task_NewGameBirchSpeech_WhatsYourName(u8 taskId) { NewGameBirchSpeech_ClearWindow(0); - StringExpandPlaceholders(gStringVar4, gText_Birch_WhatsYourName); + StringExpandPlaceholders(gStringVarBuffer, gText_Birch_WhatsYourName); AddTextPrinterForMessage(TRUE); gTasks[taskId].func = Task_NewGameBirchSpeech_WaitForWhatsYourNameToPrint; } @@ -1608,7 +1608,7 @@ static void Task_NewGameBirchSpeech_StartNamingScreen(u8 taskId) static void Task_NewGameBirchSpeech_SoItsPlayerName(u8 taskId) { NewGameBirchSpeech_ClearWindow(0); - StringExpandPlaceholders(gStringVar4, gText_Birch_SoItsPlayer); + StringExpandPlaceholders(gStringVarBuffer, gText_Birch_SoItsPlayer); AddTextPrinterForMessage(TRUE); gTasks[taskId].func = Task_NewGameBirchSpeech_CreateNameYesNo; } @@ -1674,7 +1674,7 @@ static void Task_NewGameBirchSpeech_ReshowBirchLotad(u8 taskId) NewGameBirchSpeech_StartFadeInTarget1OutTarget2(taskId, 2); NewGameBirchSpeech_StartFadePlatformOut(taskId, 1); NewGameBirchSpeech_ClearWindow(0); - StringExpandPlaceholders(gStringVar4, gText_Birch_YourePlayer); + StringExpandPlaceholders(gStringVarBuffer, gText_Birch_YourePlayer); AddTextPrinterForMessage(TRUE); gTasks[taskId].func = Task_NewGameBirchSpeech_WaitForSpriteFadeInAndTextPrinter; } @@ -1722,7 +1722,7 @@ static void Task_NewGameBirchSpeech_AreYouReady(u8 taskId) gTasks[taskId].tPlayerSpriteId = spriteId; NewGameBirchSpeech_StartFadeInTarget1OutTarget2(taskId, 2); NewGameBirchSpeech_StartFadePlatformOut(taskId, 1); - StringExpandPlaceholders(gStringVar4, gText_Birch_AreYouReady); + StringExpandPlaceholders(gStringVarBuffer, gText_Birch_AreYouReady); AddTextPrinterForMessage(TRUE); gTasks[taskId].func = Task_NewGameBirchSpeech_ShrinkPlayer; } @@ -2137,8 +2137,8 @@ static void MainMenu_FormatSavegameText(void) static void MainMenu_FormatSavegamePlayer(void) { - StringExpandPlaceholders(gStringVar4, gText_ContinueMenuPlayer); - AddTextPrinterParameterized3(2, FONT_NORMAL, 0, 17, sTextColor_MenuInfo, TEXT_SKIP_DRAW, gStringVar4); + StringExpandPlaceholders(gStringVarBuffer, gText_ContinueMenuPlayer); + AddTextPrinterParameterized3(2, FONT_NORMAL, 0, 17, sTextColor_MenuInfo, TEXT_SKIP_DRAW, gStringVarBuffer); AddTextPrinterParameterized3(2, FONT_NORMAL, GetStringRightAlignXOffset(FONT_NORMAL, gSaveBlock2Ptr->playerName, 100), 17, sTextColor_MenuInfo, TEXT_SKIP_DRAW, gSaveBlock2Ptr->playerName); } @@ -2147,8 +2147,8 @@ static void MainMenu_FormatSavegameTime(void) u8 str[0x20]; u8 *ptr; - StringExpandPlaceholders(gStringVar4, gText_ContinueMenuTime); - AddTextPrinterParameterized3(2, FONT_NORMAL, 0x6C, 17, sTextColor_MenuInfo, TEXT_SKIP_DRAW, gStringVar4); + StringExpandPlaceholders(gStringVarBuffer, gText_ContinueMenuTime); + AddTextPrinterParameterized3(2, FONT_NORMAL, 0x6C, 17, sTextColor_MenuInfo, TEXT_SKIP_DRAW, gStringVarBuffer); ptr = ConvertIntToDecimalStringN(str, gSaveBlock2Ptr->playTimeHours, STR_CONV_MODE_LEFT_ALIGN, 3); *ptr = 0xF0; ConvertIntToDecimalStringN(ptr + 1, gSaveBlock2Ptr->playTimeMinutes, STR_CONV_MODE_LEADING_ZEROS, 2); @@ -2166,8 +2166,8 @@ static void MainMenu_FormatSavegamePokedex(void) dexCount = GetNationalPokedexCount(FLAG_GET_CAUGHT); else dexCount = GetHoennPokedexCount(FLAG_GET_CAUGHT); - StringExpandPlaceholders(gStringVar4, gText_ContinueMenuPokedex); - AddTextPrinterParameterized3(2, FONT_NORMAL, 0, 33, sTextColor_MenuInfo, TEXT_SKIP_DRAW, gStringVar4); + StringExpandPlaceholders(gStringVarBuffer, gText_ContinueMenuPokedex); + AddTextPrinterParameterized3(2, FONT_NORMAL, 0, 33, sTextColor_MenuInfo, TEXT_SKIP_DRAW, gStringVarBuffer); ConvertIntToDecimalStringN(str, dexCount, STR_CONV_MODE_LEFT_ALIGN, 3); AddTextPrinterParameterized3(2, FONT_NORMAL, GetStringRightAlignXOffset(FONT_NORMAL, str, 100), 33, sTextColor_MenuInfo, TEXT_SKIP_DRAW, str); } @@ -2184,8 +2184,8 @@ static void MainMenu_FormatSavegameBadges(void) if (FlagGet(i)) badgeCount++; } - StringExpandPlaceholders(gStringVar4, gText_ContinueMenuBadges); - AddTextPrinterParameterized3(2, FONT_NORMAL, 0x6C, 33, sTextColor_MenuInfo, TEXT_SKIP_DRAW, gStringVar4); + StringExpandPlaceholders(gStringVarBuffer, gText_ContinueMenuBadges); + AddTextPrinterParameterized3(2, FONT_NORMAL, 0x6C, 33, sTextColor_MenuInfo, TEXT_SKIP_DRAW, gStringVarBuffer); ConvertIntToDecimalStringN(str, badgeCount, STR_CONV_MODE_LEADING_ZEROS, 1); AddTextPrinterParameterized3(2, FONT_NORMAL, GetStringRightAlignXOffset(FONT_NORMAL, str, 0xD0), 33, sTextColor_MenuInfo, TEXT_SKIP_DRAW, str); } diff --git a/src/match_call.c b/src/match_call.c index 2c1ad924a58..d051889a46a 100644 --- a/src/match_call.c +++ b/src/match_call.c @@ -1322,8 +1322,8 @@ static bool32 MatchCall_PrintIntro(u8 taskId) // Ready the message if (!sMatchCallState.triggeredFromScript) - SelectMatchCallMessage(sMatchCallState.trainerId, gStringVar4); - InitMatchCallTextPrinter(tWindowId, gStringVar4); + SelectMatchCallMessage(sMatchCallState.trainerId, gStringVarBuffer); + InitMatchCallTextPrinter(tWindowId, gStringVarBuffer); return TRUE; } @@ -2067,7 +2067,7 @@ void BufferPokedexRatingForMatchCall(u8 *destStr) u8 *str; u8 dexRatingLevel; - u8 *buffer = Alloc(sizeof(gStringVar4)); + u8 *buffer = Alloc(sizeof(gStringVarBuffer)); if (!buffer) { destStr[0] = EOS; diff --git a/src/mauville_old_man.c b/src/mauville_old_man.c index db25df253ba..2f23dbc8439 100644 --- a/src/mauville_old_man.c +++ b/src/mauville_old_man.c @@ -169,7 +169,7 @@ void SaveBardSongLyrics(void) bard->hasChangedSong = TRUE; } -// Copies lyrics into gStringVar4. +// Copies lyrics into gStringVarBuffer. // gSpecialVar_0x8004 is used in these functions to indicate which song should be played. // If it's set to 0 the Bard's current song should be played, otherwise the new user-provided song should be played. // Its set in the scripts right before 'PlayBardSong' is called. @@ -177,7 +177,7 @@ static void PrepareSongText(void) { struct MauvilleManBard *bard = &gSaveBlock1Ptr->oldMan.bard; u16 * lyrics = !gSpecialVar_0x8004 ? bard->songLyrics : bard->newSongLyrics; - u8 * wordEnd = gStringVar4; + u8 * wordEnd = gStringVarBuffer; u8 * str = wordEnd; u16 paragraphNum; @@ -295,14 +295,14 @@ void GenerateGiddyLine(void) u32 adjective = Random(); adjective %= ARRAY_COUNT(sGiddyAdjectives); - stringPtr = CopyEasyChatWord(gStringVar4, giddy->randomWords[giddy->taleCounter]); + stringPtr = CopyEasyChatWord(gStringVarBuffer, giddy->randomWords[giddy->taleCounter]); stringPtr = StringCopy(stringPtr, GiddyText_Is); stringPtr = StringCopy(stringPtr, sGiddyAdjectives[adjective]); StringCopy(stringPtr, GiddyText_DontYouAgree); } else { - StringCopy(gStringVar4, sGiddyQuestions[giddy->questionList[giddy->questionNum++]]); + StringCopy(gStringVarBuffer, sGiddyQuestions[giddy->questionList[giddy->questionNum++]]); } // 10% chance for Giddy to stop telling tales. @@ -611,7 +611,7 @@ static void Task_BardSong(u8 taskId) { case BARD_STATE_INIT: PrepareSongText(); - DrawSongTextWindow(gStringVar4); + DrawSongTextWindow(gStringVarBuffer); task->tWordState = 0; task->tDelay = 0; task->tCharIndex = 0; @@ -626,7 +626,7 @@ static void Task_BardSong(u8 taskId) case BARD_STATE_GET_WORD: { struct MauvilleManBard *bard = &gSaveBlock1Ptr->oldMan.bard; - u8 *str = &gStringVar4[task->tCharIndex]; + u8 *str = &gStringVarBuffer[task->tCharIndex]; u16 wordLen = 0; // Read letters until delimiter @@ -671,7 +671,7 @@ static void Task_BardSong(u8 taskId) task->tDelay--; break; case BARD_STATE_HANDLE_WORD: - if (gStringVar4[task->tCharIndex] == EOS) + if (gStringVarBuffer[task->tCharIndex] == EOS) { // End song FadeInBGM(6); @@ -679,7 +679,7 @@ static void Task_BardSong(u8 taskId) ScriptContext_Enable(); DestroyTask(taskId); } - else if (gStringVar4[task->tCharIndex] == CHAR_SPACE) + else if (gStringVarBuffer[task->tCharIndex] == CHAR_SPACE) { // End of easy chat word, move on to the next one. EnableTextPrinters(); @@ -687,14 +687,14 @@ static void Task_BardSong(u8 taskId) task->tState = BARD_STATE_GET_WORD; task->tDelay = 0; } - else if (gStringVar4[task->tCharIndex] == CHAR_NEWLINE) + else if (gStringVarBuffer[task->tCharIndex] == CHAR_NEWLINE) { // Handle newline task->tCharIndex++; task->tState = BARD_STATE_GET_WORD; task->tDelay = 0; } - else if (gStringVar4[task->tCharIndex] == EXT_CTRL_CODE_BEGIN) + else if (gStringVarBuffer[task->tCharIndex] == EXT_CTRL_CODE_BEGIN) { // Handle ctrl code // The only expected ctrl codes are those for clearing the end of the paragraph, @@ -703,10 +703,10 @@ static void Task_BardSong(u8 taskId) task->tState = BARD_STATE_GET_WORD; task->tDelay = 8; } - else if (gStringVar4[task->tCharIndex] == CHAR_BARD_WORD_DELIMIT) + else if (gStringVarBuffer[task->tCharIndex] == CHAR_BARD_WORD_DELIMIT) { // Space within the current easy chat word (see PrepareSongText), just replace it with a real space. - gStringVar4[task->tCharIndex] = CHAR_SPACE; + gStringVarBuffer[task->tCharIndex] = CHAR_SPACE; EnableTextPrinters(); task->tCharIndex++; task->tDelay = 0; diff --git a/src/menu.c b/src/menu.c index dd43e310dc8..5ec464f8ab9 100644 --- a/src/menu.c +++ b/src/menu.c @@ -192,19 +192,19 @@ void AddTextPrinterForMessage(bool8 allowSkippingDelayWithButtonPress) { void (*callback)(struct TextPrinterTemplate *, u16) = NULL; gTextFlags.canABSpeedUpPrint = allowSkippingDelayWithButtonPress; - AddTextPrinterParameterized2(0, FONT_NORMAL, gStringVar4, GetPlayerTextSpeedDelay(), callback, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); + AddTextPrinterParameterized2(0, FONT_NORMAL, gStringVarBuffer, GetPlayerTextSpeedDelay(), callback, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); } void AddTextPrinterForMessage_2(bool8 allowSkippingDelayWithButtonPress) { gTextFlags.canABSpeedUpPrint = allowSkippingDelayWithButtonPress; - AddTextPrinterParameterized2(0, FONT_NORMAL, gStringVar4, GetPlayerTextSpeedDelay(), NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); + AddTextPrinterParameterized2(0, FONT_NORMAL, gStringVarBuffer, GetPlayerTextSpeedDelay(), NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); } void AddTextPrinterWithCustomSpeedForMessage(bool8 allowSkippingDelayWithButtonPress, u8 speed) { gTextFlags.canABSpeedUpPrint = allowSkippingDelayWithButtonPress; - AddTextPrinterParameterized2(0, FONT_NORMAL, gStringVar4, speed, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); + AddTextPrinterParameterized2(0, FONT_NORMAL, gStringVarBuffer, speed, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); } void LoadMessageBoxAndBorderGfx(void) @@ -542,7 +542,7 @@ void RemoveMapNamePopUpWindow(void) void AddTextPrinterWithCallbackForMessage(bool8 canSpeedUp, void (*callback)(struct TextPrinterTemplate *, u16)) { gTextFlags.canABSpeedUpPrint = canSpeedUp; - AddTextPrinterParameterized2(0, FONT_NORMAL, gStringVar4, GetPlayerTextSpeedDelay(), callback, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); + AddTextPrinterParameterized2(0, FONT_NORMAL, gStringVarBuffer, GetPlayerTextSpeedDelay(), callback, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); } void EraseFieldMessageBox(bool8 copyToVram) @@ -1984,9 +1984,9 @@ void PrintPlayerNameOnWindow(u8 windowId, const u8 *src, u16 x, u16 y) while (gSaveBlock2Ptr->playerName[count] != EOS) count++; - StringExpandPlaceholders(gStringVar4, src); + StringExpandPlaceholders(gStringVarBuffer, src); - AddTextPrinterParameterized(windowId, 1, gStringVar4, x, y, TEXT_SKIP_DRAW, 0); + AddTextPrinterParameterized(windowId, 1, gStringVarBuffer, x, y, TEXT_SKIP_DRAW, 0); } static void UNUSED UnusedBlitBitmapRect(const struct Bitmap *src, struct Bitmap *dst, u16 srcX, u16 srcY, u16 dstX, u16 dstY, u16 width, u16 height) diff --git a/src/menu_helpers.c b/src/menu_helpers.c index d810508ae40..a3b08eafb13 100644 --- a/src/menu_helpers.c +++ b/src/menu_helpers.c @@ -126,11 +126,11 @@ void DisplayMessageAndContinueTask(u8 taskId, u8 windowId, u16 tileNum, u8 palet sMessageWindowId = windowId; DrawDialogFrameWithCustomTileAndPalette(windowId, TRUE, tileNum, paletteNum); - if (string != gStringVar4) - StringExpandPlaceholders(gStringVar4, string); + if (string != gStringVarBuffer) + StringExpandPlaceholders(gStringVarBuffer, string); gTextFlags.canABSpeedUpPrint = 1; - AddTextPrinterParameterized2(windowId, fontId, gStringVar4, textSpeed, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); + AddTextPrinterParameterized2(windowId, fontId, gStringVarBuffer, textSpeed, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); sMessageNextTask = taskFunc; gTasks[taskId].func = Task_ContinueTaskAfterMessagePrints; } diff --git a/src/money.c b/src/money.c index 88e1fea6400..1f0dd8b1074 100644 --- a/src/money.c +++ b/src/money.c @@ -143,13 +143,13 @@ void PrintMoneyAmount(u8 windowId, u8 x, u8 y, int amount, u8 speed) ConvertIntToDecimalStringN(gStringVar1, amount, STR_CONV_MODE_LEFT_ALIGN, 6); strLength = 6 - StringLength(gStringVar1); - txtPtr = gStringVar4; + txtPtr = gStringVarBuffer; while (strLength-- > 0) *(txtPtr++) = CHAR_SPACER; StringExpandPlaceholders(txtPtr, gText_PokedollarVar1); - AddTextPrinterParameterized(windowId, FONT_NORMAL, gStringVar4, x, y, speed, NULL); + AddTextPrinterParameterized(windowId, FONT_NORMAL, gStringVarBuffer, x, y, speed, NULL); } void PrintMoneyAmountInMoneyBoxWithBorder(u8 windowId, u16 tileStart, u8 pallete, int amount) diff --git a/src/move_relearner.c b/src/move_relearner.c index 975663e4d3d..24d2c192cd8 100644 --- a/src/move_relearner.c +++ b/src/move_relearner.c @@ -467,8 +467,8 @@ static void CB2_MoveRelearnerMain(void) static void PrintMessageWithPlaceholders(const u8 *src) { - StringExpandPlaceholders(gStringVar4, src); - MoveRelearnerPrintMessage(gStringVar4); + StringExpandPlaceholders(gStringVarBuffer, src); + MoveRelearnerPrintMessage(gStringVarBuffer); } // See the state machine doc at the top of the file. @@ -769,9 +769,9 @@ static void HideHeartSpritesAndShowTeachMoveText(bool8 onlyHideSprites) if (!onlyHideSprites) { - StringExpandPlaceholders(gStringVar4, gText_TeachWhichMoveToPkmn); + StringExpandPlaceholders(gStringVarBuffer, gText_TeachWhichMoveToPkmn); FillWindowPixelBuffer(RELEARNERWIN_MSG, 0x11); - AddTextPrinterParameterized(RELEARNERWIN_MSG, FONT_NORMAL, gStringVar4, 0, 1, 0, NULL); + AddTextPrinterParameterized(RELEARNERWIN_MSG, FONT_NORMAL, gStringVarBuffer, 0, 1, 0, NULL); } } @@ -808,16 +808,16 @@ static void HandleInput(bool8 showContest) PlaySE(SE_SELECT); RemoveScrollArrows(); sMoveRelearnerStruct->state = MENU_STATE_PRINT_GIVE_UP_PROMPT; - StringExpandPlaceholders(gStringVar4, gText_MoveRelearnerGiveUp); - MoveRelearnerPrintMessage(gStringVar4); + StringExpandPlaceholders(gStringVarBuffer, gText_MoveRelearnerGiveUp); + MoveRelearnerPrintMessage(gStringVarBuffer); break; default: PlaySE(SE_SELECT); RemoveScrollArrows(); sMoveRelearnerStruct->state = MENU_STATE_PRINT_TEACH_MOVE_PROMPT; StringCopy(gStringVar2, gMoveNames[itemId]); - StringExpandPlaceholders(gStringVar4, gText_MoveRelearnerTeachMoveConfirm); - MoveRelearnerPrintMessage(gStringVar4); + StringExpandPlaceholders(gStringVarBuffer, gText_MoveRelearnerTeachMoveConfirm); + MoveRelearnerPrintMessage(gStringVarBuffer); break; } } @@ -837,9 +837,9 @@ static void ShowTeachMoveText(bool8 shouldDoNothingInstead) { if (shouldDoNothingInstead == FALSE) { - StringExpandPlaceholders(gStringVar4, gText_TeachWhichMoveToPkmn); + StringExpandPlaceholders(gStringVarBuffer, gText_TeachWhichMoveToPkmn); FillWindowPixelBuffer(RELEARNERWIN_MSG, 0x11); - AddTextPrinterParameterized(RELEARNERWIN_MSG, FONT_NORMAL, gStringVar4, 0, 1, 0, NULL); + AddTextPrinterParameterized(RELEARNERWIN_MSG, FONT_NORMAL, gStringVarBuffer, 0, 1, 0, NULL); } } diff --git a/src/mystery_event_menu.c b/src/mystery_event_menu.c index 79cab2b050a..e76e4a960ab 100644 --- a/src/mystery_event_menu.c +++ b/src/mystery_event_menu.c @@ -198,8 +198,8 @@ static void CB2_MysteryEventMenu(void) } else { - GetEventLoadMessage(gStringVar4, MEVENT_STATUS_LOAD_ERROR); - PrintMysteryMenuText(WIN_MSG, gStringVar4, 1, 2, 1); + GetEventLoadMessage(gStringVarBuffer, MEVENT_STATUS_LOAD_ERROR); + PrintMysteryMenuText(WIN_MSG, gStringVarBuffer, 1, 2, 1); gMain.state = 13; } break; @@ -211,8 +211,8 @@ static void CB2_MysteryEventMenu(void) if (GetLinkPlayerDataExchangeStatusTimed(2, 2) == EXCHANGE_DIFF_SELECTIONS) { SetCloseLinkCallback(); - GetEventLoadMessage(gStringVar4, MEVENT_STATUS_LOAD_ERROR); - PrintMysteryMenuText(WIN_MSG, gStringVar4, 1, 2, 1); + GetEventLoadMessage(gStringVarBuffer, MEVENT_STATUS_LOAD_ERROR); + PrintMysteryMenuText(WIN_MSG, gStringVarBuffer, 1, 2, 1); gMain.state = 13; } else if (CheckLanguageMatch()) @@ -223,8 +223,8 @@ static void CB2_MysteryEventMenu(void) else { CloseLink(); - GetEventLoadMessage(gStringVar4, MEVENT_STATUS_LOAD_ERROR); - PrintMysteryMenuText(WIN_MSG, gStringVar4, 1, 2, 1); + GetEventLoadMessage(gStringVarBuffer, MEVENT_STATUS_LOAD_ERROR); + PrintMysteryMenuText(WIN_MSG, gStringVarBuffer, 1, 2, 1); gMain.state = 13; } } @@ -259,13 +259,13 @@ static void CB2_MysteryEventMenu(void) { u16 status = RunMysteryEventScript(gDecompressionBuffer); CpuFill32(0, gDecompressionBuffer, 0x7D4); - if (!GetEventLoadMessage(gStringVar4, status)) + if (!GetEventLoadMessage(gStringVarBuffer, status)) TrySavingData(SAVE_NORMAL); gMain.state++; } break; case 12: - PrintMysteryMenuText(WIN_MSG, gStringVar4, 1, 2, 1); + PrintMysteryMenuText(WIN_MSG, gStringVarBuffer, 1, 2, 1); gMain.state++; break; case 13: @@ -295,8 +295,8 @@ static void CB2_MysteryEventMenu(void) if (gLinkStatus & LINK_STAT_CONN_ESTABLISHED && !IsLinkMaster()) { CloseLink(); - GetEventLoadMessage(gStringVar4, MEVENT_STATUS_LOAD_ERROR); - PrintMysteryMenuText(WIN_MSG, gStringVar4, 1, 2, 1); + GetEventLoadMessage(gStringVarBuffer, MEVENT_STATUS_LOAD_ERROR); + PrintMysteryMenuText(WIN_MSG, gStringVarBuffer, 1, 2, 1); gMain.state = 13; } diff --git a/src/mystery_event_script.c b/src/mystery_event_script.c index b146bbab398..8a807f83ebd 100644 --- a/src/mystery_event_script.c +++ b/src/mystery_event_script.c @@ -51,7 +51,7 @@ static bool32 CheckCompatibility(u16 unk0, u32 unk1, u16 unk2, u32 version) static void SetIncompatible(void) { - StringExpandPlaceholders(gStringVar4, gText_MysteryEventCantBeUsed); + StringExpandPlaceholders(gStringVarBuffer, gText_MysteryEventCantBeUsed); SetMysteryEventScriptStatus(MEVENT_STATUS_FAILURE); } @@ -213,7 +213,7 @@ bool8 MEScrCmd_setmsg(struct ScriptContext *ctx) u8 status = ScriptReadByte(ctx); u8 *str = (u8 *)(ScriptReadWord(ctx) - ctx->mOffset + ctx->mScriptBase); if (status == MEVENT_STATUS_FF || status == ctx->mStatus) - StringExpandPlaceholders(gStringVar4, str); + StringExpandPlaceholders(gStringVarBuffer, str); return FALSE; } @@ -236,17 +236,17 @@ bool8 MEScrCmd_setenigmaberry(struct ScriptContext *ctx) if (!haveBerry) { - str = gStringVar4; + str = gStringVarBuffer; message = gText_MysteryEventBerry; } else if (StringCompare(gStringVar1, gStringVar2)) { - str = gStringVar4; + str = gStringVarBuffer; message = gText_MysteryEventBerryTransform; } else { - str = gStringVar4; + str = gStringVarBuffer; message = gText_MysteryEventBerryObtained; } @@ -267,7 +267,7 @@ bool8 MEScrCmd_giveribbon(struct ScriptContext *ctx) u8 index = ScriptReadByte(ctx); u8 ribbonId = ScriptReadByte(ctx); GiveGiftRibbonToParty(index, ribbonId); - StringExpandPlaceholders(gStringVar4, gText_MysteryEventSpecialRibbon); + StringExpandPlaceholders(gStringVarBuffer, gText_MysteryEventSpecialRibbon); ctx->mStatus = MEVENT_STATUS_SUCCESS; return FALSE; } @@ -286,7 +286,7 @@ bool8 MEScrCmd_initramscript(struct ScriptContext *ctx) bool8 MEScrCmd_givenationaldex(struct ScriptContext *ctx) { EnableNationalPokedex(); - StringExpandPlaceholders(gStringVar4, gText_MysteryEventNationalDex); + StringExpandPlaceholders(gStringVarBuffer, gText_MysteryEventNationalDex); ctx->mStatus = MEVENT_STATUS_SUCCESS; return FALSE; } @@ -294,7 +294,7 @@ bool8 MEScrCmd_givenationaldex(struct ScriptContext *ctx) bool8 MEScrCmd_addrareword(struct ScriptContext *ctx) { UnlockTrendySaying(ScriptReadByte(ctx)); - StringExpandPlaceholders(gStringVar4, gText_MysteryEventRareWord); + StringExpandPlaceholders(gStringVarBuffer, gText_MysteryEventRareWord); ctx->mStatus = MEVENT_STATUS_SUCCESS; return FALSE; } @@ -328,7 +328,7 @@ bool8 MEScrCmd_givepokemon(struct ScriptContext *ctx) if (gPlayerPartyCount == PARTY_SIZE) { - StringExpandPlaceholders(gStringVar4, gText_MysteryEventFullParty); + StringExpandPlaceholders(gStringVarBuffer, gText_MysteryEventFullParty); ctx->mStatus = MEVENT_STATUS_FAILURE; } else @@ -348,7 +348,7 @@ bool8 MEScrCmd_givepokemon(struct ScriptContext *ctx) GiveMailToMon(&gPlayerParty[PARTY_SIZE - 1], &mail); CompactPartySlots(); CalculatePlayerPartyCount(); - StringExpandPlaceholders(gStringVar4, gText_MysteryEventSentOver); + StringExpandPlaceholders(gStringVarBuffer, gText_MysteryEventSentOver); ctx->mStatus = MEVENT_STATUS_SUCCESS; } @@ -360,7 +360,7 @@ bool8 MEScrCmd_addtrainer(struct ScriptContext *ctx) u32 data = ScriptReadWord(ctx) - ctx->mOffset + ctx->mScriptBase; memcpy(&gSaveBlock2Ptr->frontier.ereaderTrainer, (void *)data, sizeof(gSaveBlock2Ptr->frontier.ereaderTrainer)); ValidateEReaderTrainer(); - StringExpandPlaceholders(gStringVar4, gText_MysteryEventNewTrainer); + StringExpandPlaceholders(gStringVarBuffer, gText_MysteryEventNewTrainer); ctx->mStatus = MEVENT_STATUS_SUCCESS; return FALSE; } @@ -368,7 +368,7 @@ bool8 MEScrCmd_addtrainer(struct ScriptContext *ctx) bool8 MEScrCmd_enableresetrtc(struct ScriptContext *ctx) { EnableResetRTC(); - StringExpandPlaceholders(gStringVar4, gText_InGameClockUsable); + StringExpandPlaceholders(gStringVarBuffer, gText_InGameClockUsable); ctx->mStatus = MEVENT_STATUS_SUCCESS; return FALSE; } diff --git a/src/mystery_gift_menu.c b/src/mystery_gift_menu.c index 78e4a457152..ecfc3e0ec24 100644 --- a/src/mystery_gift_menu.c +++ b/src/mystery_gift_menu.c @@ -544,9 +544,9 @@ static void ClearScreenInBg0(bool32 ignoreTopTwoRows) void MG_AddMessageTextPrinter(const u8 *str) { - StringExpandPlaceholders(gStringVar4, str); + StringExpandPlaceholders(gStringVarBuffer, str); FillWindowPixelBuffer(WIN_MSG, 0x11); - AddTextPrinterParameterized4(WIN_MSG, FONT_NORMAL, 0, 1, 0, 0, sMG_Ereader_TextColor_2, 0, gStringVar4); + AddTextPrinterParameterized4(WIN_MSG, FONT_NORMAL, 0, 1, 0, 0, sMG_Ereader_TextColor_2, 0, gStringVarBuffer); DrawTextBorderOuter(WIN_MSG, 0x001, 0xF); PutWindowTilemap(WIN_MSG); CopyWindowToVram(WIN_MSG, COPYWIN_FULL); @@ -671,13 +671,13 @@ s8 DoMysteryGiftYesNo(u8 * textState, u16 * windowId, bool8 yesNoBoxPlacement, c { case 0: // Print question message - StringExpandPlaceholders(gStringVar4, str); + StringExpandPlaceholders(gStringVarBuffer, str); if (yesNoBoxPlacement == 0) *windowId = AddWindow(&sWindowTemplate_YesNoMsg_Wide); else *windowId = AddWindow(&sWindowTemplate_YesNoMsg); FillWindowPixelBuffer(*windowId, 0x11); - AddTextPrinterParameterized4(*windowId, FONT_NORMAL, 0, 1, 0, 0, sMG_Ereader_TextColor_2, 0, gStringVar4); + AddTextPrinterParameterized4(*windowId, FONT_NORMAL, 0, 1, 0, 0, sMG_Ereader_TextColor_2, 0, gStringVarBuffer); DrawTextBorderOuter(*windowId, 0x001, 0x0F); CopyWindowToVram(*windowId, COPYWIN_GFX); PutWindowTilemap(*windowId); @@ -729,12 +729,12 @@ static s32 HandleGiftSelectMenu(u8 * textState, u16 * windowId, bool32 cannotTos case 0: // Print menu message if (!cannotToss) - StringExpandPlaceholders(gStringVar4, gText_WhatToDoWithCards); + StringExpandPlaceholders(gStringVarBuffer, gText_WhatToDoWithCards); else - StringExpandPlaceholders(gStringVar4, gText_WhatToDoWithNews); + StringExpandPlaceholders(gStringVarBuffer, gText_WhatToDoWithNews); *windowId = AddWindow(&sWindowTemplate_GiftSelect); FillWindowPixelBuffer(*windowId, 0x11); - AddTextPrinterParameterized4(*windowId, FONT_NORMAL, 0, 1, 0, 0, sMG_Ereader_TextColor_2, 0, gStringVar4); + AddTextPrinterParameterized4(*windowId, FONT_NORMAL, 0, 1, 0, 0, sMG_Ereader_TextColor_2, 0, gStringVarBuffer); DrawTextBorderOuter(*windowId, 0x001, 0x0F); CopyWindowToVram(*windowId, COPYWIN_GFX); PutWindowTilemap(*windowId); diff --git a/src/naming_screen.c b/src/naming_screen.c index d8ae7ccd4d9..4025128687c 100644 --- a/src/naming_screen.c +++ b/src/naming_screen.c @@ -727,10 +727,10 @@ static void DisplaySentToPCMessage(void) if (FlagGet(FLAG_SYS_PC_LANETTE)) stringToDisplay++; - StringExpandPlaceholders(gStringVar4, sTransferredToPCMessages[stringToDisplay]); + StringExpandPlaceholders(gStringVarBuffer, sTransferredToPCMessages[stringToDisplay]); DrawDialogueFrame(0, FALSE); gTextFlags.canABSpeedUpPrint = TRUE; - AddTextPrinterParameterized2(0, FONT_NORMAL, gStringVar4, GetPlayerTextSpeedDelay(), 0, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); + AddTextPrinterParameterized2(0, FONT_NORMAL, gStringVarBuffer, GetPlayerTextSpeedDelay(), 0, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); CopyWindowToVram(0, COPYWIN_FULL); } diff --git a/src/party_menu.c b/src/party_menu.c index cbd469713a9..f7fe8d7b79e 100755 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -1418,8 +1418,8 @@ static bool8 DisplayCancelChooseMonYesNo(u8 taskId) return FALSE; PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[1]); - StringExpandPlaceholders(gStringVar4, stringPtr); - DisplayPartyMenuMessage(gStringVar4, TRUE); + StringExpandPlaceholders(gStringVarBuffer, stringPtr); + DisplayPartyMenuMessage(gStringVarBuffer, TRUE); gTasks[taskId].func = Task_CancelChooseMonYesNo; return TRUE; } @@ -1764,8 +1764,8 @@ static void DisplayGaveHeldItemMessage(struct Pokemon *mon, u16 item, bool8 keep { GetMonNickname(mon, gStringVar1); CopyItemName(item, gStringVar2); - StringExpandPlaceholders(gStringVar4, gText_PkmnWasGivenItem); - DisplayPartyMenuMessage(gStringVar4, keepOpen); + StringExpandPlaceholders(gStringVarBuffer, gText_PkmnWasGivenItem); + DisplayPartyMenuMessage(gStringVarBuffer, keepOpen); ScheduleBgCopyTilemapToVram(2); } @@ -1773,8 +1773,8 @@ static void DisplayTookHeldItemMessage(struct Pokemon *mon, u16 item, bool8 keep { GetMonNickname(mon, gStringVar1); CopyItemName(item, gStringVar2); - StringExpandPlaceholders(gStringVar4, gText_ReceivedItemFromPkmn); - DisplayPartyMenuMessage(gStringVar4, keepOpen); + StringExpandPlaceholders(gStringVarBuffer, gText_ReceivedItemFromPkmn); + DisplayPartyMenuMessage(gStringVarBuffer, keepOpen); ScheduleBgCopyTilemapToVram(2); } @@ -1782,8 +1782,8 @@ static void DisplayAlreadyHoldingItemSwitchMessage(struct Pokemon *mon, u16 item { GetMonNickname(mon, gStringVar1); CopyItemName(item, gStringVar2); - StringExpandPlaceholders(gStringVar4, gText_PkmnAlreadyHoldingItemSwitch); - DisplayPartyMenuMessage(gStringVar4, keepOpen); + StringExpandPlaceholders(gStringVarBuffer, gText_PkmnAlreadyHoldingItemSwitch); + DisplayPartyMenuMessage(gStringVarBuffer, keepOpen); ScheduleBgCopyTilemapToVram(2); } @@ -1791,8 +1791,8 @@ static void DisplaySwitchedHeldItemMessage(u16 item, u16 item2, bool8 keepOpen) { CopyItemName(item, gStringVar1); CopyItemName(item2, gStringVar2); - StringExpandPlaceholders(gStringVar4, gText_SwitchedPkmnItem); - DisplayPartyMenuMessage(gStringVar4, keepOpen); + StringExpandPlaceholders(gStringVarBuffer, gText_SwitchedPkmnItem); + DisplayPartyMenuMessage(gStringVarBuffer, keepOpen); ScheduleBgCopyTilemapToVram(2); } @@ -1826,7 +1826,7 @@ static u8 TryTakeMonItem(struct Pokemon *mon) static void BufferBagFullCantTakeItemMessage(u16 itemUnused) { - StringExpandPlaceholders(gStringVar4, gText_BagFullCouldNotRemoveItem); + StringExpandPlaceholders(gStringVarBuffer, gText_BagFullCouldNotRemoveItem); } #define tHP data[0] @@ -2496,8 +2496,8 @@ void DisplayPartyMenuStdMessage(u32 stringId) stringId = PARTY_MSG_CHOOSE_MON_OR_CANCEL; } DrawStdFrameWithCustomTileAndPalette(*windowPtr, FALSE, 0x4F, 13); - StringExpandPlaceholders(gStringVar4, sActionStringTable[stringId]); - AddTextPrinterParameterized(*windowPtr, FONT_NORMAL, gStringVar4, 0, 1, 0, 0); + StringExpandPlaceholders(gStringVarBuffer, sActionStringTable[stringId]); + AddTextPrinterParameterized(*windowPtr, FONT_NORMAL, gStringVarBuffer, 0, 1, 0, 0); ScheduleBgCopyTilemapToVram(2); } } @@ -2718,8 +2718,8 @@ static bool8 CreateSelectionWindow(u8 taskId) } else { - StringExpandPlaceholders(gStringVar4, gText_PkmnNotHolding); - DisplayPartyMenuMessage(gStringVar4, TRUE); + StringExpandPlaceholders(gStringVarBuffer, gText_PkmnNotHolding); + DisplayPartyMenuMessage(gStringVarBuffer, TRUE); ScheduleBgCopyTilemapToVram(2); gTasks[taskId].func = Task_UpdateHeldItemSprite; return FALSE; @@ -3172,7 +3172,7 @@ static void Task_HandleSwitchItemsYesNoInput(u8 taskId) { AddBagItem(gSpecialVar_ItemId, 1); BufferBagFullCantTakeItemMessage(sPartyMenuItemId); - DisplayPartyMenuMessage(gStringVar4, FALSE); + DisplayPartyMenuMessage(gStringVarBuffer, FALSE); gTasks[taskId].func = Task_ReturnToChooseMonAfterText; } // Giving mail @@ -3282,12 +3282,12 @@ static void CursorCb_TakeItem(u8 taskId) { case 0: // Not holding item GetMonNickname(mon, gStringVar1); - StringExpandPlaceholders(gStringVar4, gText_PkmnNotHolding); - DisplayPartyMenuMessage(gStringVar4, TRUE); + StringExpandPlaceholders(gStringVarBuffer, gText_PkmnNotHolding); + DisplayPartyMenuMessage(gStringVarBuffer, TRUE); break; case 1: // No room to take item BufferBagFullCantTakeItemMessage(item); - DisplayPartyMenuMessage(gStringVar4, TRUE); + DisplayPartyMenuMessage(gStringVarBuffer, TRUE); break; default: // Took item DisplayTookHeldItemMessage(mon, item, TRUE); @@ -3308,15 +3308,15 @@ static void CursorCb_Toss(u8 taskId) if (item == ITEM_NONE) { GetMonNickname(mon, gStringVar1); - StringExpandPlaceholders(gStringVar4, gText_PkmnNotHolding); - DisplayPartyMenuMessage(gStringVar4, TRUE); + StringExpandPlaceholders(gStringVarBuffer, gText_PkmnNotHolding); + DisplayPartyMenuMessage(gStringVarBuffer, TRUE); gTasks[taskId].func = Task_UpdateHeldItemSprite; } else { CopyItemName(item, gStringVar1); - StringExpandPlaceholders(gStringVar4, gText_ThrowAwayItem); - DisplayPartyMenuMessage(gStringVar4, TRUE); + StringExpandPlaceholders(gStringVarBuffer, gText_ThrowAwayItem); + DisplayPartyMenuMessage(gStringVarBuffer, TRUE); gTasks[taskId].func = Task_TossHeldItemYesNo; } } @@ -3338,8 +3338,8 @@ static void Task_HandleTossHeldItemYesNoInput(u8 taskId) { case 0: CopyItemName(GetMonData(mon, MON_DATA_HELD_ITEM), gStringVar1); - StringExpandPlaceholders(gStringVar4, gText_ItemThrownAway); - DisplayPartyMenuMessage(gStringVar4, FALSE); + StringExpandPlaceholders(gStringVarBuffer, gText_ItemThrownAway); + DisplayPartyMenuMessage(gStringVarBuffer, FALSE); gTasks[taskId].func = Task_TossHeldItem; break; case MENU_B_PRESSED: @@ -3466,7 +3466,7 @@ static void Task_HandleLoseMailMessageYesNoInput(u8 taskId) else { BufferBagFullCantTakeItemMessage(item); - DisplayPartyMenuMessage(gStringVar4, FALSE); + DisplayPartyMenuMessage(gStringVarBuffer, FALSE); gTasks[taskId].func = Task_ReturnToChooseMonAfterText; } break; @@ -3512,9 +3512,9 @@ static void CursorCb_SendMon(u8 taskId) } else { - // gStringVar4 below is the error message buffered by TrySwitchInPokemon + // gStringVarBuffer below is the error message buffered by TrySwitchInPokemon PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[1]); - DisplayPartyMenuMessage(gStringVar4, TRUE); + DisplayPartyMenuMessage(gStringVarBuffer, TRUE); gTasks[taskId].func = Task_ReturnToChooseMonAfterText; } } @@ -3542,9 +3542,9 @@ static void CursorCb_Enter(u8 taskId) } } ConvertIntToDecimalStringN(gStringVar1, maxBattlers, STR_CONV_MODE_LEFT_ALIGN, 1); - StringExpandPlaceholders(gStringVar4, gText_NoMoreThanVar1Pkmn); + StringExpandPlaceholders(gStringVarBuffer, gText_NoMoreThanVar1Pkmn); PlaySE(SE_FAILURE); - DisplayPartyMenuMessage(gStringVar4, TRUE); + DisplayPartyMenuMessage(gStringVarBuffer, TRUE); gTasks[taskId].func = Task_ReturnToChooseMonAfterText; } @@ -3600,10 +3600,10 @@ static void CursorCb_Register(u8 taskId) switch (CanRegisterMonForTradingBoard(*(struct RfuGameCompatibilityData *)GetHostRfuGameData(), species2, species, isModernFatefulEncounter)) { case CANT_REGISTER_MON: - StringExpandPlaceholders(gStringVar4, gText_PkmnCantBeTradedNow); + StringExpandPlaceholders(gStringVarBuffer, gText_PkmnCantBeTradedNow); break; case CANT_REGISTER_EGG: - StringExpandPlaceholders(gStringVar4, gText_EggCantBeTradedNow); + StringExpandPlaceholders(gStringVarBuffer, gText_EggCantBeTradedNow); break; default: PlaySE(SE_SELECT); @@ -3613,8 +3613,8 @@ static void CursorCb_Register(u8 taskId) PlaySE(SE_FAILURE); PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[0]); PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[1]); - StringAppend(gStringVar4, gText_PauseUntilPress); - DisplayPartyMenuMessage(gStringVar4, TRUE); + StringAppend(gStringVarBuffer, gText_PauseUntilPress); + DisplayPartyMenuMessage(gStringVarBuffer, TRUE); gTasks[taskId].func = Task_ReturnToChooseMonAfterText; } @@ -3627,12 +3627,12 @@ static void CursorCb_Trade1(u8 taskId) if (stringId != UR_TRADE_MSG_NONE) { - StringExpandPlaceholders(gStringVar4, sUnionRoomTradeMessages[stringId - 1]); + StringExpandPlaceholders(gStringVarBuffer, sUnionRoomTradeMessages[stringId - 1]); PlaySE(SE_FAILURE); PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[0]); PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[1]); - StringAppend(gStringVar4, gText_PauseUntilPress); - DisplayPartyMenuMessage(gStringVar4, TRUE); + StringAppend(gStringVarBuffer, gText_PauseUntilPress); + DisplayPartyMenuMessage(gStringVarBuffer, TRUE); gTasks[taskId].func = Task_ReturnToChooseMonAfterText; } else @@ -3651,25 +3651,25 @@ static void CursorCb_Trade2(u8 taskId) switch (CanSpinTradeMon(gPlayerParty, gPartyMenu.slotId)) { case CANT_TRADE_LAST_MON: - StringExpandPlaceholders(gStringVar4, gText_OnlyPkmnForBattle); + StringExpandPlaceholders(gStringVarBuffer, gText_OnlyPkmnForBattle); break; case CANT_TRADE_NATIONAL: - StringExpandPlaceholders(gStringVar4, gText_PkmnCantBeTradedNow); + StringExpandPlaceholders(gStringVarBuffer, gText_PkmnCantBeTradedNow); break; case CANT_TRADE_EGG_YET: - StringExpandPlaceholders(gStringVar4, gText_EggCantBeTradedNow); + StringExpandPlaceholders(gStringVarBuffer, gText_EggCantBeTradedNow); break; default: // CAN_TRADE_MON PlaySE(SE_SELECT); GetMonNickname(&gPlayerParty[gPartyMenu.slotId], gStringVar1); - StringExpandPlaceholders(gStringVar4, gJPText_AreYouSureYouWantToSpinTradeMon); - DisplayPartyMenuMessage(gStringVar4, TRUE); + StringExpandPlaceholders(gStringVarBuffer, gJPText_AreYouSureYouWantToSpinTradeMon); + DisplayPartyMenuMessage(gStringVarBuffer, TRUE); gTasks[taskId].func = Task_SpinTradeYesNo; return; } PlaySE(SE_FAILURE); - StringAppend(gStringVar4, gText_PauseUntilPress); - DisplayPartyMenuMessage(gStringVar4, TRUE); + StringAppend(gStringVarBuffer, gText_PauseUntilPress); + DisplayPartyMenuMessage(gStringVarBuffer, TRUE); gTasks[taskId].func = Task_ReturnToChooseMonAfterText; } @@ -3738,14 +3738,14 @@ static void CursorCb_FieldMove(u8 taskId) case FIELD_MOVE_TELEPORT: mapHeader = Overworld_GetMapHeaderByGroupAndId(gSaveBlock1Ptr->lastHealLocation.mapGroup, gSaveBlock1Ptr->lastHealLocation.mapNum); GetMapNameGeneric(gStringVar1, mapHeader->regionMapSectionId); - StringExpandPlaceholders(gStringVar4, gText_ReturnToHealingSpot); + StringExpandPlaceholders(gStringVarBuffer, gText_ReturnToHealingSpot); DisplayFieldMoveExitAreaMessage(taskId); sPartyMenuInternal->data[0] = fieldMove; break; case FIELD_MOVE_DIG: mapHeader = Overworld_GetMapHeaderByGroupAndId(gSaveBlock1Ptr->escapeWarp.mapGroup, gSaveBlock1Ptr->escapeWarp.mapNum); GetMapNameGeneric(gStringVar1, mapHeader->regionMapSectionId); - StringExpandPlaceholders(gStringVar4, gText_EscapeFromHere); + StringExpandPlaceholders(gStringVarBuffer, gText_EscapeFromHere); DisplayFieldMoveExitAreaMessage(taskId); sPartyMenuInternal->data[0] = fieldMove; break; @@ -3781,7 +3781,7 @@ static void CursorCb_FieldMove(u8 taskId) static void DisplayFieldMoveExitAreaMessage(u8 taskId) { - DisplayPartyMenuMessage(gStringVar4, TRUE); + DisplayPartyMenuMessage(gStringVarBuffer, TRUE); gTasks[taskId].func = Task_FieldMoveExitAreaYesNo; } @@ -4311,62 +4311,62 @@ static void GetMedicineItemEffectMessage(u16 item) switch (GetItemEffectType(item)) { case ITEM_EFFECT_CURE_POISON: - StringExpandPlaceholders(gStringVar4, gText_PkmnCuredOfPoison); + StringExpandPlaceholders(gStringVarBuffer, gText_PkmnCuredOfPoison); break; case ITEM_EFFECT_CURE_SLEEP: - StringExpandPlaceholders(gStringVar4, gText_PkmnWokeUp2); + StringExpandPlaceholders(gStringVarBuffer, gText_PkmnWokeUp2); break; case ITEM_EFFECT_CURE_BURN: - StringExpandPlaceholders(gStringVar4, gText_PkmnBurnHealed); + StringExpandPlaceholders(gStringVarBuffer, gText_PkmnBurnHealed); break; case ITEM_EFFECT_CURE_FREEZE: - StringExpandPlaceholders(gStringVar4, gText_PkmnThawedOut); + StringExpandPlaceholders(gStringVarBuffer, gText_PkmnThawedOut); break; case ITEM_EFFECT_CURE_PARALYSIS: - StringExpandPlaceholders(gStringVar4, gText_PkmnCuredOfParalysis); + StringExpandPlaceholders(gStringVarBuffer, gText_PkmnCuredOfParalysis); break; case ITEM_EFFECT_CURE_CONFUSION: - StringExpandPlaceholders(gStringVar4, gText_PkmnSnappedOutOfConfusion); + StringExpandPlaceholders(gStringVarBuffer, gText_PkmnSnappedOutOfConfusion); break; case ITEM_EFFECT_CURE_INFATUATION: - StringExpandPlaceholders(gStringVar4, gText_PkmnGotOverInfatuation); + StringExpandPlaceholders(gStringVarBuffer, gText_PkmnGotOverInfatuation); break; case ITEM_EFFECT_CURE_ALL_STATUS: - StringExpandPlaceholders(gStringVar4, gText_PkmnBecameHealthy); + StringExpandPlaceholders(gStringVarBuffer, gText_PkmnBecameHealthy); break; case ITEM_EFFECT_HP_EV: StringCopy(gStringVar2, gText_HP3); - StringExpandPlaceholders(gStringVar4, gText_PkmnBaseVar2StatIncreased); + StringExpandPlaceholders(gStringVarBuffer, gText_PkmnBaseVar2StatIncreased); break; case ITEM_EFFECT_ATK_EV: StringCopy(gStringVar2, gText_Attack3); - StringExpandPlaceholders(gStringVar4, gText_PkmnBaseVar2StatIncreased); + StringExpandPlaceholders(gStringVarBuffer, gText_PkmnBaseVar2StatIncreased); break; case ITEM_EFFECT_DEF_EV: StringCopy(gStringVar2, gText_Defense3); - StringExpandPlaceholders(gStringVar4, gText_PkmnBaseVar2StatIncreased); + StringExpandPlaceholders(gStringVarBuffer, gText_PkmnBaseVar2StatIncreased); break; case ITEM_EFFECT_SPEED_EV: StringCopy(gStringVar2, gText_Speed2); - StringExpandPlaceholders(gStringVar4, gText_PkmnBaseVar2StatIncreased); + StringExpandPlaceholders(gStringVarBuffer, gText_PkmnBaseVar2StatIncreased); break; case ITEM_EFFECT_SPATK_EV: StringCopy(gStringVar2, gText_SpAtk3); - StringExpandPlaceholders(gStringVar4, gText_PkmnBaseVar2StatIncreased); + StringExpandPlaceholders(gStringVarBuffer, gText_PkmnBaseVar2StatIncreased); break; case ITEM_EFFECT_SPDEF_EV: StringCopy(gStringVar2, gText_SpDef3); - StringExpandPlaceholders(gStringVar4, gText_PkmnBaseVar2StatIncreased); + StringExpandPlaceholders(gStringVarBuffer, gText_PkmnBaseVar2StatIncreased); break; case ITEM_EFFECT_PP_UP: case ITEM_EFFECT_PP_MAX: - StringExpandPlaceholders(gStringVar4, gText_MovesPPIncreased); + StringExpandPlaceholders(gStringVarBuffer, gText_MovesPPIncreased); break; case ITEM_EFFECT_HEAL_PP: - StringExpandPlaceholders(gStringVar4, gText_PPWasRestored); + StringExpandPlaceholders(gStringVarBuffer, gText_PPWasRestored); break; default: - StringExpandPlaceholders(gStringVar4, gText_WontHaveEffect); + StringExpandPlaceholders(gStringVarBuffer, gText_WontHaveEffect); break; } } @@ -4452,7 +4452,7 @@ void ItemUseCB_Medicine(u8 taskId, TaskFunc task) { GetMonNickname(mon, gStringVar1); GetMedicineItemEffectMessage(item); - DisplayPartyMenuMessage(gStringVar4, TRUE); + DisplayPartyMenuMessage(gStringVarBuffer, TRUE); ScheduleBgCopyTilemapToVram(2); gTasks[taskId].func = task; } @@ -4462,8 +4462,8 @@ void ItemUseCB_Medicine(u8 taskId, TaskFunc task) static void Task_DisplayHPRestoredMessage(u8 taskId) { GetMonNickname(&gPlayerParty[gPartyMenu.slotId], gStringVar1); - StringExpandPlaceholders(gStringVar4, gText_PkmnHPRestoredByVar2); - DisplayPartyMenuMessage(gStringVar4, FALSE); + StringExpandPlaceholders(gStringVarBuffer, gText_PkmnHPRestoredByVar2); + DisplayPartyMenuMessage(gStringVarBuffer, FALSE); ScheduleBgCopyTilemapToVram(2); HandleBattleLowHpMusicChange(); gTasks[taskId].func = Task_ClosePartyMenuAfterText; @@ -4508,15 +4508,15 @@ void ItemUseCB_ReduceEV(u8 taskId, TaskFunc task) if (friendship != newFriendship) { if (ev != newEv) - StringExpandPlaceholders(gStringVar4, gText_PkmnFriendlyBaseVar2Fell); + StringExpandPlaceholders(gStringVarBuffer, gText_PkmnFriendlyBaseVar2Fell); else - StringExpandPlaceholders(gStringVar4, gText_PkmnFriendlyBaseVar2CantFall); + StringExpandPlaceholders(gStringVarBuffer, gText_PkmnFriendlyBaseVar2CantFall); } else { - StringExpandPlaceholders(gStringVar4, gText_PkmnAdoresBaseVar2Fell); + StringExpandPlaceholders(gStringVarBuffer, gText_PkmnAdoresBaseVar2Fell); } - DisplayPartyMenuMessage(gStringVar4, TRUE); + DisplayPartyMenuMessage(gStringVarBuffer, TRUE); ScheduleBgCopyTilemapToVram(2); gTasks[taskId].func = task; } @@ -4671,7 +4671,7 @@ static void TryUsePPItem(u8 taskId) move = GetMonData(mon, MON_DATA_MOVE1 + *moveSlot); StringCopy(gStringVar1, gMoveNames[move]); GetMedicineItemEffectMessage(item); - DisplayPartyMenuMessage(gStringVar4, TRUE); + DisplayPartyMenuMessage(gStringVarBuffer, TRUE); ScheduleBgCopyTilemapToVram(2); gTasks[taskId].func = Task_ClosePartyMenuAfterText; } @@ -4717,8 +4717,8 @@ bool8 MonKnowsMove(struct Pokemon *mon, u16 move) static void DisplayLearnMoveMessage(const u8 *str) { - StringExpandPlaceholders(gStringVar4, str); - DisplayPartyMenuMessage(gStringVar4, TRUE); + StringExpandPlaceholders(gStringVarBuffer, str); + DisplayPartyMenuMessage(gStringVarBuffer, TRUE); ScheduleBgCopyTilemapToVram(2); } @@ -4780,8 +4780,8 @@ static void Task_LearnedMove(u8 taskId) } GetMonNickname(mon, gStringVar1); StringCopy(gStringVar2, gMoveNames[move[0]]); - StringExpandPlaceholders(gStringVar4, gText_PkmnLearnedMove3); - DisplayPartyMenuMessage(gStringVar4, TRUE); + StringExpandPlaceholders(gStringVarBuffer, gText_PkmnLearnedMove3); + DisplayPartyMenuMessage(gStringVarBuffer, TRUE); ScheduleBgCopyTilemapToVram(2); gTasks[taskId].func = Task_DoLearnedMoveFanfareAfterText; } @@ -4897,8 +4897,8 @@ static void Task_PartyMenuReplaceMove(u8 taskId) static void StopLearningMovePrompt(u8 taskId) { StringCopy(gStringVar2, gMoveNames[gPartyMenu.data1]); - StringExpandPlaceholders(gStringVar4, gText_StopLearningMove2); - DisplayPartyMenuMessage(gStringVar4, TRUE); + StringExpandPlaceholders(gStringVarBuffer, gText_StopLearningMove2); + DisplayPartyMenuMessage(gStringVarBuffer, TRUE); ScheduleBgCopyTilemapToVram(2); gTasks[taskId].func = Task_StopLearningMoveYesNo; } @@ -4921,8 +4921,8 @@ static void Task_HandleStopLearningMoveYesNoInput(u8 taskId) case 0: GetMonNickname(mon, gStringVar1); StringCopy(gStringVar2, gMoveNames[gPartyMenu.data1]); - StringExpandPlaceholders(gStringVar4, gText_MoveNotLearned); - DisplayPartyMenuMessage(gStringVar4, TRUE); + StringExpandPlaceholders(gStringVarBuffer, gText_MoveNotLearned); + DisplayPartyMenuMessage(gStringVarBuffer, TRUE); if (gPartyMenu.learnMoveState == 1) { gTasks[taskId].func = Task_TryLearningNextMoveAfterText; @@ -4986,8 +4986,8 @@ void ItemUseCB_RareCandy(u8 taskId, TaskFunc task) RemoveBagItem(gSpecialVar_ItemId, 1); GetMonNickname(mon, gStringVar1); ConvertIntToDecimalStringN(gStringVar2, GetMonData(mon, MON_DATA_LEVEL), STR_CONV_MODE_LEFT_ALIGN, 3); - StringExpandPlaceholders(gStringVar4, gText_PkmnElevatedToLvVar2); - DisplayPartyMenuMessage(gStringVar4, TRUE); + StringExpandPlaceholders(gStringVarBuffer, gText_PkmnElevatedToLvVar2); + DisplayPartyMenuMessage(gStringVarBuffer, TRUE); ScheduleBgCopyTilemapToVram(2); gTasks[taskId].func = Task_DisplayLevelUpStatsPg1; } @@ -5114,8 +5114,8 @@ static void DisplayMonNeedsToReplaceMove(u8 taskId) { GetMonNickname(&gPlayerParty[gPartyMenu.slotId], gStringVar1); StringCopy(gStringVar2, gMoveNames[gMoveToLearn]); - StringExpandPlaceholders(gStringVar4, gText_PkmnNeedsToReplaceMove); - DisplayPartyMenuMessage(gStringVar4, TRUE); + StringExpandPlaceholders(gStringVarBuffer, gText_PkmnNeedsToReplaceMove); + DisplayPartyMenuMessage(gStringVarBuffer, TRUE); ScheduleBgCopyTilemapToVram(2); gPartyMenu.data1 = gMoveToLearn; gTasks[taskId].func = Task_ReplaceMoveYesNo; @@ -5125,8 +5125,8 @@ static void DisplayMonLearnedMove(u8 taskId, u16 move) { GetMonNickname(&gPlayerParty[gPartyMenu.slotId], gStringVar1); StringCopy(gStringVar2, gMoveNames[move]); - StringExpandPlaceholders(gStringVar4, gText_PkmnLearnedMove3); - DisplayPartyMenuMessage(gStringVar4, TRUE); + StringExpandPlaceholders(gStringVarBuffer, gText_PkmnLearnedMove3); + DisplayPartyMenuMessage(gStringVarBuffer, TRUE); ScheduleBgCopyTilemapToVram(2); gPartyMenu.data1 = move; gTasks[taskId].func = Task_DoLearnedMoveFanfareAfterText; @@ -5219,8 +5219,8 @@ static void Task_SacredAshLoop(u8 taskId) static void Task_SacredAshDisplayHPRestored(u8 taskId) { GetMonNickname(&gPlayerParty[gPartyMenu.slotId], gStringVar1); - StringExpandPlaceholders(gStringVar4, gText_PkmnHPRestoredByVar2); - DisplayPartyMenuMessage(gStringVar4, FALSE); + StringExpandPlaceholders(gStringVarBuffer, gText_PkmnHPRestoredByVar2); + DisplayPartyMenuMessage(gStringVarBuffer, FALSE); ScheduleBgCopyTilemapToVram(2); gTasks[taskId].func = Task_SacredAshLoop; } @@ -5488,7 +5488,7 @@ static void Task_HandleSwitchItemsFromBagYesNoInput(u8 taskId) { ReturnGiveItemToBagOrPC(item); BufferBagFullCantTakeItemMessage(sPartyMenuItemId); - DisplayPartyMenuMessage(gStringVar4, FALSE); + DisplayPartyMenuMessage(gStringVarBuffer, FALSE); gTasks[taskId].func = Task_UpdateHeldItemSpriteAndClosePartyMenu; } else if (ItemIsMail(item)) @@ -5807,13 +5807,13 @@ static bool8 TrySwitchInPokemon(void) if (IsMultiBattle() == TRUE && (slot == 1 || slot == 4 || slot == 5)) { StringCopy(gStringVar1, GetTrainerPartnerName()); - StringExpandPlaceholders(gStringVar4, gText_CantSwitchWithAlly); + StringExpandPlaceholders(gStringVarBuffer, gText_CantSwitchWithAlly); return FALSE; } if (GetMonData(&gPlayerParty[slot], MON_DATA_HP) == 0) { GetMonNickname(&gPlayerParty[slot], gStringVar1); - StringExpandPlaceholders(gStringVar4, gText_PkmnHasNoEnergy); + StringExpandPlaceholders(gStringVarBuffer, gText_PkmnHasNoEnergy); return FALSE; } for (i = 0; i < gBattlersCount; i++) @@ -5821,19 +5821,19 @@ static bool8 TrySwitchInPokemon(void) if (GetBattlerSide(i) == B_SIDE_PLAYER && GetPartyIdFromBattleSlot(slot) == gBattlerPartyIndexes[i]) { GetMonNickname(&gPlayerParty[slot], gStringVar1); - StringExpandPlaceholders(gStringVar4, gText_PkmnAlreadyInBattle); + StringExpandPlaceholders(gStringVarBuffer, gText_PkmnAlreadyInBattle); return FALSE; } } if (GetMonData(&gPlayerParty[slot], MON_DATA_IS_EGG)) { - StringExpandPlaceholders(gStringVar4, gText_EggCantBattle); + StringExpandPlaceholders(gStringVarBuffer, gText_EggCantBattle); return FALSE; } if (GetPartyIdFromBattleSlot(slot) == gBattleStruct->prevSelectedPartySlot) { GetMonNickname(&gPlayerParty[slot], gStringVar1); - StringExpandPlaceholders(gStringVar4, gText_PkmnAlreadySelected); + StringExpandPlaceholders(gStringVarBuffer, gText_PkmnAlreadySelected); return FALSE; } if (gPartyMenu.action == PARTY_ACTION_ABILITY_PREVENTS) @@ -5845,7 +5845,7 @@ static bool8 TrySwitchInPokemon(void) { u8 currBattler = gBattlerInMenuId; GetMonNickname(&gPlayerParty[GetPartyIdFromBattlePartyId(gBattlerPartyIndexes[currBattler])], gStringVar1); - StringExpandPlaceholders(gStringVar4, gText_PkmnCantSwitchOut); + StringExpandPlaceholders(gStringVarBuffer, gText_PkmnCantSwitchOut); return FALSE; } gSelectedMonPartyId = GetPartyIdFromBattleSlot(slot); diff --git a/src/player_pc.c b/src/player_pc.c index 81170a86c92..95b20b7e3bb 100644 --- a/src/player_pc.c +++ b/src/player_pc.c @@ -738,8 +738,8 @@ static void Mailbox_PrintWhatToDoWithPlayerMailText(u8 taskId) { StringCopy(gStringVar1, gSaveBlock1Ptr->mail[gPlayerPCItemPageInfo.itemsAbove + PARTY_SIZE + gPlayerPCItemPageInfo.cursorPos].playerName); ConvertInternationalPlayerNameStripChar(gStringVar1, CHAR_SPACE); - StringExpandPlaceholders(gStringVar4, gText_WhatToDoWithVar1sMail); - DisplayItemMessageOnField(taskId, gStringVar4, Mailbox_PrintMailOptions); + StringExpandPlaceholders(gStringVarBuffer, gText_WhatToDoWithVar1sMail); + DisplayItemMessageOnField(taskId, gStringVarBuffer, Mailbox_PrintMailOptions); } static void Mailbox_ReturnToPlayerPC(u8 taskId) @@ -1039,8 +1039,8 @@ static void ItemStorage_PrintMenuItem(u8 windowId, u32 id, u8 yOffset) ItemStorage_DrawSwapArrow(yOffset, 0xFF, TEXT_SKIP_DRAW); } ConvertIntToDecimalStringN(gStringVar1, gSaveBlock1Ptr->pcItems[id].quantity, STR_CONV_MODE_RIGHT_ALIGN, 3); - StringExpandPlaceholders(gStringVar4, gText_xVar1); - AddTextPrinterParameterized(windowId, FONT_NARROW, gStringVar4, GetStringRightAlignXOffset(FONT_NARROW, gStringVar4, 104), yOffset, TEXT_SKIP_DRAW, NULL); + StringExpandPlaceholders(gStringVarBuffer, gText_xVar1); + AddTextPrinterParameterized(windowId, FONT_NARROW, gStringVarBuffer, GetStringRightAlignXOffset(FONT_NARROW, gStringVarBuffer, 104), yOffset, TEXT_SKIP_DRAW, NULL); } } @@ -1205,8 +1205,8 @@ static void ItemStorage_PrintMessage(const u8 *string) { u8 windowId = sItemStorageMenu->windowIds[ITEMPC_WIN_MESSAGE]; FillWindowPixelBuffer(windowId, PIXEL_FILL(1)); - StringExpandPlaceholders(gStringVar4, string); - AddTextPrinterParameterized(windowId, FONT_NORMAL, gStringVar4, 0, 1, 0, NULL); + StringExpandPlaceholders(gStringVarBuffer, string); + AddTextPrinterParameterized(windowId, FONT_NORMAL, gStringVarBuffer, 0, 1, 0, NULL); } // Process input while on the item storage's item list @@ -1344,8 +1344,8 @@ static void ItemStorage_UpdateSwapLinePos(u8 y) static void ItemStorage_PrintItemQuantity(u8 windowId, u16 value, u32 mode, u8 x, u8 y, u8 n) { ConvertIntToDecimalStringN(gStringVar1, value, mode, n); - StringExpandPlaceholders(gStringVar4, gText_xVar1); - AddTextPrinterParameterized(windowId, FONT_NORMAL, gStringVar4, GetStringCenterAlignXOffset(FONT_NORMAL, gStringVar4, 48), y, 0, NULL); + StringExpandPlaceholders(gStringVarBuffer, gText_xVar1); + AddTextPrinterParameterized(windowId, FONT_NORMAL, gStringVarBuffer, GetStringCenterAlignXOffset(FONT_NORMAL, gStringVarBuffer, 48), y, 0, NULL); } // Start an item Withdraw/Toss diff --git a/src/pokeblock.c b/src/pokeblock.c index e01e821f7e1..5f8115a6bfd 100644 --- a/src/pokeblock.c +++ b/src/pokeblock.c @@ -1203,8 +1203,8 @@ static void PokeblockAction_Toss(u8 taskId) ClearStdWindowAndFrameToTransparent(tWindowId, FALSE); StringCopy(gStringVar1, gPokeblockNames[gSaveBlock1Ptr->pokeblocks[gSpecialVar_ItemId].color]); - StringExpandPlaceholders(gStringVar4, gText_ThrowAwayVar1); - DisplayMessageAndContinueTask(taskId, WIN_TOSS_MSG, 10, 13, FONT_NORMAL, GetPlayerTextSpeedDelay(), gStringVar4, CreateTossPokeblockYesNoMenu); + StringExpandPlaceholders(gStringVarBuffer, gText_ThrowAwayVar1); + DisplayMessageAndContinueTask(taskId, WIN_TOSS_MSG, 10, 13, FONT_NORMAL, GetPlayerTextSpeedDelay(), gStringVarBuffer, CreateTossPokeblockYesNoMenu); } static void CreateTossPokeblockYesNoMenu(u8 taskId) @@ -1214,8 +1214,8 @@ static void CreateTossPokeblockYesNoMenu(u8 taskId) static void TossedPokeblockMessage(u8 taskId) { - StringExpandPlaceholders(gStringVar4, gText_Var1ThrownAway); - DisplayMessageAndContinueTask(taskId, WIN_TOSS_MSG, 10, 13, FONT_NORMAL, GetPlayerTextSpeedDelay(), gStringVar4, TossPokeblock); + StringExpandPlaceholders(gStringVarBuffer, gText_Var1ThrownAway); + DisplayMessageAndContinueTask(taskId, WIN_TOSS_MSG, 10, 13, FONT_NORMAL, GetPlayerTextSpeedDelay(), gStringVarBuffer, TossPokeblock); } static void TossPokeblock(u8 taskId) diff --git a/src/pokeblock_feed.c b/src/pokeblock_feed.c index a334038d8d8..1d3f23933c6 100644 --- a/src/pokeblock_feed.c +++ b/src/pokeblock_feed.c @@ -865,14 +865,14 @@ static void Task_PrintAtePokeblockMessage(u8 taskId) PokeblockCopyName(pokeblock, gStringVar2); if (gPokeblockGain == 0) - StringExpandPlaceholders(gStringVar4, gText_Var1AteTheVar2); + StringExpandPlaceholders(gStringVarBuffer, gText_Var1AteTheVar2); else if (gPokeblockGain > 0) - StringExpandPlaceholders(gStringVar4, gText_Var1HappilyAteVar2); + StringExpandPlaceholders(gStringVarBuffer, gText_Var1HappilyAteVar2); else - StringExpandPlaceholders(gStringVar4, gText_Var1DisdainfullyAteVar2); + StringExpandPlaceholders(gStringVarBuffer, gText_Var1DisdainfullyAteVar2); gTextFlags.canABSpeedUpPrint = TRUE; - AddTextPrinterParameterized2(0, FONT_NORMAL, gStringVar4, GetPlayerTextSpeedDelay(), NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); + AddTextPrinterParameterized2(0, FONT_NORMAL, gStringVarBuffer, GetPlayerTextSpeedDelay(), NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); gTasks[taskId].func = Task_WaitForAtePokeblockMessage; } diff --git a/src/pokemon.c b/src/pokemon.c index e98182b0ae3..a377b35e680 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -6636,7 +6636,7 @@ void SetMonPreventsSwitchingString(void) PREPARE_MON_NICK_WITH_PREFIX_BUFFER(gBattleTextBuff2, gBattlerInMenuId, GetPartyIdFromBattlePartyId(gBattlerPartyIndexes[gBattlerInMenuId])) - BattleStringExpandPlaceholders(gText_PkmnsXPreventsSwitching, gStringVar4); + BattleStringExpandPlaceholders(gText_PkmnsXPreventsSwitching, gStringVarBuffer); } static s32 GetWildMonTableIdInAlteringCave(u16 species) diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index 642b176d6b4..e76fd5b6c47 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -3097,7 +3097,7 @@ static void BufferMonTrainerMemo(void) if (InBattleFactory() == TRUE || InSlateportBattleTent() == TRUE || IsInGamePartnerMon() == TRUE) { - DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gText_XNature); + DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVarBuffer, gText_XNature); } else { @@ -3131,7 +3131,7 @@ static void BufferMonTrainerMemo(void) text = gText_XNatureObtainedInTrade; } - DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, text); + DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVarBuffer, text); Free(metLevelString); Free(metLocationString); } @@ -3139,7 +3139,7 @@ static void BufferMonTrainerMemo(void) static void PrintMonTrainerMemo(void) { - PrintTextOnWindow(AddWindowFromTemplateList(sPageInfoTemplate, PSS_DATA_WINDOW_INFO_MEMO), gStringVar4, 0, 1, 0, 0); + PrintTextOnWindow(AddWindowFromTemplateList(sPageInfoTemplate, PSS_DATA_WINDOW_INFO_MEMO), gStringVarBuffer, 0, 1, 0, 0); } static void BufferNatureString(void) @@ -3352,8 +3352,8 @@ static void PrintRibbonCount(void) else { ConvertIntToDecimalStringN(gStringVar1, sMonSummaryScreen->summary.ribbonCount, STR_CONV_MODE_RIGHT_ALIGN, 2); - StringExpandPlaceholders(gStringVar4, gText_RibbonsVar1); - text = gStringVar4; + StringExpandPlaceholders(gStringVarBuffer, gText_RibbonsVar1); + text = gStringVarBuffer; } x = GetStringCenterAlignXOffset(FONT_NORMAL, text, 70) + 6; @@ -3377,7 +3377,7 @@ static void BufferLeftColumnStats(void) DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, maxHPString); DynamicPlaceholderTextUtil_SetPlaceholderPtr(2, attackString); DynamicPlaceholderTextUtil_SetPlaceholderPtr(3, defenseString); - DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, sStatsLeftColumnLayout); + DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVarBuffer, sStatsLeftColumnLayout); Free(currentHPString); Free(maxHPString); @@ -3387,7 +3387,7 @@ static void BufferLeftColumnStats(void) static void PrintLeftColumnStats(void) { - PrintTextOnWindow(AddWindowFromTemplateList(sPageSkillsTemplate, PSS_DATA_WINDOW_SKILLS_STATS_LEFT), gStringVar4, 4, 1, 0, 0); + PrintTextOnWindow(AddWindowFromTemplateList(sPageSkillsTemplate, PSS_DATA_WINDOW_SKILLS_STATS_LEFT), gStringVarBuffer, 4, 1, 0, 0); } static void BufferRightColumnStats(void) @@ -3400,12 +3400,12 @@ static void BufferRightColumnStats(void) DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gStringVar1); DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, gStringVar2); DynamicPlaceholderTextUtil_SetPlaceholderPtr(2, gStringVar3); - DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, sStatsRightColumnLayout); + DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVarBuffer, sStatsRightColumnLayout); } static void PrintRightColumnStats(void) { - PrintTextOnWindow(AddWindowFromTemplateList(sPageSkillsTemplate, PSS_DATA_WINDOW_SKILLS_STATS_RIGHT), gStringVar4, 2, 1, 0, 0); + PrintTextOnWindow(AddWindowFromTemplateList(sPageSkillsTemplate, PSS_DATA_WINDOW_SKILLS_STATS_RIGHT), gStringVarBuffer, 2, 1, 0, 0); } static void PrintExpPointsNextLevel(void) @@ -3515,8 +3515,8 @@ static void PrintMoveNameAndPP(u8 moveIndex) DynamicPlaceholderTextUtil_Reset(); DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gStringVar1); DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, gStringVar2); - DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, sMovesPPLayout); - text = gStringVar4; + DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVarBuffer, sMovesPPLayout); + text = gStringVarBuffer; ppState = GetCurrentPpToMaxPpState(summary->pp[moveIndex], pp) + 9; x = GetStringRightAlignXOffset(FONT_NORMAL, text, 44); } @@ -3677,8 +3677,8 @@ static void PrintNewMoveDetailsOrCancelText(void) DynamicPlaceholderTextUtil_Reset(); DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gStringVar1); DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, gStringVar1); - DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, sMovesPPLayout); - PrintTextOnWindow(windowId2, gStringVar4, GetStringRightAlignXOffset(FONT_NORMAL, gStringVar4, 44), 65, 0, 12); + DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVarBuffer, sMovesPPLayout); + PrintTextOnWindow(windowId2, gStringVarBuffer, GetStringRightAlignXOffset(FONT_NORMAL, gStringVarBuffer, 44), 65, 0, 12); } } diff --git a/src/pokenav_match_call_list.c b/src/pokenav_match_call_list.c index fb89e33e0b2..7e829d57197 100755 --- a/src/pokenav_match_call_list.c +++ b/src/pokenav_match_call_list.c @@ -356,11 +356,11 @@ const u8 *GetMatchCallMessageText(int index, bool8 *newRematchRequest) return gText_CallCantBeMadeHere; if (!state->matchCallEntries[index].isSpecialTrainer) - *newRematchRequest = SelectMatchCallMessage(GetTrainerIdxByRematchIdx(state->matchCallEntries[index].headerId), gStringVar4); + *newRematchRequest = SelectMatchCallMessage(GetTrainerIdxByRematchIdx(state->matchCallEntries[index].headerId), gStringVarBuffer); else - MatchCall_GetMessage(state->matchCallEntries[index].headerId, gStringVar4); + MatchCall_GetMessage(state->matchCallEntries[index].headerId, gStringVarBuffer); - return gStringVar4; + return gStringVarBuffer; } const u8 *GetMatchCallFlavorText(int index, int checkPageEntry) diff --git a/src/pokenav_ribbons_summary.c b/src/pokenav_ribbons_summary.c index c799daf57bb..af924a99d88 100644 --- a/src/pokenav_ribbons_summary.c +++ b/src/pokenav_ribbons_summary.c @@ -808,9 +808,9 @@ static void PrintCurrentMonRibbonCount(struct Pokenav_RibbonsSummaryMenu *menu) ConvertIntToDecimalStringN(gStringVar1, GetCurrMonRibbonCount(), STR_CONV_MODE_LEFT_ALIGN, 2); DynamicPlaceholderTextUtil_Reset(); DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gStringVar1); - DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gText_RibbonsF700); + DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVarBuffer, gText_RibbonsF700); FillWindowPixelBuffer(menu->ribbonCountWindowId, PIXEL_FILL(4)); - AddTextPrinterParameterized3(menu->ribbonCountWindowId, FONT_NORMAL, 0, 1, color, TEXT_SKIP_DRAW, gStringVar4); + AddTextPrinterParameterized3(menu->ribbonCountWindowId, FONT_NORMAL, 0, 1, color, TEXT_SKIP_DRAW, gStringVarBuffer); CopyWindowToVram(menu->ribbonCountWindowId, COPYWIN_GFX); } diff --git a/src/reset_rtc_screen.c b/src/reset_rtc_screen.c index 8f8ff6c163c..27ff4dc481b 100644 --- a/src/reset_rtc_screen.c +++ b/src/reset_rtc_screen.c @@ -365,7 +365,7 @@ static void HideChooseTimeWindow(u8 windowId) static void PrintTime(u8 windowId, u8 x, u8 y, u16 days, u8 hours, u8 minutes, u8 seconds) { - u8 *dest = gStringVar4; + u8 *dest = gStringVarBuffer; // Print days ConvertIntToDecimalStringN(gStringVar1, days, STR_CONV_MODE_RIGHT_ALIGN, 4); @@ -386,7 +386,7 @@ static void PrintTime(u8 windowId, u8 x, u8 y, u16 days, u8 hours, u8 minutes, u ConvertIntToDecimalStringN(gStringVar1, seconds, STR_CONV_MODE_LEADING_ZEROS, 2); dest = StringCopy(dest, gStringVar1); - AddTextPrinterParameterized(windowId, FONT_NORMAL, gStringVar4, x, y, TEXT_SKIP_DRAW, NULL); + AddTextPrinterParameterized(windowId, FONT_NORMAL, gStringVarBuffer, x, y, TEXT_SKIP_DRAW, NULL); } static void ShowChooseTimeWindow(u8 windowId, u16 days, u8 hours, u8 minutes, u8 seconds) diff --git a/src/roulette.c b/src/roulette.c index f4e6012a8dc..fb566f14826 100644 --- a/src/roulette.c +++ b/src/roulette.c @@ -1864,9 +1864,9 @@ static void Task_GivePayout(u8 taskId) static void Task_PrintPayout(u8 taskId) { ConvertIntToDecimalStringN(gStringVar1, (sRoulette->minBet * gTasks[taskId].tMultiplier), STR_CONV_MODE_LEFT_ALIGN, 2); - StringExpandPlaceholders(gStringVar4, Roulette_Text_YouveWonXCoins); + StringExpandPlaceholders(gStringVarBuffer, Roulette_Text_YouveWonXCoins); DrawStdWindowFrame(sTextWindowId, FALSE); - AddTextPrinterParameterized(sTextWindowId, FONT_NORMAL, gStringVar4, 0, 1, TEXT_SKIP_DRAW, NULL); + AddTextPrinterParameterized(sTextWindowId, FONT_NORMAL, gStringVarBuffer, 0, 1, TEXT_SKIP_DRAW, NULL); CopyWindowToVram(sTextWindowId, COPYWIN_FULL); gTasks[taskId].tPayout = (sRoulette->minBet * gTasks[taskId].tMultiplier); gTasks[taskId].data[7] = 0; @@ -3424,9 +3424,9 @@ static void Task_PrintMinBet(u8 taskId) { u32 minBet = sTableMinBets[GET_MIN_BET_ID(gSpecialVar_0x8004)]; ConvertIntToDecimalStringN(gStringVar1, minBet, STR_CONV_MODE_LEADING_ZEROS, 1); - StringExpandPlaceholders(gStringVar4, Roulette_Text_PlayMinimumWagerIsX); + StringExpandPlaceholders(gStringVarBuffer, Roulette_Text_PlayMinimumWagerIsX); DrawStdWindowFrame(0, FALSE); - AddTextPrinterParameterized(0, FONT_NORMAL, gStringVar4, 0, 1, TEXT_SKIP_DRAW, NULL); + AddTextPrinterParameterized(0, FONT_NORMAL, gStringVarBuffer, 0, 1, TEXT_SKIP_DRAW, NULL); CopyWindowToVram(0, COPYWIN_FULL); gTasks[taskId].func = Task_ShowMinBetYesNo; } @@ -3452,9 +3452,9 @@ static void Task_PrintRouletteEntryMsg(u8 taskId) else { // Print minimum bet - StringExpandPlaceholders(gStringVar4, Roulette_Text_PlayMinimumWagerIsX); + StringExpandPlaceholders(gStringVarBuffer, Roulette_Text_PlayMinimumWagerIsX); DrawStdWindowFrame(0, FALSE); - AddTextPrinterParameterized(0, FONT_NORMAL, gStringVar4, 0, 1, TEXT_SKIP_DRAW, NULL); + AddTextPrinterParameterized(0, FONT_NORMAL, gStringVarBuffer, 0, 1, TEXT_SKIP_DRAW, NULL); CopyWindowToVram(0, COPYWIN_FULL); gTasks[taskId].func = Task_ShowMinBetYesNo; } @@ -3462,9 +3462,9 @@ static void Task_PrintRouletteEntryMsg(u8 taskId) else { // Not enough for minimum bet - StringExpandPlaceholders(gStringVar4, Roulette_Text_NotEnoughCoins); + StringExpandPlaceholders(gStringVarBuffer, Roulette_Text_NotEnoughCoins); DrawStdWindowFrame(0, FALSE); - AddTextPrinterParameterized(0, FONT_NORMAL, gStringVar4, 0, 1, TEXT_SKIP_DRAW, NULL); + AddTextPrinterParameterized(0, FONT_NORMAL, gStringVarBuffer, 0, 1, TEXT_SKIP_DRAW, NULL); CopyWindowToVram(0, COPYWIN_FULL); gTasks[taskId].func = Task_NotEnoughForMinBet; gTasks[taskId].tCoins = 0; diff --git a/src/scrcmd.c b/src/scrcmd.c index 218be539f56..035745a39c9 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -1490,16 +1490,16 @@ bool8 ScrCmd_braillemessage(struct ScriptContext *ctx) // + 6 for the 6 bytes at the start of a braille message (brailleformat macro) // In RS these bytes are used to position the text and window, but // in Emerald they are unused and position is calculated below instead - StringExpandPlaceholders(gStringVar4, ptr + 6); + StringExpandPlaceholders(gStringVarBuffer, ptr + 6); - width = GetStringWidth(FONT_BRAILLE, gStringVar4, -1) / 8u; + width = GetStringWidth(FONT_BRAILLE, gStringVarBuffer, -1) / 8u; if (width > 28) width = 28; - for (i = 0, height = 4; gStringVar4[i] != EOS;) + for (i = 0, height = 4; gStringVarBuffer[i] != EOS;) { - if (gStringVar4[i++] == CHAR_NEWLINE) + if (gStringVarBuffer[i++] == CHAR_NEWLINE) height += 3; } @@ -1527,7 +1527,7 @@ bool8 ScrCmd_braillemessage(struct ScriptContext *ctx) DrawStdWindowFrame(sBrailleWindowId, FALSE); PutWindowTilemap(sBrailleWindowId); FillWindowPixelBuffer(sBrailleWindowId, PIXEL_FILL(1)); - AddTextPrinterParameterized(sBrailleWindowId, FONT_BRAILLE, gStringVar4, xText, yText, TEXT_SKIP_DRAW, NULL); + AddTextPrinterParameterized(sBrailleWindowId, FONT_BRAILLE, gStringVarBuffer, xText, yText, TEXT_SKIP_DRAW, NULL); CopyWindowToVram(sBrailleWindowId, COPYWIN_FULL); return FALSE; } @@ -1654,7 +1654,7 @@ bool8 ScrCmd_vbuffermessage(struct ScriptContext *ctx) { const u8 *ptr = (u8 *)(ScriptReadWord(ctx) - sAddressOffset); - StringExpandPlaceholders(gStringVar4, ptr); + StringExpandPlaceholders(gStringVarBuffer, ptr); return FALSE; } diff --git a/src/script_menu.c b/src/script_menu.c index e923f4031ac..7bbfa7d96aa 100644 --- a/src/script_menu.c +++ b/src/script_menu.c @@ -369,8 +369,8 @@ static void CreatePCMultichoice(void) else AddTextPrinterParameterized(windowId, FONT_NORMAL, gText_SomeonesPC, x, 1, TEXT_SKIP_DRAW, NULL); - StringExpandPlaceholders(gStringVar4, gText_PlayersPC); - PrintPlayerNameOnWindow(windowId, gStringVar4, x, 17); + StringExpandPlaceholders(gStringVarBuffer, gText_PlayersPC); + PrintPlayerNameOnWindow(windowId, gStringVarBuffer, x, 17); InitMenuInUpperLeftCornerNormal(windowId, numChoices, 0); CopyWindowToVram(windowId, COPYWIN_FULL); InitMultichoiceCheckWrap(FALSE, numChoices, windowId, MULTI_PC); diff --git a/src/secret_base.c b/src/secret_base.c index 9509cd0fc5c..1f1e2079450 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -1062,8 +1062,8 @@ static void ShowRegistryMenuDeleteConfirmation(u8 taskId) RemoveWindow(tActionWindowId); ScheduleBgCopyTilemapToVram(0); GetSecretBaseName(gStringVar1, tSelectedBaseId); - StringExpandPlaceholders(gStringVar4, gText_OkayToDeleteFromRegistry); - DisplayItemMessageOnField(taskId, gStringVar4, ShowRegistryMenuDeleteYesNo); + StringExpandPlaceholders(gStringVarBuffer, gText_OkayToDeleteFromRegistry); + DisplayItemMessageOnField(taskId, gStringVarBuffer, ShowRegistryMenuDeleteYesNo); } static void ShowRegistryMenuDeleteYesNo(u8 taskId) diff --git a/src/shop.c b/src/shop.c index 8fea1e1178b..0f47b37cffa 100644 --- a/src/shop.c +++ b/src/shop.c @@ -639,9 +639,9 @@ static void BuyMenuPrintPriceInList(u8 windowId, u32 itemId, u8 y) 5); } - StringExpandPlaceholders(gStringVar4, gText_PokedollarVar1); - x = GetStringRightAlignXOffset(FONT_NARROW, gStringVar4, 120); - AddTextPrinterParameterized4(windowId, FONT_NARROW, x, y, 0, 0, sShopBuyMenuTextColors[COLORID_ITEM_LIST], TEXT_SKIP_DRAW, gStringVar4); + StringExpandPlaceholders(gStringVarBuffer, gText_PokedollarVar1); + x = GetStringRightAlignXOffset(FONT_NARROW, gStringVarBuffer, 120); + AddTextPrinterParameterized4(windowId, FONT_NARROW, x, y, 0, 0, sShopBuyMenuTextColors[COLORID_ITEM_LIST], TEXT_SKIP_DRAW, gStringVarBuffer); } } @@ -1014,11 +1014,11 @@ static void Task_BuyMenu(u8 taskId) ConvertIntToDecimalStringN(gStringVar2, sShopData->totalCost, STR_CONV_MODE_LEFT_ALIGN, 6); if (sMartInfo.martType == MART_TYPE_DECOR) - StringExpandPlaceholders(gStringVar4, gText_Var1IsItThatllBeVar2); + StringExpandPlaceholders(gStringVarBuffer, gText_Var1IsItThatllBeVar2); else // MART_TYPE_DECOR2 - StringExpandPlaceholders(gStringVar4, gText_YouWantedVar1ThatllBeVar2); + StringExpandPlaceholders(gStringVarBuffer, gText_YouWantedVar1ThatllBeVar2); - BuyMenuDisplayMessage(taskId, gStringVar4, BuyMenuConfirmPurchase); + BuyMenuDisplayMessage(taskId, gStringVarBuffer, BuyMenuConfirmPurchase); } } break; @@ -1035,8 +1035,8 @@ static void Task_BuyHowManyDialogueInit(u8 taskId) DrawStdFrameWithCustomTileAndPalette(WIN_QUANTITY_IN_BAG, FALSE, 1, 13); ConvertIntToDecimalStringN(gStringVar1, quantityInBag, STR_CONV_MODE_RIGHT_ALIGN, MAX_ITEM_DIGITS + 1); - StringExpandPlaceholders(gStringVar4, gText_InBagVar1); - BuyMenuPrint(WIN_QUANTITY_IN_BAG, gStringVar4, 0, 1, 0, COLORID_NORMAL); + StringExpandPlaceholders(gStringVarBuffer, gText_InBagVar1); + BuyMenuPrint(WIN_QUANTITY_IN_BAG, gStringVarBuffer, 0, 1, 0, COLORID_NORMAL); tItemCount = 1; DrawStdFrameWithCustomTileAndPalette(WIN_QUANTITY_PRICE, FALSE, 1, 13); BuyMenuPrintItemQuantityAndPrice(taskId); @@ -1185,8 +1185,8 @@ static void BuyMenuPrintItemQuantityAndPrice(u8 taskId) FillWindowPixelBuffer(WIN_QUANTITY_PRICE, PIXEL_FILL(1)); PrintMoneyAmount(WIN_QUANTITY_PRICE, 38, 1, sShopData->totalCost, TEXT_SKIP_DRAW); ConvertIntToDecimalStringN(gStringVar1, tItemCount, STR_CONV_MODE_LEADING_ZEROS, BAG_ITEM_CAPACITY_DIGITS); - StringExpandPlaceholders(gStringVar4, gText_xVar1); - BuyMenuPrint(WIN_QUANTITY_PRICE, gStringVar4, 0, 1, 0, COLORID_NORMAL); + StringExpandPlaceholders(gStringVarBuffer, gText_xVar1); + BuyMenuPrint(WIN_QUANTITY_PRICE, gStringVarBuffer, 0, 1, 0, COLORID_NORMAL); } static void ExitBuyMenu(u8 taskId) diff --git a/src/start_menu.c b/src/start_menu.c index 0910fad84db..f22d0545992 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -411,8 +411,8 @@ static void ShowSafariBallsWindow(void) PutWindowTilemap(sSafariBallsWindowId); DrawStdWindowFrame(sSafariBallsWindowId, FALSE); ConvertIntToDecimalStringN(gStringVar1, gNumSafariBalls, STR_CONV_MODE_RIGHT_ALIGN, 2); - StringExpandPlaceholders(gStringVar4, gText_SafariBallStock); - AddTextPrinterParameterized(sSafariBallsWindowId, FONT_NORMAL, gStringVar4, 0, 1, TEXT_SKIP_DRAW, NULL); + StringExpandPlaceholders(gStringVarBuffer, gText_SafariBallStock); + AddTextPrinterParameterized(sSafariBallsWindowId, FONT_NORMAL, gStringVarBuffer, 0, 1, TEXT_SKIP_DRAW, NULL); CopyWindowToVram(sSafariBallsWindowId, COPYWIN_GFX); } @@ -426,8 +426,8 @@ static void ShowPyramidFloorWindow(void) PutWindowTilemap(sBattlePyramidFloorWindowId); DrawStdWindowFrame(sBattlePyramidFloorWindowId, FALSE); StringCopy(gStringVar1, sPyramidFloorNames[gSaveBlock2Ptr->frontier.curChallengeBattleNum]); - StringExpandPlaceholders(gStringVar4, gText_BattlePyramidFloor); - AddTextPrinterParameterized(sBattlePyramidFloorWindowId, FONT_NORMAL, gStringVar4, 0, 1, TEXT_SKIP_DRAW, NULL); + StringExpandPlaceholders(gStringVarBuffer, gText_BattlePyramidFloor); + AddTextPrinterParameterized(sBattlePyramidFloorWindowId, FONT_NORMAL, gStringVarBuffer, 0, 1, TEXT_SKIP_DRAW, NULL); CopyWindowToVram(sBattlePyramidFloorWindowId, COPYWIN_GFX); } @@ -458,8 +458,8 @@ static bool32 PrintStartMenuActions(s8 *pIndex, u32 count) } else { - StringExpandPlaceholders(gStringVar4, sStartMenuItems[sCurrentStartMenuActions[index]].text); - AddTextPrinterParameterized(GetStartMenuWindowId(), FONT_NORMAL, gStringVar4, 8, (index << 4) + 9, TEXT_SKIP_DRAW, NULL); + StringExpandPlaceholders(gStringVarBuffer, sStartMenuItems[sCurrentStartMenuActions[index]].text); + AddTextPrinterParameterized(GetStartMenuWindowId(), FONT_NORMAL, gStringVarBuffer, 8, (index << 4) + 9, TEXT_SKIP_DRAW, NULL); } index++; @@ -901,7 +901,7 @@ void SaveGame(void) static void ShowSaveMessage(const u8 *message, u8 (*saveCallback)(void)) { - StringExpandPlaceholders(gStringVar4, message); + StringExpandPlaceholders(gStringVarBuffer, message); LoadMessageBoxAndFrameGfx(0, TRUE); AddTextPrinterForMessage_2(TRUE); sSavingComplete = TRUE; @@ -1355,39 +1355,39 @@ static void ShowSaveInfoWindow(void) // Print region name yOffset = 1; - BufferSaveMenuText(SAVE_MENU_LOCATION, gStringVar4, TEXT_COLOR_GREEN); - AddTextPrinterParameterized(sSaveInfoWindowId, FONT_NORMAL, gStringVar4, 0, yOffset, TEXT_SKIP_DRAW, NULL); + BufferSaveMenuText(SAVE_MENU_LOCATION, gStringVarBuffer, TEXT_COLOR_GREEN); + AddTextPrinterParameterized(sSaveInfoWindowId, FONT_NORMAL, gStringVarBuffer, 0, yOffset, TEXT_SKIP_DRAW, NULL); // Print player name yOffset += 16; AddTextPrinterParameterized(sSaveInfoWindowId, FONT_NORMAL, gText_SavingPlayer, 0, yOffset, TEXT_SKIP_DRAW, NULL); - BufferSaveMenuText(SAVE_MENU_NAME, gStringVar4, color); - xOffset = GetStringRightAlignXOffset(FONT_NORMAL, gStringVar4, 0x70); - PrintPlayerNameOnWindow(sSaveInfoWindowId, gStringVar4, xOffset, yOffset); + BufferSaveMenuText(SAVE_MENU_NAME, gStringVarBuffer, color); + xOffset = GetStringRightAlignXOffset(FONT_NORMAL, gStringVarBuffer, 0x70); + PrintPlayerNameOnWindow(sSaveInfoWindowId, gStringVarBuffer, xOffset, yOffset); // Print badge count yOffset += 16; AddTextPrinterParameterized(sSaveInfoWindowId, FONT_NORMAL, gText_SavingBadges, 0, yOffset, TEXT_SKIP_DRAW, NULL); - BufferSaveMenuText(SAVE_MENU_BADGES, gStringVar4, color); - xOffset = GetStringRightAlignXOffset(FONT_NORMAL, gStringVar4, 0x70); - AddTextPrinterParameterized(sSaveInfoWindowId, FONT_NORMAL, gStringVar4, xOffset, yOffset, TEXT_SKIP_DRAW, NULL); + BufferSaveMenuText(SAVE_MENU_BADGES, gStringVarBuffer, color); + xOffset = GetStringRightAlignXOffset(FONT_NORMAL, gStringVarBuffer, 0x70); + AddTextPrinterParameterized(sSaveInfoWindowId, FONT_NORMAL, gStringVarBuffer, xOffset, yOffset, TEXT_SKIP_DRAW, NULL); if (FlagGet(FLAG_SYS_POKEDEX_GET) == TRUE) { // Print Pokédex count yOffset += 16; AddTextPrinterParameterized(sSaveInfoWindowId, FONT_NORMAL, gText_SavingPokedex, 0, yOffset, TEXT_SKIP_DRAW, NULL); - BufferSaveMenuText(SAVE_MENU_CAUGHT, gStringVar4, color); - xOffset = GetStringRightAlignXOffset(FONT_NORMAL, gStringVar4, 0x70); - AddTextPrinterParameterized(sSaveInfoWindowId, FONT_NORMAL, gStringVar4, xOffset, yOffset, TEXT_SKIP_DRAW, NULL); + BufferSaveMenuText(SAVE_MENU_CAUGHT, gStringVarBuffer, color); + xOffset = GetStringRightAlignXOffset(FONT_NORMAL, gStringVarBuffer, 0x70); + AddTextPrinterParameterized(sSaveInfoWindowId, FONT_NORMAL, gStringVarBuffer, xOffset, yOffset, TEXT_SKIP_DRAW, NULL); } // Print play time yOffset += 16; AddTextPrinterParameterized(sSaveInfoWindowId, FONT_NORMAL, gText_SavingTime, 0, yOffset, TEXT_SKIP_DRAW, NULL); - BufferSaveMenuText(SAVE_MENU_PLAY_TIME, gStringVar4, color); - xOffset = GetStringRightAlignXOffset(FONT_NORMAL, gStringVar4, 0x70); - AddTextPrinterParameterized(sSaveInfoWindowId, FONT_NORMAL, gStringVar4, xOffset, yOffset, TEXT_SKIP_DRAW, NULL); + BufferSaveMenuText(SAVE_MENU_PLAY_TIME, gStringVarBuffer, color); + xOffset = GetStringRightAlignXOffset(FONT_NORMAL, gStringVarBuffer, 0x70); + AddTextPrinterParameterized(sSaveInfoWindowId, FONT_NORMAL, gStringVarBuffer, xOffset, yOffset, TEXT_SKIP_DRAW, NULL); CopyWindowToVram(sSaveInfoWindowId, COPYWIN_GFX); } diff --git a/src/string_util.c b/src/string_util.c index d515c14cdaf..aeb41962bf6 100644 --- a/src/string_util.c +++ b/src/string_util.c @@ -6,7 +6,7 @@ EWRAM_DATA u8 gStringVar1[0x100] = {0}; EWRAM_DATA u8 gStringVar2[0x100] = {0}; EWRAM_DATA u8 gStringVar3[0x100] = {0}; -EWRAM_DATA u8 gStringVar4[0x3E8] = {0}; +EWRAM_DATA u8 gStringVarBuffer[0x3E8] = {0}; EWRAM_DATA static u8 sUnknownStringVar[16] = {0}; static const u8 sDigits[] = __("0123456789ABCDEF"); diff --git a/src/trade.c b/src/trade.c index e07e418d1ad..236d978de78 100644 --- a/src/trade.c +++ b/src/trade.c @@ -3465,8 +3465,8 @@ static bool8 DoTradeAnim_Cable(void) } break; case STATE_SEND_MSG: - StringExpandPlaceholders(gStringVar4, gText_XWillBeSentToY); - DrawTextOnTradeWindow(0, gStringVar4, 0); + StringExpandPlaceholders(gStringVarBuffer, gText_XWillBeSentToY); + DrawTextOnTradeWindow(0, gStringVarBuffer, 0); if (sTradeAnim->monSpecies[TRADE_PLAYER] != SPECIES_EGG) PlayCry_Normal(sTradeAnim->monSpecies[TRADE_PLAYER], 0); @@ -3479,8 +3479,8 @@ static bool8 DoTradeAnim_Cable(void) { sTradeAnim->releasePokeballSpriteId = CreateTradePokeballSprite(sTradeAnim->monSpriteIds[TRADE_PLAYER], gSprites[sTradeAnim->monSpriteIds[TRADE_PLAYER]].oam.paletteNum, 120, 32, 2, 1, 0x14, 0xfffff); sTradeAnim->state++; - StringExpandPlaceholders(gStringVar4, gText_ByeByeVar1); - DrawTextOnTradeWindow(0, gStringVar4, 0); + StringExpandPlaceholders(gStringVarBuffer, gText_ByeByeVar1); + DrawTextOnTradeWindow(0, gStringVarBuffer, 0); } break; case STATE_POKEBALL_DEPART: @@ -3828,8 +3828,8 @@ static bool8 DoTradeAnim_Cable(void) DISPCNT_BG0_ON | DISPCNT_BG2_ON | DISPCNT_OBJ_ON); - StringExpandPlaceholders(gStringVar4, gText_XSentOverY); - DrawTextOnTradeWindow(0, gStringVar4, 0); + StringExpandPlaceholders(gStringVarBuffer, gText_XSentOverY); + DrawTextOnTradeWindow(0, gStringVarBuffer, 0); sTradeAnim->state = STATE_DELAY_FOR_MON_ANIM; sTradeAnim->timer = 0; break; @@ -3851,8 +3851,8 @@ static bool8 DoTradeAnim_Cable(void) if (sTradeAnim->timer == 250) { sTradeAnim->state++; - StringExpandPlaceholders(gStringVar4, gText_TakeGoodCareOfX); - DrawTextOnTradeWindow(0, gStringVar4, 0); + StringExpandPlaceholders(gStringVarBuffer, gText_TakeGoodCareOfX); + DrawTextOnTradeWindow(0, gStringVarBuffer, 0); sTradeAnim->timer = 0; } break; @@ -3936,8 +3936,8 @@ static bool8 DoTradeAnim_Wireless(void) } break; case STATE_SEND_MSG: - StringExpandPlaceholders(gStringVar4, gText_XWillBeSentToY); - DrawTextOnTradeWindow(0, gStringVar4, 0); + StringExpandPlaceholders(gStringVarBuffer, gText_XWillBeSentToY); + DrawTextOnTradeWindow(0, gStringVarBuffer, 0); if (sTradeAnim->monSpecies[TRADE_PLAYER] != SPECIES_EGG) PlayCry_Normal(sTradeAnim->monSpecies[TRADE_PLAYER], 0); @@ -3950,8 +3950,8 @@ static bool8 DoTradeAnim_Wireless(void) { sTradeAnim->releasePokeballSpriteId = CreateTradePokeballSprite(sTradeAnim->monSpriteIds[TRADE_PLAYER], gSprites[sTradeAnim->monSpriteIds[TRADE_PLAYER]].oam.paletteNum, 120, 32, 2, 1, 0x14, 0xfffff); sTradeAnim->state++; - StringExpandPlaceholders(gStringVar4, gText_ByeByeVar1); - DrawTextOnTradeWindow(0, gStringVar4, 0); + StringExpandPlaceholders(gStringVarBuffer, gText_ByeByeVar1); + DrawTextOnTradeWindow(0, gStringVarBuffer, 0); } break; case STATE_POKEBALL_DEPART: @@ -4325,8 +4325,8 @@ static bool8 DoTradeAnim_Wireless(void) DISPCNT_BG0_ON | DISPCNT_BG2_ON | DISPCNT_OBJ_ON); - StringExpandPlaceholders(gStringVar4, gText_XSentOverY); - DrawTextOnTradeWindow(0, gStringVar4, 0); + StringExpandPlaceholders(gStringVarBuffer, gText_XSentOverY); + DrawTextOnTradeWindow(0, gStringVarBuffer, 0); sTradeAnim->state = STATE_DELAY_FOR_MON_ANIM; sTradeAnim->timer = 0; break; @@ -4348,8 +4348,8 @@ static bool8 DoTradeAnim_Wireless(void) if (sTradeAnim->timer == 250) { sTradeAnim->state++; - StringExpandPlaceholders(gStringVar4, gText_TakeGoodCareOfX); - DrawTextOnTradeWindow(0, gStringVar4, 0); + StringExpandPlaceholders(gStringVarBuffer, gText_TakeGoodCareOfX); + DrawTextOnTradeWindow(0, gStringVarBuffer, 0); sTradeAnim->timer = 0; } break; @@ -4679,8 +4679,8 @@ static void CB2_SaveAndEndTrade(void) { case 0: gMain.state++; - StringExpandPlaceholders(gStringVar4, gText_CommunicationStandby5); - DrawTextOnTradeWindow(0, gStringVar4, 0); + StringExpandPlaceholders(gStringVarBuffer, gText_CommunicationStandby5); + DrawTextOnTradeWindow(0, gStringVarBuffer, 0); break; case 1: SetTradeLinkStandbyCallback(0); @@ -4702,8 +4702,8 @@ static void CB2_SaveAndEndTrade(void) break; case 2: gMain.state = 50; - StringExpandPlaceholders(gStringVar4, gText_SavingDontTurnOffPower); - DrawTextOnTradeWindow(0, gStringVar4, 0); + StringExpandPlaceholders(gStringVarBuffer, gText_SavingDontTurnOffPower); + DrawTextOnTradeWindow(0, gStringVarBuffer, 0); break; case 50: if (!InUnionRoom()) @@ -4994,8 +4994,8 @@ static void CB2_SaveAndEndWirelessTrade(void) { case 0: gMain.state = 1; - StringExpandPlaceholders(gStringVar4, gText_CommunicationStandby5); - DrawTextOnTradeWindow(0, gStringVar4, 0); + StringExpandPlaceholders(gStringVarBuffer, gText_CommunicationStandby5); + DrawTextOnTradeWindow(0, gStringVarBuffer, 0); break; case 1: SetTradeLinkStandbyCallback(0); @@ -5006,8 +5006,8 @@ static void CB2_SaveAndEndWirelessTrade(void) if (_IsLinkTaskFinished()) { gMain.state = 3; - StringExpandPlaceholders(gStringVar4, gText_SavingDontTurnOffPower); - DrawTextOnTradeWindow(0, gStringVar4, 0); + StringExpandPlaceholders(gStringVarBuffer, gText_SavingDontTurnOffPower); + DrawTextOnTradeWindow(0, gStringVarBuffer, 0); IncrementGameStat(GAME_STAT_POKEMON_TRADES); LinkFullSave_Init(); sTradeAnim->timer = 0; diff --git a/src/trainer_card.c b/src/trainer_card.c index 1535c3d997b..135729b88f7 100755 --- a/src/trainer_card.c +++ b/src/trainer_card.c @@ -1046,18 +1046,18 @@ static void PrintMoneyOnCard(void) AddTextPrinterParameterized3(WIN_CARD_TEXT, FONT_NORMAL, 16, 57, sTrainerCardTextColors, TEXT_SKIP_DRAW, gText_TrainerCardMoney); ConvertIntToDecimalStringN(gStringVar1, sData->trainerCard.money, STR_CONV_MODE_LEFT_ALIGN, 6); - StringExpandPlaceholders(gStringVar4, gText_PokedollarVar1); + StringExpandPlaceholders(gStringVarBuffer, gText_PokedollarVar1); if (!sData->isHoenn) { - xOffset = GetStringRightAlignXOffset(FONT_NORMAL, gStringVar4, 144); + xOffset = GetStringRightAlignXOffset(FONT_NORMAL, gStringVarBuffer, 144); top = 56; } else { - xOffset = GetStringRightAlignXOffset(FONT_NORMAL, gStringVar4, 128); + xOffset = GetStringRightAlignXOffset(FONT_NORMAL, gStringVarBuffer, 128); top = 57; } - AddTextPrinterParameterized3(WIN_CARD_TEXT, FONT_NORMAL, xOffset, top, sTrainerCardTextColors, TEXT_SKIP_DRAW, gStringVar4); + AddTextPrinterParameterized3(WIN_CARD_TEXT, FONT_NORMAL, xOffset, top, sTrainerCardTextColors, TEXT_SKIP_DRAW, gStringVarBuffer); } static u16 GetCaughtMonsCount(void) @@ -1078,18 +1078,18 @@ static void PrintPokedexOnCard(void) AddTextPrinterParameterized3(WIN_CARD_TEXT, FONT_NORMAL, 20, 72, sTrainerCardTextColors, TEXT_SKIP_DRAW, gText_TrainerCardPokedex); else AddTextPrinterParameterized3(WIN_CARD_TEXT, FONT_NORMAL, 16, 73, sTrainerCardTextColors, TEXT_SKIP_DRAW, gText_TrainerCardPokedex); - StringCopy(ConvertIntToDecimalStringN(gStringVar4, sData->trainerCard.caughtMonsCount, STR_CONV_MODE_LEFT_ALIGN, 3), gText_EmptyString6); + StringCopy(ConvertIntToDecimalStringN(gStringVarBuffer, sData->trainerCard.caughtMonsCount, STR_CONV_MODE_LEFT_ALIGN, 3), gText_EmptyString6); if (!sData->isHoenn) { - xOffset = GetStringRightAlignXOffset(FONT_NORMAL, gStringVar4, 144); + xOffset = GetStringRightAlignXOffset(FONT_NORMAL, gStringVarBuffer, 144); top = 72; } else { - xOffset = GetStringRightAlignXOffset(FONT_NORMAL, gStringVar4, 128); + xOffset = GetStringRightAlignXOffset(FONT_NORMAL, gStringVarBuffer, 128); top = 73; } - AddTextPrinterParameterized3(WIN_CARD_TEXT, FONT_NORMAL, xOffset, top, sTrainerCardTextColors, TEXT_SKIP_DRAW, gStringVar4); + AddTextPrinterParameterized3(WIN_CARD_TEXT, FONT_NORMAL, xOffset, top, sTrainerCardTextColors, TEXT_SKIP_DRAW, gStringVarBuffer); } } @@ -1138,13 +1138,13 @@ static void PrintTimeOnCard(void) x -= totalWidth; FillWindowPixelRect(WIN_CARD_TEXT, PIXEL_FILL(0), x, y, totalWidth, 15); - ConvertIntToDecimalStringN(gStringVar4, hours, STR_CONV_MODE_RIGHT_ALIGN, 3); - AddTextPrinterParameterized3(WIN_CARD_TEXT, FONT_NORMAL, x, y, sTrainerCardTextColors, TEXT_SKIP_DRAW, gStringVar4); + ConvertIntToDecimalStringN(gStringVarBuffer, hours, STR_CONV_MODE_RIGHT_ALIGN, 3); + AddTextPrinterParameterized3(WIN_CARD_TEXT, FONT_NORMAL, x, y, sTrainerCardTextColors, TEXT_SKIP_DRAW, gStringVarBuffer); x += 18; AddTextPrinterParameterized3(WIN_CARD_TEXT, FONT_NORMAL, x, y, sTimeColonTextColors[sData->timeColonInvisible], TEXT_SKIP_DRAW, gText_Colon2); x += width; - ConvertIntToDecimalStringN(gStringVar4, minutes, STR_CONV_MODE_LEADING_ZEROS, 2); - AddTextPrinterParameterized3(WIN_CARD_TEXT, FONT_NORMAL, x, y, sTrainerCardTextColors, TEXT_SKIP_DRAW, gStringVar4); + ConvertIntToDecimalStringN(gStringVarBuffer, minutes, STR_CONV_MODE_LEADING_ZEROS, 2); + AddTextPrinterParameterized3(WIN_CARD_TEXT, FONT_NORMAL, x, y, sTrainerCardTextColors, TEXT_SKIP_DRAW, gStringVarBuffer); } static void PrintProfilePhraseOnCard(void) @@ -1231,8 +1231,8 @@ static void PrintLinkBattleResultsOnCard(void) { StringCopy(gStringVar1, sData->textLinkBattleWins); StringCopy(gStringVar2, sData->textLinkBattleLosses); - StringExpandPlaceholders(gStringVar4, gText_WinsLosses); - PrintStatOnBackOfCard(1, sData->textLinkBattleType, gStringVar4, sTrainerCardTextColors); + StringExpandPlaceholders(gStringVarBuffer, gText_WinsLosses); + PrintStatOnBackOfCard(1, sData->textLinkBattleType, gStringVarBuffer, sTrainerCardTextColors); } } diff --git a/src/trainer_hill.c b/src/trainer_hill.c index 018b9f14ba5..ee35a88880f 100644 --- a/src/trainer_hill.c +++ b/src/trainer_hill.c @@ -605,9 +605,9 @@ void PrintOnTrainerHillRecordsWindow(void) ConvertIntToDecimalStringN(gStringVar2, secondsWhole, STR_CONV_MODE_RIGHT_ALIGN, 2); secondsFraction = (total * 168) / 100; ConvertIntToDecimalStringN(gStringVar3, secondsFraction, STR_CONV_MODE_LEADING_ZEROS, 2); - StringExpandPlaceholders(StringCopy(gStringVar4, gText_TimeCleared), gText_XMinYDotZSec); - x = GetStringRightAlignXOffset(FONT_NORMAL, gStringVar4, 0xD0); - AddTextPrinterParameterized3(0, FONT_NORMAL, x, y, sRecordWinColors, TEXT_SKIP_DRAW, gStringVar4); + StringExpandPlaceholders(StringCopy(gStringVarBuffer, gText_TimeCleared), gText_XMinYDotZSec); + x = GetStringRightAlignXOffset(FONT_NORMAL, gStringVarBuffer, 0xD0); + AddTextPrinterParameterized3(0, FONT_NORMAL, x, y, sRecordWinColors, TEXT_SKIP_DRAW, gStringVarBuffer); y += 17; } diff --git a/src/tv.c b/src/tv.c index 26d568642f9..f289a3698ee 100644 --- a/src/tv.c +++ b/src/tv.c @@ -4807,13 +4807,13 @@ static void DoTVShowPokemonFanClubLetter(void) TVShowDone(); break; case 50: - ConvertEasyChatWordsToString(gStringVar4, show->fanclubLetter.words, 2, 2); - ShowFieldMessage(gStringVar4); + ConvertEasyChatWordsToString(gStringVarBuffer, show->fanclubLetter.words, 2, 2); + ShowFieldMessage(gStringVarBuffer); sTVShowState = 1; return; case 51: - ConvertEasyChatWordsToString(gStringVar4, show->fanclubLetter.words, 2, 2); - ShowFieldMessage(gStringVar4); + ConvertEasyChatWordsToString(gStringVarBuffer, show->fanclubLetter.words, 2, 2); + ShowFieldMessage(gStringVarBuffer); sTVShowState = 3; return; } @@ -4847,8 +4847,8 @@ static void DoTVShowRecentHappenings(void) TVShowDone(); break; case 50: - ConvertEasyChatWordsToString(gStringVar4, show->recentHappenings.words, 2, 2); - ShowFieldMessage(gStringVar4); + ConvertEasyChatWordsToString(gStringVarBuffer, show->recentHappenings.words, 2, 2); + ShowFieldMessage(gStringVarBuffer); sTVShowState = 1; return; } diff --git a/src/union_room.c b/src/union_room.c index 1b29863183c..1c8e8a4ebc5 100644 --- a/src/union_room.c +++ b/src/union_room.c @@ -341,10 +341,10 @@ static void GetAwaitingCommunicationText(u8 *dst, u8 activity) case ACTIVITY_CONTEST_CUTE: case ACTIVITY_CONTEST_SMART: case ACTIVITY_CONTEST_TOUGH: - // BUG: argument *dst isn't used, instead it always prints to gStringVar4 - // not an issue in practice since Gamefreak never used any other arguments here besides gStringVar4 + // BUG: argument *dst isn't used, instead it always prints to gStringVarBuffer + // not an issue in practice since Gamefreak never used any other arguments here besides gStringVarBuffer #ifndef BUGFIX - StringExpandPlaceholders(gStringVar4, sText_AwaitingCommunication); + StringExpandPlaceholders(gStringVarBuffer, sText_AwaitingCommunication); #else StringExpandPlaceholders(dst, sText_AwaitingCommunication); #endif @@ -453,20 +453,20 @@ static void Task_TryBecomeLinkLeader(u8 taskId) if (GROUP_MIN(sPlayerActivityGroupSize) != 0) { if (data->playerCount > GROUP_MIN(sPlayerActivityGroupSize) - 1 && GROUP_MAX(sPlayerActivityGroupSize) != 0) - StringExpandPlaceholders(gStringVar4, sText_AwaitingLinkPressStart); + StringExpandPlaceholders(gStringVarBuffer, sText_AwaitingLinkPressStart); else - StringExpandPlaceholders(gStringVar4, sText_AwaitingCommunication); + StringExpandPlaceholders(gStringVarBuffer, sText_AwaitingCommunication); } else { - GetAwaitingCommunicationText(gStringVar4, gPlayerCurrActivity); + GetAwaitingCommunicationText(gStringVarBuffer, gPlayerCurrActivity); } PrintNumPlayersWaitingForMsg(data->nPlayerModeWindowId, sPlayerActivityGroupSize, data->playerCount); data->state = LL_STATE_PRINT_AWAITING_PLAYERS; break; case LL_STATE_PRINT_AWAITING_PLAYERS: - if (PrintOnTextbox(&data->textState, gStringVar4)) + if (PrintOnTextbox(&data->textState, gStringVarBuffer)) data->state = LL_STATE_AWAIT_PLAYERS; break; case LL_STATE_AWAIT_PLAYERS: @@ -527,7 +527,7 @@ static void Task_TryBecomeLinkLeader(u8 taskId) } break; case LL_STATE_ACCEPT_NEW_MEMBER_PROMPT: - if (PrintOnTextbox(&data->textState, gStringVar4)) + if (PrintOnTextbox(&data->textState, gStringVarBuffer)) { data->state = LL_STATE_ACCEPT_NEW_MEMBER_PROMPT_HANDLE_INPUT; } @@ -572,7 +572,7 @@ static void Task_TryBecomeLinkLeader(u8 taskId) else { CopyAndTranslatePlayerName(gStringVar1, &data->playerList->players[data->playerCount - 1]); - StringExpandPlaceholders(gStringVar4, sText_AnOKWasSentToPlayer); + StringExpandPlaceholders(gStringVarBuffer, sText_AnOKWasSentToPlayer); data->state = LL_STATE_ACCEPTED_FINAL_MEMBER; } @@ -603,7 +603,7 @@ static void Task_TryBecomeLinkLeader(u8 taskId) } break; case LL_STATE_ACCEPTED_FINAL_MEMBER: - if (PrintOnTextbox(&data->textState, gStringVar4)) + if (PrintOnTextbox(&data->textState, gStringVarBuffer)) data->state = LL_STATE_WAIT_AND_CONFIRM_MEMBERS; break; case LL_STATE_WAIT_AND_CONFIRM_MEMBERS: @@ -848,7 +848,7 @@ static bool8 Leader_SetStateIfMemberListChanged(struct WirelessLink_Leader *data PlaySE(SE_PC_LOGIN); RedrawListMenu(data->listTaskId); CopyAndTranslatePlayerName(gStringVar2, &data->playerList->players[data->playerCount]); - Leader_GetAcceptNewMemberPrompt(gStringVar4, gPlayerCurrActivity); + Leader_GetAcceptNewMemberPrompt(gStringVarBuffer, gPlayerCurrActivity); data->state = joinedState; break; case UNION_ROOM_SPAWN_OUT: @@ -1058,7 +1058,7 @@ static void Task_TryJoinLinkGroup(u8 taskId) } else { - StringCopy(gStringVar4, sCantTransmitToTrainerTexts[readyStatus - 1]); + StringCopy(gStringVarBuffer, sCantTransmitToTrainerTexts[readyStatus - 1]); data->state = LG_STATE_TRADE_NOT_READY; PlaySE(SE_POKENAV_ON); } @@ -1079,8 +1079,8 @@ static void Task_TryJoinLinkGroup(u8 taskId) } break; case LG_STATE_ASK_JOIN_GROUP: - GetYouAskedToJoinGroupPleaseWaitMessage(gStringVar4, gPlayerCurrActivity); - if (PrintOnTextbox(&data->textState, gStringVar4)) + GetYouAskedToJoinGroupPleaseWaitMessage(gStringVarBuffer, gPlayerCurrActivity); + if (PrintOnTextbox(&data->textState, gStringVarBuffer)) { CopyAndTranslatePlayerName(gStringVar1, &data->playerList->players[data->leaderId]); data->state = LG_STATE_MAIN; @@ -1129,8 +1129,8 @@ static void Task_TryJoinLinkGroup(u8 taskId) data->state = LG_STATE_DISCONNECTED; break; case RFU_STATUS_JOIN_GROUP_OK: - GetGroupLeaderSentAnOKMessage(gStringVar4, gPlayerCurrActivity); - if (PrintOnTextbox(&data->textState, gStringVar4)) + GetGroupLeaderSentAnOKMessage(gStringVarBuffer, gPlayerCurrActivity); + if (PrintOnTextbox(&data->textState, gStringVarBuffer)) { if (gPlayerCurrActivity == ACTIVITY_BATTLE_TOWER || gPlayerCurrActivity == ACTIVITY_BATTLE_TOWER_OPEN) { @@ -1140,14 +1140,14 @@ static void Task_TryJoinLinkGroup(u8 taskId) { RfuSetStatus(RFU_STATUS_WAIT_ACK_JOIN_GROUP, 0); StringCopy(gStringVar1, sLinkGroupActivityNameTexts[gPlayerCurrActivity]); - StringExpandPlaceholders(gStringVar4, sText_AwaitingOtherMembers); + StringExpandPlaceholders(gStringVarBuffer, sText_AwaitingOtherMembers); } } break; case RFU_STATUS_WAIT_ACK_JOIN_GROUP: if (data->delayBeforePrint > 240) { - if (PrintOnTextbox(&data->textState, gStringVar4)) + if (PrintOnTextbox(&data->textState, gStringVarBuffer)) { RfuSetStatus(RFU_STATUS_ACK_JOIN_GROUP, 0); data->delayBeforePrint = 0; @@ -1245,7 +1245,7 @@ static void Task_TryJoinLinkGroup(u8 taskId) } break; case LG_STATE_TRADE_NOT_READY_RETRY: - if (PrintOnTextbox(&data->textState, gStringVar4)) + if (PrintOnTextbox(&data->textState, gStringVarBuffer)) { gSpecialVar_Result = LINKUP_RETRY_ROLE_ASSIGN; data->state = LG_STATE_SHUTDOWN; @@ -1923,11 +1923,11 @@ static void Task_SendMysteryGift(u8 taskId) break; case 2: StringCopy(gStringVar1, sLinkGroupActivityNameTexts[gPlayerCurrActivity]); - GetAwaitingCommunicationText(gStringVar4, gPlayerCurrActivity); + GetAwaitingCommunicationText(gStringVarBuffer, gPlayerCurrActivity); data->state = 3; break; case 3: - MG_AddMessageTextPrinter(gStringVar4); + MG_AddMessageTextPrinter(gStringVarBuffer); data->state = 4; break; case 4: @@ -1950,7 +1950,7 @@ static void Task_SendMysteryGift(u8 taskId) data->state = 7; break; case 7: - switch (DoMysteryGiftYesNo(&data->textState, &data->yesNoWindowId, FALSE, gStringVar4)) + switch (DoMysteryGiftYesNo(&data->textState, &data->yesNoWindowId, FALSE, gStringVarBuffer)) { case 0: LoadWirelessStatusIndicatorSpriteGfx(); @@ -1979,7 +1979,7 @@ static void Task_SendMysteryGift(u8 taskId) RedrawListMenu(data->listTaskId); data->playerCount++; CopyAndTranslatePlayerName(gStringVar1, &data->playerList->players[data->playerCount - 1]); - StringExpandPlaceholders(gStringVar4, sText_AnOKWasSentToPlayer); + StringExpandPlaceholders(gStringVarBuffer, sText_AnOKWasSentToPlayer); data->state = 9; LinkRfu_StopManagerAndFinalizeSlots(); } @@ -2001,7 +2001,7 @@ static void Task_SendMysteryGift(u8 taskId) } break; case 9: - MG_AddMessageTextPrinter(gStringVar4); + MG_AddMessageTextPrinter(gStringVarBuffer); data->state = 10; break; case 10: @@ -2452,8 +2452,8 @@ static void ScheduleFieldMessageWithFollowupState(u32 nextState, const u8 *src) uroom->state = UR_STATE_PRINT_MSG; uroom->stateAfterPrint = nextState; - if (src != gStringVar4) - StringExpandPlaceholders(gStringVar4, src); + if (src != gStringVarBuffer) + StringExpandPlaceholders(gStringVarBuffer, src); } static void ScheduleFieldMessageAndExit(const u8 *src) @@ -2461,8 +2461,8 @@ static void ScheduleFieldMessageAndExit(const u8 *src) struct WirelessLink_URoom *uroom = sWirelessLinkMain.uRoom; uroom->state = UR_STATE_PRINT_AND_EXIT; - if (src != gStringVar4) - StringExpandPlaceholders(gStringVar4, src); + if (src != gStringVarBuffer) + StringExpandPlaceholders(gStringVarBuffer, src); } static void CopyPlayerListToBuffer(struct WirelessLink_URoom *uroom) @@ -2652,7 +2652,7 @@ static void Task_RunUnionRoom(u8 taskId) uroom->state = UR_STATE_TRY_COMMUNICATING; break; case 2: // Ask to join chat - ScheduleFieldMessageWithFollowupState(UR_STATE_RECV_JOIN_CHAT_REQUEST, gStringVar4); + ScheduleFieldMessageWithFollowupState(UR_STATE_RECV_JOIN_CHAT_REQUEST, gStringVarBuffer); break; } break; @@ -2724,7 +2724,7 @@ static void Task_RunUnionRoom(u8 taskId) { uroom->playerSendBuffer[0] = IN_UNION_ROOM; Rfu_SendPacket(uroom->playerSendBuffer); - StringCopy(gStringVar4, sIfYouWantToDoSomethingTexts[gLinkPlayers[0].gender]); + StringCopy(gStringVarBuffer, sIfYouWantToDoSomethingTexts[gLinkPlayers[0].gender]); uroom->state = UR_STATE_REQUEST_DECLINED; } else @@ -2746,7 +2746,7 @@ static void Task_RunUnionRoom(u8 taskId) } break; case UR_STATE_TRAINER_APPEARS_BUSY: - StringCopy(gStringVar4, sText_TrainerBattleBusy); + StringCopy(gStringVarBuffer, sText_TrainerBattleBusy); uroom->state = UR_STATE_CANCEL_REQUEST_PRINT_MSG; break; case UR_STATE_SEND_ACTIVITY_REQUEST: @@ -2773,7 +2773,7 @@ static void Task_RunUnionRoom(u8 taskId) case UR_STATE_WAIT_FOR_RESPONSE_TO_REQUEST: if (!gReceivedRemoteLinkPlayers) { - StringCopy(gStringVar4, sText_TrainerBattleBusy); // Redundant, will be copied again in next state + StringCopy(gStringVarBuffer, sText_TrainerBattleBusy); // Redundant, will be copied again in next state uroom->state = UR_STATE_TRAINER_APPEARS_BUSY; } else @@ -2783,7 +2783,7 @@ static void Task_RunUnionRoom(u8 taskId) { if (gPlayerCurrActivity == ACTIVITY_CARD) { - ViewURoomPartnerTrainerCard(gStringVar4, uroom, FALSE); + ViewURoomPartnerTrainerCard(gStringVarBuffer, uroom, FALSE); uroom->state = UR_STATE_PRINT_CARD_INFO; } else @@ -2794,7 +2794,7 @@ static void Task_RunUnionRoom(u8 taskId) else if (uroom->partnerYesNoResponse == (ACTIVITY_DECLINE | IN_UNION_ROOM)) { uroom->state = UR_STATE_REQUEST_DECLINED; - GetURoomActivityRejectMsg(gStringVar4, gPlayerCurrActivity | IN_UNION_ROOM, gLinkPlayers[0].gender); + GetURoomActivityRejectMsg(gStringVarBuffer, gPlayerCurrActivity | IN_UNION_ROOM, gLinkPlayers[0].gender); gPlayerCurrActivity = ACTIVITY_NONE; } } @@ -2806,7 +2806,7 @@ static void Task_RunUnionRoom(u8 taskId) ScheduleFieldMessageWithFollowupState(UR_STATE_HANDLE_DO_SOMETHING_PROMPT_INPUT, sHiDoSomethingTexts[id][playerGender]); break; case UR_STATE_PRINT_CARD_INFO: - if (PrintOnTextbox(&uroom->textState, gStringVar4)) + if (PrintOnTextbox(&uroom->textState, gStringVarBuffer)) { uroom->state = UR_STATE_WAIT_FINISH_READING_CARD; SetLinkStandbyCallback(); @@ -2821,7 +2821,7 @@ static void Task_RunUnionRoom(u8 taskId) { StringCopy(gStringVar1, gLinkPlayers[GetMultiplayerId() ^ 1].name); id = PlayerHasMetTrainerBefore(gLinkPlayers[1].trainerId, gLinkPlayers[1].name); - StringExpandPlaceholders(gStringVar4, sAwaitingResponseTexts[id]); + StringExpandPlaceholders(gStringVarBuffer, sAwaitingResponseTexts[id]); uroom->state = UR_STATE_PRINT_CONTACT_MSG; } else @@ -2917,12 +2917,12 @@ static void Task_RunUnionRoom(u8 taskId) uroom->state = UR_STATE_PRINT_CONTACT_MSG; StringCopy(gStringVar1, gLinkPlayers[1].name); id = PlayerHasMetTrainerBefore(gLinkPlayers[1].trainerId, gLinkPlayers[1].name); - StringExpandPlaceholders(gStringVar4, sPlayerContactedYouTexts[id]); + StringExpandPlaceholders(gStringVarBuffer, sPlayerContactedYouTexts[id]); } break; case UR_STATE_PRINT_CONTACT_MSG: ReceiveUnionRoomActivityPacket(uroom); - if (PrintOnTextbox(&uroom->textState, gStringVar4)) + if (PrintOnTextbox(&uroom->textState, gStringVarBuffer)) uroom->state = UR_STATE_HANDLE_CONTACT_DATA; break; case UR_STATE_HANDLE_CONTACT_DATA: @@ -2930,12 +2930,12 @@ static void Task_RunUnionRoom(u8 taskId) if (HandleContactFromOtherPlayer(uroom) && JOY_NEW(B_BUTTON)) { Rfu_DisconnectPlayerById(1); - StringCopy(gStringVar4, sText_ChatEnded); + StringCopy(gStringVarBuffer, sText_ChatEnded); uroom->state = UR_STATE_CANCEL_REQUEST_PRINT_MSG; } break; case UR_STATE_RECV_ACTIVITY_REQUEST: - ScheduleFieldMessageWithFollowupState(UR_STATE_HANDLE_ACTIVITY_REQUEST, gStringVar4); + ScheduleFieldMessageWithFollowupState(UR_STATE_HANDLE_ACTIVITY_REQUEST, gStringVarBuffer); break; case UR_STATE_HANDLE_ACTIVITY_REQUEST: switch (UnionRoomHandleYesNo(&uroom->textState, FALSE)) @@ -2956,7 +2956,7 @@ static void Task_RunUnionRoom(u8 taskId) uroom->playerSendBuffer[0] = ACTIVITY_DECLINE | IN_UNION_ROOM; Rfu_SendPacket(uroom->playerSendBuffer); uroom->state = UR_STATE_DECLINE_ACTIVITY_REQUEST; - StringCopy(gStringVar4, sText_NeedTwoMonsOfLevel30OrLower2); + StringCopy(gStringVarBuffer, sText_NeedTwoMonsOfLevel30OrLower2); } else { @@ -2967,7 +2967,7 @@ static void Task_RunUnionRoom(u8 taskId) else if (gPlayerCurrActivity == (ACTIVITY_CARD | IN_UNION_ROOM)) { Rfu_SendPacket(uroom->playerSendBuffer); - ViewURoomPartnerTrainerCard(gStringVar4, uroom, TRUE); + ViewURoomPartnerTrainerCard(gStringVarBuffer, uroom, TRUE); uroom->state = UR_STATE_PRINT_CARD_INFO; } else @@ -2981,7 +2981,7 @@ static void Task_RunUnionRoom(u8 taskId) uroom->playerSendBuffer[0] = ACTIVITY_DECLINE | IN_UNION_ROOM; Rfu_SendPacket(uroom->playerSendBuffer); uroom->state = UR_STATE_DECLINE_ACTIVITY_REQUEST; - GetYouDeclinedTheOfferMessage(gStringVar4, gPlayerCurrActivity); + GetYouDeclinedTheOfferMessage(gStringVarBuffer, gPlayerCurrActivity); break; } break; @@ -2993,7 +2993,7 @@ static void Task_RunUnionRoom(u8 taskId) if (!gReceivedRemoteLinkPlayers) { gPlayerCurrActivity = IN_UNION_ROOM; - ScheduleFieldMessageWithFollowupState(UR_STATE_CANCEL_REQUEST_RESTART_LINK, gStringVar4); + ScheduleFieldMessageWithFollowupState(UR_STATE_CANCEL_REQUEST_RESTART_LINK, gStringVarBuffer); memset(uroom->playerSendBuffer, 0, sizeof(uroom->playerSendBuffer)); uroom->recvActivityRequest[0] = 0; uroom->partnerYesNoResponse = 0; @@ -3004,8 +3004,8 @@ static void Task_RunUnionRoom(u8 taskId) HandleCancelActivity(FALSE); break; case UR_STATE_PRINT_START_ACTIVITY_MSG: - GetURoomActivityStartMsg(gStringVar4, gPlayerCurrActivity | IN_UNION_ROOM); - ScheduleFieldMessageWithFollowupState(UR_STATE_START_ACTIVITY_LINK, gStringVar4); + GetURoomActivityStartMsg(gStringVarBuffer, gPlayerCurrActivity | IN_UNION_ROOM); + ScheduleFieldMessageWithFollowupState(UR_STATE_START_ACTIVITY_LINK, gStringVarBuffer); break; case UR_STATE_START_ACTIVITY_LINK: SetLinkStandbyCallback(); @@ -3046,15 +3046,15 @@ static void Task_RunUnionRoom(u8 taskId) { if (GetHostRfuGameData()->tradeSpecies == SPECIES_EGG) { - StringCopy(gStringVar4, sText_CancelRegistrationOfEgg); + StringCopy(gStringVarBuffer, sText_CancelRegistrationOfEgg); } else { StringCopy(gStringVar1, gSpeciesNames[GetHostRfuGameData()->tradeSpecies]); ConvertIntToDecimalStringN(gStringVar2, GetHostRfuGameData()->tradeLevel, STR_CONV_MODE_LEFT_ALIGN, 3); - StringExpandPlaceholders(gStringVar4, sText_CancelRegistrationOfMon); + StringExpandPlaceholders(gStringVarBuffer, sText_CancelRegistrationOfMon); } - ScheduleFieldMessageWithFollowupState(UR_STATE_CANCEL_REGISTRATION_PROMPT, gStringVar4); + ScheduleFieldMessageWithFollowupState(UR_STATE_CANCEL_REGISTRATION_PROMPT, gStringVarBuffer); } break; case UR_STATE_REGISTER_PROMPT: @@ -3232,7 +3232,7 @@ static void Task_RunUnionRoom(u8 taskId) uroom->state = UR_STATE_TRY_COMMUNICATING; break; case UR_STATE_PRINT_AND_EXIT: - if (PrintOnTextbox(&uroom->textState, gStringVar4)) + if (PrintOnTextbox(&uroom->textState, gStringVarBuffer)) { HandleCancelActivity(TRUE); UpdateUnionRoomMemberFacing(taskData[0], taskData[1], uroom->playerList); @@ -3240,7 +3240,7 @@ static void Task_RunUnionRoom(u8 taskId) } break; case UR_STATE_PRINT_MSG: - if (PrintOnTextbox(&uroom->textState, gStringVar4)) + if (PrintOnTextbox(&uroom->textState, gStringVarBuffer)) uroom->state = uroom->stateAfterPrint; break; } @@ -3269,7 +3269,7 @@ static bool32 HandleContactFromOtherPlayer(struct WirelessLink_URoom *uroom) { if (uroom->recvActivityRequest[0] != 0) { - s32 id = GetChatLeaderActionRequestMessage(gStringVar4, gLinkPlayers[1].gender, &uroom->recvActivityRequest[0], uroom); + s32 id = GetChatLeaderActionRequestMessage(gStringVarBuffer, gLinkPlayers[1].gender, &uroom->recvActivityRequest[0], uroom); if (id == 0) // Error { return TRUE; @@ -3585,7 +3585,7 @@ static bool32 UR_PrintFieldMessage(const u8 *src) { LoadMessageBoxAndBorderGfx(); DrawDialogueFrame(0, TRUE); - StringExpandPlaceholders(gStringVar4, src); + StringExpandPlaceholders(gStringVarBuffer, src); AddTextPrinterWithCustomSpeedForMessage(FALSE, 1); return FALSE; } @@ -3605,7 +3605,7 @@ static bool8 PrintOnTextbox(u8 *textState, const u8 *str) case 0: LoadMessageBoxAndBorderGfx(); DrawDialogueFrame(0, TRUE); - StringExpandPlaceholders(gStringVar4, str); + StringExpandPlaceholders(gStringVarBuffer, str); AddTextPrinterForMessage_2(TRUE); (*textState)++; break; @@ -3969,19 +3969,19 @@ static void PrintGroupMemberOnWindow(u8 windowId, u8 x, u8 y, struct RfuPlayer * u8 activity; u8 trainerId[6]; - ConvertIntToDecimalStringN(gStringVar4, id + 1, STR_CONV_MODE_LEADING_ZEROS, 2); - StringAppend(gStringVar4, sText_Colon); - PrintUnionRoomText(windowId, FONT_NORMAL, gStringVar4, x, y, UR_COLOR_DEFAULT); + ConvertIntToDecimalStringN(gStringVarBuffer, id + 1, STR_CONV_MODE_LEADING_ZEROS, 2); + StringAppend(gStringVarBuffer, sText_Colon); + PrintUnionRoomText(windowId, FONT_NORMAL, gStringVarBuffer, x, y, UR_COLOR_DEFAULT); x += 18; activity = player->rfu.data.activity; if (player->groupScheduledAnim == UNION_ROOM_SPAWN_IN && !(activity & IN_UNION_ROOM)) { - CopyAndTranslatePlayerName(gStringVar4, player); - PrintUnionRoomText(windowId, FONT_NORMAL, gStringVar4, x, y, colorIdx); + CopyAndTranslatePlayerName(gStringVarBuffer, player); + PrintUnionRoomText(windowId, FONT_NORMAL, gStringVarBuffer, x, y, colorIdx); ConvertIntToDecimalStringN(trainerId, player->rfu.data.compatibility.playerTrainerId[0] | (player->rfu.data.compatibility.playerTrainerId[1] << 8), STR_CONV_MODE_LEADING_ZEROS, 5); - StringCopy(gStringVar4, sText_ID); - StringAppend(gStringVar4, trainerId); - PrintUnionRoomText(windowId, FONT_NORMAL, gStringVar4, GetStringRightAlignXOffset(FONT_NORMAL, gStringVar4, 0x88), y, colorIdx); + StringCopy(gStringVarBuffer, sText_ID); + StringAppend(gStringVarBuffer, trainerId); + PrintUnionRoomText(windowId, FONT_NORMAL, gStringVarBuffer, GetStringRightAlignXOffset(FONT_NORMAL, gStringVarBuffer, 0x88), y, colorIdx); } } @@ -3991,12 +3991,12 @@ static void PrintGroupCandidateOnWindow(u8 windowId, u8 x, u8 y, struct RfuPlaye if (player->groupScheduledAnim == UNION_ROOM_SPAWN_IN) { - CopyAndTranslatePlayerName(gStringVar4, player); - PrintUnionRoomText(windowId, FONT_NORMAL, gStringVar4, x, y, colorIdx); + CopyAndTranslatePlayerName(gStringVarBuffer, player); + PrintUnionRoomText(windowId, FONT_NORMAL, gStringVarBuffer, x, y, colorIdx); ConvertIntToDecimalStringN(trainerId, player->rfu.data.compatibility.playerTrainerId[0] | (player->rfu.data.compatibility.playerTrainerId[1] << 8), STR_CONV_MODE_LEADING_ZEROS, 5); - StringCopy(gStringVar4, sText_ID); - StringAppend(gStringVar4, trainerId); - PrintUnionRoomText(windowId, FONT_NORMAL, gStringVar4, GetStringRightAlignXOffset(FONT_NORMAL, gStringVar4, 0x68), y, colorIdx); + StringCopy(gStringVarBuffer, sText_ID); + StringAppend(gStringVarBuffer, trainerId); + PrintUnionRoomText(windowId, FONT_NORMAL, gStringVarBuffer, GetStringRightAlignXOffset(FONT_NORMAL, gStringVarBuffer, 0x68), y, colorIdx); } } @@ -4052,7 +4052,7 @@ static s32 UnionRoomGetPlayerInteractionResponse(struct RfuPlayerList *list, boo metBefore = PlayerHasMetTrainerBefore(ReadAsU16(player->rfu.data.compatibility.playerTrainerId), gStringVar1); if (player->rfu.data.activity == (ACTIVITY_CHAT | IN_UNION_ROOM)) { - StringExpandPlaceholders(gStringVar4, sJoinChatTexts[metBefore][playerGender]); + StringExpandPlaceholders(gStringVarBuffer, sJoinChatTexts[metBefore][playerGender]); return 2; } else @@ -4071,19 +4071,19 @@ static s32 UnionRoomGetPlayerInteractionResponse(struct RfuPlayerList *list, boo switch (player->rfu.data.activity & 0x3F) { case ACTIVITY_BATTLE_SINGLE: - StringExpandPlaceholders(gStringVar4, sBattleReactionTexts[playerGender][Random() % ARRAY_COUNT(sBattleReactionTexts[0])]); + StringExpandPlaceholders(gStringVarBuffer, sBattleReactionTexts[playerGender][Random() % ARRAY_COUNT(sBattleReactionTexts[0])]); break; case ACTIVITY_TRADE: - StringExpandPlaceholders(gStringVar4, sTradeReactionTexts[playerGender][Random() % 2]); + StringExpandPlaceholders(gStringVarBuffer, sTradeReactionTexts[playerGender][Random() % 2]); break; case ACTIVITY_CHAT: - StringExpandPlaceholders(gStringVar4, sChatReactionTexts[playerGender][Random() % ARRAY_COUNT(sChatReactionTexts[0])]); + StringExpandPlaceholders(gStringVarBuffer, sChatReactionTexts[playerGender][Random() % ARRAY_COUNT(sChatReactionTexts[0])]); break; case ACTIVITY_CARD: - StringExpandPlaceholders(gStringVar4, sTrainerCardReactionTexts[playerGender][Random() % ARRAY_COUNT(sTrainerCardReactionTexts[0])]); + StringExpandPlaceholders(gStringVarBuffer, sTrainerCardReactionTexts[playerGender][Random() % ARRAY_COUNT(sTrainerCardReactionTexts[0])]); break; default: - StringExpandPlaceholders(gStringVar4, sText_TrainerAppearsBusy); + StringExpandPlaceholders(gStringVarBuffer, sText_TrainerAppearsBusy); break; } return 0; @@ -4462,7 +4462,7 @@ static void ViewURoomPartnerTrainerCard(u8 *unused, struct WirelessLink_URoom *d DynamicPlaceholderTextUtil_SetPlaceholderPtr(5, data->trainerCardStrBuffer[4]); DynamicPlaceholderTextUtil_ExpandPlaceholders(data->trainerCardMsgStrBuffer, sText_TrainerCardInfoPage1); - StringCopy(gStringVar4, data->trainerCardMsgStrBuffer); + StringCopy(gStringVarBuffer, data->trainerCardMsgStrBuffer); n = trainerCard->linkBattleWins; if (n > 9999) @@ -4486,17 +4486,17 @@ static void ViewURoomPartnerTrainerCard(u8 *unused, struct WirelessLink_URoom *d } DynamicPlaceholderTextUtil_ExpandPlaceholders(data->trainerCardMsgStrBuffer, sText_TrainerCardInfoPage2); - StringAppend(gStringVar4, data->trainerCardMsgStrBuffer); + StringAppend(gStringVarBuffer, data->trainerCardMsgStrBuffer); if (isParent == TRUE) { DynamicPlaceholderTextUtil_ExpandPlaceholders(data->trainerCardMsgStrBuffer, sText_FinishedCheckingPlayersTrainerCard); - StringAppend(gStringVar4, data->trainerCardMsgStrBuffer); + StringAppend(gStringVarBuffer, data->trainerCardMsgStrBuffer); } else if (isParent == FALSE) { DynamicPlaceholderTextUtil_ExpandPlaceholders(data->trainerCardMsgStrBuffer, sGladToMeetYouTexts[trainerCard->gender]); - StringAppend(gStringVar4, data->trainerCardMsgStrBuffer); + StringAppend(gStringVarBuffer, data->trainerCardMsgStrBuffer); } } diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c index c9d5c56e5c0..accbb23ccf5 100644 --- a/src/use_pokeblock.c +++ b/src/use_pokeblock.c @@ -870,10 +870,10 @@ static void AskUsePokeblock(void) GetMonData(&gPlayerParty[GetPartyIdFromSelectionId(sMenu->info.curSelection)], MON_DATA_NICKNAME, stringBuffer); StringGet_Nickname(stringBuffer); StringAppend(stringBuffer, gText_GetsAPokeBlockQuestion); - StringCopy(gStringVar4, stringBuffer); + StringCopy(gStringVarBuffer, stringBuffer); FillWindowPixelBuffer(WIN_TEXT, 17); DrawTextBorderOuter(WIN_TEXT, 151, 14); - AddTextPrinterParameterized(WIN_TEXT, FONT_NORMAL, gStringVar4, 0, 1, 0, NULL); + AddTextPrinterParameterized(WIN_TEXT, FONT_NORMAL, gStringVarBuffer, 0, 1, 0, NULL); PutWindowTilemap(WIN_TEXT); CopyWindowToVram(WIN_TEXT, COPYWIN_FULL); CreateYesNoMenu(&sUsePokeblockYesNoWinTemplate, 151, 14, 0); @@ -910,11 +910,11 @@ static void PrintFirstEnhancement(void) } if (sInfo->condition < CONDITION_COUNT) - BufferEnhancedText(gStringVar4, sInfo->condition, sInfo->enhancements[sInfo->condition]); + BufferEnhancedText(gStringVarBuffer, sInfo->condition, sInfo->enhancements[sInfo->condition]); else - BufferEnhancedText(gStringVar4, sInfo->condition, 0); + BufferEnhancedText(gStringVarBuffer, sInfo->condition, 0); - PrintMenuWindowText(gStringVar4); + PrintMenuWindowText(gStringVarBuffer); PutWindowTilemap(WIN_TEXT); CopyWindowToVram(WIN_TEXT, COPYWIN_FULL); } @@ -938,8 +938,8 @@ static bool8 TryPrintNextEnhancement(void) } } - BufferEnhancedText(gStringVar4, sInfo->condition, sInfo->enhancements[sInfo->condition]); - PrintMenuWindowText(gStringVar4); + BufferEnhancedText(gStringVarBuffer, sInfo->condition, sInfo->enhancements[sInfo->condition]); + PrintMenuWindowText(gStringVarBuffer); CopyWindowToVram(WIN_TEXT, COPYWIN_GFX); return TRUE; @@ -963,7 +963,7 @@ static void EraseMenuWindow(void) static void PrintMenuWindowText(const u8 *message) { - AddTextPrinterParameterized(WIN_TEXT, FONT_NORMAL, gStringVar4, 0, 1, 0, NULL); + AddTextPrinterParameterized(WIN_TEXT, FONT_NORMAL, gStringVarBuffer, 0, 1, 0, NULL); } static void BufferEnhancedText(u8 *dest, u8 condition, s16 enhancement) diff --git a/src/wireless_communication_status_screen.c b/src/wireless_communication_status_screen.c index 9a562cf7f7f..eba4c7cbfa1 100644 --- a/src/wireless_communication_status_screen.c +++ b/src/wireless_communication_status_screen.c @@ -312,11 +312,11 @@ static void Task_WirelessCommunicationScreen(u8 taskId) FillWindowPixelBuffer(WIN_GROUP_COUNTS, PIXEL_FILL(0)); for (i = 0; i < NUM_GROUPTYPES; i++) { - ConvertIntToDecimalStringN(gStringVar4, sStatusScreen->groupCounts[i], STR_CONV_MODE_RIGHT_ALIGN, 2); + ConvertIntToDecimalStringN(gStringVarBuffer, sStatusScreen->groupCounts[i], STR_CONV_MODE_RIGHT_ALIGN, 2); if (i != GROUPTYPE_TOTAL) - WCSS_AddTextPrinterParameterized(WIN_GROUP_COUNTS, FONT_NORMAL, gStringVar4, 12, 30 * i + 8, COLORMODE_WHITE_LGRAY); + WCSS_AddTextPrinterParameterized(WIN_GROUP_COUNTS, FONT_NORMAL, gStringVarBuffer, 12, 30 * i + 8, COLORMODE_WHITE_LGRAY); else - WCSS_AddTextPrinterParameterized(WIN_GROUP_COUNTS, FONT_NORMAL, gStringVar4, 12, 98, COLORMODE_RED); + WCSS_AddTextPrinterParameterized(WIN_GROUP_COUNTS, FONT_NORMAL, gStringVarBuffer, 12, 98, COLORMODE_RED); } PutWindowTilemap(WIN_GROUP_COUNTS); CopyWindowToVram(WIN_GROUP_COUNTS, COPYWIN_FULL);