From eb26039f33065725554539b6a6b63b8ada98fa3d Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Tue, 13 Jun 2023 06:03:37 -0300 Subject: [PATCH] Adjusted Triple Arrows' checks --- src/battle_script_commands.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index f48e764884..79337250fd 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -3872,12 +3872,15 @@ void SetMoveEffect(bool32 primary, u32 certain) BattleScriptPush(gBattlescriptCurrInstr + 1); gBattlescriptCurrInstr = BattleScript_ReduceDefenseAndFlinch; } - else if (randomLowerDefenseChance) + else if (randomLowerDefenseChance && !randomFlinchChance) { BattleScriptPush(gBattlescriptCurrInstr + 1); gBattlescriptCurrInstr = BattleScript_DefDown; } - else if (randomFlinchChance && battlerAbility != ABILITY_INNER_FOCUS && GetBattlerTurnOrderNum(gEffectBattler) > gCurrentTurnActionNumber) + else if (randomFlinchChance + && !randomLowerDefenseChance + && battlerAbility != ABILITY_INNER_FOCUS + && GetBattlerTurnOrderNum(gEffectBattler) > gCurrentTurnActionNumber) { gBattleMons[gEffectBattler].status2 |= sStatusFlagsForMoveEffects[MOVE_EFFECT_FLINCH]; gBattlescriptCurrInstr++;