From 06af24bce58b9285166d27fc371ad3c3dbb63a29 Mon Sep 17 00:00:00 2001
From: GriffinR <griffin.richards@comcast.net>
Date: Sun, 15 Sep 2019 23:47:07 -0400
Subject: Use misc ScrCmd constants

---
 include/berry.h           | 33 ---------------------------------
 include/constants/berry.h | 28 ++++++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 33 deletions(-)
 create mode 100644 include/constants/berry.h

(limited to 'include')

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);
diff --git a/include/constants/berry.h b/include/constants/berry.h
new file mode 100644
index 000000000..d413b9947
--- /dev/null
+++ b/include/constants/berry.h
@@ -0,0 +1,28 @@
+#ifndef GUARD_CONSTANTS_BERRY_H
+#define GUARD_CONSTANTS_BERRY_H
+
+#define BERRY_NONE 0
+
+#define BERRY_FIRMNESS_UNKNOWN     0
+#define BERRY_FIRMNESS_VERY_SOFT   1
+#define BERRY_FIRMNESS_SOFT        2
+#define BERRY_FIRMNESS_HARD        3
+#define BERRY_FIRMNESS_VERY_HARD   4
+#define BERRY_FIRMNESS_SUPER_HARD  5
+
+#define FLAVOR_SPICY   0
+#define FLAVOR_DRY     1
+#define FLAVOR_SWEET   2
+#define FLAVOR_BITTER  3
+#define FLAVOR_SOUR    4
+#define FLAVOR_COUNT   5
+
+#define BERRY_STAGE_NO_BERRY    0  // there is no tree planted and the soil is completely flat.
+#define BERRY_STAGE_PLANTED     1
+#define BERRY_STAGE_SPROUTED    2
+#define BERRY_STAGE_TALLER      3
+#define BERRY_STAGE_FLOWERING   4
+#define BERRY_STAGE_BERRIES     5
+#define BERRY_STAGE_SPARKLING   255
+
+#endif // GUARD_CONSTANTS_BERRY_H
-- 
cgit v1.2.3