Decompile a bunch of battle_9

14 files changed, 57 insertions, 57 deletions

diff --git a/src/battle/anim/battle_intro.c b/src/battle/anim/battle_intro.c
index 01f823fa7..d96dc7ea8 100644
--- a/src/battle/anim/battle_intro.c
+++ b/src/battle/anim/battle_intro.c
@@ -466,7 +466,7 @@ void sub_80E4EF8(u8 left, u8 top, u8 c, u8 paletteNum, u16 e, u8 bgMap, u8 g)
     u32 tileNum;
     s32 x;
     s32 y;
-    u8 bank = GetBankByIdentity(c);
+    u8 bank = GetBattlerAtPosition(c);
 
     DmaCopy16(3, gUnknown_081FAF4C[c] + gBattleMonForms[bank] * 0x800, (void *)(VRAM + e), 0x800);
     tileNum = e / 32 - g * 512;
diff --git a/src/battle/anim/bug.c b/src/battle/anim/bug.c
index d57a1046e..b9e9da27f 100644
--- a/src/battle/anim/bug.c
+++ b/src/battle/anim/bug.c
@@ -205,7 +205,7 @@ void AnimTranslateStinger(struct Sprite *sprite)
     {
         if (GetBankSide(gAnimBankAttacker) == GetBankSide(gAnimBankTarget))
         {
-            if (GetBankIdentity(gAnimBankTarget) == 0 || GetBankIdentity(gAnimBankTarget) == 1)
+            if (GetBattlerPosition(gAnimBankTarget) == 0 || GetBattlerPosition(gAnimBankTarget) == 1)
             {
                 s16 temp1, temp2;
 
diff --git a/src/battle/anim/cutter.c b/src/battle/anim/cutter.c
index fed3598fc..a750ee2c1 100644
--- a/src/battle/anim/cutter.c
+++ b/src/battle/anim/cutter.c
@@ -24,7 +24,7 @@ static void AnimMoveTwisterParticleStep(struct Sprite* sprite);
 void AnimTranslateLinearSingleSineWave(struct Sprite* sprite)
 {
     InitAnimSpritePos(sprite, 1);
-    if (GetBankSide(gAnimBankAttacker) != SIDE_PLAYER)
+    if (GetBankSide(gAnimBankAttacker) != B_SIDE_PLAYER)
     {
         gBattleAnimArgs[2] = -gBattleAnimArgs[2];
     }
diff --git a/src/battle/anim/dark.c b/src/battle/anim/dark.c
index 055cf5802..b70d27d1d 100644
--- a/src/battle/anim/dark.c
+++ b/src/battle/anim/dark.c
@@ -21,7 +21,7 @@ extern u16 gBattle_BG2_X;
 extern u16 gBattle_BG2_Y;
 extern u16 gBattle_WIN0H;
 extern u16 gBattle_WIN0V;
-extern u16 gBattlePartyID[];
+extern u16 gBattlerPartyIndexes[];
 extern u8 gAnimMoveTurn;
 
 extern const u8 gUnknown_08D1D574[];
@@ -49,7 +49,7 @@ void sub_80DFC24(u8 taskId)
     bank = gAnimBankAttacker;
     gTasks[taskId].data[1] = 16;
     REG_BLDALPHA = 16;
-    if (GetBankIdentity_permutated(bank) == 1)
+    if (GetBattlerPosition_permutated(bank) == 1)
         REG_BLDCNT = 0x3F42;
     else
         REG_BLDCNT = 0x3F44;
@@ -112,7 +112,7 @@ void sub_80DFD58(u8 taskId)
 void sub_80DFDC0(u8 taskId)
 {
     REG_BLDALPHA = 0x1000;
-    if (GetBankIdentity_permutated(gAnimBankAttacker) == 1)
+    if (GetBattlerPosition_permutated(gAnimBankAttacker) == 1)
         REG_BLDCNT = 0x3F42;
     else
         REG_BLDCNT = 0x3F44;
@@ -267,12 +267,12 @@ void sub_80E00EC(u8 taskId)
     task->data[14] = pos - 32;
     task->data[15] = pos + 32;
 
-    if (GetBankSide(gAnimBankAttacker) == SIDE_PLAYER)
+    if (GetBankSide(gAnimBankAttacker) == B_SIDE_PLAYER)
         task->data[8] = -12;
     else
         task->data[8] = -64;
 
-    task->data[3] = GetBankIdentity_permutated(gAnimBankAttacker);
+    task->data[3] = GetBattlerPosition_permutated(gAnimBankAttacker);
     if (task->data[3] == 1)
     {
         sub_8078914(&subStruct);
@@ -403,7 +403,7 @@ void sub_80E03BC(u8 taskId)
         }
         else
         {
-            task->data[3] = GetBankIdentity_permutated(gAnimBankTarget);
+            task->data[3] = GetBattlerPosition_permutated(gAnimBankTarget);
             if (task->data[3] == 1)
             {
                 REG_BLDCNT = 0x3F42;
@@ -442,7 +442,7 @@ void sub_80E03BC(u8 taskId)
         task->data[14] = pos - 4;
         task->data[15] = pos + 4;
 
-        if (GetBankSide(gAnimBankTarget) == SIDE_PLAYER)
+        if (GetBankSide(gAnimBankTarget) == B_SIDE_PLAYER)
             task->data[8] = -12;
         else
             task->data[8] = -64;
@@ -791,7 +791,7 @@ static void sub_80E08CC(u8 priority)
 
 void sub_80E0918(u8 taskId)
 {
-    u8 toBG2 = GetBankIdentity_permutated(gAnimBankAttacker) ^ 1 ? 1 : 0;
+    u8 toBG2 = GetBattlerPosition_permutated(gAnimBankAttacker) ^ 1 ? 1 : 0;
     MoveBattlerSpriteToBG(gAnimBankAttacker, toBG2);
     gSprites[gBankSpriteIds[gAnimBankAttacker]].invisible = 0;
 
@@ -806,7 +806,7 @@ void sub_80E0918(u8 taskId)
 
 void sub_80E09C4(u8 taskId)
 {
-    u8 toBG2 = GetBankIdentity_permutated(gAnimBankAttacker) ^ 1 ? 1 : 0;
+    u8 toBG2 = GetBattlerPosition_permutated(gAnimBankAttacker) ^ 1 ? 1 : 0;
     sub_8076464(toBG2);
 
     if (IsAnimBankSpriteVisible(gAnimBankAttacker ^ 2))
@@ -847,7 +847,7 @@ void sub_80E0A4C(u8 taskId)
 
     if (IsDoubleBattle() && !IsContest())
     {
-        if (GetBankIdentity(gAnimBankAttacker) == 3 || GetBankIdentity(gAnimBankAttacker) == 0)
+        if (GetBattlerPosition(gAnimBankAttacker) == 3 || GetBattlerPosition(gAnimBankAttacker) == 0)
         {
             if (IsAnimBankSpriteVisible(gAnimBankAttacker ^ 2) == TRUE)
             {
@@ -864,10 +864,10 @@ void sub_80E0A4C(u8 taskId)
     }
     else
     {
-        if (GetBankSide(gAnimBankAttacker) != SIDE_PLAYER)
-            species = GetMonData(&gEnemyParty[gBattlePartyID[gAnimBankAttacker]], MON_DATA_SPECIES);
+        if (GetBankSide(gAnimBankAttacker) != B_SIDE_PLAYER)
+            species = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gAnimBankAttacker]], MON_DATA_SPECIES);
         else
-            species = GetMonData(&gPlayerParty[gBattlePartyID[gAnimBankAttacker]], MON_DATA_SPECIES);
+            species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gAnimBankAttacker]], MON_DATA_SPECIES);
     }
 
     spriteId = GetAnimBankSpriteId(0);
@@ -961,19 +961,19 @@ void sub_80E0E24(u8 taskId)
         spriteId = GetAnimBankSpriteId(gBattleAnimArgs[0]);
         break;
     case 4:
-        identity = IDENTITY_PLAYER_MON1;
+        identity = B_POSITION_PLAYER_LEFT;
         calcSpriteId = TRUE;
         break;
     case 5:
-        identity = IDENTITY_PLAYER_MON2;
+        identity = B_POSITION_PLAYER_RIGHT;
         calcSpriteId = TRUE;
         break;
     case 6:
-        identity = IDENTITY_OPPONENT_MON1;
+        identity = B_POSITION_OPPONENT_LEFT;
         calcSpriteId = TRUE;
         break;
     case 7:
-        identity = IDENTITY_OPPONENT_MON2;
+        identity = B_POSITION_OPPONENT_RIGHT;
         calcSpriteId = TRUE;
         break;
     default:
@@ -983,7 +983,7 @@ void sub_80E0E24(u8 taskId)
 
     if (calcSpriteId)
     {
-        bank = GetBankByIdentity(identity);
+        bank = GetBattlerAtPosition(identity);
         if (IsAnimBankSpriteVisible(bank))
             spriteId = gBankSpriteIds[bank];
         else
diff --git a/src/battle/anim/dragon.c b/src/battle/anim/dragon.c
index dc2c0bc50..e8e07c443 100644
--- a/src/battle/anim/dragon.c
+++ b/src/battle/anim/dragon.c
@@ -169,7 +169,7 @@ void sub_80DF924(u8 taskId)
     struct Task *task = &gTasks[taskId];
     u16 i;
     u8 r1;
-    if (GetBankIdentity_permutated(gAnimBankAttacker) == 1)
+    if (GetBattlerPosition_permutated(gAnimBankAttacker) == 1)
     {
         sp.dmaDest = &REG_BG1HOFS;
         task->data[2] = gBattle_BG1_X;
diff --git a/src/battle/anim/draw.c b/src/battle/anim/draw.c
index be3a280af..29b0c0ceb 100644
--- a/src/battle/anim/draw.c
+++ b/src/battle/anim/draw.c
@@ -32,7 +32,7 @@ void sub_80D0C88(u8 taskId)
     task->data[5] = 0;
     task->data[15] = sub_807A100(gAnimBankTarget, 0);
 
-    if (GetBankIdentity_permutated(gAnimBankTarget) == 1)
+    if (GetBattlerPosition_permutated(gAnimBankTarget) == 1)
     {
         task->data[6] = gBattle_BG1_X;
         params.dmaDest = (u16 *)REG_ADDR_BG1HOFS;
diff --git a/src/battle/anim/energy_wave.c b/src/battle/anim/energy_wave.c
index 8111f70a3..1889cfc67 100644
--- a/src/battle/anim/energy_wave.c
+++ b/src/battle/anim/energy_wave.c
@@ -130,7 +130,7 @@ void sub_80D3728(struct Sprite *sprite)
     {
         gBattleAnimArgs[0] *= -1;
 
-        if (GetBankIdentity(gAnimBankAttacker) == 0 || GetBankIdentity(gAnimBankAttacker) == 1)
+        if (GetBattlerPosition(gAnimBankAttacker) == 0 || GetBattlerPosition(gAnimBankAttacker) == 1)
         {
             gBattleAnimArgs[0] *= -1;
         }
diff --git a/src/battle/anim/evasion.c b/src/battle/anim/evasion.c
index ded8428d4..a441110f8 100644
--- a/src/battle/anim/evasion.c
+++ b/src/battle/anim/evasion.c
@@ -47,7 +47,7 @@ void sub_80CE7E0(u8 taskId)
     }
 
     task->func = sub_80CE910;
-    if (GetBankIdentity_permutated(gAnimBankAttacker) == 1)
+    if (GetBattlerPosition_permutated(gAnimBankAttacker) == 1)
     {
         REG_DISPCNT &= 0xFDFF;
     }
@@ -62,7 +62,7 @@ void sub_80CE910(u8 taskId)
     struct Task* task = &gTasks[taskId];
     if (!task->data[3])
     {
-        if (GetBankIdentity_permutated(gAnimBankAttacker) == 1)
+        if (GetBattlerPosition_permutated(gAnimBankAttacker) == 1)
             REG_DISPCNT |= 0x200;
         else
             REG_DISPCNT |= 0x400;
diff --git a/src/battle/anim/fight.c b/src/battle/anim/fight.c
index 0f46187f2..36a8a5008 100644
--- a/src/battle/anim/fight.c
+++ b/src/battle/anim/fight.c
@@ -21,7 +21,7 @@ extern u16 gBattle_BG3_X;
 extern u16 gBattle_BG3_Y;
 extern u16 gBattle_WIN0H;
 extern u16 gBattle_WIN0V;
-extern u16 gBattlePartyID[];
+extern u16 gBattlerPartyIndexes[];
 extern u8 gAnimMoveTurn;
 
 extern struct SpriteTemplate gBasicHitSplatSpriteTemplate;
@@ -50,7 +50,7 @@ void sub_080B08A0(struct Sprite *sprite)
 
 void sub_80D902C(struct Sprite *sprite)
 {
-    if (gBattleAnimArgs[7] == 1 && GetBankSide(gAnimBankAttacker) != SIDE_PLAYER)
+    if (gBattleAnimArgs[7] == 1 && GetBankSide(gAnimBankAttacker) != B_SIDE_PLAYER)
     {
         gBattleAnimArgs[1] = -gBattleAnimArgs[1];
         gBattleAnimArgs[3] = -gBattleAnimArgs[3];
@@ -196,12 +196,12 @@ static void sub_80D9328(struct Sprite *sprite)
 
 void sub_80D9378(struct Sprite *sprite)
 {
-    if ((gAnimBankAttacker ^ 2) == gAnimBankTarget && GetBankIdentity(gAnimBankTarget) < 2)
+    if ((gAnimBankAttacker ^ 2) == gAnimBankTarget && GetBattlerPosition(gAnimBankTarget) < 2)
         gBattleAnimArgs[0] *= -1;
 
     sub_8078764(sprite, 1);
 
-    if (GetBankSide(gAnimBankAttacker) != SIDE_PLAYER)
+    if (GetBankSide(gAnimBankAttacker) != B_SIDE_PLAYER)
         gBattleAnimArgs[2] = -gBattleAnimArgs[2];
 
     sprite->data[0] = gBattleAnimArgs[3];
@@ -538,7 +538,7 @@ void sub_80D9A38(struct Sprite *sprite)
 
     if (IsContest())
         sprite->oam.matrixNum |= 0x8;
-    else if (GetBankSide(bank) == SIDE_PLAYER)
+    else if (GetBankSide(bank) == B_SIDE_PLAYER)
         sprite->oam.matrixNum |= 0x18;
 
     sprite->data[0] = 16;
@@ -572,7 +572,7 @@ void sub_80D9B48(struct Sprite *sprite)
     sprite->data[4] = gBattleAnimArgs[2];
 
     turn = gAnimMoveTurn;
-    if (GetBankSide(gAnimBankTarget) == SIDE_PLAYER)
+    if (GetBankSide(gAnimBankTarget) == B_SIDE_PLAYER)
         turn++;
 
     if (turn & 1)
@@ -598,7 +598,7 @@ void sub_80D9BD4(struct Sprite *sprite)
     {
         StartSpriteAnim(sprite, 2);
     }
-    else if (GetBankSide(gAnimBankAttacker) != SIDE_PLAYER)
+    else if (GetBankSide(gAnimBankAttacker) != B_SIDE_PLAYER)
     {
         StartSpriteAnim(sprite, 1);
     }
@@ -644,7 +644,7 @@ void sub_80D9C80(u8 taskId)
 
     task->data[10] += 2816;
 
-    if (GetBankSide(gAnimBankTarget) == SIDE_PLAYER)
+    if (GetBankSide(gAnimBankTarget) == B_SIDE_PLAYER)
         gBattle_BG3_X += task->data[9] >> 8;
     else
         gBattle_BG3_X -= task->data[9] >> 8;
diff --git a/src/battle/anim/fire_2.c b/src/battle/anim/fire_2.c
index f9c9b6d3b..4378ff298 100644
--- a/src/battle/anim/fire_2.c
+++ b/src/battle/anim/fire_2.c
@@ -34,8 +34,8 @@ void sub_80D57C4(u8 spriteId, u8 taskId, u8 a3);
 void AnimEmberFlare(struct Sprite *sprite)
 {
     if (GetBankSide(gAnimBankAttacker) == GetBankSide(gAnimBankTarget)
-        && (gAnimBankAttacker == GetBankByIdentity(IDENTITY_PLAYER_MON2)
-            || gAnimBankAttacker == GetBankByIdentity(IDENTITY_OPPONENT_MON2)))
+        && (gAnimBankAttacker == GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT)
+            || gAnimBankAttacker == GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT)))
             gBattleAnimArgs[2] = -gBattleAnimArgs[2];
 
     sprite->callback = sub_8079534;
diff --git a/src/battle/anim/orbit.c b/src/battle/anim/orbit.c
index e7dd0df49..7bf5f647c 100644
--- a/src/battle/anim/orbit.c
+++ b/src/battle/anim/orbit.c
@@ -64,7 +64,7 @@ void sub_80CACEC(u8 taskId)
     }
     else
     {
-        if (GetBankIdentity_permutated(gAnimBankTarget) == 1)
+        if (GetBattlerPosition_permutated(gAnimBankTarget) == 1)
         {
             REG_BG2CNT_BITFIELD.priority = 3;
         }
diff --git a/src/battle/anim/psychic.c b/src/battle/anim/psychic.c
index 42f396870..2a9cd364e 100644
--- a/src/battle/anim/psychic.c
+++ b/src/battle/anim/psychic.c
@@ -38,7 +38,7 @@ void sub_80DC5F4(u8 taskId);
 
 void sub_80DB74C(struct Sprite *sprite)
 {
-    if (GetBankSide(gAnimBankAttacker) == SIDE_PLAYER || IsContest())
+    if (GetBankSide(gAnimBankAttacker) == B_SIDE_PLAYER || IsContest())
     {
         sprite->oam.priority = 2;
         sprite->subpriority = 200;
@@ -47,8 +47,8 @@ void sub_80DB74C(struct Sprite *sprite)
     if (!IsContest())
     {
         u8 bankCopy;
-        u8 bank = bankCopy = GetBankByIdentity(IDENTITY_OPPONENT_MON1);
-        u8 identity = GetBankIdentity_permutated(bank);
+        u8 bank = bankCopy = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
+        u8 identity = GetBattlerPosition_permutated(bank);
         int var0 = 1;
         u8 toBG_2 = (identity ^ var0) != 0;
 
@@ -62,7 +62,7 @@ void sub_80DB74C(struct Sprite *sprite)
 
     if (!IsContest() && IsDoubleBattle())
     {
-        if (GetBankSide(gAnimBankAttacker) == SIDE_PLAYER)
+        if (GetBankSide(gAnimBankAttacker) == B_SIDE_PLAYER)
         {
             sprite->pos1.x = 72;
             sprite->pos1.y = 80;
@@ -75,7 +75,7 @@ void sub_80DB74C(struct Sprite *sprite)
     }
     else
     {
-        if (GetBankSide(gAnimBankAttacker) != SIDE_PLAYER)
+        if (GetBankSide(gAnimBankAttacker) != B_SIDE_PLAYER)
             gBattleAnimArgs[0] = -gBattleAnimArgs[0];
 
         sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 0) + gBattleAnimArgs[0];
@@ -131,7 +131,7 @@ static void sub_80DB92C(struct Sprite *sprite)
         if (!IsContest())
         {
             u8 bankCopy;
-            u8 bank = bankCopy = GetBankByIdentity(IDENTITY_OPPONENT_MON1);
+            u8 bank = bankCopy = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
 
             if (IsAnimBankSpriteVisible(bank))
                 gSprites[gBankSpriteIds[bank]].invisible = 0;
@@ -151,8 +151,8 @@ static void sub_80DB9E4(struct Sprite *sprite)
     if (!IsContest())
     {
         u8 bankCopy;
-        u8 bank = bankCopy = GetBankByIdentity(IDENTITY_OPPONENT_MON1);
-        u8 identity = GetBankIdentity_permutated(bank);
+        u8 bank = bankCopy = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
+        u8 identity = GetBattlerPosition_permutated(bank);
         int var0 = 1;
         u8 toBG_2 = (identity ^ var0) != 0;
 
@@ -178,7 +178,7 @@ void sub_80DBA4C(struct Sprite *sprite)
 
         if (!IsContest() && IsDoubleBattle())
         {
-            if (GetBankSide(gAnimBankAttacker) == SIDE_PLAYER)
+            if (GetBankSide(gAnimBankAttacker) == B_SIDE_PLAYER)
             {
                 sprite->pos1.x = 72 - gBattleAnimArgs[0];
                 sprite->pos1.y = gBattleAnimArgs[1] + 80;
@@ -211,7 +211,7 @@ void sub_80DBAF4(struct Sprite *sprite)
     sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2);
     sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3);
 
-    if (GetBankSide(gAnimBankAttacker) != SIDE_PLAYER)
+    if (GetBankSide(gAnimBankAttacker) != B_SIDE_PLAYER)
     {
         StartSpriteAnim(sprite, 1);
         sprite->pos1.x -= 40;
@@ -234,7 +234,7 @@ void sub_80DBB70(struct Sprite *sprite)
     s16 x = sub_807A100(gAnimBankAttacker, 1) /  2;
     s16 y = sub_807A100(gAnimBankAttacker, 0) / -2;
 
-    if (GetBankSide(gAnimBankAttacker) == SIDE_OPPONENT)
+    if (GetBankSide(gAnimBankAttacker) == B_SIDE_OPPONENT)
     {
         x = -x;
     }
@@ -306,7 +306,7 @@ void sub_80DBCFC(u8 taskId)
     task->data[0] = spriteId;
     task->data[1] = 0;
     task->data[2] = 0;
-    task->data[3] = GetBankSide(gAnimBankAttacker) != SIDE_PLAYER ? 4 : 8;
+    task->data[3] = GetBankSide(gAnimBankAttacker) != B_SIDE_PLAYER ? 4 : 8;
 
     sub_80798F4(task, task->data[0], &gUnknown_083DA8C4);
     task->func = sub_80DBD58;
@@ -581,7 +581,7 @@ void sub_80DC2D4(u8 taskId)
     if (task->data[14] < 0)
         task->data[14] = 0;
 
-    if (GetBankIdentity_permutated(gAnimBankTarget) == 1)
+    if (GetBattlerPosition_permutated(gAnimBankTarget) == 1)
     {
         task->data[10] = gBattle_BG1_X;
         scanlineParams.dmaDest = &REG_BG1HOFS;
diff --git a/src/battle/anim/rock.c b/src/battle/anim/rock.c
index 6fbe065b8..a9e9afb71 100644
--- a/src/battle/anim/rock.c
+++ b/src/battle/anim/rock.c
@@ -78,7 +78,7 @@ void sub_80DCF60(struct Sprite *sprite)
     StartSpriteAnim(sprite, gBattleAnimArgs[5]);
     AnimateSprite(sprite);
 
-    if (GetBankSide(gAnimBankAttacker) != SIDE_PLAYER)
+    if (GetBankSide(gAnimBankAttacker) != B_SIDE_PLAYER)
         sprite->pos1.x -= gBattleAnimArgs[0];
     else
         sprite->pos1.x += gBattleAnimArgs[0];
@@ -154,7 +154,7 @@ void do_boulder_dust(u8 taskId)
     if (IsContest())
         sub_80763FC(subStruct.field_8, (u16 *)subStruct.field_4, 0, 0);
 
-    if (gBattleAnimArgs[0] != 0 && GetBankSide(gAnimBankAttacker) != SIDE_PLAYER)
+    if (gBattleAnimArgs[0] != 0 && GetBankSide(gAnimBankAttacker) != B_SIDE_PLAYER)
         var0 = 1;
 
     gTasks[taskId].data[0] = var0;
@@ -231,7 +231,7 @@ void sub_80DD3AC(struct Sprite *sprite)
 {
     if (sprite->data[0] == 0)
     {
-        if (gBattleAnimArgs[3] != 0 && GetBankSide(gAnimBankAttacker) != SIDE_PLAYER)
+        if (gBattleAnimArgs[3] != 0 && GetBankSide(gAnimBankAttacker) != B_SIDE_PLAYER)
         {
             sprite->pos1.x = 304;
             gBattleAnimArgs[1] = -gBattleAnimArgs[1];
@@ -514,7 +514,7 @@ static void sub_80DD928(struct Sprite *sprite)
 
 void sub_80DD978(struct Sprite *sprite)
 {
-    if (GetBankSide(gAnimBankAttacker) == SIDE_OPPONENT)
+    if (GetBankSide(gAnimBankAttacker) == B_SIDE_OPPONENT)
         StartSpriteAffineAnim(sprite, 1);
 
     TranslateAnimSpriteToTargetMonLocation(sprite);
diff --git a/src/battle/anim/sfx.c b/src/battle/anim/sfx.c
index 10ef1681e..afe7c90b6 100644
--- a/src/battle/anim/sfx.c
+++ b/src/battle/anim/sfx.c
@@ -9,7 +9,7 @@
 extern s16 gBattleAnimArgs[];
 extern u8 gAnimBankAttacker;
 extern u8 gAnimBankTarget;
-extern u16 gBattlePartyID[];
+extern u16 gBattlerPartyIndexes[];
 extern u16 gAnimSpeciesByBanks[];
 extern u8 gUnknown_0202F7D2;
 
@@ -176,9 +176,9 @@ void sub_812B18C(u8 taskId)
         }
 
         if (GetBankSide(bank))
-            species = GetMonData(&gEnemyParty[gBattlePartyID[bank]], 0xB);
+            species = GetMonData(&gEnemyParty[gBattlerPartyIndexes[bank]], 0xB);
         else
-            species = GetMonData(&gPlayerParty[gBattlePartyID[bank]], 0xB);
+            species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[bank]], 0xB);
     }
 
     if (species != 0)