From c221257046db5a2fcc91f4fc99a3d7e6fa77c255 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Sat, 30 Jul 2022 20:48:59 +1000 Subject: igs/goldstar.cpp: Marked Tetris + Cherry master clones as clones. --- src/mame/igs/goldstar.cpp | 22 +++++++++++----------- src/mame/igs/goldstar.h | 4 ++-- src/mame/mame.lst | 8 ++++---- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/mame/igs/goldstar.cpp b/src/mame/igs/goldstar.cpp index 39ffcf02be0..8ec560e4104 100644 --- a/src/mame/igs/goldstar.cpp +++ b/src/mame/igs/goldstar.cpp @@ -194,7 +194,7 @@ Also there are some other calls to the same range, that also lack of code. - * Tetris + Cherry Master (+K, Canada Version, encrypted) (cmtetrsb) + * Tetris + Cherry Master (+K, Canada Version, encrypted) (cmtetrisb) Start the game and you can find some garbage due to wrong graphics banks. Press the key "insert" to throttle the game. Keep the key pressed till @@ -17258,7 +17258,7 @@ ROM_END PPI pin 19 (PB1), to switch to Cherry Master game. */ -ROM_START( cmtetrsa ) +ROM_START( cmtetrisa ) ROM_REGION( 0x20000, "maincpu", 0 ) ROM_LOAD( "cm89-tetri-9.u81", 0x10000, 0x10000, CRC(75e0c101) SHA1(6dc4f7c43f0f4e21d621f3c42cb1709d6b730c53) ) ROM_COPY( "maincpu", 0x1c000, 0x0000, 0x0800 ) /* src-dest-size */ // #01 @@ -17356,7 +17356,7 @@ ROM_END Need proper implementation. */ -ROM_START( cmtetrsb ) +ROM_START( cmtetrisb ) ROM_REGION( 0x10000, "maincpu", 0 ) ROM_LOAD( "9__canada_daughterboard.bin", 0x0000, 0x10000, CRC(9810b853) SHA1(cf1216414f93cc78c7c9e5a3998e8b162692e05e) ) @@ -17384,7 +17384,7 @@ ROM_START( cmtetrsb ) ROM_END -ROM_START( cmtetrsc ) // this set uses a standard Z80 + an Altera EPM7032LC +ROM_START( cmtetrisc ) // this set uses a standard Z80 + an Altera EPM7032LC ROM_REGION( 0x10000, "maincpu", 0 ) ROM_LOAD( "sub-pcb.bin", 0x00000, 0x10000, CRC(8e19fec2) SHA1(796746f8b4715b7a1c6324d7f9ff288aa7367026) ) @@ -17411,7 +17411,7 @@ ROM_START( cmtetrsc ) // this set uses a standard Z80 + an Altera EPM7032LC ROM_END -ROM_START( cmtetrsd ) // this set uses a standard Z80 + PLDs +ROM_START( cmtetrisd ) // this set uses a standard Z80 + PLDs ROM_REGION( 0x10000, "maincpu", 0 ) ROM_LOAD( "u81", 0x00000, 0x10000, CRC(7e16563b) SHA1(64b1f61e6203d39eb4c1e9876a34a2b67b57ed45) ) @@ -18818,7 +18818,7 @@ void cmaster_state::init_cmpacmanb() init_cm(); } -void cmaster_state::init_cmtetrsc() +void cmaster_state::init_cmtetrisc() { uint8_t *rom = memregion("maincpu")->base(); @@ -18828,7 +18828,7 @@ void cmaster_state::init_cmtetrsc() init_cm(); } -void cmaster_state::init_cmtetrsd() +void cmaster_state::init_cmtetrisd() { uint8_t *rom = memregion("maincpu")->base(); @@ -20036,10 +20036,10 @@ GAMEL( 198?, cmpacman, 0, cm, cmpacman, cmaster_state, init_cm, GAMEL( 198?, cmpacmana, cmpacman, cm, cmpacman, cmaster_state, init_cm, ROT0, "", "Super Pacman (v1.2) + Cherry Master (Corsica, v8.31, unencrypted, set 2)", 0, layout_cmpacman ) // need to press K to switch between games... GAMEL( 198?, cmpacmanb, cmpacman, cm, cmpacman, cmaster_state, init_cmpacmanb, ROT0, "", "Super Pacman (v1.2) + Cherry Master (Corsica, v8.31, encrypted)", 0, layout_cmpacman ) // need to press K to switch between games... GAMEL( 198?, cmtetris, 0, cm, cmtetris, cmaster_state, init_cm, ROT0, "", "Tetris + Cherry Master (Corsica, v8.01, unencrypted, set 1)", 0, layout_cmpacman ) // need to press K/L to switch between games... -GAMEL( 198?, cmtetrsa, 0, cm, cmtetris, cmaster_state, init_cm, ROT0, "", "Tetris + Cherry Master (Corsica, v8.01, unencrypted, set 2)", 0, layout_cmpacman ) -GAMEL( 198?, cmtetrsb, 0, cm, cmtetris, cmaster_state, init_cm, ROT0, "", "Tetris + Cherry Master (+K, Canada Version, encrypted)", MACHINE_NOT_WORKING, layout_cmpacman ) // different Tetris game. press insert to throttle and see the attract running. -GAMEL( 198?, cmtetrsc, 0, cm, cmtetris, cmaster_state, init_cmtetrsc, ROT0, "", "Tetris + Cherry Master (Corsica, v8.01, encrypted)", 0, layout_cmpacman ) -GAMEL( 198?, cmtetrsd, 0, cm, cmtetris, cmaster_state, init_cmtetrsd, ROT0, "bootleg (Aidonis Games)", "Tetris + Cherry Master (Aidonis Games bootleg)", 0, layout_cmpacman ) // seems to have been hacked to run the slot game as default, see 0x8ba8 +GAMEL( 198?, cmtetrisa, cmtetris, cm, cmtetris, cmaster_state, init_cm, ROT0, "", "Tetris + Cherry Master (Corsica, v8.01, unencrypted, set 2)", 0, layout_cmpacman ) +GAMEL( 198?, cmtetrisb, cmtetris, cm, cmtetris, cmaster_state, init_cm, ROT0, "", "Tetris + Cherry Master (+K, Canada Version, encrypted)", MACHINE_NOT_WORKING, layout_cmpacman ) // different Tetris game. press insert to throttle and see the attract running. +GAMEL( 198?, cmtetrisc, cmtetris, cm, cmtetris, cmaster_state, init_cmtetrisc, ROT0, "", "Tetris + Cherry Master (Corsica, v8.01, encrypted)", 0, layout_cmpacman ) +GAMEL( 198?, cmtetrisd, cmtetris, cm, cmtetris, cmaster_state, init_cmtetrisd, ROT0, "bootleg (Aidonis Games)", "Tetris + Cherry Master (Aidonis Games bootleg)", 0, layout_cmpacman ) // seems to have been hacked to run the slot game as default, see 0x8ba8 GAMEL( 1997, crazybon, 0, crazybon, crazybon, goldstar_state, empty_init, ROT0, "bootleg (Crazy Co.)", "Crazy Bonus 2002 (Ver. 1, set 1)", MACHINE_IMPERFECT_COLORS, layout_crazybon ) // Windows ME desktop... but not found the way to switch it. GAMEL( 1997, crazybona, crazybon, crazybon, crazybon, goldstar_state, empty_init, ROT0, "bootleg (Crazy Co.)", "Crazy Bonus 2002 (Ver. 1, set 2)", MACHINE_IMPERFECT_COLORS, layout_crazybon ) GAMEL( 1997, crazybonb, crazybon, crazybonb, pkrmast, goldstar_state, init_crazybonb, ROT0, "bootleg (TV Games)", "Crazy Bonus 2002 (Ver. 1, set 3)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_COLORS, layout_crazybon ) // F.B. & POKER 94, VER.1 in NVRAM, decryption seems ok, possibly needs proper memory map diff --git a/src/mame/igs/goldstar.h b/src/mame/igs/goldstar.h index 9dbcd5b24f7..90f95da2635 100644 --- a/src/mame/igs/goldstar.h +++ b/src/mame/igs/goldstar.h @@ -192,8 +192,8 @@ public: void init_chthree(); void init_wcat3a(); void init_cmpacmanb(); - void init_cmtetrsc(); - void init_cmtetrsd(); + void init_cmtetrisc(); + void init_cmtetrisd(); void init_ll3(); uint32_t screen_update_amcoe1a(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); diff --git a/src/mame/mame.lst b/src/mame/mame.lst index a70500780c4..94b61018851 100644 --- a/src/mame/mame.lst +++ b/src/mame/mame.lst @@ -15803,10 +15803,10 @@ cmpacman // cmpacmana // cmpacmanb // cmtetris // -cmtetrsa // -cmtetrsb // -cmtetrsc // -cmtetrsd // +cmtetrisa // +cmtetrisb // +cmtetrisc // +cmtetrisd // cmv4 // (c) 1992 Dyna Electronics cmv4a // (c) 1992 Dyna Electronics cmv801 // (c) 198? Corsica -- cgit v1.2.3