From cd4c7900500bb690de251e08b8e21c9ef5a3b984 Mon Sep 17 00:00:00 2001
From: Jeffrey Pfau <jeffrey@endrift.com>
Date: Sat, 10 Jan 2015 04:43:58 -0800
Subject: [PATCH] GBA Memory: Fix open bus 16-bit loads

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

diff --git a/src/gba/gba-memory.c b/src/gba/gba-memory.c
index 3ddc061ed..5de5be05a 100644
--- a/src/gba/gba-memory.c
+++ b/src/gba/gba-memory.c
@@ -292,14 +292,14 @@ uint32_t GBALoad16(struct ARMCore* cpu, uint32_t address, int* cycleCounter) {
 				LOAD_16(value, address, memory->bios);
 			} else {
 				GBALog(gba, GBA_LOG_GAME_ERROR, "Bad BIOS Load16: 0x%08X", address);
-				value = memory->biosPrefetch;
+				value = memory->biosPrefetch & 0xFFFF;
 			}
 		} else {
 			GBALog(gba, GBA_LOG_GAME_ERROR, "Bad memory Load16: 0x%08X", address);
 			if (cpu->cycles >= cpu->nextEvent) {
-				value = gba->bus;
+				value = gba->bus & 0xFFFF;
 			} else {
-				value = cpu->prefetch[1];
+				value = cpu->prefetch[1] & 0xFFFF;
 			}
 		}
 		break;