Use better names for match call texts

1 files changed, 272 insertions, 272 deletions

diff --git a/src/match_call.c b/src/match_call.c
index 1b9eef76d..6744be43f 100755
--- a/src/match_call.c
+++ b/src/match_call.c
@@ -47,7 +47,7 @@ struct MatchCallTrainerTextInfo
     u16 trainerId;
     u16 unused;
     u16 battleTopicTextIds[3];
-    u16 battleFrontierStreakTextId;
+    u16 generalTextId;
     u8 battleFrontierRecordStreakTextIndex;
     u16 sameRouteMatchCallTextId;
     u16 differentRouteMatchCallTextId;
@@ -121,7 +121,7 @@ static const struct MatchCallTrainerTextInfo sMatchCallTrainers[] =
         .trainerId = TRAINER_ROSE_1,
         .unused = 0,
         .battleTopicTextIds = { TEXT_ID(1, 8), TEXT_ID(2, 8), TEXT_ID(3, 8) },
-        .battleFrontierStreakTextId = TEXT_ID(1, 3),
+        .generalTextId = TEXT_ID(1, 3),
         .battleFrontierRecordStreakTextIndex = 8,
         .sameRouteMatchCallTextId = TEXT_ID(1, 8),
         .differentRouteMatchCallTextId = TEXT_ID(2, 8),
@@ -130,7 +130,7 @@ static const struct MatchCallTrainerTextInfo sMatchCallTrainers[] =
         .trainerId = TRAINER_ANDRES_1,
         .unused = 0,
         .battleTopicTextIds = { TEXT_ID(1, 12), TEXT_ID(2, 12), TEXT_ID(3, 12) },
-        .battleFrontierStreakTextId = TEXT_ID(1, 62),
+        .generalTextId = TEXT_ID(1, 62),
         .battleFrontierRecordStreakTextIndex = 12,
         .sameRouteMatchCallTextId = TEXT_ID(1, 12),
         .differentRouteMatchCallTextId = TEXT_ID(2, 12),
@@ -139,7 +139,7 @@ static const struct MatchCallTrainerTextInfo sMatchCallTrainers[] =
         .trainerId = TRAINER_DUSTY_1,
         .unused = 0,
         .battleTopicTextIds = { TEXT_ID(1, 12), TEXT_ID(2, 12), TEXT_ID(3, 12) },
-        .battleFrontierStreakTextId = TEXT_ID(1, 4),
+        .generalTextId = TEXT_ID(1, 4),
         .battleFrontierRecordStreakTextIndex = 12,
         .sameRouteMatchCallTextId = TEXT_ID(1, 12),
         .differentRouteMatchCallTextId = TEXT_ID(2, 12),
@@ -148,7 +148,7 @@ static const struct MatchCallTrainerTextInfo sMatchCallTrainers[] =
         .trainerId = TRAINER_LOLA_1,
         .unused = 0,
         .battleTopicTextIds = { TEXT_ID(1, 2), TEXT_ID(2, 2), TEXT_ID(3, 2) },
-        .battleFrontierStreakTextId = TEXT_ID(1, 5),
+        .generalTextId = TEXT_ID(1, 5),
         .battleFrontierRecordStreakTextIndex = 2,
         .sameRouteMatchCallTextId = TEXT_ID(1, 2),
         .differentRouteMatchCallTextId = TEXT_ID(2, 2),
@@ -157,7 +157,7 @@ static const struct MatchCallTrainerTextInfo sMatchCallTrainers[] =
         .trainerId = TRAINER_RICKY_1,
         .unused = 0,
         .battleTopicTextIds = { TEXT_ID(1, 1), TEXT_ID(2, 1), TEXT_ID(3, 1) },
-        .battleFrontierStreakTextId = TEXT_ID(1, 6),
+        .generalTextId = TEXT_ID(1, 6),
         .battleFrontierRecordStreakTextIndex = 1,
         .sameRouteMatchCallTextId = TEXT_ID(1, 1),
         .differentRouteMatchCallTextId = TEXT_ID(2, 1),
@@ -166,7 +166,7 @@ static const struct MatchCallTrainerTextInfo sMatchCallTrainers[] =
         .trainerId = TRAINER_LILA_AND_ROY_1,
         .unused = 4,
         .battleTopicTextIds = { TEXT_ID(1, 1), TEXT_ID(2, 1), TEXT_ID(3, 1) },
-        .battleFrontierStreakTextId = TEXT_ID(1, 61),
+        .generalTextId = TEXT_ID(1, 61),
         .battleFrontierRecordStreakTextIndex = 1,
         .sameRouteMatchCallTextId = TEXT_ID(1, 1),
         .differentRouteMatchCallTextId = TEXT_ID(2, 1),
@@ -175,7 +175,7 @@ static const struct MatchCallTrainerTextInfo sMatchCallTrainers[] =
         .trainerId = TRAINER_CRISTIN_1,
         .unused = 0,
         .battleTopicTextIds = { TEXT_ID(1, 10), TEXT_ID(2, 10), TEXT_ID(3, 10) },
-        .battleFrontierStreakTextId = TEXT_ID(1, 64),
+        .generalTextId = TEXT_ID(1, 64),
         .battleFrontierRecordStreakTextIndex = 10,
         .sameRouteMatchCallTextId = TEXT_ID(1, 10),
         .differentRouteMatchCallTextId = TEXT_ID(2, 10),
@@ -184,7 +184,7 @@ static const struct MatchCallTrainerTextInfo sMatchCallTrainers[] =
         .trainerId = TRAINER_BROOKE_1,
         .unused = 0,
         .battleTopicTextIds = { TEXT_ID(1, 9), TEXT_ID(2, 9), TEXT_ID(3, 9) },
-        .battleFrontierStreakTextId = TEXT_ID(1, 8),
+        .generalTextId = TEXT_ID(1, 8),
         .battleFrontierRecordStreakTextIndex = 9,
         .sameRouteMatchCallTextId = TEXT_ID(1, 9),
         .differentRouteMatchCallTextId = TEXT_ID(2, 9),
@@ -193,7 +193,7 @@ static const struct MatchCallTrainerTextInfo sMatchCallTrainers[] =
         .trainerId = TRAINER_WILTON_1,
         .unused = 0,
         .battleTopicTextIds = { TEXT_ID(1, 6), TEXT_ID(2, 6), TEXT_ID(3, 6) },
-        .battleFrontierStreakTextId = TEXT_ID(1, 7),
+        .generalTextId = TEXT_ID(1, 7),
         .battleFrontierRecordStreakTextIndex = 6,
         .sameRouteMatchCallTextId = TEXT_ID(1, 6),
         .differentRouteMatchCallTextId = TEXT_ID(2, 6),
@@ -202,7 +202,7 @@ static const struct MatchCallTrainerTextInfo sMatchCallTrainers[] =
         .trainerId = TRAINER_VALERIE_1,
         .unused = 0,
         .battleTopicTextIds = { TEXT_ID(1, 8), TEXT_ID(2, 8), TEXT_ID(3, 8) },
-        .battleFrontierStreakTextId = TEXT_ID(1, 9),
+        .generalTextId = TEXT_ID(1, 9),
         .battleFrontierRecordStreakTextIndex = 8,
         .sameRouteMatchCallTextId = TEXT_ID(1, 8),
         .differentRouteMatchCallTextId = TEXT_ID(2, 8),
@@ -211,7 +211,7 @@ static const struct MatchCallTrainerTextInfo sMatchCallTrainers[] =
         .trainerId = TRAINER_CINDY_1,
         .unused = 0,
         .battleTopicTextIds = { TEXT_ID(1, 8), TEXT_ID(2, 8), TEXT_ID(3, 8) },
-        .battleFrontierStreakTextId = TEXT_ID(1, 10),
+        .generalTextId = TEXT_ID(1, 10),
         .battleFrontierRecordStreakTextIndex = 8,
         .sameRouteMatchCallTextId = TEXT_ID(1, 8),
         .differentRouteMatchCallTextId = TEXT_ID(2, 8),
@@ -220,7 +220,7 @@ static const struct MatchCallTrainerTextInfo sMatchCallTrainers[] =
         .trainerId = TRAINER_THALIA_1,
         .unused = 0,
         .battleTopicTextIds = { TEXT_ID(1, 8), TEXT_ID(2, 10), TEXT_ID(3, 10) },
-        .battleFrontierStreakTextId = TEXT_ID(1, 14),
+        .generalTextId = TEXT_ID(1, 14),
         .battleFrontierRecordStreakTextIndex = 10,
         .sameRouteMatchCallTextId = TEXT_ID(1, 8),
         .differentRouteMatchCallTextId = TEXT_ID(2, 10),
@@ -229,7 +229,7 @@ static const struct MatchCallTrainerTextInfo sMatchCallTrainers[] =
         .trainerId = TRAINER_JESSICA_1,
         .unused = 0,
         .battleTopicTextIds = { TEXT_ID(1, 10), TEXT_ID(2, 10), TEXT_ID(3, 10) },
-        .battleFrontierStreakTextId = TEXT_ID(1, 11),
+        .generalTextId = TEXT_ID(1, 11),
         .battleFrontierRecordStreakTextIndex = 10,
         .sameRouteMatchCallTextId = TEXT_ID(1, 8),
         .differentRouteMatchCallTextId = TEXT_ID(2, 10),
@@ -238,7 +238,7 @@ static const struct MatchCallTrainerTextInfo sMatchCallTrainers[] =
         .trainerId = TRAINER_WINSTON_1,
         .unused = 0,
         .battleTopicTextIds = { TEXT_ID(1, 4), TEXT_ID(2, 4), TEXT_ID(3, 4) },
-        .battleFrontierStreakTextId = TEXT_ID(1, 12),
+        .generalTextId = TEXT_ID(1, 12),
         .battleFrontierRecordStreakTextIndex = 4,
         .sameRouteMatchCallTextId = TEXT_ID(1, 4),
         .differentRouteMatchCallTextId = TEXT_ID(2, 4),
@@ -247,7 +247,7 @@ static const struct MatchCallTrainerTextInfo sMatchCallTrainers[] =
         .trainerId = TRAINER_STEVE_1,
         .unused = 0,
         .battleTopicTextIds = { TEXT_ID(1, 7), TEXT_ID(2, 7), TEXT_ID(3, 7) },
-        .battleFrontierStreakTextId = TEXT_ID(1, 13),
+        .generalTextId = TEXT_ID(1, 13),
         .battleFrontierRecordStreakTextIndex = 7,
         .sameRouteMatchCallTextId = TEXT_ID(1, 7),
         .differentRouteMatchCallTextId = TEXT_ID(2, 7),
@@ -256,7 +256,7 @@ static const struct MatchCallTrainerTextInfo sMatchCallTrainers[] =
         .trainerId = TRAINER_TONY_1,
         .unused = 0,
         .battleTopicTextIds = { TEXT_ID(1, 5), TEXT_ID(2, 5), TEXT_ID(3, 5) },
-        .battleFrontierStreakTextId = TEXT_ID(1, 15),
+        .generalTextId = TEXT_ID(1, 15),
         .battleFrontierRecordStreakTextIndex = 5,
         .sameRouteMatchCallTextId = TEXT_ID(1, 5),
         .differentRouteMatchCallTextId = TEXT_ID(2, 5),
@@ -265,7 +265,7 @@ static const struct MatchCallTrainerTextInfo sMatchCallTrainers[] =
         .trainerId = TRAINER_NOB_1,
         .unused = 0,
         .battleTopicTextIds = { TEXT_ID(1, 3), TEXT_ID(2, 3), TEXT_ID(3, 3) },
-        .battleFrontierStreakTextId = TEXT_ID(1, 16),
+        .generalTextId = TEXT_ID(1, 16),
         .battleFrontierRecordStreakTextIndex = 3,
         .sameRouteMatchCallTextId = TEXT_ID(1, 3),
         .differentRouteMatchCallTextId = TEXT_ID(2, 3),
