diff options
| author | 2025-10-31 20:06:31 +0100 | |
|---|---|---|
| committer | 2025-10-31 20:06:31 +0100 | |
| commit | e95debb382be08f87c68dd883d8473bbf9b24f60 (patch) | |
| tree | a4d4458e01a43ff3207b13f396ee46d8551d0e4a | |
| parent | d437009a5cfd4ee59b1f41a4f9a05cd1ddffd98c (diff) | |
Added a new port to handle the Jackpot Knight reels background colors.
Added cherry Master 97 Double Up, Double Up Type, Show Girls, and
factory forced DIP switches.
Splitted inputs for Cherry Master 97 sets 2 & 3.
Readded removed games for unaccurate commit message, fixed in the previous one.
| -rw-r--r-- | src/mame/igs/goldstar.cpp | 54 | ||||
| -rw-r--r-- | src/mame/mame.lst | 3 |
2 files changed, 35 insertions, 22 deletions
diff --git a/src/mame/igs/goldstar.cpp b/src/mame/igs/goldstar.cpp index b8fa4f8f7ba..021424c99c0 100644 --- a/src/mame/igs/goldstar.cpp +++ b/src/mame/igs/goldstar.cpp @@ -1672,7 +1672,6 @@ uint32_t cmast97_state::screen_update_jpknight(screen_device &screen, bitmap_rgb uint32_t wingco_state::screen_update_lucky8(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) { bitmap.fill(rgb_t::black(), cliprect); - logerror("screen_update_jpknight:%02x\n", m_enable_reg); if (!(m_enable_reg & 0x01)) return 0; @@ -3903,6 +3902,8 @@ void cmast97_state::jpknight_portmap(address_map &map) map.global_mask(0xff); map(0x00, 0x00).lw8(NAME([this] (uint8_t data) { m_enable_reg = data; m_gfx_view.select(BIT(m_enable_reg, 4)); } )); map(0x01, 0x01).lw8(NAME([this] (uint8_t data) { m_tile_bank = (data & 0x0c) >> 2; if (data & 0xf3) logerror("unk tile bank w: %02x\n", data); })); + map(0x03, 0x03).lw8(NAME([this] (uint8_t data) { m_bgcolor = data & 0x03; } )); + map(0x09, 0x09).r("aysnd", FUNC(ay8910_device::data_r)); map(0x0a, 0x0b).w("aysnd", FUNC(ay8910_device::data_address_w)); map(0x0c, 0x0c).portr("DSW1"); @@ -6241,18 +6242,18 @@ static INPUT_PORTS_START( cmast97 ) PORT_INCLUDE( cmv4_service ) PORT_START("DSW1") - PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) PORT_DIPLOCATION("DSW1:1") - PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x02, 0x00, DEF_STR( Unknown ) ) PORT_DIPLOCATION("DSW1:2") - PORT_DIPSETTING( 0x02, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x01, 0x01, "Double Up Game" ) PORT_DIPLOCATION("DSW1:1") + PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x01, DEF_STR( On ) ) + PORT_DIPNAME( 0x02, 0x00, "Double Up Type" ) PORT_DIPLOCATION("DSW1:2") + PORT_DIPSETTING( 0x02, "Red / Black" ) + PORT_DIPSETTING( 0x00, "Big / Small" ) PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) ) PORT_DIPLOCATION("DSW1:3") PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) ) PORT_DIPLOCATION("DSW1:4") - PORT_DIPSETTING( 0x08, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x08, 0x08, "Double Up Girls" ) PORT_DIPLOCATION("DSW1:4") + PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x08, DEF_STR( On ) ) PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) ) PORT_DIPLOCATION("DSW1:5") PORT_DIPSETTING( 0x10, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -6371,6 +6372,21 @@ static INPUT_PORTS_START( cmast97 ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) INPUT_PORTS_END +static INPUT_PORTS_START( cmast97a ) + PORT_INCLUDE( cmast97 ) + + PORT_MODIFY("DSW1") + PORT_DIPNAME( 0x01, 0x01, "Double Up Game" ) PORT_DIPLOCATION("DSW1:1") + PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x01, DEF_STR( On ) ) + PORT_DIPNAME( 0x02, 0x02, "Double Up Type" ) PORT_DIPLOCATION("DSW1:2") + PORT_DIPSETTING( 0x02, "5 Cards" ) + PORT_DIPSETTING( 0x00, "3 Cards" ) + PORT_DIPNAME( 0x08, 0x00, "Always On" ) PORT_DIPLOCATION("DSW1:4") + PORT_DIPSETTING( 0x08, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) +INPUT_PORTS_END + static INPUT_PORTS_START( cmast99 ) PORT_START("IN0") // called "PLAYER" in input test @@ -8587,7 +8603,6 @@ static INPUT_PORTS_START( lucky8t ) INPUT_PORTS_END -#if 0 static INPUT_PORTS_START( cbonus ) PORT_INCLUDE( lucky8b ) @@ -8695,7 +8710,6 @@ static INPUT_PORTS_START( cbonus ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) INPUT_PORTS_END -#endif // no manual - best guesses static INPUT_PORTS_START( cbaai ) @@ -17842,7 +17856,6 @@ ROM_START( cmasterl ) // most similar to cmasterbv but without the extra ROM ROM_LOAD( "82s129.u46", 0x0000, 0x0100, CRC(50ec383b) SHA1(ae95b92bd3946b40134bcdc22708d5c6b0f4c23e) ) ROM_END -#if 0 // MB1 NHOLD // BET is the STOP ALL ROM_START( cmasterm ) @@ -17912,7 +17925,6 @@ ROM_START( cmastern ) ROM_REGION( 0x100, "proms2", 0 ) ROM_LOAD( "82s129.u46", 0x0000, 0x0100, CRC(50ec383b) SHA1(ae95b92bd3946b40134bcdc22708d5c6b0f4c23e) ) ROM_END -#endif /* @@ -21309,7 +21321,6 @@ ROM_START( cb2 ) // W4 base board + Dyna D8905 CPU board ROM_END -#if 0 /* Cherry Bonus チェリーボーナス (Cherī Bōnasu) @@ -21347,7 +21358,6 @@ ROM_START( cbonus ) ROM_REGION( 0x20, "unkprom2", 0 ) ROM_LOAD( "u1.bin", 0x0000, 0x0020, CRC(267004c8) SHA1(2c790e71b1c21961c5ced7b0ce8fbbb9fa5d806b) ) ROM_END -#endif /* W4 base board + CPU board. @@ -30046,8 +30056,8 @@ GAMEL( 1991, cmasteri, cmaster, cm, cmasterb, cmaster_state, init_cmv4 GAMEL( 1991, cmasterj, cmaster, cm, cmasterb, cmaster_state, init_cmv4, ROT0, "Dyna", "Cherry Master I (ver.1.01, set 10, BET stops all)", 0, layout_cmasterb ) GAMEL( 1991, cmasterk, cmaster, cm, cmasterb, cmaster_state, init_cmv4, ROT0, "Dyna", "Cherry Master I (ver.1.01, set 11, TAKE stops all)", 0, layout_cmasterb ) GAMEL( 1991, cmasterl, cmaster, cm, cmasterb, cmaster_state, init_cmv4, ROT0, "Dyna", "Cherry Master I (ver.1.01, set 12)", 0, layout_cmasterb ) -//GAMEL( 1991, cmasterm, cmaster, cm, cmasterb, cmaster_state, init_cmv4, ROT0, "Dyna", "Cherry Master I (ver.1.01, set 13, BET stops all)", 0, layout_cmasterb ) -//GAMEL( 1991, cmastern, cmaster, cm, cmasterb, cmaster_state, init_cmv4, ROT0, "Dyna", "Cherry Master I (ver.1.01, set 14, TAKE stops all)", 0, layout_cmasterb ) +GAMEL( 1991, cmasterm, cmaster, cm, cmasterb, cmaster_state, init_cmv4, ROT0, "Dyna", "Cherry Master I (ver.1.01, set 13, BET stops all)", 0, layout_cmasterb ) +GAMEL( 1991, cmastern, cmaster, cm, cmasterb, cmaster_state, init_cmv4, ROT0, "Dyna", "Cherry Master I (ver.1.01, set 14, TAKE stops all)", 0, layout_cmasterb ) GAMEL( 1991, skillmst, cmaster, cm, cmasterb, cmaster_state, init_cmv4, ROT0, "bootleg", "Skill Master (ver.fst v5.0)", 0, layout_cmasterb ) GAMEL( 1991, skillmsta, cmaster, cm, cmasterb, cmaster_state, init_cmv4, ROT0, "bootleg", "Skill Master (ver.fst v3.0)", 0, layout_cmasterb ) GAMEL( 1991, cutyline, 0, cm, cmasterb, cmaster_state, init_cmv4, ROT0, "Dyna", "Cuty Line (LC-88, ver.1.01)", 0, layout_cmasterb ) @@ -30104,8 +30114,8 @@ GAME( 1991, eldoraddo, eldoradd, eldoradd, cmast91, cmaster_state, empty_ini GAME( 1991, eldoraddob, eldoradd, eldoradd, cmast91, cmaster_state, empty_init, ROT0, "Dyna", "El Dorado (V2.0D)", MACHINE_NOT_WORKING ) // different GFX hw? GAME( 1991, eldoraddoc, eldoradd, eldoradd, cmast91, cmaster_state, empty_init, ROT0, "Dyna", "El Dorado (V1.1J)", MACHINE_NOT_WORKING ) // different GFX hw? GAMEL( 1996, cmast97, 0, cmast97, cmast97, cmast97_state, empty_init, ROT0, "Dyna", "Cherry Master '97 (V1.7, set 1)", 0, layout_cmast97 ) -GAMEL( 1997, cmast97a, cmast97, cmast97, cmast97, cmast97_state, empty_init, ROT0, "Dyna", "Cherry Master '97 (V1.7, set 2, no girls)", 0, layout_cmast97 ) -GAMEL( 1996, cmast97b, cmast97, cmast97, cmast97, cmast97_state, empty_init, ROT0, "Dyna", "Cherry Master '97 (V1.7, set 3, no girls)", 0, layout_cmast97 ) +GAMEL( 1997, cmast97a, cmast97, cmast97, cmast97a, cmast97_state, empty_init, ROT0, "Dyna", "Cherry Master '97 (V1.7, set 2, no girls)", 0, layout_cmast97 ) +GAMEL( 1996, cmast97b, cmast97, cmast97, cmast97a, cmast97_state, empty_init, ROT0, "Dyna", "Cherry Master '97 (V1.7, set 3, no girls)", 0, layout_cmast97 ) GAMEL( 1996, cmast97i, cmast97, cmast97, cmast97, cmast97_state, empty_init, ROT0, "Dyna", "Cheri Mondo '97 (V1.4I)", 0, layout_cmast97 ) GAME( 1997, jpknight, 0, jpknight, cmast97, cmast97_state, empty_init, ROT0, "Dyna / R-Stone", "Jackpot Knight (V1.1)", MACHINE_NOT_WORKING ) // check inputs GAME( 1999, cmast99, 0, cm, cmast99, cmaster_state, init_cmv4, ROT0, "Dyna", "Cherry Master '99 (V9B.00)", MACHINE_NOT_WORKING ) @@ -30165,8 +30175,8 @@ GAMEL( 1995, wcat3, 0, wcat3, wcat3, wingco_state, init_wcat GAMEL( 199?, animalw, 0, animalw, lucky8t, wingco_state, empty_init, ROT0, "GPS", "Animal Wonders (ver A900 66)", 0, layout_lucky8p1 ) // DIPs need to be checked GAMEL( 199?, animalwbl, animalw, lucky8t, lucky8t, wingco_state, empty_init, ROT0, "bootleg", "Animal Wonders (ver A900, bootleg)", 0, layout_lucky8p1 ) // DIPs need to be checked GAMEL( 1989, cb2, 0, lucky8, lucky8, wingco_state, init_cb2, ROT0, "Dyna", "Cherry Bonus II (V2.00 06/01)", 0, layout_lucky8 ) -//GAMEL( 1988, cbonus, 0, lucky8, cbonus, wingco_state, empty_init, ROT0, "Dyna", "Cherry Bonus (Dyna v1.01 20fev)", 0, layout_lucky8p1 ) // original dyna on wing board -GAMEL( 1990, cbaai, 0/*cbonus*/, cbaai, cbaai, wingco_state, init_cbaai, ROT0, "bootleg (A.A.I.)", "Cherry Bonus (A.A.I. bootleg)", 0, layout_lucky8p1 ) // jumps to 0xf430 where expects code +GAMEL( 1988, cbonus, 0, lucky8, cbonus, wingco_state, empty_init, ROT0, "Dyna", "Cherry Bonus (Dyna v1.01 20fev)", 0, layout_lucky8p1 ) // original dyna on wing board +GAMEL( 1990, cbaai, cbonus, cbaai, cbaai, wingco_state, init_cbaai, ROT0, "bootleg (A.A.I.)", "Cherry Bonus (A.A.I. bootleg)", 0, layout_lucky8p1 ) // jumps to 0xf430 where expects code GAMEL( 199?, ttactoe, 0, lucky8t, ttactoe, wingco_state, empty_init, ROT0, "bootleg (Sundance)","Tic Tac Toe (Sundance bootleg of New Lucky 8 Lines)", 0, layout_lucky8 ) // needs more DSW figured out GAME( 1995, superdrg, 0, superdrg, superdrg, wingco_state, empty_init, ROT0, "OCT", "Super Dragon (Ver 211)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS ) // " - SUPER DROGON 950828 211 (sic) diff --git a/src/mame/mame.lst b/src/mame/mame.lst index 77d861ec308..de0be0ecfe2 100644 --- a/src/mame/mame.lst +++ b/src/mame/mame.lst @@ -20590,6 +20590,7 @@ cb3h cb3micro cb3s51 cbaai +cbonus cherry96 cherry96a chry10 @@ -20628,6 +20629,8 @@ cmasteri cmasterj cmasterk cmasterl +cmasterm +cmastern cmezspin cmezspina cmezspinb |
