From 71ecb09ffe8c5051d15b05207788ced8a9d5c0c3 Mon Sep 17 00:00:00 2001
From: Sour <mesenemu@gmail.com>
Date: Thu, 19 Dec 2024 18:45:53 +0900
Subject: [PATCH] UI: Added Firmwares tab in emulation settings to view/manage
 firmware files

---
 Core/Shared/Emulator.cpp             |   2 +
 Core/Shared/FirmwareHelper.h         |  94 +-------------------
 UI/Controls/FirmwareSelect.axaml     |  33 +++++++
 UI/Controls/FirmwareSelect.axaml.cs  | 123 ++++++++++++++++++++++++++
 UI/Controls/OptionSection.axaml      |  12 ++-
 UI/Controls/OptionSection.axaml.cs   |  24 ++++-
 UI/Interop/EmuApi.cs                 |  20 +----
 UI/Interop/FirmwareTypeExtensions.cs | 104 ++++++++++++++++++++++
 UI/Localization/resources.en.xml     |  25 +++++-
 UI/Styles/MesenStyles.Dark.xaml      |   3 +
 UI/Styles/MesenStyles.Light.xaml     |   5 ++
 UI/UI.csproj                         |   9 ++
 UI/Utilities/FileDialogHelper.cs     |   2 +-
 UI/Utilities/FirmwareHelper.cs       |  71 ++++++++++-----
 UI/Views/EmulationConfigView.axaml   | 127 ++++++++++++++++++++++++++-
 15 files changed, 516 insertions(+), 138 deletions(-)
 create mode 100644 UI/Controls/FirmwareSelect.axaml
 create mode 100644 UI/Controls/FirmwareSelect.axaml.cs
 create mode 100644 UI/Interop/FirmwareTypeExtensions.cs

diff --git a/Core/Shared/Emulator.cpp b/Core/Shared/Emulator.cpp
index c5cc55114..fc9826dfe 100644
--- a/Core/Shared/Emulator.cpp
+++ b/Core/Shared/Emulator.cpp
@@ -411,6 +411,8 @@ bool Emulator::InternalLoadRom(VirtualFile romFile, VirtualFile patchFile, bool
 		_console->SaveBattery();
 	}
 
+	_soundMixer->StopAudio();
+
 	if(!forPowerCycle) {
 		_movieManager->Stop();
 	}
diff --git a/Core/Shared/FirmwareHelper.h b/Core/Shared/FirmwareHelper.h
index bbac92672..00c543fa6 100644
--- a/Core/Shared/FirmwareHelper.h
+++ b/Core/Shared/FirmwareHelper.h
@@ -7,7 +7,6 @@
 
 enum class FirmwareType
 {
-	CX4,
 	DSP1,
 	DSP1B,
 	DSP2,
@@ -32,7 +31,9 @@ enum class FirmwareType
 	WonderSwan,
 	WonderSwanColor,
 	SwanCrystal,
-	Ymf288AdpcmRom
+	Ymf288AdpcmRom,
+	SmsBootRom,
+	GgBootRom
 };
 
 struct MissingFirmwareMessage
@@ -41,7 +42,6 @@ struct MissingFirmwareMessage
 	FirmwareType Firmware;
 	uint32_t Size = 0;
 	uint32_t AltSize = 0;
