diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2018-05-04 17:45:50 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-04 17:45:50 -0400 |
| commit | 58200616d55798002046e67a656f5295834455ec (patch) | |
| tree | 7487b983c8205a97832831b6b6b06cf60534f65a /include/constants/items.h | |
| parent | 4acbcf5759cb2d5453631dd104e3a845931df66c (diff) | |
| parent | cdb5e9e3143b2f1086d8bd4f02a76186c164d02a (diff) | |
Merge branch 'master' into trader
Diffstat (limited to 'include/constants/items.h')
| -rw-r--r-- | include/constants/items.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/include/constants/items.h b/include/constants/items.h index 8717ecbd5..4ca5cb7df 100644 --- a/include/constants/items.h +++ b/include/constants/items.h @@ -108,6 +108,8 @@ #define ITEM_064 100 #define ITEM_065 101 #define ITEM_066 102 + +// Unusable #define ITEM_TINY_MUSHROOM 103 #define ITEM_BIG_MUSHROOM 104 #define ITEM_069 105 @@ -126,6 +128,8 @@ #define ITEM_076 118 #define ITEM_077 119 #define ITEM_078 120 + +// Mails #define ITEM_ORANGE_MAIL 121 #define ITEM_HARBOR_MAIL 122 #define ITEM_GLITTER_MAIL 123 @@ -138,6 +142,8 @@ #define ITEM_DREAM_MAIL 130 #define ITEM_FAB_MAIL 131 #define ITEM_RETRO_MAIL 132 + +// Berries #define ITEM_CHERI_BERRY 133 #define ITEM_CHESTO_BERRY 134 #define ITEM_PECHA_BERRY 135 @@ -185,7 +191,7 @@ #define ITEM_0B1 177 #define ITEM_0B2 178 -// hold items +// Battle Held items #define ITEM_BRIGHT_POWDER 179 #define ITEM_WHITE_HERB 180 #define ITEM_MACHO_BRACE 181 @@ -261,6 +267,8 @@ #define ITEM_0FB 251 #define ITEM_0FC 252 #define ITEM_0FD 253 + +// Contest held items #define ITEM_RED_SCARF 254 #define ITEM_BLUE_SCARF 255 #define ITEM_PINK_SCARF 256 |