summaryrefslogtreecommitdiff
path: root/src/battle/anim/devil.c
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2018-01-03 16:45:53 -0700
committerPikalaxALT <pikalaxalt@gmail.com>2018-01-03 16:45:53 -0700
commit4df728666e55b47480467fbea86f48dadcb81c97 (patch)
tree6a8413c90ec9d68c54389e1a54f6de9f12bb686c /src/battle/anim/devil.c
parent9b2ebe671fe77298d0b1adcb5d87cbb2bd01cd3e (diff)
parent397f32f29dbcd8fb6ad47afe5ba1ee354ca2b5c7 (diff)
Merge branch 'master' into slot_machine
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);
}