From b02e40d5a2865a97fa4e65c940660e74baa44fdd Mon Sep 17 00:00:00 2001 From: Lior Halphon Date: Sun, 25 Feb 2018 23:23:55 +0200 Subject: [PATCH] Refinement to that last fix --- Core/memory.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Core/memory.c b/Core/memory.c index dca92aa..2bd8215 100644 --- a/Core/memory.c +++ b/Core/memory.c @@ -110,10 +110,11 @@ static uint8_t read_banked_ram(GB_gameboy_t *gb, uint16_t addr) static uint8_t read_high_memory(GB_gameboy_t *gb, uint16_t addr) { + if (gb->hdma_on) { + return gb->last_opcode_read; + } + if (addr < 0xFE00) { - if (gb->hdma_on) { - return gb->last_opcode_read; - } return gb->ram[addr & 0x0FFF]; }