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

Make IsCGBDMGMode actually work for movies

This commit is contained in:
CasualPokePlayer 2025-01-06 13:49:20 -08:00
parent 08e3246ec9
commit e4a4493843
3 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -401,7 +401,17 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy
#endif #endif
public bool IsCGBDMGMode public bool IsCGBDMGMode
#if true
{
get
{
var headerCgbCompat = LibGambatte.gambatte_cpuread(GambatteState, 0x143);
return (headerCgbCompat & 0x80) == 0 || (headerCgbCompat & 0x84) == 0x84;
}
}
#else
=> LibGambatte.gambatte_iscgbdmg(GambatteState); => LibGambatte.gambatte_iscgbdmg(GambatteState);
#endif
private InputCallbackSystem _inputCallbacks = new(); private InputCallbackSystem _inputCallbacks = new();

1
src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/IGameboyCommon.cs
View File

@ -24,7 +24,6 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.Gameboy
bool IsCGBMode { get; } bool IsCGBMode { get; }
/// <value><see langword="true"/> iff the emulator is currently emulating CGB in DMG compatibility mode</value> /// <value><see langword="true"/> iff the emulator is currently emulating CGB in DMG compatibility mode</value>
/// <remarks>NOTE: this mode does not take affect until the bootrom unmaps itself</remarks>
bool IsCGBDMGMode { get; } bool IsCGBDMGMode { get; }
/// <summary> /// <summary>

10
src/BizHawk.Emulation.Cores/Consoles/Nintendo/SameBoy/SameBoy.cs
View File

@ -38,7 +38,17 @@ namespace BizHawk.Emulation.Cores.Nintendo.Sameboy
=> IsCgb; //TODO inline => IsCgb; //TODO inline
public bool IsCGBDMGMode public bool IsCGBDMGMode
#if true
{
get
{
var headerCgbCompat = LibSameboy.sameboy_cpuread(SameboyState, 0x143);
return (headerCgbCompat & 0x80) == 0 || (headerCgbCompat & 0x84) == 0x84;
}
}
#else
=> LibSameboy.sameboy_iscgbdmg(SameboyState); => LibSameboy.sameboy_iscgbdmg(SameboyState);
#endif
private readonly LibSameboy.InputCallback _inputcb; private readonly LibSameboy.InputCallback _inputcb;