From 1aa3fa6dcd1d17bcfcf4d430b833d2a601fff6e1 Mon Sep 17 00:00:00 2001 From: Scott Stone Date: Thu, 4 Feb 2010 18:59:33 +0000 Subject: [PATCH] Source Cleanup: Setname fixes and other minor changes - Drivers starting with D (part 1). --- .gitattributes | 6 +- src/mame/drivers/darkhors.c | 2 +- src/mame/drivers/dassault.c | 6 +- src/mame/drivers/ddenlovr.c | 76 ++++++++--------- src/mame/drivers/ddragon.c | 24 +++--- src/mame/drivers/ddragon3.c | 6 +- src/mame/drivers/{ddrible.c => ddribble.c} | 90 ++++++++++----------- src/mame/drivers/dec8.c | 46 +++++------ src/mame/drivers/decocass.c | 8 +- src/mame/drivers/destroyr.c | 2 +- src/mame/includes/{ddrible.h => ddribble.h} | 16 ++-- src/mame/includes/dec8.h | 10 +-- src/mame/machine/decocass.c | 2 +- src/mame/machine/decocass.h | 2 +- src/mame/mame.mak | 2 +- src/mame/mamedriv.c | 8 +- src/mame/video/{ddrible.c => ddribble.c} | 30 +++---- src/mame/video/dec8.c | 24 +++--- 18 files changed, 180 insertions(+), 180 deletions(-) rename src/mame/drivers/{ddrible.c => ddribble.c} (78%) rename src/mame/includes/{ddrible.h => ddribble.h} (71%) rename src/mame/video/{ddrible.c => ddribble.c} (89%) diff --git a/.gitattributes b/.gitattributes index 3756333bde2..ba4e89dc818 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1503,7 +1503,7 @@ src/mame/drivers/ddealer.c svneol=native#text/plain src/mame/drivers/ddenlovr.c svneol=native#text/plain src/mame/drivers/ddragon.c svneol=native#text/plain src/mame/drivers/ddragon3.c svneol=native#text/plain -src/mame/drivers/ddrible.c svneol=native#text/plain +src/mame/drivers/ddribble.c svneol=native#text/plain src/mame/drivers/ddz.c svneol=native#text/plain src/mame/drivers/deadang.c svneol=native#text/plain src/mame/drivers/dec0.c svneol=native#text/plain @@ -2463,7 +2463,7 @@ src/mame/includes/dcheese.h svneol=native#text/plain src/mame/includes/dday.h svneol=native#text/plain src/mame/includes/ddragon.h svneol=native#text/plain src/mame/includes/ddragon3.h svneol=native#text/plain -src/mame/includes/ddrible.h svneol=native#text/plain +src/mame/includes/ddribble.h svneol=native#text/plain src/mame/includes/dec0.h svneol=native#text/plain src/mame/includes/dec8.h svneol=native#text/plain src/mame/includes/deco16ic.h svneol=native#text/plain @@ -3323,7 +3323,7 @@ src/mame/video/dcon.c svneol=native#text/plain src/mame/video/dday.c svneol=native#text/plain src/mame/video/ddragon.c svneol=native#text/plain src/mame/video/ddragon3.c svneol=native#text/plain -src/mame/video/ddrible.c svneol=native#text/plain +src/mame/video/ddribble.c svneol=native#text/plain src/mame/video/deadang.c svneol=native#text/plain src/mame/video/dec0.c svneol=native#text/plain src/mame/video/dec8.c svneol=native#text/plain diff --git a/src/mame/drivers/darkhors.c b/src/mame/drivers/darkhors.c index e33536b9971..14989d55fa6 100644 --- a/src/mame/drivers/darkhors.c +++ b/src/mame/drivers/darkhors.c @@ -941,4 +941,4 @@ static DRIVER_INIT( darkhors ) GAME( 199?, jclub2, 0, jclub2, darkhors, 0, ROT0, "Seta", "Jockey Club II (newer hardware)", GAME_NOT_WORKING | GAME_NO_SOUND ) GAME( 199?, jclub2o, jclub2, jclub2o, darkhors, 0, ROT0, "Seta", "Jockey Club II (older hardware)", GAME_NOT_WORKING | GAME_NO_SOUND ) -GAME( 2001, darkhors, jclub2, darkhors, darkhors, darkhors, ROT0, "bootleg", "Dark Horse (bootleg of Jockey Club II)", GAME_IMPERFECT_GRAPHICS ) +GAME( 2001, darkhors, jclub2, darkhors,darkhors, darkhors, ROT0, "bootleg", "Dark Horse (bootleg of Jockey Club II)", GAME_IMPERFECT_GRAPHICS ) diff --git a/src/mame/drivers/dassault.c b/src/mame/drivers/dassault.c index 2377df1ce17..334c255eca8 100644 --- a/src/mame/drivers/dassault.c +++ b/src/mame/drivers/dassault.c @@ -99,7 +99,7 @@ Stephh's notes (based on the games M68000 code and some tests) : * BUTTON2n : "nuke" -3) 'dassaul4' +3) 'dassault4' - always 4 players : @@ -422,7 +422,7 @@ static INPUT_PORTS_START( dassault ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) INPUT_PORTS_END -static INPUT_PORTS_START( dassaul4 ) +static INPUT_PORTS_START( dassault4 ) PORT_INCLUDE( common ) PORT_MODIFY("P1_P2") @@ -848,4 +848,4 @@ static DRIVER_INIT( thndzone ) GAME( 1991, thndzone, 0, dassault, thndzone, thndzone, ROT0, "Data East Corporation", "Thunder Zone (World)", 0 ) GAME( 1991, dassault, thndzone, dassault, dassault, dassault, ROT0, "Data East Corporation", "Desert Assault (US)", 0 ) -GAME( 1991, dassault4,thndzone, dassault, dassaul4, dassault, ROT0, "Data East Corporation", "Desert Assault (US 4 Players)", 0 ) +GAME( 1991, dassault4,thndzone, dassault, dassault4,dassault, ROT0, "Data East Corporation", "Desert Assault (US 4 Players)", 0 ) diff --git a/src/mame/drivers/ddenlovr.c b/src/mame/drivers/ddenlovr.c index 2bdb1f977c4..072a58d2838 100644 --- a/src/mame/drivers/ddenlovr.c +++ b/src/mame/drivers/ddenlovr.c @@ -81,7 +81,7 @@ TODO: - quiz365 protection -- ddenlvrj, akamaru: the elapsed time text in the "game information" screen +- ddenlovj, akamaru: the elapsed time text in the "game information" screen is all wrong (RTC/interrupts related). - sryudens: Transparency problems (Test->Option->Gal, Bonus Game during Demo mode). @@ -1625,18 +1625,18 @@ static ADDRESS_MAP_START( quiz365_map, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END -static UINT16 *ddenlvrj_dsw_sel; +static UINT16 *ddenlovj_dsw_sel; -static READ16_HANDLER( ddenlvrj_dsw_r ) +static READ16_HANDLER( ddenlovj_dsw_r ) { UINT16 dsw = 0; - if ((~*ddenlvrj_dsw_sel) & 0x01) dsw |= input_port_read(space->machine, "DSW1"); - if ((~*ddenlvrj_dsw_sel) & 0x02) dsw |= input_port_read(space->machine, "DSW2"); - if ((~*ddenlvrj_dsw_sel) & 0x04) dsw |= input_port_read(space->machine, "DSW3"); + if ((~*ddenlovj_dsw_sel) & 0x01) dsw |= input_port_read(space->machine, "DSW1"); + if ((~*ddenlovj_dsw_sel) & 0x02) dsw |= input_port_read(space->machine, "DSW2"); + if ((~*ddenlovj_dsw_sel) & 0x04) dsw |= input_port_read(space->machine, "DSW3"); return dsw; } -static WRITE16_HANDLER( ddenlvrj_coincounter_w ) +static WRITE16_HANDLER( ddenlovj_coincounter_w ) { if (ACCESSING_BITS_0_7) { @@ -1646,12 +1646,12 @@ static WRITE16_HANDLER( ddenlvrj_coincounter_w ) } } -static CUSTOM_INPUT( ddenlvrj_blitter_r ) +static CUSTOM_INPUT( ddenlovj_blitter_r ) { return ddenlovr_blitter_irq_flag ? 0x03 : 0x00; // bit 4 = 1 -> blitter busy } -static ADDRESS_MAP_START( ddenlvrj_map, ADDRESS_SPACE_PROGRAM, 16 ) +static ADDRESS_MAP_START( ddenlovj_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x07ffff) AM_ROM // ROM AM_RANGE(0x200000, 0x2003ff) AM_WRITE(ddenlovr_palette_w) // Palette @@ -1673,9 +1673,9 @@ static ADDRESS_MAP_START( ddenlvrj_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x300180, 0x300181) AM_READ_PORT("P1") AM_RANGE(0x300182, 0x300183) AM_READ_PORT("P2") AM_RANGE(0x300184, 0x300185) AM_READ_PORT("SYSTEM") - AM_RANGE(0x300186, 0x300187) AM_READ(ddenlvrj_dsw_r) // DSW - AM_RANGE(0x300188, 0x300189) AM_WRITE(ddenlvrj_coincounter_w) // Coin Counters - AM_RANGE(0x30018a, 0x30018b) AM_WRITEONLY AM_BASE(&ddenlvrj_dsw_sel) // DSW select + AM_RANGE(0x300186, 0x300187) AM_READ(ddenlovj_dsw_r) // DSW + AM_RANGE(0x300188, 0x300189) AM_WRITE(ddenlovj_coincounter_w) // Coin Counters + AM_RANGE(0x30018a, 0x30018b) AM_WRITEONLY AM_BASE(&ddenlovj_dsw_sel) // DSW select AM_RANGE(0x30018c, 0x30018d) AM_DEVWRITE("oki", ddenlovr_oki_bank_w) AM_RANGE(0x3001ca, 0x3001cb) AM_WRITE(ddenlovr_blitter_irq_ack_w) // Blitter irq acknowledge AM_RANGE(0x300240, 0x300241) AM_DEVREADWRITE8("oki", okim6295_r, okim6295_w, 0x00ff)// Sound @@ -1683,35 +1683,35 @@ static ADDRESS_MAP_START( ddenlvrj_map, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END -static UINT16 *ddenlvrk_protection1, *ddenlvrk_protection2; -static READ16_HANDLER( ddenlvrk_protection1_r ) +static UINT16 *ddenlovrk_protection1, *ddenlovrk_protection2; +static READ16_HANDLER( ddenlovrk_protection1_r ) { - switch(*ddenlvrk_protection1) + switch(*ddenlovrk_protection1) { case 0x007e: return 0x00aa; } - return *ddenlvrk_protection1; + return *ddenlovrk_protection1; } -static READ16_HANDLER( ddenlvrk_protection2_r ) +static READ16_HANDLER( ddenlovrk_protection2_r ) { - switch(*ddenlvrk_protection1) + switch(*ddenlovrk_protection1) { - case 0x0000: return *ddenlvrk_protection2; + case 0x0000: return *ddenlovrk_protection2; } return 0x80; } -static WRITE16_HANDLER( ddenlvrk_protection2_w ) +static WRITE16_HANDLER( ddenlovrk_protection2_w ) { - COMBINE_DATA( ddenlvrk_protection2 ); - okim6295_set_bank_base(devtag_get_device(space->machine, "oki"), ((*ddenlvrk_protection2)&0x7) * 0x40000); + COMBINE_DATA( ddenlovrk_protection2 ); + okim6295_set_bank_base(devtag_get_device(space->machine, "oki"), ((*ddenlovrk_protection2)&0x7) * 0x40000); } -static ADDRESS_MAP_START( ddenlvrk_map, ADDRESS_SPACE_PROGRAM, 16 ) +static ADDRESS_MAP_START( ddenlovrk_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x07ffff) AM_ROM // ROM - AM_RANGE(0x100000, 0x100001) AM_RAM_READ(ddenlvrk_protection1_r) AM_BASE(&ddenlvrk_protection1) - AM_RANGE(0x200000, 0x200001) AM_READWRITE(ddenlvrk_protection2_r, ddenlvrk_protection2_w) AM_BASE(&ddenlvrk_protection2) + AM_RANGE(0x100000, 0x100001) AM_RAM_READ(ddenlovrk_protection1_r) AM_BASE(&ddenlovrk_protection1) + AM_RANGE(0x200000, 0x200001) AM_READWRITE(ddenlovrk_protection2_r, ddenlovrk_protection2_w) AM_BASE(&ddenlovrk_protection2) AM_RANGE(0xd00000, 0xd003ff) AM_WRITE(ddenlovr_palette_w) // Palette // AM_RANGE(0xd01000, 0xd017ff) AM_RAM // ? B0 on startup, then 00 @@ -3508,7 +3508,7 @@ ADDRESS_MAP_END -static INPUT_PORTS_START( ddenlvrj ) +static INPUT_PORTS_START( ddenlovj ) PORT_START("P1") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1) @@ -3535,7 +3535,7 @@ static INPUT_PORTS_START( ddenlvrj ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME(DEF_STR( Test )) PORT_CODE(KEYCODE_F1) /* Test */ PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_SPECIAL ) // blitter busy flag - PORT_BIT( 0x60, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(ddenlvrj_blitter_r, NULL) // blitter irq flag? (bit 5) & RTC (bit 6) + PORT_BIT( 0x60, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(ddenlovj_blitter_r, NULL) // blitter irq flag? (bit 5) & RTC (bit 6) PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_START("DSW1") @@ -7376,18 +7376,18 @@ static MACHINE_DRIVER_START( ddenlovr ) MDRV_MSM6242_ADD("rtc") MACHINE_DRIVER_END -static MACHINE_DRIVER_START( ddenlvrj ) +static MACHINE_DRIVER_START( ddenlovj ) /* basic machine hardware */ MDRV_IMPORT_FROM(ddenlovr) MDRV_CPU_MODIFY("maincpu") - MDRV_CPU_PROGRAM_MAP(ddenlvrj_map) + MDRV_CPU_PROGRAM_MAP(ddenlovj_map) MACHINE_DRIVER_END -static MACHINE_DRIVER_START( ddenlvrk ) +static MACHINE_DRIVER_START( ddenlovrk ) MDRV_IMPORT_FROM(ddenlovr) MDRV_CPU_MODIFY("maincpu") - MDRV_CPU_PROGRAM_MAP(ddenlvrk_map) + MDRV_CPU_PROGRAM_MAP(ddenlovrk_map) MACHINE_DRIVER_END static MACHINE_DRIVER_START( akamaru ) @@ -8459,7 +8459,7 @@ ROMs: ***************************************************************************/ -ROM_START( ddenlvrj ) +ROM_START( ddenlovj ) ROM_REGION( 0x080000, "maincpu", 0 ) /* 68000 Code */ ROM_LOAD16_BYTE( "1124.2d", 0x000000, 0x040000, CRC(6a9ec557) SHA1(e1512601910a9d06e16a20e10ab7acc96a0819bd) ) ROM_LOAD16_BYTE( "1123.2h", 0x000001, 0x040000, CRC(d41cbed0) SHA1(5c80f6a6cf15518120f664a0446355e80eeb2a0f) ) @@ -8530,7 +8530,7 @@ Hardware info by Guru ***************************************************************************/ -ROM_START( ddenlvrk ) +ROM_START( ddenlovrk ) ROM_REGION( 0x080000, "maincpu", 0 ) /* 68000 Code */ ROM_LOAD16_BYTE( "rom.1a", 0x000000, 0x40000, CRC(868c45f8) SHA1(023ceaa30cfa03470ef005c8b739a85ae9764e15) ) ROM_LOAD16_BYTE( "rom.1b", 0x000001, 0x40000, CRC(4fab3c90) SHA1(61a756a3ccae39f3a649371116b9d940d3b1b852) ) @@ -8618,7 +8618,7 @@ Notes: HSync 15.30kHz VSync 60Hz */ -ROM_START( ddenlovb ) +ROM_START( ddenlovrb ) ROM_REGION( 0x080000, "maincpu", 0 ) /* 68000 Code */ ROM_LOAD16_BYTE( "rom2", 0x000000, 0x040000, CRC(cabdf78f) SHA1(789d4754c7b84964ee317b8a618f26a417f50bcc) ) ROM_LOAD16_BYTE( "rom3", 0x000001, 0x040000, CRC(36f8d05e) SHA1(78f75175541ebf377f5375ea30d80ea91f380971) ) @@ -9771,10 +9771,10 @@ GAME( 1994, hparadis, 0, hparadis, hparadis, 0, ROT0, "Dynax", GAME( 1995, hgokou, 0, hgokou, hgokou, 0, ROT0, "Dynax (Alba licence)", "Hanafuda Hana Gokou (Japan)", GAME_NO_COCKTAIL ) GAME( 1995, mjdchuka, 0, mjchuuka, mjchuuka, 0, ROT0, "Dynax", "Mahjong The Dai Chuuka Ken (China, v. D111)", GAME_NO_COCKTAIL ) GAME( 1995, nettoqc, 0, nettoqc, nettoqc, 0, ROT0, "Nakanihon", "Nettoh Quiz Champion (Japan)", GAME_NO_COCKTAIL | GAME_IMPERFECT_COLORS ) -GAME( 1995, ddenlvrj, 0, ddenlvrj, ddenlvrj, 0, ROT0, "Dynax", "Don Den Lover Vol. 1 - Shiro Kuro Tsukeyo! (Japan)", GAME_NO_COCKTAIL ) -GAME( 1995, ddenlvrk, ddenlvrj, ddenlvrk, ddenlovr, 0, ROT0, "Dynax", "Don Den Lover Vol. 1 - Heukbaeg-euro Jeonghaja (Korea)", GAME_NO_COCKTAIL ) -GAME( 1995, ddenlovb, ddenlvrj, ddenlovr, ddenlovr, 0, ROT0, "[Dynax] (bootleg)", "Don Den Lover Vol. 1 - Heukbaeg-euro Jeonghaja (Korea, bootleg)", GAME_NO_COCKTAIL ) -GAME( 1996, ddenlovr, ddenlvrj, ddenlovr, ddenlovr, 0, ROT0, "Dynax", "Don Den Lover Vol. 1 (Hong Kong)", GAME_NO_COCKTAIL ) +GAME( 1995, ddenlovj, 0, ddenlovj, ddenlovj, 0, ROT0, "Dynax", "Don Den Lover Vol. 1 - Shiro Kuro Tsukeyo! (Japan)", GAME_NO_COCKTAIL ) +GAME( 1995, ddenlovrk,ddenlovj, ddenlovrk,ddenlovr, 0, ROT0, "Dynax", "Don Den Lover Vol. 1 - Heukbaeg-euro Jeonghaja (Korea)", GAME_NO_COCKTAIL ) +GAME( 1995, ddenlovrb,ddenlovj, ddenlovr, ddenlovr, 0, ROT0, "[Dynax] (bootleg)", "Don Den Lover Vol. 1 - Heukbaeg-euro Jeonghaja (Korea, bootleg)", GAME_NO_COCKTAIL ) +GAME( 1996, ddenlovr, ddenlovj, ddenlovr, ddenlovr, 0, ROT0, "Dynax", "Don Den Lover Vol. 1 (Hong Kong)", GAME_NO_COCKTAIL ) GAME( 1996, hanakanz, 0, hanakanz, hanakanz, 0, ROT0, "Dynax", "Hana Kanzashi (Japan)", GAME_NO_COCKTAIL ) GAME( 1996, akamaru, 0, akamaru, akamaru, 0, ROT0, "Dynax (Nakanihon licence)", "Panel & Variety Akamaru Q Jousyou Dont-R", GAME_NO_COCKTAIL ) GAME( 1996, sryudens, 0, sryudens, sryudens, 0, ROT0, "Dynax / Face", "Mahjong Seiryu Densetsu (Japan, NM502)", GAME_NO_COCKTAIL | GAME_IMPERFECT_GRAPHICS ) diff --git a/src/mame/drivers/ddragon.c b/src/mame/drivers/ddragon.c index dbdfe186549..7b8a4a80f84 100644 --- a/src/mame/drivers/ddragon.c +++ b/src/mame/drivers/ddragon.c @@ -559,7 +559,7 @@ static ADDRESS_MAP_START( sub_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END -static ADDRESS_MAP_START( ddragnba_sub_map, ADDRESS_SPACE_PROGRAM, 8 ) +static ADDRESS_MAP_START( ddragonba_sub_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0fff) AM_RAM AM_RANGE(0x8000, 0x8fff) AM_READWRITE(ddragon_spriteram_r, ddragon_spriteram_w) AM_RANGE(0xc000, 0xffff) AM_ROM @@ -574,15 +574,15 @@ static ADDRESS_MAP_START( dd2_sub_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END /* might not be 100% accurate, check bits written */ -static WRITE8_HANDLER( ddragnba_port_w ) +static WRITE8_HANDLER( ddragonba_port_w ) { ddragon_state *state = (ddragon_state *)space->machine->driver_data; cpu_set_input_line(state->maincpu, M6809_IRQ_LINE, ASSERT_LINE); cpu_set_input_line(state->sub_cpu, state->sprite_irq, CLEAR_LINE ); } -static ADDRESS_MAP_START( ddragnba_sub_portmap, ADDRESS_SPACE_IO, 8 ) - AM_RANGE(0x0000, 0xffff) AM_WRITE(ddragnba_port_w) +static ADDRESS_MAP_START( ddragonba_sub_portmap, ADDRESS_SPACE_IO, 8 ) + AM_RANGE(0x0000, 0xffff) AM_WRITE(ddragonba_port_w) ADDRESS_MAP_END @@ -1033,17 +1033,17 @@ static MACHINE_DRIVER_START( ddragonb ) MACHINE_DRIVER_END -static MACHINE_DRIVER_START( ddragnba ) +static MACHINE_DRIVER_START( ddragonba ) MDRV_IMPORT_FROM(ddragon) /* basic machine hardware */ MDRV_CPU_REPLACE("sub", M6803, MAIN_CLOCK / 2) /* 6Mhz / 4 internally */ - MDRV_CPU_PROGRAM_MAP(ddragnba_sub_map) - MDRV_CPU_IO_MAP(ddragnba_sub_portmap) + MDRV_CPU_PROGRAM_MAP(ddragonba_sub_map) + MDRV_CPU_IO_MAP(ddragonba_sub_portmap) MACHINE_DRIVER_END -static MACHINE_DRIVER_START( ddgn6809 ) +static MACHINE_DRIVER_START( ddragon6809 ) /* driver data */ MDRV_DRIVER_DATA(ddragon_state) @@ -2033,7 +2033,7 @@ static DRIVER_INIT( toffy ) /* should the sound rom be bitswapped too? */ } -static DRIVER_INIT( ddgn6809 ) +static DRIVER_INIT( ddragon6809 ) { ddragon_state *state = (ddragon_state *)machine->driver_data; /* Descramble GFX here */ @@ -2057,9 +2057,9 @@ GAME( 1987, ddragonu, ddragon, ddragon, ddragon, ddragon, ROT0, "[Technos GAME( 1987, ddragonua, ddragon, ddragon, ddragon, ddragon, ROT0, "[Technos Japan] (Taito America license)", "Double Dragon (US Set 2)", GAME_SUPPORTS_SAVE ) GAME( 1987, ddragonb2, ddragon, ddragon, ddragon, ddragon, ROT0, "bootleg", "Double Dragon (bootleg)", GAME_SUPPORTS_SAVE ) GAME( 1987, ddragonb, ddragon, ddragonb, ddragon, ddragon, ROT0, "bootleg", "Double Dragon (bootleg with HD6309)", GAME_SUPPORTS_SAVE ) // according to dump notes -GAME( 1987, ddragonba, ddragon, ddragnba, ddragon, ddragon, ROT0, "bootleg", "Double Dragon (bootleg with M6803)", GAME_SUPPORTS_SAVE ) -GAME( 1987, ddragon6809, ddragon, ddgn6809, ddragon, ddgn6809, ROT0, "bootleg", "Double Dragon (bootleg with 3xM6809, set 1)", GAME_NOT_WORKING ) -GAME( 1987, ddragon6809a,ddragon, ddgn6809, ddragon, ddgn6809, ROT0, "bootleg", "Double Dragon (bootleg with 3xM6809, set 2)", GAME_NOT_WORKING ) +GAME( 1987, ddragonba, ddragon, ddragonba, ddragon, ddragon, ROT0, "bootleg", "Double Dragon (bootleg with M6803)", GAME_SUPPORTS_SAVE ) +GAME( 1987, ddragon6809, ddragon, ddragon6809, ddragon, ddragon6809, ROT0, "bootleg", "Double Dragon (bootleg with 3xM6809, set 1)", GAME_NOT_WORKING ) +GAME( 1987, ddragon6809a,ddragon, ddragon6809, ddragon, ddragon6809, ROT0, "bootleg", "Double Dragon (bootleg with 3xM6809, set 2)", GAME_NOT_WORKING ) GAME( 1988, ddragon2, 0, ddragon2, ddragon2, ddragon2, ROT0, "Technos Japan", "Double Dragon II - The Revenge (World)", GAME_SUPPORTS_SAVE ) GAME( 1988, ddragon2u, ddragon2, ddragon2, ddragon2, ddragon2, ROT0, "Technos Japan", "Double Dragon II - The Revenge (US)", GAME_SUPPORTS_SAVE ) diff --git a/src/mame/drivers/ddragon3.c b/src/mame/drivers/ddragon3.c index e3bf2a6f065..6530e096778 100644 --- a/src/mame/drivers/ddragon3.c +++ b/src/mame/drivers/ddragon3.c @@ -437,7 +437,7 @@ static INPUT_PORTS_START( ctribe ) PORT_BIT( 0xfc00, IP_ACTIVE_LOW, IPT_UNUSED ) INPUT_PORTS_END -static INPUT_PORTS_START( ddrago3b ) +static INPUT_PORTS_START( ddragon3b ) PORT_INCLUDE( ctribe ) PORT_MODIFY("IN0") @@ -630,7 +630,7 @@ static MACHINE_DRIVER_START( ddragon3 ) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.50) MACHINE_DRIVER_END -static MACHINE_DRIVER_START( ddrago3b ) +static MACHINE_DRIVER_START( ddragon3b ) MDRV_IMPORT_FROM(ddragon3) MDRV_CPU_MODIFY("maincpu") @@ -1014,7 +1014,7 @@ ROM_END GAME( 1990, ddragon3, 0, ddragon3, ddragon3, 0, ROT0, "Technos Japan", "Double Dragon 3 - The Rosetta Stone (US)", GAME_SUPPORTS_SAVE ) GAME( 1990, ddragon3j,ddragon3, ddragon3, ddragon3, 0, ROT0, "Technos Japan", "Double Dragon 3 - The Rosetta Stone (Japan)", GAME_SUPPORTS_SAVE ) GAME( 1990, ddragon3p,ddragon3, ddragon3, ddragon3, 0, ROT0, "Technos Japan", "Double Dragon 3 - The Rosetta Stone (prototype)", GAME_SUPPORTS_SAVE ) -GAME( 1990, ddragon3b,ddragon3, ddrago3b, ddrago3b, 0, ROT0, "bootleg", "Double Dragon 3 - The Rosetta Stone (bootleg)", GAME_SUPPORTS_SAVE ) +GAME( 1990, ddragon3b,ddragon3, ddragon3b,ddragon3b,0, ROT0, "bootleg", "Double Dragon 3 - The Rosetta Stone (bootleg)", GAME_SUPPORTS_SAVE ) GAME( 1990, ctribe, 0, ctribe, ctribe, 0, ROT0, "Technos Japan", "The Combatribes (US)", GAME_SUPPORTS_SAVE ) GAME( 1990, ctribe1, ctribe, ctribe, ctribe, 0, ROT0, "Technos Japan", "The Combatribes (US Set 1?)", GAME_SUPPORTS_SAVE ) GAME( 1990, ctribej, ctribe, ctribe, ctribe, 0, ROT0, "Technos Japan", "The Combatribes (Japan)", GAME_SUPPORTS_SAVE ) diff --git a/src/mame/drivers/ddrible.c b/src/mame/drivers/ddribble.c similarity index 78% rename from src/mame/drivers/ddrible.c rename to src/mame/drivers/ddribble.c index 62a195e7d8b..2f64178984c 100644 --- a/src/mame/drivers/ddrible.c +++ b/src/mame/drivers/ddribble.c @@ -15,55 +15,55 @@ #include "sound/vlm5030.h" #include "sound/flt_rc.h" #include "includes/konamipt.h" -#include "includes/ddrible.h" +#include "includes/ddribble.h" -static INTERRUPT_GEN( ddrible_interrupt_0 ) +static INTERRUPT_GEN( ddribble_interrupt_0 ) { - ddrible_state *state = (ddrible_state *)device->machine->driver_data; + ddribble_state *state = (ddribble_state *)device->machine->driver_data; if (state->int_enable_0) cpu_set_input_line(device, M6809_FIRQ_LINE, HOLD_LINE); } -static INTERRUPT_GEN( ddrible_interrupt_1 ) +static INTERRUPT_GEN( ddribble_interrupt_1 ) { - ddrible_state *state = (ddrible_state *)device->machine->driver_data; + ddribble_state *state = (ddribble_state *)device->machine->driver_data; if (state->int_enable_1) cpu_set_input_line(device, M6809_FIRQ_LINE, HOLD_LINE); } -static WRITE8_HANDLER( ddrible_bankswitch_w ) +static WRITE8_HANDLER( ddribble_bankswitch_w ) { memory_set_bank(space->machine, "bank1", data & 0x0f); } -static READ8_HANDLER( ddrible_sharedram_r ) +static READ8_HANDLER( ddribble_sharedram_r ) { - ddrible_state *state = (ddrible_state *)space->machine->driver_data; + ddribble_state *state = (ddribble_state *)space->machine->driver_data; return state->sharedram[offset]; } -static WRITE8_HANDLER( ddrible_sharedram_w ) +static WRITE8_HANDLER( ddribble_sharedram_w ) { - ddrible_state *state = (ddrible_state *)space->machine->driver_data; + ddribble_state *state = (ddribble_state *)space->machine->driver_data; state->sharedram[offset] = data; } -static READ8_HANDLER( ddrible_snd_sharedram_r ) +static READ8_HANDLER( ddribble_snd_sharedram_r ) { - ddrible_state *state = (ddrible_state *)space->machine->driver_data; + ddribble_state *state = (ddribble_state *)space->machine->driver_data; return state->snd_sharedram[offset]; } -static WRITE8_HANDLER( ddrible_snd_sharedram_w ) +static WRITE8_HANDLER( ddribble_snd_sharedram_w ) { - ddrible_state *state = (ddrible_state *)space->machine->driver_data; + ddribble_state *state = (ddribble_state *)space->machine->driver_data; state->snd_sharedram[offset] = data; } -static WRITE8_HANDLER( ddrible_coin_counter_w ) +static WRITE8_HANDLER( ddribble_coin_counter_w ) { /* b4-b7: unused */ /* b2-b3: unknown */ @@ -73,7 +73,7 @@ static WRITE8_HANDLER( ddrible_coin_counter_w ) coin_counter_w(space->machine, 1,(data >> 1) & 0x01); } -static READ8_DEVICE_HANDLER( ddrible_vlm5030_busy_r ) +static READ8_DEVICE_HANDLER( ddribble_vlm5030_busy_r ) { return mame_rand(device->machine); /* patch */ /* FIXME: remove ? */ @@ -83,9 +83,9 @@ static READ8_DEVICE_HANDLER( ddrible_vlm5030_busy_r ) #endif } -static WRITE8_DEVICE_HANDLER( ddrible_vlm5030_ctrl_w ) +static WRITE8_DEVICE_HANDLER( ddribble_vlm5030_ctrl_w ) { - ddrible_state *state = (ddrible_state *)device->machine->driver_data; + ddribble_state *state = (ddribble_state *)device->machine->driver_data; UINT8 *SPEECH_ROM = memory_region(device->machine, "vlm"); /* b7 : vlm data bus OE */ @@ -116,33 +116,33 @@ static WRITE8_DEVICE_HANDLER( ddrible_vlm5030_ctrl_w ) static ADDRESS_MAP_START( cpu0_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0004) AM_WRITE(K005885_0_w) /* video registers (005885 #1) */ AM_RANGE(0x0800, 0x0804) AM_WRITE(K005885_1_w) /* video registers (005885 #2) */ - AM_RANGE(0x1800, 0x187f) AM_RAM AM_BASE_MEMBER(ddrible_state, paletteram) /* palette */ - AM_RANGE(0x2000, 0x2fff) AM_RAM_WRITE(ddrible_fg_videoram_w) AM_BASE_MEMBER(ddrible_state, fg_videoram) /* Video RAM 1 */ - AM_RANGE(0x3000, 0x3fff) AM_RAM AM_BASE_MEMBER(ddrible_state, spriteram_1) /* Object RAM 1 */ - AM_RANGE(0x4000, 0x5fff) AM_RAM AM_BASE_MEMBER(ddrible_state, sharedram) /* shared RAM with CPU #1 */ - AM_RANGE(0x6000, 0x6fff) AM_RAM_WRITE(ddrible_bg_videoram_w) AM_BASE_MEMBER(ddrible_state, bg_videoram) /* Video RAM 2 */ - AM_RANGE(0x7000, 0x7fff) AM_RAM AM_BASE_MEMBER(ddrible_state, spriteram_2) /* Object RAM 2 */ - AM_RANGE(0x8000, 0x8000) AM_WRITE(ddrible_bankswitch_w) /* bankswitch control */ + AM_RANGE(0x1800, 0x187f) AM_RAM AM_BASE_MEMBER(ddribble_state, paletteram) /* palette */ + AM_RANGE(0x2000, 0x2fff) AM_RAM_WRITE(ddribble_fg_videoram_w) AM_BASE_MEMBER(ddribble_state, fg_videoram) /* Video RAM 1 */ + AM_RANGE(0x3000, 0x3fff) AM_RAM AM_BASE_MEMBER(ddribble_state, spriteram_1) /* Object RAM 1 */ + AM_RANGE(0x4000, 0x5fff) AM_RAM AM_BASE_MEMBER(ddribble_state, sharedram) /* shared RAM with CPU #1 */ + AM_RANGE(0x6000, 0x6fff) AM_RAM_WRITE(ddribble_bg_videoram_w) AM_BASE_MEMBER(ddribble_state, bg_videoram) /* Video RAM 2 */ + AM_RANGE(0x7000, 0x7fff) AM_RAM AM_BASE_MEMBER(ddribble_state, spriteram_2) /* Object RAM 2 */ + AM_RANGE(0x8000, 0x8000) AM_WRITE(ddribble_bankswitch_w) /* bankswitch control */ AM_RANGE(0x8000, 0x9fff) AM_ROMBANK("bank1") /* banked ROM */ AM_RANGE(0xa000, 0xffff) AM_ROM /* ROM */ ADDRESS_MAP_END static ADDRESS_MAP_START( cpu1_map, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_READWRITE(ddrible_sharedram_r, ddrible_sharedram_w) /* shared RAM with CPU #0 */ - AM_RANGE(0x2000, 0x27ff) AM_READWRITE(ddrible_snd_sharedram_r, ddrible_snd_sharedram_w) /* shared RAM with CPU #2 */ + AM_RANGE(0x0000, 0x1fff) AM_READWRITE(ddribble_sharedram_r, ddribble_sharedram_w) /* shared RAM with CPU #0 */ + AM_RANGE(0x2000, 0x27ff) AM_READWRITE(ddribble_snd_sharedram_r, ddribble_snd_sharedram_w) /* shared RAM with CPU #2 */ AM_RANGE(0x2800, 0x2800) AM_READ_PORT("DSW1") AM_RANGE(0x2801, 0x2801) AM_READ_PORT("P1") AM_RANGE(0x2802, 0x2802) AM_READ_PORT("P2") AM_RANGE(0x2803, 0x2803) AM_READ_PORT("SYSTEM") /* coinsw & start */ AM_RANGE(0x2c00, 0x2c00) AM_READ_PORT("DSW2") AM_RANGE(0x3000, 0x3000) AM_READ_PORT("DSW3") - AM_RANGE(0x3400, 0x3400) AM_WRITE(ddrible_coin_counter_w) /* coin counters */ + AM_RANGE(0x3400, 0x3400) AM_WRITE(ddribble_coin_counter_w) /* coin counters */ AM_RANGE(0x3c00, 0x3c00) AM_WRITE(watchdog_reset_w) /* watchdog reset */ AM_RANGE(0x8000, 0xffff) AM_ROM /* ROM */ ADDRESS_MAP_END static ADDRESS_MAP_START( cpu2_map, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x07ff) AM_RAM AM_BASE_MEMBER(ddrible_state, snd_sharedram) /* shared RAM with CPU #1 */ + AM_RANGE(0x0000, 0x07ff) AM_RAM AM_BASE_MEMBER(ddribble_state, snd_sharedram) /* shared RAM with CPU #1 */ AM_RANGE(0x1000, 0x1001) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w) /* YM2203 */ AM_RANGE(0x3000, 0x3000) AM_DEVWRITE("vlm", vlm5030_data_w) /* Speech data */ AM_RANGE(0x8000, 0xffff) AM_ROM /* ROM */ @@ -221,7 +221,7 @@ static const gfx_layout spritelayout = 32*32 }; -static GFXDECODE_START( ddrible ) +static GFXDECODE_START( ddribble ) GFXDECODE_ENTRY( "gfx1", 0x00000, charlayout, 48, 1 ) /* colors 48-63 */ GFXDECODE_ENTRY( "gfx2", 0x00000, charlayout, 16, 1 ) /* colors 16-31 */ GFXDECODE_ENTRY( "gfx1", 0x20000, spritelayout, 32, 1 ) /* colors 32-47 */ @@ -234,8 +234,8 @@ static const ym2203_interface ym2203_config = AY8910_LEGACY_OUTPUT, AY8910_DEFAULT_LOADS, DEVCB_NULL, - DEVCB_DEVICE_HANDLER("vlm", ddrible_vlm5030_busy_r), - DEVCB_DEVICE_HANDLER("vlm", ddrible_vlm5030_ctrl_w), + DEVCB_DEVICE_HANDLER("vlm", ddribble_vlm5030_busy_r), + DEVCB_DEVICE_HANDLER("vlm", ddribble_vlm5030_ctrl_w), DEVCB_NULL }, NULL @@ -248,9 +248,9 @@ static const vlm5030_interface vlm5030_config = -static MACHINE_START( ddrible ) +static MACHINE_START( ddribble ) { - ddrible_state *state = (ddrible_state *)machine->driver_data; + ddribble_state *state = (ddribble_state *)machine->driver_data; UINT8 *ROM = memory_region(machine, "maincpu"); memory_configure_bank(machine, "bank1", 0, 5, &ROM[0x10000], 0x2000); @@ -265,9 +265,9 @@ static MACHINE_START( ddrible ) state_save_register_global_array(machine, state->charbank); } -static MACHINE_RESET( ddrible ) +static MACHINE_RESET( ddribble ) { - ddrible_state *state = (ddrible_state *)machine->driver_data; + ddribble_state *state = (ddribble_state *)machine->driver_data; int i; for (i = 0; i < 5; i++) @@ -285,24 +285,24 @@ static MACHINE_RESET( ddrible ) static MACHINE_DRIVER_START( ddribble ) /* driver data */ - MDRV_DRIVER_DATA(ddrible_state) + MDRV_DRIVER_DATA(ddribble_state) /* basic machine hardware */ MDRV_CPU_ADD("maincpu", M6809, XTAL_18_432MHz/12) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(cpu0_map) - MDRV_CPU_VBLANK_INT("screen", ddrible_interrupt_0) + MDRV_CPU_VBLANK_INT("screen", ddribble_interrupt_0) MDRV_CPU_ADD("cpu1", M6809, XTAL_18_432MHz/12) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(cpu1_map) - MDRV_CPU_VBLANK_INT("screen", ddrible_interrupt_1) + MDRV_CPU_VBLANK_INT("screen", ddribble_interrupt_1) MDRV_CPU_ADD("cpu2", M6809, XTAL_18_432MHz/12) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(cpu2_map) MDRV_QUANTUM_TIME(HZ(6000)) /* we need heavy synch */ - MDRV_MACHINE_START(ddrible) - MDRV_MACHINE_RESET(ddrible) + MDRV_MACHINE_START(ddribble) + MDRV_MACHINE_RESET(ddribble) /* video hardware */ MDRV_SCREEN_ADD("screen", RASTER) @@ -314,12 +314,12 @@ static MACHINE_DRIVER_START( ddribble ) /* MDRV_SCREEN_SIZE(64*8, 32*8) MDRV_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 2*8, 30*8-1) */ - MDRV_GFXDECODE(ddrible) + MDRV_GFXDECODE(ddribble) MDRV_PALETTE_LENGTH(64 + 256) - MDRV_PALETTE_INIT(ddrible) - MDRV_VIDEO_START(ddrible) - MDRV_VIDEO_UPDATE(ddrible) + MDRV_PALETTE_INIT(ddribble) + MDRV_VIDEO_START(ddribble) + MDRV_VIDEO_UPDATE(ddribble) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/dec8.c b/src/mame/drivers/dec8.c index 8720fe4592e..713a9b110f4 100644 --- a/src/mame/drivers/dec8.c +++ b/src/mame/drivers/dec8.c @@ -295,7 +295,7 @@ static WRITE8_HANDLER( shackled_i8751_w ) ((((state->coin1 / 10) << 4) | (state->coin1 % 10)) << 8); /* Coins */ } -static WRITE8_HANDLER( lastmiss_i8751_w ) +static WRITE8_HANDLER( lastmisn_i8751_w ) { dec8_state *state = (dec8_state *)space->machine->driver_data; state->i8751_return = 0; @@ -681,7 +681,7 @@ static ADDRESS_MAP_START( oscar_sub_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x4000, 0xffff) AM_ROM ADDRESS_MAP_END -static ADDRESS_MAP_START( lastmiss_map, ADDRESS_SPACE_PROGRAM, 8 ) +static ADDRESS_MAP_START( lastmisn_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0fff) AM_RAM AM_SHARE("share1") AM_RANGE(0x1000, 0x13ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split1_w) AM_SHARE("share3") AM_BASE_GENERIC(paletteram) AM_RANGE(0x1400, 0x17ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split2_w) AM_SHARE("share4") AM_BASE_GENERIC(paletteram2) @@ -694,11 +694,11 @@ static ADDRESS_MAP_START( lastmiss_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1805, 0x1805) AM_WRITE(buffer_spriteram_w) /* DMA */ AM_RANGE(0x1806, 0x1806) AM_READ(i8751_h_r) AM_RANGE(0x1807, 0x1807) AM_READWRITE(i8751_l_r, flip_screen_w) - AM_RANGE(0x1809, 0x1809) AM_WRITE(lastmiss_scrollx_w) /* Scroll LSB */ - AM_RANGE(0x180b, 0x180b) AM_WRITE(lastmiss_scrolly_w) /* Scroll LSB */ + AM_RANGE(0x1809, 0x1809) AM_WRITE(lastmisn_scrollx_w) /* Scroll LSB */ + AM_RANGE(0x180b, 0x180b) AM_WRITE(lastmisn_scrolly_w) /* Scroll LSB */ AM_RANGE(0x180c, 0x180c) AM_WRITE(dec8_sound_w) - AM_RANGE(0x180d, 0x180d) AM_WRITE(lastmiss_control_w) /* Bank switch + Scroll MSB */ - AM_RANGE(0x180e, 0x180f) AM_WRITE(lastmiss_i8751_w) + AM_RANGE(0x180d, 0x180d) AM_WRITE(lastmisn_control_w) /* Bank switch + Scroll MSB */ + AM_RANGE(0x180e, 0x180f) AM_WRITE(lastmisn_i8751_w) AM_RANGE(0x2000, 0x27ff) AM_RAM_WRITE(dec8_videoram_w) AM_BASE_SIZE_MEMBER(dec8_state, videoram, videoram_size) AM_RANGE(0x2800, 0x2fff) AM_RAM AM_BASE_SIZE_GENERIC(spriteram) AM_RANGE(0x3000, 0x37ff) AM_RAM AM_SHARE("share2") @@ -707,7 +707,7 @@ static ADDRESS_MAP_START( lastmiss_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END -static ADDRESS_MAP_START( lastmiss_sub_map, ADDRESS_SPACE_PROGRAM, 8 ) +static ADDRESS_MAP_START( lastmisn_sub_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0fff) AM_RAM AM_SHARE("share1") AM_RANGE(0x1000, 0x13ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split1_w) AM_SHARE("share3") AM_RANGE(0x1400, 0x17ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split2_w) AM_SHARE("share4") @@ -739,8 +739,8 @@ static ADDRESS_MAP_START( shackled_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1800, 0x1804) AM_WRITE(shackled_int_w) AM_RANGE(0x1805, 0x1805) AM_WRITE(buffer_spriteram_w) /* DMA */ AM_RANGE(0x1807, 0x1807) AM_WRITE(flip_screen_w) - AM_RANGE(0x1809, 0x1809) AM_WRITE(lastmiss_scrollx_w) /* Scroll LSB */ - AM_RANGE(0x180b, 0x180b) AM_WRITE(lastmiss_scrolly_w) /* Scroll LSB */ + AM_RANGE(0x1809, 0x1809) AM_WRITE(lastmisn_scrollx_w) /* Scroll LSB */ + AM_RANGE(0x180b, 0x180b) AM_WRITE(lastmisn_scrolly_w) /* Scroll LSB */ AM_RANGE(0x180c, 0x180c) AM_WRITE(dec8_sound_w) AM_RANGE(0x180d, 0x180d) AM_WRITE(shackled_control_w) /* Bank switch + Scroll MSB */ AM_RANGE(0x2000, 0x27ff) AM_RAM_WRITE(dec8_videoram_w) @@ -764,8 +764,8 @@ static ADDRESS_MAP_START( shackled_sub_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1805, 0x1805) AM_WRITE(buffer_spriteram_w) /* DMA */ AM_RANGE(0x1806, 0x1806) AM_READ(i8751_h_r) AM_RANGE(0x1807, 0x1807) AM_READWRITE(i8751_l_r, flip_screen_w) - AM_RANGE(0x1809, 0x1809) AM_WRITE(lastmiss_scrollx_w) /* Scroll LSB */ - AM_RANGE(0x180b, 0x180b) AM_WRITE(lastmiss_scrolly_w) /* Scroll LSB */ + AM_RANGE(0x1809, 0x1809) AM_WRITE(lastmisn_scrollx_w) /* Scroll LSB */ + AM_RANGE(0x180b, 0x180b) AM_WRITE(lastmisn_scrolly_w) /* Scroll LSB */ AM_RANGE(0x180c, 0x180c) AM_WRITE(dec8_sound_w) AM_RANGE(0x180d, 0x180d) AM_WRITE(shackled_control_w) /* Bank switch + Scroll MSB */ AM_RANGE(0x180e, 0x180f) AM_WRITE(shackled_i8751_w) @@ -1493,7 +1493,7 @@ static INPUT_PORTS_START( lastmisn ) PORT_DIPSETTING( 0x00, DEF_STR( Yes ) ) INPUT_PORTS_END -static INPUT_PORTS_START( lastmsnj ) +static INPUT_PORTS_START( lastmisnj ) PORT_START("IN0") PLAYER1_JOYSTICK PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) @@ -2294,17 +2294,17 @@ static MACHINE_DRIVER_START( oscar ) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70) MACHINE_DRIVER_END -static MACHINE_DRIVER_START( lastmiss ) +static MACHINE_DRIVER_START( lastmisn ) /* driver data */ MDRV_DRIVER_DATA(dec8_state) /* basic machine hardware */ MDRV_CPU_ADD("maincpu", M6809, 2000000) - MDRV_CPU_PROGRAM_MAP(lastmiss_map) + MDRV_CPU_PROGRAM_MAP(lastmisn_map) MDRV_CPU_ADD("sub", M6809, 2000000) - MDRV_CPU_PROGRAM_MAP(lastmiss_sub_map) + MDRV_CPU_PROGRAM_MAP(lastmisn_sub_map) MDRV_CPU_ADD("audiocpu", M6502, 1500000) MDRV_CPU_PROGRAM_MAP(ym3526_s_map) @@ -2327,8 +2327,8 @@ static MACHINE_DRIVER_START( lastmiss ) MDRV_GFXDECODE(shackled) MDRV_PALETTE_LENGTH(1024) - MDRV_VIDEO_START(lastmiss) - MDRV_VIDEO_UPDATE(lastmiss) + MDRV_VIDEO_START(lastmisn) + MDRV_VIDEO_UPDATE(lastmisn) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") @@ -2428,8 +2428,8 @@ static MACHINE_DRIVER_START( csilver ) MDRV_GFXDECODE(shackled) MDRV_PALETTE_LENGTH(1024) - MDRV_VIDEO_START(lastmiss) - MDRV_VIDEO_UPDATE(lastmiss) + MDRV_VIDEO_START(lastmisn) + MDRV_VIDEO_UPDATE(lastmisn) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") @@ -3603,7 +3603,7 @@ static DRIVER_INIT( shackled ) DRIVER_INIT_CALL( dec8 ); } -static DRIVER_INIT( lastmiss ) +static DRIVER_INIT( lastmisn ) { UINT8 *ROM = memory_region(machine, "maincpu"); memory_configure_bank(machine, "bank1", 0, 4, &ROM[0x10000], 0x4000); @@ -3634,9 +3634,9 @@ GAME( 1988, oscar, 0, oscar, oscar, oscar, ROT0, "Data E GAME( 1987, oscaru, oscar, oscar, oscaru, oscar, ROT0, "Data East USA", "Psycho-Nics Oscar (US)", GAME_SUPPORTS_SAVE ) GAME( 1987, oscarj1, oscar, oscar, oscaru, oscar, ROT0, "Data East Corporation", "Psycho-Nics Oscar (Japan revision 1)", GAME_SUPPORTS_SAVE ) GAME( 1987, oscarj2, oscar, oscar, oscaru, oscar, ROT0, "Data East Corporation", "Psycho-Nics Oscar (Japan revision 2)", GAME_SUPPORTS_SAVE ) -GAME( 1986, lastmisn, 0, lastmiss, lastmisn, lastmiss, ROT270, "Data East USA", "Last Mission (US revision 6)", GAME_SUPPORTS_SAVE ) -GAME( 1986, lastmisno,lastmisn, lastmiss, lastmisn, lastmiss, ROT270, "Data East USA", "Last Mission (US revision 5)", GAME_SUPPORTS_SAVE ) -GAME( 1986, lastmisnj,lastmisn, lastmiss, lastmsnj, lastmiss, ROT270, "Data East Corporation", "Last Mission (Japan)", GAME_SUPPORTS_SAVE ) +GAME( 1986, lastmisn, 0, lastmisn, lastmisn, lastmisn, ROT270, "Data East USA", "Last Mission (US revision 6)", GAME_SUPPORTS_SAVE ) +GAME( 1986, lastmisno,lastmisn, lastmisn, lastmisn, lastmisn, ROT270, "Data East USA", "Last Mission (US revision 5)", GAME_SUPPORTS_SAVE ) +GAME( 1986, lastmisnj,lastmisn, lastmisn, lastmisnj, lastmisn, ROT270, "Data East Corporation", "Last Mission (Japan)", GAME_SUPPORTS_SAVE ) GAME( 1986, shackled, 0, shackled, shackled, shackled, ROT0, "Data East USA", "Shackled (US)", GAME_SUPPORTS_SAVE ) GAME( 1986, breywood, shackled, shackled, shackled, shackled, ROT0, "Data East Corporation", "Breywood (Japan revision 2)", GAME_SUPPORTS_SAVE ) GAME( 1987, csilver, 0, csilver, csilver, csilver, ROT0, "Data East Corporation", "Captain Silver (World)", GAME_SUPPORTS_SAVE ) diff --git a/src/mame/drivers/decocass.c b/src/mame/drivers/decocass.c index d2ac9028eb6..9ead89e4f91 100644 --- a/src/mame/drivers/decocass.c +++ b/src/mame/drivers/decocass.c @@ -789,11 +789,11 @@ static MACHINE_DRIVER_START( cgraplop ) MACHINE_DRIVER_END -static MACHINE_DRIVER_START( cgraplp2 ) +static MACHINE_DRIVER_START( cgraplop2 ) /* basic machine hardware */ MDRV_IMPORT_FROM(decocass) - MDRV_MACHINE_RESET(cgraplp2) + MDRV_MACHINE_RESET(cgraplop2) MACHINE_DRIVER_END @@ -1170,7 +1170,7 @@ ROM_START( cgraplop2 ) ROM_LOAD( "cgraplop.pro", 0x0000, 0x1000, CRC(ee93787d) SHA1(0c753d62fdce2fdbd5b329a5aa259a967d07a651) ) /* is this right for this set? */ ROM_REGION( 0x10000, "cassette", 0 ) /* (max) 64k for cassette image */ - ROM_LOAD( "cgraplp2.cas", 0x0000, 0x8000, CRC(2e728981) SHA1(83ba90d95858d647315a1c311b8643672afea5f7) ) + ROM_LOAD( "cgraplop2.cas", 0x0000, 0x8000, CRC(2e728981) SHA1(83ba90d95858d647315a1c311b8643672afea5f7) ) ROM_END ROM_START( clapapa ) @@ -1404,7 +1404,7 @@ static DRIVER_INIT( decocrom ) /* 27 */ GAME( 1982, cburnrub2,cburnrub, cburnrub, decocass, decocass, ROT270, "Data East Corporation", "Burnin' Rubber (Cassette, set 2)", 0 ) /* 27 */ GAME( 1982, cbnj, cburnrub, cbnj, decocass, decocass, ROT270, "Data East Corporation", "Bump N Jump (Cassette)", 0 ) /* 28 */ GAME( 1983, cgraplop, decocass, cgraplop, cgraplop, decocass, ROT270, "Data East Corporation", "Cluster Buster / Graplop (Cassette, set 1)", 0 ) -/* 28 */ GAME( 1983, cgraplop2,cgraplop, cgraplp2, cgraplop, decocass, ROT270, "Data East Corporation", "Cluster Buster / Graplop (Cassette, set 2)", GAME_NOT_WORKING ) +/* 28 */ GAME( 1983, cgraplop2,cgraplop, cgraplop2,cgraplop, decocass, ROT270, "Data East Corporation", "Cluster Buster / Graplop (Cassette, set 2)", GAME_NOT_WORKING ) /* 29 */ GAME( 1983, clapapa, decocass, clapapa, decocass, decocass, ROT270, "Data East Corporation", "Rootin' Tootin' / La-Pa-Pa (Cassette)" , 0) /* Displays 'La-Pa-Pa during attract */ /* 29 */ GAME( 1983, clapapa2, clapapa, clapapa, decocass, decocass, ROT270, "Data East Corporation", "Rootin' Tootin' (Cassette)" , 0) /* Displays 'Rootin' Tootin' during attract */ /* 31 */ GAME( 1983, cprobowl, decocass, cprobowl, decocass, decocass, ROT270, "Data East Corporation", "Pro Bowling (Cassette)", 0 ) diff --git a/src/mame/drivers/destroyr.c b/src/mame/drivers/destroyr.c index 48ddb42ff06..234d340fd48 100644 --- a/src/mame/drivers/destroyr.c +++ b/src/mame/drivers/destroyr.c @@ -449,7 +449,7 @@ static MACHINE_DRIVER_START( destroyr ) MDRV_DRIVER_DATA(destroyr_state) /* basic machine hardware */ - MDRV_CPU_ADD("maincpu", M6800, 12096000 / 16) + MDRV_CPU_ADD("maincpu", M6800, XTAL_12_096MHz / 16) MDRV_CPU_PROGRAM_MAP(destroyr_map) MDRV_CPU_VBLANK_INT_HACK(irq0_line_assert, 4) diff --git a/src/mame/includes/ddrible.h b/src/mame/includes/ddribble.h similarity index 71% rename from src/mame/includes/ddrible.h rename to src/mame/includes/ddribble.h index 22037e8b59c..98bd21348be 100644 --- a/src/mame/includes/ddrible.h +++ b/src/mame/includes/ddribble.h @@ -4,8 +4,8 @@ ***************************************************************************/ -typedef struct _ddrible_state ddrible_state; -struct _ddrible_state +typedef struct _ddribble_state ddribble_state; +struct _ddribble_state { /* memory pointers */ UINT8 * sharedram; @@ -30,13 +30,13 @@ struct _ddrible_state running_device *filter3; }; -/*----------- defined in video/ddrible.c -----------*/ +/*----------- defined in video/ddribble.c -----------*/ -WRITE8_HANDLER( ddrible_fg_videoram_w ); -WRITE8_HANDLER( ddrible_bg_videoram_w ); +WRITE8_HANDLER( ddribble_fg_videoram_w ); +WRITE8_HANDLER( ddribble_bg_videoram_w ); WRITE8_HANDLER( K005885_0_w ); WRITE8_HANDLER( K005885_1_w ); -PALETTE_INIT( ddrible ); -VIDEO_START( ddrible ); -VIDEO_UPDATE( ddrible ); +PALETTE_INIT( ddribble ); +VIDEO_START( ddribble ); +VIDEO_UPDATE( ddribble ); diff --git a/src/mame/includes/dec8.h b/src/mame/includes/dec8.h index e31dbe629ce..9d85009680f 100644 --- a/src/mame/includes/dec8.h +++ b/src/mame/includes/dec8.h @@ -42,13 +42,13 @@ VIDEO_UPDATE( ghostb ); VIDEO_UPDATE( srdarwin ); VIDEO_UPDATE( gondo ); VIDEO_UPDATE( garyoret ); -VIDEO_UPDATE( lastmiss ); +VIDEO_UPDATE( lastmisn ); VIDEO_UPDATE( shackled ); VIDEO_UPDATE( oscar ); VIDEO_START( cobracom ); VIDEO_START( oscar ); VIDEO_START( ghostb ); -VIDEO_START( lastmiss ); +VIDEO_START( lastmisn ); VIDEO_START( shackled ); VIDEO_START( srdarwin ); VIDEO_START( gondo ); @@ -65,7 +65,7 @@ WRITE8_HANDLER( dec8_scroll2_w ); WRITE8_HANDLER( srdarwin_control_w ); WRITE8_HANDLER( gondo_scroll_w ); WRITE8_HANDLER( shackled_control_w ); -WRITE8_HANDLER( lastmiss_control_w ); -WRITE8_HANDLER( lastmiss_scrollx_w ); -WRITE8_HANDLER( lastmiss_scrolly_w ); +WRITE8_HANDLER( lastmisn_control_w ); +WRITE8_HANDLER( lastmisn_scrollx_w ); +WRITE8_HANDLER( lastmisn_scrolly_w ); WRITE8_HANDLER( dec8_videoram_w ); diff --git a/src/mame/machine/decocass.c b/src/mame/machine/decocass.c index b1659c61ec9..7366a990911 100644 --- a/src/mame/machine/decocass.c +++ b/src/mame/machine/decocass.c @@ -1570,7 +1570,7 @@ MACHINE_RESET( cgraplop ) state->type3_swap = TYPE3_SWAP_56; } -MACHINE_RESET( cgraplp2 ) +MACHINE_RESET( cgraplop2 ) { decocass_state *state = (decocass_state *)machine->driver_data; decocass_reset_common(machine); diff --git a/src/mame/machine/decocass.h b/src/mame/machine/decocass.h index dd160db7bae..b6f2df8e503 100644 --- a/src/mame/machine/decocass.h +++ b/src/mame/machine/decocass.h @@ -149,7 +149,7 @@ extern MACHINE_RESET( cbnj ); extern MACHINE_RESET( cburnrub ); extern MACHINE_RESET( cbtime ); extern MACHINE_RESET( cgraplop ); -extern MACHINE_RESET( cgraplp2 ); +extern MACHINE_RESET( cgraplop2 ); extern MACHINE_RESET( clapapa ); extern MACHINE_RESET( cfghtice ); extern MACHINE_RESET( cprobowl ); diff --git a/src/mame/mame.mak b/src/mame/mame.mak index 875a38ba520..d3dced3f7ff 100644 --- a/src/mame/mame.mak +++ b/src/mame/mame.mak @@ -774,7 +774,7 @@ $(MAMEOBJ)/konami.a: \ $(DRIVERS)/contra.o $(VIDEO)/contra.o \ $(DRIVERS)/crimfght.o $(VIDEO)/crimfght.o \ $(DRIVERS)/dbz.o $(VIDEO)/dbz.o \ - $(DRIVERS)/ddrible.o $(VIDEO)/ddrible.o \ + $(DRIVERS)/ddribble.o $(VIDEO)/ddribble.o \ $(DRIVERS)/djmain.o $(VIDEO)/djmain.o \ $(DRIVERS)/fastfred.o $(VIDEO)/fastfred.o \ $(DRIVERS)/fastlane.o $(VIDEO)/fastlane.o \ diff --git a/src/mame/mamedriv.c b/src/mame/mamedriv.c index e0036b0ed0d..5a9e54dce79 100644 --- a/src/mame/mamedriv.c +++ b/src/mame/mamedriv.c @@ -8161,10 +8161,10 @@ Other Sun games DRIVER( mjtensin ) /* "100" 1995 Dynax */ DRIVER( nettoqc ) /* "103" (c) 1995 Nakanihon */ DRIVER( majrjhdx ) /* "105" 1996 Dynax */ - DRIVER( ddenlvrj ) /* "113" (c) 1995 Dynax */ - DRIVER( ddenlvrk ) /* "113" (c) 1995 Dynax */ - DRIVER( ddenlovr ) /* "113" (c) 1996 Dynax */ - DRIVER( ddenlovb ) /* bootleg */ + DRIVER( ddenlovj ) /* "113" (c) 1995 Dynax (Japan) */ + DRIVER( ddenlovrk ) /* "113" (c) 1995 Dynax (Korea) */ + DRIVER( ddenlovr ) /* "113" (c) 1996 Dynax (Hong Kong) */ + DRIVER( ddenlovrb ) /* bootleg */ DRIVER( hanakanz ) /* "507" 1996 Dynax */ DRIVER( akamaru ) /* "501" 1996 Dynax */ DRIVER( sryudens ) /* "502" 1996 Dynax / Face */ diff --git a/src/mame/video/ddrible.c b/src/mame/video/ddribble.c similarity index 89% rename from src/mame/video/ddrible.c rename to src/mame/video/ddribble.c index ec0a4877d8c..53d4517750d 100644 --- a/src/mame/video/ddrible.c +++ b/src/mame/video/ddribble.c @@ -7,10 +7,10 @@ ***************************************************************************/ #include "emu.h" -#include "includes/ddrible.h" +#include "includes/ddribble.h" -PALETTE_INIT( ddrible ) +PALETTE_INIT( ddribble ) { int i; @@ -31,7 +31,7 @@ PALETTE_INIT( ddrible ) static void set_pens( running_machine *machine ) { - ddrible_state *state = (ddrible_state *)machine->driver_data; + ddribble_state *state = (ddribble_state *)machine->driver_data; int i; for (i = 0x00; i < 0x80; i += 2) @@ -46,7 +46,7 @@ static void set_pens( running_machine *machine ) WRITE8_HANDLER( K005885_0_w ) { - ddrible_state *state = (ddrible_state *)space->machine->driver_data; + ddribble_state *state = (ddribble_state *)space->machine->driver_data; switch (offset) { case 0x03: /* char bank selection for set 1 */ @@ -65,7 +65,7 @@ WRITE8_HANDLER( K005885_0_w ) WRITE8_HANDLER( K005885_1_w ) { - ddrible_state *state = (ddrible_state *)space->machine->driver_data; + ddribble_state *state = (ddribble_state *)space->machine->driver_data; switch (offset) { case 0x03: /* char bank selection for set 2 */ @@ -96,7 +96,7 @@ static TILEMAP_MAPPER( tilemap_scan ) static TILE_GET_INFO( get_fg_tile_info ) { - ddrible_state *state = (ddrible_state *)machine->driver_data; + ddribble_state *state = (ddribble_state *)machine->driver_data; UINT8 attr = state->fg_videoram[tile_index]; int num = state->fg_videoram[tile_index + 0x400] + ((attr & 0xc0) << 2) + ((attr & 0x20) << 5) + ((state->charbank[0] & 2) << 10); SET_TILE_INFO( @@ -108,7 +108,7 @@ static TILE_GET_INFO( get_fg_tile_info ) static TILE_GET_INFO( get_bg_tile_info ) { - ddrible_state *state = (ddrible_state *)machine->driver_data; + ddribble_state *state = (ddribble_state *)machine->driver_data; UINT8 attr = state->bg_videoram[tile_index]; int num = state->bg_videoram[tile_index + 0x400] + ((attr & 0xc0) << 2) + ((attr & 0x20) << 5) + (state->charbank[1] << 11); SET_TILE_INFO( @@ -124,9 +124,9 @@ static TILE_GET_INFO( get_bg_tile_info ) ***************************************************************************/ -VIDEO_START( ddrible ) +VIDEO_START( ddribble ) { - ddrible_state *state = (ddrible_state *)machine->driver_data; + ddribble_state *state = (ddribble_state *)machine->driver_data; state->fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan, 8, 8, 64, 32); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan, 8, 8, 64, 32); @@ -140,16 +140,16 @@ VIDEO_START( ddrible ) ***************************************************************************/ -WRITE8_HANDLER( ddrible_fg_videoram_w ) +WRITE8_HANDLER( ddribble_fg_videoram_w ) { - ddrible_state *state = (ddrible_state *)space->machine->driver_data; + ddribble_state *state = (ddribble_state *)space->machine->driver_data; state->fg_videoram[offset] = data; tilemap_mark_tile_dirty(state->fg_tilemap, offset & 0xbff); } -WRITE8_HANDLER( ddrible_bg_videoram_w ) +WRITE8_HANDLER( ddribble_bg_videoram_w ) { - ddrible_state *state = (ddrible_state *)space->machine->driver_data; + ddribble_state *state = (ddribble_state *)space->machine->driver_data; state->bg_videoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset & 0xbff); } @@ -250,9 +250,9 @@ static void draw_sprites( running_machine* machine, bitmap_t *bitmap, const rect ***************************************************************************/ -VIDEO_UPDATE( ddrible ) +VIDEO_UPDATE( ddribble ) { - ddrible_state *state = (ddrible_state *)screen->machine->driver_data; + ddribble_state *state = (ddribble_state *)screen->machine->driver_data; set_pens(screen->machine); tilemap_set_flip(state->fg_tilemap, (state->vregs[0][4] & 0x08) ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); diff --git a/src/mame/video/dec8.c b/src/mame/video/dec8.c index 2e010cc4457..c5220d57496 100644 --- a/src/mame/video/dec8.c +++ b/src/mame/video/dec8.c @@ -182,7 +182,7 @@ WRITE8_HANDLER( srdarwin_control_w ) } } -WRITE8_HANDLER( lastmiss_control_w ) +WRITE8_HANDLER( lastmisn_control_w ) { dec8_state *state = (dec8_state *)space->machine->driver_data; @@ -215,13 +215,13 @@ WRITE8_HANDLER( shackled_control_w ) state->scroll2[2] = (data >> 6) & 1; } -WRITE8_HANDLER( lastmiss_scrollx_w ) +WRITE8_HANDLER( lastmisn_scrollx_w ) { dec8_state *state = (dec8_state *)space->machine->driver_data; state->scroll2[1] = data; } -WRITE8_HANDLER( lastmiss_scrolly_w ) +WRITE8_HANDLER( lastmisn_scrolly_w ) { dec8_state *state = (dec8_state *)space->machine->driver_data; state->scroll2[3] = data; @@ -640,7 +640,7 @@ VIDEO_START( oscar ) /******************************************************************************/ -VIDEO_UPDATE( lastmiss ) +VIDEO_UPDATE( lastmisn ) { dec8_state *state = (dec8_state *)screen->machine->driver_data; tilemap_set_scrollx(state->pf0_tilemap, 0, ((state->scroll2[0] << 8)+ state->scroll2[1])); @@ -667,13 +667,13 @@ VIDEO_UPDATE( shackled ) return 0; } -static TILEMAP_MAPPER( lastmiss_scan_rows ) +static TILEMAP_MAPPER( lastmisn_scan_rows ) { /* logical (col,row) -> memory offset */ return ((col & 0x0f) + ((row & 0x0f) << 4)) + ((col & 0x10) << 4) + ((row & 0x10) << 5); } -static TILE_GET_INFO( get_lastmiss_tile_info ) +static TILE_GET_INFO( get_lastmisn_tile_info ) { dec8_state *state = (dec8_state *)machine->driver_data; int offs = tile_index * 2; @@ -692,7 +692,7 @@ static TILE_GET_INFO( get_lastmiss_tile_info ) 0); } -static TILE_GET_INFO( get_lastmiss_fix_tile_info ) +static TILE_GET_INFO( get_lastmisn_fix_tile_info ) { dec8_state *state = (dec8_state *)machine->driver_data; int offs = tile_index << 1; @@ -706,11 +706,11 @@ static TILE_GET_INFO( get_lastmiss_fix_tile_info ) 0); } -VIDEO_START( lastmiss ) +VIDEO_START( lastmisn ) { dec8_state *state = (dec8_state *)machine->driver_data; - state->pf0_tilemap = tilemap_create(machine, get_lastmiss_tile_info, lastmiss_scan_rows, 16, 16, 32, 32); - state->fix_tilemap = tilemap_create(machine, get_lastmiss_fix_tile_info, tilemap_scan_rows, 8, 8, 32, 32); + state->pf0_tilemap = tilemap_create(machine, get_lastmisn_tile_info, lastmisn_scan_rows, 16, 16, 32, 32); + state->fix_tilemap = tilemap_create(machine, get_lastmisn_fix_tile_info, tilemap_scan_rows, 8, 8, 32, 32); tilemap_set_transparent_pen(state->fix_tilemap, 0); state->game_uses_priority = 0; @@ -719,8 +719,8 @@ VIDEO_START( lastmiss ) VIDEO_START( shackled ) { dec8_state *state = (dec8_state *)machine->driver_data; - state->pf0_tilemap = tilemap_create(machine, get_lastmiss_tile_info, lastmiss_scan_rows, 16, 16, 32, 32); - state->fix_tilemap = tilemap_create(machine, get_lastmiss_fix_tile_info, tilemap_scan_rows, 8, 8, 32, 32); + state->pf0_tilemap = tilemap_create(machine, get_lastmisn_tile_info, lastmisn_scan_rows, 16, 16, 32, 32); + state->fix_tilemap = tilemap_create(machine, get_lastmisn_fix_tile_info, tilemap_scan_rows, 8, 8, 32, 32); tilemap_set_transparent_pen(state->fix_tilemap, 0); tilemap_set_transmask(state->pf0_tilemap, 0, 0x000f, 0xfff0); /* Bottom 12 pens */