Merge pull request #590 from huderlem/battle_9

Decompile battle_9

1 files changed, 26 insertions, 26 deletions

diff --git a/src/battle/pokeball.c b/src/battle/pokeball.c
index 20c6d8676..be2adbf1b 100644
--- a/src/battle/pokeball.c
+++ b/src/battle/pokeball.c
@@ -19,8 +19,8 @@
 extern struct MusicPlayerInfo gMPlay_BGM;
 extern u16 gBattleTypeFlags;
 extern u8 gBankTarget;
-extern u8 gActiveBank;
-extern u16 gBattlePartyID[];
+extern u8 gActiveBattler;
+extern u16 gBattlerPartyIndexes[];
 extern u8 gBankSpriteIds[];
 extern u8 gDoingBattleAnim;
 extern u8 gHealthboxIDs[];
@@ -333,11 +333,11 @@ u8 sub_8046400(u16 a, u8 b)
     u8 taskId;
 
     gDoingBattleAnim = 1;
-    ewram17810[gActiveBank].unk0_3 = 1;
+    ewram17810[gActiveBattler].unk0_3 = 1;
     taskId = CreateTask(sub_8046464, 5);
     gTasks[taskId].data[1] = a;
     gTasks[taskId].data[2] = b;
-    gTasks[taskId].data[3] = gActiveBank;
+    gTasks[taskId].data[3] = gActiveBattler;
     return 0;
 }
 
@@ -357,10 +357,10 @@ static void sub_8046464(u8 taskId)
     }
     r8 = gTasks[taskId].data[2];
     r5 = gTasks[taskId].data[3];
-    if (GetBankSide(r5) != 0)
-        ball = GetMonData(&gEnemyParty[gBattlePartyID[r5]], MON_DATA_POKEBALL);
+    if (GetBattlerSide(r5) != 0)
+        ball = GetMonData(&gEnemyParty[gBattlerPartyIndexes[r5]], MON_DATA_POKEBALL);
     else
-        ball = GetMonData(&gPlayerParty[gBattlePartyID[r5]], MON_DATA_POKEBALL);
+        ball = GetMonData(&gPlayerParty[gBattlerPartyIndexes[r5]], MON_DATA_POKEBALL);
     r4 = ball_number_to_ball_processing_index(ball);
     sub_80478DC(r4);
     spriteId = CreateSprite(&gBallSpriteTemplates[r4], 32, 80, 0x1D);
@@ -376,14 +376,14 @@ static void sub_8046464(u8 taskId)
         gSprites[spriteId].callback = sub_8047074;
         break;
     case 0xFE:
-        gSprites[spriteId].pos1.x = GetBankPosition(r5, 0);
-        gSprites[spriteId].pos1.y = GetBankPosition(r5, 1) + 24;
+        gSprites[spriteId].pos1.x = GetBattlerSpriteCoord(r5, 0);
+        gSprites[spriteId].pos1.y = GetBattlerSpriteCoord(r5, 1) + 24;
         gBankTarget = r5;
         gSprites[spriteId].data[0] = 0;
         gSprites[spriteId].callback = sub_8047254;
         break;
     default:
-        gBankTarget = GetBankByIdentity(1);
+        gBankTarget = GetBattlerAtPosition(1);
         sp0 = TRUE;
         break;
     }
@@ -394,8 +394,8 @@ static void sub_8046464(u8 taskId)
         return;
     }
     gSprites[spriteId].data[0] = 0x22;
-    gSprites[spriteId].data[2] = GetBankPosition(gBankTarget, 0);
-    gSprites[spriteId].data[4] = GetBankPosition(gBankTarget, 1) - 16;
+    gSprites[spriteId].data[2] = GetBattlerSpriteCoord(gBankTarget, 0);
+    gSprites[spriteId].data[4] = GetBattlerSpriteCoord(gBankTarget, 1) - 16;
     gSprites[spriteId].data[5] = -40;
     InitAnimSpriteTranslationOverDuration(&gSprites[spriteId]);
     gSprites[spriteId].oam.affineParam = taskId;
@@ -711,18 +711,18 @@ static void sub_8046C78(struct Sprite *sprite)
         u16 r4_2;
         u8 taskId;
 