@@ -274,7 +274,7 @@ static const struct MatchCallTrainerTextInfo sMatchCallTrainers[] =
         .trainerId = TRAINER_KOJI_1,
         .unused = 0,
         .battleTopicTextIds = { TEXT_ID(1, 3), TEXT_ID(2, 3), TEXT_ID(3, 3) },
-        .battleFrontierStreakTextId = TEXT_ID(1, 59),
+        .generalTextId = TEXT_ID(1, 59),
         .battleFrontierRecordStreakTextIndex = 3,
         .sameRouteMatchCallTextId = TEXT_ID(1, 3),
         .differentRouteMatchCallTextId = TEXT_ID(2, 3),
@@ -283,7 +283,7 @@ static const struct MatchCallTrainerTextInfo sMatchCallTrainers[] =
         .trainerId = TRAINER_FERNANDO_1,
         .unused = 0,
         .battleTopicTextIds = { TEXT_ID(1, 6), TEXT_ID(2, 6), TEXT_ID(3, 6) },
-        .battleFrontierStreakTextId = TEXT_ID(1, 17),
+        .generalTextId = TEXT_ID(1, 17),
         .battleFrontierRecordStreakTextIndex = 6,
         .sameRouteMatchCallTextId = TEXT_ID(1, 6),
         .differentRouteMatchCallTextId = TEXT_ID(2, 6),
@@ -292,7 +292,7 @@ static const struct MatchCallTrainerTextInfo sMatchCallTrainers[] =
         .trainerId = TRAINER_DALTON_1,
         .unused = 0,
         .battleTopicTextIds = { TEXT_ID(1, 4), TEXT_ID(2, 4), TEXT_ID(3, 4) },
-        .battleFrontierStreakTextId = TEXT_ID(1, 18),
+        .generalTextId = TEXT_ID(1, 18),
         .battleFrontierRecordStreakTextIndex = 4,
         .sameRouteMatchCallTextId = TEXT_ID(1, 4),
         .differentRouteMatchCallTextId = TEXT_ID(2, 4),
@@ -301,7 +301,7 @@ static const struct MatchCallTrainerTextInfo sMatchCallTrainers[] =
         .trainerId = TRAINER_BERNIE_1,
         .unused = 0,
         .battleTopicTextIds = { TEXT_ID(1, 11), TEXT_ID(2, 11), TEXT_ID(3, 11) },
-        .battleFrontierStreakTextId = TEXT_ID(1, 19),
+        .generalTextId = TEXT_ID(1, 19),
         .battleFrontierRecordStreakTextIndex = 11,
         .sameRouteMatchCallTextId = TEXT_ID(1, 11),
         .differentRouteMatchCallTextId = TEXT_ID(2, 11),
@@ -310,7 +310,7 @@ static const struct MatchCallTrainerTextInfo sMatchCallTrainers[] =
         .trainerId = TRAINER_ETHAN_1,
         .unused = 0,
         .battleTopicTextIds = { TEXT_ID(1, 1), TEXT_ID(2, 1), TEXT_ID(3, 1) },
-        .battleFrontierStreakTextId = TEXT_ID(1, 20),
+        .generalTextId = TEXT_ID(1, 20),
         .battleFrontierRecordStreakTextIndex = 1,
         .sameRouteMatchCallTextId = TEXT_ID(1, 1),
         .differentRouteMatchCallTextId = TEXT_ID(2, 1),
@@ -319,7 +319,7 @@ static const struct MatchCallTrainerTextInfo sMatchCallTrainers[] =
         .trainerId = TRAINER_JOHN_AND_JAY_1,
         .unused = 3,
         .battleTopicTextIds = { TEXT_ID(1, 12), TEXT_ID(2, 12), TEXT_ID(3, 12) },
-        .battleFrontierStreakTextId = TEXT_ID(1, 60),
+        .generalTextId = TEXT_ID(1, 60),
         .battleFrontierRecordStreakTextIndex = 12,
         .sameRouteMatchCallTextId = TEXT_ID(1, 12),
         .differentRouteMatchCallTextId = TEXT_ID(2, 12),
@@ -328,7 +328,7 @@ static const struct MatchCallTrainerTextInfo sMatchCallTrainers[] =
         .trainerId = TRAINER_JEFFREY_1,
         .unused = 0,
         .battleTopicTextIds = { TEXT_ID(1, 7), TEXT_ID(2, 7), TEXT_ID(3, 7) },
-        .battleFrontierStreakTextId = TEXT_ID(1, 21),
+        .generalTextId = TEXT_ID(1, 21),
         .battleFrontierRecordStreakTextIndex = 7,
         .sameRouteMatchCallTextId = TEXT_ID(1, 7),
         .differentRouteMatchCallTextId = TEXT_ID(2, 7),
@@ -337,7 +337,7 @@ static const struct MatchCallTrainerTextInfo sMatchCallTrainers[] =
         .trainerId = TRAINER_CAMERON_1,
         .unused = 0,
         .battleTopicTextIds = { TEXT_ID(1, 4), TEXT_ID(2, 4), TEXT_ID(3, 4) },
-        .battleFrontierStreakTextId = TEXT_ID(1, 22),
+        .generalTextId = TEXT_ID(1, 22),
         .battleFrontierRecordStreakTextIndex = 1,
         .sameRouteMatchCallTextId = TEXT_ID(1, 4),
         .differentRouteMatchCallTextId = TEXT_ID(2, 4),
@@ -346,7 +346,7 @@ static const struct MatchCallTrainerTextInfo sMatchCallTrainers[] =
         .trainerId = TRAINER_JACKI_1,
         .unused = 0,
         .battleTopicTextIds = { TEXT_ID(1, 8), TEXT_ID(2, 8), TEXT_ID(3, 8) },
-        .battleFrontierStreakTextId = TEXT_ID(1, 23),
+        .generalTextId = TEXT_ID(1, 23),
         .battleFrontierRecordStreakTextIndex = 8,
         .sameRouteMatchCallTextId = TEXT_ID(1, 8),
         .differentRouteMatchCallTextId = TEXT_ID(2, 8),
@@ -355,7 +355,7 @@ static const struct MatchCallTrainerTextInfo sMatchCallTrainers[] =
         .trainerId = TRAINER_WALTER_1,
         .unused = 0,
         .battleTopicTextIds = { TEXT_ID(1, 12), TEXT_ID(2, 12), TEXT_ID(3, 12) },
-        .battleFrontierStreakTextId = TEXT_ID(1, 24),
+        .generalTextId = TEXT_ID(1, 24),
         .battleFrontierRecordStreakTextIndex = 12,
         .sameRouteMatchCallTextId = TEXT_ID(1, 12),
         .differentRouteMatchCallTextId = TEXT_ID(2, 12),
@@ -364,7 +364,7 @@ static const struct MatchCallTrainerTextInfo sMatchCallTrainers[] =
         .trainerId = TRAINER_KAREN_1,
         .unused = 0,
         .battleTopicTextIds = { TEXT_ID(1, 2), TEXT_ID(2, 2), TEXT_ID(3, 2) },
-        .battleFrontierStreakTextId = TEXT_ID(1, 26),
+        .generalTextId = TEXT_ID(1, 26),
         .battleFrontierRecordStreakTextIndex = 2,
         .sameRouteMatchCallTextId = TEXT_ID(1, 2),
         .differentRouteMatchCallTextId = TEXT_ID(2, 2),
@@ -373,7 +373,7 @@ static const struct MatchCallTrainerTextInfo sMatchCallTrainers[] =
         .trainerId = TRAINER_JERRY_1,
         .unused = 0,
         .battleTopicTextIds = { TEXT_ID(1, 1), TEXT_ID(2, 1), TEXT_ID(3, 1) },
-        .battleFrontierStreakTextId = TEXT_ID(1, 25),
+        .generalTextId = TEXT_ID(1, 25),
         .battleFrontierRecordStreakTextIndex = 1,
         .sameRouteMatchCallTextId = TEXT_ID(1, 1),
         .differentRouteMatchCallTextId = TEXT_ID(2, 1),
@@ -382,7 +382,7 @@ static const struct MatchCallTrainerTextInfo sMatchCallTrainers[] =
         .trainerId = TRAINER_ANNA_AND_MEG_1,
         .unused = 6,
         .battleTopicTextIds = { TEXT_ID(1, 9), TEXT_ID(2, 9), TEXT_ID(3, 9) },
-        .battleFrontierStreakTextId = TEXT_ID(1, 27),
+        .generalTextId = TEXT_ID(1, 27),
         .battleFrontierRecordStreakTextIndex = 9,
         .sameRouteMatchCallTextId = TEXT_ID(1, 9),
         .differentRouteMatchCallTextId = TEXT_ID(2, 9),
@@ -391,7 +391,7 @@ static const struct MatchCallTrainerTextInfo sMatchCallTrainers[] =
         .trainerId = TRAINER_ISABEL_1,
         .unused = 0,
         .battleTopicTextIds = { TEXT_ID(1, 14), TEXT_ID(2, 14), TEXT_ID(3, 14) },
-        .battleFrontierStreakTextId = TEXT_ID(1, 29),
+        .generalTextId = TEXT_ID(1, 29),
         .battleFrontierRecordStreakTextIndex = 14,
         .sameRouteMatchCallTextId = TEXT_ID(1, 14),
         .differentRouteMatchCallTextId = TEXT_ID(2, 14),
@@ -400,7 +400,7 @@ static const struct MatchCallTrainerTextInfo sMatchCallTrainers[] =
         .trainerId = TRAINER_MIGUEL_1,
         .unused = 0,
         .battleTopicTextIds = { TEXT_ID(1, 11), TEXT_ID(2, 11), TEXT_ID(3, 11) },
-        .battleFrontierStreakTextId = TEXT_ID(1, 28),
+        .generalTextId = TEXT_ID(1, 28),
         .battleFrontierRecordStreakTextIndex = 11,
         .sameRouteMatchCallTextId = TEXT_ID(1, 11),
         .differentRouteMatchCallTextId = TEXT_ID(2, 11),
@@ -409,7 +409,7 @@ static const struct MatchCallTrainerTextInfo sMatchCallTrainers[] =
         .trainerId = TRAINER_TIMOTHY_1,
         .unused = 0,
         .battleTopicTextIds = { TEXT_ID(1, 12), TEXT_ID(2, 12), TEXT_ID(3, 12) },
-        .battleFrontierStreakTextId = TEXT_ID(1, 30),
+        .generalTextId = TEXT_ID(1, 30),
         .battleFrontierRecordStreakTextIndex = 12,
         .sameRouteMatchCallTextId = TEXT_ID(1, 12),
         .differentRouteMatchCallTextId = TEXT_ID(2, 12),
@@ -418,7 +418,7 @@ static const struct MatchCallTrainerTextInfo sMatchCallTrainers[] =
         .trainerId = TRAINER_SHELBY_1,
         .unused = 0,
         .battleTopicTextIds = { TEXT_ID(1, 13), TEXT_ID(2, 13), TEXT_ID(3, 13) },
-        .battleFrontierStreakTextId = TEXT_ID(1, 31),
+        .generalTextId = TEXT_ID(1, 31),
         .battleFrontierRecordStreakTextIndex = 13,
         .sameRouteMatchCallTextId = TEXT_ID(1, 13),
         .differentRouteMatchCallTextId = TEXT_ID(2, 13),
@@ -427,7 +427,7 @@ static const struct MatchCallTrainerTextInfo sMatchCallTrainers[] =
         .trainerId = TRAINER_CALVIN_1,
         .unused = 0,
         .battleTopicTextIds = { TEXT_ID(1, 1), TEXT_ID(2, 1), TEXT_ID(3, 1) },
