From 146fb95f3df3e83ae29b460213612bb416fef960 Mon Sep 17 00:00:00 2001 From: Mixone-FinallyHere Date: Mon, 29 Apr 2024 19:41:17 +0200 Subject: [PATCH] Some fixes --- DS_Map/Main Window.Designer.cs | 4 ++-- DS_Map/Main Window.cs | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/DS_Map/Main Window.Designer.cs b/DS_Map/Main Window.Designer.cs index 951cb44..b1ed7b0 100644 --- a/DS_Map/Main Window.Designer.cs +++ b/DS_Map/Main Window.Designer.cs @@ -728,7 +728,7 @@ this.label43 = new System.Windows.Forms.Label(); this.trainerClassListBox = new System.Windows.Forms.ListBox(); this.label42 = new System.Windows.Forms.Label(); - this.trainerComboBox = new System.Windows.Forms.ComboBox(); + this.trainerComboBox = new DSPRE.InputComboBox(); this.trainerSaveCurrentButton = new System.Windows.Forms.Button(); this.tableEditorTabPage = new System.Windows.Forms.TabPage(); this.label73 = new System.Windows.Forms.Label(); @@ -11823,7 +11823,7 @@ private System.Windows.Forms.Label label43; private System.Windows.Forms.ListBox trainerClassListBox; private System.Windows.Forms.Label label42; - private System.Windows.Forms.ComboBox trainerComboBox; + private DSPRE.InputComboBox trainerComboBox; private System.Windows.Forms.ComboBox followModeComboBox; private System.Windows.Forms.RadioButton johtoRadioButton; private System.Windows.Forms.RadioButton kantoRadioButton; diff --git a/DS_Map/Main Window.cs b/DS_Map/Main Window.cs index 1cfcaef..76638bc 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("[" + i.ToString("D2") + "] " + trainerClasses.messages[classMessageID] + " " + currentTrainerName); + trainerList.Add(currentTrainerName + " - " + trainerClasses.messages[classMessageID] + " [" + i.ToString("D2") + "] "); } return trainerList.ToArray(); @@ -692,6 +692,10 @@ namespace DSPRE { monEditorToolStripMenuItem.Enabled = true; scriptCommandsButton.Enabled = true; + if(RomInfo.gameFamily == RomInfo.GameFamilies.Plat || RomInfo.gameFamily == RomInfo.GameFamilies.DP) + { + EditorPanels.tabPageEncountersEditor.Hide(); + } Helpers.statusLabelMessage(); this.Text += " - " + RomInfo.fileName; }