mirror/bsnes
1
0
Fork 0
mirror of https://github.com/bsnes-emu/bsnes.git synced 2025-09-02 00:43:05 +02:00
Code Issues Projects Releases Wiki Activity

Handle single-color OBP values better in the object viewer

Browse Source
This commit is contained in:
Lior Halphon
2024-12-03 23:34:04 +02:00
parent aa5fc484d1
commit 4c904d11ff
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Core/display.c
View File

@@ -2389,6 +2389,14 @@ uint8_t GB_get_oam_info(GB_gameboy_t *gb, GB_oam_info_t *dest, uint8_t *object_h
if (GB_is_cgb(gb) && (flags & 0x8)) {
vram_address += 0x2000;
}
uint8_t dmg_palette = gb->io_registers[palette? GB_IO_OBP1:GB_IO_OBP0];
if (dmg_palette == 0xFF) {
dmg_palette = 0xFC;
}
else if (dmg_palette == 0x00) {
dmg_palette = 0x03;
}
for (unsigned y = 0; y < *object_height; y++) {
unrolled for (unsigned x = 0; x < 8; x++) {
@@ -2396,7 +2404,7 @@ uint8_t GB_get_oam_info(GB_gameboy_t *gb, GB_oam_info_t *dest, uint8_t *object_h
((gb->vram[vram_address + 1] >> ((~x)&7)) & 1) << 1 );
if (!gb->cgb_mode) {
color = (gb->io_registers[palette? GB_IO_OBP1:GB_IO_OBP0] >> (color << 1)) & 3;
color = (dmg_palette >> (color << 1)) & 3;
}
dest[i].image[((flags & 0x20)?7-x:x) + ((flags & 0x40)?*object_height - 1 -y:y) * 8] = gb->object_palettes_rgb[palette * 4 + color];
}