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_util.c | |
| parent | 5435bc4325407969b00dba8c9623fbb4f02d8cd1 (diff) | |
| parent | a01d83a4341cd0cdad01fe2d0b96920301257f2a (diff) | |
Merge pull request #237 from GriffinRichards/sync-ai
Sync AI scripts
Diffstat (limited to 'src/battle_util.c')
| -rw-r--r-- | src/battle_util.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle_util.c b/src/battle_util.c index b415f6550..d28e524a8 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -1382,7 +1382,7 @@ u8 AtkCanceller_UnableToUseMove(void) ++gBattleStruct->atkCancellerTracker; break; case CANCELLER_GHOST: // GHOST in pokemon tower - if ((gBattleTypeFlags & (BATTLE_TYPE_GHOST | BATTLE_TYPE_LEGENDARY)) == BATTLE_TYPE_GHOST) + if (IS_BATTLE_TYPE_GHOST_WITHOUT_SCOPE(gBattleTypeFlags)) { if (GetBattlerSide(gBattlerAttacker) == B_SIDE_PLAYER) gBattlescriptCurrInstr = BattleScript_TooScaredToMove; @@ -1616,7 +1616,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA if (!moveArg) moveArg = gCurrentMove; GET_MOVE_TYPE(moveArg, moveType); - if ((gBattleTypeFlags & (BATTLE_TYPE_GHOST | BATTLE_TYPE_LEGENDARY)) == BATTLE_TYPE_GHOST + if (IS_BATTLE_TYPE_GHOST_WITHOUT_SCOPE(gBattleTypeFlags) && (gLastUsedAbility == ABILITY_INTIMIDATE || gLastUsedAbility == ABILITY_TRACE)) return effect; switch (caseID) |