From 97b766eadbcf20f2ec46cdc14f740275a6bac09e Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Tue, 9 Feb 2016 15:30:10 -0800 Subject: [PATCH] Add SAV6 ChecksumsValid property --- Misc/SAV6.cs | 2 ++ PKX/f1-Main.cs | 9 +++------ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Misc/SAV6.cs b/Misc/SAV6.cs index 9ea87a08c..4cb6576de 100644 --- a/Misc/SAV6.cs +++ b/Misc/SAV6.cs @@ -261,6 +261,8 @@ private void setChecksums() BitConverter.GetBytes(ccitt16(array)).CopyTo(Data, BlockInfoOffset + 6 + i * 8); } } + public bool ChecksumsValid => verifyG6SAV(Data); + public string ChecksumInfo => verifyG6CHK(Data); public byte[] Write() { setChecksums(); diff --git a/PKX/f1-Main.cs b/PKX/f1-Main.cs index 57ba04203..31d331a85 100644 --- a/PKX/f1-Main.cs +++ b/PKX/f1-Main.cs @@ -2431,12 +2431,9 @@ private void clickVerifyCHK(object sender, EventArgs e) { if (SAV.Edited) { Util.Alert("Save has been edited. Cannot integrity check."); return; } - if (PKX.verifyG6SAV(SAV.Data)) - { Util.Alert("Checksums are correct."); return; } - if (DialogResult.Yes != Util.Prompt(MessageBoxButtons.YesNoCancel, "Export Checksum Info to Clipboard?")) - return; - - Clipboard.SetText(PKX.verifyG6CHK(SAV.Data)); + if (SAV.ChecksumsValid) { Util.Alert("Checksums are valid."); return; } + if (DialogResult.Yes == Util.Prompt(MessageBoxButtons.YesNo, "Export Checksum Info to Clipboard?")) + Clipboard.SetText(SAV.ChecksumInfo); } private void clickExportSAVBAK(object sender, EventArgs e) {