Use 'battler' instead of 'bank'

1 files changed, 16 insertions, 16 deletions

diff --git a/src/battle/anim/psychic.c b/src/battle/anim/psychic.c
index 294069efe..4a48d1ecf 100644
--- a/src/battle/anim/psychic.c
+++ b/src/battle/anim/psychic.c
@@ -78,8 +78,8 @@ void sub_80DB74C(struct Sprite *sprite)
         if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER)
             gBattleAnimArgs[0] = -gBattleAnimArgs[0];
 
-        sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 0) + gBattleAnimArgs[0];
-        sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 1) + gBattleAnimArgs[1];
+        sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 0) + gBattleAnimArgs[0];
+        sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 1) + gBattleAnimArgs[1];
     }
 
     if (IsContest())
@@ -208,8 +208,8 @@ void sub_80DBA4C(struct Sprite *sprite)
 
 void sub_80DBAF4(struct Sprite *sprite)
 {
-    sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2);
-    sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3);
+    sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
+    sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
 
     if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER)
     {
@@ -239,8 +239,8 @@ void sub_80DBB70(struct Sprite *sprite)
         x = -x;
     }
 
-    sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2) + x;
-    sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3) + y;
+    sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2) + x;
+    sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3) + y;
 
     if (sprite->pos1.y < 16)
     {
@@ -285,7 +285,7 @@ static void sub_80DBC34(struct Sprite *sprite)
 void sub_80DBC94(u8 taskId)
 {
     struct Task *task = &gTasks[taskId];
-    u8 spriteId = GetAnimBankSpriteId(0);
+    u8 spriteId = GetAnimBattlerSpriteId(0);
     task->data[0] = spriteId;
     sub_80798F4(task, spriteId, &gUnknown_083DA8A4);
     task->func = sub_80DBCD0;
@@ -302,7 +302,7 @@ static void sub_80DBCD0(u8 taskId)
 void sub_80DBCFC(u8 taskId)
 {
     struct Task *task = &gTasks[taskId];
-    u8 spriteId = GetAnimBankSpriteId(0);
+    u8 spriteId = GetAnimBattlerSpriteId(0);
     task->data[0] = spriteId;
     task->data[1] = 0;
     task->data[2] = 0;
@@ -348,8 +348,8 @@ void sub_80DBE00(u8 taskId)
 
     task->data[3] = 16;
     task->data[4] = 0;
-    task->data[13] = GetBankPosition(gAnimBankAttacker, 2);
-    task->data[14] = GetBankPosition(gAnimBankAttacker, 3);
+    task->data[13] = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
+    task->data[14] = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
 
     var0 = sub_807A100(gAnimBankAttacker, 1) / 3;
     var1 = sub_807A100(gAnimBankAttacker, 0) / 3;
@@ -448,8 +448,8 @@ void sub_80DC068(struct Sprite *sprite)
 {
     if (gBattleAnimArgs[0] == 0)
     {
-        sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2);
-        sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3);
+        sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
+        sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
     }
 
     sprite->data[0] = gBattleAnimArgs[1];
@@ -684,7 +684,7 @@ void sub_80DC4F4(u8 taskId)
     obj_id_set_rotscale(spriteId, 256, 256, 0);
     CalcCenterToCornerVec(&gSprites[spriteId], gSprites[spriteId].oam.shape, gSprites[spriteId].oam.size, gSprites[spriteId].oam.affineMode);
 
-    task->data[13] = GetAnimBankSpriteId(gBattleAnimArgs[0]);
+    task->data[13] = GetAnimBattlerSpriteId(gBattleAnimArgs[0]);
     task->data[14] = matrixNum;
     task->data[15] = spriteId;
     task->func = sub_80DC5F4;
@@ -789,7 +789,7 @@ _080DC554:\n\
     bl CalcCenterToCornerVec\n\
     ldr r1, _080DC5EC @ =gBattleAnimArgs\n\
     ldrb r0, [r1]\n\
-    bl GetAnimBankSpriteId\n\
+    bl GetAnimBattlerSpriteId\n\
     lsls r0, 24\n\
     lsrs r0, 24\n\
     strh r0, [r7, 0x22]\n\
@@ -854,8 +854,8 @@ void sub_80DC700(struct Sprite *sprite)
     switch (sprite->data[0])
     {
     case 0:
-        sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 0);
-        sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 1);
+        sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 0);
+        sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 1);
 
         if (IsContest())
             sprite->pos1.y += 12;