From 6c5a5519a95c7c8252e7c41cbcfb59ce054c21fd Mon Sep 17 00:00:00 2001 From: Angelo Salese Date: Sat, 9 Jul 2011 18:15:21 +0000 Subject: [PATCH] Added the new set --- src/emu/cpu/sh4/sh4comn.c | 3 +++ src/mame/drivers/aristmk6.c | 7 +++---- src/mame/mame.lst | 1 + 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/emu/cpu/sh4/sh4comn.c b/src/emu/cpu/sh4/sh4comn.c index 88e57e43612..6097ece9251 100644 --- a/src/emu/cpu/sh4/sh4comn.c +++ b/src/emu/cpu/sh4/sh4comn.c @@ -932,6 +932,9 @@ WRITE32_HANDLER( sh4_internal_w ) case SCBRR2: break; + case SCSPTR2: //trips often in aristocrat mk-6 + break; + default: logerror("sh4_internal_w: Unmapped write %08x, %08x @ %08x\n", 0xfe000000+((offset & 0x3fc0) << 11)+((offset & 0x3f) << 2), data, mem_mask); break; diff --git a/src/mame/drivers/aristmk6.c b/src/mame/drivers/aristmk6.c index 418060faedb..b7d2cb443f0 100644 --- a/src/mame/drivers/aristmk6.c +++ b/src/mame/drivers/aristmk6.c @@ -28,6 +28,7 @@ SCREEN_UPDATE(aristmk6) static ADDRESS_MAP_START( aristmk6_map, AS_PROGRAM, 64 ) AM_RANGE(0x00000000, 0x003fffff) AM_ROM AM_REGION("maincpu", 0) + AM_RANGE(0x0c000000, 0x0cffffff) AM_RAM // work ram ADDRESS_MAP_END static ADDRESS_MAP_START( aristmk6_port, AS_IO, 64 ) @@ -38,7 +39,7 @@ static INPUT_PORTS_START( aristmk6 ) INPUT_PORTS_END // ? -#define ARISTMK6_CPU_CLOCK 200000000 +#define ARISTMK6_CPU_CLOCK XTAL_200MHz // ? static const struct sh4_config sh4cpu_config = { 1, 0, 1, 0, 0, 0, 1, 1, 0, ARISTMK6_CPU_CLOCK }; @@ -86,13 +87,11 @@ ROM_START( 50lions ) ROM_LOAD32_WORD("u73 - 35634c6d.bin", 0x0000002, 0x0400000, CRC(ec1b699b) SHA1(5a6ad7c7eb02443e42ee6a88525ae95a2b0a3195) ) ROM_END -#if 0 ROM_START( 50lionsa ) ROM_REGION( 0x1800000, "maincpu", ROMREGION_ERASEFF) ROM_LOAD32_WORD("10120511.u86", 0x0000000, 0x0400000, CRC(0e5c86f1) SHA1(84e329e664ace697f9ea4ace08612089e0964732) ) ROM_LOAD32_WORD("10120511.u73", 0x0000002, 0x0400000, CRC(1c1f2297) SHA1(13fb8c83d8ce2340ef554490c21a38da7b47c666) ) ROM_END -#endif ROM_START( choysun ) ROM_REGION( 0x1800000, "maincpu", ROMREGION_ERASEFF) @@ -154,7 +153,7 @@ ROM_END GAME( 200?, aristmk6, 0, aristmk6, aristmk6, 0, ROT0, "Aristocrat", "Aristocrat MK-6 Base (15011025)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_IS_BIOS_ROOT) GAME( 200?, antcleo, aristmk6, aristmk6, aristmk6, 0, ROT0, "Aristocrat", "Antony and Cleopatra (10177211)", GAME_NOT_WORKING | GAME_NO_SOUND ) GAME( 200?, 50lions, aristmk6, aristmk6, aristmk6, 0, ROT0, "Aristocrat", "50 Lions (set 1, 10156111)", GAME_NOT_WORKING | GAME_NO_SOUND ) -//GAME( 200?, 50lionsa, 50lions, aristmk6, aristmk6, 0, ROT0, "Aristocrat", "50 Lions (set 2, 10120511)", GAME_NOT_WORKING | GAME_NO_SOUND ) +GAME( 200?, 50lionsa, 50lions, aristmk6, aristmk6, 0, ROT0, "Aristocrat", "50 Lions (set 2, 10120511)", GAME_NOT_WORKING | GAME_NO_SOUND ) GAME( 200?, choysun, aristmk6, aristmk6, aristmk6, 0, ROT0, "Aristocrat", "Choy Sun Doa (20131511)", GAME_NOT_WORKING | GAME_NO_SOUND ) GAME( 200?, cristals, aristmk6, aristmk6, aristmk6, 0, ROT0, "Aristocrat", "Cristal Springs (10155811)", GAME_NOT_WORKING | GAME_NO_SOUND ) GAME( 200?, indianmm, aristmk6, aristmk6, aristmk6, 0, ROT0, "Aristocrat", "Indian Dreaming (10130711) (Maximillion$ Jackpot Version)", GAME_NOT_WORKING | GAME_NO_SOUND ) diff --git a/src/mame/mame.lst b/src/mame/mame.lst index 5e1c9a3b19f..428c6419a1e 100644 --- a/src/mame/mame.lst +++ b/src/mame/mame.lst @@ -10122,6 +10122,7 @@ wtiger // (c) 2001 aristmk6 antcleo 50lions +50lionsa choysun cristals indianmm