summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/leland.cpp
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2018-06-02 03:29:30 +1000
committer Vas Crabb <vas@vastheman.com>2018-06-02 03:29:30 +1000
commitea579a59a8ff1de93fa3d96187f8ee55d3241639 (patch)
tree0f871793ae1376c0ed6cbd12841aa339174d33c3 /src/mame/drivers/leland.cpp
parent993b52015ae0473bf018db5867b7005e7917a4f0 (diff)
(nw) more cleanup - remove more literal tags, split redline/offroad/etc. out of leland state
Diffstat (limited to 'src/mame/drivers/leland.cpp')
-rw-r--r--src/mame/drivers/leland.cpp139
1 files changed, 69 insertions, 70 deletions
diff --git a/src/mame/drivers/leland.cpp b/src/mame/drivers/leland.cpp
index 1c549156e15..ae456010a65 100644
--- a/src/mame/drivers/leland.cpp
+++ b/src/mame/drivers/leland.cpp
@@ -97,13 +97,13 @@ void leland_state::master_map_io(address_map &map)
map(0xfd, 0xff).rw(this, FUNC(leland_state::leland_master_analog_key_r), FUNC(leland_state::leland_master_analog_key_w));
}
-void leland_state::master_redline_map_io(address_map &map)
+void redline_state::master_redline_map_io(address_map &map)
{
map.global_mask(0xff);
- map(0xf0, 0xf0).w(this, FUNC(leland_state::leland_master_alt_bankswitch_w));
+ map(0xf0, 0xf0).w(this, FUNC(redline_state::redline_master_alt_bankswitch_w));
map(0xf2, 0xf2).rw(m_sound, FUNC(leland_80186_sound_device::leland_80186_response_r), FUNC(leland_80186_sound_device::leland_80186_command_lo_w));
map(0xf4, 0xf4).w(m_sound, FUNC(leland_80186_sound_device::leland_80186_command_hi_w));
- map(0xfd, 0xff).rw(this, FUNC(leland_state::leland_master_analog_key_r), FUNC(leland_state::leland_master_analog_key_w));
+ map(0xfd, 0xff).rw(this, FUNC(redline_state::leland_master_analog_key_r), FUNC(redline_state::leland_master_analog_key_w));
}
@@ -148,7 +148,7 @@ void leland_state::slave_small_map_program(address_map &map)
}
-void leland_state::slave_large_map_program(address_map &map)
+void redline_state::slave_large_map_program(address_map &map)
{
map(0x0000, 0x1fff).rom();
map(0x4000, 0xbfff).bankr(m_slave_bankslot);
@@ -981,16 +981,16 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(leland_state::leland)
/* basic machine hardware */
- MCFG_DEVICE_ADD("master", Z80, MASTER_CLOCK/2)
+ MCFG_DEVICE_ADD(m_master, Z80, MASTER_CLOCK/2)
MCFG_DEVICE_PROGRAM_MAP(master_map_program)
MCFG_DEVICE_IO_MAP(master_map_io)
MCFG_DEVICE_VBLANK_INT_DRIVER("screen", leland_state, leland_master_interrupt)
- MCFG_DEVICE_ADD("slave", Z80, MASTER_CLOCK/2)
+ MCFG_DEVICE_ADD(m_slave, Z80, MASTER_CLOCK/2)
MCFG_DEVICE_PROGRAM_MAP(slave_small_map_program)
MCFG_DEVICE_IO_MAP(slave_map_io)
- MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
+ MCFG_EEPROM_SERIAL_93C46_ADD(m_eeprom)
MCFG_NVRAM_ADD_0FILL("battery")
/* video hardware */
@@ -1013,15 +1013,15 @@ MACHINE_CONFIG_START(leland_state::leland)
// MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, leland_state, leland_sound_port_w))
// MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
- MCFG_DEVICE_ADD("dac0", DAC_8BIT_BINARY_WEIGHTED, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.0625) // ls374.u79 + r17-r23 (24k,12k,6.2k,3k,1.5k,750,390,180)
- MCFG_DEVICE_ADD("dac1", DAC_8BIT_BINARY_WEIGHTED, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.0625) // ls374.u88 + r27-r34 (24k,12k,6.2k,3k,1.5k,750,390,180)
+ MCFG_DEVICE_ADD(m_dac[0], DAC_8BIT_BINARY_WEIGHTED, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.0625) // ls374.u79 + r17-r23 (24k,12k,6.2k,3k,1.5k,750,390,180)
+ MCFG_DEVICE_ADD(m_dac[1], DAC_8BIT_BINARY_WEIGHTED, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.0625) // ls374.u88 + r27-r34 (24k,12k,6.2k,3k,1.5k,750,390,180)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac0", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac0", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE(0, "dac1", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac1", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
-MACHINE_CONFIG_START(leland_state::redline)
+MACHINE_CONFIG_START(redline_state::redline)
leland(config);
/* basic machine hardware */
@@ -1029,19 +1029,19 @@ MACHINE_CONFIG_START(leland_state::redline)
MCFG_DEVICE_IO_MAP(master_redline_map_io)
/* sound hardware */
- MCFG_DEVICE_ADD("custom", REDLINE_80186, 0)
+ MCFG_DEVICE_ADD(m_sound, REDLINE_80186, 0)
MACHINE_CONFIG_END
-MACHINE_CONFIG_START(leland_state::quarterb)
+MACHINE_CONFIG_START(redline_state::quarterb)
redline(config);
/* sound hardware */
- MCFG_DEVICE_REPLACE("custom", LELAND_80186, 0)
+ MCFG_DEVICE_REPLACE(m_sound, LELAND_80186, 0)
MACHINE_CONFIG_END
-MACHINE_CONFIG_START(leland_state::lelandi)
+MACHINE_CONFIG_START(redline_state::lelandi)
quarterb(config);
/* basic machine hardware */
@@ -1053,15 +1053,15 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(ataxx_state::ataxx)
/* basic machine hardware */
- MCFG_DEVICE_ADD("master", Z80, 6000000)
+ MCFG_DEVICE_ADD(m_master, Z80, 6000000)
MCFG_DEVICE_PROGRAM_MAP(master_map_program_2)
MCFG_DEVICE_IO_MAP(master_map_io_2)
- MCFG_DEVICE_ADD("slave", Z80, 6000000)
+ MCFG_DEVICE_ADD(m_slave, Z80, 6000000)
MCFG_DEVICE_PROGRAM_MAP(slave_map_program)
MCFG_DEVICE_IO_MAP(slave_map_io_2)
- MCFG_EEPROM_SERIAL_93C56_ADD("eeprom")
+ MCFG_EEPROM_SERIAL_93C56_ADD(m_eeprom)
MCFG_EEPROM_SERIAL_ENABLE_STREAMING()
MCFG_NVRAM_ADD_0FILL("battery")
@@ -1070,15 +1070,14 @@ MACHINE_CONFIG_START(ataxx_state::ataxx)
ataxx_video(config);
/* sound hardware */
- MCFG_DEVICE_ADD("custom", ATAXX_80186, 0)
+ MCFG_DEVICE_ADD(m_sound, ATAXX_80186, 0)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(ataxx_state::wsf)
ataxx(config);
- MCFG_DEVICE_REMOVE("custom")
- MCFG_DEVICE_ADD("custom", WSF_80186, 0)
+ MCFG_DEVICE_REPLACE(m_sound, WSF_80186, 0)
MACHINE_CONFIG_END
@@ -3075,7 +3074,7 @@ void leland_state::init_strkzone()
}
-void leland_state::init_redlin2p()
+void redline_state::init_redlin2p()
{
/* master CPU bankswitching */
m_update_master_bank = &leland_state::redline_bankswitch;
@@ -3086,14 +3085,14 @@ void leland_state::init_redlin2p()
init_master_ports(0x00, 0xc0);
/* set up additional input ports */
- m_master->space(AS_IO).install_read_handler(0xc0, 0xc0, read8_delegate(FUNC(leland_state::redline_pedal_1_r),this));
- m_master->space(AS_IO).install_read_handler(0xd0, 0xd0, read8_delegate(FUNC(leland_state::redline_pedal_2_r),this));
- m_master->space(AS_IO).install_read_handler(0xf8, 0xf8, read8_delegate(FUNC(leland_state::redline_wheel_2_r),this));
- m_master->space(AS_IO).install_read_handler(0xfb, 0xfb, read8_delegate(FUNC(leland_state::redline_wheel_1_r),this));
+ m_master->space(AS_IO).install_read_handler(0xc0, 0xc0, read8_delegate(FUNC(redline_state::redline_pedal_1_r),this));
+ m_master->space(AS_IO).install_read_handler(0xd0, 0xd0, read8_delegate(FUNC(redline_state::redline_pedal_2_r),this));
+ m_master->space(AS_IO).install_read_handler(0xf8, 0xf8, read8_delegate(FUNC(redline_state::redline_wheel_2_r),this));
+ m_master->space(AS_IO).install_read_handler(0xfb, 0xfb, read8_delegate(FUNC(redline_state::redline_wheel_1_r),this));
}
-void leland_state::init_quarterb()
+void redline_state::init_quarterb()
{
/* master CPU bankswitching */
m_update_master_bank = &leland_state::viper_bankswitch;
@@ -3105,7 +3104,7 @@ void leland_state::init_quarterb()
}
-void leland_state::init_viper()
+void redline_state::init_viper()
{
/* master CPU bankswitching */
m_update_master_bank = &leland_state::viper_bankswitch;
@@ -3118,16 +3117,16 @@ void leland_state::init_viper()
init_master_ports(0x00, 0xc0);
/* set up additional input ports */
- m_master->space(AS_IO).install_read_handler(0xa4, 0xa4, read8_delegate(FUNC(leland_state::dangerz_input_upper_r),this));
- m_master->space(AS_IO).install_read_handler(0xb8, 0xb8, read8_delegate(FUNC(leland_state::dangerz_input_y_r),this));
- m_master->space(AS_IO).install_read_handler(0xbc, 0xbc, read8_delegate(FUNC(leland_state::dangerz_input_x_r),this));
+ m_master->space(AS_IO).install_read_handler(0xa4, 0xa4, read8_delegate(FUNC(redline_state::dangerz_input_upper_r),this));
+ m_master->space(AS_IO).install_read_handler(0xb8, 0xb8, read8_delegate(FUNC(redline_state::dangerz_input_y_r),this));
+ m_master->space(AS_IO).install_read_handler(0xbc, 0xbc, read8_delegate(FUNC(redline_state::dangerz_input_x_r),this));
save_item(NAME(m_dangerz_x));
save_item(NAME(m_dangerz_y));
}
-void leland_state::init_teamqb()
+void redline_state::init_teamqb()
{
/* master CPU bankswitching */
m_update_master_bank = &leland_state::viper_bankswitch;
@@ -3145,7 +3144,7 @@ void leland_state::init_teamqb()
}
-void leland_state::init_aafb()
+void redline_state::init_aafb()
{
/* master CPU bankswitching */
m_update_master_bank = &leland_state::viper_bankswitch;
@@ -3163,7 +3162,7 @@ void leland_state::init_aafb()
}
-void leland_state::init_aafbb()
+void redline_state::init_aafbb()
{
/* master CPU bankswitching */
m_update_master_bank = &leland_state::viper_bankswitch;
@@ -3181,7 +3180,7 @@ void leland_state::init_aafbb()
}
-void leland_state::init_aafbd2p()
+void redline_state::init_aafbd2p()
{
/* master CPU bankswitching */
m_update_master_bank = &leland_state::viper_bankswitch;
@@ -3199,7 +3198,7 @@ void leland_state::init_aafbd2p()
}
-void leland_state::init_offroad()
+void redline_state::init_offroad()
{
/* master CPU bankswitching */
m_update_master_bank = &leland_state::offroad_bankswitch;
@@ -3213,13 +3212,13 @@ void leland_state::init_offroad()
init_master_ports(0x40, 0x80); /* yes, this is intentional */
/* set up additional input ports */
- m_master->space(AS_IO).install_read_handler(0xf8, 0xf8, read8_delegate(FUNC(leland_state::offroad_wheel_3_r),this));
- m_master->space(AS_IO).install_read_handler(0xf9, 0xf9, read8_delegate(FUNC(leland_state::offroad_wheel_1_r),this));
- m_master->space(AS_IO).install_read_handler(0xfb, 0xfb, read8_delegate(FUNC(leland_state::offroad_wheel_2_r),this));
+ m_master->space(AS_IO).install_read_handler(0xf8, 0xf8, read8_delegate(FUNC(redline_state::offroad_wheel_3_r),this));
+ m_master->space(AS_IO).install_read_handler(0xf9, 0xf9, read8_delegate(FUNC(redline_state::offroad_wheel_1_r),this));
+ m_master->space(AS_IO).install_read_handler(0xfb, 0xfb, read8_delegate(FUNC(redline_state::offroad_wheel_2_r),this));
}
-void leland_state::init_offroadt()
+void redline_state::init_offroadt()
{
/* master CPU bankswitching */
m_update_master_bank = &leland_state::offroad_bankswitch;
@@ -3232,13 +3231,13 @@ void leland_state::init_offroadt()
init_master_ports(0x80, 0x40);
/* set up additional input ports */
- m_master->space(AS_IO).install_read_handler(0xf8, 0xf8, read8_delegate(FUNC(leland_state::offroad_wheel_3_r),this));
- m_master->space(AS_IO).install_read_handler(0xf9, 0xf9, read8_delegate(FUNC(leland_state::offroad_wheel_1_r),this));
- m_master->space(AS_IO).install_read_handler(0xfb, 0xfb, read8_delegate(FUNC(leland_state::offroad_wheel_2_r),this));
+ m_master->space(AS_IO).install_read_handler(0xf8, 0xf8, read8_delegate(FUNC(redline_state::offroad_wheel_3_r),this));
+ m_master->space(AS_IO).install_read_handler(0xf9, 0xf9, read8_delegate(FUNC(redline_state::offroad_wheel_1_r),this));
+ m_master->space(AS_IO).install_read_handler(0xfb, 0xfb, read8_delegate(FUNC(redline_state::offroad_wheel_2_r),this));
}
-void leland_state::init_pigout()
+void redline_state::init_pigout()
{
/* master CPU bankswitching */
m_update_master_bank = &leland_state::offroad_bankswitch;
@@ -3293,7 +3292,7 @@ void ataxx_state::init_indyheat()
leland_rotate_memory("slave");
/* set up additional input ports */
- m_master->space(AS_IO).install_read_handler(0x00, 0x02, read8_delegate(FUNC(ataxx_state::indyheat_wheel_r),this));
+ m_master->space(AS_IO).install_read_handler(0x00, 0x02, read8_delegate(FUNC(ataxx_state::ataxx_trackball_r),this));
m_master->space(AS_IO).install_read_handler(0x08, 0x0b, read8_delegate(FUNC(ataxx_state::indyheat_analog_r),this));
m_master->space(AS_IO).install_read_port(0x0d, 0x0d, "P1");
m_master->space(AS_IO).install_read_port(0x0e, 0x0e, "P2");
@@ -3356,35 +3355,35 @@ GAME( 1987, dblplay, 0, leland, basebal2, leland_state, init_dblpl
GAME( 1988, strkzone, 0, leland, basebal2, leland_state, init_strkzone, ROT0, "Leland Corporation", "Strike Zone Baseball", 0 )
/* large master banks, small slave banks, 80186 sound */
-GAME( 1987, redlin2p, 0, redline, redline, leland_state, init_redlin2p, ROT270, "Cinematronics (Tradewest license)", "Redline Racer (2 players)", 0 )
-GAME( 1987, quarterb, 0, quarterb, quarterb, leland_state, init_quarterb, ROT270, "Leland Corporation", "Quarterback (rev 5)", 0 )
-GAME( 1987, quarterba, quarterb, quarterb, quarterb, leland_state, init_quarterb, ROT270, "Leland Corporation", "Quarterback (rev 2)", 0 )
-GAME( 1987, quarterbc, quarterb, quarterb, quarterb, leland_state, init_quarterb, ROT270, "Leland Corporation", "Quarterback (rev 1, cocktail)", 0 )
+GAME( 1987, redlin2p, 0, redline, redline, redline_state, init_redlin2p, ROT270, "Cinematronics (Tradewest license)", "Redline Racer (2 players)", 0 )
+GAME( 1987, quarterb, 0, quarterb, quarterb, redline_state, init_quarterb, ROT270, "Leland Corporation", "Quarterback (rev 5)", 0 )
+GAME( 1987, quarterba, quarterb, quarterb, quarterb, redline_state, init_quarterb, ROT270, "Leland Corporation", "Quarterback (rev 2)", 0 )
+GAME( 1987, quarterbc, quarterb, quarterb, quarterb, redline_state, init_quarterb, ROT270, "Leland Corporation", "Quarterback (rev 1, cocktail)", 0 )
/* large master banks, large slave banks, 80186 sound */
-GAME( 1988, viper, 0, lelandi, dangerz, leland_state, init_viper, ROT0, "Leland Corporation", "Viper (rev 3)", 0 )
-GAME( 1988, teamqb, 0, lelandi, teamqb, leland_state, init_teamqb, ROT270, "Leland Corporation", "John Elway's Team Quarterback (rev 3)", 0 )
-GAME( 1988, teamqb2, teamqb, lelandi, teamqb, leland_state, init_teamqb, ROT270, "Leland Corporation", "John Elway's Team Quarterback (rev 2)", 0 )
-GAME( 1989, aafb, 0, lelandi, teamqb, leland_state, init_aafb, ROT270, "Leland Corporation", "All American Football (rev E)", 0 )
-GAME( 1989, aafbd2p, aafb, lelandi, aafb2p, leland_state, init_aafbd2p, ROT270, "Leland Corporation", "All American Football (rev D, 2 Players)", 0 )
-GAME( 1989, aafbc, aafb, lelandi, teamqb, leland_state, init_aafbb, ROT270, "Leland Corporation", "All American Football (rev C)", 0 )
-GAME( 1989, aafbb, aafb, lelandi, teamqb, leland_state, init_aafbb, ROT270, "Leland Corporation", "All American Football (rev B)", MACHINE_NOT_WORKING )
+GAME( 1988, viper, 0, lelandi, dangerz, redline_state, init_viper, ROT0, "Leland Corporation", "Viper (rev 3)", 0 )
+GAME( 1988, teamqb, 0, lelandi, teamqb, redline_state, init_teamqb, ROT270, "Leland Corporation", "John Elway's Team Quarterback (rev 3)", 0 )
+GAME( 1988, teamqb2, teamqb, lelandi, teamqb, redline_state, init_teamqb, ROT270, "Leland Corporation", "John Elway's Team Quarterback (rev 2)", 0 )
+GAME( 1989, aafb, 0, lelandi, teamqb, redline_state, init_aafb, ROT270, "Leland Corporation", "All American Football (rev E)", 0 )
+GAME( 1989, aafbd2p, aafb, lelandi, aafb2p, redline_state, init_aafbd2p, ROT270, "Leland Corporation", "All American Football (rev D, 2 Players)", 0 )
+GAME( 1989, aafbc, aafb, lelandi, teamqb, redline_state, init_aafbb, ROT270, "Leland Corporation", "All American Football (rev C)", 0 )
+GAME( 1989, aafbb, aafb, lelandi, teamqb, redline_state, init_aafbb, ROT270, "Leland Corporation", "All American Football (rev B)", MACHINE_NOT_WORKING )
/* huge master banks, large slave banks, 80186 sound */
-GAME( 1989, offroad, 0, lelandi, offroad, leland_state, init_offroad, ROT0, "Leland Corporation", "Ironman Ivan Stewart's Super Off-Road (rev 4)", 0 )
-GAME( 1989, offroad3, offroad, lelandi, offroad, leland_state, init_offroad, ROT0, "Leland Corporation", "Ironman Ivan Stewart's Super Off-Road (rev 3)", 0 )
-GAME( 1989, offroadt, 0, lelandi, offroad, leland_state, init_offroadt, ROT0, "Leland Corporation", "Ironman Ivan Stewart's Super Off-Road Track-Pak", 0 )
-GAME( 1989, offroadt2p, offroadt, lelandi, offroadt2p, leland_state, init_offroadt, ROT0, "Leland Corporation", "Ironman Ivan Stewart's Super Off-Road Track-Pak (rev 4, 2 Players)", 0 )
-GAME( 1990, pigout, 0, lelandi, pigout, leland_state, init_pigout, ROT0, "Leland Corporation", "Pig Out: Dine Like a Swine! (rev 2?)", 0 ) /* need to verify revision */
-GAME( 1990, pigouta, pigout, lelandi, pigout, leland_state, init_pigout, ROT0, "Leland Corporation", "Pig Out: Dine Like a Swine! (rev 1)", 0 )
+GAME( 1989, offroad, 0, lelandi, offroad, redline_state, init_offroad, ROT0, "Leland Corporation", "Ironman Ivan Stewart's Super Off-Road (rev 4)", 0 )
+GAME( 1989, offroad3, offroad, lelandi, offroad, redline_state, init_offroad, ROT0, "Leland Corporation", "Ironman Ivan Stewart's Super Off-Road (rev 3)", 0 )
+GAME( 1989, offroadt, 0, lelandi, offroad, redline_state, init_offroadt, ROT0, "Leland Corporation", "Ironman Ivan Stewart's Super Off-Road Track-Pak", 0 )
+GAME( 1989, offroadt2p, offroadt, lelandi, offroadt2p, redline_state, init_offroadt, ROT0, "Leland Corporation", "Ironman Ivan Stewart's Super Off-Road Track-Pak (rev 4, 2 Players)", 0 )
+GAME( 1990, pigout, 0, lelandi, pigout, redline_state, init_pigout, ROT0, "Leland Corporation", "Pig Out: Dine Like a Swine! (rev 2?)", 0 ) /* need to verify revision */
+GAME( 1990, pigouta, pigout, lelandi, pigout, redline_state, init_pigout, ROT0, "Leland Corporation", "Pig Out: Dine Like a Swine! (rev 1)", 0 )
/* Ataxx-era PCB, 80186 sound */
-GAME( 1990, ataxx, 0, ataxx, ataxx, ataxx_state, init_ataxx, ROT0, "Leland Corporation", "Ataxx (rev 5)", 0 )
-GAME( 1990, ataxxa, ataxx, ataxx, ataxx, ataxx_state, init_ataxx, ROT0, "Leland Corporation", "Ataxx (rev 4)", 0 )
-GAME( 1990, ataxxe, ataxx, ataxx, ataxx, ataxx_state, init_ataxx, ROT0, "Leland Corporation", "Ataxx (Europe)", 0 )
-GAME( 1990, ataxxj, ataxx, ataxx, ataxx, ataxx_state, init_ataxxj, ROT0, "Leland Corporation (Capcom license)", "Ataxx (Japan)", 0 )
-GAME( 1990, wsf, 0, wsf, wsf, ataxx_state, init_wsf, ROT0, "Leland Corporation", "World Soccer Finals (rev 4)", 0 )
-GAME( 1990, wsf3, wsf, wsf, wsf, ataxx_state, init_wsf, ROT0, "Leland Corporation", "World Soccer Finals (rev 3)", 0 )
-GAME( 1991, indyheat, 0, wsf, indyheat, ataxx_state, init_indyheat, ROT0, "Leland Corporation", "Danny Sullivan's Indy Heat (rev 1)", 0 )
-GAME( 1991, brutforc, 0, wsf, brutforc, ataxx_state, init_brutforc, ROT0, "Leland Corporation", "Brute Force", 0 )
-GAME( 1991, asylum, 0, wsf, brutforc, ataxx_state, init_asylum, ROT270, "Leland Corporation", "Asylum (prototype)", 0 )
+GAME( 1990, ataxx, 0, ataxx, ataxx, ataxx_state, init_ataxx, ROT0, "Leland Corporation", "Ataxx (rev 5)", 0 )
+GAME( 1990, ataxxa, ataxx, ataxx, ataxx, ataxx_state, init_ataxx, ROT0, "Leland Corporation", "Ataxx (rev 4)", 0 )
+GAME( 1990, ataxxe, ataxx, ataxx, ataxx, ataxx_state, init_ataxx, ROT0, "Leland Corporation", "Ataxx (Europe)", 0 )
+GAME( 1990, ataxxj, ataxx, ataxx, ataxx, ataxx_state, init_ataxxj, ROT0, "Leland Corporation (Capcom license)", "Ataxx (Japan)", 0 )
+GAME( 1990, wsf, 0, wsf, wsf, ataxx_state, init_wsf, ROT0, "Leland Corporation", "World Soccer Finals (rev 4)", 0 )
+GAME( 1990, wsf3, wsf, wsf, wsf, ataxx_state, init_wsf, ROT0, "Leland Corporation", "World Soccer Finals (rev 3)", 0 )
+GAME( 1991, indyheat, 0, wsf, indyheat, ataxx_state, init_indyheat, ROT0, "Leland Corporation", "Danny Sullivan's Indy Heat (rev 1)", 0 )
+GAME( 1991, brutforc, 0, wsf, brutforc, ataxx_state, init_brutforc, ROT0, "Leland Corporation", "Brute Force", 0 )
+GAME( 1991, asylum, 0, wsf, brutforc, ataxx_state, init_asylum, ROT270, "Leland Corporation", "Asylum (prototype)", 0 )