diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-01-26 22:17:40 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-26 22:17:40 -0800 |
| commit | e92ead0e159ccaa8301b189b9ef2bb1a33b2ea62 (patch) | |
| tree | e68a661388fea41c88dbb7b8d2f05618f847310a /src | |
| parent | 914f7fc6645ee456994f7a34bc6dac2c165a6392 (diff) | |
| parent | e8bddb83db39e4352fd2f44d21e761de1174451d (diff) | |
Merge pull request #555 from huderlem/oopsy
Use BATTLE_TYPE_DOUBLE constant in guard.c
Diffstat (limited to 'src')
| -rw-r--r-- | src/battle/anim/guard.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/battle/anim/guard.c b/src/battle/anim/guard.c index ab093eab1..254160109 100644 --- a/src/battle/anim/guard.c +++ b/src/battle/anim/guard.c @@ -1,4 +1,5 @@ #include "global.h" +#include "battle.h" #include "battle_anim.h" #include "rom_8077ABC.h" @@ -12,7 +13,7 @@ extern u16 gBattleTypeFlags; void sub_80D3014(struct Sprite *sprite) { - if ((gBattleTypeFlags & 1) && IsAnimBankSpriteVisible(gAnimBankAttacker ^ 2)) + if ((gBattleTypeFlags & BATTLE_TYPE_DOUBLE) && IsAnimBankSpriteVisible(gAnimBankAttacker ^ 2)) { sub_807A3FC(gAnimBankAttacker, 0, &sprite->pos1.x, &sprite->pos1.y); sprite->pos1.y += 40; |