From 5d51f02110766f85ea5fd472df0946b1e7246f5d Mon Sep 17 00:00:00 2001
From: alyosha-tas <alexei.f.k@gmail.com>
Date: Sat, 24 Jun 2017 16:17:10 -0400
Subject: [PATCH] Gambatte: I was so close!

---
 libgambatte/src/mem/cartridge.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/libgambatte/src/mem/cartridge.cpp b/libgambatte/src/mem/cartridge.cpp
index 4117c86f54..cf5c06afc1 100644
--- a/libgambatte/src/mem/cartridge.cpp
+++ b/libgambatte/src/mem/cartridge.cpp
@@ -501,15 +501,11 @@ void Cartridge::setStatePtrs(SaveState &state) {
 	state.mem.vram.set(memptrs.vramdata(), memptrs.vramdataend() - memptrs.vramdata());
 	state.mem.sram.set(memptrs.rambankdata(), memptrs.rambankdataend() - memptrs.rambankdata());
 	state.mem.wram.set(memptrs.wramdata(0), memptrs.wramdataend() - memptrs.wramdata(0));
-	
 }
 
 void Cartridge::loadState(const SaveState &state) {
 	rtc.loadState(state);
 	mbc->loadState(state.mem);
-	//if (state.mem.using_bios) {
-	//	bios_remap(0);
-	//}
 }
 
 static void enforce8bit(unsigned char *data, unsigned long sz) {
@@ -793,6 +789,9 @@ SYNCFUNC(Cartridge)
 	if (using_bios) {
 		bios_remap(0);
 	}
+	else {
+		bios_remap(1);
+	}
 }
 
 }