Merge branch 'master' into cable_car

1 files changed, 7 insertions, 7 deletions

diff --git a/src/battle/anim/guard.c b/src/battle/anim/guard.c
index 4769db2e4..ab093eab1 100644
--- a/src/battle/anim/guard.c
+++ b/src/battle/anim/guard.c
@@ -3,8 +3,8 @@
 #include "rom_8077ABC.h"
 
 extern s16 gBattleAnimArgs[8];
-extern u8 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 extern u16 gBattleTypeFlags;
 
 // guard (moves guard rings upwards)
@@ -12,17 +12,17 @@ extern u16 gBattleTypeFlags;
 
 void sub_80D3014(struct Sprite *sprite)
 {
-    if ((gBattleTypeFlags & 1) && IsAnimBankSpriteVisible(gBattleAnimBankAttacker ^ 2))
+    if ((gBattleTypeFlags & 1) && IsAnimBankSpriteVisible(gAnimBankAttacker ^ 2))
     {
-        sub_807A3FC(gBattleAnimBankAttacker, 0, &sprite->pos1.x, &sprite->pos1.y);
+        sub_807A3FC(gAnimBankAttacker, 0, &sprite->pos1.x, &sprite->pos1.y);
         sprite->pos1.y += 40;
 
         StartSpriteAffineAnim(sprite, 1);
     }
     else
     {
-        sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 0);
-        sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 1) + 40;
+        sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 0);
+        sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 1) + 40;
     }
 
     sprite->data[0] = 13;
@@ -30,5 +30,5 @@ void sub_80D3014(struct Sprite *sprite)
     sprite->data[4] = sprite->pos1.y - 72;
 
     sprite->callback = sub_8078B34;
-    StoreSpriteCallbackInData(sprite, move_anim_8072740);
+    StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
 }