dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync/document the rest of strings.c

Browse Source
This commit is contained in:
GriffinR
2022-09-13 14:14:36 -04:00
parent 803c686569
commit 7b2da8e402
21 changed files with 372 additions and 374 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/party_menu.c
+11 -11
View File
@@ -1256,7 +1256,7 @@ static void HandleChooseMonCancel(u8 taskId, s8 *slotPtr)
static void DisplayCancelChooseMonYesNo(u8 taskId)
{
PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[1]);
StringExpandPlaceholders(gStringVar4, gUnknown_84176CF);
StringExpandPlaceholders(gStringVar4, gText_CancelBattle);
DisplayPartyMenuMessage(gStringVar4, TRUE);
gTasks[taskId].func = Task_CancelChooseMonYesNo;
}
@@ -1670,7 +1670,7 @@ static void BufferBagFullCantTakeItemMessage(u16 itemId)
switch (ItemId_GetPocket(itemId))
{
default:
string = gStartMenuText_Bag;
string = gText_MenuBag;
break;
case POCKET_TM_CASE:
string = ItemId_GetName(ITEM_TM_CASE);
@@ -2160,7 +2160,7 @@ static void CreateCancelConfirmWindows(bool8 chooseHalf)
{
confirmWindowId = AddWindow(&sConfirmButtonWindowTemplate);
FillWindowPixelBuffer(confirmWindowId, PIXEL_FILL(0));
AddTextPrinterParameterized4(confirmWindowId, FONT_0, (48 - GetStringWidth(FONT_0, gMenuText_Confirm, 0)) / 2u, 1, 0, 0, sFontColorTable[0], -1, gMenuText_Confirm);
AddTextPrinterParameterized4(confirmWindowId, FONT_0, (48 - GetStringWidth(FONT_0, gText_PartyMenu_OK, 0)) / 2u, 1, 0, 0, sFontColorTable[0], -1, gText_PartyMenu_OK);
PutWindowTilemap(confirmWindowId);
CopyWindowToVram(confirmWindowId, COPYWIN_GFX);
cancelWindowId = AddWindow(&sMultiCancelButtonWindowTemplate);
@@ -3789,12 +3789,12 @@ static void CursorCB_Enter(u8 taskId)
if (gPartyMenu.unk_8_6 == 2)
{
maxBattlers = 2;
str = gUnknown_8416B3E;
str = gText_NoMoreThanTwoMayEnter;
}
else
{
maxBattlers = 3;
str = gUnknown_8416B16;
str = gText_NoMoreThanThreeMayEnter;
}
PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[0]);
PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[1]);
@@ -4402,27 +4402,27 @@ static void GetMedicineItemEffectMessage(u16 item)
StringExpandPlaceholders(gStringVar4, gText_PkmnBecameHealthy);
break;
case ITEM_EFFECT_HP_EV:
StringCopy(gStringVar2, gText_HP3);
StringCopy(gStringVar2, gText_ItemEffect_HP);
StringExpandPlaceholders(gStringVar4, gText_PkmnBaseVar2StatIncreased);
break;
case ITEM_EFFECT_ATK_EV:
StringCopy(gStringVar2, gText_Attack3);
StringCopy(gStringVar2, gText_ItemEffect_Attack);
StringExpandPlaceholders(gStringVar4, gText_PkmnBaseVar2StatIncreased);
break;
case ITEM_EFFECT_DEF_EV:
StringCopy(gStringVar2, gText_Defense3);
StringCopy(gStringVar2, gText_ItemEffect_Defense);
StringExpandPlaceholders(gStringVar4, gText_PkmnBaseVar2StatIncreased);
break;
case ITEM_EFFECT_SPEED_EV:
StringCopy(gStringVar2, gText_Speed2);
StringCopy(gStringVar2, gText_ItemEffect_Speed);
StringExpandPlaceholders(gStringVar4, gText_PkmnBaseVar2StatIncreased);
break;
case ITEM_EFFECT_SPATK_EV:
StringCopy(gStringVar2, gText_SpAtk3);
StringCopy(gStringVar2, gText_ItemEffect_SpAtk);
StringExpandPlaceholders(gStringVar4, gText_PkmnBaseVar2StatIncreased);
break;
case ITEM_EFFECT_SPDEF_EV:
StringCopy(gStringVar2, gText_SpDef3);
StringCopy(gStringVar2, gText_ItemEffect_SpDef);
StringExpandPlaceholders(gStringVar4, gText_PkmnBaseVar2StatIncreased);
break;
case ITEM_EFFECT_PP_UP: