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

Update Gambatte to fix RTC issues and output location of the DLL in the assets folder

This commit is contained in:
TiKevin83 2021-03-02 01:53:23 -05:00 committed by TiKevin83
parent 9ca1b86316
commit b2893d24c6
4 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Assets/dll/libgambatte.dll
View File

Binary file not shown.

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

@ -60,16 +60,14 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy
switch (_syncSettings.ConsoleMode) switch (_syncSettings.ConsoleMode)
{ {
case GambatteSyncSettings.ConsoleModeType.GB: case GambatteSyncSettings.ConsoleModeType.GB:
flags |= LibGambatte.LoadFlags.FORCE_DMG;
break; break;
case GambatteSyncSettings.ConsoleModeType.GBC: case GambatteSyncSettings.ConsoleModeType.GBC:
flags |= LibGambatte.LoadFlags.CGB_MODE;
break; break;
case GambatteSyncSettings.ConsoleModeType.GBA: case GambatteSyncSettings.ConsoleModeType.GBA:
flags |= LibGambatte.LoadFlags.GBA_CGB; flags |= LibGambatte.LoadFlags.CGB_MODE | LibGambatte.LoadFlags.GBA_FLAG;
break; break;
default: default:
if (game.System == "GB")
flags |= LibGambatte.LoadFlags.FORCE_DMG;
break; break;
} }
@ -86,18 +84,18 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy
byte[] bios; byte[] bios;
string biosSystemId; string biosSystemId;
string biosId; string biosId;
if ((flags & LibGambatte.LoadFlags.FORCE_DMG) == LibGambatte.LoadFlags.FORCE_DMG) if ((flags & LibGambatte.LoadFlags.CGB_MODE) == LibGambatte.LoadFlags.CGB_MODE)
{
biosSystemId = "GB";
biosId = "World";
IsCgb = false;
}
else
{ {
biosSystemId = "GBC"; biosSystemId = "GBC";
biosId = _syncSettings.ConsoleMode == GambatteSyncSettings.ConsoleModeType.GBA ? "AGB" : "World"; biosId = _syncSettings.ConsoleMode == GambatteSyncSettings.ConsoleModeType.GBA ? "AGB" : "World";
IsCgb = true; IsCgb = true;
} }
else
{
biosSystemId = "GB";
biosId = "World";
IsCgb = false;
}
if (_syncSettings.EnableBIOS) if (_syncSettings.EnableBIOS)
{ {

6
src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/LibGambatte.cs
View File

@ -20,10 +20,10 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy
[Flags] [Flags]
public enum LoadFlags : uint public enum LoadFlags : uint
{ {
/// <summary>Treat the ROM as not having CGB support regardless of what its header advertises</summary> /// <summary>Treat the ROM as having CGB support regardless of what its header advertises</summary>
FORCE_DMG = 1, CGB_MODE = 1,
/// <summary>Use GBA intial CPU register values when in CGB mode.</summary> /// <summary>Use GBA intial CPU register values when in CGB mode.</summary>
GBA_CGB = 2, GBA_FLAG = 2,
/// <summary>Use heuristics to detect and support some multicart MBCs disguised as MBC1.</summary> /// <summary>Use heuristics to detect and support some multicart MBCs disguised as MBC1.</summary>
MULTICART_COMPAT = 4 MULTICART_COMPAT = 4
} }

2
submodules/gambatte

@ -1 +1 @@
Subproject commit bfac3302a0a26ba306b873e538d03168d4c4716f Subproject commit 0bbe14d99f7e529bf119461965b26b988930ebe0