From bb4f00737e7b0e432f38217ac3030f7df85e3c96 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Tue, 10 Nov 2020 14:26:47 -0300 Subject: [PATCH] B_EXPANDED_INTIMIDATE->B_UPDATED_INTIMIDATE --- data/battle_scripts_1.s | 2 +- include/constants/battle_config.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 1fa38f04fb..35cc4fb4ee 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -6756,7 +6756,7 @@ 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 +#if B_UPDATED_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 diff --git a/include/constants/battle_config.h b/include/constants/battle_config.h index 19ea0a0280..374a4b54f6 100644 --- a/include/constants/battle_config.h +++ b/include/constants/battle_config.h @@ -106,7 +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. +#define B_UPDATED_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.