From 8ea75c0628eeb218c9090debb81f7645aab637fe Mon Sep 17 00:00:00 2001 From: AdAstra-LD Date: Tue, 2 Feb 2021 02:29:40 +0100 Subject: [PATCH] fixed overlay1 flag --- DS_Map/Main Window.cs | 2 +- DS_Map/ROMToolboxDialog.cs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/DS_Map/Main Window.cs b/DS_Map/Main Window.cs index d042192..e5004f4 100644 --- a/DS_Map/Main Window.cs +++ b/DS_Map/Main Window.cs @@ -873,7 +873,7 @@ namespace DSPRE { if (RomInfo.gameVersion == "HG" || RomInfo.gameVersion == "SS") { if (DSUtils.CheckOverlayHasCompressionFlag(1)) { - if (ROMToolboxDialog.overlayMustBeRestoredFromBackup) { + if (ROMToolboxDialog.overlay1MustBeRestoredFromBackup) { DSUtils.RestoreOverlayFromCompressedBackup(1, eventEditorIsReady); } else { DSUtils.CompressOverlay(1); diff --git a/DS_Map/ROMToolboxDialog.cs b/DS_Map/ROMToolboxDialog.cs index 2af586c..23f2d87 100644 --- a/DS_Map/ROMToolboxDialog.cs +++ b/DS_Map/ROMToolboxDialog.cs @@ -123,7 +123,7 @@ namespace DSPRE { public static bool flag_standardizedItems { get; private set; } = false; public static bool flag_arm9Expanded { get; private set; } = false; public static bool flag_BDHCAMpatchApplied { get; private set; } = false; - public static bool overlayMustBeRestoredFromBackup { get; private set; } = true; + public static bool overlay1MustBeRestoredFromBackup { get; private set; } = true; #region Constructor public ROMToolboxDialog(RomInfo romInfo) { @@ -235,7 +235,6 @@ namespace DSPRE { string overlayFilePath = romInfo.workDir + "overlay" + "\\" + "overlay_" + data.overlayNumber.ToString("D4") + ".bin"; DSUtils.DecompressOverlay(data.overlayNumber, true); - overlayMustBeRestoredFromBackup = false; byte[] overlayCode1 = HexStringtoByteArray(data.overlayString1); byte[] overlayCode1Read = DSUtils.ReadFromFile(overlayFilePath, data.overlayOffset1, overlayCode1.Length); @@ -350,7 +349,7 @@ namespace DSPRE { DSUtils.WriteToFile(overlayFilePath, data.overlayOffset1, HexStringtoByteArray(data.overlayString1)); //Write new overlayCode1 DSUtils.WriteToFile(overlayFilePath, data.overlayOffset2, HexStringtoByteArray(data.overlayString2)); //Write new overlayCode2 - overlayMustBeRestoredFromBackup = false; + overlay1MustBeRestoredFromBackup = false; String fullFilePath = romInfo.syntheticOverlayPath + '\\' + expandedARMfileID.ToString("D4"); @@ -368,6 +367,7 @@ namespace DSPRE { BDHCAMpatchLBL.Enabled = false; BDHCAMpatchTextLBL.Enabled = false; bdhcamCB.Visible = true; + overlay1MustBeRestoredFromBackup = false; BDHCAMpatchButton.Text = "Already applied"; MessageBox.Show("The BDHCAM patch has been applied.", "Operation successful.", MessageBoxButtons.OK, MessageBoxIcon.Information); } else {