diff options
| author | Phlosioneer <mattmdrr2@gmail.com> | 2019-04-07 20:20:22 -0400 |
|---|---|---|
| committer | Phlosioneer <mattmdrr2@gmail.com> | 2019-04-07 20:20:22 -0400 |
| commit | 50350cc2e1c26082f9d852e97e1698f7254d4145 (patch) | |
| tree | 3217b352dae2be8da75ad08a8d94ddc7f81a5017 /src/easy_chat.c | |
| parent | 1360b3a477f1107785900cd0c4e73ebf018f058c (diff) | |
| parent | a4ea0ac816f799b76ac4bec1b66c569d6b684e64 (diff) | |
Merge branch 'master' into contest-ai-cleanup
Diffstat (limited to 'src/easy_chat.c')
| -rw-r--r-- | src/easy_chat.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/easy_chat.c b/src/easy_chat.c index 239ada5df..93456631a 100644 --- a/src/easy_chat.c +++ b/src/easy_chat.c @@ -2,7 +2,7 @@ #include "alloc.h" #include "bard_music.h" #include "bg.h" -#include "data2.h" +#include "data.h" #include "decompress.h" #include "dewford_trend.h" #include "dynamic_placeholder_text_util.h" @@ -4883,7 +4883,7 @@ bool8 ECWord_CheckIfOutsideOfValidRange(u16 easyChatWord) { case EC_GROUP_POKEMON: case EC_GROUP_POKEMON_2: - numWordsInGroup = gUnknown_085F5490; + numWordsInGroup = gNumSpeciesNames; break; case EC_GROUP_MOVE_1: case EC_GROUP_MOVE_2: |