-	const char* FileHashes[5] = {};
 
 	MissingFirmwareMessage(const char* filename, FirmwareType type, uint32_t size, uint32_t altSize = 0)
 	{
@@ -49,94 +49,6 @@ struct MissingFirmwareMessage
 		Firmware = type;
 		Size = size;
 		AltSize = altSize;
-
-		switch(type) {
-			case FirmwareType::CX4: FileHashes[0] = "AE8D4D1961B93421FF00B3CAA1D0F0CE7783E749772A3369C36B3DBF0D37EF18"; break;
-			case FirmwareType::DSP1: FileHashes[0] = "91E87D11E1C30D172556BED2211CCE2EFA94BA595F58C5D264809EF4D363A97B"; break;
-			case FirmwareType::DSP1B: FileHashes[0] = "D789CB3C36B05C0B23B6C6F23BE7AA37C6E78B6EE9CEAC8D2D2AA9D8C4D35FA9"; break;
-			case FirmwareType::DSP2: FileHashes[0] = "03EF4EF26C9F701346708CB5D07847B5203CF1B0818BF2930ACD34510FFDD717"; break;
-			case FirmwareType::DSP3: FileHashes[0] = "0971B08F396C32E61989D1067DDDF8E4B14649D548B2188F7C541B03D7C69E4E"; break;
-			case FirmwareType::DSP4: FileHashes[0] = "752D03B2D74441E430B7F713001FA241F8BBCFC1A0D890ED4143F174DBE031DA"; break;
-			case FirmwareType::ST010: FileHashes[0] = "FA9BCED838FEDEA11C6F6ACE33D1878024BDD0D02CC9485899D0BDD4015EC24C"; break;
-			case FirmwareType::ST011: FileHashes[0] = "8B2B3F3F3E6E29F4D21D8BC736B400BC988B7D2214EBEE15643F01C1FEE2F364"; break;
-			case FirmwareType::ST018: FileHashes[0] = "6DF209AB5D2524D1839C038BE400AE5EB20DAFC14A3771A3239CD9E8ACD53806"; break;
-
-			case FirmwareType::Satellaview:
-				FileHashes[0] = "27CFDB99F7E4252BF3740D420147B63C4C88616883BC5E7FE43F2F30BF8C8CBB"; //Japan, no DRM
-				FileHashes[1] = "A49827B45FF9AC9CF5B4658190E1428E59251BC82D8A63D8E9E0F71E439F008F"; //English, no DRM
-				FileHashes[2] = "3CE321496EDC5D77038DE2034EB3FB354D7724AFD0BC7FD0319F3EB5D57B984D"; //Japan, original
-				FileHashes[3] = "77D94D64D745014BF8B51280A4204056CDEB9D41EA30EAE80DBC006675BEBEF8"; //English, DRM
-				break;
-
-			case FirmwareType::Gameboy:
-				FileHashes[0] = "CF053ECCB4CCAFFF9E67339D4E78E98DCE7D1ED59BE819D2A1BA2232C6FCE1C7";
-				FileHashes[1] = "26E71CF01E301E5DC40E987CD2ECBF6D0276245890AC829DB2A25323DA86818E";
-				break;
-
-			case FirmwareType::GameboyColor:
-				FileHashes[0] = "B4F2E416A35EEF52CBA161B159C7C8523A92594FACB924B3EDE0D722867C50C7";
-				FileHashes[1] = "3A307A41689BEE99A9A32EA021BF45136906C86B2E4F06C806738398E4F92E45";
-				break;
-
-			case FirmwareType::GameboyAdvance:
-				FileHashes[0] = "FD2547724B505F487E6DCB29EC2ECFF3AF35A841A77AB2E85FD87350ABD36570";
-				break;
-
-			case FirmwareType::Sgb1GameboyCpu: FileHashes[0] = "0E4DDFF32FC9D1EEAAE812A157DD246459B00C9E14F2F61751F661F32361E360"; break;
-			case FirmwareType::Sgb2GameboyCpu: FileHashes[0] = "FD243C4FB27008986316CE3DF29E9CFBCDC0CD52704970555A8BB76EDBEC3988"; break;
-
-			case FirmwareType::SGB1:
-				FileHashes[0] = "BBA9C269273BEDB9B38BD5EB23BFAA6E509B8DECC7CB80BB5513905AF04F4CEB"; //Rev 0 (Japan)
-				FileHashes[1] = "C6C4DAAB5C899B69900C460787DE6089EDABE94B760F96D9F583D30CC0A5BB30"; //Rev 1 (Japan+USA)
-				FileHashes[2] = "A75160F7B89B1F0E20FD2F6441BB86285C7378DB5035EF6885485EAFF6059376"; //Rev 2 (World)
-				break;
-
-			case FirmwareType::SGB2:
-				FileHashes[0] = "C172498A23D1176672931BAB33B629C7D28F914A43DCA9E540B8AF1B37CCF2C6"; //SGB2 (Japan)
-				break;
-
-			case FirmwareType::FDS:
-				FileHashes[0] = "99C18490ED9002D9C6D999B9D8D15BE5C051BDFA7CC7E73318053C9A994B0178";
-				FileHashes[1] = "A0A9D57CBACE21BF9C85C2B85E86656317F0768D7772ACC90C7411AB1DBFF2BF";
-				break;
-
-			case FirmwareType::StudyBox:
-				FileHashes[0] = "365F84C86F7F7C3AAA2042D78494D41448E998EC5A89AC1B5FECB452951D514C";
-				break;
-
-			case FirmwareType::PceSuperCd:
-				FileHashes[0] = "E11527B3B96CE112A037138988CA72FD117A6B0779C2480D9E03EAEBECE3D9CE";
-				break;
-
-			case FirmwareType::PceGamesExpress:
-				FileHashes[0] = "4B86BB96A48A4CA8375FC0109631D0B1D64F255A03B01DE70594D40788BA6C3D";
-				FileHashes[1] = "DA173B20694C2B52087B099B8C44E471D3EE08A666C90D4AFD997F8E1382ADD8";
-				break;
-
-			case FirmwareType::ColecoVision:
-				FileHashes[0] = "990BF1956F10207D8781B619EB74F89B00D921C8D45C95C334C16C8CCECA09AD";
-				FileHashes[1] = "FB4A898EB93B19B36773D87A6C70EB28F981B2686BEBDD2D431B05DCDF9CFFD4";
-				break;
-
-			case FirmwareType::WonderSwan:
-				FileHashes[0] = "BF4480DBEA1C47C8B54CE7BE9382BC1006148F431FBE4277E136351FA74F635E";
-				break;
-
-			case FirmwareType::WonderSwanColor:
-				FileHashes[0] = "F5A5C044D84CE1681F94E9EF74287CB989784497BE5BD5108DF17908DFA55DB2";
-				break;
-			
-			case FirmwareType::SwanCrystal:
-				FileHashes[0] = "82E96ADDF5AB1CE09A84B6EEDAA904E4CA432756851F7E0CC0649006C183834D";
-				break;
-
-			case FirmwareType::Ymf288AdpcmRom:
-				FileHashes[0] = "53AFD0FA9C62EDA3E2BE939E23F3ADF48A2AF8AD37BB1640261726C5D5ADEBA8";
-				break;
-
-			default:
-				throw std::runtime_error("Unexpected firmware type");
-		}
 	}
 };
 
