From b4db3b6a813ea84bba39d748f3192514a7433a8d Mon Sep 17 00:00:00 2001 From: kittenchilly Date: Thu, 7 Sep 2023 15:32:26 -0500 Subject: [PATCH] Add enigma berry effect --- src/battle_util.c | 9 +++++++++ src/data/items.h | 1 + 2 files changed, 10 insertions(+) diff --git a/src/battle_util.c b/src/battle_util.c index 1ff0a762e..cd73d4577 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -7761,6 +7761,15 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) gBattleScripting.statChanger = SET_STATCHANGER(STAT_SPATK, 1, FALSE); } break; + case HOLD_EFFECT_ENIGMA_BERRY: // consume and heal if hit by super effective move + if (IsBattlerAlive(battlerId) + && TARGET_TURN_DAMAGED + && gMoveResultFlags & MOVE_RESULT_SUPER_EFFECTIVE) + { + effect = ItemHealHp(battlerId, gLastUsedItem, TRUE, TRUE); + } + break; + case HOLD_EFFECT_JABOCA_BERRY: // consume and damage attacker if used physical move if (IsBattlerAlive(battlerId) && TARGET_TURN_DAMAGED diff --git a/src/data/items.h b/src/data/items.h index 5e15b2734..98940277b 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -7630,6 +7630,7 @@ const struct Item gItems[] = .itemId = ITEM_ENIGMA_BERRY, .price = 20, .holdEffect = HOLD_EFFECT_ENIGMA_BERRY, + .holdEffectParam = 25, .description = sEnigmaBerryDesc, .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU,