From e553f19a1daa0dd6269ff856178ad3dcc1f6dbf3 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Fri, 13 Mar 2015 15:53:27 +1100 Subject: Add internal artwork for tonypok Make artwork clickable for many goldstar.c games Make buttons that may be used when not lit appear semi-lit in Cherry Master layouts Correct some star100 inputs Make cmpacman/cmtetris key mapping more consistent with defaults for slot games --- src/mame/drivers/goldstar.c | 45 ++--- src/mame/layout/cmaster.lay | 36 ++-- src/mame/layout/cmasterb.lay | 30 ++-- src/mame/layout/cmasterc.lay | 32 ++-- src/mame/layout/cmpacman.lay | 271 ++++++++++++++++++++++++++++ src/mame/layout/cmv4.lay | 64 +++---- src/mame/layout/crazybon.lay | 40 ++--- src/mame/layout/roypok96.lay | 48 +++-- src/mame/layout/tonypok.lay | 418 +++++++++++++++++++++++++++++++++++++++++++ src/mame/mame.mak | 4 +- 10 files changed, 849 insertions(+), 139 deletions(-) create mode 100644 src/mame/layout/cmpacman.lay create mode 100644 src/mame/layout/tonypok.lay diff --git a/src/mame/drivers/goldstar.c b/src/mame/drivers/goldstar.c index 5d76c6b9c5c..d6c126b4ba7 100644 --- a/src/mame/drivers/goldstar.c +++ b/src/mame/drivers/goldstar.c @@ -160,6 +160,7 @@ #include "cmaster.lh" #include "cmasterb.lh" #include "cmasterc.lh" +#include "cmpacman.lh" #include "cmv4.lh" #include "crazybon.lh" #include "goldstar.lh" @@ -167,6 +168,7 @@ #include "nfb96.lh" #include "pokonl97.lh" #include "roypok96.lh" +#include "tonypok.lh" WRITE8_MEMBER(goldstar_state::protection_w) @@ -365,7 +367,7 @@ static ADDRESS_MAP_START( star100_readport, AS_IO, 8, sanghopm_state ) AM_RANGE(0x25, 0x25) AM_READ_PORT("DSW2") AM_RANGE(0x26, 0x26) AM_READ_PORT("DSW3") - AM_RANGE(0xf0, 0xf0) AM_WRITENOP // Writing 0's and 1's constantly. Watchdog feeder? + AM_RANGE(0xe0, 0xe0) AM_WRITENOP // Writing 0's and 1's constantly. Watchdog feeder? AM_RANGE(0xe1, 0xe1) AM_WRITE(enable_w) // enable/disable reels register. ADDRESS_MAP_END @@ -2074,11 +2076,11 @@ static INPUT_PORTS_START( tonypok ) PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_POKER_HOLD2 ) PORT_NAME("Hold 2 / Big / Red") - PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_POKER_HOLD3 ) PORT_NAME("Hold 3 / W-Up") + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_POKER_HOLD3 ) PORT_NAME("Hold 3 / D-Up") PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_POKER_HOLD4 ) PORT_NAME("Hold 4 / Take") PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_POKER_HOLD5 ) PORT_NAME("Hold 5 / Bet") PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_POKER_HOLD1 ) PORT_NAME("Hold 1 / Small / Black") - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 ) PORT_NAME("Deal") + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 ) PORT_NAME("Start / Deal / Draw") PORT_INCLUDE( cmv4_coins ) @@ -5638,11 +5640,11 @@ static INPUT_PORTS_START( star100 ) PORT_START("IN0") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SLOT_STOP_ALL ) PORT_NAME("Stop All / Big") - PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_SLOT_STOP1 ) PORT_NAME("Stop 1 / D-UP") - PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_SLOT_STOP3 ) PORT_NAME("Stop 3 / Take / Select Card") + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_GAMBLE_HIGH ) PORT_NAME("Big") + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_SLOT_STOP_ALL ) PORT_NAME("Hold / D-UP") + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_GAMBLE_TAKE ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_GAMBLE_BET ) PORT_NAME("Play (Bet)") - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SLOT_STOP2 ) PORT_NAME("Stop 2 / Small") + PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_GAMBLE_LOW ) PORT_NAME("Small") PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 ) PORT_NAME("Start") // PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_1) PORT_NAME("IN0-1") @@ -5791,12 +5793,11 @@ static INPUT_PORTS_START( star100 ) PORT_DIPNAME( 0x01, 0x01, "Bonus (switch-2)" ) PORT_DIPLOCATION("SW4:5") PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x02, 0x02, "Max Bonus" ) PORT_DIPLOCATION("SW4:6") PORT_DIPSETTING( 0x00, "100000" ) PORT_DIPSETTING( 0x02, "200000" ) PORT_DIPNAME( 0x0c, 0x0c, "Minimum Bet" ) PORT_DIPLOCATION("SW4:7,8") - PORT_DIPSETTING( 0x0c, "0" ) + PORT_DIPSETTING( 0x0c, "1" ) PORT_DIPSETTING( 0x08, "8" ) PORT_DIPSETTING( 0x04, "16" ) PORT_DIPSETTING( 0x00, "32" ) @@ -6007,11 +6008,11 @@ static INPUT_PORTS_START( cmpacman ) PORT_START("IN0") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SLOT_STOP2 ) PORT_CODE(KEYCODE_X) PORT_CODE(KEYCODE_UP) PORT_NAME("Stop 2 / Big / Up") - PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_SLOT_STOP1 ) PORT_CODE(KEYCODE_Z) PORT_CODE(KEYCODE_LEFT) PORT_NAME("Stop 1 / D-UP / Left") - PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_SLOT_STOP_ALL ) PORT_CODE(KEYCODE_V) PORT_CODE(KEYCODE_DOWN) PORT_NAME("Stop All / Take / Down") + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SLOT_STOP2 ) PORT_CODE(KEYCODE_C) PORT_CODE(KEYCODE_UP) PORT_NAME("Stop 2 / Big / Up") + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_SLOT_STOP1 ) PORT_CODE(KEYCODE_X) PORT_CODE(KEYCODE_LEFT) PORT_NAME("Stop 1 / D-UP / Left") + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_SLOT_STOP_ALL ) PORT_CODE(KEYCODE_Z) PORT_CODE(KEYCODE_DOWN) PORT_NAME("Stop All / Take / Down") PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_GAMBLE_BET ) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SLOT_STOP3 ) PORT_CODE(KEYCODE_C) PORT_NAME("Stop 3 / Small / Info") + PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SLOT_STOP3 ) PORT_CODE(KEYCODE_V) PORT_NAME("Stop 3 / Small / Info") PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 ) PORT_CODE(KEYCODE_1) PORT_CODE(KEYCODE_RIGHT) PORT_NAME("Start / Right") PORT_INCLUDE( cmv4_coins ) @@ -6118,11 +6119,11 @@ static INPUT_PORTS_START( cmtetris ) PORT_START("IN0") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SLOT_STOP2 ) PORT_CODE(KEYCODE_X) PORT_CODE(KEYCODE_RIGHT) PORT_NAME("Stop 2 / Big / Right") - PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_SLOT_STOP1 ) PORT_CODE(KEYCODE_Z) PORT_NAME("Stop 1 / D-UP") - PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_SLOT_STOP_ALL ) PORT_CODE(KEYCODE_V) PORT_CODE(KEYCODE_UP) PORT_NAME("Stop All / Take / Up") + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SLOT_STOP2 ) PORT_CODE(KEYCODE_C) PORT_CODE(KEYCODE_RIGHT) PORT_NAME("Stop 2 / Big / Right") + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_SLOT_STOP1 ) PORT_CODE(KEYCODE_X) PORT_NAME("Stop 1 / D-UP") + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_SLOT_STOP_ALL ) PORT_CODE(KEYCODE_Z) PORT_CODE(KEYCODE_UP) PORT_NAME("Stop All / Take / Up") PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_GAMBLE_BET ) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SLOT_STOP3 ) PORT_CODE(KEYCODE_C) PORT_CODE(KEYCODE_LEFT) PORT_NAME("Stop 3 / Small / Info / Left") + PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SLOT_STOP3 ) PORT_CODE(KEYCODE_V) PORT_CODE(KEYCODE_LEFT) PORT_NAME("Stop 3 / Small / Info / Left") PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 ) PORT_CODE(KEYCODE_1) PORT_CODE(KEYCODE_DOWN) PORT_NAME("Start / Down") PORT_START("IN1") @@ -12990,7 +12991,7 @@ GAMEL( 1991, cmastere, cmaster, cm, cmasterb, cmaster_state, cmv4, GAMEL( 1991, cmasterf, cmaster, cm, cmasterb, cmaster_state, cmv4, ROT0, "Dyna", "Cherry Master I (ver.1.01, set 7)", 0, layout_cmasterb ) -GAME( 1991, tonypok, 0, cm, tonypok, cmaster_state, tonypok, ROT0, "Corsica", "Poker Master (Tony-Poker V3.A, hack?)", 0 ) +GAMEL( 1991, tonypok, 0, cm, tonypok, cmaster_state, tonypok, ROT0, "Corsica", "Poker Master (Tony-Poker V3.A, hack?)", 0 , layout_tonypok ) GAME( 199?, jkrmast, 0, pkrmast, pkrmast, driver_device, 0, ROT0, "", "Joker Master", GAME_NOT_WORKING ) // encrypted? GAME( 199?, pkrmast, jkrmast, pkrmast, pkrmast, driver_device, 0, ROT0, "", "Poker Master (ED-1993 set 1)", GAME_NOT_WORKING ) // incomplete dump + encrypted? GAME( 1993, pkrmasta, jkrmast, pkrmast, pkrmast, driver_device, 0, ROT0, "", "Poker Master (ED-1993 set 2)", GAME_NOT_WORKING ) // incomplete dump + encrypted? @@ -13083,10 +13084,10 @@ GAME( 1999, unkch4, unkch1, unkch, unkch4, unkch_state, unkch4, These have hidden games inside that can be switched to avoid inspections, police or whatever purposes)... */ /* YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS */ -GAMEL( 198?, cmpacman, 0, cm, cmpacman, cmaster_state, cm, ROT0, "", "Super Pacman (v1.2) + Cherry Master (Corsica, v8.31)", 0, layout_cmv4 ) /* need to press K to switch between games... */ -GAMEL( 198?, cmtetris, 0, cm, cmtetris, cmaster_state, cm, ROT0, "", "Tetris + Cherry Master (Corsica, v8.01, set 1)", 0, layout_cmv4 ) /* need to press K/L to switch between games... */ -GAMEL( 198?, cmtetrsa, 0, cm, cmtetris, cmaster_state, cm, ROT0, "", "Tetris + Cherry Master (Corsica, v8.01, set 2)", GAME_NOT_WORKING, layout_cmv4) // seems banked... -GAMEL( 198?, cmtetrsb, 0, cm, cmtetris, cmaster_state, cm, ROT0, "", "Tetris + Cherry Master (+K, Canada Version, encrypted)", GAME_NOT_WORKING, layout_cmv4) // different Tetris game +GAMEL( 198?, cmpacman, 0, cm, cmpacman, cmaster_state, cm, ROT0, "", "Super Pacman (v1.2) + Cherry Master (Corsica, v8.31)", 0, layout_cmpacman ) // need to press K to switch between games... +GAMEL( 198?, cmtetris, 0, cm, cmtetris, cmaster_state, cm, ROT0, "", "Tetris + Cherry Master (Corsica, v8.01, set 1)", 0, layout_cmpacman ) // need to press K/L to switch between games... +GAMEL( 198?, cmtetrsa, 0, cm, cmtetris, cmaster_state, cm, ROT0, "", "Tetris + Cherry Master (Corsica, v8.01, set 2)", GAME_NOT_WORKING, layout_cmpacman ) // seems banked... +GAMEL( 198?, cmtetrsb, 0, cm, cmtetris, cmaster_state, cm, ROT0, "", "Tetris + Cherry Master (+K, Canada Version, encrypted)", GAME_NOT_WORKING, layout_cmpacman ) // different Tetris game /* other possible stealth sets: - cmv4a ---> see the 1fxx zone. put a bp in 1f9f to see the loop. diff --git a/src/mame/layout/cmaster.lay b/src/mame/layout/cmaster.lay index 5d0d0daf58a..82a1b22f670 100644 --- a/src/mame/layout/cmaster.lay +++ b/src/mame/layout/cmaster.lay @@ -13,7 +13,7 @@ - + @@ -30,7 +30,7 @@ - + @@ -47,7 +47,7 @@ - + @@ -90,7 +90,7 @@ - + @@ -116,7 +116,7 @@ - + @@ -125,7 +125,7 @@ - + @@ -211,50 +211,50 @@ - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/src/mame/layout/cmasterb.lay b/src/mame/layout/cmasterb.lay index a80537d28ff..df39c2f13e6 100644 --- a/src/mame/layout/cmasterb.lay +++ b/src/mame/layout/cmasterb.lay @@ -13,7 +13,7 @@ - + @@ -30,7 +30,7 @@ - + @@ -108,7 +108,7 @@ - + @@ -203,50 +203,50 @@ - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/src/mame/layout/cmasterc.lay b/src/mame/layout/cmasterc.lay index 908f1fba95d..d9b0f43209b 100644 --- a/src/mame/layout/cmasterc.lay +++ b/src/mame/layout/cmasterc.lay @@ -13,7 +13,7 @@ - + @@ -30,7 +30,7 @@ - + @@ -47,7 +47,7 @@ - + @@ -112,7 +112,7 @@ - + @@ -207,50 +207,50 @@ - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/src/mame/layout/cmpacman.lay b/src/mame/layout/cmpacman.lay new file mode 100644 index 00000000000..af48e1a1541 --- /dev/null +++ b/src/mame/layout/cmpacman.lay @@ -0,0 +1,271 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/mame/layout/cmv4.lay b/src/mame/layout/cmv4.lay index e726fc274b6..2fc6dfffb27 100644 --- a/src/mame/layout/cmv4.lay +++ b/src/mame/layout/cmv4.lay @@ -8,69 +8,69 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -116,7 +116,7 @@ - + @@ -134,7 +134,7 @@ - + @@ -211,50 +211,50 @@ - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/src/mame/layout/crazybon.lay b/src/mame/layout/crazybon.lay index bfed6b53d98..daad324d85b 100644 --- a/src/mame/layout/crazybon.lay +++ b/src/mame/layout/crazybon.lay @@ -203,51 +203,51 @@ - - - - - - - - - + - + - + - + - + - + - + + + + + + + + + - + - - + + - - + + diff --git a/src/mame/layout/roypok96.lay b/src/mame/layout/roypok96.lay index a9c68624a24..4dd29a2db40 100644 --- a/src/mame/layout/roypok96.lay +++ b/src/mame/layout/roypok96.lay @@ -26,7 +26,7 @@ - + @@ -56,7 +56,7 @@ - + @@ -103,7 +103,7 @@ - + @@ -112,6 +112,15 @@ + + + + + + + + + @@ -130,6 +139,15 @@ + + + + + + + + + @@ -203,50 +221,50 @@ - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/src/mame/layout/tonypok.lay b/src/mame/layout/tonypok.lay new file mode 100644 index 00000000000..7e124b8e04a --- /dev/null +++ b/src/mame/layout/tonypok.lay @@ -0,0 +1,418 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/mame/mame.mak b/src/mame/mame.mak index 86663f84e7a..ee68f57dfd7 100644 --- a/src/mame/mame.mak +++ b/src/mame/mame.mak @@ -2678,12 +2678,14 @@ $(DRIVERS)/goldstar.o: $(LAYOUT)/goldstar.lh \ $(LAYOUT)/cmaster.lh \ $(LAYOUT)/cmasterb.lh \ $(LAYOUT)/cmasterc.lh \ + $(LAYOUT)/cmpacman.lh \ $(LAYOUT)/cmv4.lh \ $(LAYOUT)/crazybon.lh \ $(LAYOUT)/lucky8.lh \ $(LAYOUT)/nfb96.lh \ $(LAYOUT)/pokonl97.lh \ - $(LAYOUT)/roypok96.lh + $(LAYOUT)/roypok96.lh \ + $(LAYOUT)/tonypok.lh $(DRIVERS)/grchamp.o: $(LAYOUT)/grchamp.lh -- cgit v1.2.3