summaryrefslogtreecommitdiff
path: root/src/battle/anim/powder.c
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2018-01-05 18:53:19 -0500
committerPikalaxALT <pikalaxalt@gmail.com>2018-01-05 18:53:19 -0500
commitf6527d12428c8a8bd2561c3da50ebb36968e061c (patch)
tree1882d862a18e61ddddf94dee1f9b4dae43336538 /src/battle/anim/powder.c
parentcbd3aa95d12bab05042025bd143a2a7cacf0b86d (diff)
parentf5fbe5b66226f4e7e38fe5d4638831d1ce19b36b (diff)
Merge branch 'master' into cable_car
Diffstat (limited to 'src/battle/anim/powder.c')
-rwxr-xr-xsrc/battle/anim/powder.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle/anim/powder.c b/src/battle/anim/powder.c
index 178a61737..a0be20d6f 100755
--- a/src/battle/anim/powder.c
+++ b/src/battle/anim/powder.c
@@ -4,7 +4,7 @@
#include "battle_anim.h"
extern s16 gBattleAnimArgs[];
-extern u8 gBattleAnimBankAttacker;
+extern u8 gAnimBankAttacker;
static void sub_80CA768(struct Sprite* sprite);
@@ -18,7 +18,7 @@ void sub_80CA710(struct Sprite* sprite)
sprite->data[0] = gBattleAnimArgs[2];
sprite->data[1] = gBattleAnimArgs[3];
- if (GetBankSide(gBattleAnimBankAttacker))
+ if (GetBankSide(gAnimBankAttacker))
{
sprite->data[3] = -gBattleAnimArgs[4];
}
@@ -43,6 +43,6 @@ void sub_80CA768(struct Sprite* sprite)
}
else
{
- move_anim_8072740(sprite);
+ DestroyAnimSprite(sprite);
}
}