From 946ef4a2ba1d8438f71b05a7fd1b34e06cee4995 Mon Sep 17 00:00:00 2001 From: kleeenexfeu <94004034+kleeenexfeu@users.noreply.github.com> Date: Wed, 10 Nov 2021 21:01:35 +0100 Subject: [PATCH 1/2] Serene Grace affects king's rock https://bulbapedia.bulbagarden.net/wiki/King%27s_Rock --- src/battle_util.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/battle_util.c b/src/battle_util.c index c005846fdb4f..569526fd894b 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -6969,6 +6969,8 @@ case ITEMEFFECT_KINGSROCK: switch (atkHoldEffect) { case HOLD_EFFECT_FLINCH: + if (GetBattlerAbility(gBattlerAttacker) == ABILITY_SERENE_GRACE) + atkHoldEffectParam *= 2}; if (gBattleMoveDamage != 0 // Need to have done damage && !(gMoveResultFlags & MOVE_RESULT_NO_EFFECT) && TARGET_TURN_DAMAGED From cb3550561b0208a8b880ae04c7389686d631a7a7 Mon Sep 17 00:00:00 2001 From: kleeenexfeu <94004034+kleeenexfeu@users.noreply.github.com> Date: Wed, 10 Nov 2021 21:11:23 +0100 Subject: [PATCH 2/2] bracket --- src/battle_util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/battle_util.c b/src/battle_util.c index 569526fd894b..cd5821f110d2 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -6970,7 +6970,7 @@ case ITEMEFFECT_KINGSROCK: { case HOLD_EFFECT_FLINCH: if (GetBattlerAbility(gBattlerAttacker) == ABILITY_SERENE_GRACE) - atkHoldEffectParam *= 2}; + atkHoldEffectParam *= 2; if (gBattleMoveDamage != 0 // Need to have done damage && !(gMoveResultFlags & MOVE_RESULT_NO_EFFECT) && TARGET_TURN_DAMAGED