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

Finalise sysID name and alphabetise

This commit is contained in:
YoshiRulz 2023-03-11 08:46:16 +10:00 committed by Moritz Bender
parent 17a098dfa3
commit 1ca1f4a397
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/BizHawk.Emulation.Common/Database/Database.cs
View File

@ -251,7 +251,7 @@ namespace BizHawk.Emulation.Common
case ".BS": case ".BS":
if (SatellaviewFileTypeDetector.IsSatellaviewRom(romData, out var warnings)) if (SatellaviewFileTypeDetector.IsSatellaviewRom(romData, out var warnings))
{ {
game.System = VSystemID.Raw.BSX; game.System = VSystemID.Raw.Satellaview;
foreach (var s in warnings) Console.WriteLine(s); foreach (var s in warnings) Console.WriteLine(s);
} }
else else

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

@ -23,7 +23,6 @@ namespace BizHawk.Emulation.Common
[VSystemID.Raw.AmstradCPC] = "Amstrad CPC", [VSystemID.Raw.AmstradCPC] = "Amstrad CPC",
[VSystemID.Raw.AppleII] = "Apple II", [VSystemID.Raw.AppleII] = "Apple II",
[VSystemID.Raw.Arcade] = "Arcade", [VSystemID.Raw.Arcade] = "Arcade",
[VSystemID.Raw.BSX] = "Satellaview",
[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",
@ -53,6 +52,7 @@ namespace BizHawk.Emulation.Common
[VSystemID.Raw.PS2] = "PlayStation 2", [VSystemID.Raw.PS2] = "PlayStation 2",
[VSystemID.Raw.PSX] = "PlayStation", [VSystemID.Raw.PSX] = "PlayStation",
[VSystemID.Raw.SAT] = "Saturn", [VSystemID.Raw.SAT] = "Saturn",
[VSystemID.Raw.Satellaview] = "Satellaview",
[VSystemID.Raw.Sega32X] = "Genesis 32X", [VSystemID.Raw.Sega32X] = "Genesis 32X",
[VSystemID.Raw.SG] = "SG-1000", [VSystemID.Raw.SG] = "SG-1000",
[VSystemID.Raw.SGX] = "SuperGrafx", [VSystemID.Raw.SGX] = "SuperGrafx",

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

@ -20,7 +20,6 @@ namespace BizHawk.Emulation.Common
public const string AmstradCPC = "AmstradCPC"; public const string AmstradCPC = "AmstradCPC";
public const string AppleII = "AppleII"; public const string AppleII = "AppleII";
public const string Arcade = "Arcade"; public const string Arcade = "Arcade";
public const string BSX = "BSX";
public const string C64 = "C64"; public const string C64 = "C64";
public const string ChannelF = "ChannelF"; public const string ChannelF = "ChannelF";
public const string Coleco = "Coleco"; public const string Coleco = "Coleco";
@ -56,6 +55,7 @@ namespace BizHawk.Emulation.Common
public const string PSP = "PSP"; public const string PSP = "PSP";
public const string PSX = "PSX"; public const string PSX = "PSX";
public const string SAT = "SAT"; public const string SAT = "SAT";
public const string Satellaview = "BSX";
public const string Sega32X = "32X"; public const string Sega32X = "32X";
public const string SG = "SG"; public const string SG = "SG";
public const string SGB = "SGB"; public const string SGB = "SGB";

14
src/BizHawk.Emulation.Cores/Consoles/Nintendo/BSNES/BsnesCore.cs
View File

@ -15,9 +15,9 @@ namespace BizHawk.Emulation.Cores.Nintendo.BSNES
[ServiceNotApplicable(new[] { typeof(IDriveLight) })] [ServiceNotApplicable(new[] { typeof(IDriveLight) })]
public partial class BsnesCore : IEmulator, IDebuggable, IVideoProvider, ISaveRam, IStatable, IInputPollable, IRegionable, ISettable<BsnesCore.SnesSettings, BsnesCore.SnesSyncSettings>, IBSNESForGfxDebugger, IBoardInfo public partial class BsnesCore : IEmulator, IDebuggable, IVideoProvider, ISaveRam, IStatable, IInputPollable, IRegionable, ISettable<BsnesCore.SnesSettings, BsnesCore.SnesSyncSettings>, IBSNESForGfxDebugger, IBoardInfo
{ {
[CoreConstructor(VSystemID.Raw.Satellaview)]
[CoreConstructor(VSystemID.Raw.SGB)] [CoreConstructor(VSystemID.Raw.SGB)]
[CoreConstructor(VSystemID.Raw.SNES)] [CoreConstructor(VSystemID.Raw.SNES)]
[CoreConstructor(VSystemID.Raw.BSX)]
public BsnesCore(CoreLoadParameters<SnesSettings, SnesSyncSettings> loadParameters) : this(loadParameters, false) { } public BsnesCore(CoreLoadParameters<SnesSettings, SnesSyncSettings> loadParameters) : this(loadParameters, false) { }
public BsnesCore(CoreLoadParameters<SnesSettings, SnesSyncSettings> loadParameters, bool subframe = false) public BsnesCore(CoreLoadParameters<SnesSettings, SnesSyncSettings> loadParameters, bool subframe = false)
{ {
@ -86,7 +86,12 @@ namespace BizHawk.Emulation.Cores.Nintendo.BSNES
InitAudio(); InitAudio();
ser.Register<ISoundProvider>(_soundProvider); ser.Register<ISoundProvider>(_soundProvider);
if (SystemId == VSystemID.Raw.BSX) if (_isSGB)
{
Api.core.snes_load_cartridge_super_gameboy(sgbRomData, loadParameters.Roms[0].RomData,
sgbRomData!.Length, loadParameters.Roms[0].RomData.Length);
}
else if (SystemId is VSystemID.Raw.Satellaview)
{ {
SATELLAVIEW_CARTRIDGE slottedCartridge = _syncSettings.SatellaviewCartridge; SATELLAVIEW_CARTRIDGE slottedCartridge = _syncSettings.SatellaviewCartridge;
if (slottedCartridge == SATELLAVIEW_CARTRIDGE.Autodetect) if (slottedCartridge == SATELLAVIEW_CARTRIDGE.Autodetect)
@ -106,11 +111,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.BSNES
Api.core.snes_load_cartridge_bsmemory(cartridgeData, loadParameters.Roms[0].RomData, Api.core.snes_load_cartridge_bsmemory(cartridgeData, loadParameters.Roms[0].RomData,
cartridgeData.Length, loadParameters.Roms[0].RomData.Length); cartridgeData.Length, loadParameters.Roms[0].RomData.Length);
} }
else if (_isSGB)
{
Api.core.snes_load_cartridge_super_gameboy(sgbRomData, loadParameters.Roms[0].RomData,
sgbRomData!.Length, loadParameters.Roms[0].RomData.Length);
}
else else
{ {
Api.core.snes_load_cartridge_normal(loadParameters.Roms[0].RomData, loadParameters.Roms[0].RomData.Length); Api.core.snes_load_cartridge_normal(loadParameters.Roms[0].RomData, loadParameters.Roms[0].RomData.Length);

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

@ -8,9 +8,9 @@ namespace BizHawk.Emulation.Cores.Nintendo.BSNES
[ServiceNotApplicable(new[] { typeof(IDriveLight) })] [ServiceNotApplicable(new[] { typeof(IDriveLight) })]
public class SubBsnesCore : IEmulator, ICycleTiming public class SubBsnesCore : IEmulator, ICycleTiming
{ {
[CoreConstructor(VSystemID.Raw.Satellaview)]
[CoreConstructor(VSystemID.Raw.SGB)] [CoreConstructor(VSystemID.Raw.SGB)]
[CoreConstructor(VSystemID.Raw.SNES)] [CoreConstructor(VSystemID.Raw.SNES)]
[CoreConstructor(VSystemID.Raw.BSX)]
public SubBsnesCore(CoreLoadParameters<BsnesCore.SnesSettings, BsnesCore.SnesSyncSettings> loadParameters) public SubBsnesCore(CoreLoadParameters<BsnesCore.SnesSettings, BsnesCore.SnesSyncSettings> loadParameters)
{ {
_bsnesCore = new BsnesCore(loadParameters, true); _bsnesCore = new BsnesCore(loadParameters, true);