Max/SameBoy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Forgot to emulate LCDC bit 0!

Browse Source
This commit is contained in:
Lior Halphon 2016-09-18 21:00:05 +03:00
parent fe51805ed7
commit ed31358934
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Core/display.c
View File

@ -45,7 +45,22 @@ static uint32_t get_pixel(GB_gameboy_t *gb, uint8_t x, uint8_t y)
uint8_t lowest_sprite_x = 0xFF; uint8_t lowest_sprite_x = 0xFF;
bool use_obp1 = false, priority = false; bool use_obp1 = false, priority = false;
bool in_window = false; bool in_window = false;
if (gb->effective_window_enabled && (gb->io_registers[GB_IO_LCDC] & 0x20)) { /* Window Enabled */ bool window_enabled = (gb->io_registers[GB_IO_LCDC] & 0x20);
bool bg_enabled = true;
bool bg_behind = false;
if ((gb->io_registers[GB_IO_LCDC] & 0x1) == 0) {
if (gb->cgb_mode) {
bg_behind = true;
}
else if (gb->is_cgb) { /* CGB in DMG mode*/
bg_enabled = window_enabled = false;
}
else {
/* DMG */
bg_enabled = false;
}
}
if (gb->effective_window_enabled && window_enabled) { /* Window Enabled */
if (y >= gb->effective_window_y && x + 7 >= gb->io_registers[GB_IO_WX]) { if (y >= gb->effective_window_y && x + 7 >= gb->io_registers[GB_IO_WX]) {
in_window = true; in_window = true;
} }
@ -118,7 +133,7 @@ static uint32_t get_pixel(GB_gameboy_t *gb, uint8_t x, uint8_t y)
} }
if (attributes & 0x80) { if (attributes & 0x80) {
priority = true; priority = !bg_behind && bg_enabled;
} }
if (!priority && sprite_pixel) { if (!priority && sprite_pixel) {
@ -129,6 +144,10 @@ static uint32_t get_pixel(GB_gameboy_t *gb, uint8_t x, uint8_t y)
return gb->sprite_palletes_rgb[sprite_palette * 4 + sprite_pixel]; return gb->sprite_palletes_rgb[sprite_palette * 4 + sprite_pixel];
} }
if (!bg_enabled) {
return gb->background_palletes_rgb[0];
}
if (gb->io_registers[GB_IO_LCDC] & 0x10) { if (gb->io_registers[GB_IO_LCDC] & 0x10) {
tile_address = tile * 0x10; tile_address = tile * 0x10;
} }