diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-24 03:03:45 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-24 03:03:45 -0500 |
| commit | 39556605cd27a567a45bfc2c46af745ac031ab90 (patch) | |
| tree | c2ff7645625d62e94b369080ba37071eb98426d1 /src/reshow_battle_screen.c | |
| parent | ef1f9ead0ba44c67185dccc616846646d7ce9257 (diff) | |
| parent | 85e5c57e8c86cca00e8bfc7d54e21d08c9e62e69 (diff) | |
Merge branch 'master' into doc-ttower
Diffstat (limited to 'src/reshow_battle_screen.c')
| -rw-r--r-- | src/reshow_battle_screen.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/reshow_battle_screen.c b/src/reshow_battle_screen.c index 5ab38e461..ebfd18493 100644 --- a/src/reshow_battle_screen.c +++ b/src/reshow_battle_screen.c @@ -202,7 +202,7 @@ static bool8 LoadBattlerSpriteGfx(u8 battler) { if (GetBattlerSide(battler) != B_SIDE_PLAYER) { - if ((gBattleTypeFlags & (BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_GHOST)) == BATTLE_TYPE_GHOST) + if (IS_BATTLE_TYPE_GHOST_WITHOUT_SCOPE(gBattleTypeFlags)) DecompressGhostFrontPic(&gEnemyParty[gBattlerPartyIndexes[battler]], battler); else if (!gBattleSpritesDataPtr->battlerData[battler].behindSubstitute) BattleLoadOpponentMonSpriteGfx(&gEnemyParty[gBattlerPartyIndexes[battler]], battler); @@ -228,7 +228,7 @@ static void CreateBattlerSprite(u8 battler) { u8 posY; - if ((gBattleTypeFlags & (BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_GHOST)) == BATTLE_TYPE_GHOST) + if (IS_BATTLE_TYPE_GHOST_WITHOUT_SCOPE(gBattleTypeFlags)) posY = GetGhostSpriteDefault_Y(battler); else if (gBattleSpritesDataPtr->battlerData[battler].behindSubstitute) posY = GetSubstituteSpriteDefault_Y(battler); |