From 56d7b299dec3eca43f419daae62ccb4824ddf680 Mon Sep 17 00:00:00 2001
From: goyuken <goyuken@4bbf4f03-6f44-549e-7e59-35d4b0962838>
Date: Tue, 28 May 2013 20:01:09 +0000
Subject: [PATCH] NES: MMC3: fix some worthless mario hack.  i don't like this
 particularly

---
 .../Consoles/Nintendo/NES/Boards/MMC3_family/MMC3.cs           | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/MMC3.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/MMC3.cs
index 35764c5008..bd60ae9517 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/MMC3.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/MMC3.cs
@@ -332,7 +332,8 @@ namespace BizHawk.Emulation.Consoles.Nintendo
 		protected virtual int MapCHR(int addr)
 		{
 			int bank_1k = Get_CHRBank_1K(addr);
-			bank_1k &= chr_mask;
+			// allow NPOT chr sizes
+			bank_1k %= chr_mask + 1;
 			addr = (bank_1k << 10) | (addr & 0x3FF);
 			return addr;
 		}