From 544d59850648b7fac42c4a3da64f18515f6fd1bc Mon Sep 17 00:00:00 2001 From: Evan Date: Fri, 15 Jan 2021 18:34:47 -0700 Subject: [PATCH] update tailwind timer --- include/constants/battle_config.h | 1 + src/battle_script_commands.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/include/constants/battle_config.h b/include/constants/battle_config.h index 2c179f9d5d..c249c19164 100644 --- a/include/constants/battle_config.h +++ b/include/constants/battle_config.h @@ -112,6 +112,7 @@ #define B_PP_REDUCED_BY_SPITE GEN_6 // In Gen4+, Spite reduces the foe's last move's PP by 4, instead of 2 to 5. #define B_CAN_SPITE_FAIL GEN_6 // In Gen4+, Spite can no longer fail if the foe's last move only has 1 remaining PP. #define B_CRASH_IF_TARGET_IMMUNE GEN_6 // In Gen4+, The user of Jump Kick or Hi Jump Kick will "keep going and crash" if it attacks a target that is immune to the move. +#define B_TAILWIND_TIMER GEN_5 // In Gen5+, Tailwind lasts 4 turns instead of 3. // Ability settings #define B_ABILITY_WEATHER GEN_6 // In Gen6+, ability-induced weather lasts 5 turns. Before, it lasted until the battle ended or until it was changed by a move. diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 6c5f37a7d4..7b03fdc951 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -10208,7 +10208,7 @@ static void Cmd_settailwind(void) { gSideStatuses[side] |= SIDE_STATUS_TAILWIND; gSideTimers[side].tailwindBattlerId = gBattlerAttacker; - gSideTimers[side].tailwindTimer = 3; + gSideTimers[side].tailwindTimer = (B_TAILWIND_TIMER >= GEN_5) ? 4 : 3; gBattlescriptCurrInstr += 5; } else