diff options
author | golem galvanize <golemgalvanize@github.com> | 2018-02-07 14:14:08 -0500 |
---|---|---|
committer | golem galvanize <golemgalvanize@github.com> | 2018-02-07 14:14:08 -0500 |
commit | b67afb9490ce7fce8c7d478e9b436c5b849fb4ad (patch) | |
tree | b07bb0bb43aeba2c7cfef97213578fb815ccb266 /include/constants/items.h | |
parent | 5f7709dc8bf1bf4eb75d9481e285980f347d5dd7 (diff) | |
parent | 802b505d7bc4f60e6dda62c9a2a4948b8ba765df (diff) |
I hope this fixes the conflicts
Diffstat (limited to 'include/constants/items.h')
-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 6135b8d6f..41d63c4a3 100644 --- a/include/constants/items.h +++ b/include/constants/items.h @@ -383,6 +383,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)) |