diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-17 23:42:44 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-17 23:42:44 -0400 |
| commit | 16f2e40576b29fd85366305b4165da3aff4aef0e (patch) | |
| tree | 24b5d9112f6cec70b2ba9f8cc4a3a63a8c0cb023 /include | |
| parent | 380858293e4597dd40390129a9a7bac713bdf080 (diff) | |
Fix naming conflicts
Diffstat (limited to 'include')
| -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 |