git.y1.nz

commit 29e920697ab10344d9f37f9b67cc2dca0cab95a9
parent 22afa576c2196fb04340e3c748a736977e45b517
Author: Lior Halphon <LIJI32@gmail.com>
Date:   Sat, 18 Feb 2023 22:30:35 +0200

Object aborts are DMG only, commit 34cf0f5 accidentally made them happen on CGB

Diffstat:
M
Core/memory.c
2
+-

1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Core/memory.c b/Core/memory.c
@@ -1489,7 +1489,7 @@ static void write_high_memory(GB_gameboy_t *gb, uint16_t addr, uint8_t value)
                     GB_lcd_off(gb);
                 }
                 /* Handle disabling objects while already fetching an object */
-                if ((gb->io_registers[GB_IO_LCDC] & GB_LCDC_OBJ_EN) && !(value & GB_LCDC_OBJ_EN)) {
+                if (!GB_is_cgb(gb) && (gb->io_registers[GB_IO_LCDC] & GB_LCDC_OBJ_EN) && !(value & GB_LCDC_OBJ_EN)) {
                     if (gb->during_object_fetch) {
                         gb->cycles_for_line += gb->display_cycles / 2;
                         gb->display_cycles = 0;

This webpage is intended to be an accessible preview of this repository. To get a fuller picture, clone it and use the git CLI.