From 196aaaa7ed3cbc996a563b93375401390aae791d Mon Sep 17 00:00:00 2001
From: Lior Halphon <LIJI32@gmail.com>
Date: Sat, 22 Jan 2022 16:56:32 +0200
Subject: [PATCH] Conflicts don't happen in the first 6 T-cycles

---
 Core/memory.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Core/memory.c b/Core/memory.c
index 762e169..da72ebe 100644
--- 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;