Decompile a bunch of battle_9

1 files changed, 13 insertions, 13 deletions

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;