diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper046.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper046.cs
index 34083db996..b217aee2a7 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper046.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper046.cs
@@ -8,7 +8,6 @@ namespace BizHawk.Emulation.Consoles.Nintendo
 	class Mapper046 : NES.NESBoardBase
 	{
 		//Rumblestation 15-in-1 (Unl).nes
-		//TODO: WHy does the gamedb entry fail?
 
 		/*
 			Regs at $6000-7FFF means no PRG-RAM.
@@ -43,8 +42,7 @@ namespace BizHawk.Emulation.Consoles.Nintendo
 		{
 			if (addr < 0x2000)
 			{
-				//TODO: High bits
-				return VROM[addr + (chr_bank_8k_L * 0x2000)];
+				return VROM[addr + (((chr_bank_8k_H << 3) + chr_bank_8k_L) * 0x2000)];
 			}
 			else return base.ReadPPU(addr);
 		}
@@ -52,7 +50,7 @@ namespace BizHawk.Emulation.Consoles.Nintendo
 		public override byte ReadPRG(int addr)
 		{
 			//TODO: High bits
-			return ROM[addr + (prg_bank_32k_L * 0x8000)];
+			return ROM[addr + ((prg_bank_32k_H << 1) + prg_bank_32k_L * 0x8000)];
 		}
 
 		public override bool Configure(NES.EDetectionOrigin origin)
@@ -60,7 +58,7 @@ namespace BizHawk.Emulation.Consoles.Nintendo
 			//configure
 			switch (Cart.board_type)
 			{
-				case "MAPPER046":
+				case "Mapper046":
 					break;
 				default:
 					return false;
diff --git a/BizHawk.MultiClient/output/gamedb.txt b/BizHawk.MultiClient/output/gamedb.txt
index cb07f5be73..9f7bd1d13a 100644
--- a/BizHawk.MultiClient/output/gamedb.txt
+++ b/BizHawk.MultiClient/output/gamedb.txt
@@ -94,7 +94,7 @@ sha1:536D623BA02A622BDE8E2D7D514AE9785B5E0357	H	Punch Out!! Kirby (Hack) (U)	NES
 sha1:334DCB823B480957057C2B4C72686BE26823C12A	V	Fighting Hero (Unl)	NES		board=Mapper193;PRG=128;CHR=256;WRAM=8
 sha1:D09EF8127C64CBE817B45DF33C4D43E7B441E381		Final Fantasy V (Unl)	NES		board=Mapper164;PRG=512;CHR=0;WRAM=8;PRAM=8
 sha1:92D9695FEB774F60965A8303CFE3E6AAEE7B7B62		Magic Dragon (Unl)	NES		board=Mapper107;PRG=128;CHR=64;WRAM=8;PAD_H=1
-sha1:E2F19D010DE7FED40C2591C3966BA5A137935249		15-in-1 (Unl)	NES		board=Mapper046;PRG=128;CHR=64;WRAM=0
+sha1:6DF9AECF5787C0833B0F05A9A83D0E58A6153977		Rumblestation 15-in-1 (Unl)	NES		board=Mapper046;PRG=1024;CHR=1024;WRAM=0
 
 #include gamedb_neshomebrew.txt
 #include gamedb_user.txt