1 files changed, 15 insertions, 15 deletions

diff --git a/src/pokemon_3.c b/src/pokemon_3.c
index 4814c900d..393d76dbc 100644
--- a/src/pokemon_3.c
+++ b/src/pokemon_3.c
@@ -40,9 +40,9 @@ extern u16 gSpeciesIdToCryId[];
 extern u8 gBattleTextBuff1[];
 extern u8 gBattleTextBuff2[];
 extern u8 gDisplayedStringBattle[];
-extern u8 gBankAttacker;
-extern u8 gBankTarget;
-extern u8 gStringBank;
+extern u8 gBattlerAttacker;
+extern u8 gBattlerTarget;
+extern u8 gPotentialItemEffectBattler;
 extern u8 gBankInMenu;
 extern struct SpindaSpot gSpindaSpotGraphics[];
 extern s8 gNatureStatTable[][5];
@@ -197,10 +197,10 @@ const u8 gUnknown_082082F8[] = {1, 1, 3, 2, 4, 6};
 
 void sub_803F324(int stat)
 {
-    gBankTarget = gBankInMenu;
+    gBattlerTarget = gBankInMenu;
     StringCopy(gBattleTextBuff1, gUnknown_08400F58[gUnknown_082082F8[stat]]);
     StringCopy(gBattleTextBuff2, BattleText_Rose);
-    StrCpyDecodeToDisplayedStringBattle(BattleText_UnknownString3);
+    BattleStringExpandPlaceholdersToDisplayedString(BattleText_UnknownString3);
 }
 
 u8 *sub_803F378(u16 itemId)
@@ -224,7 +224,7 @@ u8 *sub_803F378(u16 itemId)
         itemEffect = gItemEffectTable[itemId - 13];
     }
 
-    gStringBank = gBankInMenu;
+    gPotentialItemEffectBattler = gBankInMenu;
 
     for (i = 0; i < 3; i++)
     {
@@ -238,16 +238,16 @@ u8 *sub_803F378(u16 itemId)
             }
             else
             {
-                gBankAttacker = gBankInMenu;
-                StrCpyDecodeToDisplayedStringBattle(BattleText_GetPumped);
+                gBattlerAttacker = gBankInMenu;
+                BattleStringExpandPlaceholdersToDisplayedString(BattleText_GetPumped);
             }
         }
     }
 
     if (itemEffect[3] & 0x80)
     {
-        gBankAttacker = gBankInMenu;
-        StrCpyDecodeToDisplayedStringBattle(BattleText_MistShroud);
+        gBattlerAttacker = gBankInMenu;
+        BattleStringExpandPlaceholdersToDisplayedString(BattleText_MistShroud);
     }
 
     return gDisplayedStringBattle;
@@ -579,7 +579,7 @@ void EvolutionRenameMon(struct Pokemon *mon, u16 oldSpecies, u16 newSpecies)
 bool8 sub_803FBBC(void)
 {
     bool8 retVal = FALSE;
-    switch (gLinkPlayers[GetMultiplayerId()].lp_field_18)
+    switch (gLinkPlayers[GetMultiplayerId()].id)
     {
     case 0:
     case 3:
@@ -596,7 +596,7 @@ bool8 sub_803FBBC(void)
 bool8 sub_803FBFC(u8 id)
 {
     bool8 retVal = FALSE;
-    switch (gLinkPlayers[id].lp_field_18)
+    switch (gLinkPlayers[id].id)
     {
     case 0:
     case 3:
@@ -614,7 +614,7 @@ s32 sub_803FC34(u16 a1)
 {
     s32 id;
     for (id = 0; id < MAX_LINK_PLAYERS; id++)
-        if (gLinkPlayers[id].lp_field_18 == a1)
+        if (gLinkPlayers[id].id == a1)
             break;
     return id;
 }
@@ -1314,7 +1314,7 @@ void sub_8040B8C(void)
     gBattleTextBuff2[2] = gBankInMenu;
     gBattleTextBuff2[3] = pokemon_order_func(gBattlerPartyIndexes[gBankInMenu]);
     gBattleTextBuff2[4] = EOS;
-    StrCpyDecodeBattle(BattleText_PreventedSwitch, gStringVar4);
+    BattleStringExpandPlaceholders(BattleText_PreventedSwitch, gStringVar4);
 }
 
 void SetWildMonHeldItem(void)
@@ -1360,7 +1360,7 @@ bool8 IsShinyOtIdPersonality(u32 otId, u32 personality)
 u8 *sub_8040D08(void)
 {
     u8 id = GetMultiplayerId();
-    return gLinkPlayers[sub_803FC34(gLinkPlayers[id].lp_field_18 ^ 2)].name;
+    return gLinkPlayers[sub_803FC34(gLinkPlayers[id].id ^ 2)].name;
 }
 
 const u8 gJapaneseNidoranNames[][11] = {_("ニドラン♂"), _("ニドラン♀")};