all repos — mgba @ 0f9c4bbe60d4c30e10ac0d15d5c653297c51e034

mGBA Game Boy Advance Emulator

GBA Memory: Fix writing to OBJ memory in modes 3 and 5
Vicki Pfau vi@endrift.com
Tue, 30 Apr 2019 17:45:38 -0700
commit

0f9c4bbe60d4c30e10ac0d15d5c653297c51e034

parent

fbe375fab992cb4bb2fbc005ed26bc488ccb3389

2 files changed, 2 insertions(+), 1 deletions(-)

jump to
M CHANGES → CHANGES 
@@ -20,6 +20,7 @@ - GBA DMA: Fix DMA0-2 lengths (fixes mgba.io/i/1344)
  - GB Video: Fix window y changing mid-window (fixes mgba.io/i/1345)
  - GB Video: Fix more window edge cases (fixes mgba.io/i/1346)
  - GB Timer: Fix timing adjustments when writing to TAC (fixes mgba.io/i/1340)
+ - GBA Memory: Fix writing to OBJ memory in modes 3 and 5
 Other fixes:
  - Qt: More app metadata fixes
  - Qt: Fix load recent from archive (fixes mgba.io/i/1325)
M src/gba/memory.c → src/gba/memory.c 
@@ -938,7 +938,7 @@ case REGION_PALETTE_RAM:
 		GBAStore16(cpu, address & ~1, ((uint8_t) value) | ((uint8_t) value << 8), cycleCounter);
 		break;
 	case REGION_VRAM:
-		if ((address & 0x0001FFFF) >= ((GBARegisterDISPCNTGetMode(gba->memory.io[REG_DISPCNT >> 1]) == 4) ? 0x00014000 : 0x00010000)) {
+		if ((address & 0x0001FFFF) >= ((GBARegisterDISPCNTGetMode(gba->memory.io[REG_DISPCNT >> 1]) >= 3) ? 0x00014000 : 0x00010000)) {
 			// TODO: check BG mode
 			mLOG(GBA_MEM, GAME_ERROR, "Cannot Store8 to OBJ: 0x%08X", address);
 			break;