diff options
| author | froggestspirit <froggestspirit@gmail.com> | 2021-09-06 10:32:14 -0400 |
|---|---|---|
| committer | froggestspirit <froggestspirit@gmail.com> | 2021-09-06 10:32:14 -0400 |
| commit | 73554ec88d4f269b6146f6d1ab5d2742cb0a6f89 (patch) | |
| tree | fac5bee8a4ce4757816dbbe42265523478b78781 /include/constants/items.h | |
| parent | ec6b1ea3735ff98a9714b219e4a999894ecc6010 (diff) | |
| parent | 63e6b914e4d9b9bdb0a8d621b2ed233990f2ef66 (diff) | |
Merge remote-tracking branch 'pret/master'
Diffstat (limited to 'include/constants/items.h')
| -rw-r--r-- | include/constants/items.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/include/constants/items.h b/include/constants/items.h index 8f77e80de..c596dd3b8 100644 --- a/include/constants/items.h +++ b/include/constants/items.h @@ -199,9 +199,11 @@ #define FIRST_BERRY_INDEX ITEM_CHERI_BERRY #define LAST_BERRY_INDEX ITEM_ENIGMA_BERRY -#define ITEM_0B0 176 -#define ITEM_0B1 177 -#define ITEM_0B2 178 +#define ITEM_UNUSED_BERRY_1 176 +#define ITEM_UNUSED_BERRY_2 177 +#define ITEM_UNUSED_BERRY_3 178 + +#define MAX_BERRY_INDEX ITEM_UNUSED_BERRY_3 // Battle Held items #define ITEM_BRIGHT_POWDER 179 @@ -531,6 +533,6 @@ #define ITEM_B_USE_OTHER 2 // Check if the item is one that can be used on a Pokemon. -#define ITEM_HAS_EFFECT(item) ((item) >= ITEM_POTION && (item) <= ITEM_0B2) +#define ITEM_HAS_EFFECT(item) ((item) >= ITEM_POTION && (item) <= MAX_BERRY_INDEX) #endif // GUARD_CONSTANTS_ITEMS_H |