-        .battleFrontierStreakTextId = TEXT_ID(1, 32),
+        .generalTextId = TEXT_ID(1, 32),
         .battleFrontierRecordStreakTextIndex = 1,
         .sameRouteMatchCallTextId = TEXT_ID(1, 1),
         .differentRouteMatchCallTextId = TEXT_ID(2, 1),
@@ -436,7 +436,7 @@ static const struct MatchCallTrainerTextInfo sMatchCallTrainers[] =
         .trainerId = TRAINER_ELLIOT_1,
         .unused = 0,
         .battleTopicTextIds = { TEXT_ID(1, 3), TEXT_ID(2, 3), TEXT_ID(3, 3) },
-        .battleFrontierStreakTextId = TEXT_ID(1, 33),
+        .generalTextId = TEXT_ID(1, 33),
         .battleFrontierRecordStreakTextIndex = 3,
         .sameRouteMatchCallTextId = TEXT_ID(1, 3),
         .differentRouteMatchCallTextId = TEXT_ID(2, 3),
@@ -445,7 +445,7 @@ static const struct MatchCallTrainerTextInfo sMatchCallTrainers[] =
         .trainerId = TRAINER_ISAIAH_1,
         .unused = 0,
         .battleTopicTextIds = { TEXT_ID(1, 5), TEXT_ID(2, 5), TEXT_ID(3, 5) },
-        .battleFrontierStreakTextId = TEXT_ID(1, 38),
+        .generalTextId = TEXT_ID(1, 38),
         .battleFrontierRecordStreakTextIndex = 5,
         .sameRouteMatchCallTextId = TEXT_ID(1, 5),
         .differentRouteMatchCallTextId = TEXT_ID(2, 5),
@@ -454,7 +454,7 @@ static const struct MatchCallTrainerTextInfo sMatchCallTrainers[] =
         .trainerId = TRAINER_MARIA_1,
         .unused = 0,
         .battleTopicTextIds = { TEXT_ID(1, 9), TEXT_ID(2, 9), TEXT_ID(3, 9) },
-        .battleFrontierStreakTextId = TEXT_ID(1, 37),
+        .generalTextId = TEXT_ID(1, 37),
         .battleFrontierRecordStreakTextIndex = 9,
         .sameRouteMatchCallTextId = TEXT_ID(1, 9),
         .differentRouteMatchCallTextId = TEXT_ID(2, 9),
@@ -463,7 +463,7 @@ static const struct MatchCallTrainerTextInfo sMatchCallTrainers[] =
         .trainerId = TRAINER_ABIGAIL_1,
         .unused = 0,
         .battleTopicTextIds = { TEXT_ID(1, 9), TEXT_ID(2, 9), TEXT_ID(3, 9) },
-        .battleFrontierStreakTextId = TEXT_ID(1, 35),
+        .generalTextId = TEXT_ID(1, 35),
         .battleFrontierRecordStreakTextIndex = 9,
         .sameRouteMatchCallTextId = TEXT_ID(1, 9),
         .differentRouteMatchCallTextId = TEXT_ID(2, 9),
@@ -472,7 +472,7 @@ static const struct MatchCallTrainerTextInfo sMatchCallTrainers[] =
         .trainerId = TRAINER_DYLAN_1,
         .unused = 0,
         .battleTopicTextIds = { TEXT_ID(1, 5), TEXT_ID(2, 5), TEXT_ID(3, 5) },
-        .battleFrontierStreakTextId = TEXT_ID(1, 36),
+        .generalTextId = TEXT_ID(1, 36),
         .battleFrontierRecordStreakTextIndex = 5,
         .sameRouteMatchCallTextId = TEXT_ID(1, 5),
         .differentRouteMatchCallTextId = TEXT_ID(2, 5),
@@ -481,7 +481,7 @@ static const struct MatchCallTrainerTextInfo sMatchCallTrainers[] =
         .trainerId = TRAINER_KATELYN_1,
         .unused = 0,
         .battleTopicTextIds = { TEXT_ID(1, 9), TEXT_ID(2, 9), TEXT_ID(3, 9) },
-        .battleFrontierStreakTextId = TEXT_ID(1, 40),
+        .generalTextId = TEXT_ID(1, 40),
         .battleFrontierRecordStreakTextIndex = 9,
         .sameRouteMatchCallTextId = TEXT_ID(1, 9),
         .differentRouteMatchCallTextId = TEXT_ID(2, 9),
@@ -490,7 +490,7 @@ static const struct MatchCallTrainerTextInfo sMatchCallTrainers[] =
         .trainerId = TRAINER_BENJAMIN_1,
         .unused = 0,
         .battleTopicTextIds = { TEXT_ID(1, 5), TEXT_ID(2, 5), TEXT_ID(3, 5) },
-        .battleFrontierStreakTextId = TEXT_ID(1, 34),
+        .generalTextId = TEXT_ID(1, 34),
         .battleFrontierRecordStreakTextIndex = 5,
         .sameRouteMatchCallTextId = TEXT_ID(1, 5),
         .differentRouteMatchCallTextId = TEXT_ID(2, 5),
@@ -499,7 +499,7 @@ static const struct MatchCallTrainerTextInfo sMatchCallTrainers[] =
         .trainerId = TRAINER_PABLO_1,
         .unused = 0,
         .battleTopicTextIds = { TEXT_ID(1, 5), TEXT_ID(2, 5), TEXT_ID(3, 5) },
-        .battleFrontierStreakTextId = TEXT_ID(1, 39),
+        .generalTextId = TEXT_ID(1, 39),
         .battleFrontierRecordStreakTextIndex = 5,
         .sameRouteMatchCallTextId = TEXT_ID(1, 5),
         .differentRouteMatchCallTextId = TEXT_ID(2, 5),
@@ -508,7 +508,7 @@ static const struct MatchCallTrainerTextInfo sMatchCallTrainers[] =
         .trainerId = TRAINER_NICOLAS_1,
         .unused = 0,
         .battleTopicTextIds = { TEXT_ID(1, 4), TEXT_ID(2, 4), TEXT_ID(3, 4) },
-        .battleFrontierStreakTextId = TEXT_ID(1, 41),
+        .generalTextId = TEXT_ID(1, 41),
         .battleFrontierRecordStreakTextIndex = 4,
         .sameRouteMatchCallTextId = TEXT_ID(1, 4),
         .differentRouteMatchCallTextId = TEXT_ID(2, 4),
@@ -517,7 +517,7 @@ static const struct MatchCallTrainerTextInfo sMatchCallTrainers[] =
         .trainerId = TRAINER_ROBERT_1,
         .unused = 0,
         .battleTopicTextIds = { TEXT_ID(1, 6), TEXT_ID(2, 6), TEXT_ID(3, 6) },
-        .battleFrontierStreakTextId = TEXT_ID(1, 42),
+        .generalTextId = TEXT_ID(1, 42),
         .battleFrontierRecordStreakTextIndex = 6,
         .sameRouteMatchCallTextId = TEXT_ID(1, 6),
         .differentRouteMatchCallTextId = TEXT_ID(2, 6),
@@ -526,7 +526,7 @@ static const struct MatchCallTrainerTextInfo sMatchCallTrainers[] =
         .trainerId = TRAINER_LAO_1,
         .unused = 0,
         .battleTopicTextIds = { TEXT_ID(1, 1), TEXT_ID(2, 1), TEXT_ID(3, 1) },
-        .battleFrontierStreakTextId = TEXT_ID(1, 43),
+        .generalTextId = TEXT_ID(1, 43),
         .battleFrontierRecordStreakTextIndex = 1,
         .sameRouteMatchCallTextId = TEXT_ID(1, 1),
         .differentRouteMatchCallTextId = TEXT_ID(2, 1),
@@ -535,7 +535,7 @@ static const struct MatchCallTrainerTextInfo sMatchCallTrainers[] =
         .trainerId = TRAINER_CYNDY_1,
         .unused = 0,
         .battleTopicTextIds = { TEXT_ID(1, 9), TEXT_ID(2, 9), TEXT_ID(3, 9) },
-        .battleFrontierStreakTextId = TEXT_ID(1, 44),
+        .generalTextId = TEXT_ID(1, 44),
         .battleFrontierRecordStreakTextIndex = 9,
         .sameRouteMatchCallTextId = TEXT_ID(1, 9),
         .differentRouteMatchCallTextId = TEXT_ID(2, 9),
@@ -544,7 +544,7 @@ static const struct MatchCallTrainerTextInfo sMatchCallTrainers[] =
         .trainerId = TRAINER_MADELINE_1,
         .unused = 0,
         .battleTopicTextIds = { TEXT_ID(1, 8), TEXT_ID(2, 8), TEXT_ID(3, 8) },
-        .battleFrontierStreakTextId = TEXT_ID(1, 45),
+        .generalTextId = TEXT_ID(1, 45),
         .battleFrontierRecordStreakTextIndex = 8,
         .sameRouteMatchCallTextId = TEXT_ID(1, 8),
         .differentRouteMatchCallTextId = TEXT_ID(2, 8),
@@ -553,7 +553,7 @@ static const struct MatchCallTrainerTextInfo sMatchCallTrainers[] =
         .trainerId = TRAINER_JENNY_1,
         .unused = 0,
         .battleTopicTextIds = { TEXT_ID(1, 9), TEXT_ID(2, 9), TEXT_ID(3, 9) },
-        .battleFrontierStreakTextId = TEXT_ID(1, 46),
+        .generalTextId = TEXT_ID(1, 46),
         .battleFrontierRecordStreakTextIndex = 9,
         .sameRouteMatchCallTextId = TEXT_ID(1, 9),
         .differentRouteMatchCallTextId = TEXT_ID(2, 9),
@@ -562,7 +562,7 @@ static const struct MatchCallTrainerTextInfo sMatchCallTrainers[] =
         .trainerId = TRAINER_DIANA_1,
         .unused = 0,
         .battleTopicTextIds = { TEXT_ID(1, 2), TEXT_ID(2, 2), TEXT_ID(3, 2) },
-        .battleFrontierStreakTextId = TEXT_ID(1, 47),
+        .generalTextId = TEXT_ID(1, 47),
         .battleFrontierRecordStreakTextIndex = 2,
         .sameRouteMatchCallTextId = TEXT_ID(1, 2),
         .differentRouteMatchCallTextId = TEXT_ID(2, 2),
@@ -571,7 +571,7 @@ static const struct MatchCallTrainerTextInfo sMatchCallTrainers[] =
         .trainerId = TRAINER_AMY_AND_LIV_1,
         .unused = 2,
         .battleTopicTextIds = { TEXT_ID(1, 2), TEXT_ID(2, 2), TEXT_ID(3, 2) },
-        .battleFrontierStreakTextId = TEXT_ID(1, 48),
+        .generalTextId = TEXT_ID(1, 48),
         .battleFrontierRecordStreakTextIndex = 1,
         .sameRouteMatchCallTextId = TEXT_ID(1, 2),
         .differentRouteMatchCallTextId = TEXT_ID(2, 2),
@@ -580,7 +580,7 @@ static const struct MatchCallTrainerTextInfo sMatchCallTrainers[] =
         .trainerId = TRAINER_ERNEST_1,
         .unused = 0,
         .battleTopicTextIds = { TEXT_ID(1, 3), TEXT_ID(2, 3), TEXT_ID(3, 3) },
-        .battleFrontierStreakTextId = TEXT_ID(1, 49),
+        .generalTextId = TEXT_ID(1, 49),
         .battleFrontierRecordStreakTextIndex = 3,
         .sameRouteMatchCallTextId = TEXT_ID(1, 3),
         .differentRouteMatchCallTextId = TEXT_ID(2, 3),
