diff --git a/hash/apple2.xml b/hash/apple2.xml index c09fc978cb0..92bea14c535 100644 --- a/hash/apple2.xml +++ b/hash/apple2.xml @@ -7943,7 +7943,7 @@ - + Flash Spell Helicopter 1983 Microcomputer Workships Courseware diff --git a/hash/fidel_scc.xml b/hash/fidel_scc.xml index d6afe1e7d07..81afc3fb828 100644 --- a/hash/fidel_scc.xml +++ b/hash/fidel_scc.xml @@ -5,6 +5,18 @@ + + Challenger Book Openings 1 + 1982 + Fidelity Electronics + + + + + + + + Challenger Book Openings 2 1982 diff --git a/hash/fmtowns_cd.xml b/hash/fmtowns_cd.xml index b91d0f69335..66f3a331f86 100644 --- a/hash/fmtowns_cd.xml +++ b/hash/fmtowns_cd.xml @@ -2219,6 +2219,22 @@ User/save disks that can be created from the game itself are not included. + + Record of Lodoss War: Haiiro no Majo + 1994 + Humming Bird Soft + + + + + + + + + + + + Loom 1991 @@ -3205,6 +3221,57 @@ User/save disks that can be created from the game itself are not included. + + Rance III: Leazas Kanraku + 1992 + Alice Soft + + + + + + + + + Rance IV: Kyoudan no Isan + 1994 + Alice Soft + + + + + + + + + + + + + + Rance 4.1: Okusuri Koujou wo Sukue! + 1995 + Alice Soft + + + + + + + + + + Rance 4.2: Angel-gumi + 1995 + Alice Soft + + + + + + + + Ravenloft 1995 @@ -3227,6 +3294,294 @@ User/save disks that can be created from the game itself are not included. + + + Rainbow Islands Extra + 1992 + Ving + + + + + + + + + Regional Power II + 1992 + Cosmos + + + + + + + + + + Rejection: Den-no Senshi + 1992 + Sur de Wave + + + + + + + + + Return to Zork + 1994 + Data West + + + + + + + + + + Ring Out!! + 1995 + ZyX + + + + + + + + + Rocket Ranger + 1990 + Pony Canyon + + + + + + + + + Ryuutouden + 1994 + Fujitsu + + + + + + + + + Sayaka & Miho + 1994 + Fairytale + + + + + + + + + Scavenger 4 Demo Disc + 1993 + Fujitsu + + + + + + + + + Scavenger 4 + 1993 + Fujitsu + + + + + + + + + Scholar Movie Magazine + 1994 + King Records + + + + + + + + + + + + + + Schwarzschild + 1991 + Kogado + + + + + + + + + + + + + + Schwarzschild IV + 1993 + Kogado + + + + + + + + + Shangrlia 2 + 1993 + Elf + + + + + + + + + Sherlock Holmes: Consulting Detective + 1991 + Fujitsu + + + + + + + + + Shinc + 1993 + Libido + + + + + + + + + Shounen Magazine History + 1992 + Datt Japan + + + + + + + + + SimAnt + 1993 + Imagineer + + + + + + + + + SimCity + 1990 + Fujitsu + + + + + + + + + SimCity 2000 + 1994 + Fujitsu + + + + + + + + + SimEarth + 1991 + Imagineer + + + + + + + + + SimFarm + 1994 + Fujitsu + + + + + + + + + Silent Mobius + 1991 + Gainax + + + + + + + + + Sotsugyou '93: Graduation + 1993 + JHV + + + + + + + + + + + + Splatterhouse 1992 @@ -3238,6 +3593,88 @@ User/save disks that can be created from the game itself are not included. + + Super Odyssey + 1989 + Wave Train + + + + + + + + + Shadow of the Beast: Mashou no Okite + 1991 + Victor + + + + + + + + + + Shadow of the Beast II: Juushin no Jubaku + 1993 + Victor + + + + + + + + + Super Real Mahjong PII & PIII + 1992 + Ving + + + + + + + + + Super Real Mahjong PIV + 1994 + Ving + + + + + + + + + Space Rogue + 1990 + Wave Train + + + + + + + + + + Space Rogue (no disc check) + 1990 + Wave Train + + + + + + + Super Street Fighter II: The New Challengers 1994 @@ -3260,36 +3697,104 @@ User/save disks that can be created from the game itself are not included. - - SimCity - 1990 - Fujitsu - - - - - - - - - Shadow of the Beast: Mashou no Okite + + Super Shanghai: Dragon's Eye 1991 - Victor + Hot-B - + - - - Shadow of the Beast II: Juushin no Jubaku - 1993 - Victor + + + Samurai Spirits + 1995 + JHV + + + + + - + + + + + + + Super Shooting Towns + 1991 + Amorphous + + + + + + + + + Star Cruiser II: The Odysseus Project + 1994 + JHV + + + + + + + + + + + + + + Strike Commander + 1994 + Electronic Arts Victor + + + + + + + + + Strike Commander Plus + 1995 + Electronic Arts Victor + + + + + + + + + Stronghold + 1994 + Ving + + + + + + + + + Syndicate + 1994 + Electronic Arts Victor + + + diff --git a/hash/gameboy.xml b/hash/gameboy.xml index 215f55eb911..a9d12d837bf 100644 --- a/hash/gameboy.xml +++ b/hash/gameboy.xml @@ -4398,9 +4398,11 @@ Ocean + + - + @@ -15304,9 +15306,12 @@ Namco + + + - + diff --git a/hash/intv.xml b/hash/intv.xml index f8a0d47d26f..5156c513b6b 100644 --- a/hash/intv.xml +++ b/hash/intv.xml @@ -958,6 +958,25 @@ + + + Ms. Pac-Man + 1986 + <homebrew> + + + + + + + + + + + + + + Night Stalker diff --git a/hash/leapster.xml b/hash/leapster.xml index 8590842c0bc..fcbe2c23210 100644 --- a/hash/leapster.xml +++ b/hash/leapster.xml @@ -52,7 +52,7 @@ - + @@ -64,7 +64,7 @@ - + @@ -76,7 +76,7 @@ - + @@ -88,7 +88,7 @@ - + @@ -100,7 +100,7 @@ - + @@ -112,7 +112,7 @@ - + @@ -124,7 +124,7 @@ - + @@ -136,7 +136,7 @@ - + @@ -148,7 +148,7 @@ - + @@ -160,7 +160,7 @@ - + @@ -172,19 +172,31 @@ - + - + Disney Prinzessinnen - Zauberhaftes Lernen (Ger) 2003 LeapFrog - + + + + + + + Disney Princess - Worlds of Enchantment (USA) + 2007? + LeapFrog + + + + @@ -196,19 +208,31 @@ - + + + + + + + Finding Nemo (USA) + 2005? + LeapFrog + + + + - + Findet Nemo (Ger) 2003 LeapFrog - + @@ -220,7 +244,7 @@ - + @@ -232,7 +256,19 @@ - + + + + + + + Go Diego Go! - Animal Rescuer (USA) + 2007? + LeapFrog + + + + @@ -244,7 +280,7 @@ - + @@ -256,7 +292,7 @@ - + @@ -268,7 +304,7 @@ - + @@ -280,7 +316,19 @@ - + + + + + + + Lernst du Malen & Schreiben - Mit Bruno Bleistift (Ger) + 2004? + LeapFrog + + + + @@ -292,7 +340,7 @@ - + @@ -304,7 +352,7 @@ - + @@ -316,7 +364,7 @@ - + @@ -328,7 +376,7 @@ - + @@ -340,7 +388,7 @@ - + @@ -352,7 +400,7 @@ - + @@ -364,7 +412,7 @@ - + @@ -376,7 +424,7 @@ - + @@ -388,19 +436,31 @@ - + + + + + + + Spider-Man - The Case of the Sinister Speller (USA) + 2003 + LeapFrog + + + + - + Spider-Man - Schachmatt den Schildersaboteuren! (Ger) 2003 LeapFrog - + @@ -412,7 +472,7 @@ - + @@ -424,7 +484,31 @@ - + + + + + + + Toy Story 3 (USA) + 2010? + LeapFrog + + + + + + + + + + Wall-E (Ger) + 2008? + LeapFrog + + + + @@ -436,7 +520,7 @@ - + @@ -448,7 +532,7 @@ - + @@ -460,7 +544,7 @@ - + @@ -472,7 +556,7 @@ - + @@ -480,4 +564,16 @@ + + Numbers on the Run - Counting on Zero (USA, L-MAX) + 2005? + LeapFrog + + + + + + + + diff --git a/hash/megadriv.xml b/hash/megadriv.xml index 937dc572cf0..95e4295fac9 100644 --- a/hash/megadriv.xml +++ b/hash/megadriv.xml @@ -13786,6 +13786,17 @@ but dumps still have to be confirmed. + + + Death Duel (USA, Prototype 19920506) + 1992 + Razorsoft + + + + + + Demolition Man (USA, Prototype) @@ -15011,6 +15022,17 @@ but dumps still have to be confirmed. + + European Club Soccer (Euro, Prototype 19911025) + 1992 + Virgin Games + + + + + + + J. League Champion Soccer (Jpn) 1993 @@ -16335,6 +16357,17 @@ but dumps still have to be confirmed. + + Growl (USA, Prototype 19910826) + 1991 + Taito + + + + + + + Runark (Jpn, Kor) 1991 @@ -16542,6 +16575,18 @@ but dumps still have to be confirmed. + + + + Home Alone 2 - Lost in New York (USA, Prototype 19930929) + 1993 + Sega + + + + + + Honoo no Toukyuuji - Dodge Danpei (Jpn) @@ -21387,6 +21432,17 @@ Notice that these are not working on real hardware due to bugged code with VDP i + + + Paperboy (USA, Prototype 19911028) + 1992 + Tengen + + + + + + Paperboy (Jpn) @@ -22557,6 +22613,17 @@ Notice that these are not working on real hardware due to bugged code with VDP i + + R.B.I. Baseball 3 (USA, Prototype 19910718) + 1991 + Tengen + + + + + + + R.B.I. Baseball 4 (USA) 1992 @@ -22763,6 +22830,19 @@ Notice that these are not working on real hardware due to bugged code with VDP i + + + + Stimpy's Invention Starring Starring Ren Hoëk & Stimpy (Euro, Prototype 19931209) + 1993 + Sega + + + + + + + Stimpy's Invention Starring Starring Ren Hoëk & Stimpy (USA) @@ -23137,6 +23217,17 @@ Notice that these are not working on real hardware due to bugged code with VDP i + + + RoadBlasters (USA, Prototype 19910627) + 1992 + Tengen + + + + + + RoadBlasters (Jpn) @@ -25096,6 +25187,17 @@ Notice that these are not working on real hardware due to bugged code with VDP i + + + Speedball 2 - Brutal Deluxe (USA, Prototype 19910607) + 1991 + Arena + + + + + + Spider-Man (Euro, USA) @@ -25250,6 +25352,17 @@ Notice that these are not working on real hardware due to bugged code with VDP i + + Pat Riley Basketball (USA, Prototype 19900614) + 1990 + Sega + + + + + + + Star Control (USA) 1991 @@ -26229,6 +26342,17 @@ Notice that these are not working on real hardware due to bugged code with VDP i + + + Tommy Lasorda Baseball (USA, Prototype 19890430) + 1989 + Sega + + + + + + Super Mario World ~ Super Mario Bros. (Pirate, Alt) @@ -27377,6 +27501,18 @@ Notice that these are not working on real hardware due to bugged code with VDP i + + + + Toe Jam & Earl in Panic on Funkotron (Prototype 19930911) + 1993 + Sega + + + + + + Toki - Going Ape Spit ~ JuJu Densetsu (World, Rev. A) @@ -27713,6 +27849,17 @@ Notice that these are not working on real hardware due to bugged code with VDP i + + Turbo Out Run (Prototype, 19911209) + 1992 + Sega + + + + + + + Turrican (Euro, USA) 1991 diff --git a/hash/nes.xml b/hash/nes.xml index 806bd8e14c1..6bd8909bfef 100644 --- a/hash/nes.xml +++ b/hash/nes.xml @@ -50741,6 +50741,24 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx + + Pipe 5 (Aus) + 19?? + HES + + + + + + + + + + + + + + Fun Blaster Pak (Aus) 19?? @@ -52259,7 +52277,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx - + Pipe 5 (Tw) 19?? Sachen @@ -53289,9 +53307,9 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx - Policeman (Tw) + Policeman (Spa, Tw) 19?? - TXC Corp + Gluk Video / TXC Corp @@ -53307,24 +53325,6 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx - - Policeman (Spa) - 19?? - Gluk Video - - - - - - - - - - - - - - Thunder Warrior (Tw) 19?? diff --git a/hash/pet_cass.xml b/hash/pet_cass.xml index a41ed204d6b..1420d2aa123 100644 --- a/hash/pet_cass.xml +++ b/hash/pet_cass.xml @@ -304,11 +304,11 @@ - + Cursor 11 1979 - + The Code Works @@ -317,11 +317,11 @@ - + Cursor 12 1979 - + The Code Works @@ -369,11 +369,11 @@ - + Cursor 16 1980 - + The Code Works @@ -2775,11 +2775,11 @@ - + Seawolf 1978 - + Creative Software @@ -2841,8 +2841,8 @@ - - + + @@ -2860,6 +2860,19 @@ + + Supermon + 1979 + Toronto PET User Group + + + + + + + + + Soundware Checkers 1978 diff --git a/hash/pippin.xml b/hash/pippin.xml index 5516565c3df..1f32db3bcb8 100644 --- a/hash/pippin.xml +++ b/hash/pippin.xml @@ -25,7 +25,7 @@ NOTE: This list is here only to document available dumps and it's not used (yet) Home Improvement 1-2-3 ? ? ? Katz Pippin Demo CD 2.0 ? Kats-X01 ? Internet Kit Ver. 1.1 Bandai BDB-010 ? - Jungle Park ? BDE-10013 ? + Jungle Park Bandai BDE-10013 ? LuLu ? BDS-20039 ? Mac Fan Pippin - Pippin Title Demo ? ? ? Mission School R ? BDS-20035 ? @@ -59,6 +59,7 @@ NOTE: This list is here only to document available dumps and it's not used (yet) 1997 Bandai + @@ -105,8 +106,9 @@ NOTE: This list is here only to document available dumps and it's not used (yet) 1995.1.17 Hanshin Daishinsai (Jpn) 1996 - <unknown> + Keikakudo + @@ -119,6 +121,7 @@ NOTE: This list is here only to document available dumps and it's not used (yet) 1996 Bandai + @@ -131,6 +134,7 @@ NOTE: This list is here only to document available dumps and it's not used (yet) 1996 ASG + @@ -143,6 +147,7 @@ NOTE: This list is here only to document available dumps and it's not used (yet) 1996 Bandai + @@ -150,38 +155,41 @@ NOTE: This list is here only to document available dumps and it's not used (yet) - - Anpanman no AIUEO-N! (Jpn) + + Anpanman no AIUEO~N! (Jpn) 1996 - <unknown> + Bandai + - + - - Anpanman to asobou! 1 (Jpn) + + Anpanman to Asobou! 1 (Jpn) 1996 - <unknown> + Bandai + - + - - Anpanman to asobou! 2 (Jpn) + + Anpanman to Asobou! 2 (Jpn) 1996 - <unknown> + Bandai + - + @@ -191,6 +199,7 @@ NOTE: This list is here only to document available dumps and it's not used (yet) 1996 Bandai + @@ -203,6 +212,7 @@ NOTE: This list is here only to document available dumps and it's not used (yet) 1996 Bandai + @@ -215,6 +225,7 @@ NOTE: This list is here only to document available dumps and it's not used (yet) 1996 Bandai + @@ -225,8 +236,9 @@ NOTE: This list is here only to document available dumps and it's not used (yet) Chisato Moritaka CD-Rom Watarase Bashi (Jpn) 1996 - <unknown> + Oracion + @@ -237,8 +249,9 @@ NOTE: This list is here only to document available dumps and it's not used (yet) Circus! (Jpn) 1996 - <unknown> + Voyager + @@ -261,8 +274,9 @@ NOTE: This list is here only to document available dumps and it's not used (yet) Dazzeloids (Jpn) 1996 - <unknown> + Voyager + @@ -270,14 +284,14 @@ NOTE: This list is here only to document available dumps and it's not used (yet) - + EGWord Pure (Jpn, Ver. 1.0) 1996 <unknown> - + @@ -306,14 +320,15 @@ NOTE: This list is here only to document available dumps and it's not used (yet) - + Fortullia (Jpn) 1996 Bandai + - + @@ -321,8 +336,9 @@ NOTE: This list is here only to document available dumps and it's not used (yet) Funky Funny Aliens (Jpn) 1996 - Bandai + Amuse + @@ -333,7 +349,7 @@ NOTE: This list is here only to document available dumps and it's not used (yet) Gadget (Jpn) 1996 - <unknown> + Synergy Ikunangaku @@ -342,14 +358,15 @@ NOTE: This list is here only to document available dumps and it's not used (yet) - - Gakko no Kowai Uwasa: Hanako-san ga Kita!! (Jpn) + + Gakko no Kowai Uwasa - Hanako-san ga Kita!! (Jpn) 1996 - Bandai + Amuse + - + @@ -366,38 +383,41 @@ NOTE: This list is here only to document available dumps and it's not used (yet) - - Gundam Tactics: Mobility Fleet0079 (Jpn) + + Gundam Tactics - Mobility Fleet0079 (Jpn) 1996 Bandai + - + - - Gundam Tactics: Mobility Fleet0079 (Jpn, Alt) + + Gundam Tactics - Mobility Fleet0079 (Jpn, Alt) 1996 Bandai + - + - + Gundam Virtual Modeler Light (Jpn) 1996 Bandai + - + @@ -405,8 +425,9 @@ NOTE: This list is here only to document available dumps and it's not used (yet) Kids Box (Jpn) 1996 - Bandai + Ask Kodansha + @@ -419,6 +440,7 @@ NOTE: This list is here only to document available dumps and it's not used (yet) 1996 Bandai + @@ -453,7 +475,7 @@ NOTE: This list is here only to document available dumps and it's not used (yet) L-Zone (Jpn) 1996 - Bandai + Synergy Ikunangaku @@ -510,35 +532,38 @@ NOTE: This list is here only to document available dumps and it's not used (yet) - - Mobile Suit Gundam: Zion Dukedom Military-File (Jpn) + + Mobile Suit Gundam - Zion Dukedom Military-File (Jpn) 1996 Bandai + - + - - Mobile Suit Gundam: White Base (Jpn) + + Mobile Suit Gundam - White Base (Jpn) 1996 Bandai + - + - Music Island: Vol. 1 (Prokofiev Peter & the Wolf) (Jpn) + Music Island Vol. 1 (Prokofiev Peter & the Wolf) (Jpn) 1996 - Oracion Inc. + Oracion + @@ -547,10 +572,11 @@ NOTE: This list is here only to document available dumps and it's not used (yet) - Music Island: Vol. 2 (Tchaikovsky The Nutcracker) (Jpn) + Music Island Vol. 2 (Tchaikovsky The Nutcracker) (Jpn) 1996 - Oracion Inc. + Oracion + @@ -559,10 +585,11 @@ NOTE: This list is here only to document available dumps and it's not used (yet) - Music Island: Vol. 3 (Vivaldi The Four Seasons) (Jpn) + Music Island Vol. 3 (Vivaldi The Four Seasons) (Jpn) 1996 - Oracion Inc. + Oracion + @@ -571,10 +598,11 @@ NOTE: This list is here only to document available dumps and it's not used (yet) - Music Island: Vol. 4 (Saint-Saens Carnival of the Animals) (Jpn) + Music Island Vol. 4 (Saint-Saens Carnival of the Animals) (Jpn) 1996 - Oracion Inc. + Oracion + @@ -582,14 +610,15 @@ NOTE: This list is here only to document available dumps and it's not used (yet) - + Nemurenu Yoru no Chiisana Ohanashi (Jpn) 1996 - <unknown> + Amuse + - + @@ -743,6 +772,7 @@ NOTE: This list is here only to document available dumps and it's not used (yet) 1996 Bandai + @@ -750,11 +780,12 @@ NOTE: This list is here only to document available dumps and it's not used (yet) - + SD Gundam Wars (Jpn) 1996 Bandai + @@ -767,6 +798,7 @@ NOTE: This list is here only to document available dumps and it's not used (yet) 1996 Bandai + @@ -777,8 +809,9 @@ NOTE: This list is here only to document available dumps and it's not used (yet) SeesawC 1 - My favorite things - Sukinamonodake Eitango 120 (Jpn) 1996 - <unknown> + Aigaareba Daijoubu + @@ -789,8 +822,9 @@ NOTE: This list is here only to document available dumps and it's not used (yet) SeesawC 2 - My favorite places - Sukinatokorode Eitango 400 (Jpn) 1996 - <unknown> + Aigaareba Daijoubu + @@ -801,8 +835,9 @@ NOTE: This list is here only to document available dumps and it's not used (yet) Shichisokusen (Jpn) 1996 - <unknown> + Media Five + @@ -811,10 +846,11 @@ NOTE: This list is here only to document available dumps and it's not used (yet) - Shockwave: Invasion Earth 2019 (Jpn) + Shockwave - Invasion Earth 2019 (Jpn) 1996 - Electronic Arts + Electronic Arts Victor + @@ -848,9 +884,10 @@ NOTE: This list is here only to document available dumps and it's not used (yet) T-Break (Jpn) - 19?? - Infocity + 1996 + Infocity + @@ -860,9 +897,11 @@ NOTE: This list is here only to document available dumps and it's not used (yet) Tamagotchi CD-ROM (Jpn) - 19?? + 1997 Bandai + + @@ -872,9 +911,10 @@ NOTE: This list is here only to document available dumps and it's not used (yet) Tropic Island (Jpn) - 19?? - <unknown> + 1996 + Momoderazu Brand + @@ -887,6 +927,7 @@ NOTE: This list is here only to document available dumps and it's not used (yet) 1996 Bandai + @@ -955,10 +996,11 @@ NOTE: This list is here only to document available dumps and it's not used (yet) - Ultraman: The Digital Board Game (Jpn) + Ultraman - The Digital Board Game (Jpn) 1996 Bandai + @@ -967,10 +1009,11 @@ NOTE: This list is here only to document available dumps and it's not used (yet) - Ultraman: The Digital Board Game (Jpn, Alt) + Ultraman - The Digital Board Game (Jpn, Alt) 1996 Bandai + @@ -983,6 +1026,7 @@ NOTE: This list is here only to document available dumps and it's not used (yet) 1996 Bandai + @@ -993,8 +1037,9 @@ NOTE: This list is here only to document available dumps and it's not used (yet) Victorian Park (Jpn) 1996 - <unknown> + Bandai + @@ -1024,8 +1069,9 @@ NOTE: This list is here only to document available dumps and it's not used (yet) Yellow Brick Road I (Jpn) 1996 - <unknown> + Synergy Ikunangaku + @@ -1034,10 +1080,11 @@ NOTE: This list is here only to document available dumps and it's not used (yet) - Yellow Brick Road II CD1 (Jpn) + Yellow Brick Road II - Glinda to Nishi no Majo (Jpn) 1996 - <unknown> + Synergy Ikunangaku + @@ -1055,7 +1102,7 @@ NOTE: This list is here only to document available dumps and it's not used (yet) Yellows - Akira Gomi Photographs (Jpn) 1996 - <unknown> + Digitalogue @@ -1067,8 +1114,9 @@ NOTE: This list is here only to document available dumps and it's not used (yet) Yellows 2.0 - Tokyo 1993 Akira Gomi Photographs (Jpn) 1996 - <unknown> + Digitalogue + @@ -1077,10 +1125,11 @@ NOTE: This list is here only to document available dumps and it's not used (yet) - Yoku Mite Goran (Jpn) + Yoku Mite Goran! (Jpn) 1996 - <unknown> + Voyager + @@ -1089,10 +1138,11 @@ NOTE: This list is here only to document available dumps and it's not used (yet) - Zukkoke Sanningumi: Drama Satsujin Jiken (Jpn) + Zukkoke Sanningumi - Drama Satsujin Jiken (Jpn) 1996 - <unknown> + Bandai + diff --git a/hash/psx.xml b/hash/psx.xml index 719deac3177..89a71ca0039 100755 --- a/hash/psx.xml +++ b/hash/psx.xml @@ -10376,7 +10376,7 @@ Furthermore, for an overview of US PS1 discs that have not been dumped and added - + + Gran Turismo (USA, v1.0) + 1998 + Sony Computer Entertainment America + + + + + + + + + - Gran Turismo (USA, v1.0) - 1998 - Sony Computer Entertainment America - - - - - - - - @@ -34238,6 +34238,20 @@ List of unclassified roms + + + Arabian Nights - Sabaku no Seirei Ou (Jpn, Prototype) + 1996 + Takara + + + + + + + + + Araiguma Rascal (Jpn) @@ -37650,6 +37664,33 @@ List of unclassified roms + + + Down the World - Mervil's Ambition (Jpn, Rolling Demo) + 1994 + ASCII Entertainment + + + + + + + + + + + + + + + + + + + + + + Downtown Nekketsu Baseball Monogatari - Yakyuu de Shoubu da! Kunio-kun (Jpn) @@ -40242,6 +40283,20 @@ List of unclassified roms + + + Ganpuru - Gunman's Proof (Jpn, Prototype) + 1997 + ASCII Entertainment + + + + + + + + + Ganso Pachi-Slot Nihonichi (Jpn) @@ -60960,6 +61015,20 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20 + + + Touge Densetsu - Saisoku Battle (Jpn, Prototype) + 1996 + Bullet-Proof Software + + + + + + + + + Tower Dream (Jpn) @@ -61842,6 +61911,21 @@ to ensure nothing has been touched in the Retro Quest cart production in 2013/20 + + + Umizuri Meijin - Suzuki Hen (Jpn, Prototype) + 1994 + Electronic Arts Victor + + + + + + + + + + Undake 30 Same Game Daisakusen - Mario Version (Jpn, Not for sale) diff --git a/hash/vsmile_cart.xml b/hash/vsmile_cart.xml index 568f4d176c7..dfa15253dd6 100644 --- a/hash/vsmile_cart.xml +++ b/hash/vsmile_cart.xml @@ -693,13 +693,12 @@ V.Smile Smartbooks 80-089060(US) | Scooby-Doo! - A Night of Fright is no Delight - -/*V.Baby (NOT V.Smile Baby) +V.Baby (NOT V.Smile Baby) 80-107100-001(US) | Meet Me at the Zoo (Orange, V.Baby packin) 80-220000(US) | The World of Eric Carle - The Very Hungry Caterpillar 80-220600(US) | Backyardigans 80-220700(US) | Noah's Ark - Animal Adventures 80-220800(US) | Mother Goose -*/ --> @@ -1046,9 +1045,20 @@ V.Smile Smartbooks + + + Kleine Einsteins (Ger) + 200? + VTech + + + + + + - The Lion King - Simba's Big Adventure (USA) + Disney The Lion King - Simba's Big Adventure (USA) 200? VTech @@ -1059,7 +1069,7 @@ V.Smile Smartbooks - Løvernes Konge - Simbas store eventyr (Den) + Disney Løvernes Konge - Simbas Store Eventyr (Den) 200? VTech @@ -1069,6 +1079,17 @@ V.Smile Smartbooks + + Disney Lejonkungen - Simbas Stora Äventyr (swe) + 200? + VTech + + + + + + + Meister Manny's Werkzeugkiste (Ger) 200? @@ -1299,6 +1320,17 @@ V.Smile Smartbooks + + + Shrek - Le Rhume de Dragonne (Fra) + 200? + VTech + + + + + + Spider-Man & Ses Amis - Missions Secrètes (Fra) @@ -1409,6 +1441,17 @@ V.Smile Smartbooks + + + Tingeling (Swe) + 200? + VTech + + + + + + Toy Story 2 - Woodys Spannende Rettung (Ger) @@ -1464,6 +1507,17 @@ V.Smile Smartbooks + + + My Friends Tigger & Pooh - Die Honigjagd (Ger) + 200? + VTech + + + + + + Winnie l'Ourson - La Chasse au Miel de Winnie (Fra) @@ -1580,6 +1634,7 @@ V.Smile Smartbooks + @@ -1603,6 +1658,17 @@ V.Smile Smartbooks + + + Kleine Einsteins (Ger) (V.Smile Motion) + 200? + VTech + + + + + + diff --git a/hash/vsmile_cd.xml b/hash/vsmile_cd.xml index 735700a3519..74ad7c6e20f 100644 --- a/hash/vsmile_cd.xml +++ b/hash/vsmile_cd.xml @@ -74,34 +74,11 @@ Language: --> - - - The Incredibles - Mission Incredible (USA) - 200? - VTech - - - - - - - - - - Scooby-Doo! Ancient Adventure (USA) - 200? - VTech - - - - - - - - + + The Amazing Spider-Man - Countdown to Doom (USA) 200? VTech @@ -113,8 +90,71 @@ Language: + + + Spider-Man - Angriff der Super-Schurken (Ger) + 200? + VTech + + + + + + + + + + + + The Incredibles - Mission Incredible (USA) + 200? + VTech + + + + + + + + + + + Die Unglaublichen - In unglaublicher Mission (Ger) + 200? + VTech + + + + + + + + + + + + Scooby-Doo! Ancient Adventure (USA) + 200? + VTech + + + + + + + + - + + Wacky Race on Jumpin' Bean Island (USA) 200? VTech @@ -127,39 +167,89 @@ Language: + Cars - Auf der Überholspur (Ger) 200? VTech - + - - Shrek - Der Dritte (Ger) + + + Shrek Der Dritte - Die Suche nach Arthus (Ger) 200? VTech - + + Multisports (Ger) 200? VTech - + + + + + + + + Disney Princess - Das zauberhafte Märchen-Abenteuer (Ger) + 200? + VTech + + + + + + + + + + + Das verrückte Rennen der Hüpf-Bohnel Insel (Ger) + 200? + VTech + + + + + diff --git a/plugins/hiscore/hiscore.dat b/plugins/hiscore/hiscore.dat index a393320b067..f5771436f98 100644 --- a/plugins/hiscore/hiscore.dat +++ b/plugins/hiscore/hiscore.dat @@ -99,7 +99,6 @@ smissw: ;*******(sidearms & clones) sidearms: -sidearmsr: sidearmsur1: @:maincpu,program,e682,4e,00,03 @:maincpu,program,e601,7,00,00 @@ -206,7 +205,7 @@ raiden2eu: arescue: arescuej: -@:maincpu,program,20fb00,9f,a0,49 +@:mainpcb:maincpu,program,20fb00,9f,a0,49 fixeightbl: fixeight: @@ -342,8 +341,8 @@ passshta: cencourt: @:maincpu,program,ffec00,59e,4d,41 -bombsa: ;not working yet ?? -d84c,3c,17,00 +;bombsa: ;not working yet ?? +;d84c,3c,17,00 ;(super toffy) (by GeoMan) stoffyu: @@ -719,7 +718,6 @@ snowbrosb: snowbrosc: snowbrosd: wintbob: -snowbros3: snowbro3: ballboy: snowbroswb: @@ -848,7 +846,6 @@ chamburger: spacefb: spacefbb: spacefbe: -spacefbu: spacefbe2: starwarr: @:maincpu,program,c0a0,1e,00,00 @@ -869,10 +866,7 @@ spacefba: ;********rastan.c rastan: ;[Special thanks to Wob for enhancing this entry] rastanu: -rastanu2: rastsaga: -rastsaga1: -rastan2: rastanua: rastanub: rastsagaa: @@ -1050,10 +1044,10 @@ karnova: @:maincpu,program,063D00,28,00,4A hvyunit: -hvyunito: +hvyunitjo: hvyunitu: hvyunitj: -@:maincpu,program,e190,28,00,50 +@:master,program,e190,28,00,50 rumba: ;****** not working - mame 040u3 debug prob ??? @:maincpu,program,e18a,3,40,01 @@ -1067,8 +1061,8 @@ rumba: ;****** not working - mame 040u3 debug prob ??? skykiddx: skykiddxo: -@:maincpu,program,5000,45,00,2f -@:maincpu,program,5001,1,03,03 +@:cpu1,program,5000,45,00,2f +@:cpu1,program,5001,1,03,03 bygone: ;***** GAME NOT 100% working yet !! ***** @:maincpu,program,e0c0,3c,00,47 @@ -1086,8 +1080,8 @@ berenstn: orunners: orunnersu: orunnersj: -@:maincpu,program,20e301,3b,53,75 -@:maincpu,program,20e212,1,78,78 +@:mainpcb:maincpu,program,20e301,3b,53,75 +@:mainpcb:maincpu,program,20e212,1,78,78 hotshock: hotshockb: @@ -1117,13 +1111,9 @@ polepos2: ;********polepos.c (pole position 2) polepos2b: polepos2a: -poleps2c: -poleps2a: @:maincpu,program,3000,7f2,d0,a2 ;********polepos.c (pole position) -polepos1: -poleposa: poleposa1: poleposa2: @:maincpu,program,3000,7f2,b0,95 @@ -1179,7 +1169,6 @@ kodb: @:maincpu,program,ff9d94,28,00,04 tharrier: -tharrierj: @:maincpu,program,f9100,80,00,4e ssf2mdb: @@ -1188,7 +1177,7 @@ ssf2mdb: spidman: spidmanu: spidmanj: -@:maincpu,program,208c00,7f,a0,57 +@:mainpcb:maincpu,program,208c00,7f,a0,57 ;** hiscore & top score don`t update until you lose your first life, pretty ** ;** lame way for doing a hiscore - but who am i to complain!! ;0) ** @@ -1227,10 +1216,10 @@ crazyblk: @:maincpu,program,8401,a9,00,0a @:maincpu,program,a013,6,00,00 -getstar: +grdian: getstarj: -gtstarb1: -gtstarb2: +getstarb1: +getstarb2: @:maincpu,program,c0d2,48,00,00 @:maincpu,program,c110,1,0a,0a @:maincpu,program,c0ca,1,17,17 @@ -1242,7 +1231,7 @@ galsnewk: @:maincpu,program,c825b6,64,30,31 destryer: -@:maincpu,program,20e5,2,ff,ff +@:cdp1802,program,20e5,2,ff,ff blockgal: blockgalb: @@ -1288,8 +1277,8 @@ anteaterg: @:maincpu,program,4ef,3c,00,20 altair: -@:maincpu,program,30e5,2,00,00 -@:maincpu,program,3008,1,58,58 +@:cdp1802,program,30e5,2,00,00 +@:cdp1802,program,3008,1,58,58 sundance: ;[Special thanks to Cananas for creating this entry] @:maincpu,program,0151,01,12,12 @@ -1481,7 +1470,6 @@ ckongpt2b: ckongalc: ckongs: ckongg: -kkgalax: ckongpt2j: ;******Crazy Kong Part II (Japan) ckong: ckongmc: @@ -1594,17 +1582,14 @@ vamphalf: ;******Vamf x1/2 (Europe) vamphalfk: ;******Vamf x1/2 (korea) @:maincpu,program,5ae6c,3a,00,03 -turbosba: ;******Turbo Sub (prototype rev. TSC6) -@:maincpu,program,3c7a,46,00,56 - stratvox: -stratvxb: +stratvoxb: speakres: spacecho2: ;******space echo (set 1) spacecho: ;******space echo (set 2) speakresb: -@:maincpu,program,4001,3,00,00 -@:maincpu,program,4010,3,00,00 +@:cpu1,program,4001,3,00,00 +@:cpu1,program,4010,3,00,00 rtype: rtypeu: @@ -1618,7 +1603,6 @@ rtypejp: dkong: dkongjo: dkongj: -dkongjpo: dkongo: dkongjo1: dkongf: ;******Donkey Kong Foundry (hack) @@ -1643,7 +1627,6 @@ centipdb: centiped2: centiped3: centiped: -centtime: centipdd: ;******Centipede Dux (hack) @:maincpu,program,000b,0f,10,01 @:maincpu,program,0023,0f,04,12 @@ -1724,7 +1707,6 @@ sfz2h: sfz2j: sfz2jr1: sfz2n: -sfz2aad: sfz2al: sfz2alb: sfz2alh: @@ -1750,7 +1732,6 @@ sfzh: @:maincpu,program,ffaea0,9f,01,16 sfa3: -sfa3r1: sfz3j: sfz3jr1: sfz3a: @@ -1799,7 +1780,6 @@ sf2amf2: sf2ceblp: sf2mdtb: sf2m9: -sf2mdtc: @:maincpu,program,ffd276,28,00,20 @:maincpu,program,ffd2c6,14,ff,96 @:maincpu,program,ffd2ee,04,00,00 @@ -2029,11 +2009,10 @@ wonder3: @:maincpu,program,ff0dae,0c,00,00 tnzs: -tnzsb: tnzsj: -tnzsjn: tnzsjo: @:maincpu,program,e68d,23,00,55 + tnzso: tnzsop: @:maincpu,program,ec0a,23,00,55 @@ -2135,7 +2114,6 @@ wofa: wofj: wofhfh: ;******Sangokushi II: Huo Fenghuang (Chinese bootleg) wofr1: -wofhfb: @:maincpu,program,ff6368,0a,00,00 @:maincpu,program,ff77d8,78,ff,10 @:maincpu,program,ff63d4,04,00,00 @@ -2173,7 +2151,6 @@ mpangr1: smgp: smgpja: smgpj: -smgpu3: smgpu2: smgpu1: smgpu: @@ -2184,17 +2161,16 @@ smgp6: wrally: ;******world rally (set1) wrallya: ;******world rally (set 2) -wrallyb: l******world rally (us, 930217) +wrallyb: ;******world rally (us, 930217) @:maincpu,program,fef558,288,5a,ff ghox: -ghoxa: ;******Ghox (set 2) +ghoxj: ;******Ghox (set 2) @:maincpu,program,805a2,64,00,8e @:maincpu,program,80006,4,00,00 demonwld: demonwld1: -demonwld4: demonwld3: demonwld2: @:maincpu,program,c001c2,c8,00,2d @@ -2455,8 +2431,6 @@ airwolfa: ;******Airwolf (US) skywolf3: @:maincpu,program,e71a,5f,00,ff -sboblbob: -sboblboa: ;******Super Bobble Bobble (set 1) sboblbobla: sboblboblb: @:maincpu,program,e654,23,00,48 @@ -2517,7 +2491,6 @@ sboblboblb: tehkanwc: tehkanwcb: ;******Tehkan World Cup (set 2, bootleg?) -tehkenwcc: @:maincpu,program,c600,60,03,17 ;tantr (& clones) hiscores update after hiscore table is displayed in attract mode @@ -2576,7 +2549,6 @@ hunchbkg: @:maincpu,program,1c0d,1,20,20 shinobi: -shinobl: shinobi1: shinobi2: shinobi3: @@ -2595,7 +2567,6 @@ fghthista: ;******fighters history (us ver42-05, alternative hardware) fghthistu: ;******fighters history (us ver42-03) fghthistja: ;******fighters history (japan ver 42-03) fghthistj: -fghthistua: fghthistjb: fghthistub: fghthistua: @@ -2675,7 +2646,6 @@ mooncrsto: galaxian: galaxianm: superg: -galaxb: galapx: galap1: galap4: @@ -2830,8 +2800,8 @@ dynabomb: ;******Dynamite Bomber (Korea) (Rev 1.5) airbustr: airbustrj: ;******Air Buster: Trouble Specialty Raid Unit (japan) airbustrb: ;******Air Buster: Trouble Specialty Raid Unit (bootleg) -@:maincpu,program,e160,40,01,01 -@:maincpu,program,e19e,01,4f,4f +@:master,program,e160,40,01,01 +@:master,program,e19e,01,4f,4f troangel: newtangl: ;******New Tropical Angel @@ -2855,7 +2825,6 @@ toki: @:maincpu,program,6000a,1,20,20 circus: -circusse: ;******Circus (Sub-Electro bootleg) springbd: @:maincpu,program,0036,2,00,00 @@ -2912,7 +2881,6 @@ tempest3: ;******tempest (rev ?) * @:maincpu,program,605,11a,14,00 ;******free kick (bootleg) -freekickb: freekickb2: freekick: freekickb1: @@ -3033,16 +3001,11 @@ cawingb2: ;*** puckman/pacman (and clones) for pacmame & regular mame builds ** hangly3: -zolamaze: -mspatkx: -mspacx: msmini: mspacat2: msatk2ad: msatkad: -mspacatk: chtmsatk: -fastplus: mspacatb: mshearts: mssilad: @@ -3060,7 +3023,6 @@ msf1pac: mselton: faststrm: msdstorm: -msbaby1: msbaby: mrpacman: pacmanf: @@ -3072,18 +3034,13 @@ hangly2x: hanglyx: hanglyad: fasthang: -chthang: eltonpac: dizzy: -pacstrm: crazypac: caterpil: baby2: baby3: pacman: -pacmanm: -pacmanjp: -npacmod: pacmod: hangly: hangly2: @@ -3104,7 +3061,6 @@ newpuckx: alibaba: mspacmat: puckmod: -puckmana: ctrpllrp: puckmanh: piranhao: @@ -3240,8 +3196,8 @@ newsa: ;******News (set 2) @:maincpu,program,e4bb,8,30,30 moomesa: -moomesaa: ;******Wild West C.O.W.-Boys of Moo Mesa (ver AA) -moomesaua: ;******Wild West C.O.W.-Boys of Moo Mesa (ver ua) +moomesaaab: ;******Wild West C.O.W.-Boys of Moo Mesa (ver AA) +moomesauab: ;******Wild West C.O.W.-Boys of Moo Mesa (ver ua) moomesabl: @:maincpu,program,1801e0,97,00,1a @@ -3277,7 +3233,6 @@ outzone: outzonea: outzoneb: outzonec: ;******outzone (set 4) -outzoned: outzoneh: @:maincpu,program,2401de,18,00,00 @:maincpu,program,240503,4f,3f,3f @@ -3363,7 +3318,6 @@ thunderxb: ;******thunder cross (set 3) @:maincpu,program,414e,1,10,10 sharrier: -sharrirb: ;******Space Harrier (8751 317-0063?) @:maincpu,program,40488,4,01,00 @:maincpu,program,43400,3dc,01,20 @:maincpu,program,437dc,2,00,00 @@ -3421,7 +3375,7 @@ backfire: ;******backfire! backfirea: ;******backfire! (set 2) @:maincpu,program,170300,1b0,13,11 -rocknmsb: ;******Rock'n MegaSession (Japan, bootleg) +rocknms: ;******Rock'n MegaSession (Japan, bootleg) @:maincpu,program,1043bd,14d,3d,00 @:maincpu,program,104507,1,18,18 @@ -3432,17 +3386,17 @@ rockn: ;******Rock'n Tread (Japan) @:maincpu,program,104351,3b,3d,06 @:maincpu,program,1043c9,3b,3d,06 -rocknb: ;******Rock'n Tread 1 (Japan, bootleg) +rockna: ;******Rock'n Tread 1 (Japan, bootleg) @:maincpu,program,104351,3b,3d,06 @:maincpu,program,1043c9,3b,3d,06 -rockn4b: ;******Rock'n 4 (Japan, prototype, bootleg) +rockn4: ;******Rock'n 4 (Japan, prototype, bootleg) @:maincpu,program,1043bf,13b,3d,06 -rockn3b: ;******Rock'n 3 (Japan, bootleg) +rockn3: ;******Rock'n 3 (Japan, bootleg) @:maincpu,program,1043b1,13b,3d,06 -rockn2b: ;******Rock'n Tread 2 (Japan, bootleg) +rockn2: ;******Rock'n Tread 2 (Japan, bootleg) @:maincpu,program,104383,13b,3d,06 mgcrystlo: ;******Magical Crystals (World, 91/12/10) @@ -3458,7 +3412,7 @@ mgcrystlj: alien3: alien3u: ;*******alien 3: the gun (us) -@:maincpu,program,20f2bc,78,80,00 +@:mainpcb:maincpu,program,20f2bc,78,80,00 shuttlei: ;******shuttle invader @:maincpu,program,4008,3,00,00 @@ -3473,9 +3427,6 @@ hvysmsha: @:maincpu,program,100400,50,01,00 @:maincpu,program,10000c,04,00,00 -powernjb: ;******gouketsuji ichizoku(japan, bootleg) -@:maincpu,program,18e800,28,00,05 - plegends: ;******Power Instinct Legends (USA) plegendsj: ;******Gouketsuji Ichizoku Saikyou Densetsu (Japan) @:maincpu,program,40e800,3b,00,0c @@ -3504,12 +3455,12 @@ madballn: tp84: tp84a: ;******time pilot '84 (set 2) -@:maincpu,program,57a0,1e,00,54 -@:maincpu,program,5736,03,00,00 +@:cpu1,program,57a0,1e,00,54 +@:cpu1,program,5736,03,00,00 tp84b: ;******time pilot '84 (set 3) -@:maincpu,program,17a0,1e,00,54 -@:maincpu,program,1736,3,00,00 +@:cpu1,program,17a0,1e,00,54 +@:cpu1,program,1736,3,00,00 ;******Multi Champ Deluxe mchampdx: @@ -3519,8 +3470,8 @@ mchampdxa: ;******Multi Champ Deluxe (ver. 1126, 26/11/1999) arabfgt: arabfgtj: arabfgtu: ;******Arabian Fight (us) -@:maincpu,program,208300,49,53,00 -@:maincpu,program,208345,1,17,17 +@:mainpcb:maincpu,program,208300,49,53,00 +@:mainpcb:maincpu,program,208345,1,17,17 powerbal: powerbals: ;******power balls (super slam conversion) @@ -3564,6 +3515,7 @@ redclash: redclasha: @:maincpu,program,6023,4,00,00 @:maincpu,program,6320,6,23,1d + redclashk: @:maincpu,program,6023,4,00,00 @:maincpu,program,6320,6,1a,1e @@ -3572,8 +3524,8 @@ kikikai: knightb: ;******Knight Boy @:maincpu,program,e2fc,23,00,55 -zigzag: ;******zig zag (galaxian hardware, set 1) -zigzag2: ;******zig zag (galaxian hardware, set 2) +zigzagb: ;******zig zag (galaxian hardware, set 1) +zigzagb2: ;******zig zag (galaxian hardware, set 2) @:maincpu,program,4280,3,00,00 @:maincpu,program,5242,1,10,10 @:maincpu,program,5222,1,10,10 @@ -3651,15 +3603,6 @@ batsugunsp: @:maincpu,program,101166,70,00,00 @:maincpu,program,1011b5,01,15,15 -puzloopj: ;******Puzz Loop (Japan) -@:maincpu,program,609d080,41,00,31 -@:maincpu,program,609d1a8,41,00,30 - -puzloopu: -puzloopk: ;******Puzz Loop (Korea) -@:maincpu,program,609c5d8,41,00,31 -@:maincpu,program,609c700,41,00,30 - metlsavr: ;******Metal Saver @:maincpu,program,341600,63,03,44 @@ -3745,7 +3688,6 @@ elim4p: ;******Eliminator (4 Players, prototype) bnglngby: ;******vs. raid on bungeling bay (japan) @:maincpu,program,6400,5a,00,01 -dkngjnrb: ;******donkey kong jr. (bootleg?) dkongjnrj: ;******donkey kong jr. (japan?) dkongjr: ;******donkey kong jr. (us) dkongjre: @@ -3804,12 +3746,10 @@ mightybj: ;******vs. mighty bomb jack (japan) @:maincpu,program,3a8,4,00,00 @:maincpu,program,3aa,1,10,10 -machridrj: ;******vs. mach rider(japan,fighting cource version) machridra: @:maincpu,program,700,50,00,4b @:maincpu,program,701,1,05,05 -iceclmrj: ;******vs. ice climber dual (japan) iceclmrd: @:maincpu,program,750,3c,00,23 @:maincpu,program,751,1,77,77 @@ -3817,7 +3757,6 @@ iceclmrd: @:sub,program,751,1,77,77 iceclimb: -iceclimbj: ;******vs. ice climber (japan) iceclimba: @:maincpu,program,750,3c,00,23 @@ -3829,7 +3768,7 @@ vsfdf: ;******vs. freedom force @:maincpu,program,712,9c,10,28 excitebk: -excitebka: +excitebko: excitebkj: ;******vs. excitebike (japan) @:maincpu,program,630,14f,00,0e @@ -3888,15 +3827,6 @@ ssanchan: ;******sanrin san chan (japan) @:maincpu,program,c00b,3,00,00 @:maincpu,program,c00c,1,10,10 -vautour2: ;******Vautour (set 2) -@:maincpu,program,41e0,1,20,20 -@:maincpu,program,41c0,1,20,20 -@:maincpu,program,41a0,1,20,20 -@:maincpu,program,4180,1,20,20 -@:maincpu,program,4160,1,20,20 -@:maincpu,program,4140,1,20,20 -@:maincpu,program,4389,3,00,00 - ;*********************************************************************** ;* latest unofficial highscore_v0.99 additions below - by leezer * ;*********************************************************************** @@ -4003,14 +3933,14 @@ gunmast: ;******Tenkomori Shooting (TKM2/VER.A1) tenkomor: -tenkomorj: +tenkomorja: @:maincpu,program,3fd60,c7,20,2d ;******slipstream slipstrm: slipstrmh: -@:maincpu,program,2095e1,4e3,60,4d -@:maincpu,program,2037cf,5c,01,4d +@:mainpcb:maincpu,program,2095e1,4e3,60,4d +@:mainpcb:maincpu,program,2037cf,5c,01,4d mechatt: mechattu: ;******Mechanized Attack (US) @@ -4038,15 +3968,14 @@ animaljr: @:maincpu,program,6b63,1,08,08 finalap2: -finalp2j: ;******final lap 2 (japan) +finalap2j: ;******final lap 2 (japan) @:maincpu,program,106000,d0,50,01 finalap3: -finalp3j: ;******Final Lap 3 (Japan) +finalap3j: ;******Final Lap 3 (Japan) @:maincpu,program,106000,d0,4d,19 eaglshot: ;******eagle shot golf -eaglshta: ;******eagle shot golf (alt) @:maincpu,program,20,62,48,18 rdft: @@ -4055,7 +3984,6 @@ rdftj: rdftadi: ;******Raiden Fighters (Dream Island Co. license) rdftu: ;******Raiden Fighters (US) rdfta: -rdftdi: rdftit: rdfts: rdftauge: @@ -4088,16 +4016,6 @@ ladybugg: nsub: @:maincpu,program,8397,2,00,00 -;******Falcon (bootleg set 2) -falcona: -@:maincpu,program,4389,3,00,00 -@:maincpu,program,4140,1,20,20 -@:maincpu,program,4160,1,20,20 -@:maincpu,program,4180,1,20,20 -@:maincpu,program,41a0,1,20,20 -@:maincpu,program,41c0,1,20,20 -@:maincpu,program,41e0,1,20,20 - ;******a.d. 2083 ad2083: @:maincpu,program,4600,64,0a,04 @@ -4114,14 +4032,13 @@ mshuttle2: @:maincpu,program,808a,58,00,24 wexpress: -wexpressb: wexpressb2: wexpressb3: wexpressb1: @:maincpu,program,0245,3,15,00 @:maincpu,program,0240,50,20,00 -exprraida: ;******Express Raider (US set 2) +exprraid: ;******Express Raider (US set 2) exprraidi: @:maincpu,program,0240,50,20,00 @@ -4140,8 +4057,8 @@ yosakdona: ;******yokasu to donbei (set 2) ;** (the screen with the game name and copyright displaying) or when the hiscore ** ;** is being displayed in attract mode, or the save will not work ** kamikcab: -yellowcb: -yellowcj: ;******Yellow Cab (Japan) +yellowcbb: +yellowcbj: ;******Yellow Cab (Japan) @:maincpu,program,636b,7c,00,20 ;******hyper crash (version d) @@ -4173,9 +4090,7 @@ rdft22kc: rdft2a: rdft2: ;******Raiden Fighters 2 rdft2j: -rdft2a2: rdft2us: ;******raiden fighters 2.1 (us, single board) -rdft2j2: rdft2t: rdft2u: rdft2aa: @@ -4184,7 +4099,7 @@ rdft2ja: brival: brivalj: ;*******(burning rival (japan) -@:maincpu,program,208300,4a,42,04 +@:mainpcb:maincpu,program,208300,4a,42,04 kikcubic: kikcubicb: ;******Kickle Cubele @@ -4219,7 +4134,6 @@ survartsu: ;******survival arts (usa) @:maincpu,program,11cb,2,45,00 invaders: -earthinv: spaceatt: spaceat2: sinvemag: @@ -4247,7 +4161,6 @@ invasionrza: spacerng: ultrainv: spacecom: -sitvo: sitv1: invadersem: galmonst: @@ -4372,8 +4285,6 @@ pbaction5: @:maincpu,program,c093,51,07,00 @:maincpu,program,c12f,27,48,4b -rainbow: -rainbowo: ;******rainbow islands (old version) rbisland: @:maincpu,program,10d0cc,32,00,32 @:maincpu,program,10e1f2,04,00,00 @@ -4383,7 +4294,6 @@ jumpinga: @:maincpu,program,10d0cc,32,00,41 @:maincpu,program,10e1f2,04,00,00 -rainbowe: rbislande: @:maincpu,program,10d0d2,32,00,33 @:maincpu,program,10e1b6,04,00,00 @@ -4606,13 +4516,13 @@ alphamis: ;********sprcros2.c sprcros2: sprcros2a: ;******Super Cross 2 (Japan set 2) -@:maincpu,program,fa00,78,00,4a -@:maincpu,program,f012,6,00,00 -@:maincpu,program,f013,1,03,03 +@:master_cpu,program,fa00,78,00,4a +@:master_cpu,program,f012,6,00,00 +@:master_cpu,program,f013,1,03,03 ;******ufo senshi yohko chan ufosensi: -ufosensb: ;******Ufo Senshi Yohko Chan (not encrypted) +ufosensib: ;******Ufo Senshi Yohko Chan (not encrypted) @:maincpu,program,c800,62,11,41 ;(sdi - strategic defence initiative) @@ -4646,7 +4556,6 @@ racknrol: gravitar: gravitar2: -gravp: ;******gravitar (prototype) gravitar1: @:maincpu,program,41e,30,50,05 @@ -4781,8 +4690,6 @@ pbobble: @:maincpu,program,907010,36,00,00 ;******turbo out run (set 2, upright, 317-unknown)(both fixed) -toutruna: -toutrunu: ;****** turbo out run (set 3,upgrade kit, 317-0118) toutrun1: toutrun2: toutrun: @@ -4869,7 +4776,6 @@ sfan: @:maincpu,program,ff8732,8,00,00 sfj: -sfu: sf: sfua: @:maincpu,program,ff8e72,9C,00,12 @@ -4886,7 +4792,7 @@ wrestwar2: @:maincpu,program,ffe044,4,00,00 ;******Desert Breaker (FD1094 317-0196) -dbrkr: +desertbr: @:maincpu,program,ff3418,1,1a,1a @:maincpu,program,ff3b02,4,00,e8 @:maincpu,program,ffbb02,4,00,e8 @@ -4973,7 +4879,7 @@ mwalkbl: @:maincpu,program,ffe020,4,00,00 aurail: -auraila: ;******aurail (set 2,fd1089? 317-unknown) +aurail1: ;******aurail (set 2,fd1089? 317-unknown) aurailj: @:maincpu,program,ffff7e,27,00,52 @@ -4985,7 +4891,6 @@ dumpmtmt: ;******dump matsumoto (japan 8751 317-unknown) ;Golden Axe (by GeoMan) goldnaxe: -goldnaxa: goldnaxej: goldnaxeu: goldnaxeb2: @@ -5160,7 +5065,7 @@ ginganina: ;******Ginga NinkyouDen (set 2) sonofphx: 99lstwar: -99lstwra: +99lstwara: repulse: 99lstwark: ;******'99: The Last War (Kyugo) @:maincpu,program,f660,5f,00,ff @@ -5272,7 +5177,6 @@ fgoala: @:maincpu,program,89,9,00,00 ;*******Virtua Fighter 1 -vf1: vf: @:maincpu,program,40f800,b3,09,4d @@ -5305,7 +5209,7 @@ goldmedla: ;*******fax & fax (alt questions) fax: -faxa: +fax2: @:maincpu,program,02b4,15e,00,00 ;Mille Miglia 2: Great 1000 Miles Rally (95/05/24) & (95/04/04) @@ -5487,12 +5391,12 @@ nprinceso: ;*******Renju Kizoku renju: -@:maincpu,program,f2aa,28,b8,01 -@:maincpu,program,f2ea,2,70,17 +@:maincpu,regs,f2aa,28,b8,01 +@:maincpu,regs,f2ea,2,70,17 ;*******Neratte Chu nratechu: -@:maincpu,program,e568,28,00,08 +@:maincpu,regs,e568,28,00,08 ;*******pirate treasure piratetr: @@ -5674,22 +5578,6 @@ spacefevo2: @:maincpu,program,60f1,3,00,00 @:maincpu,program,60ec,3,00,00 -;*******Space Fever (black and white set 2) -sfevrbwa: -sfeverbw: -@:maincpu,program,609d,3,00,00 -@:maincpu,program,60a3,3,00,00 -@:maincpu,program,60a9,3,00,00 -@:maincpu,program,60af,3,00,00 -@:maincpu,program,60b5,3,00,00 -@:maincpu,program,60bb,3,00,00 -@:maincpu,program,60c1,3,00,00 -@:maincpu,program,60c7,3,00,00 -@:maincpu,program,60cd,3,00,00 -@:maincpu,program,60e7,3,00,00 -@:maincpu,program,60ec,3,00,00 -@:maincpu,program,60f1,3,00,00 - ;********galaga.c galaga: galagamk: @@ -5710,12 +5598,6 @@ bullsdrtg: @:maincpu,program,5c5e,1,30,30 @:maincpu,program,5c06,1,00,00 -;********toaplan2.c -battleg: -battlegb: -@:maincpu,program,10ca4c,ed,00,2a -@:maincpu,program,101241,1,45,45 - ;********atetris.c atetris: atetrisb2: @@ -5802,7 +5684,7 @@ gundamex: ;*******grand striker 2 (japan) gstrik2j: -gstrik2e: +gstrik2: @:maincpu,program,ffaef3,48,76,28 ;*******goal `92 @@ -5992,7 +5874,6 @@ paclandp: ;*****not working/saving driver issue i think ;********jrpacman.c jrpacman: -fastjr: jrpacad: jrhearts: jrvectr: @@ -6039,7 +5920,6 @@ vecbtime: @:maincpu,program,0033,27,00,FF ;*******centiped.c by Ziller -centidux: pacipede: vectiped: vectrped: @@ -6168,7 +6048,7 @@ cairblad: scross: scrossu: scrossa: -@:maincpu,program,701fb0,3f,53,03 +@:mainpcb:maincpu,program,701fb0,3f,53,03 ;*******r2d tank r2dtank: @@ -6416,11 +6296,6 @@ chaknpop: @:maincpu,program,8449,1f,04,00 @:maincpu,program,8466,1,14,14 -;*******battle wings -bwing: -@:maincpu,program,d00,f0,34,20 -@:maincpu,program,0d,4,00,00 - ;*******cuebrick cuebrick: cuebrickj: @@ -6525,7 +6400,6 @@ bublboblr: bublboblr1: boblbobl: bublbobl1: -boblbobl2: sboblbobl: @:maincpu,program,e654,23,00,48 @:maincpu,program,e67b,3,1f,13 @@ -6590,8 +6464,8 @@ olibochu: ;*******(birdie king 2)(By Firebrand) bking2: -@:maincpu,program,8166,9,0,0 -@:maincpu,program,8187,1,0,0 +@:main_cpu,program,8166,9,0,0 +@:main_cpu,program,8187,1,0,0 ;*******(world rally 2: twin racing)(By Firebrand) wrally2: @@ -6717,7 +6591,7 @@ dassault: ; - Only works if you delete the nvram after you turn off the game. Making ;the nvram read-only will not work. mayhem: -@:maincpu,program,e081,ba,10,45 +@:master,program,e081,ba,10,45 ;*******super triv II(By Firebrand) ; - Only saves "Experts Only" scores, can save other slots but the games are @@ -6824,7 +6698,7 @@ birdtry: f1en: f1enu: f1enj: -@:maincpu,program,20f20e,38,42,02 +@:mainpcb:maincpu,program,20f20e,38,42,02 ;mars matrix (usa/japan)(by tamphax) mmatrix: @@ -6845,7 +6719,6 @@ sf2ud: @:maincpu,program,ffd302,04,00,00 ;willow (japan, english)(clone)(by tamphax) -willowo: willowuo: @:maincpu,program,ffefc6,50,00,20 @:maincpu,program,fff03e,04,00,00 @@ -6857,13 +6730,7 @@ willowu: @:maincpu,program,fff03e,04,00,00 -;spiderman (us) and clones (by GeoMan) -spidey: -spideyj: -@:maincpu,program,208c00,80,a0,00 - ;pirates (by GeoMan) - 10th score not saved, driver -problem? pirates: @:maincpu,program,10a544,80,4e,00 @@ -6940,7 +6807,7 @@ aligatorun: ;** up the screen during attract mode, you have to be quick, you only get about 4-5 seconds ** ;** to do this...** boomrang: -boomrana: +boomranga: @:maincpu,program,10,3,07,00 @:maincpu,program,62a2,3f,07,89 @@ -7033,7 +6900,7 @@ megadon: legion: @:maincpu,program,62e8e,27,00,29 @:maincpu,program,62fde,4,00,00 -legiono: + legionjb: legionj: @:maincpu,program,62e8c,27,00,29 @@ -7073,7 +6940,6 @@ samuraia: ;********(flower) flower: -flowersj: @:maincpu,program,d060,37,00,20 @:maincpu,program,c00f,3,00,00 @:maincpu,program,c010,1,30,30 @@ -7133,7 +6999,6 @@ nost: ;********(beam invader) beaminv: -beaminva: pacominv: @:maincpu,program,1833,3,00,00 @@ -7249,12 +7114,6 @@ rjammer: ripcord: @:maincpu,program,36,2,0,0 -;(next space, the) (by GeoMan) -tnexspce: -@:maincpu,program,70016,4,0,0 -@:maincpu,program,72b40,50,0,0 -@:maincpu,program,a0f56,10,30,4e - ;(net wars) (by GeoMan) netwars: @:maincpu,program,5890,6,00,00 @@ -7299,7 +7158,6 @@ clapapa2: @:maincpu,program,3,1,0,0 ;(cassette: pro soccer) (by GeoMan) -cprosocc: cpsoccer: @:maincpu,program,56a,23,00,00 @:maincpu,program,591,3,0,0 @@ -7360,8 +7218,8 @@ bbustersu: ;(birdie king) (by GeoMan) bking: -@:maincpu,program,8161,9,0,0 -@:maincpu,program,8175,1,0,0 +@:main_cpu,program,8161,9,0,0 +@:main_cpu,program,8175,1,0,0 ;********(red robin) redrobin: @@ -7461,7 +7319,7 @@ spyu: ;(scud hammer) (by GeoMan) scudhamm: -@:maincpu,program,fd1ea,3c,00,01 +@:cpu1,program,fd1ea,3c,00,01 ;(super cup finals (world)) and clones (by GeoMan) scfinals: @@ -7483,7 +7341,6 @@ grdnstrmj: ;(shadow force (us) (by GeoMan) shadfrce: -shadfrcejv2: shadfrcej: @:maincpu,program,1f002a,2,00,05 @:maincpu,program,1f002c,26,00,00 @@ -7756,7 +7613,7 @@ gcpinbal: ;*******segac2.c (ichidant-r (puzzle_action 2 (english & japan))) ichirj: -ichidnte: +ichir: @:maincpu,program,fffc3d,27,00,00 ;*******iqblock.c (iq-block) @@ -7842,10 +7699,6 @@ darkplnt: @:maincpu,program,80b8,1e,00,4a @:maincpu,program,80f4,1e,00,51 -;********system1.c (block gal (bootleg) -blckgalb: -@:maincpu,program,c062,3,00,01 - barrier: ;[Special thanks to Cananas for making this entry work] @:maincpu,program,0074,04,00,00 @:maincpu,program,00c0,06,00,00 @@ -7871,7 +7724,7 @@ spyhunt2: ;(beraboh man (japan version c)) and clones (by GeoMan) berabohm: -berabohmo: +berabohmb: @:maincpu,program,3f00,68,42,02 ;(sky chuter) (by GeoMan) - Hiscores are updated when game enters attract mode! @@ -7930,7 +7783,6 @@ ecofghtru: @:maincpu,program,ff8106,4,00,00 ;********psikyo.c (battle k-road (japan)) -btlkrodj: btlkroad: btlkroadk: @:maincpu,program,fe1af4,4e,00,04 @@ -7971,7 +7823,7 @@ eggs: @:maincpu,program,015,3,00,03 ;(scorpion (bootleg on galaxian hardware)) (by GeoMan) -scorpng: +scorpionmc: @:maincpu,program,4207,f,00,00 @:maincpu,program,42ad,f,10,10 @@ -8144,7 +7996,6 @@ newsin7: @:maincpu,program,413d,3,0,0 ;(navalone) (by GeoMan) -navalone: navarone: @:maincpu,program,402d,3,0,0 @@ -8196,7 +8047,7 @@ kengo: @:maincpu,program,e09f2,82,10,20 ;(kodure ookami (japan)) (by GeoMan) -kodure: +kozure: @:maincpu,program,637c0,4,00,00 @:maincpu,program,635b4,28,00,00 @@ -8270,7 +8121,7 @@ buckyea: ;(mister viking) and clones (by GeoMan) mrviking: -mrvikngj: +mrvikingj: @:maincpu,program,d42c,15,59,47 @:maincpu,program,d300,15,00,01 @:maincpu,program,c086,3,00,02 @@ -8496,16 +8347,6 @@ wb34: wb3: wb33: wb35: -wb35a: -@:maincpu,program,ffc8b8,28,4c,00 -@:maincpu,program,ffc8de,1,30,30 - -;******wonder boy III - monsters lair (japan,system 16b, fd1094 317-0085) -wb3bb: -@:maincpu,program,ff08b8,27,4c,30 - -;********system16.c (wonder boy 3 (bootleg)) -wb3bl: @:maincpu,program,ffc8b8,28,4c,00 @:maincpu,program,ffc8de,1,30,30 @@ -8683,14 +8524,12 @@ endurob2: ;(dynamite duke) and clones (by GeoMan) dynduke: -dyndukef: dyndukej: dyndukeu: @:maincpu,program,1346,77,50,2a -dbldyn: + dbldynj: dbldynu: -dbldynf: @:maincpu,program,155c,8c,50,00 ;(devil zone) (by GeoMan) @@ -8753,7 +8592,7 @@ endurobl: ;********cicsheat.c (big run (11th rallye version)) bigrun: -@:maincpu,program,f61da,2bc,50,05 +@:cpu1,program,f61da,2bc,50,05 ;(crude buster (world fx version)) and clones (by GeoMan) cbuster: @@ -8809,12 +8648,6 @@ stlforce: @:maincpu,program,105772,32,4e,00 @:maincpu,program,105784,1,02,02 -;(street fighter ii! - champion edition (v004)) (by Kds) -sf2v004: -@:maincpu,program,ffd276,28,01,20 -@:maincpu,program,ffd2c6,14,ff,96 -@:maincpu,program,ffd2ee,04,01,67 - ;(big pro wrestling!,the) (by GeoMan) bigprowr: tagteam: @@ -8853,7 +8686,6 @@ warriorb: ;********cps2.c (rockman 2 : the power fighters (japan 960708)) rockman2j: -rckman2jregion: @:maincpu,program,ffefc0,118,00,02 @:maincpu,program,fff047,1,01,01 @@ -8912,7 +8744,6 @@ elvactrj: @:maincpu,program,40ce3c,1,c3,c3 galpanic: -galpanib: @:maincpu,program,53e728,50,30,31 ;Double Dragon 2 clones @@ -8934,7 +8765,7 @@ cameltrya: ;Wonder Momo (by GeoMan) wndrmomo: -@:maincpu,program,4e00,45,0,2f +@:cpu1,program,4e00,45,0,2f ;Youjyudn (Japan) (by GeoMan) youjyudn: @@ -8963,29 +8794,16 @@ mainevto: markham: @:maincpu,program,c0c4,3c,2a,00 -route16b: +route16: +route16bl: route16a: routex: -@:maincpu,program,4032,9,0,0 - -;********route16.c -route16: -@:maincpu,program,4032,9,00,00 +@:cpu1,program,4032,9,0,0 ;Moguchan (by GeoMan) moguchan: @:maincpu,program,5eda,6,0,0 -;Naughty Boy clones (by GeoMan) - score updates after game start !!! -naughtya: -naughtyc: -@:maincpu,program,4004,3,0,0 -@:maincpu,program,8733,1,20,20 -@:maincpu,program,8737,1,20,20 -@:maincpu,program,873d,1,20,20 -@:maincpu,program,873f,1,20,20 -@:maincpu,program,8743,1,20,20 - ;in this game to make the hiscore display by starting a new game (if you beat the hiscore) before you exit naughtyb: naughtyba: @@ -9082,8 +8900,8 @@ regulusu: ;********leland.c (cerberus) ;** only seems to save top score ** cerberus: -@:maincpu,program,e83b,ba,27,00 -@:maincpu,program,e004,1,1b,1b +@:master,program,e83b,ba,27,00 +@:master,program,e004,1,1b,1b ;********galaxian.c (omega) omega: @@ -9366,7 +9184,7 @@ blkpnthr: ;********wecleman.c (wec le mans 24) ;** only saves top 10 scores (ones you put your name to) ** wecleman: -wecleman2: +weclemana: @:maincpu,program,41110,64,00,20 @:maincpu,program,40006,4,00,00 @@ -9641,10 +9459,6 @@ arknoid2b: @:maincpu,program,ec81,27,01,4e @:maincpu,program,e3a8,03,01,00 -;*********(block block (world 910910)) -blocka: -@:maincpu,program,e0f0,50,54,85 - ;*******megasys1.c (saint dragon) stdragon: stdragona: @@ -9853,7 +9667,7 @@ marvins: @:maincpu,program,c28c,1,01,01 ;*********outrun.c (super hang-on (bootleg)) -shangonb: +shangon2: shangonrb: shangonro: @:maincpu,program,20d400,1b2,01,00 @@ -9916,8 +9730,8 @@ tunhuntc: ;*******mhavoc.c (major havoc (rev 3)) mhavoc: -@:maincpu,program,184,46,0b,00 -@:maincpu,program,95,1,02,02 +@:alpha,program,184,46,0b,00 +@:alpha,program,95,1,02,02 ;*******segac2.c (zunzunkyou no yabou (japan)) zunkyou: @@ -9956,7 +9770,7 @@ moegonta: exzisus: exzisusa: exzisust: -@:maincpu,program,f840,3c,00,4f +@:cpua,program,f840,3c,00,4f ;0,c9c6,1,20,20 ;0,c9ca,1,20,20 ;0,c9ce,1,05,05 @@ -10455,7 +10269,7 @@ cbdash: @:maincpu,program,23,3,88,01 ;*********tetrisp2.c (tetris plus 2(JAPAN)) -teplus2j: +tetrisp2j: tetrisp2: tetrisp2ja: @:maincpu,program,10dfb7,b3,01,00 @@ -10619,7 +10433,7 @@ skysoldrbl: ;*******cave.c (donpachi) donpachi: -donpachj: +donpachij: donpachihk: donpachikr: @:maincpu,program,101782,4,00,00 @@ -10681,7 +10495,6 @@ dazzler: ;*******saves top 10 scores only ;*****can`t be bothered with lower scores !! suprloco: -suprlocoa: suprlocoo: @:maincpu,program,fd00,1e,02,00 @:maincpu,program,fca0,12,41,48 @@ -10775,7 +10588,6 @@ lagunar: @:maincpu,program,2005,3,00,00 lrescue: -warl: desterth: lrescuem: lrescuem2: @@ -10873,19 +10685,15 @@ arkangc2: arkbloc2: arkblock: arkgcbl: -arkmcubl: arkanoidu: arkanoiduo: arkatayt: paddle2: arkgcbla: arkbloc3: -arkanoidjo: -arkanoidjb: arkanoidja: arkanoidjb: arkanoidjbl: -arkanoidjb2: arkanoidjbl2: arkanoidj: @:maincpu,program,ef79,23,00,52 @@ -10915,16 +10723,12 @@ cclimbr2: terraf: terrafu: -terrafa: terrafb: terrafjb: terrafj: @:maincpu,program,6066e,3c,00,4a @:maincpu,program,606b2,4,00,00 -asteroi1: -@:maincpu,program,001c,35,00,00 - ;********astrocde.c gorf: ;* resetting screws up 2 scores and top score gorfpgm1: @@ -10940,7 +10744,7 @@ robby: @:maincpu,program,e39d,2a,9e,47 @:maincpu,program,e33b,26,10,17 -seawolf2,;*loading score seems to auto start a game? +seawolf2: ;*loading score seems to auto start a game? @:maincpu,program,c208,2,00,00 wow: ;*resetting screws up the 1st score @@ -11028,7 +10832,7 @@ bioniccbl: ;0,f90f6,1,01,01 blkdrgon: -blkdrgnb: +blkdrgonb: @:maincpu,program,e200,50,00,26 @:maincpu,program,e1e0,8,00,00 @@ -11121,7 +10925,6 @@ spacduel1: ;********bzone.c bzone: bzonea: -bzone2: bzonec: @:maincpu,program,0300,3c,05,38 @@ -11204,12 +11007,12 @@ smash: ;********cischeat.c (cisco heat) cischeat: -@:maincpu,program,f0c00,24f,00,00 -@:maincpu,program,f0e42,1,49,49 -@:maincpu,program,f0b00,28,00,00 +@:cpu1,program,f0c00,24f,00,00 +@:cpu1,program,f0e42,1,49,49 +@:cpu1,program,f0b00,28,00,00 f1gpstar: -@:maincpu,program,f2803,5e3,04,4d +@:cpu1,program,f2803,5e3,04,4d ;********citycon.c citycon: @@ -11229,7 +11032,6 @@ joemac: cninja1: stoneage: cninjabl: -cninjaa: @:maincpu,program,1877f7,1,30,30 @:maincpu,program,1877f6,ae,00,00 @@ -11264,11 +11066,9 @@ congoa: contra: contrab: contraj: -contrajb: gryzor: contrabj1: gryzor1: -gryzora: contra1: contrabj: contraj1: @@ -11302,7 +11102,6 @@ panic3: 1941: 1941j: 1941u: -1941r: 1941r1: @:maincpu,program,ff9680,78,ff,00 @:maincpu,program,ff0d98,04,00,00 @@ -11342,7 +11141,7 @@ mmancp2ur1: mercs: mercsur1: mercsj: -mercsua: +mercsu: @:maincpu,program,ff0fd0,a0,00,20 msword: @@ -11390,11 +11189,8 @@ qtono2j: @:maincpu,program,ff51fe,04,06,00 sf2: -sf2a: sf2b: -sf2e: sf2j: -sf2jb: sf2ua: sf2ub: sf2ue: @@ -11448,8 +11244,7 @@ crbaloon2: ;********crimfght.c crimfght: -crimfgtj: -crimfght2: +crimfghtj: @:maincpu,program,1a40,46,00,19 ;********cvs.c @@ -11520,7 +11315,7 @@ breywood: @:maincpu,program,006d,3,04,00 cobracom: -cobracmj: +cobracomj: @:maincpu,program,06c6,1e,00,54 @:maincpu,program,0135,3,00,76 @@ -11877,7 +11672,6 @@ galspnbl: ;********gaplus.c gaplus: -gapluso: galaga3m: gaplusa: galaga3: @@ -11893,9 +11687,7 @@ gaplust: ;********gauntlet.c ; note saves last level completed and high scores gauntlet: -gauntir1: -gauntir2: -gaunt2p: +gauntlet2p: gauntletr4: gauntletr5: gauntletr7: @@ -11933,7 +11725,6 @@ geebeeb: ;********gradius3.c gradius3: gradius3a: -gradius3e: gradius3j: gradius3js: @:maincpu,program,43f00,64,00,08 @@ -11961,9 +11752,6 @@ gunsmokej: ;********hcastle.c hcastle: -hcastleo: -hcastljo: -hcastlej: akumajou: hcastlek: akumajoun: @@ -12084,7 +11872,7 @@ ledstorm: @:maincpu,program,ffcb76,23,02,00 @:maincpu,program,ff87c9,1,d2,d2 -ledstorm2: +leds2011u: @:maincpu,program,ff8890,78,00,00 @:maincpu,program,ffcb76,23,41,01 @:maincpu,program,ff87c9,1,d2,d2 @@ -12180,7 +11968,6 @@ dkgensan: @:maincpu,program,e0a40,3,40,02 imgfight: -imgfighto: imgfightj: @:maincpu,program,a334f,78,09,20 @@ -12296,7 +12083,6 @@ motos: @:maincpu,program,1831,4,00,00 todruaga: -todruagb: todruagao: todruagas: @:maincpu,program,102a,32,00,45 @@ -12364,7 +12150,7 @@ maniach2: @:maincpu,program,0028,3,00,00 ;********mcr3.c -destderb: +demoderb: @:maincpu,program,e4e4,ce,01,00 @:maincpu,program,e7f7,1,76,76 @@ -12373,7 +12159,6 @@ archrivl: @:maincpu,program,62cf1,319,09,05 @:maincpu,program,61ed5,1,03,03 -archrivl2: archrivla: archrivlb: @:maincpu,program,62ce3,319,09,05 @@ -12443,7 +12228,7 @@ mikiehs: block: blockj: blockbl: -blockjoy: +blockr1: @:maincpu,program,e0f0,50,54,85 ;********mnight.c @@ -12493,7 +12278,6 @@ dspirit2: @:maincpu,program,40d0,3,00,00 galaga88: -galag88b: galaga88j: galaga88a: @:maincpu,program,4a0d,6,00,00 @@ -12528,20 +12312,20 @@ rthun2j: ;********namcos86.c hopmappy: -@:maincpu,program,4c41,3,00,00 -@:maincpu,program,4ca0,81,00,62 -@:maincpu,program,209e,1,2e,2e -@:maincpu,program,20a0,1,2e,2e -@:maincpu,program,20a2,1,08,08 -@:maincpu,program,20a4,1,00,00 -@:maincpu,program,20a6,1,00,00 -@:maincpu,program,20a8,1,00,00 +@:cpu1,program,4c41,3,00,00 +@:cpu1,program,4ca0,81,00,62 +@:cpu1,program,209e,1,2e,2e +@:cpu1,program,20a0,1,2e,2e +@:cpu1,program,20a2,1,08,08 +@:cpu1,program,20a4,1,00,00 +@:cpu1,program,20a6,1,00,00 +@:cpu1,program,20a8,1,00,00 rthunder: rthunder1: rthunder2: -@:maincpu,program,5400,23,00,12 -@:maincpu,program,5450,3,00,00 +@:cpu1,program,5400,23,00,12 +@:cpu1,program,5450,3,00,00 ;********nemesis.c citybomb: @@ -12650,7 +12434,6 @@ pingpong: strider: ;*Missing: Stage completion information (Player name + Score) striderj: -stridrjr: striderua: @:maincpu,program,ff89aa,78,ff,20 @:maincpu,program,ff0ca4,04,00,00 @@ -12703,7 +12486,6 @@ sngkace: ;********psychic5.c psychic5: -psychic5a: psychic5j: @:maincpu,program,fd00,30,00,59 @:maincpu,program,fc84,3,00,53 @@ -12719,7 +12501,6 @@ spnchoutj: @:maincpu,program,d5c0,f0,21,04 ;********qwakprot.c -qwakprot: qwak: @:maincpu,program,0045,3,00,00 @:maincpu,program,0108,3,4d,43 @@ -12767,7 +12548,6 @@ ropeman: ;********rollrace.c fightrol: -rollrace: rollace: @:maincpu,program,c060,3e,00,11 @:maincpu,program,c026,3,00,00 @@ -12827,17 +12607,13 @@ cavelon: knockout: mariner: -scrambles: triplep: triplepa: 800fath: strfbomb: scramb2: ;******Scramble (bootleg) -@:maincpu,program,4200,1e,00,01 -@:maincpu,program,40a8,03,00,01 - scramble: ;[Special thanks to Cananas for enhancing this entry] -scrambls: +scrambles: scramblb: scramblebf: scramblebb: @@ -12888,13 +12664,10 @@ borench: borencha: @:maincpu,program,fff410,44,4d,05 -puyopuyo: puyo: puyoj: puyoja: puyobl: -puyopuya: -puyopuyb: @:maincpu,program,fffce2,4c,13,98 puyopuy2: @@ -13064,7 +12837,7 @@ tdfeverj: tdfever2: @:maincpu,program,df28,28,c5,00 -ftsoccer: +fsoccerb: @:maincpu,program,e349,14,48,01 ;********sonson.c @@ -13127,26 +12900,12 @@ pacnpal2: @:maincpu,program,116d,3,00,00 @:maincpu,program,3ed,7,00,24 -;********superqix.c -sqixbl: -@:maincpu,program,f4c0,28,00,03 -@:maincpu,program,f8f1,4,75,00 - -;********surpratk.c -;* you must exit this game while in-game top score is displaying (not highscore table)* -;* for in-game top score to save correctly(because of way game uses videoram) -surpratk: -@:maincpu,program,b00,5a,11,31 -@:maincpu,program,5980,4,00,00 -@:maincpu,program,609e,6,01,00 - ;********system1.c 4dwarrio: ;[Special thanks to Cananas for enhancing this entry] @:maincpu,program,d300,a0,00,20 @:maincpu,program,c017,3,00,02 chopliftu: -chplftbl: choplift: chopliftbl: @:maincpu,program,ef00,31,00,4b @@ -13173,7 +12932,6 @@ wboy: wboy2: wboy3: wboy4: -wboy4u: wboyu: ;*note* only 1/2 works... wbdeluxe: wboyo: @@ -13223,7 +12981,6 @@ fantzoneta: @:maincpu,program,fffc00,38,00,52 @:maincpu,program,ffc22c,4,00,00 -fantzono: fantzonep: fantzonepr: fantzone1: @@ -13251,8 +13008,7 @@ tetris: tetris1: @:maincpu,program,ffe800,64,45,08 -timscanr: -timescn: +timescan: @:maincpu,program,ffc036,1,00,00 @:maincpu,program,ffc037,2,01,20 @:maincpu,program,ffc039,1,00,00 @@ -13387,7 +13143,7 @@ ssia: @:maincpu,program,205814,31,00,5a @:maincpu,program,203606,4,00,00 -majest12: +majest12j: @:maincpu,program,205812,31,00,5a @:maincpu,program,203606,4,00,00 @@ -13563,18 +13319,13 @@ plumppop: @:maincpu,program,c625,27,00,52 @:maincpu,program,e471,3,00,00 -tnzs2: -@:maincpu,program,ec0a,23,00,55 - hellfire1: -hellfire3: hellfire1a: @:maincpu,program,42130,c2,00,08 @:maincpu,program,421e9,1,14,14 @:maincpu,program,42357,21,2e,30 hellfire: -hellfire2: hellfire2a: @:maincpu,program,42300,c2,00,08 @:maincpu,program,423b9,1,14,14 @@ -13614,7 +13365,6 @@ samesame2: ;*note* top score does not display vimana: vimanan: -vimana1: vimanaj: @:maincpu,program,480198,f4,00,41 @@ -13662,7 +13412,6 @@ snowbro2b: @:maincpu,program,1000a0,28,00,45 truxton2: -tatsujn2: @:maincpu,program,100300,7c,00,01 ;********topspeed.c @@ -13742,7 +13491,6 @@ fshark: fsharkbt: skyshark: hishouza: -fsharkbla: fnshark: skysharka: @:maincpu,program,3016a,16c,00,01 @@ -13784,7 +13532,7 @@ ultraman: ;********vaportra.c vaportra: -vaportru: +vaportrau: kuhga: vaportra3: @:maincpu,program,fff5d4,78,2e,00 @@ -13865,7 +13613,6 @@ xexexj: @:maincpu,program,80057,3,00,30 xmen: -xmen2p: xmenj: xmen2pj: xmen6pu: diff --git a/scripts/src/bus.lua b/scripts/src/bus.lua index 3da1e88cb3c..eebdd5d8a1d 100644 --- a/scripts/src/bus.lua +++ b/scripts/src/bus.lua @@ -1047,6 +1047,8 @@ if (BUSES["PET"]~=null) then MAME_DIR .. "src/devices/bus/pet/petuja.h", MAME_DIR .. "src/devices/bus/pet/cb2snd.cpp", MAME_DIR .. "src/devices/bus/pet/cb2snd.h", + MAME_DIR .. "src/devices/bus/pet/2joysnd.h", + MAME_DIR .. "src/devices/bus/pet/2joysnd.cpp", } end diff --git a/scripts/target/mame/mess.lua b/scripts/target/mame/mess.lua index 54d42a18ed3..116c3aea45a 100644 --- a/scripts/target/mame/mess.lua +++ b/scripts/target/mame/mess.lua @@ -3191,6 +3191,7 @@ files { MAME_DIR .. "src/mame/drivers/v6809.cpp", MAME_DIR .. "src/mame/drivers/vector4.cpp", MAME_DIR .. "src/mame/drivers/vii.cpp", + MAME_DIR .. "src/mame/drivers/vsmilepro.cpp", MAME_DIR .. "src/mame/drivers/wicat.cpp", MAME_DIR .. "src/mame/drivers/xor100.cpp", MAME_DIR .. "src/mame/includes/xor100.h", diff --git a/src/devices/bus/intv/slot.cpp b/src/devices/bus/intv/slot.cpp index d502016fe76..3716333cbf8 100644 --- a/src/devices/bus/intv/slot.cpp +++ b/src/devices/bus/intv/slot.cpp @@ -396,8 +396,8 @@ bool intv_cart_slot_device::call_load() return load_fullpath(); else { - UINT16 offset[] = { 0x400, 0x2000, 0x4000, 0x4800, 0x5000, 0x6000, 0x7000, 0x8000, 0x9000, 0xa000, 0xb000, 0xc000, 0xd000, 0xe000, 0xf000}; - const char* region_name[] = {"0400", "2000", "4000", "4800", "5000", "6000", "7000", "8000", "9000", "A000", "B000", "C000", "D000", "E000", "F000"}; + UINT16 offset[] = { 0x400, 0x2000, 0x4000, 0x4800, 0x5000, 0x6000, 0x7000, 0x8000, 0x8800, 0x9000, 0xa000, 0xb000, 0xc000, 0xd000, 0xe000, 0xf000}; + const char* region_name[] = {"0400", "2000", "4000", "4800", "5000", "6000", "7000", "8000", "8800", "9000", "A000", "B000", "C000", "D000", "E000", "F000"}; const char *pcb_name = get_feature("slot"); bool extra_bank = false; @@ -416,7 +416,7 @@ bool intv_cart_slot_device::call_load() m_cart->rom_alloc(extra_bank ? 0x22000 : 0x20000, tag()); ROM = m_cart->get_rom_base(); - for (int i = 0; i < 15; i++) + for (int i = 0; i < 16; i++) { address = offset[i]; size = get_software_region_length(region_name[i]); diff --git a/src/devices/bus/pet/2joysnd.cpp b/src/devices/bus/pet/2joysnd.cpp new file mode 100644 index 00000000000..b0ac30bf0d1 --- /dev/null +++ b/src/devices/bus/pet/2joysnd.cpp @@ -0,0 +1,163 @@ +// license:BSD-3-Clause +// copyright-holders: Ken White +/********************************************************************** + + Commodore PET user port dual joystick and sound device emulation + + BEST OF THE PET GAZETTE magazine documents attaching Atari-style joysticks + with DB-9S connectors to a DB-25P connector plugged into the user port. + page 42, PET AND THE DUAL JOYSTICKS by Chuck Johnson + page 47, STANDARD #1 (CB2 Sound) + +**********************************************************************/ + +/* + +Connections +---------- + User Joysticks + Port ____ + / | + F ----- | 1 | joy 1 up + > --- | 6 | joy 1 button + E ----- | 2 | joy 1 down + | 7 | + D ----- | 3 | joy 1 left + | 8 | + C ----- | 4 | joy 1 right + | 9 | + | 5 | + \____| + ____ + / | + L ----- | 1 | joy 2 up + > --- | 6 | joy 2 button + K ----- | 2 | joy 2 down + | 7 | + J ----- | 3 | joy 2 left + | 8 | + H ----- | 4 | joy 2 right + | 9 | + | 5 | + \____| + + M ----- audio amplifier + +*/ + +#include "2joysnd.h" + + +//************************************************************************** +// DEVICE DEFINITIONS +//************************************************************************** + +const device_type PET_USERPORT_JOYSTICK_AND_SOUND_DEVICE = &device_creator; + +#define DAC_TAG "dac" + +MACHINE_CONFIG_FRAGMENT( 2joysnd ) + MCFG_SPEAKER_STANDARD_MONO("cb2spkr") + MCFG_SOUND_ADD(DAC_TAG, DAC, 0) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "cb2spkr", 1.00) +MACHINE_CONFIG_END + +//------------------------------------------------- +// INPUT_PORTS( 2joysnd ) +//------------------------------------------------- + +static INPUT_PORTS_START( 2joysnd ) + PORT_START("JOY") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1) PORT_WRITE_LINE_DEVICE_MEMBER(DEVICE_SELF, device_pet_user_port_interface, output_c) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) PORT_WRITE_LINE_DEVICE_MEMBER(DEVICE_SELF, device_pet_user_port_interface, output_d) + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) PORT_WRITE_LINE_DEVICE_MEMBER(DEVICE_SELF, pet_userport_joystick_and_sound_device, write_down1) + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) PORT_WRITE_LINE_DEVICE_MEMBER(DEVICE_SELF, pet_userport_joystick_and_sound_device, write_up1) + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2) PORT_WRITE_LINE_DEVICE_MEMBER(DEVICE_SELF, device_pet_user_port_interface, output_h) + PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) PORT_WRITE_LINE_DEVICE_MEMBER(DEVICE_SELF, device_pet_user_port_interface, output_j) + PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) PORT_WRITE_LINE_DEVICE_MEMBER(DEVICE_SELF, pet_userport_joystick_and_sound_device, write_down2) + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) PORT_WRITE_LINE_DEVICE_MEMBER(DEVICE_SELF, pet_userport_joystick_and_sound_device, write_up2) + + PORT_START("FIRE") + PORT_BIT( 0x03, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) PORT_WRITE_LINE_DEVICE_MEMBER(DEVICE_SELF, pet_userport_joystick_and_sound_device, write_fire1) + PORT_BIT( 0x30, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) PORT_WRITE_LINE_DEVICE_MEMBER(DEVICE_SELF, pet_userport_joystick_and_sound_device, write_fire2) +INPUT_PORTS_END + +//------------------------------------------------- +// input_ports - device-specific input ports +//------------------------------------------------- + +ioport_constructor pet_userport_joystick_and_sound_device::device_input_ports() const +{ + return INPUT_PORTS_NAME( 2joysnd ); +} + +//------------------------------------------------- +// machine_config_additions - device-specific +// machine configurations +//------------------------------------------------- + +machine_config_constructor pet_userport_joystick_and_sound_device::device_mconfig_additions() const +{ + return MACHINE_CONFIG_NAME( 2joysnd ); +} + +//************************************************************************** +// LIVE DEVICE +//************************************************************************** + +//------------------------------------------------- +// pet_user_port_dual_joystick_and_sound_device - constructor +//------------------------------------------------- + +pet_userport_joystick_and_sound_device::pet_userport_joystick_and_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : + device_t(mconfig, PET_USERPORT_JOYSTICK_AND_SOUND_DEVICE, "Dual Joysticks and Sound", tag, owner, clock, "2joysnd", __FILE__), + device_pet_user_port_interface(mconfig, *this), + m_dac(*this, DAC_TAG), + m_up1(1), + m_down1(1), + m_fire1(1), + m_up2(1), + m_down2(1), + m_fire2(1) + +{ +} + + +//------------------------------------------------- +// device_start - device-specific startup +//------------------------------------------------- + +void pet_userport_joystick_and_sound_device::device_start() +{ +} + + +//------------------------------------------------- +// update_port1 +//------------------------------------------------- + +void pet_userport_joystick_and_sound_device::update_port1() +{ +// printf( "update port1\n" ); + output_f(m_up1 && m_fire1); + output_e(m_down1 && m_fire1); +} + + +//------------------------------------------------- +// update_port2 +//------------------------------------------------- + +void pet_userport_joystick_and_sound_device::update_port2() +{ +// printf( "update port2\n" ); + output_l(m_up2 && m_fire2); + output_k(m_down2 && m_fire2); +} + + +DECLARE_WRITE_LINE_MEMBER( pet_userport_joystick_and_sound_device::input_m ) +{ + m_dac->write_unsigned8(state ? 0xff : 0x00); +} diff --git a/src/devices/bus/pet/2joysnd.h b/src/devices/bus/pet/2joysnd.h new file mode 100644 index 00000000000..26a2f193d71 --- /dev/null +++ b/src/devices/bus/pet/2joysnd.h @@ -0,0 +1,72 @@ +// license:BSD-3-Clause +// copyright-holders: Ken White +/********************************************************************** + + Commodore PET user port dual joystick and CB2 sound emulation + +**********************************************************************/ + +#pragma once + +#ifndef __2JOYSND__ +#define __2JOYSND__ + + +#include "emu.h" +#include "user.h" +#include "sound/dac.h" + + +//************************************************************************** +// TYPE DEFINITIONS +//************************************************************************** + +// ======================> pet_userport_joystick_adapter_device + +class pet_userport_joystick_and_sound_device : public device_t, + public device_pet_user_port_interface +{ +public: + // construction/destruction + pet_userport_joystick_and_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + + // optional information overrides + virtual ioport_constructor device_input_ports() const override; + + virtual machine_config_constructor device_mconfig_additions() const override; + + virtual DECLARE_WRITE_LINE_MEMBER( input_m ) override; + + required_device m_dac; + + // device_pet_user_port_interface overrides + WRITE_LINE_MEMBER( write_up1 ) { m_up1 = state; update_port1(); } + WRITE_LINE_MEMBER( write_down1 ) { m_down1 = state; update_port1(); } + WRITE_LINE_MEMBER( write_fire1 ) { m_fire1 = state; update_port1(); } + WRITE_LINE_MEMBER( write_up2 ) { m_up2 = state; update_port2(); } + WRITE_LINE_MEMBER( write_down2 ) { m_down2 = state; update_port2(); } + WRITE_LINE_MEMBER( write_fire2 ) { m_fire2 = state; update_port2(); } + + + +protected: + // device-level overrides + virtual void device_start() override; + + void update_port1(); + void update_port2(); + int m_up1; + int m_down1; + int m_fire1; + int m_up2; + int m_down2; + int m_fire2; + +}; + + +// device type definition +extern const device_type PET_USERPORT_JOYSTICK_AND_SOUND_DEVICE; + + +#endif diff --git a/src/devices/bus/pet/user.cpp b/src/devices/bus/pet/user.cpp index f56132c5dd3..c79f9eec83a 100644 --- a/src/devices/bus/pet/user.cpp +++ b/src/devices/bus/pet/user.cpp @@ -122,9 +122,11 @@ device_pet_user_port_interface::~device_pet_user_port_interface() #include "diag.h" #include "petuja.h" #include "cb2snd.h" +#include "2joysnd.h" SLOT_INTERFACE_START( pet_user_port_cards ) SLOT_INTERFACE("diag", PET_USERPORT_DIAGNOSTIC_CONNECTOR) SLOT_INTERFACE("petuja", PET_USERPORT_JOYSTICK_ADAPTER) SLOT_INTERFACE("cb2snd", PET_USERPORT_CB2_SOUND_DEVICE) + SLOT_INTERFACE("2joysnd", PET_USERPORT_JOYSTICK_AND_SOUND_DEVICE) SLOT_INTERFACE_END diff --git a/src/devices/bus/ti99x/gromport.cpp b/src/devices/bus/ti99x/gromport.cpp index 3eddb6433d9..32456359a40 100644 --- a/src/devices/bus/ti99x/gromport.cpp +++ b/src/devices/bus/ti99x/gromport.cpp @@ -1337,47 +1337,47 @@ bool ti99_cartridge_device::call_load() { case PCB_STANDARD: if (TRACE_CONFIG) logerror("Standard PCB\n"); - m_pcb = new ti99_standard_cartridge(); + m_pcb = std::make_unique(); break; case PCB_PAGED12K: if (TRACE_CONFIG) logerror("Paged PCB 12K\n"); - m_pcb = new ti99_paged12k_cartridge(); + m_pcb = std::make_unique(); break; case PCB_PAGED16K: if (TRACE_CONFIG) logerror("Paged PCB 16K\n"); - m_pcb = new ti99_paged16k_cartridge(); + m_pcb = std::make_unique(); break; case PCB_MINIMEM: if (TRACE_CONFIG) logerror("Minimem PCB\n"); - m_pcb = new ti99_minimem_cartridge(); + m_pcb = std::make_unique(); break; case PCB_SUPER: if (TRACE_CONFIG) logerror("Superspace PCB\n"); - m_pcb = new ti99_super_cartridge(); + m_pcb = std::make_unique(); break; case PCB_MBX: if (TRACE_CONFIG) logerror("MBX PCB\n"); - m_pcb = new ti99_mbx_cartridge(); + m_pcb = std::make_unique(); break; case PCB_PAGED379I: if (TRACE_CONFIG) logerror("Paged379i PCB\n"); - m_pcb = new ti99_paged379i_cartridge(); + m_pcb = std::make_unique(); break; case PCB_PAGED378: if (TRACE_CONFIG) logerror("Paged378 PCB\n"); - m_pcb = new ti99_paged378_cartridge(); + m_pcb = std::make_unique(); break; case PCB_PAGED377: if (TRACE_CONFIG) logerror("Paged377 PCB\n"); - m_pcb = new ti99_paged377_cartridge(); + m_pcb = std::make_unique(); break; case PCB_PAGEDCRU: if (TRACE_CONFIG) logerror("PagedCRU PCB\n"); - m_pcb = new ti99_pagedcru_cartridge(); + m_pcb = std::make_unique(); break; case PCB_GROMEMU: if (TRACE_CONFIG) logerror("Grom Emulation PCB\n"); - m_pcb = new ti99_gromemu_cartridge(); + m_pcb = std::make_unique(); break; } @@ -1408,7 +1408,6 @@ void ti99_cartridge_device::call_unload() } } - delete m_pcb; m_pcb = nullptr; m_connector->remove(m_slot); } diff --git a/src/devices/bus/ti99x/gromport.h b/src/devices/bus/ti99x/gromport.h index ee56c885b71..bebc7d9b05f 100644 --- a/src/devices/bus/ti99x/gromport.h +++ b/src/devices/bus/ti99x/gromport.h @@ -130,7 +130,7 @@ private: int m_slot; int get_index_from_tagname(); - ti99_cartridge_pcb* m_pcb; // inbound + std::unique_ptr m_pcb; // inbound ti99_cartridge_connector_device* m_connector; // outbound // RPK which is associated to this cartridge diff --git a/src/devices/cpu/drcbex64.cpp b/src/devices/cpu/drcbex64.cpp index b6a5e67732b..e1d41783a25 100644 --- a/src/devices/cpu/drcbex64.cpp +++ b/src/devices/cpu/drcbex64.cpp @@ -173,9 +173,21 @@ #include "drcuml.h" #include "drcbex64.h" +// This is a trick to make it build on Android where the ARM SDK declares ::REG_Rn +namespace drc { + using namespace uml; using namespace x64emit; +using x64emit::REG_R8; +using x64emit::REG_R9; +using x64emit::REG_R10; +using x64emit::REG_R11; +using x64emit::REG_R12; +using x64emit::REG_R13; +using x64emit::REG_R14; +using x64emit::REG_R15; + //************************************************************************** @@ -6935,3 +6947,5 @@ void drcbe_x64::op_icopyf(x86code *&dst, const instruction &inst) } } } + +} // namespace drc diff --git a/src/devices/cpu/drcbex64.h b/src/devices/cpu/drcbex64.h index cc78b52921d..2dcca934ddd 100644 --- a/src/devices/cpu/drcbex64.h +++ b/src/devices/cpu/drcbex64.h @@ -10,8 +10,8 @@ #pragma once -#ifndef __DRCBEX64_H__ -#define __DRCBEX64_H__ +#ifndef MAME_DEVICES_CPU_DRCBEX64_H +#define MAME_DEVICES_CPU_DRCBEX64_H #include "drcuml.h" #include "drcbeut.h" @@ -21,6 +21,7 @@ #include "x86emit.h" +namespace drc { //************************************************************************** // TYPE DEFINITIONS @@ -344,5 +345,9 @@ private: static opcode_generate_func s_opcode_table[uml::OP_MAX]; }; +} // namespace drc -#endif /* __DRCBEC_H__ */ +using drc::drcbe_x64; + + +#endif /* MAME_DEVICES_CPU_DRCBEX64_H */ diff --git a/src/devices/cpu/drcuml.cpp b/src/devices/cpu/drcuml.cpp index 0abb6172025..1296aed7f9c 100644 --- a/src/devices/cpu/drcuml.cpp +++ b/src/devices/cpu/drcuml.cpp @@ -55,6 +55,14 @@ using namespace uml; // TYPE DEFINITIONS //************************************************************************** +// determine the type of the native DRC, falling back to C +#ifndef NATIVE_DRC +typedef drcbe_c drcbe_native; +#else +typedef NATIVE_DRC drcbe_native; +#endif + + // structure describing back-end validation test struct bevalidate_test { diff --git a/src/devices/cpu/drcuml.h b/src/devices/cpu/drcuml.h index 1e57e74b02c..5a93b132752 100644 --- a/src/devices/cpu/drcuml.h +++ b/src/devices/cpu/drcuml.h @@ -10,8 +10,8 @@ #pragma once -#ifndef __DRCUML_H__ -#define __DRCUML_H__ +#ifndef MAME_DEVICES_CPU_DRCUML_H +#define MAME_DEVICES_CPU_DRCUML_H #include "drccache.h" #include "uml.h" @@ -29,16 +29,6 @@ // TYPE DEFINITIONS //************************************************************************** -// determine the type of the native DRC, falling back to C -#ifndef NATIVE_DRC -class drcbe_c; -typedef drcbe_c drcbe_native; -#else -class NATIVE_DRC; -typedef NATIVE_DRC drcbe_native; -#endif - - // opaque structure describing UML generation state class drcuml_state; @@ -263,4 +253,4 @@ inline void drcuml_block::append_comment(Format &&fmt, Params &&... args) } -#endif /* __DRCUML_H__ */ +#endif /* MAME_DEVICES_CPU_DRCUML_H */ diff --git a/src/devices/cpu/sharc/sharc.h b/src/devices/cpu/sharc/sharc.h index 671076a87f7..e2bed4c89cc 100644 --- a/src/devices/cpu/sharc/sharc.h +++ b/src/devices/cpu/sharc/sharc.h @@ -117,7 +117,7 @@ struct SHARC_DMA_OP #define OP_USERFLAG_COUNTER_LOOP 0x00000001 #define OP_USERFLAG_COND_LOOP 0x00000002 -#define OP_USERFLAG_COND_FIELD 0x0000003c +#define OP_USERFLAG_COND_FIELD 0x000003fc #define OP_USERFLAG_COND_FIELD_SHIFT 2 #define OP_USERFLAG_ASTAT_DELAY_COPY_AZ 0x00001000 #define OP_USERFLAG_ASTAT_DELAY_COPY_AN 0x00002000 diff --git a/src/devices/cpu/sharc/sharcdrc.cpp b/src/devices/cpu/sharc/sharcdrc.cpp index 72fd6ca8749..7657b8f2c3d 100644 --- a/src/devices/cpu/sharc/sharcdrc.cpp +++ b/src/devices/cpu/sharc/sharcdrc.cpp @@ -4331,7 +4331,6 @@ void adsp21062_device::generate_compute(drcuml_block *block, compiler_state *com case 0xc4: // Rn = BCLR Rx BY Ry | case 0x44: // Rn = FDEP Rx BY Ry | : case 0x4c: // Rn = FDEP Rx BY Ry | : (SE) - case 0x48: // Rn = FEXT Rx BY Ry | : (SE) case 0x24: // Rn = Rn OR ASHIFT Rx BY Ry | case 0x64: // Rn = Rn OR FDEP Rx BY Ry | : case 0x6c: // Rn = Rn OR FDEP Rx BY Ry | : (SE) @@ -4414,6 +4413,35 @@ void adsp21062_device::generate_compute(drcuml_block *block, compiler_state *com if (SS_CALC_REQUIRED) UML_MOV(block, ASTAT_SS, 0); return; + case 0x48: // Rn = FEXT Rx BY Ry | : (SE) + // extraction mask + UML_MOV(block, I0, REG(ry)); + UML_SHR(block, I1, I0, 6); + UML_AND(block, I1, I1, 0x3f); // i1 = len6 + UML_AND(block, I0, I0, 0x3f); // i0 = bit6 + UML_MOV(block, I3, 0xffffffff); + UML_SUB(block, I2, 32, I1); + UML_SHR(block, I3, I3, I2); + UML_SHL(block, I3, I3, I0); + + UML_AND(block, I3, REG(rx), I3); + + UML_ADD(block, I2, I0, I1); + UML_SUB(block, I2, 32, I2); + UML_SHL(block, I3, I3, I2); + UML_ADD(block, I2, I2, I0); + UML_SAR(block, REG(rn), I3, I2); + + if (SZ_CALC_REQUIRED) UML_SETc(block, COND_Z, ASTAT_SZ); + if (SV_CALC_REQUIRED) + { + UML_ADD(block, I0, I0, I1); + UML_CMP(block, I0, 32); + UML_SETc(block, COND_G, ASTAT_SV); + } + if (SS_CALC_REQUIRED) UML_MOV(block, ASTAT_SS, 0); + return; + case 0xc0: // Rn = BSET Rx BY Ry | { UML_MOV(block, I0, REG(ry)); @@ -4610,52 +4638,49 @@ void adsp21062_device::generate_do_condition(drcuml_block *block, compiler_state // Jump to skip_label if condition is true code_label not_skip; - UML_JMP(block, skip_label); - return; - switch (condition) { case 0x00: /* EQ */ - UML_TEST(block, ASTAT_AZ, 1); + UML_TEST(block, mem(&m_core->astat_delay_copy.az), 1); UML_JMPc(block, COND_NZ, skip_label); break; case 0x01: /* LT */ not_skip = compiler->labelnum++; - UML_TEST(block, ASTAT_AZ, 1); + UML_TEST(block, mem(&m_core->astat_delay_copy.az), 1); UML_JMPc(block, COND_NZ, not_skip); - UML_TEST(block, ASTAT_AN, 1); + UML_TEST(block, mem(&m_core->astat_delay_copy.an), 1); UML_JMPc(block, COND_Z, not_skip); UML_JMP(block, skip_label); UML_LABEL(block, not_skip); break; case 0x02: /* LE */ - UML_TEST(block, ASTAT_AZ, 1); + UML_TEST(block, mem(&m_core->astat_delay_copy.az), 1); UML_JMPc(block, COND_NZ, skip_label); - UML_TEST(block, ASTAT_AN, 1); + UML_TEST(block, mem(&m_core->astat_delay_copy.an), 1); UML_JMPc(block, COND_NZ, skip_label); break; case 0x03: /* AC */ - UML_TEST(block, ASTAT_AC, 1); + UML_TEST(block, mem(&m_core->astat_delay_copy.ac), 1); UML_JMPc(block, COND_NZ, skip_label); break; case 0x04: /* AV */ - UML_TEST(block, ASTAT_AV, 1); + UML_TEST(block, mem(&m_core->astat_delay_copy.av), 1); UML_JMPc(block, COND_NZ, skip_label); break; case 0x05: /* MV */ - UML_TEST(block, ASTAT_MV, 1); + UML_TEST(block, mem(&m_core->astat_delay_copy.mv), 1); UML_JMPc(block, COND_NZ, skip_label); break; case 0x06: /* MS */ - UML_TEST(block, ASTAT_MN, 1); + UML_TEST(block, mem(&m_core->astat_delay_copy.mn), 1); UML_JMPc(block, COND_NZ, skip_label); break; case 0x07: /* SV */ - UML_TEST(block, ASTAT_SV, 1); + UML_TEST(block, mem(&m_core->astat_delay_copy.sv), 1); UML_JMPc(block, COND_NZ, skip_label); break; case 0x08: /* SZ */ - UML_TEST(block, ASTAT_SZ, 1); + UML_TEST(block, mem(&m_core->astat_delay_copy.sz), 1); UML_JMPc(block, COND_NZ, skip_label); break; case 0x09: /* FLAG0 */ @@ -4675,7 +4700,7 @@ void adsp21062_device::generate_do_condition(drcuml_block *block, compiler_state UML_JMPc(block, COND_NE, skip_label); break; case 0x0d: /* TF */ - UML_TEST(block, ASTAT_BTF, 1); + UML_TEST(block, mem(&m_core->astat_delay_copy.btf), 1); UML_JMPc(block, COND_NZ, skip_label); break; case 0x0e: /* BM */ @@ -4685,46 +4710,46 @@ void adsp21062_device::generate_do_condition(drcuml_block *block, compiler_state fatalerror("generate_do_condition 0x0f"); // this should only be used with counter loops break; case 0x10: /* NOT EQUAL */ - UML_TEST(block, ASTAT_AZ, 1); + UML_TEST(block, mem(&m_core->astat_delay_copy.az), 1); UML_JMPc(block, COND_Z, skip_label); break; case 0x11: /* GE */ - UML_TEST(block, ASTAT_AZ, 1); + UML_TEST(block, mem(&m_core->astat_delay_copy.az), 1); UML_JMPc(block, COND_NZ, skip_label); - UML_TEST(block, ASTAT_AN, 1); + UML_TEST(block, mem(&m_core->astat_delay_copy.an), 1); UML_JMPc(block, COND_Z, skip_label); break; case 0x12: /* GT */ not_skip = compiler->labelnum++; - UML_TEST(block, ASTAT_AZ, 1); + UML_TEST(block, mem(&m_core->astat_delay_copy.az), 1); UML_JMPc(block, COND_NZ, not_skip); - UML_TEST(block, ASTAT_AN, 1); + UML_TEST(block, mem(&m_core->astat_delay_copy.an), 1); UML_JMPc(block, COND_NZ, not_skip); UML_JMP(block, skip_label); UML_LABEL(block, not_skip); break; case 0x13: /* NOT AC */ - UML_TEST(block, ASTAT_AC, 1); + UML_TEST(block, mem(&m_core->astat_delay_copy.ac), 1); UML_JMPc(block, COND_Z, skip_label); break; case 0x14: /* NOT AV */ - UML_TEST(block, ASTAT_AV, 1); + UML_TEST(block, mem(&m_core->astat_delay_copy.av), 1); UML_JMPc(block, COND_Z, skip_label); break; case 0x15: /* NOT MV */ - UML_TEST(block, ASTAT_MV, 1); + UML_TEST(block, mem(&m_core->astat_delay_copy.mv), 1); UML_JMPc(block, COND_Z, skip_label); break; case 0x16: /* NOT MS */ - UML_TEST(block, ASTAT_MN, 1); + UML_TEST(block, mem(&m_core->astat_delay_copy.mn), 1); UML_JMPc(block, COND_Z, skip_label); break; case 0x17: /* NOT SV */ - UML_TEST(block, ASTAT_SV, 1); + UML_TEST(block, mem(&m_core->astat_delay_copy.sv), 1); UML_JMPc(block, COND_Z, skip_label); break; case 0x18: /* NOT SZ */ - UML_TEST(block, ASTAT_SZ, 1); + UML_TEST(block, mem(&m_core->astat_delay_copy.sz), 1); UML_JMPc(block, COND_Z, skip_label); break; case 0x19: /* NOT FLAG0 */ @@ -4744,7 +4769,7 @@ void adsp21062_device::generate_do_condition(drcuml_block *block, compiler_state UML_JMPc(block, COND_E, skip_label); break; case 0x1d: /* NOT TF */ - UML_TEST(block, ASTAT_BTF, 1); + UML_TEST(block, mem(&m_core->astat_delay_copy.btf), 1); UML_JMPc(block, COND_Z, skip_label); break; case 0x1e: /* NOT BM */ diff --git a/src/devices/cpu/sharc/sharcfe.cpp b/src/devices/cpu/sharc/sharcfe.cpp index 249df349c60..4f7fc7435b4 100644 --- a/src/devices/cpu/sharc/sharcfe.cpp +++ b/src/devices/cpu/sharc/sharcfe.cpp @@ -183,15 +183,15 @@ bool sharc_frontend::describe(opcode_desc &desc, const opcode_desc *prev) if (map[index].looptype == LOOP_TYPE_CONDITIONAL) { UINT32 flags = m_sharc->do_condition_astat_bits(map[index].condition); - if (flags & adsp21062_device::ASTAT_FLAGS::AZ) desc.userflags |= OP_USERFLAG_ASTAT_DELAY_COPY_AZ; - if (flags & adsp21062_device::ASTAT_FLAGS::AN) desc.userflags |= OP_USERFLAG_ASTAT_DELAY_COPY_AN; - if (flags & adsp21062_device::ASTAT_FLAGS::AV) desc.userflags |= OP_USERFLAG_ASTAT_DELAY_COPY_AV; - if (flags & adsp21062_device::ASTAT_FLAGS::AC) desc.userflags |= OP_USERFLAG_ASTAT_DELAY_COPY_AC; - if (flags & adsp21062_device::ASTAT_FLAGS::MN) desc.userflags |= OP_USERFLAG_ASTAT_DELAY_COPY_MN; - if (flags & adsp21062_device::ASTAT_FLAGS::MV) desc.userflags |= OP_USERFLAG_ASTAT_DELAY_COPY_MV; - if (flags & adsp21062_device::ASTAT_FLAGS::SV) desc.userflags |= OP_USERFLAG_ASTAT_DELAY_COPY_SV; - if (flags & adsp21062_device::ASTAT_FLAGS::SZ) desc.userflags |= OP_USERFLAG_ASTAT_DELAY_COPY_SZ; - if (flags & adsp21062_device::ASTAT_FLAGS::BTF) desc.userflags |= OP_USERFLAG_ASTAT_DELAY_COPY_BTF; + if (flags & adsp21062_device::ASTAT_FLAGS::AZ) { desc.userflags |= OP_USERFLAG_ASTAT_DELAY_COPY_AZ; AZ_USED(desc); } + if (flags & adsp21062_device::ASTAT_FLAGS::AN) { desc.userflags |= OP_USERFLAG_ASTAT_DELAY_COPY_AN; AN_USED(desc); } + if (flags & adsp21062_device::ASTAT_FLAGS::AV) { desc.userflags |= OP_USERFLAG_ASTAT_DELAY_COPY_AV; AV_USED(desc); } + if (flags & adsp21062_device::ASTAT_FLAGS::AC) { desc.userflags |= OP_USERFLAG_ASTAT_DELAY_COPY_AC; AC_USED(desc); } + if (flags & adsp21062_device::ASTAT_FLAGS::MN) { desc.userflags |= OP_USERFLAG_ASTAT_DELAY_COPY_MN; MN_USED(desc); } + if (flags & adsp21062_device::ASTAT_FLAGS::MV) { desc.userflags |= OP_USERFLAG_ASTAT_DELAY_COPY_MV; MV_USED(desc); } + if (flags & adsp21062_device::ASTAT_FLAGS::SV) { desc.userflags |= OP_USERFLAG_ASTAT_DELAY_COPY_SV; SV_USED(desc); } + if (flags & adsp21062_device::ASTAT_FLAGS::SZ) { desc.userflags |= OP_USERFLAG_ASTAT_DELAY_COPY_SZ; SZ_USED(desc); } + if (flags & adsp21062_device::ASTAT_FLAGS::BTF) { desc.userflags |= OP_USERFLAG_ASTAT_DELAY_COPY_BTF; BTF_USED(desc); } } } diff --git a/src/devices/machine/gt64xxx.cpp b/src/devices/machine/gt64xxx.cpp index 263024010c8..51bf9dbc2f7 100644 --- a/src/devices/machine/gt64xxx.cpp +++ b/src/devices/machine/gt64xxx.cpp @@ -29,7 +29,7 @@ gt64xxx_device::gt64xxx_device(const machine_config &mconfig, const char *tag, d m_mem_config("memory_space", ENDIANNESS_LITTLE, 32, 32), m_io_config("io_space", ENDIANNESS_LITTLE, 32, 32), m_romRegion(*this, "rom"), - m_updateRegion(*this, "update"), m_cs_map(4) + m_updateRegion(*this, "update") { } @@ -62,9 +62,6 @@ void gt64xxx_device::device_start() io_offset = 0x00000000; status = 0x0; - //dma_addr_map.reserve(static_cast(proc_addr_bank::ADDR_NUM)); - dma_addr_map.resize(static_cast(proc_addr_bank::ADDR_NUM)); - // DMA timer m_dma_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(gt64xxx_device::perform_dma), this)); // Leave the timer disabled. diff --git a/src/devices/machine/gt64xxx.h b/src/devices/machine/gt64xxx.h index 6433dcbabde..467e72bcae5 100644 --- a/src/devices/machine/gt64xxx.h +++ b/src/devices/machine/gt64xxx.h @@ -290,7 +290,7 @@ private: std::vector m_ram[4]; // Chip Select - std::vector m_cs_map; + galileo_device_map m_cs_map[4]; template void map_trampoline(::address_map &map, device_t &device) { m_cs_map[id].map(map, *m_cs_map[id].device); @@ -305,7 +305,7 @@ private: int m_last_dma; emu_timer* m_dma_timer; - std::vector dma_addr_map; + galileo_addr_map dma_addr_map[proc_addr_bank::ADDR_NUM]; int dma_fetch_next(address_space &space, int which); TIMER_CALLBACK_MEMBER(perform_dma); address_space* dma_decode_address(UINT32 &addr); diff --git a/src/devices/video/voodoo_rast.hxx b/src/devices/video/voodoo_rast.hxx index 4c858bc1e69..b736d7b14e3 100644 --- a/src/devices/video/voodoo_rast.hxx +++ b/src/devices/video/voodoo_rast.hxx @@ -444,6 +444,26 @@ RASTERIZER_ENTRY( 0x00602439, 0x00044119, 0x00000000, 0x000B0379, 0x00000009, 0x //RASTERIZER_ENTRY( 0x02420002, 0x00000009, 0x00000000, 0x00030F7B, 0x08241AC7, 0xFFFFFFFF ) /* intro */ //RASTERIZER_ENTRY( 0x01420021, 0x00005119, 0x00000000, 0x00030F7B, 0x14261AC7, 0xFFFFFFFF ) /* intro */ //RASTERIZER_ENTRY( 0x00000005, 0x00005119, 0x00000000, 0x00030F7B, 0x14261A87, 0xFFFFFFFF ) /* in-game */ +RASTERIZER_ENTRY( 0x00000005, 0x00005119, 0x00000000, 0x00030BFB, 0x14261AC7, 0xFFFFFFFF ) /* 35 1239092 118514052 */ +RASTERIZER_ENTRY( 0x0000303A, 0x00004119, 0x00000000, 0x00030BFB, 0x142610C7, 0xFFFFFFFF ) /* * 72 400122 93801372 */ +RASTERIZER_ENTRY( 0x00000005, 0x00005119, 0x00000000, 0x00030F7B, 0x14261A87, 0xFFFFFFFF ) /* * 2 1715230 16465427 */ +RASTERIZER_ENTRY( 0x02422E12, 0x00005119, 0x00000000, 0x00030F7B, 0x08241AC7, 0xFFFFFFFF ) /* 81 404825 14369443 */ +RASTERIZER_ENTRY( 0x00582435, 0x00005119, 0x00000000, 0x00030F7B, 0x14261AC7, 0xFFFFFFFF ) /* * 69 505796 13187254 */ +RASTERIZER_ENTRY( 0x00000005, 0x00005119, 0x00000000, 0x00030F7B, 0x14261AC7, 0xFFFFFFFF ) /* 33 460278 12366856 */ +RASTERIZER_ENTRY( 0x00000015, 0x00005119, 0x00000000, 0x00030F7B, 0x14261AC7, 0xFFFFFFFF ) /* 60 341915 7357317 */ +RASTERIZER_ENTRY( 0x00000005, 0x00005119, 0x00000000, 0x00030FFB, 0x08241AC7, 0xFFFFFFFF ) /* 70 444582 7071742 */ +RASTERIZER_ENTRY( 0x00580021, 0x00005119, 0x00000000, 0x00030FFB, 0x14261AC7, 0xFFFFFFFF ) /* 51 242000 6018798 */ +RASTERIZER_ENTRY( 0x00000005, 0x00005119, 0x00000000, 0x00030B7B, 0x14261A07, 0xFFFFFFFF ) /* 28 26700 4497995 */ +RASTERIZER_ENTRY( 0x02420002, 0x00000009, 0x00000000, 0x00030F7B, 0x14261AC7, 0xFFFFFFFF ) /* 5 3817984 3777348 */ +RASTERIZER_ENTRY( 0x01424A11, 0x00000009, 0x00000000, 0x00030F7B, 0x14261AC7, 0xFFFFFFFF ) /* 31 1140930 3724657 */ +RASTERIZER_ENTRY( 0x00000005, 0x00005119, 0x00000000, 0x00030BFB, 0x14261A47, 0xFFFFFFFF ) /* 70 165464 3646194 */ +RASTERIZER_ENTRY( 0x00000005, 0x00005119, 0x00000000, 0x00030BFB, 0x14261A07, 0xFFFFFFFF ) /* 39 25812 3115146 */ +RASTERIZER_ENTRY( 0x00000035, 0x00005119, 0x00000000, 0x00030F7B, 0x14261AC7, 0xFFFFFFFF ) /* * 6 72291 2961233 */ +RASTERIZER_ENTRY( 0x00000015, 0x00005119, 0x00000000, 0x00030F7B, 0x14261A87, 0xFFFFFFFF ) /* 29 43584 2752299 */ +RASTERIZER_ENTRY( 0x00000005, 0x00001419, 0x00000000, 0x00030B7B, 0x14261A07, 0xFFFFFFFF ) /* 20 15210 2402045 */ +RASTERIZER_ENTRY( 0x00000005, 0x00005119, 0x00000000, 0x00030B7B, 0x14261AC7, 0xFFFFFFFF ) /* 24 58447 1844641 */ +RASTERIZER_ENTRY( 0x00000005, 0x00005119, 0x00000000, 0x00030F7B, 0x08241AC7, 0xFFFFFFFF ) /* 59 177334 1792616 */ +RASTERIZER_ENTRY( 0x01420021, 0x00000119, 0x00000000, 0x00030F7B, 0x14261AC7, 0xFFFFFFFF ) /* 72 27090 1632226 */ /* nbapbp ------> fbzColorPath alphaMode fogMode, fbzMode, texMode0, texMode1 */ //RASTERIZER_ENTRY( 0x00424219, 0x00000000, 0x00000001, 0x00030B7B, 0x08241AC7, 0xFFFFFFFF ) /* intro */ diff --git a/src/emu/debug/debugcpu.cpp b/src/emu/debug/debugcpu.cpp index 394fabdbed4..ce1b3a274fc 100644 --- a/src/emu/debug/debugcpu.cpp +++ b/src/emu/debug/debugcpu.cpp @@ -1470,66 +1470,66 @@ static void expression_write_memory_region(running_machine &machine, const char static expression_error::error_code expression_validate(void *param, const char *name, expression_space space) { - running_machine &machine = *(running_machine *)param; + running_machine &machine = *reinterpret_cast(param); device_t *device = nullptr; switch (space) { - case EXPSPACE_PROGRAM_LOGICAL: - case EXPSPACE_DATA_LOGICAL: - case EXPSPACE_IO_LOGICAL: - case EXPSPACE_SPACE3_LOGICAL: - if (name != nullptr) - { - device = expression_get_device(machine, name); - if (device == nullptr) - return expression_error::INVALID_MEMORY_NAME; - } - if (device == nullptr) - device = debug_cpu_get_visible_cpu(machine); - if (!device->memory().has_space(AS_PROGRAM + (space - EXPSPACE_PROGRAM_LOGICAL))) - return expression_error::NO_SUCH_MEMORY_SPACE; - break; - - case EXPSPACE_PROGRAM_PHYSICAL: - case EXPSPACE_DATA_PHYSICAL: - case EXPSPACE_IO_PHYSICAL: - case EXPSPACE_SPACE3_PHYSICAL: - if (name != nullptr) - { - device = expression_get_device(machine, name); - if (device == nullptr) - return expression_error::INVALID_MEMORY_NAME; - } - if (device == nullptr) - device = debug_cpu_get_visible_cpu(machine); - if (!device->memory().has_space(AS_PROGRAM + (space - EXPSPACE_PROGRAM_PHYSICAL))) - return expression_error::NO_SUCH_MEMORY_SPACE; - break; - - case EXPSPACE_OPCODE: - case EXPSPACE_RAMWRITE: - if (name != nullptr) - { - device = expression_get_device(machine, name); - if (device == nullptr) - return expression_error::INVALID_MEMORY_NAME; - } - if (device == nullptr) - device = debug_cpu_get_visible_cpu(machine); - if (!device->memory().has_space(AS_PROGRAM)) - return expression_error::NO_SUCH_MEMORY_SPACE; - break; - - case EXPSPACE_REGION: - if (name == nullptr) - return expression_error::MISSING_MEMORY_NAME; - if (machine.root_device().memregion(name)->base() == nullptr) + case EXPSPACE_PROGRAM_LOGICAL: + case EXPSPACE_DATA_LOGICAL: + case EXPSPACE_IO_LOGICAL: + case EXPSPACE_SPACE3_LOGICAL: + if (name) + { + device = expression_get_device(machine, name); + if (!device) return expression_error::INVALID_MEMORY_NAME; - break; - - default: + } + if (!device) + device = debug_cpu_get_visible_cpu(machine); + if (!device->memory().has_space(AS_PROGRAM + (space - EXPSPACE_PROGRAM_LOGICAL))) return expression_error::NO_SUCH_MEMORY_SPACE; + break; + + case EXPSPACE_PROGRAM_PHYSICAL: + case EXPSPACE_DATA_PHYSICAL: + case EXPSPACE_IO_PHYSICAL: + case EXPSPACE_SPACE3_PHYSICAL: + if (name) + { + device = expression_get_device(machine, name); + if (!device) + return expression_error::INVALID_MEMORY_NAME; + } + if (!device) + device = debug_cpu_get_visible_cpu(machine); + if (!device->memory().has_space(AS_PROGRAM + (space - EXPSPACE_PROGRAM_PHYSICAL))) + return expression_error::NO_SUCH_MEMORY_SPACE; + break; + + case EXPSPACE_OPCODE: + case EXPSPACE_RAMWRITE: + if (name) + { + device = expression_get_device(machine, name); + if (!device) + return expression_error::INVALID_MEMORY_NAME; + } + if (!device) + device = debug_cpu_get_visible_cpu(machine); + if (!device->memory().has_space(AS_PROGRAM)) + return expression_error::NO_SUCH_MEMORY_SPACE; + break; + + case EXPSPACE_REGION: + if (!name) + return expression_error::MISSING_MEMORY_NAME; + if (!machine.root_device().memregion(name) || !machine.root_device().memregion(name)->base()) + return expression_error::INVALID_MEMORY_NAME; + break; + + default: + return expression_error::NO_SUCH_MEMORY_SPACE; } return expression_error::NONE; } diff --git a/src/emu/emuopts.cpp b/src/emu/emuopts.cpp index 85bf2c0415e..1b99a55e1ba 100644 --- a/src/emu/emuopts.cpp +++ b/src/emu/emuopts.cpp @@ -219,6 +219,7 @@ emu_options::emu_options() , m_joystick_contradictory(false) , m_sleep(true) , m_refresh_speed(false) +, m_ui(UI_CABINET) { add_entries(emu_options::s_option_entries); } @@ -263,4 +264,10 @@ void emu_options::update_cached_options() m_joystick_contradictory = bool_value(OPTION_JOYSTICK_CONTRADICTORY); m_sleep = bool_value(OPTION_SLEEP); m_refresh_speed = bool_value(OPTION_REFRESHSPEED); + + auto ui_option_string = value(OPTION_UI); + if (!strcmp(ui_option_string, "simple")) + m_ui = UI_SIMPLE; + else + m_ui = UI_CABINET; } diff --git a/src/emu/emuopts.h b/src/emu/emuopts.h index d4d4731997c..2b6630d38dd 100644 --- a/src/emu/emuopts.h +++ b/src/emu/emuopts.h @@ -194,6 +194,12 @@ class emu_options : public core_options { public: + enum ui_option + { + UI_CABINET, + UI_SIMPLE + }; + // construction/destruction emu_options(); @@ -343,7 +349,7 @@ public: bool cheat() const { return bool_value(OPTION_CHEAT); } bool skip_gameinfo() const { return bool_value(OPTION_SKIP_GAMEINFO); } const char *ui_font() const { return value(OPTION_UI_FONT); } - const char *ui() const { return value(OPTION_UI); } + ui_option ui() const { return m_ui; } const char *ram_size() const { return value(OPTION_RAMSIZE); } // core comm options @@ -382,6 +388,7 @@ private: bool m_joystick_contradictory; bool m_sleep; bool m_refresh_speed; + ui_option m_ui; }; diff --git a/src/frontend/mame/mame.cpp b/src/frontend/mame/mame.cpp index c4487609ed3..000c20033cd 100644 --- a/src/frontend/mame/mame.cpp +++ b/src/frontend/mame/mame.cpp @@ -313,7 +313,7 @@ void emulator_info::display_ui_chooser(running_machine& machine) // force the UI to show the game select screen mame_ui_manager &mui = mame_machine_manager::instance()->ui(); render_container *container = &machine.render().ui_container(); - if (strcmp(machine.options().ui(), "simple") == 0) + if (machine.options().ui() == emu_options::UI_SIMPLE) ui::simple_menu_select_game::force_game_select(mui, container); else ui::menu_select_game::force_game_select(mui, container); diff --git a/src/frontend/mame/ui/mainmenu.cpp b/src/frontend/mame/ui/mainmenu.cpp index 7f0147b0eca..70e766cd38b 100644 --- a/src/frontend/mame/ui/mainmenu.cpp +++ b/src/frontend/mame/ui/mainmenu.cpp @@ -244,7 +244,7 @@ void menu_main::handle() break; case SELECT_GAME: - if (strcmp(machine().options().ui(),"simple")==0) + if (machine().options().ui() == emu_options::UI_SIMPLE) menu::stack_push(ui(), container, nullptr); else menu::stack_push(ui(), container, nullptr); diff --git a/src/frontend/mame/ui/menu.cpp b/src/frontend/mame/ui/menu.cpp index 3b523b697a6..995920655e6 100644 --- a/src/frontend/mame/ui/menu.cpp +++ b/src/frontend/mame/ui/menu.cpp @@ -266,14 +266,14 @@ void menu::reset(reset_options options) } else if (m_parent->is_special_main_menu()) { - if (strcmp(machine().options().ui(), "simple") == 0) + if (machine().options().ui() == emu_options::UI_SIMPLE) item_append(_("Exit"), nullptr, 0, nullptr); else item_append(_("Exit"), nullptr, FLAG_UI | FLAG_LEFT_ARROW | FLAG_RIGHT_ARROW, nullptr); } else { - if (strcmp(machine().options().ui(), "simple") != 0 && menu::stack_has_special_main_menu()) + if (machine().options().ui() != emu_options::UI_SIMPLE && menu::stack_has_special_main_menu()) item_append(_("Return to Previous Menu"), nullptr, FLAG_UI | FLAG_LEFT_ARROW | FLAG_RIGHT_ARROW, nullptr); else item_append(_("Return to Previous Menu"), nullptr, 0, nullptr); diff --git a/src/frontend/mame/ui/optsmenu.cpp b/src/frontend/mame/ui/optsmenu.cpp index 2ba2b902f46..e0d3e2ff663 100644 --- a/src/frontend/mame/ui/optsmenu.cpp +++ b/src/frontend/mame/ui/optsmenu.cpp @@ -59,7 +59,7 @@ void menu_game_options::handle() // process the menu const event *menu_event; - if (strcmp(machine().options().ui(), "simple") == 0) + if (machine().options().ui() == emu_options::UI_SIMPLE) { menu_event = process(PROCESS_LR_REPEAT); } @@ -223,7 +223,7 @@ void menu_game_options::handle() void menu_game_options::populate() { - if (strcmp(machine().options().ui(),"simple")!=0) + if (machine().options().ui() != emu_options::UI_SIMPLE) { // set filter arrow std::string fbuff; diff --git a/src/mame/drivers/aerofgt.cpp b/src/mame/drivers/aerofgt.cpp index 15ae41e4221..d61597ad1ec 100644 --- a/src/mame/drivers/aerofgt.cpp +++ b/src/mame/drivers/aerofgt.cpp @@ -233,6 +233,8 @@ static ADDRESS_MAP_START( spinlbrk_map, AS_PROGRAM, 16, aerofgt_state ) AM_RANGE(0xfff002, 0xfff003) AM_READ_PORT("IN1") AM_WRITE(aerofgt_bg2scrollx_w) AM_RANGE(0xfff004, 0xfff005) AM_READ_PORT("DSW") AM_RANGE(0xfff006, 0xfff007) AM_WRITE(sound_command_w) +// AM_RANGE(0xfff008, 0xfff009) - read when analog inputs are enabled +// AM_RANGE(0xfff00a, 0xfff00b) / ADDRESS_MAP_END static ADDRESS_MAP_START( turbofrc_map, AS_PROGRAM, 16, aerofgt_state ) @@ -1560,7 +1562,7 @@ static MACHINE_CONFIG_START( spinlbrk, aerofgt_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",M68000,XTAL_20MHz/2) /* verified on pcb */ MCFG_CPU_PROGRAM_MAP(spinlbrk_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", aerofgt_state, irq1_line_hold)/* there are vectors for 3 and 4 too */ + MCFG_CPU_VBLANK_INT_DRIVER("screen", aerofgt_state, irq1_line_hold) /* there are vectors for 3 and 4 too, analog related? */ MCFG_CPU_ADD("audiocpu",Z80,XTAL_20MHz/4) /* 5mhz verified on pcb */ MCFG_CPU_PROGRAM_MAP(sound_map) @@ -1580,7 +1582,7 @@ static MACHINE_CONFIG_START( spinlbrk, aerofgt_state ) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", turbofrc) - MCFG_PALETTE_ADD("palette", 1024) + MCFG_PALETTE_ADD_INIT_BLACK("palette", 1024) // doesn't fully initialize palette at start-up ... MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) MCFG_DEVICE_ADD("vsystem_spr_old", VSYSTEM_SPR2, 0) diff --git a/src/mame/drivers/aristmk6.cpp b/src/mame/drivers/aristmk6.cpp index 3d671794925..2e2d7e9fc51 100644 --- a/src/mame/drivers/aristmk6.cpp +++ b/src/mame/drivers/aristmk6.cpp @@ -342,7 +342,7 @@ ROM_START( 50lions ) ROM_LOAD32_WORD("10120511.u73", 0x0000002, 0x0400000, CRC(1c1f2297) SHA1(13fb8c83d8ce2340ef554490c21a38da7b47c666) ) ROM_END -ROM_START( 50lionsa ) +ROM_START( 50lionsm ) ARISTMK6_BIOS ROM_REGION( 0x1800000, "game_rom", ROMREGION_ERASEFF) @@ -350,7 +350,7 @@ ROM_START( 50lionsa ) ROM_LOAD32_WORD("10156111.u73", 0x0000002, 0x0400000, CRC(ec1b699b) SHA1(5a6ad7c7eb02443e42ee6a88525ae95a2b0a3195) ) ROM_END -ROM_START( choysun ) +ROM_START( csdm ) ARISTMK6_BIOS ROM_REGION( 0x1800000, "game_rom", ROMREGION_ERASEFF) @@ -360,7 +360,7 @@ ROM_START( choysun ) ROM_LOAD32_WORD("20131511.u72", 0x0800002, 0x0400000 ,CRC(1c9a77d1) SHA1(ef31215be73b09531039fda1a2f3e875045180f3) ) ROM_END -ROM_START( crystals ) +ROM_START( crysprim ) ARISTMK6_BIOS ROM_REGION( 0x1800000, "game_rom", ROMREGION_ERASEFF) @@ -368,7 +368,7 @@ ROM_START( crystals ) ROM_LOAD32_WORD("10155811.u73", 0x0000002, 0x0400000, CRC(b52cac8a) SHA1(65bb5d73933df6d53a079e4efe00ea29649e3201) ) ROM_END -ROM_START( indianmm ) +ROM_START( indremmm ) ARISTMK6_BIOS ROM_REGION( 0x1800000, "game_rom", ROMREGION_ERASEFF) @@ -378,7 +378,7 @@ ROM_START( indianmm ) ROM_LOAD32_WORD("10130711.u72", 0x0800002, 0x0400000, CRC(efe15e58) SHA1(8ae7b1436664189a5d07f523d41611bca6d1936c) ) ROM_END -ROM_START( wheregld ) +ROM_START( wheregldm ) ARISTMK6_BIOS ROM_REGION( 0x1800000, "game_rom", ROMREGION_ERASEFF) @@ -400,7 +400,7 @@ ROM_START( whalecsh ) ROM_LOAD32_WORD("20155711.u72", 0x0800002, 0x0400000, CRC(e799e162) SHA1(aad5d6bff8afcb7f208326c4a663e8462d753f9f) ) ROM_END -ROM_START( wildways ) +ROM_START( wwaysm ) ARISTMK6_BIOS ROM_REGION( 0x1800000, "game_rom", ROMREGION_ERASEFF) @@ -410,7 +410,7 @@ ROM_START( wildways ) ROM_LOAD32_WORD("10130111.u72", 0x0800002, 0x0400000, CRC(5f2c30d1) SHA1(dfc68903e8375597477acc2fc403dcd9b838ae6c) ) ROM_END -ROM_START( thaiprin ) +ROM_START( thaiprncm ) ARISTMK6_BIOS ROM_REGION( 0x1800000, "game_rom", ROMREGION_ERASEFF) @@ -431,7 +431,7 @@ ROM_END -ROM_START( 5dragons ) +ROM_START( 5dragsp ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("5 Dragons Demo.003.u72", 0x0800002, 0x0400000, CRC(a534f262) SHA1(27201f8fd9a6c55e41e30d73e2868961961df827) ) @@ -454,7 +454,7 @@ ROM_END -ROM_START( alchemya ) +ROM_START( alchemy ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("Alchemy.003.u72", 0x0800002, 0x0400000, CRC(11321ce3) SHA1(83c6e7618b29fa7ea8c01e27be0b6e4d85822299) ) @@ -465,7 +465,7 @@ ROM_END -ROM_START( amzqnar ) +ROM_START( amzqueen ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("AmazonQueen 003.u72", 0x0800002, 0x0400000, CRC(1e039e60) SHA1(4f6c5db24c2841daa9b29af2732335498f8b8f0d) ) @@ -475,7 +475,7 @@ ROM_START( amzqnar ) ROM_END -ROM_START( arbnigar ) +ROM_START( arabnga6 ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("Arabian Nights.003.u72", 0x0800002, 0x0400000, CRC(709de514) SHA1(3f380ef548c45fa8eaba9cba2bbabdcb59c7660b) ) @@ -486,7 +486,7 @@ ROM_END -ROM_START( bigbenpj ) +ROM_START( bigben ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("bigben_003.u72", 0x0800002, 0x0400000, CRC(b5b0fb0e) SHA1(a5f233c1472d7b27a85e2b116ccac8ef61d23e6c) ) @@ -506,7 +506,7 @@ ROM_END -ROM_START( bigredjp ) +ROM_START( bigred2 ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("Big Red 2 -Stand Alone.002.u85", 0x0800000, 0x0400000, CRC(e05a45db) SHA1(4fff979915952addc3251adb4385f0072b2033cd) ) @@ -517,7 +517,7 @@ ROM_END -ROM_START( birredar ) +ROM_START( bigred ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("bigr.000.u86", 0x0000000, 0x0400000, CRC(da16ed45) SHA1(febb8f960009361250ab78814d60d008b3778a57) ) @@ -539,7 +539,7 @@ ROM_END -ROM_START( brazilar ) +ROM_START( brazil ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("Brazil 001.u73", 0x0000002, 0x0400000, CRC(5eb15d8b) SHA1(dc313f96390eb04769c5c9249b140eed67796cd8) ) @@ -547,7 +547,7 @@ ROM_START( brazilar ) ROM_END -ROM_START( bucanar ) +ROM_START( bucaneer ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("Buccaneer.001.u73", 0x0000002, 0x0400000, CRC(fa1e540e) SHA1(12d36d59fd176cbfad5e78f913a259fd06150f89) ) @@ -556,7 +556,7 @@ ROM_END -ROM_START( buffalar ) +ROM_START( buffalo ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("buffalo.000.u86", 0x0000000, 0x0400000, CRC(9fc2bb3e) SHA1(2a0253500b52ebdebb61c0c8cf296ba9cff575da) ) @@ -589,7 +589,7 @@ ROM_END -ROM_START( canary2 ) +ROM_START( canaryrc ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("Canary Riches 001.u73", 0x0000002, 0x0400000, CRC(6ae381ec) SHA1(d1103744805137dc69b77a3e1319c7168c88306f) ) @@ -674,7 +674,7 @@ ROM_END -ROM_START( deltqn ) +ROM_START( deltaqn ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("Delta Queen_003.u72", 0x0800002, 0x0400000, CRC(1978abb1) SHA1(7ffd1d81201bcf31936bbc5bd194b182cb9b5cdc) ) @@ -694,7 +694,7 @@ ROM_END -ROM_START( dinoaris ) +ROM_START( dinosa6 ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("Dinosaur.003.u72", 0x0800002, 0x0400000, CRC(34181cf9) SHA1(93d014891789260fe0a0eeeff17c25c6211753db) ) @@ -705,7 +705,7 @@ ROM_END -ROM_START( doubdolp ) +ROM_START( dbldolph ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("double_dolphins_003.u72", 0x0800002, 0x0400000, CRC(cd886389) SHA1(d0044d88d7cc168ae24e3a61f7e4758317b82417) ) @@ -716,7 +716,7 @@ ROM_END -ROM_START( drgnlrd ) +ROM_START( drgnlord ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("DragonLord_.002.u85", 0x0800000, 0x0400000, CRC(d17e1a0d) SHA1(955e4956656e7f08e352628cc632af0e3cb6cf0f) ) @@ -741,7 +741,7 @@ ROM_END -ROM_START( ent6r ) +ROM_START( enchantr ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("Enchantress_.001.u73", 0x0000002, 0x0400000, CRC(dcaaec40) SHA1(f035e54d9c926826c7883838a65260fc5ca6c02c) ) @@ -760,7 +760,7 @@ ROM_END -ROM_START( firedan ) +ROM_START( firednc ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("U72 Fire Dancer.003.u72", 0x0800002, 0x0400000, CRC(de394e4c) SHA1(9ec430df94de2cc0dbc8cc3a8763fde257fe3477) ) @@ -789,7 +789,7 @@ ROM_END -ROM_START( geishaar ) +ROM_START( geishaa6 ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("003.u72", 0x0800002, 0x0400000, CRC(1efb986d) SHA1(34a5964e0eada085ff738ee4853beb75c431aaaa) ) @@ -799,7 +799,7 @@ ROM_START( geishaar ) ROM_END -ROM_START( goapear ) +ROM_START( goape ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("Go Ape 001.u73", 0x0000002, 0x0400000, CRC(d579d719) SHA1(e3679657ed2f27b52a762a7f424714e5080a6957) ) @@ -817,7 +817,7 @@ ROM_START( gogreen ) ROM_END -ROM_START( goldarjp ) +ROM_START( goldarch ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("Golden Archer 003.u72", 0x0800002, 0x0400000, CRC(f6d262c6) SHA1(09e5f1e3838921482b01005e8781e83f08a9bd75) ) @@ -859,7 +859,7 @@ ROM_START( grizzly ) ROM_END -ROM_START( heartgar ) +ROM_START( heartgld ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("Heart of Gold 72.003.u72", 0x0800002, 0x0400000, CRC(041cf141) SHA1(793a1c1ca44f0d4c83294456f953dc4e7fd3b134) ) @@ -877,7 +877,7 @@ ROM_START( heartveg ) ROM_END -ROM_START( highnoar ) +ROM_START( highnoon ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("High Noon 003.u72", 0x0800002, 0x0400000, CRC(fa35cdef) SHA1(060af506fee9234fb4921b788368e3e850b681c9) ) @@ -897,7 +897,7 @@ ROM_START( holdrma ) ROM_END -ROM_START( houhear ) +ROM_START( househrt ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("House_of_Hearts.001.u73", 0x0000002, 0x0400000, CRC(ad7c55fc) SHA1(873abc95c8118b5ca73779445023e8e0299498a6) ) @@ -915,7 +915,7 @@ ROM_START( incachf ) ROM_END -ROM_START( indce ) +ROM_START( indremce ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("003.u72", 0x0800002, 0x0400000, CRC(4269940b) SHA1(8f5f6d751360e0abe2a6a80551f56176c46249e5) ) @@ -924,7 +924,7 @@ ROM_START( indce ) ROM_LOAD32_WORD("000.u86", 0x0000000, 0x0400000, CRC(18ae6a0a) SHA1(0401b86c7053129eb7fbd27c3e5988481df67481) ) ROM_END -ROM_START( indll ) +ROM_START( indremll ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("Indian Dreaming L L 005.u71", 0x1000002, 0x0400000, CRC(81aecf10) SHA1(ca9236003e12dbe897dd942696dbac5cf059e8f1) ) @@ -936,7 +936,7 @@ ROM_START( indll ) ROM_END -ROM_START( indsc ) +ROM_START( indrem2c ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("003.u72", 0x0800002, 0x0400000, CRC(7181dc26) SHA1(63b6ae4c3e7464d75762224a8c30348c6c6f0e98) ) @@ -945,7 +945,7 @@ ROM_START( indsc ) ROM_LOAD32_WORD("000.u86", 0x0000000, 0x0400000, CRC(23a13807) SHA1(5e0a403c3d227ef8ba49e2bd5f0a4f77acd42518) ) ROM_END -ROM_START( indsrp ) +ROM_START( drmcatch ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("Indian Dreaming SRP 003.u72", 0x0800002, 0x0400000, CRC(46244616) SHA1(3e16e7dd6f5afba135c3f1b9b40b7cfecc0d83e4) ) @@ -955,7 +955,7 @@ ROM_START( indsrp ) ROM_END -ROM_START( indgcm ) +ROM_START( indremcm ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("indian_gold_003.u72", 0x0800002, 0x0400000, CRC(e814271e) SHA1(9aaf9a463fd08a9cdb48dcb60cb0242f3df1b759) ) @@ -975,7 +975,7 @@ ROM_START( indprncs ) ROM_END -ROM_START( jailbrar ) +ROM_START( jailbrk ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("10125611_JAILBREAK_716.003.u72", 0x0800002, 0x0400000, CRC(5185ad7f) SHA1(34517ded04bf51be348200bc09e848ab74ccbeef) ) @@ -1007,7 +1007,7 @@ ROM_END -ROM_START( koalmnt ) +ROM_START( koalama6 ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("KoalaMint_003.u72", 0x0800002, 0x0400000, CRC(84c0f78d) SHA1(3f8e98261bfce1223de538d6bd53fa92d38c4b0d) ) @@ -1056,7 +1056,7 @@ ROM_START( lougcm ) ROM_LOAD32_WORD("louiesgold_000.u86", 0x0000000, 0x0400000, CRC(095161ec) SHA1(4b9ff183d244f70f59eefb2eb6b261e3bcf0c486) ) ROM_END -ROM_START( luigball ) +ROM_START( luigibal ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("Gam_Eprm.u71", 0x1000002, 0x0400000, CRC(4f289aea) SHA1(0c77020a30178644a02dac5c9e8ab5543b63409e) ) @@ -1149,7 +1149,7 @@ ROM_START( owlcap ) ROM_LOAD32_WORD("Owl Capone Demo.000.u86", 0x0000000, 0x0400000, CRC(66b2dc21) SHA1(1eeff14dd037c8c4c7fc95a04a8dc5946200d453) ) ROM_END -ROM_START( pariligh ) +ROM_START( parislgt ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("Paris Lights 003.u72", 0x0800002, 0x0400000, CRC(d04e5031) SHA1(46ef9fe928409ec031afa97f67b271cb0059c603) ) @@ -1179,7 +1179,7 @@ ROM_START( pelipete ) ROM_END -ROM_START( pharpor ) +ROM_START( pharfor ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("Pharaoh's Fortune.003.u72", 0x0800002, 0x0400000, CRC(c5d24a99) SHA1(d6d17ab5255d153beacc39880bd58b7b647f532f) ) @@ -1199,7 +1199,7 @@ ROM_START( phxfant ) ROM_END -ROM_START( piratar ) +ROM_START( pirata6 ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("Pirates_001.u73", 0x0000002, 0x0400000, CRC(5923957d) SHA1(62d6effe9f3af0cdc301bbc6541971e91ddc573a) ) @@ -1221,19 +1221,7 @@ ROM_START( pcbydem ) ROM_END -ROM_START( pcfav ) - ARISTMK6_BIOS - ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) - ROM_LOAD32_WORD("123456.000.u86", 0x0000000, 0x0400000, CRC(864ff191) SHA1(2750d74564a56615034df8417dcb7b8edb43f36e) ) - ROM_LOAD32_WORD("123456.001.u73", 0x0000002, 0x0400000, CRC(4de61358) SHA1(f1d732dfd8f3a05ab0fde7e4b98261d2f2a10a5f) ) - ROM_LOAD32_WORD("123456.002.u85", 0x0800000, 0x0400000, CRC(385e8636) SHA1(5e4bf33f91481080c80264b915a11606b03f8686) ) - ROM_LOAD32_WORD("123456.003.u72", 0x0800002, 0x0400000, CRC(9b0fb8b6) SHA1(bd5a2734068e031ca7ab0f19749f28f84288125f) ) - ROM_LOAD32_WORD("123456.004.u84", 0x1000000, 0x0400000, CRC(7944e972) SHA1(23d45a2e948a737d3186de5f0447ec7dd51ddc7b) ) - ROM_LOAD32_WORD("123456.005.u71", 0x1000002, 0x0400000, CRC(116bb514) SHA1(cd3dcca730c8e9d3fe5b0c70638f3d81f8eb8f98) ) -ROM_END - - -ROM_START( pompeiar ) +ROM_START( pompeia6 ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("003.u72", 0x0800002, 0x0400000, CRC(e3c02b5e) SHA1(714e83160917e83dafc058a9078ace800c4c3ebf) ) @@ -1251,7 +1239,7 @@ ROM_START( prideaf ) ROM_END -ROM_START( prophar ) +ROM_START( prophecy ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("Prophecy.003.u72", 0x0800002, 0x0400000, CRC(194be1d6) SHA1(8f71ff6646a34261cb003fea877b42742eea8c15) ) @@ -1270,7 +1258,7 @@ ROM_START( qsheeba ) ROM_LOAD32_WORD("queen_of_Sheba.000.u86", 0x0000000, 0x0400000, CRC(e1313dff) SHA1(536014d8d4f3ff90d93befdcd55d5b3e6eb49e7c) ) ROM_END -ROM_START( qnilecj ) +ROM_START( qnilejc ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("Gam_Eprm.u72", 0x0800002, 0x0400000, CRC(a1aa9310) SHA1(a00a7dfd57fe8624421e6821c32516f018199d49) ) @@ -1311,7 +1299,7 @@ ROM_START( raprichs ) ROM_END -ROM_START( redbarar ) +ROM_START( redbara6 ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("redbaron.003.u72", 0x0800002, 0x0400000, CRC(16b6207f) SHA1(9c5ac48cccba001b2e3605eceb9610c659e06e21) ) @@ -1331,7 +1319,7 @@ ROM_START( ruprup ) ROM_END -ROM_START( rubmgc ) +ROM_START( rubymag ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("RubyMagic_003.u72", 0x0800002, 0x0400000, CRC(2cdfe857) SHA1(33b4ce8ab0a5f1e341a5c5c536c5f3619ecd7f95) ) @@ -1341,7 +1329,7 @@ ROM_START( rubmgc ) ROM_END -ROM_START( scatmg2 ) +ROM_START( scatmag2 ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("Scatter Magic II.000.u86", 0x0000000, 0x0400000, CRC(696734d8) SHA1(baffadb943fb12d0d19069023f5cdf80b1a1674f) ) @@ -1351,7 +1339,7 @@ ROM_START( scatmg2 ) ROM_END -ROM_START( sharmnm ) +ROM_START( shamnmg ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("Shaman's Magic.001.u73", 0x0000002, 0x0400000, CRC(a84ac2a4) SHA1(743d56448135b03c25325bdc3d79781e63f0b9b6) ) @@ -1359,7 +1347,7 @@ ROM_START( sharmnm ) ROM_END -ROM_START( smtmar ) +ROM_START( smtma6 ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("10001911_SHOW_ME_THE_MONEY_657_1.003.u72", 0x0800002, 0x0400000, CRC(cb5f47d4) SHA1(70fa1e68bf1fbebc6b6663fbabb78c5f286b7805) ) @@ -1369,7 +1357,7 @@ ROM_START( smtmar ) ROM_END -ROM_START( silgolar ) +ROM_START( silgola6 ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("Gam_Eprm.u72", 0x0800002, 0x0400000, CRC(05861fb2) SHA1(ba3d2e3ab66fd7178289fdc95661f27e08124f32) ) @@ -1423,7 +1411,7 @@ ROM_START( tahitim ) ROM_END -ROM_START( thaiprar ) +ROM_START( thaiprnc ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("Thai_Princess_1of4_000.u86", 0x0000000, 0x0400000, CRC(609b3112) SHA1(77648426c7fed2e39d48d4f1ced524067bf0bb1a) ) @@ -1451,7 +1439,7 @@ ROM_START( thndrhrt ) ROM_END -ROM_START( tigresar ) +ROM_START( tigress ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("Tigress.000.u86", 0x0000000, 0x0400000, CRC(d1ff02f7) SHA1(8e8f1c4ed3c01fc62011b1bd21f53314e345f10f) ) @@ -1459,7 +1447,7 @@ ROM_START( tigresar ) ROM_END -ROM_START( topshtar ) +ROM_START( topshta6 ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("Top_Shot.000.u86", 0x0000000, 0x0400000, CRC(798200b2) SHA1(e753f8c8c26e30ab36705f748c01b90bcf166d82) ) @@ -1477,7 +1465,7 @@ ROM_START( torgods ) ROM_END -ROM_START( torpdice ) +ROM_START( toprdice ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("003.u72", 0x0800002, 0x0400000, CRC(f2ccd55e) SHA1(24738035abc26459d3d06831c907da98aea9c257) ) @@ -1487,7 +1475,7 @@ ROM_START( torpdice ) ROM_END -ROM_START( turtrea ) +ROM_START( turtreas ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("003.u72", 0x0800002, 0x0400000, CRC(f864fe2e) SHA1(9aa16c4cf3936841a1152418aca7a5dd3ad5a2b3) ) @@ -1508,7 +1496,7 @@ ROM_START( venetian ) ROM_END -ROM_START( witgold ) +ROM_START( wheregld ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("003.u72", 0x0800002, 0x0400000, CRC(584050fc) SHA1(014889e1bf3fa38c052073c374b47684be717949) ) @@ -1535,7 +1523,7 @@ ROM_START( wldgoos ) ROM_END -ROM_START( wldpan2 ) +ROM_START( wldpanda ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("Wild_panda.001.u73", 0x0000002, 0x0400000, CRC(46e28dff) SHA1(b1fd7c0d0c814f04b2bd6f35835d1d1d41aab62c) ) @@ -1545,7 +1533,7 @@ ROM_START( wldpan2 ) ROM_END -ROM_START( wldstal2 ) +ROM_START( wldstall ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("Wild Stalon.003.u72", 0x0800002, 0x0400000, CRC(0f4de65a) SHA1(232406f335786a045ab1833db50465ed476dfffe) ) @@ -1575,7 +1563,7 @@ ROM_START( wwaratah ) ROM_END -ROM_START( wwaysar ) +ROM_START( wways ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("Gam_Eprm.u72", 0x0800002, 0x0400000, CRC(acce8d74) SHA1(e22e9611e9a221bd5dfaad3d9feece1646bebe02) ) @@ -1585,7 +1573,7 @@ ROM_START( wwaysar ) ROM_END -ROM_START( wwaysll ) +ROM_START( wzwaysll ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("Gam_Eprm.u71", 0x1000002, 0x0400000, CRC(e8f8ffb1) SHA1(3aa4f8d959e9671ae93c9946b5420d55c45b1bbc) ) @@ -1597,7 +1585,7 @@ ROM_START( wwaysll ) ROM_END -ROM_START( zorrojp ) +ROM_START( zorroa6 ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("30130611_ZORRO_743.003.u72", 0x0800002, 0x0400000, CRC(cc5616af) SHA1(94d1d36b76e2587caa2c60ea70c9206580dc53d5) ) @@ -1608,7 +1596,7 @@ ROM_END -ROM_START( 5draga ) +ROM_START( 5drag ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("5dragons_.u72", 0x0800002, 0x0400000, CRC(e81d47fe) SHA1(f5730f9b5fa9a4492289ddcbc8e88d0a62771667) ) @@ -1633,7 +1621,7 @@ ROM_END -ROM_START( amzteml ) +ROM_START( amztempl ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("Gam_Eprm.u71", 0x1000002, 0x0400000, CRC(8b6ef913) SHA1(7cc8688cb9c6096a81ad21cdc046db5bd0134356) ) @@ -1646,14 +1634,7 @@ ROM_END - - - - - - - -ROM_START( buffaloa ) +ROM_START( buffalou ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("buffalo.u72", 0x0800002, 0x0400000, CRC(2a35e7df) SHA1(112ea1872bc3b8533e1339f8eb19ef9ea0740773) ) @@ -1664,8 +1645,6 @@ ROM_END - - ROM_START( cactusco ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) @@ -1677,7 +1656,7 @@ ROM_END -ROM_START( callwlar ) +ROM_START( callwld ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("Call Of The Wild.u71", 0x1000002, 0x0400000, CRC(ed7dc53a) SHA1(686326580fe1a58685341d82ae5697fd216b88b6) ) @@ -1689,12 +1668,6 @@ ROM_START( callwlar ) ROM_END - - - - - - ROM_START( deepfrz ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) @@ -1707,10 +1680,6 @@ ROM_START( deepfrz ) ROM_END - - - - ROM_START( drmred ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) @@ -1722,9 +1691,7 @@ ROM_END - - -ROM_START( encspela ) +ROM_START( encspell ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("Gam_Eprm.u71", 0x1000002, 0x0400000, CRC(7f91f73f) SHA1(5b70ffe30047d68bf521ee773ff3c323d1678e83) ) @@ -1762,12 +1729,7 @@ ROM_START( goldsam ) ROM_END - - - - - -ROM_START( inddrma ) +ROM_START( indream ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("Indian Dreaming.u72", 0x0800002, 0x0400000, CRC(92c75004) SHA1(6baa35896dd51c17ab5818919616a217b8b2e4dd) ) @@ -1777,11 +1739,7 @@ ROM_START( inddrma ) ROM_END - - - - -ROM_START( luck88 ) +ROM_START( lucky88 ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("Gam_Eprm.u71", 0x1000002, 0x0400000, CRC(f0e88142) SHA1(52271aa7dbdc99cff2a8e5230210758f4534f3bd) ) @@ -1793,9 +1751,6 @@ ROM_START( luck88 ) ROM_END - - - ROM_START( milkin ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) @@ -1833,7 +1788,7 @@ ROM_END -ROM_START( pcfava ) +ROM_START( pcfavor ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("Players Choice-Favourites.u71", 0x1000002, 0x0400000, CRC(116bb514) SHA1(cd3dcca730c8e9d3fe5b0c70638f3d81f8eb8f98) ) @@ -1858,7 +1813,7 @@ ROM_START( pcmostw ) ROM_END -ROM_START( pcnewz ) +ROM_START( pcgold ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("Gam_Eprm.u70", 0x1800002, 0x0400000, CRC(1d67f455) SHA1(4247d21757522a69184d32434cfa191a026aff19) ) @@ -1872,13 +1827,7 @@ ROM_START( pcnewz ) ROM_END - - - - - - -ROM_START( shamnmg ) +ROM_START( shamnmgu ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("shamans magic.u72", 0x0800002, 0x0400000, CRC(aab1dd80) SHA1(0e8fbc967c4d5c7d24f980afc78464052ca6d2a6) ) @@ -1889,9 +1838,7 @@ ROM_END - - -ROM_START( skydncra ) +ROM_START( skydnca6 ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("Sky Dancer.u71", 0x1000002, 0x0400000, CRC(d30c3d6f) SHA1(581a198d98f00c1b7a432ab85b5f65760e364131) ) @@ -1903,11 +1850,6 @@ ROM_START( skydncra ) ROM_END - - - - - ROM_START( buckstop ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) @@ -1918,9 +1860,6 @@ ROM_START( buckstop ) ROM_END - - - ROM_START( tikitalk ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) @@ -1929,13 +1868,6 @@ ROM_START( tikitalk ) ROM_END - - - - - - - ROM_START( werewild ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) @@ -1950,7 +1882,7 @@ ROM_END -ROM_START( wldcatsa ) +ROM_START( wldcata6 ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("Wild Cats.u72", 0x0800002, 0x0400000, CRC(f0707ab9) SHA1(f30d77c53dfbc43e9468f2cb91529e44ce10c59e) ) @@ -1985,7 +1917,7 @@ ROM_END -ROM_START( 50lionr ) +ROM_START( 50lionrr ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("50 Lions RR 005.u71", 0x1000002, 0x0400000, CRC(412524b3) SHA1(ef724755616aad7fd484b5d5fcb6f6773e92b9b9) ) @@ -2011,7 +1943,7 @@ ROM_END -ROM_START( aftrhrs ) +ROM_START( afterhrs ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("after hours.u72", 0x0800002, 0x0400000, CRC(a4bee8ab) SHA1(cac34f91459fa5902b85e4c8150e651fda68621e) ) @@ -2044,7 +1976,7 @@ ROM_END -ROM_START( arbngts ) +ROM_START( arabnga6u ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("arabiannights8cc5.u85", 0x0800000, 0x0400000, CRC(4063edd6) SHA1(bb8f8230bbad70af683d039c041e90d50a59ceed) ) @@ -2099,7 +2031,7 @@ ROM_END -ROM_START( bmbgs ) +ROM_START( bmbugs ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("bumble bugs27v322-cs-730d.u73", 0x0000002, 0x0400000, CRC(79dd907f) SHA1(06352c55ff36a82f4d0550b1723667f3287c4923) ) @@ -2121,7 +2053,7 @@ ROM_END -ROM_START( crspru ) +ROM_START( cryspriu ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("crystalsprings.u72", 0x0800002, 0x0400000, CRC(8864632c) SHA1(a3227831ee71bc01846a7400e14fb40e62770e7a) ) @@ -2132,7 +2064,7 @@ ROM_END -ROM_START( davedrag ) +ROM_START( 5dragce ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("5-dragons-m27v322-cs-645e.u71", 0x1000002, 0x0400000, CRC(a0f5999e) SHA1(0be0d58588adbdbc7b728f164538d03509f13fe5) ) @@ -2145,7 +2077,7 @@ ROM_END -ROM_START( drfz6us ) +ROM_START( deepfrzu ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("Deep Freeze.u72", 0x0800002, 0x0400000, CRC(bcfc43a6) SHA1(cd3b25005d67dc096b13b1d35eca9701f150e461) ) @@ -2156,7 +2088,7 @@ ROM_END -ROM_START( dltbel ) +ROM_START( deltabel ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("delta belle1do6.u73", 0x0000002, 0x0400000, CRC(721cb449) SHA1(10be95803f3b7e86a009cc665e847dd97aeb6749) ) @@ -2167,7 +2099,7 @@ ROM_END -ROM_START( dmneyeus ) +ROM_START( dimeyece ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("diamond-eyes-m27v322-u71-cs-f0a9.u71", 0x1000002, 0x0400000, CRC(5706aa40) SHA1(d847bd0a4e210e3f065aa59129ee4654e3087909) ) @@ -2180,7 +2112,7 @@ ROM_END -ROM_START( dmneye2 ) +ROM_START( dimeye ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("diamondeyes484a.u72", 0x0800002, 0x0400000, CRC(f5f4d871) SHA1(e1a83ed4932602f460321bb2aaf648ef10711033) ) @@ -2191,7 +2123,7 @@ ROM_END -ROM_START( dblagus ) +ROM_START( dblagent ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("Double Agent.u72", 0x0800002, 0x0400000, CRC(fdb9a838) SHA1(83976af01273234d7eaeedba60164f9c31915e4b) ) @@ -2224,7 +2156,7 @@ ROM_END -ROM_START( eggsrich ) +ROM_START( eggsrccm ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("Eggstreme riches.u72", 0x0800002, 0x0400000, CRC(883274fd) SHA1(60e65e2f7f1774eac4520f5d96dbcd149ee69b91) ) @@ -2235,7 +2167,7 @@ ROM_END -ROM_START( efcashex ) +ROM_START( efce ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("enchanted forest cshexprs.u72", 0x0800002, 0x0400000, CRC(f3ec21f4) SHA1(db9d98fe4788f27c33e84b612632feeea6d944c7) ) @@ -2244,19 +2176,7 @@ ROM_START( efcashex ) ROM_END - -ROM_START( flamoly ) - ARISTMK6_BIOS - ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) - ROM_LOAD32_WORD("flame of olympus-27v322-cs-d20d.u72", 0x0800002, 0x0400000, CRC(29a66753) SHA1(7aedd4824a3afec74942fad5b84fd72b6ab242e7) ) - ROM_LOAD32_WORD("flame of olympus-27v322-cs-4068.u73", 0x0000002, 0x0400000, CRC(aad37086) SHA1(76495ba46da0ae848ba290706be337c45afe6361) ) - ROM_LOAD32_WORD("flame of olympus-27v322-cs-d2c9.u85", 0x0800000, 0x0400000, CRC(4fcd025d) SHA1(63aa8d0f5dd331e10c032cc5ac67516054db7c27) ) - ROM_LOAD32_WORD("flame of olympus-27v322-cs-1492.u86", 0x0000000, 0x0400000, CRC(f06f3d69) SHA1(83e1d2f72275de836e170c1c10905cb6da58b90a) ) -ROM_END - - - -ROM_START( flamoly2 ) +ROM_START( flamoljc ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("flamesofolympusm27v322.u72", 0x0800002, 0x0400000, CRC(330c1988) SHA1(0d7dae49495c5b164121cd756d6e22af17a9b41b) ) @@ -2266,17 +2186,7 @@ ROM_START( flamoly2 ) ROM_END - -ROM_START( flamolus ) - ARISTMK6_BIOS - ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) - ROM_LOAD32_WORD("Flames of Olympus 09ECD2D8.u72", 0x0800002, 0x0400000, CRC(1eb5d81a) SHA1(e3dbde32ce525e3070612d411326ca85a57c79fc) ) - ROM_LOAD32_WORD("Flames of Olympus 1DCC4068.u73", 0x0000002, 0x0400000, CRC(aad37086) SHA1(76495ba46da0ae848ba290706be337c45afe6361) ) - ROM_LOAD32_WORD("Flames of Olympus 09EFD2C9.u85", 0x0800000, 0x0400000, CRC(4fcd025d) SHA1(63aa8d0f5dd331e10c032cc5ac67516054db7c27) ) - ROM_LOAD32_WORD("Flames of Olympus 1E2A1492.u86", 0x0000000, 0x0400000, CRC(f06f3d69) SHA1(83e1d2f72275de836e170c1c10905cb6da58b90a) ) -ROM_END - -ROM_START( flamolusa ) +ROM_START( flamolce ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("Flames of Olympus 09ECD2D8_alt.u72", 0x0800002, 0x0400000, CRC(b4581c28) SHA1(1daa0f1218dba6e6eb96b7925ea71be531ffa787) ) @@ -2285,16 +2195,6 @@ ROM_START( flamolusa ) ROM_LOAD32_WORD("Flames of Olympus 1E2A1492.u86", 0x0000000, 0x0400000, CRC(f06f3d69) SHA1(83e1d2f72275de836e170c1c10905cb6da58b90a) ) ROM_END - -ROM_START( foxred ) - ARISTMK6_BIOS - ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) - ROM_LOAD32_WORD("foxworthy redneck.u72", 0x0800002, 0x0400000, CRC(ff2ff01d) SHA1(c0d17b3d9907d3876c7a1dbc19b023afcffb2bb1) ) - ROM_LOAD32_WORD("foxworthy redneck.u73", 0x0000002, 0x0400000, CRC(4b778a84) SHA1(d11b2aefcaa2ac22fea80faab524f82511b6344a) ) - ROM_LOAD32_WORD("foxworthy redneck.u85", 0x0800000, 0x0400000, CRC(52d5395e) SHA1(57b854e516881bc208b48ed82fdef25059e2efab) ) - ROM_LOAD32_WORD("foxworthy redneck.u86", 0x0000000, 0x0400000, CRC(871a3861) SHA1(4344f7e1fd5414eda3afc40e60df7188425fa80c) ) -ROM_END - ROM_START( jefffox ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) @@ -2338,7 +2238,7 @@ ROM_END -ROM_START( gldincas ) +ROM_START( goldincu ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("goldenincas2adb.u85", 0x0800000, 0x0400000, CRC(cb1268de) SHA1(dc5a18736ac76c59811c7bccd7c3a4cd468fccec) ) @@ -2349,7 +2249,7 @@ ROM_END -ROM_START( hlntry ) +ROM_START( hlntroy ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("helen of troy.u72", 0x0800002, 0x0400000, CRC(b694d927) SHA1(0151f3980a401d646a18b9956d3d247daaa48bf2) ) @@ -2365,7 +2265,7 @@ ROM_END -ROM_START( jewelunc ) +ROM_START( jewelcm ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("jewel enchantress.u72", 0x0800002, 0x0400000, CRC(6c168e3b) SHA1(db251f024881e27615049f94c6e11002e89b2c40) ) @@ -2407,7 +2307,7 @@ ROM_END -ROM_START( mgforst ) +ROM_START( magforst ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("magicforest50ln.u72", 0x0800002, 0x0400000, CRC(53d881a2) SHA1(f63c500fc0208709813d661305900de2f2edc9bf) ) @@ -2418,7 +2318,7 @@ ROM_END -ROM_START( mgmerm ) +ROM_START( magmerm ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("magicmermaid.u72", 0x0800002, 0x0400000, CRC(7a5399ab) SHA1(85e3ca6e00d4f1259c4899f74981ec076524e50d) ) @@ -2440,9 +2340,6 @@ ROM_END - - - ROM_START( mrwoo ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) @@ -2470,7 +2367,7 @@ ROM_END -ROM_START( mysteyec ) +ROM_START( mysteycmu ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("mysticeyescashmanm27v322.u72", 0x0800002, 0x0400000, CRC(380a868e) SHA1(a1ac6ec1a760f8bbf68b3b86cf5dd4623dc130c7) ) @@ -2502,7 +2399,7 @@ ROM_END -ROM_START( parilius ) +ROM_START( parislgtu ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("parislightsm27v322.u72", 0x0800002, 0x0400000, CRC(8dc6a0ec) SHA1(855e8f5c6752bfc4ba25116a20ed82dfb4912c07) ) @@ -2513,7 +2410,7 @@ ROM_END -ROM_START( pelpetus ) +ROM_START( pelipeteu ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("Pelican pete.u72", 0x0800002, 0x0400000, CRC(4ff0a40b) SHA1(b9049a35a3ebc3e1274498809f7687a36cad6f24) ) @@ -2535,7 +2432,7 @@ ROM_END -ROM_START( penpayus ) +ROM_START( pengpyce ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("penguinpays.u72", 0x0800002, 0x0400000, CRC(1ee80a47) SHA1(c02485003d0724941ef346fb721bd246f69545b3) ) @@ -2548,7 +2445,7 @@ ROM_END -ROM_START( pompus2 ) +ROM_START( pompeia6u ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("pompei.u72", 0x0800002, 0x0400000, CRC(a5959d1f) SHA1(fe92eaa3f1dc6bdc356bef2a680eb9f8a09c88a2) ) @@ -2559,7 +2456,7 @@ ROM_END -ROM_START( rdtripus ) +ROM_START( roadtrip ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("roadtrip.u71", 0x1000002, 0x0400000, CRC(1da57ab8) SHA1(775d1f0d6021032e909c8089ba93cc63eef18586) ) @@ -2581,12 +2478,6 @@ ROM_START( sealdeal ) ROM_END - - - - - - ROM_START( shorthng ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) @@ -2598,7 +2489,7 @@ ROM_END -ROM_START( silkrdus ) +ROM_START( silkrda6 ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("silkroad.u72", 0x0800002, 0x0400000, CRC(1ed58be6) SHA1(114c5a800592163dbc690b5d4c4c051d358828f9) ) @@ -2609,7 +2500,7 @@ ROM_END -ROM_START( stardrfu ) +ROM_START( stardrftu ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("star-drifter-m27v322-cs8552.u72", 0x0800002, 0x0400000, CRC(dc7a30c1) SHA1(8f24c18efd6171cda7ca841d3b275937e35e2be8) ) @@ -2629,7 +2520,7 @@ ROM_END -ROM_START( sunmon2 ) +ROM_START( sunmoon ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("sunandmoon.u72", 0x0800002, 0x0400000, CRC(f69ce78d) SHA1(91a433757b377406bca61b4c96f3ba3561efd75c) ) @@ -2650,7 +2541,7 @@ ROM_END -ROM_START( swhr2us ) +ROM_START( swhr2 ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("sweethearts2.u73", 0x0000002, 0x0400000, CRC(17f0dbe2) SHA1(7f1f0936e1cf528ee794e8925c40b063d1a77729) ) @@ -2671,7 +2562,7 @@ ROM_END -ROM_START( tiktoru ) +ROM_START( tiktorch ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("tiki torch.u72", 0x0800002, 0x0400000, CRC(1161133b) SHA1(760c710167e4eca84421fc1cd54ab696e16502cc) ) @@ -2682,7 +2573,7 @@ ROM_END -ROM_START( timwolfu ) +ROM_START( timbwolf ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("timberwolf.u72", 0x0800002, 0x0400000, CRC(a004dd06) SHA1(c394b1703d62370ecf19c51d90554d6495f43eae) ) @@ -2693,7 +2584,7 @@ ROM_END -ROM_START( trkinus ) +ROM_START( trsking ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("treasureking.u72", 0x0800002, 0x0400000, CRC(c070cb6b) SHA1(cfe6ef7723233f4325ff778679d1274159ffacab) ) @@ -2703,7 +2594,7 @@ ROM_START( trkinus ) ROM_END -ROM_START( venicus ) +ROM_START( venice ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("venice3536.u86", 0x0000000, 0x0400000, CRC(a6dde7a6) SHA1(58b9bd3d80b88e9e8b40813e85b89cda69f12fb6) ) @@ -2714,7 +2605,7 @@ ROM_END -ROM_START( whlcshus ) +ROM_START( whalecshu ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("whales of cash 4ECD.u85", 0x0800000, 0x0400000, CRC(e90f5bb1) SHA1(28680395198a29356999a377f2f3e0013d97c7b2) ) @@ -2723,7 +2614,7 @@ ROM_START( whlcshus ) ROM_LOAD32_WORD("whales of cash 59AF.u86", 0x0000000, 0x0400000, CRC(a7118016) SHA1(725a46ac861bf4abaf9cc0e7084cfa20913c2299) ) ROM_END -ROM_START( whlcshusa ) +ROM_START( whalecshua ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) // 2nd, incomplete, set? @@ -2734,7 +2625,7 @@ ROM_END -ROM_START( whtwtr ) +ROM_START( whtwater ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("white water.u72", 0x0800002, 0x0400000, CRC(64a814c6) SHA1(9415bb32675e5c3b6299967b1d10dbccd699d9ed) ) @@ -2745,7 +2636,7 @@ ROM_END -ROM_START( wldafus ) +ROM_START( wldafr ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("wild africa.u72", 0x0800002, 0x0400000, CRC(a55417ca) SHA1(151615f81112b30aff2a2aa26280b7c1bf0d45db) ) @@ -2755,7 +2646,7 @@ ROM_START( wldafus ) ROM_END -ROM_START( wldpntus ) +ROM_START( wldpanth ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("wild panthers.u72", 0x0800002, 0x0400000, CRC(2969f69c) SHA1(d63f1bcbd163c067f143a55aaf7c88b3c9ac0ebe) ) @@ -2766,7 +2657,7 @@ ROM_END -ROM_START( wingolus ) +ROM_START( wingoly ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("wingsofolympus.u72", 0x0800002, 0x0400000, CRC(158877b5) SHA1(a1fc98d90a763253f07b9df44d85e8594b26d484) ) @@ -2777,7 +2668,7 @@ ROM_END -ROM_START( zorrous ) +ROM_START( zorroa6u ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("zorro28ef.u72", 0x0800002, 0x0400000, CRC(9e572513) SHA1(76f5578d957ec9a3a48fa9d532e6c440855d1cb6) ) @@ -2788,7 +2679,7 @@ ROM_START( zorrous ) ROM_LOAD32_WORD("zorroe953.u71", 0x1000002, 0x0400000, CRC(ff5a8592) SHA1(03d452133d30d780312066bada8e21566255209f) ) ROM_END -ROM_START( adonis6 ) +ROM_START( adonisa6 ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("US_Adonis_.u73", 0x0000002, 0x0400000, CRC(eba9e84f) SHA1(bf746ea356627b1a558b4c8f8a2d8d5c54400a4a) ) @@ -2802,16 +2693,7 @@ ROM_START( starqst ) ROM_LOAD32_WORD("Star Quest.u86", 0x0000000, 0x0400000, CRC(c21f4486) SHA1(5a6a532d73bf56f68f473bd56a7c3d9f0660d661) ) ROM_END -ROM_START( eaglst1 ) - ARISTMK6_BIOS - ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) - ROM_LOAD32_WORD("Eagle Strike.u73", 0x0000002, 0x0400000, CRC(94ff83d2) SHA1(54a02cdfb205a429d7458ecb51ba20083306011e) ) - ROM_LOAD32_WORD("Eagle Strike.u70", 0x1800002, 0x0400000, CRC(b899e64b) SHA1(1f1d800df39de444b03ff4cc85bf4cf073f88423) ) - ROM_LOAD32_WORD("Eagle Strike.u71", 0x1000002, 0x0400000, CRC(7311d99c) SHA1(802abed830ca3204ce50072ac69d0a3cae8f17e5) ) - ROM_LOAD32_WORD("Eagle Strike.u72", 0x0800002, 0x0400000, CRC(4d96aef2) SHA1(40860ad6a0f82d79347b65b182f72dfbec23cd74) ) -ROM_END - -ROM_START( eaglst2 ) +ROM_START( estrike ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("Eagle Strike.u86", 0x0000000, 0x0400000, CRC(71c8121b) SHA1(1a4534b8e43dbc173809b5a621d6796a7a8655cf) ) @@ -2833,21 +2715,8 @@ ROM_START( kingnilea ) ROM_LOAD32_WORD("King Of The Nile.000.u86", 0x0000000, 0x0400000, CRC(c3830908) SHA1(438fc339f8b71668e816b5909195cae4158f39c2) ) ROM_END -ROM_START( outbackja ) - ARISTMK6_BIOS - ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) - ROM_LOAD32_WORD("20195211.000.u86", 0x0000000, 0x0400000, CRC(16f70945) SHA1(0de1bd1371d5fb33bfe7f7c2a80a70412387dc5f) ) - ROM_LOAD32_WORD("20195211.001.u73", 0x0000002, 0x0400000, CRC(611f82b7) SHA1(84df7ec63d26a691acd2822b8d0803c827c89f37) ) - ROM_LOAD32_WORD("20195211.007.u70", 0x1800002, 0x0400000, CRC(3a0ea3ca) SHA1(88513130013b1b18772a5e538da9a8db3a54633e) ) - ROM_LOAD32_WORD("20195211.005.u71", 0x1000002, 0x0400000, CRC(23f1f50c) SHA1(40145b839c2b5fde5c0f20e08f46f5a859b6e20a) ) - ROM_LOAD32_WORD("20195211.003.u72", 0x0800002, 0x0400000, CRC(cdd28848) SHA1(0038bb422a1d650beaa0ffd63b7d6de1936a5e32) ) - ROM_LOAD32_WORD("20195211.006.u83", 0x1800000, 0x0400000, CRC(79ca67a1) SHA1(68bae23df71c768dc17631f6ccfc7a720c0959ee) ) - ROM_LOAD32_WORD("20195211.004.u84", 0x1000000, 0x0400000, CRC(0cd41b5d) SHA1(a7891da788fe88d2191b2f0686cb9ca2ecfeeb9c) ) - ROM_LOAD32_WORD("20195211.002.u85", 0x0800000, 0x0400000, CRC(a1853f27) SHA1(cd2bf8674555f6870f0689ca0adbca6890bc9b27) ) -ROM_END - -ROM_START( witgoldd ) +ROM_START( wheregldsp ) ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("Where's The Gold Demo.003.u72", 0x0800002, 0x0400000, CRC(bd188f12) SHA1(53433d346f23bc826fc041f1631270f8380759b6) ) @@ -2857,7 +2726,7 @@ ROM_START( witgoldd ) ROM_END -ROM_START( rumbrel ) // unknown IC positions +ROM_START( rumbreel ) // unknown IC positions ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("Rumble Reels L0", 0x0000000, 0x0400000, CRC(06b37c77) SHA1(e4dad62667a1c1d4948abcd535332975148e952b) ) @@ -2872,7 +2741,7 @@ ROM_START( rumbrel ) // unknown IC positions ROM_LOAD32_WORD("Rumble Reels R4", 0x0000000, 0x0400000, CRC(2c5baf9f) SHA1(40fb5b22460b9a35ca8ebb8b0643e58665d8643f) ) ROM_END -ROM_START( hlsunmon ) // different IC positions +ROM_START( sunmonbb ) // different IC positions ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("HL Sun and Moon.u11", 0x0000000, 0x0400000, CRC(b6a8df40) SHA1(316e3f98b75c1bdd0e8fc55aee2cf20b8a45ff4c) ) @@ -2885,7 +2754,7 @@ ROM_START( hlsunmon ) // different IC positions ROM_LOAD32_WORD("HL Sun and Moon.u24", 0x0000000, 0x0400000, CRC(19e5b7e0) SHA1(cf17a84ba08a2f24725d4ccbe046710c2f3a2459) ) ROM_END -ROM_START( bobdolu1 ) // different IC positions +ROM_START( bobdolly ) // different IC positions ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("bob-dolly-27v322-cs-e927.u11", 0x0000000, 0x0400000, CRC(d3657369) SHA1(621fb20238f10e06c486dfbd6460f94047898a42) ) @@ -2899,7 +2768,7 @@ ROM_START( bobdolu1 ) // different IC positions ROM_LOAD32_WORD("bob-dolly-27v322-cs-e2c2.u24", 0x0000000, 0x0400000, CRC(3646c16d) SHA1(c52fab2e11f39c126bcbbb348750bbf30ff96090) ) ROM_END -ROM_START( pwsp1 ) // different IC positions +ROM_START( pwsuper ) // different IC positions ARISTMK6_BIOS ROM_REGION( 0x2000000, "game_rom", ROMREGION_ERASEFF) ROM_LOAD32_WORD("players- world- super- m27v322- cs-1231.u13", 0x0000000, 0x0400000, CRC(43b44f26) SHA1(5410eea0a4911a274a794d6b27e369fb98c6edf7) ) @@ -2918,256 +2787,241 @@ ROM_END - -GAME( 2000, aristmk6, 0, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Aristocrat MK6 System Software", MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_IS_BIOS_ROOT) +GAME( 2000, aristmk6, 0, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Aristocrat MK6 System Software", MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_IS_BIOS_ROOT) // Dates listed below are for the combination (reel layout), not release dates -GAME( 2004, antcleo, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Antony and Cleopatra (10177211, Malaysia)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 754, B - 12/07/04 -GAME( 2002, 50lions, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "50 Lions (10120511, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 717, A - 11/10/02 -GAME( 2003, 50lionsa, 50lions, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "50 Lions (10156111, Malaysia)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 717, D - 20/10/03 -GAME( 2003, choysun, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Choy Sun Doa (20131511, Malaysia)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 688, D - 23/01/03 -GAME( 2003, crystals, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Crystal Springs (10155811, Malaysia)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 740, A - 28/05/03 -GAME( 2003, indianmm, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Indian Dreaming - Maximillion$ (10130711, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 628/12, A - 17/01/03 -GAME( 2004, wheregld, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Where's the Gold (20177111, Malaysia)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 756, C - 17/06/04 -GAME( 2002, whalecsh, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Whales of Cash (20155711, Malaysia)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 695, A - 14/06/02 -GAME( 2003, wildways, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Wild Ways (10130111, Malaysia)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 698/1, A - 25/02/03 -GAME( 2003, thaiprin, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Thai Princess (30127721, Malaysia)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 707, E - 21/03/03 - - -GAME( 200?, 100lions, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "100 Lions (10219211, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, 5dragons, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "5 Dragons (20161011, NSW/ACT, Show Program)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, adustcm, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "African Dusk - Mr. Cashman (20006711, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, alchemya, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Alchemy (1J009611, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, amzqnar, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Amazon Queen (10005511, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, arbnigar, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Arabian Nights (2J008211, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, bigbenpj, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Big Ben (30126911, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, bigheart, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Big Hearted (10000511, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, bigredjp, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Big Red 2 (5J011311, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, birredar, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Big Red (2J009211, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, blkbrum, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Black Brumby (1J009111, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, brazilar, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Brazil (20180311, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, bucanar, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Buccaneer (10173011, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, buffalar, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Buffalo (10217811, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, bushrngr, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Bushranger (10006111, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, calyking, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Calypso King (20197111, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, canary2, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Canary Riches (10218211, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, cmtonig, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Cashman Tonight (30194711, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, csdce, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Choy Sun Doa - Cash Express (30149511, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, csd, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Choy Sun Doa (10104011, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, csret, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Choy Sun Returns (20212211, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, corrida, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Corrida de Toros (30178311, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, cryspri, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Crystal Springs (10144411, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, deltqn, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Delta Queen (20185211, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, di4ever, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Diamonds Forever (10105011, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, dinoaris, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Dinosaur (10118811, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, doubdolp, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Double Dolphins (20000211, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, drgnlrd, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Dragon Lord (10173511, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, drgnmgic, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Dragon Magic (2J015711, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, ent6r, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Enchantress (20000711, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, eott, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Eyes of the Tiger (10002011, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, firedan, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Fire Dancer (20184911, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, followst, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Follow the Stars (20001411, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, gambjack, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Gamblin' Jack (20197211, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, geishaar, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Geisha (10000811, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, goapear, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Go Ape (10006211, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, gogreen, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Go For Green (10003411, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, goldarjp, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Golden Archer (10197411, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, goldinc, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Golden Incas (10174011, NSW/ACT, Show Program)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, goldpym, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Golden Pyramids Special Edition - Maximillions (10130811, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, grizzly, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Grizzly (10214711, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, heartgar, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Heart of Gold (20169511, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, heartveg, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Heart of Vegas (10232911, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, highnoar, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "High Noon (20004111, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, holdrma, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Hollywood Dreams (10100511, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, houhear, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "House of Hearts (10200311, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, incachf, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Inca Chief (20190711, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, indce, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Indian Dreaming - Cash Express (20109411, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, indll, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Indian Dreaming - Lady Luck (20151911, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, indsc, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Indian Dreaming 2nd Chance (10150611, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, indsrp, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Dream Catcher (10126721, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, indgcm, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Indian Gold - Mr. Cashman (10102511, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, indprncs, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Indian Princess (10174111, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, jailbrar, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Jailbreak (10125611, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, kingnep, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "King Neptune (20189111, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, kingnile, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "King of the Nile (20106321, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, koalmnt, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Koala Mint (30001011, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, kohinoor, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Kohinoor (10136711, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, lgfish, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Let's Go Fish'n (10220111, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, lordleo, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Lord Leopard (30111211, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, lougcm, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Louie's Gold - Mr. Cashman (20006911, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, luigball, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Luigi's Ball (10235411, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, mskitty, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Miss Kitty (10216611, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, mnytree, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Money Tree (10001211, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, mysteycm, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Mystic Eyes - Mr. Cashman (10008111, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, mystmerm, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Mystic Mermaid (1J008711, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, nerdwild, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Nerds Gone Wild (10197311, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, orbeaut, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Oriental Beauty (10213511, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, outbackj, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Outback Jack (20195211, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, owlcap, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Owl Capone (10008711, NSW/ACT, Show Program)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, pariligh, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Paris Lights (30002611, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, pcockmag, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Peacock Magic (1J008811, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, pelipete, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Pelican Pete (10177511, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, pharpor, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Pharaoh's Fortune (40000921, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, phxfant, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Phoenix Fantasy (20197511, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, piratar, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Pirates (10001511, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, pcbydem, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Player's Choice - By Demand (10223111, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, pcfav, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Players Choice Favourites (set 1)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, pompeiar, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Pompeii (10002211, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, prideaf, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Pride of Africa (10208511, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, prophar, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Prophecy (20173411, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, qsheeba, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Queen of Sheba (10133711, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, qnilecj, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Queen of the Nile Special Edition - Jackpot Carnival (20123911, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, qnilese, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Queen of the Nile Special Edition (10102811, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, qnile, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Queen of the Nile (3J011111, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, raprichs, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Rapid Riches (10194211, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, redbarar, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Red Baron (10119911, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, ruprup, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Roll Up! Roll Up!! (10115911, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, rubmgc, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Ruby Magic (10125711, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, scatmg2, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Scatter Magic II (10001311, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, sharmnm, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Shaman's Magic (10225911, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, smtmar, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Show Me The Money (10001911, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, silgolar, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Silver & Gold (20100721, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, spgcarn, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Spring Carnival (10000311, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, stardrft, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Star Drifter (20150811, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, sbuk5, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Super Bucks V (20203611, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, swh2ld, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Sweethearts II - Lucky Devil (10119811, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, tahitim, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Tahiti Magic (10238911, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, thaiprar, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Thai Princess (10119321, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, gldnflc, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "The Golden Fleece (10158311, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, thndrhrt, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Thunderheart (10173811, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, tigresar, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Tigress (20230111, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, topshtar, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Top Shot (30123211, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, torgods, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Torch of the Gods (10000411, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, torpdice, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Touch of Paradice (20007511, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, turtrea, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Turtle Treasure (10234711, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, venetian, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Venetian Nights (1J008911, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, witgold, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Where's The Gold (10124811, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, wikwin2, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Wicked Winnings 2", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, wldgoos, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Wild Goose (20131911, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, wldpan2, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Wild Panda (20218411, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, wldstal2, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Wild Stallion (10230811, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, wtepee, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Wild Tepee - Power Pay (10230211, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, wwaratah, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Wild Waratah (10215911, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, wwaysar, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Wild Ways (10106911, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, wwaysll, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Wizard Ways - Lady Luck (20139111, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, zorrojp, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Zorro (30130611, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, 5draga, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "5 Dragons (20161011, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, 5koipp, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "5 Koi - Power Pay (10250711, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, amzteml, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Amazon Temple (10299811, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, buffaloa, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Buffalo", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, cactusco, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Cactus Corral (10237711, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, callwlar, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Call of the Wild (10256611, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, deepfrz, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Deep Freeze (10282311, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, drmred, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Dream of the Red Chamber (10273811, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, encspela, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Enchanted Spell (10257011, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, fortath, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Fortune of Athena (10248611, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, goldsam, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Golden Samurai (10247811, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, inddrma, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Indian Dreaming (10004211, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, luck88, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Lucky 88 (10241411, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, milkin, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Milkin' It (10251911, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, moonwalt, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Moonlight Waltz (10227611, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, mchilli, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "More Chilli (20248711, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, pcfava, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Player's Choice - Favourites (20177311, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, pcmostw, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Player's Choice - Most Wanted (20234911, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, pcnewz, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Player's Choice - Gold Edition (30291411, New Zealand)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, rumbrel, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Rumble Reels (20288611, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, shamnmg, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Shaman's Magic (0152647, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, skydncra, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Sky Dancer (10272711, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, buckstop, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "The Buck Stops Here (10294311, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, tikitalk, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Tiki Talk (10239111, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, werewild, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Werewolf Wild (10288711, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, wldcatsa, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Wild Cats (10237511, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, wgorilla, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Wild Gorilla - Power Pay (20279811, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, bluetigr, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Blue Tiger (20259511, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, 50lionr, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "50 Lions - Roaring Riches (20301311, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, beavbuk, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Beaver Bucks (20255111, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -// sets below marked as 'USA' -GAME( 200?, aftrhrs, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "After Hours (0251071, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, atkgld, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "All The King's Gold (0152152, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, apocof, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Apollo Coffee (0151105, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, arbngts, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Arabian Nights (0151356, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, arwincm, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Arctic Wins - Mr. Cashman (0151065, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, arish, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Arishinko (0151087, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, asnprinc, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Asian Princess (0352502, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, blkmust, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Black Mustang (0152584, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, bmbgs, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Bumble Bugs (0351180, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, cinhell, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Chance In Hell - Li'l Lucy (0251125, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, crspru, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Crystal Springs (0352557, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, davedrag, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "5 Dragons - Cash Express (0152309, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, drfz6us, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Deep Freeze (0154081, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, dltbel, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Delta Belle (0252532, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, dmneyeus, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Diamond Eyes - Cash Express (0152039, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, dmneye2, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Diamond Eyes (0251312, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, dblagus, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Double Agent (0152082, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, eaglrock, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Eagle Rock - Cash Express (0151126, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, eastland, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Easter Island - Cash Express (0151117, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, eggsrich, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Eggstreme Riches - Mr. Cashman (0351149, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, efcashex, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Enchanted Forest - Cash Express (0151084, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, flamoly, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Flame Of Olympus", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, flamoly2, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Flame of Olympus - Jackpot Carnival (0251048, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, flamolus, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Flames Of Olympus USA (set 1)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, flamolusa, flamolus, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Flame of Olympus - Cash Express (0351025, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // one of these must be bad -GAME( 200?, foxred, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Foxworthy Redneck", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, jefffox, foxred, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "You Might Be A Redneck If... - Jeff Foxworthy (0351068, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, frogwld, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Frog Wild 2 (0251114, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, gwnn, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "The Game With No Name! (0452501, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, gldgong, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "The Golden Gong (0152558, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, gldincas, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Golden Incas (0252533, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, hlntry, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Helen of Troy (0151336, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, hlsunmon, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Sun & Moon - Bank Buster (0153028, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, jewelunc, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Jewel of the Enchantress - Mr. Cashman (0151051, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, lemrol, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Let 'em Roll (0151115, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, lineking, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Line King (0252534, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, lovestrk, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Love Stuck (0152583, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, mgforst, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Magic Forrest", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, mgmerm, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Magic Mermaid (0251331, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, metestrm, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Meteor Storm (0152162, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, mrwoo, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Mr Woo (0252599, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, mystarr, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Mystic Arrow (0151009, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, mysteyec, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Mystic Eyes - Mr. Cashman (0251024, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, opsesam, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Open Sesame (0351309, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, pandpays, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Panda Pays - Mr. Cashman (0151109, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, parilius, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Paris Lights - Jackpot Carnival (0251031, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, pelpetus, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Pelican Pete (0252555, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, pennyar, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Penny Arcade (0251169, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, penpayus, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Penguin Pays - Cash Express (0151120, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, pompus2, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Pompeii (0251010, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, rdtripus, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Road Trip (0152539, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, sealdeal, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Seal The Deal - Jackpot Carnival (0251029, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, shorthng, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Shore Thing (0251088, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, silkrdus, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Silk Road (0152537, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, stardrfu, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Star Drifter (0451341, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, statsymb, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Status Symbols (0251147, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, sunmon2, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Sun & Moon (0151303, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, sunqndol, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Sun Queen - Dollar Storm (0451327, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, swhr2us, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Sweethearts II (0151183, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, gbmoney, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "The Good, The Bad & The Money (0351016, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, tiktoru, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Tiki Torch (0151003, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, timwolfu, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Timber Wolf (0154013, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, trkinus, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Treasure King (0152570, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, venicus, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Venice (0151355, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, whlcshus, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Whales of Cash (0451311, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, whlcshusa, whlcshus, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Whales of Cash (0451346, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, whtwtr, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "White Water (0151075, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, wldafus, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Wild Africa - Millioniser (0351083, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, wldpntus, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Wild Panthers - Li'l Lucy (0651310, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, wingolus, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Wings Of Olympus", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, zorrous, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Zorro (0151372, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, bobdolu1, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Bob and Dolly (0352298, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, pwsp1, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Player's World - Super (0154019, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, adonis6, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Adonis (0151178, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) - -// marked as 'unfinished' -GAME( 200?, starqst, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Star Quest (10009511, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, eaglst1, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Eagle Strike (set 1)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, eaglst2, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Eagle Strike (40289711, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) - -// different collection -GAME( 200?, kingnilea, kingnile, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "King of the Nile (30106331, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, outbackja, outbackj, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Outback Jack (set 2)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 200?, witgoldd, witgold, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Where's The Gold (10124811, NSW/ACT, Show Program)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) - - +GAME( 2004, 5drag, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "5 Dragons (20161011, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 744, C - 14/01/04 +GAME( 2004, 5dragsp, 5drag, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "5 Dragons (20161011, NSW/ACT, Show Program)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 744, C - 14/01/04 +GAME( 2007, 5dragce, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "5 Dragons - Cash Express (0152309, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US211, A - 01/09/07 +GAME( 2007, 5koipp, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "5 Koi - Power Pay (10250711, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 744/2, C - 25/10/07 +GAME( 2002, 50lions, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "50 Lions (10120511, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 717, A - 11/10/02 +GAME( 2003, 50lionsm, 50lions, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "50 Lions (10156111, Malaysia)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 717, D - 20/10/03 +GAME( 2012, 50lionrr, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "50 Lions - Roaring Riches (20301311, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 1049, B - 20/08/12 +GAME( 2006, 100lions, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "100 Lions (10219211, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 717/4, B - 13/06/06 +GAME( 2005, adonisa6, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Adonis (0151178, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US168, A - 05/26/05 +GAME( 2001, adustcm, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "African Dusk - Mr. Cashman (20006711, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 665/1, B- 13/07/01 +GAME( 2004, afterhrs, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "After Hours (0251071, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US051, B - 01/20/04 +GAME( 2003, alchemy, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Alchemy (1J009611, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // JB013/2, A - 30/05/03 +GAME( 2007, atkgld, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "All the King's Gold (0152152, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US209, A - 01/08/07 +GAME( 2001, amzqueen, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Amazon Queen (10005511, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 669, A - 02/05/01 +GAME( 2009, amztempl, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Amazon Temple (10299811, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 906, A - 29/04/09 +// Antony and Cleopatra (10163211, NSW/ACT) +GAME( 2004, antcleo, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Antony and Cleopatra (10177211, Malaysia)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 754, B - 12/07/04 +GAME( 2003, apocof, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Apollo Coffee (0151105, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US083, A - 11/10/03 +GAME( 2001, arabnga6, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Arabian Nights (2J008211, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // JB009/1, E - 10/12/01 +GAME( 2004, arabnga6u,arabnga6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Arabian Nights (0151356, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // JB016/21, E - 07/06/04 +GAME( 2003, arwincm, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Arctic Wins - Mr. Cashman (0151065, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US029, E- 01/27/03 +GAME( 2003, arish, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Arishinko (0151087, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US057, E - 05/28/03 +GAME( 2004, asnprinc, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Asian Princess (0352502, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4208, C - 09/13/04 +GAME( 2008, beavbuk, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Beaver Bucks (20255111, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 850, C - 23/01/08 +GAME( 2003, bigben, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Big Ben (30126911, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 710, B - 17/07/03 +GAME( 1999, bigheart, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Big Hearted (10000511, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 637, D - 15/11/99 +GAME( 2002, bigred, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Big Red (2J009211, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // JB015, D - 27/09/02 +GAME( 2005, bigred2, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Big Red 2 (5J011311, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // JB024, B - 18/05/05 +GAME( 2002, blkbrum, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Black Brumby (1J009111, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // JB010, C - 14/06/02 +GAME( 200?, blkmust, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Black Mustang (0152584, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // JB014/21, (no data) +GAME( 2007, bluetigr, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Blue Tiger (20259511, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 855, A - 12/12/07 +GAME( 2007, bobdolly, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Bob and Dolly (0352298, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US243, A - 10/15/07 +GAME( 2005, brazil, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Brazil (20180311, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 783, B - 25/02/05 +GAME( 2004, bucaneer, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Buccaneer (10173011, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 765, A - 05/04/04 +GAME( 2010, buckstop, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "The Buck Stops Here (10294311, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 897/1, A - 22/07/10 +GAME( 2006, buffalo, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Buffalo (10217811, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 806, E - 06/10/06 +GAME( 200?, buffalou, buffalo, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Buffalo (0252636, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4328, (no data) +GAME( 2005, bmbugs, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Bumble Bugs (0351180, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US166, A - 05/13/05 +GAME( 2001, bushrngr, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Bushranger (10006111, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 673, A - 18/04/01 +GAME( 2007, cactusco, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Cactus Corral (10237711, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 818, D - 24/07/07 +GAME( 2007, callwld, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Call of the Wild (10256611, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 827, B - 12/11/07 +GAME( 2005, calyking, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Calypso King (20197111, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 772/1, B - 25/07/05 +GAME( 2006, canaryrc, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Canary Riches (10218211, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 809, A - 30/03/06 +GAME( 2005, cmtonig, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Cashman Tonight (30194711, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MG0007, B - 25/05/05 +GAME( 2004, cinhell, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Chance in Hell - Li'l Lucy (0251125, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US119, A - 06/30/04 +GAME( 2002, csd, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Choy Sun Doa (10104011, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 688, A - 23/04/02 +GAME( 2003, csdm, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Choy Sun Doa (20131511, Malaysia)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 688, A - 23/01/03 +GAME( 2003, csdce, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Choy Sun Doa - Cash Express (30149511, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 688, A - 03/02/03 +GAME( 2006, csret, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Choy Sun Returns (20212211, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 744/2, B - 15/08/06 +GAME( 2005, corrida, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Corrida de Toros (30178311, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 771, D - 22/03/05 +GAME( 2003, cryspri, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Crystal Springs (10144411, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 740, A - 28/05/03 +GAME( 2003, crysprim, cryspri, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Crystal Springs (10155811, Malaysia)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 740, A - 28/05/03 +GAME( 2006, cryspriu, cryspri, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Crystal Springs (0352557, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4255, C - 01/16/06 +GAME( 2009, deepfrz, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Deep Freeze (10282311, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // JB113/2, A - 27/02/09 +GAME( 2009, deepfrzu, deepfrz, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Deep Freeze (0154081, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // JB113/4, A - 27/07/09 +GAME( 2005, deltabel, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Delta Belle (0252532, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4243, B - 04/29/05 +GAME( 2004, deltaqn, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Delta Queen (20185211, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 768, A - 13/09/04 +GAME( 2004, dimeye, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Diamond Eyes (0251312, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // JB012/20, J - 01/22/04 +GAME( 2004, dimeyece, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Diamond Eyes - Cash Express (0152039, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // JB012/20, J - 01/22/04 +GAME( 2002, di4ever, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Diamonds Forever (10105011, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 679, B - 14/03/02 +GAME( 2003, dinosa6, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Dinosaur (10118811, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 731, C - 08/08/03 +GAME( 2005, dblagent, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Double Agent (0152082, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US180, A - 12/09/05 +GAME( 2000, dbldolph, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Double Dolphins (20000211, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 647, C - 18/04/00 +GAME( 2004, drgnlord, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Dragon Lord (10173511, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 761, A - 22/06/04 +GAME( 2006, drgnmgic, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Dragon Magic (2J015711, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // JB051, E - 05/07/06 +GAME( 2003, drmcatch, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Dream Catcher (10126721, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 704, F - 23/06/03 +GAME( 2008, drmred, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Dream of the Red Chamber (10273811, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // JB027/2, A - 25/8/08 +GAME( 2004, eaglrock, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Eagle Rock - Cash Express (0151126, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US021, C - 05/25/04 +GAME( 2010, estrike, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Eagle Strike (40289711, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 950, A - 20/07/10 +GAME( 2004, eastland, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Easter Island - Cash Express (0151117, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US052, B - 02/22/04 +GAME( 2005, eggsrccm, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Eggstreme Riches - Mr. Cashman (0351149, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US144, B - 11/3/05 +GAME( 200?, efce, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Enchanted Forest - Cash Express (0151084, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // ???, ??? +GAME( 2007, encspell, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Enchanted Spell (10257011, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // JB041, B - 18/07/07 +GAME( 2000, enchantr, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Enchantress (20000711, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 633, C- 15/01/00 +GAME( 2000, eott, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Eyes of the Tiger (10002011, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 658, B - 01/06/00 +GAME( 2004, firednc, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Fire Dancer (20184911, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 772, A - 01/10/04 +GAME( 2002, flamoljc, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Flame of Olympus - Jackpot Carnival (0251048, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4091/3, A - 2/18/02 +GAME( 2002, flamolce, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Flame of Olympus - Cash Express (0351025, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4091/3, A - 2/18/02 +GAME( 2000, followst, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Follow the Stars (20001411, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 659, D - 15/09/00 +GAME( 2007, fortath, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Fortune of Athena (10248611, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 847, C - 08/11/07 +GAME( 2004, frogwld, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Frog Wild 2 (0251114, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US112, A - 06/03/04 +GAME( 2005, gambjack, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Gamblin' Jack (20197211, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 791, D - 23/09/05 +GAME( 2004, gwnn, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "The Game With No Name! (0452501, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4210, C - 09/13/04 +GAME( 2000, geishaa6, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Geisha (10000811, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 602/18, B - 03/06/00 +GAME( 2001, goape, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Go Ape (10006211, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 661/2, B - 14/06/01 +GAME( 2001, gogreen, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Go For Green (10003411, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 647/1, A - 22/02/01 +GAME( 2005, goldarch, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Golden Archer (10197411, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 770, A - 07/07/05 +GAME( 2003, gldnflc, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "The Golden Fleece (10158311, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 680/2, A-07/07/03 +GAME( 2005, gldgong, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "The Golden Gong (0152558, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4258, C - 08/18/05 +GAME( 2004, goldinc, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Golden Incas (10174011, NSW/ACT, Show Program)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 752, A - 07/04/04 +GAME( 2005, goldincu, goldinc, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Golden Incas (0252533, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4244, A - 03/10/05 +GAME( 2002, goldpym, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Golden Pyramids Special Edition - Maximillions (10130811, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 683/1, A - 21/10/02 +GAME( 2007, goldsam, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Golden Samurai (10247811, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 832, A - 31/07/07 +GAME( 2002, gbmoney, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "The Good, The Bad & The Money (0351016, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US023, B - 09/11/02 +GAME( 2006, grizzly, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Grizzly (10214711, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 780, C - 12/04/06 +GAME( 2003, heartgld, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Heart of Gold (20169511, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 717/2, A - 15/09/03 +GAME( 2006, heartveg, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Heart of Vegas (10232911, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 717/4, C - 27/06/06 +GAME( 2004, hlntroy, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Helen of Troy (0151336, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // JB014/21, B - 01/16/04 +GAME( 2001, highnoon, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "High Noon (20004111, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 671, B - 28/06/01 +GAME( 2002, holdrma, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Hollywood Dreams (10100511, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 670/1, A - 31/01/02 +GAME( 2004, househrt, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "House of Hearts (10200311, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 765, C - 09/11/04 +GAME( 2005, incachf, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Inca Chief (20190711, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 784, C - 21/10/05 +GAME( 2001, indream, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Indian Dreaming (10004211, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 628/6, B - 24/04/01 +GAME( 2002, indremce, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Indian Dreaming - Cash Express (20109411, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 628/10, A - 12/07/02 +GAME( 2003, indremll, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Indian Dreaming - Lady Luck (20151911, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 742, C - 15/10/03 +GAME( 2003, indrem2c, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Indian Dreaming 2nd Chance (10150611, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 753, B - 08/12/03 +GAME( 2003, indremmm, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Indian Dreaming - Maximillion$ (10130711, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 628/12, A - 17/01/03 +GAME( 2001, indremcm, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Indian Gold - Mr. Cashman (10102511, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 674/1, A- 21/11/01 +GAME( 2004, indprncs, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Indian Princess (10174111, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 764, A - 07/04/04 +GAME( 2002, jailbrk, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Jailbreak (10125611, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 716, A - 14/11/02 +GAME( 2003, jefffox, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "You Might Be A Redneck If... - Jeff Foxworthy (0351068, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US041, B - 06/13/03 +GAME( 2003, jewelcm, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Jewel of the Enchantress - Mr. Cashman (0151051, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US039, B- 1/24/03 +GAME( 2005, kingnep, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "King Neptune (20189111, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 789, E - 08/08/05 +GAME( 2002, kingnile, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "King of the Nile (20106321, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 687, C - 27/09/02 +GAME( 2003, kingnilea,kingnile, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "King of the Nile (30106331, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 687, D - 07/01/03 +GAME( 2000, koalama6, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Koala Mint (30001011, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 643/6, A- 01/09/00 +GAME( 2003, kohinoor, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Kohinoor (10136711, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 602/21, B - 10/02/03 +GAME( 2006, lgfish, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Let's Go Fish'n (10220111, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 756, E - 23/05/06 +GAME( 2004, lemrol, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Let 'em Roll (0151115, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US088, B - 06/24/04 +GAME( 2005, lineking, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Line King (0252534, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4245, F - 11/10/05 +GAME( 2002, lordleo, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Lord Leopard (30111211, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 685, B - 27/05/02 +GAME( 2001, lougcm, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Louie's Gold - Mr. Cashman (20006911, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 674, C- 13/07/01 +GAME( 200?, lovestrk, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Love Stuck (0152583, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4285, (no data) +GAME( 2007, lucky88, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Lucky 88 (10241411, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 840, C - 25/06/07 +GAME( 2007, luigibal, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Luigi's Ball (10235411, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 822, D - 19/03/07 +GAME( 2005, magforst, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Magic Forest (0151139, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US141, D - 02/01/05 +GAME( 2003, magmerm, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Magic Mermaid (0251331, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // JB013/20, F - 10/13/03 +GAME( 2007, metestrm, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Meteor Storm (0152162, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US217, A - 03/19/07 +GAME( 2007, milkin, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Milkin' It (10251911, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 816, B - 13/08/07 +GAME( 2005, mskitty, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Miss Kitty (10216611, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 778, C - 18/04/05 +GAME( 2000, mnytree, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Money Tree (10001211, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 657, E - 06/11/00 +GAME( 2007, moonwalt, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Moonlight Waltz (10227611, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 814/1, B - 11/01/07 +GAME( 2008, mchilli, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "More Chilli (20248711, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 844, B - 21/01/08 +GAME( 200?, mrwoo, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Mr Woo (0252599, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4276, (no data) +GAME( 2002, mystarr, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Mystic Arrow (0151009, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US005, A - 01/07/02 +GAME( 2001, mysteycm, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Mystic Eyes - Mr. Cashman (10008111, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 675, A- 09/05/01 +GAME( 2002, mysteycmu,mysteycm, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Mystic Eyes - Mr. Cashman (0251024, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US020, C- 31/05/02 +GAME( 2002, mystmerm, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Mystic Mermaid (1J008711, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // JB013, D - 27/03/02 +GAME( 2005, nerdwild, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Nerds Gone Wild (10197311, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 778, C - 18/04/05 +GAME( 200?, opsesam, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Open Sesame (0351309, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // ???, ??? +GAME( 2006, orbeaut, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Oriental Beauty (10213511, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 808, A - 07/02/06 +GAME( 2005, outbackj, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Outback Jack (20195211, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 691, J - 02/06/05 +GAME( 2001, owlcap, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Owl Capone (10008711, NSW/ACT, Show Program)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 594/9, A - 12/06/01 +GAME( 2004, pandpays, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Panda Pays - Mr. Cashman (0151109, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US092, A - 01/27/04 +GAME( 2001, parislgt, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Paris Lights (30002611, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 670, A - 03/05/01 +GAME( 2002, parislgtu,parislgt, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Paris Lights - Jackpot Carnival (0251031, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US022, A - 07/03/02 +GAME( 2002, pcockmag, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Peacock Magic (1J008811, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // JB014, B - 09/05/02 +GAME( 2004, pelipete, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Pelican Pete (10177511, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 778, A - 22/11/04 +GAME( 2005, pelipeteu,pelipete, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Pelican Pete (0252555, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4251, C - 10/28/05 +GAME( 2005, pennyar, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Penny Arcade (0251169, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US159, A - 04/06/05 +GAME( 2003, pengpyce, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Penguin Pays - Cash Express (0151120, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US055, A- 4/14/03 +GAME( 2000, pharfor, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Pharaoh's Fortune (40000921, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 656, D - 11/01/00 +GAME( 2005, phxfant, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Phoenix Fantasy (20197511, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 793, A - 21/07/05 +GAME( 2000, pirata6, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Pirates (10001511, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 661/1, B - 3/11/00 +GAME( 2004, pcfavor, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Player's Choice - Favourites (20177311, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MG0002, D - 04/11/04 +GAME( 2006, pcbydem, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Player's Choice - By Demand (10223111, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MG0005, D - 25/09/06 +GAME( 2006, pcmostw, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Player's Choice - Most Wanted (20234911, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MG0010, C - 09/11/06 +GAME( 2010, pcgold, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Player's Choice - Gold Edition (30291411, New Zealand)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MG0047, A - 09/04/10 +GAME( 200?, pwsuper, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Player's World - Super (0154019, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MG0016, (no data) +GAME( 2001, pompeia6, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Pompeii (10002211, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 628/5, A - 22/01/01 +GAME( 2002, pompeia6u,pompeia6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Pompeii (0251010, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US008, A - 04/03/02 +GAME( 2005, prideaf, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Pride of Africa (10208511, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 628/9, J - 06/12/05 +GAME( 2004, prophecy, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Prophecy (20173411, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 734, B - 10/08/04 +GAME( 2005, qnile, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Queen of the Nile (3J011111, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // JB027, C - 16/02/05 +GAME( 2001, qnilese, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Queen of the Nile Special Edition (10102811, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 683, A - 06/12/01 +GAME( 2002, qnilejc, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Queen of the Nile Special Edition - Jackpot Carnival (20123911, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 683/1, A - 21/10/02 +GAME( 2003, qsheeba, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Queen of Sheba (10133711, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 687, F - 04/03/03 +GAME( 2005, raprichs, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Rapid Riches (10194211, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 762, D - 09/03/05 +GAME( 2002, redbara6, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Red Baron (10119911, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 709, B - 21/11/02 +GAME( 2005, roadtrip, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Road Trip (0152539, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4238, C - 08/18/05 +GAME( 2002, ruprup, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Roll Up! Roll Up!! (10115911, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 642/5, A - 22/08/02 +GAME( 2002, rubymag, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Ruby Magic (10125711, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 698, C - 12/11/02 +GAME( 2010, rumbreel, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Rumble Reels (20288611, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 949, B - 04/08/10 +GAME( 2000, scatmag2, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Scatter Magic II (10001311, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 660, C- 24/08/00 +GAME( 2002, sealdeal, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Seal The Deal - Jackpot Carnival (0251029, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US024, A - 06/20/02 +GAME( 2006, shamnmg, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Shaman's Magic (10225911, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 818, C - 14/11/06 +GAME( 200?, shamnmgu, shamnmg, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Shaman's Magic (0152647, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4318/1, (no data) +GAME( 2004, shorthng, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Shore Thing (0251088, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US087, B - 1/30/04 +GAME( 2001, smtma6, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Show Me The Money (10001911, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 657/1, B - 08/01/01 +GAME( 2006, silkrda6, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Silk Road (0152537, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4248/4, D - 02/09/06 +GAME( 2002, silgola6, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Silver & Gold (20100721, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 672/1, G - 08/07/02 +GAME( 2008, skydnca6, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Sky Dancer (10272711, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // JB091/2, A - 28/08/08 +GAME( 1999, spgcarn, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Spring Carnival (10000311, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 642, C - 15/11/99 +GAME( 2003, stardrft, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Star Drifter (20150811, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 717/2, A - 15/09/03 +GAME( 2004, stardrftu,stardrft, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Star Drifter (0451341, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4204/1, A - 02/16/04 +GAME( 2001, starqst, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Star Quest (10009511, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 659/2, B - 29/10/01 +GAME( 2005, statsymb, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Status Symbols (0251147, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US146, A - 02/10/05 +GAME( 2003, sunmoon, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Sun & Moon (0151303, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4173, C - 04/01/03 +GAME( 200?, sunmonbb, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Sun & Moon - Bank Buster (0153028, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4173/2, (no data) +GAME( 2003, sunqndol, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Sun Queen - Dollar Storm (0451327, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV2070/1, B - 11/24/03 +GAME( 2005, sbuk5, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Super Bucks V (20203611, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 794, A - 03/08/05 +GAME( 2005, swhr2, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Sweethearts II (0151183, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US169, A - 7/5/05 +GAME( 2002, swh2ld, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Sweethearts II - Lucky Devil (10119811, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 712, C - 16/10/02 +GAME( 2006, tahitim, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Tahiti Magic (10238911, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 765/2, C - 07/12/06 +GAME( 2002, thaiprnc, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Thai Princess (10119321, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 707, A - 17/09/02 +GAME( 2003, thaiprncm,thaiprnc, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Thai Princess (30127721, Malaysia)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 707, E - 21/03/03 +GAME( 2004, thndrhrt, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Thunderheart (10173811, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 758, B - 11/05/04 +GAME( 2007, tigress, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Tigress (20230111, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 807, C - 03/04/07 +GAME( 2007, tikitalk, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Tiki Talk (10239111, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 831, D - 28/03/07 +GAME( 2001, tiktorch, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Tiki Torch (0151003, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4130/4, A - 08/10/01 +GAME( 200?, timbwolf, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Timber Wolf (0154013, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4333/1, (no data) +GAME( 2002, topshta6, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Top Shot (30123211, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 714, C - 16/12/02 +GAME( 2000, torgods, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Torch of the Gods (10000411, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 602/19, B - 09/08/00 +GAME( 2001, toprdice, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Touch of Paradice (20007511, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 650/2, A - 24/04/01 +GAME( 200?, trsking, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Treasure King (0152570, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4268, (no data) +GAME( 2006, turtreas, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Turtle Treasure (10234711, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 819/1, A - 06/10/06 +GAME( 2002, venetian, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Venetian Nights (1J008911, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // JB016/1, D - 05/08/02 +GAME( 2004, venice, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Venice (0151355, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // JB016/20, F - 07/06/04 +GAME( 2009, werewild, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Werewolf Wild (10288711, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 939, A - 03/12/09 +GAME( 2002, whalecsh, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Whales of Cash (20155711, Malaysia)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 695, A - 14/06/02 +GAME( 2003, whalecshu,whalecsh, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Whales of Cash (0451311, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4174, A - 03/31/03 +GAME( 2005, whalecshua,whalecsh, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Whales of Cash (0451346, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4214, B - 01/14/05 +GAME( 2004, wheregld, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Where's The Gold (10124811, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 756, B - 26/02/04 +GAME( 2004, wheregldsp,wheregld, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Where's The Gold (10124811, NSW/ACT, Show Program)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 756, B - 26/02/04 +GAME( 2004, wheregldm,wheregld, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Where's the Gold (20177111, Malaysia)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 756, C - 17/06/04 +GAME( 2003, whtwater, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "White Water (0151075, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US054, A - 4/11/03 +GAME( 2006, wikwin2, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Wicked Winnings 2 - Power Pay (10214011, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 796, A - 28/02/06 +GAME( 2002, wldafr, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Wild Africa - Millioniser (0351083, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4076, D - 5/08/02 +GAME( 2006, wldcata6, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Wild Cats (10237511, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 811, B - 20/06/06 +GAME( 2003, wldgoos, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Wild Goose (20131911, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 732, B - 02/06/03 +GAME( 2009, wgorilla, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Wild Gorilla - Power Pay (20279811, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // JB108/2, B - 19/06/09 +GAME( 2006, wldpanda, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Wild Panda (20218411, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 800, E - 07/08/06 +GAME( 2004, wldpanth, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Wild Panthers - Li'l Lucy (0651310, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4187, D- 01/15/04 +GAME( 2006, wldstall, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Wild Stallion (10230811, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 805, B - 12/09/06 +GAME( 2007, wtepee, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Wild Tepee - Power Pay (10230211, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 820, H - 20/04/07 +GAME( 2006, wwaratah, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Wild Waratah (10215911, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 811, A - 14/02/06 +GAME( 2002, wways, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Wild Ways (10106911, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 698, B - 19/06/02 +GAME( 2003, wwaysm, wways, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Wild Ways (10130111, Malaysia)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 698/1, A - 25/02/03 +GAME( 2005, wingoly, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Wings Over Olympus (0252529, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4237/1, A - 03/07/05 +GAME( 2003, wzwaysll, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Wizard Ways - Lady Luck (20139111, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 702, H - 30/06/03 +GAME( 2003, zorroa6, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Zorro (30130611, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 743, B - 5/09/03 +GAME( 2005, zorroa6u, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Zorro (0151372, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4212, F - 05/13/05 diff --git a/src/mame/drivers/atlantis.cpp b/src/mame/drivers/atlantis.cpp index d967cf97dae..bd7413145af 100644 --- a/src/mame/drivers/atlantis.cpp +++ b/src/mame/drivers/atlantis.cpp @@ -60,6 +60,7 @@ public: atlantis_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), + m_screen(*this, "screen"), m_dcs(*this, "dcs"), m_ioasic(*this, "ioasic"), m_rtc(*this, "rtc") @@ -69,11 +70,13 @@ public: virtual void machine_reset() override; UINT32 screen_update_mwskins(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device m_maincpu; + required_device m_screen; //required_device m_dcs; required_device m_dcs; required_device m_ioasic; required_device m_rtc; - std::vector m_rtc_data; + UINT8 m_rtc_data[0x800]; + UINT32 m_last_offset; READ8_MEMBER(cmos_r); WRITE8_MEMBER(cmos_w); @@ -87,11 +90,11 @@ public: DECLARE_WRITE32_MEMBER(zeus_w); DECLARE_READ32_MEMBER(zeus_r); - UINT32 m_zeus_data; + UINT32 m_zeus_data[0x80]; READ8_MEMBER (red_r); WRITE8_MEMBER(red_w); - std::vector m_red_data; + UINT8 m_red_data[0x1000]; int m_red_count; READ32_MEMBER (green_r); @@ -99,9 +102,6 @@ public: READ8_MEMBER (blue_r); WRITE8_MEMBER(blue_w); - READ32_MEMBER(map2_r); - WRITE32_MEMBER(map2_w); - WRITE32_MEMBER(user_io_output); READ32_MEMBER(user_io_input); int m_user_io_state; @@ -128,13 +128,16 @@ WRITE8_MEMBER(atlantis_state::red_w) switch (offset) { case 0: - // Data written is shifted by 1 bit each time. Maybe a serial line output? - if (m_red_count == 0) - logerror("%06X: red_w start serial %08x = %02x\n", machine().device("maincpu")->safe_pc(), offset, data); - m_red_count++; - if (m_red_count == 8) - m_red_count = 0; - break; + // User I/O 0 = Allow write to red[0]. Serial Write Enable? + if (m_user_io_state & 0x1) { + // Data written is shifted by 1 bit each time. Maybe a serial line output? + if (m_red_count == 0) + logerror("%06X: red_w start serial %08x = %02x\n", machine().device("maincpu")->safe_pc(), offset, data); + m_red_count++; + if (m_red_count == 8) + m_red_count = 0; + break; + } // Fall through to default if not enabled default: logerror("%06X: red_w %08x = %02x\n", machine().device("maincpu")->safe_pc(), offset, data); break; @@ -157,24 +160,6 @@ WRITE32_MEMBER(atlantis_state::green_w) m_last_offset = offset | 0x20000; } -READ32_MEMBER(atlantis_state::map2_r) -{ - UINT32 data = 0; - switch (offset) { - case 0x104/4: - // CPU resets map2, writes 0xffffffff here, and then expects this read - data = 0x1fff03ff; - break; - } - logerror("%06X: map2_r %08x = %08x\n", machine().device("maincpu")->safe_pc(), offset*4, data); - return data; -} - -WRITE32_MEMBER(atlantis_state::map2_w) -{ - logerror("%06X: map2_w %08x = %08x\n", machine().device("maincpu")->safe_pc(), offset*4, data); -} - READ8_MEMBER (atlantis_state::blue_r) { //UINT8 data = m_red_data[offset]; @@ -199,7 +184,7 @@ READ32_MEMBER(atlantis_state::user_io_input) // Set user i/o (2) Power Detect? m_user_io_state |= 1 << 2; - // User I/O 0 = Allow write to red[0]. Serial line? + // User I/O 0 = Allow write to red[0]. Serial Write Enable? // Loop user_io(0) to user_io(1) m_user_io_state = (m_user_io_state & ~(0x2)) | ((m_user_io_state & 1) << 1); if (0) @@ -216,15 +201,16 @@ READ32_MEMBER(atlantis_state::asic_reset_r) WRITE32_MEMBER(atlantis_state::asic_reset_w) { // 0x1 IOASIC Reset - // 0x4 Map2 Reset? + // 0x4 Zeus2 Reset // 0x10 IDE Reset logerror("%s:asic_reset_w write to offset %04X = %08X & %08X\n", machine().describe_context(), offset, data, mem_mask); - //UINT32 oldData = m_asic_reset; COMBINE_DATA(&m_asic_reset); - //if (!(m_asic_reset & 0x0002)) - //if ((m_asic_reset & 0x0002)) - if ((m_asic_reset & 0x0001)==0) - m_ioasic->ioasic_reset(); + if ((m_asic_reset & 0x0001) == 0) { + m_ioasic->ioasic_reset(); + m_dcs->reset_w(ASSERT_LINE); + } else { + m_dcs->reset_w(CLEAR_LINE); + } } @@ -346,14 +332,31 @@ WRITE32_MEMBER(atlantis_state::status_leds_w) READ32_MEMBER(atlantis_state::zeus_r) { - logerror("%s:zeus_r read from offset %04X = %08X & %08X\n", machine().describe_context(), offset, m_zeus_data, mem_mask); - return m_zeus_data; + UINT32 result = m_zeus_data[offset]; + switch (offset) { + case 0x1: + /* bit $000C0070 are tested in a loop until 0 */ + /* bits $00080000 is tested in a loop until 0 */ + /* bit $00000004 is tested for toggling; probably VBLANK */ + // zeus is reset if 0x80 is read + result = 0x00; + if (m_screen->vblank()) + result |= 0x00008; + break; + case 0x41: + // CPU resets map2, writes 0xffffffff here, and then expects this read + result &= 0x1fff03ff; + break; + } + logerror("%s:zeus_r read from offset %04X = %08X & %08X\n", machine().describe_context(), offset, result, mem_mask); + return result; } WRITE32_MEMBER(atlantis_state::zeus_w) { - COMBINE_DATA(&m_zeus_data); + COMBINE_DATA(&m_zeus_data[offset]); logerror("%s:zeus_w write to offset %04X = %08X & %08X\n", machine().describe_context(), offset, data, mem_mask); + m_last_offset = offset | 0x30000; } @@ -370,10 +373,8 @@ READ32_MEMBER(atlantis_state::cmos_protect_r) void atlantis_state::machine_start() { - m_rtc_data.resize(0x800); - m_rtc->set_base(m_rtc_data.data(), m_rtc_data.size()); + m_rtc->set_base(m_rtc_data, sizeof(m_rtc_data)); - m_red_data.resize(0x1000); /* set the fastest DRC options */ m_maincpu->mips3drc_set_options(MIPS3DRC_FASTEST_OPTIONS); } @@ -392,7 +393,7 @@ void atlantis_state::machine_reset() m_dcs->reset_w(0); m_user_io_state = 0; m_cmos_write_enabled = FALSE; - m_zeus_data = 0; + memset(m_zeus_data, 0, sizeof(m_zeus_data)); m_red_count = 0; } @@ -430,22 +431,22 @@ UINT32 atlantis_state::screen_update_mwskins(screen_device &screen, bitmap_ind16 *************************************/ static ADDRESS_MAP_START( map0, AS_PROGRAM, 32, atlantis_state ) - //00b80000 - //00980000 - //00a00000 - //00a80000 - //00900000 // 00200004 // 00200008 AM_RANGE(0x000000, 0xfff) AM_READWRITE8(red_r, red_w, 0xff) AM_RANGE(0x0001e000, 0x0001ffff) AM_READWRITE8(cmos_r, cmos_w, 0xff) - //AM_RANGE(0x00180010, 0x00180013) AM_READWRITE(asic_reset_r, asic_reset_w) - AM_RANGE(0x00400000, 0x0040002f) AM_READWRITE8(blue_r, blue_w, 0xff) + //AM_RANGE(0x00180000, 0x0018001f) // Bitlatches? + AM_RANGE(0x00400000, 0x004000bf) AM_READWRITE8(blue_r, blue_w, 0xff) + AM_RANGE(0x00880000, 0x00880003) AM_READWRITE(asic_reset_r, asic_reset_w) + //00900000 + //AM_RANGE(0x00980000, 0x00980003) // irq clear ?? + //00a00000 + //AM_RANGE(0x00a80000, 0x00a80003) // irq enable ?? + //AM_RANGE(0x00b80000, 0x00b80003) // irq cause ?? + AM_RANGE(0x00c80000, 0x00c80003) AM_READWRITE(green_r, green_w) // irq status ?? 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(0x00c80000, 0x00c80003) AM_READWRITE(green_r, green_w) - //AM_RANGE(0x00e80000, 0x00e80003) AM_NOP // Watchdog? - AM_RANGE(0x00880000, 0x00880003) AM_READWRITE(asic_reset_r, asic_reset_w) + AM_RANGE(0x00e80000, 0x00e80003) AM_NOP // Watchdog? ADDRESS_MAP_END static ADDRESS_MAP_START( map1, AS_PROGRAM, 32, atlantis_state ) @@ -457,7 +458,7 @@ static ADDRESS_MAP_START( map1, AS_PROGRAM, 32, atlantis_state ) ADDRESS_MAP_END static ADDRESS_MAP_START(map2, AS_PROGRAM, 32, atlantis_state) - AM_RANGE(0x00000000, 0x000001ff) AM_READWRITE(map2_r, map2_w) + AM_RANGE(0x00000000, 0x000001ff) AM_READWRITE(zeus_r, zeus_w) ADDRESS_MAP_END static ADDRESS_MAP_START( map3, AS_PROGRAM, 32, atlantis_state ) diff --git a/src/mame/drivers/fidelz80.cpp b/src/mame/drivers/fidelz80.cpp index 34c06fd105e..c4cfde1b3f6 100644 --- a/src/mame/drivers/fidelz80.cpp +++ b/src/mame/drivers/fidelz80.cpp @@ -37,7 +37,7 @@ Program/data cartridges, for various boards, some cross-compatible: - CG6: Greatest Chess Games 1 - CAC: Challenger Advanced Chess - 8KB 101-1038A01 - - CB9: Challenger Book Openings 1 - 8KB? + - CB9: Challenger Book Openings 1 - 8KB (label not known) - CB16: Challenger Book Openings 2 - 8+8KB 101-1042A01,02 - others are alt. titles of these? diff --git a/src/mame/drivers/goldstar.cpp b/src/mame/drivers/goldstar.cpp index e04c62e7e7b..f28e9e49887 100644 --- a/src/mame/drivers/goldstar.cpp +++ b/src/mame/drivers/goldstar.cpp @@ -225,6 +225,7 @@ #include "sound/sn76496.h" #include "machine/i8255.h" #include "machine/nvram.h" +#include "machine/ds2401.h" #include "video/ramdac.h" #include "includes/goldstar.h" @@ -7160,7 +7161,7 @@ static const gfx_layout tilelayout_cb3e = 256, /* 256 tiles */ 4, /* 4 bits per pixel */ { 0, 2, 4, 6 }, - { 2*8+0, 2*8+1,3*8+0, 3*8+1, 0, 1, 1*8+0, 1*8+1 }, + { 2*8+0, 2*8+1,3*8+0, 3*8+1, 0, 1, 1*8+0, 1*8+1 }, { 0*8, 4*8, 8*8, 12*8, 16*8, 20*8, 24*8, 28*8, 32*8, 36*8, 40*8, 44*8, 48*8, 52*8, 56*8, 60*8, 64*8, 68*8, 72*8, 76*8, 80*8, 84*8, 88*8, 92*8, @@ -7201,8 +7202,8 @@ static const gfx_layout tiles8x32x4alt_layout = 8,32, RGN_FRAC(1,2), 4, - { RGN_FRAC(1,2)+0, RGN_FRAC(1,2)+4,0,4 }, - { 3,2,1,0,11, 10, 9, 8 }, + { RGN_FRAC(1,2)+0, RGN_FRAC(1,2)+4, 0, 4 }, + { 3, 2, 1, 0, 11, 10, 9, 8 }, { 0*16, 1*16, 2*16, 3*16, 4*16, 5*16, 6*16, 7*16, 8*16, 9*16, 10*16, 11*16, 12*16, 13*16, 14*16, 15*16, 16*16,17*16, 18*16, 19*16, 20*16, 21*16, 22*16, 23*16, @@ -7281,8 +7282,8 @@ static const gfx_layout cb3c_tiles8x8_layout = 8,8, RGN_FRAC(1,1), 4, - { 0,1,2,3 }, - { 4,0,12,8,20,16,28,24 }, + { 0, 1, 2, 3 }, + { 4, 0, 12, 8, 20, 16, 28, 24 }, { 0*32, 1*32, 2*32, 3*32, 4*32, 5*32, 6*32, 7*32 }, 8*32 }; @@ -7293,9 +7294,11 @@ static const gfx_layout cb3c_tiles8x32_layout = 8,32, RGN_FRAC(1,1), 4, - { 0,1,2,3 }, - { 4,0,12,8,20,16,28,24 }, - { 0*32, 1*32, 2*32, 3*32, 4*32, 5*32, 6*32, 7*32, 8*32,9*32,10*32,11*32,12*32,13*32,14*32,15*32,16*32,17*32,18*32,19*32,20*32,21*32,22*32,23*32,24*32,25*32,26*32,27*32,28*32,29*32,30*32,31*32 }, + { 0, 1, 2, 3 }, + { 4, 0, 12, 8, 20, 16, 28, 24 }, + { 0*32, 1*32, 2*32, 3*32, 4*32, 5*32, 6*32, 7*32, 8*32, 9*32, 10*32, 11*32, 12*32, + 13*32, 14*32, 15*32, 16*32, 17*32, 18*32, 19*32, 20*32, 21*32, 22*32, 23*32, + 24*32, 25*32, 26*32, 27*32, 28*32, 29*32, 30*32, 31*32 }, 32*32 }; @@ -7471,9 +7474,11 @@ static const gfx_layout tiles8x32_4bpp_layout = 8,32, RGN_FRAC(1,4), 4, - { RGN_FRAC(0,4),RGN_FRAC(1,4),RGN_FRAC(2,4),RGN_FRAC(3,4) }, - { 0,1,2,3,4,5,6,7}, - { 0*8, 1*8, 2*8, 3*8, 4*8, 5*8, 6*8, 7*8,8*8,9*8,10*8,11*8,12*8,13*8,14*8,15*8,16*8,17*8,18*8,19*8,20*8,21*8,22*8,23*8,24*8,25*8,26*8,27*8,28*8,29*8,30*8,31*8 }, + { RGN_FRAC(0,4), RGN_FRAC(1,4), RGN_FRAC(2,4), RGN_FRAC(3,4) }, + { 0, 1, 2, 3, 4, 5, 6, 7}, + { 0*8, 1*8, 2*8, 3*8, 4*8, 5*8, 6*8, 7*8, 8*8, 9*8, 10*8, 11*8, 12*8, + 13*8, 14*8, 15*8, 16*8, 17*8, 18*8, 19*8, 20*8, 21*8, 22*8, 23*8, + 24*8, 25*8, 26*8, 27*8, 28*8, 29*8, 30*8, 31*8 }, 32*8 }; @@ -7482,8 +7487,8 @@ static const gfx_layout tiles8x8_3bpp_layout = 8,8, RGN_FRAC(1,3), 3, - { RGN_FRAC(0,3),RGN_FRAC(1,3),RGN_FRAC(2,3) }, - { 0,1,2,3,4,5,6,7}, + { RGN_FRAC(0,3), RGN_FRAC(1,3), RGN_FRAC(2,3) }, + { 0, 1, 2, 3, 4, 5, 6, 7}, { 0*8, 1*8, 2*8, 3*8, 4*8, 5*8, 6*8, 7*8 }, 8*8 }; @@ -7499,8 +7504,8 @@ static const gfx_layout tiles8x8x3_miss1bpp_layout = 8,8, RGN_FRAC(1,1), 3, - { 1,2,3 }, - { 8,12,0,4,24,28,16,20 }, + { 1, 2, 3 }, + { 8, 12, 0, 4, 24, 28, 16, 20 }, { 0*32, 1*32, 2*32, 3*32, 4*32, 5*32, 6*32, 7*32 }, 8*32 }; @@ -7510,8 +7515,8 @@ static const gfx_layout tiles8x8x4alt_layout = 8,8, RGN_FRAC(1,1), 4, - { 0, 1,2,3 }, - { 4,0,12,8,20,16,28,24 }, + { 0, 1, 2, 3 }, + { 4, 0, 12, 8, 20, 16, 28, 24 }, { 0*32, 1*32, 2*32, 3*32, 4*32, 5*32, 6*32, 7*32 }, 8*32 }; @@ -7521,8 +7526,8 @@ static const gfx_layout tiles8x32x4alt2_layout = 8,32, RGN_FRAC(1,1), 4, - { 0, 1,2,3 }, - { 4,0,12,8,20,16,28,24 }, + { 0, 1, 2, 3 }, + { 4, 0, 12, 8, 20, 16, 28, 24 }, { STEP32(0,32) }, 32*32 }; @@ -7538,8 +7543,8 @@ static const gfx_layout tilescherrys_layout = 8,32, RGN_FRAC(1,1), 4, - { 3,2,1,0 }, - { 8,12,0,4,24,28,16,20 }, + { 3, 2, 1, 0 }, + { 8, 12, 0, 4, 24, 28, 16, 20 }, { STEP32(0,32) }, 32*32 }; @@ -7575,9 +7580,9 @@ static const gfx_layout cm97_layout = 8,8, RGN_FRAC(1,1), 4, - { 0,1,2,3 }, - { 8,12,0,4,24,28, 16,20 }, - { 0*32,1*32,2*32,3*32,4*32,5*32,6*32,7*32 }, + { 0, 1, 2, 3 }, + { 8, 12, 0, 4, 24, 28, 16, 20 }, + { 0*32, 1*32, 2*32, 3*32, 4*32, 5*32, 6*32, 7*32 }, 8*32 }; @@ -7588,7 +7593,9 @@ static const gfx_layout cm97_layout32 = 4, { 0,1,2,3 }, { 8,12,0,4,24,28, 16,20 }, - { 0*32,1*32,2*32,3*32,4*32,5*32,6*32,7*32, 8*32, 9*32, 10*32, 11*32, 12*32, 13*32,14*32,15*32,16*32,17*32,18*32,19*32,20*32,21*32,22*32,23*32,24*32,25*32,26*32,27*32,28*32,29*32,30*32,31*32 }, + { 0*32, 1*32, 2*32, 3*32, 4*32, 5*32, 6*32, 7*32, 8*32, 9*32, 10*32, 11*32, + 12*32, 13*32, 14*32, 15*32, 16*32, 17*32, 18*32, 19*32, 20*32, 21*32, + 22*32, 23*32, 24*32, 25*32, 26*32, 27*32, 28*32, 29*32, 30*32, 31*32 }, 32*32 }; @@ -7649,7 +7656,7 @@ static MACHINE_CONFIG_START( goldstar, goldstar_state ) MCFG_PALETTE_FORMAT(BBGGGRRR) MCFG_NVRAM_ADD_1FILL("nvram") - MCFG_VIDEO_START_OVERRIDE(goldstar_state,goldstar) + MCFG_VIDEO_START_OVERRIDE(goldstar_state, goldstar) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -7670,7 +7677,7 @@ static MACHINE_CONFIG_START( goldstbl, goldstar_state ) MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK) MCFG_CPU_PROGRAM_MAP(goldstar_map) MCFG_CPU_IO_MAP(goldstar_readport) - MCFG_CPU_VBLANK_INT_DRIVER("screen", goldstar_state, irq0_line_hold) + MCFG_CPU_VBLANK_INT_DRIVER("screen", goldstar_state, irq0_line_hold) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -7686,7 +7693,7 @@ static MACHINE_CONFIG_START( goldstbl, goldstar_state ) MCFG_PALETTE_FORMAT(BBGGGRRR) MCFG_NVRAM_ADD_1FILL("nvram") - MCFG_VIDEO_START_OVERRIDE(goldstar_state,goldstar) + MCFG_VIDEO_START_OVERRIDE(goldstar_state, goldstar) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -7714,7 +7721,7 @@ static MACHINE_CONFIG_START( star100, sanghopm_state ) MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK) MCFG_CPU_PROGRAM_MAP(star100_map) MCFG_CPU_IO_MAP(star100_readport) - MCFG_CPU_VBLANK_INT_DRIVER("screen", sanghopm_state, irq0_line_hold) + MCFG_CPU_VBLANK_INT_DRIVER("screen", sanghopm_state, irq0_line_hold) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -7755,7 +7762,7 @@ static MACHINE_CONFIG_START( super9, goldstar_state ) // MCFG_CPU_PROGRAM_MAP(nfm_map) MCFG_CPU_IO_MAP(goldstar_readport) // MCFG_CPU_IO_MAP(unkch_portmap) - MCFG_CPU_VBLANK_INT_DRIVER("screen", goldstar_state, irq0_line_hold) + MCFG_CPU_VBLANK_INT_DRIVER("screen", goldstar_state, irq0_line_hold) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -7921,7 +7928,7 @@ static MACHINE_CONFIG_START( wcherry, goldstar_state ) MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK) MCFG_CPU_PROGRAM_MAP(wcherry_map) MCFG_CPU_IO_MAP(wcherry_readwriteport) - MCFG_CPU_VBLANK_INT_DRIVER("screen", goldstar_state, irq0_line_hold) + MCFG_CPU_VBLANK_INT_DRIVER("screen", goldstar_state, irq0_line_hold) MCFG_DEVICE_ADD("ppi8255_0", I8255A, 0) MCFG_I8255_IN_PORTA_CB(IOPORT("IN0")) @@ -7970,7 +7977,7 @@ static MACHINE_CONFIG_START( cm, cmaster_state ) MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK) MCFG_CPU_PROGRAM_MAP(cm_map) MCFG_CPU_IO_MAP(cm_portmap) - MCFG_CPU_VBLANK_INT_DRIVER("screen", goldstar_state, irq0_line_hold) + MCFG_CPU_VBLANK_INT_DRIVER("screen", goldstar_state, irq0_line_hold) MCFG_DEVICE_ADD("ppi8255_0", I8255A, 0) MCFG_I8255_IN_PORTA_CB(IOPORT("IN0")) @@ -8100,7 +8107,7 @@ static MACHINE_CONFIG_START( lucky8, wingco_state ) MCFG_PALETTE_INIT_OWNER(goldstar_state, lucky8) MCFG_NVRAM_ADD_1FILL("nvram") - MCFG_VIDEO_START_OVERRIDE(goldstar_state,goldstar) + MCFG_VIDEO_START_OVERRIDE(goldstar_state, goldstar) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -8151,7 +8158,7 @@ static MACHINE_CONFIG_START( bingowng, wingco_state ) MCFG_GFXDECODE_ADD("gfxdecode", "palette", ncb3) MCFG_PALETTE_ADD("palette", 256) - MCFG_PALETTE_INIT_OWNER(goldstar_state,lucky8) + MCFG_PALETTE_INIT_OWNER(goldstar_state, lucky8) MCFG_NVRAM_ADD_1FILL("nvram") MCFG_VIDEO_START_OVERRIDE(wingco_state, bingowng) @@ -8180,6 +8187,8 @@ static MACHINE_CONFIG_DERIVED( flaming7, lucky8 ) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(flaming7_map) // MCFG_CPU_IO_MAP(flaming7_readport) + + MCFG_DS2401_ADD("fl7w4_serial_id") MACHINE_CONFIG_END @@ -8202,7 +8211,7 @@ static MACHINE_CONFIG_START( magodds, wingco_state ) MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK) MCFG_CPU_PROGRAM_MAP(magodds_map) //MCFG_CPU_IO_MAP(goldstar_readport) - MCFG_CPU_VBLANK_INT_DRIVER("screen", wingco_state, masked_irq) + MCFG_CPU_VBLANK_INT_DRIVER("screen", wingco_state, masked_irq) MCFG_DEVICE_ADD("ppi8255_0", I8255A, 0) MCFG_I8255_IN_PORTA_CB(IOPORT("IN0")) @@ -8257,7 +8266,7 @@ static MACHINE_CONFIG_START( kkotnoli, goldstar_state ) MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK) MCFG_CPU_PROGRAM_MAP(kkotnoli_map) //MCFG_CPU_IO_MAP(goldstar_readport) - MCFG_CPU_VBLANK_INT_DRIVER("screen", goldstar_state, nmi_line_pulse) + MCFG_CPU_VBLANK_INT_DRIVER("screen", goldstar_state, nmi_line_pulse) MCFG_DEVICE_ADD("ppi8255_0", I8255A, 0) MCFG_I8255_IN_PORTA_CB(IOPORT("IN0")) @@ -8284,7 +8293,7 @@ static MACHINE_CONFIG_START( kkotnoli, goldstar_state ) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_INIT_OWNER(goldstar_state, lucky8) - MCFG_VIDEO_START_OVERRIDE(goldstar_state,goldstar) + MCFG_VIDEO_START_OVERRIDE(goldstar_state, goldstar) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -8301,7 +8310,7 @@ static MACHINE_CONFIG_START( ladylinr, goldstar_state ) MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK) MCFG_CPU_PROGRAM_MAP(ladylinr_map) //MCFG_CPU_IO_MAP(goldstar_readport) - MCFG_CPU_VBLANK_INT_DRIVER("screen", goldstar_state, nmi_line_pulse) + MCFG_CPU_VBLANK_INT_DRIVER("screen", goldstar_state, nmi_line_pulse) MCFG_DEVICE_ADD("ppi8255_0", I8255A, 0) MCFG_I8255_IN_PORTA_CB(IOPORT("IN0")) @@ -8325,7 +8334,7 @@ static MACHINE_CONFIG_START( ladylinr, goldstar_state ) MCFG_PALETTE_INIT_OWNER(goldstar_state, lucky8) MCFG_NVRAM_ADD_1FILL("nvram") - MCFG_VIDEO_START_OVERRIDE(goldstar_state,goldstar) + MCFG_VIDEO_START_OVERRIDE(goldstar_state, goldstar) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -8344,7 +8353,7 @@ static MACHINE_CONFIG_START( wcat3, wingco_state ) MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK) MCFG_CPU_PROGRAM_MAP(wcat3_map) //MCFG_CPU_IO_MAP(goldstar_readport) - MCFG_CPU_VBLANK_INT_DRIVER("screen", goldstar_state, nmi_line_pulse) + MCFG_CPU_VBLANK_INT_DRIVER("screen", goldstar_state, nmi_line_pulse) MCFG_DEVICE_ADD("ppi8255_0", I8255A, 0) MCFG_I8255_IN_PORTA_CB(IOPORT("IN0")) @@ -8376,7 +8385,7 @@ static MACHINE_CONFIG_START( wcat3, wingco_state ) MCFG_PALETTE_INIT_OWNER(goldstar_state, lucky8) MCFG_NVRAM_ADD_1FILL("nvram") - MCFG_VIDEO_START_OVERRIDE(goldstar_state,goldstar) + MCFG_VIDEO_START_OVERRIDE(goldstar_state, goldstar) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -8401,7 +8410,7 @@ static MACHINE_CONFIG_START( amcoe1, cmaster_state ) MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK) MCFG_CPU_PROGRAM_MAP(cm_map) MCFG_CPU_IO_MAP(amcoe1_portmap) - MCFG_CPU_VBLANK_INT_DRIVER("screen", goldstar_state, irq0_line_hold) + MCFG_CPU_VBLANK_INT_DRIVER("screen", goldstar_state, irq0_line_hold) MCFG_DEVICE_ADD("ppi8255_0", I8255A, 0) MCFG_I8255_IN_PORTA_CB(IOPORT("IN0")) @@ -8483,7 +8492,7 @@ static MACHINE_CONFIG_START( amcoe2, cmaster_state ) MCFG_PALETTE_INIT_OWNER(goldstar_state,cm) MCFG_NVRAM_ADD_1FILL("nvram") - MCFG_VIDEO_START_OVERRIDE(goldstar_state,cherrym) + MCFG_VIDEO_START_OVERRIDE(goldstar_state, cherrym) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -8554,7 +8563,7 @@ static MACHINE_CONFIG_START( pkrmast, goldstar_state ) MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK) MCFG_CPU_PROGRAM_MAP(cm_map) MCFG_CPU_IO_MAP(pkrmast_portmap) - MCFG_CPU_VBLANK_INT_DRIVER("screen", goldstar_state, irq0_line_hold) + MCFG_CPU_VBLANK_INT_DRIVER("screen", goldstar_state, irq0_line_hold) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -14089,10 +14098,14 @@ ROM_END W-4 PCB type has some hacks... 1) PPI 8255 pin 10 (PC7) is wired to pin 22 (PB4)... - Maybe the boot protection? 2) Pin 39 from solder side (speaker GND) and pin 04 from components side (PPI 8255 pin 11, PC6) are wired with a DS2401 (sillicon serial number) device, to pins 1 & 2 (GND & DATA). + + DS2401 has 64bits of internal data: 8 bits for family type + 48 bits for serial + 8 bits for CRC. + + Maxim/Dallas 1-Wire devices use what is called Dow CRC to check that the data bytes were received correctly. + This returns an 8-bit CRC value as the last byte and uses a polynomial of X^8 + X^5 + X^4 + X^0. 3) Z80 /INT line (pin 16) is out of socket and wired to a 74161. @@ -14114,7 +14127,7 @@ ROM_END navigate between pages. Press BOOKS/STATS/SETUP (key 0) to exit the Bookkeeping mode. */ -ROM_START( fl7_3121 ) // Red, White & Blue 7's + Hollywood Nights. +ROM_START( fl7_3121 ) // Red, White & Blue 7's + Hollywood Nights. Serial 7D063B800000. ROM_REGION( 0x8000, "maincpu", 0 ) ROM_LOAD( "main.14b", 0x0000, 0x8000, CRC(5756e927) SHA1(5448e1ca4ae060b086145eee10b8dc6eb05acc56) ) @@ -14141,6 +14154,10 @@ ROM_START( fl7_3121 ) // Red, White & Blue 7's + Hollywood Nights. ROM_REGION( 0x20, "unkprom2", 0 ) ROM_LOAD( "82s123.d12", 0x0000, 0x0020, CRC(6df3f972) SHA1(0096a7f7452b70cac6c0752cb62e24b643015b5c) ) + + ROM_REGION(0x8, "serial_id", 0) /* Electronic Serial DS2401 */ + ROM_LOAD( "ds2401.bin", 0x0000, 0x0008, BAD_DUMP CRC(747b40b1) SHA1(3336d8de5333057beb5f55873b9410cc7bf73fbb) ) // Hand built... Last byte is CRC-8. Need to be checked. + ROM_END diff --git a/src/mame/drivers/hh_tms1k.cpp b/src/mame/drivers/hh_tms1k.cpp index 16c189ca360..79a3d0c87d1 100644 --- a/src/mame/drivers/hh_tms1k.cpp +++ b/src/mame/drivers/hh_tms1k.cpp @@ -21,7 +21,7 @@ @CP0904A TMS0970 1977, Milton Bradley Comp IV @MP0905B TMS0970 1977, Parker Brothers Codename Sector *MP0057 TMS1000 1978, APH Student Speech+ (same ROM contents as TSI Speech+?) - *MP0158 TMS1000 1979, Entex Soccer + @MP0158 TMS1000 1979, Entex Soccer *MP0168 TMS1000 1979, Conic Basketball @MP0170 TMS1000 1979, Conic Football @MP0914 TMS1000 1979, Entex Baseball 1 @@ -34,7 +34,7 @@ @MP1204 TMS1100 1980, Entex Baseball 3 (6007) @MP1211 TMS1100 1980, Entex Space Invader @MP1218 TMS1100 1980, Entex Basketball 2 (6010) - *MP1219 TMS1100 1980, U.S. Games Super Sports 4 + @MP1219 TMS1100 1980, U.S. Games Super Sports 4 @MP1221 TMS1100 1980, Entex Raise The Devil *MP1296 TMS1100? 1982, Entex Black Knight @MP1312 TMS1100 1983, Gakken FX-Micom R-165/Tandy Radio Shack Science Fair Microcomputer Trainer @@ -140,6 +140,7 @@ #include "efootb4.lh" #include "einvader.lh" // test-layout(but still playable) #include "elecdet.lh" +#include "esoccer.lh" #include "fxmcr165.lh" // clickable #include "gjackpot.lh" #include "gpoker.lh" @@ -152,8 +153,9 @@ #include "mmerlin.lh" // clickable #include "raisedvl.lh" #include "simon.lh" // clickable -#include "ssimon.lh" // clickable #include "splitsec.lh" +#include "ssimon.lh" // clickable +#include "ssports4.lh" #include "starwbc.lh" // clickable #include "stopthie.lh" // clickable #include "tandy12.lh" // clickable @@ -1625,6 +1627,111 @@ MACHINE_CONFIG_END +/*************************************************************************** + + Entex (Electronic) Soccer + * TMS1000NL MP0158 (die label same) + * 2 7seg LEDs, 30 other LEDs, 1-bit sound + + known releases: + - USA: Electronic Soccer, 2 versions (green bezel, transparent bezel) + - Germany: Fussball, with skill switch + +***************************************************************************/ + +class esoccer_state : public hh_tms1k_state +{ +public: + esoccer_state(const machine_config &mconfig, device_type type, const char *tag) + : hh_tms1k_state(mconfig, type, tag) + { } + + void prepare_display(); + DECLARE_WRITE16_MEMBER(write_r); + DECLARE_WRITE16_MEMBER(write_o); + DECLARE_READ8_MEMBER(read_k); +}; + +// handlers + +void esoccer_state::prepare_display() +{ + // R8,R9 are 7segs + m_display_segmask[8] = m_display_segmask[9] = 0x7f; + display_matrix(7, 10, m_o, m_r); +} + +WRITE16_MEMBER(esoccer_state::write_r) +{ + // R0-R2: input mux + m_inp_mux = data & 7; + + // R10: speaker out + m_speaker->level_w(data >> 10 & 1); + + // R0-R9: led select + m_r = data; + prepare_display(); +} + +WRITE16_MEMBER(esoccer_state::write_o) +{ + // O0-O6: led state + m_o = data; + prepare_display(); +} + +READ8_MEMBER(esoccer_state::read_k) +{ + // K: multiplexed inputs + return read_inputs(3); +} + + +// config + +static INPUT_PORTS_START( esoccer ) + PORT_START("IN.0") // R0 + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_16WAY + PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_16WAY + PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_16WAY + PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_16WAY + + PORT_START("IN.1") // R1 + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_COCKTAIL PORT_16WAY + PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_COCKTAIL PORT_16WAY + PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_COCKTAIL PORT_16WAY + PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_COCKTAIL PORT_16WAY + + PORT_START("IN.2") // R2 + PORT_CONFNAME( 0x03, 0x01, "Players" ) + PORT_CONFSETTING( 0x01, "1" ) // Auto + PORT_CONFSETTING( 0x02, "2" ) // Manual + PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON1 ) + PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_COCKTAIL +INPUT_PORTS_END + +static MACHINE_CONFIG_START( esoccer, esoccer_state ) + + /* basic machine hardware */ + MCFG_CPU_ADD("maincpu", TMS1000, 350000) // approximation - RC osc. R=47K, C=33pf + MCFG_TMS1XXX_READ_K_CB(READ8(esoccer_state, read_k)) + MCFG_TMS1XXX_WRITE_R_CB(WRITE16(esoccer_state, write_r)) + MCFG_TMS1XXX_WRITE_O_CB(WRITE16(esoccer_state, write_o)) + + MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) + MCFG_DEFAULT_LAYOUT(layout_esoccer) + + /* sound hardware */ + MCFG_SPEAKER_STANDARD_MONO("mono") + MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) +MACHINE_CONFIG_END + + + + + /*************************************************************************** Entex (Electronic) Baseball (1) @@ -3629,6 +3736,12 @@ MACHINE_CONFIG_END This is a 2-player electronic board game. It still needs game pieces like the original Battleship board game. + + It went through 3 hardware revisions: + 1977: model 4750A or B, see notes above + 1980: model 4750C: cost-reduced single chip design, lesser quality game board. + The chip is assumed to be custom, no MCU: 28-pin DIP, label 4750, SCUS 0462 + 1982: back to MCU, COP420 instead of choosing TI, see hh_cop400.cpp ***************************************************************************/ @@ -5655,6 +5768,82 @@ MACHINE_CONFIG_END +/*************************************************************************** + + U.S. Games Super Sports 4 + * TMS1100 MP1219 (no decap) + * x + +***************************************************************************/ + +class ssports4_state : public hh_tms1k_state +{ +public: + ssports4_state(const machine_config &mconfig, device_type type, const char *tag) + : hh_tms1k_state(mconfig, type, tag) + { } + + void prepare_display(); + DECLARE_WRITE16_MEMBER(write_r); + DECLARE_WRITE16_MEMBER(write_o); + DECLARE_READ8_MEMBER(read_k); +}; + +// handlers + +void ssports4_state::prepare_display() +{ +} + +WRITE16_MEMBER(ssports4_state::write_r) +{ +} + +WRITE16_MEMBER(ssports4_state::write_o) +{ +} + +READ8_MEMBER(ssports4_state::read_k) +{ + return 0; +} + + +// config + +static INPUT_PORTS_START( ssports4 ) +INPUT_PORTS_END + + +// output PLA is not decapped, dumped electronically +static const UINT16 ssports4_output_pla[0x20] = +{ + 0x3f, 0x06, 0x5b, 0x4f, 0x66, 0x6d, 0x7d, 0x07, 0x7f, 0x6f, 0x00, 0x40, 0x40, 0x40, 0x40, 0x40, + 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +}; + +static MACHINE_CONFIG_START( ssports4, ssports4_state ) + + /* basic machine hardware */ + MCFG_CPU_ADD("maincpu", TMS1100, 375000) // approximation - RC osc. R=47K, C=47pf + MCFG_TMS1XXX_OUTPUT_PLA(ssports4_output_pla) + MCFG_TMS1XXX_READ_K_CB(READ8(ssports4_state, read_k)) + MCFG_TMS1XXX_WRITE_R_CB(WRITE16(ssports4_state, write_r)) + MCFG_TMS1XXX_WRITE_O_CB(WRITE16(ssports4_state, write_o)) + + MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) + MCFG_DEFAULT_LAYOUT(layout_ssports4) + + /* sound hardware */ + MCFG_SPEAKER_STANDARD_MONO("mono") + MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) +MACHINE_CONFIG_END + + + + + /*************************************************************************** Game driver(s) @@ -5760,6 +5949,17 @@ ROM_START( cnfball2 ) ROM_END +ROM_START( esoccer ) + ROM_REGION( 0x0400, "maincpu", 0 ) + ROM_LOAD( "mp0158", 0x0000, 0x0400, CRC(ae4581ea) SHA1(5f6881f8247094abf8cffb17f6e6586e94cff38c) ) + + ROM_REGION( 867, "maincpu:mpla", 0 ) + ROM_LOAD( "tms1000_common2_micro.pla", 0, 867, CRC(d33da3cf) SHA1(13c4ebbca227818db75e6db0d45b66ba5e207776) ) + ROM_REGION( 365, "maincpu:opla", 0 ) + ROM_LOAD( "tms1000_esoccer_output.pla", 0, 365, CRC(c6eeabbd) SHA1(99d07902126b5a1c1abf43340f30d3390da5fa92) ) +ROM_END + + ROM_START( ebball ) ROM_REGION( 0x0400, "maincpu", 0 ) ROM_LOAD( "mp0914", 0x0000, 0x0400, CRC(3c6fb05b) SHA1(b2fe4b3ca72d6b4c9bfa84d67f64afdc215e7178) ) @@ -6140,6 +6340,17 @@ ROM_START( phpball ) ROM_END +ROM_START( ssports4 ) + ROM_REGION( 0x0800, "maincpu", 0 ) + ROM_LOAD( "mp1219", 0x0000, 0x0800, CRC(865c06d6) SHA1(12a625a13bdb57b82b35c42b175d38756a1e2e04) ) + + ROM_REGION( 867, "maincpu:mpla", 0 ) + ROM_LOAD( "tms1100_common2_micro.pla", 0, 867, BAD_DUMP CRC(7cc90264) SHA1(c6e1cf1ffb178061da9e31858514f7cd94e86990) ) // not verified + ROM_REGION( 365, "maincpu:opla", 0 ) + ROM_LOAD( "tms1100_ssports4_output.pla", 0, 365, NO_DUMP ) +ROM_END + + /* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY, FULLNAME, FLAGS */ COMP( 1980, mathmagi, 0, 0, mathmagi, mathmagi, driver_device, 0, "APF Electronics Inc.", "Mathemagician", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW ) @@ -6154,6 +6365,7 @@ CONS( 1981, tc4, 0, 0, tc4, tc4, driver_device, 0, "Col CONS( 1979, cnfball, 0, 0, cnfball, cnfball, driver_device, 0, "Conic", "Electronic Football (Conic, TMS1000 version)", MACHINE_SUPPORTS_SAVE ) CONS( 1979, cnfball2, 0, 0, cnfball2, cnfball2, driver_device, 0, "Conic", "Electronic Football II (Conic)", MACHINE_SUPPORTS_SAVE ) +CONS( 1979, esoccer, 0, 0, esoccer, esoccer, driver_device, 0, "Entex", "Electronic Soccer (Entex)", MACHINE_SUPPORTS_SAVE ) CONS( 1979, ebball, 0, 0, ebball, ebball, driver_device, 0, "Entex", "Electronic Baseball (Entex)", MACHINE_SUPPORTS_SAVE ) CONS( 1979, ebball2, 0, 0, ebball2, ebball2, driver_device, 0, "Entex", "Electronic Baseball 2 (Entex)", MACHINE_SUPPORTS_SAVE ) CONS( 1980, ebball3, 0, 0, ebball3, ebball3, driver_device, 0, "Entex", "Electronic Baseball 3 (Entex)", MACHINE_SUPPORTS_SAVE ) @@ -6198,5 +6410,7 @@ CONS( 1989, copycatm2, copycat, 0, copycatm2, copycatm2, driver_device, 0, "Tig CONS( 1979, tbreakup, 0, 0, tbreakup, tbreakup, driver_device, 0, "Tomy", "Break Up (Tomy)", MACHINE_SUPPORTS_SAVE ) CONS( 1980, phpball, 0, 0, phpball, phpball, driver_device, 0, "Tomy", "Power House Pinball", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK ) +CONS( 1980, ssports4, 0, 0, ssports4, ssports4, driver_device, 0, "U.S. Games", "Super Sports 4", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK ) + // ***: As far as MAME is concerned, the game is emulated fine. But for it to be playable, it requires interaction // with other, unemulatable, things eg. game board/pieces, playing cards, pen & paper, etc. diff --git a/src/mame/drivers/mario.cpp b/src/mame/drivers/mario.cpp index a837eca523b..b4d736fbfdc 100644 --- a/src/mame/drivers/mario.cpp +++ b/src/mame/drivers/mario.cpp @@ -227,8 +227,8 @@ static INPUT_PORTS_START( mario ) PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN ) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNKNOWN ) PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2) - PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_COIN1 ) - PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_COIN2 ) /* doesn't work in game, but does in service mode */ + PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_COIN2 ) + PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN ) PORT_START("DSW") @@ -243,9 +243,9 @@ static INPUT_PORTS_START( mario ) PORT_DIPSETTING( 0x08, DEF_STR( 1C_2C ) ) PORT_DIPSETTING( 0x0c, DEF_STR( 1C_3C ) ) PORT_DIPNAME( 0x30, 0x00, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW1:!5,!6") - PORT_DIPSETTING( 0x00, "20k only" ) - PORT_DIPSETTING( 0x10, "30k only" ) - PORT_DIPSETTING( 0x20, "40k only" ) + PORT_DIPSETTING( 0x00, "20k 40k 20k+" ) + PORT_DIPSETTING( 0x10, "30k 50k 20k+" ) + PORT_DIPSETTING( 0x20, "40k 60k 20k+" ) PORT_DIPSETTING( 0x30, DEF_STR( None ) ) PORT_DIPNAME( 0xc0, 0x00, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW1:!7,!8") PORT_DIPSETTING( 0x00, DEF_STR( Easy ) ) @@ -263,13 +263,25 @@ INPUT_PORTS_END static INPUT_PORTS_START( marioo ) PORT_INCLUDE( mario ) - PORT_MODIFY( "IN1" ) - PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_COIN2 ) - PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_COIN1 ) + PORT_MODIFY( "DSW" ) + PORT_DIPNAME( 0x30, 0x00, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW1:!5,!6") + PORT_DIPSETTING( 0x00, "20k only" ) + PORT_DIPSETTING( 0x10, "30k only" ) + PORT_DIPSETTING( 0x20, "40k only" ) + PORT_DIPSETTING( 0x30, DEF_STR( None ) ) +INPUT_PORTS_END + + +static INPUT_PORTS_START( marioe ) + PORT_INCLUDE( marioo ) + + PORT_MODIFY ( "IN1" ) + PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_COIN1 ) + PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_COIN2 ) /* doesn't work in game, but does in service mode */ INPUT_PORTS_END static INPUT_PORTS_START( marioj ) - PORT_INCLUDE( mario ) + PORT_INCLUDE( marioe ) PORT_MODIFY( "DSW" ) PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW1:!1,!2") @@ -296,17 +308,6 @@ static INPUT_PORTS_START( marioj ) PORT_DIPSETTING( 0xc0, DEF_STR( None ) ) INPUT_PORTS_END -static INPUT_PORTS_START( masao ) - PORT_INCLUDE( marioo ) - - PORT_MODIFY( "DSW" ) - PORT_DIPNAME( 0x30, 0x00, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW1:!5,!6") - PORT_DIPSETTING( 0x00, "20k 40k 20k+" ) - PORT_DIPSETTING( 0x10, "30k 50k 20k+" ) - PORT_DIPSETTING( 0x20, "40k 60k 20k+" ) - PORT_DIPSETTING( 0x30, DEF_STR( None ) ) -INPUT_PORTS_END - static INPUT_PORTS_START( mariobl ) @@ -831,11 +832,11 @@ ROM_END * *************************************/ -GAME( 1983, mario, 0, mario, marioo, driver_device, 0, ROT0, "Nintendo of America", "Mario Bros. (US, Revision F)", MACHINE_SUPPORTS_SAVE ) -GAME( 1983, marioe, mario, mario, mario, driver_device, 0, ROT0, "Nintendo of America", "Mario Bros. (US, Revision E)", MACHINE_SUPPORTS_SAVE ) +GAME( 1983, mario, 0, mario, mario, driver_device, 0, ROT0, "Nintendo of America", "Mario Bros. (US, Revision F)", MACHINE_SUPPORTS_SAVE ) +GAME( 1983, marioe, mario, mario, marioe, driver_device, 0, ROT0, "Nintendo of America", "Mario Bros. (US, Revision E)", MACHINE_SUPPORTS_SAVE ) GAME( 1983, marioo, mario, mario, marioo, driver_device, 0, ROT0, "Nintendo of America", "Mario Bros. (US, Unknown Rev)", MACHINE_SUPPORTS_SAVE ) GAME( 1983, marioj, mario, mario, marioj, driver_device, 0, ROT0, "Nintendo", "Mario Bros. (Japan)", MACHINE_SUPPORTS_SAVE ) -GAME( 1983, masao, mario, masao, masao, driver_device, 0, ROT0, "bootleg", "Masao", MACHINE_SUPPORTS_SAVE ) +GAME( 1983, masao, mario, masao, mario, driver_device, 0, ROT0, "bootleg", "Masao", MACHINE_SUPPORTS_SAVE ) // todo, these might have a better home than in here GAME( 1983, mariobl, mario, mariobl, mariobl,driver_device, 0, ROT180, "bootleg", "Mario Bros. (Japan, bootleg)", MACHINE_SUPPORTS_SAVE ) // was listed as 'on extended Ambush hardware' but doesn't seem similar apart from the sound system? diff --git a/src/mame/drivers/sun2.cpp b/src/mame/drivers/sun2.cpp index 80862bcf5ec..88c4fced5a8 100644 --- a/src/mame/drivers/sun2.cpp +++ b/src/mame/drivers/sun2.cpp @@ -1,5 +1,5 @@ // license:BSD-3-Clause -// copyright-holders:Miodrag Milanovic +// copyright-holders:Miodrag Milanovic, R. Belmont /*************************************************************************** Sun-2 Models @@ -68,63 +68,511 @@ 25/08/2009 Skeleton driver. + +How the architecture works: + - There are 3 address sub-spaces: CPU layer, MMU layer, and device layer + - CPU layer uses MOVS instructions to output FC 3. + - CPU layer: the low-order address bits A4-A1 specify the device + 0100x = ID Prom + 0101x = Diagnostic register (8 bits, 8 LEDs, bit = 0 for ON, 1 for OFF) + 0110x = Bus error register + 0111x = System enable register + + Bits A5+ address the actual individual parts of these things. ID Prom bytes + are at 0x0008, 0x0808, 0x1008, 0x1808, 0x2008, 0x2808, 0x3008, etc. + + System enable bits: + b0 = enable parity generation + b1 = cause level 1 IRQ + b2 = cause level 2 IRQ + b3 = cause level 3 IRQ + b4 = enable parity error checking + b5 = enable DVMA + b6 = enable all interrupts + b7 = boot state (0 = boot, 1 = normal) + In boot state, all supervisor program reads go to the EPROM. + - MMU layer: also accessed via FC 3 + PAGE MAP at 0 + V + SEGMENT MAP at 4 + V + CONTEXT REG at 6 + V + + There are 8 hardware contexts. Supervisor and User FCs can have different contexts. + + Segment map is 4096 entries, from bits 23-15 of the virtual address + 3 context bits. + Entries are 8 bits, which point to a page map entry group (PMEG). + + Page map is 4096 entries each mapping a 2K page. There are 256 groups of 16 entries; + the PMEG points to these 256 groups. The page map contains a 20-bit page number, + which combines with the 11 low bits of the original address to get a 31-bit physical address. + The entry from 0-15 is picked with bits 15-11 of the original address. + + There is an "address hole" between virtual addresses 0x600000 and 0xDFFFFF. Page table + number generation skips from 0x5FFFFF to 0xE00000. Thus the last two megs of the lower 8 MB + are replaced by the last two megs of the upper 8 MB (ROM and I/O). + + ef0942 = time to set up the maps for the data (middle of function mapmem() in sunmon.c) + ****************************************************************************/ #include "emu.h" #include "cpu/m68000/m68000.h" +#include "machine/ram.h" +#include "machine/z80scc.h" +#include "machine/bankdev.h" +#include "bus/rs232/rs232.h" +// page table entry constants +#define PM_VALID (0x80000000) // page is valid +#define PM_PROTMASK (0x7e000000) // protection mask +#define PM_TYPEMASK (0x01c00000) // type mask +#define PM_ACCESSED (0x00200000) // accessed flag +#define PM_MODIFIED (0x00100000) // modified flag + +#define HOLE_PAGE (4096) // fake page to redirect the address hole to, as TME does +#define HOLE_START (0x800000>>1) // if set to real value of 600000, the page map address line test fails +#define HOLE_END (0xDFFFFF>>1) class sun2_state : public driver_device { public: sun2_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu") - , - m_p_ram(*this, "p_ram"){ } + m_maincpu(*this, "maincpu"), + m_rom(*this, "bootprom"), + m_ram(*this, RAM_TAG), + m_type1space(*this, "type1"), + m_bw2_vram(*this, "bw2_vram") + { } - required_device m_maincpu; + required_device m_maincpu; + required_memory_region m_rom; + required_device m_ram; + required_device m_type1space; + required_shared_ptr m_bw2_vram; + + virtual void machine_start() override; virtual void machine_reset() override; + + DECLARE_READ16_MEMBER( tl_mmu_r ); + DECLARE_WRITE16_MEMBER( tl_mmu_w ); + DECLARE_WRITE16_MEMBER( video_ctrl_w ); + DECLARE_READ16_MEMBER( test_r ); + DECLARE_WRITE16_MEMBER( test_w ); + + UINT32 bw2_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - required_shared_ptr m_p_ram; +private: + UINT16 *m_rom_ptr, *m_ram_ptr; + UINT16 m_diagreg, m_sysenable, m_buserror; + UINT16 m_context; + UINT8 m_segmap[8][512]; + UINT32 m_pagemap[4097]; + UINT32 m_ram_size, m_ram_size_words; }; +READ16_MEMBER( sun2_state::test_r ) +{ + printf("test_r @ %x\n", offset << 1); + + return 0xffff; +} + +WRITE16_MEMBER( sun2_state::test_w ) +{ + printf("test_w %x @ %x\n", data, offset << 1); +} + +READ16_MEMBER( sun2_state::tl_mmu_r ) +{ + UINT8 fc = m_maincpu->get_fc(); + + if ((fc == 3) && !space.debugger_access()) + { + if (offset & 0x4) // set for CPU space + { + switch (offset) + { + case 4: + printf("sun2: Read IDPROM @ %x\n", offset<<1); + return 0xffff; + + case 5: + printf("sun2: Read diag reg\n"); + return m_diagreg; + + case 6: + printf("sun2: Read bus error\n"); + return m_buserror; + + case 7: + printf("sun2: Read sysenable\n"); + return m_sysenable; + } + } + else // clear for MMU space + { + int page; + + switch (offset & 3) + { + case 0: // page map + case 1: + page = (offset >> 10) & 0x1fff; + + if (offset >= HOLE_START) + { + if (offset <= HOLE_END) + { + page = HOLE_PAGE; + } + else + { + page &= 0xfff; + } + } + + //printf("sun2: Read page map at %x (entry %d)\n", offset<<1, page); + if (offset & 1) // low-order 16 bits + { + return m_pagemap[page] & 0xffff; + } + return m_pagemap[page] >> 16; + + case 2: // segment map + //printf("sun2: Read segment map at %x (entry %d, user ctx %d)\n", offset<<1, offset>>14, m_context & 7); + return m_segmap[m_context & 7][offset >> 14]; + + case 3: // context reg + //printf("sun2: Read context reg\n"); + return m_context; + } + } + } + + // boot mode? + if ((fc == M68K_FC_SUPERVISOR_PROGRAM) && !(m_sysenable & 0x80)) + { + return m_rom_ptr[offset & 0x3fff]; + } + + // debugger hack + if ((space.debugger_access()) && (offset >= (0xef0000>>1)) && (offset <= (0xef8000>>1))) + { + return m_rom_ptr[offset & 0x3fff]; + } + + int super_verbose = 0; + if ((offset >= (0xef6600>>1)) && (offset <= (0xef6900>>1))) + { + super_verbose = 1; + } + + // it's translation time + UINT8 context = (fc & 4) ? ((m_context >> 8) & 7) : (m_context & 7); + UINT8 pmeg = m_segmap[context][offset >> 14]; + UINT32 entry = (pmeg << 4) + ((offset >> 10) & 0xf); + + if (super_verbose) + { + //printf("sun2: Context = %d, pmeg = %d, offset >> 14 = %x, entry = %d, page = %d\n", context, pmeg, offset >> 14, entry, (offset >> 10) & 0xf); + } + + m_pagemap[entry] |= PM_ACCESSED; + if (m_pagemap[entry] & PM_VALID) + { + UINT32 tmp = (m_pagemap[entry] & 0xfffff) << 10; + tmp |= (offset & 0x3ff); + + //if ((!space.debugger_access()) && (super_verbose)) + // printf("sun2: Translated addr: %08x, type %d (page %d page entry %08x, orig virt %08x, FC %d)\n", tmp << 1, (m_pagemap[entry] >> 22) & 7, entry, m_pagemap[entry], offset<<1, fc); + + switch ((m_pagemap[entry] >> 22) & 7) + { + case 0: // main RAM space + //printf("read main RAM @ %x\n", offset<<1); + if (tmp < m_ram_size_words) return m_ram_ptr[tmp]; + return 0xffff; + + case 1: // device space + // EPROM space is special: the MMU has a trap door + // where the original bits of the virtual address are + // restored so that the entire 32K EPROM can be + // accessed via a 2K single page view. This isn't + // obvious in the sun2 manual, but the sun3 manual + // (sun3 has the same mechanism) explains it well. + // the 2/50 ROM tests this specifically at $EF0DF0. + if ((tmp >= (0x7f0000>>1)) && (tmp <= (0x7f07ff>>1))) + { + if (super_verbose) + { + printf("sun2: extra-magic EPROM bypass @ %x\n", (offset & 0x3fff) << 1); + } + + return m_rom_ptr[offset & 0x3fff]; + } + + //printf("read device space @ %x\n", tmp<<1); + return m_type1space->read16(space, tmp, mem_mask); + + case 2: // VME space + //printf("Read VME2 @ %x\n", tmp<<1); + break; + + case 3: // more VME + //printf("Read VME3 @ %x\n", tmp<<1); + break; + } + } + else + { + if (!space.debugger_access()) printf("sun2: pagemap entry not valid!\n"); + } + + if (!space.debugger_access()) printf("sun2: Unmapped read @ %08x (FC %d, mask %04x, PC=%x, seg %x)\n", offset<<1, fc, mem_mask, m_maincpu->pc, offset>>15); + + return 0xffff; +} + +WRITE16_MEMBER( sun2_state::tl_mmu_w ) +{ + UINT8 fc = m_maincpu->get_fc(); + + //printf("sun2: Write %04x (FC %d, mask %04x, PC=%x) to %08x\n", data, fc, mem_mask, m_maincpu->pc, offset<<1); + + if (fc == 3) + { + if (offset & 0x4) // set for CPU space + { + switch (offset) + { + case 4: + //printf("sun2: Write? IDPROM @ %x\n", offset<<1); + return; + + case 5: + // XOR to match Table 2-1 in the 2/50 Field Service Manual + printf("sun2: CPU LEDs to %02x (PC=%x) => ", (data & 0xff) ^ 0xff, m_maincpu->pc); + m_diagreg = data & 0xff; + for (int i = 0; i < 8; i++) + { + if (m_diagreg & (1<<(7-i))) + { + printf("*"); + } + else + { + printf("O"); + } + } + printf("\n"); + return; + + case 6: + //printf("sun2: Write %04x to bus error not allowed\n", data); + return; + + case 7: + printf("sun2: Write %04x to system enable\n", data); + COMBINE_DATA(&m_sysenable); + return; + } + } + else // clear for MMU space + { + int page; + + switch (offset & 3) + { + case 0: // page map + case 1: + page = (offset >> 10) & 0xfff; + if (offset >= HOLE_START) + { + if (offset <= HOLE_END) + { + page = HOLE_PAGE; + } + else + { + page &= 0xfff; + } + } + + printf("sun2: Write %04x to page map at %x (entry %d), ", data, offset<<1, page); + if (offset & 1) // low-order 16 bits + { + m_pagemap[page] &= 0xffff0000; + m_pagemap[page] |= data; + } + else + { + m_pagemap[page] &= 0x0000ffff; + m_pagemap[page] |= (data<<16); + } + printf("entry now %08x (adr %08x PC=%x)\n", m_pagemap[page], (m_pagemap[page] & 0xfffff) << 11, m_maincpu->pc); + return; + + case 2: // segment map + printf("sun2: Write %02x to segment map at %x (entry %d, user ctx %d PC=%x)\n", data & 0xff, offset<<1, offset>>14, m_context & 7, m_maincpu->pc); + m_segmap[m_context & 7][offset >> 14] = data & 0xff; + return; + + case 3: // context reg + //printf("sun2: Write %04x to context\n", data); + COMBINE_DATA(&m_context); + return; + } + } + } + + // it's translation time + UINT8 context = (fc & 4) ? ((m_context >> 8) & 7) : (m_context & 7); + UINT8 pmeg = m_segmap[context][offset >> 14]; + UINT32 entry = (pmeg << 4) + ((offset >> 10) & 0xf); + + m_pagemap[entry] |= PM_ACCESSED; + if (m_pagemap[entry] & PM_VALID) + { + UINT32 tmp = (m_pagemap[entry] & 0xfffff) << 10; + tmp |= (offset & 0x3ff); + + //if (!space.debugger_access()) printf("sun2: Translated addr: %08x, type %d (page entry %08x, orig virt %08x)\n", tmp << 1, (m_pagemap[entry] >> 22) & 7, m_pagemap[entry], offset<<1); + + switch ((m_pagemap[entry] >> 22) & 7) + { + case 0: // main RAM space + if (tmp < m_ram_size_words) COMBINE_DATA(&m_ram_ptr[tmp]); + return; + + case 1: // device space + //printf("write device space @ %x\n", tmp<<1); + m_type1space->write16(space, tmp, data, mem_mask); + return; + + case 2: // VME space + printf("Write VME space\n"); + break; + + case 3: // more VME + printf("Write 2nd VME space\n"); + break; + } + } + else + { + if (!space.debugger_access()) printf("sun2: pagemap entry not valid!\n"); + } + + printf("sun2: Unmapped write %04x (FC %d, mask %04x, PC=%x) to %08x\n", data, fc, mem_mask, m_maincpu->pc, offset<<1); +} + +// BW2 video control +WRITE16_MEMBER( sun2_state::video_ctrl_w ) +{ + printf("sun2: BW2: %x to video_ctrl\n", data); +} + static ADDRESS_MAP_START(sun2_mem, AS_PROGRAM, 16, sun2_state) - ADDRESS_MAP_UNMAP_HIGH - AM_RANGE(0x00000000, 0x007fffff) AM_RAM AM_SHARE("p_ram") // 8MB - AM_RANGE(0x00ef0000, 0x00ef7fff) AM_ROM AM_REGION("user1",0) + AM_RANGE(0x000000, 0xffffff) AM_READWRITE( tl_mmu_r, tl_mmu_w ) ADDRESS_MAP_END +// type 1 device space +static ADDRESS_MAP_START(type1space_map, AS_PROGRAM, 16, sun2_state) + AM_RANGE(0x000000, 0x01ffff) AM_RAM AM_SHARE("bw2_vram") + AM_RANGE(0x7f0000, 0x7f07ff) AM_ROM AM_REGION("bootprom", 0) // uses MMU loophole to read 32k from a 2k window + // 7f0800-7f0fff: Ethernet interface + // 7f1000-7f17ff: AM9518 encryption processor + // 7f1800-7f1fff: Keyboard/mouse SCC8530 + // 7f2000-7f27ff: RS232 ports SCC8530 + // 7f2800-7f2fff: AM9513 timer + AM_RANGE(0xc20000, 0xc20001) AM_WRITE( video_ctrl_w ) +ADDRESS_MAP_END + +UINT32 sun2_state::bw2_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) +{ + UINT32 *scanline; + int x, y; + UINT8 pixels; + static const UINT32 palette[2] = { 0, 0xffffff }; + UINT8 *m_vram = (UINT8 *)m_bw2_vram.target(); + + for (y = 0; y < 900; y++) + { + scanline = &bitmap.pix32(y); + for (x = 0; x < 1152/8; x++) + { + pixels = m_vram[(y * (1152/8)) + (BYTE4_XOR_BE(x))]; + + *scanline++ = palette[(pixels>>7)&1]; + *scanline++ = palette[(pixels>>6)&1]; + *scanline++ = palette[(pixels>>5)&1]; + *scanline++ = palette[(pixels>>4)&1]; + *scanline++ = palette[(pixels>>3)&1]; + *scanline++ = palette[(pixels>>2)&1]; + *scanline++ = palette[(pixels>>1)&1]; + *scanline++ = palette[(pixels&1)]; + } + } + + return 0; +} + /* Input ports */ static INPUT_PORTS_START( sun2 ) INPUT_PORTS_END +void sun2_state::machine_start() +{ + m_rom_ptr = (UINT16 *)m_rom->base(); + m_ram_ptr = (UINT16 *)m_ram->pointer(); + m_ram_size = m_ram->size(); + m_ram_size_words = m_ram_size >> 1; +} void sun2_state::machine_reset() { - UINT8* user1 = memregion("user1")->base(); - - memcpy((UINT8*)m_p_ram.target(),user1,0x8000); - + m_diagreg = 0; + m_sysenable = 0; + m_context = 0; + m_buserror = 0; + memset(m_segmap, 0, sizeof(m_segmap)); + memset(m_pagemap, 0, sizeof(m_pagemap)); + m_maincpu->reset(); } - static MACHINE_CONFIG_START( sun2, sun2_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68010, 16670000) MCFG_CPU_PROGRAM_MAP(sun2_mem) + + MCFG_RAM_ADD(RAM_TAG) + MCFG_RAM_DEFAULT_SIZE("2M") + MCFG_RAM_DEFAULT_VALUE(0x00) + + // MMU Type 1 device space + MCFG_DEVICE_ADD("type1", ADDRESS_MAP_BANK, 0) + MCFG_DEVICE_PROGRAM_MAP(type1space_map) + MCFG_ADDRESS_MAP_BANK_ENDIANNESS(ENDIANNESS_BIG) + MCFG_ADDRESS_MAP_BANK_DATABUS_WIDTH(16) + MCFG_ADDRESS_MAP_BANK_STRIDE(0x1000000) + + MCFG_SCREEN_ADD("bwtwo", RASTER) + MCFG_SCREEN_UPDATE_DRIVER(sun2_state, bw2_update) + MCFG_SCREEN_SIZE(1152,900) + MCFG_SCREEN_VISIBLE_AREA(0, 1152-1, 0, 900-1) + MCFG_SCREEN_REFRESH_RATE(72) MACHINE_CONFIG_END /* ROM definition */ ROM_START( sun2_120 ) - ROM_REGION( 0x8000, "user1", ROMREGION_ERASEFF ) + ROM_REGION( 0x8000, "bootprom", ROMREGION_ERASEFF ) ROM_LOAD16_WORD_SWAP( "sun2-multi-rev-r.bin", 0x0000, 0x8000, CRC(4df0df77) SHA1(4d6bcf09ddc9cc8f5823847b8ea88f98fe4a642e)) ROM_END ROM_START( sun2_50) - ROM_REGION( 0x8000, "user1", ROMREGION_ERASEFF ) + ROM_REGION( 0x8000, "bootprom", ROMREGION_ERASEFF ) ROM_LOAD16_BYTE( "250_q_8.rom", 0x0001, 0x4000, CRC(5bfacb5c) SHA1(ec7fb3fb0217b0138ba4748b7c79b8ff0cad896b)) ROM_LOAD16_BYTE( "250_q_0.rom", 0x0000, 0x4000, CRC(2ee29abe) SHA1(82f52b9f25e92387329581f7c8ba50a171784968)) ROM_END diff --git a/src/mame/drivers/tourvis.cpp b/src/mame/drivers/tourvis.cpp index 18887ebcf4c..f5ca871fbed 100644 --- a/src/mame/drivers/tourvis.cpp +++ b/src/mame/drivers/tourvis.cpp @@ -19,9 +19,10 @@ 1943 Kai (65) Aero Blaster (32) After Burner II (46) - * Ankoku Densetu + * Ankoku Densetu (Legendary Axe II) Armed-F (?) Ballistix (186) + * Batman Be Ball (93) * Blodia Bomberman (71) @@ -40,6 +41,7 @@ Doraemon Meikyuu Daisakusen (20) * Doraemon II Down Load (43) + * Dragon Egg! Dragon Saber (65) Dragon Spirit (?) Dungeon Explorer (?) @@ -51,12 +53,13 @@ Gomola Speed (27) Gunhed (148) Hana Taka Daka (Super Long Nose Goblin) (6) + * Hatris Jackie Chan (54) Jinmu Densho (19) Kiki Kaikai (120) Legend Of Hero Tomna (56) Makyo Densetsu - The Legenary Axe (?) - Mizubaku Daibouken Liquid Kids (10) + Mizubaku Daibouken Liquid Kids (10) (marketed as "Parasol Stars II") Mr. Heli (23) Ninja Ryukenden (10) Operation Wolf (26) @@ -94,6 +97,7 @@ Terra Cresta II (27) Thunder Blade (?) * Tiger Road + * Titan Toy Shop Boys (51) * Tricky * TV Sports @@ -105,6 +109,9 @@ Winning Shot (28) Xevious (?) + Rumored games: + * Parasol Stars - often been mentioned, but still not confirmed, for Tourvision. For now it's been added from its NEC PC-Engine dump, which it would be likely identical. + * Denotes Not Dumped _______________________________________________________________________________________________________________________________________________ diff --git a/src/mame/drivers/vsmilepro.cpp b/src/mame/drivers/vsmilepro.cpp new file mode 100644 index 00000000000..a591f729882 --- /dev/null +++ b/src/mame/drivers/vsmilepro.cpp @@ -0,0 +1,70 @@ +// license:BSD-3-Clause +// copyright-holders:Fabio Priuli +/*************************************************************************** + + Skeleton driver for V-Tech VSmile Pro CD System + + 30/05/2016 + + Some information about the hardware can be found at + + http://www.x86-secret.com/dossier-64-VTech_V_Smile_Pro.html + + + In particular + - It uses a LSI Zevio 1020 CPU + peripherals which comprises ARM926EJ-S CPU, + ZSP400 DPS, 3D graphics processor & 2D graphics processor + - The CD controller is a Sony CXD3059AR + +****************************************************************************/ + +#include "emu.h" +#include "cdrom.h" +#include "cpu/arm7/arm7.h" +#include "cpu/arm7/arm7core.h" +#include "imagedev/chd_cd.h" +#include "softlist.h" + + +class vsmilpro_state : public driver_device +{ +public: + vsmilpro_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu") + { } + +private: + required_device m_maincpu; +}; + +static ADDRESS_MAP_START(vsmilpro_map, AS_PROGRAM, 32, vsmilpro_state) + AM_RANGE(0x00000000, 0x0007ffff) AM_ROM +ADDRESS_MAP_END + + +/* Input ports */ +static INPUT_PORTS_START( vsmilpro ) +INPUT_PORTS_END + +static MACHINE_CONFIG_START( vsmilpro, vsmilpro_state ) + /* basic machine hardware */ + MCFG_CPU_ADD("maincpu", ARM9, 150000000) + MCFG_CPU_PROGRAM_MAP(vsmilpro_map) + + MCFG_CDROM_ADD("cdrom") + MCFG_CDROM_INTERFACE("vsmile_vdisk") + + MCFG_SOFTWARE_LIST_ADD("cd_list","vsmile_cd") +MACHINE_CONFIG_END + +/* ROM definition */ +ROM_START( vsmilpro ) + ROM_REGION( 0x200000, "maincpu", 0 ) + ROM_LOAD( "70004.bin", 0x000000, 0x200000, CRC(b9161eac) SHA1(8d75fdeda8c4e228a0b1efd35011f9f667f9fb23) ) +ROM_END + +/* Driver */ + +/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */ +COMP( 2007, vsmilpro, 0, 0, vsmilpro, vsmilpro, driver_device, 0, "V-Tech", "V-Smile Pro", MACHINE_NOT_WORKING|MACHINE_NO_SOUND) diff --git a/src/mame/includes/n64.h b/src/mame/includes/n64.h index c6114bf3707..09f2e5de511 100644 --- a/src/mame/includes/n64.h +++ b/src/mame/includes/n64.h @@ -283,7 +283,7 @@ private: UINT32 si_pif_addr; UINT32 si_pif_addr_rd64b; UINT32 si_pif_addr_wr64b; - UINT32 si_status; + UINT32 si_status_val; UINT32 si_dma_dir; UINT32 cic_status; int cic_type; diff --git a/src/mame/layout/esoccer.lay b/src/mame/layout/esoccer.lay new file mode 100644 index 00000000000..eda9a9c9546 --- /dev/null +++ b/src/mame/layout/esoccer.lay @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/mame/layout/ssports4.lay b/src/mame/layout/ssports4.lay new file mode 100644 index 00000000000..9d3e4d2766a --- /dev/null +++ b/src/mame/layout/ssports4.lay @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/src/mame/machine/iteagle_fpga.cpp b/src/mame/machine/iteagle_fpga.cpp index 27dbba0d405..2f6375adab1 100644 --- a/src/mame/machine/iteagle_fpga.cpp +++ b/src/mame/machine/iteagle_fpga.cpp @@ -42,8 +42,7 @@ machine_config_constructor iteagle_fpga_device::device_mconfig_additions() const void iteagle_fpga_device::device_start() { // RTC M48T02 - m_rtc_regs.resize(0x800 / 4); - m_rtc->set_base(m_rtc_regs.data(), m_rtc_regs.size() * sizeof(UINT32)); + m_rtc->set_base(m_rtc_regs, sizeof(m_rtc_regs)); pci_device::device_start(); status = 0x5555; @@ -53,7 +52,7 @@ void iteagle_fpga_device::device_start() // fpga defaults to base address 0x00000300 bank_infos[0].adr = 0x00000300 & (~(bank_infos[0].size - 1)); - add_map(m_rtc_regs.size() * sizeof(UINT32), M_MEM, FUNC(iteagle_fpga_device::rtc_map)); + add_map(sizeof(m_rtc_regs), M_MEM, FUNC(iteagle_fpga_device::rtc_map)); // RTC defaults to base address 0x000c0000 bank_infos[1].adr = 0x000c0000 & (~(bank_infos[1].size - 1)); @@ -491,7 +490,7 @@ iteagle_eeprom_device::iteagle_eeprom_device(const machine_config &mconfig, cons // 0xf = 0x01 for extra courses // 0x3e = 0x0002 for good nvram // 0x3f = checksum - iteagle_default_eeprom = + m_iteagle_default_eeprom = { 0xd000,0x0022,0x0000,0x0003,0x1209,0x1111,0x2222,0x1234, 0x0000,0x0000,0x0000,0x0000,0xcd00,0x0000,0x0000,0x0001, @@ -507,16 +506,16 @@ iteagle_eeprom_device::iteagle_eeprom_device(const machine_config &mconfig, cons void iteagle_eeprom_device::device_start() { // EEPROM: Set software version and calc crc - iteagle_default_eeprom[0xe] = m_sw_version; - iteagle_default_eeprom[0x4] = (iteagle_default_eeprom[0x4] & 0xff00) | m_hw_version; + m_iteagle_default_eeprom[0xe] = m_sw_version; + m_iteagle_default_eeprom[0x4] = (m_iteagle_default_eeprom[0x4] & 0xff00) | m_hw_version; UINT16 checkSum = 0; for (int i=0; i<0x3f; i++) { - checkSum += iteagle_default_eeprom[i]; + checkSum += m_iteagle_default_eeprom[i]; //logerror("eeprom init i: %x data: %04x\n", i, iteagle_default_eeprom[i]); } - iteagle_default_eeprom[0x3f] = checkSum; + m_iteagle_default_eeprom[0x3f] = checkSum; - eeprom_base_device::static_set_default_data(m_eeprom, iteagle_default_eeprom.data(), 0x80); + eeprom_base_device::static_set_default_data(m_eeprom, m_iteagle_default_eeprom.data(), 0x80); pci_device::device_start(); skip_map_regs(1); @@ -616,10 +615,10 @@ void iteagle_periph_device::device_start() add_map(sizeof(m_ctrl_regs), M_IO, FUNC(iteagle_periph_device::ctrl_map)); // ctrl defaults to base address 0x00000000 bank_infos[0].adr = 0x000; - m_rtc_regs.resize(0x100); + m_rtc_regs[0xa] = 0x20; // 32.768 MHz m_rtc_regs[0xb] = 0x02; // 24-hour format - m_rtc->set_base(m_rtc_regs.data(), m_rtc_regs.size()); + m_rtc->set_base(m_rtc_regs, sizeof(m_rtc_regs)); } void iteagle_periph_device::device_reset() diff --git a/src/mame/machine/iteagle_fpga.h b/src/mame/machine/iteagle_fpga.h index f59de342627..4c01b88b791 100644 --- a/src/mame/machine/iteagle_fpga.h +++ b/src/mame/machine/iteagle_fpga.h @@ -54,9 +54,9 @@ private: int m_irq_num; int m_serial_irq_num; - UINT32 m_fpga_regs[0x20/4]; - std::vector m_rtc_regs; - UINT32 m_ram[0x20000/4]; + UINT32 m_fpga_regs[0x20 / 4]; + UINT32 m_rtc_regs[0x800 / 4]; + UINT32 m_ram[0x20000 / 4]; UINT32 m_prev_reg; std::string m_serial_str; @@ -108,7 +108,7 @@ private: UINT16 m_sw_version; UINT8 m_hw_version; - std::vector iteagle_default_eeprom; // 0x40 + std::array m_iteagle_default_eeprom; DECLARE_ADDRESS_MAP(eeprom_map, 32); DECLARE_READ32_MEMBER( eeprom_r ); @@ -128,7 +128,7 @@ private: optional_device m_rtc; UINT32 m_ctrl_regs[0xd0/4]; - std::vector m_rtc_regs; + UINT8 m_rtc_regs[0x100]; DECLARE_ADDRESS_MAP(ctrl_map, 32); diff --git a/src/mame/machine/n64.cpp b/src/mame/machine/n64.cpp index af16dcea9c5..9ee9ba354f4 100644 --- a/src/mame/machine/n64.cpp +++ b/src/mame/machine/n64.cpp @@ -211,7 +211,7 @@ void n64_periphs::device_reset() memset(pif_cmd, 0, sizeof(pif_cmd)); si_dram_addr = 0; si_pif_addr = 0; - si_status = 0; + si_status_val = 0; si_dma_dir = 0; si_dma_timer->adjust(attotime::never); @@ -2084,8 +2084,8 @@ void n64_periphs::si_dma_tick() { si_dma_timer->adjust(attotime::never); pif_dma(si_dma_dir); - si_status = 0; - si_status |= 0x1000; + si_status_val = 0; + si_status_val |= 0x1000; signal_rcp_interrupt(SI_INTERRUPT); } @@ -2139,7 +2139,7 @@ READ32_MEMBER( n64_periphs::si_reg_r ) //return si_dram_addr; case 0x18/4: // SI_STATUS_REG - ret = si_status; + ret = si_status_val; } return ret; @@ -2155,23 +2155,23 @@ WRITE32_MEMBER( n64_periphs::si_reg_w ) case 0x04/4: // SI_PIF_ADDR_RD64B_REG // PIF RAM -> RDRAM - if(si_status & 1) + if(si_status_val & 1) { - si_status |= 8; //DMA Error, overlapping request + si_status_val |= 8; //DMA Error, overlapping request return; // SI Busy, ignore request } si_pif_addr = data; si_pif_addr_rd64b = data; si_dma_dir = 0; - si_status |= 1; + si_status_val |= 1; si_dma_timer->adjust(attotime::from_hz(50000)); break; case 0x10/4: // SI_PIF_ADDR_WR64B_REG // RDRAM -> PIF RAM - if(si_status & 1) + if(si_status_val & 1) { - si_status |= 8; //DMA Error, overlapping request + si_status_val |= 8; //DMA Error, overlapping request return; // SI Busy, ignore request } si_pif_addr = data; @@ -2181,7 +2181,7 @@ WRITE32_MEMBER( n64_periphs::si_reg_w ) break; case 0x18/4: // SI_STATUS_REG - si_status = 0; + si_status_val = 0; si_dma_timer->adjust(attotime::never); clear_rcp_interrupt(SI_INTERRUPT); break; diff --git a/src/mame/machine/samcoupe.cpp b/src/mame/machine/samcoupe.cpp index 15e814c659e..0f326879a31 100644 --- a/src/mame/machine/samcoupe.cpp +++ b/src/mame/machine/samcoupe.cpp @@ -133,7 +133,7 @@ void samcoupe_state::samcoupe_install_ext_mem(address_space &space) void samcoupe_state::samcoupe_update_memory(address_space &space) { - const int PAGE_MASK = ((m_ram->size() & 0xfffff) / 0x4000) - 1; + const int page_mask = ((m_ram->size() & 0xfffff) / 0x4000) - 1; UINT8 *rom = m_region_maincpu->base(); UINT8 *memory; int is_readonly; @@ -141,8 +141,8 @@ void samcoupe_state::samcoupe_update_memory(address_space &space) /* BANK1 */ if (m_lmpr & LMPR_RAM0) /* Is ram paged in at bank 1 */ { - if ((m_lmpr & 0x1F) <= PAGE_MASK) - memory = &m_ram->pointer()[(m_lmpr & PAGE_MASK) * 0x4000]; + if ((m_lmpr & 0x1F) <= page_mask) + memory = &m_ram->pointer()[(m_lmpr & page_mask) * 0x4000]; else memory = nullptr; /* Attempt to page in non existant ram region */ is_readonly = FALSE; @@ -156,8 +156,8 @@ void samcoupe_state::samcoupe_update_memory(address_space &space) /* BANK2 */ - if (((m_lmpr + 1) & 0x1f) <= PAGE_MASK) - memory = &m_ram->pointer()[((m_lmpr + 1) & PAGE_MASK) * 0x4000]; + if (((m_lmpr + 1) & 0x1f) <= page_mask) + memory = &m_ram->pointer()[((m_lmpr + 1) & page_mask) * 0x4000]; else memory = nullptr; /* Attempt to page in non existant ram region */ samcoupe_update_bank(space, 2, memory, FALSE); @@ -170,8 +170,8 @@ void samcoupe_state::samcoupe_update_memory(address_space &space) else { /* BANK3 */ - if ((m_hmpr & 0x1F) <= PAGE_MASK ) - memory = &m_ram->pointer()[(m_hmpr & PAGE_MASK)*0x4000]; + if ((m_hmpr & 0x1F) <= page_mask ) + memory = &m_ram->pointer()[(m_hmpr & page_mask)*0x4000]; else memory = nullptr; /* Attempt to page in non existant ram region */ samcoupe_update_bank(space, 3, memory, FALSE); @@ -185,8 +185,8 @@ void samcoupe_state::samcoupe_update_memory(address_space &space) } else { - if (((m_hmpr + 1) & 0x1f) <= PAGE_MASK) - memory = &m_ram->pointer()[((m_hmpr + 1) & PAGE_MASK) * 0x4000]; + if (((m_hmpr + 1) & 0x1f) <= page_mask) + memory = &m_ram->pointer()[((m_hmpr + 1) & page_mask) * 0x4000]; else memory = nullptr; /* Attempt to page in non existant ram region */ is_readonly = FALSE; @@ -196,9 +196,9 @@ void samcoupe_state::samcoupe_update_memory(address_space &space) /* video memory location */ if (m_vmpr & 0x40) /* if bit set in 2 bank screen mode */ - m_videoram = &m_ram->pointer()[((m_vmpr & 0x1e) & PAGE_MASK) * 0x4000]; + m_videoram = &m_ram->pointer()[((m_vmpr & 0x1e) & page_mask) * 0x4000]; else - m_videoram = &m_ram->pointer()[((m_vmpr & 0x1f) & PAGE_MASK) * 0x4000]; + m_videoram = &m_ram->pointer()[((m_vmpr & 0x1f) & page_mask) * 0x4000]; } diff --git a/src/mame/mame.lst b/src/mame/mame.lst index 10ff1082f73..689c678debc 100644 --- a/src/mame/mame.lst +++ b/src/mame/mame.lst @@ -1451,245 +1451,238 @@ loconz mtreenz @source:aristmk6.cpp -50lions // (c) 2002 -50lionsa // (c) 2003 -antcleo // (c) 2004 aristmk6 // -choysun // (c) 2003 -crystals // (c) 2003 -indianmm // (c) 2003 -thaiprin // (c) 2003 -whalecsh // (c) 2002 -wheregld // (c) 2004 -wildways // (c) 2003 -100lions -5dragons -adustcm -alchemya -amzqnar -arbnigar -bigbenpj -bigheart -bigredjp -birredar -blkbrum -brazilar -bucanar -buffalar -bushrngr -calyking -canary2 -cmtonig -csdce -csd -csret -corrida -cryspri -deltqn -di4ever -dinoaris -doubdolp -drgnlrd -drgnmgic -ent6r -eott -firedan -followst -gambjack -geishaar -goapear -gogreen -goldarjp -goldinc -goldpym -grizzly -heartgar -heartveg -highnoar -holdrma -houhear -incachf -indce -indll -indsc -indsrp -indgcm -indprncs -jailbrar -kingnep -kingnile -koalmnt -kohinoor -lgfish -lordleo -lougcm -luigball -mskitty -mnytree -mysteycm -mystmerm -nerdwild -orbeaut -outbackj -owlcap -pariligh -pcockmag -pelipete -pharpor -phxfant -piratar -pcbydem -pcfav -pompeiar -prideaf -prophar -qsheeba -qnilecj -qnilese -qnile -raprichs -redbarar -ruprup -rubmgc -scatmg2 -sharmnm -smtmar -silgolar -spgcarn -stardrft -sbuk5 -swh2ld -tahitim -thaiprar -gldnflc -thndrhrt -tigresar -topshtar -torgods -torpdice -turtrea -venetian -witgold -wikwin2 -wldgoos -wldpan2 -wldstal2 -wtepee -wwaratah -wwaysar -wwaysll -zorrojp -5draga +5drag +5dragsp +5dragce 5koipp -amzteml -buffaloa -cactusco -callwlar -deepfrz -drmred -encspela -fortath -goldsam -inddrma -luck88 -milkin -moonwalt -mchilli -pcfava -pcmostw -pcnewz -rumbrel -shamnmg -skydncra -buckstop -tikitalk -werewild -wldcatsa -wgorilla -bluetigr -50lionr -beavbuk -aftrhrs +50lions // (c) 2002 +50lionsm // (c) 2003 +50lionrr +100lions +adonisa6 +adustcm +afterhrs +alchemy atkgld +amzqueen +amztempl +antcleo // (c) 2004 apocof -arbngts +arabnga6 +arabnga6u arwincm arish asnprinc +beavbuk +bigben +bigheart +bigred +bigred2 +blkbrum blkmust -bmbgs +bluetigr +bobdolly +brazil +bucaneer +buckstop +buffalo +buffalou +bmbugs +bushrngr +cactusco +callwld +calyking +canaryrc +cmtonig cinhell -crspru -davedrag -drfz6us -dltbel -dmneyeus -dmneye2 -dblagus +csd +csdm // (c) 2003 +csdce +csret +corrida +cryspri +crysprim // (c) 2003 +cryspriu +deepfrz +deepfrzu +deltabel +deltaqn +dimeye +dimeyece +di4ever +dinosa6 +dblagent +dbldolph +drgnlord +drgnmgic +drmcatch +drmred eaglrock +estrike eastland -eggsrich -efcashex -flamoly -flamoly2 -flamolus -flamolusa -foxred +eggsrccm +efce +encspell +enchantr +eott +firednc +flamoljc +flamolce +followst +fortath frogwld +gambjack gwnn +geishaa6 +goape +gogreen +goldarch +gldnflc gldgong -gldincas -hlntry -hlsunmon +goldinc +goldincu +goldpym +goldsam +gbmoney +grizzly +heartgld +heartveg +hlntroy +highnoon +holdrma +househrt +incachf +indream +indremce +indremll +indrem2c +indremmm // (c) 2003 +indremcm +indprncs +jailbrk jefffox -jewelunc +jewelcm +kingnep +kingnile +kingnilea +koalama6 +kohinoor +lgfish lemrol lineking +lordleo +lougcm lovestrk -mgforst -mgmerm +luigibal +lucky88 +magforst +magmerm metestrm -pandpays +milkin +mskitty +mnytree +moonwalt +mchilli mrwoo mystarr -mysteyec +mysteycm +mysteycmu +mystmerm +nerdwild opsesam -parilius -pelpetus +orbeaut +outbackj +owlcap +pandpays +parislgt +parislgtu +pcockmag +pelipete +pelipeteu pennyar -penpayus -pompus2 -rdtripus +pengpyce +pharfor +phxfant +pirata6 +pcfavor +pcbydem +pcmostw +pcgold +pwsuper +pompeia6 +pompeia6u +prideaf +prophecy +qnile +qnilese +qnilejc +qsheeba +raprichs +redbara6 +roadtrip +ruprup +rubymag +rumbreel +scatmag2 sealdeal shorthng -silkrdus -stardrfu -statsymb -sunmon2 -sunqndol -swhr2us -gbmoney -tiktoru -timwolfu -trkinus -venicus -whlcshus -whlcshusa -whtwtr -wldafus -wldpntus -wingolus -zorrous -bobdolu1 -pwsp1 -adonis6 +shamnmg +shamnmgu +smtma6 +silkrda6 +silgola6 +skydnca6 +spgcarn +stardrft +stardrftu starqst -eaglst1 -eaglst2 -kingnilea -outbackja -witgoldd - +statsymb +sunmoon +sunmonbb +sunqndol +sbuk5 +swhr2 +swh2ld +tahitim +thaiprnc +thaiprncm // (c) 2003 +thndrhrt +tigress +tikitalk +tiktorch +timbwolf +topshta6 +torgods +toprdice +trsking +turtreas +venetian +venice +werewild +whalecsh // (c) 2002 +whalecshu +whalecshua +wheregld +wheregldsp +wheregldm // (c) 2004 +whtwater +wikwin2 +wldafr +wldcata6 +wldgoos +wgorilla +wldpanda +wldpanth +wldstall +wtepee +wwaratah +wways +wwaysm // (c) 2003 +wzwaysll +wingoly +zorroa6 +zorroa6u @source:arkanoid.cpp ark1ball // bootleg @@ -14027,6 +14020,7 @@ ebball3 // Entex efootb4 // Entex einvader // Entex elecdet // Ideal +esoccer // Entex fxmcr165 // Gakken gjackpot // Gakken gpoker // Gakken @@ -14042,6 +14036,7 @@ raisedvl // Entex simon // Milton Bradley splitsec // Parker Bros ssimon // Milton Bradley +ssports4 // US Games starwbc // Kenner starwbcp // Kenner (patent) stopthie // Parker Bros @@ -36038,6 +36033,9 @@ vsmile // vsmilef // walle // +@source:vsmilepro.cpp +vsmilpro + @source:vindictr.cpp vindictr // 136059 (c) 1988 vindictr1 // 136059 (c) 1988 diff --git a/src/mame/mess.flt b/src/mame/mess.flt index e3dddf83677..935d993d3ef 100644 --- a/src/mame/mess.flt +++ b/src/mame/mess.flt @@ -640,6 +640,7 @@ vixen.cpp vk100.cpp votrpss.cpp votrtnt.cpp +vsmilepro.cpp vt100.cpp vt220.cpp vt240.cpp diff --git a/src/mame/video/model3.cpp b/src/mame/video/model3.cpp index 2a81f39d7bd..28b3a5efe11 100644 --- a/src/mame/video/model3.cpp +++ b/src/mame/video/model3.cpp @@ -710,76 +710,108 @@ cached_texture *model3_state::get_texture(int page, int texx, int texy, int texw - Limit of 15 child nodes (nesting), not including polygon nodes - Color table (is this featured in Model 3?) - 0x00: -------- -------- ------xx -------- Viewport number 0-3 + 0x00: xxxxxxxx xxxxxxxx xxxxxx-- -------- Viewport number + -------- -------- ------xx -------- Viewport select 0-3 + -------- -------- -------- x------- Display select + -------- -------- -------- -x------ Fix point centroid + -------- -------- -------- --x----- Viewport off -------- -------- -------- ---xx--- Viewport priority + -------- -------- -------- -----x-- "clr_xlator_tbl_sel" + -------- -------- -------- ------xx Node type - 0x01: Child node pointer (inherits parameters from this node) - 0x02: Sibling node pointer - 0x03: (float) Focal length? Affected by frustum angles and viewport size - 0x04: Sun light vector Z-component (float) - 0x05: Sun light vector X-component (float) - 0x06: Sun light vector Y-component (float) + 0x01: -------x -------- -------- -------- Sibling null + -------- xxxxxxxx xxxxxxxx xxxxxxxx Sibling pointer + + 0x02: -----x-- -------- -------- -------- Child is sibling table + -------x -------- -------- -------- Leaf node + -------- xxxxxxxx xxxxxxxx xxxxxxxx Child pointer + + 0x03: "cota" (float) Affected by frustum angles and viewport size + 0x04: Sun light vector X-component (float) + 0x05: Sun light vector Y-component (float) + 0x06: Sun light vector Z-component (float) 0x07: Sun light intensity (float) - 0x08: ? (float) Affected by left and right angle - 0x09: ? (float) Affected by top and bottom angle - 0x0a: ? (float) Affected by top and bottom angle - 0x0b: ? (float) Affected by left and right angle - 0x0c: (float) Frustum Left Angle Y (these angles are defined in polar coordinates) - 0x0d: (float) Frustum Left Angle X - 0x0e: (float) Frustum Top Angle Y - 0x0f: (float) Frustum Top Angle X - 0x10: (float) Frustum Right Angle Y - 0x11: (float) Frustum Right Angle X - 0x12: (float) Frustum Bottom Angle Y - 0x13: (float) Frustum Bottom Angle X + 0x08: "Cv" ? (float) Affected by left and right angle + 0x09: "Cw" ? (float) Affected by top and bottom angle + 0x0a: "Io" ? (float) Affected by top and bottom angle + 0x0b: "Jo" ? (float) Affected by left and right angle + 0x0c: (float) Left clip plane U + 0x0d: (float) Left clip plane V + 0x0e: (float) Top clip plane U + 0x0f: (float) Top clip plane W + 0x10: (float) Right clip plane U + 0x11: (float) Right clip plane V + 0x12: (float) Bottom clip plane U + 0x13: (float) Bottom clip plane W 0x14: xxxxxxxx xxxxxxxx -------- -------- Viewport height (14.2 fixed-point) -------- -------- xxxxxxxx xxxxxxxx Viewport width (14.2 fixed-point) - 0x15: ? - 0x16: Matrix base pointer - 0x17: LOD blend type table pointer? (seems to be 8x float per entry) - 0x18: ? - 0x19: ? + 0x15: xxxxxxxx xxxxxxxx -------- -------- "env_to_chan_matrix_index" + + 0x16: -------- xxxxxxxx xxxxxxxx xxxxxxxx Matrix base pointer + + 0x17: -------- xxxxxxxx xxxxxxxx xxxxxxxx LOD pointer + + 0x18: -------- xxxxxxxx xxxxxxxx xxxxxxxx Culling offset + + 0x19: -------- xxxxxxxx xxxxxxxx xxxxxxxx Polygon offset 0x1a: xxxxxxxx xxxxxxxx -------- -------- Viewport Y coordinate (12.4 fixed-point) -------- -------- xxxxxxxx xxxxxxxx Viewport X coordinate (12.4 fixed-point) 0x1b: Copy of word 0x00 - 0x1c: ? - 0x1d: xxxxxxxx xxxxxxxx -------- -------- Spotlight Y size + 0x1c: xxxxxxxx xxxxxxxx -------- -------- "lj" + -------- -------- xxxxxxxx xxxxxxxx "li" + + 0x1d: -------- xxxxxxxx -------- -------- Spotlight Y size -------- -------- xxxxxxxx xxxxxxxx Spotlight Y position (13.3 fixed-point?) - 0x1e: xxxxxxxx xxxxxxxx -------- -------- Spotlight X size + 0x1e: -------- xxxxxxxx -------- -------- Spotlight X size -------- -------- xxxxxxxx xxxxxxxx Spotlight X position (13.3 fixed-point?) 0x1f: Light extent (float) 0x20: xxxxxxxx -------- -------- -------- ? -------- xxxxxxxx -------- -------- ? + -------- -------- -x------ -------- Parallel projection -------- -------- --xxx--- -------- Light RGB (RGB111?) -------- -------- -----xxx -------- Light RGB Fog (RGB111?) -------- -------- -------- xxxxxxxx Scroll Fog (0.8 fixed-point?) What is this??? - 0x21: ? seen 8.0, 0.125, 1000000000.0 + 0x21: "inv_light_start_range" (float) 0x22: Fog Color (RGB888) 0x23: Fog Density (float) - 0x24: xxxxxxxx xxxxxxxx -------- -------- ? + 0x24: -------- xxxxxxxx -------- -------- Fog attenuation -------- -------- xxxxxxxx -------- Sun light ambient (0.8 fixed-point) -------- -------- -------- xxxxxxxx Scroll attenuation (0.8 fixed-point) What is this??? - 0x25: Fog offset - 0x26: ? - 0x27: ? - 0x28: ? - 0x29: ? - 0x2a: ? - 0x2b: ? - 0x2c: ? - 0x2d: ? - 0x2e: ? + 0x25: -------- xxxxxxxx -------- -------- Ambient fog + -------- -------- xxxxxxxx xxxxxxxx Fog offset + + 0x26: xxxxxxxx xxxxxxxx xxxxxxxx -------- Spot light + -------- -------- -------- x------- Clear viewport + -------- -------- -------- -x------ New sun parameters + + 0x27: x------- -------- -------- -------- Valid spot light + -x------ -------- -------- -------- Pro 1000 dummy + -------- --xxxxxx xxxxxxxx xxxxxxxx "upgrade_wd_10" + + 0x28: Fog layer altitude (float) + + 0x29: Top fog density (float) + + 0x2a: Bottom fog density (float) + + 0x2b: Near clipping plane (float) + + 0x2c: Far clipping plane (float) + + 0x2d: Pfog offset top + + 0x2e: Pfog offset bottom 0x2f: ? @@ -818,12 +850,23 @@ cached_texture *model3_state::get_texture(int page, int texx, int texy, int texw Instance Node? - 0x00: xxxxxxxx xxxxxxxx xxxxxx-- -------- Node number/ID?, num of bits unknown - -------- -------- -------- ---x---- This node applies translation, else matrix - -------- -------- -------- ----x--- LOD enable? - -------- -------- -------- -----x-- ? - -------- -------- -------- ------x- ? - -------- -------- -------- -------x ? + 0x00: x------- -------- -------- -------- Is UF ref + -x------ -------- -------- -------- Is 3D model + --x----- -------- -------- -------- Is point + ---x---- -------- -------- -------- Is point ref + ----x--- -------- -------- -------- Is animation + -----x-- -------- -------- -------- Is billboard + ------x- -------- -------- -------- Child is billboard + -------x -------- -------- -------- Extra child pointer needed + -------- -----xxx xxxxxx-- -------- Node ID + + -------- -------- -------- x------- Reset matrix + -------- -------- -------- -x------ Use child pointer + -------- -------- -------- --x----- Use sibling pointer + -------- -------- -------- ---x---- No matrix + -------- -------- -------- ----x--- Indirect child + -------- -------- -------- -----x-- Valid color table + -------- -------- -------- ------xx Node type (0 = viewport, 1 = root node, 2 = culling node) 0x01,0x02 only present on Step 2+ @@ -833,18 +876,26 @@ cached_texture *model3_state::get_texture(int page, int texx, int texy, int texw -------- -------- --xxxxxx x------- X offset -------- -------- -------- -xxxxxxx Y offset - 0x03: --x----- -------- -------- -------- ? - -------- -xxxxxxx xxxx---- -------- LOD? + 0x03: xxxxxxxx xxxxx--- -------- -------- Color table address 1 + -------- -----xxx xxxx---- -------- LOD table pointer -------- -------- ----xxxx xxxxxxxx Node matrix 0x04: Translation X coordinate 0x05: Translation Y coordinate 0x06: Translation Z coordinate - 0x07: Child node pointer - 0x08: Sibling node pointer - 0x09: xxxxxxxx xxxxxxxx -------- -------- Culling or sorting related? - -------- -------- xxxxxxxx xxxxxxxx Culling or sorting related? + 0x07: xxxx---- -------- -------- -------- Color table address 2 + -----x-- -------- -------- -------- Sibling table + ------x- -------- -------- -------- Point + -------x -------- -------- -------- Leaf node + -------- xxxxxxxx xxxxxxxx xxxxxxxx Child pointer + + 0x08: xxxxxxx- -------- -------- -------- Color table address 3 + -------x -------- -------- -------- Null sibling + -------- xxxxxxxx xxxxxxxx xxxxxxxx Sibling pointer + + 0x09: xxxxxxxx xxxxxxxx -------- -------- Blend radius + -------- -------- xxxxxxxx xxxxxxxx Culling radius Polygon Data