Use 'battler' instead of 'bank'

94 files changed, 649 insertions, 649 deletions

diff --git a/src/battle/anim/anger.c b/src/battle/anim/anger.c
index 0f1984f90..4ea56636b 100644
--- a/src/battle/anim/anger.c
+++ b/src/battle/anim/anger.c
@@ -24,8 +24,8 @@ void sub_80D09C0(struct Sprite* sprite)
         gBattleAnimArgs[1] *= -1;
     }
 
-    sprite->pos1.x = GetBankPosition(bank, 2) + gBattleAnimArgs[1];
-    sprite->pos1.y = GetBankPosition(bank, 3) + gBattleAnimArgs[2];
+    sprite->pos1.x = GetBattlerSpriteCoord(bank, 2) + gBattleAnimArgs[1];
+    sprite->pos1.y = GetBattlerSpriteCoord(bank, 3) + gBattleAnimArgs[2];
     if (sprite->pos1.y <= 7)
         sprite->pos1.y = 8;
 
diff --git a/src/battle/anim/aurora.c b/src/battle/anim/aurora.c
index 4041dd3bf..de145d6a4 100644
--- a/src/battle/anim/aurora.c
+++ b/src/battle/anim/aurora.c
@@ -23,9 +23,9 @@ void sub_80D33B4(struct Sprite *sprite)
         r6 = gBattleAnimArgs[2];
     sprite->data[0] = gBattleAnimArgs[4];
     sprite->data[1] = sprite->pos1.x;
-    sprite->data[2] = GetBankPosition(gAnimBankTarget, 2) + r6;
+    sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2) + r6;
     sprite->data[3] = sprite->pos1.y;
-    sprite->data[4] = GetBankPosition(gAnimBankTarget, 3) + gBattleAnimArgs[3];
+    sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3) + gBattleAnimArgs[3];
     InitAnimSpriteTranslationDeltas(sprite);
     sprite->callback = sub_80D344C;
     sprite->affineAnimPaused = TRUE;
diff --git a/src/battle/anim/blow_kiss.c b/src/battle/anim/blow_kiss.c
index f585b74bc..6d762bc7f 100644
--- a/src/battle/anim/blow_kiss.c
+++ b/src/battle/anim/blow_kiss.c
@@ -18,9 +18,9 @@ void sub_80D1F58(struct Sprite* sprite)
     InitAnimSpritePos(sprite, 1);
     sprite->data[0] = 0x5F;
     sprite->data[1] = sprite->pos1.x;
-    sprite->data[2] = GetBankPosition(gAnimBankTarget, 2);
+    sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2);
     sprite->data[3] = sprite->pos1.y;
-    sprite->data[4] = GetBankPosition(gAnimBankTarget, 3);
+    sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3);
     InitAnimSpriteTranslationDeltas(sprite);
     sprite->callback = sub_80D1FA4;
 }
diff --git a/src/battle/anim/bottle.c b/src/battle/anim/bottle.c
index 5485bcf5d..0d5a54e18 100644
--- a/src/battle/anim/bottle.c
+++ b/src/battle/anim/bottle.c
@@ -16,8 +16,8 @@ static void sub_80CD0CC(struct Sprite* sprite, int unk1, int unk2);
 
 void sub_80CCF04(struct Sprite* sprite)
 {
-    sprite->pos1.x = GetBankPosition(gAnimBankTarget, 2);
-    sprite->pos1.y = GetBankPosition(gAnimBankTarget, 3) + 0xFFE8;
+    sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 2);
+    sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 3) + 0xFFE8;
     sprite->data[0] = 0;
     sprite->data[1] = 0;
     sprite->data[2] = 0;
diff --git a/src/battle/anim/brace.c b/src/battle/anim/brace.c
index 19ea4297b..a81af73ac 100644
--- a/src/battle/anim/brace.c
+++ b/src/battle/anim/brace.c
@@ -17,13 +17,13 @@ void sub_80CDF0C(struct Sprite* sprite)
 {
     if (gBattleAnimArgs[0] == 0)
     {
-        sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 0) + gBattleAnimArgs[1];
-        sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 1) + gBattleAnimArgs[2];
+        sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 0) + gBattleAnimArgs[1];
+        sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 1) + gBattleAnimArgs[2];
     }
     else
     {
-        sprite->pos1.x = GetBankPosition(gAnimBankTarget, 0) + gBattleAnimArgs[1];
-        sprite->pos1.y = GetBankPosition(gAnimBankTarget, 1) + gBattleAnimArgs[2];
+        sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 0) + gBattleAnimArgs[1];
+        sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 1) + gBattleAnimArgs[2];
     }
 
     sprite->data[0] = 0;
diff --git a/src/battle/anim/breath.c b/src/battle/anim/breath.c
index 948a855b8..58b5066c0 100644
--- a/src/battle/anim/breath.c
+++ b/src/battle/anim/breath.c
@@ -16,17 +16,17 @@ void sub_80D0930(struct Sprite* sprite)
     if (GetBattlerSide(gAnimBankAttacker) == 0)
     {
         StartSpriteAnim(sprite, 0);
-        sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2) + 32;
+        sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2) + 32;
         sprite->data[1] = 0x40;
     }
     else
     {
         StartSpriteAnim(sprite, 1);
-        sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2) - 32;
+        sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2) - 32;
         sprite->data[1] = -0x40;
     }
 
-    sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3);
+    sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
     sprite->data[0] = 0x34;
     sprite->data[2] = 0;
     sprite->data[3] = 0;
diff --git a/src/battle/anim/bubble.c b/src/battle/anim/bubble.c
index b118b5f90..27791eedf 100644
--- a/src/battle/anim/bubble.c
+++ b/src/battle/anim/bubble.c
@@ -21,13 +21,13 @@ void sub_80D31C8(struct Sprite* sprite)
 
     if (GetBattlerSide(gAnimBankAttacker) != 0)
     {
-        sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2) - gBattleAnimArgs[0];
-        sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3) + gBattleAnimArgs[1];
+        sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2) - gBattleAnimArgs[0];
+        sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3) + gBattleAnimArgs[1];
     }
     else
     {
-        sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2) + gBattleAnimArgs[0];
-        sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3) + gBattleAnimArgs[1];
+        sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2) + gBattleAnimArgs[0];
+        sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3) + gBattleAnimArgs[1];
     }
 
     sprite->animPaused = 1;
@@ -39,9 +39,9 @@ void sub_80D31C8(struct Sprite* sprite)
 
     sprite->data[0] = gBattleAnimArgs[6];
     sprite->data[1] = sprite->pos1.x;
-    sprite->data[2] = GetBankPosition(gAnimBankTarget, 2);
+    sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2);
     sprite->data[3] = sprite->pos1.y;
-    sprite->data[4] = GetBankPosition(gAnimBankTarget, 3);
+    sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3);
 
     InitAnimSpriteTranslationDeltas(sprite);
 
diff --git a/src/battle/anim/bug.c b/src/battle/anim/bug.c
index 64021f499..245e45774 100644
--- a/src/battle/anim/bug.c
+++ b/src/battle/anim/bug.c
@@ -37,8 +37,8 @@ void sub_80DC824(struct Sprite *sprite)
     sprite->pos1.y = sub_8077EE4(gAnimBankTarget, 3) + gBattleAnimArgs[1];
     sprite->data[0] = gBattleAnimArgs[4];
 
-    sprite->data[2] = GetBankPosition(gAnimBankTarget, 2) + gBattleAnimArgs[2];
-    sprite->data[4] = GetBankPosition(gAnimBankTarget, 3) + gBattleAnimArgs[3];
+    sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2) + gBattleAnimArgs[2];
+    sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3) + gBattleAnimArgs[3];
 
     sprite->callback = StartTranslateAnimSpriteByDeltas;
     StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
@@ -62,8 +62,8 @@ void sub_80DC8F4(struct Sprite *sprite)
     sprite->pos1.y = sub_8077EE4(gAnimBankTarget, 3) + gBattleAnimArgs[1];
     sprite->data[0] = gBattleAnimArgs[2];
 
-    sprite->data[2] = GetBankPosition(gAnimBankTarget, 2);
-    sprite->data[4] = GetBankPosition(gAnimBankTarget, 3);
+    sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2);
+    sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3);
 
     sprite->callback = StartTranslateAnimSpriteByDeltas;
     StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
@@ -83,8 +83,8 @@ void sub_80DC9A0(struct Sprite *sprite)
 
     if (!gBattleAnimArgs[4])
     {
-        sprite->data[2] = GetBankPosition(gAnimBankTarget, 2);
-        sprite->data[4] = GetBankPosition(gAnimBankTarget, 3);
+        sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2);
+        sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3);
     }
     else
     {
@@ -220,8 +220,8 @@ void AnimTranslateStinger(struct Sprite *sprite)
 
     InitAnimSpritePos(sprite, 1);
 
-    lVarX = GetBankPosition(gAnimBankTarget, 2) + gBattleAnimArgs[2];
-    lVarY = GetBankPosition(gAnimBankTarget, 3) + gBattleAnimArgs[3];
+    lVarX = GetBattlerSpriteCoord(gAnimBankTarget, 2) + gBattleAnimArgs[2];
+    lVarY = GetBattlerSpriteCoord(gAnimBankTarget, 3) + gBattleAnimArgs[3];
     rot = ArcTan2Neg(lVarX - sprite->pos1.x, lVarY - sprite->pos1.y);
     rot += 0xC000;
     sub_8078FDC(sprite, FALSE, 0x100, 0x100, rot);
@@ -251,8 +251,8 @@ void AnimMissileArc(struct Sprite *sprite)
         gBattleAnimArgs[2] = -gBattleAnimArgs[2];
 
     sprite->data[0] = gBattleAnimArgs[4];
-    sprite->data[2] = GetBankPosition(gAnimBankTarget, 2) + gBattleAnimArgs[2];
-    sprite->data[4] = GetBankPosition(gAnimBankTarget, 3) + gBattleAnimArgs[3];
+    sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2) + gBattleAnimArgs[2];
+    sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3) + gBattleAnimArgs[3];
     sprite->data[5] = gBattleAnimArgs[5];
     InitAnimSpriteTranslationOverDuration(sprite);
 
@@ -301,13 +301,13 @@ void sub_80DCE40(struct Sprite *sprite)
 {
     if (gBattleAnimArgs[0] == 0)
     {
-        sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2);
-        sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3) + 18;
+        sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
+        sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3) + 18;
     }
     else
     {
-        sprite->pos1.x = GetBankPosition(gAnimBankTarget, 2);
-        sprite->pos1.y = GetBankPosition(gAnimBankTarget, 3) + 18;
+        sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 2);
+        sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 3) + 18;
     }
 
     StoreSpriteCallbackInData(sprite, move_anim_8074EE0);
diff --git a/src/battle/anim/bullet.c b/src/battle/anim/bullet.c
index 1dca0b886..035adf394 100644
--- a/src/battle/anim/bullet.c
+++ b/src/battle/anim/bullet.c
@@ -19,8 +19,8 @@ void sub_80CFFD8(struct Sprite* sprite)
 {
     InitAnimSpritePos(sprite, 1);
     sprite->data[0] = 20;
-    sprite->data[2] = GetBankPosition(gAnimBankTarget, 2);
-    sprite->data[4] = GetBankPosition(gAnimBankTarget, 3);
+    sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2);
+    sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3);
     sprite->callback = StartTranslateAnimSpriteByDeltas;
     sprite->affineAnimPaused = 1;
     StoreSpriteCallbackInData(sprite, sub_80D0030);
diff --git a/src/battle/anim/copy_orb.c b/src/battle/anim/copy_orb.c
index 9c583670b..ac60d2c2b 100644
--- a/src/battle/anim/copy_orb.c
+++ b/src/battle/anim/copy_orb.c
@@ -22,8 +22,8 @@ void sub_80CB4CC(struct Sprite* sprite)
             gBattleAnimArgs[0] = -a;
         }
 
-        sprite->pos1.x = GetBankPosition(gAnimBankTarget, 0) + gBattleAnimArgs[0];
-        sprite->pos1.y = GetBankPosition(gAnimBankTarget, 1) + gBattleAnimArgs[1];
+        sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 0) + gBattleAnimArgs[0];
+        sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 1) + gBattleAnimArgs[1];
         sprite->invisible = 1;
         sprite->data[0]++;
         break;
@@ -35,8 +35,8 @@ void sub_80CB4CC(struct Sprite* sprite)
         {
             ChangeSpriteAffineAnim(sprite, 1);
             sprite->data[0] = 25;
-            sprite->data[2] = GetBankPosition(gAnimBankAttacker, 2);
-            sprite->data[4] = GetBankPosition(gAnimBankAttacker, 3);
+            sprite->data[2] = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
+            sprite->data[4] = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
             sprite->callback = sub_8078CC0;
             StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
             break;
diff --git a/src/battle/anim/cube.c b/src/battle/anim/cube.c
index 9adf46e32..6fef2de69 100644
--- a/src/battle/anim/cube.c
+++ b/src/battle/anim/cube.c
@@ -16,8 +16,8 @@ static void sub_80CE000(struct Sprite* sprite);
 
 void sub_80CDFB0(struct Sprite* sprite)
 {
-    sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2);
-    sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3) - 12;
+    sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
+    sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3) - 12;
     sprite->data[0] = 0;
     sprite->data[1] = 2;
     sprite->data[2] = 0;
diff --git a/src/battle/anim/cutter.c b/src/battle/anim/cutter.c
index 80411f70d..bc7478053 100644
--- a/src/battle/anim/cutter.c
+++ b/src/battle/anim/cutter.c
@@ -32,8 +32,8 @@ void AnimTranslateLinearSingleSineWave(struct Sprite* sprite)
     sprite->data[0] = gBattleAnimArgs[4];
     if (!gBattleAnimArgs[6])
     {
-        sprite->data[2] = GetBankPosition(gAnimBankTarget, 2) + gBattleAnimArgs[2];
-        sprite->data[4] = GetBankPosition(gAnimBankTarget, 3) + gBattleAnimArgs[3];
+        sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2) + gBattleAnimArgs[2];
+        sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3) + gBattleAnimArgs[3];
     }
     else
     {
diff --git a/src/battle/anim/dark.c b/src/battle/anim/dark.c
index aeb74a7d5..9a1d0842b 100644
--- a/src/battle/anim/dark.c
+++ b/src/battle/anim/dark.c
@@ -123,10 +123,10 @@ void sub_80DFDC0(u8 taskId)
 
 void sub_80DFE14(struct Sprite *sprite)
 {
-    sprite->data[1] = GetBankPosition(gAnimBankTarget, 2);
-    sprite->data[2] = GetBankPosition(gAnimBankAttacker, 2);
-    sprite->data[3] = GetBankPosition(gAnimBankTarget, 3);
-    sprite->data[4] = GetBankPosition(gAnimBankAttacker, 3);
+    sprite->data[1] = GetBattlerSpriteCoord(gAnimBankTarget, 2);
+    sprite->data[2] = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
+    sprite->data[3] = GetBattlerSpriteCoord(gAnimBankTarget, 3);
+    sprite->data[4] = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
     sprite->data[0] = 0x7E;
     InitSpriteDataForLinearTranslation(sprite);
     sprite->data[3] = -sprite->data[1];
@@ -257,13 +257,13 @@ void sub_80E00EC(u8 taskId)
     int var0;
     struct Task *task = &gTasks[taskId];
 
-    task->data[7] = GetBankPosition(gAnimBankAttacker, 1) + 31;
+    task->data[7] = GetBattlerSpriteCoord(gAnimBankAttacker, 1) + 31;
     task->data[6] = sub_807A100(gAnimBankAttacker, 2) - 7;
     task->data[5] = task->data[7];
     task->data[4] = task->data[6];
     task->data[13] = (task->data[7] - task->data[6]) << 8;
 
-    pos = GetBankPosition(gAnimBankAttacker, 0);
+    pos = GetBattlerSpriteCoord(gAnimBankAttacker, 0);
     task->data[14] = pos - 32;
     task->data[15] = pos + 32;
 
@@ -435,10 +435,10 @@ void sub_80E03BC(u8 taskId)
         task->data[0]++;
         break;
     case 2:
-        task->data[7] = GetBankPosition(gAnimBankTarget, 1) + 31;
+        task->data[7] = GetBattlerSpriteCoord(gAnimBankTarget, 1) + 31;
         task->data[6] = sub_807A100(gAnimBankTarget, 2) - 7;
         task->data[13] = (task->data[7] - task->data[6]) << 8;
-        pos = GetBankPosition(gAnimBankTarget, 0);
+        pos = GetBattlerSpriteCoord(gAnimBankTarget, 0);
         task->data[14] = pos - 4;
         task->data[15] = pos + 4;
 
@@ -783,7 +783,7 @@ static void sub_80E08CC(u8 priority)
 
     for (i = 0; i < 4; i++)
     {
-        u8 spriteId = GetAnimBankSpriteId(i);
+        u8 spriteId = GetAnimBattlerSpriteId(i);
         if (spriteId != 0xFF)
             gSprites[spriteId].oam.priority = priority;
     }
@@ -870,7 +870,7 @@ void sub_80E0A4C(u8 taskId)
             species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gAnimBankAttacker]], MON_DATA_SPECIES);
     }
 
-    spriteId = GetAnimBankSpriteId(0);
+    spriteId = GetAnimBattlerSpriteId(0);
     newSpriteId = sub_807A4A0(gAnimBankAttacker, spriteId, species);
 
     sub_8078914(&subStruct);
@@ -926,7 +926,7 @@ static void sub_80E0CD0(u8 taskId)
             REG_BLDCNT = 0;
             REG_BLDALPHA = 0;
 
-            spriteId = GetAnimBankSpriteId(0);
+            spriteId = GetAnimBattlerSpriteId(0);
             paletteNum = 16 + gSprites[spriteId].oam.paletteNum;
             if (gTasks[taskIdCopy].data[1] == 0)
                 sub_8079108(paletteNum, 1);
@@ -958,7 +958,7 @@ void sub_80E0E24(u8 taskId)
     case 1:
     case 2:
     case 3:
-        spriteId = GetAnimBankSpriteId(gBattleAnimArgs[0]);
+        spriteId = GetAnimBattlerSpriteId(gBattleAnimArgs[0]);
         break;
     case 4:
         identity = B_POSITION_PLAYER_LEFT;
diff --git a/src/battle/anim/dragon.c b/src/battle/anim/dragon.c
index edb07af01..4c8448636 100644
--- a/src/battle/anim/dragon.c
+++ b/src/battle/anim/dragon.c
@@ -25,8 +25,8 @@ extern u8 gBankSpriteIds[];
 
 void sub_80DF5A0(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))
     {
         sprite->pos1.x -= gBattleAnimArgs[0];
@@ -50,8 +50,8 @@ void sub_80DF5A0(struct Sprite *sprite)
 void sub_80DF63C(struct Sprite *sprite)
 {
     sub_8078650(sprite);
-    sprite->data[2] = GetBankPosition(gAnimBankTarget, 2);
-    sprite->data[4] = GetBankPosition(gAnimBankTarget, 3);
+    sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2);
+    sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3);
     if (GetBattlerSide(gAnimBankAttacker))
     {
         sprite->pos1.x -= gBattleAnimArgs[1];
@@ -78,13 +78,13 @@ void sub_80DF6F0(struct Sprite *sprite)
 {
     if (gBattleAnimArgs[0] == 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);
     }
     else
     {
-        sprite->pos1.x = GetBankPosition(gAnimBankTarget, 0);
-        sprite->pos1.y = GetBankPosition(gAnimBankTarget, 1);
+        sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 0);
+        sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 1);
     }
     sub_807867C(sprite, gBattleAnimArgs[1]);
     sprite->pos1.y += gBattleAnimArgs[2];
@@ -107,8 +107,8 @@ void sub_80DF78C(struct Sprite *sprite)
 {
     u16 r5;
     u16 r0;
-    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[4] = 0;
     sprite->data[5] = 1;
     sprite->data[6] = gBattleAnimArgs[0];
@@ -252,8 +252,8 @@ void sub_80DFB28(struct Sprite *sprite)
 {
     int r6 = (gBattleAnimArgs[2] * 3) / 5;
     int i;
-    sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2);
-    sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3) + gBattleAnimArgs[4];
+    sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
+    sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3) + gBattleAnimArgs[4];
     sprite->data[1] = Cos(gBattleAnimArgs[1], gBattleAnimArgs[2]);
     sprite->data[2] = Sin(gBattleAnimArgs[1], r6);
     sprite->pos1.x += sprite->data[1] * gBattleAnimArgs[0];
diff --git a/src/battle/anim/draw.c b/src/battle/anim/draw.c
index 29b0c0ceb..9eea43220 100644
--- a/src/battle/anim/draw.c
+++ b/src/battle/anim/draw.c
@@ -108,7 +108,7 @@ void sub_80D0D68(u8 taskId)
 
 void sub_80D0E30(struct Sprite* sprite)
 {
-    sprite->pos1.x = GetBankPosition(gAnimBankTarget, 0) - 16;
+    sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 0) - 16;
     sprite->pos1.y = sub_8077FC0(gAnimBankTarget) + 16;
     sprite->data[0] = 0;
     sprite->data[1] = 0;
diff --git a/src/battle/anim/drum.c b/src/battle/anim/drum.c
index 7937d040a..8dea7e608 100644
--- a/src/battle/anim/drum.c
+++ b/src/battle/anim/drum.c
@@ -24,8 +24,8 @@ void sub_80CEDF0(struct Sprite* sprite)
         a = -16;
     }
 
-    sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2) + a;
-    sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3) + 8;
+    sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2) + a;
+    sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3) + 8;
     sprite->data[0] = 8;
     sprite->callback = WaitAnimForDuration;
     StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
diff --git a/src/battle/anim/energy_wave.c b/src/battle/anim/energy_wave.c
index 029344428..7980c7b34 100644
--- a/src/battle/anim/energy_wave.c
+++ b/src/battle/anim/energy_wave.c
@@ -24,9 +24,9 @@ void sub_80D3554(struct Sprite *sprite)
 
     sprite->data[0] = 30;
     sprite->data[1] = sprite->pos1.x;
-    sprite->data[2] = GetBankPosition(gAnimBankTarget, 2);
+    sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2);
     sprite->data[3] = sprite->pos1.y;
-    sprite->data[4] = GetBankPosition(gAnimBankTarget, 3);
+    sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3);
 
     InitAnimSpriteTranslationDeltas(sprite);
 
@@ -86,8 +86,8 @@ void sub_80D3698(struct Sprite *sprite)
 {
     u8 subpriority;
 
-    sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 0);
-    sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 1);
+    sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 0);
+    sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 1);
     sprite->pos2.y = -10;
 
     subpriority = sub_8079E90(gAnimBankAttacker);
@@ -155,8 +155,8 @@ void sub_80D3728(struct Sprite *sprite)
     }
 
     sprite->data[0] = gBattleAnimArgs[4];
-    sprite->data[2] = GetBankPosition(gAnimBankTarget, 2) + gBattleAnimArgs[2];
-    sprite->data[4] = GetBankPosition(gAnimBankTarget, var2) + gBattleAnimArgs[3];
+    sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2) + gBattleAnimArgs[2];
+    sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, var2) + gBattleAnimArgs[3];
     sprite->callback = StartTranslateAnimSpriteByDeltas;
     StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
 }
diff --git a/src/battle/anim/espeed.c b/src/battle/anim/espeed.c
index a69c04330..2e80afff7 100644
--- a/src/battle/anim/espeed.c
+++ b/src/battle/anim/espeed.c
@@ -25,7 +25,7 @@ static void sub_80D1930(u8 taskId);
 void sub_80D15A4(u8 taskId)
 {
     struct Task* task = &gTasks[taskId];
-    u8 spriteId = GetAnimBankSpriteId(0);
+    u8 spriteId = GetAnimBattlerSpriteId(0);
     task->data[0] = spriteId;
     sub_80798F4(task, spriteId, &gUnknown_083D79BC);
     task->func = sub_80D15E0;
@@ -62,7 +62,7 @@ void sub_80D1638(u8 taskId)
         task->data[14] = -8;
     }
 
-    task->data[15] = GetAnimBankSpriteId(1);
+    task->data[15] = GetAnimBattlerSpriteId(1);
     task->func = sub_80D16A0;
 }
 
@@ -123,7 +123,7 @@ void sub_80D17C4(u8 taskId)
     task->data[4] = 1;
     task->data[13] = 14;
     task->data[14] = 2;
-    task->data[15] = GetAnimBankSpriteId(0);
+    task->data[15] = GetAnimBattlerSpriteId(0);
     task->func = sub_80D1808;
 }
 
@@ -169,8 +169,8 @@ void sub_80D18D4(u8 taskId)
     task->data[7] = 0;
     task->data[8] = 0;
     task->data[13] = 0;
-    task->data[14] = GetBankPosition(gAnimBankAttacker, 0);
-    task->data[15] = GetBankPosition(gAnimBankAttacker, 1);
+    task->data[14] = GetBattlerSpriteCoord(gAnimBankAttacker, 0);
+    task->data[15] = GetBattlerSpriteCoord(gAnimBankAttacker, 1);
     task->func = sub_80D1930;
 }
 
diff --git a/src/battle/anim/evasion.c b/src/battle/anim/evasion.c
index a441110f8..e7387a52a 100644
--- a/src/battle/anim/evasion.c
+++ b/src/battle/anim/evasion.c
@@ -23,7 +23,7 @@ void sub_80CE7E0(u8 taskId)
     u16 r3;
     u16 r4;
     struct Task* task = &gTasks[taskId];
-    task->data[0] = GetAnimBankSpriteId(0);
+    task->data[0] = GetAnimBattlerSpriteId(0);
     task->data[1] = AllocSpritePalette(0x2771);
     r3 = (task->data[1] * 16) + 0x100;
     r4 = (gSprites[task->data[0]].oam.paletteNum + 16) << 4;
diff --git a/src/battle/anim/fight.c b/src/battle/anim/fight.c
index 4210b751c..5e25d664a 100644
--- a/src/battle/anim/fight.c
+++ b/src/battle/anim/fight.c
@@ -108,8 +108,8 @@ void sub_80D90F4(struct Sprite *sprite)
         gBattleAnimArgs[2] = Random() % 5;
 
     StartSpriteAnim(sprite, gBattleAnimArgs[2]);
-    sprite->pos1.x = GetBankPosition(bank, 2);
-    sprite->pos1.y = GetBankPosition(bank, 3);
+    sprite->pos1.x = GetBattlerSpriteCoord(bank, 2);
+    sprite->pos1.y = GetBattlerSpriteCoord(bank, 3);
 
     xMod = sub_807A100(bank, 1) / 2;
     yMod = sub_807A100(bank, 0) / 4;
@@ -275,8 +275,8 @@ static void AnimStompFootStep(struct Sprite *sprite)
     if (--sprite->data[0] == -1)
     {
         sprite->data[0] = 6;
-        sprite->data[2] = GetBankPosition(gAnimBankTarget, 2);
-        sprite->data[4] = GetBankPosition(gAnimBankTarget, 3);
+        sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2);
+        sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3);
 
         sprite->callback = StartTranslateAnimSpriteByDeltas;
         StoreSpriteCallbackInData(sprite, AnimStompFootEnd);
