From 070064dd78b943d72e2a34b7a648a2be0b9bc3a0 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Fri, 23 Dec 2016 16:40:50 -0800 Subject: [PATCH] GB Memory: Fix HDMA5 value after DMA completes --- CHANGES | 1 + src/gb/memory.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index decc39c70..dd284443c 100644 --- a/CHANGES +++ b/CHANGES @@ -30,6 +30,7 @@ Bugfixes: - Qt: Fix Apply button for key and controller configurations - GB Video: Initialize LCDC in renderer - GBA I/O: Mask off WAITCNT bits that cannot be written + - GB Memory: Fix HDMA5 value after DMA completes Misc: - PSP2: Improved controller rumble - GB, GBA: Prevent loading null ROMs diff --git a/src/gb/memory.c b/src/gb/memory.c index 019fc93f6..bd6657dea 100644 --- a/src/gb/memory.c +++ b/src/gb/memory.c @@ -437,7 +437,7 @@ void _GBMemoryHDMAService(struct GB* gb) { gb->memory.isHdma = false; } } else { - gb->memory.io[REG_HDMA5] |= 0x80; + gb->memory.io[REG_HDMA5] = 0xFF; } } }