From 791fd5e709246de047daeab7c494236ed2f92149 Mon Sep 17 00:00:00 2001
From: Evan <eroelke@gmail.com>
Date: Wed, 3 Mar 2021 09:25:25 -0700
Subject: [PATCH] finish berry hold effects

---
 include/constants/hold_effects.h |  6 ++++++
 src/data/items.h                 | 14 +++++++-------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/include/constants/hold_effects.h b/include/constants/hold_effects.h
index 54c1d004ad..ddbb51c655 100644
--- a/include/constants/hold_effects.h
+++ b/include/constants/hold_effects.h
@@ -104,6 +104,12 @@
 #define HOLD_EFFECT_RESIST_BERRY   98
 #define HOLD_EFFECT_POWER_ITEM     99
 #define HOLD_EFFECT_RESTORE_PCT_HP 100
+#define HOLD_EFFECT_MICLE_BERRY    101
+#define HOLD_EFFECT_CUSTAP_BERRY   102
+#define HOLD_EFFECT_JABOCA_BERRY   103
+#define HOLD_EFFECT_ROWAP_BERRY    104
+#define HOLD_EFFECT_KEE_BERRY      105
+#define HOLD_EFFECT_MARANGA_BERRY  106
 
 // Gen5 hold effects
 #define HOLD_EFFECT_FLOAT_STONE    115
diff --git a/src/data/items.h b/src/data/items.h
index cd3a23f5bd..17d8ceb8f3 100644
--- a/src/data/items.h
+++ b/src/data/items.h
@@ -2223,7 +2223,7 @@ const struct Item gItems[] =
         .name = _("Micle Berry"),
         .itemId = ITEM_MICLE_BERRY,
         .price = 20,
-        .holdEffect = HOLD_EFFECT_NONE, // Placeholder
+        .holdEffect = HOLD_EFFECT_MICLE_BERRY,
         .holdEffectParam = 4,
         .description = sMicleBerryDesc,
         .pocket = POCKET_BERRIES,
@@ -2483,8 +2483,8 @@ const struct Item gItems[] =
         .name = _("Custap Berry"),
         .itemId = ITEM_CUSTAP_BERRY,
         .price = 20,
-        .holdEffect = HOLD_EFFECT_NONE, // To Do
-        .holdEffectParam = TYPE_FAIRY,
+        .holdEffect = HOLD_EFFECT_CUSTAP_BERRY,
+        .holdEffectParam = 0,
         .description = sCustapBerryDesc,
         .pocket = POCKET_BERRIES,
         .type = ITEM_USE_BAG_MENU,
@@ -2496,7 +2496,7 @@ const struct Item gItems[] =
         .name = _("Jaboca Berry"),
         .itemId = ITEM_JABOCA_BERRY,
         .price = 20,
-        .holdEffect = HOLD_EFFECT_NONE, // To Do
+        .holdEffect = HOLD_EFFECT_JABOCA_BERRY,
         .holdEffectParam = TYPE_FAIRY,
         .description = sJabocaBerryDesc,
         .pocket = POCKET_BERRIES,
@@ -2509,7 +2509,7 @@ const struct Item gItems[] =
         .name = _("Rowap Berry"),
         .itemId = ITEM_ROWAP_BERRY,
         .price = 20,
-        .holdEffect = HOLD_EFFECT_NONE, // To Do
+        .holdEffect = HOLD_EFFECT_ROWAP_BERRY,
         .holdEffectParam = TYPE_FAIRY,
         .description = sRowapBerryDesc,
         .pocket = POCKET_BERRIES,
@@ -2522,7 +2522,7 @@ const struct Item gItems[] =
         .name = _("Kee Berry"),
         .itemId = ITEM_KEE_BERRY,
         .price = 20,
-        .holdEffect = HOLD_EFFECT_NONE, // To Do
+        .holdEffect = HOLD_EFFECT_HOLD_EFFECT_KEE_BERRY,
         .holdEffectParam = TYPE_FAIRY,
         .description = sKeeBerryDesc,
         .pocket = POCKET_BERRIES,
@@ -2535,7 +2535,7 @@ const struct Item gItems[] =
         .name = _("Maranga Berry"),
         .itemId = ITEM_MARANGA_BERRY,
         .price = 20,
-        .holdEffect = HOLD_EFFECT_NONE, // To Do
+        .holdEffect = HOLD_EFFECT_HOLD_EFFECT_MARANGA_BERRY,
         .holdEffectParam = TYPE_FAIRY,
         .description = sMarangaBerryDesc,
         .pocket = POCKET_BERRIES,