From 7e7713c95507e46f8f686510880ad19f31f8381b Mon Sep 17 00:00:00 2001 From: alyosha-tas Date: Thu, 24 Sep 2020 17:26:50 -0400 Subject: [PATCH] GBHawk: fix color displayed when BG is off --- .../Consoles/Nintendo/GBHawk/GBC_GB_PPU.cs | 2 +- src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GB_PPU.cs | 2 +- 2 files changed, 2 insertions(+), 2 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 4397f7915a..662c00f84a 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 @@ -891,7 +891,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk } else { - pixel = 0; + pixel = BGP & 3; } } 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 ba60ecde7a..507203a40d 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GB_PPU.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GB_PPU.cs @@ -558,7 +558,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk } else { - pixel = 0; + pixel = BGP & 3; } // now we have the BG pixel, we next need the sprite pixel