Merge pull request #502 from huderlem/misc_ports

Misc ports from pokeemerald

1 files changed, 7 insertions, 7 deletions

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