From 8e35e46cd1ae5c0b2c1d0565cf0e2f47f64d9eca Mon Sep 17 00:00:00 2001 From: Scott Stone Date: Mon, 1 Feb 2010 00:57:36 +0000 Subject: [PATCH] Source Cleanup: Setname fixes and other minor changes - Drivers starting with A. Comments: I'm noticing a lot of "#IF (gamename)_HACK" parts in several drivers which I assume are Stephh's? Could the same thing be accomplished by using the cheat engine and not producing alternate gamenames based on a hack flag? I could use some guidance here. --- src/mame/drivers/acefruit.c | 2 +- src/mame/drivers/actfancr.c | 4 +-- src/mame/drivers/aerofgt.c | 4 +-- src/mame/drivers/airbustr.c | 8 +++--- src/mame/drivers/alg.c | 4 +-- src/mame/drivers/alpha68k.c | 54 ++++++++++++++++++------------------- src/mame/drivers/appoooh.c | 4 +-- src/mame/drivers/arabian.c | 2 +- src/mame/drivers/aristmk5.c | 2 +- src/mame/drivers/arkanoid.c | 40 +++++++++++++-------------- src/mame/drivers/asteroid.c | 6 ++--- src/mame/drivers/astinvad.c | 4 +-- src/mame/drivers/astrocde.c | 4 +-- src/mame/drivers/astrof.c | 8 +++--- src/mame/drivers/asuka.c | 8 +++--- src/mame/drivers/atarig1.c | 30 ++++++++++----------- src/mame/drivers/atetris.c | 14 +++++----- 17 files changed, 99 insertions(+), 99 deletions(-) diff --git a/src/mame/drivers/acefruit.c b/src/mame/drivers/acefruit.c index 28a821d1b98..90d2181f667 100644 --- a/src/mame/drivers/acefruit.c +++ b/src/mame/drivers/acefruit.c @@ -402,7 +402,7 @@ static INPUT_PORTS_START( spellbnd ) PORT_BIT( 0xf4, IP_ACTIVE_LOW, IPT_UNKNOWN ) INPUT_PORTS_END -/* I've only mapped the known inputs after comparaison with 'spellbnd' and the ones known to do something */ +/* I've only mapped the known inputs after comparison with 'spellbnd' and the ones known to do something */ static INPUT_PORTS_START( starspnr ) PORT_START("IN0") // 0 PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME( "Gamble" ) diff --git a/src/mame/drivers/actfancr.c b/src/mame/drivers/actfancr.c index 867de4afad8..f489410325f 100644 --- a/src/mame/drivers/actfancr.c +++ b/src/mame/drivers/actfancr.c @@ -625,7 +625,7 @@ static DRIVER_INIT( actfancr ) memory_install_read8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f0026, 0x1f0027, 0, 0, cycle_r); } -static DRIVER_INIT( actfancj ) +static DRIVER_INIT( actfancrj ) { memory_install_read8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f0026, 0x1f0027, 0, 0, cyclej_r); } @@ -633,6 +633,6 @@ static DRIVER_INIT( actfancj ) GAME( 1989, actfancr, 0, actfancr, actfancr, actfancr, ROT0, "Data East Corporation", "Act-Fancer Cybernetick Hyper Weapon (World revision 2)", GAME_SUPPORTS_SAVE ) GAME( 1989, actfancr1,actfancr, actfancr, actfancr, actfancr, ROT0, "Data East Corporation", "Act-Fancer Cybernetick Hyper Weapon (World revision 1)", GAME_SUPPORTS_SAVE ) -GAME( 1989, actfancrj,actfancr, actfancr, actfancr, actfancj, ROT0, "Data East Corporation", "Act-Fancer Cybernetick Hyper Weapon (Japan revision 1)", GAME_SUPPORTS_SAVE ) +GAME( 1989, actfancrj,actfancr, actfancr, actfancr, actfancrj,ROT0, "Data East Corporation", "Act-Fancer Cybernetick Hyper Weapon (Japan revision 1)", GAME_SUPPORTS_SAVE ) GAME( 1989, triothep, 0, triothep, triothep, 0, ROT0, "Data East Corporation", "Trio The Punch - Never Forget Me... (World)", GAME_SUPPORTS_SAVE ) GAME( 1989, triothepj,triothep, triothep, triothep, 0, ROT0, "Data East Corporation", "Trio The Punch - Never Forget Me... (Japan)", GAME_SUPPORTS_SAVE ) diff --git a/src/mame/drivers/aerofgt.c b/src/mame/drivers/aerofgt.c index 8aa6a27b522..a1c64954c41 100644 --- a/src/mame/drivers/aerofgt.c +++ b/src/mame/drivers/aerofgt.c @@ -778,7 +778,7 @@ static INPUT_PORTS_START( spinlbrk ) PORT_DIPSETTING( 0x0000, "5 Points" ) INPUT_PORTS_END -static INPUT_PORTS_START( spinlbru ) +static INPUT_PORTS_START( spinlbrku ) PORT_INCLUDE(spinlbrk) PORT_MODIFY("DSW") @@ -2502,7 +2502,7 @@ ROM_END GAME( 1990, spinlbrk, 0, spinlbrk, spinlbrk, 0, ROT0, "V-System Co.", "Spinal Breakers (World)", GAME_SUPPORTS_SAVE | GAME_NO_COCKTAIL ) -GAME( 1990, spinlbrku,spinlbrk, spinlbrk, spinlbru, 0, ROT0, "V-System Co.", "Spinal Breakers (US)", GAME_SUPPORTS_SAVE | GAME_NO_COCKTAIL ) +GAME( 1990, spinlbrku,spinlbrk, spinlbrk, spinlbrku,0, ROT0, "V-System Co.", "Spinal Breakers (US)", GAME_SUPPORTS_SAVE | GAME_NO_COCKTAIL ) GAME( 1990, spinlbrkj,spinlbrk, spinlbrk, spinlbrk, 0, ROT0, "V-System Co.", "Spinal Breakers (Japan)", GAME_SUPPORTS_SAVE | GAME_NO_COCKTAIL ) GAME( 1991, pspikes, 0, pspikes, pspikes, 0, ROT0, "Video System Co.", "Power Spikes (World)", GAME_SUPPORTS_SAVE | GAME_NO_COCKTAIL ) GAME( 1991, pspikesk, pspikes, pspikes, pspikes, 0, ROT0, "Video System Co.", "Power Spikes (Korea)", GAME_SUPPORTS_SAVE | GAME_NO_COCKTAIL ) diff --git a/src/mame/drivers/airbustr.c b/src/mame/drivers/airbustr.c index 007477b0c1e..c0d12fd8964 100644 --- a/src/mame/drivers/airbustr.c +++ b/src/mame/drivers/airbustr.c @@ -488,7 +488,7 @@ static INPUT_PORTS_START( airbustr ) PORT_DIPUNUSED_DIPLOC( 0x80, IP_ACTIVE_LOW, "SW2:8" ) INPUT_PORTS_END -static INPUT_PORTS_START( airbustj ) +static INPUT_PORTS_START( airbustrj ) PORT_INCLUDE(airbustr) PORT_MODIFY("DSW1") @@ -688,7 +688,7 @@ static MACHINE_DRIVER_START( airbustr ) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) MACHINE_DRIVER_END -static MACHINE_DRIVER_START( airbusb ) +static MACHINE_DRIVER_START( airbustrb ) MDRV_IMPORT_FROM(airbustr) MDRV_WATCHDOG_TIME_INIT(SEC(0)) // no protection device or watchdog MACHINE_DRIVER_END @@ -809,5 +809,5 @@ static DRIVER_INIT( airbustr ) /* Game Drivers */ GAME( 1990, airbustr, 0, airbustr, airbustr, airbustr, ROT0, "Kaneko (Namco license)", "Air Buster: Trouble Specialty Raid Unit (World)", GAME_SUPPORTS_SAVE ) // 891220 -GAME( 1990, airbustrj, airbustr, airbustr, airbustj, airbustr, ROT0, "Kaneko (Namco license)", "Air Buster: Trouble Specialty Raid Unit (Japan)", GAME_SUPPORTS_SAVE) // 891229 -GAME( 1990, airbustrb, airbustr, airbusb, airbustj, 0, ROT0, "bootleg", "Air Buster: Trouble Specialty Raid Unit (bootleg)", GAME_SUPPORTS_SAVE) // based on Japan set (891229) +GAME( 1990, airbustrj, airbustr, airbustr, airbustrj,airbustr, ROT0, "Kaneko (Namco license)", "Air Buster: Trouble Specialty Raid Unit (Japan)", GAME_SUPPORTS_SAVE) // 891229 +GAME( 1990, airbustrb, airbustr, airbustrb,airbustrj,0, ROT0, "bootleg", "Air Buster: Trouble Specialty Raid Unit (bootleg)", GAME_SUPPORTS_SAVE) // based on Japan set (891229) diff --git a/src/mame/drivers/alg.c b/src/mame/drivers/alg.c index 1f77f2fbe0c..6f2f40b2e20 100644 --- a/src/mame/drivers/alg.c +++ b/src/mame/drivers/alg.c @@ -795,14 +795,14 @@ GAME( 1990, maddog, alg_bios, alg_r2, alg_2p, palr6, ROT0, "American Las /* works ok but uses right player (2) controls only for trigger and holster */ GAME( 1992, maddog2, alg_bios, alg_r2, alg_2p, palr6, ROT0, "American Laser Games", "Mad Dog II: The Lost Gold v2.04", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_IMPERFECT_GRAPHICS ) GAME( 1992, maddog22, alg_bios, alg_r2, alg_2p, palr6, ROT0, "American Laser Games", "Mad Dog II: The Lost Gold v2.02", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_IMPERFECT_GRAPHICS ) -GAME( 1992, maddog21, maddog2, alg_r2, alg_2p, palr6, ROT0, "American Laser Games", "Mad Dog II: The Lost Gold v1.0", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_IMPERFECT_GRAPHICS ) +GAME( 1992, maddog21, maddog2, alg_r2, alg_2p, palr6, ROT0, "American Laser Games", "Mad Dog II: The Lost Gold v1.0", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_IMPERFECT_GRAPHICS ) /* works ok but uses right player (2) controls only for trigger and holster */ GAME( 1992, spacepir, alg_bios, alg_r2, alg_2p, palr6, ROT0, "American Laser Games", "Space Pirates v2.2", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_IMPERFECT_GRAPHICS ) GAME( 1992, gallgall, alg_bios, alg_r2, alg_2p, palr6, ROT0, "American Laser Games", "Gallagher's Gallery v2.2", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_IMPERFECT_GRAPHICS ) /* all good, but no holster */ GAME( 1993, crimepat, alg_bios, alg_r2, alg_2p, palr6, ROT0, "American Laser Games", "Crime Patrol v1.4", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_IMPERFECT_GRAPHICS ) GAME( 1993, crimep2, alg_bios, alg_r2, alg_2p, palr6, ROT0, "American Laser Games", "Crime Patrol 2: Drug Wars v1.3", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_IMPERFECT_GRAPHICS ) -GAME( 1993, crimep211,crimep2, alg_r2, alg_2p, palr6, ROT0, "American Laser Games", "Crime Patrol 2: Drug Wars v1.1", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_IMPERFECT_GRAPHICS ) +GAME( 1993, crimep211,crimep2, alg_r2, alg_2p, palr6, ROT0, "American Laser Games", "Crime Patrol 2: Drug Wars v1.1", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_IMPERFECT_GRAPHICS ) GAME( 1994, lastbh, alg_bios, alg_r2, alg_2p, palr6, ROT0, "American Laser Games", "The Last Bounty Hunter v0.06", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_IMPERFECT_GRAPHICS ) GAME( 1995, fastdraw, alg_bios, alg_r2, alg_2p, palr6, ROT90, "American Laser Games", "Fast Draw Showdown v1.3", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_IMPERFECT_GRAPHICS ) /* works ok but uses right player (2) controls only for trigger and holster */ diff --git a/src/mame/drivers/alpha68k.c b/src/mame/drivers/alpha68k.c index c61b84ed153..6bcafd0dba4 100644 --- a/src/mame/drivers/alpha68k.c +++ b/src/mame/drivers/alpha68k.c @@ -75,7 +75,7 @@ Stephh's additional notes (based on the games M68000 code and some tests) : and select difficulty/court. I've mapped them this way because you absolutely need the 2 buttons when you are in the "test mode". - 4) 'timesold', 'timesol1' and 'btlfield' + 4) 'timesold', 'timesold1' and 'btlfield' - The "Unused" Dip Switch is sort of "Debug Mode" Dip Switch and has an effect ONLY if 0x008fff.b is writable (as Bryan mentioned it). @@ -88,7 +88,7 @@ Stephh's additional notes (based on the games M68000 code and some tests) : it is set to "Romstar". Again, it has an effect only if 0x000074.w is writable and its role seems only to be limited to display some coordonates. - 7) 'skyadvnt', 'skyadvnu' and 'skyadvnj' + 7) 'skyadvnt', 'skyadvntu' and 'skyadvntj' - As in 'skysoldr', you can access to some "hidden features" if 0x000074.w is writable : @@ -97,7 +97,7 @@ Stephh's additional notes (based on the games M68000 code and some tests) : * bit 6 (when "Difficulty" Dip Switch is set to DEF_STR( Hard ) or DEF_STR( Hardest )) determines if some coordonates are displayed. - 8) 'gangwarb' + 8) 'gangwarsb' - When "Coin Slots" Dip Switch is set to "1", COIN2 only adds ONE credit and this has nothing to do with the microcontroller stuff. @@ -125,13 +125,13 @@ Stephh's log (2002.06.19) : for 'sstingry', even if I had to rewrite it !) - Fix screen flipping in 'sbasebal' (this was a Dip Switch issue) - Add READ16_HANDLER( *_cycle_r ) for the following games : - * timesol1 (based on the one from 'timesold') + * timesold1 (based on the one from 'timesold') * btlfield (based on the one from 'timesold') - * gangwarb (I splitted the one from 'gangwars') - * skyadvnt, skyadvnu and skyadvnj + * gangwarsb (I splitted the one from 'gangwars') + * skyadvnt, skyadvntu and skyadvntj - Change manufacturer for the following games : * timesold - * timesol1 + * timesold1 * btlfield * skysoldr I can send you the ending pics where "Alpha Denshi Co." is mentioned. @@ -180,7 +180,7 @@ note: CLUT and color remap PROMs missing DIP locations verified from manuals for: - tnextspc - btlfield -- gangwarb +- gangwarsb - skyadvnt - goldmedl - kyros @@ -1176,7 +1176,7 @@ static INPUT_PORTS_START( btlfield ) PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(8) PORT_CODE_DEC(KEYCODE_N) PORT_CODE_INC(KEYCODE_M) PORT_REVERSE PORT_PLAYER(2) INPUT_PORTS_END -static INPUT_PORTS_START( btlfildb ) +static INPUT_PORTS_START( btlfieldb ) PORT_INCLUDE( btlfield ) PORT_MODIFY("IN4") /* A 6 way dip switch */ @@ -1358,7 +1358,7 @@ static INPUT_PORTS_START( skyadvnt ) INPUT_PORTS_END /* Same as 'skyadvnt' but bits 0-3 of 2nd set of Dip Switches are different */ -static INPUT_PORTS_START( skyadvnu ) +static INPUT_PORTS_START( skyadvntu ) PORT_INCLUDE( skyadvnt ) PORT_MODIFY("IN4") /* A 6 way dip switch */ @@ -1428,7 +1428,7 @@ static INPUT_PORTS_START( gangwars ) INPUT_PORTS_END /* Same as 'gangwars' but bits 0-3 of 2nd set of Dip Switches are different */ -static INPUT_PORTS_START( gangwarb ) +static INPUT_PORTS_START( gangwarsb ) PORT_INCLUDE( gangwars ) /* See notes about "IN2" (microcontroller) */ PORT_MODIFY("IN3") @@ -2164,7 +2164,7 @@ static MACHINE_DRIVER_START( alpha68k_II ) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75) MACHINE_DRIVER_END -static MACHINE_DRIVER_START( btlfildb ) +static MACHINE_DRIVER_START( btlfieldb ) MDRV_IMPORT_FROM(alpha68k_II) MDRV_CPU_MODIFY("maincpu") MDRV_CPU_VBLANK_INT_HACK(alpha68k_interrupt,2) @@ -3140,7 +3140,7 @@ static READ16_HANDLER( timesold_cycle_r ) return ret; } -static READ16_HANDLER( timesol1_cycle_r ) +static READ16_HANDLER( timesold1_cycle_r ) { alpha68k_state *state = (alpha68k_state *)space->machine->driver_data; int ret = state->shared_ram[0x4]; @@ -3210,7 +3210,7 @@ static READ16_HANDLER( gangwars_cycle_r ) return ret; } -static READ16_HANDLER( gangwarb_cycle_r ) +static READ16_HANDLER( gangwarsb_cycle_r ) { alpha68k_state *state = (alpha68k_state *)space->machine->driver_data; int ret = state->shared_ram[0x103]; @@ -3269,10 +3269,10 @@ static DRIVER_INIT( timesold ) state->coin_id = 0x22 | (0x22 << 8); } -static DRIVER_INIT( timesol1 ) +static DRIVER_INIT( timesold1 ) { alpha68k_state *state = (alpha68k_state *)machine->driver_data; - memory_install_read16_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x40008, 0x40009, 0, 0, timesol1_cycle_r); + memory_install_read16_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x40008, 0x40009, 0, 0, timesold1_cycle_r); state->invert_controls = 1; state->microcontroller_id = 0; state->coin_id = 0x22 | (0x22 << 8); @@ -3287,7 +3287,7 @@ static DRIVER_INIT( btlfield ) state->coin_id = 0x22 | (0x22 << 8); } -static DRIVER_INIT( btlfildb ) +static DRIVER_INIT( btlfieldb ) { alpha68k_state *state = (alpha68k_state *)machine->driver_data; state->invert_controls = 1; @@ -3314,7 +3314,7 @@ static DRIVER_INIT( goldmedl ) state->coin_id = 0x23 | (0x24 << 8); } -static DRIVER_INIT( goldmeda ) +static DRIVER_INIT( goldmedla ) { alpha68k_state *state = (alpha68k_state *)machine->driver_data; memory_set_bankptr(machine, "bank8", memory_region(machine, "maincpu") + 0x20000); @@ -3332,7 +3332,7 @@ static DRIVER_INIT( skyadvnt ) state->coin_id = 0x22 | (0x22 << 8); } -static DRIVER_INIT( skyadvnu ) +static DRIVER_INIT( skyadvntu ) { alpha68k_state *state = (alpha68k_state *)machine->driver_data; memory_install_read16_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x40008, 0x40009, 0, 0, skyadvnt_cycle_r); @@ -3351,10 +3351,10 @@ static DRIVER_INIT( gangwars ) state->coin_id = 0x23 | (0x24 << 8); } -static DRIVER_INIT( gangwarb ) +static DRIVER_INIT( gangwarsb ) { alpha68k_state *state = (alpha68k_state *)machine->driver_data; - memory_install_read16_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x40206, 0x40207, 0, 0, gangwarb_cycle_r); + memory_install_read16_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x40206, 0x40207, 0, 0, gangwarsb_cycle_r); memory_set_bankptr(machine, "bank8", memory_region(machine, "user1")); state->invert_controls = 0; state->microcontroller_id = 0x8512; @@ -3401,18 +3401,18 @@ GAME( 1986, kyrosj, kyros, kyros, kyros, kyros, ROT90, "Alp GAME( 1987, jongbou, 0, jongbou, jongbou, jongbou, ROT90, "SNK", "Mahjong Block Jongbou (Japan)", GAME_SUPPORTS_SAVE ) GAME( 1988, paddlema, 0, alpha68k_I, paddlema, paddlema, ROT90, "SNK", "Paddle Mania", GAME_SUPPORTS_SAVE ) GAME( 1987, timesold, 0, alpha68k_II, timesold, timesold, ROT90, "[Alpha Denshi Co.] (SNK/Romstar license)", "Time Soldiers (US Rev 3)", GAME_SUPPORTS_SAVE ) -GAME( 1987, timesold1, timesold, alpha68k_II, timesold, timesol1, ROT90, "[Alpha Denshi Co.] (SNK/Romstar license)", "Time Soldiers (US Rev 1)", GAME_SUPPORTS_SAVE ) +GAME( 1987, timesold1, timesold, alpha68k_II, timesold, timesold1,ROT90, "[Alpha Denshi Co.] (SNK/Romstar license)", "Time Soldiers (US Rev 1)", GAME_SUPPORTS_SAVE ) GAME( 1987, btlfield, timesold, alpha68k_II, btlfield, btlfield, ROT90, "[Alpha Denshi Co.] (SNK license)", "Battle Field (Japan)", GAME_SUPPORTS_SAVE ) -GAME( 1987, btlfieldb, timesold, btlfildb, btlfildb, btlfildb, ROT90, "bootleg", "Battle Field (bootleg)", GAME_SUPPORTS_SAVE ) +GAME( 1987, btlfieldb, timesold, btlfieldb, btlfieldb,btlfieldb,ROT90, "bootleg", "Battle Field (bootleg)", GAME_SUPPORTS_SAVE ) GAME( 1988, skysoldr, 0, alpha68k_II, skysoldr, skysoldr, ROT90, "[Alpha Denshi Co.] (SNK of America/Romstar license)", "Sky Soldiers (US)", GAME_SUPPORTS_SAVE ) GAME( 1988, goldmedl, 0, alpha68k_II_gm, goldmedl, goldmedl, ROT0, "SNK", "Gold Medalist", GAME_SUPPORTS_SAVE ) -GAME( 1988, goldmedla, goldmedl, alpha68k_II_gm, goldmedl, goldmeda, ROT0, "SNK", "Gold Medalist (alt)", GAME_SUPPORTS_SAVE ) -GAME( 1988, goldmedlb, goldmedl, alpha68k_II_gm, goldmedl, goldmeda, ROT0, "bootleg", "Gold Medalist (bootleg)", GAME_NOT_WORKING ) +GAME( 1988, goldmedla, goldmedl, alpha68k_II_gm, goldmedl, goldmedla,ROT0, "SNK", "Gold Medalist (alt)", GAME_SUPPORTS_SAVE ) +GAME( 1988, goldmedlb, goldmedl, alpha68k_II_gm, goldmedl, goldmedla,ROT0, "bootleg", "Gold Medalist (bootleg)", GAME_NOT_WORKING ) GAME( 1989, skyadvnt, 0, alpha68k_V, skyadvnt, skyadvnt, ROT90, "Alpha Denshi Co.", "Sky Adventure (World)", GAME_SUPPORTS_SAVE ) -GAME( 1989, skyadvntu, skyadvnt, alpha68k_V, skyadvnu, skyadvnu, ROT90, "Alpha Denshi Co. (SNK of America license)", "Sky Adventure (US)", GAME_SUPPORTS_SAVE ) +GAME( 1989, skyadvntu, skyadvnt, alpha68k_V, skyadvntu,skyadvntu,ROT90, "Alpha Denshi Co. (SNK of America license)", "Sky Adventure (US)", GAME_SUPPORTS_SAVE ) GAME( 1989, skyadvntj, skyadvnt, alpha68k_V, skyadvnt, skyadvnt, ROT90, "Alpha Denshi Co.", "Sky Adventure (Japan)", GAME_SUPPORTS_SAVE ) GAME( 1989, gangwars, 0, alpha68k_V, gangwars, gangwars, ROT0, "Alpha Denshi Co.", "Gang Wars (US)", GAME_SUPPORTS_SAVE ) -GAME( 1989, gangwarsb, gangwars, alpha68k_V, gangwarb, gangwarb, ROT0, "bootleg", "Gang Wars (bootleg)", GAME_SUPPORTS_SAVE ) +GAME( 1989, gangwarsb, gangwars, alpha68k_V, gangwarsb,gangwarsb,ROT0, "bootleg", "Gang Wars (bootleg)", GAME_SUPPORTS_SAVE ) #if SBASEBAL_HACK GAME( 1989, sbasebal, 0, alpha68k_V_sb, sbasebal, sbasebal, ROT0, "Alpha Denshi Co.", "Super Champion Baseball (Japan)", GAME_SUPPORTS_SAVE ) #else diff --git a/src/mame/drivers/appoooh.c b/src/mame/drivers/appoooh.c index e5e5a62db64..65f65b99e8f 100644 --- a/src/mame/drivers/appoooh.c +++ b/src/mame/drivers/appoooh.c @@ -603,7 +603,7 @@ static DRIVER_INIT(robowres) robowres_decode(machine, "maincpu"); } -static DRIVER_INIT(robowrb) +static DRIVER_INIT(robowresb) { const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); memory_set_decrypted_region(space, 0x0000, 0x7fff, memory_region(machine, "maincpu") + 0x1c000); @@ -618,4 +618,4 @@ static DRIVER_INIT(robowrb) GAME( 1984, appoooh, 0, appoooh, appoooh, 0, ROT0, "[Sanritsu] Sega", "Appoooh", GAME_SUPPORTS_SAVE ) GAME( 1986, robowres, 0, robowres, robowres, robowres, ROT0, "Sega", "Robo Wres 2001", GAME_SUPPORTS_SAVE ) -GAME( 1986, robowresb, robowres, robowres, robowres, robowrb, ROT0, "bootleg", "Robo Wres 2001 (bootleg)", GAME_SUPPORTS_SAVE ) +GAME( 1986, robowresb, robowres, robowres, robowres, robowresb,ROT0, "bootleg", "Robo Wres 2001 (bootleg)", GAME_SUPPORTS_SAVE ) diff --git a/src/mame/drivers/arabian.c b/src/mame/drivers/arabian.c index 52accd6dca2..6632a1959c2 100644 --- a/src/mame/drivers/arabian.c +++ b/src/mame/drivers/arabian.c @@ -72,7 +72,7 @@ #include "sound/ay8910.h" /* constants */ -#define MAIN_OSC 12000000 +#define MAIN_OSC XTAL_12MHz /************************************* diff --git a/src/mame/drivers/aristmk5.c b/src/mame/drivers/aristmk5.c index ff32d2d69db..10920c6bf9b 100644 --- a/src/mame/drivers/aristmk5.c +++ b/src/mame/drivers/aristmk5.c @@ -185,7 +185,7 @@ GAME( 1995, enchfrst, 0, aristmk5, aristmk5, aristmk5, ROT0, "Aristocrat", "Enc GAME( 1996, dolphntr, 0, aristmk5, aristmk5, aristmk5, ROT0, "Aristocrat", "Dolphin Treasure (B - 06/12/96, NSW/ACT, Rev 1.24.4.0)", GAME_NOT_WORKING|GAME_NO_SOUND ) GAME( 1996, dolphtra, 0, aristmk5, aristmk5, aristmk5, ROT0, "Aristocrat", "Dolphin Treasure (B - 06/12/96, NSW/ACT, Rev 3)", GAME_NOT_WORKING|GAME_NO_SOUND ) GAME( 1997, goldprmd, 0, aristmk5, aristmk5, aristmk5, ROT0, "Aristocrat", "Golden Pyramids (B - 13-05-97, USA)", GAME_NOT_WORKING|GAME_NO_SOUND ) -GAME( 1997, qotn, 0, aristmk5, aristmk5, aristmk5, ROT0, "Aristocrat", "Queen of the Nile (B - 13-05-97, NSW/ACT)", GAME_NOT_WORKING|GAME_NO_SOUND ) +GAME( 1997, qotn, 0, aristmk5, aristmk5, aristmk5, ROT0, "Aristocrat", "Queen of the Nile (B - 13-05-97, NSW/ACT)", GAME_NOT_WORKING|GAME_NO_SOUND ) GAME( 1997, dmdtouch, 0, aristmk5, aristmk5, aristmk5, ROT0, "Aristocrat", "Diamond Touch (E - 30-06-97, Local)", GAME_NOT_WORKING|GAME_NO_SOUND ) GAME( 1998, adonis, 0, aristmk5, aristmk5, aristmk5, ROT0, "Aristocrat", "Adonis (A - 25-05-98, NSW/ACT)", GAME_NOT_WORKING|GAME_NO_SOUND ) GAME( 1998, reelrock, 0, aristmk5, aristmk5, aristmk5, ROT0, "Aristocrat", "Reelin-n-Rockin (A - 13/07/98, Local)", GAME_NOT_WORKING|GAME_NO_SOUND ) diff --git a/src/mame/drivers/arkanoid.c b/src/mame/drivers/arkanoid.c index 98bffe488f6..48941a87784 100644 --- a/src/mame/drivers/arkanoid.c +++ b/src/mame/drivers/arkanoid.c @@ -8,18 +8,18 @@ Here are the versions we have: arkanoid World version, probably an earlier revision - arknoidu USA version, probably a later revision; There has been code + arkanoidu USA version, probably a later revision; There has been code inserted, NOT patched, so I don't think it's a bootleg The 68705 code for this one was not available; I made it up from the World version changing the level data pointer table. - arknoiuo USA version, probably an earlier revision + arkanoiduo USA version, probably an earlier revision ROM a75-10.bin should be identical to the real World one. (It only differs in the country byte from A75-11.ROM) This version works fine with the real MCU ROM arkatour Tournament version The 68705 code for this one was not available; I made it up from the World version changing the level data pointer table. - arknoidj Japanese version with level selector. + arkanoidj Japanese version with level selector. The 68705 code for this one was not available; I made it up from the World version changing the level data pointer table. arkbl2 Bootleg of the early Japanese version. @@ -224,7 +224,7 @@ Stephh's notes (based on the games Z80 code and some tests) : * affects ball speed at start of level (0x06 or 0x08) * affects level 2 (same as normal version or same as level 30) - You can select your starting level (between 1 and 30) - but they aren't displayed like in the original Japanese set we have ('arknoidj'). + but they aren't displayed like in the original Japanese set we have ('arkanoidj'). - Level 30 differs from original Japanese version - There seems to be code to edit levels (check code at 0x8082), but the routines don't seem to be called anymore. @@ -247,7 +247,7 @@ Stephh's notes (based on the games Z80 code and some tests) : * affects ball speed at start of level (0x04 or 0x06) * affects level 2 (same as normal version or same as level 30) - You can select your starting level (between 1 and 30) - but they aren't displayed like in the original Japanese set we have ('arknoidj'). + but they aren't displayed like in the original Japanese set we have ('arkanoidj'). No "What round do you want to start from ?" message though. - Level 30 differs from original Japanese version (it also differs from 'arkangc') - The routine to handle the paddle is completely different as in 'arkangc' @@ -278,11 +278,11 @@ Stephh's notes (based on the games Z80 code and some tests) : - "Continue" Dip Switch has been replaced by sort of "Debug" Dip Switch as in 'arkangc'; however, this has no effect due to newly patched code at 0x06e9 ! - You can select your starting level (between 1 and 30) - but they aren't displayed like in the original Japanese set we have ('arknoidj'). + but they aren't displayed like in the original Japanese set we have ('arkanoidj'). - Levels 1, 2, 3, 4, 6, 7, 11, 14, 30, 31 and 32 differ from original Japanese version; level 1 starts at a different offset (0x90a8 instead of 0xbf15). - Complerely different initials on high-scores table, but scores and rounds - are the same as in the original Japanese set we have ('arknoidj'). + are the same as in the original Japanese set we have ('arkanoidj'). - There seems to be code to edit levels (check code at 0x8082), but the routines don't seem to be called anymore. - Known bugs : @@ -317,12 +317,12 @@ Stephh's notes (based on the games Z80 code and some tests) : - All reads from 0xf002 are patched. - Reads bit 5 from 0xd008. - You can select your starting level (between 1 and 30) but they aren't displayed - like in the original Japanese set we have ('arknoidj'). + like in the original Japanese set we have ('arkanoidj'). - "Continue" Dip Switch has been replaced by sort of "Debug" Dip Switch : * affects ball speed at start of level (0x06 or 0x08) * affects level 2 (same as normal version or same as level 30) - You can select your starting level (between 1 and 30) - but they aren't displayed like in the original Japanese set we have ('arknoidj'). + but they aren't displayed like in the original Japanese set we have ('arkanoidj'). - Level 30 differs from original Japanese version (same as the one from 'arkangc2') - Known bugs : * You can go from one side of the screen to the other through the walls @@ -345,7 +345,7 @@ Stephh's notes (based on the games Z80 code and some tests) : - Different "Lives" Dip Switch (check table at 0x9a28) - Specific coinage (always 2C_1C) - If Dip Switch is set, you can select your starting level (between 1 and 30) - but they aren't displayed like in the original Japanese set we have ('arknoidj'). + but they aren't displayed like in the original Japanese set we have ('arkanoidj'). - Same level 30 as original Japanese version - Known bugs : * You can go from one side of the screen to the other through the walls @@ -373,7 +373,7 @@ Stephh's notes (based on the games Z80 code and some tests) : * "20K 60K 60K+" or "20K" when you continue - Different "Lives" Dip Switch (check table at 0x9a28) - If Dip Switch is set, you can select your starting level (between 1 and 30) - but they aren't displayed like in the original Japanese set we have ('arknoidj'). + but they aren't displayed like in the original Japanese set we have ('arkanoidj'). - Levels are based on the ones from "Arkanoid II". - Known bugs : * You can go from one side of the screen to the other through the walls @@ -424,9 +424,9 @@ Stephh's notes (based on the games Z80 code and some tests) : TO DO (2006.09.12) : - Check the following Taito sets (adresses, routines and Dip Switches) : - * 'arkanoid' = 'arknoiuo' - * 'arknoidj' - * 'arknoidu' + * 'arkanoid' = 'arkanoiduo' + * 'arkanoidj' + * 'arkanoidu' * 'arkatour' - Add more notes about main addresses and routines in the Z80 - Try to understand the problem with the MCU in the following sets : @@ -498,7 +498,7 @@ Stephh's notes on 'tetrsark' (based on the game Z80 code and some tests) : *************************************************************************** DIP locations verified for: - - arknoidj + - arkanoidj - arkanoid ***************************************************************************/ @@ -613,7 +613,7 @@ static INPUT_PORTS_START( arkanoid ) INPUT_PORTS_END /* Different coinage and additional "Cabinet" Dip Switch */ -static INPUT_PORTS_START( arknoidj ) +static INPUT_PORTS_START( arkanoidj ) PORT_INCLUDE( arkanoid ) PORT_MODIFY("DSW") @@ -626,7 +626,7 @@ static INPUT_PORTS_START( arknoidj ) INPUT_PORTS_END static INPUT_PORTS_START( ark1ball ) - PORT_INCLUDE( arknoidj ) + PORT_INCLUDE( arkanoidj ) PORT_MODIFY("DSW") PORT_DIPNAME( 0x10, 0x10, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW1:4") /* "ld a,$60" at 0x93bd and "ld a,$60" at 0x9c7f and 0x9c9b */ @@ -639,7 +639,7 @@ INPUT_PORTS_END /* Bootlegs do not read from the MCU */ static INPUT_PORTS_START( arkatayt ) - PORT_INCLUDE( arknoidj ) + PORT_INCLUDE( arkanoidj ) PORT_MODIFY("SYSTEM") PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SPECIAL ) /* Some bootlegs need it to be 1 */ @@ -1382,8 +1382,8 @@ static DRIVER_INIT( tetrsark ) GAME( 1986, arkanoid, 0, arkanoid, arkanoid, 0, ROT90, "Taito Corporation Japan", "Arkanoid (World)", GAME_SUPPORTS_SAVE ) GAME( 1986, arkanoidu, arkanoid, arkanoid, arkanoid, 0, ROT90, "Taito America Corporation (Romstar license)", "Arkanoid (US)", GAME_SUPPORTS_SAVE ) GAME( 1986, arkanoiduo, arkanoid, arkanoid, arkanoid, 0, ROT90, "Taito America Corporation (Romstar license)", "Arkanoid (US, older)", GAME_SUPPORTS_SAVE ) -GAME( 1986, arkanoidj, arkanoid, arkanoid, arknoidj, 0, ROT90, "Taito Corporation", "Arkanoid (Japan)", GAME_SUPPORTS_SAVE ) -GAME( 1986, arkmcubl, arkanoid, arkanoid, arknoidj, 0, ROT90, "bootleg", "Arkanoid (bootleg with MCU)", GAME_SUPPORTS_SAVE ) +GAME( 1986, arkanoidj, arkanoid, arkanoid, arkanoidj,0, ROT90, "Taito Corporation", "Arkanoid (Japan)", GAME_SUPPORTS_SAVE ) +GAME( 1986, arkmcubl, arkanoid, arkanoid, arkanoidj,0, ROT90, "bootleg", "Arkanoid (bootleg with MCU)", GAME_SUPPORTS_SAVE ) GAME( 1986, ark1ball, arkanoid, arkanoid, ark1ball, 0, ROT90, "bootleg", "Arkanoid (bootleg with MCU, harder)", GAME_SUPPORTS_SAVE ) GAME( 1986, arkangc, arkanoid, bootleg, arkangc, arkangc, ROT90, "bootleg", "Arkanoid (Game Corporation bootleg, set 1)", GAME_SUPPORTS_SAVE ) GAME( 1986, arkangc2, arkanoid, bootleg, arkangc2, arkangc2, ROT90, "bootleg", "Arkanoid (Game Corporation bootleg, set 2)", GAME_SUPPORTS_SAVE ) diff --git a/src/mame/drivers/asteroid.c b/src/mame/drivers/asteroid.c index 67a7a8ec82b..9e58392b6f9 100644 --- a/src/mame/drivers/asteroid.c +++ b/src/mame/drivers/asteroid.c @@ -358,7 +358,7 @@ static INPUT_PORTS_START( asteroid ) INPUT_PORTS_END -static INPUT_PORTS_START( asteroib ) +static INPUT_PORTS_START( asteroidb ) PORT_INCLUDE( asteroid ) PORT_MODIFY("IN0") @@ -920,7 +920,7 @@ ROM_END * *************************************/ -static DRIVER_INIT( asteroib ) +static DRIVER_INIT( asteroidb ) { memory_install_read_port(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x2000, 0x2000, 0, 0, "IN0"); memory_install_read_port(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x2003, 0x2003, 0, 0, "HS"); @@ -943,7 +943,7 @@ static DRIVER_INIT( asterock ) GAME( 1979, asteroid, 0, asteroid, asteroid, 0, ROT0, "Atari", "Asteroids (rev 4)", GAME_SUPPORTS_SAVE ) GAME( 1979, asteroid2,asteroid, asteroid, asteroid, 0, ROT0, "Atari", "Asteroids (rev 2)", GAME_SUPPORTS_SAVE ) GAME( 1979, asteroid1,asteroid, asteroid, asteroid, 0, ROT0, "Atari", "Asteroids (rev 1)", GAME_SUPPORTS_SAVE ) -GAME( 1979, asteroidb,asteroid, asteroid, asteroib, asteroib, ROT0, "bootleg", "Asteroids (bootleg on Lunar Lander hardware)", GAME_SUPPORTS_SAVE ) +GAME( 1979, asteroidb,asteroid, asteroid, asteroidb,asteroidb,ROT0, "bootleg", "Asteroids (bootleg on Lunar Lander hardware)", GAME_SUPPORTS_SAVE ) GAME( 1979, asterock, asteroid, asterock, asterock, asterock, ROT0, "Sidam", "Asterock", GAME_SUPPORTS_SAVE ) GAME( 1979, meteorts, asteroid, asteroid, asteroid, 0, ROT0, "VGG", "Meteorites", GAME_SUPPORTS_SAVE ) GAME( 1980, meteorho, asteroid, asteroid, asteroid, 0, ROT0, "Hoei", "Meteor", GAME_SUPPORTS_SAVE ) diff --git a/src/mame/drivers/astinvad.c b/src/mame/drivers/astinvad.c index e2cac2cd8ff..d83e42067d4 100644 --- a/src/mame/drivers/astinvad.c +++ b/src/mame/drivers/astinvad.c @@ -533,7 +533,7 @@ static INPUT_PORTS_START( spaceint ) PORT_DIPSETTING( 0xff, DEF_STR( Cocktail ) ) INPUT_PORTS_END -static INPUT_PORTS_START( spaceinj ) +static INPUT_PORTS_START( spaceintj ) PORT_INCLUDE( spaceint ) PORT_MODIFY("IN1") @@ -776,4 +776,4 @@ GAME( 1980, astinvad, kamikaze, kamikaze, astinvad, kamikaze, ROT270, "Stern", GAME( 19??, kosmokil, kamikaze, kamikaze, kamikaze, kamikaze, ROT270, "bootleg", "Kosmo Killer", GAME_IMPERFECT_SOUND | GAME_SUPPORTS_SAVE ) // says >BEM< Mi Italy but it looks hacked in, dif revision of game tho. GAME( 1979, spcking2, 0, spcking2, spcking2, spcking2, ROT270, "Konami", "Space King 2", GAME_IMPERFECT_SOUND | GAME_SUPPORTS_SAVE ) GAME( 1980, spaceint, 0, spaceint, spaceint, 0, ROT90, "Shoei", "Space Intruder", GAME_IMPERFECT_SOUND | GAME_WRONG_COLORS | GAME_SUPPORTS_SAVE ) -GAME( 1980, spaceintj,spaceint, spaceint, spaceinj, 0, ROT90, "Shoei", "Space Intruder (Japan)", GAME_IMPERFECT_SOUND | GAME_WRONG_COLORS | GAME_SUPPORTS_SAVE ) +GAME( 1980, spaceintj,spaceint, spaceint, spaceintj,0, ROT90, "Shoei", "Space Intruder (Japan)", GAME_IMPERFECT_SOUND | GAME_WRONG_COLORS | GAME_SUPPORTS_SAVE ) diff --git a/src/mame/drivers/astrocde.c b/src/mame/drivers/astrocde.c index 870399e804c..d2cc8fe2362 100644 --- a/src/mame/drivers/astrocde.c +++ b/src/mame/drivers/astrocde.c @@ -1008,7 +1008,7 @@ static INPUT_PORTS_START( gorf ) INPUT_PORTS_END -static INPUT_PORTS_START( gorfg ) +static INPUT_PORTS_START( gorfpgm1g ) PORT_INCLUDE(gorf) PORT_MODIFY("P4HANDLE") @@ -1838,7 +1838,7 @@ GAME( 1980, wowg, wow, wow, wowg, wow, ROT0, "Midway", "Wiz /* 91354 CPU board + 90708 game board + 91356 RAM board + 91355 pattern board + 91364 ROM/RAM board */ GAMEL(1981, gorf, 0, gorf, gorf, gorf, ROT270, "Midway", "Gorf", GAME_IMPERFECT_SOUND | GAME_SUPPORTS_SAVE, layout_gorf ) GAMEL(1981, gorfpgm1, gorf, gorf, gorf, gorf, ROT270, "Midway", "Gorf (program 1)", GAME_IMPERFECT_SOUND | GAME_SUPPORTS_SAVE, layout_gorf ) -GAMEL(1981, gorfpgm1g,gorf, gorf, gorfg, gorf, ROT270, "Midway", "Gorf (program 1, with German Language ROM)", GAME_IMPERFECT_SOUND | GAME_SUPPORTS_SAVE, layout_gorf ) +GAMEL(1981, gorfpgm1g,gorf, gorf, gorfpgm1g,gorf, ROT270, "Midway", "Gorf (program 1, with German Language ROM)", GAME_IMPERFECT_SOUND | GAME_SUPPORTS_SAVE, layout_gorf ) /* 91354 CPU board + 90708 game board + 91356 RAM board + 91355 pattern board + 91423 memory board */ GAME( 1981, robby, 0, robby, robby, robby, ROT0, "Bally Midway", "Robby Roto", GAME_SUPPORTS_SAVE ) diff --git a/src/mame/drivers/astrof.c b/src/mame/drivers/astrof.c index 3fadf21b2b0..bc62de6b807 100644 --- a/src/mame/drivers/astrof.c +++ b/src/mame/drivers/astrof.c @@ -821,7 +821,7 @@ static INPUT_PORTS_START( spfghmk2 ) PORT_BIT( 0xfc, IP_ACTIVE_HIGH, IPT_UNUSED ) INPUT_PORTS_END -static INPUT_PORTS_START( spfgmk22 ) +static INPUT_PORTS_START( spfghmk22 ) PORT_INCLUDE( astrof_common ) PORT_START("IN") @@ -935,7 +935,7 @@ static INPUT_PORTS_START( tomahawk ) PORT_BIT( 0xfc, IP_ACTIVE_HIGH, IPT_UNUSED ) INPUT_PORTS_END -static INPUT_PORTS_START( tomahaw1 ) +static INPUT_PORTS_START( tomahawk1 ) PORT_INCLUDE( tomahawk ) PORT_MODIFY("DSW") @@ -1362,6 +1362,6 @@ GAME( 1979, acombat, astrof, abattle, abattle, afire, ROT90, "bootleg", GAME( 1979, acombato, astrof, abattle, abattle, afire, ROT90, "bootleg", "Astro Combat (older, PZ)", GAME_IMPERFECT_SOUND | GAME_SUPPORTS_SAVE ) GAME( 1979, sstarbtl, astrof, abattle, abattle, sstarbtl,ROT90, "bootleg", "Super Star Battle", GAME_IMPERFECT_SOUND | GAME_SUPPORTS_SAVE ) GAME( 1979, spfghmk2, 0, spfghmk2, spfghmk2, 0, ROT90, "Data East", "Space Fighter Mark II (set 1)", GAME_NO_SOUND | GAME_SUPPORTS_SAVE ) -GAME( 1979, spfghmk22,spfghmk2, spfghmk2, spfgmk22, 0, ROT90, "Data East", "Space Fighter Mark II (set 2)", GAME_NO_SOUND | GAME_SUPPORTS_SAVE ) +GAME( 1979, spfghmk22,spfghmk2, spfghmk2, spfghmk22,0, ROT90, "Data East", "Space Fighter Mark II (set 2)", GAME_NO_SOUND | GAME_SUPPORTS_SAVE ) GAME( 1980, tomahawk, 0, tomahawk, tomahawk, 0, ROT90, "Data East", "Tomahawk 777 (rev 5)", GAME_IMPERFECT_SOUND | GAME_SUPPORTS_SAVE ) -GAME( 1980, tomahawk1,tomahawk, tomahawk, tomahaw1, 0, ROT90, "Data East", "Tomahawk 777 (rev 1)", GAME_IMPERFECT_SOUND | GAME_SUPPORTS_SAVE ) +GAME( 1980, tomahawk1,tomahawk, tomahawk, tomahawk1,0, ROT90, "Data East", "Tomahawk 777 (rev 1)", GAME_IMPERFECT_SOUND | GAME_SUPPORTS_SAVE ) diff --git a/src/mame/drivers/asuka.c b/src/mame/drivers/asuka.c index 0fb4b2aa02c..876a01d7ce2 100644 --- a/src/mame/drivers/asuka.c +++ b/src/mame/drivers/asuka.c @@ -76,13 +76,13 @@ TC0100SCN do use the FG layer for text (Driftout is an exception). Stephh's notes (based on the game M68000 code and some tests) : -1) 'bonzeadv', 'jigkmgri' and 'bonzeadu' +1) 'bonzeadv', 'jigkmgri' and 'bonzeadvu' - Region stored at 0x03fffe.w - Sets : * 'bonzeadv' : region = 0x0002 * 'jigkmgri' : region = 0x0000 - * 'bonzeadu' : region = 0x0001 + * 'bonzeadvu': region = 0x0001 - These 3 games are 100% the same, only region differs ! - Coinage relies on the region (code at 0x02d344) : * 0x0000 (Japan) and 0x0001 (US) use TAITO_COINAGE_JAPAN_OLD_LOC() @@ -107,11 +107,11 @@ Stephh's notes (based on the game M68000 code and some tests) : but it is now unused due to "bra" instruction at 0x007572 -2) 'bonzeado' +2) 'bonzeadvo' - Region stored at 0x03fffe.w - Sets : - * 'bonzeado' : region = 0x0002 + * 'bonzeadvo' : region = 0x0002 - The only difference is that the following code is missing : 00D218: 08AD 0004 15DE bclr #$4, ($15de,A5) diff --git a/src/mame/drivers/atarig1.c b/src/mame/drivers/atarig1.c index 63b8537b381..9dc28755f1e 100644 --- a/src/mame/drivers/atarig1.c +++ b/src/mame/drivers/atarig1.c @@ -147,7 +147,7 @@ INLINE void update_bank(atarig1_state *state, int bank) } -static STATE_POSTLOAD( pitfighb_state_postload ) +static STATE_POSTLOAD( pitfightb_state_postload ) { atarig1_state *state = (atarig1_state *)machine->driver_data; int bank = state->bslapstic_bank; @@ -156,7 +156,7 @@ static STATE_POSTLOAD( pitfighb_state_postload ) } -static READ16_HANDLER( pitfighb_cheap_slapstic_r ) +static READ16_HANDLER( pitfightb_cheap_slapstic_r ) { atarig1_state *state = (atarig1_state *)space->machine->driver_data; int result = state->bslapstic_base[offset & 0xfff]; @@ -184,12 +184,12 @@ static READ16_HANDLER( pitfighb_cheap_slapstic_r ) } -static void pitfighb_cheap_slapstic_init(running_machine *machine) +static void pitfightb_cheap_slapstic_init(running_machine *machine) { atarig1_state *state = (atarig1_state *)machine->driver_data; /* install a read handler */ - state->bslapstic_base = memory_install_read16_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x038000, 0x03ffff, 0, 0, pitfighb_cheap_slapstic_r); + state->bslapstic_base = memory_install_read16_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x038000, 0x03ffff, 0, 0, pitfightb_cheap_slapstic_r); /* allocate memory for a copy of bank 0 */ state->bslapstic_bank0 = auto_alloc_array(machine, UINT8, 0x2000); @@ -314,7 +314,7 @@ static INPUT_PORTS_START( pitfight ) INPUT_PORTS_END -static INPUT_PORTS_START( pitfighj ) +static INPUT_PORTS_START( pitfightj ) PORT_START("IN0") /* fc0000 */ PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1) @@ -1078,10 +1078,10 @@ static void init_g1_common(running_machine *machine, offs_t slapstic_base, int s state->atarigen.eeprom_default = NULL; if (slapstic == -1) { - pitfighb_cheap_slapstic_init(machine); + pitfightb_cheap_slapstic_init(machine); state_save_register_global(machine, state->bslapstic_bank); state_save_register_global(machine, state->bslapstic_primed); - state_save_register_postload(machine, pitfighb_state_postload, NULL); + state_save_register_postload(machine, pitfightb_state_postload, NULL); } else if (slapstic != 0) atarigen_slapstic_init(devtag_get_device(machine, "maincpu"), slapstic_base, 0, slapstic); @@ -1093,10 +1093,10 @@ static void init_g1_common(running_machine *machine, offs_t slapstic_base, int s static DRIVER_INIT( hydra ) { init_g1_common(machine, 0x078000, 116, 0); } static DRIVER_INIT( hydrap ) { init_g1_common(machine, 0x000000, 0, 0); } -static DRIVER_INIT( pitfigh7 ) { init_g1_common(machine, 0x038000, 112, 2); } +static DRIVER_INIT( pitfight7 ) { init_g1_common(machine, 0x038000, 112, 2); } static DRIVER_INIT( pitfight ) { init_g1_common(machine, 0x038000, 111, 1); } -static DRIVER_INIT( pitfighj ) { init_g1_common(machine, 0x038000, 113, 1); } -static DRIVER_INIT( pitfighb ) { init_g1_common(machine, 0x038000, -1, 1); } +static DRIVER_INIT( pitfightj ) { init_g1_common(machine, 0x038000, 113, 1); } +static DRIVER_INIT( pitfightb ) { init_g1_common(machine, 0x038000, -1, 1); } /************************************* @@ -1109,10 +1109,10 @@ GAME( 1990, hydra, 0, atarig1, hydra, hydra, ROT0, "Atari Games" GAME( 1990, hydrap, hydra, atarig1, hydra, hydrap, ROT0, "Atari Games", "Hydra (prototype 5/14/90)", GAME_SUPPORTS_SAVE ) GAME( 1990, hydrap2, hydra, atarig1, hydra, hydrap, ROT0, "Atari Games", "Hydra (prototype 5/25/90)", GAME_SUPPORTS_SAVE ) -GAME( 1990, pitfight, 0, atarig1, pitfight, pitfigh7, ROT0, "Atari Games", "Pit Fighter (rev 7)", GAME_SUPPORTS_SAVE ) -GAME( 1990, pitfight6, pitfight, atarig1, pitfight, pitfighj, ROT0, "Atari Games", "Pit Fighter (rev 6)", GAME_SUPPORTS_SAVE ) -GAME( 1990, pitfight5, pitfight, atarig1, pitfight, pitfigh7, ROT0, "Atari Games", "Pit Fighter (rev 5)", GAME_SUPPORTS_SAVE ) +GAME( 1990, pitfight, 0, atarig1, pitfight, pitfight7,ROT0, "Atari Games", "Pit Fighter (rev 7)", GAME_SUPPORTS_SAVE ) +GAME( 1990, pitfight6, pitfight, atarig1, pitfight, pitfightj,ROT0, "Atari Games", "Pit Fighter (rev 6)", GAME_SUPPORTS_SAVE ) +GAME( 1990, pitfight5, pitfight, atarig1, pitfight, pitfight7,ROT0, "Atari Games", "Pit Fighter (rev 5)", GAME_SUPPORTS_SAVE ) GAME( 1990, pitfight4, pitfight, atarig1, pitfight, pitfight, ROT0, "Atari Games", "Pit Fighter (rev 4)", GAME_SUPPORTS_SAVE ) GAME( 1990, pitfight3, pitfight, atarig1, pitfight, pitfight, ROT0, "Atari Games", "Pit Fighter (rev 3)", GAME_SUPPORTS_SAVE ) -GAME( 1990, pitfightj, pitfight, atarig1, pitfighj, pitfighj, ROT0, "Atari Games", "Pit Fighter (Japan, 2 players)", GAME_SUPPORTS_SAVE ) -GAME( 1990, pitfightb, pitfight, atarig1, pitfight, pitfighb, ROT0, "Atari Games", "Pit Fighter (bootleg)", GAME_SUPPORTS_SAVE ) +GAME( 1990, pitfightj, pitfight, atarig1, pitfightj,pitfightj,ROT0, "Atari Games", "Pit Fighter (Japan, 2 players)", GAME_SUPPORTS_SAVE ) +GAME( 1990, pitfightb, pitfight, atarig1, pitfight, pitfightb,ROT0, "Atari Games", "Pit Fighter (bootleg)", GAME_SUPPORTS_SAVE ) diff --git a/src/mame/drivers/atetris.c b/src/mame/drivers/atetris.c index 9840ba3970e..07ef5f9c599 100644 --- a/src/mame/drivers/atetris.c +++ b/src/mame/drivers/atetris.c @@ -220,7 +220,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END -static ADDRESS_MAP_START( atetrsb2_map, ADDRESS_SPACE_PROGRAM, 8 ) +static ADDRESS_MAP_START( atetrisb2_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0fff) AM_RAM AM_RANGE(0x1000, 0x1fff) AM_RAM_WRITE(atetris_videoram_w) AM_BASE_GENERIC(videoram) AM_SIZE_GENERIC(videoram) AM_RANGE(0x2000, 0x20ff) AM_RAM_WRITE(paletteram_RRRGGGBB_w) AM_BASE_GENERIC(paletteram) @@ -276,7 +276,7 @@ INPUT_PORTS_END // Same as the regular one except they added a Flip Controls switch -static INPUT_PORTS_START( atetcktl ) +static INPUT_PORTS_START( atetrisc ) PORT_INCLUDE( atetris ) PORT_MODIFY("IN0") @@ -374,11 +374,11 @@ static MACHINE_DRIVER_START( atetris ) MACHINE_DRIVER_END -static MACHINE_DRIVER_START( atetrsb2 ) +static MACHINE_DRIVER_START( atetrisb2 ) /* basic machine hardware */ MDRV_CPU_ADD("maincpu", M6502,BOOTLEG_CLOCK/8) - MDRV_CPU_PROGRAM_MAP(atetrsb2_map) + MDRV_CPU_PROGRAM_MAP(atetrisb2_map) MDRV_MACHINE_START(atetris) MDRV_MACHINE_RESET(atetris) @@ -509,6 +509,6 @@ static DRIVER_INIT( atetris ) GAME( 1988, atetris, 0, atetris, atetris, atetris, ROT0, "Atari Games", "Tetris (set 1)", GAME_SUPPORTS_SAVE ) GAME( 1988, atetrisa, atetris, atetris, atetris, atetris, ROT0, "Atari Games", "Tetris (set 2)", GAME_SUPPORTS_SAVE ) GAME( 1988, atetrisb, atetris, atetris, atetris, atetris, ROT0, "bootleg", "Tetris (bootleg set 1)", GAME_SUPPORTS_SAVE ) -GAME( 1988, atetrisb2,atetris, atetrsb2, atetris, atetris, ROT0, "bootleg", "Tetris (bootleg set 2)", GAME_SUPPORTS_SAVE ) -GAME( 1989, atetrisc, atetris, atetris, atetcktl, atetris, ROT270, "Atari Games", "Tetris (cocktail set 1)", GAME_SUPPORTS_SAVE ) -GAME( 1989, atetrisc2,atetris, atetris, atetcktl, atetris, ROT270, "Atari Games", "Tetris (cocktail set 2)", GAME_SUPPORTS_SAVE ) +GAME( 1988, atetrisb2,atetris, atetrisb2,atetris, atetris, ROT0, "bootleg", "Tetris (bootleg set 2)", GAME_SUPPORTS_SAVE ) +GAME( 1989, atetrisc, atetris, atetris, atetrisc, atetris, ROT270, "Atari Games", "Tetris (cocktail set 1)", GAME_SUPPORTS_SAVE ) +GAME( 1989, atetrisc2,atetris, atetris, atetrisc, atetris, ROT270, "Atari Games", "Tetris (cocktail set 2)", GAME_SUPPORTS_SAVE )