From d5fdbaf013ad27c21cdff4cb97cf8f7a6d70014f Mon Sep 17 00:00:00 2001
From: YoshiRulz <OSSYoshiRulz@gmail.com>
Date: Mon, 15 Nov 2021 20:03:26 +1000
Subject: [PATCH] Bring unreleased cores in PathConfig in line with core
 attributes

effectively:
- show 32X in all builds (was never shown)
- show GGL and PS2 in dev builds (was never shown)
- show GB4x and O2 in non-dev builds (was shown only in dev builds)
- hide MSX in non-dev builds (was always shown)
---
 .../config/PathEntryCollection.cs             | 24 +++++++++++++++++++
 .../config/PathConfig.cs                      |  2 +-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/src/BizHawk.Client.Common/config/PathEntryCollection.cs b/src/BizHawk.Client.Common/config/PathEntryCollection.cs
index f05df89021..48193b59aa 100644
--- a/src/BizHawk.Client.Common/config/PathEntryCollection.cs
+++ b/src/BizHawk.Client.Common/config/PathEntryCollection.cs
@@ -57,6 +57,9 @@ namespace BizHawk.Client.Common
 			[VSystemID.Raw.MSX] = "MSX",
 			[VSystemID.Raw.UZE] = "UZE",
 			[VSystemID.Raw.NDS] = "NDS",
+			[VSystemID.Raw.Sega32X] = "Sega 32X",
+			[VSystemID.Raw.GGL] = "Dual Game Gear",
+			[VSystemID.Raw.PS2] = "Playstation 2",
 		};
 
 		public static string GetDisplayNameFor(string sysID)
@@ -417,6 +420,27 @@ namespace BizHawk.Client.Common
 			new(VSystemID.Raw.NDS, 3, "Save RAM", Path.Combine(".", "SaveRAM")),
 			new(VSystemID.Raw.NDS, 4, "Screenshots", Path.Combine(".", "Screenshots")),
 			new(VSystemID.Raw.NDS, 5, "Cheats", Path.Combine(".", "Cheats")),
+
+			new(VSystemID.Raw.Sega32X, 0, "Base", Path.Combine(".", "32X")),
+			new(VSystemID.Raw.Sega32X, 1, "ROM", "."),
+			new(VSystemID.Raw.Sega32X, 2, "Savestates", Path.Combine(".", "State")),
+			new(VSystemID.Raw.Sega32X, 3, "Save RAM", Path.Combine(".", "SaveRAM")),
+			new(VSystemID.Raw.Sega32X, 4, "Screenshots", Path.Combine(".", "Screenshots")),
+			new(VSystemID.Raw.Sega32X, 5, "Cheats", Path.Combine(".", "Cheats")),
+
+			new(VSystemID.Raw.GGL, 0, "Base", Path.Combine(".", "Dual Game Gear")),
+			new(VSystemID.Raw.GGL, 1, "ROM", "."),
+			new(VSystemID.Raw.GGL, 2, "Savestates", Path.Combine(".", "State")),
+			new(VSystemID.Raw.GGL, 3, "Save RAM", Path.Combine(".", "SaveRAM")),
+			new(VSystemID.Raw.GGL, 4, "Screenshots", Path.Combine(".", "Screenshots")),
+			new(VSystemID.Raw.GGL, 5, "Cheats", Path.Combine(".", "Cheats")),
+
+			new(VSystemID.Raw.PS2, 0, "Base", Path.Combine(".", "PS2")),
+			new(VSystemID.Raw.PS2, 1, "ROM", "."),
+			new(VSystemID.Raw.PS2, 2, "Savestates", Path.Combine(".", "State")),
+			new(VSystemID.Raw.PS2, 3, "Save RAM", Path.Combine(".", "SaveRAM")),
+			new(VSystemID.Raw.PS2, 4, "Screenshots", Path.Combine(".", "Screenshots")),
+			new(VSystemID.Raw.PS2, 5, "Cheats", Path.Combine(".", "Cheats")),
 		};
 	}
 }
diff --git a/src/BizHawk.Client.EmuHawk/config/PathConfig.cs b/src/BizHawk.Client.EmuHawk/config/PathConfig.cs
index a87d209b26..c92187c881 100644
--- a/src/BizHawk.Client.EmuHawk/config/PathConfig.cs
+++ b/src/BizHawk.Client.EmuHawk/config/PathConfig.cs
@@ -27,7 +27,7 @@ namespace BizHawk.Client.EmuHawk
 				return;
 			}
 
-			string[] coresToHide = { VSystemID.Raw.GB4x, VSystemID.Raw.O2, VSystemID.Raw.ChannelF, VSystemID.Raw.AmstradCPC };
+			string[] coresToHide = { VSystemID.Raw.AmstradCPC, VSystemID.Raw.ChannelF, VSystemID.Raw.GGL, VSystemID.Raw.MSX, VSystemID.Raw.PS2 };
 
 			foreach (var core in coresToHide)
 			{