Merge branch 'master' into cable_car

1 files changed, 5 insertions, 5 deletions

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];