diff --git a/src/boards/116.cpp b/src/boards/116.cpp index 6efcbca9..4a833ac3 100644 --- a/src/boards/116.cpp +++ b/src/boards/116.cpp @@ -174,7 +174,7 @@ static void Sync(void) static DECLFW(UNLSL12ModeWrite) { -// FCEU_printf("%04X:%02X\n",A,V); + printf("%04X:%02X\n",A,V); if((A & 0x4100) == 0x4100) { mode = V; if(A&1) { // hacky hacky, there are two configuration modes on SOMARI HUANG-1 PCBs @@ -194,7 +194,11 @@ static DECLFW(UNLSL12ModeWrite) static DECLFW(UNLSL12Write) { -// FCEU_printf("%04X:%02X\n",A,V); + printf("%04X:%02X\n",A,V); + if(A==0xA123) + { + int zzz=9; + } switch(mode & 3) { case 0: { if((A>=0xB000)&&(A<=0xE003)) diff --git a/src/boards/datalatch.cpp b/src/boards/datalatch.cpp index 219011b6..fb52862d 100644 --- a/src/boards/datalatch.cpp +++ b/src/boards/datalatch.cpp @@ -19,6 +19,7 @@ */ #include "mapinc.h" +#include "ines.h" static uint8 latche, latcheinit, bus_conflict; static uint16 addrreg0, addrreg1; @@ -133,7 +134,8 @@ static void CNROMSync(void) void CNROM_Init(CartInfo *info) { - Latch_Init(info, CNROMSync, 0, 0x8000, 0xFFFF, 1, 1); + bool busc = MasterRomInfoParams.ContainsKey("busc"); + Latch_Init(info, CNROMSync, 0, 0x8000, 0xFFFF, 1, busc?1:0); } //------------------ ANROM --------------------------- diff --git a/src/ines.cpp b/src/ines.cpp index e3cab428..227e515a 100644 --- a/src/ines.cpp +++ b/src/ines.cpp @@ -311,9 +311,10 @@ static const TMasterRomInfo sMasterRomInfo[] = { { 0x8bb48490d8d22711LL, "bonus=0" }, //4-in-1 (FK23C8033)[p1][!].nes { 0xc75888d7b48cd378LL, "bonus=0" }, //4-in-1 (FK23C8043)[p1][!].nes { 0xf81a376fa54fdd69LL, "bonus=0" }, //4-in-1 (FK23Cxxxx, S-0210A PCB)[p1][!].nes + { 0x164eea6097a1e313LL, "busc=1" }, //Cybernoid - The Fighting Machine (U)[!].nes -- needs bus conflict emulation }; const TMasterRomInfo* MasterRomInfo; -std::map MasterRomInfoParams; +TMasterRomInfoParams MasterRomInfoParams; static void CheckHInfo(void) { @@ -393,7 +394,7 @@ static void CheckHInfo(void) CheckBad(partialmd5); MasterRomInfo = NULL; - MasterRomInfoParams = std::map(); + MasterRomInfoParams = TMasterRomInfoParams(); for(int i=0;i +{ +public: + bool ContainsKey(const std::string& key) { return find(key) != end(); } +}; //mbg merge 6/29/06 extern uint8 *ROM; @@ -84,7 +90,7 @@ extern int iNesSave(); //bbit Edited: line added extern int iNesSaveAs(char* name); extern char LoadedRomFName[2048]; //bbit Edited: line added extern const TMasterRomInfo* MasterRomInfo; -extern std::map MasterRomInfoParams; +extern TMasterRomInfoParams MasterRomInfoParams; //mbg merge 7/19/06 changed to c++ decl format struct iNES_HEADER {