Leahnaya/DS-Pokemon-Rom-Editor
1
0
Fork 0
mirror of https://github.com/AdAstra-LD/DS-Pokemon-Rom-Editor.git synced 2026-10-01 22:38:13 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed overlay1 flag

Browse Source
This commit is contained in:
AdAstra-LD
2021-02-02 02:29:40 +01:00
parent 907d69fc03
commit 8ea75c0628
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DS_Map/Main Window.cs
View File

@@ -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);

6
DS_Map/ROMToolboxDialog.cs
View File

@@ -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 {