summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2021-01-25 14:38:19 +1100
committer Vas Crabb <vas@vastheman.com>2021-01-25 14:38:19 +1100
commita77e3cc566c068cde557531c721935c92f0a931c (patch)
treeb3a45104ad115ca89f5607dc52b2d4e2dc411d0f
parentaaec472649521f2f373d9812b8a6e2c7fa94ca00 (diff)
parent722f0a9739a950a5448ed862d4b5f0523ad4e6d6 (diff)
Merge branch 'release0228' into mainline-master
-rw-r--r--hash/chip8_quik.xml (renamed from hash/chip8.xml)0
-rw-r--r--hash/psx.xml14
-rw-r--r--hash/wscolor.xml4
-rw-r--r--src/mame/drivers/d6800.cpp2
-rw-r--r--src/mame/drivers/funworld.cpp2
-rw-r--r--src/mame/drivers/tmc1800.cpp2
-rw-r--r--src/mame/drivers/vip.cpp2
7 files changed, 15 insertions, 11 deletions
diff --git a/hash/chip8.xml b/hash/chip8_quik.xml
index 1bc39703648..1bc39703648 100644
--- a/hash/chip8.xml
+++ b/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
<rom name="Densha Daisuki (Japan) [SLPS-01753].bin" size="233473632" crc="abaf63a4" sha1="a5afc173700c8fc15d5f1efc307f51603b30f313"/>
<rom name="Densha Daisuki (Japan) [SLPS-01753].cue" size="367" crc="9f71930c" sha1="711fad6b3a92f738711baa1b05d4b9f62999c672"/>
-->
- <description>Densha Daisuki - Play Rail ga Ippai (Jpn)</description>
+ <description>Densha Daisuki - Plarail ga Ippai (Jpn)</description>
<year>1998</year>
<publisher>Tomy</publisher>
<info name="serial" value="SLPS-01753" />
@@ -44007,11 +44007,12 @@ The entries in this section are intended to replace the existing "low-grade" Jap
<rom name="Galeoz (Japan) [SLPS-00621].bin" size="416543904" crc="b2087c38" sha1="972e1d727ea5d808ba15607e02cfd1c2b62df53c"/>
<rom name="Galeoz (Japan) [SLPS-00621].cue" size="442" crc="a1b335fb" sha1="e6eba67248f4ae4b829b55fd343c02866184a2f4"/>
-->
- <description>ΓΑΛΕΟΖ (Jpn)</description>
+ <description>GALEOZ (Jpn)</description>
<year>1996</year>
<publisher>Atlus</publisher>
<info name="serial" value="SLPS-00621" />
<info name="release" value="19961220" />
+ <info name="alt_title" value="ΓΑΛΕΟΖ"/>
<info name="alt_title" value="ガレオス"/>
<sharedfeat name="compatibility" value="NTSC-J"/>
<part name="cdrom" interface="psx_cdrom">
@@ -44092,7 +44093,7 @@ The entries in this section are intended to replace the existing "low-grade" Jap
<rom name="Gunbare! Game Tengoku 2 (Japan) (Track 2) [SLPS-01322].bin" size="8742384" crc="f082a565" sha1="5a574c15b2713fe5aae9dcb07d6124c2547f9363"/>
<rom name="Gunbare! Game Tengoku 2 (Japan) [SLPS-01322].cue" size="233" crc="0d05f602" sha1="405b9db2a63f93593dd75ee200dbb5efb40cfdf9"/>
-->
- <description>Gunbare! Game Tengoku - The Game Paradise 2 (Jpn)</description>
+ <description>GUNbare! Game Tengoku - The Game Paradise 2 (Jpn)</description>
<year>1998</year>
<publisher>Jaleco</publisher>
<info name="serial" value="SLPS-01322" />
@@ -47651,11 +47652,12 @@ The entries in this section are intended to replace the existing "low-grade" Jap
<rom name="Kukuro Sea Toro - Eternal Eyes (Japan) [SLPS-02385].bin" size="382350528" crc="f7ae75a6" sha1="e0d1894ef9caa250c1a5f4f16e41ea075c179286"/>
<rom name="Kukuro Sea Toro - Eternal Eyes (Japan) [SLPS-02385].cue" size="117" crc="4ab2c164" sha1="0b410503a84da819ccd67478da5f4003c414e6f7"/>
-->
- <description>Koukλoθεαtρo - Yuukyuu no Hitomi (Jpn)</description>
+ <description>Kouklotheatro - Yuukyuu no Hitomi (Jpn)</description>
<year>1999</year>
<publisher>Sunsoft</publisher>
<info name="serial" value="SLPS-02385" />
<info name="release" value="19991202" />
+ <info name="alt_title" value="Κουκλοθεατρο 悠久の瞳"/>
<info name="alt_title" value="ククロセアトロ 悠久の瞳"/>
<sharedfeat name="compatibility" value="NTSC-J"/>
<part name="cdrom" interface="psx_cdrom">
@@ -55476,7 +55478,7 @@ The entries in this section are intended to replace the existing "low-grade" Jap
<rom name="Simple 1500 Series Vol.071 - The Renai Simulation 2 (Japan) [SLPM-86870].bin" size="457358160" crc="42119dd6" sha1="df53b442ae2471711f9e88499b20576e789c905c"/>
<rom name="Simple 1500 Series Vol.071 - The Renai Simulation 2 (Japan) [SLPM-86870].cue" size="138" crc="65a4dbb6" sha1="8de9f5cbe5f99115783f68253d601c674de35cfd"/>
-->
- <description>Simple 1500 Series vol.71 - The Renai Simulation 2 (Jpn)</description>
+ <description>Simple 1500 Series vol.71 - The Ren'ai Simulation 2 (Jpn)</description>
<year>2001</year>
<publisher>D3 Publisher</publisher>
<info name="serial" value="SLPM-86870" />
@@ -56977,7 +56979,7 @@ The entries in this section are intended to replace the existing "low-grade" Jap
<rom name="Toca Touring Car Championship (Japan) [SLPS-01410].bin" size="451593408" crc="1e32795b" sha1="13482e77d47ece248f7a8ef88658aa75195cac38"/>
<rom name="Toca Touring Car Championship (Japan) [SLPS-01410].cue" size="403" crc="e8468861" sha1="236e15d87818ac3a9e8a70f051879ba864f4e913"/>
-->
- <description>Toca Touring Car Championship (Jpn)</description>
+ <description>TOCA Touring Car Championship (Jpn)</description>
<year>1998</year>
<publisher>Upstar</publisher>
<info name="serial" value="SLPS-01410" />
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.
<publisher>Qute</publisher>
<info name="release" value="20040205"/>
<part name="cart" interface="wswan_cart">
+ <!-- no markings on pcb
<feature name="pcb" value="no label" />
- <feature name="uX" value="BANDAI 2003" /><!-- no markings on pcb -->
+ <feature name="uX" value="BANDAI 2003" />
<feature name="uX" value="CS18LV40963DCR70 SRAM" />
+ -->
<feature name="slot" value="ws_sram" />
<feature name="rtc" value="yes" />
<dataarea name="rom" size="2097152" width="16" endianness="little">
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);