Finish merge

2017-09-16 15:50:08 -05:00
parent 5a74c0e913
commit 5e12833b13
2 changed files with 2 additions and 6 deletions
--- a/include/global.berry.h
+++ b/include/global.berry.h
@@ -46,10 +46,6 @@ struct EnigmaBerry
    u8 holdEffect;
    u8 holdEffectParam;
    u32 checksum;
-    u8 pic[(6 * 6) * TILE_SIZE_4BPP];
-    u16 palette[16];
-    u8 description1[45];
-    u8 description2[45];
 };

 struct BattleEnigmaBerry