diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-08-15 12:01:57 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-15 12:01:57 -0400 |
| commit | ee5eee6ccc3c792203838baec7a1273010414027 (patch) | |
| tree | c2097775edd87f2b2af7582de5b851e72e0458ae /include/constants | |
| parent | c7fc6ac893b1018d48379d807740352e0926defd (diff) | |
| parent | 034b7f051338a45823a239ee2628ae58f9c96eb2 (diff) | |
Merge pull request #1493 from GriffinRichards/doc-itemmenu2
Document item menu
Diffstat (limited to 'include/constants')
| -rw-r--r-- | include/constants/item.h | 5 | ||||
| -rw-r--r-- | include/constants/items.h | 10 |
2 files changed, 6 insertions, 9 deletions
diff --git a/include/constants/item.h b/include/constants/item.h index 3277f2379..a224291fa 100644 --- a/include/constants/item.h +++ b/include/constants/item.h @@ -16,9 +16,4 @@ #define KEYITEMS_POCKET 4 #define POCKETS_COUNT 5 -// The TM/HM pocket is the largest pocket, so the maximum amount of items -// in a pocket is its count + 1 for the cancel option -#define MAX_POCKET_ITEMS (BAG_TMHM_COUNT + 1) - - #endif // GUARD_ITEM_CONSTANTS_H 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 |