From f8f93b9d7e87d39c5ffa1fa28e71e238145367c0 Mon Sep 17 00:00:00 2001
From: Matt Nadareski <mnadareski@outlook.com>
Date: Thu, 15 Feb 2018 18:47:11 -0800
Subject: [PATCH] [AttractMode, Rom] Handle "null" case

---
 SabreTools.Library/DatFiles/AttractMode.cs |  6 ------
 SabreTools.Library/DatItems/Rom.cs         | 12 ++++++------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/SabreTools.Library/DatFiles/AttractMode.cs b/SabreTools.Library/DatFiles/AttractMode.cs
index bdc6dfa2..5eaee600 100644
--- a/SabreTools.Library/DatFiles/AttractMode.cs
+++ b/SabreTools.Library/DatFiles/AttractMode.cs
@@ -173,12 +173,6 @@ namespace SabreTools.Library.DatFiles
 
 							item.Name = (item.Name == "null" ? "-" : item.Name);
 							((Rom)item).Size = Constants.SizeZero;
-							((Rom)item).CRC = ((Rom)item).CRC == "null" ? Constants.CRCZero : null;
-							((Rom)item).MD5 = ((Rom)item).MD5 == "null" ? Constants.MD5Zero : null;
-							((Rom)item).SHA1 = ((Rom)item).SHA1 == "null" ? Constants.SHA1Zero : null;
-							((Rom)item).SHA256 = ((Rom)item).SHA256 == "null" ? Constants.SHA256Zero : null;
-							((Rom)item).SHA384 = ((Rom)item).SHA384 == "null" ? Constants.SHA384Zero : null;
-							((Rom)item).SHA512 = ((Rom)item).SHA512 == "null" ? Constants.SHA512Zero : null;
 						}
 
 						// Set the new data to compare against
diff --git a/SabreTools.Library/DatItems/Rom.cs b/SabreTools.Library/DatItems/Rom.cs
index 5c7c8ebc..a6ddd4c5 100644
--- a/SabreTools.Library/DatItems/Rom.cs
+++ b/SabreTools.Library/DatItems/Rom.cs
@@ -46,32 +46,32 @@ namespace SabreTools.Library.DatItems
 		public string CRC
 		{
 			get { return _crc.IsNullOrWhiteSpace() ? null : Utilities.ByteArrayToString(_crc); }
-			set { _crc = Utilities.StringToByteArray(value); }
+			set { _crc = (value == "null" ? Constants.CRCZeroBytes : Utilities.StringToByteArray(value)); }
 		}
 		public string MD5
 		{
 			get { return _md5.IsNullOrWhiteSpace() ? null : Utilities.ByteArrayToString(_md5); }
-			set { _md5 = Utilities.StringToByteArray(value); }
+			set { _md5 = (value == "null" ? Constants.MD5ZeroBytes : Utilities.StringToByteArray(value)); }
 		}
 		public string SHA1
 		{
 			get { return _sha1.IsNullOrWhiteSpace() ? null : Utilities.ByteArrayToString(_sha1); }
-			set { _sha1 = Utilities.StringToByteArray(value); }
+			set { _sha1 = (value == "null" ? Constants.SHA1ZeroBytes : Utilities.StringToByteArray(value)); }
 		}
 		public string SHA256
 		{
 			get { return _sha256.IsNullOrWhiteSpace() ? null : Utilities.ByteArrayToString(_sha256); }
-			set { _sha256 = Utilities.StringToByteArray(value); }
+			set { _sha256 = (value == "null" ? Constants.SHA256ZeroBytes : Utilities.StringToByteArray(value)); }
 		}
 		public string SHA384
 		{
 			get { return _sha384.IsNullOrWhiteSpace() ? null : Utilities.ByteArrayToString(_sha384); }
-			set { _sha384 = Utilities.StringToByteArray(value); }
+			set { _sha384 = (value == "null" ? Constants.SHA384ZeroBytes : Utilities.StringToByteArray(value)); }
 		}
 		public string SHA512
 		{
 			get { return _sha512.IsNullOrWhiteSpace() ? null : Utilities.ByteArrayToString(_sha512); }
-			set { _sha512 = Utilities.StringToByteArray(value); }
+			set { _sha512 = (value == "null" ? Constants.SHA512ZeroBytes : Utilities.StringToByteArray(value)); }
 		}
 		public string MergeTag
 		{