diff options
| author | Cameron Hall <cameronghall@cox.net> | 2018-01-27 16:51:06 -0600 |
|---|---|---|
| committer | Cameron Hall <cameronghall@cox.net> | 2018-01-27 16:51:06 -0600 |
| commit | 0597628ae78755f4e30ae6bc79b3075e5b9c8ab8 (patch) | |
| tree | 0b2964103554e55ba4e03d4dbe8103bc8f06fc41 /src/battle/anim/guard.c | |
| parent | 8aae2583eb851d1442b85e28d7bcb13a15c1818d (diff) | |
| parent | e92ead0e159ccaa8301b189b9ef2bb1a33b2ea62 (diff) | |
Merge branch 'master' into german_debug
Diffstat (limited to 'src/battle/anim/guard.c')
| -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; |