From da1e7cd24e6195a8d8f0c1c821fdfe553a1fe5c4 Mon Sep 17 00:00:00 2001 From: barbudreadmon Date: Thu, 31 Oct 2024 16:41:09 +0100 Subject: [PATCH] MAME 0.270 sync (nmk, vsystem) --- src/burn/drv/pst90s/d_aerofgt.cpp | 2 +- src/burn/drv/pst90s/d_nmk16.cpp | 54 ++++++++++++++++++++++++------- 2 files changed, 43 insertions(+), 13 deletions(-) diff --git a/src/burn/drv/pst90s/d_aerofgt.cpp b/src/burn/drv/pst90s/d_aerofgt.cpp index 9697e50edf..94f0003c18 100644 --- a/src/burn/drv/pst90s/d_aerofgt.cpp +++ b/src/burn/drv/pst90s/d_aerofgt.cpp @@ -4924,7 +4924,7 @@ STD_ROM_FN(pspikesc) struct BurnDriver BurnDrvPspikesc = { "pspikesc", "pspikes", NULL, NULL, "1991", - "Power Spikes (China)\0", NULL, "bootleg", "Miscellaneous", + "Power Spikes (China, bootleg)\0", NULL, "bootleg", "Miscellaneous", NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE | BDF_BOOTLEG | BDF_HISCORE_SUPPORTED, 2, HARDWARE_MISC_POST90S, GBF_SPORTSMISC, 0, NULL, pspikescRomInfo, pspikescRomName, NULL, NULL, NULL, NULL, PspikesInputInfo, PspikescDIPInfo, diff --git a/src/burn/drv/pst90s/d_nmk16.cpp b/src/burn/drv/pst90s/d_nmk16.cpp index 0c02d93d15..63bf580885 100644 --- a/src/burn/drv/pst90s/d_nmk16.cpp +++ b/src/burn/drv/pst90s/d_nmk16.cpp @@ -8539,8 +8539,8 @@ static struct BurnRomInfo bjtwinRomDesc[] = { { "93087-7.bin", 0x100000, 0x8da67808, 7 | BRF_SND }, // 6 OKI2 Samples - { "8.bpr", 0x000100, 0x633ab1c9, 0 | BRF_OPT }, // 7 Unused proms - { "9.bpr", 0x000100, 0x435653a2, 0 | BRF_OPT }, // 8 + { "8.ic37", 0x000100, 0x633ab1c9, 0 | BRF_OPT }, // 7 Vtiming + { "9.ic51", 0x000100, 0x435653a2, 0 | BRF_OPT }, // 8 Htiming { "nmk-215.bin", 0x002000, 0xd355a06f, 0 | BRF_OPT }, // 9 MCU }; @@ -8603,8 +8603,9 @@ static struct BurnRomInfo bjtwinaRomDesc[] = { { "93087-7.bin", 0x100000, 0x8da67808, 7 | BRF_SND }, // 6 OKI2 Samples - { "8.bpr", 0x000100, 0x633ab1c9, 0 | BRF_OPT }, // 7 Unused proms - { "9.bpr", 0x000100, 0x435653a2, 0 | BRF_OPT }, // 8 + { "8.ic37", 0x000100, 0x633ab1c9, 0 | BRF_OPT }, // 7 Vtiming + + { "9.ic51", 0x000100, 0x435653a2, 0 | BRF_OPT }, // 8 Htiming { "nmk-215.bin", 0x002000, 0xd355a06f, 0 | BRF_OPT }, // 9 MCU }; @@ -8643,7 +8644,11 @@ static struct BurnRomInfo bjtwinpRomDesc[] = { { "top.ic30", 0x080000, 0xab50531d, 6 | BRF_SND }, // 9 { "top.ic27", 0x080000, 0xadb2f256, 7 | BRF_SND }, // 10 OKI2 Samples - { "bottom.ic27", 0x080000, 0x6ebeb9e4, 7 | BRF_SND }, // 11 + { "bottom.ic27", 0x080000, 0x6ebeb9e4, 7 | BRF_SND }, // 11 + + { "8.ic37", 0x000100, 0x633ab1c9, 0 | BRF_OPT }, // 12 Vtiming + + { "9.ic51", 0x000100, 0x435653a2, 0 | BRF_OPT }, // 13 Htiming }; STD_ROM_PICK(bjtwinp) @@ -8712,7 +8717,11 @@ static struct BurnRomInfo bjtwinpaRomDesc[] = { { "top.ic27", 0x080000, 0xadb2f256, 7 | BRF_SND }, // 10 OKI2 Samples { "bottom.ic27", 0x080000, 0x6ebeb9e4, 7 | BRF_SND }, // 11 - { "nmk-215.bin", 0x002000, 0xd355a06f, 0 | BRF_OPT }, // 12 MCU + { "8.ic37", 0x000100, 0x633ab1c9, 0 | BRF_OPT }, // 12 Vtiming + + { "9.ic51", 0x000100, 0x435653a2, 0 | BRF_OPT }, // 13 Htiming + + { "nmk-215.bin", 0x002000, 0xd355a06f, 0 | BRF_OPT }, // 14 MCU }; STD_ROM_PICK(bjtwinpa) @@ -8777,7 +8786,11 @@ static struct BurnRomInfo nouryokuRomDesc[] = { { "ic27.7", 0x100000, 0x8a69fded, 7 | BRF_SND }, // 6 OKI2 Samples - { "nmk-215.bin", 0x002000, 0xd355a06f, 0 | BRF_OPT }, // 7 MCU + { "8.ic37", 0x000100, 0x633ab1c9, 0 | BRF_OPT }, // 7 Vtiming + + { "9.ic51", 0x000100, 0x435653a2, 0 | BRF_OPT }, // 8 Htiming + + { "nmk-215.bin", 0x002000, 0xd355a06f, 0 | BRF_OPT }, // 9 MCU }; STD_ROM_PICK(nouryoku) @@ -8844,7 +8857,11 @@ static struct BurnRomInfo nouryokupRomDesc[] = { { "soundpcm1.top.ic30", 0x080000, 0xa8d2abf7, 6 | BRF_SND }, // 12 { "soundpcm2.top.ic27", 0x080000, 0x29d0a15d, 7 | BRF_SND }, // 13 OKI2 Samples - { "soundpcm3.bottom.ic27", 0x080000, 0xc764e749, 7 | BRF_SND }, // 13 OKI2 Samples + { "soundpcm3.bottom.ic27", 0x080000, 0xc764e749, 7 | BRF_SND }, // 14 OKI2 Samples + + { "8.ic37", 0x000100, 0x633ab1c9, 0 | BRF_OPT }, // 15 Vtiming + + { "9.ic51", 0x000100, 0x435653a2, 0 | BRF_OPT }, // 16 Htiming }; STD_ROM_PICK(nouryokup) @@ -10176,7 +10193,11 @@ static struct BurnRomInfo hachamfRomDesc[] = { { "91076-3.45", 0x080000, 0xb25ed93b, 7 | BRF_SND }, // 7 OKI2 Samples - { "nmk-113.bin", 0x004000, 0xf3072715, 0 | BRF_OPT }, // 8 MCU + { "82s135.ic50", 0x000100, 0x633ab1c9, 0 | BRF_OPT }, // 8 Vtiming + + { "82s129.ic51", 0x000100, 0xcfdbb86c, 0 | BRF_OPT }, // 9 Htiming + + { "nmk-113.bin", 0x004000, 0xf3072715, 0 | BRF_OPT }, // 10 MCU }; STDROMPICKEXT(hachamf, hachamf, nmk004) @@ -10264,7 +10285,11 @@ static struct BurnRomInfo hachamfaRomDesc[] = { { "91076-3.45", 0x080000, 0xb25ed93b, 7 | BRF_SND }, // 7 OKI2 Samples - { "nmk-113.bin", 0x004000, 0xf3072715, 0 | BRF_OPT }, // 8 MCU + { "82s135.ic50", 0x000100, 0x633ab1c9, 0 | BRF_OPT }, // 8 Vtiming + + { "82s129.ic51", 0x000100, 0xcfdbb86c, 0 | BRF_OPT }, // 9 Htiming + + { "nmk-113.bin", 0x004000, 0xf3072715, 0 | BRF_OPT }, // 10 MCU }; STDROMPICKEXT(hachamfa, hachamfa, nmk004) @@ -10298,6 +10323,10 @@ static struct BurnRomInfo hachamfbRomDesc[] = { { "91076-2.46", 0x080000, 0x3f1e67f2, 6 | BRF_SND }, // 6 OKI1 Samples { "91076-3.45", 0x080000, 0xb25ed93b, 7 | BRF_SND }, // 7 OKI2 Samples + + { "82s135.ic50", 0x000100, 0x633ab1c9, 0 | BRF_OPT }, // 8 Vtiming + + { "82s129.ic51", 0x000100, 0xcfdbb86c, 0 | BRF_OPT }, // 9 Htiming }; STDROMPICKEXT(hachamfb, hachamfb, nmk004) @@ -10380,8 +10409,9 @@ static struct BurnRomInfo hachamfpRomDesc[] = { { "kf-a1.ic1", 0x80000, 0xd945aabb, 7 | BRF_SND }, // 9 OKI2 Samples - { "82s135.ic50", 0x00100, 0x633ab1c9, 8 | BRF_OPT }, // 10 proms - { "82s129.ic51", 0x00100, 0xcfdbb86c, 8 | BRF_OPT }, // 11 + { "82s135.ic50", 0x000100, 0x633ab1c9, 0 | BRF_OPT }, // 10 Vtiming + + { "82s129.ic51", 0x000100, 0xcfdbb86c, 0 | BRF_OPT }, // 11 Htiming }; STDROMPICKEXT(hachamfp, hachamfp, nmk004)