From 2e46d13980d6bc00fe4a1d3cb3f4a0f97bcc7af6 Mon Sep 17 00:00:00 2001
From: YoshiRulz <OSSYoshiRulz@gmail.com>
Date: Wed, 15 Jun 2022 07:37:54 +1000
Subject: [PATCH] Add missing system display names, add MSX to rom file ext.
 filters

---
 src/BizHawk.Client.Common/RomLoader.cs     | 4 ++++
 src/BizHawk.Emulation.Common/Extensions.cs | 8 ++++++++
 2 files changed, 12 insertions(+)

diff --git a/src/BizHawk.Client.Common/RomLoader.cs b/src/BizHawk.Client.Common/RomLoader.cs
index 54ebf95d5f..ef281b9953 100644
--- a/src/BizHawk.Client.Common/RomLoader.cs
+++ b/src/BizHawk.Client.Common/RomLoader.cs
@@ -791,6 +791,8 @@ namespace BizHawk.Client.Common
 
 			public static readonly IReadOnlyCollection<string> Lynx = new[] { "lnx" };
 
+			public static readonly IReadOnlyCollection<string> MSX = new[] { "cas", "dsk", "mx1", "rom" };
+
 			public static readonly IReadOnlyCollection<string> N64 = new[] { "z64", "v64", "n64" };
 
 			public static readonly IReadOnlyCollection<string> NDS = new[] { "nds" };
@@ -830,6 +832,7 @@ namespace BizHawk.Client.Common
 				.Concat(GEN)
 				.Concat(INTV)
 				.Concat(Lynx)
+				.Concat(MSX)
 				.Concat(N64)
 				.Concat(NDS)
 				.Concat(NES)
@@ -882,6 +885,7 @@ namespace BizHawk.Client.Common
 			new FilesystemFilter("Odyssey 2", RomFileExtensions.O2),
 			new FilesystemFilter("Uzebox", RomFileExtensions.UZE),
 			new FilesystemFilter("Vectrex", RomFileExtensions.VEC),
+			new FilesystemFilter("MSX", RomFileExtensions.MSX),
 			FilesystemFilter.EmuHawkSaveStates
 		);
 
diff --git a/src/BizHawk.Emulation.Common/Extensions.cs b/src/BizHawk.Emulation.Common/Extensions.cs
index 9f08d05135..78ce54ab32 100644
--- a/src/BizHawk.Emulation.Common/Extensions.cs
+++ b/src/BizHawk.Emulation.Common/Extensions.cs
@@ -15,6 +15,7 @@ namespace BizHawk.Emulation.Common
 {
 	public static class EmulatorExtensions
 	{
+		/// <remarks>need to think about e.g. Genesis / Mega Drive using one sysID but having a different display name depending on the BIOS region --yoshi</remarks>
 		public static readonly IReadOnlyDictionary<string, string> SystemIDDisplayNames = new Dictionary<string, string>
 		{
 			[VSystemID.Raw.A26] = "Atari 2600",
@@ -24,6 +25,7 @@ namespace BizHawk.Emulation.Common
 			[VSystemID.Raw.C64] = "Commodore 64",
 			[VSystemID.Raw.ChannelF] = "Channel F",
 			[VSystemID.Raw.Coleco] = "ColecoVision",
+			// DEBUG
 			[VSystemID.Raw.GBL] = "Game Boy Link",
 			[VSystemID.Raw.GB] = "GB",
 			[VSystemID.Raw.SGB] = "SGB",
@@ -31,22 +33,28 @@ namespace BizHawk.Emulation.Common
 			[VSystemID.Raw.GBC] = "Gameboy Color",
 			[VSystemID.Raw.GEN] = "Genesis",
 			[VSystemID.Raw.GG] = "Game Gear",
+			[VSystemID.Raw.GGL] = "Game Gear Link",
 			[VSystemID.Raw.INTV] = "Intellivision",
 			[VSystemID.Raw.Libretro] = "Libretro",
 			[VSystemID.Raw.Lynx] = "Lynx",
 			[VSystemID.Raw.MAME] = "MAME",
+			[VSystemID.Raw.MSX] = "MSX",
 			[VSystemID.Raw.N64] = "Nintendo 64",
 			[VSystemID.Raw.NDS] = "NDS",
 			[VSystemID.Raw.NES] = "NES",
 			[VSystemID.Raw.NGP] = "Neo-Geo Pocket",
+			// NULL
 			[VSystemID.Raw.O2] = "Odyssey2",
 			[VSystemID.Raw.PCE] = "TurboGrafx-16",
 			[VSystemID.Raw.PCECD] = "TurboGrafx - 16(CD)",
 			[VSystemID.Raw.PCFX] = "PCFX",
+			[VSystemID.Raw.PS2] = "PlayStation 2",
 			[VSystemID.Raw.PSX] = "PlayStation",
 			[VSystemID.Raw.SAT] = "Saturn",
+			[VSystemID.Raw.Sega32X] = "Genesis 32X",
 			[VSystemID.Raw.SG] = "SG-1000",
 			[VSystemID.Raw.SGX] = "SuperGrafx",
+			[VSystemID.Raw.SGXCD] = "SuperGrafx CD-ROM²", // this was a TG-16 peripheral which the SuperGrafx kept compatibility with, though no games used it (w/ SGX) according to Wikipedia, so maybe this should say "TurboGrafx CD-ROM²"? --yoshi
 			[VSystemID.Raw.SMS] = "Sega Master System",
 			[VSystemID.Raw.SNES] = "SNES",
 			[VSystemID.Raw.TI83] = "TI - 83",