@@ -589,7 +589,7 @@ static const struct MatchCallTrainerTextInfo sMatchCallTrainers[] =
         .trainerId = TRAINER_CORY_1,
         .unused = 0,
         .battleTopicTextIds = { TEXT_ID(1, 3), TEXT_ID(2, 3), TEXT_ID(3, 3) },
-        .battleFrontierStreakTextId = TEXT_ID(1, 63),
+        .generalTextId = TEXT_ID(1, 63),
         .battleFrontierRecordStreakTextIndex = 3,
         .sameRouteMatchCallTextId = TEXT_ID(1, 3),
         .differentRouteMatchCallTextId = TEXT_ID(2, 3),
@@ -598,7 +598,7 @@ static const struct MatchCallTrainerTextInfo sMatchCallTrainers[] =
         .trainerId = TRAINER_EDWIN_1,
         .unused = 0,
         .battleTopicTextIds = { TEXT_ID(1, 7), TEXT_ID(2, 7), TEXT_ID(3, 7) },
-        .battleFrontierStreakTextId = TEXT_ID(1, 50),
+        .generalTextId = TEXT_ID(1, 50),
         .battleFrontierRecordStreakTextIndex = 7,
         .sameRouteMatchCallTextId = TEXT_ID(1, 7),
         .differentRouteMatchCallTextId = TEXT_ID(2, 7),
@@ -607,7 +607,7 @@ static const struct MatchCallTrainerTextInfo sMatchCallTrainers[] =
         .trainerId = TRAINER_LYDIA_1,
         .unused = 0,
         .battleTopicTextIds = { TEXT_ID(1, 8), TEXT_ID(2, 8), TEXT_ID(3, 8) },
-        .battleFrontierStreakTextId = TEXT_ID(1, 52),
+        .generalTextId = TEXT_ID(1, 52),
         .battleFrontierRecordStreakTextIndex = 8,
         .sameRouteMatchCallTextId = TEXT_ID(1, 8),
         .differentRouteMatchCallTextId = TEXT_ID(2, 8),
@@ -616,7 +616,7 @@ static const struct MatchCallTrainerTextInfo sMatchCallTrainers[] =
         .trainerId = TRAINER_ISAAC_1,
         .unused = 0,
         .battleTopicTextIds = { TEXT_ID(1, 5), TEXT_ID(2, 5), TEXT_ID(3, 5) },
-        .battleFrontierStreakTextId = TEXT_ID(1, 51),
+        .generalTextId = TEXT_ID(1, 51),
         .battleFrontierRecordStreakTextIndex = 5,
         .sameRouteMatchCallTextId = TEXT_ID(1, 5),
         .differentRouteMatchCallTextId = TEXT_ID(2, 5),
@@ -625,7 +625,7 @@ static const struct MatchCallTrainerTextInfo sMatchCallTrainers[] =
         .trainerId = TRAINER_GABRIELLE_1,
         .unused = 0,
         .battleTopicTextIds = { TEXT_ID(1, 8), TEXT_ID(2, 8), TEXT_ID(3, 8) },
-        .battleFrontierStreakTextId = TEXT_ID(1, 2),
+        .generalTextId = TEXT_ID(1, 2),
         .battleFrontierRecordStreakTextIndex = 8,
         .sameRouteMatchCallTextId = TEXT_ID(1, 8),
         .differentRouteMatchCallTextId = TEXT_ID(2, 8),
@@ -634,7 +634,7 @@ static const struct MatchCallTrainerTextInfo sMatchCallTrainers[] =
         .trainerId = TRAINER_CATHERINE_1,
         .unused = 0,
         .battleTopicTextIds = { TEXT_ID(1, 9), TEXT_ID(2, 9), TEXT_ID(3, 9) },
-        .battleFrontierStreakTextId = TEXT_ID(1, 54),
+        .generalTextId = TEXT_ID(1, 54),
         .battleFrontierRecordStreakTextIndex = 9,
         .sameRouteMatchCallTextId = TEXT_ID(1, 9),
         .differentRouteMatchCallTextId = TEXT_ID(2, 9),
@@ -643,7 +643,7 @@ static const struct MatchCallTrainerTextInfo sMatchCallTrainers[] =
         .trainerId = TRAINER_JACKSON_1,
         .unused = 0,
         .battleTopicTextIds = { TEXT_ID(1, 5), TEXT_ID(2, 5), TEXT_ID(3, 5) },
-        .battleFrontierStreakTextId = TEXT_ID(1, 53),
+        .generalTextId = TEXT_ID(1, 53),
         .battleFrontierRecordStreakTextIndex = 5,
         .sameRouteMatchCallTextId = TEXT_ID(1, 5),
         .differentRouteMatchCallTextId = TEXT_ID(2, 5),
@@ -652,7 +652,7 @@ static const struct MatchCallTrainerTextInfo sMatchCallTrainers[] =
         .trainerId = TRAINER_HALEY_1,
         .unused = 0,
         .battleTopicTextIds = { TEXT_ID(1, 2), TEXT_ID(2, 2), TEXT_ID(3, 2) },
-        .battleFrontierStreakTextId = TEXT_ID(1, 55),
+        .generalTextId = TEXT_ID(1, 55),
         .battleFrontierRecordStreakTextIndex = 2,
         .sameRouteMatchCallTextId = TEXT_ID(1, 2),
         .differentRouteMatchCallTextId = TEXT_ID(2, 2),
@@ -661,7 +661,7 @@ static const struct MatchCallTrainerTextInfo sMatchCallTrainers[] =
         .trainerId = TRAINER_JAMES_1,
         .unused = 0,
         .battleTopicTextIds = { TEXT_ID(1, 1), TEXT_ID(2, 1), TEXT_ID(3, 1) },
-        .battleFrontierStreakTextId = TEXT_ID(1, 56),
+        .generalTextId = TEXT_ID(1, 56),
         .battleFrontierRecordStreakTextIndex = 1,
         .sameRouteMatchCallTextId = TEXT_ID(1, 1),
         .differentRouteMatchCallTextId = TEXT_ID(2, 1),
@@ -670,7 +670,7 @@ static const struct MatchCallTrainerTextInfo sMatchCallTrainers[] =
         .trainerId = TRAINER_TRENT_1,
         .unused = 0,
         .battleTopicTextIds = { TEXT_ID(1, 3), TEXT_ID(2, 3), TEXT_ID(3, 3) },
-        .battleFrontierStreakTextId = TEXT_ID(1, 57),
+        .generalTextId = TEXT_ID(1, 57),
         .battleFrontierRecordStreakTextIndex = 3,
         .sameRouteMatchCallTextId = TEXT_ID(1, 3),
         .differentRouteMatchCallTextId = TEXT_ID(2, 3),
@@ -679,7 +679,7 @@ static const struct MatchCallTrainerTextInfo sMatchCallTrainers[] =
         .trainerId = TRAINER_SAWYER_1,
         .unused = 0,
         .battleTopicTextIds = { TEXT_ID(1, 15), TEXT_ID(2, 3), TEXT_ID(3, 3) },
-        .battleFrontierStreakTextId = TEXT_ID(1, 1),
+        .generalTextId = TEXT_ID(1, 1),
         .battleFrontierRecordStreakTextIndex = 3,
         .sameRouteMatchCallTextId = TEXT_ID(1, 3),
         .differentRouteMatchCallTextId = TEXT_ID(2, 3),
@@ -688,7 +688,7 @@ static const struct MatchCallTrainerTextInfo sMatchCallTrainers[] =
         .trainerId = TRAINER_KIRA_AND_DAN_1,
         .unused = 1,
         .battleTopicTextIds = { TEXT_ID(1, 9), TEXT_ID(2, 9), TEXT_ID(3, 9) },
-        .battleFrontierStreakTextId = TEXT_ID(1, 58),
+        .generalTextId = TEXT_ID(1, 58),
         .battleFrontierRecordStreakTextIndex = 9,
         .sameRouteMatchCallTextId = TEXT_ID(1, 9),
         .differentRouteMatchCallTextId = TEXT_ID(2, 9),
@@ -697,251 +697,251 @@ static const struct MatchCallTrainerTextInfo sMatchCallTrainers[] =
 
 static const struct MatchCallText sMatchCallWildBattleTexts[] =
 {
-    { .text = BattleFrontier_PokeNav_2A971C, .stringVarFuncIds = { 0, 2, -1 } },
-    { .text = BattleFrontier_PokeNav_2A9798, .stringVarFuncIds = { 0, 2, -1 } },
-    { .text = BattleFrontier_PokeNav_2A9813, .stringVarFuncIds = { 0, 2, -1 } },
-    { .text = BattleFrontier_PokeNav_2A98A8, .stringVarFuncIds = { 0, 2, -1 } },
-    { .text = BattleFrontier_PokeNav_2A9977, .stringVarFuncIds = { 0, 2, -1 } },
-    { .text = BattleFrontier_PokeNav_2A99FD, .stringVarFuncIds = { 0, 2, -1 } },
-    { .text = BattleFrontier_PokeNav_2A9A78, .stringVarFuncIds = { 0, 2, -1 } },
-    { .text = BattleFrontier_PokeNav_2A9AE8, .stringVarFuncIds = { 0, 2, -1 } },
-    { .text = BattleFrontier_PokeNav_2A9BA7, .stringVarFuncIds = { 0, 2, -1 } },
-    { .text = BattleFrontier_PokeNav_2A9C36, .stringVarFuncIds = { 0, 2, -1 } },
-    { .text = BattleFrontier_PokeNav_2A9CC8, .stringVarFuncIds = { 0, 2, -1 } },
-    { .text = BattleFrontier_PokeNav_2A9D44, .stringVarFuncIds = { 0, 2, -1 } },
-    { .text = BattleFrontier_PokeNav_2A9DD7, .stringVarFuncIds = { 0, 2, -1 } },
-    { .text = BattleFrontier_PokeNav_2A9E70, .stringVarFuncIds = { 0, 2, -1 } },
-    { .text = BattleFrontier_PokeNav_2A9EFD, .stringVarFuncIds = { 0, 2, -1 } },
+    { .text = MatchCall_WildBattleText1,  .stringVarFuncIds = { 0, 2, -1 } },
+    { .text = MatchCall_WildBattleText2,  .stringVarFuncIds = { 0, 2, -1 } },
+    { .text = MatchCall_WildBattleText3,  .stringVarFuncIds = { 0, 2, -1 } },
+    { .text = MatchCall_WildBattleText4,  .stringVarFuncIds = { 0, 2, -1 } },
+    { .text = MatchCall_WildBattleText5,  .stringVarFuncIds = { 0, 2, -1 } },
+    { .text = MatchCall_WildBattleText6,  .stringVarFuncIds = { 0, 2, -1 } },
+    { .text = MatchCall_WildBattleText7,  .stringVarFuncIds = { 0, 2, -1 } },
+    { .text = MatchCall_WildBattleText8,  .stringVarFuncIds = { 0, 2, -1 } },
+    { .text = MatchCall_WildBattleText9,  .stringVarFuncIds = { 0, 2, -1 } },
+    { .text = MatchCall_WildBattleText10, .stringVarFuncIds = { 0, 2, -1 } },
+    { .text = MatchCall_WildBattleText11, .stringVarFuncIds = { 0, 2, -1 } },
+    { .text = MatchCall_WildBattleText12, .stringVarFuncIds = { 0, 2, -1 } },
+    { .text = MatchCall_WildBattleText13, .stringVarFuncIds = { 0, 2, -1 } },
+    { .text = MatchCall_WildBattleText14, .stringVarFuncIds = { 0, 2, -1 } },
+    { .text = MatchCall_WildBattleText15, .stringVarFuncIds = { 0, 2, -1 } },
 };
 
  static const struct MatchCallText sMatchCallNegativeBattleTexts[] =
  {
-    { .text = BattleFrontier_PokeNav_2A9FAB, .stringVarFuncIds = { 0, -1, -1 } },
-    { .text = BattleFrontier_PokeNav_2AA028, .stringVarFuncIds = { 0, -1, -1 } },
-    { .text = BattleFrontier_PokeNav_2AA099, .stringVarFuncIds = { 0, -1, -1 } },
-    { .text = BattleFrontier_PokeNav_2AA100, .stringVarFuncIds = { 0, -1, -1 } },
-    { .text = BattleFrontier_PokeNav_2AA188, .stringVarFuncIds = { 0, -1, -1 } },
-    { .text = BattleFrontier_PokeNav_2AA214, .stringVarFuncIds = { 0, -1, -1 } },
-    { .text = BattleFrontier_PokeNav_2AA2A1, .stringVarFuncIds = { 0, -1, -1 } },
-    { .text = BattleFrontier_PokeNav_2AA31B, .stringVarFuncIds = { 0, -1, -1 } },
-    { .text = BattleFrontier_PokeNav_2AA3A8, .stringVarFuncIds = { 0, -1, -1 } },
-    { .text = BattleFrontier_PokeNav_2AA442, .stringVarFuncIds = { 0, -1, -1 } },
-    { .text = BattleFrontier_PokeNav_2AA4C5, .stringVarFuncIds = { 0, -1, -1 } },
-    { .text = BattleFrontier_PokeNav_2AA520, .stringVarFuncIds = { 0, -1, -1 } },
-    { .text = BattleFrontier_PokeNav_2AA5AD, .stringVarFuncIds = { 0, -1, -1 } },
-    { .text = BattleFrontier_PokeNav_2AA64D, .stringVarFuncIds = { 0, -1, -1 } },
+    { .text = MatchCall_NegativeBattleText1,  .stringVarFuncIds = { 0, -1, -1 } },
+    { .text = MatchCall_NegativeBattleText2,  .stringVarFuncIds = { 0, -1, -1 } },
+    { .text = MatchCall_NegativeBattleText3,  .stringVarFuncIds = { 0, -1, -1 } },
+    { .text = MatchCall_NegativeBattleText4,  .stringVarFuncIds = { 0, -1, -1 } },
+    { .text = MatchCall_NegativeBattleText5,  .stringVarFuncIds = { 0, -1, -1 } },
+    { .text = MatchCall_NegativeBattleText6,  .stringVarFuncIds = { 0, -1, -1 } },
+    { .text = MatchCall_NegativeBattleText7,  .stringVarFuncIds = { 0, -1, -1 } },
+    { .text = MatchCall_NegativeBattleText8,  .stringVarFuncIds = { 0, -1, -1 } },
+    { .text = MatchCall_NegativeBattleText9,  .stringVarFuncIds = { 0, -1, -1 } },
+    { .text = MatchCall_NegativeBattleText10, .stringVarFuncIds = { 0, -1, -1 } },
+    { .text = MatchCall_NegativeBattleText11, .stringVarFuncIds = { 0, -1, -1 } },
+    { .text = MatchCall_NegativeBattleText12, .stringVarFuncIds = { 0, -1, -1 } },
+    { .text = MatchCall_NegativeBattleText13, .stringVarFuncIds = { 0, -1, -1 } },
+    { .text = MatchCall_NegativeBattleText14, .stringVarFuncIds = { 0, -1, -1 } },
 };
 
 static const struct MatchCallText sMatchCallPositiveBattleTexts[] =
 {
-    { .text = BattleFrontier_PokeNav_2AA6AF, .stringVarFuncIds = { 0, 3, -1 } },
-    { .text = BattleFrontier_PokeNav_2AA730, .stringVarFuncIds = { 0, 3, -1 } },
-    { .text = BattleFrontier_PokeNav_2AA77A, .stringVarFuncIds = { 0, 3, -1 } },
-    { .text = BattleFrontier_PokeNav_2AA81C, .stringVarFuncIds = { 0, 3, -1 } },
-    { .text = BattleFrontier_PokeNav_2AA88C, .stringVarFuncIds = { 0, 3, -1 } },
-    { .text = BattleFrontier_PokeNav_2AA934, .stringVarFuncIds = { 0, 3, -1 } },
-    { .text = BattleFrontier_PokeNav_2AA9D3, .stringVarFuncIds = { 0, 3, -1 } },
-    { .text = BattleFrontier_PokeNav_2AAA40, .stringVarFuncIds = { 0, 3, -1 } },
-    { .text = BattleFrontier_PokeNav_2AAAE4, .stringVarFuncIds = { 0, 3, -1 } },
-    { .text = BattleFrontier_PokeNav_2AAB8C, .stringVarFuncIds = { 0, 3, -1 } },
-    { .text = BattleFrontier_PokeNav_2AAC25, .stringVarFuncIds = { 0, 3, -1 } },
-    { .text = BattleFrontier_PokeNav_2AAC9D, .stringVarFuncIds = { 0, 3, -1 } },
-    { .text = BattleFrontier_PokeNav_2AAD41, .stringVarFuncIds = { 0, 3, -1 } },
-    { .text = BattleFrontier_PokeNav_2AAE00, .stringVarFuncIds = { 0, 3, -1 } },
+    { .text = MatchCall_PositiveBattleText1,  .stringVarFuncIds = { 0, 3, -1 } },
+    { .text = MatchCall_PositiveBattleText2,  .stringVarFuncIds = { 0, 3, -1 } },
+    { .text = MatchCall_PositiveBattleText3,  .stringVarFuncIds = { 0, 3, -1 } },
+    { .text = MatchCall_PositiveBattleText4,  .stringVarFuncIds = { 0, 3, -1 } },
+    { .text = MatchCall_PositiveBattleText5,  .stringVarFuncIds = { 0, 3, -1 } },
+    { .text = MatchCall_PositiveBattleText6,  .stringVarFuncIds = { 0, 3, -1 } },
+    { .text = MatchCall_PositiveBattleText7,  .stringVarFuncIds = { 0, 3, -1 } },
+    { .text = MatchCall_PositiveBattleText8,  .stringVarFuncIds = { 0, 3, -1 } },
+    { .text = MatchCall_PositiveBattleText9,  .stringVarFuncIds = { 0, 3, -1 } },
+    { .text = MatchCall_PositiveBattleText10, .stringVarFuncIds = { 0, 3, -1 } },
+    { .text = MatchCall_PositiveBattleText11, .stringVarFuncIds = { 0, 3, -1 } },
+    { .text = MatchCall_PositiveBattleText12, .stringVarFuncIds = { 0, 3, -1 } },
+    { .text = MatchCall_PositiveBattleText13, .stringVarFuncIds = { 0, 3, -1 } },
+    { .text = MatchCall_PositiveBattleText14, .stringVarFuncIds = { 0, 3, -1 } },
 };
 
 static const struct MatchCallText sMatchCallSameRouteBattleRequestTexts[] =
 {
-    { .text = BattleFrontier_PokeNav_2AAE7F, .stringVarFuncIds = { 0, 1, -1 } },
-    { .text = BattleFrontier_PokeNav_2AAEF1, .stringVarFuncIds = { 0, 1, -1 } },
-    { .text = BattleFrontier_PokeNav_2AAF69, .stringVarFuncIds = { 0, 1, -1 } },
-    { .text = BattleFrontier_PokeNav_2AB010, .stringVarFuncIds = { 0, 1, -1 } },
-    { .text = BattleFrontier_PokeNav_2AB076, .stringVarFuncIds = { 0, 1, -1 } },
-    { .text = BattleFrontier_PokeNav_2AB11A, .stringVarFuncIds = { 0, 1, -1 } },
-    { .text = BattleFrontier_PokeNav_2AB1B4, .stringVarFuncIds = { 0, 1, -1 } },
-    { .text = BattleFrontier_PokeNav_2AB23D, .stringVarFuncIds = { 0, 1, -1 } },
-    { .text = BattleFrontier_PokeNav_2AB2E9, .stringVarFuncIds = { 0, 1, -1 } },
-    { .text = BattleFrontier_PokeNav_2AB382, .stringVarFuncIds = { 0, 1, -1 } },
-    { .text = BattleFrontier_PokeNav_2AB410, .stringVarFuncIds = { 0, 1, -1 } },
-    { .text = BattleFrontier_PokeNav_2AB4B0, .stringVarFuncIds = { 0, 1, -1 } },
-    { .text = BattleFrontier_PokeNav_2AB538, .stringVarFuncIds = { 0, 1, -1 } },
-    { .text = BattleFrontier_PokeNav_2AB5E4, .stringVarFuncIds = { 0, 1, -1 } },
+    { .text = MatchCall_SameRouteBattleRequestText1,  .stringVarFuncIds = { 0, 1, -1 } },
+    { .text = MatchCall_SameRouteBattleRequestText2,  .stringVarFuncIds = { 0, 1, -1 } },
+    { .text = MatchCall_SameRouteBattleRequestText3,  .stringVarFuncIds = { 0, 1, -1 } },
+    { .text = MatchCall_SameRouteBattleRequestText4,  .stringVarFuncIds = { 0, 1, -1 } },
+    { .text = MatchCall_SameRouteBattleRequestText5,  .stringVarFuncIds = { 0, 1, -1 } },
+    { .text = MatchCall_SameRouteBattleRequestText6,  .stringVarFuncIds = { 0, 1, -1 } },
+    { .text = MatchCall_SameRouteBattleRequestText7,  .stringVarFuncIds = { 0, 1, -1 } },
+    { .text = MatchCall_SameRouteBattleRequestText8,  .stringVarFuncIds = { 0, 1, -1 } },
+    { .text = MatchCall_SameRouteBattleRequestText9,  .stringVarFuncIds = { 0, 1, -1 } },
+    { .text = MatchCall_SameRouteBattleRequestText10, .stringVarFuncIds = { 0, 1, -1 } },
+    { .text = MatchCall_SameRouteBattleRequestText11, .stringVarFuncIds = { 0, 1, -1 } },
+    { .text = MatchCall_SameRouteBattleRequestText12, .stringVarFuncIds = { 0, 1, -1 } },
+    { .text = MatchCall_SameRouteBattleRequestText13, .stringVarFuncIds = { 0, 1, -1 } },
+    { .text = MatchCall_SameRouteBattleRequestText14, .stringVarFuncIds = { 0, 1, -1 } },
 };
 
 static const struct MatchCallText sMatchCallDifferentRouteBattleRequestTexts[] =
 {
-    { .text = BattleFrontier_PokeNav_2AB670, .stringVarFuncIds = { 0, 1, -1 } },
-    { .text = BattleFrontier_PokeNav_2AB6CD, .stringVarFuncIds = { 0, 1, -1 } },
-    { .text = BattleFrontier_PokeNav_2AB73C, .stringVarFuncIds = { 0, 1, -1 } },
-    { .text = BattleFrontier_PokeNav_2AB808, .stringVarFuncIds = { 0, 1, -1 } },
-    { .text = BattleFrontier_PokeNav_2AB8B7, .stringVarFuncIds = { 0, 1, -1 } },
-    { .text = BattleFrontier_PokeNav_2AB95D, .stringVarFuncIds = { 0, 1, -1 } },
-    { .text = BattleFrontier_PokeNav_2ABA03, .stringVarFuncIds = { 0, 1, -1 } },
-    { .text = BattleFrontier_PokeNav_2ABA9F, .stringVarFuncIds = { 0, 1, -1 } },
-    { .text = BattleFrontier_PokeNav_2ABB62, .stringVarFuncIds = { 0, 1, -1 } },
-    { .text = BattleFrontier_PokeNav_2ABC26, .stringVarFuncIds = { 0, 1, -1 } },
-    { .text = BattleFrontier_PokeNav_2ABCE9, .stringVarFuncIds = { 0, 1, -1 } },
-    { .text = BattleFrontier_PokeNav_2ABDA2, .stringVarFuncIds = { 0, 1, -1 } },
-    { .text = BattleFrontier_PokeNav_2ABE5E, .stringVarFuncIds = { 0, 1, -1 } },
-    { .text = BattleFrontier_PokeNav_2ABF36, .stringVarFuncIds = { 0, 1, -1 } },
+    { .text = MatchCall_DifferentRouteBattleRequestText1,  .stringVarFuncIds = { 0, 1, -1 } },
+    { .text = MatchCall_DifferentRouteBattleRequestText2,  .stringVarFuncIds = { 0, 1, -1 } },
+    { .text = MatchCall_DifferentRouteBattleRequestText3,  .stringVarFuncIds = { 0, 1, -1 } },
+    { .text = MatchCall_DifferentRouteBattleRequestText4,  .stringVarFuncIds = { 0, 1, -1 } },
+    { .text = MatchCall_DifferentRouteBattleRequestText5,  .stringVarFuncIds = { 0, 1, -1 } },
+    { .text = MatchCall_DifferentRouteBattleRequestText6,  .stringVarFuncIds = { 0, 1, -1 } },
+    { .text = MatchCall_DifferentRouteBattleRequestText7,  .stringVarFuncIds = { 0, 1, -1 } },
+    { .text = MatchCall_DifferentRouteBattleRequestText8,  .stringVarFuncIds = { 0, 1, -1 } },
+    { .text = MatchCall_DifferentRouteBattleRequestText9,  .stringVarFuncIds = { 0, 1, -1 } },
+    { .text = MatchCall_DifferentRouteBattleRequestText10, .stringVarFuncIds = { 0, 1, -1 } },
+    { .text = MatchCall_DifferentRouteBattleRequestText11, .stringVarFuncIds = { 0, 1, -1 } },
+    { .text = MatchCall_DifferentRouteBattleRequestText12, .stringVarFuncIds = { 0, 1, -1 } },
+    { .text = MatchCall_DifferentRouteBattleRequestText13, .stringVarFuncIds = { 0, 1, -1 } },
+    { .text = MatchCall_DifferentRouteBattleRequestText14, .stringVarFuncIds = { 0, 1, -1 } },
 };
 
 static const struct MatchCallText sMatchCallPersonalizedTexts[] =
 {
-    { .text = BattleFrontier_PokeNav_2AC009, .stringVarFuncIds = { 0,  1, -1 } },
-    { .text = BattleFrontier_PokeNav_2AC0BD, .stringVarFuncIds = { 0, -1, -1 } },
-    { .text = BattleFrontier_PokeNav_2AC18C, .stringVarFuncIds = { 0, -1, -1 } },
-    { .text = BattleFrontier_PokeNav_2AC228, .stringVarFuncIds = { 0, -1, -1 } },
-    { .text = BattleFrontier_PokeNav_2AC30C, .stringVarFuncIds = { 0, -1, -1 } },
-    { .text = BattleFrontier_PokeNav_2AC3B6, .stringVarFuncIds = { 0, -1, -1 } },
-    { .text = BattleFrontier_PokeNav_2AC446, .stringVarFuncIds = { 0, -1, -1 } },
-    { .text = BattleFrontier_PokeNav_2AC5C7, .stringVarFuncIds = { 0, -1, -1 } },
-    { .text = BattleFrontier_PokeNav_2AC682, .stringVarFuncIds = { 0, -1, -1 } },
-    { .text = BattleFrontier_PokeNav_2AC755, .stringVarFuncIds = { 0, -1, -1 } },
-    { .text = BattleFrontier_PokeNav_2AC82C, .stringVarFuncIds = { 0, -1, -1 } },
-    { .text = BattleFrontier_PokeNav_2AC914, .stringVarFuncIds = { 0, -1, -1 } },
-    { .text = BattleFrontier_PokeNav_2ACA59, .stringVarFuncIds = { 0,  2, -1 } },
-    { .text = BattleFrontier_PokeNav_2ACB02, .stringVarFuncIds = { 0, -1, -1 } },
-    { .text = BattleFrontier_PokeNav_2ACC3F, .stringVarFuncIds = { 0, -1, -1 } },
-    { .text = BattleFrontier_PokeNav_2ACD2F, .stringVarFuncIds = { 0, -1, -1 } },
-    { .text = BattleFrontier_PokeNav_2ACE1E, .stringVarFuncIds = { 0, -1, -1 } },
-    { .text = BattleFrontier_PokeNav_2ACF32, .stringVarFuncIds = { 0,  3, -1 } },
-    { .text = BattleFrontier_PokeNav_2ACFBE, .stringVarFuncIds = { 0, -1, -1 } },
-    { .text = BattleFrontier_PokeNav_2AD0AC, .stringVarFuncIds = { 0, -1, -1 } },
-    { .text = BattleFrontier_PokeNav_2AD194, .stringVarFuncIds = { 0, -1, -1 } },
-    { .text = BattleFrontier_PokeNav_2AD1DF, .stringVarFuncIds = { 0, -1, -1 } },
-    { .text = BattleFrontier_PokeNav_2AD2A8, .stringVarFuncIds = { 0, -1, -1 } },
-    { .text = BattleFrontier_PokeNav_2AD34F, .stringVarFuncIds = { 0, -1, -1 } },
-    { .text = BattleFrontier_PokeNav_2AD44E, .stringVarFuncIds = { 0, -1, -1 } },
-    { .text = BattleFrontier_PokeNav_2AD53A, .stringVarFuncIds = { 0, -1, -1 } },
-    { .text = BattleFrontier_PokeNav_2AD642, .stringVarFuncIds = { 0, -1, -1 } },
-    { .text = BattleFrontier_PokeNav_2AD801, .stringVarFuncIds = { 0,  3, -1 } },
-    { .text = BattleFrontier_PokeNav_2AD92E, .stringVarFuncIds = { 0,  3, -1 } },
-    { .text = BattleFrontier_PokeNav_2ADA8F, .stringVarFuncIds = { 0, -1, -1 } },
-    { .text = BattleFrontier_PokeNav_2ADB9B, .stringVarFuncIds = { 0, -1, -1 } },
-    { .text = BattleFrontier_PokeNav_2ADC92, .stringVarFuncIds = { 0, -1, -1 } },
-    { .text = BattleFrontier_PokeNav_2ADE08, .stringVarFuncIds = { 0, -1, -1 } },
-    { .text = BattleFrontier_PokeNav_2ADF07, .stringVarFuncIds = { 0, -1, -1 } },
-    { .text = BattleFrontier_PokeNav_2AE0D9, .stringVarFuncIds = { 0, -1, -1 } },
-    { .text = BattleFrontier_PokeNav_2AE1FD, .stringVarFuncIds = { 0, -1, -1 } },
-    { .text = BattleFrontier_PokeNav_2AE327, .stringVarFuncIds = { 0, -1, -1 } },
-    { .text = BattleFrontier_PokeNav_2AE3DA, .stringVarFuncIds = { 0, -1, -1 } },
-    { .text = BattleFrontier_PokeNav_2AE489, .stringVarFuncIds = { 0, -1, -1 } },
-    { .text = BattleFrontier_PokeNav_2AE5CD, .stringVarFuncIds = { 0, -1, -1 } },
-    { .text = BattleFrontier_PokeNav_2AE698, .stringVarFuncIds = { 0, -1, -1 } },
-    { .text = BattleFrontier_PokeNav_2AE704, .stringVarFuncIds = { 0,  3, -1 } },
-    { .text = BattleFrontier_PokeNav_2AE78F, .stringVarFuncIds = { 0, -1, -1 } },
-    { .text = BattleFrontier_PokeNav_2AE859, .stringVarFuncIds = { 0,  3, -1 } },
-    { .text = BattleFrontier_PokeNav_2AE8E6, .stringVarFuncIds = { 0, -1, -1 } },
-    { .text = BattleFrontier_PokeNav_2AE998, .stringVarFuncIds = { 0, -1, -1 } },
-    { .text = BattleFrontier_PokeNav_2AEA8F, .stringVarFuncIds = { 0, -1, -1 } },
-    { .text = BattleFrontier_PokeNav_2AEB77, .stringVarFuncIds = { 0, -1, -1 } },
-    { .text = BattleFrontier_PokeNav_2AEBFA, .stringVarFuncIds = { 0, -1, -1 } },
-    { .text = BattleFrontier_PokeNav_2AECC1, .stringVarFuncIds = { 0, -1, -1 } },
-    { .text = BattleFrontier_PokeNav_2AED52, .stringVarFuncIds = { 0,  1, -1 } },
-    { .text = BattleFrontier_PokeNav_2AEE35, .stringVarFuncIds = { 0,  3, -1 } },
-    { .text = BattleFrontier_PokeNav_2AEEF4, .stringVarFuncIds = { 0, -1, -1 } },
-    { .text = BattleFrontier_PokeNav_2AEFDA, .stringVarFuncIds = { 0, -1, -1 } },
-    { .text = BattleFrontier_PokeNav_2AF0E7, .stringVarFuncIds = { 0,  1, -1 } },
-    { .text = BattleFrontier_PokeNav_2AF1B8, .stringVarFuncIds = { 0, -1, -1 } },
-    { .text = BattleFrontier_PokeNav_2AF2C4, .stringVarFuncIds = { 0, -1, -1 } },
-    { .text = BattleFrontier_PokeNav_2AF371, .stringVarFuncIds = { 0, -1, -1 } },
-    { .text = BattleFrontier_PokeNav_2AF480, .stringVarFuncIds = { 0, -1, -1 } },
-    { .text = BattleFrontier_PokeNav_2AF671, .stringVarFuncIds = { 0, -1, -1 } },
-    { .text = BattleFrontier_PokeNav_2AF7D8, .stringVarFuncIds = { 0, -1, -1 } },
-    { .text = BattleFrontier_PokeNav_2AF8F7, .stringVarFuncIds = { 0, -1, -1 } },
-    { .text = BattleFrontier_PokeNav_2AFA39, .stringVarFuncIds = { 0, -1, -1 } },
-    { .text = BattleFrontier_PokeNav_2AFB26, .stringVarFuncIds = { 0, -1, -1 } },
+    { .text = MatchCall_PersonalizedText1,  .stringVarFuncIds = { 0,  1, -1 } },
+    { .text = MatchCall_PersonalizedText2,  .stringVarFuncIds = { 0, -1, -1 } },
+    { .text = MatchCall_PersonalizedText3,  .stringVarFuncIds = { 0, -1, -1 } },
+    { .text = MatchCall_PersonalizedText4,  .stringVarFuncIds = { 0, -1, -1 } },
+    { .text = MatchCall_PersonalizedText5,  .stringVarFuncIds = { 0, -1, -1 } },
+    { .text = MatchCall_PersonalizedText6,  .stringVarFuncIds = { 0, -1, -1 } },
+    { .text = MatchCall_PersonalizedText7,  .stringVarFuncIds = { 0, -1, -1 } },
+    { .text = MatchCall_PersonalizedText8,  .stringVarFuncIds = { 0, -1, -1 } },
+    { .text = MatchCall_PersonalizedText9,  .stringVarFuncIds = { 0, -1, -1 } },
+    { .text = MatchCall_PersonalizedText10, .stringVarFuncIds = { 0, -1, -1 } },
+    { .text = MatchCall_PersonalizedText11, .stringVarFuncIds = { 0, -1, -1 } },
+    { .text = MatchCall_PersonalizedText12, .stringVarFuncIds = { 0, -1, -1 } },
+    { .text = MatchCall_PersonalizedText13, .stringVarFuncIds = { 0,  2, -1 } },
+    { .text = MatchCall_PersonalizedText14, .stringVarFuncIds = { 0, -1, -1 } },
+    { .text = MatchCall_PersonalizedText15, .stringVarFuncIds = { 0, -1, -1 } },
+    { .text = MatchCall_PersonalizedText16, .stringVarFuncIds = { 0, -1, -1 } },
+    { .text = MatchCall_PersonalizedText17, .stringVarFuncIds = { 0, -1, -1 } },
+    { .text = MatchCall_PersonalizedText18, .stringVarFuncIds = { 0,  3, -1 } },
+    { .text = MatchCall_PersonalizedText19, .stringVarFuncIds = { 0, -1, -1 } },
+    { .text = MatchCall_PersonalizedText20, .stringVarFuncIds = { 0, -1, -1 } },
+    { .text = MatchCall_PersonalizedText21, .stringVarFuncIds = { 0, -1, -1 } },
+    { .text = MatchCall_PersonalizedText22, .stringVarFuncIds = { 0, -1, -1 } },
+    { .text = MatchCall_PersonalizedText23, .stringVarFuncIds = { 0, -1, -1 } },
+    { .text = MatchCall_PersonalizedText24, .stringVarFuncIds = { 0, -1, -1 } },
+    { .text = MatchCall_PersonalizedText25, .stringVarFuncIds = { 0, -1, -1 } },
+    { .text = MatchCall_PersonalizedText26, .stringVarFuncIds = { 0, -1, -1 } },
+    { .text = MatchCall_PersonalizedText27, .stringVarFuncIds = { 0, -1, -1 } },
+    { .text = MatchCall_PersonalizedText28, .stringVarFuncIds = { 0,  3, -1 } },
+    { .text = MatchCall_PersonalizedText29, .stringVarFuncIds = { 0,  3, -1 } },
+    { .text = MatchCall_PersonalizedText30, .stringVarFuncIds = { 0, -1, -1 } },
+    { .text = MatchCall_PersonalizedText31, .stringVarFuncIds = { 0, -1, -1 } },
+    { .text = MatchCall_PersonalizedText32, .stringVarFuncIds = { 0, -1, -1 } },
+    { .text = MatchCall_PersonalizedText33, .stringVarFuncIds = { 0, -1, -1 } },
+    { .text = MatchCall_PersonalizedText34, .stringVarFuncIds = { 0, -1, -1 } },
+    { .text = MatchCall_PersonalizedText35, .stringVarFuncIds = { 0, -1, -1 } },
+    { .text = MatchCall_PersonalizedText36, .stringVarFuncIds = { 0, -1, -1 } },
+    { .text = MatchCall_PersonalizedText37, .stringVarFuncIds = { 0, -1, -1 } },
+    { .text = MatchCall_PersonalizedText38, .stringVarFuncIds = { 0, -1, -1 } },
+    { .text = MatchCall_PersonalizedText39, .stringVarFuncIds = { 0, -1, -1 } },
+    { .text = MatchCall_PersonalizedText40, .stringVarFuncIds = { 0, -1, -1 } },
+    { .text = MatchCall_PersonalizedText41, .stringVarFuncIds = { 0, -1, -1 } },
+    { .text = MatchCall_PersonalizedText42, .stringVarFuncIds = { 0,  3, -1 } },
+    { .text = MatchCall_PersonalizedText43, .stringVarFuncIds = { 0, -1, -1 } },
+    { .text = MatchCall_PersonalizedText44, .stringVarFuncIds = { 0,  3, -1 } },
+    { .text = MatchCall_PersonalizedText45, .stringVarFuncIds = { 0, -1, -1 } },
+    { .text = MatchCall_PersonalizedText46, .stringVarFuncIds = { 0, -1, -1 } },
+    { .text = MatchCall_PersonalizedText47, .stringVarFuncIds = { 0, -1, -1 } },
+    { .text = MatchCall_PersonalizedText48, .stringVarFuncIds = { 0, -1, -1 } },
+    { .text = MatchCall_PersonalizedText49, .stringVarFuncIds = { 0, -1, -1 } },
+    { .text = MatchCall_PersonalizedText50, .stringVarFuncIds = { 0, -1, -1 } },
+    { .text = MatchCall_PersonalizedText51, .stringVarFuncIds = { 0,  1, -1 } },
+    { .text = MatchCall_PersonalizedText52, .stringVarFuncIds = { 0,  3, -1 } },
+    { .text = MatchCall_PersonalizedText53, .stringVarFuncIds = { 0, -1, -1 } },
+    { .text = MatchCall_PersonalizedText54, .stringVarFuncIds = { 0, -1, -1 } },
+    { .text = MatchCall_PersonalizedText55, .stringVarFuncIds = { 0,  1, -1 } },
+    { .text = MatchCall_PersonalizedText56, .stringVarFuncIds = { 0, -1, -1 } },
+    { .text = MatchCall_PersonalizedText57, .stringVarFuncIds = { 0, -1, -1 } },
+    { .text = MatchCall_PersonalizedText58, .stringVarFuncIds = { 0, -1, -1 } },
+    { .text = MatchCall_PersonalizedText59, .stringVarFuncIds = { 0, -1, -1 } },
+    { .text = MatchCall_PersonalizedText60, .stringVarFuncIds = { 0, -1, -1 } },
+    { .text = MatchCall_PersonalizedText61, .stringVarFuncIds = { 0, -1, -1 } },
+    { .text = MatchCall_PersonalizedText62, .stringVarFuncIds = { 0, -1, -1 } },
+    { .text = MatchCall_PersonalizedText63, .stringVarFuncIds = { 0, -1, -1 } },
+    { .text = MatchCall_PersonalizedText64, .stringVarFuncIds = { 0, -1, -1 } },
 };
 
 static const struct MatchCallText sMatchCallBattleFrontierStreakTexts[] =
 {
-    { .text = BattleFrontier_PokeNav_2AFC07, .stringVarFuncIds = { 0, 4, 5 } },
-    { .text = BattleFrontier_PokeNav_2AFC78, .stringVarFuncIds = { 0, 4, 5 } },
-    { .text = BattleFrontier_PokeNav_2AFCFF, .stringVarFuncIds = { 0, 4, 5 } },
-    { .text = BattleFrontier_PokeNav_2AFDA7, .stringVarFuncIds = { 0, 4, 5 } },
-    { .text = BattleFrontier_PokeNav_2AFE3D, .stringVarFuncIds = { 0, 4, 5 } },
-    { .text = BattleFrontier_PokeNav_2AFECA, .stringVarFuncIds = { 0, 4, 5 } },
-    { .text = BattleFrontier_PokeNav_2AFF64, .stringVarFuncIds = { 0, 4, 5 } },
-    { .text = BattleFrontier_PokeNav_2AFFF0, .stringVarFuncIds = { 0, 4, 5 } },
-    { .text = BattleFrontier_PokeNav_2B00B5, .stringVarFuncIds = { 0, 4, 5 } },
-    { .text = BattleFrontier_PokeNav_2B0129, .stringVarFuncIds = { 0, 4, 5 } },
-    { .text = BattleFrontier_PokeNav_2B01A5, .stringVarFuncIds = { 0, 4, 5 } },
-    { .text = BattleFrontier_PokeNav_2B0232, .stringVarFuncIds = { 0, 4, 5 } },
-    { .text = BattleFrontier_PokeNav_2B02D9, .stringVarFuncIds = { 0, 4, 5 } },
-    { .text = BattleFrontier_PokeNav_2B0366, .stringVarFuncIds = { 0, 4, 5 } },
+    { .text = MatchCall_BattleFrontierStreakText1,  .stringVarFuncIds = { 0, 4, 5 } },
+    { .text = MatchCall_BattleFrontierStreakText2,  .stringVarFuncIds = { 0, 4, 5 } },
+    { .text = MatchCall_BattleFrontierStreakText3,  .stringVarFuncIds = { 0, 4, 5 } },
+    { .text = MatchCall_BattleFrontierStreakText4,  .stringVarFuncIds = { 0, 4, 5 } },
+    { .text = MatchCall_BattleFrontierStreakText5,  .stringVarFuncIds = { 0, 4, 5 } },
+    { .text = MatchCall_BattleFrontierStreakText6,  .stringVarFuncIds = { 0, 4, 5 } },
+    { .text = MatchCall_BattleFrontierStreakText7,  .stringVarFuncIds = { 0, 4, 5 } },
+    { .text = MatchCall_BattleFrontierStreakText8,  .stringVarFuncIds = { 0, 4, 5 } },
+    { .text = MatchCall_BattleFrontierStreakText9,  .stringVarFuncIds = { 0, 4, 5 } },
+    { .text = MatchCall_BattleFrontierStreakText10, .stringVarFuncIds = { 0, 4, 5 } },
+    { .text = MatchCall_BattleFrontierStreakText11, .stringVarFuncIds = { 0, 4, 5 } },
+    { .text = MatchCall_BattleFrontierStreakText12, .stringVarFuncIds = { 0, 4, 5 } },
+    { .text = MatchCall_BattleFrontierStreakText13, .stringVarFuncIds = { 0, 4, 5 } },
+    { .text = MatchCall_BattleFrontierStreakText14, .stringVarFuncIds = { 0, 4, 5 } },
 };
 
 static const struct MatchCallText sMatchCallBattleFrontierRecordStreakTexts[] =
 {
-    { .text = BattleFrontier_PokeNav_2B03E6, .stringVarFuncIds = { 0, 4, 5 } },
-    { .text = BattleFrontier_PokeNav_2B0457, .stringVarFuncIds = { 0, 4, 5 } },
-    { .text = BattleFrontier_PokeNav_2B04DE, .stringVarFuncIds = { 0, 4, 5 } },
-    { .text = BattleFrontier_PokeNav_2B0586, .stringVarFuncIds = { 0, 4, 5 } },
-    { .text = BattleFrontier_PokeNav_2B061C, .stringVarFuncIds = { 0, 4, 5 } },
-    { .text = BattleFrontier_PokeNav_2B06A3, .stringVarFuncIds = { 0, 4, 5 } },
-    { .text = BattleFrontier_PokeNav_2B073B, .stringVarFuncIds = { 0, 4, 5 } },
-    { .text = BattleFrontier_PokeNav_2B07C7, .stringVarFuncIds = { 0, 4, 5 } },
-    { .text = BattleFrontier_PokeNav_2B0894, .stringVarFuncIds = { 0, 4, 5 } },
-    { .text = BattleFrontier_PokeNav_2B0908, .stringVarFuncIds = { 0, 4, 5 } },
-    { .text = BattleFrontier_PokeNav_2B0984, .stringVarFuncIds = { 0, 4, 5 } },
-    { .text = BattleFrontier_PokeNav_2B0A11, .stringVarFuncIds = { 0, 4, 5 } },
-    { .text = BattleFrontier_PokeNav_2B0AB8, .stringVarFuncIds = { 0, 4, 5 } },
-    { .text = BattleFrontier_PokeNav_2B0B45, .stringVarFuncIds = { 0, 4, 5 } },
+    { .text = MatchCall_BattleFrontierRecordStreakText1,  .stringVarFuncIds = { 0, 4, 5 } },
+    { .text = MatchCall_BattleFrontierRecordStreakText2,  .stringVarFuncIds = { 0, 4, 5 } },
+    { .text = MatchCall_BattleFrontierRecordStreakText3,  .stringVarFuncIds = { 0, 4, 5 } },
+    { .text = MatchCall_BattleFrontierRecordStreakText4,  .stringVarFuncIds = { 0, 4, 5 } },
+    { .text = MatchCall_BattleFrontierRecordStreakText5,  .stringVarFuncIds = { 0, 4, 5 } },
+    { .text = MatchCall_BattleFrontierRecordStreakText6,  .stringVarFuncIds = { 0, 4, 5 } },
+    { .text = MatchCall_BattleFrontierRecordStreakText7,  .stringVarFuncIds = { 0, 4, 5 } },
+    { .text = MatchCall_BattleFrontierRecordStreakText8,  .stringVarFuncIds = { 0, 4, 5 } },
+    { .text = MatchCall_BattleFrontierRecordStreakText9,  .stringVarFuncIds = { 0, 4, 5 } },
+    { .text = MatchCall_BattleFrontierRecordStreakText10, .stringVarFuncIds = { 0, 4, 5 } },
+    { .text = MatchCall_BattleFrontierRecordStreakText11, .stringVarFuncIds = { 0, 4, 5 } },
+    { .text = MatchCall_BattleFrontierRecordStreakText12, .stringVarFuncIds = { 0, 4, 5 } },
+    { .text = MatchCall_BattleFrontierRecordStreakText13, .stringVarFuncIds = { 0, 4, 5 } },
+    { .text = MatchCall_BattleFrontierRecordStreakText14, .stringVarFuncIds = { 0, 4, 5 } },
 };
 
 static const struct MatchCallText sMatchCallBattleDomeTexts[] =
 {
-    { .text = BattleFrontier_PokeNav_2B0BC5, .stringVarFuncIds = { 0, 4, 5 } },
-    { .text = BattleFrontier_PokeNav_2B0C4A, .stringVarFuncIds = { 0, 4, 5 } },
-    { .text = BattleFrontier_PokeNav_2B0CC7, .stringVarFuncIds = { 0, 4, 5 } },
-    { .text = BattleFrontier_PokeNav_2B0D4A, .stringVarFuncIds = { 0, 4, 5 } },
-    { .text = BattleFrontier_PokeNav_2B0DC8, .stringVarFuncIds = { 0, 4, 5 } },
-    { .text = BattleFrontier_PokeNav_2B0E35, .stringVarFuncIds = { 0, 4, 5 } },
-    { .text = BattleFrontier_PokeNav_2B0ED1, .stringVarFuncIds = { 0, 4, 5 } },
-    { .text = BattleFrontier_PokeNav_2B0F72, .stringVarFuncIds = { 0, 4, 5 } },
-    { .text = BattleFrontier_PokeNav_2B102A, .stringVarFuncIds = { 0, 4, 5 } },
-    { .text = BattleFrontier_PokeNav_2B10A7, .stringVarFuncIds = { 0, 4, 5 } },
-    { .text = BattleFrontier_PokeNav_2B1121, .stringVarFuncIds = { 0, 4, 5 } },
-    { .text = BattleFrontier_PokeNav_2B11D3, .stringVarFuncIds = { 0, 4, 5 } },
-    { .text = BattleFrontier_PokeNav_2B124D, .stringVarFuncIds = { 0, 4, 5 } },
-    { .text = BattleFrontier_PokeNav_2B12D0, .stringVarFuncIds = { 0, 4, 5 } },
+    { .text = MatchCall_BattleDomeText1,  .stringVarFuncIds = { 0, 4, 5 } },
+    { .text = MatchCall_BattleDomeText2,  .stringVarFuncIds = { 0, 4, 5 } },
+    { .text = MatchCall_BattleDomeText3,  .stringVarFuncIds = { 0, 4, 5 } },
+    { .text = MatchCall_BattleDomeText4,  .stringVarFuncIds = { 0, 4, 5 } },
+    { .text = MatchCall_BattleDomeText5,  .stringVarFuncIds = { 0, 4, 5 } },
+    { .text = MatchCall_BattleDomeText6,  .stringVarFuncIds = { 0, 4, 5 } },
+    { .text = MatchCall_BattleDomeText7,  .stringVarFuncIds = { 0, 4, 5 } },
+    { .text = MatchCall_BattleDomeText8,  .stringVarFuncIds = { 0, 4, 5 } },
+    { .text = MatchCall_BattleDomeText9,  .stringVarFuncIds = { 0, 4, 5 } },
+    { .text = MatchCall_BattleDomeText10, .stringVarFuncIds = { 0, 4, 5 } },
+    { .text = MatchCall_BattleDomeText11, .stringVarFuncIds = { 0, 4, 5 } },
+    { .text = MatchCall_BattleDomeText12, .stringVarFuncIds = { 0, 4, 5 } },
+    { .text = MatchCall_BattleDomeText13, .stringVarFuncIds = { 0, 4, 5 } },
+    { .text = MatchCall_BattleDomeText14, .stringVarFuncIds = { 0, 4, 5 } },
 };
 
 static const struct MatchCallText sMatchCallBattlePikeTexts[] =
 {
-    { .text = BattleFrontier_PokeNav_2B1347, .stringVarFuncIds = { 0, 4, 5 } },
-    { .text = BattleFrontier_PokeNav_2B13B1, .stringVarFuncIds = { 0, 4, 5 } },
-    { .text = BattleFrontier_PokeNav_2B142B, .stringVarFuncIds = { 0, 4, 5 } },
-    { .text = BattleFrontier_PokeNav_2B14B4, .stringVarFuncIds = { 0, 4, 5 } },
-    { .text = BattleFrontier_PokeNav_2B1525, .stringVarFuncIds = { 0, 4, 5 } },
-    { .text = BattleFrontier_PokeNav_2B158E, .stringVarFuncIds = { 0, 4, 5 } },
-    { .text = BattleFrontier_PokeNav_2B1622, .stringVarFuncIds = { 0, 4, 5 } },
-    { .text = BattleFrontier_PokeNav_2B169D, .stringVarFuncIds = { 0, 4, 5 } },
-    { .text = BattleFrontier_PokeNav_2B1775, .stringVarFuncIds = { 0, 4, 5 } },
-    { .text = BattleFrontier_PokeNav_2B17F8, .stringVarFuncIds = { 0, 4, 5 } },
-    { .text = BattleFrontier_PokeNav_2B1877, .stringVarFuncIds = { 0, 4, 5 } },
-    { .text = BattleFrontier_PokeNav_2B1946, .stringVarFuncIds = { 0, 4, 5 } },
-    { .text = BattleFrontier_PokeNav_2B19C7, .stringVarFuncIds = { 0, 4, 5 } },
-    { .text = BattleFrontier_PokeNav_2B1A4C, .stringVarFuncIds = { 0, 4, 5 } },
+    { .text = MatchCall_BattlePikeText1,  .stringVarFuncIds = { 0, 4, 5 } },
+    { .text = MatchCall_BattlePikeText2,  .stringVarFuncIds = { 0, 4, 5 } },
+    { .text = MatchCall_BattlePikeText3,  .stringVarFuncIds = { 0, 4, 5 } },
+    { .text = MatchCall_BattlePikeText4,  .stringVarFuncIds = { 0, 4, 5 } },
+    { .text = MatchCall_BattlePikeText5,  .stringVarFuncIds = { 0, 4, 5 } },
+    { .text = MatchCall_BattlePikeText6,  .stringVarFuncIds = { 0, 4, 5 } },
+    { .text = MatchCall_BattlePikeText7,  .stringVarFuncIds = { 0, 4, 5 } },
+    { .text = MatchCall_BattlePikeText8,  .stringVarFuncIds = { 0, 4, 5 } },
+    { .text = MatchCall_BattlePikeText9,  .stringVarFuncIds = { 0, 4, 5 } },
+    { .text = MatchCall_BattlePikeText10, .stringVarFuncIds = { 0, 4, 5 } },
+    { .text = MatchCall_BattlePikeText11, .stringVarFuncIds = { 0, 4, 5 } },
+    { .text = MatchCall_BattlePikeText12, .stringVarFuncIds = { 0, 4, 5 } },
+    { .text = MatchCall_BattlePikeText13, .stringVarFuncIds = { 0, 4, 5 } },
+    { .text = MatchCall_BattlePikeText14, .stringVarFuncIds = { 0, 4, 5 } },
 };
 
 static const struct MatchCallText sMatchCallBattlePyramidTexts[] =
 {
-    { .text = BattleFrontier_PokeNav_2B1ACA, .stringVarFuncIds = { 0, 4, 5 } },
-    { .text = BattleFrontier_PokeNav_2B1B50, .stringVarFuncIds = { 0, 4, 5 } },
-    { .text = BattleFrontier_PokeNav_2B1BE4, .stringVarFuncIds = { 0, 4, 5 } },
-    { .text = BattleFrontier_PokeNav_2B1C6A, .stringVarFuncIds = { 0, 4, 5 } },
-    { .text = BattleFrontier_PokeNav_2B1CCF, .stringVarFuncIds = { 0, 4, 5 } },
-    { .text = BattleFrontier_PokeNav_2B1D38, .stringVarFuncIds = { 0, 4, 5 } },
-    { .text = BattleFrontier_PokeNav_2B1DCD, .stringVarFuncIds = { 0, 4, 5 } },
-    { .text = BattleFrontier_PokeNav_2B1E4B, .stringVarFuncIds = { 0, 4, 5 } },
-    { .text = BattleFrontier_PokeNav_2B1F24, .stringVarFuncIds = { 0, 4, 5 } },
-    { .text = BattleFrontier_PokeNav_2B1FA8, .stringVarFuncIds = { 0, 4, 5 } },
-    { .text = BattleFrontier_PokeNav_2B2022, .stringVarFuncIds = { 0, 4, 5 } },
-    { .text = BattleFrontier_PokeNav_2B20F3, .stringVarFuncIds = { 0, 4, 5 } },
-    { .text = BattleFrontier_PokeNav_2B2175, .stringVarFuncIds = { 0, 4, 5 } },
-    { .text = BattleFrontier_PokeNav_2B21FC, .stringVarFuncIds = { 0, 4, 5 } },
+    { .text = MatchCall_BattlePyramidText1,  .stringVarFuncIds = { 0, 4, 5 } },
+    { .text = MatchCall_BattlePyramidText2,  .stringVarFuncIds = { 0, 4, 5 } },
+    { .text = MatchCall_BattlePyramidText3,  .stringVarFuncIds = { 0, 4, 5 } },
+    { .text = MatchCall_BattlePyramidText4,  .stringVarFuncIds = { 0, 4, 5 } },
+    { .text = MatchCall_BattlePyramidText5,  .stringVarFuncIds = { 0, 4, 5 } },
+    { .text = MatchCall_BattlePyramidText6,  .stringVarFuncIds = { 0, 4, 5 } },
+    { .text = MatchCall_BattlePyramidText7,  .stringVarFuncIds = { 0, 4, 5 } },
+    { .text = MatchCall_BattlePyramidText8,  .stringVarFuncIds = { 0, 4, 5 } },
+    { .text = MatchCall_BattlePyramidText9,  .stringVarFuncIds = { 0, 4, 5 } },
+    { .text = MatchCall_BattlePyramidText10, .stringVarFuncIds = { 0, 4, 5 } },
+    { .text = MatchCall_BattlePyramidText11, .stringVarFuncIds = { 0, 4, 5 } },
+    { .text = MatchCall_BattlePyramidText12, .stringVarFuncIds = { 0, 4, 5 } },
+    { .text = MatchCall_BattlePyramidText13, .stringVarFuncIds = { 0, 4, 5 } },
+    { .text = MatchCall_BattlePyramidText14, .stringVarFuncIds = { 0, 4, 5 } },
 };
 
 static const struct MatchCallText *const sMatchCallBattleTopics[] =
@@ -1529,8 +1529,8 @@ static const struct MatchCallText *GetGeneralMatchCallText(int matchCallId, u8 *
         }
     }
 
-    topic = (sMatchCallTrainers[matchCallId].battleFrontierStreakTextId >> 8) - 1;
-    id = (sMatchCallTrainers[matchCallId].battleFrontierStreakTextId & 0xFF) - 1;
+    topic = (sMatchCallTrainers[matchCallId].generalTextId >> 8) - 1;
+    id = (sMatchCallTrainers[matchCallId].generalTextId & 0xFF) - 1;
     return &sMatchCallGeneralTopics[topic][id];
 }