ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rename DGB to GBL and make all link gb cores use it; todo: rename/fix shit

This commit is contained in:
CasualPokePlayer 2021-11-21 00:59:56 -08:00
parent 7c25241c4b
commit 92157d0af0
20 changed files with 36 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/BizHawk.Client.Common/Api/BizHawkSystemIdToCoreSystemEnumConverter.cs
View File

@ -32,7 +32,7 @@ namespace BizHawk.Client.Common
VSystemID.Raw.A78 => CoreSystem.Atari7800, VSystemID.Raw.A78 => CoreSystem.Atari7800,
VSystemID.Raw.Coleco => CoreSystem.ColecoVision, VSystemID.Raw.Coleco => CoreSystem.ColecoVision,
VSystemID.Raw.C64 => CoreSystem.Commodore64, VSystemID.Raw.C64 => CoreSystem.Commodore64,
VSystemID.Raw.DGB => CoreSystem.DualGameBoy, VSystemID.Raw.GBL => CoreSystem.GameBoyLink,
VSystemID.Raw.GB => CoreSystem.GameBoy, VSystemID.Raw.GB => CoreSystem.GameBoy,
VSystemID.Raw.GBA => CoreSystem.GameBoyAdvance, VSystemID.Raw.GBA => CoreSystem.GameBoyAdvance,
VSystemID.Raw.GEN => CoreSystem.Genesis, VSystemID.Raw.GEN => CoreSystem.Genesis,
@ -57,8 +57,6 @@ namespace BizHawk.Client.Common
VSystemID.Raw.AmstradCPC => CoreSystem.AmstradCPC, VSystemID.Raw.AmstradCPC => CoreSystem.AmstradCPC,
VSystemID.Raw.GGL => CoreSystem.GGL, VSystemID.Raw.GGL => CoreSystem.GGL,
VSystemID.Raw.ChannelF => CoreSystem.ChannelF, VSystemID.Raw.ChannelF => CoreSystem.ChannelF,
VSystemID.Raw.GB3x => CoreSystem.GB3x,
VSystemID.Raw.GB4x => CoreSystem.GB4x,
VSystemID.Raw.MAME => CoreSystem.MAME, VSystemID.Raw.MAME => CoreSystem.MAME,
VSystemID.Raw.O2 => CoreSystem.Odyssey2, VSystemID.Raw.O2 => CoreSystem.Odyssey2,
VSystemID.Raw.MSX => CoreSystem.MSX, VSystemID.Raw.MSX => CoreSystem.MSX,
@ -102,7 +100,7 @@ namespace BizHawk.Client.Common
CoreSystem.Atari7800 => VSystemID.Raw.A78, CoreSystem.Atari7800 => VSystemID.Raw.A78,
CoreSystem.ColecoVision => VSystemID.Raw.Coleco, CoreSystem.ColecoVision => VSystemID.Raw.Coleco,
CoreSystem.Commodore64 => VSystemID.Raw.C64, CoreSystem.Commodore64 => VSystemID.Raw.C64,
CoreSystem.DualGameBoy => VSystemID.Raw.DGB, CoreSystem.GameBoyLink => VSystemID.Raw.GBL,
CoreSystem.GameBoy => VSystemID.Raw.GB, CoreSystem.GameBoy => VSystemID.Raw.GB,
CoreSystem.GameBoyAdvance => VSystemID.Raw.GBA, CoreSystem.GameBoyAdvance => VSystemID.Raw.GBA,
CoreSystem.Genesis => VSystemID.Raw.GEN, CoreSystem.Genesis => VSystemID.Raw.GEN,

4
src/BizHawk.Client.Common/Api/CoreSystem.cs
View File

@ -15,7 +15,7 @@
ColecoVision, ColecoVision,
Intellivision, Intellivision,
GameBoy, GameBoy,
DualGameBoy, GameBoyLink,
GameBoyAdvance, GameBoyAdvance,
NintendoDS, NintendoDS,
Nintendo64, Nintendo64,
@ -34,8 +34,6 @@
ZXSpectrum, ZXSpectrum,
AmstradCPC, AmstradCPC,
GGL, GGL,
GB3x,
GB4x,
ChannelF, ChannelF,
Odyssey2, Odyssey2,
MAME, MAME,

