From 2d4920e8bbee91e320bba3a7ed7c46f603cbe009 Mon Sep 17 00:00:00 2001
From: Kurt <kaphotics@gmail.com>
Date: Wed, 23 Dec 2015 07:58:43 -0800
Subject: [PATCH] Fix FlagDiff

No longer supports 1MB decrypted saves (because honestly who does that)
---
 SAV/SAV_EventFlagsORAS.cs | 23 +++++++++--------------
 SAV/SAV_EventFlagsXY.cs   | 23 +++++++++--------------
 2 files changed, 18 insertions(+), 28 deletions(-)

diff --git a/SAV/SAV_EventFlagsORAS.cs b/SAV/SAV_EventFlagsORAS.cs
index aa364ff3f..48578e9d6 100644
--- a/SAV/SAV_EventFlagsORAS.cs
+++ b/SAV/SAV_EventFlagsORAS.cs
@@ -2,6 +2,7 @@
 using System.Collections;
 using System.Drawing;
 using System.IO;
+using System.Linq;
 using System.Windows.Forms;
 
 namespace PKHeX
@@ -203,21 +204,15 @@ private void openSAV(object sender, EventArgs e)
         private void loadSAV(object sender, string path)
         {
             FileInfo fi = new FileInfo(path);
-            byte[] eventflags = new byte[0x180];
-            switch (fi.Length)
+            byte[] eventflags;
+            if (fi.Length == SAV6.SIZE_ORAS)
+                eventflags = File.ReadAllBytes(path).Skip(Main.SAV.EventFlag).Take(0x180).ToArray();
+            else if (fi.Name.ToLower().Contains("ram") && fi.Length == 0x80000)
+                eventflags = ram2sav.getMAIN(File.ReadAllBytes(path)).Skip(Main.SAV.EventFlag).Take(0x180).ToArray();
+            else
             {
-                case 0x100000: // ramsav
-                    Array.Copy(File.ReadAllBytes(path), Main.SAV.EventFlag, eventflags, 0, 0x180);
-                    break;
-                case 0x76000: // oras main
-                    Array.Copy(File.ReadAllBytes(path), Main.SAV.EventFlag, eventflags, 0, 0x180);
-                    break;
-                default: // figure it out
-                    if (fi.Name.ToLower().Contains("ram") && fi.Length == 0x80000)
-                        Array.Copy(ram2sav.getMAIN(File.ReadAllBytes(path)), Main.SAV.EventFlag, eventflags, 0, 0x180);
-                    else
-                    { Util.Error("Invalid SAV Size", String.Format("File Size: 0x{1} ({0} bytes)", fi.Length, fi.Length.ToString("X5")), "File Loaded: " + path); return; }
-                    break;
+                Util.Error("Invalid SAV Size", String.Format("File Size: 0x{1} ({0} bytes)", fi.Length, fi.Length.ToString("X5")), "File Loaded: " + path);
+                return;
             }
 
             Button bs = (Button)sender;
diff --git a/SAV/SAV_EventFlagsXY.cs b/SAV/SAV_EventFlagsXY.cs
index b4c2c29e0..f272edf55 100644
--- a/SAV/SAV_EventFlagsXY.cs
+++ b/SAV/SAV_EventFlagsXY.cs
@@ -2,6 +2,7 @@
 using System.Collections;
 using System.Drawing;
 using System.IO;
+using System.Linq;
 using System.Windows.Forms;
 
 namespace PKHeX
@@ -171,21 +172,15 @@ private void openSAV(object sender, EventArgs e)
         private void loadSAV(object sender, string path)
         {
             FileInfo fi = new FileInfo(path);
-            byte[] eventflags = new byte[0x180];
-            switch (fi.Length)
+            byte[] eventflags;
+            if (fi.Length == SAV6.SIZE_XY)
+                eventflags = File.ReadAllBytes(path).Skip(Main.SAV.EventFlag).Take(0x180).ToArray();
+            else if (fi.Name.ToLower().Contains("ram") && fi.Length == 0x70000)
+                eventflags = ram2sav.getMAIN(File.ReadAllBytes(path)).Skip(Main.SAV.EventFlag).Take(0x180).ToArray();
+            else
             {
-                case 0x100000: // ramsav
-                    Array.Copy(File.ReadAllBytes(path), Main.SAV.EventFlag, eventflags, 0, 0x180);
-                    break;
-                case 0x76000: // oras main
-                    Array.Copy(File.ReadAllBytes(path), Main.SAV.EventFlag, eventflags, 0, 0x180);
-                    break;
-                default: // figure it out
-                    if (fi.Name.ToLower().Contains("ram") && fi.Length == 0x80000)
-                        Array.Copy(ram2sav.getMAIN(File.ReadAllBytes(path)), Main.SAV.EventFlag, eventflags, 0, 0x180);
-                    else
-                    { Util.Error("Invalid SAV Size", String.Format("File Size: 0x{1} ({0} bytes)", fi.Length, fi.Length.ToString("X5")), "File Loaded: " + path); return; }
-                    break;
+                Util.Error("Invalid SAV Size", String.Format("File Size: 0x{1} ({0} bytes)", fi.Length, fi.Length.ToString("X5")), "File Loaded: " + path);
+                return;
             }
 
             Button bs = (Button)sender;