Merge pull request #296 from kleeenexfeu/master

Serene Grace affects king's rock
BuffelSaft · Nov 11, 2021 · 6df2bb9 · 6df2bb9
2 parents 3f062c9 + cb35505
commit 6df2bb9
Showing 1 changed file with 2 additions and 0 deletions.
diff --git 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