Sync new_game.inc

3 files changed, 45 insertions, 34 deletions

diff --git a/include/berry.h b/include/berry.h
index 9a7773779..0a84ed1c2 100644
--- a/include/berry.h
+++ b/include/berry.h
@@ -1,39 +1,6 @@
 #ifndef GUARD_BERRY_H
 #define GUARD_BERRY_H
 
-#define BERRY_NAME_LENGTH 6
-#define BERRY_REGROW_LIMIT 10
-#define MAX_BERRY_TREES 128
-
-#define BERRY_NONE 0
-#define FIRST_BERRY ITEM_CHERI_BERRY
-#define LAST_BERRY  ITEM_ENIGMA_BERRY
-
-#define GETBERRYID(berry) ((berry - FIRST_BERRY) + 1)
-#define GETITEMID(berry) ((berry + FIRST_BERRY) - 1)
-
-enum
-{
-    BERRY_FIRMNESS_UNKNOWN,
-    BERRY_FIRMNESS_VERY_SOFT,
-    BERRY_FIRMNESS_SOFT,
-    BERRY_FIRMNESS_HARD,
-    BERRY_FIRMNESS_VERY_HARD,
-    BERRY_FIRMNESS_SUPER_HARD,
-};
-
-// berry stages
-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 debug_sub_80C2C18(const u8 *name, u8 holdEffect, u8 holdEffectParam);
 void SetEnigmaBerry(u8 *src);
diff --git a/include/constants/berry.h b/include/constants/berry.h
new file mode 100644
index 000000000..9dc8474f1
--- /dev/null
+++ b/include/constants/berry.h
@@ -0,0 +1,32 @@
+#ifndef GUARD_CONSTANTS_BERRY_H
+#define GUARD_CONSTANTS_BERRY_H
+
+#define BERRY_NAME_LENGTH 6
+#define BERRY_REGROW_LIMIT 10
+#define MAX_BERRY_TREES 128
+
+#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
diff --git a/include/constants/items.h b/include/constants/items.h
index a52c72599..9dd381076 100644
--- a/include/constants/items.h
+++ b/include/constants/items.h
@@ -363,11 +363,23 @@
 #define ITEM_15B 347
 #define ITEM_15C 348
 
+#define ITEMS_COUNT 349
+#define ITEM_FIELD_ARROW ITEMS_COUNT
+
 #define NUM_TECHNICAL_MACHINES 50
 #define NUM_HIDDEN_MACHINES     8
 
+#define MAX_BAG_ITEM_CAPACITY  99
+#define MAX_PC_ITEM_CAPACITY   999
+#define MAX_BERRY_CAPACITY     999
+
+#define FIRST_BERRY_INDEX             ITEM_CHERI_BERRY
+#define LAST_BERRY_INDEX              ITEM_ENIGMA_BERRY
+
+#define ITEM_TO_BERRY(itemId)(((itemId - FIRST_BERRY_INDEX) + 1))
+
 // Check if the item is one that can be used on a Pokemon.
-#define IS_POKEMON_ITEM(item) ((item) >= ITEM_POTION && (item) <= ITEM_0B2)
+#define ITEM_HAS_EFFECT(item) ((item) >= ITEM_POTION && (item) <= ITEM_0B2)
 
 #define IS_ITEM_MAIL(item) ((item) >= ITEM_ORANGE_MAIL && (item) <= ITEM_RETRO_MAIL)