From a8fd85157c2df9d71ee5a70ef9b30fba0a0980cb Mon Sep 17 00:00:00 2001 From: SaxxonPike Date: Tue, 9 Jul 2019 08:02:55 -0500 Subject: [PATCH] VIC: Use correct color mapping for non-multicolor bitmap mode --- .../Computers/Commodore64/MOS/Vic.Parse.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Vic.Parse.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Vic.Parse.cs index af86811337..68639f8f10 100644 --- a/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Vic.Parse.cs +++ b/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Vic.Parse.cs @@ -119,11 +119,13 @@ } else { - _parseSrData0 = _bitmapMode ? 0 : _dataG; - _parseSrData1 = _dataG; + _parseSrData0 = _parseSrData1 = _dataG; } _srData1 |= _parseSrData1 << _parseSrShift; + if (_bitmapMode && !_multicolorMode) + _parseSrData1 ^= 0xFF; + // graphics color shift register _srColor0 &= ~(0xFF << _parseSrShift); _srColor1 &= ~(0xFF << _parseSrShift);