From f7dd4430fb92a46261fe1c332837c77a7071a392 Mon Sep 17 00:00:00 2001 From: negative Date: Fri, 11 Feb 2022 19:16:19 +0800 Subject: [PATCH] Only enable bus conflict for submapper 2 (mapper 2, mapper 3) Fix https://github.com/TASEmulators/fceux/issues/460 https://wiki.nesdev.org/w/index.php?title=NES_2.0_submappers#002.2C_003.2C_007:_UxROM.2C_CNROM.2C_AxROM --- src/boards/datalatch.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/boards/datalatch.cpp b/src/boards/datalatch.cpp index c9e9c985..026354d3 100644 --- a/src/boards/datalatch.cpp +++ b/src/boards/datalatch.cpp @@ -180,7 +180,7 @@ static void UNROMSync(void) { } void UNROM_Init(CartInfo *info) { - Latch_Init(info, UNROMSync, 0, 0x8000, 0xFFFF, 0, 1); + Latch_Init(info, UNROMSync, 0, 0x8000, 0xFFFF, 0, info->ines2 && info->submapper == 2); } //------------------ Map 3 --------------------------- @@ -192,7 +192,7 @@ static void CNROMSync(void) { } void CNROM_Init(CartInfo *info) { - Latch_Init(info, CNROMSync, 0, 0x8000, 0xFFFF, 1, 1); + Latch_Init(info, CNROMSync, 0, 0x8000, 0xFFFF, 1, info->ines2 && info->submapper == 2); } //------------------ Map 7 ---------------------------