From 35e0b61ac3e34dd0ee24530cf5c7f1e76da88468 Mon Sep 17 00:00:00 2001 From: goyuken Date: Sat, 10 Nov 2012 01:59:13 +0000 Subject: [PATCH] NES: VRC6: support ines roms without hash id --- .../Consoles/Nintendo/NES/Boards/VRC6.cs | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/VRC6.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/VRC6.cs index fdd8edf262..29ed5e7542 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/VRC6.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/VRC6.cs @@ -68,21 +68,22 @@ namespace BizHawk.Emulation.Consoles.Nintendo switch (Cart.board_type) { case "MAPPER024": + newer_variant = false; break; case "MAPPER026": + newer_variant = true; break; case "KONAMI-VRC-6": - AssertPrg(256); AssertChr(128,256); AssertVram(0); AssertWram(0,8); + if (Cart.pcb == "351951") + newer_variant = false; + else if (Cart.pcb == "351949A") + newer_variant = true; + else throw new Exception("Unknown PCB type for VRC6"); break; default: return false; } - - if (Cart.pcb == "351951") - newer_variant = false; - else if (Cart.pcb == "351949A") - newer_variant = true; - else throw new Exception("Unknown PCB type for VRC6"); + AssertPrg(256); AssertChr(128, 256); AssertVram(0); AssertWram(0, 8); prg_bank_mask_8k = Cart.prg_size / 8 - 1; chr_bank_mask_1k = Cart.chr_size - 1;