diff options
author | Marco Willems (M17.1) <progreon@gmail.com> | 2017-12-31 13:16:44 +0100 |
---|---|---|
committer | Marco Willems (M17.1) <progreon@gmail.com> | 2017-12-31 13:16:44 +0100 |
commit | d0ae8995292ce6483dc3fb656090425c4638bd4f (patch) | |
tree | 91015855cd1bc71bdf03b2806effae82ded2e0a3 /src/battle/anim/guillotine.c | |
parent | ba5e6c8a32c617f0d70e62968bf13023d1e1ff5e (diff) | |
parent | 153ddde3b90c893b47d5c844b2a58c707038e6b4 (diff) |
merged
Diffstat (limited to 'src/battle/anim/guillotine.c')
-rwxr-xr-x | src/battle/anim/guillotine.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/battle/anim/guillotine.c b/src/battle/anim/guillotine.c index b710f372a..b3d842cdf 100755 --- a/src/battle/anim/guillotine.c +++ b/src/battle/anim/guillotine.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80D02D0(struct Sprite* sprite); static void sub_80D0344(struct Sprite* sprite); @@ -34,9 +34,9 @@ void sub_80D0228(struct Sprite* sprite) sprite->pos1.y += r4; sprite->data[0] = 6; sprite->data[1] = sprite->pos1.x; - sprite->data[2] = sub_8077ABC(gBattleAnimBankTarget, 2) + r9; + sprite->data[2] = GetBankPosition(gAnimBankTarget, 2) + r9; sprite->data[3] = sprite->pos1.y; - sprite->data[4] = sub_8077ABC(gBattleAnimBankTarget, 3) + r6; + sprite->data[4] = GetBankPosition(gAnimBankTarget, 3) + r6; obj_translate_based_on_private_1_2_3_4(sprite); sprite->data[5] = gBattleAnimArgs[0]; sprite->data[6] = sprite->data[0]; @@ -86,5 +86,5 @@ void sub_80D0344(struct Sprite* sprite) void sub_80D03A8(struct Sprite* sprite) { if (sub_8078B5C(sprite) != 0) - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } |