From 00ed13b983b9ef7ba63298de3a678476792649c2 Mon Sep 17 00:00:00 2001 From: ClawGrip Date: Sun, 24 Jan 2021 13:19:51 +0100 Subject: [PATCH 1/4] nmk16.cpp: Fixed 'redhawks' bad graphics, and added placeholders for undumped PROMs and PLDs. (#7696) --- src/mame/drivers/nmk16.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/mame/drivers/nmk16.cpp b/src/mame/drivers/nmk16.cpp index 763895a4c29..9889dfb829d 100644 --- a/src/mame/drivers/nmk16.cpp +++ b/src/mame/drivers/nmk16.cpp @@ -7633,6 +7633,14 @@ ROM_START( redhawks ) ROM_REGION( 0x40000, "oki1", 0 ) // Samples ROM_LOAD( "5.bin", 0x00000, 0x40000, CRC(e911ce33) SHA1(a29c4dea98a22235122303325c63c15fadd3431d) ) + + ROM_REGION( 0x300, "proms", 0 ) // Bipolar PROMs, not dumped + ROM_LOAD( "n82s147an.bin", 0x000, 0x200, NO_DUMP ) + ROM_LOAD( "n82s129n.bin", 0x200, 0x100, NO_DUMP ) + + ROM_REGION( 0x26e, "plds", 0 ) // PLDs, not dumped + ROM_LOAD( "gal16v8d.bin", 0x000, 0x117, NO_DUMP ) + ROM_LOAD( "gal20v8b.bin", 0x117, 0x157, NO_DUMP ) ROM_END void afega_state::init_redhawkg() @@ -8658,7 +8666,7 @@ GAME( 1995, dolmen, 0, twinactn, dolmen, nmk16_state, init_ GAME( 1998, stagger1, 0, stagger1, stagger1, afega_state, empty_init, ROT270, "Afega", "Stagger I (Japan)", 0 ) GAME( 1997, redhawk, stagger1, stagger1, stagger1, afega_state, init_redhawk, ROT270, "Afega (New Vision Ent. license)", "Red Hawk (USA, Canada & South America)", 0 ) GAME( 1997, redhawki, stagger1, redhawki, stagger1, afega_state, init_redhawki, ROT0, "Afega (Hae Dong Corp license)", "Red Hawk (horizontal, Italy)", 0 ) // bootleg? strange scroll regs -GAME( 1997, redhawks, stagger1, stagger1, stagger1, afega_state, empty_init, ROT0, "Afega (Hae Dong Corp license)", "Red Hawk (horizontal, Spain)", 0 ) +GAME( 1997, redhawks, stagger1, redhawki, stagger1, afega_state, empty_init, ROT0, "Afega (Hae Dong Corp license)", "Red Hawk (horizontal, Spain)", 0 ) GAME( 1997, redhawkg, stagger1, redhawki, stagger1, afega_state, init_redhawkg, ROT0, "Afega", "Red Hawk (horizontal, Greece)", 0 ) GAME( 1997, redhawke, stagger1, stagger1, stagger1, afega_state, empty_init, ROT270, "Afega (Excellent Co. license)", "Red Hawk (Excellent Co., Ltd)", 0 ) // earlier revision? different afega logo and score and credit number fonts compared to other sets GAME( 1997, redhawkk, stagger1, stagger1, stagger1, afega_state, empty_init, ROT270, "Afega", "Red Hawk (Korea)", 0 ) From 295fb9b4021c19f45c4a11499b39ce02583c758b Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Mon, 25 Jan 2021 04:06:29 +1100 Subject: [PATCH 2/4] Renamed chip8 software list so the filename matches the list name. Also corrected a few titles, mostly in psx.xml. --- hash/{chip8.xml => chip8_quik.xml} | 0 hash/psx.xml | 14 ++++++++------ src/mame/drivers/d6800.cpp | 2 +- src/mame/drivers/funworld.cpp | 2 +- src/mame/drivers/tmc1800.cpp | 2 +- src/mame/drivers/vip.cpp | 2 +- 6 files changed, 12 insertions(+), 10 deletions(-) rename hash/{chip8.xml => chip8_quik.xml} (100%) diff --git a/hash/chip8.xml b/hash/chip8_quik.xml similarity index 100% rename from hash/chip8.xml rename to hash/chip8_quik.xml diff --git a/hash/psx.xml b/hash/psx.xml index 07679578f7f..9747c4fa78c 100644 --- a/hash/psx.xml +++ b/hash/psx.xml @@ -41661,7 +41661,7 @@ The entries in this section are intended to replace the existing "low-grade" Jap --> - Densha Daisuki - Play Rail ga Ippai (Jpn) + Densha Daisuki - Plarail ga Ippai (Jpn) 1998 Tomy @@ -44007,11 +44007,12 @@ The entries in this section are intended to replace the existing "low-grade" Jap --> - ΓΑΛΕΟΖ (Jpn) + GALEOZ (Jpn) 1996 Atlus + @@ -44092,7 +44093,7 @@ The entries in this section are intended to replace the existing "low-grade" Jap --> - Gunbare! Game Tengoku - The Game Paradise 2 (Jpn) + GUNbare! Game Tengoku - The Game Paradise 2 (Jpn) 1998 Jaleco @@ -47651,11 +47652,12 @@ The entries in this section are intended to replace the existing "low-grade" Jap --> - Koukλoθεαtρo - Yuukyuu no Hitomi (Jpn) + Kouklotheatro - Yuukyuu no Hitomi (Jpn) 1999 Sunsoft + @@ -55476,7 +55478,7 @@ The entries in this section are intended to replace the existing "low-grade" Jap --> - Simple 1500 Series vol.71 - The Renai Simulation 2 (Jpn) + Simple 1500 Series vol.71 - The Ren'ai Simulation 2 (Jpn) 2001 D3 Publisher @@ -56977,7 +56979,7 @@ The entries in this section are intended to replace the existing "low-grade" Jap --> - Toca Touring Car Championship (Jpn) + TOCA Touring Car Championship (Jpn) 1998 Upstar diff --git a/src/mame/drivers/d6800.cpp b/src/mame/drivers/d6800.cpp index 834bc21f360..ca08bcbc118 100644 --- a/src/mame/drivers/d6800.cpp +++ b/src/mame/drivers/d6800.cpp @@ -412,7 +412,7 @@ void d6800_state::d6800(machine_config &config) quickload_image_device &quickload(QUICKLOAD(config, "quickload", "bin,c8", attotime::from_seconds(2))); quickload.set_load_callback(FUNC(d6800_state::quickload_cb)); quickload.set_interface("chip8quik"); - SOFTWARE_LIST(config, "quik_list").set_original("chip8").set_filter("D"); + SOFTWARE_LIST(config, "quik_list").set_original("chip8_quik").set_filter("D"); } /* ROMs */ diff --git a/src/mame/drivers/funworld.cpp b/src/mame/drivers/funworld.cpp index f27b801839d..d3ba1e8c5e5 100644 --- a/src/mame/drivers/funworld.cpp +++ b/src/mame/drivers/funworld.cpp @@ -8715,7 +8715,7 @@ GAMEL( 199?, jolycdit, jollycrd, cuoreuno, jolycdit, funworld_state, init_tab GAMEL( 1990, jolycdib, jollycrd, cuoreuno, jolycdib, funworld_state, init_tabblue, ROT0, "bootleg", "Jolly Card (Italian, encrypted bootleg, set 1)", 0, layout_jollycrd ) // not a real TAB blue PCB GAMEL( 1993, jolycdic, jollycrd, cuoreuno, jolycdic, funworld_state, init_tabblue, ROT0, "bootleg", "Jolly Card (Italian, encrypted bootleg, set 2)", 0, layout_jollycrd ) // not a real TAB blue PCB GAMEL( 1993, jolycdii, jollycrd, cuoreuno, jolycdib, funworld_state, init_tabblue, ROT0, "bootleg (Cleco)", "Jolly Card (Italian, encrypted bootleg, set 3)", 0, layout_jollycrd ) // Cleco bootleg PCB -GAMEL( 1993, jolycdcy, jollycrd, cuoreuno, jolycdcy, funworld_state, init_tabblue, ROT0, "bootleg (Cleco)", "Zabavni Karti (cyrillic, Bulgarian, encrypted)", 0, layout_jollycrd ) +GAMEL( 1993, jolycdcy, jollycrd, cuoreuno, jolycdcy, funworld_state, init_tabblue, ROT0, "bootleg (Cleco)", "Zabavni Karti (Bulgarian, encrypted)", 0, layout_jollycrd ) // Dino 4 encrypted hardware... GAMEL( 1997, pool10e, pool10, cuoreuno, cuoreuno, funworld_state, init_dino4, ROT0, "C.M.C.", "Pool 10 (Italian, Dino 4 hardware, encrypted)", 0, layout_jollycrd ) diff --git a/src/mame/drivers/tmc1800.cpp b/src/mame/drivers/tmc1800.cpp index 43d4d9aeece..d0ca713e0c2 100644 --- a/src/mame/drivers/tmc1800.cpp +++ b/src/mame/drivers/tmc1800.cpp @@ -803,7 +803,7 @@ void tmc1800_state::tmc1800(machine_config &config) //quickload_image_device &quickload(QUICKLOAD(config, "quickload", "bin,c8", attotime::from_seconds(2))); //quickload.set_load_callback(FUNC(tmc1800_base_state_state::quickload_cb)); //quickload.set_interface("chip8quik"); - //SOFTWARE_LIST(config, "quik_list").set_original("chip8").set_filter("T"); // filter unknown until it can be tested + //SOFTWARE_LIST(config, "quik_list").set_original("chip8_quik").set_filter("T"); // filter unknown until it can be tested CASSETTE(config, m_cassette); m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED); diff --git a/src/mame/drivers/vip.cpp b/src/mame/drivers/vip.cpp index 6b857fc616a..2dd7ac192bf 100644 --- a/src/mame/drivers/vip.cpp +++ b/src/mame/drivers/vip.cpp @@ -758,7 +758,7 @@ void vip_state::vip(machine_config &config) quickload_image_device &quickload(QUICKLOAD(config, "quickload", "bin,c8", attotime::from_seconds(2))); quickload.set_load_callback(FUNC(vip_state::quickload_cb)); quickload.set_interface("chip8quik"); - SOFTWARE_LIST(config, "quik_list").set_original("chip8").set_filter("V"); + SOFTWARE_LIST(config, "quik_list").set_original("chip8_quik").set_filter("V"); CASSETTE(config, m_cassette); m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED); From 171483bbd5339b1e08bf1e505fdd75b203c25179 Mon Sep 17 00:00:00 2001 From: AJR Date: Sun, 24 Jan 2021 14:48:06 -0500 Subject: [PATCH 3/4] input.cpp, inputdev.cpp: Misc. fixes - Fix a recent regression with processing XInput DPAD input item tokens - Prevent code_to_token from blowing up in strange cases --- src/emu/input.cpp | 4 +++- src/emu/inputdev.cpp | 3 +-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/emu/input.cpp b/src/emu/input.cpp index 0cc37abc1c9..f767254fb7b 100644 --- a/src/emu/input.cpp +++ b/src/emu/input.cpp @@ -832,6 +832,8 @@ std::string input_manager::code_to_token(input_code code) const { // determine the devclass part const char *devclass = (*devclass_token_table)[code.device_class()]; + if (devclass == nullptr) + return "INVALID"; // determine the devindex part; keyboard 0 doesn't show an index std::string devindex = string_format("%d", code.device_index() + 1); @@ -858,7 +860,7 @@ std::string input_manager::code_to_token(input_code code) const str.append("_").append(devcode); if (modifier != nullptr) str.append("_").append(modifier); - if (itemclass[0] != 0) + if (itemclass != nullptr && itemclass[0] != 0) str.append("_").append(itemclass); return str; } diff --git a/src/emu/inputdev.cpp b/src/emu/inputdev.cpp index 3ca876ff0d8..783bccf3a31 100644 --- a/src/emu/inputdev.cpp +++ b/src/emu/inputdev.cpp @@ -684,8 +684,7 @@ input_device_item::input_device_item(input_device &device, const char *name, voi else { // otherwise, create a tokenized name - m_token.assign(name); - strmakeupper(m_token); + m_token.assign(strmakeupper(name)); strdelchr(m_token, ' '); strdelchr(m_token, '_'); } From 722f0a9739a950a5448ed862d4b5f0523ad4e6d6 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Mon, 25 Jan 2021 14:33:27 +1100 Subject: [PATCH 4/4] wscolor.xml: Software part features must be unique. --- hash/wscolor.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hash/wscolor.xml b/hash/wscolor.xml index c3a43936d65..f594f54aeeb 100644 --- a/hash/wscolor.xml +++ b/hash/wscolor.xml @@ -1195,9 +1195,11 @@ See the wswan software list for the full game list. Qute + + + -->