From d41428ca6984406fb3b447a51fb7f67f6cdb4377 Mon Sep 17 00:00:00 2001 From: hap Date: Sun, 6 Aug 2023 03:12:01 +0200 Subject: tugboat: assume vblank goes to pia1 like on calomega --- src/mame/misc/calomega.cpp | 14 +++++++------- src/mame/misc/tugboat.cpp | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/mame/misc/calomega.cpp b/src/mame/misc/calomega.cpp index 038ff6bd356..a92b8f01a63 100644 --- a/src/mame/misc/calomega.cpp +++ b/src/mame/misc/calomega.cpp @@ -5712,7 +5712,7 @@ ROM_END -/****************** Unofficial / 3rd part games *****************/ +/****************** Unofficial / 3rd party games *****************/ /* @@ -6154,14 +6154,14 @@ GAMEL( 1985, comg272a, 0, sys903kb, keno_903, calomega_state, empty_init, GAMEL( 1985, comg272b, 0, sys903kb, keno_903, calomega_state, empty_init, ROT0, "Cal Omega Inc.", "Cal Omega - Game 27.2 (Keno, gaming)", MACHINE_SUPPORTS_SAVE, layout_kenokb ) //************ Diagnostic Sets ************ -GAME( 198?, comg903d, 0, sys903, stand903, calomega_state, empty_init, ROT0, "Cal Omega Inc.", "Cal Omega - System 903 Diag.PROM", MACHINE_SUPPORTS_SAVE ) -GAME( 198?, comg905d, 0, sys905, stand905, calomega_state, empty_init, ROT0, "Cal Omega Inc.", "Cal Omega - System 905 Diag.PROM", MACHINE_SUPPORTS_SAVE ) +GAME( 198?, comg903d, 0, sys903, stand903, calomega_state, empty_init, ROT0, "Cal Omega Inc.", "Cal Omega - System 903 Diag.PROM", MACHINE_SUPPORTS_SAVE ) +GAME( 198?, comg905d, 0, sys905, stand905, calomega_state, empty_init, ROT0, "Cal Omega Inc.", "Cal Omega - System 905 Diag.PROM", MACHINE_SUPPORTS_SAVE ) //************* 906-III games ************** -GAME( 1988, comg5107, 0, sys906, stand906, calomega_state, empty_init, ROT0, "Casino Electronics Inc.", "CEI 51.07 (CEI 906-III Poker)", MACHINE_SUPPORTS_SAVE ) -GAME( 1988, comg5108, 0, sys906, stand906, calomega_state, empty_init, ROT0, "Casino Electronics Inc.", "CEI 51.08 (CEI 906-III Poker)", MACHINE_SUPPORTS_SAVE ) +GAME( 1988, comg5107, 0, sys906, stand906, calomega_state, empty_init, ROT0, "Casino Electronics Inc.", "CEI 51.07 (CEI 906-III Poker)", MACHINE_SUPPORTS_SAVE ) +GAME( 1988, comg5108, 0, sys906, stand906, calomega_state, empty_init, ROT0, "Casino Electronics Inc.", "CEI 51.08 (CEI 906-III Poker)", MACHINE_SUPPORTS_SAVE ) -//****** Unofficial 903/904/905 3rd part games ******* +//****** Unofficial 903/904/905 3rd party games ******* GAME( 1982, elgrande, 0, s903mod, elgrande, calomega_state, empty_init, ROT0, "Tuni Electro Service", "El Grande - 5 Card Draw (New)", MACHINE_SUPPORTS_SAVE ) GAME( 1983, jjpoker, 0, s903mod, jjpoker, calomega_state, empty_init, ROT0, "Enter-Tech, Ltd.", "Jackpot Joker Poker (set 1)", MACHINE_SUPPORTS_SAVE ) GAME( 1983, jjpokerb, jjpoker, s903mod, jjpoker, calomega_state, empty_init, ROT0, "Enter-Tech, Ltd.", "Jackpot Joker Poker (set 2)", MACHINE_SUPPORTS_SAVE ) @@ -6169,7 +6169,7 @@ GAME( 1988, ssipkr24, 0, s903mod, ssipkr, calomega_state, empty_init, GAME( 1988, ssipkr30, ssipkr24, s903mod, ssipkr, calomega_state, empty_init, ROT0, "SSI", "SSI Poker (v3.0)", MACHINE_SUPPORTS_SAVE ) GAME( 1990, ssipkr40, ssipkr24, s903mod, ssipkr, calomega_state, empty_init, ROT0, "SSI", "SSI Poker (v4.0)", MACHINE_SUPPORTS_SAVE ) -//****** Unofficial 906-III family 3rd part games ******* +//****** Unofficial 906-III family 3rd party games ******* GAME( 1990, cas21iwc, 0, sys906, cas21iwc, calomega_state, empty_init, ROT0, "UCMC/IWC", "Casino 21 UCMC/IWC (ver 30.08)", MACHINE_SUPPORTS_SAVE ) GAME( 1991, pokeriwc, 0, sys906, pokeriwc, calomega_state, empty_init, ROT0, "UCMC/IWC", "Poker UCMC/IWC (ver 162.03)", MACHINE_SUPPORTS_SAVE ) GAME( 1991, pokiwc162, pokeriwc, sys906, pokeriwc, calomega_state, empty_init, ROT0, "UCMC/IWC", "Poker UCMC/IWC (ver 162.03 20-6-91)", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/misc/tugboat.cpp b/src/mame/misc/tugboat.cpp index 84eb3b836b6..9dc690620ae 100644 --- a/src/mame/misc/tugboat.cpp +++ b/src/mame/misc/tugboat.cpp @@ -2,7 +2,7 @@ // copyright-holders:Ryan Holtz /******************************************************************************* -Enter-Tech Tugboat (Moppet Video hardware) +Enter-Tech Tugboat (Moppet Video series, on improved El Grande hardware) 6502 hooked up + preliminary video by Ryan Holtz TODO: @@ -13,7 +13,7 @@ TODO: with IRQ timing that causes it to dislike how tugboat does it? - colors might not be entirely accurate Suspect berenstn is using the wrong color PROM. -- convert to use the HD46505 device, it has two. +- convert to use the HD46505 device, it has two? Be careful modifying IRQ timing, otherwise controls in tugboat won't work properly, noticeable on the 2nd level. @@ -421,14 +421,16 @@ void tugboat_state::tugboat(machine_config &config) PIA6821(config, m_pia[1]); m_pia[1]->readpa_handler().set_ioport("DSW"); m_pia[1]->writepb_handler().set(FUNC(tugboat_state::control1_w)); + m_pia[1]->cb2_handler().set_nop(); + m_pia[1]->irqb_handler().set_inputline(m_maincpu, INPUT_LINE_NMI); + m_pia[1]->irqb_handler().append_inputline(m_maincpu, 0); // video hardware SCREEN(config, m_screen, SCREEN_TYPE_RASTER); m_screen->set_raw(10_MHz_XTAL/2, 320, 8, 248, 264, 8, 240); m_screen->set_screen_update(FUNC(tugboat_state::screen_update)); m_screen->set_palette(m_palette); - m_screen->screen_vblank().set_inputline(m_maincpu, INPUT_LINE_NMI); - m_screen->screen_vblank().append_inputline(m_maincpu, 0, HOLD_LINE); + m_screen->screen_vblank().set(m_pia[1], FUNC(pia6821_device::cb1_w)); m_screen->screen_vblank().append(FUNC(tugboat_state::tugboat_vblank_w)); GFXDECODE(config, m_gfxdecode, m_palette, gfx_tugboat); @@ -445,9 +447,7 @@ void tugboat_state::noahsark(machine_config &config) tugboat(config); // video hardware - m_screen->set_video_attributes(0); - m_screen->screen_vblank().set_inputline(m_maincpu, INPUT_LINE_NMI); - m_screen->screen_vblank().append_inputline(m_maincpu, 0, HOLD_LINE); + m_screen->screen_vblank().set(m_pia[1], FUNC(pia6821_device::cb1_w)); m_screen->screen_vblank().append(FUNC(tugboat_state::noahsark_vblank_w)); } -- cgit v1.2.3