From db2d524603db4476f6289c89e4c11ff024eb0784 Mon Sep 17 00:00:00 2001
From: Eduardo Quezada <eduardo602002@gmail.com>
Date: Tue, 16 Aug 2022 17:22:39 -0400
Subject: [PATCH] Corrected CopyFrontierBrainTrainerName

---
 include/constants/global.h | 5 -----
 src/frontier_util.c        | 6 +++++-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/include/constants/global.h b/include/constants/global.h
index 5343928b15..2af5d59adc 100644
--- a/include/constants/global.h
+++ b/include/constants/global.h
@@ -111,11 +111,6 @@
 #define TYPE_NAME_LENGTH 6
 #define ABILITY_NAME_LENGTH 12
 #define TRAINER_NAME_LENGTH 10
-#if ENGLISH
-#define FRONTIER_BRAIN_NAME_LENGTH PLAYER_NAME_LENGTH
-#elif FRENCH || ITALIAN
-#define FRONTIER_BRAIN_NAME_LENGTH TRAINER_NAME_LENGTH
-#endif
 
 #define MAX_STAMP_CARD_STAMPS 7
 
diff --git a/src/frontier_util.c b/src/frontier_util.c
index 056235bce5..8e2dcad8ea 100644
--- a/src/frontier_util.c
+++ b/src/frontier_util.c
@@ -2509,7 +2509,11 @@ void CopyFrontierBrainTrainerName(u8 *dst)
     else
         facility = VarGet(VAR_FRONTIER_FACILITY);
 
-    for (i = 0; i < FRONTIER_BRAIN_NAME_LENGTH; i++)
+#if defined(BUGFIX) || FRENCH || ITALIAN
+    for (i = 0; i < TRAINER_NAME_LENGTH + 1; i++)
+#else
+    for (i = 0; i < PLAYER_NAME_LENGTH; i++)
+#endif
         dst[i] = gTrainers[sFrontierBrainTrainerIds[facility]].trainerName[i];
 
     dst[i] = EOS;