From f5b47bcd52018267285556b62eaf33c5e64bb3c2 Mon Sep 17 00:00:00 2001
From: Matt Nadareski <mnadareski@outlook.com>
Date: Sun, 1 May 2016 10:07:35 -0700
Subject: [PATCH] Add PSID and SPC support

---
 SabreHelper/Enums.cs           |  2 ++
 SabreHelper/Remapping.cs       | 11 ++++++++++-
 SabreHelper/SabreHelper.csproj |  6 ++++++
 SabreHelper/Skippers/psid.xml  | 29 +++++++++++++++++++++++++++++
 SabreHelper/Skippers/spc.xml   | 13 +++++++++++++
 5 files changed, 60 insertions(+), 1 deletion(-)
 create mode 100644 SabreHelper/Skippers/psid.xml
 create mode 100644 SabreHelper/Skippers/spc.xml

diff --git a/SabreHelper/Enums.cs b/SabreHelper/Enums.cs
index 5588980d..6a38f530 100644
--- a/SabreHelper/Enums.cs
+++ b/SabreHelper/Enums.cs
@@ -35,7 +35,9 @@ namespace SabreTools.Helper
 		//N64,
 		NES,
 		PCE,
+		PSID,
 		SNES,
+		SPC,
 	}
 
 	/// <summary>
diff --git a/SabreHelper/Remapping.cs b/SabreHelper/Remapping.cs
index 3dd76811..d225b4e6 100644
--- a/SabreHelper/Remapping.cs
+++ b/SabreHelper/Remapping.cs
@@ -27,7 +27,10 @@ namespace SabreTools.Helper
 		//public static Dictionary<string, int> N64 = new Dictionary<string, int>();
 		public static Dictionary<string, int> NES = new Dictionary<string, int>();
 		public static Dictionary<string, int> PCE = new Dictionary<string, int>();
+		public static Dictionary<string, int> PSID = new Dictionary<string, int>();
 		public static Dictionary<string, int> SNES = new Dictionary<string, int>();
+		public static Dictionary<string, int> SPC = new Dictionary<string, int>();
+
 
 		/// <summary>
 		/// Create all remappings to be used by the program
@@ -139,7 +142,7 @@ namespace SabreTools.Helper
 			// Create array of dictionary names
 			string[] skippers =
 			{
-				"a7800", "fds", "lynx", /* "n64", */ "nes", "pce", "snes",
+				"a7800", "fds", "lynx", /* "n64", */ "nes", "pce", "psid", "snes", "spc",
 			};
 
 			// Loop through and add all remappings
@@ -215,9 +218,15 @@ namespace SabreTools.Helper
 							case "pce":
 								PCE.Add(header, size);
 								break;
+							case "psid":
+								PSID.Add(header, size);
+								break;
 							case "snes":
 								SNES.Add(header, size);
 								break;
+							case "spc":
+								SPC.Add(header, size);
+								break;
 						}
 					}
 				}
diff --git a/SabreHelper/SabreHelper.csproj b/SabreHelper/SabreHelper.csproj
index ca0fbd2c..32253277 100644
--- a/SabreHelper/SabreHelper.csproj
+++ b/SabreHelper/SabreHelper.csproj
@@ -158,9 +158,15 @@
     <Content Include="Skippers\pce.xml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <Content Include="Skippers\psid.xml">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
     <Content Include="Skippers\snes.xml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <Content Include="Skippers\spc.xml">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
     <Content Include="sqlite3-x64.dll">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
diff --git a/SabreHelper/Skippers/psid.xml b/SabreHelper/Skippers/psid.xml
new file mode 100644
index 00000000..2b0061b2
--- /dev/null
+++ b/SabreHelper/Skippers/psid.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+
+<detector>
+
+  <name>psid</name>
+  <author>Yori Yoshizuki</author>
+  <version>1.2</version>
+
+  <rule start_offset="76" end_offset="EOF" operation="none">
+    <data offset="0" value="5053494400010076" result="true"/>
+  </rule>
+
+  <rule start_offset="76" end_offset="EOF" operation="none">
+    <data offset="0" value="505349440003007c" result="true"/>
+  </rule>
+
+  <rule start_offset="7c" end_offset="EOF" operation="none">
+    <data offset="0" value="505349440002007c" result="true"/>
+  </rule>
+
+   <rule start_offset="7c" end_offset="EOF" operation="none">
+    <data offset="0" value="505349440001007c" result="true"/>
+  </rule>
+
+   <rule start_offset="7c" end_offset="EOF" operation="none">
+    <data offset="0" value="525349440002007c" result="true"/>
+  </rule>
+
+</detector>
diff --git a/SabreHelper/Skippers/spc.xml b/SabreHelper/Skippers/spc.xml
new file mode 100644
index 00000000..35145d2a
--- /dev/null
+++ b/SabreHelper/Skippers/spc.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+
+<detector>
+
+  <name>Nintendo Super Famicon SPC</name>
+  <author>Yori Yoshizuki</author>
+  <version>1.0</version>
+
+  <rule start_offset="00100" end_offset="EOF" operation="none">
+    <data offset="0" value="534E45532D535043" result="true"/>
+  </rule>
+
+</detector>