diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2018-02-07 00:40:17 -0500 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2018-02-07 00:40:17 -0500 |
| commit | 0e448936b5f77561f8bb55f3e0d27e7ed5a64c99 (patch) | |
| tree | 7c529306c92bcc3e482ef4e0ac89ec941bdc4097 /include/constants | |
| parent | 51ade392bf16ae4c87a18f8965b8e650fe983d03 (diff) | |
| parent | a395cd7e53ed33634eef4df22814da4ba96a3357 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeruby
Diffstat (limited to 'include/constants')
| -rw-r--r-- | include/constants/decorations.h | 2 | ||||
| -rw-r--r-- | include/constants/items.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/include/constants/decorations.h b/include/constants/decorations.h index 2e3558721..c361ccdf1 100644 --- a/include/constants/decorations.h +++ b/include/constants/decorations.h @@ -123,4 +123,6 @@ #define DECOR_REGICE_DOLL 119 #define DECOR_REGISTEEL_DOLL 120 +#define DECOR_COUNT 121 + #endif // GUARD_CONSTANTS_DECORATIONS_H diff --git a/include/constants/items.h b/include/constants/items.h index 9b88db1da..6f54e6ee4 100644 --- a/include/constants/items.h +++ b/include/constants/items.h @@ -401,4 +401,6 @@ // Check if the item is one that can be used on a Pokemon. #define IS_POKEMON_ITEM(item) ((item) >= ITEM_POTION && (item) <= ITEM_0B2) +#define IS_ITEM_MAIL(item) ((item) >= ITEM_ORANGE_MAIL && (item) <= ITEM_RETRO_MAIL) + #endif // GUARD_CONSTANTS_ITEMS_H |