2
src/BizHawk.Client.Common/RomLoader.cs
View File

@ -576,7 +576,7 @@ namespace BizHawk.Client.Common
} }
catch catch
{ {
DoLoadErrorCallback(ex.ToString(), VSystemID.Raw.DGB, LoadErrorType.Xml); DoLoadErrorCallback(ex.ToString(), VSystemID.Raw.GBL, LoadErrorType.Xml);
return false; return false;
} }
} }

6
src/BizHawk.Client.Common/config/Config.cs
View File

@ -28,8 +28,8 @@ namespace BizHawk.Client.Common
new[] { CoreNames.Gambatte, CoreNames.Bsnes, CoreNames.Bsnes115}), new[] { CoreNames.Gambatte, CoreNames.Bsnes, CoreNames.Bsnes115}),
(new[] { VSystemID.Raw.GB, VSystemID.Raw.GBC }, (new[] { VSystemID.Raw.GB, VSystemID.Raw.GBC },
new[] { CoreNames.Gambatte, CoreNames.GbHawk, CoreNames.SubGbHawk }), new[] { CoreNames.Gambatte, CoreNames.GbHawk, CoreNames.SubGbHawk }),
(new[] { VSystemID.Raw.DGB }, (new[] { VSystemID.Raw.GBL },
new[] { CoreNames.DualGambatte, CoreNames.GBHawkLink }), new[] { CoreNames.GambatteLink, CoreNames.GBHawkLink, CoreNames.GBHawkLink3x, CoreNames.GBHawkLink4x }),
(new[] { VSystemID.Raw.PCE, VSystemID.Raw.PCECD, VSystemID.Raw.SGX }, (new[] { VSystemID.Raw.PCE, VSystemID.Raw.PCECD, VSystemID.Raw.SGX },
new[] { CoreNames.TurboNyma, CoreNames.HyperNyma, CoreNames.PceHawk }) new[] { CoreNames.TurboNyma, CoreNames.HyperNyma, CoreNames.PceHawk })
}; };
@ -314,7 +314,7 @@ namespace BizHawk.Client.Common
[VSystemID.Raw.SNES] = CoreNames.Snes9X, [VSystemID.Raw.SNES] = CoreNames.Snes9X,
[VSystemID.Raw.GB] = CoreNames.Gambatte, [VSystemID.Raw.GB] = CoreNames.Gambatte,
[VSystemID.Raw.GBC] = CoreNames.Gambatte, [VSystemID.Raw.GBC] = CoreNames.Gambatte,
[VSystemID.Raw.DGB] = CoreNames.DualGambatte, [VSystemID.Raw.GBL] = CoreNames.GambatteLink,
[VSystemID.Raw.SGB] = CoreNames.Gambatte, [VSystemID.Raw.SGB] = CoreNames.Gambatte,
[VSystemID.Raw.PCE] = CoreNames.TurboNyma, [VSystemID.Raw.PCE] = CoreNames.TurboNyma,
[VSystemID.Raw.PCECD] = CoreNames.TurboNyma, [VSystemID.Raw.PCECD] = CoreNames.TurboNyma,

12
src/BizHawk.Client.Common/config/PathEntryCollection.cs
View File

@ -32,7 +32,7 @@ namespace BizHawk.Client.Common
[VSystemID.Raw.GEN] = "Genesis", [VSystemID.Raw.GEN] = "Genesis",
[COMBINED_SYSIDS_PCE] = "PC Engine", [COMBINED_SYSIDS_PCE] = "PC Engine",
[COMBINED_SYSIDS_GB] = "Gameboy", [COMBINED_SYSIDS_GB] = "Gameboy",
[VSystemID.Raw.DGB] = "Dual Gameboy", [VSystemID.Raw.GBL] = "Gameboy Link",
[VSystemID.Raw.TI83] = "TI83", [VSystemID.Raw.TI83] = "TI83",
[VSystemID.Raw.A26] = "Atari 2600", [VSystemID.Raw.A26] = "Atari 2600",
[VSystemID.Raw.A78] = "Atari 7800", [VSystemID.Raw.A78] = "Atari 7800",
@ -51,8 +51,6 @@ namespace BizHawk.Client.Common
[VSystemID.Raw.NGP] = "NGP", [VSystemID.Raw.NGP] = "NGP",
[VSystemID.Raw.PCFX] = "PCFX", [VSystemID.Raw.PCFX] = "PCFX",
[VSystemID.Raw.ChannelF] = "Fairchild Channel F", [VSystemID.Raw.ChannelF] = "Fairchild Channel F",
[VSystemID.Raw.GB3x] = "GB3x",
[VSystemID.Raw.GB4x] = "GB4x",
[VSystemID.Raw.VEC] = "VEC", [VSystemID.Raw.VEC] = "VEC",
[VSystemID.Raw.O2] = "O2", [VSystemID.Raw.O2] = "O2",
[VSystemID.Raw.MSX] = "MSX", [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.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[] { new[] {
PalettesEntryFor(VSystemID.Raw.DGB), PalettesEntryFor(VSystemID.Raw.GBL),
}, },
CommonEntriesFor(COMBINED_SYSIDS_GB, basePath: Path.Combine(".", "Gameboy")), CommonEntriesFor(COMBINED_SYSIDS_GB, basePath: Path.Combine(".", "Gameboy")),
@ -221,10 +219,6 @@ namespace BizHawk.Client.Common
PalettesEntryFor(COMBINED_SYSIDS_GB), 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.GBA, basePath: Path.Combine(".", "GBA")),
CommonEntriesFor(VSystemID.Raw.GEN, basePath: Path.Combine(".", "Genesis")), CommonEntriesFor(VSystemID.Raw.GEN, basePath: Path.Combine(".", "Genesis")),

19
src/BizHawk.Client.Common/movie/bk2/Bk2MnemonicLookup.cs
View File

