summaryrefslogtreecommitdiff
path: root/src/battle/anim/alert.c
diff options
context:
space:
mode:
authorMarco Willems (M17.1) <progreon@gmail.com>2017-12-31 13:16:44 +0100
committerMarco Willems (M17.1) <progreon@gmail.com>2017-12-31 13:16:44 +0100
commitd0ae8995292ce6483dc3fb656090425c4638bd4f (patch)
tree91015855cd1bc71bdf03b2806effae82ded2e0a3 /src/battle/anim/alert.c
parentba5e6c8a32c617f0d70e62968bf13023d1e1ff5e (diff)
parent153ddde3b90c893b47d5c844b2a58c707038e6b4 (diff)
merged
Diffstat (limited to 'src/battle/anim/alert.c')
-rwxr-xr-xsrc/battle/anim/alert.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/battle/anim/alert.c b/src/battle/anim/alert.c
index 538008be0..7cd42c17b 100755
--- a/src/battle/anim/alert.c
+++ b/src/battle/anim/alert.c
@@ -5,8 +5,8 @@
#include "sound.h"
extern s16 gBattleAnimArgs[];
-extern u8 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
// alert (red thunder from the sides of a Pokemon, simulating more alert behavior.)
// Used in Kinesis.
@@ -16,7 +16,7 @@ void sub_80CF610(struct Sprite* sprite)
sub_8078650(sprite);
sub_807867C(sprite, gBattleAnimArgs[0]);
sprite->pos1.y += gBattleAnimArgs[1];
- if (GetBankSide(gBattleAnimBankAttacker) != 0)
+ if (GetBankSide(gAnimBankAttacker) != 0)
{
sprite->hFlip = 1;
if (gBattleAnimArgs[2] != 0)
@@ -29,5 +29,5 @@ void sub_80CF610(struct Sprite* sprite)
}
sprite->callback = sub_8078600;
- StoreSpriteCallbackInData(sprite, move_anim_8072740);
+ StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
}