diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-27 20:09:53 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-27 20:09:53 -0500 |
| commit | 88636dfc2a07790d9bdbba1ca56f4ca252d16f5b (patch) | |
| tree | 9b31cc1b61577ee20fa50b8feec5c7780cbce3ef /include/items.h | |
| parent | 9840be1f0041e697f1aefbdc839a5227b7100112 (diff) | |
| parent | 18c6b8efc21a509121ab4d6f5b9c8523689d27a2 (diff) | |
Merge branch 'master' into clock
Diffstat (limited to 'include/items.h')
| -rw-r--r-- | include/items.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/items.h b/include/items.h index 1f6c288c5..1a6df42db 100644 --- a/include/items.h +++ b/include/items.h @@ -386,6 +386,10 @@ enum ITEM_OLD_SEA_MAP, // 0x178 }; +#define FIRST_BERRY_INDEX ITEM_CHERI_BERRY +#define LAST_BERRY_INDEX ITEM_ENIGMA_BERRY +#define ITEM_TO_BERRY(itemId)(((itemId - FIRST_BERRY_INDEX) + 1)) + #define NUM_TECHNICAL_MACHINES 50 #define NUM_HIDDEN_MACHINES 8 |