From 1988a49e920f0d1521bcfa4c1d39a5881cab4e10 Mon Sep 17 00:00:00 2001
From: Jeffrey Pfau <jeffrey@endrift.com>
Date: Sat, 24 Dec 2016 21:22:29 -0800
Subject: [PATCH] GB Memory: Reset ROM bank when loading a ROM

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

diff --git a/CHANGES b/CHANGES
index c8dc6dafe..76ad8b769 100644
--- a/CHANGES
+++ b/CHANGES
@@ -37,6 +37,7 @@ Misc:
  - PSP2: Improved controller rumble
  - GB, GBA: Prevent loading null ROMs
  - GB Audio: Initialize wave RAM to GBC values
+ - GB Memory: Reset ROM bank when loading a ROM
 
 0.5.1: (2016-10-05)
 Bugfixes:
diff --git a/src/gb/gb.c b/src/gb/gb.c
index 39ff04046..d9c61f9f6 100644
--- a/src/gb/gb.c
+++ b/src/gb/gb.c
@@ -105,6 +105,7 @@ bool GBLoadROM(struct GB* gb, struct VFile* vf) {
 	gb->memory.romBase = gb->memory.rom;
 	gb->memory.romSize = gb->pristineRomSize;
 	gb->romCrc32 = doCrc32(gb->memory.rom, gb->memory.romSize);
+	GBMBCSwitchBank(&gb->memory, gb->memory.currentBank);
 
 	if (gb->cpu) {
 		struct LR35902Core* cpu = gb->cpu;