1 files changed, 44 insertions, 44 deletions
diff --git a/src/data/easy_chat/easy_chat_groups.h b/src/data/easy_chat/easy_chat_groups.h
index df114d980..a89f228fe 100755
--- a/src/data/easy_chat/easy_chat_groups.h
+++ b/src/data/easy_chat/easy_chat_groups.h
@@ -26,112 +26,112 @@
 const struct EasyChatGroup gEasyChatGroups[] = {
     {
         .wordData = {.valueList = gEasyChatGroup_Pokemon},
-        .numWords = 202,
-        .numEnabledWords = 202,
+        .numWords = ARRAY_COUNT(gEasyChatGroup_Pokemon),
+        .numEnabledWords = ARRAY_COUNT(gEasyChatGroup_Pokemon),
     },
     {
         .wordData = {.words = gEasyChatGroup_Trainer},
-        .numWords = 27,
-        .numEnabledWords = 21,
+        .numWords = ARRAY_COUNT(gEasyChatGroup_Trainer),
+        .numEnabledWords = ARRAY_COUNT(gEasyChatGroup_Trainer) - 6, // Excludes Red, Green, Flame, Gold, Leaf, and Silver
     },
     {
         .wordData = {.words = gEasyChatGroup_Status},
-        .numWords = 109,
-        .numEnabledWords = 109,
+        .numWords = ARRAY_COUNT(gEasyChatGroup_Status),
+        .numEnabledWords = ARRAY_COUNT(gEasyChatGroup_Status),
     },
     {
         .wordData = {.words = gEasyChatGroup_Battle},
-        .numWords = 63,
-        .numEnabledWords = 63,
+        .numWords = ARRAY_COUNT(gEasyChatGroup_Battle),
+        .numEnabledWords = ARRAY_COUNT(gEasyChatGroup_Battle),
     },
     {
         .wordData = {.words = gEasyChatGroup_Greetings},
-        .numWords = 42,
-        .numEnabledWords = 42,
+        .numWords = ARRAY_COUNT(gEasyChatGroup_Greetings),
+        .numEnabledWords = ARRAY_COUNT(gEasyChatGroup_Greetings),
     },
     {
         .wordData = {.words = gEasyChatGroup_People},
-        .numWords = 75,
-        .numEnabledWords = 75,
+        .numWords = ARRAY_COUNT(gEasyChatGroup_People),
+        .numEnabledWords = ARRAY_COUNT(gEasyChatGroup_People),
     },
     {
         .wordData = {.words = gEasyChatGroup_Voices},
-        .numWords = 63,
-        .numEnabledWords = 63,
+        .numWords = ARRAY_COUNT(gEasyChatGroup_Voices),
+        .numEnabledWords = ARRAY_COUNT(gEasyChatGroup_Voices),
     },
     {
         .wordData = {.words = gEasyChatGroup_Speech},
-        .numWords = 60,
-        .numEnabledWords = 60,
+        .numWords = ARRAY_COUNT(gEasyChatGroup_Speech),
+        .numEnabledWords = ARRAY_COUNT(gEasyChatGroup_Speech),
     },
     {
         .wordData = {.words = gEasyChatGroup_Endings},
-        .numWords = 69,
-        .numEnabledWords = 69,
+        .numWords = ARRAY_COUNT(gEasyChatGroup_Endings),
+        .numEnabledWords = ARRAY_COUNT(gEasyChatGroup_Endings),
     },
     {
         .wordData = {.words = gEasyChatGroup_Feelings},
-        .numWords = 69,
-        .numEnabledWords = 69,
+        .numWords = ARRAY_COUNT(gEasyChatGroup_Feelings),
+        .numEnabledWords = ARRAY_COUNT(gEasyChatGroup_Feelings),
     },
     {
         .wordData = {.words = gEasyChatGroup_Conditions},
-        .numWords = 69,
-        .numEnabledWords = 69,
+        .numWords = ARRAY_COUNT(gEasyChatGroup_Conditions),
+        .numEnabledWords = ARRAY_COUNT(gEasyChatGroup_Conditions),
     },
     {
         .wordData = {.words = gEasyChatGroup_Actions},
-        .numWords = 78,
-        .numEnabledWords = 78,
+        .numWords = ARRAY_COUNT(gEasyChatGroup_Actions),
+        .numEnabledWords = ARRAY_COUNT(gEasyChatGroup_Actions),
     },
     {
         .wordData = {.words = gEasyChatGroup_Lifestyle},
-        .numWords = 45,
-        .numEnabledWords = 45,
+        .numWords = ARRAY_COUNT(gEasyChatGroup_Lifestyle),
+        .numEnabledWords = ARRAY_COUNT(gEasyChatGroup_Lifestyle),
     },
     {
         .wordData = {.words = gEasyChatGroup_Hobbies},
-        .numWords = 54,
-        .numEnabledWords = 54,
+        .numWords = ARRAY_COUNT(gEasyChatGroup_Hobbies),
+        .numEnabledWords = ARRAY_COUNT(gEasyChatGroup_Hobbies),
     },
     {
         .wordData = {.words = gEasyChatGroup_Time},
-        .numWords = 45,
-        .numEnabledWords = 45,
+        .numWords = ARRAY_COUNT(gEasyChatGroup_Time),
+        .numEnabledWords = ARRAY_COUNT(gEasyChatGroup_Time),
     },
     {
         .wordData = {.words = gEasyChatGroup_Misc},
-        .numWords = 42,
-        .numEnabledWords = 42,
+        .numWords = ARRAY_COUNT(gEasyChatGroup_Misc),
+        .numEnabledWords = ARRAY_COUNT(gEasyChatGroup_Misc),
     },
     {
         .wordData = {.words = gEasyChatGroup_Adjectives},
-        .numWords = 36,
-        .numEnabledWords = 36,
+        .numWords = ARRAY_COUNT(gEasyChatGroup_Adjectives),
+        .numEnabledWords = ARRAY_COUNT(gEasyChatGroup_Adjectives),
     },
     {
         .wordData = {.words = gEasyChatGroup_Events},
-        .numWords = 29,
-        .numEnabledWords = 29,
+        .numWords = ARRAY_COUNT(gEasyChatGroup_Events),
+        .numEnabledWords = ARRAY_COUNT(gEasyChatGroup_Events),
     },
     {
         .wordData = {.valueList = gEasyChatGroup_Move1},
-        .numWords = 154,
-        .numEnabledWords = 154,
+        .numWords = ARRAY_COUNT(gEasyChatGroup_Move1),
+        .numEnabledWords = ARRAY_COUNT(gEasyChatGroup_Move1),
     },
     {
         .wordData = {.valueList = gEasyChatGroup_Move2},
-        .numWords = 200,
-        .numEnabledWords = 200,
+        .numWords = ARRAY_COUNT(gEasyChatGroup_Move2),
+        .numEnabledWords = ARRAY_COUNT(gEasyChatGroup_Move2),
     },
     {
         .wordData = {.words = gEasyChatGroup_TrendySaying},
-        .numWords = 33,
-        .numEnabledWords = 33,
+        .numWords = ARRAY_COUNT(gEasyChatGroup_TrendySaying),
+        .numEnabledWords = ARRAY_COUNT(gEasyChatGroup_TrendySaying),
     },
     {
         .wordData = {.valueList = gEasyChatGroup_Pokemon2},
-        .numWords = 251,
-        .numEnabledWords = 251,
+        .numWords = ARRAY_COUNT(gEasyChatGroup_Pokemon2),
+        .numEnabledWords = ARRAY_COUNT(gEasyChatGroup_Pokemon2),
     },
 };