Battle labels named (#333)

* Changed battle labels

1 files changed, 36 insertions, 36 deletions

diff --git a/src/pokemon_3.c b/src/pokemon_3.c
index 9e69a3850..ef9a1698d 100644
--- a/src/pokemon_3.c
+++ b/src/pokemon_3.c
@@ -48,19 +48,19 @@ struct SpindaSpot
 extern u8 gPlayerPartyCount;
 extern u8 gEnemyPartyCount;
 extern struct BattlePokemon gBattleMons[4];
-extern u8 gUnknown_02024A60;
+extern u8 gActiveBank;
 extern struct BattleEnigmaBerry gEnigmaBerries[];
 extern u16 gSpeciesToHoennPokedexNum[];
 extern u16 gSpeciesToNationalPokedexNum[];
 extern u16 gHoennToNationalOrder[];
 extern u16 gSpeciesIdToCryId[];
-extern u8 gUnknown_030041C0[];
-extern u8 gUnknown_03004290[];
-extern u8 gUnknown_020238CC[];
-extern u8 gPlayerMonIndex;
-extern u8 gEnemyMonIndex;
-extern u8 gUnknown_02024C0B;
-extern u8 gUnknown_02024E6C;
+extern u8 gBattleTextBuff1[];
+extern u8 gBattleTextBuff2[];
+extern u8 gDisplayedStringBattle[];
+extern u8 gBankAttacker;
+extern u8 gBankTarget;
+extern u8 gStringBank;
+extern u8 gBankInMenu;
 extern struct SpindaSpot gSpindaSpotGraphics[];
 extern s8 gNatureStatTable[][5];
 extern s8 gUnknown_082082FE[][3];
@@ -71,9 +71,9 @@ extern u8 gBattleMonForms[];
 extern const u8 BattleText_Wally[];
 extern const u16 gHMMoves[];
 extern s8 gUnknown_083F7E28[];
-extern u8 byte_2024C06;
+extern u8 gLastUsedAbility;
 extern const u8 BattleText_PreventedSwitch[];
-extern u16 gUnknown_02024A6A[];
+extern u16 gBattlePartyID[];
 extern u8 gJapaneseNidoranNames[][11];
 
 extern u8 gUnknown_082082F8[];
@@ -119,7 +119,7 @@ u8 GetItemEffectParamOffset(u16 itemId, u8 effectByte, u8 effectBit)
 
     if (itemId == ITEM_ENIGMA_BERRY)
     {
-        temp = gEnigmaBerries[gUnknown_02024A60].itemEffect;
+        temp = gEnigmaBerries[gActiveBank].itemEffect;
     }
 
     itemEffect = temp;
@@ -216,10 +216,10 @@ u8 GetItemEffectParamOffset(u16 itemId, u8 effectByte, u8 effectBit)
 
 void sub_803F324(int stat)
 {
-    gEnemyMonIndex = gUnknown_02024E6C;
-    StringCopy(gUnknown_030041C0, gUnknown_08400F58[gUnknown_082082F8[stat]]);
-    StringCopy(gUnknown_03004290, gUnknown_083FFDB3);
-    get_battle_strings_(gUnknown_083FFDD3);
+    gBankTarget = gBankInMenu;
+    StringCopy(gBattleTextBuff1, gUnknown_08400F58[gUnknown_082082F8[stat]]);
+    StringCopy(gBattleTextBuff2, gUnknown_083FFDB3);
+    StrCpyDecodeToDisplayedStringBattle(gUnknown_083FFDD3);
 }
 
 u8 *sub_803F378(u16 itemId)
@@ -231,7 +231,7 @@ u8 *sub_803F378(u16 itemId)
     {
         if (gMain.inBattle)
         {
-            itemEffect = gEnigmaBerries[gUnknown_02024E6C].itemEffect;
+            itemEffect = gEnigmaBerries[gBankInMenu].itemEffect;
         }
         else
         {
@@ -243,7 +243,7 @@ u8 *sub_803F378(u16 itemId)
         itemEffect = (u8 *) gItemEffectTable[itemId - 13];
     }
 
-    gUnknown_02024C0B = gUnknown_02024E6C;
+    gStringBank = gBankInMenu;
 
     for (i = 0; i < 3; i++)
     {
@@ -257,19 +257,19 @@ u8 *sub_803F378(u16 itemId)
             }
             else
             {
-                gPlayerMonIndex = gUnknown_02024E6C;
-                get_battle_strings_(gUnknown_083FEE92);
+                gBankAttacker = gBankInMenu;
+                StrCpyDecodeToDisplayedStringBattle(gUnknown_083FEE92);
             }
         }
     }
 
     if (itemEffect[3] & 0x80)
     {
-        gPlayerMonIndex = gUnknown_02024E6C;
-        get_battle_strings_(gUnknown_083FEE5D);
+        gBankAttacker = gBankInMenu;
+        StrCpyDecodeToDisplayedStringBattle(gUnknown_083FEE5D);
     }
 
-    return gUnknown_020238CC;
+    return gDisplayedStringBattle;
 }
 
 u8 GetNature(struct Pokemon *mon)
@@ -1296,21 +1296,21 @@ void BoxMonRestorePP(struct BoxPokemon *boxMon)
 
 void sub_8040B8C(void)
 {
-    byte_2024C06 = BATTLE_STRUCT->filler1_2[0x37];
-    gUnknown_030041C0[0] = 0xFD;
-    gUnknown_030041C0[1] = 4;
-    gUnknown_030041C0[2] = BATTLE_STRUCT->filler1[0x34];
-    gUnknown_030041C0[4] = EOS;
-    if (!battle_side_get_owner(BATTLE_STRUCT->filler1[0x34]))
-        gUnknown_030041C0[3] = pokemon_order_func(gUnknown_02024A6A[BATTLE_STRUCT->filler1[0x34]]);
+    gLastUsedAbility = BATTLE_STRUCT->filler1_2[0x37];
+    gBattleTextBuff1[0] = 0xFD;
+    gBattleTextBuff1[1] = 4;
+    gBattleTextBuff1[2] = BATTLE_STRUCT->filler1[0x34];
+    gBattleTextBuff1[4] = EOS;
+    if (!GetBankSide(BATTLE_STRUCT->filler1[0x34]))
+        gBattleTextBuff1[3] = pokemon_order_func(gBattlePartyID[BATTLE_STRUCT->filler1[0x34]]);
     else
-        gUnknown_030041C0[3] = gUnknown_02024A6A[BATTLE_STRUCT->filler1[0x34]];
-    gUnknown_03004290[0] = 0xFD;
-    gUnknown_03004290[1] = 4;
-    gUnknown_03004290[2] = gUnknown_02024E6C;
-    gUnknown_03004290[3] = pokemon_order_func(gUnknown_02024A6A[gUnknown_02024E6C]);
-    gUnknown_03004290[4] = EOS;
-    sub_8120FFC(BattleText_PreventedSwitch, gStringVar4);
+        gBattleTextBuff1[3] = gBattlePartyID[BATTLE_STRUCT->filler1[0x34]];
+    gBattleTextBuff2[0] = 0xFD;
+    gBattleTextBuff2[1] = 4;
+    gBattleTextBuff2[2] = gBankInMenu;
+    gBattleTextBuff2[3] = pokemon_order_func(gBattlePartyID[gBankInMenu]);
+    gBattleTextBuff2[4] = EOS;
+    StrCpyDecodeBattle(BattleText_PreventedSwitch, gStringVar4);
 }
 
 void SetWildMonHeldItem(void)