Merge pull request #590 from huderlem/battle_9

Decompile battle_9

1 files changed, 18 insertions, 18 deletions

diff --git a/src/battle/battle_party_menu.c b/src/battle/battle_party_menu.c
index ed8cf4583..be376a9f1 100644
--- a/src/battle/battle_party_menu.c
+++ b/src/battle/battle_party_menu.c
@@ -31,8 +31,8 @@ extern void nullsub_14();
 extern u8 sub_803FBBC(void);
 
 extern u8 gPlayerPartyCount;
-extern u8 gNoOfAllBanks;
-extern u16 gBattlePartyID[];
+extern u8 gBattlersCount;
+extern u16 gBattlerPartyIndexes[];
 extern u8 gBankInMenu;
 extern u8 gUnknown_0202E8F4;
 extern u8 gUnknown_0202E8F5;
@@ -122,7 +122,7 @@ static void sub_8094998(u8 arg[3], u8 player_number)
         if (!IsDoubleBattle())
         {
             pos = 1;
-            *temp = gBattlePartyID[GetBankByIdentity(0)];
+            *temp = gBattlerPartyIndexes[GetBattlerAtPosition(0)];
             for (i = 0; i <= 5; i++)
                 if (i != *temp)
                     temp[pos++] = i;
@@ -130,8 +130,8 @@ static void sub_8094998(u8 arg[3], u8 player_number)
         else
         {
             pos = 2;
-            *temp = gBattlePartyID[GetBankByIdentity(0)];
-            temp[1] = gBattlePartyID[GetBankByIdentity(2)];
+            *temp = gBattlerPartyIndexes[GetBattlerAtPosition(0)];
+            temp[1] = gBattlerPartyIndexes[GetBattlerAtPosition(2)];
             for (i = 0; i <= 5; i++)
                 if ((i != *temp) && (i != temp[1]))
                     temp[pos++] = i;
@@ -145,15 +145,15 @@ static void sub_8094A74(u8 arg[3], u8 player_number, u32 arg3)
 {
     int i, j;
     u8 temp[6];
-    if (!GetBankSide(arg3))
+    if (!GetBattlerSide(arg3))
     {
-        i = GetBankByIdentity(0);
-        j = GetBankByIdentity(2);
+        i = GetBattlerAtPosition(0);
+        j = GetBattlerAtPosition(2);
     }
     else
     {
-        i = GetBankByIdentity(1);
-        j = GetBankByIdentity(3);
+        i = GetBattlerAtPosition(1);
+        j = GetBattlerAtPosition(3);
     }
     if (IsLinkDoubleBattle() == TRUE)
     {
@@ -175,7 +175,7 @@ static void sub_8094A74(u8 arg[3], u8 player_number, u32 arg3)
         if (!IsDoubleBattle())
         {
             int pos = 1;
-            *temp = gBattlePartyID[i];
+            *temp = gBattlerPartyIndexes[i];
             for (i = 0; i <= 5; i++)
                 if (i != *temp)
                     temp[pos++] = i;
@@ -183,8 +183,8 @@ static void sub_8094A74(u8 arg[3], u8 player_number, u32 arg3)
         else
         {
             int pos = 2;
-            *temp = gBattlePartyID[i];
-            temp[1] = gBattlePartyID[j];
+            *temp = gBattlerPartyIndexes[i];
+            temp[1] = gBattlerPartyIndexes[j];
             for (i = 0; i <= 5; i++)
                 if ((i != *temp) && (i != temp[1]))
                     temp[pos++] = i;
@@ -662,10 +662,10 @@ static void Task_BattlePartyMenuShift(u8 taskId)
         gTasks[taskId].func = Task_80954C0;
         return;
     }
-    for (i = 0; i < gNoOfAllBanks; i++)
+    for (i = 0; i < gBattlersCount; i++)
     {
-        if (GetBankSide(i) == 0
-         && sub_8094C20(partySelection) == gBattlePartyID[i])
+        if (GetBattlerSide(i) == 0
+         && sub_8094C20(partySelection) == gBattlerPartyIndexes[i])
         {
             sub_806D5A4();
             GetMonNickname(&gPlayerParty[partySelection], gStringVar1);
@@ -706,7 +706,7 @@ static void Task_BattlePartyMenuShift(u8 taskId)
         u8 r4 = gBankInMenu;
 
         sub_806D5A4();
-        r0 = pokemon_order_func(gBattlePartyID[r4]);
+        r0 = pokemon_order_func(gBattlerPartyIndexes[r4]);
         GetMonNickname(&gPlayerParty[r0], gStringVar1);
         StringExpandPlaceholders(gStringVar4, gOtherText_CantBeSwitched);
         sub_806E834(gStringVar4, 0);
@@ -715,7 +715,7 @@ static void Task_BattlePartyMenuShift(u8 taskId)
     }
     gUnknown_0202E8F5 = sub_8094C20(partySelection);
     gUnknown_0202E8F4 = 1;
-    r4 = pokemon_order_func(gBattlePartyID[gBankInMenu]);
+    r4 = pokemon_order_func(gBattlerPartyIndexes[gBankInMenu]);
     sub_8094C98(r4, partySelection);
     SwapPokemon(&gPlayerParty[r4], &gPlayerParty[partySelection]);
     gTasks[taskId].func = Task_809527C;