From e179b9b5fea61afb496be256fad039973259ae64 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Tue, 10 Nov 2020 10:18:16 -0300 Subject: [PATCH] Updated Intimidate to Gen. 8 standard --- data/battle_scripts_1.s | 6 ++++++ include/constants/battle_config.h | 1 + 2 files changed, 7 insertions(+) diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index de84e2411..fbad1db5e 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -6756,6 +6756,12 @@ BattleScript_IntimidateActivatesLoop: jumpifability BS_TARGET, ABILITY_CLEAR_BODY, BattleScript_IntimidatePrevented jumpifability BS_TARGET, ABILITY_HYPER_CUTTER, BattleScript_IntimidatePrevented jumpifability BS_TARGET, ABILITY_WHITE_SMOKE, BattleScript_IntimidatePrevented +#if B_EXPANDED_INTIMIDATE >= GEN_8 + jumpifability BS_TARGET, ABILITY_INNER_FOCUS, BattleScript_IntimidatePrevented + jumpifability BS_TARGET, ABILITY_SCRAPPY, BattleScript_IntimidatePrevented + jumpifability BS_TARGET, ABILITY_OWN_TEMPO, BattleScript_IntimidatePrevented + jumpifability BS_TARGET, ABILITY_OBLIVIOUS, BattleScript_IntimidatePrevented +#endif statbuffchange STAT_BUFF_NOT_PROTECT_AFFECTED | STAT_BUFF_ALLOW_PTR, BattleScript_IntimidateActivatesLoopIncrement jumpifbyte CMP_GREATER_THAN, cMULTISTRING_CHOOSER, 0x1, BattleScript_IntimidateActivatesLoopIncrement setgraphicalstatchangevalues diff --git a/include/constants/battle_config.h b/include/constants/battle_config.h index 9fcff614a..19ea0a028 100644 --- a/include/constants/battle_config.h +++ b/include/constants/battle_config.h @@ -106,6 +106,7 @@ #define B_MOODY_ACC_EVASION GEN_6 // In Gen8+, Moody CANNOT raise Accuray and Evasion any more. #define B_FLASH_FIRE_FROZEN GEN_6 // In Gen5+, Flash Fire can trigger even when frozen, when it couldn't before. #define B_SYNCHRONIZE_NATURE GEN_6 // In Gen8+, if the Pokémon with Synchronize is leading the party, it's 100% guaranteed that wild Pokémon will have the same ability, as opposed to 50% previously. +#define B_EXPANDED_INTIMIDATE GEN_8 // In Gen8, Intimidate doesn't work on opponents with the Inner Focus, Scrappy, Own Tempo or Oblivious abilities. // Item settings #define B_HP_BERRIES GEN_6 // In Gen4+, berries which restore hp activate immediately after hp drops to half. In gen3, the effect occurs at the end of the turn.