diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-10-31 14:22:51 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-31 14:22:51 -0400 |
| commit | b1ea2592c30a2e5af547dfc69cef56eb65ae85ba (patch) | |
| tree | a65d2af7712a2913afb72329215f2574d92d1668 /include/constants/easy_chat.h | |
| parent | b33db9b96cda2f03d10b9bfeec4e6ac8bc90da13 (diff) | |
| parent | 67ce8c9cc2dc9d018cae17e71b46c2c999cb048a (diff) | |
Merge branch 'master' into doc-partymenu
Diffstat (limited to 'include/constants/easy_chat.h')
| -rw-r--r-- | include/constants/easy_chat.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/constants/easy_chat.h b/include/constants/easy_chat.h index 50f5994f4..b97c2aaf2 100644 --- a/include/constants/easy_chat.h +++ b/include/constants/easy_chat.h @@ -1095,6 +1095,7 @@ #define EC_WORD_OLD (EC_GROUP_TRENDY_SAYING << 9) | 0x1e #define EC_WORD_YOUNG (EC_GROUP_TRENDY_SAYING << 9) | 0x1f #define EC_WORD_UGLY (EC_GROUP_TRENDY_SAYING << 9) | 0x20 +#define NUM_ADDITIONAL_PHRASES 33 #define EC_POKEMON(mon) ((EC_GROUP_POKEMON << 9) | SPECIES_##mon) #define EC_POKEMON2(mon) ((EC_GROUP_POKEMON_2 << 9) | SPECIES_##mon) |