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

Don't ignore mGBA skip BIOS setting when recording (resolves #2465) 

also disable skip BIOS with TAS profile and enable with Casual profile
also removed `DeterministicEmulation ||= !SkipBios`, does it matter?
This commit is contained in:
YoshiRulz 2022-11-03 11:58:19 +10:00
parent 77f824ab55
commit c891cc2cb5
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/BizHawk.Client.EmuHawk/config/ProfileConfig.cs
View File

@ -10,6 +10,7 @@ using BizHawk.Emulation.Cores.Sega.MasterSystem;
using BizHawk.Emulation.Cores.ColecoVision;
using BizHawk.Emulation.Cores.Atari.Atari2600;
using BizHawk.Emulation.Cores.Nintendo.Gameboy;
using BizHawk.Emulation.Cores.Nintendo.GBA;
namespace BizHawk.Client.EmuHawk
{
@ -142,6 +143,11 @@ namespace BizHawk.Client.EmuHawk
var s = GetSyncSettings<Gameboy, Gameboy.GambatteSyncSettings>();
s.EnableBIOS = false;
PutSyncSettings<Gameboy>(s);
// GBA
var mGBASettings = GetSyncSettings<MGBAHawk, MGBAHawk.SyncSettings>();
mGBASettings.SkipBios = true;
PutSyncSettings<MGBAHawk>(mGBASettings);
}
private void SetLongPlay()
@ -221,7 +227,11 @@ namespace BizHawk.Client.EmuHawk
var s = GetSyncSettings<Gameboy, Gameboy.GambatteSyncSettings>();
s.EnableBIOS = true;
PutSyncSettings<Gameboy>(s);
// GBA
var mGBASettings = GetSyncSettings<MGBAHawk, MGBAHawk.SyncSettings>();
mGBASettings.SkipBios = false;
PutSyncSettings<MGBAHawk>(mGBASettings);
}
private void SetN64Tas()

4
src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/MGBAHawk.cs
View File

@ -32,14 +32,14 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA
if (bios is { Length: not 0x4000 }) throw new InvalidOperationException("BIOS must be exactly 16384 bytes!");
if (deterministic && bios is null) throw new MissingFirmwareException("A BIOS is required for deterministic recordings!");
DeterministicEmulation = deterministic
|| (bios is not null && !_syncSettings.RTCUseRealTime && !_syncSettings.SkipBios); // in this case, the core is deterministic even though it wasn't asked to be
|| (bios is not null && !_syncSettings.RTCUseRealTime); // in this case, the core is deterministic even though it wasn't asked to be
Core = LibmGBA.BizCreate(
bios,
file,
file.Length,
GetOverrideInfo(_syncSettings),
skipBios: _syncSettings.SkipBios && !DeterministicEmulation);
skipBios: _syncSettings.SkipBios);
if (Core == IntPtr.Zero)
{
throw new InvalidOperationException($"{nameof(LibmGBA.BizCreate)}() returned NULL! Bad BIOS? and/or ROM?");