diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua index 043ab24680b..d289e09b64e 100644 --- a/scripts/target/mame/arcade.lua +++ b/scripts/target/mame/arcade.lua @@ -3535,7 +3535,6 @@ files { MAME_DIR .. "src/mame/drivers/slotcarn.c", MAME_DIR .. "src/mame/drivers/smsmcorp.c", MAME_DIR .. "src/mame/drivers/sothello.c", - MAME_DIR .. "src/mame/drivers/spcwarp.c", MAME_DIR .. "src/mame/drivers/splus.c", MAME_DIR .. "src/mame/drivers/spool99.c", MAME_DIR .. "src/mame/drivers/sprcros2.c", diff --git a/src/mame/drivers/cvs.c b/src/mame/drivers/cvs.c index b18858532d8..56327ce4851 100644 --- a/src/mame/drivers/cvs.c +++ b/src/mame/drivers/cvs.c @@ -460,7 +460,6 @@ static ADDRESS_MAP_START( cvs_main_cpu_map, AS_PROGRAM, 8, cvs_state ) AM_RANGE(0x6000, 0x73ff) AM_ROM ADDRESS_MAP_END - static ADDRESS_MAP_START( cvs_main_cpu_io_map, AS_IO, 8, cvs_state ) AM_RANGE(0x00, 0xff) AM_READ(cvs_input_r) AM_WRITE(cvs_scroll_w) AM_RANGE(S2650_DATA_PORT, S2650_DATA_PORT) AM_READWRITE(cvs_collision_clear, cvs_video_fx_w) @@ -468,8 +467,6 @@ static ADDRESS_MAP_START( cvs_main_cpu_io_map, AS_IO, 8, cvs_state ) AM_RANGE(S2650_SENSE_PORT, S2650_SENSE_PORT) AM_READ_PORT("SENSE") ADDRESS_MAP_END - - /************************************* * * DAC driving CPU memory/IO handlers @@ -1046,7 +1043,6 @@ static MACHINE_CONFIG_START( cvs, cvs_state ) MACHINE_CONFIG_END - /************************************* * * ROM definitions @@ -1534,6 +1530,29 @@ ROM_START( raidersr3 ) ROM_END +ROM_START( spcwarp ) + ROM_REGION( 0x8000, "maincpu", 0 ) + /* we're likely missing ROMs, no DAC or speech CPU roms anywhere */ + /* also there's only 3 maincpu ROMS, which is odd; game calls to empty locations */ + ROM_LOAD_STAGGERED( "swarpt7f.bin", 0x0000, CRC(04d744e3) SHA1(db8218510052a05670cb0b722b73d3f10464788c) ) + ROM_LOAD_STAGGERED( "swarpt7h.bin", 0x0400, CRC(34a36536) SHA1(bc438515618683b2a7c29637871ee00ed95ad7f8) ) +/* ROMCMP reports "BADADDR xxxxxx-xxxxx". Observed data sequence repeated every 32 bytes */ + ROM_LOAD_STAGGERED( "swarpt7m.bin", 0x0800, BAD_DUMP CRC(a2dff6c8) SHA1(d1c72848450dc5ff386dc94a26e4bf704ccc7121) ) +/* Stripped "repaired" rom. Was original rom supposed to be 0x1000 or 0x800? */ +// ROM_LOAD( "swarpt7m-repair.bin", 0x2000, 0x0800, CRC(109f95cf) SHA1(d99171ffd6639fec28966edaf7cce3a4df5e948d) ) + + ROM_REGION( 0x8000, "audiocpu", ROMREGION_ERASE ) + + ROM_REGION( 0x1000, "speechdata", ROMREGION_ERASE ) + + ROM_REGION( 0x1800, "gfx1", 0 ) + ROM_LOAD( "swarpb1h.bin", 0x0000, 0x0800, CRC(6ee3b5f7) SHA1(8150f2ecd59d3a165c0541b550664c56d049edd5) ) + ROM_LOAD( "swarpb1k.bin", 0x0800, 0x0800, CRC(da4cee6b) SHA1(28b91381658f598fa62049489beee443232825c6) ) + + CVS_COMMON_ROMS +ROM_END + + /************************************* * * Game specific initalization @@ -1662,9 +1681,10 @@ GAME( 1982, goldbug, 0, cvs, goldbug, driver_device, 0, ROT GAME( 1982, diggerc, 0, cvs, diggerc, driver_device, 0, ROT90, "Century Electronics", "Digger (CVS)", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) GAME( 1983, heartatk, 0, cvs, heartatk, driver_device, 0, ROT90, "Century Electronics", "Heart Attack", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) GAME( 1983, hunchbak, 0, cvs, hunchbak, driver_device, 0, ROT90, "Century Electronics", "Hunchback (set 1)", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) -GAME( 1983, hunchbaka, hunchbak, cvs, hunchbak, cvs_state, hunchbaka,ROT90, "Century Electronics", "Hunchback (set 2)", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) -GAME( 1983, superbik, 0, cvs, superbik, cvs_state, superbik, ROT90, "Century Electronics", "Superbike", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) -GAME( 1983, raiders, 0, cvs, raiders, cvs_state, raiders, ROT90, "Century Electronics", "Raiders", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) -GAME( 1983, raidersr3, raiders, cvs, raiders, cvs_state, raiders, ROT90, "Century Electronics", "Raiders (Rev.3)", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) -GAME( 1984, hero, 0, cvs, hero, cvs_state, hero, ROT90, "Century Electronics / Seatongrove Ltd", "Hero", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // (C) 1984 CVS on titlescreen, (C) 1983 Seatongrove on highscore screen -GAME( 1984, huncholy, 0, cvs, huncholy, cvs_state, huncholy, ROT90, "Century Electronics / Seatongrove Ltd", "Hunchback Olympic", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) +GAME( 1983, hunchbaka, hunchbak, cvs, hunchbak, cvs_state, hunchbaka, ROT90, "Century Electronics", "Hunchback (set 2)", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) +GAME( 1983, spcwarp, 0, cvs, cvs, driver_device, 0, ROT90, "Century Electronics", "Space Warp?", MACHINE_NO_COCKTAIL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) +GAME( 1983, superbik, 0, cvs, superbik, cvs_state, superbik, ROT90, "Century Electronics", "Superbike", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) +GAME( 1983, raiders, 0, cvs, raiders, cvs_state, raiders, ROT90, "Century Electronics", "Raiders", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) +GAME( 1983, raidersr3, raiders, cvs, raiders, cvs_state, raiders, ROT90, "Century Electronics", "Raiders (Rev.3)", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) +GAME( 1984, hero, 0, cvs, hero, cvs_state, hero, ROT90, "Century Electronics / Seatongrove Ltd", "Hero", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // (C) 1984 CVS on titlescreen, (C) 1983 Seatongrove on highscore screen +GAME( 1984, huncholy, 0, cvs, huncholy, cvs_state, huncholy, ROT90, "Century Electronics / Seatongrove Ltd", "Hunchback Olympic", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/drivers/spcwarp.c b/src/mame/drivers/spcwarp.c deleted file mode 100644 index 67fb9257bf9..00000000000 --- a/src/mame/drivers/spcwarp.c +++ /dev/null @@ -1,84 +0,0 @@ -// license:BSD-3-Clause -// copyright-holders:kazblox -/* -Space Warp(?) -it's completely unknown if this is actually Space Warp but it contains Galaxian-like GFX -ASCII shows "COPYRIGHT 1983", "CENTURY ELECTRONICS UK LTD" in swarpt7f.bin -gfx is like cosmos according to hap(cvs.c) - -9/25/2015 - Initial commit of skeleton driver - -TODO: --merge with cvs_state - -*/ - -#include "emu.h" -#include "cpu/s2650/s2650.h" - -class spcwarp_state : public driver_device -{ -public: - spcwarp_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu") - { } - - virtual void machine_start(); - virtual void machine_reset(); - required_device m_maincpu; -}; - -static ADDRESS_MAP_START( spcwarp_map, AS_PROGRAM, 8, spcwarp_state ) - AM_RANGE(0x0000, 0x2fff) AM_ROM -ADDRESS_MAP_END - -static INPUT_PORTS_START( spcwarp ) - //PORT_START("SENSE") - //PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_VBLANK("screen") -INPUT_PORTS_END - -void spcwarp_state::machine_start() -{ -} - -void spcwarp_state::machine_reset() -{ -} - -static MACHINE_CONFIG_START( spcwarp, spcwarp_state ) - - /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", S2650, XTAL_14_31818MHz/16) // clock is a complete guess - MCFG_CPU_PROGRAM_MAP(spcwarp_map) - //MCFG_CPU_VBLANK_INT_DRIVER("screen", spcwarp_state, spcwarp_main_cpu_interrupt) // ??? - //MCFG_S2650_FLAG_HANDLER(WRITELINE(spcwarp_state, write_s2650_flag)) // ??? - - /* TODO video hardware */ - /* copypaste from cvs.c */ - //MCFG_SCREEN_ADD("screen", RASTER) - //MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE) - //MCFG_SCREEN_REFRESH_RATE(50) - //MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) - //MCFG_SCREEN_SIZE(256, 256) - //MCFG_SCREEN_VISIBLE_AREA(0*8, 30*8-1, 2*8, 32*8-1) - - /* TODO audio hardware */ - MCFG_SPEAKER_STANDARD_MONO("mono") -MACHINE_CONFIG_END - -ROM_START( spcwarp ) - ROM_REGION( 0x4000, "maincpu", 0 ) - ROM_LOAD( "swarpt7f.bin", 0x0000, 0x1000, CRC(04d744e3) SHA1(db8218510052a05670cb0b722b73d3f10464788c) ) - ROM_LOAD( "swarpt7h.bin", 0x1000, 0x1000, CRC(34a36536) SHA1(bc438515618683b2a7c29637871ee00ed95ad7f8) ) -/* ROMCMP reports "BADADDR xxxxxx-xxxxx". Observed data sequence repeated every 32 bytes */ - ROM_LOAD( "swarpt7m.bin", 0x2000, 0x1000, BAD_DUMP CRC(a2dff6c8) SHA1(d1c72848450dc5ff386dc94a26e4bf704ccc7121) ) -/* Stripped "repaired" rom. Was original rom supposed to be 0x1000 or 0x800? */ -// ROM_LOAD( "swarpt7m-repair.bin", 0x2000, 0x0800, CRC(109f95cf) SHA1(d99171ffd6639fec28966edaf7cce3a4df5e948d) ) - - ROM_REGION( 0x1000, "gfx1", 0 ) - ROM_LOAD( "swarpb1h.bin", 0x0000, 0x0800, CRC(6ee3b5f7) SHA1(8150f2ecd59d3a165c0541b550664c56d049edd5) ) - ROM_LOAD( "swarpb1k.bin", 0x0800, 0x0800, CRC(da4cee6b) SHA1(28b91381658f598fa62049489beee443232825c6) ) -ROM_END - -GAME( 1983, spcwarp, 0, spcwarp, spcwarp, driver_device, 0, ROT90, "Century Electronics", "Space Warp?", MACHINE_IS_SKELETON )