diff options
author | Diegoisawesome <diego@domoreaweso.me> | 2017-09-16 15:50:08 -0500 |
---|---|---|
committer | Diegoisawesome <diego@domoreaweso.me> | 2017-09-16 15:50:08 -0500 |
commit | 5e12833b13223ecc6a5a9c91332ed71303358680 (patch) | |
tree | 46256c02f8d772d76a81c1ec2a9f4bd15fb05b0f /include/global.berry.h | |
parent | 5a74c0e91354276a92ea01152b76a85462d30d4e (diff) |
Finish merge
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 |