From 8edb61eb52d8b6a3d46da8283f35ecfb846b1174 Mon Sep 17 00:00:00 2001 From: alyosha-tas Date: Thu, 14 Jun 2018 11:05:48 -0400 Subject: [PATCH] GBHawk: set to released and proper window time (tested on console) --- BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBC_PPU.cs | 2 +- BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.cs | 2 +- BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GB_PPU.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBC_PPU.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBC_PPU.cs index 6d85069d24..1988ff98fa 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBC_PPU.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBC_PPU.cs @@ -655,7 +655,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk window_latch = LCDC.Bit(5); // TODO: If Window is turned on midscanline what happens? When is this check done exactly? - if ((window_started && window_latch) || (window_is_reset && !window_latch && (LY > window_y))) + if ((window_started && window_latch) || (window_is_reset && !window_latch && (LY >= window_y))) { window_y_tile_inc++; if (window_y_tile_inc==8) diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.cs index ed6d09a237..1a65681be0 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.cs @@ -14,7 +14,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk "GBHawk", "", isPorted: false, - isReleased: false)] + isReleased: true)] [ServiceNotApplicable(typeof(IDriveLight))] public partial class GBHawk : IEmulator, ISaveRam, IDebuggable, IStatable, IInputPollable, IRegionable, IGameboyCommon, ISettable diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GB_PPU.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GB_PPU.cs index 535844ebc3..255cbf9d1b 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GB_PPU.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GB_PPU.cs @@ -426,7 +426,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk window_latch = LCDC.Bit(5); // TODO: If Window is turned on midscanline what happens? When is this check done exactly? - if ((window_started && window_latch) || (window_is_reset && !window_latch && (LY > window_y))) + if ((window_started && window_latch) || (window_is_reset && !window_latch && (LY >= window_y))) { window_y_tile_inc++; if (window_y_tile_inc==8)