summaryrefslogtreecommitdiff
path: root/src/battle/anim
diff options
context:
space:
mode:
authorProjectRevoTPP <projectrevotpp@hotmail.com>2018-01-28 20:18:00 -0500
committerProjectRevoTPP <projectrevotpp@hotmail.com>2018-01-28 20:18:00 -0500
commit6bef5a2622b432049df9c8b581e21ae09965b02c (patch)
treed764c1d61d17018c41ef9eab403137d5aeef17d0 /src/battle/anim
parent4327bee485510b424cbf28e450d90ff50e6fe78b (diff)
parente92ead0e159ccaa8301b189b9ef2bb1a33b2ea62 (diff)
merge
Diffstat (limited to 'src/battle/anim')
-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;