-        if (GetBankSide(r5) != 0)
+        if (GetBattlerSide(r5) != 0)
         {
-            pkmn = &gEnemyParty[gBattlePartyID[r5]];
+            pkmn = &gEnemyParty[gBattlerPartyIndexes[r5]];
             r8 = 25;
         }
         else
         {
-            pkmn = &gPlayerParty[gBattlePartyID[r5]];
+            pkmn = &gPlayerParty[gBattlerPartyIndexes[r5]];
             r8 = -25;
         }
         species = GetMonData(pkmn, MON_DATA_SPECIES);
-        if ((r5 == GetBankByIdentity(0) || r5 == GetBankByIdentity(1))
+        if ((r5 == GetBattlerAtPosition(0) || r5 == GetBattlerAtPosition(1))
          && IsDoubleBattle() && ewram17840.unk9_0)
         {
             if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
@@ -737,7 +737,7 @@ static void sub_8046C78(struct Sprite *sprite)
         }
         if (!IsDoubleBattle() || !ewram17840.unk9_0)
             r4_2 = 0;
-        else if (r5 == GetBankByIdentity(0) || r5 == GetBankByIdentity(1))
+        else if (r5 == GetBattlerAtPosition(0) || r5 == GetBattlerAtPosition(1))
             r4_2 = 1;
         else
             r4_2 = 2;
@@ -830,8 +830,8 @@ static void sub_8046FBC(struct Sprite *sprite)
 static void sub_8047074(struct Sprite *sprite)
 {
     sprite->data[0] = 25;
-    sprite->data[2] = GetBankPosition(sprite->data[6], 2);
-    sprite->data[4] = GetBankPosition(sprite->data[6], 3) + 24;
+    sprite->data[2] = GetBattlerSpriteCoord(sprite->data[6], 2);
+    sprite->data[4] = GetBattlerSpriteCoord(sprite->data[6], 3) + 24;
     sprite->data[5] = -30;
     sprite->oam.affineParam = sprite->data[6];
     InitAnimSpriteTranslationOverDuration(sprite);
@@ -885,7 +885,7 @@ static void sub_80470C4(struct Sprite *sprite)
             sprite->data[6] = sprite->oam.affineParam & 0xFF;
             sprite->data[0] = 0;
             if (IsDoubleBattle() && ewram17840.unk9_0
-             && sprite->data[6] == GetBankByIdentity(2))
+             && sprite->data[6] == GetBattlerAtPosition(2))
                 sprite->callback = sub_8047230;
             else
                 sprite->callback = sub_8046C78;
@@ -910,7 +910,7 @@ static void sub_8047254(struct Sprite *sprite)
     {
         sprite->data[0] = 0;
         if (IsDoubleBattle() && ewram17840.unk9_0
-         && sprite->data[6] == GetBankByIdentity(3))
+         && sprite->data[6] == GetBattlerAtPosition(3))
             sprite->callback = sub_8047230;
         else
             sprite->callback = sub_8046C78;
@@ -1102,7 +1102,7 @@ void sub_804777C(u8 a)
     sprite->pos2.x = 0x73;
     sprite->pos2.y = 0;
     sprite->callback = sub_8047830;
-    if (GetBankSide(a) != 0)
+    if (GetBattlerSide(a) != 0)
     {
         sprite->data[0] = -sprite->data[0];
         sprite->data[1] = -sprite->data[1];
@@ -1110,7 +1110,7 @@ void sub_804777C(u8 a)
         sprite->pos2.y = -sprite->pos2.y;
     }
     gSprites[sprite->data[5]].callback(&gSprites[sprite->data[5]]);
-    if (GetBankIdentity(a) == 2)
+    if (GetBattlerPosition(a) == 2)
         sprite->callback = sub_804780C;
 }
 
@@ -1187,8 +1187,8 @@ void sub_804794C(u8 a)
 
 static u16 sub_8047978(u8 a)
 {
-    if (GetBankSide(a) == 0)
-        return GetMonData(&gPlayerParty[gBattlePartyID[a]], MON_DATA_POKEBALL);
+    if (GetBattlerSide(a) == 0)
+        return GetMonData(&gPlayerParty[gBattlerPartyIndexes[a]], MON_DATA_POKEBALL);
     else
-        return GetMonData(&gEnemyParty[gBattlePartyID[a]], MON_DATA_POKEBALL);
+        return GetMonData(&gEnemyParty[gBattlerPartyIndexes[a]], MON_DATA_POKEBALL);
 }