Merge pull request #715 from shinny456/master

gAnimBankAttacker/Target to gBattleAnimAttacker/Target

120 files changed, 1340 insertions, 1340 deletions

diff --git a/asm/battle_anim_812C144.s b/asm/battle_anim_812C144.s
index ded2b5848..45ab2de2a 100644
--- a/asm/battle_anim_812C144.s
+++ b/asm/battle_anim_812C144.s
@@ -106,7 +106,7 @@ _08131990:
 	ldrh r1, [r6, 0xA]
 	adds r0, r1
 	strh r0, [r6, 0xA]
-	ldr r0, _081319E0 @ =gAnimBankAttacker
+	ldr r0, _081319E0 @ =gBattleAnimAttacker
 	ldrb r0, [r0]
 	bl GetBattlerSide
 	lsls r0, 24
@@ -127,7 +127,7 @@ _08131990:
 	b _08131A02
 	.align 2, 0
 _081319DC: .4byte gTasks
-_081319E0: .4byte gAnimBankAttacker
+_081319E0: .4byte gBattleAnimAttacker
 _081319E4: .4byte gSprites
 _081319E8:
 	ldr r3, _08131A3C @ =gSprites
@@ -187,7 +187,7 @@ _08131A44:
 	ldr r3, [r0, 0xC]
 	mov r9, r3
 	ldrh r5, [r0]
-	ldr r0, _08131A70 @ =gAnimBankAttacker
+	ldr r0, _08131A70 @ =gBattleAnimAttacker
 	ldrb r0, [r0]
 	bl GetBattlerSubpriority
 	lsls r0, 24
@@ -196,9 +196,9 @@ _08131A44:
 	b _08131B92
 	.align 2, 0
 _08131A6C: .4byte gSharedMem + 0x19348
-_08131A70: .4byte gAnimBankAttacker
+_08131A70: .4byte gBattleAnimAttacker
 _08131A74:
-	ldr r4, _08131AD4 @ =gAnimBankAttacker
+	ldr r4, _08131AD4 @ =gBattleAnimAttacker
 	ldrb r0, [r4]
 	bl GetBattlerSide
 	lsls r0, 24
@@ -243,7 +243,7 @@ _08131A74:
 	lsrs r5, r0, 16
 	b _08131AE6
 	.align 2, 0
-_08131AD4: .4byte gAnimBankAttacker
+_08131AD4: .4byte gBattleAnimAttacker
 _08131AD8: .4byte gBattlerPartyIndexes
 _08131ADC: .4byte gPlayerParty
 _08131AE0: .4byte gSharedMem + 0x17800
@@ -334,7 +334,7 @@ _08131B72:
 _08131B92:
 	ldr r6, _08131C08 @ =0x0000ffe0
 _08131B94:
-	ldr r0, _08131C0C @ =gAnimBankTarget
+	ldr r0, _08131C0C @ =gBattleAnimTarget
 	ldrb r0, [r0]
 	movs r1, 0x1
 	bl GetBattlerSpriteCoord
@@ -354,7 +354,7 @@ _08131B94:
 	bl sub_8079F44
 	lsls r0, 24
 	lsrs r5, r0, 24
-	ldr r0, _08131C10 @ =gAnimBankAttacker
+	ldr r0, _08131C10 @ =gBattleAnimAttacker
 	ldrb r0, [r0]
 	lsls r0, 2
 	ldr r1, _08131C14 @ =gSharedMem + 0x17800
@@ -390,8 +390,8 @@ _08131BF2:
 	.align 2, 0
 _08131C04: .4byte gSprites
 _08131C08: .4byte 0x0000ffe0
-_08131C0C: .4byte gAnimBankTarget
-_08131C10: .4byte gAnimBankAttacker
+_08131C0C: .4byte gBattleAnimTarget
+_08131C10: .4byte gBattleAnimAttacker
 _08131C14: .4byte gSharedMem + 0x17800
 _08131C18: .4byte 0x00007fff
 _08131C1C: .4byte gTasks
@@ -411,7 +411,7 @@ _08131C20:
 	ldrh r2, [r6, 0xA]
 	adds r0, r2
 	strh r0, [r6, 0xA]
-	ldr r0, _08131C70 @ =gAnimBankAttacker
+	ldr r0, _08131C70 @ =gBattleAnimAttacker
 	ldrb r0, [r0]
 	bl GetBattlerSide
 	lsls r0, 24
@@ -434,7 +434,7 @@ _08131C20:
 	b _08131C8E
 	.align 2, 0
 _08131C6C: .4byte gTasks
-_08131C70: .4byte gAnimBankAttacker
+_08131C70: .4byte gBattleAnimAttacker
 _08131C74: .4byte gSprites
 _08131C78:
 	ldr r2, _08131CDC @ =gSprites
@@ -468,7 +468,7 @@ _08131C8E:
 	ldrsh r0, [r6, r1]
 	cmp r0, 0
 	bne _08131D0E
-	ldr r0, _08131CE4 @ =gAnimBankAttacker
+	ldr r0, _08131CE4 @ =gBattleAnimAttacker
 	ldrb r0, [r0]
 	bl GetBattlerSide
 	lsls r0, 24
@@ -476,7 +476,7 @@ _08131C8E:
 	bne _08131CEC
 	lsls r4, r5, 16
 	asrs r4, 16
-	ldr r0, _08131CE8 @ =gAnimBankTarget
+	ldr r0, _08131CE8 @ =gBattleAnimTarget
 	ldrb r0, [r0]
 	movs r1, 0
 	bl GetBattlerSpriteCoord
@@ -488,12 +488,12 @@ _08131C8E:
 	.align 2, 0
 _08131CDC: .4byte gSprites
 _08131CE0: .4byte gTasks
-_08131CE4: .4byte gAnimBankAttacker
-_08131CE8: .4byte gAnimBankTarget
+_08131CE4: .4byte gBattleAnimAttacker
+_08131CE8: .4byte gBattleAnimTarget
 _08131CEC:
 	lsls r4, r5, 16
 	asrs r4, 16
-	ldr r0, _08131D30 @ =gAnimBankTarget
+	ldr r0, _08131D30 @ =gBattleAnimTarget
 	ldrb r0, [r0]
 	movs r1, 0
 	bl GetBattlerSpriteCoord
@@ -528,7 +528,7 @@ _08131D20:
 	strh r0, [r1, 0xA]
 	b _08131DB6
 	.align 2, 0
-_08131D30: .4byte gAnimBankTarget
+_08131D30: .4byte gBattleAnimTarget
 _08131D34: .4byte gBattleAnimArgs
 _08131D38: .4byte 0x0000ffff
 _08131D3C: .4byte gTasks
@@ -552,7 +552,7 @@ _08131D40:
 	ldr r5, _08131D90 @ =gSprites
 	adds r0, r5
 	bl sub_807A0F4
-	ldr r0, _08131D94 @ =gAnimBankAttacker
+	ldr r0, _08131D94 @ =gBattleAnimAttacker
 	ldrb r0, [r0]
 	bl GetBattlerSide
 	lsls r0, 24
@@ -571,7 +571,7 @@ _08131D40:
 	.align 2, 0
 _08131D8C: .4byte gTasks
 _08131D90: .4byte gSprites
-_08131D94: .4byte gAnimBankAttacker
+_08131D94: .4byte gBattleAnimAttacker
 _08131D98:
 	lsls r0, r7, 4
 	adds r0, r7
@@ -613,7 +613,7 @@ _08131DC4:
 	ldrh r3, [r2, 0xA]
 	adds r0, r3
 	strh r0, [r2, 0xA]
-	ldr r0, _08131E3C @ =gAnimBankAttacker
+	ldr r0, _08131E3C @ =gBattleAnimAttacker
 	mov r10, r0
 	ldrb r0, [r0]
 	str r2, [sp, 0x10]
@@ -653,7 +653,7 @@ _08131DC4:
 	b _08131E7C
 	.align 2, 0
 _08131E38: .4byte gTasks
-_08131E3C: .4byte gAnimBankAttacker
+_08131E3C: .4byte gBattleAnimAttacker
 _08131E40: .4byte gSprites
 _08131E44:
 	ldr r1, _08131EB0 @ =gSprites
@@ -741,7 +741,7 @@ _08131ECA:
 	asrs r1, 24
 	movs r0, 0x7A
 	bl PlaySE12WithPanning
-	ldr r0, _08131F54 @ =gAnimBankTarget
+	ldr r0, _08131F54 @ =gBattleAnimTarget
 	ldrb r0, [r0]
 	movs r1, 0x1
 	bl GetBattlerSpriteCoord
@@ -761,7 +761,7 @@ _08131ECA:
 	negs r0, r0
 	ands r0, r1
 	strb r0, [r2]
-	ldr r0, _08131F5C @ =gAnimBankAttacker
+	ldr r0, _08131F5C @ =gBattleAnimAttacker
 	ldrb r0, [r0]
 	bl GetBattlerSide
 	lsls r0, 24
@@ -790,9 +790,9 @@ _08131ECA:
 	b _08131FF4
 	.align 2, 0
 _08131F50: .4byte gBattleAnimArgs
-_08131F54: .4byte gAnimBankTarget
+_08131F54: .4byte gBattleAnimTarget
 _08131F58: .4byte 0x0000ffe0
-_08131F5C: .4byte gAnimBankAttacker
+_08131F5C: .4byte gBattleAnimAttacker
 _08131F60: .4byte gSprites
 _08131F64:
 	adds r0, r4, 0
@@ -835,7 +835,7 @@ _08131FA6:
 	ldrh r1, [r4, 0x32]
 	adds r0, r1
 	strh r0, [r4, 0x32]
-	ldr r0, _08131FD0 @ =gAnimBankAttacker
+	ldr r0, _08131FD0 @ =gBattleAnimAttacker
 	ldrb r0, [r0]
 	bl GetBattlerSide
 	lsls r0, 24
@@ -850,7 +850,7 @@ _08131FA6:
 	adds r1, r2, 0
 	b _08131FE0
 	.align 2, 0
-_08131FD0: .4byte gAnimBankAttacker
+_08131FD0: .4byte gBattleAnimAttacker
 _08131FD4:
 	ldrh r1, [r4, 0x32]
 	lsls r0, r1, 16
@@ -907,14 +907,14 @@ _0813202C:
 	.4byte _08132104
 	.4byte _0813216A
 _08132040:
-	ldr r0, _08132084 @ =gAnimBankAttacker
+	ldr r0, _08132084 @ =gBattleAnimAttacker
 	ldrb r0, [r0]
 	movs r1, 0
 	bl GetBattlerSpriteCoord
 	lsls r0, 24
 	lsrs r0, 24
 	adds r5, r0, 0
-	ldr r0, _08132088 @ =gAnimBankTarget
+	ldr r0, _08132088 @ =gBattleAnimTarget
 	ldrb r0, [r0]
 	movs r1, 0
 	bl GetBattlerSpriteCoord
@@ -940,12 +940,12 @@ _08132076:
 	strh r0, [r1, 0x26]
 	b _08132188
 	.align 2, 0
-_08132084: .4byte gAnimBankAttacker
-_08132088: .4byte gAnimBankTarget
+_08132084: .4byte gBattleAnimAttacker
+_08132088: .4byte gBattleAnimTarget
 _0813208C: .4byte gTasks
 _08132090:
 	ldr r1, _081320CC @ =gBankSpriteIds
-	ldr r0, _081320D0 @ =gAnimBankAttacker
+	ldr r0, _081320D0 @ =gBattleAnimAttacker
 	ldrb r0, [r0]
 	adds r0, r1
 	ldrb r2, [r0]
@@ -976,7 +976,7 @@ _08132090:
 	b _0813215E
 	.align 2, 0
 _081320CC: .4byte gBankSpriteIds
-_081320D0: .4byte gAnimBankAttacker
+_081320D0: .4byte gBattleAnimAttacker
 _081320D4: .4byte gSprites
 _081320D8:
 	movs r3, 0x20
@@ -1004,7 +1004,7 @@ _081320EC:
 	b _08132188
 _08132104:
 	ldr r1, _08132144 @ =gBankSpriteIds
-	ldr r0, _08132148 @ =gAnimBankAttacker
+	ldr r0, _08132148 @ =gBattleAnimAttacker
 	ldrb r0, [r0]
 	adds r0, r1
 	ldrb r2, [r0]
@@ -1037,7 +1037,7 @@ _08132104:
 	b _08132162
 	.align 2, 0
 _08132144: .4byte gBankSpriteIds
-_08132148: .4byte gAnimBankAttacker
+_08132148: .4byte gBattleAnimAttacker
 _0813214C: .4byte gSprites
 _08132150:
 	movs r3, 0x20
@@ -1057,7 +1057,7 @@ _08132162:
 	b _08132188
 _0813216A:
 	ldr r1, _08132190 @ =gBankSpriteIds
-	ldr r0, _08132194 @ =gAnimBankAttacker
+	ldr r0, _08132194 @ =gBattleAnimAttacker
 	ldrb r0, [r0]
 	adds r0, r1
 	ldrb r2, [r0]
@@ -1076,7 +1076,7 @@ _08132188:
 	bx r0
 	.align 2, 0
 _08132190: .4byte gBankSpriteIds
-_08132194: .4byte gAnimBankAttacker
+_08132194: .4byte gBattleAnimAttacker
 _08132198: .4byte gSprites
 	thumb_func_end sub_8131FFC
 
@@ -1096,7 +1096,7 @@ sub_813219C: @ 813219C
 	lsrs r0, 24
 	movs r5, 0
 	strh r0, [r4, 0xE]
-	ldr r0, _08132208 @ =gAnimBankAttacker
+	ldr r0, _08132208 @ =gBattleAnimAttacker
 	ldrb r0, [r0]
 	bl GetBattlerSide
 	lsls r0, 24
@@ -1135,7 +1135,7 @@ _081321D0:
 	bx r0
 	.align 2, 0
 _08132204: .4byte gTasks
-_08132208: .4byte gAnimBankAttacker
+_08132208: .4byte gBattleAnimAttacker
 _0813220C: .4byte gSprites
 _08132210: .4byte sub_8132214
 	thumb_func_end sub_813219C
@@ -1279,7 +1279,7 @@ _08132312:
 sub_8132318: @ 8132318
 	push {r4,lr}
 	adds r4, r0, 0
-	ldr r0, _0813236C @ =gAnimBankTarget
+	ldr r0, _0813236C @ =gBattleAnimTarget
 	ldrb r0, [r0]
 	bl GetBattlerSide
 	lsls r0, 24
@@ -1316,14 +1316,14 @@ _0813235E:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0813236C: .4byte gAnimBankTarget
+_0813236C: .4byte gBattleAnimTarget
 	thumb_func_end sub_8132318
 
 	thumb_func_start sub_8132370
 sub_8132370: @ 8132370
 	push {r4,lr}
 	adds r4, r0, 0
-	ldr r0, _081323A8 @ =gAnimBankTarget
+	ldr r0, _081323A8 @ =gBattleAnimTarget
 	ldrb r0, [r0]
 	bl GetBattlerSide
 	lsls r0, 24
@@ -1347,7 +1347,7 @@ sub_8132370: @ 8132370
 	bl StartSpriteAffineAnim
 	b _081323CE
 	.align 2, 0
-_081323A8: .4byte gAnimBankTarget
+_081323A8: .4byte gBattleAnimTarget
 _081323AC: .4byte gBattleAnimArgs
 _081323B0: .4byte 0x0000fff5
 _081323B4:
@@ -1379,7 +1379,7 @@ _081323DC: .4byte sub_8132318
 sub_81323E0: @ 81323E0
 	push {r4,r5,lr}
 	adds r5, r0, 0
-	ldr r4, _08132424 @ =gAnimBankAttacker
+	ldr r4, _08132424 @ =gBattleAnimAttacker
 	ldrb r0, [r4]
 	movs r1, 0x2
 	bl GetBattlerSpriteCoord
@@ -1410,7 +1410,7 @@ _0813240A:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08132424: .4byte gAnimBankAttacker
+_08132424: .4byte gBattleAnimAttacker
 _08132428: .4byte sub_8132430
 _0813242C: .4byte REG_BLDALPHA
 	thumb_func_end sub_81323E0
diff --git a/asm/water.s b/asm/water.s
index f3d5ada68..ef7a469f0 100644
--- a/asm/water.s
+++ b/asm/water.s
@@ -1083,7 +1083,7 @@ _080D438A:
 	thumb_func_start sub_80D4394
 sub_80D4394: @ 80D4394
 	push {r4,r5,lr}
-	ldr r4, _080D43B8 @ =gAnimBankAttacker
+	ldr r4, _080D43B8 @ =gBattleAnimAttacker
 	ldrb r0, [r4]
 	bl GetBattlerSide
 	lsls r0, 24
@@ -1099,7 +1099,7 @@ sub_80D4394: @ 80D4394
 	ldr r0, _080D43C0 @ =gPlayerParty
 	b _080D43D8
 	.align 2, 0
-_080D43B8: .4byte gAnimBankAttacker
+_080D43B8: .4byte gBattleAnimAttacker
 _080D43BC: .4byte gBattlerPartyIndexes
 _080D43C0: .4byte gPlayerParty
 _080D43C4:
@@ -1160,7 +1160,7 @@ sub_80D4418: @ 80D4418
 	lsls r1, 24
 	lsrs r1, 24
 	str r1, [sp]
-	ldr r4, _080D4520 @ =gAnimBankAttacker
+	ldr r4, _080D4520 @ =gBattleAnimAttacker
 	ldrb r0, [r4]
 	movs r1, 0x2
 	bl GetBattlerSpriteCoord
@@ -1280,7 +1280,7 @@ _080D44EA:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080D4520: .4byte gAnimBankAttacker
+_080D4520: .4byte gBattleAnimAttacker
 _080D4524: .4byte gSpriteTemplate_83D9378
 _080D4528: .4byte gSprites
 	thumb_func_end sub_80D4418
@@ -1390,7 +1390,7 @@ sub_80D45D8: @ 80D45D8
 	lsls r0, 24
 	lsrs r0, 24
 	strh r0, [r4, 0xA]
-	ldr r0, _080D460C @ =gAnimBankAttacker
+	ldr r0, _080D460C @ =gBattleAnimAttacker
 	ldrb r0, [r0]
 	bl GetBattlerSide
 	lsls r0, 24
@@ -1402,7 +1402,7 @@ sub_80D45D8: @ 80D45D8
 	b _080D4616
 	.align 2, 0
 _080D4608: .4byte gTasks
-_080D460C: .4byte gAnimBankAttacker
+_080D460C: .4byte gBattleAnimAttacker
 _080D4610:
 	movs r0, 0x10
 	strh r0, [r4, 0x10]
@@ -1788,7 +1788,7 @@ sub_80D48F4: @ 80D48F4
 	lsls r1, 3
 	ldr r0, _080D4978 @ =gTasks
 	adds r5, r1, r0
-	ldr r4, _080D497C @ =gAnimBankAttacker
+	ldr r4, _080D497C @ =gBattleAnimAttacker
 	ldrb r0, [r4]
 	movs r1, 0x2
 	bl GetBattlerSpriteCoord
@@ -1845,7 +1845,7 @@ _080D494C:
 	bx r0
 	.align 2, 0
 _080D4978: .4byte gTasks
-_080D497C: .4byte gAnimBankAttacker
+_080D497C: .4byte gBattleAnimAttacker
 _080D4980: .4byte 0x0000ffe0
 _080D4984: .4byte sub_80D4988
 	thumb_func_end sub_80D48F4
@@ -2265,7 +2265,7 @@ sub_80D4CA4: @ 80D4CA4
 	adds r4, r0, 0
 	movs r1, 0x1
 	bl InitAnimSpritePos
-	ldr r5, _080D4CE0 @ =gAnimBankTarget
+	ldr r5, _080D4CE0 @ =gBattleAnimTarget
 	ldrb r0, [r5]
 	movs r1, 0x2
 	bl GetBattlerSpriteCoord
@@ -2289,7 +2289,7 @@ sub_80D4CA4: @ 80D4CA4
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080D4CE0: .4byte gAnimBankTarget
+_080D4CE0: .4byte gBattleAnimTarget
 _080D4CE4: .4byte gBattleAnimArgs
 _080D4CE8: .4byte sub_80D4CEC
 	thumb_func_end sub_80D4CA4
@@ -2443,7 +2443,7 @@ _080D4DF2:
 	strh r0, [r4, 0x2E]
 	mov r0, r9
 	strh r0, [r4, 0x30]
-	ldr r0, _080D4E3C @ =gAnimBankAttacker
+	ldr r0, _080D4E3C @ =gBattleAnimAttacker
 	ldrb r0, [r0]
 	bl GetBattlerSubpriority
 	subs r0, 0x1
@@ -2459,7 +2459,7 @@ _080D4DF2:
 	.align 2, 0
 _080D4E34: .4byte gSpriteTemplate_83D9420
 _080D4E38: .4byte gSprites
-_080D4E3C: .4byte gAnimBankAttacker
+_080D4E3C: .4byte gBattleAnimAttacker
 _080D4E40:
 	strh r7, [r4, 0x32]
 _080D4E42:
@@ -2501,7 +2501,7 @@ _080D4E68:
 	strh r0, [r4, 0x2E]
 	mov r0, r9
 	strh r0, [r4, 0x30]
-	ldr r0, _080D4EB4 @ =gAnimBankAttacker
+	ldr r0, _080D4EB4 @ =gBattleAnimAttacker
 	ldrb r0, [r0]
 	bl GetBattlerSubpriority
 	subs r0, 0x1
@@ -2517,7 +2517,7 @@ _080D4E68:
 	.align 2, 0
 _080D4EAC: .4byte gSpriteTemplate_83D9420
 _080D4EB0: .4byte gSprites
-_080D4EB4: .4byte gAnimBankAttacker
+_080D4EB4: .4byte gBattleAnimAttacker
 _080D4EB8:
 	strh r7, [r4, 0x32]
 _080D4EBA:
diff --git a/src/battle/anim/alert.c b/src/battle/anim/alert.c
index f0d437627..13bdd997d 100644
--- a/src/battle/anim/alert.c
+++ b/src/battle/anim/alert.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 void sub_80CF610(struct Sprite* sprite);
 
@@ -47,7 +47,7 @@ void sub_80CF610(struct Sprite* sprite)
     sub_8078650(sprite);
     sub_807867C(sprite, gBattleAnimArgs[0]);
     sprite->pos1.y += gBattleAnimArgs[1];
-    if (GetBattlerSide(gAnimBankAttacker) != 0)
+    if (GetBattlerSide(gBattleAnimAttacker) != 0)
     {
         sprite->hFlip = 1;
         if (gBattleAnimArgs[2] != 0)
diff --git a/src/battle/anim/angel.c b/src/battle/anim/angel.c
index 4121e3c70..787691e6d 100644
--- a/src/battle/anim/angel.c
+++ b/src/battle/anim/angel.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 void sub_80D2938(struct Sprite* sprite);
 
diff --git a/src/battle/anim/angel_kiss.c b/src/battle/anim/angel_kiss.c
index 1b395fded..e38c6f388 100644
--- a/src/battle/anim/angel_kiss.c
+++ b/src/battle/anim/angel_kiss.c
@@ -6,8 +6,8 @@
 #include "random.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 void sub_80D2A38(struct Sprite* sprite);
 
diff --git a/src/battle/anim/anger.c b/src/battle/anim/anger.c
index 7abe53ab8..6ed40ad3c 100644
--- a/src/battle/anim/anger.c
+++ b/src/battle/anim/anger.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 void sub_80D09C0(struct Sprite* sprite);
 
@@ -40,9 +40,9 @@ void sub_80D09C0(struct Sprite* sprite)
 {
     u8 bank;
     if (gBattleAnimArgs[0] == 0)
-        bank = gAnimBankAttacker;
+        bank = gBattleAnimAttacker;
     else
-        bank = gAnimBankTarget;
+        bank = gBattleAnimTarget;
 
     if (GetBattlerSide(bank) == 1)
     {
diff --git a/src/battle/anim/aurora.c b/src/battle/anim/aurora.c
index ed41e9e79..b6f446de4 100644
--- a/src/battle/anim/aurora.c
+++ b/src/battle/anim/aurora.c
@@ -6,8 +6,8 @@
 #include "task.h"
 
 extern s16 gBattleAnimArgs[8];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 void AnimAuroraRings(struct Sprite *sprite);
 static void AnimGrowAuroraRings(struct Sprite *);
@@ -66,15 +66,15 @@ void AnimAuroraRings(struct Sprite *sprite)
     s16 r6;
 
     InitAnimSpritePos(sprite, 1);
-    if (GetBattlerSide(gAnimBankAttacker) != 0)
+    if (GetBattlerSide(gBattleAnimAttacker) != 0)
         r6 = -gBattleAnimArgs[2];
     else
         r6 = gBattleAnimArgs[2];
     sprite->data[0] = gBattleAnimArgs[4];
     sprite->data[1] = sprite->pos1.x;
-    sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2) + r6;
+    sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + r6;
     sprite->data[3] = sprite->pos1.y;
-    sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3) + gBattleAnimArgs[3];
+    sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + gBattleAnimArgs[3];
     InitAnimLinearTranslation(sprite);
     sprite->callback = AnimGrowAuroraRings;
     sprite->affineAnimPaused = TRUE;
diff --git a/src/battle/anim/beta_beat_up.c b/src/battle/anim/beta_beat_up.c
index bc70b705c..5671755b8 100644
--- a/src/battle/anim/beta_beat_up.c
+++ b/src/battle/anim/beta_beat_up.c
@@ -4,8 +4,8 @@
 #include "trig.h"
 
 extern s16 gBattleAnimArgs[8];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 void sub_80D6234(struct Sprite *sprite);
 static void sub_80D6278(struct Sprite *);
@@ -38,7 +38,7 @@ const struct SpriteTemplate gSpriteTemplate_83D980C =
 
 void sub_80D6234(struct Sprite *sprite)
 {
-    if (GetBattlerSide(gAnimBankAttacker) != 0)
+    if (GetBattlerSide(gBattleAnimAttacker) != 0)
     {
         sprite->pos1.x -= gBattleAnimArgs[0];
     }
diff --git a/src/battle/anim/blow_kiss.c b/src/battle/anim/blow_kiss.c
index d66e4aade..f1baef38a 100644
--- a/src/battle/anim/blow_kiss.c
+++ b/src/battle/anim/blow_kiss.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 void sub_80D1F58(struct Sprite* sprite);
 static void sub_80D1FA4(struct Sprite* sprite);
@@ -30,9 +30,9 @@ void sub_80D1F58(struct Sprite* sprite)
     InitAnimSpritePos(sprite, 1);
     sprite->data[0] = 0x5F;
     sprite->data[1] = sprite->pos1.x;
-    sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2);
+    sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
     sprite->data[3] = sprite->pos1.y;
-    sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3);
+    sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
     InitAnimLinearTranslation(sprite);
     sprite->callback = sub_80D1FA4;
 }
diff --git a/src/battle/anim/bottle.c b/src/battle/anim/bottle.c
index c5b43d7bc..13a3d538e 100644
--- a/src/battle/anim/bottle.c
+++ b/src/battle/anim/bottle.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 void sub_80CCF04(struct Sprite* sprite);
 static void sub_80CCF70(struct Sprite* sprite);
@@ -50,8 +50,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6C48 =
 
 void sub_80CCF04(struct Sprite* sprite)
 {
-    sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 2);
-    sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 3) + 0xFFE8;
+    sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
+    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 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 acf31e121..b57a2596e 100644
--- a/src/battle/anim/brace.c
+++ b/src/battle/anim/brace.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 void sub_80CDF0C(struct Sprite* sprite);
 static void sub_80CDF70(struct Sprite* sprite);
@@ -43,13 +43,13 @@ void sub_80CDF0C(struct Sprite* sprite)
 {
     if (gBattleAnimArgs[0] == 0)
     {
-        sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 0) + gBattleAnimArgs[1];
-        sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 1) + gBattleAnimArgs[2];
+        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0) + gBattleAnimArgs[1];
+        sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1) + gBattleAnimArgs[2];
     }
     else
     {
-        sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 0) + gBattleAnimArgs[1];
-        sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 1) + gBattleAnimArgs[2];
+        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 0) + gBattleAnimArgs[1];
+        sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 1) + gBattleAnimArgs[2];
     }
 
     sprite->data[0] = 0;
diff --git a/src/battle/anim/breath.c b/src/battle/anim/breath.c
index b55ff729e..d79cdcf77 100644
--- a/src/battle/anim/breath.c
+++ b/src/battle/anim/breath.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 void sub_80D0930(struct Sprite* sprite);
 
@@ -50,20 +50,20 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7764 =
 
 void sub_80D0930(struct Sprite* sprite)
 {
-    if (GetBattlerSide(gAnimBankAttacker) == 0)
+    if (GetBattlerSide(gBattleAnimAttacker) == 0)
     {
         StartSpriteAnim(sprite, 0);
-        sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2) + 32;
+        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) + 32;
         sprite->data[1] = 0x40;
     }
     else
     {
         StartSpriteAnim(sprite, 1);
-        sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2) - 32;
+        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) - 32;
         sprite->data[1] = -0x40;
     }
 
-    sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
+    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 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 9caf4d918..1870b786d 100644
--- a/src/battle/anim/bubble.c
+++ b/src/battle/anim/bubble.c
@@ -5,8 +5,8 @@
 #include "util.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 void sub_80D31C8(struct Sprite* sprite);
 static void sub_80D32E8(struct Sprite *sprite);
@@ -56,29 +56,29 @@ void sub_80D31C8(struct Sprite* sprite)
 {
     u8 newSpriteId;
 
-    if (GetBattlerSide(gAnimBankAttacker) != 0)
+    if (GetBattlerSide(gBattleAnimAttacker) != 0)
     {
-        sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2) - gBattleAnimArgs[0];
-        sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3) + gBattleAnimArgs[1];
+        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) - gBattleAnimArgs[0];
+        sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) + gBattleAnimArgs[1];
     }
     else
     {
-        sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2) + gBattleAnimArgs[0];
-        sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3) + gBattleAnimArgs[1];
+        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) + gBattleAnimArgs[0];
+        sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) + gBattleAnimArgs[1];
     }
 
     sprite->animPaused = 1;
 
-    if (GetBattlerSide(gAnimBankAttacker) != 0)
+    if (GetBattlerSide(gBattleAnimAttacker) != 0)
     {
         gBattleAnimArgs[2] = -gBattleAnimArgs[2];
     }
 
     sprite->data[0] = gBattleAnimArgs[6];
     sprite->data[1] = sprite->pos1.x;
-    sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2);
+    sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
     sprite->data[3] = sprite->pos1.y;
-    sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3);
+    sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
 
     InitAnimLinearTranslation(sprite);
 
diff --git a/src/battle/anim/bug.c b/src/battle/anim/bug.c
index b9429a75a..65b45b6cc 100644
--- a/src/battle/anim/bug.c
+++ b/src/battle/anim/bug.c
@@ -5,8 +5,8 @@
 #include "trig.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 void sub_80DC824(struct Sprite *sprite);
 void sub_80DC8F4(struct Sprite *sprite);
@@ -208,7 +208,7 @@ void sub_80DC824(struct Sprite *sprite)
         gBattleAnimArgs[2] = -gBattleAnimArgs[2];
         gBattleAnimArgs[0] = -gBattleAnimArgs[0];
     }
-    else if (!GetBattlerSide(gAnimBankTarget))
+    else if (!GetBattlerSide(gBattleAnimTarget))
     {
         StartSpriteAffineAnim(sprite, 1);
         gBattleAnimArgs[1] = -gBattleAnimArgs[1];
@@ -217,12 +217,12 @@ void sub_80DC824(struct Sprite *sprite)
         gBattleAnimArgs[0] = -gBattleAnimArgs[0];
     }
 
-    sprite->pos1.x = sub_8077EE4(gAnimBankTarget, 2) + gBattleAnimArgs[0];
-    sprite->pos1.y = sub_8077EE4(gAnimBankTarget, 3) + gBattleAnimArgs[1];
+    sprite->pos1.x = sub_8077EE4(gBattleAnimTarget, 2) + gBattleAnimArgs[0];
+    sprite->pos1.y = sub_8077EE4(gBattleAnimTarget, 3) + gBattleAnimArgs[1];
     sprite->data[0] = gBattleAnimArgs[4];
 
-    sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2) + gBattleAnimArgs[2];
-    sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3) + gBattleAnimArgs[3];
+    sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + gBattleAnimArgs[2];
+    sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + gBattleAnimArgs[3];
 
     sprite->callback = StartAnimLinearTranslation;
     StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
@@ -236,18 +236,18 @@ void sub_80DC8F4(struct Sprite *sprite)
         gBattleAnimArgs[0] = -gBattleAnimArgs[0];
         StartSpriteAffineAnim(sprite, 2);
     }
-    else if (!GetBattlerSide(gAnimBankTarget))
+    else if (!GetBattlerSide(gBattleAnimTarget))
     {
         gBattleAnimArgs[1] = -gBattleAnimArgs[1];
         gBattleAnimArgs[0] = -gBattleAnimArgs[0];
     }
 
-    sprite->pos1.x = sub_8077EE4(gAnimBankTarget, 2) + gBattleAnimArgs[0];
-    sprite->pos1.y = sub_8077EE4(gAnimBankTarget, 3) + gBattleAnimArgs[1];
+    sprite->pos1.x = sub_8077EE4(gBattleAnimTarget, 2) + gBattleAnimArgs[0];
+    sprite->pos1.y = sub_8077EE4(gBattleAnimTarget, 3) + gBattleAnimArgs[1];
     sprite->data[0] = gBattleAnimArgs[2];
 
-    sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2);
-    sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3);
+    sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
+    sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
 
     sprite->callback = StartAnimLinearTranslation;
     StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
@@ -267,12 +267,12 @@ void sub_80DC9A0(struct Sprite *sprite)
 
     if (!gBattleAnimArgs[4])
     {
-        sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2);
-        sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3);
+        sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
+        sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
     }
     else
     {
-        SetAverageBattlerPositions(gAnimBankTarget, 1, &sprite->data[2], &sprite->data[4]);
+        SetAverageBattlerPositions(gBattleAnimTarget, 1, &sprite->data[2], &sprite->data[4]);
     }
 
     sub_8078BD4(sprite);
@@ -295,14 +295,14 @@ static void sub_80DCA38(struct Sprite *sprite)
 // used in Move_STRING_SHOT
 void sub_80DCA70(struct Sprite *sprite)
 {
-    SetAverageBattlerPositions(gAnimBankTarget, 0, &sprite->pos1.x, &sprite->pos1.y);
-    if (GetBattlerSide(gAnimBankAttacker))
+    SetAverageBattlerPositions(gBattleAnimTarget, 0, &sprite->pos1.x, &sprite->pos1.y);
+    if (GetBattlerSide(gBattleAnimAttacker))
         sprite->pos1.x -= gBattleAnimArgs[0];
     else
         sprite->pos1.x += gBattleAnimArgs[0];
 
     sprite->pos1.y += gBattleAnimArgs[1];
-    if (!GetBattlerSide(gAnimBankTarget))
+    if (!GetBattlerSide(gBattleAnimTarget))
         sprite->pos1.y += 8;
 
     sprite->callback = sub_80DCAEC;
@@ -377,7 +377,7 @@ void AnimTranslateStinger(struct Sprite *sprite)
     }
     else
     {
-        if (GetBattlerSide(gAnimBankAttacker))
+        if (GetBattlerSide(gBattleAnimAttacker))
         {
             gBattleAnimArgs[2] = -gBattleAnimArgs[2];
             gBattleAnimArgs[1] = -gBattleAnimArgs[1];
@@ -387,9 +387,9 @@ void AnimTranslateStinger(struct Sprite *sprite)
 
     if (!IsContest())
     {
-        if (GetBattlerSide(gAnimBankAttacker) == GetBattlerSide(gAnimBankTarget))
+        if (GetBattlerSide(gBattleAnimAttacker) == GetBattlerSide(gBattleAnimTarget))
         {
-            if (GetBattlerPosition(gAnimBankTarget) == 0 || GetBattlerPosition(gAnimBankTarget) == 1)
+            if (GetBattlerPosition(gBattleAnimTarget) == 0 || GetBattlerPosition(gBattleAnimTarget) == 1)
             {
                 s16 temp1, temp2;
 
@@ -404,8 +404,8 @@ void AnimTranslateStinger(struct Sprite *sprite)
 
     InitAnimSpritePos(sprite, 1);
 
-    lVarX = GetBattlerSpriteCoord(gAnimBankTarget, 2) + gBattleAnimArgs[2];
-    lVarY = GetBattlerSpriteCoord(gAnimBankTarget, 3) + gBattleAnimArgs[3];
+    lVarX = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + gBattleAnimArgs[2];
+    lVarY = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + gBattleAnimArgs[3];
     rot = ArcTan2Neg(lVarX - sprite->pos1.x, lVarY - sprite->pos1.y);
     rot += 0xC000;
     sub_8078FDC(sprite, FALSE, 0x100, 0x100, rot);
@@ -431,12 +431,12 @@ void AnimMissileArc(struct Sprite *sprite)
 {
     InitAnimSpritePos(sprite, 1);
 
-    if (GetBattlerSide(gAnimBankAttacker))
+    if (GetBattlerSide(gBattleAnimAttacker))
         gBattleAnimArgs[2] = -gBattleAnimArgs[2];
 
     sprite->data[0] = gBattleAnimArgs[4];
-    sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2) + gBattleAnimArgs[2];
-    sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3) + gBattleAnimArgs[3];
+    sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + gBattleAnimArgs[2];
+    sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + gBattleAnimArgs[3];
     sprite->data[5] = gBattleAnimArgs[5];
     InitAnimArcTranslation(sprite);
 
@@ -485,13 +485,13 @@ void sub_80DCE40(struct Sprite *sprite)
 {
     if (gBattleAnimArgs[0] == 0)
     {
-        sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
-        sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3) + 18;
+        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
+        sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) + 18;
     }
     else
     {
-        sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 2);
-        sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 3) + 18;
+        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
+        sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + 18;
     }
 
     StoreSpriteCallbackInData(sprite, move_anim_8074EE0);
diff --git a/src/battle/anim/bullet.c b/src/battle/anim/bullet.c
index a47cfeccc..043e70563 100644
--- a/src/battle/anim/bullet.c
+++ b/src/battle/anim/bullet.c
@@ -6,8 +6,8 @@
 #include "random.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 void sub_80CFFD8(struct Sprite* sprite);
 static void sub_80D0030(struct Sprite* sprite);
@@ -42,8 +42,8 @@ void sub_80CFFD8(struct Sprite* sprite)
 {
     InitAnimSpritePos(sprite, 1);
     sprite->data[0] = 20;
-    sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2);
-    sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3);
+    sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
+    sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
     sprite->callback = StartAnimLinearTranslation;
     sprite->affineAnimPaused = 1;
     StoreSpriteCallbackInData(sprite, sub_80D0030);
diff --git a/src/battle/anim/copy_orb.c b/src/battle/anim/copy_orb.c
index da42814fa..9d078f440 100644
--- a/src/battle/anim/copy_orb.c
+++ b/src/battle/anim/copy_orb.c
@@ -4,8 +4,8 @@
 #include "battle_anim.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 extern const union AnimCmd *const gSpriteAnimTable_83D62D4[];
 
@@ -47,14 +47,14 @@ void sub_80CB4CC(struct Sprite* sprite)
     {
     case 0:
     {
-        if (GetBattlerSide(gAnimBankTarget) == 0)
+        if (GetBattlerSide(gBattleAnimTarget) == 0)
         {
             s16 a = gBattleAnimArgs[0];
             gBattleAnimArgs[0] = -a;
         }
 
-        sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 0) + gBattleAnimArgs[0];
-        sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 1) + gBattleAnimArgs[1];
+        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 0) + gBattleAnimArgs[0];
+        sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 1) + gBattleAnimArgs[1];
         sprite->invisible = 1;
         sprite->data[0]++;
         break;
@@ -66,8 +66,8 @@ void sub_80CB4CC(struct Sprite* sprite)
         {
             ChangeSpriteAffineAnim(sprite, 1);
             sprite->data[0] = 25;
-            sprite->data[2] = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
-            sprite->data[4] = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
+            sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
+            sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
             sprite->callback = sub_8078CC0;
             StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
             break;
diff --git a/src/battle/anim/cube.c b/src/battle/anim/cube.c
index 5dd83c4bd..e807002b4 100644
--- a/src/battle/anim/cube.c
+++ b/src/battle/anim/cube.c
@@ -6,8 +6,8 @@
 #include "constants/songs.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 void sub_80CDFB0(struct Sprite* sprite);
 static void sub_80CE000(struct Sprite* sprite);
@@ -52,8 +52,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6EF0 =
 
 void sub_80CDFB0(struct Sprite* sprite)
 {
-    sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
-    sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3) - 12;
+    sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
+    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) - 12;
     sprite->data[0] = 0;
     sprite->data[1] = 2;
     sprite->data[2] = 0;
diff --git a/src/battle/anim/current.c b/src/battle/anim/current.c
index 8547e9565..8621ca523 100644
--- a/src/battle/anim/current.c
+++ b/src/battle/anim/current.c
@@ -8,8 +8,8 @@
 #include "constants/songs.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 extern u8 gAnimVisualTaskCount;
 
 extern const struct SpriteTemplate gBattleAnimSpriteTemplate_83D97D0;
@@ -362,9 +362,9 @@ void sub_80D648C(struct Sprite *sprite)
 
     sprite->data[0] = gBattleAnimArgs[3];
     sprite->data[1] = sprite->pos1.x;
-    sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2);
+    sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
     sprite->data[3] = sprite->pos1.y;
-    sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3);
+    sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
 
     InitAnimLinearTranslation(sprite);
     sprite->data[5] = gBattleAnimArgs[2];
@@ -411,11 +411,11 @@ static void sub_80D658C(struct Sprite *sprite)
 
 void sub_80D65DC(struct Sprite *sprite)
 {
-    if (!gMain.inBattle || GetBattlerSide(gAnimBankTarget) == B_SIDE_PLAYER)
+    if (!gMain.inBattle || GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER)
         gBattleAnimArgs[1] = -gBattleAnimArgs[1];
 
-    sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 2) + gBattleAnimArgs[1];
-    sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 3) + gBattleAnimArgs[2];
+    sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + gBattleAnimArgs[1];
+    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + gBattleAnimArgs[2];
     sprite->data[3] = gBattleAnimArgs[0];
     sprite->data[4] = gBattleAnimArgs[3];
     sprite->data[5] = gBattleAnimArgs[3];
@@ -428,9 +428,9 @@ void sub_80D6658(struct Sprite *sprite)
 
     sprite->data[0] = gBattleAnimArgs[3];
     if (gBattleAnimArgs[7] & 0x8000)
-        bank = gAnimBankTarget;
+        bank = gBattleAnimTarget;
     else
-        bank = gAnimBankAttacker;
+        bank = gBattleAnimAttacker;
 
     if (!gMain.inBattle || GetBattlerSide(bank) == B_SIDE_PLAYER)
         gBattleAnimArgs[0] = -gBattleAnimArgs[0];
@@ -478,8 +478,8 @@ void sub_80D679C(struct Sprite *sprite)
 
 void sub_80D681C(u8 taskId)
 {
-    gTasks[taskId].data[0] = GetBattlerSpriteCoord(gAnimBankTarget, 0) + gBattleAnimArgs[0];
-    gTasks[taskId].data[1] = GetBattlerSpriteCoord(gAnimBankTarget, 1) + gBattleAnimArgs[1];
+    gTasks[taskId].data[0] = GetBattlerSpriteCoord(gBattleAnimTarget, 0) + gBattleAnimArgs[0];
+    gTasks[taskId].data[1] = GetBattlerSpriteCoord(gBattleAnimTarget, 1) + gBattleAnimArgs[1];
     gTasks[taskId].data[2] = gBattleAnimArgs[2];
     gTasks[taskId].func = sub_80D6874;
 }
@@ -813,13 +813,13 @@ void sub_80D6B3C(u8 taskId)
 
     if (gBattleAnimArgs[0] == 0) 
     {
-        task->data[14] = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
-        task->data[15] = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
+        task->data[14] = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
+        task->data[15] = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
     }
     else
     {
-        task->data[14] = GetBattlerSpriteCoord(gAnimBankTarget, 2);
-        task->data[15] = GetBattlerSpriteCoord(gAnimBankTarget, 3);
+        task->data[14] = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
+        task->data[15] = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
     }
 
     task->data[6] = gBattleAnimArgs[1];
@@ -904,13 +904,13 @@ void sub_80D6D18(struct Sprite *sprite)
 {
     if (gBattleAnimArgs[0] == 0)
     {
-        sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
-        sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
+        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
+        sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
     }
     else
     {
-        sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 2);
-        sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 3);
+        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
+        sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
     }
 
     StoreSpriteCallbackInData(sprite, move_anim_8074EE0);
@@ -921,13 +921,13 @@ void sub_80D6D70(struct Sprite *sprite)
 {
     if (gBattleAnimArgs[0] == 0)
     {
-        sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
-        sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
+        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
+        sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
     }
     else
     {
-        sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 2);
-        sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 3);
+        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
+        sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
     }
 
     sprite->pos2.x = gBattleAnimArgs[1];
@@ -939,12 +939,12 @@ void sub_80D6D70(struct Sprite *sprite)
 void sub_80D6DD8(struct Sprite *sprite)
 {
     StartSpriteAffineAnim(sprite, 1);
-    sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
-    sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
+    sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
+    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
     sprite->data[6] = GetAnimBattlerSpriteId(0);
     sprite->data[7] = 16;
 
-    if (GetBattlerSide(gAnimBankAttacker) == B_SIDE_OPPONENT)
+    if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT)
         sprite->data[7] *= -1;
 
     sprite->callback = sub_80D6E38;
@@ -977,8 +977,8 @@ void sub_80D6E9C(u8 taskId)
     {
     case 0:
         task->data[15] = GetAnimBattlerSpriteId(0);
-        task->data[14] = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
-        if (GetBattlerSide(gAnimBankAttacker) == B_SIDE_PLAYER)
+        task->data[14] = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
+        if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER)
         {
             task->data[14] = -32;
             task->data[13] = 2;
@@ -1033,19 +1033,19 @@ void sub_80D700C(u8 taskId)
     switch(task->data[0])
     {
     case 0:
-        task->data[1] = GetBattlerSide(gAnimBankAttacker) == B_SIDE_PLAYER ? 1 : -1;
+        task->data[1] = GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER ? 1 : -1;
 
         switch (gBattleAnimArgs[0])
         {
         case 0:
-            task->data[3] = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
-            task->data[5] = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
+            task->data[3] = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
+            task->data[5] = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
             task->data[4] = (task->data[1] * 128) + 120;
             break;
         case 4:
             task->data[3] = 120 - (task->data[1] * 128);
-            task->data[5] = GetBattlerSpriteCoord(gAnimBankTarget, 3);
-            task->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 2) - (task->data[1] * 32);
+            task->data[5] = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
+            task->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 2) - (task->data[1] * 32);
             break;
         default:
             if ((gBattleAnimArgs[0] & 1) != 0)
@@ -1147,8 +1147,8 @@ void sub_80D727C(struct Sprite *sprite)
     switch (sprite->data[0])
     {
     case 0:
-        sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
-        sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
+        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
+        sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
         StartSpriteAffineAnim(sprite, 2);
         sprite->data[0]++;
         break;
@@ -1166,10 +1166,10 @@ void sub_80D72DC(u8 taskId)
     switch (task->data[0])
     {
     case 0:
-        task->data[6] = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
-        task->data[7] = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
+        task->data[6] = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
+        task->data[7] = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
         task->data[8] = 4;
-        task->data[10] = GetBattlerSpriteCoord(gAnimBankTarget, 2);
+        task->data[10] = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
         task->data[9] = (task->data[10] - task->data[6]) / 5;
         task->data[4] = 7;
         task->data[5] = -1;
@@ -1290,15 +1290,15 @@ void sub_80D759C(u8 taskId)
     switch (task->data[0])
     {
     case 0:
-        task->data[15] = GetBattlerSpriteCoord(gAnimBankTarget, 1) + 32;
+        task->data[15] = GetBattlerSpriteCoord(gBattleAnimTarget, 1) + 32;
         task->data[14] = task->data[15];
         while (task->data[14] > 16)
         {
             task->data[14] -= 32;
         }
 
-        task->data[13] = GetBattlerSpriteCoord(gAnimBankTarget, 2);
-        task->data[12] = GetBattlerSubpriority(gAnimBankTarget) - 2;
+        task->data[13] = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
+        task->data[12] = GetBattlerSubpriority(gBattleAnimTarget) - 2;
         task->data[0]++;
         break;
     case 1:
diff --git a/src/battle/anim/curtain.c b/src/battle/anim/curtain.c
index 3c9e4e84c..a7e330278 100644
--- a/src/battle/anim/curtain.c
+++ b/src/battle/anim/curtain.c
@@ -6,8 +6,8 @@
 #include "palette.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 extern u16 gBattle_WIN0V;
 extern u16 gBattle_WIN0H;
diff --git a/src/battle/anim/cyclone.c b/src/battle/anim/cyclone.c
index 8a7f34d5d..b02f7b858 100644
--- a/src/battle/anim/cyclone.c
+++ b/src/battle/anim/cyclone.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 void sub_80D0118(struct Sprite* sprite);
 
@@ -39,7 +39,7 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D765C =
 void sub_80D0118(struct Sprite* sprite)
 {
     InitAnimSpritePos(sprite, 0);
-    if (GetBattlerSide(gAnimBankAttacker) == 0)
+    if (GetBattlerSide(gBattleAnimAttacker) == 0)
         sprite->pos1.y += 16;
 
     sprite->data[0] = gBattleAnimArgs[4];
diff --git a/src/battle/anim/dark.c b/src/battle/anim/dark.c
index fcbced40e..45ef7b831 100644
--- a/src/battle/anim/dark.c
+++ b/src/battle/anim/dark.c
@@ -12,8 +12,8 @@
 #include "constants/battle_constants.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 extern u8 gBankSpriteIds[];
 extern u16 gBattle_BG1_X;
 extern u16 gBattle_BG1_Y;
@@ -210,7 +210,7 @@ void sub_80DFC24(u8 taskId)
 {
     int bank;
     gTasks[taskId].data[0] = gBattleAnimArgs[0];
-    bank = gAnimBankAttacker;
+    bank = gBattleAnimAttacker;
     gTasks[taskId].data[1] = 16;
     REG_BLDALPHA = 16;
     if (GetBattlerPosition_permutated(bank) == 1)
@@ -233,7 +233,7 @@ static void sub_80DFC9C(u8 taskId)
         gTasks[taskId].data[2] = 0;
         if (r2 == 16)
         {
-            gSprites[gBankSpriteIds[gAnimBankAttacker]].invisible = 1;
+            gSprites[gBankSpriteIds[gBattleAnimAttacker]].invisible = 1;
             DestroyAnimVisualTask(taskId);
         }
     }
@@ -276,7 +276,7 @@ void sub_80DFD58(u8 taskId)
 void sub_80DFDC0(u8 taskId)
 {
     REG_BLDALPHA = 0x1000;
-    if (GetBattlerPosition_permutated(gAnimBankAttacker) == 1)
+    if (GetBattlerPosition_permutated(gBattleAnimAttacker) == 1)
         REG_BLDCNT = 0x3F42;
     else
         REG_BLDCNT = 0x3F44;
@@ -287,10 +287,10 @@ void sub_80DFDC0(u8 taskId)
 
 void sub_80DFE14(struct Sprite *sprite)
 {
-    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[1] = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
+    sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
+    sprite->data[3] = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
+    sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
     sprite->data[0] = 0x7E;
     InitSpriteDataForLinearTranslation(sprite);
     sprite->data[3] = -sprite->data[1];
@@ -366,9 +366,9 @@ void sub_80DFFD0(struct Sprite *sprite)
     s8 xOffset;
 
     if (gBattleAnimArgs[0] == 0)
-        bank = gAnimBankAttacker;
+        bank = gBattleAnimAttacker;
     else
-        bank = gAnimBankTarget;
+        bank = gBattleAnimTarget;
 
     xOffset = 20;
     sprite->oam.tileNum += 4;
@@ -421,22 +421,22 @@ void sub_80E00EC(u8 taskId)
     int var0;
     struct Task *task = &gTasks[taskId];
 
-    task->data[7] = GetBattlerSpriteCoord(gAnimBankAttacker, 1) + 31;
-    task->data[6] = sub_807A100(gAnimBankAttacker, 2) - 7;
+    task->data[7] = GetBattlerSpriteCoord(gBattleAnimAttacker, 1) + 31;
+    task->data[6] = sub_807A100(gBattleAnimAttacker, 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 = GetBattlerSpriteCoord(gAnimBankAttacker, 0);
+    pos = GetBattlerSpriteCoord(gBattleAnimAttacker, 0);
     task->data[14] = pos - 32;
     task->data[15] = pos + 32;
 
-    if (GetBattlerSide(gAnimBankAttacker) == B_SIDE_PLAYER)
+    if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER)
         task->data[8] = -12;
     else
         task->data[8] = -64;
 
-    task->data[3] = GetBattlerPosition_permutated(gAnimBankAttacker);
+    task->data[3] = GetBattlerPosition_permutated(gBattleAnimAttacker);
     if (task->data[3] == 1)
     {
         sub_8078914(&subStruct);
@@ -567,7 +567,7 @@ void sub_80E03BC(u8 taskId)
         }
         else
         {
-            task->data[3] = GetBattlerPosition_permutated(gAnimBankTarget);
+            task->data[3] = GetBattlerPosition_permutated(gBattleAnimTarget);
             if (task->data[3] == 1)
             {
                 REG_BLDCNT = 0x3F42;
@@ -599,14 +599,14 @@ void sub_80E03BC(u8 taskId)
         task->data[0]++;
         break;
     case 2:
-        task->data[7] = GetBattlerSpriteCoord(gAnimBankTarget, 1) + 31;
-        task->data[6] = sub_807A100(gAnimBankTarget, 2) - 7;
+        task->data[7] = GetBattlerSpriteCoord(gBattleAnimTarget, 1) + 31;
+        task->data[6] = sub_807A100(gBattleAnimTarget, 2) - 7;
         task->data[13] = (task->data[7] - task->data[6]) << 8;
-        pos = GetBattlerSpriteCoord(gAnimBankTarget, 0);
+        pos = GetBattlerSpriteCoord(gBattleAnimTarget, 0);
         task->data[14] = pos - 4;
         task->data[15] = pos + 4;
 
-        if (GetBattlerSide(gAnimBankTarget) == B_SIDE_PLAYER)
+        if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER)
             task->data[8] = -12;
         else
             task->data[8] = -64;
@@ -955,14 +955,14 @@ static void sub_80E08CC(u8 priority)
 
 void sub_80E0918(u8 taskId)
 {
-    u8 toBG2 = GetBattlerPosition_permutated(gAnimBankAttacker) ^ 1 ? 1 : 0;
-    MoveBattlerSpriteToBG(gAnimBankAttacker, toBG2);
-    gSprites[gBankSpriteIds[gAnimBankAttacker]].invisible = 0;
+    u8 toBG2 = GetBattlerPosition_permutated(gBattleAnimAttacker) ^ 1 ? 1 : 0;
+    MoveBattlerSpriteToBG(gBattleAnimAttacker, toBG2);
+    gSprites[gBankSpriteIds[gBattleAnimAttacker]].invisible = 0;
 
-    if (IsAnimBankSpriteVisible(gAnimBankAttacker ^ 2))
+    if (IsAnimBankSpriteVisible(gBattleAnimAttacker ^ 2))
     {
-        MoveBattlerSpriteToBG(gAnimBankAttacker ^ 2, toBG2 ^ 1);
-        gSprites[gBankSpriteIds[gAnimBankAttacker ^ 2]].invisible = 0;
+        MoveBattlerSpriteToBG(gBattleAnimAttacker ^ 2, toBG2 ^ 1);
+        gSprites[gBankSpriteIds[gBattleAnimAttacker ^ 2]].invisible = 0;
     }
 
     DestroyAnimVisualTask(taskId);
@@ -970,10 +970,10 @@ void sub_80E0918(u8 taskId)
 
 void sub_80E09C4(u8 taskId)
 {
-    u8 toBG2 = GetBattlerPosition_permutated(gAnimBankAttacker) ^ 1 ? 1 : 0;
+    u8 toBG2 = GetBattlerPosition_permutated(gBattleAnimAttacker) ^ 1 ? 1 : 0;
     sub_8076464(toBG2);
 
-    if (IsAnimBankSpriteVisible(gAnimBankAttacker ^ 2))
+    if (IsAnimBankSpriteVisible(gBattleAnimAttacker ^ 2))
         sub_8076464(toBG2 ^ 1);
 
     DestroyAnimVisualTask(taskId);
@@ -1011,11 +1011,11 @@ void sub_80E0A4C(u8 taskId)
 
     if (IsDoubleBattle() && !IsContest())
     {
-        if (GetBattlerPosition(gAnimBankAttacker) == 3 || GetBattlerPosition(gAnimBankAttacker) == 0)
+        if (GetBattlerPosition(gBattleAnimAttacker) == 3 || GetBattlerPosition(gBattleAnimAttacker) == 0)
         {
-            if (IsAnimBankSpriteVisible(gAnimBankAttacker ^ 2) == TRUE)
+            if (IsAnimBankSpriteVisible(gBattleAnimAttacker ^ 2) == TRUE)
             {
-                gSprites[gBankSpriteIds[gAnimBankAttacker ^ 2]].oam.priority--;
+                gSprites[gBankSpriteIds[gBattleAnimAttacker ^ 2]].oam.priority--;
                 REG_BG1CNT_BITFIELD.priority = 1;
                 var0 = 1;
             }
@@ -1028,14 +1028,14 @@ void sub_80E0A4C(u8 taskId)
     }
     else
     {
-        if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER)
-            species = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gAnimBankAttacker]], MON_DATA_SPECIES);
+        if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
+            species = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattleAnimAttacker]], MON_DATA_SPECIES);
         else
-            species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gAnimBankAttacker]], MON_DATA_SPECIES);
+            species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gBattleAnimAttacker]], MON_DATA_SPECIES);
     }
 
     spriteId = GetAnimBattlerSpriteId(0);
-    newSpriteId = sub_807A4A0(gAnimBankAttacker, spriteId, species);
+    newSpriteId = sub_807A4A0(gBattleAnimAttacker, spriteId, species);
 
     sub_8078914(&subStruct);
     DmaClear32(3, subStruct.field_4, 0x1000);
@@ -1101,7 +1101,7 @@ static void sub_80E0CD0(u8 taskId)
 
             if (gTasks[taskIdCopy].data[6] == 1)
             {
-                gSprites[gBankSpriteIds[gAnimBankAttacker ^ 2]].oam.priority++;
+                gSprites[gBankSpriteIds[gBattleAnimAttacker ^ 2]].oam.priority++;
             }
             
             DestroyAnimVisualTask(taskIdCopy);
diff --git a/src/battle/anim/devil.c b/src/battle/anim/devil.c
index 8e1010d2b..cc96cc455 100644
--- a/src/battle/anim/devil.c
+++ b/src/battle/anim/devil.c
@@ -5,7 +5,7 @@
 #include "trig.h"
 
 extern s16 gBattleAnimArgs[8];
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimTarget;
 
 void sub_80D2ABC(struct Sprite *sprite);
 
@@ -45,7 +45,7 @@ void sub_80D2ABC(struct Sprite *sprite)
         sprite->pos1.x += gBattleAnimArgs[0];
         sprite->pos1.y += gBattleAnimArgs[1];
         StartSpriteAnim(sprite, 0);
-        sprite->subpriority = GetBattlerSubpriority(gAnimBankTarget) - 1;
+        sprite->subpriority = GetBattlerSubpriority(gBattleAnimTarget) - 1;
         sprite->data[2] = 1;
     }
     sprite->data[0] += sprite->data[2];
diff --git a/src/battle/anim/dragon.c b/src/battle/anim/dragon.c
index c9a1d1539..cfb7576d6 100644
--- a/src/battle/anim/dragon.c
+++ b/src/battle/anim/dragon.c
@@ -6,8 +6,8 @@
 #include "scanline_effect.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 extern u8 gBankAttacker;
 extern u16 gBattle_BG1_X;
 extern u16 gBattle_BG2_X;
@@ -199,9 +199,9 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DB100 =
 
 void sub_80DF5A0(struct Sprite *sprite)
 {
-    sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
-    sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
-    if (GetBattlerSide(gAnimBankAttacker))
+    sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
+    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
+    if (GetBattlerSide(gBattleAnimAttacker))
     {
         sprite->pos1.x -= gBattleAnimArgs[0];
         gBattleAnimArgs[3] = -gBattleAnimArgs[3];
@@ -224,9 +224,9 @@ void sub_80DF5A0(struct Sprite *sprite)
 void sub_80DF63C(struct Sprite *sprite)
 {
     sub_8078650(sprite);
-    sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2);
-    sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3);
-    if (GetBattlerSide(gAnimBankAttacker))
+    sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
+    sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
+    if (GetBattlerSide(gBattleAnimAttacker))
     {
         sprite->pos1.x -= gBattleAnimArgs[1];
         sprite->pos1.y += gBattleAnimArgs[1];
@@ -252,13 +252,13 @@ void sub_80DF6F0(struct Sprite *sprite)
 {
     if (gBattleAnimArgs[0] == 0)
     {
-        sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 0);
-        sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 1);
+        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0);
+        sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1);
     }
     else
     {
-        sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 0);
-        sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 1);
+        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 0);
+        sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 1);
     }
     sub_807867C(sprite, gBattleAnimArgs[1]);
     sprite->pos1.y += gBattleAnimArgs[2];
@@ -270,7 +270,7 @@ void sub_80DF6F0(struct Sprite *sprite)
 
 void sub_80DF760(struct Sprite *sprite)
 {
-    if (GetBattlerSide(gAnimBankAttacker))
+    if (GetBattlerSide(gBattleAnimAttacker))
         StartSpriteAffineAnim(sprite, 1);
     sub_80DF63C(sprite);
 }
@@ -281,8 +281,8 @@ void sub_80DF78C(struct Sprite *sprite)
 {
     u16 r5;
     u16 r0;
-    sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
-    sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
+    sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
+    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
     sprite->data[4] = 0;
     sprite->data[5] = 1;
     sprite->data[6] = gBattleAnimArgs[0];
@@ -343,7 +343,7 @@ void sub_80DF924(u8 taskId)
     struct Task *task = &gTasks[taskId];
     u16 i;
     u8 r1;
-    if (GetBattlerPosition_permutated(gAnimBankAttacker) == 1)
+    if (GetBattlerPosition_permutated(gBattleAnimAttacker) == 1)
     {
         sp.dmaDest = &REG_BG1HOFS;
         task->data[2] = gBattle_BG1_X;
@@ -356,7 +356,7 @@ void sub_80DF924(u8 taskId)
     sp.dmaControl = 0xA2600001;
     sp.initState = 1;
     sp.unused9 = 0;
-    r1 = sub_8077FC0(gAnimBankAttacker);
+    r1 = sub_8077FC0(gBattleAnimAttacker);
     task->data[3] = r1 - 32;
     task->data[4] = r1 + 32;
     if (task->data[3] < 0)
@@ -426,8 +426,8 @@ void sub_80DFB28(struct Sprite *sprite)
 {
     int r6 = (gBattleAnimArgs[2] * 3) / 5;
     int i;
-    sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
-    sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3) + gBattleAnimArgs[4];
+    sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
+    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 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 b25c4fb9a..90a27eae6 100644
--- a/src/battle/anim/draw.c
+++ b/src/battle/anim/draw.c
@@ -6,8 +6,8 @@
 #include "scanline_effect.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 extern u16 gBattle_BG2_X;
 extern u16 gBattle_BG1_X;
@@ -36,15 +36,15 @@ void sub_80D0C88(u8 taskId)
     struct ScanlineEffectParams params;
 
     s16 i;
-    task->data[0] = sub_8077FC0(gAnimBankTarget) + 32;
+    task->data[0] = sub_8077FC0(gBattleAnimTarget) + 32;
     task->data[1] = 4;
     task->data[2] = 0;
     task->data[3] = 0;
     task->data[4] = 0;
     task->data[5] = 0;
-    task->data[15] = sub_807A100(gAnimBankTarget, 0);
+    task->data[15] = sub_807A100(gBattleAnimTarget, 0);
 
-    if (GetBattlerPosition_permutated(gAnimBankTarget) == 1)
+    if (GetBattlerPosition_permutated(gBattleAnimTarget) == 1)
     {
         task->data[6] = gBattle_BG1_X;
         params.dmaDest = (u16 *)REG_ADDR_BG1HOFS;
@@ -120,14 +120,14 @@ static void sub_80D0D68(u8 taskId)
 
 void sub_80D0E30(struct Sprite* sprite)
 {
-    sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 0) - 16;
-    sprite->pos1.y = sub_8077FC0(gAnimBankTarget) + 16;
+    sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 0) - 16;
+    sprite->pos1.y = sub_8077FC0(gBattleAnimTarget) + 16;
     sprite->data[0] = 0;
     sprite->data[1] = 0;
     sprite->data[2] = 0;
     sprite->data[3] = 16;
     sprite->data[4] = 0;
-    sprite->data[5] = sub_807A100(gAnimBankTarget, 0) + 2;
+    sprite->data[5] = sub_807A100(gBattleAnimTarget, 0) + 2;
     sprite->data[6] = BattleAnimAdjustPanning(SOUND_PAN_TARGET);
     sprite->callback = sub_80D0E8C;
 }
diff --git a/src/battle/anim/energy_wave.c b/src/battle/anim/energy_wave.c
index cdf3e3ced..b165a7f28 100644
--- a/src/battle/anim/energy_wave.c
+++ b/src/battle/anim/energy_wave.c
@@ -6,8 +6,8 @@
 #include "trig.h"
 
 extern s16 gBattleAnimArgs[8];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 extern const union AffineAnimCmd *const gSpriteAffineAnimTable_83D752C[];
 
 void sub_80D3554(struct Sprite *sprite);
@@ -166,9 +166,9 @@ void sub_80D3554(struct Sprite *sprite)
 
     sprite->data[0] = 30;
     sprite->data[1] = sprite->pos1.x;
-    sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2);
+    sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
     sprite->data[3] = sprite->pos1.y;
-    sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3);
+    sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
 
     InitAnimLinearTranslation(sprite);
 
@@ -228,15 +228,15 @@ void sub_80D3698(struct Sprite *sprite)
 {
     u8 subpriority;
 
-    sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 0);
-    sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 1);
+    sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0);
+    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1);
     sprite->pos2.y = -10;
 
-    subpriority = GetBattlerSubpriority(gAnimBankAttacker);
+    subpriority = GetBattlerSubpriority(gBattleAnimAttacker);
 
     if (!IsContest())
     {
-        if (GetBattlerSide(gAnimBankAttacker) == 0)
+        if (GetBattlerSide(gBattleAnimAttacker) == 0)
         {
             sprite->pos2.x = 10;
             sprite->subpriority = subpriority + 2;
@@ -268,11 +268,11 @@ void sub_80D3728(struct Sprite *sprite)
 {
     int var1, var2;
 
-    if (GetBattlerSide(gAnimBankAttacker) == GetBattlerSide(gAnimBankTarget))
+    if (GetBattlerSide(gBattleAnimAttacker) == GetBattlerSide(gBattleAnimTarget))
     {
         gBattleAnimArgs[0] *= -1;
 
-        if (GetBattlerPosition(gAnimBankAttacker) == 0 || GetBattlerPosition(gAnimBankAttacker) == 1)
+        if (GetBattlerPosition(gBattleAnimAttacker) == 0 || GetBattlerPosition(gBattleAnimAttacker) == 1)
         {
             gBattleAnimArgs[0] *= -1;
         }
@@ -291,14 +291,14 @@ void sub_80D3728(struct Sprite *sprite)
 
     InitAnimSpritePos(sprite, var1);
 
-    if (GetBattlerSide(gAnimBankAttacker) != 0)
+    if (GetBattlerSide(gBattleAnimAttacker) != 0)
     {
         gBattleAnimArgs[2] = -gBattleAnimArgs[2];
     }
 
     sprite->data[0] = gBattleAnimArgs[4];
-    sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2) + gBattleAnimArgs[2];
-    sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, var2) + gBattleAnimArgs[3];
+    sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + gBattleAnimArgs[2];
+    sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, var2) + gBattleAnimArgs[3];
     sprite->callback = StartAnimLinearTranslation;
     StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
 }
diff --git a/src/battle/anim/espeed.c b/src/battle/anim/espeed.c
index 17d0b383f..143510f3f 100644
--- a/src/battle/anim/espeed.c
+++ b/src/battle/anim/espeed.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 void sub_80D1A70(struct Sprite* sprite);
 static void sub_80D15E0(u8 taskId);
@@ -87,7 +87,7 @@ void sub_80D1638(u8 taskId)
     task->data[2] = 0;
     task->data[3] = 0;
     task->data[12] = 3;
-    if (GetBattlerSide(gAnimBankTarget) == 0)
+    if (GetBattlerSide(gBattleAnimTarget) == 0)
     {
         task->data[13] = 0xFFFF;
         task->data[14] = 8;
@@ -205,8 +205,8 @@ void sub_80D18D4(u8 taskId)
     task->data[7] = 0;
     task->data[8] = 0;
     task->data[13] = 0;
-    task->data[14] = GetBattlerSpriteCoord(gAnimBankAttacker, 0);
-    task->data[15] = GetBattlerSpriteCoord(gAnimBankAttacker, 1);
+    task->data[14] = GetBattlerSpriteCoord(gBattleAnimAttacker, 0);
+    task->data[15] = GetBattlerSpriteCoord(gBattleAnimAttacker, 1);
     task->func = sub_80D1930;
 }
 
diff --git a/src/battle/anim/evasion.c b/src/battle/anim/evasion.c
index c60618a49..2c3d973aa 100644
--- a/src/battle/anim/evasion.c
+++ b/src/battle/anim/evasion.c
@@ -7,8 +7,8 @@
 #include "blend_palette.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 static void sub_80CE910(u8 taskId);
 static void sub_80CE974(struct Sprite* sprite);
@@ -47,7 +47,7 @@ void sub_80CE7E0(u8 taskId)
     }
 
     task->func = sub_80CE910;
-    if (GetBattlerPosition_permutated(gAnimBankAttacker) == 1)
+    if (GetBattlerPosition_permutated(gBattleAnimAttacker) == 1)
     {
         REG_DISPCNT &= 0xFDFF;
     }
@@ -62,7 +62,7 @@ void sub_80CE910(u8 taskId)
     struct Task* task = &gTasks[taskId];
     if (!task->data[3])
     {
-        if (GetBattlerPosition_permutated(gAnimBankAttacker) == 1)
+        if (GetBattlerPosition_permutated(gBattleAnimAttacker) == 1)
             REG_DISPCNT |= 0x200;
         else
             REG_DISPCNT |= 0x400;
diff --git a/src/battle/anim/fang.c b/src/battle/anim/fang.c
index 74de16b56..776dc9f14 100644
--- a/src/battle/anim/fang.c
+++ b/src/battle/anim/fang.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 void sub_80CEA04(struct Sprite* sprite);
 
diff --git a/src/battle/anim/fight.c b/src/battle/anim/fight.c
index 76a8f2e7c..499cb0c98 100644
--- a/src/battle/anim/fight.c
+++ b/src/battle/anim/fight.c
@@ -9,8 +9,8 @@
 
 extern s16 gBattleAnimArgs[];
 extern u8 gBankAttacker;
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 extern u8 gBankSpriteIds[];
 extern u8 gBanksBySide[];
 extern u16 gBattle_BG1_X;
@@ -444,7 +444,7 @@ void sub_080B08A0(struct Sprite *sprite)
 
 void sub_80D902C(struct Sprite *sprite)
 {
-    if (gBattleAnimArgs[7] == 1 && GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER)
+    if (gBattleAnimArgs[7] == 1 && GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
     {
         gBattleAnimArgs[1] = -gBattleAnimArgs[1];
         gBattleAnimArgs[3] = -gBattleAnimArgs[3];
@@ -494,9 +494,9 @@ void sub_80D90F4(struct Sprite *sprite)
     s16 x, y;
 
     if (gBattleAnimArgs[0] == 0)
-        bank = gAnimBankAttacker;
+        bank = gBattleAnimAttacker;
     else
-        bank = gAnimBankTarget;
+        bank = gBattleAnimTarget;
 
     if (gBattleAnimArgs[2] < 0)
         gBattleAnimArgs[2] = Random() % 5;
@@ -590,12 +590,12 @@ static void sub_80D9328(struct Sprite *sprite)
 
 void sub_80D9378(struct Sprite *sprite)
 {
-    if ((gAnimBankAttacker ^ 2) == gAnimBankTarget && GetBattlerPosition(gAnimBankTarget) < 2)
+    if ((gBattleAnimAttacker ^ 2) == gBattleAnimTarget && GetBattlerPosition(gBattleAnimTarget) < 2)
         gBattleAnimArgs[0] *= -1;
 
     sub_8078764(sprite, TRUE);
 
-    if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER)
+    if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
         gBattleAnimArgs[2] = -gBattleAnimArgs[2];
 
     sprite->data[0] = gBattleAnimArgs[3];
@@ -669,8 +669,8 @@ static void AnimStompFootStep(struct Sprite *sprite)
     if (--sprite->data[0] == -1)
     {
         sprite->data[0] = 6;
-        sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2);
-        sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3);
+        sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
+        sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
 
         sprite->callback = StartAnimLinearTranslation;
         StoreSpriteCallbackInData(sprite, AnimStompFootEnd);
@@ -713,13 +713,13 @@ void sub_80D95D0(struct Sprite *sprite)
 {
     if (gBattleAnimArgs[0] == 0)
     {
-        sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 0);
-        sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 1);
+        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0);
+        sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1);
     }
     else
     {
-        sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 0);
-        sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 1);
+        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 0);
+        sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 1);
     }
 
     sprite->pos1.x += gBattleAnimArgs[1];
@@ -766,13 +766,13 @@ void sub_80D96B8(struct Sprite *sprite)
 {
     if (gBattleAnimArgs[0] == 0)
     {
-        sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 0) + gBattleAnimArgs[2];
-        sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 1) + gBattleAnimArgs[3];
+        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0) + gBattleAnimArgs[2];
+        sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1) + gBattleAnimArgs[3];
     }
     else
     {
-        sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 0) + gBattleAnimArgs[2];
-        sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 1) + gBattleAnimArgs[3];
+        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 0) + gBattleAnimArgs[2];
+        sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 1) + gBattleAnimArgs[3];
     }
 
     sprite->oam.tileNum += gBattleAnimArgs[1] * 16;
@@ -819,13 +819,13 @@ void sub_80D97CC(struct Sprite *sprite)
     {
         sprite->pos1.x = GetBattlerSpriteCoord(gBankAttacker, 2);
         sprite->pos1.y = GetBattlerSpriteCoord(gBankAttacker, 3);
-        sprite->oam.priority = sub_8079ED4(gAnimBankAttacker);
-        sprite->data[7] = gAnimBankTarget;
+        sprite->oam.priority = sub_8079ED4(gBattleAnimAttacker);
+        sprite->data[7] = gBattleAnimTarget;
     }
     else
     {
-        sprite->oam.priority = sub_8079ED4(gAnimBankTarget);
-        sprite->data[7] = gAnimBankAttacker;
+        sprite->oam.priority = sub_8079ED4(gBattleAnimTarget);
+        sprite->data[7] = gBattleAnimAttacker;
     }
 
     sprite->data[0] = 0;
@@ -885,10 +885,10 @@ static void sub_80D9934(struct Sprite *sprite)
     }
     else
     {
-        s16 pos0 = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
-        s16 pos1 = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
-        s16 pos2 = GetBattlerSpriteCoord(gAnimBankTarget, 2);
-        s16 pos3 = GetBattlerSpriteCoord(gAnimBankTarget, 3);
+        s16 pos0 = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
+        s16 pos1 = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
+        s16 pos2 = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
+        s16 pos3 = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
 
         sprite->data[0] = pos2 - pos0;
         sprite->data[1] = pos3 - pos1;
@@ -921,13 +921,13 @@ void sub_80D9A38(struct Sprite *sprite)
     {
         sprite->pos1.x = GetBattlerSpriteCoord(gBankAttacker, 2);
         sprite->pos1.y = GetBattlerSpriteCoord(gBankAttacker, 3);
-        bank = gAnimBankTarget;
-        sprite->oam.priority = sub_8079ED4(gAnimBankAttacker);
+        bank = gBattleAnimTarget;
+        sprite->oam.priority = sub_8079ED4(gBattleAnimAttacker);
     }
     else
     {
-        bank = gAnimBankAttacker;
-        sprite->oam.priority = sub_8079ED4(gAnimBankTarget);
+        bank = gBattleAnimAttacker;
+        sprite->oam.priority = sub_8079ED4(gBattleAnimTarget);
     }
 
     if (IsContest())
@@ -958,15 +958,15 @@ void sub_80D9B48(struct Sprite *sprite)
 {
     u8 turn;
 
-    sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 2);
-    sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 3);
+    sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
+    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
     sprite->data[1] = gBattleAnimArgs[3];
     sprite->data[2] = gBattleAnimArgs[0];
     sprite->data[3] = gBattleAnimArgs[1];
     sprite->data[4] = gBattleAnimArgs[2];
 
     turn = gAnimMoveTurn;
-    if (GetBattlerSide(gAnimBankTarget) == B_SIDE_PLAYER)
+    if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER)
         turn++;
 
     if (turn & 1)
@@ -992,7 +992,7 @@ void sub_80D9BD4(struct Sprite *sprite)
     {
         StartSpriteAnim(sprite, 2);
     }
-    else if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER)
+    else if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
     {
         StartSpriteAnim(sprite, 1);
     }
@@ -1038,7 +1038,7 @@ void sub_80D9C80(u8 taskId)
 
     task->data[10] += 2816;
 
-    if (GetBattlerSide(gAnimBankTarget) == B_SIDE_PLAYER)
+    if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER)
         gBattle_BG3_X += task->data[9] >> 8;
     else
         gBattle_BG3_X -= task->data[9] >> 8;
diff --git a/src/battle/anim/finger.c b/src/battle/anim/finger.c
index fd4be79a9..46e493de0 100644
--- a/src/battle/anim/finger.c
+++ b/src/battle/anim/finger.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 extern void sub_80CEF44(u8 bank, struct Sprite* sprite);
 
@@ -138,9 +138,9 @@ void sub_80CF040(struct Sprite* sprite)
 {
     u8 bank;
     if (gBattleAnimArgs[0] == 0)
-        bank = gAnimBankAttacker;
+        bank = gBattleAnimAttacker;
     else
-        bank = gAnimBankTarget;
+        bank = gBattleAnimTarget;
 
     sub_80CEF44(bank, sprite);
     sprite->data[0] = 0;
@@ -162,9 +162,9 @@ void sub_80CF0BC(struct Sprite* sprite)
 {
     u8 bank;
     if (gBattleAnimArgs[0] == 0)
-        bank = gAnimBankAttacker;
+        bank = gBattleAnimAttacker;
     else
-        bank = gAnimBankTarget;
+        bank = gBattleAnimTarget;
 
     sprite->pos1.x = GetBattlerSpriteCoord(bank, 0);
     sprite->pos1.y = sub_807A100(bank, 2);
@@ -219,9 +219,9 @@ void sub_80CF1C8(struct Sprite* sprite)
 {
     u8 bank;
     if (gBattleAnimArgs[0] == 0)
-        bank = gAnimBankAttacker;
+        bank = gBattleAnimAttacker;
     else
-        bank = gAnimBankTarget;
+        bank = gBattleAnimTarget;
 
     sub_80CEF44(bank, sprite);
     if (GetBattlerSide(bank) == 0)
diff --git a/src/battle/anim/fire.c b/src/battle/anim/fire.c
index c5d75d9a5..59923ea1a 100644
--- a/src/battle/anim/fire.c
+++ b/src/battle/anim/fire.c
@@ -4,7 +4,7 @@
 #include "trig.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
+extern u8 gBattleAnimAttacker;
 
 void sub_80D4ED8(struct Sprite *sprite);
 void sub_80D4F18(struct Sprite *sprite);
@@ -202,7 +202,7 @@ void sub_80D4F5C(struct Sprite *sprite)
 {
     sub_8078650(sprite);
 
-    if (GetBattlerSide(gAnimBankAttacker))
+    if (GetBattlerSide(gBattleAnimAttacker))
     {
         sprite->pos1.x -= gBattleAnimArgs[0];
         sprite->pos1.y += gBattleAnimArgs[1];
@@ -224,7 +224,7 @@ void sub_80D4F5C(struct Sprite *sprite)
 
 void sub_80D4FCC(struct Sprite *sprite)
 {
-    if (GetBattlerSide(gAnimBankAttacker))
+    if (GetBattlerSide(gBattleAnimAttacker))
     {
         sprite->pos1.x -= gBattleAnimArgs[0];
         sprite->pos1.y += gBattleAnimArgs[1];
@@ -260,7 +260,7 @@ void sub_80D5074(struct Sprite *sprite)
 {
     sub_8078650(sprite);
 
-    if (GetBattlerSide(gAnimBankAttacker))
+    if (GetBattlerSide(gBattleAnimAttacker))
     {
         sprite->pos1.x -= gBattleAnimArgs[0];
     }
diff --git a/src/battle/anim/fire_2.c b/src/battle/anim/fire_2.c
index 9db989aac..53d7038cb 100644
--- a/src/battle/anim/fire_2.c
+++ b/src/battle/anim/fire_2.c
@@ -7,8 +7,8 @@
 #include "trig.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 void AnimEmberFlare(struct Sprite *sprite);
 void sub_80D5210(struct Sprite *sprite);
@@ -195,9 +195,9 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D96F8 =
 // arg 6: ? (todo: something related to which mon the pixel offsets are based on)
 void AnimEmberFlare(struct Sprite *sprite)
 {
-    if (GetBattlerSide(gAnimBankAttacker) == GetBattlerSide(gAnimBankTarget)
-        && (gAnimBankAttacker == GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT)
-            || gAnimBankAttacker == GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT)))
+    if (GetBattlerSide(gBattleAnimAttacker) == GetBattlerSide(gBattleAnimTarget)
+        && (gBattleAnimAttacker == GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT)
+            || gBattleAnimAttacker == GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT)))
             gBattleAnimArgs[2] = -gBattleAnimArgs[2];
 
     sprite->callback = sub_8079534;
@@ -237,9 +237,9 @@ static void AnimFireRingStep1(struct Sprite *sprite)
     {
         sprite->data[0] = 0x19;
         sprite->data[1] = sprite->pos1.x;
-        sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2);
+        sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
         sprite->data[3] = sprite->pos1.y;
-        sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3);
+        sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
 
         InitAnimLinearTranslation(sprite);
 
@@ -253,8 +253,8 @@ static void AnimFireRingStep2(struct Sprite *sprite)
     {
         sprite->data[0] = 0;
 
-        sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 2);
-        sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 3);
+        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
+        sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
         sprite->pos2.y = 0;
         sprite->pos2.x = 0;
 
@@ -352,7 +352,7 @@ void sub_80D5470(u8 taskId) // initialize animation task for Move_ERUPTION?
     task->data[2] = 0;
     task->data[3] = 0;
     task->data[4] = gSprites[task->data[15]].pos1.y;
-    task->data[5] = GetBattlerSide(gAnimBankAttacker);
+    task->data[5] = GetBattlerSide(gBattleAnimAttacker);
     task->data[6] = 0;
 
     sub_8078E70(task->data[15], 0);
@@ -478,7 +478,7 @@ static void sub_80D57C4(u8 spriteId, u8 taskId, u8 a3)
     u16 y = sub_80D5940(spriteId);
     u16 x = gSprites[spriteId].pos1.x;
 
-    if(!GetBattlerSide(gAnimBankAttacker))
+    if(!GetBattlerSide(gBattleAnimAttacker))
     {
         x -= 0xC;
         sign = 1;
@@ -524,7 +524,7 @@ u16 sub_80D5940(u8 spriteId)
 {
     u16 var1 = gSprites[spriteId].pos1.y + gSprites[spriteId].pos2.y + gSprites[spriteId].centerToCornerVecY;
 
-    if (GetBattlerSide(gAnimBankAttacker) == 0)
+    if (GetBattlerSide(gBattleAnimAttacker) == 0)
     {
         var1 = ((var1 << 16) + 0x4A0000) >> 16;
     }
diff --git a/src/battle/anim/flash.c b/src/battle/anim/flash.c
index 2799046c8..34dc291f4 100644
--- a/src/battle/anim/flash.c
+++ b/src/battle/anim/flash.c
@@ -6,8 +6,8 @@
 #include "palette.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 extern struct SpriteTemplate gBattleAnimSpriteTemplate_83D6FC8;
 extern struct SpriteTemplate gBattleAnimSpriteTemplate_83D6FF8;
diff --git a/src/battle/anim/flying.c b/src/battle/anim/flying.c
index 3e3e7dc6b..9722e884a 100644
--- a/src/battle/anim/flying.c
+++ b/src/battle/anim/flying.c
@@ -8,8 +8,8 @@
 #include "random.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 extern u8 gAnimVisualTaskCount;
 extern struct OamMatrix gOamMatrices[];
 extern u8 gBanksBySide[];
@@ -430,15 +430,15 @@ void sub_80DA0DC(u8 taskId)
 void sub_80DA16C(struct Sprite *sprite)
 {
     InitAnimSpritePos(sprite, 1);
-    if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER)
+    if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
     {
         gBattleAnimArgs[2] = -gBattleAnimArgs[2];
     }
     sprite->data[0] = gBattleAnimArgs[4];
     sprite->data[1] = sprite->pos1.x;
-    sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2) + gBattleAnimArgs[2];
+    sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + gBattleAnimArgs[2];
     sprite->data[3] = sprite->pos1.y;
-    sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3) + gBattleAnimArgs[3];
+    sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + gBattleAnimArgs[3];
     InitAnimLinearTranslation(sprite);
     sprite->callback = sub_80785E4;
     StoreSpriteCallbackInData(sprite, sub_80DA1EC);
@@ -454,7 +454,7 @@ void sub_80DA1EC(struct Sprite *sprite)
 
 void sub_80DA208(struct Sprite *sprite)
 {
-    if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER)
+    if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
     {
         gBattleAnimArgs[0] = -gBattleAnimArgs[0];
         gBattleAnimArgs[1] = -gBattleAnimArgs[1];
@@ -468,20 +468,20 @@ void sub_80DA208(struct Sprite *sprite)
         gBattleAnimArgs[3] = -gBattleAnimArgs[3];
     }
 
-    sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
-    sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
+    sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
+    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
     sprite->pos1.x += gBattleAnimArgs[0];
     sprite->pos1.y += gBattleAnimArgs[1];
     sprite->data[0] = gBattleAnimArgs[4];
 
     if (gBattleAnimArgs[6] == 0)
     {
-        sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2);
-        sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3);
+        sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
+        sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
     }
     else
     {
-        SetAverageBattlerPositions(gAnimBankTarget, 1, &sprite->data[2], &sprite->data[4]);
+        SetAverageBattlerPositions(gBattleAnimTarget, 1, &sprite->data[2], &sprite->data[4]);
     }
 
     sprite->data[2] = sprite->data[2] + gBattleAnimArgs[2];
@@ -521,7 +521,7 @@ void sub_80DA348(struct Sprite *sprite)
 
 void sub_80DA38C(struct Sprite *sprite)
 {
-    if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER)
+    if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
     {
         sprite->pos1.x = 272;
         sprite->pos1.y = -32;
@@ -535,9 +535,9 @@ void sub_80DA38C(struct Sprite *sprite)
 
     sprite->data[0] = gBattleAnimArgs[0];
     sprite->data[1] = sprite->pos1.x;
-    sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2);
+    sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
     sprite->data[3] = sprite->pos1.y;
-    sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3);
+    sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
 
     InitAnimLinearTranslation(sprite);
     sprite->callback = sub_80DA410;
@@ -594,11 +594,11 @@ void sub_80DA4D8(struct Sprite *sprite)
 
     if (gBattleAnimArgs[7] & 0x100)
     {
-        slot = gAnimBankAttacker;
+        slot = gBattleAnimAttacker;
     }
     else
     {
-        slot = gAnimBankTarget;
+        slot = gBattleAnimTarget;
     }
 
     if (GetBattlerSide(slot) == 0)
@@ -1881,9 +1881,9 @@ _080DAD2C: .4byte sub_80DA48C\n");
 
 void sub_80DAD30(struct Sprite *sprite)
 {
-    sprite->oam.priority = sub_8079ED4(gAnimBankTarget);
-    sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
-    sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
+    sprite->oam.priority = sub_8079ED4(gBattleAnimTarget);
+    sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
+    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
     sprite->callback = TranslateAnimSpriteToTargetMonLocation;
 }
 
@@ -1899,29 +1899,29 @@ void sub_80DAD84(struct Sprite * sprite)
 
     if (gMain.inBattle)
     {
-        if (gBanksBySide[gAnimBankTarget] & 1)
+        if (gBanksBySide[gBattleAnimTarget] & 1)
         {
-            sprite->data[7] = GetBattlerSpriteCoord(gAnimBankTarget, 1) + gBattleAnimArgs[3];
+            sprite->data[7] = GetBattlerSpriteCoord(gBattleAnimTarget, 1) + gBattleAnimArgs[3];
         }
         else
         {
             // 080dade0
-            sprite->data[7] = GetBattlerSpriteCoord(gAnimBankTarget, 1) + 40;
+            sprite->data[7] = GetBattlerSpriteCoord(gBattleAnimTarget, 1) + 40;
         }
 
         if (gBattleAnimArgs[4])
         {
-            sprite->oam.priority = sub_8079ED4(gAnimBankTarget) + 1;
+            sprite->oam.priority = sub_8079ED4(gBattleAnimTarget) + 1;
             // 080dae24
         }
         else
         {
-            sprite->oam.priority = sub_8079ED4(gAnimBankTarget);
+            sprite->oam.priority = sub_8079ED4(gBattleAnimTarget);
         }
     }
     else
     {
-        sprite->data[7] = GetBattlerSpriteCoord(gAnimBankTarget, 1) + gBattleAnimArgs[3];
+        sprite->data[7] = GetBattlerSpriteCoord(gBattleAnimTarget, 1) + gBattleAnimArgs[3];
     }
 
     sprite->data[4] = gSineTable[sprite->data[1] & 0xff];
@@ -2181,8 +2181,8 @@ void sub_80DB000(struct Sprite *sprite)
         sub_8078764(sprite, FALSE);
     }
 
-    if ((!gBattleAnimArgs[2] && !GetBattlerSide(gAnimBankAttacker))
-        || (gBattleAnimArgs[2] == 1 && !GetBattlerSide(gAnimBankTarget)))
+    if ((!gBattleAnimArgs[2] && !GetBattlerSide(gBattleAnimAttacker))
+        || (gBattleAnimArgs[2] == 1 && !GetBattlerSide(gBattleAnimTarget)))
     {
         sprite->pos1.x += 8;
     }
@@ -2229,8 +2229,8 @@ void sub_80DB0E8(u8 task)
         gBattleAnimArgs[3] = 3;
 
         CreateSpriteAndAnimate(&gBattleAnimSpriteTemplate_83DB538,
-                               GetBattlerSpriteCoord(gAnimBankTarget, 2),
-                               GetBattlerSpriteCoord(gAnimBankTarget, 3),
+                               GetBattlerSpriteCoord(gBattleAnimTarget, 2),
+                               GetBattlerSpriteCoord(gBattleAnimTarget, 3),
                                3);
     }
 
@@ -2264,7 +2264,7 @@ void sub_80DB1F4(struct Sprite *sprite)
     switch (sprite->data[0])
     {
         case 0:
-            sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 1);
+            sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 1);
             sprite->pos2.y = -sprite->pos1.y - 32;
             ++sprite->data[0];
             break;
@@ -2345,13 +2345,13 @@ void sub_80DB374(struct Sprite *sprite)
         case 0:
             if (!gBattleAnimArgs[0])
             {
-                sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 0);
-                sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 1);
+                sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0);
+                sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1);
             }
             else
             {
-                sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 0);
-                sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 1);
+                sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 0);
+                sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 1);
             }
 
             sprite->data[1] = 512;
@@ -2420,13 +2420,13 @@ _080DB388:\n\
 	ldrsh r0, [r0, r2]\n\
 	cmp r0, 0\n\
 	bne _080DB3A0\n\
-	ldr r4, _080DB39C @ =gAnimBankAttacker\n\
+	ldr r4, _080DB39C @ =gBattleAnimAttacker\n\
 	b _080DB3A2\n\
 	.align 2, 0\n\
 _080DB398: .4byte gBattleAnimArgs\n\
-_080DB39C: .4byte gAnimBankAttacker\n\
+_080DB39C: .4byte gBattleAnimAttacker\n\
 _080DB3A0:\n\
-	ldr r4, _080DB3DC @ =gAnimBankTarget\n\
+	ldr r4, _080DB3DC @ =gBattleAnimTarget\n\
 _080DB3A2:\n\
 	ldrb r0, [r4]\n\
 	movs r1, 0\n\
@@ -2455,7 +2455,7 @@ _080DB3A2:\n\
 	strh r0, [r5, 0x2E]\n\
 	b _080DB44C\n\
 	.align 2, 0\n\
-_080DB3DC: .4byte gAnimBankTarget\n\
+_080DB3DC: .4byte gBattleAnimTarget\n\
 _080DB3E0:\n\
 	movs r1, 0x32\n\
 	ldrsh r0, [r5, r1]\n\
@@ -2554,13 +2554,13 @@ void sub_80DB458(struct Sprite *sprite)
 
     if (gBattleAnimArgs[1] == 0)
     {
-        sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 0);
-        sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 1) + 32;
+        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0);
+        sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1) + 32;
     }
     else
     {
-        sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 0);
-        sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 1) + 32;
+        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 0);
+        sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 1) + 32;
     }
 
     sprite->callback = sub_80DB508;
@@ -2628,8 +2628,8 @@ void sub_80DB5E4(struct Sprite *sprite)
     posx = sprite->pos1.x;
     posy = sprite->pos1.y;
 
-    sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
-    sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
+    sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
+    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
 
     sprite->data[4] = sprite->pos1.x << 4;
     sprite->data[5] = sprite->pos1.y << 4;
diff --git a/src/battle/anim/flying_hearts.c b/src/battle/anim/flying_hearts.c
index 855b3b8a3..31998b830 100644
--- a/src/battle/anim/flying_hearts.c
+++ b/src/battle/anim/flying_hearts.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 void sub_80D2064(struct Sprite* sprite);
 static void sub_80D2094(struct Sprite* sprite);
diff --git a/src/battle/anim/flying_path.c b/src/battle/anim/flying_path.c
index c9c506919..6e7dd03f1 100644
--- a/src/battle/anim/flying_path.c
+++ b/src/battle/anim/flying_path.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 static void sub_80CBF5C(u8 taskId);
 static s16 sub_80CC338(struct Sprite* sprite);
@@ -84,12 +84,12 @@ void sub_80CBDF4(u8 taskId)
 {
     struct Task *task = &gTasks[taskId];
 
-    task->data[4] = GetBattlerSubpriority(gAnimBankTarget) - 1;
-    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;
+    task->data[4] = GetBattlerSubpriority(gBattleAnimTarget) - 1;
+    task->data[6] = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
+    task->data[7] = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
+    task->data[10] = sub_807A100(gBattleAnimTarget, 1);
+    task->data[11] = sub_807A100(gBattleAnimTarget, 0);
+    task->data[5] = (GetBattlerSide(gBattleAnimTarget) == 1) ? 1 : -1;
     task->data[9] = 0x38 - (task->data[5] * 64);
     task->data[8] = task->data[7] - task->data[9] + task->data[6];
     task->data[2] = CreateSprite(&gSpriteTemplate_83D6884, task->data[8], task->data[9], task->data[4]);
diff --git a/src/battle/anim/flying_petals.c b/src/battle/anim/flying_petals.c
index 7135f4380..4d06b994e 100644
--- a/src/battle/anim/flying_petals.c
+++ b/src/battle/anim/flying_petals.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 extern const union AnimCmd *const gSpriteAnimTable_83D6424[];
 extern const union AnimCmd *const gSpriteAnimTable_83D6420[];
 
@@ -115,9 +115,9 @@ void sub_80CC474(struct Sprite* sprite)
 {
     u8 bank;
     if (!gBattleAnimArgs[6])
-        bank = gAnimBankAttacker;
+        bank = gBattleAnimAttacker;
     else
-        bank = gAnimBankTarget;
+        bank = gBattleAnimTarget;
 
     if (GetBattlerSide(bank) != 0)
     {
@@ -150,7 +150,7 @@ void sub_80CC474(struct Sprite* sprite)
         sprite->oam.priority = sub_8079ED4(bank);
         break;
     case 3:
-        sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 3) + gBattleAnimArgs[0];
+        sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + gBattleAnimArgs[0];
         GetAnimBattlerSpriteId(1);
         sprite->oam.priority = sub_8079ED4(bank) + 1;
         break;
diff --git a/src/battle/anim/ghost.c b/src/battle/anim/ghost.c
index 130e7ff92..f67035ac7 100644
--- a/src/battle/anim/ghost.c
+++ b/src/battle/anim/ghost.c
@@ -12,8 +12,8 @@
 
 extern s16 gBattleAnimArgs[];
 extern u8 gBankSpriteIds[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 extern u8 gUnknown_0202F7D2;
 
 static void sub_80DDB6C(struct Sprite *sprite);
@@ -227,9 +227,9 @@ static void sub_80DDB6C(struct Sprite *sprite)
     InitAnimSpritePos(sprite, 1);
     sprite->data[0] = gBattleAnimArgs[2];
     sprite->data[1] = sprite->pos1.x;
-    sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2);
+    sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
     sprite->data[3] = sprite->pos1.y;
-    sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3);
+    sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
     sub_8078BD4(sprite);
     sprite->callback = sub_80DDBD8;
     sprite->data[6] = 16;
@@ -409,8 +409,8 @@ static void InitAnimShadowBall(struct Sprite *sprite)
     u16 r5, r6;
     r5 = sprite->pos1.x;
     r6 = sprite->pos1.y;
-    sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
-    sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
+    sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
+    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
     sprite->data[0] = 0;
     sprite->data[1] = gBattleAnimArgs[0];
     sprite->data[2] = gBattleAnimArgs[1];
@@ -440,8 +440,8 @@ static void AnimShadowBallStep(struct Sprite *sprite)
         sprite->data[2] -= 1;
         if (sprite->data[2] > 0)
             break;
-        sprite->data[1] = GetBattlerSpriteCoord(gAnimBankTarget, 2);
-        sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 3);
+        sprite->data[1] = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
+        sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
         sprite->data[4] = sprite->pos1.x << 4;
         sprite->data[5] = sprite->pos1.y << 4;
         sprite->data[6] = ((sprite->data[1] - sprite->pos1.x) << 4) / sprite->data[3];
@@ -456,8 +456,8 @@ static void AnimShadowBallStep(struct Sprite *sprite)
         sprite->data[3] -= 1;
         if (sprite->data[3] > 0)
             break;
-        sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 2);
-        sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 3);
+        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
+        sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
         sprite->data[0] += 1;
         break;
     case 3:
@@ -581,7 +581,7 @@ void sub_80DE1B0(u8 taskId)
     REG_BLDCNT = 0x3F40;
     REG_BLDALPHA = (task->data[3] << 8) | task->data[2];
     gSprites[task->data[0]].data[0] = 80;
-    if (GetBattlerSide(gAnimBankTarget) == 0)
+    if (GetBattlerSide(gBattleAnimTarget) == 0)
     {
         gSprites[task->data[0]].data[1] = -144;
         gSprites[task->data[0]].data[2] = 112;
@@ -648,7 +648,7 @@ static void sub_80DE3D4(u8 taskId)
 {
     s16 startLine;
     struct Task *task = &gTasks[taskId];
-    u8 position = GetBattlerPosition_permutated(gAnimBankTarget);
+    u8 position = GetBattlerPosition_permutated(gBattleAnimTarget);
 
     switch (task->data[15])
     {
@@ -750,7 +750,7 @@ static void sub_80DE61C(u8 taskId)
 static void sub_80DE6B0(u8 taskId)
 {
     struct Task *task = &gTasks[taskId];
-    u8 position = GetBattlerPosition_permutated(gAnimBankTarget);
+    u8 position = GetBattlerPosition_permutated(gBattleAnimTarget);
 
     switch (task->data[15])
     {
@@ -791,17 +791,17 @@ static void sub_80DE7B8(struct Sprite *sprite)
 
     if (gBattleAnimArgs[0] == 0)
     {
-        battler1X = GetBattlerSpriteCoord(gAnimBankAttacker, 0);
-        battler1Y = GetBattlerSpriteCoord(gAnimBankAttacker, 1) + 28;
-        battler2X = GetBattlerSpriteCoord(gAnimBankTarget, 0);
-        battler2Y = GetBattlerSpriteCoord(gAnimBankTarget, 1) + 28;
+        battler1X = GetBattlerSpriteCoord(gBattleAnimAttacker, 0);
+        battler1Y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1) + 28;
+        battler2X = GetBattlerSpriteCoord(gBattleAnimTarget, 0);
+        battler2Y = GetBattlerSpriteCoord(gBattleAnimTarget, 1) + 28;
     }
     else
     {
-        battler1X = GetBattlerSpriteCoord(gAnimBankTarget, 0);
-        battler1Y = GetBattlerSpriteCoord(gAnimBankTarget, 1) + 28;
-        battler2X = GetBattlerSpriteCoord(gAnimBankAttacker, 0);
-        battler2Y = GetBattlerSpriteCoord(gAnimBankAttacker, 1) + 28;
+        battler1X = GetBattlerSpriteCoord(gBattleAnimTarget, 0);
+        battler1Y = GetBattlerSpriteCoord(gBattleAnimTarget, 1) + 28;
+        battler2X = GetBattlerSpriteCoord(gBattleAnimAttacker, 0);
+        battler2Y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1) + 28;
     }
 
     yDiff = battler2Y - battler1Y;
@@ -851,14 +851,14 @@ void sub_80DE918(u8 taskId)
     task->data[9] = 16;
     task->data[10] = gBattleAnimArgs[0];
 
-    baseX = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
-    baseY = sub_807A100(gAnimBankAttacker, 3);
+    baseX = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
+    baseY = sub_807A100(gBattleAnimAttacker, 3);
     if (!IsContest())
     {
         for (battler = 0; battler < 4; battler++)
         {
-            if (battler != gAnimBankAttacker
-             && battler != (gAnimBankAttacker ^ 2)
+            if (battler != gBattleAnimAttacker
+             && battler != (gBattleAnimAttacker ^ 2)
              && IsAnimBankSpriteVisible(battler))
             {
                 spriteId = CreateSprite(&gSpriteTemplate_83DAF08, baseX, baseY, 55);
@@ -994,7 +994,7 @@ void sub_80DECB0(u8 taskId)
     REG_BLDCNT = 0xC8;
     REG_BLDY = 0x10;
 
-    if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER || IsContest())
+    if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER || IsContest())
         startX = 40;
     else
         startX = 200;
@@ -1075,7 +1075,7 @@ static void sub_80DEF3C(struct Sprite *sprite)
     s16 xDelta2;
 
     InitAnimSpritePos(sprite, 1);
-    if (GetBattlerSide(gAnimBankAttacker) == B_SIDE_PLAYER)
+    if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER)
     {
         xDelta = 24;
         xDelta2 = -2;
@@ -1166,7 +1166,7 @@ static void sub_80DF0B8(struct Sprite *sprite)
     u16 coeffA;
 
     sprite->pos2.x = Sin(sprite->data[0], 12);
-    if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER)
+    if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
         sprite->pos2.x = -sprite->pos2.x;
     
     sprite->data[0] = (sprite->data[0] + 6) & 0xFF;
@@ -1214,12 +1214,12 @@ void sub_80DF1A4(u8 taskId)
 
     task->data[0] = 0;
     task->data[1] = 16;
-    task->data[9] = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
-    task->data[10] = sub_8077FC0(gAnimBankAttacker);
-    task->data[11] = (sub_807A100(gAnimBankAttacker, 1) / 2) + 8;
+    task->data[9] = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
+    task->data[10] = sub_8077FC0(gBattleAnimAttacker);
+    task->data[11] = (sub_807A100(gBattleAnimAttacker, 1) / 2) + 8;
     task->data[7] = 0;
-    task->data[5] = sub_8079ED4(gAnimBankAttacker);
-    task->data[6] = GetBattlerSubpriority(gAnimBankAttacker) - 2;
+    task->data[5] = sub_8079ED4(gBattleAnimAttacker);
+    task->data[6] = GetBattlerSubpriority(gBattleAnimAttacker) - 2;
     task->data[3] = 0;
     task->data[4] = 16;
     REG_BLDCNT = 0x3F40;
@@ -1243,7 +1243,7 @@ static void sub_80DF24C(u8 taskId)
             if (spriteId != MAX_SPRITES)
             {
                 gSprites[spriteId].data[0] = taskId;
-                gSprites[spriteId].data[1] = GetBattlerSide(gAnimBankAttacker) == B_SIDE_PLAYER;
+                gSprites[spriteId].data[1] = GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER;
 
                 gSprites[spriteId].data[2] = (i * 42) & 0xFF;
                 gSprites[spriteId].data[3] = task->data[11];
@@ -1344,7 +1344,7 @@ static void sub_80DF3D8(struct Sprite *sprite)
 static void sub_80DF49C(struct Sprite *sprite)
 {
     sprite->invisible = 1;
-    sprite->data[5] = gBankSpriteIds[gAnimBankAttacker];
+    sprite->data[5] = gBankSpriteIds[gBattleAnimAttacker];
     sprite->data[0] = 128;
     sprite->data[1] = 10;
     sprite->data[2] = gBattleAnimArgs[0];
diff --git a/src/battle/anim/glitter.c b/src/battle/anim/glitter.c
index e0ef150ad..894d857f0 100644
--- a/src/battle/anim/glitter.c
+++ b/src/battle/anim/glitter.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 void sub_80CD140(struct Sprite* sprite);
 void sub_80CD190(struct Sprite* sprite);
@@ -72,9 +72,9 @@ void sub_80CD190(struct Sprite* sprite)
 {
     u8 bank;
     if (!gBattleAnimArgs[2])
-        bank = gAnimBankAttacker;
+        bank = gBattleAnimAttacker;
     else
-        bank = gAnimBankTarget;
+        bank = gBattleAnimTarget;
 
     if (IsDoubleBattle() && IsAnimBankSpriteVisible(bank ^ 2))
     {
diff --git a/src/battle/anim/grip.c b/src/battle/anim/grip.c
index 8cf4e4bf9..60d0a46ad 100644
--- a/src/battle/anim/grip.c
+++ b/src/battle/anim/grip.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 void sub_80D0178(struct Sprite* sprite);
 static void sub_80D020C(struct Sprite* sprite);
@@ -65,8 +65,8 @@ void sub_80D0178(struct Sprite* sprite)
     sprite->pos1.x += r7;
     sprite->pos1.y += r4;
     sprite->data[0] = 6;
-    sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2) + r8;
-    sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3) + r6;
+    sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + r8;
+    sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + r6;
     sprite->callback = StartAnimLinearTranslation;
     StoreSpriteCallbackInData(sprite, sub_80D020C);
 }
diff --git a/src/battle/anim/ground.c b/src/battle/anim/ground.c
index 9f72cd73e..8c8e1d2a7 100644
--- a/src/battle/anim/ground.c
+++ b/src/battle/anim/ground.c
@@ -8,8 +8,8 @@
 #include "trig.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 extern u16 gBattle_BG1_X;
 extern u16 gBattle_BG1_Y;
 extern u16 gBattle_BG2_X;
@@ -154,11 +154,11 @@ const struct SpriteTemplate gDigDirtMoundSpriteTemplate =
 // a boomerang. After hitting the target mon, it comes back to the user.
 static void AnimBonemerangProjectile(struct Sprite *sprite)
 {
-    sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
-    sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
+    sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
+    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
     sprite->data[0] = 20;
-    sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2);
-    sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3);
+    sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
+    sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
     sprite->data[5] = -40;
     InitAnimArcTranslation(sprite);
     sprite->callback = AnimBonemerangProjectileStep;
@@ -173,8 +173,8 @@ static void AnimBonemerangProjectileStep(struct Sprite *sprite)
         sprite->pos2.y = 0;
         sprite->pos2.x = 0;
         sprite->data[0] = 20;
-        sprite->data[2] = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
-        sprite->data[4] = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
+        sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
+        sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
         sprite->data[5] = 40;
         InitAnimArcTranslation(sprite);
         sprite->callback = AnimBonemerangProjectileEnd;
@@ -197,12 +197,12 @@ static void AnimBonemerangProjectileEnd(struct Sprite *sprite)
 static void AnimBoneHitProjectile(struct Sprite *sprite)
 {
     sub_8078764(sprite, TRUE);
-    if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER)
+    if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
         gBattleAnimArgs[2] = -gBattleAnimArgs[2];
     
     sprite->data[0] = gBattleAnimArgs[4];
-    sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2) + gBattleAnimArgs[2];
-    sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3) + gBattleAnimArgs[3];
+    sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + gBattleAnimArgs[2];
+    sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + gBattleAnimArgs[3];
     sprite->callback = StartAnimLinearTranslation;
     StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
 }
@@ -220,8 +220,8 @@ static void AnimDirtScatter(struct Sprite *sprite)
 
     InitAnimSpritePos(sprite, 1);
 
-    targetXPos = sub_8077EE4(gAnimBankTarget, 2);
-    targetYPos = sub_8077EE4(gAnimBankTarget, 3);
+    targetXPos = sub_8077EE4(gBattleAnimTarget, 2);
+    targetYPos = sub_8077EE4(gBattleAnimTarget, 3);
 
     xOffset = Random() & 0x1F;
     yOffset = Random() & 0x1F;
@@ -247,8 +247,8 @@ static void AnimMudSportDirt(struct Sprite *sprite)
     sprite->oam.tileNum++;
     if (gBattleAnimArgs[0] == 0)
     {
-        sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2) + gBattleAnimArgs[1];
-        sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3) + gBattleAnimArgs[2];
+        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) + gBattleAnimArgs[1];
+        sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) + gBattleAnimArgs[2];
         sprite->data[0] = gBattleAnimArgs[1] > 0 ? 1 : -1;
         sprite->callback = AnimMudSportDirtRising;
     }
@@ -319,7 +319,7 @@ static void sub_80E1284(u8 taskId)
     {
     case 0:
         task->data[10] = GetAnimBattlerSpriteId(0);
-        task->data[11] = GetBattlerPosition_permutated(gAnimBankAttacker);
+        task->data[11] = GetBattlerPosition_permutated(gBattleAnimAttacker);
         if (task->data[11] == 1)
         {
             task->data[12] = gBattle_BG1_X;
@@ -331,7 +331,7 @@ static void sub_80E1284(u8 taskId)
             task->data[13] = gBattle_BG2_Y;
         }
 
-        var0 = sub_8077FC0(gAnimBankAttacker);
+        var0 = sub_8077FC0(gBattleAnimAttacker);
         task->data[14] = var0 - 32;
         task->data[15] = var0 + 32;
         if (task->data[14] < 0)
@@ -388,7 +388,7 @@ static void sub_80E143C(u8 taskId)
     gSprites[spriteId].pos2.x = 0;
     gSprites[spriteId].pos2.y = 0;
 
-    if (GetBattlerPosition_permutated(gAnimBankAttacker) == 1)
+    if (GetBattlerPosition_permutated(gBattleAnimAttacker) == 1)
         gBattle_BG1_Y = 0;
     else
         gBattle_BG2_Y = 0;
@@ -435,13 +435,13 @@ static void sub_80E1560(u8 taskId)
     {
     case 0:
         task->data[10] = GetAnimBattlerSpriteId(0);
-        task->data[11] = GetBattlerPosition_permutated(gAnimBankAttacker);
+        task->data[11] = GetBattlerPosition_permutated(gBattleAnimAttacker);
         if (task->data[11] == 1)
             task->data[12] = gBattle_BG1_X;
         else
             task->data[12] = gBattle_BG2_X;
 
-        var0 =  sub_8077FC0(gAnimBankAttacker);
+        var0 =  sub_8077FC0(gBattleAnimAttacker);
         task->data[14] = var0 - 32;
         task->data[15] = var0 + 32;
         task->data[0]++;
@@ -520,9 +520,9 @@ static void AnimFissureDirtPlumeParticle(struct Sprite *sprite)
     s16 xOffset;
 
     if (gBattleAnimArgs[0] == 0)
-        battler = gAnimBankAttacker;
+        battler = gBattleAnimAttacker;
     else
-        battler = gAnimBankTarget;
+        battler = gBattleAnimTarget;
 
     xOffset = 24;
     if (gBattleAnimArgs[1] == 1)
@@ -558,9 +558,9 @@ static void AnimDigDirtMound(struct Sprite *sprite)
     s8 battler;
 
     if (gBattleAnimArgs[0] == 0)
-        battler = gAnimBankAttacker;
+        battler = gBattleAnimAttacker;
     else
-        battler = gAnimBankTarget;
+        battler = gBattleAnimTarget;
 
     sprite->pos1.x = GetBattlerSpriteCoord(battler, 0) - 16 + (gBattleAnimArgs[1] * 32);
     sprite->pos1.y = sub_8077FC0(battler) + 32;
@@ -729,7 +729,7 @@ void sub_80E1B88(u8 taskId)
 void sub_80E1BB0(u8 taskId)
 {
     struct Task *newTask;
-    u8 battler = (gBattleAnimArgs[0] & 1) ? gAnimBankTarget : gAnimBankAttacker;
+    u8 battler = (gBattleAnimArgs[0] & 1) ? gBattleAnimTarget : gBattleAnimAttacker;
 
     if (gBattleAnimArgs[0] > 1)
         battler ^= 2;
diff --git a/src/battle/anim/grow.c b/src/battle/anim/grow.c
index ad535ad7f..aeaeb2c30 100644
--- a/src/battle/anim/grow.c
+++ b/src/battle/anim/grow.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 static void sub_80D0904(u8 taskId);
 
diff --git a/src/battle/anim/guard.c b/src/battle/anim/guard.c
index 779895831..9f9685003 100644
--- a/src/battle/anim/guard.c
+++ b/src/battle/anim/guard.c
@@ -4,8 +4,8 @@
 #include "rom_8077ABC.h"
 
 extern s16 gBattleAnimArgs[8];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 extern u16 gBattleTypeFlags;
 
 void sub_80D3014(struct Sprite *sprite);
@@ -44,17 +44,17 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7D74 =
 
 void sub_80D3014(struct Sprite *sprite)
 {
-    if ((gBattleTypeFlags & BATTLE_TYPE_DOUBLE) && IsAnimBankSpriteVisible(gAnimBankAttacker ^ 2))
+    if ((gBattleTypeFlags & BATTLE_TYPE_DOUBLE) && IsAnimBankSpriteVisible(gBattleAnimAttacker ^ 2))
     {
-        SetAverageBattlerPositions(gAnimBankAttacker, 0, &sprite->pos1.x, &sprite->pos1.y);
+        SetAverageBattlerPositions(gBattleAnimAttacker, 0, &sprite->pos1.x, &sprite->pos1.y);
         sprite->pos1.y += 40;
 
         StartSpriteAffineAnim(sprite, 1);
     }
     else
     {
-        sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 0);
-        sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 1) + 40;
+        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0);
+        sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1) + 40;
     }
 
     sprite->data[0] = 13;
diff --git a/src/battle/anim/guillotine.c b/src/battle/anim/guillotine.c
index cfad4837b..e2de9a0ec 100644
--- a/src/battle/anim/guillotine.c
+++ b/src/battle/anim/guillotine.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 void sub_80D0228(struct Sprite* sprite);
 static void sub_80D02D0(struct Sprite* sprite);
@@ -68,9 +68,9 @@ void sub_80D0228(struct Sprite* sprite)
     sprite->pos1.y += r4;
     sprite->data[0] = 6;
     sprite->data[1] = sprite->pos1.x;
-    sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2) + r9;
+    sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + r9;
     sprite->data[3] = sprite->pos1.y;
-    sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3) + r6;
+    sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + r6;
     InitAnimLinearTranslation(sprite);
     sprite->data[5] = gBattleAnimArgs[0];
     sprite->data[6] = sprite->data[0];
diff --git a/src/battle/anim/heal.c b/src/battle/anim/heal.c
index c44dd4ba4..0f35d7508 100644
--- a/src/battle/anim/heal.c
+++ b/src/battle/anim/heal.c
@@ -4,8 +4,8 @@
 #include "battle_anim.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 void sub_80CBAA4(struct Sprite* sprite);
 
diff --git a/src/battle/anim/heal_bell.c b/src/battle/anim/heal_bell.c
index 25b1ccc51..e191460ea 100644
--- a/src/battle/anim/heal_bell.c
+++ b/src/battle/anim/heal_bell.c
@@ -8,8 +8,8 @@
 #include "decompress.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 extern const u8 gBattleAnimSpritePalette_206[];
 
@@ -120,12 +120,12 @@ static void sub_80D1BA8(struct Sprite* sprite, u8 a, u8 b)
 void sub_80D1C08(struct Sprite* sprite)
 {
     InitAnimSpritePos(sprite, 0);
-    if (GetBattlerSide(gAnimBankAttacker) != 0)
+    if (GetBattlerSide(gBattleAnimAttacker) != 0)
         gBattleAnimArgs[2] = -gBattleAnimArgs[2];
 
     sprite->data[0] = gBattleAnimArgs[4];
-    sprite->data[2] = GetBattlerSpriteCoord(gAnimBankAttacker, 0) + gBattleAnimArgs[2];
-    sprite->data[4] = GetBattlerSpriteCoord(gAnimBankAttacker, 1) + gBattleAnimArgs[3];
+    sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimAttacker, 0) + gBattleAnimArgs[2];
+    sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimAttacker, 1) + gBattleAnimArgs[3];
     sprite->callback = StartAnimLinearTranslation;
     StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
     sub_80D1BA8(sprite, gBattleAnimArgs[5], gBattleAnimArgs[6]);
diff --git a/src/battle/anim/heart_1.c b/src/battle/anim/heart_1.c
index 523e0082d..f9e6b5080 100644
--- a/src/battle/anim/heart_1.c
+++ b/src/battle/anim/heart_1.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 void sub_80D1C80(struct Sprite* sprite);
 
diff --git a/src/battle/anim/hidden_power_orbit.c b/src/battle/anim/hidden_power_orbit.c
index 3d1cd74c0..63557c6e0 100644
--- a/src/battle/anim/hidden_power_orbit.c
+++ b/src/battle/anim/hidden_power_orbit.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 void AnimOrbitFast(struct Sprite* sprite);
 void AnimOrbitScatter(struct Sprite* sprite);
@@ -53,12 +53,12 @@ const struct SpriteTemplate gHiddenPowerOrbScatterSpriteTemplate =
 // arg 1: initial wave offset
 void AnimOrbitFast(struct Sprite* sprite)
 {
-    sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
-    sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
+    sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
+    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
     sprite->affineAnimPaused = 1;
     sprite->data[0] = gBattleAnimArgs[0];
     sprite->data[1] = gBattleAnimArgs[1];
-    sprite->data[7] = GetBattlerSubpriority(gAnimBankAttacker);
+    sprite->data[7] = GetBattlerSubpriority(gBattleAnimAttacker);
     sprite->callback = AnimOrbitFastStep;
     sprite->callback(sprite);
 }
@@ -104,8 +104,8 @@ static void AnimOrbitFastStep(struct Sprite* sprite)
 // arg 0: initial wave offset
 void AnimOrbitScatter(struct Sprite* sprite)
 {
-    sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
-    sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
+    sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
+    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
     sprite->data[0] = Sin(gBattleAnimArgs[0], 10);
     sprite->data[1] = Cos(gBattleAnimArgs[0], 7);
     sprite->callback = AnimOrbitScatterStep;
diff --git a/src/battle/anim/homing.c b/src/battle/anim/homing.c
index 4b2365542..874b9ea4e 100644
--- a/src/battle/anim/homing.c
+++ b/src/battle/anim/homing.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 void sub_80CC6CC(struct Sprite* sprite);
 static void sub_80CC7D4(struct Sprite* sprite);
@@ -41,13 +41,13 @@ void sub_80CC6CC(struct Sprite* sprite)
     {
         if (gBattleAnimArgs[0] == 0)
         {
-            a = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
-            b = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
+            a = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
+            b = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
         }
         else
         {
-            a = GetBattlerSpriteCoord(gAnimBankTarget, 2);
-            b = GetBattlerSpriteCoord(gAnimBankTarget, 3);
+            a = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
+            b = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
         }
 
         sprite->data[0] = gBattleAnimArgs[4];
diff --git a/src/battle/anim/hop.c b/src/battle/anim/hop.c
index dcf8ed702..4fb1a916c 100644
--- a/src/battle/anim/hop.c
+++ b/src/battle/anim/hop.c
@@ -4,8 +4,8 @@
 #include "battle_anim.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 void sub_80CB94C(struct Sprite* sprite);
 void sub_80CBA28(struct Sprite* sprite);
@@ -150,9 +150,9 @@ void sub_80CB94C(struct Sprite* sprite)
     s16 e1;
     s16 e2;
     InitAnimSpritePos(sprite, 0);
-    e1 = GetBattlerSpriteCoord(gAnimBankTarget, 0);
-    e2 = GetBattlerSpriteCoord(gAnimBankTarget, 1);
-    if ((gAnimBankAttacker ^ 2) == gAnimBankTarget)
+    e1 = GetBattlerSpriteCoord(gBattleAnimTarget, 0);
+    e2 = GetBattlerSpriteCoord(gBattleAnimTarget, 1);
+    if ((gBattleAnimAttacker ^ 2) == gBattleAnimTarget)
     {
         sprite->data[6] = e1;
         sprite->data[7] = e2 + 10;
@@ -193,8 +193,8 @@ void sub_80CB9C4(struct Sprite* sprite)
 
 void sub_80CBA28(struct Sprite* sprite)
 {
-    s16 e = GetBattlerSpriteCoord(gAnimBankTarget, 1);
-    if (GetBattlerSide(gAnimBankTarget) == 0)
+    s16 e = GetBattlerSpriteCoord(gBattleAnimTarget, 1);
+    if (GetBattlerSide(gBattleAnimTarget) == 0)
     {
         sprite->data[6] = 0;
         sprite->data[7] = e + 10;
diff --git a/src/battle/anim/hop_2.c b/src/battle/anim/hop_2.c
index 5ebefd626..83d67c94a 100644
--- a/src/battle/anim/hop_2.c
+++ b/src/battle/anim/hop_2.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 extern void sub_80CB7EC(struct Sprite* sprite, s16 c);
 extern bool8 sub_80CB814(struct Sprite* sprite);
@@ -36,9 +36,9 @@ void sub_80CBAE8(struct Sprite* sprite)
     s16 p1;
     s16 p2;
     sub_8078764(sprite, FALSE);
-    p1 = GetBattlerSpriteCoord(gAnimBankAttacker, 0);
-    p2 = GetBattlerSpriteCoord(gAnimBankAttacker, 1);
-    if ((gAnimBankTarget ^ 2) == gAnimBankAttacker)
+    p1 = GetBattlerSpriteCoord(gBattleAnimAttacker, 0);
+    p2 = GetBattlerSpriteCoord(gBattleAnimAttacker, 1);
+    if ((gBattleAnimTarget ^ 2) == gBattleAnimAttacker)
     {
         sprite->data[6] = p1;
         sprite->data[7] = p2 + 10;
diff --git a/src/battle/anim/ice.c b/src/battle/anim/ice.c
index 5ad79051f..b9f8f2f2c 100644
--- a/src/battle/anim/ice.c
+++ b/src/battle/anim/ice.c
@@ -11,8 +11,8 @@
 #include "random.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8  gAnimBankAttacker;
-extern u8  gAnimBankTarget;
+extern u8  gBattleAnimAttacker;
+extern u8  gBattleAnimTarget;
 extern u8  gAnimVisualTaskCount;
 extern u8  gBanksBySide[];
 extern u8  gBankSpriteIds[];
@@ -543,10 +543,10 @@ static void sub_80D7704(struct Sprite *sprite)
 
     //u8 battler1, battler2, battler3, battler4;
 
-    //battler1 = GetBattlerSpriteCoord(gAnimBankTarget, 2);
-    //battler2 = GetBattlerSpriteCoord(gAnimBankTarget, 3);
-    //battler3 = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
-    //battler4 = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
+    //battler1 = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
+    //battler2 = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
+    //battler3 = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
+    //battler4 = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
 
     //sprite->oam.tileNum += 7;
 
@@ -557,10 +557,10 @@ static void sub_80D7704(struct Sprite *sprite)
     //sprite->data[3] = battler4 + gBattleAnimArgs[1];
     //sprite->data[4] = battler2 + gBattleAnimArgs[3];
 
-    r9 = GetBattlerSpriteCoord(gAnimBankTarget, 2);
-    r8 = GetBattlerSpriteCoord(gAnimBankTarget, 3);
-    r3 = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
-    r6 = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
+    r9 = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
+    r8 = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
+    r3 = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
+    r6 = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
 
     sprite->data[0] = gBattleAnimArgs[4];
 
@@ -614,7 +614,7 @@ NAKED static void sub_80D7704(struct Sprite *sprite)
                 "\tands r0, r2\n"
                 "\torrs r0, r1\n"
                 "\tstrh r0, [r5, 0x4]\n"
-                "\tldr r4, _080D7814 @ =gAnimBankTarget\n"
+                "\tldr r4, _080D7814 @ =gBattleAnimTarget\n"
                 "\tldrb r0, [r4]\n"
                 "\tmovs r1, 0x2\n"
                 "\tbl GetBattlerSpriteCoord\n"
@@ -627,7 +627,7 @@ NAKED static void sub_80D7704(struct Sprite *sprite)
                 "\tlsls r0, 24\n"
                 "\tlsrs r0, 24\n"
                 "\tmov r8, r0\n"
-                "\tldr r4, _080D7818 @ =gAnimBankAttacker\n"
+                "\tldr r4, _080D7818 @ =gBattleAnimAttacker\n"
                 "\tldrb r0, [r4]\n"
                 "\tmovs r1, 0x2\n"
                 "\tbl GetBattlerSpriteCoord\n"
@@ -728,8 +728,8 @@ NAKED static void sub_80D7704(struct Sprite *sprite)
                 "\t.align 2, 0\n"
                 "_080D780C: .4byte 0x000003ff\n"
                 "_080D7810: .4byte 0xfffffc00\n"
-                "_080D7814: .4byte gAnimBankTarget\n"
-                "_080D7818: .4byte gAnimBankAttacker\n"
+                "_080D7814: .4byte gBattleAnimTarget\n"
+                "_080D7818: .4byte gBattleAnimAttacker\n"
                 "_080D781C: .4byte gBattleAnimArgs\n"
                 "_080D7820:\n"
                 "\tlsls r1, r3, 16\n"
@@ -829,14 +829,14 @@ static void AnimIcePunchSwirlingParticle(struct Sprite *sprite)
 static void AnimIceBeamParticle(struct Sprite *sprite)
 {
     InitAnimSpritePos(sprite, 1);
-    sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2);
+    sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
 
-    if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER)
+    if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
         sprite->data[2] -= gBattleAnimArgs[2];
     else
         sprite->data[2] += gBattleAnimArgs[2];
 
-    sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3) + gBattleAnimArgs[3];
+    sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + gBattleAnimArgs[3];
     sprite->data[0] = gBattleAnimArgs[4];
     StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
     sprite->callback = StartAnimLinearTranslation;
@@ -855,8 +855,8 @@ static void AnimIceEffectParticle(struct Sprite *sprite)
     }
     else
     {
-        SetAverageBattlerPositions(gAnimBankTarget, 1, &sprite->pos1.x, &sprite->pos1.y);
-        if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER)
+        SetAverageBattlerPositions(gBattleAnimTarget, 1, &sprite->pos1.x, &sprite->pos1.y);
+        if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
             gBattleAnimArgs[0] = -gBattleAnimArgs[0];
 
         sprite->pos1.x += gBattleAnimArgs[0];
@@ -895,15 +895,15 @@ static void AnimSwirlingSnowball_Step1(struct Sprite *sprite)
 
     if (!gBattleAnimArgs[5])
     {
-        sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2);
-        sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3) + gBattleAnimArgs[3];
+        sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
+        sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + gBattleAnimArgs[3];
     }
     else
     {
-        SetAverageBattlerPositions(gAnimBankTarget, 1, &sprite->data[2], &sprite->data[4]);
+        SetAverageBattlerPositions(gBattleAnimTarget, 1, &sprite->data[2], &sprite->data[4]);
     }
 
-    if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER)
+    if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
         sprite->data[2] -= gBattleAnimArgs[2];
     else
         sprite->data[2] += gBattleAnimArgs[2];
@@ -948,7 +948,7 @@ static void AnimSwirlingSnowball_Step2(struct Sprite *sprite)
     sprite->pos2.x = 0;
     sprite->data[0] = 128;
 
-    tempVar = GetBattlerSide(gAnimBankAttacker) != 0 ? 20 : 65516;
+    tempVar = GetBattlerSide(gBattleAnimAttacker) != 0 ? 20 : 65516;
 
     sprite->data[3] = Sin(sprite->data[0], tempVar);
     sprite->data[4] = Cos(sprite->data[0], 0xF);
@@ -960,7 +960,7 @@ static void AnimSwirlingSnowball_Step2(struct Sprite *sprite)
 static void AnimSwirlingSnowball_Step3(struct Sprite *sprite)
 {
     s16 tempVar;
-    tempVar = GetBattlerSide(gAnimBankAttacker) != 0 ? 20 : 65516;
+    tempVar = GetBattlerSide(gBattleAnimAttacker) != 0 ? 20 : 65516;
 
     if (sprite->data[5] <= 31)
     {
@@ -1015,15 +1015,15 @@ static void AnimMoveParticleBeyondTarget(struct Sprite *sprite)
 
     if (!gBattleAnimArgs[7])
     {
-        sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2);
-        sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3);
+        sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
+        sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
     }
     else
     {
-        SetAverageBattlerPositions(gAnimBankTarget, 1, &sprite->data[2], &sprite->data[4]);
+        SetAverageBattlerPositions(gBattleAnimTarget, 1, &sprite->data[2], &sprite->data[4]);
     }
 
-    if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER)
+    if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
         sprite->data[2] -= gBattleAnimArgs[2];
     else
         sprite->data[2] += gBattleAnimArgs[2];
@@ -1091,9 +1091,9 @@ static void AnimWaveFromCenterOfTarget(struct Sprite *sprite)
         }
         else
         {
-            SetAverageBattlerPositions(gAnimBankTarget, 0, &sprite->pos1.x, &sprite->pos1.y);
+            SetAverageBattlerPositions(gBattleAnimTarget, 0, &sprite->pos1.x, &sprite->pos1.y);
 
-            if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER)
+            if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
                 gBattleAnimArgs[0] = -gBattleAnimArgs[0];
 
             sprite->pos1.x += gBattleAnimArgs[0];
@@ -1129,8 +1129,8 @@ static void InitSwirlingFogAnim(struct Sprite *sprite)
         }
         else
         {
-            SetAverageBattlerPositions(gAnimBankAttacker, 0, &sprite->pos1.x, &sprite->pos1.y);
-            if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER) 
+            SetAverageBattlerPositions(gBattleAnimAttacker, 0, &sprite->pos1.x, &sprite->pos1.y);
+            if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) 
                 sprite->pos1.x -= gBattleAnimArgs[0];
             else 
                 sprite->pos1.x += gBattleAnimArgs[0];
@@ -1138,7 +1138,7 @@ static void InitSwirlingFogAnim(struct Sprite *sprite)
             sprite->pos1.y += gBattleAnimArgs[1];
         }
 
-        battler = gAnimBankAttacker;
+        battler = gBattleAnimAttacker;
     }
     else 
     {
@@ -1148,8 +1148,8 @@ static void InitSwirlingFogAnim(struct Sprite *sprite)
         }
         else 
         {
-            SetAverageBattlerPositions(gAnimBankTarget, 0, &sprite->pos1.x, &sprite->pos1.y);
-            if (GetBattlerSide(gAnimBankTarget) != B_SIDE_PLAYER)
+            SetAverageBattlerPositions(gBattleAnimTarget, 0, &sprite->pos1.x, &sprite->pos1.y);
+            if (GetBattlerSide(gBattleAnimTarget) != B_SIDE_PLAYER)
                 sprite->pos1.x -= gBattleAnimArgs[0];
             else 
                 sprite->pos1.x += gBattleAnimArgs[0];
@@ -1157,7 +1157,7 @@ static void InitSwirlingFogAnim(struct Sprite *sprite)
             sprite->pos1.y += gBattleAnimArgs[1];
         }
 
-        battler = gAnimBankTarget;
+        battler = gBattleAnimTarget;
     }
 
     sprite->data[7] = battler;
@@ -1167,7 +1167,7 @@ static void InitSwirlingFogAnim(struct Sprite *sprite)
         tempVar = 0x40;
 
     sprite->data[6] = tempVar;
-    if (GetBattlerSide(gAnimBankTarget) == B_SIDE_PLAYER)
+    if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER)
         sprite->pos1.y += 8;
 
     sprite->data[0] = gBattleAnimArgs[3];
@@ -1308,8 +1308,8 @@ static void AnimTask_Haze2(u8 taskId)
 // arg 5: ??? unknown (seems to vibrate target mon somehow)
 static void AnimThrowMistBall(struct Sprite *sprite)
 {
-    sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
-    sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
+    sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
+    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
     sprite->callback = TranslateAnimSpriteToTargetMonLocation;
 }
 
@@ -1416,37 +1416,37 @@ static void InitPoisonGasCloudAnim(struct Sprite *sprite)
 {
     sprite->data[0] = gBattleAnimArgs[0];
 
-    if (GetBattlerSpriteCoord(gAnimBankAttacker, 2) < GetBattlerSpriteCoord(gAnimBankTarget, 2))
+    if (GetBattlerSpriteCoord(gBattleAnimAttacker, 2) < GetBattlerSpriteCoord(gBattleAnimTarget, 2))
         sprite->data[7] = 0x8000;
 
-    if (!(gBanksBySide[gAnimBankTarget] & 1))
+    if (!(gBanksBySide[gBattleAnimTarget] & 1))
     {
         gBattleAnimArgs[1] = -gBattleAnimArgs[1];
         gBattleAnimArgs[3] = -gBattleAnimArgs[3];
 
-        if ((sprite->data[7] & 0x8000) && !(gBanksBySide[gAnimBankAttacker] & 1))
+        if ((sprite->data[7] & 0x8000) && !(gBanksBySide[gBattleAnimAttacker] & 1))
             sprite->subpriority = gSprites[GetAnimBattlerSpriteId(1)].subpriority + 1;
 
         sprite->data[6] = 1; 
     }
 
-    sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
-    sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
+    sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
+    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
     if (gBattleAnimArgs[7])
     {
         sprite->data[1] = sprite->pos1.x + gBattleAnimArgs[1];
-        sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2) + gBattleAnimArgs[3];
+        sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + gBattleAnimArgs[3];
         sprite->data[3] = sprite->pos1.y + gBattleAnimArgs[2];
-        sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3) + gBattleAnimArgs[4];
-        sprite->data[7] |= sub_8079ED4(gAnimBankTarget) << 8;
+        sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + gBattleAnimArgs[4];
+        sprite->data[7] |= sub_8079ED4(gBattleAnimTarget) << 8;
     }
     else
     {
         sprite->data[1] = sprite->pos1.x + gBattleAnimArgs[1];
-        sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 0) + gBattleAnimArgs[3];
+        sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 0) + gBattleAnimArgs[3];
         sprite->data[3] = sprite->pos1.y + gBattleAnimArgs[2];
-        sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 1) + gBattleAnimArgs[4];
-        sprite->data[7] |= sub_8079ED4(gAnimBankTarget) << 8;
+        sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 1) + gBattleAnimArgs[4];
+        sprite->data[7] |= sub_8079ED4(gBattleAnimTarget) << 8;
     } 
 
     if (IsContest())
@@ -1483,14 +1483,14 @@ static void sub_80D8874(struct Sprite *sprite)
         {
             value2 = 80;
             sprite->data[0] = value2;
-            sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 0);
+            sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 0);
             sprite->data[1] = sprite->pos1.x;
             sprite->data[2] = sprite->pos1.x;
             sprite->pos1.y += sprite->pos2.y;
             sprite->data[3] = sprite->pos1.y;
             sprite->data[4] = sprite->pos1.y + 29;
             sprite->data[7]++;
-            if (gMain.inBattle && gBanksBySide[gAnimBankTarget] & 1)
+            if (gMain.inBattle && gBanksBySide[gBattleAnimTarget] & 1)
                 sprite->data[5] = 204;
             else
                 sprite->data[5] = value2;
@@ -1535,7 +1535,7 @@ static void sub_80D8874(struct Sprite *sprite)
             sprite->data[1] = sprite->pos1.x += sprite->pos2.x;
             sprite->data[3] = sprite->pos1.y += sprite->pos2.y;
             sprite->data[4] = sprite->pos1.y + 4;
-            if (gMain.inBattle && gBanksBySide[gAnimBankTarget] & 1)
+            if (gMain.inBattle && gBanksBySide[gBattleAnimTarget] & 1)
                 sprite->data[2] = 0x100;
             else
                 sprite->data[2] = -0x10;
@@ -1619,7 +1619,7 @@ NAKED static void sub_80D8874(struct Sprite *sprite)
                 "_080D88D6:\n"
                 "\tmovs r5, 0x50\n"
                 "\tstrh r5, [r4, 0x2E]\n"
-                "\tldr r6, _080D8928 @ =gAnimBankTarget\n"
+                "\tldr r6, _080D8928 @ =gBattleAnimTarget\n"
                 "\tldrb r0, [r6]\n"
                 "\tmovs r1, 0\n"
                 "\tbl GetBattlerSpriteCoord\n"
@@ -1658,7 +1658,7 @@ NAKED static void sub_80D8874(struct Sprite *sprite)
                 "\tstrh r0, [r4, 0x38]\n"
                 "\tb _080D893A\n"
                 "\t.align 2, 0\n"
-                "_080D8928: .4byte gAnimBankTarget\n"
+                "_080D8928: .4byte gBattleAnimTarget\n"
                 "_080D892C: .4byte gMain\n"
                 "_080D8930: .4byte 0x0000043d\n"
                 "_080D8934: .4byte gBanksBySide\n"
@@ -1807,7 +1807,7 @@ NAKED static void sub_80D8874(struct Sprite *sprite)
                 "\tcmp r0, 0\n"
                 "\tbeq _080D8A78\n"
                 "\tldr r1, _080D8A70 @ =gBanksBySide\n"
-                "\tldr r0, _080D8A74 @ =gAnimBankTarget\n"
+                "\tldr r0, _080D8A74 @ =gBattleAnimTarget\n"
                 "\tldrb r0, [r0]\n"
                 "\tadds r0, r1\n"
                 "\tldrb r1, [r0]\n"
@@ -1822,7 +1822,7 @@ NAKED static void sub_80D8874(struct Sprite *sprite)
                 "_080D8A68: .4byte gMain\n"
                 "_080D8A6C: .4byte 0x0000043d\n"
                 "_080D8A70: .4byte gBanksBySide\n"
-                "_080D8A74: .4byte gAnimBankTarget\n"
+                "_080D8A74: .4byte gBattleAnimTarget\n"
                 "_080D8A78:\n"
                 "\tldr r0, _080D8A90 @ =0x0000fff0\n"
                 "_080D8A7A:\n"
@@ -2253,11 +2253,11 @@ static void InitIceBallAnim(struct Sprite *sprite)
 
     sprite->data[0] = gBattleAnimArgs[4];
 
-    if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER)
+    if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
         gBattleAnimArgs[2] = -gBattleAnimArgs[2];
 
-    sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2) + gBattleAnimArgs[2];
-    sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3) + gBattleAnimArgs[3];
+    sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + gBattleAnimArgs[2];
+    sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + gBattleAnimArgs[3];
     sprite->data[5] = gBattleAnimArgs[5];
 
     InitAnimArcTranslation(sprite);
diff --git a/src/battle/anim/kiss_fountain.c b/src/battle/anim/kiss_fountain.c
index 4fc340e63..ac7cbfb0f 100644
--- a/src/battle/anim/kiss_fountain.c
+++ b/src/battle/anim/kiss_fountain.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 void sub_80D1FDC(struct Sprite* sprite);
 
diff --git a/src/battle/anim/leaf.c b/src/battle/anim/leaf.c
index a60390dc5..5f7f9d288 100644
--- a/src/battle/anim/leaf.c
+++ b/src/battle/anim/leaf.c
@@ -5,8 +5,8 @@
 #include "trig.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 void sub_80CAED8(struct Sprite* sprite);
 void AnimMoveTwisterParticle(struct Sprite* sprite);
@@ -117,8 +117,8 @@ const struct SpriteTemplate gSwiftStarSpriteTemplate =
 
 void sub_80CAED8(struct Sprite* sprite)
 {
-    sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
-    sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
+    sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
+    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
     sprite->data[0] = gBattleAnimArgs[0];
     sprite->data[1] = gBattleAnimArgs[1];
     sprite->data[2] = gBattleAnimArgs[2];
@@ -153,7 +153,7 @@ static void sub_80CAF20(struct Sprite* sprite)
 
 static void sub_80CAF6C(struct Sprite* sprite)
 {
-    if (GetBattlerSide(gAnimBankAttacker))
+    if (GetBattlerSide(gBattleAnimAttacker))
     {
         sprite->pos2.x = -Sin(sprite->data[0], 0x19);
     }
@@ -188,7 +188,7 @@ static void sub_80CAF6C(struct Sprite* sprite)
 void AnimTranslateLinearSingleSineWave(struct Sprite* sprite)
 {
     InitAnimSpritePos(sprite, 1);
-    if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER)
+    if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
     {
         gBattleAnimArgs[2] = -gBattleAnimArgs[2];
     }
@@ -196,19 +196,19 @@ void AnimTranslateLinearSingleSineWave(struct Sprite* sprite)
     sprite->data[0] = gBattleAnimArgs[4];
     if (!gBattleAnimArgs[6])
     {
-        sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2) + gBattleAnimArgs[2];
-        sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3) + gBattleAnimArgs[3];
+        sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + gBattleAnimArgs[2];
+        sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + gBattleAnimArgs[3];
     }
     else
     {
-        SetAverageBattlerPositions(gAnimBankTarget, 1, &sprite->data[2], &sprite->data[4]);
+        SetAverageBattlerPositions(gBattleAnimTarget, 1, &sprite->data[2], &sprite->data[4]);
         sprite->data[2] += gBattleAnimArgs[2];
         sprite->data[4] += gBattleAnimArgs[3];
     }
 
     sprite->data[5] = gBattleAnimArgs[5];
     InitAnimArcTranslation(sprite);
-    if (GetBattlerSide(gAnimBankAttacker) == GetBattlerSide(gAnimBankTarget))
+    if (GetBattlerSide(gBattleAnimAttacker) == GetBattlerSide(gBattleAnimTarget))
     {
         sprite->data[0] = 1;
     }
@@ -262,7 +262,7 @@ void AnimMoveTwisterParticle(struct Sprite* sprite)
 {
     if (!IsContest() && IsDoubleBattle() == TRUE)
     {
-        SetAverageBattlerPositions(gAnimBankTarget, 1, &sprite->pos1.x, &sprite->pos1.y);
+        SetAverageBattlerPositions(gBattleAnimTarget, 1, &sprite->pos1.x, &sprite->pos1.y);
     }
 
     sprite->pos1.y += 32;
@@ -295,11 +295,11 @@ static void AnimMoveTwisterParticleStep(struct Sprite* sprite)
     sprite->pos2.y = Sin(sprite->data[5], 5);
     if (sprite->data[5] <= 0x7F)
     {
-        sprite->oam.priority = sub_8079ED4(gAnimBankTarget) - 1;
+        sprite->oam.priority = sub_8079ED4(gBattleAnimTarget) - 1;
     }
     else
     {
-        sprite->oam.priority = sub_8079ED4(gAnimBankTarget) + 1;
+        sprite->oam.priority = sub_8079ED4(gBattleAnimTarget) + 1;
     }
 
     sprite->data[0]--;
diff --git a/src/battle/anim/love_bg.c b/src/battle/anim/love_bg.c
index 72d9325f2..0400fd9c4 100644
--- a/src/battle/anim/love_bg.c
+++ b/src/battle/anim/love_bg.c
@@ -7,8 +7,8 @@
 #include "palette.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 extern const u8 gAttractTilemap[];
 extern const u8 gAttractGfx[];
diff --git a/src/battle/anim/lunge.c b/src/battle/anim/lunge.c
index 13cabb422..ce6aa58f4 100644
--- a/src/battle/anim/lunge.c
+++ b/src/battle/anim/lunge.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 extern u8 gBankSpriteIds[];
 
@@ -71,9 +71,9 @@ void sub_80CD774(struct Sprite* sprite)
 static void sub_80CD7CC(struct Sprite* sprite)
 {
     sprite->data[0] = 6;
-    sprite->data[1] = (GetBattlerSide(gAnimBankAttacker)) ? 2 : -2;
+    sprite->data[1] = (GetBattlerSide(gBattleAnimAttacker)) ? 2 : -2;
     sprite->data[2] = 0;
-    sprite->data[3] = gBankSpriteIds[gAnimBankAttacker];
+    sprite->data[3] = gBankSpriteIds[gBattleAnimAttacker];
     StoreSpriteCallbackInData(sprite, sub_80CD81C);
     sprite->callback = TranslateMonBGUntil;
 }
@@ -82,9 +82,9 @@ static void sub_80CD81C(struct Sprite* sprite)
 {
     if (sprite->data[0] == 0)
     {
-        sprite->data[3] = gBankSpriteIds[gAnimBankAttacker];
+        sprite->data[3] = gBankSpriteIds[gBattleAnimAttacker];
         sub_8078E70(sprite->data[3], 0);
-        sprite->data[4] = (sprite->data[6] = GetBattlerSide(gAnimBankAttacker)) ? 0x300 : 0xFFFFFD00;
+        sprite->data[4] = (sprite->data[6] = GetBattlerSide(gBattleAnimAttacker)) ? 0x300 : 0xFFFFFD00;
         sprite->data[5] = 0;
     }
 
@@ -101,9 +101,9 @@ static void sub_80CD81C(struct Sprite* sprite)
 static void sub_80CD8A8(struct Sprite* sprite)
 {
     sprite->data[0] = 4;
-    sprite->data[1] = (GetBattlerSide(gAnimBankAttacker)) ? -3 : 3;
+    sprite->data[1] = (GetBattlerSide(gBattleAnimAttacker)) ? -3 : 3;
     sprite->data[2] = 0;
-    sprite->data[3] = gBankSpriteIds[gAnimBankAttacker];
+    sprite->data[3] = gBankSpriteIds[gBattleAnimAttacker];
     StoreSpriteCallbackInData(sprite, sub_80CD9B8);
     sprite->callback = TranslateMonBGUntil;
 }
@@ -121,9 +121,9 @@ static void sub_80CD91C(struct Sprite* sprite)
 {
     if (sprite->data[0] == 0)
     {
-        sprite->data[3] = gBankSpriteIds[gAnimBankAttacker];
-        sprite->data[6] = GetBattlerSide(gAnimBankAttacker);
-        if (GetBattlerSide(gAnimBankAttacker))
+        sprite->data[3] = gBankSpriteIds[gBattleAnimAttacker];
+        sprite->data[6] = GetBattlerSide(gBattleAnimAttacker);
+        if (GetBattlerSide(gBattleAnimAttacker))
         {
             sprite->data[4] = 0xFC00;
             sprite->data[5] = 0xC00;
@@ -162,8 +162,8 @@ static void sub_80CD9D4(struct Sprite* sprite)
     {
     case 0:
         sprite->data[1] = 0;
-        sprite->data[2] = gBankSpriteIds[gAnimBankAttacker];
-        sprite->data[3] = GetBattlerSide(gAnimBankAttacker);
+        sprite->data[2] = gBankSpriteIds[gBattleAnimAttacker];
+        sprite->data[3] = GetBattlerSide(gBattleAnimAttacker);
         sprite->data[4] = (sprite->data[3] != 0) ? 0x200 : -0x200;
         sprite->data[5] = 0;
         sub_8078E70(sprite->data[2], 0);
@@ -196,8 +196,8 @@ void sub_80CDAC8(u8 taskId)
 {
     u8 a;
 
-    gTasks[taskId].data[0] = gBankSpriteIds[gAnimBankAttacker];
-    a = GetBattlerSide(gAnimBankAttacker);
+    gTasks[taskId].data[0] = gBankSpriteIds[gBattleAnimAttacker];
+    a = GetBattlerSide(gBattleAnimAttacker);
     gTasks[taskId].data[1] = a;
     gTasks[taskId].data[2] = 0;
     switch (gBattleAnimArgs[0])
diff --git a/src/battle/anim/money.c b/src/battle/anim/money.c
index e23b38012..03af2f8e1 100644
--- a/src/battle/anim/money.c
+++ b/src/battle/anim/money.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 void sub_80CFE9C(struct Sprite* sprite);
 void sub_80CFF50(struct Sprite* sprite);
@@ -66,9 +66,9 @@ void sub_80CFE9C(struct Sprite* sprite)
     u16 var;
 
     InitAnimSpritePos(sprite, 1);
-    r6 = GetBattlerSpriteCoord(gAnimBankTarget, 2);
-    r7 = GetBattlerSpriteCoord(gAnimBankTarget, 3) + gBattleAnimArgs[3];
-    if (GetBattlerSide(gAnimBankAttacker) != 0)
+    r6 = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
+    r7 = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + gBattleAnimArgs[3];
+    if (GetBattlerSide(gBattleAnimAttacker) != 0)
         gBattleAnimArgs[2] = -gBattleAnimArgs[2];
 
     r6 += gBattleAnimArgs[2];
@@ -93,7 +93,7 @@ static void sub_80CFF68(struct Sprite* sprite)
 {
     sprite->data[0] += 0x80;
     sprite->pos2.x = sprite->data[0] >> 8;
-    if (GetBattlerSide(gAnimBankAttacker) == 0)
+    if (GetBattlerSide(gBattleAnimAttacker) == 0)
         sprite->pos2.x = -sprite->pos2.x;
 
     sprite->pos2.y = Sin(sprite->data[1], sprite->data[2]);
diff --git a/src/battle/anim/moon.c b/src/battle/anim/moon.c
index fe2e7a849..30639a0e5 100644
--- a/src/battle/anim/moon.c
+++ b/src/battle/anim/moon.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 void sub_80CE30C(struct Sprite* sprite);
 static void sub_80CE354(struct Sprite* sprite);
diff --git a/src/battle/anim/musical.c b/src/battle/anim/musical.c
index c0269a379..5e4e3e97b 100644
--- a/src/battle/anim/musical.c
+++ b/src/battle/anim/musical.c
@@ -6,8 +6,8 @@
 #include "palette.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 void sub_80CEB0C(struct Sprite* sprite);
 void sub_80CECE8(struct Sprite* sprite);
@@ -221,8 +221,8 @@ void sub_80CEB0C(struct Sprite* sprite)
     }
     else
     {
-        a = GetBattlerSpriteCoord(gAnimBankTarget, 2);
-        b = GetBattlerSpriteCoord(gAnimBankTarget, 3);
+        a = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
+        b = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
     }
 
     sprite->data[4] = sprite->pos1.x << 4;
@@ -288,14 +288,14 @@ static void sub_80CEC1C(struct Sprite* sprite)
 void sub_80CECE8(struct Sprite* sprite)
 {
     int a; 
-    if (GetBattlerSide(gAnimBankAttacker) == 1)
+    if (GetBattlerSide(gBattleAnimAttacker) == 1)
     {
         a = gBattleAnimArgs[1]; 
         (u16)gBattleAnimArgs[1] = -a;
     }
 
-    sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2) + gBattleAnimArgs[1];
-    sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3) + gBattleAnimArgs[2];
+    sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) + gBattleAnimArgs[1];
+    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) + gBattleAnimArgs[2];
     StartSpriteAnim(sprite, gBattleAnimArgs[0]);
     sprite->data[2] = 0;
     sprite->data[3] = 0;
@@ -341,8 +341,8 @@ void sub_80CEDF0(struct Sprite* sprite)
         a = -16;
     }
 
-    sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2) + a;
-    sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3) + 8;
+    sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) + a;
+    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) + 8;
     sprite->data[0] = 8;
     sprite->callback = WaitAnimForDuration;
     StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
diff --git a/src/battle/anim/noise.c b/src/battle/anim/noise.c
index f4ea10bf9..65d962ace 100644
--- a/src/battle/anim/noise.c
+++ b/src/battle/anim/noise.c
@@ -3,8 +3,8 @@
 #include "battle_anim.h"
 
 extern s16 gBattleAnimArgs[8];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 void sub_80D2D68(struct Sprite* sprite);
 static void sub_80D2E30(struct Sprite *);
@@ -26,7 +26,7 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7CC8 =
 void sub_80D2D68(struct Sprite* sprite)
 {
     int var1;
-    u8 slot = gBattleAnimArgs[0] == 0 ? gAnimBankAttacker : gAnimBankTarget;
+    u8 slot = gBattleAnimArgs[0] == 0 ? gBattleAnimAttacker : gBattleAnimTarget;
 
     if (GetBattlerSide(slot) == 1)
     {
diff --git a/src/battle/anim/normal.c b/src/battle/anim/normal.c
index 9f0007e97..3d4901448 100644
--- a/src/battle/anim/normal.c
+++ b/src/battle/anim/normal.c
@@ -14,8 +14,8 @@
 #include "constants/songs.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 extern u8 gHealthboxIDs[];
 extern u8 gBattlersCount;
 extern u8 gBankSpriteIds[];
@@ -313,7 +313,7 @@ static void AnimConfusionDuck(struct Sprite *sprite)
     sprite->pos1.x += gBattleAnimArgs[0];
     sprite->pos1.y += gBattleAnimArgs[1];
     sprite->data[0] = gBattleAnimArgs[2];
-    if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER)
+    if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
     {
         sprite->data[1] = -gBattleAnimArgs[3];
         sprite->data[4] = 1;
@@ -362,10 +362,10 @@ static void AnimSimplePaletteBlend(struct Sprite *sprite)
 // Unpacks a bitfield and returns a bitmask of its selected palettes.
 // Bits 0-6 of the selector parameter result in the following palettes being selected:
 //   0: battle background palettes (BG palettes 1, 2, and 3)
-//   1: gAnimBankAttacker OBJ palette
-//   2: gAnimBankTarget OBJ palette
-//   3: gAnimBankAttacker partner OBJ palette
-//   4: gAnimBankTarget partner OBJ palette
+//   1: gBattleAnimAttacker OBJ palette
+//   2: gBattleAnimTarget OBJ palette
+//   3: gBattleAnimAttacker partner OBJ palette
+//   4: gBattleAnimTarget partner OBJ palette
 //   5: BG palette 4
 //   6: BG palette 5
 static u32 UnpackSelectedBattleAnimPalettes(s16 selector)
@@ -659,8 +659,8 @@ static void sub_80E22CC(u8 taskId)
 void sub_80E2324(u8 taskId)
 {
     u32 selectedPalettes = 0;
-    u8 attackerBattler = gAnimBankAttacker;
-    u8 targetBattler = gAnimBankTarget;
+    u8 attackerBattler = gBattleAnimAttacker;
+    u8 targetBattler = gBattleAnimTarget;
 
     if (gBattleAnimArgs[0] & 0x100)
         selectedPalettes = sub_80791A8(1, 0, 0, 0, 0, 0, 0);
@@ -694,8 +694,8 @@ void unref_sub_80E23A8(u8 taskId)
     }
 
     gTasks[taskId].data[0]++;
-    attackerBattler = gAnimBankAttacker;
-    targetBattler = gAnimBankTarget;
+    attackerBattler = gBattleAnimAttacker;
+    targetBattler = gBattleAnimTarget;
 
     if (gTasks[taskId].data[2] & 0x100)
         selectedPalettes = 0x0000FFFF;
@@ -790,20 +790,20 @@ static void sub_80E255C(struct Sprite *sprite)
 
 static void sub_80E260C(void)
 {
-    gSprites[gBankSpriteIds[gAnimBankAttacker]].coordOffsetEnabled = 0;
-    gSprites[gBankSpriteIds[gAnimBankTarget]].coordOffsetEnabled = 0;
+    gSprites[gBankSpriteIds[gBattleAnimAttacker]].coordOffsetEnabled = 0;
+    gSprites[gBankSpriteIds[gBattleAnimTarget]].coordOffsetEnabled = 0;
 
     if (gBattleAnimArgs[4] == 2)
     {
-        gSprites[gBankSpriteIds[gAnimBankAttacker]].coordOffsetEnabled = 1;
-        gSprites[gBankSpriteIds[gAnimBankTarget]].coordOffsetEnabled = 1;
+        gSprites[gBankSpriteIds[gBattleAnimAttacker]].coordOffsetEnabled = 1;
+        gSprites[gBankSpriteIds[gBattleAnimTarget]].coordOffsetEnabled = 1;
     }
     else
     {
         if (gBattleAnimArgs[4] == 0)
-            gSprites[gBankSpriteIds[gAnimBankAttacker]].coordOffsetEnabled = 1;
+            gSprites[gBankSpriteIds[gBattleAnimAttacker]].coordOffsetEnabled = 1;
         else
-            gSprites[gBankSpriteIds[gAnimBankTarget]].coordOffsetEnabled = 1;
+            gSprites[gBankSpriteIds[gBattleAnimTarget]].coordOffsetEnabled = 1;
     }
 }
 
@@ -875,7 +875,7 @@ static void sub_80E27E8(struct Sprite *sprite)
 
 static void sub_80E2838(struct Sprite *sprite)
 {
-    if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER && !IsContest())
+    if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER && !IsContest())
         gBattleAnimArgs[1] = -gBattleAnimArgs[1];
     
     sub_80E27A0(sprite);
@@ -967,28 +967,28 @@ void sub_80E2A7C(u8 taskId)
         selectedPalettes = 0;
         // fall through
     case 0:
-        sp[0] = gAnimBankAttacker;
+        sp[0] = gBattleAnimAttacker;
         break;
     case 3:
         selectedPalettes = 0;
         // fall through
     case 1:
-        sp[0] = gAnimBankTarget;
+        sp[0] = gBattleAnimTarget;
         break;
     case 4:
-        sp[0] = gAnimBankAttacker;
-        sp[1] = gAnimBankTarget;
+        sp[0] = gBattleAnimAttacker;
+        sp[1] = gBattleAnimTarget;
         break;
     case 5:
         sp[0] = 0xFF;
         break;
     case 6:
         selectedPalettes = 0;
-        sp[0] = gAnimBankAttacker ^ 2;
+        sp[0] = gBattleAnimAttacker ^ 2;
         break;
     case 7:
         selectedPalettes = 0;
-        sp[0] = gAnimBankTarget ^ 2;
+        sp[0] = gBattleAnimTarget ^ 2;
         break;
     }
 
@@ -1201,12 +1201,12 @@ void sub_80E2F2C(u8 taskId)
 
     if (IsDoubleBattle() && !IsContest())
     {
-        if (GetBattlerPosition(gAnimBankAttacker) == B_POSITION_OPPONENT_RIGHT
-         || GetBattlerPosition(gAnimBankAttacker) == B_POSITION_PLAYER_LEFT)
+        if (GetBattlerPosition(gBattleAnimAttacker) == B_POSITION_OPPONENT_RIGHT
+         || GetBattlerPosition(gBattleAnimAttacker) == B_POSITION_PLAYER_LEFT)
         {
-            if (IsAnimBankSpriteVisible(gAnimBankAttacker ^ 2) == TRUE)
+            if (IsAnimBankSpriteVisible(gBattleAnimAttacker ^ 2) == TRUE)
             {
-                gSprites[gBankSpriteIds[gAnimBankAttacker ^ 2]].oam.priority -= 1;
+                gSprites[gBankSpriteIds[gBattleAnimAttacker ^ 2]].oam.priority -= 1;
                 REG_BG1CNT_BITFIELD.priority = 1;
                 var0 = 1;
             }
@@ -1219,14 +1219,14 @@ void sub_80E2F2C(u8 taskId)
     }
     else
     {
-        if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER)
-            species = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gAnimBankAttacker]], MON_DATA_SPECIES);
+        if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
+            species = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattleAnimAttacker]], MON_DATA_SPECIES);
         else
-            species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gAnimBankAttacker]], MON_DATA_SPECIES);
+            species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gBattleAnimAttacker]], MON_DATA_SPECIES);
     }
 
     spriteId = GetAnimBattlerSpriteId(0);
-    newSpriteId = sub_807A4A0(gAnimBankAttacker, spriteId, species);
+    newSpriteId = sub_807A4A0(gBattleAnimAttacker, spriteId, species);
     sub_8078914(&subStruct);
     DmaFill32Defvars(3, 0, subStruct.field_4, 0x1000);
     LZDecompressVram(&gUnknown_08D20A30, subStruct.field_4);
@@ -1275,7 +1275,7 @@ static void sub_80E3194(u8 taskId)
             sub_8078914(&subStruct);
             DmaFill32Defvars(3, 0, subStruct.field_4, 0x800);
             if (gTasks[taskId].data[6] == 1)
-                gSprites[gBankSpriteIds[gAnimBankAttacker ^ 2]].oam.priority++;
+                gSprites[gBankSpriteIds[gBattleAnimAttacker ^ 2]].oam.priority++;
 
             REG_BG1CNT_BITFIELD.areaOverflowMode = 0;
             do {} while(0); // needed to match. perhaps part of a debug macro
@@ -1315,9 +1315,9 @@ static void sub_80E3338(u8 taskId)
     }
 
     if (taskData[2] == 0)
-        battler1 = gAnimBankAttacker;
+        battler1 = gBattleAnimAttacker;
     else
-        battler1 = gAnimBankTarget;
+        battler1 = gBattleAnimTarget;
 
     battler2 = battler1 ^ 2;
     if (IsContest() || (taskData[3] && !IsAnimBankSpriteVisible(battler2)))
@@ -1576,7 +1576,7 @@ void sub_80E3A08(u8 taskId)
 
     for (i = 0; i < 4; i++)
     {
-        if (gAnimBankAttacker != i)
+        if (gBattleAnimAttacker != i)
             selectedPalettes |= 1 << (i + 16);
     }
 
@@ -1592,7 +1592,7 @@ void sub_80E3A58(u8 taskId)
 
     sub_80789D4(0);
     newTaskId = CreateTask(sub_80E3AD0, 5);
-    if (gBattleAnimArgs[2] && GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER)
+    if (gBattleAnimArgs[2] && GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
     {
         gBattleAnimArgs[0] = -gBattleAnimArgs[0];
         gBattleAnimArgs[1] = -gBattleAnimArgs[1];
@@ -1625,19 +1625,19 @@ static void sub_80E3AD0(u8 taskId)
 
 void sub_80E3B4C(u8 taskId)
 {
-    gBattleAnimArgs[7] = GetBattlerSide(gAnimBankAttacker);
+    gBattleAnimArgs[7] = GetBattlerSide(gBattleAnimAttacker);
     DestroyAnimVisualTask(taskId);
 }
 
 void sub_80E3B78(u8 taskId)
 {
-    gBattleAnimArgs[7] = GetBattlerSide(gAnimBankTarget);
+    gBattleAnimArgs[7] = GetBattlerSide(gBattleAnimTarget);
     DestroyAnimVisualTask(taskId);
 }
 
 void sub_80E3BA4(u8 taskId)
 {
-    gBattleAnimArgs[7] = (gAnimBankAttacker ^ 2) == gAnimBankTarget;
+    gBattleAnimArgs[7] = (gBattleAnimAttacker ^ 2) == gBattleAnimTarget;
     DestroyAnimVisualTask(taskId);
 }
 
@@ -1647,7 +1647,7 @@ void sub_80E3BDC(u8 taskId)
 
     for (i = 0; i < 4; i++)
     {
-        if (i != gAnimBankAttacker && IsAnimBankSpriteVisible(i))
+        if (i != gBattleAnimAttacker && IsAnimBankSpriteVisible(i))
             gSprites[gBankSpriteIds[i]].invisible = gBattleAnimArgs[0];
     }
 
@@ -1796,11 +1796,11 @@ void sub_80E4028(u8 taskId)
     }
     else if (gBattleAnimArgs[0] == 1)
     {
-        i = gAnimBankAttacker + 16;
+        i = gBattleAnimAttacker + 16;
     }
     else if (gBattleAnimArgs[0] == 2)
     {
-        i = gAnimBankTarget + 16;
+        i = gBattleAnimTarget + 16;
     }
 
     offset = gBattleAnimArgs[1] * 32;
@@ -1830,11 +1830,11 @@ void sub_80E40D0(u8 taskId)
     }
     else if (gBattleAnimArgs[0] == 1)
     {
-        i = gAnimBankAttacker + 16;
+        i = gBattleAnimAttacker + 16;
     }
     else if (gBattleAnimArgs[0] == 2)
     {
-        i = gAnimBankTarget + 16;
+        i = gBattleAnimTarget + 16;
     }
 
     dest = &((u8 *)gPlttBufferUnfaded)[i * 32];
@@ -1861,11 +1861,11 @@ void sub_80E4178(u8 taskId)
     }
     else if (gBattleAnimArgs[0] == 1)
     {
-        i = gAnimBankAttacker + 16;
+        i = gBattleAnimAttacker + 16;
     }
     else if (gBattleAnimArgs[0] == 2)
     {
-        i = gAnimBankTarget + 16;
+        i = gBattleAnimTarget + 16;
     }
 
     memcpy(&gPlttBufferUnfaded[i * 16], &gPlttBufferFaded[i * 16], 32);
@@ -1884,14 +1884,14 @@ void sub_80E4200(u8 taskId)
 
 void sub_80E4234(u8 taskId)
 {
-    gAnimBankAttacker = gBankTarget;
-    gAnimBankTarget = gEffectBank;
+    gBattleAnimAttacker = gBankTarget;
+    gBattleAnimTarget = gEffectBank;
     DestroyAnimVisualTask(taskId);
 }
 
 void sub_80E4264(u8 taskId)
 {
-    if (GetBattlerSide(gAnimBankAttacker) == GetBattlerSide(gAnimBankTarget))
+    if (GetBattlerSide(gBattleAnimAttacker) == GetBattlerSide(gBattleAnimTarget))
         gBattleAnimArgs[7] = 1;
     else
         gBattleAnimArgs[7] = 0;
@@ -1901,14 +1901,14 @@ void sub_80E4264(u8 taskId)
 
 void sub_80E42B0(u8 taskId)
 {
-    gAnimBankTarget = gBankTarget;
+    gBattleAnimTarget = gBankTarget;
     DestroyAnimVisualTask(taskId);
 }
 
 void sub_80E42D0(u8 taskId)
 {
-    gAnimBankAttacker = gBankAttacker;
-    gAnimBankTarget = gEffectBank;
+    gBattleAnimAttacker = gBankAttacker;
+    gBattleAnimTarget = gEffectBank;
     DestroyAnimVisualTask(taskId);
 }
 
@@ -1920,8 +1920,8 @@ void sub_80E4300(u8 taskId)
     }
     else
     {
-        gTasks[taskId].data[0] = ewram17800[gAnimBankAttacker].invisible;
-        ewram17800[gAnimBankAttacker].invisible = 1;
+        gTasks[taskId].data[0] = ewram17800[gBattleAnimAttacker].invisible;
+        ewram17800[gBattleAnimAttacker].invisible = 1;
         gTasks[taskId].func = sub_80E4368;
         gAnimVisualTaskCount--;
     }
@@ -1931,7 +1931,7 @@ static void sub_80E4368(u8 taskId)
 {
     if (gBattleAnimArgs[7] == 0x1000)
     {
-        ewram17800[gAnimBankAttacker].invisible = gTasks[taskId].data[0] & 1;
+        ewram17800[gBattleAnimAttacker].invisible = gTasks[taskId].data[0] & 1;
         DestroyTask(taskId);
     }
 }
diff --git a/src/battle/anim/note_rain.c b/src/battle/anim/note_rain.c
index 26ae96c3a..f849655f8 100644
--- a/src/battle/anim/note_rain.c
+++ b/src/battle/anim/note_rain.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 // note_rain (notes rain from a source point, usually a bell.)
 // Used in Heal Bell.
diff --git a/src/battle/anim/note_spin.c b/src/battle/anim/note_spin.c
index 899357310..165820cc1 100644
--- a/src/battle/anim/note_spin.c
+++ b/src/battle/anim/note_spin.c
@@ -4,8 +4,8 @@
 #include "trig.h"
 
 extern s16 gBattleAnimArgs[8];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 extern const union AnimCmd *const gSpriteAnimTable_83D70D8[];
 
diff --git a/src/battle/anim/orbit.c b/src/battle/anim/orbit.c
index d59adde08..4d937a114 100644
--- a/src/battle/anim/orbit.c
+++ b/src/battle/anim/orbit.c
@@ -4,8 +4,8 @@
 #include "battle_anim.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 void sub_80CABF8(struct Sprite* sprite);
 void sub_80CAD54(struct Sprite* sprite);
@@ -110,11 +110,11 @@ static void sub_80CAC44(struct Sprite* sprite)
     sprite->pos2.y = Cos(sprite->data[1], -3) + ((sprite->data[2] += 24) >> 8);
     if ((u16)(sprite->data[1] - 0x40) < 0x80)
     {
-        sprite->oam.priority = (sub_8079ED4(gAnimBankTarget) & 3);
+        sprite->oam.priority = (sub_8079ED4(gBattleAnimTarget) & 3);
     }
     else
     {
-        var1 = sub_8079ED4(gAnimBankTarget) + 1;
+        var1 = sub_8079ED4(gBattleAnimTarget) + 1;
         if (var1 > 3)
         {
             var1 = 3;
@@ -137,7 +137,7 @@ void sub_80CACEC(u8 taskId)
     }
     else
     {
-        if (GetBattlerPosition_permutated(gAnimBankTarget) == 1)
+        if (GetBattlerPosition_permutated(gBattleAnimTarget) == 1)
         {
             REG_BG2CNT_BITFIELD.priority = 3;
         }
@@ -157,7 +157,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] = GetBattlerSpriteCoord(gAnimBankAttacker, 3) + gBattleAnimArgs[2];
+    sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) + gBattleAnimArgs[2];
     InitAnimLinearTranslation(sprite);
     sprite->data[5] = 0x40;
     sprite->callback = sub_80CADA8;
@@ -172,11 +172,11 @@ static void sub_80CADA8(struct Sprite* sprite)
         sprite->pos2.y += Cos(sprite->data[5], -5);
         if ((u16)(sprite->data[5] - 0x40) < 0x80)
         {
-            sprite->subpriority = GetBattlerSubpriority(gAnimBankAttacker) - 1;
+            sprite->subpriority = GetBattlerSubpriority(gBattleAnimAttacker) - 1;
         }
         else
         {
-            sprite->subpriority = GetBattlerSubpriority(gAnimBankAttacker) + 1;
+            sprite->subpriority = GetBattlerSubpriority(gBattleAnimAttacker) + 1;
         }
 
         sprite->data[5] = (sprite->data[5] + 5) & 0xFF;
@@ -194,7 +194,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] = GetBattlerSpriteCoord(gAnimBankAttacker, 3) + gBattleAnimArgs[2];
+    sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) + gBattleAnimArgs[2];
     InitAnimLinearTranslation(sprite);
     sprite->data[5] = 0x40;
     sprite->callback = sub_80CAE74;
diff --git a/src/battle/anim/orbs.c b/src/battle/anim/orbs.c
index 3301990ec..80cf97a5c 100644
--- a/src/battle/anim/orbs.c
+++ b/src/battle/anim/orbs.c
@@ -5,8 +5,8 @@
 #include "random.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 void sub_80CA7B0(struct Sprite* sprite);
 void sub_80CA800(struct Sprite* sprite);
@@ -194,8 +194,8 @@ void sub_80CA7B0(struct Sprite* sprite)
 {
     InitAnimSpritePos(sprite, 1);
     sprite->data[0] = gBattleAnimArgs[2];
-    sprite->data[2] = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
-    sprite->data[4] = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
+    sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
+    sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
     sprite->callback = StartAnimLinearTranslation;
     StoreSpriteCallbackInData(sprite, move_anim_8074EE0);
 }
@@ -205,8 +205,8 @@ void sub_80CA800(struct Sprite* sprite)
     InitAnimSpritePos(sprite, 1);
     StartSpriteAnim(sprite, gBattleAnimArgs[3]);
     sprite->data[0] = gBattleAnimArgs[2];
-    sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2);
-    sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3);
+    sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
+    sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
     sprite->callback = StartAnimLinearTranslation;
     StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
 }
@@ -216,9 +216,9 @@ void sub_80CA858(struct Sprite* sprite)
     InitAnimSpritePos(sprite, 1);
     sprite->data[0] = gBattleAnimArgs[2];
     sprite->data[1] = sprite->pos1.x;
-    sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2);
+    sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
     sprite->data[3] = sprite->pos1.y;
-    sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3);
+    sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
     InitAnimLinearTranslation(sprite);
     sprite->data[5] = gBattleAnimArgs[3];
     sprite->callback = sub_80CA8B4;
@@ -235,11 +235,11 @@ static void sub_80CA8B4(struct Sprite* sprite)
     {
         if (sprite->data[5] > 0x7F)
         {
-            sprite->subpriority = GetBattlerSubpriority(gAnimBankTarget) + 1;
+            sprite->subpriority = GetBattlerSubpriority(gBattleAnimTarget) + 1;
         }
         else
         {
-            sprite->subpriority = GetBattlerSubpriority(gAnimBankTarget) + 6;
+            sprite->subpriority = GetBattlerSubpriority(gBattleAnimTarget) + 6;
         }
         sprite->pos2.x += Sin(sprite->data[5], 5);
         sprite->pos2.y += Cos(sprite->data[5], 14);
@@ -258,7 +258,7 @@ void sub_80CA928(u8 taskId)
         gBattleAnimArgs[1] = 0;
         gBattleAnimArgs[2] = 80;
         gBattleAnimArgs[3] = 0;
-        CreateSpriteAndAnimate(&gSpriteTemplate_83D631C, 0, 0, GetBattlerSubpriority(gAnimBankTarget) + 1);
+        CreateSpriteAndAnimate(&gSpriteTemplate_83D631C, 0, 0, GetBattlerSubpriority(gBattleAnimTarget) + 1);
     }
 
     if (gTasks[taskId].data[1] == 15)
@@ -269,8 +269,8 @@ void sub_80CA9A8(struct Sprite* sprite)
 {
     sub_8078764(sprite, TRUE);
     sprite->data[0] = gBattleAnimArgs[3];
-    sprite->data[2] = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
-    sprite->data[4] = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
+    sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
+    sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
     sprite->data[5] = gBattleAnimArgs[2];
     InitAnimArcTranslation(sprite);
     sprite->callback = sub_80CA9F8;
@@ -288,9 +288,9 @@ void sub_80CAA14(struct Sprite* sprite)
     u16 b;
     
     StartSpriteAnim(sprite, a & 7);
-    sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
-    sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
-    if (GetBattlerSide(gAnimBankAttacker))
+    sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
+    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
+    if (GetBattlerSide(gBattleAnimAttacker))
     {
         sprite->pos1.x -= 20;
     }
@@ -302,9 +302,9 @@ void sub_80CAA14(struct Sprite* sprite)
     b = Random();
     sprite->data[0] = (b & 31) + 64;
     sprite->data[1] = sprite->pos1.x;
-    sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2);
+    sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
     sprite->data[3] = sprite->pos1.y;
-    sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3);
+    sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 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 36949b3c5..26350cbbe 100644
--- a/src/battle/anim/osmose.c
+++ b/src/battle/anim/osmose.c
@@ -4,8 +4,8 @@
 #include "battle_anim.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 void sub_80CB768(struct Sprite* sprite);
 
@@ -39,8 +39,8 @@ void sub_80CB768(struct Sprite* sprite)
 {
     if (!sprite->data[0])
     {
-        sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2) + gBattleAnimArgs[0];
-        sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 1) + gBattleAnimArgs[1];
+        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) + gBattleAnimArgs[0];
+        sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1) + gBattleAnimArgs[1];
         sprite->data[1] = gBattleAnimArgs[2];
         sprite->data[2] = gBattleAnimArgs[3];
         sprite->data[3] = gBattleAnimArgs[4];
diff --git a/src/battle/anim/perceive.c b/src/battle/anim/perceive.c
index 0679dc617..921e21687 100644
--- a/src/battle/anim/perceive.c
+++ b/src/battle/anim/perceive.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 void sub_80D2920(struct Sprite* sprite);
 
diff --git a/src/battle/anim/poison.c b/src/battle/anim/poison.c
index 6559e1b2e..b6af984ef 100644
--- a/src/battle/anim/poison.c
+++ b/src/battle/anim/poison.c
@@ -4,8 +4,8 @@
 #include "trig.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 extern const union AnimCmd *const gSpriteAnimTable_83D9310[];
 
@@ -200,8 +200,8 @@ void sub_80D9D70(struct Sprite *sprite)
     InitAnimSpritePos(sprite, 1);
 
     sprite->data[0] = gBattleAnimArgs[2];
-    sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2);
-    sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3);
+    sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
+    sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
     sprite->data[5] = -30;
 
     InitAnimArcTranslation(sprite);
@@ -222,9 +222,9 @@ void sub_80D9DF0(struct Sprite *sprite)
         StartSpriteAnim(sprite, 2);
 
     InitAnimSpritePos(sprite, 1);
-    SetAverageBattlerPositions(gAnimBankTarget, 1, &l1, &l2);
+    SetAverageBattlerPositions(gBattleAnimTarget, 1, &l1, &l2);
 
-    if (GetBattlerSide(gAnimBankAttacker))
+    if (GetBattlerSide(gBattleAnimAttacker))
         gBattleAnimArgs[4] = -gBattleAnimArgs[4];
 
     sprite->data[0] = gBattleAnimArgs[2];
@@ -272,9 +272,9 @@ static void sub_80D9EE8(struct Sprite *sprite)
 
 void sub_80D9F14(struct Sprite *sprite)
 {
-    SetAverageBattlerPositions(gAnimBankTarget, TRUE, &sprite->pos1.x, &sprite->pos1.y);
+    SetAverageBattlerPositions(gBattleAnimTarget, TRUE, &sprite->pos1.x, &sprite->pos1.y);
 
-    if (GetBattlerSide(gAnimBankAttacker))
+    if (GetBattlerSide(gBattleAnimAttacker))
         gBattleAnimArgs[0] = -gBattleAnimArgs[0];
 
     sprite->pos1.x += gBattleAnimArgs[0];
@@ -302,9 +302,9 @@ void AnimBubbleEffect(struct Sprite *sprite)
     }
     else
     {
-        SetAverageBattlerPositions(gAnimBankTarget, TRUE, &sprite->pos1.x, &sprite->pos1.y);
+        SetAverageBattlerPositions(gBattleAnimTarget, TRUE, &sprite->pos1.x, &sprite->pos1.y);
 
-        if (GetBattlerSide(gAnimBankAttacker))
+        if (GetBattlerSide(gBattleAnimAttacker))
             gBattleAnimArgs[0] = -gBattleAnimArgs[0];
 
         sprite->pos1.x += gBattleAnimArgs[0];
diff --git a/src/battle/anim/powder.c b/src/battle/anim/powder.c
index 447f31866..58b34e0f3 100644
--- a/src/battle/anim/powder.c
+++ b/src/battle/anim/powder.c
@@ -4,7 +4,7 @@
 #include "battle_anim.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
+extern u8 gBattleAnimAttacker;
 
 void AnimMovePowderParticle(struct Sprite* sprite);
 static void AnimMovePowderParticleStep(struct Sprite* sprite);
@@ -75,7 +75,7 @@ void AnimMovePowderParticle(struct Sprite* sprite)
     sprite->data[0] = gBattleAnimArgs[2];
     sprite->data[1] = gBattleAnimArgs[3];
 
-    if (GetBattlerSide(gAnimBankAttacker))
+    if (GetBattlerSide(gBattleAnimAttacker))
     {
         sprite->data[3] = -gBattleAnimArgs[4];
     }
diff --git a/src/battle/anim/psychic.c b/src/battle/anim/psychic.c
index 140eadde1..42a2ce387 100644
--- a/src/battle/anim/psychic.c
+++ b/src/battle/anim/psychic.c
@@ -10,8 +10,8 @@
 #include "constants/songs.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 extern u16 gBattle_BG1_X;
 extern u16 gBattle_BG2_X;
 extern u8 gBankSpriteIds[];
@@ -428,7 +428,7 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAA68 =
 
 void sub_80DB74C(struct Sprite *sprite)
 {
-    if (GetBattlerSide(gAnimBankAttacker) == B_SIDE_PLAYER || IsContest())
+    if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER || IsContest())
     {
         sprite->oam.priority = 2;
         sprite->subpriority = 200;
@@ -452,7 +452,7 @@ void sub_80DB74C(struct Sprite *sprite)
 
     if (!IsContest() && IsDoubleBattle())
     {
-        if (GetBattlerSide(gAnimBankAttacker) == B_SIDE_PLAYER)
+        if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER)
         {
             sprite->pos1.x = 72;
             sprite->pos1.y = 80;
@@ -465,11 +465,11 @@ void sub_80DB74C(struct Sprite *sprite)
     }
     else
     {
-        if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER)
+        if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
             gBattleAnimArgs[0] = -gBattleAnimArgs[0];
 
-        sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 0) + gBattleAnimArgs[0];
-        sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 1) + gBattleAnimArgs[1];
+        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0) + gBattleAnimArgs[0];
+        sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1) + gBattleAnimArgs[1];
     }
 
     if (IsContest())
@@ -568,7 +568,7 @@ void sub_80DBA4C(struct Sprite *sprite)
 
         if (!IsContest() && IsDoubleBattle())
         {
-            if (GetBattlerSide(gAnimBankAttacker) == B_SIDE_PLAYER)
+            if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER)
             {
                 sprite->pos1.x = 72 - gBattleAnimArgs[0];
                 sprite->pos1.y = gBattleAnimArgs[1] + 80;
@@ -598,10 +598,10 @@ void sub_80DBA4C(struct Sprite *sprite)
 
 void sub_80DBAF4(struct Sprite *sprite)
 {
-    sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
-    sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
+    sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
+    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
 
-    if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER)
+    if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
     {
         StartSpriteAnim(sprite, 1);
         sprite->pos1.x -= 40;
@@ -621,16 +621,16 @@ void sub_80DBAF4(struct Sprite *sprite)
 
 void sub_80DBB70(struct Sprite *sprite)
 {
-    s16 x = sub_807A100(gAnimBankAttacker, 1) /  2;
-    s16 y = sub_807A100(gAnimBankAttacker, 0) / -2;
+    s16 x = sub_807A100(gBattleAnimAttacker, 1) /  2;
+    s16 y = sub_807A100(gBattleAnimAttacker, 0) / -2;
 
-    if (GetBattlerSide(gAnimBankAttacker) == B_SIDE_OPPONENT)
+    if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT)
     {
         x = -x;
     }
 
-    sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2) + x;
-    sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3) + y;
+    sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) + x;
+    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) + y;
 
     if (sprite->pos1.y < 16)
     {
@@ -696,7 +696,7 @@ void sub_80DBCFC(u8 taskId)
     task->data[0] = spriteId;
     task->data[1] = 0;
     task->data[2] = 0;
-    task->data[3] = GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER ? 4 : 8;
+    task->data[3] = GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER ? 4 : 8;
 
     sub_80798F4(task, task->data[0], &gSpriteAffineAnim_083DA8C4);
     task->func = sub_80DBD58;
@@ -738,11 +738,11 @@ void sub_80DBE00(u8 taskId)
 
     task->data[3] = 16;
     task->data[4] = 0;
-    task->data[13] = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
-    task->data[14] = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
+    task->data[13] = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
+    task->data[14] = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
 
-    var0 = sub_807A100(gAnimBankAttacker, 1) / 3;
-    var1 = sub_807A100(gAnimBankAttacker, 0) / 3;
+    var0 = sub_807A100(gBattleAnimAttacker, 1) / 3;
+    var1 = sub_807A100(gBattleAnimAttacker, 0) / 3;
     task->data[12] = var0 > var1 ? var0 : var1;
 
     REG_BLDCNT = 0x3F40;
@@ -838,8 +838,8 @@ void sub_80DC068(struct Sprite *sprite)
 {
     if (gBattleAnimArgs[0] == 0)
     {
-        sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
-        sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
+        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
+        sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
     }
 
     sprite->data[0] = gBattleAnimArgs[1];
@@ -855,18 +855,18 @@ void sub_80DC0B0(u8 taskId)
         if (gBattleAnimArgs[0] == 1)
         {
             task->data[10] = -10;
-            task->data[11] = sub_807A100(gAnimBankTarget, 5) - 8;
-            task->data[12] = sub_807A100(gAnimBankTarget, 2) + 8;
-            task->data[13] = sub_807A100(gAnimBankAttacker, 5) - 8;
-            task->data[14] = sub_807A100(gAnimBankAttacker, 2) + 8;
+            task->data[11] = sub_807A100(gBattleAnimTarget, 5) - 8;
+            task->data[12] = sub_807A100(gBattleAnimTarget, 2) + 8;
+            task->data[13] = sub_807A100(gBattleAnimAttacker, 5) - 8;
+            task->data[14] = sub_807A100(gBattleAnimAttacker, 2) + 8;
         }
         else
         {
             task->data[10] = 10;
-            task->data[11] = sub_807A100(gAnimBankAttacker, 4) + 8;
-            task->data[12] = sub_807A100(gAnimBankAttacker, 3) - 8;
-            task->data[13] = sub_807A100(gAnimBankTarget, 4) + 8;
-            task->data[14] = sub_807A100(gAnimBankTarget, 3) - 8;
+            task->data[11] = sub_807A100(gBattleAnimAttacker, 4) + 8;
+            task->data[12] = sub_807A100(gBattleAnimAttacker, 3) - 8;
+            task->data[13] = sub_807A100(gBattleAnimTarget, 4) + 8;
+            task->data[14] = sub_807A100(gBattleAnimTarget, 3) - 8;
         }
     }
     else
@@ -874,18 +874,18 @@ void sub_80DC0B0(u8 taskId)
         if (gBattleAnimArgs[0] == 1)
         {
             task->data[10] = -10;
-            task->data[11] = sub_807A100(gAnimBankTarget, 4) + 8;
-            task->data[12] = sub_807A100(gAnimBankTarget, 2) + 8;
-            task->data[13] = sub_807A100(gAnimBankAttacker, 4) + 8;
-            task->data[14] = sub_807A100(gAnimBankAttacker, 2) + 8;
+            task->data[11] = sub_807A100(gBattleAnimTarget, 4) + 8;
+            task->data[12] = sub_807A100(gBattleAnimTarget, 2) + 8;
+            task->data[13] = sub_807A100(gBattleAnimAttacker, 4) + 8;
+            task->data[14] = sub_807A100(gBattleAnimAttacker, 2) + 8;
         }
         else
         {
             task->data[10] = 10;
-            task->data[11] = sub_807A100(gAnimBankAttacker, 5) - 8;
-            task->data[12] = sub_807A100(gAnimBankAttacker, 3) - 8;
-            task->data[13] = sub_807A100(gAnimBankTarget, 5) - 8;
-            task->data[14] = sub_807A100(gAnimBankTarget, 3) - 8;
+            task->data[11] = sub_807A100(gBattleAnimAttacker, 5) - 8;
+            task->data[12] = sub_807A100(gBattleAnimAttacker, 3) - 8;
+            task->data[13] = sub_807A100(gBattleAnimTarget, 5) - 8;
+            task->data[14] = sub_807A100(gBattleAnimTarget, 3) - 8;
         }
     }
 
@@ -943,7 +943,7 @@ void sub_80DC2D4(u8 taskId)
     struct ScanlineEffectParams scanlineParams;
     struct Task *task = &gTasks[taskId];
     
-    var1 = sub_8077FC0(gAnimBankTarget);
+    var1 = sub_8077FC0(gBattleAnimTarget);
     task->data[14] = var1 - 32;
 
     switch (gBattleAnimArgs[0])
@@ -971,7 +971,7 @@ void sub_80DC2D4(u8 taskId)
     if (task->data[14] < 0)
         task->data[14] = 0;
 
-    if (GetBattlerPosition_permutated(gAnimBankTarget) == 1)
+    if (GetBattlerPosition_permutated(gBattleAnimTarget) == 1)
     {
         task->data[10] = gBattle_BG1_X;
         scanlineParams.dmaDest = &REG_BG1HOFS;
@@ -1244,8 +1244,8 @@ void sub_80DC700(struct Sprite *sprite)
     switch (sprite->data[0])
     {
     case 0:
-        sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 0);
-        sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 1);
+        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0);
+        sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1);
 
         if (IsContest())
             sprite->pos1.y += 12;
diff --git a/src/battle/anim/ring.c b/src/battle/anim/ring.c
index f3d18c89a..398671249 100644
--- a/src/battle/anim/ring.c
+++ b/src/battle/anim/ring.c
@@ -7,8 +7,8 @@
 #include "blend_palette.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 extern u8 gBankSpriteIds[];
 
@@ -215,9 +215,9 @@ void sub_80D0FD8(struct Sprite* sprite)
     u8 r4;
 
     if (gBattleAnimArgs[2] == 0)
-        bank = gAnimBankAttacker;
+        bank = gBattleAnimAttacker;
     else
-        bank = gAnimBankTarget;
+        bank = gBattleAnimTarget;
 
     r4 = gBattleAnimArgs[3] ^ 1;
     if (IsDoubleBattle() && IsAnimBankSpriteVisible(bank ^ 2))
@@ -260,13 +260,13 @@ void sub_80D10B8(struct Sprite* sprite)
 
     if (gBattleAnimArgs[5] == 0)
     {
-        bankr7 = gAnimBankAttacker;
-        bankr8 = gAnimBankTarget;
+        bankr7 = gBattleAnimAttacker;
+        bankr8 = gBattleAnimTarget;
     }
     else
     {
-        bankr7 = gAnimBankTarget;
-        bankr8 = gAnimBankAttacker;
+        bankr7 = gBattleAnimTarget;
+        bankr8 = gBattleAnimAttacker;
     }
 
     if (gBattleAnimArgs[6] == 0)
@@ -349,7 +349,7 @@ void sub_80D1368(struct Sprite* sprite)
 {
     s16 r1;
     InitAnimSpritePos(sprite, 0);
-    r1 = (GetBattlerSide(gAnimBankAttacker)) ? -0xA0 : 0xA0;
+    r1 = (GetBattlerSide(gBattleAnimAttacker)) ? -0xA0 : 0xA0;
     sprite->data[0] = 0x380;
     sprite->data[1] = r1;
     sprite->data[7] = gBattleAnimArgs[2];
@@ -362,7 +362,7 @@ static void sub_80D13AC(struct Sprite* sprite)
     sprite->pos2.y -= (sprite->data[0] >> 8);
     sprite->pos2.x = sprite->data[1] >> 8;
     sprite->data[0] -= 32;
-    add = (GetBattlerSide(gAnimBankAttacker)) ? -0xA0 : 0xA0;
+    add = (GetBattlerSide(gBattleAnimAttacker)) ? -0xA0 : 0xA0;
     sprite->data[1] += add;
     if (sprite->pos2.y > 0)
     {
diff --git a/src/battle/anim/rock.c b/src/battle/anim/rock.c
index 4a6fcd89e..386ddfac7 100644
--- a/src/battle/anim/rock.c
+++ b/src/battle/anim/rock.c
@@ -10,8 +10,8 @@
 #include "constants/songs.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 extern s32 gAnimMoveDmg;
 extern u16 gBattle_BG1_X;
 extern u16 gBattle_BG1_Y;
@@ -321,7 +321,7 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAE30 =
 void sub_80DCE9C(struct Sprite *sprite)
 {
     if (gBattleAnimArgs[3] != 0)
-        SetAverageBattlerPositions(gAnimBankTarget, 0, &sprite->pos1.x, &sprite->pos1.y);
+        SetAverageBattlerPositions(gBattleAnimTarget, 0, &sprite->pos1.x, &sprite->pos1.y);
 
     sprite->pos1.x += gBattleAnimArgs[0];
     sprite->pos1.y += 14;
@@ -361,7 +361,7 @@ void sub_80DCF60(struct Sprite *sprite)
     StartSpriteAnim(sprite, gBattleAnimArgs[5]);
     AnimateSprite(sprite);
 
-    if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER)
+    if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
         sprite->pos1.x -= gBattleAnimArgs[0];
     else
         sprite->pos1.x += gBattleAnimArgs[0];
@@ -437,7 +437,7 @@ void do_boulder_dust(u8 taskId)
     if (IsContest())
         sub_80763FC(subStruct.field_8, (u16 *)subStruct.field_4, 0, 0);
 
-    if (gBattleAnimArgs[0] != 0 && GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER)
+    if (gBattleAnimArgs[0] != 0 && GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
         var0 = 1;
 
     gTasks[taskId].data[0] = var0;
@@ -520,7 +520,7 @@ void AnimDirtParticleAcrossScreen(struct Sprite *sprite)
 {
     if (sprite->data[0] == 0)
     {
-        if (gBattleAnimArgs[3] != 0 && GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER)
+        if (gBattleAnimArgs[3] != 0 && GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
         {
             sprite->pos1.x = 304;
             gBattleAnimArgs[1] = -gBattleAnimArgs[1];
@@ -590,12 +590,12 @@ void sub_80DD4D4(u8 taskId)
 
     task = &gTasks[taskId];
 
-    var0 = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
-    var1 = GetBattlerSpriteCoord(gAnimBankAttacker, 1) + 24;
-    var2 = GetBattlerSpriteCoord(gAnimBankTarget, 2);
-    var3 = GetBattlerSpriteCoord(gAnimBankTarget, 1) + 24;
+    var0 = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
+    var1 = GetBattlerSpriteCoord(gBattleAnimAttacker, 1) + 24;
+    var2 = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
+    var3 = GetBattlerSpriteCoord(gBattleAnimTarget, 1) + 24;
 
-    if ((gAnimBankAttacker ^ 2) == gAnimBankTarget)
+    if ((gBattleAnimAttacker ^ 2) == gBattleAnimTarget)
         var3 = var1;
 
     var4 = sub_80DD8BC();
@@ -809,7 +809,7 @@ static void sub_80DD928(struct Sprite *sprite)
 
 void sub_80DD978(struct Sprite *sprite)
 {
-    if (GetBattlerSide(gAnimBankAttacker) == B_SIDE_OPPONENT)
+    if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT)
         StartSpriteAffineAnim(sprite, 1);
 
     TranslateAnimSpriteToTargetMonLocation(sprite);
@@ -817,8 +817,8 @@ void sub_80DD978(struct Sprite *sprite)
 
 void sub_80DD9A4(struct Sprite *sprite)
 {
-    sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 0);
-    sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 1);
+    sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 0);
+    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 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 085d678d6..e2dd4a2af 100644
--- a/src/battle/anim/roots.c
+++ b/src/battle/anim/roots.c
@@ -4,8 +4,8 @@
 #include "battle_anim.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 extern s16 gUnknown_03000728[];
 
 void sub_80CB59C(struct Sprite* sprite);
@@ -83,8 +83,8 @@ void sub_80CB59C(struct Sprite* sprite)
 {
     if (!sprite->data[0])
     {
-        sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
-        sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 1);
+        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
+        sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1);
         sprite->pos2.x = gBattleAnimArgs[0];
         sprite->pos2.y = gBattleAnimArgs[1];
         sprite->subpriority = gBattleAnimArgs[2] + 30;
@@ -101,10 +101,10 @@ void sub_80CB59C(struct Sprite* sprite)
 
 void sub_80CB620(struct Sprite *sprite)
 {
-    s16 p1 = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
-    s16 p2 = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
-    s16 e1 = GetBattlerSpriteCoord(gAnimBankTarget, 2);
-    s16 e2 = GetBattlerSpriteCoord(gAnimBankTarget, 3);
+    s16 p1 = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
+    s16 p2 = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
+    s16 e1 = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
+    s16 e2 = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
 
     e1 -= p1;
     e2 -= p2;
diff --git a/src/battle/anim/scan.c b/src/battle/anim/scan.c
index 792e832cb..329e28f71 100644
--- a/src/battle/anim/scan.c
+++ b/src/battle/anim/scan.c
@@ -6,8 +6,8 @@
 #include "palette.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 void sub_80CD3E0(struct Sprite* sprite);
 void sub_80CD6CC(struct Sprite* sprite);
@@ -140,8 +140,8 @@ static void sub_80CD4EC(struct Sprite* sprite)
         sprite->pos2.y = 0;
         sprite->pos2.x = 0;
         sprite->data[0] = 6;
-        sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2) + a;
-        sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3) + b;
+        sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + a;
+        sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + b;
         sprite->callback = StartAnimLinearTranslation;
         StoreSpriteCallbackInData(sprite, sub_80CD654);
     }
diff --git a/src/battle/anim/scary_face.c b/src/battle/anim/scary_face.c
index 5a2c52825..2fe58ce26 100644
--- a/src/battle/anim/scary_face.c
+++ b/src/battle/anim/scary_face.c
@@ -7,8 +7,8 @@
 #include "palette.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 extern const u8 gBattleAnimBackgroundTilemap_ScaryFaceContest[];
 extern const u8 gBattleAnimBackgroundTilemap_ScaryFacePlayer[];
@@ -43,7 +43,7 @@ void sub_80D23B4(u8 taskId)
     DmaFill32Defvars(3, 0, subStruct.field_4, 0x1000);
     if (IsContest())
         LZDecompressVram(&gBattleAnimBackgroundTilemap_ScaryFaceContest, subStruct.field_4);
-    else if (GetBattlerSide(gAnimBankTarget) == 1)
+    else if (GetBattlerSide(gBattleAnimTarget) == 1)
         LZDecompressVram(&gBattleAnimBackgroundTilemap_ScaryFacePlayer, subStruct.field_4);
     else
         LZDecompressVram(&gBattleAnimBackgroundTilemap_ScaryFaceOpponent, subStruct.field_4);
diff --git a/src/battle/anim/seed.c b/src/battle/anim/seed.c
index 8065c9a38..9b0d87eca 100644
--- a/src/battle/anim/seed.c
+++ b/src/battle/anim/seed.c
@@ -4,8 +4,8 @@
 #include "battle_anim.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 void AnimLeechSeed(struct Sprite* sprite);
 static void AnimLeechSeedStep(struct Sprite* sprite);
@@ -52,14 +52,14 @@ const struct SpriteTemplate gLeechSeedSpriteTemplate =
 void AnimLeechSeed(struct Sprite* sprite)
 {
     InitAnimSpritePos(sprite, 1);
-    if (GetBattlerSide(gAnimBankAttacker))
+    if (GetBattlerSide(gBattleAnimAttacker))
     {
         gBattleAnimArgs[2] = -gBattleAnimArgs[2];
     }
 
     sprite->data[0] = gBattleAnimArgs[4];
-    sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 0) + gBattleAnimArgs[2];
-    sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 1) + gBattleAnimArgs[3];
+    sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 0) + gBattleAnimArgs[2];
+    sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 1) + gBattleAnimArgs[3];
     sprite->data[5] = gBattleAnimArgs[5];
     InitAnimArcTranslation(sprite);
     sprite->callback = AnimLeechSeedStep;
diff --git a/src/battle/anim/sfx.c b/src/battle/anim/sfx.c
index e41251964..e1127508b 100644
--- a/src/battle/anim/sfx.c
+++ b/src/battle/anim/sfx.c
@@ -7,8 +7,8 @@
 #include "task.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 extern u16 gBattlerPartyIndexes[];
 extern u16 gAnimSpeciesByBanks[];
 extern u8 gUnknown_0202F7D2;
@@ -158,13 +158,13 @@ void sub_812B18C(u8 taskId)
     {
         u8 bank;
         if (gBattleAnimArgs[0] == 0)
-            bank = gAnimBankAttacker;
+            bank = gBattleAnimAttacker;
         else if (gBattleAnimArgs[0] == 1)
-            bank = gAnimBankTarget;
+            bank = gBattleAnimTarget;
         else if (gBattleAnimArgs[0] == 2)
-            bank = gAnimBankAttacker ^ 0x2;
+            bank = gBattleAnimAttacker ^ 0x2;
         else
-            bank = gAnimBankTarget ^ 0x2;
+            bank = gBattleAnimTarget ^ 0x2;
 
         if (gBattleAnimArgs[0] == 1 || gBattleAnimArgs[0] == 3)
         {
@@ -202,7 +202,7 @@ void sub_812B2B8(u8 taskId)
     if (IsContest())
         species = shared19348.unk0;
     else
-        species = gAnimSpeciesByBanks[gAnimBankAttacker];
+        species = gAnimSpeciesByBanks[gBattleAnimAttacker];
 
     if (species != 0)
         PlayCry3(species, pan, 4);
diff --git a/src/battle/anim/shadow_enlarge.c b/src/battle/anim/shadow_enlarge.c
index 7662583ac..ab975914a 100644
--- a/src/battle/anim/shadow_enlarge.c
+++ b/src/battle/anim/shadow_enlarge.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 static void sub_80D0428(u8 taskId);
 
diff --git a/src/battle/anim/shadow_minimize.c b/src/battle/anim/shadow_minimize.c
index 224896d86..e65b4a193 100644
--- a/src/battle/anim/shadow_minimize.c
+++ b/src/battle/anim/shadow_minimize.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 static void sub_80D04E0(u8 taskId);
 void sub_80D0614(struct Task* task, u8 taskId);
@@ -27,7 +27,7 @@ void sub_80D0488(u8 taskId)
     task->data[4] = 0x100;
     task->data[5] = 0;
     task->data[6] = 0;
-    task->data[7] = GetBattlerSubpriority(gAnimBankAttacker);
+    task->data[7] = GetBattlerSubpriority(gBattleAnimAttacker);
     task->func = sub_80D04E0;
 }
 
diff --git a/src/battle/anim/shield.c b/src/battle/anim/shield.c
index d71baacc9..9500d66c9 100644
--- a/src/battle/anim/shield.c
+++ b/src/battle/anim/shield.c
@@ -6,8 +6,8 @@
 #include "palette.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 void sub_80CCD24(struct Sprite* sprite);
 static void sub_80CCE0C(struct Sprite* sprite);
@@ -33,12 +33,12 @@ void sub_80CCD24(struct Sprite* sprite)
         gBattleAnimArgs[1] += 8;
     }
 
-    sprite->pos1.x = sub_8077EE4(gAnimBankAttacker, 0) + gBattleAnimArgs[0];
-    sprite->pos1.y = sub_8077EE4(gAnimBankAttacker, 1) + gBattleAnimArgs[1];
-    if (GetBattlerSide(gAnimBankAttacker) == 0 || IsContest())
-        sprite->oam.priority = sub_8079ED4(gAnimBankAttacker) + 1;
+    sprite->pos1.x = sub_8077EE4(gBattleAnimAttacker, 0) + gBattleAnimArgs[0];
+    sprite->pos1.y = sub_8077EE4(gBattleAnimAttacker, 1) + gBattleAnimArgs[1];
+    if (GetBattlerSide(gBattleAnimAttacker) == 0 || IsContest())
+        sprite->oam.priority = sub_8079ED4(gBattleAnimAttacker) + 1;
     else
-        sprite->oam.priority = sub_8079ED4(gAnimBankAttacker);
+        sprite->oam.priority = sub_8079ED4(gBattleAnimAttacker);
 
     sprite->data[0] = gBattleAnimArgs[2];
     sprite->data[2] = (IndexOfSpritePaletteTag(0x2828) << 4) + 0x100;
diff --git a/src/battle/anim/shimmer.c b/src/battle/anim/shimmer.c
index 78b430094..0cd5580aa 100644
--- a/src/battle/anim/shimmer.c
+++ b/src/battle/anim/shimmer.c
@@ -6,8 +6,8 @@
 #include "blend_palette.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 // shimmer
 // Used by Magical Leaf.
diff --git a/src/battle/anim/shock.c b/src/battle/anim/shock.c
index fac415ade..4459e43b8 100644
--- a/src/battle/anim/shock.c
+++ b/src/battle/anim/shock.c
@@ -4,8 +4,8 @@
 #include "trig.h"
 
 extern s16 gBattleAnimArgs[8];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 extern struct OamMatrix gOamMatrices[];
 
 void sub_80D6294(struct Sprite *sprite);
@@ -66,10 +66,10 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9874 =
 
 void sub_80D6294(struct Sprite *sprite)
 {
-    sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 2);
-    sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 3);
+    sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
+    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
 
-    if (GetBattlerSide(gAnimBankAttacker) != 0)
+    if (GetBattlerSide(gBattleAnimAttacker) != 0)
     {
         sprite->pos1.x -= gBattleAnimArgs[0];
         sprite->pos1.y -= gBattleAnimArgs[1];
@@ -98,30 +98,30 @@ void sub_80D6328(struct Sprite *sprite)
     switch (gBattleAnimArgs[4])
     {
     case 0:
-        slot = gAnimBankAttacker;
+        slot = gBattleAnimAttacker;
         break;
     case 1:
     default:
-        slot = gAnimBankTarget;
+        slot = gBattleAnimTarget;
         break;
     case 2:
-        if (!IsAnimBankSpriteVisible(gAnimBankAttacker ^ 2))
+        if (!IsAnimBankSpriteVisible(gBattleAnimAttacker ^ 2))
         {
-            slot = gAnimBankAttacker;
+            slot = gBattleAnimAttacker;
         }
         else
         {
-            slot = gAnimBankAttacker ^ 2;
+            slot = gBattleAnimAttacker ^ 2;
         }
         break;
     case 3:
-        if (IsAnimBankSpriteVisible(gAnimBankAttacker ^ 2))
+        if (IsAnimBankSpriteVisible(gBattleAnimAttacker ^ 2))
         {
-            slot = gAnimBankTarget ^ 2;
+            slot = gBattleAnimTarget ^ 2;
         }
         else
         {
-            slot = gAnimBankTarget;
+            slot = gBattleAnimTarget;
         }
         break;
     }
diff --git a/src/battle/anim/silhouette.c b/src/battle/anim/silhouette.c
index 00bb24762..f61c0913b 100644
--- a/src/battle/anim/silhouette.c
+++ b/src/battle/anim/silhouette.c
@@ -4,8 +4,8 @@
 #include "battle_anim.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 static void sub_80CB3A8(u8 taskId);
 static void sub_80CB438(u8 taskId);
@@ -35,7 +35,7 @@ void sub_80CB3A8(u8 taskId)
     u8 spriteId = GetAnimBattlerSpriteId(1);
     gTasks[taskId].data[10] += gTasks[taskId].data[0];
     gSprites[spriteId].pos2.x = gTasks[taskId].data[10] >> 8;
-    if (GetBattlerSide(gAnimBankTarget))
+    if (GetBattlerSide(gBattleAnimTarget))
     {
         gSprites[spriteId].pos2.x = -gSprites[spriteId].pos2.x;
     }
diff --git a/src/battle/anim/slash.c b/src/battle/anim/slash.c
index c2c1fcb16..e42a6c2ad 100644
--- a/src/battle/anim/slash.c
+++ b/src/battle/anim/slash.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 void sub_80CDD74(struct Sprite* sprite);
 void sub_80CDDDC(struct Sprite* sprite);
@@ -76,13 +76,13 @@ void sub_80CDD74(struct Sprite* sprite)
 {
     if (gBattleAnimArgs[0] == 0)
     {
-        sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2) + gBattleAnimArgs[1];
-        sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3) + gBattleAnimArgs[2];
+        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) + gBattleAnimArgs[1];
+        sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) + gBattleAnimArgs[2];
     }
     else
     {
-        sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 2) + gBattleAnimArgs[1];
-        sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 3) + gBattleAnimArgs[2];
+        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + gBattleAnimArgs[1];
+        sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + gBattleAnimArgs[2];
     }
 
     sprite->data[0] = 0;
@@ -93,16 +93,16 @@ void sub_80CDD74(struct Sprite* sprite)
 
 void sub_80CDDDC(struct Sprite* sprite)
 {
-    sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 2) + 0xFFD0;
-    sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 3);
+    sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + 0xFFD0;
+    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
     StoreSpriteCallbackInData(sprite, sub_80CDE78);
     sprite->callback = sub_8078600;
 }
 
 void sub_80CDE24(struct Sprite* sprite)
 {
-    sprite->pos1.x = sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 2) + 0xFFD0 + gBattleAnimArgs[0];
-    sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 3);
+    sprite->pos1.x = sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + 0xFFD0 + gBattleAnimArgs[0];
+    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
     StartSpriteAnim(sprite, 1);
     sprite->data[0] = 0;
     sprite->data[1] = 0;
diff --git a/src/battle/anim/sleep.c b/src/battle/anim/sleep.c
index 6963624ee..82822c931 100644
--- a/src/battle/anim/sleep.c
+++ b/src/battle/anim/sleep.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 void sub_80CD328(struct Sprite* sprite);
 static void sub_80CD394(struct Sprite* sprite);
@@ -73,7 +73,7 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6D94 =
 void sub_80CD328(struct Sprite* sprite)
 {
     sub_8078650(sprite);
-    if (GetBattlerSide(gAnimBankAttacker) == 0)
+    if (GetBattlerSide(gBattleAnimAttacker) == 0)
     {
         sprite->pos1.x += gBattleAnimArgs[0];
         sprite->pos1.y += gBattleAnimArgs[1];
diff --git a/src/battle/anim/slice.c b/src/battle/anim/slice.c
index 329f267d6..7abb2cdcf 100644
--- a/src/battle/anim/slice.c
+++ b/src/battle/anim/slice.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 void AnimCuttingSlice(struct Sprite* sprite);
 void sub_80CC9BC(struct Sprite* sprite);
@@ -55,9 +55,9 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6B40 =
 // arg 2: slice direction; 0 = right-to-left, 1 = left-to-right
 void AnimCuttingSlice(struct Sprite* sprite)
 {
-    sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 0);
-    sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 1);
-    if (GetBattlerSide(gAnimBankTarget) == 0)
+    sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 0);
+    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 1);
+    if (GetBattlerSide(gBattleAnimTarget) == 0)
         sprite->pos1.y += 8;
 
     sprite->callback = AnimSliceStep;
@@ -86,28 +86,28 @@ void sub_80CC9BC(struct Sprite* sprite)
     switch (gBattleAnimArgs[3])
     {
     case 1:
-        a = GetBattlerSpriteCoord(gAnimBankTarget ^ 2, 0);
-        b = GetBattlerSpriteCoord(gAnimBankTarget ^ 2, 1);
+        a = GetBattlerSpriteCoord(gBattleAnimTarget ^ 2, 0);
+        b = GetBattlerSpriteCoord(gBattleAnimTarget ^ 2, 1);
         break;
     case 2:
-        a = GetBattlerSpriteCoord(gAnimBankTarget, 0);
-        b = GetBattlerSpriteCoord(gAnimBankTarget, 1);
-        if (IsAnimBankSpriteVisible(gAnimBankTarget ^ 2))
+        a = GetBattlerSpriteCoord(gBattleAnimTarget, 0);
+        b = GetBattlerSpriteCoord(gBattleAnimTarget, 1);
+        if (IsAnimBankSpriteVisible(gBattleAnimTarget ^ 2))
         {
-            a = (GetBattlerSpriteCoord(gAnimBankTarget ^ 2, 0) + a) / 2;
-            b = (GetBattlerSpriteCoord(gAnimBankTarget ^ 2, 1) + b) / 2;
+            a = (GetBattlerSpriteCoord(gBattleAnimTarget ^ 2, 0) + a) / 2;
+            b = (GetBattlerSpriteCoord(gBattleAnimTarget ^ 2, 1) + b) / 2;
         }
         break;
     case 0:
     default:
-        a = GetBattlerSpriteCoord(gAnimBankTarget, 0);
-        b = GetBattlerSpriteCoord(gAnimBankTarget, 1);
+        a = GetBattlerSpriteCoord(gBattleAnimTarget, 0);
+        b = GetBattlerSpriteCoord(gBattleAnimTarget, 1);
         break;
     }
 
     sprite->pos1.x = a;
     sprite->pos1.y = b;
-    if (GetBattlerSide(gAnimBankTarget) == 0)
+    if (GetBattlerSide(gBattleAnimTarget) == 0)
         sprite->pos1.y += 8;
 
     sprite->callback = AnimSliceStep;
diff --git a/src/battle/anim/sonic.c b/src/battle/anim/sonic.c
index 1de546780..9cdda992f 100644
--- a/src/battle/anim/sonic.c
+++ b/src/battle/anim/sonic.c
@@ -7,8 +7,8 @@
 #include "battle_anim_80CA710.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 extern u8 gBanksBySide[];
 extern u16 gBattleTypeFlags;
 
@@ -129,7 +129,7 @@ void AnimSonicBoomProjectile(struct Sprite* sprite)
     {
         gBattleAnimArgs[2] = -gBattleAnimArgs[2];
     }
-    else if (GetBattlerSide(gAnimBankAttacker) != 0)
+    else if (GetBattlerSide(gBattleAnimAttacker) != 0)
     {
         gBattleAnimArgs[2] = -gBattleAnimArgs[2];
         gBattleAnimArgs[1] = -gBattleAnimArgs[1];
@@ -137,8 +137,8 @@ void AnimSonicBoomProjectile(struct Sprite* sprite)
     }
 
     InitAnimSpritePos(sprite, 1);
-    targetXPos = GetBattlerSpriteCoord(gAnimBankTarget, 2) + gBattleAnimArgs[2];
-    targetYPos = GetBattlerSpriteCoord(gAnimBankTarget, 3) + gBattleAnimArgs[3];
+    targetXPos = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + gBattleAnimArgs[2];
+    targetYPos = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + gBattleAnimArgs[3];
     rotation = ArcTan2Neg(targetXPos - sprite->pos1.x, targetYPos - sprite->pos1.y);
     rotation += 0xF000;
     if (IsContest())
@@ -296,7 +296,7 @@ void sub_80CFB04(u8 taskId)
     }
     else
     {
-        if ((gBanksBySide[gAnimBankTarget] & 1) == 0)
+        if ((gBanksBySide[gBattleAnimTarget] & 1) == 0)
         {
             gTasks[taskId].data[4] = 1;
             gBattleAnimArgs[0] = -gBattleAnimArgs[0];
@@ -307,17 +307,17 @@ void sub_80CFB04(u8 taskId)
                 gBattleAnimArgs[2] |= 1;
         }
     }
-    r6 = gTasks[taskId].data[9] = GetBattlerSpriteCoord(gAnimBankAttacker, 0);
-    r9 = gTasks[taskId].data[10] = GetBattlerSpriteCoord(gAnimBankAttacker, 1);
+    r6 = gTasks[taskId].data[9] = GetBattlerSpriteCoord(gBattleAnimAttacker, 0);
+    r9 = gTasks[taskId].data[10] = GetBattlerSpriteCoord(gBattleAnimAttacker, 1);
     if ((gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
-        && IsAnimBankSpriteVisible(gAnimBankTarget ^ 2))
+        && IsAnimBankSpriteVisible(gBattleAnimTarget ^ 2))
     {
-        SetAverageBattlerPositions(gAnimBankTarget, 0, &sp1, &sp2);
+        SetAverageBattlerPositions(gBattleAnimTarget, 0, &sp1, &sp2);
     }
     else
     {
-        sp1 = GetBattlerSpriteCoord(gAnimBankTarget, 0);
-        sp2 = GetBattlerSpriteCoord(gAnimBankTarget, 1);
+        sp1 = GetBattlerSpriteCoord(gBattleAnimTarget, 0);
+        sp2 = GetBattlerSpriteCoord(gBattleAnimTarget, 1);
     }
 
     sp1 = gTasks[taskId].data[11] = sp1 + gBattleAnimArgs[0];
@@ -347,12 +347,12 @@ void sub_80CFB04(u8 taskId)
         gBattleAnimArgs[4] ^= 0x80;
         if (gBattleAnimArgs[4] >= 64)
         {
-            u16 var = GetBattlerSubpriority(gAnimBankTarget) + (gBattleAnimArgs[4] - 64);
+            u16 var = GetBattlerSubpriority(gBattleAnimTarget) + (gBattleAnimArgs[4] - 64);
             gTasks[taskId].data[2] = var;
         }
         else
         {
-            u16 var = GetBattlerSubpriority(gAnimBankTarget) - gBattleAnimArgs[4];
+            u16 var = GetBattlerSubpriority(gBattleAnimTarget) - gBattleAnimArgs[4];
             gTasks[taskId].data[2] = var;
         }
     }
@@ -360,12 +360,12 @@ void sub_80CFB04(u8 taskId)
     {
         if (gBattleAnimArgs[4] >= 64)
         {
-            u16 var = GetBattlerSubpriority(gAnimBankTarget) + (gBattleAnimArgs[4] - 64);
+            u16 var = GetBattlerSubpriority(gBattleAnimTarget) + (gBattleAnimArgs[4] - 64);
             gTasks[taskId].data[2] = var;
         }
         else
         {
-            u16 var = GetBattlerSubpriority(gAnimBankTarget) - gBattleAnimArgs[4];
+            u16 var = GetBattlerSubpriority(gBattleAnimTarget) - gBattleAnimArgs[4];
             gTasks[taskId].data[2] = var;
         }
     }
diff --git a/src/battle/anim/spit.c b/src/battle/anim/spit.c
index ee21135ac..44b29e9db 100644
--- a/src/battle/anim/spit.c
+++ b/src/battle/anim/spit.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 void sub_80D28AC(struct Sprite* sprite);
 
@@ -46,8 +46,8 @@ static void sub_80D287C(struct Sprite* sprite)
 
 void sub_80D28AC(struct Sprite* sprite)
 {
-    sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
-    sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
+    sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
+    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 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 7e3d08554..6bf59bc54 100644
--- a/src/battle/anim/splash.c
+++ b/src/battle/anim/splash.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 static void AnimTask_SplashStep(u8 taskId);
 
diff --git a/src/battle/anim/startle.c b/src/battle/anim/startle.c
index b23c7ac9e..fb1e0f375 100644
--- a/src/battle/anim/startle.c
+++ b/src/battle/anim/startle.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 // startle (the pokemon sprite shrivels upward and restores after a brief time.)
 // Used in Fake Out, Trick, and Astonish.
diff --git a/src/battle/anim/strike.c b/src/battle/anim/strike.c
index 0eba290a9..303a39d29 100644
--- a/src/battle/anim/strike.c
+++ b/src/battle/anim/strike.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 void sub_80CE670(struct Sprite* sprite);
 static void sub_80CE798(struct Sprite* sprite);
@@ -64,8 +64,8 @@ void sub_80CE670(struct Sprite* sprite)
 
     sprite->data[0] = 0;
     sprite->data[1] = gBattleAnimArgs[2];
-    sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 2) + gBattleAnimArgs[0];
-    sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 3) + gBattleAnimArgs[1];
+    sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + gBattleAnimArgs[0];
+    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + gBattleAnimArgs[1];
     sprite->data[6] = sprite->pos1.x;
     sprite->data[7] = sprite->pos1.y;
     if (IsContest() != 0)
@@ -78,7 +78,7 @@ void sub_80CE670(struct Sprite* sprite)
         sprite->data[4] = sprite->pos1.y << 7;
         sprite->data[5] = -0xA00 / sprite->data[1];
     }
-    else if (GetBattlerSide(gAnimBankAttacker) == 0)
+    else if (GetBattlerSide(gBattleAnimAttacker) == 0)
     {
         sprite->pos1.x -= 40;
         sprite->pos1.y += 20;
diff --git a/src/battle/anim/struggle.c b/src/battle/anim/struggle.c
index 609673fa0..578dd7618 100644
--- a/src/battle/anim/struggle.c
+++ b/src/battle/anim/struggle.c
@@ -4,8 +4,8 @@
 #include "sprite.h"
 
 extern s16 gBattleAnimArgs[8];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 void sub_80D2C38(struct Sprite *sprite);
 static void sub_80D2CC4(struct Sprite *);
@@ -55,13 +55,13 @@ void sub_80D2C38(struct Sprite *sprite)
     {
         if (gBattleAnimArgs[0] == 0)
         {
-            sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
-            sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
+            sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
+            sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
         }
         else
         {
-            sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 2);
-            sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 3);
+            sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
+            sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
         }
 
         if (gBattleAnimArgs[1] == 0)
diff --git a/src/battle/anim/switch.c b/src/battle/anim/switch.c
index 2b8a87d3d..7667355dd 100644
--- a/src/battle/anim/switch.c
+++ b/src/battle/anim/switch.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 extern const union AffineAnimCmd gSpriteAffineAnim_83D66BC[];
 extern const union AffineAnimCmd gSpriteAffineAnim_83D66DC[];
 extern const union AnimCmd *const gSpriteAnimTable_83D66B8[];
diff --git a/src/battle/anim/sword.c b/src/battle/anim/sword.c
index 8b15288b9..a917a9693 100644
--- a/src/battle/anim/sword.c
+++ b/src/battle/anim/sword.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 void sub_80CF690(struct Sprite* sprite);
 static void sub_80CF6B4(struct Sprite* sprite);
diff --git a/src/battle/anim/tendrils.c b/src/battle/anim/tendrils.c
index de50fc419..8999cf18d 100644
--- a/src/battle/anim/tendrils.c
+++ b/src/battle/anim/tendrils.c
@@ -4,8 +4,8 @@
 #include "battle_anim.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 void sub_80CB25C(struct Sprite* sprite);
 static void sub_80CB298(struct Sprite* sprite);
diff --git a/src/battle/anim/thought.c b/src/battle/anim/thought.c
index fcaf6a9a8..ee387040f 100644
--- a/src/battle/anim/thought.c
+++ b/src/battle/anim/thought.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 void sub_80CEF9C(struct Sprite* sprite);
 static void sub_80CF008(struct Sprite* sprite);
@@ -84,9 +84,9 @@ void sub_80CEF9C(struct Sprite* sprite)
     u8 a;
     u8 bank;
     if (gBattleAnimArgs[0] == 0)
-        bank = gAnimBankAttacker;
+        bank = gBattleAnimAttacker;
     else
-        bank = gAnimBankTarget;
+        bank = gBattleAnimTarget;
 
     sub_80CEF44(bank, sprite);
     a = (GetBattlerSide(bank) == 0) ? 0 : 1;
diff --git a/src/battle/anim/thrashing.c b/src/battle/anim/thrashing.c
index 38dccb83f..2f00b1acc 100644
--- a/src/battle/anim/thrashing.c
+++ b/src/battle/anim/thrashing.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 static void sub_80D0A8C(u8 taskId);
 static void sub_80D0B3C(u8 taskId);
@@ -56,7 +56,7 @@ void sub_80D0AB8(u8 taskId)
     task->data[7] = 0;
     task->data[8] = 0;
     task->data[9] = 2;
-    if (GetBattlerSide(gAnimBankAttacker) == 1)
+    if (GetBattlerSide(gBattleAnimAttacker) == 1)
         task->data[2] *= -1;
 
     task->func = sub_80D0B3C;
diff --git a/src/battle/anim/thunder.c b/src/battle/anim/thunder.c
index 862f0f7a8..b15a5c4f1 100644
--- a/src/battle/anim/thunder.c
+++ b/src/battle/anim/thunder.c
@@ -3,8 +3,8 @@
 #include "rom_8077ABC.h"
 
 extern s16 gBattleAnimArgs[8];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 extern u16 gBattleTypeFlags;
 
 void sub_80D61C8(struct Sprite *sprite);
@@ -41,7 +41,7 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D97D0 =
 
 void sub_80D61C8(struct Sprite *sprite)
 {
-    if (GetBattlerSide(gAnimBankAttacker) != 0)
+    if (GetBattlerSide(gBattleAnimAttacker) != 0)
     {
         sprite->pos1.x -= gBattleAnimArgs[0];
     }
diff --git a/src/battle/anim/tile.c b/src/battle/anim/tile.c
index de89b80a7..34695ecf4 100644
--- a/src/battle/anim/tile.c
+++ b/src/battle/anim/tile.c
@@ -6,8 +6,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 extern u8 gBattlersCount;
 extern u8 gHealthboxIDs[];
 
@@ -120,8 +120,8 @@ void sub_80CE09C(struct Sprite* sprite)
 {
     if (sprite->data[0] == 0)
     {
-        sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 0) + gBattleAnimArgs[0];
-        sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 1) + gBattleAnimArgs[1];
+        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0) + gBattleAnimArgs[0];
+        sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1) + gBattleAnimArgs[1];
         if (IsContest())
             sprite->pos1.y += 10;
         sprite->data[0]++;
@@ -173,8 +173,8 @@ static void sub_80CE1AC(struct Sprite* sprite)
     {
         sprite->animPaused = 0;
         sprite->data[0] = 30;
-        sprite->data[2] = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
-        sprite->data[4] = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
+        sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
+        sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
         sprite->callback = StartAnimLinearTranslation;
         StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
     }
diff --git a/src/battle/anim/twinkle.c b/src/battle/anim/twinkle.c
index 0180d5be1..dc26a7432 100644
--- a/src/battle/anim/twinkle.c
+++ b/src/battle/anim/twinkle.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 void sub_80CE36C(struct Sprite* sprite);
 static void sub_80CE3B0(struct Sprite* sprite);
@@ -41,7 +41,7 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6FF8 =
 
 void sub_80CE36C(struct Sprite* sprite)
 {
-    sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2) + gBattleAnimArgs[0];
+    sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) + gBattleAnimArgs[0];
     sprite->pos1.y = gBattleAnimArgs[1];
     sprite->data[0] = 0;
     sprite->data[1] = 0;
diff --git a/src/battle/anim/unused_1.c b/src/battle/anim/unused_1.c
index ee775a0ed..c9712de8f 100644
--- a/src/battle/anim/unused_1.c
+++ b/src/battle/anim/unused_1.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 void sub_80CC8C8(struct Sprite* sprite);
 
diff --git a/src/battle/anim/unused_2.c b/src/battle/anim/unused_2.c
index 4c12f609d..0209823b8 100644
--- a/src/battle/anim/unused_2.c
+++ b/src/battle/anim/unused_2.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 void sub_80CCC50(struct Sprite* sprite);
 static void sub_80CCCB4(struct Sprite* sprite);
@@ -135,7 +135,7 @@ void unref_sub_80CCB6C(struct Sprite* sprite)
 void sub_80CCC50(struct Sprite* sprite)
 {
     sprite->data[0] = gBattleAnimArgs[2];
-    if (GetBattlerSide(gAnimBankAttacker) != 0)
+    if (GetBattlerSide(gBattleAnimAttacker) != 0)
         sprite->pos1.x -= gBattleAnimArgs[0];
     else
         sprite->pos1.x += gBattleAnimArgs[0];
diff --git a/src/battle/anim/unused_3.c b/src/battle/anim/unused_3.c
index e222cd512..2ee1984a5 100644
--- a/src/battle/anim/unused_3.c
+++ b/src/battle/anim/unused_3.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 void sub_80CD274(struct Sprite* sprite);
 static void sub_80CD2D4(struct Sprite* sprite);
@@ -59,7 +59,7 @@ const struct SpriteTemplate gSpriteTemplate_83D6D08 =
 void sub_80CD274(struct Sprite* sprite)
 {
     sub_8078650(sprite);
-    if (GetBattlerSide(gAnimBankAttacker) == 0)
+    if (GetBattlerSide(gBattleAnimAttacker) == 0)
     {
         sprite->pos1.x += gBattleAnimArgs[0];
         sprite->pos1.y += gBattleAnimArgs[1];
diff --git a/src/battle/anim/unused_5.c b/src/battle/anim/unused_5.c
index e6b2f47f4..98cd62bd0 100644
--- a/src/battle/anim/unused_5.c
+++ b/src/battle/anim/unused_5.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 void sub_80CF280(struct Sprite* sprite);
 
diff --git a/src/battle/anim/unused_6.c b/src/battle/anim/unused_6.c
index ab5678641..27957f27d 100644
--- a/src/battle/anim/unused_6.c
+++ b/src/battle/anim/unused_6.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 extern void sub_80CEF44(u8 bank, struct Sprite* sprite);
 
@@ -41,9 +41,9 @@ void sub_80CF2D0(struct Sprite* sprite)
 {
     u8 bank;
     if (gBattleAnimArgs[0] == 0)
-        bank = gAnimBankAttacker;
+        bank = gBattleAnimAttacker;
     else
-        bank = gAnimBankTarget;
+        bank = gBattleAnimTarget;
 
     sub_80CEF44(bank, sprite);
     sprite->data[0] = 0;
diff --git a/src/battle/anim/unused_7.c b/src/battle/anim/unused_7.c
index fa3facdda..d2ce1f0a8 100644
--- a/src/battle/anim/unused_7.c
+++ b/src/battle/anim/unused_7.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 extern u8 gBankSpriteIds[];
 
@@ -43,10 +43,10 @@ static void sub_80CF374(struct Sprite* sprite)
 void sub_80CF3C4(struct Sprite* sprite)
 {
     u8 a;
-    sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
-    sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
-    a = gBankSpriteIds[gAnimBankTarget];
-    if (GetBattlerSide(gAnimBankAttacker) != 0)
+    sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
+    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
+    a = gBankSpriteIds[gBattleAnimTarget];
+    if (GetBattlerSide(gBattleAnimAttacker) != 0)
     {
         sprite->pos1.x -= gBattleAnimArgs[0];
     }
diff --git a/src/battle/anim/unused_8.c b/src/battle/anim/unused_8.c
index 586725f33..2a04d4d01 100644
--- a/src/battle/anim/unused_8.c
+++ b/src/battle/anim/unused_8.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 extern const union AffineAnimCmd *const gSpriteAffineAnimTable_83DB1B0[];
 
 void sub_80CF458(struct Sprite* sprite);
diff --git a/src/battle/anim/unused_9.c b/src/battle/anim/unused_9.c
index 75d236714..a9a42a695 100644
--- a/src/battle/anim/unused_9.c
+++ b/src/battle/anim/unused_9.c
@@ -6,8 +6,8 @@
 #include "palette.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 void sub_80CFDFC(struct Sprite* sprite);
 static void sub_80CFE2C(struct Sprite* sprite);
diff --git a/src/battle/anim/water.c b/src/battle/anim/water.c
index af38ecd7a..207e35083 100644
--- a/src/battle/anim/water.c
+++ b/src/battle/anim/water.c
@@ -5,8 +5,8 @@
 #include "util.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 extern const union AffineAnimCmd *const gSpriteAffineAnimTable_83DA318[];
 extern const union AnimCmd *const gSpriteAnimTable_83D9BC8[];
@@ -331,7 +331,7 @@ _080D3920:\n\
     movs r1, 0x4\n\
     orrs r0, r1\n\
     strb r0, [r2]\n\
-    ldr r0, _080D39A0 @ =gAnimBankAttacker\n\
+    ldr r0, _080D39A0 @ =gBattleAnimAttacker\n\
     ldrb r0, [r0]\n\
     bl GetBattlerSide\n\
     lsls r0, 24\n\
@@ -346,7 +346,7 @@ _080D3990: .4byte 0x00003f42\n\
 _080D3994: .4byte REG_BG1CNT\n\
 _080D3998: .4byte 0x040000d4\n\
 _080D399C: .4byte 0x85000400\n\
-_080D39A0: .4byte gAnimBankAttacker\n\
+_080D39A0: .4byte gBattleAnimAttacker\n\
 _080D39A4: .4byte gUnknown_08E70968\n\
 _080D39A8:\n\
     ldr r0, _080D39B4 @ =gUnknown_08E70C38\n\
@@ -454,7 +454,7 @@ _080D3A88: .4byte gBattle_BG1_X\n\
 _080D3A8C: .4byte 0x0000ffd0\n\
 _080D3A90: .4byte gBattle_BG1_Y\n\
 _080D3A94:\n\
-    ldr r0, _080D3AC4 @ =gAnimBankAttacker\n\
+    ldr r0, _080D3AC4 @ =gBattleAnimAttacker\n\
     ldrb r0, [r0]\n\
     bl GetBattlerSide\n\
     lsls r0, 24\n\
@@ -477,7 +477,7 @@ _080D3A94:\n\
     strh r1, [r7, 0xE]\n\
     b _080D3AEE\n\
     .align 2, 0\n\
-_080D3AC4: .4byte gAnimBankAttacker\n\
+_080D3AC4: .4byte gBattleAnimAttacker\n\
 _080D3AC8: .4byte 0x0000ff20\n\
 _080D3ACC: .4byte gBattle_BG1_X\n\
 _080D3AD0: .4byte gBattle_BG1_Y\n\
diff --git a/src/battle/anim/whip.c b/src/battle/anim/whip.c
index 91a937d41..8cfebc0dd 100644
--- a/src/battle/anim/whip.c
+++ b/src/battle/anim/whip.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 void sub_80CC82C(struct Sprite* sprite);
 void sub_80CC884(struct Sprite* sprite);
@@ -105,7 +105,7 @@ static void sub_80CC810(struct Sprite* sprite)
 
 void sub_80CC82C(struct Sprite* sprite)
 {
-    if (GetBattlerSide(gAnimBankAttacker) != 0)
+    if (GetBattlerSide(gBattleAnimAttacker) != 0)
     {
         sprite->pos1.x -= gBattleAnimArgs[0];
         sprite->pos1.y += gBattleAnimArgs[1];
@@ -122,7 +122,7 @@ void sub_80CC82C(struct Sprite* sprite)
 
 void sub_80CC884(struct Sprite* sprite)
 {
-    if (GetBattlerSide(gAnimBankAttacker) == 0)
+    if (GetBattlerSide(gBattleAnimAttacker) == 0)
         StartSpriteAnim(sprite, 1);
 
     sprite->callback = sub_80CC810;
diff --git a/src/battle/anim/wisp_fire.c b/src/battle/anim/wisp_fire.c
index afcfaa832..6914afdd4 100644
--- a/src/battle/anim/wisp_fire.c
+++ b/src/battle/anim/wisp_fire.c
@@ -7,8 +7,8 @@
 #include "trig.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankTarget;
-extern u8 gAnimBankAttacker;
+extern u8 gBattleAnimTarget;
+extern u8 gBattleAnimAttacker;
 extern u8 gBankSpriteIds[];
 
 void sub_80D5CC0(struct Sprite *sprite);
@@ -68,9 +68,9 @@ void sub_80D5CC0(struct Sprite *sprite)
     if (gMain.inBattle)
     {
         if (sprite->data[1] < 64 || sprite->data[1] > 195)
-            sprite->oam.priority = sub_8079ED4(gAnimBankTarget);
+            sprite->oam.priority = sub_8079ED4(gBattleAnimTarget);
         else
-            sprite->oam.priority = sub_8079ED4(gAnimBankTarget) + 1;
+            sprite->oam.priority = sub_8079ED4(gBattleAnimTarget) + 1;
     }
     else
     {
@@ -91,8 +91,8 @@ void sub_80D5DDC(u8 taskId)
 {
     struct Task *task = &gTasks[taskId];
 
-    task->data[12] = !GetBattlerSide(gAnimBankAttacker) ? 1 : -1;
-    task->data[13] = IsAnimBankSpriteVisible(gAnimBankTarget ^ 2) + 1;
+    task->data[12] = !GetBattlerSide(gBattleAnimAttacker) ? 1 : -1;
+    task->data[13] = IsAnimBankSpriteVisible(gBattleAnimTarget ^ 2) + 1;
     task->data[14] = GetAnimBattlerSpriteId(1);
     task->data[15] = GetAnimBattlerSpriteId(3);
 
@@ -211,7 +211,7 @@ void sub_80D60B4(u8 taskId)
     }
     gTasks[taskId].data[0]++;
 
-    spriteId = gBankSpriteIds[gAnimBankTarget];
+    spriteId = gBankSpriteIds[gBattleAnimTarget];
 
     if (!gTasks[taskId].data[4])
         unk = gUnknown_083D9794[gTasks[taskId].data[0] % 10];
diff --git a/src/battle/anim/wisp_orb.c b/src/battle/anim/wisp_orb.c
index 891d86ee1..dd04e258c 100644
--- a/src/battle/anim/wisp_orb.c
+++ b/src/battle/anim/wisp_orb.c
@@ -6,8 +6,8 @@
 #include "trig.h"
 
 extern s16 gBattleAnimArgs[8];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 extern u16 gBattleTypeFlags;
 extern u8 gUnknown_0202F7D2;
 
@@ -72,7 +72,7 @@ void sub_80D5B0C(struct Sprite *sprite)
         StartSpriteAnim(sprite, gBattleAnimArgs[2]);
         sprite->data[7] = gBattleAnimArgs[2];
 
-        if (GetBattlerSide(gAnimBankAttacker) != 0)
+        if (GetBattlerSide(gBattleAnimAttacker) != 0)
         {
             sprite->data[4] = 4;
         }
@@ -81,12 +81,12 @@ void sub_80D5B0C(struct Sprite *sprite)
             sprite->data[4] = -4;
         }
 
-        sprite->oam.priority = sub_8079ED4(gAnimBankTarget);
+        sprite->oam.priority = sub_8079ED4(gBattleAnimTarget);
         sprite->data[0]++;
         break;
     case 1:
         sprite->data[1] += 192;
-        if (GetBattlerSide(gAnimBankAttacker) != 0)
+        if (GetBattlerSide(gBattleAnimAttacker) != 0)
         {
             sprite->pos2.y = -(sprite->data[1] >> 8);
         }
@@ -117,9 +117,9 @@ void sub_80D5B0C(struct Sprite *sprite)
 
             sprite->data[0] = 256;
             sprite->data[1] = sprite->pos1.x;
-            sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2);
+            sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
             sprite->data[3] = sprite->pos1.y;
-            sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3);
+            sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
 
             sub_8078BD4(sprite);
             sprite->callback = sub_80D5C5C;
diff --git a/src/battle/anim/withdraw.c b/src/battle/anim/withdraw.c
index baf5d9b94..a1de45d15 100644
--- a/src/battle/anim/withdraw.c
+++ b/src/battle/anim/withdraw.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 extern u8 gBankSpriteIds[];
 
@@ -17,15 +17,15 @@ static void sub_80CF514(u8 taskId);
 
 void sub_80CF4D8(u8 taskId)
 {
-    sub_8078E70(gBankSpriteIds[gAnimBankAttacker], 0);
+    sub_8078E70(gBankSpriteIds[gBattleAnimAttacker], 0);
     gTasks[taskId].func = sub_80CF514;
 }
 
 void sub_80CF514(u8 taskId)
 {
-    u8 a = gBankSpriteIds[gAnimBankAttacker];
+    u8 a = gBankSpriteIds[gBattleAnimAttacker];
     s16 b;
-    if (GetBattlerSide(gAnimBankAttacker) == 0)
+    if (GetBattlerSide(gBattleAnimAttacker) == 0)
     {
         b = -gTasks[taskId].data[0];
     }
diff --git a/src/battle/battle_7.c b/src/battle/battle_7.c
index 87a0f0309..6e1ddceaf 100644
--- a/src/battle/battle_7.c
+++ b/src/battle/battle_7.c
@@ -42,8 +42,8 @@ extern struct MusicPlayerInfo gMPlay_BGM;
 extern u32 gBitTable[];
 extern u16 gBattleTypeFlags;
 extern u8 gBattleMonForms[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 extern void (*gAnimScriptCallback)(void);
 extern u8 gAnimScriptActive;
 extern const u8 *const gBattleAnims_General[];
@@ -204,8 +204,8 @@ bool8 move_anim_start_t3(u8 a, u8 b, u8 c, u8 d, u16 e)
         sub_80324E0(a);
         return TRUE;
     }
-    gAnimBankAttacker = b;
-    gAnimBankTarget = c;
+    gBattleAnimAttacker = b;
+    gBattleAnimTarget = c;
     ewram17840.unk0 = e;
     LaunchBattleAnimation(gBattleAnims_General, d, 0);
     taskId = CreateTask(sub_80315E8, 10);
@@ -244,8 +244,8 @@ void move_anim_start_t4(u8 a, u8 b, u8 c, u8 d)
 {
     u8 taskId;
 
-    gAnimBankAttacker = b;
-    gAnimBankTarget = c;
+    gBattleAnimAttacker = b;
+    gBattleAnimTarget = c;
     LaunchBattleAnimation(gBattleAnims_Special, d, 0);
     taskId = CreateTask(sub_80316CC, 10);
     gTasks[taskId].data[0] = a;
diff --git a/src/battle/battle_anim.c b/src/battle/battle_anim.c
index 376de416a..48852e627 100644
--- a/src/battle/battle_anim.c
+++ b/src/battle/battle_anim.c
@@ -1304,8 +1304,8 @@ EWRAM_DATA u8 gMonAnimTaskIdArray[2] = {0};
 EWRAM_DATA u8 gAnimMoveTurn = 0;
 EWRAM_DATA u8 sAnimBackgroundFadeState = 0;
 EWRAM_DATA u16 sAnimMoveIndex = 0; // set but unused.
-EWRAM_DATA u8 gAnimBankAttacker = 0;
-EWRAM_DATA u8 gAnimBankTarget = 0;
+EWRAM_DATA u8 gBattleAnimAttacker = 0;
+EWRAM_DATA u8 gBattleAnimTarget = 0;
 EWRAM_DATA u16 gAnimSpeciesByBanks[4] = {0};
 EWRAM_DATA u8 gUnknown_0202F7D2 = 0; // some global pan variable
 
@@ -1457,15 +1457,15 @@ void ClearBattleAnimationVars(void)
     gAnimMoveTurn = 0;
     sAnimBackgroundFadeState = 0;
     sAnimMoveIndex = 0;
-    gAnimBankAttacker = 0;
-    gAnimBankTarget = 0;
+    gBattleAnimAttacker = 0;
+    gBattleAnimTarget = 0;
     gUnknown_0202F7D2 = 0;
 }
 
 void DoMoveAnim(u16 move)
 {
-    gAnimBankAttacker = gBankAttacker;
-    gAnimBankTarget = gBankTarget;
+    gBattleAnimAttacker = gBankAttacker;
+    gBattleAnimTarget = gBankTarget;
     LaunchBattleAnimation(gBattleAnims_Moves, move, TRUE);
 }
 
@@ -1660,7 +1660,7 @@ static void ScriptCmd_createsprite(void)
         else
             argVar *= -1;
 
-        subpriority = GetBattlerSubpriority(gAnimBankTarget) + (s8)(argVar);
+        subpriority = GetBattlerSubpriority(gBattleAnimTarget) + (s8)(argVar);
     }
     else
     {
@@ -1669,13 +1669,13 @@ static void ScriptCmd_createsprite(void)
         else
             argVar *= -1;
 
-        subpriority = GetBattlerSubpriority(gAnimBankAttacker) + (s8)(argVar);
+        subpriority = GetBattlerSubpriority(gBattleAnimAttacker) + (s8)(argVar);
     }
 
     if (subpriority < 3)
         subpriority = 3;
 
-    CreateSpriteAndAnimate(template, GetBattlerSpriteCoord(gAnimBankTarget, 2), GetBattlerSpriteCoord(gAnimBankTarget, 3), subpriority);
+    CreateSpriteAndAnimate(template, GetBattlerSpriteCoord(gBattleAnimTarget, 2), GetBattlerSpriteCoord(gBattleAnimTarget, 3), subpriority);
     gAnimVisualTaskCount++;
 }
 
@@ -1830,9 +1830,9 @@ static void ScriptCmd_monbg(void)
         animBank = ANIM_BANK_DEF_PARTNER;
 
     if (animBank == ANIM_BANK_ATTACKER || animBank == ANIM_BANK_ATK_PARTNER)
-        bank = gAnimBankAttacker;
+        bank = gBattleAnimAttacker;
     else
-        bank = gAnimBankTarget;
+        bank = gBattleAnimTarget;
 
     if (IsAnimBankSpriteVisible(bank))
     {
@@ -1903,7 +1903,7 @@ bool8 IsAnimBankSpriteVisible(u8 bank)
 {
     if (IsContest())
     {
-        if (bank == gAnimBankAttacker)
+        if (bank == gBattleAnimAttacker)
             return TRUE;
         else
             return FALSE;
@@ -2101,9 +2101,9 @@ static void ScriptCmd_clearmonbg(void)
         animBankId = ANIM_BANK_DEF_PARTNER;
 
     if (animBankId == ANIM_BANK_ATTACKER || animBankId == ANIM_BANK_ATK_PARTNER)
-        bank = gAnimBankAttacker;
+        bank = gBattleAnimAttacker;
     else
-        bank = gAnimBankTarget;
+        bank = gBattleAnimTarget;
 
     if (gMonAnimTaskIdArray[0] != 0xFF)
         gSprites[gBankSpriteIds[bank]].invisible = FALSE;
@@ -2164,9 +2164,9 @@ static void ScriptCmd_monbg_22(void)
         animBankId = ANIM_BANK_DEF_PARTNER;
 
     if (animBankId == ANIM_BANK_ATTACKER || animBankId == ANIM_BANK_ATK_PARTNER)
-        bank = gAnimBankAttacker;
+        bank = gBattleAnimAttacker;
     else
-        bank = gAnimBankTarget;
+        bank = gBattleAnimTarget;
 
     if (IsAnimBankSpriteVisible(bank))
     {
@@ -2210,9 +2210,9 @@ static void ScriptCmd_clearmonbg_23(void)
         animBankId = ANIM_BANK_DEF_PARTNER;
 
     if (animBankId == ANIM_BANK_ATTACKER || animBankId == ANIM_BANK_ATK_PARTNER)
-        bank = gAnimBankAttacker;
+        bank = gBattleAnimAttacker;
     else
-        bank = gAnimBankTarget;
+        bank = gBattleAnimTarget;
 
     if (IsAnimBankSpriteVisible(bank))
         gSprites[gBankSpriteIds[bank]].invisible = FALSE;
@@ -2400,7 +2400,7 @@ static void ScriptCmd_fadetobgfromset(void)
 
     if (IsContest())
         gTasks[taskId].tBackgroundId = bg3;
-    else if (GetBattlerSide(gAnimBankTarget) == 0)
+    else if (GetBattlerSide(gBattleAnimTarget) == 0)
         gTasks[taskId].tBackgroundId = bg2;
     else
         gTasks[taskId].tBackgroundId = bg1;
@@ -2528,16 +2528,16 @@ static void ScriptCmd_changebg(void)
 /*
 s8 BattleAnimAdjustPanning(s8 a)
 {
-    if (!IsContest() && (EWRAM_17810[gAnimBankAttacker].unk0 & 0x10))
+    if (!IsContest() && (EWRAM_17810[gBattleAnimAttacker].unk0 & 0x10))
     {
-        a = GetBattlerSide(gAnimBankAttacker) ? SOUND_PAN_ATTACKER : SOUND_PAN_TARGET;
+        a = GetBattlerSide(gBattleAnimAttacker) ? SOUND_PAN_ATTACKER : SOUND_PAN_TARGET;
     }
     //_08076FDC
     else
     {
         if (IsContest())
         {
-            if (gAnimBankAttacker == gAnimBankTarget && gAnimBankAttacker == 2
+            if (gBattleAnimAttacker == gBattleAnimTarget && gBattleAnimAttacker == 2
              && a == SOUND_PAN_TARGET)
             {
                 //jump to _0807707A
@@ -2549,9 +2549,9 @@ s8 BattleAnimAdjustPanning(s8 a)
         //_08077004
         else
         {
-            if (GetBattlerSide(gAnimBankAttacker) == 0)
+            if (GetBattlerSide(gBattleAnimAttacker) == 0)
             {
-                if (GetBattlerSide(gAnimBankTarget) == 0)
+                if (GetBattlerSide(gBattleAnimTarget) == 0)
             }
             //_08077042
             else
@@ -2575,7 +2575,7 @@ s8 BattleAnimAdjustPanning(s8 a)
     lsls r0, 24\n\
     cmp r0, 0\n\
     bne _08076FDC\n\
-    ldr r0, _08076FD4 @ =gAnimBankAttacker\n\
+    ldr r0, _08076FD4 @ =gBattleAnimAttacker\n\
     ldrb r2, [r0]\n\
     lsls r0, r2, 1\n\
     adds r0, r2\n\
@@ -2596,15 +2596,15 @@ s8 BattleAnimAdjustPanning(s8 a)
     movs r4, 0x3F\n\
     b _0807706E\n\
     .align 2, 0\n\
-_08076FD4: .4byte gAnimBankAttacker\n\
+_08076FD4: .4byte gBattleAnimAttacker\n\
 _08076FD8: .4byte gSharedMem + 0x17810\n\
 _08076FDC:\n\
     bl IsContest\n\
     lsls r0, 24\n\
     cmp r0, 0\n\
     beq _08077004\n\
-    ldr r0, _08076FFC @ =gAnimBankAttacker\n\
-    ldr r1, _08077000 @ =gAnimBankTarget\n\
+    ldr r0, _08076FFC @ =gBattleAnimAttacker\n\
+    ldr r1, _08077000 @ =gBattleAnimTarget\n\
     ldrb r0, [r0]\n\
     ldrb r1, [r1]\n\
     cmp r0, r1\n\
@@ -2615,16 +2615,16 @@ _08076FDC:\n\
     beq _0807707A\n\
     b _08077068\n\
     .align 2, 0\n\
-_08076FFC: .4byte gAnimBankAttacker\n\
-_08077000: .4byte gAnimBankTarget\n\
+_08076FFC: .4byte gBattleAnimAttacker\n\
+_08077000: .4byte gBattleAnimTarget\n\
 _08077004:\n\
-    ldr r0, _0807702C @ =gAnimBankAttacker\n\
+    ldr r0, _0807702C @ =gBattleAnimAttacker\n\
     ldrb r0, [r0]\n\
     bl GetBattlerSide\n\
     lsls r0, 24\n\
     cmp r0, 0\n\
     bne _08077042\n\
-    ldr r0, _08077030 @ =gAnimBankTarget\n\
+    ldr r0, _08077030 @ =gBattleAnimTarget\n\
     ldrb r0, [r0]\n\
     bl GetBattlerSide\n\
     lsls r0, 24\n\
@@ -2637,8 +2637,8 @@ _08077004:\n\
     movs r4, 0xC0\n\
     b _0807706E\n\
     .align 2, 0\n\
-_0807702C: .4byte gAnimBankAttacker\n\
-_08077030: .4byte gAnimBankTarget\n\
+_0807702C: .4byte gBattleAnimAttacker\n\
+_08077030: .4byte gBattleAnimTarget\n\
 _08077034:\n\
     movs r0, 0x40\n\
     negs r0, r0\n\
@@ -2648,7 +2648,7 @@ _08077034:\n\
     lsls r0, 24\n\
     b _0807706C\n\
 _08077042:\n\
-    ldr r0, _08077064 @ =gAnimBankTarget\n\
+    ldr r0, _08077064 @ =gBattleAnimTarget\n\
     ldrb r0, [r0]\n\
     bl GetBattlerSide\n\
     lsls r0, 24\n\
@@ -2664,7 +2664,7 @@ _08077042:\n\
     movs r4, 0x3F\n\
     b _0807706E\n\
     .align 2, 0\n\
-_08077064: .4byte gAnimBankTarget\n\
+_08077064: .4byte gBattleAnimTarget\n\
 _08077068:\n\
     lsls r0, r4, 24\n\
     negs r0, r0\n\
@@ -2696,16 +2696,16 @@ _08077088:\n\
 
 s8 BattleAnimAdjustPanning2(s8 pan)
 {
-    if (!IsContest() && (EWRAM_17810[gAnimBankAttacker].unk0 & 0x10))
+    if (!IsContest() && (EWRAM_17810[gBattleAnimAttacker].unk0 & 0x10))
     {
-        if (GetBattlerSide(gAnimBankAttacker) != 0)
+        if (GetBattlerSide(gBattleAnimAttacker) != 0)
             pan = SOUND_PAN_TARGET;
         else
             pan = SOUND_PAN_ATTACKER;
     }
     else
     {
-        if (GetBattlerSide(gAnimBankAttacker) != 0 || IsContest() != 0)
+        if (GetBattlerSide(gBattleAnimAttacker) != 0 || IsContest() != 0)
             pan = -pan;
     }
     return pan;
@@ -3094,9 +3094,9 @@ static void ScriptCmd_monbgprio_28(void)
     sBattleAnimScriptPtr += 2;
 
     if (wantedBank != 0)
-        bank = gAnimBankTarget;
+        bank = gBattleAnimTarget;
     else
-        bank = gAnimBankAttacker;
+        bank = gBattleAnimAttacker;
 
     bankIdentity = GetBattlerPosition(bank);
     if (!IsContest() && (bankIdentity == 0 || bankIdentity == 3))
@@ -3124,12 +3124,12 @@ static void ScriptCmd_monbgprio_2A(void)
 
     wantedBank = T1_READ_8(sBattleAnimScriptPtr + 1);
     sBattleAnimScriptPtr += 2;
-    if (GetBattlerSide(gAnimBankAttacker) != GetBattlerSide(gAnimBankTarget))
+    if (GetBattlerSide(gBattleAnimAttacker) != GetBattlerSide(gBattleAnimTarget))
     {
         if (wantedBank != 0)
-            bank = gAnimBankTarget;
+            bank = gBattleAnimTarget;
         else
-            bank = gAnimBankAttacker;
+            bank = gBattleAnimAttacker;
         bankIdentity = GetBattlerPosition(bank);
         if (!IsContest() && (bankIdentity == 0 || bankIdentity == 3))
         {
@@ -3174,16 +3174,16 @@ static void ScriptCmd_doublebattle_2D(void)
     wantedBank = T1_READ_8(sBattleAnimScriptPtr + 1);
     sBattleAnimScriptPtr += 2;
     if (!IsContest() && IsDoubleBattle()
-     && GetBattlerSide(gAnimBankAttacker) == GetBattlerSide(gAnimBankTarget))
+     && GetBattlerSide(gBattleAnimAttacker) == GetBattlerSide(gBattleAnimTarget))
     {
         if (wantedBank == 0)
         {
-            r4 = GetBattlerPosition_permutated(gAnimBankAttacker);
+            r4 = GetBattlerPosition_permutated(gBattleAnimAttacker);
             spriteId = GetAnimBattlerSpriteId(0);
         }
         else
         {
-            r4 = GetBattlerPosition_permutated(gAnimBankTarget);
+            r4 = GetBattlerPosition_permutated(gBattleAnimTarget);
             spriteId = GetAnimBattlerSpriteId(1);
         }
         if (spriteId != 0xFF)
@@ -3208,16 +3208,16 @@ static void ScriptCmd_doublebattle_2E(void)
     wantedBank = T1_READ_8(sBattleAnimScriptPtr  + 1);
     sBattleAnimScriptPtr += 2;
     if (!IsContest() && IsDoubleBattle()
-     && GetBattlerSide(gAnimBankAttacker) == GetBattlerSide(gAnimBankTarget))
+     && GetBattlerSide(gBattleAnimAttacker) == GetBattlerSide(gBattleAnimTarget))
     {
         if (wantedBank == 0)
         {
-            r4 = GetBattlerPosition_permutated(gAnimBankAttacker);
+            r4 = GetBattlerPosition_permutated(gBattleAnimAttacker);
             spriteId = GetAnimBattlerSpriteId(0);
         }
         else
         {
-            r4 = GetBattlerPosition_permutated(gAnimBankTarget);
+            r4 = GetBattlerPosition_permutated(gBattleAnimTarget);
             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 5daf7bb50..90e6ce38c 100644
--- a/src/battle/battle_anim_807B69C.c
+++ b/src/battle/battle_anim_807B69C.c
@@ -9,12 +9,12 @@
 #include "trig.h"
 #include "ewram.h"
 
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 extern bool8 gAnimScriptActive;
 extern void (*gAnimScriptCallback)(void);
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimTarget;
 extern u8 gBankSpriteIds[];
 extern const struct CompressedSpriteSheet gBattleAnimPicTable[];
 extern const struct CompressedSpritePalette gBattleAnimPaletteTable[];
@@ -180,8 +180,8 @@ static void sub_807B8A4(struct Sprite *sprite)
 
 void sub_807B920(u8 taskId)
 {
-    s16 x = GetBattlerSpriteCoord(gAnimBankTarget, 2) - 32;
-    s16 y = GetBattlerSpriteCoord(gAnimBankTarget, 3) - 36;
+    s16 x = GetBattlerSpriteCoord(gBattleAnimTarget, 2) - 32;
+    s16 y = GetBattlerSpriteCoord(gBattleAnimTarget, 3) - 36;
     u8 spriteId;
 
     if (IsContest())
@@ -336,8 +336,8 @@ void move_anim_start_t2(u8 a, u8 b)
 {
     u8 taskId;
 
-    gAnimBankAttacker = a;
-    gAnimBankTarget = a;
+    gBattleAnimAttacker = a;
+    gBattleAnimTarget = a;
     LaunchBattleAnimation(gBattleAnims_StatusConditions, b, 0);
     taskId = CreateTask(sub_807BDAC, 10);
     gTasks[taskId].data[0] = a;
diff --git a/src/battle/battle_anim_80A7E7C.c b/src/battle/battle_anim_80A7E7C.c
index 480cb3d72..7b3e197d7 100644
--- a/src/battle/battle_anim_80A7E7C.c
+++ b/src/battle/battle_anim_80A7E7C.c
@@ -13,8 +13,8 @@ extern s16 gBattleAnimArgs[8];
 extern u8 gBankSpriteIds[];
 extern s32 gAnimMoveDmg;
 extern u16 gAnimMovePower;
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 static void AnimTask_ShakeMonStep(u8 taskId);
 static void AnimTask_ShakeMon2Step(u8 taskId);
@@ -203,7 +203,7 @@ void AnimTask_ShakeMon2(u8 taskId)
     }
     else
     {
-        sprite = gBankSpriteIds[gAnimBankAttacker];
+        sprite = gBankSpriteIds[gBattleAnimAttacker];
     }
 
     if (destroy)
@@ -427,7 +427,7 @@ static void sub_80A8488(u8 taskId)
 // arg 4: speed (valid values are 0-5)
 void AnimTask_TranslateMonEllipticalRespectSide(u8 taskId)
 {
-    if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER)
+    if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
         gBattleAnimArgs[1] = -gBattleAnimArgs[1];
 
     AnimTask_TranslateMonElliptical(taskId);
@@ -440,14 +440,14 @@ void AnimTask_TranslateMonEllipticalRespectSide(u8 taskId)
 static void DoHorizontalLunge(struct Sprite *sprite)
 {
     sprite->invisible = TRUE;
-    if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER)
+    if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
         sprite->data[1] = -gBattleAnimArgs[1];
     else
         sprite->data[1] = gBattleAnimArgs[1];
 
     sprite->data[0] = gBattleAnimArgs[0];
     sprite->data[2] = 0;
-    sprite->data[3] = gBankSpriteIds[gAnimBankAttacker];
+    sprite->data[3] = gBankSpriteIds[gBattleAnimAttacker];
     sprite->data[4] = gBattleAnimArgs[0];
     StoreSpriteCallbackInData(sprite, ReverseHorizontalLungeDirection);
     sprite->callback = TranslateMonBGUntil;
@@ -498,9 +498,9 @@ static void SlideMonToOriginalPos(struct Sprite *sprite)
     int something;
     int monSpriteId;
     if (!gBattleAnimArgs[0])
-        monSpriteId = gBankSpriteIds[gAnimBankAttacker];
+        monSpriteId = gBankSpriteIds[gBattleAnimAttacker];
     else
-        monSpriteId = gBankSpriteIds[gAnimBankTarget];
+        monSpriteId = gBankSpriteIds[gBattleAnimTarget];
 
     sprite->data[0] = gBattleAnimArgs[2];
     sprite->data[1] = gSprites[monSpriteId].pos1.x + gSprites[monSpriteId].pos2.x;
@@ -567,9 +567,9 @@ static void SlideMonToOffset(struct Sprite *sprite)
     u8 battler;
     u8 monSpriteId;
     if (!gBattleAnimArgs[0])
-        battler = gAnimBankAttacker;
+        battler = gBattleAnimAttacker;
     else
-        battler = gAnimBankTarget;
+        battler = gBattleAnimTarget;
 
     monSpriteId = gBankSpriteIds[battler];
     if (GetBattlerSide(battler) != B_SIDE_PLAYER)
@@ -602,11 +602,11 @@ static void sub_80A8818(struct Sprite *sprite)
     sprite->invisible = TRUE;
     if (!gBattleAnimArgs[0])
     {
-        v1 = gAnimBankAttacker;
+        v1 = gBattleAnimAttacker;
     }
     else
     {
-        v1 = gAnimBankTarget;
+        v1 = gBattleAnimTarget;
     }
     spriteId = gBankSpriteIds[v1];
     if (GetBattlerSide(v1))
@@ -659,7 +659,7 @@ static void sub_80A88F0(struct Sprite *sprite)
 void AnimTask_WindUpLunge(u8 taskId)
 {
     s16 wavePeriod = 0x8000 / gBattleAnimArgs[3];
-    if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER)
+    if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
     {
         gBattleAnimArgs[1] = -gBattleAnimArgs[1];
         gBattleAnimArgs[5] = -gBattleAnimArgs[5];
@@ -721,27 +721,27 @@ void sub_80A8A80(u8 taskId)
         spriteId = GetAnimBattlerSpriteId(gBattleAnimArgs[0]);
         break;
     case 2:
-        if (!IsAnimBankSpriteVisible(gAnimBankAttacker ^ 2))
+        if (!IsAnimBankSpriteVisible(gBattleAnimAttacker ^ 2))
         {
             DestroyAnimVisualTask(taskId);
             return;
         }
-        spriteId = gBankSpriteIds[gAnimBankAttacker ^ 2];
+        spriteId = gBankSpriteIds[gBattleAnimAttacker ^ 2];
         break;
     case 3:
-        if (!IsAnimBankSpriteVisible(gAnimBankTarget ^ 2))
+        if (!IsAnimBankSpriteVisible(gBattleAnimTarget ^ 2))
         {
             DestroyAnimVisualTask(taskId);
             return;
         }
-        spriteId = gBankSpriteIds[gAnimBankTarget ^ 2];
+        spriteId = gBankSpriteIds[gBattleAnimTarget ^ 2];
         break;
     default:
         DestroyAnimVisualTask(taskId);
         return;
     }
     TASK.data[0] = spriteId;
-    if (GetBattlerSide(gAnimBankTarget))
+    if (GetBattlerSide(gBattleAnimTarget))
     {
         TASK.data[1] = gBattleAnimArgs[1];
     }
@@ -774,7 +774,7 @@ static void sub_80A8B3C(u8 taskId)
 void AnimTask_SwayMon(u8 taskId)
 {
     u8 spriteId;
-    if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER)
+    if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
         gBattleAnimArgs[1] = -gBattleAnimArgs[1];
 
     spriteId = GetAnimBattlerSpriteId(gBattleAnimArgs[4]);
@@ -785,9 +785,9 @@ void AnimTask_SwayMon(u8 taskId)
     TASK.data[4] = spriteId;
 
     if (gBattleAnimArgs[4] == 0)
-        TASK.data[5] = gAnimBankAttacker;
+        TASK.data[5] = gBattleAnimAttacker;
     else
-        TASK.data[5] = gAnimBankTarget;
+        TASK.data[5] = gBattleAnimTarget;
 
     TASK.data[12] = 1;
     TASK.func = AnimTask_SwayMonStep;
@@ -909,11 +909,11 @@ void sub_80A8E04(u8 taskId)
     {
         if (gBattleAnimArgs[2] == 0)
         {
-            TASK.data[7] = !GetBattlerSide(gAnimBankAttacker);
+            TASK.data[7] = !GetBattlerSide(gBattleAnimAttacker);
         }
         else
         {
-            TASK.data[7] = !GetBattlerSide(gAnimBankTarget);
+            TASK.data[7] = !GetBattlerSide(gBattleAnimTarget);
         }
     }
     if (TASK.data[7])
@@ -936,14 +936,14 @@ void sub_80A8EFC(u8 taskId)
     TASK.data[2] = gBattleAnimArgs[0];
     if (gBattleAnimArgs[2] == 0)
     {
-        if (GetBattlerSide(gAnimBankAttacker))
+        if (GetBattlerSide(gBattleAnimAttacker))
         {
             gBattleAnimArgs[1] = -gBattleAnimArgs[1];
         }
     }
     else
     {
-        if (GetBattlerSide(gAnimBankTarget))
+        if (GetBattlerSide(gBattleAnimTarget))
         {
             gBattleAnimArgs[1] = -gBattleAnimArgs[1];
         }
diff --git a/src/battle/battle_anim_812C144.c b/src/battle/battle_anim_812C144.c
index acf8f7749..0581cb855 100644
--- a/src/battle/battle_anim_812C144.c
+++ b/src/battle/battle_anim_812C144.c
@@ -16,8 +16,8 @@
 #include "constants/species.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 extern u8 gAnimVisualTaskCount;
 extern u8 gAnimFriendship;
 extern s32 gAnimMoveDmg;
@@ -1205,8 +1205,8 @@ static void sub_812C184(struct Sprite *sprite)
 void sub_812C1D0(u8 taskId)
 {
     sub_8046234(
-        GetBattlerSpriteCoord(gAnimBankTarget, 2) + 8,
-        GetBattlerSpriteCoord(gAnimBankTarget, 3) + 8,
+        GetBattlerSpriteCoord(gBattleAnimTarget, 2) + 8,
+        GetBattlerSpriteCoord(gBattleAnimTarget, 3) + 8,
         0);
     DestroyAnimVisualTask(taskId);
 
@@ -1242,8 +1242,8 @@ static void sub_812C2A4(struct Sprite *sprite)
 static void sub_812C2BC(struct Sprite *sprite)
 {
     u16 rotation;
-    u8 x = GetBattlerSpriteCoord(gAnimBankTarget, 2);
-    u8 y = GetBattlerSpriteCoord(gAnimBankTarget, 3);
+    u8 x = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
+    u8 y = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
 
     sub_8078764(sprite, TRUE);
 
@@ -1427,9 +1427,9 @@ static void sub_812C720(struct Sprite *sprite)
     u16 y;
 
     InitAnimSpritePos(sprite, 1);
-    SetAverageBattlerPositions(gAnimBankTarget, 0, &x, &y);
+    SetAverageBattlerPositions(gBattleAnimTarget, 0, &x, &y);
 
-    if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER)
+    if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
         gBattleAnimArgs[2] = -gBattleAnimArgs[2];
 
     sprite->data[0] = gBattleAnimArgs[4];
@@ -1482,7 +1482,7 @@ static void sub_812C848(struct Sprite *sprite)
 
         if (!IsContest())
         {
-            if (GetBattlerSide(gAnimBankAttacker) == B_SIDE_PLAYER)
+            if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER)
             {
                 sprite->data[1] = gBattleAnimArgs[2];
                 sprite->data[2] = gBattleAnimArgs[3];
@@ -1522,7 +1522,7 @@ static void sub_812C908(struct Sprite *sprite)
 
 void sub_812C924(u8 taskId)
 {
-    if (GetBattlerSide(gAnimBankTarget) == B_SIDE_OPPONENT)
+    if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_OPPONENT)
         gBattleAnimArgs[7] = 0;
     else
         gBattleAnimArgs[7] = 1;
@@ -1609,8 +1609,8 @@ static void sub_812CAFC(struct Sprite *sprite)
 {
     if (gBattleAnimArgs[3] == 0)
     {
-        sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 0);
-        sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 1);
+        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0);
+        sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1);
     }
 
     sprite->pos1.x += gBattleAnimArgs[0];
@@ -1704,13 +1704,13 @@ static void sub_812CCE8(struct Sprite *sprite)
     int var0;
     if (gBattleAnimArgs[0] == 0)
     {
-        sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 0) + gBattleAnimArgs[1];
-        sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 1);
+        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0) + gBattleAnimArgs[1];
+        sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1);
     }
     else
     {
-        sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 0) + gBattleAnimArgs[1];
-        sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 1);
+        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 0) + gBattleAnimArgs[1];
+        sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 1);
     }
 
     sprite->pos2.y = gBattleAnimArgs[2];
@@ -1757,13 +1757,13 @@ void sub_812CDC8(u8 taskId)
 
     if (gBattleAnimArgs[0] == 0)
     {
-        var0 = sub_8077FC0(gAnimBankAttacker);
-        toBG2 = GetBattlerPosition_permutated(gAnimBankAttacker);
+        var0 = sub_8077FC0(gBattleAnimAttacker);
+        toBG2 = GetBattlerPosition_permutated(gBattleAnimAttacker);
     }
     else
     {
-        var0 = sub_8077FC0(gAnimBankTarget);
-        toBG2 = GetBattlerPosition_permutated(gAnimBankTarget);
+        var0 = sub_8077FC0(gBattleAnimTarget);
+        toBG2 = GetBattlerPosition_permutated(gBattleAnimTarget);
     }
 
     task->data[0] = var0 + 36;
@@ -1893,8 +1893,8 @@ void sub_812D008(u8 taskId)
 
     task->data[0] = 0;
     task->data[1] = 0;
-    task->data[2] = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
-    task->data[3] = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
+    task->data[2] = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
+    task->data[3] = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
     task->data[4] = 32;
     task->data[5] = -20;
     task->data[6] = 0;
@@ -2036,8 +2036,8 @@ static void sub_812D294(struct Sprite *sprite)
         sprite->pos2.x = 0;
         sprite->pos2.y = 0;
         sprite->data[0] = 20;
-        sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2);
-        sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3);
+        sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
+        sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
         sprite->callback = StartAnimLinearTranslation;
     }
 }
@@ -2064,8 +2064,8 @@ static void sub_812D3AC(struct Sprite *sprite)
     switch (sprite->data[0])
     {
     case 0:
-        sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
-        sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
+        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
+        sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
         sub_8078E70(spriteId, 0);
         sprite->data[1] = 256;
         sprite->data[2] = 256;
@@ -2102,7 +2102,7 @@ static void sub_812D3AC(struct Sprite *sprite)
 
 static void sub_812D4B4(struct Sprite *sprite)
 {
-    if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER)
+    if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
         sprite->pos1.x = -16;
     else
         sprite->pos1.x = 256;
@@ -2116,7 +2116,7 @@ static void sub_812D4EC(struct Sprite *sprite)
     u32 newX;
 
     sprite->data[0] += 72;
-    if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER)
+    if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
         sprite->pos2.x = sprite->data[0] >> 4;
     else
         sprite->pos2.x = -(sprite->data[0] >> 4);
@@ -2220,7 +2220,7 @@ static void sub_812D724(struct Sprite *sprite)
     case 0:
         InitAnimSpritePos(sprite, 0);
         sprite->data[1] = 0x900;
-        sprite->data[2] = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
+        sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
         sprite->data[0]++;
         break;
     case 1:
@@ -2261,7 +2261,7 @@ void sub_812D7E8(u8 taskId)
     {
     case 0:
         REG_MOSAIC = 0;
-        if (GetBattlerPosition_permutated(gAnimBankAttacker) == 1)
+        if (GetBattlerPosition_permutated(gBattleAnimAttacker) == 1)
             REG_BG1CNT_BITFIELD.mosaic = 1;
         else
             REG_BG2CNT_BITFIELD.mosaic = 1;
@@ -2281,15 +2281,15 @@ void sub_812D7E8(u8 taskId)
         }
         break;
     case 2:
-        sub_8031FC4(gAnimBankAttacker, gAnimBankTarget, gTasks[taskId].data[10]);
-        sub_8078954(&subStruct, gAnimBankAttacker);
+        sub_8031FC4(gBattleAnimAttacker, gBattleAnimTarget, gTasks[taskId].data[10]);
+        sub_8078954(&subStruct, gBattleAnimAttacker);
 
         if (IsContest())
             position = 0;
         else
-            position = GetBattlerPosition(gAnimBankAttacker);
+            position = GetBattlerPosition(gBattleAnimAttacker);
 
-        dest = gUnknown_081FAF4C[position] + (gBattleMonForms[gAnimBankAttacker] << 11);
+        dest = gUnknown_081FAF4C[position] + (gBattleMonForms[gBattleAnimAttacker] << 11);
         src = subStruct.field_0;
         DmaCopy32(3, dest, src, 0x800);
 
@@ -2319,11 +2319,11 @@ void sub_812D7E8(u8 taskId)
 
             ptr = EWRAM_19348;
             if (IsSpeciesNotUnown(ptr[1]))
-                gSprites[gBankSpriteIds[gAnimBankAttacker]].affineAnims = gSpriteAffineAnimTable_81E7C18;
+                gSprites[gBankSpriteIds[gBattleAnimAttacker]].affineAnims = gSpriteAffineAnimTable_81E7C18;
             else
-                gSprites[gBankSpriteIds[gAnimBankAttacker]].affineAnims = gSpriteAffineAnimTable_81E7BEC;
+                gSprites[gBankSpriteIds[gBattleAnimAttacker]].affineAnims = gSpriteAffineAnimTable_81E7BEC;
 
-            StartSpriteAffineAnim(&gSprites[gBankSpriteIds[gAnimBankAttacker]], 0);
+            StartSpriteAffineAnim(&gSprites[gBankSpriteIds[gBattleAnimAttacker]], 0);
         }
 
         gTasks[taskId].data[0]++;
@@ -2342,17 +2342,17 @@ void sub_812D7E8(u8 taskId)
         break;
     case 4:
         REG_MOSAIC = 0;
-        if (GetBattlerPosition_permutated(gAnimBankAttacker) == 1)
+        if (GetBattlerPosition_permutated(gBattleAnimAttacker) == 1)
             REG_BG1CNT_BITFIELD.mosaic = 0;
         else
             REG_BG2CNT_BITFIELD.mosaic = 0;
 
         if (!IsContest())
         {
-            if (GetBattlerSide(gAnimBankAttacker) == B_SIDE_OPPONENT)
+            if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT)
             {
                 if (gTasks[taskId].data[10] == 0)
-                    sub_8032984(gAnimBankAttacker, eTransformStatuses[gAnimBankAttacker].species);
+                    sub_8032984(gBattleAnimAttacker, eTransformStatuses[gBattleAnimAttacker].species);
             }
         }
 
@@ -2363,13 +2363,13 @@ void sub_812D7E8(u8 taskId)
 
 void c3_80DFBE4(u8 taskId)
 {
-    gBattleAnimArgs[7] = gSprites[gBankSpriteIds[gAnimBankAttacker]].invisible;
+    gBattleAnimArgs[7] = gSprites[gBankSpriteIds[gBattleAnimAttacker]].invisible;
     DestroyAnimVisualTask(taskId);
 }
 
 void sub_812DB58(u8 taskId)
 {
-    sub_8031FC4(gAnimBankAttacker, gAnimBankTarget, 1);
+    sub_8031FC4(gBattleAnimAttacker, gBattleAnimTarget, 1);
     DestroyAnimVisualTask(taskId);
 }
 
@@ -2401,7 +2401,7 @@ void sub_812DB84(u8 taskId)
         }
         else
         {
-            if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER)
+            if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
                 gBattle_BG1_X = -135;
             else
                 gBattle_BG1_X = -10;
@@ -2480,8 +2480,8 @@ static void sub_812DEAC(struct Sprite *sprite)
     if (var0 > 31)
         var0 = 32 - var0;
     
-    sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 0) + var0;
-    sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 1) + 32;
+    sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0) + var0;
+    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1) + 32;
     sprite->data[1] = gBattleAnimArgs[0];
     sprite->data[2] = gBattleAnimArgs[1];
 
@@ -2598,7 +2598,7 @@ void sub_812E14C(u8 taskId)
         }
         else
         {
-            u8 position = GetBattlerPosition(gAnimBankTarget);
+            u8 position = GetBattlerPosition(gBattleAnimTarget);
             if (IsDoubleBattle() == TRUE)
             {
                 if (position == B_POSITION_OPPONENT_LEFT)
@@ -2627,7 +2627,7 @@ void sub_812E14C(u8 taskId)
         break;
     case 1:
         gTasks[taskId].data[3] = 0;
-        if (GetBattlerSide(gAnimBankTarget) == B_SIDE_OPPONENT)
+        if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_OPPONENT)
             gBattle_BG1_X = gTasks[taskId].data[10] + gUnknown_08402604[gTasks[taskId].data[2]];
         else
             gBattle_BG1_X = gTasks[taskId].data[10] - gUnknown_08402604[gTasks[taskId].data[2]];
@@ -2702,7 +2702,7 @@ static void sub_812E4F0(struct Sprite *sprite)
         sprite->data[1] += 160;
         sprite->data[2] += 128;
 
-        if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER)
+        if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
             sprite->pos2.x = -(sprite->data[1] >> 8);
         else
             sprite->pos2.x = sprite->data[1] >> 8;
@@ -2739,9 +2739,9 @@ void sub_812E568(u8 taskId)
     task->data[15] = GetAnimBattlerSpriteId(gBattleAnimArgs[0]);
 
     if (gBattleAnimArgs[0] == 0)
-        side = GetBattlerSide(gAnimBankAttacker);
+        side = GetBattlerSide(gBattleAnimAttacker);
     else
-        side = GetBattlerSide(gAnimBankTarget);
+        side = GetBattlerSide(gBattleAnimTarget);
 
     if (side == B_SIDE_OPPONENT)
     {
@@ -2809,7 +2809,7 @@ static void sub_812E638(u8 taskId)
 
 static void sub_812E7A0(struct Sprite *sprite)
 {
-    if (GetBattlerSide(gAnimBankAttacker) == B_SIDE_PLAYER)
+    if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER)
     {
         sprite->pos1.x = 0;
         sprite->pos1.y = gBattleAnimArgs[0];
@@ -2828,7 +2828,7 @@ static void sub_812E7A0(struct Sprite *sprite)
 static void sub_812E7F0(struct Sprite *sprite)
 {
     sprite->data[0] += 3;
-    if (GetBattlerSide(gAnimBankAttacker) == B_SIDE_PLAYER)
+    if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER)
     {
         sprite->pos1.x += 5;
         sprite->pos1.y -= 1;
@@ -2944,8 +2944,8 @@ static void sub_812EA4C(struct Sprite *sprite)
     {
         if (gBattleAnimArgs[2] == 0)
         {
-            sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
-            sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
+            sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
+            sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
         }
 
         sprite->pos1.x += gBattleAnimArgs[0];
@@ -2979,9 +2979,9 @@ void sub_812EB10(u8 taskId)
     if (gTasks[taskId].data[0] == 0)
     {
         if (gBattleAnimArgs[0] == 0)
-            gTasks[taskId].data[11] = gAnimBankAttacker;
+            gTasks[taskId].data[11] = gBattleAnimAttacker;
         else
-            gTasks[taskId].data[11] = gAnimBankTarget;
+            gTasks[taskId].data[11] = gBattleAnimTarget;
 
         spriteId = GetAnimBattlerSpriteId(gBattleAnimArgs[0]);
         gTasks[taskId].data[10] = spriteId;
@@ -3131,8 +3131,8 @@ static void sub_812EE00(struct Sprite *sprite)
 
 static void sub_812EEA4(struct Sprite *sprite)
 {
-    sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
-    sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
+    sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
+    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
     sprite->data[0] = gBattleAnimArgs[0];
     sprite->data[1] = gBattleAnimArgs[1];
     sprite->callback = sub_812EEEC;
@@ -3146,9 +3146,9 @@ static void sub_812EEEC(struct Sprite *sprite)
     sprite->data[1] = (sprite->data[1] + 9) & 0xFF;
 
     if ((u16)sprite->data[1] < 64 || sprite->data[1] > 195)
-        sprite->subpriority = GetBattlerSubpriority(gAnimBankAttacker) - 1;
+        sprite->subpriority = GetBattlerSubpriority(gBattleAnimAttacker) - 1;
     else
-        sprite->subpriority = GetBattlerSubpriority(gAnimBankAttacker) + 1;
+        sprite->subpriority = GetBattlerSubpriority(gBattleAnimAttacker) + 1;
 
     if (sprite->data[5] == 0)
     {
@@ -3194,21 +3194,21 @@ void sub_812EFC8(u8 taskId)
     }
     else
     {
-        if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER)
+        if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
         {
             isBackPic = 0;
-            personality = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gAnimBankTarget]], MON_DATA_PERSONALITY);
-            otId = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gAnimBankTarget]], MON_DATA_OT_ID);
-            if (eTransformStatuses[gAnimBankTarget].species == SPECIES_NONE)
+            personality = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gBattleAnimTarget]], MON_DATA_PERSONALITY);
+            otId = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gBattleAnimTarget]], MON_DATA_OT_ID);
+            if (eTransformStatuses[gBattleAnimTarget].species == SPECIES_NONE)
             {
-                if (GetBattlerSide(gAnimBankTarget) == B_SIDE_PLAYER)
-                    species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gAnimBankTarget]], MON_DATA_SPECIES);
+                if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER)
+                    species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gBattleAnimTarget]], MON_DATA_SPECIES);
                 else
-                    species = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gAnimBankTarget]], MON_DATA_SPECIES);
+                    species = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattleAnimTarget]], MON_DATA_SPECIES);
             }
             else
             {
-                species = eTransformStatuses[gAnimBankTarget].species;
+                species = eTransformStatuses[gBattleAnimTarget].species;
             }
 
             xOffset = 20;
@@ -3216,27 +3216,27 @@ void sub_812EFC8(u8 taskId)
         else
         {
             isBackPic = 1;
-            personality = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gAnimBankTarget]], MON_DATA_PERSONALITY);
-            otId = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gAnimBankTarget]], MON_DATA_OT_ID);
-            if (eTransformStatuses[gAnimBankTarget].species == SPECIES_NONE)
+            personality = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattleAnimTarget]], MON_DATA_PERSONALITY);
+            otId = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattleAnimTarget]], MON_DATA_OT_ID);
+            if (eTransformStatuses[gBattleAnimTarget].species == SPECIES_NONE)
             {
-                if (GetBattlerSide(gAnimBankTarget) == B_SIDE_PLAYER)
-                    species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gAnimBankTarget]], MON_DATA_SPECIES);
+                if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER)
+                    species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gBattleAnimTarget]], MON_DATA_SPECIES);
                 else
-                    species = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gAnimBankTarget]], MON_DATA_SPECIES);
+                    species = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattleAnimTarget]], MON_DATA_SPECIES);
             }
             else
             {
-                species = eTransformStatuses[gAnimBankTarget].species;
+                species = eTransformStatuses[gBattleAnimTarget].species;
             }
 
             xOffset = -20;
         }
     }
 
-    priority = sub_8079ED4(gAnimBankAttacker);
-    coord1 = GetBattlerSpriteCoord(gAnimBankAttacker, 0);
-    coord2 = GetBattlerSpriteCoord(gAnimBankAttacker, 1);
+    priority = sub_8079ED4(gBattleAnimAttacker);
+    coord1 = GetBattlerSpriteCoord(gBattleAnimAttacker, 0);
+    coord2 = GetBattlerSpriteCoord(gBattleAnimAttacker, 1);
     spriteId = sub_8079F44(species, isBackPic, 0, coord1 + xOffset, coord2, 5, personality, otId);
 
     gSprites[spriteId].oam.priority = priority;
@@ -3284,7 +3284,7 @@ void sub_812EFC8(u8 taskId)
     .align 2, 0\n\
 _0812F000: .4byte gSharedMem + 0x19348\n\
 _0812F004:\n\
-    ldr r0, _0812F070 @ =gAnimBankAttacker\n\
+    ldr r0, _0812F070 @ =gBattleAnimAttacker\n\
     ldrb r0, [r0]\n\
     bl GetBattlerSide\n\
     lsls r0, 24\n\
@@ -3293,7 +3293,7 @@ _0812F004:\n\
     movs r0, 0\n\
     str r0, [sp, 0x14]\n\
     ldr r6, _0812F074 @ =gBattlerPartyIndexes\n\
-    ldr r4, _0812F078 @ =gAnimBankTarget\n\
+    ldr r4, _0812F078 @ =gBattleAnimTarget\n\
     ldrb r0, [r4]\n\
     lsls r0, 1\n\
     adds r0, r6\n\
@@ -3334,9 +3334,9 @@ _0812F004:\n\
     adds r0, r7\n\
     b _0812F092\n\
     .align 2, 0\n\
-_0812F070: .4byte gAnimBankAttacker\n\
+_0812F070: .4byte gBattleAnimAttacker\n\
 _0812F074: .4byte gBattlerPartyIndexes\n\
-_0812F078: .4byte gAnimBankTarget\n\
+_0812F078: .4byte gBattleAnimTarget\n\
 _0812F07C: .4byte gPlayerParty\n\
 _0812F080: .4byte gSharedMem + 0x17800\n\
 _0812F084:\n\
@@ -3365,7 +3365,7 @@ _0812F0AC:\n\
     movs r2, 0x1\n\
     str r2, [sp, 0x14]\n\
     ldr r6, _0812F10C @ =gBattlerPartyIndexes\n\
-    ldr r4, _0812F110 @ =gAnimBankTarget\n\
+    ldr r4, _0812F110 @ =gBattleAnimTarget\n\
     ldrb r0, [r4]\n\
     lsls r0, 1\n\
     adds r0, r6\n\
@@ -3408,7 +3408,7 @@ _0812F0AC:\n\
     b _0812F12C\n\
     .align 2, 0\n\
 _0812F10C: .4byte gBattlerPartyIndexes\n\
-_0812F110: .4byte gAnimBankTarget\n\
+_0812F110: .4byte gBattleAnimTarget\n\
 _0812F114: .4byte gEnemyParty\n\
 _0812F118: .4byte gSharedMem + 0x17800\n\
 _0812F11C: .4byte gPlayerParty\n\
@@ -3432,12 +3432,12 @@ _0812F13A:\n\
 _0812F13C:\n\
     mov r10, r3\n\
 _0812F13E:\n\
-    ldr r0, _0812F21C @ =gAnimBankAttacker\n\
+    ldr r0, _0812F21C @ =gBattleAnimAttacker\n\
     ldrb r0, [r0]\n\
     bl sub_8079ED4\n\
     lsls r0, 24\n\
     lsrs r7, r0, 24\n\
-    ldr r5, _0812F21C @ =gAnimBankAttacker\n\
+    ldr r5, _0812F21C @ =gBattleAnimAttacker\n\
     ldrb r0, [r5]\n\
     movs r1, 0\n\
     bl GetBattlerSpriteCoord\n\
@@ -3538,7 +3538,7 @@ _0812F13E:\n\
     bx r0\n\
     .align 2, 0\n\
 _0812F218: .4byte 0x0000ffec\n\
-_0812F21C: .4byte gAnimBankAttacker\n\
+_0812F21C: .4byte gBattleAnimAttacker\n\
 _0812F220: .4byte gSprites\n\
 _0812F224: .4byte 0x00007fff\n\
 _0812F228: .4byte REG_BLDCNT\n\
@@ -3589,9 +3589,9 @@ void sub_812F314(u8 taskId)
     struct Task *task = &gTasks[taskId];
 
     if (gBattleAnimArgs[0] == 0)
-        battler = gAnimBankAttacker;
+        battler = gBattleAnimAttacker;
     else
-        battler = gAnimBankTarget;
+        battler = gBattleAnimTarget;
 
     task->data[0] = 0;
     task->data[1] = 0;
@@ -3849,11 +3849,11 @@ static void sub_812F948(struct Sprite *sprite)
 {
     sprite->data[0] = gBattleAnimArgs[3];
     StartSpriteAffineAnim(sprite, gBattleAnimArgs[0]);
-    if (GetBattlerSide(gAnimBankTarget) != B_SIDE_PLAYER)
+    if (GetBattlerSide(gBattleAnimTarget) != B_SIDE_PLAYER)
         gBattleAnimArgs[1] = -gBattleAnimArgs[1];
 
-    sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2) + gBattleAnimArgs[1];
-    sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3) + gBattleAnimArgs[2];
+    sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) + gBattleAnimArgs[1];
+    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) + gBattleAnimArgs[2];
     sprite->callback = sub_80DA48C;
 }
 
@@ -3962,14 +3962,14 @@ static void sub_812FAF8(u8 taskId)
 
 void sub_812FC68(u8 taskId)
 {
-    gTasks[taskId].data[15] = gBankSpriteIds[gAnimBankAttacker];
+    gTasks[taskId].data[15] = gBankSpriteIds[gBattleAnimAttacker];
     gTasks[taskId].data[14] = gBattleAnimArgs[0];
     gTasks[taskId].data[0] = gBattleAnimArgs[0];
     gTasks[taskId].data[13] = gBattleAnimArgs[6];
     if (gBattleAnimArgs[3])
         gTasks[taskId].data[6] = gTasks[taskId].data[6] | -0x8000;
 
-    if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER)
+    if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
     {
         gTasks[taskId].data[2] = gBattleAnimArgs[1];
         gTasks[taskId].data[3] = gBattleAnimArgs[2];
@@ -4007,9 +4007,9 @@ void sub_812FD7C(u8 taskId)
     task->data[2] = 0;
     task->data[3] = gBattleAnimArgs[1];
     if (gBattleAnimArgs[0] == 0)
-        battler = gAnimBankAttacker;
+        battler = gBattleAnimAttacker;
     else
-        battler = gAnimBankTarget;
+        battler = gBattleAnimTarget;
 
     task->data[4] = GetBattlerSpriteCoord(battler, 0);
     task->data[5] = GetBattlerSpriteCoord(battler, 1);
@@ -4139,7 +4139,7 @@ void sub_81300A4(u8 taskId)
         taskId,
         0,
         0x1A0,
-        gAnimBankAttacker,
+        gBattleAnimAttacker,
         gBattleAnimArgs[0],
         10,
         2,
@@ -4151,11 +4151,11 @@ void sub_81300A4(u8 taskId)
 
 static void sub_81300F4(struct Sprite *sprite)
 {
-    if (GetBattlerSide(gAnimBankAttacker) == B_SIDE_OPPONENT)
+    if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT)
         gBattleAnimArgs[0] = -gBattleAnimArgs[0];
     
-    sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 0) + gBattleAnimArgs[0];
-    sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 1) + gBattleAnimArgs[1];
+    sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0) + gBattleAnimArgs[0];
+    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1) + gBattleAnimArgs[1];
     if (gBattleAnimArgs[2] == 0)
     {
         sprite->data[0] = 640;
@@ -4173,7 +4173,7 @@ static void sub_81300F4(struct Sprite *sprite)
         sprite->data[0] = 640;
     }
 
-    if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER)
+    if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
     {
         sprite->data[0] = -sprite->data[0];
         sprite->hFlip = 1;
@@ -4209,14 +4209,14 @@ void sub_81301EC(u8 taskId)
         task->data[7] = 0;
     }
 
-    if (GetBattlerSide(gAnimBankAttacker) == B_SIDE_PLAYER)
-        task->data[11] = GetBattlerSpriteCoord(gAnimBankAttacker, 2) + sub_807A100(gAnimBankAttacker, 0) / 4;
+    if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER)
+        task->data[11] = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) + sub_807A100(gBattleAnimAttacker, 0) / 4;
     else
-        task->data[11] = GetBattlerSpriteCoord(gAnimBankAttacker, 2) - sub_807A100(gAnimBankAttacker, 0) / 4;
+        task->data[11] = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) - sub_807A100(gBattleAnimAttacker, 0) / 4;
 
-    task->data[12] = GetBattlerSpriteCoord(gAnimBankAttacker, 3) - sub_807A100(gAnimBankAttacker, 0) / 4;
-    task->data[13] = GetBattlerSpriteCoord(gAnimBankTarget, 2);
-    task->data[14] = GetBattlerSpriteCoord(gAnimBankTarget, 3);
+    task->data[12] = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) - sub_807A100(gBattleAnimAttacker, 0) / 4;
+    task->data[13] = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
+    task->data[14] = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
     task->func = sub_81302E4;
 }
 
@@ -4338,11 +4338,11 @@ void sub_8130554(u8 taskId)
 {
     struct Task *task = &gTasks[taskId];
 
-    task->data[11] = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
-    task->data[12] = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
-    task->data[13] = GetBattlerSpriteCoord(gAnimBankTarget, 2);
-    task->data[14] = GetBattlerSpriteCoord(gAnimBankTarget, 3) + sub_807A100(gAnimBankTarget, 0) / 4;
-    task->data[15] = CreateSprite(&gSpriteTemplate_84029AC, task->data[11], task->data[12], GetBattlerSubpriority(gAnimBankTarget) - 5);
+    task->data[11] = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
+    task->data[12] = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
+    task->data[13] = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
+    task->data[14] = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + sub_807A100(gBattleAnimTarget, 0) / 4;
+    task->data[15] = CreateSprite(&gSpriteTemplate_84029AC, task->data[11], task->data[12], GetBattlerSubpriority(gBattleAnimTarget) - 5);
     if (task->data[15] != MAX_SPRITES)
     {
         gSprites[task->data[15]].data[0] = 16;
@@ -4350,7 +4350,7 @@ void sub_8130554(u8 taskId)
         gSprites[task->data[15]].data[4] = task->data[14];
         gSprites[task->data[15]].data[5] = -32;
         InitAnimArcTranslation(&gSprites[task->data[15]]);
-        if (GetBattlerSide(gAnimBankAttacker) == B_SIDE_OPPONENT)
+        if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT)
             StartSpriteAffineAnim(&gSprites[task->data[15]], 1);
         
         task->func = sub_81306A4;
@@ -4409,9 +4409,9 @@ static void sub_81307B0(struct Sprite *sprite)
     u8 battler;
 
     if (gBattleAnimArgs[0] == 0)
-        battler = gAnimBankAttacker;
+        battler = gBattleAnimAttacker;
     else
-        battler = gAnimBankTarget;
+        battler = gBattleAnimTarget;
 
     sprite->oam.tileNum += 16;
     sprite->data[6] = gBattleAnimArgs[2];
@@ -4524,13 +4524,13 @@ static void sub_8130A2C(struct Sprite *sprite)
 {
     if (gBattleAnimArgs[0] == 0)
     {
-        sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
-        sprite->pos1.y = sub_807A100(gAnimBankAttacker, 2);
+        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
+        sprite->pos1.y = sub_807A100(gBattleAnimAttacker, 2);
     }
     else
     {
-        sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 2);
-        sprite->pos1.y = sub_807A100(gAnimBankTarget, 2);
+        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
+        sprite->pos1.y = sub_807A100(gBattleAnimTarget, 2);
     }
 
     if (sprite->pos1.y < 8)
@@ -4665,8 +4665,8 @@ void sub_8130D20(u8 taskId)
     {
         if (IsDoubleBattle() == TRUE)
         {
-            int x = GetBattlerSpriteCoord(gAnimBankAttacker, 0);
-            int y = GetBattlerSpriteCoord(gAnimBankAttacker ^ 2, 0);
+            int x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0);
+            int y = GetBattlerSpriteCoord(gBattleAnimAttacker ^ 2, 0);
             if (x > y)
                 task->data[14] = 1;
             else
@@ -4674,7 +4674,7 @@ void sub_8130D20(u8 taskId)
         }
         else
         {
-            if (GetBattlerSide(gAnimBankAttacker) == B_SIDE_PLAYER)
+            if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER)
                 task->data[14] = -1;
             else
                 task->data[14] = 1;
@@ -4775,11 +4775,11 @@ static void sub_8130F5C(struct Sprite *sprite)
     if (gBattleAnimArgs[0] == 0)
     {
         InitAnimSpritePos(sprite, 1);
-        sprite->data[7] = gAnimBankAttacker;
+        sprite->data[7] = gBattleAnimAttacker;
     }
     else
     {
-        sprite->data[7] = gAnimBankTarget;
+        sprite->data[7] = gBattleAnimTarget;
     }
 
     if (GetBattlerSide(sprite->data[7]) == B_SIDE_OPPONENT)
@@ -4912,10 +4912,10 @@ static void sub_81311E4(struct Sprite *sprite)
 
 static void sub_8131264(struct Sprite *sprite)
 {
-    GetBattlerSpriteCoord(gAnimBankTarget, 2); // unused local variable
-    GetBattlerSpriteCoord(gAnimBankTarget, 3); // unused local variable
+    GetBattlerSpriteCoord(gBattleAnimTarget, 2); // unused local variable
+    GetBattlerSpriteCoord(gBattleAnimTarget, 3); // unused local variable
 
-    if (GetBattlerSide(gAnimBankTarget) == B_SIDE_PLAYER || IsContest())
+    if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER || IsContest())
     {
         sprite->data[0] = sprite->pos1.x - gBattleAnimArgs[0];
         sprite->data[2] = sprite->pos1.x - gBattleAnimArgs[2];
@@ -4961,11 +4961,11 @@ void sub_81312E4(u8 taskId)
     }
     else
     {
-        refresh_graphics_maybe(gAnimBankAttacker, 0, spriteId);
+        refresh_graphics_maybe(gBattleAnimAttacker, 0, spriteId);
         if (IsContest())
         {
-            gSprites[gBankSpriteIds[gAnimBankAttacker]].affineAnims = gSpriteAffineAnimTable_81E7C18;
-            StartSpriteAffineAnim(&gSprites[gBankSpriteIds[gAnimBankAttacker]], 0);
+            gSprites[gBankSpriteIds[gBattleAnimAttacker]].affineAnims = gSpriteAffineAnimTable_81E7C18;
+            StartSpriteAffineAnim(&gSprites[gBankSpriteIds[gBattleAnimAttacker]], 0);
         }
 
         for (i = 0; i < 16; i++)
@@ -5032,18 +5032,18 @@ static void sub_8131564(struct Sprite *sprite)
 {
     s16 y2;
 
-    if (GetBattlerSide(gAnimBankTarget) == B_SIDE_PLAYER)
+    if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER)
     {
-        sprite->subpriority = GetBattlerSubpriority(gAnimBankTarget) - 2;
+        sprite->subpriority = GetBattlerSubpriority(gBattleAnimTarget) - 2;
         y2 = -144;
     }
     else
     {
-        sprite->subpriority = GetBattlerSubpriority(gAnimBankTarget) + 2;
+        sprite->subpriority = GetBattlerSubpriority(gBattleAnimTarget) + 2;
         y2 = -96;
     }
 
-    sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 3);
+    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
     sprite->pos2.y = y2;
     sprite->callback = sub_81315C8;
 }
diff --git a/src/battle/battle_anim_813F0F4.c b/src/battle/battle_anim_813F0F4.c
index 7bcae382f..ed3e6d642 100755
--- a/src/battle/battle_anim_813F0F4.c
+++ b/src/battle/battle_anim_813F0F4.c
@@ -24,8 +24,8 @@ extern u16 gUnknown_03005F10;
 extern u16 gUnknown_03005F14;
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 extern u8 gHealthboxIDs[];
 extern u8 gBankSpriteIds[];
 extern u16 gBattlerPartyIndexes[];
@@ -367,7 +367,7 @@ void unref_sub_813F0F4(u8 taskId)
     u8 battler;
     u8 spriteId1, spriteId2, spriteId3, spriteId4;
 
-    battler = gAnimBankAttacker;
+    battler = gBattleAnimAttacker;
     gBattle_WIN0H = 0;
     gBattle_WIN0V = 0;
     REG_WININ = 0x3F3F;
@@ -415,7 +415,7 @@ static void sub_813F300(u8 taskId)
     u8 spriteId1, spriteId2;
     u8 battler;
 
-    battler = gAnimBankAttacker;
+    battler = gBattleAnimAttacker;
     gTasks[taskId].data[13] += gTasks[taskId].data[1];
     gBattle_BG1_Y += (u16)gTasks[taskId].data[13] >> 8;
     gTasks[taskId].data[13] &= 0xFF;
@@ -479,7 +479,7 @@ void sub_813F4EC(u8 taskId)
     u8 paletteNum1, paletteNum2;
     u16 offset1, offset2;
 
-    healthBoxSpriteId = gHealthboxIDs[gAnimBankAttacker];
+    healthBoxSpriteId = gHealthboxIDs[gBattleAnimAttacker];
     spriteId1 = gSprites[healthBoxSpriteId].oam.affineParam;
     spriteId2 = gSprites[healthBoxSpriteId].data[5];
     paletteNum1 = AllocSpritePalette(0xD709);
@@ -502,7 +502,7 @@ void sub_813F5E8(u8 taskId)
     u8 spriteId1, spriteId2;
     u8 paletteIndex1, paletteIndex2;
 
-    healthBoxSpriteId = gHealthboxIDs[gAnimBankAttacker];
+    healthBoxSpriteId = gHealthboxIDs[gBattleAnimAttacker];
     spriteId1 = gSprites[healthBoxSpriteId].oam.affineParam;
     spriteId2 = gSprites[healthBoxSpriteId].data[5];
 
@@ -565,7 +565,7 @@ void sub_813F798(u8 taskId)
 {
     u8 spriteId;
 
-    spriteId = gBankSpriteIds[gAnimBankAttacker];
+    spriteId = gBankSpriteIds[gBattleAnimAttacker];
     switch (gTasks[taskId].data[0])
     {
     case 0:
@@ -597,23 +597,23 @@ void sub_813F844(u8 taskId)
     u8 priority, subpriority;
     u32 selectedPalettes;
 
-    spriteId = gBankSpriteIds[gAnimBankAttacker];
-    if (GetBattlerSide(gAnimBankAttacker) == B_SIDE_PLAYER)
-        ball = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gAnimBankAttacker]], MON_DATA_POKEBALL);
+    spriteId = gBankSpriteIds[gBattleAnimAttacker];
+    if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER)
+        ball = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gBattleAnimAttacker]], MON_DATA_POKEBALL);
     else
-        ball = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gAnimBankAttacker]], MON_DATA_POKEBALL);
+        ball = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattleAnimAttacker]], MON_DATA_POKEBALL);
 
     ballIndex = ball_number_to_ball_processing_index(ball);
     switch (gTasks[taskId].data[0])
     {
     case 0:
-        x = GetBattlerSpriteCoord(gAnimBankAttacker, 0);
-        y = GetBattlerSpriteCoord(gAnimBankAttacker, 1);
+        x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0);
+        y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1);
         priority = gSprites[spriteId].oam.priority;
         subpriority = gSprites[spriteId].subpriority;
         gTasks[taskId].data[10] = AnimateBallOpenParticles(x, y + 32, priority, subpriority, ballIndex);
         selectedPalettes = sub_80791A8(1, 0, 0, 0, 0, 0, 0);
-        gTasks[taskId].data[11] = sub_8141314(0, gAnimBankAttacker, selectedPalettes, ballIndex);
+        gTasks[taskId].data[11] = sub_8141314(0, gBattleAnimAttacker, selectedPalettes, ballIndex);
         gTasks[taskId].data[0]++;
         break;
     case 1:
@@ -687,10 +687,10 @@ void sub_813FA94(u8 taskId)
     ballIndex = ball_number_to_ball_processing_index(gLastUsedItem);
     spriteId = CreateSprite(&gBallSpriteTemplates[ballIndex], 32, 80, 29);
     gSprites[spriteId].data[0] = 34;
-    gSprites[spriteId].data[1] = GetBattlerSpriteCoord(gAnimBankTarget, 0);
-    gSprites[spriteId].data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 1) - 16;
+    gSprites[spriteId].data[1] = GetBattlerSpriteCoord(gBattleAnimTarget, 0);
+    gSprites[spriteId].data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 1) - 16;
     gSprites[spriteId].callback = sub_813FD90;
-    ewram17840.unk9_1 = gSprites[gBankSpriteIds[gAnimBankTarget]].invisible;
+    ewram17840.unk9_1 = gSprites[gBankSpriteIds[gBattleAnimTarget]].invisible;
     gTasks[taskId].data[0] = spriteId;
     gTasks[taskId].func = sub_813FB7C;
 }
@@ -724,8 +724,8 @@ void sub_813FBB8(u8 taskId)
     subpriority = GetBattlerSubpriority(GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT)) + 1;
     spriteId = CreateSprite(&gBallSpriteTemplates[ballIndex], x + 32, y | 80, subpriority);
     gSprites[spriteId].data[0] = 34;
-    gSprites[spriteId].data[1] = GetBattlerSpriteCoord(gAnimBankTarget, 0);
-    gSprites[spriteId].data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 1) - 16;
+    gSprites[spriteId].data[1] = GetBattlerSpriteCoord(gBattleAnimTarget, 0);
+    gSprites[spriteId].data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 1) - 16;
     gSprites[spriteId].callback = SpriteCallbackDummy;
     StartSpriteAnim(&gSprites[gBankSpriteIds[GetBattlerAtPosition(B_POSITION_PLAYER_LEFT)]], 1);
     gTasks[taskId].data[0] = spriteId;
@@ -800,7 +800,7 @@ static void sub_813FDC0(struct Sprite *sprite)
                 return;
 
             AnimateBallOpenParticles(sprite->pos1.x, sprite->pos1.y - 5, 1, 28, ballIndex);
-            sub_8141314(0, gAnimBankTarget, 14, ballIndex);
+            sub_8141314(0, gBattleAnimTarget, 14, ballIndex);
         }
     }
 }
@@ -811,7 +811,7 @@ static void sub_813FE70(struct Sprite *sprite)
     {
         sprite->data[5] = CreateTask(TaskDummy, 50);
         sprite->callback = sub_813FEC8;
-        gSprites[gBankSpriteIds[gAnimBankTarget]].data[1] = 0;
+        gSprites[gBankSpriteIds[gBattleAnimTarget]].data[1] = 0;
     }
 }
 
@@ -820,7 +820,7 @@ static void sub_813FEC8(struct Sprite *sprite)
     u8 spriteId;
     u8 taskId;
 
-    spriteId = gBankSpriteIds[gAnimBankTarget];
+    spriteId = gBankSpriteIds[gBattleAnimTarget];
     taskId = sprite->data[5];
 
     if (++gTasks[taskId].data[1] == 11)
@@ -1124,7 +1124,7 @@ static void sub_8140434(struct Sprite *sprite)
 
 static void sub_8140454(struct Sprite *sprite)
 {
-    u8 *battler = &gAnimBankTarget;
+    u8 *battler = &gBattleAnimTarget;
 
     sprite->data[4]++;
     if (sprite->data[4] == 40)
@@ -1220,13 +1220,13 @@ static void sub_81405F4(struct Sprite *sprite)
         goto LABEL;
 
     AnimateBallOpenParticles(sprite->pos1.x, sprite->pos1.y - 5, 1, 28, ballIndex);
-    sub_8141314(1, gAnimBankTarget, 14, ballIndex);
+    sub_8141314(1, gBattleAnimTarget, 14, ballIndex);
 
     LABEL:
-    gSprites[gBankSpriteIds[gAnimBankTarget]].invisible = 0;
-    StartSpriteAffineAnim(&gSprites[gBankSpriteIds[gAnimBankTarget]], 1);
-    AnimateSprite(&gSprites[gBankSpriteIds[gAnimBankTarget]]);
-    gSprites[gBankSpriteIds[gAnimBankTarget]].data[1] = 0x1000;
+    gSprites[gBankSpriteIds[gBattleAnimTarget]].invisible = 0;
+    StartSpriteAffineAnim(&gSprites[gBankSpriteIds[gBattleAnimTarget]], 1);
+    AnimateSprite(&gSprites[gBankSpriteIds[gBattleAnimTarget]]);
+    gSprites[gBankSpriteIds[gBattleAnimTarget]].data[1] = 0x1000;
 }
 
 static void sub_81406BC(struct Sprite *sprite)
@@ -1236,21 +1236,21 @@ static void sub_81406BC(struct Sprite *sprite)
     if (sprite->animEnded)
         sprite->invisible = 1;
     
-    if (gSprites[gBankSpriteIds[gAnimBankTarget]].affineAnimEnded)
+    if (gSprites[gBankSpriteIds[gBattleAnimTarget]].affineAnimEnded)
     {
-        StartSpriteAffineAnim(&gSprites[gBankSpriteIds[gAnimBankTarget]], 0);
+        StartSpriteAffineAnim(&gSprites[gBankSpriteIds[gBattleAnimTarget]], 0);
         next = TRUE;
     }
     else
     {
-        gSprites[gBankSpriteIds[gAnimBankTarget]].data[1] -= 288;
-        gSprites[gBankSpriteIds[gAnimBankTarget]].pos2.y = gSprites[gBankSpriteIds[gAnimBankTarget]].data[1] >> 8;   
+        gSprites[gBankSpriteIds[gBattleAnimTarget]].data[1] -= 288;
+        gSprites[gBankSpriteIds[gBattleAnimTarget]].pos2.y = gSprites[gBankSpriteIds[gBattleAnimTarget]].data[1] >> 8;   
     }
 
     if (sprite->animEnded && next)
     {
-        gSprites[gBankSpriteIds[gAnimBankTarget]].pos2.y = 0;
-        gSprites[gBankSpriteIds[gAnimBankTarget]].invisible = ewram17840.unk9_1;
+        gSprites[gBankSpriteIds[gBattleAnimTarget]].pos2.y = 0;
+        gSprites[gBankSpriteIds[gBattleAnimTarget]].invisible = ewram17840.unk9_1;
         sprite->data[0] = 0;
         sprite->callback = sub_81405C8;
         gDoingBattleAnim = 0;
@@ -1824,13 +1824,13 @@ void sub_814151C(u8 taskId)
     u32 done;
     
     done = FALSE;
-    spriteId = gBankSpriteIds[gAnimBankAttacker];
+    spriteId = gBankSpriteIds[gBattleAnimAttacker];
     switch (gTasks[taskId].data[10])
     {
     case 0:
         gTasks[taskId].data[11] = gBattleAnimArgs[0];
         gTasks[taskId].data[0] += 0x500;
-        if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER)
+        if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
             gSprites[spriteId].pos2.x += gTasks[taskId].data[0] >> 8;
         else
             gSprites[spriteId].pos2.x -= gTasks[taskId].data[0] >> 8;
@@ -1841,18 +1841,18 @@ void sub_814151C(u8 taskId)
             gTasks[taskId].data[10]++;
         break;
     case 1:
-        refresh_graphics_maybe(gAnimBankAttacker, gTasks[taskId].data[11], spriteId);
+        refresh_graphics_maybe(gBattleAnimAttacker, gTasks[taskId].data[11], spriteId);
         gTasks[taskId].data[10]++;
         break;
     case 2:
         gTasks[taskId].data[0] += 0x500;
-        if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER)
+        if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
             gSprites[spriteId].pos2.x -= gTasks[taskId].data[0] >> 8;
         else
             gSprites[spriteId].pos2.x += gTasks[taskId].data[0] >> 8;
 
         gTasks[taskId].data[0] &= 0xFF;
-        if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER)
+        if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
         {
             if (gSprites[spriteId].pos2.x <= 0)
             {
@@ -1886,7 +1886,7 @@ void sub_81416C4(u8 taskId)
     switch (gTasks[taskId].data[15])
     {
     case 0:
-        if (GetBattlerPosition_permutated(gAnimBankAttacker) == 1)
+        if (GetBattlerPosition_permutated(gBattleAnimAttacker) == 1)
             REG_BLDCNT = 0x3F42;
         else
             REG_BLDCNT = 0x3F44;
@@ -1905,9 +1905,9 @@ void sub_81416C4(u8 taskId)
         }
         break;
     case 2:
-        spriteId = gBankSpriteIds[gAnimBankAttacker];
+        spriteId = gBankSpriteIds[gBattleAnimAttacker];
         DmaClear32(3, (void *)OBJ_VRAM0 + gSprites[spriteId].oam.tileNum * TILE_SIZE_4BPP, 0x800);
-        sub_80324E0(gAnimBankAttacker);
+        sub_80324E0(gBattleAnimAttacker);
         DestroyAnimVisualTask(taskId);
         break;
     }
@@ -1915,13 +1915,13 @@ void sub_81416C4(u8 taskId)
 
 void sub_81417D8(u8 taskId)
 {
-    gBattleAnimArgs[7] = ewram17800[gAnimBankAttacker].substituteSprite;
+    gBattleAnimArgs[7] = ewram17800[gBattleAnimAttacker].substituteSprite;
     DestroyAnimVisualTask(taskId);
 }
 
 void sub_8141808(u8 taskId)
 {
-    gAnimBankTarget = gEffectBank;
+    gBattleAnimTarget = gEffectBank;
     DestroyAnimVisualTask(taskId);
 }
 
@@ -2107,13 +2107,13 @@ static void sub_8141C30(struct Sprite *sprite)
     sprite->data[4] = GetBattlerSpriteCoord(GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT), 1) + gBattleAnimArgs[3];
     sprite->data[5] = -32;
     InitAnimArcTranslation(sprite);
-    StartSpriteAnim(&gSprites[gBankSpriteIds[gAnimBankAttacker]], 1);
+    StartSpriteAnim(&gSprites[gBankSpriteIds[gBattleAnimAttacker]], 1);
     sprite->callback = sub_8141CBC;
 }
 
 static void sub_8141CBC(struct Sprite *sprite)
 {
-    if (gSprites[gBankSpriteIds[gAnimBankAttacker]].animCmdIndex == 1)
+    if (gSprites[gBankSpriteIds[gBattleAnimAttacker]].animCmdIndex == 1)
         sprite->callback = sub_8141CF4;
 }
 
@@ -2129,11 +2129,11 @@ static void sub_8141CF4(struct Sprite *sprite)
 
 static void sub_8141D20(struct Sprite *sprite)
 {
-    if (gSprites[gBankSpriteIds[gAnimBankAttacker]].animEnded)
+    if (gSprites[gBankSpriteIds[gBattleAnimAttacker]].animEnded)
     {
         if (++sprite->data[0] > 0)
         {
-            StartSpriteAnim(&gSprites[gBankSpriteIds[gAnimBankAttacker]], 0);
+            StartSpriteAnim(&gSprites[gBankSpriteIds[gBattleAnimAttacker]], 0);
             DestroyAnimSprite(sprite);
         }
     }
@@ -2141,8 +2141,8 @@ static void sub_8141D20(struct Sprite *sprite)
 
 void sub_8141D7C(u8 taskId)
 {
-    gAnimBankAttacker = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
-    gAnimBankTarget = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
+    gBattleAnimAttacker = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
+    gBattleAnimTarget = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
     DestroyAnimVisualTask(taskId);
 }
 
@@ -2164,7 +2164,7 @@ void sub_8141DAC(u8 taskId)
 
 void sub_8141E10(u8 taskId)
 {
-    gAnimBankAttacker = ewram17840.unk0;
-    gAnimBankTarget = ewram17840.unk0 >> 8;
+    gBattleAnimAttacker = ewram17840.unk0;
+    gBattleAnimTarget = ewram17840.unk0 >> 8;
     DestroyAnimVisualTask(taskId);
 }
diff --git a/src/rom_8077ABC.c b/src/rom_8077ABC.c
index 20ca6c592..780a37b2e 100644
--- a/src/rom_8077ABC.c
+++ b/src/rom_8077ABC.c
@@ -59,8 +59,8 @@ extern u32 gTransformPersonalities[NUM_BATTLE_SLOTS];
 extern u8 gBattleMonForms[NUM_BATTLE_SLOTS];
 extern u16 gAnimSpeciesByBanks[];
 extern u8 gBattleMonSprites[NUM_BATTLE_SLOTS];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 extern s16 gBattleAnimArgs[8];
 extern u8 gBanksBySide[NUM_BATTLE_SLOTS];
 extern u8 gBattlersCount; // gNumBattleMons?
@@ -412,10 +412,10 @@ u8 GetAnimBattlerSpriteId(u8 whichBank)
 
     if (whichBank == ANIM_BANK_ATTACKER)
     {
-        if (IsBankSpritePresent(gAnimBankAttacker))
+        if (IsBankSpritePresent(gBattleAnimAttacker))
         {
             sprites = gBattleMonSprites;
-            return sprites[gAnimBankAttacker];
+            return sprites[gBattleAnimAttacker];
         }
         else
         {
@@ -424,10 +424,10 @@ u8 GetAnimBattlerSpriteId(u8 whichBank)
     }
     else if (whichBank == ANIM_BANK_TARGET)
     {
-        if (IsBankSpritePresent(gAnimBankTarget))
+        if (IsBankSpritePresent(gBattleAnimTarget))
         {
             sprites = gBattleMonSprites;
-            return sprites[gAnimBankTarget];
+            return sprites[gBattleAnimTarget];
         }
         else
         {
@@ -436,15 +436,15 @@ u8 GetAnimBattlerSpriteId(u8 whichBank)
     }
     else if (whichBank == ANIM_BANK_ATK_PARTNER)
     {
-        if (!IsAnimBankSpriteVisible(gAnimBankAttacker ^ 2))
+        if (!IsAnimBankSpriteVisible(gBattleAnimAttacker ^ 2))
             return 0xff;
         else
-            return gBattleMonSprites[gAnimBankAttacker ^ 2];
+            return gBattleMonSprites[gBattleAnimAttacker ^ 2];
     }
     else
     {
-        if (IsAnimBankSpriteVisible(gAnimBankTarget ^ 2))
-            return gBattleMonSprites[gAnimBankTarget ^ 2];
+        if (IsAnimBankSpriteVisible(gBattleAnimTarget ^ 2))
+            return gBattleMonSprites[gBattleAnimTarget ^ 2];
         else
             return 0xff;
     }
@@ -627,8 +627,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] = GetBattlerSpriteCoord(gAnimBankTarget, 2);
-    sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3);
+    sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
+    sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
     sprite->callback = sub_80782F8;
 }
 
@@ -695,8 +695,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] = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
-    sprite->data[4] = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
+    sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
+    sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
     sprite->callback = sub_80782F8;
 }
 
@@ -734,14 +734,14 @@ void sub_8078634(u8 task)
 
 void sub_8078650(struct Sprite *sprite)
 {
-    sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
-    sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
+    sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
+    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
 }
 
 void sub_807867C(struct Sprite *sprite, s16 a2)
 {
-    u16 v1 = GetBattlerSpriteCoord(gAnimBankAttacker, 0);
-    u16 v2 = GetBattlerSpriteCoord(gAnimBankTarget, 0);
+    u16 v1 = GetBattlerSpriteCoord(gBattleAnimAttacker, 0);
+    u16 v2 = GetBattlerSpriteCoord(gBattleAnimTarget, 0);
 
     if (v1 > v2)
     {
@@ -753,7 +753,7 @@ void sub_807867C(struct Sprite *sprite, s16 a2)
     }
     else
     {
-        if (GetBattlerSide(gAnimBankAttacker) != 0)
+        if (GetBattlerSide(gBattleAnimAttacker) != 0)
             sprite->pos1.x -= a2;
         else
             sprite->pos1.x += a2;
@@ -790,8 +790,8 @@ void sub_8078764(struct Sprite *sprite, bool8 a2)
 {
     if (!a2)
     {
-        sprite->pos1.x = sub_8077EE4(gAnimBankTarget, 0);
-        sprite->pos1.y = sub_8077EE4(gAnimBankTarget, 1);
+        sprite->pos1.x = sub_8077EE4(gBattleAnimTarget, 0);
+        sprite->pos1.y = sub_8077EE4(gBattleAnimTarget, 1);
     }
     sub_807867C(sprite, gBattleAnimArgs[0]);
     sprite->pos1.y += gBattleAnimArgs[1];
@@ -801,13 +801,13 @@ void InitAnimSpritePos(struct Sprite *sprite, u8 a2)
 {
     if (!a2)
     {
-        sprite->pos1.x = sub_8077EE4(gAnimBankAttacker, 0);
-        sprite->pos1.y = sub_8077EE4(gAnimBankAttacker, 1);
+        sprite->pos1.x = sub_8077EE4(gBattleAnimAttacker, 0);
+        sprite->pos1.y = sub_8077EE4(gBattleAnimAttacker, 1);
     }
     else
     {
-        sprite->pos1.x = sub_8077EE4(gAnimBankAttacker, 2);
-        sprite->pos1.y = sub_8077EE4(gAnimBankAttacker, 3);
+        sprite->pos1.x = sub_8077EE4(gBattleAnimAttacker, 2);
+        sprite->pos1.y = sub_8077EE4(gBattleAnimAttacker, 3);
     }
     sub_807867C(sprite, gBattleAnimArgs[0]);
     sprite->pos1.y += gBattleAnimArgs[1];
@@ -839,9 +839,9 @@ bool8 IsBankSpritePresent(u8 slot)
 {
     if (IsContest())
     {
-        if (gAnimBankAttacker == slot)
+        if (gBattleAnimAttacker == slot)
             return TRUE;
-        if (gAnimBankTarget == slot)
+        if (gBattleAnimTarget == slot)
             return TRUE;
         return FALSE;
     }
@@ -892,7 +892,7 @@ void sub_8078954(struct Struct_sub_8078914 *unk, u8 b)
         unk->field_4 = (u8 *)(VRAM + 0xf000);
         unk->field_8 = 0xe;
     }
-    else if (GetBattlerPosition_permutated(gAnimBankAttacker) == 1)
+    else if (GetBattlerPosition_permutated(gBattleAnimAttacker) == 1)
     {
         unk->field_0 = (u8 *)(VRAM + 0x4000);
         unk->field_4 = (u8 *)(VRAM + 0xe000);
@@ -1279,26 +1279,26 @@ u32 sub_80791A8(u8 a1, u8 a2, u8 a3, u8 a4, u8 a5, u8 a6, u8 a7)
     }
     if (a2)
     {
-        shift = gAnimBankAttacker + 16;
+        shift = gBattleAnimAttacker + 16;
         var |= 1 << shift;
     }
     if (a3) {
-        shift = gAnimBankTarget + 16;
+        shift = gBattleAnimTarget + 16;
         var |= 1 << shift;
     }
     if (a4)
     {
-        if (IsAnimBankSpriteVisible(gAnimBankAttacker ^ 2))
+        if (IsAnimBankSpriteVisible(gBattleAnimAttacker ^ 2))
         {
-            shift = (gAnimBankAttacker ^ 2) + 16;
+            shift = (gBattleAnimAttacker ^ 2) + 16;
             var |= 1 << shift;
         }
     }
     if (a5)
     {
-        if (IsAnimBankSpriteVisible(gAnimBankTarget ^ 2))
+        if (IsAnimBankSpriteVisible(gBattleAnimTarget ^ 2))
         {
-            shift = (gAnimBankTarget ^ 2) + 16;
+            shift = (gBattleAnimTarget ^ 2) + 16;
             var |= 1 << shift;
         }
     }
@@ -1414,12 +1414,12 @@ void TranslateAnimSpriteToTargetMonLocation(struct Sprite *sprite)
         v2 = 1;
 
     InitAnimSpritePos(sprite, v1);
-    if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER)
+    if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
         gBattleAnimArgs[2] = -gBattleAnimArgs[2];
 
     sprite->data[0] = gBattleAnimArgs[4];
-    sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2) + gBattleAnimArgs[2];
-    sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, v2) + gBattleAnimArgs[3];
+    sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + gBattleAnimArgs[2];
+    sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, v2) + gBattleAnimArgs[3];
     sprite->callback = StartAnimLinearTranslation;
     StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
 }
@@ -1427,11 +1427,11 @@ void TranslateAnimSpriteToTargetMonLocation(struct Sprite *sprite)
 void sub_80794A8(struct Sprite *sprite)
 {
     InitAnimSpritePos(sprite, 1);
-    if (GetBattlerSide(gAnimBankAttacker))
+    if (GetBattlerSide(gBattleAnimAttacker))
         gBattleAnimArgs[2] = -gBattleAnimArgs[2];
     sprite->data[0] = gBattleAnimArgs[4];
-    sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2) + gBattleAnimArgs[2];
-    sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3) + gBattleAnimArgs[3];
+    sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + gBattleAnimArgs[2];
+    sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + gBattleAnimArgs[3];
     sprite->data[5] = gBattleAnimArgs[5];
     InitAnimArcTranslation(sprite);
     sprite->callback = sub_8079518;
@@ -1461,14 +1461,14 @@ void sub_8079534(struct Sprite *sprite)
     if (!gBattleAnimArgs[5])
     {
         InitAnimSpritePos(sprite, r4);
-        slot = gAnimBankAttacker;
+        slot = gBattleAnimAttacker;
     }
     else
     {
         sub_8078764(sprite, r4);
-        slot = gAnimBankTarget;
+        slot = gBattleAnimTarget;
     }
-    if (GetBattlerSide(gAnimBankAttacker))
+    if (GetBattlerSide(gBattleAnimAttacker))
         gBattleAnimArgs[2] = -gBattleAnimArgs[2];
     sub_8078764(sprite, r4);
     sprite->data[0] = gBattleAnimArgs[4];
@@ -1852,14 +1852,14 @@ void sub_8079CEC(u8 task)
 
 void unref_sub_8079D20(u8 priority)
 {
-    if (IsAnimBankSpriteVisible(gAnimBankTarget))
-        gSprites[gBattleMonSprites[gAnimBankTarget]].oam.priority = priority;
-    if (IsAnimBankSpriteVisible(gAnimBankAttacker))
-        gSprites[gBattleMonSprites[gAnimBankAttacker]].oam.priority = priority;
-    if (IsAnimBankSpriteVisible(gAnimBankTarget ^ 2))
-        gSprites[gBattleMonSprites[gAnimBankTarget ^ 2]].oam.priority = priority;
-    if (IsAnimBankSpriteVisible(gAnimBankAttacker ^ 2))
-        gSprites[gBattleMonSprites[gAnimBankAttacker ^ 2]].oam.priority = priority;
+    if (IsAnimBankSpriteVisible(gBattleAnimTarget))
+        gSprites[gBattleMonSprites[gBattleAnimTarget]].oam.priority = priority;
+    if (IsAnimBankSpriteVisible(gBattleAnimAttacker))
+        gSprites[gBattleMonSprites[gBattleAnimAttacker]].oam.priority = priority;
+    if (IsAnimBankSpriteVisible(gBattleAnimTarget ^ 2))
+        gSprites[gBattleMonSprites[gBattleAnimTarget ^ 2]].oam.priority = priority;
+    if (IsAnimBankSpriteVisible(gBattleAnimAttacker ^ 2))
+        gSprites[gBattleMonSprites[gBattleAnimAttacker ^ 2]].oam.priority = priority;
 }
 
 void UpdateBattlerSpritePriorities()
@@ -2170,7 +2170,7 @@ u8 sub_807A4A0(int bank, u8 sprite, int species)
 void sub_807A544(struct Sprite *sprite)
 {
     sub_8078650(sprite);
-    if (GetBattlerSide(gAnimBankAttacker))
+    if (GetBattlerSide(gBattleAnimAttacker))
     {
         sprite->pos1.x -= gBattleAnimArgs[0];
         gBattleAnimArgs[3] = -gBattleAnimArgs[3];
@@ -2191,7 +2191,7 @@ void sub_807A544(struct Sprite *sprite)
 
 void sub_807A5C4(struct Sprite *sprite)
 {
-    if (GetBattlerSide(gAnimBankAttacker))
+    if (GetBattlerSide(gBattleAnimAttacker))
     {
         sprite->pos1.x -= gBattleAnimArgs[0];
         gBattleAnimArgs[3] *= -1;
@@ -2215,7 +2215,7 @@ void sub_807A5C4(struct Sprite *sprite)
 void sub_807A63C(struct Sprite *sprite)
 {
     sub_8078650(sprite);
-    if (GetBattlerSide(gAnimBankAttacker))
+    if (GetBattlerSide(gBattleAnimAttacker))
         sprite->pos1.x -= gBattleAnimArgs[0];
     else
         sprite->pos1.x += gBattleAnimArgs[0];
@@ -2232,7 +2232,7 @@ void sub_807A69C(u8 taskId)
     u16 dest;
     struct Task *task = &gTasks[taskId];
     task->data[0] = GetAnimBattlerSpriteId(0);
-    task->data[1] = (GetBattlerSide(gAnimBankAttacker)) ? -8 : 8;
+    task->data[1] = (GetBattlerSide(gBattleAnimAttacker)) ? -8 : 8;
     task->data[2] = 0;
     task->data[3] = 0;
     gSprites[task->data[0]].pos2.x -= task->data[0];
@@ -2241,7 +2241,7 @@ void sub_807A69C(u8 taskId)
 
     dest = (task->data[4] + 0x10) * 0x10;
     src = (gSprites[task->data[0]].oam.paletteNum + 0x10) * 0x10;
-    task->data[6] = GetBattlerSubpriority(gAnimBankAttacker);
+    task->data[6] = GetBattlerSubpriority(gBattleAnimAttacker);
     if (task->data[6] == 20 || task->data[6] == 40)
         task->data[6] = 2;
     else
@@ -2312,9 +2312,9 @@ void sub_807A8D4(struct Sprite *sprite)
 // file_4
 
 void sub_807A908(struct Sprite *sprite) {
-    sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
-    sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
-    if (!GetBattlerSide(gAnimBankAttacker))
+    sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
+    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
+    if (!GetBattlerSide(gBattleAnimAttacker))
         sprite->data[0] = 5;
     else
         sprite->data[0] = -10;
@@ -2340,7 +2340,7 @@ void sub_807A9BC(struct Sprite *sprite)
     sprite->data[0] = gBattleAnimArgs[2];
     sprite->data[2] = sprite->pos1.x + gBattleAnimArgs[4];
     sprite->data[4] = sprite->pos1.y + gBattleAnimArgs[5];
-    if (!GetBattlerSide(gAnimBankTarget))
+    if (!GetBattlerSide(gBattleAnimTarget))
     {
         x = (u16)gBattleAnimArgs[4] + 30;
         sprite->pos1.x += x;