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/battle_util.c | |
| parent | ef1f9ead0ba44c67185dccc616846646d7ce9257 (diff) | |
| parent | 85e5c57e8c86cca00e8bfc7d54e21d08c9e62e69 (diff) | |
Merge branch 'master' into doc-ttower
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) |