From 16e2aec6df0114eba7b6996d20409c643d004451 Mon Sep 17 00:00:00 2001
From: Jeffrey Pfau <jeffrey@endrift.com>
Date: Fri, 6 Nov 2015 21:07:29 -0800
Subject: [PATCH] GBA Memory: Fix Store8 to OBJ VRAM

---
 CHANGES          | 1 +
 src/gba/memory.c | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 6d4408b4f..86b6788ef 100644
--- a/CHANGES
+++ b/CHANGES
@@ -20,6 +20,7 @@ Bugfixes:
  - ARM7: Fix sign of unaligned LDRSH
  - GBA BIOS: Fix CpuSet on 0x01XXXXXX addresses
  - GBA Memory: Fix DMA behavior for SRAM accesses
+ - GBA Memory: Fix Store8 to OBJ VRAM
 Misc:
  - Qt: Window size command line options are now supported
  - Qt: Increase usability of key mapper
diff --git a/src/gba/memory.c b/src/gba/memory.c
index 48f105c6b..f4a743503 100644
--- a/src/gba/memory.c
+++ b/src/gba/memory.c
@@ -811,7 +811,7 @@ void GBAStore8(struct ARMCore* cpu, uint32_t address, int8_t value, int* cycleCo
 		GBAStore16(cpu, address & ~1, ((uint8_t) value) | ((uint8_t) value << 8), cycleCounter);
 		break;
 	case REGION_VRAM:
-		if (address >= 0x06018000) {
+		if ((address & 0x0001FFFF) >= 0x00010000) {
 			// TODO: check BG mode
 			GBALog(gba, GBA_LOG_GAME_ERROR, "Cannot Store8 to OBJ: 0x%08X", address);
 			break;