From 7ecc409cdad27478c9f0d052bf5605283c020ea8 Mon Sep 17 00:00:00 2001 From: James Wallace Date: Sun, 23 Sep 2012 16:37:22 +0000 Subject: [PATCH] Let's try this again - make the sc2 layout names make more sense -vid,dmd,vfd (nw). Added new spACE clone of pound for pound. --- .gitattributes | 3 +- src/mame/drivers/acesp.c | 7 + src/mame/drivers/bfm_sc2.c | 7 +- src/mame/layout/sc2_vfd.lay | 903 +++++++++++++++++++ src/mame/layout/{bfm_sc2.lay => sc2_vid.lay} | 8 +- src/mame/mame.lst | 1 + src/mame/mame.mak | 3 +- 7 files changed, 923 insertions(+), 9 deletions(-) create mode 100644 src/mame/layout/sc2_vfd.lay rename src/mame/layout/{bfm_sc2.lay => sc2_vid.lay} (99%) diff --git a/.gitattributes b/.gitattributes index f6d3f7e49ea..5ac95bbf9f5 100644 --- a/.gitattributes +++ b/.gitattributes @@ -4251,7 +4251,6 @@ src/mame/layout/babydad.lay svneol=native#text/plain src/mame/layout/babypkr.lay svneol=native#text/plain src/mame/layout/beaminv.lay svneol=native#text/plain src/mame/layout/bfm_sc1.lay svneol=native#text/plain -src/mame/layout/bfm_sc2.lay svneol=native#text/plain src/mame/layout/bfm_sc4.lay svneol=native#text/native src/mame/layout/bfmsys85.lay svneol=native#text/plain src/mame/layout/bigdeal.lay svneol=native#text/plain @@ -4389,6 +4388,8 @@ src/mame/layout/royalcrd.lay svneol=native#text/plain src/mame/layout/saiyukip.lay svneol=native#text/plain src/mame/layout/sbrkout.lay svneol=native#text/plain src/mame/layout/sc2_dmd.lay svneol=native#text/plain +src/mame/layout/sc2_vfd.lay svneol=native#text/plain +src/mame/layout/sc2_vid.lay svneol=native#text/plain src/mame/layout/sc4_dmd.lay svneol=native#text/plain src/mame/layout/sderby.lay svneol=native#text/plain src/mame/layout/sgsafari.lay svneol=native#text/plain diff --git a/src/mame/drivers/acesp.c b/src/mame/drivers/acesp.c index 243caac0dc2..f4034accec2 100644 --- a/src/mame/drivers/acesp.c +++ b/src/mame/drivers/acesp.c @@ -3653,6 +3653,12 @@ ROM_START( sp_poundbwbf ) SP_POUND_SOUND ROM_END +ROM_START( sp_poundbwbg ) + ROM_REGION( 0x80000, "maincpu", 0 ) + ROM_LOAD( "p4p_1.bin", 0x0000, 0x8000, CRC(b2c1625e) SHA1(c992e54280bfe42a77686802faccfebb4db300a8) ) + ROM_LOAD( "p4p_2.bin", 0x8000, 0x8000, CRC(30f09a7d) SHA1(e00eeba15b8ed1f47a5d8f7ae1e59fcadbcbd838) ) + SP_POUND_SOUND +ROM_END #define SP_PRZNA_SOUND \ ROM_REGION( 0x100000, "oki", ROMREGION_ERASE00 ) \ @@ -4427,6 +4433,7 @@ GAME( 199?, sp_poundbwbc ,sp_pound ,ace_sp ,ace_sp , ace_sp_state,ace_sp ,ROT0 , GAME( 199?, sp_poundbwbd ,sp_pound ,ace_sp ,ace_sp , ace_sp_state,ace_sp ,ROT0 ,"Ace / Bwb", "Pound For Pound (Ace/Bwb) (sp.ACE) (set 5)",GAME_IS_SKELETON_MECHANICAL ) GAME( 199?, sp_poundbwbe ,sp_pound ,ace_sp ,ace_sp , ace_sp_state,ace_sp ,ROT0 ,"Ace / Bwb", "Pound For Pound (Ace/Bwb) (sp.ACE) (set 6)",GAME_IS_SKELETON_MECHANICAL ) GAME( 199?, sp_poundbwbf ,sp_pound ,ace_sp ,ace_sp , ace_sp_state,ace_sp ,ROT0 ,"Ace / Bwb", "Pound For Pound (Ace/Bwb) (sp.ACE) (set 7)",GAME_IS_SKELETON_MECHANICAL ) +GAME( 199?, sp_poundbwbg ,sp_pound ,ace_sp ,ace_sp , ace_sp_state,ace_sp ,ROT0 ,"Ace / Bwb", "Pound For Pound (Ace/Bwb) (sp.ACE) (set 8)",GAME_IS_SKELETON_MECHANICAL ) GAME( 199?, sp_road ,0 ,ace_sp ,ace_sp , ace_sp_state,ace_sp ,ROT0 ,"Ace", "Road To Hell (Ace) (sp.ACE)",GAME_IS_SKELETON_MECHANICAL ) // incomplete program diff --git a/src/mame/drivers/bfm_sc2.c b/src/mame/drivers/bfm_sc2.c index fc9295a3eee..cbcac7815cb 100644 --- a/src/mame/drivers/bfm_sc2.c +++ b/src/mame/drivers/bfm_sc2.c @@ -155,7 +155,7 @@ Adder hardware: #include "machine/bfm_bd1.h" // vfd #include "machine/meters.h" -#include "bfm_sc2.lh" +#include "sc2_vid.lh" #include "gldncrwn.lh" #include "paradice.lh" #include "pokio.lh" @@ -167,6 +167,7 @@ Adder hardware: /* fruit machines only */ #include "video/bfm_dm01.h" +#include "sc2_vfd.lh" #include "sc2_dmd.lh" #include "drwho.lh" #include "machine/bfm_comn.h" @@ -2159,7 +2160,7 @@ static MACHINE_CONFIG_START( scorpion2_vid, bfm_sc2_state ) MCFG_NVRAM_ADD_0FILL("nvram") MCFG_NVRAM_ADD_CUSTOM_DRIVER("e2ram", bfm_sc2_state, e2ram_init) - MCFG_DEFAULT_LAYOUT(layout_bfm_sc2) + MCFG_DEFAULT_LAYOUT(layout_sc2_vid) MCFG_SCREEN_ADD("adder", RASTER) MCFG_SCREEN_SIZE( 400, 280) @@ -3718,7 +3719,7 @@ static MACHINE_CONFIG_START( scorpion2, bfm_sc2_state ) MCFG_NVRAM_ADD_CUSTOM_DRIVER("e2ram", bfm_sc2_state, e2ram_init) /* video hardware */ - MCFG_DEFAULT_LAYOUT(layout_bfm_sc2) + MCFG_DEFAULT_LAYOUT(layout_sc2_vfd) MACHINE_CONFIG_END diff --git a/src/mame/layout/sc2_vfd.lay b/src/mame/layout/sc2_vfd.lay new file mode 100644 index 00000000000..b6f1ef30b9c --- /dev/null +++ b/src/mame/layout/sc2_vfd.lay @@ -0,0 +1,903 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/mame/layout/bfm_sc2.lay b/src/mame/layout/sc2_vid.lay similarity index 99% rename from src/mame/layout/bfm_sc2.lay rename to src/mame/layout/sc2_vid.lay index ea2f127d44a..ba91a95a22f 100644 --- a/src/mame/layout/bfm_sc2.lay +++ b/src/mame/layout/sc2_vid.lay @@ -849,15 +849,15 @@ - + - + diff --git a/src/mame/mame.lst b/src/mame/mame.lst index cf22b608740..2112e3624d2 100644 --- a/src/mame/mame.lst +++ b/src/mame/mame.lst @@ -25835,6 +25835,7 @@ sp_poundbwbc // sp_poundbwbd // sp_poundbwbe // sp_poundbwbf // +sp_poundbwbg // sp_road // Road To Hell (Ace) sp_skylm // Sky's The Limit Club, The (Ace) sp_skylma // diff --git a/src/mame/mame.mak b/src/mame/mame.mak index 3c112693906..a0b9c38f8f3 100644 --- a/src/mame/mame.mak +++ b/src/mame/mame.mak @@ -1982,8 +1982,9 @@ $(DRIVERS)/beaminv.o: $(LAYOUT)/beaminv.lh $(DRIVERS)/bfm_sc1.o: $(LAYOUT)/bfm_sc1.lh -$(DRIVERS)/bfm_sc2.o: $(LAYOUT)/bfm_sc2.lh \ +$(DRIVERS)/bfm_sc2.o: $(LAYOUT)/sc2_vfd.lh \ $(LAYOUT)/sc2_dmd.lh \ + $(LAYOUT)/sc2_vid.lh \ $(LAYOUT)/drwho.lh \ $(LAYOUT)/gldncrwn.lh \ $(LAYOUT)/quintoon.lh \