diff options
author | scnorton <scnorton@biociphers.org> | 2017-09-17 13:38:33 -0400 |
---|---|---|
committer | scnorton <scnorton@biociphers.org> | 2017-09-17 13:38:33 -0400 |
commit | 71b40f50c0de173913d11f1e5bc228060cb4a49b (patch) | |
tree | 4029150523fe2157e746640de6375e9530f7a2d9 /include/global.berry.h | |
parent | 4b04e92e8b236d91ea5cc45813f914f10a86b748 (diff) | |
parent | 74bda5b68088f08220cf3f1b9791e5900a6a9877 (diff) |
Merge branch 'master' into field_map_obj
Diffstat (limited to 'include/global.berry.h')
-rw-r--r-- | include/global.berry.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/global.berry.h b/include/global.berry.h index 4b9ca644c..a77da20ba 100644 --- 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 |