diff options
| author | camthesaxman <cameronghall@cox.net> | 2018-01-05 22:18:57 -0600 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2018-01-05 22:18:57 -0600 |
| commit | 7d181ec03bdc8e5b9424e08e4428b76bab8eb5fd (patch) | |
| tree | ff8df8bc4745ef584f18e336d457da0d10fe0b1e /include/constants | |
| parent | 2ea6caea07ef5926b344871fc283fc1984bd2414 (diff) | |
minor cleanup
Diffstat (limited to 'include/constants')
| -rw-r--r-- | include/constants/easy_chat.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/constants/easy_chat.h b/include/constants/easy_chat.h index 12350aebe..215dac48c 100644 --- a/include/constants/easy_chat.h +++ b/include/constants/easy_chat.h @@ -1,7 +1,7 @@ #ifndef GUARD_CONSTANTS_EASY_CHAT_H #define GUARD_CONSTANTS_EASY_CHAT_H -#define EC_GROUP_POKEMON 0x0 +#define EC_GROUP_POKEMON_1 0x0 #define EC_GROUP_TRAINER 0x1 #define EC_GROUP_STATUS 0x2 #define EC_GROUP_BATTLE 0x3 @@ -1053,7 +1053,7 @@ #define EC_WORD_YOUNG (EC_GROUP_TRENDY_SAYING << 9) | 0x1f #define EC_WORD_UGLY (EC_GROUP_TRENDY_SAYING << 9) | 0x20 -#define EC_POKEMON(mon) ((EC_GROUP_POKEMON << 9) | SPECIES_##mon) +#define EC_POKEMON(mon) ((EC_GROUP_POKEMON_1 << 9) | SPECIES_##mon) #define EC_POKEMON2(mon) ((EC_GROUP_POKEMON_2 << 9) | SPECIES_##mon) #define EC_MOVE(move) ((EC_GROUP_MOVE_1 << 9) | MOVE_##move) #define EC_MOVE2(move) ((EC_GROUP_MOVE_2 << 9) | MOVE_##move) |