From a4e29886c9aab8a54a1232bac1bf4a4b7eb1b3db Mon Sep 17 00:00:00 2001
From: Jeffrey Pfau <jeffrey@endrift.com>
Date: Fri, 22 Apr 2016 22:58:59 -0700
Subject: [PATCH] GBA Memory: Better fix for OBJ VRAM code

---
 src/gba/memory.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/gba/memory.c b/src/gba/memory.c
index eb8a7b561..fe251a791 100644
--- a/src/gba/memory.c
+++ b/src/gba/memory.c
@@ -276,12 +276,12 @@ static void GBASetActiveRegion(struct ARMCore* cpu, uint32_t address) {
 		cpu->memory.activeMask = SIZE_PALETTE_RAM - 1;
 		break;
 	case REGION_VRAM:
-		if (address < 0x06010000) {
-			cpu->memory.activeRegion = (uint32_t*) gba->video.renderer->vram;
-			cpu->memory.activeMask = 0x0000FFFF;
-		} else {
+		if (address & 0x10000) {
 			cpu->memory.activeRegion = (uint32_t*) &gba->video.renderer->vram[0x8000];
 			cpu->memory.activeMask = 0x00007FFF;
+		} else {
+			cpu->memory.activeRegion = (uint32_t*) gba->video.renderer->vram;
+			cpu->memory.activeMask = 0x0000FFFF;
 		}
 		break;
 	case REGION_OAM: