From 31db5f9d05a966672564e1d32970a741e3845221 Mon Sep 17 00:00:00 2001 From: "andres.delikat" Date: Fri, 3 Aug 2012 14:12:04 +0000 Subject: [PATCH] NES - better handling of bus conflicts for AOROM board, fixes Wheel of Fortune --- .../Consoles/Nintendo/NES/Boards/AxROM.cs | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/AxROM.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/AxROM.cs index a49eb069bd..2da8a13fa1 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/AxROM.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/AxROM.cs @@ -32,19 +32,22 @@ namespace BizHawk.Emulation.Consoles.Nintendo case "NES-AN1ROM": //R.C. Pro-Am AssertPrg(64); AssertChr(0); AssertVram(8); AssertWram(0); - bus_conflict = false; - break; + bus_conflict = false; + break; case "NES-AMROM": //time lord AssertPrg(128); AssertChr(0); AssertVram(8); AssertWram(0); - bus_conflict = true; - break; + bus_conflict = true; + break; case "NES-AOROM": //battletoads case "HVC-AOROM": - AssertPrg(128,256); AssertChr(0); AssertVram(8); AssertWram(0); - bus_conflict = true; //MAYBE. apparently it varies - break; + AssertPrg(128,256); AssertChr(0); AssertVram(8); AssertWram(0); + if (Cart.pcb == "NES-AOROM-03") //Battle toads = 03, and needs bus_conflict. Wheel of Fortune is 01 and does not. Thus assuming 03 always needs it and 01 and 02 do not. Until there are test cases that suggest otherwise + { + bus_conflict = true; //MAYBE. apparently it varies + } + break; default: return false;