From eac27c41ffbd5eab2c54c57e334dbb0bdf408ff7 Mon Sep 17 00:00:00 2001 From: AdAstra-LD Date: Mon, 22 Mar 2021 20:01:54 +0100 Subject: [PATCH] Fixed WildEditor showing success messages for every file upon repairing --- DS_Map/ROMFiles/EncounterFile.cs | 14 +++++++++++--- DS_Map/WildEditorDPPt.cs | 4 ++-- DS_Map/WildEditorHGSS.cs | 4 ++-- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/DS_Map/ROMFiles/EncounterFile.cs b/DS_Map/ROMFiles/EncounterFile.cs index 11652a6..ddbf619 100644 --- a/DS_Map/ROMFiles/EncounterFile.cs +++ b/DS_Map/ROMFiles/EncounterFile.cs @@ -104,7 +104,10 @@ namespace DSPRE.ROMFiles { #endregion #region Methods (1) - public void SaveToFileDefaultDir(int IDtoReplace) => SaveToFileDefaultDir(DirNames.encounters, IDtoReplace); + public void SaveToFileDefaultDir(int IDtoReplace, bool showSuccessMessage = true) { + SaveToFileDefaultDir(DirNames.encounters, IDtoReplace, showSuccessMessage); + } + public void ReportErrors(List errorList) { string fullError = "The following sections of this encounter file couldn't be read correctly: " + Environment.NewLine; @@ -411,7 +414,9 @@ namespace DSPRE.ROMFiles { } return newData.ToArray(); } - public void SaveToFileExplorePath(string suggestedFileName) => SaveToFileExplorePath("DPPt Encounter File", "enc", suggestedFileName); + public void SaveToFileExplorePath(string suggestedFileName, bool showSuccessMessage = true) { + SaveToFileExplorePath("DPPt Encounter File", "enc", suggestedFileName, showSuccessMessage); + } #endregion } @@ -679,7 +684,10 @@ namespace DSPRE.ROMFiles { } return newData.ToArray(); } - public void SaveToFileExplorePath(string suggestedFileName) => SaveToFileExplorePath("HGSS Encounter File", "enc", suggestedFileName); + + public void SaveToFileExplorePath(string suggestedFileName, bool showSuccessMessage = true) { + SaveToFileExplorePath("HGSS Encounter File", "enc", suggestedFileName, showSuccessMessage); + } #endregion } } \ No newline at end of file diff --git a/DS_Map/WildEditorDPPt.cs b/DS_Map/WildEditorDPPt.cs index 3c286fb..9a3d901 100644 --- a/DS_Map/WildEditorDPPt.cs +++ b/DS_Map/WildEditorDPPt.cs @@ -694,10 +694,10 @@ namespace DSPRE { if (d == DialogResult.Yes) { for (int i = 0; i < Directory.GetFiles(encounterFileFolder).Length; i++) { - currentFile.SaveToFileDefaultDir(i); + currentFile.SaveToFileDefaultDir(i, showSuccessMessage: false); } - MessageBox.Show("Operation completed", "Done", MessageBoxButtons.OK, MessageBoxIcon.Information); + MessageBox.Show("All repairable fields have been fixed.", "Operation completed", MessageBoxButtons.OK, MessageBoxIcon.Information); } } } diff --git a/DS_Map/WildEditorHGSS.cs b/DS_Map/WildEditorHGSS.cs index 60c7e6b..eea8d75 100644 --- a/DS_Map/WildEditorHGSS.cs +++ b/DS_Map/WildEditorHGSS.cs @@ -729,10 +729,10 @@ namespace DSPRE { if (d == DialogResult.Yes) { for (int i = 0; i < Directory.GetFiles(encounterFileFolder).Length; i++) { - currentFile.SaveToFileDefaultDir(i); + currentFile.SaveToFileDefaultDir(i, showSuccessMessage: false); } - MessageBox.Show("Operation completed", "Done", MessageBoxButtons.OK, MessageBoxIcon.Information); + MessageBox.Show("All repairable fields have been fixed.", "Operation completed", MessageBoxButtons.OK, MessageBoxIcon.Information); } } }