git.y1.nz

commit 196aaaa7ed3cbc996a563b93375401390aae791d
parent 8676a7c7bcdf4d418b07b49e466e7d0fb63889fc
Author: Lior Halphon <LIJI32@gmail.com>
Date:   Sat, 22 Jan 2022 16:56:32 +0200

Conflicts don't happen in the first 6 T-cycles

Diffstat:
M
Core/memory.c
2
+-

1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Core/memory.c b/Core/memory.c
@@ -252,7 +252,7 @@ void GB_trigger_oam_bug_read(GB_gameboy_t *gb, uint16_t address)
 static bool is_addr_in_dma_use(GB_gameboy_t *gb, uint16_t addr)
 {
     if (!GB_is_dma_active(gb) || addr >= 0xfe00) return false;
-    if (gb->dma_current_dest == 0xFF) return false; // Warm up
+    if (gb->dma_current_dest == 0xFF || gb->dma_current_dest == 0x0) return false; // Warm up
     if (addr >= 0xfe00) return false;
     if (gb->dma_current_src == addr) return false; // Shortcut for DMA access flow
     if (gb->dma_current_src > 0xe000 && (gb->dma_current_src & ~0x2000) == addr) return false;

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