diff options
author | DizzyEggg <jajkodizzy@wp.pl> | 2018-02-07 20:17:55 +0100 |
---|---|---|
committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-02-07 20:17:55 +0100 |
commit | 4b7d778a5ce4c2012966bb34b706dadd860804a1 (patch) | |
tree | 59e554a52930bf67ef3c16ea314bfbbdd7f3bdd9 /include/constants | |
parent | 541fef5368c334559cba946f61ab3fe08bf1575b (diff) | |
parent | 802b505d7bc4f60e6dda62c9a2a4948b8ba765df (diff) |
move mon data fix conflicts
Diffstat (limited to 'include/constants')
-rw-r--r-- | include/constants/items.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/constants/items.h b/include/constants/items.h index 17cf9ec5d..ca6fdbf64 100644 --- 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)) |