diff options
author | Vas Crabb <vas@vastheman.com> | 2019-03-26 11:13:37 +1100 |
---|---|---|
committer | Vas Crabb <vas@vastheman.com> | 2019-03-26 11:13:37 +1100 |
commit | 97b67170277437131adf6ed4d60139c172529e4f (patch) | |
tree | 7a5cbf608f191075f1612b1af15832c206a3fe2d /src/mame/drivers/namcos2.cpp | |
parent | b380514764cf857469bae61c11143a19f79a74c5 (diff) |
(nw) Clean up the mess on master
This effectively reverts b380514764cf857469bae61c11143a19f79a74c5 and
c24473ddff715ecec2e258a6eb38960cf8c8e98e, restoring the state at
598cd5227223c3b04ca31f0dbc1981256d9ea3ff.
Before pushing, please check that what you're about to push is sane.
Check your local commit log and ensure there isn't anything out-of-place
before pushing to mainline. When things like this happen, it wastes
everyone's time. I really don't need this in a week when real work⢠is
busting my balls and I'm behind where I want to be with preparing for
MAME release.
Diffstat (limited to 'src/mame/drivers/namcos2.cpp')
-rw-r--r-- | src/mame/drivers/namcos2.cpp | 497 |
1 files changed, 254 insertions, 243 deletions
diff --git a/src/mame/drivers/namcos2.cpp b/src/mame/drivers/namcos2.cpp index 80279914f30..0b03529e90e 100644 --- a/src/mame/drivers/namcos2.cpp +++ b/src/mame/drivers/namcos2.cpp @@ -1777,30 +1777,31 @@ void namcos2_state::configure_c123tmap_standard(machine_config &config) m_c123tmap->set_color_base(16*256); } -MACHINE_CONFIG_START(namcos2_state::base_noio) - MCFG_DEVICE_ADD("maincpu", M68000, M68K_CPU_CLOCK) /* 12.288MHz (49.152MHz OSC/4) */ - MCFG_DEVICE_PROGRAM_MAP(master_default_am) - MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", namcos2_state, screen_scanline, "screen", 0, 1) +void namcos2_state::base_noio(machine_config &config) +{ + M68000(config, m_maincpu, M68K_CPU_CLOCK); /* 12.288MHz (49.152MHz OSC/4) */ + m_maincpu->set_addrmap(AS_PROGRAM, &namcos2_state::master_default_am); + TIMER(config, "scantimer").configure_scanline(FUNC(namcos2_state::screen_scanline), "screen", 0, 1); - MCFG_DEVICE_ADD("slave", M68000, M68K_CPU_CLOCK) /* 12.288MHz (49.152MHz OSC/4) */ - MCFG_DEVICE_PROGRAM_MAP(slave_default_am) + M68000(config, m_slave, M68K_CPU_CLOCK); /* 12.288MHz (49.152MHz OSC/4) */ + m_slave->set_addrmap(AS_PROGRAM, &namcos2_state::slave_default_am); - MCFG_DEVICE_ADD("audiocpu", MC6809E, M68B09_CPU_CLOCK) /* 2.048MHz (49.152MHz OSC/24) - Sound handling */ - MCFG_DEVICE_PROGRAM_MAP(sound_default_am) - MCFG_DEVICE_PERIODIC_INT_DRIVER(namcos2_state, irq0_line_hold, 2*60) - MCFG_DEVICE_PERIODIC_INT_DRIVER(namcos2_state, irq1_line_hold, 120) + MC6809E(config, m_audiocpu, M68B09_CPU_CLOCK); /* 2.048MHz (49.152MHz OSC/24) - Sound handling */ + m_audiocpu->set_addrmap(AS_PROGRAM, &namcos2_state::sound_default_am); + m_audiocpu->set_periodic_int(FUNC(namcos2_state::irq0_line_hold), attotime::from_hz(2*60)); + m_audiocpu->set_periodic_int(FUNC(namcos2_state::irq1_line_hold), attotime::from_hz(120)); - MCFG_QUANTUM_TIME(attotime::from_hz(12000)) /* CPU slices per frame */ + config.m_minimum_quantum = attotime::from_hz(12000); /* CPU slices per frame */ NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_1); configure_c148_standard(config); NAMCO_C139(config, m_sci, 0); - MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_RAW_PARAMS(MAIN_OSC_CLOCK/8, 384, 0*8, 36*8, 264, 0*8, 28*8) - MCFG_SCREEN_UPDATE_DRIVER(namcos2_state, screen_update) - MCFG_SCREEN_PALETTE(m_c116) + SCREEN(config, m_screen, SCREEN_TYPE_RASTER); + m_screen->set_raw(MAIN_OSC_CLOCK/8, 384, 0*8, 36*8, 264, 0*8, 28*8); + m_screen->set_screen_update(FUNC(namcos2_state::screen_update)); + m_screen->set_palette(m_c116); configure_c123tmap_standard(config); @@ -1815,7 +1816,7 @@ MACHINE_CONFIG_START(namcos2_state::base_noio) configure_c116_standard(config); - MCFG_DEVICE_ADD(m_gfxdecode, GFXDECODE, m_c116, gfx_namcos2) + GFXDECODE(config, m_gfxdecode, m_c116, gfx_namcos2); SPEAKER(config, "lspeaker").front_left(); SPEAKER(config, "rspeaker").front_right(); @@ -1826,34 +1827,36 @@ MACHINE_CONFIG_START(namcos2_state::base_noio) m_c140->add_route(1, "rspeaker", 0.75); YM2151(config, "ymsnd", YM2151_SOUND_CLOCK).add_route(0, "lspeaker", 0.80).add_route(1, "rspeaker", 0.80); /* 3.579545MHz */ -MACHINE_CONFIG_END +} -MACHINE_CONFIG_START(namcos2_state::base) +void namcos2_state::base(machine_config &config) +{ base_noio(config); configure_c65_standard(config); -MACHINE_CONFIG_END +} -MACHINE_CONFIG_START(namcos2_state::base_c68) +void namcos2_state::base_c68(machine_config &config) +{ base_noio(config); configure_c68_standard(config); -MACHINE_CONFIG_END +} -/* adjusted machine driver start */ -MACHINE_CONFIG_START(namcos2_state::base2) +void namcos2_state::base2(machine_config &config) +{ base(config); m_c140->reset_routes(); m_c140->add_route(0, "lspeaker", 1.0); m_c140->add_route(1, "rspeaker", 1.0); -MACHINE_CONFIG_END -/* end */ +} -MACHINE_CONFIG_START(namcos2_state::assaultp) +void namcos2_state::assaultp(machine_config &config) +{ base2(config); - MCFG_QUANTUM_TIME(attotime::from_hz(12000*8)) /* CPU slices per frame - boosted (along with MCU speed) so that the Mode Select works */ -MACHINE_CONFIG_END + config.m_minimum_quantum = attotime::from_hz(12000*8); /* CPU slices per frame - boosted (along with MCU speed) so that the Mode Select works */ +} void namcos2_state::base3(machine_config &config) { @@ -1866,34 +1869,35 @@ void namcos2_state::base3(machine_config &config) YM2151(config.replace(), "ymsnd", YM2151_SOUND_CLOCK).add_route(0, "lspeaker", 1.0).add_route(1, "rspeaker", 1.0); /* 3.579545MHz */ } -MACHINE_CONFIG_START(namcos2_state::gollygho) - MCFG_DEVICE_ADD("maincpu", M68000, M68K_CPU_CLOCK) /* 12.288MHz (49.152MHz OSC/4) */ - MCFG_DEVICE_PROGRAM_MAP(master_default_am) - MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", namcos2_state, screen_scanline, "screen", 0, 1) +void namcos2_state::gollygho(machine_config &config) +{ + M68000(config, m_maincpu, M68K_CPU_CLOCK); /* 12.288MHz (49.152MHz OSC/4) */ + m_maincpu->set_addrmap(AS_PROGRAM, &namcos2_state::master_default_am); + TIMER(config, "scantimer").configure_scanline(FUNC(namcos2_state::screen_scanline), "screen", 0, 1); - MCFG_DEVICE_ADD("slave", M68000, M68K_CPU_CLOCK) /* 12.288MHz (49.152MHz OSC/4) */ - MCFG_DEVICE_PROGRAM_MAP(slave_default_am) + M68000(config, m_slave, M68K_CPU_CLOCK); /* 12.288MHz (49.152MHz OSC/4) */ + m_slave->set_addrmap(AS_PROGRAM, &namcos2_state::slave_default_am); - MCFG_DEVICE_ADD("audiocpu", MC6809E, M68B09_CPU_CLOCK) /* 2.048MHz (49.152MHz OSC/24) - Sound handling */ - MCFG_DEVICE_PROGRAM_MAP(sound_default_am) - MCFG_DEVICE_PERIODIC_INT_DRIVER(namcos2_state, irq0_line_hold, 2*60) - MCFG_DEVICE_PERIODIC_INT_DRIVER(namcos2_state, irq1_line_hold, 120) + MC6809E(config, m_audiocpu, M68B09_CPU_CLOCK); /* 2.048MHz (49.152MHz OSC/24) - Sound handling */ + m_audiocpu->set_addrmap(AS_PROGRAM, &namcos2_state::sound_default_am); + m_audiocpu->set_periodic_int(FUNC(namcos2_state::irq0_line_hold), attotime::from_hz(2*60)); + m_audiocpu->set_periodic_int(FUNC(namcos2_state::irq1_line_hold), attotime::from_hz(120)); configure_c65_standard(config); - MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* CPU slices per frame */ + config.m_minimum_quantum = attotime::from_hz(6000); /* CPU slices per frame */ NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_1); configure_c148_standard(config); NAMCO_C139(config, m_sci, 0); - MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_RAW_PARAMS(MAIN_OSC_CLOCK/8, 384, 0*8, 36*8, 264, 0*8, 28*8) - MCFG_SCREEN_UPDATE_DRIVER(namcos2_state, screen_update) - MCFG_SCREEN_PALETTE(m_c116) + SCREEN(config, m_screen, SCREEN_TYPE_RASTER); + m_screen->set_raw(MAIN_OSC_CLOCK/8, 384, 0*8, 36*8, 264, 0*8, 28*8); + m_screen->set_screen_update(FUNC(namcos2_state::screen_update)); + m_screen->set_palette(m_c116); - MCFG_DEVICE_ADD(m_gfxdecode, GFXDECODE, m_c116, gfx_namcos2) + GFXDECODE(config, m_gfxdecode, m_c116, gfx_namcos2); configure_c123tmap_standard(config); @@ -1917,35 +1921,36 @@ MACHINE_CONFIG_START(namcos2_state::gollygho) m_c140->add_route(1, "rspeaker", 0.75); YM2151(config, "ymsnd", YM2151_SOUND_CLOCK).add_route(0, "lspeaker", 0.80).add_route(1, "rspeaker", 0.80); /* 3.579545MHz */ -MACHINE_CONFIG_END +} -MACHINE_CONFIG_START(namcos2_state::finallap_noio) - MCFG_DEVICE_ADD("maincpu", M68000, M68K_CPU_CLOCK) /* 12.288MHz (49.152MHz OSC/4) */ - MCFG_DEVICE_PROGRAM_MAP(master_finallap_am) - MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", namcos2_state, screen_scanline, "screen", 0, 1) +void namcos2_state::finallap_noio(machine_config &config) +{ + M68000(config, m_maincpu, M68K_CPU_CLOCK); /* 12.288MHz (49.152MHz OSC/4) */ + m_maincpu->set_addrmap(AS_PROGRAM, &namcos2_state::master_finallap_am); + TIMER(config, "scantimer").configure_scanline(FUNC(namcos2_state::screen_scanline), "screen", 0, 1); - MCFG_DEVICE_ADD("slave", M68000, M68K_CPU_CLOCK) /* 12.288MHz (49.152MHz OSC/4) */ - MCFG_DEVICE_PROGRAM_MAP(slave_finallap_am) + M68000(config, m_slave, M68K_CPU_CLOCK); /* 12.288MHz (49.152MHz OSC/4) */ + m_slave->set_addrmap(AS_PROGRAM, &namcos2_state::slave_finallap_am); - MCFG_DEVICE_ADD("audiocpu", MC6809E, M68B09_CPU_CLOCK) /* 2.048MHz (49.152MHz OSC/24) - Sound handling */ - MCFG_DEVICE_PROGRAM_MAP(sound_default_am) - MCFG_DEVICE_PERIODIC_INT_DRIVER(namcos2_state, irq0_line_hold, 2*60) - MCFG_DEVICE_PERIODIC_INT_DRIVER(namcos2_state, irq1_line_hold, 120) + MC6809E(config, m_audiocpu, M68B09_CPU_CLOCK); /* 2.048MHz (49.152MHz OSC/24) - Sound handling */ + m_audiocpu->set_addrmap(AS_PROGRAM, &namcos2_state::sound_default_am); + m_audiocpu->set_periodic_int(FUNC(namcos2_state::irq0_line_hold), attotime::from_hz(2*60)); + m_audiocpu->set_periodic_int(FUNC(namcos2_state::irq1_line_hold), attotime::from_hz(120)); - MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* CPU slices per frame */ + config.m_minimum_quantum = attotime::from_hz(6000); /* CPU slices per frame */ NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_1); configure_c148_standard(config); NAMCO_C139(config, m_sci, 0); - MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_RAW_PARAMS(MAIN_OSC_CLOCK/8, 384, 0*8, 36*8, 264, 0*8, 28*8) - MCFG_SCREEN_UPDATE_DRIVER(namcos2_state, screen_update_finallap) - MCFG_SCREEN_PALETTE(m_c116) + SCREEN(config, m_screen, SCREEN_TYPE_RASTER); + m_screen->set_raw(MAIN_OSC_CLOCK/8, 384, 0*8, 36*8, 264, 0*8, 28*8); + m_screen->set_screen_update(FUNC(namcos2_state::screen_update_finallap)); + m_screen->set_palette(m_c116); - MCFG_DEVICE_ADD(m_gfxdecode, GFXDECODE, m_c116, gfx_namcos2) + GFXDECODE(config, m_gfxdecode, m_c116, gfx_namcos2); configure_c123tmap_standard(config); @@ -1967,61 +1972,66 @@ MACHINE_CONFIG_START(namcos2_state::finallap_noio) m_c140->add_route(1, "rspeaker", 0.75); YM2151(config, "ymsnd", YM2151_SOUND_CLOCK).add_route(0, "lspeaker", 0.80).add_route(1, "rspeaker", 0.80); /* 3.579545MHz */ -MACHINE_CONFIG_END +} -MACHINE_CONFIG_START(namcos2_state::finallap) +void namcos2_state::finallap(machine_config &config) +{ finallap_noio(config); configure_c65_standard(config); -MACHINE_CONFIG_END +} -MACHINE_CONFIG_START(namcos2_state::finallap_c68) +void namcos2_state::finallap_c68(machine_config &config) +{ finallap_noio(config); configure_c68_standard(config); -MACHINE_CONFIG_END +} // finalap2 has different mangle -MACHINE_CONFIG_START(namcos2_state::finalap2) +void namcos2_state::finalap2(machine_config &config) +{ finallap(config); m_c123tmap->set_tile_callback(namco_c123tmap_device::c123_tilemap_delegate(&namcos2_state::TilemapCB_finalap2, this)); -MACHINE_CONFIG_END +} -MACHINE_CONFIG_START(namcos2_state::finalap3) +void namcos2_state::finalap3(machine_config &config) +{ finallap_c68(config); m_c123tmap->set_tile_callback(namco_c123tmap_device::c123_tilemap_delegate(&namcos2_state::TilemapCB_finalap2, this)); -MACHINE_CONFIG_END +} -MACHINE_CONFIG_START(namcos2_state::sgunner) - MCFG_DEVICE_ADD("maincpu", M68000, M68K_CPU_CLOCK) /* 12.288MHz (49.152MHz OSC/4) */ - MCFG_DEVICE_PROGRAM_MAP(master_sgunner_am) - MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", namcos2_state, screen_scanline, "screen", 0, 1) +void namcos2_state::sgunner(machine_config &config) +{ + M68000(config, m_maincpu, M68K_CPU_CLOCK); /* 12.288MHz (49.152MHz OSC/4) */ + m_maincpu->set_addrmap(AS_PROGRAM, &namcos2_state::master_sgunner_am); + TIMER(config, "scantimer").configure_scanline(FUNC(namcos2_state::screen_scanline), "screen", 0, 1); - MCFG_DEVICE_ADD("slave", M68000, M68K_CPU_CLOCK) /* 12.288MHz (49.152MHz OSC/4) */ - MCFG_DEVICE_PROGRAM_MAP(slave_sgunner_am) + M68000(config, m_slave, M68K_CPU_CLOCK); /* 12.288MHz (49.152MHz OSC/4) */ + m_slave->set_addrmap(AS_PROGRAM, &namcos2_state::slave_sgunner_am); - MCFG_DEVICE_ADD("audiocpu", MC6809E, M68B09_CPU_CLOCK) /* 2.048MHz (49.152MHz OSC/24) - Sound handling */ - MCFG_DEVICE_PROGRAM_MAP(sound_default_am) - MCFG_DEVICE_PERIODIC_INT_DRIVER(namcos2_state, irq0_line_hold, 2*60) - MCFG_DEVICE_PERIODIC_INT_DRIVER(namcos2_state, irq1_line_hold, 120) + MC6809E(config, m_audiocpu, M68B09_CPU_CLOCK); /* 2.048MHz (49.152MHz OSC/24) - Sound handling */ + m_audiocpu->set_addrmap(AS_PROGRAM, &namcos2_state::sound_default_am); + m_audiocpu->set_periodic_int(FUNC(namcos2_state::irq0_line_hold), attotime::from_hz(2*60)); + m_audiocpu->set_periodic_int(FUNC(namcos2_state::irq1_line_hold), attotime::from_hz(120)); configure_c65_standard(config); - MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* CPU slices per frame */ + config.m_minimum_quantum = attotime::from_hz(6000); /* CPU slices per frame */ NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_1); configure_c148_standard(config); NAMCO_C139(config, m_sci, 0); - MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_RAW_PARAMS(MAIN_OSC_CLOCK/8, 384, 0*8, 36*8, 264, 0*8, 28*8) - MCFG_SCREEN_UPDATE_DRIVER(namcos2_state, screen_update_sgunner) - MCFG_SCREEN_PALETTE(m_c116) + SCREEN(config, m_screen, SCREEN_TYPE_RASTER); + m_screen->set_raw(MAIN_OSC_CLOCK/8, 384, 0*8, 36*8, 264, 0*8, 28*8); + m_screen->set_screen_update(FUNC(namcos2_state::screen_update_sgunner)); + m_screen->set_palette(m_c116); - MCFG_DEVICE_ADD(m_gfxdecode, GFXDECODE, m_c116, gfx_c355) + GFXDECODE(config, m_gfxdecode, m_c116, gfx_c355); NAMCO_C355SPR(config, m_c355spr, 0); m_c355spr->set_screen(m_screen); @@ -2046,36 +2056,37 @@ MACHINE_CONFIG_START(namcos2_state::sgunner) m_c140->add_route(1, "rspeaker", 0.75); YM2151(config, "ymsnd", YM2151_SOUND_CLOCK).add_route(0, "lspeaker", 0.80).add_route(1, "rspeaker", 0.80); /* 3.579545MHz */ -MACHINE_CONFIG_END +} -MACHINE_CONFIG_START(namcos2_state::sgunner2) - MCFG_DEVICE_ADD("maincpu", M68000, M68K_CPU_CLOCK) /* 12.288MHz (49.152MHz OSC/4) */ - MCFG_DEVICE_PROGRAM_MAP(master_sgunner_am) - MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", namcos2_state, screen_scanline, "screen", 0, 1) +void namcos2_state::sgunner2(machine_config &config) +{ + M68000(config, m_maincpu, M68K_CPU_CLOCK); /* 12.288MHz (49.152MHz OSC/4) */ + m_maincpu->set_addrmap(AS_PROGRAM, &namcos2_state::master_sgunner_am); + TIMER(config, "scantimer").configure_scanline(FUNC(namcos2_state::screen_scanline), "screen", 0, 1); - MCFG_DEVICE_ADD("slave", M68000, M68K_CPU_CLOCK) /* 12.288MHz (49.152MHz OSC/4) */ - MCFG_DEVICE_PROGRAM_MAP(slave_sgunner_am) + M68000(config, m_slave, M68K_CPU_CLOCK); /* 12.288MHz (49.152MHz OSC/4) */ + m_slave->set_addrmap(AS_PROGRAM, &namcos2_state::slave_sgunner_am); - MCFG_DEVICE_ADD("audiocpu", MC6809E, M68B09_CPU_CLOCK) /* 2.048MHz (49.152MHz OSC/24) - Sound handling */ - MCFG_DEVICE_PROGRAM_MAP(sound_default_am) - MCFG_DEVICE_PERIODIC_INT_DRIVER(namcos2_state, irq0_line_hold, 2*60) - MCFG_DEVICE_PERIODIC_INT_DRIVER(namcos2_state, irq1_line_hold, 120) + MC6809E(config, m_audiocpu, M68B09_CPU_CLOCK); /* 2.048MHz (49.152MHz OSC/24) - Sound handling */ + m_audiocpu->set_addrmap(AS_PROGRAM, &namcos2_state::sound_default_am); + m_audiocpu->set_periodic_int(FUNC(namcos2_state::irq0_line_hold), attotime::from_hz(2*60)); + m_audiocpu->set_periodic_int(FUNC(namcos2_state::irq1_line_hold), attotime::from_hz(120)); configure_c68_standard(config); - MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* CPU slices per frame */ + config.m_minimum_quantum = attotime::from_hz(6000); /* CPU slices per frame */ NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_1); configure_c148_standard(config); NAMCO_C139(config, m_sci, 0); - MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_RAW_PARAMS(MAIN_OSC_CLOCK/8, 384, 0*8, 36*8, 264, 0*8, 28*8) - MCFG_SCREEN_UPDATE_DRIVER(namcos2_state, screen_update_sgunner) - MCFG_SCREEN_PALETTE(m_c116) + SCREEN(config, m_screen, SCREEN_TYPE_RASTER); + m_screen->set_raw(MAIN_OSC_CLOCK/8, 384, 0*8, 36*8, 264, 0*8, 28*8); + m_screen->set_screen_update(FUNC(namcos2_state::screen_update_sgunner)); + m_screen->set_palette(m_c116); - MCFG_DEVICE_ADD(m_gfxdecode, GFXDECODE, m_c116, gfx_c355) + GFXDECODE(config, m_gfxdecode, m_c116, gfx_c355); NAMCO_C355SPR(config, m_c355spr, 0); m_c355spr->set_screen(m_screen); @@ -2100,36 +2111,37 @@ MACHINE_CONFIG_START(namcos2_state::sgunner2) m_c140->add_route(1, "rspeaker", 0.75); YM2151(config, "ymsnd", YM2151_SOUND_CLOCK).add_route(0, "lspeaker", 0.80).add_route(1, "rspeaker", 0.80); /* 3.579545MHz */ -MACHINE_CONFIG_END +} -MACHINE_CONFIG_START(namcos2_state::suzuka8h) - MCFG_DEVICE_ADD("maincpu", M68000, M68K_CPU_CLOCK) /* 12.288MHz (49.152MHz OSC/4) */ - MCFG_DEVICE_PROGRAM_MAP(master_suzuka8h_am) - MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", namcos2_state, screen_scanline, "screen", 0, 1) +void namcos2_state::suzuka8h(machine_config &config) +{ + M68000(config, m_maincpu, M68K_CPU_CLOCK); /* 12.288MHz (49.152MHz OSC/4) */ + m_maincpu->set_addrmap(AS_PROGRAM, &namcos2_state::master_suzuka8h_am); + TIMER(config, "scantimer").configure_scanline(FUNC(namcos2_state::screen_scanline), "screen", 0, 1); - MCFG_DEVICE_ADD("slave", M68000, M68K_CPU_CLOCK) /* 12.288MHz (49.152MHz OSC/4) */ - MCFG_DEVICE_PROGRAM_MAP(slave_suzuka8h_am) + M68000(config, m_slave, M68K_CPU_CLOCK); /* 12.288MHz (49.152MHz OSC/4) */ + m_slave->set_addrmap(AS_PROGRAM, &namcos2_state::slave_suzuka8h_am); - MCFG_DEVICE_ADD("audiocpu", MC6809E, M68B09_CPU_CLOCK) /* 2.048MHz (49.152MHz OSC/24) - Sound handling */ - MCFG_DEVICE_PROGRAM_MAP(sound_default_am) - MCFG_DEVICE_PERIODIC_INT_DRIVER(namcos2_state, irq0_line_hold, 2*60) - MCFG_DEVICE_PERIODIC_INT_DRIVER(namcos2_state, irq1_line_hold, 120) + MC6809E(config, m_audiocpu, M68B09_CPU_CLOCK); /* 2.048MHz (49.152MHz OSC/24) - Sound handling */ + m_audiocpu->set_addrmap(AS_PROGRAM, &namcos2_state::sound_default_am); + m_audiocpu->set_periodic_int(FUNC(namcos2_state::irq0_line_hold), attotime::from_hz(2*60)); + m_audiocpu->set_periodic_int(FUNC(namcos2_state::irq1_line_hold), attotime::from_hz(120)); configure_c68_standard(config); - MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* CPU slices per frame */ + config.m_minimum_quantum = attotime::from_hz(6000); /* CPU slices per frame */ NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_1); configure_c148_standard(config); NAMCO_C139(config, m_sci, 0); - MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_RAW_PARAMS(MAIN_OSC_CLOCK/8, 384, 0*8, 36*8, 264, 0*8, 28*8) - MCFG_SCREEN_UPDATE_DRIVER(namcos2_state, screen_update_luckywld) - MCFG_SCREEN_PALETTE(m_c116) + SCREEN(config, m_screen, SCREEN_TYPE_RASTER); + m_screen->set_raw(MAIN_OSC_CLOCK/8, 384, 0*8, 36*8, 264, 0*8, 28*8); + m_screen->set_screen_update(FUNC(namcos2_state::screen_update_luckywld)); + m_screen->set_palette(m_c116); - MCFG_DEVICE_ADD(m_gfxdecode, GFXDECODE, m_c116, gfx_c355) + GFXDECODE(config, m_gfxdecode, m_c116, gfx_c355); NAMCO_C355SPR(config, m_c355spr, 0); m_c355spr->set_screen(m_screen); @@ -2157,16 +2169,15 @@ MACHINE_CONFIG_START(namcos2_state::suzuka8h) m_c140->add_route(1, "rspeaker", 0.75); YM2151(config, "ymsnd", YM2151_SOUND_CLOCK).add_route(0, "lspeaker", 0.80).add_route(1, "rspeaker", 0.80); /* 3.579545MHz */ -MACHINE_CONFIG_END +} -MACHINE_CONFIG_START(namcos2_state::luckywld) +void namcos2_state::luckywld(machine_config &config) +{ suzuka8h(config); - MCFG_DEVICE_MODIFY("maincpu") - MCFG_DEVICE_PROGRAM_MAP(master_luckywld_am) + m_maincpu->set_addrmap(AS_PROGRAM, &namcos2_state::master_luckywld_am); - MCFG_DEVICE_MODIFY("slave") - MCFG_DEVICE_PROGRAM_MAP(slave_luckywld_am) + m_slave->set_addrmap(AS_PROGRAM, &namcos2_state::slave_luckywld_am); NAMCO_C169ROZ(config, m_c169roz, 0); m_c169roz->set_palette(m_c116); @@ -2174,37 +2185,37 @@ MACHINE_CONFIG_START(namcos2_state::luckywld) m_c169roz->set_ram_words(0x10000/2); m_c169roz->set_tile_callback(namco_c169roz_device::c169_tilemap_delegate(&namcos2_state::RozCB_luckywld, this)); m_c169roz->set_color_base(0*256); +} -MACHINE_CONFIG_END - -MACHINE_CONFIG_START(namcos2_state::metlhawk) - MCFG_DEVICE_ADD("maincpu", M68000, M68K_CPU_CLOCK) /* 12.288MHz (49.152MHz OSC/4) */ - MCFG_DEVICE_PROGRAM_MAP(master_metlhawk_am) - MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", namcos2_state, screen_scanline, "screen", 0, 1) +void namcos2_state::metlhawk(machine_config &config) +{ + M68000(config, m_maincpu, M68K_CPU_CLOCK); /* 12.288MHz (49.152MHz OSC/4) */ + m_maincpu->set_addrmap(AS_PROGRAM, &namcos2_state::master_metlhawk_am); + TIMER(config, "scantimer").configure_scanline(FUNC(namcos2_state::screen_scanline), "screen", 0, 1); - MCFG_DEVICE_ADD("slave", M68000, M68K_CPU_CLOCK) /* 12.288MHz (49.152MHz OSC/4) */ - MCFG_DEVICE_PROGRAM_MAP(slave_metlhawk_am) + M68000(config, m_slave, M68K_CPU_CLOCK); /* 12.288MHz (49.152MHz OSC/4) */ + m_slave->set_addrmap(AS_PROGRAM, &namcos2_state::slave_metlhawk_am); - MCFG_DEVICE_ADD("audiocpu", MC6809E, M68B09_CPU_CLOCK) /* 2.048MHz (49.152MHz OSC/24) - Sound handling */ - MCFG_DEVICE_PROGRAM_MAP(sound_default_am) - MCFG_DEVICE_PERIODIC_INT_DRIVER(namcos2_state, irq0_line_hold, 2*60) - MCFG_DEVICE_PERIODIC_INT_DRIVER(namcos2_state, irq1_line_hold, 120) + MC6809E(config, m_audiocpu, M68B09_CPU_CLOCK); /* 2.048MHz (49.152MHz OSC/24) - Sound handling */ + m_audiocpu->set_addrmap(AS_PROGRAM, &namcos2_state::sound_default_am); + m_audiocpu->set_periodic_int(FUNC(namcos2_state::irq0_line_hold), attotime::from_hz(2*60)); + m_audiocpu->set_periodic_int(FUNC(namcos2_state::irq1_line_hold), attotime::from_hz(120)); configure_c65_standard(config); - MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* CPU slices per frame */ + config.m_minimum_quantum = attotime::from_hz(6000); /* CPU slices per frame */ NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_1); configure_c148_standard(config); NAMCO_C139(config, m_sci, 0); - MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_RAW_PARAMS(MAIN_OSC_CLOCK/8, 384, 0*8, 36*8, 264, 0*8, 28*8) - MCFG_SCREEN_UPDATE_DRIVER(namcos2_state, screen_update_metlhawk) - MCFG_SCREEN_PALETTE(m_c116) + SCREEN(config, m_screen, SCREEN_TYPE_RASTER); + m_screen->set_raw(MAIN_OSC_CLOCK/8, 384, 0*8, 36*8, 264, 0*8, 28*8); + m_screen->set_screen_update(FUNC(namcos2_state::screen_update_metlhawk)); + m_screen->set_palette(m_c116); - MCFG_DEVICE_ADD(m_gfxdecode, GFXDECODE, m_c116, gfx_metlhawk) + GFXDECODE(config, m_gfxdecode, m_c116, gfx_metlhawk); NAMCO_C169ROZ(config, m_c169roz, 0); m_c169roz->set_palette(m_c116); @@ -2233,7 +2244,7 @@ MACHINE_CONFIG_START(namcos2_state::metlhawk) YM2151(config, "ymsnd", YM2151_SOUND_CLOCK).add_route(0, "lspeaker", 0.80).add_route(1, "rspeaker", 0.80); /* 3.579545MHz */ // ymsnd.irq_handler().set_inputline("audiocpu", 1); -MACHINE_CONFIG_END +} /*************************************************************/ @@ -2321,8 +2332,8 @@ ROM_START( assault ) NAMCOS2_GFXROM_LOAD_128K( "atshape.bin", 0x000000, CRC(dfcad82b) SHA1(9c3826b8dc36fa0d71c0de7f8be3479d9a025803) ) ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data ROMs */ - NAMCOS2_DATA_LOAD_E_128K( "at1dat0.bin", 0x000000, CRC(844890f4) SHA1(1be30760acd81fae836301d81d6adbb3e5941373) ) - NAMCOS2_DATA_LOAD_O_128K( "at1dat1.bin", 0x000000, CRC(21715313) SHA1(97c6edae6a5f1df434f1dcf7be307b5e006e72a6) ) + NAMCOS2_DATA_LOAD_E_128K( "at1dat0.13s", 0x000000, CRC(844890f4) SHA1(1be30760acd81fae836301d81d6adbb3e5941373) ) + NAMCOS2_DATA_LOAD_O_128K( "at1dat1.13p", 0x000000, CRC(21715313) SHA1(97c6edae6a5f1df434f1dcf7be307b5e006e72a6) ) ROM_REGION( 0x100000, "c140", 0 ) /* Sound voices */ ROM_LOAD( "atvoi1.bin", 0x000000, 0x080000, CRC(d36a649e) SHA1(30173f32c6ec9dda6b8946baa14266e828b0324e) ) @@ -2372,8 +2383,8 @@ ROM_START( assaultj ) NAMCOS2_GFXROM_LOAD_128K( "atshape.bin", 0x000000, CRC(dfcad82b) SHA1(9c3826b8dc36fa0d71c0de7f8be3479d9a025803) ) ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data ROMs */ - NAMCOS2_DATA_LOAD_E_128K( "at1dat0.bin", 0x000000, CRC(844890f4) SHA1(1be30760acd81fae836301d81d6adbb3e5941373) ) - NAMCOS2_DATA_LOAD_O_128K( "at1dat1.bin", 0x000000, CRC(21715313) SHA1(97c6edae6a5f1df434f1dcf7be307b5e006e72a6) ) + NAMCOS2_DATA_LOAD_E_128K( "at1dat0.13s", 0x000000, CRC(844890f4) SHA1(1be30760acd81fae836301d81d6adbb3e5941373) ) + NAMCOS2_DATA_LOAD_O_128K( "at1dat1.13p", 0x000000, CRC(21715313) SHA1(97c6edae6a5f1df434f1dcf7be307b5e006e72a6) ) ROM_REGION( 0x100000, "c140", 0 ) /* Sound voices */ ROM_LOAD( "atvoi1.bin", 0x000000, 0x080000, CRC(d36a649e) SHA1(30173f32c6ec9dda6b8946baa14266e828b0324e) ) @@ -2423,8 +2434,8 @@ ROM_START( assaultp ) NAMCOS2_GFXROM_LOAD_128K( "atshape.bin", 0x000000, CRC(dfcad82b) SHA1(9c3826b8dc36fa0d71c0de7f8be3479d9a025803) ) ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data ROMs */ - NAMCOS2_DATA_LOAD_E_128K( "at1dat0.bin", 0x000000, CRC(844890f4) SHA1(1be30760acd81fae836301d81d6adbb3e5941373) ) - NAMCOS2_DATA_LOAD_O_128K( "at1dat1.bin", 0x000000, CRC(21715313) SHA1(97c6edae6a5f1df434f1dcf7be307b5e006e72a6) ) + NAMCOS2_DATA_LOAD_E_128K( "at1dat0.13s", 0x000000, CRC(844890f4) SHA1(1be30760acd81fae836301d81d6adbb3e5941373) ) + NAMCOS2_DATA_LOAD_O_128K( "at1dat1.13p", 0x000000, CRC(21715313) SHA1(97c6edae6a5f1df434f1dcf7be307b5e006e72a6) ) ROM_REGION( 0x100000, "c140", 0 ) /* Sound voices */ ROM_LOAD( "atvoi1.bin", 0x000000, 0x080000, CRC(d36a649e) SHA1(30173f32c6ec9dda6b8946baa14266e828b0324e) ) @@ -2473,8 +2484,8 @@ ROM_START( burnforc ) NAMCOS2_GFXROM_LOAD_128K( "bu_shape.bin", 0x000000,CRC(80a6b722) SHA1(2c24327a890310c5e8086dc6821627108a88c62e) ) ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data ROMs */ - NAMCOS2_DATA_LOAD_E_128K( "bu1_dat0.bin", 0x000000, CRC(e0a9d92f) SHA1(15042e6d7b31bec08ccdf36e89fdb4b6fb62fa4b) ) - NAMCOS2_DATA_LOAD_O_128K( "bu1_dat1.bin", 0x000000, CRC(5fe54b73) SHA1(a5d4895f0a4523be20de40ccaa74f8fad0d5df7d) ) + NAMCOS2_DATA_LOAD_E_128K( "bu1_dat0.13s", 0x000000, CRC(e0a9d92f) SHA1(15042e6d7b31bec08ccdf36e89fdb4b6fb62fa4b) ) + NAMCOS2_DATA_LOAD_O_128K( "bu1_dat1.13p", 0x000000, CRC(5fe54b73) SHA1(a5d4895f0a4523be20de40ccaa74f8fad0d5df7d) ) ROM_REGION( 0x100000, "c140", 0 ) /* Sound voices */ ROM_LOAD( "bu_voi-1.bin", 0x000000, 0x080000, CRC(99d8a239) SHA1(1ebc586048e757ac0ac68dc9cc171f4849e67cef) ) @@ -2522,8 +2533,8 @@ ROM_START( burnforco ) NAMCOS2_GFXROM_LOAD_128K( "bu_shape.bin", 0x000000,CRC(80a6b722) SHA1(2c24327a890310c5e8086dc6821627108a88c62e) ) ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data ROMs */ - NAMCOS2_DATA_LOAD_E_128K( "bu1_dat0.bin", 0x000000, CRC(e0a9d92f) SHA1(15042e6d7b31bec08ccdf36e89fdb4b6fb62fa4b) ) - NAMCOS2_DATA_LOAD_O_128K( "bu1_dat1.bin", 0x000000, CRC(5fe54b73) SHA1(a5d4895f0a4523be20de40ccaa74f8fad0d5df7d) ) + NAMCOS2_DATA_LOAD_E_128K( "bu1_dat0.13s", 0x000000, CRC(e0a9d92f) SHA1(15042e6d7b31bec08ccdf36e89fdb4b6fb62fa4b) ) + NAMCOS2_DATA_LOAD_O_128K( "bu1_dat1.13p", 0x000000, CRC(5fe54b73) SHA1(a5d4895f0a4523be20de40ccaa74f8fad0d5df7d) ) ROM_REGION( 0x100000, "c140", 0 ) /* Sound voices */ ROM_LOAD( "bu_voi-1.bin", 0x000000, 0x080000, CRC(99d8a239) SHA1(1ebc586048e757ac0ac68dc9cc171f4849e67cef) ) @@ -2564,8 +2575,8 @@ ROM_START( cosmogng ) ROM_LOAD( "co1sha0.bin", 0x000000, 0x80000, CRC(063a70cc) SHA1(c3179d55d57c47d3fef49d45e45b88c4d8250548) ) ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data ROMs */ - NAMCOS2_DATA_LOAD_E_128K( "co1dat0.bin", 0x000000, CRC(b53da2ae) SHA1(a7fe63668d50928d5d2e2249a5f377c7e8dfc6a5) ) - NAMCOS2_DATA_LOAD_O_128K( "co1dat1.bin", 0x000000, CRC(d21ad10b) SHA1(dcf2d4cc048ea57507952a9a35390af7de5cfe34) ) + NAMCOS2_DATA_LOAD_E_128K( "co1dat0.13s", 0x000000, CRC(b53da2ae) SHA1(a7fe63668d50928d5d2e2249a5f377c7e8dfc6a5) ) + NAMCOS2_DATA_LOAD_O_128K( "co1dat1.13p", 0x000000, CRC(d21ad10b) SHA1(dcf2d4cc048ea57507952a9a35390af7de5cfe34) ) ROM_REGION( 0x100000, "c140", 0 ) /* Sound voices */ ROM_LOAD( "co2voi1.bin", 0x000000, 0x080000, CRC(5a301349) SHA1(e333ea5955a66ac8d7c94cd50047efaf6fa95b15) ) @@ -2607,8 +2618,8 @@ ROM_START( cosmogngj ) ROM_LOAD( "co1sha0.bin", 0x000000, 0x80000, CRC(063a70cc) SHA1(c3179d55d57c47d3fef49d45e45b88c4d8250548) ) ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data ROMs */ - NAMCOS2_DATA_LOAD_E_128K( "co1dat0.bin", 0x000000, CRC(b53da2ae) SHA1(a7fe63668d50928d5d2e2249a5f377c7e8dfc6a5) ) - NAMCOS2_DATA_LOAD_O_128K( "co1dat1.bin", 0x000000, CRC(d21ad10b) SHA1(dcf2d4cc048ea57507952a9a35390af7de5cfe34) ) + NAMCOS2_DATA_LOAD_E_128K( "co1dat0.13s", 0x000000, CRC(b53da2ae) SHA1(a7fe63668d50928d5d2e2249a5f377c7e8dfc6a5) ) + NAMCOS2_DATA_LOAD_O_128K( "co1dat1.13p", 0x000000, CRC(d21ad10b) SHA1(dcf2d4cc048ea57507952a9a35390af7de5cfe34) ) ROM_REGION( 0x100000, "c140", 0 ) /* Sound voices */ ROM_LOAD( "co1voi1.bin", 0x000000, 0x080000, CRC(b5ba8f15) SHA1(9e54b9ba1cd44353782adf337376dff9eec4e937) ) @@ -2657,8 +2668,8 @@ ROM_START( dirtfoxj ) NAMCOS2_GFXROM_LOAD_128K( "df1_sha.bin", 0x000000, CRC(9a7c9a9b) SHA1(06221ae8d3f6bebbb5a7ab2eaaf35b9922389115) ) ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data ROMs */ - NAMCOS2_DATA_LOAD_E_256K( "df1_dat0.bin", 0x000000, CRC(f5851c85) SHA1(e99c05891622cdaab394630b7b2678968e6761d7) ) - NAMCOS2_DATA_LOAD_O_256K( "df1_dat1.bin", 0x000000, CRC(1a31e46b) SHA1(4be7115893b27d6a3dc38c97dcb41eafebb423cd) ) + NAMCOS2_DATA_LOAD_E_256K( "df1_dat0.13s", 0x000000, CRC(f5851c85) SHA1(e99c05891622cdaab394630b7b2678968e6761d7) ) + NAMCOS2_DATA_LOAD_O_256K( "df1_dat1.13p", 0x000000, CRC(1a31e46b) SHA1(4be7115893b27d6a3dc38c97dcb41eafebb423cd) ) ROM_REGION( 0x100000, "c140", 0 ) /* Sound voices */ ROM_LOAD( "df1_voi1.bin", 0x000000, 0x080000, CRC(15053904) SHA1(b8ca7e5e53249dbee8284ce1e5c0e6438e64b2cf) ) @@ -2701,8 +2712,8 @@ ROM_START( dsaber ) ROM_LOAD( "shape.bin", 0x000000, 0x80000, CRC(698e7a3e) SHA1(4d41bf0242626ca1448d1f650c84b5987a7f6597) ) ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data ROMs */ - NAMCOS2_DATA_LOAD_E_128K( "do1 dat0.data0", 0x000000, CRC(3e53331f) SHA1(3dd4c133f587361f30ab1b890f5b05749d5838e3) ) - NAMCOS2_DATA_LOAD_O_128K( "do1 dat1.data1", 0x000000, CRC(d5427f11) SHA1(af8d8153dc60044616a6b0571831c53c09fefda1) ) + NAMCOS2_DATA_LOAD_E_128K( "do1 dat0.13s", 0x000000, CRC(3e53331f) SHA1(3dd4c133f587361f30ab1b890f5b05749d5838e3) ) + NAMCOS2_DATA_LOAD_O_128K( "do1 dat1.13p", 0x000000, CRC(d5427f11) SHA1(af8d8153dc60044616a6b0571831c53c09fefda1) ) ROM_REGION( 0x100000, "c140", 0 ) /* Sound voices */ ROM_LOAD( "do voi-1a.voice1", 0x000000, 0x080000, CRC(dadf6a57) SHA1(caba21fc6b62d140f6d8231411ce82ae0ad2837a) ) @@ -2749,8 +2760,8 @@ ROM_START( dsabera ) ROM_LOAD( "shape.bin", 0x000000, 0x80000, CRC(698e7a3e) SHA1(4d41bf0242626ca1448d1f650c84b5987a7f6597) ) ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data ROMs */ - NAMCOS2_DATA_LOAD_E_128K( "do1 dat0.data0", 0x000000, CRC(3e53331f) SHA1(3dd4c133f587361f30ab1b890f5b05749d5838e3) ) - NAMCOS2_DATA_LOAD_O_128K( "do1 dat1.data1", 0x000000, CRC(d5427f11) SHA1(af8d8153dc60044616a6b0571831c53c09fefda1) ) + NAMCOS2_DATA_LOAD_E_128K( "do1 dat0.13s", 0x000000, CRC(3e53331f) SHA1(3dd4c133f587361f30ab1b890f5b05749d5838e3) ) + NAMCOS2_DATA_LOAD_O_128K( "do1 dat1.13p", 0x000000, CRC(d5427f11) SHA1(af8d8153dc60044616a6b0571831c53c09fefda1) ) ROM_REGION( 0x100000, "c140", 0 ) /* Sound voices */ ROM_LOAD( "do voi-1a.voice1", 0x000000, 0x080000, CRC(dadf6a57) SHA1(caba21fc6b62d140f6d8231411ce82ae0ad2837a) ) @@ -2796,8 +2807,8 @@ ROM_START( dsaberj ) ROM_LOAD( "shape.bin", 0x000000, 0x80000, CRC(698e7a3e) SHA1(4d41bf0242626ca1448d1f650c84b5987a7f6597) ) ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data ROMs */ - NAMCOS2_DATA_LOAD_E_128K( "do1 dat0.data0", 0x000000, CRC(3e53331f) SHA1(3dd4c133f587361f30ab1b890f5b05749d5838e3) ) - NAMCOS2_DATA_LOAD_O_128K( "do1 dat1.data1", 0x000000, CRC(d5427f11) SHA1(af8d8153dc60044616a6b0571831c53c09fefda1) ) + NAMCOS2_DATA_LOAD_E_128K( "do1 dat0.13s", 0x000000, CRC(3e53331f) SHA1(3dd4c133f587361f30ab1b890f5b05749d5838e3) ) + NAMCOS2_DATA_LOAD_O_128K( "do1 dat1.13p", 0x000000, CRC(d5427f11) SHA1(af8d8153dc60044616a6b0571831c53c09fefda1) ) ROM_REGION( 0x100000, "c140", 0 ) /* Sound voices */ ROM_LOAD( "do voi-1a.voice1", 0x000000, 0x080000, CRC(dadf6a57) SHA1(caba21fc6b62d140f6d8231411ce82ae0ad2837a) ) @@ -3108,8 +3119,8 @@ ROM_START( finalap2 ) NAMCOS2_GFXROM_LOAD_256K( "fls2sha", 0x000000, CRC(f7b40a85) SHA1(a458a1cc0dae757fe8a15cb5f5ae46d3c033df00) ) ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data ROMs */ - NAMCOS2_DATA_LOAD_E_256K( "fls2dat0", 0x000000, CRC(f1af432c) SHA1(c514261a49ceb5c3ba0246519ba5d02e9a20d950) ) - NAMCOS2_DATA_LOAD_O_256K( "fls2dat1", 0x000000, CRC(8719533e) SHA1(98d2767da6f7f67da7af15e8cfed95adb04b7427) ) + NAMCOS2_DATA_LOAD_E_256K( "fls2dat0.13s", 0x000000, CRC(f1af432c) SHA1(c514261a49ceb5c3ba0246519ba5d02e9a20d950) ) + NAMCOS2_DATA_LOAD_O_256K( "fls2dat1.13p", 0x000000, CRC(8719533e) SHA1(98d2767da6f7f67da7af15e8cfed95adb04b7427) ) ROM_REGION( 0x100, "c45_road:clut", 0 ) /* PROM for road colors */ ROM_LOAD( "fl1-3.5b", 0, 0x100, CRC(d179d99a) SHA1(4e64f284c74d2b77f893bd28aaa6489084056aa2) ) @@ -3163,8 +3174,8 @@ ROM_START( finalap2j ) NAMCOS2_GFXROM_LOAD_256K( "fls2sha", 0x000000, BAD_DUMP CRC(f7b40a85) SHA1(a458a1cc0dae757fe8a15cb5f5ae46d3c033df00) ) ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data ROMs */ - NAMCOS2_DATA_LOAD_E_256K( "fls2dat0", 0x000000, CRC(f1af432c) SHA1(c514261a49ceb5c3ba0246519ba5d02e9a20d950) ) - NAMCOS2_DATA_LOAD_O_256K( "fls2dat1", 0x000000, CRC(8719533e) SHA1(98d2767da6f7f67da7af15e8cfed95adb04b7427) ) + NAMCOS2_DATA_LOAD_E_256K( "fls2dat0.13s", 0x000000, CRC(f1af432c) SHA1(c514261a49ceb5c3ba0246519ba5d02e9a20d950) ) + NAMCOS2_DATA_LOAD_O_256K( "fls2dat1.13p", 0x000000, CRC(8719533e) SHA1(98d2767da6f7f67da7af15e8cfed95adb04b7427) ) ROM_REGION( 0x100, "c45_road:clut", 0 ) /* PROM for road colors */ ROM_LOAD( "fl1-3.5b", 0, 0x100, CRC(d179d99a) SHA1(4e64f284c74d2b77f893bd28aaa6489084056aa2) ) @@ -3449,8 +3460,8 @@ ROM_START( finalap3bl ) // bootleg set NAMCOS2_GFXROM_LOAD_256K( "flt2_sha.bin", 0x000000, CRC(6986565b) SHA1(df95f2ad5d1e938551d33153f2dcc4711ffd0eba) ) ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */ - NAMCOS2_DATA_LOAD_E_128K( "flt1d0", 0x000000, CRC(80004966) SHA1(112b2a9b0ea792d5dbff1b9cf904da788aeede29) ) - NAMCOS2_DATA_LOAD_O_128K( "flt1d1", 0x000000, CRC(a2e93e8c) SHA1(9c8a5431a79153a70eb6939d16e0a5a6be235e75) ) + NAMCOS2_DATA_LOAD_E_128K( "flt1d0.13s", 0x000000, CRC(80004966) SHA1(112b2a9b0ea792d5dbff1b9cf904da788aeede29) ) + NAMCOS2_DATA_LOAD_O_128K( "flt1d1.13p", 0x000000, CRC(a2e93e8c) SHA1(9c8a5431a79153a70eb6939d16e0a5a6be235e75) ) ROM_REGION( 0x100, "c45_road:clut", 0 ) /* prom for road colors */ ROM_LOAD( "fl1-3.5b", 0, 0x100, CRC(d179d99a) SHA1(4e64f284c74d2b77f893bd28aaa6489084056aa2) ) @@ -3508,10 +3519,10 @@ ROM_START( finehour ) NAMCOS2_GFXROM_LOAD_256K( "fh1_sha.bin", 0x000000, CRC(15875eb0) SHA1(9225df6b01897938488461ebf0717e6d7b81d562) ) ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */ - NAMCOS2_DATA_LOAD_E_128K( "fh1_dt0.bin", 0x000000, CRC(2441c26f) SHA1(429c8f12f7bef3e62153ac8b9e00ea870db36a7b) ) - NAMCOS2_DATA_LOAD_O_128K( "fh1_dt1.bin", 0x000000, CRC(48154deb) SHA1(d6fde316f90bc847f60fa8d997504da34337ffa4) ) - NAMCOS2_DATA_LOAD_E_128K( "fh1_dt2.bin", 0x100000, CRC(12453ba4) SHA1(26ad0da6e56ece6f1ba0b0cf23d2fdae2ce24100) ) - NAMCOS2_DATA_LOAD_O_128K( "fh1_dt3.bin", 0x100000, CRC(50bab9da) SHA1(9c18e5fb810123f9d17042212e0878172e220d2a) ) + NAMCOS2_DATA_LOAD_E_128K( "fh1_dt0.13s", 0x000000, CRC(2441c26f) SHA1(429c8f12f7bef3e62153ac8b9e00ea870db36a7b) ) + NAMCOS2_DATA_LOAD_O_128K( "fh1_dt1.13p", 0x000000, CRC(48154deb) SHA1(d6fde316f90bc847f60fa8d997504da34337ffa4) ) + NAMCOS2_DATA_LOAD_E_128K( "fh1_dt2.13r", 0x100000, CRC(12453ba4) SHA1(26ad0da6e56ece6f1ba0b0cf23d2fdae2ce24100) ) + NAMCOS2_DATA_LOAD_O_128K( "fh1_dt3.13n", 0x100000, CRC(50bab9da) SHA1(9c18e5fb810123f9d17042212e0878172e220d2a) ) ROM_REGION( 0x100000, "c140", 0 ) /* Sound voices */ ROM_LOAD( "fh1_vo1.bin", 0x000000, 0x080000, CRC(07560fc7) SHA1(76f3855f5a4567dc65d513e37072072c2a011e7e) ) @@ -3726,8 +3737,8 @@ ROM_START( fourtrax ) ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */ NAMCOS2_DATA_LOAD_E_256K( "fx_dat0.13s", 0x000000, CRC(63abf69b) SHA1(6776991eeff434bf9720f49ad6e62c37fc7ddf40) ) - NAMCOS2_DATA_LOAD_O_256K( "fx_dat1.13r", 0x000000, CRC(725bed14) SHA1(bbf886ac7f8c2c7857bc0b5d7f8fc7e63e8e9559) ) - NAMCOS2_DATA_LOAD_E_256K( "fx_dat2.13p", 0x100000, CRC(71e4a5a0) SHA1(a0188c920a43c5e69e25464627094b6b6ed26a59) ) + NAMCOS2_DATA_LOAD_O_256K( "fx_dat1.13p", 0x000000, CRC(725bed14) SHA1(bbf886ac7f8c2c7857bc0b5d7f8fc7e63e8e9559) ) + NAMCOS2_DATA_LOAD_E_256K( "fx_dat2.13r", 0x100000, CRC(71e4a5a0) SHA1(a0188c920a43c5e69e25464627094b6b6ed26a59) ) NAMCOS2_DATA_LOAD_O_256K( "fx_dat3.13n", 0x100000, CRC(605725f7) SHA1(b94ce0ec37f879a5e46a097058cb2dd57e2281f1) ) ROM_REGION( 0x100, "c45_road:clut", 0 ) /* prom for road colors */ @@ -3785,8 +3796,8 @@ ROM_START( fourtraxj ) ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */ NAMCOS2_DATA_LOAD_E_256K( "fx_dat0.13s", 0x000000, CRC(63abf69b) SHA1(6776991eeff434bf9720f49ad6e62c37fc7ddf40) ) - NAMCOS2_DATA_LOAD_O_256K( "fx_dat1.13r", 0x000000, CRC(725bed14) SHA1(bbf886ac7f8c2c7857bc0b5d7f8fc7e63e8e9559) ) - NAMCOS2_DATA_LOAD_E_256K( "fx_dat2.13p", 0x100000, CRC(71e4a5a0) SHA1(a0188c920a43c5e69e25464627094b6b6ed26a59) ) + NAMCOS2_DATA_LOAD_O_256K( "fx_dat1.13p", 0x000000, CRC(725bed14) SHA1(bbf886ac7f8c2c7857bc0b5d7f8fc7e63e8e9559) ) + NAMCOS2_DATA_LOAD_E_256K( "fx_dat2.13r", 0x100000, CRC(71e4a5a0) SHA1(a0188c920a43c5e69e25464627094b6b6ed26a59) ) NAMCOS2_DATA_LOAD_O_256K( "fx_dat3.13n", 0x100000, CRC(605725f7) SHA1(b94ce0ec37f879a5e46a097058cb2dd57e2281f1) ) ROM_REGION( 0x100, "c45_road:clut", 0 ) /* prom for road colors */ @@ -3855,8 +3866,8 @@ ROM_START( fourtraxa ) ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */ NAMCOS2_DATA_LOAD_E_256K( "fx_dat0.13s", 0x000000, CRC(63abf69b) SHA1(6776991eeff434bf9720f49ad6e62c37fc7ddf40) ) - NAMCOS2_DATA_LOAD_O_256K( "fx_dat1.13r", 0x000000, CRC(725bed14) SHA1(bbf886ac7f8c2c7857bc0b5d7f8fc7e63e8e9559) ) - NAMCOS2_DATA_LOAD_E_256K( "fx_dat2.13p", 0x100000, CRC(71e4a5a0) SHA1(a0188c920a43c5e69e25464627094b6b6ed26a59) ) + NAMCOS2_DATA_LOAD_O_256K( "fx_dat1.13p", 0x000000, CRC(725bed14) SHA1(bbf886ac7f8c2c7857bc0b5d7f8fc7e63e8e9559) ) + NAMCOS2_DATA_LOAD_E_256K( "fx_dat2.13r", 0x100000, CRC(71e4a5a0) SHA1(a0188c920a43c5e69e25464627094b6b6ed26a59) ) NAMCOS2_DATA_LOAD_O_256K( "fx_dat3.13n", 0x100000, CRC(605725f7) SHA1(b94ce0ec37f879a5e46a097058cb2dd57e2281f1) ) ROM_REGION( 0x100, "c45_road:clut", 0 ) /* prom for road colors */ @@ -3906,10 +3917,10 @@ ROM_START( marvland ) NAMCOS2_GFXROM_LOAD_256K( "mv1-sha.bin", 0x000000, CRC(a47db5d3) SHA1(110e26412aa84f229773049112709be457b7a6ff) ) ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */ - NAMCOS2_DATA_LOAD_E_128K( "mv2_dat0", 0x000000, CRC(62e6318b) SHA1(5c26bc054298f2a0980f7e82ba1844bc9f5eff98) ) - NAMCOS2_DATA_LOAD_O_128K( "mv2_dat1", 0x000000, CRC(8a6902ca) SHA1(272e8699b872b3a50d72090b43c57493e6642bfe) ) - NAMCOS2_DATA_LOAD_E_128K( "mv2_dat2", 0x100000, CRC(f5c6408c) SHA1(568fb08d0763dc91674d708fa2d15ca952956145) ) - NAMCOS2_DATA_LOAD_O_128K( "mv2_dat3", 0x100000, CRC(6df76955) SHA1(fcfb520399acdd3776f66944121d6980552d3100) ) + NAMCOS2_DATA_LOAD_E_128K( "mv2_dat0.13s", 0x000000, CRC(62e6318b) SHA1(5c26bc054298f2a0980f7e82ba1844bc9f5eff98) ) + NAMCOS2_DATA_LOAD_O_128K( "mv2_dat1.13p", 0x000000, CRC(8a6902ca) SHA1(272e8699b872b3a50d72090b43c57493e6642bfe) ) + NAMCOS2_DATA_LOAD_E_128K( "mv2_dat2.13r", 0x100000, CRC(f5c6408c) SHA1(568fb08d0763dc91674d708fa2d15ca952956145) ) + NAMCOS2_DATA_LOAD_O_128K( "mv2_dat3.13n", 0x100000, CRC(6df76955) SHA1(fcfb520399acdd3776f66944121d6980552d3100) ) ROM_REGION( 0x100000, "c140", 0 ) /* Sound voices */ ROM_LOAD( "mv1-voi1.bin", 0x000000, 0x080000, CRC(de5cac09) SHA1(2d73e54c4f159e52db2c403a59d6c137cce6f53e) ) @@ -3954,8 +3965,8 @@ ROM_START( marvlandj ) NAMCOS2_GFXROM_LOAD_256K( "mv1-sha.bin", 0x000000, CRC(a47db5d3) SHA1(110e26412aa84f229773049112709be457b7a6ff) ) ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */ - NAMCOS2_DATA_LOAD_E_128K( "mv1-dat0.bin", 0x000000, CRC(e15f412e) SHA1(d3ff006d4577540a690c912e94897a1b638ac265) ) - NAMCOS2_DATA_LOAD_O_128K( "mv1-dat1.bin", 0x000000, CRC(73e1545a) SHA1(a04034e56fef69fb2a2eb88f2f392c376e52d00d) ) + NAMCOS2_DATA_LOAD_E_128K( "mv1-dat0.13s", 0x000000, CRC(e15f412e) SHA1(d3ff006d4577540a690c912e94897a1b638ac265) ) + NAMCOS2_DATA_LOAD_O_128K( "mv1-dat1.13p", 0x000000, CRC(73e1545a) SHA1(a04034e56fef69fb2a2eb88f2f392c376e52d00d) ) ROM_REGION( 0x100000, "c140", 0 ) /* Sound voices */ ROM_LOAD( "mv1-voi1.bin", 0x000000, 0x080000, CRC(de5cac09) SHA1(2d73e54c4f159e52db2c403a59d6c137cce6f53e) ) @@ -4141,8 +4152,8 @@ ROM_START( mirninja ) NAMCOS2_GFXROM_LOAD_128K( "mn_sha.bin", 0x000000, CRC(c28af90f) SHA1(8b7f95375eb32c3e30c2a55b7f543235f56d3a13) ) ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */ - NAMCOS2_DATA_LOAD_E_128K( "mn1_dat0.bin", 0x000000, CRC(104bcca8) SHA1(e8368d0dc51bf0653143bf2261d7ed5b54d92941) ) - NAMCOS2_DATA_LOAD_O_128K( "mn1_dat1.bin", 0x000000, CRC(d2a918fb) SHA1(032b7a7bcc60c41325e7b35df9a932e68cdd0788) ) + NAMCOS2_DATA_LOAD_E_128K( "mn1_dat0.13s", 0x000000, CRC(104bcca8) SHA1(e8368d0dc51bf0653143bf2261d7ed5b54d92941) ) + NAMCOS2_DATA_LOAD_O_128K( "mn1_dat1.13p", 0x000000, CRC(d2a918fb) SHA1(032b7a7bcc60c41325e7b35df9a932e68cdd0788) ) ROM_REGION( 0x100000, "c140", 0 ) /* Sound voices */ ROM_LOAD( "mn_voi1.bin", 0x000000, 0x080000, CRC(2ca3573c) SHA1(b2af101730de4ccc68acc1ed143c21a8c81f64db) ) @@ -4194,8 +4205,8 @@ ROM_START( ordyne ) NAMCOS2_GFXROM_LOAD_128K( "or_shape.shape", 0x000000, CRC(7aec9dee) SHA1(2e774e4cff69173b4524d6b25a6a449ba5498a6a) ) ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */ - NAMCOS2_DATA_LOAD_E_128K( "or1_d0.data0", 0x000000, CRC(de214f7a) SHA1(59883c7886b403306c30e51d7f49225483792650) ) - NAMCOS2_DATA_LOAD_O_128K( "or1_d1.data1", 0x000000, CRC(25e3e6c8) SHA1(ad093f15edaea71f6c7226c6e4f3c2130d418013) ) + NAMCOS2_DATA_LOAD_E_128K( "or1_d0.13s", 0x000000, CRC(de214f7a) SHA1(59883c7886b403306c30e51d7f49225483792650) ) + NAMCOS2_DATA_LOAD_O_128K( "or1_d1.13p", 0x000000, CRC(25e3e6c8) SHA1(ad093f15edaea71f6c7226c6e4f3c2130d418013) ) ROM_REGION( 0x100000, "c140", 0 ) /* Sound voices */ ROM_LOAD( "or_voi1.voice1", 0x000000, 0x080000, CRC(369e0bca) SHA1(2a921bb373dd043bd7b2a30e5e46ec3b8b3b5c8d) ) @@ -4250,8 +4261,8 @@ ROM_START( ordyneje ) NAMCOS2_GFXROM_LOAD_128K( "or_shape.shape", 0x000000, CRC(7aec9dee) SHA1(2e774e4cff69173b4524d6b25a6a449ba5498a6a) ) ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */ - NAMCOS2_DATA_LOAD_E_128K( "or1_d0.data0", 0x000000, CRC(de214f7a) SHA1(59883c7886b403306c30e51d7f49225483792650) ) - NAMCOS2_DATA_LOAD_O_128K( "or1_d1.data1", 0x000000, CRC(25e3e6c8) SHA1(ad093f15edaea71f6c7226c6e4f3c2130d418013) ) + NAMCOS2_DATA_LOAD_E_128K( "or1_d0.13s", 0x000000, CRC(de214f7a) SHA1(59883c7886b403306c30e51d7f49225483792650) ) + NAMCOS2_DATA_LOAD_O_128K( "or1_d1.13p", 0x000000, CRC(25e3e6c8) SHA1(ad093f15edaea71f6c7226c6e4f3c2130d418013) ) ROM_REGION( 0x100000, "c140", 0 ) /* Sound voices */ ROM_LOAD( "or_voi1.voice1", 0x000000, 0x080000, CRC(369e0bca) SHA1(2a921bb373dd043bd7b2a30e5e46ec3b8b3b5c8d) ) @@ -4306,8 +4317,8 @@ ROM_START( ordynej ) NAMCOS2_GFXROM_LOAD_128K( "or_shape.shape", 0x000000, CRC(7aec9dee) SHA1(2e774e4cff69173b4524d6b25a6a449ba5498a6a) ) ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */ - NAMCOS2_DATA_LOAD_E_128K( "or1_d0.data0", 0x000000, CRC(de214f7a) SHA1(59883c7886b403306c30e51d7f49225483792650) ) - NAMCOS2_DATA_LOAD_O_128K( "or1_d1.data1", 0x000000, CRC(25e3e6c8) SHA1(ad093f15edaea71f6c7226c6e4f3c2130d418013) ) + NAMCOS2_DATA_LOAD_E_128K( "or1_d0.13s", 0x000000, CRC(de214f7a) SHA1(59883c7886b403306c30e51d7f49225483792650) ) + NAMCOS2_DATA_LOAD_O_128K( "or1_d1.13p", 0x000000, CRC(25e3e6c8) SHA1(ad093f15edaea71f6c7226c6e4f3c2130d418013) ) ROM_REGION( 0x100000, "c140", 0 ) /* Sound voices */ ROM_LOAD( "or_voi1.voice1", 0x000000, 0x080000, CRC(369e0bca) SHA1(2a921bb373dd043bd7b2a30e5e46ec3b8b3b5c8d) ) @@ -4365,8 +4376,8 @@ ROM_START( phelios ) NAMCOS2_GFXROM_LOAD_128K( "ps_shape.shape", 0x000000, CRC(58e26fcf) SHA1(9edc3b54964f923ed07ee878520ccf3f188f04ad) ) ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */ - NAMCOS2_DATA_LOAD_E_128K( "ps2_dat0.data0", 0x000000, CRC(ee4194b0) SHA1(a0c2a807db70164ed761e5ad04301e5ae1173e7a) ) - NAMCOS2_DATA_LOAD_O_128K( "ps2_dat1.data1", 0x000000, CRC(5b22d714) SHA1(f6cb1fe661f7691269840245f06875845fd6eb33) ) + NAMCOS2_DATA_LOAD_E_128K( "ps2_dat0.13s", 0x000000, CRC(ee4194b0) SHA1(a0c2a807db70164ed761e5ad04301e5ae1173e7a) ) + NAMCOS2_DATA_LOAD_O_128K( "ps2_dat1.13p", 0x000000, CRC(5b22d714) SHA1(f6cb1fe661f7691269840245f06875845fd6eb33) ) ROM_REGION( 0x100000, "c140", 0 ) /* Sound voices */ ROM_LOAD( "ps_voi-1.voice1", 0x000000, 0x080000, CRC(f67376ed) SHA1(b54257aad34c6ad03d5b040e6a5dda94a48b6780) ) @@ -4420,8 +4431,8 @@ ROM_START( pheliosj ) NAMCOS2_GFXROM_LOAD_128K( "ps_shape.shape", 0x000000, CRC(58e26fcf) SHA1(9edc3b54964f923ed07ee878520ccf3f188f04ad) ) ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */ - NAMCOS2_DATA_LOAD_E_128K( "ps1_dat0.data0", 0x000000, CRC(ee4194b0) SHA1(a0c2a807db70164ed761e5ad04301e5ae1173e7a) ) /* Same DATA as World set, but labeled PS1 */ - NAMCOS2_DATA_LOAD_O_128K( "ps1_dat1.data1", 0x000000, CRC(5b22d714) SHA1(f6cb1fe661f7691269840245f06875845fd6eb33) ) /* Same DATA as World set, but labeled PS1 */ + NAMCOS2_DATA_LOAD_E_128K( "ps1_dat0.13s", 0x000000, CRC(ee4194b0) SHA1(a0c2a807db70164ed761e5ad04301e5ae1173e7a) ) /* Same DATA as World set, but labeled PS1 */ + NAMCOS2_DATA_LOAD_O_128K( "ps1_dat1.13p", 0x000000, CRC(5b22d714) SHA1(f6cb1fe661f7691269840245f06875845fd6eb33) ) /* Same DATA as World set, but labeled PS1 */ ROM_REGION( 0x100000, "c140", 0 ) /* Sound voices */ ROM_LOAD( "ps_voi-1.voice1", 0x000000, 0x080000, CRC(f67376ed) SHA1(b54257aad34c6ad03d5b040e6a5dda94a48b6780) ) @@ -4461,9 +4472,9 @@ ROM_START( rthun2 ) ROM_LOAD( "shape.bin", 0x000000, 0x80000, CRC(cf58fbbe) SHA1(fbe3b2f0c3267b298993d6238d97b119e13e07f6) ) ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */ - NAMCOS2_DATA_LOAD_E_128K( "rst1_data0.bin", 0x000000, CRC(0baf44ee) SHA1(5135d634f76893adb26a32976a69e2d47e2385c6) ) - NAMCOS2_DATA_LOAD_O_128K( "rst1_data1.bin", 0x000000, CRC(58a8daac) SHA1(c13ae8fc25b748a006c6db5b4b7ae593738544e8) ) - NAMCOS2_DATA_LOAD_E_128K( "rst1_data2.bin", 0x100000, CRC(8e850a2a) SHA1(e5230e80a23ca6d09c2c53f443ecf70cc74075d7) ) + NAMCOS2_DATA_LOAD_E_128K( "rst1_data0.13s", 0x000000, CRC(0baf44ee) SHA1(5135d634f76893adb26a32976a69e2d47e2385c6) ) + NAMCOS2_DATA_LOAD_O_128K( "rst1_data1.13p", 0x000000, CRC(58a8daac) SHA1(c13ae8fc25b748a006c6db5b4b7ae593738544e8) ) + NAMCOS2_DATA_LOAD_E_128K( "rst1_data2.13r", 0x100000, CRC(8e850a2a) SHA1(e5230e80a23ca6d09c2c53f443ecf70cc74075d7) ) ROM_REGION( 0x100000, "c140", 0 ) /* Sound voices */ ROM_LOAD( "rst1_voi1.bin", 0x000000, 0x080000, CRC(e42027cd) SHA1(fa3a81118c7f112289c27023236dec2e9cbc78b5) ) @@ -4504,9 +4515,9 @@ ROM_START( rthun2j ) ROM_LOAD( "shape.bin", 0x000000, 0x80000, CRC(cf58fbbe) SHA1(fbe3b2f0c3267b298993d6238d97b119e13e07f6) ) ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */ - NAMCOS2_DATA_LOAD_E_128K( "rst1_data0.bin", 0x000000, CRC(0baf44ee) SHA1(5135d634f76893adb26a32976a69e2d47e2385c6) ) - NAMCOS2_DATA_LOAD_O_128K( "rst1_data1.bin", 0x000000, CRC(58a8daac) SHA1(c13ae8fc25b748a006c6db5b4b7ae593738544e8) ) - NAMCOS2_DATA_LOAD_E_128K( "rst1_data2.bin", 0x100000, CRC(8e850a2a) SHA1(e5230e80a23ca6d09c2c53f443ecf70cc74075d7) ) + NAMCOS2_DATA_LOAD_E_128K( "rst1_data0.13s", 0x000000, CRC(0baf44ee) SHA1(5135d634f76893adb26a32976a69e2d47e2385c6) ) + NAMCOS2_DATA_LOAD_O_128K( "rst1_data1.13p", 0x000000, CRC(58a8daac) SHA1(c13ae8fc25b748a006c6db5b4b7ae593738544e8) ) + NAMCOS2_DATA_LOAD_E_128K( "rst1_data2.13r", 0x100000, CRC(8e850a2a) SHA1(e5230e80a23ca6d09c2c53f443ecf70cc74075d7) ) ROM_REGION( 0x100000, "c140", 0 ) /* Sound voices */ ROM_LOAD( "rst1_voi1.bin", 0x000000, 0x080000, CRC(e42027cd) SHA1(fa3a81118c7f112289c27023236dec2e9cbc78b5) ) @@ -4656,10 +4667,10 @@ ROM_START( sgunner2 ) ROM_LOAD( "sns_sha0.bin", 0x000000, 0x80000, CRC(0374fd67) SHA1(2f09536ef4f8e1aa719108e73642feb376d6efff) ) ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */ - NAMCOS2_DATA_LOAD_E_128K( "sns_dat0.bin", 0x000000, CRC(48295d93) SHA1(2b314128d5ed7d30895967dbd2ecd8f1dfdc61ca) ) - NAMCOS2_DATA_LOAD_O_128K( "sns_dat1.bin", 0x000000, CRC(b44cc656) SHA1(7126ef28bf174c6c560469fa6dc4cfb439811850) ) - NAMCOS2_DATA_LOAD_E_128K( "sns_dat2.bin", 0x100000, CRC(ca2ae645) SHA1(8addc8ed8244d0ff4c03909e865e3f15934963f1) ) - NAMCOS2_DATA_LOAD_O_128K( "sns_dat3.bin", 0x100000, CRC(203bb018) SHA1(36e20ab81ed69a941e13518ff2ae52acd6b22a78) ) + NAMCOS2_DATA_LOAD_E_128K( "sns_dat0.13s", 0x000000, CRC(48295d93) SHA1(2b314128d5ed7d30895967dbd2ecd8f1dfdc61ca) ) + NAMCOS2_DATA_LOAD_O_128K( "sns_dat1.13p", 0x000000, CRC(b44cc656) SHA1(7126ef28bf174c6c560469fa6dc4cfb439811850) ) + NAMCOS2_DATA_LOAD_E_128K( "sns_dat2.13r", 0x100000, CRC(ca2ae645) SHA1(8addc8ed8244d0ff4c03909e865e3f15934963f1) ) + NAMCOS2_DATA_LOAD_O_128K( "sns_dat3.13n", 0x100000, CRC(203bb018) SHA1(36e20ab81ed69a941e13518ff2ae52acd6b22a78) ) ROM_REGION( 0x100000, "c140", 0 ) /* Sound voices */ ROM_LOAD( "sns_voi1.bin", 0x000000, 0x080000, CRC(219c97f7) SHA1(d4b1d81e3d0e2585bc2fa305c0d80beef15b2a9f) ) @@ -4708,10 +4719,10 @@ ROM_START( sgunner2j ) ROM_LOAD( "sns_sha0.bin", 0x000000, 0x80000, CRC(0374fd67) SHA1(2f09536ef4f8e1aa719108e73642feb376d6efff) ) ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */ - NAMCOS2_DATA_LOAD_E_128K( "sns_dat0.bin", 0x000000, CRC(48295d93) SHA1(2b314128d5ed7d30895967dbd2ecd8f1dfdc61ca) ) - NAMCOS2_DATA_LOAD_O_128K( "sns_dat1.bin", 0x000000, CRC(b44cc656) SHA1(7126ef28bf174c6c560469fa6dc4cfb439811850) ) - NAMCOS2_DATA_LOAD_E_128K( "sns_dat2.bin", 0x100000, CRC(ca2ae645) SHA1(8addc8ed8244d0ff4c03909e865e3f15934963f1) ) - NAMCOS2_DATA_LOAD_O_128K( "sns_dat3.bin", 0x100000, CRC(203bb018) SHA1(36e20ab81ed69a941e13518ff2ae52acd6b22a78) ) + NAMCOS2_DATA_LOAD_E_128K( "sns_dat0.13s", 0x000000, CRC(48295d93) SHA1(2b314128d5ed7d30895967dbd2ecd8f1dfdc61ca) ) + NAMCOS2_DATA_LOAD_O_128K( "sns_dat1.13p", 0x000000, CRC(b44cc656) SHA1(7126ef28bf174c6c560469fa6dc4cfb439811850) ) + NAMCOS2_DATA_LOAD_E_128K( "sns_dat2.13r", 0x100000, CRC(ca2ae645) SHA1(8addc8ed8244d0ff4c03909e865e3f15934963f1) ) + NAMCOS2_DATA_LOAD_O_128K( "sns_dat3.13n", 0x100000, CRC(203bb018) SHA1(36e20ab81ed69a941e13518ff2ae52acd6b22a78) ) ROM_REGION( 0x100000, "c140", 0 ) /* Sound voices */ ROM_LOAD( "sns_voi1.bin", 0x000000, 0x080000, CRC(219c97f7) SHA1(d4b1d81e3d0e2585bc2fa305c0d80beef15b2a9f) ) @@ -4798,8 +4809,8 @@ ROM_START( sws92 ) ROM_LOAD( "sss_sha0.bin", 0x000000, 0x80000, CRC(b71a731a) SHA1(29eab0ad5618f54e6c790d20f7dc895afae6c709) ) ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */ - NAMCOS2_DATA_LOAD_E_256K( "sss1dat0.bin", 0x000000, CRC(db3e6aec) SHA1(928960e3dc9c8225e695d12e9b18fbb7f151c151) ) - NAMCOS2_DATA_LOAD_O_256K( "sss1dat1.bin", 0x000000, CRC(463b5ba8) SHA1(029dce2e7ee50181392b6ef409bbd192105fb065) ) + NAMCOS2_DATA_LOAD_E_256K( "sss1dat0.13s", 0x000000, CRC(db3e6aec) SHA1(928960e3dc9c8225e695d12e9b18fbb7f151c151) ) + NAMCOS2_DATA_LOAD_O_256K( "sss1dat1.13p", 0x000000, CRC(463b5ba8) SHA1(029dce2e7ee50181392b6ef409bbd192105fb065) ) ROM_REGION( 0x100000, "c140", 0 ) /* Sound voices */ ROM_LOAD( "ss_voi1.bin", 0x000000, 0x080000, CRC(503e51b7) SHA1(2e159fcc9bb0bef9a3476ae233bc8d61fabbb4bd) ) @@ -4841,10 +4852,10 @@ ROM_START( sws92g ) ROM_LOAD( "sss_sha0.bin", 0x000000, 0x80000, CRC(b71a731a) SHA1(29eab0ad5618f54e6c790d20f7dc895afae6c709) ) ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */ - NAMCOS2_DATA_LOAD_E_256K( "sss1dat0.bin", 0x000000, CRC(db3e6aec) SHA1(928960e3dc9c8225e695d12e9b18fbb7f151c151) ) - NAMCOS2_DATA_LOAD_O_256K( "sss1dat1.bin", 0x000000, CRC(463b5ba8) SHA1(029dce2e7ee50181392b6ef409bbd192105fb065) ) - NAMCOS2_DATA_LOAD_E_256K( "ssg1dat2.bin", 0x080000, CRC(754128aa) SHA1(459ffb08bcd905644d6019e5b25870dcb1e2b418) ) - NAMCOS2_DATA_LOAD_O_256K( "ssg1dat3.bin", 0x080000, CRC(cb3fed01) SHA1(68887d46fd07cd8fb67d58f37e74a6aefdae4328) ) + NAMCOS2_DATA_LOAD_E_256K( "sss1dat0.13s", 0x000000, CRC(db3e6aec) SHA1(928960e3dc9c8225e695d12e9b18fbb7f151c151) ) + NAMCOS2_DATA_LOAD_O_256K( "sss1dat1.13p", 0x000000, CRC(463b5ba8) SHA1(029dce2e7ee50181392b6ef409bbd192105fb065) ) + NAMCOS2_DATA_LOAD_E_256K( "ssg1dat2.13r", 0x080000, CRC(754128aa) SHA1(459ffb08bcd905644d6019e5b25870dcb1e2b418) ) + NAMCOS2_DATA_LOAD_O_256K( "ssg1dat3.13n", 0x080000, CRC(cb3fed01) SHA1(68887d46fd07cd8fb67d58f37e74a6aefdae4328) ) ROM_REGION( 0x100000, "c140", 0 ) /* Sound voices */ ROM_LOAD( "ss_voi1.bin", 0x000000, 0x080000, CRC(503e51b7) SHA1(2e159fcc9bb0bef9a3476ae233bc8d61fabbb4bd) ) @@ -4886,8 +4897,8 @@ ROM_START( sws93 ) ROM_LOAD( "sst_sha0.bin", 0x000000, 0x80000, CRC(4f64d4bd) SHA1(0eb5311448cfd91b1e139b64b2f35b5179237e58) ) ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */ - NAMCOS2_DATA_LOAD_E_512K( "sst1dat0.bin", 0x000000, CRC(b99c9656) SHA1(ac9e6bf46204dad70caf0d75614a20af0269a07f) ) - NAMCOS2_DATA_LOAD_O_512K( "sst1dat1.bin", 0x000000, CRC(60cf6281) SHA1(c02a5bf8f4f94cbe8b0448c9457af53cd1c043d0) ) + NAMCOS2_DATA_LOAD_E_512K( "sst1dat0.13s", 0x000000, CRC(b99c9656) SHA1(ac9e6bf46204dad70caf0d75614a20af0269a07f) ) + NAMCOS2_DATA_LOAD_O_512K( "sst1dat1.13p", 0x000000, CRC(60cf6281) SHA1(c02a5bf8f4f94cbe8b0448c9457af53cd1c043d0) ) ROM_REGION( 0x100000, "c140", 0 ) /* Sound voices */ ROM_LOAD( "ss_voi1.bin", 0x000000, 0x080000, CRC(503e51b7) SHA1(2e159fcc9bb0bef9a3476ae233bc8d61fabbb4bd) ) @@ -4928,9 +4939,9 @@ ROM_START( suzuka8h ) ROM_LOAD( "eh2-sha0.bin", 0x000000, 0x80000, CRC(7f24619c) SHA1(0d19ab621cb42c5315be9a6b56f6711fc46ffff7) ) ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */ - NAMCOS2_DATA_LOAD_E_256K( "eh1-d0.bin", 0x000000, CRC(b43e5dfa) SHA1(7e24ee46169532cdb5c504239f7961f8d17e86e4) ) - NAMCOS2_DATA_LOAD_O_256K( "eh1-d1.bin", 0x000000, CRC(9825d5bf) SHA1(720f0e90c69a2e0c48889d510a15102768226a67) ) - NAMCOS2_DATA_LOAD_O_256K( "eh1-d3.bin", 0x100000, CRC(f46d301f) SHA1(70797fd584735844539553efcad53e11239ec10e) ) + NAMCOS2_DATA_LOAD_E_256K( "eh1-d0.13s", 0x000000, CRC(b43e5dfa) SHA1(7e24ee46169532cdb5c504239f7961f8d17e86e4) ) + NAMCOS2_DATA_LOAD_O_256K( "eh1-d1.13p", 0x000000, CRC(9825d5bf) SHA1(720f0e90c69a2e0c48889d510a15102768226a67) ) + NAMCOS2_DATA_LOAD_O_256K( "eh1-d3.13n", 0x100000, CRC(f46d301f) SHA1(70797fd584735844539553efcad53e11239ec10e) ) ROM_REGION( 0x100, "c45_road:clut", 0 ) /* prom for road colors */ ROM_LOAD( "ehs1_landdt.10w", 0, 0x100, CRC(cde7e8a6) SHA1(860273daf2e649418746adf50a67ae33f9f3740c) ) @@ -4975,9 +4986,9 @@ ROM_START( suzuka8hj ) ROM_LOAD( "eh1-sha0.bin", 0x000000, 0x80000, CRC(39585cf9) SHA1(8cc18b5745ab2cf50d4df0a17fc1a57771db28ab) ) ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */ - NAMCOS2_DATA_LOAD_E_256K( "eh1-d0.bin", 0x000000, CRC(b43e5dfa) SHA1(7e24ee46169532cdb5c504239f7961f8d17e86e4) ) - NAMCOS2_DATA_LOAD_O_256K( "eh1-d1.bin", 0x000000, CRC(9825d5bf) SHA1(720f0e90c69a2e0c48889d510a15102768226a67) ) - NAMCOS2_DATA_LOAD_O_256K( "eh1-d3.bin", 0x100000, CRC(f46d301f) SHA1(70797fd584735844539553efcad53e11239ec10e) ) + NAMCOS2_DATA_LOAD_E_256K( "eh1-d0.13s", 0x000000, CRC(b43e5dfa) SHA1(7e24ee46169532cdb5c504239f7961f8d17e86e4) ) + NAMCOS2_DATA_LOAD_O_256K( "eh1-d1.13p", 0x000000, CRC(9825d5bf) SHA1(720f0e90c69a2e0c48889d510a15102768226a67) ) + NAMCOS2_DATA_LOAD_O_256K( "eh1-d3.13n", 0x100000, CRC(f46d301f) SHA1(70797fd584735844539553efcad53e11239ec10e) ) ROM_REGION( 0x100, "c45_road:clut", 0 ) /* prom for road colors */ ROM_LOAD( "ehs1_landdt.10w", 0, 0x100, CRC(cde7e8a6) SHA1(860273daf2e649418746adf50a67ae33f9f3740c) ) @@ -5028,8 +5039,8 @@ ROM_START( suzuk8h2 ) ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */ NAMCOS2_DATA_LOAD_E_512K( "ehs1-dat0.13s", 0x000000, CRC(12a202fb) SHA1(dca1b88cb524d54a699d4f6003854cfc980e084b) ) - NAMCOS2_DATA_LOAD_O_512K( "ehs1-dat1.13r", 0x000000, CRC(91790905) SHA1(988af294959dbb8636f808347b44897a133d3203) ) - NAMCOS2_DATA_LOAD_E_512K( "ehs1-dat2.13p", 0x100000, CRC(087da1f3) SHA1(e9c4ba0383e883502c0f45ae6e6d5daba4eccb01) ) + NAMCOS2_DATA_LOAD_O_512K( "ehs1-dat1.13p", 0x000000, CRC(91790905) SHA1(988af294959dbb8636f808347b44897a133d3203) ) + NAMCOS2_DATA_LOAD_E_512K( "ehs1-dat2.13r", 0x100000, CRC(087da1f3) SHA1(e9c4ba0383e883502c0f45ae6e6d5daba4eccb01) ) NAMCOS2_DATA_LOAD_O_512K( "ehs1-dat3.13n", 0x100000, CRC(85aecb3f) SHA1(00ab6104dee0cd0fbdb0235b88b41e4d26794f98) ) ROM_REGION( 0x100, "c45_road:clut", 0 ) /* prom for road colors */ @@ -5081,8 +5092,8 @@ ROM_START( suzuk8h2j ) ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */ NAMCOS2_DATA_LOAD_E_512K( "ehs1-dat0.13s", 0x000000, CRC(12a202fb) SHA1(dca1b88cb524d54a699d4f6003854cfc980e084b) ) - NAMCOS2_DATA_LOAD_O_512K( "ehs1-dat1.13r", 0x000000, CRC(91790905) SHA1(988af294959dbb8636f808347b44897a133d3203) ) - NAMCOS2_DATA_LOAD_E_512K( "ehs1-dat2.13p", 0x100000, CRC(087da1f3) SHA1(e9c4ba0383e883502c0f45ae6e6d5daba4eccb01) ) + NAMCOS2_DATA_LOAD_O_512K( "ehs1-dat1.13p", 0x000000, CRC(91790905) SHA1(988af294959dbb8636f808347b44897a133d3203) ) + NAMCOS2_DATA_LOAD_E_512K( "ehs1-dat2.13r", 0x100000, CRC(087da1f3) SHA1(e9c4ba0383e883502c0f45ae6e6d5daba4eccb01) ) NAMCOS2_DATA_LOAD_O_512K( "ehs1-dat3.13n", 0x100000, CRC(85aecb3f) SHA1(00ab6104dee0cd0fbdb0235b88b41e4d26794f98) ) ROM_REGION( 0x100, "c45_road:clut", 0 ) /* prom for road colors */ @@ -5137,8 +5148,8 @@ ROM_START( valkyrie ) NAMCOS2_GFXROM_LOAD_128K( "wdshape.bin", 0x000000, CRC(3b5e0249) SHA1(259bbabf57a8ad739c646c56aad6d0b92e10adcd) ) ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */ - NAMCOS2_DATA_LOAD_E_128K( "wd1dat0.bin", 0x000000, CRC(ea209f48) SHA1(5e73a745dc2faaa4ce6c633d4072d41e9e494276) ) - NAMCOS2_DATA_LOAD_O_128K( "wd1dat1.bin", 0x000000, CRC(04b48ada) SHA1(aa046f8856bdd5b56d481c2c12ad2808c6517a5f) ) + NAMCOS2_DATA_LOAD_E_128K( "wd1dat0.13s", 0x000000, CRC(ea209f48) SHA1(5e73a745dc2faaa4ce6c633d4072d41e9e494276) ) + NAMCOS2_DATA_LOAD_O_128K( "wd1dat1.13p", 0x000000, CRC(04b48ada) SHA1(aa046f8856bdd5b56d481c2c12ad2808c6517a5f) ) ROM_REGION( 0x100000, "c140", 0 ) /* Sound voices */ ROM_LOAD( "wd1voi1.bin", 0x000000, 0x040000, CRC(f1ace193) SHA1(dd13bdf4b99c6bf4e356d623ff2e3da72db331dd) ) @@ -5187,10 +5198,10 @@ ROM_START( kyukaidk ) NAMCOS2_GFXROM_LOAD_128K( "ky1_sha.bin", 0x000000, CRC(380a20d7) SHA1(9627d2e0192779d50bfb25d5c19976275818c310) ) ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */ - NAMCOS2_DATA_LOAD_E_128K( "ky1_d0.bin", 0x000000, CRC(c9cf399d) SHA1(90cba42781b1e03ecc3f5b802d740ace6b88baaa) ) - NAMCOS2_DATA_LOAD_O_128K( "ky1_d1.bin", 0x000000, CRC(6d4f21b9) SHA1(f234a785f61969be684d2a4aed59616f125d72fc) ) - NAMCOS2_DATA_LOAD_E_128K( "ky1_d2.bin", 0x100000, CRC(eb6d19c8) SHA1(c9fdb33fe191d3c4d284db7cbb05d852551a998d) ) - NAMCOS2_DATA_LOAD_O_128K( "ky1_d3.bin", 0x100000, CRC(95674701) SHA1(9a8832837b9a3f8b75437717ea84d86261bfce59) ) + NAMCOS2_DATA_LOAD_E_128K( "ky1_d0.13s", 0x000000, CRC(c9cf399d) SHA1(90cba42781b1e03ecc3f5b802d740ace6b88baaa) ) + NAMCOS2_DATA_LOAD_O_128K( "ky1_d1.13p", 0x000000, CRC(6d4f21b9) SHA1(f234a785f61969be684d2a4aed59616f125d72fc) ) + NAMCOS2_DATA_LOAD_E_128K( "ky1_d2.13r", 0x100000, CRC(eb6d19c8) SHA1(c9fdb33fe191d3c4d284db7cbb05d852551a998d) ) + NAMCOS2_DATA_LOAD_O_128K( "ky1_d3.13n", 0x100000, CRC(95674701) SHA1(9a8832837b9a3f8b75437717ea84d86261bfce59) ) ROM_REGION( 0x100000, "c140", 0 ) /* Sound voices */ ROM_LOAD( "ky1_v1.bin", 0x000000, 0x080000, CRC(5ff81aec) SHA1(0535eda474de0a4aa3b48649b04afe2b7a8619c9) ) @@ -5234,10 +5245,10 @@ ROM_START( kyukaidko ) NAMCOS2_GFXROM_LOAD_128K( "ky1_sha.bin", 0x000000, CRC(380a20d7) SHA1(9627d2e0192779d50bfb25d5c19976275818c310) ) ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */ - NAMCOS2_DATA_LOAD_E_128K( "ky1_d0.bin", 0x000000, CRC(c9cf399d) SHA1(90cba42781b1e03ecc3f5b802d740ace6b88baaa) ) - NAMCOS2_DATA_LOAD_O_128K( "ky1_d1.bin", 0x000000, CRC(6d4f21b9) SHA1(f234a785f61969be684d2a4aed59616f125d72fc) ) - NAMCOS2_DATA_LOAD_E_128K( "ky1_d2.bin", 0x100000, CRC(eb6d19c8) SHA1(c9fdb33fe191d3c4d284db7cbb05d852551a998d) ) - NAMCOS2_DATA_LOAD_O_128K( "ky1_d3.bin", 0x100000, CRC(95674701) SHA1(9a8832837b9a3f8b75437717ea84d86261bfce59) ) + NAMCOS2_DATA_LOAD_E_128K( "ky1_d0.13s", 0x000000, CRC(c9cf399d) SHA1(90cba42781b1e03ecc3f5b802d740ace6b88baaa) ) + NAMCOS2_DATA_LOAD_O_128K( "ky1_d1.13p", 0x000000, CRC(6d4f21b9) SHA1(f234a785f61969be684d2a4aed59616f125d72fc) ) + NAMCOS2_DATA_LOAD_E_128K( "ky1_d2.13r", 0x100000, CRC(eb6d19c8) SHA1(c9fdb33fe191d3c4d284db7cbb05d852551a998d) ) + NAMCOS2_DATA_LOAD_O_128K( "ky1_d3.13n", 0x100000, CRC(95674701) SHA1(9a8832837b9a3f8b75437717ea84d86261bfce59) ) ROM_REGION( 0x100000, "c140", 0 ) /* Sound voices */ ROM_LOAD( "ky1_v1.bin", 0x000000, 0x080000, CRC(5ff81aec) SHA1(0535eda474de0a4aa3b48649b04afe2b7a8619c9) ) |