diff options
author | Cameron Hall <camthesaxman@users.noreply.github.com> | 2018-01-05 22:39:18 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-05 22:39:18 -0600 |
commit | f3399955b15f622aec629dbd9bee3090a69e2ce0 (patch) | |
tree | 4b47c9fb0f2db74dcbc56cedec839523c86a5647 /include/constants | |
parent | f5fbe5b66226f4e7e38fe5d4638831d1ce19b36b (diff) | |
parent | e95436b9024f2c32a2a005c97cf35f426fadab62 (diff) |
Merge pull request #504 from camthesaxman/decompile_easy_chat
decompile easy_chat.s
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) |