diff options
| author | Marco Willems (M17.1) <progreon@gmail.com> | 2018-01-06 13:46:46 +0100 |
|---|---|---|
| committer | Marco Willems (M17.1) <progreon@gmail.com> | 2018-01-06 13:46:46 +0100 |
| commit | a9e39c0919ccbd0fc9dac0a60f3a1a206f9249f5 (patch) | |
| tree | baf1dbf232ad81f906c9805ce5986f850c0b84a9 /include/constants/easy_chat.h | |
| parent | 6fae3c9b75221ac611871fe5ec4bca057f6f79a2 (diff) | |
| parent | 818dfa314e1658ab797af686fedd464c9fda6557 (diff) | |
Merge branch 'master' into battle_anim
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) |