From 16f2e40576b29fd85366305b4165da3aff4aef0e Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sun, 17 Sep 2017 23:42:44 -0400
Subject: Fix naming conflicts

---
 include/global.berry.h | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'include')

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
-- 
cgit v1.2.3