Merge branch 'master' into gflib

1 files changed, 0 insertions, 33 deletions

diff --git a/include/berry.h b/include/berry.h
index 9ff18e198..ebe1e9a38 100644
--- a/include/berry.h
+++ b/include/berry.h
@@ -1,39 +1,6 @@
 #ifndef GUARD_BERRY_H
 #define GUARD_BERRY_H
 
-#define BERRY_NONE 0
-
-enum
-{
-    BERRY_FIRMNESS_UNKNOWN,
-    BERRY_FIRMNESS_VERY_SOFT,
-    BERRY_FIRMNESS_SOFT,
-    BERRY_FIRMNESS_HARD,
-    BERRY_FIRMNESS_VERY_HARD,
-    BERRY_FIRMNESS_SUPER_HARD,
-};
-
-enum
-{
-    FLAVOR_SPICY,
-    FLAVOR_DRY,
-    FLAVOR_SWEET,
-    FLAVOR_BITTER,
-    FLAVOR_SOUR,
-    FLAVOR_COUNT
-};
-
-enum
-{
-    BERRY_STAGE_NO_BERRY, // there is no tree planted and the soil is completely flat.
-    BERRY_STAGE_PLANTED,
-    BERRY_STAGE_SPROUTED,
-    BERRY_STAGE_TALLER,
-    BERRY_STAGE_FLOWERING,
-    BERRY_STAGE_BERRIES,
-    BERRY_STAGE_SPARKLING = 0xFF,
-};
-
 void ClearEnigmaBerries(void);
 void SetEnigmaBerry(u8 *src);
 bool32 IsEnigmaBerryValid(void);