From 34533a9047bf661b8c5c00b3725cf61e792e8ff5 Mon Sep 17 00:00:00 2001
From: LOuroboros <lunosouroboros@gmail.com>
Date: Sat, 9 Oct 2021 00:20:56 -0300
Subject: [PATCH 1/8] Adjusted the data of the Red and Blue Orbs

---
 src/data/items.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/data/items.h b/src/data/items.h
index 7ac826a3b..aa0c951ba 100644
--- a/src/data/items.h
+++ b/src/data/items.h
@@ -3726,9 +3726,9 @@ const struct Item gItems[] =
         .name = _("Red Orb"),
         .itemId = ITEM_RED_ORB,
         .price = 0,
+        .holdEffect = HOLD_EFFECT_PRIMAL_ORB,
         .description = sRedOrbDesc,
-        .importance = 2,
-        .pocket = POCKET_KEY_ITEMS,
+        .pocket = POCKET_ITEMS,
         .type = ITEM_USE_BAG_MENU,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
     },
@@ -3738,9 +3738,9 @@ const struct Item gItems[] =
         .name = _("Blue Orb"),
         .itemId = ITEM_BLUE_ORB,
         .price = 0,
+        .holdEffect = HOLD_EFFECT_PRIMAL_ORB,
         .description = sBlueOrbDesc,
-        .importance = 2,
-        .pocket = POCKET_KEY_ITEMS,
+        .pocket = POCKET_ITEMS,
         .type = ITEM_USE_BAG_MENU,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
     },

From b9816f0f28713f4afbaef093ea0cc02d4754ac07 Mon Sep 17 00:00:00 2001
From: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
Date: Thu, 14 Oct 2021 20:38:13 -0300
Subject: [PATCH 2/8] Saftety Goggles typo for Item Expansion

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

diff --git a/include/constants/hold_effects.h b/include/constants/hold_effects.h
index 3dc4a1389..d7d74d3e1 100644
--- a/include/constants/hold_effects.h
+++ b/include/constants/hold_effects.h
@@ -130,7 +130,7 @@
 // Gen6 hold effects
 #define HOLD_EFFECT_FAIRY_POWER     139
 #define HOLD_EFFECT_MEGA_STONE      140
-#define HOLD_EFFECT_SAFETY_GOOGLES  141
+#define HOLD_EFFECT_SAFETY_GOGGLES  141
 #define HOLD_EFFECT_LUMINOUS_MOSS   142
 #define HOLD_EFFECT_SNOWBALL        143
 #define HOLD_EFFECT_WEAKNESS_POLICY 144
diff --git a/src/data/items.h b/src/data/items.h
index 7ac826a3b..02fc2ccab 100644
--- a/src/data/items.h
+++ b/src/data/items.h
@@ -6336,7 +6336,7 @@ const struct Item gItems[] =
         .name = _("SafetyGoggles"),
         .itemId = ITEM_SAFETY_GOGGLES,
         .price = 4000,
-        .holdEffect = HOLD_EFFECT_SAFETY_GOOGLES,
+        .holdEffect = HOLD_EFFECT_SAFETY_GOGGLES,
         .description = sSafetyGogglesDesc,
         .pocket = POCKET_ITEMS,
         .type = ITEM_USE_BAG_MENU,

From d31700d2aca4dbaffb677a0242cb0ef5025f9b8f Mon Sep 17 00:00:00 2001
From: LOuroboros <lunosouroboros@gmail.com>
Date: Sat, 23 Oct 2021 13:49:02 -0300
Subject: [PATCH 3/8] Replaced the Red and Blue Orbs' sprites

---
 graphics/items/icon_palettes/blue_orb.pal |  30 +++++++++++-----------
 graphics/items/icon_palettes/red_orb.pal  |  26 +++++++++----------
 graphics/items/icons/blue_orb.png         | Bin 0 -> 299 bytes
 graphics/items/icons/orb.png              | Bin 264 -> 0 bytes
 graphics/items/icons/red_orb.png          | Bin 0 -> 309 bytes
 include/graphics.h                        |   3 ++-
 src/data/graphics/items.h                 |   3 ++-
 src/data/item_icon_table.h                |   4 +--
 8 files changed, 34 insertions(+), 32 deletions(-)
 create mode 100644 graphics/items/icons/blue_orb.png
 delete mode 100644 graphics/items/icons/orb.png
 create mode 100644 graphics/items/icons/red_orb.png

diff --git a/graphics/items/icon_palettes/blue_orb.pal b/graphics/items/icon_palettes/blue_orb.pal
index 9f061a800..1f07de0f2 100644
--- a/graphics/items/icon_palettes/blue_orb.pal
+++ b/graphics/items/icon_palettes/blue_orb.pal
@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-180 180 180
-49 49 49
-106 115 230
-156 156 222
-74 82 197
-57 65 148
-205 205 255
-255 255 255
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
+255 126 0
+48 48 48
+136 160 248
+104 128 248
+72 104 240
+240 240 248
+168 184 248
+128 208 248
+48 72 192
+248 248 248
+224 248 248
+232 248 248
+40 40 168
+184 248 248
+80 152 248
 0 0 0
diff --git a/graphics/items/icon_palettes/red_orb.pal b/graphics/items/icon_palettes/red_orb.pal
index dfbaa5cf3..486e32e8c 100644
--- a/graphics/items/icon_palettes/red_orb.pal
+++ b/graphics/items/icon_palettes/red_orb.pal
@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-180 180 180
-49 49 49
-230 115 106
-222 156 156
-197 82 74
-148 65 57
-255 205 205
-255 255 255
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
+255 126 0
+48 48 48
+248 248 248
+248 88 112
+248 128 128
+248 40 56
+248 216 216
+216 32 56
+176 32 56
+248 136 72
+248 224 96
+144 24 64
+248 200 96
 0 0 0
 0 0 0
 0 0 0
diff --git a/graphics/items/icons/blue_orb.png b/graphics/items/icons/blue_orb.png
new file mode 100644
index 0000000000000000000000000000000000000000..14374bf1d6e92205bcca88c3d6cee29efa321740
GIT binary patch
literal 299
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;wmUKs7M+SzC{oH>NS%G}r0G|-o
z|8)!o1_m7qeq=QK@W}Y^;lqy=JAO1=_+j92;Kz?24}Sc3@#BYv22kurz>FW!i@oOp
zH8Pe2`2{mLJiCzw<jnDOaSV~ToSdK_XTZh9b>ODcv15G(^D-tFPGFzP!5eI5R@Ugz
z*|tn|=alUZOI!{crSF<v(O}u*mSt>wIyNTC;g!VHE!$M5?$|M>p-60ZO!>#g!gV{Y
z?3&Y9&{N_a<E67eMtpkF_o99|gLcP7hxgvuyXdjP4Y`SZV&c<x@pUZik&{h7SFyz*
tR_jvnvonJ3GsIKQ&9T&II9u$(z+juM^U)(I;04f~44$rjF6*2UngH}8dPM*L

literal 0
HcmV?d00001

diff --git a/graphics/items/icons/orb.png b/graphics/items/icons/orb.png
deleted file mode 100644
index 0a3e182923f726541882b0814b7fcd1f8f173935..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 264
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;wg8-ip*DYJN7#bQrE6%z%XU@?e
zuPKg}|IeQN|NlQw9xFIIr+ht7g0UpXFPOpM*^M+Hr_IyFF+^hO-1CNfhYWaFFDPA<
zWwd4JJKeX|Ncr^5g^F)hWc4##S6@51QSjdrb?sB-p?_!ox)yVK&#RfceUD8G_N#oj
ztg$60bpCyPw=Lm+c_x-QdMLOY?px02!q4`cV}mJ+lEtF;JbVmS`nj)7N#hm&EfQK=
p^Te*Y*U-lM;_eR-U3GImWZO*;mf+21{~Qc*x2LP0%Q~loCIAlEUNry!

diff --git a/graphics/items/icons/red_orb.png b/graphics/items/icons/red_orb.png
new file mode 100644
index 0000000000000000000000000000000000000000..ca132f46a0830b7d7a6e7c401b511c9b624f4f89
GIT binary patch
literal 309
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;wmUKs7M+SzC{oH>NS%G}@0G|-o
z|8)!o1_nQXAfn($L&FaZiyt>`+)%LCpkVQ%!{f(;gb5N3KTaeZ?>a3E)WTR2<QL4~
z@a#q!kh8|q#W6(Ua&p1}h8`vl8AWFmPSNC+DHDneV!8rP9ud`3o%ZIDkQB#Mk76@3
zGk(#Aq8@9j1euK~-I3a}y}1v{2!3C8CUdp5)WKDA&Mx=uJ#*(GU(oT4oQ*mrCfvt5
zXNXGeDl%_L-l&tC84`7_ti$K|s+AL0mo;1R91@FNxNx=NDTyVgtxuiaUGDHEQD-ef
z(XEAgqWv2B?OqK_ZfT!-xKFqzL)_&@bbx^I1ct^+BjNozOZkEBX7F_Nb6Mw<&;$Sj
CWOV=l

literal 0
HcmV?d00001

diff --git a/include/graphics.h b/include/graphics.h
index b38f82e2b..0aaa6d898 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -3815,8 +3815,9 @@ extern const u32 gItemIconPalette_PokeblockCase[];
 extern const u32 gItemIcon_Letter[];
 extern const u32 gItemIcon_EonTicket[];
 extern const u32 gItemIconPalette_EonTicket[];
-extern const u32 gItemIcon_Orb[];
+extern const u32 gItemIcon_RedOrb[];
 extern const u32 gItemIconPalette_RedOrb[];
+extern const u32 gItemIcon_BlueOrb[];
 extern const u32 gItemIconPalette_BlueOrb[];
 extern const u32 gItemIcon_Scanner[];
 extern const u32 gItemIconPalette_Scanner[];
diff --git a/src/data/graphics/items.h b/src/data/graphics/items.h
index c3d44debd..f34037afd 100644
--- a/src/data/graphics/items.h
+++ b/src/data/graphics/items.h
@@ -630,8 +630,9 @@ const u32 gItemIcon_EonTicket[] = INCBIN_U32("graphics/items/icons/eon_ticket.4b
 
 const u32 gItemIconPalette_EonTicket[] = INCBIN_U32("graphics/items/icon_palettes/eon_ticket.gbapal.lz");
 
-const u32 gItemIcon_Orb[] = INCBIN_U32("graphics/items/icons/orb.4bpp.lz");
+const u32 gItemIcon_RedOrb[] = INCBIN_U32("graphics/items/icons/red_orb.4bpp.lz");
 const u32 gItemIconPalette_RedOrb[] = INCBIN_U32("graphics/items/icon_palettes/red_orb.gbapal.lz");
+const u32 gItemIcon_BlueOrb[] = INCBIN_U32("graphics/items/icons/blue_orb.4bpp.lz");
 const u32 gItemIconPalette_BlueOrb[] = INCBIN_U32("graphics/items/icon_palettes/blue_orb.gbapal.lz");
 
 const u32 gItemIcon_Scanner[] = INCBIN_U32("graphics/items/icons/scanner.4bpp.lz");
diff --git a/src/data/item_icon_table.h b/src/data/item_icon_table.h
index 1002e741c..2345d143a 100644
--- a/src/data/item_icon_table.h
+++ b/src/data/item_icon_table.h
@@ -239,8 +239,8 @@ const u32 *const gItemIconTable[][2] =
     [ITEM_POKEBLOCK_CASE] = {gItemIcon_PokeblockCase, gItemIconPalette_PokeblockCase},
     [ITEM_LETTER] = {gItemIcon_Letter, gItemIconPalette_LavaCookieAndLetter},
     [ITEM_EON_TICKET] = {gItemIcon_EonTicket, gItemIconPalette_EonTicket},
-    [ITEM_RED_ORB] = {gItemIcon_Orb, gItemIconPalette_RedOrb},
-    [ITEM_BLUE_ORB] = {gItemIcon_Orb, gItemIconPalette_BlueOrb},
+    [ITEM_RED_ORB] = {gItemIcon_RedOrb, gItemIconPalette_RedOrb},
+    [ITEM_BLUE_ORB] = {gItemIcon_BlueOrb, gItemIconPalette_BlueOrb},
     [ITEM_SCANNER] = {gItemIcon_Scanner, gItemIconPalette_Scanner},
     [ITEM_GO_GOGGLES] = {gItemIcon_GoGoggles, gItemIconPalette_GoGoggles},
     [ITEM_METEORITE] = {gItemIcon_Meteorite, gItemIconPalette_Meteorite},

From adcf563ba10e15c27744edb30b228e28cfa3c3e1 Mon Sep 17 00:00:00 2001
From: BuffelSaft <buffalojuice@gmail.com>
Date: Tue, 26 Oct 2021 14:42:06 +1300
Subject: [PATCH 4/8] Add missing berry data

Certain gen 4+ berries were missing graphics and berry data. Adding this data allows them to be viewed and planted.
---
 graphics/berries/custap.png                   | Bin 0 -> 527 bytes
 graphics/berries/jaboca.png                   | Bin 0 -> 512 bytes
 graphics/berries/kee.png                      | Bin 0 -> 589 bytes
 graphics/berries/maranga.png                  | Bin 0 -> 568 bytes
 graphics/berries/micle.png                    | Bin 0 -> 383 bytes
 graphics/berries/rowap.png                    | Bin 0 -> 565 bytes
 .../object_events/pics/berry_trees/custap.png | Bin 0 -> 669 bytes
 .../object_events/pics/berry_trees/jaboca.png | Bin 0 -> 693 bytes
 .../object_events/pics/berry_trees/micle.png  | Bin 0 -> 627 bytes
 .../object_events/pics/berry_trees/rowap.png  | Bin 0 -> 665 bytes
 include/graphics.h                            |  12 ++
 src/berry.c                                   | 120 ++++++++++++++++++
 src/data/graphics/berries.h                   |  12 ++
 .../berry_tree_graphics_tables.h              |  80 ++++++++++--
 .../object_events/object_event_graphics.h     |   4 +
 src/item_menu_icons.c                         |  12 +-
 16 files changed, 222 insertions(+), 18 deletions(-)
 create mode 100644 graphics/berries/custap.png
 create mode 100644 graphics/berries/jaboca.png
 create mode 100644 graphics/berries/kee.png
 create mode 100644 graphics/berries/maranga.png
 create mode 100644 graphics/berries/micle.png
 create mode 100644 graphics/berries/rowap.png
 create mode 100644 graphics/object_events/pics/berry_trees/custap.png
 create mode 100644 graphics/object_events/pics/berry_trees/jaboca.png
 create mode 100644 graphics/object_events/pics/berry_trees/micle.png
 create mode 100644 graphics/object_events/pics/berry_trees/rowap.png

diff --git a/graphics/berries/custap.png b/graphics/berries/custap.png
new file mode 100644
index 0000000000000000000000000000000000000000..a5b89427c74ddcfd750b35c2a9315513b46dc752
GIT binary patch
literal 527
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDB3?!H8JlO)I*h@TpUD=<q2r|hCH5&O{01Anh
zxJHx&=ckpFCl;kLxcj&OjZr8|EmAPnGbwCc@(`$mqolyk9VlZAWHWd*XvzaAmUKs7
zM+SzC{oH>NS%G|m0G|-oDet}o1qJQx5%_<vdT)^C^K7U8ORJ~EdcL32^8eV{_tn`g
zK~7T~6{qC!f=psy`18fT5lAs6dAqwXbg;^L0NKW#E{-7;bDmz<n|0VgfW6?N={fHc
z&T9G}@4Q{Gpy~_fWlO6Uc{wX~v&|CMs1RqlqUx;BJe|*TcM3<O)zet5%2SqgO<@_o
z{_o)T?5Hm~_sL|I|Kl%pdlY<+dq4Vl)Vai_ZqpCHWhX<_F3O2ZPPUjk|43!nLbDSp
z(>!miRx|3j`PEO{{)hWH9-&vP^2&>%u6200te5!~5`OfO|3yjt6&>?#n_ua8&C7gg
zS;lRKzJuE@My$D2ekjJ!;>&~RnK7o<KZwp+Gp%l|jGUzan=|i+gHa3XOB>X!S)A1v
zERILX)~wKM2<6#UTi?8s{aV)ZsuPTC#%ib9^jo4e=JHSFJ|L&D?G#(VIi}x28=3VV
z?qcVgEHvls>Kohsl`IX_b5L&k#Pp!ue70i8I_<=}cc0moCV!l7v%kH%z4GXdGCok4
Ndb;|#taD0e0s#1Q(BS|8

literal 0
HcmV?d00001

diff --git a/graphics/berries/jaboca.png b/graphics/berries/jaboca.png
new file mode 100644
index 0000000000000000000000000000000000000000..42815ea4a946ed2c3a194ed8d025b30970931ffe
GIT binary patch
literal 512
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDB3?!H8JlO)I*h@TpUD=<q2r@}47B1e&2ow@8
zag8Vm&QB{TPb^AhaQATm8lzB_TBKmCXHwX@<RMTAM@fO7J5a_L$Y$_r(3A&KEa{HE
zjtmSN`?>!lvI6-A0X`wFQ{H{cPS)&6HtcE9+}q={cB$sMV}{?Kd;R~vw!&XMC<x>x
zWWapxwFZ#SnB?v5!qCAg>j7k|c)B=-RLr@0aid?0g8*B?hgGj5I5&nq=6;Z}VE>JX
zJT+#12eCJ2-+o~0p4-~m|5~YYd$)UHa?$MxZ>Hb<KVQ{TujcK2^9P^buK)1y4}Zap
zrrW#~HzYp1%4D^U*!TM|*M{?qLJh}%OO!2sJ;CeA>)lryFYeuTNZ(Ie)KPbuYv1C_
zmr@l&!~%}UuR1a%QMIKlOOfGC<os_F7tWF~^k|oHFto~2FJBU-V=#Z+u8*<pCnF{1
zsxF)VVT<TXHo<OVmeTYG$EF{3<Y7%-(ks!hZ26v#Q=2w<9=ss^M2Ktt8fK4;^ZxKy
zPVr%FZC+g_v{*}ifko4ma-$0pYIe+a4W>mB@2YvH?N@Ankz1>O&3H=YAM+ahb4Aa7
o%v(Br*2GQm8x~mYuIGHsy~He5bHjlX)}X-jboFyt=akR{00Lsk$^ZZW

literal 0
HcmV?d00001

diff --git a/graphics/berries/kee.png b/graphics/berries/kee.png
new file mode 100644
index 0000000000000000000000000000000000000000..1c83b65b1943a2fc373ad1b59dd70662352c3394
GIT binary patch
literal 589
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDB3?!H8JlO)I*h@TpUD=<q2r`QZd1$VC4-^tF
zag8Vm&QB{TPb^AhaQATm8lzB_TBKmCXHwX@<RMTAM@fO7J5a_L$Y$_r(3A&KEa{HE
zjtmSN`?>!lvI6-A0X`wFQ;r^WD>N?K7&h}<wzq-O`8@Ye3(LQ5?D=_R=bGlU)>OZ}
z@0$OwY5*#SfF0ZTWq>TkByV?@|4Z3F9R;!rJzX3_D&}0BWSG}%AksFMqs+n9A@`V1
zr@NTYMCk`AwhV5z4i#Tm%JeTxIXBlxO?mq3>O5|>Q;fINBRBm!e}A)K+MD`oF&)2u
zE_(m?gzwSC{08sWd%Is+s{ch?amf>ty+!*ks!rAPcPU}kh+i9Kb1bJ$@}NxdOs+L5
zN!)_HZZgRc35D}2nw<GtukF%)bVYo_A=#(9ZgJG<U*EMyP^13X!qs0{TBhu`3@Doa
zhVj5tjz7MKuH6c6XzRFDvHOiKQ#P;QRyk3jH`aX43uN-mRT>xMa(GDc&gI#|u*L7=
zLB{Y$?pN#;Chy<N=XPEF&7~lHlXc7)ufC-;h%iN(HBIBY8nFJ9`Jr2Luhld=rI{aC
zlrbf0`Qc}8Oc(;5`tTf2^^d)7nZVOn!mw)TYNrcwq3@a#-dC9>^r_CS{4V##!%(#0
zlzKz%#~67pMv)%XfARbVtIs|EtbT6tN#mPZG4(pdOp~t*h`iV_=j@FwA8MbyIe%Sz
X#?0lX-+jL128t6;S3j3^P6<r_nac0^

literal 0
HcmV?d00001

diff --git a/graphics/berries/maranga.png b/graphics/berries/maranga.png
new file mode 100644
index 0000000000000000000000000000000000000000..b103f24108ecbe2ad26e246b8f81ef7016ba96ff
GIT binary patch
literal 568
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDB3?!H8JlO)I*h@TpUD=<q2(su2Wt>kF1`3In
zxJHx&=ckpFCl;kLxcj&OjZr8|EmAPnGbwCc@(`$mqolyk9VlZAWHWd*XvzaAmUKs7
zM+SzC{oH>NS%G|m0G|-oDc`=Cn`k_F(y@J0SyPGWmNj})`VG?}w5Cr^@U)Y!D)*bv
zkN{K*2U};}0-4X4<n8Xl(7`I}0c6K`x;TbZ%sD%0W8NVH5!bzfmssl##tJMpzOX5D
z(;5CN_a^3S7E`^X9qlT%dhU#fmAgWIGA;QR6ECDuXCkTn)id(l$GzA4&ffSx>%wCG
z3J(3b4h3~TmL7Vb`JQQmM#B8`M_ddVi}$ws_+;)dkF!n>t2A5AwtVifj|TPu&DYP)
zP`%o1T;MGf;_*Ie!E|M&Db|dSuNO|TVZHi9k?qtx*;_{ft5=?rJ?7S@sPG|n!Gs;F
zuRVI(!SHlzrtBo9l`)qe$vyVvW#rQN$mXx8JfX#)+U@Sc`0Yit6TSPGw=(bN&UhlW
z;NbeYU6=dWQXZ_G6sD^;+iSJfl%~hM+M18^<|N-W)?PEE+mz8f-tmLvI(CKa2M^ud
z$o8YAj73FBX1i$vuc?a79z})**^7~um4A<D+~`@^n0r`J@K2rjG9zy_(Q6;RuYSt0
y>ekhdzi#ia3%K{Kq2$)u%_aAkBm6JjKWonQs9kXKj2+UT81QuUb6Mw<&;$U)qv9U`

literal 0
HcmV?d00001

diff --git a/graphics/berries/micle.png b/graphics/berries/micle.png
new file mode 100644
index 0000000000000000000000000000000000000000..bbe6011b4490e80726f759920a6e9c2a06e2eb3d
GIT binary patch
literal 383
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDB3?!H8JlO)I*h@TpUD=<q2r@~@7+g3K2ow@8
zag8Vm&QB{TPb^AhaQATm8lzB_TBKmCXHwX@<RMTAM@fO7J5a_L$Y$_r(3A&KEa{HE
zjtmSN`?>!lvI6-A0X`wF=gz$ks<sSTDv^9nGitA5%X25kMBO>xlR^5hfw!0Re*nc9
zlf2zs{x4<!bQH*0?CIhdQZeW4gpGWM40v4Tw$5}}Q9Y+izCiigA^8wd?W7a@3RCVM
z=k(b&GvQ6|_mc8yjAnl$@4eT({j))=(C%W-#SfXWYCYyx=dUY$*ukPVH;cWQp)sp=
z5}WM@0|)L9rL7P7cIr;pb!zFIE(w{ZYb#Za)OV>(5tcVNt=3-FaPa5bZievQyW#y!
y)_vmNp3axbkP2Zai?3-AO4?YXc65vR-$mjRSEwa^k!a)q`N`AO&t;ucLK6V_A%n&M

literal 0
HcmV?d00001

diff --git a/graphics/berries/rowap.png b/graphics/berries/rowap.png
new file mode 100644
index 0000000000000000000000000000000000000000..bbeee3f3b4608f8daae62c16537a0c0da84bbb7b
GIT binary patch
literal 565
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDB3?!H8JlO)I*h@TpUD=<q2r@|-y<s~!4=5yF
z;u=vBoS#-wo>-L1;O^rBG)AE;wMfBO&!n(*$wQzLj*<dDcc6?hkj>!LpeYZeSkfJR
z9T^xl_H+M9WCijK0(?STj~+d`v{>`p(&Cn6OU;%R!|ZIsIa?KvJ)bhiY3tsod(Y=Y
zegCiM?hY~r3=VWj*a8`hN#5=*|Ch3VItpY*db&7<RLnVhVXxm|0|E8|WmZiO9+7zs
zpO{?tFdRO*uw$Xn$73&U2^CkHr@Xw8wr;|i9)TyUMk$F8_wLvd^vLAov4H;n^K0eB
z9(kO5vB=(D^8S~@Pk&@FtW#$;_~3BopSlmj0|Q=#DmhKhUvVw3!}27Ayq6q4`+XIo
zXUY`~Lzg8ne;@g<nCTkq^5(IRT=i>L@q))fTbU+ID+qI*wtlWpV6#bEx2eFs=aD`u
zb_#AhGyB?Woo?<YdvrW*r80kbaLFm!>+~eCW6V2mE<19-Nkf`r%`>q!E|*RfW&R&V
zUi<7y4PVY=ziKh5yyRW)9<j!i$5JA4mdop|5PPi4b;qvmmx2%*!@J4Pb1hiUHCpd|
zb}c@JW9gJNZf?!@!rz{Jv#;yV`Mcqd^{!rd>m};3`L)sfQb%W|f*J4Ku1);)_K6bX
zwB>nv=XUyC(LJ&tE+k&>(E9oNW}MGbuwV6=ecR-Y8y`MKT?GZbr>mdKI;Vst0HEON
AqW}N^

literal 0
HcmV?d00001

diff --git a/graphics/object_events/pics/berry_trees/custap.png b/graphics/object_events/pics/berry_trees/custap.png
new file mode 100644
index 0000000000000000000000000000000000000000..3cb5ccfb10cd4f2869efdf9560f2f96f7752b5eb
GIT binary patch
literal 669
zcmV;O0%HA%P)<h;3K|Lk000e1NJLTq003YB001Ba0{{R3AMRjh00007bV*G`2jv72
z02wGb&9_Ma000+sMObuGZ)S9NVRB^vM@&RePDdbiWpW@hE;Mn4q~QPn00?w&PDe*f
zL^A*Y002sWDIWj;00d`2O+f$vv5yP<VFdsH05DKYR7G>er2o~l|HYKvlyiGQL28Sv
zIZ9#(5Fpiaq@+P}QXoOq)zyoOltDpK|Ns90001r;H<kbZ00Cl4M@0Xn2lB-L00F^C
zL_t(|oVAoYa)U4shSg~%_d}e(QmbaQi3@7m7f8lcs@UOTbezHa5;0)oDr){+vEM!<
zz_~}u=ee=;R}0#?vGkY8eUm3+^5tQ(uE05D-wbH8^MT{gnX#xq!O&RRLKT|iAeawN
zfy71<k}8SsfPH*8um!YKLDEmY8kDSZsJ(j)2(_QduK?KazTsf)+xguZP(xx2RDjzh
zBe21u37R_~)JidP6#=+^0nFF(3ha^sC6sJ&P6vcE`E1xd_*j8hGE4wH<cpj6b`MzU
zX~hfyGv5XEi2^96KxrjPhjfUXp@eQg4%&qdk$p`}eQPD@RfnR9=^zLgiv*0_KzA4N
z+r@xhfoMP=fDR%e3J?=^1I-!t*G~odgC?elfqSHh3j^AcD``Yv@cq;WNpS3c_$3U*
zfJ771P^BBBG6NF$aXntdKOfEvP+~bPph`tDb0@4gqUiNdfs<SU9ZoA73a)`)tI&U)
z<+hRnzG_4+B-5+zd-MBm13)*jPx>I_$Etq-3Y3gAfDB6+>_vH^4$bh%z=&>3$-<e^
ziRUeqaqkskOk2udalTjjQa1JPhglU~=xX^F`p@eI-c}jH5WI?b00000NkvXXu0mjf
DOOYCF

literal 0
HcmV?d00001

diff --git a/graphics/object_events/pics/berry_trees/jaboca.png b/graphics/object_events/pics/berry_trees/jaboca.png
new file mode 100644
index 0000000000000000000000000000000000000000..36e51eb01579861bcab6ff0b4acd3ba2568b56af
GIT binary patch
literal 693
zcmV;m0!safP)<h;3K|Lk000e1NJLTq003YB001Ba0{{R3AMRjh00007bV*G`2jv72
z2pALrs;f5u000+sMObuGZ)S9NVRB^vM@&RePDdbiWpW@hE;Mn4q~QPn00?w&PDe*f
zL^A*Y002sWDIWj;00d`2O+f$vv5yP<VFdsH05DKYR7G>er2o~l|HYKvlyiGQLI0$*
z)oOc-K~j{(_F9X*5HV7;q+)w>K{+`X|Ns900013rp2q+H00Cl4M@0Xn2lB-L00G%a
zL_t(|ob8i8YAZ1i#?=`_nn#Y1Be?TDMh~`drwPmfY)Ij=YzUgbKzs(*!MQ-N%V2P!
zGrVuKHayl&AYF>6@VDQ3{`^MLhVZ+7>au>&XxIIC#U#T+;r^PxOrXwdSzoC4;$wdS
zR4A3yN0LlJa^bz?In7#qrj$K^GahB^8=IWr8vy(2V-uFKZwZYtT6D(9sF%TNuHDG{
z3>d~4LrFR?r$Swls6vD>&pw#JBhH6$MkKH^PRbGiB<p%4(%c2p=Hs6kJPMu}gAR<7
zc~wTIH659efWYRV@ScFEq+pAMopJIpe=ucR*Mr%T4S`|?ozBePV+J&G#t33CPHJ7O
z>amY?abN3$Adnw#u^Fa<TxloojF_P`#`Qs0bm+sgJ%7v<L#saCLe&g(*rk#rOG{AS
zCj|1U9{ixt0Yew#r)hC7(-}NYfg78#0M$J4zAkz+=GBoq_xPiE%+mRR`Q}Ja9W+{|
zrO&4Hcj21>p9T;0yMP7)w&)F<F)H~T2{E6p+Q{PovR8<w^9ZllzYX5M+DS*=d$tPb
zDM-9|pWe-OpKH6;!?%YkfZv<_)7{JNbN&BQ8@{KvciV4Iy1AkkYrEg?HecwKjP2%2
b{oeWq@B(gL*y32d00000NkvXXu0mjf*<U)#

literal 0
HcmV?d00001

diff --git a/graphics/object_events/pics/berry_trees/micle.png b/graphics/object_events/pics/berry_trees/micle.png
new file mode 100644
index 0000000000000000000000000000000000000000..365ff43b2153c7f1bfc3112f5ffd3949018201c7
GIT binary patch
literal 627
zcmV-(0*w8MP)<h;3K|Lk000e1NJLTq003YB001Ba0{{R3AMRjh00007bV*G`2jv72
z2on|zP!rGq000+sMObuGZ)S9NVRB^vM@&RePDdbiWpW@hE;Mn4q~QPn00?w&PDe*f
zL^A*Y002sWDIWj;00d`2O+f$vv5yP<VFdsH05DKYR7G>er2o~l|HYKvlyiGQLCwwH
zoSeN%N_%s?06}{I5IF$NVoH=bDN+ys|Ns90001$F0&@TW00Cl4M?`Z$2|dmL00Eat
zL_t(|ob8dZZrd;rhB>(-pQ;@@St5`{U33RzC@1m&57Ki~dt*C8`c^iOf#G5a$k6K@
zl{S%GBx?$k%Xc4eKTkXv^Z&fpWAm~&_lt9Cmc_YW3^+A<6KAft_~Va-znD~<xjV8{
zqo2vV8)n~ZnHQ66B}p6M{;tJrrdTMxA7<Yb{t4(v)hVU~y|FB;d-1T@*6LwDs7qB<
zoONX7<l}7<x+9+Q*sS3bPFXy-;_m9ZxZD63HE98<_Gavk!F303)5mo};1MZY5qOKi
zMR92)xj}+FRe;{u`$UxPvQ6vH=|J8R)VmwXmfYqB$jb|+==w$pB%daMh$R4DZx7lS
zufJ^zcLS0%01-vVW>iS<=drE22YC}oz$@EZD%=lB*-BfZzTr3JEszV-6QBHgt27p)
zi}{(%0A7ET@-HrHor}{<>w0DmQV4V>XD*HX=qLGhE7Xxp0d#wYf+xOoS!X}>dX=!1
zzy}H#%}i=8-K+>AeR(Fv_Ekz_#5ph%-k??lFSx?jshvx%-r&D~egUsNUS{^HkpKVy
N002ovPDHLkV1g@{1_%HE

literal 0
HcmV?d00001

diff --git a/graphics/object_events/pics/berry_trees/rowap.png b/graphics/object_events/pics/berry_trees/rowap.png
new file mode 100644
index 0000000000000000000000000000000000000000..a0814bfa2e6f79b89584543968a0811b98f34b95
GIT binary patch
literal 665
zcmV;K0%rY*P)<h;3K|Lk000e1NJLTq003YB001Ba0{{R3AMRjh00007bV*G`2jv72
z2r(PgQz=aV000+sMObuGZ)S9NVRB^vM@&RePDdbiWpW@hE;Mn4q~QPn00?w&PDe*f
zL^A*Y002sWDIWj;00d`2O+f$vv5yP<VFdsH05DKYR7G>er2o~l|HYKvlyiGQL28Sv
zIZ9#(5Fpiaq@+P}QXoOq)zyoOltDpK|Ns90001r;H<kbZ00Cl4M??UK1szBL00F&8
zL_t(|ob8f5ZsRZzh1D70{epBZH?6DCRu141eE^HxhRq_>BcRRzA)Y6V3ZEe}q_Hdi
z727VB&8Ly(y?LbAH2>E>vw%tke^ujB-!4TYAK+s$rOvrDszWx9{c~ndMJ88eOk~RY
zRO>r`6VqUQ$b@V-47QruVzA#n5`;X?2+0SU&cMMd+MhIA2cnPHJ(in7*<>(Z>v1L%
zXndK^fw_OvJ&z@;bsfRkM4?iUtdRx3*1<)v;AM7^j`{=^;Pd0vN(VO@5k@i;d^2F2
zzt#W<=TQXM9e>!?f$aMmilvMf!br`V8#t2V!-YEs58@F$L8VUbEJ_BpW3nXz3zD(y
z;8dca2YKes^+IEX97#6jxsfNCA|MJKXEU6!6T!BV1`b{Yk@!&>X^{8L;D`pt6FF$_
z<k(WFm2C1#z$42cz}j+Y1~Nh=r&#{DL=Z}Zi75`{vWTCYv#sQgTJw!5=RYNizK*Q7
z?9c7I;l%)PLUpKY!sWv=-a4&<+g$TlsDksC25c5w?W~oK-yE!U3pPy~@VQ`%pPf8B
zqdZ-)#dN3*kIA#N-YmEh;pRE-*Nwp)|8ji;Q%-M^+uBhQ00000NkvXXu0mjfex4h}

literal 0
HcmV?d00001

diff --git a/include/graphics.h b/include/graphics.h
index 0aaa6d898..22ba0d9ea 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -4648,6 +4648,12 @@ extern const u32 gBerryPic_Colbur[];
 extern const u32 gBerryPic_Babiri[];
 extern const u32 gBerryPic_Chilan[];
 extern const u32 gBerryPic_Roseli[];
+extern const u32 gBerryPic_Micle[];
+extern const u32 gBerryPic_Custap[];
+extern const u32 gBerryPic_Jaboca[];
+extern const u32 gBerryPic_Rowap[];
+extern const u32 gBerryPic_Kee[];
+extern const u32 gBerryPic_Maranga[];
 extern const u32 gBerryPalette_Occa[];
 extern const u32 gBerryPalette_Passho[];
 extern const u32 gBerryPalette_Wacan[];
@@ -4666,6 +4672,12 @@ extern const u32 gBerryPalette_Colbur[];
 extern const u32 gBerryPalette_Babiri[];
 extern const u32 gBerryPalette_Chilan[];
 extern const u32 gBerryPalette_Roseli[];
+extern const u32 gBerryPalette_Micle[];
+extern const u32 gBerryPalette_Custap[];
+extern const u32 gBerryPalette_Jaboca[];
+extern const u32 gBerryPalette_Rowap[];
+extern const u32 gBerryPalette_Kee[];
+extern const u32 gBerryPalette_Maranga[];
 
 //pokenav
 extern const u16 gPokenavCondition_Pal[];
diff --git a/src/berry.c b/src/berry.c
index 6cb46cc05..b1339cb60 100644
--- a/src/berry.c
+++ b/src/berry.c
@@ -148,6 +148,18 @@ static const u8 sBerryDescriptionPart1_Chilan[] = _("It can be made into a whist
 static const u8 sBerryDescriptionPart2_Chilan[] = _("produces an indescribable sound.");
 static const u8 sBerryDescriptionPart1_Roseli[] = _("In nature, they grow in wide rings");
 static const u8 sBerryDescriptionPart2_Roseli[] = _("for reasons that are still unknown.");
+static const u8 sBerryDescriptionPart1_Micle[] = _("It has the effect of making other food");
+static const u8 sBerryDescriptionPart2_Micle[] = _("eaten at the same time taste sweet.");
+static const u8 sBerryDescriptionPart1_Custap[] = _("The flesh underneath the Custap Berry's");
+static const u8 sBerryDescriptionPart2_Custap[] = _("skin is sweet and creamy soft.");
+static const u8 sBerryDescriptionPart1_Jaboca[] = _("The drupelets that make up this berry");
+static const u8 sBerryDescriptionPart2_Jaboca[] = _("pop rythmically if it's handled roughly.");
+static const u8 sBerryDescriptionPart1_Rowap[] = _("People once worked top-shaped pieces");
+static const u8 sBerryDescriptionPart2_Rowap[] = _("of this berry free to use as toys.");
+static const u8 sBerryDescriptionPart1_Kee[] = _("A berry that is incredibly spicy at");
+static const u8 sBerryDescriptionPart2_Kee[] = _("first, then extremely bitter.");
+static const u8 sBerryDescriptionPart1_Maranga[] = _("Its outside is very bitter, but its");
+static const u8 sBerryDescriptionPart2_Maranga[] = _("inside tastes like a sweet drink.");
 
 const struct Berry gBerries[] =
 {
@@ -1248,6 +1260,114 @@ const struct Berry gBerries[] =
         .sour = 40,
         .smoothness = 70,
     },
+
+    [ITEM_MICLE_BERRY - FIRST_BERRY_INDEX] =
+    {
+        .name = _("MICLE"),
+        .firmness = BERRY_FIRMNESS_SOFT,
+        .size = 35,
+        .maxYield = 5,
+        .minYield = 1,
+        .description1 = sBerryDescriptionPart1_Micle,
+        .description2 = sBerryDescriptionPart2_Micle,
+        .stageDuration = 24,
+        .spicy = 0,
+        .dry = 40,
+        .sweet = 10,
+        .bitter = 0,
+        .sour = 0,
+        .smoothness = 35,
+    },
+
+    [ITEM_CUSTAP_BERRY - FIRST_BERRY_INDEX] =
+    {
+        .name = _("CUSTAP"),
+        .firmness = BERRY_FIRMNESS_SUPER_HARD,
+        .size = 35,
+        .maxYield = 5,
+        .minYield = 1,
+        .description1 = sBerryDescriptionPart1_Custap,
+        .description2 = sBerryDescriptionPart2_Custap,
+        .stageDuration = 24,
+        .spicy = 0,
+        .dry = 0,
+        .sweet = 40,
+        .bitter = 10,
+        .sour = 0,
+        .smoothness = 35,
+    },
+
+    [ITEM_JABOCA_BERRY - FIRST_BERRY_INDEX] =
+    {
+        .name = _("JABOCA"),
+        .firmness = BERRY_FIRMNESS_SOFT,
+        .size = 35,
+        .maxYield = 5,
+        .minYield = 1,
+        .description1 = sBerryDescriptionPart1_Jaboca,
+        .description2 = sBerryDescriptionPart2_Jaboca,
+        .stageDuration = 24,
+        .spicy = 0,
+        .dry = 0,
+        .sweet = 0,
+        .bitter = 40,
+        .sour = 10,
+        .smoothness = 35,
+    },
+
+    [ITEM_ROWAP_BERRY - FIRST_BERRY_INDEX] =
+    {
+        .name = _("ROWAP"),
+        .firmness = BERRY_FIRMNESS_VERY_SOFT,
+        .size = 35,
+        .maxYield = 5,
+        .minYield = 1,
+        .description1 = sBerryDescriptionPart1_Rowap,
+        .description2 = sBerryDescriptionPart2_Rowap,
+        .stageDuration = 24,
+        .spicy = 10,
+        .dry = 0,
+        .sweet = 0,
+        .bitter = 0,
+        .sour = 40,
+        .smoothness = 35,
+    },
+
+    [ITEM_KEE_BERRY - FIRST_BERRY_INDEX] =
+    {
+        .name = _("KEE"),
+        .firmness = BERRY_FIRMNESS_HARD,
+        .size = 35,
+        .maxYield = 8,
+        .minYield = 2,
+        .description1 = sBerryDescriptionPart1_Kee,
+        .description2 = sBerryDescriptionPart2_Kee,
+        .stageDuration = 18,
+        .spicy = 40,
+        .dry = 40,
+        .sweet = 10,
+        .bitter = 10,
+        .sour = 10,
+        .smoothness = 35,
+    },
+
+    [ITEM_MARANGA_BERRY - FIRST_BERRY_INDEX] =
+    {
+        .name = _("MARNGA"), // "Maranga" is too long
+        .firmness = BERRY_FIRMNESS_SOFT,
+        .size = 35,
+        .maxYield = 8,
+        .minYield = 2,
+        .description1 = sBerryDescriptionPart1_Maranga,
+        .description2 = sBerryDescriptionPart2_Maranga,
+        .stageDuration = 18,
+        .spicy = 10,
+        .dry = 10,
+        .sweet = 40,
+        .bitter = 40,
+        .sour = 10,
+        .smoothness = 35,
+    },
 };
 
 const struct BerryCrushBerryData gBerryCrush_BerryData[] = {
diff --git a/src/data/graphics/berries.h b/src/data/graphics/berries.h
index 95c72b3e9..9d4c080a8 100644
--- a/src/data/graphics/berries.h
+++ b/src/data/graphics/berries.h
@@ -67,6 +67,12 @@ const u32 gBerryPic_Colbur[] = INCBIN_U32("graphics/berries/colbur.4bpp.lz");
 const u32 gBerryPic_Babiri[] = INCBIN_U32("graphics/berries/babiri.4bpp.lz");
 const u32 gBerryPic_Chilan[] = INCBIN_U32("graphics/berries/chilan.4bpp.lz");
 const u32 gBerryPic_Roseli[] = INCBIN_U32("graphics/berries/roseli.4bpp.lz");
+const u32 gBerryPic_Micle[] = INCBIN_U32("graphics/berries/micle.4bpp.lz");
+const u32 gBerryPic_Custap[] = INCBIN_U32("graphics/berries/custap.4bpp.lz");
+const u32 gBerryPic_Jaboca[] = INCBIN_U32("graphics/berries/jaboca.4bpp.lz");
+const u32 gBerryPic_Rowap[] = INCBIN_U32("graphics/berries/rowap.4bpp.lz");
+const u32 gBerryPic_Kee[] = INCBIN_U32("graphics/berries/kee.4bpp.lz");
+const u32 gBerryPic_Maranga[] = INCBIN_U32("graphics/berries/maranga.4bpp.lz");
 
 const u32 gBerryPalette_Cheri[] = INCBIN_U32("graphics/berries/cheri.gbapal.lz");
 const u32 gBerryPalette_Oran[] = INCBIN_U32("graphics/berries/oran.gbapal.lz");
@@ -129,3 +135,9 @@ const u32 gBerryPalette_Colbur[] = INCBIN_U32("graphics/berries/colbur.gbapal.lz
 const u32 gBerryPalette_Babiri[] = INCBIN_U32("graphics/berries/babiri.gbapal.lz");
 const u32 gBerryPalette_Chilan[] = INCBIN_U32("graphics/berries/chilan.gbapal.lz");
 const u32 gBerryPalette_Roseli[] = INCBIN_U32("graphics/berries/roseli.gbapal.lz");
+const u32 gBerryPalette_Micle[] = INCBIN_U32("graphics/berries/micle.gbapal.lz");
+const u32 gBerryPalette_Custap[] = INCBIN_U32("graphics/berries/custap.gbapal.lz");
+const u32 gBerryPalette_Jaboca[] = INCBIN_U32("graphics/berries/jaboca.gbapal.lz");
+const u32 gBerryPalette_Rowap[] = INCBIN_U32("graphics/berries/rowap.gbapal.lz");
+const u32 gBerryPalette_Kee[] = INCBIN_U32("graphics/berries/kee.gbapal.lz");
+const u32 gBerryPalette_Maranga[] = INCBIN_U32("graphics/berries/maranga.gbapal.lz");
diff --git a/src/data/object_events/berry_tree_graphics_tables.h b/src/data/object_events/berry_tree_graphics_tables.h
index 3fe63d8dd..2ed2afccd 100755
--- a/src/data/object_events/berry_tree_graphics_tables.h
+++ b/src/data/object_events/berry_tree_graphics_tables.h
@@ -572,6 +572,62 @@ static const struct SpriteFrameImage sPicTable_RoseliBerryTree[] = {
 
 const u8 gBerryTreePaletteSlotTable_Roseli[] = {3, 4, 4, 4, 4};
 
+const struct SpriteFrameImage sPicTable_MicleBerryTree[] = {
+    overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
+    overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0),
+    overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1),
+    overworld_frame(gObjectEventPic_MicleBerryTree, 2, 4, 0),
+    overworld_frame(gObjectEventPic_MicleBerryTree, 2, 4, 1),
+    overworld_frame(gObjectEventPic_MicleBerryTree, 2, 4, 2),
+    overworld_frame(gObjectEventPic_MicleBerryTree, 2, 4, 3),
+    overworld_frame(gObjectEventPic_MicleBerryTree, 2, 4, 4),
+    overworld_frame(gObjectEventPic_MicleBerryTree, 2, 4, 5),
+};
+
+const u8 gBerryTreePaletteSlotTable_Micle[] = {3, 4, 4, 4, 4};
+
+const struct SpriteFrameImage sPicTable_CustapBerryTree[] = {
+    overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
+    overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0),
+    overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1),
+    overworld_frame(gObjectEventPic_CustapBerryTree, 2, 4, 0),
+    overworld_frame(gObjectEventPic_CustapBerryTree, 2, 4, 1),
+    overworld_frame(gObjectEventPic_CustapBerryTree, 2, 4, 2),
+    overworld_frame(gObjectEventPic_CustapBerryTree, 2, 4, 3),
+    overworld_frame(gObjectEventPic_CustapBerryTree, 2, 4, 4),
+    overworld_frame(gObjectEventPic_CustapBerryTree, 2, 4, 5),
+};
+
+const u8 gBerryTreePaletteSlotTable_Custap[] = {3, 4, 5, 5, 5};
+
+const struct SpriteFrameImage sPicTable_JabocaBerryTree[] = {
+    overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
+    overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0),
+    overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1),
+    overworld_frame(gObjectEventPic_JabocaBerryTree, 2, 4, 0),
+    overworld_frame(gObjectEventPic_JabocaBerryTree, 2, 4, 1),
+    overworld_frame(gObjectEventPic_JabocaBerryTree, 2, 4, 2),
+    overworld_frame(gObjectEventPic_JabocaBerryTree, 2, 4, 3),
+    overworld_frame(gObjectEventPic_JabocaBerryTree, 2, 4, 4),
+    overworld_frame(gObjectEventPic_JabocaBerryTree, 2, 4, 5),
+};
+
+const u8 gBerryTreePaletteSlotTable_Jaboca[] = {3, 4, 5, 5, 5};
+
+const struct SpriteFrameImage sPicTable_RowapBerryTree[] = {
+    overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
+    overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0),
+    overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1),
+    overworld_frame(gObjectEventPic_RowapBerryTree, 2, 4, 0),
+    overworld_frame(gObjectEventPic_RowapBerryTree, 2, 4, 1),
+    overworld_frame(gObjectEventPic_RowapBerryTree, 2, 4, 2),
+    overworld_frame(gObjectEventPic_RowapBerryTree, 2, 4, 3),
+    overworld_frame(gObjectEventPic_RowapBerryTree, 2, 4, 4),
+    overworld_frame(gObjectEventPic_RowapBerryTree, 2, 4, 5),
+};
+
+const u8 gBerryTreePaletteSlotTable_Rowap[] = {3, 4, 5, 5, 5};
+
 const u8 gDeadBerryTreeObjectEventGraphicsIdTable[] = {OBJ_EVENT_GFX_BERRY_TREE_EARLY_STAGES, OBJ_EVENT_GFX_BERRY_TREE_EARLY_STAGES, OBJ_EVENT_GFX_BERRY_TREE_EARLY_STAGES, OBJ_EVENT_GFX_BERRY_TREE_EARLY_STAGES, OBJ_EVENT_GFX_BERRY_TREE_EARLY_STAGES};
 
 const u8 gBerryTreeObjectEventGraphicsIdTable[] = {OBJ_EVENT_GFX_BERRY_TREE_EARLY_STAGES, OBJ_EVENT_GFX_BERRY_TREE_EARLY_STAGES, OBJ_EVENT_GFX_BERRY_TREE_LATE_STAGES, OBJ_EVENT_GFX_BERRY_TREE_LATE_STAGES, OBJ_EVENT_GFX_BERRY_TREE_LATE_STAGES};
@@ -638,12 +694,12 @@ const struct SpriteFrameImage *const gBerryTreePicTablePointers[] = {
     [ITEM_BABIRI_BERRY - FIRST_BERRY_INDEX]  = sPicTable_LiechiBerryTree,
     [ITEM_CHILAN_BERRY - FIRST_BERRY_INDEX]  = sPicTable_GrepaBerryTree,
     [ITEM_ROSELI_BERRY - FIRST_BERRY_INDEX]  = sPicTable_RoseliBerryTree,
-    [ITEM_MICLE_BERRY - FIRST_BERRY_INDEX]   = NULL,
-    [ITEM_CUSTAP_BERRY - FIRST_BERRY_INDEX]  = NULL,
-    [ITEM_JABOCA_BERRY - FIRST_BERRY_INDEX]  = NULL,
-    [ITEM_ROWAP_BERRY - FIRST_BERRY_INDEX]   = NULL,
-    [ITEM_KEE_BERRY - FIRST_BERRY_INDEX]     = NULL,
-    [ITEM_MARANGA_BERRY - FIRST_BERRY_INDEX] = NULL,
+    [ITEM_MICLE_BERRY - FIRST_BERRY_INDEX]   = sPicTable_MicleBerryTree,
+    [ITEM_CUSTAP_BERRY - FIRST_BERRY_INDEX]  = sPicTable_CustapBerryTree,
+    [ITEM_JABOCA_BERRY - FIRST_BERRY_INDEX]  = sPicTable_JabocaBerryTree,
+    [ITEM_ROWAP_BERRY - FIRST_BERRY_INDEX]   = sPicTable_RowapBerryTree,
+    [ITEM_KEE_BERRY - FIRST_BERRY_INDEX]     = sPicTable_PechaBerryTree,
+    [ITEM_MARANGA_BERRY - FIRST_BERRY_INDEX] = sPicTable_OccaBerryTree,
 };
 
 const u8 *const gBerryTreePaletteSlotTablePointers[] = {
@@ -708,12 +764,12 @@ const u8 *const gBerryTreePaletteSlotTablePointers[] = {
     [ITEM_BABIRI_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Liechi,
     [ITEM_CHILAN_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Grepa,
     [ITEM_ROSELI_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Roseli,
-    [ITEM_MICLE_BERRY - FIRST_BERRY_INDEX] = NULL,
-    [ITEM_CUSTAP_BERRY - FIRST_BERRY_INDEX] = NULL,
-    [ITEM_JABOCA_BERRY - FIRST_BERRY_INDEX] = NULL,
-    [ITEM_ROWAP_BERRY - FIRST_BERRY_INDEX] = NULL,
-    [ITEM_KEE_BERRY - FIRST_BERRY_INDEX] = NULL,
-    [ITEM_MARANGA_BERRY - FIRST_BERRY_INDEX] = NULL,
+    [ITEM_MICLE_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Micle,
+    [ITEM_CUSTAP_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Custap,
+    [ITEM_JABOCA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Custap,
+    [ITEM_ROWAP_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Rowap,
+    [ITEM_KEE_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Pecha,
+    [ITEM_MARANGA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Occa,
 };
 
 const u8 *const gBerryTreeObjectEventGraphicsIdTablePointers[] = {
diff --git a/src/data/object_events/object_event_graphics.h b/src/data/object_events/object_event_graphics.h
index 26383aac9..b3a4f5ff2 100755
--- a/src/data/object_events/object_event_graphics.h
+++ b/src/data/object_events/object_event_graphics.h
@@ -296,6 +296,10 @@ const u32 gObjectEventPic_KasibBerryTree[] = INCBIN_U32("graphics/object_events/
 const u32 gObjectEventPic_HabanBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/haban.4bpp");
 const u32 gObjectEventPic_ColburBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/colbur.4bpp");
 const u32 gObjectEventPic_RoseliBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/roseli.4bpp");
+const u32 gObjectEventPic_MicleBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/micle.4bpp");
+const u32 gObjectEventPic_CustapBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/custap.4bpp");
+const u32 gObjectEventPic_JabocaBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/jaboca.4bpp");
+const u32 gObjectEventPic_RowapBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/rowap.4bpp");
 const u32 gFieldEffectObjectPic_SurfBlob[] = INCBIN_U32("graphics/field_effects/pics/surf_blob.4bpp");
 const u32 gObjectEventPic_QuintyPlump[] = INCBIN_U32("graphics/object_events/pics/people/quinty_plump.4bpp");
 const u16 gObjectEventPal_QuintyPlump[] = INCBIN_U16("graphics/object_events/palettes/quinty_plump.gbapal");
diff --git a/src/item_menu_icons.c b/src/item_menu_icons.c
index bab65444e..4dfa0c0fb 100644
--- a/src/item_menu_icons.c
+++ b/src/item_menu_icons.c
@@ -382,12 +382,12 @@ static const struct CompressedTilesPal sBerryPicTable[] =
     [ITEM_TO_BERRY(ITEM_BABIRI_BERRY) - 1] = {gBerryPic_Babiri, gBerryPalette_Babiri},
     [ITEM_TO_BERRY(ITEM_CHILAN_BERRY) - 1] = {gBerryPic_Chilan, gBerryPalette_Chilan},
     [ITEM_TO_BERRY(ITEM_ROSELI_BERRY) - 1] = {gBerryPic_Roseli, gBerryPalette_Roseli},
-    [ITEM_TO_BERRY(ITEM_MICLE_BERRY)  - 1] = {},
-    [ITEM_TO_BERRY(ITEM_CUSTAP_BERRY) - 1] = {},
-    [ITEM_TO_BERRY(ITEM_JABOCA_BERRY) - 1] = {},
-    [ITEM_TO_BERRY(ITEM_ROWAP_BERRY)  - 1] = {},
-    [ITEM_TO_BERRY(ITEM_KEE_BERRY)    - 1] = {},
-    [ITEM_TO_BERRY(ITEM_MARANGA_BERRY)- 1] = {},
+    [ITEM_TO_BERRY(ITEM_MICLE_BERRY)  - 1] = {gBerryPic_Micle, gBerryPalette_Micle},
+    [ITEM_TO_BERRY(ITEM_CUSTAP_BERRY) - 1] = {gBerryPic_Custap, gBerryPalette_Custap},
+    [ITEM_TO_BERRY(ITEM_JABOCA_BERRY) - 1] = {gBerryPic_Jaboca, gBerryPalette_Jaboca},
+    [ITEM_TO_BERRY(ITEM_ROWAP_BERRY)  - 1] = {gBerryPic_Rowap, gBerryPalette_Rowap},
+    [ITEM_TO_BERRY(ITEM_KEE_BERRY)    - 1] = {gBerryPic_Kee, gBerryPalette_Kee},
+    [ITEM_TO_BERRY(ITEM_MARANGA_BERRY)- 1] = {gBerryPic_Maranga, gBerryPalette_Maranga},
 };
 
 const struct CompressedSpriteSheet gBerryCheckCircleSpriteSheet =

From 1429170d161cb758978ddae567b35e2984be9bcb Mon Sep 17 00:00:00 2001
From: BuffelSaft <buffalojuice@gmail.com>
Date: Tue, 26 Oct 2021 16:45:49 +1300
Subject: [PATCH 5/8] Fix long descriptions

Just noticed some of these didn't fit in the box.
---
 src/berry.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/berry.c b/src/berry.c
index b1339cb60..ff783a6e7 100644
--- a/src/berry.c
+++ b/src/berry.c
@@ -148,12 +148,12 @@ static const u8 sBerryDescriptionPart1_Chilan[] = _("It can be made into a whist
 static const u8 sBerryDescriptionPart2_Chilan[] = _("produces an indescribable sound.");
 static const u8 sBerryDescriptionPart1_Roseli[] = _("In nature, they grow in wide rings");
 static const u8 sBerryDescriptionPart2_Roseli[] = _("for reasons that are still unknown.");
-static const u8 sBerryDescriptionPart1_Micle[] = _("It has the effect of making other food");
-static const u8 sBerryDescriptionPart2_Micle[] = _("eaten at the same time taste sweet.");
-static const u8 sBerryDescriptionPart1_Custap[] = _("The flesh underneath the Custap Berry's");
-static const u8 sBerryDescriptionPart2_Custap[] = _("skin is sweet and creamy soft.");
+static const u8 sBerryDescriptionPart1_Micle[] = _("It makes other food eaten at the");
+static const u8 sBerryDescriptionPart2_Micle[] = _("same time taste sweet.");
+static const u8 sBerryDescriptionPart1_Custap[] = _("The flesh underneath the Custap");
+static const u8 sBerryDescriptionPart2_Custap[] = _("Berry's skin is sweet and creamy soft.");
 static const u8 sBerryDescriptionPart1_Jaboca[] = _("The drupelets that make up this berry");
-static const u8 sBerryDescriptionPart2_Jaboca[] = _("pop rythmically if it's handled roughly.");
+static const u8 sBerryDescriptionPart2_Jaboca[] = _("pop rythmically if handled roughly.");
 static const u8 sBerryDescriptionPart1_Rowap[] = _("People once worked top-shaped pieces");
 static const u8 sBerryDescriptionPart2_Rowap[] = _("of this berry free to use as toys.");
 static const u8 sBerryDescriptionPart1_Kee[] = _("A berry that is incredibly spicy at");

From 10a3c8f119c8540f5822d170fda781a8891e98df Mon Sep 17 00:00:00 2001
From: LOuroboros <lunosouroboros@gmail.com>
Date: Thu, 4 Nov 2021 17:11:10 -0300
Subject: [PATCH 6/8] Added an item config for the Soul Dew

---
 include/constants/item_config.h | 1 +
 src/data/items.h                | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/include/constants/item_config.h b/include/constants/item_config.h
index 59f3ceb39..89ec0dda4 100644
--- a/include/constants/item_config.h
+++ b/include/constants/item_config.h
@@ -18,6 +18,7 @@
 #define I_KEY_ESCAPE_ROPE       GEN_7   // In Gen8, Escape Rope became a Key Item. Keep in mind, this will make it free to buy in marts.
 #define I_LEGACY_HEALING_ITEMS  GEN_7   // In Gen7+, certain healing items recover less HP than they used to.
 #define I_SITRUS_BERRY_HEAL     GEN_7   // In Gen4+, Sitrus Berry was changed from healing 30 HP to healing 25% of Max HP.
+#define I_SOUL_DEW_BOOST        GEN_7   // In Gens3-6, Soul Dew boosts the stats of Lati@s by 50%. In Gen7+ it boosts the power of their Psychic and Dragon type moves by 20% instead.
 
 // Ball config
 #define I_LURE_BALL_MODIFIER    GEN_7   // In Gen7+, Lure Ball's catch multiplier is x5 instead of x3.
diff --git a/src/data/items.h b/src/data/items.h
index 8e2843ada..d0d2861bc 100644
--- a/src/data/items.h
+++ b/src/data/items.h
@@ -2724,6 +2724,11 @@ const struct Item gItems[] =
         .name = _("Soul Dew"),
         .itemId = ITEM_SOUL_DEW,
         .price = 0,
+        #if defined(BATTLE_ENGINE) && I_SOUL_DEW_BOOST >= GEN_7
+            .holdEffectParam = 20,
+        #elif defined(BATTLE_ENGINE) && I_SOUL_DEW_BOOST <= GEN_6
+            .holdEffectParam = 50,
+        #endif
         .holdEffect = HOLD_EFFECT_SOUL_DEW,
         .description = sSoulDewDesc,
         .pocket = POCKET_ITEMS,

From 05c7f7ebfb2a2f2d80f97d338eb5fdf1249f909c Mon Sep 17 00:00:00 2001
From: LOuroboros <lunosouroboros@gmail.com>
Date: Fri, 5 Nov 2021 10:39:27 -0300
Subject: [PATCH 7/8] Fixed the comment for I_SOUL_DEW_BOOST

---
 include/constants/item_config.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/constants/item_config.h b/include/constants/item_config.h
index 89ec0dda4..ab46849ce 100644
--- a/include/constants/item_config.h
+++ b/include/constants/item_config.h
@@ -18,7 +18,7 @@
 #define I_KEY_ESCAPE_ROPE       GEN_7   // In Gen8, Escape Rope became a Key Item. Keep in mind, this will make it free to buy in marts.
 #define I_LEGACY_HEALING_ITEMS  GEN_7   // In Gen7+, certain healing items recover less HP than they used to.
 #define I_SITRUS_BERRY_HEAL     GEN_7   // In Gen4+, Sitrus Berry was changed from healing 30 HP to healing 25% of Max HP.
-#define I_SOUL_DEW_BOOST        GEN_7   // In Gens3-6, Soul Dew boosts the stats of Lati@s by 50%. In Gen7+ it boosts the power of their Psychic and Dragon type moves by 20% instead.
+#define I_SOUL_DEW_BOOST        GEN_7   // In Gens3-6, Soul Dew boosts Lati@s' Sp. Atk and Sp. Def by 50%. In Gen7+ it boosts the power of their Psychic and Dragon type moves by 20% instead.
 
 // Ball config
 #define I_LURE_BALL_MODIFIER    GEN_7   // In Gen7+, Lure Ball's catch multiplier is x5 instead of x3.

From ab2dab9d050290f5a2ed7b33742e5df4b094e90a Mon Sep 17 00:00:00 2001
From: LOuroboros <lunosouroboros@gmail.com>
Date: Fri, 5 Nov 2021 17:42:12 -0300
Subject: [PATCH 8/8] Gave a holdEffectParam to the Adamant, Lustrous and
 Griseous Orbs

---
 src/data/items.h | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/data/items.h b/src/data/items.h
index d0d2861bc..4ef2799b4 100644
--- a/src/data/items.h
+++ b/src/data/items.h
@@ -5327,6 +5327,9 @@ const struct Item gItems[] =
         .name = _("Adamant Orb"),
         .itemId = ITEM_ADAMANT_ORB,
         .price = 0,
+        #if defined(BATTLE_ENGINE)
+            .holdEffectParam = 20,
+        #endif
         .holdEffect = HOLD_EFFECT_ADAMANT_ORB,
         .description = sAdamantOrbDesc,
         .pocket = POCKET_ITEMS,
@@ -5339,6 +5342,9 @@ const struct Item gItems[] =
         .name = _("Lustrous Orb"),
         .itemId = ITEM_LUSTROUS_ORB,
         .price = 0,
+        #if defined(BATTLE_ENGINE)
+            .holdEffectParam = 20,
+        #endif
         .holdEffect = HOLD_EFFECT_LUSTROUS_ORB,
         .description = sLustrousOrbDesc,
         .pocket = POCKET_ITEMS,
@@ -5351,6 +5357,9 @@ const struct Item gItems[] =
         .name = _("Griseous Orb"),
         .itemId = ITEM_GRISEOUS_ORB,
         .price = 0,
+        #if defined(BATTLE_ENGINE)
+            .holdEffectParam = 20,
+        #endif
         .holdEffect = HOLD_EFFECT_GRISEOUS_ORB,
         .description = sGriseousOrbDesc,
         .pocket = POCKET_ITEMS,