Ensure there can be no edge cases involving SGXCD sysID

breaks config, in case you care about setting a custom save dir for PCE

Author: YoshiRulz

src/BizHawk.Client.Common/config/Config.cs

@@ -36,7 +36,7 @@ public class Config
 				new[] { CoreNames.Gambatte, CoreNames.Sameboy, CoreNames.GbHawk, CoreNames.SubGbHawk }),
 			(new[] { VSystemID.Raw.GBL },
 				new[] { CoreNames.GambatteLink, CoreNames.GBHawkLink, CoreNames.GBHawkLink3x, CoreNames.GBHawkLink4x }),
-			(new[] { VSystemID.Raw.PCE, VSystemID.Raw.PCECD, VSystemID.Raw.SGX },
+			(new[] { VSystemID.Raw.PCE, VSystemID.Raw.PCECD, VSystemID.Raw.SGX, VSystemID.Raw.SGXCD },
 				new[] { CoreNames.TurboNyma, CoreNames.HyperNyma, CoreNames.PceHawk }),
 			(new[] { VSystemID.Raw.PSX },
 				new[] { CoreNames.Octoshock, CoreNames.Nymashock }),
@@ -329,6 +329,7 @@ public void ResolveDefaults()
 			[VSystemID.Raw.PCE] = CoreNames.TurboNyma,
 			[VSystemID.Raw.PCECD] = CoreNames.TurboNyma,
 			[VSystemID.Raw.SGX] = CoreNames.TurboNyma,
+			[VSystemID.Raw.SGXCD] = CoreNames.TurboNyma,
 			[VSystemID.Raw.PSX] = CoreNames.Nymashock,
 			[VSystemID.Raw.TI83] = CoreNames.Emu83,
 		};

src/BizHawk.Client.Common/config/PathEntryCollection.cs

@@ -15,7 +15,7 @@ public class PathEntryCollection : IEnumerable<PathEntry>
 	{
 		private static readonly string COMBINED_SYSIDS_GB = string.Join("_", VSystemID.Raw.GB, VSystemID.Raw.GBC, VSystemID.Raw.SGB);
 
-		private static readonly string COMBINED_SYSIDS_PCE = string.Join("_", VSystemID.Raw.PCE, VSystemID.Raw.PCECD, VSystemID.Raw.SGX);
+		private static readonly string COMBINED_SYSIDS_PCE = string.Join("_", VSystemID.Raw.PCE, VSystemID.Raw.PCECD, VSystemID.Raw.SGX, VSystemID.Raw.SGXCD);
 
 		public static readonly string GLOBAL = string.Join("_", "Global", VSystemID.Raw.NULL);
 

src/BizHawk.Emulation.Cores/Consoles/NEC/PCE/HyperNyma.cs

@@ -38,6 +38,7 @@ public static NymaSettingsInfo CachedSettingsInfo(CoreComm comm)
 		[CoreConstructor(VSystemID.Raw.PCE, Priority = CorePriority.Low)]
 		[CoreConstructor(VSystemID.Raw.SGX, Priority = CorePriority.Low)]
 		[CoreConstructor(VSystemID.Raw.PCECD, Priority = CorePriority.Low)]
+		[CoreConstructor(VSystemID.Raw.SGXCD, Priority = CorePriority.Low)]
 		public HyperNyma(CoreLoadParameters<NymaSettings, NymaSyncSettings> lp)
 			: base(lp.Comm, VSystemID.Raw.PCE, "PC Engine Controller", lp.Settings, lp.SyncSettings)
 		{

src/BizHawk.Emulation.Cores/Consoles/NEC/PCE/TurboNyma.cs

@@ -40,6 +40,7 @@ public static NymaSettingsInfo CachedSettingsInfo(CoreComm comm)
 		[CoreConstructor(VSystemID.Raw.PCE)]
 		[CoreConstructor(VSystemID.Raw.SGX)]
 		[CoreConstructor(VSystemID.Raw.PCECD)]
+		[CoreConstructor(VSystemID.Raw.SGXCD)]
 		public TurboNyma(CoreLoadParameters<NymaSettings, NymaSyncSettings> lp)
 			: base(lp.Comm, VSystemID.Raw.PCE, "PC Engine Controller", lp.Settings, lp.SyncSettings)
 		{

src/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.cs

@@ -23,6 +23,7 @@ public sealed partial class PCEngine : IEmulator, ISaveRam, IInputPollable, IVid
 		[CoreConstructor(VSystemID.Raw.PCE, Priority = CorePriority.Low)]
 		[CoreConstructor(VSystemID.Raw.SGX, Priority = CorePriority.Low)]
 		[CoreConstructor(VSystemID.Raw.PCECD, Priority = CorePriority.Low)]
+		[CoreConstructor(VSystemID.Raw.SGXCD, Priority = CorePriority.Low)]
 		public PCEngine(CoreLoadParameters<PCESettings, PCESyncSettings> lp)
 		{
 			if (lp.Discs.Count == 1 && lp.Roms.Count == 0)

src/BizHawk.Emulation.Cores/vpads_schemata/PceSchema.cs

@@ -10,6 +10,10 @@
 
 namespace BizHawk.Emulation.Cores
 {
+	[Schema(VSystemID.Raw.SGXCD)]
+	// ReSharper disable once UnusedMember.Global
+	public class SgxCdSchema : PceSchema { }
+
 	[Schema(VSystemID.Raw.PCECD)]
 	// ReSharper disable once UnusedMember.Global
 	public class PceCdSchema : PceSchema { }