1 files changed, 21 insertions, 21 deletions

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
     {