From a32e6298e875b4d53d12f91c6514b1b832ff3d9c Mon Sep 17 00:00:00 2001 From: David Haywood Date: Thu, 13 Dec 2012 16:25:59 +0000 Subject: [PATCH] move a set sc1 -> b85 (nw) --- src/mame/drivers/bfm_sc1.c | 6 ------ src/mame/drivers/bfmsys85.c | 10 ++++++++++ src/mame/mame.lst | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/mame/drivers/bfm_sc1.c b/src/mame/drivers/bfm_sc1.c index d07947d3b83..b1f6ae85f91 100644 --- a/src/mame/drivers/bfm_sc1.c +++ b/src/mame/drivers/bfm_sc1.c @@ -1613,11 +1613,6 @@ ROM_START( sc1disc ) ROM_LOAD( "disc-88.a", 0x8000, 0x008000, CRC(1ac052d0) SHA1(a37cc2896fb884af7e922289d7fda1e7d26fc387) ) ROM_END -ROM_START( sc1disca ) - ROM_REGION( 0x10000, "maincpu", 0 ) - ROM_LOAD( "ds2.bin", 0x0000, 0x008000, CRC(fa549c55) SHA1(93a31e4f847dcd326760d17753c994f6210fb6ed) ) - ROM_LOAD( "ds1.bin", 0x8000, 0x008000, CRC(22f6ce92) SHA1(5db8f54bc83e963687ebe2f13769e3f2f678d356) ) -ROM_END @@ -3186,7 +3181,6 @@ GAME( 198?, sc1copdd , 0 , scorpion1 , scorpion1 , bfm_sc1_state, lotse , GAME( 198?, sc1disc , 0 , scorpion1 , scorpion1 , bfm_sc1_state, lotse , 0, "BFM/ELAM", "Discovey (Bellfruit) (Dutch) (set 1) (Scorpion 1)", GAME_FLAGS ) -GAME( 198?, sc1disca , sc1disc , scorpion1 , scorpion1 , bfm_sc1_state, lotse , 0, "BFM/ELAM", "Discovey (Bellfruit) (set 2) (Scorpion 1)", GAME_FLAGS ) GAME( 198?, sc1dream , 0 , scorpion1 , scorpion1 , bfm_sc1_state, lotse , 0, "BFM", "Dream Machine (Bellfruit) (Scorpion 1)", GAME_FLAGS ) GAME( 198?, sc1final , 0 , scorpion1 , scorpion1 , bfm_sc1_state, lotse , 0, "BFM", "Final Touch (Bellfruit) (Scorpion 1)", GAME_FLAGS ) GAME( 198?, sc1flash , 0 , scorpion1 , scorpion1 , bfm_sc1_state, nocrypt , 0, "BFM/ELAM", "Flash (Bellfruit) (Dutch) (Scorpion 1)", GAME_FLAGS ) diff --git a/src/mame/drivers/bfmsys85.c b/src/mame/drivers/bfmsys85.c index 3d75f969a20..e9e454b8d2d 100644 --- a/src/mame/drivers/bfmsys85.c +++ b/src/mame/drivers/bfmsys85.c @@ -648,6 +648,13 @@ ROM_START( b85koca ) ROM_END +ROM_START( b85disc ) + ROM_REGION( 0x10000, "maincpu", 0 ) + ROM_LOAD( "ds2.bin", 0x0000, 0x008000, CRC(fa549c55) SHA1(93a31e4f847dcd326760d17753c994f6210fb6ed) ) + ROM_LOAD( "ds1.bin", 0x8000, 0x008000, CRC(22f6ce92) SHA1(5db8f54bc83e963687ebe2f13769e3f2f678d356) ) +ROM_END + + DRIVER_INIT_MEMBER(bfmsys85_state,decode) { bfm_decode_mainrom(machine(),"maincpu", m_codec_data); @@ -683,3 +690,6 @@ GAME( 1988, b85sngam , 0 , bfmsys85, bfmsys85, bfmsys85_state, decode , 0, GAME( 199?, b85cops , 0 , bfmsys85, bfmsys85, driver_device, 0 , 0, "BFM", "Cops 'n' Robbers (Bellfruit) (Dutch) (System 85)", GAME_SUPPORTS_SAVE|GAME_REQUIRES_ARTWORK|GAME_NOT_WORKING|GAME_MECHANICAL) GAME( 199?, b85koc , 0 , bfmsys85, bfmsys85, bfmsys85_state, decode , 0, "BFM", "King of Clubs (Bellfruit) (System 85, set 1)", GAME_SUPPORTS_SAVE|GAME_REQUIRES_ARTWORK|GAME_NOT_WORKING|GAME_MECHANICAL) // this has valid strings in it BEFORE the bfm decode, but decodes to valid code, does it use some funky mapping, or did they just fill unused space with valid looking data? GAME( 199?, b85koca , b85koc , bfmsys85, bfmsys85, bfmsys85_state, decode , 0, "BFM", "King of Clubs (Bellfruit) (System 85, set 2)", GAME_SUPPORTS_SAVE|GAME_REQUIRES_ARTWORK|GAME_NOT_WORKING|GAME_MECHANICAL) // this has valid strings in it BEFORE the bfm decode, but decodes to valid code, does it use some funky mapping, or did they just fill unused space with valid looking data? + +// PROJECT NUMBER 5596 DISCOVERY 85 - 06-APR-1990 08:57:39 +GAME( 198?, b85disc , 0 , bfmsys85 , bfmsys85 , bfmsys85_state, decode , 0, "BFM/ELAM", "Discovey (Bellfruit) (System 85)", GAME_SUPPORTS_SAVE|GAME_REQUIRES_ARTWORK|GAME_NOT_WORKING|GAME_MECHANICAL ) // GAME No 39-350-251 diff --git a/src/mame/mame.lst b/src/mame/mame.lst index df0f887ba16..244a312c217 100644 --- a/src/mame/mame.lst +++ b/src/mame/mame.lst @@ -13264,6 +13264,7 @@ b85sngam b85cops // Cops 'n' Robbers (Bellfruit) [Dutch] b85koc b85koca +b85disc // Scorpion 1 games @@ -13346,7 +13347,6 @@ sc1counta sc1countap sc1dago // Dagobert's Vault (Bellfruit) sc1disc // Discovey (Bellfruit) -sc1disca sc1dblch // Double Chance (Bellfruit) sc1dblcha sc1dblchb