diff options
author | GriffinR <griffin.g.richards@gmail.com> | 2021-10-07 16:10:35 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-10-07 16:10:35 -0400 |
commit | a2655ba9ab82646a54f60abc6078df372179f8d4 (patch) | |
tree | 95b074a1a4d77d6cd77e413e1d6e72eb55b595b0 /include/constants/items.h | |
parent | e86d3410a1719fcbf62754bfda93a295aa7e0d57 (diff) | |
parent | 001a25e49cd6acdac89a62f4230aef80422e78f2 (diff) |
Merge branch 'master' into doc-union
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 |