From f251492a21331aaa01bc7cf556aa3c6b128ed70a Mon Sep 17 00:00:00 2001 From: alyosha-tas Date: Mon, 14 Jun 2021 22:12:41 -0400 Subject: [PATCH] GBHawk: revert innacurate changes to window state, window timing needs to be fixed instead --- .../Consoles/Nintendo/GBHawk/GBC_GB_PPU.cs | 9 +++++---- .../Consoles/Nintendo/GBHawk/GBC_PPU.cs | 8 ++++---- .../Consoles/Nintendo/GBHawk/GB_PPU.cs | 8 ++++---- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBC_GB_PPU.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBC_GB_PPU.cs index 22fcdd4ef0..97e79b2048 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBC_GB_PPU.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBC_GB_PPU.cs @@ -200,6 +200,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk case 0xFF4A: // WY window_y = value; window_y_read = window_y; + if (!window_started && (!LCDC.Bit(7) || (value > LY))) { window_y_latch = window_y; @@ -1900,12 +1901,12 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk BGP = 0xFF; obj_pal_0 = 0; obj_pal_1 = 0; - window_y = 0xFF; - window_x = 0xFF; + window_y = 0; + window_x = 0; window_y_read = 0; window_x_read = 0; - window_x_latch = 0xFF; - window_y_latch = 0xFF; + window_y_latch = 0; + window_x_latch = 0; LY_inc = 1; no_scan = false; OAM_access_read = true; diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBC_PPU.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBC_PPU.cs index 756a45c14f..5b777d3380 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBC_PPU.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBC_PPU.cs @@ -1845,12 +1845,12 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk BGP = 0xFF; obj_pal_0 = 0; obj_pal_1 = 0; - window_y = 0xFF; - window_x = 0xFF; + window_y = 0; + window_x = 0; window_y_read = 0; window_x_read = 0; - window_x_latch = 0xFF; - window_y_latch = 0xFF; + window_y_latch = 0; + window_x_latch = 0; LY_inc = 1; no_scan = false; OAM_access_read = true; diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GB_PPU.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GB_PPU.cs index 3b757dd8ad..bbc9e36d7c 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GB_PPU.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GB_PPU.cs @@ -1271,12 +1271,12 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk BGP = 0xFF; obj_pal_0 = 0xFF; obj_pal_1 = 0xFF; - window_y = 0xFF; - window_x = 0xFF; + window_y = 0; + window_x = 0; window_y_read = 0; window_x_read = 0; - window_x_latch = 0xFF; - window_y_latch = 0xFF; + window_y_latch = 0; + window_x_latch = 0; LY_inc = 1; no_scan = false; OAM_access_read = true;