From 6f1f65aedb30fb32d46c4ec48e92f405cb3a8207 Mon Sep 17 00:00:00 2001
From: Matt Nadareski <mnadareski@outlook.com>
Date: Fri, 13 May 2016 16:17:03 -0700
Subject: [PATCH] Revert "Experimental flip of values"

This reverts commit 1b3cbf679694a864f08ad44a35dee8fb2bf2979a.
---
 SabreHelper/RomManipulation.cs | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/SabreHelper/RomManipulation.cs b/SabreHelper/RomManipulation.cs
index a3b300e0..0386c519 100644
--- a/SabreHelper/RomManipulation.cs
+++ b/SabreHelper/RomManipulation.cs
@@ -575,17 +575,17 @@ namespace SabreTools.Helper
 				{
 					if (x.Size == y.Size)
 					{
-						if (x.SHA1 == y.SHA1)
+						if (x.CRC == y.CRC)
 						{
-							// If the SHA1 is blank, use MD5 before SystemID
-							if (x.SHA1 == "")
+							// If the CRC is blank, use MD5 before SystemID
+							if (x.CRC == "")
 							{
 								if (x.MD5 == y.MD5)
 								{
-									// If the MD5 is blank, use CRC before SystemID
+									// If the MD5 is blank, use SHA1 before SystemID
 									if (x.MD5 == "")
 									{
-										if (x.CRC == y.CRC)
+										if (x.SHA1 == y.SHA1)
 										{
 											if (x.SystemID == y.SystemID)
 											{
@@ -593,7 +593,7 @@ namespace SabreTools.Helper
 											}
 											return x.SystemID - y.SystemID;
 										}
-										return String.Compare(x.CRC, y.CRC);
+										return String.Compare(x.SHA1, y.SHA1);
 									}
 									else
 									{
@@ -601,7 +601,7 @@ namespace SabreTools.Helper
 										{
 											if (x.SourceID == y.SourceID)
 											{
-												return String.Compare(x.CRC, y.CRC);
+												return String.Compare(x.SHA1, y.SHA1);
 											}
 											return x.SourceID - y.SourceID;
 										}
@@ -618,7 +618,7 @@ namespace SabreTools.Helper
 									{
 										if (x.MD5 == y.MD5)
 										{
-											return String.Compare(x.CRC, y.CRC);
+											return String.Compare(x.SHA1, y.SHA1);
 										}
 										return String.Compare(x.MD5, y.MD5);
 									}
@@ -626,8 +626,9 @@ namespace SabreTools.Helper
 								}
 								return x.SystemID - y.SystemID;
 							}
+
 						}
-						return String.Compare(x.SHA1, y.SHA1);
+						return String.Compare(x.CRC, y.CRC);
 					}
 					return (int)(x.Size - y.Size);
 				});