@ -367,22 +367,21 @@ namespace BizHawk.Client.Common
["DPad L"] = 'L', ["DPad L"] = 'L',
["DPad R"] = 'R', ["DPad R"] = 'R',
}, },
[VSystemID.Raw.DGB] = new() [VSystemID.Raw.GBL] = new()
{
["Toggle Cable"] = 'L'
},
[VSystemID.Raw.GB3x] = new()
{ {
// gbhawk
["Toggle Cable"] = 'L',
["Toggle Cable LC"] = 'L', ["Toggle Cable LC"] = 'L',
["Toggle Cable CR"] = 'C', ["Toggle Cable CR"] = 'C',
["Toggle Cable RL"] = 'R' ["Toggle Cable RL"] = 'R',
},
[VSystemID.Raw.GB4x] = new()
{
["Toggle Cable UD"] = 'U', ["Toggle Cable UD"] = 'U',
["Toggle Cable LR"] = 'L', ["Toggle Cable LR"] = 'L',
["Toggle Cable X"] = 'X', ["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() [VSystemID.Raw.Lynx] = new()
{ {

2
src/BizHawk.Client.EmuHawk/MainForm.cs
View File

@ -1997,7 +1997,7 @@ namespace BizHawk.Client.EmuHawk
case VSystemID.Raw.ZXSpectrum: case VSystemID.Raw.ZXSpectrum:
zXSpectrumToolStripMenuItem.Visible = true; zXSpectrumToolStripMenuItem.Visible = true;
break; break;
case VSystemID.Raw.DGB when Emulator is GambatteLink: case VSystemID.Raw.GBL when Emulator is GambatteLink:
DGBSubMenu.Visible = true; DGBSubMenu.Visible = true;
break; break;
case VSystemID.Raw.GB: case VSystemID.Raw.GB:

4
src/BizHawk.Emulation.Common/Extensions.cs
View File

@ -24,11 +24,9 @@ namespace BizHawk.Emulation.Common
[VSystemID.Raw.C64] = "Commodore 64", [VSystemID.Raw.C64] = "Commodore 64",
[VSystemID.Raw.ChannelF] = "Channel F", [VSystemID.Raw.ChannelF] = "Channel F",
[VSystemID.Raw.Coleco] = "ColecoVision", [VSystemID.Raw.Coleco] = "ColecoVision",
[VSystemID.Raw.DGB] = "Game Boy Link", [VSystemID.Raw.GBL] = "Game Boy Link",
[VSystemID.Raw.GB] = "GB", [VSystemID.Raw.GB] = "GB",
[VSystemID.Raw.SGB] = "SGB", [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.GBA] = "Gameboy Advance",
[VSystemID.Raw.GBC] = "Gameboy Color", [VSystemID.Raw.GBC] = "Gameboy Color",
[VSystemID.Raw.GEN] = "Genesis", [VSystemID.Raw.GEN] = "Genesis",

4
src/BizHawk.Emulation.Common/VSystemID.cs
View File

@ -20,12 +20,10 @@ namespace BizHawk.Emulation.Common
public const string ChannelF = "ChannelF"; public const string ChannelF = "ChannelF";
public const string Coleco = "Coleco"; public const string Coleco = "Coleco";
public const string DEBUG = "DEBUG"; public const string DEBUG = "DEBUG";
public const string DGB = "DGB";
public const string GB = "GB"; public const string GB = "GB";
public const string GB3x = "GB3x";
public const string GB4x = "GB4x";
public const string GBA = "GBA"; public const string GBA = "GBA";
public const string GBC = "GBC"; public const string GBC = "GBC";
public const string GBL = "GBL";
public const string GEN = "GEN"; public const string GEN = "GEN";
public const string GG = "GG"; public const string GG = "GG";
public const string GGL = "GGL"; public const string GGL = "GGL";

2
src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink/GBHawkLink.IEmulator.cs
View File

@ -225,7 +225,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink
public int Frame => _frame; public int Frame => _frame;
public string SystemId => VSystemID.Raw.DGB; public string SystemId => VSystemID.Raw.GBL;
public bool DeterministicEmulation { get; set; } public bool DeterministicEmulation { get; set; }

2
src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink/GBHawkLink.cs
View File

@ -25,7 +25,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink
public bool do_frame_fill; public bool do_frame_fill;
[CoreConstructor(VSystemID.Raw.DGB)] [CoreConstructor(VSystemID.Raw.GBL)]
public GBHawkLink(CoreLoadParameters<GBHawkLink.GBLinkSettings, GBHawkLink.GBLinkSyncSettings> lp) public GBHawkLink(CoreLoadParameters<GBHawkLink.GBLinkSettings, GBHawkLink.GBLinkSyncSettings> lp)
{ {
if (lp.Roms.Count != 2) if (lp.Roms.Count != 2)

2
src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink3x/GBHawkLink3x.IEmulator.cs
View File

@ -420,7 +420,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink3x
public int Frame => _frame; public int Frame => _frame;
public string SystemId => VSystemID.Raw.GB3x; public string SystemId => VSystemID.Raw.GBL;
public bool DeterministicEmulation { get; set; } public bool DeterministicEmulation { get; set; }

2
src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink3x/GBHawkLink3x.cs
View File

@ -25,7 +25,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink3x
public bool do_frame_fill; public bool do_frame_fill;
[CoreConstructor(VSystemID.Raw.GB3x)] [CoreConstructor(VSystemID.Raw.GBL)]
public GBHawkLink3x(CoreLoadParameters<GBLink3xSettings, GBLink3xSyncSettings> lp) public GBHawkLink3x(CoreLoadParameters<GBLink3xSettings, GBLink3xSyncSettings> lp)
{ {
if (lp.Roms.Count != 3) if (lp.Roms.Count != 3)

2
src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink4x/GBHawkLink4x.IEmulator.cs
View File

@ -999,7 +999,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink4x
public int Frame => _frame; public int Frame => _frame;
public string SystemId => VSystemID.Raw.GB4x; public string SystemId => VSystemID.Raw.GBL;
public bool DeterministicEmulation { get; set; } public bool DeterministicEmulation { get; set; }

2
src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink4x/GBHawkLink4x.cs
View File

@ -46,7 +46,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink4x
public bool do_frame_fill; public bool do_frame_fill;
[CoreConstructor(VSystemID.Raw.GB4x)] [CoreConstructor(VSystemID.Raw.GBL)]
public GBHawkLink4x(CoreLoadParameters<GBLink4xSettings, GBLink4xSyncSettings> lp) public GBHawkLink4x(CoreLoadParameters<GBLink4xSettings, GBLink4xSyncSettings> lp)
{ {
if (lp.Roms.Count != 4) if (lp.Roms.Count != 4)

2
src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.IEmulator.cs
View File

@ -267,7 +267,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy
public int Frame { get; private set; } public int Frame { get; private set; }
public string SystemId => VSystemID.Raw.DGB; public string SystemId => VSystemID.Raw.GBL;
public bool DeterministicEmulation => LinkedDeterministicEmulation(); public bool DeterministicEmulation => LinkedDeterministicEmulation();

4
src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.cs
View File

@ -5,11 +5,11 @@ using BizHawk.Emulation.Common;
namespace BizHawk.Emulation.Cores.Nintendo.Gameboy namespace BizHawk.Emulation.Cores.Nintendo.Gameboy
{ {
[PortedCore(CoreNames.DualGambatte, "sinamas/natt")] [PortedCore(CoreNames.GambatteLink, "sinamas/natt")]
[ServiceNotApplicable(new[] { typeof(IDriveLight) })] [ServiceNotApplicable(new[] { typeof(IDriveLight) })]
public partial class GambatteLink : ILinkable, IRomInfo public partial class GambatteLink : ILinkable, IRomInfo
{ {
[CoreConstructor(VSystemID.Raw.DGB)] [CoreConstructor(VSystemID.Raw.GBL)]
public GambatteLink(CoreLoadParameters<GambatteLinkSettings, GambatteLinkSyncSettings> lp) public GambatteLink(CoreLoadParameters<GambatteLinkSettings, GambatteLinkSyncSettings> lp)
{ {
if (lp.Roms.Count < MIN_PLAYERS || lp.Roms.Count > MAX_PLAYERS) if (lp.Roms.Count < MIN_PLAYERS || lp.Roms.Count > MAX_PLAYERS)

4
src/BizHawk.Emulation.Cores/CoreNames.cs
View File

@ -19,9 +19,9 @@ namespace BizHawk.Emulation.Cores
public const string CPCHawk = "CPCHawk"; public const string CPCHawk = "CPCHawk";
public const string Cygne = "Cygne/Mednafen"; public const string Cygne = "Cygne/Mednafen";
public const string DobieStation = "DobieStation"; public const string DobieStation = "DobieStation";
public const string DualGambatte = "DualGambatte";
public const string Faust = "Faust"; 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 GbHawk = "GBHawk";
public const string GBHawkLink = "GBHawkLink"; public const string GBHawkLink = "GBHawkLink";
public const string GBHawkLink3x = "GBHawkLink3x"; public const string GBHawkLink3x = "GBHawkLink3x";

2
src/BizHawk.Emulation.Cores/vpads_schemata/DualGBSchema.cs
View File

@ -6,7 +6,7 @@ using BizHawk.Emulation.Common;
namespace BizHawk.Emulation.Cores namespace BizHawk.Emulation.Cores
{ {
[Schema(VSystemID.Raw.DGB)] [Schema(VSystemID.Raw.GBL)]
// ReSharper disable once UnusedMember.Global // ReSharper disable once UnusedMember.Global
public class DualGbSchema : IVirtualPadSchema public class DualGbSchema : IVirtualPadSchema
{ {

4
src/BizHawk.Emulation.Cores/vpads_schemata/GBSchema.cs
View File

@ -111,7 +111,7 @@ namespace BizHawk.Emulation.Cores
} }
} }
[Schema(VSystemID.Raw.GB3x)] [Schema(VSystemID.Raw.GBL)]
public class Gb3XSchema : GbSchema public class Gb3XSchema : GbSchema
{ {
public override IEnumerable<PadSchema> GetPadSchemas(IEmulator core, Action<string> showMessageBox) public override IEnumerable<PadSchema> GetPadSchemas(IEmulator core, Action<string> showMessageBox)
@ -123,7 +123,7 @@ namespace BizHawk.Emulation.Cores
} }
} }
[Schema(VSystemID.Raw.GB4x)] [Schema(VSystemID.Raw.GBL)]
public class Gb4XSchema : GbSchema public class Gb4XSchema : GbSchema
{ {
public override IEnumerable<PadSchema> GetPadSchemas(IEmulator core, Action<string> showMessageBox) public override IEnumerable<PadSchema> GetPadSchemas(IEmulator core, Action<string> showMessageBox)