From 135a55fff1515ae5da3517dec137add6da468ef5 Mon Sep 17 00:00:00 2001 From: Scott Stone Date: Wed, 3 Feb 2010 23:16:00 +0000 Subject: [PATCH] Source Cleanup: Setname fixes and other minor changes - Drivers starting with C. --- src/mame/drivers/canyon.c | 2 +- src/mame/drivers/carpolo.c | 2 +- src/mame/drivers/cave.c | 10 +++---- src/mame/drivers/cball.c | 2 +- src/mame/drivers/ccastles.c | 6 ++-- src/mame/drivers/cclimber.c | 8 +++--- src/mame/drivers/champbas.c | 8 +++--- src/mame/drivers/chinagat.c | 48 +++++++++++++++---------------- src/mame/drivers/cidelsa.c | 24 ++++++++-------- src/mame/drivers/cliffhgr.c | 6 ++-- src/mame/drivers/cojag.c | 56 ++++++++++++++++++------------------ src/mame/drivers/commando.c | 10 +++---- src/mame/drivers/crbaloon.c | 2 +- src/mame/drivers/crimfght.c | 6 ++-- src/mame/drivers/crshrace.c | 10 +++---- src/mame/drivers/cshooter.c | 12 ++++---- src/mame/drivers/cvs.c | 6 ++-- src/mame/drivers/cyberbal.c | 34 +++++++++++----------- src/mame/drivers/galaxian.c | 2 +- src/mame/includes/cclimber.h | 4 +-- src/mame/includes/cyberbal.h | 2 +- src/mame/machine/cclimber.c | 6 ++-- src/mame/mamedriv.c | 14 ++++----- src/mame/video/cyberbal.c | 2 +- src/mame/video/konamiic.c | 16 +++++------ src/mame/video/konicdev.c | 16 +++++------ 26 files changed, 157 insertions(+), 157 deletions(-) diff --git a/src/mame/drivers/canyon.c b/src/mame/drivers/canyon.c index 48812b0918a..f8e3f3dc47c 100644 --- a/src/mame/drivers/canyon.c +++ b/src/mame/drivers/canyon.c @@ -240,7 +240,7 @@ static MACHINE_DRIVER_START( canyon ) MDRV_DRIVER_DATA(canyon_state) /* basic machine hardware */ - MDRV_CPU_ADD("maincpu", M6502, 12096000 / 16) + MDRV_CPU_ADD("maincpu", M6502, XTAL_12_096MHz / 16) MDRV_CPU_PROGRAM_MAP(main_map) MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse) MDRV_WATCHDOG_VBLANK_INIT(8) diff --git a/src/mame/drivers/carpolo.c b/src/mame/drivers/carpolo.c index 713cdb13414..5fd83c6d21f 100644 --- a/src/mame/drivers/carpolo.c +++ b/src/mame/drivers/carpolo.c @@ -233,7 +233,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( carpolo ) /* basic machine hardware */ - MDRV_CPU_ADD("maincpu", M6502,11289000/12) /* 940.75 kHz */ + MDRV_CPU_ADD("maincpu", M6502, XTAL_11_289MHz/12) /* 940.75 kHz */ MDRV_CPU_PROGRAM_MAP(main_map) MDRV_CPU_VBLANK_INT("screen", carpolo_timer_interrupt) /* this not strictly VBLANK, but it's supposed to happen 60 diff --git a/src/mame/drivers/cave.c b/src/mame/drivers/cave.c index 554aef8ad25..ee0c2b14445 100644 --- a/src/mame/drivers/cave.c +++ b/src/mame/drivers/cave.c @@ -4089,7 +4089,7 @@ static DRIVER_INIT( metmqstr ) } -static DRIVER_INIT( pwrins2j ) +static DRIVER_INIT( pwrinst2j ) { cave_state *state = (cave_state *)machine->driver_data; UINT8 *ROM = memory_region(machine, "audiocpu"); @@ -4127,7 +4127,7 @@ static DRIVER_INIT( pwrinst2 ) { /* this patch fixes on of the moves, why is it needed? is the rom bad or is there another problem? does the Japan set need it or not? */ - DRIVER_INIT_CALL(pwrins2j); + DRIVER_INIT_CALL(pwrinst2j); #if 1 //ROM PATCH { @@ -4213,7 +4213,7 @@ static DRIVER_INIT( korokoro ) ***************************************************************************/ GAME( 1994, pwrinst2, 0, pwrinst2, metmqstr, pwrinst2, ROT0, "Atlus/Cave", "Power Instinct 2 (US, Ver. 94/04/08)" , 0 ) -GAME( 1994, pwrinst2j, pwrinst2, pwrinst2, metmqstr, pwrins2j, ROT0, "Atlus/Cave", "Gouketsuji Ichizoku 2 (Japan, Ver. 94/04/08)" , 0 ) +GAME( 1994, pwrinst2j, pwrinst2, pwrinst2, metmqstr, pwrinst2j,ROT0, "Atlus/Cave", "Gouketsuji Ichizoku 2 (Japan, Ver. 94/04/08)" , 0 ) GAME( 1994, mazinger, 0, mazinger, mazinger, mazinger, ROT90, "Banpresto/Dynamic Pl. Toei Animation", "Mazinger Z (International/Japan)" , 0 ) // region in eeprom GAME( 1995, donpachi, 0, donpachi, cave, donpachi, ROT270, "Atlus/Cave", "DonPachi (US)" , 0 ) GAME( 1995, donpachij, donpachi, donpachi, cave, donpachi, ROT270, "Atlus/Cave", "DonPachi (Japan)" , 0 ) @@ -4221,8 +4221,8 @@ GAME( 1995, donpachikr, donpachi, donpachi, cave, donpachi, ROT270, "Atlus/C GAME( 1995, donpachihk, donpachi, donpachi, cave, donpachi, ROT270, "Atlus/Cave", "DonPachi (Hong Kong)" , 0 ) GAME( 1995, metmqstr, 0, metmqstr, metmqstr, metmqstr, ROT0, "Banpresto/Pandorabox", "Metamoqester (International)" , 0 ) GAME( 1995, nmaster, metmqstr, metmqstr, metmqstr, metmqstr, ROT0, "Banpresto/Pandorabox", "Oni - The Ninja Master (Japan)" , 0 ) -GAME( 1995, plegends, 0, pwrinst2, metmqstr, pwrins2j, ROT0, "Atlus/Cave", "Power Instinct Legends (US, Ver. 95/06/20)" , 0 ) -GAME( 1995, plegendsj, plegends, pwrinst2, metmqstr, pwrins2j, ROT0, "Atlus/Cave", "Gouketsuji Ichizoku Saikyou Densetsu (Japan, Ver. 95/06/20)", 0 ) +GAME( 1995, plegends, 0, pwrinst2, metmqstr, pwrinst2j,ROT0, "Atlus/Cave", "Power Instinct Legends (US, Ver. 95/06/20)" , 0 ) +GAME( 1995, plegendsj, plegends, pwrinst2, metmqstr, pwrinst2j,ROT0, "Atlus/Cave", "Gouketsuji Ichizoku Saikyou Densetsu (Japan, Ver. 95/06/20)", 0 ) GAME( 1995, sailormn, 0, sailormn, sailormn, sailormn, ROT0, "Banpresto", "Pretty Soldier Sailor Moon (JUEHTK, Ver. 95/03/22B)" , 0 ) // region in eeprom GAME( 1995, sailormno, sailormn, sailormn, sailormn, sailormn, ROT0, "Banpresto", "Pretty Soldier Sailor Moon (JUEHTK, Ver. 95/03/22)" , 0 ) // region in eeprom GAME( 1996, agallet, 0, sailormn, sailormn, agallet, ROT270, "Banpresto / Gazelle", "Air Gallet (JUEHTK)" , 0 ) // board was taiwan, region in eeprom diff --git a/src/mame/drivers/cball.c b/src/mame/drivers/cball.c index 4676e66887c..2673ab6db34 100644 --- a/src/mame/drivers/cball.c +++ b/src/mame/drivers/cball.c @@ -226,7 +226,7 @@ static MACHINE_DRIVER_START( cball ) MDRV_DRIVER_DATA(cball_state) /* basic machine hardware */ - MDRV_CPU_ADD("maincpu", M6800, 12096000 / 16) /* ? */ + MDRV_CPU_ADD("maincpu", M6800, XTAL_12_096MHz / 16) /* ? */ MDRV_CPU_PROGRAM_MAP(cpu_map) MDRV_MACHINE_START(cball) diff --git a/src/mame/drivers/ccastles.c b/src/mame/drivers/ccastles.c index a8b80d59635..37052410f00 100644 --- a/src/mame/drivers/ccastles.c +++ b/src/mame/drivers/ccastles.c @@ -418,7 +418,7 @@ static INPUT_PORTS_START( ccastles ) INPUT_PORTS_END -static INPUT_PORTS_START( ccastlej ) +static INPUT_PORTS_START( ccastlesj ) PORT_INCLUDE(ccastles) PORT_MODIFY("LETA0") @@ -698,11 +698,11 @@ ROM_END * *************************************/ -GAME( 1983, ccastles, 0, ccastles, ccastles, 0, ROT0, "Atari", "Crystal Castles (version 4)", GAME_SUPPORTS_SAVE ) +GAME( 1983, ccastles, 0, ccastles, ccastles, 0, ROT0, "Atari", "Crystal Castles (version 4)", GAME_SUPPORTS_SAVE ) GAME( 1983, ccastlesg, ccastles, ccastles, ccastles, 0, ROT0, "Atari", "Crystal Castles (version 3, German)", GAME_SUPPORTS_SAVE ) GAME( 1983, ccastlesp, ccastles, ccastles, ccastles, 0, ROT0, "Atari", "Crystal Castles (version 3, Spanish)", GAME_SUPPORTS_SAVE ) GAME( 1983, ccastlesf, ccastles, ccastles, ccastles, 0, ROT0, "Atari", "Crystal Castles (version 3, French)", GAME_SUPPORTS_SAVE ) GAME( 1983, ccastles3, ccastles, ccastles, ccastles, 0, ROT0, "Atari", "Crystal Castles (version 3)", GAME_SUPPORTS_SAVE ) GAME( 1983, ccastles2, ccastles, ccastles, ccastles, 0, ROT0, "Atari", "Crystal Castles (version 2)", GAME_SUPPORTS_SAVE ) GAME( 1983, ccastles1, ccastles, ccastles, ccastles, 0, ROT0, "Atari", "Crystal Castles (version 1)", GAME_SUPPORTS_SAVE ) -GAME( 1983, ccastlesj, ccastles, ccastles, ccastlej, 0, ROT0, "Atari", "Crystal Castles (joystick version)", GAME_SUPPORTS_SAVE ) +GAME( 1983, ccastlesj, ccastles, ccastles, ccastlesj,0, ROT0, "Atari", "Crystal Castles (joystick version)", GAME_SUPPORTS_SAVE ) diff --git a/src/mame/drivers/cclimber.c b/src/mame/drivers/cclimber.c index 3f547e3cd3c..3cad1c3058c 100644 --- a/src/mame/drivers/cclimber.c +++ b/src/mame/drivers/cclimber.c @@ -482,7 +482,7 @@ static INPUT_PORTS_START( cclimber ) INPUT_PORTS_END /* Same as 'cclimber' but correct "Bonus Life" Dip Switch */ -static INPUT_PORTS_START( cclimbrj ) +static INPUT_PORTS_START( cclimberj ) PORT_INCLUDE( cclimber ) PORT_MODIFY("DSW") @@ -2041,9 +2041,9 @@ static DRIVER_INIT( toprollr ) GAME( 1980, cclimber, 0, cclimber, cclimber, cclimber, ROT0, "Nichibutsu", "Crazy Climber (US)", 0 ) -GAME( 1980, cclimberj,cclimber, cclimber, cclimbrj, cclimbrj, ROT0, "Nichibutsu", "Crazy Climber (Japan)", 0 ) -GAME( 1980, ccboot, cclimber, cclimber, cclimber, cclimbrj, ROT0, "bootleg", "Crazy Climber (bootleg set 1)", 0 ) -GAME( 1980, ccboot2, cclimber, cclimber, cclimber, cclimbrj, ROT0, "bootleg", "Crazy Climber (bootleg set 2)", 0 ) +GAME( 1980, cclimberj,cclimber, cclimber, cclimberj,cclimberj,ROT0, "Nichibutsu", "Crazy Climber (Japan)", 0 ) +GAME( 1980, ccboot, cclimber, cclimber, cclimber, cclimberj,ROT0, "bootleg", "Crazy Climber (bootleg set 1)", 0 ) +GAME( 1980, ccboot2, cclimber, cclimber, cclimber, cclimberj,ROT0, "bootleg", "Crazy Climber (bootleg set 2)", 0 ) GAME( 1981, ckong, 0, cclimber, ckong, 0, ROT270, "Falcon", "Crazy Kong Part II (set 1)", 0 ) GAME( 1981, ckonga, ckong, cclimber, ckong, 0, ROT270, "Falcon", "Crazy Kong Part II (set 2)", 0 ) GAME( 1981, ckong2j, ckong, cclimber, ckong, 0, ROT270, "Falcon", "Crazy Kong Part II (Japan)", 0 ) diff --git a/src/mame/drivers/champbas.c b/src/mame/drivers/champbas.c index 9419f75830b..46841cb148f 100644 --- a/src/mame/drivers/champbas.c +++ b/src/mame/drivers/champbas.c @@ -272,7 +272,7 @@ static ADDRESS_MAP_START( champbas_main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x6800, 0x68ff) AM_READ(champbja_alt_protection_r) ADDRESS_MAP_END -static ADDRESS_MAP_START( exctsccb_main_map, ADDRESS_SPACE_PROGRAM, 8 ) +static ADDRESS_MAP_START( exctsccrb_main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x5fff) AM_ROM // AM_RANGE(0x6000, 0x63ff) AM_RAM AM_SHARE("share1") // MCU not used (though it's present on the board) AM_RANGE(0x7000, 0x7001) AM_DEVWRITE("aysnd", ay8910_data_address_w) @@ -753,14 +753,14 @@ static MACHINE_DRIVER_START( exctsccr ) MACHINE_DRIVER_END /* Bootleg running on a modified Champion Baseball board */ -static MACHINE_DRIVER_START( exctsccb ) +static MACHINE_DRIVER_START( exctsccrb ) /* driver data */ MDRV_DRIVER_DATA(champbas_state) /* basic machine hardware */ MDRV_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/6) - MDRV_CPU_PROGRAM_MAP(exctsccb_main_map) + MDRV_CPU_PROGRAM_MAP(exctsccrb_main_map) MDRV_CPU_VBLANK_INT("screen", irq0_line_assert) MDRV_CPU_ADD("sub", Z80, XTAL_18_432MHz/6) @@ -1218,5 +1218,5 @@ GAME( 1983, exctsccr, 0, exctsccr, exctsccr, exctsccr, ROT270, "Alpha D GAME( 1983, exctsccra, exctsccr, exctsccr, exctsccr, exctsccr, ROT270, "Alpha Denshi Co.", "Exciting Soccer (alternate music)", GAME_SUPPORTS_SAVE ) GAME( 1983, exctsccrj, exctsccr, exctsccr, exctsccr, exctsccr, ROT270, "Alpha Denshi Co.", "Exciting Soccer (Japan)", GAME_SUPPORTS_SAVE ) GAME( 1983, exctsccrj2, exctsccr, exctsccr, exctsccr, exctsccr, ROT270, "Alpha Denshi Co.", "Exciting Soccer (Japan set 2)", GAME_SUPPORTS_SAVE ) -GAME( 1983, exctsccrb, exctsccr, exctsccb, exctsccr, exctsccr, ROT270, "bootleg", "Exciting Soccer (bootleg)", GAME_SUPPORTS_SAVE ) +GAME( 1983, exctsccrb, exctsccr, exctsccrb,exctsccr, exctsccr, ROT270, "bootleg", "Exciting Soccer (bootleg)", GAME_SUPPORTS_SAVE ) GAME( 1984, exctscc2, 0, exctsccr, exctsccr, exctsccr, ROT270, "Alpha Denshi Co.", "Exciting Soccer II", GAME_SUPPORTS_SAVE ) diff --git a/src/mame/drivers/chinagat.c b/src/mame/drivers/chinagat.c index ba782643311..404efc60560 100644 --- a/src/mame/drivers/chinagat.c +++ b/src/mame/drivers/chinagat.c @@ -188,7 +188,7 @@ static WRITE8_HANDLER( chinagat_sub_bankswitch_w ) memory_set_bank(space->machine, "bank4", data & 0x07); // shall we check (data & 7) < 6 (# of banks)? } -static READ8_HANDLER( saiyugb1_mcu_command_r ) +static READ8_HANDLER( saiyugoub1_mcu_command_r ) { ddragon_state *state = (ddragon_state *)space->machine->driver_data; #if 0 @@ -200,7 +200,7 @@ static READ8_HANDLER( saiyugb1_mcu_command_r ) return state->mcu_command; } -static WRITE8_HANDLER( saiyugb1_mcu_command_w ) +static WRITE8_HANDLER( saiyugoub1_mcu_command_w ) { ddragon_state *state = (ddragon_state *)space->machine->driver_data; state->mcu_command = data; @@ -212,19 +212,19 @@ static WRITE8_HANDLER( saiyugb1_mcu_command_w ) #endif } -static WRITE8_HANDLER( saiyugb1_adpcm_rom_addr_w ) +static WRITE8_HANDLER( saiyugoub1_adpcm_rom_addr_w ) { ddragon_state *state = (ddragon_state *)space->machine->driver_data; /* i8748 Port 1 write */ state->i8748_P1 = data; } -static WRITE8_DEVICE_HANDLER( saiyugb1_adpcm_control_w ) +static WRITE8_DEVICE_HANDLER( saiyugoub1_adpcm_control_w ) { ddragon_state *state = (ddragon_state *)device->machine->driver_data; /* i8748 Port 2 write */ - UINT8 *saiyugb1_adpcm_rom = memory_region(device->machine, "adpcm"); + UINT8 *saiyugoub1_adpcm_rom = memory_region(device->machine, "adpcm"); if (data & 0x80) /* Reset m5205 and disable ADPCM ROM outputs */ { @@ -251,7 +251,7 @@ static WRITE8_DEVICE_HANDLER( saiyugb1_adpcm_control_w ) state->adpcm_addr = ((state->adpcm_addr & 0x07fff) | (data & 0x70 << 11)); - state->pcm_nibble = saiyugb1_adpcm_rom[state->adpcm_addr & 0x3ffff]; + state->pcm_nibble = saiyugoub1_adpcm_rom[state->adpcm_addr & 0x3ffff]; state->pcm_nibble = (state->pcm_nibble >> state->pcm_shift) & 0x0f; @@ -267,7 +267,7 @@ static WRITE8_DEVICE_HANDLER( saiyugb1_adpcm_control_w ) state->i8748_P2 = data; } -static WRITE8_DEVICE_HANDLER( saiyugb1_m5205_clk_w ) +static WRITE8_DEVICE_HANDLER( saiyugoub1_m5205_clk_w ) { /* i8748 T0 output clk mode */ /* This signal goes through a divide by 8 counter */ @@ -288,7 +288,7 @@ static WRITE8_DEVICE_HANDLER( saiyugb1_m5205_clk_w ) #endif } -static READ8_HANDLER( saiyugb1_m5205_irq_r ) +static READ8_HANDLER( saiyugoub1_m5205_irq_r ) { ddragon_state *state = (ddragon_state *)space->machine->driver_data; if (state->adpcm_sound_irq) @@ -299,7 +299,7 @@ static READ8_HANDLER( saiyugb1_m5205_irq_r ) return 0; } -static void saiyugb1_m5205_irq_w( running_device *device ) +static void saiyugoub1_m5205_irq_w( running_device *device ) { ddragon_state *state = (ddragon_state *)device->machine->driver_data; state->adpcm_sound_irq = 1; @@ -362,11 +362,11 @@ static ADDRESS_MAP_START( ym2203c_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xA000, 0xA000) AM_READ(soundlatch_r) ADDRESS_MAP_END -static ADDRESS_MAP_START( saiyugb1_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) +static ADDRESS_MAP_START( saiyugoub1_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x87ff) AM_RAM AM_RANGE(0x8800, 0x8801) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) - AM_RANGE(0x9800, 0x9800) AM_WRITE(saiyugb1_mcu_command_w) + AM_RANGE(0x9800, 0x9800) AM_WRITE(saiyugoub1_mcu_command_w) AM_RANGE(0xA000, 0xA000) AM_READ(soundlatch_r) ADDRESS_MAP_END @@ -376,11 +376,11 @@ static ADDRESS_MAP_START( i8748_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( i8748_portmap, ADDRESS_SPACE_IO, 8 ) - AM_RANGE(MCS48_PORT_BUS, MCS48_PORT_BUS) AM_READ(saiyugb1_mcu_command_r) - AM_RANGE(MCS48_PORT_T0, MCS48_PORT_T0) AM_DEVWRITE("adpcm", saiyugb1_m5205_clk_w) /* Drives the clock on the m5205 at 1/8 of this frequency */ - AM_RANGE(MCS48_PORT_T1, MCS48_PORT_T1) AM_READ(saiyugb1_m5205_irq_r) - AM_RANGE(MCS48_PORT_P1, MCS48_PORT_P1) AM_WRITE(saiyugb1_adpcm_rom_addr_w) - AM_RANGE(MCS48_PORT_P2, MCS48_PORT_P2) AM_DEVWRITE("adpcm", saiyugb1_adpcm_control_w) + AM_RANGE(MCS48_PORT_BUS, MCS48_PORT_BUS) AM_READ(saiyugoub1_mcu_command_r) + AM_RANGE(MCS48_PORT_T0, MCS48_PORT_T0) AM_DEVWRITE("adpcm", saiyugoub1_m5205_clk_w) /* Drives the clock on the m5205 at 1/8 of this frequency */ + AM_RANGE(MCS48_PORT_T1, MCS48_PORT_T1) AM_READ(saiyugoub1_m5205_irq_r) + AM_RANGE(MCS48_PORT_P1, MCS48_PORT_P1) AM_WRITE(saiyugoub1_adpcm_rom_addr_w) + AM_RANGE(MCS48_PORT_P2, MCS48_PORT_P2) AM_DEVWRITE("adpcm", saiyugoub1_adpcm_control_w) ADDRESS_MAP_END @@ -506,7 +506,7 @@ static const ym2151_interface ym2151_config = /* This on the bootleg board, instead of the m6295 */ static const msm5205_interface msm5205_config = { - saiyugb1_m5205_irq_w, /* Interrupt function */ + saiyugoub1_m5205_irq_w, /* Interrupt function */ MSM5205_S64_4B /* vclk input mode (6030Hz, 4-bit) */ }; @@ -613,7 +613,7 @@ static MACHINE_DRIVER_START( chinagat ) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) MACHINE_DRIVER_END -static MACHINE_DRIVER_START( saiyugb1 ) +static MACHINE_DRIVER_START( saiyugoub1 ) /* driver data */ MDRV_DRIVER_DATA(ddragon_state) @@ -627,7 +627,7 @@ static MACHINE_DRIVER_START( saiyugb1 ) MDRV_CPU_PROGRAM_MAP(sub_map) MDRV_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz) /* 3.579545 MHz oscillator */ - MDRV_CPU_PROGRAM_MAP(saiyugb1_sound_map) + MDRV_CPU_PROGRAM_MAP(saiyugoub1_sound_map) MDRV_CPU_ADD("mcu", I8748, 9263750) /* 9.263750 MHz oscillator, divided by 3*5 internally */ MDRV_CPU_PROGRAM_MAP(i8748_map) @@ -662,7 +662,7 @@ static MACHINE_DRIVER_START( saiyugb1 ) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60) MACHINE_DRIVER_END -static MACHINE_DRIVER_START( saiyugb2 ) +static MACHINE_DRIVER_START( saiyugoub2 ) /* driver data */ MDRV_DRIVER_DATA(ddragon_state) @@ -938,7 +938,7 @@ static DRIVER_INIT( chinagat ) /* ( YEAR NAME PARENT MACHINE INPUT INIT MONITOR COMPANY FULLNAME FLAGS ) */ -GAME( 1988, chinagat, 0, chinagat, chinagat, chinagat, ROT0, "[Technos Japan] (Taito Romstar license)", "China Gate (US)", GAME_SUPPORTS_SAVE ) -GAME( 1988, saiyugou, chinagat, chinagat, chinagat, chinagat, ROT0, "Technos Japan", "Sai Yu Gou Ma Roku (Japan)", GAME_SUPPORTS_SAVE ) -GAME( 1988, saiyugoub1, chinagat, saiyugb1, chinagat, chinagat, ROT0, "bootleg", "Sai Yu Gou Ma Roku (Japan bootleg 1)", GAME_IMPERFECT_SOUND | GAME_SUPPORTS_SAVE ) -GAME( 1988, saiyugoub2, chinagat, saiyugb2, chinagat, chinagat, ROT0, "bootleg", "Sai Yu Gou Ma Roku (Japan bootleg 2)", GAME_SUPPORTS_SAVE ) +GAME( 1988, chinagat, 0, chinagat, chinagat, chinagat, ROT0, "[Technos Japan] (Taito Romstar license)", "China Gate (US)", GAME_SUPPORTS_SAVE ) +GAME( 1988, saiyugou, chinagat, chinagat, chinagat, chinagat, ROT0, "Technos Japan", "Sai Yu Gou Ma Roku (Japan)", GAME_SUPPORTS_SAVE ) +GAME( 1988, saiyugoub1, chinagat, saiyugoub1, chinagat, chinagat, ROT0, "bootleg", "Sai Yu Gou Ma Roku (Japan bootleg 1)", GAME_IMPERFECT_SOUND | GAME_SUPPORTS_SAVE ) +GAME( 1988, saiyugoub2, chinagat, saiyugoub2, chinagat, chinagat, ROT0, "bootleg", "Sai Yu Gou Ma Roku (Japan bootleg 2)", GAME_SUPPORTS_SAVE ) diff --git a/src/mame/drivers/cidelsa.c b/src/mame/drivers/cidelsa.c index 2cbe314b19c..7408232fea9 100644 --- a/src/mame/drivers/cidelsa.c +++ b/src/mame/drivers/cidelsa.c @@ -236,7 +236,7 @@ static ADDRESS_MAP_START( destryer_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xf800, 0xffff) AM_DEVREADWRITE(CDP1869_TAG, cdp1869_pageram_r, cdp1869_pageram_w) ADDRESS_MAP_END -static ADDRESS_MAP_START( destryea_map, ADDRESS_SPACE_PROGRAM, 8 ) +static ADDRESS_MAP_START( destryera_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_ROM AM_RANGE(0x3000, 0x30ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram) AM_RANGE(0xf400, 0xf7ff) AM_DEVREADWRITE(CDP1869_TAG, cdp1869_charram_r, cdp1869_charram_w) @@ -526,12 +526,12 @@ static MACHINE_DRIVER_START( destryer ) MDRV_IMPORT_FROM(destryer_video) MACHINE_DRIVER_END -static MACHINE_DRIVER_START( destryea ) +static MACHINE_DRIVER_START( destryera ) MDRV_DRIVER_DATA(cidelsa_state) /* basic system hardware */ MDRV_CPU_ADD(CDP1802_TAG, CDP1802, DESTRYER_CHR1) - MDRV_CPU_PROGRAM_MAP(destryea_map) + MDRV_CPU_PROGRAM_MAP(destryera_map) MDRV_CPU_IO_MAP(destryer_io_map) MDRV_CPU_CONFIG(cidelsa_cdp1802_config) MDRV_NVRAM_HANDLER(generic_0fill) @@ -605,12 +605,12 @@ ROM_START( destryer ) ROM_END // this was destroyer2.rom in standalone emu.. -ROM_START( destryea ) +ROM_START( destryera ) ROM_REGION( 0x10000, CDP1802_TAG, 0 ) - ROM_LOAD( "destryea_1", 0x0000, 0x0800, CRC(421428e9) SHA1(0ac3a1e7f61125a1cd82145fa28cbc4b93505dc9) ) - ROM_LOAD( "destryea_2", 0x0800, 0x0800, CRC(55dc8145) SHA1(a0066d3f3ac0ae56273485b74af90eeffea5e64e) ) - ROM_LOAD( "destryea_3", 0x1000, 0x0800, CRC(5557bdf8) SHA1(37a9cbc5d25051d3bed7535c58aac937cd7c64e1) ) - ROM_LOAD( "destryea_4", 0x1800, 0x0800, CRC(608b779c) SHA1(8fd6cc376c507680777553090329cc66be42a934) ) + ROM_LOAD( "destryera_1", 0x0000, 0x0800, CRC(421428e9) SHA1(0ac3a1e7f61125a1cd82145fa28cbc4b93505dc9) ) + ROM_LOAD( "destryera_2", 0x0800, 0x0800, CRC(55dc8145) SHA1(a0066d3f3ac0ae56273485b74af90eeffea5e64e) ) + ROM_LOAD( "destryera_3", 0x1000, 0x0800, CRC(5557bdf8) SHA1(37a9cbc5d25051d3bed7535c58aac937cd7c64e1) ) + ROM_LOAD( "destryera_4", 0x1800, 0x0800, CRC(608b779c) SHA1(8fd6cc376c507680777553090329cc66be42a934) ) ROM_END ROM_START( altair ) @@ -640,7 +640,7 @@ ROM_END /* Game Drivers */ -GAME( 1980, destryer, 0, destryer, destryer, 0, ROT90, "Cidelsa", "Destroyer (Cidelsa) (set 1)", GAME_IMPERFECT_SOUND | GAME_SUPPORTS_SAVE ) -GAME( 1980, destryea, destryer, destryea, destryer, 0, ROT90, "Cidelsa", "Destroyer (Cidelsa) (set 2)", GAME_IMPERFECT_SOUND | GAME_SUPPORTS_SAVE ) -GAME( 1981, altair, 0, altair, altair, 0, ROT90, "Cidelsa", "Altair", GAME_IMPERFECT_SOUND | GAME_SUPPORTS_SAVE ) -GAME( 1981, draco, 0, draco, draco, 0, ROT90, "Cidelsa", "Draco", GAME_IMPERFECT_COLORS | GAME_SUPPORTS_SAVE ) +GAME( 1980, destryer, 0, destryer, destryer, 0, ROT90, "Cidelsa", "Destroyer (Cidelsa) (set 1)", GAME_IMPERFECT_SOUND | GAME_SUPPORTS_SAVE ) +GAME( 1980, destryera,destryer, destryera,destryer, 0, ROT90, "Cidelsa", "Destroyer (Cidelsa) (set 2)", GAME_IMPERFECT_SOUND | GAME_SUPPORTS_SAVE ) +GAME( 1981, altair, 0, altair, altair, 0, ROT90, "Cidelsa", "Altair", GAME_IMPERFECT_SOUND | GAME_SUPPORTS_SAVE ) +GAME( 1981, draco, 0, draco, draco, 0, ROT90, "Cidelsa", "Draco", GAME_IMPERFECT_COLORS | GAME_SUPPORTS_SAVE ) diff --git a/src/mame/drivers/cliffhgr.c b/src/mame/drivers/cliffhgr.c index 276b9ee4a0d..5650e2a856d 100644 --- a/src/mame/drivers/cliffhgr.c +++ b/src/mame/drivers/cliffhgr.c @@ -390,7 +390,7 @@ static INPUT_PORTS_START( cliffhgr ) PORT_BIT ( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED ) INPUT_PORTS_END -static INPUT_PORTS_START( cliffhga ) +static INPUT_PORTS_START( cliffhgra ) PORT_START("BANK0") PORT_BIT ( 0x3F, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT ( 0x40, IP_ACTIVE_LOW, IPT_SERVICE2 ) /* SW2 on CPU PCB */ @@ -783,6 +783,6 @@ static DRIVER_INIT( cliff ) * *************************************/ -GAME( 1983, cliffhgr, 0, cliffhgr, cliffhgr, cliff, ROT0, "Stern Electronics", "Cliff Hanger", 0) -GAME( 1983, cliffhgra,cliffhgr, cliffhgr, cliffhga, cliff, ROT0, "Stern Electronics", "Cliff Hanger (Alt)", 0) +GAME( 1983, cliffhgr, 0, cliffhgr, cliffhgr, cliff, ROT0, "Stern Electronics", "Cliff Hanger", 0) +GAME( 1983, cliffhgra,cliffhgr, cliffhgr, cliffhgra, cliff, ROT0, "Stern Electronics", "Cliff Hanger (Alt)", 0) GAME( 1983, goaltogo, 0, cliffhgr, goaltogo, cliff, ROT0, "Stern Electronics", "Goal To Go", GAME_NOT_WORKING) diff --git a/src/mame/drivers/cojag.c b/src/mame/drivers/cojag.c index 9ecdb1b773c..bf830e5a2dd 100644 --- a/src/mame/drivers/cojag.c +++ b/src/mame/drivers/cojag.c @@ -1335,7 +1335,7 @@ ROM_START( freezeat ) ROMX_LOAD( "fish_eng.07-00", 0x800007, 0x100000, CRC(13fa20ad) SHA1(0a04fdea025109c0e604ef2a6d58cfb3adce9bd1), ROM_SKIP(7) ) ROM_END -ROM_START( freezejp ) +ROM_START( freezeatjp ) ROM_REGION32_BE( 0x200000, "user1", 0 ) /* 2MB for R3000 code */ ROM_LOAD32_BYTE( "prog_jpn.hh", 0x000000, 0x040000, CRC(989302bf) SHA1(232927ec0a52b8bb587a3c206af8e1c6cde67860) ) ROM_LOAD32_BYTE( "prog_jpn.hl", 0x000001, 0x040000, CRC(6262b760) SHA1(12ca749f5cdc6db7d19f88a21f5f955b80206784) ) @@ -1361,7 +1361,7 @@ ROM_START( freezejp ) ROMX_LOAD( "fish_jpn.07-00", 0x800007, 0x100000, CRC(e7e0daa5) SHA1(108da84cc6b4df7ae88cfdacd27c1728e59cdb81), ROM_SKIP(7) ) ROM_END -ROM_START( freezea2 ) +ROM_START( freezeat2 ) ROM_REGION32_BE( 0x200000, "user1", 0 ) /* 2MB for R3000 code */ ROM_LOAD32_BYTE( "prog.hh", 0x000000, 0x040000, CRC(a8aefa52) SHA1(ba95da93035520de4b15245f68217c59dfb69dbd) ) ROM_LOAD32_BYTE( "prog.hl", 0x000001, 0x040000, CRC(152dd641) SHA1(52fa260baf1979ed8f15f8abcbbeebd8e595d0e4) ) @@ -1387,7 +1387,7 @@ ROM_START( freezea2 ) ROMX_LOAD( "fish_gr1.07-00", 0x800007, 0x100000, CRC(1f20c020) SHA1(71b32386dc0444264f2f1e2a81899e0e9260994c), ROM_SKIP(7) ) ROM_END -ROM_START( freezea3 ) +ROM_START( freezeat3 ) ROM_REGION32_BE( 0x200000, "user1", 0 ) /* 2MB for R3000 code */ ROM_LOAD32_BYTE( "prog.hh", 0x000000, 0x040000, CRC(863942e6) SHA1(c7429c8a5c86ff93c64950e201cffca83dd7b7b0) ) ROM_LOAD32_BYTE( "prog.hl", 0x000001, 0x040000, CRC(2acc18ef) SHA1(ead02566f7641b1d1066bd2e257b695e5c7e8437) ) @@ -1413,7 +1413,7 @@ ROM_START( freezea3 ) ROMX_LOAD( "fish_gr1.07-00", 0x800007, 0x100000, CRC(5ae08327) SHA1(822d8292793509ebfbfce27e92a74c78c4328bda), ROM_SKIP(7) ) ROM_END -ROM_START( freezea4 ) +ROM_START( freezeat4 ) ROM_REGION32_BE( 0x200000, "user1", 0 ) /* 2MB for R3000 code */ ROM_LOAD32_BYTE( "prog.hh", 0x000000, 0x040000, CRC(80336f5e) SHA1(9946e8eebec2cd68db059f40f535ea212f41913d) ) ROM_LOAD32_BYTE( "prog.hl", 0x000001, 0x040000, CRC(55125520) SHA1(13be4fbf32bcd94a2ea97fd690bd1dfdff146d33) ) @@ -1439,7 +1439,7 @@ ROM_START( freezea4 ) ROMX_LOAD( "fish_gr1.07-00", 0x800007, 0x100000, CRC(a84335c3) SHA1(340f5ddb9bff1ecd469eab8be36cc0ede84f1f5e), ROM_SKIP(7) ) ROM_END -ROM_START( freezea5 ) +ROM_START( freezeat5 ) ROM_REGION32_BE( 0x200000, "user1", 0 ) /* 2MB for R3000 code */ ROM_LOAD32_BYTE( "prog.hh", 0x000000, 0x040000, CRC(95c4fc64) SHA1(cd00efe7f760ef1e4cdc4bc8a3b368427cb15d8a) ) ROM_LOAD32_BYTE( "prog.hl", 0x000001, 0x040000, CRC(ffb9cb71) SHA1(35d6a5440d63bc5b94c4447645365039169da368) ) @@ -1465,7 +1465,7 @@ ROM_START( freezea5 ) ROMX_LOAD( "fish_gr1.07-00", 0x800007, 0x100000, CRC(3676ac70) SHA1(640c4d4f53ca2bcae2009e402fd6ad70e40defa4), ROM_SKIP(7) ) ROM_END -ROM_START( freezea6 ) +ROM_START( freezeat6 ) ROM_REGION32_BE( 0x200000, "user1", 0 ) /* 2MB for R3000 code */ ROM_LOAD32_BYTE( "prog.hh", 0x000000, 0x040000, CRC(120711fe) SHA1(387e3cc8a1a9ea7d65c528387891d09ed9889fe3) ) ROM_LOAD32_BYTE( "prog.hl", 0x000001, 0x040000, CRC(18dd292a) SHA1(00e79851140716985f43594142c97e510a06b24a) ) @@ -1609,11 +1609,11 @@ static void init_freeze_common(running_machine *machine, offs_t main_speedup_add } static DRIVER_INIT( freezeat ) { init_freeze_common(machine, 0x1001a9f4); } -static DRIVER_INIT( freezea2 ) { init_freeze_common(machine, 0x1001a8c4); } -static DRIVER_INIT( freezea3 ) { init_freeze_common(machine, 0x1001a134); } -static DRIVER_INIT( freezea4 ) { init_freeze_common(machine, 0x1001a134); } -static DRIVER_INIT( freezea5 ) { init_freeze_common(machine, 0x10019b34); } -static DRIVER_INIT( freezea6 ) { init_freeze_common(machine, 0x10019684); } +static DRIVER_INIT( freezeat2 ) { init_freeze_common(machine, 0x1001a8c4); } +static DRIVER_INIT( freezeat3 ) { init_freeze_common(machine, 0x1001a134); } +static DRIVER_INIT( freezeat4 ) { init_freeze_common(machine, 0x1001a134); } +static DRIVER_INIT( freezeat5 ) { init_freeze_common(machine, 0x10019b34); } +static DRIVER_INIT( freezeat6 ) { init_freeze_common(machine, 0x10019684); } static DRIVER_INIT( vcircle ) @@ -1635,20 +1635,20 @@ static DRIVER_INIT( vcircle ) * *************************************/ -GAME( 1996, area51, 0, cojagr3k, area51, area51, ROT0, "Atari Games", "Area 51 (R3000)", 0 ) -GAME( 1995, area51t, area51, cojag68k, area51, area51a, ROT0, "Time Warner", "Area 51 (Time Warner License)", 0 ) -GAME( 1995, area51a, area51, cojag68k, area51, area51a, ROT0, "Atari Games", "Area 51 (Atari Games License)", 0 ) -GAME( 1995, fishfren, 0, cojagr3k, fishfren, fishfren, ROT0, "Time Warner Interactive", "Fishin' Frenzy (prototype)", 0 ) -GAME( 1996, freezeat, 0, cojagr3k, freezeat, freezeat, ROT0, "Atari Games", "Freeze (Atari) (prototype, English voice, 96/10/25)", 0 ) -GAME( 1996, freezejp, freezeat, cojagr3k, freezeat, freezeat, ROT0, "Atari Games", "Freeze (Atari) (prototype, Japanese voice, 96/10/25)", 0 ) -GAME( 1996, freezea2, freezeat, cojagr3k, freezeat, freezea2, ROT0, "Atari Games", "Freeze (Atari) (prototype, 96/10/18)", 0 ) -GAME( 1996, freezea3, freezeat, cojagr3k, freezeat, freezea3, ROT0, "Atari Games", "Freeze (Atari) (prototype, 96/10/07)", 0 ) -GAME( 1996, freezea4, freezeat, cojagr3k, freezeat, freezea4, ROT0, "Atari Games", "Freeze (Atari) (prototype, 96/10/03)", 0 ) -GAME( 1996, freezea5, freezeat, cojagr3k, freezeat, freezea5, ROT0, "Atari Games", "Freeze (Atari) (prototype, 96/09/20, AMOA-96)", 0 ) -GAME( 1996, freezea6, freezeat, cojagr3k, freezeat, freezea6, ROT0, "Atari Games", "Freeze (Atari) (prototype, 96/09/07, Jamma-96)", 0 ) -GAME( 1996, maxforce, 0, cojagr3k, area51, maxforce, ROT0, "Atari Games", "Maximum Force v1.05", 0 ) -GAME( 1996, maxf_102, maxforce, cojagr3k, area51, maxforce, ROT0, "Atari Games", "Maximum Force v1.02", 0 ) -GAME( 1996, maxf_ng, maxforce, cojagr3k, area51, maxforce, ROT0, "Atari Games", "Maximum Force (No Gore version)", 0 ) -GAME( 1998, area51mx, 0, cojag68k, area51, area51mx, ROT0, "Atari Games", "Area 51 / Maximum Force Duo v2.0", 0 ) -GAME( 1998, a51mxr3k, area51mx, cojagr3k, area51, a51mxr3k, ROT0, "Atari Games", "Area 51 / Maximum Force Duo (R3000)", 0 ) -GAME( 1996, vcircle, 0, cojagr3k, vcircle, vcircle, ROT0, "Atari Games", "Vicious Circle (prototype)", 0 ) +GAME( 1996, area51, 0, cojagr3k, area51, area51, ROT0, "Atari Games", "Area 51 (R3000)", 0 ) +GAME( 1995, area51t, area51, cojag68k, area51, area51a, ROT0, "Time Warner", "Area 51 (Time Warner License)", 0 ) +GAME( 1995, area51a, area51, cojag68k, area51, area51a, ROT0, "Atari Games", "Area 51 (Atari Games License)", 0 ) +GAME( 1995, fishfren, 0, cojagr3k, fishfren, fishfren, ROT0, "Time Warner Interactive", "Fishin' Frenzy (prototype)", 0 ) +GAME( 1996, freezeat, 0, cojagr3k, freezeat, freezeat, ROT0, "Atari Games", "Freeze (Atari) (prototype, English voice, 96/10/25)", 0 ) +GAME( 1996, freezeatjp,freezeat, cojagr3k, freezeat, freezeat, ROT0, "Atari Games", "Freeze (Atari) (prototype, Japanese voice, 96/10/25)", 0 ) +GAME( 1996, freezeat2, freezeat, cojagr3k, freezeat, freezeat2,ROT0, "Atari Games", "Freeze (Atari) (prototype, 96/10/18)", 0 ) +GAME( 1996, freezeat3, freezeat, cojagr3k, freezeat, freezeat3,ROT0, "Atari Games", "Freeze (Atari) (prototype, 96/10/07)", 0 ) +GAME( 1996, freezeat4, freezeat, cojagr3k, freezeat, freezeat4,ROT0, "Atari Games", "Freeze (Atari) (prototype, 96/10/03)", 0 ) +GAME( 1996, freezeat5, freezeat, cojagr3k, freezeat, freezeat5,ROT0, "Atari Games", "Freeze (Atari) (prototype, 96/09/20, AMOA-96)", 0 ) +GAME( 1996, freezeat6, freezeat, cojagr3k, freezeat, freezeat6,ROT0, "Atari Games", "Freeze (Atari) (prototype, 96/09/07, Jamma-96)", 0 ) +GAME( 1996, maxforce, 0, cojagr3k, area51, maxforce, ROT0, "Atari Games", "Maximum Force v1.05", 0 ) +GAME( 1996, maxf_102, maxforce, cojagr3k, area51, maxforce, ROT0, "Atari Games", "Maximum Force v1.02", 0 ) +GAME( 1996, maxf_ng, maxforce, cojagr3k, area51, maxforce, ROT0, "Atari Games", "Maximum Force (No Gore version)", 0 ) +GAME( 1998, area51mx, 0, cojag68k, area51, area51mx, ROT0, "Atari Games", "Area 51 / Maximum Force Duo v2.0", 0 ) +GAME( 1998, a51mxr3k, area51mx, cojagr3k, area51, a51mxr3k, ROT0, "Atari Games", "Area 51 / Maximum Force Duo (R3000)", 0 ) +GAME( 1996, vcircle, 0, cojagr3k, vcircle, vcircle, ROT0, "Atari Games", "Vicious Circle (prototype)", 0 ) diff --git a/src/mame/drivers/commando.c b/src/mame/drivers/commando.c index 8749181396f..23b24871a28 100644 --- a/src/mame/drivers/commando.c +++ b/src/mame/drivers/commando.c @@ -38,7 +38,7 @@ write: **************************************************************************** Note : there is an ingame typo bug that doesn't display the bonus life values - correctly on the title screen in 'commando', 'commandj' and 'spaceinv'. + correctly on the title screen in 'commando', 'commandoj' and 'spaceinv'. ***************************************************************************/ @@ -155,7 +155,7 @@ static INPUT_PORTS_START( commando ) PORT_DIPSETTING( 0xc0, DEF_STR( Cocktail ) ) INPUT_PORTS_END -static INPUT_PORTS_START( commandu ) +static INPUT_PORTS_START( commandou ) PORT_INCLUDE(commando) PORT_MODIFY("DSW2") @@ -403,7 +403,7 @@ ROM_END ROM_START( commandob ) ROM_REGION( 2*0x10000, "maincpu", 0 ) /* 64k for code + 64k for decrypted opcodes */ - ROM_LOAD( "commandb_04_9m_27256.bin", 0x0000, 0x8000, CRC(348a7654) SHA1(f3668c47c154a9c7d7afeabb0259c9bc56e847ac) ) + ROM_LOAD( "commandob_04_9m_27256.bin", 0x0000, 0x8000, CRC(348a7654) SHA1(f3668c47c154a9c7d7afeabb0259c9bc56e847ac) ) ROM_LOAD( "cm03.8m", 0x8000, 0x4000, CRC(35486542) SHA1(531a85c9e03970ce037be84f2240c2df6f6e3ec1) ) ROM_REGION( 0x10000, "audiocpu", 0 ) @@ -442,7 +442,7 @@ ROM_START( commandob ) and the CPU1 (a Z80 compatible NEC D780C-1). This sub-board is plugged on what seems to be a ROM socket. */ ROM_REGION( 0x0200, "plds", 0 ) - ROM_LOAD( "commandb_pal16l8a.bin", 0x0000, 0x0104, NO_DUMP ) /* I Didn't try to dump it... */ + ROM_LOAD( "commandob_pal16l8a.bin", 0x0000, 0x0104, NO_DUMP ) /* I Didn't try to dump it... */ ROM_END ROM_START( sinvasn ) @@ -561,7 +561,7 @@ static DRIVER_INIT( spaceinv ) /* Game Drivers */ GAME( 1985, commando, 0, commando, commando, commando, ROT270, "Capcom", "Commando (World)", GAME_SUPPORTS_SAVE ) -GAME( 1985, commandou, commando, commando, commandu, commando, ROT270, "Capcom (Data East USA license)", "Commando (US)", GAME_SUPPORTS_SAVE ) +GAME( 1985, commandou, commando, commando, commandou,commando, ROT270, "Capcom (Data East USA license)", "Commando (US)", GAME_SUPPORTS_SAVE ) GAME( 1985, commandoj, commando, commando, commando, commando, ROT270, "Capcom", "Senjou no Ookami", GAME_SUPPORTS_SAVE ) GAME( 1985, commandob, commando, commando, commando, spaceinv, ROT270, "bootleg", "Commando (bootleg)", GAME_SUPPORTS_SAVE ) GAME( 1985, sinvasn, commando, commando, commando, commando, ROT270, "Capcom", "Space Invasion (Europe)", GAME_SUPPORTS_SAVE ) diff --git a/src/mame/drivers/crbaloon.c b/src/mame/drivers/crbaloon.c index 72000f7a2bf..cedda6e1003 100644 --- a/src/mame/drivers/crbaloon.c +++ b/src/mame/drivers/crbaloon.c @@ -438,5 +438,5 @@ ROM_END * *************************************/ -GAME( 1980, crbaloon, 0, crbaloon, crbaloon, 0, ROT90, "Taito Corporation", "Crazy Balloon (set 1)", GAME_IMPERFECT_SOUND | GAME_SUPPORTS_SAVE ) +GAME( 1980, crbaloon, 0, crbaloon, crbaloon, 0, ROT90, "Taito Corporation", "Crazy Balloon (set 1)", GAME_IMPERFECT_SOUND | GAME_SUPPORTS_SAVE ) GAME( 1980, crbaloon2,crbaloon, crbaloon, crbaloon, 0, ROT90, "Taito Corporation", "Crazy Balloon (set 2)", GAME_IMPERFECT_SOUND | GAME_SUPPORTS_SAVE ) diff --git a/src/mame/drivers/crimfght.c b/src/mame/drivers/crimfght.c index d3293863dbe..398ec9e58e2 100644 --- a/src/mame/drivers/crimfght.c +++ b/src/mame/drivers/crimfght.c @@ -180,7 +180,7 @@ static INPUT_PORTS_START( crimfght ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE4 ) INPUT_PORTS_END -static INPUT_PORTS_START( crimfgtj ) +static INPUT_PORTS_START( crimfghtj ) PORT_INCLUDE( crimfght ) PORT_MODIFY("DSW1") @@ -427,5 +427,5 @@ static KONAMI_SETLINES_CALLBACK( crimfght_banking ) } GAME( 1989, crimfght, 0, crimfght, crimfght, 0, ROT0, "Konami", "Crime Fighters (US 4 players)", GAME_SUPPORTS_SAVE ) -GAME( 1989, crimfght2, crimfght, crimfght, crimfgtj, 0, ROT0, "Konami", "Crime Fighters (World 2 Players)", GAME_SUPPORTS_SAVE ) -GAME( 1989, crimfghtj, crimfght, crimfght, crimfgtj, 0, ROT0, "Konami", "Crime Fighters (Japan 2 Players)", GAME_SUPPORTS_SAVE ) +GAME( 1989, crimfght2, crimfght, crimfght, crimfghtj,0, ROT0, "Konami", "Crime Fighters (World 2 Players)", GAME_SUPPORTS_SAVE ) +GAME( 1989, crimfghtj, crimfght, crimfght, crimfghtj,0, ROT0, "Konami", "Crime Fighters (Japan 2 Players)", GAME_SUPPORTS_SAVE ) diff --git a/src/mame/drivers/crshrace.c b/src/mame/drivers/crshrace.c index ad5b96dddac..19a66f64a21 100644 --- a/src/mame/drivers/crshrace.c +++ b/src/mame/drivers/crshrace.c @@ -89,7 +89,7 @@ Stephh's notes (based on the games M68000 code and some tests) : to the "test mode" (code at 0x0040de). -2) 'crshrac2' +2) 'crshrace2' - Even if there is code for it, there is NO possibility to select a 3 players game due to code at 0x003796 which "invalidates" the previous reading of DSW 3 : @@ -374,7 +374,7 @@ static INPUT_PORTS_START( crshrace ) INPUT_PORTS_END /* Same as 'crshrace', but additional "unknown" Dip Switch (see notes) */ -static INPUT_PORTS_START( crshrac2 ) +static INPUT_PORTS_START( crshrace2 ) PORT_INCLUDE( crshrace ) PORT_MODIFY("DSW0") @@ -603,7 +603,7 @@ static DRIVER_INIT( crshrace ) #endif } -static DRIVER_INIT( crshrac2 ) +static DRIVER_INIT( crshrace2 ) { #if CRSHRACE_3P_HACK crshrace_patch_code(0x003796); @@ -611,5 +611,5 @@ static DRIVER_INIT( crshrac2 ) } -GAME( 1993, crshrace, 0, crshrace, crshrace, crshrace, ROT270, "Video System Co.", "Lethal Crash Race (set 1)", GAME_NO_COCKTAIL | GAME_SUPPORTS_SAVE ) -GAME( 1993, crshrace2,crshrace, crshrace, crshrac2, crshrac2, ROT270, "Video System Co.", "Lethal Crash Race (set 2)", GAME_NO_COCKTAIL | GAME_SUPPORTS_SAVE ) +GAME( 1993, crshrace, 0, crshrace, crshrace, crshrace, ROT270, "Video System Co.", "Lethal Crash Race (set 1)", GAME_NO_COCKTAIL | GAME_SUPPORTS_SAVE ) +GAME( 1993, crshrace2, crshrace, crshrace, crshrace2, crshrace2, ROT270, "Video System Co.", "Lethal Crash Race (set 2)", GAME_NO_COCKTAIL | GAME_SUPPORTS_SAVE ) diff --git a/src/mame/drivers/cshooter.c b/src/mame/drivers/cshooter.c index 4938a23e5e9..8f8cb86ea0c 100644 --- a/src/mame/drivers/cshooter.c +++ b/src/mame/drivers/cshooter.c @@ -3,7 +3,7 @@ TS 01.05.2006: - added sprites, bgmap reading and few ixes here and there - airraid and cshootre are a bit "playable" ;) without gfx + airraid and cshootere are a bit "playable" ;) without gfx Haze's notes : @@ -14,7 +14,7 @@ Haze's notes : - i can't decode the other gfx? rom - there don't seem to be any sprites / bg's in ram, interrupts? - palette? format isn't understood - - the other sets ('cshootre' and 'airraid') need decrypting .. + - the other sets ('cshootere' and 'airraid') need decrypting .. is the main one protected ? theres a 68705 on it @@ -658,7 +658,7 @@ static DRIVER_INIT( cshooter ) memory_set_bankptr(machine, "bank1",&memory_region(machine, "user1")[0]); } -static DRIVER_INIT( cshootre ) +static DRIVER_INIT( cshootere ) { const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); int A; @@ -698,7 +698,7 @@ static DRIVER_INIT( cshootre ) -GAME( 1987, cshooter, 0, cshooter, cshooter, cshooter, ROT270, "[Seibu Kaihatsu] (Taito license)", "Cross Shooter (not encrypted)", GAME_NOT_WORKING | GAME_NO_SOUND ) -GAME( 1987, cshootere, cshooter, airraid, cshooter, cshootre, ROT270, "[Seibu Kaihatsu] (J.K.H. license)", "Cross Shooter (encrypted)", GAME_NOT_WORKING | GAME_NO_SOUND ) -GAME( 1987, airraid, cshooter, airraid, cshooter, cshootre, ROT270, "Seibu Kaihatsu", "Air Raid (encrypted)", GAME_NOT_WORKING | GAME_NO_SOUND ) +GAME( 1987, cshooter, 0, cshooter, cshooter, cshooter, ROT270, "[Seibu Kaihatsu] (Taito license)", "Cross Shooter (not encrypted)", GAME_NOT_WORKING | GAME_NO_SOUND ) +GAME( 1987, cshootere, cshooter, airraid, cshooter, cshootere, ROT270, "[Seibu Kaihatsu] (J.K.H. license)", "Cross Shooter (encrypted)", GAME_NOT_WORKING | GAME_NO_SOUND ) +GAME( 1987, airraid, cshooter, airraid, cshooter, cshootere, ROT270, "Seibu Kaihatsu", "Air Raid (encrypted)", GAME_NOT_WORKING | GAME_NO_SOUND ) diff --git a/src/mame/drivers/cvs.c b/src/mame/drivers/cvs.c index ef72e744efb..a4338391326 100644 --- a/src/mame/drivers/cvs.c +++ b/src/mame/drivers/cvs.c @@ -895,7 +895,7 @@ static INPUT_PORTS_START( hunchbak ) PORT_DIPSETTING( 0x00, "80k only" ) /* displays "80000" */ /* hunchbak : DSW2 bit 5 stored at 0x5e97 - code at 0x516c - read back code at 0x6054 */ - /* hunchbka : DSW2 bit 5 stored at 0x1e97 - code at 0x0c0c - read back code at 0x6054 */ + /* hunchbaka : DSW2 bit 5 stored at 0x1e97 - code at 0x0c0c - read back code at 0x6054 */ INPUT_PORTS_END static INPUT_PORTS_START( superbik ) @@ -1616,7 +1616,7 @@ static DRIVER_INIT( huncholy ) } -static DRIVER_INIT( hunchbka ) +static DRIVER_INIT( hunchbaka ) { UINT8 *ROM = memory_region(machine, "maincpu"); @@ -1718,7 +1718,7 @@ GAME( 1982, goldbug, 0, cvs, goldbug, 0, ROT90, "Century El GAME( 1982, diggerc, 0, cvs, diggerc, 0, ROT90, "Century Electronics", "Digger (CVS)", GAME_NO_COCKTAIL | GAME_IMPERFECT_SOUND | GAME_SUPPORTS_SAVE ) GAME( 1983, heartatk, 0, cvs, heartatk, 0, ROT90, "Century Electronics", "Heart Attack", GAME_NO_COCKTAIL | GAME_IMPERFECT_SOUND | GAME_SUPPORTS_SAVE ) GAME( 1983, hunchbak, 0, cvs, hunchbak, 0, ROT90, "Century Electronics", "Hunchback (set 1)", GAME_NO_COCKTAIL | GAME_IMPERFECT_SOUND | GAME_SUPPORTS_SAVE ) -GAME( 1983, hunchbaka, hunchbak, cvs, hunchbak, hunchbka, ROT90, "Century Electronics", "Hunchback (set 2)", GAME_NO_COCKTAIL | GAME_IMPERFECT_SOUND | GAME_SUPPORTS_SAVE ) +GAME( 1983, hunchbaka, hunchbak, cvs, hunchbak, hunchbaka,ROT90, "Century Electronics", "Hunchback (set 2)", GAME_NO_COCKTAIL | GAME_IMPERFECT_SOUND | GAME_SUPPORTS_SAVE ) GAME( 1983, superbik, 0, cvs, superbik, superbik, ROT90, "Century Electronics", "Superbike", GAME_NO_COCKTAIL | GAME_IMPERFECT_SOUND | GAME_SUPPORTS_SAVE ) GAME( 1983, raiders, 0, cvs, raiders, raiders, ROT90, "Century Electronics", "Raiders", GAME_NO_COCKTAIL | GAME_IMPERFECT_SOUND | GAME_SUPPORTS_SAVE ) GAME( 1983, hero, 0, cvs, hero, hero, ROT90, "Seatongrove Ltd", "Hero", GAME_NO_COCKTAIL | GAME_IMPERFECT_SOUND | GAME_SUPPORTS_SAVE ) diff --git a/src/mame/drivers/cyberbal.c b/src/mame/drivers/cyberbal.c index 94ccd2488b1..1ef688cd86c 100644 --- a/src/mame/drivers/cyberbal.c +++ b/src/mame/drivers/cyberbal.c @@ -74,7 +74,7 @@ static MACHINE_RESET( cyberbal ) } -static void cyberb2p_update_interrupts(running_machine *machine) +static void cyberbal2p_update_interrupts(running_machine *machine) { cyberbal_state *state = (cyberbal_state *)machine->driver_data; cputag_set_input_line(machine, "maincpu", 1, state->atarigen.video_int_state ? ASSERT_LINE : CLEAR_LINE); @@ -82,12 +82,12 @@ static void cyberb2p_update_interrupts(running_machine *machine) } -static MACHINE_RESET( cyberb2p ) +static MACHINE_RESET( cyberbal2p ) { cyberbal_state *state = (cyberbal_state *)machine->driver_data; atarigen_eeprom_reset(&state->atarigen); - atarigen_interrupt_reset(&state->atarigen, cyberb2p_update_interrupts); + atarigen_interrupt_reset(&state->atarigen, cyberbal2p_update_interrupts); atarigen_scanline_timer_reset(machine->primary_screen, cyberbal_scanline_update, 8); atarijsa_reset(); } @@ -247,7 +247,7 @@ ADDRESS_MAP_END * *************************************/ -static ADDRESS_MAP_START( cyberb2p_map, ADDRESS_SPACE_PROGRAM, 16 ) +static ADDRESS_MAP_START( cyberbal2p_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x07ffff) AM_ROM AM_RANGE(0xfc0000, 0xfc0003) AM_READ_PORT("IN0") AM_RANGE(0xfc2000, 0xfc2003) AM_READ_PORT("IN1") @@ -326,7 +326,7 @@ static INPUT_PORTS_START( cyberbal ) INPUT_PORTS_END -static INPUT_PORTS_START( cyberb2p ) +static INPUT_PORTS_START( cyberbal2p ) PORT_START("IN0") /* fc0000 */ PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1) @@ -490,16 +490,16 @@ static MACHINE_DRIVER_START( cyberbal ) MACHINE_DRIVER_END -static MACHINE_DRIVER_START( cyberb2p ) +static MACHINE_DRIVER_START( cyberbal2p ) MDRV_DRIVER_DATA(cyberbal_state) /* basic machine hardware */ MDRV_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2) - MDRV_CPU_PROGRAM_MAP(cyberb2p_map) + MDRV_CPU_PROGRAM_MAP(cyberbal2p_map) MDRV_CPU_VBLANK_INT("screen", atarigen_video_int_gen) MDRV_MACHINE_START(cyberbal) - MDRV_MACHINE_RESET(cyberb2p) + MDRV_MACHINE_RESET(cyberbal2p) MDRV_NVRAM_HANDLER(atarigen) /* video hardware */ @@ -513,7 +513,7 @@ static MACHINE_DRIVER_START( cyberb2p ) /* the board uses an SOS-2 chip to generate video signals */ MDRV_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz, 456*2, 0, 336*2, 262, 0, 240) - MDRV_VIDEO_START(cyberb2p) + MDRV_VIDEO_START(cyberbal2p) MDRV_VIDEO_UPDATE(cyberbal) /* sound hardware */ @@ -1003,7 +1003,7 @@ static DRIVER_INIT( cyberbal ) } -static DRIVER_INIT( cyberbt ) +static DRIVER_INIT( cyberbalt ) { cyberbal_state *state = (cyberbal_state *)machine->driver_data; state->atarigen.eeprom_default = default_eeprom; @@ -1011,7 +1011,7 @@ static DRIVER_INIT( cyberbt ) } -static DRIVER_INIT( cyberb2p ) +static DRIVER_INIT( cyberbal2p ) { cyberbal_state *state = (cyberbal_state *)machine->driver_data; state->atarigen.eeprom_default = default_eeprom; @@ -1030,11 +1030,11 @@ GAMEL(1988, cyberbal, 0, cyberbal, cyberbal, cyberbal, ROT0, "Atari Game GAMEL(1988, cyberbal2, cyberbal, cyberbal, cyberbal, cyberbal, ROT0, "Atari Games", "Cyberball (rev 2)", 0, layout_dualhsxs ) GAMEL(1988, cyberbalp, cyberbal, cyberbal, cyberbal, cyberbal, ROT0, "Atari Games", "Cyberball (prototype)", 0, layout_dualhsxs ) -GAME( 1989, cyberbal2p, cyberbal, cyberb2p, cyberb2p, cyberb2p, ROT0, "Atari Games", "Cyberball 2072 (2 player, rev 4)", 0 ) -GAME( 1989, cyberbal2p3, cyberbal, cyberb2p, cyberb2p, cyberb2p, ROT0, "Atari Games", "Cyberball 2072 (2 player, rev 3)", 0 ) -GAME( 1989, cyberbal2p2, cyberbal, cyberb2p, cyberb2p, cyberb2p, ROT0, "Atari Games", "Cyberball 2072 (2 player, rev 2)", 0 ) -GAME( 1989, cyberbal2p1, cyberbal, cyberb2p, cyberb2p, cyberb2p, ROT0, "Atari Games", "Cyberball 2072 (2 player, rev 1)", 0 ) +GAME( 1989, cyberbal2p, cyberbal, cyberbal2p, cyberbal2p, cyberbal2p, ROT0, "Atari Games", "Cyberball 2072 (2 player, rev 4)", 0 ) +GAME( 1989, cyberbal2p3, cyberbal, cyberbal2p, cyberbal2p, cyberbal2p, ROT0, "Atari Games", "Cyberball 2072 (2 player, rev 3)", 0 ) +GAME( 1989, cyberbal2p2, cyberbal, cyberbal2p, cyberbal2p, cyberbal2p, ROT0, "Atari Games", "Cyberball 2072 (2 player, rev 2)", 0 ) +GAME( 1989, cyberbal2p1, cyberbal, cyberbal2p, cyberbal2p, cyberbal2p, ROT0, "Atari Games", "Cyberball 2072 (2 player, rev 1)", 0 ) -GAMEL(1989, cyberbalt, cyberbal, cyberbal, cyberbal, cyberbt, ROT0, "Atari Games", "Tournament Cyberball 2072 (rev 2)", 0, layout_dualhsxs ) -GAMEL(1989, cyberbalt1, cyberbal, cyberbal, cyberbal, cyberbt, ROT0, "Atari Games", "Tournament Cyberball 2072 (rev 1)", 0, layout_dualhsxs ) +GAMEL(1989, cyberbalt, cyberbal, cyberbal, cyberbal, cyberbalt, ROT0, "Atari Games", "Tournament Cyberball 2072 (rev 2)", 0, layout_dualhsxs ) +GAMEL(1989, cyberbalt1, cyberbal, cyberbal, cyberbal, cyberbalt, ROT0, "Atari Games", "Tournament Cyberball 2072 (rev 1)", 0, layout_dualhsxs ) diff --git a/src/mame/drivers/galaxian.c b/src/mame/drivers/galaxian.c index 9788cdc533c..a9da02fed25 100644 --- a/src/mame/drivers/galaxian.c +++ b/src/mame/drivers/galaxian.c @@ -2834,7 +2834,7 @@ static DRIVER_INIT( mshuttlj ) irq_line = 0; /* decrypt the code */ - cclimbrj_decode(machine); + cclimberj_decode(machine); } diff --git a/src/mame/includes/cclimber.h b/src/mame/includes/cclimber.h index d8bceacacab..51bd738caaa 100644 --- a/src/mame/includes/cclimber.h +++ b/src/mame/includes/cclimber.h @@ -5,8 +5,8 @@ DRIVER_INIT( cclimber ); -DRIVER_INIT( cclimbrj ); -void cclimbrj_decode(running_machine *machine); +DRIVER_INIT( cclimberj ); +void cclimberj_decode(running_machine *machine); void mshuttle_decode(running_machine *machine); DRIVER_INIT( cannonb ); DRIVER_INIT( cannonb2 ); diff --git a/src/mame/includes/cyberbal.h b/src/mame/includes/cyberbal.h index e5814c3c85a..62e0a5f603b 100644 --- a/src/mame/includes/cyberbal.h +++ b/src/mame/includes/cyberbal.h @@ -55,7 +55,7 @@ WRITE16_HANDLER( cyberbal_paletteram_0_w ); WRITE16_HANDLER( cyberbal_paletteram_1_w ); VIDEO_START( cyberbal ); -VIDEO_START( cyberb2p ); +VIDEO_START( cyberbal2p ); VIDEO_UPDATE( cyberbal ); void cyberbal_scanline_update(running_device *screen, int scanline); diff --git a/src/mame/machine/cclimber.c b/src/mame/machine/cclimber.c index 67fd2358080..e481b510952 100644 --- a/src/mame/machine/cclimber.c +++ b/src/mame/machine/cclimber.c @@ -51,7 +51,7 @@ DRIVER_INIT( cclimber ) cclimber_decode(machine, convtable); } -void cclimbrj_decode(running_machine *machine) +void cclimberj_decode(running_machine *machine) { static const UINT8 convtable[8][16] = { @@ -68,9 +68,9 @@ void cclimbrj_decode(running_machine *machine) cclimber_decode(machine, convtable); } -DRIVER_INIT( cclimbrj ) +DRIVER_INIT( cclimberj ) { - cclimbrj_decode(machine); + cclimberj_decode(machine); } void mshuttle_decode(running_machine *machine) diff --git a/src/mame/mamedriv.c b/src/mame/mamedriv.c index 8f568724ed5..e0036b0ed0d 100644 --- a/src/mame/mamedriv.c +++ b/src/mame/mamedriv.c @@ -6198,12 +6198,12 @@ BOMULEUL CHAJARA SEGA ST-V 1997/04/11 DRIVER( area51a ) /* 136105 (c) 1995 */ DRIVER( fishfren ) /* (proto) (c) 1995 */ DRIVER( freezeat ) /* (proto) (c) 1996 */ - DRIVER( freezejp ) /* (proto) (c) 1996 */ - DRIVER( freezea2 ) /* (proto) (c) 1996 */ - DRIVER( freezea3 ) /* (proto) (c) 1996 */ - DRIVER( freezea4 ) /* (proto) (c) 1996 */ - DRIVER( freezea5 ) /* (proto) (c) 1996 */ - DRIVER( freezea6 ) /* (proto) (c) 1996 */ + DRIVER( freezeatjp ) /* (proto) (c) 1996 */ + DRIVER( freezeat2 ) /* (proto) (c) 1996 */ + DRIVER( freezeat3 ) /* (proto) (c) 1996 */ + DRIVER( freezeat4 ) /* (proto) (c) 1996 */ + DRIVER( freezeat5 ) /* (proto) (c) 1996 */ + DRIVER( freezeat6 ) /* (proto) (c) 1996 */ DRIVER( area51mx ) /* 136105 (c) 1998 */ DRIVER( a51mxr3k ) /* ?? (c) 1998 */ DRIVER( maxforce ) /* ?? (c) 1996 */ @@ -9249,7 +9249,7 @@ Other Sun games DRIVER( altair ) /* (c) 1981 Cidelsa */ DRIVER( destryer ) /* (c) 1981 Cidelsa */ - DRIVER( destryea ) /* (c) 1981 Cidelsa */ + DRIVER( destryera ) /* (c) 1981 Cidelsa */ DRIVER( draco ) /* (c) 1981 Cidelsa */ DRIVER( rockduck ) /* (c) 1983 Datel SAS */ DRIVER( tetriskr ) /* (c) 1988? bootleg */ diff --git a/src/mame/video/cyberbal.c b/src/mame/video/cyberbal.c index 77ee67839a9..66b63c470de 100644 --- a/src/mame/video/cyberbal.c +++ b/src/mame/video/cyberbal.c @@ -191,7 +191,7 @@ VIDEO_START( cyberbal ) } -VIDEO_START( cyberb2p ) +VIDEO_START( cyberbal2p ) { video_start_cyberbal_common(machine, 1); diff --git a/src/mame/video/konamiic.c b/src/mame/video/konamiic.c index 6b099681448..98d0599cc5d 100644 --- a/src/mame/video/konamiic.c +++ b/src/mame/video/konamiic.c @@ -308,7 +308,7 @@ outputs: control registers 000: scroll x (low 8 bits) 001: -------x scroll x (high bit) - ------x- enable rowscroll? (combasc) + ------x- enable rowscroll? (combatsc) ----x--- this probably selects an alternate screen layout used in combat school where tilemap #2 is overlayed on front and doesn't scroll. The 32 lines of the front layer can be individually turned on or @@ -332,10 +332,10 @@ control registers --x----- might be sprite / tilemap priority (0 = sprites have priority) (combat school, contra, haunted castle(0/1), labyrunr) -x------ Chops away the leftmost and rightmost columns, switching the - visible area from 256 to 240 pixels. This is used by combasc on + visible area from 256 to 240 pixels. This is used by combatsc on the scrolling stages, and by labyrunr on the title screen. At first I thought that this enabled an extra bank of 0x40 - sprites, needed by combasc, but labyrunr proves that this is not + sprites, needed by combatsc, but labyrunr proves that this is not the case x------- unknown (contra) 004: ----xxxx bits 9-12 of the tile code. Only the bits enabled by the following @@ -355,15 +355,15 @@ control registers same ones indexed by register 005). Note that an attribute bit can therefore be used at the same time to be BOTH a tile code bit and an additional effect. - -------x bit 3 of attribute is bit 3 of color (combasc, fastlane, flkatck) + -------x bit 3 of attribute is bit 3 of color (combatsc, fastlane, flkatck) ------x- bit 4 of attribute is tile flip X (assumption - no game uses this) -----x-- bit 5 of attribute is tile flip Y (flkatck) - ----x--- bit 6 of attribute is tile priority over sprites (combasc, hcastle, + ----x--- bit 6 of attribute is tile priority over sprites (combatsc, hcastle, labyrunr) Note that hcastle sets this bit for layer 0, and bit 6 of the attribute is also used as bit 12 of the tile code, however that bit is ALWAYS set throughout the game. - combasc uses the bit in the "graduation" scene during attract mode, + combatsc uses the bit in the "graduation" scene during attract mode, to place soldiers behind the stand. Use in labyrunr has not been investigated yet. --xx---- palette bank (both tiles and sprites, see contra) @@ -1333,8 +1333,8 @@ if (input_code_pressed(gfx->machine, KEYCODE_D)) } else /* all others */ { - //num = (K007121_ctrlram[chip][0x03] & 0x40) ? 0x80 : 0x40; /* WRONG!!! (needed by combasc) */ - num = 0x40; // Combasc writes 70 sprites to VRAM at peak but the chip only processes the first 64. + //num = (K007121_ctrlram[chip][0x03] & 0x40) ? 0x80 : 0x40; /* WRONG!!! (needed by combatsc) */ + num = 0x40; // combatsc writes 70 sprites to VRAM at peak but the chip only processes the first 64. inc = 5; offs[0] = 0x00; diff --git a/src/mame/video/konicdev.c b/src/mame/video/konicdev.c index 18f61c13593..a43980c9e78 100644 --- a/src/mame/video/konicdev.c +++ b/src/mame/video/konicdev.c @@ -308,7 +308,7 @@ outputs: control registers 000: scroll x (low 8 bits) 001: -------x scroll x (high bit) - ------x- enable rowscroll? (combasc) + ------x- enable rowscroll? (combatsc) ----x--- this probably selects an alternate screen layout used in combat school where tilemap #2 is overlayed on front and doesn't scroll. The 32 lines of the front layer can be individually turned on or @@ -332,10 +332,10 @@ control registers --x----- might be sprite / tilemap priority (0 = sprites have priority) (combat school, contra, haunted castle(0/1), labyrunr) -x------ Chops away the leftmost and rightmost columns, switching the - visible area from 256 to 240 pixels. This is used by combasc on + visible area from 256 to 240 pixels. This is used by combatsc on the scrolling stages, and by labyrunr on the title screen. At first I thought that this enabled an extra bank of 0x40 - sprites, needed by combasc, but labyrunr proves that this is not + sprites, needed by combatsc, but labyrunr proves that this is not the case x------- unknown (contra) 004: ----xxxx bits 9-12 of the tile code. Only the bits enabled by the following @@ -355,15 +355,15 @@ control registers same ones indexed by register 005). Note that an attribute bit can therefore be used at the same time to be BOTH a tile code bit and an additional effect. - -------x bit 3 of attribute is bit 3 of color (combasc, fastlane, flkatck) + -------x bit 3 of attribute is bit 3 of color (combatsc, fastlane, flkatck) ------x- bit 4 of attribute is tile flip X (assumption - no game uses this) -----x-- bit 5 of attribute is tile flip Y (flkatck) - ----x--- bit 6 of attribute is tile priority over sprites (combasc, hcastle, + ----x--- bit 6 of attribute is tile priority over sprites (combatsc, hcastle, labyrunr) Note that hcastle sets this bit for layer 0, and bit 6 of the attribute is also used as bit 12 of the tile code, however that bit is ALWAYS set throughout the game. - combasc uses the bit in the "graduation" scene during attract mode, + combatsc uses the bit in the "graduation" scene during attract mode, to place soldiers behind the stand. Use in labyrunr has not been investigated yet. --xx---- palette bank (both tiles and sprites, see contra) @@ -1455,8 +1455,8 @@ void k007121_sprites_draw( running_device *device, bitmap_t *bitmap, const recta } else /* all others */ { - //num = (k007121->ctrlram[0x03] & 0x40) ? 0x80 : 0x40; /* WRONG!!! (needed by combasc) */ - num = 0x40; // Combasc writes 70 sprites to VRAM at peak but the chip only processes the first 64. + //num = (k007121->ctrlram[0x03] & 0x40) ? 0x80 : 0x40; /* WRONG!!! (needed by combatsc) */ + num = 0x40; // combatsc writes 70 sprites to VRAM at peak but the chip only processes the first 64. inc = 5; offs[0] = 0x00;