move mon data fix conflicts

2018-02-07 20:17:55 +01:00
parent 541fef5368 802b505d7b
commit 4b7d778a5c
302 changed files with 14099 additions and 23834 deletions
--- a/include/constants/items.h
+++ b/include/constants/items.h
@@ -454,6 +454,9 @@
 #define ITEM_MAGMA_EMBLEM 375
 #define ITEM_OLD_SEA_MAP 376

+#define ITEM_LAST_ID 376
+#define ITEM_FIELD_ARROW ITEM_LAST_ID + 1
+
 #define FIRST_BERRY_INDEX ITEM_CHERI_BERRY
 #define LAST_BERRY_INDEX ITEM_ENIGMA_BERRY
 #define ITEM_TO_BERRY(itemId)(((itemId - FIRST_BERRY_INDEX) + 1))