diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-24 05:11:37 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-01-24 05:11:37 -0500 |
| commit | ce5bc554e5739044af0c10eb6cc9231308fb28ce (patch) | |
| tree | 9bbd647b96b9a44eb897174804bf324861e78874 /src/battle_util.c | |
| parent | c63a889bf45d9cd6da0668703fad55941e531fa2 (diff) | |
| parent | 39556605cd27a567a45bfc2c46af745ac031ab90 (diff) | |
Merge branch 'doc-ttower' of https://github.com/GriffinRichards/pokefirered 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) |