From d3ae05189db302fc981cfffdaf413a036b46f94b Mon Sep 17 00:00:00 2001 From: Evan Date: Tue, 5 Jan 2021 22:21:38 -0700 Subject: [PATCH] resist berry ripen boost --- src/battle_util.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/battle_util.c b/src/battle_util.c index 56e7a2928c..fcfa97e82e 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -7407,7 +7407,10 @@ static u32 CalcFinalDmg(u32 dmg, u16 move, u8 battlerAtk, u8 battlerDef, u8 move if (moveType == GetBattlerHoldEffectParam(battlerDef) && (moveType == TYPE_NORMAL || typeEffectivenessModifier >= UQ_4_12(2.0))) { - MulModifier(&finalModifier, UQ_4_12(0.5)); + if (abilityDef == ABILITY_RIPEN) + MulModifier(&finalModifier, UQ_4_12(0.25)); + else + MulModifier(&finalModifier, UQ_4_12(0.5)); if (updateFlags) gSpecialStatuses[battlerDef].berryReduced = 1; }