From 1d6a6030f514f8ed9d787b1b4f246189338204d5 Mon Sep 17 00:00:00 2001 From: goyuken Date: Wed, 13 Aug 2014 21:49:28 +0000 Subject: [PATCH] vba next: RTC should be functional now. maybe. --- .../Consoles/Nintendo/GBA/VBANext.cs | 7 +++++-- output/dll/libvbanext.dll | Bin 442880 -> 442880 bytes vbanext/instance.cpp | 4 +--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/VBANext.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/VBANext.cs index 0b5f4d5f1e..2fe873e8ba 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/VBANext.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/VBANext.cs @@ -31,8 +31,11 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA LibVBANext.FrontEndSettings FES = new LibVBANext.FrontEndSettings(); FES.saveType = (LibVBANext.FrontEndSettings.SaveType)gi.GetInt("saveType", 0); FES.flashSize = (LibVBANext.FrontEndSettings.FlashSize)gi.GetInt("flashSize", 0x10000); - FES.enableRtc = gi.GetInt("enableRtc", 0) != 0; - FES.mirroringEnable = gi.GetInt("mirroringEnable", 0) != 0; + FES.enableRtc = gi.GetInt("rtcEnabled", 0) != 0; + FES.mirroringEnable = gi.GetInt("mirroringEnabled", 0) != 0; + + Console.WriteLine("GameDB loaded settings: saveType={0}, flashSize={1}, rtcEnabled={2}, mirroringEnabled={3}", + FES.saveType, FES.flashSize, FES.enableRtc, FES.mirroringEnable); _SyncSettings = (SyncSettings)_SS ?? new SyncSettings(); DeterministicEmulation = deterministic; diff --git a/output/dll/libvbanext.dll b/output/dll/libvbanext.dll index 7d237e9fc2a7bce773da85bc117dc146498f91a3..209d1a06e833ff9bd52181fdf5533cb0ea3c005c 100644 GIT binary patch delta 6717 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 delta 6803 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 SyncState(NewState *ns) NSS(skipBios); NSS(cpuSaveType); - NSS(enableRtc); NSS(mirroringEnable); NSS(cpuDmaCount); @@ -13253,7 +13251,7 @@ templatebool SyncBatteryRam(NewState *ns) cpuSaveType = settings.cpuSaveType; flashSize = settings.flashSize; - enableRtc = settings.enableRtc; + rtcEnabled = settings.enableRtc; mirroringEnable = settings.mirroringEnable; skipBios = settings.skipBios;