Slightly more accurate

LIJI32 · Jul 26, 2024 · 5f71ec4 · 5f71ec4
1 parent 5eb0e5d
commit 5f71ec4
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/Core/display.c b/Core/display.c
@@ -1739,7 +1739,15 @@ void GB_display_run(GB_gameboy_t *gb, unsigned cycles, bool force)
                 if (!gb->wx_triggered && gb->wy_triggered && (gb->io_registers[GB_IO_LCDC] & GB_LCDC_WIN_ENABLE)) {
                     bool should_activate_window = false;
                     if (unlikely(gb->io_registers[GB_IO_WX] == 0)) {
-                        should_activate_window = (gb->position_in_line == (uint8_t)-16 && (gb->io_registers[GB_IO_SCX] & 7)) || (gb->position_in_line == (uint8_t)-7);
+                        if (gb->position_in_line == (uint8_t)-7) {
+                            should_activate_window = true;
+                        }
+                        else if (gb->position_in_line == (uint8_t)-16 && (gb->io_registers[GB_IO_SCX] & 7)) {
+                            should_activate_window = true;
+                        }
+                        else if (gb->position_in_line >= (uint8_t)-15 && gb->position_in_line <= (uint8_t)-8) {
+                            should_activate_window = true;
+                        }
                     }
                     else if (gb->io_registers[GB_IO_WX] < 166 + GB_is_cgb(gb)) {
                         if (gb->io_registers[GB_IO_WX] == (uint8_t) (gb->position_in_line + 7)) {