From 9b8bba9fdaf855009937a7e98addf3e41db88281 Mon Sep 17 00:00:00 2001 From: Dirk Best Date: Fri, 2 Aug 2024 13:17:57 +0200 Subject: nightgal.cpp: Inputs cleanup --- src/mame/nichibutsu/nbmj8688.cpp | 16 +++--- src/mame/nichibutsu/nightgal.cpp | 115 ++++++++++++++++----------------------- src/mame/nichibutsu/pastelg.cpp | 2 +- 3 files changed, 57 insertions(+), 76 deletions(-) diff --git a/src/mame/nichibutsu/nbmj8688.cpp b/src/mame/nichibutsu/nbmj8688.cpp index b436d3946ad..9fb8aeaed47 100644 --- a/src/mame/nichibutsu/nbmj8688.cpp +++ b/src/mame/nichibutsu/nbmj8688.cpp @@ -3937,28 +3937,28 @@ ROM_END /* 8-bit palette */ -GAME( 1986, crystalg, 0, crystalg, crystalg, nbmj8688_state, empty_init, ROT0, "Nichibutsu", "Crystal Gal (Japan 860512)", MACHINE_SUPPORTS_SAVE ) +GAME( 1986, crystalg, 0, crystalg, crystalg, nbmj8688_state, empty_init, ROT0, "Nichibutsu", "Crystal Gal (Japan 860512)", MACHINE_SUPPORTS_SAVE ) // クリスタルギャル GAME( 1986, crystal2, 0, crystal2, crystal2, nbmj8688_state, empty_init, ROT0, "Nichibutsu", "Crystal Gal 2 (Japan 860620)", MACHINE_SUPPORTS_SAVE ) -GAME( 1986, nightlov, 0, nightlov, nightlov, nbmj8688_state, empty_init, ROT0, "Central Denshi", "Night Love (Japan 860705)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) -GAME( 1986, apparel, 0, apparel, apparel, nbmj8688_state, empty_init, ROT0, "Central Denshi", "Apparel Night (Japan 860929)", MACHINE_SUPPORTS_SAVE ) +GAME( 1986, nightlov, 0, nightlov, nightlov, nbmj8688_state, empty_init, ROT0, "Central Denshi", "Night Love (Japan 860705)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) // ナイトラブ +GAME( 1986, apparel, 0, apparel, apparel, nbmj8688_state, empty_init, ROT0, "Central Denshi", "Apparel Night (Japan 860929)", MACHINE_SUPPORTS_SAVE ) // アパレルナイト GAME( 1988, bikkuri, 0, bikkuri, bikkuri, nbmj8688_state, empty_init, ROT0, "Nichibutsu", "Bikkuri Pro Wrestling (Japan 881221, Ver 1.05)", MACHINE_SUPPORTS_SAVE ) /* hybrid 12-bit palette */ -GAME( 1986, citylove, 0, citylove, citylove, nbmj8688_state, empty_init, ROT0, "Nichibutsu", "City Love (Japan 860908)", MACHINE_SUPPORTS_SAVE ) +GAME( 1986, citylove, 0, citylove, citylove, nbmj8688_state, empty_init, ROT0, "Nichibutsu", "City Love (Japan 860908)", MACHINE_SUPPORTS_SAVE ) // シティラブ GAME( 1986, mcitylov, citylove, mcitylov, mcitylov, nbmj8688_state, empty_init, ROT0, "Nichibutsu", "City Love (Japan 860904, medal)", MACHINE_SUPPORTS_SAVE ) -GAME( 1986, secolove, 0, secolove, secolove, nbmj8688_state, empty_init, ROT0, "Nichibutsu", "Second Love (Japan 861201)", MACHINE_SUPPORTS_SAVE ) +GAME( 1986, secolove, 0, secolove, secolove, nbmj8688_state, empty_init, ROT0, "Nichibutsu", "Second Love (Japan 861201)", MACHINE_SUPPORTS_SAVE ) // セカンドラブ GAME( 1988, barline, 0, barline, barline, nbmj8688_state, empty_init, ROT180, "Nichibutsu", "Barline (Japan?)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) /* hybrid 16-bit palette */ GAME( 1987, seiha, 0, seiha, seiha, nbmj8688_state, empty_init, ROT0, "Nichibutsu", "Seiha (Japan 870725)", MACHINE_SUPPORTS_SAVE ) GAME( 1987, seiham, seiha, seiham, seiham, nbmj8688_state, empty_init, ROT0, "Nichibutsu", "Seiha (Japan 870723, medal)", MACHINE_SUPPORTS_SAVE ) GAME( 1987, mjgaiden, 0, mjgaiden, ojousan, nbmj8688_state, empty_init, ROT0, "Central Denshi", "Mahjong Gaiden (Japan 870803)", MACHINE_SUPPORTS_SAVE ) -GAME( 1987, iemoto, 0, iemoto, iemoto, nbmj8688_state, empty_init, ROT0, "Nichibutsu", "Iemoto (Japan 871020)", MACHINE_SUPPORTS_SAVE ) +GAME( 1987, iemoto, 0, iemoto, iemoto, nbmj8688_state, empty_init, ROT0, "Nichibutsu", "Iemoto (Japan 871020)", MACHINE_SUPPORTS_SAVE ) // 家元 GAME( 1987, iemotom, iemoto, iemotom, iemotom, nbmj8688_state, empty_init, ROT0, "Nichibutsu", "Iemoto (Japan 871118, medal)", MACHINE_SUPPORTS_SAVE ) GAME( 1987, ryuuha, iemoto, ryuuha, ryuuha, nbmj8688_state, empty_init, ROT0, "Central Denshi", "Ryuuha (Japan 871027)", MACHINE_SUPPORTS_SAVE ) GAME( 1987, ojousan, 0, ojousan, ojousan, nbmj8688_state, empty_init, ROT0, "Nichibutsu", "Ojousan (Japan 871204)", MACHINE_SUPPORTS_SAVE ) GAME( 1987, ojousanm, ojousan, ojousanm, ojousanm, nbmj8688_state, empty_init, ROT0, "Nichibutsu", "Ojousan (Japan 870108, medal)", MACHINE_SUPPORTS_SAVE ) -GAME( 1987, swinggal, 0, swinggal, ryuuha, nbmj8688_state, empty_init, ROT0, "Digital Denshi", "Swing Gal (Japan 871221)", MACHINE_SUPPORTS_SAVE ) +GAME( 1987, swinggal, 0, swinggal, ryuuha, nbmj8688_state, empty_init, ROT0, "Digital Denshi", "Swing Gal (Japan 871221)", MACHINE_SUPPORTS_SAVE ) // スウィングギャル GAME( 1988, korinai, 0, korinai, korinai, nbmj8688_state, empty_init, ROT0, "Nichibutsu", "Mahjong-zukino Korinai Menmen (Japan 880425)", MACHINE_SUPPORTS_SAVE ) GAME( 1988, korinaim, korinai, korinaim, korinaim, nbmj8688_state, empty_init, ROT0, "Nichibutsu", "Mahjong-zukino Korinai Menmen (Japan 880920, medal)", MACHINE_SUPPORTS_SAVE ) @@ -3986,5 +3986,5 @@ GAME( 1988, mjsikakb, mjsikaku, mjsikaku, mjsikaku, nbmj8688_state, empty GAME( 1988, mjsikakc, mjsikaku, mjsikaku, mjsikaku, nbmj8688_state, empty_init, ROT0, "Nichibutsu", "Mahjong Shikaku (Japan 880806)", MACHINE_SUPPORTS_SAVE ) GAME( 1988, mjsikakd, mjsikaku, mjsikaku, mjsikaku, nbmj8688_state, empty_init, ROT0, "Nichibutsu", "Mahjong Shikaku (Japan 880802)", MACHINE_SUPPORTS_SAVE ) GAME( 1988, mmsikaku, mjsikaku, mmsikaku, mmsikaku, nbmj8688_state, empty_init, ROT0, "Nichibutsu", "Mahjong Shikaku (Japan 880929, medal)", MACHINE_SUPPORTS_SAVE ) -GAME( 1988, otonano, 0, otonano, otonano, nbmj8688_state, empty_init, ROT0, "Apple", "Otona no Mahjong (Japan 880628)", MACHINE_SUPPORTS_SAVE ) +GAME( 1988, otonano, 0, otonano, otonano, nbmj8688_state, empty_init, ROT0, "Apple", "Otona no Mahjong (Japan 880628)", MACHINE_SUPPORTS_SAVE ) // おとなの麻雀 GAME( 1988, mjcamera, 0, mjcamera, mjcamera, nbmj8688_state, init_mjcamera, ROT0, "Miki Syouji", "Mahjong Camera Kozou (set 1) (Japan 881109)", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/nichibutsu/nightgal.cpp b/src/mame/nichibutsu/nightgal.cpp index 067c69140da..0821c8da9ce 100644 --- a/src/mame/nichibutsu/nightgal.cpp +++ b/src/mame/nichibutsu/nightgal.cpp @@ -1,5 +1,5 @@ -// license:BSD-3-Clause -// copyright-holders:Angelo Salese, David Haywood +// license: BSD-3-Clause +// copyright-holders: Angelo Salese, David Haywood // thanks-to: Charles MacDonald /******************************************************************************************* @@ -52,18 +52,8 @@ public: m_audiocpu(*this, "audiocpu"), m_io_cr_clear(*this, "CR_CLEAR"), m_io_coins(*this, "COINS"), - m_io_pl1_1(*this, "PL1_1"), - m_io_pl1_2(*this, "PL1_2"), - m_io_pl1_3(*this, "PL1_3"), - m_io_pl1_4(*this, "PL1_4"), - m_io_pl1_5(*this, "PL1_5"), - m_io_pl1_6(*this, "PL1_6"), - m_io_pl2_1(*this, "PL2_1"), - m_io_pl2_2(*this, "PL2_2"), - m_io_pl2_3(*this, "PL2_3"), - m_io_pl2_4(*this, "PL2_4"), - m_io_pl2_5(*this, "PL2_5"), - m_io_pl2_6(*this, "PL2_6"), + m_io_pl1(*this, "PL1_%u", 1U), + m_io_pl2(*this, "PL2_%u", 1U), m_io_system(*this, "SYSTEM"), m_io_dswa(*this, "DSWA"), m_io_dswb(*this, "DSWB"), @@ -132,18 +122,8 @@ private: required_ioport m_io_cr_clear; required_ioport m_io_coins; - required_ioport m_io_pl1_1; - required_ioport m_io_pl1_2; - required_ioport m_io_pl1_3; - required_ioport m_io_pl1_4; - required_ioport m_io_pl1_5; - required_ioport m_io_pl1_6; - required_ioport m_io_pl2_1; - required_ioport m_io_pl2_2; - required_ioport m_io_pl2_3; - required_ioport m_io_pl2_4; - required_ioport m_io_pl2_5; - required_ioport m_io_pl2_6; + required_ioport_array<6> m_io_pl1; + required_ioport_array<6> m_io_pl2; required_ioport m_io_system; required_ioport m_io_dswa; required_ioport m_io_dswb; @@ -302,46 +282,37 @@ void nightgal_state::royalqn_comm_w(offs_t offset, uint8_t data) void nightgal_state::mux_w(uint8_t data) { - m_mux_data = ~data; - //printf("%02x\n", m_mux_data); + m_mux_data = data; } uint8_t nightgal_state::input_1p_r() { - uint8_t cr_clear = m_io_cr_clear->read(); + uint8_t data = 0xff; - switch (m_mux_data) - { - case 0x01: return m_io_pl1_1->read() | cr_clear; - case 0x02: return m_io_pl1_2->read() | cr_clear; - case 0x04: return m_io_pl1_3->read() | cr_clear; - case 0x08: return m_io_pl1_4->read() | cr_clear; - case 0x10: return m_io_pl1_5->read() | cr_clear; - case 0x20: return m_io_pl1_6->read() | cr_clear; - } - //printf("%04x\n", m_mux_data); + // mahjong inputs depending on mux + for (unsigned i = 0; i < 6; i++) + if (BIT(m_mux_data, i) == 0) + data &= m_io_pl1[i]->read(); + + // credit clear buttons are always read + data &= m_io_cr_clear->read(); - return (m_io_pl1_1->read() & m_io_pl1_2->read() & m_io_pl1_3->read() & - m_io_pl1_4->read() & m_io_pl1_5->read() & m_io_pl1_6->read()) | cr_clear; + return data; } uint8_t nightgal_state::input_2p_r() { - uint8_t coin_port = m_io_coins->read(); + uint8_t data = 0xff; - switch (m_mux_data) - { - case 0x01: return m_io_pl2_1->read() | coin_port; - case 0x02: return m_io_pl2_2->read() | coin_port; - case 0x04: return m_io_pl2_3->read() | coin_port; - case 0x08: return m_io_pl2_4->read() | coin_port; - case 0x10: return m_io_pl2_5->read() | coin_port; - case 0x20: return m_io_pl2_6->read() | coin_port; - } - //printf("%04x\n", m_mux_data); + // mahjong inputs depending on mux + for (unsigned i = 0; i < 6; i++) + if (BIT(m_mux_data, i) == 0) + data &= m_io_pl2[i]->read(); - return (m_io_pl2_1->read() & m_io_pl2_2->read() & m_io_pl2_3->read() & - m_io_pl2_4->read() & m_io_pl2_5->read() & m_io_pl2_6->read()) | coin_port; + // coin inputs are always read + data &= m_io_coins->read(); + + return data; } void nightgal_state::output_w(uint8_t data) @@ -532,14 +503,12 @@ void nightgal_state::royalqn_nsc_map(address_map &map) static INPUT_PORTS_START( sexygal ) PORT_START("CR_CLEAR") - PORT_DIPNAME( 0x40, 0x40, "Credit Clear-1" )//button - PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x80, 0x80, "Credit Clear-2" )//button - PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_BIT( 0x3f, IP_ACTIVE_LOW, IPT_CUSTOM ) // multiplexed mahjong inputs + PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Credit Clear P1") + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Credit Clear P2") PORT_START("COINS") + PORT_BIT( 0x3f, IP_ACTIVE_LOW, IPT_CUSTOM ) // multiplexed mahjong inputs PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 ) //player-1 side PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 ) //player-2 side @@ -550,6 +519,7 @@ static INPUT_PORTS_START( sexygal ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_M ) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_KAN ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START1 ) + PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_CUSTOM ) PORT_START("PL1_2") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B ) @@ -558,6 +528,7 @@ static INPUT_PORTS_START( sexygal ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_N ) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_REACH ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET ) PORT_CODE(KEYCODE_3)//rate button + PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_CUSTOM ) PORT_START("PL1_3") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C ) @@ -566,6 +537,7 @@ static INPUT_PORTS_START( sexygal ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_CHI ) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_RON ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNUSED ) //another D button + PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_CUSTOM ) PORT_START("PL1_4") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D ) @@ -573,6 +545,7 @@ static INPUT_PORTS_START( sexygal ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_PON ) PORT_BIT( 0x30, IP_ACTIVE_LOW, IPT_UNUSED ) //another opt 1 button + PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_CUSTOM ) PORT_START("PL1_5") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE ) @@ -581,11 +554,13 @@ static INPUT_PORTS_START( sexygal ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP ) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("1P Option 3") PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("1P Option 4") + PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_CUSTOM ) PORT_START("PL1_6") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("1P Pass") //??? PORT_BIT( 0x3c, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_CUSTOM ) PORT_START("PL2_1") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A ) PORT_PLAYER(2) @@ -594,6 +569,7 @@ static INPUT_PORTS_START( sexygal ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_M ) PORT_PLAYER(2) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_KAN ) PORT_PLAYER(2) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START2 ) + PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_CUSTOM ) PORT_START("PL2_2") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B ) PORT_PLAYER(2) @@ -602,6 +578,7 @@ static INPUT_PORTS_START( sexygal ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_N ) PORT_PLAYER(2) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_REACH ) PORT_PLAYER(2) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET ) PORT_CODE(KEYCODE_4) PORT_PLAYER(2)//rate button + PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_CUSTOM ) PORT_START("PL2_3") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C ) PORT_PLAYER(2) @@ -610,6 +587,7 @@ static INPUT_PORTS_START( sexygal ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_CHI ) PORT_PLAYER(2) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_RON ) PORT_PLAYER(2) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNUSED ) //another D button + PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_CUSTOM ) PORT_START("PL2_4") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D ) PORT_PLAYER(2) @@ -617,6 +595,7 @@ static INPUT_PORTS_START( sexygal ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L ) PORT_PLAYER(2) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_PON ) PORT_PLAYER(2) PORT_BIT( 0x30, IP_ACTIVE_LOW, IPT_UNUSED ) //another opt 1 button + PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_CUSTOM ) PORT_START("PL2_5") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE ) PORT_PLAYER(2) @@ -625,11 +604,13 @@ static INPUT_PORTS_START( sexygal ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP ) PORT_PLAYER(2) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("2P Option 3") PORT_PLAYER(2) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("2P Option 4") PORT_PLAYER(2) + PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_CUSTOM ) PORT_START("PL2_6") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("2P Pass") PORT_PLAYER(2) //??? PORT_BIT( 0x3c, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_CUSTOM ) PORT_START("SYSTEM") PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_GAMBLE_PAYOUT ) PORT_CODE(KEYCODE_BACKSPACE) PORT_NAME("Option 0 - Payout") @@ -1322,14 +1303,14 @@ void nightgal_state::init_ngalsumr() /* Type 1 HW */ -GAME( 1984, nightgal, 0, royalqn, sexygal, nightgal_state, empty_init, ROT0, "Nichibutsu", "Night Gal (Japan 840920 AG 1-00)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) -GAME( 1984, ngtbunny, 0, royalqn, sexygal, nightgal_state, empty_init, ROT0, "Nichibutsu", "Night Bunny (Japan 840601 MRN 2-10)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) -GAME( 1984, royalngt, ngtbunny, royalqn, sexygal, nightgal_state, empty_init, ROT0, "Royal Denshi", "Royal Night (Japan 840220 RN 2-00)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) -GAME( 1984, royalqn, 0, royalqn, sexygal, nightgal_state, init_royalqn, ROT0, "Royal Denshi", "Royal Queen (Japan 841010 RQ 0-07)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) +GAME( 1984, nightgal, 0, royalqn, sexygal, nightgal_state, empty_init, ROT0, "Nichibutsu", "Night Gal (Japan 840920 AG 1-00)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) // ナイトギャル +GAME( 1984, ngtbunny, 0, royalqn, sexygal, nightgal_state, empty_init, ROT0, "Nichibutsu", "Night Bunny (Japan 840601 MRN 2-10)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) // ナイトバニー +GAME( 1984, royalngt, ngtbunny, royalqn, sexygal, nightgal_state, empty_init, ROT0, "Royal Denshi", "Royal Night (Japan 840220 RN 2-00)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) // ロイヤルナイト +GAME( 1984, royalqn, 0, royalqn, sexygal, nightgal_state, init_royalqn, ROT0, "Royal Denshi", "Royal Queen (Japan 841010 RQ 0-07)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) // ロイヤルクイーン /* Type 2 HW */ -GAME( 1985, sexygal, 0, sexygal, sexygal, nightgal_state, empty_init, ROT0, "Nichibutsu", "Sexy Gal (Japan 850501 SXG 1-00)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) -GAME( 1985, sweetgal, sexygal, sweetgal, sexygal, nightgal_state, empty_init, ROT0, "Nichibutsu", "Sweet Gal (Japan 850510 SWG 1-02)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) +GAME( 1985, sexygal, 0, sexygal, sexygal, nightgal_state, empty_init, ROT0, "Nichibutsu", "Sexy Gal (Japan 850501 SXG 1-00)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) // セクシーギャル +GAME( 1985, sweetgal, sexygal, sweetgal, sexygal, nightgal_state, empty_init, ROT0, "Nichibutsu", "Sweet Gal (Japan 850510 SWG 1-02)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) // スイートギャル /* Type 3 HW */ -GAME( 1985, ngalsumr, 0, ngalsumr, sexygal, nightgal_state, init_ngalsumr, ROT0, "Nichibutsu", "Night Gal Summer (Japan 850702 NGS 0-01)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_UNEMULATED_PROTECTION | MACHINE_SUPPORTS_SAVE ) +GAME( 1985, ngalsumr, 0, ngalsumr, sexygal, nightgal_state, init_ngalsumr, ROT0, "Nichibutsu", "Night Gal Summer (Japan 850702 NGS 0-01)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_UNEMULATED_PROTECTION | MACHINE_SUPPORTS_SAVE ) // ナイトギャルサマー /* Type 4 HW */ GAME( 1985, sgaltrop, 0, sgaltrop, sexygal, nightgal_state, empty_init, ROT0, "Nichibutsu", "Sexy Gal Tropical (Japan 850805 SXG T-02)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/nichibutsu/pastelg.cpp b/src/mame/nichibutsu/pastelg.cpp index d9bceac8321..14799f4863a 100644 --- a/src/mame/nichibutsu/pastelg.cpp +++ b/src/mame/nichibutsu/pastelg.cpp @@ -944,7 +944,7 @@ ROM_END } // anonymous namespace -GAME( 1985, pastelg, 0, pastelg, pastelg, pastelg_state, empty_init, ROT0, "Nichibutsu", "Pastel Gal (Japan 851224)", MACHINE_SUPPORTS_SAVE ) +GAME( 1985, pastelg, 0, pastelg, pastelg, pastelg_state, empty_init, ROT0, "Nichibutsu", "Pastel Gal (Japan 851224)", MACHINE_SUPPORTS_SAVE ) // パステルギャル GAME( 1985, threeds, 0, threeds, threeds, threeds_state, empty_init, ROT0, "Nichibutsu", "Three Ds - Three Dealers Casino House (set 1)", MACHINE_SUPPORTS_SAVE ) GAME( 1985, threedsa, threeds, threeds, threeds, threeds_state, empty_init, ROT0, "Nichibutsu", "Three Ds - Three Dealers Casino House (set 2)", MACHINE_SUPPORTS_SAVE ) GAME( 1985, galds, threeds, threeds, galds, threeds_state, empty_init, ROT0, "Nihon System Corp.", "Gals Ds - Three Dealers Casino House (bootleg?)", MACHINE_SUPPORTS_SAVE ) -- cgit v1.2.3