diff --git a/BizHawk.Emulation/Consoles/Nintendo/Docs/compatibility.txt b/BizHawk.Emulation/Consoles/Nintendo/Docs/compatibility.txt index 0042995705..71757f091e 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/Docs/compatibility.txt +++ b/BizHawk.Emulation/Consoles/Nintendo/Docs/compatibility.txt @@ -124,4 +124,5 @@ Open bus and bus conflict emulation is not considered complete or thorough in an 242 Misc (CN) Complete 243 Misc Nothing 245 Pirate Junk -246 Misc (CN) Nothing \ No newline at end of file +246 Misc (CN) Nothing +248 Misc (CN) {{See 115}} \ No newline at end of file diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper115.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper115.cs index ce22d9a34c..199d7d61be 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper115.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper115.cs @@ -4,6 +4,9 @@ using System.Diagnostics; namespace BizHawk.Emulation.Consoles.Nintendo { + //this class also handles mapper 248 + //FCEUX uses 115 to implement 248 as well (as of 09-apr-2012 it does it buggily in the case of Bao Qing Tian (As)) + //VirtuaNES has its own class that implements 248. I think it's wrong (MAME and/or MESS may have switched to using 115 at some point) public class Mapper115 : MMC3Board_Base { public override bool Configure(NES.EDetectionOrigin origin) @@ -12,6 +15,7 @@ namespace BizHawk.Emulation.Consoles.Nintendo switch (Cart.board_type) { case "MAPPER115": + case "MAPPER248": break; default: return false; diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/iNES.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/iNES.cs index 883f380140..64f06d4a92 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/iNES.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/iNES.cs @@ -118,6 +118,7 @@ static string ClassifyTable = @" 232 -1 -1 -1 -1 MAPPER232 240 -1 -1 -1 -1 MAPPER240 242 -1 -1 -1 -1 MAPPER242 +248 -1 -1 -1 -1 MAPPER248 "; }