diff options
| author | Made-s <made111@gmx.de> | 2018-01-06 19:09:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-06 19:09:47 +0100 |
| commit | 8906ac68e7c5caf7c62597abf16affafc2bb05a3 (patch) | |
| tree | 3c523aa3c85e1d112f06b34283ddc076d0916891 /include/constants/easy_chat.h | |
| parent | f813e926e6438c04167a563225b9fca0939fa758 (diff) | |
| parent | b396c6038cec6eba5eed46ed8f70f6a465acc2a6 (diff) | |
Merge branch 'master' into master
Diffstat (limited to 'include/constants/easy_chat.h')
| -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) |