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

GB minor clean ups

This commit is contained in:
alyosha-tas 2018-01-16 20:00:42 -05:00
parent 5b17e5b958
commit 296b88f155
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.ISettable.cs
View File

@ -44,8 +44,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
Gr Gr
} }
[DisplayName("Console Mode")] [DisplayName("Color Mode")]
[Description("Pick which console to run, 'Auto' chooses from ROM header, 'GB' and 'GBC' chooses the respective system")] [Description("Pick Between Green scale and Grey scale colors")]
[DefaultValue(PaletteType.BW)] [DefaultValue(PaletteType.BW)]
public PaletteType Palette { get; set; } public PaletteType Palette { get; set; }

2
BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.cs
View File

@ -88,7 +88,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
_syncSettings = (GBSyncSettings)syncSettings ?? new GBSyncSettings(); _syncSettings = (GBSyncSettings)syncSettings ?? new GBSyncSettings();
_controllerDeck = new GBHawkControllerDeck(_syncSettings.Port1); _controllerDeck = new GBHawkControllerDeck(_syncSettings.Port1);
byte[] Bios = comm.CoreFileProvider.GetFirmware("GB", "World", false, "BIOS Not Found, Cannot Load"); byte[] Bios = comm.CoreFileProvider.GetFirmware("GB", "World", true, "BIOS Not Found, Cannot Load");
if (Bios == null) if (Bios == null)
{ {

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

@ -95,7 +95,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy
if ((flags & LibGambatte.LoadFlags.FORCE_DMG) == LibGambatte.LoadFlags.FORCE_DMG) if ((flags & LibGambatte.LoadFlags.FORCE_DMG) == LibGambatte.LoadFlags.FORCE_DMG)
{ {
byte[] Bios = comm.CoreFileProvider.GetFirmware("GB", "World", false, "BIOS Not Found, Cannot Load"); byte[] Bios = comm.CoreFileProvider.GetFirmware("GB", "World", true, "BIOS Not Found, Cannot Load");
if (LibGambatte.gambatte_loaddmgbios(GambatteState, Bios) != 0) if (LibGambatte.gambatte_loaddmgbios(GambatteState, Bios) != 0)
{ {
@ -104,7 +104,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy
} }
else else
{ {
byte[] Bios = comm.CoreFileProvider.GetFirmware("GBC", "World", false, "BIOS Not Found, Cannot Load"); byte[] Bios = comm.CoreFileProvider.GetFirmware("GBC", "World", true, "BIOS Not Found, Cannot Load");
if (LibGambatte.gambatte_loadgbcbios(GambatteState, Bios) != 0) if (LibGambatte.gambatte_loadgbcbios(GambatteState, Bios) != 0)
{ {