Merge pull request #1344 from GriffinRichards/doc-ec

Document easy chat and mail, script.c cleanup, add/use some general constants

9 files changed, 790 insertions, 788 deletions

diff --git a/src/data/bard_music/bard_sounds.h b/src/data/bard_music/bard_sounds.h
index 1ec1f0d97..1dd5c7f56 100644
--- a/src/data/bard_music/bard_sounds.h
+++ b/src/data/bard_music/bard_sounds.h
@@ -25,28 +25,28 @@
 #include "trendysaying.h"
 
 const struct BardSound (*const gBardSoundsTable[EC_NUM_GROUPS])[6] = {
-    [EC_GROUP_POKEMON]       = NULL, // Handled by gBardSounds_Pokemon
-    [EC_GROUP_TRAINER]       = gBardSounds_Trainer,
-    [EC_GROUP_STATUS]        = gBardSounds_Status,
-    [EC_GROUP_BATTLE]        = gBardSounds_Battle,
-    [EC_GROUP_GREETINGS]     = gBardSounds_Greetings,
-    [EC_GROUP_PEOPLE]        = gBardSounds_People,
-    [EC_GROUP_VOICES]        = gBardSounds_Voices,
-    [EC_GROUP_SPEECH]        = gBardSounds_Speech,
-    [EC_GROUP_ENDINGS]       = gBardSounds_Endings,
-    [EC_GROUP_FEELINGS]      = gBardSounds_Feelings,
-    [EC_GROUP_CONDITIONS]    = gBardSounds_Conditions,
-    [EC_GROUP_ACTIONS]       = gBardSounds_Actions,
-    [EC_GROUP_LIFESTYLE]     = gBardSounds_Lifestyle,
-    [EC_GROUP_HOBBIES]       = gBardSounds_Hobbies,
-    [EC_GROUP_TIME]          = gBardSounds_Time,
-    [EC_GROUP_MISC]          = gBardSounds_Misc,
-    [EC_GROUP_ADJECTIVES]    = gBardSounds_Adjectives,
-    [EC_GROUP_EVENTS]        = gBardSounds_Events,
-    [EC_GROUP_MOVE_1]        = NULL, // Handled by gBardSounds_Moves
-    [EC_GROUP_MOVE_2]        = NULL, // Handled by gBardSounds_Moves
-    [EC_GROUP_TRENDY_SAYING] = gBardSounds_TrendySaying,
-    [EC_GROUP_POKEMON_2]     = NULL // Handled by gBardSounds_Pokemon
+    [EC_GROUP_POKEMON]          = NULL, // Handled by gBardSounds_Pokemon
+    [EC_GROUP_TRAINER]          = gBardSounds_Trainer,
+    [EC_GROUP_STATUS]           = gBardSounds_Status,
+    [EC_GROUP_BATTLE]           = gBardSounds_Battle,
+    [EC_GROUP_GREETINGS]        = gBardSounds_Greetings,
+    [EC_GROUP_PEOPLE]           = gBardSounds_People,
+    [EC_GROUP_VOICES]           = gBardSounds_Voices,
+    [EC_GROUP_SPEECH]           = gBardSounds_Speech,
+    [EC_GROUP_ENDINGS]          = gBardSounds_Endings,
+    [EC_GROUP_FEELINGS]         = gBardSounds_Feelings,
+    [EC_GROUP_CONDITIONS]       = gBardSounds_Conditions,
+    [EC_GROUP_ACTIONS]          = gBardSounds_Actions,
+    [EC_GROUP_LIFESTYLE]        = gBardSounds_Lifestyle,
+    [EC_GROUP_HOBBIES]          = gBardSounds_Hobbies,
+    [EC_GROUP_TIME]             = gBardSounds_Time,
+    [EC_GROUP_MISC]             = gBardSounds_Misc,
+    [EC_GROUP_ADJECTIVES]       = gBardSounds_Adjectives,
+    [EC_GROUP_EVENTS]           = gBardSounds_Events,
+    [EC_GROUP_MOVE_1]           = NULL, // Handled by gBardSounds_Moves
+    [EC_GROUP_MOVE_2]           = NULL, // Handled by gBardSounds_Moves
+    [EC_GROUP_TRENDY_SAYING]    = gBardSounds_TrendySaying,
+    [EC_GROUP_POKEMON_NATIONAL] = NULL // Handled by gBardSounds_Pokemon
 };
 
 #endif //GUARD_BARD_SOUNDS_TABLE_H
diff --git a/src/data/battle_frontier/apprentice.h b/src/data/battle_frontier/apprentice.h
index 349dc9619..144129743 100644
--- a/src/data/battle_frontier/apprentice.h
+++ b/src/data/battle_frontier/apprentice.h
@@ -326,7 +326,7 @@ const struct ApprenticeTrainer gApprentices[NUM_APPRENTICES] =
         .facilityClass = FACILITY_CLASS_LASS,
         .species = {SPECIES_SWALOT, SPECIES_XATU, SPECIES_ALTARIA, SPECIES_GOLDUCK, SPECIES_FLYGON, SPECIES_ALAKAZAM, SPECIES_GARDEVOIR, SPECIES_WAILORD, SPECIES_GRUMPIG, SPECIES_MIGHTYENA},
         .id = 3,
-        .speechLost = {EC_WORD_IS, EC_WORD_THIS, EC_WORD_TOO, EC_WORD_MUCH, EC_WORD_QUES, 0xFFFF},
+        .speechLost = {EC_WORD_IS, EC_WORD_THIS, EC_WORD_TOO, EC_WORD_MUCH, EC_WORD_QUES, EC_EMPTY_WORD},
     },
     {
         .name = {_("ヨウカ"), _("MACY"), _("AMELIE"), _("CLEO"), _("MARIA"), _("ELISA")},
@@ -358,7 +358,7 @@ const struct ApprenticeTrainer gApprentices[NUM_APPRENTICES] =
         .facilityClass = FACILITY_CLASS_BEAUTY,
         .species = {SPECIES_NINETALES, SPECIES_ALAKAZAM, SPECIES_SCEPTILE, SPECIES_SALAMENCE, SPECIES_GOLDUCK, SPECIES_MAWILE, SPECIES_WEEZING, SPECIES_LANTURN, SPECIES_GARDEVOIR, SPECIES_MILOTIC},
         .id = 7,
-        .speechLost = {EC_WORD_YOU_RE, EC_WORD_STRONG, EC_WORD_AREN_T, EC_WORD_YOU, EC_WORD_QUES, 0xFFFF},
+        .speechLost = {EC_WORD_YOU_RE, EC_WORD_STRONG, EC_WORD_AREN_T, EC_WORD_YOU, EC_WORD_QUES, EC_EMPTY_WORD},
     },
     {
         .name = {_("スミレ"), _("ANNIE"), _("ANNIE"), _("IMELDA"), _("INES"), _("ROSA")},
@@ -374,7 +374,7 @@ const struct ApprenticeTrainer gApprentices[NUM_APPRENTICES] =
         .facilityClass = FACILITY_CLASS_HIKER,
         .species = {SPECIES_SKARMORY, SPECIES_GOLEM, SPECIES_BLAZIKEN, SPECIES_CAMERUPT, SPECIES_DONPHAN, SPECIES_MUK, SPECIES_SALAMENCE, SPECIES_TROPIUS, SPECIES_SOLROCK, SPECIES_RHYDON},
         .id = 9,
-        .speechLost = {EC_WORD_WE, EC_WORD_WERE, EC_WORD_JUST, EC_WORD_SHREDDED, EC_WORD_ELLIPSIS, 0xFFFF},
+        .speechLost = {EC_WORD_WE, EC_WORD_WERE, EC_WORD_JUST, EC_WORD_SHREDDED, EC_WORD_ELLIPSIS, EC_EMPTY_WORD},
     },
     {
         .name = {_("トウゾウ"), _("DALLAS"), _("BRUNO"), _("LEARCO"), _("ANSGAR"), _("MANOLO")},
@@ -382,7 +382,7 @@ const struct ApprenticeTrainer gApprentices[NUM_APPRENTICES] =
         .facilityClass = FACILITY_CLASS_FISHERMAN,
         .species = {SPECIES_SEAKING, SPECIES_STARMIE, SPECIES_GOLDUCK, SPECIES_TENTACRUEL, SPECIES_OCTILLERY, SPECIES_GOREBYSS, SPECIES_GLALIE, SPECIES_WAILORD, SPECIES_SHARPEDO, SPECIES_KINGDRA},
         .id = 10,
-        .speechLost = {EC_WORD_YOUR, EC_WORD_WIN, EC_WORD_ANGERS, EC_WORD_ME, EC_WORD_EXCL, 0xFFFF},
+        .speechLost = {EC_WORD_YOUR, EC_WORD_WIN, EC_WORD_ANGERS, EC_WORD_ME, EC_WORD_EXCL, EC_EMPTY_WORD},
     },
     {
         .name = {_("セイヤ"), _("FRANK"), _("FRANK"), _("OLINDO"), _("FRANK"), _("MAURO")},
diff --git a/src/data/battle_frontier/battle_frontier_trainers.h b/src/data/battle_frontier/battle_frontier_trainers.h
index bbd88d76f..1cae890c2 100644
--- a/src/data/battle_frontier/battle_frontier_trainers.h
+++ b/src/data/battle_frontier/battle_frontier_trainers.h
@@ -4,15 +4,15 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
         .facilityClass = FACILITY_CLASS_YOUNGSTER,
         .trainerName = _("BRADY"),
         .speechBefore = {EC_WORD_I_AM, EC_WORD_NEVER, EC_WORD_GOING, EC_WORD_TO, EC_WORD_LOSE, EC_WORD_EXCL},
-        .speechWin = {EC_WORD_I_AM, EC_WORD_STRONG, EC_WORD_AREN_T, EC_WORD_I, EC_WORD_QUES, 0xFFFF},
-        .speechLose = {EC_WORD_WHAT, EC_WORD_QUES, 0xFFFF, EC_WORD_BUT, EC_WORD_HOW, EC_WORD_QUES},
+        .speechWin = {EC_WORD_I_AM, EC_WORD_STRONG, EC_WORD_AREN_T, EC_WORD_I, EC_WORD_QUES, EC_EMPTY_WORD},
+        .speechLose = {EC_WORD_WHAT, EC_WORD_QUES, EC_EMPTY_WORD, EC_WORD_BUT, EC_WORD_HOW, EC_WORD_QUES},
         .monSet = gBattleFrontierTrainerMons_Brady
     },
     [FRONTIER_TRAINER_CONNER] = {
         .facilityClass = FACILITY_CLASS_YOUNGSTER,
         .trainerName = _("CONNER"),
-        .speechBefore = {EC_WORD_LOSING, EC_WORD_DOESN_T, EC_WORD_BUG, EC_WORD_ME, 0xFFFF, 0xFFFF},
-        .speechWin = {EC_WORD_A, EC_WORD_WIN, EC_WORD_IS, EC_WORD_JUST, EC_WORD_AWESOME, 0xFFFF},
+        .speechBefore = {EC_WORD_LOSING, EC_WORD_DOESN_T, EC_WORD_BUG, EC_WORD_ME, EC_EMPTY_WORD, EC_EMPTY_WORD},
+        .speechWin = {EC_WORD_A, EC_WORD_WIN, EC_WORD_IS, EC_WORD_JUST, EC_WORD_AWESOME, EC_EMPTY_WORD},
         .speechLose = {EC_WORD_DARN, EC_WORD_ELLIPSIS, EC_WORD_LOSING, EC_WORD_DOES, EC_WORD_BUG, EC_WORD_ME},
         .monSet = gBattleFrontierTrainerMons_Conner
     },
@@ -20,7 +20,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
         .facilityClass = FACILITY_CLASS_YOUNGSTER,
         .trainerName = _("BRADLEY"),
         .speechBefore = {EC_WORD_HEY_THERE, EC_WORD_EXCL, EC_WORD_YOU_RE, EC_WORD_MY, EC_WORD_OPPONENT, EC_WORD_TODAY},
-        .speechWin = {EC_WORD_HAHAHA, EC_WORD_EXCL, 0xFFFF, EC_WORD_SEE_YA, EC_WORD_LATER, EC_WORD_EXCL},
+        .speechWin = {EC_WORD_HAHAHA, EC_WORD_EXCL, EC_EMPTY_WORD, EC_WORD_SEE_YA, EC_WORD_LATER, EC_WORD_EXCL},
         .speechLose = {EC_WORD_TOMORROW, EC_WORD_IS, EC_WORD_WHEN, EC_WORD_WE, EC_WORD_REALLY, EC_WORD_BATTLE},
         .monSet = gBattleFrontierTrainerMons_Bradley
     },
@@ -44,7 +44,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
         .facilityClass = FACILITY_CLASS_LASS,
         .trainerName = _("PEGGY"),
         .speechBefore = {EC_WORD_GET, EC_WORD_READY, EC_WORD_TO, EC_WORD_BE, EC_WORD_DESTROYED, EC_WORD_EXCL},
-        .speechWin = {EC_WORD_HAHAHA, EC_WORD_EXCL_EXCL, 0xFFFF, EC_WORD_I_AM, EC_WORD_LOLLING, EC_WORD_EXCL},
+        .speechWin = {EC_WORD_HAHAHA, EC_WORD_EXCL_EXCL, EC_EMPTY_WORD, EC_WORD_I_AM, EC_WORD_LOLLING, EC_WORD_EXCL},
         .speechLose = {EC_WORD_I_AM, EC_WORD_FEELING, EC_WORD_SAD, EC_WORD_THANKS, EC_WORD_TO, EC_WORD_YOU},
         .monSet = gBattleFrontierTrainerMons_Peggy
     },
@@ -52,7 +52,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
         .facilityClass = FACILITY_CLASS_SCHOOL_KID_M,
         .trainerName = _("KEITH"),
         .speechBefore = {EC_WORD_I, EC_WORD_DON_T, EC_WORD_JUST, EC_WORD_STUDY, EC_WORD_YOU, EC_WORD_KNOW},
-        .speechWin = {EC_WORD_YOU, EC_WORD_DON_T, EC_WORD_STUDY, EC_WORD_ENOUGH, EC_WORD_ELLIPSIS, 0xFFFF},
+        .speechWin = {EC_WORD_YOU, EC_WORD_DON_T, EC_WORD_STUDY, EC_WORD_ENOUGH, EC_WORD_ELLIPSIS, EC_EMPTY_WORD},
         .speechLose = {EC_WORD_I, EC_WORD_NEED, EC_WORD_TO, EC_WORD_STUDY, EC_WORD_MORE, EC_WORD_ELLIPSIS},
         .monSet = gBattleFrontierTrainerMons_Keith
     },
@@ -60,15 +60,15 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
         .facilityClass = FACILITY_CLASS_SCHOOL_KID_M,
         .trainerName = _("GRAYSON"),
         .speechBefore = {EC_WORD_A, EC_WORD_POKEMON, EC_WORD_BATTLE, EC_WORD_ISN_T, EC_WORD_CHILD_S_PLAY, EC_WORD_EXCL},
-        .speechWin = {EC_WORD_YOU_RE, EC_WORD_DONE, EC_WORD_AREN_T, EC_WORD_YOU, EC_WORD_QUES, 0xFFFF},
+        .speechWin = {EC_WORD_YOU_RE, EC_WORD_DONE, EC_WORD_AREN_T, EC_WORD_YOU, EC_WORD_QUES, EC_EMPTY_WORD},
         .speechLose = {EC_WORD_WE, EC_WORD_WERE, EC_WORD_LIKE, EC_WORD_TOYS, EC_WORD_TO, EC_WORD_YOU},
         .monSet = gBattleFrontierTrainerMons_Grayson
     },
     [FRONTIER_TRAINER_GLENN] = {
         .facilityClass = FACILITY_CLASS_SCHOOL_KID_M,
         .trainerName = _("GLENN"),
-        .speechBefore = {EC_WORD_I, EC_WORD_WOULD, EC_WORD_BE, EC_WORD_COOL, EC_WORD_IF_I_WIN, 0xFFFF},
-        .speechWin = {EC_WORD_COOL, EC_WORD_EXCL, 0xFFFF, EC_WORD_THAT_S, EC_WORD_WHAT, EC_WORD_I_AM},
+        .speechBefore = {EC_WORD_I, EC_WORD_WOULD, EC_WORD_BE, EC_WORD_COOL, EC_WORD_IF_I_WIN, EC_EMPTY_WORD},
+        .speechWin = {EC_WORD_COOL, EC_WORD_EXCL, EC_EMPTY_WORD, EC_WORD_THAT_S, EC_WORD_WHAT, EC_WORD_I_AM},
         .speechLose = {EC_WORD_I_AM, EC_WORD_NOT, EC_WORD_GOING, EC_WORD_TO, EC_WORD_BE, EC_WORD_COOL},
         .monSet = gBattleFrontierTrainerMons_Glenn
     },
@@ -92,7 +92,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
         .facilityClass = FACILITY_CLASS_SCHOOL_KID_F,
         .trainerName = _("ZOEY"),
         .speechBefore = {EC_WORD_PLEASE, EC_WORD_BATTLE, EC_WORD_LIKE, EC_WORD_YOU, EC_WORD_MEAN, EC_WORD_IT},
-        .speechWin = {EC_WORD_THANK_YOU, EC_WORD_EXCL_EXCL, 0xFFFF, EC_WORD_THANK_YOU, EC_WORD_SO, EC_WORD_MUCH},
+        .speechWin = {EC_WORD_THANK_YOU, EC_WORD_EXCL_EXCL, EC_EMPTY_WORD, EC_WORD_THANK_YOU, EC_WORD_SO, EC_WORD_MUCH},
         .speechLose = {EC_WORD_WERE, EC_WORD_YOU, EC_WORD_REALLY, EC_WORD_BEING, EC_WORD_SERIOUS, EC_WORD_QUES},
         .monSet = gBattleFrontierTrainerMons_Zoey
     },
@@ -100,8 +100,8 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
         .facilityClass = FACILITY_CLASS_RICH_BOY,
         .trainerName = _("MANUEL"),
         .speechBefore = {EC_WORD_ME, EC_WORD_LOSE, EC_WORD_QUES, EC_WORD_THAT_S, EC_WORD_PREPOSTEROUS, EC_WORD_EXCL},
-        .speechWin = {EC_WORD_NATURALLY, EC_WORD_I, EC_WORD_WIN, 0xFFFF, 0xFFFF, 0xFFFF},
-        .speechLose = {EC_WORD_WAAAH, EC_WORD_EXCL, 0xFFFF, EC_WORD_I, EC_WORD_LOST, EC_WORD_MOTHER},
+        .speechWin = {EC_WORD_NATURALLY, EC_WORD_I, EC_WORD_WIN, EC_EMPTY_WORD, EC_EMPTY_WORD, EC_EMPTY_WORD},
+        .speechLose = {EC_WORD_WAAAH, EC_WORD_EXCL, EC_EMPTY_WORD, EC_WORD_I, EC_WORD_LOST, EC_WORD_MOTHER},
         .monSet = gBattleFrontierTrainerMons_Manuel
     },
     [FRONTIER_TRAINER_RUSS] = {
@@ -115,16 +115,16 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
     [FRONTIER_TRAINER_DUSTIN] = {
         .facilityClass = FACILITY_CLASS_RICH_BOY,
         .trainerName = _("DUSTIN"),
-        .speechBefore = {EC_WORD_I, EC_WORD_REALLY, EC_WORD_LIKE, EC_WORD_COOL, EC_WORD_POKEMON, 0xFFFF},
-        .speechWin = {EC_WORD_I, EC_WORD_LIKE, EC_WORD_MYSELF, EC_WORD_WHEN_I_WIN, EC_WORD_EXCL, 0xFFFF},
-        .speechLose = {EC_WORD_I, EC_WORD_LIKE, EC_WORD_MYSELF, EC_WORD_IF_I_LOSE, EC_WORD_TOO, 0xFFFF},
+        .speechBefore = {EC_WORD_I, EC_WORD_REALLY, EC_WORD_LIKE, EC_WORD_COOL, EC_WORD_POKEMON, EC_EMPTY_WORD},
+        .speechWin = {EC_WORD_I, EC_WORD_LIKE, EC_WORD_MYSELF, EC_WORD_WHEN_I_WIN, EC_WORD_EXCL, EC_EMPTY_WORD},
+        .speechLose = {EC_WORD_I, EC_WORD_LIKE, EC_WORD_MYSELF, EC_WORD_IF_I_LOSE, EC_WORD_TOO, EC_EMPTY_WORD},
         .monSet = gBattleFrontierTrainerMons_Dustin
     },
     [FRONTIER_TRAINER_TINA] = {
         .facilityClass = FACILITY_CLASS_LADY,
         .trainerName = _("TINA"),
         .speechBefore = {EC_WORD_IF_I_WIN, EC_WORD_YOU, EC_WORD_CAN, EC_WORD_HAVE, EC_WORD_A, EC_MOVE2(SWEET_KISS)},
-        .speechWin = {EC_WORD_HERE_IT_IS, EC_WORD_YOUR, EC_MOVE2(SWEET_KISS), EC_WORD_FROM, EC_WORD_MY, EC_POKEMON2(JYNX)},
+        .speechWin = {EC_WORD_HERE_IT_IS, EC_WORD_YOUR, EC_MOVE2(SWEET_KISS), EC_WORD_FROM, EC_WORD_MY, EC_POKEMON_NATIONAL(JYNX)},
         .speechLose = {EC_WORD_YOU, EC_WORD_WANT, EC_WORD_A, EC_MOVE(SWIFT), EC_MOVE2(MEGA_KICK), EC_WORD_INSTEAD},
         .monSet = gBattleFrontierTrainerMons_Tina
     },
@@ -133,14 +133,14 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
         .trainerName = _("GILLIAN"),
         .speechBefore = {EC_WORD_THE, EC_WORD_GOURMET, EC_WORD_THING, EC_WORD_IS, EC_WORD_SO, EC_WORD_YESTERDAY},
         .speechWin = {EC_WORD_POKEMON, EC_WORD_NEVER, EC_WORD_GO, EC_WORD_OUT, EC_WORD_OF, EC_WORD_FASHION},
-        .speechLose = {EC_WORD_LOSING, EC_WORD_DOESN_T, EC_WORD_DISAPPOINT, EC_WORD_ME, 0xFFFF, 0xFFFF},
+        .speechLose = {EC_WORD_LOSING, EC_WORD_DOESN_T, EC_WORD_DISAPPOINT, EC_WORD_ME, EC_EMPTY_WORD, EC_EMPTY_WORD},
         .monSet = gBattleFrontierTrainerMons_Gillian
     },
     [FRONTIER_TRAINER_ZOE] = {
         .facilityClass = FACILITY_CLASS_LADY,
         .trainerName = _("ZOE"),
         .speechBefore = {EC_WORD_I, EC_WORD_HAVEN_T, EC_WORD_A, EC_WORD_WORRY, EC_WORD_AT, EC_WORD_ALL},
-        .speechWin = {EC_WORD_LIFE, EC_WORD_IS, EC_WORD_ALWAYS, EC_WORD_GOOD, EC_WORD_TO_ME, 0xFFFF},
+        .speechWin = {EC_WORD_LIFE, EC_WORD_IS, EC_WORD_ALWAYS, EC_WORD_GOOD, EC_WORD_TO_ME, EC_EMPTY_WORD},
         .speechLose = {EC_WORD_I, EC_WORD_WORRY, EC_WORD_ABOUT, EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_SKILL},
         .monSet = gBattleFrontierTrainerMons_Zoe
     },
@@ -156,7 +156,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
         .facilityClass = FACILITY_CLASS_CAMPER,
         .trainerName = _("AL"),
         .speechBefore = {EC_WORD_YOUR, EC_WORD_LOOK, EC_WORD_SAYS, EC_WORD_YOU_RE, EC_WORD_REALLY, EC_WORD_TOUGH},
-        .speechWin = {EC_WORD_IT_S, EC_WORD_ME, EC_WORD_WHO_IS, EC_WORD_REALLY, EC_WORD_TOUGH, 0xFFFF},
+        .speechWin = {EC_WORD_IT_S, EC_WORD_ME, EC_WORD_WHO_IS, EC_WORD_REALLY, EC_WORD_TOUGH, EC_EMPTY_WORD},
         .speechLose = {EC_WORD_I_AM, EC_WORD_RIGHT, EC_WORD_EXCL, EC_WORD_YOU_RE, EC_WORD_REALLY, EC_WORD_TOUGH},
         .monSet = gBattleFrontierTrainerMons_Al
     },
@@ -165,15 +165,15 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
         .trainerName = _("MITCH"),
         .speechBefore = {EC_WORD_MOTHER, EC_WORD_NATURE, EC_WORD_IS, EC_WORD_MY, EC_WORD_ALLY, EC_WORD_EXCL},
         .speechWin = {EC_WORD_WAS, EC_WORD_THAT, EC_WORD_ENOUGH, EC_WORD_FOR, EC_WORD_YOU, EC_WORD_QUES},
-        .speechLose = {EC_WORD_MOTHER, EC_WORD_NATURE, EC_WORD_DIDN_T, EC_WORD_LET_ME_WIN, EC_WORD_QUES, 0xFFFF},
+        .speechLose = {EC_WORD_MOTHER, EC_WORD_NATURE, EC_WORD_DIDN_T, EC_WORD_LET_ME_WIN, EC_WORD_QUES, EC_EMPTY_WORD},
         .monSet = gBattleFrontierTrainerMons_Mitch
     },
     [FRONTIER_TRAINER_ANNE] = {
         .facilityClass = FACILITY_CLASS_PICNICKER,
         .trainerName = _("ANNE"),
         .speechBefore = {EC_WORD_I, EC_WORD_CAN_T, EC_WORD_WAIT, EC_WORD_LET_S, EC_WORD_BATTLE, EC_WORD_NOW},
-        .speechWin = {EC_WORD_MY, EC_WORD_HAPPINESS, EC_WORD_IS, EC_WORD_OVERWHELMING, EC_WORD_EXCL, 0xFFFF},
-        .speechLose = {EC_WORD_YOU_VE, EC_WORD_DESTROYED, EC_WORD_MY, EC_WORD_HAPPINESS, EC_WORD_ELLIPSIS, 0xFFFF},
+        .speechWin = {EC_WORD_MY, EC_WORD_HAPPINESS, EC_WORD_IS, EC_WORD_OVERWHELMING, EC_WORD_EXCL, EC_EMPTY_WORD},
+        .speechLose = {EC_WORD_YOU_VE, EC_WORD_DESTROYED, EC_WORD_MY, EC_WORD_HAPPINESS, EC_WORD_ELLIPSIS, EC_EMPTY_WORD},
         .monSet = gBattleFrontierTrainerMons_Anne
     },
     [FRONTIER_TRAINER_ALIZE] = {
@@ -203,15 +203,15 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
     [FRONTIER_TRAINER_JASON] = {
         .facilityClass = FACILITY_CLASS_TUBER_M,
         .trainerName = _("JASON"),
-        .speechBefore = {EC_WORD_TEACH, EC_WORD_ME, EC_WORD_A, EC_WORD_GOOD, EC_WORD_STRATEGY, 0xFFFF},
-        .speechWin = {EC_WORD_THAT_WAS, EC_WORD_YOUR, EC_WORD_GOOD, EC_WORD_STRATEGY, EC_WORD_QUES_EXCL, 0xFFFF},
+        .speechBefore = {EC_WORD_TEACH, EC_WORD_ME, EC_WORD_A, EC_WORD_GOOD, EC_WORD_STRATEGY, EC_EMPTY_WORD},
+        .speechWin = {EC_WORD_THAT_WAS, EC_WORD_YOUR, EC_WORD_GOOD, EC_WORD_STRATEGY, EC_WORD_QUES_EXCL, EC_EMPTY_WORD},
         .speechLose = {EC_WORD_WOW, EC_WORD_THAT, EC_WORD_IS, EC_WORD_AN, EC_WORD_AWESOME, EC_WORD_STRATEGY},
         .monSet = gBattleFrontierTrainerMons_Jason
     },
     [FRONTIER_TRAINER_JOHN] = {
         .facilityClass = FACILITY_CLASS_TUBER_M,
         .trainerName = _("JOHN"),
-        .speechBefore = {EC_WORD_I_AM, EC_WORD_A, EC_WORD_PRETTY, EC_WORD_NEW, EC_WORD_TRAINER, 0xFFFF},
+        .speechBefore = {EC_WORD_I_AM, EC_WORD_A, EC_WORD_PRETTY, EC_WORD_NEW, EC_WORD_TRAINER, EC_EMPTY_WORD},
         .speechWin = {EC_WORD_I_AM, EC_WORD_NEW, EC_WORD_BUT, EC_WORD_I, EC_WORD_WON, EC_WORD_EXCL},
         .speechLose = {EC_WORD_I_AM, EC_WORD_NEW, EC_WORD_SO, EC_WORD_WHAT, EC_WORD_IF_I_LOSE, EC_WORD_QUES},
         .monSet = gBattleFrontierTrainerMons_John
@@ -237,14 +237,14 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
         .trainerName = _("CARLIE"),
         .speechBefore = {EC_WORD_MY, EC_WORD_SUMMER, EC_WORD_VACATION, EC_WORD_IS, EC_WORD_FOR, EC_WORD_POKEMON},
         .speechWin = {EC_WORD_MY, EC_WORD_SUMMER, EC_WORD_VACATION, EC_WORD_WILL, EC_WORD_BE, EC_WORD_AWESOME},
-        .speechLose = {EC_WORD_I, EC_WORD_CAN_T_WIN, EC_WORD_LIKE, EC_WORD_THIS, EC_WORD_ELLIPSIS, 0xFFFF},
+        .speechLose = {EC_WORD_I, EC_WORD_CAN_T_WIN, EC_WORD_LIKE, EC_WORD_THIS, EC_WORD_ELLIPSIS, EC_EMPTY_WORD},
         .monSet = gBattleFrontierTrainerMons_Carlie
     },
     [FRONTIER_TRAINER_GORDON] = {
         .facilityClass = FACILITY_CLASS_SWIMMER_M,
         .trainerName = _("GORDON"),
-        .speechBefore = {EC_WORD_VICTORY, EC_WORD_WILL, EC_WORD_COME, EC_WORD_TO_ME, EC_WORD_EXCL, 0xFFFF},
-        .speechWin = {EC_WORD_OH_YEAH, EC_WORD_EXCL, 0xFFFF, EC_WORD_I, EC_WORD_REALLY, EC_WORD_WON},
+        .speechBefore = {EC_WORD_VICTORY, EC_WORD_WILL, EC_WORD_COME, EC_WORD_TO_ME, EC_WORD_EXCL, EC_EMPTY_WORD},
+        .speechWin = {EC_WORD_OH_YEAH, EC_WORD_EXCL, EC_EMPTY_WORD, EC_WORD_I, EC_WORD_REALLY, EC_WORD_WON},
         .speechLose = {EC_WORD_NOTHING, EC_WORD_IS, EC_WORD_WORKING, EC_WORD_OUT, EC_WORD_FOR, EC_WORD_ME},
         .monSet = gBattleFrontierTrainerMons_Gordon
     },
@@ -268,7 +268,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
         .facilityClass = FACILITY_CLASS_SWIMMER_F,
         .trainerName = _("CIERRA"),
         .speechBefore = {EC_WORD_I, EC_WORD_LIKE, EC_WORD_TO, EC_WORD_SYNCHRONIZE, EC_WORD_MY, EC_WORD_SWIFT_SWIM},
-        .speechWin = {EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_SYNCHRONIZE, EC_WORD_WITH, EC_WORD_ME, 0xFFFF},
+        .speechWin = {EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_SYNCHRONIZE, EC_WORD_WITH, EC_WORD_ME, EC_EMPTY_WORD},
         .speechLose = {EC_WORD_I, EC_WORD_NEED, EC_WORD_TO, EC_WORD_SYNCHRONIZE, EC_WORD_BETTER, EC_WORD_ELLIPSIS},
         .monSet = gBattleFrontierTrainerMons_Cierra
     },
@@ -324,7 +324,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
         .facilityClass = FACILITY_CLASS_POKEFAN_F,
         .trainerName = _("AMANDA"),
         .speechBefore = {EC_WORD_I, EC_WORD_COME, EC_WORD_FROM, EC_WORD_A, EC_WORD_TRAINER, EC_WORD_FAMILY},
-        .speechWin = {EC_WORD_I, EC_WORD_WILL, EC_WORD_TREASURE, EC_WORD_THIS, EC_WORD_WIN, 0xFFFF},
+        .speechWin = {EC_WORD_I, EC_WORD_WILL, EC_WORD_TREASURE, EC_WORD_THIS, EC_WORD_WIN, EC_EMPTY_WORD},
         .speechLose = {EC_WORD_I, EC_WORD_WANT, EC_WORD_TO, EC_WORD_GO_HOME, EC_WORD_RIGHT, EC_WORD_NOW},
         .monSet = gBattleFrontierTrainerMons_Amanda
     },
@@ -340,7 +340,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
         .facilityClass = FACILITY_CLASS_PKMN_BREEDER_M,
         .trainerName = _("RAFAEL"),
         .speechBefore = {EC_WORD_COME_ON, EC_WORD_EXCL, EC_WORD_LET_S, EC_WORD_SEE, EC_WORD_SOME, EC_WORD_SPIRIT},
-        .speechWin = {EC_WORD_THAT_S_IT_EXCL, EC_WORD_THAT_S, EC_WORD_THE, EC_WORD_SPIRIT, EC_WORD_EXCL, 0xFFFF},
+        .speechWin = {EC_WORD_THAT_S_IT_EXCL, EC_WORD_THAT_S, EC_WORD_THE, EC_WORD_SPIRIT, EC_WORD_EXCL, EC_EMPTY_WORD},
         .speechLose = {EC_WORD_WELL, EC_WORD_SO, EC_WORD_MUCH, EC_WORD_FOR, EC_WORD_OUR, EC_WORD_SPIRIT},
         .monSet = gBattleFrontierTrainerMons_Rafael
     },
@@ -356,15 +356,15 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
         .facilityClass = FACILITY_CLASS_PKMN_BREEDER_M,
         .trainerName = _("PAYTON"),
         .speechBefore = {EC_WORD_I, EC_WORD_TRAIN, EC_WORD_FROM, EC_WORD_THE, EC_WORD_EGG, EC_WORD_UP},
-        .speechWin = {EC_WORD_WELL, EC_WORD_DONE, EC_WORD_EXCL, 0xFFFF, 0xFFFF, 0xFFFF},
-        .speechLose = {EC_WORD_THAT_WAS, EC_WORD_A, EC_MOVE2(SOFT_BOILED), EC_WORD_LOSS, EC_WORD_ELLIPSIS, 0xFFFF},
+        .speechWin = {EC_WORD_WELL, EC_WORD_DONE, EC_WORD_EXCL, EC_EMPTY_WORD, EC_EMPTY_WORD, EC_EMPTY_WORD},
+        .speechLose = {EC_WORD_THAT_WAS, EC_WORD_A, EC_MOVE2(SOFT_BOILED), EC_WORD_LOSS, EC_WORD_ELLIPSIS, EC_EMPTY_WORD},
         .monSet = gBattleFrontierTrainerMons_Payton
     },
     [FRONTIER_TRAINER_PAMELA] = {
         .facilityClass = FACILITY_CLASS_PKMN_BREEDER_F,
         .trainerName = _("PAMELA"),
         .speechBefore = {EC_WORD_ALL, EC_WORD_POKEMON, EC_WORD_ADORE, EC_WORD_A, EC_WORD_KIND, EC_WORD_TRAINER},
-        .speechWin = {EC_WORD_IT_S, EC_WORD_TOO, EC_WORD_BAD, EC_WORD_YOU, EC_WORD_LOST, 0xFFFF},
+        .speechWin = {EC_WORD_IT_S, EC_WORD_TOO, EC_WORD_BAD, EC_WORD_YOU, EC_WORD_LOST, EC_EMPTY_WORD},
         .speechLose = {EC_WORD_YOU_RE, EC_WORD_KIND, EC_WORD_AND, EC_WORD_YOU_RE, EC_WORD_ALSO, EC_WORD_STRONG},
         .monSet = gBattleFrontierTrainerMons_Pamela
     },
@@ -379,7 +379,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
     [FRONTIER_TRAINER_MARISA] = {
         .facilityClass = FACILITY_CLASS_PKMN_BREEDER_F,
         .trainerName = _("MARISA"),
-        .speechBefore = {EC_WORD_I, EC_WORD_PROMISE, EC_WORD_TO, EC_WORD_BATTLE, EC_WORD_SERIOUSLY, 0xFFFF},
+        .speechBefore = {EC_WORD_I, EC_WORD_PROMISE, EC_WORD_TO, EC_WORD_BATTLE, EC_WORD_SERIOUSLY, EC_EMPTY_WORD},
         .speechWin = {EC_WORD_PROMISE, EC_WORD_ME, EC_WORD_YOU, EC_WORD_WILL, EC_WORD_DO, EC_WORD_BETTER},
         .speechLose = {EC_WORD_PROMISE, EC_WORD_ME, EC_WORD_ANOTHER, EC_WORD_BATTLE, EC_WORD_PLEASE, EC_WORD_EXCL},
         .monSet = gBattleFrontierTrainerMons_Marisa
@@ -397,23 +397,23 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
         .trainerName = _("YOSHI"),
         .speechBefore = {EC_WORD_BUG, EC_WORD_POKEMON, EC_WORD_MAKE, EC_WORD_ME, EC_WORD_FEELING, EC_WORD_LOVEY_DOVEY},
         .speechWin = {EC_WORD_BUG, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_THE, EC_WORD_BEST, EC_WORD_EXCL},
-        .speechLose = {EC_WORD_YOU_RE, EC_WORD_IGNORANT, EC_WORD_ABOUT, EC_WORD_BUG, EC_WORD_POKEMON, 0xFFFF},
+        .speechLose = {EC_WORD_YOU_RE, EC_WORD_IGNORANT, EC_WORD_ABOUT, EC_WORD_BUG, EC_WORD_POKEMON, EC_EMPTY_WORD},
         .monSet = gBattleFrontierTrainerMons_Yoshi
     },
     [FRONTIER_TRAINER_DESTIN] = {
         .facilityClass = FACILITY_CLASS_BUG_CATCHER,
         .trainerName = _("DESTIN"),
-        .speechBefore = {EC_WORD_IT_S, EC_WORD_WAY, EC_WORD_TOO, EC_WORD_HOT, EC_WORD_HERE, 0xFFFF},
-        .speechWin = {EC_WORD_I_AM, EC_WORD_ABOUT, EC_WORD_TO, EC_MOVE(OVERHEAT), 0xFFFF, 0xFFFF},
-        .speechLose = {EC_WORD_PLEASE, EC_WORD_I, EC_WORD_NEED, EC_WORD_SOME, EC_WORD_WATER, 0xFFFF},
+        .speechBefore = {EC_WORD_IT_S, EC_WORD_WAY, EC_WORD_TOO, EC_WORD_HOT, EC_WORD_HERE, EC_EMPTY_WORD},
+        .speechWin = {EC_WORD_I_AM, EC_WORD_ABOUT, EC_WORD_TO, EC_MOVE(OVERHEAT), EC_EMPTY_WORD, EC_EMPTY_WORD},
+        .speechLose = {EC_WORD_PLEASE, EC_WORD_I, EC_WORD_NEED, EC_WORD_SOME, EC_WORD_WATER, EC_EMPTY_WORD},
         .monSet = gBattleFrontierTrainerMons_Destin
     },
     [FRONTIER_TRAINER_KEON] = {
         .facilityClass = FACILITY_CLASS_NINJA_BOY,
         .trainerName = _("KEON"),
-        .speechBefore = {EC_WORD_FORGIVE, EC_WORD_ME, EC_WORD_BUT, EC_WORD_HERE_I_COME, EC_WORD_EXCL, 0xFFFF},
+        .speechBefore = {EC_WORD_FORGIVE, EC_WORD_ME, EC_WORD_BUT, EC_WORD_HERE_I_COME, EC_WORD_EXCL, EC_EMPTY_WORD},
         .speechWin = {EC_WORD_FORGIVE, EC_WORD_ME, EC_WORD_FOR, EC_WORD_MY, EC_WORD_OVERWHELMING, EC_WORD_POWER},
-        .speechLose = {EC_WORD_I_AM, EC_WORD_SORRY, EC_WORD_ELLIPSIS, 0xFFFF, 0xFFFF, 0xFFFF},
+        .speechLose = {EC_WORD_I_AM, EC_WORD_SORRY, EC_WORD_ELLIPSIS, EC_EMPTY_WORD, EC_EMPTY_WORD, EC_EMPTY_WORD},
         .monSet = gBattleFrontierTrainerMons_Keon
     },
     [FRONTIER_TRAINER_STUART] = {
@@ -429,7 +429,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
         .trainerName = _("NESTOR"),
         .speechBefore = {EC_WORD_SHOW, EC_WORD_ME, EC_WORD_A, EC_WORD_REALLY, EC_WORD_SMOOTH, EC_WORD_MOVE},
         .speechWin = {EC_WORD_THERE, EC_WORD_WAS, EC_WORD_NOTHING, EC_WORD_SMOOTH, EC_WORD_ABOUT, EC_WORD_THAT},
-        .speechLose = {EC_WORD_YOU, EC_WORD_REALLY, EC_WORD_ARE, EC_WORD_SMOOTH, EC_WORD_EXCL, 0xFFFF},
+        .speechLose = {EC_WORD_YOU, EC_WORD_REALLY, EC_WORD_ARE, EC_WORD_SMOOTH, EC_WORD_EXCL, EC_EMPTY_WORD},
         .monSet = gBattleFrontierTrainerMons_Nestor
     },
     [FRONTIER_TRAINER_DERRICK] = {
@@ -445,13 +445,13 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
         .trainerName = _("BRYSON"),
         .speechBefore = {EC_MOVE2(POISON_POWDER), EC_WORD_IS, EC_WORD_IN, EC_WORD_OUR, EC_MOVE2(COTTON_SPORE), EC_WORD_MOVE},
         .speechWin = {EC_WORD_HOW_DO, EC_WORD_YOU, EC_WORD_LIKE, EC_WORD_OUR, EC_MOVE2(POISON_POWDER), EC_WORD_QUES},
-        .speechLose = {EC_WORD_MY, EC_MOVE2(COTTON_SPORE), EC_WORD_WAS, EC_WORD_USELESS, 0xFFFF, 0xFFFF},
+        .speechLose = {EC_WORD_MY, EC_MOVE2(COTTON_SPORE), EC_WORD_WAS, EC_WORD_USELESS, EC_EMPTY_WORD, EC_EMPTY_WORD},
         .monSet = gBattleFrontierTrainerMons_Bryson
     },
     [FRONTIER_TRAINER_CLAYTON] = {
         .facilityClass = FACILITY_CLASS_BUG_MANIAC,
         .trainerName = _("CLAYTON"),
-        .speechBefore = {EC_WORD_HUH_QUES, 0xFFFF, 0xFFFF, EC_WORD_WHERE, EC_WORD_IS_IT_QUES, 0xFFFF},
+        .speechBefore = {EC_WORD_HUH_QUES, EC_EMPTY_WORD, EC_EMPTY_WORD, EC_WORD_WHERE, EC_WORD_IS_IT_QUES, EC_EMPTY_WORD},
         .speechWin = {EC_WORD_WHERE, EC_WORD_IS_IT_QUES, EC_WORD_I_VE, EC_WORD_LOST, EC_WORD_MY, EC_WORD_POKENAV},
         .speechLose = {EC_WORD_WHERE, EC_WORD_IS_IT_QUES, EC_WORD_I_VE, EC_WORD_LOST, EC_WORD_MY, EC_WORD_SENSE},
         .monSet = gBattleFrontierTrainerMons_Clayton
@@ -459,7 +459,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
     [FRONTIER_TRAINER_TRENTON] = {
         .facilityClass = FACILITY_CLASS_FISHERMAN,
         .trainerName = _("TRENTON"),
-        .speechBefore = {EC_WORD_COME_OVER, EC_WORD_FOR, EC_WORD_SOME, EC_WORD_TASTY, EC_WORD_WATER, 0xFFFF},
+        .speechBefore = {EC_WORD_COME_OVER, EC_WORD_FOR, EC_WORD_SOME, EC_WORD_TASTY, EC_WORD_WATER, EC_EMPTY_WORD},
         .speechWin = {EC_WORD_MMM, EC_WORD_DO, EC_WORD_YOU, EC_WORD_WANT, EC_WORD_SOME, EC_WORD_QUES},
         .speechLose = {EC_WORD_I, EC_WORD_GOT, EC_WORD_THIS, EC_WORD_TASTY, EC_WORD_WATER, EC_WORD_SHOPPING},
         .monSet = gBattleFrontierTrainerMons_Trenton
@@ -475,9 +475,9 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
     [FRONTIER_TRAINER_WESLEY] = {
         .facilityClass = FACILITY_CLASS_FISHERMAN,
         .trainerName = _("WESLEY"),
-        .speechBefore = {EC_POKEMON2(MEW), EC_POKEMON2(MEW), EC_WORD_IS, EC_WORD_HOW, EC_WORD_I, EC_WORD_CRY},
+        .speechBefore = {EC_POKEMON_NATIONAL(MEW), EC_POKEMON_NATIONAL(MEW), EC_WORD_IS, EC_WORD_HOW, EC_WORD_I, EC_WORD_CRY},
         .speechWin = {EC_WORD_YES, EC_WORD_I, EC_WORD_KNOW, EC_WORD_I_AM, EC_WORD_CUTE, EC_WORD_EXCL},
-        .speechLose = {EC_POKEMON2(MEW), EC_POKEMON2(MEW), EC_WORD_EXCL, EC_POKEMON2(MEW), EC_WORD_EXCL_EXCL, 0xFFFF},
+        .speechLose = {EC_POKEMON_NATIONAL(MEW), EC_POKEMON_NATIONAL(MEW), EC_WORD_EXCL, EC_POKEMON_NATIONAL(MEW), EC_WORD_EXCL_EXCL, EC_EMPTY_WORD},
         .monSet = gBattleFrontierTrainerMons_Wesley
     },
     [FRONTIER_TRAINER_ANTON] = {
@@ -491,7 +491,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
     [FRONTIER_TRAINER_LAWSON] = {
         .facilityClass = FACILITY_CLASS_RUIN_MANIAC,
         .trainerName = _("LAWSON"),
-        .speechBefore = {EC_WORD_I_AM, EC_WORD_YOUNG, EC_WORD_AT, EC_WORD_HEART, EC_WORD_EXCL, 0xFFFF},
+        .speechBefore = {EC_WORD_I_AM, EC_WORD_YOUNG, EC_WORD_AT, EC_WORD_HEART, EC_WORD_EXCL, EC_EMPTY_WORD},
         .speechWin = {EC_WORD_NOT, EC_WORD_COOL, EC_WORD_EXCL, EC_WORD_NOT, EC_WORD_AT, EC_WORD_ALL},
         .speechLose = {EC_WORD_I_AM, EC_WORD_OLD, EC_WORD_AND, EC_WORD_FEELING, EC_WORD_SHAKY, EC_WORD_ELLIPSIS},
         .monSet = gBattleFrontierTrainerMons_Lawson
@@ -515,16 +515,16 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
     [FRONTIER_TRAINER_ADRIAN] = {
         .facilityClass = FACILITY_CLASS_COLLECTOR,
         .trainerName = _("ADRIAN"),
-        .speechBefore = {EC_WORD_YAHOO, EC_WORD_EXCL, 0xFFFF, EC_WORD_YAHOO, EC_WORD_EXCL_EXCL, 0xFFFF},
-        .speechWin = {EC_WORD_THANK_YOU, EC_WORD_EXCL, 0xFFFF, EC_WORD_THANK_YOU, EC_WORD_EXCL_EXCL, 0xFFFF},
-        .speechLose = {EC_WORD_GOOD_BYE, EC_WORD_EXCL, 0xFFFF, EC_WORD_GOOD_BYE, EC_WORD_EXCL_EXCL, 0xFFFF},
+        .speechBefore = {EC_WORD_YAHOO, EC_WORD_EXCL, EC_EMPTY_WORD, EC_WORD_YAHOO, EC_WORD_EXCL_EXCL, EC_EMPTY_WORD},
+        .speechWin = {EC_WORD_THANK_YOU, EC_WORD_EXCL, EC_EMPTY_WORD, EC_WORD_THANK_YOU, EC_WORD_EXCL_EXCL, EC_EMPTY_WORD},
+        .speechLose = {EC_WORD_GOOD_BYE, EC_WORD_EXCL, EC_EMPTY_WORD, EC_WORD_GOOD_BYE, EC_WORD_EXCL_EXCL, EC_EMPTY_WORD},
         .monSet = gBattleFrontierTrainerMons_Adrian
     },
     [FRONTIER_TRAINER_TRISTAN] = {
         .facilityClass = FACILITY_CLASS_COLLECTOR,
         .trainerName = _("TRISTAN"),
-        .speechBefore = {EC_WORD_CONFUSED, EC_WORD_QUES, 0xFFFF, EC_WORD_I_AM, EC_WORD_A, EC_WORD_GENIUS},
-        .speechWin = {EC_WORD_SEE, EC_WORD_QUES, 0xFFFF, EC_WORD_I_AM, EC_WORD_A, EC_WORD_GENIUS},
+        .speechBefore = {EC_WORD_CONFUSED, EC_WORD_QUES, EC_EMPTY_WORD, EC_WORD_I_AM, EC_WORD_A, EC_WORD_GENIUS},
+        .speechWin = {EC_WORD_SEE, EC_WORD_QUES, EC_EMPTY_WORD, EC_WORD_I_AM, EC_WORD_A, EC_WORD_GENIUS},
         .speechLose = {EC_WORD_I_AM, EC_WORD_NOT, EC_WORD_A, EC_WORD_GENIUS, EC_WORD_IN, EC_WORD_BATTLE},
         .monSet = gBattleFrontierTrainerMons_Tristan
     },
@@ -548,8 +548,8 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
         .facilityClass = FACILITY_CLASS_PARASOL_LADY,
         .trainerName = _("CHELSEA"),
         .speechBefore = {EC_WORD_I, EC_WORD_SERIOUSLY, EC_WORD_MEAN, EC_WORD_TO, EC_WORD_WIN, EC_WORD_EXCL},
-        .speechWin = {EC_WORD_THAT_WAS, EC_WORD_MY, EC_WORD_WILL, EC_WORD_TO, EC_WORD_WIN, 0xFFFF},
-        .speechLose = {EC_WORD_YOU_RE, EC_WORD_FAR, EC_WORD_TOO_STRONG, EC_WORD_FOR, EC_WORD_ME, 0xFFFF},
+        .speechWin = {EC_WORD_THAT_WAS, EC_WORD_MY, EC_WORD_WILL, EC_WORD_TO, EC_WORD_WIN, EC_EMPTY_WORD},
+        .speechLose = {EC_WORD_YOU_RE, EC_WORD_FAR, EC_WORD_TOO_STRONG, EC_WORD_FOR, EC_WORD_ME, EC_EMPTY_WORD},
         .monSet = gBattleFrontierTrainerMons_Chelsea
     },
     [FRONTIER_TRAINER_DANELA] = {
@@ -613,7 +613,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
         .trainerName = _("JADEN"),
         .speechBefore = {EC_WORD_HELLO, EC_WORD_I, EC_WORD_THINK, EC_WORD_I, EC_WORD_ADORE, EC_WORD_YOU},
         .speechWin = {EC_WORD_YOU, EC_WORD_MAKE, EC_WORD_ME, EC_MOVE(THRASH), EC_WORD_IN, EC_MOVE2(FRUSTRATION)},
-        .speechLose = {EC_WORD_THIS_IS_IT_EXCL, 0xFFFF, 0xFFFF, EC_WORD_GOOD_BYE, EC_WORD_FOREVER, EC_WORD_EXCL},
+        .speechLose = {EC_WORD_THIS_IS_IT_EXCL, EC_EMPTY_WORD, EC_EMPTY_WORD, EC_WORD_GOOD_BYE, EC_WORD_FOREVER, EC_WORD_EXCL},
         .monSet = gBattleFrontierTrainerMons_Jaden
     },
     [FRONTIER_TRAINER_DAKOTA] = {
@@ -621,7 +621,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
         .trainerName = _("DAKOTA"),
         .speechBefore = {EC_WORD_YOU, EC_WORD_HAVE, EC_WORD_TO, EC_WORD_DANCE, EC_WORD_WITH, EC_WORD_POWER},
         .speechWin = {EC_WORD_GOT, EC_WORD_IT, EC_WORD_QUES, EC_WORD_DANCE, EC_WORD_WITH, EC_WORD_POWER},
-        .speechLose = {EC_WORD_OKAY, EC_WORD_YOU, EC_WORD_UNDERSTAND, EC_WORD_ALL_RIGHT, EC_WORD_EXCL, 0xFFFF},
+        .speechLose = {EC_WORD_OKAY, EC_WORD_YOU, EC_WORD_UNDERSTAND, EC_WORD_ALL_RIGHT, EC_WORD_EXCL, EC_EMPTY_WORD},
         .monSet = gBattleFrontierTrainerMons_Dakota
     },
     [FRONTIER_TRAINER_BRAYDEN] = {
@@ -637,22 +637,22 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
         .trainerName = _("CORSON"),
         .speechBefore = {EC_WORD_I, EC_WORD_GET, EC_WORD_TO, EC_MOVE2(BEAT_UP), EC_WORD_ON, EC_WORD_YOU},
         .speechWin = {EC_WORD_TOO, EC_WORD_EASY, EC_WORD_EXCL, EC_WORD_I_AM, EC_WORD_SO, EC_WORD_COOL},
-        .speechLose = {EC_WORD_WHY, EC_WORD_QUES_EXCL, 0xFFFF, EC_WORD_I, EC_MOVE2(CURSE), EC_WORD_YOU},
+        .speechLose = {EC_WORD_WHY, EC_WORD_QUES_EXCL, EC_EMPTY_WORD, EC_WORD_I, EC_MOVE2(CURSE), EC_WORD_YOU},
         .monSet = gBattleFrontierTrainerMons_Corson
     },
     [FRONTIER_TRAINER_TREVIN] = {
         .facilityClass = FACILITY_CLASS_BIRD_KEEPER,
         .trainerName = _("TREVIN"),
         .speechBefore = {EC_WORD_THERE, EC_WORD_IS, EC_WORD_NONE, EC_WORD_BETTER, EC_WORD_THAN, EC_WORD_ME},
-        .speechWin = {EC_WORD_YES_SIR_EXCL, 0xFFFF, 0xFFFF, EC_WORD_I_AM, EC_WORD_THE, EC_WORD_BEST},
-        .speechLose = {EC_WORD_SERIOUS, EC_WORD_QUES_EXCL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF},
+        .speechWin = {EC_WORD_YES_SIR_EXCL, EC_EMPTY_WORD, EC_EMPTY_WORD, EC_WORD_I_AM, EC_WORD_THE, EC_WORD_BEST},
+        .speechLose = {EC_WORD_SERIOUS, EC_WORD_QUES_EXCL, EC_EMPTY_WORD, EC_EMPTY_WORD, EC_EMPTY_WORD, EC_EMPTY_WORD},
         .monSet = gBattleFrontierTrainerMons_Trevin
     },
     [FRONTIER_TRAINER_PATRICK] = {
         .facilityClass = FACILITY_CLASS_SAILOR,
         .trainerName = _("PATRICK"),
-        .speechBefore = {EC_WORD_I_AM, EC_WORD_PERFECT, EC_WORD_EXCL, EC_WORD_GIVE_UP, EC_WORD_NOW, 0xFFFF},
-        .speechWin = {EC_WORD_DON_T, EC_WORD_BE, EC_WORD_DISAPPOINTED, EC_WORD_I_AM, EC_WORD_PERFECT, 0xFFFF},
+        .speechBefore = {EC_WORD_I_AM, EC_WORD_PERFECT, EC_WORD_EXCL, EC_WORD_GIVE_UP, EC_WORD_NOW, EC_EMPTY_WORD},
+        .speechWin = {EC_WORD_DON_T, EC_WORD_BE, EC_WORD_DISAPPOINTED, EC_WORD_I_AM, EC_WORD_PERFECT, EC_EMPTY_WORD},
         .speechLose = {EC_WORD_BUT, EC_WORD_HOW, EC_WORD_QUES, EC_WORD_I_AM, EC_WORD_PERFECT, EC_WORD_ELLIPSIS},
         .monSet = gBattleFrontierTrainerMons_Patrick
     },
@@ -667,9 +667,9 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
     [FRONTIER_TRAINER_MAXWELL] = {
         .facilityClass = FACILITY_CLASS_SAILOR,
         .trainerName = _("MAXWELL"),
-        .speechBefore = {EC_WORD_HEY_THERE, EC_WORD_WHO_IS, EC_WORD_YOUR, EC_WORD_RIVAL, EC_WORD_QUES, 0xFFFF},
+        .speechBefore = {EC_WORD_HEY_THERE, EC_WORD_WHO_IS, EC_WORD_YOUR, EC_WORD_RIVAL, EC_WORD_QUES, EC_EMPTY_WORD},
         .speechWin = {EC_WORD_MY, EC_WORD_RIVAL, EC_WORD_IS, EC_WORD_MY, EC_WORD_GIRL, EC_WORD_FRIEND},
-        .speechLose = {EC_WORD_I_AM, EC_WORD_MAKING, EC_WORD_YOU, EC_WORD_MY, EC_WORD_RIVAL, 0xFFFF},
+        .speechLose = {EC_WORD_I_AM, EC_WORD_MAKING, EC_WORD_YOU, EC_WORD_MY, EC_WORD_RIVAL, EC_EMPTY_WORD},
         .monSet = gBattleFrontierTrainerMons_Maxwell
     },
     [FRONTIER_TRAINER_DARYL] = {
@@ -685,22 +685,22 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
         .trainerName = _("KENNETH"),
         .speechBefore = {EC_WORD_YOU, EC_WORD_BETTER, EC_WORD_NOT, EC_MOVE2(SLACK_OFF), EC_WORD_WITH, EC_WORD_ME},
         .speechWin = {EC_WORD_DID, EC_WORD_MY, EC_MOVE2(TAUNT), EC_WORD_INTIMIDATE, EC_WORD_YOU, EC_WORD_QUES},
-        .speechLose = {EC_WORD_I_AM, EC_WORD_SORRY, EC_WORD_ELLIPSIS, 0xFFFF, 0xFFFF, 0xFFFF},
+        .speechLose = {EC_WORD_I_AM, EC_WORD_SORRY, EC_WORD_ELLIPSIS, EC_EMPTY_WORD, EC_EMPTY_WORD, EC_EMPTY_WORD},
         .monSet = gBattleFrontierTrainerMons_Kenneth
     },
     [FRONTIER_TRAINER_RICH] = {
         .facilityClass = FACILITY_CLASS_HIKER,
         .trainerName = _("RICH"),
-        .speechBefore = {EC_WORD_YOUR, EC_MOVE(FACADE), EC_WORD_DOESN_T, EC_MOVE2(TRICK), EC_WORD_ME, 0xFFFF},
-        .speechWin = {EC_WORD_SERIOUSLY, EC_WORD_ARE, EC_WORD_YOU, EC_WORD_REALLY, EC_WORD_OK_QUES, 0xFFFF},
-        .speechLose = {EC_WORD_THAT_WAS, EC_WORD_REALLY, EC_WORD_TOUGH, EC_WORD_ON, EC_WORD_ME, 0xFFFF},
+        .speechBefore = {EC_WORD_YOUR, EC_MOVE(FACADE), EC_WORD_DOESN_T, EC_MOVE2(TRICK), EC_WORD_ME, EC_EMPTY_WORD},
+        .speechWin = {EC_WORD_SERIOUSLY, EC_WORD_ARE, EC_WORD_YOU, EC_WORD_REALLY, EC_WORD_OK_QUES, EC_EMPTY_WORD},
+        .speechLose = {EC_WORD_THAT_WAS, EC_WORD_REALLY, EC_WORD_TOUGH, EC_WORD_ON, EC_WORD_ME, EC_EMPTY_WORD},
         .monSet = gBattleFrontierTrainerMons_Rich
     },
     [FRONTIER_TRAINER_CADEN] = {
         .facilityClass = FACILITY_CLASS_KINDLER,
         .trainerName = _("CADEN"),
-        .speechBefore = {EC_WORD_I, EC_WORD_CAN_T, EC_WORD_BE, EC_WORD_DEFEATED, EC_WORD_EXCL, 0xFFFF},
-        .speechWin = {EC_WORD_FIRE, EC_WORD_EXCL, 0xFFFF, EC_WORD_FIRE, EC_WORD_EXCL_EXCL, 0xFFFF},
+        .speechBefore = {EC_WORD_I, EC_WORD_CAN_T, EC_WORD_BE, EC_WORD_DEFEATED, EC_WORD_EXCL, EC_EMPTY_WORD},
+        .speechWin = {EC_WORD_FIRE, EC_WORD_EXCL, EC_EMPTY_WORD, EC_WORD_FIRE, EC_WORD_EXCL_EXCL, EC_EMPTY_WORD},
         .speechLose = {EC_WORD_I_AM, EC_WORD_TIRED, EC_WORD_ELLIPSIS, EC_WORD_IT_S, EC_WORD_SO, EC_WORD_HOT},
         .monSet = gBattleFrontierTrainerMons_Caden
     },
@@ -715,9 +715,9 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
     [FRONTIER_TRAINER_NASH] = {
         .facilityClass = FACILITY_CLASS_KINDLER,
         .trainerName = _("NASH"),
-        .speechBefore = {EC_WORD_I_AM, EC_WORD_ON, EC_WORD_FIRE, EC_WORD_BABY, EC_WORD_EXCL, 0xFFFF},
+        .speechBefore = {EC_WORD_I_AM, EC_WORD_ON, EC_WORD_FIRE, EC_WORD_BABY, EC_WORD_EXCL, EC_EMPTY_WORD},
         .speechWin = {EC_WORD_I, EC_WORD_LEFT, EC_WORD_YOU, EC_WORD_JUST, EC_WORD_AN, EC_MOVE2(EMBER)},
-        .speechLose = {EC_WORD_AIYEEH, EC_WORD_EXCL_EXCL, 0xFFFF, EC_WORD_NO, EC_WORD_WATER, EC_WORD_PLEASE},
+        .speechLose = {EC_WORD_AIYEEH, EC_WORD_EXCL_EXCL, EC_EMPTY_WORD, EC_WORD_NO, EC_WORD_WATER, EC_WORD_PLEASE},
         .monSet = gBattleFrontierTrainerMons_Nash
     },
     [FRONTIER_TRAINER_ROBBY] = {
@@ -749,13 +749,13 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
         .trainerName = _("ELLEN"),
         .speechBefore = {EC_WORD_CRUSH, EC_WORD_YOU, EC_WORD_LIKE, EC_WORD_AN, EC_WORD_EGG, EC_WORD_EXCL},
         .speechWin = {EC_WORD_THAT_WAS, EC_WORD_A, EC_WORD_TASTY, EC_WORD_VICTORY, EC_WORD_FOR, EC_WORD_ME},
-        .speechLose = {EC_WORD_TOO, EC_WORD_TOUGH, EC_WORD_TO, EC_WORD_CRUSH, EC_WORD_EXCL, 0xFFFF},
+        .speechLose = {EC_WORD_TOO, EC_WORD_TOUGH, EC_WORD_TO, EC_WORD_CRUSH, EC_WORD_EXCL, EC_EMPTY_WORD},
         .monSet = gBattleFrontierTrainerMons_Ellen
     },
     [FRONTIER_TRAINER_RAMON] = {
         .facilityClass = FACILITY_CLASS_SWIMMING_TRIATHLETE_M,
         .trainerName = _("RAMON"),
-        .speechBefore = {EC_WORD_OKAY, EC_WORD_EXCL, 0xFFFF, EC_WORD_THIS, EC_WORD_IS, EC_WORD_PERFECTION},
+        .speechBefore = {EC_WORD_OKAY, EC_WORD_EXCL, EC_EMPTY_WORD, EC_WORD_THIS, EC_WORD_IS, EC_WORD_PERFECTION},
         .speechWin = {EC_WORD_I_AM, EC_WORD_HAPPY, EC_WORD_THAT, EC_WORD_I, EC_WORD_WON, EC_WORD_EXCL},
         .speechLose = {EC_WORD_IT_S, EC_WORD_A, EC_WORD_SECRET, EC_WORD_WHY, EC_WORD_I_AM, EC_WORD_HAPPY},
         .monSet = gBattleFrontierTrainerMons_Ramon
@@ -764,8 +764,8 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
         .facilityClass = FACILITY_CLASS_SWIMMING_TRIATHLETE_M,
         .trainerName = _("ARTHUR"),
         .speechBefore = {EC_WORD_HERE_I_COME, EC_WORD_FEELING, EC_WORD_READY, EC_WORD_FOR, EC_WORD_IT, EC_WORD_ALL},
-        .speechWin = {EC_WORD_THAT_S_IT_EXCL, 0xFFFF, 0xFFFF, EC_WORD_THAT_WAS, EC_WORD_FABULOUS, EC_WORD_EXCL},
-        .speechLose = {EC_WORD_THAT_WAS, EC_WORD_NOT, EC_WORD_WHAT, EC_WORD_I, EC_WORD_NEED, 0xFFFF},
+        .speechWin = {EC_WORD_THAT_S_IT_EXCL, EC_EMPTY_WORD, EC_EMPTY_WORD, EC_WORD_THAT_WAS, EC_WORD_FABULOUS, EC_WORD_EXCL},
+        .speechLose = {EC_WORD_THAT_WAS, EC_WORD_NOT, EC_WORD_WHAT, EC_WORD_I, EC_WORD_NEED, EC_EMPTY_WORD},
         .monSet = gBattleFrontierTrainerMons_Arthur
     },
     [FRONTIER_TRAINER_ALONDRA] = {
@@ -781,7 +781,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
         .trainerName = _("ADRIANA"),
         .speechBefore = {EC_WORD_COME, EC_WORD_SEE, EC_WORD_AN, EC_WORD_INCREDIBLE, EC_WORD_SWIFT_SWIM, EC_WORD_EXCL},
         .speechWin = {EC_WORD_I, EC_WORD_MAKE, EC_WORD_IT, EC_WORD_LOOK, EC_WORD_SO, EC_WORD_EASY},
-        .speechLose = {EC_WORD_I_AM, EC_WORD_FEELING, EC_MOVE2(BEAT_UP), EC_WORD_AND, EC_WORD_TIRED, 0xFFFF},
+        .speechLose = {EC_WORD_I_AM, EC_WORD_FEELING, EC_MOVE2(BEAT_UP), EC_WORD_AND, EC_WORD_TIRED, EC_EMPTY_WORD},
         .monSet = gBattleFrontierTrainerMons_Adriana
     },
     [FRONTIER_TRAINER_MALIK] = {
@@ -795,17 +795,17 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
     [FRONTIER_TRAINER_JILL] = {
         .facilityClass = FACILITY_CLASS_CYCLING_TRIATHLETE_F,
         .trainerName = _("JILL"),
-        .speechBefore = {EC_WORD_I_AM, EC_WORD_THE, EC_MOVE2(QUICK_ATTACK), EC_WORD_TRAINER, EC_WORD_EXCL, 0xFFFF},
-        .speechWin = {EC_WORD_THE, EC_MOVE2(QUICK_ATTACK), EC_WORD_TRAINER, EC_WORD_WINS, EC_WORD_EXCL, 0xFFFF},
+        .speechBefore = {EC_WORD_I_AM, EC_WORD_THE, EC_MOVE2(QUICK_ATTACK), EC_WORD_TRAINER, EC_WORD_EXCL, EC_EMPTY_WORD},
+        .speechWin = {EC_WORD_THE, EC_MOVE2(QUICK_ATTACK), EC_WORD_TRAINER, EC_WORD_WINS, EC_WORD_EXCL, EC_EMPTY_WORD},
         .speechLose = {EC_WORD_THE, EC_MOVE2(QUICK_ATTACK), EC_WORD_TRAINER, EC_WORD_GIVES, EC_WORD_UP, EC_WORD_EXCL},
         .monSet = gBattleFrontierTrainerMons_Jill
     },
     [FRONTIER_TRAINER_ERIK] = {
         .facilityClass = FACILITY_CLASS_RUNNING_TRIATHLETE_M,
         .trainerName = _("ERIK"),
-        .speechBefore = {EC_WORD_I_AM, EC_WORD_THE, EC_WORD_SPEED_BOOST, EC_WORD_HERO, EC_WORD_EXCL, 0xFFFF},
+        .speechBefore = {EC_WORD_I_AM, EC_WORD_THE, EC_WORD_SPEED_BOOST, EC_WORD_HERO, EC_WORD_EXCL, EC_EMPTY_WORD},
         .speechWin = {EC_WORD_THANK_YOU, EC_WORD_FROM, EC_WORD_THE, EC_WORD_SPEED_BOOST, EC_WORD_HERO, EC_WORD_EXCL},
-        .speechLose = {EC_WORD_WAAAH, EC_WORD_EXCL_EXCL, 0xFFFF, EC_WORD_NO, EC_WORD_NO, EC_WORD_EXCL_EXCL},
+        .speechLose = {EC_WORD_WAAAH, EC_WORD_EXCL_EXCL, EC_EMPTY_WORD, EC_WORD_NO, EC_WORD_NO, EC_WORD_EXCL_EXCL},
         .monSet = gBattleFrontierTrainerMons_Erik
     },
     [FRONTIER_TRAINER_YAZMIN] = {
@@ -843,9 +843,9 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
     [FRONTIER_TRAINER_CARLO] = {
         .facilityClass = FACILITY_CLASS_CYCLING_TRIATHLETE_M,
         .trainerName = _("CARLO"),
-        .speechBefore = {EC_WORD_HAH, EC_WORD_EXCL_EXCL, 0xFFFF, EC_WORD_YEAH, EC_WORD_EXCL_EXCL, 0xFFFF},
+        .speechBefore = {EC_WORD_HAH, EC_WORD_EXCL_EXCL, EC_EMPTY_WORD, EC_WORD_YEAH, EC_WORD_EXCL_EXCL, EC_EMPTY_WORD},
         .speechWin = {EC_WORD_I, EC_WORD_DO, EC_WORD_THINGS, EC_WORD_AT, EC_MOVE(EXTREME_SPEED), EC_WORD_EXCL},
-        .speechLose = {EC_WORD_I, EC_WORD_LOST, EC_WORD_AT, EC_MOVE(EXTREME_SPEED), EC_WORD_ELLIPSIS, 0xFFFF},
+        .speechLose = {EC_WORD_I, EC_WORD_LOST, EC_WORD_AT, EC_MOVE(EXTREME_SPEED), EC_WORD_ELLIPSIS, EC_EMPTY_WORD},
         .monSet = gBattleFrontierTrainerMons_Carlo
     },
     [FRONTIER_TRAINER_EMILIA] = {
@@ -859,7 +859,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
     [FRONTIER_TRAINER_DALIA] = {
         .facilityClass = FACILITY_CLASS_CYCLING_TRIATHLETE_F,
         .trainerName = _("DALIA"),
-        .speechBefore = {EC_WORD_MY, EC_WORD_BIKE, EC_WORD_IS, EC_WORD_VERY, EC_WORD_EXPENSIVE, 0xFFFF},
+        .speechBefore = {EC_WORD_MY, EC_WORD_BIKE, EC_WORD_IS, EC_WORD_VERY, EC_WORD_EXPENSIVE, EC_EMPTY_WORD},
         .speechWin = {EC_WORD_DON_T, EC_WORD_COME, EC_WORD_NEAR, EC_WORD_MY, EC_WORD_BIKE, EC_WORD_EXCL},
         .speechLose = {EC_WORD_MY, EC_WORD_BIKE, EC_WORD_IS, EC_WORD_MY, EC_WORD_BEST, EC_WORD_FRIEND},
         .monSet = gBattleFrontierTrainerMons_Dalia
@@ -867,24 +867,24 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
     [FRONTIER_TRAINER_HITOMI] = {
         .facilityClass = FACILITY_CLASS_BLACK_BELT,
         .trainerName = _("HITOMI"),
-        .speechBefore = {EC_WORD_YEAH, EC_WORD_EXCL_EXCL, 0xFFFF, EC_WORD_HAH, EC_WORD_EXCL_EXCL, 0xFFFF},
-        .speechWin = {EC_WORD_WHAT, EC_WORD_QUES_EXCL, 0xFFFF, EC_WORD_I, EC_WORD_WON, EC_WORD_QUES_EXCL},
-        .speechLose = {EC_WORD_AIYEEH, EC_WORD_EXCL_EXCL, 0xFFFF, EC_WORD_I_AM, EC_WORD_SORRY, EC_WORD_EXCL_EXCL},
+        .speechBefore = {EC_WORD_YEAH, EC_WORD_EXCL_EXCL, EC_EMPTY_WORD, EC_WORD_HAH, EC_WORD_EXCL_EXCL, EC_EMPTY_WORD},
+        .speechWin = {EC_WORD_WHAT, EC_WORD_QUES_EXCL, EC_EMPTY_WORD, EC_WORD_I, EC_WORD_WON, EC_WORD_QUES_EXCL},
+        .speechLose = {EC_WORD_AIYEEH, EC_WORD_EXCL_EXCL, EC_EMPTY_WORD, EC_WORD_I_AM, EC_WORD_SORRY, EC_WORD_EXCL_EXCL},
         .monSet = gBattleFrontierTrainerMons_Hitomi
     },
     [FRONTIER_TRAINER_RICARDO] = {
         .facilityClass = FACILITY_CLASS_BLACK_BELT,
         .trainerName = _("RICARDO"),
         .speechBefore = {EC_WORD_COME_ON, EC_WORD_EXCL, EC_WORD_PLAY, EC_WORD_TIME, EC_WORD_IS, EC_WORD_OVER},
-        .speechWin = {EC_WORD_YOU_RE, EC_WORD_OUT, EC_WORD_OF, EC_WORD_HERE, EC_WORD_EXCL, 0xFFFF},
-        .speechLose = {EC_WORD_PLEASE, EC_WORD_DON_T, EC_WORD_HIT, EC_WORD_ME, EC_WORD_EXCL, 0xFFFF},
+        .speechWin = {EC_WORD_YOU_RE, EC_WORD_OUT, EC_WORD_OF, EC_WORD_HERE, EC_WORD_EXCL, EC_EMPTY_WORD},
+        .speechLose = {EC_WORD_PLEASE, EC_WORD_DON_T, EC_WORD_HIT, EC_WORD_ME, EC_WORD_EXCL, EC_EMPTY_WORD},
         .monSet = gBattleFrontierTrainerMons_Ricardo
     },
     [FRONTIER_TRAINER_SHIZUKA] = {
         .facilityClass = FACILITY_CLASS_BLACK_BELT,
         .trainerName = _("SHIZUKA"),
         .speechBefore = {EC_WORD_SHOW, EC_WORD_ME, EC_WORD_THAT, EC_WORD_YOU_RE, EC_WORD_SERIOUS, EC_WORD_EXCL},
-        .speechWin = {EC_WORD_I, EC_WORD_WON_T, EC_WORD_FORGET, EC_WORD_ABOUT, EC_WORD_YOU, 0xFFFF},
+        .speechWin = {EC_WORD_I, EC_WORD_WON_T, EC_WORD_FORGET, EC_WORD_ABOUT, EC_WORD_YOU, EC_EMPTY_WORD},
         .speechLose = {EC_WORD_YOU_RE, EC_WORD_PERFECT, EC_WORD_IN, EC_WORD_EVERY, EC_WORD_WAY, EC_WORD_EXCL},
         .monSet = gBattleFrontierTrainerMons_Shizuka
     },
@@ -900,7 +900,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
         .facilityClass = FACILITY_CLASS_BATTLE_GIRL,
         .trainerName = _("KELLY"),
         .speechBefore = {EC_WORD_MY, EC_WORD_NIGHT, EC_WORD_SCHOOL, EC_WORD_IS, EC_WORD_REALLY, EC_WORD_SCARY},
-        .speechWin = {EC_WORD_A, EC_WORD_LADY, EC_WORD_GHOST, EC_WORD_APPEARS, EC_WORD_THERE, 0xFFFF},
+        .speechWin = {EC_WORD_A, EC_WORD_LADY, EC_WORD_GHOST, EC_WORD_APPEARS, EC_WORD_THERE, EC_EMPTY_WORD},
         .speechLose = {EC_WORD_THE, EC_WORD_HOME, EC_WORD_WORK, EC_WORD_IS, EC_WORD_AWFULLY, EC_WORD_SCARY},
         .monSet = gBattleFrontierTrainerMons_Kelly
     },
@@ -908,14 +908,14 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
         .facilityClass = FACILITY_CLASS_BATTLE_GIRL,
         .trainerName = _("RAYNA"),
         .speechBefore = {EC_WORD_I_AM, EC_WORD_NO_1, EC_WORD_WHEN, EC_WORD_IT_S, EC_WORD_ABOUT, EC_WORD_POWER},
-        .speechWin = {EC_WORD_UNDERSTAND, EC_WORD_MY, EC_WORD_POWER, EC_WORD_NOW, EC_WORD_QUES, 0xFFFF},
-        .speechLose = {EC_WORD_TERRIBLE, EC_WORD_ELLIPSIS, 0xFFFF, EC_WORD_I_AM, EC_WORD_TERRIBLE, EC_WORD_ELLIPSIS},
+        .speechWin = {EC_WORD_UNDERSTAND, EC_WORD_MY, EC_WORD_POWER, EC_WORD_NOW, EC_WORD_QUES, EC_EMPTY_WORD},
+        .speechLose = {EC_WORD_TERRIBLE, EC_WORD_ELLIPSIS, EC_EMPTY_WORD, EC_WORD_I_AM, EC_WORD_TERRIBLE, EC_WORD_ELLIPSIS},
         .monSet = gBattleFrontierTrainerMons_Rayna
     },
     [FRONTIER_TRAINER_EVAN] = {
         .facilityClass = FACILITY_CLASS_EXPERT_M,
         .trainerName = _("EVAN"),
-        .speechBefore = {EC_WORD_EVERY, EC_WORD_BATTLE, EC_WORD_HAS, EC_WORD_A, EC_WORD_SMELL, 0xFFFF},
+        .speechBefore = {EC_WORD_EVERY, EC_WORD_BATTLE, EC_WORD_HAS, EC_WORD_A, EC_WORD_SMELL, EC_EMPTY_WORD},
         .speechWin = {EC_WORD_OH, EC_WORD_EXCL, EC_WORD_THE, EC_MOVE(SWEET_SCENT), EC_WORD_OF, EC_WORD_VICTORY},
         .speechLose = {EC_WORD_THE, EC_WORD_AWFUL, EC_WORD_STENCH, EC_WORD_OF, EC_WORD_A, EC_WORD_LOSS},
         .monSet = gBattleFrontierTrainerMons_Evan
@@ -923,23 +923,23 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
     [FRONTIER_TRAINER_JORDAN] = {
         .facilityClass = FACILITY_CLASS_EXPERT_M,
         .trainerName = _("JORDAN"),
-        .speechBefore = {EC_WORD_GOOD, EC_WORD_EXCL, 0xFFFF, EC_WORD_COME_ON, EC_WORD_EXCL_EXCL, 0xFFFF},
-        .speechWin = {EC_WORD_YOU, EC_WORD_CAN_T, EC_WORD_BEAT, EC_WORD_ME, EC_WORD_EXCL, 0xFFFF},
-        .speechLose = {EC_WORD_WHAT, EC_WORD_QUES_EXCL, 0xFFFF, EC_WORD_BUT, EC_WORD_HOW, EC_WORD_QUES},
+        .speechBefore = {EC_WORD_GOOD, EC_WORD_EXCL, EC_EMPTY_WORD, EC_WORD_COME_ON, EC_WORD_EXCL_EXCL, EC_EMPTY_WORD},
+        .speechWin = {EC_WORD_YOU, EC_WORD_CAN_T, EC_WORD_BEAT, EC_WORD_ME, EC_WORD_EXCL, EC_EMPTY_WORD},
+        .speechLose = {EC_WORD_WHAT, EC_WORD_QUES_EXCL, EC_EMPTY_WORD, EC_WORD_BUT, EC_WORD_HOW, EC_WORD_QUES},
         .monSet = gBattleFrontierTrainerMons_Jordan
     },
     [FRONTIER_TRAINER_JOEL] = {
         .facilityClass = FACILITY_CLASS_EXPERT_M,
         .trainerName = _("JOEL"),
-        .speechBefore = {EC_WORD_FUFUFU, EC_WORD_ELLIPSIS, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF},
-        .speechWin = {EC_WORD_GIGGLE, EC_WORD_ELLIPSIS, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF},
-        .speechLose = {EC_WORD_HAHAHA, EC_WORD_ELLIPSIS, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF},
+        .speechBefore = {EC_WORD_FUFUFU, EC_WORD_ELLIPSIS, EC_EMPTY_WORD, EC_EMPTY_WORD, EC_EMPTY_WORD, EC_EMPTY_WORD},
+        .speechWin = {EC_WORD_GIGGLE, EC_WORD_ELLIPSIS, EC_EMPTY_WORD, EC_EMPTY_WORD, EC_EMPTY_WORD, EC_EMPTY_WORD},
+        .speechLose = {EC_WORD_HAHAHA, EC_WORD_ELLIPSIS, EC_EMPTY_WORD, EC_EMPTY_WORD, EC_EMPTY_WORD, EC_EMPTY_WORD},
         .monSet = gBattleFrontierTrainerMons_Joel
     },
     [FRONTIER_TRAINER_KRISTEN] = {
         .facilityClass = FACILITY_CLASS_EXPERT_F,
         .trainerName = _("KRISTEN"),
-        .speechBefore = {EC_WORD_HAHAHA, EC_WORD_ELLIPSIS, 0xFFFF, EC_WORD_A, EC_WORD_KID, EC_WORD_ELLIPSIS},
+        .speechBefore = {EC_WORD_HAHAHA, EC_WORD_ELLIPSIS, EC_EMPTY_WORD, EC_WORD_A, EC_WORD_KID, EC_WORD_ELLIPSIS},
         .speechWin = {EC_WORD_JUST, EC_WORD_A_LITTLE, EC_WORD_KID, EC_WORD_AFTER, EC_WORD_ALL, EC_WORD_EXCL},
         .speechLose = {EC_WORD_A, EC_WORD_TOUGH, EC_WORD_KID, EC_WORD_HUH_QUES, EC_WORD_HUMPH, EC_WORD_EXCL},
         .monSet = gBattleFrontierTrainerMons_Kristen
@@ -947,7 +947,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
     [FRONTIER_TRAINER_SELPHY] = {
         .facilityClass = FACILITY_CLASS_EXPERT_F,
         .trainerName = _("SELPHY"),
-        .speechBefore = {EC_WORD_HUH_QUES, EC_WORD_WHAT, EC_WORD_IS_IT_QUES, 0xFFFF, 0xFFFF, 0xFFFF},
+        .speechBefore = {EC_WORD_HUH_QUES, EC_WORD_WHAT, EC_WORD_IS_IT_QUES, EC_EMPTY_WORD, EC_EMPTY_WORD, EC_EMPTY_WORD},
         .speechWin = {EC_WORD_OH, EC_WORD_YES, EC_WORD_EXCL, EC_WORD_WHY, EC_WORD_NOT, EC_WORD_QUES},
         .speechLose = {EC_WORD_OH, EC_WORD_NO, EC_WORD_EXCL, EC_WORD_WHY, EC_WORD_NOT, EC_WORD_QUES},
         .monSet = gBattleFrontierTrainerMons_Selphy
@@ -956,14 +956,14 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
         .facilityClass = FACILITY_CLASS_EXPERT_F,
         .trainerName = _("CHLOE"),
         .speechBefore = {EC_WORD_COME, EC_WORD_WE, EC_WORD_WILL, EC_WORD_DO, EC_WORD_BATTLE, EC_WORD_NOW},
-        .speechWin = {EC_WORD_MORE, EC_WORD_EXCL, 0xFFFF, EC_WORD_ANOTHER, EC_WORD_BATTLE, EC_WORD_EXCL},
-        .speechLose = {EC_WORD_OH, EC_WORD_EXCL, 0xFFFF, EC_WORD_STRONG, EC_WORD_YOU, EC_WORD_ARE},
+        .speechWin = {EC_WORD_MORE, EC_WORD_EXCL, EC_EMPTY_WORD, EC_WORD_ANOTHER, EC_WORD_BATTLE, EC_WORD_EXCL},
+        .speechLose = {EC_WORD_OH, EC_WORD_EXCL, EC_EMPTY_WORD, EC_WORD_STRONG, EC_WORD_YOU, EC_WORD_ARE},
         .monSet = gBattleFrontierTrainerMons_Chloe
     },
     [FRONTIER_TRAINER_NORTON] = {
         .facilityClass = FACILITY_CLASS_PSYCHIC_M,
         .trainerName = _("NORTON"),
-        .speechBefore = {EC_WORD_I, EC_WORD_KNOW, EC_WORD_ONLY, EC_WORD_YOU, 0xFFFF, 0xFFFF},
+        .speechBefore = {EC_WORD_I, EC_WORD_KNOW, EC_WORD_ONLY, EC_WORD_YOU, EC_EMPTY_WORD, EC_EMPTY_WORD},
         .speechWin = {EC_WORD_EXCUSE_ME, EC_WORD_BUT, EC_WORD_YOU_RE, EC_WORD_A, EC_WORD_PUSHOVER, EC_WORD_EXCL},
         .speechLose = {EC_WORD_YOU_RE, EC_WORD_SOME, EC_WORD_KIND, EC_WORD_OF, EC_WORD_AWESOME, EC_WORD_EXCL},
         .monSet = gBattleFrontierTrainerMons_Norton
@@ -973,15 +973,15 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
         .trainerName = _("LUKAS"),
         .speechBefore = {EC_WORD_MY, EC_WORD_JOKING, EC_WORD_IS, EC_WORD_PRETTY, EC_WORD_TERRIBLE, EC_WORD_ELLIPSIS},
         .speechWin = {EC_WORD_YOUR, EC_WORD_ROCK_HEAD, EC_WORD_EXISTS, EC_WORD_TO, EC_WORD_SHINE, EC_WORD_EXCL},
-        .speechLose = {EC_WORD_YOUR, EC_WORD_ROCK_HEAD, EC_WORD_COME, EC_WORD_TO, EC_WORD_SHINE, 0xFFFF},
+        .speechLose = {EC_WORD_YOUR, EC_WORD_ROCK_HEAD, EC_WORD_COME, EC_WORD_TO, EC_WORD_SHINE, EC_EMPTY_WORD},
         .monSet = gBattleFrontierTrainerMons_Lukas
     },
     [FRONTIER_TRAINER_ZACH] = {
         .facilityClass = FACILITY_CLASS_PSYCHIC_M,
         .trainerName = _("ZACH"),
         .speechBefore = {EC_WORD_I_AM, EC_WORD_AN, EC_WORD_EXCELLENT, EC_MOVE2(MIMIC), EC_WORD_OF, EC_WORD_POKEMON},
-        .speechWin = {EC_WORD_I_AM, EC_WORD_HAPPY, EC_WORD_LIKE, EC_WORD_A_LITTLE, EC_POKEMON2(TOGEPI), EC_WORD_EXCL},
-        .speechLose = {EC_WORD_I_AM, EC_WORD_ANGRY, EC_WORD_LIKE, EC_WORD_A, EC_POKEMON2(MANKEY), EC_WORD_EXCL},
+        .speechWin = {EC_WORD_I_AM, EC_WORD_HAPPY, EC_WORD_LIKE, EC_WORD_A_LITTLE, EC_POKEMON_NATIONAL(TOGEPI), EC_WORD_EXCL},
+        .speechLose = {EC_WORD_I_AM, EC_WORD_ANGRY, EC_WORD_LIKE, EC_WORD_A, EC_POKEMON_NATIONAL(MANKEY), EC_WORD_EXCL},
         .monSet = gBattleFrontierTrainerMons_Zach
     },
     [FRONTIER_TRAINER_KAITLYN] = {
@@ -997,7 +997,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
         .trainerName = _("BREANNA"),
         .speechBefore = {EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_WILL, EC_WORD_CRUSH, EC_WORD_YOU, EC_WORD_EXCL},
         .speechWin = {EC_WORD_HAVE, EC_WORD_SOME, EC_WORD_MORE, EC_WORD_OF, EC_WORD_THIS, EC_WORD_EXCL},
-        .speechLose = {EC_WORD_YOU, EC_WORD_HAVE, EC_WORD_GUTS, EC_WORD_AND, EC_WORD_SKILL, 0xFFFF},
+        .speechLose = {EC_WORD_YOU, EC_WORD_HAVE, EC_WORD_GUTS, EC_WORD_AND, EC_WORD_SKILL, EC_EMPTY_WORD},
         .monSet = gBattleFrontierTrainerMons_Breanna
     },
     [FRONTIER_TRAINER_KENDRA] = {
@@ -1005,7 +1005,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
         .trainerName = _("KENDRA"),
         .speechBefore = {EC_WORD_IF, EC_WORD_YOU_RE, EC_WORD_SMART, EC_WORD_STOP, EC_WORD_RIGHT, EC_WORD_NOW},
         .speechWin = {EC_WORD_I, EC_WORD_SAID, EC_WORD_THAT, EC_WORD_YOU, EC_WORD_SHOULD, EC_WORD_STOP},
-        .speechLose = {EC_WORD_WHY, EC_WORD_DIDN_T, EC_WORD_YOU, EC_WORD_STOP, EC_WORD_QUES, 0xFFFF},
+        .speechLose = {EC_WORD_WHY, EC_WORD_DIDN_T, EC_WORD_YOU, EC_WORD_STOP, EC_WORD_QUES, EC_EMPTY_WORD},
         .monSet = gBattleFrontierTrainerMons_Kendra
     },
     [FRONTIER_TRAINER_MOLLY] = {
@@ -1013,7 +1013,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
         .trainerName = _("MOLLY"),
         .speechBefore = {EC_WORD_WILL, EC_WORD_MY, EC_WORD_CUTE_CHARM, EC_MOVE2(ATTRACT), EC_WORD_YOU, EC_WORD_QUES},
         .speechWin = {EC_WORD_YOUR, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_MY, EC_WORD_TOYS, EC_WORD_NOW},
-        .speechLose = {EC_WORD_OH, EC_WORD_HOW, EC_WORD_COULD, EC_WORD_YOU, EC_WORD_QUES, 0xFFFF},
+        .speechLose = {EC_WORD_OH, EC_WORD_HOW, EC_WORD_COULD, EC_WORD_YOU, EC_WORD_QUES, EC_EMPTY_WORD},
         .monSet = gBattleFrontierTrainerMons_Molly
     },
     [FRONTIER_TRAINER_JAZMIN] = {
@@ -1077,7 +1077,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
         .trainerName = _("BALEY"),
         .speechBefore = {EC_MOVE(SCREECH), EC_WORD_IS, EC_WORD_LIKE, EC_WORD_MUSIC, EC_WORD_TO_ME, EC_WORD_EXCL},
         .speechWin = {EC_WORD_MY, EC_MOVE(SCREECH), EC_WORD_STRATEGY, EC_WORD_IS, EC_WORD_THE, EC_WORD_BEST},
-        .speechLose = {EC_WORD_YOU_RE, EC_WORD_SOUNDPROOF, EC_WORD_QUES, 0xFFFF, 0xFFFF, 0xFFFF},
+        .speechLose = {EC_WORD_YOU_RE, EC_WORD_SOUNDPROOF, EC_WORD_QUES, EC_EMPTY_WORD, EC_EMPTY_WORD, EC_EMPTY_WORD},
         .monSet = gBattleFrontierTrainerMons_Baley
     },
     [FRONTIER_TRAINER_ZACKARY] = {
@@ -1093,7 +1093,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
         .trainerName = _("GABRIEL"),
         .speechBefore = {EC_MOVE2(POUND), EC_WORD_THE, EC_WORD_THICK_FAT, EC_WORD_ON, EC_WORD_MY, EC_MOVE2(BELLY_DRUM)},
         .speechWin = {EC_MOVE2(POUND), EC_WORD_MY, EC_MOVE2(BELLY_DRUM), EC_MOVE2(POUND), EC_WORD_MY, EC_MOVE2(BELLY_DRUM)},
-        .speechLose = {EC_WORD_MY, EC_MOVE2(BELLY_DRUM), EC_WORD_WAS, EC_WORD_TOO_WEAK, EC_WORD_ELLIPSIS, 0xFFFF},
+        .speechLose = {EC_WORD_MY, EC_MOVE2(BELLY_DRUM), EC_WORD_WAS, EC_WORD_TOO_WEAK, EC_WORD_ELLIPSIS, EC_EMPTY_WORD},
         .monSet = gBattleFrontierTrainerMons_Gabriel
     },
     [FRONTIER_TRAINER_EMILY] = {
@@ -1115,17 +1115,17 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
     [FRONTIER_TRAINER_SOFIA] = {
         .facilityClass = FACILITY_CLASS_AROMA_LADY,
         .trainerName = _("SOFIA"),
-        .speechBefore = {EC_POKEMON(LOUDRED), EC_WORD_PROBABLY, EC_WORD_HAS, EC_WORD_A, EC_MOVE(SWEET_SCENT), 0xFFFF},
+        .speechBefore = {EC_POKEMON(LOUDRED), EC_WORD_PROBABLY, EC_WORD_HAS, EC_WORD_A, EC_MOVE(SWEET_SCENT), EC_EMPTY_WORD},
         .speechWin = {EC_WORD_THAT_S, EC_WORD_THE, EC_WORD_FEELING, EC_WORD_THAT, EC_WORD_I, EC_WORD_GET},
-        .speechLose = {EC_WORD_I, EC_WORD_WORK, EC_WORD_AT, EC_WORD_THE, EC_WORD_DEPT_STORE, 0xFFFF},
+        .speechLose = {EC_WORD_I, EC_WORD_WORK, EC_WORD_AT, EC_WORD_THE, EC_WORD_DEPT_STORE, EC_EMPTY_WORD},
         .monSet = gBattleFrontierTrainerMons_Sofia
     },
     [FRONTIER_TRAINER_BRADEN] = {
         .facilityClass = FACILITY_CLASS_COOLTRAINER_M,
         .trainerName = _("BRADEN"),
-        .speechBefore = {EC_WORD_I_CHOOSE_YOU, EC_WORD_EXCL, 0xFFFF, EC_WORD_THIS_IS_IT_EXCL, 0xFFFF, 0xFFFF},
+        .speechBefore = {EC_WORD_I_CHOOSE_YOU, EC_WORD_EXCL, EC_EMPTY_WORD, EC_WORD_THIS_IS_IT_EXCL, EC_EMPTY_WORD, EC_EMPTY_WORD},
         .speechWin = {EC_WORD_I_AM, EC_WORD_FEELING, EC_WORD_PRETTY, EC_WORD_AWESOME, EC_WORD_ABOUT, EC_WORD_MYSELF},
-        .speechLose = {EC_WORD_ALL_RIGHT, EC_WORD_EXCL, 0xFFFF, EC_WORD_I, EC_WORD_SURRENDER, EC_WORD_EXCL},
+        .speechLose = {EC_WORD_ALL_RIGHT, EC_WORD_EXCL, EC_EMPTY_WORD, EC_WORD_I, EC_WORD_SURRENDER, EC_WORD_EXCL},
         .monSet = gBattleFrontierTrainerMons_Braden
     },
     [FRONTIER_TRAINER_KAYDEN] = {
@@ -1133,7 +1133,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
         .trainerName = _("KAYDEN"),
         .speechBefore = {EC_WORD_THEY, EC_WORD_OVERDO, EC_WORD_THAT, EC_WORD_GOURMET, EC_WORD_THING, EC_WORD_ELLIPSIS},
         .speechWin = {EC_WORD_THAT, EC_WORD_GOURMET, EC_WORD_THING, EC_WORD_ISN_T, EC_WORD_FOR, EC_WORD_ME},
-        .speechLose = {EC_WORD_HEY, EC_WORD_THIS, EC_WORD_IS, EC_WORD_PRETTY, EC_WORD_TASTY, 0xFFFF},
+        .speechLose = {EC_WORD_HEY, EC_WORD_THIS, EC_WORD_IS, EC_WORD_PRETTY, EC_WORD_TASTY, EC_EMPTY_WORD},
         .monSet = gBattleFrontierTrainerMons_Kayden
     },
     [FRONTIER_TRAINER_COOPER] = {
@@ -1141,7 +1141,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
         .trainerName = _("COOPER"),
         .speechBefore = {EC_WORD_THIS, EC_WORD_SHOULD, EC_WORD_ABSOLUTELY, EC_WORD_BE, EC_WORD_A, EC_WORD_PUSHOVER},
         .speechWin = {EC_WORD_THAT_WAS, EC_WORD_TOO, EC_WORD_EXCITING, EC_WORD_FOR, EC_WORD_ME, EC_WORD_ELLIPSIS},
-        .speechLose = {EC_WORD_PLEASE, EC_WORD_EXCL, 0xFFFF, EC_WORD_SORRY, EC_WORD_I_AM, EC_WORD_SORRY},
+        .speechLose = {EC_WORD_PLEASE, EC_WORD_EXCL, EC_EMPTY_WORD, EC_WORD_SORRY, EC_WORD_I_AM, EC_WORD_SORRY},
         .monSet = gBattleFrontierTrainerMons_Cooper
     },
     [FRONTIER_TRAINER_JULIA] = {
@@ -1179,8 +1179,8 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
     [FRONTIER_TRAINER_DOMINIC] = {
         .facilityClass = FACILITY_CLASS_PKMN_RANGER_M,
         .trainerName = _("DOMINIC"),
-        .speechBefore = {EC_WORD_I, EC_WORD_HAVE, EC_WORD_THIS, EC_WORD_EXCELLENT, EC_WORD_CAMERA, 0xFFFF},
-        .speechWin = {EC_WORD_MY, EC_WORD_CAMERA, EC_WORD_WAS, EC_WORD_AWFULLY, EC_WORD_EXPENSIVE, 0xFFFF},
+        .speechBefore = {EC_WORD_I, EC_WORD_HAVE, EC_WORD_THIS, EC_WORD_EXCELLENT, EC_WORD_CAMERA, EC_EMPTY_WORD},
+        .speechWin = {EC_WORD_MY, EC_WORD_CAMERA, EC_WORD_WAS, EC_WORD_AWFULLY, EC_WORD_EXPENSIVE, EC_EMPTY_WORD},
         .speechLose = {EC_WORD_MY, EC_WORD_CAMERA, EC_WORD_DOESN_T, EC_WORD_MISS, EC_WORD_A, EC_WORD_THING},
         .monSet = gBattleFrontierTrainerMons_Dominic
     },
@@ -1188,8 +1188,8 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
         .facilityClass = FACILITY_CLASS_PKMN_RANGER_M,
         .trainerName = _("NIKOLAS"),
         .speechBefore = {EC_WORD_I, EC_MOVE2(MIMIC), EC_WORD_POKEMON, EC_WORD_AFTER, EC_WORD_EVERY, EC_WORD_BATTLE},
-        .speechWin = {EC_WORD_IF_I_WIN, EC_WORD_I, EC_WORD_PRETEND, EC_WORD_I_AM, EC_WORD_A, EC_POKEMON2(TAUROS)},
-        .speechLose = {EC_WORD_IF_I_LOSE, EC_WORD_I, EC_WORD_PRETEND, EC_WORD_I_AM, EC_WORD_A, EC_POKEMON2(MILTANK)},
+        .speechWin = {EC_WORD_IF_I_WIN, EC_WORD_I, EC_WORD_PRETEND, EC_WORD_I_AM, EC_WORD_A, EC_POKEMON_NATIONAL(TAUROS)},
+        .speechLose = {EC_WORD_IF_I_LOSE, EC_WORD_I, EC_WORD_PRETEND, EC_WORD_I_AM, EC_WORD_A, EC_POKEMON_NATIONAL(MILTANK)},
         .monSet = gBattleFrontierTrainerMons_Nikolas
     },
     [FRONTIER_TRAINER_VALERIA] = {
@@ -1212,16 +1212,16 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
         .facilityClass = FACILITY_CLASS_PKMN_RANGER_F,
         .trainerName = _("MEGHAN"),
         .speechBefore = {EC_WORD_SCHOOL, EC_WORD_IS, EC_WORD_OUT, EC_WORD_TIME, EC_WORD_TO, EC_WORD_PLAY},
-        .speechWin = {EC_WORD_MY, EC_WORD_BOY, EC_WORD_FRIEND, EC_WORD_LIKES, EC_WORD_COMICS, 0xFFFF},
-        .speechLose = {EC_WORD_IT_S, EC_WORD_BACK, EC_WORD_TO, EC_WORD_SCHOOL, EC_WORD_SOON, 0xFFFF},
+        .speechWin = {EC_WORD_MY, EC_WORD_BOY, EC_WORD_FRIEND, EC_WORD_LIKES, EC_WORD_COMICS, EC_EMPTY_WORD},
+        .speechLose = {EC_WORD_IT_S, EC_WORD_BACK, EC_WORD_TO, EC_WORD_SCHOOL, EC_WORD_SOON, EC_EMPTY_WORD},
         .monSet = gBattleFrontierTrainerMons_Meghan
     },
     [FRONTIER_TRAINER_ROBERTO] = {
         .facilityClass = FACILITY_CLASS_DRAGON_TAMER,
         .trainerName = _("ROBERTO"),
-        .speechBefore = {EC_WORD_DRAGON, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_INVINCIBLE, EC_WORD_EXCL, 0xFFFF},
+        .speechBefore = {EC_WORD_DRAGON, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_INVINCIBLE, EC_WORD_EXCL, EC_EMPTY_WORD},
         .speechWin = {EC_WORD_YOU, EC_WORD_WEREN_T, EC_WORD_BAD, EC_WORD_I_WAS, EC_WORD_JUST, EC_WORD_BETTER},
-        .speechLose = {EC_WORD_AREN_T, EC_WORD_YOU, EC_WORD_SATISFIED, EC_WORD_YET, EC_WORD_QUES, 0xFFFF},
+        .speechLose = {EC_WORD_AREN_T, EC_WORD_YOU, EC_WORD_SATISFIED, EC_WORD_YET, EC_WORD_QUES, EC_EMPTY_WORD},
         .monSet = gBattleFrontierTrainerMons_Roberto
     },
     [FRONTIER_TRAINER_DAMIAN] = {
@@ -1229,7 +1229,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
         .trainerName = _("DAMIAN"),
         .speechBefore = {EC_WORD_MY, EC_WORD_PURE_POWER, EC_WORD_IS, EC_WORD_MACHINE, EC_WORD_LIKE, EC_WORD_EXCL},
         .speechWin = {EC_WORD_MY, EC_MOVE2(MACH_PUNCH), EC_WORD_WILL, EC_WORD_MAKE, EC_WORD_A, EC_MOVE(BRICK_BREAK)},
-        .speechLose = {EC_WORD_ARRGH, EC_WORD_EXCL, 0xFFFF, EC_WORD_NO, EC_WORD_EXCL_EXCL, 0xFFFF},
+        .speechLose = {EC_WORD_ARRGH, EC_WORD_EXCL, EC_EMPTY_WORD, EC_WORD_NO, EC_WORD_EXCL_EXCL, EC_EMPTY_WORD},
         .monSet = gBattleFrontierTrainerMons_Damian
     },
     [FRONTIER_TRAINER_BRODY] = {
@@ -1243,7 +1243,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
     [FRONTIER_TRAINER_GRAHAM] = {
         .facilityClass = FACILITY_CLASS_DRAGON_TAMER,
         .trainerName = _("GRAHAM"),
-        .speechBefore = {EC_WORD_YEAH, EC_WORD_EXCL, 0xFFFF, EC_WORD_YEAH_YEAH, EC_WORD_EXCL_EXCL, 0xFFFF},
+        .speechBefore = {EC_WORD_YEAH, EC_WORD_EXCL, EC_EMPTY_WORD, EC_WORD_YEAH_YEAH, EC_WORD_EXCL_EXCL, EC_EMPTY_WORD},
         .speechWin = {EC_WORD_WAHAHAHA, EC_WORD_WAHAHAHA, EC_WORD_EXCL, EC_WORD_WAHAHAHA, EC_WORD_WAHAHAHA, EC_WORD_EXCL_EXCL},
         .speechLose = {EC_WORD_I_AM, EC_WORD_SORRY, EC_WORD_ELLIPSIS, EC_WORD_IT_S, EC_WORD_MY, EC_WORD_BAD},
         .monSet = gBattleFrontierTrainerMons_Graham
@@ -1252,23 +1252,23 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
         .facilityClass = FACILITY_CLASS_POKEFAN_M,
         .trainerName = _("TYLOR"),
         .speechBefore = {EC_WORD_ARE, EC_WORD_YOU, EC_WORD_FEELING, EC_WORD_MY, EC_MOVE2(HEAT_WAVE), EC_WORD_QUES},
-        .speechWin = {EC_WORD_YES, EC_WORD_I_AM, EC_WORD_ON, EC_WORD_FIRE, EC_WORD_EXCL, 0xFFFF},
+        .speechWin = {EC_WORD_YES, EC_WORD_I_AM, EC_WORD_ON, EC_WORD_FIRE, EC_WORD_EXCL, EC_EMPTY_WORD},
         .speechLose = {EC_WORD_BUT, EC_WORD_I_WAS, EC_WORD_ON, EC_WORD_FIRE, EC_WORD_FOR, EC_WORD_YOU},
         .monSet = gBattleFrontierTrainerMons_Tylor
     },
     [FRONTIER_TRAINER_JAREN] = {
         .facilityClass = FACILITY_CLASS_POKEFAN_F,
         .trainerName = _("JAREN"),
-        .speechBefore = {EC_WORD_FIGHTING, EC_WORD_SPIRIT, EC_WORD_QUES, EC_WORD_ME, EC_WORD_QUES, 0xFFFF},
-        .speechWin = {EC_WORD_I, EC_WORD_WANT, EC_WORD_MORE, EC_WORD_CUTE, EC_WORD_POKEMON, 0xFFFF},
-        .speechLose = {EC_WORD_YOUR, EC_WORD_POKEMON, EC_WORD_LOOK, EC_WORD_QUITE, EC_WORD_CUTE, 0xFFFF},
+        .speechBefore = {EC_WORD_FIGHTING, EC_WORD_SPIRIT, EC_WORD_QUES, EC_WORD_ME, EC_WORD_QUES, EC_EMPTY_WORD},
+        .speechWin = {EC_WORD_I, EC_WORD_WANT, EC_WORD_MORE, EC_WORD_CUTE, EC_WORD_POKEMON, EC_EMPTY_WORD},
+        .speechLose = {EC_WORD_YOUR, EC_WORD_POKEMON, EC_WORD_LOOK, EC_WORD_QUITE, EC_WORD_CUTE, EC_EMPTY_WORD},
         .monSet = gBattleFrontierTrainerMons_Jaren
     },
     [FRONTIER_TRAINER_CORDELL] = {
         .facilityClass = FACILITY_CLASS_PKMN_BREEDER_M,
         .trainerName = _("CORDELL"),
         .speechBefore = {EC_WORD_A, EC_WORD_BATTLE, EC_WORD_IS, EC_WORD_DECIDED, EC_WORD_ON, EC_WORD_SPIRIT},
-        .speechWin = {EC_WORD_CAN_T, EC_WORD_YOU, EC_WORD_ACCEPT, EC_WORD_THAT, EC_WORD_QUES, 0xFFFF},
+        .speechWin = {EC_WORD_CAN_T, EC_WORD_YOU, EC_WORD_ACCEPT, EC_WORD_THAT, EC_WORD_QUES, EC_EMPTY_WORD},
         .speechLose = {EC_WORD_I, EC_WORD_WILL, EC_WORD_BE, EC_WORD_ON, EC_WORD_MY, EC_WORD_WAY},
         .monSet = gBattleFrontierTrainerMons_Cordell
     },
@@ -1291,7 +1291,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
     [FRONTIER_TRAINER_JOHAN] = {
         .facilityClass = FACILITY_CLASS_YOUNGSTER,
         .trainerName = _("JOHAN"),
-        .speechBefore = {EC_WORD_WINTER, EC_WORD_WILL, EC_WORD_SOON, EC_WORD_BE, EC_WORD_HERE, 0xFFFF},
+        .speechBefore = {EC_WORD_WINTER, EC_WORD_WILL, EC_WORD_SOON, EC_WORD_BE, EC_WORD_HERE, EC_EMPTY_WORD},
         .speechWin = {EC_WORD_MY, EC_WORD_ALLOWANCE, EC_WORD_COULD, EC_WORD_USE, EC_WORD_A, EC_MOVE2(HELPING_HAND)},
         .speechLose = {EC_WORD_I, EC_WORD_ALWAYS, EC_WORD_USE, EC_WORD_MY, EC_WORD_ALLOWANCE, EC_WORD_UP},
         .monSet = gBattleFrontierTrainerMons_Johan
@@ -1315,7 +1315,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
     [FRONTIER_TRAINER_ISIAH] = {
         .facilityClass = FACILITY_CLASS_SCHOOL_KID_M,
         .trainerName = _("ISIAH"),
-        .speechBefore = {EC_WORD_I, EC_WORD_PRETEND, EC_WORD_TO, EC_WORD_STUDY, EC_WORD_A_LOT, 0xFFFF},
+        .speechBefore = {EC_WORD_I, EC_WORD_PRETEND, EC_WORD_TO, EC_WORD_STUDY, EC_WORD_A_LOT, EC_EMPTY_WORD},
         .speechWin = {EC_WORD_I, EC_MOVE2(TRICK), EC_WORD_MOTHER, EC_WORD_FOR, EC_WORD_MY, EC_WORD_ALLOWANCE},
         .speechLose = {EC_WORD_I, EC_WORD_DON_T, EC_WORD_WANT, EC_WORD_TO, EC_WORD_STUDY, EC_WORD_MORE},
         .monSet = gBattleFrontierTrainerMons_Isiah
@@ -1340,14 +1340,14 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
         .facilityClass = FACILITY_CLASS_SCHOOL_KID_F,
         .trainerName = _("MEGAN"),
         .speechBefore = {EC_WORD_I, EC_WORD_BELIEVE, EC_WORD_IN, EC_WORD_AN, EC_MOVE(AROMATHERAPY), EC_WORD_BATH},
-        .speechWin = {EC_WORD_I, EC_WORD_WANT, EC_WORD_A, EC_WORD_HEALTHY, EC_WORD_CLEAR_BODY, 0xFFFF},
+        .speechWin = {EC_WORD_I, EC_WORD_WANT, EC_WORD_A, EC_WORD_HEALTHY, EC_WORD_CLEAR_BODY, EC_EMPTY_WORD},
         .speechLose = {EC_WORD_IF, EC_WORD_ONLY, EC_MOVE(AROMATHERAPY), EC_WORD_WERE, EC_WORD_LESS, EC_WORD_EXPENSIVE},
         .monSet = gBattleFrontierTrainerMons_Megan
     },
     [FRONTIER_TRAINER_ISSAC] = {
         .facilityClass = FACILITY_CLASS_RICH_BOY,
         .trainerName = _("ISSAC"),
-        .speechBefore = {EC_WORD_MY, EC_WORD_HOBBY, EC_WORD_QUES, 0xFFFF, 0xFFFF, 0xFFFF},
+        .speechBefore = {EC_WORD_MY, EC_WORD_HOBBY, EC_WORD_QUES, EC_EMPTY_WORD, EC_EMPTY_WORD, EC_EMPTY_WORD},
         .speechWin = {EC_WORD_I, EC_WORD_LIKE, EC_WORD_ANY, EC_WORD_KIND, EC_WORD_OF, EC_MOVE2(WATER_SPORT)},
         .speechLose = {EC_WORD_I, EC_WORD_DISLIKE, EC_WORD_ANY, EC_WORD_KIND, EC_WORD_OF, EC_MOVE2(MUD_SPORT)},
         .monSet = gBattleFrontierTrainerMons_Issac
@@ -1355,8 +1355,8 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
     [FRONTIER_TRAINER_QUINTON] = {
         .facilityClass = FACILITY_CLASS_RICH_BOY,
         .trainerName = _("QUINTON"),
-        .speechBefore = {EC_WORD_I_AM, EC_WORD_SAD, EC_WORD_CAUSE, EC_WORD_I_AM, EC_WORD_TOO_WEAK, 0xFFFF},
-        .speechWin = {EC_WORD_YOU, EC_WORD_AREN_T, EC_WORD_TOO_STRONG, EC_WORD_FOR, EC_WORD_ME, 0xFFFF},
+        .speechBefore = {EC_WORD_I_AM, EC_WORD_SAD, EC_WORD_CAUSE, EC_WORD_I_AM, EC_WORD_TOO_WEAK, EC_EMPTY_WORD},
+        .speechWin = {EC_WORD_YOU, EC_WORD_AREN_T, EC_WORD_TOO_STRONG, EC_WORD_FOR, EC_WORD_ME, EC_EMPTY_WORD},
         .speechLose = {EC_WORD_HEY, EC_WORD_WHAT, EC_WORD_DID, EC_WORD_I, EC_WORD_DO, EC_WORD_QUES},
         .monSet = gBattleFrontierTrainerMons_Quinton
     },
@@ -1372,7 +1372,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
         .facilityClass = FACILITY_CLASS_LADY,
         .trainerName = _("ANSLEY"),
         .speechBefore = {EC_WORD_I_AM, EC_WORD_BORED, EC_WORD_ELLIPSIS, EC_WORD_DANCE, EC_WORD_FOR, EC_WORD_ME},
-        .speechWin = {EC_WORD_YOU_VE, EC_WORD_BORED, EC_WORD_ME, EC_WORD_SOME, EC_WORD_MORE, 0xFFFF},
+        .speechWin = {EC_WORD_YOU_VE, EC_WORD_BORED, EC_WORD_ME, EC_WORD_SOME, EC_WORD_MORE, EC_EMPTY_WORD},
         .speechLose = {EC_WORD_TAKE, EC_WORD_YOUR, EC_MOVE2(FRUSTRATION), EC_WORD_SOME, EC_WORD_OTHER, EC_WORD_PLACE},
         .monSet = gBattleFrontierTrainerMons_Ansley
     },
@@ -1380,8 +1380,8 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
         .facilityClass = FACILITY_CLASS_BUG_CATCHER,
         .trainerName = _("HOLDEN"),
         .speechBefore = {EC_WORD_LET_S, EC_WORD_COMMEMORATE, EC_WORD_MY, EC_WORD_COOLNESS, EC_WORD_IN, EC_WORD_BATTLE},
-        .speechWin = {EC_WORD_YOU_RE, EC_WORD_TOO_WEAK, EC_WORD_FOR, EC_WORD_ANY, EC_WORD_PRAISE, 0xFFFF},
-        .speechLose = {EC_WORD_YOUR, EC_WORD_BATTLE, EC_WORD_SENSE, EC_WORD_IS, EC_WORD_AMUSING, 0xFFFF},
+        .speechWin = {EC_WORD_YOU_RE, EC_WORD_TOO_WEAK, EC_WORD_FOR, EC_WORD_ANY, EC_WORD_PRAISE, EC_EMPTY_WORD},
+        .speechLose = {EC_WORD_YOUR, EC_WORD_BATTLE, EC_WORD_SENSE, EC_WORD_IS, EC_WORD_AMUSING, EC_EMPTY_WORD},
         .monSet = gBattleFrontierTrainerMons_Holden
     },
     [FRONTIER_TRAINER_LUCA] = {
@@ -1396,14 +1396,14 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
         .facilityClass = FACILITY_CLASS_NINJA_BOY,
         .trainerName = _("JAMISON"),
         .speechBefore = {EC_WORD_MY, EC_MOVE2(SECRET_POWER), EC_WORD_IS, EC_WORD_OVERWHELMING, EC_WORD_TO, EC_WORD_POKEMON},
-        .speechWin = {EC_WORD_DID, EC_WORD_YOU, EC_WORD_SEE, EC_WORD_THAT, EC_WORD_QUES, 0xFFFF},
+        .speechWin = {EC_WORD_DID, EC_WORD_YOU, EC_WORD_SEE, EC_WORD_THAT, EC_WORD_QUES, EC_EMPTY_WORD},
         .speechLose = {EC_WORD_I, EC_WORD_WILL, EC_WORD_USE, EC_MOVE(SMOKESCREEN), EC_WORD_TO, EC_WORD_ESCAPE},
         .monSet = gBattleFrontierTrainerMons_Jamison
     },
     [FRONTIER_TRAINER_GUNNAR] = {
         .facilityClass = FACILITY_CLASS_NINJA_BOY,
         .trainerName = _("GUNNAR"),
-        .speechBefore = {EC_WORD_I, EC_MOVE(CUT), EC_WORD_DOWN, EC_WORD_EVERY, EC_WORD_OPPONENT, 0xFFFF},
+        .speechBefore = {EC_WORD_I, EC_MOVE(CUT), EC_WORD_DOWN, EC_WORD_EVERY, EC_WORD_OPPONENT, EC_EMPTY_WORD},
         .speechWin = {EC_WORD_DON_T, EC_MOVE(GRUDGE), EC_WORD_ME, EC_WORD_FOR, EC_WORD_YOUR, EC_WORD_LOSS},
         .speechLose = {EC_WORD_PLEASE, EC_WORD_LOSE, EC_WORD_THAT, EC_MOVE(SCARY_FACE), EC_WORD_OF, EC_WORD_YOURS},
         .monSet = gBattleFrontierTrainerMons_Gunnar
@@ -1413,22 +1413,22 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
         .trainerName = _("CRAIG"),
         .speechBefore = {EC_WORD_I, EC_WORD_CAN_T, EC_WORD_WAIT, EC_WORD_FOR, EC_WORD_MY, EC_WORD_TRAIN},
         .speechWin = {EC_WORD_MY, EC_WORD_TRAIN, EC_WORD_ISN_T, EC_WORD_HERE, EC_WORD_YET, EC_WORD_ELLIPSIS},
-        .speechLose = {EC_WORD_HERE_IT_IS, EC_WORD_MY, EC_WORD_TRAIN, EC_WORD_SEE_YA, EC_WORD_EXCL, 0xFFFF},
+        .speechLose = {EC_WORD_HERE_IT_IS, EC_WORD_MY, EC_WORD_TRAIN, EC_WORD_SEE_YA, EC_WORD_EXCL, EC_EMPTY_WORD},
         .monSet = gBattleFrontierTrainerMons_Craig
     },
     [FRONTIER_TRAINER_PIERCE] = {
         .facilityClass = FACILITY_CLASS_TUBER_M,
         .trainerName = _("PIERCE"),
         .speechBefore = {EC_WORD_THERE, EC_WORD_WAS, EC_WORD_A, EC_MOVE2(HEAT_WAVE), EC_WORD_LAST, EC_WORD_WEEK},
-        .speechWin = {EC_WORD_I, EC_WORD_CAN_T, EC_WORD_TAKE, EC_WORD_A, EC_MOVE2(HEAT_WAVE), 0xFFFF},
-        .speechLose = {EC_WORD_DIDN_T, EC_WORD_IT, EC_MOVE(HAIL), EC_WORD_TOO, EC_WORD_QUES, 0xFFFF},
+        .speechWin = {EC_WORD_I, EC_WORD_CAN_T, EC_WORD_TAKE, EC_WORD_A, EC_MOVE2(HEAT_WAVE), EC_EMPTY_WORD},
+        .speechLose = {EC_WORD_DIDN_T, EC_WORD_IT, EC_MOVE(HAIL), EC_WORD_TOO, EC_WORD_QUES, EC_EMPTY_WORD},
         .monSet = gBattleFrontierTrainerMons_Pierce
     },
     [FRONTIER_TRAINER_REGINA] = {
         .facilityClass = FACILITY_CLASS_TUBER_F,
         .trainerName = _("REGINA"),
         .speechBefore = {EC_WORD_I, EC_WORD_LIKE, EC_WORD_TO, EC_WORD_PLAY, EC_WORD_IN, EC_WORD_WATER},
-        .speechWin = {EC_WORD_I, EC_WORD_REFUSE, EC_WORD_TO, EC_WORD_COME, EC_WORD_OUT, 0xFFFF},
+        .speechWin = {EC_WORD_I, EC_WORD_REFUSE, EC_WORD_TO, EC_WORD_COME, EC_WORD_OUT, EC_EMPTY_WORD},
         .speechLose = {EC_WORD_YOU_RE, EC_WORD_NOT, EC_WORD_MUCH, EC_WORD_GOOD, EC_WORD_IN, EC_WORD_WATER},
         .monSet = gBattleFrontierTrainerMons_Regina
     },
@@ -1469,7 +1469,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
         .trainerName = _("HUNTER"),
         .speechBefore = {EC_WORD_SHOW, EC_WORD_ME, EC_WORD_A, EC_WORD_TOTALLY, EC_WORD_COOL, EC_MOVE(CROSS_CHOP)},
         .speechWin = {EC_WORD_YOU_RE, EC_WORD_TOO_WEAK, EC_WORD_TO, EC_WORD_DO, EC_WORD_A, EC_MOVE(CROSS_CHOP)},
-        .speechLose = {EC_WORD_WAS, EC_WORD_IT, EC_WORD_A, EC_WORD_MISTAKE, EC_WORD_QUES, 0xFFFF},
+        .speechLose = {EC_WORD_WAS, EC_WORD_IT, EC_WORD_A, EC_WORD_MISTAKE, EC_WORD_QUES, EC_EMPTY_WORD},
         .monSet = gBattleFrontierTrainerMons_Hunter
     },
     [FRONTIER_TRAINER_AIDEN] = {
@@ -1483,9 +1483,9 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
     [FRONTIER_TRAINER_XAVIER] = {
         .facilityClass = FACILITY_CLASS_RUIN_MANIAC,
         .trainerName = _("XAVIER"),
-        .speechBefore = {EC_WORD_HEY_THERE, EC_WORD_EXCL, 0xFFFF, EC_WORD_LOOK, EC_WORD_LOOK, EC_WORD_EXCL_EXCL},
-        .speechWin = {EC_WORD_GOOD_BYE, EC_WORD_AND, EC_WORD_THANK_YOU, EC_WORD_THAT_WAS, EC_WORD_FUNNY, 0xFFFF},
-        .speechLose = {EC_WORD_WOWEE, EC_WORD_EXCL, 0xFFFF, EC_WORD_NO, EC_WORD_NO, EC_WORD_EXCL_EXCL},
+        .speechBefore = {EC_WORD_HEY_THERE, EC_WORD_EXCL, EC_EMPTY_WORD, EC_WORD_LOOK, EC_WORD_LOOK, EC_WORD_EXCL_EXCL},
+        .speechWin = {EC_WORD_GOOD_BYE, EC_WORD_AND, EC_WORD_THANK_YOU, EC_WORD_THAT_WAS, EC_WORD_FUNNY, EC_EMPTY_WORD},
+        .speechLose = {EC_WORD_WOWEE, EC_WORD_EXCL, EC_EMPTY_WORD, EC_WORD_NO, EC_WORD_NO, EC_WORD_EXCL_EXCL},
         .monSet = gBattleFrontierTrainerMons_Xavier
     },
     [FRONTIER_TRAINER_CLINTON] = {
@@ -1493,7 +1493,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
         .trainerName = _("CLINTON"),
         .speechBefore = {EC_WORD_WANT, EC_WORD_TO, EC_WORD_SEE, EC_WORD_MY, EC_MOVE(HYPNOSIS), EC_WORD_QUES},
         .speechWin = {EC_WORD_YOUR, EC_MOVE2(FURY_SWIPES), EC_WORD_YOUR, EC_MOVE(STRENGTH), EC_WORD_YOUNG, EC_WORD_TRAINER},
-        .speechLose = {EC_WORD_TCH, EC_WORD_ELLIPSIS, 0xFFFF, EC_WORD_I_AM, EC_WORD_TOO_WEAK, EC_WORD_ELLIPSIS},
+        .speechLose = {EC_WORD_TCH, EC_WORD_ELLIPSIS, EC_EMPTY_WORD, EC_WORD_I_AM, EC_WORD_TOO_WEAK, EC_WORD_ELLIPSIS},
         .monSet = gBattleFrontierTrainerMons_Clinton
     },
     [FRONTIER_TRAINER_JESSE] = {
@@ -1501,7 +1501,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
         .trainerName = _("JESSE"),
         .speechBefore = {EC_WORD_THIS, EC_WORD_BATTLE, EC_WORD_IS, EC_WORD_FOR, EC_WORD_MY, EC_WORD_MOTHER},
         .speechWin = {EC_WORD_MOTHER, EC_WORD_WILL, EC_WORD_BE, EC_WORD_HAPPY, EC_WORD_FOR, EC_WORD_ME},
-        .speechLose = {EC_WORD_I, EC_WORD_WANT, EC_WORD_MY, EC_WORD_MOTHER, EC_WORD_EXCL, 0xFFFF},
+        .speechLose = {EC_WORD_I, EC_WORD_WANT, EC_WORD_MY, EC_WORD_MOTHER, EC_WORD_EXCL, EC_EMPTY_WORD},
         .monSet = gBattleFrontierTrainerMons_Jesse
     },
     [FRONTIER_TRAINER_EDUARDO] = {
@@ -1515,7 +1515,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
     [FRONTIER_TRAINER_HAL] = {
         .facilityClass = FACILITY_CLASS_GUITARIST,
         .trainerName = _("HAL"),
-        .speechBefore = {EC_WORD_I_AM, EC_WORD_TRENDY, EC_WORD_AREN_T, EC_WORD_I, EC_WORD_QUES, 0xFFFF},
+        .speechBefore = {EC_WORD_I_AM, EC_WORD_TRENDY, EC_WORD_AREN_T, EC_WORD_I, EC_WORD_QUES, EC_EMPTY_WORD},
         .speechWin = {EC_WORD_I_AM, EC_WORD_FEELING, EC_WORD_HIP_AND, EC_WORD_HAPPENING, EC_WORD_OH_YEAH, EC_WORD_EXCL},
         .speechLose = {EC_WORD_I_AM, EC_WORD_ALWAYS, EC_WORD_TRENDY, EC_WORD_THANK_YOU, EC_WORD_VERY, EC_WORD_MUCH},
         .monSet = gBattleFrontierTrainerMons_Hal
@@ -1525,7 +1525,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
         .trainerName = _("GAGE"),
         .speechBefore = {EC_WORD_HERE_IT_IS, EC_WORD_A, EC_WORD_FLYING, EC_WORD_TYPE, EC_WORD_HIDDEN, EC_WORD_MOVE},
         .speechWin = {EC_WORD_IT_S, EC_WORD_A, EC_WORD_FLYING, EC_WORD_TYPE, EC_WORD_VICTORY, EC_WORD_EXCL},
-        .speechLose = {EC_WORD_IF_I_LOSE, EC_WORD_I, EC_WORD_JUST, EC_MOVE(FLY), EC_WORD_AWAY, 0xFFFF},
+        .speechLose = {EC_WORD_IF_I_LOSE, EC_WORD_I, EC_WORD_JUST, EC_MOVE(FLY), EC_WORD_AWAY, EC_EMPTY_WORD},
         .monSet = gBattleFrontierTrainerMons_Gage
     },
     [FRONTIER_TRAINER_ARNOLD] = {
@@ -1563,8 +1563,8 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
     [FRONTIER_TRAINER_GUSTAVO] = {
         .facilityClass = FACILITY_CLASS_HIKER,
         .trainerName = _("GUSTAVO"),
-        .speechBefore = {EC_MOVE(CHARGE), EC_WORD_EXCL, 0xFFFF, EC_MOVE(CHARGE), EC_WORD_EXCL_EXCL, 0xFFFF},
-        .speechWin = {EC_WORD_SURRENDER, EC_WORD_QUES, 0xFFFF, EC_WORD_SO, EC_WORD_SOON, EC_WORD_QUES},
+        .speechBefore = {EC_MOVE(CHARGE), EC_WORD_EXCL, EC_EMPTY_WORD, EC_MOVE(CHARGE), EC_WORD_EXCL_EXCL, EC_EMPTY_WORD},
+        .speechWin = {EC_WORD_SURRENDER, EC_WORD_QUES, EC_EMPTY_WORD, EC_WORD_SO, EC_WORD_SOON, EC_WORD_QUES},
         .speechLose = {EC_WORD_YOU, EC_WORD_CAN_T, EC_WORD_MAKE, EC_WORD_ME, EC_WORD_SURRENDER, EC_WORD_YET},
         .monSet = gBattleFrontierTrainerMons_Gustavo
     },
@@ -1581,7 +1581,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
         .trainerName = _("ALFREDO"),
         .speechBefore = {EC_WORD_A, EC_WORD_FIERY, EC_WORD_GOURMET, EC_WORD_AM, EC_WORD_I, EC_WORD_EXCL},
         .speechWin = {EC_WORD_IT_S, EC_WORD_A, EC_WORD_TASTY, EC_WORD_GOURMET, EC_WORD_VICTORY, EC_WORD_EXCL},
-        .speechLose = {EC_WORD_WHAT, EC_WORD_A, EC_WORD_DISASTER, EC_WORD_THAT_WAS, EC_WORD_EXCL, 0xFFFF},
+        .speechLose = {EC_WORD_WHAT, EC_WORD_A, EC_WORD_DISASTER, EC_WORD_THAT_WAS, EC_WORD_EXCL, EC_EMPTY_WORD},
         .monSet = gBattleFrontierTrainerMons_Alfredo
     },
     [FRONTIER_TRAINER_RUBEN] = {
@@ -1589,15 +1589,15 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
         .trainerName = _("RUBEN"),
         .speechBefore = {EC_WORD_I, EC_WORD_CAN_T, EC_WORD_WAIT, EC_WORD_TO, EC_WORD_GET, EC_WORD_GOING},
         .speechWin = {EC_WORD_GET, EC_WORD_GOING, EC_WORD_EXCL, EC_WORD_THIS, EC_WORD_IS, EC_WORD_GOOD_BYE},
-        .speechLose = {EC_WORD_I_VE, EC_WORD_GOT, EC_WORD_TO, EC_WORD_GET, EC_WORD_GOING, 0xFFFF},
+        .speechLose = {EC_WORD_I_VE, EC_WORD_GOT, EC_WORD_TO, EC_WORD_GET, EC_WORD_GOING, EC_EMPTY_WORD},
         .monSet = gBattleFrontierTrainerMons_Ruben
     },
     [FRONTIER_TRAINER_LAMAR] = {
         .facilityClass = FACILITY_CLASS_GENTLEMAN,
         .trainerName = _("LAMAR"),
-        .speechBefore = {EC_WORD_A, EC_MOVE2(PRESENT), EC_WORD_FOR, EC_WORD_ME, EC_WORD_QUES, 0xFFFF},
+        .speechBefore = {EC_WORD_A, EC_MOVE2(PRESENT), EC_WORD_FOR, EC_WORD_ME, EC_WORD_QUES, EC_EMPTY_WORD},
         .speechWin = {EC_WORD_MMM, EC_WORD_THIS, EC_WORD_IS, EC_WORD_QUITE, EC_WORD_TASTY, EC_WORD_ELLIPSIS},
-        .speechLose = {EC_WORD_OH, EC_WORD_IT_S, EC_WORD_A, EC_WORD_GAME, EC_WORD_IS_IT_QUES, 0xFFFF},
+        .speechLose = {EC_WORD_OH, EC_WORD_IT_S, EC_WORD_A, EC_WORD_GAME, EC_WORD_IS_IT_QUES, EC_EMPTY_WORD},
         .monSet = gBattleFrontierTrainerMons_Lamar
     },
     [FRONTIER_TRAINER_JAXON] = {
@@ -1645,14 +1645,14 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
         .trainerName = _("SKYLER"),
         .speechBefore = {EC_MOVE2(INGRAIN), EC_WORD_IS, EC_WORD_MY, EC_WORD_CHOICE, EC_WORD_BATTLE, EC_WORD_MOVE},
         .speechWin = {EC_WORD_YOU, EC_WORD_CAN_T, EC_WORD_MOVE, EC_WORD_ME, EC_WORD_NOW, EC_WORD_EXCL},
-        .speechLose = {EC_WORD_YOU, EC_MOVE(CUT), EC_WORD_ME, EC_WORD_DOWN, EC_WORD_ELLIPSIS, 0xFFFF},
+        .speechLose = {EC_WORD_YOU, EC_MOVE(CUT), EC_WORD_ME, EC_WORD_DOWN, EC_WORD_ELLIPSIS, EC_EMPTY_WORD},
         .monSet = gBattleFrontierTrainerMons_Skyler
     },
     [FRONTIER_TRAINER_RUTH] = {
         .facilityClass = FACILITY_CLASS_PICNICKER,
         .trainerName = _("RUTH"),
         .speechBefore = {EC_WORD_I, EC_WORD_WANT, EC_WORD_TO, EC_WORD_ENJOY, EC_WORD_THIS, EC_WORD_BATTLE},
-        .speechWin = {EC_WORD_THAT_WAS, EC_WORD_MUCH, EC_WORD_TOO, EC_WORD_EASY, EC_WORD_EXCL, 0xFFFF},
+        .speechWin = {EC_WORD_THAT_WAS, EC_WORD_MUCH, EC_WORD_TOO, EC_WORD_EASY, EC_WORD_EXCL, EC_EMPTY_WORD},
         .speechLose = {EC_WORD_PLEASE, EC_WORD_STOP, EC_WORD_I, EC_WORD_DON_T, EC_WORD_ENJOY, EC_WORD_THIS},
         .monSet = gBattleFrontierTrainerMons_Ruth
     },
@@ -1669,7 +1669,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
         .trainerName = _("PEDRO"),
         .speechBefore = {EC_WORD_A, EC_WORD_SWIFT_SWIM, EC_WORD_WILL, EC_WORD_DO, EC_WORD_YOU, EC_WORD_GOOD},
         .speechWin = {EC_WORD_THAT_S, EC_WORD_HOW, EC_WORD_I, EC_WORD_SINK, EC_WORD_AN, EC_WORD_OPPONENT},
-        .speechLose = {EC_WORD_UH_OH, EC_WORD_EXCL, 0xFFFF, EC_WORD_A, EC_MOVE(WHIRLPOOL), EC_WORD_EXCL},
+        .speechLose = {EC_WORD_UH_OH, EC_WORD_EXCL, EC_EMPTY_WORD, EC_WORD_A, EC_MOVE(WHIRLPOOL), EC_WORD_EXCL},
         .monSet = gBattleFrontierTrainerMons_Pedro
     },
     [FRONTIER_TRAINER_ERICK] = {
@@ -1693,7 +1693,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
         .trainerName = _("JOYCE"),
         .speechBefore = {EC_WORD_YOU, EC_WORD_MAKE, EC_WORD_ME, EC_WORD_GO, EC_WORD_AHAHA, EC_WORD_EXCL},
         .speechWin = {EC_WORD_LALALA, EC_WORD_NO, EC_WORD_LOSING, EC_WORD_FOR, EC_WORD_ME, EC_WORD_EXCL},
-        .speechLose = {EC_WORD_LALALA, EC_WORD_ELLIPSIS, 0xFFFF, EC_WORD_HUH_QUES, 0xFFFF, 0xFFFF},
+        .speechLose = {EC_WORD_LALALA, EC_WORD_ELLIPSIS, EC_EMPTY_WORD, EC_WORD_HUH_QUES, EC_EMPTY_WORD, EC_EMPTY_WORD},
         .monSet = gBattleFrontierTrainerMons_Joyce
     },
     [FRONTIER_TRAINER_TODD] = {
@@ -1707,8 +1707,8 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
     [FRONTIER_TRAINER_GAVIN] = {
         .facilityClass = FACILITY_CLASS_POKEFAN_M,
         .trainerName = _("GAVIN"),
-        .speechBefore = {EC_WORD_I, EC_WORD_WILL, EC_MOVE(BIDE), EC_WORD_MY, EC_WORD_TIME, 0xFFFF},
-        .speechWin = {EC_WORD_IT_S, EC_WORD_OVER, EC_WORD_SO, EC_WORD_SOON, EC_WORD_QUES, 0xFFFF},
+        .speechBefore = {EC_WORD_I, EC_WORD_WILL, EC_MOVE(BIDE), EC_WORD_MY, EC_WORD_TIME, EC_EMPTY_WORD},
+        .speechWin = {EC_WORD_IT_S, EC_WORD_OVER, EC_WORD_SO, EC_WORD_SOON, EC_WORD_QUES, EC_EMPTY_WORD},
         .speechLose = {EC_WORD_MY, EC_WORD_MISTAKE, EC_WORD_WAS, EC_WORD_TOO, EC_WORD_EXPENSIVE, EC_WORD_ELLIPSIS},
         .monSet = gBattleFrontierTrainerMons_Gavin
     },
@@ -1716,7 +1716,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
         .facilityClass = FACILITY_CLASS_POKEFAN_F,
         .trainerName = _("MALORY"),
         .speechBefore = {EC_WORD_PROMISE, EC_WORD_TO, EC_WORD_SHOW, EC_WORD_ME, EC_WORD_CUTE, EC_WORD_POKEMON},
-        .speechWin = {EC_WORD_GIGGLE, EC_WORD_ELLIPSIS, 0xFFFF, EC_WORD_THANK_YOU, EC_WORD_SO, EC_WORD_MUCH},
+        .speechWin = {EC_WORD_GIGGLE, EC_WORD_ELLIPSIS, EC_EMPTY_WORD, EC_WORD_THANK_YOU, EC_WORD_SO, EC_WORD_MUCH},
         .speechLose = {EC_WORD_TCH, EC_WORD_YOUR, EC_WORD_POKEMON, EC_WORD_AREN_T, EC_WORD_VERY, EC_WORD_NICE},
         .monSet = gBattleFrontierTrainerMons_Malory
     },
@@ -1733,7 +1733,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
         .trainerName = _("OSCAR"),
         .speechBefore = {EC_WORD_LET_S, EC_WORD_SEE, EC_WORD_YOUR, EC_WORD_POWER, EC_WORD_IN, EC_WORD_FULL},
         .speechWin = {EC_WORD_THAT_WAS, EC_WORD_NOT, EC_WORD_YOUR, EC_WORD_FULL, EC_WORD_POWER, EC_WORD_EXCL},
-        .speechLose = {EC_WORD_NOT, EC_WORD_FUNNY, EC_WORD_ELLIPSIS, EC_WORD_YOU_RE, EC_WORD_TOO_STRONG, 0xFFFF},
+        .speechLose = {EC_WORD_NOT, EC_WORD_FUNNY, EC_WORD_ELLIPSIS, EC_WORD_YOU_RE, EC_WORD_TOO_STRONG, EC_EMPTY_WORD},
         .monSet = gBattleFrontierTrainerMons_Oscar
     },
     [FRONTIER_TRAINER_WILSON] = {
@@ -1772,8 +1772,8 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
         .facilityClass = FACILITY_CLASS_COOLTRAINER_M,
         .trainerName = _("ALONZO"),
         .speechBefore = {EC_WORD_I_VE, EC_WORD_NOT, EC_WORD_LOST, EC_WORD_ONCE, EC_WORD_YET, EC_WORD_EXCL},
-        .speechWin = {EC_WORD_YOUR, EC_WORD_SAD, EC_WORD_LOOK, EC_WORD_BECOMES, EC_WORD_YOU, 0xFFFF},
-        .speechLose = {EC_WORD_I, EC_WORD_DON_T, EC_WORD_BELIEVE, EC_WORD_THIS, EC_WORD_ELLIPSIS, 0xFFFF},
+        .speechWin = {EC_WORD_YOUR, EC_WORD_SAD, EC_WORD_LOOK, EC_WORD_BECOMES, EC_WORD_YOU, EC_EMPTY_WORD},
+        .speechLose = {EC_WORD_I, EC_WORD_DON_T, EC_WORD_BELIEVE, EC_WORD_THIS, EC_WORD_ELLIPSIS, EC_EMPTY_WORD},
         .monSet = gBattleFrontierTrainerMons_Alonzo
     },
     [FRONTIER_TRAINER_VINCE] = {
@@ -1812,7 +1812,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
         .facilityClass = FACILITY_CLASS_COOLTRAINER_F,
         .trainerName = _("CARRIE"),
         .speechBefore = {EC_WORD_I, EC_WORD_WILL, EC_WORD_SHOW, EC_WORD_YOU, EC_WORD_GUTSY, EC_WORD_EXCL},
-        .speechWin = {EC_WORD_IT_S, EC_WORD_ALL, EC_WORD_ABOUT, EC_WORD_GUTS, EC_WORD_EXCL, 0xFFFF},
+        .speechWin = {EC_WORD_IT_S, EC_WORD_ALL, EC_WORD_ABOUT, EC_WORD_GUTS, EC_WORD_EXCL, EC_EMPTY_WORD},
         .speechLose = {EC_WORD_OH, EC_WORD_NO, EC_WORD_ELLIPSIS, EC_MOVE(SELF_DESTRUCT), EC_WORD_MODE, EC_WORD_EXCL},
         .monSet = gBattleFrontierTrainerMons_Carrie
     },
@@ -1827,9 +1827,9 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
     [FRONTIER_TRAINER_TYLER] = {
         .facilityClass = FACILITY_CLASS_PKMN_RANGER_M,
         .trainerName = _("TYLER"),
-        .speechBefore = {EC_WORD_YO, EC_WORD_EXCL, 0xFFFF, EC_WORD_LET_S, EC_WORD_GO, EC_WORD_EXCL_EXCL},
-        .speechWin = {EC_WORD_YO, EC_WORD_EXCL, 0xFFFF, EC_WORD_I, EC_WORD_WON, EC_WORD_YO},
-        .speechLose = {EC_WORD_YO, EC_WORD_EXCL, 0xFFFF, EC_WORD_I, EC_WORD_LOST, EC_WORD_YO},
+        .speechBefore = {EC_WORD_YO, EC_WORD_EXCL, EC_EMPTY_WORD, EC_WORD_LET_S, EC_WORD_GO, EC_WORD_EXCL_EXCL},
+        .speechWin = {EC_WORD_YO, EC_WORD_EXCL, EC_EMPTY_WORD, EC_WORD_I, EC_WORD_WON, EC_WORD_YO},
+        .speechLose = {EC_WORD_YO, EC_WORD_EXCL, EC_EMPTY_WORD, EC_WORD_I, EC_WORD_LOST, EC_WORD_YO},
         .monSet = gBattleFrontierTrainerMons_Tyler
     },
     [FRONTIER_TRAINER_CHAZ] = {
@@ -1867,7 +1867,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
     [FRONTIER_TRAINER_DORINE] = {
         .facilityClass = FACILITY_CLASS_PKMN_RANGER_F,
         .trainerName = _("DORINE"),
-        .speechBefore = {EC_WORD_I_AM, EC_WORD_YOUNG, EC_WORD_AND, EC_WORD_STRONG, EC_WORD_EXCL, 0xFFFF},
+        .speechBefore = {EC_WORD_I_AM, EC_WORD_YOUNG, EC_WORD_AND, EC_WORD_STRONG, EC_WORD_EXCL, EC_EMPTY_WORD},
         .speechWin = {EC_WORD_SEE, EC_WORD_QUES, EC_WORD_AREN_T, EC_WORD_I, EC_WORD_GOOD, EC_WORD_QUES},
         .speechLose = {EC_WORD_THIS, EC_WORD_ISN_T, EC_WORD_WORKING, EC_WORD_OUT, EC_WORD_AT, EC_WORD_ALL},
         .monSet = gBattleFrontierTrainerMons_Dorine
@@ -1883,9 +1883,9 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
     [FRONTIER_TRAINER_DAVIN] = {
         .facilityClass = FACILITY_CLASS_DRAGON_TAMER,
         .trainerName = _("DAVIN"),
-        .speechBefore = {EC_WORD_LET_S, EC_WORD_HEAR, EC_WORD_YOU, EC_MOVE2(ROAR), EC_WORD_EXCL, 0xFFFF},
-        .speechWin = {EC_WORD_WROOOAAR_EXCL, 0xFFFF, 0xFFFF, EC_WORD_VICTORY, EC_WORD_EXCL_EXCL, 0xFFFF},
-        .speechLose = {EC_WORD_WROOOAAR_EXCL, 0xFFFF, 0xFFFF, EC_WORD_WHY, EC_WORD_QUES_EXCL, 0xFFFF},
+        .speechBefore = {EC_WORD_LET_S, EC_WORD_HEAR, EC_WORD_YOU, EC_MOVE2(ROAR), EC_WORD_EXCL, EC_EMPTY_WORD},
+        .speechWin = {EC_WORD_WROOOAAR_EXCL, EC_EMPTY_WORD, EC_EMPTY_WORD, EC_WORD_VICTORY, EC_WORD_EXCL_EXCL, EC_EMPTY_WORD},
+        .speechLose = {EC_WORD_WROOOAAR_EXCL, EC_EMPTY_WORD, EC_EMPTY_WORD, EC_WORD_WHY, EC_WORD_QUES_EXCL, EC_EMPTY_WORD},
         .monSet = gBattleFrontierTrainerMons_Davin
     },
     [FRONTIER_TRAINER_TREVON] = {
@@ -1915,7 +1915,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
     [FRONTIER_TRAINER_RAUL] = {
         .facilityClass = FACILITY_CLASS_BLACK_BELT,
         .trainerName = _("RAUL"),
-        .speechBefore = {EC_WORD_I, EC_WORD_REJECT, EC_WORD_EVERY, EC_WORD_WEAK, EC_WORD_TRAINER, 0xFFFF},
+        .speechBefore = {EC_WORD_I, EC_WORD_REJECT, EC_WORD_EVERY, EC_WORD_WEAK, EC_WORD_TRAINER, EC_EMPTY_WORD},
         .speechWin = {EC_WORD_HUMPH, EC_WORD_EXCL, EC_WORD_ANOTHER, EC_WORD_WEAK, EC_WORD_TRAINER, EC_WORD_ELLIPSIS},
         .speechLose = {EC_WORD_THERE, EC_WORD_IS, EC_WORD_NOTHING, EC_WORD_WEAK, EC_WORD_ABOUT, EC_WORD_YOU},
         .monSet = gBattleFrontierTrainerMons_Raul
@@ -1923,7 +1923,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
     [FRONTIER_TRAINER_KAY] = {
         .facilityClass = FACILITY_CLASS_BATTLE_GIRL,
         .trainerName = _("KAY"),
-        .speechBefore = {EC_WORD_AND, EC_WORD_YET, EC_WORD_ANOTHER, EC_WORD_BATTLE, EC_WORD_QUES, 0xFFFF},
+        .speechBefore = {EC_WORD_AND, EC_WORD_YET, EC_WORD_ANOTHER, EC_WORD_BATTLE, EC_WORD_QUES, EC_EMPTY_WORD},
         .speechWin = {EC_WORD_I, EC_WORD_WON, EC_WORD_BUT, EC_WORD_I_AM, EC_WORD_TIRED, EC_WORD_ELLIPSIS},
         .speechLose = {EC_WORD_GOOD, EC_WORD_IT_S, EC_WORD_OVER, EC_WORD_AT, EC_WORD_LAST, EC_WORD_ELLIPSIS},
         .monSet = gBattleFrontierTrainerMons_Kay
@@ -1940,7 +1940,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
         .facilityClass = FACILITY_CLASS_BATTLE_GIRL,
         .trainerName = _("ALANA"),
         .speechBefore = {EC_WORD_EAT, EC_WORD_MY, EC_WORD_INVINCIBLE, EC_WORD_ATTACK, EC_WORD_YOU, EC_WORD_EXCL},
-        .speechWin = {EC_WORD_YOU, EC_WORD_HAVE, EC_WORD_MUCH, EC_WORD_TO, EC_WORD_LEARN, 0xFFFF},
+        .speechWin = {EC_WORD_YOU, EC_WORD_HAVE, EC_WORD_MUCH, EC_WORD_TO, EC_WORD_LEARN, EC_EMPTY_WORD},
         .speechLose = {EC_WORD_SO, EC_WORD_MUCH, EC_WORD_FOR, EC_WORD_MY, EC_WORD_INVINCIBLE, EC_WORD_ATTACK},
         .monSet = gBattleFrontierTrainerMons_Alana
     },
@@ -1948,7 +1948,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
         .facilityClass = FACILITY_CLASS_EXPERT_M,
         .trainerName = _("ALEXAS"),
         .speechBefore = {EC_WORD_GOOD, EC_WORD_TO, EC_WORD_MEET_YOU, EC_WORD_YOUNG, EC_WORD_TRAINER, EC_WORD_EXCL},
-        .speechWin = {EC_WORD_WAHAHAHA, EC_WORD_EXCL, 0xFFFF, EC_WORD_GIVE, EC_WORD_IT, EC_WORD_UP},
+        .speechWin = {EC_WORD_WAHAHAHA, EC_WORD_EXCL, EC_EMPTY_WORD, EC_WORD_GIVE, EC_WORD_IT, EC_WORD_UP},
         .speechLose = {EC_WORD_YOU, EC_WORD_ARE, EC_WORD_A, EC_WORD_STRONG, EC_WORD_TRAINER, EC_WORD_KID},
         .monSet = gBattleFrontierTrainerMons_Alexas
     },
@@ -1964,7 +1964,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
         .facilityClass = FACILITY_CLASS_EXPERT_M,
         .trainerName = _("JASPER"),
         .speechBefore = {EC_WORD_I_AM, EC_WORD_NOT, EC_WORD_OLD, EC_WORD_I_AM, EC_WORD_SKILLED, EC_WORD_EXCL},
-        .speechWin = {EC_WORD_SKILLED, EC_WORD_THAT_S, EC_WORD_WHAT, EC_WORD_I_AM, EC_WORD_EXCL, 0xFFFF},
+        .speechWin = {EC_WORD_SKILLED, EC_WORD_THAT_S, EC_WORD_WHAT, EC_WORD_I_AM, EC_WORD_EXCL, EC_EMPTY_WORD},
         .speechLose = {EC_WORD_I_AM, EC_WORD_SHOCKED, EC_WORD_EXCL, EC_WORD_DOWN, EC_WORD_I, EC_WORD_GO},
         .monSet = gBattleFrontierTrainerMons_Jasper
     },
@@ -1972,14 +1972,14 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
         .facilityClass = FACILITY_CLASS_EXPERT_F,
         .trainerName = _("NADIA"),
         .speechBefore = {EC_WORD_YOU, EC_WORD_CAN_T, EC_WORD_BEAT, EC_WORD_ME, EC_WORD_DOWN, EC_WORD_EXCL},
-        .speechWin = {EC_WORD_HAH, EC_WORD_EXCL, 0xFFFF, EC_WORD_I, EC_WORD_BEAT, EC_WORD_YOU},
-        .speechLose = {EC_WORD_I_AM, EC_MOVE2(BEAT_UP), EC_WORD_AND, EC_WORD_DOWNCAST, EC_WORD_ELLIPSIS, 0xFFFF},
+        .speechWin = {EC_WORD_HAH, EC_WORD_EXCL, EC_EMPTY_WORD, EC_WORD_I, EC_WORD_BEAT, EC_WORD_YOU},
+        .speechLose = {EC_WORD_I_AM, EC_MOVE2(BEAT_UP), EC_WORD_AND, EC_WORD_DOWNCAST, EC_WORD_ELLIPSIS, EC_EMPTY_WORD},
         .monSet = gBattleFrontierTrainerMons_Nadia
     },
     [FRONTIER_TRAINER_MIRANDA] = {
         .facilityClass = FACILITY_CLASS_EXPERT_F,
         .trainerName = _("MIRANDA"),
-        .speechBefore = {EC_WORD_WELL, EC_WORD_WELL, 0xFFFF, EC_WORD_LET_S, EC_WORD_START, 0xFFFF},
+        .speechBefore = {EC_WORD_WELL, EC_WORD_WELL, EC_EMPTY_WORD, EC_WORD_LET_S, EC_WORD_START, EC_EMPTY_WORD},
         .speechWin = {EC_WORD_WHAT, EC_WORD_QUES, EC_WORD_DONE, EC_WORD_SO, EC_WORD_SOON, EC_WORD_QUES},
         .speechLose = {EC_WORD_WELL, EC_WORD_I, EC_WORD_SEE, EC_WORD_THAT, EC_WORD_I_AM, EC_WORD_TOO_WEAK},
         .monSet = gBattleFrontierTrainerMons_Miranda
@@ -1987,8 +1987,8 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
     [FRONTIER_TRAINER_EMMA] = {
         .facilityClass = FACILITY_CLASS_EXPERT_F,
         .trainerName = _("EMMA"),
-        .speechBefore = {EC_WORD_I_VE, EC_WORD_BEEN, EC_WORD_HEARING, EC_WORD_ABOUT, EC_WORD_YOU, 0xFFFF},
-        .speechWin = {EC_WORD_I, EC_WORD_THINK, EC_WORD_I_VE, EC_WORD_MISHEARD, EC_WORD_THINGS, 0xFFFF},
+        .speechBefore = {EC_WORD_I_VE, EC_WORD_BEEN, EC_WORD_HEARING, EC_WORD_ABOUT, EC_WORD_YOU, EC_EMPTY_WORD},
+        .speechWin = {EC_WORD_I, EC_WORD_THINK, EC_WORD_I_VE, EC_WORD_MISHEARD, EC_WORD_THINGS, EC_EMPTY_WORD},
         .speechLose = {EC_WORD_WHAT, EC_WORD_I_VE, EC_WORD_BEEN, EC_WORD_HEARING, EC_WORD_IS, EC_WORD_RIGHT},
         .monSet = gBattleFrontierTrainerMons_Emma
     },
@@ -2004,15 +2004,15 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
         .facilityClass = FACILITY_CLASS_PSYCHIC_M,
         .trainerName = _("STANLY"),
         .speechBefore = {EC_WORD_THIS, EC_WORD_SHOULD, EC_WORD_BE, EC_WORD_AN, EC_WORD_EASY, EC_WORD_MATCH},
-        .speechWin = {EC_WORD_IT, EC_WORD_REALLY, EC_WORD_WAS, EC_WORD_EASY, 0xFFFF, 0xFFFF},
-        .speechLose = {EC_WORD_ARE, EC_WORD_YOU, EC_WORD_HAPPY, EC_WORD_NOW, EC_WORD_QUES, 0xFFFF},
+        .speechWin = {EC_WORD_IT, EC_WORD_REALLY, EC_WORD_WAS, EC_WORD_EASY, EC_EMPTY_WORD, EC_EMPTY_WORD},
+        .speechLose = {EC_WORD_ARE, EC_WORD_YOU, EC_WORD_HAPPY, EC_WORD_NOW, EC_WORD_QUES, EC_EMPTY_WORD},
         .monSet = gBattleFrontierTrainerMons_Stanly
     },
     [FRONTIER_TRAINER_DARIO] = {
         .facilityClass = FACILITY_CLASS_PSYCHIC_M,
         .trainerName = _("DARIO"),
         .speechBefore = {EC_WORD_MY, EC_MOVE2(FORESIGHT), EC_WORD_SAYS, EC_WORD_I, EC_WORD_WILL, EC_WORD_WIN},
-        .speechWin = {EC_WORD_MY, EC_MOVE2(FORESIGHT), EC_WORD_HAS, EC_WORD_BEEN, EC_WORD_PERFECT, 0xFFFF},
+        .speechWin = {EC_WORD_MY, EC_MOVE2(FORESIGHT), EC_WORD_HAS, EC_WORD_BEEN, EC_WORD_PERFECT, EC_EMPTY_WORD},
         .speechLose = {EC_WORD_I, EC_WORD_DIDN_T, EC_WORD_SEE, EC_WORD_THIS, EC_MOVE(REVERSAL), EC_WORD_ELLIPSIS},
         .monSet = gBattleFrontierTrainerMons_Dario
     },
@@ -2020,7 +2020,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
         .facilityClass = FACILITY_CLASS_PSYCHIC_F,
         .trainerName = _("KARLEE"),
         .speechBefore = {EC_WORD_SOMETHING, EC_WORD_GOOD, EC_WORD_WILL, EC_WORD_COME, EC_WORD_OF, EC_WORD_THIS},
-        .speechWin = {EC_WORD_YOU, EC_WORD_SEE, EC_WORD_QUES, EC_WORD_FANTASTIC, EC_WORD_EXCL, 0xFFFF},
+        .speechWin = {EC_WORD_YOU, EC_WORD_SEE, EC_WORD_QUES, EC_WORD_FANTASTIC, EC_WORD_EXCL, EC_EMPTY_WORD},
         .speechLose = {EC_WORD_THAT, EC_WORD_SOMETHING, EC_WORD_GOOD, EC_WORD_WENT, EC_WORD_TO, EC_WORD_YOU},
         .monSet = gBattleFrontierTrainerMons_Karlee
     },
@@ -2043,7 +2043,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
     [FRONTIER_TRAINER_DELILAH] = {
         .facilityClass = FACILITY_CLASS_HEX_MANIAC,
         .trainerName = _("DELILAH"),
-        .speechBefore = {EC_WORD_DON_T, EC_MOVE(GRUDGE), EC_WORD_ME, EC_WORD_IF_I_WIN, EC_WORD_OK_QUES, 0xFFFF},
+        .speechBefore = {EC_WORD_DON_T, EC_MOVE(GRUDGE), EC_WORD_ME, EC_WORD_IF_I_WIN, EC_WORD_OK_QUES, EC_EMPTY_WORD},
         .speechWin = {EC_WORD_I_AM, EC_WORD_SORRY, EC_WORD_TO, EC_WORD_SEE, EC_WORD_YOU, EC_WORD_ANGRY},
         .speechLose = {EC_WORD_I, EC_WORD_HAVE, EC_WORD_A, EC_MOVE(GRUDGE), EC_WORD_WITH, EC_WORD_YOU},
         .monSet = gBattleFrontierTrainerMons_Delilah
@@ -2060,16 +2060,16 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
         .facilityClass = FACILITY_CLASS_HEX_MANIAC,
         .trainerName = _("LEXIE"),
         .speechBefore = {EC_WORD_WANT, EC_WORD_TO, EC_WORD_SEE, EC_WORD_SCARY, EC_WORD_POKEMON, EC_WORD_QUES},
-        .speechWin = {EC_WORD_WASN_T, EC_WORD_THAT, EC_WORD_SCARY, EC_WORD_EH_QUES, 0xFFFF, 0xFFFF},
+        .speechWin = {EC_WORD_WASN_T, EC_WORD_THAT, EC_WORD_SCARY, EC_WORD_EH_QUES, EC_EMPTY_WORD, EC_EMPTY_WORD},
         .speechLose = {EC_WORD_YOU_RE, EC_WORD_MORE, EC_WORD_SCARY, EC_WORD_THAN, EC_WORD_MY, EC_WORD_POKEMON},
         .monSet = gBattleFrontierTrainerMons_Lexie
     },
     [FRONTIER_TRAINER_MILLER] = {
         .facilityClass = FACILITY_CLASS_POKEMANIAC,
         .trainerName = _("MILLER"),
-        .speechBefore = {EC_WORD_HELLO, EC_WORD_QUES, 0xFFFF, EC_WORD_HELLO, EC_WORD_QUES_EXCL, 0xFFFF},
+        .speechBefore = {EC_WORD_HELLO, EC_WORD_QUES, EC_EMPTY_WORD, EC_WORD_HELLO, EC_WORD_QUES_EXCL, EC_EMPTY_WORD},
         .speechWin = {EC_WORD_HELLO, EC_WORD_MOTHER, EC_WORD_EXCL, EC_WORD_I, EC_WORD_WON, EC_WORD_EXCL},
-        .speechLose = {EC_WORD_MY, EC_WORD_PHONE, EC_WORD_ISN_T, EC_WORD_WORKING, EC_WORD_ELLIPSIS, 0xFFFF},
+        .speechLose = {EC_WORD_MY, EC_WORD_PHONE, EC_WORD_ISN_T, EC_WORD_WORKING, EC_WORD_ELLIPSIS, EC_EMPTY_WORD},
         .monSet = gBattleFrontierTrainerMons_Miller
     },
     [FRONTIER_TRAINER_MARV] = {
@@ -2099,7 +2099,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
     [FRONTIER_TRAINER_GREGORY] = {
         .facilityClass = FACILITY_CLASS_GENTLEMAN,
         .trainerName = _("GREGORY"),
-        .speechBefore = {EC_WORD_I_AM, EC_WORD_NOT, EC_WORD_THAT, EC_WORD_OLD, EC_WORD_YET, 0xFFFF},
+        .speechBefore = {EC_WORD_I_AM, EC_WORD_NOT, EC_WORD_THAT, EC_WORD_OLD, EC_WORD_YET, EC_EMPTY_WORD},
         .speechWin = {EC_WORD_WHO, EC_WORD_SAYS, EC_WORD_I_AM, EC_WORD_TOO, EC_WORD_OLD, EC_WORD_QUES},
         .speechLose = {EC_WORD_PLEASE, EC_WORD_I_AM, EC_WORD_REALLY, EC_WORD_NOT, EC_WORD_THAT, EC_WORD_OLD},
         .monSet = gBattleFrontierTrainerMons_Gregory
@@ -2107,23 +2107,23 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
     [FRONTIER_TRAINER_REESE] = {
         .facilityClass = FACILITY_CLASS_GENTLEMAN,
         .trainerName = _("REESE"),
-        .speechBefore = {EC_WORD_I_VE, EC_WORD_A, EC_WORD_COUPLE, EC_WORD_THINGS, 0xFFFF, 0xFFFF},
-        .speechWin = {EC_WORD_DON_T, EC_WORD_DIET, EC_WORD_PLAY, EC_WORD_SPORTS, EC_WORD_INSTEAD, 0xFFFF},
+        .speechBefore = {EC_WORD_I_VE, EC_WORD_A, EC_WORD_COUPLE, EC_WORD_THINGS, EC_EMPTY_WORD, EC_EMPTY_WORD},
+        .speechWin = {EC_WORD_DON_T, EC_WORD_DIET, EC_WORD_PLAY, EC_WORD_SPORTS, EC_WORD_INSTEAD, EC_EMPTY_WORD},
         .speechLose = {EC_WORD_INSTEAD, EC_WORD_OF, EC_WORD_TELEVISION, EC_WORD_GET, EC_WORD_A, EC_WORD_BOOK},
         .monSet = gBattleFrontierTrainerMons_Reese
     },
     [FRONTIER_TRAINER_MASON] = {
         .facilityClass = FACILITY_CLASS_RUNNING_TRIATHLETE_M,
         .trainerName = _("MASON"),
-        .speechBefore = {EC_WORD_PLEASE, EC_WORD_DON_T, EC_WORD_MAKE, EC_WORD_THIS, EC_WORD_SCARY, 0xFFFF},
-        .speechWin = {EC_WORD_THANK_YOU, EC_WORD_ELLIPSIS, 0xFFFF, EC_WORD_I_AM, EC_WORD_HAPPY, EC_WORD_NOW},
-        .speechLose = {EC_WORD_I_AM, EC_WORD_DISAPPOINTED, EC_WORD_ELLIPSIS, 0xFFFF, 0xFFFF, 0xFFFF},
+        .speechBefore = {EC_WORD_PLEASE, EC_WORD_DON_T, EC_WORD_MAKE, EC_WORD_THIS, EC_WORD_SCARY, EC_EMPTY_WORD},
+        .speechWin = {EC_WORD_THANK_YOU, EC_WORD_ELLIPSIS, EC_EMPTY_WORD, EC_WORD_I_AM, EC_WORD_HAPPY, EC_WORD_NOW},
+        .speechLose = {EC_WORD_I_AM, EC_WORD_DISAPPOINTED, EC_WORD_ELLIPSIS, EC_EMPTY_WORD, EC_EMPTY_WORD, EC_EMPTY_WORD},
         .monSet = gBattleFrontierTrainerMons_Mason
     },
     [FRONTIER_TRAINER_TOBY] = {
         .facilityClass = FACILITY_CLASS_RUNNING_TRIATHLETE_M,
         .trainerName = _("TOBY"),
-        .speechBefore = {EC_WORD_LISTEN, EC_WORD_UP, 0xFFFF, EC_WORD_I, EC_WORD_ALWAYS, EC_WORD_WIN},
+        .speechBefore = {EC_WORD_LISTEN, EC_WORD_UP, EC_EMPTY_WORD, EC_WORD_I, EC_WORD_ALWAYS, EC_WORD_WIN},
         .speechWin = {EC_WORD_I_AM, EC_WORD_A, EC_WORD_GENIUS, EC_WORD_OR, EC_WORD_WHAT, EC_WORD_QUES},
         .speechLose = {EC_WORD_I, EC_WORD_CAN, EC_WORD_BEAT, EC_WORD_YOU, EC_WORD_AT, EC_WORD_SMARTNESS},
         .monSet = gBattleFrontierTrainerMons_Toby
@@ -2141,14 +2141,14 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
         .trainerName = _("PIPER"),
         .speechBefore = {EC_WORD_COME_ON, EC_WORD_YOU, EC_WORD_NEED, EC_WORD_A, EC_WORD_SPEED_BOOST, EC_WORD_QUES},
         .speechWin = {EC_WORD_YOU, EC_WORD_NEED, EC_WORD_TO, EC_WORD_SHOW, EC_WORD_MORE, EC_WORD_GUTS},
-        .speechLose = {EC_WORD_OH, EC_WORD_YOU, EC_WORD_EXCL, 0xFFFF, 0xFFFF, 0xFFFF},
+        .speechLose = {EC_WORD_OH, EC_WORD_YOU, EC_WORD_EXCL, EC_EMPTY_WORD, EC_EMPTY_WORD, EC_EMPTY_WORD},
         .monSet = gBattleFrontierTrainerMons_Piper
     },
     [FRONTIER_TRAINER_FINN] = {
         .facilityClass = FACILITY_CLASS_SWIMMING_TRIATHLETE_M,
         .trainerName = _("FINN"),
-        .speechBefore = {EC_WORD_NOT, EC_WORD_ANOTHER, EC_WORD_TRAINER, EC_WORD_BATTLE, EC_WORD_ELLIPSIS, 0xFFFF},
-        .speechWin = {EC_WORD_WON_T, EC_WORD_THIS, EC_WORD_EVER, EC_WORD_END, EC_WORD_QUES, 0xFFFF},
+        .speechBefore = {EC_WORD_NOT, EC_WORD_ANOTHER, EC_WORD_TRAINER, EC_WORD_BATTLE, EC_WORD_ELLIPSIS, EC_EMPTY_WORD},
+        .speechWin = {EC_WORD_WON_T, EC_WORD_THIS, EC_WORD_EVER, EC_WORD_END, EC_WORD_QUES, EC_EMPTY_WORD},
         .speechLose = {EC_WORD_I, EC_WORD_FINALLY, EC_WORD_GET, EC_WORD_TO, EC_MOVE2(REST), EC_WORD_A_LITTLE},
         .monSet = gBattleFrontierTrainerMons_Finn
     },
@@ -2157,7 +2157,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
         .trainerName = _("SAMIR"),
         .speechBefore = {EC_WORD_I, EC_MOVE2(DIVE), EC_WORD_BELOW, EC_WORD_THE, EC_MOVE2(SURF), EC_WORD_EXCL},
         .speechWin = {EC_WORD_YAHOO, EC_WORD_TAKE, EC_WORD_A, EC_MOVE2(DIVE), EC_WORD_YOU, EC_WORD_EXCL},
-        .speechLose = {EC_WORD_I_AM, EC_WORD_GOING, EC_WORD_TO, EC_WORD_SINK, EC_WORD_ELLIPSIS, 0xFFFF},
+        .speechLose = {EC_WORD_I_AM, EC_WORD_GOING, EC_WORD_TO, EC_WORD_SINK, EC_WORD_ELLIPSIS, EC_EMPTY_WORD},
         .monSet = gBattleFrontierTrainerMons_Samir
     },
     [FRONTIER_TRAINER_FIONA] = {
@@ -2179,7 +2179,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
     [FRONTIER_TRAINER_NICO] = {
         .facilityClass = FACILITY_CLASS_CYCLING_TRIATHLETE_M,
         .trainerName = _("NICO"),
-        .speechBefore = {EC_WORD_LIKE, EC_WORD_A, EC_MOVE(SONIC_BOOM), EC_WORD_I_VE_ARRIVED, 0xFFFF, 0xFFFF},
+        .speechBefore = {EC_WORD_LIKE, EC_WORD_A, EC_MOVE(SONIC_BOOM), EC_WORD_I_VE_ARRIVED, EC_EMPTY_WORD, EC_EMPTY_WORD},
         .speechWin = {EC_WORD_SORRY, EC_WORD_TO, EC_WORD_MAKE, EC_WORD_YOU, EC_WORD_SO, EC_WORD_DOWNCAST},
         .speechLose = {EC_WORD_I_AM, EC_WORD_GOING, EC_WORD_WITH, EC_WORD_A, EC_MOVE2(SUPERSONIC), EC_WORD_SPEED_BOOST},
         .monSet = gBattleFrontierTrainerMons_Nico
@@ -2220,7 +2220,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
         .facilityClass = FACILITY_CLASS_BUG_MANIAC,
         .trainerName = _("LIAM"),
         .speechBefore = {EC_WORD_WE, EC_WORD_REALLY, EC_WORD_DISLIKE, EC_WORD_FIRE, EC_WORD_AND, EC_WORD_FLYING},
-        .speechWin = {EC_WORD_BUG, EC_WORD_POKEMON, EC_WORD_AREN_T, EC_WORD_BAD, EC_WORD_HEY_QUES, 0xFFFF},
+        .speechWin = {EC_WORD_BUG, EC_WORD_POKEMON, EC_WORD_AREN_T, EC_WORD_BAD, EC_WORD_HEY_QUES, EC_EMPTY_WORD},
         .speechLose = {EC_WORD_YOU, EC_WORD_KNOW, EC_WORD_WHAT, EC_WORD_WE, EC_WORD_DISLIKE, EC_WORD_HEY_QUES},
         .monSet = gBattleFrontierTrainerMons_Liam
     },
@@ -2269,14 +2269,14 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
         .trainerName = _("TRISTON"),
         .speechBefore = {EC_WORD_I, EC_WORD_WOULD, EC_WORD_RATHER, EC_WORD_LOOK, EC_WORD_AT, EC_WORD_POKEMON},
         .speechWin = {EC_WORD_HUH_QUES, EC_WORD_YOU, EC_WORD_MEAN, EC_WORD_I, EC_WORD_WON, EC_WORD_QUES_EXCL},
-        .speechLose = {EC_WORD_SEE, EC_WORD_QUES, 0xFFFF, EC_WORD_I, EC_WORD_ALWAYS, EC_WORD_LOSE},
+        .speechLose = {EC_WORD_SEE, EC_WORD_QUES, EC_EMPTY_WORD, EC_WORD_I, EC_WORD_ALWAYS, EC_WORD_LOSE},
         .monSet = gBattleFrontierTrainerMons_Triston
     },
     [FRONTIER_TRAINER_CHARLES] = {
         .facilityClass = FACILITY_CLASS_GUITARIST,
         .trainerName = _("CHARLES"),
         .speechBefore = {EC_WORD_IT_S, EC_WORD_HOPELESS, EC_WORD_TO, EC_MOVE2(STRUGGLE), EC_WORD_WITH, EC_WORD_ME},
-        .speechWin = {EC_MOVE(SUBMISSION), EC_WORD_WAS, EC_WORD_YOUR, EC_WORD_ONLY, EC_WORD_CHOICE, 0xFFFF},
+        .speechWin = {EC_MOVE(SUBMISSION), EC_WORD_WAS, EC_WORD_YOUR, EC_WORD_ONLY, EC_WORD_CHOICE, EC_EMPTY_WORD},
         .speechLose = {EC_WORD_I_AM, EC_WORD_GOING, EC_WORD_DOWN, EC_WORD_DOWN, EC_WORD_DOWN, EC_WORD_EXCL},
         .monSet = gBattleFrontierTrainerMons_Charles
     },
@@ -2284,7 +2284,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
         .facilityClass = FACILITY_CLASS_GUITARIST,
         .trainerName = _("RAYMOND"),
         .speechBefore = {EC_WORD_WANT, EC_WORD_TO, EC_WORD_HEAR, EC_WORD_MY, EC_WORD_SONG, EC_WORD_QUES},
-        .speechWin = {EC_WORD_SATISFIED, EC_WORD_THAT_S, EC_WORD_WHAT, EC_WORD_I_AM, EC_WORD_EXCL, 0xFFFF},
+        .speechWin = {EC_WORD_SATISFIED, EC_WORD_THAT_S, EC_WORD_WHAT, EC_WORD_I_AM, EC_WORD_EXCL, EC_EMPTY_WORD},
         .speechLose = {EC_WORD_SATISFIED, EC_WORD_IS, EC_WORD_WHAT, EC_WORD_I, EC_WORD_CAN_T, EC_WORD_BE},
         .monSet = gBattleFrontierTrainerMons_Raymond
     },
@@ -2348,7 +2348,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
         .facilityClass = FACILITY_CLASS_KINDLER,
         .trainerName = _("FERRIS"),
         .speechBefore = {EC_WORD_I_AM, EC_WORD_NO_1, EC_WORD_IN, EC_WORD_THE, EC_WORD_OLD, EC_WORD_CLASS},
-        .speechWin = {EC_WORD_NO_1, EC_WORD_THAT_S, EC_WORD_WHAT, EC_WORD_I_AM, EC_WORD_EXCL, 0xFFFF},
+        .speechWin = {EC_WORD_NO_1, EC_WORD_THAT_S, EC_WORD_WHAT, EC_WORD_I_AM, EC_WORD_EXCL, EC_EMPTY_WORD},
         .speechLose = {EC_WORD_I_AM, EC_WORD_NOT, EC_WORD_NO_1, EC_WORD_ANY, EC_WORD_MORE, EC_WORD_ELLIPSIS},
         .monSet = gBattleFrontierTrainerMons_Ferris
     },
@@ -2363,24 +2363,24 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
     [FRONTIER_TRAINER_PAIGE] = {
         .facilityClass = FACILITY_CLASS_PARASOL_LADY,
         .trainerName = _("PAIGE"),
-        .speechBefore = {EC_WORD_LET_S, EC_WORD_ENJOY, EC_WORD_OUR, EC_WORD_BATTLE, EC_WORD_TOGETHER, 0xFFFF},
-        .speechWin = {EC_WORD_THAT_S_IT_EXCL, 0xFFFF, 0xFFFF, EC_WORD_THANK_YOU, EC_WORD_VERY, EC_WORD_MUCH},
-        .speechLose = {EC_WORD_THAT_S_IT_EXCL, 0xFFFF, 0xFFFF, EC_WORD_DO, EC_WORD_GO, EC_WORD_ON},
+        .speechBefore = {EC_WORD_LET_S, EC_WORD_ENJOY, EC_WORD_OUR, EC_WORD_BATTLE, EC_WORD_TOGETHER, EC_EMPTY_WORD},
+        .speechWin = {EC_WORD_THAT_S_IT_EXCL, EC_EMPTY_WORD, EC_EMPTY_WORD, EC_WORD_THANK_YOU, EC_WORD_VERY, EC_WORD_MUCH},
+        .speechLose = {EC_WORD_THAT_S_IT_EXCL, EC_EMPTY_WORD, EC_EMPTY_WORD, EC_WORD_DO, EC_WORD_GO, EC_WORD_ON},
         .monSet = gBattleFrontierTrainerMons_Paige
     },
     [FRONTIER_TRAINER_ANYA] = {
         .facilityClass = FACILITY_CLASS_BEAUTY,
         .trainerName = _("ANYA"),
         .speechBefore = {EC_WORD_I, EC_WORD_DISLIKE, EC_WORD_OH, EC_WORD_SO, EC_WORD_PRETTY, EC_WORD_FASHION},
-        .speechWin = {EC_WORD_FASHION, EC_WORD_SHOULD, EC_WORD_MATCH, EC_WORD_THE, EC_WORD_PERSON, 0xFFFF},
-        .speechLose = {EC_WORD_PRETTY, EC_WORD_COULD, EC_WORD_BE, EC_WORD_GOOD, 0xFFFF, 0xFFFF},
+        .speechWin = {EC_WORD_FASHION, EC_WORD_SHOULD, EC_WORD_MATCH, EC_WORD_THE, EC_WORD_PERSON, EC_EMPTY_WORD},
+        .speechLose = {EC_WORD_PRETTY, EC_WORD_COULD, EC_WORD_BE, EC_WORD_GOOD, EC_EMPTY_WORD, EC_EMPTY_WORD},
         .monSet = gBattleFrontierTrainerMons_Anya
     },
     [FRONTIER_TRAINER_DAWN] = {
         .facilityClass = FACILITY_CLASS_BEAUTY,
         .trainerName = _("DAWN"),
-        .speechBefore = {EC_WORD_I, EC_WORD_GO, EC_WORD_ALL, EC_WORD_OUT, EC_WORD_EXCL, 0xFFFF},
-        .speechWin = {EC_WORD_DON_T, EC_WORD_BE, EC_WORD_A, EC_WORD_BABY, EC_WORD_EXCL, 0xFFFF},
+        .speechBefore = {EC_WORD_I, EC_WORD_GO, EC_WORD_ALL, EC_WORD_OUT, EC_WORD_EXCL, EC_EMPTY_WORD},
+        .speechWin = {EC_WORD_DON_T, EC_WORD_BE, EC_WORD_A, EC_WORD_BABY, EC_WORD_EXCL, EC_EMPTY_WORD},
         .speechLose = {EC_WORD_YOU, EC_WORD_WON, EC_WORD_EXCL, EC_WORD_MOVE, EC_WORD_ON, EC_WORD_EXCL},
         .monSet = gBattleFrontierTrainerMons_Dawn
     },
@@ -2388,8 +2388,8 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COU
         .facilityClass = FACILITY_CLASS_AROMA_LADY,
         .trainerName = _("ABBY"),
         .speechBefore = {EC_WORD_I, EC_WORD_LIKE, EC_WORD_A, EC_WORD_TRAINER, EC_WORD_THAT_S, EC_WORD_REFRESHING},
-        .speechWin = {EC_WORD_VICTORY, EC_WORD_HAS, EC_WORD_A, EC_MOVE(SWEET_SCENT), EC_WORD_EXCL, 0xFFFF},
-        .speechLose = {EC_WORD_WHAT, EC_WORD_AN, EC_WORD_AWFUL, EC_WORD_STENCH, EC_WORD_EXCL, 0xFFFF},
+        .speechWin = {EC_WORD_VICTORY, EC_WORD_HAS, EC_WORD_A, EC_MOVE(SWEET_SCENT), EC_WORD_EXCL, EC_EMPTY_WORD},
+        .speechLose = {EC_WORD_WHAT, EC_WORD_AN, EC_WORD_AWFUL, EC_WORD_STENCH, EC_WORD_EXCL, EC_EMPTY_WORD},
         .monSet = gBattleFrontierTrainerMons_Abby
     },
     [FRONTIER_TRAINER_GRETEL] = {
diff --git a/src/data/battle_frontier/battle_tent.h b/src/data/battle_frontier/battle_tent.h
index bf89c5bc3..e1c3750bf 100644
--- a/src/data/battle_frontier/battle_tent.h
+++ b/src/data/battle_frontier/battle_tent.h
@@ -616,9 +616,9 @@ const struct BattleFrontierTrainer gSlateportBattleTentTrainers[NUM_BATTLE_TENT_
     [SLATEPORT_TENT_TRAINER_MAGGIE] = {
         .facilityClass = FACILITY_CLASS_SCHOOL_KID_F,
         .trainerName = _("MAGGIE"),
-        .speechBefore = {EC_POKEMON(VULPIX), EC_POKEMON(XATU), EC_POKEMON2(UMBREON), EC_WORD_ELLIPSIS, EC_WORD_UM, EC_WORD_ELLIPSIS},
+        .speechBefore = {EC_POKEMON(VULPIX), EC_POKEMON(XATU), EC_POKEMON_NATIONAL(UMBREON), EC_WORD_ELLIPSIS, EC_WORD_UM, EC_WORD_ELLIPSIS},
         .speechWin = {EC_POKEMON(NOSEPASS), EC_WORD_ELLIPSIS, EC_WORD_UM, EC_POKEMON(SEVIPER), EC_WORD_EXCL, -1},
-        .speechLose = {EC_POKEMON(NOSEPASS), EC_WORD_ELLIPSIS, EC_WORD_UM, EC_POKEMON2(SNORLAX), EC_WORD_ELLIPSIS, EC_WORD_UH_OH},
+        .speechLose = {EC_POKEMON(NOSEPASS), EC_WORD_ELLIPSIS, EC_WORD_UM, EC_POKEMON_NATIONAL(SNORLAX), EC_WORD_ELLIPSIS, EC_WORD_UH_OH},
         .monSet = gSlateportBattleTentTrainerMons_Maggie
     },
     [SLATEPORT_TENT_TRAINER_STEPHON] = {
diff --git a/src/data/battle_frontier/trainer_hill.h b/src/data/battle_frontier/trainer_hill.h
index d8bd57576..127eb8ed4 100644
--- a/src/data/battle_frontier/trainer_hill.h
+++ b/src/data/battle_frontier/trainer_hill.h
@@ -314,7 +314,7 @@ static const struct TrHillFloor sDataTagJPDefault_Floors[] = {
                 .speechBefore = { EC_WORD_SISTER, EC_WORD_ALTHOUGH, EC_WORD_KIND, EC_WORD_MATCH, EC_WORD_PLEASE, EC_WORD_WITHOUT },
                 .speechWin = { EC_WORD_KIND, EC_WORD_ELLIPSIS, EC_WORD_INSTEAD, EC_WORD_DEEP, EC_WORD_WEAK, EC_WORD_QUES },
                 .speechLose = { EC_WORD_AWFUL, EC_WORD_GWAH, EC_WORD_HOPELESS, EC_WORD_CAN_T_WIN, EC_WORD_IS, EC_WORD_NONE },
-                .speechAfter = { EC_WORD_AWW, 0xFFFF, 0xFFFF, EC_WORD_ALMOST, EC_WORD_GOOD, EC_WORD_ANYWHERE },
+                .speechAfter = { EC_WORD_AWW, EC_EMPTY_WORD, EC_EMPTY_WORD, EC_WORD_ALMOST, EC_WORD_GOOD, EC_WORD_ANYWHERE },
                 .mons = {
                     [0] = NULL_BATTLE_TOWER_POKEMON,
                     [1] = NULL_BATTLE_TOWER_POKEMON,
@@ -444,7 +444,7 @@ static const struct TrHillFloor sDataTagNormal_Floors[] =
                 .unused = 0,
                 .speechBefore = {EC_WORD_YOU, EC_WORD_CAN, EC_WORD_CHOOSE, EC_WORD_NOT, EC_WORD_TO, EC_WORD_BELIEVE},
                 .speechWin = {EC_WORD_A, EC_WORD_SUPER, EC_WORD_NATURAL, EC_WORD_POWER, EC_WORD_HAS, EC_WORD_COME},
-                .speechLose = {EC_WORD_THIS, EC_WORD_MUST_BE, EC_WORD_A, EC_MOVE(NIGHTMARE), EC_WORD_EXCL, 0xFFFF},
+                .speechLose = {EC_WORD_THIS, EC_WORD_MUST_BE, EC_WORD_A, EC_MOVE(NIGHTMARE), EC_WORD_EXCL, EC_EMPTY_WORD},
                 .speechAfter = {EC_WORD_I, EC_WORD_WILL, EC_WORD_DISAPPEAR, EC_WORD_IN, EC_WORD_THE, EC_WORD_DARK},
                 .mons =
                 {
@@ -589,7 +589,7 @@ static const struct TrHillFloor sDataTagNormal_Floors[] =
                 .name = _("ALFONSO"),
                 .facilityClass = FACILITY_CLASS_CYCLING_TRIATHLETE_M,
                 .unused = 0,
-                .speechBefore = {EC_WORD_I, EC_WORD_NEVER, EC_WORD_TAKE, EC_WORD_A, EC_WORD_TRAIN, 0xFFFF},
+                .speechBefore = {EC_WORD_I, EC_WORD_NEVER, EC_WORD_TAKE, EC_WORD_A, EC_WORD_TRAIN, EC_EMPTY_WORD},
                 .speechWin = {EC_WORD_I_AM, EC_WORD_FEELING, EC_MOVE2(SUPERSONIC), EC_WORD_ON, EC_WORD_MY, EC_WORD_BIKE},
                 .speechLose = {EC_WORD_MY, EC_WORD_BIKE, EC_WORD_EXCL, EC_WORD_YOU_VE, EC_WORD_DESTROYED, EC_WORD_IT},
                 .speechAfter = {EC_WORD_A, EC_WORD_BIKE, EC_WORD_OVER, EC_WORD_ANY, EC_WORD_TRAIN, EC_WORD_EXCL},
@@ -907,8 +907,8 @@ static const struct TrHillFloor sDataTagNormal_Floors[] =
                 .facilityClass = FACILITY_CLASS_PKMN_BREEDER_F,
                 .unused = 0,
                 .speechBefore = {EC_WORD_SOME, EC_WORD_THINGS, EC_WORD_YOU, EC_WORD_CAN_T, EC_WORD_DO, EC_WORD_ALONE},
-                .speechWin = {EC_WORD_YOU, EC_WORD_WIN, EC_WORD_AS, EC_WORD_A, EC_WORD_GROUP, 0xFFFF},
-                .speechLose = {EC_WORD_WE, EC_WORD_COULDN_T, EC_WORD_WIN, EC_WORD_TOGETHER, EC_WORD_QUES, 0xFFFF},
+                .speechWin = {EC_WORD_YOU, EC_WORD_WIN, EC_WORD_AS, EC_WORD_A, EC_WORD_GROUP, EC_EMPTY_WORD},
+                .speechLose = {EC_WORD_WE, EC_WORD_COULDN_T, EC_WORD_WIN, EC_WORD_TOGETHER, EC_WORD_QUES, EC_EMPTY_WORD},
                 .speechAfter = {EC_WORD_MAYBE, EC_WORD_I, EC_WORD_NEED, EC_WORD_A, EC_WORD_BOY, EC_WORD_FRIEND},
                 .mons =
                 {
@@ -1086,7 +1086,7 @@ static const struct TrHillFloor sDataTagNormal_Floors[] =
                 .speechBefore = {EC_WORD_LET_S, EC_MOVE2(WRAP), EC_WORD_THINGS, EC_WORD_UP, EC_WORD_HERE, EC_WORD_HEY_QUES},
                 .speechWin = {EC_WORD_WOULD, EC_WORD_YOU, EC_WORD_LIKE, EC_WORD_TO, EC_WORD_GO_HOME, EC_WORD_QUES},
                 .speechLose = {EC_WORD_I, EC_WORD_WILL, EC_WORD_MAKE, EC_WORD_YOU, EC_WORD_SORRY, EC_WORD_FRIEND},
-                .speechAfter = {EC_WORD_HAVEN_T, EC_WORD_YOU, EC_WORD_DONE, EC_WORD_ENOUGH, EC_WORD_QUES, 0xFFFF},
+                .speechAfter = {EC_WORD_HAVEN_T, EC_WORD_YOU, EC_WORD_DONE, EC_WORD_ENOUGH, EC_WORD_QUES, EC_EMPTY_WORD},
                 .mons =
                 {
                     [0] =
@@ -1229,7 +1229,7 @@ static const struct TrHillFloor sDataTagNormal_Floors[] =
                 .facilityClass = FACILITY_CLASS_PKMN_BREEDER_F,
                 .unused = 0,
                 .speechBefore = {EC_WORD_I_AM, EC_WORD_THE, EC_WORD_STRONG, EC_WORD_BEAUTY, EC_WORD_AROUND, EC_WORD_HERE},
-                .speechWin = {EC_WORD_I_AM, EC_WORD_STRONG, EC_WORD_THAT_S, EC_WORD_WHY, EC_WORD_EXCL, 0xFFFF},
+                .speechWin = {EC_WORD_I_AM, EC_WORD_STRONG, EC_WORD_THAT_S, EC_WORD_WHY, EC_WORD_EXCL, EC_EMPTY_WORD},
                 .speechLose = {EC_WORD_I_AM, EC_WORD_TIRED, EC_WORD_TODAY, EC_WORD_THAT_S, EC_WORD_WHY, EC_WORD_EXCL},
                 .speechAfter = {EC_WORD_WHY, EC_WORD_YES, EC_WORD_I_AM, EC_WORD_ANGRY, EC_WORD_THANK_YOU, EC_WORD_EXCL},
                 .mons =
@@ -1404,8 +1404,8 @@ static const struct TrHillFloor sDataTagNormal_Floors[] =
                 .name = _("KEENAN"),
                 .facilityClass = FACILITY_CLASS_PSYCHIC_M,
                 .unused = 0,
-                .speechBefore = {EC_WORD_YOU, EC_WORD_LOOK, EC_WORD_SO, EC_WORD_HURRIED, 0xFFFF, 0xFFFF},
-                .speechWin = {EC_WORD_TOO, EC_WORD_BAD, 0xFFFF, EC_WORD_TIME, EC_WORD_IS, EC_WORD_UP},
+                .speechBefore = {EC_WORD_YOU, EC_WORD_LOOK, EC_WORD_SO, EC_WORD_HURRIED, EC_EMPTY_WORD, EC_EMPTY_WORD},
+                .speechWin = {EC_WORD_TOO, EC_WORD_BAD, EC_EMPTY_WORD, EC_WORD_TIME, EC_WORD_IS, EC_WORD_UP},
                 .speechLose = {EC_WORD_DOES, EC_WORD_THE, EC_WORD_TIME, EC_WORD_WORRY, EC_WORD_YOU, EC_WORD_QUES},
                 .speechAfter = {EC_WORD_YOU, EC_WORD_DON_T, EC_WORD_HAVE, EC_WORD_TIME, EC_WORD_TO, EC_WORD_CHAT},
                 .mons =
@@ -1547,7 +1547,7 @@ static const struct TrHillFloor sDataTagNormal_Floors[] =
                 .unused = 0,
                 .speechBefore = {EC_WORD_IT_S, EC_WORD_HOT, EC_WORD_ELLIPSIS, EC_WORD_WHAT, EC_WORD_A, EC_WORD_STENCH},
                 .speechWin = {EC_WORD_I, EC_WORD_REALLY, EC_WORD_LIKE, EC_WORD_AN, EC_WORD_OFFENSIVE, EC_WORD_STENCH},
-                .speechLose = {EC_WORD_I, EC_MOVE2(COVET), EC_WORD_ANY, EC_WORD_STRONG, EC_WORD_STENCH, 0xFFFF},
+                .speechLose = {EC_WORD_I, EC_MOVE2(COVET), EC_WORD_ANY, EC_WORD_STRONG, EC_WORD_STENCH, EC_EMPTY_WORD},
                 .speechAfter = {EC_WORD_MY, EC_WORD_SENSE, EC_WORD_OF, EC_WORD_SMELL, EC_WORD_ISN_T, EC_WORD_NORMAL},
                 .mons =
                 {
@@ -1731,8 +1731,8 @@ static const struct TrHillFloor sDataTagVariety_Floors[] = {
                             .unused = 0,
                             .speechBefore = {EC_WORD_GOOD, EC_WORD_CHILDREN, EC_WORD_WILL, EC_WORD_GET, EC_WORD_A, EC_MOVE2(PRESENT)},
                             .speechWin = {EC_WORD_THANK_YOU, EC_WORD_MY, EC_WORD_VICTORY, EC_WORD_IS, EC_WORD_YOUR, EC_MOVE2(PRESENT)},
-                            .speechLose = {EC_WORD_THAT_WAS, EC_WORD_MY, EC_MOVE2(PRESENT), EC_WORD_TO, EC_WORD_YOU, 0xFFFF},
-                            .speechAfter = {EC_WORD_WELL_THEN, EC_WORD_CONGRATS, EC_WORD_MY, EC_WORD_FRIEND, 0xFFFF, 0xFFFF},
+                            .speechLose = {EC_WORD_THAT_WAS, EC_WORD_MY, EC_MOVE2(PRESENT), EC_WORD_TO, EC_WORD_YOU, EC_EMPTY_WORD},
+                            .speechAfter = {EC_WORD_WELL_THEN, EC_WORD_CONGRATS, EC_WORD_MY, EC_WORD_FRIEND, EC_EMPTY_WORD, EC_EMPTY_WORD},
                             .mons =
                                 {
                                     [0] =
@@ -1870,7 +1870,7 @@ static const struct TrHillFloor sDataTagVariety_Floors[] = {
                             .unused = 0,
                             .speechBefore = {EC_WORD_CAN, EC_WORD_YOU, EC_WORD_SENSE, EC_WORD_ME, EC_MOVE(FOCUS_ENERGY), EC_WORD_QUES},
                             .speechWin = {EC_WORD_THAT_S, EC_WORD_ABOUT, EC_WORD_RIGHT, EC_WORD_I, EC_WORD_WOULD, EC_WORD_THINK},
-                            .speechLose = {EC_WORD_THINGS, EC_WORD_DON_T, EC_WORD_ALWAYS, EC_WORD_WORK, EC_WORD_OUT, 0xFFFF},
+                            .speechLose = {EC_WORD_THINGS, EC_WORD_DON_T, EC_WORD_ALWAYS, EC_WORD_WORK, EC_WORD_OUT, EC_EMPTY_WORD},
                             .speechAfter = {EC_WORD_I_AM, EC_WORD_FEELING, EC_WORD_LONESOME, EC_WORD_AND, EC_WORD_SAD, EC_WORD_NOW},
                             .mons =
                                 {
@@ -2040,7 +2040,7 @@ static const struct TrHillFloor sDataTagVariety_Floors[] = {
                             .facilityClass = FACILITY_CLASS_PARASOL_LADY,
                             .unused = 0,
                             .speechBefore = {EC_WORD_HI, EC_WORD_ARE, EC_WORD_YOU, EC_WORD_FEELING, EC_WORD_UPBEAT, EC_WORD_QUES},
-                            .speechWin = {EC_WORD_AREN_T, EC_WORD_YOU, EC_WORD_FEELING, EC_WORD_WELL, EC_WORD_QUES, 0xFFFF},
+                            .speechWin = {EC_WORD_AREN_T, EC_WORD_YOU, EC_WORD_FEELING, EC_WORD_WELL, EC_WORD_QUES, EC_EMPTY_WORD},
                             .speechLose = {EC_WORD_I, EC_WORD_CAN, EC_WORD_SEE, EC_WORD_YOU_RE, EC_WORD_FEELING, EC_WORD_GREAT},
                             .speechAfter = {EC_WORD_YOUR, EC_WORD_POKEMON, EC_WORD_LOOK, EC_WORD_READY, EC_WORD_TO, EC_WORD_HUSTLE},
                             .mons =
@@ -2380,8 +2380,8 @@ static const struct TrHillFloor sDataTagVariety_Floors[] = {
                             .facilityClass = FACILITY_CLASS_RICH_BOY,
                             .unused = 0,
                             .speechBefore = {EC_WORD_GET, EC_WORD_READY, EC_WORD_FOR, EC_WORD_AN, EC_WORD_AWESOME, EC_WORD_TIME},
-                            .speechWin = {EC_WORD_HEY, EC_WORD_HEY, EC_WORD_EXCL, EC_WORD_WHAT_S_UP_QUES, 0xFFFF, 0xFFFF},
-                            .speechLose = {EC_WORD_AWW, EC_WORD_COULDN_T, EC_WORD_YOU, EC_WORD_LET_ME_WIN, EC_WORD_QUES, 0xFFFF},
+                            .speechWin = {EC_WORD_HEY, EC_WORD_HEY, EC_WORD_EXCL, EC_WORD_WHAT_S_UP_QUES, EC_EMPTY_WORD, EC_EMPTY_WORD},
+                            .speechLose = {EC_WORD_AWW, EC_WORD_COULDN_T, EC_WORD_YOU, EC_WORD_LET_ME_WIN, EC_WORD_QUES, EC_EMPTY_WORD},
                             .speechAfter = {EC_WORD_DID, EC_WORD_YOU, EC_WORD_SEE, EC_WORD_MY, EC_WORD_SKILL, EC_WORD_QUES},
                             .mons =
                                 {
@@ -2840,10 +2840,10 @@ static const struct TrHillFloor sDataTagVariety_Floors[] = {
                             .name = _("FRANCISCO"),
                             .facilityClass = FACILITY_CLASS_POKEFAN_M,
                             .unused = 0,
-                            .speechBefore = {EC_WORD_I, EC_WORD_STUDY, EC_WORD_EVERY, EC_WORD_DAY, EC_WORD_TOO, 0xFFFF},
-                            .speechWin = {EC_WORD_SO, EC_WORD_THAT_S, EC_WORD_HOW, EC_WORD_YOU, EC_WORD_LOSE, 0xFFFF},
+                            .speechBefore = {EC_WORD_I, EC_WORD_STUDY, EC_WORD_EVERY, EC_WORD_DAY, EC_WORD_TOO, EC_EMPTY_WORD},
+                            .speechWin = {EC_WORD_SO, EC_WORD_THAT_S, EC_WORD_HOW, EC_WORD_YOU, EC_WORD_LOSE, EC_EMPTY_WORD},
                             .speechLose = {EC_WORD_NO, EC_WORD_WONDER, EC_WORD_I, EC_WORD_COULDN_T, EC_WORD_BEAT, EC_WORD_YOU},
-                            .speechAfter = {EC_WORD_YES, EC_WORD_ELLIPSIS, 0xFFFF, EC_WORD_THANK_YOU, 0xFFFF, 0xFFFF},
+                            .speechAfter = {EC_WORD_YES, EC_WORD_ELLIPSIS, EC_EMPTY_WORD, EC_WORD_THANK_YOU, EC_EMPTY_WORD, EC_EMPTY_WORD},
                             .mons =
                                 {
                                     [0] =
@@ -3023,10 +3023,10 @@ static const struct TrHillFloor sDataTagUnique_Floors[] = {
                             .name = _("MEREDITH"),
                             .facilityClass = FACILITY_CLASS_PKMN_RANGER_F,
                             .unused = 0,
-                            .speechBefore = {EC_WORD_UM, EC_WORD_ELLIPSIS, 0xFFFF, EC_WORD_I, EC_WORD_ELLIPSIS, 0xFFFF},
-                            .speechWin = {EC_WORD_OH, EC_WORD_EXCL, 0xFFFF, EC_WORD_UM, EC_WORD_ELLIPSIS, EC_WORD_YAY},
-                            .speechLose = {EC_WORD_UM, EC_WORD_ELLIPSIS, 0xFFFF, EC_WORD_WAAAH, EC_WORD_ELLIPSIS, 0xFFFF},
-                            .speechAfter = {EC_WORD_UM, EC_WORD_ELLIPSIS, 0xFFFF, EC_WORD_I_AM, EC_WORD_SAD, EC_WORD_ELLIPSIS},
+                            .speechBefore = {EC_WORD_UM, EC_WORD_ELLIPSIS, EC_EMPTY_WORD, EC_WORD_I, EC_WORD_ELLIPSIS, EC_EMPTY_WORD},
+                            .speechWin = {EC_WORD_OH, EC_WORD_EXCL, EC_EMPTY_WORD, EC_WORD_UM, EC_WORD_ELLIPSIS, EC_WORD_YAY},
+                            .speechLose = {EC_WORD_UM, EC_WORD_ELLIPSIS, EC_EMPTY_WORD, EC_WORD_WAAAH, EC_WORD_ELLIPSIS, EC_EMPTY_WORD},
+                            .speechAfter = {EC_WORD_UM, EC_WORD_ELLIPSIS, EC_EMPTY_WORD, EC_WORD_I_AM, EC_WORD_SAD, EC_WORD_ELLIPSIS},
                             .mons =
                                 {
                                     [0] =
@@ -4948,8 +4948,8 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = {
                             .unused = 0,
                             .speechBefore = {EC_WORD_OH_DEAR, EC_WORD_THIS, EC_WORD_MATCH, EC_WORD_IS, EC_WORD_FOR, EC_WORD_YOU},
                             .speechWin = {EC_WORD_OH_DEAR, EC_WORD_DID, EC_WORD_YOU, EC_WORD_SEE, EC_WORD_THAT, EC_WORD_QUES},
-                            .speechLose = {EC_WORD_OH_DEAR, EC_WORD_I_AM, EC_WORD_SO, EC_WORD_SORRY, 0xFFFF, 0xFFFF},
-                            .speechAfter = {EC_WORD_IS, EC_WORD_YOUR, EC_WORD_GRANDMOTHER, EC_WORD_STRONG, EC_WORD_QUES, 0xFFFF},
+                            .speechLose = {EC_WORD_OH_DEAR, EC_WORD_I_AM, EC_WORD_SO, EC_WORD_SORRY, EC_EMPTY_WORD, EC_EMPTY_WORD},
+                            .speechAfter = {EC_WORD_IS, EC_WORD_YOUR, EC_WORD_GRANDMOTHER, EC_WORD_STRONG, EC_WORD_QUES, EC_EMPTY_WORD},
                             .mons =
                                 {
                                     [0] =
@@ -5094,7 +5094,7 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = {
                             .speechBefore = {EC_WORD_OH_DEAR, EC_WORD_I, EC_WORD_WILL, EC_WORD_WIN, EC_WORD_FOR, EC_WORD_YOU},
                             .speechWin = {EC_WORD_OH_DEAR, EC_WORD_WE, EC_WORD_HAVE, EC_WORD_A, EC_WORD_PARTY, EC_WORD_LATER},
                             .speechLose = {EC_WORD_OH_DEAR, EC_WORD_I_AM, EC_WORD_SORRY, EC_WORD_TO, EC_WORD_DISAPPOINT, EC_WORD_YOU},
-                            .speechAfter = {EC_WORD_IS, EC_WORD_YOUR, EC_WORD_GRANDFATHER, EC_WORD_COOL, EC_WORD_QUES, 0xFFFF},
+                            .speechAfter = {EC_WORD_IS, EC_WORD_YOUR, EC_WORD_GRANDFATHER, EC_WORD_COOL, EC_WORD_QUES, EC_EMPTY_WORD},
                             .mons =
                                 {
                                     [0] =
@@ -5271,7 +5271,7 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = {
                             .speechBefore = {EC_WORD_WAAAH, EC_WORD_THIS, EC_WORD_IS, EC_WORD_SO, EC_WORD_EXCITING, EC_WORD_EXCL},
                             .speechWin = {EC_WORD_WAAAH, EC_WORD_I_AM, EC_WORD_SO, EC_WORD_HAPPY, EC_WORD_I, EC_WORD_WON},
                             .speechLose = {EC_WORD_WAAAH, EC_WORD_I_AM, EC_WORD_SO, EC_WORD_SAD, EC_WORD_I, EC_WORD_LOST},
-                            .speechAfter = {EC_WORD_WAAAH, EC_WORD_EXCL, 0xFFFF, EC_WORD_GO, EC_WORD_AWAY, EC_WORD_EXCL},
+                            .speechAfter = {EC_WORD_WAAAH, EC_WORD_EXCL, EC_EMPTY_WORD, EC_WORD_GO, EC_WORD_AWAY, EC_WORD_EXCL},
                             .mons =
                                 {
                                     [0] =
@@ -5410,7 +5410,7 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = {
                             .facilityClass = FACILITY_CLASS_PKMN_RANGER_M,
                             .unused = 0,
                             .speechBefore = {EC_WORD_WAHAHAHA, EC_WORD_YOU, EC_WORD_CAN_T, EC_WORD_STOP, EC_WORD_ME, EC_WORD_EXCL},
-                            .speechWin = {EC_WORD_WOWEE, EC_WORD_EXCL, 0xFFFF, EC_WORD_I_AM, EC_WORD_AWESOME, EC_WORD_COOL},
+                            .speechWin = {EC_WORD_WOWEE, EC_WORD_EXCL, EC_EMPTY_WORD, EC_WORD_I_AM, EC_WORD_AWESOME, EC_WORD_COOL},
                             .speechLose = {EC_WORD_I_AM, EC_WORD_NOT, EC_WORD_COOL, EC_WORD_AT, EC_WORD_ALL, EC_WORD_EXCL},
                             .speechAfter = {EC_WORD_HEHEHE, EC_WORD_THAT_WAS, EC_WORD_AN, EC_WORD_AWESOME, EC_WORD_BATTLE, EC_WORD_EXCL},
                             .mons =
diff --git a/src/data/easy_chat/easy_chat_words_by_letter.h b/src/data/easy_chat/easy_chat_words_by_letter.h
index 927b9db2f..a56e3184f 100755
--- a/src/data/easy_chat/easy_chat_words_by_letter.h
+++ b/src/data/easy_chat/easy_chat_words_by_letter.h
@@ -1,6 +1,8 @@
 #include "easy_chat.h"
 #include "constants/easy_chat.h"
 
+#define DOUBLE_SPECIES_NAME EC_EMPTY_WORD, 2,
+
 const u16 gEasyChatWordsByLetter_Others[] = {
     EC_WORD_EXCL,
     EC_WORD_EXCL_EXCL,
@@ -21,9 +23,9 @@ const u16 gEasyChatWordsByLetter_A[] = {
     EC_WORD_A_TINY_BIT,
     EC_WORD_ABOUT,
     EC_WORD_ABOVE,
-    -1, 2, // Doubled pokemon species name
+    DOUBLE_SPECIES_NAME
     EC_POKEMON(ABRA),
-    EC_POKEMON2(ABRA),
+    EC_POKEMON_NATIONAL(ABRA),
     EC_WORD_ABSENT,
     EC_POKEMON(ABSOL),
     EC_WORD_ABSOLUTELY,
@@ -36,7 +38,7 @@ const u16 gEasyChatWordsByLetter_A[] = {
     EC_WORD_ADVENTURE,
     EC_MOVE2(AERIAL_ACE),
     EC_MOVE(AEROBLAST),
-    EC_POKEMON2(AERODACTYL),
+    EC_POKEMON_NATIONAL(AERODACTYL),
     EC_WORD_AFTER,
     EC_WORD_AGE,
     EC_POKEMON(AGGRON),
@@ -44,13 +46,13 @@ const u16 gEasyChatWordsByLetter_A[] = {
     EC_WORD_AGREE,
     EC_WORD_AHAHA,
     EC_WORD_AIM,
-    EC_POKEMON2(AIPOM),
+    EC_POKEMON_NATIONAL(AIPOM),
     EC_MOVE(AIR_CUTTER),
     EC_WORD_AIR_LOCK,
     EC_WORD_AIYEEH,
-    -1, 2, // Doubled pokemon species name
+    DOUBLE_SPECIES_NAME
     EC_POKEMON(ALAKAZAM),
-    EC_POKEMON2(ALAKAZAM),
+    EC_POKEMON_NATIONAL(ALAKAZAM),
     EC_WORD_ALL,
     EC_WORD_ALL_RIGHT,
     EC_WORD_ALLOW,
@@ -65,7 +67,7 @@ const u16 gEasyChatWordsByLetter_A[] = {
     EC_WORD_ALWAYS,
     EC_WORD_AM,
     EC_MOVE2(AMNESIA),
-    EC_POKEMON2(AMPHAROS),
+    EC_POKEMON_NATIONAL(AMPHAROS),
     EC_WORD_AMUSING,
     EC_WORD_AN,
     EC_MOVE(ANCIENT_POWER),
@@ -85,19 +87,19 @@ const u16 gEasyChatWordsByLetter_A[] = {
     EC_WORD_APPEARS,
     EC_WORD_APPRECIATE,
     EC_WORD_APPROVED,
-    EC_POKEMON2(ARBOK),
-    EC_POKEMON2(ARCANINE),
+    EC_POKEMON_NATIONAL(ARBOK),
+    EC_POKEMON_NATIONAL(ARCANINE),
     EC_WORD_ARE,
     EC_WORD_AREN_T,
     EC_WORD_ARENA_TRAP,
-    EC_POKEMON2(ARIADOS),
+    EC_POKEMON_NATIONAL(ARIADOS),
     EC_MOVE2(ARM_THRUST),
     EC_POKEMON(ARMALDO),
     EC_MOVE(AROMATHERAPY),
     EC_POKEMON(ARON),
     EC_WORD_AROUND,
     EC_WORD_ARRGH,
-    EC_POKEMON2(ARTICUNO),
+    EC_POKEMON_NATIONAL(ARTICUNO),
     EC_WORD_AS,
     EC_WORD_AS_IF,
     EC_WORD_AS_MUCH_AS,
@@ -114,9 +116,9 @@ const u16 gEasyChatWordsByLetter_A[] = {
     EC_WORD_AWFUL,
     EC_WORD_AWFULLY,
     EC_WORD_AWW,
-    -1, 2, // Doubled pokemon species name
+    DOUBLE_SPECIES_NAME
     EC_POKEMON(AZUMARILL),
-    EC_POKEMON2(AZUMARILL),
+    EC_POKEMON_NATIONAL(AZUMARILL),
     EC_POKEMON(AZURILL),
 };
 
@@ -141,7 +143,7 @@ const u16 gEasyChatWordsByLetter_B[] = {
     EC_WORD_BATTLE_ARMOR,
     EC_WORD_BATTLE_ROOM,
     EC_WORD_BATTLE_TOWER,
-    EC_POKEMON2(BAYLEEF),
+    EC_POKEMON_NATIONAL(BAYLEEF),
     EC_WORD_BE,
     EC_WORD_BEAT,
     EC_MOVE2(BEAT_UP),
@@ -149,17 +151,17 @@ const u16 gEasyChatWordsByLetter_B[] = {
     EC_WORD_BEAUTIFUL,
     EC_WORD_BEAUTY,
     EC_WORD_BECOMES,
-    EC_POKEMON2(BEEDRILL),
+    EC_POKEMON_NATIONAL(BEEDRILL),
     EC_WORD_BEEN,
     EC_WORD_BEFORE,
     EC_WORD_BEGINNING,
     EC_WORD_BEING,
     EC_POKEMON(BELDUM),
     EC_WORD_BELIEVE,
-    -1, 2, // Doubled pokemon species name
+    DOUBLE_SPECIES_NAME
     EC_POKEMON(BELLOSSOM),
-    EC_POKEMON2(BELLOSSOM),
-    EC_POKEMON2(BELLSPROUT),
+    EC_POKEMON_NATIONAL(BELLOSSOM),
+    EC_POKEMON_NATIONAL(BELLSPROUT),
     EC_MOVE2(BELLY_DRUM),
     EC_WORD_BELONGS_TO,
     EC_WORD_BELOW,
@@ -173,12 +175,12 @@ const u16 gEasyChatWordsByLetter_B[] = {
     EC_MOVE(BIND),
     EC_MOVE(BITE),
     EC_MOVE2(BLAST_BURN),
-    EC_POKEMON2(BLASTOISE),
+    EC_POKEMON_NATIONAL(BLASTOISE),
     EC_WORD_BLAZE,
     EC_MOVE2(BLAZE_KICK),
     EC_POKEMON(BLAZIKEN),
     EC_WORD_BLEND,
-    EC_POKEMON2(BLISSEY),
+    EC_POKEMON_NATIONAL(BLISSEY),
     EC_MOVE2(BLIZZARD),
     EC_MOVE2(BLOCK),
     EC_WORD_BOARD,
@@ -199,12 +201,12 @@ const u16 gEasyChatWordsByLetter_B[] = {
     EC_MOVE(BUBBLE),
     EC_MOVE2(BUBBLE_BEAM),
     EC_WORD_BUG,
-    EC_POKEMON2(BULBASAUR),
+    EC_POKEMON_NATIONAL(BULBASAUR),
     EC_MOVE2(BULK_UP),
     EC_MOVE2(BULLET_SEED),
     EC_WORD_BUSY,
     EC_WORD_BUT,
-    EC_POKEMON2(BUTTERFREE),
+    EC_POKEMON_NATIONAL(BUTTERFREE),
     EC_WORD_BYE_BYE,
 };
 
@@ -229,27 +231,27 @@ const u16 gEasyChatWordsByLetter_C[] = {
     EC_POKEMON(CASCOON),
     EC_WORD_CASE,
     EC_POKEMON(CASTFORM),
-    EC_POKEMON2(CATERPIE),
+    EC_POKEMON_NATIONAL(CATERPIE),
     EC_WORD_CAUSE,
-    EC_POKEMON2(CELEBI),
+    EC_POKEMON_NATIONAL(CELEBI),
     EC_WORD_CENTER,
     EC_WORD_CHALLENGE,
     EC_WORD_CHANGE,
     EC_WORD_CHANNEL,
-    EC_POKEMON2(CHANSEY),
+    EC_POKEMON_NATIONAL(CHANSEY),
     EC_MOVE(CHARGE),
-    EC_POKEMON2(CHARIZARD),
+    EC_POKEMON_NATIONAL(CHARIZARD),
     EC_MOVE(CHARM),
-    EC_POKEMON2(CHARMANDER),
-    EC_POKEMON2(CHARMELEON),
+    EC_POKEMON_NATIONAL(CHARMANDER),
+    EC_POKEMON_NATIONAL(CHARMELEON),
     EC_WORD_CHAT,
-    EC_POKEMON2(CHIKORITA),
+    EC_POKEMON_NATIONAL(CHIKORITA),
     EC_WORD_CHILD_S_PLAY,
     EC_WORD_CHILDREN,
     EC_POKEMON(CHIMECHO),
-    -1, 2, // Doubled pokemon species name
+    DOUBLE_SPECIES_NAME
     EC_POKEMON(CHINCHOU),
-    EC_POKEMON2(CHINCHOU),
+    EC_POKEMON_NATIONAL(CHINCHOU),
     EC_WORD_CHLOROPHYLL,
     EC_WORD_CHOICE,
     EC_WORD_CHOOSE,
@@ -259,12 +261,12 @@ const u16 gEasyChatWordsByLetter_C[] = {
     EC_WORD_CLASS,
     EC_POKEMON(CLAYDOL),
     EC_WORD_CLEAR_BODY,
-    EC_POKEMON2(CLEFABLE),
-    EC_POKEMON2(CLEFAIRY),
-    EC_POKEMON2(CLEFFA),
+    EC_POKEMON_NATIONAL(CLEFABLE),
+    EC_POKEMON_NATIONAL(CLEFAIRY),
+    EC_POKEMON_NATIONAL(CLEFFA),
     EC_WORD_CLOSE,
     EC_WORD_CLOUD_NINE,
-    EC_POKEMON2(CLOYSTER),
+    EC_POKEMON_NATIONAL(CLOYSTER),
     EC_WORD_COLD,
     EC_WORD_COLLECT,
     EC_WORD_COLLECTION,
@@ -293,9 +295,9 @@ const u16 gEasyChatWordsByLetter_C[] = {
     EC_WORD_COOLNESS,
     EC_POKEMON(CORPHISH),
     EC_WORD_CORRECT,
-    -1, 2, // Doubled pokemon species name
+    DOUBLE_SPECIES_NAME
     EC_POKEMON(CORSOLA),
-    EC_POKEMON2(CORSOLA),
+    EC_POKEMON_NATIONAL(CORSOLA),
     EC_MOVE(COSMIC_POWER),
     EC_MOVE2(COTTON_SPORE),
     EC_WORD_COULD,
@@ -308,23 +310,23 @@ const u16 gEasyChatWordsByLetter_C[] = {
     EC_POKEMON(CRADILY),
     EC_POKEMON(CRAWDAUNT),
     EC_WORD_CRIES,
-    -1, 2, // Doubled pokemon species name
+    DOUBLE_SPECIES_NAME
     EC_POKEMON(CROBAT),
-    EC_POKEMON2(CROBAT),
-    EC_POKEMON2(CROCONAW),
+    EC_POKEMON_NATIONAL(CROBAT),
+    EC_POKEMON_NATIONAL(CROCONAW),
     EC_MOVE(CROSS_CHOP),
     EC_MOVE(CRUNCH),
     EC_WORD_CRUSH,
     EC_MOVE2(CRUSH_CLAW),
     EC_WORD_CRY,
-    EC_POKEMON2(CUBONE),
+    EC_POKEMON_NATIONAL(CUBONE),
     EC_WORD_CURRENT,
     EC_MOVE2(CURSE),
     EC_MOVE(CUT),
     EC_WORD_CUTE,
     EC_WORD_CUTE_CHARM,
     EC_WORD_CUTENESS,
-    EC_POKEMON2(CYNDAQUIL),
+    EC_POKEMON_NATIONAL(CYNDAQUIL),
 };
 
 const u16 gEasyChatWordsByLetter_D[] = {
@@ -345,7 +347,7 @@ const u16 gEasyChatWordsByLetter_D[] = {
     EC_WORD_DEFEATED,
     EC_MOVE2(DEFENSE_CURL),
     EC_POKEMON(DELCATTY),
-    EC_POKEMON2(DELIBIRD),
+    EC_POKEMON_NATIONAL(DELIBIRD),
     EC_POKEMON(DEOXYS),
     EC_WORD_DEPT_STORE,
     EC_WORD_DESIGN,
@@ -353,14 +355,14 @@ const u16 gEasyChatWordsByLetter_D[] = {
     EC_MOVE2(DESTINY_BOND),
     EC_WORD_DESTROYED,
     EC_MOVE2(DETECT),
-    EC_POKEMON2(DEWGONG),
+    EC_POKEMON_NATIONAL(DEWGONG),
     EC_WORD_DID,
     EC_WORD_DIDN_T,
     EC_WORD_DIET,
     EC_WORD_DIFFERENT,
     EC_MOVE(DIG),
     EC_WORD_DIGITAL,
-    EC_POKEMON2(DIGLETT),
+    EC_POKEMON_NATIONAL(DIGLETT),
     EC_WORD_DIRECT,
     EC_MOVE(DISABLE),
     EC_WORD_DISAPPEAR,
@@ -370,24 +372,24 @@ const u16 gEasyChatWordsByLetter_D[] = {
     EC_WORD_DISASTER,
     EC_WORD_DISLIKE,
     EC_WORD_DISLIKES,
-    EC_POKEMON2(DITTO),
+    EC_POKEMON_NATIONAL(DITTO),
     EC_MOVE2(DIVE),
     EC_MOVE2(DIZZY_PUNCH),
     EC_WORD_DO,
     EC_WORD_DOCILE,
-    -1, 2, // Doubled pokemon species name
+    DOUBLE_SPECIES_NAME
     EC_POKEMON(DODRIO),
-    EC_POKEMON2(DODRIO),
-    -1, 2, // Doubled pokemon species name
+    EC_POKEMON_NATIONAL(DODRIO),
+    DOUBLE_SPECIES_NAME
     EC_POKEMON(DODUO),
-    EC_POKEMON2(DODUO),
+    EC_POKEMON_NATIONAL(DODUO),
     EC_WORD_DOES,
     EC_WORD_DOESN_T,
     EC_WORD_DON_T,
     EC_WORD_DONE,
-    -1, 2, // Doubled pokemon species name
+    DOUBLE_SPECIES_NAME
     EC_POKEMON(DONPHAN),
-    EC_POKEMON2(DONPHAN),
+    EC_POKEMON_NATIONAL(DONPHAN),
     EC_MOVE2(DOOM_DESIRE),
     EC_MOVE2(DOUBLE_KICK),
     EC_MOVE(DOUBLE_TEAM),
@@ -399,10 +401,10 @@ const u16 gEasyChatWordsByLetter_D[] = {
     EC_MOVE2(DRAGON_CLAW),
     EC_MOVE2(DRAGON_DANCE),
     EC_MOVE2(DRAGON_RAGE),
-    EC_POKEMON2(DRAGONAIR),
+    EC_POKEMON_NATIONAL(DRAGONAIR),
     EC_MOVE2(DRAGON_BREATH),
-    EC_POKEMON2(DRAGONITE),
-    EC_POKEMON2(DRATINI),
+    EC_POKEMON_NATIONAL(DRAGONITE),
+    EC_POKEMON_NATIONAL(DRATINI),
     EC_WORD_DREAM,
     EC_MOVE2(DREAM_EATER),
     EC_MOVE2(DRILL_PECK),
@@ -411,10 +413,10 @@ const u16 gEasyChatWordsByLetter_D[] = {
     EC_WORD_DRIZZLE,
     EC_WORD_DROOLING,
     EC_WORD_DROUGHT,
-    EC_POKEMON2(DROWZEE),
+    EC_POKEMON_NATIONAL(DROWZEE),
     EC_WORD_DUDE,
-    EC_POKEMON2(DUGTRIO),
-    EC_POKEMON2(DUNSPARCE),
+    EC_POKEMON_NATIONAL(DUGTRIO),
+    EC_POKEMON_NATIONAL(DUNSPARCE),
     EC_POKEMON(DUSCLOPS),
     EC_POKEMON(DUSKULL),
     EC_POKEMON(DUSTOX),
@@ -429,20 +431,20 @@ const u16 gEasyChatWordsByLetter_E[] = {
     EC_WORD_EAT,
     EC_WORD_EATS,
     EC_WORD_EEK,
-    EC_POKEMON2(EEVEE),
+    EC_POKEMON_NATIONAL(EEVEE),
     EC_WORD_EFFECT_SPORE,
     EC_WORD_EGG,
     EC_MOVE2(EGG_BOMB),
     EC_WORD_EH_QUES,
     EC_WORD_EHEHE,
-    EC_POKEMON2(EKANS),
-    EC_POKEMON2(ELECTABUZZ),
+    EC_POKEMON_NATIONAL(EKANS),
+    EC_POKEMON_NATIONAL(ELECTABUZZ),
     EC_WORD_ELECTRIC,
     EC_POKEMON(ELECTRIKE),
-    -1, 2, // Doubled pokemon species name
+    DOUBLE_SPECIES_NAME
     EC_POKEMON(ELECTRODE),
-    EC_POKEMON2(ELECTRODE),
-    EC_POKEMON2(ELEKID),
+    EC_POKEMON_NATIONAL(ELECTRODE),
+    EC_POKEMON_NATIONAL(ELEKID),
     EC_WORD_ELSE,
     EC_MOVE2(EMBER),
     EC_WORD_EMERALD,
@@ -454,11 +456,11 @@ const u16 gEasyChatWordsByLetter_E[] = {
     EC_WORD_ENJOY,
     EC_WORD_ENJOYS,
     EC_WORD_ENOUGH,
-    EC_POKEMON2(ENTEI),
+    EC_POKEMON_NATIONAL(ENTEI),
     EC_WORD_ENTERTAINING,
     EC_MOVE2(ERUPTION),
     EC_WORD_ESCAPE,
-    EC_POKEMON2(ESPEON),
+    EC_POKEMON_NATIONAL(ESPEON),
     EC_WORD_EVEN_SO,
     EC_WORD_EVENT,
     EC_WORD_EVENTS,
@@ -472,8 +474,8 @@ const u16 gEasyChatWordsByLetter_E[] = {
     EC_WORD_EXCITING,
     EC_WORD_EXCUSE,
     EC_WORD_EXCUSE_ME,
-    EC_POKEMON2(EXEGGCUTE),
-    EC_POKEMON2(EXEGGUTOR),
+    EC_POKEMON_NATIONAL(EXEGGCUTE),
+    EC_POKEMON_NATIONAL(EXEGGUTOR),
     EC_WORD_EXISTS,
     EC_WORD_EXPENSIVE,
     EC_MOVE2(EXPLOSION),
@@ -495,16 +497,16 @@ const u16 gEasyChatWordsByLetter_F[] = {
     EC_WORD_FAMILY,
     EC_WORD_FANTASTIC,
     EC_WORD_FAR,
-    EC_POKEMON2(FARFETCHD),
+    EC_POKEMON_NATIONAL(FARFETCHD),
     EC_WORD_FASHION,
     EC_WORD_FAST,
     EC_WORD_FATHER,
     EC_WORD_FEAR,
-    EC_POKEMON2(FEAROW),
+    EC_POKEMON_NATIONAL(FEAROW),
     EC_MOVE2(FEATHER_DANCE),
     EC_POKEMON(FEEBAS),
     EC_WORD_FEELING,
-    EC_POKEMON2(FERALIGATR),
+    EC_POKEMON_NATIONAL(FERALIGATR),
     EC_WORD_FESTIVAL,
     EC_WORD_FEVER,
     EC_WORD_FIERY,
@@ -520,13 +522,13 @@ const u16 gEasyChatWordsByLetter_F[] = {
     EC_MOVE2(FIRE_SPIN),
     EC_WORD_FISHING,
     EC_MOVE(FISSURE),
-    EC_POKEMON2(FLAAFFY),
+    EC_POKEMON_NATIONAL(FLAAFFY),
     EC_MOVE(FLAIL),
     EC_WORD_FLAME,
     EC_WORD_FLAME_BODY,
     EC_MOVE(FLAME_WHEEL),
     EC_MOVE(FLAMETHROWER),
-    EC_POKEMON2(FLAREON),
+    EC_POKEMON_NATIONAL(FLAREON),
     EC_MOVE2(FLASH),
     EC_WORD_FLASH_FIRE,
     EC_WORD_FLATTEN,
@@ -547,7 +549,7 @@ const u16 gEasyChatWordsByLetter_F[] = {
     EC_WORD_FORGET,
     EC_WORD_FORGETS,
     EC_WORD_FORGIVE,
-    EC_POKEMON2(FORRETRESS),
+    EC_POKEMON_NATIONAL(FORRETRESS),
     EC_MOVE2(FRENZY_PLANT),
     EC_WORD_FRIDAY,
     EC_WORD_FRIEND,
@@ -558,7 +560,7 @@ const u16 gEasyChatWordsByLetter_F[] = {
     EC_WORD_FUFUFU,
     EC_WORD_FULL,
     EC_WORD_FUNNY,
-    EC_POKEMON2(FURRET),
+    EC_POKEMON_NATIONAL(FURRET),
     EC_MOVE2(FURY_ATTACK),
     EC_MOVE2(FURY_CUTTER),
     EC_MOVE2(FURY_SWIPES),
@@ -568,12 +570,12 @@ const u16 gEasyChatWordsByLetter_F[] = {
 const u16 gEasyChatWordsByLetter_G[] = {
     EC_WORD_GAME,
     EC_POKEMON(GARDEVOIR),
-    EC_POKEMON2(GASTLY),
-    EC_POKEMON2(GENGAR),
+    EC_POKEMON_NATIONAL(GASTLY),
+    EC_POKEMON_NATIONAL(GENGAR),
     EC_WORD_GENIUS,
-    -1, 2, // Doubled pokemon species name
+    DOUBLE_SPECIES_NAME
     EC_POKEMON(GEODUDE),
-    EC_POKEMON2(GEODUDE),
+    EC_POKEMON_NATIONAL(GEODUDE),
     EC_WORD_GET,
     EC_WORD_GETS,
     EC_WORD_GHOST,
@@ -581,9 +583,9 @@ const u16 gEasyChatWordsByLetter_G[] = {
     EC_MOVE(GIGA_DRAIN),
     EC_WORD_GIGGLE,
     EC_WORD_GIMME,
-    -1, 2, // Doubled pokemon species name
+    DOUBLE_SPECIES_NAME
     EC_POKEMON(GIRAFARIG),
-    EC_POKEMON2(GIRAFARIG),
+    EC_POKEMON_NATIONAL(GIRAFARIG),
     EC_WORD_GIRL,
     EC_WORD_GIVE,
     EC_WORD_GIVE_ME,
@@ -591,29 +593,29 @@ const u16 gEasyChatWordsByLetter_G[] = {
     EC_WORD_GIVES,
     EC_POKEMON(GLALIE),
     EC_MOVE2(GLARE),
-    EC_POKEMON2(GLIGAR),
-    -1, 2, // Doubled pokemon species name
+    EC_POKEMON_NATIONAL(GLIGAR),
+    DOUBLE_SPECIES_NAME
     EC_POKEMON(GLOOM),
-    EC_POKEMON2(GLOOM),
+    EC_POKEMON_NATIONAL(GLOOM),
     EC_WORD_GO,
     EC_WORD_GO_AHEAD,
     EC_WORD_GO_EASY,
     EC_WORD_GO_HOME,
     EC_WORD_GOES,
     EC_WORD_GOING,
-    -1, 2, // Doubled pokemon species name
+    DOUBLE_SPECIES_NAME
     EC_POKEMON(GOLBAT),
-    EC_POKEMON2(GOLBAT),
+    EC_POKEMON_NATIONAL(GOLBAT),
     EC_WORD_GOLD,
-    -1, 2, // Doubled pokemon species name
+    DOUBLE_SPECIES_NAME
     EC_POKEMON(GOLDEEN),
-    EC_POKEMON2(GOLDEEN),
-    -1, 2, // Doubled pokemon species name
+    EC_POKEMON_NATIONAL(GOLDEEN),
+    DOUBLE_SPECIES_NAME
     EC_POKEMON(GOLDUCK),
-    EC_POKEMON2(GOLDUCK),
-    -1, 2, // Doubled pokemon species name
+    EC_POKEMON_NATIONAL(GOLDUCK),
+    DOUBLE_SPECIES_NAME
     EC_POKEMON(GOLEM),
-    EC_POKEMON2(GOLEM),
+    EC_POKEMON_NATIONAL(GOLEM),
     EC_WORD_GOOD,
     EC_WORD_GOOD_BYE,
     EC_POKEMON(GOREBYSS),
@@ -621,25 +623,25 @@ const u16 gEasyChatWordsByLetter_G[] = {
     EC_WORD_GOTCHA,
     EC_WORD_GOURMET,
     EC_WORD_GRAAAH,
-    EC_POKEMON2(GRANBULL),
+    EC_POKEMON_NATIONAL(GRANBULL),
     EC_WORD_GRANDFATHER,
     EC_WORD_GRANDMOTHER,
     EC_WORD_GRASS,
     EC_MOVE(GRASS_WHISTLE),
-    -1, 2, // Doubled pokemon species name
+    DOUBLE_SPECIES_NAME
     EC_POKEMON(GRAVELER),
-    EC_POKEMON2(GRAVELER),
+    EC_POKEMON_NATIONAL(GRAVELER),
     EC_WORD_GREAT,
     EC_WORD_GREEN,
-    -1, 2, // Doubled pokemon species name
+    DOUBLE_SPECIES_NAME
     EC_POKEMON(GRIMER),
-    EC_POKEMON2(GRIMER),
+    EC_POKEMON_NATIONAL(GRIMER),
     EC_POKEMON(GROUDON),
     EC_WORD_GROUND,
     EC_WORD_GROUP,
     EC_POKEMON(GROVYLE),
     EC_MOVE2(GROWL),
-    EC_POKEMON2(GROWLITHE),
+    EC_POKEMON_NATIONAL(GROWLITHE),
     EC_MOVE(GROWTH),
     EC_MOVE(GRUDGE),
     EC_POKEMON(GRUMPIG),
@@ -651,9 +653,9 @@ const u16 gEasyChatWordsByLetter_G[] = {
     EC_WORD_GUTSY,
     EC_WORD_GWAH,
     EC_WORD_GWAHAHAHA,
-    -1, 2, // Doubled pokemon species name
+    DOUBLE_SPECIES_NAME
     EC_POKEMON(GYARADOS),
-    EC_POKEMON2(GYARADOS),
+    EC_POKEMON_NATIONAL(GYARADOS),
 };
 
 const u16 gEasyChatWordsByLetter_H[] = {
@@ -671,7 +673,7 @@ const u16 gEasyChatWordsByLetter_H[] = {
     EC_POKEMON(HARIYAMA),
     EC_WORD_HAS,
     EC_WORD_HASSLE,
-    EC_POKEMON2(HAUNTER),
+    EC_POKEMON_NATIONAL(HAUNTER),
     EC_WORD_HAVE,
     EC_WORD_HAVEN_T,
     EC_MOVE(HAZE),
@@ -691,9 +693,9 @@ const u16 gEasyChatWordsByLetter_H[] = {
     EC_WORD_HELLO,
     EC_MOVE2(HELPING_HAND),
     EC_WORD_HER,
-    -1, 2, // Doubled pokemon species name
+    DOUBLE_SPECIES_NAME
     EC_POKEMON(HERACROSS),
-    EC_POKEMON2(HERACROSS),
+    EC_POKEMON_NATIONAL(HERACROSS),
     EC_WORD_HERE,
     EC_WORD_HERE_GOES,
     EC_WORD_HERE_I_COME,
@@ -714,28 +716,28 @@ const u16 gEasyChatWordsByLetter_H[] = {
     EC_WORD_HIP_AND,
     EC_WORD_HIS,
     EC_WORD_HIT,
-    EC_POKEMON2(HITMONCHAN),
-    EC_POKEMON2(HITMONLEE),
-    EC_POKEMON2(HITMONTOP),
+    EC_POKEMON_NATIONAL(HITMONCHAN),
+    EC_POKEMON_NATIONAL(HITMONLEE),
+    EC_POKEMON_NATIONAL(HITMONTOP),
     EC_WORD_HIYAH,
     EC_WORD_HMM,
-    EC_POKEMON2(HO_OH),
+    EC_POKEMON_NATIONAL(HO_OH),
     EC_WORD_HOBBY,
     EC_WORD_HOHOHO,
     EC_WORD_HOLIDAY,
     EC_WORD_HOME,
     EC_WORD_HOO_HAH,
-    EC_POKEMON2(HOOTHOOT),
+    EC_POKEMON_NATIONAL(HOOTHOOT),
     EC_WORD_HOPELESS,
-    EC_POKEMON2(HOPPIP),
+    EC_POKEMON_NATIONAL(HOPPIP),
     EC_MOVE2(HORN_ATTACK),
     EC_MOVE2(HORN_DRILL),
-    -1, 2, // Doubled pokemon species name
+    DOUBLE_SPECIES_NAME
     EC_POKEMON(HORSEA),
-    EC_POKEMON2(HORSEA),
+    EC_POKEMON_NATIONAL(HORSEA),
     EC_WORD_HOT,
-    EC_POKEMON2(HOUNDOOM),
-    EC_POKEMON2(HOUNDOUR),
+    EC_POKEMON_NATIONAL(HOUNDOOM),
+    EC_POKEMON_NATIONAL(HOUNDOUR),
     EC_WORD_HOW,
     EC_WORD_HOW_DO,
     EC_WORD_HOWEVER,
@@ -754,7 +756,7 @@ const u16 gEasyChatWordsByLetter_H[] = {
     EC_WORD_HYPER_CUTTER,
     EC_MOVE2(HYPER_FANG),
     EC_MOVE2(HYPER_VOICE),
-    EC_POKEMON2(HYPNO),
+    EC_POKEMON_NATIONAL(HYPNO),
     EC_MOVE(HYPNOSIS),
 };
 
@@ -775,9 +777,9 @@ const u16 gEasyChatWordsByLetter_I[] = {
     EC_WORD_IF,
     EC_WORD_IF_I_LOSE,
     EC_WORD_IF_I_WIN,
-    -1, 2, // Doubled pokemon species name
+    DOUBLE_SPECIES_NAME
     EC_POKEMON(IGGLYBUFF),
-    EC_POKEMON2(IGGLYBUFF),
+    EC_POKEMON_NATIONAL(IGGLYBUFF),
     EC_WORD_IGNORANT,
     EC_WORD_ILLUMINATE,
     EC_POKEMON(ILLUMISE),
@@ -805,32 +807,32 @@ const u16 gEasyChatWordsByLetter_I[] = {
     EC_WORD_IT,
     EC_WORD_IT_S,
     EC_WORD_ITEM,
-    EC_POKEMON2(IVYSAUR),
+    EC_POKEMON_NATIONAL(IVYSAUR),
 };
 
 const u16 gEasyChatWordsByLetter_J[] = {
-    -1, 2, // Doubled pokemon species name
+    DOUBLE_SPECIES_NAME
     EC_POKEMON(JIGGLYPUFF),
-    EC_POKEMON2(JIGGLYPUFF),
+    EC_POKEMON_NATIONAL(JIGGLYPUFF),
     EC_POKEMON(JIRACHI),
     EC_WORD_JOKING,
-    EC_POKEMON2(JOLTEON),
+    EC_POKEMON_NATIONAL(JOLTEON),
     EC_WORD_JOY,
     EC_WORD_JUDGE,
     EC_MOVE2(JUMP_KICK),
-    EC_POKEMON2(JUMPLUFF),
+    EC_POKEMON_NATIONAL(JUMPLUFF),
     EC_WORD_JUST,
-    EC_POKEMON2(JYNX),
+    EC_POKEMON_NATIONAL(JYNX),
 };
 
 const u16 gEasyChatWordsByLetter_K[] = {
-    EC_POKEMON2(KABUTO),
-    EC_POKEMON2(KABUTOPS),
-    -1, 2, // Doubled pokemon species name
+    EC_POKEMON_NATIONAL(KABUTO),
+    EC_POKEMON_NATIONAL(KABUTOPS),
+    DOUBLE_SPECIES_NAME
     EC_POKEMON(KADABRA),
-    EC_POKEMON2(KADABRA),
-    EC_POKEMON2(KAKUNA),
-    EC_POKEMON2(KANGASKHAN),
+    EC_POKEMON_NATIONAL(KADABRA),
+    EC_POKEMON_NATIONAL(KAKUNA),
+    EC_POKEMON_NATIONAL(KANGASKHAN),
     EC_MOVE(KARATE_CHOP),
     EC_POKEMON(KECLEON),
     EC_WORD_KEEN_EYE,
@@ -839,19 +841,19 @@ const u16 gEasyChatWordsByLetter_K[] = {
     EC_WORD_KIND,
     EC_WORD_KINDERGARTEN,
     EC_MOVE(KINESIS),
-    -1, 2, // Doubled pokemon species name
+    DOUBLE_SPECIES_NAME
     EC_POKEMON(KINGDRA),
-    EC_POKEMON2(KINGDRA),
-    EC_POKEMON2(KINGLER),
+    EC_POKEMON_NATIONAL(KINGDRA),
+    EC_POKEMON_NATIONAL(KINGLER),
     EC_POKEMON(KIRLIA),
     EC_MOVE2(KNOCK_OFF),
     EC_WORD_KNOCKOUT,
     EC_WORD_KNOW,
     EC_WORD_KNOWS,
-    -1, 2, // Doubled pokemon species name
+    DOUBLE_SPECIES_NAME
     EC_POKEMON(KOFFING),
-    EC_POKEMON2(KOFFING),
-    EC_POKEMON2(KRABBY),
+    EC_POKEMON_NATIONAL(KOFFING),
+    EC_POKEMON_NATIONAL(KRABBY),
     EC_WORD_KTHX_BYE,
     EC_POKEMON(KYOGRE),
 };
@@ -862,11 +864,11 @@ const u16 gEasyChatWordsByLetter_L[] = {
     EC_WORD_LADY,
     EC_POKEMON(LAIRON),
     EC_WORD_LALALA,
-    -1, 2, // Doubled pokemon species name
+    DOUBLE_SPECIES_NAME
     EC_POKEMON(LANTURN),
-    EC_POKEMON2(LANTURN),
-    EC_POKEMON2(LAPRAS),
-    EC_POKEMON2(LARVITAR),
+    EC_POKEMON_NATIONAL(LANTURN),
+    EC_POKEMON_NATIONAL(LAPRAS),
+    EC_POKEMON_NATIONAL(LARVITAR),
     EC_WORD_LAST,
     EC_WORD_LATE,
     EC_WORD_LATER,
@@ -879,8 +881,8 @@ const u16 gEasyChatWordsByLetter_L[] = {
     EC_WORD_LEAF,
     EC_MOVE2(LEAF_BLADE),
     EC_WORD_LEARN,
-    EC_POKEMON2(LEDIAN),
-    EC_POKEMON2(LEDYBA),
+    EC_POKEMON_NATIONAL(LEDIAN),
+    EC_POKEMON_NATIONAL(LEDYBA),
     EC_MOVE(LEECH_LIFE),
     EC_MOVE2(LEECH_SEED),
     EC_MOVE2(LEER),
@@ -894,7 +896,7 @@ const u16 gEasyChatWordsByLetter_L[] = {
     EC_WORD_LEVEL,
     EC_WORD_LEVITATE,
     EC_MOVE(LICK),
-    EC_POKEMON2(LICKITUNG),
+    EC_POKEMON_NATIONAL(LICKITUNG),
     EC_WORD_LIE,
     EC_WORD_LIFE,
     EC_MOVE2(LIGHT_SCREEN),
@@ -933,7 +935,7 @@ const u16 gEasyChatWordsByLetter_L[] = {
     EC_MOVE(LOW_KICK),
     EC_WORD_LOWS,
     EC_POKEMON(LUDICOLO),
-    EC_POKEMON2(LUGIA),
+    EC_POKEMON_NATIONAL(LUGIA),
     EC_WORD_LUKEWARM,
     EC_POKEMON(LUNATONE),
     EC_MOVE2(LUSTER_PURGE),
@@ -942,35 +944,35 @@ const u16 gEasyChatWordsByLetter_L[] = {
 
 const u16 gEasyChatWordsByLetter_M[] = {
     EC_MOVE2(MACH_PUNCH),
-    -1, 2, // Doubled pokemon species name
+    DOUBLE_SPECIES_NAME
     EC_POKEMON(MACHAMP),
-    EC_POKEMON2(MACHAMP),
+    EC_POKEMON_NATIONAL(MACHAMP),
     EC_WORD_MACHINE,
-    -1, 2, // Doubled pokemon species name
+    DOUBLE_SPECIES_NAME
     EC_POKEMON(MACHOKE),
-    EC_POKEMON2(MACHOKE),
-    -1, 2, // Doubled pokemon species name
+    EC_POKEMON_NATIONAL(MACHOKE),
+    DOUBLE_SPECIES_NAME
     EC_POKEMON(MACHOP),
-    EC_POKEMON2(MACHOP),
+    EC_POKEMON_NATIONAL(MACHOP),
     EC_WORD_MAGAZINE,
-    EC_POKEMON2(MAGBY),
-    -1, 2, // Doubled pokemon species name
+    EC_POKEMON_NATIONAL(MAGBY),
+    DOUBLE_SPECIES_NAME
     EC_POKEMON(MAGCARGO),
-    EC_POKEMON2(MAGCARGO),
+    EC_POKEMON_NATIONAL(MAGCARGO),
     EC_MOVE2(MAGIC_COAT),
     EC_MOVE2(MAGICAL_LEAF),
-    -1, 2, // Doubled pokemon species name
+    DOUBLE_SPECIES_NAME
     EC_POKEMON(MAGIKARP),
-    EC_POKEMON2(MAGIKARP),
+    EC_POKEMON_NATIONAL(MAGIKARP),
     EC_WORD_MAGMA_ARMOR,
-    EC_POKEMON2(MAGMAR),
-    -1, 2, // Doubled pokemon species name
+    EC_POKEMON_NATIONAL(MAGMAR),
+    DOUBLE_SPECIES_NAME
     EC_POKEMON(MAGNEMITE),
-    EC_POKEMON2(MAGNEMITE),
+    EC_POKEMON_NATIONAL(MAGNEMITE),
     EC_WORD_MAGNET_PULL,
-    -1, 2, // Doubled pokemon species name
+    DOUBLE_SPECIES_NAME
     EC_POKEMON(MAGNETON),
-    EC_POKEMON2(MAGNETON),
+    EC_POKEMON_NATIONAL(MAGNETON),
     EC_MOVE2(MAGNITUDE),
     EC_WORD_MAIL,
     EC_WORD_MAKE,
@@ -978,13 +980,13 @@ const u16 gEasyChatWordsByLetter_M[] = {
     EC_POKEMON(MAKUHITA),
     EC_WORD_MAN,
     EC_POKEMON(MANECTRIC),
-    EC_POKEMON2(MANKEY),
-    EC_POKEMON2(MANTINE),
-    EC_POKEMON2(MAREEP),
-    -1, 2, // Doubled pokemon species name
+    EC_POKEMON_NATIONAL(MANKEY),
+    EC_POKEMON_NATIONAL(MANTINE),
+    EC_POKEMON_NATIONAL(MAREEP),
+    DOUBLE_SPECIES_NAME
     EC_POKEMON(MARILL),
-    EC_POKEMON2(MARILL),
-    EC_POKEMON2(MAROWAK),
+    EC_POKEMON_NATIONAL(MARILL),
+    EC_POKEMON_NATIONAL(MAROWAK),
     EC_POKEMON(MARSHTOMP),
     EC_WORD_MARVEL_SCALE,
     EC_POKEMON(MASQUERAIN),
@@ -1008,23 +1010,23 @@ const u16 gEasyChatWordsByLetter_M[] = {
     EC_MOVE2(MEGA_KICK),
     EC_MOVE2(MEGA_PUNCH),
     EC_MOVE2(MEGAHORN),
-    EC_POKEMON2(MEGANIUM),
+    EC_POKEMON_NATIONAL(MEGANIUM),
     EC_MOVE(MEMENTO),
-    EC_POKEMON2(MEOWTH),
+    EC_POKEMON_NATIONAL(MEOWTH),
     EC_WORD_MESSAGE,
     EC_POKEMON(METAGROSS),
     EC_MOVE2(METAL_CLAW),
     EC_MOVE(METAL_SOUND),
     EC_POKEMON(METANG),
-    EC_POKEMON2(METAPOD),
+    EC_POKEMON_NATIONAL(METAPOD),
     EC_MOVE(METEOR_MASH),
     EC_MOVE2(METRONOME),
-    EC_POKEMON2(MEW),
-    EC_POKEMON2(MEWTWO),
+    EC_POKEMON_NATIONAL(MEW),
+    EC_POKEMON_NATIONAL(MEWTWO),
     EC_POKEMON(MIGHTYENA),
     EC_MOVE2(MILK_DRINK),
     EC_POKEMON(MILOTIC),
-    EC_POKEMON2(MILTANK),
+    EC_POKEMON_NATIONAL(MILTANK),
     EC_MOVE2(MIMIC),
     EC_MOVE(MIND_READER),
     EC_MOVE2(MINIMIZE),
@@ -1032,7 +1034,7 @@ const u16 gEasyChatWordsByLetter_M[] = {
     EC_WORD_MINUS,
     EC_MOVE2(MIRROR_COAT),
     EC_MOVE(MIRROR_MOVE),
-    EC_POKEMON2(MISDREAVUS),
+    EC_POKEMON_NATIONAL(MISDREAVUS),
     EC_WORD_MISHEARD,
     EC_WORD_MISS,
     EC_MOVE(MIST),
@@ -1041,7 +1043,7 @@ const u16 gEasyChatWordsByLetter_M[] = {
     EC_WORD_MMM,
     EC_WORD_MODE,
     EC_WORD_MODERN,
-    EC_POKEMON2(MOLTRES),
+    EC_POKEMON_NATIONAL(MOLTRES),
     EC_WORD_MOMENTUM,
     EC_WORD_MONDAY,
     EC_WORD_MONEY,
@@ -1055,7 +1057,7 @@ const u16 gEasyChatWordsByLetter_M[] = {
     EC_WORD_MOVE,
     EC_WORD_MOVIE,
     EC_WORD_MR,
-    EC_POKEMON2(MR_MIME),
+    EC_POKEMON_NATIONAL(MR_MIME),
     EC_WORD_MRS,
     EC_WORD_MUCH,
     EC_WORD_MUCH_OBLIGED,
@@ -1065,10 +1067,10 @@ const u16 gEasyChatWordsByLetter_M[] = {
     EC_MOVE2(MUDDY_WATER),
     EC_POKEMON(MUDKIP),
     EC_WORD_MUFUFU,
-    -1, 2, // Doubled pokemon species name
+    DOUBLE_SPECIES_NAME
     EC_POKEMON(MUK),
-    EC_POKEMON2(MUK),
-    EC_POKEMON2(MURKROW),
+    EC_POKEMON_NATIONAL(MUK),
+    EC_POKEMON_NATIONAL(MURKROW),
     EC_WORD_MUSIC,
     EC_WORD_MUST_BE,
     EC_WORD_MY,
@@ -1079,9 +1081,9 @@ const u16 gEasyChatWordsByLetter_M[] = {
 const u16 gEasyChatWordsByLetter_N[] = {
     EC_WORD_NAME,
     EC_WORD_NAP,
-    -1, 2, // Doubled pokemon species name
+    DOUBLE_SPECIES_NAME
     EC_POKEMON(NATU),
-    EC_POKEMON2(NATU),
+    EC_POKEMON_NATIONAL(NATU),
     EC_WORD_NATURAL,
     EC_WORD_NATURAL_CURE,
     EC_WORD_NATURALLY,
@@ -1097,26 +1099,26 @@ const u16 gEasyChatWordsByLetter_N[] = {
     EC_WORD_NEWS,
     EC_WORD_NEXT,
     EC_WORD_NICE,
-    EC_POKEMON2(NIDOKING),
-    EC_POKEMON2(NIDOQUEEN),
-    EC_POKEMON2(NIDORAN_F),
-    EC_POKEMON2(NIDORAN_M),
-    EC_POKEMON2(NIDORINA),
-    EC_POKEMON2(NIDORINO),
+    EC_POKEMON_NATIONAL(NIDOKING),
+    EC_POKEMON_NATIONAL(NIDOQUEEN),
+    EC_POKEMON_NATIONAL(NIDORAN_F),
+    EC_POKEMON_NATIONAL(NIDORAN_M),
+    EC_POKEMON_NATIONAL(NIDORINA),
+    EC_POKEMON_NATIONAL(NIDORINO),
     EC_WORD_NIGHT,
     EC_MOVE2(NIGHT_SHADE),
     EC_MOVE(NIGHTMARE),
     EC_WORD_NIGHTTIME,
     EC_POKEMON(NINCADA),
-    -1, 2, // Doubled pokemon species name
+    DOUBLE_SPECIES_NAME
     EC_POKEMON(NINETALES),
-    EC_POKEMON2(NINETALES),
+    EC_POKEMON_NATIONAL(NINETALES),
     EC_POKEMON(NINJASK),
     EC_WORD_NITWIT,
     EC_WORD_NO,
     EC_WORD_NO_MATCH,
     EC_WORD_NO_1,
-    EC_POKEMON2(NOCTOWL),
+    EC_POKEMON_NATIONAL(NOCTOWL),
     EC_WORD_NOISY,
     EC_WORD_NON_STOP,
     EC_WORD_NONE,
@@ -1134,10 +1136,10 @@ const u16 gEasyChatWordsByLetter_N[] = {
 const u16 gEasyChatWordsByLetter_O[] = {
     EC_WORD_OBLIVIOUS,
     EC_MOVE(OCTAZOOKA),
-    EC_POKEMON2(OCTILLERY),
-    -1, 2, // Doubled pokemon species name
+    EC_POKEMON_NATIONAL(OCTILLERY),
+    DOUBLE_SPECIES_NAME
     EC_POKEMON(ODDISH),
-    EC_POKEMON2(ODDISH),
+    EC_POKEMON_NATIONAL(ODDISH),
     EC_MOVE(ODOR_SLEUTH),
     EC_WORD_OF,
     EC_WORD_OFF,
@@ -1153,11 +1155,11 @@ const u16 gEasyChatWordsByLetter_O[] = {
     EC_WORD_OKAY,
     EC_WORD_OLD,
     EC_WORD_OLDEN,
-    EC_POKEMON2(OMANYTE),
-    EC_POKEMON2(OMASTAR),
+    EC_POKEMON_NATIONAL(OMANYTE),
+    EC_POKEMON_NATIONAL(OMASTAR),
     EC_WORD_ON,
     EC_WORD_ONCE,
-    EC_POKEMON2(ONIX),
+    EC_POKEMON_NATIONAL(ONIX),
     EC_WORD_ONLY,
     EC_WORD_OOPS,
     EC_WORD_OPPONENT,
@@ -1179,8 +1181,8 @@ const u16 gEasyChatWordsByLetter_O[] = {
 
 const u16 gEasyChatWordsByLetter_P[] = {
     EC_MOVE(PAIN_SPLIT),
-    EC_POKEMON2(PARAS),
-    EC_POKEMON2(PARASECT),
+    EC_POKEMON_NATIONAL(PARAS),
+    EC_POKEMON_NATIONAL(PARASECT),
     EC_WORD_PARDON,
     EC_WORD_PARENT,
     EC_WORD_PARTNER,
@@ -1193,29 +1195,29 @@ const u16 gEasyChatWordsByLetter_P[] = {
     EC_WORD_PERFECT,
     EC_WORD_PERFECTION,
     EC_MOVE2(PERISH_SONG),
-    EC_POKEMON2(PERSIAN),
+    EC_POKEMON_NATIONAL(PERSIAN),
     EC_WORD_PERSON,
     EC_MOVE2(PETAL_DANCE),
-    -1, 2, // Doubled pokemon species name
+    DOUBLE_SPECIES_NAME
     EC_POKEMON(PHANPY),
-    EC_POKEMON2(PHANPY),
+    EC_POKEMON_NATIONAL(PHANPY),
     EC_WORD_PHONE,
-    -1, 2, // Doubled pokemon species name
+    DOUBLE_SPECIES_NAME
     EC_POKEMON(PICHU),
-    EC_POKEMON2(PICHU),
+    EC_POKEMON_NATIONAL(PICHU),
     EC_WORD_PICKUP,
-    EC_POKEMON2(PIDGEOT),
-    EC_POKEMON2(PIDGEOTTO),
-    EC_POKEMON2(PIDGEY),
-    -1, 2, // Doubled pokemon species name
+    EC_POKEMON_NATIONAL(PIDGEOT),
+    EC_POKEMON_NATIONAL(PIDGEOTTO),
+    EC_POKEMON_NATIONAL(PIDGEY),
+    DOUBLE_SPECIES_NAME
     EC_POKEMON(PIKACHU),
-    EC_POKEMON2(PIKACHU),
-    EC_POKEMON2(PILOSWINE),
+    EC_POKEMON_NATIONAL(PIKACHU),
+    EC_POKEMON_NATIONAL(PILOSWINE),
     EC_MOVE2(PIN_MISSILE),
-    EC_POKEMON2(PINECO),
-    -1, 2, // Doubled pokemon species name
+    EC_POKEMON_NATIONAL(PINECO),
+    DOUBLE_SPECIES_NAME
     EC_POKEMON(PINSIR),
-    EC_POKEMON2(PINSIR),
+    EC_POKEMON_NATIONAL(PINSIR),
     EC_WORD_PKRS,
     EC_WORD_PLACE,
     EC_WORD_PLANS,
@@ -1238,15 +1240,15 @@ const u16 gEasyChatWordsByLetter_P[] = {
     EC_WORD_POKEDEX,
     EC_WORD_POKEMON,
     EC_WORD_POKENAV,
-    EC_POKEMON2(POLITOED),
-    EC_POKEMON2(POLIWAG),
-    EC_POKEMON2(POLIWHIRL),
-    EC_POKEMON2(POLIWRATH),
-    EC_POKEMON2(PONYTA),
+    EC_POKEMON_NATIONAL(POLITOED),
+    EC_POKEMON_NATIONAL(POLIWAG),
+    EC_POKEMON_NATIONAL(POLIWHIRL),
+    EC_POKEMON_NATIONAL(POLIWRATH),
+    EC_POKEMON_NATIONAL(PONYTA),
     EC_POKEMON(POOCHYENA),
     EC_WORD_POPULAR,
-    EC_POKEMON2(PORYGON),
-    EC_POKEMON2(PORYGON2),
+    EC_POKEMON_NATIONAL(PORYGON),
+    EC_POKEMON_NATIONAL(PORYGON2),
     EC_MOVE2(POUND),
     EC_MOVE(POWDER_SNOW),
     EC_WORD_POWER,
@@ -1256,52 +1258,52 @@ const u16 gEasyChatWordsByLetter_P[] = {
     EC_WORD_PRESSURE,
     EC_WORD_PRETEND,
     EC_WORD_PRETTY,
-    EC_POKEMON2(PRIMEAPE),
+    EC_POKEMON_NATIONAL(PRIMEAPE),
     EC_WORD_PROBABLY,
     EC_WORD_PROMISE,
     EC_MOVE2(PROTECT),
     EC_MOVE(PSYBEAM),
     EC_MOVE(PSYCH_UP),
-    -1, 2, // Doubled pokemon species name
+    DOUBLE_SPECIES_NAME
     EC_WORD_PSYCHIC,
     EC_MOVE(PSYCHIC),
     EC_MOVE(PSYCHO_BOOST),
-    -1, 2, // Doubled pokemon species name
+    DOUBLE_SPECIES_NAME
     EC_POKEMON(PSYDUCK),
-    EC_POKEMON2(PSYDUCK),
+    EC_POKEMON_NATIONAL(PSYDUCK),
     EC_MOVE(PSYWAVE),
-    EC_POKEMON2(PUPITAR),
+    EC_POKEMON_NATIONAL(PUPITAR),
     EC_WORD_PURE_POWER,
     EC_MOVE(PURSUIT),
     EC_WORD_PUSHOVER,
 };
 
 const u16 gEasyChatWordsByLetter_Q[] = {
-    EC_POKEMON2(QUAGSIRE),
+    EC_POKEMON_NATIONAL(QUAGSIRE),
     EC_WORD_QUESTION,
     EC_MOVE2(QUICK_ATTACK),
-    EC_POKEMON2(QUILAVA),
+    EC_POKEMON_NATIONAL(QUILAVA),
     EC_WORD_QUITE,
-    EC_POKEMON2(QWILFISH),
+    EC_POKEMON_NATIONAL(QWILFISH),
 };
 
 const u16 gEasyChatWordsByLetter_R[] = {
     EC_WORD_RADIO,
     EC_MOVE(RAGE),
-    -1, 2, // Doubled pokemon species name
+    DOUBLE_SPECIES_NAME
     EC_POKEMON(RAICHU),
-    EC_POKEMON2(RAICHU),
-    EC_POKEMON2(RAIKOU),
+    EC_POKEMON_NATIONAL(RAICHU),
+    EC_POKEMON_NATIONAL(RAIKOU),
     EC_MOVE(RAIN_DANCE),
     EC_WORD_RAIN_DISH,
     EC_POKEMON(RALTS),
     EC_WORD_RANK,
     EC_MOVE(RAPID_SPIN),
-    EC_POKEMON2(RAPIDASH),
+    EC_POKEMON_NATIONAL(RAPIDASH),
     EC_WORD_RARE,
     EC_WORD_RATHER,
-    EC_POKEMON2(RATICATE),
-    EC_POKEMON2(RATTATA),
+    EC_POKEMON_NATIONAL(RATICATE),
+    EC_POKEMON_NATIONAL(RATTATA),
     EC_POKEMON(RAYQUAZA),
     EC_MOVE2(RAZOR_LEAF),
     EC_MOVE(RAZOR_WIND),
@@ -1323,19 +1325,19 @@ const u16 gEasyChatWordsByLetter_R[] = {
     EC_WORD_REJECT,
     EC_WORD_RELEASE,
     EC_POKEMON(RELICANTH),
-    EC_POKEMON2(REMORAID),
+    EC_POKEMON_NATIONAL(REMORAID),
     EC_WORD_RENTAL,
     EC_MOVE2(REST),
     EC_WORD_RESUSCITATE,
     EC_MOVE(RETURN),
     EC_MOVE2(REVENGE),
     EC_MOVE(REVERSAL),
-    -1, 2, // Doubled pokemon species name
+    DOUBLE_SPECIES_NAME
     EC_POKEMON(RHYDON),
-    EC_POKEMON2(RHYDON),
-    -1, 2, // Doubled pokemon species name
+    EC_POKEMON_NATIONAL(RHYDON),
+    DOUBLE_SPECIES_NAME
     EC_POKEMON(RHYHORN),
-    EC_POKEMON2(RHYHORN),
+    EC_POKEMON_NATIONAL(RHYHORN),
     EC_WORD_RIBBON,
     EC_WORD_RICKETY,
     EC_WORD_RIGHT,
@@ -1377,12 +1379,12 @@ const u16 gEasyChatWordsByLetter_S[] = {
     EC_MOVE(SAND_TOMB),
     EC_WORD_SAND_VEIL,
     EC_MOVE(SAND_ATTACK),
-    -1, 2, // Doubled pokemon species name
+    DOUBLE_SPECIES_NAME
     EC_POKEMON(SANDSHREW),
-    EC_POKEMON2(SANDSHREW),
-    -1, 2, // Doubled pokemon species name
+    EC_POKEMON_NATIONAL(SANDSHREW),
+    DOUBLE_SPECIES_NAME
     EC_POKEMON(SANDSLASH),
-    EC_POKEMON2(SANDSLASH),
+    EC_POKEMON_NATIONAL(SANDSLASH),
     EC_MOVE(SANDSTORM),
     EC_WORD_SAPPHIRE,
     EC_WORD_SATISFIED,
@@ -1393,16 +1395,16 @@ const u16 gEasyChatWordsByLetter_S[] = {
     EC_WORD_SCATTER,
     EC_POKEMON(SCEPTILE),
     EC_WORD_SCHOOL,
-    EC_POKEMON2(SCIZOR),
+    EC_POKEMON_NATIONAL(SCIZOR),
     EC_MOVE2(SCRATCH),
     EC_MOVE(SCREECH),
-    EC_POKEMON2(SCYTHER),
-    -1, 2, // Doubled pokemon species name
+    EC_POKEMON_NATIONAL(SCYTHER),
+    DOUBLE_SPECIES_NAME
     EC_POKEMON(SEADRA),
-    EC_POKEMON2(SEADRA),
-    -1, 2, // Doubled pokemon species name
+    EC_POKEMON_NATIONAL(SEADRA),
+    DOUBLE_SPECIES_NAME
     EC_POKEMON(SEAKING),
-    EC_POKEMON2(SEAKING),
+    EC_POKEMON_NATIONAL(SEAKING),
     EC_POKEMON(SEALEO),
     EC_WORD_SEARCH,
     EC_WORD_SECRET,
@@ -1412,13 +1414,13 @@ const u16 gEasyChatWordsByLetter_S[] = {
     EC_WORD_SEE_YA,
     EC_POKEMON(SEEDOT),
     EC_WORD_SEEK,
-    EC_POKEMON2(SEEL),
+    EC_POKEMON_NATIONAL(SEEL),
     EC_WORD_SEEMS,
     EC_WORD_SEES,
     EC_MOVE2(SEISMIC_TOSS),
     EC_MOVE(SELF_DESTRUCT),
     EC_WORD_SENSE,
-    EC_POKEMON2(SENTRET),
+    EC_POKEMON_NATIONAL(SENTRET),
     EC_WORD_SERENE_GRACE,
     EC_WORD_SERIOUS,
     EC_WORD_SERIOUSLY,
@@ -1441,7 +1443,7 @@ const u16 gEasyChatWordsByLetter_S[] = {
     EC_MOVE(SHEER_COLD),
     EC_POKEMON(SHELGON),
     EC_WORD_SHELL_ARMOR,
-    EC_POKEMON2(SHELLDER),
+    EC_POKEMON_NATIONAL(SHELLDER),
     EC_WORD_SHIELD_DUST,
     EC_POKEMON(SHIFTRY),
     EC_WORD_SHINE,
@@ -1452,7 +1454,7 @@ const u16 gEasyChatWordsByLetter_S[] = {
     EC_WORD_SHOW,
     EC_WORD_SHREDDED,
     EC_POKEMON(SHROOMISH),
-    EC_POKEMON2(SHUCKLE),
+    EC_POKEMON_NATIONAL(SHUCKLE),
     EC_POKEMON(SHUPPET),
     EC_WORD_SIBLINGS,
     EC_WORD_SIGH,
@@ -1466,14 +1468,14 @@ const u16 gEasyChatWordsByLetter_S[] = {
     EC_MOVE(SING),
     EC_WORD_SINK,
     EC_WORD_SISTER,
-    -1, 2, // Doubled pokemon species name
+    DOUBLE_SPECIES_NAME
     EC_POKEMON(SKARMORY),
-    EC_POKEMON2(SKARMORY),
+    EC_POKEMON_NATIONAL(SKARMORY),
     EC_MOVE(SKETCH),
     EC_WORD_SKILL,
     EC_MOVE(SKILL_SWAP),
     EC_WORD_SKILLED,
-    EC_POKEMON2(SKIPLOOM),
+    EC_POKEMON_NATIONAL(SKIPLOOM),
     EC_POKEMON(SKITTY),
     EC_MOVE2(SKULL_BASH),
     EC_MOVE(SKY_ATTACK),
@@ -1489,34 +1491,34 @@ const u16 gEasyChatWordsByLetter_S[] = {
     EC_WORD_SLEPT,
     EC_WORD_SLIDE,
     EC_WORD_SLIMY,
-    EC_POKEMON2(SLOWBRO),
-    EC_POKEMON2(SLOWKING),
-    EC_POKEMON2(SLOWPOKE),
+    EC_POKEMON_NATIONAL(SLOWBRO),
+    EC_POKEMON_NATIONAL(SLOWKING),
+    EC_POKEMON_NATIONAL(SLOWPOKE),
     EC_MOVE2(SLUDGE),
     EC_MOVE2(SLUDGE_BOMB),
-    -1, 2, // Doubled pokemon species name
+    DOUBLE_SPECIES_NAME
     EC_POKEMON(SLUGMA),
-    EC_POKEMON2(SLUGMA),
+    EC_POKEMON_NATIONAL(SLUGMA),
     EC_WORD_SMACK,
     EC_WORD_SMALL,
     EC_WORD_SMART,
     EC_WORD_SMARTNESS,
-    EC_POKEMON2(SMEARGLE),
+    EC_POKEMON_NATIONAL(SMEARGLE),
     EC_WORD_SMELL,
     EC_WORD_SMELL_YA,
     EC_MOVE(SMELLING_SALT),
     EC_WORD_SMITE,
     EC_MOVE(SMOG),
     EC_MOVE(SMOKESCREEN),
-    EC_POKEMON2(SMOOCHUM),
+    EC_POKEMON_NATIONAL(SMOOCHUM),
     EC_WORD_SMOOTH,
     EC_MOVE2(SNATCH),
-    EC_POKEMON2(SNEASEL),
+    EC_POKEMON_NATIONAL(SNEASEL),
     EC_MOVE(SNORE),
-    EC_POKEMON2(SNORLAX),
+    EC_POKEMON_NATIONAL(SNORLAX),
     EC_WORD_SNORT,
     EC_POKEMON(SNORUNT),
-    EC_POKEMON2(SNUBBULL),
+    EC_POKEMON_NATIONAL(SNUBBULL),
     EC_WORD_SO,
     EC_MOVE2(SOFT_BOILED),
     EC_WORD_SOFTWARE,
@@ -1536,14 +1538,14 @@ const u16 gEasyChatWordsByLetter_S[] = {
     EC_WORD_SOUNDPROOF,
     EC_WORD_SP_ABILITY,
     EC_MOVE(SPARK),
-    EC_POKEMON2(SPEAROW),
+    EC_POKEMON_NATIONAL(SPEAROW),
     EC_WORD_SPECTATOR,
     EC_WORD_SPEED_BOOST,
     EC_POKEMON(SPHEAL),
     EC_MOVE(SPIDER_WEB),
     EC_MOVE2(SPIKE_CANNON),
     EC_MOVE2(SPIKES),
-    EC_POKEMON2(SPINARAK),
+    EC_POKEMON_NATIONAL(SPINARAK),
     EC_POKEMON(SPINDA),
     EC_WORD_SPIRALING,
     EC_WORD_SPIRIT,
@@ -1554,21 +1556,21 @@ const u16 gEasyChatWordsByLetter_S[] = {
     EC_MOVE(SPORE),
     EC_WORD_SPORTS,
     EC_WORD_SPRING,
-    EC_POKEMON2(SQUIRTLE),
+    EC_POKEMON_NATIONAL(SQUIRTLE),
     EC_WORD_STAGE,
-    EC_POKEMON2(STANTLER),
-    -1, 2, // Doubled pokemon species name
+    EC_POKEMON_NATIONAL(STANTLER),
+    DOUBLE_SPECIES_NAME
     EC_POKEMON(STARMIE),
-    EC_POKEMON2(STARMIE),
+    EC_POKEMON_NATIONAL(STARMIE),
     EC_WORD_START,
-    -1, 2, // Doubled pokemon species name
+    DOUBLE_SPECIES_NAME
     EC_POKEMON(STARYU),
-    EC_POKEMON2(STARYU),
+    EC_POKEMON_NATIONAL(STARYU),
     EC_WORD_STATIC,
     EC_WORD_STAY_AT_HOME,
     EC_WORD_STEEL,
     EC_MOVE2(STEEL_WING),
-    EC_POKEMON2(STEELIX),
+    EC_POKEMON_NATIONAL(STEELIX),
     EC_WORD_STENCH,
     EC_WORD_STICKY_HOLD,
     EC_MOVE2(STOCKPILE),
@@ -1588,12 +1590,12 @@ const u16 gEasyChatWordsByLetter_S[] = {
     EC_MOVE(SUBMISSION),
     EC_MOVE2(SUBSTITUTE),
     EC_WORD_SUCTION_CUPS,
-    EC_POKEMON2(SUDOWOODO),
-    EC_POKEMON2(SUICUNE),
+    EC_POKEMON_NATIONAL(SUDOWOODO),
+    EC_POKEMON_NATIONAL(SUICUNE),
     EC_WORD_SUMMER,
     EC_WORD_SUNDAY,
-    EC_POKEMON2(SUNFLORA),
-    EC_POKEMON2(SUNKERN),
+    EC_POKEMON_NATIONAL(SUNFLORA),
+    EC_POKEMON_NATIONAL(SUNKERN),
     EC_MOVE2(SUNNY_DAY),
     EC_WORD_SUPER,
     EC_MOVE(SUPER_FANG),
@@ -1615,7 +1617,7 @@ const u16 gEasyChatWordsByLetter_S[] = {
     EC_POKEMON(SWELLOW),
     EC_MOVE(SWIFT),
     EC_WORD_SWIFT_SWIM,
-    EC_POKEMON2(SWINUB),
+    EC_POKEMON_NATIONAL(SWINUB),
     EC_MOVE2(SWORDS_DANCE),
     EC_WORD_SYNCHRONIZE,
     EC_MOVE(SYNTHESIS),
@@ -1633,24 +1635,24 @@ const u16 gEasyChatWordsByLetter_T[] = {
     EC_WORD_TALENT,
     EC_WORD_TALK,
     EC_WORD_TALKING,
-    EC_POKEMON2(TANGELA),
+    EC_POKEMON_NATIONAL(TANGELA),
     EC_WORD_TASTY,
     EC_MOVE2(TAUNT),
-    EC_POKEMON2(TAUROS),
+    EC_POKEMON_NATIONAL(TAUROS),
     EC_WORD_TCH,
     EC_WORD_TEACH,
     EC_WORD_TEACHER,
     EC_WORD_TEACHES,
-    EC_POKEMON2(TEDDIURSA),
+    EC_POKEMON_NATIONAL(TEDDIURSA),
     EC_MOVE2(TEETER_DANCE),
     EC_MOVE2(TELEPORT),
     EC_WORD_TELEVISION,
-    -1, 2, // Doubled pokemon species name
+    DOUBLE_SPECIES_NAME
     EC_POKEMON(TENTACOOL),
-    EC_POKEMON2(TENTACOOL),
-    -1, 2, // Doubled pokemon species name
+    EC_POKEMON_NATIONAL(TENTACOOL),
+    DOUBLE_SPECIES_NAME
     EC_POKEMON(TENTACRUEL),
-    EC_POKEMON2(TENTACRUEL),
+    EC_POKEMON_NATIONAL(TENTACRUEL),
     EC_WORD_TERRIBLE,
     EC_WORD_TEST,
     EC_WORD_THAN,
@@ -1704,9 +1706,9 @@ const u16 gEasyChatWordsByLetter_T[] = {
     EC_WORD_TO_US,
     EC_WORD_TO_WHOM,
     EC_WORD_TODAY,
-    EC_POKEMON2(TOGEPI),
+    EC_POKEMON_NATIONAL(TOGEPI),
     EC_WORD_TOGETHER,
-    EC_POKEMON2(TOGETIC),
+    EC_POKEMON_NATIONAL(TOGETIC),
     EC_WORD_TOMORROW,
     EC_WORD_TOO,
     EC_WORD_TOO_LATE,
@@ -1718,7 +1720,7 @@ const u16 gEasyChatWordsByLetter_T[] = {
     EC_MOVE(TORMENT),
     EC_WORD_TORRENT,
     EC_WORD_TOTALLY,
-    EC_POKEMON2(TOTODILE),
+    EC_POKEMON_NATIONAL(TOTODILE),
     EC_WORD_TOUGH,
     EC_WORD_TOUGHNESS,
     EC_WORD_TOURNAMENT,
@@ -1751,9 +1753,9 @@ const u16 gEasyChatWordsByLetter_T[] = {
     EC_WORD_TWIRLING,
     EC_MOVE2(TWISTER),
     EC_WORD_TYPE,
-    EC_POKEMON2(TYPHLOSION),
-    EC_POKEMON2(TYRANITAR),
-    EC_POKEMON2(TYROGUE),
+    EC_POKEMON_NATIONAL(TYPHLOSION),
+    EC_POKEMON_NATIONAL(TYRANITAR),
+    EC_POKEMON_NATIONAL(TYROGUE),
 };
 
 const u16 gEasyChatWordsByLetter_U[] = {
@@ -1761,7 +1763,7 @@ const u16 gEasyChatWordsByLetter_U[] = {
     EC_WORD_UH_HUH,
     EC_WORD_UH_OH,
     EC_WORD_UM,
-    EC_POKEMON2(UMBREON),
+    EC_POKEMON_NATIONAL(UMBREON),
     EC_WORD_UNAVOIDABLE,
     EC_WORD_UNBELIEVABLE,
     EC_WORD_UNCLE,
@@ -1769,14 +1771,14 @@ const u16 gEasyChatWordsByLetter_U[] = {
     EC_WORD_UNDERSTANDS,
     EC_WORD_UNDERSTOOD,
     EC_WORD_UNION,
-    EC_POKEMON2(UNOWN),
+    EC_POKEMON_NATIONAL(UNOWN),
     EC_WORD_UNTIL,
     EC_WORD_UP,
     EC_WORD_UPBEAT,
     EC_MOVE(UPROAR),
     EC_WORD_UPSIDE_DOWN,
     EC_WORD_URGH,
-    EC_POKEMON2(URSARING),
+    EC_POKEMON_NATIONAL(URSARING),
     EC_WORD_USE,
     EC_WORD_USELESS,
     EC_WORD_USES,
@@ -1785,35 +1787,35 @@ const u16 gEasyChatWordsByLetter_U[] = {
 
 const u16 gEasyChatWordsByLetter_V[] = {
     EC_WORD_VACATION,
-    EC_POKEMON2(VAPOREON),
-    EC_POKEMON2(VENOMOTH),
-    EC_POKEMON2(VENONAT),
-    EC_POKEMON2(VENUSAUR),
+    EC_POKEMON_NATIONAL(VAPOREON),
+    EC_POKEMON_NATIONAL(VENOMOTH),
+    EC_POKEMON_NATIONAL(VENONAT),
+    EC_POKEMON_NATIONAL(VENUSAUR),
     EC_WORD_VERSION,
     EC_WORD_VERSUS,
     EC_WORD_VERY,
     EC_POKEMON(VIBRAVA),
     EC_MOVE2(VICE_GRIP),
     EC_WORD_VICTORY,
-    EC_POKEMON2(VICTREEBEL),
+    EC_POKEMON_NATIONAL(VICTREEBEL),
     EC_WORD_VIEWING,
     EC_POKEMON(VIGOROTH),
-    -1, 2, // Doubled pokemon species name
+    DOUBLE_SPECIES_NAME
     EC_POKEMON(VILEPLUME),
-    EC_POKEMON2(VILEPLUME),
+    EC_POKEMON_NATIONAL(VILEPLUME),
     EC_MOVE2(VINE_WHIP),
     EC_WORD_VITAL_SPIRIT,
     EC_MOVE(VITAL_THROW),
     EC_POKEMON(VOLBEAT),
     EC_WORD_VOLT_ABSORB,
     EC_MOVE2(VOLT_TACKLE),
-    -1, 2, // Doubled pokemon species name
+    DOUBLE_SPECIES_NAME
     EC_POKEMON(VOLTORB),
-    EC_POKEMON2(VOLTORB),
+    EC_POKEMON_NATIONAL(VOLTORB),
     EC_WORD_VORACIOUS,
-    -1, 2, // Doubled pokemon species name
+    DOUBLE_SPECIES_NAME
     EC_POKEMON(VULPIX),
-    EC_POKEMON2(VULPIX),
+    EC_POKEMON_NATIONAL(VULPIX),
 };
 
 const u16 gEasyChatWordsByLetter_W[] = {
@@ -1832,7 +1834,7 @@ const u16 gEasyChatWordsByLetter_W[] = {
     EC_WORD_WANNABE,
     EC_WORD_WANT,
     EC_WORD_WANTS,
-    EC_POKEMON2(WARTORTLE),
+    EC_POKEMON_NATIONAL(WARTORTLE),
     EC_WORD_WAS,
     EC_WORD_WASN_T,
     EC_WORD_WATER,
@@ -1851,12 +1853,12 @@ const u16 gEasyChatWordsByLetter_W[] = {
     EC_WORD_WEAKENED,
     EC_MOVE(WEATHER_BALL),
     EC_WORD_WEDNESDAY,
-    EC_POKEMON2(WEEDLE),
+    EC_POKEMON_NATIONAL(WEEDLE),
     EC_WORD_WEEK,
-    EC_POKEMON2(WEEPINBELL),
-    -1, 2, // Doubled pokemon species name
+    EC_POKEMON_NATIONAL(WEEPINBELL),
+    DOUBLE_SPECIES_NAME
     EC_POKEMON(WEEZING),
-    EC_POKEMON2(WEEZING),
+    EC_POKEMON_NATIONAL(WEEZING),
     EC_WORD_WEIRD,
     EC_WORD_WELCOME,
     EC_WORD_WELL,
@@ -1883,9 +1885,9 @@ const u16 gEasyChatWordsByLetter_W[] = {
     EC_WORD_WHOM,
     EC_WORD_WHOSE,
     EC_WORD_WHY,
-    -1, 2, // Doubled pokemon species name
+    DOUBLE_SPECIES_NAME
     EC_POKEMON(WIGGLYTUFF),
-    EC_POKEMON2(WIGGLYTUFF),
+    EC_POKEMON_NATIONAL(WIGGLYTUFF),
     EC_WORD_WILD,
     EC_WORD_WILL,
     EC_WORD_WILL_BE_HERE,
@@ -1903,15 +1905,15 @@ const u16 gEasyChatWordsByLetter_W[] = {
     EC_MOVE(WITHDRAW),
     EC_WORD_WITHOUT,
     EC_WORD_WOBBLY,
-    -1, 2, // Doubled pokemon species name
+    DOUBLE_SPECIES_NAME
     EC_POKEMON(WOBBUFFET),
-    EC_POKEMON2(WOBBUFFET),
+    EC_POKEMON_NATIONAL(WOBBUFFET),
     EC_WORD_WOMAN,
     EC_WORD_WON,
     EC_WORD_WON_T,
     EC_WORD_WONDER,
     EC_WORD_WONDER_GUARD,
-    EC_POKEMON2(WOOPER),
+    EC_POKEMON_NATIONAL(WOOPER),
     EC_WORD_WORD,
     EC_WORD_WORK,
     EC_WORD_WORKING,
@@ -1928,14 +1930,14 @@ const u16 gEasyChatWordsByLetter_W[] = {
 };
 
 const u16 gEasyChatWordsByLetter_X[] = {
-    -1, 2, // Doubled pokemon species name
+    DOUBLE_SPECIES_NAME
     EC_POKEMON(XATU),
-    EC_POKEMON2(XATU),
+    EC_POKEMON_NATIONAL(XATU),
 };
 
 const u16 gEasyChatWordsByLetter_Y[] = {
     EC_WORD_YAHOO,
-    EC_POKEMON2(YANMA),
+    EC_POKEMON_NATIONAL(YANMA),
     EC_MOVE(YAWN),
     EC_WORD_YAY,
     EC_WORD_YEAH,
@@ -1958,59 +1960,59 @@ const u16 gEasyChatWordsByLetter_Y[] = {
 const u16 gEasyChatWordsByLetter_Z[] = {
     EC_POKEMON(ZANGOOSE),
     EC_MOVE2(ZAP_CANNON),
-    EC_POKEMON2(ZAPDOS),
+    EC_POKEMON_NATIONAL(ZAPDOS),
     EC_POKEMON(ZIGZAGOON),
-    -1, 2, // Doubled pokemon species name
+    DOUBLE_SPECIES_NAME
     EC_POKEMON(ZUBAT),
-    EC_POKEMON2(ZUBAT),
+    EC_POKEMON_NATIONAL(ZUBAT),
 };
 
 const u16 gEasyChatWordsByLetter_UnusedJapaneseHi[] = {
-    EC_POKEMON2(CLEFFA),
+    EC_POKEMON_NATIONAL(CLEFFA),
     EC_WORD_AIYEEH,
-    EC_POKEMON2(WEEDLE),
+    EC_POKEMON_NATIONAL(WEEDLE),
     EC_WORD_HERO,
-    -1, 2, // Doubled pokemon species name
-    EC_POKEMON2(PIKACHU),
+    DOUBLE_SPECIES_NAME
+    EC_POKEMON_NATIONAL(PIKACHU),
     EC_POKEMON(PIKACHU),
     EC_MOVE2(LIGHT_SCREEN),
     EC_WORD_SHINE,
     EC_WORD_LOW,
-    EC_POKEMON2(CLEFABLE),
+    EC_POKEMON_NATIONAL(CLEFABLE),
     EC_WORD_FLYING,
-    EC_POKEMON2(PIDGEOT),
-    EC_POKEMON2(PIDGEOTTO),
+    EC_POKEMON_NATIONAL(PIDGEOT),
+    EC_POKEMON_NATIONAL(PIDGEOTTO),
     EC_WORD_LEFT,
-    -1, 2, // Doubled pokemon species name
-    EC_POKEMON2(PICHU),
+    DOUBLE_SPECIES_NAME
+    EC_POKEMON_NATIONAL(PICHU),
     EC_POKEMON(PICHU),
     EC_MOVE2(SCRATCH),
     EC_WORD_SURPRISE,
     EC_MOVE2(HYPER_FANG),
-    EC_POKEMON2(CLEFAIRY),
+    EC_POKEMON_NATIONAL(CLEFAIRY),
     EC_WORD_DROUGHT,
     EC_WORD_HIDDEN,
     EC_WORD_PERSON,
     EC_WORD_AWFUL,
-    EC_POKEMON2(CHARMANDER),
-    -1, 2, // Doubled pokemon species name
-    EC_POKEMON2(STARYU),
+    EC_POKEMON_NATIONAL(CHARMANDER),
+    DOUBLE_SPECIES_NAME
+    EC_POKEMON_NATIONAL(STARYU),
     EC_POKEMON(STARYU),
     EC_WORD_ALONE,
-    EC_POKEMON2(CYNDAQUIL),
+    EC_POKEMON_NATIONAL(CYNDAQUIL),
     EC_MOVE2(EMBER),
     EC_POKEMON(VIBRAVA),
     EC_WORD_BORED,
-    EC_POKEMON2(SUNKERN),
+    EC_POKEMON_NATIONAL(SUNKERN),
     EC_WORD_SECRET,
     EC_WORD_SECRET_BASE,
     EC_MOVE2(SECRET_POWER),
-    EC_POKEMON2(TEDDIURSA),
+    EC_POKEMON_NATIONAL(TEDDIURSA),
     EC_WORD_HIYAH,
     EC_MOVE2(DIZZY_PUNCH),
     EC_WORD_LIGHTNINGROD,
-    -1, 2, // Doubled pokemon species name
-    EC_POKEMON2(VOLTORB),
+    DOUBLE_SPECIES_NAME
+    EC_POKEMON_NATIONAL(VOLTORB),
     EC_POKEMON(VOLTORB),
     EC_WORD_DAYTIME,
     EC_MOVE2(BULK_UP),
@@ -2021,42 +2023,42 @@ const u16 gEasyChatWordsByLetter_UnusedJapaneseHi[] = {
 
 const u16 gEasyChatWordsByLetter_UnusedJapaneseFu[] = {
     EC_WORD_FIGHT,
-    EC_POKEMON2(MOLTRES),
+    EC_POKEMON_NATIONAL(MOLTRES),
     EC_WORD_FASHION,
     EC_WORD_FEAR,
     EC_WORD_FEVER,
     EC_MOVE2(IMPRISON),
-    EC_POKEMON2(FLAREON),
-    -1, 2, // Doubled pokemon species name
-    EC_POKEMON2(ALAKAZAM),
+    EC_POKEMON_NATIONAL(FLAREON),
+    DOUBLE_SPECIES_NAME
+    EC_POKEMON_NATIONAL(ALAKAZAM),
     EC_POKEMON(ALAKAZAM),
-    EC_POKEMON2(MAGMAR),
+    EC_POKEMON_NATIONAL(MAGMAR),
     EC_POKEMON(GRUMPIG),
     EC_MOVE2(FEATHER_DANCE),
-    EC_POKEMON2(FORRETRESS),
+    EC_POKEMON_NATIONAL(FORRETRESS),
     EC_MOVE2(WHIRLWIND),
     EC_WORD_COMPOUNDEYES,
-    -1, 2, // Doubled pokemon species name
-    EC_POKEMON2(WIGGLYTUFF),
+    DOUBLE_SPECIES_NAME
+    EC_POKEMON_NATIONAL(WIGGLYTUFF),
     EC_POKEMON(WIGGLYTUFF),
     EC_MOVE2(BEAT_UP),
     EC_WORD_MYSTERY,
-    EC_POKEMON2(IVYSAUR),
-    EC_POKEMON2(BULBASAUR),
+    EC_POKEMON_NATIONAL(IVYSAUR),
+    EC_POKEMON_NATIONAL(BULBASAUR),
     EC_WORD_MARVEL_SCALE,
     EC_WORD_WONDER_GUARD,
-    EC_POKEMON2(VENUSAUR),
+    EC_POKEMON_NATIONAL(VENUSAUR),
     EC_WORD_LACKS,
     EC_WORD_RESUSCITATE,
     EC_WORD_SMACK,
     EC_WORD_FUFUFU,
-    EC_POKEMON2(AERODACTYL),
+    EC_POKEMON_NATIONAL(AERODACTYL),
     EC_WORD_WIMPY,
-    EC_POKEMON2(MAGBY),
+    EC_POKEMON_NATIONAL(MAGBY),
     EC_WORD_LOL,
     EC_MOVE2(BLIZZARD),
-    -1, 2, // Doubled pokemon species name
-    EC_POKEMON2(IGGLYBUFF),
+    DOUBLE_SPECIES_NAME
+    EC_POKEMON_NATIONAL(IGGLYBUFF),
     EC_POKEMON(IGGLYBUFF),
     EC_WORD_SNORT,
     EC_MOVE2(STOMP),
@@ -2067,17 +2069,17 @@ const u16 gEasyChatWordsByLetter_UnusedJapaneseFu[] = {
     EC_WORD_PLUS,
     EC_MOVE2(BLAST_BURN),
     EC_POKEMON(PLUSLE),
-    EC_POKEMON2(UMBREON),
+    EC_POKEMON_NATIONAL(UMBREON),
     EC_MOVE2(FLASH),
     EC_WORD_WOBBLY,
     EC_MOVE2(TEETER_DANCE),
     EC_WORD_PRETEND,
-    EC_POKEMON2(ARTICUNO),
+    EC_POKEMON_NATIONAL(ARTICUNO),
     EC_WORD_WANNABE,
-    -1, 2, // Doubled pokemon species name
-    EC_POKEMON2(JIGGLYPUFF),
+    DOUBLE_SPECIES_NAME
+    EC_POKEMON_NATIONAL(JIGGLYPUFF),
     EC_POKEMON(JIGGLYPUFF),
-    EC_POKEMON2(SNUBBULL),
+    EC_POKEMON_NATIONAL(SNUBBULL),
     EC_WORD_SHAKY,
     EC_MOVE2(CRUSH_CLAW),
     EC_MOVE2(BLAZE_KICK),
@@ -2093,29 +2095,29 @@ const u16 gEasyChatWordsByLetter_UnusedJapaneseHe[] = {
     EC_WORD_HEY,
     EC_POKEMON(CORPHISH),
     EC_WORD_BABY,
-    EC_POKEMON2(BAYLEEF),
+    EC_POKEMON_NATIONAL(BAYLEEF),
     EC_WORD_BEST,
     EC_WORD_LOUSY,
     EC_WORD_HEHEHE,
-    -1, 2, // Doubled pokemon species name
-    EC_POKEMON2(GRIMER),
+    DOUBLE_SPECIES_NAME
+    EC_POKEMON_NATIONAL(GRIMER),
     EC_POKEMON(GRIMER),
-    -1, 2, // Doubled pokemon species name
-    EC_POKEMON2(MUK),
+    DOUBLE_SPECIES_NAME
+    EC_POKEMON_NATIONAL(MUK),
     EC_POKEMON(MUK),
     EC_WORD_LIQUID_OOZE,
     EC_MOVE2(SLUDGE),
     EC_MOVE2(SLUDGE_BOMB),
     EC_MOVE2(GLARE),
     EC_WORD_HEH,
-    -1, 2, // Doubled pokemon species name
-    EC_POKEMON2(HERACROSS),
+    DOUBLE_SPECIES_NAME
+    EC_POKEMON_NATIONAL(HERACROSS),
     EC_POKEMON(HERACROSS),
     EC_POKEMON(PELIPPER),
-    EC_POKEMON2(HOUNDOOM),
-    EC_POKEMON2(PERSIAN),
+    EC_POKEMON_NATIONAL(HOUNDOOM),
+    EC_POKEMON_NATIONAL(PERSIAN),
     EC_WORD_RIPPED,
-    EC_POKEMON2(LICKITUNG),
+    EC_POKEMON_NATIONAL(LICKITUNG),
     EC_WORD_STUDY,
     EC_WORD_COLOR_CHANGE,
     EC_MOVE2(TRANSFORM),
@@ -2124,7 +2126,7 @@ const u16 gEasyChatWordsByLetter_UnusedJapaneseHe[] = {
 const u16 gEasyChatWordsByLetter_UnusedJapaneseHo[] = {
     EC_MOVE2(POISON_TAIL),
     EC_WORD_POINTS,
-    EC_POKEMON2(HO_OH),
+    EC_POKEMON_NATIONAL(HO_OH),
     EC_WORD_SOUNDPROOF,
     EC_WORD_ADVENTURE,
     EC_WORD_EFFECT_SPORE,
@@ -2133,7 +2135,7 @@ const u16 gEasyChatWordsByLetter_UnusedJapaneseHo[] = {
     EC_POKEMON(WAILMER),
     EC_WORD_DUDE,
     EC_WORD_BOARD,
-    EC_POKEMON2(HOOTHOOT),
+    EC_POKEMON_NATIONAL(HOOTHOOT),
     EC_POKEMON(SALAMENCE),
     EC_WORD_BALL,
     EC_MOVE2(BONE_RUSH),
@@ -2154,21 +2156,21 @@ const u16 gEasyChatWordsByLetter_UnusedJapaneseHo[] = {
     EC_POKEMON(AGGRON),
     EC_MOVE2(TAIL_GLOW),
     EC_POKEMON(POOCHYENA),
-    EC_POKEMON2(PIDGEY),
+    EC_POKEMON_NATIONAL(PIDGEY),
     EC_WORD_AS_MUCH_AS,
-    EC_POKEMON2(PONYTA),
+    EC_POKEMON_NATIONAL(PONYTA),
     EC_MOVE2(BONE_CLUB),
     EC_MOVE2(BONEMERANG),
     EC_WORD_FIRE,
     EC_MOVE2(FIRE_SPIN),
     EC_WORD_FLAME_BODY,
     EC_MOVE2(FIRE_PUNCH),
-    EC_POKEMON2(SKIPLOOM),
+    EC_POKEMON_NATIONAL(SKIPLOOM),
     EC_WORD_HOHOHO,
     EC_WORD_PRAISE,
     EC_WORD_UH_HUH,
-    EC_POKEMON2(PORYGON),
-    EC_POKEMON2(PORYGON2),
+    EC_POKEMON_NATIONAL(PORYGON),
+    EC_POKEMON_NATIONAL(PORYGON2),
     EC_MOVE2(VOLT_TACKLE),
     EC_WORD_POKEBLOCK,
     EC_MOVE2(PERISH_SONG),
@@ -2189,16 +2191,16 @@ const u16 gEasyChatWordsByLetter_UnusedJapaneseMa[] = {
     EC_WORD_OWN_TEMPO,
     EC_MOVE2(WRAP),
     EC_MOVE2(SPIKES),
-    -1, 2, // Doubled pokemon species name
-    EC_POKEMON2(MAGCARGO),
+    DOUBLE_SPECIES_NAME
+    EC_POKEMON_NATIONAL(MAGCARGO),
     EC_POKEMON(MAGCARGO),
     EC_MOVE2(MAGNITUDE),
     EC_POKEMON(MAKUHITA),
-    -1, 2, // Doubled pokemon species name
-    EC_POKEMON2(SLUGMA),
+    DOUBLE_SPECIES_NAME
+    EC_POKEMON_NATIONAL(SLUGMA),
     EC_POKEMON(SLUGMA),
     EC_WORD_MAGMA_ARMOR,
-    EC_POKEMON2(QUILAVA),
+    EC_POKEMON_NATIONAL(QUILAVA),
     EC_WORD_OVERDO,
     EC_WORD_LOSS,
     EC_WORD_IF_I_LOSE,
@@ -2214,9 +2216,9 @@ const u16 gEasyChatWordsByLetter_UnusedJapaneseMa[] = {
     EC_WORD_INCREASING,
     EC_WORD_TOO,
     EC_WORD_LIKE,
-    EC_POKEMON2(BELLSPROUT),
-    -1, 2, // Doubled pokemon species name
-    EC_POKEMON2(WEEZING),
+    EC_POKEMON_NATIONAL(BELLSPROUT),
+    DOUBLE_SPECIES_NAME
+    EC_POKEMON_NATIONAL(WEEZING),
     EC_POKEMON(WEEZING),
     EC_WORD_SMELL,
     EC_WORD_YET,
@@ -2231,23 +2233,23 @@ const u16 gEasyChatWordsByLetter_UnusedJapaneseMa[] = {
     EC_WORD_GUARD,
     EC_MOVE2(PROTECT),
     EC_POKEMON(CASCOON),
-    -1, 2, // Doubled pokemon species name
-    EC_POKEMON2(MARILL),
+    DOUBLE_SPECIES_NAME
+    EC_POKEMON_NATIONAL(MARILL),
     EC_POKEMON(MARILL),
-    -1, 2, // Doubled pokemon species name
-    EC_POKEMON2(AZUMARILL),
+    DOUBLE_SPECIES_NAME
+    EC_POKEMON_NATIONAL(AZUMARILL),
     EC_POKEMON(AZUMARILL),
     EC_MOVE2(DEFENSE_CURL),
     EC_WORD_AS_IF,
     EC_POKEMON(SWALOT),
-    -1, 2, // Doubled pokemon species name
-    EC_POKEMON2(ELECTRODE),
+    DOUBLE_SPECIES_NAME
+    EC_POKEMON_NATIONAL(ELECTRODE),
     EC_POKEMON(ELECTRODE),
     EC_MOVE2(ROLLING_KICK),
     EC_WORD_COMICS,
-    EC_POKEMON2(MANKEY),
+    EC_POKEMON_NATIONAL(MANKEY),
     EC_WORD_SATISFIED,
-    EC_POKEMON2(MANTINE),
+    EC_POKEMON_NATIONAL(MANTINE),
 };
 
 const u16 gEasyChatWordsByLetter_UnusedJapaneseMi[] = {
@@ -2272,16 +2274,16 @@ const u16 gEasyChatWordsByLetter_UnusedJapaneseMi[] = {
     EC_WORD_LOOKS,
     EC_WORD_REJECT,
     EC_WORD_ACCEPT,
-    EC_POKEMON2(DRATINI),
+    EC_POKEMON_NATIONAL(DRATINI),
     EC_MOVE2(FALSE_SWIPE),
     EC_MOVE2(FORESIGHT),
-    EC_POKEMON2(MEW),
-    EC_POKEMON2(MEWTWO),
+    EC_POKEMON_NATIONAL(MEW),
+    EC_POKEMON_NATIONAL(MEWTWO),
     EC_MOVE2(MIRROR_COAT),
     EC_MOVE2(FUTURE_SIGHT),
     EC_WORD_SEES,
     EC_MOVE2(MILK_DRINK),
-    EC_POKEMON2(MILTANK),
+    EC_POKEMON_NATIONAL(MILTANK),
     EC_POKEMON(MILOTIC),
     EC_WORD_WE,
     EC_WORD_BEEN,
@@ -2292,13 +2294,13 @@ const u16 gEasyChatWordsByLetter_UnusedJapaneseMi[] = {
 
 const u16 gEasyChatWordsByLetter_UnusedJapaneseMu[] = {
     EC_WORD_MOOD,
-    EC_POKEMON2(MISDREAVUS),
+    EC_POKEMON_NATIONAL(MISDREAVUS),
     EC_WORD_OLDEN,
     EC_WORD_ARRGH,
     EC_WORD_BUG,
     EC_WORD_SWARM,
     EC_WORD_RATHER,
-    EC_POKEMON2(SMOOCHUM),
+    EC_POKEMON_NATIONAL(SMOOCHUM),
     EC_WORD_INVINCIBLE,
     EC_WORD_HEART,
     EC_WORD_MUFUFU,
@@ -2311,23 +2313,23 @@ const u16 gEasyChatWordsByLetter_UnusedJapaneseMe[] = {
     EC_MOVE2(MEGA_DRAIN),
     EC_MOVE2(MEGA_KICK),
     EC_MOVE2(MEGA_PUNCH),
-    EC_POKEMON2(MEGANIUM),
+    EC_POKEMON_NATIONAL(MEGANIUM),
     EC_MOVE2(MEGAHORN),
     EC_WORD_SEEK,
     EC_MOVE2(HIDDEN_POWER),
     EC_WORD_RARE,
     EC_POKEMON(METAGROSS),
-    EC_POKEMON2(DITTO),
+    EC_POKEMON_NATIONAL(DITTO),
     EC_MOVE2(METAL_CLAW),
     EC_POKEMON(METANG),
     EC_WORD_DESTROYED,
     EC_WORD_MESSAGE,
     EC_WORD_AWFULLY,
-    -1, 2, // Doubled pokemon species name
-    EC_POKEMON2(TENTACOOL),
+    DOUBLE_SPECIES_NAME
+    EC_POKEMON_NATIONAL(TENTACOOL),
     EC_POKEMON(TENTACOOL),
     EC_WORD_FIERY,
-    EC_POKEMON2(MAREEP),
+    EC_POKEMON_NATIONAL(MAREEP),
     EC_MOVE2(ATTRACT),
     EC_WORD_CUTE_CHARM,
     EC_WORD_IMMUNITY,
@@ -2340,7 +2342,7 @@ const u16 gEasyChatWordsByLetter_UnusedJapaneseMo[] = {
     EC_WORD_MODE,
     EC_WORD_OLD,
     EC_WORD_THURSDAY,
-    EC_POKEMON2(FLAAFFY),
+    EC_POKEMON_NATIONAL(FLAAFFY),
     EC_WORD_LISTENING,
     EC_WORD_OWN,
     EC_WORD_MORE,
@@ -2351,9 +2353,9 @@ const u16 gEasyChatWordsByLetter_UnusedJapaneseMo[] = {
     EC_WORD_PATTERN,
     EC_WORD_FLASH_FIRE,
     EC_WORD_RECEIVED,
-    EC_POKEMON2(VENOMOTH),
+    EC_POKEMON_NATIONAL(VENOMOTH),
     EC_WORD_DOESN_T,
-    EC_POKEMON2(TANGELA),
+    EC_POKEMON_NATIONAL(TANGELA),
 };
 
 const u16 gEasyChatWordsByLetter_UnusedJapaneseYa[] = {
@@ -2368,19 +2370,19 @@ const u16 gEasyChatWordsByLetter_UnusedJapaneseYa[] = {
     EC_WORD_FINALLY,
     EC_WORD_ANY,
     EC_WORD_YAHOO,
-    EC_POKEMON2(SLOWKING),
-    EC_POKEMON2(SLOWBRO),
+    EC_POKEMON_NATIONAL(SLOWKING),
+    EC_POKEMON_NATIONAL(SLOWBRO),
     EC_MOVE2(LEECH_SEED),
-    EC_POKEMON2(SLOWPOKE),
+    EC_POKEMON_NATIONAL(SLOWPOKE),
     EC_WORD_DANGER,
-    EC_POKEMON2(MURKROW),
+    EC_POKEMON_NATIONAL(MURKROW),
     EC_POKEMON(SABLEYE),
     EC_WORD_DEFEATED,
     EC_WORD_BEAT,
     EC_WORD_VITAL_SPIRIT,
     EC_POKEMON(VIGOROTH),
     EC_WORD_YOUNG,
-    EC_POKEMON2(YANMA),
+    EC_POKEMON_NATIONAL(YANMA),
 };
 
 const u16 gEasyChatWordsByLetter_UnusedJapaneseYu[] = {
@@ -2393,8 +2395,8 @@ const u16 gEasyChatWordsByLetter_UnusedJapaneseYu[] = {
     EC_WORD_ALLOW,
     EC_WORD_FORGET,
     EC_POKEMON(CRADILY),
-    -1, 2, // Doubled pokemon species name
-    EC_POKEMON2(KADABRA),
+    DOUBLE_SPECIES_NAME
+    EC_POKEMON_NATIONAL(KADABRA),
     EC_POKEMON(KADABRA),
 };
 
@@ -2406,7 +2408,7 @@ const u16 gEasyChatWordsByLetter_UnusedJapaneseYo[] = {
     EC_WORD_KINDERGARTEN,
     EC_WORD_CHLOROPHYLL,
     EC_WORD_AFTER,
-    EC_POKEMON2(LARVITAR),
+    EC_POKEMON_NATIONAL(LARVITAR),
     EC_WORD_OH_KAY,
     EC_WORD_BEFORE,
     EC_WORD_GREAT,
@@ -2422,7 +2424,7 @@ const u16 gEasyChatWordsByLetter_UnusedJapaneseYo[] = {
     EC_WORD_EASY,
     EC_WORD_INSTEAD,
     EC_WORD_NIGHT,
-    EC_POKEMON2(NOCTOWL),
+    EC_POKEMON_NATIONAL(NOCTOWL),
     EC_WORD_COUNT_ON,
     EC_WORD_WEAK,
     EC_WORD_TOO_WEAK,
@@ -2430,10 +2432,10 @@ const u16 gEasyChatWordsByLetter_UnusedJapaneseYo[] = {
 };
 
 const u16 gEasyChatWordsByLetter_UnusedJapaneseRa[] = {
-    EC_POKEMON2(RAIKOU),
+    EC_POKEMON_NATIONAL(RAIKOU),
     EC_WORD_WEEK,
-    -1, 2, // Doubled pokemon species name
-    EC_POKEMON2(RAICHU),
+    DOUBLE_SPECIES_NAME
+    EC_POKEMON_NATIONAL(RAICHU),
     EC_POKEMON(RAICHU),
     EC_WORD_RIVAL,
     EC_WORD_LIFE,
@@ -2445,31 +2447,31 @@ const u16 gEasyChatWordsByLetter_UnusedJapaneseRa[] = {
     EC_WORD_SEEMS,
     EC_WORD_RADIO,
     EC_MOVE2(LUSTER_PURGE),
-    EC_POKEMON2(CHANSEY),
-    EC_POKEMON2(RATICATE),
+    EC_POKEMON_NATIONAL(CHANSEY),
+    EC_POKEMON_NATIONAL(RATICATE),
     EC_POKEMON(LATIAS),
     EC_POKEMON(LATIOS),
     EC_POKEMON(LUVDISC),
-    EC_POKEMON2(LAPRAS),
+    EC_POKEMON_NATIONAL(LAPRAS),
     EC_WORD_LOVEY_DOVEY,
-    -1, 2, // Doubled pokemon species name
-    EC_POKEMON2(VILEPLUME),
+    DOUBLE_SPECIES_NAME
+    EC_POKEMON_NATIONAL(VILEPLUME),
     EC_POKEMON(VILEPLUME),
     EC_WORD_LALALA,
     EC_POKEMON(RALTS),
     EC_WORD_FORGETS,
     EC_WORD_APPEARS,
     EC_WORD_RANK,
-    -1, 2, // Doubled pokemon species name
-    EC_POKEMON2(LANTURN),
+    DOUBLE_SPECIES_NAME
+    EC_POKEMON_NATIONAL(LANTURN),
     EC_POKEMON(LANTURN),
 };
 
 const u16 gEasyChatWordsByLetter_UnusedJapaneseRi[] = {
     EC_WORD_LEADER,
     EC_MOVE2(LEAF_BLADE),
-    EC_POKEMON2(CHARMELEON),
-    EC_POKEMON2(CHARIZARD),
+    EC_POKEMON_NATIONAL(CHARMELEON),
+    EC_POKEMON_NATIONAL(CHARIZARD),
     EC_MOVE2(RECYCLE),
     EC_MOVE2(REFLECT),
     EC_MOVE2(REFRESH),
@@ -2481,15 +2483,15 @@ const u16 gEasyChatWordsByLetter_UnusedJapaneseRi[] = {
     EC_MOVE2(DRAGON_DANCE),
     EC_WORD_VACATION,
     EC_POKEMON(LILEEP),
-    EC_POKEMON2(URSARING),
+    EC_POKEMON_NATIONAL(URSARING),
     EC_WORD_SHIELD_DUST,
 };
 
 const u16 gEasyChatWordsByLetter_UnusedJapaneseRu[] = {
-    EC_POKEMON2(JYNX),
+    EC_POKEMON_NATIONAL(JYNX),
     EC_WORD_ROOM,
     EC_WORD_RULE,
-    EC_POKEMON2(LUGIA),
+    EC_POKEMON_NATIONAL(LUGIA),
     EC_WORD_LOOK,
     EC_POKEMON(LUNATONE),
     EC_WORD_RUBY,
@@ -2500,8 +2502,8 @@ const u16 gEasyChatWordsByLetter_UnusedJapaneseRu[] = {
 };
 
 const u16 gEasyChatWordsByLetter_UnusedJapaneseRe[] = {
-    -1, 2, // Doubled pokemon species name
-    EC_POKEMON2(MAGNETON),
+    DOUBLE_SPECIES_NAME
+    EC_POKEMON_NATIONAL(MAGNETON),
     EC_POKEMON(MAGNETON),
     EC_MOVE2(ICE_PUNCH),
     EC_MOVE2(ICE_BEAM),
@@ -2510,8 +2512,8 @@ const u16 gEasyChatWordsByLetter_UnusedJapaneseRe[] = {
     EC_POKEMON(REGIROCK),
     EC_POKEMON(RAYQUAZA),
     EC_WORD_UGLY,
-    EC_POKEMON2(LEDIAN),
-    EC_POKEMON2(LEDYBA),
+    EC_POKEMON_NATIONAL(LEDIAN),
+    EC_POKEMON_NATIONAL(LEDYBA),
     EC_WORD_FANTASTIC,
     EC_WORD_LEVEL,
     EC_MOVE2(FURY_CUTTER),
@@ -2521,8 +2523,8 @@ const u16 gEasyChatWordsByLetter_UnusedJapaneseRe[] = {
 
 const u16 gEasyChatWordsByLetter_UnusedJapaneseRo[] = {
     EC_MOVE2(SKULL_BASH),
-    -1, 2, // Doubled pokemon species name
-    EC_POKEMON2(VULPIX),
+    DOUBLE_SPECIES_NAME
+    EC_POKEMON_NATIONAL(VULPIX),
     EC_POKEMON(VULPIX),
     EC_POKEMON(ROSELIA),
     EC_MOVE2(LOCK_ON),
@@ -2553,198 +2555,198 @@ const u16 gEasyChatWordsByLetter_UnusedJapaneseWa[] = {
     EC_WORD_HERS,
     EC_WORD_SHE_IS,
     EC_WORD_SOME,
-    EC_POKEMON2(JUMPLUFF),
+    EC_POKEMON_NATIONAL(JUMPLUFF),
     EC_MOVE2(COTTON_SPORE),
     EC_WORD_GWAH,
-    EC_POKEMON2(TOTODILE),
+    EC_POKEMON_NATIONAL(TOTODILE),
     EC_WORD_WAHAHAHA,
     EC_WORD_ANYWHERE,
     EC_MOVE2(STRUGGLE),
     EC_WORD_BADLY,
-    -1, 2, // Doubled pokemon species name
-    EC_POKEMON2(MACHOP),
+    DOUBLE_SPECIES_NAME
+    EC_POKEMON_NATIONAL(MACHOP),
     EC_POKEMON(MACHOP),
 };
 
-const struct EasyChatWordsByLetter gEasyChatWordsByLetterPointers[] = {
+const struct EasyChatWordsByLetter gEasyChatWordsByLetterPointers[EC_NUM_ALPHABET_GROUPS + 18] = { // 18 unused JP groups
     {
         .words = gEasyChatWordsByLetter_Others,
-        .numWords = 10,
+        .numWords = ARRAY_COUNT(gEasyChatWordsByLetter_Others),
     },
     {
         .words = gEasyChatWordsByLetter_A,
-        .numWords = 106,
+        .numWords = ARRAY_COUNT(gEasyChatWordsByLetter_A),
     },
     {
         .words = gEasyChatWordsByLetter_B,
-        .numWords = 86,
+        .numWords = ARRAY_COUNT(gEasyChatWordsByLetter_B),
     },
     {
         .words = gEasyChatWordsByLetter_C,
-        .numWords = 119,
+        .numWords = ARRAY_COUNT(gEasyChatWordsByLetter_C),
     },
     {
         .words = gEasyChatWordsByLetter_D,
-        .numWords = 94,
+        .numWords = ARRAY_COUNT(gEasyChatWordsByLetter_D),
     },
     {
         .words = gEasyChatWordsByLetter_E,
-        .numWords = 59,
+        .numWords = ARRAY_COUNT(gEasyChatWordsByLetter_E),
     },
     {
         .words = gEasyChatWordsByLetter_F,
-        .numWords = 80,
+        .numWords = ARRAY_COUNT(gEasyChatWordsByLetter_F),
     },
     {
         .words = gEasyChatWordsByLetter_G,
-        .numWords = 98,
+        .numWords = ARRAY_COUNT(gEasyChatWordsByLetter_G),
     },
     {
         .words = gEasyChatWordsByLetter_H,
-        .numWords = 101,
+        .numWords = ARRAY_COUNT(gEasyChatWordsByLetter_H),
     },
     {
         .words = gEasyChatWordsByLetter_I,
-        .numWords = 48,
+        .numWords = ARRAY_COUNT(gEasyChatWordsByLetter_I),
     },
     {
         .words = gEasyChatWordsByLetter_J,
-        .numWords = 13,
+        .numWords = ARRAY_COUNT(gEasyChatWordsByLetter_J),
     },
     {
         .words = gEasyChatWordsByLetter_K,
-        .numWords = 33,
+        .numWords = ARRAY_COUNT(gEasyChatWordsByLetter_K),
     },
     {
         .words = gEasyChatWordsByLetter_L,
-        .numWords = 82,
+        .numWords = ARRAY_COUNT(gEasyChatWordsByLetter_L),
     },
     {
         .words = gEasyChatWordsByLetter_M,
-        .numWords = 142,
+        .numWords = ARRAY_COUNT(gEasyChatWordsByLetter_M),
     },
     {
         .words = gEasyChatWordsByLetter_N,
-        .numWords = 54,
+        .numWords = ARRAY_COUNT(gEasyChatWordsByLetter_N),
     },
     {
         .words = gEasyChatWordsByLetter_O,
-        .numWords = 44,
+        .numWords = ARRAY_COUNT(gEasyChatWordsByLetter_O),
     },
     {
         .words = gEasyChatWordsByLetter_P,
-        .numWords = 102,
+        .numWords = ARRAY_COUNT(gEasyChatWordsByLetter_P),
     },
     {
         .words = gEasyChatWordsByLetter_Q,
-        .numWords = 6,
+        .numWords = ARRAY_COUNT(gEasyChatWordsByLetter_Q),
     },
     {
         .words = gEasyChatWordsByLetter_R,
-        .numWords = 80,
+        .numWords = ARRAY_COUNT(gEasyChatWordsByLetter_R),
     },
     {
         .words = gEasyChatWordsByLetter_S,
-        .numWords = 262,
+        .numWords = ARRAY_COUNT(gEasyChatWordsByLetter_S),
     },
     {
         .words = gEasyChatWordsByLetter_T,
-        .numWords = 133,
+        .numWords = ARRAY_COUNT(gEasyChatWordsByLetter_T),
     },
     {
         .words = gEasyChatWordsByLetter_U,
-        .numWords = 24,
+        .numWords = ARRAY_COUNT(gEasyChatWordsByLetter_U),
     },
     {
         .words = gEasyChatWordsByLetter_V,
-        .numWords = 33,
+        .numWords = ARRAY_COUNT(gEasyChatWordsByLetter_V),
     },
     {
         .words = gEasyChatWordsByLetter_W,
-        .numWords = 111,
+        .numWords = ARRAY_COUNT(gEasyChatWordsByLetter_W),
     },
     {
         .words = gEasyChatWordsByLetter_X,
-        .numWords = 4,
+        .numWords = ARRAY_COUNT(gEasyChatWordsByLetter_X),
     },
     {
         .words = gEasyChatWordsByLetter_Y,
-        .numWords = 19,
+        .numWords = ARRAY_COUNT(gEasyChatWordsByLetter_Y),
     },
     {
         .words = gEasyChatWordsByLetter_Z,
-        .numWords = 8,
+        .numWords = ARRAY_COUNT(gEasyChatWordsByLetter_Z),
     },
     {
         .words = gEasyChatWordsByLetter_UnusedJapaneseHi,
-        .numWords = 55,
+        .numWords = ARRAY_COUNT(gEasyChatWordsByLetter_UnusedJapaneseHi),
     },
     {
         .words = gEasyChatWordsByLetter_UnusedJapaneseFu,
-        .numWords = 71,
+        .numWords = ARRAY_COUNT(gEasyChatWordsByLetter_UnusedJapaneseFu),
     },
     {
         .words = gEasyChatWordsByLetter_UnusedJapaneseHe,
-        .numWords = 32,
+        .numWords = ARRAY_COUNT(gEasyChatWordsByLetter_UnusedJapaneseHe),
     },
     {
         .words = gEasyChatWordsByLetter_UnusedJapaneseHo,
-        .numWords = 55,
+        .numWords = ARRAY_COUNT(gEasyChatWordsByLetter_UnusedJapaneseHo),
     },
     {
         .words = gEasyChatWordsByLetter_UnusedJapaneseMa,
-        .numWords = 74,
+        .numWords = ARRAY_COUNT(gEasyChatWordsByLetter_UnusedJapaneseMa),
     },
     {
         .words = gEasyChatWordsByLetter_UnusedJapaneseMi,
-        .numWords = 37,
+        .numWords = ARRAY_COUNT(gEasyChatWordsByLetter_UnusedJapaneseMi),
     },
     {
         .words = gEasyChatWordsByLetter_UnusedJapaneseMu,
-        .numWords = 12,
+        .numWords = ARRAY_COUNT(gEasyChatWordsByLetter_UnusedJapaneseMu),
     },
     {
         .words = gEasyChatWordsByLetter_UnusedJapaneseMe,
-        .numWords = 26,
+        .numWords = ARRAY_COUNT(gEasyChatWordsByLetter_UnusedJapaneseMe),
     },
     {
         .words = gEasyChatWordsByLetter_UnusedJapaneseMo,
-        .numWords = 20,
+        .numWords = ARRAY_COUNT(gEasyChatWordsByLetter_UnusedJapaneseMo),
     },
     {
         .words = gEasyChatWordsByLetter_UnusedJapaneseYa,
-        .numWords = 24,
+        .numWords = ARRAY_COUNT(gEasyChatWordsByLetter_UnusedJapaneseYa),
     },
     {
         .words = gEasyChatWordsByLetter_UnusedJapaneseYu,
-        .numWords = 13,
+        .numWords = ARRAY_COUNT(gEasyChatWordsByLetter_UnusedJapaneseYu),
     },
     {
         .words = gEasyChatWordsByLetter_UnusedJapaneseYo,
-        .numWords = 28,
+        .numWords = ARRAY_COUNT(gEasyChatWordsByLetter_UnusedJapaneseYo),
     },
     {
         .words = gEasyChatWordsByLetter_UnusedJapaneseRa,
-        .numWords = 36,
+        .numWords = ARRAY_COUNT(gEasyChatWordsByLetter_UnusedJapaneseRa),
     },
     {
         .words = gEasyChatWordsByLetter_UnusedJapaneseRi,
-        .numWords = 17,
+        .numWords = ARRAY_COUNT(gEasyChatWordsByLetter_UnusedJapaneseRi),
     },
     {
         .words = gEasyChatWordsByLetter_UnusedJapaneseRu,
-        .numWords = 11,
+        .numWords = ARRAY_COUNT(gEasyChatWordsByLetter_UnusedJapaneseRu),
     },
     {
         .words = gEasyChatWordsByLetter_UnusedJapaneseRe,
-        .numWords = 18,
+        .numWords = ARRAY_COUNT(gEasyChatWordsByLetter_UnusedJapaneseRe),
     },
     {
         .words = gEasyChatWordsByLetter_UnusedJapaneseRo,
-        .numWords = 10,
+        .numWords = ARRAY_COUNT(gEasyChatWordsByLetter_UnusedJapaneseRo),
     },
     {
         .words = gEasyChatWordsByLetter_UnusedJapaneseWa,
-        .numWords = 33,
+        .numWords = ARRAY_COUNT(gEasyChatWordsByLetter_UnusedJapaneseWa),
     },
 };
diff --git a/src/data/items.h b/src/data/items.h
index 443c45f1a..e4e7e0fbc 100644
--- a/src/data/items.h
+++ b/src/data/items.h
@@ -1479,7 +1479,7 @@ const struct Item gItems[] =
         .pocket = POCKET_ITEMS,
         .type = ITEM_USE_MAIL,
         .fieldUseFunc = ItemUseOutOfBattle_Mail,
-        .secondaryId = ITEM_ORANGE_MAIL - FIRST_MAIL_INDEX,
+        .secondaryId = ITEM_TO_MAIL(ITEM_ORANGE_MAIL),
     },
 
     [ITEM_HARBOR_MAIL] =
@@ -1491,7 +1491,7 @@ const struct Item gItems[] =
         .pocket = POCKET_ITEMS,
         .type = ITEM_USE_MAIL,
         .fieldUseFunc = ItemUseOutOfBattle_Mail,
-        .secondaryId = ITEM_HARBOR_MAIL - FIRST_MAIL_INDEX,
+        .secondaryId = ITEM_TO_MAIL(ITEM_HARBOR_MAIL),
     },
 
     [ITEM_GLITTER_MAIL] =
@@ -1503,7 +1503,7 @@ const struct Item gItems[] =
         .pocket = POCKET_ITEMS,
         .type = ITEM_USE_MAIL,
         .fieldUseFunc = ItemUseOutOfBattle_Mail,
-        .secondaryId = ITEM_GLITTER_MAIL - FIRST_MAIL_INDEX,
+        .secondaryId = ITEM_TO_MAIL(ITEM_GLITTER_MAIL),
     },
 
     [ITEM_MECH_MAIL] =
@@ -1515,7 +1515,7 @@ const struct Item gItems[] =
         .pocket = POCKET_ITEMS,
         .type = ITEM_USE_MAIL,
         .fieldUseFunc = ItemUseOutOfBattle_Mail,
-        .secondaryId = ITEM_MECH_MAIL - FIRST_MAIL_INDEX,
+        .secondaryId = ITEM_TO_MAIL(ITEM_MECH_MAIL),
     },
 
     [ITEM_WOOD_MAIL] =
@@ -1527,7 +1527,7 @@ const struct Item gItems[] =
         .pocket = POCKET_ITEMS,
         .type = ITEM_USE_MAIL,
         .fieldUseFunc = ItemUseOutOfBattle_Mail,
-        .secondaryId = ITEM_WOOD_MAIL - FIRST_MAIL_INDEX,
+        .secondaryId = ITEM_TO_MAIL(ITEM_WOOD_MAIL),
     },
 
     [ITEM_WAVE_MAIL] =
@@ -1539,7 +1539,7 @@ const struct Item gItems[] =
         .pocket = POCKET_ITEMS,
         .type = ITEM_USE_MAIL,
         .fieldUseFunc = ItemUseOutOfBattle_Mail,
-        .secondaryId = ITEM_WAVE_MAIL - FIRST_MAIL_INDEX,
+        .secondaryId = ITEM_TO_MAIL(ITEM_WAVE_MAIL),
     },
 
     [ITEM_BEAD_MAIL] =
@@ -1551,7 +1551,7 @@ const struct Item gItems[] =
         .pocket = POCKET_ITEMS,
         .type = ITEM_USE_MAIL,
         .fieldUseFunc = ItemUseOutOfBattle_Mail,
-        .secondaryId = ITEM_BEAD_MAIL - FIRST_MAIL_INDEX,
+        .secondaryId = ITEM_TO_MAIL(ITEM_BEAD_MAIL),
     },
 
     [ITEM_SHADOW_MAIL] =
@@ -1563,7 +1563,7 @@ const struct Item gItems[] =
         .pocket = POCKET_ITEMS,
         .type = ITEM_USE_MAIL,
         .fieldUseFunc = ItemUseOutOfBattle_Mail,
-        .secondaryId = ITEM_SHADOW_MAIL - FIRST_MAIL_INDEX,
+        .secondaryId = ITEM_TO_MAIL(ITEM_SHADOW_MAIL),
     },
 
     [ITEM_TROPIC_MAIL] =
@@ -1575,7 +1575,7 @@ const struct Item gItems[] =
         .pocket = POCKET_ITEMS,
         .type = ITEM_USE_MAIL,
         .fieldUseFunc = ItemUseOutOfBattle_Mail,
-        .secondaryId = ITEM_TROPIC_MAIL - FIRST_MAIL_INDEX,
+        .secondaryId = ITEM_TO_MAIL(ITEM_TROPIC_MAIL),
     },
 
     [ITEM_DREAM_MAIL] =
@@ -1587,7 +1587,7 @@ const struct Item gItems[] =
         .pocket = POCKET_ITEMS,
         .type = ITEM_USE_MAIL,
         .fieldUseFunc = ItemUseOutOfBattle_Mail,
-        .secondaryId = ITEM_DREAM_MAIL - FIRST_MAIL_INDEX,
+        .secondaryId = ITEM_TO_MAIL(ITEM_DREAM_MAIL),
     },
 
     [ITEM_FAB_MAIL] =
@@ -1599,7 +1599,7 @@ const struct Item gItems[] =
         .pocket = POCKET_ITEMS,
         .type = ITEM_USE_MAIL,
         .fieldUseFunc = ItemUseOutOfBattle_Mail,
-        .secondaryId = ITEM_FAB_MAIL - FIRST_MAIL_INDEX,
+        .secondaryId = ITEM_TO_MAIL(ITEM_FAB_MAIL),
     },
 
     [ITEM_RETRO_MAIL] =
@@ -1611,7 +1611,7 @@ const struct Item gItems[] =
         .pocket = POCKET_ITEMS,
         .type = ITEM_USE_MAIL,
         .fieldUseFunc = ItemUseOutOfBattle_Mail,
-        .secondaryId = ITEM_RETRO_MAIL - FIRST_MAIL_INDEX,
+        .secondaryId = ITEM_TO_MAIL(ITEM_RETRO_MAIL),
     },
 
 // Berries
diff --git a/src/data/lilycove_lady.h b/src/data/lilycove_lady.h
index 37bae7e95..818a5fd5f 100644
--- a/src/data/lilycove_lady.h
+++ b/src/data/lilycove_lady.h
@@ -53,7 +53,7 @@ static const u16 sQuizLadyQuestion3[] =
     EC_WORD_POKEMON,
     EC_WORD_EVOLVE,
     EC_WORD_QUES,
-    0xFFFF,
+    EC_EMPTY_WORD,
     EC_WORD_LEVEL,
     EC_WORD_INSOMNIA,
     EC_WORD_CUTE_CHARM
@@ -92,7 +92,7 @@ static const u16 sQuizLadyQuestion6[] =
     EC_WORD_STOP,
     EC_MOVE2(CONFUSION),
     EC_WORD_QUES,
-    0xFFFF,
+    EC_EMPTY_WORD,
     EC_WORD_ILLUMINATE,
     EC_WORD_OWN_TEMPO,
     EC_WORD_SWIFT_SWIM
@@ -118,7 +118,7 @@ static const u16 sQuizLadyQuestion8[] =
     EC_MOVE2(BLOCK),
     EC_WORD_ESCAPE,
     EC_WORD_QUES,
-    0xFFFF, 
+    EC_EMPTY_WORD, 
     EC_WORD_RUN_AWAY,
     EC_WORD_SHADOW_TAG,
     EC_WORD_WONDER_GUARD
@@ -131,7 +131,7 @@ static const u16 sQuizLadyQuestion9[] =
     EC_WORD_STOP,
     EC_WORD_POISON,
     EC_WORD_QUES,
-    0xFFFF,
+    EC_EMPTY_WORD,
     EC_WORD_GUTS,
     EC_WORD_IMMUNITY,
     EC_WORD_SHED_SKIN
@@ -144,7 +144,7 @@ static const u16 sQuizLadyQuestion10[] =
     EC_WORD_WITH,
     EC_WORD_CENTER,
     EC_WORD_QUES,
-    0xFFFF,
+    EC_EMPTY_WORD,
     EC_WORD_POKEDEX,
     EC_WORD_POKEMON,
     EC_WORD_POKENAV
@@ -157,7 +157,7 @@ static const u16 sQuizLadyQuestion11[] =
     EC_WORD_YOUR,
     EC_WORD_POKEMON,
     EC_WORD_QUES,
-    0xFFFF,
+    EC_EMPTY_WORD,
     EC_WORD_PC,
     EC_WORD_DEPT_STORE,
     EC_WORD_TELEVISION
@@ -199,7 +199,7 @@ static const u16 sQuizLadyQuestion14[] =
     EC_WORD_QUES,
     EC_WORD_ICE,
     EC_WORD_GROUND,
-    0xFFFF
+    EC_EMPTY_WORD
 };
 
 static const u16 sQuizLadyQuestion15[] =
@@ -212,7 +212,7 @@ static const u16 sQuizLadyQuestion15[] =
     EC_WORD_QUES,
     EC_WORD_PSYCHIC,
     EC_WORD_FIGHTING,
-    0xFFFF
+    EC_EMPTY_WORD
 };
 
 static const u16 sQuizLadyQuestion16[] =
@@ -225,7 +225,7 @@ static const u16 sQuizLadyQuestion16[] =
     EC_WORD_QUES,
     EC_WORD_NORMAL,
     EC_WORD_DARK,
-    0xFFFF
+    EC_EMPTY_WORD
 };
 
 static const u16 *const sQuizLadyQuizQuestions[] =
diff --git a/src/data/trade.h b/src/data/trade.h
index b9350863b..7001b6ce5 100644
--- a/src/data/trade.h
+++ b/src/data/trade.h
@@ -1070,7 +1070,7 @@ static const u16 sIngameTradeMail[][MAIL_WORDS_COUNT + 1] =
         EC_WORD_THANK_YOU,
         EC_WORD_FOR,
         EC_POKEMON(SKITTY),
-        EC_POKEMON2(MEOWTH),
+        EC_POKEMON_NATIONAL(MEOWTH),
         EC_WORD_CRIES,
         EC_WORD_IN,
         EC_WORD_A,