diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-27 20:07:33 -0500 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-27 20:07:33 -0500 |
commit | 1ac177723de817a85533adc3e984425d3ab86e00 (patch) | |
tree | 3f5ce54362ad9a8c75e21c52f78ce3b4bcd460f2 /include/items.h | |
parent | eff1ad330031633b2a28f2b9e8bc8f5e5258826a (diff) | |
parent | 18c6b8efc21a509121ab4d6f5b9c8523689d27a2 (diff) |
Merge branch 'master' into field_poison
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 |