From cc85ff1d40bd5603e02a0363b1f11270f34603f8 Mon Sep 17 00:00:00 2001
From: Miguel Terol Espino <miguel.terol.93@gmail.com>
Date: Tue, 14 May 2024 13:08:40 +0200
Subject: [PATCH] Revert the trainer name search to avoid UI error

---
 DS_Map/Main Window.cs | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/DS_Map/Main Window.cs b/DS_Map/Main Window.cs
index 230034f..9f3aef8 100644
--- a/DS_Map/Main Window.cs	
+++ b/DS_Map/Main Window.cs	
@@ -105,7 +105,7 @@ namespace DSPRE {
                     currentTrainerName = TrainerFile.NAME_NOT_FOUND;
                 }
 
-                trainerList.Add(currentTrainerName + " - " + trainerClasses.messages[classMessageID] + " [" + i.ToString("D2") + "] ");
+                trainerList.Add("[" + i.ToString("D2") + "] " + trainerClasses.messages[classMessageID] + " " + currentTrainerName);
 
             }
             return trainerList.ToArray();
@@ -734,8 +734,6 @@ namespace DSPRE {
                 }
             }
 
-            ARM9.WriteBytes(new byte[4] { 0, 0, 0, 0 }, (uint)(RomInfo.gameFamily == GameFamilies.DP ? 0xB7C : 0xBB4));
-
             Helpers.statusLabelMessage("Repacking ROM...");
 
             if (OverlayUtils.OverlayTable.IsDefaultCompressed(1)) {
@@ -985,7 +983,7 @@ namespace DSPRE {
 
             /* Read Header internal names */
             try {
-                headerListBoxNames = Helpers.getHeaderListBoxNames();
+                headerListBoxNames  = Helpers.getHeaderListBoxNames();
                 internalNames = Helpers.getInternalNames();
 
                 headerListBox.Items.Clear();
@@ -1258,7 +1256,7 @@ namespace DSPRE {
             textFileUpDown.Value = currentHeader.textArchiveID;
             wildPokeUpDown.Value = currentHeader.wildPokemon;
             weatherUpDown.Value = currentHeader.weatherID;
-            cameraUpDown.Value = currentHeader.cameraAngleID;
+            cameraUpDown.Value = currentHeader.cameraAngleID;            
             battleBackgroundUpDown.Value = currentHeader.battleBackground;
 
             if (RomInfo.gameFamily == GameFamilies.HGSS) {