Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-05-22 13:48:55 +03:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Bunch of change from Haze (no credit wanted)

Browse Source
This commit is contained in:
Angelo Salese 2010-03-10 02:18:28 +00:00
parent a8b0ba8abc
commit d7f7564b38
3 changed files with 106 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/mame/drivers/cps1.c
View File

@ -9047,6 +9047,14 @@ static DRIVER_INIT( sf2mdt )
DRIVER_INIT_CALL(cps1);
}
static DRIVER_INIT( dinohunt )
{
// is this shared with the new sound hw?
UINT8* ram = (UINT8*)memory_install_ram(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xf18000, 0xf19fff, 0, 0, 0);
memset(ram,0xff,0x2000);
DRIVER_INIT_CALL(cps1);
}
GAME( 1988, forgottn, 0, cps1_10MHz, forgottn, forgottn, ROT0, "Capcom", "Forgotten Worlds (World)", GAME_SUPPORTS_SAVE )
GAME( 1988, forgottnu,forgottn, cps1_10MHz, forgottn, forgottn, ROT0, "Capcom", "Forgotten Worlds (US)", GAME_SUPPORTS_SAVE )
@ -9169,7 +9177,7 @@ GAME( 1993, dinou, dino, qsound, dino, dino, ROT0, "Capcom"
GAME( 1993, dinoj, dino, qsound, dino, dino, ROT0, "Capcom", "Cadillacs Kyouryuu-Shinseiki (Japan 930201)", GAME_SUPPORTS_SAVE )
GAME( 1993, dinopic, dino, cpspicb, dinopic, dino, ROT0, "bootleg", "Cadillacs and Dinosaurs (bootleg with PIC16c57, set 1)", GAME_NOT_WORKING | GAME_SUPPORTS_SAVE )
GAME( 1993, dinopic2, dino, cpspicb, dinopic, dino, ROT0, "bootleg", "Cadillacs and Dinosaurs (bootleg with PIC16c57, set 2)", GAME_NOT_WORKING | GAME_SUPPORTS_SAVE )
GAME( 1993, dinohunt, dino, wofhfh, dinoh, cps1, ROT0, "bootleg", "Dinosaur Hunter (Chinese bootleg of Cadillacs and Dinosaurs)", GAME_SUPPORTS_SAVE | GAME_NOT_WORKING )
GAME( 1993, dinohunt, dino, wofhfh, dinoh, dinohunt, ROT0, "bootleg", "Dinosaur Hunter (Chinese bootleg of Cadillacs and Dinosaurs)", GAME_SUPPORTS_SAVE | GAME_NOT_WORKING )
GAME( 1993, punisher, 0, qsound, punisher, punisher, ROT0, "Capcom", "The Punisher (World 930422)", GAME_SUPPORTS_SAVE ) // "ETC"
GAME( 1993, punisheru,punisher, qsound, punisher, punisher, ROT0, "Capcom", "The Punisher (US 930422)", GAME_SUPPORTS_SAVE )
GAME( 1993, punisherj,punisher, qsound, punisher, punisher, ROT0, "Capcom", "The Punisher (Japan 930422)", GAME_SUPPORTS_SAVE )

99
src/mame/drivers/goldstar.c
View File

@ -4908,6 +4908,35 @@ static GFXDECODE_START(cherrys )
GFXDECODE_END
static const gfx_layout tiles8x8x4pkr_layout =
{
8,8, /* 8*8 characters */
RGN_FRAC(1,1), /* 4096 characters */
4, /* 3 bits per pixel */
{ 0, 2, 4, 6 }, /* the bitplanes are packed in one byte */
{ 0*8+0, 0*8+1, 1*8+0, 1*8+1, 2*8+0, 2*8+1, 3*8+0, 3*8+1 },
{ 0*32, 1*32, 2*32, 3*32, 4*32, 5*32, 6*32, 7*32 },
32*8 /* every char takes 32 consecutive bytes */
};
static const gfx_layout tiles8x32x4pkr_layout =
{
8,32, /* 8*8 characters */
RGN_FRAC(1,1), /* 4096 characters */
4, /* 3 bits per pixel */
{ 0, 2, 4, 6 }, /* the bitplanes are packed in one byte */
{ 0*8+0, 0*8+1, 1*8+0, 1*8+1, 2*8+0, 2*8+1, 3*8+0, 3*8+1 },
{ 0*32, 1*32, 2*32, 3*32, 4*32, 5*32, 6*32, 7*32, 8*32, 9*32, 10*32, 11*32, 12*32, 13*32, 14*32, 15*32,
16*32,17*32,18*32,19*32,20*32,21*32,22*32,23*32,24*32,25*32, 26*32, 27*32, 28*32, 29*32, 30*32, 31*32},
32*8*4 /* every char takes 32 consecutive bytes */
};
static GFXDECODE_START( pkrmast )
GFXDECODE_ENTRY( "gfx1", 0, tiles8x8x4pkr_layout, 0, 16 )
GFXDECODE_ENTRY( "gfx2", 0, tiles8x32x4pkr_layout, 0, 16 )
GFXDECODE_END
/*************************************
* PPI 8255 (x3) Interfaces *
@ -5918,6 +5947,44 @@ static MACHINE_DRIVER_START( cherrys )
MACHINE_DRIVER_END
// hw unknown
static MACHINE_DRIVER_START( pkrmast )
MDRV_DRIVER_DATA(goldstar_state)
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, CPU_CLOCK)
MDRV_CPU_PROGRAM_MAP(cm_map)
MDRV_CPU_IO_MAP(cm_portmap)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
/* 2x 8255 */
MDRV_PPI8255_ADD( "ppi8255_0", cm_ppi8255_intf[0] )
MDRV_PPI8255_ADD( "ppi8255_1", cm_ppi8255_intf[1] )
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
MDRV_SCREEN_REFRESH_RATE(60)
// MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
MDRV_SCREEN_SIZE(64*8, 32*8)
MDRV_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 2*8, 30*8-1)
MDRV_GFXDECODE(pkrmast)
MDRV_PALETTE_LENGTH(256)
MDRV_PALETTE_INIT(cm)
MDRV_NVRAM_HANDLER(goldstar)
MDRV_VIDEO_START(cherrym)
MDRV_VIDEO_UPDATE(goldstar)
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
MDRV_SOUND_ADD("aysnd", AY8910, AY_CLOCK)
MDRV_SOUND_CONFIG(cm_ay8910_config)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
/***************************************************************************
Game driver(s)
@ -6789,9 +6856,10 @@ ROM_START( jkrmast )
ROM_LOAD( "jokermaster.rom", 0x0000, 0x10000, CRC(73caf824) SHA1(b7a7bb6190465f7c3b40f2ef97f4f6beeb89ec41) )
// unknown # of roms / sizes
ROM_REGION( 0x18000, "gfx1", 0 )
ROM_REGION( 0x20000, "gfx1", 0 )
ROM_LOAD( "gfx_roms", 0x00000, 0x8000, NO_DUMP )
ROM_REGION( 0x8000, "gfx2", ROMREGION_ERASE00 )
ROM_REGION( 0x20000, "gfx2", ROMREGION_ERASE00 )
ROM_REGION( 0x10000, "user1", ROMREGION_ERASE00 )
ROM_REGION( 0x200, "proms", 0 )
ROM_LOAD( "proms", 0x00000, 0x200, NO_DUMP )
@ -6802,10 +6870,12 @@ ROM_START( pkrmast )
ROM_REGION( 0x10000, "maincpu", 0 )
ROM_LOAD( "pokermastera.rom", 0x0000, 0x10000, CRC(467249f7) SHA1(efbab56896dc58d22ec921e7f5fd0befcfaadc52) )
// unknown # of roms / sizes
ROM_REGION( 0x18000, "gfx1", 0 )
ROM_LOAD( "gfx_roms", 0x00000, 0x8000, NO_DUMP )
ROM_REGION( 0x8000, "gfx2", ROMREGION_ERASE00 )
ROM_REGION( 0x20000, "gfx1", 0 ) // tiles
ROM_LOAD( "103-2.bin", 0x00000, 0x20000, CRC(ed0dfbfe) SHA1(c3a5b68e821461b161293eaec1515e2b0f26c4f9) )
ROM_REGION( 0x20000, "gfx2", 0 ) // reels + girl?
ROM_LOAD( "103-1.bin", 0x00000, 0x20000, CRC(e375cd4b) SHA1(68888126ff9743cd589f3426205231bc3a896588) )
ROM_REGION( 0x10000, "user1", ROMREGION_ERASE00 )
ROM_REGION( 0x200, "proms", 0 )
ROM_LOAD( "proms", 0x00000, 0x200, NO_DUMP )
@ -6813,14 +6883,17 @@ ROM_START( pkrmast )
ROM_END
ROM_START( pkrmasta )
ROM_REGION( 0x10000, "maincpu", 0 )
ROM_LOAD( "pokermasterb.rom", 0x0000, 0x10000, CRC(f59e0273) SHA1(160426b86dbb8a718cb3b886f90a231baed86a40) )
// unknown # of roms / sizes
ROM_REGION( 0x18000, "gfx1", 0 )
ROM_LOAD( "gfx_roms", 0x00000, 0x8000, NO_DUMP )
ROM_REGION( 0x8000, "gfx2", ROMREGION_ERASE00 )
ROM_REGION( 0x20000, "gfx1", 0 ) // tiles
ROM_LOAD( "103-2.bin", 0x00000, 0x20000, CRC(ed0dfbfe) SHA1(c3a5b68e821461b161293eaec1515e2b0f26c4f9) )
ROM_REGION( 0x20000, "gfx2", 0 ) // reels + girl?
ROM_LOAD( "103-1.bin", 0x00000, 0x20000, CRC(e375cd4b) SHA1(68888126ff9743cd589f3426205231bc3a896588) )
ROM_REGION( 0x10000, "user1", ROMREGION_ERASE00 )
ROM_REGION( 0x200, "proms", 0 )
ROM_LOAD( "proms", 0x00000, 0x200, NO_DUMP )
@ -9350,9 +9423,9 @@ GAME( 1991, cmasterd, cmaster, cm, cmasterb, cmv4, ROT0, "Dyna",
GAME( 1991, cmastere, cmaster, cm, cmasterb, cmv4, ROT0, "Dyna", "Cherry Master I (ver.1.01, set 6)", 0 )
GAME( 1991, cmasterf, cmaster, cm, cmasterb, cmv4, ROT0, "Dyna", "Cherry Master I (ver.1.01, set 7)", 0 )
GAME( 199?, jkrmast, 0, cm, cmasterb, cmv4, ROT0, "<unknown>", "Joker Master", GAME_NOT_WORKING ) // incomplete dump + encrypted?
GAME( 199?, pkrmast, jkrmast, cm, cmasterb, cmv4, ROT0, "<unknown>", "Poker Master (set 1)", GAME_NOT_WORKING ) // incomplete dump + encrypted?
GAME( 199?, pkrmasta, jkrmast, cm, cmasterb, cmv4, ROT0, "<unknown>", "Poker Master (set 2)", GAME_NOT_WORKING ) // incomplete dump + encrypted?
GAME( 199?, jkrmast, 0, pkrmast, cmasterb, cmv4, ROT0, "<unknown>", "Joker Master", GAME_NOT_WORKING ) // incomplete dump + encrypted?
GAME( 199?, pkrmast, jkrmast, pkrmast, cmasterb, cmv4, ROT0, "<unknown>", "Poker Master (set 1)", GAME_NOT_WORKING ) // incomplete dump + encrypted?
GAME( 199?, pkrmasta, jkrmast, pkrmast, cmasterb, cmv4, ROT0, "<unknown>", "Poker Master (set 2)", GAME_NOT_WORKING ) // incomplete dump + encrypted?
GAME( 1991, cmast91, 0, cmast91, cmast91, cmast91, ROT0, "Dyna", "Cherry Master '91 (ver.1.30)", 0 )

14
src/mame/video/cps1.c
View File

@ -1474,8 +1474,10 @@ WRITE16_HANDLER( cps1_cps_a_w )
if (offset == 0x24 / 2 && state->cps_version == 2)
return;
#ifdef MAME_DEBUG
if (offset > CPS1_VIDEOCONTROL)
popmessage("write to CPS-A register %02x contact MAMEDEV", offset * 2);
#endif
}
@ -1516,9 +1518,9 @@ READ16_HANDLER( cps1_cps_b_r )
if (offset == 0x12/2)
return state->cps_b_regs[0x12 / 2];
}
#ifdef MAME_DEBUG
popmessage("CPS-B read port %02x contact MAMEDEV", offset * 2);
#endif
return 0xffff;
}
@ -1569,7 +1571,7 @@ WRITE16_HANDLER( cps1_cps_b_w )
}
}
#ifdef MAME_DEBUG
if (offset != state->game_config->cpsb_addr / 2 && // only varth writes here
offset != state->game_config->mult_factor1 / 2 &&
offset != state->game_config->mult_factor2 / 2 &&
@ -1585,6 +1587,7 @@ WRITE16_HANDLER( cps1_cps_b_w )
offset != state->game_config->out2_addr / 2 &&
!state->game_config->bootleg_kludge)
popmessage("CPS-B write %04x to port %02x contact MAMEDEV", data, offset * 2);
#endif
}
@ -1771,18 +1774,23 @@ void cps1_get_video_base( running_machine *machine )
if (state->game_config->layer_enable_mask[1] == state->game_config->layer_enable_mask[2])
enablemask = state->game_config->layer_enable_mask[1];
#ifdef MAME_DEBUG
if (enablemask)
{
if (((layercontrol & enablemask) && (layercontrol & enablemask) != enablemask))
popmessage("layer %02x contact MAMEDEV", layercontrol & 0xc03f);
}
#endif
enablemask = state->game_config->layer_enable_mask[0] | state->game_config->layer_enable_mask[1]
| state->game_config->layer_enable_mask[2]
| state->game_config->layer_enable_mask[3] | state->game_config->layer_enable_mask[4];
#ifdef MAME_DEBUG
if (((layercontrol & ~enablemask) & 0x003e) != 0)
popmessage("layer %02x contact MAMEDEV", layercontrol & 0xc03f);
#endif
}
}