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

The object enabled bit is checked only when popping from the object FIFO. Objects affect timing even when disabled.

This commit is contained in:
Lior Halphon 2018-03-23 19:50:19 +03:00
parent 04bfc89816
commit e9eeace995
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Core/display.c
View File

@ -357,6 +357,9 @@ static void render_pixel_if_possible(GB_gameboy_t *gb)
if (pixel && bg_priority) {
draw_oam = false;
}
else if ((gb->io_registers[GB_IO_LCDC] & 2) == 0) {
draw_oam = false;
}
if (!gb->cgb_mode) {
pixel = ((gb->io_registers[GB_IO_BGP] >> (pixel << 1)) & 3);
}
@ -537,7 +540,6 @@ void GB_display_run(GB_gameboy_t *gb, uint8_t cycles)
while (true) {
/* Handle objects */
while (gb->n_visible_objs != 0 &&
(gb->io_registers[GB_IO_LCDC] & 2) != 0 &&
objects[gb->visible_objs[gb->n_visible_objs - 1]].x == (uint8_t)(gb->position_in_line + 8)) {
if (!gb->fetching_objects) {