From 92157d0af0ca9c3ddbe8bdd469aeb14e2c699243 Mon Sep 17 00:00:00 2001 From: CasualPokePlayer <50538166+CasualPokePlayer@users.noreply.github.com> Date: Sun, 21 Nov 2021 00:59:56 -0800 Subject: [PATCH] rename DGB to GBL and make all link gb cores use it; todo: rename/fix shit --- ...izHawkSystemIdToCoreSystemEnumConverter.cs | 6 ++---- src/BizHawk.Client.Common/Api/CoreSystem.cs | 4 +--- src/BizHawk.Client.Common/RomLoader.cs | 2 +- src/BizHawk.Client.Common/config/Config.cs | 6 +++--- .../config/PathEntryCollection.cs | 12 +++--------- .../movie/bk2/Bk2MnemonicLookup.cs | 19 +++++++++---------- src/BizHawk.Client.EmuHawk/MainForm.cs | 2 +- src/BizHawk.Emulation.Common/Extensions.cs | 4 +--- src/BizHawk.Emulation.Common/VSystemID.cs | 4 +--- .../GBHawkLink/GBHawkLink.IEmulator.cs | 2 +- .../Nintendo/GBHawkLink/GBHawkLink.cs | 2 +- .../GBHawkLink3x/GBHawkLink3x.IEmulator.cs | 2 +- .../Nintendo/GBHawkLink3x/GBHawkLink3x.cs | 2 +- .../GBHawkLink4x/GBHawkLink4x.IEmulator.cs | 2 +- .../Nintendo/GBHawkLink4x/GBHawkLink4x.cs | 2 +- .../Gameboy/GambatteLink.IEmulator.cs | 2 +- .../Consoles/Nintendo/Gameboy/GambatteLink.cs | 4 ++-- src/BizHawk.Emulation.Cores/CoreNames.cs | 4 ++-- .../vpads_schemata/DualGBSchema.cs | 2 +- .../vpads_schemata/GBSchema.cs | 4 ++-- 20 files changed, 36 insertions(+), 51 deletions(-) diff --git a/src/BizHawk.Client.Common/Api/BizHawkSystemIdToCoreSystemEnumConverter.cs b/src/BizHawk.Client.Common/Api/BizHawkSystemIdToCoreSystemEnumConverter.cs index 6c18b72896..1bf677f53c 100644 --- a/src/BizHawk.Client.Common/Api/BizHawkSystemIdToCoreSystemEnumConverter.cs +++ b/src/BizHawk.Client.Common/Api/BizHawkSystemIdToCoreSystemEnumConverter.cs @@ -32,7 +32,7 @@ namespace BizHawk.Client.Common VSystemID.Raw.A78 => CoreSystem.Atari7800, VSystemID.Raw.Coleco => CoreSystem.ColecoVision, VSystemID.Raw.C64 => CoreSystem.Commodore64, - VSystemID.Raw.DGB => CoreSystem.DualGameBoy, + VSystemID.Raw.GBL => CoreSystem.GameBoyLink, VSystemID.Raw.GB => CoreSystem.GameBoy, VSystemID.Raw.GBA => CoreSystem.GameBoyAdvance, VSystemID.Raw.GEN => CoreSystem.Genesis, @@ -57,8 +57,6 @@ namespace BizHawk.Client.Common VSystemID.Raw.AmstradCPC => CoreSystem.AmstradCPC, VSystemID.Raw.GGL => CoreSystem.GGL, VSystemID.Raw.ChannelF => CoreSystem.ChannelF, - VSystemID.Raw.GB3x => CoreSystem.GB3x, - VSystemID.Raw.GB4x => CoreSystem.GB4x, VSystemID.Raw.MAME => CoreSystem.MAME, VSystemID.Raw.O2 => CoreSystem.Odyssey2, VSystemID.Raw.MSX => CoreSystem.MSX, @@ -102,7 +100,7 @@ namespace BizHawk.Client.Common CoreSystem.Atari7800 => VSystemID.Raw.A78, CoreSystem.ColecoVision => VSystemID.Raw.Coleco, CoreSystem.Commodore64 => VSystemID.Raw.C64, - CoreSystem.DualGameBoy => VSystemID.Raw.DGB, + CoreSystem.GameBoyLink => VSystemID.Raw.GBL, CoreSystem.GameBoy => VSystemID.Raw.GB, CoreSystem.GameBoyAdvance => VSystemID.Raw.GBA, CoreSystem.Genesis => VSystemID.Raw.GEN, diff --git a/src/BizHawk.Client.Common/Api/CoreSystem.cs b/src/BizHawk.Client.Common/Api/CoreSystem.cs index e180d17ddb..93cf8a32d9 100644 --- a/src/BizHawk.Client.Common/Api/CoreSystem.cs +++ b/src/BizHawk.Client.Common/Api/CoreSystem.cs @@ -15,7 +15,7 @@ ColecoVision, Intellivision, GameBoy, - DualGameBoy, + GameBoyLink, GameBoyAdvance, NintendoDS, Nintendo64, @@ -34,8 +34,6 @@ ZXSpectrum, AmstradCPC, GGL, - GB3x, - GB4x, ChannelF, Odyssey2, MAME, diff --git a/src/BizHawk.Client.Common/RomLoader.cs b/src/BizHawk.Client.Common/RomLoader.cs index 94456429b9..e5a1a129e2 100644 --- a/src/BizHawk.Client.Common/RomLoader.cs +++ b/src/BizHawk.Client.Common/RomLoader.cs @@ -576,7 +576,7 @@ namespace BizHawk.Client.Common } catch { - DoLoadErrorCallback(ex.ToString(), VSystemID.Raw.DGB, LoadErrorType.Xml); + DoLoadErrorCallback(ex.ToString(), VSystemID.Raw.GBL, LoadErrorType.Xml); return false; } } diff --git a/src/BizHawk.Client.Common/config/Config.cs b/src/BizHawk.Client.Common/config/Config.cs index 76a50dad9c..512deafc49 100644 --- a/src/BizHawk.Client.Common/config/Config.cs +++ b/src/BizHawk.Client.Common/config/Config.cs @@ -28,8 +28,8 @@ namespace BizHawk.Client.Common new[] { CoreNames.Gambatte, CoreNames.Bsnes, CoreNames.Bsnes115}), (new[] { VSystemID.Raw.GB, VSystemID.Raw.GBC }, new[] { CoreNames.Gambatte, CoreNames.GbHawk, CoreNames.SubGbHawk }), - (new[] { VSystemID.Raw.DGB }, - new[] { CoreNames.DualGambatte, CoreNames.GBHawkLink }), + (new[] { VSystemID.Raw.GBL }, + new[] { CoreNames.GambatteLink, CoreNames.GBHawkLink, CoreNames.GBHawkLink3x, CoreNames.GBHawkLink4x }), (new[] { VSystemID.Raw.PCE, VSystemID.Raw.PCECD, VSystemID.Raw.SGX }, new[] { CoreNames.TurboNyma, CoreNames.HyperNyma, CoreNames.PceHawk }) }; @@ -314,7 +314,7 @@ namespace BizHawk.Client.Common [VSystemID.Raw.SNES] = CoreNames.Snes9X, [VSystemID.Raw.GB] = CoreNames.Gambatte, [VSystemID.Raw.GBC] = CoreNames.Gambatte, - [VSystemID.Raw.DGB] = CoreNames.DualGambatte, + [VSystemID.Raw.GBL] = CoreNames.GambatteLink, [VSystemID.Raw.SGB] = CoreNames.Gambatte, [VSystemID.Raw.PCE] = CoreNames.TurboNyma, [VSystemID.Raw.PCECD] = CoreNames.TurboNyma, diff --git a/src/BizHawk.Client.Common/config/PathEntryCollection.cs b/src/BizHawk.Client.Common/config/PathEntryCollection.cs index 56e6b75d10..05607199bf 100644 --- a/src/BizHawk.Client.Common/config/PathEntryCollection.cs +++ b/src/BizHawk.Client.Common/config/PathEntryCollection.cs @@ -32,7 +32,7 @@ namespace BizHawk.Client.Common [VSystemID.Raw.GEN] = "Genesis", [COMBINED_SYSIDS_PCE] = "PC Engine", [COMBINED_SYSIDS_GB] = "Gameboy", - [VSystemID.Raw.DGB] = "Dual Gameboy", + [VSystemID.Raw.GBL] = "Gameboy Link", [VSystemID.Raw.TI83] = "TI83", [VSystemID.Raw.A26] = "Atari 2600", [VSystemID.Raw.A78] = "Atari 7800", @@ -51,8 +51,6 @@ namespace BizHawk.Client.Common [VSystemID.Raw.NGP] = "NGP", [VSystemID.Raw.PCFX] = "PCFX", [VSystemID.Raw.ChannelF] = "Fairchild Channel F", - [VSystemID.Raw.GB3x] = "GB3x", - [VSystemID.Raw.GB4x] = "GB4x", [VSystemID.Raw.VEC] = "VEC", [VSystemID.Raw.O2] = "O2", [VSystemID.Raw.MSX] = "MSX", @@ -211,9 +209,9 @@ namespace BizHawk.Client.Common CommonEntriesFor(VSystemID.Raw.Coleco, basePath: Path.Combine(".", "Coleco"), omitSaveRAM: true), - CommonEntriesFor(VSystemID.Raw.DGB, basePath: Path.Combine(".", "Dual Gameboy")), + CommonEntriesFor(VSystemID.Raw.GBL, basePath: Path.Combine(".", "Gameboy Link")), new[] { - PalettesEntryFor(VSystemID.Raw.DGB), + PalettesEntryFor(VSystemID.Raw.GBL), }, CommonEntriesFor(COMBINED_SYSIDS_GB, basePath: Path.Combine(".", "Gameboy")), @@ -221,10 +219,6 @@ namespace BizHawk.Client.Common PalettesEntryFor(COMBINED_SYSIDS_GB), }, - CommonEntriesFor(VSystemID.Raw.GB3x, basePath: Path.Combine(".", "GB3x")), - - CommonEntriesFor(VSystemID.Raw.GB4x, basePath: Path.Combine(".", "GB4x")), - CommonEntriesFor(VSystemID.Raw.GBA, basePath: Path.Combine(".", "GBA")), CommonEntriesFor(VSystemID.Raw.GEN, basePath: Path.Combine(".", "Genesis")), diff --git a/src/BizHawk.Client.Common/movie/bk2/Bk2MnemonicLookup.cs b/src/BizHawk.Client.Common/movie/bk2/Bk2MnemonicLookup.cs index ef0b5a177e..5b564d3fcb 100644 --- a/src/BizHawk.Client.Common/movie/bk2/Bk2MnemonicLookup.cs +++ b/src/BizHawk.Client.Common/movie/bk2/Bk2MnemonicLookup.cs @@ -367,22 +367,21 @@ namespace BizHawk.Client.Common ["DPad L"] = 'L', ["DPad R"] = 'R', }, - [VSystemID.Raw.DGB] = new() - { - ["Toggle Cable"] = 'L' - }, - [VSystemID.Raw.GB3x] = new() + [VSystemID.Raw.GBL] = new() { + // gbhawk + ["Toggle Cable"] = 'L', ["Toggle Cable LC"] = 'L', ["Toggle Cable CR"] = 'C', - ["Toggle Cable RL"] = 'R' - }, - [VSystemID.Raw.GB4x] = new() - { + ["Toggle Cable RL"] = 'R', ["Toggle Cable UD"] = 'U', ["Toggle Cable LR"] = 'L', ["Toggle Cable X"] = 'X', - ["Toggle Cable 4x"] = '4' + ["Toggle Cable 4x"] = '4', + // gambatte + ["Toggle Link Connection"] = 'L', + ["Toggle Link Shift"] = 'F', + ["Toggle Link Spacing"] = 'C', }, [VSystemID.Raw.Lynx] = new() { diff --git a/src/BizHawk.Client.EmuHawk/MainForm.cs b/src/BizHawk.Client.EmuHawk/MainForm.cs index 45c4334ad8..338be96e54 100644 --- a/src/BizHawk.Client.EmuHawk/MainForm.cs +++ b/src/BizHawk.Client.EmuHawk/MainForm.cs @@ -1997,7 +1997,7 @@ namespace BizHawk.Client.EmuHawk case VSystemID.Raw.ZXSpectrum: zXSpectrumToolStripMenuItem.Visible = true; break; - case VSystemID.Raw.DGB when Emulator is GambatteLink: + case VSystemID.Raw.GBL when Emulator is GambatteLink: DGBSubMenu.Visible = true; break; case VSystemID.Raw.GB: diff --git a/src/BizHawk.Emulation.Common/Extensions.cs b/src/BizHawk.Emulation.Common/Extensions.cs index 59c35dab08..9cc7fd11ae 100644 --- a/src/BizHawk.Emulation.Common/Extensions.cs +++ b/src/BizHawk.Emulation.Common/Extensions.cs @@ -24,11 +24,9 @@ namespace BizHawk.Emulation.Common [VSystemID.Raw.C64] = "Commodore 64", [VSystemID.Raw.ChannelF] = "Channel F", [VSystemID.Raw.Coleco] = "ColecoVision", - [VSystemID.Raw.DGB] = "Game Boy Link", + [VSystemID.Raw.GBL] = "Game Boy Link", [VSystemID.Raw.GB] = "GB", [VSystemID.Raw.SGB] = "SGB", - [VSystemID.Raw.GB3x] = "Game Boy Link 3x", - [VSystemID.Raw.GB4x] = "Game Boy Link 4x", [VSystemID.Raw.GBA] = "Gameboy Advance", [VSystemID.Raw.GBC] = "Gameboy Color", [VSystemID.Raw.GEN] = "Genesis", diff --git a/src/BizHawk.Emulation.Common/VSystemID.cs b/src/BizHawk.Emulation.Common/VSystemID.cs index 3dd51d6e6e..ca40d78aef 100644 --- a/src/BizHawk.Emulation.Common/VSystemID.cs +++ b/src/BizHawk.Emulation.Common/VSystemID.cs @@ -20,12 +20,10 @@ namespace BizHawk.Emulation.Common public const string ChannelF = "ChannelF"; public const string Coleco = "Coleco"; public const string DEBUG = "DEBUG"; - public const string DGB = "DGB"; public const string GB = "GB"; - public const string GB3x = "GB3x"; - public const string GB4x = "GB4x"; public const string GBA = "GBA"; public const string GBC = "GBC"; + public const string GBL = "GBL"; public const string GEN = "GEN"; public const string GG = "GG"; public const string GGL = "GGL"; diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink/GBHawkLink.IEmulator.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink/GBHawkLink.IEmulator.cs index 43877b25f0..46f2e49793 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink/GBHawkLink.IEmulator.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink/GBHawkLink.IEmulator.cs @@ -225,7 +225,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink public int Frame => _frame; - public string SystemId => VSystemID.Raw.DGB; + public string SystemId => VSystemID.Raw.GBL; public bool DeterministicEmulation { get; set; } diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink/GBHawkLink.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink/GBHawkLink.cs index d68df846d5..a8dbda771d 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink/GBHawkLink.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink/GBHawkLink.cs @@ -25,7 +25,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink public bool do_frame_fill; - [CoreConstructor(VSystemID.Raw.DGB)] + [CoreConstructor(VSystemID.Raw.GBL)] public GBHawkLink(CoreLoadParameters lp) { if (lp.Roms.Count != 2) diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink3x/GBHawkLink3x.IEmulator.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink3x/GBHawkLink3x.IEmulator.cs index 7f2ed5dcb1..d77e1e9e20 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink3x/GBHawkLink3x.IEmulator.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink3x/GBHawkLink3x.IEmulator.cs @@ -420,7 +420,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink3x public int Frame => _frame; - public string SystemId => VSystemID.Raw.GB3x; + public string SystemId => VSystemID.Raw.GBL; public bool DeterministicEmulation { get; set; } diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink3x/GBHawkLink3x.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink3x/GBHawkLink3x.cs index 2ff6884203..da58be8893 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink3x/GBHawkLink3x.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink3x/GBHawkLink3x.cs @@ -25,7 +25,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink3x public bool do_frame_fill; - [CoreConstructor(VSystemID.Raw.GB3x)] + [CoreConstructor(VSystemID.Raw.GBL)] public GBHawkLink3x(CoreLoadParameters lp) { if (lp.Roms.Count != 3) diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink4x/GBHawkLink4x.IEmulator.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink4x/GBHawkLink4x.IEmulator.cs index cf8967a331..335dbe81cf 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink4x/GBHawkLink4x.IEmulator.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink4x/GBHawkLink4x.IEmulator.cs @@ -999,7 +999,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink4x public int Frame => _frame; - public string SystemId => VSystemID.Raw.GB4x; + public string SystemId => VSystemID.Raw.GBL; public bool DeterministicEmulation { get; set; } diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink4x/GBHawkLink4x.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink4x/GBHawkLink4x.cs index d40b7f63f2..ab0f3833e2 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink4x/GBHawkLink4x.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink4x/GBHawkLink4x.cs @@ -46,7 +46,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink4x public bool do_frame_fill; - [CoreConstructor(VSystemID.Raw.GB4x)] + [CoreConstructor(VSystemID.Raw.GBL)] public GBHawkLink4x(CoreLoadParameters lp) { if (lp.Roms.Count != 4) diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.IEmulator.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.IEmulator.cs index 430d963e0d..d89da635c8 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.IEmulator.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.IEmulator.cs @@ -267,7 +267,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy public int Frame { get; private set; } - public string SystemId => VSystemID.Raw.DGB; + public string SystemId => VSystemID.Raw.GBL; public bool DeterministicEmulation => LinkedDeterministicEmulation(); diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.cs index 0bfd5973d2..2c5350734d 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.cs @@ -5,11 +5,11 @@ using BizHawk.Emulation.Common; namespace BizHawk.Emulation.Cores.Nintendo.Gameboy { - [PortedCore(CoreNames.DualGambatte, "sinamas/natt")] + [PortedCore(CoreNames.GambatteLink, "sinamas/natt")] [ServiceNotApplicable(new[] { typeof(IDriveLight) })] public partial class GambatteLink : ILinkable, IRomInfo { - [CoreConstructor(VSystemID.Raw.DGB)] + [CoreConstructor(VSystemID.Raw.GBL)] public GambatteLink(CoreLoadParameters lp) { if (lp.Roms.Count < MIN_PLAYERS || lp.Roms.Count > MAX_PLAYERS) diff --git a/src/BizHawk.Emulation.Cores/CoreNames.cs b/src/BizHawk.Emulation.Cores/CoreNames.cs index a70a79ae75..c7fd2aac33 100644 --- a/src/BizHawk.Emulation.Cores/CoreNames.cs +++ b/src/BizHawk.Emulation.Cores/CoreNames.cs @@ -19,9 +19,9 @@ namespace BizHawk.Emulation.Cores public const string CPCHawk = "CPCHawk"; public const string Cygne = "Cygne/Mednafen"; public const string DobieStation = "DobieStation"; - public const string DualGambatte = "DualGambatte"; public const string Faust = "Faust"; - public const string Gambatte = "Gambatte"; + public const string Gambatte = "Gambatte"; + public const string GambatteLink = "GambatteLink"; public const string GbHawk = "GBHawk"; public const string GBHawkLink = "GBHawkLink"; public const string GBHawkLink3x = "GBHawkLink3x"; diff --git a/src/BizHawk.Emulation.Cores/vpads_schemata/DualGBSchema.cs b/src/BizHawk.Emulation.Cores/vpads_schemata/DualGBSchema.cs index 4bb2fa7bba..42a3362c32 100644 --- a/src/BizHawk.Emulation.Cores/vpads_schemata/DualGBSchema.cs +++ b/src/BizHawk.Emulation.Cores/vpads_schemata/DualGBSchema.cs @@ -6,7 +6,7 @@ using BizHawk.Emulation.Common; namespace BizHawk.Emulation.Cores { - [Schema(VSystemID.Raw.DGB)] + [Schema(VSystemID.Raw.GBL)] // ReSharper disable once UnusedMember.Global public class DualGbSchema : IVirtualPadSchema { diff --git a/src/BizHawk.Emulation.Cores/vpads_schemata/GBSchema.cs b/src/BizHawk.Emulation.Cores/vpads_schemata/GBSchema.cs index 8072f7586a..fd8d83aa03 100644 --- a/src/BizHawk.Emulation.Cores/vpads_schemata/GBSchema.cs +++ b/src/BizHawk.Emulation.Cores/vpads_schemata/GBSchema.cs @@ -111,7 +111,7 @@ namespace BizHawk.Emulation.Cores } } - [Schema(VSystemID.Raw.GB3x)] + [Schema(VSystemID.Raw.GBL)] public class Gb3XSchema : GbSchema { public override IEnumerable GetPadSchemas(IEmulator core, Action showMessageBox) @@ -123,7 +123,7 @@ namespace BizHawk.Emulation.Cores } } - [Schema(VSystemID.Raw.GB4x)] + [Schema(VSystemID.Raw.GBL)] public class Gb4XSchema : GbSchema { public override IEnumerable GetPadSchemas(IEmulator core, Action showMessageBox)