From d929891c975eef4f91af022dd7895beaab13a7e8 Mon Sep 17 00:00:00 2001
From: nattthebear <goyuken@gmail.com>
Date: Sun, 21 Feb 2021 09:24:02 -0500
Subject: [PATCH] Something something mapper 90 out of bounds

Closes #2632
---
 .../Consoles/Nintendo/NES/Boards/Mapper090.cs               | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper090.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper090.cs
index b80ba9e7b0..34589eb75f 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper090.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper090.cs
@@ -510,7 +510,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
 
 		public override byte ReadExp(int addr)
 		{
-			switch (addr & 0x1807)
+			addr &= 0x1807;
+			switch (addr)
 			{
 				case 0x1000:
 					int value = dipswitch_0 ? 0x80 : 0x00;
@@ -527,12 +528,13 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
 				case 0x1807:
 					return ram_bytes[addr - 0x1803];
 				default:
-					return base.ReadExp(addr);
+					return NES.DB;
 			}
 		}
 
 		public override void WriteExp(int addr, byte value)
 		{
+			addr &= 0x1807;
 			switch (addr)
 			{
 				case 0x1800: