1 files changed, 28 insertions, 9 deletions
diff --git a/include/global.berry.h b/include/global.berry.h
index 6632e55e2..5c8a43a02 100644
--- a/include/global.berry.h
+++ b/include/global.berry.h
@@ -1,9 +1,12 @@
 #ifndef GUARD_GLOBAL_BERRY_H
 #define GUARD_GLOBAL_BERRY_H
 
+#define BERRY_NAME_COUNT 7
+#define BERRY_ITEM_EFFECT_COUNT 18
+
 struct Berry
 {
-    const u8 name[7];
+    const u8 name[BERRY_NAME_COUNT];
     u8 firmness;
     u16 size;
     u8 maxYield;
@@ -19,14 +22,30 @@ struct Berry
     u8 smoothness;
 };
 
+// with no const fields
+
+struct Berry2
+{
+    u8 name[BERRY_NAME_COUNT];
+    u8 firmness;
+    u16 size;
+    u8 maxYield;
+    u8 minYield;
+    u8 *description1;
+    u8 *description2;
+    u8 stageDuration;
+    u8 spicy;
+    u8 dry;
+    u8 sweet;
+    u8 bitter;
+    u8 sour;
+    u8 smoothness;
+};
+
 struct EnigmaBerry
 {
-    struct Berry berry;
-    u8 pic[(6 * 6) * TILE_SIZE_4BPP];
-    u16 palette[16];
-    u8 description1[45];
-    u8 description2[45];
-    u8 itemEffect[18];
+    struct Berry2 berry;
+    u8 itemEffect[BERRY_ITEM_EFFECT_COUNT];
     u8 holdEffect;
     u8 holdEffectParam;
     u32 checksum;
@@ -34,9 +53,9 @@ struct EnigmaBerry
 
 struct BattleEnigmaBerry
 {
-    /*0x00*/ u8 name[7];
+    /*0x00*/ u8 name[BERRY_NAME_COUNT];
     /*0x07*/ u8 holdEffect;
-    /*0x08*/ u8 itemEffect[18];
+    /*0x08*/ u8 itemEffect[BERRY_ITEM_EFFECT_COUNT];
     /*0x1A*/ u8 holdEffectParam;
 };