libretro/Mesen
1
0
Fork 0
mirror of https://github.com/libretro/Mesen.git synced 2025-02-20 00:20:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backport PPU - reading palette while grayscale is on should return grayscale palette colors

Browse Source
This commit is contained in:
vailkyte 2023-05-18 08:32:04 -05:00 committed by GitHub
parent 8f23a95009
commit 86e77b6a2b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Core/PPU.cpp
View File

@ -304,7 +304,7 @@ uint8_t PPU::PeekRAM(uint16_t addr)
returnValue = _memoryReadBuffer;
if((_state.VideoRamAddr & 0x3FFF) >= 0x3F00 && !_settings->CheckFlag(EmulationFlags::DisablePaletteRead)) {
returnValue = ReadPaletteRAM(_state.VideoRamAddr) | (_openBus & 0xC0);
returnValue = (ReadPaletteRAM(_state.VideoRamAddr) & _paletteRamMask) | (_openBus & 0xC0);
openBusMask = 0xC0;
} else {
openBusMask = 0x00;
@ -361,7 +361,8 @@ uint8_t PPU::ReadRAM(uint16_t addr)
_memoryReadBuffer = ReadVram(_ppuBusAddress & 0x3FFF, MemoryOperationType::Read);
if((_ppuBusAddress & 0x3FFF) >= 0x3F00 && !_settings->CheckFlag(EmulationFlags::DisablePaletteRead)) {
returnValue = ReadPaletteRAM(_ppuBusAddress) | (_openBus & 0xC0);
//Note: When grayscale is turned on, the read values also have the grayscale mask applied to them
returnValue = (ReadPaletteRAM(_ppuBusAddress) & _paletteRamMask) | (_openBus & 0xC0);
openBusMask = 0xC0;
} else {
openBusMask = 0x00;