summaryrefslogtreecommitdiff
path: root/src/battle/anim/guard.c
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2018-01-29 21:50:48 -0500
committerPikalaxALT <pikalaxalt@gmail.com>2018-01-29 21:50:48 -0500
commit46bc01f0dd1a3435b3c6ce71e1be0d19b7aaa5bd (patch)
tree928ec5581c3a77d459fe13a2ef278693e517f400 /src/battle/anim/guard.c
parente7c94a3c270a2a43a3a84e7cefe98d9044d93dd6 (diff)
parent1416a4c4efe8b926c809664eb63dd2c3d0f86728 (diff)
Merge branch 'master' into contest_link_80C2020
Diffstat (limited to 'src/battle/anim/guard.c')
-rw-r--r--src/battle/anim/guard.c3
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;