enigma berry structs

3 files changed, 17 insertions, 3 deletions

diff --git a/include/berry.h b/include/berry.h
index 9d75eada6..9800e74eb 100644
--- a/include/berry.h
+++ b/include/berry.h
@@ -21,9 +21,21 @@ struct Berry
 
 struct EnigmaBerry
 {
+    struct Berry berry;
+    u8 pic[(6 * 6) * TILE_SIZE_4BPP];
+    u16 palette[16];
+    u8 description1[45];
+    u8 description2[45];
+    u8 itemEffect[18];
+    u8 holdEffect;
+    u32 checksum;
+};
+
+struct BattleEnigmaBerry
+{
     u8 name[7];
     u8 holdEffect;
-    u8 unknown[18];
+    u8 itemEffect[18];
     u8 holdEffectParam;
 };
 
diff --git a/include/global.h b/include/global.h
index 5b1705261..a489b93be 100644
--- a/include/global.h
+++ b/include/global.h
@@ -93,6 +93,7 @@ struct SecretBaseRecord
 
 #include "game_stat.h"
 #include "fieldmap.h"
+#include "berry.h"
 
 struct WarpData
 {
@@ -148,7 +149,8 @@ struct SaveBlock1
     u32 gameStats[NUM_GAME_STATS];
     u8 filler_1608[0x18F4];
     struct SB1_2EFC_Struct sb1_2EFC_struct[5];
-    u8 filler_2F9C[0x6F4];
+    u8 filler_2F9C[0x1C4];
+    struct EnigmaBerry enigmaBerry;
     struct RamScript ramScript;
     u8 filler_3A7C[0x10];
     u8 unk3A8C[52]; //pokedex related
diff --git a/src/pokemon_2.c b/src/pokemon_2.c
index 11bd20f4c..588b01168 100644
--- a/src/pokemon_2.c
+++ b/src/pokemon_2.c
@@ -25,7 +25,7 @@ extern u8 gUnknown_02024C08;
 extern u8 gUnknown_02024C0C;
 extern u8 gXXX_CritRelated;
 extern u16 word_2024DB8;
-extern struct EnigmaBerry gEnigmaBerries[];
+extern struct BattleEnigmaBerry gEnigmaBerries[];
 extern u16 gBattleMovePower;
 extern struct SpriteTemplate gUnknown_02024E8C;
 extern u16 gTrainerBattleOpponent;