From b99bae99796c3999eadf2e40982dfa474d992c62 Mon Sep 17 00:00:00 2001 From: FakeShemp Date: Sat, 15 Oct 2016 21:41:42 +0200 Subject: [PATCH 01/30] Start to document the V.Smile carts --- hash/vsmile_cart.xml | 719 ++++++++++++++++++++++++++++-------------- hash/vsmileb_cart.xml | 86 +++++ hash/vsmilem_cart.xml | 90 ++++++ 3 files changed, 667 insertions(+), 228 deletions(-) create mode 100644 hash/vsmileb_cart.xml create mode 100644 hash/vsmilem_cart.xml diff --git a/hash/vsmile_cart.xml b/hash/vsmile_cart.xml index fea4e6a5dda..fa452dc9410 100644 --- a/hash/vsmile_cart.xml +++ b/hash/vsmile_cart.xml @@ -47,6 +47,10 @@ Language: ********5 = France (Yellow labels on back, also for NTSC French-Canadian) ********6 = Portugal Apparently distributed by company 'Concentra' (White labels on back) ********7 = Spain (Green labels on back) +*******?? = Norway +*******?? = Finland +*******13 = Denmark Distributed by the company 'Top Toy A/S' +*******14 = Sweden Distributed by the company 'Top Toy A/S' 80-084000(US) | Action Mania (IT) | ????? @@ -703,12 +707,16 @@ V.Baby (NOT V.Smile Baby) --> - Aladdin - Aladdins Welt der Wunder (Ger) - 200? + Disneys Aladdin - Aladdins Welt der Wunder (Ger) + 2005? VTech + + + + - + @@ -717,9 +725,13 @@ V.Baby (NOT V.Smile Baby) Entdecke die Welt von Rotkäppchen (Ger) 200? VTech + + + + - + @@ -728,9 +740,13 @@ V.Baby (NOT V.Smile Baby) Alphabet Park Adventure (USA) 200? VTech + + + + - + @@ -748,22 +764,30 @@ V.Baby (NOT V.Smile Baby) Arielle Die Meerjungfrau - Arielles aufregendes Abenteuer (Ger) - 200? + 2004? VTech + + + + - + - La Petite Sirene - Ariel Devient une Princesse (Fra) - 200? + La Petite Sirene - Ariel devient une princesse (Fra) + 2004? VTech + + + + - + @@ -772,9 +796,13 @@ V.Baby (NOT V.Smile Baby) Den Lille Havfrue - Ariels majestætiske rejse! (Den) 200? VTech + + + + - + @@ -783,20 +811,28 @@ V.Baby (NOT V.Smile Baby) Den Lilla Sjöjungfrun - Ariels majestätiska resa! (Swe) 200? VTech + + + + - + Barney - Erlebnis-Reise (Ger) - 200? + 2005? VTech + + + + - + @@ -804,44 +840,60 @@ V.Baby (NOT V.Smile Baby) Bob the Builder - Bob's Busy Day (USA) - 200? + 2005? VTech + + + + - + Bob der Baumeister - Bobs spannender Arbeitstag (Ger) - 200? + 2005? VTech + + + + - + Byggemand Bob - Bobs travle dag (Den) - 200? + 2006? VTech + + + + - + Byggare Bob - Bobs stressiga dag (Swe) - 200? + 2006? VTech + + + + - + @@ -851,57 +903,95 @@ V.Baby (NOT V.Smile Baby) Cars - Rev It Up in Radiator Springs (USA) 2006? VTech + + + + - + + + + Cars - Vollgas in Radiator Springs (Ger) + 2006? + VTech + + + + + + + + + + + Cars - Quatre Roues (Fra) 2006? VTech + + + + - + - Biler - Ræs i kølerkildekøbing (Den) - 2006? + Biler - Ræs i Kølerkildekøbing (Den) + 2007? VTech + + + + - + - Biler - Kör ikapp i kylarköping (Swe) - 19?? - <unknown> + Bilar - Kör ikapp i Kylarköping (Swe) + 2007? + VTech + + + + + - + Cinderella - Cinderella's Magic Wishes (USA) - 200? + 2005? VTech + + + + - + + Cinderella - Cinderella's Magic Wishes (USA, Alt) 200? @@ -914,79 +1004,119 @@ V.Baby (NOT V.Smile Baby) - Cendrillon - Le Rêve Enchanté de Cendrillon (Fra) - 200? + Cendrillon - Le rêve enchanté de Cendrillon (Fra) + 2005? VTech + + + + - + Cinderella - Askepots magiske ønsker (Den) - 200? + 2006? VTech + + + + - + Cinderella - Lernen im Märchenland (Ger, Rev. 1) - 200? + 2007? VTech + + + + - + Cinderella - Lernen im Märchenland (Ger) - 200? + 2005? VTech + + + + - + Cinderella - Askungens magiska önskningar (Swe) - 200? + 2006? VTech + + + + - + - - - Dora The Explorer - Dora's Fix-it Adventure (USA) + + + Disney's Mickey Mouse - Mickey's Magical Adventure (USA) 200? VTech - + + + + + + + + Dora the Explorer - Dora's Fix-it Adventure (USA) + 2005? + VTech + + + + + + + - Dora L'Exploratrice - Les Adventures de Dora Apprentie Mécano (Fra) - 200? + Dora L'Exploratrice - Les aventures de Dora Apprentie Mécano (Fra) + 2005? VTech + + + + - + @@ -1004,33 +1134,45 @@ V.Baby (NOT V.Smile Baby) Elmos großes Abenteuer (Ger) - 200? + 2005? VTech + + + + - + - Fußball Schule (Ger) + V.Smile Fußball Schule (Ger) 200? VTech + + + + - + Finding Nemo - Nemo's Ocean Discoveries (USA) - 200? + 2005? VTech + + + + - + @@ -1039,9 +1181,13 @@ V.Baby (NOT V.Smile Baby) Freds Zahlen Rallye (Ger) 200? VTech + + + + - + @@ -1050,13 +1196,18 @@ V.Baby (NOT V.Smile Baby) Apprenti' Pilote (Fra) 200? VTech + + + + - + + Kleine Einsteins (Ger) 200? @@ -1067,7 +1218,7 @@ V.Baby (NOT V.Smile Baby) - + Disney The Lion King - Simba's Big Adventure (USA) 200? @@ -1083,9 +1234,13 @@ V.Baby (NOT V.Smile Baby) Disney Løvernes Konge - Simbas Store Eventyr (Den) 200? VTech + + + + - + @@ -1103,37 +1258,35 @@ V.Baby (NOT V.Smile Baby) Meister Manny's Werkzeugkiste (Ger) - 200? + 2009? VTech + + + + - + - Les Mélodilous - Les Explorateurs Vikings (Fra) - 200? + Les Mélodilous - Les explorateurs vikings (Fra) + 2006? VTech + + + + - - - - - - - Disney's Mickey Mouse - Mickey's Magical Adventure (USA) - 200? - VTech - - - + + Micky - Mickys magisches Abenteuer (Ger) 200? @@ -1149,9 +1302,13 @@ V.Baby (NOT V.Smile Baby) Musse Pigg - Musses magiska äventyr (Swe) 200? VTech + + + + - + @@ -1160,31 +1317,43 @@ V.Baby (NOT V.Smile Baby) Micky Maus Wunderhaus (Ger) 200? VTech + + + + - + - Mickey Mouse - Clubhouse (Swe) + Mickey Mouse Clubhouse (Swe) 200? VTech + + + + - + Monsters vs Aliens (Ger) - 200? + 2009? VTech + + + + - + @@ -1193,20 +1362,28 @@ V.Baby (NOT V.Smile Baby) Mein erster Hund (Ger) 200? VTech + + + + - + - Min hunvalp (Swe) - 200? + Min hundvalp (Swe) + 2009? VTech + + + + - + @@ -1215,42 +1392,58 @@ V.Baby (NOT V.Smile Baby) Noddy - Detektiv für einen Tag (Ger, Rev. 1?) 200? VTech + + + + - + Oben (Ger) - 200? + 2009? VTech + + + + - + - Partyland Park - A Carnival of Play and Learn Fun (USA) - 200? + Partyland Park - A Carnival of Play-and-Learn Fun (USA) + 2007? VTech + + + + - + - Ratatouille - Remys Neue Rezepte (Ger) - 200? + Ratatouille - Remys neue Rezepte (Ger) + 2007? VTech + + + + - + @@ -1259,9 +1452,13 @@ V.Baby (NOT V.Smile Baby) Scooby-Doo! - Funland Frenzy (USA) 200? VTech + + + + - + @@ -1270,9 +1467,13 @@ V.Baby (NOT V.Smile Baby) Scooby-Doo - Panique à Funland (Fra) 200? VTech + + + + - + @@ -1281,9 +1482,13 @@ V.Baby (NOT V.Smile Baby) Scooby-Doo! - Im Lernpark (Ger) 200? VTech + + + + - + @@ -1292,57 +1497,78 @@ V.Baby (NOT V.Smile Baby) Scooby-Doo! - Sjov i forlystelsesparken (Den) 200? VTech + + + + - + - Scooby-Doo! - Tivoli-Tokerier (Swe) + Scooby-Doo! - Tivoli-tokerier (Swe) 200? VTech + + + + - + - Sesamestrasse - Ernies + Berts Fantastisches Abenteuer (Ger) + Sesamstrasse - Ernies & Berts Fantastisches Abenteuer (Ger) 2006? VTech + + + + - + - Shrek The Third - Arthur's School Day Adventure (USA) - 200? + Shrek the Third - Arthur's School Day Adventure (USA) + 2007? VTech + + + + - + Shrek - Die Geschichte des Drachen (Ger) - 200? + 2006? VTech + + + + - + + Shrek - Le Rhume de Dragonne (Fra) 200? @@ -1355,56 +1581,76 @@ V.Baby (NOT V.Smile Baby) - Spider-Man & Ses Amis - Missions Secrètes (Fra) - 200? + Spider-Man & ses amis - Missions secrètes (Fra) + 2005? VTech + + + + - + Spider-Man & Freunde - Wettkampf im Space-Labor (Ger) - 200? + 2006? VTech + + + + - + Spongebob Squarepants - A Day in the Life of a Sponge (USA) - 200? + 2005? VTech + + + + - + Spongebob Schwammkopf - Der Tag des Schwamms (Ger, Rev. 1) - 200? + 2005? VTech + + + + - + Spongebob Schwammkopf - Der Tag des Schwamms (Ger) - 200? + 2005? VTech + + + + - + @@ -1413,20 +1659,28 @@ V.Baby (NOT V.Smile Baby) Superman - Der Superheld (Ger) 200? VTech + + + + - + - Superman - À la Rescousse (Fra) + Superman - À la rescousse ! (Fra) 200? VTech + + + + - + @@ -1443,23 +1697,31 @@ V.Baby (NOT V.Smile Baby) - Thomas & seine Freunde - Freunde halten zusammen (Ger) - 200? + Thomas & seine Freunde - Freunde Halten Zusammen (Ger) + 2007? VTech + + + + - + Thomas & Friends - Tågen hjälps åt (Swe) - 200? + 2007? VTech + + + + - + @@ -1488,59 +1750,80 @@ V.Baby (NOT V.Smile Baby) Toy Story 2 - Woodys Spannende Rettung (Ger) - 200? + 2006? VTech + + + + - + Toy Story 2 - Operation: Rädda Woody! (Swe) - 200? + 2005? VTech + + + + - + Wall-E (Ger) - 200? + 2008? VTech + + + + - + Wall-E (Swe) - 200? + 2008? VTech + + + + - + - Winnie Puhh - Die Honigjagd (Ger) - 200? + Winnie Puuh - Die Honigjagd (Ger) + 2004? VTech + + + + - + + My Friends Tigger & Pooh - Die Honigjagd (Ger) 200? @@ -1553,12 +1836,16 @@ V.Baby (NOT V.Smile Baby) - Winnie l'Ourson - La Chasse au Miel de Winnie (Fra) - 200? + Winnie l'Ourson - La Chasse au miel de Winnie (Fra) + 2004? VTech + + + + - + @@ -1567,9 +1854,13 @@ V.Baby (NOT V.Smile Baby) Peter Plys - Honningjagten (Den) 200? VTech + + + + - + @@ -1578,9 +1869,13 @@ V.Baby (NOT V.Smile Baby) Nalle Puh - Honungsjakten (Swe) 200? VTech + + + + - + @@ -1589,9 +1884,13 @@ V.Baby (NOT V.Smile Baby) V.Smile - Lern- und Tanzmatte (Ger) 200? VTech + + + + - + @@ -1600,9 +1899,16 @@ V.Baby (NOT V.Smile Baby) V.Smile - Zeichenatelier (Ger) 200? VTech + + + + + - + + + @@ -1611,14 +1917,21 @@ V.Baby (NOT V.Smile Baby) V.Smile Tecknarstudio (Swe) 200? VTech + + + + + - + + + - + Zayzoo - My Alien Classmate (USA) 200? VTech @@ -1628,99 +1941,49 @@ V.Baby (NOT V.Smile Baby) - - - Zayzoo's Lernall (Ger) + + + + Zayzoo: An Earth Adventure (USA, Rev. 1?) 200? VTech + + + + - + + + + + + + Zayzoos Lernall (Ger) + 200? + VTech + + + + + + + - Zezou - Notre Ami Venu d'Ailleurs (Fra) + Zézou - Notre Ami Venu d'Ailleurs (Fra) 200? VTech + + + + - - - - - - - - - - - Meine kleinen Tierfreunde (Ger) (V.Smile Baby) - 200? - VTech - - - - - - - - - Pooh's Hundred Acre Wood Adventure (USA) (V.Smile Baby) - 2007 - VTech - - - - - - - - - Nalle Puhs Aeventyr i Sjumilaskogen (Swe) (V.Smile Baby) - 200? - VTech - - - - - - - - - - - - - Cinderella - Lernen im Märchenland (Ger) (V.Smile Motion) - 200? - VTech - - - - - - - - - Kung Fu Panda - Der Weg des Panda (Ger) (V.Smile Motion) - 200? - VTech - - - - - - - - - Kleine Einsteins (Ger) (V.Smile Motion) - 200? - VTech - - - + diff --git a/hash/vsmileb_cart.xml b/hash/vsmileb_cart.xml new file mode 100644 index 00000000000..40a3622e97b --- /dev/null +++ b/hash/vsmileb_cart.xml @@ -0,0 +1,86 @@ + + + + + + + Meine kleinen Tierfreunde (Ger) + 200? + VTech + + + + + + + + + + + + + Mein erster Bauernhof (Ger) + 200? + VTech + + + + + + + + + + + + + Pooh's Hundred Acre Wood Adventure (USA) (V.Smile Baby) + 2007 + VTech + + + + + + + + + Puuhs Hundert-Morgen-Wald (Ger) + 2006? + VTech + + + + + + + + + Nalle Puhs Äventyr i Sjumilaskogen (Swe) + 2007? + VTech + + + + + + + + + + + + + Lär och upptäck (Swe) + 200? + VTech + + + + + + + + \ No newline at end of file diff --git a/hash/vsmilem_cart.xml b/hash/vsmilem_cart.xml new file mode 100644 index 00000000000..a0140363b29 --- /dev/null +++ b/hash/vsmilem_cart.xml @@ -0,0 +1,90 @@ + + + + + + + Cinderella - Lernen im Märchenland (Ger) + 2010? + VTech + + + + + + + + + + + + + Kung Fu Panda - Der Weg des Panda (Ger) + 200? + VTech + + + + + + + + + Dora - Doras Reparatur-Abenteuer (Ger) + 2009? + VTech + + + + + + + + + + + + + Kleine Einsteins (Ger) (V.Smile Motion) + 200? + VTech + + + + + + + + + TinkerBell (Ger) + 2009? + VTech + + + + + + + + + + + + + Winnie Puuh - Die Honigjagd (Ger) + 2009? + VTech + + + + + + + + + + + + \ No newline at end of file From efbf8ead0e05ec9023ef82134fde47ba48f25006 Mon Sep 17 00:00:00 2001 From: Fake Shemp Date: Thu, 20 Oct 2016 01:00:47 +0200 Subject: [PATCH 02/30] Update V.Smile carts documentation and undumped list. A-B done. --- hash/vsmile_cart.xml | 1472 ++++++++++++++++++++--------------------- hash/vsmileb_cart.xml | 75 ++- 2 files changed, 795 insertions(+), 752 deletions(-) diff --git a/hash/vsmile_cart.xml b/hash/vsmile_cart.xml index fa452dc9410..6154aea39a5 100644 --- a/hash/vsmile_cart.xml +++ b/hash/vsmile_cart.xml @@ -1,9 +1,9 @@ + - + + Disneys Aladdin - Aladdins Welt der Wunder (Ger) 2005? @@ -714,9 +680,9 @@ V.Baby (NOT V.Smile Baby) - + - + @@ -729,9 +695,9 @@ V.Baby (NOT V.Smile Baby) - + - + @@ -744,80 +710,84 @@ V.Baby (NOT V.Smile Baby) - + - + - Arielle die Meerjungfrau - Arielles aufregendes Abenteuer (Ger, Newer?) - 200? + Disneys Arielle die Meerjungfrau - Arielles aufregendes Abenteuer (Ger, Rev.3?) + 2004? VTech + + + + - + - - Arielle Die Meerjungfrau - Arielles aufregendes Abenteuer (Ger) + + Disneys Arielle Die Meerjungfrau - Arielles aufregendes Abenteuer (Ger) 2004? VTech - + - + - La Petite Sirene - Ariel devient une princesse (Fra) + Disney La Petite Sirene - Ariel devient une princesse (Fra) 2004? VTech - + - + - Den Lille Havfrue - Ariels majestætiske rejse! (Den) + Disney Den Lille Havfrue - Ariels majestætiske rejse! (Den) 200? VTech - + - + - Den Lilla Sjöjungfrun - Ariels majestätiska resa! (Swe) + Disneys Den Lilla Sjöjungfrun - Ariels majestätiska resa! (Swe) 200? VTech - + - + @@ -830,14 +800,14 @@ V.Baby (NOT V.Smile Baby) - + - + - + Bob the Builder - Bob's Busy Day (USA) 2005? @@ -846,9 +816,9 @@ V.Baby (NOT V.Smile Baby) - + - + @@ -861,9 +831,9 @@ V.Baby (NOT V.Smile Baby) - + - + @@ -876,9 +846,9 @@ V.Baby (NOT V.Smile Baby) - + - + @@ -891,14 +861,14 @@ V.Baby (NOT V.Smile Baby) - + - + - + Cars - Rev It Up in Radiator Springs (USA) 2006? @@ -907,7 +877,7 @@ V.Baby (NOT V.Smile Baby) - + @@ -923,7 +893,7 @@ V.Baby (NOT V.Smile Baby) - + @@ -938,7 +908,7 @@ V.Baby (NOT V.Smile Baby) - + @@ -953,7 +923,7 @@ V.Baby (NOT V.Smile Baby) - + @@ -969,7 +939,7 @@ V.Baby (NOT V.Smile Baby) - + @@ -984,7 +954,7 @@ V.Baby (NOT V.Smile Baby) - + @@ -1011,7 +981,7 @@ V.Baby (NOT V.Smile Baby) - + @@ -1041,7 +1011,7 @@ V.Baby (NOT V.Smile Baby) - + @@ -1056,7 +1026,7 @@ V.Baby (NOT V.Smile Baby) - + @@ -1071,7 +1041,7 @@ V.Baby (NOT V.Smile Baby) - + @@ -1099,7 +1069,7 @@ V.Baby (NOT V.Smile Baby) - + @@ -1114,7 +1084,7 @@ V.Baby (NOT V.Smile Baby) - + @@ -1140,7 +1110,7 @@ V.Baby (NOT V.Smile Baby) - + @@ -1155,7 +1125,7 @@ V.Baby (NOT V.Smile Baby) - + @@ -1170,7 +1140,7 @@ V.Baby (NOT V.Smile Baby) - + @@ -1185,7 +1155,7 @@ V.Baby (NOT V.Smile Baby) - + @@ -1200,7 +1170,7 @@ V.Baby (NOT V.Smile Baby) - + @@ -1238,7 +1208,7 @@ V.Baby (NOT V.Smile Baby) - + @@ -1246,7 +1216,7 @@ V.Baby (NOT V.Smile Baby) - Disney Lejonkungen - Simbas Stora Äventyr (swe) + Disney Lejonkungen - Simbas Stora Äventyr (Swe) 200? VTech @@ -1264,7 +1234,7 @@ V.Baby (NOT V.Smile Baby) - + @@ -1279,7 +1249,7 @@ V.Baby (NOT V.Smile Baby) - + @@ -1306,7 +1276,7 @@ V.Baby (NOT V.Smile Baby) - + @@ -1321,7 +1291,7 @@ V.Baby (NOT V.Smile Baby) - + @@ -1336,7 +1306,7 @@ V.Baby (NOT V.Smile Baby) - + @@ -1351,7 +1321,7 @@ V.Baby (NOT V.Smile Baby) - + @@ -1366,7 +1336,7 @@ V.Baby (NOT V.Smile Baby) - + @@ -1381,7 +1351,7 @@ V.Baby (NOT V.Smile Baby) - + @@ -1396,7 +1366,7 @@ V.Baby (NOT V.Smile Baby) - + @@ -1411,7 +1381,7 @@ V.Baby (NOT V.Smile Baby) - + @@ -1426,7 +1396,7 @@ V.Baby (NOT V.Smile Baby) - + @@ -1441,7 +1411,7 @@ V.Baby (NOT V.Smile Baby) - + @@ -1456,7 +1426,7 @@ V.Baby (NOT V.Smile Baby) - + @@ -1471,7 +1441,7 @@ V.Baby (NOT V.Smile Baby) - + @@ -1486,7 +1456,7 @@ V.Baby (NOT V.Smile Baby) - + @@ -1501,7 +1471,7 @@ V.Baby (NOT V.Smile Baby) - + @@ -1516,7 +1486,7 @@ V.Baby (NOT V.Smile Baby) - + @@ -1531,7 +1501,7 @@ V.Baby (NOT V.Smile Baby) - + @@ -1546,7 +1516,7 @@ V.Baby (NOT V.Smile Baby) - + @@ -1561,7 +1531,7 @@ V.Baby (NOT V.Smile Baby) - + @@ -1588,7 +1558,7 @@ V.Baby (NOT V.Smile Baby) - + @@ -1603,7 +1573,7 @@ V.Baby (NOT V.Smile Baby) - + @@ -1618,7 +1588,7 @@ V.Baby (NOT V.Smile Baby) - + @@ -1633,7 +1603,7 @@ V.Baby (NOT V.Smile Baby) - + @@ -1648,7 +1618,7 @@ V.Baby (NOT V.Smile Baby) - + @@ -1663,7 +1633,7 @@ V.Baby (NOT V.Smile Baby) - + @@ -1678,7 +1648,7 @@ V.Baby (NOT V.Smile Baby) - + @@ -1704,7 +1674,7 @@ V.Baby (NOT V.Smile Baby) - + @@ -1719,7 +1689,7 @@ V.Baby (NOT V.Smile Baby) - + @@ -1756,7 +1726,7 @@ V.Baby (NOT V.Smile Baby) - + @@ -1771,7 +1741,7 @@ V.Baby (NOT V.Smile Baby) - + @@ -1786,7 +1756,7 @@ V.Baby (NOT V.Smile Baby) - + @@ -1801,7 +1771,7 @@ V.Baby (NOT V.Smile Baby) - + @@ -1816,7 +1786,7 @@ V.Baby (NOT V.Smile Baby) - + @@ -1843,7 +1813,7 @@ V.Baby (NOT V.Smile Baby) - + @@ -1858,7 +1828,7 @@ V.Baby (NOT V.Smile Baby) - + @@ -1873,7 +1843,7 @@ V.Baby (NOT V.Smile Baby) - + @@ -1888,7 +1858,7 @@ V.Baby (NOT V.Smile Baby) - + @@ -1904,7 +1874,7 @@ V.Baby (NOT V.Smile Baby) - + @@ -1922,7 +1892,7 @@ V.Baby (NOT V.Smile Baby) - + @@ -1951,7 +1921,7 @@ V.Baby (NOT V.Smile Baby) - + @@ -1966,7 +1936,7 @@ V.Baby (NOT V.Smile Baby) - + @@ -1981,7 +1951,7 @@ V.Baby (NOT V.Smile Baby) - + diff --git a/hash/vsmileb_cart.xml b/hash/vsmileb_cart.xml index 40a3622e97b..2fd58c4b07e 100644 --- a/hash/vsmileb_cart.xml +++ b/hash/vsmileb_cart.xml @@ -4,6 +4,79 @@ NOTE: This list is here only to document available dumps and it's not used (yet) by MESS! --> + + Meine kleinen Tierfreunde (Ger) @@ -39,7 +112,7 @@ NOTE: This list is here only to document available dumps and it's not used (yet) Pooh's Hundred Acre Wood Adventure (USA) (V.Smile Baby) 2007 VTech - + From 8a57c9afa1b33f7f58bbf5a8d333dddf58550c01 Mon Sep 17 00:00:00 2001 From: Fake Shemp Date: Thu, 20 Oct 2016 12:18:34 +0200 Subject: [PATCH 03/30] Document some more carts. --- hash/vsmile_cart.xml | 2572 +++++++++++++++++++++-------------------- hash/vsmileb_cart.xml | 228 ++-- 2 files changed, 1411 insertions(+), 1389 deletions(-) diff --git a/hash/vsmile_cart.xml b/hash/vsmile_cart.xml index 6154aea39a5..5a8f16cbea2 100644 --- a/hash/vsmile_cart.xml +++ b/hash/vsmile_cart.xml @@ -180,13 +180,18 @@ Language: | | 80-084386(PT) | Winnie - Em Busca do Mel (84396 on cart) | | 80-084387(SP) | Winnie the Pooh - En busca de la miel +========+===================+============================================================================+ -| | 80-084400(US) | Cars: Rev it up in Radiator Springs +| XX | 80-084400(US) | Cars: Rev It Up in Radiator Springs | | 80-084402(NL) | Cars: Spektakel in Radiator Springs | | 80-084403(UK) | Cars: Rev it up in Radiator Springs -| | 80-084404(GE) | Cars: Vollgas in Radiator Springs -| | 80-084405(FR) | Cars: Quatre Roues +| XX | 80-084404(GE) | Cars: Vollgas in Radiator Springs +| XX | 80-084405(FR) | Cars: Quatre Roues | | 80-084406(PT) | Cars: Aventura Em Radiator Springs (84416 on cart) | | 80-084407(SP) | Cars: Acelera el Motor en Radiador Springs +| XX | 80-092673(DK) | Biler - Ræs i Kølerkildekøbing +| | 80-092674(SE) | Bilar - Kör ikapp i Kylarköping +| XX | 80-092674(SE) | Biler - Kör ikapp i Kylarköping (label misprint) +| | (NO) | Biler - Full gass i Radiator By +| | (FI) | Autot - Aja kilpaa Syylari Cityssä +========+===================+============================================================================+ | | 80-084420(US) | Toy Story 3 | | 80-084421(US) | Toy Story 3 (pocket version) @@ -300,9 +305,9 @@ Language: +========+===================+============================================================================+ | | 80-090260(US) | Disney Fairies: Tinker Bell +========+===================+============================================================================+ -| | +| | | | Oldest Smartidges start here -| | +| | +========+===================+============================================================================+ | XX | 80-092000(US) | Alphabet Park Adventure (Red Haired Girl Version) | | 80-092000-101(US) | Alphabet Park Adventure (Blond Haired Girl Version) @@ -317,7 +322,7 @@ Language: +========+===================+============================================================================+ | | 80-092020(US) | The Adventures of Little Red Riding Hood | | 80-092023(UK) | The Adventures of Little Red Riding Hood (no # on label, but box says 'colours') -| XX | 80-092024(GE) | Entdecke die Welt von Rotkäppchen +| XX | 80-092024(GE) | Entdecke die Welt von Rotkäppchen | | 80-092025(FR) | Les aventures du Le Petit Chaperon Rouge +========+===================+============================================================================+ | | 80-092040(US) | Learnin' Wheels (blue car with guy driving) @@ -672,1291 +677,1308 @@ Language: - - Disneys Aladdin - Aladdins Welt der Wunder (Ger) - 2005? - VTech - - - - - - - - - - + + Disneys Aladdin - Aladdins Welt der Wunder (Ger) + 2005? + VTech + + + + + + + + + + - - Entdecke die Welt von Rotkäppchen (Ger) - 200? - VTech - - - - - - - - - - + + Entdecke die Welt von Rotkäppchen (Ger) + 200? + VTech + + + + + + + + + + - - Alphabet Park Adventure (USA) - 200? - VTech - - - - - - - - - - + + Alphabet Park Adventure (USA) + 200? + VTech + + + + + + + + + + - - Disneys Arielle die Meerjungfrau - Arielles aufregendes Abenteuer (Ger, Rev.3?) - 2004? - VTech - - + + Disneys Arielle die Meerjungfrau - Arielles aufregendes Abenteuer (Ger, Rev. 3?) + 2004? + VTech + + - - - - - - - + + + + + + + - - Disneys Arielle Die Meerjungfrau - Arielles aufregendes Abenteuer (Ger) - 2004? - VTech - - - - - - - - - - + + Disneys Arielle Die Meerjungfrau - Arielles aufregendes Abenteuer (Ger) + 2004? + VTech + + + + + + + + + + - - Disney La Petite Sirene - Ariel devient une princesse (Fra) - 2004? - VTech - - - - - - - - - - + + Disney La Petite Sirene - Ariel devient une princesse (Fra) + 2004? + VTech + + + + + + + + + + - - Disney Den Lille Havfrue - Ariels majestætiske rejse! (Den) - 200? - VTech - - - - - - - - - - + + Disney Den Lille Havfrue - Ariels majestætiske rejse! (Den) + 200? + VTech + + + + + + + + + + - - Disneys Den Lilla Sjöjungfrun - Ariels majestätiska resa! (Swe) - 200? - VTech - - - - - - - - - - + + Disneys Den Lilla Sjöjungfrun - Ariels majestätiska resa! (Swe) + 200? + VTech + + + + + + + + + + - - Barney - Erlebnis-Reise (Ger) - 2005? - VTech - - - - - - - - - - + + Barney - Erlebnis-Reise (Ger) + 2005? + VTech + + + + + + + + + + - - Bob the Builder - Bob's Busy Day (USA) - 2005? - VTech - - - - - - - - - - + + Bob the Builder - Bob's Busy Day (USA) + 2005? + VTech + + + + + + + + + + - - Bob der Baumeister - Bobs spannender Arbeitstag (Ger) - 2005? - VTech - - - - - - - - - - + + Bob der Baumeister - Bobs spannender Arbeitstag (Ger) + 2005? + VTech + + + + + + + + + + - - Byggemand Bob - Bobs travle dag (Den) - 2006? - VTech - - - - - - - - - - + + Byggemand Bob - Bobs travle dag (Den) + 2006? + VTech + + + + + + + + + + - - Byggare Bob - Bobs stressiga dag (Swe) - 2006? - VTech - - - - - - - - - - + + Byggare Bob - Bobs stressiga dag (Swe) + 2006? + VTech + + + + + + + + + + - - Cars - Rev It Up in Radiator Springs (USA) - 2006? - VTech - - - - - - - - - - - - - - Cars - Vollgas in Radiator Springs (Ger) - 2006? - VTech - - - - - - - - - - - - - Cars - Quatre Roues (Fra) - 2006? - VTech - - - - - - - - - - - - - Biler - Ræs i Kølerkildekøbing (Den) - 2007? - VTech - - - - - - - - - - - - - Bilar - Kör ikapp i Kylarköping (Swe) - 2007? - VTech - - - - - - - - - - - - - - Cinderella - Cinderella's Magic Wishes (USA) - 2005? - VTech - - - - - - - - - - - - - - Cinderella - Cinderella's Magic Wishes (USA, Alt) - 200? - VTech - - - - - - - - - Cendrillon - Le rêve enchanté de Cendrillon (Fra) - 2005? - VTech - - - - - - - - - - - - - Cinderella - Askepots magiske ønsker (Den) - 2006? - VTech - - - - - - - - - - - - - Cinderella - Lernen im Märchenland (Ger, Rev. 1) - 2007? - VTech - - - - - - - - - - - - - Cinderella - Lernen im Märchenland (Ger) - 2005? - VTech - - - - - - - - - - - - - Cinderella - Askungens magiska önskningar (Swe) - 2006? - VTech - - - - - - - - - - - - - - Disney's Mickey Mouse - Mickey's Magical Adventure (USA) - 200? - VTech - - - - - - - - - - Dora the Explorer - Dora's Fix-it Adventure (USA) - 2005? - VTech - - - - - - - - - - - - - Dora L'Exploratrice - Les aventures de Dora Apprentie Mécano (Fra) - 2005? - VTech - - - - - - - - - - - - - Dora - Doras Reparatur-Abenteuer (Ger, Rev. 1) - 200? - VTech - - - - - - - - - Elmos großes Abenteuer (Ger) - 2005? - VTech - - - - - - - - - - - - - V.Smile Fußball Schule (Ger) - 200? - VTech - - - - - - - - - - - - - Finding Nemo - Nemo's Ocean Discoveries (USA) - 2005? - VTech - - - - - - - - - - - - - Freds Zahlen Rallye (Ger) - 200? - VTech - - - - - - - - - - - - - Apprenti' Pilote (Fra) - 200? - VTech - - - - - - - - - - - - - - Kleine Einsteins (Ger) - 200? - VTech - - - - - - - - - Disney The Lion King - Simba's Big Adventure (USA) - 200? - VTech - - - - - - - - - Disney Løvernes Konge - Simbas Store Eventyr (Den) - 200? - VTech - - - - - - - - - - - - - Disney Lejonkungen - Simbas Stora Äventyr (Swe) - 200? - VTech - - - - - - - - - Meister Manny's Werkzeugkiste (Ger) - 2009? - VTech - - - - - - - - - - - - - Les Mélodilous - Les explorateurs vikings (Fra) - 2006? - VTech - - - - - - - - - - - - - - Micky - Mickys magisches Abenteuer (Ger) - 200? - VTech - - - - - - - - - Musse Pigg - Musses magiska äventyr (Swe) - 200? - VTech - - - - - - - - - - - - - Micky Maus Wunderhaus (Ger) - 200? - VTech - - - - - - - - - - - - - Mickey Mouse Clubhouse (Swe) - 200? - VTech - - - - - - - - - - - - - Monsters vs Aliens (Ger) - 2009? - VTech - - - - - - - - - - - - - Mein erster Hund (Ger) - 200? - VTech - - - - - - - - - - - - - Min hundvalp (Swe) - 2009? - VTech - - - - - - - - - - - - - Noddy - Detektiv für einen Tag (Ger, Rev. 1?) - 200? - VTech - - - - - - - - - - - - - Oben (Ger) - 2009? - VTech - - - - - - - - - - - - - Partyland Park - A Carnival of Play-and-Learn Fun (USA) - 2007? - VTech - - - - - - - - - - - - - Ratatouille - Remys neue Rezepte (Ger) - 2007? - VTech - - - - - - - - - - - - - Scooby-Doo! - Funland Frenzy (USA) - 200? - VTech - - - - - - - - - - - - - Scooby-Doo - Panique à Funland (Fra) - 200? - VTech - - - - - - - - - - - - - Scooby-Doo! - Im Lernpark (Ger) - 200? - VTech - - - - - - - - - - - - - Scooby-Doo! - Sjov i forlystelsesparken (Den) - 200? - VTech - - - - - - - - - - - - - Scooby-Doo! - Tivoli-tokerier (Swe) - 200? - VTech - - - - - - - - - - - - - Sesamstrasse - Ernies & Berts Fantastisches Abenteuer (Ger) - 2006? - VTech - - - - - - - - - - - - - Shrek the Third - Arthur's School Day Adventure (USA) - 2007? - VTech - - - - - - - - - - - - - Shrek - Die Geschichte des Drachen (Ger) - 2006? - VTech - - - - - - - - - - - - - - Shrek - Le Rhume de Dragonne (Fra) - 200? - VTech - - - - - - - - - Spider-Man & ses amis - Missions secrètes (Fra) - 2005? - VTech - - - - - - - - - - - - - Spider-Man & Freunde - Wettkampf im Space-Labor (Ger) - 2006? - VTech - - - - - - - - - - - - - Spongebob Squarepants - A Day in the Life of a Sponge (USA) - 2005? - VTech - - - - - - - - - - - - - Spongebob Schwammkopf - Der Tag des Schwamms (Ger, Rev. 1) - 2005? - VTech - - - - - - - - - - - - - Spongebob Schwammkopf - Der Tag des Schwamms (Ger) - 2005? - VTech - - - - - - - - - - - - - Superman - Der Superheld (Ger) - 200? - VTech - - - - - - - - - - - - - Superman - À la rescousse ! (Fra) - 200? - VTech - - - - - - - - - - - - - Thomas & seine Freunde - Freunde halten zusammen (Ger, Rev. 1) - 200? - VTech - - - - - - - - - Thomas & seine Freunde - Freunde Halten Zusammen (Ger) - 2007? - VTech - - - - - - - - - - - - - Thomas & Friends - Tågen hjälps åt (Swe) - 2007? - VTech - - - - - - - - - - - - - Tingeling (Swe) - 200? - VTech - - - - - - - - - Toy Story 2 - Operation: Rescue Woody! (USA) - 2005 - VTech - - - - - - - - - Toy Story 2 - Woodys Spannende Rettung (Ger) - 2006? - VTech - - - - - - - - - - - - - Toy Story 2 - Operation: Rädda Woody! (Swe) - 2005? - VTech - - - - - - - - - - - - - Wall-E (Ger) - 2008? - VTech - - - - - - - - - - - - - Wall-E (Swe) - 2008? - VTech - - - - - - - - - - - - - Winnie Puuh - Die Honigjagd (Ger) - 2004? - VTech - - - - - - - - - - - - - - My Friends Tigger & Pooh - Die Honigjagd (Ger) - 200? - VTech - - - - - - - - - Winnie l'Ourson - La Chasse au miel de Winnie (Fra) - 2004? - VTech - - - - - - - - - - - - - Peter Plys - Honningjagten (Den) - 200? - VTech - - - - - - - - - - - - - Nalle Puh - Honungsjakten (Swe) - 200? - VTech - - - - - - - - - - - - - V.Smile - Lern- und Tanzmatte (Ger) - 200? - VTech - - - - - - - - - - - - - V.Smile - Zeichenatelier (Ger) - 200? - VTech - - - - - - - - - - - - - - - - V.Smile Tecknarstudio (Swe) - 200? - VTech - - - - - - - - - - - - - - - - Zayzoo - My Alien Classmate (USA) - 200? - VTech - - - - - - - - - - Zayzoo: An Earth Adventure (USA, Rev. 1?) - 200? - VTech - - - - - - - - - - - - - Zayzoos Lernall (Ger) - 200? - VTech - - - - - - - - - - - - - Zézou - Notre Ami Venu d'Ailleurs (Fra) - 200? - VTech - - - - - - - - - - + + Cars - Rev It Up in Radiator Springs (USA) + 2006? + VTech + + + + + + + + + + + + + Cars - Vollgas in Radiator Springs (Ger) + 2006? + VTech + + + + + + + + + + + + + Cars - Quatre Roues (Fra) + 2006? + VTech + + + + + + + + + + + + + Biler - Ræs i Kølerkildekøbing (Den) + 2007? + VTech + + + + + + + + + + + + + Bilar - Kör ikapp i Kylarköping (Swe) + 2007? + VTech + + + + + + + + + + + + + + Disney Princess Cinderella - Cinderella's Magic Wishes (USA) + 2005? + VTech + + + + + + + + + + + + + Disney Princess Cinderella - Cinderella's Magic Wishes (USA, Alt) + 200? + VTech + + + + + + + + + + Disney Princesses Cendrillon - Le rêve enchanté de Cendrillon (Fra) + 2005? + VTech + + + + + + + + + + + + + Disney Princess Cinderella - Askepots magiske ønsker (Den) + 2006? + VTech + + + + + + + + + + + + + Disney Princess Cinderella - Lernen im Märchenland (Ger, Rev. 1) + 2007? + VTech + + + + + + + + + + + + + Disney Princess Cinderella - Lernen im Märchenland (Ger) + 2005? + VTech + + + + + + + + + + + + + Disney Princess Cinderella - Askungens magiska önskningar (Swe) + 2006? + VTech + + + + + + + + + + + + + Disney's Mickey Mouse - Mickey's Magical Adventure (USA) + 200? + VTech + + + + + + + + + + + Nick Jr Dora the Explorer - Dora's Fix-it Adventure (USA) + 2005? + VTech + + + + + + + + + + + + + Dora L'Exploratrice - Les aventures de Dora Apprentie Mécano (Fra) + 2005? + VTech + + + + + + + + + + + + + Nick Jr Dora - Doras Reparatur-Abenteuer (Ger, Rev. 1) + 2007? + VTech + + + + + + + + + + + + + Elmos großes Abenteuer (Ger) + 2005? + VTech + + + + + + + + + + + + + V.Smile Fußball Schule (Ger) + 200? + VTech + + + + + + + + + + + + + Disney/Pixar Finding Nemo - Nemo's Ocean Discoveries (USA) + 2005? + VTech + + + + + + + + + + + + + Freds Zahlen Rallye (Ger) + 200? + VTech + + + + + + + + + + + + + Apprenti' pilote (Fra) + 200? + VTech + + + + + + + + + + + + + Kleine Einsteins (Ger, Rev. 3?) + 2009? + VTech + + + + + + + + + + + + + Disney's The Lion King - Simba's Big Adventure (USA) + 200? + VTech + + + + + + + + + + + + + Disney Løvernes Konge - Simbas store eventyr (Den) + 200? + VTech + + + + + + + + + + + + + Disney Lejonkungen - Simbas stora äventyr (Swe) + 200? + VTech + + + + + + + + + + + + + Meister Manny's Werkzeugkiste (Ger) + 2009? + VTech + + + + + + + + + + + + + Nickelodeon Les Mélodilous - Les explorateurs vikings (Fra) + 2006? + VTech + + + + + + + + + + + + + Disneys Micky - Mickys magisches Abenteuer (Ger) + 2004? + VTech + + + + + + + + + + + + + Disneys Musse Pigg - Musses magiska äventyr (Swe) + 200? + VTech + + + + + + + + + + + + + Micky Maus Wunderhaus (Ger, Rev. 3?) + 200? + VTech + + + + + + + + + + + + + Mickey Mouse Clubhouse (Swe) + 200? + VTech + + + + + + + + + + + + + DreamWorks Monsters vs Aliens (Ger) + 2009? + VTech + + + + + + + + + + + + + Mein erster Hund (Ger) + 200? + VTech + + + + + + + + + + + + + Min hundvalp (Swe) + 2009? + VTech + + + + + + + + + + + + + Noddy - Detektiv für einen Tag (Ger, Rev. 1?) + 200? + VTech + + + + + + + + + + + + + Oben (Ger) + 2009? + VTech + + + + + + + + + + + + + Partyland Park - A Carnival of Play-and-Learn Fun (USA) + 2007? + VTech + + + + + + + + + + + + + Ratatouille - Remys neue Rezepte (Ger) + 2007? + VTech + + + + + + + + + + + + + Scooby-Doo! - Funland Frenzy (USA) + 200? + VTech + + + + + + + + + + + + + Scooby-Doo - Panique à Funland (Fra) + 200? + VTech + + + + + + + + + + + + + Scooby-Doo! - Im Lernpark (Ger) + 200? + VTech + + + + + + + + + + + + + Scooby-Doo! - Sjov i forlystelsesparken (Den) + 200? + VTech + + + + + + + + + + + + + Scooby-Doo! - Tivoli-tokerier (Swe) + 200? + VTech + + + + + + + + + + + + + Sesamstrasse - Ernies & Berts Fantastisches Abenteuer (Ger) + 2006? + VTech + + + + + + + + + + + + + Shrek the Third - Arthur's School Day Adventure (USA) + 2007? + VTech + + + + + + + + + + + + + Shrek - Die Geschichte des Drachen (Ger) + 2006? + VTech + + + + + + + + + + + + + + Shrek - Le Rhume de Dragonne (Fra) + 200? + VTech + + + + + + + + + Spider-Man & ses amis - Missions secrètes (Fra) + 2005? + VTech + + + + + + + + + + + + + Spider-Man & Freunde - Wettkampf im Space-Labor (Ger) + 2006? + VTech + + + + + + + + + + + + + Spongebob Squarepants - A Day in the Life of a Sponge (USA) + 2005? + VTech + + + + + + + + + + + + + Spongebob Schwammkopf - Der Tag des Schwamms (Ger, Rev. 1) + 2005? + VTech + + + + + + + + + + + + + Spongebob Schwammkopf - Der Tag des Schwamms (Ger) + 2005? + VTech + + + + + + + + + + + + + Superman - Der Superheld (Ger) + 200? + VTech + + + + + + + + + + + + + Superman - À la rescousse ! (Fra) + 200? + VTech + + + + + + + + + + + + + Thomas & seine Freunde - Freunde halten zusammen (Ger, Rev. 1) + 200? + VTech + + + + + + + + + Thomas & seine Freunde - Freunde Halten Zusammen (Ger) + 2007? + VTech + + + + + + + + + + + + + Thomas & Friends - Tågen hjälps åt (Swe) + 2007? + VTech + + + + + + + + + + + + + Tingeling (Swe) + 200? + VTech + + + + + + + + + Toy Story 2 - Operation: Rescue Woody! (USA) + 2005 + VTech + + + + + + + + + Toy Story 2 - Woodys Spannende Rettung (Ger) + 2006? + VTech + + + + + + + + + + + + + Toy Story 2 - Operation: Rädda Woody! (Swe) + 2005? + VTech + + + + + + + + + + + + + Wall-E (Ger) + 2008? + VTech + + + + + + + + + + + + + Wall-E (Swe) + 2008? + VTech + + + + + + + + + + + + + Winnie Puuh - Die Honigjagd (Ger) + 2004? + VTech + + + + + + + + + + + + + + My Friends Tigger & Pooh - Die Honigjagd (Ger) + 200? + VTech + + + + + + + + + Winnie l'Ourson - La Chasse au miel de Winnie (Fra) + 2004? + VTech + + + + + + + + + + + + + Peter Plys - Honningjagten (Den) + 200? + VTech + + + + + + + + + + + + + Nalle Puh - Honungsjakten (Swe) + 200? + VTech + + + + + + + + + + + + + V.Smile - Lern- und Tanzmatte (Ger) + 200? + VTech + + + + + + + + + + + + + V.Smile - Zeichenatelier (Ger) + 200? + VTech + + + + + + + + + + + + + + + + V.Smile Tecknarstudio (Swe) + 200? + VTech + + + + + + + + + + + + + + + + Zayzoo - My Alien Classmate (USA) + 200? + VTech + + + + + + + + + + Zayzoo: An Earth Adventure (USA, Rev. 1?) + 200? + VTech + + + + + + + + + + + + + Zayzoos Lernall (Ger) + 200? + VTech + + + + + + + + + + + + + Zézou - Notre Ami Venu d'Ailleurs (Fra) + 200? + VTech + + + + + + + + + + diff --git a/hash/vsmileb_cart.xml b/hash/vsmileb_cart.xml index 2fd58c4b07e..298126757ad 100644 --- a/hash/vsmileb_cart.xml +++ b/hash/vsmileb_cart.xml @@ -4,7 +4,7 @@ NOTE: This list is here only to document available dumps and it's not used (yet) by MESS! --> - + - - Meine kleinen Tierfreunde (Ger) - 200? - VTech - - - - - - - - - - - - - Mein erster Bauernhof (Ger) - 200? - VTech - - - - - - - - - - + + Meine kleinen Tierfreunde (Ger) + 200? + VTech + + + + + + + + + + + + + Mein erster Bauernhof (Ger) + 200? + VTech + + + + + + + + + + + + + Pooh's Hundred Acre Wood Adventure (USA) (V.Smile Baby) + 2007 + VTech + + + + + + + + + Puuhs Hundert-Morgen-Wald (Ger) + 2006? + VTech + + + + + + + + + Nalle Puhs Äventyr i Sjumilaskogen (Swe) + 2007? + VTech + + + + + + + + + + + + + Lär och upptäck (Swe) + 200? + VTech + + + + + + - - Pooh's Hundred Acre Wood Adventure (USA) (V.Smile Baby) - 2007 - VTech - - - - - - - - - Puuhs Hundert-Morgen-Wald (Ger) - 2006? - VTech - - - - - - - - - Nalle Puhs Äventyr i Sjumilaskogen (Swe) - 2007? - VTech - - - - - - - - - - - - - Lär och upptäck (Swe) - 200? - VTech - - - - - - - \ No newline at end of file From afb793686af218cd771f8950aae9cc61206004cb Mon Sep 17 00:00:00 2001 From: Fake Shemp Date: Thu, 20 Oct 2016 15:51:47 +0200 Subject: [PATCH 04/30] Document the last carts. --- hash/vsmile_cart.xml | 568 +++++++++++++++++------------------------- hash/vsmileb_cart.xml | 129 ++++++---- hash/vsmilem_cart.xml | 275 ++++++++++++++++++-- 3 files changed, 564 insertions(+), 408 deletions(-) diff --git a/hash/vsmile_cart.xml b/hash/vsmile_cart.xml index 5a8f16cbea2..3ca4b4c24e5 100644 --- a/hash/vsmile_cart.xml +++ b/hash/vsmile_cart.xml @@ -4,7 +4,6 @@ - @@ -685,6 +475,7 @@ Language: + @@ -700,6 +491,7 @@ Language: + @@ -715,6 +507,7 @@ Language: + @@ -730,6 +523,7 @@ Language: + @@ -745,6 +539,7 @@ Language: + @@ -760,6 +555,7 @@ Language: + @@ -775,6 +571,7 @@ Language: + @@ -790,6 +587,7 @@ Language: + @@ -805,6 +603,7 @@ Language: + @@ -821,6 +620,7 @@ Language: + @@ -836,6 +636,7 @@ Language: + @@ -851,6 +652,7 @@ Language: + @@ -866,6 +668,7 @@ Language: + @@ -882,6 +685,7 @@ Language: + @@ -897,6 +701,7 @@ Language: + @@ -912,6 +717,7 @@ Language: + @@ -927,6 +733,7 @@ Language: + @@ -943,6 +750,7 @@ Language: + @@ -958,6 +766,7 @@ Language: + @@ -985,6 +794,7 @@ Language: + @@ -1000,6 +810,7 @@ Language: + @@ -1015,6 +826,7 @@ Language: + @@ -1030,6 +842,7 @@ Language: + @@ -1045,6 +858,7 @@ Language: + @@ -1073,6 +887,7 @@ Language: + @@ -1088,6 +903,7 @@ Language: + @@ -1103,6 +919,7 @@ Language: + @@ -1118,6 +935,7 @@ Language: + @@ -1133,6 +951,7 @@ Language: + @@ -1148,6 +967,7 @@ Language: + @@ -1163,6 +983,7 @@ Language: + @@ -1178,6 +999,7 @@ Language: + @@ -1193,6 +1015,7 @@ Language: + @@ -1208,6 +1031,7 @@ Language: + @@ -1223,6 +1047,7 @@ Language: + @@ -1238,6 +1063,7 @@ Language: + @@ -1253,6 +1079,7 @@ Language: + @@ -1268,6 +1095,7 @@ Language: + @@ -1283,6 +1111,7 @@ Language: + @@ -1298,6 +1127,7 @@ Language: + @@ -1313,6 +1143,7 @@ Language: + @@ -1328,6 +1159,7 @@ Language: + @@ -1343,6 +1175,7 @@ Language: + @@ -1358,9 +1191,10 @@ Language: + - + @@ -1373,69 +1207,74 @@ Language: + - + - Noddy - Detektiv für einen Tag (Ger, Rev. 1?) + Noddy - Detektiv für einen Tag (Ger, Rev. 3?) 200? VTech + - + - Oben (Ger) + Disney/Pixar Oben (Ger) 2009? VTech + - + - Partyland Park - A Carnival of Play-and-Learn Fun (USA) + Cranium Partyland Park - A Carnival of Play-and-Learn Fun (USA) 2007? VTech + - + - Ratatouille - Remys neue Rezepte (Ger) + Disney/Pixar Ratatouille - Remys neue Rezepte (Ger) 2007? VTech + - + @@ -1448,9 +1287,10 @@ Language: + - + @@ -1463,9 +1303,10 @@ Language: + - + @@ -1478,9 +1319,10 @@ Language: + - + @@ -1493,9 +1335,10 @@ Language: + - + @@ -1508,66 +1351,74 @@ Language: + - + - Sesamstrasse - Ernies & Berts Fantastisches Abenteuer (Ger) + Ernies & Berts Fantastisches Abenteuer (Ger) 2006? VTech + - + - Shrek the Third - Arthur's School Day Adventure (USA) + DreamWorks Shrek the Third - Arthur's School Day Adventure (USA) 2007? VTech + - + - Shrek - Die Geschichte des Drachen (Ger) + DreamWorks Shrek - Die Geschichte des Drachen (Ger) 2006? VTech + - + - - Shrek - Le Rhume de Dragonne (Fra) - 200? + DreamWorks Shrek - Le rhume de Dragonne (Fra) + 2006? VTech + + + + + - + @@ -1580,9 +1431,10 @@ Language: + - + @@ -1595,54 +1447,58 @@ Language: + - + - Spongebob Squarepants - A Day in the Life of a Sponge (USA) + Nickelodeon Spongebob Squarepants - A Day in the Life of a Sponge (USA) 2005? VTech + - + - Spongebob Schwammkopf - Der Tag des Schwamms (Ger, Rev. 1) + Nickelodeon Spongebob Schwammkopf - Der Tag des Schwamms (Ger, Rev. 1) 2005? VTech + - + - Spongebob Schwammkopf - Der Tag des Schwamms (Ger) + Nickelodeon Spongebob Schwammkopf - Der Tag des Schwamms (Ger) 2005? VTech + - + @@ -1655,9 +1511,10 @@ Language: + - + @@ -1670,20 +1527,26 @@ Language: + - + - Thomas & seine Freunde - Freunde halten zusammen (Ger, Rev. 1) - 200? + Thomas & seine Freunde - Freunde Halten Zusammen (Ger, Rev. 1) + 2007? VTech + + + + + - + @@ -1696,9 +1559,10 @@ Language: + - + @@ -1707,167 +1571,187 @@ Language: Thomas & Friends - Tågen hjälps åt (Swe) 2007? VTech - + + - + Tingeling (Swe) - 200? + 2010? VTech + + + + + - + - Toy Story 2 - Operation: Rescue Woody! (USA) + Disney/Pixar Toy Story 2 - Operation: Rescue Woody! (USA) 2005 VTech + - + - Toy Story 2 - Woodys Spannende Rettung (Ger) + Disney/Pixar Toy Story 2 - Woodys Spannende Rettung (Ger) 2006? VTech + - + - Toy Story 2 - Operation: Rädda Woody! (Swe) + Disney/Pixar Toy Story 2 - Operation: Rädda Woody! (Swe) 2005? VTech + - + - Wall-E (Ger) + Disney/Pixar Wall-E (Ger) 2008? VTech + - + - Wall-E (Swe) + Disney/Pixar Wall-E (Swe) 2008? VTech + - + - Winnie Puuh - Die Honigjagd (Ger) + Disneys Winnie Puuh - Die Honigjagd (Ger) 2004? VTech + - + - My Friends Tigger & Pooh - Die Honigjagd (Ger) - 200? + 2008? VTech + + + + + - + - Winnie l'Ourson - La Chasse au miel de Winnie (Fra) + Disney Winnie l'Ourson - La Chasse au miel de Winnie (Fra) 2004? VTech + - + - Peter Plys - Honningjagten (Den) + Disney Peter Plys - Honningjagten (Den) 200? VTech + - + - Nalle Puh - Honungsjakten (Swe) + Disney Nalle Puh - Honungsjakten (Swe) 200? VTech + + - + @@ -1880,25 +1764,27 @@ Language: + - + - V.Smile - Zeichenatelier (Ger) + V.Smile Zeichenatelier (Ger) 200? VTech + - + @@ -1913,6 +1799,7 @@ Language: + @@ -1923,34 +1810,35 @@ Language: - + Zayzoo - My Alien Classmate (USA) 200? VTech + - + - - - Zayzoo: An Earth Adventure (USA, Rev. 1?) + + Zayzoo: An Earth Adventure (USA) 200? VTech + - + - + Zayzoos Lernall (Ger) 200? VTech @@ -1958,14 +1846,15 @@ Language: + - + - + Zézou - Notre Ami Venu d'Ailleurs (Fra) 200? VTech @@ -1973,9 +1862,10 @@ Language: + - + diff --git a/hash/vsmileb_cart.xml b/hash/vsmileb_cart.xml index 298126757ad..527aa2d73ab 100644 --- a/hash/vsmileb_cart.xml +++ b/hash/vsmileb_cart.xml @@ -1,83 +1,103 @@ + - - + + Meine kleinen Tierfreunde (Ger) 200? @@ -86,9 +106,9 @@ The V.Baby currently have no dumps available, hence the list is temporarily list - + - + @@ -109,12 +129,13 @@ The V.Baby currently have no dumps available, hence the list is temporarily list - Pooh's Hundred Acre Wood Adventure (USA) (V.Smile Baby) + Pooh's Hundred Acre Wood Adventure (USA) 2007 VTech + - + @@ -138,9 +159,9 @@ The V.Baby currently have no dumps available, hence the list is temporarily list - + - + diff --git a/hash/vsmilem_cart.xml b/hash/vsmilem_cart.xml index a0140363b29..6e50321d5c0 100644 --- a/hash/vsmilem_cart.xml +++ b/hash/vsmilem_cart.xml @@ -1,55 +1,300 @@ + + + - Cinderella - Lernen im Märchenland (Ger) + Disney Princess Cinderella - Lernen im Märchenland (Ger) 2010? VTech - + - + - Kung Fu Panda - Der Weg des Panda (Ger) - 200? + DreamWorks Kung Fu Panda - Der Weg des Panda (Ger) + 2008? VTech + + + + - + - Dora - Doras Reparatur-Abenteuer (Ger) + Nick Dora - Doras Reparatur-Abenteuer (Ger) 2009? VTech - + - + - - Kleine Einsteins (Ger) (V.Smile Motion) + + Kleine Einsteins (Ger) 200? VTech + @@ -65,9 +310,9 @@ NOTE: This list is here only to document available dumps and it's not used (yet) - + - + @@ -80,9 +325,9 @@ NOTE: This list is here only to document available dumps and it's not used (yet) - + - + From 911483a29c564744fddc3af35488201efb0dd49b Mon Sep 17 00:00:00 2001 From: Fake Shemp Date: Thu, 20 Oct 2016 15:54:25 +0200 Subject: [PATCH 05/30] Fix typo. --- hash/vsmile_cart.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hash/vsmile_cart.xml b/hash/vsmile_cart.xml index 3ca4b4c24e5..b8eebe92abe 100644 --- a/hash/vsmile_cart.xml +++ b/hash/vsmile_cart.xml @@ -1210,7 +1210,7 @@ Game cartridges - + From f5de6e4cc321c4a15dcec2ed4182d8401aaf4976 Mon Sep 17 00:00:00 2001 From: Fake Shemp Date: Thu, 20 Oct 2016 20:17:32 +0200 Subject: [PATCH 06/30] Add some carts to undumped list. --- hash/vsmile_cart.xml | 766 ++++++++++++++++++++++-------------------- hash/vsmilem_cart.xml | 511 ++++++++++++++-------------- 2 files changed, 660 insertions(+), 617 deletions(-) diff --git a/hash/vsmile_cart.xml b/hash/vsmile_cart.xml index b8eebe92abe..55973fab7a2 100644 --- a/hash/vsmile_cart.xml +++ b/hash/vsmile_cart.xml @@ -29,438 +29,486 @@ Addons (w/ yellow Smartridges) +========+===================+============================================================================+ | Dumped | Serial | Name | +========+===================+============================================================================+ -| | 80-091440(US) | V.Smile Smart Keyboard | -| | 80-091443(UK) | V.Smile Smart Keyboard | -| | 80-091444(GE) | V.Smile Tastatur fuer Lernkonsole | -+========+===================+============================================================================+ -| | 80-03600(US) | V.Smile PC Pal Island | -+========+===================+============================================================================+ -| | 80-036800(US) | V.Smile PC Pal Island (cart serial) | -| | 80-036822(SP) | V.Smile PC Pal Island (cart serial) | -+========+===================+============================================================================+ -| | 80-067000(US) | V.Smile Art Studio | -| | 80-067003(UK) | V.Smile Art Studio | -| XX | 80-067004(GE) | V.Smile Zeichenatelier (Magic Malboard) | -| | 80-067005(FR) | V.Smile Studio De Dessin | -| XX | 80-067021(SE) | V.Smile Tecknarstudio (Swe) | -| | 80-067022(SP) | V.Smile Estudio de Arte ORG | -| | 80-067033(NO) | V.Smile Tegnestudio | -| | 80-067057(SP) | V.Smile Estudio de Arte PINK | -+========+===================+============================================================================+ -| | 80-091320(US) | V.Smile Jamming Gym Class | -| | 80-091322(NL) | V.Smile Muziek en Leer Mat | -| | 80-091323(UK) | V.Smile Dance'n'Learn | -| | 80-091324(GE) | V.Smile Lern- und Tanzmatte | -| | 80-091325(FR) | V.Smile Defi Gym | -| | 80-091325(FR) | V.Smile Tapis Multisport (box serial) | -| | 80-091327(SP) | V.Smile Gimnasio Interactivo | +| | 80-091440(US) | V.Smile Smart Keyboard | +| | 80-091443(UK) | V.Smile Smart Keyboard | +| | 80-091444(GE) | V.Smile Tastatur fuer Lernkonsole | ++========+===================+============================================================================+ +| | 80-03600(US) | V.Smile PC Pal Island | ++========+===================+============================================================================+ +| | 80-036800(US) | V.Smile PC Pal Island (cart serial) | +| | 80-036822(SP) | V.Smile PC Pal Island (cart serial) | ++========+===================+============================================================================+ +| | 80-067000(US) | V.Smile Art Studio | +| | 80-067003(UK) | V.Smile Art Studio | +| XX | 80-067004(GE) | V.Smile Zeichenatelier (Magic Malboard) | +| | 80-067005(FR) | V.Smile Studio De Dessin | +| | (DK) | V.Smile Tegnestudie | +| XX | 80-067021(SE) | V.Smile Tecknarstudio | +| | 80-067022(SP) | V.Smile Estudio de Arte ORG | +| | 80-067033(NO) | V.Smile Tegnestudio | +| | 80-067057(SP) | V.Smile Estudio de Arte PINK | ++========+===================+============================================================================+ +| | 80-091320(US) | V.Smile Jamming Gym Class | +| | 80-091322(NL) | V.Smile Muziek en Leer Mat | +| | 80-091323(UK) | V.Smile Dance'n'Learn | +| | 80-091324(GE) | V.Smile Lern- und Tanzmatte | +| | 80-091325(FR) | V.Smile Defi Gym | +| | 80-091325(FR) | V.Smile Tapis Multisport (box serial) | +| | 80-091327(SP) | V.Smile Gimnasio Interactivo | +========+===================+============================================================================+ Game cartridges +========+===================+============================================================================+ | Dumped | Serial | Name | +========+===================+============================================================================+ -| Vtech ran out of UPC codes at 92999, these are wraparound and newer than 92xxx series. -| They also say 'v.link compatible' on the back though not all are v.motion compatible +| Vtech ran out of UPC codes at 92999, these are wraparound and newer than 92xxx series. | +| They also say 'v.link compatible' on the back though not all are v.motion compatible | +========+===================+============================================================================+ -| | 80-090000(US) | Up <- need pic -| | 80-090000-001(US) | Up -| | 80-090004(GE) | Oben -| | 80-090004-004(GE) | Oben -| | 80-090005(FR) | La Haut +| | 80-090000(US) | Up <- need pic | +| | 80-090000-001(US) | Up | +| | 80-090004(GE) | Oben | +| XX | 80-090004-004(GE) | Oben | +| | 80-090005(FR) | La Haut | +========+===================+============================================================================+ -| | 80-090020(US) | Handy Manny -| | 80-090023(UK) | Handy Manny -| | 80-090024(GE) | Meister Manny's Werkzeugkiste -| | 80-090025(FR) | Manny Et Ses Outils +| | 80-090020(US) | Handy Manny | +| | 80-090023(UK) | Handy Manny | +| XX | 80-090024(GE) | Meister Manny's Werkzeugkiste | +| | 80-090025(FR) | Manny Et Ses Outils | +========+===================+============================================================================+ -| | 80-090040(US) | Wow! Wow! Wubbzy! - Attack of the 50-Foot Fleegle +| | 80-090040(US) | Wow! Wow! Wubbzy! - Attack of the 50-Foot Fleegle | +========+===================+============================================================================+ -| | 80-090060(US) | +| | 80-090060(US) | | +========+===================+============================================================================+ -| | 80-090080(US) | +| | 80-090080(US) | | +========+===================+============================================================================+ -| | 80-090100(US) | +| | 80-090100(US) | | +========+===================+============================================================================+ -| | 80-090120(US) | +| | 80-090120(US) | | +========+===================+============================================================================+ -| | 80-090140(US) | (Should be My Pet Puppy) -| | 80-090142(NL) | Mijn Puppy! -| | 80-090144(GE) | Mein erster Hund -| | 80-090145(FR) | Mon Toutou Tout Fou! -| | 80-090147(SP) | Dakota y su mascota (EAN 3417766901475) +| | 80-090140(US) | (Should be My Pet Puppy) | +| | 80-090142(NL) | Mijn Puppy! | +| XX | 80-090144(GE) | Mein erster Hund | +| | 80-090145(FR) | Mon Toutou Tout Fou! | +| | 80-090147(SP) | Dakota y su mascota (EAN 3417766901475) | +| | (DK) | Min hundehvalp | +| XX | 80-090154(SE) | Min hundvalp | +| | (NO) | Min valp | +| | (FI) | Koiranpentuni | +========+===================+============================================================================+ | | 80-090160(US) | Should be Monsters vs. Aliens #80-084440, exists in vtech v.link database -| | 80-090163(UK) | Monsters vs. Aliens -| | 80-090164(GE) | Monsters vs. Aliens -| | 80-090165(FR) | Monsters Contre Aliens -| | 80-090167(SP) | Monstruos contra Alienigenas +| | 80-090163(UK) | Monsters vs. Aliens | +| XX | 80-090164(GE) | Monsters vs. Aliens | +| | 80-090165(FR) | Monsters Contre Aliens | +| | 80-090167(SP) | Monstruos contra Alienigenas | +========+===================+============================================================================+ -| | 80-090180(US) | -| | 80-090183(UK) | Wonder Pets! - Save the Animals +| | 80-090180(US) | | +| | 80-090183(UK) | Wonder Pets! - Save the Animals | +========+===================+============================================================================+ -| | 80-090200(US) | +| | 80-090200(US) | | +========+===================+============================================================================+ -| | 80-090220(US) | should be Wild Waves (purple) -| | 80-090224(GE) | Dolphis Wasser-abenteuer +| | 80-090220(US) | should be Wild Waves (purple) | +| | 80-090224(GE) | Dolphis Wasser-abenteuer | +========+===================+============================================================================+ -| | 80-090240(US) | +| | 80-090240(US) | | +========+===================+============================================================================+ -| | 80-090260(US) | Disney Fairies: Tinker Bell +| | 80-090260(US) | Disney Fairies: Tinker Bell | +| | (DK) | Disney Fairies: Tingeling | +| | 80-090274(SE) | Disney Fairies: Tingeling | +| | 80-090275(NO) | Disney Fairies: Tingeling | +| | (FI) | Disney Fairies: Helinä-keiju | +========+===================+============================================================================+ -| | -| | Oldest Smartidges start here -| | +| | +| Oldest Smartidges start here | +| | +========+===================+============================================================================+ -| XX | 80-092000(US) | Alphabet Park Adventure (Red Haired Girl Version) -| | 80-092000-101(US) | Alphabet Park Adventure (Blond Haired Girl Version) -| | (IT) | Avventura nel parco dell'alfabeto -| | 80-092002(NL) | Alfabet Pretpark -| | 80-092003(UK) | Alphabet Park Adventure (Red Haired Girl Version) -| | 80-092004(GE) | Abenteuer im ABC Park -| | 80-092005(FR) | ABC Land Aventure -| | 80-092006(PT) | ABC Adventure (EAN is 3417768920162 cart#92016) -| | 80-092007(SP) | Aventuras en el Parque Alfabeto (purple) -| | 80-092007(SP) | Aventuras en el Parque Alfabeto (translucent) (No # on label) +| XX | 80-092000(US) | Alphabet Park Adventure (Red Haired Girl Version) | +| | 80-092000-101(US) | Alphabet Park Adventure (Blond Haired Girl Version) | +| | (IT) | Avventura nel parco dell'alfabeto | +| | 80-092002(NL) | Alfabet Pretpark | +| | 80-092003(UK) | Alphabet Park Adventure (Red Haired Girl Version) | +| | 80-092004(GE) | Abenteuer im ABC Park | +| | 80-092005(FR) | ABC Land Aventure | +| | 80-092006(PT) | ABC Adventure (EAN is 3417768920162 cart#92016) | +| | 80-092007(SP) | Aventuras en el Parque Alfabeto (purple) | +| | 80-092007(SP) | Aventuras en el Parque Alfabeto (translucent) (No # on label) | +========+===================+============================================================================+ -| | 80-092020(US) | The Adventures of Little Red Riding Hood +| | 80-092020(US) | The Adventures of Little Red Riding Hood | | | 80-092023(UK) | The Adventures of Little Red Riding Hood (no # on label, but box says 'colours') -| XX | 80-092024(GE) | Entdecke die Welt von Rotkäppchen -| | 80-092025(FR) | Les aventures du Le Petit Chaperon Rouge +| XX | 80-092024(GE) | Entdecke die Welt von Rotkäppchen | +| | 80-092025(FR) | Les aventures du Le Petit Chaperon Rouge | +========+===================+============================================================================+ -| | 80-092040(US) | Learnin' Wheels (blue car with guy driving) -| | 80-092043(UK) | Learnin' Wheels -| | 80-092044(GE) | Freds Zahlen Rally (note to self, guy in blue car wrong serial#) 80-092924(GE) on label -| | 80-092045(FR) | Apprenti' Pilote +| | 80-092040(US) | Learnin' Wheels (blue car with guy driving) | +| | 80-092043(UK) | Learnin' Wheels | +| XX | 80-092044(GE) | Freds Zahlen Rally (note to self, guy in blue car wrong serial#) 80-092924(GE) on label +| XX | 80-092045(FR) | Apprenti' Pilote | +========+===================+============================================================================+ -| | 80-092060(US) | Winnie The Pooh: The Honey Hunt -| | (IT) | Winnie the Pooh - e la caccia al miele -| | 80-092062(NL) | Winnie de Poeh - De winderwereld van Poeh -| | 80-092063(UK) | Winnie The Pooh: The Honey Hunt -| XX | 80-092064(GE) | Pooh - Die Honigjagd -| | 80-092064(GE) | Pooh - Die Honigjagd (ALT-no# on label) -| | 80-092064(GE) | My Friends Tigger and Pooh - Die Honigjagd (yes, Tigger on this one) -| XX | 80-092064-104(GE) | My Friends Tigger and Pooh - Die Honigjagd (yes, Tigger on this one) -| XX | 80-092065(FR) | Winnie l'Ourson - La Chasse au miel de Winnie -| | 80-092065-105(FR) | Winnie Rourson - La Chasse au miel de Winnie (ALT) -| | 80-092066(PT) | Winnie the Pooh - Em Busca Do Mel (92076 on cart) +| | 80-092060(US) | Winnie The Pooh: The Honey Hunt | +| | (IT) | Winnie the Pooh - e la caccia al miele | +| | 80-092062(NL) | Winnie de Poeh - De winderwereld van Poeh | +| | 80-092063(UK) | Winnie The Pooh: The Honey Hunt | +| XX | 80-092064(GE) | Pooh - Die Honigjagd | +| | 80-092064(GE) | Pooh - Die Honigjagd (ALT-no# on label) | +| | 80-092064(GE) | My Friends Tigger and Pooh - Die Honigjagd (yes, Tigger on this one) | +| XX | 80-092064-104(GE) | My Friends Tigger and Pooh - Die Honigjagd (yes, Tigger on this one) | +| XX | 80-092065(FR) | Winnie l'Ourson - La Chasse au miel de Winnie | +| | 80-092065-105(FR) | Winnie Rourson - La Chasse au miel de Winnie (ALT) | +| | 80-092066(PT) | Winnie the Pooh - Em Busca Do Mel (92076 on cart) | | | 80-092067(SP) | Winnie the Pooh (My Friends Tigger and Pooh) - En Busca de la Miel (no # on label) -| | 80-092067-122(SP) | Winnie the Pooh (My Friends Tigger and Pooh) - En Busca de la Miel -| XX | 80-092073(DK) | Peter Plys - Honningjagten -| XX | 80-092074(SE) | Nalle Puh - Honungsjakten -| | (NO) | Winnie the Pooh - Honningjakten -| | (NO) | Ole Brumm - Honningjakten -| | (FI) | Winnie the Pooh - Hunajajahti +| | 80-092067-122(SP) | Winnie the Pooh (My Friends Tigger and Pooh) - En Busca de la Miel | +| XX | 80-092073(DK) | Peter Plys - Honningjagten | +| XX | 80-092074(SE) | Nalle Puh - Honungsjakten | +| | (NO) | Winnie the Pooh - Honningjakten | +| | (NO) | Ole Brumm - Honningjakten | +| | (FI) | Winnie the Pooh - Hunajajahti | +========+===================+============================================================================+ -| | 80-092080(US) | Mickey Mouse - Mickey's Magical Adventures -| | (IT) | Topolino - Le Magiche Avventure di Topolino -| | 80-092082(NL) | Mickey Mouse - De wonderwereld van Mickey -| | 80-092083(UK) | Mickey Mouse - Mickey's Magical Adventures -| | 80-092084(GE) | Micky - Mickys magisches Abenteuer -| | 80-092085(FR) | Mickey - Mickey a la recherche de Pluto -| | 80-092086(PT) | Mickey - A Aventura Magica de Mickey (EAN is 3417768920964 cart 92096) -| | 80-092087(SP) | Mickey - La Aventura Magica de Mickey +| XX | 80-092080(US) | Mickey Mouse - Mickey's Magical Adventures | +| | (IT) | Topolino - Le Magiche Avventure di Topolino | +| | 80-092082(NL) | Mickey Mouse - De wonderwereld van Mickey | +| | 80-092083(UK) | Mickey Mouse - Mickey's Magical Adventures | +| XX | 80-092084(GE) | Micky - Mickys magisches Abenteuer | +| | 80-092085(FR) | Mickey - Mickey a la recherche de Pluto | +| | 80-092086(PT) | Mickey - A Aventura Magica de Mickey (EAN is 3417768920964 cart 92096) | +| | 80-092087(SP) | Mickey - La Aventura Magica de Mickey | +| | (DK) | Mickey | +| | 80-092094(SE) | Musse Pigg - Musses magiska äventyr | +| | (NO) | Mickey | +| | (FI) | Mickey | +========+===================+============================================================================+ -| | 80-092100(US) | The Lion King: Simba's Big Adventure -| | (IT) | Il Re Leone - La Grande Avventura di Simba -| | 80-092102(NL) | Leeuwenkoning - De wonderwereld van Simba -| | 80-092103(UK) | The Lion King: Simba's Big Adventure -| | 80-092104(GE) | Der Koenig der Loewen - Simbas grosses Abenteuer -| | 80-092105(FR) | Roi Lion - Simba Decouvre la Jungle -| | 80-092106(PT) | O Rei Leao - A grande aventura de Simba (92116 on cart) -| | 80-092107(SP) | Rey Leon - La Gran Aventura de Simba +| XX | 80-092100(US) | The Lion King: Simba's Big Adventure | +| | (IT) | Il Re Leone - La Grande Avventura di Simba | +| | 80-092102(NL) | Leeuwenkoning - De wonderwereld van Simba | +| | 80-092103(UK) | The Lion King: Simba's Big Adventure | +| | 80-092104(GE) | Der Koenig der Loewen - Simbas grosses Abenteuer | +| | 80-092105(FR) | Roi Lion - Simba Decouvre la Jungle | +| | 80-092106(PT) | O Rei Leao - A grande aventura de Simba (92116 on cart) | +| | 80-092107(SP) | Rey Leon - La Gran Aventura de Simba | +| XX | 80-092113(DK) | Løvernes Konge - Simbas store eventyr | +| XX | 80-092114(SE) | Lejonkungen - Simbas stora äventyr | +| | (NO) | Løvenes konge - Simbas store eventyr | +| | (FI) | Leijona kuningas - Simban suuri seikkailu | +========+===================+============================================================================+ -| | 80-092120(US) | The Little Mermaid - Ariel's Majestic Journey -| | 80-092121(IT) | Sirenetta - Ariel e le -| | 80-092122(NL) | De Kleine Zeemeermin - De Wunderwereld von Ariel -| | 80-092123(UK) | The Little Mermaid - Ariel's Majestic Journey -| XX | 80-092124(GE) | Arielle die Meerjungfrau - Arielles aufregendes Abenteuer -| XX | 80-092125(FR) | La Petite Sirene - Ariel devient une princesse -| | 80-092126(PT) | -| | 80-092127(SP) | La Sirenita - El Vieje Fantastico de Ariel -| XX | 80-092133(DK) | Den Lille Havfrue - Ariels majestætiske rejse! -| XX | 80-092134(SE) | Den Lilla Sjöjungfrun - Ariels majestätiska resa! -| | (NO) | Den Lille Havfruen - Ariels majestetiske reise! -| | (FI) | Pieni Merenneito - Arielin majesteettinen matka +| | 80-092120(US) | The Little Mermaid - Ariel's Majestic Journey | +| | 80-092121(IT) | Sirenetta - Ariel e le | +| | 80-092122(NL) | De Kleine Zeemeermin - De Wunderwereld von Ariel | +| | 80-092123(UK) | The Little Mermaid - Ariel's Majestic Journey | +| XX | 80-092124(GE) | Arielle die Meerjungfrau - Arielles aufregendes Abenteuer | +| XX | 80-092125(FR) | La Petite Sirene - Ariel devient une princesse | +| | 80-092126(PT) | | +| | 80-092127(SP) | La Sirenita - El Vieje Fantastico de Ariel | +| XX | 80-092133(DK) | Den Lille Havfrue - Ariels majestætiske rejse! | +| XX | 80-092134(SE) | Den Lilla Sjöjungfrun - Ariels majestätiska resa! | +| | (NO) | Den Lille Havfruen - Ariels majestetiske reise! | +| | (FI) | Pieni Merenneito - Arielin majesteettinen matka | +========+===================+============================================================================+ -| | 80-092140(US) | Spider-Man & Friends - Secret Missions -| | 80-092140-101(US) | Spider-Man & Friends - Secret Missions (ALT) -| | 80-092142(NL) | Spider-Man en Vrienden! - Geheime Missies (white Webs) -| | 80-092142-123(NL) | Spider-Man en Vrienden! - Geheime Missies (Yellow webs) -| | 80-092143(UK) | Spider-Man & Friends - Secret Missions (no # on front label) -| | 80-092143-103(UK) | Spider-Man & Friends - Secret Missions (ALT) -| | 80-092144(GE) | Spider-Man & Freunde - Geheime Missionen -| | 80-092145(FR) | Spider-Man and ses amis - Missions Secretes (white webs) -| | 80-092145-105(FR) | Spider-Man and ses amis - Missions Secretes (yellow webs) -| | 80-092146(PT) | Spider-man & Amigos - Missoes Secretas -| | 80-092147(SP) | Spider-Man y Amigos - Misiones Secretas (white webs) -| | 80-092147-122(SP) | Spider-Man y Amigos - Misiones Secretas (yellow webs) +| | 80-092140(US) | Spider-Man & Friends - Secret Missions | +| | 80-092140-101(US) | Spider-Man & Friends - Secret Missions (ALT) | +| | 80-092142(NL) | Spider-Man en Vrienden! - Geheime Missies (white Webs) | +| | 80-092142-123(NL) | Spider-Man en Vrienden! - Geheime Missies (Yellow webs) | +| | 80-092143(UK) | Spider-Man & Friends - Secret Missions (no # on front label) | +| | 80-092143-103(UK) | Spider-Man & Friends - Secret Missions (ALT) | +| | 80-092144(GE) | Spider-Man & Freunde - Geheime Missionen | +| XX | 80-092145(FR) | Spider-Man and ses amis - Missions Secretes (white webs) | +| | 80-092145-105(FR) | Spider-Man and ses amis - Missions Secretes (yellow webs) | +| | 80-092146(PT) | Spider-man & Amigos - Missoes Secretas | +| | 80-092147(SP) | Spider-Man y Amigos - Misiones Secretas (white webs) | +| | 80-092147-122(SP) | Spider-Man y Amigos - Misiones Secretas (yellow webs) | +========+===================+============================================================================+ -| | 80-092160(US) | Scooby-Doo! - Funland Frenzy -| | 80-092160-101(US) | Scooby-Doo! - Funland Frenzy (ALT) -| | (IT) | Scooby-Doo! - Avventura e Funland -| | 80-092162(NL) | Scooby-Doo griezelen in het pretpark -| | 80-092163(UK) | Scooby-Doo! - Funland Frenzy -| | 80-092163-103(UK) | Scooby-Doo! - Funland Frenzy +| XX | 80-092160(US) | Scooby-Doo! - Funland Frenzy | +| | 80-092160-101(US) | Scooby-Doo! - Funland Frenzy (ALT) | +| | (IT) | Scooby-Doo! - Avventura e Funland | +| | 80-092162(NL) | Scooby-Doo griezelen in het pretpark | +| | 80-092163(UK) | Scooby-Doo! - Funland Frenzy | +| | 80-092163-103(UK) | Scooby-Doo! - Funland Frenzy | | | 80-092163-293(UK) | Scooby-Doo! - Funland Frenzy (Yellow, only Scooby on label might be motion version) -| | 80-092165(FR) | Scooby-Doo! - Panique a Funland -| | 80-092165(FR) | Scooby-Doo! - Panique a Funland (translucent purple, packin) -| | 80-092167(SP) | Scooby-Doo - Misterio En El Parque (translucent Purple) +| XX | 80-092164(GE) | Scooby-Doo! - Im Lernpark | +| XX | 80-092165(FR) | Scooby-Doo! - Panique à Funland | +| | 80-092165(FR) | Scooby-Doo! - Panique à Funland (translucent purple, packin) | +| | 80-092167(SP) | Scooby-Doo - Misterio En El Parque (translucent Purple) | +| XX | 80-092173(DK) | Scooby-Doo! - Sjov i forlystelsesparken | +| XX | 80-092174(SE) | Scooby-Doo! - Tivoli-tokerier | +| | (NO) | Scooby-Doo! - Moro i fornøyelsesparken | +| | (FI) | Scooby-Doo! | +========+===================+============================================================================+ -| | 80-092180(US) | Care Bears - A Lesson in Caring -| | 80-092183(UK) | Care Bears - A Lesson in Caring -| | 80-092184(GE) | Gluecksbarchis <- existance not proven -| | 80-092185(FR) | Les Bisounours - Le Monde Merveilleux des Bisounours -| | 80-092187(SP) | Osos Amorosos - Una Leccion de Amor +| | 80-092180(US) | Care Bears - A Lesson in Caring | +| | 80-092183(UK) | Care Bears - A Lesson in Caring | +| | 80-092184(GE) | Gluecksbarchis <- existance not proven | +| | 80-092185(FR) | Les Bisounours - Le Monde Merveilleux des Bisounours | +| | 80-092187(SP) | Osos Amorosos - Una Leccion de Amor | ++========+===================+============================================================================| +| | 80-092200(US) | Aladdin - Aladdin's Wonders of the World | +| | (IT) | Aladdin - Il magico mondo di Aladdin | +| | 80-092202(NL) | Aladdin - De Wunderwereld van Aladdin | +| | 80-092203(UK) | Aladdin - Aladdin's Wonders of the World | +| XX | 80-092204(GE) | Aladdin - Aladdins Welt der Wunder | +| | 80-092205(FR) | Aladdin - Les fabuleuses aventures d'Aladdin | +| | 80-092207(SP) | Aladdin - El Maravilloso Mundo de Aladdin | +========+===================+============================================================================+ -| | 80-092200(US) | Aladdin - Aladdin's Wonders of the World -| | (IT) | Aladdin - Il magico mondo di Aladdin -| | 80-092202(NL) | Aladdin - De Wunderwereld van Aladdin -| | 80-092203(UK) | Aladdin - Aladdin's Wonders of the World -| XX | 80-092204(GE) | Aladdin - Aladdins Welt der Wunder -| | 80-092205(FR) | Aladdin - Les fabuleuses aventures d'Aladdin -| | 80-092207(SP) | Aladdin - El Maravilloso Mundo de Aladdin +| XX | 80-092220(US) | Toy Story 2 - Operation Rescue Woody! | +| | (IT) | Toy Story 2 - Operazione: Salvataggio di Woody! gpz06503 | +| | 80-092223(UK) | Toy Story 2 - Operation Rescue Woody! | +| XX | 80-092224(GE) | Toy Story 2 - Woodys Spannende Rettung | +| | 80-092225(FR) | Toy Story 2 - Buzz a la Rescousse | +| | 80-092226(PT) | Toy Story 2 - O Resgate de Woody (92236 on cart) | +| | 80-092227(SP) | Toy Story 2 - El Rescate De Woody | +| | (DK) | Toy Story 2 - Operation: Red Woody! | +| XX | 80-092234(SE) | Toy Story 2 - Operation: Rädda Woody! | +| | (NO) | Toy Story 2 - Operasjon: Redd Woody! | +| | (FI) | Toy Story 2 | +========+===================+============================================================================+ -| | 80-092220(US) | Toy Story 2 - Operation Rescue Woody! -| | (IT) | Toy Story 2 - Operazione: Salvataggio di Woody! gpz06503 -| | 80-092223(UK) | Toy Story 2 - Operation Rescue Woody! -| | 80-092224(GE) | Toy Story 2 - Woodys Spannende Rettung -| | 80-092225(FR) | Toy Story 2 - Buzz a la Rescousse -| | 80-092226(PT) | Toy Story 2 - O Resgate de Woody (92236 on cart) -| | 80-092227(SP) | Toy Story 2 - El Rescate De Woody -+========+===================+============================================================================+ -| | 80-092240(US) | Cinderella - Cinderella's Magic Wishes -| | (IT) | Cenerentola - I desideri magici di Cenerentola -| | 80-092242(NL) | Assepoester - De wonderwereld van Assepoester -| | 80-092242-123(NL) | Assepoester - De wonderwereld van Assepoester | 2007 -| | 80-092243(UK) | Cinderella - Cinderella's Magic Wishes -| | 80-092243-103(UK) | Cinderella - Cinderella's Magic Wishes | 2007 -| | 80-092243-203(UK) | Cinderella - Cinderella's Magic Wishes | 2008 -| | 80-092244(GE) | Cinderella - Lernen im Maerchenland | 2005 -| | 80-092244-104(GE) | Cinderella - Lernen im Maerchenland | 2007 -| | 80-092244-204(GE) | Cinderella - Lernen im Maerchenland | 2007 -| | 80-092245(FR) | Cendrillon - Le reve enchante de Cendrillon -| | 80-092245-105(FR) | Cendrillon - Le reve enchante de Cendrillon -| | 80-092245-205(FR) | Cendrillon - Le reve enchante de Cendrillon -| | 80-092246(PT) | Cinderela - Os Sonhos Magicos da Cinderela (Cart#92256) +| XX | 80-092240(US) | Cinderella - Cinderella's Magic Wishes | +| | (IT) | Cenerentola - I desideri magici di Cenerentola | +| | 80-092242(NL) | Assepoester - De wonderwereld van Assepoester | +| | 80-092242-123(NL) | Assepoester - De wonderwereld van Assepoester | 2007 | +| | 80-092243(UK) | Cinderella - Cinderella's Magic Wishes | +| | 80-092243-103(UK) | Cinderella - Cinderella's Magic Wishes | 2007 | +| | 80-092243-203(UK) | Cinderella - Cinderella's Magic Wishes | 2008 | +| XX | 80-092244(GE) | Cinderella - Lernen im Maerchenland | 2005 | +| XX | 80-092244-104(GE) | Cinderella - Lernen im Maerchenland | 2007 | +| | 80-092244-204(GE) | Cinderella - Lernen im Maerchenland | 2007 | +| XX | 80-092245(FR) | Cendrillon - Le reve enchante de Cendrillon | +| | 80-092245-105(FR) | Cendrillon - Le reve enchante de Cendrillon | +| | 80-092245-205(FR) | Cendrillon - Le reve enchante de Cendrillon | +| | 80-092246(PT) | Cinderela - Os Sonhos Magicos da Cinderela (Cart#92256) | | | 80-092247(SP) | La Cenicienta - Los suenos magicos de Cenicienta (non motion#, but v.motion in spanish catalog) | | 80-092247-222(SP) | La Cenicienta - Los suenos magicos de Cenicienta (non motion#, but v.motion in spanish catalog) +| XX | 80-092253(DK) | Cinderella - Askepots magiske ønsker | +| XX | 80-092254(SE) | Cinderella - Askungens magiska önskningar | +| | 80-092255(NO) | Cinderella - Askepotts magiske ønsker | +| | (FI) | Cinderella - Tuhkimon Taikatoiveet | +========+===================+============================================================================+ -| | 80-092260(US) | Elmo's World - Elmo's Big Discoveries -| | 80-092264(GE) | Elmo's grosses Abenteuer -| | 80-092265(FR) | Le Monde d'ELMO - Les Grandes Decouvertes D'Elmo +| | 80-092260(US) | Elmo's World - Elmo's Big Discoveries | +| XX | 80-092264(GE) | Elmos großes Abenteuer | +| | 80-092265(FR) | Le Monde d'ELMO - Les Grandes Decouvertes D'Elmo | +========+===================+============================================================================+ -| | 80-092280(US) | Dora The Explorer - Dora's Fit-it Adventure -| | 80-092280-101(US) | Dora The Explorer - Dora's Fit-it Adventure (ALT) -| | 80-092282(NL) | Dora - Doras Reparatie Avontuur! -| | 80-092283(UK) | Dora The Explorer - Dora's Fit-it Adventure -| | 80-092283-103(UK) | Dora The Explorer - Dora's Fit-it Adventure (ALT) -| | 80-092284(GE) | Dora - Doras Reparatur-Abenteuer -| | 80-092285(FR) | Dora L'Exploratrice - Les aventures de Dora Apprentie Mecano -| | 80-092285-1?5(FR) | Dora L'Exploratrice - Les aventures de Dora Apprentie Mecano NTSC French-Canadian -| | 80-092286(PT) | Dora - em busca das pecas perdidas (cart# 92296) -| | 80-092287(SP) | Dora - La Aventura arregla-todo de Dora (seen as purple without#) -| | 80-092287-122(SP) | Dora - La Aventura arregla-todo de Dora +| XX | 80-092280(US) | Dora The Explorer - Dora's Fit-it Adventure | +| | 80-092280-101(US) | Dora The Explorer - Dora's Fit-it Adventure (ALT) | +| | 80-092282(NL) | Dora - Doras Reparatie Avontuur! | +| | 80-092283(UK) | Dora The Explorer - Dora's Fit-it Adventure | +| | 80-092283-103(UK) | Dora The Explorer - Dora's Fit-it Adventure (ALT) | +| | 80-092284(GE) | Dora - Doras Reparatur-Abenteuer | +| XX | 80-092284-104(GE) | Dora - Doras Reparatur-Abenteuer | +| XX | 80-092285(FR) | Dora L'Exploratrice - Les aventures de Dora Apprentie Mécano | +| | 80-092285-1?5(FR) | Dora L'Exploratrice - Les aventures de Dora Apprentie Mécano NTSC French-Canadian +| | 80-092286(PT) | Dora - em busca das pecas perdidas (cart# 92296) | +| | 80-092287(SP) | Dora - La Aventura arregla-todo de Dora (seen as purple without#) | +| | 80-092287-122(SP) | Dora - La Aventura arregla-todo de Dora | +========+===================+============================================================================+ -| XX | 80-092300(US) | Bob the Builder: Bob's Busy Day -| | 80-092303(UK) | Bob the Builder: Bob's Busy Day -| | 80-092303-103(UK) | Bob the Builder: Bob's Busy Day (Yellow Label) -| XX | 80-092304(GE) | Bob der Baumeister - Bobs Spannender Arbeitstag -| | 80-092304-104(GE) | Bob der Baumeister - Bobs Spannender Arbeitstag -| | 80-092305(FR) | Bob Bricoleur: Les P'tits Chantiers de Bob -| | 80-092305-105(FR) | Bob Bricoleur: Les P'tits Chantiers de Bob (ALT) -| | 80-092306(PT) | Bob o Construtor - Um dia Atarefado (92316 on cart) -| | 80-092307(SP) | Bob y sus Amigos - Un dia de trabajo -| XX | 80-092313(DK) | Byggemand Bob - Bobs travle dag -| XX | 80-092314(SE) | Byggare Bob - Bobs stressiga dag -| | (NO) | Byggmester Bob - Bobs travle dag -| | (FI) | Puuha-Pete - Peten kiirenes päivä +| XX | 80-092300(US) | Bob the Builder: Bob's Busy Day | +| | 80-092303(UK) | Bob the Builder: Bob's Busy Day | +| | 80-092303-103(UK) | Bob the Builder: Bob's Busy Day (Yellow Label) | +| XX | 80-092304(GE) | Bob der Baumeister - Bobs Spannender Arbeitstag | +| | 80-092304-104(GE) | Bob der Baumeister - Bobs Spannender Arbeitstag | +| | 80-092305(FR) | Bob Bricoleur: Les P'tits Chantiers de Bob | +| | 80-092305-105(FR) | Bob Bricoleur: Les P'tits Chantiers de Bob (ALT) | +| | 80-092306(PT) | Bob o Construtor - Um dia Atarefado (92316 on cart) | +| | 80-092307(SP) | Bob y sus Amigos - Un dia de trabajo | +| XX | 80-092313(DK) | Byggemand Bob - Bobs travle dag | +| XX | 80-092314(SE) | Byggare Bob - Bobs stressiga dag | +| | (NO) | Byggmester Bob - Bobs travle dag | +| | (FI) | Puuha-Pete - Peten kiirenes päivä | +========+===================+============================================================================+ -| | 80-092320(US) | The Wiggles - It's Wiggle Time! -| | 80-092323(UK) | The Wiggles - It's Wiggle Time! +| | 80-092320(US) | The Wiggles - It's Wiggle Time! | +| | 80-092323(UK) | The Wiggles - It's Wiggle Time! | +========+===================+============================================================================+ -| | 80-092340(US) | Thomas The Tank: Engines Working Together -| | 80-092340-101(US) | Thomas The Tank: Engines Working Together (ALT) (HiT logo on label) +| | 80-092340(US) | Thomas The Tank: Engines Working Together | +| | 80-092340-101(US) | Thomas The Tank: Engines Working Together (ALT) (HiT logo on label) | | | 80-092342(NL) | Thomas de Stoomlocomotief' - Locomotieven Werken Somen <- need pic even the manual has -123 on cover -| | 80-092342-123(NL) | Thomas de Stoomlocomotief' - Locomotieven Werken Somen -| | 80-092343(UK) | Thomas and Friends: Engines Working Together -| | 80-092343-103(UK) | Thomas and Friends: Engines Working Together (ALT) -| | 80-092343-203(UK) | Thomas and Friends: Engines Working Together (ALT) -| | 80-092344(GE) | Thomas and Seine Freunde - Freunde Halten Zusammen -| | 80-092344-104(GE) | Thomas and Seine Freunde - Freunde Halten Zusammen -| | 80-092345(FR) | Thomas er ses Amis - Les locomotives s'entraident -| | 80-092347(SP) | Thomas and Friends: Juego de Aprendizaje +| | 80-092342-123(NL) | Thomas de Stoomlocomotief' - Locomotieven Werken Somen | +| | 80-092343(UK) | Thomas and Friends: Engines Working Together | +| | 80-092343-103(UK) | Thomas and Friends: Engines Working Together (ALT) | +| | 80-092343-203(UK) | Thomas and Friends: Engines Working Together (ALT) | +| XX | 80-092344(GE) | Thomas and Seine Freunde - Freunde Halten Zusammen | +| XX | 80-092344-104(GE) | Thomas and Seine Freunde - Freunde Halten Zusammen | +| | 80-092345(FR) | Thomas er ses Amis - Les locomotives s'entraident | +| | 80-092347(SP) | Thomas and Friends: Juego de Aprendizaje | +| | (DK) | Thomas and Friends: Togene arbejder sammen | +| XX | 80-092354(SE) | Thomas and Friends: Tågen hjälps åt | +| | (NO) | Thomas and Friends: Togene samarbeider (494097(NO) printed on cart) | +| | (FI) | Thomas and Friends | +========+===================+============================================================================+ -| XX | 80-092360(US) | Zayzoo - My Alien Classmate -| XX | 80-092360-101(US) | Zayzoo: An Earth Adventure -| | 80-092362(NL) | Zayzoo - Mijn Buitenaardse Vriendje -| | 80-092363(UK) | Zayzoo My Alien Classmate <- yes, duped# -| | 80-092363(UK) | Zayzoo - An Earth Adventure <- saw it, can't find pic again -| | 80-092363-103(UK) | Zayzoo - An Earth Adventure -| XX | 80-092364(GE) | Zayzoos Lernall -| XX | 80-092365(FR) | Zézou - Notre Ami Venu d'Ailleurs -| | 80-092367(SP) | Zayzoo - Mi Amiga del Espacio (Alien Classmate) +| XX | 80-092360(US) | Zayzoo - My Alien Classmate | +| XX | 80-092360-101(US) | Zayzoo: An Earth Adventure | +| | 80-092362(NL) | Zayzoo - Mijn Buitenaardse Vriendje | +| | 80-092363(UK) | Zayzoo My Alien Classmate <- yes, duped# | +| | 80-092363(UK) | Zayzoo - An Earth Adventure <- saw it, can't find pic again | +| | 80-092363-103(UK) | Zayzoo - An Earth Adventure | +| XX | 80-092364(GE) | Zayzoos Lernall | +| XX | 80-092365(FR) | Zézou - Notre Ami Venu d'Ailleurs | +| | 80-092367(SP) | Zayzoo - Mi Amiga del Espacio (Alien Classmate) | +========+===================+============================================================================+ -| | 80-092380(US) | Barney - The Land of Make Believe -| | 80-092383(UK) | Barney - The Land of Make Believe -| XX | 80-092384(GE) | Barney - Erlebnis-Reise +| | 80-092380(US) | Barney - The Land of Make Believe | +| | 80-092383(UK) | Barney - The Land of Make Believe | +| XX | 80-092384(GE) | Barney - Erlebnis-Reise | +========+===================+============================================================================+ -| | 80-092400(US) | Blue's Clues Collection Day +| | 80-092400(US) | Blue's Clues Collection Day | +========+===================+============================================================================+ -| | 80-092420(US) | Finding Nemo - Nemo's Ocean Discoveries -| | 80-092422(NL) | Finding Nemo - De wonderwereld van Nemo -| | 80-092423(UK) | Finding Nemo - Nemo's Ocean Discoveries -| | 80-092424(GE) | Findet Nemo - Nemos Unterwasserabenteuer -| | 80-092425(FR) | Le Monde de Nemo - Nemo a la decourverte de l'ocean -| | 80-092426(PT) | Nemo - A descoberta do Oceano (Cart#92436) -| | 80-092427(SP) | Buscando a Nemo - Los Descubrimientos de Nemo +| XX | 80-092420(US) | Finding Nemo - Nemo's Ocean Discoveries | +| | 80-092422(NL) | Finding Nemo - De wonderwereld van Nemo | +| | 80-092423(UK) | Finding Nemo - Nemo's Ocean Discoveries | +| | 80-092424(GE) | Findet Nemo - Nemos Unterwasserabenteuer | +| | 80-092425(FR) | Le Monde de Nemo - Nemo a la decourverte de l'ocean | +| | 80-092426(PT) | Nemo - A descoberta do Oceano (Cart#92436) | +| | 80-092427(SP) | Buscando a Nemo - Los Descubrimientos de Nemo | +========+===================+============================================================================+ -| | 80-092440(US) | Spongebob Squarepants: A Day In The Life of A Sponge -| | 80-092442(NL) | Spongebob Squarepants: Een Dag uit het Leven van een Spons -| | 80-092443(UK) | Spongebob Squarepants: A Day In The Life of A Sponge -| | 80-092444(GE) | Spongebob Schwammkopf - Der Tag des Schwamms -| | 80-092445(FR) | Bob L'eponge - Une journee dans la vie d'une eponge -| | 80-092447(SP) | Bob Esponja - Un dia en la vida de una esponja +| XX | 80-092440(US) | Spongebob Squarepants: A Day In The Life of A Sponge | +| | 80-092442(NL) | Spongebob Squarepants: Een Dag uit het Leven van een Spons | +| | 80-092443(UK) | Spongebob Squarepants: A Day In The Life of A Sponge | +| XX | 80-092444(GE) | Spongebob Schwammkopf - Der Tag des Schwamms | +| | 80-092445(FR) | Bob L'eponge - Une journee dans la vie d'une eponge | +| | 80-092447(SP) | Bob Esponja - Un dia en la vida de una esponja | +========+===================+============================================================================+ -| | 80-092460(US) | Sesame Street : Bert and Ernie's Imagination Adventure -| | 80-092462(NL) | Sesamstraat : Bert and Ernie's Fantasie Avontuur -| | 80-092464(GE) | Sesame Street : Ernie and Berts Fantastisches Abenteuer -| | 80-092465(FR) | 5, Rue Sesame : Les Aventures Imaginaires d'Ernest et Bert -| | 80-092467(SP) | Barrio Sesamo : El Mundo Fantastico de Epy y Bias +| | 80-092460(US) | Sesame Street : Bert and Ernie's Imagination Adventure | +| | 80-092462(NL) | Sesamstraat : Bert and Ernie's Fantasie Avontuur | +| XX | 80-092464(GE) | Sesame Street : Ernie and Berts Fantastisches Abenteuer | +| | 80-092465(FR) | 5, Rue Sesame : Les Aventures Imaginaires d'Ernest et Bert | +| | 80-092467(SP) | Barrio Sesamo : El Mundo Fantastico de Epy y Bias | +========+===================+============================================================================+ -| | 80-092480(US) | Batman: Gotham City Rescue -| | (IT) | Batman: Il Salvataggio di Gotham City 80-092492?? gpz06629 -| | 80-092482(NL) | Batman: De Redding van Gotham City -| | 80-092483(UK) | Batman: Gotham City Rescue -| | 80-092484(GE) | Batman - Rettung von Gotham City -| | 80-092485(FR) | Batman: Panique a Gotham City +| | 80-092480(US) | Batman: Gotham City Rescue | +| | (IT) | Batman: Il Salvataggio di Gotham City 80-092492?? gpz06629 | +| | 80-092482(NL) | Batman: De Redding van Gotham City | +| | 80-092483(UK) | Batman: Gotham City Rescue | +| | 80-092484(GE) | Batman - Rettung von Gotham City | +| | 80-092485(FR) | Batman: Panique a Gotham City | +========+===================+============================================================================+ -| | 80-092500(US) | Whiz Kid Wheels (note to self.. no rider in this blue car) -| | 80-092502(NL) | Truckie's Rekenrace -| | 80-092503(UK) | Whiz Kid Wheels -| | 80-092504(GE) | Flitzers Schlaue Staedtetour (diff color) -| | 80-092504(GE) | Flitzers Schlaue Staedtetour (normal purple) -| | 80-092505(FR) | Mission Pilote -| | 80-092506(PT) | Conducao Diverrido (Cart# 92516) -| | 80-092507(SP) | Conduccion Divertida +| | 80-092500(US) | Whiz Kid Wheels (note to self.. no rider in this blue car) | +| | 80-092502(NL) | Truckie's Rekenrace | +| | 80-092503(UK) | Whiz Kid Wheels | +| | 80-092504(GE) | Flitzers Schlaue Staedtetour (diff color) | +| | 80-092504(GE) | Flitzers Schlaue Staedtetour (normal purple) | +| | 80-092505(FR) | Mission Pilote | +| | 80-092506(PT) | Conducao Diverrido (Cart# 92516) | +| | 80-092507(SP) | Conduccion Divertida | +========+===================+============================================================================+ -| | 80-092520(US) | Spider-Man & Friends Doc Ock's Challenge -| | (IT) | Spider-Man la sfida del dottor Ock (V.smile pocket bundle only?) -| | 80-092523(UK) | Spider-Man & Friends Doc Ock's Challenge -| | 80-092524(GE) | Spider-Man & Freunde Wettkampf im Space Labor -| | 80-092525(FR) | Spider-Man & ses amis Le defi du docteur Ock -| | 80-092527(SP) | Spider-man y Amigas - La Aventura Del Doctor Octopus +| | 80-092520(US) | Spider-Man & Friends Doc Ock's Challenge | +| | (IT) | Spider-Man la sfida del dottor Ock (V.smile pocket bundle only?) | +| | 80-092523(UK) | Spider-Man & Friends Doc Ock's Challenge | +| XX | 80-092524(GE) | Spider-Man & Freunde Wettkampf im Space Labor | +| | 80-092525(FR) | Spider-Man & ses amis Le defi du docteur Ock | +| | 80-092527(SP) | Spider-man y Amigas - La Aventura Del Doctor Octopus | +========+===================+============================================================================+ -| | 80-092540(US) | Noddy - Detective for a Day -| | 80-092543(UK) | Noddy - Detective for a Day -| | 80-092543-103(UK) | Noddy - Detective for a Day (ALT) +| | 80-092540(US) | Noddy - Detective for a Day | +| | 80-092543(UK) | Noddy - Detective for a Day | +| | 80-092543-103(UK) | Noddy - Detective for a Day (ALT) | | | 80-092544(GE) | Noddy - Detektiv fuer einen Tag <- need pic to confirm, manual cover says -104 -| | 80-092544-104(GE) | Noddy - Detektiv fuer einen Tag (ALT) -| | 80-092545(FR) | Oui-Oui - Detective d'un Jour -| | 80-092545-105(FR) | Oui-Oui - Detective d'un Jour (ALT) -| | 80-092546(PT) | Noddy - Detective por um dia (92556 on cart) +| XX | 80-092544-104(GE) | Noddy - Detektiv fuer einen Tag (ALT) | +| | 80-092545(FR) | Oui-Oui - Detective d'un Jour | +| | 80-092545-105(FR) | Oui-Oui - Detective d'un Jour (ALT) | +| | 80-092546(PT) | Noddy - Detective por um dia (92556 on cart) | +========+===================+============================================================================+ -| | 80-092560(US) | 101 Dalmations (one pic on german site with USA code) -| | 80-092564(GE) | 101 Dalmatiner (EAN on german site with USA pic.. wtf) +| | 80-092560(US) | 101 Dalmations (one pic on german site with USA code) | +| | 80-092564(GE) | 101 Dalmatiner (EAN on german site with USA pic.. wtf) | +========+===================+============================================================================+ -| | 80-092580(US) | Backyardigans - Viking Voyage -| | 80-092580-201(US) | Backyardigans - Viking Voyage (ALT) -| | 80-092583(UK) | Backyardigans - Viking Voyage -| | 80-092585(FR) | Les Melodilous - Les explorateurs vikings +| | 80-092580(US) | Backyardigans - Viking Voyage | +| | 80-092580-201(US) | Backyardigans - Viking Voyage (ALT) | +| | 80-092583(UK) | Backyardigans - Viking Voyage | +| XX | 80-092585(FR) | Les Melodilous - Les explorateurs vikings | +========+===================+============================================================================+ -| | 80-092600(US) | Shrek - Dragon's Tale -| | 80-092602(NL) | Shrek - Het verhaal van draakje -| | 80-092604(GE) | Shrek - Die Geschichte des Drachen -| | 80-092605(FR) | Shrek - Le Ehume de Dragonne -| | 80-092607(SP) | Shrek - El Cuento de la Drago na +| | 80-092600(US) | Shrek - Dragon's Tale | +| | 80-092602(NL) | Shrek - Het verhaal van draakje | +| XX | 80-092604(GE) | Shrek - Die Geschichte des Drachen | +| XX | 80-092605(FR) | Shrek - Le Ehume de Dragonne | +| | 80-092607(SP) | Shrek - El Cuento de la Drago na | +========+===================+============================================================================+ -| | 80-092620(US) | Lil' Bratz - Friends, Fashion and Fun -| | 80-092623(UK) | Lil' Bratz - Friends, Fashion and Fun -| | 80-092627(SP) | Lil' Bratz - Amigos Moda y Diversion +| | 80-092620(US) | Lil' Bratz - Friends, Fashion and Fun | +| | 80-092623(UK) | Lil' Bratz - Friends, Fashion and Fun | +| | 80-092627(SP) | Lil' Bratz - Amigos Moda y Diversion | +========+===================+============================================================================+ -| | 80-092640(US) | Superman - The Greatest Hero -| | 80-092642(NL) | Superman - De Grootste Held -| | 80-092643(UK) | Superman - The Greatest Hero -| | 80-092644(GE) | Superman - Der Superheld -| | 80-092645(FR) | Superman - A la Rescousse -| | 80-092647(SP) | Superman - El Hombre de Acero +| | 80-092640(US) | Superman - The Greatest Hero | +| | 80-092642(NL) | Superman - De Grootste Held | +| | 80-092643(UK) | Superman - The Greatest Hero | +| XX | 80-092644(GE) | Superman - Der Superheld | +| XX | 80-092645(FR) | Superman - À la rescousse ! | +| | 80-092647(SP) | Superman - El Hombre de Acero | +========+===================+============================================================================+ -| | 80-092660(US) | Cars: Rev It Up In Radiator Springs -| | (IT) | Cars: Motori Ruggenti gpz06755 -| | 80-092662(NL) | Cars: Spektakel in Radiator Springs -| | 80-092663(UK) | Cars: Rev It Up In Radiator Springs -| | 80-092664(GE) | Cars: Vollgas in Radiator Springs -| | 80-092665(FR) | Cars: Quatre Roues -| | 80-092666(PT) | Carros: Aventura em Radiator Springs (92676 on cart) -| | 80-092667(SP) | Cars: Acelera El Motor En Radiador Springs +| XX | 80-092660(US) | Cars: Rev It Up In Radiator Springs | +| | (IT) | Cars: Motori Ruggenti gpz06755 | +| | 80-092662(NL) | Cars: Spektakel in Radiator Springs | +| | 80-092663(UK) | Cars: Rev It Up In Radiator Springs | +| XX | 80-092664(GE) | Cars: Vollgas in Radiator Springs | +| XX | 80-092665(FR) | Cars: Quatre Roues | +| | 80-092666(PT) | Carros: Aventura em Radiator Springs (92676 on cart) | +| | 80-092667(SP) | Cars: Acelera El Motor En Radiador Springs | +| XX | 80-092673(DK) | Biler - Ræs i Kølerkildekøbing | +| XX | 80-092674(SE) | Bilar - Kör ikapp i Kylarköping | +| | 80-092674(SE) | Biler - Kör ikapp i Kylarköping (Misprinted label) | +| | (NO) | Biler - Full gass i Radiator By | +| | (FI) | Autot - Aja kilpaa Syylari Cityssä | +========+===================+============================================================================+ -| | 80-092680(US) -> | -| | 80-092800(US) | +| | 80-092680(US) -> | | +| | 80-092800(US) | | +========+===================+============================================================================+ -| | 80-092820(US) | Soccer Challenge -| | 80-092821(IT) | Football Club (cart is 92831) (EAN 8001444067538) -| | 80-092822(NL) | Voetbal -| | 80-092823(UK) | Football Challenge -| | 80-092824(GE) | Fussball Schule -| | 80-092825(FR) | Football Challenge -| | 80-092826(PT) | Football Challenge (cart# 92836) -| | 80-092827(SP) | Campeonato de Futbol +| | 80-092820(US) | Soccer Challenge | +| | 80-092821(IT) | Football Club (cart is 92831) (EAN 8001444067538) | +| | 80-092822(NL) | Voetbal | +| | 80-092823(UK) | Football Challenge | +| XX | 80-092824(GE) | Fußball Schule | +| | 80-092825(FR) | Football Challenge | +| | 80-092826(PT) | Football Challenge (cart# 92836) | +| | 80-092827(SP) | Campeonato de Futbol | +========+===================+============================================================================+ -| | 80-092840(US) | Wall-E -| | (IT) | Wall-E (GPZ07996) -| | 80-092842(NL) | Wall-E -| | 80-092843(UK) | Wall-E -| | 80-092844(GE) | Wall-E -| | 80-092845(FR) | Wall-E -| | 80-092847(SP) | Wall-E +| | 80-092840(US) | Wall-E | +| | (IT) | Wall-E (GPZ07996) | +| | 80-092842(NL) | Wall-E | +| | 80-092843(UK) | Wall-E | +| XX | 80-092844(GE) | Wall-E | +| | 80-092845(FR) | Wall-E | +| | 80-092847(SP) | Wall-E | +| | (DK) | Wall-E | +| XX | 80-092854(SE) | Wall-E | +| | (NO) | Wall-E | +| | (FI) | Wall-E | +========+===================+============================================================================+ -| | 80-092860(US) | Shrek the Third: Arthur's School Day Adventure -| | (IT) | Shrek Terzo L'Advventura Do Artu in un Giorno di Scuola -| | 80-092862(NL) | Shrek de Derde - Arthurs Schooldag Avontuur -| | 80-092863(UK) | Shrek the Third: Arthur's School Day Adventure -| | 80-092864(GE) | Shrek der Dritte - Ein Spannender Schultag -| | 80-092865(FR) | Shrek Troisieme : L'aventure d'Arthur -| | 80-092867(SP) | Shrek Tercero - En Busca De Arturo +| XX | 80-092860(US) | Shrek the Third: Arthur's School Day Adventure | +| | (IT) | Shrek Terzo L'Advventura Do Artu in un Giorno di Scuola | +| | 80-092862(NL) | Shrek de Derde - Arthurs Schooldag Avontuur | +| | 80-092863(UK) | Shrek the Third: Arthur's School Day Adventure | +| | 80-092864(GE) | Shrek der Dritte - Ein Spannender Schultag | +| | 80-092865(FR) | Shrek Troisieme : L'aventure d'Arthur | +| | 80-092867(SP) | Shrek Tercero - En Busca De Arturo | +========+===================+============================================================================+ -| | 80-092880(US) | Ratatouille - Remy's New Recipes -| | (IT) | Ratatouille - Le nuove Ricette di Remy -| | 80-092882(NL) | Ratatouille - Remy's Nieuwe Recepten -| | 80-092883(UK) | Ratatouille - Remy's New Recipes -| | 80-092884(GE) | Ratatouille - Remys neue Rezepte -| | 80-092884-104(GE) | Ratatouille - Remys neue Rezepte (ALT) -| | 80-092885(FR) | Ratatouille - Les nouvelles recettes de Remy -| | 80-092887(SP) | Ratatouille - Las recetas del Remy +| | 80-092880(US) | Ratatouille - Remy's New Recipes | +| | (IT) | Ratatouille - Le nuove Ricette di Remy | +| | 80-092882(NL) | Ratatouille - Remy's Nieuwe Recepten | +| | 80-092883(UK) | Ratatouille - Remy's New Recipes | +| XX | 80-092884(GE) | Ratatouille - Remys neue Rezepte | +| | 80-092884-104(GE) | Ratatouille - Remys neue Rezepte (ALT) | +| | 80-092885(FR) | Ratatouille - Les nouvelles recettes de Remy | +| | 80-092887(SP) | Ratatouille - Las recetas del Remy | +========+===================+============================================================================+ -| | 80-092900(US) | Go Diego Go! - Save the Animal Familes! -| | 80-092902(NL) | Go Diego Go! - Red de dierenfamilies! -| | 80-092903(UK) | Go Diego Go! - Save the Animal Familes! -| | 80-092905(FR) | Go Diego! - A la rescousse des animaux! +| | 80-092900(US) | Go Diego Go! - Save the Animal Familes! | +| | 80-092902(NL) | Go Diego Go! - Red de dierenfamilies! | +| | 80-092903(UK) | Go Diego Go! - Save the Animal Familes! | +| | 80-092905(FR) | Go Diego! - A la rescousse des animaux! | +========+===================+============================================================================+ -| | 80-092920(US) | Cranium - Partyland Park -| | 80-092922(UK) | Cranium - Partyland Park -| | 80-092924(GE) | Cranium - Freizeit Park -| | 80-092925(FR) | Cranium - Le Parc D'attractions +| XX | 80-092920(US) | Cranium - Partyland Park | +| | 80-092922(UK) | Cranium - Partyland Park | +| | 80-092924(GE) | Cranium - Freizeit Park | +| | 80-092925(FR) | Cranium - Le Parc D'attractions | +========+===================+============================================================================+ | | 80-092940(US) | should be Mickey Mouse Clubhouse 80-084180 exists in v.link database -| | (IT) | La Casa di Topolino -| | 80-092942(NL) | Mickey Mouse Clubhause -| | 80-092943(UK) | Mickey Mouse Clubhouse -| | 80-092944(GE) | Micky Maus Wunderhaus -| | 80-092945(FR) | La Maison de Mickey -| | 80-092947(SP) | La Casa de Mickey Mouse +| | (IT) | La Casa di Topolino | +| | 80-092942(NL) | Mickey Mouse Clubhause | +| | 80-092943(UK) | Mickey Mouse Clubhouse | +| XX | 80-092944(GE) | Micky Maus Wunderhaus | +| | 80-092945(FR) | La Maison de Mickey | +| | 80-092947(SP) | La Casa de Mickey Mouse | +| | (DK) | Mickey Mouse Clubhouse | +| XX | 80-092954(SE) | Mickey Mouse Clubhouse | +| | (NO) | Mickey Mouse Clubhouse | +| | (FI) | Mickey Mouse Clubhouse | +========+===================+============================================================================+ -| | 80-092960(US) | Kung Fu Panda - Path of the Panda -| | 80-092962(NL) | Kung Fu Panda - Het pad van de panda -| | 80-092963(UK) | Kung Fu Panda - Path of the Panda -| | 80-092964(GE) | Kung Fu Panda - Der Weg des Panda -| | 80-092965(FR) | Kung Fu Panda - La ????? -| | 80-092967(SP) | Kung Fu Panda - Aventura en el Valle de la Paz +| | 80-092960(US) | Kung Fu Panda - Path of the Panda | +| | 80-092962(NL) | Kung Fu Panda - Het pad van de panda | +| | 80-092963(UK) | Kung Fu Panda - Path of the Panda | +| | 80-092964(GE) | Kung Fu Panda - Der Weg des Panda | +| | 80-092965(FR) | Kung Fu Panda - La ????? | +| | 80-092967(SP) | Kung Fu Panda - Aventura en el Valle de la Paz | +========+===================+============================================================================+ -| | 80-092980(US) | Disney's Little Einsteins: The Glass Slipper Ball +| | 80-092980(US) | Disney's Little Einsteins: The Glass Slipper Ball | | | 80-092983(UK) | Disney's Little Einsteins: The Glass Slipper Ball <- purple cart on front of UK box, but v.motion listed) -| | 80-092984(GE) | Kleine Einsteins -| | 80-092985(FR) | Disney - Les petits Einsteins: Le bal du soulier de verre -| | 80-092987(SP) | Little Einsteins de Disney: El baile del zapatito de cristal +| XX | 80-092984(GE) | Kleine Einsteins | +| | 80-092985(FR) | Disney - Les petits Einsteins: Le bal du soulier de verre | +| | 80-092987(SP) | Little Einsteins de Disney: El baile del zapatito de cristal | +========+===================+============================================================================+ --> @@ -1107,7 +1155,7 @@ Game cartridges Disneys Micky - Mickys magisches Abenteuer (Ger) 2004? VTech - + diff --git a/hash/vsmilem_cart.xml b/hash/vsmilem_cart.xml index 6e50321d5c0..540bba33664 100644 --- a/hash/vsmilem_cart.xml +++ b/hash/vsmilem_cart.xml @@ -26,310 +26,305 @@ Language: *******?? = Finland +========+===================+============================================================================+ -| | 80-084000(US) | Action Mania -| | (IT) | ????? -| | 80-084002(NL) | Sports Games -| | 80-084003(UK) | Action Mania -| | 80-084004(GE) | Sportskanone -| | 80-084005(FR) | Sporti Folies -| | 80-084006(PT) | Action Mania (84016 on cart) -| | 80-084007(SP) | Action Mania +| | 80-084000(US) | Action Mania | +| | (IT) | ????? | +| | 80-084002(NL) | Sports Games | +| | 80-084003(UK) | Action Mania | +| | 80-084004(GE) | Sportskanone | +| | 80-084005(FR) | Sporti Folies | +| | 80-084006(PT) | Action Mania (84016 on cart) | +| | 80-084007(SP) | Action Mania | +========+===================+============================================================================+ -| | 80-084020(US) | Dora the Explorer : Dora's Fix It Adventure -| | 80-084021(US) | Dora the Explorer : Dora's Fix It Adventure (pocket version) -| | 80-084022(NL) | Dora: Dora's Reparatie Avontuur -| | 80-084023(UK) | Dora the Explorer : Dora's Fix It Adventure -| | 80-084024(GE) | Dora: Doras Reparatur-Abenteuer -| | 80-084025(FR) | Dora L'Exploratrice : Les Adventures De Dora Apprentie Mecano -| | 80-084026(PT) | Dora : em busca das pecas perdidas -| | 80-084027(SP) | Dora : La Aventura arregla-todo de Dora +| | 80-084020(US) | Dora the Explorer : Dora's Fix It Adventure | +| | 80-084021(US) | Dora the Explorer : Dora's Fix It Adventure (pocket version) | +| | 80-084022(NL) | Dora: Dora's Reparatie Avontuur | +| | 80-084023(UK) | Dora the Explorer : Dora's Fix It Adventure | +| XX | 80-084024(GE) | Dora: Doras Reparatur-Abenteuer | +| | 80-084025(FR) | Dora L'Exploratrice : Les Adventures De Dora Apprentie Mecano | +| | 80-084026(PT) | Dora : em busca das pecas perdidas | +| | 80-084027(SP) | Dora : La Aventura arregla-todo de Dora | +========+===================+============================================================================+ -| | 80-084040(US) | Scooby-Doo! - Funland Frenzy -| | 80-084043(UK) | Scooby-Doo! - Funland Frenzy -| | 80-084044(GE) | Scooby-Doo! - Im Lernpark -| | 80-084045(FR) | Scooby-Doo - Panique A Funland -| | 80-084047(SP) | Scooby-Doo - Misterio en el Parque +| | 80-084040(US) | Scooby-Doo! - Funland Frenzy | +| | 80-084043(UK) | Scooby-Doo! - Funland Frenzy | +| | 80-084044(GE) | Scooby-Doo! - Im Lernpark | +| | 80-084045(FR) | Scooby-Doo - Panique A Funland | +| | 80-084047(SP) | Scooby-Doo - Misterio en el Parque | +========+===================+============================================================================+ -| | 80-084060(US) | Thomas and Friends - Engines Working Together -| | 80-084063(UK) | Thomas and Friends - Engines Working Together -| | 80-084064(GE) | Thomas - Freunde halten zusammen +| | 80-084060(US) | Thomas and Friends - Engines Working Together | +| | 80-084063(UK) | Thomas and Friends - Engines Working Together | +| | 80-084064(GE) | Thomas - Freunde halten zusammen | +========+===================+============================================================================+ -| | 80-084080(US) | Wall-E -| | 80-084083(UK) | Wall-E -| | 80-084084(GE) | Wall-E -| | 80-084085(FR) | Wall-E -| | 80-084087(SP) | Wall-E +| | 80-084080(US) | Wall-E | +| | 80-084083(UK) | Wall-E | +| | 80-084084(GE) | Wall-E | +| | 80-084085(FR) | Wall-E | +| | 80-084087(SP) | Wall-E | +========+===================+============================================================================+ -| | 80-084100(US) | Wonder Pets - Save the Animals! -| | 80-084103(UK) | Wonder Pets - Save the Animals! +| | 80-084100(US) | Wonder Pets - Save the Animals! | +| | 80-084103(UK) | Wonder Pets - Save the Animals! | +========+===================+============================================================================+ -| | 80-084120(US) | Kung Fu Panda - Path of the Panda -| | 80-084123(UK) | Kung Fu Panda - Path of the Panda -| | 80-084124(GE) | Kung Fu Panda - Der Weg des Panda -| | 80-084125(FR) | Kung Fu Panda - La mission de Po +| | 80-084120(US) | Kung Fu Panda - Path of the Panda | +| | 80-084123(UK) | Kung Fu Panda - Path of the Panda | +| XX | 80-084124(GE) | Kung Fu Panda - Der Weg des Panda | +| | 80-084125(FR) | Kung Fu Panda - La mission de Po | +========+===================+============================================================================+ | | 80-084140(US) | Spider-Man & Friends - Secret Missions (AKA Professor V's Secret Missions with diff label) -| | 80-084143(UK) | Spider-Man & Friends - Secret Missions -| | 80-084144(GE) | Spider-Man & Freunde - Geheime Missionen -| | 80-084145(FR) | Spider-Man and ses amis - Missions Secretes -| | 80-084147(SP) | Spider-Man y Amigos: Misiones Secretas (no # on label) +| | 80-084143(UK) | Spider-Man & Friends - Secret Missions | +| | 80-084144(GE) | Spider-Man & Freunde - Geheime Missionen | +| | 80-084145(FR) | Spider-Man and ses amis - Missions Secretes | +| | 80-084147(SP) | Spider-Man y Amigos: Misiones Secretas (no # on label) | +========+===================+============================================================================+ -| | 80-084160(US) | Disney's Little Einsteins: The Glass Slipper Ball -| | 80-084163(UK) | Disney's Little Einsteins: The Glass Slipper Ball -| | 80-084164(GE) | Disney's Kleine Einsteins: Der Glaspantoffel-Ball -| | 80-084167(SP) | Little Einsteins de Disney: El baile del zapatito de cristal +| | 80-084160(US) | Disney's Little Einsteins: The Glass Slipper Ball | +| | 80-084163(UK) | Disney's Little Einsteins: The Glass Slipper Ball | +| XX | 80-084164(GE) | Disney's Kleine Einsteins: Der Glaspantoffel-Ball | +| | 80-084167(SP) | Little Einsteins de Disney: El baile del zapatito de cristal | +========+===================+============================================================================+ -| | 80-084180(US) | Mickey Mouse Clubhouse -| | 80-084182(NL) | Mickey Mouse Clubhouse -| | 80-084183(UK) | Mickey Mouse Clubhouse -| | 80-084184(GE) | Micky Maus Wunderhaus -| | 80-084185(FR) | La Maison de Mickey -| | 80-084186(PT) | A Casa do Mickey Mouse (84196 on cart) -| | 80-084187(SP) | La Casa de Mickey Mouse +| | 80-084180(US) | Mickey Mouse Clubhouse | +| | 80-084182(NL) | Mickey Mouse Clubhouse | +| | 80-084183(UK) | Mickey Mouse Clubhouse | +| | 80-084184(GE) | Micky Maus Wunderhaus | +| | 80-084185(FR) | La Maison de Mickey | +| | 80-084186(PT) | A Casa do Mickey Mouse (84196 on cart) | +| | 80-084187(SP) | La Casa de Mickey Mouse | +========+===================+============================================================================+ -| | 80-084200(US) | Nascar Academy - Race Car Superstar +| | 80-084200(US) | Nascar Academy - Race Car Superstar | +========+===================+============================================================================+ -| | 80-084220(US) | Snow Park Challenge -| | 80-084222(NL) | Wintersport Games -| | 80-084223(UK) | Snow Park Challenge -| | 80-084224(GE) | Wintersport -| | 80-084225(FR) | ?????? picture too fuzzy for positve confirm +| | 80-084220(US) | Snow Park Challenge | +| | 80-084222(NL) | Wintersport Games | +| | 80-084223(UK) | Snow Park Challenge | +| | 80-084224(GE) | Wintersport | +| | 80-084225(FR) | ?????? picture too fuzzy for positve confirm | +========+===================+============================================================================+ -| | 80-084240(US) | Ni Hao Kai Lan -| | 80-084245(FR) | Ni Hao Kai Lan +| | 80-084240(US) | Ni Hao Kai Lan | +| | 80-084245(FR) | Ni Hao Kai Lan | +========+===================+============================================================================+ -| | 80-084260(US) | My Pet Puppy (unreleased in USA?? UK version plays AOK on NTSC console) -| | 80-084262(NL) | Mijn Puppy! -| | 80-084263(UK) | My Pet Puppy -| | 80-084264(GE) | Mein erster Hund -| | 80-084265(FR) | Mon Youtou Tout Fou! -| | 80-084267(SP) | Dakota y su Mascota +| | 80-084260(US) | My Pet Puppy (unreleased in USA?? UK version plays AOK on NTSC console) | +| | 80-084262(NL) | Mijn Puppy! | +| | 80-084263(UK) | My Pet Puppy | +| | 80-084264(GE) | Mein erster Hund | +| | 80-084265(FR) | Mon Youtou Tout Fou! | +| | 80-084267(SP) | Dakota y su Mascota | +========+===================+============================================================================+ -| | 80-084280(US) | Wild Waves -| | 80-084282(NL) | Water-sport Games -| | 80-084283(UJ) | Wild Waves -| | 80-084284(GE) | Dolphis Wasser-abenteuer -| | 80-084285(FR) | Martin le Dauphin +| | 80-084280(US) | Wild Waves | +| | 80-084282(NL) | Water-sport Games | +| | 80-084283(UJ) | Wild Waves | +| | 80-084284(GE) | Dolphis Wasser-abenteuer | +| | 80-084285(FR) | Martin le Dauphin | +========+===================+============================================================================+ -| | 80-084300(US) | Soccer Challenge -| | 80-084303(UK) | Football Challenge -| | 80-084304(GE) | Fussball Meisterschaft -| | 80-084305(FR) | Football Challenge -| | 80-084306(PT) | Football Challenge (cart#??) -| | 80-084307(SP) | Campeonato de Futbol +| | 80-084300(US) | Soccer Challenge | +| | 80-084303(UK) | Football Challenge | +| | 80-084304(GE) | Fussball Meisterschaft | +| | 80-084305(FR) | Football Challenge | +| | 80-084306(PT) | Football Challenge (cart#??) | +| | 80-084307(SP) | Campeonato de Futbol | +========+===================+============================================================================+ -| | 80-084320(US) | Disney Fairies: TinkerBell -| | 80-084321(US) | Disney Fairies: TinkerBell (pocket version) -| | 80-084322(NL) | TinkerBell -| | 80-084323(UK) | TinkerBell -| | 80-084324(GE) | TinkerBell -| | 80-084325(FR) | La fee Clochette -| | 80-084326(PT) | Sininho (84336 on cart) -| | 80-084327(SP) | Campanilla +| | 80-084320(US) | Disney Fairies: TinkerBell | +| | 80-084321(US) | Disney Fairies: TinkerBell (pocket version) | +| | 80-084322(NL) | TinkerBell | +| | 80-084323(UK) | TinkerBell | +| XX | 80-084324(GE) | TinkerBell | +| | 80-084325(FR) | La fee Clochette | +| | 80-084326(PT) | Sininho (84336 on cart) | +| | 80-084327(SP) | Campanilla | +========+===================+============================================================================+ -| | 80-084340(US) | Up! -| | 80-084342(NL) | Up! -| | 80-084344(GE) | Oben -| | 80-084345(FR) | La-Haut -| | 80-084347(SP) | Up! -| | 80-084347-022(SP) | Up! (-022 is odd for SP) +| | 80-084340(US) | Up! | +| | 80-084342(NL) | Up! | +| | 80-084344(GE) | Oben | +| | 80-084345(FR) | La-Haut | +| | 80-084347(SP) | Up! | +| | 80-084347-022(SP) | Up! (-022 is odd for SP) | +========+===================+============================================================================+ -| | 80-084360(US) | Handy Manny -| | 80-084362(NL) | Handy Manny -| | 80-084363(UK) | Handy Manny -| | 80-084364(GE) | Meister Manny's Werkzeugkiste -| | 80-084365(FR) | Manny Et Ses Outils -| | 80-084366(PT) | Manny Maozinhas (84376 on cart) -| | 80-084367(SP) | Manny Manitas +| | 80-084360(US) | Handy Manny | +| | 80-084362(NL) | Handy Manny | +| | 80-084363(UK) | Handy Manny | +| | 80-084364(GE) | Meister Manny's Werkzeugkiste | +| | 80-084365(FR) | Manny Et Ses Outils | +| | 80-084366(PT) | Manny Maozinhas (84376 on cart) | +| | 80-084367(SP) | Manny Manitas | +========+===================+============================================================================+ -| | 80-084380(US) | Winnie the Pooh - The Honey Hunt -| | (IT) | Winnie the Pooh - e la caccia al miele ??? -| | 80-084383(UK) | Winnie the Pooh - The Honey Hunt -| | 80-084384(GE) | Winnie Puuh - Die Honigjagd -| | 80-084385(FR) | Winnie Rourson - La Chasse au miel de Winnie -| | 80-084386(PT) | Winnie - Em Busca do Mel (84396 on cart) -| | 80-084387(SP) | Winnie the Pooh - En busca de la miel +| | 80-084380(US) | Winnie the Pooh - The Honey Hunt | +| | (IT) | Winnie the Pooh - e la caccia al miele ??? | +| | 80-084383(UK) | Winnie the Pooh - The Honey Hunt | +| XX | 80-084384(GE) | Winnie Puuh - Die Honigjagd | +| | 80-084385(FR) | Winnie Rourson - La Chasse au miel de Winnie | +| | 80-084386(PT) | Winnie - Em Busca do Mel (84396 on cart) | +| | 80-084387(SP) | Winnie the Pooh - En busca de la miel | +========+===================+============================================================================+ -| XX | 80-084400(US) | Cars: Rev It Up in Radiator Springs -| | 80-084402(NL) | Cars: Spektakel in Radiator Springs -| | 80-084403(UK) | Cars: Rev it up in Radiator Springs -| XX | 80-084404(GE) | Cars: Vollgas in Radiator Springs -| XX | 80-084405(FR) | Cars: Quatre Roues -| | 80-084406(PT) | Cars: Aventura Em Radiator Springs (84416 on cart) -| | 80-084407(SP) | Cars: Acelera el Motor en Radiador Springs -| XX | 80-092673(DK) | Biler - Ræs i Kølerkildekøbing -| | 80-092674(SE) | Bilar - Kör ikapp i Kylarköping -| XX | 80-092674(SE) | Biler - Kör ikapp i Kylarköping (label misprint) -| | (NO) | Biler - Full gass i Radiator By -| | (FI) | Autot - Aja kilpaa Syylari Cityssä +| | 80-084400(US) | Cars: Rev It Up in Radiator Springs | +| | 80-084402(NL) | Cars: Spektakel in Radiator Springs | +| | 80-084403(UK) | Cars: Rev it up in Radiator Springs | +| | 80-084404(GE) | Cars: Vollgas in Radiator Springs | +| | 80-084405(FR) | Cars: Quatre Roues | +| | 80-084406(PT) | Cars: Aventura Em Radiator Springs (84416 on cart) | +| | 80-084407(SP) | Cars: Acelera el Motor en Radiador Springs | +========+===================+============================================================================+ -| | 80-084420(US) | Toy Story 3 -| | 80-084421(US) | Toy Story 3 (pocket version) -| | (IT) | Toy Story 3 (EAN 8033836704196) GP470419? -| | 80-084422(NL) | Toy Story 3 -| | 80-084423(UK) | Toy Story 3 -| | 80-084424(GE) | Toy Story 3 -| | 80-084425(FR) | Toy Story 3 -| | 80-084427(SP) | Toy Story 3 +| | 80-084420(US) | Toy Story 3 | +| | 80-084421(US) | Toy Story 3 (pocket version) | +| | (IT) | Toy Story 3 (EAN 8033836704196) GP470419? | +| | 80-084422(NL) | Toy Story 3 | +| | 80-084423(UK) | Toy Story 3 | +| | 80-084424(GE) | Toy Story 3 | +| | 80-084425(FR) | Toy Story 3 | +| | 80-084427(SP) | Toy Story 3 | +========+===================+============================================================================+ -| | 80-084440(US) | Monsters vs. Aliens -| | 80-084442(NL) | Monsters vs. Aliens -| | 80-084443(UK) | Monsters vs. Aliens -| | 80-084444(GE) | Monsters vs. Aliens -| | 80-084445(FR) | Monsters vs. Aliens -| | 80-084447(SP) | Monstruos contra Alienigenas +| | 80-084440(US) | Monsters vs. Aliens | +| | 80-084442(NL) | Monsters vs. Aliens | +| | 80-084443(UK) | Monsters vs. Aliens | +| | 80-084444(GE) | Monsters vs. Aliens | +| | 80-084445(FR) | Monsters vs. Aliens | +| | 80-084447(SP) | Monstruos contra Alienigenas | +========+===================+============================================================================+ -| | 80-084460(US) | Noddy - Detective for a Day (unreleased in USA??) see 80-092540 -| | 80-084463(UK) | Noddy - Detective for a Day -| | 80-084465(FR) | Oui-Oui - Detective d'un jour -| | 80-084467(SP) | Noddy - Detective por un Dia +| | 80-084460(US) | Noddy - Detective for a Day (unreleased in USA??) see 80-092540 | +| | 80-084463(UK) | Noddy - Detective for a Day | +| | 80-084465(FR) | Oui-Oui - Detective d'un jour | +| | 80-084467(SP) | Noddy - Detective por un Dia | +========+===================+============================================================================+ -| | 80-084480(US) | The Princess and the Frog (motion version) -| | 80-084481(US) | The Princess and the Frog (pocket version) -| | 80-084482(NL) | Prinses en de Kikker (label in english) -| | 80-084483(UK) | The Princess and the Frog -| | 80-084484(GE) | Kuess den Frosch -| | 80-084485(FR) | La Princesse Et La Grenouille -| | 80-084487(SP) | Tiana y el sapo - El gran Sueno de Tiana +| | 80-084480(US) | The Princess and the Frog (motion version) | +| | 80-084481(US) | The Princess and the Frog (pocket version) | +| | 80-084482(NL) | Prinses en de Kikker (label in english) | +| | 80-084483(UK) | The Princess and the Frog | +| | 80-084484(GE) | Kuess den Frosch | +| | 80-084485(FR) | La Princesse Et La Grenouille | +| | 80-084487(SP) | Tiana y el sapo - El gran Sueno de Tiana | +========+===================+============================================================================+ -| | 80-084500(US) | Shrek Forever After -| | 80-084502(NL) | Sjrek voor eeuwig en altijd -| | 80-084503(UK) | Shrek Forever After -| | 80-084504(GE) | Fuer immer Shrek -| | 80-084505(FR) | Shrek 4 - Il Etait une Fin -| | 80-084507(SP) | Shrek Felices para siempre +| | 80-084500(US) | Shrek Forever After | +| | 80-084502(NL) | Sjrek voor eeuwig en altijd | +| | 80-084503(UK) | Shrek Forever After | +| | 80-084504(GE) | Fuer immer Shrek | +| | 80-084505(FR) | Shrek 4 - Il Etait une Fin | +| | 80-084507(SP) | Shrek Felices para siempre | +========+===================+============================================================================+ -| | 80-084520(US) | +| | 80-084520(US) | | +========+===================+============================================================================+ -| | 80-084540(US) | Super Why to the Rescue! The Beach Day Mystery -| | 80-084541(US) | Super Why to the Rescue! The Beach Day Mystery (pocket version) +| | 80-084540(US) | Super Why to the Rescue! The Beach Day Mystery | +| | 80-084541(US) | Super Why to the Rescue! The Beach Day Mystery (pocket version) | +========+===================+============================================================================+ -| | 80-084560(US) | +| | 80-084560(US) | | +========+===================+============================================================================+ -| | 80-084580(US) | Cars 2 (motion version) -| | 80-084581(US) | Cars 2 (pocket version) -| | 80-084583(UK) | Cars 2 -| | 80-084584(GE) | Cars 2 -| | 80-084585(FR) | Cars 2 -| | 80-084587(SP) | Cars 2 +| | 80-084580(US) | Cars 2 (motion version) | +| | 80-084581(US) | Cars 2 (pocket version) | +| | 80-084583(UK) | Cars 2 | +| | 80-084584(GE) | Cars 2 | +| | 80-084585(FR) | Cars 2 | +| | 80-084587(SP) | Cars 2 | +========+===================+============================================================================+ -| | 80-084600(US) | (Should be Orange colored Cinderella - Cinderella's Magic Wishes) -| | 80-084603(UK) | Cinderella - Cinderella's Magic Wishes -| | 80-084604(GE) | Cinderella - Lernen im Maerchenland -| | 80-084605(FR) | Cendrillon - ????? +| | 80-084600(US) | (Should be Orange colored Cinderella - Cinderella's Magic Wishes)| +| | 80-084603(UK) | Cinderella - Cinderella's Magic Wishes | +| XX | 80-084604(GE) | Cinderella - Lernen im Maerchenland | +| | 80-084605(FR) | Cendrillon - ????? | +========+===================+============================================================================+ -| | 80-084620(US) | (Should be Orange colored Finding Nemo) -| | 80-084624(GE) | Findet Nemo - Nemos Unterwasserabenteuer -| | 80-084625(FR) | Le Monde de Nemo - Nemo a la decourverte de l'ocean -| | 80-084627(SP) | Buscando a Nemo - Los Descubrimientos de Nemo +| | 80-084620(US) | (Should be Orange colored Finding Nemo) | +| | 80-084624(GE) | Findet Nemo - Nemos Unterwasserabenteuer | +| | 80-084625(FR) | Le Monde de Nemo - Nemo a la decourverte de l'ocean | +| | 80-084627(SP) | Buscando a Nemo - Los Descubrimientos de Nemo | +========+===================+============================================================================+ -| | 80-084640(US) | (Should be Orange colored Spongebob) -| | 80-084644(GE) | Spongebob Schwammkopf - Der Tag des Schwamms -| | 80-084647(SP) | Bob Epsonja - Un dia en la vida de una esponja +| | 80-084640(US) | (Should be Orange colored Spongebob) | +| | 80-084644(GE) | Spongebob Schwammkopf - Der Tag des Schwamms | +| | 80-084647(SP) | Bob Epsonja - Un dia en la vida de una esponja | +========+===================+============================================================================+ V.Smile Smartbooks Smartbooks currently have no dumps available, hence they are temporarily listed here. +========+===================+============================================================================+ -| | 80-089000(US) | Spider-Man & Friends Where is Hulk? +| | 80-089000(US) | Spider-Man & Friends Where is Hulk? | +========+===================+============================================================================+ -| | 80-089020(US) | Toy Story 2 +| | 80-089020(US) | Toy Story 2 | +========+===================+============================================================================+ -| | 80-089040(US) | Dora the Explorer - Dora's Got a Puppy -| | 80-089045(FR) | Dora's ?????? +| | 80-089040(US) | Dora the Explorer - Dora's Got a Puppy | +| | 80-089045(FR) | Dora's ?????? | +========+===================+============================================================================+ -| | 80-089060(US) | Scooby-Doo! - A Night of Fright is no Delight +| | 80-089060(US) | Scooby-Doo! - A Night of Fright is no Delight | +========+===================+============================================================================+ --> - - Disney Princess Cinderella - Lernen im Märchenland (Ger) - 2010? - VTech - - - - - - - - - - + + Disney Princess Cinderella - Lernen im Märchenland (Ger) + 2010? + VTech + + + + + + + + + + + + + DreamWorks Kung Fu Panda - Der Weg des Panda (Ger) + 2008? + VTech + + + + + + + + + + + + + Nick Dora - Doras Reparatur-Abenteuer (Ger) + 2009? + VTech + + + + + + + + + + + + + Kleine Einsteins (Ger) + 200? + VTech + + + + + + + + + + TinkerBell (Ger) + 2009? + VTech + + + + + + + + + + + + + Winnie Puuh - Die Honigjagd (Ger) + 2009? + VTech + + + + + + + + + + - - DreamWorks Kung Fu Panda - Der Weg des Panda (Ger) - 2008? - VTech - - - - - - - - - - - - - Nick Dora - Doras Reparatur-Abenteuer (Ger) - 2009? - VTech - - - - - - - - - - - - - Kleine Einsteins (Ger) - 200? - VTech - - - - - - - - - - TinkerBell (Ger) - 2009? - VTech - - - - - - - - - - - - - Winnie Puuh - Die Honigjagd (Ger) - 2009? - VTech - - - - - - - - - - - \ No newline at end of file From f0f1d2ee23f0fd9b02b8ac57d1760d0f689ba399 Mon Sep 17 00:00:00 2001 From: Fake Shemp Date: Thu, 20 Oct 2016 20:34:46 +0200 Subject: [PATCH 07/30] Typo. --- hash/vsmile_cart.xml | 170 +++++++++++++++++++++---------------------- 1 file changed, 85 insertions(+), 85 deletions(-) diff --git a/hash/vsmile_cart.xml b/hash/vsmile_cart.xml index 55973fab7a2..9a38733e08a 100644 --- a/hash/vsmile_cart.xml +++ b/hash/vsmile_cart.xml @@ -523,7 +523,7 @@ Game cartridges - + @@ -539,7 +539,7 @@ Game cartridges - + @@ -555,7 +555,7 @@ Game cartridges - + @@ -571,7 +571,7 @@ Game cartridges - + @@ -587,7 +587,7 @@ Game cartridges - + @@ -603,7 +603,7 @@ Game cartridges - + @@ -619,7 +619,7 @@ Game cartridges - + @@ -635,7 +635,7 @@ Game cartridges - + @@ -651,7 +651,7 @@ Game cartridges - + @@ -668,7 +668,7 @@ Game cartridges - + @@ -684,7 +684,7 @@ Game cartridges - + @@ -700,7 +700,7 @@ Game cartridges - + @@ -716,7 +716,7 @@ Game cartridges - + @@ -733,7 +733,7 @@ Game cartridges - + @@ -749,7 +749,7 @@ Game cartridges - + @@ -765,7 +765,7 @@ Game cartridges - + @@ -781,7 +781,7 @@ Game cartridges - + @@ -798,7 +798,7 @@ Game cartridges - + @@ -814,7 +814,7 @@ Game cartridges - + @@ -842,7 +842,7 @@ Game cartridges - + @@ -858,7 +858,7 @@ Game cartridges - + @@ -874,7 +874,7 @@ Game cartridges - + @@ -890,7 +890,7 @@ Game cartridges - + @@ -906,7 +906,7 @@ Game cartridges - + @@ -935,7 +935,7 @@ Game cartridges - + @@ -951,7 +951,7 @@ Game cartridges - + @@ -967,7 +967,7 @@ Game cartridges - + @@ -983,7 +983,7 @@ Game cartridges - + @@ -999,7 +999,7 @@ Game cartridges - + @@ -1015,7 +1015,7 @@ Game cartridges - + @@ -1031,7 +1031,7 @@ Game cartridges - + @@ -1047,7 +1047,7 @@ Game cartridges - + @@ -1063,7 +1063,7 @@ Game cartridges - + @@ -1079,7 +1079,7 @@ Game cartridges - + @@ -1095,7 +1095,7 @@ Game cartridges - + @@ -1111,7 +1111,7 @@ Game cartridges - + @@ -1127,7 +1127,7 @@ Game cartridges - + @@ -1143,7 +1143,7 @@ Game cartridges - + @@ -1159,7 +1159,7 @@ Game cartridges - + @@ -1175,7 +1175,7 @@ Game cartridges - + @@ -1191,7 +1191,7 @@ Game cartridges - + @@ -1207,7 +1207,7 @@ Game cartridges - + @@ -1223,7 +1223,7 @@ Game cartridges - + @@ -1239,7 +1239,7 @@ Game cartridges - + @@ -1255,7 +1255,7 @@ Game cartridges - + @@ -1271,7 +1271,7 @@ Game cartridges - + @@ -1287,7 +1287,7 @@ Game cartridges - + @@ -1303,7 +1303,7 @@ Game cartridges - + @@ -1319,7 +1319,7 @@ Game cartridges - + @@ -1335,7 +1335,7 @@ Game cartridges - + @@ -1351,7 +1351,7 @@ Game cartridges - + @@ -1367,7 +1367,7 @@ Game cartridges - + @@ -1383,7 +1383,7 @@ Game cartridges - + @@ -1399,7 +1399,7 @@ Game cartridges - + @@ -1415,7 +1415,7 @@ Game cartridges - + @@ -1431,7 +1431,7 @@ Game cartridges - + @@ -1447,7 +1447,7 @@ Game cartridges - + @@ -1463,7 +1463,7 @@ Game cartridges - + @@ -1479,7 +1479,7 @@ Game cartridges - + @@ -1495,7 +1495,7 @@ Game cartridges - + @@ -1511,7 +1511,7 @@ Game cartridges - + @@ -1527,7 +1527,7 @@ Game cartridges - + @@ -1543,7 +1543,7 @@ Game cartridges - + @@ -1559,7 +1559,7 @@ Game cartridges - + @@ -1575,7 +1575,7 @@ Game cartridges - + @@ -1591,7 +1591,7 @@ Game cartridges - + @@ -1607,7 +1607,7 @@ Game cartridges - + @@ -1623,7 +1623,7 @@ Game cartridges - + @@ -1639,7 +1639,7 @@ Game cartridges - + @@ -1667,7 +1667,7 @@ Game cartridges - + @@ -1683,7 +1683,7 @@ Game cartridges - + @@ -1699,7 +1699,7 @@ Game cartridges - + @@ -1715,7 +1715,7 @@ Game cartridges - + @@ -1731,7 +1731,7 @@ Game cartridges - + @@ -1747,7 +1747,7 @@ Game cartridges - + @@ -1763,7 +1763,7 @@ Game cartridges - + @@ -1779,7 +1779,7 @@ Game cartridges - + @@ -1795,8 +1795,8 @@ Game cartridges - - + + @@ -1812,7 +1812,7 @@ Game cartridges - + @@ -1828,7 +1828,7 @@ Game cartridges - + @@ -1847,7 +1847,7 @@ Game cartridges - + @@ -1878,7 +1878,7 @@ Game cartridges - + @@ -1894,7 +1894,7 @@ Game cartridges - + @@ -1910,7 +1910,7 @@ Game cartridges - + From 6429535f1820fcc97d986ebc3cf55752709e1ef7 Mon Sep 17 00:00:00 2001 From: FakeShemp Date: Sat, 22 Oct 2016 18:17:03 +0200 Subject: [PATCH 08/30] Small formatting work. --- hash/vsmile_cart.xml | 3 ++- hash/vsmileb_cart.xml | 1 + hash/vsmilem_cart.xml | 7 ++++--- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/hash/vsmile_cart.xml b/hash/vsmile_cart.xml index 9a38733e08a..26bd1237baf 100644 --- a/hash/vsmile_cart.xml +++ b/hash/vsmile_cart.xml @@ -4,6 +4,7 @@ + + + - Cars - Rev It Up in Radiator Springs (USA) + Disney/Pixar Cars - Rev It Up in Radiator Springs (USA) 2006? VTech @@ -743,7 +743,7 @@ Game cartridges - Cars - Vollgas in Radiator Springs (Ger) + Disney/Pixar Cars - Vollgas in Radiator Springs (Ger) 2006? VTech @@ -759,7 +759,7 @@ Game cartridges - Cars - Quatre Roues (Fra) + Disney/Pixar Cars - Quatre Roues (Fra) 2006? VTech @@ -775,7 +775,7 @@ Game cartridges - Biler - Ræs i Kølerkildekøbing (Den) + Disney/Pixar Biler - Ræs i Kølerkildekøbing (Den) 2007? VTech @@ -791,7 +791,7 @@ Game cartridges - Bilar - Kör ikapp i Kylarköping (Swe) + Disney/Pixar Bilar - Kör ikapp i Kylarköping (Swe) 2007? VTech From 6da844e8017081972742cc0f28291e8929ac8ce6 Mon Sep 17 00:00:00 2001 From: FakeShemp Date: Sun, 23 Oct 2016 12:14:05 +0200 Subject: [PATCH 10/30] Copy paste error. --- hash/vsmilem_cart.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hash/vsmilem_cart.xml b/hash/vsmilem_cart.xml index 1df2fc7b877..1bfb1f4dd06 100644 --- a/hash/vsmilem_cart.xml +++ b/hash/vsmilem_cart.xml @@ -291,7 +291,7 @@ Smartbooks currently have no dumps available, hence they are temporarily listed 200? VTech - + From ca2672c715415dbd6ab6ee61983d62ee7e86a072 Mon Sep 17 00:00:00 2001 From: FakeShemp Date: Sun, 23 Oct 2016 12:38:54 +0200 Subject: [PATCH 11/30] V.Smile Baby parent error fix. --- hash/vsmileb_cart.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hash/vsmileb_cart.xml b/hash/vsmileb_cart.xml index 584201e0fed..1eaa6635fd0 100644 --- a/hash/vsmileb_cart.xml +++ b/hash/vsmileb_cart.xml @@ -141,7 +141,7 @@ The V.Baby currently have no dumps available, hence the carts are temporarily li - + Puuhs Hundert-Morgen-Wald (Ger) 2006? VTech @@ -152,7 +152,7 @@ The V.Baby currently have no dumps available, hence the carts are temporarily li - + Nalle Puhs Äventyr i Sjumilaskogen (Swe) 2007? VTech From 5a5a368602e9cee1e9a7bb8a23f879d9ff369ac8 Mon Sep 17 00:00:00 2001 From: FakeShemp Date: Tue, 25 Oct 2016 22:31:22 +0200 Subject: [PATCH 12/30] Make ROM names more in-line with chip labels. --- hash/vsmile_cart.xml | 12 ++++++------ hash/vsmilem_cart.xml | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/hash/vsmile_cart.xml b/hash/vsmile_cart.xml index 6acaa989a92..59a1d0a4eba 100644 --- a/hash/vsmile_cart.xml +++ b/hash/vsmile_cart.xml @@ -802,7 +802,7 @@ Game cartridges - + @@ -1131,7 +1131,7 @@ Game cartridges - + @@ -1227,7 +1227,7 @@ Game cartridges - + @@ -1243,7 +1243,7 @@ Game cartridges - + @@ -1259,7 +1259,7 @@ Game cartridges - + @@ -1833,7 +1833,7 @@ Game cartridges - + diff --git a/hash/vsmilem_cart.xml b/hash/vsmilem_cart.xml index 1bfb1f4dd06..ac1bbb32628 100644 --- a/hash/vsmilem_cart.xml +++ b/hash/vsmilem_cart.xml @@ -251,7 +251,7 @@ Smartbooks currently have no dumps available, hence they are temporarily listed - + @@ -266,7 +266,7 @@ Smartbooks currently have no dumps available, hence they are temporarily listed - + @@ -281,7 +281,7 @@ Smartbooks currently have no dumps available, hence they are temporarily listed - + @@ -308,7 +308,7 @@ Smartbooks currently have no dumps available, hence they are temporarily listed - + From 8348bd40da7eb1136b3ff7aebaf196f272c6da11 Mon Sep 17 00:00:00 2001 From: FakeShemp Date: Fri, 18 Nov 2016 14:46:28 +0100 Subject: [PATCH 13/30] Add new dump confirms from TeamEurope. --- hash/a2600.xml | 48 +++++++++++++++++++++++++++++++---------------- hash/megadriv.xml | 8 +++++--- hash/n64.xml | 9 ++++++++- hash/snes.xml | 48 +++++++++++++++++++++++++++-------------------- 4 files changed, 73 insertions(+), 40 deletions(-) diff --git a/hash/a2600.xml b/hash/a2600.xml index 01d954dac9d..2f09581dac4 100644 --- a/hash/a2600.xml +++ b/hash/a2600.xml @@ -1954,7 +1954,7 @@ Info from Atariage and Atarimania - add correct parent/clone relations for games with different descriptions - add programmers and serial numbers in - verify PAL publishers when multiple ones were present (only 1 got picked up the most common, but this might have - lead to a bunch of mistakes, e.g. for Ariola releases)... case by case checks are needed! + lead to a bunch of mistakes, e.g. for Ariola releases)... case by case checks are needed! - verify games with multiple titles --> @@ -5035,8 +5035,8 @@ Info from Atariage and Atarimania - - Dodge 'Em (PAL) + + Dodge 'Em (PAL, Alt) 1980 Atari @@ -5046,13 +5046,16 @@ Info from Atariage and Atarimania - - Dodge 'Em (PAL) (Fixed?) - 1980 + + Dodge 'Em (PAL) + 1987 Atari + + + - + @@ -7275,12 +7278,15 @@ Info from Atariage and Atarimania - Haunted House - 1982 + Haunted House (NTSC) + 1981 Atari + + + - + @@ -10655,11 +10661,14 @@ Info from Atariage and Atarimania Outlaw (PAL) - 1978 + 1979 Atari + + + - + @@ -16865,11 +16874,15 @@ Info from Atariage and Atarimania Tuby Bird (PAL) - 19?? - Suntek + 1983? + Suntek, Quelle + + + + - + @@ -17539,9 +17552,12 @@ Info from Atariage and Atarimania Weltraumtunnel (PAL) 1983 Quelle + + + - + diff --git a/hash/megadriv.xml b/hash/megadriv.xml index d2b1b7e2e16..b221dd40c21 100644 --- a/hash/megadriv.xml +++ b/hash/megadriv.xml @@ -4816,11 +4816,12 @@ Info on Sega chip labels (from Sunbeam / Digital Corruption) Mega Games I (Euro) 1992 Sega + - + - + @@ -7385,11 +7386,12 @@ Info on Sega chip labels (from Sunbeam / Digital Corruption) Sonic the Hedgehog (Euro, USA) 1991 Sega + - + diff --git a/hash/n64.xml b/hash/n64.xml index 79bfc6a0bfe..991e3ea338d 100644 --- a/hash/n64.xml +++ b/hash/n64.xml @@ -10899,9 +10899,16 @@ clips onto the player's ear. 1999 Acclaim Entertainment + + + + + + + - + diff --git a/hash/snes.xml b/hash/snes.xml index d3a430f1d3b..7e67bf981bf 100644 --- a/hash/snes.xml +++ b/hash/snes.xml @@ -9929,8 +9929,8 @@ more investigation needed... - - + + @@ -11930,7 +11930,7 @@ more investigation needed... - + @@ -19340,17 +19340,17 @@ more investigation needed... Nintendo Scope 6 (Euro) 1992 Nintendo - + - + - + @@ -25243,7 +25243,7 @@ more investigation needed... - + @@ -28147,7 +28147,7 @@ Alternate board (XL-1) - + @@ -33286,6 +33286,26 @@ Alternate board (XL-1) + + + The Lost Vikings (Euro) + 1993 + Interplay + + + + + + + + + + + + + + + @@ -46113,18 +46133,6 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20 - - The Lost Vikings (Euro) - 1993 - Interplay - - - - - - - - The Lost Vikings (Fra) 1993 From dc884d454966799818934be1f8a92a0a79ff5797 Mon Sep 17 00:00:00 2001 From: FakeShemp Date: Fri, 18 Nov 2016 14:53:14 +0100 Subject: [PATCH 14/30] Formatting. --- hash/n64.xml | 2 +- hash/snes.xml | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/hash/n64.xml b/hash/n64.xml index 991e3ea338d..42611c02ee6 100644 --- a/hash/n64.xml +++ b/hash/n64.xml @@ -10907,7 +10907,7 @@ clips onto the player's ear. - + diff --git a/hash/snes.xml b/hash/snes.xml index 7e67bf981bf..46d9ae99851 100644 --- a/hash/snes.xml +++ b/hash/snes.xml @@ -33295,13 +33295,13 @@ Alternate board (XL-1) - - - - - - - + + + + + + + From fe2e0344884f195c817e4b1d621a957b36d93ca8 Mon Sep 17 00:00:00 2001 From: FakeShemp Date: Fri, 18 Nov 2016 14:55:34 +0100 Subject: [PATCH 15/30] Oops. --- hash/a2600.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hash/a2600.xml b/hash/a2600.xml index 2f09581dac4..627fdb96dbd 100644 --- a/hash/a2600.xml +++ b/hash/a2600.xml @@ -1954,7 +1954,7 @@ Info from Atariage and Atarimania - add correct parent/clone relations for games with different descriptions - add programmers and serial numbers in - verify PAL publishers when multiple ones were present (only 1 got picked up the most common, but this might have - lead to a bunch of mistakes, e.g. for Ariola releases)... case by case checks are needed! + lead to a bunch of mistakes, e.g. for Ariola releases)... case by case checks are needed! - verify games with multiple titles --> From 111836b2a44a6ad32a21b727f3309de794fb885b Mon Sep 17 00:00:00 2001 From: FakeShemp Date: Fri, 18 Nov 2016 15:02:19 +0100 Subject: [PATCH 16/30] Remember to save this time -_- --- hash/a2600.xml | 10 +++++----- hash/n64.xml | 12 ++++++------ hash/snes.xml | 16 ++++++++-------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/hash/a2600.xml b/hash/a2600.xml index 627fdb96dbd..67349261d66 100644 --- a/hash/a2600.xml +++ b/hash/a2600.xml @@ -5052,8 +5052,8 @@ Info from Atariage and Atarimania Atari - - + + @@ -10666,7 +10666,7 @@ Info from Atariage and Atarimania - + @@ -16880,7 +16880,7 @@ Info from Atariage and Atarimania - + @@ -17555,7 +17555,7 @@ Info from Atariage and Atarimania - + diff --git a/hash/n64.xml b/hash/n64.xml index 42611c02ee6..cfdf0795554 100644 --- a/hash/n64.xml +++ b/hash/n64.xml @@ -10902,12 +10902,12 @@ clips onto the player's ear. - - - - - - + + + + + + diff --git a/hash/snes.xml b/hash/snes.xml index 46d9ae99851..6b92a337dd3 100644 --- a/hash/snes.xml +++ b/hash/snes.xml @@ -33294,14 +33294,14 @@ Alternate board (XL-1) - - - - - - - - + + + + + + + + From a34d4d6e947fd5af1629e350e1decf6313cd62b3 Mon Sep 17 00:00:00 2001 From: FakeShemp Date: Fri, 18 Nov 2016 15:11:28 +0100 Subject: [PATCH 17/30] Add note. --- hash/a2600.xml | 4 ++-- hash/snes.xml | 13 ------------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/hash/a2600.xml b/hash/a2600.xml index 67349261d66..7e9975591b1 100644 --- a/hash/a2600.xml +++ b/hash/a2600.xml @@ -5036,7 +5036,7 @@ Info from Atariage and Atarimania - Dodge 'Em (PAL, Alt) + Dodge 'Em (PAL, Earlier) 1980 Atari @@ -5047,7 +5047,7 @@ Info from Atariage and Atarimania - Dodge 'Em (PAL) + Dodge 'Em (PAL, Later) 1987 Atari diff --git a/hash/snes.xml b/hash/snes.xml index 6b92a337dd3..a849b49be77 100644 --- a/hash/snes.xml +++ b/hash/snes.xml @@ -59528,19 +59528,6 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20 - - - Syvalion (Euro, Prototype 2) - 1992 - Toshiba EMI - - - - - - - - Syvalion (Euro) 1992 From aeffa61e3567958526bb4b1d546302b317bbb2a1 Mon Sep 17 00:00:00 2001 From: Zoe Blade Date: Thu, 22 Dec 2016 19:59:15 +0000 Subject: [PATCH 18/30] Create handy ROM filename discrepancy spotter --- src/tools/discrepancy-fixer.py | 53 ++++++++++++++++++++++++++++++++ src/tools/discrepancy-spotter.py | 34 ++++++++++++++++++++ 2 files changed, 87 insertions(+) create mode 100755 src/tools/discrepancy-fixer.py create mode 100755 src/tools/discrepancy-spotter.py diff --git a/src/tools/discrepancy-fixer.py b/src/tools/discrepancy-fixer.py new file mode 100755 index 00000000000..bc334444e85 --- /dev/null +++ b/src/tools/discrepancy-fixer.py @@ -0,0 +1,53 @@ +#!/usr/bin/python + +# Fix discrepancies in arcade ROM dump names, by Zoe Blade +# For Python 2 + +import xml.etree.ElementTree + +print('Loading XML file...') +root = xml.etree.ElementTree.parse('arcade.xml').getroot() +print('Done.') + +for childMachine in root.iter('machine'): + if not childMachine.get('cloneof'): + continue + + for parentMachine in root.iter('machine'): + if not parentMachine.get('name') == childMachine.get('cloneof'): + continue + + # Machine pair found + + for childRom in childMachine.iter('rom'): + for parentRom in parentMachine.iter('rom'): + if not parentRom.get('sha1') == childRom.get('sha1'): + continue + + # ROM pair found + + if parentRom.get('name') == childRom.get('name'): + break + + # The names don't match + + sourceFilename = childMachine.get('sourcefile') + + input = open(sourceFilename, 'r') + source = input.read() + input.close() + + oldRomFilename = '"' + childRom.get('name') + '"' + newRomFilename = '"' + parentRom.get('name') + '"' + + oldRomFilenamePadded = oldRomFilename.ljust(14, ' ') + newRomFilenamePadded = newRomFilename.ljust(14, ' ') + + source = source.replace(oldRomFilenamePadded, newRomFilenamePadded) # Try to preserve fancy spacing where possible + source = source.replace(oldRomFilename, newRomFilename) # Fallback on just replacing the filename + + output = open(sourceFilename, 'w') + output.write(source) + output.close() + + print(sourceFilename + ': ' + oldRomFilename + ' -> ' + newRomFilename) diff --git a/src/tools/discrepancy-spotter.py b/src/tools/discrepancy-spotter.py new file mode 100755 index 00000000000..42bae617068 --- /dev/null +++ b/src/tools/discrepancy-spotter.py @@ -0,0 +1,34 @@ +#!/usr/bin/python + +# Find discrepancies in arcade ROM dump names, by Zoe Blade +# For Python 2 + +import xml.etree.ElementTree + +print('Loading XML file...') +root = xml.etree.ElementTree.parse('arcade.xml').getroot() +print('Done.') + +for childMachine in root.iter('machine'): + if not childMachine.get('cloneof'): + continue + + for parentMachine in root.iter('machine'): + if not parentMachine.get('name') == childMachine.get('cloneof'): + continue + + # Machine pair found + + for childRom in childMachine.iter('rom'): + for parentRom in parentMachine.iter('rom'): + if not parentRom.get('sha1') == childRom.get('sha1'): + continue + + # ROM pair found + + if parentRom.get('name') == childRom.get('name'): + break + + # The names don't match + + print(childMachine.get('sourcefile') + ' ' + childMachine.get('name') + ': ' + childRom.get('name') + ' -> ' + parentRom.get('name')) From 7b95b103796f4a281c92660624499ac5a24be610 Mon Sep 17 00:00:00 2001 From: Patrick Mackinlay Date: Fri, 6 Jan 2017 21:27:59 +0700 Subject: [PATCH 19/30] write line member for terminal count line of upd765 (#1935) --- src/devices/machine/upd765.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/devices/machine/upd765.h b/src/devices/machine/upd765.h index 36ca5ccd727..9da63ed2484 100644 --- a/src/devices/machine/upd765.h +++ b/src/devices/machine/upd765.h @@ -130,6 +130,8 @@ public: void tc_w(bool val) override; void ready_w(bool val); + DECLARE_WRITE_LINE_MEMBER(tc_line_w) { tc_w(state == ASSERT_LINE); } + void set_rate(int rate); // rate in bps, to be used when the fdc is externally frequency-controlled void set_mode(int mode); From b2a66f5f5dfa09ef04256f7ab47b106fdacfbf22 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Fri, 6 Jan 2017 22:00:00 +1100 Subject: [PATCH 20/30] gladiatr.cpp: Improvements * separate gladiatr and ppking state classes * hook up all four MCUs in greatgur * eliminate tagmap lookups on input read * this fixes coinage in greatgur (nw) When starting for the first time, greatgur will come up with one credit, and when doing an F3 reset it will randomly come up with one credit or no credits. I think this has something to do with the dodgy code for synchronising the master CPUs in the bootleg MCUs that depends on how MAME initialises memory. (The MCU dumps we have come from a bootleg set as far as I can ascertain.) --- src/mame/drivers/gladiatr.cpp | 462 ++++++++++++++++++++++++---------- src/mame/includes/gladiatr.h | 205 ++++++++++----- src/mame/video/gladiatr.cpp | 42 ++-- 3 files changed, 494 insertions(+), 215 deletions(-) diff --git a/src/mame/drivers/gladiatr.cpp b/src/mame/drivers/gladiatr.cpp index 2fdda445943..b3182e0c4d9 100644 --- a/src/mame/drivers/gladiatr.cpp +++ b/src/mame/drivers/gladiatr.cpp @@ -1,5 +1,5 @@ // license:BSD-3-Clause -// copyright-holders:Victor Trucco,Steve Ellenoff,Phil Stroffolino,Tatsuyuki Satoh,Tomasz Slanina,Nicola Salmoria +// copyright-holders:Victor Trucco,Steve Ellenoff,Phil Stroffolino,Tatsuyuki Satoh,Tomasz Slanina,Nicola Salmoria,Vas Crabb /*************************************************************************** Ping Pong King (c) Taito 1985 @@ -12,13 +12,15 @@ Credits: Golden Castle Rom Set Support - Phil Stroffolino: palette, sprites, misc video driver fixes - Tatsuyuki Satoh: YM2203 sound improvements, NEC 8741 simulation, ADPCM with MC6809 -- Tomasz Slanina preliminary Ping Pong King driver -- Nicola Salmoria clean up +- Tomasz Slanina: preliminary Ping Pong King driver +- Nicola Salmoria: clean up +- Vas Crabb: MCU hookup special thanks to: - Camilty for precious hardware information and screenshots - Jason Richmond for hardware information and misc. notes - Joe Rounceville for schematics +- JunoMan for measuring and tracing signals on a bootleg - and everyone else who's offered support along the way! @@ -184,13 +186,19 @@ TODO: ***************************************************************************/ #include "emu.h" +#include "includes/gladiatr.h" + #include "cpu/m6809/m6809.h" -#include "machine/tait8741.h" +#include "cpu/mcs48/mcs48.h" #include "cpu/z80/z80.h" + +#include "machine/clock.h" +#include "machine/nvram.h" + +#include "machine/tait8741.h" + #include "sound/2203intf.h" #include "sound/msm5205.h" -#include "machine/nvram.h" -#include "includes/gladiatr.h" /*Rom bankswitching*/ @@ -202,42 +210,37 @@ WRITE8_MEMBER(gladiatr_state::gladiatr_bankswitch_w) READ8_MEMBER(gladiatr_state::gladiator_dsw1_r ) { - int orig = ioport("DSW1")->read()^0xff; - - return BITSWAP8(orig, 0,1,2,3,4,5,6,7); + return BITSWAP8(~m_dsw1->read(), 0,1,2,3,4,5,6,7); } READ8_MEMBER(gladiatr_state::gladiator_dsw2_r ) { - int orig = ioport("DSW2")->read()^0xff; - - return BITSWAP8(orig, 2,3,4,5,6,7,1,0); + return BITSWAP8(~m_dsw2->read(), 2,3,4,5,6,7,1,0); } READ8_MEMBER(gladiatr_state::gladiator_controls_r ) { - int coins = 0; + u8 const coins = (~m_coins->read() & 0x07) ? 0x80 : 0x00; - if(ioport("COINS")->read() & 0xc0 ) coins = 0x80; switch(offset) { - case 0x01: /* start button , coins */ - return ioport("IN0")->read() | coins; - case 0x02: /* Player 1 Controller , coins */ - return ioport("IN1")->read() | coins; - case 0x04: /* Player 2 Controller , coins */ - return ioport("IN2")->read() | coins; + case 0x01: // start button , coins + return ((~m_in0->read() >> 6) & 0x03) | coins; + case 0x02: // Player 1 Controller , coins + return (~m_in0->read() & 0x3f) | coins; + case 0x04: // Player 2 Controller , coins + return (~m_in1->read() & 0x3f) | coins; } - /* unknown */ + // unknown return 0; } -READ8_MEMBER(gladiatr_state::gladiator_button3_r ) +READ8_MEMBER(gladiatr_state::gladiator_button3_r) { switch(offset) { case 0x01: /* button 3 */ - return ioport("IN3")->read(); + return (~m_in2->read() >> 6) & 0x03; } /* unknown */ return 0; @@ -304,60 +307,182 @@ WRITE8_MEMBER(gladiatr_state::gladiatr_irq_patch_w) #endif +WRITE_LINE_MEMBER(gladiatr_state::tclk_w) +{ + m_tclk_val = state != 0; + + // these are actually edge-triggered, but MAME only supports polled inputs + + u8 const new_in0_val(m_in0->read()); + if (BIT(~new_in0_val & (new_in0_val ^ m_in0_val), 5)) + m_cctl_p1 = (m_cctl_p1 & 0xfc) | BIT(~new_in0_val, 5) | (BIT(~new_in0_val, 5) << 1); + else + m_cctl_p1 = (m_cctl_p1 & 0xfe) | BIT(~new_in0_val, 5); + m_in0_val = new_in0_val; + + u8 const new_in1_val(m_in0->read()); + if (BIT(~new_in1_val & (new_in1_val ^ m_in1_val), 5)) + m_cctl_p2 = (m_cctl_p2 & 0xfc) | BIT(~new_in1_val, 5) | (BIT(~new_in1_val, 5) << 1); + else + m_cctl_p2 = (m_cctl_p2 & 0xfe) | BIT(~new_in1_val, 5); + m_in1_val = new_in1_val; +} + +READ8_MEMBER(gladiatr_state::cctl_p1_r) +{ + return m_cctl_p1 & m_in2->read(); +} + +READ8_MEMBER(gladiatr_state::cctl_p2_r) +{ + return m_cctl_p2; +} + +READ8_MEMBER(gladiatr_state::ucpu_p2_r) +{ + return BITSWAP8(m_dsw1->read(), 0,1,2,3,4,5,6,7); +} + +READ8_MEMBER(gladiatr_state::cctl_t_r) +{ + return BIT(m_coins->read(), offset + 2); +} + +READ8_MEMBER(gladiatr_state::ccpu_t_r) +{ + return BIT(m_coins->read(), offset); +} + +WRITE8_MEMBER(gladiatr_state::ccpu_p2_w) +{ + // FIXME: active high or active low? (bootleg MCU never uses these outputs) + machine().bookkeeping().coin_counter_w(0, BIT(data, 6)); + machine().bookkeeping().coin_counter_w(1, BIT(data, 7)); +} + +READ8_MEMBER(gladiatr_state::tclk_r) +{ + // fed to t0 on comms MCUs + return m_tclk_val ? 0x01 : 0x00; +} + +READ8_MEMBER(gladiatr_state::ucpu_t1_r) +{ + // connected to p1 on other MCU + return BIT(m_csnd_p1, 1); +} + +READ8_MEMBER(gladiatr_state::ucpu_p1_r) +{ + // p10 connected to corresponding line on other MCU + // p11 connected to t1 on other MCU + // other lines floating + return m_csnd_p1 |= 0xfe; +} + +WRITE8_MEMBER(gladiatr_state::ucpu_p1_w) +{ + m_ucpu_p1 = data; +} + +READ8_MEMBER(gladiatr_state::csnd_t1_r) +{ + // connected to p1 on other MCU + return BIT(m_ucpu_p1, 1); +} + +READ8_MEMBER(gladiatr_state::csnd_p1_r) +{ + // p10 connected to corresponding line on other MCU + // p11 connected to t1 on other MCU + // other lines floating + return m_ucpu_p1 |= 0xfe; +} + +WRITE8_MEMBER(gladiatr_state::csnd_p1_w) +{ + m_csnd_p1 = data; +} + +READ8_MEMBER(gladiatr_state::csnd_p2_r) +{ + return BITSWAP8(m_dsw2->read(), 2,3,4,5,6,7,1,0); +} +READ8_MEMBER(ppking_state::ppking_f1_r) +{ + return machine().rand(); +} +READ8_MEMBER(ppking_state::ppking_f6a3_r) +{ + if (space.device().safe_pcbase() == 0x8e) + m_nvram[0x6a3] = 1; -WRITE8_MEMBER(gladiatr_state::ppking_qx0_w) + return m_nvram[0x6a3]; +} + +WRITE8_MEMBER(ppking_state::ppking_qx0_w) { if(!offset) { - m_data2=data; - m_flag2=1; + m_data2 = data; + m_flag2 = 1; } } -WRITE8_MEMBER(gladiatr_state::ppking_qx1_w) +WRITE8_MEMBER(ppking_state::ppking_qx1_w) { if(!offset) { - m_data1=data; - m_flag1=1; + m_data1 = data; + m_flag1 = 1; } } -WRITE8_MEMBER(gladiatr_state::ppking_qx2_w){ } - -WRITE8_MEMBER(gladiatr_state::ppking_qx3_w){ } - -READ8_MEMBER(gladiatr_state::ppking_qx2_r){ return machine().rand(); } - -READ8_MEMBER(gladiatr_state::ppking_qx3_r){ return machine().rand()&0xf; } - -READ8_MEMBER(gladiatr_state::ppking_qx0_r) +WRITE8_MEMBER(ppking_state::ppking_qx2_w) { - if(!offset) - return m_data1; +} + +WRITE8_MEMBER(ppking_state::ppking_qx3_w) +{ +} + +READ8_MEMBER(ppking_state::ppking_qx0_r) +{ + if (!offset) + return m_data1; else return m_flag2; } -READ8_MEMBER(gladiatr_state::ppking_qx1_r) +READ8_MEMBER(ppking_state::ppking_qx1_r) { - if(!offset) + if (!offset) return m_data2; else return m_flag1; } -MACHINE_RESET_MEMBER(gladiatr_state,ppking) +READ8_MEMBER(ppking_state::ppking_qx2_r) +{ + return machine().rand(); +} + +READ8_MEMBER(ppking_state::ppking_qx3_r) +{ + return machine().rand()&0xf; +} + +MACHINE_RESET_MEMBER(ppking_state, ppking) { m_data1 = m_data2 = 0; m_flag1 = m_flag2 = 1; } -static ADDRESS_MAP_START( ppking_cpu1_map, AS_PROGRAM, 8, gladiatr_state ) +static ADDRESS_MAP_START( ppking_cpu1_map, AS_PROGRAM, 8, ppking_state ) AM_RANGE(0x0000, 0xbfff) AM_ROM AM_RANGE(0xc000, 0xcbff) AM_RAM AM_SHARE("spriteram") AM_RANGE(0xcc00, 0xcfff) AM_WRITE(ppking_video_registers_w) @@ -369,12 +494,12 @@ static ADDRESS_MAP_START( ppking_cpu1_map, AS_PROGRAM, 8, gladiatr_state ) ADDRESS_MAP_END -static ADDRESS_MAP_START( ppking_cpu3_map, AS_PROGRAM, 8, gladiatr_state ) +static ADDRESS_MAP_START( ppking_cpu3_map, AS_PROGRAM, 8, ppking_state ) AM_RANGE(0x2000, 0x2fff) AM_ROM AM_RANGE(0xc000, 0xffff) AM_ROM ADDRESS_MAP_END -static ADDRESS_MAP_START( ppking_cpu1_io, AS_IO, 8, gladiatr_state ) +static ADDRESS_MAP_START( ppking_cpu1_io, AS_IO, 8, ppking_state ) // ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0xc000, 0xc000) AM_WRITE(spritebuffer_w) AM_RANGE(0xc004, 0xc004) AM_NOP // WRITE(ppking_irq_patch_w) @@ -382,7 +507,7 @@ static ADDRESS_MAP_START( ppking_cpu1_io, AS_IO, 8, gladiatr_state ) AM_RANGE(0xc0bf, 0xc0bf) AM_NOP ADDRESS_MAP_END -static ADDRESS_MAP_START( ppking_cpu2_io, AS_IO, 8, gladiatr_state ) +static ADDRESS_MAP_START( ppking_cpu2_io, AS_IO, 8, ppking_state ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ymsnd", ym2203_device, read, write) AM_RANGE(0x20, 0x21) AM_READ(ppking_qx1_r) AM_WRITE(ppking_qx1_w) @@ -440,22 +565,71 @@ static ADDRESS_MAP_START( gladiatr_cpu2_io, AS_IO, 8, gladiatr_state ) AM_RANGE(0xe0, 0xe0) AM_WRITE(gladiator_cpu_sound_command_w) ADDRESS_MAP_END +static ADDRESS_MAP_START( greatgur_cpu1_io, AS_IO, 8, gladiatr_state ) +// ADDRESS_MAP_GLOBAL_MASK(0xff) + AM_RANGE(0xc000, 0xc000) AM_WRITE(spritebuffer_w) + AM_RANGE(0xc001, 0xc001) AM_WRITE(gladiatr_spritebank_w) + AM_RANGE(0xc002, 0xc002) AM_WRITE(gladiatr_bankswitch_w) + AM_RANGE(0xc004, 0xc004) AM_WRITE(gladiatr_irq_patch_w) /* !!! patch to 2nd CPU IRQ !!! */ + AM_RANGE(0xc007, 0xc007) AM_WRITE(gladiatr_flipscreen_w) + AM_RANGE(0xc09e, 0xc09f) AM_DEVREADWRITE("ucpu", upi41_cpu_device, upi41_master_r, upi41_master_w) + AM_RANGE(0xc0bf, 0xc0bf) AM_NOP // watchdog_reset_w doesn't work +ADDRESS_MAP_END + +static ADDRESS_MAP_START( greatgur_cpu2_io, AS_IO, 8, gladiatr_state ) + ADDRESS_MAP_GLOBAL_MASK(0xff) + AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ymsnd", ym2203_device, read, write) + AM_RANGE(0x20, 0x21) AM_DEVREADWRITE("csnd", upi41_cpu_device, upi41_master_r, upi41_master_w) + AM_RANGE(0x40, 0x40) AM_NOP // WRITE(sub_irq_ack_w) + AM_RANGE(0x60, 0x61) AM_DEVREADWRITE("cctl", upi41_cpu_device, upi41_master_r, upi41_master_w) + AM_RANGE(0x80, 0x81) AM_DEVREADWRITE("ccpu", upi41_cpu_device, upi41_master_r, upi41_master_w) + AM_RANGE(0xa0, 0xa7) AM_NOP // filters on sound output + AM_RANGE(0xe0, 0xe0) AM_WRITE(gladiator_cpu_sound_command_w) +ADDRESS_MAP_END + + + +static ADDRESS_MAP_START( cctl_io_map, AS_IO, 8, gladiatr_state ) + AM_RANGE(MCS48_PORT_T0, MCS48_PORT_T1) AM_READ(cctl_t_r) + AM_RANGE(MCS48_PORT_P1, MCS48_PORT_P1) AM_READ(cctl_p1_r) + AM_RANGE(MCS48_PORT_P2, MCS48_PORT_P2) AM_READ(cctl_p2_r) +ADDRESS_MAP_END + +static ADDRESS_MAP_START( ccpu_io_map, AS_IO, 8, gladiatr_state ) + AM_RANGE(MCS48_PORT_P1, MCS48_PORT_P1) AM_READ_PORT("IN0") + AM_RANGE(MCS48_PORT_P2, MCS48_PORT_P2) AM_READ_PORT("IN1") AM_WRITE(ccpu_p2_w) + AM_RANGE(MCS48_PORT_T0, MCS48_PORT_T1) AM_READ(ccpu_t_r) +ADDRESS_MAP_END + +static ADDRESS_MAP_START( ucpu_io_map, AS_IO, 8, gladiatr_state ) + AM_RANGE(MCS48_PORT_P1, MCS48_PORT_P1) AM_READWRITE(ucpu_p1_r, ucpu_p1_w) + AM_RANGE(MCS48_PORT_P2, MCS48_PORT_P2) AM_READ(ucpu_p2_r) + AM_RANGE(MCS48_PORT_T0, MCS48_PORT_T0) AM_READ(tclk_r) + AM_RANGE(MCS48_PORT_T1, MCS48_PORT_T1) AM_READ(ucpu_t1_r) +ADDRESS_MAP_END + +static ADDRESS_MAP_START( csnd_io_map, AS_IO, 8, gladiatr_state ) + AM_RANGE(MCS48_PORT_P1, MCS48_PORT_P1) AM_READWRITE(csnd_p1_r, csnd_p1_w) + AM_RANGE(MCS48_PORT_P2, MCS48_PORT_P2) AM_READ(csnd_p2_r) + AM_RANGE(MCS48_PORT_T0, MCS48_PORT_T0) AM_READ(tclk_r) + AM_RANGE(MCS48_PORT_T1, MCS48_PORT_T1) AM_READ(csnd_t1_r) +ADDRESS_MAP_END static INPUT_PORTS_START( gladiatr ) PORT_START("DSW1") /* (8741-0 parallel port)*/ - PORT_DIPNAME( 0x03, 0x02, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW1:1,2") + PORT_DIPNAME( 0x03, 0x02, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW1:1,2") PORT_DIPSETTING( 0x03, DEF_STR( Easy ) ) PORT_DIPSETTING( 0x02, DEF_STR( Medium ) ) PORT_DIPSETTING( 0x01, DEF_STR( Hard ) ) PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) ) - PORT_DIPNAME( 0x04, 0x00, "After 4 Stages" ) PORT_DIPLOCATION("SW1:3") + PORT_DIPNAME( 0x04, 0x00, "After 4 Stages" ) PORT_DIPLOCATION("SW1:3") PORT_DIPSETTING( 0x00, DEF_STR( Continues ) ) PORT_DIPSETTING( 0x04, "Ends" ) - PORT_DIPNAME( 0x08, 0x08, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW1:4") /*NOTE: Actual manual has these settings reversed(typo?)! */ - PORT_DIPSETTING( 0x00, "Only at 100000" ) + PORT_DIPNAME( 0x08, 0x08, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW1:4") /*NOTE: Actual manual has these settings reversed(typo?)! */ + PORT_DIPSETTING( 0x08, "Only at 100000" ) PORT_DIPSETTING( 0x00, "Every 100000" ) - PORT_DIPNAME( 0x30, 0x10, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW1:5,6") + PORT_DIPNAME( 0x30, 0x10, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW1:5,6") PORT_DIPSETTING( 0x30, "1" ) PORT_DIPSETTING( 0x20, "2" ) PORT_DIPSETTING( 0x10, "3" ) @@ -463,29 +637,29 @@ static INPUT_PORTS_START( gladiatr ) PORT_DIPNAME( 0x40, 0x40, DEF_STR( Allow_Continue ) ) PORT_DIPLOCATION("SW1:7") PORT_DIPSETTING( 0x00, DEF_STR( No ) ) PORT_DIPSETTING( 0x40, DEF_STR( Yes ) ) - PORT_DIPNAME( 0x80, 0x00, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW1:8") + PORT_DIPNAME( 0x80, 0x00, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW1:8") PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_START("DSW2") /* (8741-1 parallel port) - Dips 6 Unused */ - PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW2:1,2") + PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW2:1,2") PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) ) PORT_DIPSETTING( 0x02, DEF_STR( 1C_2C ) ) PORT_DIPSETTING( 0x01, DEF_STR( 1C_4C ) ) PORT_DIPSETTING( 0x00, DEF_STR( 1C_5C ) ) - PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("SW2:3,4") + PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("SW2:3,4") PORT_DIPSETTING( 0x00, DEF_STR( 5C_1C ) ) PORT_DIPSETTING( 0x04, DEF_STR( 4C_1C ) ) PORT_DIPSETTING( 0x08, DEF_STR( 3C_1C ) ) PORT_DIPSETTING( 0x0c, DEF_STR( 2C_1C ) ) - PORT_DIPNAME( 0x10, 0x10, DEF_STR( Free_Play ) ) PORT_DIPLOCATION("SW2:5") + PORT_DIPNAME( 0x10, 0x10, DEF_STR( Free_Play ) ) PORT_DIPLOCATION("SW2:5") PORT_DIPSETTING( 0x10, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPUNUSED_DIPLOC( 0x20, 0x20, "SW2:6" ) /* Listed as "Unused" */ - PORT_DIPNAME( 0x40, 0x00, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW2:7") + PORT_DIPUNUSED_DIPLOC( 0x20, 0x20, "SW2:6" ) /* Listed as "Unused" */ + PORT_DIPNAME( 0x40, 0x00, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW2:7") PORT_DIPSETTING( 0x00, DEF_STR( Upright ) ) PORT_DIPSETTING( 0x40, DEF_STR( Cocktail ) ) - PORT_DIPNAME( 0x80, 0x80, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW2:8") + PORT_DIPNAME( 0x80, 0x80, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW2:8") PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -493,68 +667,48 @@ static INPUT_PORTS_START( gladiatr ) PORT_DIPNAME( 0x01, 0x01, "Invulnerability (Cheat)") PORT_DIPLOCATION("SW3:1") PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x02, 0x02, "Memory Backup" ) PORT_DIPLOCATION("SW3:2") + PORT_DIPNAME( 0x02, 0x02, "Memory Backup" ) PORT_DIPLOCATION("SW3:2") PORT_DIPSETTING( 0x02, DEF_STR( Normal ) ) PORT_DIPSETTING( 0x00, "Clear" ) - PORT_DIPNAME( 0x0c, 0x0c, "Starting Stage" ) PORT_DIPLOCATION("SW3:3,4") + PORT_DIPNAME( 0x0c, 0x0c, "Starting Stage" ) PORT_DIPLOCATION("SW3:3,4") PORT_DIPSETTING( 0x0c, "1" ) PORT_DIPSETTING( 0x08, "2" ) PORT_DIPSETTING( 0x04, "3" ) PORT_DIPSETTING( 0x00, "4" ) - PORT_DIPUNUSED_DIPLOC( 0x10, 0x10, "SW3:5" ) /* Listed as "Unused" */ - PORT_DIPUNUSED_DIPLOC( 0x20, 0x20, "SW3:6" ) /* Listed as "Unused" */ - PORT_DIPUNUSED_DIPLOC( 0x40, 0x40, "SW3:7" ) /* Listed as "Unused" */ + PORT_DIPUNUSED_DIPLOC( 0x10, 0x10, "SW3:5" ) /* Listed as "Unused" */ + PORT_DIPUNUSED_DIPLOC( 0x20, 0x20, "SW3:6" ) /* Listed as "Unused" */ + PORT_DIPUNUSED_DIPLOC( 0x40, 0x40, "SW3:7" ) /* Listed as "Unused" */ PORT_SERVICE_DIPLOC( 0x80, IP_ACTIVE_LOW, "SW3:8" ) - PORT_START("IN0") /*(8741-3 parallel port 1) */ - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 ) - PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 ) - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* COINS */ + PORT_START("IN0") // ccpu p1 + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_8WAY + PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_8WAY + PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 ) + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 ) - PORT_START("COINS") /*(8741-3 parallel port bit7) */ - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_IMPULSE(1) - PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_COIN2 ) PORT_IMPULSE(1) + PORT_START("IN1") // ccpu p2 + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL + PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL + PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED ) // coin counter outputs - PORT_START("IN1") /* (8741-3 parallel port 2) */ - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY - PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY - PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY - PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON1 ) - PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_BUTTON2 ) - PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* COINS */ + PORT_START("IN2") // cctl p1 + PORT_BIT( 0x3f, IP_ACTIVE_LOW, IPT_UNUSED ) // other stuff mixed here + PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_COCKTAIL - PORT_START("IN2") /* (8741-3 parallel port 4) */ - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL - PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL - PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL - PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_COCKTAIL - PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_COCKTAIL - PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* COINS */ - - PORT_START("IN3") /* (8741-2 parallel port 1) */ - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON3 ) - PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_COCKTAIL - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN ) + PORT_START("COINS") // ccpu test, cctl test + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(1) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(1) + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_IMPULSE(1) + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNUSED ) INPUT_PORTS_END /*******************************************************************/ @@ -608,12 +762,7 @@ GFXDECODE_END -READ8_MEMBER(gladiatr_state::ppking_f1_r) -{ - return machine().rand(); -} - -static MACHINE_CONFIG_START( ppking, gladiatr_state ) +static MACHINE_CONFIG_START( ppking, ppking_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* verified on pcb */ @@ -631,7 +780,7 @@ static MACHINE_CONFIG_START( ppking, gladiatr_state ) MCFG_QUANTUM_TIME(attotime::from_hz(6000)) - MCFG_MACHINE_RESET_OVERRIDE(gladiatr_state,ppking) + MCFG_MACHINE_RESET_OVERRIDE(ppking_state, ppking) MCFG_NVRAM_ADD_0FILL("nvram") /* video hardware */ @@ -640,13 +789,13 @@ static MACHINE_CONFIG_START( ppking, gladiatr_state ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) - MCFG_SCREEN_UPDATE_DRIVER(gladiatr_state, screen_update_ppking) + MCFG_SCREEN_UPDATE_DRIVER(ppking_state, screen_update_ppking) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", ppking) MCFG_PALETTE_ADD("palette", 1024) - MCFG_VIDEO_START_OVERRIDE(gladiatr_state,ppking) + MCFG_VIDEO_START_OVERRIDE(ppking_state, ppking) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -654,8 +803,8 @@ static MACHINE_CONFIG_START( ppking, gladiatr_state ) MCFG_GENERIC_LATCH_8_ADD("soundlatch") MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_12MHz/8) /* verified on pcb */ - MCFG_AY8910_PORT_A_READ_CB(READ8(gladiatr_state, ppking_f1_r)) - MCFG_AY8910_PORT_B_READ_CB(READ8(gladiatr_state, ppking_f1_r)) + MCFG_AY8910_PORT_A_READ_CB(READ8(ppking_state, ppking_f1_r)) + MCFG_AY8910_PORT_B_READ_CB(READ8(ppking_state, ppking_f1_r)) MCFG_SOUND_ROUTE(0, "mono", 0.60) MCFG_SOUND_ROUTE(1, "mono", 0.60) MCFG_SOUND_ROUTE(2, "mono", 0.60) @@ -724,6 +873,37 @@ static MACHINE_CONFIG_START( gladiatr, gladiatr_state ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60) MACHINE_CONFIG_END +MACHINE_CONFIG_DERIVED( greatgur, gladiatr ) + + /* basic machine hardware */ + MCFG_CPU_MODIFY("maincpu") + MCFG_CPU_IO_MAP(greatgur_cpu1_io) + + MCFG_CPU_MODIFY("sub") + MCFG_CPU_IO_MAP(greatgur_cpu2_io) + + MCFG_DEVICE_ADD("cctl", I8741, XTAL_12MHz/2) /* verified on pcb */ + MCFG_CPU_IO_MAP(cctl_io_map) + + MCFG_DEVICE_ADD("ccpu", I8741, XTAL_12MHz/2) /* verified on pcb */ + MCFG_CPU_IO_MAP(ccpu_io_map) + + MCFG_DEVICE_ADD("ucpu", I8741, XTAL_12MHz/2) /* verified on pcb */ + MCFG_CPU_IO_MAP(ucpu_io_map) + + MCFG_DEVICE_ADD("csnd", I8741, XTAL_12MHz/2) /* verified on pcb */ + MCFG_CPU_IO_MAP(csnd_io_map) + + MCFG_CLOCK_ADD("tclk", XTAL_12MHz/8/128/2) /* verified on pcb */ + MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(gladiatr_state, tclk_w)); + + /* lazy way to make polled serial between MCUs work */ + MCFG_QUANTUM_PERFECT_CPU("ucpu") + + MCFG_DEVICE_REMOVE("taito8741") +MACHINE_CONFIG_END + + /*************************************************************************** Game driver(s) @@ -898,10 +1078,16 @@ ROM_START( greatgur ) ROM_LOAD( "q3.2b", 0x00000, 0x0020, CRC(6a7c3c60) SHA1(5125bfeb03752c8d76b140a4e74d5cac29dcdaa6) ) /* address decoding */ ROM_LOAD( "q4.5s", 0x00020, 0x0020, CRC(e325808e) SHA1(5fd92ad4eff24f6ccf2df19d268a6cafba72202e) ) - ROM_REGION( 0x0400, "user1", 0 ) /* ROMs for the four 8741 (not emulated yet) */ + ROM_REGION( 0x0400, "cctl", 0 ) /* I/O MCU */ ROM_LOAD( "gladcctl.1", 0x00000, 0x0400, CRC(b30d225f) SHA1(f383286530975c440589c276aa8c46fdfe5292b6) ) + + ROM_REGION( 0x0400, "ccpu", 0 ) /* I/O MCU */ ROM_LOAD( "gladccpu.2", 0x00000, 0x0400, CRC(1d02cd5f) SHA1(f7242039788c66a1d91b01852d7d447330b847c4) ) + + ROM_REGION( 0x0400, "ucpu", 0 ) /* comms MCU */ ROM_LOAD( "gladucpu.17", 0x00000, 0x0400, CRC(3c5ca4c6) SHA1(0d8c2e1c2142ada11e30cfb9a48663386fee9cb8) ) + + ROM_REGION( 0x0400, "csnd", 0 ) /* comms MCU */ ROM_LOAD( "gladcsnd.18", 0x00000, 0x0400, CRC(3c5ca4c6) SHA1(0d8c2e1c2142ada11e30cfb9a48663386fee9cb8) ) ROM_END @@ -1001,18 +1187,26 @@ DRIVER_INIT_MEMBER(gladiatr_state,gladiatr) /* make sure bank is valid in cpu-reset */ membank("bank2")->set_entry(0); + + m_tclk_val = false; + m_in0_val = 0xff; + m_in1_val = 0xff; + m_cctl_p1 = 0xff; + m_cctl_p2 = 0xff; + m_ucpu_p1 = 0xff; + m_csnd_p1 = 0xff; + + save_item(NAME(m_tclk_val)); + save_item(NAME(m_in0_val)); + save_item(NAME(m_in1_val)); + save_item(NAME(m_cctl_p1)); + save_item(NAME(m_cctl_p2)); + save_item(NAME(m_ucpu_p1)); + save_item(NAME(m_csnd_p1)); } -READ8_MEMBER(gladiatr_state::ppking_f6a3_r) -{ - if(space.device().safe_pcbase()==0x8e) - m_nvram[0x6a3]=1; - - return m_nvram[0x6a3]; -} - -DRIVER_INIT_MEMBER(gladiatr_state,ppking) +DRIVER_INIT_MEMBER(ppking_state, ppking) { uint8_t *rom; int i,j; @@ -1034,7 +1228,7 @@ DRIVER_INIT_MEMBER(gladiatr_state,ppking) rom[i+2*j*0x2000] = rom[i+j*0x2000]; } } - m_maincpu->space(AS_PROGRAM).install_read_handler(0xf6a3,0xf6a3,read8_delegate(FUNC(gladiatr_state::ppking_f6a3_r),this)); + m_maincpu->space(AS_PROGRAM).install_read_handler(0xf6a3,0xf6a3,read8_delegate(FUNC(ppking_state::ppking_f6a3_r),this)); save_item(NAME(m_data1)); save_item(NAME(m_data2)); @@ -1042,8 +1236,8 @@ DRIVER_INIT_MEMBER(gladiatr_state,ppking) -GAME( 1985, ppking, 0, ppking, 0, gladiatr_state, ppking, ROT90, "Taito America Corporation", "Ping-Pong King", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) +GAME( 1985, ppking, 0, ppking, 0, ppking_state, ppking, ROT90, "Taito America Corporation", "Ping-Pong King", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) GAME( 1986, gladiatr, 0, gladiatr, gladiatr, gladiatr_state, gladiatr, ROT0, "Allumer / Taito America Corporation", "Gladiator (US)", MACHINE_SUPPORTS_SAVE ) GAME( 1986, ogonsiro, gladiatr, gladiatr, gladiatr, gladiatr_state, gladiatr, ROT0, "Allumer / Taito Corporation", "Ougon no Shiro (Japan)", MACHINE_SUPPORTS_SAVE ) -GAME( 1986, greatgur, gladiatr, gladiatr, gladiatr, gladiatr_state, gladiatr, ROT0, "Allumer / Taito Corporation", "Great Gurianos (Japan?)", MACHINE_SUPPORTS_SAVE ) +GAME( 1986, greatgur, gladiatr, greatgur, gladiatr, gladiatr_state, gladiatr, ROT0, "Allumer / Taito Corporation", "Great Gurianos (Japan?)", MACHINE_SUPPORTS_SAVE ) GAME( 1986, gcastle, gladiatr, gladiatr, gladiatr, gladiatr_state, gladiatr, ROT0, "Allumer / Taito Corporation", "Golden Castle (prototype?)", MACHINE_SUPPORTS_SAVE ) // incomplete dump diff --git a/src/mame/includes/gladiatr.h b/src/mame/includes/gladiatr.h index 1ed36a46947..97ddf67f5af 100644 --- a/src/mame/includes/gladiatr.h +++ b/src/mame/includes/gladiatr.h @@ -1,66 +1,100 @@ // license:BSD-3-Clause -// copyright-holders:Victor Trucco,Steve Ellenoff,Phil Stroffolino,Tatsuyuki Satoh,Tomasz Slanina,Nicola Salmoria +// copyright-holders:Victor Trucco,Steve Ellenoff,Phil Stroffolino,Tatsuyuki Satoh,Tomasz Slanina,Nicola Salmoria,Vas Crabb #include "machine/gen_latch.h" + #include "sound/msm5205.h" -class gladiatr_state : public driver_device + +class gladiatr_state_base : public driver_device { public: - gladiatr_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu"), - m_audiocpu(*this, "audiocpu"), - m_subcpu(*this, "sub"), - m_msm(*this, "msm"), - m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette"), - m_soundlatch(*this, "soundlatch"), - m_nvram(*this, "nvram") , - m_spriteram(*this, "spriteram"), - m_videoram(*this, "videoram"), - m_colorram(*this, "colorram"), - m_textram(*this, "textram"), - m_generic_paletteram_8(*this, "paletteram") { } - - required_device m_maincpu; - required_device m_audiocpu; - required_device m_subcpu; - required_device m_msm; - required_device m_gfxdecode; - required_device m_palette; - required_device m_soundlatch; - - required_shared_ptr m_nvram; - required_shared_ptr m_spriteram; - required_shared_ptr m_videoram; - required_shared_ptr m_colorram; - required_shared_ptr m_textram; - required_shared_ptr m_generic_paletteram_8; - - int m_data1; - int m_data2; - int m_flag1; - int m_flag2; - int m_video_attributes; - int m_fg_scrollx; - int m_fg_scrolly; - int m_bg_scrollx; - int m_bg_scrolly; - int m_sprite_bank; - int m_sprite_buffer; - tilemap_t *m_fg_tilemap; - tilemap_t *m_bg_tilemap; - int m_fg_tile_bank; - int m_bg_tile_bank; - - // common DECLARE_WRITE8_MEMBER(videoram_w); DECLARE_WRITE8_MEMBER(colorram_w); DECLARE_WRITE8_MEMBER(textram_w); DECLARE_WRITE8_MEMBER(paletteram_w); DECLARE_WRITE8_MEMBER(spritebuffer_w); +protected: + gladiatr_state_base(const machine_config &mconfig, device_type type, const char *tag) + : driver_device(mconfig, type, tag) + , m_maincpu(*this, "maincpu") + , m_subcpu(*this, "sub") + , m_audiocpu(*this, "audiocpu") + , m_gfxdecode(*this, "gfxdecode") + , m_palette(*this, "palette") + , m_msm(*this, "msm") + , m_soundlatch(*this, "soundlatch") + , m_videoram(*this, "videoram") + , m_colorram(*this, "colorram") + , m_textram(*this, "textram") + , m_paletteram(*this, "paletteram") + , m_spriteram(*this, "spriteram") + , m_video_attributes(0) + , m_fg_scrolly(0) + , m_fg_tile_bank(0) + , m_bg_tile_bank(0) + , m_sprite_bank(0) + , m_sprite_buffer(0) + , m_fg_tilemap(nullptr) + , m_bg_tilemap(nullptr) + { + } + + TILE_GET_INFO_MEMBER(bg_get_tile_info); + TILE_GET_INFO_MEMBER(fg_get_tile_info); + + void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); + + required_device m_maincpu; + required_device m_subcpu; + required_device m_audiocpu; + required_device m_gfxdecode; + required_device m_palette; + required_device m_msm; + required_device m_soundlatch; + + required_shared_ptr m_videoram; + required_shared_ptr m_colorram; + required_shared_ptr m_textram; + required_shared_ptr m_paletteram; + required_shared_ptr m_spriteram; + + int m_video_attributes; + int m_fg_scrolly; + int m_fg_tile_bank; + int m_bg_tile_bank; + int m_sprite_bank; + int m_sprite_buffer; + + tilemap_t *m_fg_tilemap; + tilemap_t *m_bg_tilemap; +}; + +class gladiatr_state : public gladiatr_state_base +{ +public: + gladiatr_state(const machine_config &mconfig, device_type type, const char *tag) + : gladiatr_state_base(mconfig, type, tag) + , m_dsw1(*this, "DSW1") + , m_dsw2(*this, "DSW2") + , m_in0(*this, "IN0") + , m_in1(*this, "IN1") + , m_in2(*this, "IN2") + , m_coins(*this, "COINS") + , m_tclk_val(false) + , m_in0_val(0xff) + , m_in1_val(0xff) + , m_cctl_p1(0xff) + , m_cctl_p2(0xff) + , m_ucpu_p1(0xff) + , m_csnd_p1(0xff) + , m_fg_scrollx(0) + , m_bg_scrollx(0) + , m_bg_scrolly(0) + { + } + // gladiator specific DECLARE_READ8_MEMBER(gladiator_dsw1_r); DECLARE_READ8_MEMBER(gladiator_dsw2_r); @@ -77,7 +111,59 @@ public: DECLARE_WRITE8_MEMBER(gladiator_adpcm_w); DECLARE_WRITE_LINE_MEMBER(gladiator_ym_irq); - // ppking specific + // greatgur MCU hookup + DECLARE_WRITE_LINE_MEMBER(tclk_w); + DECLARE_READ8_MEMBER(cctl_t_r); + DECLARE_READ8_MEMBER(cctl_p1_r); + DECLARE_READ8_MEMBER(cctl_p2_r); + DECLARE_READ8_MEMBER(ccpu_t_r); + DECLARE_WRITE8_MEMBER(ccpu_p2_w); + DECLARE_READ8_MEMBER(tclk_r); + DECLARE_READ8_MEMBER(ucpu_t1_r); + DECLARE_READ8_MEMBER(ucpu_p1_r); + DECLARE_WRITE8_MEMBER(ucpu_p1_w); + DECLARE_READ8_MEMBER(ucpu_p2_r); + DECLARE_READ8_MEMBER(csnd_t1_r); + DECLARE_READ8_MEMBER(csnd_p1_r); + DECLARE_WRITE8_MEMBER(csnd_p1_w); + DECLARE_READ8_MEMBER(csnd_p2_r); + + DECLARE_DRIVER_INIT(gladiatr); + + DECLARE_MACHINE_RESET(gladiator); + DECLARE_VIDEO_START(gladiatr); + + uint32_t screen_update_gladiatr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void swap_block(uint8_t *src1,uint8_t *src2,int len); + +private: + required_ioport m_dsw1, m_dsw2; + required_ioport m_in0, m_in1, m_in2; + required_ioport m_coins; + + bool m_tclk_val; + u8 m_in0_val, m_in1_val; + u8 m_cctl_p1, m_cctl_p2; + u8 m_ucpu_p1, m_csnd_p1; + + int m_fg_scrollx; + int m_bg_scrollx; + int m_bg_scrolly; +}; + +class ppking_state : public gladiatr_state_base +{ +public: + ppking_state(const machine_config &mconfig, device_type type, const char *tag) + : gladiatr_state_base(mconfig, type, tag) + , m_nvram(*this, "nvram") + , m_data1(0) + , m_data2(0) + , m_flag1(0) + , m_flag2(0) + { + } + DECLARE_READ8_MEMBER(ppking_f1_r); DECLARE_READ8_MEMBER(ppking_f6a3_r); DECLARE_WRITE8_MEMBER(ppking_qx0_w); @@ -90,19 +176,18 @@ public: DECLARE_READ8_MEMBER(ppking_qx1_r); DECLARE_WRITE8_MEMBER(ppking_video_registers_w); - DECLARE_DRIVER_INIT(gladiatr); DECLARE_DRIVER_INIT(ppking); - TILE_GET_INFO_MEMBER(bg_get_tile_info); - TILE_GET_INFO_MEMBER(fg_get_tile_info); - DECLARE_MACHINE_RESET(ppking); DECLARE_VIDEO_START(ppking); - DECLARE_MACHINE_RESET(gladiator); - DECLARE_VIDEO_START(gladiatr); uint32_t screen_update_ppking(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - uint32_t screen_update_gladiatr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); - void swap_block(uint8_t *src1,uint8_t *src2,int len); + +private: + required_shared_ptr m_nvram; + + u8 m_data1; + u8 m_data2; + u8 m_flag1; + u8 m_flag2; }; diff --git a/src/mame/video/gladiatr.cpp b/src/mame/video/gladiatr.cpp index 5460125c975..2d206ac5975 100644 --- a/src/mame/video/gladiatr.cpp +++ b/src/mame/video/gladiatr.cpp @@ -16,7 +16,7 @@ ***************************************************************************/ -TILE_GET_INFO_MEMBER(gladiatr_state::bg_get_tile_info) +TILE_GET_INFO_MEMBER(gladiatr_state_base::bg_get_tile_info) { uint8_t attr = m_colorram[tile_index]; @@ -26,7 +26,7 @@ TILE_GET_INFO_MEMBER(gladiatr_state::bg_get_tile_info) 0); } -TILE_GET_INFO_MEMBER(gladiatr_state::fg_get_tile_info) +TILE_GET_INFO_MEMBER(gladiatr_state_base::fg_get_tile_info) { SET_TILE_INFO_MEMBER(0, m_textram[tile_index] + (m_fg_tile_bank << 8), @@ -42,10 +42,10 @@ TILE_GET_INFO_MEMBER(gladiatr_state::fg_get_tile_info) ***************************************************************************/ -VIDEO_START_MEMBER(gladiatr_state,ppking) +VIDEO_START_MEMBER(ppking_state,ppking) { - m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(gladiatr_state::bg_get_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,64); - m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(gladiatr_state::fg_get_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,64); + m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(ppking_state::bg_get_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,64); + m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(ppking_state::fg_get_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,64); m_fg_tilemap->set_transparent_pen(0); @@ -90,44 +90,44 @@ VIDEO_START_MEMBER(gladiatr_state,gladiatr) ***************************************************************************/ -WRITE8_MEMBER(gladiatr_state::videoram_w) +WRITE8_MEMBER(gladiatr_state_base::videoram_w) { m_videoram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } -WRITE8_MEMBER(gladiatr_state::colorram_w) +WRITE8_MEMBER(gladiatr_state_base::colorram_w) { m_colorram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } -WRITE8_MEMBER(gladiatr_state::textram_w) +WRITE8_MEMBER(gladiatr_state_base::textram_w) { m_textram[offset] = data; m_fg_tilemap->mark_tile_dirty(offset); } -WRITE8_MEMBER(gladiatr_state::paletteram_w) +WRITE8_MEMBER(gladiatr_state_base::paletteram_w) { int r,g,b; - m_generic_paletteram_8[offset] = data; + m_paletteram[offset] = data; offset &= 0x3ff; - r = (m_generic_paletteram_8[offset] >> 0) & 0x0f; - g = (m_generic_paletteram_8[offset] >> 4) & 0x0f; - b = (m_generic_paletteram_8[offset + 0x400] >> 0) & 0x0f; + r = (m_paletteram[offset] >> 0) & 0x0f; + g = (m_paletteram[offset] >> 4) & 0x0f; + b = (m_paletteram[offset + 0x400] >> 0) & 0x0f; - r = (r << 1) + ((m_generic_paletteram_8[offset + 0x400] >> 4) & 0x01); - g = (g << 1) + ((m_generic_paletteram_8[offset + 0x400] >> 5) & 0x01); - b = (b << 1) + ((m_generic_paletteram_8[offset + 0x400] >> 6) & 0x01); + r = (r << 1) + ((m_paletteram[offset + 0x400] >> 4) & 0x01); + g = (g << 1) + ((m_paletteram[offset + 0x400] >> 5) & 0x01); + b = (b << 1) + ((m_paletteram[offset + 0x400] >> 6) & 0x01); - m_palette->set_pen_color(offset,pal5bit(r),pal5bit(g),pal5bit(b)); + m_palette->set_pen_color(offset, pal5bit(r), pal5bit(g), pal5bit(b)); } -WRITE8_MEMBER(gladiatr_state::spritebuffer_w) +WRITE8_MEMBER(gladiatr_state_base::spritebuffer_w) { m_sprite_buffer = data & 1; } @@ -138,7 +138,7 @@ WRITE8_MEMBER(gladiatr_state::gladiatr_spritebank_w) } -WRITE8_MEMBER(gladiatr_state::ppking_video_registers_w) +WRITE8_MEMBER(ppking_state::ppking_video_registers_w) { switch (offset & 0x300) { @@ -204,7 +204,7 @@ WRITE8_MEMBER(gladiatr_state::gladiatr_video_registers_w) ***************************************************************************/ -void gladiatr_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect) +void gladiatr_state_base::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect) { int offs; @@ -254,7 +254,7 @@ void gladiatr_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprec -uint32_t gladiatr_state::screen_update_ppking(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) +uint32_t ppking_state::screen_update_ppking(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { m_bg_tilemap->draw(screen, bitmap, cliprect, 0,0); draw_sprites(bitmap,cliprect); From 189052cd581eb58c9c20a9b848f4f8b439005a5d Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Sat, 7 Jan 2017 02:12:45 +1100 Subject: [PATCH 21/30] Hopefully fix build for everyone - someone please work out a way to make the bgfx examples build on platforms with/without the POSIX 2008 strnlen function (nw) --- 3rdparty/bgfx/3rdparty/tinyexr/tinyexr.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/3rdparty/bgfx/3rdparty/tinyexr/tinyexr.h b/3rdparty/bgfx/3rdparty/tinyexr/tinyexr.h index 4482b82602f..38ac53c66eb 100644 --- a/3rdparty/bgfx/3rdparty/tinyexr/tinyexr.h +++ b/3rdparty/bgfx/3rdparty/tinyexr/tinyexr.h @@ -7076,8 +7076,7 @@ static const char *ReadString(std::string *s, const char *ptr) { static bool ReadAttribute(std::string *name, std::string *type, std::vector *data, size_t *marker_size, const char *marker, size_t size) { - using namespace bx; - size_t name_len = strnlen(marker, size); + size_t name_len = bx::strnlen(marker, size); if (name_len == size) { // String does not have a terminating character. return false; @@ -7087,7 +7086,7 @@ static bool ReadAttribute(std::string *name, std::string *type, marker += name_len + 1; size -= name_len + 1; - size_t type_len = strnlen(marker, size); + size_t type_len = bx::strnlen(marker, size); if (type_len == size) { return false; } From 13401dadfb5218b79ee67b2560b900bd42dfa613 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Sat, 7 Jan 2017 03:04:11 +1100 Subject: [PATCH 22/30] greatgur MCU doesn't like impulse coins, add hack to simulated sets to make them work with non-impulse coins (nw) --- src/mame/drivers/gladiatr.cpp | 50 ++++++++++++++++++++++++----------- src/mame/includes/gladiatr.h | 4 +++ 2 files changed, 39 insertions(+), 15 deletions(-) diff --git a/src/mame/drivers/gladiatr.cpp b/src/mame/drivers/gladiatr.cpp index b3182e0c4d9..8a6d06738f8 100644 --- a/src/mame/drivers/gladiatr.cpp +++ b/src/mame/drivers/gladiatr.cpp @@ -208,31 +208,45 @@ WRITE8_MEMBER(gladiatr_state::gladiatr_bankswitch_w) } -READ8_MEMBER(gladiatr_state::gladiator_dsw1_r ) +READ8_MEMBER(gladiatr_state::gladiator_dsw1_r) { return BITSWAP8(~m_dsw1->read(), 0,1,2,3,4,5,6,7); } -READ8_MEMBER(gladiatr_state::gladiator_dsw2_r ) +READ8_MEMBER(gladiatr_state::gladiator_dsw2_r) { return BITSWAP8(~m_dsw2->read(), 2,3,4,5,6,7,1,0); } -READ8_MEMBER(gladiatr_state::gladiator_controls_r ) +READ8_MEMBER(gladiatr_state::gladiator_controls_r) { - u8 const coins = (~m_coins->read() & 0x07) ? 0x80 : 0x00; + // hack to simulate the way the MCUs counts edges on coin inputs + u8 const coins = ~m_coins->read() & 0x07; + u8 const changed = (m_coins_val ^ coins) & coins; + m_credits += 2 * (BIT(changed, 0) + BIT(changed, 1) + BIT(changed, 2)); + m_coins_val = coins; + u8 result = 0; switch(offset) { - case 0x01: // start button , coins - return ((~m_in0->read() >> 6) & 0x03) | coins; - case 0x02: // Player 1 Controller , coins - return (~m_in0->read() & 0x3f) | coins; - case 0x04: // Player 2 Controller , coins - return (~m_in1->read() & 0x3f) | coins; + case 0x01: // start button, coins + result = (~m_in0->read() >> 6) & 0x03; + break; + case 0x02: // Player 1 Controller , coins + result = ~m_in0->read() & 0x3f; + break; + case 0x04: // Player 2 Controller , coins + result = ~m_in1->read() & 0x3f; + break; + default: // unknown + return 0; } - // unknown - return 0; + if (m_credits) + { + result |= 0x80; + --m_credits; + } + return result; } READ8_MEMBER(gladiatr_state::gladiator_button3_r) @@ -705,9 +719,9 @@ static INPUT_PORTS_START( gladiatr ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_COCKTAIL PORT_START("COINS") // ccpu test, cctl test - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(1) - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(1) - PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_IMPULSE(1) + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNUSED ) INPUT_PORTS_END @@ -1188,6 +1202,12 @@ DRIVER_INIT_MEMBER(gladiatr_state,gladiatr) /* make sure bank is valid in cpu-reset */ membank("bank2")->set_entry(0); + m_coins_val = 0x00; + m_credits = 0; + + save_item(NAME(m_coins_val)); + save_item(NAME(m_credits)); + m_tclk_val = false; m_in0_val = 0xff; m_in1_val = 0xff; diff --git a/src/mame/includes/gladiatr.h b/src/mame/includes/gladiatr.h index 97ddf67f5af..ffc900e8f71 100644 --- a/src/mame/includes/gladiatr.h +++ b/src/mame/includes/gladiatr.h @@ -82,6 +82,8 @@ public: , m_in1(*this, "IN1") , m_in2(*this, "IN2") , m_coins(*this, "COINS") + , m_coins_val(0x00) + , m_credits(0) , m_tclk_val(false) , m_in0_val(0xff) , m_in1_val(0xff) @@ -141,6 +143,8 @@ private: required_ioport m_in0, m_in1, m_in2; required_ioport m_coins; + u8 m_coins_val, m_credits; + bool m_tclk_val; u8 m_in0_val, m_in1_val; u8 m_cctl_p1, m_cctl_p2; From 3fa0a77b14d1fc141dbd8cea5497507175d406e3 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Sat, 7 Jan 2017 04:08:17 +1100 Subject: [PATCH 23/30] gladiatr.cpp: add bootleg MCU dumps to all gladiatr sets as BAD_DUMP, remove MCU simulation, update notes --- src/mame/drivers/gladiatr.cpp | 208 ++++++++++++---------------------- src/mame/includes/gladiatr.h | 11 +- 2 files changed, 73 insertions(+), 146 deletions(-) diff --git a/src/mame/drivers/gladiatr.cpp b/src/mame/drivers/gladiatr.cpp index 8a6d06738f8..4991af81e2d 100644 --- a/src/mame/drivers/gladiatr.cpp +++ b/src/mame/drivers/gladiatr.cpp @@ -165,8 +165,11 @@ Notes: - The fg tilemap is a 1bpp layer which selects the second palette bank when active, so it could be used for some cool effects. Gladiator just sets the whole palette to white so we can just treat it as a monochromatic layer. -- tilemap Y scroll is not implemented because the game doesn't use it so I can't - verify it's right. +- Tilemap Y scroll is not implemented because the game doesn't use it so I + can't verify it's right. +- gladiatr and clones start with one credit due to the way MAME initialises + memory and the dodgy code the bootleg MCUs use to synchronise with the host + CPUs. On an F3 reset they randomly start with one credit or no credits. TODO: ----- @@ -180,8 +183,10 @@ TODO: - YM2203 some sound effects just don't sound correct - Audio Filter Switch not hooked up (might solve YM2203 mixing issue) - Ports 60,61,80,81 not fully understood yet... -- The four 8741 ROMs are available but not used. - +- The four 8741 dumps come from an unprotected bootleg, we need dumps from + original boards. +- TCLK and comms MCU clocks were measured on a bootleg board, we should + confirm that it's the same on original boards. ***************************************************************************/ @@ -195,78 +200,21 @@ TODO: #include "machine/clock.h" #include "machine/nvram.h" -#include "machine/tait8741.h" - #include "sound/2203intf.h" #include "sound/msm5205.h" -/*Rom bankswitching*/ WRITE8_MEMBER(gladiatr_state::gladiatr_bankswitch_w) { + // ROM bankswitching membank("bank1")->set_entry(data & 0x01); } - -READ8_MEMBER(gladiatr_state::gladiator_dsw1_r) -{ - return BITSWAP8(~m_dsw1->read(), 0,1,2,3,4,5,6,7); -} - -READ8_MEMBER(gladiatr_state::gladiator_dsw2_r) -{ - return BITSWAP8(~m_dsw2->read(), 2,3,4,5,6,7,1,0); -} - -READ8_MEMBER(gladiatr_state::gladiator_controls_r) -{ - // hack to simulate the way the MCUs counts edges on coin inputs - u8 const coins = ~m_coins->read() & 0x07; - u8 const changed = (m_coins_val ^ coins) & coins; - m_credits += 2 * (BIT(changed, 0) + BIT(changed, 1) + BIT(changed, 2)); - m_coins_val = coins; - - u8 result = 0; - switch(offset) - { - case 0x01: // start button, coins - result = (~m_in0->read() >> 6) & 0x03; - break; - case 0x02: // Player 1 Controller , coins - result = ~m_in0->read() & 0x3f; - break; - case 0x04: // Player 2 Controller , coins - result = ~m_in1->read() & 0x3f; - break; - default: // unknown - return 0; - } - if (m_credits) - { - result |= 0x80; - --m_credits; - } - return result; -} - -READ8_MEMBER(gladiatr_state::gladiator_button3_r) -{ - switch(offset) - { - case 0x01: /* button 3 */ - return (~m_in2->read() >> 6) & 0x03; - } - /* unknown */ - return 0; -} - MACHINE_RESET_MEMBER(gladiatr_state,gladiator) { - /* 6809 bank memory set */ - { - membank("bank2")->set_entry(0); - m_audiocpu->reset(); - } + // 6809 bank memory set + membank("bank2")->set_entry(0); + m_audiocpu->reset(); } /* YM2203 port B handler (output) */ @@ -286,12 +234,12 @@ WRITE_LINE_MEMBER(gladiatr_state::gladiator_ym_irq) /*Sound Functions*/ WRITE8_MEMBER(gladiatr_state::gladiator_adpcm_w) { - /* bit6 = bank offset */ + // bit 6 = bank offset membank("bank2")->set_entry((data & 0x40) ? 1 : 0); - m_msm->data_w(data); /* bit0..3 */ - m_msm->reset_w(BIT(data, 5)); /* bit 5 */ - m_msm->vclk_w (BIT(data, 4)); /* bit4 */ + m_msm->data_w(data); // bit 0..3 + m_msm->reset_w(BIT(data, 5)); // bit 5 + m_msm->vclk_w (BIT(data, 4)); // bit 4 } WRITE8_MEMBER(gladiatr_state::gladiator_cpu_sound_command_w) @@ -558,28 +506,6 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( gladiatr_cpu1_io, AS_IO, 8, gladiatr_state ) -// ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0xc000, 0xc000) AM_WRITE(spritebuffer_w) - AM_RANGE(0xc001, 0xc001) AM_WRITE(gladiatr_spritebank_w) - AM_RANGE(0xc002, 0xc002) AM_WRITE(gladiatr_bankswitch_w) - AM_RANGE(0xc004, 0xc004) AM_WRITE(gladiatr_irq_patch_w) /* !!! patch to 2nd CPU IRQ !!! */ - AM_RANGE(0xc007, 0xc007) AM_WRITE(gladiatr_flipscreen_w) - AM_RANGE(0xc09e, 0xc09f) AM_DEVREADWRITE("taito8741", taito8741_4pack_device, read_0, write_0) - AM_RANGE(0xc0bf, 0xc0bf) AM_NOP // watchdog_reset_w doesn't work -ADDRESS_MAP_END - -static ADDRESS_MAP_START( gladiatr_cpu2_io, AS_IO, 8, gladiatr_state ) - ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ymsnd", ym2203_device, read, write) - AM_RANGE(0x20, 0x21) AM_DEVREADWRITE("taito8741", taito8741_4pack_device, read_1, write_1) - AM_RANGE(0x40, 0x40) AM_NOP // WRITE(sub_irq_ack_w) - AM_RANGE(0x60, 0x61) AM_DEVREADWRITE("taito8741", taito8741_4pack_device, read_2, write_2) - AM_RANGE(0x80, 0x81) AM_DEVREADWRITE("taito8741", taito8741_4pack_device, read_3, write_3) - AM_RANGE(0xa0, 0xa7) AM_NOP // filters on sound output - AM_RANGE(0xe0, 0xe0) AM_WRITE(gladiator_cpu_sound_command_w) -ADDRESS_MAP_END - -static ADDRESS_MAP_START( greatgur_cpu1_io, AS_IO, 8, gladiatr_state ) // ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0xc000, 0xc000) AM_WRITE(spritebuffer_w) AM_RANGE(0xc001, 0xc001) AM_WRITE(gladiatr_spritebank_w) @@ -590,7 +516,7 @@ static ADDRESS_MAP_START( greatgur_cpu1_io, AS_IO, 8, gladiatr_state ) AM_RANGE(0xc0bf, 0xc0bf) AM_NOP // watchdog_reset_w doesn't work ADDRESS_MAP_END -static ADDRESS_MAP_START( greatgur_cpu2_io, AS_IO, 8, gladiatr_state ) +static ADDRESS_MAP_START( gladiatr_cpu2_io, AS_IO, 8, gladiatr_state ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ymsnd", ym2203_device, read, write) AM_RANGE(0x20, 0x21) AM_DEVREADWRITE("csnd", upi41_cpu_device, upi41_master_r, upi41_master_w) @@ -602,7 +528,6 @@ static ADDRESS_MAP_START( greatgur_cpu2_io, AS_IO, 8, gladiatr_state ) ADDRESS_MAP_END - static ADDRESS_MAP_START( cctl_io_map, AS_IO, 8, gladiatr_state ) AM_RANGE(MCS48_PORT_T0, MCS48_PORT_T1) AM_READ(cctl_t_r) AM_RANGE(MCS48_PORT_P1, MCS48_PORT_P1) AM_READ(cctl_p1_r) @@ -844,15 +769,26 @@ static MACHINE_CONFIG_START( gladiatr, gladiatr_state ) MCFG_CPU_ADD("audiocpu", M6809, XTAL_12MHz/16) /* verified on pcb */ MCFG_CPU_PROGRAM_MAP(gladiatr_cpu3_map) - MCFG_QUANTUM_TIME(attotime::from_hz(600)) - MCFG_MACHINE_RESET_OVERRIDE(gladiatr_state,gladiator) MCFG_NVRAM_ADD_0FILL("nvram") - MCFG_TAITO8741_ADD("taito8741") - MCFG_TAITO8741_MODES(TAITO8741_MASTER,TAITO8741_SLAVE,TAITO8741_PORT,TAITO8741_PORT) - MCFG_TAITO8741_CONNECT(1,0,0,0) - MCFG_TAITO8741_PORT_HANDLERS(READ8(gladiatr_state,gladiator_dsw1_r),READ8(gladiatr_state,gladiator_dsw2_r),READ8(gladiatr_state,gladiator_button3_r),READ8(gladiatr_state,gladiator_controls_r)) + MCFG_DEVICE_ADD("cctl", I8741, XTAL_12MHz/2) /* verified on pcb */ + MCFG_CPU_IO_MAP(cctl_io_map) + + MCFG_DEVICE_ADD("ccpu", I8741, XTAL_12MHz/2) /* verified on pcb */ + MCFG_CPU_IO_MAP(ccpu_io_map) + + MCFG_DEVICE_ADD("ucpu", I8741, XTAL_12MHz/2) /* verified on pcb */ + MCFG_CPU_IO_MAP(ucpu_io_map) + + MCFG_DEVICE_ADD("csnd", I8741, XTAL_12MHz/2) /* verified on pcb */ + MCFG_CPU_IO_MAP(csnd_io_map) + + /* lazy way to make polled serial between MCUs work */ + MCFG_QUANTUM_PERFECT_CPU("ucpu") + + MCFG_CLOCK_ADD("tclk", XTAL_12MHz/8/128/2) /* verified on pcb */ + MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(gladiatr_state, tclk_w)); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -887,36 +823,6 @@ static MACHINE_CONFIG_START( gladiatr, gladiatr_state ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60) MACHINE_CONFIG_END -MACHINE_CONFIG_DERIVED( greatgur, gladiatr ) - - /* basic machine hardware */ - MCFG_CPU_MODIFY("maincpu") - MCFG_CPU_IO_MAP(greatgur_cpu1_io) - - MCFG_CPU_MODIFY("sub") - MCFG_CPU_IO_MAP(greatgur_cpu2_io) - - MCFG_DEVICE_ADD("cctl", I8741, XTAL_12MHz/2) /* verified on pcb */ - MCFG_CPU_IO_MAP(cctl_io_map) - - MCFG_DEVICE_ADD("ccpu", I8741, XTAL_12MHz/2) /* verified on pcb */ - MCFG_CPU_IO_MAP(ccpu_io_map) - - MCFG_DEVICE_ADD("ucpu", I8741, XTAL_12MHz/2) /* verified on pcb */ - MCFG_CPU_IO_MAP(ucpu_io_map) - - MCFG_DEVICE_ADD("csnd", I8741, XTAL_12MHz/2) /* verified on pcb */ - MCFG_CPU_IO_MAP(csnd_io_map) - - MCFG_CLOCK_ADD("tclk", XTAL_12MHz/8/128/2) /* verified on pcb */ - MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(gladiatr_state, tclk_w)); - - /* lazy way to make polled serial between MCUs work */ - MCFG_QUANTUM_PERFECT_CPU("ucpu") - - MCFG_DEVICE_REMOVE("taito8741") -MACHINE_CONFIG_END - /*************************************************************************** @@ -1005,6 +911,18 @@ ROM_START( gladiatr ) ROM_REGION( 0x00040, "proms", 0 ) /* unused */ ROM_LOAD( "q3.2b", 0x00000, 0x0020, CRC(6a7c3c60) SHA1(5125bfeb03752c8d76b140a4e74d5cac29dcdaa6) ) /* address decoding */ ROM_LOAD( "q4.5s", 0x00020, 0x0020, CRC(e325808e) SHA1(5fd92ad4eff24f6ccf2df19d268a6cafba72202e) ) + + ROM_REGION( 0x0400, "cctl", 0 ) /* I/O MCU */ + ROM_LOAD( "aq_002.9b", 0x00000, 0x0400, CRC(b30d225f) SHA1(f383286530975c440589c276aa8c46fdfe5292b6) BAD_DUMP ) + + ROM_REGION( 0x0400, "ccpu", 0 ) /* I/O MCU */ + ROM_LOAD( "aq_003.xx", 0x00000, 0x0400, CRC(1d02cd5f) SHA1(f7242039788c66a1d91b01852d7d447330b847c4) BAD_DUMP ) + + ROM_REGION( 0x0400, "ucpu", 0 ) /* comms MCU */ + ROM_LOAD( "aq_006.3a", 0x00000, 0x0400, CRC(3c5ca4c6) SHA1(0d8c2e1c2142ada11e30cfb9a48663386fee9cb8) BAD_DUMP ) + + ROM_REGION( 0x0400, "csnd", 0 ) /* comms MCU */ + ROM_LOAD( "aq_006.6c", 0x00000, 0x0400, CRC(3c5ca4c6) SHA1(0d8c2e1c2142ada11e30cfb9a48663386fee9cb8) BAD_DUMP ) ROM_END ROM_START( ogonsiro ) @@ -1048,6 +966,18 @@ ROM_START( ogonsiro ) ROM_REGION( 0x00040, "proms", 0 ) /* unused */ ROM_LOAD( "q3.2b", 0x00000, 0x0020, CRC(6a7c3c60) SHA1(5125bfeb03752c8d76b140a4e74d5cac29dcdaa6) ) /* address decoding */ ROM_LOAD( "q4.5s", 0x00020, 0x0020, CRC(e325808e) SHA1(5fd92ad4eff24f6ccf2df19d268a6cafba72202e) ) + + ROM_REGION( 0x0400, "cctl", 0 ) /* I/O MCU */ + ROM_LOAD( "aq_002.9b", 0x00000, 0x0400, CRC(b30d225f) SHA1(f383286530975c440589c276aa8c46fdfe5292b6) BAD_DUMP ) + + ROM_REGION( 0x0400, "ccpu", 0 ) /* I/O MCU */ + ROM_LOAD( "aq_003.xx", 0x00000, 0x0400, CRC(1d02cd5f) SHA1(f7242039788c66a1d91b01852d7d447330b847c4) BAD_DUMP ) + + ROM_REGION( 0x0400, "ucpu", 0 ) /* comms MCU */ + ROM_LOAD( "aq_006.3a", 0x00000, 0x0400, CRC(3c5ca4c6) SHA1(0d8c2e1c2142ada11e30cfb9a48663386fee9cb8) BAD_DUMP ) + + ROM_REGION( 0x0400, "csnd", 0 ) /* comms MCU */ + ROM_LOAD( "aq_006.6c", 0x00000, 0x0400, CRC(3c5ca4c6) SHA1(0d8c2e1c2142ada11e30cfb9a48663386fee9cb8) BAD_DUMP ) ROM_END ROM_START( greatgur ) @@ -1146,6 +1076,18 @@ ROM_START( gcastle ) ROM_REGION( 0x00040, "proms", 0 ) /* unused */ ROM_LOAD( "q3.2b", 0x00000, 0x0020, CRC(6a7c3c60) SHA1(5125bfeb03752c8d76b140a4e74d5cac29dcdaa6) ) /* address decoding */ ROM_LOAD( "q4.5s", 0x00020, 0x0020, CRC(e325808e) SHA1(5fd92ad4eff24f6ccf2df19d268a6cafba72202e) ) + + ROM_REGION( 0x0400, "cctl", 0 ) /* I/O MCU */ + ROM_LOAD( "aq_002.9b", 0x00000, 0x0400, CRC(b30d225f) SHA1(f383286530975c440589c276aa8c46fdfe5292b6) BAD_DUMP ) + + ROM_REGION( 0x0400, "ccpu", 0 ) /* I/O MCU */ + ROM_LOAD( "aq_003.xx", 0x00000, 0x0400, CRC(1d02cd5f) SHA1(f7242039788c66a1d91b01852d7d447330b847c4) BAD_DUMP ) + + ROM_REGION( 0x0400, "ucpu", 0 ) /* comms MCU */ + ROM_LOAD( "aq_006.3a", 0x00000, 0x0400, CRC(3c5ca4c6) SHA1(0d8c2e1c2142ada11e30cfb9a48663386fee9cb8) BAD_DUMP ) + + ROM_REGION( 0x0400, "csnd", 0 ) /* comms MCU */ + ROM_LOAD( "aq_006.6c", 0x00000, 0x0400, CRC(3c5ca4c6) SHA1(0d8c2e1c2142ada11e30cfb9a48663386fee9cb8) BAD_DUMP ) ROM_END @@ -1202,12 +1144,6 @@ DRIVER_INIT_MEMBER(gladiatr_state,gladiatr) /* make sure bank is valid in cpu-reset */ membank("bank2")->set_entry(0); - m_coins_val = 0x00; - m_credits = 0; - - save_item(NAME(m_coins_val)); - save_item(NAME(m_credits)); - m_tclk_val = false; m_in0_val = 0xff; m_in1_val = 0xff; @@ -1259,5 +1195,5 @@ DRIVER_INIT_MEMBER(ppking_state, ppking) GAME( 1985, ppking, 0, ppking, 0, ppking_state, ppking, ROT90, "Taito America Corporation", "Ping-Pong King", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) GAME( 1986, gladiatr, 0, gladiatr, gladiatr, gladiatr_state, gladiatr, ROT0, "Allumer / Taito America Corporation", "Gladiator (US)", MACHINE_SUPPORTS_SAVE ) GAME( 1986, ogonsiro, gladiatr, gladiatr, gladiatr, gladiatr_state, gladiatr, ROT0, "Allumer / Taito Corporation", "Ougon no Shiro (Japan)", MACHINE_SUPPORTS_SAVE ) -GAME( 1986, greatgur, gladiatr, greatgur, gladiatr, gladiatr_state, gladiatr, ROT0, "Allumer / Taito Corporation", "Great Gurianos (Japan?)", MACHINE_SUPPORTS_SAVE ) +GAME( 1986, greatgur, gladiatr, gladiatr, gladiatr, gladiatr_state, gladiatr, ROT0, "Allumer / Taito Corporation", "Great Gurianos (Japan?)", MACHINE_SUPPORTS_SAVE ) GAME( 1986, gcastle, gladiatr, gladiatr, gladiatr, gladiatr_state, gladiatr, ROT0, "Allumer / Taito Corporation", "Golden Castle (prototype?)", MACHINE_SUPPORTS_SAVE ) // incomplete dump diff --git a/src/mame/includes/gladiatr.h b/src/mame/includes/gladiatr.h index ffc900e8f71..60166ed4b99 100644 --- a/src/mame/includes/gladiatr.h +++ b/src/mame/includes/gladiatr.h @@ -82,8 +82,6 @@ public: , m_in1(*this, "IN1") , m_in2(*this, "IN2") , m_coins(*this, "COINS") - , m_coins_val(0x00) - , m_credits(0) , m_tclk_val(false) , m_in0_val(0xff) , m_in1_val(0xff) @@ -97,13 +95,9 @@ public: { } - // gladiator specific - DECLARE_READ8_MEMBER(gladiator_dsw1_r); - DECLARE_READ8_MEMBER(gladiator_dsw2_r); - DECLARE_READ8_MEMBER(gladiator_controls_r); - DECLARE_READ8_MEMBER(gladiator_button3_r); DECLARE_WRITE8_MEMBER(gladiatr_spritebank_w); DECLARE_WRITE8_MEMBER(gladiatr_video_registers_w); + DECLARE_WRITE8_MEMBER(gladiatr_bankswitch_w); DECLARE_WRITE8_MEMBER(gladiator_cpu_sound_command_w); DECLARE_READ8_MEMBER(gladiator_cpu_sound_command_r); @@ -113,7 +107,6 @@ public: DECLARE_WRITE8_MEMBER(gladiator_adpcm_w); DECLARE_WRITE_LINE_MEMBER(gladiator_ym_irq); - // greatgur MCU hookup DECLARE_WRITE_LINE_MEMBER(tclk_w); DECLARE_READ8_MEMBER(cctl_t_r); DECLARE_READ8_MEMBER(cctl_p1_r); @@ -143,8 +136,6 @@ private: required_ioport m_in0, m_in1, m_in2; required_ioport m_coins; - u8 m_coins_val, m_credits; - bool m_tclk_val; u8 m_in0_val, m_in1_val; u8 m_cctl_p1, m_cctl_p2; From dd4e42ccd7c898c2241b63550173097a7977b1e0 Mon Sep 17 00:00:00 2001 From: AJR Date: Fri, 6 Jan 2017 16:01:23 -0500 Subject: [PATCH 24/30] phi.cpp: Fix build (nw) dynax.cpp: Correction regarding absence of MSM5205 in mjfriday (nw) --- src/devices/machine/phi.cpp | 2 +- src/mame/drivers/dynax.cpp | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/devices/machine/phi.cpp b/src/devices/machine/phi.cpp index 34fa8d6117c..f5b91929d9a 100644 --- a/src/devices/machine/phi.cpp +++ b/src/devices/machine/phi.cpp @@ -1037,7 +1037,7 @@ void phi_device::update_fsm(void) m_int_write_func(m_int_line); } - // TODO: update DMARQ + (void)m_dmarq_line; // TODO: update DMARQ m_no_recursion = false; } diff --git a/src/mame/drivers/dynax.cpp b/src/mame/drivers/dynax.cpp index ea8d6ace24c..9d8b07e9a9d 100644 --- a/src/mame/drivers/dynax.cpp +++ b/src/mame/drivers/dynax.cpp @@ -55,11 +55,10 @@ Notes: - sprtmtch and drgpunch are "clones", but the gfx are very different; sprtmtch is a trimmed down version, without all animations between levels. -- according to the readme, mjfriday should have a M5205. However there don't seem to be - accesses to it, and looking at the ROMs I don't see ADPCM data. Note that apart from a - minor difference in the memory map mjfriday and mjdialq2 are identical, and mjdialq2 - doesn't have a 5205 either. Therefore, I think it's either a mistake in the readme or - the chip is on the board but unused. +- according to the readme, mjfriday should have a M5205. However the program ROMs don't + seem to make accesses to it or contain ADPCM data for it, and photos of the game's + PCB don't even show an unpopulated location for one. Note that gekisha and mjdialq2, + which run on similar hardware, also lack 5205s. Likely it's a mistake in the readme. TODO: @@ -5287,7 +5286,7 @@ Mahjong Friday D2607198L1 CPU : Zilog Z0840006PSC (Z80) -Sound: YM2413 M5205 +Sound: YM2413 OSC : 24MHz (X1) CRT Controller: HD46505SP (6845) From 7a673d99035b468476cbabd583821c335bc6027e Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Sat, 7 Jan 2017 09:18:18 +1100 Subject: [PATCH 25/30] confirmed clocks with original board, fix ppking (nw) --- src/mame/drivers/gladiatr.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/mame/drivers/gladiatr.cpp b/src/mame/drivers/gladiatr.cpp index 4991af81e2d..828fa447413 100644 --- a/src/mame/drivers/gladiatr.cpp +++ b/src/mame/drivers/gladiatr.cpp @@ -20,7 +20,7 @@ special thanks to: - Camilty for precious hardware information and screenshots - Jason Richmond for hardware information and misc. notes - Joe Rounceville for schematics -- JunoMan for measuring and tracing signals on a bootleg +- JunoMan for measuring and tracing signals - and everyone else who's offered support along the way! @@ -185,8 +185,6 @@ TODO: - Ports 60,61,80,81 not fully understood yet... - The four 8741 dumps come from an unprotected bootleg, we need dumps from original boards. -- TCLK and comms MCU clocks were measured on a bootleg board, we should - confirm that it's the same on original boards. ***************************************************************************/ @@ -707,12 +705,12 @@ static MACHINE_CONFIG_START( ppking, ppking_state ) MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* verified on pcb */ MCFG_CPU_PROGRAM_MAP(ppking_cpu1_map) MCFG_CPU_IO_MAP(ppking_cpu1_io) - MCFG_CPU_VBLANK_INT_DRIVER("screen", gladiatr_state, irq0_line_hold) + MCFG_CPU_VBLANK_INT_DRIVER("screen", ppking_state, irq0_line_hold) MCFG_CPU_ADD("sub", Z80, XTAL_12MHz/4) /* verified on pcb */ MCFG_CPU_PROGRAM_MAP(cpu2_map) MCFG_CPU_IO_MAP(ppking_cpu2_io) - MCFG_CPU_VBLANK_INT_DRIVER("screen", gladiatr_state, irq0_line_hold) + MCFG_CPU_VBLANK_INT_DRIVER("screen", ppking_state, irq0_line_hold) MCFG_CPU_ADD("audiocpu", M6809, XTAL_12MHz/16) /* verified on pcb */ MCFG_CPU_PROGRAM_MAP(ppking_cpu3_map) From fe33390d5e4b9e5eb0c68a5fca7cfb78d1528c92 Mon Sep 17 00:00:00 2001 From: Stiletto Date: Fri, 6 Jan 2017 17:26:51 -0500 Subject: [PATCH 26/30] (nw) (nw) --- src/mame/nl.lst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mame/nl.lst b/src/mame/nl.lst index d1c764862c4..135f3e375a2 100644 --- a/src/mame/nl.lst +++ b/src/mame/nl.lst @@ -57,10 +57,10 @@ marioo // (c) 1983 Nintendo of America masao // bootleg // popeye.cpp -popeye // (c) 1982 -popeyeu // (c) 1982 -popeyef // (c) 1982 -popeyebl // bootleg +popeye // (c) 1982 +popeyeu // (c) 1982 +popeyef // (c) 1982 +popeyebl // bootleg /******************************************************************************/ From 0d0997984356e5d1ab140b1d5569e17f97f5fadc Mon Sep 17 00:00:00 2001 From: Dirk Best Date: Sat, 7 Jan 2017 00:37:48 +0100 Subject: [PATCH 27/30] z80ne: kill direct update handler --- src/mame/includes/z80ne.h | 10 +++--- src/mame/machine/z80ne.cpp | 73 ++++++++++---------------------------- 2 files changed, 24 insertions(+), 59 deletions(-) diff --git a/src/mame/includes/z80ne.h b/src/mame/includes/z80ne.h index 77b4bb3b893..502bb44b0ac 100644 --- a/src/mame/includes/z80ne.h +++ b/src/mame/includes/z80ne.h @@ -112,8 +112,6 @@ public: uint8_t m_lx383_scan_counter; uint8_t m_lx383_key[LX383_KEYS]; int m_lx383_downsampler; - int m_nmi_delay_counter; - int m_reset_delay_counter; uint8_t m_lx385_ctrl; emu_timer *m_cassette_timer; z80ne_cass_data_t m_cass_data; @@ -126,9 +124,6 @@ public: DECLARE_WRITE8_MEMBER(lx385_ctrl_w); DECLARE_READ8_MEMBER(lx388_data_r); DECLARE_READ8_MEMBER(lx388_read_field_sync); - DECLARE_DIRECT_UPDATE_MEMBER(z80ne_default); - DECLARE_DIRECT_UPDATE_MEMBER(z80ne_nmi_delay_count); - DECLARE_DIRECT_UPDATE_MEMBER(z80ne_reset_delay_count); DECLARE_DRIVER_INIT(z80netf); DECLARE_DRIVER_INIT(z80net); DECLARE_DRIVER_INIT(z80netb); @@ -153,6 +148,8 @@ public: DECLARE_WRITE8_MEMBER(lx390_fdc_w); protected: + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; + required_device m_maincpu; optional_device m_floppy0; optional_device m_floppy1; @@ -183,6 +180,9 @@ protected: optional_ioport m_io_modifiers; optional_ioport m_io_config; + emu_timer *m_timer_nmi; + emu_timer *m_timer_reset; + cassette_image_device *cassette_device_image(); void reset_lx388(); void reset_lx382_banking(); diff --git a/src/mame/machine/z80ne.cpp b/src/mame/machine/z80ne.cpp index 571dae53262..a357d9dd089 100644 --- a/src/mame/machine/z80ne.cpp +++ b/src/mame/machine/z80ne.cpp @@ -154,47 +154,18 @@ TIMER_CALLBACK_MEMBER(z80ne_state::z80ne_kbd_scan) } } -DIRECT_UPDATE_MEMBER(z80ne_state::z80ne_default) +void z80ne_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) { - return address; -} -/* - * Handle NMI delay for single step instruction - */ -DIRECT_UPDATE_MEMBER(z80ne_state::z80ne_nmi_delay_count) -{ - m_nmi_delay_counter--; - - if (!m_nmi_delay_counter) + switch (id) { - m_maincpu->space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(&z80ne_state::z80ne_default, this)); + case 0: m_maincpu->set_input_line(INPUT_LINE_NMI, PULSE_LINE); + break; + case 1: + // switch to RAM bank at address 0x0000 + m_bank1->set_entry(0); + break; } - return address; -} - -/* - * Handle delayed ROM/RAM banking at RESET - * after the first reset_delay_counter bytes have been read from ROM, switch the RAM back in - */ -DIRECT_UPDATE_MEMBER(z80ne_state::z80ne_reset_delay_count) -{ - address_space &space = m_maincpu->space(AS_PROGRAM); - /* - * TODO: when debugger is active, his memory access causes this callback - * - */ - if(!space.debugger_access()) - m_reset_delay_counter--; - - if (!m_reset_delay_counter) - { - /* remove this callback */ - m_maincpu->space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(&z80ne_state::z80ne_default, this)); - /* and switch to RAM bank at address 0x0000 */ - m_bank1->set_entry( 0 ); /* RAM at 0x0000 (bank 1) */ - } - return address; } void z80ne_state::reset_lx388() @@ -210,15 +181,13 @@ void z80ne_state::reset_lx382_banking() m_bank2->set_entry(0); /* ep382 at 0x8000 */ /* after the first 3 bytes have been read from ROM, switch the RAM back in */ - m_reset_delay_counter = 2; - m_maincpu->space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(&z80ne_state::z80ne_reset_delay_count, this)); + m_timer_reset->adjust(m_maincpu->cycles_to_attotime(2)); } void z80ne_state::reset_lx390_banking() { - m_reset_delay_counter = 0; - - switch (m_io_config->read() & 0x07) { + switch (m_io_config->read() & 0x07) + { case 0x01: /* EP382 Hex Monitor */ if (VERBOSE) logerror("reset_lx390_banking: banking ep382\n"); @@ -226,9 +195,8 @@ void z80ne_state::reset_lx390_banking() m_bank2->set_entry(0); /* RAM at 0x0400 */ m_bank3->set_entry(1); /* ep382 at 0x8000 */ m_bank4->set_entry(0); /* RAM at 0xF000 */ - /* after the first 3 bytes have been read from ROM, switch the RAM back in */ - m_reset_delay_counter = 2; - m_maincpu->space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(&z80ne_state::z80ne_reset_delay_count, this)); + // after the first 3 bytes have been read from ROM, switch the RAM back in + m_timer_reset->adjust(m_maincpu->cycles_to_attotime(2)); break; case 0x02: /* EP548 16k BASIC */ if (VERBOSE) @@ -237,7 +205,6 @@ void z80ne_state::reset_lx390_banking() m_bank2->set_entry(1); /* ep548 at 0x0400-0x3FFF */ m_bank3->set_entry(0); /* RAM at 0x8000 */ m_bank4->set_entry(0); /* RAM at 0xF000 */ - m_maincpu->space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(&z80ne_state::z80ne_default, this)); break; case 0x03: /* EP390 Boot Loader for 5.5k floppy BASIC */ if (VERBOSE) @@ -246,7 +213,6 @@ void z80ne_state::reset_lx390_banking() m_bank2->set_entry(0); /* RAM at 0x0400-0x3FFF */ m_bank3->set_entry(0); /* RAM at 0x8000 */ m_bank4->set_entry(1); /* ep390 at 0xF000 */ - m_maincpu->space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(&z80ne_state::z80ne_default, this)); break; case 0x04: /* EP1390 Boot Loader for NE DOS 1.0/1.5 */ if (VERBOSE) @@ -255,7 +221,6 @@ void z80ne_state::reset_lx390_banking() m_bank2->set_entry(0); /* RAM at 0x0400-0x3FFF */ m_bank3->set_entry(0); /* RAM at 0x8000 */ m_bank4->set_entry(2); /* ep1390 at 0xF000 */ - m_maincpu->space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(&z80ne_state::z80ne_default, this)); break; case 0x05: /* EP2390 Boot Loader for NE DOS G.1 */ if (VERBOSE) @@ -264,7 +229,6 @@ void z80ne_state::reset_lx390_banking() m_bank2->set_entry(0); /* RAM at 0x0400-0x3FFF */ m_bank3->set_entry(0); /* RAM at 0x8000 */ m_bank4->set_entry(3); /* ep2390 at 0xF000 */ - m_maincpu->space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(&z80ne_state::z80ne_default, this)); break; } @@ -321,7 +285,6 @@ MACHINE_RESET_MEMBER(z80ne_state,z80ne_base) m_ay31015->set_receiver_clock(m_cass_data.speed * 16.0); m_ay31015->set_transmitter_clock(m_cass_data.speed * 16.0); - m_nmi_delay_counter = 0; lx385_ctrl_w(m_maincpu->space(AS_PROGRAM), 0, 0); } @@ -380,11 +343,14 @@ INPUT_CHANGED_MEMBER(z80ne_state::z80ne_nmi) MACHINE_START_MEMBER(z80ne_state,z80ne) { LOG(("In MACHINE_START z80ne\n")); + + m_timer_nmi = timer_alloc(0); + m_timer_reset = timer_alloc(1); + m_lx385_ctrl = 0x1f; save_item(NAME(m_lx383_scan_counter)); save_item(NAME(m_lx383_downsampler)); save_item(NAME(m_lx383_key)); - save_item(NAME(m_nmi_delay_counter)); m_cassette_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(z80ne_state::z80ne_cassette_tc),this)); machine().scheduler().timer_pulse( attotime::from_hz(1000), timer_expired_delegate(FUNC(z80ne_state::z80ne_kbd_scan),this)); } @@ -465,9 +431,8 @@ WRITE8_MEMBER(z80ne_state::lx383_w) output().set_digit_value( offset, data ^ 0xff ); else { - /* after writing to port 0xF8 and the first ~M1 cycles strike a NMI for single step execution */ - m_nmi_delay_counter = 1; - m_maincpu->space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(&z80ne_state::z80ne_nmi_delay_count, this)); + // after writing to port 0xF8 and the first ~M1 cycles strike a NMI for single step execution + m_timer_reset->adjust(m_maincpu->cycles_to_attotime(1)); } } From febf0e0850a576492944902ad48165e3e2421e02 Mon Sep 17 00:00:00 2001 From: Robbbert Date: Sat, 7 Jan 2017 10:54:31 +1100 Subject: [PATCH 28/30] Cleanup of my drivers (nw) --- src/mame/drivers/argo.cpp | 15 ++++++++------ src/mame/drivers/beehive.cpp | 13 +++++++----- src/mame/drivers/binbug.cpp | 6 ++---- src/mame/drivers/c10.cpp | 14 +++++++------ src/mame/drivers/cd2650.cpp | 4 +--- src/mame/drivers/cdc721.cpp | 16 +++++++-------- src/mame/drivers/grfd2301.cpp | 6 +++--- src/mame/drivers/h19.cpp | 4 +--- src/mame/drivers/homez80.cpp | 10 ++++----- src/mame/drivers/ipds.cpp | 4 +--- src/mame/drivers/jupiter.cpp | 9 +++----- src/mame/drivers/k8915.cpp | 8 +++----- src/mame/drivers/llc.cpp | 4 +--- src/mame/drivers/m20.cpp | 6 +++--- src/mame/drivers/m79152pc.cpp | 8 ++++---- src/mame/drivers/mes.cpp | 4 ++-- src/mame/drivers/modellot.cpp | 4 +--- src/mame/drivers/mx2178.cpp | 4 +--- src/mame/drivers/mz80.cpp | 2 +- src/mame/drivers/okean240.cpp | 19 ++++++++--------- src/mame/drivers/phunsy.cpp | 4 +--- src/mame/drivers/plan80.cpp | 4 ++-- src/mame/drivers/poly.cpp | 4 +--- src/mame/drivers/pv1000.cpp | 4 ++-- src/mame/drivers/sapi1.cpp | 9 +++----- src/mame/drivers/special.cpp | 4 ++-- src/mame/drivers/tavernie.cpp | 4 +--- src/mame/drivers/tk80bs.cpp | 4 +--- src/mame/drivers/trs80.cpp | 6 +++--- src/mame/drivers/ut88.cpp | 2 +- src/mame/drivers/v6809.cpp | 4 +--- src/mame/drivers/z9001.cpp | 4 +--- src/mame/drivers/zrt80.cpp | 4 +--- src/mame/includes/jupiter.h | 35 ++++++++++++++++---------------- src/mame/includes/trs80.h | 2 +- src/mame/machine/teleprinter.cpp | 4 +--- 36 files changed, 112 insertions(+), 146 deletions(-) diff --git a/src/mame/drivers/argo.cpp b/src/mame/drivers/argo.cpp index 4d0171fdb16..d707f9ac9d0 100644 --- a/src/mame/drivers/argo.cpp +++ b/src/mame/drivers/argo.cpp @@ -36,14 +36,19 @@ public: }; argo_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu"), - m_p_videoram(*this, "p_videoram"){ } + : driver_device(mconfig, type, tag) + , m_maincpu(*this, "maincpu") + , m_p_videoram(*this, "videoram") + { } - required_device m_maincpu; DECLARE_WRITE8_MEMBER(argo_videoram_w); DECLARE_READ8_MEMBER(argo_io_r); DECLARE_WRITE8_MEMBER(argo_io_w); + uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + DECLARE_DRIVER_INIT(argo); + +private: + required_device m_maincpu; required_shared_ptr m_p_videoram; const uint8_t *m_p_chargen; uint8_t m_framecnt; @@ -53,8 +58,6 @@ public: uint8_t m_scroll_ctrl; virtual void machine_reset() override; virtual void video_start() override; - uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_DRIVER_INIT(argo); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; diff --git a/src/mame/drivers/beehive.cpp b/src/mame/drivers/beehive.cpp index 6919a0d34e0..ead41079a16 100644 --- a/src/mame/drivers/beehive.cpp +++ b/src/mame/drivers/beehive.cpp @@ -28,19 +28,22 @@ class beehive_state : public driver_device { public: beehive_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu"), - m_p_videoram(*this, "videoram"){ } + : driver_device(mconfig, type, tag) + , m_maincpu(*this, "maincpu") + , m_p_videoram(*this, "videoram") + { } - required_device m_maincpu; DECLARE_READ8_MEMBER(beehive_60_r); DECLARE_WRITE8_MEMBER(beehive_62_w); + uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + +private: + required_device m_maincpu; const uint8_t *m_p_chargen; required_shared_ptr m_p_videoram; uint8_t m_keyline; virtual void machine_reset() override; virtual void video_start() override; - uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; READ8_MEMBER(beehive_state::beehive_60_r) diff --git a/src/mame/drivers/binbug.cpp b/src/mame/drivers/binbug.cpp index c03e8b7cba8..acda6b96d55 100644 --- a/src/mame/drivers/binbug.cpp +++ b/src/mame/drivers/binbug.cpp @@ -56,14 +56,12 @@ #include "sound/wave.h" #include "imagedev/snapquik.h" -#define KEYBOARD_TAG "keyboard" - class binbug_state : public driver_device { public: binbug_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_rs232(*this, KEYBOARD_TAG), + m_rs232(*this, "keyboard"), m_cass(*this, "cassette"), m_p_videoram(*this, "videoram"), m_p_attribram(*this, "attribram"), @@ -309,7 +307,7 @@ static MACHINE_CONFIG_START( binbug, binbug_state ) MCFG_PALETTE_ADD_MONOCHROME("palette") /* Keyboard */ - MCFG_RS232_PORT_ADD(KEYBOARD_TAG, default_rs232_devices, "keyboard") + MCFG_RS232_PORT_ADD("keyboard", default_rs232_devices, "keyboard") MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("keyboard", keyboard) /* Cassette */ diff --git a/src/mame/drivers/c10.cpp b/src/mame/drivers/c10.cpp index d5df4b8f89d..b9d8348b236 100644 --- a/src/mame/drivers/c10.cpp +++ b/src/mame/drivers/c10.cpp @@ -25,17 +25,19 @@ public: }; c10_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu"), - m_p_videoram(*this, "p_videoram"){ } + : driver_device(mconfig, type, tag) + , m_maincpu(*this, "maincpu") + , m_p_videoram(*this, "videoram") + { } + uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + DECLARE_DRIVER_INIT(c10); +private: required_device m_maincpu; const uint8_t *m_p_chargen; required_shared_ptr m_p_videoram; virtual void machine_reset() override; virtual void video_start() override; - uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_DRIVER_INIT(c10); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; @@ -49,7 +51,7 @@ static ADDRESS_MAP_START(c10_mem, AS_PROGRAM, 8, c10_state) AM_RANGE(0x1000, 0x7fff) AM_RAM AM_RANGE(0x8000, 0xbfff) AM_ROM AM_RANGE(0xc000, 0xf0a1) AM_RAM - AM_RANGE(0xf0a2, 0xffff) AM_RAM AM_SHARE("p_videoram") + AM_RANGE(0xf0a2, 0xffff) AM_RAM AM_SHARE("videoram") ADDRESS_MAP_END static ADDRESS_MAP_START( c10_io, AS_IO, 8, c10_state) diff --git a/src/mame/drivers/cd2650.cpp b/src/mame/drivers/cd2650.cpp index eac2095ee6c..d34cd203124 100644 --- a/src/mame/drivers/cd2650.cpp +++ b/src/mame/drivers/cd2650.cpp @@ -36,8 +36,6 @@ TODO #include "sound/wave.h" #include "sound/beep.h" -#define KEYBOARD_TAG "keyboard" - class cd2650_state : public driver_device { public: @@ -291,7 +289,7 @@ static MACHINE_CONFIG_START( cd2650, cd2650_state ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) /* Devices */ - MCFG_DEVICE_ADD(KEYBOARD_TAG, GENERIC_KEYBOARD, 0) + MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0) MCFG_GENERIC_KEYBOARD_CB(WRITE8(cd2650_state, kbd_put)) MCFG_CASSETTE_ADD( "cassette" ) MACHINE_CONFIG_END diff --git a/src/mame/drivers/cdc721.cpp b/src/mame/drivers/cdc721.cpp index 3a50cd3e83e..7f302777a76 100644 --- a/src/mame/drivers/cdc721.cpp +++ b/src/mame/drivers/cdc721.cpp @@ -18,17 +18,17 @@ class cdc721_state : public driver_device public: cdc721_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) - , m_p_videoram(*this, "videoram") - , m_maincpu(*this, "maincpu") - { } + , m_p_videoram(*this, "videoram") + , m_maincpu(*this, "maincpu") + { } -public: - virtual void machine_reset() override; - DECLARE_PALETTE_INIT(cdc721); - const uint8_t *m_p_chargen; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - required_shared_ptr m_p_videoram; + DECLARE_PALETTE_INIT(cdc721); + private: + virtual void machine_reset() override; + const uint8_t *m_p_chargen; + required_shared_ptr m_p_videoram; required_device m_maincpu; diff --git a/src/mame/drivers/grfd2301.cpp b/src/mame/drivers/grfd2301.cpp index 087d86273e1..475659ae1c3 100644 --- a/src/mame/drivers/grfd2301.cpp +++ b/src/mame/drivers/grfd2301.cpp @@ -39,9 +39,9 @@ class grfd2301_state : public driver_device public: grfd2301_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) - , m_p_videoram(*this, "videoram") - , m_maincpu(*this, "maincpu") - { } + , m_p_videoram(*this, "videoram") + , m_maincpu(*this, "maincpu") + { } public: virtual void machine_reset() override; diff --git a/src/mame/drivers/h19.cpp b/src/mame/drivers/h19.cpp index b7167e05dbb..73332ffe62e 100644 --- a/src/mame/drivers/h19.cpp +++ b/src/mame/drivers/h19.cpp @@ -41,8 +41,6 @@ #include "machine/ins8250.h" #include "machine/keyboard.h" -#define KEYBOARD_TAG "keyboard" - #define H19_CLOCK (XTAL_12_288MHz / 6) #define H19_BEEP_FRQ (H19_CLOCK / 1024) @@ -407,7 +405,7 @@ static MACHINE_CONFIG_START( h19, h19_state ) MCFG_DEVICE_ADD("ins8250", INS8250, XTAL_12_288MHz / 4) // 3.072mhz clock which gets divided down for the various baud rates MCFG_INS8250_OUT_INT_CB(INPUTLINE("maincpu", 0)) // interrupt - MCFG_DEVICE_ADD(KEYBOARD_TAG, GENERIC_KEYBOARD, 0) + MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0) MCFG_GENERIC_KEYBOARD_CB(WRITE8(h19_state, h19_kbd_put)) /* sound hardware */ diff --git a/src/mame/drivers/homez80.cpp b/src/mame/drivers/homez80.cpp index fdcb5341abb..f89e76275f6 100644 --- a/src/mame/drivers/homez80.cpp +++ b/src/mame/drivers/homez80.cpp @@ -28,10 +28,10 @@ class homez80_state : public driver_device { public: homez80_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu") - , - m_p_videoram(*this, "p_videoram"){ } + : driver_device(mconfig, type, tag) + , m_maincpu(*this, "maincpu") + , m_p_videoram(*this, "videoram") + { } required_device m_maincpu; DECLARE_READ8_MEMBER( homez80_keyboard_r ); @@ -55,7 +55,7 @@ READ8_MEMBER( homez80_state::homez80_keyboard_r ) static ADDRESS_MAP_START(homez80_mem, AS_PROGRAM, 8, homez80_state) ADDRESS_MAP_UNMAP_HIGH AM_RANGE( 0x0000, 0x0fff ) AM_ROM // Monitor - AM_RANGE( 0x2000, 0x23ff ) AM_RAM AM_SHARE("p_videoram") // Video RAM + AM_RANGE( 0x2000, 0x23ff ) AM_RAM AM_SHARE("videoram") // Video RAM AM_RANGE( 0x7020, 0x702f ) AM_READ(homez80_keyboard_r) AM_RANGE( 0x8000, 0xffff ) AM_RAM // 32 K RAM ADDRESS_MAP_END diff --git a/src/mame/drivers/ipds.cpp b/src/mame/drivers/ipds.cpp index 7790f04c521..7b3df48d8cc 100644 --- a/src/mame/drivers/ipds.cpp +++ b/src/mame/drivers/ipds.cpp @@ -13,8 +13,6 @@ #include "video/i8275.h" #include "machine/keyboard.h" -#define KEYBOARD_TAG "keyboard" - class ipds_state : public driver_device { public: @@ -146,7 +144,7 @@ static MACHINE_CONFIG_START( ipds, ipds_state ) MCFG_I8275_CHARACTER_WIDTH(6) MCFG_I8275_DRAW_CHARACTER_CALLBACK_OWNER(ipds_state, crtc_display_pixels) - MCFG_DEVICE_ADD(KEYBOARD_TAG, GENERIC_KEYBOARD, 0) + MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0) MCFG_GENERIC_KEYBOARD_CB(WRITE8(ipds_state, kbd_put)) MACHINE_CONFIG_END diff --git a/src/mame/drivers/jupiter.cpp b/src/mame/drivers/jupiter.cpp index 0c30d5b4b8c..944608f3fa2 100644 --- a/src/mame/drivers/jupiter.cpp +++ b/src/mame/drivers/jupiter.cpp @@ -27,9 +27,6 @@ ToDo: #include "machine/wd_fdc.h" #include "includes/jupiter.h" -#define TERMINAL_TAG "terminal" -#define KEYBOARD_TAG "keyboard" - //************************************************************************** // ADDRESS MAPS @@ -75,7 +72,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( jupiter3_mem, AS_PROGRAM, 8, jupiter3_state ) AM_RANGE(0x0000, 0xbfff) AM_RAM AM_SHARE("p_ram") - AM_RANGE(0xc000, 0xdfff) AM_RAM AM_SHARE("p_videoram") + AM_RANGE(0xc000, 0xdfff) AM_RAM AM_SHARE("videoram") AM_RANGE(0xe000, 0xefff) AM_ROM AM_REGION(Z80_TAG, 0) AM_RANGE(0xf000, 0xffff) AM_RAM ADDRESS_MAP_END @@ -229,7 +226,7 @@ static MACHINE_CONFIG_START( jupiter, jupiter2_state ) MCFG_FLOPPY_DRIVE_ADD(INS1771N1_TAG":0", jupiter_floppies, "525ssdd", floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_ADD(INS1771N1_TAG":1", jupiter_floppies, nullptr, floppy_image_device::default_floppy_formats) - MCFG_DEVICE_ADD(TERMINAL_TAG, GENERIC_TERMINAL, 0) + MCFG_DEVICE_ADD("terminal", GENERIC_TERMINAL, 0) // internal ram MCFG_RAM_ADD(RAM_TAG) @@ -263,7 +260,7 @@ static MACHINE_CONFIG_START( jupiter3, jupiter3_state ) MCFG_FLOPPY_DRIVE_ADD(INS1771N1_TAG":0", jupiter_floppies, "525ssdd", floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_ADD(INS1771N1_TAG":1", jupiter_floppies, nullptr, floppy_image_device::default_floppy_formats) - MCFG_DEVICE_ADD(KEYBOARD_TAG, GENERIC_KEYBOARD, 0) + MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0) MCFG_GENERIC_KEYBOARD_CB(WRITE8(jupiter3_state, kbd_put)) // internal ram diff --git a/src/mame/drivers/k8915.cpp b/src/mame/drivers/k8915.cpp index 4c2a97662f8..637ff7eb831 100644 --- a/src/mame/drivers/k8915.cpp +++ b/src/mame/drivers/k8915.cpp @@ -14,15 +14,13 @@ #include "cpu/z80/z80.h" #include "machine/keyboard.h" -#define KEYBOARD_TAG "keyboard" - class k8915_state : public driver_device { public: k8915_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), - m_p_videoram(*this, "p_videoram") + m_p_videoram(*this, "videoram") { } @@ -67,7 +65,7 @@ WRITE8_MEMBER( k8915_state::k8915_a8_w ) static ADDRESS_MAP_START(k8915_mem, AS_PROGRAM, 8, k8915_state) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x0000, 0x0fff) AM_RAMBANK("boot") - AM_RANGE(0x1000, 0x17ff) AM_RAM AM_SHARE("p_videoram") + AM_RANGE(0x1000, 0x17ff) AM_RAM AM_SHARE("videoram") AM_RANGE(0x1800, 0xffff) AM_RAM ADDRESS_MAP_END @@ -166,7 +164,7 @@ static MACHINE_CONFIG_START( k8915, k8915_state ) MCFG_PALETTE_ADD_MONOCHROME("palette") - MCFG_DEVICE_ADD(KEYBOARD_TAG, GENERIC_KEYBOARD, 0) + MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0) MCFG_GENERIC_KEYBOARD_CB(WRITE8(k8915_state, kbd_put)) MACHINE_CONFIG_END diff --git a/src/mame/drivers/llc.cpp b/src/mame/drivers/llc.cpp index e01e1ad72b9..e2faf3bf50c 100644 --- a/src/mame/drivers/llc.cpp +++ b/src/mame/drivers/llc.cpp @@ -51,8 +51,6 @@ #include "includes/llc.h" #include "llc1.lh" -#define KEYBOARD_TAG "keyboard" - /* Address maps */ static ADDRESS_MAP_START( llc1_mem, AS_PROGRAM, 8, llc_state ) AM_RANGE(0x0000, 0x07ff) AM_ROM // Monitor ROM @@ -234,7 +232,7 @@ static MACHINE_CONFIG_START( llc1, llc_state ) MCFG_Z80CTC_ZC0_CB(DEVWRITELINE("z80ctc", z80ctc_device, trg1)) MCFG_Z80CTC_ZC1_CB(DEVWRITELINE("z80ctc", z80ctc_device, trg3)) - MCFG_DEVICE_ADD(KEYBOARD_TAG, GENERIC_KEYBOARD, 0) + MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0) MCFG_GENERIC_KEYBOARD_CB(WRITE8(llc_state, kbd_put)) MACHINE_CONFIG_END diff --git a/src/mame/drivers/m20.cpp b/src/mame/drivers/m20.cpp index 2dd25590d9c..12481737d0f 100644 --- a/src/mame/drivers/m20.cpp +++ b/src/mame/drivers/m20.cpp @@ -68,7 +68,7 @@ public: m_floppy0(*this, "fd1797:0:5dd"), m_floppy1(*this, "fd1797:1:5dd"), m_apb(*this, "apb"), - m_p_videoram(*this, "p_videoram"), + m_p_videoram(*this, "videoram"), m_palette(*this, "palette") { } @@ -312,13 +312,13 @@ B/W, 128K cards, 3 cards => 512K of memory: static ADDRESS_MAP_START(m20_program_mem, AS_PROGRAM, 16, m20_state) ADDRESS_MAP_UNMAP_HIGH - AM_RANGE( 0x30000, 0x33fff ) AM_RAM AM_SHARE("p_videoram") + AM_RANGE( 0x30000, 0x33fff ) AM_RAM AM_SHARE("videoram") AM_RANGE( 0x40000, 0x41fff ) AM_ROM AM_REGION("maincpu", 0x00000) ADDRESS_MAP_END static ADDRESS_MAP_START(m20_data_mem, AS_DATA, 16, m20_state) ADDRESS_MAP_UNMAP_HIGH - AM_RANGE( 0x30000, 0x33fff ) AM_RAM AM_SHARE("p_videoram") + AM_RANGE( 0x30000, 0x33fff ) AM_RAM AM_SHARE("videoram") AM_RANGE( 0x40000, 0x41fff ) AM_ROM AM_REGION("maincpu", 0x00000) ADDRESS_MAP_END diff --git a/src/mame/drivers/m79152pc.cpp b/src/mame/drivers/m79152pc.cpp index 33793aee66b..4228c278336 100644 --- a/src/mame/drivers/m79152pc.cpp +++ b/src/mame/drivers/m79152pc.cpp @@ -18,8 +18,8 @@ class m79152pc_state : public driver_device public: m79152pc_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_p_videoram(*this, "p_videoram"), - m_p_attributes(*this, "p_attributes"), + m_p_videoram(*this, "videoram"), + m_p_attributes(*this, "attributes"), m_maincpu(*this, "maincpu") { } uint8_t *m_p_chargen; @@ -35,8 +35,8 @@ static ADDRESS_MAP_START(m79152pc_mem, AS_PROGRAM, 8, m79152pc_state) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x0000, 0x3fff) AM_ROM AM_RANGE(0x4000, 0x47ff) AM_RAM - AM_RANGE(0x8000, 0x8fff) AM_RAM AM_SHARE("p_videoram") - AM_RANGE(0x9000, 0x9fff) AM_RAM AM_SHARE("p_attributes") + AM_RANGE(0x8000, 0x8fff) AM_RAM AM_SHARE("videoram") + AM_RANGE(0x9000, 0x9fff) AM_RAM AM_SHARE("attributes") ADDRESS_MAP_END static ADDRESS_MAP_START( m79152pc_io, AS_IO, 8, m79152pc_state) diff --git a/src/mame/drivers/mes.cpp b/src/mame/drivers/mes.cpp index 416d76dc6cd..0f8daa02678 100644 --- a/src/mame/drivers/mes.cpp +++ b/src/mame/drivers/mes.cpp @@ -18,7 +18,7 @@ public: mes_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), - m_p_videoram(*this, "p_videoram"){ } + m_p_videoram(*this, "videoram"){ } required_device m_maincpu; const uint8_t *m_p_chargen; @@ -34,7 +34,7 @@ static ADDRESS_MAP_START(mes_mem, AS_PROGRAM, 8, mes_state) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x0000, 0x0fff) AM_ROM AM_RANGE(0x1000, 0xefff) AM_RAM - AM_RANGE(0xf000, 0xffff) AM_RAM AM_SHARE("p_videoram") + AM_RANGE(0xf000, 0xffff) AM_RAM AM_SHARE("videoram") ADDRESS_MAP_END static ADDRESS_MAP_START( mes_io, AS_IO, 8, mes_state) diff --git a/src/mame/drivers/modellot.cpp b/src/mame/drivers/modellot.cpp index 6d8317f1a8a..4db699ae724 100644 --- a/src/mame/drivers/modellot.cpp +++ b/src/mame/drivers/modellot.cpp @@ -20,8 +20,6 @@ #include "cpu/z80/z80.h" #include "machine/keyboard.h" -#define KEYBOARD_TAG "keyboard" - class modellot_state : public driver_device { public: @@ -167,7 +165,7 @@ static MACHINE_CONFIG_START( modellot, modellot_state ) MCFG_PALETTE_ADD_MONOCHROME("palette") /* Devices */ - MCFG_DEVICE_ADD(KEYBOARD_TAG, GENERIC_KEYBOARD, 0) + MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0) MCFG_GENERIC_KEYBOARD_CB(WRITE8(modellot_state, kbd_put)) MACHINE_CONFIG_END diff --git a/src/mame/drivers/mx2178.cpp b/src/mame/drivers/mx2178.cpp index 627d65b5043..6fd41d07583 100644 --- a/src/mame/drivers/mx2178.cpp +++ b/src/mame/drivers/mx2178.cpp @@ -26,8 +26,6 @@ #include "machine/clock.h" #include "machine/keyboard.h" -#define KEYBOARD_TAG "keyboard" - class mx2178_state : public driver_device { public: @@ -181,7 +179,7 @@ static MACHINE_CONFIG_START( mx2178, mx2178_state ) /// TODO: hook up acia to keyboard and memory map - MCFG_DEVICE_ADD(KEYBOARD_TAG, GENERIC_KEYBOARD, 0) + MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0) MCFG_GENERIC_KEYBOARD_CB(WRITE8(mx2178_state, kbd_put)) MCFG_DEVICE_ADD("acia_clock", CLOCK, 614400) diff --git a/src/mame/drivers/mz80.cpp b/src/mame/drivers/mz80.cpp index 661671ac470..cbba39680b1 100644 --- a/src/mame/drivers/mz80.cpp +++ b/src/mame/drivers/mz80.cpp @@ -244,7 +244,7 @@ static ADDRESS_MAP_START( mz80k_mem, AS_PROGRAM, 8, mz80_state ) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x0000, 0x0fff) AM_ROM AM_RANGE(0x1000, 0xcfff) AM_RAM AM_SHARE("p_ram") // 48 KB of RAM - AM_RANGE(0xd000, 0xd7ff) AM_RAM AM_SHARE("p_videoram") // Video RAM + AM_RANGE(0xd000, 0xd7ff) AM_RAM AM_SHARE("videoram") // Video RAM AM_RANGE(0xe000, 0xe003) AM_DEVREADWRITE("ppi8255", i8255_device, read, write) /* PPIA 8255 */ AM_RANGE(0xe004, 0xe007) AM_DEVREADWRITE("pit8253", pit8253_device, read, write) /* PIT 8253 */ AM_RANGE(0xe008, 0xe00b) AM_READWRITE( mz80k_strobe_r, mz80k_strobe_w) diff --git a/src/mame/drivers/okean240.cpp b/src/mame/drivers/okean240.cpp index 5810d6983d2..a1657b61367 100644 --- a/src/mame/drivers/okean240.cpp +++ b/src/mame/drivers/okean240.cpp @@ -54,9 +54,6 @@ Usage of terminal: #include "machine/keyboard.h" #include "machine/terminal.h" -#define KEYBOARD_TAG "keyboard" -#define TERMINAL_TAG "terminal" - class okean240_state : public driver_device { public: @@ -70,7 +67,7 @@ public: m_term_data(0), m_j(0), m_scroll(0), - m_p_videoram(*this, "p_videoram"), + m_p_videoram(*this, "videoram"), m_io_modifiers(*this, "MODIFIERS"), m_maincpu(*this, "maincpu") { @@ -206,7 +203,7 @@ static ADDRESS_MAP_START(okean240_mem, AS_PROGRAM, 8, okean240_state) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x0000, 0x07ff) AM_RAMBANK("boot") AM_RANGE(0x0800, 0x3fff) AM_RAM - AM_RANGE(0x4000, 0x7fff) AM_RAM AM_SHARE("p_videoram") + AM_RANGE(0x4000, 0x7fff) AM_RAM AM_SHARE("videoram") AM_RANGE(0x8000, 0xbfff) AM_RAM AM_RANGE(0xc000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -243,7 +240,7 @@ static ADDRESS_MAP_START(okean240t_io, AS_IO, 8, okean240_state) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x40, 0x42) AM_READWRITE(okean240_keyboard_r,okean240_keyboard_w) AM_RANGE(0x80, 0x80) AM_READ(okean240_kbd_status_r) - AM_RANGE(0xa0, 0xa0) AM_DEVWRITE(TERMINAL_TAG, generic_terminal_device, write) + AM_RANGE(0xa0, 0xa0) AM_DEVWRITE("terminal", generic_terminal_device, write) AM_RANGE(0xa0, 0xa0) AM_READ(term_r) AM_RANGE(0xa1, 0xa1) AM_READ(term_status_r) AM_RANGE(0xc0, 0xc0) AM_WRITE(scroll_w) @@ -490,7 +487,7 @@ static MACHINE_CONFIG_START( okean240t, okean240_state ) MCFG_PALETTE_ADD_MONOCHROME("palette") - MCFG_DEVICE_ADD(TERMINAL_TAG, GENERIC_TERMINAL, 0) + MCFG_DEVICE_ADD("terminal", GENERIC_TERMINAL, 0) MCFG_GENERIC_TERMINAL_KEYBOARD_CB(WRITE8(okean240_state, kbd_put)) MACHINE_CONFIG_END @@ -498,8 +495,8 @@ static MACHINE_CONFIG_DERIVED( okean240a, okean240t ) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(okean240a_io) MCFG_GFXDECODE_ADD("gfxdecode", "palette", okean240a) - MCFG_DEVICE_REMOVE(TERMINAL_TAG) - MCFG_DEVICE_ADD(KEYBOARD_TAG, GENERIC_KEYBOARD, 0) + MCFG_DEVICE_REMOVE("terminal") + MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0) MCFG_GENERIC_KEYBOARD_CB(WRITE8(okean240_state, kbd_put)) MACHINE_CONFIG_END @@ -507,8 +504,8 @@ static MACHINE_CONFIG_DERIVED( okean240, okean240t ) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(okean240_io) MCFG_GFXDECODE_ADD("gfxdecode", "palette", okean240) - MCFG_DEVICE_REMOVE(TERMINAL_TAG) - MCFG_DEVICE_ADD(KEYBOARD_TAG, GENERIC_KEYBOARD, 0) + MCFG_DEVICE_REMOVE("terminal") + MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0) MCFG_GENERIC_KEYBOARD_CB(WRITE8(okean240_state, kbd_put)) MACHINE_CONFIG_END diff --git a/src/mame/drivers/phunsy.cpp b/src/mame/drivers/phunsy.cpp index 2221597d4b5..f93e0d68fc2 100644 --- a/src/mame/drivers/phunsy.cpp +++ b/src/mame/drivers/phunsy.cpp @@ -37,8 +37,6 @@ #define LOG 1 -#define KEYBOARD_TAG "keyboard" - class phunsy_state : public driver_device { public: @@ -363,7 +361,7 @@ static MACHINE_CONFIG_START( phunsy, phunsy_state ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) /* Devices */ - MCFG_DEVICE_ADD(KEYBOARD_TAG, GENERIC_KEYBOARD, 0) + MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0) MCFG_GENERIC_KEYBOARD_CB(WRITE8(phunsy_state, kbd_put)) MCFG_CASSETTE_ADD( "cassette" ) diff --git a/src/mame/drivers/plan80.cpp b/src/mame/drivers/plan80.cpp index 99ef3aabe0e..af9d3de4f74 100644 --- a/src/mame/drivers/plan80.cpp +++ b/src/mame/drivers/plan80.cpp @@ -38,7 +38,7 @@ public: plan80_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") - , m_p_videoram(*this, "p_videoram") + , m_p_videoram(*this, "videoram") { } required_device m_maincpu; @@ -88,7 +88,7 @@ static ADDRESS_MAP_START(plan80_mem, AS_PROGRAM, 8, plan80_state) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x0000, 0x07ff) AM_RAMBANK("boot") AM_RANGE(0x0800, 0xefff) AM_RAM - AM_RANGE(0xf000, 0xf7ff) AM_RAM AM_SHARE("p_videoram") + AM_RANGE(0xf000, 0xf7ff) AM_RAM AM_SHARE("videoram") AM_RANGE(0xf800, 0xffff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/poly.cpp b/src/mame/drivers/poly.cpp index 3557dd0d7f6..6771465d81a 100644 --- a/src/mame/drivers/poly.cpp +++ b/src/mame/drivers/poly.cpp @@ -41,8 +41,6 @@ #include "machine/keyboard.h" #include "sound/speaker.h" -#define KEYBOARD_TAG "keyboard" - class poly_state : public driver_device { public: @@ -198,7 +196,7 @@ static MACHINE_CONFIG_START( poly, poly_state ) MCFG_DEVICE_ADD("adlc", MC6854, 0) - MCFG_DEVICE_ADD(KEYBOARD_TAG, GENERIC_KEYBOARD, 0) + MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0) MCFG_GENERIC_KEYBOARD_CB(WRITE8(poly_state, kbd_put)) MACHINE_CONFIG_END diff --git a/src/mame/drivers/pv1000.cpp b/src/mame/drivers/pv1000.cpp index 1b7bf3402bd..924a8293a64 100644 --- a/src/mame/drivers/pv1000.cpp +++ b/src/mame/drivers/pv1000.cpp @@ -147,7 +147,7 @@ public: m_maincpu(*this, "maincpu"), m_sound(*this, "pv1000_sound"), m_cart(*this, "cartslot"), - m_p_videoram(*this, "p_videoram"), + m_p_videoram(*this, "videoram"), m_gfxdecode(*this, "gfxdecode"), m_screen(*this, "screen"), m_palette(*this, "palette") @@ -187,7 +187,7 @@ public: static ADDRESS_MAP_START( pv1000, AS_PROGRAM, 8, pv1000_state ) //AM_RANGE(0x0000, 0x7fff) // mapped by the cartslot - AM_RANGE(0xb800, 0xbbff) AM_RAM AM_SHARE("p_videoram") + AM_RANGE(0xb800, 0xbbff) AM_RAM AM_SHARE("videoram") AM_RANGE(0xbc00, 0xbfff) AM_RAM_WRITE(gfxram_w) AM_REGION("gfxram", 0) ADDRESS_MAP_END diff --git a/src/mame/drivers/sapi1.cpp b/src/mame/drivers/sapi1.cpp index bd4a9591b7e..afda5083ffc 100644 --- a/src/mame/drivers/sapi1.cpp +++ b/src/mame/drivers/sapi1.cpp @@ -38,9 +38,6 @@ Unable to proceed due to no info available (& in English). #include "machine/keyboard.h" #include "machine/terminal.h" -#define TERMINAL_TAG "terminal" -#define KEYBOARD_TAG "keyboard" - class sapi1_state : public driver_device { public: @@ -226,7 +223,7 @@ static ADDRESS_MAP_START( sapi3a_io, AS_IO, 8, sapi1_state ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_WRITE(sapi3_00_w) - AM_RANGE(0x12, 0x12) AM_READ(sapi2_keyboard_data_r) AM_DEVWRITE(TERMINAL_TAG, generic_terminal_device, write) + AM_RANGE(0x12, 0x12) AM_READ(sapi2_keyboard_data_r) AM_DEVWRITE("terminal", generic_terminal_device, write) AM_RANGE(0x25, 0x25) AM_READWRITE(sapi3_25_r,sapi3_25_w) ADDRESS_MAP_END @@ -560,7 +557,7 @@ static MACHINE_CONFIG_DERIVED( sapi2, sapi1 ) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(sapi2_mem) - MCFG_DEVICE_ADD(KEYBOARD_TAG, GENERIC_KEYBOARD, 0) + MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0) MCFG_GENERIC_KEYBOARD_CB(WRITE8(sapi1_state, kbd_put)) MACHINE_CONFIG_END @@ -600,7 +597,7 @@ static MACHINE_CONFIG_START( sapi3a, sapi1_state ) MCFG_MACHINE_RESET_OVERRIDE(sapi1_state, sapizps3 ) /* video hardware */ - MCFG_DEVICE_ADD(TERMINAL_TAG, GENERIC_TERMINAL, 0) + MCFG_DEVICE_ADD("terminal", GENERIC_TERMINAL, 0) MCFG_GENERIC_TERMINAL_KEYBOARD_CB(WRITE8(sapi1_state, kbd_put)) /* internal ram */ diff --git a/src/mame/drivers/special.cpp b/src/mame/drivers/special.cpp index b4ce4e5ac49..dc3c07ba188 100644 --- a/src/mame/drivers/special.cpp +++ b/src/mame/drivers/special.cpp @@ -17,7 +17,7 @@ static ADDRESS_MAP_START(specialist_mem, AS_PROGRAM, 8, special_state ) AM_RANGE( 0x0000, 0x2fff ) AM_RAMBANK("bank1") // First bank AM_RANGE( 0x3000, 0x8fff ) AM_RAM // RAM - AM_RANGE( 0x9000, 0xbfff ) AM_RAM AM_SHARE("p_videoram") // Video RAM + AM_RANGE( 0x9000, 0xbfff ) AM_RAM AM_SHARE("videoram") // Video RAM AM_RANGE( 0xc000, 0xefff ) AM_ROM // System ROM AM_RANGE( 0xf800, 0xf803 ) AM_MIRROR(0x7fc) AM_DEVREADWRITE("ppi8255", i8255_device, read, write) ADDRESS_MAP_END @@ -25,7 +25,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START(specialp_mem, AS_PROGRAM, 8, special_state ) AM_RANGE( 0x0000, 0x2fff ) AM_RAMBANK("bank1") // First bank AM_RANGE( 0x3000, 0x7fff ) AM_RAM // RAM - AM_RANGE( 0x8000, 0xbfff ) AM_RAM AM_SHARE("p_videoram") // Video RAM + AM_RANGE( 0x8000, 0xbfff ) AM_RAM AM_SHARE("videoram") // Video RAM AM_RANGE( 0xc000, 0xefff ) AM_ROM // System ROM AM_RANGE( 0xf800, 0xf803 ) AM_MIRROR(0x7fc) AM_DEVREADWRITE("ppi8255", i8255_device, read, write) ADDRESS_MAP_END diff --git a/src/mame/drivers/tavernie.cpp b/src/mame/drivers/tavernie.cpp index 89496153b65..36f4a86e8d0 100644 --- a/src/mame/drivers/tavernie.cpp +++ b/src/mame/drivers/tavernie.cpp @@ -62,8 +62,6 @@ Z - more scan lines per row (cursor is bigger) #include "sound/beep.h" #include "tavernie.lh" -#define KEYBOARD_TAG "keyboard" - class tavernie_state : public driver_device { public: @@ -356,7 +354,7 @@ static MACHINE_CONFIG_DERIVED( ivg09, cpu09 ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) /* Devices */ - MCFG_DEVICE_ADD(KEYBOARD_TAG, GENERIC_KEYBOARD, 0) + MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0) MCFG_GENERIC_KEYBOARD_CB(WRITE8(tavernie_state, kbd_put)) MCFG_MC6845_ADD("crtc", MC6845, "screen", 1008000) // unknown clock diff --git a/src/mame/drivers/tk80bs.cpp b/src/mame/drivers/tk80bs.cpp index 728e6c8401b..81d38d4a795 100644 --- a/src/mame/drivers/tk80bs.cpp +++ b/src/mame/drivers/tk80bs.cpp @@ -27,8 +27,6 @@ TODO: #include "machine/i8255.h" #include "machine/keyboard.h" -#define KEYBOARD_TAG "keyboard" - class tk80bs_state : public driver_device { public: @@ -189,7 +187,7 @@ static MACHINE_CONFIG_START( tk80bs, tk80bs_state ) MCFG_I8255_IN_PORTA_CB(READ8(tk80bs_state, port_a_r)) MCFG_I8255_IN_PORTB_CB(READ8(tk80bs_state, port_b_r)) - MCFG_DEVICE_ADD(KEYBOARD_TAG, GENERIC_KEYBOARD, 0) + MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0) MCFG_GENERIC_KEYBOARD_CB(WRITE8(tk80bs_state, kbd_put)) MACHINE_CONFIG_END diff --git a/src/mame/drivers/trs80.cpp b/src/mame/drivers/trs80.cpp index 46bf876a5d9..b5800cae666 100644 --- a/src/mame/drivers/trs80.cpp +++ b/src/mame/drivers/trs80.cpp @@ -143,7 +143,7 @@ There don't seem to be any JV1 boot disks for Model III/4. static ADDRESS_MAP_START( trs80_map, AS_PROGRAM, 8, trs80_state ) AM_RANGE(0x0000, 0x0fff) AM_ROM AM_RANGE(0x3800, 0x38ff) AM_READ(trs80_keyboard_r) - AM_RANGE(0x3c00, 0x3fff) AM_READWRITE(trs80_videoram_r, trs80_videoram_w) AM_SHARE("p_videoram") + AM_RANGE(0x3c00, 0x3fff) AM_READWRITE(trs80_videoram_r, trs80_videoram_w) AM_SHARE("videoram") AM_RANGE(0x4000, 0x7fff) AM_RAM ADDRESS_MAP_END @@ -166,7 +166,7 @@ static ADDRESS_MAP_START( model1_map, AS_PROGRAM, 8, trs80_state ) AM_RANGE(0x37ee, 0x37ee) AM_DEVREADWRITE("fdc", fd1793_t, sector_r, sector_w) AM_RANGE(0x37ef, 0x37ef) AM_DEVREADWRITE("fdc", fd1793_t, data_r, data_w) AM_RANGE(0x3800, 0x38ff) AM_MIRROR(0x300) AM_READ(trs80_keyboard_r) - AM_RANGE(0x3c00, 0x3fff) AM_READWRITE(trs80_videoram_r, trs80_videoram_w) AM_SHARE("p_videoram") + AM_RANGE(0x3c00, 0x3fff) AM_READWRITE(trs80_videoram_r, trs80_videoram_w) AM_SHARE("videoram") AM_RANGE(0x4000, 0xffff) AM_RAM ADDRESS_MAP_END @@ -274,7 +274,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( meritum_map, AS_PROGRAM, 8, trs80_state ) AM_RANGE(0x0000, 0x37ff) AM_ROM AM_RANGE(0x3800, 0x38ff) AM_MIRROR(0x300) AM_READ(trs80_keyboard_r) - AM_RANGE(0x3c00, 0x3fff) AM_READWRITE(trs80_videoram_r, trs80_videoram_w) AM_SHARE("p_videoram") + AM_RANGE(0x3c00, 0x3fff) AM_READWRITE(trs80_videoram_r, trs80_videoram_w) AM_SHARE("videoram") AM_RANGE(0x4000, 0xffff) AM_RAM ADDRESS_MAP_END diff --git a/src/mame/drivers/ut88.cpp b/src/mame/drivers/ut88.cpp index 85e51348cbf..3c66e2d6165 100644 --- a/src/mame/drivers/ut88.cpp +++ b/src/mame/drivers/ut88.cpp @@ -44,7 +44,7 @@ static ADDRESS_MAP_START( ut88_mem, AS_PROGRAM, 8, ut88_state ) AM_RANGE( 0x0000, 0x07ff ) AM_RAMBANK("bank1") // First bank AM_RANGE( 0x0800, 0xdfff ) AM_RAM // RAM AM_RANGE( 0xe000, 0xe7ff ) AM_RAM // Video RAM (not used) - AM_RANGE( 0xe800, 0xefff ) AM_RAM AM_SHARE("p_videoram") // Video RAM + AM_RANGE( 0xe800, 0xefff ) AM_RAM AM_SHARE("videoram") // Video RAM AM_RANGE( 0xf400, 0xf7ff ) AM_RAM // System RAM AM_RANGE( 0xf800, 0xffff ) AM_ROM // System ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/v6809.cpp b/src/mame/drivers/v6809.cpp index abdfabadf6d..80af98465fa 100644 --- a/src/mame/drivers/v6809.cpp +++ b/src/mame/drivers/v6809.cpp @@ -60,8 +60,6 @@ ToDo: #include "sound/speaker.h" #include "machine/wd_fdc.h" -#define KEYBOARD_TAG "keyboard" - class v6809_state : public driver_device { public: @@ -323,7 +321,7 @@ static MACHINE_CONFIG_START( v6809, v6809_state ) MCFG_MC6845_UPDATE_ROW_CB(v6809_state, crtc_update_row) MCFG_MC6845_ADDR_CHANGED_CB(v6809_state, crtc_update_addr) - MCFG_DEVICE_ADD(KEYBOARD_TAG, GENERIC_KEYBOARD, 0) + MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0) MCFG_GENERIC_KEYBOARD_CB(WRITE8(v6809_state, kbd_put)) // port A = drive select and 2 control lines ; port B = keyboard diff --git a/src/mame/drivers/z9001.cpp b/src/mame/drivers/z9001.cpp index 7ce228bafd7..3c144f6eb01 100644 --- a/src/mame/drivers/z9001.cpp +++ b/src/mame/drivers/z9001.cpp @@ -39,8 +39,6 @@ ToDo: // temporary #include "machine/keyboard.h" -#define KEYBOARD_TAG "keyboard" - class z9001_state : public driver_device { public: @@ -227,7 +225,7 @@ static MACHINE_CONFIG_START( z9001, z9001_state ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) /* Devices */ - MCFG_DEVICE_ADD(KEYBOARD_TAG, GENERIC_KEYBOARD, 0) + MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0) MCFG_GENERIC_KEYBOARD_CB(WRITE8(z9001_state, kbd_put)) MCFG_TIMER_DRIVER_ADD_PERIODIC("z9001_timer", z9001_state, timer_callback, attotime::from_msec(10)) diff --git a/src/mame/drivers/zrt80.cpp b/src/mame/drivers/zrt80.cpp index d6d652a85ae..f6f14dee9ba 100644 --- a/src/mame/drivers/zrt80.cpp +++ b/src/mame/drivers/zrt80.cpp @@ -23,8 +23,6 @@ #include "machine/keyboard.h" #include "sound/beep.h" -#define KEYBOARD_TAG "keyboard" - class zrt80_state : public driver_device { public: @@ -302,7 +300,7 @@ static MACHINE_CONFIG_START( zrt80, zrt80_state ) MCFG_DEVICE_ADD( "ins8250", INS8250, 2457600 ) MCFG_INS8250_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) - MCFG_DEVICE_ADD(KEYBOARD_TAG, GENERIC_KEYBOARD, 0) + MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0) MCFG_GENERIC_KEYBOARD_CB(WRITE8(zrt80_state, kbd_put)) MACHINE_CONFIG_END diff --git a/src/mame/includes/jupiter.h b/src/mame/includes/jupiter.h index 479e57f8807..4a10d99bfb9 100644 --- a/src/mame/includes/jupiter.h +++ b/src/mame/includes/jupiter.h @@ -17,43 +17,42 @@ class jupiter2_state : public driver_device { public: jupiter2_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_maincpu(*this, MCM6571AP_TAG) - { } + : driver_device(mconfig, type, tag) + , m_maincpu(*this, MCM6571AP_TAG) + { } - required_device m_maincpu; - - virtual void machine_start() override; DECLARE_DRIVER_INIT(jupiter); + +private: + required_device m_maincpu; + virtual void machine_start() override; }; class jupiter3_state : public driver_device { public: jupiter3_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_maincpu(*this, Z80_TAG), - m_p_videoram(*this, "p_videoram"), - m_p_ram(*this, "p_ram") - { } - - required_device m_maincpu; + : driver_device(mconfig, type, tag) + , m_maincpu(*this, Z80_TAG) + , m_p_videoram(*this, "videoram") + , m_p_ram(*this, "p_ram") + { } + uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + DECLARE_DRIVER_INIT(jupiter3); DECLARE_WRITE8_MEMBER(kbd_put); DECLARE_READ8_MEMBER(status_r); DECLARE_READ8_MEMBER(key_r); DECLARE_READ8_MEMBER(ff_r); - uint8_t m_term_data; +private: + required_device m_maincpu; + uint8_t m_term_data; required_shared_ptr m_p_videoram; required_shared_ptr m_p_ram; const uint8_t *m_p_chargen; - virtual void machine_reset() override; virtual void video_start() override; - uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - - DECLARE_DRIVER_INIT(jupiter3); }; #endif diff --git a/src/mame/includes/trs80.h b/src/mame/includes/trs80.h index 013d4037d13..2ebbe72230e 100644 --- a/src/mame/includes/trs80.h +++ b/src/mame/includes/trs80.h @@ -40,7 +40,7 @@ public: m_floppy3(*this, "fdc:3"), m_speaker(*this, "speaker"), m_cassette(*this, "cassette"), - m_p_videoram(*this, "p_videoram"), + m_p_videoram(*this, "videoram"), m_region_maincpu(*this, "maincpu"), m_io_config(*this, "CONFIG"), m_io_line0(*this, "LINE0"), diff --git a/src/mame/machine/teleprinter.cpp b/src/mame/machine/teleprinter.cpp index 658bdf691b6..8ffc4144794 100644 --- a/src/mame/machine/teleprinter.cpp +++ b/src/mame/machine/teleprinter.cpp @@ -2,8 +2,6 @@ // copyright-holders:Miodrag Milanovic #include "teleprinter.h" -#define KEYBOARD_TAG "keyboard" - static const uint8_t teleprinter_font[128*8] = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, @@ -215,7 +213,7 @@ MACHINE_CONFIG_FRAGMENT( generic_teleprinter ) MCFG_SCREEN_SIZE(TELEPRINTER_WIDTH*8, TELEPRINTER_HEIGHT*8) MCFG_SCREEN_VISIBLE_AREA(0, TELEPRINTER_WIDTH*8-1, 0, TELEPRINTER_HEIGHT*8-1) MCFG_SCREEN_UPDATE_DEVICE(DEVICE_SELF, teleprinter_device, tp_update) - MCFG_DEVICE_ADD(KEYBOARD_TAG, GENERIC_KEYBOARD, 0) + MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0) MCFG_GENERIC_KEYBOARD_CB(WRITE8(generic_terminal_device, kbd_put)) MCFG_SPEAKER_STANDARD_MONO("bell") From 7c22de056ca511f9bfdf9b52850c9c926ceee4d6 Mon Sep 17 00:00:00 2001 From: Ted Green Date: Fri, 6 Jan 2017 17:10:57 -0700 Subject: [PATCH 29/30] atlantis: Clean up driver and add info (nw) --- src/mame/drivers/atlantis.cpp | 316 ++++++++++++++++++---------------- 1 file changed, 166 insertions(+), 150 deletions(-) diff --git a/src/mame/drivers/atlantis.cpp b/src/mame/drivers/atlantis.cpp index 1a4f43e33f1..4dc593db94d 100644 --- a/src/mame/drivers/atlantis.cpp +++ b/src/mame/drivers/atlantis.cpp @@ -50,29 +50,42 @@ #include "coreutil.h" // Board Ctrl Reg Offsets -#define CTRL_POWER0 0 -#define CTRL_POWER1 1 -#define CTRL_IRQ1_EN 2 -#define CTRL_IRQ2_EN 3 -#define CTRL_IRQ3_EN 4 -#define CTRL_IRQ4_EN 5 -#define CTRL_GLOBAL_EN 6 -#define CTRL_CAUSE 7 -#define CTRL_STATUS 8 -#define CTRL_SIZE 9 +#define CTRL_PLD_REV 0 +#define CTRL_RESET 1 +#define CTRL_VSYNC_CLEAR 2 +#define CTRL_IRQ_MAP1 3 +#define CTRL_IRQ_MAP2 4 +#define CTRL_IRQ_MAP3 5 +// Empty?? 6 +#define CTRL_IRQ_EN 7 +#define CTRL_CAUSE 8 +#define CTRL_STATUS 9 +#define CTRL_SIZE 10 -// These need more verification +// Reset bits +#define RESET_IOASIC 0x01 +#define RESET_ROMBUS 0x02 +#define RESET_ZEUS 0x04 +#define RESET_ROMBUS_IN 0x08 +#define RESET_IDE 0x10 +#define RESET_DUART 0x20 + +// IRQ Bits #define IOASIC_IRQ_SHIFT 0 -#define GALILEO_IRQ_SHIFT 1 -#define ZEUS_IRQ_SHIFT 2 -#define PARALLEL_IRQ_SHIFT 3 -#define UART1_SHIFT 4 -#define UART2_SHIFT 5 +#define ROMBUS_IRQ_SHIFT 1 +#define ZEUS0_IRQ_SHIFT 2 +#define ZEUS1_IRQ_SHIFT 3 +#define ZEUS2_IRQ_SHIFT 4 +#define WDOG_IRQ_SHIFT 5 +#define A2D_IRQ_SHIFT 6 #define VBLANK_IRQ_SHIFT 7 +// Not sure how duart interrupts are mapped +#define UART1_IRQ_SHIFT ZEUS2_IRQ_SHIFT +#define UART2_IRQ_SHIFT ZEUS2_IRQ_SHIFT + /* static interrupts */ #define GALILEO_IRQ_NUM MIPS3_IRQ0 -#define VBLANK_IRQ_NUM MIPS3_IRQ3 #define IDE_IRQ_NUM MIPS3_IRQ4 #define DEBUG_CONSOLE (0) @@ -127,10 +140,8 @@ public: DECLARE_WRITE32_MEMBER(asic_fifo_w); DECLARE_WRITE32_MEMBER(dcs3_fifo_full_w); - READ32_MEMBER (green_r); - WRITE32_MEMBER(green_w); - READ8_MEMBER (blue_r); - WRITE8_MEMBER(blue_w); + READ8_MEMBER (exprom_r); + WRITE8_MEMBER(exprom_w); WRITE32_MEMBER(user_io_output); READ32_MEMBER(user_io_input); @@ -151,37 +162,28 @@ public: DECLARE_WRITE_LINE_MEMBER(uart2_irq_callback); DECLARE_CUSTOM_INPUT_MEMBER(port_mod_r); - DECLARE_READ32_MEMBER(port_ctrl_r); - DECLARE_WRITE32_MEMBER(port_ctrl_w); - uint32_t m_port_ctrl_reg[0x8]; + DECLARE_READ16_MEMBER(port_ctrl_r); + DECLARE_WRITE16_MEMBER(port_ctrl_w); + uint16_t m_port_data; + uint16_t m_a2d_data; + + DECLARE_READ16_MEMBER(a2d_ctrl_r); + DECLARE_WRITE16_MEMBER(a2d_ctrl_w); + + DECLARE_READ16_MEMBER(a2d_data_r); + DECLARE_WRITE16_MEMBER(a2d_data_w); }; -READ32_MEMBER(atlantis_state::green_r) +READ8_MEMBER (atlantis_state::exprom_r) { - // If not 0x80 cpu writes to 00e80000 = 0 - if ((offset | 0x20000) != m_last_offset) - logerror("%06X: green_r %08x = %02x\n", machine().device("maincpu")->safe_pc(), offset, 0x80); - m_last_offset = offset | 0x20000; - return 0x80; -} - -WRITE32_MEMBER(atlantis_state::green_w) -{ - logerror("%06X: green_w %08x = %02x\n", machine().device("maincpu")->safe_pc(), offset, data); - m_last_offset = offset | 0x20000; -} - -READ8_MEMBER (atlantis_state::blue_r) -{ - //uint8_t data = m_red_data[offset]; - logerror("%06X: blue_r %08x = %02x\n", machine().device("maincpu")->safe_pc(), offset, 0); + logerror("%06X: exprom_r %08x = %02x\n", machine().device("maincpu")->safe_pc(), offset, 0); //return data; return 0; } -WRITE8_MEMBER(atlantis_state::blue_w) +WRITE8_MEMBER(atlantis_state::exprom_w) { - logerror("%06X: blue_w %08x = %02x\n", machine().device("maincpu")->safe_pc(), offset, data); + logerror("%06X: exprom_w %08x = %02x\n", machine().device("maincpu")->safe_pc(), offset, data); } READ32_MEMBER(atlantis_state::board_ctrl_r) @@ -189,9 +191,10 @@ READ32_MEMBER(atlantis_state::board_ctrl_r) uint32_t newOffset = offset >> 17; uint32_t data = board_ctrl[newOffset]; switch (newOffset) { + case CTRL_PLD_REV: + // ??? + data = 0x1; case CTRL_STATUS: - if (1 && m_screen->vblank()) - data |= 1 << VBLANK_IRQ_SHIFT; if (m_last_offset != (newOffset | 0x40000)) if (LOG_IRQ) logerror("%s:board_ctrl_r read from CTRL_STATUS offset %04X = %08X & %08X bus offset = %08X\n", machine().describe_context(), newOffset, data, mem_mask, offset); @@ -211,12 +214,12 @@ WRITE32_MEMBER(atlantis_state::board_ctrl_w) uint32_t changeData = board_ctrl[newOffset] ^ data; COMBINE_DATA(&board_ctrl[newOffset]); switch (newOffset) { - case CTRL_POWER0: + case CTRL_RESET: // 0x1 IOASIC Reset // 0x4 Zeus2 Reset // 0x10 IDE Reset - if (changeData & 0x1) { - if ((data & 0x0001) == 0) { + if (changeData & RESET_IOASIC) { + if ((data & RESET_IOASIC) == 0) { m_ioasic->ioasic_reset(); m_dcs->reset_w(ASSERT_LINE); } @@ -225,14 +228,15 @@ WRITE32_MEMBER(atlantis_state::board_ctrl_w) } } if (LOG_IRQ) - logerror("%s:board_ctrl_w write to CTRL_POWER0 offset %04X = %08X & %08X bus offset = %08X\n", machine().describe_context(), newOffset, data, mem_mask, offset); + logerror("%s:board_ctrl_w write to CTRL_RESET offset %04X = %08X & %08X bus offset = %08X\n", machine().describe_context(), newOffset, data, mem_mask, offset); break; - case CTRL_POWER1: + case CTRL_VSYNC_CLEAR: + //VSYNC_IE (0x1) + //VSYNC_POL (0x2) off=negative true, on=positive true // 0x1 VBlank clear? if (changeData & 0x1) { if ((data & 0x0001) == 0) { - //uint32_t status_bit = (1 << VBLANK_IRQ_SHIFT); - uint32_t status_bit = (1 << 7); + uint32_t status_bit = (1 << VBLANK_IRQ_SHIFT); board_ctrl[CTRL_CAUSE] &= ~status_bit; board_ctrl[CTRL_STATUS] &= ~status_bit; update_asic_irq(); @@ -240,15 +244,15 @@ WRITE32_MEMBER(atlantis_state::board_ctrl_w) else { } } - if (LOG_IRQ) - logerror("%s:board_ctrl_w write to CTRL_POWER1 offset %04X = %08X & %08X bus offset = %08X\n", machine().describe_context(), newOffset, data, mem_mask, offset); + if (0 && LOG_IRQ) + logerror("%s:board_ctrl_w write to CTRL_VSYNC_CLEAR offset %04X = %08X & %08X bus offset = %08X\n", machine().describe_context(), newOffset, data, mem_mask, offset); break; - case CTRL_GLOBAL_EN: + case CTRL_IRQ_EN: // Zero bit will clear cause board_ctrl[CTRL_CAUSE] &= data; update_asic_irq(); if (LOG_IRQ) - logerror("%s:board_ctrl_w write to CTRL_GLOBAL_EN offset %04X = %08X & %08X bus offset = %08X\n", machine().describe_context(), newOffset, data, mem_mask, offset); + logerror("%s:board_ctrl_w write to CTRL_IRQ_EN offset %04X = %08X & %08X bus offset = %08X\n", machine().describe_context(), newOffset, data, mem_mask, offset); break; default: if (LOG_IRQ) @@ -423,7 +427,7 @@ READ32_MEMBER(atlantis_state::user_io_input) *************************************/ WRITE_LINE_MEMBER(atlantis_state::uart1_irq_callback) { - uint32_t status_bit = (1 << UART1_SHIFT); + uint32_t status_bit = UART1_IRQ_SHIFT; if (state && !(board_ctrl[CTRL_STATUS] & status_bit)) { board_ctrl[CTRL_STATUS] |= status_bit; update_asic_irq(); @@ -441,7 +445,7 @@ WRITE_LINE_MEMBER(atlantis_state::uart1_irq_callback) *************************************/ WRITE_LINE_MEMBER(atlantis_state::uart2_irq_callback) { - uint32_t status_bit = (1 << UART2_SHIFT); + uint32_t status_bit = UART2_IRQ_SHIFT; if (state && !(board_ctrl[CTRL_STATUS] & status_bit)) { board_ctrl[CTRL_STATUS] |= status_bit; update_asic_irq(); @@ -460,18 +464,14 @@ WRITE_LINE_MEMBER(atlantis_state::uart2_irq_callback) WRITE_LINE_MEMBER(atlantis_state::vblank_irq) { //logerror("%s: atlantis_state::vblank state = %i\n", machine().describe_context(), state); - if (1) { - if (state) { - board_ctrl[CTRL_STATUS] |= (1 << VBLANK_IRQ_SHIFT); - update_asic_irq(); - } - else { - board_ctrl[CTRL_STATUS] &= ~(1 << VBLANK_IRQ_SHIFT); - board_ctrl[CTRL_CAUSE] &= ~(1 << VBLANK_IRQ_SHIFT); - update_asic_irq(); - } - } else { - m_maincpu->set_input_line(VBLANK_IRQ_NUM, state); + if (state) { + board_ctrl[CTRL_STATUS] |= (1 << VBLANK_IRQ_SHIFT); + update_asic_irq(); + } + else { + board_ctrl[CTRL_STATUS] &= ~(1 << VBLANK_IRQ_SHIFT); + board_ctrl[CTRL_CAUSE] &= ~(1 << VBLANK_IRQ_SHIFT); + update_asic_irq(); } } @@ -479,12 +479,12 @@ WRITE_LINE_MEMBER(atlantis_state::zeus_irq) { //logerror("%s: atlantis_state::zeus_irq state = %i\n", machine().describe_context(), state); if (state) { - board_ctrl[CTRL_STATUS] |= (1 << ZEUS_IRQ_SHIFT); + board_ctrl[CTRL_STATUS] |= (1 << ZEUS0_IRQ_SHIFT); update_asic_irq(); } else { - board_ctrl[CTRL_STATUS] &= ~(1 << ZEUS_IRQ_SHIFT); - board_ctrl[CTRL_CAUSE] &= ~(1 << ZEUS_IRQ_SHIFT); + board_ctrl[CTRL_STATUS] &= ~(1 << ZEUS0_IRQ_SHIFT); + board_ctrl[CTRL_CAUSE] &= ~(1 << ZEUS0_IRQ_SHIFT); update_asic_irq(); } } @@ -522,21 +522,20 @@ WRITE_LINE_MEMBER(atlantis_state::ioasic_irq) *************************************/ void atlantis_state::update_asic_irq() { - // Uknown if CTRL_POWER1 is actually a separate power register. Skip it for now. - for (int irqIndex = 1; irqIndex <= 4; irqIndex++) { - uint32_t irqBits = (board_ctrl[CTRL_GLOBAL_EN] & board_ctrl[CTRL_POWER1 + irqIndex] & board_ctrl[CTRL_STATUS]); - uint32_t causeBits = (board_ctrl[CTRL_GLOBAL_EN] & board_ctrl[CTRL_POWER1 + irqIndex] & board_ctrl[CTRL_CAUSE]); - uint32_t currState = m_irq_state & (1 << irqIndex); + for (int irqIndex = 0; irqIndex < 3; irqIndex++) { + uint32_t irqBits = (board_ctrl[CTRL_IRQ_EN] & board_ctrl[CTRL_IRQ_MAP1 + irqIndex] & board_ctrl[CTRL_STATUS]); + uint32_t causeBits = (board_ctrl[CTRL_IRQ_EN] & board_ctrl[CTRL_IRQ_MAP1 + irqIndex] & board_ctrl[CTRL_CAUSE]); + uint32_t currState = m_irq_state & (2 << irqIndex); board_ctrl[CTRL_CAUSE] |= irqBits; if (irqBits && !currState) { - m_maincpu->set_input_line(MIPS3_IRQ0 + irqIndex, ASSERT_LINE); - m_irq_state |= (1 << irqIndex); + m_maincpu->set_input_line(MIPS3_IRQ1 + irqIndex, ASSERT_LINE); + m_irq_state |= (2 << irqIndex); if (LOG_IRQ) logerror("atlantis_state::update_asic_irq Asserting IRQ(%d) CAUSE = %02X\n", irqIndex, board_ctrl[CTRL_CAUSE]); } else if (!(causeBits) && currState) { - m_maincpu->set_input_line(MIPS3_IRQ0 + irqIndex, CLEAR_LINE); - m_irq_state &= ~(1 << irqIndex); + m_maincpu->set_input_line(MIPS3_IRQ1 + irqIndex, CLEAR_LINE); + m_irq_state &= ~(2 << irqIndex); if (LOG_IRQ) logerror("atlantis_state::update_asic_irq Clearing IRQ(%d) CAUSE = %02X\n", irqIndex, board_ctrl[CTRL_CAUSE]); } @@ -545,43 +544,36 @@ void atlantis_state::update_asic_irq() /************************************* * I/O Port control *************************************/ -READ32_MEMBER(atlantis_state::port_ctrl_r) +READ16_MEMBER(atlantis_state::port_ctrl_r) { uint32_t newOffset = offset >> 17; - uint32_t result = m_port_ctrl_reg[newOffset]; + uint32_t result = m_port_data; if (LOG_PORT) logerror("%s: port_ctrl_r newOffset = %02X data = %08X\n", machine().describe_context(), newOffset, result); return result; } -WRITE32_MEMBER(atlantis_state::port_ctrl_w) +WRITE16_MEMBER(atlantis_state::port_ctrl_w) { uint32_t newOffset = offset >> 17; - COMBINE_DATA(&m_port_ctrl_reg[newOffset]); switch (newOffset) { case 1: { uint32_t bits = ioport("KEYPAD")->read(); - m_port_ctrl_reg[2] = 0; + m_port_data = 0; if (!(data & 0x8)) - m_port_ctrl_reg[2] = bits & 7; // Row 0 + m_port_data = bits & 7; // Row 0 else if (!(data & 0x10)) - m_port_ctrl_reg[2] = (bits >> 4) & 7; // Row 1 + m_port_data = (bits >> 4) & 7; // Row 1 else if (!(data & 0x20)) - m_port_ctrl_reg[2] = (bits >> 8) & 7; // Row 2 + m_port_data = (bits >> 8) & 7; // Row 2 else if (!(data & 0x40)) - m_port_ctrl_reg[2] = (bits >> 12) & 7; // Row 3 + m_port_data = (bits >> 12) & 7; // Row 3 if (LOG_PORT) logerror("%s: port_ctrl_w Keypad Row Sel = %04X bits = %08X\n", machine().describe_context(), data, bits); break; } - case 3: - if (data==0x8f) - m_port_ctrl_reg[4] = ioport("AN.1")->read(); - else - m_port_ctrl_reg[4] = ioport("AN.0")->read(); - break; default: if (LOG_PORT) logerror("%s: port_ctrl_w write to offset %04X = %08X & %08X bus offset = %08X\n", machine().describe_context(), newOffset, data, mem_mask, offset); @@ -589,13 +581,38 @@ WRITE32_MEMBER(atlantis_state::port_ctrl_w) } } -CUSTOM_INPUT_MEMBER(atlantis_state::port_mod_r) +/************************************* +* A2D +*************************************/ +#define A2D_CTRL_COMPLETE 0x1 +#define A2D_CTRL_ENABLE 0x2 +#define A2D_CTRL_SINGLEND 0x4 +#define A2D_CTRL_UNIPOLAR 0x8 +#define A2D_CTRL_CHAN_SHIFT 4 +#define A2D_CTRL_CHAN_MASK 0x70 +#define A2D_CTRL_START 0x80 + +READ16_MEMBER(atlantis_state::a2d_ctrl_r) { - uint32_t bits = ioport((const char *)param)->read(); - //bits &= m_port_ctrl_reg[1]; - //bits >>= m_port_ctrl_reg[1]; - logerror("%s: port_mod_r read data %s = %08X m_port_ctrl_reg[1] = %08X\n", machine().describe_context(), (const char *)param, bits, m_port_ctrl_reg[1]); - return bits; + return A2D_CTRL_COMPLETE; +} + +WRITE16_MEMBER(atlantis_state::a2d_ctrl_w) +{ + if (data == 0x8f) + m_a2d_data = ioport("AN.1")->read(); + else + m_a2d_data = ioport("AN.0")->read(); +} + +READ16_MEMBER(atlantis_state::a2d_data_r) +{ + return m_a2d_data; +} + +WRITE16_MEMBER(atlantis_state::a2d_data_w) +{ + } /************************************* @@ -619,7 +636,6 @@ void atlantis_state::machine_start() // Save states save_item(NAME(m_irq_state)); save_item(NAME(board_ctrl)); - save_item(NAME(m_port_ctrl_reg)); } @@ -636,7 +652,6 @@ void atlantis_state::machine_reset() m_serial_count = 0; m_irq_state = 0; memset(board_ctrl, 0, sizeof(board_ctrl)); - memset(m_port_ctrl_reg, 0, sizeof(m_port_ctrl_reg)); } /************************************* @@ -644,39 +659,32 @@ void atlantis_state::machine_reset() *************************************/ static ADDRESS_MAP_START( map0, AS_PROGRAM, 32, atlantis_state ) AM_RANGE(0x00000000, 0x0001ffff) AM_READWRITE8(cmos_r, cmos_w, 0xff) + //AM_RANGE(0x00080000, 0x000?0000) AM_READWRITE8(zeus debug) AM_RANGE(0x00100000, 0x0010001f) AM_DEVREADWRITE8("uart1", ns16550_device, ins8250_r, ins8250_w, 0xff) // Serial UART1 (TL16C552 CS0) AM_RANGE(0x00180000, 0x0018001f) AM_DEVREADWRITE8("uart2", ns16550_device, ins8250_r, ins8250_w, 0xff) // Serial UART2 (TL16C552 CS1) //AM_RANGE(0x00200000, 0x0020001f) // Parallel UART (TL16C552 CS2) - AM_RANGE(0x00400000, 0x004000bf) AM_READWRITE8(blue_r, blue_w, 0xff) - AM_RANGE(0x00880000, 0x00c80003) AM_READWRITE(board_ctrl_r, board_ctrl_w) - //AM_RANGE(0x00880000, 0x00880003) // Sub-module Power0 - //AM_RANGE(0x00900000, 0x00900003) // Sub_module Power1 (Zeus or vblank?) - //AM_RANGE(0x00980000, 0x00980003) // IRQ1 Enable - //AM_RANGE(0x00a00000, 0x00a00003) // IRQ2 Enable - //AM_RANGE(0x00a80000, 0x00a80003) // IRQ3 Enable - //AM_RANGE(0x00b00000, 0x00b00003) // IRQ4 Enable Not Seen (Hardcoded to IDE?) - //AM_RANGE(0x00b80000, 0x00b80003) // IRQ Global Enable - //AM_RANGE(0x00c00000, 0x00c00003) // IRQ Cause - //AM_RANGE(0x00c80000, 0x00c80003) // IRQ Status + AM_RANGE(0x00400000, 0x007fffff) AM_READWRITE8(exprom_r, exprom_w, 0xff) // EXPROM + AM_RANGE(0x00800000, 0x00c80003) AM_READWRITE(board_ctrl_r, board_ctrl_w) AM_RANGE(0x00d80000, 0x00d80003) AM_READWRITE(status_leds_r, status_leds_w) AM_RANGE(0x00e00000, 0x00e00003) AM_READWRITE(cmos_protect_r, cmos_protect_w) - AM_RANGE(0x00e80000, 0x00e80003) AM_NOP // Watchdog? -ADDRESS_MAP_END + AM_RANGE(0x00e80000, 0x00e80003) AM_NOP // Watchdog + //AM_RANGE(0x00f00000, 0x00f00003) AM_NOP // Trackball ctrl + ADDRESS_MAP_END static ADDRESS_MAP_START( map1, AS_PROGRAM, 32, atlantis_state ) AM_RANGE(0x00000000, 0x0000003f) AM_DEVREADWRITE("ioasic", midway_ioasic_device, read, write) - // asic_fifo_w - // dcs3_fifo_full_w AM_RANGE(0x00200000, 0x00200003) AM_WRITE(dcs3_fifo_full_w) AM_RANGE(0x00400000, 0x00400003) AM_DEVWRITE("dcs", dcs_audio_device, dsio_idma_addr_w) AM_RANGE(0x00600000, 0x00600003) AM_DEVREADWRITE("dcs", dcs_audio_device, dsio_idma_data_r, dsio_idma_data_w) - AM_RANGE(0x00800000, 0x00a00003) AM_READWRITE(port_ctrl_r, port_ctrl_w) - //AM_RANGE(0x00800000, 0x00800003) // Written once = 0000fff8 - //AM_RANGE(0x00880000, 0x00880003) // Initial write 0000fff0, follow by sequence ffef, ffdf, ffbf, fff7. Row Select? - //AM_RANGE(0x00900000, 0x00900003) // Read once before each sequence write to 0x00880000. Code checks bits 0,1,2. Keypad? - //AM_RANGE(0x00980000, 0x00980003) // Read / Write. Bytes written 0x8f, 0xcf. Code if read 0x1 then read 00a00000. POTs? - //AM_RANGE(0x00a00000, 0x00a00003) - //AM_RANGE(0x00980000, 0x00980003) AM_NOP // AM_WRITE(asic_fifo_w) + AM_RANGE(0x00800000, 0x00900003) AM_READWRITE16(port_ctrl_r, port_ctrl_w, 0xffff) + //AM_RANGE(0x00880000, 0x00880003) // AUX Output Initial write 0000fff0, follow by sequence ffef, ffdf, ffbf, fff7. Row Select? + //AM_RANGE(0x00900000, 0x00900003) // AUX Input Read once before each sequence write to 0x00880000. Code checks bits 0,1,2. Keypad? + AM_RANGE(0x00980000, 0x00980003) AM_READWRITE16(a2d_ctrl_r, a2d_ctrl_w, 0xffff) // A2D Control Read / Write. Bytes written 0x8f, 0xcf. Code if read 0x1 then read 00a00000. + AM_RANGE(0x00a00000, 0x00a00003) AM_READWRITE16(a2d_data_r, a2d_data_w, 0xffff) // A2D Data + //AM_RANGE(0x00a80000, 0x00a80003) // Trackball Chan 0 16 bits + //AM_RANGE(0x00b00000, 0x00b00003) // Trackball Chan 1 16 bits + //AM_RANGE(0x00b80000, 0x00b80003) // Trackball Error 16 bits + //AM_RANGE(0x00c00000, 0x00c00003) // Trackball Pins 16 bits ADDRESS_MAP_END static ADDRESS_MAP_START(map2, AS_PROGRAM, 32, atlantis_state) @@ -684,7 +692,7 @@ static ADDRESS_MAP_START(map2, AS_PROGRAM, 32, atlantis_state) ADDRESS_MAP_END static ADDRESS_MAP_START( map3, AS_PROGRAM, 32, atlantis_state ) - //AM_RANGE(0x000000, 0xffffff) AM_READWRITE(blue_r, blue_w) + //AM_RANGE(0x000000, 0xffffff) ROMBUS ADDRESS_MAP_END /************************************* @@ -876,31 +884,31 @@ static MACHINE_CONFIG_START( mwskins, atlantis_state ) // TL16C552 UART MCFG_DEVICE_ADD("uart1", NS16550, XTAL_24MHz) - //MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("com1", rs232_port_device, write_txd)) - //MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE("com1", rs232_port_device, write_dtr)) - //MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE("com1", rs232_port_device, write_rts)) - //MCFG_INS8250_OUT_INT_CB(DEVWRITELINE(":", atlantis_state, uart1_irq_callback)) + MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("com1", rs232_port_device, write_txd)) + MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE("com1", rs232_port_device, write_dtr)) + MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE("com1", rs232_port_device, write_rts)) + MCFG_INS8250_OUT_INT_CB(DEVWRITELINE(":", atlantis_state, uart1_irq_callback)) MCFG_DEVICE_ADD("uart2", NS16550, XTAL_24MHz) - //MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("com2", rs232_port_device, write_txd)) - //MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE("com2", rs232_port_device, write_dtr)) - //MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE("com2", rs232_port_device, write_rts)) - //MCFG_INS8250_OUT_INT_CB(DEVWRITELINE(":", atlantis_state, uart2_irq_callback)) + MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("com2", rs232_port_device, write_txd)) + MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE("com2", rs232_port_device, write_dtr)) + MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE("com2", rs232_port_device, write_rts)) + MCFG_INS8250_OUT_INT_CB(DEVWRITELINE(":", atlantis_state, uart2_irq_callback)) - //MCFG_RS232_PORT_ADD("com1", default_rs232_devices, nullptr) - //MCFG_RS232_RXD_HANDLER(DEVWRITELINE("uart1", ins8250_uart_device, rx_w)) - //MCFG_RS232_DCD_HANDLER(DEVWRITELINE("uart1", ins8250_uart_device, dcd_w)) - //MCFG_RS232_DSR_HANDLER(DEVWRITELINE("uart1", ins8250_uart_device, dsr_w)) - //MCFG_RS232_RI_HANDLER(DEVWRITELINE("uart1", ins8250_uart_device, ri_w)) - //MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart1", ins8250_uart_device, cts_w)) + MCFG_RS232_PORT_ADD("com1", default_rs232_devices, nullptr) + MCFG_RS232_RXD_HANDLER(DEVWRITELINE("uart1", ins8250_uart_device, rx_w)) + MCFG_RS232_DCD_HANDLER(DEVWRITELINE("uart1", ins8250_uart_device, dcd_w)) + MCFG_RS232_DSR_HANDLER(DEVWRITELINE("uart1", ins8250_uart_device, dsr_w)) + MCFG_RS232_RI_HANDLER(DEVWRITELINE("uart1", ins8250_uart_device, ri_w)) + MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart1", ins8250_uart_device, cts_w)) //MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("com1", mwskins_comm) - //MCFG_RS232_PORT_ADD("com2", default_rs232_devices, nullptr) - //MCFG_RS232_RXD_HANDLER(DEVWRITELINE("uart2", ins8250_uart_device, rx_w)) - //MCFG_RS232_DCD_HANDLER(DEVWRITELINE("uart2", ins8250_uart_device, dcd_w)) - //MCFG_RS232_DSR_HANDLER(DEVWRITELINE("uart2", ins8250_uart_device, dsr_w)) - //MCFG_RS232_RI_HANDLER(DEVWRITELINE("uart2", ins8250_uart_device, ri_w)) - //MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart2", ins8250_uart_device, cts_w)) + MCFG_RS232_PORT_ADD("com2", default_rs232_devices, nullptr) + MCFG_RS232_RXD_HANDLER(DEVWRITELINE("uart2", ins8250_uart_device, rx_w)) + MCFG_RS232_DCD_HANDLER(DEVWRITELINE("uart2", ins8250_uart_device, dcd_w)) + MCFG_RS232_DSR_HANDLER(DEVWRITELINE("uart2", ins8250_uart_device, dsr_w)) + MCFG_RS232_RI_HANDLER(DEVWRITELINE("uart2", ins8250_uart_device, ri_w)) + MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart2", ins8250_uart_device, cts_w)) MACHINE_CONFIG_END @@ -918,7 +926,7 @@ ROM_START( mwskins ) DISK_IMAGE( "mwskins", 0, SHA1(5cb293a6fdb2478293f48ddfc93cdd018acb2bb5) ) ROM_END -ROM_START( mwskinsa ) +ROM_START( mwskinsaorig ) ROM_REGION32_LE( 0x80000, PCI_ID_NILE":rom", 0 ) /* 512k for R4310 code */ ROM_LOAD( "skins_game_u4_boot_1.00.u4", 0x000000, 0x080000, CRC(0fe87720) SHA1(4b24abbe662a2d7b61e6a3f079e28b73605ba19f) ) @@ -926,6 +934,14 @@ ROM_START( mwskinsa ) DISK_IMAGE( "mwskinsa", 0, SHA1(72497917b31156eb11a46bbcc6f22a254dcec044) ) ROM_END +ROM_START(mwskinsa) + ROM_REGION32_LE(0x80000, PCI_ID_NILE":rom", 0) /* 512k for R4310 code */ + ROM_LOAD("skins_game_u4_boot_1.00.u4", 0x000000, 0x080000, CRC(0fe87720) SHA1(4b24abbe662a2d7b61e6a3f079e28b73605ba19f)) + + DISK_REGION(PCI_ID_IDE":ide:0:hdd:image") + DISK_IMAGE( "mwskinsc", 0, SHA1(437bc145b7b852f7b4a1da35cab6569f4c357658) ) +ROM_END + ROM_START( mwskinso ) ROM_REGION32_LE( 0x80000, PCI_ID_NILE":rom", 0 ) /* 512k for R4310 code */ ROM_LOAD( "skins_game_u4_boot_1.00.u4", 0x000000, 0x080000, CRC(0fe87720) SHA1(4b24abbe662a2d7b61e6a3f079e28b73605ba19f) ) From 91ea57b4e42a2561388a119c3dd8ce9615262382 Mon Sep 17 00:00:00 2001 From: Ted Green Date: Fri, 6 Jan 2017 17:16:21 -0700 Subject: [PATCH 30/30] atlantis: Forgot to revert chd mod (nw) --- src/mame/drivers/atlantis.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mame/drivers/atlantis.cpp b/src/mame/drivers/atlantis.cpp index 4dc593db94d..48d237aabc0 100644 --- a/src/mame/drivers/atlantis.cpp +++ b/src/mame/drivers/atlantis.cpp @@ -926,7 +926,7 @@ ROM_START( mwskins ) DISK_IMAGE( "mwskins", 0, SHA1(5cb293a6fdb2478293f48ddfc93cdd018acb2bb5) ) ROM_END -ROM_START( mwskinsaorig ) +ROM_START( mwskinsa ) ROM_REGION32_LE( 0x80000, PCI_ID_NILE":rom", 0 ) /* 512k for R4310 code */ ROM_LOAD( "skins_game_u4_boot_1.00.u4", 0x000000, 0x080000, CRC(0fe87720) SHA1(4b24abbe662a2d7b61e6a3f079e28b73605ba19f) ) @@ -934,7 +934,7 @@ ROM_START( mwskinsaorig ) DISK_IMAGE( "mwskinsa", 0, SHA1(72497917b31156eb11a46bbcc6f22a254dcec044) ) ROM_END -ROM_START(mwskinsa) +ROM_START(mwskinsa_mod) ROM_REGION32_LE(0x80000, PCI_ID_NILE":rom", 0) /* 512k for R4310 code */ ROM_LOAD("skins_game_u4_boot_1.00.u4", 0x000000, 0x080000, CRC(0fe87720) SHA1(4b24abbe662a2d7b61e6a3f079e28b73605ba19f))