From 3af9ffa2540ec46f94fe6e791a405b7dfd00536d Mon Sep 17 00:00:00 2001 From: Scott Stone Date: Fri, 27 Jul 2012 18:21:38 +0000 Subject: [PATCH] More set splitting for allied.c - From Haze (nw) Fix for MT#04957: galaxygn: life dipswitch is broken. there's only 1 life Fix for some duplicate roms in acesp.c as well as documenting shared roms in play_1.c (nw) --- src/mame/drivers/acesp.c | 14 -------------- src/mame/drivers/allied.c | 2 ++ src/mame/drivers/fantland.c | 4 ++-- src/mame/drivers/play_1.c | 2 ++ src/mame/mame.lst | 2 -- 5 files changed, 6 insertions(+), 18 deletions(-) diff --git a/src/mame/drivers/acesp.c b/src/mame/drivers/acesp.c index 3a599930cab..dd89d73f680 100644 --- a/src/mame/drivers/acesp.c +++ b/src/mame/drivers/acesp.c @@ -423,18 +423,6 @@ ROM_START( sp_emmrdk ) SP_EMMRD_SOUND ROM_END -ROM_START( sp_emmrdl ) - ROM_REGION( 0x80000, "maincpu", 0 ) - ROM_LOAD( "0015dp50.bin", 0x0000, 0x010000, CRC(e37fa624) SHA1(3d7e09a259ed53a88cd4c9dc2e39b1aadb7049c7) ) // just a merged rom? - SP_EMMRD_SOUND -ROM_END - -ROM_START( sp_emmrdm ) - ROM_REGION( 0x80000, "maincpu", 0 ) - ROM_LOAD( "0015dp60.bin", 0x0000, 0x010000, CRC(b27378c8) SHA1(dd8dfc587d0c051d1144f4b0205bd8d4a28ceaaf) ) // just a merged rom? - SP_EMMRD_SOUND -ROM_END - ROM_START( sp_emmrdn ) ROM_REGION( 0x80000, "maincpu", 0 ) ROM_LOAD( "0015rp50.bin", 0x0000, 0x010000, CRC(e37fa624) SHA1(3d7e09a259ed53a88cd4c9dc2e39b1aadb7049c7) ) // just a merged rom? @@ -3960,8 +3948,6 @@ GAME( 1995, sp_emmrdh ,sp_emmrd ,ace_sp ,ace_sp ,ace_sp ,ROT0 ,"Ace", "Emmerdal GAME( 1995, sp_emmrdi ,sp_emmrd ,ace_sp ,ace_sp ,ace_sp ,ROT0 ,"Ace", "Emmerdale (Ace) (sp.ACE) (set 10)",GAME_IS_SKELETON_MECHANICAL ) GAME( 1995, sp_emmrdj ,sp_emmrd ,ace_sp ,ace_sp ,ace_sp ,ROT0 ,"Ace", "Emmerdale (Ace) (sp.ACE) (set 11)",GAME_IS_SKELETON_MECHANICAL ) GAME( 1995, sp_emmrdk ,sp_emmrd ,ace_sp ,ace_sp ,ace_sp ,ROT0 ,"Ace", "Emmerdale (Ace) (sp.ACE) (set 12)",GAME_IS_SKELETON_MECHANICAL ) -GAME( 1995, sp_emmrdl ,sp_emmrd ,ace_sp ,ace_sp ,ace_sp ,ROT0 ,"Ace", "Emmerdale (Ace) (sp.ACE) (set 13)",GAME_IS_SKELETON_MECHANICAL ) -GAME( 1995, sp_emmrdm ,sp_emmrd ,ace_sp ,ace_sp ,ace_sp ,ROT0 ,"Ace", "Emmerdale (Ace) (sp.ACE) (set 14)",GAME_IS_SKELETON_MECHANICAL ) GAME( 1995, sp_emmrdn ,sp_emmrd ,ace_sp ,ace_sp ,ace_sp ,ROT0 ,"Ace", "Emmerdale (Ace) (sp.ACE) (set 15)",GAME_IS_SKELETON_MECHANICAL ) GAME( 1995, sp_emmrdo ,sp_emmrd ,ace_sp ,ace_sp ,ace_sp ,ROT0 ,"Ace", "Emmerdale (Ace) (sp.ACE) (set 16)",GAME_IS_SKELETON_MECHANICAL ) // seems to be very closely related to Emmerdale, looks like the same basic game with different strings, these have "GO T' WOOLPACK" diff --git a/src/mame/drivers/allied.c b/src/mame/drivers/allied.c index e04a3fd374b..8b3768b2027 100644 --- a/src/mame/drivers/allied.c +++ b/src/mame/drivers/allied.c @@ -1,3 +1,5 @@ +/* Allied Leisure Cocktail Pinball +All tables use the same base roms and some playfields even interchange between games */ #include "emu.h" #include "cpu/m6502/m6502.h" diff --git a/src/mame/drivers/fantland.c b/src/mame/drivers/fantland.c index a21d3ed496f..31eaa007759 100644 --- a/src/mame/drivers/fantland.c +++ b/src/mame/drivers/fantland.c @@ -148,7 +148,7 @@ static ADDRESS_MAP_START( galaxygn_map, AS_PROGRAM, 8, fantland_state ) AM_RANGE( 0x53000, 0x53000 ) AM_READ_PORT("P1") AM_WRITE(fantland_nmi_enable_w ) AM_RANGE( 0x53001, 0x53001 ) AM_READ_PORT("P2") AM_RANGE( 0x53002, 0x53002 ) AM_READ_PORT("DSW1") AM_WRITE(fantland_soundlatch_w ) - AM_RANGE( 0x53003, 0x53003 ) AM_READ_PORT("P2") + AM_RANGE( 0x53003, 0x53003 ) AM_READ_PORT("DSW2") AM_RANGE( 0x54000, 0x567ff ) AM_RAM AM_SHARE("spriteram") AM_RANGE( 0x60000, 0x6ffff ) AM_RAM AM_SHARE("spriteram2") @@ -538,7 +538,7 @@ static INPUT_PORTS_START( galaxygn ) PORT_DIPSETTING( 0x06, DEF_STR( 1C_2C ) ) PORT_DIPSETTING( 0x05, DEF_STR( 1C_3C ) ) PORT_DIPSETTING( 0x04, DEF_STR( 1C_4C ) ) - PORT_DIPSETTING( 0x00, "Invulnerability" ) + PORT_DIPSETTING( 0x00, DEF_STR( Free_Play ) ) PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) ) // Demo Sounds? doesn't work PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x08, DEF_STR( On ) ) diff --git a/src/mame/drivers/play_1.c b/src/mame/drivers/play_1.c index b562c4d2ac9..827c461b7c4 100644 --- a/src/mame/drivers/play_1.c +++ b/src/mame/drivers/play_1.c @@ -107,6 +107,8 @@ ROM_START(party) ROM_LOAD("party_b.bin", 0x0400, 0x0400, CRC(5e2ba9c0) SHA1(abd285aa5702c7fb84257b4341f64ff83c1fc0ce)) ROM_END + +/* Big Town, Last Lap and Party all reportedly share the same roms with different playfield/machine artworks */ GAME(1978, bigtown, 0, play_1, play_1, play_1, ROT0, "Playmatic", "Big Town", GAME_IS_SKELETON_MECHANICAL) GAME(1978, chance, 0, play_1, play_1, play_1, ROT0, "Playmatic", "Chance", GAME_IS_SKELETON_MECHANICAL) GAME(1978, lastlap, 0, play_1, play_1, play_1, ROT0, "Playmatic", "Last Lap", GAME_IS_SKELETON_MECHANICAL) diff --git a/src/mame/mame.lst b/src/mame/mame.lst index ed9962cf814..25b8d885f69 100644 --- a/src/mame/mame.lst +++ b/src/mame/mame.lst @@ -19454,8 +19454,6 @@ sp_emmrdh // sp_emmrdi // sp_emmrdj // sp_emmrdk // -sp_emmrdl // -sp_emmrdm // sp_emmrdn // sp_emmrdo // sp_woolp // Woolpack (Ace)