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

gambatte: make RTC run at the correct 59.7fps instead of 60fps

This commit is contained in:
goyuken 2014-05-12 04:08:22 +00:00
parent f6243d919b
commit 93b710e4ab
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,6 +5,7 @@ using System.IO;
using BizHawk.Common; using BizHawk.Common;
using BizHawk.Emulation.Common; using BizHawk.Emulation.Common;
using Newtonsoft.Json; using Newtonsoft.Json;
using System.ComponentModel;
namespace BizHawk.Emulation.Cores.Nintendo.Gameboy namespace BizHawk.Emulation.Cores.Nintendo.Gameboy
{ {
@ -43,10 +44,12 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy
uint GetCurrentTime() uint GetCurrentTime()
{ {
uint fn = (uint)Frame; ulong fn = (ulong)Frame;
fn /= 60; // exactly 60 fps. in case you feel bad about it, remember that we're not exactly tracking cpu cycles either. // as we're exactly tracking cpu cycles, this can be pretty accurate
fn *= 4389;
fn /= 262144;
fn += zerotime; fn += zerotime;
return fn; return (uint)fn;
} }
public Gameboy(CoreComm comm, GameInfo game, byte[] romdata, object Settings, object SyncSettings) public Gameboy(CoreComm comm, GameInfo game, byte[] romdata, object Settings, object SyncSettings)
@ -966,11 +969,11 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy
public class GambatteSyncSettings public class GambatteSyncSettings
{ {
[System.ComponentModel.Description("Force the game to run on DMG hardware, even if it's detected as a CGB game. Relevant for games that are \"CGB Enhanced\" but do not require CGB.")] [Description("Force the game to run on DMG hardware, even if it's detected as a CGB game. Relevant for games that are \"CGB Enhanced\" but do not require CGB.")]
public bool ForceDMG { get; set; } public bool ForceDMG { get; set; }
[System.ComponentModel.Description("Emulate GBA hardware running a CGB game, instead of CGB hardware. Relevant only for titles that detect the presense of a GBA, such as Shantae.")] [Description("Emulate GBA hardware running a CGB game, instead of CGB hardware. Relevant only for titles that detect the presense of a GBA, such as Shantae.")]
public bool GBACGB { get; set; } public bool GBACGB { get; set; }
[System.ComponentModel.Description("Use special compatibility hacks for certain multicart games. Relevant only for specific multicarts.")] [Description("Use special compatibility hacks for certain multicart games. Relevant only for specific multicarts.")]
public bool MulticartCompat { get; set; } public bool MulticartCompat { get; set; }
public static GambatteSyncSettings GetDefaults() public static GambatteSyncSettings GetDefaults()