diff --git a/UI/Controls/FirmwareSelect.axaml b/UI/Controls/FirmwareSelect.axaml
new file mode 100644
index 000000000..dd99f8b38
--- /dev/null
+++ b/UI/Controls/FirmwareSelect.axaml
@@ -0,0 +1,33 @@
+<UserControl 
+	xmlns="https://github.com/avaloniaui"
+	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+	xmlns:c="using:Mesen.Controls"
+	xmlns:l="using:Mesen.Localization"
+	mc:Ignorable="d" d:DesignWidth="100" d:DesignHeight="50"
+	x:Name="root"
+	x:Class="Mesen.Controls.FirmwareSelect"
+>
+	<Grid DataContext="{Binding ElementName=root}" ColumnDefinitions="*,Auto,Auto,Auto" RowDefinitions="Auto">
+		<TextBox Text="{Binding Filename}" Grid.Column="0" IsReadOnly="True" />
+		<Image
+			Grid.Column="1"
+			Stretch="None"
+			Source="/Assets/Warning.png"
+			ToolTip.Tip="{Binding WarningMessage}"
+			ToolTip.ShowDelay="0"
+			IsVisible="{Binding WarningMessage.Length}"
+			Margin="3 0"
+		/>
+		<Button Content="{l:Translate btnSelect}" Click="btnBrowse_OnClick" Grid.Column="2" />
+		<c:IconButton
+			Grid.Column="3"
+			ToolTip.Tip="{l:Translate btnDelete}"
+			Icon="Assets/Close.png"
+			Command="{Binding DeleteFirmware}"
+			Height="21"
+			Width="21"
+		/>
+	</Grid>
+</UserControl>
\ No newline at end of file
diff --git a/UI/Controls/FirmwareSelect.axaml.cs b/UI/Controls/FirmwareSelect.axaml.cs
new file mode 100644
index 000000000..11da8c3dc
--- /dev/null
+++ b/UI/Controls/FirmwareSelect.axaml.cs
@@ -0,0 +1,123 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+using Avalonia.Markup.Xaml;
+using Avalonia.Metadata;
+using Mesen.Config;
+using Mesen.Interop;
+using Mesen.Localization;
+using Mesen.Utilities;
+using Mesen.Windows;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+
+namespace Mesen.Controls;
+
+public class FirmwareSelect : UserControl
+{
+	public static readonly StyledProperty<FirmwareType> FirmwareTypeProperty = AvaloniaProperty.Register<FirmwareSelect, FirmwareType>(nameof(FirmwareType));
+	public static readonly StyledProperty<string> FilenameProperty = AvaloniaProperty.Register<FirmwareSelect, string>(nameof(Filename), "");
+	public static readonly StyledProperty<string> WarningMessageProperty = AvaloniaProperty.Register<FirmwareSelect, string>(nameof(WarningMessage), "");
+
+	public FirmwareType FirmwareType
+	{
+		get { return GetValue(FirmwareTypeProperty); }
+		set { SetValue(FirmwareTypeProperty, value); }
+	}
+
+	public string Filename
+	{
+		get { return GetValue(FilenameProperty); }
+		set { SetValue(FilenameProperty, value); }
+	}
+
+	public string WarningMessage
+	{
+		get { return GetValue(WarningMessageProperty); }
+		set { SetValue(WarningMessageProperty, value); }
+	}
+
+	public FirmwareSelect()
+	{
+		InitializeComponent();
+	}
+
+	private void InitializeComponent()
+	{
+		AvaloniaXamlLoader.Load(this);
+	}
+
+	protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
+	{
+		ValidateFirmware();
+		base.OnAttachedToVisualTree(e);
+	}
+
+	private void ValidateFirmware()
+	{
+		bool incorrectSize = false;
+		long fileSize = 0;
+
+		Filename = "";
+		WarningMessage = "";
+
+		FirmwareFiles firmwareFiles = FirmwareType.GetFirmwareInfo();
+		string? path = firmwareFiles.Names.Select(filename => Path.Combine(ConfigManager.FirmwareFolder, filename)).Where(File.Exists).FirstOrDefault();
+		if(path != null) {
+			fileSize = new FileInfo(path).Length;
+			Filename = Path.GetFileName(path);
+
+			foreach(FirmwareFileInfo firmwareInfo in firmwareFiles) {
+				if(fileSize == firmwareInfo.Size) {
+					string hash = FirmwareHelper.GetFileHash(path);
+					if(Array.IndexOf(firmwareInfo.Hashes, hash) < 0) {
+						WarningMessage = ResourceHelper.GetMessage("UnknownFirmwareHash", firmwareInfo.Hashes[0], hash);
+					}
+					incorrectSize = false;
+					break;
+				} else {
+					incorrectSize = true;
+				}
+			}
+		}
+
+		if(incorrectSize) {
+			WarningMessage = ResourceHelper.GetMessage("InvalidFirmwareSize", FirmwareType.GetFirmwareInfo()[0].Size, fileSize);
+		}
+	}
+
+	private async void btnBrowse_OnClick(object sender, RoutedEventArgs e)
+	{
+		while(true) {
+			string? selectedFile = await FileDialogHelper.OpenFile(null, VisualRoot, FileDialogHelper.FirmwareExt);
+			if(selectedFile?.Length > 0 && File.Exists(selectedFile)) {
+				if(await FirmwareHelper.SelectFirmwareFile(FirmwareType, selectedFile, VisualRoot)) {
+					break;
+				}
+			} else {
+				break;
+			}
+		}
+		ValidateFirmware();
+	}
+
+	public async void DeleteFirmware(object parameter)
+	{
+		string path = Path.Combine(ConfigManager.FirmwareFolder, Filename);
+		if(File.Exists(path)) {
+			DialogResult result = await MesenMsgBox.Show(VisualRoot, "PromptDeleteFirmware", MessageBoxButtons.OKCancel, MessageBoxIcon.Warning, path);
+			if(result == DialogResult.OK) {
+				File.Delete(path);
+			}
+		}
+		ValidateFirmware();
+	}
+
+	[DependsOn(nameof(Filename))]
+	public bool CanDeleteFirmware(object parameter)
+	{
+		return Filename != null && Filename.Length > 0 && File.Exists(Path.Combine(ConfigManager.FirmwareFolder, Filename));
+	}
+}
diff --git a/UI/Controls/OptionSection.axaml b/UI/Controls/OptionSection.axaml
index cce327eea..4c714c7d8 100644
--- a/UI/Controls/OptionSection.axaml
+++ b/UI/Controls/OptionSection.axaml
@@ -12,14 +12,20 @@
 	<ItemsControl.Template>
 		<ControlTemplate>
 			<StackPanel>
-				<StackPanel Orientation="Horizontal">
+				<StackPanel Orientation="Horizontal" Margin="0 0 0 5">
+					<Image 
+						Margin="2 0 5 0"
+						Stretch="None"
+						IsVisible="{Binding Icon.Length, ElementName=root}"
+						Source="{Binding IconSource, ElementName=root}"
+						VerticalAlignment="Center"
+					/>
 					<TextBlock
 						Text="{Binding Header, ElementName=root}"
 						Foreground="{DynamicResource ThemeControlHighlightLowBrush}"
 						FontSize="13"
-						Margin="0 0 0 5"
+						VerticalAlignment="Center"
 					/>
-					<ContentControl Content="{Binding Button, ElementName=root}" />
 				</StackPanel>
 				<StackPanel Margin="10 0 0 0">
 					<ItemsPresenter
