diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-01-23 15:33:01 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-23 15:33:01 -0500 |
| commit | 85e5c57e8c86cca00e8bfc7d54e21d08c9e62e69 (patch) | |
| tree | 252bafc0e59e3531c80e3b25b0b0ede2e1373201 /src/battle_main.c | |
| parent | 5435bc4325407969b00dba8c9623fbb4f02d8cd1 (diff) | |
| parent | a01d83a4341cd0cdad01fe2d0b96920301257f2a (diff) | |
Merge pull request #237 from GriffinRichards/sync-ai
Sync AI scripts
Diffstat (limited to 'src/battle_main.c')
| -rw-r--r-- | src/battle_main.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/battle_main.c b/src/battle_main.c index 15c264369..fd8aeffbc 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; |