Merge branch 'master' into pokedex_area_screen

1 files changed, 8 insertions, 10 deletions

diff --git a/src/easy_chat_2.c b/src/easy_chat_2.c
index 01290daba..01f5e016d 100644
--- a/src/easy_chat_2.c
+++ b/src/easy_chat_2.c
@@ -19,6 +19,12 @@
 #include "trig.h"
 #include "scanline_effect.h"
 
+#include "data/text/easy_chat/group_words.h"
+#include "data/text/easy_chat/words_by_letter.h"
+#include "data/text/easy_chat/group_sizes.h"
+#include "data/text/easy_chat/group_orders.h"
+#include "data/text/easy_chat/group_name_table.h"
+
 extern void sub_8095C8C();
 extern void sub_809D104(void *, u16, u16, const void *, u16, u16, u16, u16);
 
@@ -2067,11 +2073,6 @@ void sub_80EAD08(void)
     }
 }
 
-extern const u8 *const gEasyChatGroupNames[];
-extern const u8 gEasyChatGroupSizes[];
-extern const u16 gEasyChatWordsByLetter[];
-extern const u16 gEasyChatWordsAlphabetized[];
-
 u8 *CopyEasyChatGroupName(u8 *dest, u8 group, int unused)
 {
     return StringCopy(dest, gEasyChatGroupNames[group]);
@@ -2369,10 +2370,6 @@ void sub_80EAECC(void)
 }
 #endif
 
-extern const u8 *const gEasyChatGroupWords[];
-extern const u16 *const gEasyChatGroupOrders[];
-extern const u8 gEasyChatGroupSizes[];
-
 // loads strings of all easy chat words except for the species and move names.
 void LoadEasyChatStrings(void)
 {
@@ -3011,6 +3008,7 @@ static u16 sub_80EB9D8(void)
     u16 *speciesList;
     u16 local1;
     u16 i;
+    u8 topsize;
 
     local1 = sub_80EAE88(0);
 
@@ -3019,7 +3017,7 @@ static u16 sub_80EB9D8(void)
 
     local1 = Random() % local1;
     speciesList = (u16 *)gEasyChatGroupWords[EC_GROUP_POKEMON_1];
-    for (i = 0; i < gEasyChatGroupSizes[EC_GROUP_POKEMON_1]; i++)
+    for (i = 0, topsize = gEasyChatGroupSizes[EC_GROUP_POKEMON_1]; i < topsize; i++)
     {
         const u16 dexNum = SpeciesToNationalPokedexNum(*speciesList);
         const u8 local2 = GetSetPokedexFlag(dexNum, 0);