diff --git a/UI/Controls/OptionSection.axaml.cs b/UI/Controls/OptionSection.axaml.cs
index acf7c232d..0f0619c08 100644
--- a/UI/Controls/OptionSection.axaml.cs
+++ b/UI/Controls/OptionSection.axaml.cs
@@ -1,13 +1,16 @@
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
+using Avalonia.Media.Imaging;
+using Mesen.Utilities;
 
 namespace Mesen.Controls
 {
 	public class OptionSection : ItemsControl
 	{
 		public static readonly StyledProperty<string> HeaderProperty = AvaloniaProperty.Register<OptionSection, string>(nameof(Header));
-		public static readonly StyledProperty<object> ButtonProperty = AvaloniaProperty.Register<OptionSection, object>(nameof(Button));
+		public static readonly StyledProperty<string> IconProperty = AvaloniaProperty.Register<OptionSection, string>(nameof(Icon), "");
+		public static readonly StyledProperty<Bitmap?> IconSourceProperty = AvaloniaProperty.Register<OptionSection, Bitmap?>(nameof(IconSource));
 
 		public string Header
 		{
@@ -15,10 +18,23 @@ public string Header
 			set { SetValue(HeaderProperty, value); }
 		}
 
-		public object Button
+		public string Icon
 		{
-			get { return GetValue(ButtonProperty); }
-			set { SetValue(ButtonProperty, value); }
+			get { return GetValue(IconProperty); }
+			set { SetValue(IconProperty, value); }
+		}
+
+		public Bitmap? IconSource
+		{
+			get { return GetValue(IconSourceProperty); }
+			set { SetValue(IconSourceProperty, value); }
+		}
+
+		static OptionSection()
+		{
+			IconProperty.Changed.AddClassHandler<OptionSection>((x, e) => {
+				x.IconSource = ImageUtilities.BitmapFromAsset(x.Icon);
+			});
 		}
 
 		public OptionSection()
diff --git a/UI/Interop/EmuApi.cs b/UI/Interop/EmuApi.cs
index 15d776b8d..3c3801779 100644
--- a/UI/Interop/EmuApi.cs
+++ b/UI/Interop/EmuApi.cs
@@ -248,7 +248,6 @@ public string GetRomName()
 
 	public enum FirmwareType
 	{
-		CX4,
 		DSP1,
 		DSP1B,
 		DSP2,
@@ -273,7 +272,9 @@ public enum FirmwareType
 		WonderSwan,
 		WonderSwanColor,
 		SwanCrystal,
-		Ymf288AdpcmRom
+		Ymf288AdpcmRom,
+		SmsBootRom,
+		GgBootRom
 	}
 
 	public struct MissingFirmwareMessage
@@ -282,21 +283,6 @@ public struct MissingFirmwareMessage
 		public FirmwareType Firmware;
 		public UInt32 Size;
 		public UInt32 AltSize;
-
-		[MarshalAs(UnmanagedType.ByValArray, SizeConst = 5)]
-		public IntPtr[] FileHashes;
-
-		public List<string> GetFileHashes()
-		{
-			List<string> hashes = new List<string>();
-			for(int i = 0; i < FileHashes.Length; i++) {
-				string hash = Marshal.PtrToStringUTF8(FileHashes[i]) ?? "";
-				if(hash.Length > 0) {
-					hashes.Add(hash);
-				}
-			}
-			return hashes;
-		}
 	}
 
 	public struct ExecuteShortcutParams
diff --git a/UI/Interop/FirmwareTypeExtensions.cs b/UI/Interop/FirmwareTypeExtensions.cs
new file mode 100644
index 000000000..3b95fa992
--- /dev/null
+++ b/UI/Interop/FirmwareTypeExtensions.cs
@@ -0,0 +1,104 @@
+using System;
+using System.Collections.Generic;
+
+namespace Mesen.Interop;
+
+public static class FirmwareTypeExtensions
+{
+	public static FirmwareFiles GetFirmwareInfo(this FirmwareType type)
+	{
+		switch(type) {
+			case FirmwareType.DSP1: return new("dsp1.rom") { new(0x2000, "91E87D11E1C30D172556BED2211CCE2EFA94BA595F58C5D264809EF4D363A97B") };
+			case FirmwareType.DSP1B: return new("dsp1b.rom") { new(0x2000, "D789CB3C36B05C0B23B6C6F23BE7AA37C6E78B6EE9CEAC8D2D2AA9D8C4D35FA9") };
+			case FirmwareType.DSP2: return new("dsp2.rom") { new(0x2000, "03EF4EF26C9F701346708CB5D07847B5203CF1B0818BF2930ACD34510FFDD717") };
+			case FirmwareType.DSP3: return new("dsp3.rom") { new(0x2000, "0971B08F396C32E61989D1067DDDF8E4B14649D548B2188F7C541B03D7C69E4E") };
+			case FirmwareType.DSP4: return new("dsp4.rom") { new(0x2000, "752D03B2D74441E430B7F713001FA241F8BBCFC1A0D890ED4143F174DBE031DA") };
+			
+			case FirmwareType.ST010: return new("st010.rom") { new(0xD000, "FA9BCED838FEDEA11C6F6ACE33D1878024BDD0D02CC9485899D0BDD4015EC24C") };
+			case FirmwareType.ST011: return new("st011.rom") { new(0xD000, "8B2B3F3F3E6E29F4D21D8BC736B400BC988B7D2214EBEE15643F01C1FEE2F364") };
+			case FirmwareType.ST018: return new("st018.rom") { new(0xD000, "6DF209AB5D2524D1839C038BE400AE5EB20DAFC14A3771A3239CD9E8ACD53806") };
+			
+			case FirmwareType.Satellaview: return new("BS-X.bin") {
+				new(1024 * 1024,
+					"27CFDB99F7E4252BF3740D420147B63C4C88616883BC5E7FE43F2F30BF8C8CBB", //Japan, no DRM
+					"A49827B45FF9AC9CF5B4658190E1428E59251BC82D8A63D8E9E0F71E439F008F", //English, no DRM
+					"3CE321496EDC5D77038DE2034EB3FB354D7724AFD0BC7FD0319F3EB5D57B984D", //Japan, original
+					"77D94D64D745014BF8B51280A4204056CDEB9D41EA30EAE80DBC006675BEBEF8" //English, DRM
+				)
+			};
+
+			case FirmwareType.Gameboy: return new("dmg_boot.bin", "gb_bios.bin") { new(256, "CF053ECCB4CCAFFF9E67339D4E78E98DCE7D1ED59BE819D2A1BA2232C6FCE1C7", "26E71CF01E301E5DC40E987CD2ECBF6D0276245890AC829DB2A25323DA86818E") };
+			case FirmwareType.GameboyColor: return new("cgb_boot.bin", "gbc_bios.bin") { new(2304, "B4F2E416A35EEF52CBA161B159C7C8523A92594FACB924B3EDE0D722867C50C7", "3A307A41689BEE99A9A32EA021BF45136906C86B2E4F06C806738398E4F92E45") };
+			case FirmwareType.GameboyAdvance: return new("gba_bios.bin") { new(0x4000, "FD2547724B505F487E6DCB29EC2ECFF3AF35A841A77AB2E85FD87350ABD36570") };
+			
+			case FirmwareType.Sgb1GameboyCpu: return new("sgb_boot.bin") { new(256, "0E4DDFF32FC9D1EEAAE812A157DD246459B00C9E14F2F61751F661F32361E360") };
+			case FirmwareType.Sgb2GameboyCpu: return new("sgb2_boot.bin") { new(256, "FD243C4FB27008986316CE3DF29E9CFBCDC0CD52704970555A8BB76EDBEC3988") };
+			
+			case FirmwareType.SGB1: return new("SGB1.sfc") { new(0x40000,
+				"BBA9C269273BEDB9B38BD5EB23BFAA6E509B8DECC7CB80BB5513905AF04F4CEB", //Rev 0 (Japan)
+				"C6C4DAAB5C899B69900C460787DE6089EDABE94B760F96D9F583D30CC0A5BB30", //Rev 1 (Japan+USA)
+				"A75160F7B89B1F0E20FD2F6441BB86285C7378DB5035EF6885485EAFF6059376" //Rev 2 (World)
+			) };
+
+			case FirmwareType.SGB2: return new("SGB2.sfc") { new(0x80000, "C172498A23D1176672931BAB33B629C7D28F914A43DCA9E540B8AF1B37CCF2C6") }; //SGB2 (Japan)
+			
+			case FirmwareType.FDS: return new("disksys.rom", "FdsBios.bin") { new(0x2000,
+				"99C18490ED9002D9C6D999B9D8D15BE5C051BDFA7CC7E73318053C9A994B0178",
+				"A0A9D57CBACE21BF9C85C2B85E86656317F0768D7772ACC90C7411AB1DBFF2BF"
+			) };
+
+			case FirmwareType.StudyBox: return new("StudyBox.bin") { new(0x40000, "365F84C86F7F7C3AAA2042D78494D41448E998EC5A89AC1B5FECB452951D514C") };
+
+			case FirmwareType.PceSuperCd: return new("[BIOS] Super CD-ROM System (Japan) (v3.0).pce", "syscard3.pce") { new(0x40000, "E11527B3B96CE112A037138988CA72FD117A6B0779C2480D9E03EAEBECE3D9CE")
+			};
+
+			case FirmwareType.PceGamesExpress: return new("[BIOS] Games Express CD Card (Japan).pce", "gecard.pce") {
+				new(0x8000, "4B86BB96A48A4CA8375FC0109631D0B1D64F255A03B01DE70594D40788BA6C3D"),
+				new(0x4000, "DA173B20694C2B52087B099B8C44E471D3EE08A666C90D4AFD997F8E1382ADD8")
+			};
+
+			case FirmwareType.ColecoVision: return new("bios.col") { new(0x2000, "990BF1956F10207D8781B619EB74F89B00D921C8D45C95C334C16C8CCECA09AD", "FB4A898EB93B19B36773D87A6C70EB28F981B2686BEBDD2D431B05DCDF9CFFD4") };
+			case FirmwareType.SmsBootRom:
+				return new("bios.sms") {
+					new(0x2000, "477617917A12A30F9F43844909DC2DE6E6A617430F5C9A36306C86414A670D50", "1EB16FC06CEAF05651D7CFD69D1713E6DDCCC4349A511F6FD17E037D71F9D85B", "67846E26764BD862F19179294347F7353A4166B62AC4198A5EC32933B7DA486E", "CB01DE3464797A77B52E82F5F9B05398540DF8C1151D31128D49584028589062"),
+					new(0x4000, "6F4E6DE10F1D07BDA695C629C67457BB0248EEB8FFA0C61A2742B8529274DE30"),
+					new(0x20000, "0C08E17B0ECC3967E1094F12841FDC97FDCBBF986E3BF9A06B35B69E7D95E4CD", "1A73BC6E1A9973B98432774A1480B3AC1259027A97590D5E67D52745159ABBBC", "E9EB04EC80DED8658F765C4ECA75CDBE23CBC7D8FED73F9C3DB7A868DBF649FF", "13C0639CC037167F53E6151DBDEA013758C3D09A76B064A894BF15C39C0A3897", "AAF39841BE10F9CD6908A95A7451C3A0C8AC77125EB412B7A41CAD260C888AB5", "57ABF3C00C82A8E042EBEB2BFE412ADAC9BA005E9009845236390DE3EE645248"),
+					new(0x40000, "C51EC80B7A609C5EE3D203CEEE2B602AE4DFB4479CAF15DC1D030C40C0364E93"),
+				};
+
+			case FirmwareType.GgBootRom: return new("bios.gg") { new(0x400, "8C8A21335038285CFA03DC076100C1F0BFADF3E4FF70796F11F3DFAAAB60EEE2") };
+			case FirmwareType.WonderSwan: return new("bootrom.ws") { new(0x1000, "BF4480DBEA1C47C8B54CE7BE9382BC1006148F431FBE4277E136351FA74F635E") };
+			case FirmwareType.WonderSwanColor: return new("bootrom.wsc") { new(0x2000, "F5A5C044D84CE1681F94E9EF74287CB989784497BE5BD5108DF17908DFA55DB2") };
+			case FirmwareType.SwanCrystal: return new("bootrom_sc.wsc") { new(0x2000, "82E96ADDF5AB1CE09A84B6EEDAA904E4CA432756851F7E0CC0649006C183834D") };
+			case FirmwareType.Ymf288AdpcmRom: return new("ymf288_adpcm_rom.bin") { new(0x2000, "53AFD0FA9C62EDA3E2BE939E23F3ADF48A2AF8AD37BB1640261726C5D5ADEBA8") };
+		}
+
+		throw new Exception("Unsupported firmware type");
+	}
+}
+
+public class FirmwareFiles : List<FirmwareFileInfo>
+{
+	public string[] Names;
+
+	public FirmwareFiles(string filename) : this(new string[] { filename })
+	{
+	}
+
+	public FirmwareFiles(params string[] filename)
+	{
+		Names = filename;
+	}
+}
+
+public record FirmwareFileInfo
+{
+	public int Size;
+	public string[] Hashes;
+
+	public FirmwareFileInfo(int size, params string[] hashes)
+	{
+		Size = size;
+		Hashes = hashes;
+	}
+}
diff --git a/UI/Localization/resources.en.xml b/UI/Localization/resources.en.xml
index 331c2e7d2..f2b4ed471 100644
--- a/UI/Localization/resources.en.xml
+++ b/UI/Localization/resources.en.xml
@@ -200,7 +200,18 @@
 			<Control ID="lblRunAhead">Run Ahead:</Control>
 			<Control ID="lblRunAheadFrames">frames (reduces input lag, increases CPU usage)</Control>
 
-			<Control ID="lblRegion">Region:</Control>
+			<Control ID="tpgFirmwares">Firmwares</Control>
+			<Control ID="lblNes">NES</Control>
+			<Control ID="lblSnes">SNES</Control>
+			<Control ID="lblGameboy">Game Boy</Control>
+			<Control ID="lblGba">Game Boy Advance</Control>
+			<Control ID="lblPce">PC Engine</Control>
+			<Control ID="lblSms">SMS / Game Gear</Control>
+			<Control ID="lblColecoVision">ColecoVision</Control>
+			<Control ID="lblWonderSwan">WonderSwan</Control>
+			<Control ID="lblOtherConsoles">Other systems</Control>
+			
+			<Control ID="lblWrongHash">File does not contain the expected data, and may not work correctly.</Control>
 		</Form>
 
 		<Form ID="VideoConfigOverrideView">
@@ -1681,6 +1692,11 @@
 			<Control ID="btnOK">OK</Control>
 			<Control ID="btnCancel">Cancel</Control>
 		</Form>
+
+		<Form ID="FirmwareSelect">
+			<Control ID="btnSelect">Select...</Control>
+			<Control ID="btnDelete">Delete file</Control>
+		</Form>
 	</Forms>
 	<Messages>
 		<Message ID="LastSession">Last Session</Message>
@@ -1699,6 +1715,11 @@
 		<Message ID="PromptSaveChanges">Save changes?</Message>
 		<Message ID="PromptKeepChanges">Keep changes?</Message>
 
+		<Message ID="UnknownFirmwareHash">This file does not match any of the known firmwares and may not work properly.&#xA;&#xA;Expected (SHA256): {0}&#xA;Current (SHA256): {1}</Message>
+		<Message ID="InvalidFirmwareSize">This file does not have the required size.&#xA;&#xA;Expected: {0} bytes&#xA;Current: {1} bytes</Message>
+		<Message ID="PromptDeleteFirmware">The following file will be deleted permanently. Are you sure?&#xA;&#xA;{0}</Message>
+		<Message ID="OverwriteFirmware">The following file already exists and will be overwritten. This cannot be undone. Are you sure?&#xA;&#xA;{0}</Message>
+
 		<Message ID="MovieSegment">Segment #{0}</Message>
 		<Message ID="MovieExportEntireSegment">Export entire segment</Message>
 		<Message ID="MovieExportSpecificRange">Export specific range...</Message>
@@ -2668,6 +2689,8 @@ E
 			<Value ID="WonderSwanColor">WonderSwan Color</Value>
 			<Value ID="SwanCrystal">SwanCrystal</Value>
 			<Value ID="Ymf288AdpcmRom">YFM288 ADPCM ROM (EPSM)</Value>
+			<Value ID="SmsBootRom">Master System - Boot ROM</Value>
+			<Value ID="GgBootRom">Game Gear - Boot ROM</Value>
 		</Enum>
 
 		<Enum ID="CpuType">
diff --git a/UI/Styles/MesenStyles.Dark.xaml b/UI/Styles/MesenStyles.Dark.xaml
index c5b480322..87fab2a74 100644
--- a/UI/Styles/MesenStyles.Dark.xaml
+++ b/UI/Styles/MesenStyles.Dark.xaml
@@ -64,6 +64,9 @@
 				<ResourceDictionary x:Key="Dark">
 					<Color x:Key="MesenBlackBorderColor">#FFFFFFFF</Color>
 
+					<Color x:Key="ButtonBackgroundDisabled">#333</Color>
+					<Color x:Key="RepeatButtonBackgroundDisabled">#333</Color>
+
 					<Color x:Key="MesenGridBackground">#00000000</Color>
 					<Color x:Key="MesenMenuBackground">#00000000</Color>
 					<Color x:Key="MesenMenuBackgroundHighlight">#40808080</Color>
diff --git a/UI/Styles/MesenStyles.Light.xaml b/UI/Styles/MesenStyles.Light.xaml
index 3c4a0206b..dc5a70f3c 100644
--- a/UI/Styles/MesenStyles.Light.xaml
+++ b/UI/Styles/MesenStyles.Light.xaml
@@ -41,6 +41,9 @@
 					<ComboBoxItem>0Test</ComboBoxItem>
 					<ComboBoxItem>0Test</ComboBoxItem>
 				</ComboBox>
+				<ComboBox SelectedIndex="0" IsEnabled="False">
+					<ComboBoxItem>0Test</ComboBoxItem>
+				</ComboBox>
 				<TextBox Text="00bc" />
 				<TextBox Text="test&#13;test&#13;test&#13;test&#13;test" AcceptsReturn="True" />
 				<Button Content="Testgpq" />
@@ -113,6 +116,8 @@
 					<Color x:Key="CheckBoxCheckGlyphForegroundUncheckedDisabled">#000</Color>
 
 					<Color x:Key="ButtonBackground">#E1E1E1</Color>
+					<Color x:Key="ButtonBackgroundDisabled">#BBB</Color>
+					<Color x:Key="RepeatButtonBackgroundDisabled">#BBB</Color>
 					<Color x:Key="ButtonBorderBrush">#ADADAD</Color>
 					<Color x:Key="ButtonBackgroundPointerOver">#E5F1FB</Color>
 					<Color x:Key="ButtonBorderBrushPointerOver">#0078D7</Color>
diff --git a/UI/UI.csproj b/UI/UI.csproj
index e7bc6553f..053d49510 100644
--- a/UI/UI.csproj
+++ b/UI/UI.csproj
@@ -128,6 +128,10 @@
     <Compile Update="Controls\ControllerButton.axaml.cs">
       <DependentUpon>ControllerButton.axaml</DependentUpon>
     </Compile>
+    <Compile Update="Controls\FirmwareSelect.axaml.cs">
+      <SubType>Code</SubType>
+      <DependentUpon>FirmwareSelect.axaml</DependentUpon>
+    </Compile>
     <Compile Update="Controls\SoftwareRendererView.axaml.cs">
       <DependentUpon>SoftwareRendererView.axaml</DependentUpon>
     </Compile>
@@ -634,6 +638,11 @@
     <EmbeddedResource Include="Localization\resources.en.xml" WithCulture="false" Type="Non-Resx" />
     <EmbeddedResource Include="Utilities\DipSwitchDefinitions.xml" />
   </ItemGroup>
+  <ItemGroup>
+    <AvaloniaXaml Update="Controls\FirmwareSelect.axaml">
+      <SubType>Designer</SubType>
+    </AvaloniaXaml>
+  </ItemGroup>
 
   <Target Name="PreBuildWindows" BeforeTargets="PreBuildEvent" Condition="'$(RuntimeIdentifier)'=='win-x64'">
     <Exec Command="cd $(OutDir)&#xD;&#xA;rd Dependencies /s /q&#xD;&#xA;md Dependencies&#xD;&#xA;xcopy /s $(ProjectDir)Dependencies\* Dependencies&#xD;&#xA;copy libHarfBuzzSharp.dll Dependencies&#xD;&#xA;copy libSkiaSharp.dll Dependencies&#xD;&#xA;copy MesenCore.dll Dependencies&#xD;&#xA;cd Dependencies&#xD;&#xA;del ..\Dependencies.zip&#xD;&#xA;powershell Compress-Archive -Path * -DestinationPath '..\Dependencies.zip' -Force&#xD;&#xA;copy ..\Dependencies.zip $(ProjectDir)" />
diff --git a/UI/Utilities/FileDialogHelper.cs b/UI/Utilities/FileDialogHelper.cs
index 31befa1bf..dc81362b2 100644
--- a/UI/Utilities/FileDialogHelper.cs
+++ b/UI/Utilities/FileDialogHelper.cs
@@ -70,7 +70,7 @@ public class FileDialogHelper
 						filter.Add(new FilePickerFileType("ColecoVision ROM files") { Patterns = new List<string>() { "*.col" } });
 						filter.Add(new FilePickerFileType("WonderSwan ROM files") { Patterns = new List<string>() { "*.ws", "*.wsc" } });
 					} else if(ext == FileDialogHelper.FirmwareExt) {
-						filter.Add(new FilePickerFileType("All firmware files") { Patterns = new List<string>() { "*.sfc", "*.pce", "*.nes", "*.bin", "*.rom", "*.col" } });
+						filter.Add(new FilePickerFileType("All firmware files") { Patterns = new List<string>() { "*.sfc", "*.pce", "*.nes", "*.bin", "*.rom", "*.col", "*.sms", "*.gba" } });
 					} else if(ext == FileDialogHelper.LabelFileExt) {
 						filter.Add(new FilePickerFileType("All label files") { Patterns = new List<string>() { "*.mlb", "*.sym", "*.dbg", "*.fns", "*.elf", "*.cdb" } });
 					} else {
diff --git a/UI/Utilities/FirmwareHelper.cs b/UI/Utilities/FirmwareHelper.cs
index d7683fc3b..c6c4890f4 100644
--- a/UI/Utilities/FirmwareHelper.cs
+++ b/UI/Utilities/FirmwareHelper.cs
@@ -1,4 +1,5 @@
 using Avalonia.Controls;
+using Avalonia.Rendering;
 using Mesen.Config;
 using Mesen.Interop;
 using Mesen.Localization;
@@ -15,7 +16,7 @@ namespace Mesen.Utilities
 {
 	public static class FirmwareHelper
 	{
-		private static string GetFileHash(string filename)
+		public static string GetFileHash(string filename)
 		{
 			using(SHA256 sha256Hash = SHA256.Create()) {
 				// ComputeHash - returns byte array  
@@ -44,34 +45,64 @@ public static async Task RequestFirmwareFile(MissingFirmwareMessage msg)
 					string? selectedFile = await FileDialogHelper.OpenFile(null, wnd, FileDialogHelper.FirmwareExt);
 					if(selectedFile != null) {
 						try {
-							List<string> expectedHashes = msg.GetFileHashes();
-							long fileSize = new FileInfo(selectedFile).Length;
-							if(fileSize != msg.Size && (msg.AltSize == 0 || fileSize != msg.AltSize)) {
-								await MesenMsgBox.Show(wnd, "FirmwareFileWrongSize", MessageBoxButtons.OK, MessageBoxIcon.Error, msg.Size.ToString());
-								continue;
-							}
-
-							string fileHash = GetFileHash(selectedFile);
-							if(!expectedHashes.Contains(fileHash)) {
-								if(await MesenMsgBox.Show(wnd, "FirmwareMismatch", MessageBoxButtons.OKCancel, MessageBoxIcon.Warning, ResourceHelper.GetEnumText(msg.Firmware), expectedHashes[0], fileHash) != DialogResult.OK) {
-									//Files don't match and user cancelled the action
-									return;
-								}
-							}
-
-							string destination = Path.Combine(ConfigManager.FirmwareFolder, filename);
-							if(selectedFile != destination) {
-								File.Copy(selectedFile, destination, true);
+							if(await SelectFirmwareFile(msg.Firmware, selectedFile, ApplicationHelper.GetMainWindow())) {
+								break;
 							}
 						} catch(Exception ex) {
 							await MesenMsgBox.ShowException(ex);
 						}
+					} else {
+						break;
 					}
+				}
+			}
+		}
+
+		public static async Task<bool> SelectFirmwareFile(FirmwareType type, string selectedFile, IRenderRoot? wnd)
+		{
+			FirmwareFiles knownFirmwares = type.GetFirmwareInfo();
+
+			long fileSize = new FileInfo(selectedFile).Length;
+
+			bool foundSizeMatch = false;
+			foreach(FirmwareFileInfo knownFirmware in knownFirmwares) {
+				if(knownFirmware.Size == fileSize) {
+					foundSizeMatch = true;
+				}
+			}
+
+			if(!foundSizeMatch) {
+				await MesenMsgBox.Show(wnd, "FirmwareFileWrongSize", MessageBoxButtons.OK, MessageBoxIcon.Error, knownFirmwares[0].Size.ToString());
+				return false;
+			}
 
-					//Only loop if user picks a file with the wrong size
+			string fileHash = GetFileHash(selectedFile);
+			bool hashMatches = false;
+			foreach(FirmwareFileInfo knownFirmware in knownFirmwares) {
+				if(Array.IndexOf(knownFirmware.Hashes, fileHash) >= 0) {
+					hashMatches = true;
 					break;
 				}
 			}
+
+			if(!hashMatches) {
+				if(await MesenMsgBox.Show(wnd, "FirmwareMismatch", MessageBoxButtons.OKCancel, MessageBoxIcon.Warning, ResourceHelper.GetEnumText(type), knownFirmwares[0].Hashes[0], fileHash) != DialogResult.OK) {
+					//Files don't match and user cancelled the action, retry
+					return false;
+				}
+			}
+
+			string destination = Path.Combine(ConfigManager.FirmwareFolder, knownFirmwares.Names[0]);
+			if(selectedFile != destination) {
+				if(File.Exists(destination)) {
+					if(await MesenMsgBox.Show(wnd, "OverwriteFirmware", MessageBoxButtons.OKCancel, MessageBoxIcon.Warning, destination) != DialogResult.OK) {
+						//Don't overwrite the existing file
+						return true;
+					}
+				}
+				File.Copy(selectedFile, destination, true);
+			}
+			return true;
 		}
 	}
 }
diff --git a/UI/Views/EmulationConfigView.axaml b/UI/Views/EmulationConfigView.axaml
index 704c13178..356e163ef 100644
--- a/UI/Views/EmulationConfigView.axaml
+++ b/UI/Views/EmulationConfigView.axaml
@@ -7,7 +7,7 @@
 	xmlns:c="using:Mesen.Controls"
 	xmlns:cfg="using:Mesen.Config"
 	xmlns:l="using:Mesen.Localization"
-	mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="450"
+	mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="950"
 	VerticalAlignment="Stretch"
 	HorizontalAlignment="Stretch"
 	x:DataType="vm:EmulationConfigViewModel"
@@ -45,5 +45,130 @@
 				</StackPanel>
 			</ScrollViewer>
 		</TabItem>
+
+		<TabItem Header="{l:Translate tpgFirmwares}">
+			<TabItem.Styles>
+				<Style Selector="Grid > TextBlock">
+					<Setter Property="MinWidth" Value="170" />
+				</Style>
+			</TabItem.Styles>
+			
+			<ScrollViewer AllowAutoHide="False" HorizontalScrollBarVisibility="Disabled" Padding="0 0 2 0">
+				<StackPanel>
+					<c:OptionSection Header="{l:Translate lblGameboy}" Icon="Assets/GameboyIcon.png" Margin="0">
+						<Grid ColumnDefinitions="Auto,*" RowDefinitions="Auto,Auto,Auto,Auto,*">
+							<TextBlock Text="Boot ROM (Monochrome)" />
+							<c:FirmwareSelect FirmwareType="Gameboy" Grid.Column="1" />
+
+							<TextBlock Text="Boot ROM (Color)" Grid.Row="1" />
+							<c:FirmwareSelect FirmwareType="GameboyColor" Grid.Column="1" Grid.Row="1" />
+
+							<TextBlock Text="Boot ROM (SGB1)" Grid.Row="2" />
+							<c:FirmwareSelect FirmwareType="Sgb1GameboyCpu" Grid.Column="1" Grid.Row="2" />
+
+							<TextBlock Text="Boot ROM (SGB2)" Grid.Row="3" />
+							<c:FirmwareSelect FirmwareType="Sgb2GameboyCpu" Grid.Column="1" Grid.Row="3" />
+						</Grid>
+					</c:OptionSection>
+
+					<c:OptionSection Header="{l:Translate lblGba}" Icon="Assets/GbaIcon.png" >
+						<Grid ColumnDefinitions="Auto,*" RowDefinitions="Auto,Auto,*">
+							<TextBlock Text="Boot ROM" />
+							<c:FirmwareSelect FirmwareType="GameboyAdvance" Grid.Column="1" />
+						</Grid>
+					</c:OptionSection>
+
+					<c:OptionSection Header="{l:Translate lblNes}" Icon="Assets/NesIcon.png" >
+						<Grid ColumnDefinitions="Auto,*" RowDefinitions="Auto,Auto,Auto,*">
+							<TextBlock Text="FDS" />
+							<c:FirmwareSelect FirmwareType="FDS" Grid.Column="1" />
+
+							<TextBlock Text="StudyBox" Grid.Row="1" />
+							<c:FirmwareSelect FirmwareType="StudyBox" Grid.Column="1" Grid.Row="1" />
+
+							<TextBlock Text="YMF288 ADPCM ROM (EPSM)" Grid.Row="2" />
+							<c:FirmwareSelect FirmwareType="Ymf288AdpcmRom" Grid.Column="1" Grid.Row="2" />
+						</Grid>
+					</c:OptionSection>
+
+					<c:OptionSection Header="{l:Translate lblSnes}" Icon="Assets/SnesIcon.png" >
+						<Grid ColumnDefinitions="Auto,*" RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,*">
+							<TextBlock Text="DSP-1" Grid.Row="1" />
+							<c:FirmwareSelect FirmwareType="DSP1" Grid.Column="1" Grid.Row="1" />
+
+							<TextBlock Text="DSP-1B" Grid.Row="2" />
+							<c:FirmwareSelect FirmwareType="DSP1B" Grid.Column="1" Grid.Row="2" />
+
+							<TextBlock Text="DSP-2" Grid.Row="3" />
+							<c:FirmwareSelect FirmwareType="DSP2" Grid.Column="1" Grid.Row="3" />
+
+							<TextBlock Text="DSP-3" Grid.Row="4" />
+							<c:FirmwareSelect FirmwareType="DSP3" Grid.Column="1" Grid.Row="4" />
+
+							<TextBlock Text="DSP-4" Grid.Row="5" />
+							<c:FirmwareSelect FirmwareType="DSP4" Grid.Column="1" Grid.Row="5" />
+
+							<TextBlock Text="Satellaview / BS-X" Grid.Row="6" />
+							<c:FirmwareSelect FirmwareType="Satellaview" Grid.Column="1" Grid.Row="6" />
+
+							<TextBlock Text="Super Game Boy (v1)" Grid.Row="7" />
+							<c:FirmwareSelect FirmwareType="SGB1" Grid.Column="1" Grid.Row="7" />
+
+							<TextBlock Text="Super Game Boy (v2)" Grid.Row="8" />
+							<c:FirmwareSelect FirmwareType="SGB2" Grid.Column="1" Grid.Row="8" />
+
+							<TextBlock Text="ST010" Grid.Row="9" />
+							<c:FirmwareSelect FirmwareType="ST010" Grid.Column="1" Grid.Row="9" />
+
+							<TextBlock Text="ST011" Grid.Row="10" />
+							<c:FirmwareSelect FirmwareType="ST011" Grid.Column="1" Grid.Row="10" />
+
+							<TextBlock Text="ST018" Grid.Row="11" IsVisible="False" />
+							<c:FirmwareSelect FirmwareType="ST018" Grid.Column="1" Grid.Row="11" IsVisible="False" />
+						</Grid>
+					</c:OptionSection>
+
+					<c:OptionSection Header="{l:Translate lblPce}" Icon="Assets/PceIcon.png" >
+						<Grid ColumnDefinitions="Auto,*" RowDefinitions="Auto,Auto,Auto,*">
+							<TextBlock Text="Super CD-ROM²" />
+							<c:FirmwareSelect FirmwareType="PceSuperCd" Grid.Column="1" />
+
+							<TextBlock Text="Games Express" Grid.Row="1" />
+							<c:FirmwareSelect FirmwareType="PceGamesExpress" Grid.Column="1" Grid.Row="1" />
+						</Grid>
+					</c:OptionSection>
+
+					<c:OptionSection Header="{l:Translate lblSms}" Icon="Assets/SmsIcon.png" >
+						<Grid ColumnDefinitions="Auto,*" RowDefinitions="Auto,Auto,Auto,*">
+							<TextBlock Text="Boot ROM (SMS)" />
+							<c:FirmwareSelect FirmwareType="SmsBootRom" Grid.Column="1" />
+
+							<TextBlock Text="Boot ROM (GG)" Grid.Row="1" />
+							<c:FirmwareSelect FirmwareType="GgBootRom" Grid.Column="1" Grid.Row="1" />
+						</Grid>
+					</c:OptionSection>
+					
+					<c:OptionSection Header="{l:Translate lblWonderSwan}" Icon="Assets/WsIcon.png" >
+						<Grid ColumnDefinitions="Auto,*" RowDefinitions="Auto,Auto,Auto,*">
+							<TextBlock Text="Boot ROM (WonderSwan)" />
+							<c:FirmwareSelect FirmwareType="WonderSwan" Grid.Column="1" />
+
+							<TextBlock Text="Boot ROM (WonderSwan Color)" Grid.Row="1" />
+							<c:FirmwareSelect FirmwareType="WonderSwanColor" Grid.Column="1" Grid.Row="1" />
+
+							<TextBlock Text="Boot ROM (SwanCrystal)" Grid.Row="2" />
+							<c:FirmwareSelect FirmwareType="SwanCrystal" Grid.Column="1" Grid.Row="2" />
+						</Grid>
+					</c:OptionSection>
+
+					<c:OptionSection Header="{l:Translate lblOtherConsoles}" Icon="Assets/Drive.png" >
+						<Grid ColumnDefinitions="Auto,*" RowDefinitions="Auto,Auto,Auto,*">
+							<TextBlock Text="ColecoVision - Boot ROM" />
+							<c:FirmwareSelect FirmwareType="ColecoVision" Grid.Column="1" />
+						</Grid>
+					</c:OptionSection>
+				</StackPanel>
+			</ScrollViewer>
+		</TabItem>
 	</TabControl>
 </UserControl>