From 39f6668f18b2aa0cb9b016e471d23f14cd1969da Mon Sep 17 00:00:00 2001 From: alyosha-tas Date: Fri, 25 Sep 2020 09:12:33 -0400 Subject: [PATCH] dual gameboy: fix XML generation and core preference selection --- src/BizHawk.Client.Common/config/Config.cs | 1 + src/BizHawk.Client.EmuHawk/MainForm.cs | 1 + .../tools/MultiDiskBundler/MultiDiskBundler.Designer.cs | 2 +- src/BizHawk.Emulation.Cores/CoreNames.cs | 2 ++ 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/BizHawk.Client.Common/config/Config.cs b/src/BizHawk.Client.Common/config/Config.cs index 7c4d1a4a4c..1506f5cf3e 100644 --- a/src/BizHawk.Client.Common/config/Config.cs +++ b/src/BizHawk.Client.Common/config/Config.cs @@ -300,6 +300,7 @@ namespace BizHawk.Client.Common ["SNES"] = CoreNames.Snes9X, ["GB"] = CoreNames.Gambatte, ["GBC"] = CoreNames.Gambatte, + ["DGB"] = CoreNames.DualGambatte, ["SGB"] = CoreNames.SameBoy, ["PCE"] = CoreNames.TurboNyma, ["PCECD"] = CoreNames.TurboNyma, diff --git a/src/BizHawk.Client.EmuHawk/MainForm.cs b/src/BizHawk.Client.EmuHawk/MainForm.cs index 6f998e708d..1aa0144745 100644 --- a/src/BizHawk.Client.EmuHawk/MainForm.cs +++ b/src/BizHawk.Client.EmuHawk/MainForm.cs @@ -47,6 +47,7 @@ namespace BizHawk.Client.EmuHawk (new[] { "SNES" }, new[] { CoreNames.Faust, CoreNames.Snes9X, CoreNames.Bsnes }), (new[] { "SGB" }, new[] { CoreNames.SameBoy, CoreNames.Bsnes }), (new[] { "GB", "GBC" }, new[] { CoreNames.Gambatte, CoreNames.GbHawk, CoreNames.SubGbHawk }), + (new[] { "DGB" }, new[] { CoreNames.DualGambatte, CoreNames.GBHawkLink }), (new[] { "PCE", "PCECD", "SGX" }, new[] { CoreNames.TurboNyma, CoreNames.HyperNyma, CoreNames.PceHawk }) }; diff --git a/src/BizHawk.Client.EmuHawk/tools/MultiDiskBundler/MultiDiskBundler.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/MultiDiskBundler/MultiDiskBundler.Designer.cs index 42df1aac6a..7d1f93d25a 100644 --- a/src/BizHawk.Client.EmuHawk/tools/MultiDiskBundler/MultiDiskBundler.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/MultiDiskBundler/MultiDiskBundler.Designer.cs @@ -139,7 +139,7 @@ this.SystemDropDown.Items.AddRange(new object[] { "AppleII", "C64", - "GB", + "DGB", "GB3x", "GB4x", "GEN", diff --git a/src/BizHawk.Emulation.Cores/CoreNames.cs b/src/BizHawk.Emulation.Cores/CoreNames.cs index 8d76346104..2e17ced300 100644 --- a/src/BizHawk.Emulation.Cores/CoreNames.cs +++ b/src/BizHawk.Emulation.Cores/CoreNames.cs @@ -24,5 +24,7 @@ namespace BizHawk.Emulation.Cores public const string TurboNyma = "TurboNyma"; public const string HyperNyma = "HyperNyma"; public const string Faust = "Faust"; + public const string DualGambatte = "DualGambatte"; + public const string GBHawkLink = "GBHawkLink"; } }