diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-04-05 08:41:31 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-04-05 08:41:31 -0400 |
| commit | a58d9a16dd7e4f263ebccda50e70103e7490886b (patch) | |
| tree | ddde359501adee874131731c700862c615c46e77 /src/easy_chat.c | |
| parent | a677d1f4cb6f2925e9694b8d2b408273dcd13d9b (diff) | |
| parent | 9e74409bb2032e25d431dda116462759e5b51fe0 (diff) | |
Merge branch 'master' into dodrio_berry_picking
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 2e384de6e..4388592f7 100644 --- a/src/easy_chat.c +++ b/src/easy_chat.c @@ -3721,7 +3721,7 @@ static void sub_811D0BC(void) { FillBgTilemapBufferRect(0, 0, 0, 0, 32, 20, 17); LoadUserWindowBorderGfx(1, 1, 0xE0); - sub_8098858(1, 1, 14); + DrawTextBorderOuter(1, 1, 14); sub_811D104(0); PutWindowTilemap(1); CopyBgTilemapBufferToVram(0); @@ -4882,7 +4882,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: |