From 13dedfb5116ac9d61e65ddd905092308bcb03e56 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada D'Ottone Date: Mon, 11 Sep 2023 10:37:17 -0300 Subject: [PATCH] Revert "Implement Enigma Berry's hold effect" (#3298) --- src/battle_util.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/src/battle_util.c b/src/battle_util.c index 94437dca2..1ff0a762e 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -6802,21 +6802,6 @@ static u8 ItemEffectMoveEnd(u32 battlerId, u16 holdEffect) case HOLD_EFFECT_SP_DEFENSE_UP: effect = StatRaiseBerry(battlerId, gLastUsedItem, STAT_SPDEF, FALSE); break; - case HOLD_EFFECT_ENIGMA_BERRY: // consume and heal if hit by super effective move - if (IsBattlerAlive(battlerId) - && TARGET_TURN_DAMAGED - && (gBattleScripting.overrideBerryRequirements - || (!DoesSubstituteBlockMove(gBattlerAttacker, battlerId, gCurrentMove) && (gMoveResultFlags & MOVE_RESULT_SUPER_EFFECTIVE)))) - { - gBattleMoveDamage = (gBattleMons[battlerId].maxHP * 25 / 100) * -1; - if (GetBattlerAbility(battlerId) == ABILITY_RIPEN) - gBattleMoveDamage *= 2; - - BattleScriptPushCursor(); - gBattlescriptCurrInstr = BattleScript_ItemHealHP_RemoveItemRet; - return ITEM_HP_CHANGE; - } - break; case HOLD_EFFECT_KEE_BERRY: // consume and boost defense if used physical move effect = DamagedStatBoostBerryEffect(battlerId, STAT_DEF, SPLIT_PHYSICAL); break;