From 0b317a458bf9c4809406d4826e6d88c09e8ae9c0 Mon Sep 17 00:00:00 2001 From: AJR Date: Sun, 9 Jul 2017 03:29:53 -0400 Subject: [PATCH] freekick.cpp: Correct coin counter polarity; name config structures more consistently (nw) --- src/mame/drivers/freekick.cpp | 37 +++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/src/mame/drivers/freekick.cpp b/src/mame/drivers/freekick.cpp index 0b19d5cafbb..df140f5a77e 100644 --- a/src/mame/drivers/freekick.cpp +++ b/src/mame/drivers/freekick.cpp @@ -75,7 +75,7 @@ WRITE8_MEMBER(freekick_state::flipscreen_w) WRITE8_MEMBER(freekick_state::coin_w) { - machine().bookkeeping().coin_counter_w(offset, ~data & 1); + machine().bookkeeping().coin_counter_w(offset, data & 1); } WRITE8_MEMBER(freekick_state::spinner_select_w) @@ -222,7 +222,7 @@ static ADDRESS_MAP_START( decrypted_opcodes_map, AS_OPCODES, 8, freekick_state ) AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1d") ADDRESS_MAP_END -static ADDRESS_MAP_START( freekickb_map, AS_PROGRAM, 8, freekick_state ) +static ADDRESS_MAP_START( freekick_map, AS_PROGRAM, 8, freekick_state ) AM_RANGE(0x0000, 0xcfff) AM_ROM AM_RANGE(0xd000, 0xdfff) AM_RAM AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(freek_videoram_w) AM_SHARE("videoram") // tilemap @@ -282,7 +282,7 @@ static ADDRESS_MAP_START( oigas_io_map, AS_IO, 8, freekick_state ) AM_RANGE(0x05, 0x05) AM_WRITE(oigas_5_w) ADDRESS_MAP_END -static ADDRESS_MAP_START( freekickb_io_map, AS_IO, 8, freekick_state ) +static ADDRESS_MAP_START( freekick_io_map, AS_IO, 8, freekick_state ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0xff, 0xff) AM_READWRITE(freekick_ff_r, freekick_ff_w) ADDRESS_MAP_END @@ -485,7 +485,7 @@ static INPUT_PORTS_START( omega ) PORT_DIPSETTING( 0x00, "On Setting 3" ) INPUT_PORTS_END -static INPUT_PORTS_START( freekck ) +static INPUT_PORTS_START( freekick ) PORT_START("DSW1") PORT_DIPNAME( 0x01, 0x01, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW1:1") PORT_DIPSETTING( 0x01, "3" ) @@ -588,7 +588,7 @@ static INPUT_PORTS_START( freekck ) INPUT_PORTS_END static INPUT_PORTS_START( countrun ) - PORT_INCLUDE( freekck ) + PORT_INCLUDE( freekick ) PORT_MODIFY("DSW1") PORT_DIPNAME( 0x01, 0x01, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW1:1") @@ -684,6 +684,9 @@ MACHINE_RESET_MEMBER(freekick_state,freekick) m_spinner = 0; m_nmi_en = 0; m_ff_data = 0; + + machine().bookkeeping().coin_counter_w(0, 0); + machine().bookkeeping().coin_counter_w(1, 0); } MACHINE_START_MEMBER(freekick_state,pbillrd) @@ -784,7 +787,7 @@ static MACHINE_CONFIG_DERIVED( pbillrd, base ) MCFG_MACHINE_RESET_OVERRIDE(freekick_state,freekick) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pbillrdm, pbillrd ) +static MACHINE_CONFIG_DERIVED( pbillrds, pbillrd ) MCFG_CPU_REPLACE("maincpu", MC8123, XTAL_12MHz/4) MCFG_CPU_PROGRAM_MAP(pbillrd_map) MCFG_CPU_DECRYPTED_OPCODES_MAP(decrypted_opcodes_map) @@ -792,12 +795,12 @@ static MACHINE_CONFIG_DERIVED( pbillrdm, pbillrd ) MCFG_CPU_VBLANK_INT_DRIVER("screen", freekick_state, freekick_irqgen) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( freekickb, base ) +static MACHINE_CONFIG_DERIVED( freekick, base ) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") - MCFG_CPU_PROGRAM_MAP(freekickb_map) - MCFG_CPU_IO_MAP(freekickb_io_map) + MCFG_CPU_PROGRAM_MAP(freekick_map) + MCFG_CPU_IO_MAP(freekick_io_map) MCFG_MACHINE_START_OVERRIDE(freekick_state,freekick) MCFG_MACHINE_RESET_OVERRIDE(freekick_state,freekick) @@ -1396,11 +1399,11 @@ GAME( 1986, omega, 0, omega, omega, freekick_state, gigas, GAME( 1987, pbillrd, 0, pbillrd, pbillrd, freekick_state, 0, ROT0, "Nihon System", "Perfect Billiard", MACHINE_SUPPORTS_SAVE ) GAME( 1987, pbillrds, pbillrd, pbillrdm, pbillrd, freekick_state, pbillrds, ROT0, "Nihon System", "Perfect Billiard (MC-8123, 317-0030)", MACHINE_SUPPORTS_SAVE ) GAME( 1987, pbillrdsa, pbillrd, pbillrdm, pbillrd, freekick_state, pbillrds, ROT0, "Nihon System", "Perfect Billiard (MC-8123, 317-5008)", MACHINE_SUPPORTS_SAVE ) // sticker on CPU module different (wrong?) functionality the same -GAME( 1987, freekick, 0, freekickb, freekck, freekick_state, 0, ROT270, "Nihon System (Merit license)", "Free Kick (NS6201-A 1987.10)", MACHINE_SUPPORTS_SAVE ) -GAME( 1987, freekicka, freekick, freekickb, freekck, freekick_state, 0, ROT270, "Nihon System", "Free Kick (NS6201-A 1987.9)", MACHINE_SUPPORTS_SAVE ) -GAME( 1987, freekickb1, freekick, freekickb, freekck, freekick_state, 0, ROT270, "bootleg", "Free Kick (bootleg set 1)", MACHINE_SUPPORTS_SAVE ) -GAME( 1987, freekickb2, freekick, freekickb, freekck, freekick_state, 0, ROT270, "bootleg", "Free Kick (bootleg set 2)", MACHINE_SUPPORTS_SAVE ) -GAME( 1987, freekickb3, freekick, freekickb, freekck, freekick_state, 0, ROT270, "bootleg", "Free Kick (bootleg set 3)", MACHINE_SUPPORTS_SAVE ) -GAME( 1988, countrun, 0, freekickb, countrun, freekick_state, 0, ROT0, "Nihon System (Sega license)", "Counter Run (NS6201-A 1988.3)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) // CPU module not dumped -GAME( 1988, countrunb, countrun, freekickb, countrun, freekick_state, 0, ROT0, "bootleg", "Counter Run (bootleg set 1)", MACHINE_SUPPORTS_SAVE ) -GAME( 1988, countrunb2, countrun, freekickb, countrun, freekick_state, 0, ROT0, "bootleg", "Counter Run (bootleg set 2)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) +GAME( 1987, freekick, 0, freekick, freekick, freekick_state, 0, ROT270, "Nihon System (Merit license)", "Free Kick (NS6201-A 1987.10)", MACHINE_SUPPORTS_SAVE ) +GAME( 1987, freekicka, freekick, freekick, freekick, freekick_state, 0, ROT270, "Nihon System", "Free Kick (NS6201-A 1987.9)", MACHINE_SUPPORTS_SAVE ) +GAME( 1987, freekickb1, freekick, freekick, freekick, freekick_state, 0, ROT270, "bootleg", "Free Kick (bootleg set 1)", MACHINE_SUPPORTS_SAVE ) +GAME( 1987, freekickb2, freekick, freekick, freekick, freekick_state, 0, ROT270, "bootleg", "Free Kick (bootleg set 2)", MACHINE_SUPPORTS_SAVE ) +GAME( 1987, freekickb3, freekick, freekick, freekick, freekick_state, 0, ROT270, "bootleg", "Free Kick (bootleg set 3)", MACHINE_SUPPORTS_SAVE ) +GAME( 1988, countrun, 0, freekick, countrun, freekick_state, 0, ROT0, "Nihon System (Sega license)", "Counter Run (NS6201-A 1988.3)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) // CPU module not dumped +GAME( 1988, countrunb, countrun, freekick, countrun, freekick_state, 0, ROT0, "bootleg", "Counter Run (bootleg set 1)", MACHINE_SUPPORTS_SAVE ) +GAME( 1988, countrunb2, countrun, freekick, countrun, freekick_state, 0, ROT0, "bootleg", "Counter Run (bootleg set 2)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )