From 1d5a65e16c15e763cbcd91fd1a2e2002ac216325 Mon Sep 17 00:00:00 2001
From: cawtds <38510667+cawtds@users.noreply.github.com>
Date: Wed, 1 Apr 2026 00:05:27 +0200
Subject: [PATCH] fix frontier not getting cleared on new game

---
 src/new_game.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/new_game.c b/src/new_game.c
index abeb47e25..07322ecdd 100644
--- a/src/new_game.c
+++ b/src/new_game.c
@@ -85,9 +85,12 @@ static void ClearPokedexFlags(void)
     memset(&gSaveBlock1Ptr->dexSeen, 0, sizeof(gSaveBlock1Ptr->dexSeen));
 }
 
-static void ClearEReaderTrainer(void)
+static void ClearFrontierRecord(void)
 {
-    CpuFill32(0, &gSaveBlock2Ptr->frontier.ereaderTrainer, sizeof(gSaveBlock2Ptr->frontier.ereaderTrainer));
+    CpuFill32(0, &gSaveBlock2Ptr->frontier, sizeof(gSaveBlock2Ptr->frontier));
+
+    gSaveBlock2Ptr->frontier.opponentNames[0][0] = EOS;
+    gSaveBlock2Ptr->frontier.opponentNames[1][0] = EOS;
 }
 
 static void WarpToPlayersRoom(void)
@@ -126,7 +129,7 @@ void NewGameInitData(void)
     gDifferentSaveFile = TRUE;
     ZeroPlayerPartyMons();
     ZeroEnemyPartyMons();
-    ClearEReaderTrainer();
+    ClearFrontierRecord();
     ClearSav1();
     ClearSav3();
     ClearMailData();