From e7cd8c59f4ca0f6c56a3b3782c21e896c203694e Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 22 Jan 2020 20:07:46 -0500 Subject: Remove unused BF battle types, clarify Ghost battle type flags --- src/battle_main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/battle_main.c') diff --git a/src/battle_main.c b/src/battle_main.c index 9f3477659..51509513f 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -2559,9 +2559,9 @@ static void BattleIntroDrawTrainersOrMonsSprites(void) { if (GetBattlerSide(gActiveBattler) == B_SIDE_OPPONENT) { - if (gBattleTypeFlags & (BATTLE_TYPE_GHOST | BATTLE_TYPE_LEGENDARY)) + if (gBattleTypeFlags & (BATTLE_TYPE_GHOST | BATTLE_TYPE_GHOST_UNVEILED)) { - if ((gBattleTypeFlags & (BATTLE_TYPE_GHOST | BATTLE_TYPE_LEGENDARY)) != BATTLE_TYPE_GHOST) + if (!IS_BATTLE_TYPE_GHOST_WITHOUT_SCOPE(gBattleTypeFlags)) HandleSetPokedexFlag(SpeciesToNationalPokedexNum(gBattleMons[gActiveBattler].species), FLAG_SET_SEEN, gBattleMons[gActiveBattler].personality); } else if (!(gBattleTypeFlags & (BATTLE_TYPE_EREADER_TRAINER @@ -2674,7 +2674,7 @@ static void BattleIntroPrintWildMonAttacked(void) { gBattleMainFunc = BattleIntroPrintPlayerSendsOut; PrepareStringBattle(STRINGID_INTROMSG, 0); - if ((gBattleTypeFlags & (BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_GHOST)) == (BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_GHOST)) + if (IS_BATTLE_TYPE_GHOST_WITH_SCOPE(gBattleTypeFlags)) { gBattleScripting.battler = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT); BattleScriptExecute(BattleScript_SilphScopeUnveiled); @@ -4183,7 +4183,7 @@ bool8 TryRunFromBattle(u8 battler) gProtectStructs[battler].fleeFlag = 2; ++effect; } - else if ((gBattleTypeFlags & (BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_GHOST)) == BATTLE_TYPE_GHOST) + else if (IS_BATTLE_TYPE_GHOST_WITHOUT_SCOPE(gBattleTypeFlags)) { if (GetBattlerSide(battler) == B_SIDE_PLAYER) ++effect; -- cgit v1.2.3