From a3b891bd653434fa6587275724e334650b502ec3 Mon Sep 17 00:00:00 2001 From: BuffelSaft Date: Mon, 7 Dec 2020 19:41:49 +1300 Subject: [PATCH] Cap recoil for Gen 4 Jump Kick Jump Kick's recoil in Gen 4 cannot exceed half of the target's maximum HP. --- src/battle_script_commands.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 58e4cf60da..2de22dd989 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -8583,8 +8583,10 @@ static void Cmd_manipulatedamage(void) gBattleMoveDamage /= 2; if (gBattleMoveDamage == 0) gBattleMoveDamage = 1; - if (B_RECOIL_IF_MISS_DMG >= GEN_5 || ((gBattleMons[gBattlerTarget].maxHP / 2) < gBattleMoveDamage)) + if (B_RECOIL_IF_MISS_DMG >= GEN_5) gBattleMoveDamage = gBattleMons[gBattlerAttacker].maxHP / 2; + if ((B_RECOIL_IF_MISS_DMG <= GEN_4) && ((gBattleMons[gBattlerTarget].maxHP / 2) < gBattleMoveDamage)) + gBattleMoveDamage = gBattleMons[gBattlerTarget].maxHP / 2; break; case DMG_DOUBLED: gBattleMoveDamage *= 2;