Merge branch 'master' into slot_machine

1 files changed, 5 insertions, 5 deletions

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);
 }