@@ -319,13 +319,13 @@ void sub_80D95D0(struct Sprite *sprite)
 {
     if (gBattleAnimArgs[0] == 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);
     }
     else
     {
-        sprite->pos1.x = GetBankPosition(gAnimBankTarget, 0);
-        sprite->pos1.y = GetBankPosition(gAnimBankTarget, 1);
+        sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 0);
+        sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 1);
     }
 
     sprite->pos1.x += gBattleAnimArgs[1];
@@ -372,13 +372,13 @@ void sub_80D96B8(struct Sprite *sprite)
 {
     if (gBattleAnimArgs[0] == 0)
     {
-        sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 0) + gBattleAnimArgs[2];
-        sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 1) + gBattleAnimArgs[3];
+        sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 0) + gBattleAnimArgs[2];
+        sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 1) + gBattleAnimArgs[3];
     }
     else
     {
-        sprite->pos1.x = GetBankPosition(gAnimBankTarget, 0) + gBattleAnimArgs[2];
-        sprite->pos1.y = GetBankPosition(gAnimBankTarget, 1) + gBattleAnimArgs[3];
+        sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 0) + gBattleAnimArgs[2];
+        sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 1) + gBattleAnimArgs[3];
     }
 
     sprite->oam.tileNum += gBattleAnimArgs[1] * 16;
@@ -423,8 +423,8 @@ void sub_80D97CC(struct Sprite *sprite)
 {
     if (gBattleAnimArgs[0] == 0)
     {
-        sprite->pos1.x = GetBankPosition(gBankAttacker, 2);
-        sprite->pos1.y = GetBankPosition(gBankAttacker, 3);
+        sprite->pos1.x = GetBattlerSpriteCoord(gBankAttacker, 2);
+        sprite->pos1.y = GetBattlerSpriteCoord(gBankAttacker, 3);
         sprite->oam.priority = sub_8079ED4(gAnimBankAttacker);
         sprite->data[7] = gAnimBankTarget;
     }
@@ -448,9 +448,9 @@ static void sub_80D986C(struct Sprite *sprite)
 
         sprite->data[0] = 16;
         sprite->data[1] = sprite->pos1.x;
-        sprite->data[2] = GetBankPosition(sprite->data[7], 2);
+        sprite->data[2] = GetBattlerSpriteCoord(sprite->data[7], 2);
         sprite->data[3] = sprite->pos1.y;
-        sprite->data[4] = GetBankPosition(sprite->data[7], 3);
+        sprite->data[4] = GetBattlerSpriteCoord(sprite->data[7], 3);
 
         InitAnimSpriteTranslationDeltas(sprite);
         StoreSpriteCallbackInData(sprite, move_anim_8074EE0);
@@ -491,10 +491,10 @@ static void sub_80D9934(struct Sprite *sprite)
     }
     else
     {
-        s16 pos0 = GetBankPosition(gAnimBankAttacker, 2);
-        s16 pos1 = GetBankPosition(gAnimBankAttacker, 3);
-        s16 pos2 = GetBankPosition(gAnimBankTarget, 2);
-        s16 pos3 = GetBankPosition(gAnimBankTarget, 3);
+        s16 pos0 = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
+        s16 pos1 = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
+        s16 pos2 = GetBattlerSpriteCoord(gAnimBankTarget, 2);
+        s16 pos3 = GetBattlerSpriteCoord(gAnimBankTarget, 3);
 
         sprite->data[0] = pos2 - pos0;
         sprite->data[1] = pos3 - pos1;
@@ -525,8 +525,8 @@ void sub_80D9A38(struct Sprite *sprite)
 
     if (gBattleAnimArgs[0] == 0)
     {
-        sprite->pos1.x = GetBankPosition(gBankAttacker, 2);
-        sprite->pos1.y = GetBankPosition(gBankAttacker, 3);
+        sprite->pos1.x = GetBattlerSpriteCoord(gBankAttacker, 2);
+        sprite->pos1.y = GetBattlerSpriteCoord(gBankAttacker, 3);
         bank = gAnimBankTarget;
         sprite->oam.priority = sub_8079ED4(gAnimBankAttacker);
     }
@@ -543,9 +543,9 @@ void sub_80D9A38(struct Sprite *sprite)
 
     sprite->data[0] = 16;
     sprite->data[1] = sprite->pos1.x;
-    sprite->data[2] = GetBankPosition(bank, 2);
+    sprite->data[2] = GetBattlerSpriteCoord(bank, 2);
     sprite->data[3] = sprite->pos1.y;
-    sprite->data[4] = GetBankPosition(bank, 3);
+    sprite->data[4] = GetBattlerSpriteCoord(bank, 3);
 
     InitAnimSpriteTranslationDeltas(sprite);
     StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
@@ -564,8 +564,8 @@ void sub_80D9B48(struct Sprite *sprite)
 {
     u8 turn;
 
-    sprite->pos1.x = GetBankPosition(gAnimBankTarget, 2);
-    sprite->pos1.y = GetBankPosition(gAnimBankTarget, 3);
+    sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 2);
+    sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 3);
     sprite->data[1] = gBattleAnimArgs[3];
     sprite->data[2] = gBattleAnimArgs[0];
     sprite->data[3] = gBattleAnimArgs[1];
diff --git a/src/battle/anim/fire_2.c b/src/battle/anim/fire_2.c
index 6d95475d0..97ac2e933 100644
--- a/src/battle/anim/fire_2.c
+++ b/src/battle/anim/fire_2.c
@@ -76,9 +76,9 @@ static void AnimFireRingStep1(struct Sprite *sprite)
     {
         sprite->data[0] = 0x19;
         sprite->data[1] = sprite->pos1.x;
-        sprite->data[2] = GetBankPosition(gAnimBankTarget, 2);
+        sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2);
         sprite->data[3] = sprite->pos1.y;
-        sprite->data[4] = GetBankPosition(gAnimBankTarget, 3);
+        sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3);
 
         InitAnimSpriteTranslationDeltas(sprite);
 
@@ -92,8 +92,8 @@ static void AnimFireRingStep2(struct Sprite *sprite)
     {
         sprite->data[0] = 0;
 
-        sprite->pos1.x = GetBankPosition(gAnimBankTarget, 2);
-        sprite->pos1.y = GetBankPosition(gAnimBankTarget, 3);
+        sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 2);
+        sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 3);
         sprite->pos2.y = 0;
         sprite->pos2.x = 0;
 
@@ -184,7 +184,7 @@ void sub_80D5470(u8 taskId) // initialize animation task for Move_ERUPTION?
 {
     struct Task *task = &gTasks[taskId];
 
-    task->data[15] = GetAnimBankSpriteId(0);
+    task->data[15] = GetAnimBattlerSpriteId(0);
 
     task->data[0] = 0;
     task->data[1] = 0;
diff --git a/src/battle/anim/flying_path.c b/src/battle/anim/flying_path.c
index 8145446ad..5e9de8cb1 100644
--- a/src/battle/anim/flying_path.c
+++ b/src/battle/anim/flying_path.c
@@ -23,8 +23,8 @@ void sub_80CBDF4(u8 taskId)
     struct Task *task = &gTasks[taskId];
 
     task->data[4] = sub_8079E90(gAnimBankTarget) - 1;
-    task->data[6] = GetBankPosition(gAnimBankTarget, 2);
-    task->data[7] = GetBankPosition(gAnimBankTarget, 3);
+    task->data[6] = GetBattlerSpriteCoord(gAnimBankTarget, 2);
+    task->data[7] = GetBattlerSpriteCoord(gAnimBankTarget, 3);
     task->data[10] = sub_807A100(gAnimBankTarget, 1);
     task->data[11] = sub_807A100(gAnimBankTarget, 0);
     task->data[5] = (GetBattlerSide(gAnimBankTarget) == 1) ? 1 : -1;
diff --git a/src/battle/anim/flying_petals.c b/src/battle/anim/flying_petals.c
index 681b0ba1f..c7a596b56 100644
--- a/src/battle/anim/flying_petals.c
+++ b/src/battle/anim/flying_petals.c
@@ -48,12 +48,12 @@ void sub_80CC474(struct Sprite* sprite)
         sprite->oam.priority = sub_8079ED4(bank) + 1;
         break;
     case 2:
-        sprite->pos1.y = GetBankPosition(bank, 3) + gBattleAnimArgs[0];
+        sprite->pos1.y = GetBattlerSpriteCoord(bank, 3) + gBattleAnimArgs[0];
         sprite->oam.priority = sub_8079ED4(bank);
         break;
     case 3:
-        sprite->pos1.y = GetBankPosition(gAnimBankTarget, 3) + gBattleAnimArgs[0];
-        GetAnimBankSpriteId(1);
+        sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 3) + gBattleAnimArgs[0];
+        GetAnimBattlerSpriteId(1);
         sprite->oam.priority = sub_8079ED4(bank) + 1;
         break;
     }
diff --git a/src/battle/anim/glitter.c b/src/battle/anim/glitter.c
index e6c101de3..d73b46bbd 100644
--- a/src/battle/anim/glitter.c
+++ b/src/battle/anim/glitter.c
@@ -43,13 +43,13 @@ void sub_80CD190(struct Sprite* sprite)
     {
         if (!gBattleAnimArgs[6])
         {
-            sprite->pos1.x = GetBankPosition(bank, 0);
-            sprite->pos1.y = GetBankPosition(bank, 1) + gBattleAnimArgs[1];
+            sprite->pos1.x = GetBattlerSpriteCoord(bank, 0);
+            sprite->pos1.y = GetBattlerSpriteCoord(bank, 1) + gBattleAnimArgs[1];
         }
         else
         {
-            sprite->pos1.x = GetBankPosition(bank, 2);
-            sprite->pos1.y = GetBankPosition(bank, 3) + gBattleAnimArgs[1];
+            sprite->pos1.x = GetBattlerSpriteCoord(bank, 2);
+            sprite->pos1.y = GetBattlerSpriteCoord(bank, 3) + gBattleAnimArgs[1];
         }
 
         sub_807867C(sprite, gBattleAnimArgs[0]);
diff --git a/src/battle/anim/grip.c b/src/battle/anim/grip.c
index dbf7a1562..a56a02d82 100644
--- a/src/battle/anim/grip.c
+++ b/src/battle/anim/grip.c
@@ -31,8 +31,8 @@ void sub_80D0178(struct Sprite* sprite)
     sprite->pos1.x += r7;
     sprite->pos1.y += r4;
     sprite->data[0] = 6;
-    sprite->data[2] = GetBankPosition(gAnimBankTarget, 2) + r8;
-    sprite->data[4] = GetBankPosition(gAnimBankTarget, 3) + r6;
+    sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2) + r8;
+    sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3) + r6;
     sprite->callback = StartTranslateAnimSpriteByDeltas;
     StoreSpriteCallbackInData(sprite, sub_80D020C);
 }
diff --git a/src/battle/anim/grow.c b/src/battle/anim/grow.c
index 8788b32fe..924629048 100644
--- a/src/battle/anim/grow.c
+++ b/src/battle/anim/grow.c
@@ -18,7 +18,7 @@ static void sub_80D0904(u8 taskId);
 void sub_80D08C8(u8 taskId)
 {
     struct Task* task = &gTasks[taskId];
-    u8 spriteId = GetAnimBankSpriteId(0);
+    u8 spriteId = GetAnimBattlerSpriteId(0);
     sub_80798F4(task, spriteId, &gUnknown_083D7714);
     task->func = sub_80D0904;
 }
diff --git a/src/battle/anim/guard.c b/src/battle/anim/guard.c
index 211e0e841..d54fa4abc 100644
--- a/src/battle/anim/guard.c
+++ b/src/battle/anim/guard.c
@@ -22,8 +22,8 @@ void sub_80D3014(struct Sprite *sprite)
     }
     else
     {
-        sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 0);
-        sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 1) + 40;
+        sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 0);
+        sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 1) + 40;
     }
 
     sprite->data[0] = 13;
diff --git a/src/battle/anim/guillotine.c b/src/battle/anim/guillotine.c
index 15279d5e2..0768e8334 100644
--- a/src/battle/anim/guillotine.c
+++ b/src/battle/anim/guillotine.c
@@ -34,9 +34,9 @@ void sub_80D0228(struct Sprite* sprite)
     sprite->pos1.y += r4;
     sprite->data[0] = 6;
     sprite->data[1] = sprite->pos1.x;
-    sprite->data[2] = GetBankPosition(gAnimBankTarget, 2) + r9;
+    sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2) + r9;
     sprite->data[3] = sprite->pos1.y;
-    sprite->data[4] = GetBankPosition(gAnimBankTarget, 3) + r6;
+    sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3) + r6;
     InitAnimSpriteTranslationDeltas(sprite);
     sprite->data[5] = gBattleAnimArgs[0];
     sprite->data[6] = sprite->data[0];
diff --git a/src/battle/anim/homing.c b/src/battle/anim/homing.c
index 208d3b831..b24fcf4b1 100644
--- a/src/battle/anim/homing.c
+++ b/src/battle/anim/homing.c
@@ -29,13 +29,13 @@ void sub_80CC6CC(struct Sprite* sprite)
     {
         if (gBattleAnimArgs[0] == 0)
         {
-            a = GetBankPosition(gAnimBankAttacker, 2);
-            b = GetBankPosition(gAnimBankAttacker, 3);
+            a = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
+            b = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
         }
         else
         {
-            a = GetBankPosition(gAnimBankTarget, 2);
-            b = GetBankPosition(gAnimBankTarget, 3);
+            a = GetBattlerSpriteCoord(gAnimBankTarget, 2);
+            b = GetBattlerSpriteCoord(gAnimBankTarget, 3);
         }
 
         sprite->data[0] = gBattleAnimArgs[4];
diff --git a/src/battle/anim/hop.c b/src/battle/anim/hop.c
index c76863f4a..7d1b2fd01 100644
--- a/src/battle/anim/hop.c
+++ b/src/battle/anim/hop.c
@@ -92,8 +92,8 @@ void sub_80CB94C(struct Sprite* sprite)
     s16 e1;
     s16 e2;
     InitAnimSpritePos(sprite, 0);
-    e1 = GetBankPosition(gAnimBankTarget, 0);
-    e2 = GetBankPosition(gAnimBankTarget, 1);
+    e1 = GetBattlerSpriteCoord(gAnimBankTarget, 0);
+    e2 = GetBattlerSpriteCoord(gAnimBankTarget, 1);
     if ((gAnimBankAttacker ^ 2) == gAnimBankTarget)
     {
         sprite->data[6] = e1;
@@ -135,7 +135,7 @@ void sub_80CB9C4(struct Sprite* sprite)
 
 void sub_80CBA28(struct Sprite* sprite)
 {
-    s16 e = GetBankPosition(gAnimBankTarget, 1);
+    s16 e = GetBattlerSpriteCoord(gAnimBankTarget, 1);
     if (GetBattlerSide(gAnimBankTarget) == 0)
     {
         sprite->data[6] = 0;
diff --git a/src/battle/anim/hop_2.c b/src/battle/anim/hop_2.c
index 1bc3f46af..861f428da 100644
--- a/src/battle/anim/hop_2.c
+++ b/src/battle/anim/hop_2.c
@@ -22,8 +22,8 @@ void sub_80CBAE8(struct Sprite* sprite)
     s16 p1;
     s16 p2;
     sub_8078764(sprite, 0);
-    p1 = GetBankPosition(gAnimBankAttacker, 0);
-    p2 = GetBankPosition(gAnimBankAttacker, 1);
+    p1 = GetBattlerSpriteCoord(gAnimBankAttacker, 0);
+    p2 = GetBattlerSpriteCoord(gAnimBankAttacker, 1);
     if ((gAnimBankTarget ^ 2) == gAnimBankAttacker)
     {
         sprite->data[6] = p1;
diff --git a/src/battle/anim/leaf.c b/src/battle/anim/leaf.c
index c39a52ff1..ca2af257d 100644
--- a/src/battle/anim/leaf.c
+++ b/src/battle/anim/leaf.c
@@ -15,8 +15,8 @@ static void sub_80CAF6C(struct Sprite* sprite);
 
 void sub_80CAED8(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);
     sprite->data[0] = gBattleAnimArgs[0];
     sprite->data[1] = gBattleAnimArgs[1];
     sprite->data[2] = gBattleAnimArgs[2];
diff --git a/src/battle/anim/money.c b/src/battle/anim/money.c
index 093c406a0..1407e8cd7 100644
--- a/src/battle/anim/money.c
+++ b/src/battle/anim/money.c
@@ -20,8 +20,8 @@ void sub_80CFE9C(struct Sprite* sprite)
     u16 var;
 
     InitAnimSpritePos(sprite, 1);
-    r6 = GetBankPosition(gAnimBankTarget, 2);
-    r7 = GetBankPosition(gAnimBankTarget, 3) + gBattleAnimArgs[3];
+    r6 = GetBattlerSpriteCoord(gAnimBankTarget, 2);
+    r7 = GetBattlerSpriteCoord(gAnimBankTarget, 3) + gBattleAnimArgs[3];
     if (GetBattlerSide(gAnimBankAttacker) != 0)
         gBattleAnimArgs[2] = -gBattleAnimArgs[2];
 
diff --git a/src/battle/anim/noise.c b/src/battle/anim/noise.c
index dab6c698f..0b6498318 100644
--- a/src/battle/anim/noise.c
+++ b/src/battle/anim/noise.c
@@ -21,8 +21,8 @@ void sub_80D2D68(struct Sprite* sprite)
         gBattleAnimArgs[1] *= -1;
     }
 
-    sprite->pos1.x = GetBankPosition(slot, 2)  + gBattleAnimArgs[1];
-    sprite->pos1.y = GetBankPosition(slot, 3) + gBattleAnimArgs[2];
+    sprite->pos1.x = GetBattlerSpriteCoord(slot, 2)  + gBattleAnimArgs[1];
+    sprite->pos1.y = GetBattlerSpriteCoord(slot, 3) + gBattleAnimArgs[2];
     sprite->data[0] = 0;
     sprite->data[1] = (u16)sprite->pos1.x << 3;
     sprite->data[2] = (u16)sprite->pos1.y << 3;
diff --git a/src/battle/anim/note_rain.c b/src/battle/anim/note_rain.c
index 5574d5b98..4e12c7e1a 100644
--- a/src/battle/anim/note_rain.c
+++ b/src/battle/anim/note_rain.c
@@ -29,8 +29,8 @@ void sub_80D1C08(struct Sprite* sprite)
         gBattleAnimArgs[2] = -gBattleAnimArgs[2];
 
     sprite->data[0] = gBattleAnimArgs[4];
-    sprite->data[2] = GetBankPosition(gAnimBankAttacker, 0) + gBattleAnimArgs[2];
-    sprite->data[4] = GetBankPosition(gAnimBankAttacker, 1) + gBattleAnimArgs[3];
+    sprite->data[2] = GetBattlerSpriteCoord(gAnimBankAttacker, 0) + gBattleAnimArgs[2];
+    sprite->data[4] = GetBattlerSpriteCoord(gAnimBankAttacker, 1) + gBattleAnimArgs[3];
     sprite->callback = StartTranslateAnimSpriteByDeltas;
     StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
     sub_80D1BA8(sprite, gBattleAnimArgs[5], gBattleAnimArgs[6]);
diff --git a/src/battle/anim/note_scatter.c b/src/battle/anim/note_scatter.c
index 5820da571..53afa7d78 100644
--- a/src/battle/anim/note_scatter.c
+++ b/src/battle/anim/note_scatter.c
@@ -22,8 +22,8 @@ void sub_80CECE8(struct Sprite* sprite)
         (u16)gBattleAnimArgs[1] = -a;
     }
 
-    sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2) + gBattleAnimArgs[1];
-    sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3) + gBattleAnimArgs[2];
+    sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2) + gBattleAnimArgs[1];
+    sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3) + gBattleAnimArgs[2];
     StartSpriteAnim(sprite, gBattleAnimArgs[0]);
     sprite->data[2] = 0;
     sprite->data[3] = 0;
diff --git a/src/battle/anim/note_wave.c b/src/battle/anim/note_wave.c
index 80ed2256f..1f3db8c56 100644
--- a/src/battle/anim/note_wave.c
+++ b/src/battle/anim/note_wave.c
@@ -81,8 +81,8 @@ void sub_80CEB0C(struct Sprite* sprite)
     }
     else
     {
-        a = GetBankPosition(gAnimBankTarget, 2);
-        b = GetBankPosition(gAnimBankTarget, 3);
+        a = GetBattlerSpriteCoord(gAnimBankTarget, 2);
+        b = GetBattlerSpriteCoord(gAnimBankTarget, 3);
     }
 
     sprite->data[4] = sprite->pos1.x << 4;
diff --git a/src/battle/anim/orbit.c b/src/battle/anim/orbit.c
index 7bf5f647c..b4a641cc2 100644
--- a/src/battle/anim/orbit.c
+++ b/src/battle/anim/orbit.c
@@ -84,7 +84,7 @@ void sub_80CAD54(struct Sprite* sprite)
     sprite->data[1] = sprite->pos1.x;
     sprite->data[2] = sprite->pos1.x;
     sprite->data[3] = sprite->pos1.y;
-    sprite->data[4] = GetBankPosition(gAnimBankAttacker, 3) + gBattleAnimArgs[2];
+    sprite->data[4] = GetBattlerSpriteCoord(gAnimBankAttacker, 3) + gBattleAnimArgs[2];
     InitAnimSpriteTranslationDeltas(sprite);
     sprite->data[5] = 0x40;
     sprite->callback = sub_80CADA8;
@@ -121,7 +121,7 @@ void sub_80CAE20(struct Sprite* sprite)
     sprite->data[1] = sprite->pos1.x;
     sprite->data[2] = sprite->pos1.x;
     sprite->data[3] = sprite->pos1.y;
-    sprite->data[4] = GetBankPosition(gAnimBankAttacker, 3) + gBattleAnimArgs[2];
+    sprite->data[4] = GetBattlerSpriteCoord(gAnimBankAttacker, 3) + gBattleAnimArgs[2];
     InitAnimSpriteTranslationDeltas(sprite);
     sprite->data[5] = 0x40;
     sprite->callback = sub_80CAE74;
diff --git a/src/battle/anim/orbit_fast.c b/src/battle/anim/orbit_fast.c
index 71303b03c..67a59583f 100644
--- a/src/battle/anim/orbit_fast.c
+++ b/src/battle/anim/orbit_fast.c
@@ -16,8 +16,8 @@ static void AnimOrbitFastStep(struct Sprite* sprite);
 // arg 1: initial wave offset
 void AnimOrbitFast(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);
     sprite->affineAnimPaused = 1;
     sprite->data[0] = gBattleAnimArgs[0];
     sprite->data[1] = gBattleAnimArgs[1];
diff --git a/src/battle/anim/orbit_scatter.c b/src/battle/anim/orbit_scatter.c
index cda09a729..bd03ee78c 100644
--- a/src/battle/anim/orbit_scatter.c
+++ b/src/battle/anim/orbit_scatter.c
@@ -15,8 +15,8 @@ static void AnimOrbitScatterStep(struct Sprite* sprite);
 // arg 0: initial wave offset
 void AnimOrbitScatter(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);
     sprite->data[0] = Sin(gBattleAnimArgs[0], 10);
     sprite->data[1] = Cos(gBattleAnimArgs[0], 7);
     sprite->callback = AnimOrbitScatterStep;
diff --git a/src/battle/anim/orbs.c b/src/battle/anim/orbs.c
index 1c98da012..53c16d8d7 100644
--- a/src/battle/anim/orbs.c
+++ b/src/battle/anim/orbs.c
@@ -21,8 +21,8 @@ void sub_80CA7B0(struct Sprite* sprite)
 {
     InitAnimSpritePos(sprite, 1);
     sprite->data[0] = gBattleAnimArgs[2];
-    sprite->data[2] = GetBankPosition(gAnimBankAttacker, 2);
-    sprite->data[4] = GetBankPosition(gAnimBankAttacker, 3);
+    sprite->data[2] = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
+    sprite->data[4] = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
     sprite->callback = StartTranslateAnimSpriteByDeltas;
     StoreSpriteCallbackInData(sprite, move_anim_8074EE0);
 }
@@ -32,8 +32,8 @@ void sub_80CA800(struct Sprite* sprite)
     InitAnimSpritePos(sprite, 1);
     StartSpriteAnim(sprite, gBattleAnimArgs[3]);
     sprite->data[0] = gBattleAnimArgs[2];
-    sprite->data[2] = GetBankPosition(gAnimBankTarget, 2);
-    sprite->data[4] = GetBankPosition(gAnimBankTarget, 3);
+    sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2);
+    sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3);
     sprite->callback = StartTranslateAnimSpriteByDeltas;
     StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
 }
@@ -43,9 +43,9 @@ void sub_80CA858(struct Sprite* sprite)
     InitAnimSpritePos(sprite, 1);
     sprite->data[0] = gBattleAnimArgs[2];
     sprite->data[1] = sprite->pos1.x;
-    sprite->data[2] = GetBankPosition(gAnimBankTarget, 2);
+    sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2);
     sprite->data[3] = sprite->pos1.y;
-    sprite->data[4] = GetBankPosition(gAnimBankTarget, 3);
+    sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3);
     InitAnimSpriteTranslationDeltas(sprite);
     sprite->data[5] = gBattleAnimArgs[3];
     sprite->callback = sub_80CA8B4;
@@ -96,8 +96,8 @@ void sub_80CA9A8(struct Sprite* sprite)
 {
     sub_8078764(sprite, 1);
     sprite->data[0] = gBattleAnimArgs[3];
-    sprite->data[2] = GetBankPosition(gAnimBankAttacker, 2);
-    sprite->data[4] = GetBankPosition(gAnimBankAttacker, 3);
+    sprite->data[2] = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
+    sprite->data[4] = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
     sprite->data[5] = gBattleAnimArgs[2];
     InitAnimSpriteTranslationOverDuration(sprite);
     sprite->callback = sub_80CA9F8;
@@ -115,8 +115,8 @@ void sub_80CAA14(struct Sprite* sprite)
     u16 b;
     
     StartSpriteAnim(sprite, a & 7);
-    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))
     {
         sprite->pos1.x -= 20;
@@ -129,9 +129,9 @@ void sub_80CAA14(struct Sprite* sprite)
     b = Random();
     sprite->data[0] = (b & 31) + 64;
     sprite->data[1] = sprite->pos1.x;
-    sprite->data[2] = GetBankPosition(gAnimBankTarget, 2);
+    sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2);
     sprite->data[3] = sprite->pos1.y;
-    sprite->data[4] = GetBankPosition(gAnimBankTarget, 3);
+    sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3);
     sub_8078D60(sprite);
     sprite->data[5] = Random() & 0xFF;
     sprite->data[6] = sprite->subpriority;
diff --git a/src/battle/anim/osmose.c b/src/battle/anim/osmose.c
index 1140aa34a..cca7af76e 100644
--- a/src/battle/anim/osmose.c
+++ b/src/battle/anim/osmose.c
@@ -14,8 +14,8 @@ void sub_80CB768(struct Sprite* sprite)
 {
     if (!sprite->data[0])
     {
-        sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2) + gBattleAnimArgs[0];
-        sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 1) + gBattleAnimArgs[1];
+        sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2) + gBattleAnimArgs[0];
+        sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 1) + gBattleAnimArgs[1];
         sprite->data[1] = gBattleAnimArgs[2];
         sprite->data[2] = gBattleAnimArgs[3];
         sprite->data[3] = gBattleAnimArgs[4];
