all repos — mgba @ 0234cb07b8d64bf0979d17927350db4f07f44d3b

mGBA Game Boy Advance Emulator

GB Memory: Fix OAM DMA from top 8 kB
Vicki Pfau vi@endrift.com
Tue, 16 Jun 2020 23:06:32 -0700
commit

0234cb07b8d64bf0979d17927350db4f07f44d3b

parent

d2f84e625b824c329b1653ad9cd178e83eb88bfd

5 files changed, 4 insertions(+), 4 deletions(-)

jump to
M CHANGES → CHANGES 
@@ -1,5 +1,6 @@
 0.8.3: (Future)
 Emulation fixes:
+ - GB Memory: Fix OAM DMA from top 8 kB
  - GB MBC: Fix MBC1 RAM enable bit selection
  - GB MBC: Fix MBC2 bit selection
D cinema/gb/mooneye-gb/acceptance/oam_dma/sources-dmgABCmgbS/manifest.yml 
@@ -1,1 +0,0 @@
-fail: true
M src/gb/io.c → src/gb/io.c 
@@ -191,7 +191,7 @@ }
 	GBIOWrite(gb, REG_SCY, 0x00);
 	GBIOWrite(gb, REG_SCX, 0x00);
 	GBIOWrite(gb, REG_LYC, 0x00);
-	GBIOWrite(gb, REG_DMA, 0xFF);
+	gb->memory.io[REG_DMA] = 0xFF;
 	GBIOWrite(gb, REG_BGP, 0xFC);
 	if (gb->model < GB_MODEL_CGB) {
 		GBIOWrite(gb, REG_OBP0, 0xFF);
M src/gb/memory.c → src/gb/memory.c 
@@ -519,8 +519,8 @@ }
 }
 
 void GBMemoryDMA(struct GB* gb, uint16_t base) {
-	if (base > 0xF100) {
-		return;
+	if (base >= 0xE000) {
+		base &= 0xDFFF;
 	}
 	mTimingDeschedule(&gb->timing, &gb->memory.dmaEvent);
 	mTimingSchedule(&gb->timing, &gb->memory.dmaEvent, 8);