summaryrefslogtreecommitdiff
path: root/src/battle/anim/devil.c
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2018-01-04 18:50:53 -0500
committerPikalaxALT <pikalaxalt@gmail.com>2018-01-04 18:50:53 -0500
commiteff6795887cc27f2c5139df9a6da70f4f02338b4 (patch)
treef91be2b0b7194b4ddff13f4935a0edafc4284a43 /src/battle/anim/devil.c
parent3ea9cff2c67b3db195c3326afc56fa0662c2327a (diff)
parentb1a7733c1cead8ed3d4a58c42d638afd0ead8ab0 (diff)
Merge branch 'master' into unk_text_8095904
Diffstat (limited to 'src/battle/anim/devil.c')
-rw-r--r--src/battle/anim/devil.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle/anim/devil.c b/src/battle/anim/devil.c
index 345ee53ea..c628abfc0 100644
--- a/src/battle/anim/devil.c
+++ b/src/battle/anim/devil.c
@@ -5,7 +5,7 @@
#include "trig.h"
extern s16 gBattleAnimArgs[8];
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankTarget;
void sub_80D2ABC(struct Sprite *sprite)
{
@@ -14,7 +14,7 @@ void sub_80D2ABC(struct Sprite *sprite)
sprite->pos1.x += gBattleAnimArgs[0];
sprite->pos1.y += gBattleAnimArgs[1];
StartSpriteAnim(sprite, 0);
- sprite->subpriority = sub_8079E90(gBattleAnimBankTarget) - 1;
+ sprite->subpriority = sub_8079E90(gAnimBankTarget) - 1;
sprite->data[2] = 1;
}
sprite->data[0] += sprite->data[2];
@@ -33,5 +33,5 @@ void sub_80D2ABC(struct Sprite *sprite)
else
sprite->invisible = FALSE;
if (sprite->data[3] > 0x5A)
- move_anim_8072740(sprite);
+ DestroyAnimSprite(sprite);
}