diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-12-30 23:50:49 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-30 23:50:49 -0600 |
| commit | 153ddde3b90c893b47d5c844b2a58c707038e6b4 (patch) | |
| tree | 8e3e5ab774b89399bf91e9ca110f270fa9bfffde /src/battle/anim/switch.c | |
| parent | 86a36767dba19e84297047addf1d1d776e2efdec (diff) | |
| parent | c21bde059812ed521952512e4d800038e0e1deb7 (diff) | |
Merge pull request #502 from huderlem/misc_ports
Misc ports from pokeemerald
Diffstat (limited to 'src/battle/anim/switch.c')
| -rwxr-xr-x | src/battle/anim/switch.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/battle/anim/switch.c b/src/battle/anim/switch.c index a1be144df..c4082b6aa 100755 --- a/src/battle/anim/switch.c +++ b/src/battle/anim/switch.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern s8 gUnknown_083D680C[11][3]; @@ -24,7 +24,7 @@ void sub_80CBBF0(struct Sprite* sprite) if (sprite->data[0] == 0) { - if (!NotInBattle()) + if (!IsContest()) { sprite->data[1] = gBattleAnimArgs[1]; sprite->pos1.x = 0x78; @@ -101,7 +101,7 @@ void sub_80CBCF8(struct Sprite* sprite) { sprite->data[2]++; sprite->data[1] = (gUnknown_083D680C[sprite->data[0]][0] * gUnknown_083D680C[sprite->data[0]][2] + sprite->data[1]) & 0xFF; - if (!NotInBattle()) + if (!IsContest()) { if ((u16)(sprite->data[1] - 1) <= 0xBE) { @@ -121,7 +121,7 @@ void sub_80CBCF8(struct Sprite* sprite) void sub_80CBDB0(struct Sprite* sprite) { if (sprite->data[0] > 20) - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); sprite->invisible = sprite->data[0] % 2; sprite->data[0]++; |