diff --git a/src/battle/anim/poison.c b/src/battle/anim/poison.c
index 3bdac02da..2cc104c07 100644
--- a/src/battle/anim/poison.c
+++ b/src/battle/anim/poison.c
@@ -20,8 +20,8 @@ void sub_80D9D70(struct Sprite *sprite)
     InitAnimSpritePos(sprite, 1);
 
     sprite->data[0] = gBattleAnimArgs[2];
-    sprite->data[2] = GetBankPosition(gAnimBankTarget, 2);
-    sprite->data[4] = GetBankPosition(gAnimBankTarget, 3);
+    sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2);
+    sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3);
     sprite->data[5] = -30;
 
     InitAnimSpriteTranslationOverDuration(sprite);
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;
diff --git a/src/battle/anim/ring.c b/src/battle/anim/ring.c
index 7516d74e5..b317cdaed 100644
--- a/src/battle/anim/ring.c
+++ b/src/battle/anim/ring.c
@@ -34,9 +34,9 @@ void sub_80D0FD8(struct Sprite* sprite)
     {
         SetAverageBattlerPositions(bank, r4, &sp0, &sp1);
         if (r4 == 0)
-            r4 = GetBankPosition(bank, 0);
+            r4 = GetBattlerSpriteCoord(bank, 0);
         else
-            r4 = GetBankPosition(bank, 2);
+            r4 = GetBattlerSpriteCoord(bank, 2);
 
         if (GetBattlerSide(bank) != 0)
             gBattleAnimArgs[0] -= (sp0 - r4) - gBattleAnimArgs[0];  // This is weird.
@@ -92,7 +92,7 @@ void sub_80D10B8(struct Sprite* sprite)
 
     if (GetBattlerSide(bankr7) != 0)
     {
-        r9 = GetBankPosition(bankr7, r10) + gBattleAnimArgs[0];
+        r9 = GetBattlerSpriteCoord(bankr7, r10) + gBattleAnimArgs[0];
         if (IsAnimBankSpriteVisible(bankr8 ^ 2))
             sprite->subpriority = gSprites[gBankSpriteIds[bankr8 ^ 2]].subpriority - 1;
         else
@@ -100,7 +100,7 @@ void sub_80D10B8(struct Sprite* sprite)
     }
     else
     {
-        r9 = GetBankPosition(bankr7, r10) - gBattleAnimArgs[0];
+        r9 = GetBattlerSpriteCoord(bankr7, r10) - gBattleAnimArgs[0];
         if (gMain.inBattle && IsAnimBankSpriteVisible(bankr7 ^ 2))
         {
             if (gSprites[gBankSpriteIds[bankr7]].pos1.x < gSprites[gBankSpriteIds[bankr7 ^ 2]].pos1.x)
@@ -115,15 +115,15 @@ void sub_80D10B8(struct Sprite* sprite)
 
     }
 
-    r6 = GetBankPosition(bankr7, sp4) + gBattleAnimArgs[1];
+    r6 = GetBattlerSpriteCoord(bankr7, sp4) + gBattleAnimArgs[1];
     if (gMain.inBattle && IsAnimBankSpriteVisible(bankr8 ^ 2))
     {
         SetAverageBattlerPositions(bankr8, gBattleAnimArgs[6], &sp0, &sp1);
     }
     else
     {
-        sp0 = GetBankPosition(bankr8, r10);
-        sp1 = GetBankPosition(bankr8, sp4);
+        sp0 = GetBattlerSpriteCoord(bankr8, r10);
+        sp1 = GetBattlerSpriteCoord(bankr8, sp4);
     }
 
     if (GetBattlerSide(bankr8))
diff --git a/src/battle/anim/rock.c b/src/battle/anim/rock.c
index 4254c551c..73be7c42b 100644
--- a/src/battle/anim/rock.c
+++ b/src/battle/anim/rock.c
@@ -295,10 +295,10 @@ void sub_80DD4D4(u8 taskId)
 
     task = &gTasks[taskId];
 
-    var0 = GetBankPosition(gAnimBankAttacker, 2);
-    var1 = GetBankPosition(gAnimBankAttacker, 1) + 24;
-    var2 = GetBankPosition(gAnimBankTarget, 2);
-    var3 = GetBankPosition(gAnimBankTarget, 1) + 24;
+    var0 = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
+    var1 = GetBattlerSpriteCoord(gAnimBankAttacker, 1) + 24;
+    var2 = GetBattlerSpriteCoord(gAnimBankTarget, 2);
+    var3 = GetBattlerSpriteCoord(gAnimBankTarget, 1) + 24;
 
     if ((gAnimBankAttacker ^ 2) == gAnimBankTarget)
         var3 = var1;
@@ -333,7 +333,7 @@ void sub_80DD4D4(u8 taskId)
     task->data[13] = pan1;
     task->data[14] = (pan2 - pan1) / task->data[8];
     task->data[1] = var4;
-    task->data[15] = GetAnimBankSpriteId(0);
+    task->data[15] = GetAnimBattlerSpriteId(0);
 
     task->func = sub_80DD604;
 }
@@ -522,8 +522,8 @@ void sub_80DD978(struct Sprite *sprite)
 
 void sub_80DD9A4(struct Sprite *sprite)
 {
-    sprite->pos1.x = GetBankPosition(gAnimBankTarget, 0);
-    sprite->pos1.y = GetBankPosition(gAnimBankTarget, 1);
+    sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 0);
+    sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 1);
     sprite->pos1.x += gBattleAnimArgs[0];
     sprite->pos1.y += gBattleAnimArgs[1];
 
diff --git a/src/battle/anim/roots.c b/src/battle/anim/roots.c
index 68f8a3e2f..30c2d9652 100644
--- a/src/battle/anim/roots.c
+++ b/src/battle/anim/roots.c
@@ -18,8 +18,8 @@ void sub_80CB59C(struct Sprite* sprite)
 {
     if (!sprite->data[0])
     {
-        sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2);
-        sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 1);
+        sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
+        sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 1);
         sprite->pos2.x = gBattleAnimArgs[0];
         sprite->pos2.y = gBattleAnimArgs[1];
         sprite->subpriority = gBattleAnimArgs[2] + 30;
@@ -36,10 +36,10 @@ void sub_80CB59C(struct Sprite* sprite)
 
 void sub_80CB620(struct Sprite *sprite)
 {
-    s16 p1 = GetBankPosition(gAnimBankAttacker, 2);
-    s16 p2 = GetBankPosition(gAnimBankAttacker, 3);
-    s16 e1 = GetBankPosition(gAnimBankTarget, 2);
-    s16 e2 = GetBankPosition(gAnimBankTarget, 3);
+    s16 p1 = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
+    s16 p2 = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
+    s16 e1 = GetBattlerSpriteCoord(gAnimBankTarget, 2);
+    s16 e2 = GetBattlerSpriteCoord(gAnimBankTarget, 3);
 
     e1 -= p1;
     e2 -= p2;
diff --git a/src/battle/anim/scan.c b/src/battle/anim/scan.c
index 403894cc8..abd54cef3 100644
--- a/src/battle/anim/scan.c
+++ b/src/battle/anim/scan.c
@@ -110,8 +110,8 @@ void sub_80CD4EC(struct Sprite* sprite)
         sprite->pos2.y = 0;
         sprite->pos2.x = 0;
         sprite->data[0] = 6;
-        sprite->data[2] = GetBankPosition(gAnimBankTarget, 2) + a;
-        sprite->data[4] = GetBankPosition(gAnimBankTarget, 3) + b;
+        sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2) + a;
+        sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3) + b;
         sprite->callback = StartTranslateAnimSpriteByDeltas;
         StoreSpriteCallbackInData(sprite, sub_80CD654);
     }
diff --git a/src/battle/anim/seed.c b/src/battle/anim/seed.c
index 2bce9df41..d7c56e7a8 100644
--- a/src/battle/anim/seed.c
+++ b/src/battle/anim/seed.c
@@ -27,8 +27,8 @@ void AnimLeechSeed(struct Sprite* sprite)
     }
 
     sprite->data[0] = gBattleAnimArgs[4];
-    sprite->data[2] = GetBankPosition(gAnimBankTarget, 0) + gBattleAnimArgs[2];
-    sprite->data[4] = GetBankPosition(gAnimBankTarget, 1) + gBattleAnimArgs[3];
+    sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 0) + gBattleAnimArgs[2];
+    sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 1) + gBattleAnimArgs[3];
     sprite->data[5] = gBattleAnimArgs[5];
     InitAnimSpriteTranslationOverDuration(sprite);
     sprite->callback = AnimLeechSeedStep;
diff --git a/src/battle/anim/shadow_enlarge.c b/src/battle/anim/shadow_enlarge.c
index 399cf1ba4..7662583ac 100644
--- a/src/battle/anim/shadow_enlarge.c
+++ b/src/battle/anim/shadow_enlarge.c
@@ -15,7 +15,7 @@ static void sub_80D0428(u8 taskId);
 
 void sub_80D03C4(u8 taskId)
 {
-    u8 spriteId = GetAnimBankSpriteId(1);
+    u8 spriteId = GetAnimBattlerSpriteId(1);
     sub_8078E70(spriteId, 1);
     obj_id_set_rotscale(spriteId, 0xD0, 0xD0, 0);
     sub_8079108(gSprites[spriteId].oam.paletteNum + 16, 0);
@@ -27,7 +27,7 @@ void sub_80D0428(u8 taskId)
 {
     if (--gTasks[taskId].data[0] == -1)
     {
-        u8 spriteId = GetAnimBankSpriteId(1);
+        u8 spriteId = GetAnimBattlerSpriteId(1);
         sub_8078F40(spriteId);
         sub_8079108(gSprites[spriteId].oam.paletteNum + 16, 1);
         DestroyAnimVisualTask(taskId);
diff --git a/src/battle/anim/shadow_minimize.c b/src/battle/anim/shadow_minimize.c
index 61645bc59..b4e18eb51 100644
--- a/src/battle/anim/shadow_minimize.c
+++ b/src/battle/anim/shadow_minimize.c
@@ -18,7 +18,7 @@ void sub_80D0704(struct Sprite* sprite);
 void sub_80D0488(u8 taskId)
 {
     struct Task* task = &gTasks[taskId];
-    u8 spriteId = GetAnimBankSpriteId(0);
+    u8 spriteId = GetAnimBattlerSpriteId(0);
     task->data[0] = spriteId;
     sub_8078E70(spriteId, 0);
     task->data[1] = 0;
diff --git a/src/battle/anim/shock.c b/src/battle/anim/shock.c
index 50bd78379..19e4d0fb2 100644
--- a/src/battle/anim/shock.c
+++ b/src/battle/anim/shock.c
@@ -15,8 +15,8 @@ extern void sub_80DA48C(struct Sprite *);
 
 void sub_80D6294(struct Sprite *sprite)
 {
-    sprite->pos1.x = GetBankPosition(gAnimBankTarget, 2);
-    sprite->pos1.y = GetBankPosition(gAnimBankTarget, 3);
+    sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 2);
+    sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 3);
 
     if (GetBattlerSide(gAnimBankAttacker) != 0)
     {
@@ -77,13 +77,13 @@ void sub_80D6328(struct Sprite *sprite)
 
     if (gBattleAnimArgs[5] == 0)
     {
-        sprite->pos1.x = GetBankPosition(slot, 0);
-        sprite->pos1.y = GetBankPosition(slot, 1);
+        sprite->pos1.x = GetBattlerSpriteCoord(slot, 0);
+        sprite->pos1.y = GetBattlerSpriteCoord(slot, 1);
     }
     else
     {
-        sprite->pos1.x = GetBankPosition(slot, 2);
-        sprite->pos1.y = GetBankPosition(slot, 3);
+        sprite->pos1.x = GetBattlerSpriteCoord(slot, 2);
+        sprite->pos1.y = GetBattlerSpriteCoord(slot, 3);
     }
 
     sprite->pos2.x = (gSineTable[gBattleAnimArgs[0]] * gBattleAnimArgs[1]) >> 8;
diff --git a/src/battle/anim/silhouette.c b/src/battle/anim/silhouette.c
index b34eaf0b5..00bb24762 100644
--- a/src/battle/anim/silhouette.c
+++ b/src/battle/anim/silhouette.c
@@ -15,7 +15,7 @@ static void sub_80CB438(u8 taskId);
 
 void sub_80CB340(u8 taskId)
 {
-    u8 spriteId = GetAnimBankSpriteId(1);
+    u8 spriteId = GetAnimBattlerSpriteId(1);
     if (gSprites[spriteId].invisible)
     {
         DestroyAnimVisualTask(taskId);
@@ -32,7 +32,7 @@ void sub_80CB340(u8 taskId)
 
 void sub_80CB3A8(u8 taskId)
 {
-    u8 spriteId = GetAnimBankSpriteId(1);
+    u8 spriteId = GetAnimBattlerSpriteId(1);
     gTasks[taskId].data[10] += gTasks[taskId].data[0];
     gSprites[spriteId].pos2.x = gTasks[taskId].data[10] >> 8;
     if (GetBattlerSide(gAnimBankTarget))
@@ -57,7 +57,7 @@ void sub_80CB438(u8 taskId)
     {
         if (gTasks[taskId].data[0] == 0)
         {
-            u8 spriteId = GetAnimBankSpriteId(1);
+            u8 spriteId = GetAnimBattlerSpriteId(1);
             sub_8078F40(spriteId);
             gSprites[spriteId].pos2.x = 0;
             gSprites[spriteId].pos2.y = 0;
diff --git a/src/battle/anim/slash.c b/src/battle/anim/slash.c
index 306968111..68a1b81ef 100644
--- a/src/battle/anim/slash.c
+++ b/src/battle/anim/slash.c
@@ -19,13 +19,13 @@ void sub_80CDD74(struct Sprite* sprite)
 {
     if (gBattleAnimArgs[0] == 0)
     {
-        sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2) + gBattleAnimArgs[1];
-        sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3) + gBattleAnimArgs[2];
+        sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2) + gBattleAnimArgs[1];
+        sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3) + gBattleAnimArgs[2];
     }
     else
     {
-        sprite->pos1.x = GetBankPosition(gAnimBankTarget, 2) + gBattleAnimArgs[1];
-        sprite->pos1.y = GetBankPosition(gAnimBankTarget, 3) + gBattleAnimArgs[2];
+        sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 2) + gBattleAnimArgs[1];
+        sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 3) + gBattleAnimArgs[2];
     }
 
     sprite->data[0] = 0;
@@ -36,16 +36,16 @@ void sub_80CDD74(struct Sprite* sprite)
 
 void sub_80CDDDC(struct Sprite* sprite)
 {
-    sprite->pos1.x = GetBankPosition(gAnimBankTarget, 2) + 0xFFD0;
-    sprite->pos1.y = GetBankPosition(gAnimBankTarget, 3);
+    sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 2) + 0xFFD0;
+    sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 3);
     StoreSpriteCallbackInData(sprite, sub_80CDE78);
     sprite->callback = sub_8078600;
 }
 
 void sub_80CDE24(struct Sprite* sprite)
 {
-    sprite->pos1.x = sprite->pos1.x = GetBankPosition(gAnimBankTarget, 2) + 0xFFD0 + gBattleAnimArgs[0];
-    sprite->pos1.y = GetBankPosition(gAnimBankTarget, 3);
+    sprite->pos1.x = sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 2) + 0xFFD0 + gBattleAnimArgs[0];
+    sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 3);
     StartSpriteAnim(sprite, 1);
     sprite->data[0] = 0;
     sprite->data[1] = 0;
diff --git a/src/battle/anim/slice.c b/src/battle/anim/slice.c
index 814aa46ac..8e7f35f46 100644
--- a/src/battle/anim/slice.c
+++ b/src/battle/anim/slice.c
@@ -17,8 +17,8 @@ static void AnimSliceStep(struct Sprite* sprite);
 // arg 2: slice direction; 0 = right-to-left, 1 = left-to-right
 void AnimCuttingSlice(struct Sprite* sprite)
 {
-    sprite->pos1.x = GetBankPosition(gAnimBankTarget, 0);
-    sprite->pos1.y = GetBankPosition(gAnimBankTarget, 1);
+    sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 0);
+    sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 1);
     if (GetBattlerSide(gAnimBankTarget) == 0)
         sprite->pos1.y += 8;
 
@@ -48,22 +48,22 @@ void sub_80CC9BC(struct Sprite* sprite)
     switch (gBattleAnimArgs[3])
     {
     case 1:
-        a = GetBankPosition(gAnimBankTarget ^ 2, 0);
-        b = GetBankPosition(gAnimBankTarget ^ 2, 1);
+        a = GetBattlerSpriteCoord(gAnimBankTarget ^ 2, 0);
+        b = GetBattlerSpriteCoord(gAnimBankTarget ^ 2, 1);
         break;
     case 2:
-        a = GetBankPosition(gAnimBankTarget, 0);
-        b = GetBankPosition(gAnimBankTarget, 1);
+        a = GetBattlerSpriteCoord(gAnimBankTarget, 0);
+        b = GetBattlerSpriteCoord(gAnimBankTarget, 1);
         if (IsAnimBankSpriteVisible(gAnimBankTarget ^ 2))
         {
-            a = (GetBankPosition(gAnimBankTarget ^ 2, 0) + a) / 2;
-            b = (GetBankPosition(gAnimBankTarget ^ 2, 1) + b) / 2;
+            a = (GetBattlerSpriteCoord(gAnimBankTarget ^ 2, 0) + a) / 2;
+            b = (GetBattlerSpriteCoord(gAnimBankTarget ^ 2, 1) + b) / 2;
         }
         break;
     case 0:
     default:
-        a = GetBankPosition(gAnimBankTarget, 0);
-        b = GetBankPosition(gAnimBankTarget, 1);
+        a = GetBattlerSpriteCoord(gAnimBankTarget, 0);
+        b = GetBattlerSpriteCoord(gAnimBankTarget, 1);
         break;
     }
 
diff --git a/src/battle/anim/sonic.c b/src/battle/anim/sonic.c
index b89338a26..a882be73c 100644
--- a/src/battle/anim/sonic.c
+++ b/src/battle/anim/sonic.c
@@ -34,8 +34,8 @@ void AnimSonicBoomProjectile(struct Sprite* sprite)
     }
 
     InitAnimSpritePos(sprite, 1);
-    targetXPos = GetBankPosition(gAnimBankTarget, 2) + gBattleAnimArgs[2];
-    targetYPos = GetBankPosition(gAnimBankTarget, 3) + gBattleAnimArgs[3];
+    targetXPos = GetBattlerSpriteCoord(gAnimBankTarget, 2) + gBattleAnimArgs[2];
+    targetYPos = GetBattlerSpriteCoord(gAnimBankTarget, 3) + gBattleAnimArgs[3];
     rotation = ArcTan2Neg(targetXPos - sprite->pos1.x, targetYPos - sprite->pos1.y);
     rotation += 0xF000;
     if (IsContest())
diff --git a/src/battle/anim/sonic_task.c b/src/battle/anim/sonic_task.c
index 260ae544c..dc5d60efa 100644
--- a/src/battle/anim/sonic_task.c
+++ b/src/battle/anim/sonic_task.c
@@ -82,8 +82,8 @@ void sub_80CFB04(u8 taskId)
                 gBattleAnimArgs[2] |= 1;
         }
     }
-    r6 = gTasks[taskId].data[9] = GetBankPosition(gAnimBankAttacker, 0);
-    r9 = gTasks[taskId].data[10] = GetBankPosition(gAnimBankAttacker, 1);
+    r6 = gTasks[taskId].data[9] = GetBattlerSpriteCoord(gAnimBankAttacker, 0);
+    r9 = gTasks[taskId].data[10] = GetBattlerSpriteCoord(gAnimBankAttacker, 1);
     if ((gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
         && IsAnimBankSpriteVisible(gAnimBankTarget ^ 2))
     {
@@ -91,8 +91,8 @@ void sub_80CFB04(u8 taskId)
     }
     else
     {
-        sp1 = GetBankPosition(gAnimBankTarget, 0);
-        sp2 = GetBankPosition(gAnimBankTarget, 1);
+        sp1 = GetBattlerSpriteCoord(gAnimBankTarget, 0);
+        sp2 = GetBattlerSpriteCoord(gAnimBankTarget, 1);
     }
 
     sp1 = gTasks[taskId].data[11] = sp1 + gBattleAnimArgs[0];
diff --git a/src/battle/anim/spin_finger.c b/src/battle/anim/spin_finger.c
index 8eb060358..1ce3aa0d0 100644
--- a/src/battle/anim/spin_finger.c
+++ b/src/battle/anim/spin_finger.c
@@ -23,7 +23,7 @@ void sub_80CF0BC(struct Sprite* sprite)
     else
         bank = gAnimBankTarget;
 
-    sprite->pos1.x = GetBankPosition(bank, 0);
+    sprite->pos1.x = GetBattlerSpriteCoord(bank, 0);
     sprite->pos1.y = sub_807A100(bank, 2);
     if (sprite->pos1.y <= 9)
         sprite->pos1.y = 10;
diff --git a/src/battle/anim/spit.c b/src/battle/anim/spit.c
index 1e65ba53e..36fcb788c 100644
--- a/src/battle/anim/spit.c
+++ b/src/battle/anim/spit.c
@@ -21,8 +21,8 @@ void sub_80D287C(struct Sprite* sprite)
 
 void sub_80D28AC(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);
     sprite->data[0] = Sin(gBattleAnimArgs[0], 10);
     sprite->data[1] = Cos(gBattleAnimArgs[0], 7);
     sprite->data[2] = gBattleAnimArgs[1];
diff --git a/src/battle/anim/splash.c b/src/battle/anim/splash.c
index 570ef0dca..d6caaf0f6 100644
--- a/src/battle/anim/splash.c
+++ b/src/battle/anim/splash.c
@@ -24,7 +24,7 @@ void sub_80D074C(u8 taskId)
     }
     else
     {
-        u8 spriteId = GetAnimBankSpriteId(gBattleAnimArgs[0]);
+        u8 spriteId = GetAnimBattlerSpriteId(gBattleAnimArgs[0]);
         task->data[0] = spriteId;
         task->data[1] = 0;
         task->data[2] = gBattleAnimArgs[1];
diff --git a/src/battle/anim/startle.c b/src/battle/anim/startle.c
index 50e78af37..95462bd9f 100644
--- a/src/battle/anim/startle.c
+++ b/src/battle/anim/startle.c
@@ -16,10 +16,10 @@ extern struct AffineAnimFrameCmd gUnknown_083D7A98;
 // opponent
 void sub_80D1E38(u8 taskId)
 {
-    u8 spriteId = GetAnimBankSpriteId(1);
+    u8 spriteId = GetAnimBattlerSpriteId(1);
     if (++gTasks[taskId].data[0] == 1)
     {
-        sub_80798F4(&gTasks[taskId], GetAnimBankSpriteId(1), &gUnknown_083D7A98);
+        sub_80798F4(&gTasks[taskId], GetAnimBattlerSpriteId(1), &gUnknown_083D7A98);
         gSprites[spriteId].pos2.x = 4;
     }
     else
@@ -37,10 +37,10 @@ void sub_80D1E38(u8 taskId)
 // player
 void sub_80D1EC8(u8 taskId)
 {
-    u8 spriteId = GetAnimBankSpriteId(0);
+    u8 spriteId = GetAnimBattlerSpriteId(0);
     if (++gTasks[taskId].data[0] == 1)
     {
-        sub_80798F4(&gTasks[taskId], GetAnimBankSpriteId(0), &gUnknown_083D7A98);
+        sub_80798F4(&gTasks[taskId], GetAnimBattlerSpriteId(0), &gUnknown_083D7A98);
         gSprites[spriteId].pos2.x = 4;
     }
     else
diff --git a/src/battle/anim/strike.c b/src/battle/anim/strike.c
index 832abe694..775485a79 100644
--- a/src/battle/anim/strike.c
+++ b/src/battle/anim/strike.c
@@ -23,8 +23,8 @@ void sub_80CE670(struct Sprite* sprite)
 
     sprite->data[0] = 0;
     sprite->data[1] = gBattleAnimArgs[2];
-    sprite->pos1.x = GetBankPosition(gAnimBankTarget, 2) + gBattleAnimArgs[0];
-    sprite->pos1.y = GetBankPosition(gAnimBankTarget, 3) + gBattleAnimArgs[1];
+    sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 2) + gBattleAnimArgs[0];
+    sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 3) + gBattleAnimArgs[1];
     sprite->data[6] = sprite->pos1.x;
     sprite->data[7] = sprite->pos1.y;
     if (IsContest() != 0)
diff --git a/src/battle/anim/struggle.c b/src/battle/anim/struggle.c
index 20dbaf2dc..6a1355e1b 100644
--- a/src/battle/anim/struggle.c
+++ b/src/battle/anim/struggle.c
@@ -19,13 +19,13 @@ void sub_80D2C38(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);
         }
         else
         {
-            sprite->pos1.x = GetBankPosition(gAnimBankTarget, 2);
-            sprite->pos1.y = GetBankPosition(gAnimBankTarget, 3);
+            sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 2);
+            sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 3);
         }
 
         if (gBattleAnimArgs[1] == 0)
diff --git a/src/battle/anim/tendrils.c b/src/battle/anim/tendrils.c
index 9f57ffd45..4ef704f3a 100644
--- a/src/battle/anim/tendrils.c
+++ b/src/battle/anim/tendrils.c
@@ -28,7 +28,7 @@ void sub_80CB298(struct Sprite* sprite)
     if ((u16)gBattleAnimArgs[7] == 0xFFFF)
     {
         sprite->affineAnimPaused = 0;
-        GetAnimBankSpriteId(1);
+        GetAnimBattlerSpriteId(1);
         sprite->data[0] = 0x100;
         sprite->callback = sub_80CB2D4;
     }
@@ -36,7 +36,7 @@ void sub_80CB298(struct Sprite* sprite)
 
 void sub_80CB2D4(struct Sprite* sprite)
 {
-    GetAnimBankSpriteId(1);
+    GetAnimBattlerSpriteId(1);
     if (!sprite->data[2])
     {
         sprite->data[0] += 11;
diff --git a/src/battle/anim/thought.c b/src/battle/anim/thought.c
index fbd7dfaee..5163cbfad 100644
--- a/src/battle/anim/thought.c
+++ b/src/battle/anim/thought.c
@@ -20,7 +20,7 @@ void sub_80CEF44(u8 bank, struct Sprite* sprite)
     else
         sprite->pos1.x = sub_807A100(bank, 4) - 8;
 
-    sprite->pos1.y = GetBankPosition(bank, 3) - (s16)sub_807A100(bank, 0) / 4;
+    sprite->pos1.y = GetBattlerSpriteCoord(bank, 3) - (s16)sub_807A100(bank, 0) / 4;
 }
 
 void sub_80CEF9C(struct Sprite* sprite)
diff --git a/src/battle/anim/thrashing.c b/src/battle/anim/thrashing.c
index 34089de31..bc1fc4842 100644
--- a/src/battle/anim/thrashing.c
+++ b/src/battle/anim/thrashing.c
@@ -20,7 +20,7 @@ static void sub_80D0B3C(u8 taskId);
 void sub_80D0A4C(u8 taskId)
 {
     struct Task* task = &gTasks[taskId];
-    u8 spriteId = GetAnimBankSpriteId(0);
+    u8 spriteId = GetAnimBattlerSpriteId(0);
     task->data[0] = spriteId;
     task->data[1] = 0;
     sub_80798F4(task, spriteId, &gUnknown_083D77B0);
@@ -38,7 +38,7 @@ void sub_80D0A8C(u8 taskId)
 void sub_80D0AB8(u8 taskId)
 {
     struct Task* task = &gTasks[taskId];
-    task->data[0] = GetAnimBankSpriteId(0);
+    task->data[0] = GetAnimBattlerSpriteId(0);
     task->data[1] = 0;
     task->data[2] = 4;
     task->data[3] = 7;
diff --git a/src/battle/anim/tile_in.c b/src/battle/anim/tile_in.c
index a4a544a0c..b1d804317 100644
--- a/src/battle/anim/tile_in.c
+++ b/src/battle/anim/tile_in.c
@@ -15,8 +15,8 @@ void sub_80CE09C(struct Sprite* sprite)
 {
     if (sprite->data[0] == 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())
             sprite->pos1.y += 10;
         sprite->data[0]++;
diff --git a/src/battle/anim/tile_out.c b/src/battle/anim/tile_out.c
index f253c2524..04f51e556 100644
--- a/src/battle/anim/tile_out.c
+++ b/src/battle/anim/tile_out.c
@@ -9,7 +9,7 @@ extern s16 gBattleAnimArgs[];
 extern u8 gAnimBankAttacker;
 extern u8 gAnimBankTarget;
 
-extern u8 gNoOfAllBanks;
+extern u8 gBattlersCount;
 extern u8 gHealthboxIDs[];
 
 static void sub_80CE1AC(struct Sprite* sprite);
@@ -35,8 +35,8 @@ void sub_80CE1AC(struct Sprite* sprite)
     {
         sprite->animPaused = 0;
         sprite->data[0] = 30;
-        sprite->data[2] = GetBankPosition(gAnimBankAttacker, 2);
-        sprite->data[4] = GetBankPosition(gAnimBankAttacker, 3);
+        sprite->data[2] = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
+        sprite->data[4] = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
         sprite->callback = StartTranslateAnimSpriteByDeltas;
         StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
     }
@@ -57,7 +57,7 @@ void sub_80CE210(u8 taskId)
 void unref_sub_80CE260(u8 taskId)
 {
     u8 i;
-    for (i = 0; i < gNoOfAllBanks; i++)
+    for (i = 0; i < gBattlersCount; i++)
     {
         if (gBattleAnimArgs[0] == 1 && GetBattlerSide(i) == 0)
             sub_8043DB0(gHealthboxIDs[i]);
@@ -72,7 +72,7 @@ void unref_sub_80CE260(u8 taskId)
 void unref_sub_80CE2D4(u8 taskId)
 {
     u8 i;
-    for (i = 0; i < gNoOfAllBanks; i++)
+    for (i = 0; i < gBattlersCount; i++)
     {
         sub_8043DFC(gHealthboxIDs[i]);
     }
diff --git a/src/battle/anim/twinkle.c b/src/battle/anim/twinkle.c
index e26669f63..34082cc2f 100644
--- a/src/battle/anim/twinkle.c
+++ b/src/battle/anim/twinkle.c
@@ -15,7 +15,7 @@ static void sub_80CE3B0(struct Sprite* sprite);
 
 void sub_80CE36C(struct Sprite* sprite)
 {
-    sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2) + gBattleAnimArgs[0];
+    sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2) + gBattleAnimArgs[0];
     sprite->pos1.y = gBattleAnimArgs[1];
     sprite->data[0] = 0;
     sprite->data[1] = 0;
diff --git a/src/battle/anim/unused_7.c b/src/battle/anim/unused_7.c
index eea10aaa2..a2f00db31 100644
--- a/src/battle/anim/unused_7.c
+++ b/src/battle/anim/unused_7.c
@@ -30,8 +30,8 @@ void sub_80CF374(struct Sprite* sprite)
 void sub_80CF3C4(struct Sprite* sprite)
 {
     u8 a;
-    sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2);
-    sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3);
+    sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
+    sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
     a = gBankSpriteIds[gAnimBankTarget];
     if (GetBattlerSide(gAnimBankAttacker) != 0)
     {
diff --git a/src/battle/anim/uproar.c b/src/battle/anim/uproar.c
index 03cc65bc0..538ca9b20 100644
--- a/src/battle/anim/uproar.c
+++ b/src/battle/anim/uproar.c
@@ -12,7 +12,7 @@ void sub_80D2D3C(u8);
 
 void sub_80D2CF8(u8 taskId)
 {
-    u8 spriteId = GetAnimBankSpriteId(gBattleAnimArgs[0]);
+    u8 spriteId = GetAnimBattlerSpriteId(gBattleAnimArgs[0]);
 
     sub_80798F4(&gTasks[taskId], spriteId, gUnknown_083D7CA8);
     gTasks[taskId].func = sub_80D2D3C;
diff --git a/src/battle/anim/wisp_fire.c b/src/battle/anim/wisp_fire.c
index 36fc655c3..5a51986c7 100644
--- a/src/battle/anim/wisp_fire.c
+++ b/src/battle/anim/wisp_fire.c
@@ -60,8 +60,8 @@ void sub_80D5DDC(u8 taskId)
 
     task->data[12] = !GetBattlerSide(gAnimBankAttacker) ? 1 : -1;
     task->data[13] = IsAnimBankSpriteVisible(gAnimBankTarget ^ 2) + 1;
-    task->data[14] = GetAnimBankSpriteId(1);
-    task->data[15] = GetAnimBankSpriteId(3);
+    task->data[14] = GetAnimBattlerSpriteId(1);
+    task->data[15] = GetAnimBattlerSpriteId(3);
 
     task->func = sub_80D5E4C;
 }
diff --git a/src/battle/anim/wisp_orb.c b/src/battle/anim/wisp_orb.c
index cd91080ba..90b90acb7 100644
--- a/src/battle/anim/wisp_orb.c
+++ b/src/battle/anim/wisp_orb.c
@@ -70,9 +70,9 @@ void sub_80D5B0C(struct Sprite *sprite)
 
             sprite->data[0] = 256;
             sprite->data[1] = sprite->pos1.x;
-            sprite->data[2] = GetBankPosition(gAnimBankTarget, 2);
+            sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2);
             sprite->data[3] = sprite->pos1.y;
-            sprite->data[4] = GetBankPosition(gAnimBankTarget, 3);
+            sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3);
 
             sub_8078BD4(sprite);
             sprite->callback = sub_80D5C5C;
diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c
index 4abf89bf1..8e727f00f 100644
--- a/src/battle/battle_2.c
+++ b/src/battle/battle_2.c
@@ -86,7 +86,7 @@ extern struct UnknownPokemonStruct2 gUnknown_02023A00[];
 extern u8 gBattleBufferB[][0x200];
 extern u8 gActiveBattler;
 extern u32 gBattleExecBuffer;
-extern u8 gNoOfAllBanks;
+extern u8 gBattlersCount;
 extern u16 gBattlerPartyIndexes[];
 extern u8 gCurrentActionFuncId;
 extern u8 gBanksByTurnOrder[];
@@ -3604,17 +3604,17 @@ void sub_8010824(void)
 #if DEBUG
     if (gUnknown_02023A14_50 & 0x80)
     {
-        for (gActiveBattler = 0; gActiveBattler < gNoOfAllBanks; gActiveBattler++)
+        for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++)
             debug_sub_80138CC();
         gBattleMainFunc();
-        for (gActiveBattler = 0; gActiveBattler < gNoOfAllBanks; gActiveBattler++)
+        for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++)
             gBattleBankFunc[gActiveBattler]();
     }
     else
 #endif
     {
         gBattleMainFunc();
-        for (gActiveBattler = 0; gActiveBattler < gNoOfAllBanks; gActiveBattler++)
+        for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++)
             gBattleBankFunc[gActiveBattler]();
     }
 }
