Port battle_anim changes from pokeemerald

author: Marcus Huderle <huderlem@gmail.com> 2017-12-27 13:15:01 -0600
committer: Marcus Huderle <huderlem@gmail.com> 2017-12-27 13:15:01 -0600
commit: 16e0d8089194a8d098da47c7a7b07fbc4dcc0292 (patch)
tree: b92766b1ed1710c7d8ea0492c160e0a39a3dc539 /src
parent: 86a36767dba19e84297047addf1d1d776e2efdec (diff)
134 files changed, 1914 insertions, 2173 deletions
diff --git a/src/battle/anim/alert.c b/src/battle/anim/alert.c
index 538008be0..7cd42c17b 100755
--- a/src/battle/anim/alert.c
+++ b/src/battle/anim/alert.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 // alert (red thunder from the sides of a Pokemon, simulating more alert behavior.)
 // Used in Kinesis.
@@ -16,7 +16,7 @@ void sub_80CF610(struct Sprite* sprite)
     sub_8078650(sprite);
     sub_807867C(sprite, gBattleAnimArgs[0]);
     sprite->pos1.y += gBattleAnimArgs[1];
-    if (GetBankSide(gBattleAnimBankAttacker) != 0)
+    if (GetBankSide(gAnimBankAttacker) != 0)
     {
         sprite->hFlip = 1;
         if (gBattleAnimArgs[2] != 0)
@@ -29,5 +29,5 @@ void sub_80CF610(struct Sprite* sprite)
     }
 
     sprite->callback = sub_8078600;
-    StoreSpriteCallbackInData(sprite, move_anim_8072740);
+    StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
 }
diff --git a/src/battle/anim/angel.c b/src/battle/anim/angel.c
index 916ebfdfd..5ec083887 100755
--- a/src/battle/anim/angel.c
+++ b/src/battle/anim/angel.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 // angel (a little angel descends from somewhere towards a position)
 // Used in Sweet Kiss.
@@ -33,5 +33,5 @@ void sub_80D2938(struct Sprite* sprite)
     }
 
     if (sprite->data[0] > 0x64)
-        move_anim_8072740(sprite);
+        DestroyAnimSprite(sprite);
 }
diff --git a/src/battle/anim/angel_kiss.c b/src/battle/anim/angel_kiss.c
index 453c4d802..d5be6e2af 100755
--- 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 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 // angel_kiss (a different variation of kiss_fountain.)
 // Used in Sweet Kiss.
@@ -22,7 +22,7 @@ void sub_80D29CC(struct Sprite* sprite)
         sprite->invisible = sprite->data[5] % 2;
 
     if (sprite->data[5] > 30)
-        move_anim_8072740(sprite);
+        DestroyAnimSprite(sprite);
 }
 
 void sub_80D2A38(struct Sprite* sprite)
@@ -62,7 +62,7 @@ void sub_80D2A38(struct Sprite* sprite)
         sprite->pos1.x += gBattleAnimArgs[0];
         sprite->pos1.y += gBattleAnimArgs[1];
         StartSpriteAnim(sprite, 0);
-        sprite->subpriority = sub_8079E90(gBattleAnimBankTarget) - 1;
+        sprite->subpriority = sub_8079E90(gAnimBankTarget) - 1;
         sprite->data[2] = 1;
     }
 
diff --git a/src/battle/anim/anger.c b/src/battle/anim/anger.c
index 8962e0855..011aa68ce 100755
--- a/src/battle/anim/anger.c
+++ b/src/battle/anim/anger.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 // anger (anger emotes, usually above the Pokemon's head, indicating annoyed emotions.)
 // Used in Frustration, Rage, Swagger, Torment, and Taunt.
@@ -15,17 +15,17 @@ void sub_80D09C0(struct Sprite* sprite)
 {
     u8 bank;
     if (gBattleAnimArgs[0] == 0)
-        bank = gBattleAnimBankAttacker;
+        bank = gAnimBankAttacker;
     else
-        bank = gBattleAnimBankTarget;
+        bank = gAnimBankTarget;
 
     if (GetBankSide(bank) == 1)
     {
         gBattleAnimArgs[1] *= -1;
     }
 
-    sprite->pos1.x = sub_8077ABC(bank, 2) + gBattleAnimArgs[1];
-    sprite->pos1.y = sub_8077ABC(bank, 3) + gBattleAnimArgs[2];
+    sprite->pos1.x = GetBankPosition(bank, 2) + gBattleAnimArgs[1];
+    sprite->pos1.y = GetBankPosition(bank, 3) + gBattleAnimArgs[2];
     if (sprite->pos1.y <= 7)
         sprite->pos1.y = 8;
 
diff --git a/src/battle/anim/aurora.c b/src/battle/anim/aurora.c
index 1ca5e649f..90fa5c879 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 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 static void sub_80D344C(struct Sprite *);
 static void sub_80D34D4(u8);
@@ -17,15 +17,15 @@ void sub_80D33B4(struct Sprite *sprite)
     s16 r6;
 
     sub_80787B0(sprite, 1);
-    if (GetBankSide(gBattleAnimBankAttacker) != 0)
+    if (GetBankSide(gAnimBankAttacker) != 0)
         r6 = -gBattleAnimArgs[2];
     else
         r6 = gBattleAnimArgs[2];
     sprite->data[0] = gBattleAnimArgs[4];
     sprite->data[1] = sprite->pos1.x;
-    sprite->data[2] = sub_8077ABC(gBattleAnimBankTarget, 2) + r6;
+    sprite->data[2] = GetBankPosition(gAnimBankTarget, 2) + r6;
     sprite->data[3] = sprite->pos1.y;
-    sprite->data[4] = sub_8077ABC(gBattleAnimBankTarget, 3) + gBattleAnimArgs[3];
+    sprite->data[4] = GetBankPosition(gAnimBankTarget, 3) + gBattleAnimArgs[3];
     obj_translate_based_on_private_1_2_3_4(sprite);
     sprite->callback = sub_80D344C;
     sprite->affineAnimPaused = TRUE;
@@ -40,7 +40,7 @@ static void sub_80D344C(struct Sprite *sprite)
         sprite->affineAnimPaused = FALSE;
     }
     if (sub_8078B5C(sprite) != 0)
-        move_anim_8072740(sprite);
+        DestroyAnimSprite(sprite);
 }
 
 void sub_80D3490(u8 taskId)
diff --git a/src/battle/anim/beta_beat_up.c b/src/battle/anim/beta_beat_up.c
index 499e52a80..3af6dd926 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 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 static void sub_80D6278(struct Sprite *);
 
@@ -13,7 +13,7 @@ static void sub_80D6278(struct Sprite *);
 
 void sub_80D6234(struct Sprite *sprite)
 {
-    if (GetBankSide(gBattleAnimBankAttacker) != 0)
+    if (GetBankSide(gAnimBankAttacker) != 0)
     {
         sprite->pos1.x -= gBattleAnimArgs[0];
     }
diff --git a/src/battle/anim/blow_kiss.c b/src/battle/anim/blow_kiss.c
index e63f7189d..e7b49471d 100755
--- 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 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 static void sub_80D1FA4(struct Sprite* sprite);
 
@@ -18,9 +18,9 @@ void sub_80D1F58(struct Sprite* sprite)
     sub_80787B0(sprite, 1);
     sprite->data[0] = 0x5F;
     sprite->data[1] = sprite->pos1.x;
-    sprite->data[2] = sub_8077ABC(gBattleAnimBankTarget, 2);
+    sprite->data[2] = GetBankPosition(gAnimBankTarget, 2);
     sprite->data[3] = sprite->pos1.y;
-    sprite->data[4] = sub_8077ABC(gBattleAnimBankTarget, 3);
+    sprite->data[4] = GetBankPosition(gAnimBankTarget, 3);
     obj_translate_based_on_private_1_2_3_4(sprite);
     sprite->callback = sub_80D1FA4;
 }
@@ -34,6 +34,6 @@ void sub_80D1FA4(struct Sprite* sprite)
     }
     else
     {
-        move_anim_8072740(sprite);
+        DestroyAnimSprite(sprite);
     }
 }
diff --git a/src/battle/anim/bottle.c b/src/battle/anim/bottle.c
index ac5e51881..5485bcf5d 100755
--- a/src/battle/anim/bottle.c
+++ b/src/battle/anim/bottle.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 static void sub_80CCF70(struct Sprite* sprite);
 static void sub_80CD0CC(struct Sprite* sprite, int unk1, int unk2);
@@ -16,8 +16,8 @@ static void sub_80CD0CC(struct Sprite* sprite, int unk1, int unk2);
 
 void sub_80CCF04(struct Sprite* sprite)
 {
-    sprite->pos1.x = sub_8077ABC(gBattleAnimBankTarget, 2);
-    sprite->pos1.y = sub_8077ABC(gBattleAnimBankTarget, 3) + 0xFFE8;
+    sprite->pos1.x = GetBankPosition(gAnimBankTarget, 2);
+    sprite->pos1.y = GetBankPosition(gAnimBankTarget, 3) + 0xFFE8;
     sprite->data[0] = 0;
     sprite->data[1] = 0;
     sprite->data[2] = 0;
@@ -98,7 +98,7 @@ void sub_80CCF70(struct Sprite* sprite)
     case 4:
         REG_BLDCNT = 0;
         REG_BLDALPHA = 0;
-        move_anim_8072740(sprite);
+        DestroyAnimSprite(sprite);
         break;
     }
 }
diff --git a/src/battle/anim/brace.c b/src/battle/anim/brace.c
index 7b084efbb..19ea4297b 100755
--- a/src/battle/anim/brace.c
+++ b/src/battle/anim/brace.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 static void sub_80CDF70(struct Sprite* sprite);
 
@@ -17,13 +17,13 @@ void sub_80CDF0C(struct Sprite* sprite)
 {
     if (gBattleAnimArgs[0] == 0)
     {
-        sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 0) + gBattleAnimArgs[1];
-        sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 1) + gBattleAnimArgs[2];
+        sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 0) + gBattleAnimArgs[1];
+        sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 1) + gBattleAnimArgs[2];
     }
     else
     {
-        sprite->pos1.x = sub_8077ABC(gBattleAnimBankTarget, 0) + gBattleAnimArgs[1];
-        sprite->pos1.y = sub_8077ABC(gBattleAnimBankTarget, 1) + gBattleAnimArgs[2];
+        sprite->pos1.x = GetBankPosition(gAnimBankTarget, 0) + gBattleAnimArgs[1];
+        sprite->pos1.y = GetBankPosition(gAnimBankTarget, 1) + gBattleAnimArgs[2];
     }
 
     sprite->data[0] = 0;
@@ -41,5 +41,5 @@ void sub_80CDF70(struct Sprite* sprite)
 
     sprite->pos1.y -= sprite->data[0];
     if (sprite->animEnded)
-        move_anim_8072740(sprite);
+        DestroyAnimSprite(sprite);
 }
diff --git a/src/battle/anim/breath.c b/src/battle/anim/breath.c
index 0fcc7fa08..831b222ad 100755
--- a/src/battle/anim/breath.c
+++ b/src/battle/anim/breath.c
@@ -5,32 +5,32 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 // breath (a puff of smoke, usually from the mouth or nose of the Pokemon.)
 // Used in Swagger and Bulk Up.
 
 void sub_80D0930(struct Sprite* sprite)
 {
-    if (GetBankSide(gBattleAnimBankAttacker) == 0)
+    if (GetBankSide(gAnimBankAttacker) == 0)
     {
         StartSpriteAnim(sprite, 0);
-        sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2) + 32;
+        sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2) + 32;
         sprite->data[1] = 0x40;
     }
     else
     {
         StartSpriteAnim(sprite, 1);
-        sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2) - 32;
+        sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2) - 32;
         sprite->data[1] = -0x40;
     }
 
-    sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 3);
+    sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3);
     sprite->data[0] = 0x34;
     sprite->data[2] = 0;
     sprite->data[3] = 0;
     sprite->data[4] = 0;
-    StoreSpriteCallbackInData(sprite, move_anim_8072740);
+    StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
     sprite->callback = sub_8078394;
 }
diff --git a/src/battle/anim/bubble.c b/src/battle/anim/bubble.c
index 5da0d9929..403003ce3 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 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 static void sub_80D32E8(struct Sprite *sprite);
 static void sub_80D3370(struct Sprite *sprite);
@@ -19,29 +19,29 @@ void sub_80D31C8(struct Sprite* sprite)
 {
     u8 newSpriteId;
 
-    if (GetBankSide(gBattleAnimBankAttacker) != 0)
+    if (GetBankSide(gAnimBankAttacker) != 0)
     {
-        sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2) - gBattleAnimArgs[0];
-        sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 3) + gBattleAnimArgs[1];
+        sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2) - gBattleAnimArgs[0];
+        sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3) + gBattleAnimArgs[1];
     }
     else
     {
-        sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2) + gBattleAnimArgs[0];
-        sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 3) + gBattleAnimArgs[1];
+        sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2) + gBattleAnimArgs[0];
+        sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3) + gBattleAnimArgs[1];
     }
 
     sprite->animPaused = 1;
 
-    if (GetBankSide(gBattleAnimBankAttacker) != 0)
+    if (GetBankSide(gAnimBankAttacker) != 0)
     {
         gBattleAnimArgs[2] = -gBattleAnimArgs[2];
     }
 
     sprite->data[0] = gBattleAnimArgs[6];
     sprite->data[1] = sprite->pos1.x;
-    sprite->data[2] = sub_8077ABC(gBattleAnimBankTarget, 2);
+    sprite->data[2] = GetBankPosition(gAnimBankTarget, 2);
     sprite->data[3] = sprite->pos1.y;
-    sprite->data[4] = sub_8077ABC(gBattleAnimBankTarget, 3);
+    sprite->data[4] = GetBankPosition(gAnimBankTarget, 3);
 
     obj_translate_based_on_private_1_2_3_4(sprite);
 
diff --git a/src/battle/anim/bullet.c b/src/battle/anim/bullet.c
index 11306873a..90b2021f1 100755
--- a/src/battle/anim/bullet.c
+++ b/src/battle/anim/bullet.c
@@ -6,8 +6,8 @@
 #include "random.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 static void sub_80D0030(struct Sprite* sprite);
 static void sub_80D00B4(struct Sprite* sprite);
@@ -19,8 +19,8 @@ void sub_80CFFD8(struct Sprite* sprite)
 {
     sub_80787B0(sprite, 1);
     sprite->data[0] = 20;
-    sprite->data[2] = sub_8077ABC(gBattleAnimBankTarget, 2);
-    sprite->data[4] = sub_8077ABC(gBattleAnimBankTarget, 3);
+    sprite->data[2] = GetBankPosition(gAnimBankTarget, 2);
+    sprite->data[4] = GetBankPosition(gAnimBankTarget, 3);
     sprite->callback = sub_8078B34;
     sprite->affineAnimPaused = 1;
     StoreSpriteCallbackInData(sprite, sub_80D0030);
@@ -31,7 +31,7 @@ void sub_80D0030(struct Sprite* sprite)
     int i;
     u16 rand;
     s16* ptr;
-    PlaySE12WithPanning(0xA6, sub_8076F98(0x3F));
+    PlaySE12WithPanning(0xA6, BattleAnimAdjustPanning(0x3F));
     sprite->pos1.x += sprite->pos2.x;
     sprite->pos1.y += sprite->pos2.y;
     sprite->pos2.y = 0;
@@ -64,6 +64,6 @@ void sub_80D00B4(struct Sprite* sprite)
         sprite->data[1] = 0;
         sprite->data[2] /= 2;
         if (++sprite->data[3] == 1)
-            move_anim_8072740(sprite);
+            DestroyAnimSprite(sprite);
     }
 }
diff --git a/src/battle/anim/copy_orb.c b/src/battle/anim/copy_orb.c
index 96d2910f0..4fa8ea163 100755
--- 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 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 // copy_orb
 // Used in Mimic.
@@ -16,14 +16,14 @@ void sub_80CB4CC(struct Sprite* sprite)
     {
     case 0:
     {
-        if (GetBankSide(gBattleAnimBankTarget) == 0)
+        if (GetBankSide(gAnimBankTarget) == 0)
         {
             s16 a = gBattleAnimArgs[0];
             gBattleAnimArgs[0] = -a;
         }
 
-        sprite->pos1.x = sub_8077ABC(gBattleAnimBankTarget, 0) + gBattleAnimArgs[0];
-        sprite->pos1.y = sub_8077ABC(gBattleAnimBankTarget, 1) + gBattleAnimArgs[1];
+        sprite->pos1.x = GetBankPosition(gAnimBankTarget, 0) + gBattleAnimArgs[0];
+        sprite->pos1.y = GetBankPosition(gAnimBankTarget, 1) + gBattleAnimArgs[1];
         sprite->invisible = 1;
         sprite->data[0]++;
         break;
@@ -35,10 +35,10 @@ void sub_80CB4CC(struct Sprite* sprite)
         {
             ChangeSpriteAffineAnim(sprite, 1);
             sprite->data[0] = 25;
-            sprite->data[2] = sub_8077ABC(gBattleAnimBankAttacker, 2);
-            sprite->data[4] = sub_8077ABC(gBattleAnimBankAttacker, 3);
+            sprite->data[2] = GetBankPosition(gAnimBankAttacker, 2);
+            sprite->data[4] = GetBankPosition(gAnimBankAttacker, 3);
             sprite->callback = sub_8078CC0;
-            StoreSpriteCallbackInData(sprite, move_anim_8072740);
+            StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
             break;
         }
     }
diff --git a/src/battle/anim/cube.c b/src/battle/anim/cube.c
index 07b3ea517..9adf46e32 100755
--- 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 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 static void sub_80CE000(struct Sprite* sprite);
 
@@ -16,14 +16,14 @@ static void sub_80CE000(struct Sprite* sprite);
 
 void sub_80CDFB0(struct Sprite* sprite)
 {
-    sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2);
-    sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 3) - 12;
+    sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2);
+    sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3) - 12;
     sprite->data[0] = 0;
     sprite->data[1] = 2;
     sprite->data[2] = 0;
     sprite->data[3] = 0;
     sprite->data[4] = 0;
-    sprite->data[5] = sub_8076F98(-0x40);
+    sprite->data[5] = BattleAnimAdjustPanning(-0x40);
     sprite->callback = sub_80CE000;
 }
 
@@ -48,5 +48,5 @@ void sub_80CE000(struct Sprite* sprite)
     }
 
     if (sprite->animEnded && sprite->data[1] > 16 && sprite->invisible)
-        move_anim_8072740(sprite);
+        DestroyAnimSprite(sprite);
 }
diff --git a/src/battle/anim/curtain.c b/src/battle/anim/curtain.c
index 1f34cb173..3c9e4e84c 100755
--- a/src/battle/anim/curtain.c
+++ b/src/battle/anim/curtain.c
@@ -6,11 +6,11 @@
 #include "palette.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
-extern u16 gUnknown_03004240;
-extern u16 gUnknown_030042C4;
+extern u16 gBattle_WIN0V;
+extern u16 gBattle_WIN0H;
 
 static void sub_80D1D48(u8 taskId);
 static void sub_80D1D9C(u8 taskId);
@@ -21,7 +21,7 @@ static void sub_80D1D9C(u8 taskId);
 void sub_80D1CD0(u8 taskId)
 {
     int zero;
-    bool8 result = NotInBattle();
+    bool8 result = IsContest();
     u16 var = 0xF0;
     if (result)
     {
@@ -33,8 +33,8 @@ void sub_80D1CD0(u8 taskId)
         zero = 0;
     }
 
-    gUnknown_030042C4 = var;
-    gUnknown_03004240 = 0xA0;
+    gBattle_WIN0H = var;
+    gBattle_WIN0V = 0xA0;
     REG_WIN0H = var;
     REG_WIN0V = 0xA0;
     REG_WININ = 0x3F1F;
@@ -52,12 +52,12 @@ void sub_80D1D48(u8 taskId)
     gTasks[taskId].data[1] -= 13;
     if (gTasks[taskId].data[0] >= gTasks[taskId].data[1])
     {
-        gUnknown_030042C4 = 0;
+        gBattle_WIN0H = 0;
         gTasks[taskId].func = sub_80D1D9C;
     }
     else
     {
-        gUnknown_030042C4 = gTasks[taskId].data[1] | (gTasks[taskId].data[0] << 8);
+        gBattle_WIN0H = gTasks[taskId].data[1] | (gTasks[taskId].data[0] << 8);
     }
 }
 
@@ -71,8 +71,8 @@ void sub_80D1D9C(u8 taskId)
     }
     else if (gTasks[taskId].data[10] > 4)
     {
-        gUnknown_030042C4 = 0;
-        gUnknown_03004240 = 0;
+        gBattle_WIN0H = 0;
+        gBattle_WIN0V = 0;
         REG_WININ = 0x3F3F;
         REG_WINOUT = 0x3F3F;
         REG_BLDCNT = 0;
diff --git a/src/battle/anim/cutter.c b/src/battle/anim/cutter.c
index 9859497e5..2234ebacb 100755
--- a/src/battle/anim/cutter.c
+++ b/src/battle/anim/cutter.c
@@ -4,8 +4,8 @@
 #include "battle_anim.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 static void sub_80CB09C(struct Sprite* sprite);
 static void sub_80CB1A4(struct Sprite* sprite);
@@ -16,7 +16,7 @@ static void sub_80CB1A4(struct Sprite* sprite);
 void sub_80CAFD0(struct Sprite* sprite)
 {
     sub_80787B0(sprite, 1);
-    if (GetBankSide(gBattleAnimBankAttacker))
+    if (GetBankSide(gAnimBankAttacker))
     {
         gBattleAnimArgs[2] = -gBattleAnimArgs[2];
     }
@@ -24,19 +24,19 @@ void sub_80CAFD0(struct Sprite* sprite)
     sprite->data[0] = gBattleAnimArgs[4];
     if (!(gBattleAnimArgs[6]))
     {
-        sprite->data[2] = sub_8077ABC(gBattleAnimBankTarget, 2) + gBattleAnimArgs[2];
-        sprite->data[4] = sub_8077ABC(gBattleAnimBankTarget, 3) + gBattleAnimArgs[3];
+        sprite->data[2] = GetBankPosition(gAnimBankTarget, 2) + gBattleAnimArgs[2];
+        sprite->data[4] = GetBankPosition(gAnimBankTarget, 3) + gBattleAnimArgs[3];
     }
     else
     {
-        sub_807A3FC(gBattleAnimBankTarget, 1, &sprite->data[2], &sprite->data[4]);
+        sub_807A3FC(gAnimBankTarget, 1, &sprite->data[2], &sprite->data[4]);
         sprite->data[2] += gBattleAnimArgs[2];
         sprite->data[4] += gBattleAnimArgs[3];
     }
 
     sprite->data[5] = gBattleAnimArgs[5];
     sub_80786EC(sprite);
-    if (GetBankSide(gBattleAnimBankAttacker) == GetBankSide(gBattleAnimBankTarget))
+    if (GetBankSide(gAnimBankAttacker) == GetBankSide(gAnimBankTarget))
     {
         sprite->data[0] = 1;
     }
@@ -77,14 +77,14 @@ void sub_80CB09C(struct Sprite* sprite)
         c = TRUE;
 
     if (c)
-        move_anim_8072740(sprite);
+        DestroyAnimSprite(sprite);
 }
 
 void sub_80CB144(struct Sprite* sprite)
 {
-    if (!NotInBattle() && IsDoubleBattle() == TRUE)
+    if (!IsContest() && IsDoubleBattle() == TRUE)
     {
-        sub_807A3FC(gBattleAnimBankTarget, 1, &sprite->pos1.x, &sprite->pos1.y);
+        sub_807A3FC(gAnimBankTarget, 1, &sprite->pos1.x, &sprite->pos1.y);
     }
 
     sprite->pos1.y += 32;
@@ -117,14 +117,14 @@ void sub_80CB1A4(struct Sprite* sprite)
     sprite->pos2.y = Sin(sprite->data[5], 5);
     if (sprite->data[5] <= 0x7F)
     {
-        sprite->oam.priority = sub_8079ED4(gBattleAnimBankTarget) - 1;
+        sprite->oam.priority = sub_8079ED4(gAnimBankTarget) - 1;
     }
     else
     {
-        sprite->oam.priority = sub_8079ED4(gBattleAnimBankTarget) + 1;
+        sprite->oam.priority = sub_8079ED4(gAnimBankTarget) + 1;
     }
 
     sprite->data[0]--;
     if (!sprite->data[0])
-        move_anim_8072740(sprite);
+        DestroyAnimSprite(sprite);
 }
diff --git a/src/battle/anim/cyclone.c b/src/battle/anim/cyclone.c
index b19304f17..0f83df211 100755
--- a/src/battle/anim/cyclone.c
+++ b/src/battle/anim/cyclone.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 // cyclone (creates a circling motion like a cyclone, usually a wind sprite.)
 // Used in Razor Wind.
@@ -14,7 +14,7 @@ extern u8 gBattleAnimBankTarget;
 void sub_80D0118(struct Sprite* sprite)
 {
     sub_80787B0(sprite, 0);
-    if (GetBankSide(gBattleAnimBankAttacker) == 0)
+    if (GetBankSide(gAnimBankAttacker) == 0)
         sprite->pos1.y += 16;
 
     sprite->data[0] = gBattleAnimArgs[4];
@@ -23,6 +23,6 @@ void sub_80D0118(struct Sprite* sprite)
     sprite->data[3] = gBattleAnimArgs[6];
     sprite->data[4] = gBattleAnimArgs[3];
     sprite->callback = sub_8078114;
-    StoreSpriteCallbackInData(sprite, move_anim_8072740);
+    StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
     sprite->callback(sprite);
 }
diff --git a/src/battle/anim/devil.c b/src/battle/anim/devil.c
index 345ee53ea..c628abfc0 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 gBattleAnimBankTarget;
+extern u8 gAnimBankTarget;
 
 void sub_80D2ABC(struct Sprite *sprite)
 {
@@ -14,7 +14,7 @@ void sub_80D2ABC(struct Sprite *sprite)
         sprite->pos1.x += gBattleAnimArgs[0];
         sprite->pos1.y += gBattleAnimArgs[1];
         StartSpriteAnim(sprite, 0);
-        sprite->subpriority = sub_8079E90(gBattleAnimBankTarget) - 1;
+        sprite->subpriority = sub_8079E90(gAnimBankTarget) - 1;
         sprite->data[2] = 1;
     }
     sprite->data[0] += sprite->data[2];
@@ -33,5 +33,5 @@ void sub_80D2ABC(struct Sprite *sprite)
     else
         sprite->invisible = FALSE;
     if (sprite->data[3] > 0x5A)
-        move_anim_8072740(sprite);
+        DestroyAnimSprite(sprite);
 }
diff --git a/src/battle/anim/draw.c b/src/battle/anim/draw.c
index c075af097..3adb62e06 100755
--- a/src/battle/anim/draw.c
+++ b/src/battle/anim/draw.c
@@ -6,11 +6,11 @@
 #include "unknown_task.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
-extern u16 gUnknown_03004288;
-extern u16 gUnknown_030042C0;
+extern u16 gBattle_BG2_X;
+extern u16 gBattle_BG1_X;
 
 static void sub_80D0D68(u8 taskId);
 static void sub_80D0E8C(struct Sprite* sprite);
@@ -23,21 +23,21 @@ void sub_80D0C88(u8 taskId)
     struct Task* task = &gTasks[taskId];
     struct UnknownTaskStruct sp;
     s16 i;
-    task->data[0] = sub_8077FC0(gBattleAnimBankTarget) + 32;
+    task->data[0] = sub_8077FC0(gAnimBankTarget) + 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(gBattleAnimBankTarget, 0);
-    if (GetBankIdentity_permutated(gBattleAnimBankTarget) == 1)
+    task->data[15] = sub_807A100(gAnimBankTarget, 0);
+    if (GetBankIdentity_permutated(gAnimBankTarget) == 1)
     {
-        task->data[6] = gUnknown_030042C0;
+        task->data[6] = gBattle_BG1_X;
         sp.dest = (u16 *)REG_ADDR_BG1HOFS;
     }
     else
     {
-        task->data[6] = gUnknown_03004288;
+        task->data[6] = gBattle_BG2_X;
         sp.dest = (u16 *)REG_ADDR_BG2HOFS;
     }
 
@@ -220,15 +220,15 @@ _080D0E2C: .4byte gUnknown_03004DC0\n\
 
 void sub_80D0E30(struct Sprite* sprite)
 {
-    sprite->pos1.x = sub_8077ABC(gBattleAnimBankTarget, 0) - 16;
-    sprite->pos1.y = sub_8077FC0(gBattleAnimBankTarget) + 16;
+    sprite->pos1.x = GetBankPosition(gAnimBankTarget, 0) - 16;
+    sprite->pos1.y = sub_8077FC0(gAnimBankTarget) + 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(gBattleAnimBankTarget, 0) + 2;
-    sprite->data[6] = sub_8076F98(0x3F);
+    sprite->data[5] = sub_807A100(gAnimBankTarget, 0) + 2;
+    sprite->data[6] = BattleAnimAdjustPanning(0x3F);
     sprite->callback = sub_80D0E8C;
 }
 
@@ -285,7 +285,7 @@ void sub_80D0E8C(struct Sprite* sprite)
         if (++sprite->data[1] > 16)
         {
             sprite->invisible = 0;
-            move_anim_8072740(sprite);
+            DestroyAnimSprite(sprite);
         }
         break;
     }
diff --git a/src/battle/anim/drum.c b/src/battle/anim/drum.c
index 60cb2acc1..6306778ae 100755
--- a/src/battle/anim/drum.c
+++ b/src/battle/anim/drum.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 // drum (using hands to slap the Pokemon's belly in a rhythm.)
 // Used in Belly Drum.
@@ -24,9 +24,9 @@ void sub_80CEDF0(struct Sprite* sprite)
         a = -16;
     }
 
-    sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2) + a;
-    sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 3) + 8;
+    sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2) + a;
+    sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3) + 8;
     sprite->data[0] = 8;
     sprite->callback = sub_80782D8;
-    StoreSpriteCallbackInData(sprite, move_anim_8072740);
+    StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
 }
diff --git a/src/battle/anim/egg.c b/src/battle/anim/egg.c
index a5bcffa6d..8004b3bf5 100755
--- a/src/battle/anim/egg.c
+++ b/src/battle/anim/egg.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 static void sub_80D13AC(struct Sprite* sprite);
 static void sub_80D1424(struct Sprite* sprite);
@@ -23,7 +23,7 @@ void sub_80D1368(struct Sprite* sprite)
 {
     s16 r1;
     sub_80787B0(sprite, 0);
-    r1 = (GetBankSide(gBattleAnimBankAttacker)) ? -0xA0 : 0xA0;
+    r1 = (GetBankSide(gAnimBankAttacker)) ? -0xA0 : 0xA0;
     sprite->data[0] = 0x380;
     sprite->data[1] = r1;
     sprite->data[7] = gBattleAnimArgs[2];
@@ -36,7 +36,7 @@ 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 = (GetBankSide(gBattleAnimBankAttacker)) ? -0xA0 : 0xA0;
+    add = (GetBankSide(gAnimBankAttacker)) ? -0xA0 : 0xA0;
     sprite->data[1] += add;
     if (sprite->pos2.y > 0)
     {
@@ -110,7 +110,7 @@ void sub_80D154C(struct Sprite* sprite)
         if (sprite->data[7] == 0)
             sprite->callback = sub_80D158C;
         else
-            sprite->callback = move_anim_8072740;
+            sprite->callback = DestroyAnimSprite;
     }
 }
 
@@ -118,5 +118,5 @@ void sub_80D158C(struct Sprite* sprite)
 {
     REG_BLDCNT = 0;
     REG_BLDALPHA = 0;
-    move_anim_8072740(sprite);
+    DestroyAnimSprite(sprite);
 }
diff --git a/src/battle/anim/energy_wave.c b/src/battle/anim/energy_wave.c
index ffba5c300..15045f5bd 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 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 extern const struct SpriteTemplate gSpriteTemplate_83D9130[];
 
 static void sub_80D35DC(struct Sprite *);
@@ -24,9 +24,9 @@ void sub_80D3554(struct Sprite *sprite)
 
     sprite->data[0] = 30;
     sprite->data[1] = sprite->pos1.x;
-    sprite->data[2] = sub_8077ABC(gBattleAnimBankTarget, 2);
+    sprite->data[2] = GetBankPosition(gAnimBankTarget, 2);
     sprite->data[3] = sprite->pos1.y;
-    sprite->data[4] = sub_8077ABC(gBattleAnimBankTarget, 3);
+    sprite->data[4] = GetBankPosition(gAnimBankTarget, 3);
 
     obj_translate_based_on_private_1_2_3_4(sprite);
 
@@ -51,7 +51,7 @@ static void sub_80D35DC(struct Sprite *sprite)
 {
     if (sub_8078B5C(sprite))
     {
-        move_anim_8072740(sprite);
+        DestroyAnimSprite(sprite);
     }
 
     sprite->pos2.y += Sin(sprite->data[6] >> 8, sprite->data[7]);
@@ -86,15 +86,15 @@ void sub_80D3698(struct Sprite *sprite)
 {
     u8 subpriority;
 
-    sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 0);
-    sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 1);
+    sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 0);
+    sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 1);
     sprite->pos2.y = -10;
 
-    subpriority = sub_8079E90(gBattleAnimBankAttacker);
+    subpriority = sub_8079E90(gAnimBankAttacker);
 
-    if (!NotInBattle())
+    if (!IsContest())
     {
-        if (GetBankSide(gBattleAnimBankAttacker) == 0)
+        if (GetBankSide(gAnimBankAttacker) == 0)
         {
             sprite->pos2.x = 10;
             sprite->subpriority = subpriority + 2;
@@ -118,7 +118,7 @@ static void sub_80D370C(struct Sprite *sprite)
 {
     if (sprite->affineAnimEnded)
     {
-        move_anim_8072740(sprite);
+        DestroyAnimSprite(sprite);
     }
 }
 
@@ -126,11 +126,11 @@ void sub_80D3728(struct Sprite *sprite)
 {
     int var1, var2;
 
-    if (GetBankSide(gBattleAnimBankAttacker) == GetBankSide(gBattleAnimBankTarget))
+    if (GetBankSide(gAnimBankAttacker) == GetBankSide(gAnimBankTarget))
     {
         gBattleAnimArgs[0] *= -1;
 
-        if (GetBankIdentity(gBattleAnimBankAttacker) == 0 || GetBankIdentity(gBattleAnimBankAttacker) == 1)
+        if (GetBankIdentity(gAnimBankAttacker) == 0 || GetBankIdentity(gAnimBankAttacker) == 1)
         {
             gBattleAnimArgs[0] *= -1;
         }
@@ -149,14 +149,14 @@ void sub_80D3728(struct Sprite *sprite)
 
     sub_80787B0(sprite, var1);
 
-    if (GetBankSide(gBattleAnimBankAttacker) != 0)
+    if (GetBankSide(gAnimBankAttacker) != 0)
     {
         gBattleAnimArgs[2] = -gBattleAnimArgs[2];
     }
 
     sprite->data[0] = gBattleAnimArgs[4];
-    sprite->data[2] = sub_8077ABC(gBattleAnimBankTarget, 2) + gBattleAnimArgs[2];
-    sprite->data[4] = sub_8077ABC(gBattleAnimBankTarget, var2) + gBattleAnimArgs[3];
+    sprite->data[2] = GetBankPosition(gAnimBankTarget, 2) + gBattleAnimArgs[2];
+    sprite->data[4] = GetBankPosition(gAnimBankTarget, var2) + gBattleAnimArgs[3];
     sprite->callback = sub_8078B34;
-    StoreSpriteCallbackInData(sprite, move_anim_8072740);
+    StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
 }
diff --git a/src/battle/anim/espeed.c b/src/battle/anim/espeed.c
index 621d386e1..469522092 100755
--- a/src/battle/anim/espeed.c
+++ b/src/battle/anim/espeed.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 extern s8 gUnknown_083D7A00[4][2];
 
@@ -51,7 +51,7 @@ void sub_80D1638(u8 taskId)
     task->data[2] = 0;
     task->data[3] = 0;
     task->data[12] = 3;
-    if (GetBankSide(gBattleAnimBankTarget) == 0)
+    if (GetBankSide(gAnimBankTarget) == 0)
     {
         task->data[13] = 0xFFFF;
         task->data[14] = 8;
@@ -169,8 +169,8 @@ void sub_80D18D4(u8 taskId)
     task->data[7] = 0;
     task->data[8] = 0;
     task->data[13] = 0;
-    task->data[14] = sub_8077ABC(gBattleAnimBankAttacker, 0);
-    task->data[15] = sub_8077ABC(gBattleAnimBankAttacker, 1);
+    task->data[14] = GetBankPosition(gAnimBankAttacker, 0);
+    task->data[15] = GetBankPosition(gAnimBankAttacker, 1);
     task->func = sub_80D1930;
 }
 
diff --git a/src/battle/anim/evasion.c b/src/battle/anim/evasion.c
index b4e81009b..ded8428d4 100755
--- 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 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 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 (GetBankIdentity_permutated(gBattleAnimBankAttacker) == 1)
+    if (GetBankIdentity_permutated(gAnimBankAttacker) == 1)
     {
         REG_DISPCNT &= 0xFDFF;
     }
@@ -62,7 +62,7 @@ void sub_80CE910(u8 taskId)
     struct Task* task = &gTasks[taskId];
     if (!task->data[3])
     {
-        if (GetBankIdentity_permutated(gBattleAnimBankAttacker) == 1)
+        if (GetBankIdentity_permutated(gAnimBankAttacker) == 1)
             REG_DISPCNT |= 0x200;
         else
             REG_DISPCNT |= 0x400;
diff --git a/src/battle/anim/fang.c b/src/battle/anim/fang.c
index 4df450691..5ed7372a8 100755
--- a/src/battle/anim/fang.c
+++ b/src/battle/anim/fang.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 // fang
 // Used by Super Fang (and probably Hyper Fang, but the actual callbacks are not in this file.)
@@ -14,6 +14,6 @@ extern u8 gBattleAnimBankTarget;
 
 void sub_80CEA04(struct Sprite* sprite)
 {
-    StoreSpriteCallbackInData(sprite, move_anim_8072740);
+    StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
     sprite->callback = sub_8078600;
 }
diff --git a/src/battle/anim/flash.c b/src/battle/anim/flash.c
index 0e087ec2d..eaa38e5b7 100755
--- a/src/battle/anim/flash.c
+++ b/src/battle/anim/flash.c
@@ -6,8 +6,8 @@
 #include "palette.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 extern struct SpriteTemplate gBattleAnimSpriteTemplate_83D6FC8;
 extern struct SpriteTemplate gBattleAnimSpriteTemplate_83D6FF8;
diff --git a/src/battle/anim/flying_hearts.c b/src/battle/anim/flying_hearts.c
index 5b7d31a51..d2d22602a 100755
--- 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 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 static void sub_80D2094(struct Sprite* sprite);
 
@@ -35,6 +35,6 @@ void sub_80D2094(struct Sprite* sprite)
     {
         sprite->invisible = sprite->data[3] % 2;
         if (y <= 0x40)
-            move_anim_8072740(sprite);
+            DestroyAnimSprite(sprite);
     }
 }
diff --git a/src/battle/anim/flying_path.c b/src/battle/anim/flying_path.c
index 017f89858..441ac0e6d 100755
--- 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 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 extern struct SpriteTemplate gSpriteTemplate_83D6884;
 
@@ -22,12 +22,12 @@ void sub_80CBDF4(u8 taskId)
 {
     struct Task *task = &gTasks[taskId];
 
-    task->data[4] = sub_8079E90(gBattleAnimBankTarget) - 1;
-    task->data[6] = sub_8077ABC(gBattleAnimBankTarget, 2);
-    task->data[7] = sub_8077ABC(gBattleAnimBankTarget, 3);
-    task->data[10] = sub_807A100(gBattleAnimBankTarget, 1);
-    task->data[11] = sub_807A100(gBattleAnimBankTarget, 0);
-    task->data[5] = (GetBankSide(gBattleAnimBankTarget) == 1) ? 1 : -1;
+    task->data[4] = sub_8079E90(gAnimBankTarget) - 1;
+    task->data[6] = GetBankPosition(gAnimBankTarget, 2);
+    task->data[7] = GetBankPosition(gAnimBankTarget, 3);
+    task->data[10] = sub_807A100(gAnimBankTarget, 1);
+    task->data[11] = sub_807A100(gAnimBankTarget, 0);
+    task->data[5] = (GetBankSide(gAnimBankTarget) == 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 ed6497b7a..4eeaa5215 100755
--- 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 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 static void sub_80CC580(struct Sprite* sprite);
 
@@ -17,9 +17,9 @@ void sub_80CC474(struct Sprite* sprite)
 {
     u8 bank;
     if (!gBattleAnimArgs[6])
-        bank = gBattleAnimBankAttacker;
+        bank = gAnimBankAttacker;
     else
-        bank = gBattleAnimBankTarget;
+        bank = gAnimBankTarget;
 
     if (GetBankSide(bank) != 0)
     {
@@ -48,11 +48,11 @@ void sub_80CC474(struct Sprite* sprite)
         sprite->oam.priority = sub_8079ED4(bank) + 1;
         break;
     case 2:
-        sprite->pos1.y = sub_8077ABC(bank, 3) + gBattleAnimArgs[0];
+        sprite->pos1.y = GetBankPosition(bank, 3) + gBattleAnimArgs[0];
         sprite->oam.priority = sub_8079ED4(bank);
         break;
     case 3:
-        sprite->pos1.y = sub_8077ABC(gBattleAnimBankTarget, 3) + gBattleAnimArgs[0];
+        sprite->pos1.y = GetBankPosition(gAnimBankTarget, 3) + gBattleAnimArgs[0];
         GetAnimBankSpriteId(1);
         sprite->oam.priority = sub_8079ED4(bank) + 1;
         break;
diff --git a/src/battle/anim/glitter.c b/src/battle/anim/glitter.c
index 548397932..e4577f1e1 100755
--- a/src/battle/anim/glitter.c
+++ b/src/battle/anim/glitter.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 // glitter (the sparkling effect seen on Pokemon, usually after healing or a beneficial effect.)
 // Used by Heal Bell, Cosmic Power, and Aromatherapy.
@@ -21,7 +21,7 @@ void sub_80CD140(struct Sprite* sprite)
     sprite->data[0] = gBattleAnimArgs[5];
     sprite->data[1] = gBattleAnimArgs[3];
     sprite->data[2] = gBattleAnimArgs[4];
-    StoreSpriteCallbackInData(sprite, move_anim_8072740);
+    StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
     sprite->callback = sub_8078394;
 }
 
@@ -29,9 +29,9 @@ void sub_80CD190(struct Sprite* sprite)
 {
     u8 bank;
     if (!gBattleAnimArgs[2])
-        bank = gBattleAnimBankAttacker;
+        bank = gAnimBankAttacker;
     else
-        bank = gBattleAnimBankTarget;
+        bank = gAnimBankTarget;
 
     if (IsDoubleBattle() && IsAnimBankSpriteVisible(bank ^ 2))
     {
@@ -43,13 +43,13 @@ void sub_80CD190(struct Sprite* sprite)
     {
         if (!gBattleAnimArgs[6])
         {
-            sprite->pos1.x = sub_8077ABC(bank, 0);
-            sprite->pos1.y = sub_8077ABC(bank, 1) + gBattleAnimArgs[1];
+            sprite->pos1.x = GetBankPosition(bank, 0);
+            sprite->pos1.y = GetBankPosition(bank, 1) + gBattleAnimArgs[1];
         }
         else
         {
-            sprite->pos1.x = sub_8077ABC(bank, 2);
-            sprite->pos1.y = sub_8077ABC(bank, 3) + gBattleAnimArgs[1];
+            sprite->pos1.x = GetBankPosition(bank, 2);
+            sprite->pos1.y = GetBankPosition(bank, 3) + gBattleAnimArgs[1];
         }
 
         sub_807867C(sprite, gBattleAnimArgs[0]);
@@ -58,6 +58,6 @@ void sub_80CD190(struct Sprite* sprite)
     sprite->data[0] = gBattleAnimArgs[5];
     sprite->data[1] = gBattleAnimArgs[3];
     sprite->data[2] = gBattleAnimArgs[4];
-    StoreSpriteCallbackInData(sprite, move_anim_8072740);
+    StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
     sprite->callback = sub_8078394;
 }
diff --git a/src/battle/anim/glow.c b/src/battle/anim/glow.c
index 6038825af..63466c0ff 100755
--- a/src/battle/anim/glow.c
+++ b/src/battle/anim/glow.c
@@ -8,8 +8,8 @@
 #include "decompress.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 extern u16 gUnknown_083D7A5C[5];
 
@@ -32,11 +32,11 @@ void sub_80D1ADC(u8 taskId)
     }
 
     src = &gBattleAnimSpritePalette_206;
-    dest = (NotInBattle()) ? gSharedMem + 0x18000 - 0x3800: gSharedMem + 0x18000;
+    dest = (IsContest()) ? gSharedMem + 0x18000 - 0x3800: gSharedMem + 0x18000;
     LZDecompressWram(src, dest);
     for (i = 0; i <= 4; i++)
     {
-        what = ((NotInBattle()) ? gSharedMem + 0x14800 : gSharedMem + 0x18000) + (i << 5);
+        what = ((IsContest()) ? gSharedMem + 0x14800 : gSharedMem + 0x18000) + (i << 5);
         LoadPalette(what, (u16)((sp[i] << 4) + 0x100), 32);
     }
 
diff --git a/src/battle/anim/grip.c b/src/battle/anim/grip.c
index 93c3dba96..c4d7b1cef 100755
--- a/src/battle/anim/grip.c
+++ b/src/battle/anim/grip.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 static void sub_80D020C(struct Sprite* sprite);
 
@@ -31,8 +31,8 @@ void sub_80D0178(struct Sprite* sprite)
     sprite->pos1.x += r7;
     sprite->pos1.y += r4;
     sprite->data[0] = 6;
-    sprite->data[2] = sub_8077ABC(gBattleAnimBankTarget, 2) + r8;
-    sprite->data[4] = sub_8077ABC(gBattleAnimBankTarget, 3) + r6;
+    sprite->data[2] = GetBankPosition(gAnimBankTarget, 2) + r8;
+    sprite->data[4] = GetBankPosition(gAnimBankTarget, 3) + r6;
     sprite->callback = sub_8078B34;
     StoreSpriteCallbackInData(sprite, sub_80D020C);
 }
@@ -40,5 +40,5 @@ void sub_80D0178(struct Sprite* sprite)
 void sub_80D020C(struct Sprite* sprite)
 {
     if (sprite->animEnded == 1)
-        move_anim_8072740(sprite);
+        DestroyAnimSprite(sprite);
 }
diff --git a/src/battle/anim/grow.c b/src/battle/anim/grow.c
index 35047c8b0..8788b32fe 100755
--- a/src/battle/anim/grow.c
+++ b/src/battle/anim/grow.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 extern struct AffineAnimFrameCmd gUnknown_083D7714;
 
diff --git a/src/battle/anim/guard.c b/src/battle/anim/guard.c
index 4769db2e4..ab093eab1 100644
--- a/src/battle/anim/guard.c
+++ b/src/battle/anim/guard.c
@@ -3,8 +3,8 @@
 #include "rom_8077ABC.h"
 
 extern s16 gBattleAnimArgs[8];
-extern u8 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 extern u16 gBattleTypeFlags;
 
 // guard (moves guard rings upwards)
@@ -12,17 +12,17 @@ extern u16 gBattleTypeFlags;
 
 void sub_80D3014(struct Sprite *sprite)
 {
-    if ((gBattleTypeFlags & 1) && IsAnimBankSpriteVisible(gBattleAnimBankAttacker ^ 2))
+    if ((gBattleTypeFlags & 1) && IsAnimBankSpriteVisible(gAnimBankAttacker ^ 2))
     {
-        sub_807A3FC(gBattleAnimBankAttacker, 0, &sprite->pos1.x, &sprite->pos1.y);
+        sub_807A3FC(gAnimBankAttacker, 0, &sprite->pos1.x, &sprite->pos1.y);
         sprite->pos1.y += 40;
 
         StartSpriteAffineAnim(sprite, 1);
     }
     else
     {
-        sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 0);
-        sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 1) + 40;
+        sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 0);
+        sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 1) + 40;
     }
 
     sprite->data[0] = 13;
@@ -30,5 +30,5 @@ void sub_80D3014(struct Sprite *sprite)
     sprite->data[4] = sprite->pos1.y - 72;
 
     sprite->callback = sub_8078B34;
-    StoreSpriteCallbackInData(sprite, move_anim_8072740);
+    StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
 }
diff --git a/src/battle/anim/guillotine.c b/src/battle/anim/guillotine.c
index b710f372a..b3d842cdf 100755
--- a/src/battle/anim/guillotine.c
+++ b/src/battle/anim/guillotine.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 static void sub_80D02D0(struct Sprite* sprite);
 static void sub_80D0344(struct Sprite* sprite);
@@ -34,9 +34,9 @@ void sub_80D0228(struct Sprite* sprite)
     sprite->pos1.y += r4;
     sprite->data[0] = 6;
     sprite->data[1] = sprite->pos1.x;
-    sprite->data[2] = sub_8077ABC(gBattleAnimBankTarget, 2) + r9;
+    sprite->data[2] = GetBankPosition(gAnimBankTarget, 2) + r9;
     sprite->data[3] = sprite->pos1.y;
-    sprite->data[4] = sub_8077ABC(gBattleAnimBankTarget, 3) + r6;
+    sprite->data[4] = GetBankPosition(gAnimBankTarget, 3) + r6;
     obj_translate_based_on_private_1_2_3_4(sprite);
     sprite->data[5] = gBattleAnimArgs[0];
     sprite->data[6] = sprite->data[0];
@@ -86,5 +86,5 @@ void sub_80D0344(struct Sprite* sprite)
 void sub_80D03A8(struct Sprite* sprite)
 {
     if (sub_8078B5C(sprite) != 0)
-        move_anim_8072740(sprite);
+        DestroyAnimSprite(sprite);
 }
diff --git a/src/battle/anim/heal.c b/src/battle/anim/heal.c
index c5950650c..a8c14ea1c 100755
--- 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 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 // heal (healing sparkles on a Pokemon)
 // Used in Present, if the move heals instead of damages.
@@ -22,6 +22,6 @@ void sub_80CBAA4(struct Sprite* sprite)
     sprite->pos2.y = sprite->data[1] * sprite->data[0];
     if (sprite->animEnded)
     {
-        move_anim_8072740(sprite);
+        DestroyAnimSprite(sprite);
     }
 }
diff --git a/src/battle/anim/heart_1.c b/src/battle/anim/heart_1.c
index 1ab83136c..5df89f929 100755
--- 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 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 // heart_1 (a floating heart in a wave pattern upward.)
 // Used in Charm, Covet, and when a Pokemon is infatuated.
@@ -21,5 +21,5 @@ void sub_80D1C80(struct Sprite* sprite)
     sprite->data[1] = (sprite->data[1] + 7) & 0xFF;
     sprite->data[2] -= 0x80;
     if (sprite->data[0] == 0x3C)
-        move_anim_8072740(sprite);
+        DestroyAnimSprite(sprite);
 }
diff --git a/src/battle/anim/heated_rock.c b/src/battle/anim/heated_rock.c
index 1d59669cf..51cfbd007 100644
--- a/src/battle/anim/heated_rock.c
+++ b/src/battle/anim/heated_rock.c
@@ -3,8 +3,8 @@
 #include "rom_8077ABC.h"
 
 extern s16 gBattleAnimArgs[8];
-extern u8 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 extern u16 gBattleTypeFlags;
 
 void sub_80D59B0(struct Sprite *);
@@ -28,7 +28,7 @@ u16 sub_80D5940(u8 spriteId)
 {
     u16 var1 = gSprites[spriteId].pos1.y + gSprites[spriteId].pos2.y + gSprites[spriteId].centerToCornerVecY;
 
-    if (GetBankSide(gBattleAnimBankAttacker) == 0)
+    if (GetBankSide(gAnimBankAttacker) == 0)
     {
         var1 = ((var1 << 16) + 0x4A0000) >> 16;
     }
@@ -198,7 +198,7 @@ static void sub_80D5A74(struct Sprite *sprite)
 
         if (++sprite->data[3] > 16)
         {
-            move_anim_8072740(sprite);
+            DestroyAnimSprite(sprite);
         }
         break;
     }
diff --git a/src/battle/anim/homing.c b/src/battle/anim/homing.c
index c5e372d78..6fb4a76d8 100755
--- a/src/battle/anim/homing.c
+++ b/src/battle/anim/homing.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 static void sub_80CC7D4(struct Sprite* sprite);
 
@@ -23,19 +23,19 @@ void sub_80CC6CC(struct Sprite* sprite)
 
     if (gBattleAnimArgs[4] == 0)
     {
-        move_anim_8072740(sprite);
+        DestroyAnimSprite(sprite);
     }
     else
     {
         if (gBattleAnimArgs[0] == 0)
         {
-            a = sub_8077ABC(gBattleAnimBankAttacker, 2);
-            b = sub_8077ABC(gBattleAnimBankAttacker, 3);
+            a = GetBankPosition(gAnimBankAttacker, 2);
+            b = GetBankPosition(gAnimBankAttacker, 3);
         }
         else
         {
-            a = sub_8077ABC(gBattleAnimBankTarget, 2);
-            b = sub_8077ABC(gBattleAnimBankTarget, 3);
+            a = GetBankPosition(gAnimBankTarget, 2);
+            b = GetBankPosition(gAnimBankTarget, 3);
         }
 
         sprite->data[0] = gBattleAnimArgs[4];
@@ -61,7 +61,7 @@ void sub_80CC6CC(struct Sprite* sprite)
         sprite->data[3] = (sprite->data[5] - sprite->pos1.x) * 16 / gBattleAnimArgs[4];
         sprite->data[4] = (sprite->data[6] - sprite->pos1.y) * 16 / gBattleAnimArgs[4];
         c = sub_80790F0(sprite->data[5] - x, sprite->data[6] - y);
-        if (NotInBattle())
+        if (IsContest())
             c -= 0x8000;
 
         sub_8078FDC(sprite, 0, 0x100, 0x100, c);
diff --git a/src/battle/anim/hop.c b/src/battle/anim/hop.c
index 60f3b8a48..4006e2d43 100755
--- 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 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 // hop (where a sprite "hops" across the screen)
 // Used by Present, Trick, and the item knock off effect.
@@ -65,7 +65,7 @@ void sub_80CB8B8(struct Sprite* sprite)
     sprite->data[0]++;
     if (sprite->data[0] > 50)
     {
-        move_anim_8072740(sprite);
+        DestroyAnimSprite(sprite);
     }
 }
 
@@ -92,9 +92,9 @@ void sub_80CB94C(struct Sprite* sprite)
     s16 e1;
     s16 e2;
     sub_80787B0(sprite, 0);
-    e1 = sub_8077ABC(gBattleAnimBankTarget, 0);
-    e2 = sub_8077ABC(gBattleAnimBankTarget, 1);
-    if ((gBattleAnimBankAttacker ^ 2) == gBattleAnimBankTarget)
+    e1 = GetBankPosition(gAnimBankTarget, 0);
+    e2 = GetBankPosition(gAnimBankTarget, 1);
+    if ((gAnimBankAttacker ^ 2) == gAnimBankTarget)
     {
         sprite->data[6] = e1;
         sprite->data[7] = e2 + 10;
@@ -129,14 +129,14 @@ void sub_80CB9C4(struct Sprite* sprite)
     {
         sprite->pos2.y = zero;
         sprite->data[0] = zero;
-        move_anim_8072740(sprite);
+        DestroyAnimSprite(sprite);
     }
 }
 
 void sub_80CBA28(struct Sprite* sprite)
 {
-    s16 e = sub_8077ABC(gBattleAnimBankTarget, 1);
-    if (GetBankSide(gBattleAnimBankTarget) == 0)
+    s16 e = GetBankPosition(gAnimBankTarget, 1);
+    if (GetBankSide(gAnimBankTarget) == 0)
     {
         sprite->data[6] = 0;
         sprite->data[7] = e + 10;
@@ -149,7 +149,7 @@ void sub_80CBA28(struct Sprite* sprite)
     {
         sprite->data[6] = 255;
         sprite->data[7] = e + 10;
-        if (NotInBattle())
+        if (IsContest())
             sprite->data[6] = 0;
 
         sub_80CB7EC(sprite, 0x28);
diff --git a/src/battle/anim/hop_2.c b/src/battle/anim/hop_2.c
index 5458c4599..1bc3f46af 100755
--- 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 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 extern void sub_80CB7EC(struct Sprite* sprite, s16 c);
 extern bool8 sub_80CB814(struct Sprite* sprite);
@@ -22,9 +22,9 @@ void sub_80CBAE8(struct Sprite* sprite)
     s16 p1;
     s16 p2;
     sub_8078764(sprite, 0);
-    p1 = sub_8077ABC(gBattleAnimBankAttacker, 0);
-    p2 = sub_8077ABC(gBattleAnimBankAttacker, 1);
-    if ((gBattleAnimBankTarget ^ 2) == gBattleAnimBankAttacker)
+    p1 = GetBankPosition(gAnimBankAttacker, 0);
+    p2 = GetBankPosition(gAnimBankAttacker, 1);
+    if ((gAnimBankTarget ^ 2) == gAnimBankAttacker)
     {
         sprite->data[6] = p1;
         sprite->data[7] = p2 + 10;
@@ -57,7 +57,7 @@ void sub_80CBB60(struct Sprite* sprite)
     sprite->pos2.y = Sin(sprite->data[0] + 0x80, 30 - sprite->data[1] * 8);
     if (sprite->pos2.y == 0)
     {
-        PlaySE12WithPanning(0x7D, sub_8076F98(0x3F));
+        PlaySE12WithPanning(0x7D, BattleAnimAdjustPanning(0x3F));
     }
 
     if (sub_80CB814(sprite))
@@ -65,6 +65,6 @@ void sub_80CBB60(struct Sprite* sprite)
         sprite->pos2.y = 0;
         sprite->data[0] = 0;
         sprite->callback = sub_80CB8B8;
-        PlaySE12WithPanning(0x7D, sub_8076F98(-0x40));
+        PlaySE12WithPanning(0x7D, BattleAnimAdjustPanning(-0x40));
     }
 }
diff --git a/src/battle/anim/kiss_fountain.c b/src/battle/anim/kiss_fountain.c
index 2e7f64c11..d3270ee65 100755
--- 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 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 // kiss_fountain (a series of hearts pour out of a target Pokemon.)
 // Used in Attract and Sweet Kiss.
@@ -32,7 +32,7 @@ void sub_80D1FDC(struct Sprite* sprite)
 
         if (sprite->data[3] > 0x78)
         {
-            move_anim_8072740(sprite);
+            DestroyAnimSprite(sprite);
         }
     }
 }
diff --git a/src/battle/anim/leaf.c b/src/battle/anim/leaf.c
index 13d1bc9f5..676734717 100755
--- a/src/battle/anim/leaf.c
+++ b/src/battle/anim/leaf.c
@@ -4,8 +4,8 @@
 #include "battle_anim.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 static void sub_80CAF20(struct Sprite* sprite);
 static void sub_80CAF6C(struct Sprite* sprite);
@@ -15,8 +15,8 @@ static void sub_80CAF6C(struct Sprite* sprite);
 
 void sub_80CAED8(struct Sprite* sprite)
 {
-    sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2);
-    sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 3);
+    sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2);
+    sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3);
     sprite->data[0] = gBattleAnimArgs[0];
     sprite->data[1] = gBattleAnimArgs[1];
     sprite->data[2] = gBattleAnimArgs[2];
@@ -51,7 +51,7 @@ void sub_80CAF20(struct Sprite* sprite)
 
 void sub_80CAF6C(struct Sprite* sprite)
 {
-    if (GetBankSide(gBattleAnimBankAttacker))
+    if (GetBankSide(gAnimBankAttacker))
     {
         sprite->pos2.x = -Sin(sprite->data[0], 0x19);
     }
@@ -69,6 +69,6 @@ void sub_80CAF6C(struct Sprite* sprite)
 
     if (sprite->data[1] > 0x50)
     {
-        move_anim_8072740(sprite);
+        DestroyAnimSprite(sprite);
     }
 }
diff --git a/src/battle/anim/love_bg.c b/src/battle/anim/love_bg.c
index 1e49b536c..bd3d22ca6 100755
--- a/src/battle/anim/love_bg.c
+++ b/src/battle/anim/love_bg.c
@@ -7,15 +7,15 @@
 #include "palette.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 extern struct INCBIN_U8 gAttractTilemap;
 extern struct INCBIN_U8 gAttractGfx;
 extern struct INCBIN_U8 gAttractPal;
 
-extern u16 gUnknown_030041B4;
-extern u16 gUnknown_030042C0;
+extern u16 gBattle_BG1_Y;
+extern u16 gBattle_BG1_X;
 
 static void sub_80D21F0(u8 taskId);
 
@@ -30,11 +30,11 @@ void sub_80D2100(u8 taskId)
     REG_BLDALPHA = 0x1000;
     REG_BG1CNT_BITFIELD.priority = 3;
     REG_BG1CNT_BITFIELD.screenSize = 0;
-    if (!NotInBattle())
+    if (!IsContest())
         REG_BG1CNT_BITFIELD.charBaseBlock = 1;
 
-    gUnknown_030042C0 = 0;
-    gUnknown_030041B4 = 0;
+    gBattle_BG1_X = 0;
+    gBattle_BG1_Y = 0;
     REG_BG1HOFS = 0;
     REG_BG1VOFS = 0;
     sub_8078914(&subStruct);
@@ -43,7 +43,7 @@ void sub_80D2100(u8 taskId)
     LZDecompressVram(&gAttractTilemap, tempvar);
     LZDecompressVram(&gAttractGfx, subStruct.field_0);
     LoadCompressedPalette(&gAttractPal, subStruct.field_8 << 4, 32);
-    if (NotInBattle())
+    if (IsContest())
         sub_80763FC(subStruct.field_8, (u16 *)subStruct.field_4, 0, 0);
 
     gTasks[taskId].func = sub_80D21F0;
@@ -106,7 +106,7 @@ void sub_80D21F0(u8 taskId)
             }
         }
         DmaClear32(3, subStruct.field_4, 0x800);
-        if (!NotInBattle())
+        if (!IsContest())
             REG_BG1CNT_BITFIELD.charBaseBlock = 0;
 
         gTasks[taskId].data[12]++;
diff --git a/src/battle/anim/lunge_1.c b/src/battle/anim/lunge_1.c
index f1e1e35b6..d379c8f09 100755
--- a/src/battle/anim/lunge_1.c
+++ b/src/battle/anim/lunge_1.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 extern u8 gObjectBankIDs[];
 
@@ -44,9 +44,9 @@ void sub_80CD774(struct Sprite* sprite)
 void sub_80CD7CC(struct Sprite* sprite)
 {
     sprite->data[0] = 6;
-    sprite->data[1] = (GetBankSide(gBattleAnimBankAttacker)) ? 2 : -2;
+    sprite->data[1] = (GetBankSide(gAnimBankAttacker)) ? 2 : -2;
     sprite->data[2] = 0;
-    sprite->data[3] = gObjectBankIDs[gBattleAnimBankAttacker];
+    sprite->data[3] = gObjectBankIDs[gAnimBankAttacker];
     StoreSpriteCallbackInData(sprite, sub_80CD81C);
     sprite->callback = sub_8078458;
 }
@@ -55,9 +55,9 @@ void sub_80CD81C(struct Sprite* sprite)
 {
     if (sprite->data[0] == 0)
     {
-        sprite->data[3] = gObjectBankIDs[gBattleAnimBankAttacker];
+        sprite->data[3] = gObjectBankIDs[gAnimBankAttacker];
         sub_8078E70(sprite->data[3], 0);
-        sprite->data[4] = (sprite->data[6] = GetBankSide(gBattleAnimBankAttacker)) ? 0x300 : 0xFFFFFD00;
+        sprite->data[4] = (sprite->data[6] = GetBankSide(gAnimBankAttacker)) ? 0x300 : 0xFFFFFD00;
         sprite->data[5] = 0;
     }
 
@@ -74,9 +74,9 @@ void sub_80CD81C(struct Sprite* sprite)
 void sub_80CD8A8(struct Sprite* sprite)
 {
     sprite->data[0] = 4;
-    sprite->data[1] = (GetBankSide(gBattleAnimBankAttacker)) ? -3 : 3;
+    sprite->data[1] = (GetBankSide(gAnimBankAttacker)) ? -3 : 3;
     sprite->data[2] = 0;
-    sprite->data[3] = gObjectBankIDs[gBattleAnimBankAttacker];
+    sprite->data[3] = gObjectBankIDs[gAnimBankAttacker];
     StoreSpriteCallbackInData(sprite, sub_80CD9B8);
     sprite->callback = sub_8078458;
 }
@@ -94,9 +94,9 @@ void sub_80CD91C(struct Sprite* sprite)
 {
     if (sprite->data[0] == 0)
     {
-        sprite->data[3] = gObjectBankIDs[gBattleAnimBankAttacker];
-        sprite->data[6] = GetBankSide(gBattleAnimBankAttacker);
-        if (GetBankSide(gBattleAnimBankAttacker))
+        sprite->data[3] = gObjectBankIDs[gAnimBankAttacker];
+        sprite->data[6] = GetBankSide(gAnimBankAttacker);
+        if (GetBankSide(gAnimBankAttacker))
         {
             sprite->data[4] = 0xFC00;
             sprite->data[5] = 0xC00;
@@ -120,5 +120,5 @@ void sub_80CD91C(struct Sprite* sprite)
 
 void sub_80CD9B8(struct Sprite* sprite)
 {
-    move_anim_8072740(sprite);
+    DestroyAnimSprite(sprite);
 }
diff --git a/src/battle/anim/lunge_2.c b/src/battle/anim/lunge_2.c
index 3972bee59..fe2470567 100755
--- a/src/battle/anim/lunge_2.c
+++ b/src/battle/anim/lunge_2.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 extern u8 gObjectBankIDs[];
 
@@ -20,8 +20,8 @@ void sub_80CDAC8(u8 taskId)
 {
     u8 a;
 
-    gTasks[taskId].data[0] = gObjectBankIDs[gBattleAnimBankAttacker];
-    a = GetBankSide(gBattleAnimBankAttacker);
+    gTasks[taskId].data[0] = gObjectBankIDs[gAnimBankAttacker];
+    a = GetBankSide(gAnimBankAttacker);
     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 91eaf20b1..8358d23db 100755
--- a/src/battle/anim/money.c
+++ b/src/battle/anim/money.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 static void sub_80CFF68(struct Sprite* sprite);
 
@@ -20,9 +20,9 @@ void sub_80CFE9C(struct Sprite* sprite)
     u16 var;
 
     sub_80787B0(sprite, 1);
-    r6 = sub_8077ABC(gBattleAnimBankTarget, 2);
-    r7 = sub_8077ABC(gBattleAnimBankTarget, 3) + gBattleAnimArgs[3];
-    if (GetBankSide(gBattleAnimBankAttacker) != 0)
+    r6 = GetBankPosition(gAnimBankTarget, 2);
+    r7 = GetBankPosition(gAnimBankTarget, 3) + gBattleAnimArgs[3];
+    if (GetBankSide(gAnimBankAttacker) != 0)
         gBattleAnimArgs[2] = -gBattleAnimArgs[2];
 
     r6 += gBattleAnimArgs[2];
@@ -33,7 +33,7 @@ void sub_80CFE9C(struct Sprite* sprite)
     sprite->data[2] = r6;
     sprite->data[4] = r7;
     sprite->callback = sub_8078C00;
-    StoreSpriteCallbackInData(sprite, move_anim_8072740);
+    StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
 }
 
 void sub_80CFF50(struct Sprite* sprite)
@@ -47,7 +47,7 @@ void sub_80CFF68(struct Sprite* sprite)
 {
     sprite->data[0] += 0x80;
     sprite->pos2.x = sprite->data[0] >> 8;
-    if (GetBankSide(gBattleAnimBankAttacker) == 0)
+    if (GetBankSide(gAnimBankAttacker) == 0)
         sprite->pos2.x = -sprite->pos2.x;
 
     sprite->pos2.y = Sin(sprite->data[1], sprite->data[2]);
@@ -57,6 +57,6 @@ void sub_80CFF68(struct Sprite* sprite)
         sprite->data[1] = 0;
         sprite->data[2] /= 2;
         if (++sprite->data[3] == 2)
-            move_anim_8072740(sprite);
+            DestroyAnimSprite(sprite);
     }
 }
diff --git a/src/battle/anim/moon.c b/src/battle/anim/moon.c
index e2a31d14d..c532e8057 100755
--- a/src/battle/anim/moon.c
+++ b/src/battle/anim/moon.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 static void sub_80CE354(struct Sprite* sprite);
 
@@ -15,7 +15,7 @@ static void sub_80CE354(struct Sprite* sprite);
 
 void sub_80CE30C(struct Sprite* sprite)
 {
-    if (NotInBattle())
+    if (IsContest())
     {
         sprite->pos1.x = 0x30;
         sprite->pos1.y = 0x28;
@@ -35,5 +35,5 @@ void sub_80CE30C(struct Sprite* sprite)
 void sub_80CE354(struct Sprite* sprite)
 {
     if (sprite->data[0])
-        move_anim_8072740(sprite);
+        DestroyAnimSprite(sprite);
 }
diff --git a/src/battle/anim/noise.c b/src/battle/anim/noise.c
index 78953d96a..369650d82 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 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 static void sub_80D2E30(struct Sprite *);
 
@@ -14,15 +14,15 @@ static void sub_80D2E30(struct Sprite *);
 void sub_80D2D68(struct Sprite* sprite)
 {
     int var1;
-    u8 slot = gBattleAnimArgs[0] == 0 ? gBattleAnimBankAttacker : gBattleAnimBankTarget;
+    u8 slot = gBattleAnimArgs[0] == 0 ? gAnimBankAttacker : gAnimBankTarget;
 
     if (GetBankSide(slot) == 1)
     {
         gBattleAnimArgs[1] *= -1;
     }
 
-    sprite->pos1.x = sub_8077ABC(slot, 2)  + gBattleAnimArgs[1];
-    sprite->pos1.y = sub_8077ABC(slot, 3) + gBattleAnimArgs[2];
+    sprite->pos1.x = GetBankPosition(slot, 2)  + gBattleAnimArgs[1];
+    sprite->pos1.y = GetBankPosition(slot, 3) + gBattleAnimArgs[2];
     sprite->data[0] = 0;
     sprite->data[1] = (u16)sprite->pos1.x << 3;
     sprite->data[2] = (u16)sprite->pos1.y << 3;
@@ -51,6 +51,6 @@ static void sub_80D2E30(struct Sprite *sprite)
 
     if (++sprite->data[0] > 16)
     {
-        move_anim_8072740(sprite);
+        DestroyAnimSprite(sprite);
     } 
 }
diff --git a/src/battle/anim/note_rain.c b/src/battle/anim/note_rain.c
index fd62b7176..715462d73 100755
--- 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 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 extern u16 gUnknown_083D7A5C[5];
 
@@ -25,13 +25,13 @@ void sub_80D1BA8(struct Sprite* sprite, u8 a, u8 b)
 void sub_80D1C08(struct Sprite* sprite)
 {
     sub_80787B0(sprite, 0);
-    if (GetBankSide(gBattleAnimBankAttacker) != 0)
+    if (GetBankSide(gAnimBankAttacker) != 0)
         gBattleAnimArgs[2] = -gBattleAnimArgs[2];
 
     sprite->data[0] = gBattleAnimArgs[4];
-    sprite->data[2] = sub_8077ABC(gBattleAnimBankAttacker, 0) + gBattleAnimArgs[2];
-    sprite->data[4] = sub_8077ABC(gBattleAnimBankAttacker, 1) + gBattleAnimArgs[3];
+    sprite->data[2] = GetBankPosition(gAnimBankAttacker, 0) + gBattleAnimArgs[2];
+    sprite->data[4] = GetBankPosition(gAnimBankAttacker, 1) + gBattleAnimArgs[3];
     sprite->callback = sub_8078B34;
-    StoreSpriteCallbackInData(sprite, move_anim_8072740);
+    StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
     sub_80D1BA8(sprite, gBattleAnimArgs[5], gBattleAnimArgs[6]);
 }
diff --git a/src/battle/anim/note_scatter.c b/src/battle/anim/note_scatter.c
index 9ff49ee9d..8564c58fe 100755
--- a/src/battle/anim/note_scatter.c
+++ b/src/battle/anim/note_scatter.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 static void sub_80CED78(struct Sprite* sprite);
 
@@ -16,14 +16,14 @@ static void sub_80CED78(struct Sprite* sprite);
 void sub_80CECE8(struct Sprite* sprite)
 {
     int a; 
-    if (GetBankSide(gBattleAnimBankAttacker) == 1)
+    if (GetBankSide(gAnimBankAttacker) == 1)
     {
         a = gBattleAnimArgs[1]; 
         (u16)gBattleAnimArgs[1] = -a;
     }
 
-    sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2) + gBattleAnimArgs[1];
-    sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 3) + gBattleAnimArgs[2];
+    sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2) + gBattleAnimArgs[1];
+    sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3) + gBattleAnimArgs[2];
     StartSpriteAnim(sprite, gBattleAnimArgs[0]);
     sprite->data[2] = 0;
     sprite->data[3] = 0;
diff --git a/src/battle/anim/note_scatter_2.c b/src/battle/anim/note_scatter_2.c
index a163aa9a5..524c51c08 100755
--- a/src/battle/anim/note_scatter_2.c
+++ b/src/battle/anim/note_scatter_2.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 extern u16 gUnknown_083D712C[4][6];
 
@@ -52,6 +52,6 @@ void sub_80CEEE8(struct Sprite* sprite)
     }
     else
     {
-        move_anim_8072740(sprite);
+        DestroyAnimSprite(sprite);
     }
 }
diff --git a/src/battle/anim/note_spin.c b/src/battle/anim/note_spin.c
index bdc0f4615..026ee1856 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 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 static void sub_80D2F80(struct Sprite *);
 static void sub_80D2FA4(struct Sprite *);
@@ -28,7 +28,7 @@ void sub_80D2E68(struct Sprite *sprite)
 
     if (sprite->data[0] == sprite->data[1] + 80)
     {
-        move_anim_8072740(sprite);
+        DestroyAnimSprite(sprite);
     }
 }
 
@@ -100,11 +100,11 @@ static void sub_80D2FA4(struct Sprite *sprite)
     {
         int var1 = sprite->data[2];
         sprite->invisible = var1 - (((s32)(var1 + ((u32)var1 >> 31)) >> 1) << 1);
-        move_anim_8072740(sprite);
+        DestroyAnimSprite(sprite);
     }
 
     if (sprite->data[4] == 4)
     {
-        move_anim_8072740(sprite);
+        DestroyAnimSprite(sprite);
     }
 }
diff --git a/src/battle/anim/note_wave.c b/src/battle/anim/note_wave.c
index 4dc3ceb75..80ed2256f 100755
--- a/src/battle/anim/note_wave.c
+++ b/src/battle/anim/note_wave.c
@@ -6,8 +6,8 @@
 #include "palette.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 extern u16 gUnknown_083D712C[4][6];
 
@@ -74,15 +74,15 @@ void sub_80CEB0C(struct Sprite* sprite)
     sprite->data[1] = gBattleAnimArgs[1];
     sprite->data[2] = 0;
     sprite->data[3] = gBattleAnimArgs[2];
-    if (NotInBattle())
+    if (IsContest())
     {
         a = 0x30;
         b = 0x28;
     }
     else
     {
-        a = sub_8077ABC(gBattleAnimBankTarget, 2);
-        b = sub_8077ABC(gBattleAnimBankTarget, 3);
+        a = GetBankPosition(gAnimBankTarget, 2);
+        b = GetBankPosition(gAnimBankTarget, 3);
     }
 
     sprite->data[4] = sprite->pos1.x << 4;
diff --git a/src/battle/anim/orbit.c b/src/battle/anim/orbit.c
index 9b77552fa..c8cf339d2 100755
--- 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 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 static void sub_80CAC44(struct Sprite* sprite);
 static void sub_80CADA8(struct Sprite* sprite);
@@ -37,11 +37,11 @@ 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(gBattleAnimBankTarget) & 3);
+        sprite->oam.priority = (sub_8079ED4(gAnimBankTarget) & 3);
     }
     else
     {
-        var1 = sub_8079ED4(gBattleAnimBankTarget) + 1;
+        var1 = sub_8079ED4(gAnimBankTarget) + 1;
         if (var1 > 3)
         {
             var1 = 3;
@@ -53,18 +53,18 @@ void sub_80CAC44(struct Sprite* sprite)
     sprite->data[1] = (sprite->data[1] + 2) & 0xFF;
     sprite->data[0]--;
     if (sprite->data[0] == -1)
-        move_anim_8072740(sprite);
+        DestroyAnimSprite(sprite);
 }
 
 void sub_80CACEC(u8 taskId)
 {
-    if (NotInBattle() || !IsDoubleBattle())
+    if (IsContest() || !IsDoubleBattle())
     {
         DestroyAnimVisualTask(taskId);
     }
     else
     {
-        if (GetBankIdentity_permutated(gBattleAnimBankTarget) == 1)
+        if (GetBankIdentity_permutated(gAnimBankTarget) == 1)
         {
             REG_BG2CNT_BITFIELD.priority = 3;
         }
@@ -84,7 +84,7 @@ void sub_80CAD54(struct Sprite* sprite)
     sprite->data[1] = sprite->pos1.x;
     sprite->data[2] = sprite->pos1.x;
     sprite->data[3] = sprite->pos1.y;
-    sprite->data[4] = sub_8077ABC(gBattleAnimBankAttacker, 3) + gBattleAnimArgs[2];
+    sprite->data[4] = GetBankPosition(gAnimBankAttacker, 3) + gBattleAnimArgs[2];
     obj_translate_based_on_private_1_2_3_4(sprite);
     sprite->data[5] = 0x40;
     sprite->callback = sub_80CADA8;
@@ -99,18 +99,18 @@ void sub_80CADA8(struct Sprite* sprite)
         sprite->pos2.y += Cos(sprite->data[5], -5);
         if ((u16)(sprite->data[5] - 0x40) < 0x80)
         {
-            sprite->subpriority = sub_8079E90(gBattleAnimBankAttacker) - 1;
+            sprite->subpriority = sub_8079E90(gAnimBankAttacker) - 1;
         }
         else
         {
-            sprite->subpriority = sub_8079E90(gBattleAnimBankAttacker) + 1;
+            sprite->subpriority = sub_8079E90(gAnimBankAttacker) + 1;
         }
 
         sprite->data[5] = (sprite->data[5] + 5) & 0xFF;
     }
     else
     {
-        move_anim_8072740(sprite);
+        DestroyAnimSprite(sprite);
     }
 }
 
@@ -121,7 +121,7 @@ void sub_80CAE20(struct Sprite* sprite)
     sprite->data[1] = sprite->pos1.x;
     sprite->data[2] = sprite->pos1.x;
     sprite->data[3] = sprite->pos1.y;
-    sprite->data[4] = sub_8077ABC(gBattleAnimBankAttacker, 3) + gBattleAnimArgs[2];
+    sprite->data[4] = GetBankPosition(gAnimBankAttacker, 3) + gBattleAnimArgs[2];
     obj_translate_based_on_private_1_2_3_4(sprite);
     sprite->data[5] = 0x40;
     sprite->callback = sub_80CAE74;
@@ -142,6 +142,6 @@ void sub_80CAE74(struct Sprite* sprite)
     }
     else
     {
-       move_anim_8072740(sprite);
+       DestroyAnimSprite(sprite);
     }
 }
diff --git a/src/battle/anim/orbit_fast.c b/src/battle/anim/orbit_fast.c
index 30396f398..92b67672b 100755
--- a/src/battle/anim/orbit_fast.c
+++ b/src/battle/anim/orbit_fast.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 static void sub_80D2704(struct Sprite* sprite);
 
@@ -15,12 +15,12 @@ static void sub_80D2704(struct Sprite* sprite);
 
 void sub_80D26A4(struct Sprite* sprite)
 {
-    sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2);
-    sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 3);
+    sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2);
+    sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3);
     sprite->affineAnimPaused = 1;
     sprite->data[0] = gBattleAnimArgs[0];
     sprite->data[1] = gBattleAnimArgs[1];
-    sprite->data[7] = sub_8079E90(gBattleAnimBankAttacker);
+    sprite->data[7] = sub_8079E90(gAnimBankAttacker);
     sprite->callback = sub_80D2704;
     sub_80D2704(sprite);
 }
@@ -58,5 +58,5 @@ void sub_80D2704(struct Sprite* sprite)
     }
 
     if ((u16)gBattleAnimArgs[7] == 0xFFFF)
-        move_anim_8072740(sprite);
+        DestroyAnimSprite(sprite);
 }
diff --git a/src/battle/anim/orbit_scatter.c b/src/battle/anim/orbit_scatter.c
index 6cebc9375..54c157839 100755
--- a/src/battle/anim/orbit_scatter.c
+++ b/src/battle/anim/orbit_scatter.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 static void sub_80D2834(struct Sprite* sprite);
 
@@ -15,8 +15,8 @@ static void sub_80D2834(struct Sprite* sprite);
 
 void sub_80D27E0(struct Sprite* sprite)
 {
-    sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2);
-    sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 3);
+    sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2);
+    sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3);
     sprite->data[0] = Sin(gBattleAnimArgs[0], 10);
     sprite->data[1] = Cos(gBattleAnimArgs[0], 7);
     sprite->callback = sub_80D2834;
@@ -27,5 +27,5 @@ void sub_80D2834(struct Sprite* sprite)
     sprite->pos2.x += sprite->data[0];
     sprite->pos2.y += sprite->data[1];
     if (sprite->pos1.x + sprite->pos2.x + 16 > 0x110u || sprite->pos1.y + sprite->pos2.y > 0xA0 || sprite->pos1.y + sprite->pos2.y < -16)
-        move_anim_8072740(sprite);
+        DestroyAnimSprite(sprite);
 }
diff --git a/src/battle/anim/orbs.c b/src/battle/anim/orbs.c
index 22e7d3895..6ca2fa71c 100755
--- a/src/battle/anim/orbs.c
+++ b/src/battle/anim/orbs.c
@@ -5,8 +5,8 @@
 #include "random.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 static void sub_80CA8B4(struct Sprite* sprite);
 static void sub_80CA9F8(struct Sprite* sprite);
@@ -21,8 +21,8 @@ void sub_80CA7B0(struct Sprite* sprite)
 {
     sub_80787B0(sprite, 1);
     sprite->data[0] = gBattleAnimArgs[2];
-    sprite->data[2] = sub_8077ABC(gBattleAnimBankAttacker, 2);
-    sprite->data[4] = sub_8077ABC(gBattleAnimBankAttacker, 3);
+    sprite->data[2] = GetBankPosition(gAnimBankAttacker, 2);
+    sprite->data[4] = GetBankPosition(gAnimBankAttacker, 3);
     sprite->callback = sub_8078B34;
     StoreSpriteCallbackInData(sprite, move_anim_8074EE0);
 }
@@ -32,10 +32,10 @@ void sub_80CA800(struct Sprite* sprite)
     sub_80787B0(sprite, 1);
     StartSpriteAnim(sprite, gBattleAnimArgs[3]);
     sprite->data[0] = gBattleAnimArgs[2];
-    sprite->data[2] = sub_8077ABC(gBattleAnimBankTarget, 2);
-    sprite->data[4] = sub_8077ABC(gBattleAnimBankTarget, 3);
+    sprite->data[2] = GetBankPosition(gAnimBankTarget, 2);
+    sprite->data[4] = GetBankPosition(gAnimBankTarget, 3);
     sprite->callback = sub_8078B34;
-    StoreSpriteCallbackInData(sprite, move_anim_8072740);
+    StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
 }
 
 void sub_80CA858(struct Sprite* sprite)
@@ -43,9 +43,9 @@ void sub_80CA858(struct Sprite* sprite)
     sub_80787B0(sprite, 1);
     sprite->data[0] = gBattleAnimArgs[2];
     sprite->data[1] = sprite->pos1.x;
-    sprite->data[2] = sub_8077ABC(gBattleAnimBankTarget, 2);
+    sprite->data[2] = GetBankPosition(gAnimBankTarget, 2);
     sprite->data[3] = sprite->pos1.y;
-    sprite->data[4] = sub_8077ABC(gBattleAnimBankTarget, 3);
+    sprite->data[4] = GetBankPosition(gAnimBankTarget, 3);
     obj_translate_based_on_private_1_2_3_4(sprite);
     sprite->data[5] = gBattleAnimArgs[3];
     sprite->callback = sub_80CA8B4;
@@ -62,11 +62,11 @@ void sub_80CA8B4(struct Sprite* sprite)
     {
         if (sprite->data[5] > 0x7F)
         {
-            sprite->subpriority = sub_8079E90(gBattleAnimBankTarget) + 1;
+            sprite->subpriority = sub_8079E90(gAnimBankTarget) + 1;
         }
         else
         {
-            sprite->subpriority = sub_8079E90(gBattleAnimBankTarget) + 6;
+            sprite->subpriority = sub_8079E90(gAnimBankTarget) + 6;
         }
         sprite->pos2.x += Sin(sprite->data[5], 5);
         sprite->pos2.y += Cos(sprite->data[5], 14);
@@ -85,7 +85,7 @@ void sub_80CA928(u8 taskId)
         gBattleAnimArgs[1] = 0;
         gBattleAnimArgs[2] = 80;
         gBattleAnimArgs[3] = 0;
-        CreateSpriteAndAnimate(&gSpriteTemplate_83D631C, 0, 0, sub_8079E90(gBattleAnimBankTarget) + 1);
+        CreateSpriteAndAnimate(&gSpriteTemplate_83D631C, 0, 0, sub_8079E90(gAnimBankTarget) + 1);
     }
 
     if (gTasks[taskId].data[1] == 15)
@@ -96,8 +96,8 @@ void sub_80CA9A8(struct Sprite* sprite)
 {
     sub_8078764(sprite, 1);
     sprite->data[0] = gBattleAnimArgs[3];
-    sprite->data[2] = sub_8077ABC(gBattleAnimBankAttacker, 2);
-    sprite->data[4] = sub_8077ABC(gBattleAnimBankAttacker, 3);
+    sprite->data[2] = GetBankPosition(gAnimBankAttacker, 2);
+    sprite->data[4] = GetBankPosition(gAnimBankAttacker, 3);
     sprite->data[5] = gBattleAnimArgs[2];
     sub_80786EC(sprite);
     sprite->callback = sub_80CA9F8;
@@ -106,7 +106,7 @@ void sub_80CA9A8(struct Sprite* sprite)
 void sub_80CA9F8(struct Sprite* sprite)
 {
     if (sub_8078718(sprite))
-        move_anim_8072740(sprite);
+        DestroyAnimSprite(sprite);
 }
 
 void sub_80CAA14(struct Sprite* sprite)
@@ -115,9 +115,9 @@ void sub_80CAA14(struct Sprite* sprite)
     u16 b;
     
     StartSpriteAnim(sprite, a & 7);
-    sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2);
-    sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 3);
-    if (GetBankSide(gBattleAnimBankAttacker))
+    sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2);
+    sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3);
+    if (GetBankSide(gAnimBankAttacker))
     {
         sprite->pos1.x -= 20;
     }
@@ -129,9 +129,9 @@ void sub_80CAA14(struct Sprite* sprite)
     b = Random();
     sprite->data[0] = (b & 31) + 64;
     sprite->data[1] = sprite->pos1.x;
-    sprite->data[2] = sub_8077ABC(gBattleAnimBankTarget, 2);
+    sprite->data[2] = GetBankPosition(gAnimBankTarget, 2);
     sprite->data[3] = sprite->pos1.y;
-    sprite->data[4] = sub_8077ABC(gBattleAnimBankTarget, 3);
+    sprite->data[4] = GetBankPosition(gAnimBankTarget, 3);
     sub_8078D60(sprite);
     sprite->data[5] = Random() & 0xFF;
     sprite->data[6] = sprite->subpriority;
@@ -143,7 +143,7 @@ void sub_80CAACC(struct Sprite* sprite)
 {
     if (sub_8078CE8(sprite))
     {
-        move_anim_8072740(sprite);
+        DestroyAnimSprite(sprite);
     }
     else
     {
diff --git a/src/battle/anim/osmose.c b/src/battle/anim/osmose.c
index f1f1b25ff..1140aa34a 100755
--- 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 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 // osmose (I didn't want to use "absorb" as thats confusing)
 // Used by Ingrain.
@@ -14,8 +14,8 @@ void sub_80CB768(struct Sprite* sprite)
 {
     if (!sprite->data[0])
     {
-        sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2) + gBattleAnimArgs[0];
-        sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 1) + gBattleAnimArgs[1];
+        sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2) + gBattleAnimArgs[0];
+        sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 1) + gBattleAnimArgs[1];
         sprite->data[1] = gBattleAnimArgs[2];
         sprite->data[2] = gBattleAnimArgs[3];
         sprite->data[3] = gBattleAnimArgs[4];
@@ -25,5 +25,5 @@ void sub_80CB768(struct Sprite* sprite)
     sprite->pos2.x = sprite->data[1] * sprite->data[0];
     sprite->pos2.y = Sin((sprite->data[0] * 20) & 0xFF, sprite->data[2]);
     if (sprite->data[0] > sprite->data[3])
-        move_anim_8072740(sprite);
+        DestroyAnimSprite(sprite);
 }
diff --git a/src/battle/anim/perceive.c b/src/battle/anim/perceive.c
index 27afcbc0c..3b3153428 100755
--- a/src/battle/anim/perceive.c
+++ b/src/battle/anim/perceive.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 // perceive (shows a sparkle in a set of eyes, usually for heightened perception.)
 // Used in Glare, Tickle, and Scary Face.
@@ -14,7 +14,7 @@ extern u8 gBattleAnimBankTarget;
 void sub_80D2904(struct Sprite* sprite)
 {
     if (sprite->animEnded)
-        move_anim_8072740(sprite);
+        DestroyAnimSprite(sprite);
 }
 
 void sub_80D2920(struct Sprite* sprite)
diff --git a/src/battle/anim/powder.c b/src/battle/anim/powder.c
index 178a61737..a0be20d6f 100755
--- 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 gBattleAnimBankAttacker;
+extern u8 gAnimBankAttacker;
 
 static void sub_80CA768(struct Sprite* sprite);
 
@@ -18,7 +18,7 @@ void sub_80CA710(struct Sprite* sprite)
     sprite->data[0] = gBattleAnimArgs[2];
     sprite->data[1] = gBattleAnimArgs[3];
 
-    if (GetBankSide(gBattleAnimBankAttacker))
+    if (GetBankSide(gAnimBankAttacker))
     {
         sprite->data[3] = -gBattleAnimArgs[4];
     }
@@ -43,6 +43,6 @@ void sub_80CA768(struct Sprite* sprite)
     }
     else
     {
-        move_anim_8072740(sprite);
+        DestroyAnimSprite(sprite);
     }
 }
diff --git a/src/battle/anim/ring.c b/src/battle/anim/ring.c
index 0a5816b23..915cadcbc 100755
--- 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 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 extern u8 gObjectBankIDs[];
 
@@ -25,18 +25,18 @@ void sub_80D0FD8(struct Sprite* sprite)
     u8 r4;
 
     if (gBattleAnimArgs[2] == 0)
-        bank = gBattleAnimBankAttacker;
+        bank = gAnimBankAttacker;
     else
-        bank = gBattleAnimBankTarget;
+        bank = gAnimBankTarget;
 
     r4 = gBattleAnimArgs[3] ^ 1;
     if (IsDoubleBattle() && IsAnimBankSpriteVisible(bank ^ 2))
     {
         sub_807A3FC(bank, r4, &sp0, &sp1);
         if (r4 == 0)
-            r4 = sub_8077ABC(bank, 0);
+            r4 = GetBankPosition(bank, 0);
         else
-            r4 = sub_8077ABC(bank, 2);
+            r4 = GetBankPosition(bank, 2);
 
         if (GetBankSide(bank) != 0)
             gBattleAnimArgs[0] -= (sp0 - r4) - gBattleAnimArgs[0];  // This is weird.
@@ -53,7 +53,7 @@ void sub_80D1098(struct Sprite* sprite)
     if (sub_8078B5C(sprite))
     {
         FreeSpriteOamMatrix(sprite);
-        move_anim_8072740(sprite);
+        DestroyAnimSprite(sprite);
     }
 }
 
@@ -70,13 +70,13 @@ void sub_80D10B8(struct Sprite* sprite)
 
     if (gBattleAnimArgs[5] == 0)
     {
-        bankr7 = gBattleAnimBankAttacker;
-        bankr8 = gBattleAnimBankTarget;
+        bankr7 = gAnimBankAttacker;
+        bankr8 = gAnimBankTarget;
     }
     else
     {
-        bankr7 = gBattleAnimBankTarget;
-        bankr8 = gBattleAnimBankAttacker;
+        bankr7 = gAnimBankTarget;
+        bankr8 = gAnimBankAttacker;
     }
 
     if (gBattleAnimArgs[6] == 0)
@@ -92,7 +92,7 @@ void sub_80D10B8(struct Sprite* sprite)
 
     if (GetBankSide(bankr7) != 0)
     {
-        r9 = sub_8077ABC(bankr7, r10) + gBattleAnimArgs[0];
+        r9 = GetBankPosition(bankr7, r10) + gBattleAnimArgs[0];
         if (IsAnimBankSpriteVisible(bankr8 ^ 2))
             sprite->subpriority = gSprites[gObjectBankIDs[bankr8 ^ 2]].subpriority - 1;
         else
@@ -100,7 +100,7 @@ void sub_80D10B8(struct Sprite* sprite)
     }
     else
     {
-        r9 = sub_8077ABC(bankr7, r10) - gBattleAnimArgs[0];
+        r9 = GetBankPosition(bankr7, r10) - gBattleAnimArgs[0];
         if (gMain.inBattle && IsAnimBankSpriteVisible(bankr7 ^ 2))
         {
             if (gSprites[gObjectBankIDs[bankr7]].pos1.x < gSprites[gObjectBankIDs[bankr7 ^ 2]].pos1.x)
@@ -115,15 +115,15 @@ void sub_80D10B8(struct Sprite* sprite)
 
     }
 
-    r6 = sub_8077ABC(bankr7, sp4) + gBattleAnimArgs[1];
+    r6 = GetBankPosition(bankr7, sp4) + gBattleAnimArgs[1];
     if (gMain.inBattle && IsAnimBankSpriteVisible(bankr8 ^ 2))
     {
         sub_807A3FC(bankr8, gBattleAnimArgs[6], &sp0, &sp1);
     }
     else
     {
-        sp0 = sub_8077ABC(bankr8, r10);
-        sp1 = sub_8077ABC(bankr8, sp4);
+        sp0 = GetBankPosition(bankr8, r10);
+        sp1 = GetBankPosition(bankr8, sp4);
     }
 
     if (GetBankSide(bankr8))
diff --git a/src/battle/anim/roots.c b/src/battle/anim/roots.c
index 40c51808a..68f8a3e2f 100755
--- 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 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 extern s16 gUnknown_03000728[];
 
@@ -18,8 +18,8 @@ void sub_80CB59C(struct Sprite* sprite)
 {
     if (!sprite->data[0])
     {
-        sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2);
-        sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 1);
+        sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2);
+        sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 1);
         sprite->pos2.x = gBattleAnimArgs[0];
         sprite->pos2.y = gBattleAnimArgs[1];
         sprite->subpriority = gBattleAnimArgs[2] + 30;
@@ -36,10 +36,10 @@ void sub_80CB59C(struct Sprite* sprite)
 
 void sub_80CB620(struct Sprite *sprite)
 {
-    s16 p1 = sub_8077ABC(gBattleAnimBankAttacker, 2);
-    s16 p2 = sub_8077ABC(gBattleAnimBankAttacker, 3);
-    s16 e1 = sub_8077ABC(gBattleAnimBankTarget, 2);
-    s16 e2 = sub_8077ABC(gBattleAnimBankTarget, 3);
+    s16 p1 = GetBankPosition(gAnimBankAttacker, 2);
+    s16 p2 = GetBankPosition(gAnimBankAttacker, 3);
+    s16 e1 = GetBankPosition(gAnimBankTarget, 2);
+    s16 e2 = GetBankPosition(gAnimBankTarget, 3);
 
     e1 -= p1;
     e2 -= p2;
@@ -63,5 +63,5 @@ void sub_80CB710(struct Sprite* sprite)
         sprite->invisible = sprite->data[0] % 2;
 
     if (sprite->data[0] > sprite->data[2])
-        move_anim_8072740(sprite);
+        DestroyAnimSprite(sprite);
 }
diff --git a/src/battle/anim/scan.c b/src/battle/anim/scan.c
index 5573758c3..22bb26973 100755
--- a/src/battle/anim/scan.c
+++ b/src/battle/anim/scan.c
@@ -6,8 +6,8 @@
 #include "palette.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 extern s8 gUnknown_083D6DDC[4][2];
 
@@ -50,7 +50,7 @@ void sub_80CD408(struct Sprite* sprite)
         sprite->callback = sub_8078B34;
         StoreSpriteCallbackInData(sprite, sub_80CD4B8);
         sprite->data[5] += 0x100;
-        PlaySE12WithPanning(0xD2, sub_8076F98(0x3F));
+        PlaySE12WithPanning(0xD2, BattleAnimAdjustPanning(0x3F));
         break;
     }
 
@@ -110,8 +110,8 @@ void sub_80CD4EC(struct Sprite* sprite)
         sprite->pos2.y = 0;
         sprite->pos2.x = 0;
         sprite->data[0] = 6;
-        sprite->data[2] = sub_8077ABC(gBattleAnimBankTarget, 2) + a;
-        sprite->data[4] = sub_8077ABC(gBattleAnimBankTarget, 3) + b;
+        sprite->data[2] = GetBankPosition(gAnimBankTarget, 2) + a;
+        sprite->data[4] = GetBankPosition(gAnimBankTarget, 3) + b;
         sprite->callback = sub_8078B34;
         StoreSpriteCallbackInData(sprite, sub_80CD654);
     }
@@ -136,7 +136,7 @@ void sub_80CD5A8(struct Sprite* sprite)
         sprite->data[2]++;
         pal = sprite->oam.paletteNum;
         LoadPalette(&gPlttBufferUnfaded[0x108 + pal * 16], pal * 16 | 0x101, 4);
-        PlaySE12WithPanning(0xC0, sub_8076F98(0x3F));
+        PlaySE12WithPanning(0xC0, BattleAnimAdjustPanning(0x3F));
     }
     else if (sprite->data[1] == 0)
     {
@@ -164,7 +164,7 @@ void sub_80CD67C(struct Sprite* sprite)
 
     sprite->data[0]++;
     if (sprite->data[1] == 8)
-        move_anim_8072740(sprite);
+        DestroyAnimSprite(sprite);
 }
 
 void sub_80CD6CC(struct Sprite* sprite)
diff --git a/src/battle/anim/scary_face.c b/src/battle/anim/scary_face.c
index 0c5056704..47776a3cb 100755
--- 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 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 extern struct INCBIN_U8 gBattleAnimBackgroundTilemap_ScaryFaceContest;
 extern struct INCBIN_U8 gBattleAnimBackgroundTilemap_ScaryFacePlayer;
@@ -16,8 +16,8 @@ extern struct INCBIN_U8 gBattleAnimBackgroundTilemap_ScaryFaceOpponent;
 extern struct INCBIN_U8 gBattleAnimBackgroundImage_ScaryFace;
 extern struct INCBIN_U8 gBattleAnimBackgroundPalette_ScaryFace;
 
-extern u16 gUnknown_030041B4;
-extern u16 gUnknown_030042C0;
+extern u16 gBattle_BG1_Y;
+extern u16 gBattle_BG1_X;
 
 static void sub_80D24E0(u8 taskId);
 
@@ -32,26 +32,26 @@ void sub_80D23B4(u8 taskId)
     REG_BLDALPHA = 0x1000;
     REG_BG1CNT_BITFIELD.priority = 1;
     REG_BG1CNT_BITFIELD.screenSize = 0;
-    if (!NotInBattle())
+    if (!IsContest())
         REG_BG1CNT_BITFIELD.charBaseBlock = 1;
 
-    gUnknown_030042C0 = 0;
-    gUnknown_030041B4 = 0;
+    gBattle_BG1_X = 0;
+    gBattle_BG1_Y = 0;
     REG_BG1HOFS = 0;
     REG_BG1VOFS = 0;
     sub_8078914(&subStruct);
     tempvar = subStruct.field_4;
     DmaFill32(3, 0x0, tempvar, 0x1000);
-    if (NotInBattle())
+    if (IsContest())
         LZDecompressVram(&gBattleAnimBackgroundTilemap_ScaryFaceContest, subStruct.field_4);
-    else if (GetBankSide(gBattleAnimBankTarget) == 1)
+    else if (GetBankSide(gAnimBankTarget) == 1)
         LZDecompressVram(&gBattleAnimBackgroundTilemap_ScaryFacePlayer, subStruct.field_4);
     else
         LZDecompressVram(&gBattleAnimBackgroundTilemap_ScaryFaceOpponent, subStruct.field_4);
 
     LZDecompressVram(&gBattleAnimBackgroundImage_ScaryFace, subStruct.field_0);
     LoadCompressedPalette(&gBattleAnimBackgroundPalette_ScaryFace, subStruct.field_8 << 4, 32);
-    if (NotInBattle())
+    if (IsContest())
         sub_80763FC(subStruct.field_8, (u16 *)subStruct.field_4, 0, 0);
 
     gTasks[taskId].func = sub_80D24E0;
@@ -114,7 +114,7 @@ void sub_80D24E0(u8 taskId)
             }
         }
         DmaClear32(3, subStruct.field_4, 0x800);
-        if (!NotInBattle())
+        if (!IsContest())
             REG_BG1CNT_BITFIELD.charBaseBlock = 0;
 
         gTasks[taskId].data[12]++;
diff --git a/src/battle/anim/seed.c b/src/battle/anim/seed.c
index bd072849a..be8613a74 100755
--- 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 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 static void sub_80CAB88(struct Sprite* sprite);
 static void sub_80CABC0(struct Sprite* sprite);
@@ -16,14 +16,14 @@ static void sub_80CABC0(struct Sprite* sprite);
 void sub_80CAB18(struct Sprite* sprite)
 {
     sub_80787B0(sprite, 1);
-    if (GetBankSide(gBattleAnimBankAttacker))
+    if (GetBankSide(gAnimBankAttacker))
     {
         gBattleAnimArgs[2] = -gBattleAnimArgs[2];
     }
 
     sprite->data[0] = gBattleAnimArgs[4];
-    sprite->data[2] = sub_8077ABC(gBattleAnimBankTarget, 0) + gBattleAnimArgs[2];
-    sprite->data[4] = sub_8077ABC(gBattleAnimBankTarget, 1) + gBattleAnimArgs[3];
+    sprite->data[2] = GetBankPosition(gAnimBankTarget, 0) + gBattleAnimArgs[2];
+    sprite->data[4] = GetBankPosition(gAnimBankTarget, 1) + gBattleAnimArgs[3];
     sprite->data[5] = gBattleAnimArgs[5];
     sub_80786EC(sprite);
     sprite->callback = sub_80CAB88;
@@ -46,5 +46,5 @@ void sub_80CABC0(struct Sprite* sprite)
     StartSpriteAnim(sprite, 1);
     sprite->data[0] = 60;
     sprite->callback = sub_80782D8;
-    StoreSpriteCallbackInData(sprite, move_anim_8072740);
+    StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
 }
diff --git a/src/battle/anim/shadow_enlarge.c b/src/battle/anim/shadow_enlarge.c
index bed6c7ea3..399cf1ba4 100755
--- 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 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 static void sub_80D0428(u8 taskId);
 
diff --git a/src/battle/anim/shadow_minimize.c b/src/battle/anim/shadow_minimize.c
index 22ebeab7a..94069374f 100755
--- 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 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 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] = sub_8079E90(gBattleAnimBankAttacker);
+    task->data[7] = sub_8079E90(gAnimBankAttacker);
     task->func = sub_80D04E0;
 }
 
diff --git a/src/battle/anim/shield.c b/src/battle/anim/shield.c
index 8ed4f9796..676318545 100755
--- a/src/battle/anim/shield.c
+++ b/src/battle/anim/shield.c
@@ -6,8 +6,8 @@
 #include "palette.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 static void sub_80CCE0C(struct Sprite* sprite);
 
@@ -16,17 +16,17 @@ static void sub_80CCE0C(struct Sprite* sprite);
 
 void sub_80CCD24(struct Sprite* sprite)
 {
-    if (NotInBattle() != 0)
+    if (IsContest() != 0)
     {
         gBattleAnimArgs[1] += 8;
     }
 
-    sprite->pos1.x = sub_8077EE4(gBattleAnimBankAttacker, 0) + gBattleAnimArgs[0];
-    sprite->pos1.y = sub_8077EE4(gBattleAnimBankAttacker, 1) + gBattleAnimArgs[1];
-    if (GetBankSide(gBattleAnimBankAttacker) == 0 || NotInBattle())
-        sprite->oam.priority = sub_8079ED4(gBattleAnimBankAttacker) + 1;
+    sprite->pos1.x = sub_8077EE4(gAnimBankAttacker, 0) + gBattleAnimArgs[0];
+    sprite->pos1.y = sub_8077EE4(gAnimBankAttacker, 1) + gBattleAnimArgs[1];
+    if (GetBankSide(gAnimBankAttacker) == 0 || IsContest())
+        sprite->oam.priority = sub_8079ED4(gAnimBankAttacker) + 1;
     else
-        sprite->oam.priority = sub_8079ED4(gBattleAnimBankAttacker);
+        sprite->oam.priority = sub_8079ED4(gAnimBankAttacker);
 
     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 ecb3dcdf9..9e7bea1e4 100755
--- 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 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 extern u16 gUnknown_083D6984[];
 
diff --git a/src/battle/anim/shock.c b/src/battle/anim/shock.c
index 35c380f23..16e04c9db 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 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 extern struct OamMatrix gOamMatrices[];
 
 extern void sub_80DA48C(struct Sprite *);
@@ -15,10 +15,10 @@ extern void sub_80DA48C(struct Sprite *);
 
 void sub_80D6294(struct Sprite *sprite)
 {
-    sprite->pos1.x = sub_8077ABC(gBattleAnimBankTarget, 2);
-    sprite->pos1.y = sub_8077ABC(gBattleAnimBankTarget, 3);
+    sprite->pos1.x = GetBankPosition(gAnimBankTarget, 2);
+    sprite->pos1.y = GetBankPosition(gAnimBankTarget, 3);
 
-    if (GetBankSide(gBattleAnimBankAttacker) != 0)
+    if (GetBankSide(gAnimBankAttacker) != 0)
     {
         sprite->pos1.x -= gBattleAnimArgs[0];
         sprite->pos1.y -= gBattleAnimArgs[1];
@@ -47,43 +47,43 @@ void sub_80D6328(struct Sprite *sprite)
     switch (gBattleAnimArgs[4])
     {
     case 0:
-        slot = gBattleAnimBankAttacker;
+        slot = gAnimBankAttacker;
         break;
     case 1:
     default:
-        slot = gBattleAnimBankTarget;
+        slot = gAnimBankTarget;
         break;
     case 2:
-        if (!IsAnimBankSpriteVisible(gBattleAnimBankAttacker ^ 2))
+        if (!IsAnimBankSpriteVisible(gAnimBankAttacker ^ 2))
         {
-            slot = gBattleAnimBankAttacker;
+            slot = gAnimBankAttacker;
         }
         else
         {
-            slot = gBattleAnimBankAttacker ^ 2;
+            slot = gAnimBankAttacker ^ 2;
         }
         break;
     case 3:
-        if (IsAnimBankSpriteVisible(gBattleAnimBankAttacker ^ 2))
+        if (IsAnimBankSpriteVisible(gAnimBankAttacker ^ 2))
         {
-            slot = gBattleAnimBankTarget ^ 2;
+            slot = gAnimBankTarget ^ 2;
         }
         else
         {
-            slot = gBattleAnimBankTarget;
+            slot = gAnimBankTarget;
         }
         break;
     }
 
     if (gBattleAnimArgs[5] == 0)
     {
-        sprite->pos1.x = sub_8077ABC(slot, 0);
-        sprite->pos1.y = sub_8077ABC(slot, 1);
+        sprite->pos1.x = GetBankPosition(slot, 0);
+        sprite->pos1.y = GetBankPosition(slot, 1);
     }
     else
     {
-        sprite->pos1.x = sub_8077ABC(slot, 2);
-        sprite->pos1.y = sub_8077ABC(slot, 3);
+        sprite->pos1.x = GetBankPosition(slot, 2);
+        sprite->pos1.y = GetBankPosition(slot, 3);
     }
 
     sprite->pos2.x = (gSineTable[gBattleAnimArgs[0]] * gBattleAnimArgs[1]) >> 8;
diff --git a/src/battle/anim/silhouette.c b/src/battle/anim/silhouette.c
index 71ff3dae2..a3147f598 100755
--- 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 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 static void sub_80CB3A8(u8 taskId);
 static void sub_80CB438(u8 taskId);
@@ -35,7 +35,7 @@ void sub_80CB3A8(u8 taskId)
     u8 spriteId = GetAnimBankSpriteId(1);
     gTasks[taskId].data[10] += gTasks[taskId].data[0];
     gSprites[spriteId].pos2.x = gTasks[taskId].data[10] >> 8;
-    if (GetBankSide(gBattleAnimBankTarget))
+    if (GetBankSide(gAnimBankTarget))
     {
         gSprites[spriteId].pos2.x = -gSprites[spriteId].pos2.x;
     }
diff --git a/src/battle/anim/slash.c b/src/battle/anim/slash.c
index c5869c4ab..6adcaf098 100755
--- a/src/battle/anim/slash.c
+++ b/src/battle/anim/slash.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 static void sub_80CDE78(struct Sprite* sprite);
 static void sub_80CDEB0(struct Sprite* sprite);
@@ -19,13 +19,13 @@ void sub_80CDD74(struct Sprite* sprite)
 {
     if (gBattleAnimArgs[0] == 0)
     {
-        sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2) + gBattleAnimArgs[1];
-        sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 3) + gBattleAnimArgs[2];
+        sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2) + gBattleAnimArgs[1];
+        sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3) + gBattleAnimArgs[2];
     }
     else
     {
-        sprite->pos1.x = sub_8077ABC(gBattleAnimBankTarget, 2) + gBattleAnimArgs[1];
-        sprite->pos1.y = sub_8077ABC(gBattleAnimBankTarget, 3) + gBattleAnimArgs[2];
+        sprite->pos1.x = GetBankPosition(gAnimBankTarget, 2) + gBattleAnimArgs[1];
+        sprite->pos1.y = GetBankPosition(gAnimBankTarget, 3) + gBattleAnimArgs[2];
     }
 
     sprite->data[0] = 0;
@@ -36,16 +36,16 @@ void sub_80CDD74(struct Sprite* sprite)
 
 void sub_80CDDDC(struct Sprite* sprite)
 {
-    sprite->pos1.x = sub_8077ABC(gBattleAnimBankTarget, 2) + 0xFFD0;
-    sprite->pos1.y = sub_8077ABC(gBattleAnimBankTarget, 3);
+    sprite->pos1.x = GetBankPosition(gAnimBankTarget, 2) + 0xFFD0;
+    sprite->pos1.y = GetBankPosition(gAnimBankTarget, 3);
     StoreSpriteCallbackInData(sprite, sub_80CDE78);
     sprite->callback = sub_8078600;
 }
 
 void sub_80CDE24(struct Sprite* sprite)
 {
-    sprite->pos1.x = sprite->pos1.x = sub_8077ABC(gBattleAnimBankTarget, 2) + 0xFFD0 + gBattleAnimArgs[0];
-    sprite->pos1.y = sub_8077ABC(gBattleAnimBankTarget, 3);
+    sprite->pos1.x = sprite->pos1.x = GetBankPosition(gAnimBankTarget, 2) + 0xFFD0 + gBattleAnimArgs[0];
+    sprite->pos1.y = GetBankPosition(gAnimBankTarget, 3);
     StartSpriteAnim(sprite, 1);
     sprite->data[0] = 0;
     sprite->data[1] = 0;
@@ -78,6 +78,6 @@ void sub_80CDEC0(struct Sprite* sprite)
         sprite->data[0] = 0;
         sprite->invisible = !sprite->invisible;
         if (++sprite->data[1] > 8)
-            move_anim_8072740(sprite);
+            DestroyAnimSprite(sprite);
     }
 }
diff --git a/src/battle/anim/sleep.c b/src/battle/anim/sleep.c
index 58ecc702f..0f0e54f80 100755
--- a/src/battle/anim/sleep.c
+++ b/src/battle/anim/sleep.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 static void sub_80CD394(struct Sprite* sprite);
 
@@ -16,7 +16,7 @@ static void sub_80CD394(struct Sprite* sprite);
 void sub_80CD328(struct Sprite* sprite)
 {
     sub_8078650(sprite);
-    if (GetBankSide(gBattleAnimBankAttacker) == 0)
+    if (GetBankSide(gAnimBankAttacker) == 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 8e33dcb06..fe8745483 100755
--- a/src/battle/anim/slice.c
+++ b/src/battle/anim/slice.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 static void sub_80CCB00(struct Sprite* sprite);
 
@@ -15,9 +15,9 @@ static void sub_80CCB00(struct Sprite* sprite);
 
 void sub_80CC914(struct Sprite* sprite)
 {
-    sprite->pos1.x = sub_8077ABC(gBattleAnimBankTarget, 0);
-    sprite->pos1.y = sub_8077ABC(gBattleAnimBankTarget, 1);
-    if (GetBankSide(gBattleAnimBankTarget) == 0)
+    sprite->pos1.x = GetBankPosition(gAnimBankTarget, 0);
+    sprite->pos1.y = GetBankPosition(gAnimBankTarget, 1);
+    if (GetBankSide(gAnimBankTarget) == 0)
         sprite->pos1.y += 8;
 
     sprite->callback = sub_80CCB00;
@@ -46,28 +46,28 @@ void sub_80CC9BC(struct Sprite* sprite)
     switch (gBattleAnimArgs[3])
     {
     case 1:
-        a = sub_8077ABC(gBattleAnimBankTarget ^ 2, 0);
-        b = sub_8077ABC(gBattleAnimBankTarget ^ 2, 1);
+        a = GetBankPosition(gAnimBankTarget ^ 2, 0);
+        b = GetBankPosition(gAnimBankTarget ^ 2, 1);
         break;
     case 2:
-        a = sub_8077ABC(gBattleAnimBankTarget, 0);
-        b = sub_8077ABC(gBattleAnimBankTarget, 1);
-        if (IsAnimBankSpriteVisible(gBattleAnimBankTarget ^ 2))
+        a = GetBankPosition(gAnimBankTarget, 0);
+        b = GetBankPosition(gAnimBankTarget, 1);
+        if (IsAnimBankSpriteVisible(gAnimBankTarget ^ 2))
         {
-            a = (sub_8077ABC(gBattleAnimBankTarget ^ 2, 0) + a) / 2;
-            b = (sub_8077ABC(gBattleAnimBankTarget ^ 2, 1) + b) / 2;
+            a = (GetBankPosition(gAnimBankTarget ^ 2, 0) + a) / 2;
+            b = (GetBankPosition(gAnimBankTarget ^ 2, 1) + b) / 2;
         }
         break;
     case 0:
     default:
-        a = sub_8077ABC(gBattleAnimBankTarget, 0);
-        b = sub_8077ABC(gBattleAnimBankTarget, 1);
+        a = GetBankPosition(gAnimBankTarget, 0);
+        b = GetBankPosition(gAnimBankTarget, 1);
         break;
     }
 
     sprite->pos1.x = a;
     sprite->pos1.y = b;
-    if (GetBankSide(gBattleAnimBankTarget) == 0)
+    if (GetBankSide(gAnimBankTarget) == 0)
         sprite->pos1.y += 8;
 
     sprite->callback = sub_80CCB00;
@@ -104,7 +104,7 @@ void sub_80CCB00(struct Sprite* sprite)
     sprite->data[0]++;
     if (sprite->data[0] == 20)
     {
-        StoreSpriteCallbackInData(sprite, move_anim_8072740);
+        StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
         sprite->data[0] = 3;
         sprite->callback = sub_80782D8;
     }
diff --git a/src/battle/anim/smoke.c b/src/battle/anim/smoke.c
index c6ce91b76..7ab873e63 100755
--- a/src/battle/anim/smoke.c
+++ b/src/battle/anim/smoke.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 // smoke (smoke on the ground around a sprite.)
 // Used in Extremespeed.
diff --git a/src/battle/anim/sonic.c b/src/battle/anim/sonic.c
index 684516ba7..0897ec6e3 100755
--- a/src/battle/anim/sonic.c
+++ b/src/battle/anim/sonic.c
@@ -6,8 +6,8 @@
 #include "battle_anim_80CA710.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 // sonic (shoots a projectile towards the target.)
 // Used in Sonic Boom and Air Cutter.
@@ -18,11 +18,11 @@ void sub_80CF6DC(struct Sprite* sprite)
     s16 b;
     u16 c;
 
-    if (NotInBattle())
+    if (IsContest())
     {
         gBattleAnimArgs[2] = -gBattleAnimArgs[2];
     }
-    else if (GetBankSide(gBattleAnimBankAttacker) != 0)
+    else if (GetBankSide(gAnimBankAttacker) != 0)
     {
         gBattleAnimArgs[2] = -gBattleAnimArgs[2];
         gBattleAnimArgs[1] = -gBattleAnimArgs[1];
@@ -30,11 +30,11 @@ void sub_80CF6DC(struct Sprite* sprite)
     }
 
     sub_80787B0(sprite, 1);
-    a = sub_8077ABC(gBattleAnimBankTarget, 2) + gBattleAnimArgs[2];
-    b = sub_8077ABC(gBattleAnimBankTarget, 3) + gBattleAnimArgs[3];
+    a = GetBankPosition(gAnimBankTarget, 2) + gBattleAnimArgs[2];
+    b = GetBankPosition(gAnimBankTarget, 3) + gBattleAnimArgs[3];
     c = sub_80790F0(a - sprite->pos1.x, b - sprite->pos1.y);
     c += 0xF000;
-    if (NotInBattle())
+    if (IsContest())
         c -= 0x6000;
 
     sub_8078FDC(sprite, 0, 0x100, 0x100, c);
@@ -42,7 +42,7 @@ void sub_80CF6DC(struct Sprite* sprite)
     sprite->data[2] = a;
     sprite->data[4] = b;
     sprite->callback = sub_8078B34;
-    StoreSpriteCallbackInData(sprite, move_anim_8072740);
+    StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
 }
 
 void sub_80CF7E0(struct Sprite* sprite)
diff --git a/src/battle/anim/sonic_task.c b/src/battle/anim/sonic_task.c
index efd13dff6..924b1b568 100755
--- a/src/battle/anim/sonic_task.c
+++ b/src/battle/anim/sonic_task.c
@@ -7,8 +7,8 @@
 #include "battle.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 extern u8 gBanksBySide[];
 extern u16 gBattleTypeFlags;
@@ -46,7 +46,7 @@ void sub_80CFA20(u8 taskId)
         gTasks[taskId].data[gTasks[taskId].data[1] + 13] = spriteId;
         gTasks[taskId].data[0] = gTasks[taskId].data[3];
         gTasks[taskId].data[1]++;
-        PlaySE12WithPanning(0x9A, sub_8076F98(-0x3F));
+        PlaySE12WithPanning(0x9A, BattleAnimAdjustPanning(-0x3F));
         if (gTasks[taskId].data[1] > 2)
             gTasks[taskId].func = sub_80CF9F8;
     }
@@ -60,7 +60,7 @@ void sub_80CFB04(u8 taskId)
     s16 sp2 = 0;
     s16 r4;
 
-    if (NotInBattle())
+    if (IsContest())
     {
         gTasks[taskId].data[4] = 2;
         gBattleAnimArgs[0] = -gBattleAnimArgs[0];
@@ -71,7 +71,7 @@ void sub_80CFB04(u8 taskId)
     }
     else
     {
-        if ((gBanksBySide[gBattleAnimBankTarget] & 1) == 0)
+        if ((gBanksBySide[gAnimBankTarget] & 1) == 0)
         {
             gTasks[taskId].data[4] = 1;
             gBattleAnimArgs[0] = -gBattleAnimArgs[0];
@@ -82,17 +82,17 @@ void sub_80CFB04(u8 taskId)
                 gBattleAnimArgs[2] |= 1;
         }
     }
-    r6 = gTasks[taskId].data[9] = sub_8077ABC(gBattleAnimBankAttacker, 0);
-    r9 = gTasks[taskId].data[10] = sub_8077ABC(gBattleAnimBankAttacker, 1);
+    r6 = gTasks[taskId].data[9] = GetBankPosition(gAnimBankAttacker, 0);
+    r9 = gTasks[taskId].data[10] = GetBankPosition(gAnimBankAttacker, 1);
     if ((gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
-        && IsAnimBankSpriteVisible(gBattleAnimBankTarget ^ 2))
+        && IsAnimBankSpriteVisible(gAnimBankTarget ^ 2))
     {
-        sub_807A3FC(gBattleAnimBankTarget, 0, &sp1, &sp2);
+        sub_807A3FC(gAnimBankTarget, 0, &sp1, &sp2);
     }
     else
     {
-        sp1 = sub_8077ABC(gBattleAnimBankTarget, 0);
-        sp2 = sub_8077ABC(gBattleAnimBankTarget, 1);
+        sp1 = GetBankPosition(gAnimBankTarget, 0);
+        sp2 = GetBankPosition(gAnimBankTarget, 1);
     }
 
     sp1 = gTasks[taskId].data[11] = sp1 + gBattleAnimArgs[0];
@@ -122,12 +122,12 @@ void sub_80CFB04(u8 taskId)
         gBattleAnimArgs[4] ^= 0x80;
         if (gBattleAnimArgs[4] >= 64)
         {
-            u16 var = sub_8079E90(gBattleAnimBankTarget) + (gBattleAnimArgs[4] - 64);
+            u16 var = sub_8079E90(gAnimBankTarget) + (gBattleAnimArgs[4] - 64);
             gTasks[taskId].data[2] = var;
         }
         else
         {
-            u16 var = sub_8079E90(gBattleAnimBankTarget) - gBattleAnimArgs[4];
+            u16 var = sub_8079E90(gAnimBankTarget) - gBattleAnimArgs[4];
             gTasks[taskId].data[2] = var;
         }
     }
@@ -135,12 +135,12 @@ void sub_80CFB04(u8 taskId)
     {
         if (gBattleAnimArgs[4] >= 64)
         {
-            u16 var = sub_8079E90(gBattleAnimBankTarget) + (gBattleAnimArgs[4] - 64);
+            u16 var = sub_8079E90(gAnimBankTarget) + (gBattleAnimArgs[4] - 64);
             gTasks[taskId].data[2] = var;
         }
         else
         {
-            u16 var = sub_8079E90(gBattleAnimBankTarget) - gBattleAnimArgs[4];
+            u16 var = sub_8079E90(gAnimBankTarget) - gBattleAnimArgs[4];
             gTasks[taskId].data[2] = var;
         }
     }
diff --git a/src/battle/anim/spin_finger.c b/src/battle/anim/spin_finger.c
index adf41b261..8eb060358 100755
--- a/src/battle/anim/spin_finger.c
+++ b/src/battle/anim/spin_finger.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 extern void sub_80CF088(struct Sprite* sprite);
 static void sub_80CF138(struct Sprite* sprite);
@@ -19,11 +19,11 @@ void sub_80CF0BC(struct Sprite* sprite)
 {
     u8 bank;
     if (gBattleAnimArgs[0] == 0)
-        bank = gBattleAnimBankAttacker;
+        bank = gAnimBankAttacker;
     else
-        bank = gBattleAnimBankTarget;
+        bank = gAnimBankTarget;
 
-    sprite->pos1.x = sub_8077ABC(bank, 0);
+    sprite->pos1.x = GetBankPosition(bank, 0);
     sprite->pos1.y = sub_807A100(bank, 2);
     if (sprite->pos1.y <= 9)
         sprite->pos1.y = 10;
diff --git a/src/battle/anim/spit.c b/src/battle/anim/spit.c
index f9ad462ae..1e65ba53e 100755
--- a/src/battle/anim/spit.c
+++ b/src/battle/anim/spit.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 // spit (hurls sprites outward from the pokemon. Similar to orbit_fast, but takes another argument.)
 // Used in Spit Up.
@@ -16,13 +16,13 @@ void sub_80D287C(struct Sprite* sprite)
     sprite->pos2.x += sprite->data[0];
     sprite->pos2.y += sprite->data[1];
     if (sprite->data[3]++ >= sprite->data[2])
-        move_anim_8072740(sprite);
+        DestroyAnimSprite(sprite);
 }
 
 void sub_80D28AC(struct Sprite* sprite)
 {
-    sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2);
-    sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 3);
+    sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2);
+    sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3);
     sprite->data[0] = Sin(gBattleAnimArgs[0], 10);
     sprite->data[1] = Cos(gBattleAnimArgs[0], 7);
     sprite->data[2] = gBattleAnimArgs[1];
diff --git a/src/battle/anim/splash.c b/src/battle/anim/splash.c
index 1b0ceba93..570ef0dca 100755
--- a/src/battle/anim/splash.c
+++ b/src/battle/anim/splash.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 extern struct AffineAnimFrameCmd gUnknown_083D76F4;
 
diff --git a/src/battle/anim/startle.c b/src/battle/anim/startle.c
index acbf80fec..50e78af37 100755
--- a/src/battle/anim/startle.c
+++ b/src/battle/anim/startle.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 extern struct AffineAnimFrameCmd gUnknown_083D7A98;
 
diff --git a/src/battle/anim/strike.c b/src/battle/anim/strike.c
index f2fbdb5a4..bfa1dc4f7 100755
--- a/src/battle/anim/strike.c
+++ b/src/battle/anim/strike.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 static void sub_80CE798(struct Sprite* sprite);
 
@@ -23,11 +23,11 @@ void sub_80CE670(struct Sprite* sprite)
 
     sprite->data[0] = 0;
     sprite->data[1] = gBattleAnimArgs[2];
-    sprite->pos1.x = sub_8077ABC(gBattleAnimBankTarget, 2) + gBattleAnimArgs[0];
-    sprite->pos1.y = sub_8077ABC(gBattleAnimBankTarget, 3) + gBattleAnimArgs[1];
+    sprite->pos1.x = GetBankPosition(gAnimBankTarget, 2) + gBattleAnimArgs[0];
+    sprite->pos1.y = GetBankPosition(gAnimBankTarget, 3) + gBattleAnimArgs[1];
     sprite->data[6] = sprite->pos1.x;
     sprite->data[7] = sprite->pos1.y;
-    if (NotInBattle() != 0)
+    if (IsContest() != 0)
     {
         sprite->oam.matrixNum = 8;
         sprite->pos1.x += 40;
@@ -37,7 +37,7 @@ void sub_80CE670(struct Sprite* sprite)
         sprite->data[4] = sprite->pos1.y << 7;
         sprite->data[5] = -0xA00 / sprite->data[1];
     }
-    else if (GetBankSide(gBattleAnimBankAttacker) == 0)
+    else if (GetBankSide(gAnimBankAttacker) == 0)
     {
         sprite->pos1.x -= 40;
         sprite->pos1.y += 20;
@@ -73,5 +73,5 @@ void sub_80CE798(struct Sprite* sprite)
     }
 
     if (sprite->data[1] == 0)
-        move_anim_8072740(sprite);
+        DestroyAnimSprite(sprite);
 }
diff --git a/src/battle/anim/struggle.c b/src/battle/anim/struggle.c
index 63a01a79e..20dbaf2dc 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 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 static void sub_80D2CC4(struct Sprite *);
 
@@ -13,19 +13,19 @@ void sub_80D2C38(struct Sprite *sprite)
 {
     if (gBattleAnimArgs[2] == 0)
     {
-        move_anim_8072740(sprite);
+        DestroyAnimSprite(sprite);
     }
     else
     {
         if (gBattleAnimArgs[0] == 0)
         {
-            sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2);
-            sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 3);
+            sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2);
+            sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3);
         }
         else
         {
-            sprite->pos1.x = sub_8077ABC(gBattleAnimBankTarget, 2);
-            sprite->pos1.y = sub_8077ABC(gBattleAnimBankTarget, 3);
+            sprite->pos1.x = GetBankPosition(gAnimBankTarget, 2);
+            sprite->pos1.y = GetBankPosition(gAnimBankTarget, 3);
         }
 
         if (gBattleAnimArgs[1] == 0)
@@ -47,6 +47,6 @@ static void sub_80D2CC4(struct Sprite *sprite)
         if (--sprite->data[0] != 0)
             StartSpriteAnim(sprite, sprite->data[1]);
         else
-            move_anim_8072740(sprite);
+            DestroyAnimSprite(sprite);
     }
 }
diff --git a/src/battle/anim/sunlight.c b/src/battle/anim/sunlight.c
index f6cb8a077..e6fd49a11 100644
--- a/src/battle/anim/sunlight.c
+++ b/src/battle/anim/sunlight.c
@@ -13,5 +13,5 @@ void sub_80D517C(struct Sprite *sprite)
     sprite->data[2] = 140;
     sprite->data[4] = 80;
     sprite->callback = sub_8078B34;
-    StoreSpriteCallbackInData(sprite, move_anim_8072740);
+    StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
 }
diff --git a/src/battle/anim/swipe.c b/src/battle/anim/swipe.c
index 15bee06ee..922b11a5f 100644
--- a/src/battle/anim/swipe.c
+++ b/src/battle/anim/swipe.c
@@ -15,6 +15,6 @@ void sub_80D2BE8(struct Sprite *sprite)
     }
     else if (sprite->animEnded)
     {
-        move_anim_8072740(sprite);
+        DestroyAnimSprite(sprite);
     }
 }
diff --git a/src/battle/anim/switch.c b/src/battle/anim/switch.c
index a1be144df..c4082b6aa 100755
--- a/src/battle/anim/switch.c
+++ b/src/battle/anim/switch.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 extern s8 gUnknown_083D680C[11][3];
 
@@ -24,7 +24,7 @@ void sub_80CBBF0(struct Sprite* sprite)
 
     if (sprite->data[0] == 0)
     {
-        if (!NotInBattle())
+        if (!IsContest())
         {
             sprite->data[1] = gBattleAnimArgs[1];
             sprite->pos1.x = 0x78;
@@ -101,7 +101,7 @@ void sub_80CBCF8(struct Sprite* sprite)
 	{
 	    sprite->data[2]++;
 		sprite->data[1] = (gUnknown_083D680C[sprite->data[0]][0] * gUnknown_083D680C[sprite->data[0]][2] + sprite->data[1]) & 0xFF;
-		if (!NotInBattle())
+		if (!IsContest())
 		{
 		    if ((u16)(sprite->data[1] - 1) <= 0xBE)
             {
@@ -121,7 +121,7 @@ void sub_80CBCF8(struct Sprite* sprite)
 void sub_80CBDB0(struct Sprite* sprite)
 {
     if (sprite->data[0] > 20)
-        move_anim_8072740(sprite);
+        DestroyAnimSprite(sprite);
 
 	sprite->invisible = sprite->data[0] % 2;
 	sprite->data[0]++;
diff --git a/src/battle/anim/sword.c b/src/battle/anim/sword.c
index 536f89b26..b46fe6759 100755
--- a/src/battle/anim/sword.c
+++ b/src/battle/anim/sword.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 static void sub_80CF6B4(struct Sprite* sprite);
 
@@ -26,5 +26,5 @@ void sub_80CF6B4(struct Sprite* sprite)
     sprite->data[2] = sprite->pos1.x;
     sprite->data[4] = sprite->pos1.y - 32;
     sprite->callback = sub_8078B34;
-    StoreSpriteCallbackInData(sprite, move_anim_8072740);
+    StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
 }
diff --git a/src/battle/anim/taunt_finger.c b/src/battle/anim/taunt_finger.c
index 7024f85a0..023e14e45 100755
--- a/src/battle/anim/taunt_finger.c
+++ b/src/battle/anim/taunt_finger.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 extern void sub_80CEF44(u8 bank, struct Sprite* sprite);
 static void sub_80CF228(struct Sprite* sprite);
@@ -19,9 +19,9 @@ void sub_80CF1C8(struct Sprite* sprite)
 {
     u8 bank;
     if (gBattleAnimArgs[0] == 0)
-        bank = gBattleAnimBankAttacker;
+        bank = gAnimBankAttacker;
     else
-        bank = gBattleAnimBankTarget;
+        bank = gAnimBankTarget;
 
     sub_80CEF44(bank, sprite);
     if (GetBankSide(bank) == 0)
@@ -52,5 +52,5 @@ void sub_80CF228(struct Sprite* sprite)
 void sub_80CF264(struct Sprite* sprite)
 {
     if (++sprite->data[1] > 5)
-        move_anim_8072740(sprite);
+        DestroyAnimSprite(sprite);
 }
diff --git a/src/battle/anim/tendrils.c b/src/battle/anim/tendrils.c
index ba1014d2f..9f57ffd45 100755
--- 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 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 static void sub_80CB298(struct Sprite* sprite);
 static void sub_80CB2D4(struct Sprite* sprite);
@@ -61,7 +61,7 @@ void sub_80CB2D4(struct Sprite* sprite)
         }
         else
         {
-            move_anim_8072740(sprite);
+            DestroyAnimSprite(sprite);
         }
     }
 }
 \ No newline at end of file
diff --git a/src/battle/anim/thought.c b/src/battle/anim/thought.c
index 9cffafe14..c3ab6f82c 100755
--- a/src/battle/anim/thought.c
+++ b/src/battle/anim/thought.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 static void sub_80CF008(struct Sprite* sprite);
 
@@ -20,7 +20,7 @@ void sub_80CEF44(u8 bank, struct Sprite* sprite)
     else
         sprite->pos1.x = sub_807A100(bank, 4) - 8;
 
-    sprite->pos1.y = sub_8077ABC(bank, 3) - (s16)sub_807A100(bank, 0) / 4;
+    sprite->pos1.y = GetBankPosition(bank, 3) - (s16)sub_807A100(bank, 0) / 4;
 }
 
 void sub_80CEF9C(struct Sprite* sprite)
@@ -28,9 +28,9 @@ void sub_80CEF9C(struct Sprite* sprite)
     u8 a;
     u8 bank;
     if (gBattleAnimArgs[0] == 0)
-        bank = gBattleAnimBankAttacker;
+        bank = gAnimBankAttacker;
     else
-        bank = gBattleAnimBankTarget;
+        bank = gAnimBankTarget;
 
     sub_80CEF44(bank, sprite);
     a = (GetBankSide(bank) == 0) ? 0 : 1;
@@ -45,7 +45,7 @@ void sub_80CF008(struct Sprite* sprite)
 {
     if (--sprite->data[0] == 0)
     {
-        StoreSpriteCallbackInData(sprite, move_anim_8072740);
+        StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
         StartSpriteAnim(sprite, sprite->data[1]);
         sprite->callback = sub_8078600;
     }
diff --git a/src/battle/anim/thrashing.c b/src/battle/anim/thrashing.c
index 9811c546a..3fde815ae 100755
--- a/src/battle/anim/thrashing.c
+++ b/src/battle/anim/thrashing.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 extern struct AffineAnimFrameCmd gUnknown_083D77B0;
 
@@ -48,7 +48,7 @@ void sub_80D0AB8(u8 taskId)
     task->data[7] = 0;
     task->data[8] = 0;
     task->data[9] = 2;
-    if (GetBankSide(gBattleAnimBankAttacker) == 1)
+    if (GetBankSide(gAnimBankAttacker) == 1)
         task->data[2] *= -1;
 
     task->func = sub_80D0B3C;
diff --git a/src/battle/anim/thunder.c b/src/battle/anim/thunder.c
index 5064148ef..2ed073221 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 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 extern u16 gBattleTypeFlags;
 
 static void sub_80D6218(struct Sprite *);
@@ -14,7 +14,7 @@ static void sub_80D6218(struct Sprite *);
 
 void sub_80D61C8(struct Sprite *sprite)
 {
-    if (GetBankSide(gBattleAnimBankAttacker) != 0)
+    if (GetBankSide(gAnimBankAttacker) != 0)
     {
         sprite->pos1.x -= gBattleAnimArgs[0];
     }
@@ -31,6 +31,6 @@ static void sub_80D6218(struct Sprite *sprite)
 {
     if (sprite->animEnded)
     {
-        move_anim_8072740(sprite);
+        DestroyAnimSprite(sprite);
     }
 }
diff --git a/src/battle/anim/tile_in.c b/src/battle/anim/tile_in.c
index 5fcbadbb7..a4a544a0c 100755
--- a/src/battle/anim/tile_in.c
+++ b/src/battle/anim/tile_in.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 // tile_in (flips a white tile from the scene into facing the player.)
 // Used in Conversion.
@@ -15,15 +15,15 @@ void sub_80CE09C(struct Sprite* sprite)
 {
     if (sprite->data[0] == 0)
     {
-        sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 0) + gBattleAnimArgs[0];
-        sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 1) + gBattleAnimArgs[1];
-        if (NotInBattle())
+        sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 0) + gBattleAnimArgs[0];
+        sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 1) + gBattleAnimArgs[1];
+        if (IsContest())
             sprite->pos1.y += 10;
         sprite->data[0]++;
     }
 
     if ((u16)gBattleAnimArgs[7] == 0xFFFF)
-        move_anim_8072740(sprite);
+        DestroyAnimSprite(sprite);
 }
 
 void sub_80CE108(u8 taskId)
diff --git a/src/battle/anim/tile_out.c b/src/battle/anim/tile_out.c
index 8b710268f..50468a440 100755
--- a/src/battle/anim/tile_out.c
+++ b/src/battle/anim/tile_out.c
@@ -6,8 +6,8 @@
 #include "battle_interface.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 extern u8 gNoOfAllBanks;
 extern u8 gHealthboxIDs[];
@@ -35,10 +35,10 @@ void sub_80CE1AC(struct Sprite* sprite)
     {
         sprite->animPaused = 0;
         sprite->data[0] = 30;
-        sprite->data[2] = sub_8077ABC(gBattleAnimBankAttacker, 2);
-        sprite->data[4] = sub_8077ABC(gBattleAnimBankAttacker, 3);
+        sprite->data[2] = GetBankPosition(gAnimBankAttacker, 2);
+        sprite->data[4] = GetBankPosition(gAnimBankAttacker, 3);
         sprite->callback = sub_8078B34;
-        StoreSpriteCallbackInData(sprite, move_anim_8072740);
+        StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
     }
 }
 
diff --git a/src/battle/anim/twinkle.c b/src/battle/anim/twinkle.c
index 56095c29d..e26669f63 100755
--- a/src/battle/anim/twinkle.c
+++ b/src/battle/anim/twinkle.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 static void sub_80CE3B0(struct Sprite* sprite);
 
@@ -15,7 +15,7 @@ static void sub_80CE3B0(struct Sprite* sprite);
 
 void sub_80CE36C(struct Sprite* sprite)
 {
-    sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2) + gBattleAnimArgs[0];
+    sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2) + gBattleAnimArgs[0];
     sprite->pos1.y = gBattleAnimArgs[1];
     sprite->data[0] = 0;
     sprite->data[1] = 0;
@@ -38,5 +38,5 @@ void sub_80CE3B0(struct Sprite* sprite)
     }
 
     if (sprite->data[0])
-        move_anim_8072740(sprite);
+        DestroyAnimSprite(sprite);
 }
diff --git a/src/battle/anim/unused_1.c b/src/battle/anim/unused_1.c
index fdcef0de9..d7e5fbfe4 100755
--- 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 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 // unused effect file.
 // Seems to be a beta effect for Beat Up, possibly.
diff --git a/src/battle/anim/unused_2.c b/src/battle/anim/unused_2.c
index f7f5be88d..122f39e02 100755
--- 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 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 static void sub_80CCCB4(struct Sprite* sprite);
 
@@ -42,14 +42,14 @@ void unref_sub_80CCB6C(struct Sprite* sprite)
     {
         DestroySprite(&gSprites[sprite->data[0]]);
         DestroySprite(&gSprites[sprite->data[1]]);
-        move_anim_8072740(sprite);
+        DestroyAnimSprite(sprite);
     }
 }
 
 void sub_80CCC50(struct Sprite* sprite)
 {
     sprite->data[0] = gBattleAnimArgs[2];
-    if (GetBankSide(gBattleAnimBankAttacker) != 0)
+    if (GetBankSide(gAnimBankAttacker) != 0)
         sprite->pos1.x -= gBattleAnimArgs[0];
     else
         sprite->pos1.x += gBattleAnimArgs[0];
@@ -76,5 +76,5 @@ void sub_80CCCB4(struct Sprite* sprite)
     sprite->pos2.y += sprite->data[5] >> 8;
     sprite->data[2]++;
     if (sprite->data[2] == sprite->data[3])
-        move_anim_8072740(sprite);
+        DestroyAnimSprite(sprite);
 }
diff --git a/src/battle/anim/unused_3.c b/src/battle/anim/unused_3.c
index 049e0ca1b..6dbcbfefe 100755
--- 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 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 static void sub_80CD2D4(struct Sprite* sprite);
 
@@ -16,7 +16,7 @@ static void sub_80CD2D4(struct Sprite* sprite);
 void sub_80CD274(struct Sprite* sprite)
 {
     sub_8078650(sprite);
-    if (GetBankSide(gBattleAnimBankAttacker) == 0)
+    if (GetBankSide(gAnimBankAttacker) == 0)
     {
         sprite->pos1.x += gBattleAnimArgs[0];
         sprite->pos1.y += gBattleAnimArgs[1];
@@ -41,5 +41,5 @@ void sub_80CD2D4(struct Sprite* sprite)
     }
 
     if (sprite->animEnded)
-        move_anim_8072740(sprite);
+        DestroyAnimSprite(sprite);
 }
diff --git a/src/battle/anim/unused_4.c b/src/battle/anim/unused_4.c
index 72ecde05c..bda476a0a 100755
--- a/src/battle/anim/unused_4.c
+++ b/src/battle/anim/unused_4.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 extern u8 gObjectBankIDs[];
 
@@ -27,8 +27,8 @@ void sub_80CD9D4(struct Sprite* sprite)
     {
     case 0:
         sprite->data[1] = 0;
-        sprite->data[2] = gObjectBankIDs[gBattleAnimBankAttacker];
-        sprite->data[3] = GetBankSide(gBattleAnimBankAttacker);
+        sprite->data[2] = gObjectBankIDs[gAnimBankAttacker];
+        sprite->data[3] = GetBankSide(gAnimBankAttacker);
         sprite->data[4] = (sprite->data[3] != 0) ? 0x200 : -0x200;
         sprite->data[5] = 0;
         sub_8078E70(sprite->data[2], 0);
@@ -51,7 +51,7 @@ void sub_80CD9D4(struct Sprite* sprite)
         if (++sprite->data[1] > 3)
         {
             sub_8078F40(sprite->data[2]);
-            move_anim_8072740(sprite);
+            DestroyAnimSprite(sprite);
         }
         break;
     }
diff --git a/src/battle/anim/unused_5.c b/src/battle/anim/unused_5.c
index 4dc2da70d..421cdd6bf 100755
--- 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 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 // unused_5
 
diff --git a/src/battle/anim/unused_6.c b/src/battle/anim/unused_6.c
index f7c87647f..37e2031b0 100755
--- 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 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 extern void sub_80CEF44(u8 bank, struct Sprite* sprite);
 static void sub_80CF310(struct Sprite* sprite);
@@ -17,9 +17,9 @@ void sub_80CF2D0(struct Sprite* sprite)
 {
     u8 bank;
     if (gBattleAnimArgs[0] == 0)
-        bank = gBattleAnimBankAttacker;
+        bank = gAnimBankAttacker;
     else
-        bank = gBattleAnimBankTarget;
+        bank = gAnimBankTarget;
 
     sub_80CEF44(bank, sprite);
     sprite->data[0] = 0;
@@ -43,7 +43,7 @@ void sub_80CF310(struct Sprite* sprite)
         break;
     case 2:
         if (++sprite->data[1] == 0x40)
-            move_anim_8072740(sprite);
+            DestroyAnimSprite(sprite);
         break;
     }
 }
diff --git a/src/battle/anim/unused_7.c b/src/battle/anim/unused_7.c
index 3a8998f1d..2be6e7633 100755
--- 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 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 extern u8 gObjectBankIDs[];
 
@@ -30,10 +30,10 @@ void sub_80CF374(struct Sprite* sprite)
 void sub_80CF3C4(struct Sprite* sprite)
 {
     u8 a;
-    sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2);
-    sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 3);
-    a = gObjectBankIDs[gBattleAnimBankTarget];
-    if (GetBankSide(gBattleAnimBankAttacker) != 0)
+    sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2);
+    sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3);
+    a = gObjectBankIDs[gAnimBankTarget];
+    if (GetBankSide(gAnimBankAttacker) != 0)
     {
         sprite->pos1.x -= gBattleAnimArgs[0];
     }
diff --git a/src/battle/anim/unused_8.c b/src/battle/anim/unused_8.c
index bcebfcd2b..03772f951 100755
--- 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 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 static void sub_80CF490(struct Sprite* sprite);
 static void sub_80CF4B8(struct Sprite* sprite);
@@ -35,7 +35,7 @@ void sub_80CF490(struct Sprite* sprite)
 void sub_80CF4B8(struct Sprite* sprite)
 {
     if (sprite->data[5] == 0)
-        move_anim_8072740(sprite);
+        DestroyAnimSprite(sprite);
     else
         sprite->data[5]--;
 }
diff --git a/src/battle/anim/unused_9.c b/src/battle/anim/unused_9.c
index 579238fbc..cf3ccb0d4 100755
--- a/src/battle/anim/unused_9.c
+++ b/src/battle/anim/unused_9.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 extern struct SpriteTemplate gSpriteTemplate_83D75AC;
 
@@ -44,7 +44,7 @@ void sub_80CFE2C(struct Sprite* sprite)
 
         gPlttBufferFaded[sprite->data[0] + 15] = r7;
         if (++sprite->data[2] == 0x18)
-            move_anim_8072740(sprite);
+            DestroyAnimSprite(sprite);
     }
 }
 #else
@@ -101,7 +101,7 @@ _080CFE64:\n\
 	cmp r0, 0x18\n\
 	bne _080CFE90\n\
 	adds r0, r4, 0\n\
-	bl move_anim_8072740\n\
+	bl DestroyAnimSprite\n\
 _080CFE90:\n\
 	pop {r4-r7}\n\
 	pop {r0}\n\
diff --git a/src/battle/anim/water.c b/src/battle/anim/water.c
index 396a4637d..4068cbe78 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 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 static void sub_80D3874(struct Sprite *);
 
@@ -19,7 +19,7 @@ void sub_80D37FC(struct Sprite *sprite)
     sprite->data[4] = sprite->pos1.y + gBattleAnimArgs[4];
 
     sprite->callback = sub_8078B34;
-    StoreSpriteCallbackInData(sprite, move_anim_8072740);
+    StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
 }
 
 void sub_80D3838(struct Sprite *sprite)
@@ -47,7 +47,7 @@ static void sub_80D3874(struct Sprite *sprite)
 
     if (--sprite->data[7] == -1)
     {
-        move_anim_8072740(sprite);
+        DestroyAnimSprite(sprite);
     }
 }
 
@@ -139,7 +139,7 @@ _080D3920:\n\
     ldr r1, _080D399C @ =0x85000400\n\
     str r1, [r0, 0x8]\n\
     ldr r0, [r0, 0x8]\n\
-    bl NotInBattle\n\
+    bl IsContest\n\
     lsls r0, 24\n\
     cmp r0, 0\n\
     bne _080D39B8\n\
@@ -151,7 +151,7 @@ _080D3920:\n\
     movs r1, 0x4\n\
     orrs r0, r1\n\
     strb r0, [r2]\n\
-    ldr r0, _080D39A0 @ =gBattleAnimBankAttacker\n\
+    ldr r0, _080D39A0 @ =gAnimBankAttacker\n\
     ldrb r0, [r0]\n\
     bl GetBankSide\n\
     lsls r0, 24\n\
@@ -166,7 +166,7 @@ _080D3990: .4byte 0x00003f42\n\
 _080D3994: .4byte REG_BG1CNT\n\
 _080D3998: .4byte 0x040000d4\n\
 _080D399C: .4byte 0x85000400\n\
-_080D39A0: .4byte gBattleAnimBankAttacker\n\
+_080D39A0: .4byte gAnimBankAttacker\n\
 _080D39A4: .4byte gUnknown_08E70968\n\
 _080D39A8:\n\
     ldr r0, _080D39B4 @ =gUnknown_08E70C38\n\
@@ -245,18 +245,18 @@ _080D3A0E:\n\
     lsls r0, 5\n\
     strh r0, [r7, 0xA]\n\
     strh r0, [r7, 0xC]\n\
-    bl NotInBattle\n\
+    bl IsContest\n\
     lsls r0, 24\n\
     lsrs r4, r0, 24\n\
     cmp r4, 0\n\
     beq _080D3A94\n\
     ldr r3, _080D3A84 @ =0x0000ffb0\n\
     adds r0, r3, 0\n\
-    ldr r1, _080D3A88 @ =gUnknown_030042C0\n\
+    ldr r1, _080D3A88 @ =gBattle_BG1_X\n\
     strh r0, [r1]\n\
     ldr r2, _080D3A8C @ =0x0000ffd0\n\
     adds r0, r2, 0\n\
-    ldr r3, _080D3A90 @ =gUnknown_030041B4\n\
+    ldr r3, _080D3A90 @ =gBattle_BG1_Y\n\
     strh r0, [r3]\n\
     movs r0, 0x2\n\
     strh r0, [r6, 0x8]\n\
@@ -270,11 +270,11 @@ _080D3A78: .4byte gBattleAnimBackgroundImageMuddyWater_Pal\n\
 _080D3A7C: .4byte sub_80D3D68\n\
 _080D3A80: .4byte gTasks\n\
 _080D3A84: .4byte 0x0000ffb0\n\
-_080D3A88: .4byte gUnknown_030042C0\n\
+_080D3A88: .4byte gBattle_BG1_X\n\
 _080D3A8C: .4byte 0x0000ffd0\n\
-_080D3A90: .4byte gUnknown_030041B4\n\
+_080D3A90: .4byte gBattle_BG1_Y\n\
 _080D3A94:\n\
-    ldr r0, _080D3AC4 @ =gBattleAnimBankAttacker\n\
+    ldr r0, _080D3AC4 @ =gAnimBankAttacker\n\
     ldrb r0, [r0]\n\
     bl GetBankSide\n\
     lsls r0, 24\n\
@@ -283,12 +283,12 @@ _080D3A94:\n\
     bne _080D3AD8\n\
     ldr r2, _080D3AC8 @ =0x0000ff20\n\
     adds r0, r2, 0\n\
-    ldr r3, _080D3ACC @ =gUnknown_030042C0\n\
+    ldr r3, _080D3ACC @ =gBattle_BG1_X\n\
     strh r0, [r3]\n\
     movs r2, 0x80\n\
     lsls r2, 1\n\
     adds r0, r2, 0\n\
-    ldr r3, _080D3AD0 @ =gUnknown_030041B4\n\
+    ldr r3, _080D3AD0 @ =gBattle_BG1_Y\n\
     strh r0, [r3]\n\
     movs r0, 0x2\n\
     strh r0, [r6, 0x8]\n\
@@ -297,17 +297,17 @@ _080D3A94:\n\
     strh r1, [r7, 0xE]\n\
     b _080D3AEE\n\
     .align 2, 0\n\
-_080D3AC4: .4byte gBattleAnimBankAttacker\n\
+_080D3AC4: .4byte gAnimBankAttacker\n\
 _080D3AC8: .4byte 0x0000ff20\n\
-_080D3ACC: .4byte gUnknown_030042C0\n\
-_080D3AD0: .4byte gUnknown_030041B4\n\
+_080D3ACC: .4byte gBattle_BG1_X\n\
+_080D3AD0: .4byte gBattle_BG1_Y\n\
 _080D3AD4: .4byte 0x0000ffff\n\
 _080D3AD8:\n\
-    ldr r0, _080D3B1C @ =gUnknown_030042C0\n\
+    ldr r0, _080D3B1C @ =gBattle_BG1_X\n\
     strh r4, [r0]\n\
     ldr r1, _080D3B20 @ =0x0000ffd0\n\
     adds r0, r1, 0\n\
-    ldr r2, _080D3B24 @ =gUnknown_030041B4\n\
+    ldr r2, _080D3B24 @ =gBattle_BG1_Y\n\
     strh r0, [r2]\n\
     ldr r0, _080D3B28 @ =0x0000fffe\n\
     strh r0, [r6, 0x8]\n\
@@ -316,11 +316,11 @@ _080D3AD8:\n\
     strh r4, [r7, 0xE]\n\
 _080D3AEE:\n\
     ldr r1, _080D3B2C @ =REG_BG1HOFS\n\
-    ldr r3, _080D3B1C @ =gUnknown_030042C0\n\
+    ldr r3, _080D3B1C @ =gBattle_BG1_X\n\
     ldrh r0, [r3]\n\
     strh r0, [r1]\n\
     adds r1, 0x2\n\
-    ldr r2, _080D3B24 @ =gUnknown_030041B4\n\
+    ldr r2, _080D3B24 @ =gBattle_BG1_Y\n\
     ldrh r0, [r2]\n\
     strh r0, [r1]\n\
     ldr r1, _080D3B30 @ =gTasks\n\
@@ -338,9 +338,9 @@ _080D3AEE:\n\
     movs r0, 0x70\n\
     b _080D3B38\n\
     .align 2, 0\n\
-_080D3B1C: .4byte gUnknown_030042C0\n\
+_080D3B1C: .4byte gBattle_BG1_X\n\
 _080D3B20: .4byte 0x0000ffd0\n\
-_080D3B24: .4byte gUnknown_030041B4\n\
+_080D3B24: .4byte gBattle_BG1_Y\n\
 _080D3B28: .4byte 0x0000fffe\n\
 _080D3B2C: .4byte REG_BG1HOFS\n\
 _080D3B30: .4byte gTasks\n\
diff --git a/src/battle/anim/wave_finger.c b/src/battle/anim/wave_finger.c
index 58f0f8778..2cf68c34c 100755
--- a/src/battle/anim/wave_finger.c
+++ b/src/battle/anim/wave_finger.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 extern void sub_80CEF44(u8 bank, struct Sprite* sprite);
 void sub_80CF088(struct Sprite* sprite);
@@ -18,9 +18,9 @@ void sub_80CF040(struct Sprite* sprite)
 {
     u8 bank;
     if (gBattleAnimArgs[0] == 0)
-        bank = gBattleAnimBankAttacker;
+        bank = gAnimBankAttacker;
     else
-        bank = gBattleAnimBankTarget;
+        bank = gAnimBankTarget;
 
     sub_80CEF44(bank, sprite);
     sprite->data[0] = 0;
diff --git a/src/battle/anim/whip.c b/src/battle/anim/whip.c
index 3aa0758a9..cb3ce327e 100755
--- a/src/battle/anim/whip.c
+++ b/src/battle/anim/whip.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 // whip (does a hitting animation that uses a rotating sprite to invoke the sprite getting hit.)
 // Used by Slam and Vine Whip.
@@ -14,13 +14,13 @@ extern u8 gBattleAnimBankTarget;
 void sub_80CC810(struct Sprite* sprite)
 {
     if (sprite->animEnded)
-        move_anim_8072740(sprite);
+        DestroyAnimSprite(sprite);
 }
 
 // unused, beta effect for diagonal sprite movement?
 void sub_80CC82C(struct Sprite* sprite)
 {
-    if (GetBankSide(gBattleAnimBankAttacker) != 0)
+    if (GetBankSide(gAnimBankAttacker) != 0)
     {
         sprite->pos1.x -= gBattleAnimArgs[0];
         sprite->pos1.y += gBattleAnimArgs[1];
@@ -32,12 +32,12 @@ void sub_80CC82C(struct Sprite* sprite)
     }
 
     sprite->callback = sub_8078600;
-    StoreSpriteCallbackInData(sprite, move_anim_8072740);
+    StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
 }
 
 void sub_80CC884(struct Sprite* sprite)
 {
-    if (GetBankSide(gBattleAnimBankAttacker) == 0)
+    if (GetBankSide(gAnimBankAttacker) == 0)
         StartSpriteAnim(sprite, 1);
 
     sprite->callback = sub_80CC810;
diff --git a/src/battle/anim/wisp_orb.c b/src/battle/anim/wisp_orb.c
index 0e13fa119..0cbe6eed7 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 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 extern u16 gBattleTypeFlags;
 extern u8 gUnknown_0202F7D2;
 
@@ -25,7 +25,7 @@ void sub_80D5B0C(struct Sprite *sprite)
         StartSpriteAnim(sprite, gBattleAnimArgs[2]);
         sprite->data[7] = gBattleAnimArgs[2];
 
-        if (GetBankSide(gBattleAnimBankAttacker) != 0)
+        if (GetBankSide(gAnimBankAttacker) != 0)
         {
             sprite->data[4] = 4;
         }
@@ -34,12 +34,12 @@ void sub_80D5B0C(struct Sprite *sprite)
             sprite->data[4] = -4;
         }
 
-        sprite->oam.priority = sub_8079ED4(gBattleAnimBankTarget);
+        sprite->oam.priority = sub_8079ED4(gAnimBankTarget);
         sprite->data[0]++;
         break;
     case 1:
         sprite->data[1] += 192;
-        if (GetBankSide(gBattleAnimBankAttacker) != 0)
+        if (GetBankSide(gAnimBankAttacker) != 0)
         {
             sprite->pos2.y = -(sprite->data[1] >> 8);
         }
@@ -70,9 +70,9 @@ void sub_80D5B0C(struct Sprite *sprite)
 
             sprite->data[0] = 256;
             sprite->data[1] = sprite->pos1.x;
-            sprite->data[2] = sub_8077ABC(gBattleAnimBankTarget, 2);
+            sprite->data[2] = GetBankPosition(gAnimBankTarget, 2);
             sprite->data[3] = sprite->pos1.y;
-            sprite->data[4] = sub_8077ABC(gBattleAnimBankTarget, 3);
+            sprite->data[4] = GetBankPosition(gAnimBankTarget, 3);
 
             sub_8078BD4(sprite);
             sprite->callback = sub_80D5C5C;
@@ -100,6 +100,6 @@ static void sub_80D5C5C(struct Sprite *sprite)
     }
     else
     {
-        move_anim_8072740(sprite);
+        DestroyAnimSprite(sprite);
     }
 }
diff --git a/src/battle/anim/withdraw.c b/src/battle/anim/withdraw.c
index 9abcff32d..e67248b9f 100755
--- a/src/battle/anim/withdraw.c
+++ b/src/battle/anim/withdraw.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 extern u8 gObjectBankIDs[];
 
@@ -17,15 +17,15 @@ static void sub_80CF514(u8 taskId);
 
 void sub_80CF4D8(u8 taskId)
 {
-    sub_8078E70(gObjectBankIDs[gBattleAnimBankAttacker], 0);
+    sub_8078E70(gObjectBankIDs[gAnimBankAttacker], 0);
     gTasks[taskId].func = sub_80CF514;
 }
 
 void sub_80CF514(u8 taskId)
 {
-    u8 a = gObjectBankIDs[gBattleAnimBankAttacker];
+    u8 a = gObjectBankIDs[gAnimBankAttacker];
     s16 b;
-    if (GetBankSide(gBattleAnimBankAttacker) == 0)
+    if (GetBankSide(gAnimBankAttacker) == 0)
     {
         b = -gTasks[taskId].data[0];
     }
diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c
index ff3df7235..b0654950b 100644
--- a/src/battle/battle_2.c
+++ b/src/battle/battle_2.c
@@ -96,21 +96,21 @@ extern u8 gActionSelectionCursor[];
 extern u8 gMoveSelectionCursor[];
 extern u8 gUnknown_02038470[];
 extern u16 gUnknown_030041B0;
-extern u16 gUnknown_030041B4;
+extern u16 gBattle_BG1_Y;
 extern u16 gUnknown_030041B8;
 extern struct Window gUnknown_030041D0;
-extern u16 gUnknown_03004200;
+extern u16 gBattle_WIN1H;
 extern struct Window gUnknown_03004210;
-extern u16 gUnknown_03004244;
+extern u16 gBattle_WIN1V;
 extern struct Window gUnknown_03004250;
-extern u16 gUnknown_03004240;
-extern u16 gUnknown_03004280;
+extern u16 gBattle_WIN0V;
+extern u16 gBattle_BG2_Y;
 extern u32 gUnknown_03004284;
-extern u16 gUnknown_03004288;
+extern u16 gBattle_BG2_X;
 extern u16 gUnknown_030042A0;
 extern u16 gUnknown_030042A4;
-extern u16 gUnknown_030042C0;
-extern u16 gUnknown_030042C4;
+extern u16 gBattle_BG1_X;
+extern u16 gBattle_WIN0H;
 extern MainCallback gPreBattleCallback1;
 extern void (*gBattleMainFunc)(void);
 extern u8 gLeveledUpInBattle;
@@ -160,8 +160,8 @@ void InitBattle(void)
     REG_WIN0V = 0x5051;
     REG_WININ = 0;
     REG_WINOUT = 0;
-    gUnknown_030042C4 = 0xF0;
-    gUnknown_03004240 = 0x5051;
+    gBattle_WIN0H = 0xF0;
+    gBattle_WIN0V = 0x5051;
     dp12_8087EA4();
 
     for (i = 0; i < 80; i++)
@@ -181,10 +181,10 @@ void InitBattle(void)
     ResetPaletteFade();
     gUnknown_030042A4 = 0;
     gUnknown_030042A0 = 0;
-    gUnknown_030042C0 = 0;
-    gUnknown_030041B4 = 0;
-    gUnknown_03004288 = 0;
-    gUnknown_03004280 = 0;
+    gBattle_BG1_X = 0;
+    gBattle_BG1_Y = 0;
+    gBattle_BG2_X = 0;
+    gBattle_BG2_Y = 0;
     gUnknown_030041B0 = 0;
     gUnknown_030041B8 = 0;
     gBattleTerrain = BattleSetup_GetTerrain();
@@ -1003,16 +1003,16 @@ void sub_800FCFC(void)
     Random();  // unused return value
     REG_BG0HOFS = gUnknown_030042A4;
     REG_BG0VOFS = gUnknown_030042A0;
-    REG_BG1HOFS = gUnknown_030042C0;
-    REG_BG1VOFS = gUnknown_030041B4;
-    REG_BG2HOFS = gUnknown_03004288;
-    REG_BG2VOFS = gUnknown_03004280;
+    REG_BG1HOFS = gBattle_BG1_X;
+    REG_BG1VOFS = gBattle_BG1_Y;
+    REG_BG2HOFS = gBattle_BG2_X;
+    REG_BG2VOFS = gBattle_BG2_Y;
     REG_BG3HOFS = gUnknown_030041B0;
     REG_BG3VOFS = gUnknown_030041B8;
-    REG_WIN0H = gUnknown_030042C4;
-    REG_WIN0V = gUnknown_03004240;
-    REG_WIN1H = gUnknown_03004200;
-    REG_WIN1V = gUnknown_03004244;
+    REG_WIN0H = gBattle_WIN0H;
+    REG_WIN0V = gBattle_WIN0V;
+    REG_WIN1H = gBattle_WIN1H;
+    REG_WIN1V = gBattle_WIN1V;
     LoadOam();
     ProcessSpriteCopyRequests();
     TransferPlttBuffer();
@@ -1138,8 +1138,8 @@ void c2_8011A1C(void)
     REG_WIN0V = 0x5051;
     REG_WININ = 0;
     REG_WINOUT = 0;
-    gUnknown_030042C4 = 0xF0;
-    gUnknown_03004240 = 0x5051;
+    gBattle_WIN0H = 0xF0;
+    gBattle_WIN0V = 0x5051;
     dp12_8087EA4();
 
     for (i = 0; i < 80; i++)
@@ -1157,10 +1157,10 @@ void c2_8011A1C(void)
     ResetPaletteFade();
     gUnknown_030042A4 = 0;
     gUnknown_030042A0 = 0;
-    gUnknown_030042C0 = 0;
-    gUnknown_030041B4 = 0;
-    gUnknown_03004288 = 0;
-    gUnknown_03004280 = 0;
+    gBattle_BG1_X = 0;
+    gBattle_BG1_Y = 0;
+    gBattle_BG2_X = 0;
+    gBattle_BG2_Y = 0;
     gUnknown_030041B0 = 0;
     gUnknown_030041B8 = 0;
 
diff --git a/src/battle/battle_7.c b/src/battle/battle_7.c
index 5a30e012d..22e15d69a 100644
--- a/src/battle/battle_7.c
+++ b/src/battle/battle_7.c
@@ -39,8 +39,8 @@ extern struct MusicPlayerInfo gMPlay_BGM;
 extern u32 gBitTable[];
 extern u16 gBattleTypeFlags;
 extern u8 gBattleMonForms[];
-extern u8 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 extern void (*gAnimScriptCallback)(void);
 extern u8 gAnimScriptActive;
 extern const u8 *const gBattleAnims_General[];
@@ -66,8 +66,8 @@ extern void c3_0802FDF4(u8);
 extern void sub_80440EC();
 extern void sub_804777C();
 extern void sub_8141828();
-extern u8 sub_8077ABC();
-extern u8 AnimBankSpriteExists(u8);
+extern u8 GetBankPosition();
+extern u8 IsBankSpritePresent(u8);
 extern u8 sub_8077F68(u8);
 extern u8 sub_8077F7C(u8);
 extern void sub_8094958(void);
@@ -174,10 +174,10 @@ bool8 move_anim_start_t3(u8 a, u8 b, u8 c, u8 d, u16 e)
         sub_80324E0(a);
         return TRUE;
     }
-    gBattleAnimBankAttacker = b;
-    gBattleAnimBankTarget = c;
+    gAnimBankAttacker = b;
+    gAnimBankTarget = c;
     ewram17840.unk0 = e;
-    DoMoveAnim(gBattleAnims_General, d, 0);
+    LaunchBattleAnimation(gBattleAnims_General, d, 0);
     taskId = CreateTask(sub_80315E8, 10);
     gTasks[taskId].data[0] = a;
     ewram17810[gTasks[taskId].data[0]].unk0_5 = 1;
@@ -214,9 +214,9 @@ void move_anim_start_t4(u8 a, u8 b, u8 c, u8 d)
 {
     u8 taskId;
 
-    gBattleAnimBankAttacker = b;
-    gBattleAnimBankTarget = c;
-    DoMoveAnim(gBattleAnims_Special, d, 0);
+    gAnimBankAttacker = b;
+    gAnimBankTarget = c;
+    LaunchBattleAnimation(gBattleAnims_Special, d, 0);
     taskId = CreateTask(sub_80316CC, 10);
     gTasks[taskId].data[0] = a;
     ewram17810[gTasks[taskId].data[0]].unk0_6 = 1;
@@ -626,7 +626,7 @@ void sub_8031FC4(u8 a, u8 b, bool8 c)
         const void *src;
         void *dst;
 
-        if (NotInBattle())
+        if (IsContest())
         {
             r10 = 0;
             species = ewram19348.unk2;
@@ -691,7 +691,7 @@ void sub_8031FC4(u8 a, u8 b, bool8 c)
         }
         BlendPalette(paletteOffset, 16, 6, 0x7FFF);
         CpuCopy32(gPlttBufferFaded + paletteOffset, gPlttBufferUnfaded + paletteOffset, 32);
-        if (!NotInBattle())
+        if (!IsContest())
         {
             ewram17800[a].transformedSpecies = species;
             gBattleMonForms[a] = gBattleMonForms[b];
@@ -711,11 +711,11 @@ void BattleLoadSubstituteSprite(u8 a, u8 b)
 
     if (b == 0)
     {
-        if (NotInBattle())
+        if (IsContest())
             r4 = 0;
         else
             r4 = GetBankIdentity(a);
-        if (NotInBattle())
+        if (IsContest())
             LZDecompressVram(gSubstituteDollTilemap, gUnknown_081FAF4C[r4]);
         else if (GetBankSide(a) != 0)
             LZDecompressVram(gSubstituteDollGfx, gUnknown_081FAF4C[r4]);
@@ -731,7 +731,7 @@ void BattleLoadSubstituteSprite(u8 a, u8 b)
     }
     else
     {
-        if (!NotInBattle())
+        if (!IsContest())
         {
             if (GetBankSide(a) != 0)
                 BattleLoadOpponentMonSprite(&gEnemyParty[gBattlePartyID[a]], a);
@@ -835,7 +835,7 @@ void sub_80326EC(u8 a)
 
     for (i = 0; i < gNoOfAllBanks; i++)
     {
-        if (AnimBankSpriteExists(i) != 0)
+        if (IsBankSpritePresent(i) != 0)
         {
             gSprites[gObjectBankIDs[i]].oam.affineMode = a;
             if (a == 0)
@@ -857,12 +857,12 @@ void sub_80327CC(void)
 
     LoadCompressedObjectPic(&gUnknown_081FAF24);
     r5 = GetBankByPlayerAI(1);
-    ewram17810[r5].unk7 = CreateSprite(&gSpriteTemplate_81FAF34, sub_8077ABC(r5, 0), sub_8077ABC(r5, 1) + 32, 0xC8);
+    ewram17810[r5].unk7 = CreateSprite(&gSpriteTemplate_81FAF34, GetBankPosition(r5, 0), GetBankPosition(r5, 1) + 32, 0xC8);
     gSprites[ewram17810[r5].unk7].data[0] = r5;
     if (IsDoubleBattle())
     {
         r5 = GetBankByPlayerAI(3);
-        ewram17810[r5].unk7 = CreateSprite(&gSpriteTemplate_81FAF34, sub_8077ABC(r5, 0), sub_8077ABC(r5, 1) + 32, 0xC8);
+        ewram17810[r5].unk7 = CreateSprite(&gSpriteTemplate_81FAF34, GetBankPosition(r5, 0), GetBankPosition(r5, 1) + 32, 0xC8);
         gSprites[ewram17810[r5].unk7].data[0] = r5;
     }
 }
@@ -873,7 +873,7 @@ void sub_80328A4(struct Sprite *sprite)
     u8 r4 = sprite->data[0];
     struct Sprite *r7 = &gSprites[gObjectBankIDs[r4]];
 
-    if (!r7->inUse || AnimBankSpriteExists(r4) == 0)
+    if (!r7->inUse || IsBankSpritePresent(r4) == 0)
     {
         sprite->callback = sub_8032978;
         return;
diff --git a/src/battle/battle_anim.c b/src/battle/battle_anim.c
index 1a78b2863..8c37e6010 100644
--- a/src/battle/battle_anim.c
+++ b/src/battle/battle_anim.c
@@ -17,11 +17,14 @@
 // sprites start at 10000 and thus must be subtracted of 10000 to account for the true index.
 #define GET_TRUE_SPRITE_INDEX(i) (i - 10000)
 
+#define ANIM_SPRITE_INDEX_COUNT 8
+#define ANIM_ARGS_COUNT 8
+
 extern u16 gBattlePartyID[4];
 extern u8 gObjectBankIDs[];
 extern u8 gBankAttacker;
 extern u8 gBankTarget;
-EWRAM_DATA const u8 *gBattleAnimScriptPtr = NULL;
+EWRAM_DATA const u8 *sBattleAnimScriptPtr = NULL;
 EWRAM_DATA const u8 *gBattleAnimScriptRetAddr = NULL;
 EWRAM_DATA void (*gAnimScriptCallback)(void) = NULL;
 EWRAM_DATA s8 gAnimFramesToWait = 0;
@@ -29,30 +32,30 @@ EWRAM_DATA u8 gAnimScriptActive = FALSE;
 EWRAM_DATA u8 gAnimVisualTaskCount = 0;
 EWRAM_DATA u8 gAnimSoundTaskCount = 0;
 EWRAM_DATA u32 gDisableStructMoveAnim = 0;
-EWRAM_DATA u32 gMoveDmgMoveAnim = 0;
-EWRAM_DATA u16 gMovePowerMoveAnim = 0;
-EWRAM_DATA u8 gHappinessMoveAnim = 0;
+EWRAM_DATA u32 gAnimMoveDmg = 0;
+EWRAM_DATA u16 gAnimMovePower = 0;
+EWRAM_DATA u8 gAnimFriendship = 0;
 EWRAM_DATA u16 gWeatherMoveAnim = 0;
 EWRAM_DATA u8 gMonAnimTaskIdArray[2] = {0};
-EWRAM_DATA u8 gUnknown_0202F7C4 = 0;
-EWRAM_DATA u8 gUnknown_0202F7C5 = 0;
-EWRAM_DATA u16 gAnimMoveIndex = 0; // set but unused.
-EWRAM_DATA u8 gBattleAnimBankAttacker = 0;
-EWRAM_DATA u8 gBattleAnimBankTarget = 0;
-EWRAM_DATA u16 gUnknown_0202F7CA[4] = {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 u16 gAnimSpeciesByBanks[4] = {0};
 EWRAM_DATA u8 gUnknown_0202F7D2 = 0;
-extern u16 gUnknown_030041B4;
-extern u16 gUnknown_03004200;
-extern u16 gUnknown_03004240;
-extern u16 gUnknown_03004244;
-extern u16 gUnknown_03004280;
-extern u16 gUnknown_03004288;
-extern u16 gUnknown_030042C0;
-extern u16 gUnknown_030042C4;
+extern u16 gBattle_BG1_Y;
+extern u16 gBattle_WIN1H;
+extern u16 gBattle_WIN0V;
+extern u16 gBattle_WIN1V;
+extern u16 gBattle_BG2_Y;
+extern u16 gBattle_BG2_X;
+extern u16 gBattle_BG1_X;
+extern u16 gBattle_WIN0H;
 
 u16 gSoundAnimFramesToWait;
-s16 gBattleAnimArgs[8];
-u16 gAnimSpriteIndexArray[8];
+s16 gBattleAnimArgs[ANIM_ARGS_COUNT];
+u16 gAnimSpriteIndexArray[ANIM_SPRITE_INDEX_COUNT];
 
 extern struct MusicPlayerInfo gMPlay_BGM;
 extern struct MusicPlayerInfo gMPlay_SE1;
@@ -65,10 +68,10 @@ extern const struct CompressedSpritePalette gBattleAnimPaletteTable[];
 extern const struct BattleAnimBackground gBattleAnimBackgroundTable[];
 
 static void RunAnimScriptCommand(void);
-static void ScriptCmd_loadsprite(void);
-static void ScriptCmd_unloadsprite(void);
-static void ScriptCmd_sprite(void);
-static void ScriptCmd_createtask(void);
+static void ScriptCmd_loadspritegfx(void);
+static void ScriptCmd_unloadspritegfx(void);
+static void ScriptCmd_createsprite(void);
+static void ScriptCmd_createvisualtask(void);
 static void ScriptCmd_delay(void);
 static void ScriptCmd_waitforvisualfinish(void);
 static void ScriptCmd_hang1(void);
@@ -88,33 +91,33 @@ static void ScriptCmd_setbldcnt(void);
 static void ScriptCmd_blendoff(void);
 static void ScriptCmd_call(void);
 static void ScriptCmd_return(void);
-static void ScriptCmd_setvar(void);
-static void ScriptCmd_ifelse(void);
-static void ScriptCmd_jumpif(void);
+static void ScriptCmd_setarg(void);
+static void ScriptCmd_choosetwoturnanim(void);
+static void ScriptCmd_jumpifmoveturn(void);
 static void ScriptCmd_jump(void);
 static void ScriptCmd_fadetobg(void);
-static void ScriptCmd_fadetobg_25(void);
-static void task_p5_load_battle_screen_elements(u8);
-static void sub_8076DB8(u16);
-static void dp01t_11_3_message_for_player_only(void);
+static void ScriptCmd_fadetobgfromset(void);
+static void Task_FadeToBg(u8);
+static void LoadMoveBg(u16);
+static void LoadDefaultBg(void);
 static void ScriptCmd_restorebg(void);
 static void ScriptCmd_waitbgfadeout(void);
 static void ScriptCmd_waitbgfadein(void);
 static void ScriptCmd_changebg(void);
-static void ScriptCmd_panse_19(void);
+static void ScriptCmd_playsewithpan(void);
 static void ScriptCmd_setpan(void);
 static void ScriptCmd_panse_1B(void);
-static void c3_08073CEC(u8);
+static void Task_PanFromInitialToTarget(u8);
 static void ScriptCmd_panse_26(void);
 static void ScriptCmd_panse_27(void);
-static void ScriptCmd_panse_1C(void);
-static void sub_80774FC(u8);
-static void ScriptCmd_panse_1D(void);
-static void sub_80775CC(u8);
-static void ScriptCmd_createtask_1F(void);
+static void ScriptCmd_loopsewithpan(void);
+static void Task_LoopAndPlaySE(u8);
+static void ScriptCmd_waitplaysewithpan(void);
+static void Task_WaitAndPlaySE(u8);
+static void ScriptCmd_createsoundtask(void);
 static void ScriptCmd_waitsound(void);
-static void ScriptCmd_jumpvareq(void);
-static void ScriptCmd_jumpunkcond(void);
+static void ScriptCmd_jumpargeq(void);
+static void ScriptCmd_jumpifcontest(void);
 static void ScriptCmd_monbgprio_28(void);
 static void ScriptCmd_monbgprio_29(void);
 static void ScriptCmd_monbgprio_2A(void);
@@ -125,10 +128,10 @@ static void ScriptCmd_doublebattle_2E(void);
 static void ScriptCmd_stopsound(void);
 
 static void (*const sScriptCmdTable[])(void) = {
-    ScriptCmd_loadsprite,
-    ScriptCmd_unloadsprite,
-    ScriptCmd_sprite,
-    ScriptCmd_createtask,
+    ScriptCmd_loadspritegfx,
+    ScriptCmd_unloadspritegfx,
+    ScriptCmd_createsprite,
+    ScriptCmd_createvisualtask,
     ScriptCmd_delay,
     ScriptCmd_waitforvisualfinish,
     ScriptCmd_hang1,
@@ -141,28 +144,28 @@ static void (*const sScriptCmdTable[])(void) = {
     ScriptCmd_blendoff,
     ScriptCmd_call,
     ScriptCmd_return,
-    ScriptCmd_setvar,
-    ScriptCmd_ifelse,
-    ScriptCmd_jumpif,
+    ScriptCmd_setarg,
+    ScriptCmd_choosetwoturnanim,
+    ScriptCmd_jumpifmoveturn,
     ScriptCmd_jump,
     ScriptCmd_fadetobg,
     ScriptCmd_restorebg,
     ScriptCmd_waitbgfadeout,
     ScriptCmd_waitbgfadein,
     ScriptCmd_changebg,
-    ScriptCmd_panse_19,
+    ScriptCmd_playsewithpan,
     ScriptCmd_setpan,
     ScriptCmd_panse_1B,
-    ScriptCmd_panse_1C,
-    ScriptCmd_panse_1D,
+    ScriptCmd_loopsewithpan,
+    ScriptCmd_waitplaysewithpan,
     ScriptCmd_setbldcnt,
-    ScriptCmd_createtask_1F,
+    ScriptCmd_createsoundtask,
     ScriptCmd_waitsound,
-    ScriptCmd_jumpvareq,
+    ScriptCmd_jumpargeq,
     ScriptCmd_monbg_22,
     ScriptCmd_clearmonbg_23,
-    ScriptCmd_jumpunkcond,
-    ScriptCmd_fadetobg_25,
+    ScriptCmd_jumpifcontest,
+    ScriptCmd_fadetobgfromset,
     ScriptCmd_panse_26,
     ScriptCmd_panse_27,
     ScriptCmd_monbgprio_28,
@@ -175,7 +178,7 @@ static void (*const sScriptCmdTable[])(void) = {
     ScriptCmd_stopsound,
 };
 
-void battle_anim_clear_some_data(void)
+void ClearBattleAnimationVars(void)
 {
     s32 i;
 
@@ -184,76 +187,76 @@ void battle_anim_clear_some_data(void)
     gAnimVisualTaskCount = 0;
     gAnimSoundTaskCount = 0;
     gDisableStructMoveAnim = 0;
-    gMoveDmgMoveAnim = 0;
-    gMovePowerMoveAnim = 0;
-    gHappinessMoveAnim = 0;
+    gAnimMoveDmg = 0;
+    gAnimMovePower = 0;
+    gAnimFriendship = 0;
 
     // clear index array.
-    for (i = 0; i < 8; i++)
+    for (i = 0; i < ANIM_SPRITE_INDEX_COUNT; i++)
         gAnimSpriteIndexArray[i] |= 0xFFFF;
 
     // clear anim args.
-    for (i = 0; i < 8; i++)
+    for (i = 0; i < ANIM_ARGS_COUNT; i++)
         gBattleAnimArgs[i] = 0;
 
     gMonAnimTaskIdArray[0] = 0xFF;
     gMonAnimTaskIdArray[1] = 0xFF;
-    gUnknown_0202F7C4 = 0;
-    gUnknown_0202F7C5 = 0;
-    gAnimMoveIndex = 0;
-    gBattleAnimBankAttacker = 0;
-    gBattleAnimBankTarget = 0;
+    gAnimMoveTurn = 0;
+    sAnimBackgroundFadeState = 0;
+    sAnimMoveIndex = 0;
+    gAnimBankAttacker = 0;
+    gAnimBankTarget = 0;
     gUnknown_0202F7D2 = 0;
 }
 
-void ExecuteMoveAnim(u16 move)
+void DoMoveAnim(u16 move)
 {
-    gBattleAnimBankAttacker = gBankAttacker;
-    gBattleAnimBankTarget = gBankTarget;
-    DoMoveAnim(gBattleAnims_Moves, move, 1);
+    gAnimBankAttacker = gBankAttacker;
+    gAnimBankTarget = gBankTarget;
+    LaunchBattleAnimation(gBattleAnims_Moves, move, TRUE);
 }
 
-void DoMoveAnim(const u8 *const moveAnims[], u16 move, u8 c)
+void LaunchBattleAnimation(const u8 *const moveAnims[], u16 move, u8 isMoveAnim)
 {
     s32 i;
 
-    if (NotInBattle() == 0)
+    if (!IsContest())
     {
         sub_8079E24();
-        sub_8043EB4(0);
+        UpdateOamPriorityInAllHealthboxes(0);
         for (i = 0; i < 4; i++)
         {
             if (GetBankSide(i) != 0)
-                gUnknown_0202F7CA[i] = GetMonData(&gEnemyParty[gBattlePartyID[i]], MON_DATA_SPECIES);
+                gAnimSpeciesByBanks[i] = GetMonData(&gEnemyParty[gBattlePartyID[i]], MON_DATA_SPECIES);
             else
-                gUnknown_0202F7CA[i] = GetMonData(&gPlayerParty[gBattlePartyID[i]], MON_DATA_SPECIES);
+                gAnimSpeciesByBanks[i] = GetMonData(&gPlayerParty[gBattlePartyID[i]], MON_DATA_SPECIES);
         }
     }
     else
     {
         for (i = 0; i < 4; i++)
-            gUnknown_0202F7CA[i] = EWRAM_19348;
+            gAnimSpeciesByBanks[i] = EWRAM_19348;
     }
 
-    if (c == 0)
-        gAnimMoveIndex = 0;
+    if (isMoveAnim == 0)
+        sAnimMoveIndex = 0;
     else
-        gAnimMoveIndex = move;
+        sAnimMoveIndex = move;
 
-    for (i = 0; i < 8; i++)
+    for (i = 0; i < ANIM_ARGS_COUNT; i++)
         gBattleAnimArgs[i] = 0;
 
     gMonAnimTaskIdArray[0] = 0xFF;
     gMonAnimTaskIdArray[1] = 0xFF;
-    gBattleAnimScriptPtr = moveAnims[move];
+    sBattleAnimScriptPtr = moveAnims[move];
     gAnimScriptActive = TRUE;
     gAnimFramesToWait = 0;
     gAnimScriptCallback = RunAnimScriptCommand;
 
-    for (i = 0; i < 8; i++)
+    for (i = 0; i < ANIM_SPRITE_INDEX_COUNT; i++)
         gAnimSpriteIndexArray[i] |= 0xFFFF;
 
-    if (c != 0)
+    if (isMoveAnim)
     {
         for (i = 0; gUnknown_081C7160[i] != 0xFFFF; i++)
         {
@@ -265,13 +268,13 @@ void DoMoveAnim(const u8 *const moveAnims[], u16 move, u8 c)
         }
     }
 
-    gUnknown_030042C4 = 0;
-    gUnknown_03004240 = 0;
-    gUnknown_03004200 = 0;
-    gUnknown_03004244 = 0;
+    gBattle_WIN0H = 0;
+    gBattle_WIN0V = 0;
+    gBattle_WIN1H = 0;
+    gBattle_WIN1V = 0;
 }
 
-void move_anim_8072740(struct Sprite *sprite)
+void DestroyAnimSprite(struct Sprite *sprite)
 {
     FreeSpriteOamMatrix(sprite);
     DestroySprite(sprite);
@@ -294,7 +297,7 @@ static void AddSpriteIndex(u16 index)
 {
     s32 i;
 
-    for (i = 0; i < 8; i++)
+    for (i = 0; i < ANIM_SPRITE_INDEX_COUNT; i++)
     {
         if (gAnimSpriteIndexArray[i] == 0xFFFF)
         {
@@ -308,7 +311,7 @@ static void ClearSpriteIndex(u16 index)
 {
     s32 i;
 
-    for (i = 0; i < 8; i++)
+    for (i = 0; i < ANIM_SPRITE_INDEX_COUNT; i++)
     {
         if (gAnimSpriteIndexArray[i] == index)
         {
@@ -335,222 +338,87 @@ static void RunAnimScriptCommand(void)
 {
     do
     {
-        sScriptCmdTable[T1_READ_8(gBattleAnimScriptPtr)]();
-    } while (gAnimFramesToWait == 0 && gAnimScriptActive != FALSE);
+        sScriptCmdTable[T1_READ_8(sBattleAnimScriptPtr)]();
+    } while (gAnimFramesToWait == 0 && gAnimScriptActive);
 }
 
-static void ScriptCmd_loadsprite(void)
+static void ScriptCmd_loadspritegfx(void)
 {
     u16 index;
 
-    gBattleAnimScriptPtr++;
-    index = T1_READ_16(gBattleAnimScriptPtr);
+    sBattleAnimScriptPtr++;
+    index = T1_READ_16(sBattleAnimScriptPtr);
     LoadCompressedObjectPic(&gBattleAnimPicTable[GET_TRUE_SPRITE_INDEX(index)]);
     LoadCompressedObjectPalette(&gBattleAnimPaletteTable[GET_TRUE_SPRITE_INDEX(index)]);
-    gBattleAnimScriptPtr += 2;
+    sBattleAnimScriptPtr += 2;
     AddSpriteIndex(GET_TRUE_SPRITE_INDEX(index));
     gAnimFramesToWait = 1;
     gAnimScriptCallback = WaitAnimFrameCount;
 }
 
-static void ScriptCmd_unloadsprite(void)
+static void ScriptCmd_unloadspritegfx(void)
 {
     u16 index;
 
-    gBattleAnimScriptPtr++;
-    index = T1_READ_16(gBattleAnimScriptPtr);
+    sBattleAnimScriptPtr++;
+    index = T1_READ_16(sBattleAnimScriptPtr);
     FreeSpriteTilesByTag(gBattleAnimPicTable[GET_TRUE_SPRITE_INDEX(index)].tag);
     FreeSpritePaletteByTag(gBattleAnimPicTable[GET_TRUE_SPRITE_INDEX(index)].tag);
-    gBattleAnimScriptPtr += 2;
+    sBattleAnimScriptPtr += 2;
     ClearSpriteIndex(GET_TRUE_SPRITE_INDEX(index));
 }
 
-#ifdef NONMATCHING
-static void ScriptCmd_sprite(void)
+static void ScriptCmd_createsprite(void)
 {
     s32 i;
-    struct SpriteTemplate *r7;
-    u8 r4;
-    u8 r0;
-    u8 _r0;
-    u16 r6;
-    u8 r2;
-    s8 r1;
-
-    gBattleAnimScriptPtr++;
-    r7 = (struct SpriteTemplate *)(T2_READ_32(gBattleAnimScriptPtr));
-    gBattleAnimScriptPtr += 4;
-    r4 = T1_READ_8(gBattleAnimScriptPtr);
-    gBattleAnimScriptPtr++;
-    r0 = T1_READ_8(gBattleAnimScriptPtr);
-    gBattleAnimScriptPtr++;
-    for (i = 0; i < r0; i++)
+    const struct SpriteTemplate *template;
+    u8 argVar;
+    u8 argsCount;
+    s16 subpriority;
+
+    sBattleAnimScriptPtr++;
+    template = (const struct SpriteTemplate *)(T2_READ_32(sBattleAnimScriptPtr));
+    sBattleAnimScriptPtr += 4;
+
+    argVar = T1_READ_8(sBattleAnimScriptPtr);
+    sBattleAnimScriptPtr++;
+
+    argsCount = T1_READ_8(sBattleAnimScriptPtr);
+    sBattleAnimScriptPtr++;
+    for (i = 0; i < argsCount; i++)
     {
-        gBattleAnimArgs[i] = T1_READ_16(gBattleAnimScriptPtr);
-        gBattleAnimScriptPtr += 2;
+        gBattleAnimArgs[i] = T1_READ_16(sBattleAnimScriptPtr);
+        sBattleAnimScriptPtr += 2;
     }
-    if (r4 & 0x80)
+
+    if (argVar & 0x80)
     {
-        r4 ^= 0x80;
-        if (r4 > 0x3F)
-            r4 -= 0x40;
+        argVar ^= 0x80;
+        if (argVar >= 0x40)
+            argVar -= 0x40;
         else
-            r4 = -r4;
-        _r0 = sub_8079E90(gBattleAnimBankTarget);
-        r1 = r4;
+            argVar *= -1;
 
+        subpriority = sub_8079E90(gAnimBankTarget) + (s8)(argVar);
     }
     else
     {
-        //_08075B44
-        if (r4 > 0x3F)
-            r4 -= 0x40;
+        if (argVar >= 0x40)
+            argVar -= 0x40;
         else
-            r4 = -r4;
-        _r0 = sub_8079E90(gBattleAnimBankAttacker);
-        r1 = r4;
+            argVar *= -1;
+
+        subpriority = sub_8079E90(gAnimBankAttacker) + (s8)(argVar);
     }
-    r6 = _r0 + r1;
-    if ((s16)r6 < 3)
-        r6 = 3;
 
-    r4 = sub_8077ABC(gBattleAnimBankTarget, 2);
-    r2 = sub_8077ABC(gBattleAnimBankTarget, 3);
-    CreateSpriteAndAnimate(r7, r4, r2, r6);
+    if (subpriority < 3)
+        subpriority = 3;
+
+    CreateSpriteAndAnimate(template, GetBankPosition(gAnimBankTarget, 2), GetBankPosition(gAnimBankTarget, 3), subpriority);
     gAnimVisualTaskCount++;
 }
-#else
-__attribute__((naked))
-static void ScriptCmd_sprite(void)
-{
-    asm(".syntax unified\n\
-    push {r4-r7,lr}\n\
-    ldr r5, _08075B2C @ =gBattleAnimScriptPtr\n\
-    ldr r1, [r5]\n\
-    adds r3, r1, 0x1\n\
-    str r3, [r5]\n\
-    ldrb r2, [r1, 0x1]\n\
-    ldrb r0, [r3, 0x1]\n\
-    lsls r0, 8\n\
-    adds r2, r0\n\
-    ldrb r0, [r3, 0x2]\n\
-    lsls r0, 16\n\
-    adds r2, r0\n\
-    ldrb r0, [r3, 0x3]\n\
-    lsls r0, 24\n\
-    adds r7, r2, r0\n\
-    adds r0, r1, 0x5\n\
-    str r0, [r5]\n\
-    ldrb r4, [r1, 0x5]\n\
-    adds r0, r1, 0x6\n\
-    str r0, [r5]\n\
-    ldrb r0, [r1, 0x6]\n\
-    adds r1, 0x7\n\
-    str r1, [r5]\n\
-    cmp r0, 0\n\
-    beq _08075B14\n\
-    adds r6, r5, 0\n\
-    ldr r5, _08075B30 @ =gBattleAnimArgs\n\
-    adds r3, r0, 0\n\
-_08075AFC:\n\
-    ldr r2, [r6]\n\
-    ldrb r1, [r2]\n\
-    ldrb r0, [r2, 0x1]\n\
-    lsls r0, 8\n\
-    orrs r1, r0\n\
-    strh r1, [r5]\n\
-    adds r2, 0x2\n\
-    str r2, [r6]\n\
-    adds r5, 0x2\n\
-    subs r3, 0x1\n\
-    cmp r3, 0\n\
-    bne _08075AFC\n\
-_08075B14:\n\
-    movs r0, 0x80\n\
-    ands r0, r4\n\
-    cmp r0, 0\n\
-    beq _08075B44\n\
-    movs r0, 0x80\n\
-    eors r4, r0\n\
-    cmp r4, 0x3F\n\
-    bls _08075B34\n\
-    adds r0, r4, 0\n\
-    subs r0, 0x40\n\
-    b _08075B36\n\
-    .align 2, 0\n\
-_08075B2C: .4byte gBattleAnimScriptPtr\n\
-_08075B30: .4byte gBattleAnimArgs\n\
-_08075B34:\n\
-    negs r0, r4\n\
-_08075B36:\n\
-    lsls r0, 24\n\
-    lsrs r4, r0, 24\n\
-    ldr r0, _08075B40 @ =gBattleAnimBankTarget\n\
-    b _08075B56\n\
-    .align 2, 0\n\
-_08075B40: .4byte gBattleAnimBankTarget\n\
-_08075B44:\n\
-    cmp r4, 0x3F\n\
-    bls _08075B4E\n\
-    adds r0, r4, 0\n\
-    subs r0, 0x40\n\
-    b _08075B50\n\
-_08075B4E:\n\
-    negs r0, r4\n\
-_08075B50:\n\
-    lsls r0, 24\n\
-    lsrs r4, r0, 24\n\
-    ldr r0, _08075BAC @ =gBattleAnimBankAttacker\n\
-_08075B56:\n\
-    ldrb r0, [r0]\n\
-    bl sub_8079E90\n\
-    lsls r0, 24\n\
-    lsrs r0, 24\n\
-    lsls r1, r4, 24\n\
-    asrs r1, 24\n\
-    adds r0, r1\n\
-    lsls r0, 16\n\
-    lsrs r6, r0, 16\n\
-    lsls r0, r6, 16\n\
-    asrs r0, 16\n\
-    cmp r0, 0x2\n\
-    bgt _08075B74\n\
-    movs r6, 0x3\n\
-_08075B74:\n\
-    ldr r5, _08075BB0 @ =gBattleAnimBankTarget\n\
-    ldrb r0, [r5]\n\
-    movs r1, 0x2\n\
-    bl sub_8077ABC\n\
-    adds r4, r0, 0\n\
-    lsls r4, 24\n\
-    lsrs r4, 24\n\
-    ldrb r0, [r5]\n\
-    movs r1, 0x3\n\
-    bl sub_8077ABC\n\
-    adds r2, r0, 0\n\
-    lsls r2, 24\n\
-    lsrs r2, 24\n\
-    lsls r3, r6, 24\n\
-    lsrs r3, 24\n\
-    adds r0, r7, 0\n\
-    adds r1, r4, 0\n\
-    bl CreateSpriteAndAnimate\n\
-    ldr r1, _08075BB4 @ =gAnimVisualTaskCount\n\
-    ldrb r0, [r1]\n\
-    adds r0, 0x1\n\
-    strb r0, [r1]\n\
-    pop {r4-r7}\n\
-    pop {r0}\n\
-    bx r0\n\
-    .align 2, 0\n\
-_08075BAC: .4byte gBattleAnimBankAttacker\n\
-_08075BB0: .4byte gBattleAnimBankTarget\n\
-_08075BB4: .4byte gAnimVisualTaskCount\n\
-    .syntax divided\n");
-}
-#endif
 
-static void ScriptCmd_createtask(void)
+static void ScriptCmd_createvisualtask(void)
 {
     TaskFunc taskFunc;
     u8 taskPriority;
@@ -558,18 +426,21 @@ static void ScriptCmd_createtask(void)
     u8 numArgs;
     s32 i;
 
-    gBattleAnimScriptPtr++;
-    taskFunc = (TaskFunc)T2_READ_32(gBattleAnimScriptPtr);
-    gBattleAnimScriptPtr += 4;
-    taskPriority = T1_READ_8(gBattleAnimScriptPtr);
-    gBattleAnimScriptPtr++;
-    numArgs = T1_READ_8(gBattleAnimScriptPtr);
-    gBattleAnimScriptPtr++;
+    sBattleAnimScriptPtr++;
+
+    taskFunc = (TaskFunc)T2_READ_32(sBattleAnimScriptPtr);
+    sBattleAnimScriptPtr += 4;
+
+    taskPriority = T1_READ_8(sBattleAnimScriptPtr);
+    sBattleAnimScriptPtr++;
+
+    numArgs = T1_READ_8(sBattleAnimScriptPtr);
+    sBattleAnimScriptPtr++;
 
     for (i = 0; i < numArgs; i++)
     {
-        gBattleAnimArgs[i] = T1_READ_16(gBattleAnimScriptPtr);
-        gBattleAnimScriptPtr += 2;
+        gBattleAnimArgs[i] = T1_READ_16(sBattleAnimScriptPtr);
+        sBattleAnimScriptPtr += 2;
     }
 
     taskId = CreateTask(taskFunc, taskPriority);
@@ -579,11 +450,11 @@ static void ScriptCmd_createtask(void)
 
 static void ScriptCmd_delay(void)
 {
-    gBattleAnimScriptPtr++;
-    gAnimFramesToWait = T1_READ_8(gBattleAnimScriptPtr);
+    sBattleAnimScriptPtr++;
+    gAnimFramesToWait = T1_READ_8(sBattleAnimScriptPtr);
     if (gAnimFramesToWait == 0)
         gAnimFramesToWait = -1;
-    gBattleAnimScriptPtr++;
+    sBattleAnimScriptPtr++;
     gAnimScriptCallback = WaitAnimFrameCount;
 }
 
@@ -592,7 +463,7 @@ static void ScriptCmd_waitforvisualfinish(void)
 {
     if (gAnimVisualTaskCount == 0)
     {
-        gBattleAnimScriptPtr++;
+        sBattleAnimScriptPtr++;
         gAnimFramesToWait = 0;
     }
     else
@@ -641,7 +512,7 @@ static void ScriptCmd_end(void)
     // the SE has halted, so set the SE Frame Counter to 0 and continue.
     gSoundAnimFramesToWait = 0;
 
-    for (i = 0; i < 8; i++)
+    for (i = 0; i < ANIM_SPRITE_INDEX_COUNT; i++)
     {
         if (gAnimSpriteIndexArray[i] != 0xFFFF)
         {
@@ -651,13 +522,13 @@ static void ScriptCmd_end(void)
         }
     }
 
-    if (continuousAnim == FALSE) // may have been used for debug?
+    if (!continuousAnim) // may have been used for debug?
     {
         m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 256);
-        if (NotInBattle() == 0)
+        if (IsContest() == 0)
         {
             sub_8079E24();
-            sub_8043EB4(1);
+            UpdateOamPriorityInAllHealthboxes(1);
         }
         gAnimScriptActive = FALSE;
     }
@@ -665,178 +536,114 @@ static void ScriptCmd_end(void)
 
 static void ScriptCmd_playse(void)
 {
-    gBattleAnimScriptPtr++;
-    PlaySE(T1_READ_16(gBattleAnimScriptPtr));
-    gBattleAnimScriptPtr += 2;
+    sBattleAnimScriptPtr++;
+    PlaySE(T1_READ_16(sBattleAnimScriptPtr));
+    sBattleAnimScriptPtr += 2;
 }
 
 static void ScriptCmd_monbg(void)
 {
-    u8 r6;
-    u8 r5;
-    u8 r0;
-    u8 r7;
+    u8 animBank;
+    u8 bank;
+    u8 identity;
+    bool8 toBG_2;
     u16 r4;
     u8 taskId;
 
-    gBattleAnimScriptPtr++;
-    r6 = T1_READ_8(gBattleAnimScriptPtr);
-    if (r6 == 0)
-        r6 = 2;
-    else if (r6 == 1)
-        r6 = 3;
-    if (r6 == 0 || r6 == 2)
-        r5 = gBattleAnimBankAttacker;
+    sBattleAnimScriptPtr++;
+    animBank = T1_READ_8(sBattleAnimScriptPtr);
+    if (animBank == ANIM_BANK_ATTACKER)
+        animBank = ANIM_BANK_ATK_PARTNER;
+    else if (animBank == ANIM_BANK_TARGET)
+        animBank = ANIM_BANK_DEF_PARTNER;
+
+    if (animBank == ANIM_BANK_ATTACKER || animBank == ANIM_BANK_ATK_PARTNER)
+        bank = gAnimBankAttacker;
     else
-        r5 = gBattleAnimBankTarget;
-    if (IsAnimBankSpriteVisible(r5))
+        bank = gAnimBankTarget;
+
+    if (IsAnimBankSpriteVisible(bank))
     {
-        r0 = GetBankIdentity(r5);
-        r0 += 0xFF;
-        if (r0 <= 1 || NotInBattle() != 0)
-            r7 = 0;
+        identity = GetBankIdentity(bank);
+        identity += 0xFF;
+        if (identity <= 1 || IsContest() != 0)
+            toBG_2 = 0;
         else
-            r7 = 1;
-        sub_8076034(r5, r7);
-        r4 = gObjectBankIDs[r5];
+            toBG_2 = 1;
+
+        sub_8076034(bank, toBG_2);
+        r4 = gObjectBankIDs[bank];
         taskId = CreateTask(task_pA_ma0A_obj_to_bg_pal, 10);
         gTasks[taskId].data[0] = r4;
         gTasks[taskId].data[1] = gSprites[r4].pos1.x + gSprites[r4].pos2.x;
         gTasks[taskId].data[2] = gSprites[r4].pos1.y + gSprites[r4].pos2.y;
-        if (r7 == 0)
+        if (toBG_2 == 0)
         {
-            gTasks[taskId].data[3] = gUnknown_030042C0;
-            gTasks[taskId].data[4] = gUnknown_030041B4;
+            gTasks[taskId].data[3] = gBattle_BG1_X;
+            gTasks[taskId].data[4] = gBattle_BG1_Y;
         }
         else
         {
-            gTasks[taskId].data[3] = gUnknown_03004288;
-            gTasks[taskId].data[4] = gUnknown_03004280;
+            gTasks[taskId].data[3] = gBattle_BG2_X;
+            gTasks[taskId].data[4] = gBattle_BG2_Y;
         }
-        gTasks[taskId].data[5] = r7;
-        gTasks[taskId].data[6] = r5;
+        gTasks[taskId].data[5] = toBG_2;
+        gTasks[taskId].data[6] = bank;
         gMonAnimTaskIdArray[0] = taskId;
 
     }
-    r5 ^= 2;
-    if (r6 > 1 && IsAnimBankSpriteVisible(r5))
+    bank ^= 2;
+    if (animBank > 1 && IsAnimBankSpriteVisible(bank))
     {
-        r0 = GetBankIdentity(r5);
-        r0 += 0xFF;
-        if (r0 <= 1 || NotInBattle() != 0)
-            r7 = 0;
+        identity = GetBankIdentity(bank);
+        identity += 0xFF;
+        if (identity <= 1 || IsContest() != 0)
+            toBG_2 = 0;
         else
-            r7 = 1;
-        sub_8076034(r5, r7);
-        r4 = gObjectBankIDs[r5];
+            toBG_2 = 1;
+        sub_8076034(bank, toBG_2);
+        r4 = gObjectBankIDs[bank];
         taskId = CreateTask(task_pA_ma0A_obj_to_bg_pal, 10);
         gTasks[taskId].data[0] = r4;
         gTasks[taskId].data[1] = gSprites[r4].pos1.x + gSprites[r4].pos2.x;
         gTasks[taskId].data[2] = gSprites[r4].pos1.y + gSprites[r4].pos2.y;
-        if (r7 == 0)
+        if (toBG_2 == 0)
         {
-            gTasks[taskId].data[3] = gUnknown_030042C0;
-            gTasks[taskId].data[4] = gUnknown_030041B4;
+            gTasks[taskId].data[3] = gBattle_BG1_X;
+            gTasks[taskId].data[4] = gBattle_BG1_Y;
         }
         else
         {
-            gTasks[taskId].data[3] = gUnknown_03004288;
-            gTasks[taskId].data[4] = gUnknown_03004280;
+            gTasks[taskId].data[3] = gBattle_BG2_X;
+            gTasks[taskId].data[4] = gBattle_BG2_Y;
         }
-        gTasks[taskId].data[5] = r7;
-        gTasks[taskId].data[6] = r5;
+
+        gTasks[taskId].data[5] = toBG_2;
+        gTasks[taskId].data[6] = bank;
         gMonAnimTaskIdArray[1] = taskId;
     }
-    gBattleAnimScriptPtr++;
+
+    sBattleAnimScriptPtr++;
 }
 
-#ifdef NONMATCHING
-bool8 IsAnimBankSpriteVisible(u8 a)
+bool8 IsAnimBankSpriteVisible(u8 bank)
 {
-    if (NotInBattle())
+    if (IsContest())
     {
-        if (a == gBattleAnimBankAttacker)
+        if (bank == gAnimBankAttacker)
             return TRUE;
         else
             return FALSE;
     }
-    if (!AnimBankSpriteExists(a))
+    if (!IsBankSpritePresent(bank))
         return FALSE;
-    if (NotInBattle())
+    if (IsContest())
         return TRUE; // this line wont ever be reached.
-    if (!(EWRAM_17800[a].unk0 & 1))
+    if (!(EWRAM_17800[bank].unk0 & 1) || !gSprites[gObjectBankIDs[bank]].invisible)
         return TRUE;
-    if (gSprites[gObjectBankIDs[a]].invisible)
-        return FALSE;
-    return TRUE;
-}
-#else
-__attribute__((naked))
-bool8 IsAnimBankSpriteVisible(u8 a)
-{
-    asm(".syntax unified\n\
-    push {r4,r5,lr}\n\
-    lsls r0, 24\n\
-    lsrs r4, r0, 24\n\
-    adds r5, r4, 0\n\
-    bl NotInBattle\n\
-    lsls r0, 24\n\
-    cmp r0, 0\n\
-    beq _08075FDC\n\
-    ldr r0, _08075FD8 @ =gBattleAnimBankAttacker\n\
-    ldrb r0, [r0]\n\
-    cmp r4, r0\n\
-    beq _0807601C\n\
-    b _0807602C\n\
-    .align 2, 0\n\
-_08075FD8: .4byte gBattleAnimBankAttacker\n\
-_08075FDC:\n\
-    adds r0, r4, 0\n\
-    bl AnimBankSpriteExists\n\
-    lsls r0, 24\n\
-    cmp r0, 0\n\
-    beq _0807602C\n\
-    bl NotInBattle\n\
-    lsls r0, 24\n\
-    cmp r0, 0\n\
-    bne _0807601C\n\
-    lsls r0, r5, 2\n\
-    ldr r1, _08076020 @ =gSharedMem + 0x17800\n\
-    adds r0, r1\n\
-    ldrb r1, [r0]\n\
-    movs r0, 0x1\n\
-    ands r0, r1\n\
-    cmp r0, 0\n\
-    beq _0807601C\n\
-    ldr r2, _08076024 @ =gSprites\n\
-    ldr r0, _08076028 @ =gObjectBankIDs\n\
-    adds r0, r5, r0\n\
-    ldrb r1, [r0]\n\
-    lsls r0, r1, 4\n\
-    adds r0, r1\n\
-    lsls r0, 2\n\
-    adds r0, r2\n\
-    adds r0, 0x3E\n\
-    ldrb r0, [r0]\n\
-    lsls r0, 29\n\
-    cmp r0, 0\n\
-    blt _0807602C\n\
-_0807601C:\n\
-    movs r0, 0x1\n\
-    b _0807602E\n\
-    .align 2, 0\n\
-_08076020: .4byte gSharedMem + 0x17800\n\
-_08076024: .4byte gSprites\n\
-_08076028: .4byte gObjectBankIDs\n\
-_0807602C:\n\
-    movs r0, 0\n\
-_0807602E:\n\
-    pop {r4,r5}\n\
-    pop {r1}\n\
-    bx r1\n\
-    .syntax divided\n");
+
+    return FALSE;
 }
-#endif
 
 void sub_8076034(u8 a, u8 b)
 {
@@ -876,25 +683,25 @@ void sub_8076034(u8 a, u8 b)
         REG_BG1CNT_BITFIELD.areaOverflowMode = 0;
 
         spriteId = gObjectBankIDs[a];
-        gUnknown_030042C0 = -(gSprites[spriteId].pos1.x + gSprites[spriteId].pos2.x) + 32;
-        if (NotInBattle() != 0 && sub_80AEB1C(EWRAM_19348) != 0)
-            gUnknown_030042C0--;
-        gUnknown_030041B4 = -(gSprites[spriteId].pos1.y + gSprites[spriteId].pos2.y) + 32;
+        gBattle_BG1_X = -(gSprites[spriteId].pos1.x + gSprites[spriteId].pos2.x) + 32;
+        if (IsContest() != 0 && IsSpeciesNotUnown(EWRAM_19348) != 0)
+            gBattle_BG1_X--;
+        gBattle_BG1_Y = -(gSprites[spriteId].pos1.y + gSprites[spriteId].pos2.y) + 32;
         gSprites[gObjectBankIDs[a]].invisible = TRUE;
 
-        REG_BG1HOFS = gUnknown_030042C0;
-        REG_BG1VOFS = gUnknown_030041B4;
+        REG_BG1HOFS = gBattle_BG1_X;
+        REG_BG1VOFS = gBattle_BG1_Y;
 
         LoadPalette(gPlttBufferUnfaded + 0x100 + a * 16, s.unk8 * 16, 32);
         addr3 = (u16 *)PLTT + s.unk8 * 16;
         DmaCopy32(3, gPlttBufferUnfaded + 0x100 + a * 16, addr3, 32);
 
-        if (NotInBattle() != 0)
+        if (IsContest() != 0)
             r2 = 0;
         else
             r2 = GetBankIdentity(a);
         sub_80E4EF8(0, 0, r2, s.unk8, (u32)s.unk0, (((s32)s.unk4 - VRAM) / 2048), REG_BG1CNT_BITFIELD.charBaseBlock);
-        if (NotInBattle() != 0)
+        if (IsContest() != 0)
             sub_8076380();
     }
     else
@@ -926,12 +733,12 @@ void sub_8076034(u8 a, u8 b)
         REG_BG2CNT_BITFIELD.areaOverflowMode = 0;
 
         spriteId = gObjectBankIDs[a];
-        gUnknown_03004288 = -(gSprites[spriteId].pos1.x + gSprites[spriteId].pos2.x) + 32;
-        gUnknown_03004280 = -(gSprites[spriteId].pos1.y + gSprites[spriteId].pos2.y) + 32;
+        gBattle_BG2_X = -(gSprites[spriteId].pos1.x + gSprites[spriteId].pos2.x) + 32;
+        gBattle_BG2_Y = -(gSprites[spriteId].pos1.y + gSprites[spriteId].pos2.y) + 32;
         gSprites[gObjectBankIDs[a]].invisible = TRUE;
 
-        REG_BG2HOFS = gUnknown_03004288;
-        REG_BG2VOFS = gUnknown_03004280;
+        REG_BG2HOFS = gBattle_BG2_X;
+        REG_BG2VOFS = gBattle_BG2_Y;
 
         LoadPalette(gPlttBufferUnfaded + 0x100 + a * 16, 0x90, 32);
         addr3 = (void *)(PLTT + 0x120);
@@ -948,7 +755,7 @@ static void sub_8076380(void)
     struct UnknownStruct2 s;
     u16 *ptr;
 
-    if (sub_80AEB1C(EWRAM_19348) != 0)
+    if (IsSpeciesNotUnown(EWRAM_19348))
     {
         sub_8078914(&s);
         ptr = s.unk4;
@@ -996,7 +803,7 @@ void sub_8076464(u8 a)
     struct UnknownStruct2 s;
 
     sub_8078914(&s);
-    if (a == 0 || NotInBattle() != 0)
+    if (a == 0 || IsContest() != 0)
     {
         u16 *addr2;
 
@@ -1017,8 +824,8 @@ void sub_8076464(u8 a)
         pointlessZero = 0;
         addr2 = s.unk4;
         DmaFill32(3, 0, addr2, 0x800);
-        gUnknown_030042C0 = 0;
-        gUnknown_030041B4 = 0;
+        gBattle_BG1_X = 0;
+        gBattle_BG1_Y = 0;
     }
     else
     {
@@ -1041,32 +848,31 @@ void sub_8076464(u8 a)
         pointlessZero = 0;
         addr2 = (void *)(VRAM + 0xF000);
         DmaFill32(3, 0, addr2, 0x800);
-        gUnknown_03004288 = 0;
-        gUnknown_03004280 = 0;
+        gBattle_BG2_X = 0;
+        gBattle_BG2_Y = 0;
     }
 }
 
 static void task_pA_ma0A_obj_to_bg_pal(u8 taskId)
 {
-    u8 r4;
-    u8 r6;
-    s16 r3;
-    s16 r2;
+    u8 spriteId, palIndex;
+    s16 x, y;
     struct UnknownStruct2 s;
 
-    r4 = gTasks[taskId].data[0];
-    r6 = gTasks[taskId].data[6];
+    spriteId = gTasks[taskId].data[0];
+    palIndex = gTasks[taskId].data[6];
     sub_8078914(&s);
-    r3 = gTasks[taskId].data[1] - (gSprites[r4].pos1.x + gSprites[r4].pos2.x);
-    r2 = gTasks[taskId].data[2] - (gSprites[r4].pos1.y + gSprites[r4].pos2.y);
+    x = gTasks[taskId].data[1] - (gSprites[spriteId].pos1.x + gSprites[spriteId].pos2.x);
+    y = gTasks[taskId].data[2] - (gSprites[spriteId].pos1.y + gSprites[spriteId].pos2.y);
+
     if (gTasks[taskId].data[5] == 0)
     {
         u16 *src;
         u16 *dst;
 
-        gUnknown_030042C0 = r3 + gTasks[taskId].data[3];
-        gUnknown_030041B4 = r2 + gTasks[taskId].data[4];
-        src = gPlttBufferFaded + 0x100 + r6 * 16;
+        gBattle_BG1_X = x + gTasks[taskId].data[3];
+        gBattle_BG1_Y = y + gTasks[taskId].data[4];
+        src = gPlttBufferFaded + 0x100 + palIndex * 16;
         dst = gPlttBufferFaded + 0x100 + s.unk8 * 16 - 256;
         DmaCopy32(3, src, dst, 32);
     }
@@ -1075,9 +881,9 @@ static void task_pA_ma0A_obj_to_bg_pal(u8 taskId)
         u16 *src;
         u16 *dst;
 
-        gUnknown_03004288 = r3 + gTasks[taskId].data[3];
-        gUnknown_03004280 = r2 + gTasks[taskId].data[4];
-        src = gPlttBufferFaded + 0x100 + r6 * 16;
+        gBattle_BG2_X = x + gTasks[taskId].data[3];
+        gBattle_BG2_Y = y + gTasks[taskId].data[4];
+        src = gPlttBufferFaded + 0x100 + palIndex * 16;
         dst = gPlttBufferFaded + 0x100 - 112;
         DmaCopy32(3, src, dst, 32);
     }
@@ -1085,55 +891,59 @@ static void task_pA_ma0A_obj_to_bg_pal(u8 taskId)
 
 static void ScriptCmd_clearmonbg(void)
 {
-    u8 r4;
-    u8 r5;
+    u8 animBankId;
+    u8 bank;
     u8 taskId;
 
-    gBattleAnimScriptPtr++;
-    r4 = T1_READ_8(gBattleAnimScriptPtr);
-    if (r4 == 0)
-        r4 = 2;
-    else if (r4 == 1)
-        r4 = 3;
-    if (r4 == 0 || r4 == 2)
-        r5 = gBattleAnimBankAttacker;
+    sBattleAnimScriptPtr++;
+    animBankId = T1_READ_8(sBattleAnimScriptPtr);
+
+    if (animBankId == ANIM_BANK_ATTACKER)
+        animBankId = ANIM_BANK_ATK_PARTNER;
+    else if (animBankId == ANIM_BANK_TARGET)
+        animBankId = ANIM_BANK_DEF_PARTNER;
+
+    if (animBankId == ANIM_BANK_ATTACKER || animBankId == ANIM_BANK_ATK_PARTNER)
+        bank = gAnimBankAttacker;
     else
-        r5 = gBattleAnimBankTarget;
+        bank = gAnimBankTarget;
+
     if (gMonAnimTaskIdArray[0] != 0xFF)
-        gSprites[gObjectBankIDs[r5]].invisible = FALSE;
-    if (r4 > 1 && gMonAnimTaskIdArray[1] != 0xFF)
-        gSprites[gObjectBankIDs[r5 ^ 2]].invisible = FALSE;
+        gSprites[gObjectBankIDs[bank]].invisible = FALSE;
+    if (animBankId > 1 && gMonAnimTaskIdArray[1] != 0xFF)
+        gSprites[gObjectBankIDs[bank ^ 2]].invisible = FALSE;
     else
-        r4 = 0;
+        animBankId = 0;
+
     taskId = CreateTask(sub_807672C, 5);
-    gTasks[taskId].data[0] = r4;
-    gTasks[taskId].data[2] = r5;
-    gBattleAnimScriptPtr++;
+    gTasks[taskId].data[0] = animBankId;
+    gTasks[taskId].data[2] = bank;
+    sBattleAnimScriptPtr++;
 }
 
 static void sub_807672C(u8 taskId)
 {
-    u8 var;
-    u8 r4;
+    u8 identity;
+    u8 to_BG2;
 
     gTasks[taskId].data[1]++;
     if (gTasks[taskId].data[1] != 1)
     {
-        var = GetBankIdentity(gTasks[taskId].data[2]);
-        var += 0xFF;
-        if (var <= 1 || NotInBattle() != 0)
-            r4 = 0;
+        identity = GetBankIdentity(gTasks[taskId].data[2]);
+        identity += 0xFF;
+        if (identity <= 1 || IsContest() != 0)
+            to_BG2 = 0;
         else
-            r4 = 1;
+            to_BG2 = 1;
         if (gMonAnimTaskIdArray[0] != 0xFF)
         {
-            sub_8076464(r4);
+            sub_8076464(to_BG2);
             DestroyTask(gMonAnimTaskIdArray[0]);
             gMonAnimTaskIdArray[0] = 0xFF;
         }
         if (gTasks[taskId].data[0] > 1)
         {
-            sub_8076464(r4 ^ 1);
+            sub_8076464(to_BG2 ^ 1);
             DestroyTask(gMonAnimTaskIdArray[1]);
             gMonAnimTaskIdArray[1] = 0xFF;
         }
@@ -1143,187 +953,195 @@ static void sub_807672C(u8 taskId)
 
 static void ScriptCmd_monbg_22(void)
 {
-    u8 r5;
-    u8 r4;
-    u8 r0;
+    u8 animBankId;
+    u8 bank;
+    u8 identity;
     u8 r1;
 
-    gBattleAnimScriptPtr++;
-    r5 = T1_READ_8(gBattleAnimScriptPtr);
-    if (r5 == 0)
-        r5 = 2;
-    else if (r5 == 1)
-        r5 = 3;
-    if (r5 == 0 || r5 == 2)
-        r4 = gBattleAnimBankAttacker;
+    sBattleAnimScriptPtr++;
+    animBankId = T1_READ_8(sBattleAnimScriptPtr);
+
+    if (animBankId == ANIM_BANK_ATTACKER)
+        animBankId = ANIM_BANK_ATK_PARTNER;
+    else if (animBankId == ANIM_BANK_TARGET)
+        animBankId = ANIM_BANK_DEF_PARTNER;
+
+    if (animBankId == ANIM_BANK_ATTACKER || animBankId == ANIM_BANK_ATK_PARTNER)
+        bank = gAnimBankAttacker;
     else
-        r4 = gBattleAnimBankTarget;
-    if (IsAnimBankSpriteVisible(r4))
+        bank = gAnimBankTarget;
+
+    if (IsAnimBankSpriteVisible(bank))
     {
-        r0 = GetBankIdentity(r4);
-        r0 += 0xFF;
-        if (r0 <= 1 || NotInBattle() != 0)
+        identity = GetBankIdentity(bank);
+        identity += 0xFF;
+        if (identity <= 1 || IsContest() != 0)
             r1 = 0;
         else
             r1 = 1;
-        sub_8076034(r4, r1);
-        gSprites[gObjectBankIDs[r4]].invisible = FALSE;
+        sub_8076034(bank, r1);
+        gSprites[gObjectBankIDs[bank]].invisible = FALSE;
     }
-    r4 ^= 2;
-    if (r5 > 1 && IsAnimBankSpriteVisible(r4))
+
+    bank ^= 2;
+    if (animBankId > ANIM_BANK_TARGET && IsAnimBankSpriteVisible(bank))
     {
-        r0 = GetBankIdentity(r4);
-        r0 += 0xFF;
-        if (r0 <= 1 || NotInBattle() != 0)
+        identity = GetBankIdentity(bank);
+        identity += 0xFF;
+        if (identity <= 1 || IsContest() != 0)
             r1 = 0;
         else
             r1 = 1;
-        sub_8076034(r4, r1);
-        gSprites[gObjectBankIDs[r4]].invisible = FALSE;
+        sub_8076034(bank, r1);
+        gSprites[gObjectBankIDs[bank]].invisible = FALSE;
     }
-    gBattleAnimScriptPtr++;
+    sBattleAnimScriptPtr++;
 }
 
 static void ScriptCmd_clearmonbg_23(void)
 {
-    u8 r5;
-    u8 r6;
+    u8 animBankId;
+    u8 bank;
     u8 taskId;
 
-    gBattleAnimScriptPtr++;
-    r5 = T1_READ_8(gBattleAnimScriptPtr);
-    if (r5 == 0)
-        r5 = 2;
-    else if (r5 == 1)
-        r5 = 3;
-    if (r5 == 0 || r5 == 2)
-        r6 = gBattleAnimBankAttacker;
+    sBattleAnimScriptPtr++;
+    animBankId = T1_READ_8(sBattleAnimScriptPtr);
+
+    if (animBankId == ANIM_BANK_ATTACKER)
+        animBankId = ANIM_BANK_ATK_PARTNER;
+    else if (animBankId == ANIM_BANK_TARGET)
+        animBankId = ANIM_BANK_DEF_PARTNER;
+
+    if (animBankId == ANIM_BANK_ATTACKER || animBankId == ANIM_BANK_ATK_PARTNER)
+        bank = gAnimBankAttacker;
     else
-        r6 = gBattleAnimBankTarget;
-    if (IsAnimBankSpriteVisible(r6))
-        gSprites[gObjectBankIDs[r6]].invisible = FALSE;
-    if (r5 > 1 && IsAnimBankSpriteVisible(r6 ^ 2))
-        gSprites[gObjectBankIDs[r6 ^ 2]].invisible = FALSE;
+        bank = gAnimBankTarget;
+
+    if (IsAnimBankSpriteVisible(bank))
+        gSprites[gObjectBankIDs[bank]].invisible = FALSE;
+    if (animBankId > 1 && IsAnimBankSpriteVisible(bank ^ 2))
+        gSprites[gObjectBankIDs[bank ^ 2]].invisible = FALSE;
     else
-        r5 = 0;
+        animBankId = 0;
+
     taskId = CreateTask(sub_80769A4, 5);
-    gTasks[taskId].data[0] = r5;
-    gTasks[taskId].data[2] = r6;
-    gBattleAnimScriptPtr++;
+    gTasks[taskId].data[0] = animBankId;
+    gTasks[taskId].data[2] = bank;
+
+    sBattleAnimScriptPtr++;
 }
 
 static void sub_80769A4(u8 taskId)
 {
-    u8 r0;
-    u8 r4;
-    u8 r5;
+    u8 identity;
+    u8 bank;
+    u8 toBG_2;
 
     gTasks[taskId].data[1]++;
     if (gTasks[taskId].data[1] != 1)
     {
-        r4 = gTasks[taskId].data[2];
-        r0 = GetBankIdentity(r4);
-        r0 += 0xFF;
-        if (r0 <= 1 || NotInBattle() != 0)
-            r5 = 0;
+        bank = gTasks[taskId].data[2];
+        identity = GetBankIdentity(bank);
+        identity += 0xFF;
+        if (identity <= 1 || IsContest() != 0)
+            toBG_2 = 0;
         else
-            r5 = 1;
-        if (IsAnimBankSpriteVisible(r4))
-            sub_8076464(r5);
-        if (gTasks[taskId].data[0] > 1 && IsAnimBankSpriteVisible(r4 ^ 2))
-            sub_8076464(r5 ^ 1);
+            toBG_2 = 1;
+        if (IsAnimBankSpriteVisible(bank))
+            sub_8076464(toBG_2);
+        if (gTasks[taskId].data[0] > 1 && IsAnimBankSpriteVisible(bank ^ 2))
+            sub_8076464(toBG_2 ^ 1);
         DestroyTask(taskId);
     }
 }
 
 static void ScriptCmd_setalpha(void)
 {
-    u16 r3;
-    u16 r1;
+    u16 half1, half2;
 
-    gBattleAnimScriptPtr++;
-    r3 = *(gBattleAnimScriptPtr++);
-    r1 = *(gBattleAnimScriptPtr++) << 8;
+    sBattleAnimScriptPtr++;
+    half1 = *(sBattleAnimScriptPtr++);
+    half2 = *(sBattleAnimScriptPtr++) << 8;
     REG_BLDCNT = 0x3F40;
-    REG_BLDALPHA = r3 | r1;
+    REG_BLDALPHA = half1 | half2;
 }
 
 static void ScriptCmd_setbldcnt(void)
 {
-    u16 r3;
-    u16 r1;
+    u16 half1, half2;
 
-    gBattleAnimScriptPtr++;
-    r3 = *(gBattleAnimScriptPtr++);
-    r1 = *(gBattleAnimScriptPtr++) << 8;
-    REG_BLDCNT = r3 | r1;
+    sBattleAnimScriptPtr++;
+    half1 = *(sBattleAnimScriptPtr++);
+    half2 = *(sBattleAnimScriptPtr++) << 8;
+    REG_BLDCNT = half1 | half2;
 }
 
 static void ScriptCmd_blendoff(void)
 {
-    gBattleAnimScriptPtr++;
+    sBattleAnimScriptPtr++;
     REG_BLDCNT = 0;
     REG_BLDALPHA = 0;
 }
 
 static void ScriptCmd_call(void)
 {
-    gBattleAnimScriptPtr++;
-    gBattleAnimScriptRetAddr = gBattleAnimScriptPtr + 4;
-    gBattleAnimScriptPtr = T2_READ_PTR(gBattleAnimScriptPtr);
+    sBattleAnimScriptPtr++;
+    gBattleAnimScriptRetAddr = sBattleAnimScriptPtr + 4;
+    sBattleAnimScriptPtr = T2_READ_PTR(sBattleAnimScriptPtr);
 }
 
 static void ScriptCmd_return(void)
 {
-    gBattleAnimScriptPtr = gBattleAnimScriptRetAddr;
+    sBattleAnimScriptPtr = gBattleAnimScriptRetAddr;
 }
 
-static void ScriptCmd_setvar(void)
+static void ScriptCmd_setarg(void)
 {
-    const u8 *addr = gBattleAnimScriptPtr;
-    u16 r4;
-    u8 r2;
+    const u8 *addr = sBattleAnimScriptPtr;
+    u16 value;
+    u8 argId;
 
-    gBattleAnimScriptPtr++;
-    r2 = T1_READ_8(gBattleAnimScriptPtr);
-    gBattleAnimScriptPtr++;
-    r4 = T1_READ_16(gBattleAnimScriptPtr);
-    gBattleAnimScriptPtr = addr + 4;
-    gBattleAnimArgs[r2] = r4;
+    sBattleAnimScriptPtr++;
+    argId = T1_READ_8(sBattleAnimScriptPtr);
+    sBattleAnimScriptPtr++;
+    value = T1_READ_16(sBattleAnimScriptPtr);
+    sBattleAnimScriptPtr = addr + 4;
+    gBattleAnimArgs[argId] = value;
 }
 
-static void ScriptCmd_ifelse(void)
+static void ScriptCmd_choosetwoturnanim(void)
 {
-    gBattleAnimScriptPtr++;
-    if (gUnknown_0202F7C4 & 1)
-        gBattleAnimScriptPtr += 4;
-    gBattleAnimScriptPtr = T2_READ_PTR(gBattleAnimScriptPtr);
+    sBattleAnimScriptPtr++;
+    if (gAnimMoveTurn & 1)
+        sBattleAnimScriptPtr += 4;
+    sBattleAnimScriptPtr = T2_READ_PTR(sBattleAnimScriptPtr);
 }
 
-static void ScriptCmd_jumpif(void)
+static void ScriptCmd_jumpifmoveturn(void)
 {
-    u8 r1;
+    u8 toCheck;
 
-    gBattleAnimScriptPtr++;
-    r1 = T1_READ_8(gBattleAnimScriptPtr);
-    gBattleAnimScriptPtr++;
-    if (r1 == gUnknown_0202F7C4)
+    sBattleAnimScriptPtr++;
+    toCheck = T1_READ_8(sBattleAnimScriptPtr);
+    sBattleAnimScriptPtr++;
+
+    if (toCheck == gAnimMoveTurn)
     {
-        gBattleAnimScriptPtr = T2_READ_PTR(gBattleAnimScriptPtr);
+        sBattleAnimScriptPtr = T2_READ_PTR(sBattleAnimScriptPtr);
     }
     else
     {
-        gBattleAnimScriptPtr += 4;
+        sBattleAnimScriptPtr += 4;
     }
 }
 
 static void ScriptCmd_jump(void)
 {
-    gBattleAnimScriptPtr++;
-    gBattleAnimScriptPtr = T2_READ_PTR(gBattleAnimScriptPtr);
+    sBattleAnimScriptPtr++;
+    sBattleAnimScriptPtr = T2_READ_PTR(sBattleAnimScriptPtr);
 }
 
-bool8 NotInBattle(void)
+bool8 IsContest(void)
 {
     if (!gMain.inBattle)
         return TRUE;
@@ -1331,124 +1149,131 @@ bool8 NotInBattle(void)
         return FALSE;
 }
 
+#define tBackgroundId   data[0]
+#define tState          data[10]
+
 static void ScriptCmd_fadetobg(void)
 {
-    u8 r4;
+    u8 backgroundId;
     u8 taskId;
 
-    gBattleAnimScriptPtr++;
-    r4 = T1_READ_8(gBattleAnimScriptPtr);
-    gBattleAnimScriptPtr++;
-    taskId = CreateTask(task_p5_load_battle_screen_elements, 5);
-    gTasks[taskId].data[0] = r4;
-    gUnknown_0202F7C5 = 1;
+    sBattleAnimScriptPtr++;
+    backgroundId = T1_READ_8(sBattleAnimScriptPtr);
+    sBattleAnimScriptPtr++;
+    taskId = CreateTask(Task_FadeToBg, 5);
+    gTasks[taskId].tBackgroundId = backgroundId;
+    sAnimBackgroundFadeState = 1;
 }
 
-static void ScriptCmd_fadetobg_25(void)
+static void ScriptCmd_fadetobgfromset(void)
 {
-    u8 r8;
-    u8 r7;
-    u8 r6;
+    u8 bg1, bg2, bg3;
     u8 taskId;
 
-    gBattleAnimScriptPtr++;
-    r8 = gBattleAnimScriptPtr[0];
-    r7 = gBattleAnimScriptPtr[1];
-    r6 = gBattleAnimScriptPtr[2];
-    gBattleAnimScriptPtr += 3;
-    taskId = CreateTask(task_p5_load_battle_screen_elements, 5);
-    if (NotInBattle() != 0)
-        gTasks[taskId].data[0] = r6;
-    else if (GetBankSide(gBattleAnimBankTarget) == 0)
-        gTasks[taskId].data[0] = r7;
+    sBattleAnimScriptPtr++;
+    bg1 = sBattleAnimScriptPtr[0];
+    bg2 = sBattleAnimScriptPtr[1];
+    bg3 = sBattleAnimScriptPtr[2];
+    sBattleAnimScriptPtr += 3;
+    taskId = CreateTask(Task_FadeToBg, 5);
+
+    if (IsContest())
+        gTasks[taskId].tBackgroundId = bg3;
+    else if (GetBankSide(gAnimBankTarget) == 0)
+        gTasks[taskId].tBackgroundId = bg2;
     else
-        gTasks[taskId].data[0] = r8;
-    gUnknown_0202F7C5 = 1;
+        gTasks[taskId].tBackgroundId = bg1;
+
+    sAnimBackgroundFadeState = 1;
 }
 
-static void task_p5_load_battle_screen_elements(u8 taskId)
+static void Task_FadeToBg(u8 taskId)
 {
-    if (gTasks[taskId].data[10] == 0)
+    if (gTasks[taskId].tState == 0)
     {
         BeginHardwarePaletteFade(0xE8, 0, 0, 16, 0);
-        gTasks[taskId].data[10]++;
+        gTasks[taskId].tState++;
         return;
     }
     if (gPaletteFade.active)
         return;
-    if (gTasks[taskId].data[10] == 1)
+    if (gTasks[taskId].tState == 1)
     {
-        gTasks[taskId].data[10]++;
-        gUnknown_0202F7C5 = 2;
+        gTasks[taskId].tState++;
+        sAnimBackgroundFadeState = 2;
     }
-    else if (gTasks[taskId].data[10] == 2)
+    else if (gTasks[taskId].tState == 2)
     {
-        s16 data0 = (u16)gTasks[taskId].data[0];
+        s16 bgId = (u16)gTasks[taskId].tBackgroundId;
 
-        if (data0 == -1)
-            dp01t_11_3_message_for_player_only();
+        if (bgId == -1)
+            LoadDefaultBg();
         else
-            sub_8076DB8(data0);
+            LoadMoveBg(bgId);
+
         BeginHardwarePaletteFade(0xE8, 0, 16, 0, 1);
-        gTasks[taskId].data[10]++;
+        gTasks[taskId].tState++;
         return;
     }
     if (gPaletteFade.active)
         return;
-    if (gTasks[taskId].data[10] == 3)
+    if (gTasks[taskId].tState == 3)
     {
         DestroyTask(taskId);
-        gUnknown_0202F7C5 = 0;
+        sAnimBackgroundFadeState = 0;
     }
 }
 
-static void sub_8076DB8(u16 a)
+static void LoadMoveBg(u16 bgId)
 {
-    if (NotInBattle())
+    if (IsContest())
     {
-        void *tilemap = gBattleAnimBackgroundTable[a].tilemap;
+        void *tilemap = gBattleAnimBackgroundTable[bgId].tilemap;
         void *dmaSrc;
         void *dmaDest;
 
-        LZDecompressWram(tilemap, NotInBattle() ? EWRAM_14800 : EWRAM_18000);
-        sub_80763FC(sub_80789BC(), NotInBattle() ? EWRAM_14800 : EWRAM_18000, 0x100, 0);
-        dmaSrc = NotInBattle() ? EWRAM_14800 : EWRAM_18000;
+        LZDecompressWram(tilemap, IsContest() ? EWRAM_14800 : EWRAM_18000);
+        sub_80763FC(sub_80789BC(), IsContest() ? EWRAM_14800 : EWRAM_18000, 0x100, 0);
+        dmaSrc = IsContest() ? EWRAM_14800 : EWRAM_18000;
         dmaDest = (void *)(VRAM + 0xD000);
         DmaCopy32(3, dmaSrc, dmaDest, 0x800);
-        LZDecompressVram(gBattleAnimBackgroundTable[a].image, (void *)(VRAM + 0x2000));
-        LoadCompressedPalette(gBattleAnimBackgroundTable[a].palette, sub_80789BC() * 16, 32);
+        LZDecompressVram(gBattleAnimBackgroundTable[bgId].image, (void *)(VRAM + 0x2000));
+        LoadCompressedPalette(gBattleAnimBackgroundTable[bgId].palette, sub_80789BC() * 16, 32);
     }
     else
     {
-        LZDecompressVram(gBattleAnimBackgroundTable[a].tilemap, (void *)(VRAM + 0xD000));
-        LZDecompressVram(gBattleAnimBackgroundTable[a].image, (void *)(VRAM + 0x8000));
-        LoadCompressedPalette(gBattleAnimBackgroundTable[a].palette, 32, 32);
+        LZDecompressVram(gBattleAnimBackgroundTable[bgId].tilemap, (void *)(VRAM + 0xD000));
+        LZDecompressVram(gBattleAnimBackgroundTable[bgId].image, (void *)(VRAM + 0x8000));
+        LoadCompressedPalette(gBattleAnimBackgroundTable[bgId].palette, 32, 32);
     }
 }
 
-static void dp01t_11_3_message_for_player_only(void)
+static void LoadDefaultBg(void)
 {
-    if (NotInBattle())
-        sub_80AB2AC();
+    if (IsContest())
+        LoadContestBgAfterMoveAnim();
     else
-        sub_800D7B8();
+        DrawMainBattleBackground();
 }
 
 static void ScriptCmd_restorebg(void)
 {
     u8 taskId;
 
-    gBattleAnimScriptPtr++;
-    taskId = CreateTask(task_p5_load_battle_screen_elements, 5);
-    gTasks[taskId].data[0] = 0xFFFF;
-    gUnknown_0202F7C5 = 1;
+    sBattleAnimScriptPtr++;
+    taskId = CreateTask(Task_FadeToBg, 5);
+    gTasks[taskId].tBackgroundId = 0xFFFF;
+    sAnimBackgroundFadeState = 1;
 }
 
+#undef tBackgroundId
+#undef tState
+
 static void ScriptCmd_waitbgfadeout(void)
 {
-    if (gUnknown_0202F7C5 == 2)
+    if (sAnimBackgroundFadeState == 2)
     {
-        gBattleAnimScriptPtr++;
+        sBattleAnimScriptPtr++;
         gAnimFramesToWait = 0;
     }
     else
@@ -1459,9 +1284,9 @@ static void ScriptCmd_waitbgfadeout(void)
 
 static void ScriptCmd_waitbgfadein(void)
 {
-    if (gUnknown_0202F7C5 == 0)
+    if (sAnimBackgroundFadeState == 0)
     {
-        gBattleAnimScriptPtr++;
+        sBattleAnimScriptPtr++;
         gAnimFramesToWait = 0;
     }
     else
@@ -1472,25 +1297,25 @@ static void ScriptCmd_waitbgfadein(void)
 
 static void ScriptCmd_changebg(void)
 {
-    gBattleAnimScriptPtr++;
-    sub_8076DB8(T1_READ_8(gBattleAnimScriptPtr));
-    gBattleAnimScriptPtr++;
+    sBattleAnimScriptPtr++;
+    LoadMoveBg(T1_READ_8(sBattleAnimScriptPtr));
+    sBattleAnimScriptPtr++;
 }
 
 //Weird control flow
 /*
-s8 sub_8076F98(s8 a)
+s8 BattleAnimAdjustPanning(s8 a)
 {
-    if (!NotInBattle() && (EWRAM_17810[gBattleAnimBankAttacker].unk0 & 0x10))
+    if (!IsContest() && (EWRAM_17810[gAnimBankAttacker].unk0 & 0x10))
     {
-        a = GetBankSide(gBattleAnimBankAttacker) ? 0xC0 : 0x3F;
+        a = GetBankSide(gAnimBankAttacker) ? 0xC0 : 0x3F;
     }
     //_08076FDC
     else
     {
-        if (NotInBattle())
+        if (IsContest())
         {
-            if (gBattleAnimBankAttacker == gBattleAnimBankTarget && gBattleAnimBankAttacker == 2
+            if (gAnimBankAttacker == gAnimBankTarget && gAnimBankAttacker == 2
              && a == 0x3F)
             {
                 //jump to _0807707A
@@ -1502,9 +1327,9 @@ s8 sub_8076F98(s8 a)
         //_08077004
         else
         {
-            if (GetBankSide(gBattleAnimBankAttacker) == 0)
+            if (GetBankSide(gAnimBankAttacker) == 0)
             {
-                if (GetBankSide(gBattleAnimBankTarget) == 0)
+                if (GetBankSide(gAnimBankTarget) == 0)
             }
             //_08077042
             else
@@ -1518,17 +1343,17 @@ s8 sub_8076F98(s8 a)
 }
 */
 __attribute__((naked))
-s8 sub_8076F98(s8 a)
+s8 BattleAnimAdjustPanning(s8 a)
 {
     asm(".syntax unified\n\
     push {r4,lr}\n\
     lsls r0, 24\n\
     lsrs r4, r0, 24\n\
-    bl NotInBattle\n\
+    bl IsContest\n\
     lsls r0, 24\n\
     cmp r0, 0\n\
     bne _08076FDC\n\
-    ldr r0, _08076FD4 @ =gBattleAnimBankAttacker\n\
+    ldr r0, _08076FD4 @ =gAnimBankAttacker\n\
     ldrb r2, [r0]\n\
     lsls r0, r2, 1\n\
     adds r0, r2\n\
@@ -1549,15 +1374,15 @@ s8 sub_8076F98(s8 a)
     movs r4, 0x3F\n\
     b _0807706E\n\
     .align 2, 0\n\
-_08076FD4: .4byte gBattleAnimBankAttacker\n\
+_08076FD4: .4byte gAnimBankAttacker\n\
 _08076FD8: .4byte gSharedMem + 0x17810\n\
 _08076FDC:\n\
-    bl NotInBattle\n\
+    bl IsContest\n\
     lsls r0, 24\n\
     cmp r0, 0\n\
     beq _08077004\n\
-    ldr r0, _08076FFC @ =gBattleAnimBankAttacker\n\
-    ldr r1, _08077000 @ =gBattleAnimBankTarget\n\
+    ldr r0, _08076FFC @ =gAnimBankAttacker\n\
+    ldr r1, _08077000 @ =gAnimBankTarget\n\
     ldrb r0, [r0]\n\
     ldrb r1, [r1]\n\
     cmp r0, r1\n\
@@ -1568,16 +1393,16 @@ _08076FDC:\n\
     beq _0807707A\n\
     b _08077068\n\
     .align 2, 0\n\
-_08076FFC: .4byte gBattleAnimBankAttacker\n\
-_08077000: .4byte gBattleAnimBankTarget\n\
+_08076FFC: .4byte gAnimBankAttacker\n\
+_08077000: .4byte gAnimBankTarget\n\
 _08077004:\n\
-    ldr r0, _0807702C @ =gBattleAnimBankAttacker\n\
+    ldr r0, _0807702C @ =gAnimBankAttacker\n\
     ldrb r0, [r0]\n\
     bl GetBankSide\n\
     lsls r0, 24\n\
     cmp r0, 0\n\
     bne _08077042\n\
-    ldr r0, _08077030 @ =gBattleAnimBankTarget\n\
+    ldr r0, _08077030 @ =gAnimBankTarget\n\
     ldrb r0, [r0]\n\
     bl GetBankSide\n\
     lsls r0, 24\n\
@@ -1590,8 +1415,8 @@ _08077004:\n\
     movs r4, 0xC0\n\
     b _0807706E\n\
     .align 2, 0\n\
-_0807702C: .4byte gBattleAnimBankAttacker\n\
-_08077030: .4byte gBattleAnimBankTarget\n\
+_0807702C: .4byte gAnimBankAttacker\n\
+_08077030: .4byte gAnimBankTarget\n\
 _08077034:\n\
     movs r0, 0x40\n\
     negs r0, r0\n\
@@ -1601,7 +1426,7 @@ _08077034:\n\
     lsls r0, 24\n\
     b _0807706C\n\
 _08077042:\n\
-    ldr r0, _08077064 @ =gBattleAnimBankTarget\n\
+    ldr r0, _08077064 @ =gAnimBankTarget\n\
     ldrb r0, [r0]\n\
     bl GetBankSide\n\
     lsls r0, 24\n\
@@ -1617,7 +1442,7 @@ _08077042:\n\
     movs r4, 0x3F\n\
     b _0807706E\n\
     .align 2, 0\n\
-_08077064: .4byte gBattleAnimBankTarget\n\
+_08077064: .4byte gAnimBankTarget\n\
 _08077068:\n\
     lsls r0, r4, 24\n\
     negs r0, r0\n\
@@ -1647,21 +1472,21 @@ _08077088:\n\
     .syntax divided\n");
 }
 
-s8 sub_8077094(s8 a)
+s8 BattleAnimAdjustPanning2(s8 pan)
 {
-    if (!NotInBattle() && (EWRAM_17810[gBattleAnimBankAttacker].unk0 & 0x10))
+    if (!IsContest() && (EWRAM_17810[gAnimBankAttacker].unk0 & 0x10))
     {
-        if (GetBankSide(gBattleAnimBankAttacker) != 0)
-            a = 0x3F;
+        if (GetBankSide(gAnimBankAttacker) != 0)
+            pan = 0x3F;
         else
-            a = 0xC0;
+            pan = 0xC0;
     }
     else
     {
-        if (GetBankSide(gBattleAnimBankAttacker) != 0 || NotInBattle() != 0)
-            a = -a;
+        if (GetBankSide(gAnimBankAttacker) != 0 || IsContest() != 0)
+            pan = -pan;
     }
-    return a;
+    return pan;
 }
 
 s16 sub_8077104(s16 a)
@@ -1675,310 +1500,232 @@ s16 sub_8077104(s16 a)
     return var;
 }
 
-s16 sub_807712C(s16 a, s16 b, s16 c)
+s16 CalculatePanIncrement(s16 sourcePan, s16 targetPan, s16 incrementPan)
 {
-    u16 var;
+    u16 ret;
 
-    if (a < b)
-        var = ((c < 0) ? -c : c);
-    else if (a > b)
-        var = -((c < 0) ? -c : c);
+    if (sourcePan < targetPan)
+        ret = ((incrementPan < 0) ? -incrementPan : incrementPan);
+    else if (sourcePan > targetPan)
+        ret = -((incrementPan < 0) ? -incrementPan : incrementPan);
     else
-        var = 0;
-    return var;
+        ret = 0;
+
+    return ret;
 }
 
-static void ScriptCmd_panse_19(void)
+static void ScriptCmd_playsewithpan(void)
 {
-    u16 r4;
-    s8 r0;
+    u16 songId;
+    s8 pan;
 
-    gBattleAnimScriptPtr++;
-    r4 = T1_READ_16(gBattleAnimScriptPtr);
-    r0 = T1_READ_8(gBattleAnimScriptPtr + 2);
-    PlaySE12WithPanning(r4, sub_8076F98(r0));
-    gBattleAnimScriptPtr += 3;
+    sBattleAnimScriptPtr++;
+    songId = T1_READ_16(sBattleAnimScriptPtr);
+    pan = T1_READ_8(sBattleAnimScriptPtr + 2);
+    PlaySE12WithPanning(songId, BattleAnimAdjustPanning(pan));
+    sBattleAnimScriptPtr += 3;
 }
 
 static void ScriptCmd_setpan(void)
 {
-    s8 r0;
+    s8 pan;
 
-    gBattleAnimScriptPtr++;
-    r0 = T1_READ_8(gBattleAnimScriptPtr);
-    SE12PanpotControl(sub_8076F98(r0));
-    gBattleAnimScriptPtr++;
+    sBattleAnimScriptPtr++;
+    pan = T1_READ_8(sBattleAnimScriptPtr);
+    SE12PanpotControl(BattleAnimAdjustPanning(pan));
+    sBattleAnimScriptPtr++;
 }
 
+#define tInitialPan     data[0]
+#define tTargetPan      data[1]
+#define tIncrementPan   data[2]
+#define tFramesToWait   data[3]
+#define tCurrentPan     data[4]
+#define tFrameCounter   data[8]
+
 static void ScriptCmd_panse_1B(void)
 {
     u16 songNum;
-    s8 r0;
-    s8 r4;
-    s8 r6;
-    u8 r7;
-    s8 panning;
-    s8 r8;
+    s8 currentPanArg, incrementPan, incrementPanArg, currentPan, targetPan;
+    u8 framesToWait;
     u8 taskId;
 
-    gBattleAnimScriptPtr++;
-    songNum = T1_READ_16(gBattleAnimScriptPtr);
-    r0 = T1_READ_8(gBattleAnimScriptPtr + 2);
-    r4 = T1_READ_8(gBattleAnimScriptPtr + 3);
-    r6 = T1_READ_8(gBattleAnimScriptPtr + 4);
-    r7 = T1_READ_8(gBattleAnimScriptPtr + 5);
-    panning = sub_8076F98(r0);
-    r8 = sub_8076F98(r4);
-    r4 = sub_807712C(panning, r8, r6);
-    taskId = CreateTask(c3_08073CEC, 1);
-    gTasks[taskId].data[0] = panning;
-    gTasks[taskId].data[1] = r8;
-    gTasks[taskId].data[2] = r4;
-    gTasks[taskId].data[3] = r7;
-    gTasks[taskId].data[4] = panning;
-    PlaySE12WithPanning(songNum, panning);
+    sBattleAnimScriptPtr++;
+    songNum = T1_READ_16(sBattleAnimScriptPtr);
+    currentPanArg = T1_READ_8(sBattleAnimScriptPtr + 2);
+    incrementPan = T1_READ_8(sBattleAnimScriptPtr + 3);
+    incrementPanArg = T1_READ_8(sBattleAnimScriptPtr + 4);
+    framesToWait = T1_READ_8(sBattleAnimScriptPtr + 5);
+
+    currentPan = BattleAnimAdjustPanning(currentPanArg);
+    targetPan = BattleAnimAdjustPanning(incrementPan);
+    incrementPan = CalculatePanIncrement(currentPan, targetPan, incrementPanArg);
+    taskId = CreateTask(Task_PanFromInitialToTarget, 1);
+    gTasks[taskId].tInitialPan = currentPan;
+    gTasks[taskId].tTargetPan = targetPan;
+    gTasks[taskId].tIncrementPan = incrementPan;
+    gTasks[taskId].tFramesToWait = framesToWait;
+    gTasks[taskId].tCurrentPan = currentPan;
+
+    PlaySE12WithPanning(songNum, currentPan);
+
     gAnimSoundTaskCount++;
-    gBattleAnimScriptPtr += 6;
+    sBattleAnimScriptPtr += 6;
 }
 
-#ifdef NONMATCHING
-static void c3_08073CEC(u8 taskId)
+void Task_PanFromInitialToTarget(u8 taskId)
 {
-    u16 r7 = 0;
-    s16 r0;
-    s16 r6;
-    s16 r3;
-    s16 r4;
-    int foo;
-
-    r0 = gTasks[taskId].data[8];
-    gTasks[taskId].data[8]++;
-    if (r0 >= gTasks[taskId].data[3])
+    bool32 destroyTask = FALSE;
+    if (gTasks[taskId].tFrameCounter++ >= gTasks[taskId].tFramesToWait)
     {
-        gTasks[taskId].data[8] = r7;
-        r6 = gTasks[taskId].data[0];
-        r3 = gTasks[taskId].data[1];
-        foo = gTasks[taskId].data[4] + gTasks[taskId].data[2];
-        r4 = foo;
-        gTasks[taskId].data[4] = r4;
-        if (gTasks[taskId].data[2] == 0)
+        s16 pan;
+        s16 initialPanning, targetPanning, currentPan, incrementPan;
+
+        gTasks[taskId].tFrameCounter = 0;
+        initialPanning = gTasks[taskId].tInitialPan;
+        targetPanning = gTasks[taskId].tTargetPan;
+        currentPan = gTasks[taskId].tCurrentPan;
+        incrementPan = gTasks[taskId].tIncrementPan;
+        pan = currentPan + incrementPan;
+        gTasks[taskId].tCurrentPan = pan;
+
+        if (incrementPan == 0) // If we're not incrementing, just cancel the task immediately
         {
-            r4 = r3;
-            DestroyTask(taskId);
-            gAnimSoundTaskCount--;
+            destroyTask = TRUE;
         }
-        //_080772D8
-        else
+        else if (initialPanning < targetPanning) // Panning increasing
         {
-            if (r6 < r3)
-            {
-                if (r4 < r3)
-                    goto check;
-                DestroyTask(taskId);
-                gAnimSoundTaskCount--;
-            }
-            else
-            {
-                if (r4 <= r3)
-                    r7 = 1;
-              check:
-                if (r7 != 0)
-                {
-                    DestroyTask(taskId);
-                    gAnimSoundTaskCount--;
-                }
-            }
+            if (pan >= targetPanning) // Target reached
+                destroyTask = TRUE;
         }
-        //_080772F8
-        SE12PanpotControl(r4);
+        else // Panning decreasing
+        {
+            if (pan <= targetPanning) // Target reached
+                destroyTask = TRUE;
+        }
+
+        if (destroyTask)
+        {
+            pan = targetPanning;
+            DestroyTask(taskId);
+            gAnimSoundTaskCount--;
+        }
+
+        SE12PanpotControl(pan);
     }
-    //_08077314
-}
-#else
-__attribute__((naked))
-static void c3_08073CEC(u8 taskId)
-{
-    asm(".syntax unified\n\
-    push {r4-r7,lr}\n\
-    lsls r0, 24\n\
-    lsrs r5, r0, 24\n\
-    movs r7, 0\n\
-    ldr r1, _080772D4 @ =gTasks\n\
-    lsls r0, r5, 2\n\
-    adds r0, r5\n\
-    lsls r0, 3\n\
-    adds r2, r0, r1\n\
-    ldrh r0, [r2, 0x18]\n\
-    adds r1, r0, 0x1\n\
-    strh r1, [r2, 0x18]\n\
-    lsls r0, 16\n\
-    asrs r0, 16\n\
-    movs r3, 0xE\n\
-    ldrsh r1, [r2, r3]\n\
-    cmp r0, r1\n\
-    blt _08077314\n\
-    strh r7, [r2, 0x18]\n\
-    ldrh r6, [r2, 0x8]\n\
-    ldrh r3, [r2, 0xA]\n\
-    movs r4, 0x10\n\
-    ldrsh r0, [r2, r4]\n\
-    movs r4, 0xC\n\
-    ldrsh r1, [r2, r4]\n\
-    adds r0, r1\n\
-    lsls r0, 16\n\
-    lsrs r4, r0, 16\n\
-    strh r4, [r2, 0x10]\n\
-    cmp r1, 0\n\
-    bne _080772D8\n\
-    lsls r2, r3, 16\n\
-    b _080772FC\n\
-    .align 2, 0\n\
-_080772D4: .4byte gTasks\n\
-_080772D8:\n\
-    lsls r1, r6, 16\n\
-    lsls r0, r3, 16\n\
-    asrs r3, r0, 16\n\
-    adds r2, r0, 0\n\
-    cmp r1, r2\n\
-    bge _080772EE\n\
-    lsls r0, r4, 16\n\
-    asrs r0, 16\n\
-    cmp r0, r3\n\
-    blt _080772F8\n\
-    b _080772FC\n\
-_080772EE:\n\
-    lsls r0, r4, 16\n\
-    asrs r0, 16\n\
-    cmp r0, r3\n\
-    bgt _080772F8\n\
-    movs r7, 0x1\n\
-_080772F8:\n\
-    cmp r7, 0\n\
-    beq _0807730C\n\
-_080772FC:\n\
-    lsrs r4, r2, 16\n\
-    adds r0, r5, 0\n\
-    bl DestroyTask\n\
-    ldr r1, _0807731C @ =gAnimSoundTaskCount\n\
-    ldrb r0, [r1]\n\
-    subs r0, 0x1\n\
-    strb r0, [r1]\n\
-_0807730C:\n\
-    lsls r0, r4, 24\n\
-    asrs r0, 24\n\
-    bl SE12PanpotControl\n\
-_08077314:\n\
-    pop {r4-r7}\n\
-    pop {r0}\n\
-    bx r0\n\
-    .align 2, 0\n\
-_0807731C: .4byte gAnimSoundTaskCount\n\
-    .syntax divided\n");
 }
-#endif
 
 static void ScriptCmd_panse_26(void)
 {
-    u16 r8;
-    s8 r4;
-    s8 r5;
-    s8 r6;
-    u8 r10;
+    u16 songId;
+    s8 currentPan, targetPan, incrementPan;
+    u8 framesToWait;
     u8 taskId;
 
-    gBattleAnimScriptPtr++;
-    r8 = T1_READ_16(gBattleAnimScriptPtr);
-    r4 = T1_READ_8(gBattleAnimScriptPtr + 2);
-    r5 = T1_READ_8(gBattleAnimScriptPtr + 3);
-    r6 = T1_READ_8(gBattleAnimScriptPtr + 4);
-    r10 = T1_READ_8(gBattleAnimScriptPtr + 5);
-    taskId = CreateTask(c3_08073CEC, 1);
-    gTasks[taskId].data[0] = r4;
-    gTasks[taskId].data[1] = r5;
-    gTasks[taskId].data[2] = r6;
-    gTasks[taskId].data[3] = r10;
-    gTasks[taskId].data[4] = r4;
-    PlaySE12WithPanning(r8, r4);
+    sBattleAnimScriptPtr++;
+    songId = T1_READ_16(sBattleAnimScriptPtr);
+    currentPan = T1_READ_8(sBattleAnimScriptPtr + 2);
+    targetPan = T1_READ_8(sBattleAnimScriptPtr + 3);
+    incrementPan = T1_READ_8(sBattleAnimScriptPtr + 4);
+    framesToWait = T1_READ_8(sBattleAnimScriptPtr + 5);
+
+    taskId = CreateTask(Task_PanFromInitialToTarget, 1);
+    gTasks[taskId].tInitialPan = currentPan;
+    gTasks[taskId].tTargetPan = targetPan;
+    gTasks[taskId].tIncrementPan = incrementPan;
+    gTasks[taskId].tFramesToWait = framesToWait;
+    gTasks[taskId].tCurrentPan = currentPan;
+
+    PlaySE12WithPanning(songId, currentPan);
+
     gAnimSoundTaskCount++;
-    gBattleAnimScriptPtr += 6;
+    sBattleAnimScriptPtr += 6;
 }
 
 static void ScriptCmd_panse_27(void)
 {
-    u16 r9;
-    u8 r4;
-    u8 r8;
-    u8 r7;
-    u8 r0;
-    s8 r6;
-    s8 r5;
-    s8 r4_2;
+    u16 songId;
+    u8 targetPanArg, incrementPanArg, currentPan, currentPanArg;
+    s8 targetPan, incrementPan, framesToWait;
     u8 taskId;
 
-    gBattleAnimScriptPtr++;
-    r9 = T1_READ_16(gBattleAnimScriptPtr);
-    r0 = T1_READ_8(gBattleAnimScriptPtr + 2);
-    r4 = T1_READ_8(gBattleAnimScriptPtr + 3);
-    r8 = T1_READ_8(gBattleAnimScriptPtr + 4);
-    r7 = T1_READ_8(gBattleAnimScriptPtr + 5);
-    r6 = sub_8077094(r0);
-    r5 = sub_8077094(r4);
-    r4_2 = sub_8077094(r8);
-    taskId = CreateTask(c3_08073CEC, 1);
-    gTasks[taskId].data[0] = r6;
-    gTasks[taskId].data[1] = r5;
-    gTasks[taskId].data[2] = r4_2;
-    gTasks[taskId].data[3] = r7;
-    gTasks[taskId].data[4] = r6;
-    PlaySE12WithPanning(r9, r6);
+    sBattleAnimScriptPtr++;
+    songId = T1_READ_16(sBattleAnimScriptPtr);
+    currentPanArg = T1_READ_8(sBattleAnimScriptPtr + 2);
+    targetPanArg = T1_READ_8(sBattleAnimScriptPtr + 3);
+    incrementPanArg = T1_READ_8(sBattleAnimScriptPtr + 4);
+    currentPan = T1_READ_8(sBattleAnimScriptPtr + 5);
+
+    targetPan = BattleAnimAdjustPanning2(currentPanArg);
+    incrementPan = BattleAnimAdjustPanning2(targetPanArg);
+    framesToWait = BattleAnimAdjustPanning2(incrementPanArg);
+
+    taskId = CreateTask(Task_PanFromInitialToTarget, 1);
+    gTasks[taskId].data[0] = targetPan;
+    gTasks[taskId].data[1] = incrementPan;
+    gTasks[taskId].data[2] = framesToWait;
+    gTasks[taskId].data[3] = currentPan;
+    gTasks[taskId].data[4] = targetPan;
+
+    PlaySE12WithPanning(songId, targetPan);
+
     gAnimSoundTaskCount++;
-    gBattleAnimScriptPtr += 6;
+    sBattleAnimScriptPtr += 6;
 }
 
-static void ScriptCmd_panse_1C(void)
+#undef tInitialPan
+#undef tTargetPan
+#undef tIncrementPan
+#undef tFramesToWait
+#undef tCurrentPan
+#undef tFrameCounter
+
+#define tSongId         data[0]
+#define tPanning        data[1]
+#define tFramesToWait   data[2]
+#define tNumberOfPlays  data[3]
+#define tFrameCounter   data[8]
+
+static void ScriptCmd_loopsewithpan(void)
 {
-    u16 r5;
-    u8 r0;
-    u8 r8;
-    u8 r9;
-    s8 r4;
+    u16 songId;
+    s8 panningArg, panning;
+    u8 framesToWait, numberOfPlays;
     u8 taskId;
 
-    gBattleAnimScriptPtr++;
-    r5 = T1_READ_16(gBattleAnimScriptPtr);
-    r0 = T1_READ_8(gBattleAnimScriptPtr + 2);
-    r8 = T1_READ_8(gBattleAnimScriptPtr + 3);
-    r9 = T1_READ_8(gBattleAnimScriptPtr + 4);
-    r4 = sub_8076F98(r0);
-    taskId = CreateTask(sub_80774FC, 1);
-    gTasks[taskId].data[0] = r5;
-    gTasks[taskId].data[1] = r4;
-    gTasks[taskId].data[2] = r8;
-    gTasks[taskId].data[3] = r9;
-    gTasks[taskId].data[8] = r8;
+    sBattleAnimScriptPtr++;
+    songId = T1_READ_16(sBattleAnimScriptPtr);
+    panningArg = T1_READ_8(sBattleAnimScriptPtr + 2);
+    framesToWait = T1_READ_8(sBattleAnimScriptPtr + 3);
+    numberOfPlays = T1_READ_8(sBattleAnimScriptPtr + 4);
+    panning = BattleAnimAdjustPanning(panningArg);
+
+    taskId = CreateTask(Task_LoopAndPlaySE, 1);
+    gTasks[taskId].tSongId = songId;
+    gTasks[taskId].tPanning = panning;
+    gTasks[taskId].tFramesToWait = framesToWait;
+    gTasks[taskId].tNumberOfPlays = numberOfPlays;
+    gTasks[taskId].tFrameCounter = framesToWait;
     gTasks[taskId].func(taskId);
+
     gAnimSoundTaskCount++;
-    gBattleAnimScriptPtr += 5;
+    sBattleAnimScriptPtr += 5;
 }
 
-static void sub_80774FC(u8 taskId)
+static void Task_LoopAndPlaySE(u8 taskId)
 {
-    s16 data8;
-    u16 r0;
-    s8 r1;
-    u8 r4;
-
-    data8 = gTasks[taskId].data[8];
-    gTasks[taskId].data[8]++;
-    if (data8 >= gTasks[taskId].data[2])
+    if (gTasks[taskId].tFrameCounter++ >= gTasks[taskId].tFramesToWait)
     {
-        gTasks[taskId].data[8] = 0;
-        r0 = gTasks[taskId].data[0];
-        r1 = gTasks[taskId].data[1];
-        gTasks[taskId].data[3]--;
-        r4 = gTasks[taskId].data[3];
-        PlaySE12WithPanning(r0, r1);
-        if (r4 == 0)
+        u16 songId;
+        s8 panning;
+        u8 numberOfPlays;
+
+        gTasks[taskId].tFrameCounter = 0;
+        songId = gTasks[taskId].tSongId;
+        panning = gTasks[taskId].tPanning;
+        numberOfPlays = --gTasks[taskId].tNumberOfPlays;
+        PlaySE12WithPanning(songId, panning);
+        if (numberOfPlays == 0)
         {
             DestroyTask(taskId);
             gAnimSoundTaskCount--;
@@ -1986,57 +1733,67 @@ static void sub_80774FC(u8 taskId)
     }
 }
 
-static void ScriptCmd_panse_1D(void)
+#undef tSongId
+#undef tPanning
+#undef tFramesToWait
+#undef tNumberOfPlays
+#undef tFrameCounter
+
+#define tSongId         data[0]
+#define tPanning        data[1]
+#define tFramesToWait   data[2]
+
+static void ScriptCmd_waitplaysewithpan(void)
 {
-    u16 r5;
-    u8 r0;
-    u8 r8;
-    s8 r4;
+    u16 songId;
+    s8 panningArg, panning;
+    u8 framesToWait;
     u8 taskId;
 
-    gBattleAnimScriptPtr++;
-    r5 = T1_READ_16(gBattleAnimScriptPtr);
-    r0 = T1_READ_8(gBattleAnimScriptPtr + 2);
-    r8 = T1_READ_8(gBattleAnimScriptPtr + 3);
-    r4 = sub_8076F98(r0);
-    taskId = CreateTask(sub_80775CC, 1);
-    gTasks[taskId].data[0] = r5;
-    gTasks[taskId].data[1] = r4;
-    gTasks[taskId].data[2] = r8;
+    sBattleAnimScriptPtr++;
+    songId = T1_READ_16(sBattleAnimScriptPtr);
+    panningArg = T1_READ_8(sBattleAnimScriptPtr + 2);
+    framesToWait = T1_READ_8(sBattleAnimScriptPtr + 3);
+    panning = BattleAnimAdjustPanning(panningArg);
+
+    taskId = CreateTask(Task_WaitAndPlaySE, 1);
+    gTasks[taskId].tSongId = songId;
+    gTasks[taskId].tPanning = panning;
+    gTasks[taskId].tFramesToWait = framesToWait;
+
     gAnimSoundTaskCount++;
-    gBattleAnimScriptPtr += 4;
+    sBattleAnimScriptPtr += 4;
 }
 
-static void sub_80775CC(u8 taskId)
+static void Task_WaitAndPlaySE(u8 taskId)
 {
-    s16 r0;
-
-    r0 = gTasks[taskId].data[2];
-    gTasks[taskId].data[2]--;
-    if (r0 <= 0)
+    if (gTasks[taskId].tFramesToWait-- <= 0)
     {
-        PlaySE12WithPanning(gTasks[taskId].data[0], gTasks[taskId].data[1]);
+        PlaySE12WithPanning(gTasks[taskId].tSongId, gTasks[taskId].tPanning);
         DestroyTask(taskId);
         gAnimSoundTaskCount--;
     }
 }
 
-static void ScriptCmd_createtask_1F(void)
+#undef tSongId
+#undef tPanning
+#undef tFramesToWait
+
+static void ScriptCmd_createsoundtask(void)
 {
     TaskFunc func;
-    u8 numArgs;
-    int i;
-    u8 taskId;
+    u8 numArgs, taskId;
+    s32 i;
 
-    gBattleAnimScriptPtr++;
-    func = (TaskFunc)T2_READ_32(gBattleAnimScriptPtr);
-    gBattleAnimScriptPtr += 4;
-    numArgs = T1_READ_8(gBattleAnimScriptPtr);
-    gBattleAnimScriptPtr++;
+    sBattleAnimScriptPtr++;
+    func = (TaskFunc)T2_READ_32(sBattleAnimScriptPtr);
+    sBattleAnimScriptPtr += 4;
+    numArgs = T1_READ_8(sBattleAnimScriptPtr);
+    sBattleAnimScriptPtr++;
     for (i = 0; i < numArgs; i++)
     {
-        gBattleAnimArgs[i] = T1_READ_16(gBattleAnimScriptPtr);
-        gBattleAnimScriptPtr += 2;
+        gBattleAnimArgs[i] = T1_READ_16(sBattleAnimScriptPtr);
+        sBattleAnimScriptPtr += 2;
     }
     taskId = CreateTask(func, 1);
     func(taskId);
@@ -2066,61 +1823,51 @@ static void ScriptCmd_waitsound(void)
     else
     {
         gSoundAnimFramesToWait = 0;
-        gBattleAnimScriptPtr++;
+        sBattleAnimScriptPtr++;
         gAnimFramesToWait = 0;
     }
 }
 
-static void ScriptCmd_jumpvareq(void)
+static void ScriptCmd_jumpargeq(void)
 {
-    u8 r2;
-    s16 r1;
-    u8 *addr;
+    u8 argId;
+    s16 valueToCheck;
 
-    gBattleAnimScriptPtr++;
-    r2 = T1_READ_8(gBattleAnimScriptPtr);
-    r1 = T1_READ_16(gBattleAnimScriptPtr + 1);
-    if (r1 == gBattleAnimArgs[r2])
-    {
-        addr = T2_READ_PTR(gBattleAnimScriptPtr + 3);
-        gBattleAnimScriptPtr = addr;
-    }
+    sBattleAnimScriptPtr++;
+    argId = T1_READ_8(sBattleAnimScriptPtr);
+    valueToCheck = T1_READ_16(sBattleAnimScriptPtr + 1);
+
+    if (valueToCheck == gBattleAnimArgs[argId])
+        sBattleAnimScriptPtr = T2_READ_PTR(sBattleAnimScriptPtr + 3);
     else
-    {
-        gBattleAnimScriptPtr += 7;
-    }
+        sBattleAnimScriptPtr += 7;
 }
 
-static void ScriptCmd_jumpunkcond(void)
+static void ScriptCmd_jumpifcontest(void)
 {
-    u8 *addr;
-
-    gBattleAnimScriptPtr++;
-    if (NotInBattle())
-    {
-        addr = T2_READ_PTR(gBattleAnimScriptPtr);
-        gBattleAnimScriptPtr = addr;
-    }
+    sBattleAnimScriptPtr++;
+    if (IsContest())
+        sBattleAnimScriptPtr = T2_READ_PTR(sBattleAnimScriptPtr);
     else
-    {
-        gBattleAnimScriptPtr += 4;
-    }
+        sBattleAnimScriptPtr += 4;
 }
 
 static void ScriptCmd_monbgprio_28(void)
 {
-    u8 r2;
-    u8 r0;
-    u8 r4;
+    u8 wantedBank;
+    u8 bank;
+    u8 bankIdentity;
+
+    wantedBank = T1_READ_8(sBattleAnimScriptPtr + 1);
+    sBattleAnimScriptPtr += 2;
 
-    r2 = T1_READ_8(gBattleAnimScriptPtr + 1);
-    gBattleAnimScriptPtr += 2;
-    if (r2 != 0)
-        r0 = gBattleAnimBankTarget;
+    if (wantedBank != 0)
+        bank = gAnimBankTarget;
     else
-        r0 = gBattleAnimBankAttacker;
-    r4 = GetBankIdentity(r0);
-    if (!NotInBattle() && (r4 == 0 || r4 == 3))
+        bank = gAnimBankAttacker;
+
+    bankIdentity = GetBankIdentity(bank);
+    if (!IsContest() && (bankIdentity == 0 || bankIdentity == 3))
     {
         REG_BG1CNT_BITFIELD.priority = 1;
         REG_BG2CNT_BITFIELD.priority = 2;
@@ -2129,8 +1876,8 @@ static void ScriptCmd_monbgprio_28(void)
 
 static void ScriptCmd_monbgprio_29(void)
 {
-    gBattleAnimScriptPtr++;
-    if (!NotInBattle())
+    sBattleAnimScriptPtr++;
+    if (!IsContest())
     {
         REG_BG1CNT_BITFIELD.priority = 1;
         REG_BG2CNT_BITFIELD.priority = 2;
@@ -2139,20 +1886,20 @@ static void ScriptCmd_monbgprio_29(void)
 
 static void ScriptCmd_monbgprio_2A(void)
 {
-    u8 r6;
-    u8 r4;
-    u8 r0;
+    u8 wantedBank;
+    u8 bankIdentity;
+    u8 bank;
 
-    r6 = T1_READ_8(gBattleAnimScriptPtr + 1);
-    gBattleAnimScriptPtr += 2;
-    if (GetBankSide(gBattleAnimBankAttacker) != GetBankSide(gBattleAnimBankTarget))
+    wantedBank = T1_READ_8(sBattleAnimScriptPtr + 1);
+    sBattleAnimScriptPtr += 2;
+    if (GetBankSide(gAnimBankAttacker) != GetBankSide(gAnimBankTarget))
     {
-        if (r6 != 0)
-            r0 = gBattleAnimBankTarget;
+        if (wantedBank != 0)
+            bank = gAnimBankTarget;
         else
-            r0 = gBattleAnimBankAttacker;
-        r4 = GetBankIdentity(r0);
-        if (!NotInBattle() && (r4 == 0 || r4 == 3))
+            bank = gAnimBankAttacker;
+        bankIdentity = GetBankIdentity(bank);
+        if (!IsContest() && (bankIdentity == 0 || bankIdentity == 3))
         {
             REG_BG1CNT_BITFIELD.priority = 1;
             REG_BG2CNT_BITFIELD.priority = 2;
@@ -2162,51 +1909,45 @@ static void ScriptCmd_monbgprio_2A(void)
 
 static void ScriptCmd_invisible(void)
 {
-    u8 r0;
     u8 spriteId;
 
-    r0 = T1_READ_8(gBattleAnimScriptPtr + 1);
-    spriteId = GetAnimBankSpriteId(r0);
+    spriteId = GetAnimBankSpriteId(T1_READ_8(sBattleAnimScriptPtr + 1));
     if (spriteId != 0xFF)
-    {
         gSprites[spriteId].invisible = TRUE;
-    }
-    gBattleAnimScriptPtr += 2;
+
+    sBattleAnimScriptPtr += 2;
 }
 
 static void ScriptCmd_visible(void)
 {
-    u8 r0;
     u8 spriteId;
 
-    r0 = T1_READ_8(gBattleAnimScriptPtr + 1);
-    spriteId = GetAnimBankSpriteId(r0);
+    spriteId = GetAnimBankSpriteId(T1_READ_8(sBattleAnimScriptPtr + 1));
     if (spriteId != 0xFF)
-    {
         gSprites[spriteId].invisible = FALSE;
-    }
-    gBattleAnimScriptPtr += 2;
+
+    sBattleAnimScriptPtr += 2;
 }
 
 static void ScriptCmd_doublebattle_2D(void)
 {
-    u8 r7;
+    u8 wantedBank;
     u8 r4;
     u8 spriteId;
 
-    r7 = T1_READ_8(gBattleAnimScriptPtr + 1);
-    gBattleAnimScriptPtr += 2;
-    if (!NotInBattle() && IsDoubleBattle()
-     && GetBankSide(gBattleAnimBankAttacker) == GetBankSide(gBattleAnimBankTarget))
+    wantedBank = T1_READ_8(sBattleAnimScriptPtr + 1);
+    sBattleAnimScriptPtr += 2;
+    if (!IsContest() && IsDoubleBattle()
+     && GetBankSide(gAnimBankAttacker) == GetBankSide(gAnimBankTarget))
     {
-        if (r7 == 0)
+        if (wantedBank == 0)
         {
-            r4 = GetBankIdentity_permutated(gBattleAnimBankAttacker);
+            r4 = GetBankIdentity_permutated(gAnimBankAttacker);
             spriteId = GetAnimBankSpriteId(0);
         }
         else
         {
-            r4 = GetBankIdentity_permutated(gBattleAnimBankTarget);
+            r4 = GetBankIdentity_permutated(gAnimBankTarget);
             spriteId = GetAnimBankSpriteId(1);
         }
         if (spriteId != 0xFF)
@@ -2224,23 +1965,23 @@ static void ScriptCmd_doublebattle_2D(void)
 
 static void ScriptCmd_doublebattle_2E(void)
 {
-    u8 r7;
+    u8 wantedBank;
     u8 r4;
     u8 spriteId;
 
-    r7 = T1_READ_8(gBattleAnimScriptPtr  + 1);
-    gBattleAnimScriptPtr += 2;
-    if (!NotInBattle() && IsDoubleBattle()
-     && GetBankSide(gBattleAnimBankAttacker) == GetBankSide(gBattleAnimBankTarget))
+    wantedBank = T1_READ_8(sBattleAnimScriptPtr  + 1);
+    sBattleAnimScriptPtr += 2;
+    if (!IsContest() && IsDoubleBattle()
+     && GetBankSide(gAnimBankAttacker) == GetBankSide(gAnimBankTarget))
     {
-        if (r7 == 0)
+        if (wantedBank == 0)
         {
-            r4 = GetBankIdentity_permutated(gBattleAnimBankAttacker);
+            r4 = GetBankIdentity_permutated(gAnimBankAttacker);
             spriteId = GetAnimBankSpriteId(0);
         }
         else
         {
-            r4 = GetBankIdentity_permutated(gBattleAnimBankTarget);
+            r4 = GetBankIdentity_permutated(gAnimBankTarget);
             spriteId = GetAnimBankSpriteId(1);
         }
         if (spriteId != 0xFF && r4 == 2)
@@ -2254,5 +1995,5 @@ static void ScriptCmd_stopsound(void)
 {
     m4aMPlayStop(&gMPlay_SE1);
     m4aMPlayStop(&gMPlay_SE2);
-    gBattleAnimScriptPtr++;
+    sBattleAnimScriptPtr++;
 }
diff --git a/src/battle/battle_anim_807B69C.c b/src/battle/battle_anim_807B69C.c
index 6c35a85c9..058a45769 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 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 extern bool8 gAnimScriptActive;
 extern void (*gAnimScriptCallback)(void);
 extern s16 gBattleAnimArgs[];
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankTarget;
 extern u8 gObjectBankIDs[];
 extern const struct CompressedSpriteSheet gBattleAnimPicTable[];
 extern const struct CompressedSpritePalette gBattleAnimPaletteTable[];
@@ -22,7 +22,7 @@ extern const u8 *const gBattleAnims_StatusConditions[];
 extern const struct OamData gOamData_837E05C;
 extern const struct OamData gOamData_837DF24;
 
-extern u8 sub_8077ABC(u8, u8);
+extern u8 GetBankPosition(u8, u8);
 extern void sub_80E32E0(u8);
 
 
@@ -180,11 +180,11 @@ static void sub_807B8A4(struct Sprite *sprite)
 
 void sub_807B920(u8 taskId)
 {
-    s16 x = sub_8077ABC(gBattleAnimBankTarget, 2) - 32;
-    s16 y = sub_8077ABC(gBattleAnimBankTarget, 3) - 36;
+    s16 x = GetBankPosition(gAnimBankTarget, 2) - 32;
+    s16 y = GetBankPosition(gAnimBankTarget, 3) - 36;
     u8 spriteId;
 
-    if (NotInBattle())
+    if (IsContest())
         x -= 6;
     REG_BLDCNT = 0x3F40;
     REG_BLDALPHA = 0x1000;
@@ -336,9 +336,9 @@ void move_anim_start_t2(u8 a, u8 b)
 {
     u8 taskId;
 
-    gBattleAnimBankAttacker = a;
-    gBattleAnimBankTarget = a;
-    DoMoveAnim(gBattleAnims_StatusConditions, b, 0);
+    gAnimBankAttacker = a;
+    gAnimBankTarget = 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 a1d916f0f..3097f1a0e 100644
--- a/src/battle/battle_anim_80A7E7C.c
+++ b/src/battle/battle_anim_80A7E7C.c
@@ -10,10 +10,10 @@
 extern s16 gBattleAnimArgs[8];
 
 extern u8 gObjectBankIDs[];
-extern s32 gMoveDmgMoveAnim;
-extern u16 gMovePowerMoveAnim;
-extern u8 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern s32 gAnimMoveDmg;
+extern u16 gAnimMovePower;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 static void sub_80A7EF0(u8 taskId);
 static void sub_80A808C(u8 taskId);
@@ -129,7 +129,7 @@ void sub_80A7FA0(u8 taskId)
     }
     else
     {
-        sprite = gObjectBankIDs[gBattleAnimBankAttacker];
+        sprite = gObjectBankIDs[gAnimBankAttacker];
     }
     if (r6)
     {
@@ -328,7 +328,7 @@ static void sub_80A8488(u8 taskId)
 
 void sub_80A8500(u8 taskId)
 {
-    if (GetBankSide(gBattleAnimBankAttacker))
+    if (GetBankSide(gAnimBankAttacker))
     {
         gBattleAnimArgs[1] = -gBattleAnimArgs[1];
     }
@@ -338,7 +338,7 @@ void sub_80A8500(u8 taskId)
 void sub_80A8530(struct Sprite *sprite)
 {
     sprite->invisible = TRUE;
-    if (GetBankSide(gBattleAnimBankAttacker))
+    if (GetBankSide(gAnimBankAttacker))
     {
         sprite->data[1] = -gBattleAnimArgs[1];
     }
@@ -348,7 +348,7 @@ void sub_80A8530(struct Sprite *sprite)
     }
     sprite->data[0] = gBattleAnimArgs[0];
     sprite->data[2] = 0;
-    sprite->data[3] = gObjectBankIDs[gBattleAnimBankAttacker];
+    sprite->data[3] = gObjectBankIDs[gAnimBankAttacker];
     sprite->data[4] = gBattleAnimArgs[0];
     StoreSpriteCallbackInData(sprite, sub_80A85A4);
     sprite->callback = sub_8078458;
@@ -359,7 +359,7 @@ static void sub_80A85A4(struct Sprite *sprite)
     sprite->data[0] = sprite->data[4];
     sprite->data[1] = -sprite->data[1];
     sprite->callback = sub_8078458;
-    StoreSpriteCallbackInData(sprite, move_anim_8072740);
+    StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
 }
 
 void sub_80A85C8(struct Sprite *sprite)
@@ -381,7 +381,7 @@ void sub_80A8614(struct Sprite *sprite)
     sprite->data[0] = sprite->data[4];
     sprite->data[2] = -sprite->data[2];
     sprite->callback = sub_8078458;
-    StoreSpriteCallbackInData(sprite, move_anim_8072740);
+    StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
 }
 
 void sub_80A8638(struct Sprite *sprite)
@@ -390,11 +390,11 @@ void sub_80A8638(struct Sprite *sprite)
     int spriteId;
     if (!gBattleAnimArgs[0])
     {
-        spriteId = gObjectBankIDs[gBattleAnimBankAttacker];
+        spriteId = gObjectBankIDs[gAnimBankAttacker];
     }
     else
     {
-        spriteId = gObjectBankIDs[gBattleAnimBankTarget];
+        spriteId = gObjectBankIDs[gAnimBankTarget];
     }
     sprite->data[0] = gBattleAnimArgs[2];
     sprite->data[1] = gSprites[spriteId].pos1.x + gSprites[spriteId].pos2.x;
@@ -439,7 +439,7 @@ static void sub_80A86F4(struct Sprite *sprite)
         {
             sprite2->pos2.y = 0;
         }
-        move_anim_8072740(sprite);
+        DestroyAnimSprite(sprite);
     }
     else
     {
@@ -457,11 +457,11 @@ void sub_80A8764(struct Sprite *sprite)
     u8 spriteId;
     if (!gBattleAnimArgs[0])
     {
-        v1 = gBattleAnimBankAttacker;
+        v1 = gAnimBankAttacker;
     }
     else
     {
-        v1 = gBattleAnimBankTarget;
+        v1 = gAnimBankTarget;
     }
     spriteId = gObjectBankIDs[v1];
     if (GetBankSide(v1))
@@ -482,7 +482,7 @@ void sub_80A8764(struct Sprite *sprite)
     sprite->data[4] = 0;
     sprite->data[5] = spriteId;
     sprite->invisible = TRUE;
-    StoreSpriteCallbackInData(sprite, move_anim_8072740);
+    StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
     sprite->callback = sub_80784A8;
 }
 
@@ -493,11 +493,11 @@ void sub_80A8818(struct Sprite *sprite)
     sprite->invisible = TRUE;
     if (!gBattleAnimArgs[0])
     {
-        v1 = gBattleAnimBankAttacker;
+        v1 = gAnimBankAttacker;
     }
     else
     {
-        v1 = gBattleAnimBankTarget;
+        v1 = gAnimBankTarget;
     }
     spriteId = gObjectBankIDs[v1];
     if (GetBankSide(v1))
@@ -520,7 +520,7 @@ void sub_80A8818(struct Sprite *sprite)
     sprite->data[6] = gBattleAnimArgs[5];
     if (!gBattleAnimArgs[5])
     {
-        StoreSpriteCallbackInData(sprite, move_anim_8072740);
+        StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
     }
     else
     {
@@ -534,14 +534,14 @@ static void sub_80A88F0(struct Sprite *sprite)
 {
     gSprites[sprite->data[5]].pos2.x = 0;
     gSprites[sprite->data[5]].pos2.y = 0;
-    move_anim_8072740(sprite);
+    DestroyAnimSprite(sprite);
 }
 
 void sub_80A8920(u8 taskId)
 {
     s16 r7;
     r7 = 0x8000 / gBattleAnimArgs[3];
-    if (GetBankSide(gBattleAnimBankAttacker))
+    if (GetBankSide(gAnimBankAttacker))
     {
         gBattleAnimArgs[1] = -gBattleAnimArgs[1];
         gBattleAnimArgs[5] = -gBattleAnimArgs[5];
@@ -603,27 +603,27 @@ void sub_80A8A80(u8 taskId)
         spriteId = GetAnimBankSpriteId(gBattleAnimArgs[0]);
         break;
     case 2:
-        if (!IsAnimBankSpriteVisible(gBattleAnimBankAttacker ^ 2))
+        if (!IsAnimBankSpriteVisible(gAnimBankAttacker ^ 2))
         {
             DestroyAnimVisualTask(taskId);
             return;
         }
-        spriteId = gObjectBankIDs[gBattleAnimBankAttacker ^ 2];
+        spriteId = gObjectBankIDs[gAnimBankAttacker ^ 2];
         break;
     case 3:
-        if (!IsAnimBankSpriteVisible(gBattleAnimBankTarget ^ 2))
+        if (!IsAnimBankSpriteVisible(gAnimBankTarget ^ 2))
         {
             DestroyAnimVisualTask(taskId);
             return;
         }
-        spriteId = gObjectBankIDs[gBattleAnimBankTarget ^ 2];
+        spriteId = gObjectBankIDs[gAnimBankTarget ^ 2];
         break;
     default:
         DestroyAnimVisualTask(taskId);
         return;
     }
     TASK.data[0] = spriteId;
-    if (GetBankSide(gBattleAnimBankTarget))
+    if (GetBankSide(gAnimBankTarget))
     {
         TASK.data[1] = gBattleAnimArgs[1];
     }
@@ -648,7 +648,7 @@ static void sub_80A8B3C(u8 taskId)
 void sub_80A8B88(u8 taskId)
 {
     u8 spriteId;
-    if (GetBankSide(gBattleAnimBankAttacker))
+    if (GetBankSide(gAnimBankAttacker))
     {
         gBattleAnimArgs[1] = -gBattleAnimArgs[1];
     }
@@ -660,11 +660,11 @@ void sub_80A8B88(u8 taskId)
     TASK.data[4] = spriteId;
     if (gBattleAnimArgs[4] == 0)
     {
-        TASK.data[5] = gBattleAnimBankAttacker;
+        TASK.data[5] = gAnimBankAttacker;
     }
     else
     {
-        TASK.data[5] = gBattleAnimBankTarget;
+        TASK.data[5] = gAnimBankTarget;
     }
     TASK.data[12] = 1;
     TASK.func = sub_80A8C0C;
@@ -769,7 +769,7 @@ void sub_80A8E04(u8 taskId)
     TASK.data[4] = gBattleAnimArgs[1];
     TASK.data[5] = spriteId;
     TASK.data[6] = gBattleAnimArgs[3];
-    if (NotInBattle())
+    if (IsContest())
     {
         TASK.data[7] = 1;
     }
@@ -777,16 +777,16 @@ void sub_80A8E04(u8 taskId)
     {
         if (gBattleAnimArgs[2] == 0)
         {
-            TASK.data[7] = !GetBankSide(gBattleAnimBankAttacker);
+            TASK.data[7] = !GetBankSide(gAnimBankAttacker);
         }
         else
         {
-            TASK.data[7] = !GetBankSide(gBattleAnimBankTarget);
+            TASK.data[7] = !GetBankSide(gAnimBankTarget);
         }
     }
     if (TASK.data[7])
     {
-        if (!NotInBattle())
+        if (!IsContest())
         {
             TASK.data[3] *= -1;
             TASK.data[4] *= -1;
@@ -804,14 +804,14 @@ void sub_80A8EFC(u8 taskId)
     TASK.data[2] = gBattleAnimArgs[0];
     if (gBattleAnimArgs[2] == 0)
     {
-        if (GetBankSide(gBattleAnimBankAttacker))
+        if (GetBankSide(gAnimBankAttacker))
         {
             gBattleAnimArgs[1] = -gBattleAnimArgs[1];
         }
     }
     else
     {
-        if (GetBankSide(gBattleAnimBankTarget))
+        if (GetBankSide(gAnimBankTarget))
         {
             gBattleAnimArgs[1] = -gBattleAnimArgs[1];
         }
@@ -864,7 +864,7 @@ void sub_80A9058(u8 taskId)
 {
     if (!gBattleAnimArgs[0])
     {
-        TASK.data[15] = gMovePowerMoveAnim / 12;
+        TASK.data[15] = gAnimMovePower / 12;
         if (TASK.data[15] < 1)
         {
             TASK.data[15] = 1;
@@ -876,7 +876,7 @@ void sub_80A9058(u8 taskId)
     }
     else
     {
-        TASK.data[15] = gMoveDmgMoveAnim / 12;
+        TASK.data[15] = gAnimMoveDmg / 12;
         if (TASK.data[15] < 1)
         {
             TASK.data[15] = 1;
diff --git a/src/battle/battle_controller_linkopponent.c b/src/battle/battle_controller_linkopponent.c
index 3259fc7ee..a80a07b9f 100644
--- a/src/battle/battle_controller_linkopponent.c
+++ b/src/battle/battle_controller_linkopponent.c
@@ -33,9 +33,9 @@ extern u16 gBattleTypeFlags;
 extern u8 gBattleMonForms[];
 extern void (*gBattleBankFunc[])(void);
 extern u32 *gDisableStructMoveAnim;
-extern u32 gMoveDmgMoveAnim;
-extern u16 gMovePowerMoveAnim;
-extern u8 gHappinessMoveAnim;
+extern u32 gAnimMoveDmg;
+extern u16 gAnimMovePower;
+extern u8 gAnimFriendship;
 extern u16 gWeatherMoveAnim;
 extern u32 gPID_perBank[];
 extern u8 gAnimScriptActive;
@@ -46,7 +46,7 @@ extern u8 gBattleOutcome;
 extern u16 gUnknown_02024DE8;
 extern u8 gUnknown_02024E68[];
 extern struct SpriteTemplate gUnknown_02024E8C;
-extern u8 gUnknown_0202F7C4;
+extern u8 gAnimMoveTurn;
 extern struct Window gUnknown_03004210;
 extern u16 gUnknown_030042A0;
 extern u16 gUnknown_030042A4;
@@ -79,7 +79,7 @@ extern void sub_8010384(struct Sprite *);
 extern void sub_8037B78(void);
 extern u8 sub_8031720();
 extern bool8 mplay_80342A4(u8);
-extern void ExecuteMoveAnim();
+extern void DoMoveAnim();
 extern void sub_80326EC();
 extern void sub_8031F24(void);
 extern void sub_80324BC();
@@ -100,7 +100,7 @@ extern void nullsub_47(void);
 extern bool8 IsDoubleBattle(void);
 extern void sub_8037840(void);
 extern void sub_8031B74();
-extern u8 AnimBankSpriteExists();
+extern u8 IsBankSpritePresent();
 extern u8 move_anim_start_t3();
 extern void sub_8037FD8(void);
 extern void sub_8037F34(void);
@@ -1157,7 +1157,7 @@ void LinkOpponentHandleLoadPokeSprite(void)
     GetMonSpriteTemplate_803C56C(species, GetBankIdentity(gActiveBank));
     gObjectBankIDs[gActiveBank] = CreateSprite(
       &gUnknown_02024E8C,
-      sub_8077ABC(gActiveBank, 2),
+      GetBankPosition(gActiveBank, 2),
       sub_8077F68(gActiveBank),
       sub_8079E90(gActiveBank));
     gSprites[gObjectBankIDs[gActiveBank]].pos2.x = -240;
@@ -1187,7 +1187,7 @@ void sub_8039430(u8 a, u8 b)
     GetMonSpriteTemplate_803C56C(species, GetBankIdentity(a));
     gObjectBankIDs[a] = CreateSprite(
       &gUnknown_02024E8C,
-      sub_8077ABC(a, 2),
+      GetBankPosition(a, 2),
       sub_8077F68(a),
       sub_8079E90(a));
     gSprites[gUnknown_0300434C[a]].data[1] = gObjectBankIDs[a];
@@ -1331,21 +1331,21 @@ void LinkOpponentHandleMoveAnimation(void)
         u32 r0 = gBattleBufferA[gActiveBank][1]
                | (gBattleBufferA[gActiveBank][2] << 8);
 
-        gUnknown_0202F7C4 = gBattleBufferA[gActiveBank][3];
-        gMovePowerMoveAnim = gBattleBufferA[gActiveBank][4]
+        gAnimMoveTurn = gBattleBufferA[gActiveBank][3];
+        gAnimMovePower = gBattleBufferA[gActiveBank][4]
                           | (gBattleBufferA[gActiveBank][5] << 8);
-        gMoveDmgMoveAnim = gBattleBufferA[gActiveBank][6]
+        gAnimMoveDmg = gBattleBufferA[gActiveBank][6]
                           | (gBattleBufferA[gActiveBank][7] << 8)
                           | (gBattleBufferA[gActiveBank][8] << 16)
                           | (gBattleBufferA[gActiveBank][9] << 24);
-        gHappinessMoveAnim = gBattleBufferA[gActiveBank][10];
+        gAnimFriendship = gBattleBufferA[gActiveBank][10];
         gWeatherMoveAnim = gBattleBufferA[gActiveBank][12]
                           | (gBattleBufferA[gActiveBank][13] << 8);
         gDisableStructMoveAnim = (u32 *)&gBattleBufferA[gActiveBank][16];
         gPID_perBank[gActiveBank] = *gDisableStructMoveAnim;
 
         // Dead code. sub_8031720 always returns 0.
-        if (sub_8031720(r0, gUnknown_0202F7C4) != 0)
+        if (sub_8031720(r0, gAnimMoveTurn) != 0)
         {
             LinkOpponentBufferExecCompleted();
         }
@@ -1377,7 +1377,7 @@ void sub_8039B64(void)
         if (!ewram17810[gActiveBank].unk0_6)
         {
             sub_80326EC(0);
-            ExecuteMoveAnim(r4);
+            DoMoveAnim(r4);
             ewram17810[gActiveBank].unk4 = 2;
         }
         break;
@@ -1731,7 +1731,7 @@ void LinkOpponentHandlecmd50(void)
 
 void LinkOpponentHandleSpriteInvisibility(void)
 {
-    if (AnimBankSpriteExists(gActiveBank) != 0)
+    if (IsBankSpritePresent(gActiveBank) != 0)
     {
         gSprites[gObjectBankIDs[gActiveBank]].invisible = gBattleBufferA[gActiveBank][1];
         sub_8031F88(gActiveBank);
diff --git a/src/battle/battle_controller_linkpartner.c b/src/battle/battle_controller_linkpartner.c
index fc3fde661..6e63333d4 100644
--- a/src/battle/battle_controller_linkpartner.c
+++ b/src/battle/battle_controller_linkpartner.c
@@ -50,11 +50,11 @@ extern u8 gDoingBattleAnim;
 extern u32 gPID_perBank[];
 extern struct SpriteTemplate gUnknown_02024E8C;
 extern u32 *gDisableStructMoveAnim;
-extern u32 gMoveDmgMoveAnim;
-extern u16 gMovePowerMoveAnim;
-extern u8 gHappinessMoveAnim;
+extern u32 gAnimMoveDmg;
+extern u16 gAnimMovePower;
+extern u8 gAnimFriendship;
 extern u16 gWeatherMoveAnim;
-extern u8 gUnknown_0202F7C4;
+extern u8 gAnimMoveTurn;
 extern struct Window gUnknown_03004210;
 extern u16 gUnknown_030042A0;
 extern u16 gUnknown_030042A4;
@@ -67,7 +67,7 @@ extern u8 gAnimScriptActive;
 extern void (*gAnimScriptCallback)(void);
 
 extern u8 move_anim_start_t3();
-extern u8 AnimBankSpriteExists();
+extern u8 IsBankSpritePresent();
 extern void sub_8044CA0(u8);
 extern void sub_8030E38(struct Sprite *);
 extern void sub_80E43C0();
@@ -78,7 +78,7 @@ extern void sub_8043D84();
 extern void BufferStringBattle();
 extern void sub_8031F24(void);
 extern void sub_80326EC();
-extern void ExecuteMoveAnim();
+extern void DoMoveAnim();
 extern void sub_80324BC();
 extern u8 sub_8031720();
 extern u8 mplay_80342A4();
@@ -93,7 +93,7 @@ extern u8 sub_8046400();
 extern void sub_80312F0(struct Sprite *);
 extern u8 CreateInvisibleSpriteWithCallback();
 extern void BattleLoadPlayerMonSprite();
-extern u8 sub_8077ABC();
+extern u8 GetBankPosition();
 extern u8 sub_8077F68();
 extern u8 sub_8079E90();
 extern void nullsub_10();
@@ -1114,7 +1114,7 @@ void LinkPartnerHandleLoadPokeSprite(void)
       GetBankIdentity(gActiveBank));
     gObjectBankIDs[gActiveBank] = CreateSprite(
       &gUnknown_02024E8C,
-      sub_8077ABC(gActiveBank, 2),
+      GetBankPosition(gActiveBank, 2),
       sub_8077F68(gActiveBank),
       sub_8079E90(gActiveBank));
     gSprites[gObjectBankIDs[gActiveBank]].pos2.x = -240;
@@ -1144,7 +1144,7 @@ void sub_811F864(u8 a, u8 b)
     GetMonSpriteTemplate_803C56C(species, GetBankIdentity(a));
     gObjectBankIDs[a] = CreateSprite(
       &gUnknown_02024E8C,
-      sub_8077ABC(a, 2),
+      GetBankPosition(a, 2),
       sub_8077F68(a),
       sub_8079E90(a));
     gSprites[gUnknown_0300434C[a]].data[1] = gObjectBankIDs[a];
@@ -1287,20 +1287,20 @@ void LinkPartnerHandleMoveAnimation(void)
         u32 r0 = gBattleBufferA[gActiveBank][1]
                | (gBattleBufferA[gActiveBank][2] << 8);
 
-        gUnknown_0202F7C4 = gBattleBufferA[gActiveBank][3];
-        gMovePowerMoveAnim = gBattleBufferA[gActiveBank][4]
+        gAnimMoveTurn = gBattleBufferA[gActiveBank][3];
+        gAnimMovePower = gBattleBufferA[gActiveBank][4]
                           | (gBattleBufferA[gActiveBank][5] << 8);
-        gMoveDmgMoveAnim = gBattleBufferA[gActiveBank][6]
+        gAnimMoveDmg = gBattleBufferA[gActiveBank][6]
                           | (gBattleBufferA[gActiveBank][7] << 8)
                           | (gBattleBufferA[gActiveBank][8] << 16)
                           | (gBattleBufferA[gActiveBank][9] << 24);
-        gHappinessMoveAnim = gBattleBufferA[gActiveBank][10];
+        gAnimFriendship = gBattleBufferA[gActiveBank][10];
         gWeatherMoveAnim = gBattleBufferA[gActiveBank][12]
                           | (gBattleBufferA[gActiveBank][13] << 8);
         gDisableStructMoveAnim = (u32 *)&gBattleBufferA[gActiveBank][16];
         gPID_perBank[gActiveBank] = *gDisableStructMoveAnim;
 
-        if (sub_8031720(r0, gUnknown_0202F7C4) != 0)
+        if (sub_8031720(r0, gAnimMoveTurn) != 0)
             LinkPartnerBufferExecCompleted();
         else
         {
@@ -1330,7 +1330,7 @@ void sub_811FF30(void)
         if (!ewram17810[gActiveBank].unk0_6)
         {
             sub_80326EC(0);
-            ExecuteMoveAnim(r4);
+            DoMoveAnim(r4);
             ewram17810[gActiveBank].unk4 = 2;
         }
         break;
@@ -1679,7 +1679,7 @@ void LinkPartnerHandlecmd50(void)
 
 void LinkPartnerHandleSpriteInvisibility(void)
 {
-    if (AnimBankSpriteExists(gActiveBank) != 0)
+    if (IsBankSpritePresent(gActiveBank) != 0)
     {
         gSprites[gObjectBankIDs[gActiveBank]].invisible = gBattleBufferA[gActiveBank][1];
         sub_8031F88(gActiveBank);
diff --git a/src/battle/battle_controller_opponent.c b/src/battle/battle_controller_opponent.c
index a35687796..7b693a06f 100644
--- a/src/battle/battle_controller_opponent.c
+++ b/src/battle/battle_controller_opponent.c
@@ -41,12 +41,12 @@ extern u8 gHealthboxIDs[];
 extern u16 gBattleTypeFlags;
 extern u16 gTrainerBattleOpponent;
 extern u32 *gDisableStructMoveAnim;
-extern u32 gMoveDmgMoveAnim;
-extern u16 gMovePowerMoveAnim;
-extern u8 gHappinessMoveAnim;
+extern u32 gAnimMoveDmg;
+extern u16 gAnimMovePower;
+extern u8 gAnimFriendship;
 extern u16 gWeatherMoveAnim;
 extern u32 gPID_perBank[];
-extern u8 gUnknown_0202F7C4;
+extern u8 gAnimMoveTurn;
 extern u8 gAnimScriptActive;
 extern void (*gAnimScriptCallback)(void);
 extern struct Window gUnknown_03004210;
@@ -65,7 +65,7 @@ extern struct MusicPlayerInfo gMPlay_SE2;
 extern struct MusicPlayerInfo gMPlay_BGM;
 extern u32 gBattleExecBuffer;
 
-extern u8 sub_8077ABC();
+extern u8 GetBankPosition();
 extern u8 sub_8077F68();
 extern u8 sub_8079E90();
 extern void sub_8033018(void);
@@ -91,7 +91,7 @@ extern void sub_803311C(void);
 extern void sub_8010384(struct Sprite *);
 extern bool8 mplay_80342A4(u8);
 extern u8 sub_8031720();
-extern void ExecuteMoveAnim();
+extern void DoMoveAnim();
 extern void sub_80326EC();
 extern void sub_8031F24(void);
 extern void sub_80324BC();
@@ -114,7 +114,7 @@ extern void nullsub_45(void);
 extern void sub_8031B74();
 extern bool8 IsDoubleBattle(void);
 extern void sub_8032E2C(void);
-extern u8 AnimBankSpriteExists();
+extern u8 IsBankSpritePresent();
 extern u8 move_anim_start_t3();
 extern void sub_80334C0(void);
 
@@ -1127,7 +1127,7 @@ void OpponentHandleLoadPokeSprite(void)
     GetMonSpriteTemplate_803C56C(species, GetBankIdentity(gActiveBank));
     gObjectBankIDs[gActiveBank] = CreateSprite(
       &gUnknown_02024E8C,
-      sub_8077ABC(gActiveBank, 2),
+      GetBankPosition(gActiveBank, 2),
       sub_8077F68(gActiveBank),
       sub_8079E90(gActiveBank));
     gSprites[gObjectBankIDs[gActiveBank]].pos2.x = -240;
@@ -1159,7 +1159,7 @@ void sub_803495C(u8 a, u8 b)
     GetMonSpriteTemplate_803C56C(species, GetBankIdentity(a));
     gObjectBankIDs[a] = CreateSprite(
       &gUnknown_02024E8C,
-      sub_8077ABC(a, 2),
+      GetBankPosition(a, 2),
       sub_8077F68(a),
       sub_8079E90(a));
     gSprites[gObjectBankIDs[a]].data[0] = a;
@@ -1325,21 +1325,21 @@ void OpponentHandleMoveAnimation(void)
         u32 r0 = gBattleBufferA[gActiveBank][1]
                | (gBattleBufferA[gActiveBank][2] << 8);
 
-        gUnknown_0202F7C4 = gBattleBufferA[gActiveBank][3];
-        gMovePowerMoveAnim = gBattleBufferA[gActiveBank][4]
+        gAnimMoveTurn = gBattleBufferA[gActiveBank][3];
+        gAnimMovePower = gBattleBufferA[gActiveBank][4]
                           | (gBattleBufferA[gActiveBank][5] << 8);
-        gMoveDmgMoveAnim = gBattleBufferA[gActiveBank][6]
+        gAnimMoveDmg = gBattleBufferA[gActiveBank][6]
                           | (gBattleBufferA[gActiveBank][7] << 8)
                           | (gBattleBufferA[gActiveBank][8] << 16)
                           | (gBattleBufferA[gActiveBank][9] << 24);
-        gHappinessMoveAnim = gBattleBufferA[gActiveBank][10];
+        gAnimFriendship = gBattleBufferA[gActiveBank][10];
         gWeatherMoveAnim = gBattleBufferA[gActiveBank][12]
                           | (gBattleBufferA[gActiveBank][13] << 8);
         gDisableStructMoveAnim = (u32 *)&gBattleBufferA[gActiveBank][16];
         gPID_perBank[gActiveBank] = *gDisableStructMoveAnim;
 
         // Dead code. sub_8031720 always returns 0.
-        if (sub_8031720(r0, gUnknown_0202F7C4) != 0)
+        if (sub_8031720(r0, gAnimMoveTurn) != 0)
         {
             OpponentBufferExecCompleted();
         }
@@ -1371,7 +1371,7 @@ void sub_8035238(void)
         if (!ewram17810[gActiveBank].unk0_6)
         {
             sub_80326EC(0);
-            ExecuteMoveAnim(r4);
+            DoMoveAnim(r4);
             ewram17810[gActiveBank].unk4 = 2;
         }
         break;
@@ -2003,7 +2003,7 @@ void OpponentHandlecmd50(void)
 
 void OpponentHandleSpriteInvisibility(void)
 {
-    if (AnimBankSpriteExists(gActiveBank) != 0)
+    if (IsBankSpritePresent(gActiveBank) != 0)
     {
         gSprites[gObjectBankIDs[gActiveBank]].invisible = gBattleBufferA[gActiveBank][1];
         sub_8031F88(gActiveBank);
diff --git a/src/battle/battle_controller_player.c b/src/battle/battle_controller_player.c
index c2d34db0d..cdf8b4c37 100644
--- a/src/battle/battle_controller_player.c
+++ b/src/battle/battle_controller_player.c
@@ -56,9 +56,9 @@ extern u16 gBattleTypeFlags;
 extern u8 gBattleOutcome;
 extern void (*gAnimScriptCallback)(void);
 extern bool8 gAnimScriptActive;
-extern u16 gMovePowerMoveAnim;
-extern u32 gMoveDmgMoveAnim;
-extern u8 gHappinessMoveAnim;
+extern u16 gAnimMovePower;
+extern u32 gAnimMoveDmg;
+extern u8 gAnimFriendship;
 extern u16 gWeatherMoveAnim;
 extern u32 *gDisableStructMoveAnim;
 extern u32 gPID_perBank[];
@@ -66,15 +66,15 @@ extern u8 gBattleMonForms[];
 extern u16 gUnknown_02024DE8;
 extern u8 gUnknown_02024E68[];
 extern struct SpriteTemplate gUnknown_02024E8C;
-extern u8 gUnknown_0202F7C4;
+extern u8 gAnimMoveTurn;
 extern u8 gUnknown_02038470[];
 extern u16 gUnknown_030041B0;
-extern u16 gUnknown_030041B4;
+extern u16 gBattle_BG1_Y;
 extern u16 gUnknown_030041B8;
-extern u16 gUnknown_03004280;
-extern u16 gUnknown_03004288;
+extern u16 gBattle_BG2_Y;
+extern u16 gBattle_BG2_X;
 extern u16 gUnknown_030042A4;
-extern u16 gUnknown_030042C0;
+extern u16 gBattle_BG1_X;
 extern u8 gUnknown_03004344;
 extern u8 gUnknown_0300434C[];
 
@@ -106,7 +106,7 @@ extern void StoreSpriteCallbackInData();
 extern void BattleLoadPlayerMonSprite();
 extern bool8 IsDoubleBattle(void);
 extern void sub_802D500(void);
-extern bool8 AnimBankSpriteExists(u8);
+extern bool8 IsBankSpritePresent(u8);
 extern bool8 move_anim_start_t3();
 extern void sub_802E460(void);
 extern void b_link_standby_message(void);
@@ -114,7 +114,7 @@ extern void sub_802D18C(void);
 extern void sub_802DF18(void);
 extern void BufferStringBattle();
 extern void sub_80326EC();
-extern void ExecuteMoveAnim();
+extern void DoMoveAnim();
 extern void sub_8031F24(void);
 extern void sub_80324BC();
 extern u8 sub_8031720();
@@ -131,7 +131,7 @@ extern void sub_802D204(void);
 extern u8 sub_8079E90();
 extern void sub_802DEAC(void);
 extern void sub_80312F0(struct Sprite *);
-extern u8 sub_8077ABC();
+extern u8 GetBankPosition();
 extern u8 sub_8077F68();
 extern u8 sub_8046400();
 extern void sub_802D798(void);
@@ -2321,7 +2321,7 @@ void sub_802F934(u8 bank, u8 b)
     GetMonSpriteTemplate_803C56C(species, GetBankIdentity(bank));
     gObjectBankIDs[bank] = CreateSprite(
       &gUnknown_02024E8C,
-      sub_8077ABC(bank, 2),
+      GetBankPosition(bank, 2),
       sub_8077F68(bank),
       sub_8079E90(bank));
     gSprites[gUnknown_0300434C[bank]].data[1] = gObjectBankIDs[bank];
@@ -2490,14 +2490,14 @@ void PlayerHandleMoveAnimation(void)
     {
         u16 r0 = gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8);
 
-        gUnknown_0202F7C4 = gBattleBufferA[gActiveBank][3];
-        gMovePowerMoveAnim = gBattleBufferA[gActiveBank][4] | (gBattleBufferA[gActiveBank][5] << 8);
-        gMoveDmgMoveAnim = gBattleBufferA[gActiveBank][6] | (gBattleBufferA[gActiveBank][7] << 8) | (gBattleBufferA[gActiveBank][8] << 16) | (gBattleBufferA[gActiveBank][9] << 24);
-        gHappinessMoveAnim = gBattleBufferA[gActiveBank][10];
+        gAnimMoveTurn = gBattleBufferA[gActiveBank][3];
+        gAnimMovePower = gBattleBufferA[gActiveBank][4] | (gBattleBufferA[gActiveBank][5] << 8);
+        gAnimMoveDmg = gBattleBufferA[gActiveBank][6] | (gBattleBufferA[gActiveBank][7] << 8) | (gBattleBufferA[gActiveBank][8] << 16) | (gBattleBufferA[gActiveBank][9] << 24);
+        gAnimFriendship = gBattleBufferA[gActiveBank][10];
         gWeatherMoveAnim = gBattleBufferA[gActiveBank][12] | (gBattleBufferA[gActiveBank][13] << 8);
         gDisableStructMoveAnim = (u32 *)&gBattleBufferA[gActiveBank][16];
         gPID_perBank[gActiveBank] = *gDisableStructMoveAnim;
-        if (sub_8031720(r0, gUnknown_0202F7C4) != 0)
+        if (sub_8031720(r0, gAnimMoveTurn) != 0)
         {
             // Dead code. sub_8031720 always returns 0.
             PlayerBufferExecCompleted();
@@ -2529,7 +2529,7 @@ void sub_8030190(void)
         if (ewram17810[gActiveBank].unk0_6 == 0)
         {
             sub_80326EC(0);
-            ExecuteMoveAnim(r4);
+            DoMoveAnim(r4);
             ewram17810[gActiveBank].unk4 = 2;
         }
         break;
@@ -2990,7 +2990,7 @@ void PlayerHandlecmd50(void)
 
 void PlayerHandleSpriteInvisibility(void)
 {
-    if (AnimBankSpriteExists(gActiveBank))
+    if (IsBankSpritePresent(gActiveBank))
     {
         gSprites[gObjectBankIDs[gActiveBank]].invisible = gBattleBufferA[gActiveBank][1];
         sub_8031F88(gActiveBank);
diff --git a/src/battle/battle_controller_wally.c b/src/battle/battle_controller_wally.c
index d81c43381..e3a45825a 100644
--- a/src/battle/battle_controller_wally.c
+++ b/src/battle/battle_controller_wally.c
@@ -37,9 +37,9 @@ extern bool8 gDoingBattleAnim;
 extern u16 gBattlePartyID[];
 extern u8 gHealthboxIDs[];
 extern u16 gBattleTypeFlags;
-extern u16 gMovePowerMoveAnim;
-extern u32 gMoveDmgMoveAnim;
-extern u8 gHappinessMoveAnim;
+extern u16 gAnimMovePower;
+extern u32 gAnimMoveDmg;
+extern u8 gAnimFriendship;
 extern u16 gWeatherMoveAnim;
 extern u32 *gDisableStructMoveAnim;
 extern u32 gPID_perBank[];
@@ -52,7 +52,7 @@ extern u8 gBattleOutcome;
 extern u16 gUnknown_02024DE8;
 extern u8 gUnknown_02024E68[];
 extern struct SpriteTemplate gUnknown_02024E8C;
-extern u8 gUnknown_0202F7C4;
+extern u8 gAnimMoveTurn;
 extern struct Window gUnknown_03004210;
 extern u16 gUnknown_030042A0;
 extern u16 gUnknown_030042A4;
@@ -78,7 +78,7 @@ extern u8 GetBankIdentity(u8);
 extern void sub_80313A0(struct Sprite *);
 extern u8 GetBankByPlayerAI(u8);
 extern u8 sub_8031720();
-extern void ExecuteMoveAnim();
+extern void DoMoveAnim();
 extern void sub_80326EC();
 extern void sub_8031F24(void);
 extern void sub_80324BC();
@@ -92,7 +92,7 @@ extern void sub_8078B34(struct Sprite *);
 extern void sub_8030E38(struct Sprite *);
 extern void StoreSpriteCallbackInData();
 extern u8 sub_8046400();
-extern u8 sub_8077ABC();
+extern u8 GetBankPosition();
 extern u8 sub_8077F68();
 extern u8 sub_8079E90();
 extern void sub_80312F0(struct Sprite *);
@@ -1173,14 +1173,14 @@ void WallyHandleMoveAnimation(void)
 {
     u16 r0 = gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8);
 
-    gUnknown_0202F7C4 = gBattleBufferA[gActiveBank][3];
-    gMovePowerMoveAnim = gBattleBufferA[gActiveBank][4] | (gBattleBufferA[gActiveBank][5] << 8);
-    gMoveDmgMoveAnim = gBattleBufferA[gActiveBank][6] | (gBattleBufferA[gActiveBank][7] << 8) | (gBattleBufferA[gActiveBank][8] << 16) | (gBattleBufferA[gActiveBank][9] << 24);
-    gHappinessMoveAnim = gBattleBufferA[gActiveBank][10];
+    gAnimMoveTurn = gBattleBufferA[gActiveBank][3];
+    gAnimMovePower = gBattleBufferA[gActiveBank][4] | (gBattleBufferA[gActiveBank][5] << 8);
+    gAnimMoveDmg = gBattleBufferA[gActiveBank][6] | (gBattleBufferA[gActiveBank][7] << 8) | (gBattleBufferA[gActiveBank][8] << 16) | (gBattleBufferA[gActiveBank][9] << 24);
+    gAnimFriendship = gBattleBufferA[gActiveBank][10];
     gWeatherMoveAnim = gBattleBufferA[gActiveBank][12] | (gBattleBufferA[gActiveBank][13] << 8);
     gDisableStructMoveAnim = (u32 *)&gBattleBufferA[gActiveBank][16];
     gPID_perBank[gActiveBank] = *gDisableStructMoveAnim;
-    if (sub_8031720(r0, gUnknown_0202F7C4) != 0)
+    if (sub_8031720(r0, gAnimMoveTurn) != 0)
     {
         // Dead code. sub_8031720 always returns 0.
         WallyBufferExecCompleted();
@@ -1211,7 +1211,7 @@ void sub_81390D0(void)
         if (ewram17810[gActiveBank].unk0_6 == 0)
         {
             sub_80326EC(0);
-            ExecuteMoveAnim(r4);
+            DoMoveAnim(r4);
             ewram17810[gActiveBank].unk4 = 2;
         }
         break;
@@ -1511,7 +1511,7 @@ void sub_81398BC(u8 bank)
     GetMonSpriteTemplate_803C56C(species, GetBankIdentity(bank));
     gObjectBankIDs[bank] = CreateSprite(
       &gUnknown_02024E8C,
-      sub_8077ABC(bank, 2),
+      GetBankPosition(bank, 2),
       sub_8077F68(bank),
       sub_8079E90(bank));
     gSprites[gUnknown_0300434C[bank]].data[1] = gObjectBankIDs[bank];
diff --git a/src/battle/battle_interface.c b/src/battle/battle_interface.c
index ea393277e..97568d254 100644
--- a/src/battle/battle_interface.c
+++ b/src/battle/battle_interface.c
@@ -583,7 +583,7 @@ void nullsub_11()
 {
 }
 
-void sub_8043EB4(u8 priority)
+void UpdateOamPriorityInAllHealthboxes(u8 priority)
 {
     s32 i;
 
diff --git a/src/battle/pokeball.c b/src/battle/pokeball.c
index 12fd5e5d9..bcaaebcda 100644
--- a/src/battle/pokeball.c
+++ b/src/battle/pokeball.c
@@ -376,8 +376,8 @@ static void sub_8046464(u8 taskId)
         gSprites[spriteId].callback = sub_8047074;
         break;
     case 0xFE:
-        gSprites[spriteId].pos1.x = sub_8077ABC(r5, 0);
-        gSprites[spriteId].pos1.y = sub_8077ABC(r5, 1) + 24;
+        gSprites[spriteId].pos1.x = GetBankPosition(r5, 0);
+        gSprites[spriteId].pos1.y = GetBankPosition(r5, 1) + 24;
         gBankTarget = r5;
         gSprites[spriteId].data[0] = 0;
         gSprites[spriteId].callback = sub_8047254;
@@ -394,8 +394,8 @@ static void sub_8046464(u8 taskId)
         return;
     }
     gSprites[spriteId].data[0] = 0x22;
-    gSprites[spriteId].data[2] = sub_8077ABC(gBankTarget, 0);
-    gSprites[spriteId].data[4] = sub_8077ABC(gBankTarget, 1) - 16;
+    gSprites[spriteId].data[2] = GetBankPosition(gBankTarget, 0);
+    gSprites[spriteId].data[4] = GetBankPosition(gBankTarget, 1) - 16;
     gSprites[spriteId].data[5] = -40;
     sub_80786EC(&gSprites[spriteId]);
     gSprites[spriteId].oam.affineParam = taskId;
@@ -830,8 +830,8 @@ static void sub_8046FBC(struct Sprite *sprite)
 static void sub_8047074(struct Sprite *sprite)
 {
     sprite->data[0] = 25;
-    sprite->data[2] = sub_8077ABC(sprite->data[6], 2);
-    sprite->data[4] = sub_8077ABC(sprite->data[6], 3) + 24;
+    sprite->data[2] = GetBankPosition(sprite->data[6], 2);
+    sprite->data[4] = GetBankPosition(sprite->data[6], 3) + 24;
     sprite->data[5] = -30;
     sprite->oam.affineParam = sprite->data[6];
     sub_80786EC(sprite);
diff --git a/src/battle/reshow_battle_screen.c b/src/battle/reshow_battle_screen.c
index 03b5660fe..49b0854cc 100644
--- a/src/battle/reshow_battle_screen.c
+++ b/src/battle/reshow_battle_screen.c
@@ -11,12 +11,12 @@
 
 extern struct SpriteTemplate gUnknown_02024E8C;
 extern struct Window gUnknown_03004210;
-extern u16 gUnknown_03004280;
-extern u16 gUnknown_03004288;
+extern u16 gBattle_BG2_Y;
+extern u16 gBattle_BG2_X;
 extern u16 gUnknown_030042A4;
-extern u16 gUnknown_030042C0;
+extern u16 gBattle_BG1_X;
 extern u16 gUnknown_030041B0;
-extern u16 gUnknown_030041B4;
+extern u16 gBattle_BG1_Y;
 extern u16 gUnknown_030041B8;
 extern u16 gUnknown_030042A0;
 extern u8 gReservedSpritePaletteCount;
@@ -83,10 +83,10 @@ static void CB2_ReshowBattleScreenAfterMenu(void)
         InitWindowFromConfig(&gUnknown_03004210, &gWindowConfig_81E6C58);
         gUnknown_030042A4 = 0;
         gUnknown_030042A0 = 0;
-        gUnknown_030042C0 = 0;
-        gUnknown_030041B4 = 0;
-        gUnknown_03004288 = 0;
-        gUnknown_03004280 = 0;
+        gBattle_BG1_X = 0;
+        gBattle_BG1_Y = 0;
+        gBattle_BG2_X = 0;
+        gBattle_BG2_Y = 0;
         gUnknown_030041B0 = 0;
         gUnknown_030041B8 = 0;
         break;
@@ -243,7 +243,7 @@ static void sub_807B184(u8 bank)
             if (GetMonData(&gEnemyParty[gBattlePartyID[bank]], MON_DATA_HP) == 0)
                 return;
             GetMonSpriteTemplate_803C56C(GetMonData(&gEnemyParty[gBattlePartyID[bank]], MON_DATA_SPECIES), GetBankIdentity(bank));
-            gObjectBankIDs[bank] = CreateSprite(&gUnknown_02024E8C, sub_8077ABC(bank, 2), posY, sub_8079E90(bank));
+            gObjectBankIDs[bank] = CreateSprite(&gUnknown_02024E8C, GetBankPosition(bank, 2), posY, sub_8079E90(bank));
             gSprites[gObjectBankIDs[bank]].oam.paletteNum = bank;
             gSprites[gObjectBankIDs[bank]].callback = SpriteCallbackDummy;
             gSprites[gObjectBankIDs[bank]].data[0] = bank;
@@ -275,7 +275,7 @@ static void sub_807B184(u8 bank)
             if (GetMonData(&gPlayerParty[gBattlePartyID[bank]], MON_DATA_HP) == 0)
                 return;
             GetMonSpriteTemplate_803C56C(GetMonData(&gPlayerParty[gBattlePartyID[bank]], MON_DATA_SPECIES), GetBankIdentity(bank));
-            gObjectBankIDs[bank] = CreateSprite(&gUnknown_02024E8C, sub_8077ABC(bank, 2), posY, sub_8079E90(bank));
+            gObjectBankIDs[bank] = CreateSprite(&gUnknown_02024E8C, GetBankPosition(bank, 2), posY, sub_8079E90(bank));
             gSprites[gObjectBankIDs[bank]].oam.paletteNum = bank;
             gSprites[gObjectBankIDs[bank]].callback = SpriteCallbackDummy;
             gSprites[gObjectBankIDs[bank]].data[0] = bank;
diff --git a/src/contest.c b/src/contest.c
index 3aa3c8f59..91fc91b78 100644
--- a/src/contest.c
+++ b/src/contest.c
@@ -217,18 +217,18 @@ extern u8 gObjectBankIDs[];
 extern u8 gIsLinkContest;
 extern u8 gContestPlayerMonIndex;
 extern u16 gUnknown_030041B0;
-extern s16 gUnknown_030041B4;
+extern s16 gBattle_BG1_Y;
 extern u16 gUnknown_030041B8;
-extern u16 gUnknown_03004200;
+extern u16 gBattle_WIN1H;
 extern struct Window gUnknown_03004210;
-extern u16 gUnknown_03004240;
-extern u16 gUnknown_03004244;
-extern u16 gUnknown_03004280;
-extern u16 gUnknown_03004288;
+extern u16 gBattle_WIN0V;
+extern u16 gBattle_WIN1V;
+extern u16 gBattle_BG2_Y;
+extern u16 gBattle_BG2_X;
 extern u16 gUnknown_030042A0;
 extern u16 gUnknown_030042A4;
-extern u16 gUnknown_030042C0;
-extern u16 gUnknown_030042C4;
+extern u16 gBattle_BG1_X;
+extern u16 gBattle_WIN0H;
 extern u32 gUnknown_03005D28;  // saved RNG value
 
 extern s16 gUnknown_02038680[];
@@ -364,7 +364,7 @@ void sub_80AE6E4(u8, u8);
 u8 CreateJudgeSprite(void);
 u8 sub_80AE8B4(void);
 u8 sub_80AE9FC(u16, u32, u32);
-bool8 sub_80AEB1C(u16);
+bool8 IsSpeciesNotUnown(u16);
 void sub_80AEB30(void);
 void sub_80AEBEC(u16);
 void sub_80AED58(void);
@@ -491,19 +491,19 @@ void ResetContestGpuRegs(void)
 
     gUnknown_030042A4 = 0;
     gUnknown_030042A0 = 0;
-    gUnknown_030042C0 = 0;
-    gUnknown_030041B4 = 0;
-    gUnknown_03004288 = 0;
-    gUnknown_03004280 = 0;
+    gBattle_BG1_X = 0;
+    gBattle_BG1_Y = 0;
+    gBattle_BG2_X = 0;
+    gBattle_BG2_Y = 0;
     gUnknown_030041B0 = 0;
     gUnknown_030041B8 = 0;
-    gUnknown_030042C4 = 0;
-    gUnknown_03004240 = 0;
-    gUnknown_03004200 = 0;
-    gUnknown_03004244 = 0;
+    gBattle_WIN0H = 0;
+    gBattle_WIN0V = 0;
+    gBattle_WIN1H = 0;
+    gBattle_WIN1V = 0;
 }
 
-void sub_80AB2AC(void)
+void LoadContestBgAfterMoveAnim(void)
 {
     s32 i;
 
@@ -603,8 +603,8 @@ void CB2_StartContest(void)
         break;
     case 3:
         sub_80B2184();
-        gUnknown_030042C0 = 0;
-        gUnknown_030041B4 = 0;
+        gBattle_BG1_X = 0;
+        gBattle_BG1_Y = 0;
         BeginFastPaletteFade(2);
         gPaletteFade.bufferTransferDisabled = FALSE;
         SetVBlankCallback(ContestVBlankCallback);
@@ -749,8 +749,8 @@ void sub_80AB9A0(u8 taskId)
         gTasks[taskId].data[0]++;
         break;
     case 1:
-        gUnknown_030041B4 += 7;
-        if (gUnknown_030041B4 <= 160)
+        gBattle_BG1_Y += 7;
+        if (gBattle_BG1_Y <= 160)
             break;
         gTasks[taskId].data[0]++;
         break;
@@ -787,16 +787,16 @@ void ContestVBlankCallback(void)
 {
     REG_BG0HOFS = gUnknown_030042A4;
     REG_BG0VOFS = gUnknown_030042A0;
-    REG_BG1HOFS = gUnknown_030042C0;
-    REG_BG1VOFS = gUnknown_030041B4;
-    REG_BG2HOFS = gUnknown_03004288;
-    REG_BG2VOFS = gUnknown_03004280;
+    REG_BG1HOFS = gBattle_BG1_X;
+    REG_BG1VOFS = gBattle_BG1_Y;
+    REG_BG2HOFS = gBattle_BG2_X;
+    REG_BG2VOFS = gBattle_BG2_Y;
     REG_BG3HOFS = gUnknown_030041B0;
     REG_BG3VOFS = gUnknown_030041B8;
-    REG_WIN0H = gUnknown_030042C4;
-    REG_WIN0V = gUnknown_03004240;
-    REG_WIN1H = gUnknown_03004200;
-    REG_WIN1V = gUnknown_03004244;
+    REG_WIN0H = gBattle_WIN0H;
+    REG_WIN0V = gBattle_WIN0V;
+    REG_WIN1H = gBattle_WIN1H;
+    REG_WIN1V = gBattle_WIN1V;
     TransferPlttBuffer();
     LoadOam();
     ProcessSpriteCopyRequests();
@@ -806,7 +806,7 @@ void ContestVBlankCallback(void)
 void sub_80ABB70(u8 taskId)
 {
     gUnknown_030042A0 = 0;
-    gUnknown_03004280 = 0;
+    gBattle_BG2_Y = 0;
     sub_80B0D7C();
     DmaCopy32Defvars(3, gPlttBufferUnfaded, shared18000.unk18204, 0x400);
     if (!Contest_IsMonsTurnDisabled(gContestPlayerMonIndex))
@@ -850,7 +850,7 @@ void sub_80ABCDC(u8 taskId)
     u8 sp8[32];
 
     gUnknown_030042A0 = 0xA0;
-    gUnknown_03004280 = 0xA0;
+    gBattle_BG2_Y = 0xA0;
     FillWindowRect_DefaultPalette(
       &gUnknown_03004210,
       0,
@@ -938,7 +938,7 @@ void sub_80ABEA0(u8 taskId)
             StringExpandPlaceholders(gStringVar4, gDisplayedStringBattle);
             sub_8003460(&gMenuWindow, gStringVar4, 776, 1, 15);
             gUnknown_030042A0 = 0;
-            gUnknown_03004280 = 0;
+            gBattle_BG2_Y = 0;
             gTasks[taskId].func = sub_80ABC70;
             break;
         case DPAD_LEFT:
@@ -1012,7 +1012,7 @@ void sub_80AC188(u8 taskId)
 {
     sub_80AF138();
     gUnknown_030042A0 = 0;
-    gUnknown_03004280 = 0;
+    gBattle_BG2_Y = 0;
     sub_80AFFE0(FALSE);
     DmaCopy32Defvars(3, gPlttBufferFaded, shared18000.unk18604, 0x400);
     LoadPalette(shared18000.unk18204, 0, 0x400);
@@ -1159,7 +1159,7 @@ void sub_80AC2CC(u8 taskId)
             sub_80B2790(sContest.unk19215);
             sub_80B28F0(sContest.unk19215);
             SelectContestMoveBankTarget(move);
-            ExecuteMoveAnim(move);
+            DoMoveAnim(move);
             gTasks[taskId].data[0] = 8;
         }
         return;
@@ -1970,7 +1970,7 @@ void sub_80ADDA4(u8 taskId)
     s32 i;
 
     gUnknown_030042A0 = 0;
-    gUnknown_03004280 = 0;
+    gBattle_BG2_Y = 0;
     for (i = 0; i < 4; i++)
         gUnknown_02038680[i] = sContestantStatus[i].unk4;
     sub_80AF668();
@@ -1988,8 +1988,8 @@ void sub_80ADE54(u8 taskId)
     if (sub_80037A0(&gMenuWindow) == 1)
     {
         sub_80B2184();
-        gUnknown_030042C0 = 0;
-        gUnknown_030041B4 = 160;
+        gBattle_BG1_X = 0;
+        gBattle_BG1_Y = 160;
         PlaySE12WithPanning(SE_C_MAKU_D, 0);
         gTasks[taskId].data[0] = 0;
         gTasks[taskId].func = sub_80ADEAC;
@@ -1998,10 +1998,10 @@ void sub_80ADE54(u8 taskId)
 
 void sub_80ADEAC(u8 taskId)
 {
-    gUnknown_030041B4 -= 7;
-    if (gUnknown_030041B4 < 0)
-        gUnknown_030041B4 = 0;
-    if (*(u16 *)&gUnknown_030041B4 == 0)  // Why cast?
+    gBattle_BG1_Y -= 7;
+    if (gBattle_BG1_Y < 0)
+        gBattle_BG1_Y = 0;
+    if (*(u16 *)&gBattle_BG1_Y == 0)  // Why cast?
     {
         gTasks[taskId].func = sub_80ADEEC;
         gTasks[taskId].data[0] = 0;
@@ -2491,7 +2491,7 @@ u8 sub_80AE9FC(u16 species, u32 otId, u32 personality)
     gSprites[spriteId].callback = SpriteCallbackDummy;
     gSprites[spriteId].data[0] = gSprites[spriteId].oam.paletteNum;
     gSprites[spriteId].data[2] = species;
-    if (sub_80AEB1C(species))
+    if (IsSpeciesNotUnown(species))
         gSprites[spriteId].affineAnims = gSpriteAffineAnimTable_81E7C18;
     else
         gSprites[spriteId].affineAnims = gSpriteAffineAnimTable_81E7BEC;
@@ -2499,7 +2499,7 @@ u8 sub_80AE9FC(u16 species, u32 otId, u32 personality)
     return spriteId;
 }
 
-bool8 sub_80AEB1C(u16 species)
+bool8 IsSpeciesNotUnown(u16 species)
 {
     if (species == SPECIES_UNOWN)
         return FALSE;
@@ -3116,7 +3116,7 @@ bool8 sub_80AF828(s32 a, s32 b, struct UnknownContestStruct6 *c)
 void sub_80AF860(void)
 {
     gUnknown_030042A0 = 0;
-    gUnknown_03004280 = 0;
+    gBattle_BG2_Y = 0;
     sub_80AF138();
     sub_8003460(&gMenuWindow, gUnknownText_LinkStandbyAndWinner, 776, 1, 15);
 }
@@ -5113,8 +5113,8 @@ void sub_80B2184(void)
     ((vBgCnt *)&REG_BG1CNT)->screenSize = 1;
     ((vBgCnt *)&REG_BG1CNT)->areaOverflowMode = 0;
 
-    gUnknown_030042C0 = DISPLAY_WIDTH;
-    gUnknown_030041B4 = DISPLAY_HEIGHT;
+    gBattle_BG1_X = DISPLAY_WIDTH;
+    gBattle_BG1_Y = DISPLAY_HEIGHT;
     REG_BG1HOFS = DISPLAY_WIDTH;
     REG_BG1VOFS = DISPLAY_HEIGHT;
 
@@ -5141,8 +5141,8 @@ void sub_80B2280(void)
     DmaClearLarge32(3, (void *)(VRAM + 0x8000), 0x2000, 0x1000);
     DmaClear32(3, (void *)(VRAM + 0xF000), 0x1000);
 
-    gUnknown_030042C0 = 0;
-    gUnknown_030041B4 = 0;
+    gBattle_BG1_X = 0;
+    gBattle_BG1_Y = 0;
 
     ((vBgCnt *)&REG_BG1CNT)->priority = 1;
     ((vBgCnt *)&REG_BG1CNT)->screenSize = 0;
@@ -5158,18 +5158,18 @@ void sub_80B2280(void)
 
 void sub_80B237C(u8 taskId)
 {
-    gUnknown_030042C0 = 0;
-    gUnknown_030041B4 = DISPLAY_HEIGHT;
+    gBattle_BG1_X = 0;
+    gBattle_BG1_Y = DISPLAY_HEIGHT;
     PlaySE12WithPanning(SE_C_MAKU_D, 0);
     gTasks[taskId].func = sub_80B23BC;
 }
 
 void sub_80B23BC(u8 taskId)
 {
-    gUnknown_030041B4 -= 7;
-    if (gUnknown_030041B4 < 0)
-        gUnknown_030041B4 = 0;
-    if (*(u16 *)&gUnknown_030041B4 == 0)  // Why cast?
+    gBattle_BG1_Y -= 7;
+    if (gBattle_BG1_Y < 0)
+        gBattle_BG1_Y = 0;
+    if (*(u16 *)&gBattle_BG1_Y == 0)  // Why cast?
     {
         gTasks[taskId].data[0] = 0;
         gTasks[taskId].data[1] = 0;
@@ -5229,8 +5229,8 @@ void sub_80B2400(u8 taskId)
 
 void sub_80B2508(u8 taskId)
 {
-    gUnknown_030041B4 += 7;
-    if (gUnknown_030041B4 > DISPLAY_HEIGHT)
+    gBattle_BG1_Y += 7;
+    if (gBattle_BG1_Y > DISPLAY_HEIGHT)
         gTasks[taskId].func = sub_80ADCDC;
 }
 
@@ -5340,16 +5340,16 @@ void sub_80B2790(u8 a)
     u8 r5_2;
 
     memset(&shared19348_, 0, sizeof(shared19348_));
-    battle_anim_clear_some_data();
+    ClearBattleAnimationVars();
     for (i = 0; i < 4; i++)
         gBattleMonForms[i] = 0;
     switch (move)
     {
     case MOVE_CURSE:
         if (gBaseStats[species].type1 == TYPE_GHOST || gBaseStats[species].type2 == TYPE_GHOST)
-            gUnknown_0202F7C4 = 0;
+            gAnimMoveTurn = 0;
         else
-            gUnknown_0202F7C4 = 1;
+            gAnimMoveTurn = 1;
         break;
     case MOVE_TRANSFORM:
     case MOVE_ROLE_PLAY:
@@ -5359,10 +5359,10 @@ void sub_80B2790(u8 a)
         shared19348_.unk4_0 = 1;
         break;
     case MOVE_RETURN:
-        gHappinessMoveAnim = 0xFF;
+        gAnimFriendship = 0xFF;
         break;
     case MOVE_FRUSTRATION:
-        gHappinessMoveAnim = 0;
+        gAnimFriendship = 0;
         break;
     case MOVE_SOLAR_BEAM:
     case MOVE_RAZOR_WIND:
@@ -5371,11 +5371,11 @@ void sub_80B2790(u8 a)
         if (sContest.unk1925E == 0)
         {
             sContest.unk1925E = 2;
-            gUnknown_0202F7C4 = 0;
+            gAnimMoveTurn = 0;
         }
         else
         {
-            gUnknown_0202F7C4 = 1;
+            gAnimMoveTurn = 1;
         }
         break;
     }
@@ -5410,8 +5410,8 @@ void sub_80B2968(void)
 
     sprite->pos2.x = 0;
     sprite->pos2.y = 0;
-    sprite->pos1.x = sub_8077ABC(3, 0);
-    sprite->pos1.y = sub_8077ABC(3, 1);
+    sprite->pos1.x = GetBankPosition(3, 0);
+    sprite->pos1.y = GetBankPosition(3, 1);
     sprite->invisible = TRUE;
 }
 
diff --git a/src/debug/matsuda_debug_menu.c b/src/debug/matsuda_debug_menu.c
index d797e8850..bb80de6fe 100644
--- a/src/debug/matsuda_debug_menu.c
+++ b/src/debug/matsuda_debug_menu.c
@@ -31,10 +31,10 @@ extern u16 gSpecialVar_ContestRank;
 
 extern u16 gUnknown_030042A4;
 extern u16 gUnknown_030042A0;
-extern u16 gUnknown_030042C0;
-extern u16 gUnknown_030041B4;
-extern u16 gUnknown_03004288;
-extern u16 gUnknown_03004280;
+extern u16 gBattle_BG1_X;
+extern u16 gBattle_BG1_Y;
+extern u16 gBattle_BG2_X;
+extern u16 gBattle_BG2_Y;
 extern u16 gUnknown_030041B0;
 extern u16 gUnknown_030041B8;
 extern struct Window gUnknown_03004210;
@@ -459,10 +459,10 @@ static void sub_80A9F50(void)
     REG_BG0VOFS = 0;
     gUnknown_030042A4 = 0;
     gUnknown_030042A0 = 0;
-    gUnknown_030042C0 = 0;
-    gUnknown_030041B4 = 0;
-    gUnknown_03004288 = 0;
-    gUnknown_03004280 = 0;
+    gBattle_BG1_X = 0;
+    gBattle_BG1_Y = 0;
+    gBattle_BG2_X = 0;
+    gBattle_BG2_Y = 0;
     gUnknown_030041B0 = 0;
     gUnknown_030041B8 = 0;
 }
@@ -507,10 +507,10 @@ static void sub_80AA090(void)
 {
     REG_BG0HOFS = gUnknown_030042A4;
     REG_BG0VOFS = gUnknown_030042A0;
-    REG_BG1HOFS = gUnknown_030042C0;
-    REG_BG1VOFS = gUnknown_030041B4;
-    REG_BG2HOFS = gUnknown_03004288;
-    REG_BG2VOFS = gUnknown_03004280;
+    REG_BG1HOFS = gBattle_BG1_X;
+    REG_BG1VOFS = gBattle_BG1_Y;
+    REG_BG2HOFS = gBattle_BG2_X;
+    REG_BG2VOFS = gBattle_BG2_Y;
     REG_BG3HOFS = gUnknown_030041B0;
     REG_BG3VOFS = gUnknown_030041B8;
     LoadOam();
diff --git a/src/engine/sprite.c b/src/engine/sprite.c
index c1bb36917..cf35e12a3 100644
--- a/src/engine/sprite.c
+++ b/src/engine/sprite.c
@@ -598,7 +598,7 @@ static u8 CreateSpriteAt(u8 index, const struct SpriteTemplate *template, s16 x,
     return index;
 }
 
-u8 CreateSpriteAndAnimate(struct SpriteTemplate *template, s16 x, s16 y, u8 subpriority)
+u8 CreateSpriteAndAnimate(const struct SpriteTemplate *template, s16 x, s16 y, u8 subpriority)
 {
     u8 i;
 
diff --git a/src/field/berry_tag_screen.c b/src/field/berry_tag_screen.c
index 2abbac287..960a163c1 100644
--- a/src/field/berry_tag_screen.c
+++ b/src/field/berry_tag_screen.c
@@ -29,7 +29,7 @@ struct Struct2000000
 };
 
 extern struct Struct2000000 gSharedMem;
-extern u16 gUnknown_030041B4;
+extern u16 gBattle_BG1_Y;
 
 static EWRAM_DATA u8 gUnknown_0203932C = 0;
 static EWRAM_DATA s16 gUnknown_0203932E[5] = {0};
@@ -77,8 +77,8 @@ static void sub_8146014(void)
 
 static void sub_814602C(void)
 {
-    REG_BG0VOFS = gUnknown_030041B4;
-    REG_BG1VOFS = gUnknown_030041B4;
+    REG_BG0VOFS = gBattle_BG1_Y;
+    REG_BG1VOFS = gBattle_BG1_Y;
 
     LoadOam();
     ProcessSpriteCopyRequests();
@@ -183,7 +183,7 @@ static void sub_8146288(void)
     REG_BG1CNT = BGCNT_PRIORITY(2) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(5) | BGCNT_16COLOR | BGCNT_TXT256x256;
     REG_BG2CNT = BGCNT_PRIORITY(0) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(6) | BGCNT_16COLOR | BGCNT_TXT256x256;
     REG_BG3CNT = BGCNT_PRIORITY(3) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(7) | BGCNT_16COLOR | BGCNT_TXT256x256;
-    gUnknown_030041B4 = 0;
+    gBattle_BG1_Y = 0;
 }
 
 bool8 sub_81462B8(void)
@@ -394,17 +394,17 @@ static void sub_8146798(u8 taskId)
 {
     s16 *taskData = gTasks[taskId].data;
 
-    gUnknown_030041B4 = (gUnknown_030041B4 + taskData[0]) & 0xFF;
-    if ((taskData[0] > 0 && gUnknown_030041B4 == 144)
-     || (taskData[0] < 0 && gUnknown_030041B4 == 112))
+    gBattle_BG1_Y = (gBattle_BG1_Y + taskData[0]) & 0xFF;
+    if ((taskData[0] > 0 && gBattle_BG1_Y == 144)
+     || (taskData[0] < 0 && gBattle_BG1_Y == 112))
     {
         sub_8146810(gTasks[taskId].data[1]);
         sub_81468BC();
     }
-    if (gUnknown_030041B4 == 0)
+    if (gBattle_BG1_Y == 0)
     {
-        gTasks[taskId].data[0] = gUnknown_030041B4;
-        gTasks[taskId].data[1] = gUnknown_030041B4;
+        gTasks[taskId].data[0] = gBattle_BG1_Y;
+        gTasks[taskId].data[1] = gBattle_BG1_Y;
         gTasks[taskId].func = sub_8146480;
     }
 }
diff --git a/src/field/item_menu.c b/src/field/item_menu.c
index 4e283ffe9..e9b8b24d3 100644
--- a/src/field/item_menu.c
+++ b/src/field/item_menu.c
@@ -153,7 +153,7 @@ static const u8 *sPopupMenuActionList;
 
 // common
 void (*gFieldItemUseCallback)(u8) = NULL;
-extern u16 gUnknown_030041B4;
+extern u16 gBattle_BG1_Y;
 extern struct PocketScrollState gBagPocketScrollStates[];
 extern struct ItemSlot *gCurrentBagPocketItemSlots;  // selected pocket item slots
 extern const u8 Event_NoRegisteredItem[];
@@ -4499,7 +4499,7 @@ u8 CreateBerrySprite(u8 berryId, s16 x, s16 y)
 
 static void SpriteCB_BerrySprite(struct Sprite *sprite)
 {
-    sprite->pos2.y = -gUnknown_030041B4;
+    sprite->pos2.y = -gBattle_BG1_Y;
 }
 
 void sub_80A7DD4(void)
diff --git a/src/pokemon/pokemon_summary_screen.c b/src/pokemon/pokemon_summary_screen.c
index cd3793cb5..9563bc08f 100644
--- a/src/pokemon/pokemon_summary_screen.c
+++ b/src/pokemon/pokemon_summary_screen.c
@@ -124,10 +124,10 @@ extern struct MusicPlayerInfo gMPlay_BGM;
 extern u8 gUnknown_020384F0;
 extern u8 gUnknown_08208238[];
 extern u16 gUnknown_030041B8;
-extern u16 gUnknown_03004280;
-extern u16 gUnknown_030041B4;
-extern u16 gUnknown_030042C0;
-extern u16 gUnknown_03004288;
+extern u16 gBattle_BG2_Y;
+extern u16 gBattle_BG1_Y;
+extern u16 gBattle_BG1_X;
+extern u16 gBattle_BG2_X;
 extern u16 gUnknown_030041B0;
 extern TaskFunc gUnknown_03005CF0;
 extern struct Sprite *gUnknown_020384F4;
@@ -582,10 +582,10 @@ void sub_809D844(void)
 
 void sub_809D85C(void)
 {
-    REG_BG1HOFS = gUnknown_030042C0;
-    REG_BG1VOFS = gUnknown_030041B4;
-    REG_BG2HOFS = gUnknown_03004288;
-    REG_BG2VOFS = gUnknown_03004280;
+    REG_BG1HOFS = gBattle_BG1_X;
+    REG_BG1VOFS = gBattle_BG1_Y;
+    REG_BG2HOFS = gBattle_BG2_X;
+    REG_BG2VOFS = gBattle_BG2_Y;
     REG_BG3HOFS = gUnknown_030041B0;
     REG_BG3VOFS = gUnknown_030041B8;
 
@@ -868,10 +868,10 @@ static void sub_809DE64(void)
     REG_BG2CNT = 0x4A02;
     REG_BG3CNT = 0x5C03;
 
-    gUnknown_030042C0 = 0;
-    gUnknown_030041B4 = 0;
-    gUnknown_03004288 = 0;
-    gUnknown_03004280 = 0;
+    gBattle_BG1_X = 0;
+    gBattle_BG1_Y = 0;
+    gBattle_BG2_X = 0;
+    gBattle_BG2_Y = 0;
     gUnknown_030041B0 = 0;
     gUnknown_030041B8 = 0;
 
@@ -1522,7 +1522,7 @@ static void sub_809EBC4(void)
     if (pssData.page != PSS_PAGE_INFO)
     {
         DrawSummaryScreenNavigationDots();
-        gUnknown_030042C0 = 0x100;
+        gBattle_BG1_X = 0x100;
 
         if (pssData.page == PSS_PAGE_SKILLS)
             REG_BG1CNT = (REG_BG1CNT & 0xE0FF) + 0x800;
@@ -1547,7 +1547,7 @@ void sub_809EC38(u8 taskId)
         {
             if (pssData.page != PSS_PAGE_INFO)
             {
-                gUnknown_03004288 = 0x100;
+                gBattle_BG2_X = 0x100;
             }
 
             if (pssData.page == PSS_PAGE_SKILLS)
@@ -1564,7 +1564,7 @@ void sub_809EC38(u8 taskId)
         {
             if (pssData.page != PSS_PAGE_INFO)
             {
-                gUnknown_030042C0 = 0x100;
+                gBattle_BG1_X = 0x100;
             }
 
             if (pssData.page == PSS_PAGE_SKILLS)
@@ -1583,8 +1583,8 @@ void sub_809EC38(u8 taskId)
     case 1:
         if (pssData.bgToggle == 0)
         {
-            int var2 = gUnknown_030042C0 - 0x20;
-            gUnknown_030042C0 = var2;
+            int var2 = gBattle_BG1_X - 0x20;
+            gBattle_BG1_X = var2;
             if (var2 << 16 == 0)
             {
                 REG_BG1CNT = (REG_BG1CNT & 0xFFFC) + 2;
@@ -1594,8 +1594,8 @@ void sub_809EC38(u8 taskId)
         }
         else
         {
-            int var2 = gUnknown_03004288 - 0x20;
-            gUnknown_03004288 = var2;
+            int var2 = gBattle_BG2_X - 0x20;
+            gBattle_BG2_X = var2;
             if (var2 << 16 == 0)
             {
                 REG_BG1CNT = (REG_BG1CNT & 0xFFFC) + 1;
@@ -1663,12 +1663,12 @@ void sub_809EE74(u8 taskId)
         var1 = pssData.bgToggle;
         if (var1 == 0)
         {
-            gUnknown_03004288 = pssData.bgToggle;
+            gBattle_BG2_X = pssData.bgToggle;
             taskData[0]++;
         }
         else
         {
-            gUnknown_030042C0 = 0;
+            gBattle_BG1_X = 0;
             taskData[0]++;
         }
         break;
@@ -1705,8 +1705,8 @@ void sub_809EE74(u8 taskId)
     case 2:
         if (pssData.bgToggle == 0)
         {
-            int var2 = gUnknown_03004288 + 0x20;
-            gUnknown_03004288 = var2;
+            int var2 = gBattle_BG2_X + 0x20;
+            gBattle_BG2_X = var2;
             if ((var2 << 16) == 0x1000000)
             {
                 taskData[0]++;
@@ -1714,8 +1714,8 @@ void sub_809EE74(u8 taskId)
         }
         else
         {
-            int var2 = gUnknown_030042C0 + 0x20;
-            gUnknown_030042C0 = var2;
+            int var2 = gBattle_BG1_X + 0x20;
+            gBattle_BG1_X = var2;
             if ((var2 << 16) == 0x1000000)
             {
                 taskData[0]++;
diff --git a/src/rom3.c b/src/rom3.c
index dd520a839..b29bc7428 100644
--- a/src/rom3.c
+++ b/src/rom3.c
@@ -80,7 +80,7 @@ void setup_poochyena_battle(void)
     }
     sub_800B858();
     gBattleExecBuffer = 0;
-    battle_anim_clear_some_data();
+    ClearBattleAnimationVars();
     ClearBattleMonForms();
     BattleAI_HandleItemUseBeforeAISetup();
     if (gBattleTypeFlags & BATTLE_TYPE_FIRST_BATTLE)
diff --git a/src/rom_8077ABC.c b/src/rom_8077ABC.c
index 347f113c3..2070ea991 100644
--- a/src/rom_8077ABC.c
+++ b/src/rom_8077ABC.c
@@ -86,16 +86,16 @@ extern u16 gBattleMonPartyPositions[];
 extern u16 gBattleTypeFlags;
 extern u32 gTransformPersonalities[NUM_BATTLE_SLOTS];
 extern u8 gBattleMonForms[NUM_BATTLE_SLOTS];
-extern u16 gUnknown_0202F7CA[];
+extern u16 gAnimSpeciesByBanks[];
 extern u8 gBattleMonSprites[NUM_BATTLE_SLOTS];
-extern u8 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 extern s16 gBattleAnimArgs[8];
 extern u8 gBanksBySide[NUM_BATTLE_SLOTS];
 extern u8 gNoOfAllBanks; // gNumBattleMons?
 extern struct OamMatrix gOamMatrices[];
 extern struct Struct_2017810 unk_2017810[];
-extern u8 gHappinessMoveAnim;
+extern u8 gAnimFriendship;
 
 extern u8 UpdateMonIconFrame(struct Sprite *sprite);
 
@@ -168,12 +168,12 @@ const struct SpriteSheet gUnknown_0837F5E0[] = {
 };
 
 
-u8 sub_8077ABC(u8 slot, u8 a2) {
+u8 GetBankPosition(u8 slot, u8 a2) {
     u8 var;
     u16 species;
     struct TransformStatus *transform;
 
-    if (NotInBattle()) {
+    if (IsContest()) {
         if (a2 == 3 && slot == 3) {
             a2 = 1;
         }
@@ -189,7 +189,7 @@ u8 sub_8077ABC(u8 slot, u8 a2) {
     case 3:
     case 4:
     default:
-        if (NotInBattle()) {
+        if (IsContest()) {
             if (ewram19348.unk4 & 1) {
                 species = ewram19348.unk2;
             } else {
@@ -229,9 +229,9 @@ u8 sub_8077BFC(u8 slot, u16 species) {
     u8 ret;
     u16 var;
 
-    if (!GetBankSide(slot) || NotInBattle()) {
+    if (!GetBankSide(slot) || IsContest()) {
         if (species == SPECIES_UNOWN) {
-            if (NotInBattle()) {
+            if (IsContest()) {
                 if (ewram19348.unk4 & 1) {
                     personality = ewram19348.unk10;
                 } else {
@@ -288,7 +288,7 @@ u8 sub_8077BFC(u8 slot, u16 species) {
 u8 sub_8077DD8(u8 slot, u16 species) {
     u8 ret = 0;
     if (GetBankSide(slot) == 1) {
-        if (!NotInBattle()) {
+        if (!IsContest()) {
             if (species == SPECIES_CASTFORM) {
                 ret = gCastformElevations[gBattleMonForms[slot]];
             } else if (species > NUM_SPECIES) {
@@ -304,7 +304,7 @@ u8 sub_8077DD8(u8 slot, u16 species) {
 u8 sub_8077E44(u8 slot, u16 species, u8 a3) {
     u16 offset;
     u8 y;
-    if (GetBankSide(slot) == 0 || NotInBattle()) {
+    if (GetBankSide(slot) == 0 || IsContest()) {
         offset = sub_8077BFC(slot, species);
     } else {
         offset = sub_8077BFC(slot, species);
@@ -324,7 +324,7 @@ u8 sub_8077EE4(u8 slot, u8 a2) {
     u16 species;
     struct TransformStatus *transform;
     if (a2 == 3 || a2 == 4) {
-        if (NotInBattle()) {
+        if (IsContest()) {
             if (ewram19348.unk4 & 1) {
                 species = ewram19348.unk2;
             } else {
@@ -333,7 +333,7 @@ u8 sub_8077EE4(u8 slot, u8 a2) {
         } else {
             transform = &eTransformStatuses[slot];
             if (!transform->species) {
-                species = gUnknown_0202F7CA[slot];
+                species = gAnimSpeciesByBanks[slot];
             } else {
                 species = transform->species;
             }
@@ -344,20 +344,20 @@ u8 sub_8077EE4(u8 slot, u8 a2) {
             return sub_8077E44(slot, species, 0);
         }
     } else {
-        return sub_8077ABC(slot, a2);
+        return GetBankPosition(slot, a2);
     }
 }
 
 u8 sub_8077F68(u8 slot) {
-    return sub_8077ABC(slot, 4);
+    return GetBankPosition(slot, 4);
 }
 
 u8 sub_8077F7C(u8 slot) {
     u16 var;
     if (GetBankSide(slot)) {
-        var = sub_8077ABC(slot, 1) + 16;
+        var = GetBankPosition(slot, 1) + 16;
     } else {
-        var = sub_8077ABC(slot, 1) + 17;
+        var = GetBankPosition(slot, 1) + 17;
     }
     return var;
 }
@@ -366,8 +366,8 @@ u8 sub_8077FC0(u8 slot) {
     u16 var;
     u8 r6;
     struct TransformStatus *transform;
-    r6 = sub_8077ABC(slot, 1);
-    if (!NotInBattle()) {
+    r6 = GetBankPosition(slot, 1);
+    if (!IsContest()) {
         if (GetBankSide(slot)) {
             transform = &eTransformStatuses[slot];
             if (!transform->species) {
@@ -392,29 +392,29 @@ u8 sub_8077FC0(u8 slot) {
 
 u8 GetAnimBankSpriteId(u8 whichBank) {
     u8 *sprites;
-    if (whichBank == ANIM_BANK_ATK) {
-        if (AnimBankSpriteExists(gBattleAnimBankAttacker)) {
+    if (whichBank == ANIM_BANK_ATTACKER) {
+        if (IsBankSpritePresent(gAnimBankAttacker)) {
             sprites = gBattleMonSprites;
-            return sprites[gBattleAnimBankAttacker];
+            return sprites[gAnimBankAttacker];
         } else {
             return 0xff;
         }
-    } else if (whichBank == ANIM_BANK_DEF) {
-        if (AnimBankSpriteExists(gBattleAnimBankTarget)) {
+    } else if (whichBank == ANIM_BANK_TARGET) {
+        if (IsBankSpritePresent(gAnimBankTarget)) {
             sprites = gBattleMonSprites;
-            return sprites[gBattleAnimBankTarget];
+            return sprites[gAnimBankTarget];
         } else {
             return 0xff;
         }
     } else if (whichBank == ANIM_BANK_ATK_PARTNER) {
-        if (!IsAnimBankSpriteVisible(gBattleAnimBankAttacker ^ 2)) {
+        if (!IsAnimBankSpriteVisible(gAnimBankAttacker ^ 2)) {
             return 0xff;
         } else {
-            return gBattleMonSprites[gBattleAnimBankAttacker ^ 2];
+            return gBattleMonSprites[gAnimBankAttacker ^ 2];
         }
     } else {
-        if (IsAnimBankSpriteVisible(gBattleAnimBankTarget ^ 2)) {
-            return gBattleMonSprites[gBattleAnimBankTarget ^ 2];
+        if (IsAnimBankSpriteVisible(gAnimBankTarget ^ 2)) {
+            return gBattleMonSprites[gAnimBankTarget ^ 2];
         } else {
             return 0xff;
         }
@@ -567,8 +567,8 @@ void sub_80783D0(struct Sprite *sprite) {
 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] = sub_8077ABC(gBattleAnimBankTarget, 2);
-    sprite->data[4] = sub_8077ABC(gBattleAnimBankTarget, 3);
+    sprite->data[2] = GetBankPosition(gAnimBankTarget, 2);
+    sprite->data[4] = GetBankPosition(gAnimBankTarget, 3);
     sprite->callback = sub_80782F8;
 }
 
@@ -613,14 +613,14 @@ void sub_8078504(struct Sprite *sprite) {
 
 void move_anim_8074EE0(struct Sprite *sprite) {
     FreeSpriteOamMatrix(sprite);
-    move_anim_8072740(sprite);
+    DestroyAnimSprite(sprite);
 }
 
 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] = sub_8077ABC(gBattleAnimBankAttacker, 2);
-    sprite->data[4] = sub_8077ABC(gBattleAnimBankAttacker, 3);
+    sprite->data[2] = GetBankPosition(gAnimBankAttacker, 2);
+    sprite->data[4] = GetBankPosition(gAnimBankAttacker, 3);
     sprite->callback = sub_80782F8;
 }
 
@@ -644,7 +644,7 @@ void sub_8078600(struct Sprite *sprite) {
 void sub_807861C(struct Sprite *sprite) {
     REG_BLDCNT = 0;
     REG_BLDALPHA = 0;
-    move_anim_8072740(sprite);
+    DestroyAnimSprite(sprite);
 }
 
 void sub_8078634(u8 task) {
@@ -654,19 +654,19 @@ void sub_8078634(u8 task) {
 }
 
 void sub_8078650(struct Sprite *sprite) {
-    sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2);
-    sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 3);
+    sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2);
+    sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3);
 }
 
 void sub_807867C(struct Sprite *sprite, s16 a2) {
-    u16 v1 = sub_8077ABC(gBattleAnimBankAttacker, 0);
-    u16 v2 = sub_8077ABC(gBattleAnimBankTarget, 0);
+    u16 v1 = GetBankPosition(gAnimBankAttacker, 0);
+    u16 v2 = GetBankPosition(gAnimBankTarget, 0);
     if (v1 > v2) {
         sprite->pos1.x -= a2;
     } else if (v1 < v2) {
         sprite->pos1.x += a2;
     } else {
-        if (GetBankSide(gBattleAnimBankAttacker)) {
+        if (GetBankSide(gAnimBankAttacker)) {
             sprite->pos1.x -= a2;
         } else {
             sprite->pos1.x += a2;
@@ -700,8 +700,8 @@ void oamt_add_pos2_onto_pos1(struct Sprite *sprite) {
 
 void sub_8078764(struct Sprite *sprite, u8 a2) {
     if (!a2) {
-        sprite->pos1.x = sub_8077EE4(gBattleAnimBankTarget, 0);
-        sprite->pos1.y = sub_8077EE4(gBattleAnimBankTarget, 1);
+        sprite->pos1.x = sub_8077EE4(gAnimBankTarget, 0);
+        sprite->pos1.y = sub_8077EE4(gAnimBankTarget, 1);
     }
     sub_807867C(sprite, gBattleAnimArgs[0]);
     sprite->pos1.y += gBattleAnimArgs[1];
@@ -709,11 +709,11 @@ void sub_8078764(struct Sprite *sprite, u8 a2) {
 
 void sub_80787B0(struct Sprite *sprite, u8 a2) {
     if (!a2) {
-        sprite->pos1.x = sub_8077EE4(gBattleAnimBankAttacker, 0);
-        sprite->pos1.y = sub_8077EE4(gBattleAnimBankAttacker, 1);
+        sprite->pos1.x = sub_8077EE4(gAnimBankAttacker, 0);
+        sprite->pos1.y = sub_8077EE4(gAnimBankAttacker, 1);
     } else {
-        sprite->pos1.x = sub_8077EE4(gBattleAnimBankAttacker, 2);
-        sprite->pos1.y = sub_8077EE4(gBattleAnimBankAttacker, 3);
+        sprite->pos1.x = sub_8077EE4(gAnimBankAttacker, 2);
+        sprite->pos1.y = sub_8077EE4(gAnimBankAttacker, 3);
     }
     sub_807867C(sprite, gBattleAnimArgs[0]);
     sprite->pos1.y += gBattleAnimArgs[1];
@@ -737,12 +737,12 @@ u8 GetBankByPlayerAI(u8 slot) {
     return i;
 }
 
-bool8 AnimBankSpriteExists(u8 slot) {
-    if (NotInBattle()) {
-        if (gBattleAnimBankAttacker == slot) {
+bool8 IsBankSpritePresent(u8 slot) {
+    if (IsContest()) {
+        if (gAnimBankAttacker == slot) {
             return TRUE;
         }
-        if (gBattleAnimBankTarget == slot) {
+        if (gAnimBankTarget == slot) {
             return TRUE;
         }
         return FALSE;
@@ -768,7 +768,7 @@ bool8 IsDoubleBattle() {
 }
 
 void sub_8078914(struct Struct_sub_8078914 *unk) {
-    if (NotInBattle()) {
+    if (IsContest()) {
         unk->field_0 = (u8 *)0x6008000;
         unk->field_4 = (u8 *)0x600f000;
         unk->field_8 = 0xe;
@@ -780,11 +780,11 @@ void sub_8078914(struct Struct_sub_8078914 *unk) {
 }
 
 void sub_8078954(struct Struct_sub_8078914 *unk) {
-    if (NotInBattle()) {
+    if (IsContest()) {
         unk->field_0 = (u8 *)0x6008000;
         unk->field_4 = (u8 *)0x600f000;
         unk->field_8 = 0xe;
-    } else if (GetBankIdentity_permutated(gBattleAnimBankAttacker) == 1) {
+    } else if (GetBankIdentity_permutated(gAnimBankAttacker) == 1) {
         unk->field_0 = (u8 *)0x6004000;
         unk->field_4 = (u8 *)0x600e000;
         unk->field_8 = 0x8;
@@ -796,7 +796,7 @@ void sub_8078954(struct Struct_sub_8078914 *unk) {
 }
 
 u8 sub_80789BC() {
-    if (NotInBattle()) {
+    if (IsContest()) {
         return 1;
     }
     return 2;
@@ -806,7 +806,7 @@ void sub_80789D4(bool8 a1) {
     if (!a1) {
         BG3CNT.size = 0;
         BG3CNT.overflow = 1;
-    } else if (NotInBattle()) {
+    } else if (IsContest()) {
         BG3CNT.size = 0;
         BG3CNT.overflow = 1;
     } else {
@@ -1011,7 +1011,7 @@ void obj_id_set_rotscale(u8 sprite, s16 xScale, s16 yScale, u16 rotation) {
 }
 
 bool8 sub_8078E38() {
-    if (NotInBattle()) {
+    if (IsContest()) {
         if (gSprites[GetAnimBankSpriteId(0)].data[2] == 0xc9 /* XXX SPECIES_UNOWN? */) {
             return FALSE;
         }
@@ -1022,12 +1022,12 @@ bool8 sub_8078E38() {
 
 void sub_8078E70(u8 sprite, u8 a2) {
     u8 r7 = gSprites[sprite].data[0];
-    if (NotInBattle() || IsAnimBankSpriteVisible(r7)) {
+    if (IsContest() || IsAnimBankSpriteVisible(r7)) {
         gSprites[sprite].invisible = FALSE;
     }
     gSprites[sprite].oam.objMode = a2;
     gSprites[sprite].affineAnimPaused = TRUE;
-    if (!NotInBattle() && !gSprites[sprite].oam.affineMode) {
+    if (!IsContest() && !gSprites[sprite].oam.affineMode) {
         gSprites[sprite].oam.matrixNum = ewram17810[r7].unk6;
     }
     gSprites[sprite].oam.affineMode = 3;
@@ -1119,41 +1119,41 @@ u32 sub_80791A8(u8 a1, u8 a2, u8 a3, u8 a4, u8 a5, u8 a6, u8 a7) {
     u32 var = 0;
     u32 shift;
     if (a1) {
-        if (!NotInBattle()) {
+        if (!IsContest()) {
             var = 0xe;
         } else {
             var = 1 << sub_80789BC();
         }
     }
     if (a2) {
-        shift = gBattleAnimBankAttacker + 16;
+        shift = gAnimBankAttacker + 16;
         var |= 1 << shift;
     }
     if (a3) {
-        shift = gBattleAnimBankTarget + 16;
+        shift = gAnimBankTarget + 16;
         var |= 1 << shift;
     }
     if (a4) {
-        if (IsAnimBankSpriteVisible(gBattleAnimBankAttacker ^ 2)) {
-            shift = (gBattleAnimBankAttacker ^ 2) + 16;
+        if (IsAnimBankSpriteVisible(gAnimBankAttacker ^ 2)) {
+            shift = (gAnimBankAttacker ^ 2) + 16;
             var |= 1 << shift;
         }
     }
     if (a5) {
-        if (IsAnimBankSpriteVisible(gBattleAnimBankTarget ^ 2)) {
-            shift = (gBattleAnimBankTarget ^ 2) + 16;
+        if (IsAnimBankSpriteVisible(gAnimBankTarget ^ 2)) {
+            shift = (gAnimBankTarget ^ 2) + 16;
             var |= 1 << shift;
         }
     }
     if (a6) {
-        if (!NotInBattle()) {
+        if (!IsContest()) {
             var |= 0x100;
         } else {
             var |= 0x4000;
         }
     }
     if (a7) {
-        if (!NotInBattle()) {
+        if (!IsContest()) {
             var |= 0x200;
         }
     }
@@ -1163,7 +1163,7 @@ u32 sub_80791A8(u8 a1, u8 a2, u8 a3, u8 a4, u8 a5, u8 a6, u8 a7) {
 u32 sub_80792C0(u8 a1, u8 a2, u8 a3, u8 a4) {
     u32 var = 0;
     u32 shift;
-    if (NotInBattle()) {
+    if (IsContest()) {
         if (a1) {
             var |= 1 << 18;
             return var;
@@ -1238,24 +1238,24 @@ void sub_807941C(struct Sprite *sprite) {
         v2 = 1;
     }
     sub_80787B0(sprite, v1);
-    if (GetBankSide(gBattleAnimBankAttacker)) {
+    if (GetBankSide(gAnimBankAttacker)) {
         gBattleAnimArgs[2] = -gBattleAnimArgs[2];
     }
     sprite->data[0] = gBattleAnimArgs[4];
-    sprite->data[2] = sub_8077ABC(gBattleAnimBankTarget, 2) + gBattleAnimArgs[2];
-    sprite->data[4] = sub_8077ABC(gBattleAnimBankTarget, v2) + gBattleAnimArgs[3];
+    sprite->data[2] = GetBankPosition(gAnimBankTarget, 2) + gBattleAnimArgs[2];
+    sprite->data[4] = GetBankPosition(gAnimBankTarget, v2) + gBattleAnimArgs[3];
     sprite->callback = sub_8078B34;
-    StoreSpriteCallbackInData(sprite, move_anim_8072740);
+    StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
 }
 
 void sub_80794A8(struct Sprite *sprite) {
     sub_80787B0(sprite, 1);
-    if (GetBankSide(gBattleAnimBankAttacker)) {
+    if (GetBankSide(gAnimBankAttacker)) {
         gBattleAnimArgs[2] = -gBattleAnimArgs[2];
     }
     sprite->data[0] = gBattleAnimArgs[4];
-    sprite->data[2] = sub_8077ABC(gBattleAnimBankTarget, 2) + gBattleAnimArgs[2];
-    sprite->data[4] = sub_8077ABC(gBattleAnimBankTarget, 3) + gBattleAnimArgs[3];
+    sprite->data[2] = GetBankPosition(gAnimBankTarget, 2) + gBattleAnimArgs[2];
+    sprite->data[4] = GetBankPosition(gAnimBankTarget, 3) + gBattleAnimArgs[3];
     sprite->data[5] = gBattleAnimArgs[5];
     sub_80786EC(sprite);
     sprite->callback = sub_8079518;
@@ -1263,7 +1263,7 @@ void sub_80794A8(struct Sprite *sprite) {
 
 void sub_8079518(struct Sprite *sprite) {
     if (sub_8078718(sprite)) {
-        move_anim_8072740(sprite);
+        DestroyAnimSprite(sprite);
     }
 }
 
@@ -1278,20 +1278,20 @@ void sub_8079534(struct Sprite *sprite) {
     }
     if (!gBattleAnimArgs[5]) {
         sub_80787B0(sprite, r4);
-        slot = gBattleAnimBankAttacker;
+        slot = gAnimBankAttacker;
     } else {
         sub_8078764(sprite, r4);
-        slot = gBattleAnimBankTarget;
+        slot = gAnimBankTarget;
     }
-    if (GetBankSide(gBattleAnimBankAttacker)) {
+    if (GetBankSide(gAnimBankAttacker)) {
         gBattleAnimArgs[2] = -gBattleAnimArgs[2];
     }
     sub_8078764(sprite, r4);
     sprite->data[0] = gBattleAnimArgs[4];
-    sprite->data[2] = sub_8077ABC(slot, 2) + gBattleAnimArgs[2];
-    sprite->data[4] = sub_8077ABC(slot, r7) + gBattleAnimArgs[3];
+    sprite->data[2] = GetBankPosition(slot, 2) + gBattleAnimArgs[2];
+    sprite->data[4] = GetBankPosition(slot, r7) + gBattleAnimArgs[3];
     sprite->callback = sub_8078B34;
-    StoreSpriteCallbackInData(sprite, move_anim_8072740);
+    StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
 }
 
 s16 duplicate_obj_of_side_rel2move_in_transparent_mode(u8 a1) {
@@ -1524,7 +1524,7 @@ u16 sub_8079B10(u8 sprite) {
     u16 i;
     for (i = 0; i < (sizeof(gBattleMonSprites) / sizeof(u8)); i++) {
         if (gBattleMonSprites[i] == sprite) {
-            if (NotInBattle()) {
+            if (IsContest()) {
                 species = ewram19348.unk0;
                 return gMonBackPicCoords[species].y_offset;
             } else {
@@ -1596,11 +1596,11 @@ u8 sub_8079C74(struct Task *task) {
 
 void sub_8079CEC(u8 task) {
     u16 v1;
-    if (gHappinessMoveAnim <= 30) {
+    if (gAnimFriendship <= 30) {
         v1 = 0;
-    } else if (gHappinessMoveAnim <= 100) {
+    } else if (gAnimFriendship <= 100) {
         v1 = 1;
-    } else if (gHappinessMoveAnim <= 200) {
+    } else if (gAnimFriendship <= 200) {
         v1 = 2;
     } else {
         v1 = 3;
@@ -1610,17 +1610,17 @@ void sub_8079CEC(u8 task) {
 }
 
 void unref_sub_8079D20(u8 priority) {
-    if (IsAnimBankSpriteVisible(gBattleAnimBankTarget)) {
-        gSprites[gBattleMonSprites[gBattleAnimBankTarget]].oam.priority = priority;
+    if (IsAnimBankSpriteVisible(gAnimBankTarget)) {
+        gSprites[gBattleMonSprites[gAnimBankTarget]].oam.priority = priority;
     }
-    if (IsAnimBankSpriteVisible(gBattleAnimBankAttacker)) {
-        gSprites[gBattleMonSprites[gBattleAnimBankAttacker]].oam.priority = priority;
+    if (IsAnimBankSpriteVisible(gAnimBankAttacker)) {
+        gSprites[gBattleMonSprites[gAnimBankAttacker]].oam.priority = priority;
     }
-    if (IsAnimBankSpriteVisible(gBattleAnimBankTarget ^ 2)) {
-        gSprites[gBattleMonSprites[gBattleAnimBankTarget ^ 2]].oam.priority = priority;
+    if (IsAnimBankSpriteVisible(gAnimBankTarget ^ 2)) {
+        gSprites[gBattleMonSprites[gAnimBankTarget ^ 2]].oam.priority = priority;
     }
-    if (IsAnimBankSpriteVisible(gBattleAnimBankAttacker ^ 2)) {
-        gSprites[gBattleMonSprites[gBattleAnimBankAttacker ^ 2]].oam.priority = priority;
+    if (IsAnimBankSpriteVisible(gAnimBankAttacker ^ 2)) {
+        gSprites[gBattleMonSprites[gAnimBankAttacker ^ 2]].oam.priority = priority;
     }
 }
 
@@ -1637,7 +1637,7 @@ void sub_8079E24() {
 u8 sub_8079E90(u8 slot) {
     u8 status;
     u8 ret;
-    if (NotInBattle()) {
+    if (IsContest()) {
         if (slot == 2) {
             return 30;
         } else {
@@ -1660,7 +1660,7 @@ u8 sub_8079E90(u8 slot) {
 
 u8 sub_8079ED4(u8 slot) {
     u8 status = GetBankIdentity(slot);
-    if (NotInBattle()) {
+    if (IsContest()) {
         return 2;
     }
     if (status == 0 || status == 3) {
@@ -1672,7 +1672,7 @@ u8 sub_8079ED4(u8 slot) {
 
 u8 GetBankIdentity_permutated(u8 slot) {
     u8 status;
-    if (!NotInBattle()) {
+    if (!IsContest()) {
         status = GetBankIdentity(slot);
         if (status == 0 || status == 3) {
             return 2;
@@ -1728,7 +1728,7 @@ u8 sub_8079F44(u16 species, u8 isBackpic, u8 a3, s16 a4, s16 a5, u8 a6, u32 a7,
     } else {
         sprite = CreateSprite(&gSpriteTemplate_837F5B0[a3], a4, a5 + gMonBackPicCoords[species].y_offset, a6);
     }
-    if (NotInBattle()) {
+    if (IsContest()) {
         gSprites[sprite].affineAnims = gSpriteAffineAnimTable_81E7C18;
         StartSpriteAffineAnim(&gSprites[sprite], 0);
     }
@@ -1747,7 +1747,7 @@ int sub_807A100(u8 slot, u8 a2) {
     int ret;
     const struct MonCoords *coords;
     struct TransformStatus *transform;
-    if (NotInBattle()) {
+    if (IsContest()) {
         if (ewram19348.unk4 & 1) {
             species = ewram19348.unk2;
             personality = ewram19348.unk10;
@@ -1826,15 +1826,15 @@ int sub_807A100(u8 slot, u8 a2) {
     case 1:
         return (coords->coords >> 4) * 8;
     case 4:
-        return sub_8077ABC(slot, 2) - ((coords->coords >> 4) * 4);
+        return GetBankPosition(slot, 2) - ((coords->coords >> 4) * 4);
     case 5:
-        return sub_8077ABC(slot, 2) + ((coords->coords >> 4) * 4);
+        return GetBankPosition(slot, 2) + ((coords->coords >> 4) * 4);
     case 2:
-        return sub_8077ABC(slot, 3) - ((coords->coords & 0xf) * 4);
+        return GetBankPosition(slot, 3) - ((coords->coords & 0xf) * 4);
     case 3:
-        return sub_8077ABC(slot, 3) + ((coords->coords & 0xf) * 4);
+        return GetBankPosition(slot, 3) + ((coords->coords & 0xf) * 4);
     case 6:
-        ret = sub_8077ABC(slot, 1) + 0x1f;
+        ret = GetBankPosition(slot, 1) + 0x1f;
         return ret - coords->y_offset;
     default:
         return 0;
@@ -1852,11 +1852,11 @@ void sub_807A3FC(u8 slot, u8 a2, s16 *a3, s16 *a4) {
         v1 = 2;
         v2 = 3;
     }
-    v3 = sub_8077ABC(slot, v1);
-    v4 = sub_8077ABC(slot, v2);
-    if (IsDoubleBattle() && !NotInBattle()) {
-        v5 = sub_8077ABC(slot ^ 2, v1);
-        v6 = sub_8077ABC(slot ^ 2, v2);
+    v3 = GetBankPosition(slot, v1);
+    v4 = GetBankPosition(slot, v2);
+    if (IsDoubleBattle() && !IsContest()) {
+        v5 = GetBankPosition(slot ^ 2, v1);
+        v6 = GetBankPosition(slot ^ 2, v2);
     } else {
         v5 = v3;
         v6 = v4;
@@ -1878,7 +1878,7 @@ u8 sub_807A4A0(int a1, u8 sprite, int a3) {
 
 void sub_807A544(struct Sprite *sprite) {
     sub_8078650(sprite);
-    if (GetBankSide(gBattleAnimBankAttacker)) {
+    if (GetBankSide(gAnimBankAttacker)) {
         sprite->pos1.x -= gBattleAnimArgs[0];
         gBattleAnimArgs[3] = -gBattleAnimArgs[3];
         sprite->hFlip = TRUE;
@@ -1895,7 +1895,7 @@ void sub_807A544(struct Sprite *sprite) {
 }
 
 void sub_807A5C4(struct Sprite *sprite) {
-    if (GetBankSide(gBattleAnimBankAttacker)) {
+    if (GetBankSide(gAnimBankAttacker)) {
         sprite->pos1.x -= gBattleAnimArgs[0];
         gBattleAnimArgs[3] *= -1;
     } else {
@@ -1913,14 +1913,14 @@ void sub_807A5C4(struct Sprite *sprite) {
 
 void sub_807A63C(struct Sprite *sprite) {
     sub_8078650(sprite);
-    if (GetBankSide(gBattleAnimBankAttacker)) {
+    if (GetBankSide(gAnimBankAttacker)) {
         sprite->pos1.x -= gBattleAnimArgs[0];
     } else {
         sprite->pos1.x += gBattleAnimArgs[0];
     }
     sprite->pos1.y += gBattleAnimArgs[1];
     sprite->callback = sub_8078600;
-    StoreSpriteCallbackInData(sprite, move_anim_8072740);
+    StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
 }
 
 void sub_807A69C(u8 taskId) {
@@ -1928,7 +1928,7 @@ void sub_807A69C(u8 taskId) {
     u16 dest;
     struct Task *task = &gTasks[taskId];
     task->data[0] = GetAnimBankSpriteId(0);
-    task->data[1] = (GetBankSide(gBattleAnimBankAttacker)) ? -8 : 8;
+    task->data[1] = (GetBankSide(gAnimBankAttacker)) ? -8 : 8;
     task->data[2] = 0;
     task->data[3] = 0;
     gSprites[task->data[0]].pos2.x -= task->data[0];
@@ -1937,7 +1937,7 @@ void sub_807A69C(u8 taskId) {
 
     dest = (task->data[4] + 0x10) * 0x10;
     src = (gSprites[task->data[0]].oam.paletteNum + 0x10) * 0x10;
-    task->data[6] = sub_8079E90(gBattleAnimBankAttacker);
+    task->data[6] = sub_8079E90(gAnimBankAttacker);
     if (task->data[6] == 20 || task->data[6] == 40) {
         task->data[6] = 2;
     } else {
@@ -1998,9 +1998,9 @@ void sub_807A8D4(struct Sprite *sprite) {
 }
 
 void sub_807A908(struct Sprite *sprite) {
-    sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2);
-    sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 3);
-    if (!GetBankSide(gBattleAnimBankAttacker)) {
+    sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2);
+    sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3);
+    if (!GetBankSide(gAnimBankAttacker)) {
         sprite->data[0] = 5;
     } else {
         sprite->data[0] = -10;
@@ -2018,7 +2018,7 @@ void sub_807A960(struct Sprite *sprite) {
         sprite->data[1]++;
     }
     if ((sprite->pos1.y + sprite->pos2.y) < -32) {
-        move_anim_8072740(sprite);
+        DestroyAnimSprite(sprite);
     }
 }
 
@@ -2027,7 +2027,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 (!GetBankSide(gBattleAnimBankTarget)) {
+    if (!GetBankSide(gAnimBankTarget)) {
         x = (u16)gBattleAnimArgs[4] + 30;
         sprite->pos1.x += x;
         sprite->pos1.y = gBattleAnimArgs[5] - 20;
@@ -2037,5 +2037,5 @@ void sub_807A9BC(struct Sprite *sprite) {
         sprite->pos1.y = gBattleAnimArgs[5] - 80;
     }
     sprite->callback = sub_8078B34;
-    StoreSpriteCallbackInData(sprite, move_anim_8072740);
+    StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
 }
diff --git a/src/scene/evolution_scene.c b/src/scene/evolution_scene.c
index e0b42e1c7..f307f5979 100644
--- a/src/scene/evolution_scene.c
+++ b/src/scene/evolution_scene.c
@@ -67,10 +67,10 @@ bool32 IsHMMove2(u16 move);
 extern struct Window gUnknown_03004210;
 extern u16 gUnknown_030042A4;
 extern u16 gUnknown_030042A0;
-extern u16 gUnknown_030042C0;
-extern u16 gUnknown_030041B4;
-extern u16 gUnknown_03004288;
-extern u16 gUnknown_03004280;
+extern u16 gBattle_BG1_X;
+extern u16 gBattle_BG1_Y;
+extern u16 gBattle_BG2_X;
+extern u16 gBattle_BG2_Y;
 extern u16 gUnknown_030041B0;
 extern u16 gUnknown_030041B8;
 extern u8 gBattleTerrain;
@@ -202,10 +202,10 @@ void EvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, bool8 canStopEvo,
 
     gUnknown_030042A4 = 0;
     gUnknown_030042A0 = 0;
-    gUnknown_030042C0 = 0;
-    gUnknown_030041B4 = 0;
-    gUnknown_03004288 = 0;
-    gUnknown_03004280 = 0;
+    gBattle_BG1_X = 0;
+    gBattle_BG1_Y = 0;
+    gBattle_BG2_X = 0;
+    gBattle_BG2_Y = 0;
     gUnknown_030041B0 = 256;
     gUnknown_030041B8 = 0;
 
@@ -310,10 +310,10 @@ static void CB2_EvolutionSceneLoadGraphics(void)
     ResetPaletteFade();
     gUnknown_030042A4 = 0;
     gUnknown_030042A0 = 0;
-    gUnknown_030042C0 = 0;
-    gUnknown_030041B4 = 0;
-    gUnknown_03004288 = 0;
-    gUnknown_03004280 = 0;
+    gBattle_BG1_X = 0;
+    gBattle_BG1_Y = 0;
+    gBattle_BG2_X = 0;
+    gBattle_BG2_Y = 0;
     gUnknown_030041B0 = 256;
     gUnknown_030041B8 = 0;
 
@@ -364,10 +364,10 @@ static void CB2_TradeEvolutionSceneLoadGraphics(void)
         gReservedSpritePaletteCount = 4;
         gUnknown_030042A4 = 0;
         gUnknown_030042A0 = 0;
-        gUnknown_030042C0 = 0;
-        gUnknown_030041B4 = 0;
-        gUnknown_03004288 = 0;
-        gUnknown_03004280 = 0;
+        gBattle_BG1_X = 0;
+        gBattle_BG1_Y = 0;
+        gBattle_BG2_X = 0;
+        gBattle_BG2_Y = 0;
         gUnknown_030041B0 = 256;
         gUnknown_030041B8 = 0;
         gMain.state++;
@@ -3925,10 +3925,10 @@ static void VBlankCB_EvolutionScene(void)
     REG_BG0CNT = BGCNT_SCREENBASE(24) | BGCNT_16COLOR | BGCNT_TXT256x256 | BGCNT_AFF512x512 | BGCNT_PRIORITY(3); // 0x9803
     REG_BG0HOFS = gUnknown_030042A4;
     REG_BG0VOFS = gUnknown_030042A0;
-    REG_BG1HOFS = gUnknown_030042C0;
-    REG_BG1VOFS = gUnknown_030041B4;
-    REG_BG2HOFS = gUnknown_03004288;
-    REG_BG2VOFS = gUnknown_03004280;
+    REG_BG1HOFS = gBattle_BG1_X;
+    REG_BG1VOFS = gBattle_BG1_Y;
+    REG_BG2HOFS = gBattle_BG2_X;
+    REG_BG2VOFS = gBattle_BG2_Y;
     REG_BG3HOFS = gUnknown_030041B0;
     REG_BG3VOFS = gUnknown_030041B8;
     LoadOam();
@@ -3941,10 +3941,10 @@ static void VBlankCB_TradeEvolutionScene(void)
 {
     REG_BG0HOFS = gUnknown_030042A4;
     REG_BG0VOFS = gUnknown_030042A0;
-    REG_BG1HOFS = gUnknown_030042C0;
-    REG_BG1VOFS = gUnknown_030041B4;
-    REG_BG2HOFS = gUnknown_03004288;
-    REG_BG2VOFS = gUnknown_03004280;
+    REG_BG1HOFS = gBattle_BG1_X;
+    REG_BG1VOFS = gBattle_BG1_Y;
+    REG_BG2HOFS = gBattle_BG2_X;
+    REG_BG2VOFS = gBattle_BG2_Y;
     REG_BG3HOFS = gUnknown_030041B0;
     REG_BG3VOFS = gUnknown_030041B8;
     LoadOam();
diff --git a/src/scene/title_screen.c b/src/scene/title_screen.c
index f158500fe..26fe088d5 100644
--- a/src/scene/title_screen.c
+++ b/src/scene/title_screen.c
@@ -41,8 +41,8 @@
 
 extern u8 gReservedSpritePaletteCount;
 extern struct MusicPlayerInfo gMPlay_BGM;
-extern u16 gUnknown_030041B4;
-extern u16 gUnknown_030042C0;
+extern u16 gBattle_BG1_Y;
+extern u16 gBattle_BG1_X;
 extern const u8 gUnknown_08E9D8CC[];
 extern const u16 gUnknown_08E9F624[];
 extern const u8 gUnknown_08E9F7E4[];
@@ -602,7 +602,7 @@ static void VBlankCB(void)
     LoadOam();
     ProcessSpriteCopyRequests();
     TransferPlttBuffer();
-    REG_BG1VOFS = gUnknown_030041B4;
+    REG_BG1VOFS = gBattle_BG1_Y;
 }
 
 
@@ -836,8 +836,8 @@ static void Task_TitleScreenPhase3(u8 taskId)
             if (gTasks[taskId].tCounter & 1)
             {
                 gTasks[taskId].data[4]++;
-                gUnknown_030041B4 = gTasks[taskId].data[4];
-                gUnknown_030042C0 = 0;
+                gBattle_BG1_Y = gTasks[taskId].data[4];
+                gBattle_BG1_X = 0;
             }
             UpdateLegendaryMarkingColor(gTasks[taskId].tCounter);
             if ((gMPlay_BGM.status & 0xFFFF) == 0)
diff --git a/src/unknown_task.c b/src/unknown_task.c
index 0cc59fc66..c9ba95d42 100644
--- a/src/unknown_task.c
+++ b/src/unknown_task.c
@@ -8,13 +8,13 @@ static void sub_80896F4(void);
 static void sub_8089714(void);
 
 extern u16 gUnknown_030041B0;
-extern u16 gUnknown_030041B4;
+extern u16 gBattle_BG1_Y;
 extern u16 gUnknown_030041B8;
-extern u16 gUnknown_03004280;
-extern u16 gUnknown_03004288;
+extern u16 gBattle_BG2_Y;
+extern u16 gBattle_BG2_X;
 extern u16 gUnknown_030042A0;
 extern u16 gUnknown_030042A4;
-extern u16 gUnknown_030042C0;
+extern u16 gBattle_BG1_X;
 
 extern u8 gUnknown_0202FFA4;
 
@@ -125,16 +125,16 @@ static void task00_for_dp12(u8 taskId)
                 value = gUnknown_030042A0;
                 break;
             case 0x4:
-                value = gUnknown_030042C0;
+                value = gBattle_BG1_X;
                 break;
             case 0x6:
-                value = gUnknown_030041B4;
+                value = gBattle_BG1_Y;
                 break;
             case 0x8:
-                value = gUnknown_03004288;
+                value = gBattle_BG2_X;
                 break;
             case 0xA:
-                value = gUnknown_03004280;
+                value = gBattle_BG2_Y;
                 break;
             case 0xC:
                 value = gUnknown_030041B0;
author	Marcus Huderle <huderlem@gmail.com>	2017-12-27 13:15:01 -0600
committer	Marcus Huderle <huderlem@gmail.com>	2017-12-27 13:15:01 -0600
commit	16e0d8089194a8d098da47c7a7b07fbc4dcc0292 (patch)
tree	b92766b1ed1710c7d8ea0492c160e0a39a3dc539 /src
parent	86a36767dba19e84297047addf1d1d776e2efdec (diff)