Merge pull request #502 from huderlem/misc_ports

Misc ports from pokeemerald

1 files changed, 6 insertions, 6 deletions

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