@@ -3735,7 +3735,7 @@ void SwitchInClearSetData(void)
     {
         for (i = 0; i < 8; i++)
             gBattleMons[gActiveBattler].statStages[i] = 6;
-        for (i = 0; i < gNoOfAllBanks; i++)
+        for (i = 0; i < gBattlersCount; i++)
         {
             struct UnknownStruct12 *sp20 = &gUnknown_02024AD0[i];
 
@@ -3753,7 +3753,7 @@ void SwitchInClearSetData(void)
         gBattleMons[gActiveBattler].status2 &= (STATUS2_CONFUSION | STATUS2_FOCUS_ENERGY | STATUS2_SUBSTITUTE | STATUS2_ESCAPE_PREVENTION | STATUS2_CURSED);
         gStatuses3[gActiveBattler] &= (STATUS3_LEECHSEED_BANK | STATUS3_LEECHSEED | STATUS3_ALWAYS_HITS | STATUS3_PERISH_SONG | STATUS3_ROOTED | STATUS3_MUDSPORT | STATUS3_WATERSPORT);
 
-        for (i = 0; i < gNoOfAllBanks; i++)
+        for (i = 0; i < gBattlersCount; i++)
         {
             if (GetBattlerSide(gActiveBattler) != GetBattlerSide(i)
              && (gStatuses3[i] & STATUS3_ALWAYS_HITS) != 0
@@ -3770,7 +3770,7 @@ void SwitchInClearSetData(void)
         gStatuses3[gActiveBattler] = 0;
     }
 
-    for (i = 0; i < gNoOfAllBanks; i++)
+    for (i = 0; i < gBattlersCount; i++)
     {
         if (gUnknown_02024AD0[i].unk0 & (gBitTable[gActiveBattler] << 16))
             gUnknown_02024AD0[i].unk0 &= ~(gBitTable[gActiveBattler] << 16);
@@ -3822,7 +3822,7 @@ void UndoEffectsAfterFainting(void)
         gBattleMons[gActiveBattler].statStages[i] = 6;
     gBattleMons[gActiveBattler].status2 = 0;
     gStatuses3[gActiveBattler] = 0;
-    for (i = 0; i < gNoOfAllBanks; i++)
+    for (i = 0; i < gBattlersCount; i++)
     {
         if ((gBattleMons[i].status2 & STATUS2_ESCAPE_PREVENTION) && gDisableStructs[i].bankPreventingEscape == gActiveBattler)
             gBattleMons[i].status2 &= ~STATUS2_ESCAPE_PREVENTION;
@@ -3892,7 +3892,7 @@ void bc_8012FAC(void)
         if (gBattleExecBuffer == 0)
         {
             gBattleCommunication[1]++;
-            if (gBattleCommunication[1] == gNoOfAllBanks)
+            if (gBattleCommunication[1] == gBattlersCount)
                 gBattleMainFunc = BattlePrepIntroSlide;
             else
                 gBattleCommunication[0] = 0;
@@ -3921,7 +3921,7 @@ void sub_8011384(void)
 
     if (gBattleExecBuffer == 0)
     {
-        for (gActiveBattler = 0; gActiveBattler < gNoOfAllBanks; gActiveBattler++)
+        for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++)
         {
             if ((gBattleTypeFlags & BATTLE_TYPE_SAFARI)
              && GetBattlerSide(gActiveBattler) == 0)
@@ -4090,7 +4090,7 @@ void sub_8011834(void)
 {
     if (gBattleExecBuffer == 0)
     {
-        for (gActiveBattler = 0; gActiveBattler < gNoOfAllBanks; gActiveBattler++)
+        for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++)
         {
             if (GetBattlerPosition(gActiveBattler) == 1)
             {
@@ -4112,7 +4112,7 @@ void bc_801362C(void)
 {
     if (gBattleExecBuffer == 0)
     {
-        for (gActiveBattler = 0; gActiveBattler < gNoOfAllBanks; gActiveBattler++)
+        for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++)
         {
             if (GetBattlerSide(gActiveBattler) == 1
              && !(gBattleTypeFlags & (BATTLE_TYPE_EREADER_TRAINER | BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_LINK)))
@@ -4142,7 +4142,7 @@ void sub_80119B4(void)
 {
     if (gBattleExecBuffer == 0)
     {
-        for (gActiveBattler = 0; gActiveBattler < gNoOfAllBanks; gActiveBattler++)
+        for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++)
         {
             if (GetBattlerPosition(gActiveBattler) == 0)
             {
@@ -4167,7 +4167,7 @@ void unref_sub_8011A68(void)
 {
     if (gBattleExecBuffer == 0)
     {
-        for (gActiveBattler = 0; gActiveBattler < gNoOfAllBanks; gActiveBattler++)
+        for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++)
         {
             if (GetBattlerSide(gActiveBattler) == 0)
             {
@@ -4192,11 +4192,11 @@ void BattleBeginFirstTurn(void)
     {
         if (ewram16058 == 0)
         {
-            for (i = 0; i < gNoOfAllBanks; i++)
+            for (i = 0; i < gBattlersCount; i++)
                 gBanksByTurnOrder[i] = i;
-            for (i = 0; i < gNoOfAllBanks - 1; i++)
+            for (i = 0; i < gBattlersCount - 1; i++)
             {
-                for (j = i + 1; j < gNoOfAllBanks; j++)
+                for (j = i + 1; j < gBattlersCount; j++)
                 {
                     if (GetWhoStrikesFirst(gBanksByTurnOrder[i], gBanksByTurnOrder[j], 1) != 0)
                         SwapTurnOrder(i, j);
@@ -4208,7 +4208,7 @@ void BattleBeginFirstTurn(void)
             ewram160E6 = 1;
             return;
         }
-        while (ewram16058 < gNoOfAllBanks)
+        while (ewram16058 < gBattlersCount)
         {
             if (AbilityBattleEffects(0, gBanksByTurnOrder[ewram16058], 0, 0, 0) != 0)
                 r9++;
@@ -4220,7 +4220,7 @@ void BattleBeginFirstTurn(void)
             return;
         if (AbilityBattleEffects(11, 0, 0, 0, 0) != 0)
             return;
-        while (ewram160F9 < gNoOfAllBanks)
+        while (ewram160F9 < gBattlersCount)
         {
             if (ItemBattleEffects(0, gBanksByTurnOrder[ewram160F9], 0) != 0)
                 r9++;
@@ -4229,7 +4229,7 @@ void BattleBeginFirstTurn(void)
                 return;
         }
         // Absolutely pointless for-loop that somehow doesn't get optimized out
-        for (i = 0; i < gNoOfAllBanks; i++)
+        for (i = 0; i < gBattlersCount; i++)
             ;
         for (i = 0; i < 4; i++)
         {
@@ -4244,7 +4244,7 @@ void BattleBeginFirstTurn(void)
         ResetSentPokesToOpponentValue();
         for (i = 0; i < 8; i++)
             gBattleCommunication[i] = 0;
-        for (i = 0; i < gNoOfAllBanks; i++)
+        for (i = 0; i < gBattlersCount; i++)
             gBattleMons[i].status2 &= ~8;
         ewram16000 = 0;
         ewram16001 = 0;
@@ -4267,7 +4267,7 @@ void bc_8013B1C(void)
         gBattleMainFunc = BattleTurnPassed;
         for (i = 0; i < 8; i++)
             gBattleCommunication[i] = 0;
-        for (i = 0; i < gNoOfAllBanks; i++)
+        for (i = 0; i < gBattlersCount; i++)
         {
             gBattleMons[i].status2 &= ~8;
             if ((gBattleMons[i].status1 & 7) && (gBattleMons[i].status2 & 0x1000))
@@ -4319,7 +4319,7 @@ void BattleTurnPassed(void)
     }
     if (gBattleResults.battleTurnCounter < 0xFF)
         gBattleResults.battleTurnCounter++;
-    for (i = 0; i < gNoOfAllBanks; i++)
+    for (i = 0; i < gBattlersCount; i++)
     {
         gActionForBanks[i] = 0xFF;
         gChosenMovesByBanks[i] = 0;
@@ -4349,7 +4349,7 @@ u8 CanRunFromBattle(void)
     if (gBattleMons[gActiveBattler].ability == ABILITY_RUN_AWAY)
         return 0;
     r6 = GetBattlerSide(gActiveBattler);
-    for (i = 0; i < gNoOfAllBanks; i++)
+    for (i = 0; i < gBattlersCount; i++)
     {
         if (r6 != GetBattlerSide(i)
          && gBattleMons[i].ability == ABILITY_SHADOW_TAG)
@@ -4428,7 +4428,7 @@ void sub_8012324(void)
     gBattleCommunication[4] = 0;
     // inverted loop
     //_0801234C
-    for (gActiveBattler = 0; gActiveBattler < gNoOfAllBanks; gActiveBattler++)
+    for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++)
     {
         r5 = GetBattlerPosition(gActiveBattler);
         switch (gBattleCommunication[gActiveBattler])
@@ -4485,12 +4485,12 @@ void sub_8012324(void)
     strb r1, [r0, 0x4]\n\
     ldr r0, _08012344 @ =gActiveBattler\n\
     strb r1, [r0]\n\
-    ldr r0, _08012348 @ =gNoOfAllBanks\n\
+    ldr r0, _08012348 @ =gBattlersCount\n\
     bl _08012F74\n\
     .align 2, 0\n\
 _08012340: .4byte gBattleCommunication\n\
 _08012344: .4byte gActiveBattler\n\
-_08012348: .4byte gNoOfAllBanks\n\
+_08012348: .4byte gBattlersCount\n\
 _0801234C:\n\
     ldr r4, _08012374 @ =gActiveBattler\n\
     ldrb r0, [r4]\n\
@@ -5914,7 +5914,7 @@ _08012F66:\n\
     ldrb r1, [r0]\n\
     adds r1, 0x1\n\
     strb r1, [r0]\n\
-    ldr r0, _08012FB0 @ =gNoOfAllBanks\n\
+    ldr r0, _08012FB0 @ =gBattlersCount\n\
     lsls r1, 24\n\
     lsrs r1, 24\n\
 _08012F74:\n\
@@ -5946,7 +5946,7 @@ _08012FA0: .4byte gBattleExecBuffer\n\
 _08012FA4: .4byte gBitTable\n\
 _08012FA8: .4byte gActiveBattler\n\
 _08012FAC: .4byte gBattleCommunication\n\
-_08012FB0: .4byte gNoOfAllBanks\n\
+_08012FB0: .4byte gBattlersCount\n\
 _08012FB4: .4byte gBattleMainFunc\n\
 _08012FB8: .4byte SetActionsAndBanksTurnOrder\n\
     .syntax divided\n");
@@ -6117,7 +6117,7 @@ void SetActionsAndBanksTurnOrder(void)
 
     if (gBattleTypeFlags & BATTLE_TYPE_SAFARI)
     {
-        for (gActiveBattler = 0; gActiveBattler < gNoOfAllBanks; gActiveBattler++)
+        for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++)
         {
             gActionsByTurnOrder[var] = gActionForBanks[gActiveBattler];
             gBanksByTurnOrder[var] = gActiveBattler;
@@ -6128,7 +6128,7 @@ void SetActionsAndBanksTurnOrder(void)
     {
         if (gBattleTypeFlags & BATTLE_TYPE_LINK)
         {
-            for (gActiveBattler = 0; gActiveBattler < gNoOfAllBanks; gActiveBattler++)
+            for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++)
             {
                 if (gActionForBanks[gActiveBattler] == ACTION_RUN)
                 {
@@ -6151,7 +6151,7 @@ void SetActionsAndBanksTurnOrder(void)
             gActionsByTurnOrder[0] = gActionForBanks[gActiveBattler];
             gBanksByTurnOrder[0] = gActiveBattler;
             var = 1;
-            for (i = 0; i < gNoOfAllBanks; i++)
+            for (i = 0; i < gBattlersCount; i++)
             {
                 if (i != gActiveBattler)
                 {
@@ -6161,12 +6161,12 @@ void SetActionsAndBanksTurnOrder(void)
                 }
             }
             gBattleMainFunc = CheckFocusPunch_ClearVarsBeforeTurnStarts;
-            eFocusPunchBank = 0;
+            eFocusPunchBattler = 0;
             return;
         }
         else
         {
-            for (gActiveBattler = 0; gActiveBattler < gNoOfAllBanks; gActiveBattler++)
+            for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++)
             {
                 if (gActionForBanks[gActiveBattler] == ACTION_USE_ITEM || gActionForBanks[gActiveBattler] == ACTION_SWITCH)
                 {
@@ -6175,7 +6175,7 @@ void SetActionsAndBanksTurnOrder(void)
                     var++;
                 }
             }
-            for (gActiveBattler = 0; gActiveBattler < gNoOfAllBanks; gActiveBattler++)
+            for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++)
             {
                 if (gActionForBanks[gActiveBattler] != ACTION_USE_ITEM && gActionForBanks[gActiveBattler] != ACTION_SWITCH)
                 {
@@ -6184,9 +6184,9 @@ void SetActionsAndBanksTurnOrder(void)
                     var++;
                 }
             }
-            for (i = 0; i < gNoOfAllBanks - 1; i++)
+            for (i = 0; i < gBattlersCount - 1; i++)
             {
-                for (j = i + 1; j < gNoOfAllBanks; j++)
+                for (j = i + 1; j < gBattlersCount; j++)
                 {
                     u8 bank1 = gBanksByTurnOrder[i];
                     u8 bank2 = gBanksByTurnOrder[j];
@@ -6204,7 +6204,7 @@ void SetActionsAndBanksTurnOrder(void)
     }
 
     gBattleMainFunc = CheckFocusPunch_ClearVarsBeforeTurnStarts;
-    eFocusPunchBank = 0;
+    eFocusPunchBattler = 0;
 }
 
 static void TurnValuesCleanUp(bool8 var0)
@@ -6212,7 +6212,7 @@ static void TurnValuesCleanUp(bool8 var0)
     s32 i;
     u8 *dataPtr;
 
-    for (gActiveBattler = 0; gActiveBattler < gNoOfAllBanks; gActiveBattler++)
+    for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++)
     {
         if (var0)
         {
@@ -6246,7 +6246,7 @@ static void TurnValuesCleanUp(bool8 var0)
 
 void SpecialStatusesClear(void)
 {
-    for (gActiveBattler = 0; gActiveBattler < gNoOfAllBanks; gActiveBattler++)
+    for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++)
     {
         s32 i;
         u8 *dataPtr = (u8*)(&gSpecialStatuses[gActiveBattler]);
@@ -6260,10 +6260,10 @@ void CheckFocusPunch_ClearVarsBeforeTurnStarts(void)
 {
     if (!(gHitMarker & HITMARKER_RUN))
     {
-        while (eFocusPunchBank < gNoOfAllBanks)
+        while (eFocusPunchBattler < gBattlersCount)
         {
-            gActiveBattler = gBankAttacker = eFocusPunchBank;
-            eFocusPunchBank++;
+            gActiveBattler = gBankAttacker = eFocusPunchBattler;
+            eFocusPunchBattler++;
             if (gChosenMovesByBanks[gActiveBattler] == MOVE_FOCUS_PUNCH
                 && !(gBattleMons[gActiveBattler].status1 & STATUS_SLEEP)
                 && !(gDisableStructs[gBankAttacker].truantCounter)
@@ -6300,7 +6300,7 @@ static void RunTurnActionsFunctions(void)
     gBattleStruct->unk16057 = gCurrentTurnActionNumber;
     gUnknown_081FA640[gCurrentActionFuncId]();
 
-    if (gCurrentTurnActionNumber >= gNoOfAllBanks) // everyone did their actions, turn finished
+    if (gCurrentTurnActionNumber >= gBattlersCount) // everyone did their actions, turn finished
     {
         gHitMarker &= ~(HITMARKER_x100000);
         gBattleMainFunc = gUnknown_081FA678[gBattleOutcome & 0x7F];
@@ -6425,7 +6425,7 @@ void HandleEndTurn_FinishBattle(void)
                                   | BATTLE_TYPE_WALLY_TUTORIAL
                                   | BATTLE_TYPE_BATTLE_TOWER)))
         {
-            for (gActiveBattler = 0; gActiveBattler < gNoOfAllBanks; gActiveBattler++)
+            for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++)
             {
                 if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER)
                 {
@@ -6640,7 +6640,7 @@ void HandleAction_UseMove(void)
              && gBattleMoves[gCurrentMove].type == TYPE_ELECTRIC)
     {
         side = GetBattlerSide(gBankAttacker);
-        for (gActiveBattler = 0; gActiveBattler < gNoOfAllBanks; gActiveBattler++)
+        for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++)
         {
             if (side != GetBattlerSide(gActiveBattler)
                 && ewram16010arr(gBankAttacker) != gActiveBattler
@@ -7255,7 +7255,7 @@ bool8 TryRunFromBattle(u8 bank)
 
     if (effect)
     {
-        gCurrentTurnActionNumber = gNoOfAllBanks;
+        gCurrentTurnActionNumber = gBattlersCount;
         gBattleOutcome = BATTLE_RAN;
     }
 
@@ -7268,9 +7268,9 @@ void HandleAction_Run(void)
 
     if (gBattleTypeFlags & BATTLE_TYPE_LINK)
     {
-        gCurrentTurnActionNumber = gNoOfAllBanks;
+        gCurrentTurnActionNumber = gBattlersCount;
 
-        for (gActiveBattler = 0; gActiveBattler < gNoOfAllBanks; gActiveBattler++)
+        for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++)
         {
             if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER)
             {
@@ -7308,7 +7308,7 @@ void HandleAction_Run(void)
             }
             else
             {
-                gCurrentTurnActionNumber = gNoOfAllBanks;
+                gCurrentTurnActionNumber = gBattlersCount;
                 gBattleOutcome = BATTLE_POKE_FLED;
             }
         }
@@ -7388,7 +7388,7 @@ void HandleAction_SafriZoneRun(void)
 {
     gBankAttacker = gBanksByTurnOrder[gCurrentTurnActionNumber];
     PlaySE(SE_NIGERU);
-    gCurrentTurnActionNumber = gNoOfAllBanks;
+    gCurrentTurnActionNumber = gBattlersCount;
     gBattleOutcome = BATTLE_RAN;
 }
 
diff --git a/src/battle/battle_4.c b/src/battle/battle_4.c
index 9c6d3bbd4..8f5ea7cae 100644
--- a/src/battle/battle_4.c
+++ b/src/battle/battle_4.c
@@ -98,17 +98,17 @@ enum
 extern u8 gUnknown_02023A14_50;
 extern u8 gCritMultiplier;
 extern s32 gBattleMoveDamage;
-extern u32 gStatuses3[BATTLE_BANKS_COUNT];
+extern u32 gStatuses3[MAX_BATTLERS_COUNT];
 extern u16 gBattleTypeFlags;
 extern const struct BaseStats gBaseStats[];
-extern struct BattleEnigmaBerry gEnigmaBerries[BATTLE_BANKS_COUNT];
-extern struct BattlePokemon gBattleMons[BATTLE_BANKS_COUNT];
+extern struct BattleEnigmaBerry gEnigmaBerries[MAX_BATTLERS_COUNT];
+extern struct BattlePokemon gBattleMons[MAX_BATTLERS_COUNT];
 extern u8 gActiveBattler;
 extern u32 gBattleExecBuffer;
-extern u8 gNoOfAllBanks;
-extern u16 gBattlerPartyIndexes[BATTLE_BANKS_COUNT];
-extern u8 gBanksByTurnOrder[BATTLE_BANKS_COUNT];
-extern u8 gActionsByTurnOrder[BATTLE_BANKS_COUNT];
+extern u8 gBattlersCount;
+extern u16 gBattlerPartyIndexes[MAX_BATTLERS_COUNT];
+extern u8 gBanksByTurnOrder[MAX_BATTLERS_COUNT];
+extern u8 gActionsByTurnOrder[MAX_BATTLERS_COUNT];
 extern u16 gCurrentMove;
 extern u8 gLastUsedAbility;
 extern u16 gBattleWeather;
@@ -142,8 +142,8 @@ extern const u8 gTypeEffectiveness[];
 extern u16 gLastUsedItem;
 extern u16 gBattleMovePower;
 extern s32 gHpDealt;
-extern s32 gTakenDmg[BATTLE_BANKS_COUNT];
-extern u8 gTakenDmgBanks[BATTLE_BANKS_COUNT];
+extern s32 gTakenDmg[MAX_BATTLERS_COUNT];
+extern u8 gTakenDmgBanks[MAX_BATTLERS_COUNT];
 extern const u16 gMissStringIds[];
 extern u8 gSentPokesToOpponent[2];
 extern u8 gBank1;
@@ -1152,7 +1152,7 @@ static void atk00_attackcanceler(void)
         return;
     }
 
-    for (i = 0; i < gNoOfAllBanks; i++)
+    for (i = 0; i < gBattlersCount; i++)
     {
         if ((gProtectStructs[gBanksByTurnOrder[i]].stealMove) && gBattleMoves[gCurrentMove].flags & FLAG_SNATCH_AFFECTED)
         {
@@ -2352,7 +2352,7 @@ static void atk14_printselectionstringfromtable(void)
 u8 BankGetTurnOrder(u8 bank)
 {
     int i;
-    for (i = 0; i < gNoOfAllBanks; i++)
+    for (i = 0; i < gBattlersCount; i++)
     {
         if (gBanksByTurnOrder[i] == bank)
             break;
@@ -2406,12 +2406,12 @@ void SetMoveEffect(bool8 primary, u8 certainArg)
             //check active uproar
             if (gBattleMons[gEffectBank].ability != ABILITY_SOUNDPROOF)
             {
-                for (gActiveBattler = 0; gActiveBattler < gNoOfAllBanks && !(gBattleMons[gActiveBattler].status2 & STATUS2_UPROAR); gActiveBattler++) {}
+                for (gActiveBattler = 0; gActiveBattler < gBattlersCount && !(gBattleMons[gActiveBattler].status2 & STATUS2_UPROAR); gActiveBattler++) {}
             }
             else
-                gActiveBattler = gNoOfAllBanks;
+                gActiveBattler = gBattlersCount;
             if (gBattleMons[gEffectBank].status1) {break;}
-            if (gActiveBattler != gNoOfAllBanks) {break;} //nice way of checking uproar...
+            if (gActiveBattler != gBattlersCount) {break;} //nice way of checking uproar...
             if (gBattleMons[gEffectBank].ability == ABILITY_VITAL_SPIRIT) {break;}
             if (gBattleMons[gEffectBank].ability == ABILITY_INSOMNIA) {break;}
 
@@ -3061,7 +3061,7 @@ _0801E57A:\n\
     ldr r0, _0801E5D4 @ =gActiveBattler\n\
     movs r1, 0\n\
     strb r1, [r0]\n\
-    ldr r1, _0801E5D8 @ =gNoOfAllBanks\n\
+    ldr r1, _0801E5D8 @ =gBattlersCount\n\
     ldrb r3, [r1]\n\
     adds r7, r0, 0\n\
     mov r12, r1\n\
@@ -3096,10 +3096,10 @@ _0801E5B4:\n\
     b _0801E5E8\n\
     .align 2, 0\n\
 _0801E5D4: .4byte gActiveBattler\n\
-_0801E5D8: .4byte gNoOfAllBanks\n\
+_0801E5D8: .4byte gBattlersCount\n\
 _0801E5DC:\n\
     ldr r0, _0801E628 @ =gActiveBattler\n\
-    ldr r2, _0801E62C @ =gNoOfAllBanks\n\
+    ldr r2, _0801E62C @ =gBattlersCount\n\
     ldrb r1, [r2]\n\
     strb r1, [r0]\n\
     adds r7, r0, 0\n\
@@ -3142,7 +3142,7 @@ _0801E620:\n\
     b _0801EA04\n\
     .align 2, 0\n\
 _0801E628: .4byte gActiveBattler\n\
-_0801E62C: .4byte gNoOfAllBanks\n\
+_0801E62C: .4byte gBattlersCount\n\
 _0801E630:\n\
     mov r2, r8\n\
     ldrb r1, [r2]\n\
@@ -5662,13 +5662,13 @@ static void atk24(void)
 
         //I can't for the love of god decompile that part
 
-        for (found1 = 0, i = 0; i < gNoOfAllBanks; i += 2)
+        for (found1 = 0, i = 0; i < gBattlersCount; i += 2)
         {
             if ((gHitMarker & HITMARKER_UNK(i)) && !gSpecialStatuses[i].flag40)
                 found1++;
         }
 
-        for (found2 = 0, i = 1; i < gNoOfAllBanks; i += 2)
+        for (found2 = 0, i = 1; i < gBattlersCount; i += 2)
         {
             if ((gHitMarker & HITMARKER_UNK(i)) && !gSpecialStatuses[i].flag40)
                 found2++;
@@ -5791,7 +5791,7 @@ _08020A54:\n\
     beq _08020B3E\n\
     movs r2, 0\n\
     movs r5, 0\n\
-    ldr r0, _08020B04 @ =gNoOfAllBanks\n\
+    ldr r0, _08020B04 @ =gBattlersCount\n\
     ldrb r3, [r0]\n\
     mov r12, r0\n\
     ldr r7, _08020B08 @ =gBattlescriptCurrInstr\n\
@@ -5868,7 +5868,7 @@ _08020AF4: .4byte gPlayerParty\n\
 _08020AF8: .4byte gBattleOutcome\n\
 _08020AFC: .4byte gEnemyParty\n\
 _08020B00: .4byte gBattleTypeFlags\n\
-_08020B04: .4byte gNoOfAllBanks\n\
+_08020B04: .4byte gBattlersCount\n\
 _08020B08: .4byte gBattlescriptCurrInstr\n\
 _08020B0C: .4byte gHitMarker\n\
 _08020B10: .4byte gSpecialStatuses\n\
@@ -6844,7 +6844,7 @@ static void atk49_moveend(void)
             gBattleStruct->cmd49StateTracker++;
             break;
         case 7: //changed held items
-            for (i = 0; i < gNoOfAllBanks; i++)
+            for (i = 0; i < gBattlersCount; i++)
             {
                 #define CHANGED_ITEM (((*u16)(gSharedMem + 0x160F0)))
                 if (CHANGED_ITEM(i))
@@ -7408,7 +7408,7 @@ _08021C38: .4byte gBattleMons\n\
 _08021C3C: .4byte gBankAttacker\n\
 _08021C40:\n\
     movs r4, 0\n\
-    ldr r0, _08021C6C @ =gNoOfAllBanks\n\
+    ldr r0, _08021C6C @ =gBattlersCount\n\
     ldrb r2, [r0]\n\
     cmp r4, r2\n\
     blt _08021C4C\n\
@@ -7432,7 +7432,7 @@ _08021C5C:\n\
     blt _08021C52\n\
     b _08022244\n\
     .align 2, 0\n\
-_08021C6C: .4byte gNoOfAllBanks\n\
+_08021C6C: .4byte gBattlersCount\n\
 _08021C70: .4byte gSharedMem + 0x160F0\n\
 _08021C74: .4byte gBattleMons\n\
 _08021C78:\n\
@@ -7588,7 +7588,7 @@ _08021DAC:\n\
     lsls r0, 29\n\
     cmp r0, 0\n\
     blt _08021DFA\n\
-    ldr r0, _08021E14 @ =gNoOfAllBanks\n\
+    ldr r0, _08021E14 @ =gBattlersCount\n\
     ldrb r0, [r0]\n\
     cmp r3, r0\n\
     bcs _08021DFA\n\
@@ -7627,7 +7627,7 @@ _08021E00:\n\
     .align 2, 0\n\
 _08021E0C: .4byte gSpecialStatuses\n\
 _08021E10: .4byte gBankTarget\n\
-_08021E14: .4byte gNoOfAllBanks\n\
+_08021E14: .4byte gBattlersCount\n\
 _08021E18: .4byte gStatuses3\n\
 _08021E1C: .4byte 0x000400c0\n\
 _08021E20: .4byte gActiveBattler\n\
@@ -7636,7 +7636,7 @@ _08021E28: .4byte gSharedMem\n\
 _08021E2C: .4byte 0x0001600c\n\
 _08021E30:\n\
     movs r4, 0\n\
-    ldr r0, _08021E60 @ =gNoOfAllBanks\n\
+    ldr r0, _08021E60 @ =gBattlersCount\n\
     ldrb r5, [r0]\n\
     cmp r4, r5\n\
     blt _08021E3C\n\
@@ -7662,7 +7662,7 @@ _08021E50:\n\
     blt _08021E44\n\
     b _08022244\n\
     .align 2, 0\n\
-_08021E60: .4byte gNoOfAllBanks\n\
+_08021E60: .4byte gBattlersCount\n\
 _08021E64: .4byte gDisableStructs\n\
 _08021E68: .4byte 0xfeffffff\n\
 _08021E6C: .4byte gUnknown_02024AD0\n\
@@ -8456,7 +8456,7 @@ static void atk50_openpartyscreen(void)
     {
         if ((gBattleTypeFlags & (BATTLE_TYPE_DOUBLE | BATTLE_TYPE_MULTI)) != BATTLE_TYPE_DOUBLE)
         {
-            for (gActiveBattler = i; gActiveBattler < gNoOfAllBanks; gActiveBattler++)
+            for (gActiveBattler = i; gActiveBattler < gBattlersCount; gActiveBattler++)
             {
                 if (!(gHitMarker & HITMARKER_FAINTED(gActiveBattler)))
                 {
@@ -8538,7 +8538,7 @@ _08022ACE:\n\
     beq _08022BBC\n\
     ldr r1, _08022B4C @ =gActiveBattler\n\
     strb r7, [r1]\n\
-    ldr r0, _08022B50 @ =gNoOfAllBanks\n\
+    ldr r0, _08022B50 @ =gBattlersCount\n\
     ldrb r0, [r0]\n\
     cmp r7, r0\n\
     bcc _08022AE8\n\
@@ -8592,7 +8592,7 @@ _08022AF2:\n\
 _08022B44: .4byte gBattlescriptCurrInstr\n\
 _08022B48: .4byte gBattleTypeFlags\n\
 _08022B4C: .4byte gActiveBattler\n\
-_08022B50: .4byte gNoOfAllBanks\n\
+_08022B50: .4byte gBattlersCount\n\
 _08022B54: .4byte gHitMarker\n\
 _08022B58: .4byte gBitTable\n\
 _08022B5C: .4byte gAbsentBattlerFlags\n\
@@ -8631,7 +8631,7 @@ _08022BA2:\n\
     ldrb r0, [r4]\n\
     adds r0, 0x1\n\
     strb r0, [r4]\n\
-    ldr r1, _08022BB8 @ =gNoOfAllBanks\n\
+    ldr r1, _08022BB8 @ =gBattlersCount\n\
     lsls r0, 24\n\
     lsrs r0, 24\n\
     ldrb r1, [r1]\n\
@@ -8639,7 +8639,7 @@ _08022BA2:\n\
     bcc _08022AF2\n\
     b _08022F62\n\
     .align 2, 0\n\
-_08022BB8: .4byte gNoOfAllBanks\n\
+_08022BB8: .4byte gBattlersCount\n\
 _08022BBC:\n\
     ands r1, r0\n\
     cmp r1, 0\n\
@@ -9277,7 +9277,7 @@ _08023110:\n\
     ldr r4, _08023168 @ =gBitTable\n\
     ldr r2, [r4]\n\
     ands r2, r5\n\
-    ldr r6, _0802316C @ =gNoOfAllBanks\n\
+    ldr r6, _0802316C @ =gBattlersCount\n\
     cmp r2, 0\n\
     bne _0802314C\n\
     adds r7, r6, 0\n\
@@ -9314,7 +9314,7 @@ _08023156:\n\
 _08023160: .4byte gHitMarker\n\
 _08023164: .4byte gBank1\n\
 _08023168: .4byte gBitTable\n\
-_0802316C: .4byte gNoOfAllBanks\n\
+_0802316C: .4byte gBattlersCount\n\
 _08023170:\n\
     movs r0, 0x80\n\
     ands r0, r2\n\
@@ -9436,7 +9436,7 @@ _0802325A:\n\
     ldr r1, _080232A0 @ =gActiveBattler\n\
     movs r0, 0\n\
     strb r0, [r1]\n\
-    ldr r0, _080232C0 @ =gNoOfAllBanks\n\
+    ldr r0, _080232C0 @ =gBattlersCount\n\
     ldrb r0, [r0]\n\
     cmp r0, 0\n\
     beq _08023302\n\
@@ -9454,7 +9454,7 @@ _0802328A:\n\
     ldrb r0, [r4]\n\
     adds r0, 0x1\n\
     strb r0, [r4]\n\
-    ldr r1, _080232C0 @ =gNoOfAllBanks\n\
+    ldr r1, _080232C0 @ =gBattlersCount\n\
     lsls r0, 24\n\
     lsrs r0, 24\n\
     ldrb r1, [r1]\n\
@@ -9470,7 +9470,7 @@ _080232B0: .4byte 0x00016068\n\
 _080232B4: .4byte 0x0001606c\n\
 _080232B8: .4byte gBattleResults\n\
 _080232BC: .4byte gBattleTypeFlags\n\
-_080232C0: .4byte gNoOfAllBanks\n\
+_080232C0: .4byte gBattlersCount\n\
 _080232C4:\n\
     adds r0, r7, 0\n\
     bl GetBattlerPosition\n\
@@ -9525,7 +9525,7 @@ static void atk51_switchhandleorder(void)
     switch (T2_READ_8(gBattlescriptCurrInstr + 2))
     {
     case 0:
-        for (i = 0; i < gNoOfAllBanks; i++)
+        for (i = 0; i < gBattlersCount; i++)
         {
             if (gBattleBufferB[i][0] == 0x22)
                 ewram16068arr(i) = gBattleBufferB[i][1];
@@ -9608,13 +9608,13 @@ static void atk52_switchineffects(void)
         {
             gSideAffecting[GetBattlerSide(gActiveBattler)] &= ~(SIDE_STATUS_SPIKES_DAMAGED);
 
-            for (i = 0; i < gNoOfAllBanks; i++)
+            for (i = 0; i < gBattlersCount; i++)
             {
                 if (gBanksByTurnOrder[i] == gActiveBattler)
                     gActionsByTurnOrder[i] = 0xC;
             }
 
-            for (i = 0; i < gNoOfAllBanks; i++)
+            for (i = 0; i < gBattlersCount; i++)
             {
                 *(HP_ON_SWITCHOUT + GetBattlerSide(i)) = gBattleMons[i].hp;
             }
@@ -9627,7 +9627,7 @@ static void atk52_switchineffects(void)
                 {
                     if (hitmark & gBitTable[gBank1] && !(gAbsentBattlerFlags & gBitTable[gBank1]))
                         break;
-                    if (gBank1 >= gNoOfAllBanks)
+                    if (gBank1 >= gBattlersCount)
                         break;
                     gBank1++;
                 }
@@ -10422,7 +10422,7 @@ static void atk67_yesnobox(void)
 static void atk68_cancelallactions(void)
 {
     int i;
-    for (i = 0; i < gNoOfAllBanks; i++)
+    for (i = 0; i < gBattlersCount; i++)
     {
         gActionsByTurnOrder[i] = 0xC;
     }
@@ -11100,7 +11100,7 @@ static void atk77_setprotectlike(void) //protect and endure
 
     if (last_move != MOVE_PROTECT && last_move != MOVE_DETECT && last_move != MOVE_ENDURE)
         gDisableStructs[gBankAttacker].protectUses = 0;
-    if (gCurrentTurnActionNumber == (gNoOfAllBanks - 1))
+    if (gCurrentTurnActionNumber == (gBattlersCount - 1))
         not_last_turn = 0;
 
     if (sProtectSuccessRates[gDisableStructs[gBankAttacker].protectUses] > Random() && not_last_turn)
@@ -11132,13 +11132,13 @@ static void atk78_faintifabilitynotdamp(void)
     if (gBattleExecBuffer)
         return;
 
-    for (gBankTarget = 0; gBankTarget < gNoOfAllBanks; gBankTarget++)
+    for (gBankTarget = 0; gBankTarget < gBattlersCount; gBankTarget++)
     {
         if (gBattleMons[gBankTarget].ability == ABILITY_DAMP)
             break;
     }
 
-    if (gBankTarget == gNoOfAllBanks)
+    if (gBankTarget == gBattlersCount)
     {
         gActiveBattler = gBankAttacker;
         gBattleMoveDamage = gBattleMons[gActiveBattler].hp;
@@ -11146,7 +11146,7 @@ static void atk78_faintifabilitynotdamp(void)
         MarkBufferBankForExecution(gActiveBattler);
         gBattlescriptCurrInstr++;
 
-        for (gBankTarget = 0; gBankTarget < gNoOfAllBanks; gBankTarget++)
+        for (gBankTarget = 0; gBankTarget < gBattlersCount; gBankTarget++)
         {
             if (gBankTarget == gBankAttacker)
                 continue;
@@ -11189,7 +11189,7 @@ static void atk7A_jumpifnexttargetvalid(void) //used by intimidate to loop throu
                 break;
         }
 
-        if (gBankTarget >= gNoOfAllBanks)
+        if (gBankTarget >= gBattlersCount)
             gBattlescriptCurrInstr += 5;
         else
             gBattlescriptCurrInstr = jump_loc;
@@ -11378,7 +11378,7 @@ static void atk83_nop(void)
 bool8 UproarWakeUpCheck(u8 bank)
 {
     int i;
-    for (i = 0; i < gNoOfAllBanks; i++)
+    for (i = 0; i < gBattlersCount; i++)
     {
         if (!(gBattleMons[i].status2 & STATUS2_UPROAR) || gBattleMons[bank].ability == ABILITY_SOUNDPROOF) //wtf gamefreak, you should check this only once, not every time in a loop...
             continue;
@@ -11391,7 +11391,7 @@ bool8 UproarWakeUpCheck(u8 bank)
             gBattleCommunication[MULTISTRING_CHOOSER] = 1;
         break;
     }
-    if (i == gNoOfAllBanks)
+    if (i == gBattlersCount)
         return 0;
     else
         return 1;
@@ -11677,7 +11677,7 @@ static void atk89_statbuffchange(void)
 static void atk8A_normalisebuffs(void) //haze
 {
     int i, j;
-    for (i = 0; i < gNoOfAllBanks; i++)
+    for (i = 0; i < gBattlersCount; i++)
     {
         for (j = 0; j < 8; j++)
         {
@@ -13668,7 +13668,7 @@ static void atkB2_trysetperishsong(void)
 {
     int not_affected_pokes = 0, i;
 
-    for (i = 0; i < gNoOfAllBanks; i++)
+    for (i = 0; i < gBattlersCount; i++)
     {
         if (gStatuses3[i] & STATUS3_PERISH_SONG || gBattleMons[i].ability == ABILITY_SOUNDPROOF)
             not_affected_pokes++;
@@ -13681,7 +13681,7 @@ static void atkB2_trysetperishsong(void)
     }
 
     PressurePPLoseOnUsingPerishSong(gBankAttacker);
-    if (not_affected_pokes == gNoOfAllBanks)
+    if (not_affected_pokes == gBattlersCount)
         gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1);
     else
         gBattlescriptCurrInstr += 5;
@@ -13846,7 +13846,7 @@ static void atkB9_magnitudedamagecalculation(void)
     gBattleTextBuff1[4] = magnitude;
     gBattleTextBuff1[5] = 0xFF;
 
-    for (gBankTarget = 0; gBankTarget < gNoOfAllBanks; gBankTarget++)
+    for (gBankTarget = 0; gBankTarget < gBattlersCount; gBankTarget++)
     {
         if (gBankTarget == gBankAttacker)
             continue;
@@ -13877,7 +13877,7 @@ static void atkBA_jumpifnopursuitswitchdmg(void)
         && gBattleMons[gBankAttacker].hp && !gDisableStructs[gBankTarget].truantCounter && gChosenMovesByBanks[gBankTarget] == MOVE_PURSUIT)
     {
         int i;
-        for (i = 0; i < gNoOfAllBanks; i++)
+        for (i = 0; i < gBattlersCount; i++)
         {
             if (gBanksByTurnOrder[i] == gBankTarget)
                 gActionsByTurnOrder[i] = 11;
@@ -14148,7 +14148,7 @@ _080298A8: .4byte gBattlescriptCurrInstr\n\
 
 static void atkC2_selectfirstvalidtarget(void)
 {
-    for (gBankTarget = 0; gBankTarget < gNoOfAllBanks; gBankTarget++)
+    for (gBankTarget = 0; gBankTarget < gBattlersCount; gBankTarget++)
     {
         if (gBankTarget == gBankAttacker)
             continue;
@@ -15100,7 +15100,7 @@ static void atkDB_tryimprision(void)
     {
         u8 bank;
         PressurePPLoseOnUsingImprision(gBankAttacker);
-        for (bank = 0; bank < gNoOfAllBanks; bank++)
+        for (bank = 0; bank < gBattlersCount; bank++)
         {
             if (r8 != GetBattlerSide(bank))
             {
@@ -15124,7 +15124,7 @@ static void atkDB_tryimprision(void)
                 }
             }
         }
-        if (bank == gNoOfAllBanks)
+        if (bank == gBattlersCount)
             gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1);
     }
 }
@@ -15401,7 +15401,7 @@ static void atkDF_trysetmagiccoat(void)
 {
     gBankTarget = gBankAttacker;
     gSpecialStatuses[gBankAttacker].flag20 = 1;
-    if (gCurrentTurnActionNumber == gNoOfAllBanks - 1) //last turn
+    if (gCurrentTurnActionNumber == gBattlersCount - 1) //last turn
         gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1);
     else
     {
@@ -15413,7 +15413,7 @@ static void atkDF_trysetmagiccoat(void)
 static void atkE0_trysetsnatch(void)
 {
     gSpecialStatuses[gBankAttacker].flag20 = 1;
-    if (gCurrentTurnActionNumber == gNoOfAllBanks - 1) //last turn
+    if (gCurrentTurnActionNumber == gBattlersCount - 1) //last turn
         gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1);
     else
     {
@@ -15433,7 +15433,7 @@ static void atkE1_trygetintimidatetarget(void)
     gBattleTextBuff1[2] = gBattleMons[gBattleStruct->scriptingActive].ability;
     gBattleTextBuff1[3] = 0xFF;
 
-    for (;gBankTarget < gNoOfAllBanks; gBankTarget++)
+    for (;gBankTarget < gBattlersCount; gBankTarget++)
     {
         if (GetBattlerSide(gBankTarget) == side)
             continue;
@@ -15441,7 +15441,7 @@ static void atkE1_trygetintimidatetarget(void)
             break;
     }
 
-    if (gBankTarget >= gNoOfAllBanks)
+    if (gBankTarget >= gBattlersCount)
         gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1);
     else
         gBattlescriptCurrInstr += 5;
@@ -16061,5 +16061,5 @@ static void atkF6_finishaction(void)
 static void atkF7_finishturn(void)
 {
     gCurrentActionFuncId = 0xC;
-    gCurrentTurnActionNumber = gNoOfAllBanks;
+    gCurrentTurnActionNumber = gBattlersCount;
 }
diff --git a/src/battle/battle_7.c b/src/battle/battle_7.c
index 70863a9fd..914ee245b 100644
--- a/src/battle/battle_7.c
+++ b/src/battle/battle_7.c
@@ -24,7 +24,7 @@
 
 extern u8 gBattleBufferA[][0x200];
 extern u8 gActiveBattler;
-extern u8 gNoOfAllBanks;
+extern u8 gBattlersCount;
 extern u16 gBattlerPartyIndexes[];
 extern u8 gBanksBySide[];
 extern u8 gBankSpriteIds[];
@@ -96,7 +96,7 @@ extern void c3_0802FDF4(u8);
 extern void sub_80440EC();
 extern void sub_804777C();
 extern void sub_8141828();
-extern u8 GetBankPosition();
+extern u8 GetBattlerSpriteCoord();
 extern u8 IsBankSpritePresent(u8);
 extern u8 sub_8077F68(u8);
 extern u8 sub_8077F7C(u8);
@@ -558,7 +558,7 @@ u8 battle_load_something(u8 *pState, u8 *b)
         else
             gHealthboxIDs[*b] = battle_make_oam_normal_battle(*b);
         (*b)++;
-        if (*b == gNoOfAllBanks)
+        if (*b == gBattlersCount)
         {
             *b = 0;
             (*pState)++;
@@ -571,7 +571,7 @@ u8 battle_load_something(u8 *pState, u8 *b)
         else
             nullsub_11(gHealthboxIDs[*b], 1);
         (*b)++;
-        if (*b == gNoOfAllBanks)
+        if (*b == gBattlersCount)
         {
             *b = 0;
             (*pState)++;
@@ -589,7 +589,7 @@ u8 battle_load_something(u8 *pState, u8 *b)
         }
         sub_8043DB0(gHealthboxIDs[*b]);
         (*b)++;
-        if (*b == gNoOfAllBanks)
+        if (*b == gBattlersCount)
         {
             *b = 0;
             (*pState)++;
@@ -620,7 +620,7 @@ void sub_8031F24(void)
 {
     s32 i;
 
-    for (i = 0; i < gNoOfAllBanks; i++)
+    for (i = 0; i < gBattlersCount; i++)
         ewram17800[i].invisible = gSprites[gBankSpriteIds[i]].invisible;
 }
 
@@ -858,7 +858,7 @@ void sub_80326EC(u8 a)
 {
     s32 i;
 
-    for (i = 0; i < gNoOfAllBanks; i++)
+    for (i = 0; i < gBattlersCount; i++)
     {
         if (IsBankSpritePresent(i) != 0)
         {
@@ -882,12 +882,12 @@ void sub_80327CC(void)
 
     LoadCompressedObjectPic(&gUnknown_081FAF24);
     r5 = GetBattlerAtPosition(1);
-    ewram17810[r5].unk7 = CreateSprite(&gSpriteTemplate_81FAF34, GetBankPosition(r5, 0), GetBankPosition(r5, 1) + 32, 0xC8);
+    ewram17810[r5].unk7 = CreateSprite(&gSpriteTemplate_81FAF34, GetBattlerSpriteCoord(r5, 0), GetBattlerSpriteCoord(r5, 1) + 32, 0xC8);
     gSprites[ewram17810[r5].unk7].data[0] = r5;
     if (IsDoubleBattle())
     {
         r5 = GetBattlerAtPosition(3);
-        ewram17810[r5].unk7 = CreateSprite(&gSpriteTemplate_81FAF34, GetBankPosition(r5, 0), GetBankPosition(r5, 1) + 32, 0xC8);
+        ewram17810[r5].unk7 = CreateSprite(&gSpriteTemplate_81FAF34, GetBattlerSpriteCoord(r5, 0), GetBattlerSpriteCoord(r5, 1) + 32, 0xC8);
         gSprites[ewram17810[r5].unk7].data[0] = r5;
     }
 }
diff --git a/src/battle/battle_ai_switch_items.c b/src/battle/battle_ai_switch_items.c
index fd1d23684..7edd3ce94 100755
--- a/src/battle/battle_ai_switch_items.c
+++ b/src/battle/battle_ai_switch_items.c
@@ -27,7 +27,7 @@ extern u16 gBattlerPartyIndexes[];
 extern u16 gLastLandedMoves[];
 extern const u8 gTypeEffectiveness[];
 extern struct BattlePokemon gBattleMons[];
-extern u32 gStatuses3[BATTLE_BANKS_COUNT];
+extern u32 gStatuses3[MAX_BATTLERS_COUNT];
 
 /*static*/ bool8 HasSuperEffectiveMoveAgainstOpponents(bool8 noRng);
 /*static*/ bool8 FindMonWithFlagsAndSuperEffective(u8 flags, u8 moduloPercent);
@@ -51,7 +51,7 @@ extern u32 gStatuses3[BATTLE_BANKS_COUNT];
 #ifdef NONMATCHING
 /*static*/ bool8 ShouldSwitchIfWonderGuard(void)
 {
-    u8 opposingBank;
+    u8 opposingBattler;
     u8 moveFlags;
     s32 i, j;
 
@@ -62,14 +62,14 @@ extern u32 gStatuses3[BATTLE_BANKS_COUNT];
         return FALSE;
 
     // check if pokemon has a super effective move
-    opposingBank = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
+    opposingBattler = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
     for (i = 0; i < 4; i++)
     {
         u16 move = gBattleMons[gActiveBattler].moves[i];
         if (move == MOVE_NONE)
             continue;
 
-        moveFlags = AI_TypeCalc(move, gBattleMons[opposingBank].species, gBattleMons[opposingBank].ability);
+        moveFlags = AI_TypeCalc(move, gBattleMons[opposingBattler].species, gBattleMons[opposingBattler].ability);
         if (moveFlags & MOVE_RESULT_SUPER_EFFECTIVE)
             return FALSE;
     }
@@ -86,14 +86,14 @@ extern u32 gStatuses3[BATTLE_BANKS_COUNT];
         GetMonData(&gEnemyParty[i], MON_DATA_SPECIES); // unused return value
         GetMonData(&gEnemyParty[i], MON_DATA_ALT_ABILITY); // unused return value
 
-        opposingBank = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
+        opposingBattler = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
         for (j = 0; j < 4; j++)
         {
             u16 move = GetMonData(&gEnemyParty[i], MON_DATA_MOVE1 + j);
             if (move == MOVE_NONE)
                 continue;
 
-            moveFlags = AI_TypeCalc(move, gBattleMons[opposingBank].species, gBattleMons[opposingBank].ability);
+            moveFlags = AI_TypeCalc(move, gBattleMons[opposingBattler].species, gBattleMons[opposingBattler].ability);
             if (moveFlags & MOVE_RESULT_SUPER_EFFECTIVE && (Random() % 3) < 2)
             {
                 // we found a mon
@@ -308,7 +308,7 @@ _080361E4: .4byte gBattlerPartyIndexes\n\
 
 /*static*/ bool8 FindMonThatAbsorbsOpponentsMove(void)
 {
-    u8 bankIn1, bankIn2;
+    u8 battlerIn1, battlerIn2;
     u8 absorbingTypeAbility;
     s32 i;
 
@@ -323,16 +323,16 @@ _080361E4: .4byte gBattlerPartyIndexes\n\
 
     if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
     {
-        bankIn1 = gActiveBattler;
+        battlerIn1 = gActiveBattler;
         if (gAbsentBattlerFlags & gBitTable[GetBattlerAtPosition(BATTLE_PARTNER(GetBattlerPosition(gActiveBattler)))])
-            bankIn2 = gActiveBattler;
+            battlerIn2 = gActiveBattler;
         else
-            bankIn2 = GetBattlerAtPosition(BATTLE_PARTNER(GetBattlerPosition(gActiveBattler)));
+            battlerIn2 = GetBattlerAtPosition(BATTLE_PARTNER(GetBattlerPosition(gActiveBattler)));
     }
     else
     {
-        bankIn1 = gActiveBattler;
-        bankIn2 = gActiveBattler;
+        battlerIn1 = gActiveBattler;
+        battlerIn2 = gActiveBattler;
     }
 
     if (gBattleMoves[gLastLandedMoves[gActiveBattler]].type == TYPE_FIRE)
@@ -358,13 +358,13 @@ _080361E4: .4byte gBattlerPartyIndexes\n\
             continue;
         if (GetMonData(&gEnemyParty[i], MON_DATA_SPECIES2) == SPECIES_EGG)
             continue;
-        if (i == gBattlerPartyIndexes[bankIn1])
+        if (i == gBattlerPartyIndexes[battlerIn1])
             continue;
-        if (i == gBattlerPartyIndexes[bankIn2])
+        if (i == gBattlerPartyIndexes[battlerIn2])
             continue;
-        if (i == ewram16068arr(bankIn1))
+        if (i == ewram16068arr(battlerIn1))
             continue;
-        if (i == ewram16068arr(bankIn2))
+        if (i == ewram16068arr(battlerIn2))
             continue;
 
         species = GetMonData(&gEnemyParty[i], MON_DATA_SPECIES);
@@ -423,13 +423,13 @@ _080361E4: .4byte gBattlerPartyIndexes\n\
 
 /*static*/ bool8 HasSuperEffectiveMoveAgainstOpponents(bool8 noRng)
 {
-    u8 opposingBank;
+    u8 opposingBattler;
     s32 i;
     u8 moveFlags;
     u16 move;
 
-    opposingBank = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
-    if (!(gAbsentBattlerFlags & gBitTable[opposingBank]))
+    opposingBattler = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
+    if (!(gAbsentBattlerFlags & gBitTable[opposingBattler]))
     {
         for (i = 0; i < 4; i++)
         {
@@ -437,7 +437,7 @@ _080361E4: .4byte gBattlerPartyIndexes\n\
             if (move == MOVE_NONE)
                 continue;
 
-            moveFlags = AI_TypeCalc(move, gBattleMons[opposingBank].species, gBattleMons[opposingBank].ability);
+            moveFlags = AI_TypeCalc(move, gBattleMons[opposingBattler].species, gBattleMons[opposingBattler].ability);
             if (moveFlags & MOVE_RESULT_SUPER_EFFECTIVE)
             {
                 if (noRng)
@@ -450,8 +450,8 @@ _080361E4: .4byte gBattlerPartyIndexes\n\
     if (!(gBattleTypeFlags & BATTLE_TYPE_DOUBLE))
         return FALSE;
 
-    opposingBank = GetBattlerAtPosition(BATTLE_PARTNER(B_POSITION_PLAYER_LEFT));
-    if (!(gAbsentBattlerFlags & gBitTable[opposingBank]))
+    opposingBattler = GetBattlerAtPosition(BATTLE_PARTNER(B_POSITION_PLAYER_LEFT));
+    if (!(gAbsentBattlerFlags & gBitTable[opposingBattler]))
     {
         for (i = 0; i < 4; i++)
         {
@@ -459,7 +459,7 @@ _080361E4: .4byte gBattlerPartyIndexes\n\
             if (move == MOVE_NONE)
                 continue;
 
-            moveFlags = AI_TypeCalc(move, gBattleMons[opposingBank].species, gBattleMons[opposingBank].ability);
+            moveFlags = AI_TypeCalc(move, gBattleMons[opposingBattler].species, gBattleMons[opposingBattler].ability);
             if (moveFlags & MOVE_RESULT_SUPER_EFFECTIVE)
             {
                 if (noRng)
@@ -489,7 +489,7 @@ _080361E4: .4byte gBattlerPartyIndexes\n\
 
 /*static*/ bool8 FindMonWithFlagsAndSuperEffective(u8 flags, u8 moduloPercent)
 {
-    u8 bankIn1, bankIn2;
+    u8 battlerIn1, battlerIn2;
     s32 i, j;
     u16 move;
     u8 moveFlags;
@@ -505,16 +505,16 @@ _080361E4: .4byte gBattlerPartyIndexes\n\
 
     if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
     {
-        bankIn1 = gActiveBattler;
+        battlerIn1 = gActiveBattler;
         if (gAbsentBattlerFlags & gBitTable[GetBattlerAtPosition(BATTLE_PARTNER(GetBattlerPosition(gActiveBattler)))])
-            bankIn2 = gActiveBattler;
+            battlerIn2 = gActiveBattler;
         else
-            bankIn2 = GetBattlerAtPosition(BATTLE_PARTNER(GetBattlerPosition(gActiveBattler)));
+            battlerIn2 = GetBattlerAtPosition(BATTLE_PARTNER(GetBattlerPosition(gActiveBattler)));
     }
     else
     {
-        bankIn1 = gActiveBattler;
-        bankIn2 = gActiveBattler;
+        battlerIn1 = gActiveBattler;
+        battlerIn2 = gActiveBattler;
     }
 
     for (i = 0; i < 6; i++)
@@ -528,13 +528,13 @@ _080361E4: .4byte gBattlerPartyIndexes\n\
             continue;
         if (GetMonData(&gEnemyParty[i], MON_DATA_SPECIES2) == SPECIES_EGG)
             continue;
-        if (i == gBattlerPartyIndexes[bankIn1])
+        if (i == gBattlerPartyIndexes[battlerIn1])
             continue;
-        if (i == gBattlerPartyIndexes[bankIn2])
+        if (i == gBattlerPartyIndexes[battlerIn2])
             continue;
-        if (i == ewram16068arr(bankIn1))
+        if (i == ewram16068arr(battlerIn1))
             continue;
-        if (i == ewram16068arr(bankIn2))
+        if (i == ewram16068arr(battlerIn2))
             continue;
 
         species = GetMonData(&gEnemyParty[i], MON_DATA_SPECIES);
@@ -546,7 +546,7 @@ _080361E4: .4byte gBattlerPartyIndexes\n\
         moveFlags = AI_TypeCalc(gLastLandedMoves[gActiveBattler], species, monAbility);
         if (moveFlags & flags)
         {
-            bankIn1 = gLastHitBy[gActiveBattler];
+            battlerIn1 = gLastHitBy[gActiveBattler];
 
             for (j = 0; j < 4; j++)
             {
@@ -554,7 +554,7 @@ _080361E4: .4byte gBattlerPartyIndexes\n\
                 if (move == 0)
                     continue;
 
-                moveFlags = AI_TypeCalc(move, gBattleMons[bankIn1].species, gBattleMons[bankIn1].ability);
+                moveFlags = AI_TypeCalc(move, gBattleMons[battlerIn1].species, gBattleMons[battlerIn1].ability);
                 if (moveFlags & MOVE_RESULT_SUPER_EFFECTIVE && Random() % moduloPercent == 0)
                 {
                     ewram160C8arr(GetBattlerPosition(gActiveBattler)) = i;
@@ -570,7 +570,7 @@ _080361E4: .4byte gBattlerPartyIndexes\n\
 
 /*static*/ bool8 ShouldSwitch(void)
 {
-    u8 bankIn1, bankIn2;
+    u8 battlerIn1, battlerIn2;
     s32 i;
     s32 availableToSwitch;
 
@@ -593,16 +593,16 @@ _080361E4: .4byte gBattlerPartyIndexes\n\
     availableToSwitch = 0;
     if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
     {
-        bankIn1 = gActiveBattler;
+        battlerIn1 = gActiveBattler;
         if (gAbsentBattlerFlags & gBitTable[GetBattlerAtPosition(GetBattlerPosition(gActiveBattler) ^ BIT_FLANK)])
-            bankIn2 = gActiveBattler;
+            battlerIn2 = gActiveBattler;
         else
-            bankIn2 = GetBattlerAtPosition(GetBattlerPosition(gActiveBattler) ^ BIT_FLANK);
+            battlerIn2 = GetBattlerAtPosition(GetBattlerPosition(gActiveBattler) ^ BIT_FLANK);
     }
     else
     {
-        bankIn1 = gActiveBattler;
-        bankIn2 = gActiveBattler;
+        battlerIn1 = gActiveBattler;
+        battlerIn2 = gActiveBattler;
     }
 
     for (i = 0; i < 6; i++)
@@ -613,13 +613,13 @@ _080361E4: .4byte gBattlerPartyIndexes\n\
             continue;
         if (GetMonData(&gEnemyParty[i], MON_DATA_SPECIES2) == SPECIES_EGG)
             continue;
-        if (i == gBattlerPartyIndexes[bankIn1])
+        if (i == gBattlerPartyIndexes[battlerIn1])
             continue;
-        if (i == gBattlerPartyIndexes[bankIn2])
+        if (i == gBattlerPartyIndexes[battlerIn2])
             continue;
-        if (i == ewram16068arr(bankIn1))
+        if (i == ewram16068arr(battlerIn1))
             continue;
-        if (i == ewram16068arr(bankIn2))
+        if (i == ewram16068arr(battlerIn2))
             continue;
 
         availableToSwitch++;
@@ -648,7 +648,7 @@ _080361E4: .4byte gBattlerPartyIndexes\n\
 
 void AI_TrySwitchOrUseItem(void)
 {
-    u8 bankIn1, bankIn2;
+    u8 battlerIn1, battlerIn2;
 
     if (gBattleTypeFlags & BATTLE_TYPE_TRAINER)
     {
@@ -661,26 +661,26 @@ void AI_TrySwitchOrUseItem(void)
                 {
                     if (!(gBattleTypeFlags & BATTLE_TYPE_DOUBLE))
                     {
-                        bankIn1 = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
-                        bankIn2 = bankIn1;
+                        battlerIn1 = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
+                        battlerIn2 = battlerIn1;
                     }
                     else
                     {
-                        bankIn1 = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
-                        bankIn2 = GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT);
+                        battlerIn1 = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
+                        battlerIn2 = GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT);
                     }
 
                     for (monToSwitchId = 0; monToSwitchId < 6; monToSwitchId++)
                     {
                         if (GetMonData(&gEnemyParty[monToSwitchId], MON_DATA_HP) == 0)
                             continue;
-                        if (monToSwitchId == gBattlerPartyIndexes[bankIn1])
+                        if (monToSwitchId == gBattlerPartyIndexes[battlerIn1])
                             continue;
-                        if (monToSwitchId == gBattlerPartyIndexes[bankIn2])
+                        if (monToSwitchId == gBattlerPartyIndexes[battlerIn2])
                             continue;
-                        if (monToSwitchId == ewram16068arr(bankIn1))
+                        if (monToSwitchId == ewram16068arr(battlerIn1))
                             continue;
-                        if (monToSwitchId == ewram16068arr(bankIn2))
+                        if (monToSwitchId == ewram16068arr(battlerIn2))
                             continue;
 
                         break;
@@ -734,32 +734,32 @@ void AI_TrySwitchOrUseItem(void)
 
 u8 GetMostSuitableMonToSwitchInto(void)
 {
-    u8 opposingBank;
+    u8 opposingBattler;
     u8 bestDmg; // note : should be changed to s32
     u8 bestMonId;
-    u8 bankIn1, bankIn2;
+    u8 battlerIn1, battlerIn2;
     s32 i, j;
     u8 invalidMons;
     u16 move;
 
     if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
     {
-        bankIn1 = gActiveBattler;
+        battlerIn1 = gActiveBattler;
         if (gAbsentBattlerFlags & gBitTable[GetBattlerAtPosition(GetBattlerPosition(gActiveBattler) ^ BIT_FLANK)])
-            bankIn2 = gActiveBattler;
+            battlerIn2 = gActiveBattler;
         else
-            bankIn2 = GetBattlerAtPosition(GetBattlerPosition(gActiveBattler) ^ BIT_FLANK);
+            battlerIn2 = GetBattlerAtPosition(GetBattlerPosition(gActiveBattler) ^ BIT_FLANK);
 
         // UB: It considers the opponent only player's side even though it can battle alongside player;
-        opposingBank = Random() & BIT_FLANK;
-        if (gAbsentBattlerFlags & gBitTable[opposingBank])
-            opposingBank ^= BIT_FLANK;
+        opposingBattler = Random() & BIT_FLANK;
+        if (gAbsentBattlerFlags & gBitTable[opposingBattler])
+            opposingBattler ^= BIT_FLANK;
     }
     else
     {
-        opposingBank = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
-        bankIn1 = gActiveBattler;
-        bankIn2 = gActiveBattler;
+        opposingBattler = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
+        battlerIn1 = gActiveBattler;
+        battlerIn2 = gActiveBattler;
     }
 
     invalidMons = 0;
@@ -775,16 +775,16 @@ u8 GetMostSuitableMonToSwitchInto(void)
             if (species != SPECIES_NONE
                 && GetMonData(&gEnemyParty[i], MON_DATA_HP) != 0
                 && !(gBitTable[i] & invalidMons)
-                && gBattlerPartyIndexes[bankIn1] != i
-                && gBattlerPartyIndexes[bankIn2] != i
-                && i != ewram16068arr(bankIn1)
-                && i != ewram16068arr(bankIn2))
+                && gBattlerPartyIndexes[battlerIn1] != i
+                && gBattlerPartyIndexes[battlerIn2] != i
+                && i != ewram16068arr(battlerIn1)
+                && i != ewram16068arr(battlerIn2))
             {
                 u8 type1 = gBaseStats[species].type1;
                 u8 type2 = gBaseStats[species].type2;
                 u8 typeDmg = 10;
-                ModulateByTypeEffectiveness(gBattleMons[opposingBank].type1, type1, type2, &typeDmg);
-                ModulateByTypeEffectiveness(gBattleMons[opposingBank].type2, type1, type2, &typeDmg);
+                ModulateByTypeEffectiveness(gBattleMons[opposingBattler].type1, type1, type2, &typeDmg);
+                ModulateByTypeEffectiveness(gBattleMons[opposingBattler].type2, type1, type2, &typeDmg);
                 if (bestDmg < typeDmg)
                 {
                     bestDmg = typeDmg;
@@ -803,7 +803,7 @@ u8 GetMostSuitableMonToSwitchInto(void)
             for (i = 0; i < 4; i++)
             {
                 move = GetMonData(&gEnemyParty[bestMonId], MON_DATA_MOVE1 + i);
-                if (move != MOVE_NONE && TypeCalc(move, gActiveBattler, opposingBank) & MOVE_RESULT_SUPER_EFFECTIVE)
+                if (move != MOVE_NONE && TypeCalc(move, gActiveBattler, opposingBattler) & MOVE_RESULT_SUPER_EFFECTIVE)
                     break;
             }
 
@@ -833,13 +833,13 @@ u8 GetMostSuitableMonToSwitchInto(void)
             continue;
         if (GetMonData(&gEnemyParty[i], MON_DATA_HP) == 0)
             continue;
-        if (gBattlerPartyIndexes[bankIn1] == i)
+        if (gBattlerPartyIndexes[battlerIn1] == i)
             continue;
-        if (gBattlerPartyIndexes[bankIn2] == i)
+        if (gBattlerPartyIndexes[battlerIn2] == i)
             continue;
-        if (i == ewram16068arr(bankIn1))
+        if (i == ewram16068arr(battlerIn1))
             continue;
-        if (i == ewram16068arr(bankIn2))
+        if (i == ewram16068arr(battlerIn2))
             continue;
 
         for (j = 0; j < 4; j++)
@@ -848,8 +848,8 @@ u8 GetMostSuitableMonToSwitchInto(void)
             gBattleMoveDamage = 0;
             if (move != MOVE_NONE && gBattleMoves[move].power != 1)
             {
-                AI_CalcDmg(gActiveBattler, opposingBank);
-                TypeCalc(move, gActiveBattler, opposingBank);
+                AI_CalcDmg(gActiveBattler, opposingBattler);
+                TypeCalc(move, gActiveBattler, opposingBattler);
             }
             if (bestDmg < gBattleMoveDamage)
             {
@@ -900,7 +900,7 @@ u8 GetMostSuitableMonToSwitchInto(void)
         u16 item;
         const u8 *itemEffects;
         u8 paramOffset;
-        u8 bankSide;
+        u8 battlerSide;
 
         if (i != 0 && validMons > (AI_BATTLE_HISTORY->numItems - i) + 1)
             continue;
@@ -987,8 +987,8 @@ u8 GetMostSuitableMonToSwitchInto(void)
             shouldUse = TRUE;
             break;
         case AI_ITEM_GUARD_SPECS:
-            bankSide = GetBattlerSide(gActiveBattler);
-            if (gDisableStructs[gActiveBattler].isFirstTurn != 0 && gSideTimers[bankSide].mistTimer == 0)
+            battlerSide = GetBattlerSide(gActiveBattler);
+            if (gDisableStructs[gActiveBattler].isFirstTurn != 0 && gSideTimers[battlerSide].mistTimer == 0)
                 shouldUse = TRUE;
             break;
         case AI_ITEM_NOT_RECOGNIZABLE:
diff --git a/src/battle/battle_anim.c b/src/battle/battle_anim.c
index ca2431f15..a3360096a 100644
--- a/src/battle/battle_anim.c
+++ b/src/battle/battle_anim.c
@@ -1679,7 +1679,7 @@ static void ScriptCmd_createsprite(void)
     if (subpriority < 3)
         subpriority = 3;
 
-    CreateSpriteAndAnimate(template, GetBankPosition(gAnimBankTarget, 2), GetBankPosition(gAnimBankTarget, 3), subpriority);
+    CreateSpriteAndAnimate(template, GetBattlerSpriteCoord(gAnimBankTarget, 2), GetBattlerSpriteCoord(gAnimBankTarget, 3), subpriority);
     gAnimVisualTaskCount++;
 }
 
@@ -3097,7 +3097,7 @@ static void ScriptCmd_invisible(void)
 {
     u8 spriteId;
 
-    spriteId = GetAnimBankSpriteId(T1_READ_8(sBattleAnimScriptPtr + 1));
+    spriteId = GetAnimBattlerSpriteId(T1_READ_8(sBattleAnimScriptPtr + 1));
     if (spriteId != 0xFF)
         gSprites[spriteId].invisible = TRUE;
 
@@ -3108,7 +3108,7 @@ static void ScriptCmd_visible(void)
 {
     u8 spriteId;
 
-    spriteId = GetAnimBankSpriteId(T1_READ_8(sBattleAnimScriptPtr + 1));
+    spriteId = GetAnimBattlerSpriteId(T1_READ_8(sBattleAnimScriptPtr + 1));
     if (spriteId != 0xFF)
         gSprites[spriteId].invisible = FALSE;
 
@@ -3129,12 +3129,12 @@ static void ScriptCmd_doublebattle_2D(void)
         if (wantedBank == 0)
         {
             r4 = GetBattlerPosition_permutated(gAnimBankAttacker);
-            spriteId = GetAnimBankSpriteId(0);
+            spriteId = GetAnimBattlerSpriteId(0);
         }
         else
         {
             r4 = GetBattlerPosition_permutated(gAnimBankTarget);
-            spriteId = GetAnimBankSpriteId(1);
+            spriteId = GetAnimBattlerSpriteId(1);
         }
         if (spriteId != 0xFF)
         {
@@ -3163,12 +3163,12 @@ static void ScriptCmd_doublebattle_2E(void)
         if (wantedBank == 0)
         {
             r4 = GetBattlerPosition_permutated(gAnimBankAttacker);
-            spriteId = GetAnimBankSpriteId(0);
+            spriteId = GetAnimBattlerSpriteId(0);
         }
         else
         {
             r4 = GetBattlerPosition_permutated(gAnimBankTarget);
-            spriteId = GetAnimBankSpriteId(1);
+            spriteId = GetAnimBattlerSpriteId(1);
         }
         if (spriteId != 0xFF && r4 == 2)
         {
diff --git a/src/battle/battle_anim_807B69C.c b/src/battle/battle_anim_807B69C.c
index 6043efb0c..92099c495 100644
--- a/src/battle/battle_anim_807B69C.c
+++ b/src/battle/battle_anim_807B69C.c
@@ -22,7 +22,7 @@ extern const u8 *const gBattleAnims_StatusConditions[];
 extern const struct OamData gOamData_837E05C;
 extern const struct OamData gOamData_837DF24;
 
-extern u8 GetBankPosition(u8, u8);
+extern u8 GetBattlerSpriteCoord(u8, u8);
 extern void sub_80E32E0(u8);
 
 
@@ -180,8 +180,8 @@ static void sub_807B8A4(struct Sprite *sprite)
 
 void sub_807B920(u8 taskId)
 {
-    s16 x = GetBankPosition(gAnimBankTarget, 2) - 32;
-    s16 y = GetBankPosition(gAnimBankTarget, 3) - 36;
+    s16 x = GetBattlerSpriteCoord(gAnimBankTarget, 2) - 32;
+    s16 y = GetBattlerSpriteCoord(gAnimBankTarget, 3) - 36;
     u8 spriteId;
 
     if (IsContest())
diff --git a/src/battle/battle_anim_80A7E7C.c b/src/battle/battle_anim_80A7E7C.c
index a504570ca..480cb3d72 100644
--- a/src/battle/battle_anim_80A7E7C.c
+++ b/src/battle/battle_anim_80A7E7C.c
@@ -102,7 +102,7 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83C2010 =
 void AnimTask_ShakeMon(u8 taskId)
 {
     u8 spriteId;
-    spriteId = GetAnimBankSpriteId(gBattleAnimArgs[0]);
+    spriteId = GetAnimBattlerSpriteId(gBattleAnimArgs[0]);
     if (spriteId == 0xff)
     {
         DestroyAnimVisualTask(taskId);
@@ -170,7 +170,7 @@ void AnimTask_ShakeMon2(u8 taskId)
     destroy = FALSE;
     if (gBattleAnimArgs[0] < 4)
     {
-        sprite = GetAnimBankSpriteId(gBattleAnimArgs[0]);
+        sprite = GetAnimBattlerSpriteId(gBattleAnimArgs[0]);
         if (sprite == 0xff)
         {
             DestroyAnimVisualTask(taskId);
@@ -263,7 +263,7 @@ static void AnimTask_ShakeMon2Step(u8 taskId)
 // arg 4: delay
 void AnimTask_ShakeMonInPlace(u8 taskId)
 {
-    u8 spriteId = GetAnimBankSpriteId(gBattleAnimArgs[0]);
+    u8 spriteId = GetAnimBattlerSpriteId(gBattleAnimArgs[0]);
     if (spriteId == 0xff)
     {
         DestroyAnimVisualTask(taskId);
@@ -328,7 +328,7 @@ static void AnimTask_ShakeMonInPlaceStep(u8 taskId)
 // arg 4: duration
 void AnimTask_ShakeAndSinkMon(u8 taskId)
 {
-    u8 sprite = GetAnimBankSpriteId(gBattleAnimArgs[0]);
+    u8 sprite = GetAnimBattlerSpriteId(gBattleAnimArgs[0]);
     gSprites[sprite].pos2.x = gBattleAnimArgs[1];
     TASK.data[0] = sprite;
     TASK.data[1] = gBattleAnimArgs[1];
@@ -378,7 +378,7 @@ void AnimTask_TranslateMonElliptical(u8 taskId)
     u8 wavePeriod;
 
     wavePeriod = 1;
-    spriteId = GetAnimBankSpriteId(gBattleAnimArgs[0]);
+    spriteId = GetAnimBattlerSpriteId(gBattleAnimArgs[0]);
     if (gBattleAnimArgs[4] > 5)
         gBattleAnimArgs[4] = 5;
 
@@ -470,7 +470,7 @@ static void DoVerticalDip(struct Sprite *sprite)
 {
     u8 spriteId;
     sprite->invisible = TRUE;
-    spriteId = GetAnimBankSpriteId(gBattleAnimArgs[2]);
+    spriteId = GetAnimBattlerSpriteId(gBattleAnimArgs[2]);
     sprite->data[0] = gBattleAnimArgs[0];
     sprite->data[1] = 0;
     sprite->data[2] = gBattleAnimArgs[1];
@@ -664,7 +664,7 @@ void AnimTask_WindUpLunge(u8 taskId)
         gBattleAnimArgs[1] = -gBattleAnimArgs[1];
         gBattleAnimArgs[5] = -gBattleAnimArgs[5];
     }
-    TASK.data[0] = GetAnimBankSpriteId(gBattleAnimArgs[0]);
+    TASK.data[0] = GetAnimBattlerSpriteId(gBattleAnimArgs[0]);
     TASK.data[1] = (gBattleAnimArgs[1] << 8) / gBattleAnimArgs[3];
     TASK.data[2] = gBattleAnimArgs[2];
     TASK.data[3] = gBattleAnimArgs[3];
@@ -718,7 +718,7 @@ void sub_80A8A80(u8 taskId)
     {
     case 0:
     case 1:
-        spriteId = GetAnimBankSpriteId(gBattleAnimArgs[0]);
+        spriteId = GetAnimBattlerSpriteId(gBattleAnimArgs[0]);
         break;
     case 2:
         if (!IsAnimBankSpriteVisible(gAnimBankAttacker ^ 2))
@@ -777,7 +777,7 @@ void AnimTask_SwayMon(u8 taskId)
     if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER)
         gBattleAnimArgs[1] = -gBattleAnimArgs[1];
 
-    spriteId = GetAnimBankSpriteId(gBattleAnimArgs[4]);
+    spriteId = GetAnimBattlerSpriteId(gBattleAnimArgs[4]);
     TASK.data[0] = gBattleAnimArgs[0];
     TASK.data[1] = gBattleAnimArgs[1];
     TASK.data[2] = gBattleAnimArgs[2];
@@ -846,7 +846,7 @@ static void AnimTask_SwayMonStep(u8 taskId)
 void AnimTask_ScaleMonAndRestore(u8 taskId)
 {
     u8 spriteId;
-    spriteId = GetAnimBankSpriteId(gBattleAnimArgs[3]);
+    spriteId = GetAnimBattlerSpriteId(gBattleAnimArgs[3]);
     sub_8078E70(spriteId, gBattleAnimArgs[4]);
     TASK.data[0] = gBattleAnimArgs[0];
     TASK.data[1] = gBattleAnimArgs[1];
@@ -886,7 +886,7 @@ static void AnimTask_ScaleMonAndRestoreStep(u8 taskId)
 void sub_80A8E04(u8 taskId)
 {
     u8 spriteId;
-    spriteId = GetAnimBankSpriteId(gBattleAnimArgs[2]);
+    spriteId = GetAnimBattlerSpriteId(gBattleAnimArgs[2]);
     sub_8078E70(spriteId, 0);
     TASK.data[1] = 0;
     TASK.data[2] = gBattleAnimArgs[0];
@@ -930,7 +930,7 @@ void sub_80A8E04(u8 taskId)
 void sub_80A8EFC(u8 taskId)
 {
     u8 spriteId;
-    spriteId = GetAnimBankSpriteId(gBattleAnimArgs[2]);
+    spriteId = GetAnimBattlerSpriteId(gBattleAnimArgs[2]);
     sub_8078E70(spriteId, 0);
     TASK.data[1] = 0;
     TASK.data[2] = gBattleAnimArgs[0];
@@ -1023,7 +1023,7 @@ void sub_80A9058(u8 taskId)
     TASK.data[12] = 0;
     TASK.data[10] = gBattleAnimArgs[3];
     TASK.data[11] = gBattleAnimArgs[4];
-    TASK.data[7] = GetAnimBankSpriteId(1);
+    TASK.data[7] = GetAnimBattlerSpriteId(1);
     TASK.data[8] = gSprites[TASK.data[7]].pos2.x;
     TASK.data[9] = gSprites[TASK.data[7]].pos2.y;
     TASK.data[0] = 0;
diff --git a/src/battle/battle_controller_linkopponent.c b/src/battle/battle_controller_linkopponent.c
index f26ec399c..f720d6a78 100644
--- a/src/battle/battle_controller_linkopponent.c
+++ b/src/battle/battle_controller_linkopponent.c
@@ -1157,7 +1157,7 @@ void LinkOpponentHandleLoadPokeSprite(void)
     GetMonSpriteTemplate_803C56C(species, GetBattlerPosition(gActiveBattler));
     gBankSpriteIds[gActiveBattler] = CreateSprite(
       &gUnknown_02024E8C,
-      GetBankPosition(gActiveBattler, 2),
+      GetBattlerSpriteCoord(gActiveBattler, 2),
       sub_8077F68(gActiveBattler),
       sub_8079E90(gActiveBattler));
     gSprites[gBankSpriteIds[gActiveBattler]].pos2.x = -240;
@@ -1187,7 +1187,7 @@ void sub_8039430(u8 a, u8 b)
     GetMonSpriteTemplate_803C56C(species, GetBattlerPosition(a));
     gBankSpriteIds[a] = CreateSprite(
       &gUnknown_02024E8C,
-      GetBankPosition(a, 2),
+      GetBattlerSpriteCoord(a, 2),
       sub_8077F68(a),
       sub_8079E90(a));
     gSprites[gUnknown_0300434C[a]].data[1] = gBankSpriteIds[a];
diff --git a/src/battle/battle_controller_linkpartner.c b/src/battle/battle_controller_linkpartner.c
index e8da4721a..0baeca43e 100644
--- a/src/battle/battle_controller_linkpartner.c
+++ b/src/battle/battle_controller_linkpartner.c
@@ -85,7 +85,7 @@ extern u8 sub_8046400();
 extern void sub_80312F0(struct Sprite *);
 extern u8 CreateInvisibleSpriteWithCallback();
 extern void BattleLoadPlayerMonSprite();
-extern u8 GetBankPosition();
+extern u8 GetBattlerSpriteCoord();
 extern u8 sub_8077F68();
 extern u8 sub_8079E90();
 extern void nullsub_10();
@@ -1106,7 +1106,7 @@ void LinkPartnerHandleLoadPokeSprite(void)
       GetBattlerPosition(gActiveBattler));
     gBankSpriteIds[gActiveBattler] = CreateSprite(
       &gUnknown_02024E8C,
-      GetBankPosition(gActiveBattler, 2),
+      GetBattlerSpriteCoord(gActiveBattler, 2),
       sub_8077F68(gActiveBattler),
       sub_8079E90(gActiveBattler));
     gSprites[gBankSpriteIds[gActiveBattler]].pos2.x = -240;
@@ -1136,7 +1136,7 @@ void sub_811F864(u8 a, u8 b)
     GetMonSpriteTemplate_803C56C(species, GetBattlerPosition(a));
     gBankSpriteIds[a] = CreateSprite(
       &gUnknown_02024E8C,
-      GetBankPosition(a, 2),
+      GetBattlerSpriteCoord(a, 2),
       sub_8077F68(a),
       sub_8079E90(a));
     gSprites[gUnknown_0300434C[a]].data[1] = gBankSpriteIds[a];
diff --git a/src/battle/battle_controller_opponent.c b/src/battle/battle_controller_opponent.c
index abdc9ccd0..232a9c07d 100644
--- a/src/battle/battle_controller_opponent.c
+++ b/src/battle/battle_controller_opponent.c
@@ -66,7 +66,7 @@ extern struct MusicPlayerInfo gMPlay_SE2;
 extern struct MusicPlayerInfo gMPlay_BGM;
 extern u32 gBattleExecBuffer;
 
-extern u8 GetBankPosition();
+extern u8 GetBattlerSpriteCoord();
 extern u8 sub_8077F68();
 extern u8 sub_8079E90();
 extern void sub_8033018(void);
@@ -1128,7 +1128,7 @@ void OpponentHandleLoadPokeSprite(void)
     GetMonSpriteTemplate_803C56C(species, GetBattlerPosition(gActiveBattler));
     gBankSpriteIds[gActiveBattler] = CreateSprite(
       &gUnknown_02024E8C,
-      GetBankPosition(gActiveBattler, 2),
+      GetBattlerSpriteCoord(gActiveBattler, 2),
       sub_8077F68(gActiveBattler),
       sub_8079E90(gActiveBattler));
     gSprites[gBankSpriteIds[gActiveBattler]].pos2.x = -240;
@@ -1160,7 +1160,7 @@ void sub_803495C(u8 a, u8 b)
     GetMonSpriteTemplate_803C56C(species, GetBattlerPosition(a));
     gBankSpriteIds[a] = CreateSprite(
       &gUnknown_02024E8C,
-      GetBankPosition(a, 2),
+      GetBattlerSpriteCoord(a, 2),
       sub_8077F68(a),
       sub_8079E90(a));
     gSprites[gBankSpriteIds[a]].data[0] = a;
diff --git a/src/battle/battle_controller_player.c b/src/battle/battle_controller_player.c
index 439888d38..50ab1eb7e 100644
--- a/src/battle/battle_controller_player.c
+++ b/src/battle/battle_controller_player.c
@@ -133,7 +133,7 @@ extern void sub_802D204(void);
 extern u8 sub_8079E90();
 extern void sub_802DEAC(void);
 extern void sub_80312F0(struct Sprite *);
-extern u8 GetBankPosition();
+extern u8 GetBattlerSpriteCoord();
 extern u8 sub_8077F68();
 extern u8 sub_8046400();
 extern void sub_802D798(void);
@@ -149,7 +149,7 @@ extern u8 gActionSelectionCursor[];
 extern u8 gMoveSelectionCursor[];
 extern u8 gAbsentBattlerFlags;
 extern u8 gUnknown_03004344;
-extern u8 gNoOfAllBanks;
+extern u8 gBattlersCount;
 extern u16 gBattlerPartyIndexes[];
 extern u16 gBattle_BG0_Y;
 extern u16 gBattle_BG0_X;
@@ -486,14 +486,14 @@ void sub_802C2EC(void)
 
     dp11b_obj_instanciate(gUnknown_03004344, 1, 15, 1);
     i = 0;
-    if (gNoOfAllBanks != 0)
+    if (gBattlersCount != 0)
     {
         do
         {
             if (i != gUnknown_03004344)
                 dp11b_obj_free(i, 1);
             i++;
-        } while (i < gNoOfAllBanks);
+        } while (i < gBattlersCount);
     }
     if (gMain.newKeys & A_BUTTON)
     {
@@ -533,7 +533,7 @@ void sub_802C2EC(void)
                 if (i < 0)
                     i = 3;
                 gUnknown_03004344 = GetBattlerAtPosition(arr[i]);
-            } while(gUnknown_03004344 == gNoOfAllBanks);
+            } while(gUnknown_03004344 == gBattlersCount);
             i = 0;
             switch (GetBattlerPosition(gUnknown_03004344))
             {
@@ -580,7 +580,7 @@ void sub_802C2EC(void)
                 if (i > 3)
                     i = 0;
                 gUnknown_03004344 = GetBattlerAtPosition(arr[i]);
-            } while (gUnknown_03004344 == gNoOfAllBanks);
+            } while (gUnknown_03004344 == gBattlersCount);
             i = 0;
             switch (GetBattlerPosition(gUnknown_03004344))
             {
@@ -2525,7 +2525,7 @@ void sub_802F934(u8 bank, u8 b)
     GetMonSpriteTemplate_803C56C(species, GetBattlerPosition(bank));
     gBankSpriteIds[bank] = CreateSprite(
       &gUnknown_02024E8C,
-      GetBankPosition(bank, 2),
+      GetBattlerSpriteCoord(bank, 2),
       sub_8077F68(bank),
       sub_8079E90(bank));
     gSprites[gUnknown_0300434C[bank]].data[1] = gBankSpriteIds[bank];
diff --git a/src/battle/battle_controller_wally.c b/src/battle/battle_controller_wally.c
index 8ae61d0cb..26348b434 100644
--- a/src/battle/battle_controller_wally.c
+++ b/src/battle/battle_controller_wally.c
@@ -91,7 +91,7 @@ extern void StartTranslateAnimSpriteByDeltas(struct Sprite *);
 extern void sub_8030E38(struct Sprite *);
 extern void StoreSpriteCallbackInData();
 extern u8 sub_8046400();
-extern u8 GetBankPosition();
+extern u8 GetBattlerSpriteCoord();
 extern u8 sub_8077F68();
 extern u8 sub_8079E90();
 extern void sub_80312F0(struct Sprite *);
@@ -1510,7 +1510,7 @@ void sub_81398BC(u8 bank)
     GetMonSpriteTemplate_803C56C(species, GetBattlerPosition(bank));
     gBankSpriteIds[bank] = CreateSprite(
       &gUnknown_02024E8C,
-      GetBankPosition(bank, 2),
+      GetBattlerSpriteCoord(bank, 2),
       sub_8077F68(bank),
       sub_8079E90(bank));
     gSprites[gUnknown_0300434C[bank]].data[1] = gBankSpriteIds[bank];
diff --git a/src/battle/battle_interface.c b/src/battle/battle_interface.c
index 823fba6d0..bd954ae8d 100644
--- a/src/battle/battle_interface.c
+++ b/src/battle/battle_interface.c
@@ -423,7 +423,7 @@ u8 *const gUnknown_0820A904[10] =
 };
 
 extern u8 gDisplayedStringBattle[];
-extern u8 gNoOfAllBanks;
+extern u8 gBattlersCount;
 extern u16 gBattlerPartyIndexes[];
 extern u8 gBanksBySide[];
 extern u8 gHealthboxIDs[];
@@ -951,7 +951,7 @@ void UpdateOamPriorityInAllHealthboxes(u8 priority)
 {
     s32 i;
 
-    for (i = 0; i < gNoOfAllBanks; i++)
+    for (i = 0; i < gBattlersCount; i++)
     {
         u8 spriteId1;
         u8 spriteId2;
@@ -1648,7 +1648,7 @@ void sub_804454C(void)
     s32 i;
     u8 spriteId;
 
-    for (i = 0; i < gNoOfAllBanks; i++)
+    for (i = 0; i < gBattlersCount; i++)
     {
         if (gSprites[gHealthboxIDs[i]].callback == SpriteCallbackDummy
 #if DEBUG
diff --git a/src/battle/battle_party_menu.c b/src/battle/battle_party_menu.c
index be7269699..be376a9f1 100644
--- a/src/battle/battle_party_menu.c
+++ b/src/battle/battle_party_menu.c
@@ -31,7 +31,7 @@ extern void nullsub_14();
 extern u8 sub_803FBBC(void);
 
 extern u8 gPlayerPartyCount;
-extern u8 gNoOfAllBanks;
+extern u8 gBattlersCount;
 extern u16 gBattlerPartyIndexes[];
 extern u8 gBankInMenu;
 extern u8 gUnknown_0202E8F4;
@@ -662,7 +662,7 @@ 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 (GetBattlerSide(i) == 0
          && sub_8094C20(partySelection) == gBattlerPartyIndexes[i])
diff --git a/src/battle/battle_util.c b/src/battle/battle_util.c
index 3441c0d14..e164a60dc 100644
--- a/src/battle/battle_util.c
+++ b/src/battle/battle_util.c
@@ -36,7 +36,7 @@ extern u16 gLastUsedItem;
 extern u16 gCurrentMove;
 extern const u32 gBitTable[];
 extern u16 gBattleTypeFlags;
-extern u8 gNoOfAllBanks;
+extern u8 gBattlersCount;
 extern u32 gStatuses3[4];
 extern u8 gBankAttacker;
 extern u8 gBankTarget;
@@ -271,7 +271,7 @@ void PressurePPLoseOnUsingImprision(u8 bankAtk)
     s32 imprisionPos = 4;
     u8 atkSide = GetBattlerSide(bankAtk);
 
-    for (i = 0; i < gNoOfAllBanks; i++)
+    for (i = 0; i < gBattlersCount; i++)
     {
         if (atkSide != GetBattlerSide(i) && gBattleMons[i].ability == ABILITY_PRESSURE)
         {
@@ -304,7 +304,7 @@ void PressurePPLoseOnUsingPerishSong(u8 bankAtk)
     s32 i, j;
     s32 perishSongPos = 4;
 
-    for (i = 0; i < gNoOfAllBanks; i++)
+    for (i = 0; i < gBattlersCount; i++)
     {
         if (gBattleMons[i].ability == ABILITY_PRESSURE && i != bankAtk)
         {
@@ -339,12 +339,12 @@ void MarkAllBufferBanksForExecution(void) // unused
 
     if (gBattleTypeFlags & BATTLE_TYPE_LINK)
     {
-        for (i = 0; i < gNoOfAllBanks; i++)
+        for (i = 0; i < gBattlersCount; i++)
             gBattleExecBuffer |= gBitTable[i] << 0x1C;
     }
     else
     {
-        for (i = 0; i < gNoOfAllBanks; i++)
+        for (i = 0; i < gBattlersCount; i++)
             gBattleExecBuffer |= gBitTable[i];
     }
 }
@@ -415,10 +415,10 @@ void ResetSentPokesToOpponentValue(void)
     gSentPokesToOpponent[0] = 0;
     gSentPokesToOpponent[1] = 0;
 
-    for (i = 0; i < gNoOfAllBanks; i += 2)
+    for (i = 0; i < gBattlersCount; i += 2)
         bits |= gBitTable[gBattlerPartyIndexes[i]];
 
-    for (i = 1; i < gNoOfAllBanks; i += 2)
+    for (i = 1; i < gBattlersCount; i += 2)
         gSentPokesToOpponent[(i & BIT_FLANK) >> 1] = bits;
 }
 
@@ -432,7 +432,7 @@ void sub_8015740(u8 bank)
         u8 id = ((bank & BIT_FLANK) >> 1);
         gSentPokesToOpponent[id] = 0;
 
-        for (i = 0; i < gNoOfAllBanks; i += 2)
+        for (i = 0; i < gBattlersCount; i += 2)
         {
             if (!(gAbsentBattlerFlags & gBitTable[i]))
                 bits |= gBitTable[gBattlerPartyIndexes[i]];
@@ -451,7 +451,7 @@ void sub_80157C4(u8 bank)
     else
     {
         s32 i;
-        for (i = 1; i < gNoOfAllBanks; i++)
+        for (i = 1; i < gBattlersCount; i++)
             gSentPokesToOpponent[(i & BIT_FLANK) >> 1] |= gBitTable[gBattlerPartyIndexes[bank]];
     }
 }
@@ -584,7 +584,7 @@ u8 IsImprisoned(u8 bank, u16 move)
     u8 imprisionedMoves = 0;
     u8 bankSide = GetBattlerSide(bank);
     s32 i;
-    for (i = 0; i < gNoOfAllBanks; i++)
+    for (i = 0; i < gBattlersCount; i++)
     {
         if (bankSide != GetBattlerSide(i) && gStatuses3[i] & STATUS3_IMPRISIONED)
         {
@@ -606,10 +606,10 @@ u8 UpdateTurnCounters(void)
     u8 effect = 0;
     s32 i;
 
-    for (gBankAttacker = 0; gBankAttacker < gNoOfAllBanks && gAbsentBattlerFlags & gBitTable[gBankAttacker]; gBankAttacker++)
+    for (gBankAttacker = 0; gBankAttacker < gBattlersCount && gAbsentBattlerFlags & gBitTable[gBankAttacker]; gBankAttacker++)
     {
     }
-    for (gBankTarget = 0; gBankTarget < gNoOfAllBanks && gAbsentBattlerFlags & gBitTable[gBankTarget]; gBankTarget++)
+    for (gBankTarget = 0; gBankTarget < gBattlersCount && gAbsentBattlerFlags & gBitTable[gBankTarget]; gBankTarget++)
     {
     }
 
@@ -620,14 +620,14 @@ u8 UpdateTurnCounters(void)
         switch (gBattleStruct->turncountersTracker)
         {
         case 0:
-            for (i = 0; i < gNoOfAllBanks; i++)
+            for (i = 0; i < gBattlersCount; i++)
             {
                 gBanksByTurnOrder[i] = i;
             }
-            for (i = 0; i < gNoOfAllBanks - 1; i++)
+            for (i = 0; i < gBattlersCount - 1; i++)
             {
                 s32 j;
-                for (j = i + 1; j < gNoOfAllBanks; j++)
+                for (j = i + 1; j < gBattlersCount; j++)
                 {
                     if (GetWhoStrikesFirst(gBanksByTurnOrder[i], gBanksByTurnOrder[j], 0))
                         SwapTurnOrder(i, j);
@@ -744,7 +744,7 @@ u8 UpdateTurnCounters(void)
             }
             break;
         case 5:
-            while (gBattleStruct->turnSideTracker < gNoOfAllBanks)
+            while (gBattleStruct->turnSideTracker < gBattlersCount)
             {
                 gActiveBattler = gBanksByTurnOrder[gBattleStruct->turnSideTracker];
                 if (gWishFutureKnock.wishCounter[gActiveBattler] && --gWishFutureKnock.wishCounter[gActiveBattler] == 0 && gBattleMons[gActiveBattler].hp)
@@ -854,7 +854,7 @@ u8 TurnBasedEffects(void)
     u8 effect = 0;
 
     gHitMarker |= (HITMARKER_GRUDGE | HITMARKER_x20);
-    while (gBattleStruct->turnEffectsBank < gNoOfAllBanks && gBattleStruct->turnEffectsTracker <= TURNBASED_MAX_CASE)
+    while (gBattleStruct->turnEffectsBank < gBattlersCount && gBattleStruct->turnEffectsTracker <= TURNBASED_MAX_CASE)
     {
         gActiveBattler = gBankAttacker = gBanksByTurnOrder[gBattleStruct->turnEffectsBank];
         if (gAbsentBattlerFlags & gBitTable[gActiveBattler])
@@ -1002,7 +1002,7 @@ u8 TurnBasedEffects(void)
             case 10:  // uproar
                 if (gBattleMons[gActiveBattler].status2 & STATUS2_UPROAR)
                 {
-                    for (gBankAttacker = 0; gBankAttacker < gNoOfAllBanks; gBankAttacker++)
+                    for (gBankAttacker = 0; gBankAttacker < gBattlersCount; gBankAttacker++)
                     {
                         if ((gBattleMons[gBankAttacker].status1 & STATUS_SLEEP)
                          && gBattleMons[gBankAttacker].ability != ABILITY_SOUNDPROOF)
@@ -1017,7 +1017,7 @@ u8 TurnBasedEffects(void)
                             break;
                         }
                     }
-                    if (gBankAttacker != gNoOfAllBanks)
+                    if (gBankAttacker != gBattlersCount)
                     {
                         effect = 2;  // a pokemon was awaken
                         break;
@@ -1165,7 +1165,7 @@ bool8 HandleWishPerishSongOnTurnEnd(void)
     switch (gBattleStruct->sub80170DC_Tracker)
     {
     case 0: // future sight
-        while (gBattleStruct->sub80170DC_Bank < gNoOfAllBanks)
+        while (gBattleStruct->sub80170DC_Bank < gBattlersCount)
         {
             gActiveBattler = gBattleStruct->sub80170DC_Bank;
             if (gAbsentBattlerFlags & gBitTable[gActiveBattler])
@@ -1196,7 +1196,7 @@ bool8 HandleWishPerishSongOnTurnEnd(void)
         gBattleStruct->sub80170DC_Tracker = 1;
         gBattleStruct->sub80170DC_Bank = 0;
     case 1: // perish song
-        while (gBattleStruct->sub80170DC_Bank < gNoOfAllBanks)
+        while (gBattleStruct->sub80170DC_Bank < gBattlersCount)
         {
             gActiveBattler = gBankAttacker = gBanksByTurnOrder[gBattleStruct->sub80170DC_Bank];
             if (gAbsentBattlerFlags & gBitTable[gActiveBattler])
@@ -1248,7 +1248,7 @@ bool8 HandleFaintedMonActions(void)
         case 0:
             gBattleStruct->unk1605A = 0;
             gBattleStruct->sub80173A4_Tracker++;
-            for (i = 0; i < gNoOfAllBanks; i++)
+            for (i = 0; i < gBattlersCount; i++)
             {
                 if (gAbsentBattlerFlags & gBitTable[i] && !sub_8018018(i, 6, 6))
                     gAbsentBattlerFlags &= ~(gBitTable[i]);
@@ -1263,12 +1263,12 @@ bool8 HandleFaintedMonActions(void)
                     gBattleStruct->sub80173A4_Tracker = 2;
                     return 1;
                 }
-            } while (++gBattleStruct->unk1605A != gNoOfAllBanks);
+            } while (++gBattleStruct->unk1605A != gBattlersCount);
             gBattleStruct->sub80173A4_Tracker = 3;
             break;
         case 2:
             sub_8015740(gBank1);
-            if (++gBattleStruct->unk1605A == gNoOfAllBanks)
+            if (++gBattleStruct->unk1605A == gBattlersCount)
                 gBattleStruct->sub80173A4_Tracker = 3;
             else
                 gBattleStruct->sub80173A4_Tracker = 1;
@@ -1286,11 +1286,11 @@ bool8 HandleFaintedMonActions(void)
                     gBattleStruct->sub80173A4_Tracker = 5;
                     return 1;
                 }
-            } while (++gBattleStruct->unk1605A != gNoOfAllBanks);
+            } while (++gBattleStruct->unk1605A != gBattlersCount);
             gBattleStruct->sub80173A4_Tracker = 6;
             break;
         case 5:
-            if (++gBattleStruct->unk1605A == gNoOfAllBanks)
+            if (++gBattleStruct->unk1605A == gBattlersCount)
                 gBattleStruct->sub80173A4_Tracker = 6;
             else
                 gBattleStruct->sub80173A4_Tracker = 4;
@@ -1310,7 +1310,7 @@ bool8 HandleFaintedMonActions(void)
 void TryClearRageStatuses(void)
 {
     int i;
-    for (i = 0; i < gNoOfAllBanks; i++)
+    for (i = 0; i < gBattlersCount; i++)
     {
         if (gBattleMons[i].status2 & STATUS2_RAGE && gChosenMovesByBanks[i] != MOVE_RAGE)
             gBattleMons[i].status2 &= ~(STATUS2_RAGE);
@@ -1695,14 +1695,14 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
     u32 pidAtk;
     u32 pidDef;
 
-    if (gBankAttacker >= gNoOfAllBanks)
+    if (gBankAttacker >= gBattlersCount)
         gBankAttacker = bank;
     if (GetBattlerSide(gBankAttacker) == 0)
         pokeAtk = &gPlayerParty[gBattlerPartyIndexes[gBankAttacker]];
     else
         pokeAtk = &gEnemyParty[gBattlerPartyIndexes[gBankAttacker]];
 
-    if (gBankTarget >= gNoOfAllBanks)
+    if (gBankTarget >= gBattlersCount)
         gBankTarget = bank;
     if (GetBattlerSide(gBankTarget) == 0)
         pokeDef = &gPlayerParty[gBattlerPartyIndexes[gBankTarget]];
@@ -1741,7 +1741,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
         switch (caseID)
         {
         case ABILITYEFFECT_ON_SWITCHIN: // 0
-            if (gBankAttacker >= gNoOfAllBanks)
+            if (gBankAttacker >= gBattlersCount)
                 gBankAttacker = bank;
             switch (gLastUsedAbility)
             {
@@ -1838,7 +1838,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
             case ABILITY_AIR_LOCK:
                 {
                     // that's a weird choice for a variable, why not use i or bank?
-                    for (target1 = 0; target1 < gNoOfAllBanks; target1++)
+                    for (target1 = 0; target1 < gBattlersCount; target1++)
                     {
                         effect = CastformDataTypeChange(target1);
                         if (effect != 0)
@@ -2227,7 +2227,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
             break;
         case ABILITYEFFECT_IMMUNITY: // 5
             {
-                for (bank = 0; bank < gNoOfAllBanks; bank++)
+                for (bank = 0; bank < gBattlersCount; bank++)
                 {
                     switch (gBattleMons[bank].ability)
                     {
@@ -2310,7 +2310,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
             break;
         case ABILITYEFFECT_FORECAST: // 6
             {
-                for (bank = 0; bank < gNoOfAllBanks; bank++)
+                for (bank = 0; bank < gBattlersCount; bank++)
                 {
                     if (gBattleMons[bank].ability == ABILITY_FORECAST)
                     {
@@ -2357,7 +2357,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
             }
             break;
         case ABILITYEFFECT_INTIMIDATE1: // 9
-            for (i = 0; i < gNoOfAllBanks; i++)
+            for (i = 0; i < gBattlersCount; i++)
             {
                 if (gBattleMons[i].ability == ABILITY_INTIMIDATE && gStatuses3[i] & STATUS3_INTIMIDATE_POKES)
                 {
@@ -2371,7 +2371,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
             }
             break;
         case ABILITYEFFECT_TRACE: // 11
-            for (i = 0; i < gNoOfAllBanks; i++)
+            for (i = 0; i < gBattlersCount; i++)
             {
                 if (gBattleMons[i].ability == ABILITY_TRACE && (gStatuses3[i] & STATUS3_TRACE))
                 {
@@ -2436,7 +2436,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
             }
             break;
         case ABILITYEFFECT_INTIMIDATE2: // 10
-            for (i = 0; i < gNoOfAllBanks; i++)
+            for (i = 0; i < gBattlersCount; i++)
             {
                 if (gBattleMons[i].ability == ABILITY_INTIMIDATE && (gStatuses3[i] & STATUS3_INTIMIDATE_POKES))
                 {
@@ -2452,7 +2452,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
             break;
         case ABILITYEFFECT_CHECK_OTHER_SIDE: // 12
             side = GetBattlerSide(bank);
-            for (i = 0; i < gNoOfAllBanks; i++)
+            for (i = 0; i < gBattlersCount; i++)
             {
                 if (GetBattlerSide(i) != side && gBattleMons[i].ability == ability)
                 {
@@ -2463,7 +2463,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
             break;
         case ABILITYEFFECT_CHECK_BANK_SIDE: // 13
             side = GetBattlerSide(bank);
-            for (i = 0; i < gNoOfAllBanks; i++)
+            for (i = 0; i < gBattlersCount; i++)
             {
                 if (GetBattlerSide(i) == side && gBattleMons[i].ability == ability)
                 {
@@ -2476,21 +2476,21 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
             switch (gLastUsedAbility)
             {
             case 0xFD:
-                for (i = 0; i < gNoOfAllBanks; i++)
+                for (i = 0; i < gBattlersCount; i++)
                 {
                     if (gStatuses3[i] & STATUS3_MUDSPORT)
                         effect = i + 1;
                 }
                 break;
             case 0xFE:
-                for (i = 0; i < gNoOfAllBanks; i++)
+                for (i = 0; i < gBattlersCount; i++)
                 {
                     if (gStatuses3[i] & STATUS3_WATERSPORT)
                         effect = i + 1;
                 }
                 break;
             default:
-                for (i = 0; i < gNoOfAllBanks; i++)
+                for (i = 0; i < gBattlersCount; i++)
                 {
                     if (gBattleMons[i].ability == ability)
                     {
@@ -2502,7 +2502,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
             }
             break;
         case ABILITYEFFECT_CHECK_ON_FIELD: // 19
-            for (i = 0; i < gNoOfAllBanks; i++)
+            for (i = 0; i < gBattlersCount; i++)
             {
                 if (gBattleMons[i].ability == ability && gBattleMons[i].hp != 0)
                 {
@@ -2512,7 +2512,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
             }
             break;
         case ABILITYEFFECT_CHECK_FIELD_EXCEPT_BANK: // 15
-            for (i = 0; i < gNoOfAllBanks; i++)
+            for (i = 0; i < gBattlersCount; i++)
             {
                 if (gBattleMons[i].ability == ability && i != bank)
                 {
@@ -2523,7 +2523,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
             break;
         case ABILITYEFFECT_COUNT_OTHER_SIZE: // 16
             side = GetBattlerSide(bank);
-            for (i = 0; i < gNoOfAllBanks; i++)
+            for (i = 0; i < gBattlersCount; i++)
             {
                 if (GetBattlerSide(i) != side && gBattleMons[i].ability == ability)
                 {
@@ -2534,7 +2534,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
             break;
         case ABILITYEFFECT_COUNT_BANK_SIDE: // 17
             side = GetBattlerSide(bank);
-            for (i = 0; i < gNoOfAllBanks; i++)
+            for (i = 0; i < gBattlersCount; i++)
             {
                 if (GetBattlerSide(i) == side && gBattleMons[i].ability == ability)
                 {
@@ -2544,7 +2544,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
             }
             break;
         case ABILITYEFFECT_COUNT_ON_FIELD: // 18
-            for (i = 0; i < gNoOfAllBanks; i++)
+            for (i = 0; i < gBattlersCount; i++)
             {
                 if (gBattleMons[i].ability == ability && i != bank)
                 {
@@ -3115,7 +3115,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
     case 2:
         break;
     case 3:
-        for (bank = 0; bank < gNoOfAllBanks; bank++)
+        for (bank = 0; bank < gBattlersCount; bank++)
         {
             gLastUsedItem = gBattleMons[bank].item;
             if (gBattleMons[bank].item == ITEM_ENIGMA_BERRY)
@@ -3384,7 +3384,7 @@ u8 GetMoveTarget(u16 move, u8 useMoveTarget) //get move target
             side = GetBattlerSide(gBankAttacker);
             do
             {
-                targetBank = Random() % gNoOfAllBanks;
+                targetBank = Random() % gBattlersCount;
             } while (targetBank == gBankAttacker || side == GetBattlerSide(targetBank) || gAbsentBattlerFlags & gBitTable[targetBank]);
             if (gBattleMoves[move].type == TYPE_ELECTRIC
                 && AbilityBattleEffects(ABILITYEFFECT_COUNT_OTHER_SIZE, gBankAttacker, ABILITY_LIGHTNING_ROD, 0, 0)
@@ -3519,12 +3519,12 @@ u8 IsMonDisobedient(void)
         {
             // try putting asleep
             int i;
-            for (i = 0; i < gNoOfAllBanks; i++)
+            for (i = 0; i < gBattlersCount; i++)
             {
                 if (gBattleMons[i].status2 & STATUS2_UPROAR)
                     break;
             }
-            if (i == gNoOfAllBanks)
+            if (i == gBattlersCount)
             {
                 gBattlescriptCurrInstr = BattleScript_IgnoresAndFallsAsleep;
                 return 1;
diff --git a/src/battle/pokeball.c b/src/battle/pokeball.c
index 91754b4d3..be2adbf1b 100644
--- a/src/battle/pokeball.c
+++ b/src/battle/pokeball.c
@@ -376,8 +376,8 @@ 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;
@@ -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;
@@ -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);
diff --git a/src/battle/reshow_battle_screen.c b/src/battle/reshow_battle_screen.c
index fe80168fd..f602d4835 100644
--- a/src/battle/reshow_battle_screen.c
+++ b/src/battle/reshow_battle_screen.c
@@ -23,7 +23,7 @@ extern u8 gReservedSpritePaletteCount;
 extern u8 gActionSelectionCursor[4];
 extern u8 gBankInMenu;
 extern u16 gBattlerPartyIndexes[4];
-extern u8 gNoOfAllBanks;
+extern u8 gBattlersCount;
 extern u16 gBattleTypeFlags;
 extern u8 gBankSpriteIds[4];
 extern u8 gBattleMonForms[4];
@@ -205,7 +205,7 @@ static void sub_807B06C(void)
 
 static bool8 LoadAppropiateBankSprite(u8 bank)
 {
-    if (bank < gNoOfAllBanks)
+    if (bank < gBattlersCount)
     {
         if (GetBattlerSide(bank))
         {
@@ -230,7 +230,7 @@ static bool8 LoadAppropiateBankSprite(u8 bank)
 
 static void sub_807B184(u8 bank)
 {
-    if (bank < gNoOfAllBanks)
+    if (bank < gBattlersCount)
     {
         u8 posY;
 
@@ -243,7 +243,7 @@ static void sub_807B184(u8 bank)
             if (GetMonData(&gEnemyParty[gBattlerPartyIndexes[bank]], MON_DATA_HP) == 0)
                 return;
             GetMonSpriteTemplate_803C56C(GetMonData(&gEnemyParty[gBattlerPartyIndexes[bank]], MON_DATA_SPECIES), GetBattlerPosition(bank));
-            gBankSpriteIds[bank] = CreateSprite(&gUnknown_02024E8C, GetBankPosition(bank, 2), posY, sub_8079E90(bank));
+            gBankSpriteIds[bank] = CreateSprite(&gUnknown_02024E8C, GetBattlerSpriteCoord(bank, 2), posY, sub_8079E90(bank));
             gSprites[gBankSpriteIds[bank]].oam.paletteNum = bank;
             gSprites[gBankSpriteIds[bank]].callback = SpriteCallbackDummy;
             gSprites[gBankSpriteIds[bank]].data[0] = bank;
@@ -275,7 +275,7 @@ static void sub_807B184(u8 bank)
             if (GetMonData(&gPlayerParty[gBattlerPartyIndexes[bank]], MON_DATA_HP) == 0)
                 return;
             GetMonSpriteTemplate_803C56C(GetMonData(&gPlayerParty[gBattlerPartyIndexes[bank]], MON_DATA_SPECIES), GetBattlerPosition(bank));
-            gBankSpriteIds[bank] = CreateSprite(&gUnknown_02024E8C, GetBankPosition(bank, 2), posY, sub_8079E90(bank));
+            gBankSpriteIds[bank] = CreateSprite(&gUnknown_02024E8C, GetBattlerSpriteCoord(bank, 2), posY, sub_8079E90(bank));
             gSprites[gBankSpriteIds[bank]].oam.paletteNum = bank;
             gSprites[gBankSpriteIds[bank]].callback = SpriteCallbackDummy;
             gSprites[gBankSpriteIds[bank]].data[0] = bank;
@@ -288,7 +288,7 @@ static void sub_807B184(u8 bank)
 
 static void sub_807B508(u8 bank)
 {
-    if (bank < gNoOfAllBanks)
+    if (bank < gBattlersCount)
     {
         u8 healthboxID;
         if (gBattleTypeFlags & BATTLE_TYPE_SAFARI && bank == 0)
diff --git a/src/contest.c b/src/contest.c
index 2d953241a..031cf768f 100644
--- a/src/contest.c
+++ b/src/contest.c
@@ -5421,8 +5421,8 @@ void sub_80B2968(void)
 
     sprite->pos2.x = 0;
     sprite->pos2.y = 0;
-    sprite->pos1.x = GetBankPosition(3, 0);
-    sprite->pos1.y = GetBankPosition(3, 1);
+    sprite->pos1.x = GetBattlerSpriteCoord(3, 0);
+    sprite->pos1.y = GetBattlerSpriteCoord(3, 1);
     sprite->invisible = TRUE;
 }
 
diff --git a/src/pokemon_item_effect.c b/src/pokemon_item_effect.c
index aa6e49877..d26546f02 100644
--- a/src/pokemon_item_effect.c
+++ b/src/pokemon_item_effect.c
@@ -18,7 +18,7 @@
 extern s32 gBattleMoveDamage;
 extern u8 gAbsentBattlerFlags;
 extern u8 gBankInMenu;
-extern u8 gNoOfAllBanks;
+extern u8 gBattlersCount;
 extern u16 gBattlerPartyIndexes[];
 extern u8 gActiveBattler;
 extern u8 gStringBank;
@@ -80,7 +80,7 @@ bool8 PokemonUseItemEffects(struct Pokemon *pkmn, u16 item, u8 partyIndex, u8 mo
     {
         gActiveBattler = gBankInMenu;
         cmdIndex = (GetBattlerSide(gActiveBattler) != 0);
-        while (cmdIndex < gNoOfAllBanks)
+        while (cmdIndex < gBattlersCount)
         {
             if (gBattlerPartyIndexes[cmdIndex] == partyIndex)
             {
diff --git a/src/rom3.c b/src/rom3.c
index 64d7a535c..a9433695d 100644
--- a/src/rom3.c
+++ b/src/rom3.c
@@ -32,7 +32,7 @@ extern u8 gBattleBufferA[][0x200];
 extern u8 gBattleBufferB[][0x200];
 extern u8 gActiveBattler;
 extern u32 gBattleExecBuffer;
-extern u8 gNoOfAllBanks;
+extern u8 gBattlersCount;
 extern u16 gBattlerPartyIndexes[];
 extern u8 gBanksBySide[];
 extern u16 gCurrentMove;
@@ -120,7 +120,7 @@ void sub_800B950(void)
     sub_800BD54();
     if (!(gBattleTypeFlags & BATTLE_TYPE_MULTI))
     {
-        for (i = 0; i < gNoOfAllBanks; i++)
+        for (i = 0; i < gBattlersCount; i++)
             sub_8094978(i, 0);
     }
 }
@@ -139,7 +139,7 @@ void sub_800B9A8(void)
         gBanksBySide[0] = 0;
         gBattleBankFunc[1] = SetBankFuncToOpponentBufferRunCommand;
         gBanksBySide[1] = 1;
-        gNoOfAllBanks = 2;
+        gBattlersCount = 2;
     }
     else
     {
@@ -152,7 +152,7 @@ void sub_800B9A8(void)
         gBanksBySide[2] = 2;
         gBattleBankFunc[3] = SetBankFuncToOpponentBufferRunCommand;
         gBanksBySide[3] = 3;
-        gNoOfAllBanks = 4;
+        gBattlersCount = 4;
     }
 }
 
@@ -170,7 +170,7 @@ void sub_800BA78(void)
             gBanksBySide[0] = 0;
             gBattleBankFunc[1] = SetBankFuncToLinkOpponentBufferRunCommand;
             gBanksBySide[1] = 1;
-            gNoOfAllBanks = 2;
+            gBattlersCount = 2;
         }
         else
         {
@@ -178,7 +178,7 @@ void sub_800BA78(void)
             gBanksBySide[1] = 0;
             gBattleBankFunc[0] = SetBankFuncToLinkOpponentBufferRunCommand;
             gBanksBySide[0] = 1;
-            gNoOfAllBanks = 2;
+            gBattlersCount = 2;
         }
         return;
     }
@@ -195,7 +195,7 @@ void sub_800BA78(void)
             gBanksBySide[2] = 2;
             gBattleBankFunc[3] = SetBankFuncToLinkOpponentBufferRunCommand;
             gBanksBySide[3] = 3;
-            gNoOfAllBanks = 4;
+            gBattlersCount = 4;
         }
         else
         {
@@ -207,7 +207,7 @@ void sub_800BA78(void)
             gBanksBySide[3] = 2;
             gBattleBankFunc[2] = SetBankFuncToLinkOpponentBufferRunCommand;
             gBanksBySide[2] = 3;
-            gNoOfAllBanks = 4;
+            gBattlersCount = 4;
 
         }
         return;
@@ -285,7 +285,7 @@ void sub_800BA78(void)
             }
         }
     }
-    gNoOfAllBanks = 4;
+    gBattlersCount = 4;
 }
 
 void sub_800BD54(void)
@@ -295,7 +295,7 @@ void sub_800BD54(void)
 
     if (!(gBattleTypeFlags & BATTLE_TYPE_MULTI))
     {
-        for (i = 0; i < gNoOfAllBanks; i++)
+        for (i = 0; i < gBattlersCount; i++)
         {
             for (j = 0; j < 6; j++)
             {
diff --git a/src/rom_8077ABC.c b/src/rom_8077ABC.c
index 0a0c89cf4..cccedc89c 100644
--- a/src/rom_8077ABC.c
+++ b/src/rom_8077ABC.c
@@ -70,7 +70,7 @@ extern u8 gAnimBankAttacker;
 extern u8 gAnimBankTarget;
 extern s16 gBattleAnimArgs[8];
 extern u8 gBanksBySide[NUM_BATTLE_SLOTS];
-extern u8 gNoOfAllBanks; // gNumBattleMons?
+extern u8 gBattlersCount; // gNumBattleMons?
 extern struct OamMatrix gOamMatrices[];
 extern struct Struct_2017810 unk_2017810[];
 extern u8 gAnimFriendship;
@@ -154,7 +154,7 @@ const struct SpriteSheet gUnknown_0837F5E0[] =
 
 // pkmn_form.c
 
-u8 GetBankPosition(u8 slot, u8 a2)
+u8 GetBattlerSpriteCoord(u8 slot, u8 a2)
 {
     u8 var;
     u16 species;
@@ -362,22 +362,22 @@ u8 sub_8077EE4(u8 slot, u8 a2)
     }
     else
     {
-        return GetBankPosition(slot, a2);
+        return GetBattlerSpriteCoord(slot, a2);
     }
 }
 
 u8 sub_8077F68(u8 slot)
 {
-    return GetBankPosition(slot, 4);
+    return GetBattlerSpriteCoord(slot, 4);
 }
 
 u8 sub_8077F7C(u8 slot)
 {
     u16 var;
     if (GetBattlerSide(slot) != 0)
-        var = GetBankPosition(slot, 1) + 16;
+        var = GetBattlerSpriteCoord(slot, 1) + 16;
     else
-        var = GetBankPosition(slot, 1) + 17;
+        var = GetBattlerSpriteCoord(slot, 1) + 17;
     return var;
 }
 
@@ -387,7 +387,7 @@ u8 sub_8077FC0(u8 slot)
     u8 r6;
     struct TransformStatus *transform;
 
-    r6 = GetBankPosition(slot, 1);
+    r6 = GetBattlerSpriteCoord(slot, 1);
     if (!IsContest())
     {
         if (GetBattlerSide(slot) != 0)
@@ -413,7 +413,7 @@ u8 sub_8077FC0(u8 slot)
     return r6;
 }
 
-u8 GetAnimBankSpriteId(u8 whichBank)
+u8 GetAnimBattlerSpriteId(u8 whichBank)
 {
     u8 *sprites;
 
@@ -634,8 +634,8 @@ void unref_sub_8078414(struct Sprite *sprite)
 {
     sprite->data[1] = sprite->pos1.x + sprite->pos2.x;
     sprite->data[3] = sprite->pos1.y + sprite->pos2.y;
-    sprite->data[2] = GetBankPosition(gAnimBankTarget, 2);
-    sprite->data[4] = GetBankPosition(gAnimBankTarget, 3);
+    sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2);
+    sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3);
     sprite->callback = sub_80782F8;
 }
 
@@ -702,8 +702,8 @@ void unref_sub_8078588(struct Sprite *sprite)
 {
     sprite->data[1] = sprite->pos1.x + sprite->pos2.x;
     sprite->data[3] = sprite->pos1.y + sprite->pos2.y;
-    sprite->data[2] = GetBankPosition(gAnimBankAttacker, 2);
-    sprite->data[4] = GetBankPosition(gAnimBankAttacker, 3);
+    sprite->data[2] = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
+    sprite->data[4] = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
     sprite->callback = sub_80782F8;
 }
 
@@ -741,14 +741,14 @@ void sub_8078634(u8 task)
 
 void sub_8078650(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);
 }
 
 void sub_807867C(struct Sprite *sprite, s16 a2)
 {
-    u16 v1 = GetBankPosition(gAnimBankAttacker, 0);
-    u16 v2 = GetBankPosition(gAnimBankTarget, 0);
+    u16 v1 = GetBattlerSpriteCoord(gAnimBankAttacker, 0);
+    u16 v2 = GetBattlerSpriteCoord(gAnimBankTarget, 0);
 
     if (v1 > v2)
     {
@@ -834,7 +834,7 @@ u8 GetBattlerAtPosition(u8 slot)
 {
     u8 i;
 
-    for (i = 0; i < gNoOfAllBanks; i++)
+    for (i = 0; i < gBattlersCount; i++)
     {
         if (gBanksBySide[i] == slot)
             break;
@@ -1159,7 +1159,7 @@ bool8 sub_8078E38()
 {
     if (IsContest())
     {
-        if (gSprites[GetAnimBankSpriteId(0)].data[2] == 0xc9 /* XXX SPECIES_UNOWN? */)
+        if (gSprites[GetAnimBattlerSpriteId(0)].data[2] == 0xc9 /* XXX SPECIES_UNOWN? */)
             return FALSE;
         return TRUE;
     }
@@ -1425,8 +1425,8 @@ void TranslateAnimSpriteToTargetMonLocation(struct Sprite *sprite)
         gBattleAnimArgs[2] = -gBattleAnimArgs[2];
 
     sprite->data[0] = gBattleAnimArgs[4];
-    sprite->data[2] = GetBankPosition(gAnimBankTarget, 2) + gBattleAnimArgs[2];
-    sprite->data[4] = GetBankPosition(gAnimBankTarget, v2) + gBattleAnimArgs[3];
+    sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2) + gBattleAnimArgs[2];
+    sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, v2) + gBattleAnimArgs[3];
     sprite->callback = StartTranslateAnimSpriteByDeltas;
     StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
 }
@@ -1437,8 +1437,8 @@ void sub_80794A8(struct Sprite *sprite)
     if (GetBattlerSide(gAnimBankAttacker))
         gBattleAnimArgs[2] = -gBattleAnimArgs[2];
     sprite->data[0] = gBattleAnimArgs[4];
-    sprite->data[2] = GetBankPosition(gAnimBankTarget, 2) + gBattleAnimArgs[2];
-    sprite->data[4] = GetBankPosition(gAnimBankTarget, 3) + gBattleAnimArgs[3];
+    sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2) + gBattleAnimArgs[2];
+    sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3) + gBattleAnimArgs[3];
     sprite->data[5] = gBattleAnimArgs[5];
     InitAnimSpriteTranslationOverDuration(sprite);
     sprite->callback = sub_8079518;
@@ -1478,8 +1478,8 @@ void sub_8079534(struct Sprite *sprite)
         gBattleAnimArgs[2] = -gBattleAnimArgs[2];
     sub_8078764(sprite, r4);
     sprite->data[0] = gBattleAnimArgs[4];
-    sprite->data[2] = GetBankPosition(slot, 2) + gBattleAnimArgs[2];
-    sprite->data[4] = GetBankPosition(slot, r7) + gBattleAnimArgs[3];
+    sprite->data[2] = GetBattlerSpriteCoord(slot, 2) + gBattleAnimArgs[2];
+    sprite->data[4] = GetBattlerSpriteCoord(slot, r7) + gBattleAnimArgs[3];
     sprite->callback = StartTranslateAnimSpriteByDeltas;
     StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
 }
@@ -1487,7 +1487,7 @@ void sub_8079534(struct Sprite *sprite)
 s16 duplicate_obj_of_side_rel2move_in_transparent_mode(u8 a1)
 {
     u16 i;
-    u8 sprite = GetAnimBankSpriteId(a1);
+    u8 sprite = GetAnimBattlerSpriteId(a1);
 
     if (sprite != 0xff)
     {
@@ -1573,7 +1573,7 @@ void sub_80796F8(u8 taskId)
 // arg 4: number of times to blend in and out
 void AnimTask_BlendMonInAndOut(u8 task)
 {
-    u8 spriteId = GetAnimBankSpriteId(gBattleAnimArgs[0]);
+    u8 spriteId = GetAnimBattlerSpriteId(gBattleAnimArgs[0]);
     if (spriteId == 0xff)
     {
         DestroyAnimVisualTask(task);
@@ -1872,7 +1872,7 @@ void sub_8079E24()
 {
     int i;
 
-    for (i = 0; i < gNoOfAllBanks; i++)
+    for (i = 0; i < gBattlersCount; i++)
     {
         if (IsAnimBankSpriteVisible(i))
         {
@@ -2112,15 +2112,15 @@ s16 sub_807A100(u8 slot, u8 a2)
     case 1:
         return (coords->coords >> 4) * 8;
     case 4:
-        return GetBankPosition(slot, 2) - ((coords->coords >> 4) * 4);
+        return GetBattlerSpriteCoord(slot, 2) - ((coords->coords >> 4) * 4);
     case 5:
-        return GetBankPosition(slot, 2) + ((coords->coords >> 4) * 4);
+        return GetBattlerSpriteCoord(slot, 2) + ((coords->coords >> 4) * 4);
     case 2:
-        return GetBankPosition(slot, 3) - ((coords->coords & 0xf) * 4);
+        return GetBattlerSpriteCoord(slot, 3) - ((coords->coords & 0xf) * 4);
     case 3:
-        return GetBankPosition(slot, 3) + ((coords->coords & 0xf) * 4);
+        return GetBattlerSpriteCoord(slot, 3) + ((coords->coords & 0xf) * 4);
     case 6:
-        ret = GetBankPosition(slot, 1) + 0x1f;
+        ret = GetBattlerSpriteCoord(slot, 1) + 0x1f;
         return ret - coords->y_offset;
     default:
         return 0;
@@ -2143,12 +2143,12 @@ void SetAverageBattlerPositions(u8 slot, bool8 a2, s16 *x, s16 *y)
         v1 = 2;
         v2 = 3;
     }
-    v3 = GetBankPosition(slot, v1);
-    v4 = GetBankPosition(slot, v2);
+    v3 = GetBattlerSpriteCoord(slot, v1);
+    v4 = GetBattlerSpriteCoord(slot, v2);
     if (IsDoubleBattle() && !IsContest())
     {
-        v5 = GetBankPosition(slot ^ 2, v1);
-        v6 = GetBankPosition(slot ^ 2, v2);
+        v5 = GetBattlerSpriteCoord(slot ^ 2, v1);
+        v6 = GetBattlerSpriteCoord(slot ^ 2, v2);
     }
     else
     {
@@ -2237,7 +2237,7 @@ void sub_807A69C(u8 taskId)
     u16 src;
     u16 dest;
     struct Task *task = &gTasks[taskId];
-    task->data[0] = GetAnimBankSpriteId(0);
+    task->data[0] = GetAnimBattlerSpriteId(0);
     task->data[1] = (GetBattlerSide(gAnimBankAttacker)) ? -8 : 8;
     task->data[2] = 0;
     task->data[3] = 0;
@@ -2318,8 +2318,8 @@ void sub_807A8D4(struct Sprite *sprite)
 // file_4
 
 void sub_807A908(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))
         sprite->data[0] = 5;
     else