From 7a805600054a0c9c80430a8d999c890205afe294 Mon Sep 17 00:00:00 2001 From: alyosha-tas Date: Wed, 22 May 2019 17:30:04 -0400 Subject: [PATCH] GBHawk: 10 second timeout if ppu not running --- .../Consoles/Nintendo/GBHawk/GBHawk.IEmulator.cs | 2 +- BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.cs | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.IEmulator.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.IEmulator.cs index ca42c1472e..8b22b682ee 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.IEmulator.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.IEmulator.cs @@ -161,7 +161,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk } ticker++; - // if (ticker > 10000000) { vblank_rise = true; }//throw new Exception("ERROR: Unable to Resolve Frame"); } + if (ticker > 42134400) { throw new Exception("ERROR: Unable to Resolve Frame"); } in_vblank_old = in_vblank; REG_FF0F_OLD = REG_FF0F; diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.cs index 00e89a039e..cf3a5123f2 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.cs @@ -158,10 +158,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk Buffer.BlockCopy(rom, 0x100, header, 0, 0x50); - string hash_md5 = null; - hash_md5 = "md5:" + rom.HashMD5(0, rom.Length); - Console.WriteLine(hash_md5); - + Console.WriteLine("MD5: " + rom.HashMD5(0, rom.Length)); + Console.WriteLine("SHA1: " + rom.HashSHA1(0, rom.Length)); _rom = rom; Setup_Mapper();