Merge branch 'master' into field_map_obj

2017-09-17 13:38:33 -04:00
parent 4b04e92e8b 74bda5b680
commit 71b40f50c0
206 changed files with 137559 additions and 132143 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