From 8a514fdba8cd5c34ec42836255223b2e9e0afdb6 Mon Sep 17 00:00:00 2001 From: cam900 Date: Thu, 22 Feb 2018 22:37:12 +0900 Subject: zn.cpp : Cleanup duplicates / Unuseds (#3226) * zn.cpp : Cleanup duplicates / Unuseds Move nbajamex bank scheme to address_map_bank_device Move Bankswitch initializations to MACHINE_START beastrzrb : CPU Type / Soundchip identification * zn.cpp : Fix compiles --- src/mame/drivers/zn.cpp | 400 ++++++++++++++++++++++++++++++------------------ 1 file changed, 249 insertions(+), 151 deletions(-) diff --git a/src/mame/drivers/zn.cpp b/src/mame/drivers/zn.cpp index 5488047618f..5832d0c3521 100644 --- a/src/mame/drivers/zn.cpp +++ b/src/mame/drivers/zn.cpp @@ -16,11 +16,13 @@ #include "audio/taitosnd.h" #include "cpu/m68000/m68000.h" +#include "cpu/mcs51/mcs51.h" #include "cpu/psx/psx.h" #include "cpu/z80/z80.h" #include "machine/7200fifo.h" #include "machine/at28c16.h" #include "machine/ataintf.h" +#include "machine/bankdev.h" #include "machine/cat702.h" #include "machine/gen_latch.h" #include "machine/mb3773.h" @@ -29,6 +31,7 @@ #include "machine/vt83c461.h" #include "machine/znmcu.h" #include "sound/2610intf.h" +#include "sound/okim6295.h" #include "sound/qsound.h" #include "sound/spu.h" #include "sound/ymf271.h" @@ -38,6 +41,7 @@ #include "screen.h" #include "speaker.h" +#include #define VERBOSE_LEVEL ( 0 ) @@ -49,36 +53,35 @@ public: m_gpu(*this, "gpu"), m_gpu_screen(*this, "gpu:screen"), m_sio0(*this, "maincpu:sio0"), - m_cat702_1(*this, "cat702_1"), - m_cat702_2(*this, "cat702_2"), + m_cat702(*this, "cat702_%u", 1), m_znmcu(*this, "znmcu"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_ram(*this, "maincpu:ram"), - m_cbaj_fifo1(*this, "cbaj_fifo1"), - m_cbaj_fifo2(*this, "cbaj_fifo2"), + m_cbaj_fifo(*this, "cbaj_fifo%u", 1), m_mb3773(*this, "mb3773"), m_zoom(*this, "taito_zoom"), m_rax(*this, "rax"), m_vt83c461(*this, "ide"), m_soundlatch(*this, "soundlatch"), m_soundlatch16(*this, "soundlatch16"), + m_nbajamex_bankmap(*this, "nbajamex_bankmap"), m_bankedroms(*this, "bankedroms"), + m_rombank(*this, "rombank%u", 1), m_soundbank(*this, "soundbank"), - m_cat702_1_dataout(1), - m_cat702_2_dataout(1), + m_okibank(*this, "okibank"), m_znmcu_dataout(1), m_znmcu_dsrout(1) { + std::fill(std::begin(m_cat702_dataout), std::end(m_cat702_dataout), 1); } - DECLARE_WRITE_LINE_MEMBER(sio0_sck){ m_cat702_1->write_clock(state); m_cat702_2->write_clock(state); m_znmcu->write_clock(state); } - DECLARE_WRITE_LINE_MEMBER(sio0_txd){ m_cat702_1->write_datain(state); m_cat702_2->write_datain(state); } - DECLARE_WRITE_LINE_MEMBER(cat702_1_dataout){ m_cat702_1_dataout = state; update_sio0_rxd(); } - DECLARE_WRITE_LINE_MEMBER(cat702_2_dataout){ m_cat702_2_dataout = state; update_sio0_rxd(); } + DECLARE_WRITE_LINE_MEMBER(sio0_sck){ m_cat702[0]->write_clock(state); m_cat702[1]->write_clock(state); m_znmcu->write_clock(state); } + DECLARE_WRITE_LINE_MEMBER(sio0_txd){ m_cat702[0]->write_datain(state); m_cat702[1]->write_datain(state); } + template DECLARE_WRITE_LINE_MEMBER(cat702_dataout){ m_cat702_dataout[Chip] = state; update_sio0_rxd(); } DECLARE_WRITE_LINE_MEMBER(znmcu_dataout){ m_znmcu_dataout = state; update_sio0_rxd(); } DECLARE_WRITE_LINE_MEMBER(znmcu_dsrout){ m_znmcu_dsrout = state; update_sio0_dsr(); } - void update_sio0_rxd(){ m_sio0->write_rxd(m_cat702_1_dataout && m_cat702_2_dataout && m_znmcu_dataout); } + void update_sio0_rxd(){ m_sio0->write_rxd(m_cat702_dataout[0] && m_cat702_dataout[1] && m_znmcu_dataout); } void update_sio0_dsr(){ m_sio0->write_dsr(m_znmcu_dsrout); } DECLARE_CUSTOM_INPUT_MEMBER(jdredd_gun_mux_read); DECLARE_READ8_MEMBER(znsecsel_r); @@ -89,7 +92,6 @@ public: DECLARE_READ16_MEMBER(capcom_kickharness_r); DECLARE_WRITE8_MEMBER(bank_coh1000c_w); DECLARE_WRITE8_MEMBER(qsound_bankswitch_w); - DECLARE_WRITE8_MEMBER(zn_qsound_w); DECLARE_WRITE8_MEMBER(bank_coh1000t_w); DECLARE_WRITE8_MEMBER(fx1a_sound_bankswitch_w); DECLARE_WRITE8_MEMBER(fx1b_fram_w); @@ -107,7 +109,6 @@ public: DECLARE_READ16_MEMBER(nbajamex_08_r); DECLARE_READ16_MEMBER(nbajamex_80_r); DECLARE_WRITE8_MEMBER(coh1001l_bank_w); - DECLARE_WRITE16_MEMBER(coh1001l_latch_w); DECLARE_WRITE16_MEMBER(coh1001l_sound_unk_w); DECLARE_WRITE8_MEMBER(coh1002v_bank_w); DECLARE_WRITE8_MEMBER(coh1002m_bank_w); @@ -123,11 +124,17 @@ public: DECLARE_DRIVER_INIT(jdredd); DECLARE_DRIVER_INIT(coh1000w); DECLARE_DRIVER_INIT(primrag2); + DECLARE_MACHINE_START(coh1000c); + DECLARE_MACHINE_START(coh1000ta); + DECLARE_MACHINE_START(coh1002e); + DECLARE_MACHINE_START(bam2); + DECLARE_MACHINE_START(nbajamex); + DECLARE_MACHINE_START(coh1001l); + DECLARE_MACHINE_START(coh1002v); + DECLARE_MACHINE_START(coh1002m); DECLARE_MACHINE_RESET(coh1000c); DECLARE_MACHINE_RESET(glpracr); DECLARE_MACHINE_RESET(coh1000ta); - DECLARE_MACHINE_RESET(coh1000tb); - DECLARE_MACHINE_RESET(coh1002tb); DECLARE_MACHINE_RESET(coh1002e); DECLARE_MACHINE_RESET(bam2); DECLARE_MACHINE_RESET(nbajamex); @@ -151,6 +158,7 @@ public: void coh1002ml(machine_config &config); void coh1001l(machine_config &config); void bam2(machine_config &config); + void beastrzrb(machine_config &config); void glpracr(machine_config &config); void coh1000ta(machine_config &config); void coh1002v(machine_config &config); @@ -162,6 +170,7 @@ public: void coh1002c(machine_config &config); void atlus_snd_map(address_map &map); void bam2_map(address_map &map); + void beastrzrb_snd_map(address_map &map); void cbaj_z80_map(address_map &map); void cbaj_z80_port_map(address_map &map); void coh1000a_map(address_map &map); @@ -179,6 +188,8 @@ public: void fx1a_sound_map(address_map &map); void jdredd_map(address_map &map); void nbajamex_map(address_map &map); + void nbajamex_bank_map(address_map &map); + void oki_map(address_map &map); void psarc_snd_map(address_map &map); void qsound_map(address_map &map); void qsound_portmap(address_map &map); @@ -205,25 +216,25 @@ private: required_device m_gpu; required_device m_gpu_screen; required_device m_sio0; - required_device m_cat702_1; - required_device m_cat702_2; + required_device_array m_cat702; required_device m_znmcu; required_device m_maincpu; optional_device m_audiocpu; required_device m_ram; - optional_device m_cbaj_fifo1; - optional_device m_cbaj_fifo2; + optional_device_array m_cbaj_fifo; optional_device m_mb3773; optional_device m_zoom; optional_device m_rax; optional_device m_vt83c461; optional_device m_soundlatch; optional_device m_soundlatch16; - optional_memory_bank m_bankedroms; + optional_device m_nbajamex_bankmap; + optional_memory_region m_bankedroms; + optional_memory_bank_array<2> m_rombank; optional_memory_bank m_soundbank; + optional_memory_bank m_okibank; - int m_cat702_1_dataout; - int m_cat702_2_dataout; + int m_cat702_dataout[2]; int m_znmcu_dataout; int m_znmcu_dsrout; }; @@ -244,8 +255,7 @@ inline void ATTR_PRINTF(3,4) zn_state::verboselog( int n_level, const char *s_fm void zn_state::machine_start() { save_item(NAME(m_n_znsecsel)); - save_item(NAME(m_cat702_1_dataout)); - save_item(NAME(m_cat702_2_dataout)); + save_item(NAME(m_cat702_dataout)); save_item(NAME(m_znmcu_dataout)); save_item(NAME(m_znmcu_dsrout)); } @@ -273,8 +283,8 @@ WRITE8_MEMBER(zn_state::znsecsel_w) { verboselog(2, "znsecsel_w( %08x, %08x, %08x )\n", offset, data, mem_mask ); - m_cat702_1->write_select(BIT(data, 2)); - m_cat702_2->write_select(BIT(data, 3)); + m_cat702[0]->write_select(BIT(data, 2)); + m_cat702[1]->write_select(BIT(data, 3)); m_znmcu->write_select((data & 0x8c) != 0x8c); // BIT(data,4); // read analogue controls? @@ -378,10 +388,10 @@ MACHINE_CONFIG_START(zn_state::zn1_1mb_vram) MCFG_PSX_SIO_TXD_HANDLER(DEVWRITELINE(DEVICE_SELF_OWNER, zn_state, sio0_txd)) MCFG_DEVICE_ADD("cat702_1", CAT702, 0) - MCFG_CAT702_DATAOUT_HANDLER(WRITELINE(zn_state, cat702_1_dataout)) + MCFG_CAT702_DATAOUT_HANDLER(WRITELINE(zn_state, cat702_dataout<0>)) MCFG_DEVICE_ADD("cat702_2", CAT702, 0) - MCFG_CAT702_DATAOUT_HANDLER(WRITELINE(zn_state, cat702_2_dataout)) + MCFG_CAT702_DATAOUT_HANDLER(WRITELINE(zn_state, cat702_dataout<1>)) MCFG_DEVICE_ADD("znmcu", ZNMCU, 0) MCFG_ZNMCU_DATAOUT_HANDLER(WRITELINE(zn_state, znmcu_dataout)) @@ -424,10 +434,10 @@ MACHINE_CONFIG_START(zn_state::zn2) MCFG_PSX_SIO_TXD_HANDLER(DEVWRITELINE(DEVICE_SELF_OWNER, zn_state, sio0_txd)) MCFG_DEVICE_ADD("cat702_1", CAT702, 0) - MCFG_CAT702_DATAOUT_HANDLER(WRITELINE(zn_state, cat702_1_dataout)) + MCFG_CAT702_DATAOUT_HANDLER(WRITELINE(zn_state, cat702_dataout<0>)) MCFG_DEVICE_ADD("cat702_2", CAT702, 0) - MCFG_CAT702_DATAOUT_HANDLER(WRITELINE(zn_state, cat702_2_dataout)) + MCFG_CAT702_DATAOUT_HANDLER(WRITELINE(zn_state, cat702_dataout<1>)) MCFG_DEVICE_ADD("znmcu", ZNMCU, 0) MCFG_ZNMCU_DATAOUT_HANDLER(WRITELINE(zn_state, znmcu_dataout)) @@ -574,7 +584,7 @@ READ16_MEMBER(zn_state::capcom_kickharness_r) WRITE8_MEMBER(zn_state::bank_coh1000c_w) { - m_bankedroms->set_entry( data ); + m_rombank[0]->set_entry( data ); } WRITE8_MEMBER(zn_state::qsound_bankswitch_w) @@ -587,30 +597,28 @@ INTERRUPT_GEN_MEMBER(zn_state::qsound_interrupt) device.execute().set_input_line(0, HOLD_LINE); } -WRITE8_MEMBER(zn_state::zn_qsound_w) -{ - m_soundlatch->write(space, 0, data); - m_audiocpu->set_input_line(INPUT_LINE_NMI, PULSE_LINE); -} - ADDRESS_MAP_START(zn_state::coh1000c_map) AM_IMPORT_FROM(zn_map) - AM_RANGE(0x1f000000, 0x1f3fffff) AM_ROM AM_REGION("maskroms", 0) - AM_RANGE(0x1f400000, 0x1f7fffff) AM_ROMBANK("bankedroms") + AM_RANGE(0x1f000000, 0x1f3fffff) AM_ROM AM_REGION("bankedroms", 0) + AM_RANGE(0x1f400000, 0x1f7fffff) AM_ROMBANK("rombank1") AM_RANGE(0x1fb00000, 0x1fb00003) AM_WRITE8(bank_coh1000c_w, 0x000000ff) AM_RANGE(0x1fb40010, 0x1fb40013) AM_READ16(capcom_kickharness_r, 0x0000ffff) AM_RANGE(0x1fb40020, 0x1fb40023) AM_READ16(capcom_kickharness_r, 0x0000ffff) AM_RANGE(0x1fb80000, 0x1fbfffff) AM_ROM AM_REGION("countryrom", 0) - AM_RANGE(0x1fb60000, 0x1fb60003) AM_WRITE8(zn_qsound_w, 0x000000ff) + AM_RANGE(0x1fb60000, 0x1fb60003) AM_DEVWRITE8("soundlatch", generic_latch_8_device, write, 0x000000ff) ADDRESS_MAP_END +MACHINE_START_MEMBER(zn_state,coh1000c) +{ + m_rombank[0]->configure_entries( 0, 16, m_bankedroms->base() + 0x400000, 0x400000 ); /* banked game rom */ + m_soundbank->configure_entries( 0, 16, memregion("audiocpu")->base() + 0x8000, 0x4000 ); /* banked audio rom */ +} + MACHINE_RESET_MEMBER(zn_state,coh1000c) { - m_bankedroms->configure_entries(0, 16, memregion( "maskroms" )->base() + 0x400000, 0x400000 ); /* banked game rom */ - m_bankedroms->set_entry(0 ); - m_soundbank->configure_entries(0, 16, memregion("audiocpu")->base() + 0x8000, 0x4000 ); /* banked audio rom */ - m_soundbank->set_entry(0 ); + m_rombank[0]->set_entry( 0 ); + m_soundbank->set_entry( 0 ); } MACHINE_RESET_MEMBER(zn_state,glpracr) @@ -643,8 +651,12 @@ MACHINE_CONFIG_START(zn_state::coh1000c) MCFG_CPU_IO_MAP(qsound_portmap) MCFG_CPU_PERIODIC_INT_DRIVER(zn_state, qsound_interrupt, 250) // measured (cps2.cpp) + MCFG_MACHINE_START_OVERRIDE(zn_state, coh1000c) MCFG_MACHINE_RESET_OVERRIDE(zn_state, coh1000c) + MCFG_DEVICE_MODIFY("soundlatch") + MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI)) + MCFG_QSOUND_ADD("qsound", QSOUND_CLOCK) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) @@ -665,8 +677,12 @@ MACHINE_CONFIG_START(zn_state::coh1002c) MCFG_CPU_IO_MAP(qsound_portmap) MCFG_CPU_PERIODIC_INT_DRIVER(zn_state, qsound_interrupt, 250) // measured (cps2.cpp) + MCFG_MACHINE_START_OVERRIDE(zn_state, coh1000c) MCFG_MACHINE_RESET_OVERRIDE(zn_state, coh1000c) + MCFG_DEVICE_MODIFY("soundlatch") + MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI)) + MCFG_QSOUND_ADD("qsound", QSOUND_CLOCK) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) @@ -823,8 +839,12 @@ MACHINE_CONFIG_START(zn_state::coh3002c) MCFG_CPU_IO_MAP(qsound_portmap) MCFG_CPU_PERIODIC_INT_DRIVER(zn_state, qsound_interrupt, 250) // measured (cps2.cpp) + MCFG_MACHINE_START_OVERRIDE(zn_state, coh1000c) MCFG_MACHINE_RESET_OVERRIDE(zn_state, coh1000c) + MCFG_DEVICE_MODIFY("soundlatch") + MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI)) + MCFG_QSOUND_ADD("qsound", QSOUND_CLOCK) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) @@ -1056,7 +1076,7 @@ WRITE8_MEMBER(zn_state::bank_coh1000t_w) m_mb3773->write_line_ck((data & 0x20) >> 5); - m_bankedroms->set_entry( data & 3 ); + m_rombank[0]->set_entry( data & 3 ); } WRITE8_MEMBER(zn_state::fx1a_sound_bankswitch_w) @@ -1067,19 +1087,24 @@ WRITE8_MEMBER(zn_state::fx1a_sound_bankswitch_w) ADDRESS_MAP_START(zn_state::coh1000ta_map) AM_IMPORT_FROM(zn_map) - AM_RANGE(0x1f000000, 0x1f7fffff) AM_ROMBANK("bankedroms") + AM_RANGE(0x1f000000, 0x1f7fffff) AM_ROMBANK("rombank1") AM_RANGE(0x1fb40000, 0x1fb40003) AM_WRITE8(bank_coh1000t_w, 0x000000ff) AM_RANGE(0x1fb80000, 0x1fb80003) AM_DEVWRITE8("tc0140syt", tc0140syt_device, master_port_w, 0x000000ff) AM_RANGE(0x1fb80000, 0x1fb80003) AM_DEVREADWRITE8("tc0140syt", tc0140syt_device, master_comm_r, master_comm_w, 0x00ff0000) ADDRESS_MAP_END -MACHINE_RESET_MEMBER(zn_state,coh1000ta) +MACHINE_START_MEMBER(zn_state,coh1000ta) { - m_bankedroms->configure_entries( 0, 4, memregion( "bankedroms" )->base(), 0x800000 ); /* banked game rom */ - m_bankedroms->set_entry( 0 ); + m_rombank[0]->configure_entries( 0, 4, m_bankedroms->base(), 0x800000 ); /* banked game rom */ + if (m_soundbank.found()) + m_soundbank->configure_entries( 0, 8, memregion( "audiocpu" )->base() + 0x4000, 0x4000 ); +} - m_soundbank->configure_entries( 0, 8, memregion( "audiocpu" )->base() + 0x4000, 0x4000 ); - m_soundbank->set_entry( 0 ); +MACHINE_RESET_MEMBER(zn_state,coh1000ta) +{ + m_rombank[0]->set_entry( 0 ); + if (m_soundbank.found()) + m_soundbank->set_entry( 0 ); } ADDRESS_MAP_START(zn_state::fx1a_sound_map) @@ -1103,6 +1128,8 @@ MACHINE_CONFIG_START(zn_state::coh1000ta) MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000) / 4) /* 4 MHz */ MCFG_CPU_PROGRAM_MAP(fx1a_sound_map) + + MCFG_MACHINE_START_OVERRIDE(zn_state, coh1000ta) MCFG_MACHINE_RESET_OVERRIDE(zn_state, coh1000ta) MCFG_SOUND_ADD("ymsnd", YM2610B, XTAL(16'000'000)/2) @@ -1131,7 +1158,7 @@ READ8_MEMBER(zn_state::fx1b_fram_r) ADDRESS_MAP_START(zn_state::coh1000tb_map) AM_IMPORT_FROM(zn_map) - AM_RANGE(0x1f000000, 0x1f7fffff) AM_ROMBANK("bankedroms") + AM_RANGE(0x1f000000, 0x1f7fffff) AM_ROMBANK("rombank1") AM_RANGE(0x1fb00000, 0x1fb003ff) AM_READWRITE8(fx1b_fram_r, fx1b_fram_w, 0x00ff00ff) AM_RANGE(0x1fb40000, 0x1fb40003) AM_WRITE8(bank_coh1000t_w, 0x000000ff) AM_RANGE(0x1fb80000, 0x1fb80003) AM_DEVWRITE16("taito_zoom", taito_zoom_device, reg_data_w, 0x0000ffff) @@ -1149,12 +1176,6 @@ DRIVER_INIT_MEMBER(zn_state,coh1000tb) save_pointer(NAME(m_fx1b_fram.get()), 0x200); } -MACHINE_RESET_MEMBER(zn_state,coh1000tb) -{ - m_bankedroms->configure_entries( 0, 4, memregion( "bankedroms" )->base(), 0x800000 ); /* banked game rom */ - m_bankedroms->set_entry( 0 ); -} - MACHINE_CONFIG_START(zn_state::coh1000tb) zn1_1mb_vram(config); @@ -1162,7 +1183,8 @@ MACHINE_CONFIG_START(zn_state::coh1000tb) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(coh1000tb_map) - MCFG_MACHINE_RESET_OVERRIDE(zn_state, coh1000tb) + MCFG_MACHINE_START_OVERRIDE(zn_state, coh1000ta) + MCFG_MACHINE_RESET_OVERRIDE(zn_state, coh1000ta) MCFG_NVRAM_ADD_1FILL("fm1208s") MCFG_MB3773_ADD("mb3773") @@ -1183,7 +1205,8 @@ MACHINE_CONFIG_START(zn_state::coh1002tb) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(coh1000tb_map) - MCFG_MACHINE_RESET_OVERRIDE(zn_state, coh1000tb) + MCFG_MACHINE_START_OVERRIDE(zn_state, coh1000ta) + MCFG_MACHINE_RESET_OVERRIDE(zn_state, coh1000ta) MCFG_NVRAM_ADD_1FILL("fm1208s") MCFG_MB3773_ADD("mb3773") @@ -1588,7 +1611,7 @@ WRITE8_MEMBER(zn_state::coh1002e_bank_w) { znsecsel_w( space, offset, data, mem_mask ); - m_bankedroms->set_entry( data & 3 ); + m_rombank[0]->set_entry( data & 3 ); } WRITE8_MEMBER(zn_state::coh1002e_sound_irq_w) @@ -1599,16 +1622,24 @@ WRITE8_MEMBER(zn_state::coh1002e_sound_irq_w) ADDRESS_MAP_START(zn_state::coh1002e_map) AM_IMPORT_FROM(zn_map) - AM_RANGE(0x1f000000, 0x1f7fffff) AM_ROMBANK("bankedroms") + AM_RANGE(0x1f000000, 0x1f7fffff) AM_ROMBANK("rombank1") AM_RANGE(0x1fa10300, 0x1fa10303) AM_WRITE8(coh1002e_bank_w, 0x000000ff) AM_RANGE(0x1fb00000, 0x1fb00003) AM_DEVWRITE8("soundlatch", generic_latch_8_device, write, 0x000000ff) AM_RANGE(0x1fb00004, 0x1fb00007) AM_WRITE8(coh1002e_sound_irq_w, 0x000000ff) ADDRESS_MAP_END +MACHINE_START_MEMBER(zn_state,coh1002e) +{ + m_rombank[0]->configure_entries( 0, 4, m_bankedroms->base(), 0x800000 ); /* banked game rom */ + if (m_okibank.found()) + m_okibank->configure_entries( 0, memregion( "oki" )->bytes()/0x10000, memregion( "oki" )->base(), 0x10000 ); /* not verified */ +} + MACHINE_RESET_MEMBER(zn_state,coh1002e) { - m_bankedroms->configure_entries( 0, 4, memregion( "bankedroms" )->base(), 0x800000 ); /* banked game rom */ - m_bankedroms->set_entry( 0 ); + m_rombank[0]->set_entry( 0 ); + if (m_okibank.found()) + m_okibank->set_entry( 0 ); } ADDRESS_MAP_START(zn_state::psarc_snd_map) @@ -1620,6 +1651,15 @@ ADDRESS_MAP_START(zn_state::psarc_snd_map) AM_RANGE(0x100020, 0xffffff) AM_WRITENOP ADDRESS_MAP_END +ADDRESS_MAP_START(zn_state::beastrzrb_snd_map) // Internal ROM Not dumped +// AM_RANGE(0x0000, 0x0fff) AM_ROM +ADDRESS_MAP_END + +ADDRESS_MAP_START(zn_state::oki_map) + AM_RANGE(0x00000, 0x2ffff) AM_ROM + AM_RANGE(0x30000, 0x3ffff) AM_ROMBANK("okibank") +ADDRESS_MAP_END + MACHINE_CONFIG_START(zn_state::coh1002e) zn1_2mb_vram(config); MCFG_CPU_MODIFY("maincpu") @@ -1628,6 +1668,7 @@ MACHINE_CONFIG_START(zn_state::coh1002e) MCFG_CPU_ADD("audiocpu", M68000, XTAL(12'000'000)) MCFG_CPU_PROGRAM_MAP(psarc_snd_map) + MCFG_MACHINE_START_OVERRIDE(zn_state, coh1002e) MCFG_MACHINE_RESET_OVERRIDE(zn_state, coh1002e) MCFG_SOUND_ADD("ymf", YMF271, XTAL(16'934'400)) @@ -1635,6 +1676,23 @@ MACHINE_CONFIG_START(zn_state::coh1002e) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_CONFIG_END +MACHINE_CONFIG_START(zn_state::beastrzrb) + zn1_2mb_vram(config); + MCFG_CPU_MODIFY("maincpu") + MCFG_CPU_PROGRAM_MAP(coh1002e_map) + + MCFG_CPU_ADD("audiocpu", AT89C4051, XTAL(12'000'000)) // clock unverified + MCFG_CPU_PROGRAM_MAP(beastrzrb_snd_map) + + MCFG_MACHINE_START_OVERRIDE(zn_state, coh1002e) + MCFG_MACHINE_RESET_OVERRIDE(zn_state, coh1002e) + + MCFG_OKIM6295_ADD("oki", 1000000, PIN7_LOW) // clock frequency & pin 7 not verified + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) + MCFG_DEVICE_ADDRESS_MAP(0, oki_map) +MACHINE_CONFIG_END + /* @@ -1694,7 +1752,7 @@ WRITE16_MEMBER(zn_state::bam2_mcu_w) switch( offset ) { case 0: - m_bankedroms->set_entry( data & 0xf ); + m_rombank[0]->set_entry( data & 0xf ); break; case 1: @@ -1737,7 +1795,7 @@ ADDRESS_MAP_START(zn_state::bam2_map) AM_IMPORT_FROM(zn_map) AM_RANGE(0x1f000000, 0x1f3fffff) AM_ROM AM_REGION("bankedroms", 0) - AM_RANGE(0x1f400000, 0x1f7fffff) AM_ROMBANK("bankedroms") + AM_RANGE(0x1f400000, 0x1f7fffff) AM_ROMBANK("rombank1") AM_RANGE(0x1fa20000, 0x1fa20003) AM_READ16(bam2_unk_r, 0x0000ffff) AM_RANGE(0x1fb00000, 0x1fb00007) AM_READWRITE16(bam2_mcu_r, bam2_mcu_w, 0xffffffff) ADDRESS_MAP_END @@ -1747,10 +1805,14 @@ DRIVER_INIT_MEMBER(zn_state,bam2) save_item(NAME(m_bam2_mcu_command)); } +MACHINE_START_MEMBER(zn_state,bam2) +{ + m_rombank[0]->configure_entries( 0, 16, m_bankedroms->base(), 0x400000 ); /* banked game rom */ +} + MACHINE_RESET_MEMBER(zn_state,bam2) { - m_bankedroms->configure_entries( 0, 16, memregion( "bankedroms" )->base(), 0x400000 ); /* banked game rom */ - m_bankedroms->set_entry( 1 ); + m_rombank[0]->set_entry( 1 ); } MACHINE_CONFIG_START(zn_state::bam2) @@ -1758,6 +1820,7 @@ MACHINE_CONFIG_START(zn_state::bam2) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(bam2_map) + MCFG_MACHINE_START_OVERRIDE(zn_state, bam2) MCFG_MACHINE_RESET_OVERRIDE(zn_state, bam2) MACHINE_CONFIG_END @@ -1981,29 +2044,28 @@ WRITE16_MEMBER(zn_state::nbajamex_bank_w) m_nbajamex_rombank[offset] = data; - uint32_t bankbase0 = ((m_nbajamex_rombank[0] & 0x10) ? 0x200000 : 0) + (m_nbajamex_rombank[0] & 7) * 0x400000; - uint32_t bankbase1 = ((m_nbajamex_rombank[1] & 0x10) ? 0 : 0x200000) + (m_nbajamex_rombank[1] & 7) * 0x400000; + uint32_t bankbase0 = ((m_nbajamex_rombank[0] & 0x10) ? 1 : 0) | ((m_nbajamex_rombank[0] & 7) << 1); + uint32_t bankbase1 = ((m_nbajamex_rombank[1] & 0x10) ? 0 : 1) | ((m_nbajamex_rombank[1] & 7) << 1); if (offset == 0) { if (m_nbajamex_rombank[0] == 0) { - m_maincpu->space(AS_PROGRAM).install_read_bank(0x1f200000, 0x1f207fff, "sram"); - membank( "sram" )->set_base( m_nbajamex_sram.get() ); + m_nbajamex_bankmap->set_bank(0); } else { - m_maincpu->space(AS_PROGRAM).install_read_bank(0x1f200000, 0x1f7fffff, "bankedroms2"); - membank( "bankedroms2" )->set_base( memregion( "bankedroms" )->base() + bankbase1); + m_nbajamex_bankmap->set_bank(1); + m_rombank[1]->set_entry(bankbase1); } - m_bankedroms->set_base( memregion( "bankedroms" )->base() + bankbase0); + m_rombank[0]->set_entry(bankbase0); } else if (offset == 1) { if (m_nbajamex_rombank[0] != 0) { - m_maincpu->space(AS_PROGRAM).install_read_bank(0x1f200000, 0x1f7fffff, "bankedroms2"); - membank( "bankedroms2" )->set_base( memregion( "bankedroms" )->base() + bankbase1); + m_nbajamex_bankmap->set_bank(1); + m_rombank[1]->set_entry(bankbase1); } } } @@ -2048,27 +2110,42 @@ ADDRESS_MAP_END ADDRESS_MAP_START(zn_state::nbajamex_map) AM_IMPORT_FROM(coh1000a_map) - AM_RANGE(0x1f000000, 0x1f1fffff) AM_ROMBANK("bankedroms") - AM_RANGE(0x1f200000, 0x1f207fff) AM_WRITE8(nbajamex_backup_w, 0xffffffff) + AM_RANGE(0x1f000000, 0x1f7fffff) AM_DEVICE("nbajamex_bankmap", address_map_bank_device, amap32) AM_RANGE(0x1fbfff00, 0x1fbfff07) AM_WRITE16(nbajamex_bank_w, 0xffffffff) AM_RANGE(0x1fbfff08, 0x1fbfff0b) AM_READ16(nbajamex_08_r, 0xffff) AM_RANGE(0x1fbfff80, 0x1fbfff83) AM_READWRITE16(nbajamex_80_r, nbajamex_80_w, 0xffff) ADDRESS_MAP_END +ADDRESS_MAP_START(zn_state::nbajamex_bank_map) + AM_RANGE(0x000000, 0x1fffff) AM_MIRROR(0x800000) AM_ROMBANK("rombank1") + AM_RANGE(0x200000, 0x207fff) AM_MIRROR(0x800000) AM_WRITE8(nbajamex_backup_w, 0xffffffff) + AM_RANGE(0x200000, 0x207fff) AM_ROMBANK("sram") + AM_RANGE(0xa00000, 0xffffff) AM_ROMBANK("rombank2") +ADDRESS_MAP_END + DRIVER_INIT_MEMBER(zn_state,nbajamex) { - m_nbajamex_sram = std::make_unique(0x80000); + m_nbajamex_sram = std::make_unique(0x8000); machine().device("71256")->set_base(m_nbajamex_sram.get(), 0x8000); - - save_pointer(NAME(m_nbajamex_sram.get()), 0x80000); + + save_pointer(NAME(m_nbajamex_sram.get()), 0x8000); save_item(NAME(m_nbajamex_rombank)); } +MACHINE_START_MEMBER(zn_state,nbajamex) +{ + for (int bank = 0; bank < 2; bank++) + m_rombank[bank]->configure_entries( 0, 16, m_bankedroms->base(), 0x200000 ); + + membank( "sram" )->set_base( m_nbajamex_sram.get() ); +} MACHINE_RESET_MEMBER(zn_state,nbajamex) { - m_bankedroms->set_base( memregion( "bankedroms" )->base() ); + m_nbajamex_bankmap->set_bank( 0 ); + m_rombank[0]->set_entry( 0 ); + m_rombank[1]->set_entry( 0 ); } DRIVER_INIT_MEMBER(zn_state,jdredd) @@ -2094,8 +2171,19 @@ MACHINE_CONFIG_START(zn_state::nbajamex) coh1000a(config); MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(nbajamex_map) + MCFG_NVRAM_ADD_1FILL("71256") + + MCFG_MACHINE_START_OVERRIDE(zn_state, nbajamex) MCFG_MACHINE_RESET_OVERRIDE(zn_state, nbajamex) + + MCFG_DEVICE_ADD("nbajamex_bankmap", ADDRESS_MAP_BANK, 0) + MCFG_DEVICE_PROGRAM_MAP(nbajamex_bank_map) + MCFG_ADDRESS_MAP_BANK_ENDIANNESS(ENDIANNESS_LITTLE) + MCFG_ADDRESS_MAP_BANK_DATA_WIDTH(32) + MCFG_ADDRESS_MAP_BANK_ADDR_WIDTH(24) + MCFG_ADDRESS_MAP_BANK_STRIDE(0x800000) + MCFG_DEVICE_ADD("rax", ACCLAIM_RAX, 0) MACHINE_CONFIG_END @@ -2234,29 +2322,27 @@ WRITE16_MEMBER(zn_state::coh1001l_sound_unk_w) logerror("coh1001l_sound_unk_w: %04x %04x\n", data, mem_mask); } -WRITE16_MEMBER(zn_state::coh1001l_latch_w) -{ - m_soundlatch16->write(space, 0, data); - m_audiocpu->set_input_line(3, HOLD_LINE); -} - WRITE8_MEMBER(zn_state::coh1001l_bank_w) { - m_bankedroms->set_entry( data & 3 ); + m_rombank[0]->set_entry( data & 3 ); } ADDRESS_MAP_START(zn_state::coh1001l_map) AM_IMPORT_FROM(zn_map) - AM_RANGE(0x1f000000, 0x1f7fffff) AM_ROMBANK("bankedroms") - AM_RANGE(0x1fb00000, 0x1fb00003) AM_WRITE16(coh1001l_latch_w, 0x0000ffff) + AM_RANGE(0x1f000000, 0x1f7fffff) AM_ROMBANK("rombank1") + AM_RANGE(0x1fb00000, 0x1fb00003) AM_DEVWRITE16("soundlatch16", generic_latch_16_device, write, 0x0000ffff) AM_RANGE(0x1fb00000, 0x1fb00003) AM_WRITE8(coh1001l_bank_w, 0x00ff0000) ADDRESS_MAP_END +MACHINE_START_MEMBER(zn_state,coh1001l) +{ + m_rombank[0]->configure_entries( 0, 4, m_bankedroms->base(), 0x800000 ); /* banked game rom */ +} + MACHINE_RESET_MEMBER(zn_state,coh1001l) { - m_bankedroms->configure_entries( 0, 4, memregion( "bankedroms" )->base(), 0x800000 ); /* banked game rom */ - m_bankedroms->set_entry( 0 ); + m_rombank[0]->set_entry( 0 ); } ADDRESS_MAP_START(zn_state::atlus_snd_map) @@ -2275,9 +2361,11 @@ MACHINE_CONFIG_START(zn_state::coh1001l) MCFG_CPU_ADD("audiocpu", M68000, XTAL(10'000'000)) MCFG_CPU_PROGRAM_MAP(atlus_snd_map) + MCFG_MACHINE_START_OVERRIDE(zn_state, coh1001l) MCFG_MACHINE_RESET_OVERRIDE(zn_state, coh1001l) MCFG_GENERIC_LATCH_16_ADD("soundlatch16") + MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", 3)) MCFG_SOUND_ADD("ymz", YMZ280B, XTAL(16'934'400)) MCFG_YMZ280B_IRQ_HANDLER(INPUTLINE("audiocpu", 2)) @@ -2300,20 +2388,24 @@ Key: Mother KN01 WRITE8_MEMBER(zn_state::coh1002v_bank_w) { - m_bankedroms->set_entry( data ); + m_rombank[0]->set_entry( data ); } ADDRESS_MAP_START(zn_state::coh1002v_map) AM_IMPORT_FROM(zn_map) AM_RANGE(0x1f000000, 0x1f27ffff) AM_ROM AM_REGION("fixedroms", 0) - AM_RANGE(0x1fb00000, 0x1fbfffff) AM_ROMBANK("bankedroms") + AM_RANGE(0x1fb00000, 0x1fbfffff) AM_ROMBANK("rombank1") AM_RANGE(0x1fb00000, 0x1fb00003) AM_WRITE8(coh1002v_bank_w, 0x000000ff) ADDRESS_MAP_END +MACHINE_START_MEMBER(zn_state,coh1002v) +{ + m_rombank[0]->configure_entries( 0, 24, m_bankedroms->base(), 0x100000 ); /* banked game rom */ +} + MACHINE_RESET_MEMBER(zn_state,coh1002v) { - m_bankedroms->configure_entries( 0, 24, memregion( "bankedroms" )->base(), 0x100000 ); /* banked game rom */ - m_bankedroms->set_entry( 0 ); + m_rombank[0]->set_entry( 0 ); } MACHINE_CONFIG_START(zn_state::coh1002v) @@ -2321,6 +2413,7 @@ MACHINE_CONFIG_START(zn_state::coh1002v) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(coh1002v_map) + MCFG_MACHINE_START_OVERRIDE(zn_state, coh1002v) MCFG_MACHINE_RESET_OVERRIDE(zn_state, coh1002v) MACHINE_CONFIG_END @@ -2485,19 +2578,23 @@ Notes: WRITE8_MEMBER(zn_state::coh1002m_bank_w) { verboselog(1, "coh1002m_bank_w( %08x, %08x, %08x )\n", offset, data, mem_mask ); - m_bankedroms->set_entry( data ); + m_rombank[0]->set_entry( data ); } ADDRESS_MAP_START(zn_state::coh1002m_map) AM_IMPORT_FROM(zn_map) - AM_RANGE(0x1f000000, 0x1f7fffff) AM_ROMBANK("bankedroms") + AM_RANGE(0x1f000000, 0x1f7fffff) AM_ROMBANK("rombank1") AM_RANGE(0x1fb00004, 0x1fb00007) AM_WRITE8(coh1002m_bank_w, 0x00ff0000) ADDRESS_MAP_END +MACHINE_START_MEMBER(zn_state,coh1002m) +{ + m_rombank[0]->configure_entries( 0, 8, m_bankedroms->base(), 0x800000 ); /* banked game rom */ +} + MACHINE_RESET_MEMBER(zn_state,coh1002m) { - m_bankedroms->configure_entries( 0, 6, memregion( "bankedroms" )->base(), 0x800000 ); /* banked game rom */ - m_bankedroms->set_entry( 0 ); + m_rombank[0]->set_entry( 0 ); } MACHINE_CONFIG_START(zn_state::coh1002m) @@ -2505,13 +2602,14 @@ MACHINE_CONFIG_START(zn_state::coh1002m) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(coh1002m_map) + MCFG_MACHINE_START_OVERRIDE(zn_state, coh1002m) MCFG_MACHINE_RESET_OVERRIDE(zn_state, coh1002m) MACHINE_CONFIG_END READ8_MEMBER(zn_state::cbaj_sound_main_status_r) { // d1: fifo empty flag, other bits: unused(?) - return m_cbaj_fifo2->ef_r() << 1; + return m_cbaj_fifo[1]->ef_r() << 1; } ADDRESS_MAP_START(zn_state::coh1002msnd_map) @@ -2524,7 +2622,7 @@ ADDRESS_MAP_END READ8_MEMBER(zn_state::cbaj_sound_z80_status_r) { // d1: fifo empty flag, other bits: unused - return m_cbaj_fifo1->ef_r() << 1; + return m_cbaj_fifo[0]->ef_r() << 1; } ADDRESS_MAP_START(zn_state::cbaj_z80_map) @@ -2840,7 +2938,7 @@ ROM_START( coh1000c ) CPZN1_BIOS ROM_REGION32_LE( 0x80000, "countryrom", ROMREGION_ERASE00 ) - ROM_REGION32_LE( 0x2400000, "maskroms", ROMREGION_ERASE00 ) + ROM_REGION32_LE( 0x2400000, "bankedroms", ROMREGION_ERASE00 ) ROM_REGION( 0x40000, "audiocpu", ROMREGION_ERASE00 ) ROM_REGION( 0x400000, "qsound", ROMREGION_ERASE00 ) ROM_REGION( 0x8, "cat702_2", 0 ) ROM_COPY( "cat702_1", 0x0, 0x0, 0x8 ) @@ -2853,7 +2951,7 @@ ROM_START( ts2 ) ROM_REGION32_LE( 0x80000, "countryrom", 0 ) ROM_LOAD( "ts2u_04.2h", 0x0000000, 0x080000, CRC(ddb52e7c) SHA1(e77891abae7681d911ef6eba2e0920d81433ebe6) ) - ROM_REGION32_LE( 0x2400000, "maskroms", 0 ) + ROM_REGION32_LE( 0x2400000, "bankedroms", 0 ) ROM_LOAD( "ts2-05m.3h", 0x0000000, 0x400000, CRC(7f4228e2) SHA1(3690a76d19d97e55bc7b05a8456328697cfd7a77) ) ROM_LOAD( "ts2-06m", 0x0400000, 0x400000, CRC(cd7e0a27) SHA1(325b5f2e653cdea07cddc9d20d12b5ab50dca949) ) ROM_LOAD( "ts2-08m", 0x0800000, 0x400000, CRC(b1f7f115) SHA1(3f416d2aac07aa73a99593b5a21b047da60cea6a) ) @@ -2876,7 +2974,7 @@ ROM_START( ts2a ) ROM_REGION32_LE( 0x80000, "countryrom", 0 ) ROM_LOAD( "ts2u_04.2h", 0x0000000, 0x080000, CRC(ddb52e7c) SHA1(e77891abae7681d911ef6eba2e0920d81433ebe6) ) - ROM_REGION32_LE( 0x2400000, "maskroms", 0 ) + ROM_REGION32_LE( 0x2400000, "bankedroms", 0 ) ROM_LOAD( "ts2-05m.3h", 0x0000000, 0x400000, CRC(7f4228e2) SHA1(3690a76d19d97e55bc7b05a8456328697cfd7a77) ) ROM_LOAD( "ts2-06m.4h", 0x0400000, 0x200000, CRC(67be6797) SHA1(521f69439ba7666f54d1008a291f3391f3a16499) ) ROM_LOAD( "ts2-07m.5h", 0x0600000, 0x200000, CRC(db73e2b8) SHA1(239243f44c41df765789c14cc4036bb02e2ab373) ) @@ -2901,7 +2999,7 @@ ROM_START( ts2j ) ROM_REGION32_LE( 0x80000, "countryrom", 0 ) ROM_LOAD( "ts2j_04.2h", 0x0000000, 0x080000, CRC(4aba8c5e) SHA1(a56001bf50bfc1b03036e88ae1febd1aac8c63c0) ) - ROM_REGION32_LE( 0x2400000, "maskroms", 0 ) + ROM_REGION32_LE( 0x2400000, "bankedroms", 0 ) ROM_LOAD( "ts2-05m.3h", 0x0000000, 0x400000, CRC(7f4228e2) SHA1(3690a76d19d97e55bc7b05a8456328697cfd7a77) ) ROM_LOAD( "ts2-06m", 0x0400000, 0x400000, CRC(cd7e0a27) SHA1(325b5f2e653cdea07cddc9d20d12b5ab50dca949) ) ROM_LOAD( "ts2-08m", 0x0800000, 0x400000, CRC(b1f7f115) SHA1(3f416d2aac07aa73a99593b5a21b047da60cea6a) ) @@ -2924,7 +3022,7 @@ ROM_START( starglad ) ROM_REGION32_LE( 0x80000, "countryrom", 0 ) ROM_LOAD( "ps1u_04.2h", 0x0000000, 0x080000, CRC(121fb234) SHA1(697d18d37afd95f302b40a5a6a78d8c92a41ea73) ) - ROM_REGION32_LE( 0x2400000, "maskroms", 0 ) + ROM_REGION32_LE( 0x2400000, "bankedroms", 0 ) ROM_LOAD( "ps1-05m.3h", 0x0000000, 0x400000, CRC(8ad72c4f) SHA1(c848c37eb5365000b4d4720b5c08d89ddd8e2c33) ) ROM_LOAD( "ps1-06m.4h", 0x0400000, 0x400000, CRC(95d8ed61) SHA1(e9f259d589dc38a8321a6fea1f5dac741cadc0ff) ) ROM_LOAD( "ps1-07m.5h", 0x0800000, 0x400000, CRC(c06752db) SHA1(0884b308e9cd9dde8660b422bc8fec9a362bcb52) ) @@ -2950,7 +3048,7 @@ ROM_START( stargladj ) ROM_REGION32_LE( 0x80000, "countryrom", 0 ) ROM_LOAD( "ps1j_04.2h", 0x0000000, 0x080000, CRC(f865006d) SHA1(6abb476777a4309b1a60f12e6313c051db195808) ) - ROM_REGION32_LE( 0x2400000, "maskroms", 0 ) + ROM_REGION32_LE( 0x2400000, "bankedroms", 0 ) ROM_LOAD( "ps1-05m.3h", 0x0000000, 0x400000, CRC(8ad72c4f) SHA1(c848c37eb5365000b4d4720b5c08d89ddd8e2c33) ) ROM_LOAD( "ps1-06m.4h", 0x0400000, 0x400000, CRC(95d8ed61) SHA1(e9f259d589dc38a8321a6fea1f5dac741cadc0ff) ) ROM_LOAD( "ps1-07m.5h", 0x0800000, 0x400000, CRC(c06752db) SHA1(0884b308e9cd9dde8660b422bc8fec9a362bcb52) ) @@ -2991,7 +3089,7 @@ ROM_START( glpracr ) ROM_REGION32_LE( 0x80000, "countryrom", 0 ) ROM_LOAD( "gra_ep-eng.2h", 0x0000000, 0x080000, CRC(f3ab9c85) SHA1(ce9d5d0406a6854975d5c71935fe917706334429) ) - ROM_REGION32_LE( 0x2400000, "maskroms", 0 ) + ROM_REGION32_LE( 0x2400000, "bankedroms", 0 ) ROM_LOAD( "gra-05m.3h", 0x0000000, 0x400000, CRC(78053700) SHA1(38727c8cc34bb57b7b7e73041e382fb0361f184e) ) ROM_LOAD( "gra-06m.4h", 0x0400000, 0x400000, CRC(d73b392b) SHA1(241ddf474cea035e81a2abc580d3c0395ee925bb) ) ROM_LOAD( "gra-07m.5h", 0x0800000, 0x400000, CRC(acaefe3a) SHA1(32d596b0f975e1558fa7929c3166d8dad40a1c80) ) @@ -3013,7 +3111,7 @@ ROM_START( glpracrj ) ROM_REGION32_LE( 0x80000, "countryrom", 0 ) ROM_LOAD( "gpaj_04.2h", 0x0000000, 0x080000, CRC(53bf551c) SHA1(320632b5010630cee4c5ccb1578d5ee6d2754632) ) - ROM_REGION32_LE( 0x2400000, "maskroms", 0 ) + ROM_REGION32_LE( 0x2400000, "bankedroms", 0 ) ROM_LOAD( "gra-05m.3h", 0x0000000, 0x400000, CRC(78053700) SHA1(38727c8cc34bb57b7b7e73041e382fb0361f184e) ) ROM_LOAD( "gra-06m.4h", 0x0400000, 0x400000, CRC(d73b392b) SHA1(241ddf474cea035e81a2abc580d3c0395ee925bb) ) ROM_LOAD( "gra-07m.5h", 0x0800000, 0x400000, CRC(acaefe3a) SHA1(32d596b0f975e1558fa7929c3166d8dad40a1c80) ) @@ -3035,7 +3133,7 @@ ROM_START( sfex ) ROM_REGION32_LE( 0x80000, "countryrom", 0 ) ROM_LOAD( "sfee_04a.2h", 0x0000000, 0x080000, CRC(092cfa2e) SHA1(8af38a3f4f89f661233995a672faf486e71b79bc) ) - ROM_REGION32_LE( 0x2400000, "maskroms", 0 ) + ROM_REGION32_LE( 0x2400000, "bankedroms", 0 ) ROM_LOAD( "sfe-05m.3h", 0x0000000, 0x400000, CRC(eab781fe) SHA1(205476cb72c8dac915e140fb32243dfc5d209ba4) ) ROM_LOAD( "sfe-06m.4h", 0x0400000, 0x400000, CRC(999de60c) SHA1(092882698c411fc5c3bcb43105bf1886f94b8e40) ) ROM_LOAD( "sfe-07m.5h", 0x0800000, 0x400000, CRC(76117b0a) SHA1(027233199170fa6e5b32f28da2031638c6d3d14a) ) @@ -3061,7 +3159,7 @@ ROM_START( sfexu ) ROM_REGION32_LE( 0x80000, "countryrom", 0 ) ROM_LOAD( "sfeu_04b.2h", 0x0000000, 0x080000, CRC(de02bd29) SHA1(62a88a30f73db661f5b98fc7e2d34d51acb965cc) ) - ROM_REGION32_LE( 0x2400000, "maskroms", 0 ) + ROM_REGION32_LE( 0x2400000, "bankedroms", 0 ) ROM_LOAD( "sfe-05m.3h", 0x0000000, 0x400000, CRC(eab781fe) SHA1(205476cb72c8dac915e140fb32243dfc5d209ba4) ) ROM_LOAD( "sfe-06m.4h", 0x0400000, 0x400000, CRC(999de60c) SHA1(092882698c411fc5c3bcb43105bf1886f94b8e40) ) ROM_LOAD( "sfe-07m.5h", 0x0800000, 0x400000, CRC(76117b0a) SHA1(027233199170fa6e5b32f28da2031638c6d3d14a) ) @@ -3087,7 +3185,7 @@ ROM_START( sfexa ) ROM_REGION32_LE( 0x80000, "countryrom", 0 ) ROM_LOAD( "sfea_04a.2h", 0x0000000, 0x080000, CRC(08247bd4) SHA1(07f356ef2827b3fbd0bfaf2010915315d9d60ef1) ) // could be sfea_04.2h - ROM_REGION32_LE( 0x2400000, "maskroms", 0 ) + ROM_REGION32_LE( 0x2400000, "bankedroms", 0 ) ROM_LOAD( "sfe-05m.3h", 0x0000000, 0x400000, CRC(eab781fe) SHA1(205476cb72c8dac915e140fb32243dfc5d209ba4) ) ROM_LOAD( "sfe-06m.4h", 0x0400000, 0x400000, CRC(999de60c) SHA1(092882698c411fc5c3bcb43105bf1886f94b8e40) ) ROM_LOAD( "sfe-07m.5h", 0x0800000, 0x400000, CRC(76117b0a) SHA1(027233199170fa6e5b32f28da2031638c6d3d14a) ) @@ -3113,7 +3211,7 @@ ROM_START( sfexj ) ROM_REGION32_LE( 0x80000, "countryrom", 0 ) ROM_LOAD( "sfej_04.2h", 0x0000000, 0x080000, CRC(ea100607) SHA1(27ef8c619804999d32d14fcc5ec783c057b4dc73) ) - ROM_REGION32_LE( 0x2400000, "maskroms", 0 ) + ROM_REGION32_LE( 0x2400000, "bankedroms", 0 ) ROM_LOAD( "sfe-05m.3h", 0x0000000, 0x400000, CRC(eab781fe) SHA1(205476cb72c8dac915e140fb32243dfc5d209ba4) ) ROM_LOAD( "sfe-06m.4h", 0x0400000, 0x400000, CRC(999de60c) SHA1(092882698c411fc5c3bcb43105bf1886f94b8e40) ) ROM_LOAD( "sfe-07m.5h", 0x0800000, 0x400000, CRC(76117b0a) SHA1(027233199170fa6e5b32f28da2031638c6d3d14a) ) @@ -3139,7 +3237,7 @@ ROM_START( sfexp ) ROM_REGION32_LE( 0x80000, "countryrom", 0 ) ROM_LOAD( "sfpu_04a.2h", 0x0000000, 0x080000, CRC(4617adc2) SHA1(200307904349ad7e5d7d76d8c904b6b10424c7ef) ) - ROM_REGION32_LE( 0x2400000, "maskroms", 0 ) + ROM_REGION32_LE( 0x2400000, "bankedroms", 0 ) ROM_LOAD( "sfp-05m.3h", 0x0000000, 0x400000, CRC(ac7dcc5e) SHA1(216de2de691a9bd7982d5d6b5b1e3e35ff381a2f) ) ROM_LOAD( "sfp-06m.4h", 0x0400000, 0x400000, CRC(1d504758) SHA1(bd56141aba35dbb5b318445ba5db12eff7442221) ) ROM_LOAD( "sfp-07m.5h", 0x0800000, 0x400000, CRC(0f585f30) SHA1(24ffdbc360f8eddb702905c99d315614327861a7) ) @@ -3165,7 +3263,7 @@ ROM_START( sfexpu1 ) ROM_REGION32_LE( 0x80000, "countryrom", 0 ) ROM_LOAD( "sfpu_04.2h", 0x0000000, 0x080000, CRC(305e4ec0) SHA1(0df9572d7fc1bbc7131483960771d016fa5487a5) ) - ROM_REGION32_LE( 0x2400000, "maskroms", 0 ) + ROM_REGION32_LE( 0x2400000, "bankedroms", 0 ) ROM_LOAD( "sfp-05m.3h", 0x0000000, 0x400000, CRC(ac7dcc5e) SHA1(216de2de691a9bd7982d5d6b5b1e3e35ff381a2f) ) ROM_LOAD( "sfp-06m.4h", 0x0400000, 0x400000, CRC(1d504758) SHA1(bd56141aba35dbb5b318445ba5db12eff7442221) ) ROM_LOAD( "sfp-07m.5h", 0x0800000, 0x400000, CRC(0f585f30) SHA1(24ffdbc360f8eddb702905c99d315614327861a7) ) @@ -3191,7 +3289,7 @@ ROM_START( sfexpj ) ROM_REGION32_LE( 0x80000, "countryrom", 0 ) ROM_LOAD( "sfpj_04a.2h", 0x0000000, 0x080000, CRC(6e99a0f7) SHA1(8f22bc545dd0e3eff24ab62ce5af1998d48d3770) ) - ROM_REGION32_LE( 0x2400000, "maskroms", 0 ) + ROM_REGION32_LE( 0x2400000, "bankedroms", 0 ) ROM_LOAD( "sfp-05m.3h", 0x0000000, 0x400000, CRC(ac7dcc5e) SHA1(216de2de691a9bd7982d5d6b5b1e3e35ff381a2f) ) ROM_LOAD( "sfp-06m.4h", 0x0400000, 0x400000, CRC(1d504758) SHA1(bd56141aba35dbb5b318445ba5db12eff7442221) ) ROM_LOAD( "sfp-07m.5h", 0x0800000, 0x400000, CRC(0f585f30) SHA1(24ffdbc360f8eddb702905c99d315614327861a7) ) @@ -3217,7 +3315,7 @@ ROM_START( sfexpj1 ) ROM_REGION32_LE( 0x80000, "countryrom", 0 ) ROM_LOAD( "sfpj_04.2h", 0x0000000, 0x080000, CRC(18d043f5) SHA1(9e6e24a722d13888fbfd391ddb1a5045b162488c) ) - ROM_REGION32_LE( 0x2400000, "maskroms", 0 ) + ROM_REGION32_LE( 0x2400000, "bankedroms", 0 ) ROM_LOAD( "sfp-05m.3h", 0x0000000, 0x400000, CRC(ac7dcc5e) SHA1(216de2de691a9bd7982d5d6b5b1e3e35ff381a2f) ) ROM_LOAD( "sfp-06m.4h", 0x0400000, 0x400000, CRC(1d504758) SHA1(bd56141aba35dbb5b318445ba5db12eff7442221) ) ROM_LOAD( "sfp-07m.5h", 0x0800000, 0x400000, CRC(0f585f30) SHA1(24ffdbc360f8eddb702905c99d315614327861a7) ) @@ -3250,7 +3348,7 @@ ROM_START( coh3002c ) CPZN2_BIOS ROM_REGION32_LE( 0x80000, "countryrom", ROMREGION_ERASE00 ) - ROM_REGION32_LE( 0x3000000, "maskroms", ROMREGION_ERASE00 ) + ROM_REGION32_LE( 0x3000000, "bankedroms", ROMREGION_ERASE00 ) ROM_REGION( 0x40000, "audiocpu", ROMREGION_ERASE00 ) ROM_REGION( 0x400000, "qsound", ROMREGION_ERASE00 ) ROM_REGION( 0x8, "cat702_2", 0 ) ROM_COPY( "cat702_1", 0x0, 0x0, 0x8 ) @@ -3263,7 +3361,7 @@ ROM_START( rvschool ) ROM_REGION32_LE( 0x80000, "countryrom", 0 ) ROM_LOAD( "jste_04.2h", 0x0000000, 0x080000, CRC(1567555a) SHA1(3b93235076ab3c06914c83becf0da8e810b8917a) ) - ROM_REGION32_LE( 0x3000000, "maskroms", 0 ) + ROM_REGION32_LE( 0x3000000, "bankedroms", 0 ) ROM_LOAD( "jst-05m.3h", 0x0000000, 0x400000, CRC(723372b8) SHA1(2a7c95d1f9a3f58c469dfc28ead1fd192eaaebd1) ) ROM_LOAD( "jst-06m.4h", 0x0400000, 0x400000, CRC(4248988e) SHA1(4bdf7cac17d70ea85aa2002fc6b21a64d05e6e5a) ) ROM_LOAD( "jst-07m.5h", 0x0800000, 0x400000, CRC(c84c5a16) SHA1(5c0ca7454189c766f1ca7305504ff1867007c8e6) ) @@ -3292,7 +3390,7 @@ ROM_START( rvschoolu ) ROM_REGION32_LE( 0x80000, "countryrom", 0 ) ROM_LOAD( "jstu_04.2h", 0x0000000, 0x080000, CRC(d83724ae) SHA1(0890c0164116606acc600f646e82972d0d4f79b4) ) - ROM_REGION32_LE( 0x3000000, "maskroms", 0 ) + ROM_REGION32_LE( 0x3000000, "bankedroms", 0 ) ROM_LOAD( "jst-05m.3h", 0x0000000, 0x400000, CRC(723372b8) SHA1(2a7c95d1f9a3f58c469dfc28ead1fd192eaaebd1) ) ROM_LOAD( "jst-06m.4h", 0x0400000, 0x400000, CRC(4248988e) SHA1(4bdf7cac17d70ea85aa2002fc6b21a64d05e6e5a) ) ROM_LOAD( "jst-07m.5h", 0x0800000, 0x400000, CRC(c84c5a16) SHA1(5c0ca7454189c766f1ca7305504ff1867007c8e6) ) @@ -3321,7 +3419,7 @@ ROM_START( rvschoola ) ROM_REGION32_LE( 0x80000, "countryrom", 0 ) ROM_LOAD( "jsta_04.2h", 0x0000000, 0x080000, CRC(034b1011) SHA1(6773246be242ee336503d21d7d44a3884832eb1e) ) - ROM_REGION32_LE( 0x3000000, "maskroms", 0 ) + ROM_REGION32_LE( 0x3000000, "bankedroms", 0 ) ROM_LOAD( "jst-05m.3h", 0x0000000, 0x400000, CRC(723372b8) SHA1(2a7c95d1f9a3f58c469dfc28ead1fd192eaaebd1) ) ROM_LOAD( "jst-06m.4h", 0x0400000, 0x400000, CRC(4248988e) SHA1(4bdf7cac17d70ea85aa2002fc6b21a64d05e6e5a) ) ROM_LOAD( "jst-07m.5h", 0x0800000, 0x400000, CRC(c84c5a16) SHA1(5c0ca7454189c766f1ca7305504ff1867007c8e6) ) @@ -3350,7 +3448,7 @@ ROM_START( jgakuen ) ROM_REGION32_LE( 0x80000, "countryrom", 0 ) ROM_LOAD( "jstj_04a.2h", 0x0000000, 0x080000, CRC(91b36f38) SHA1(423dbf0f9f08458a866e9acb2a5b657c736b179f) ) - ROM_REGION32_LE( 0x3000000, "maskroms", 0 ) + ROM_REGION32_LE( 0x3000000, "bankedroms", 0 ) ROM_LOAD( "jst-05m.3h", 0x0000000, 0x400000, CRC(723372b8) SHA1(2a7c95d1f9a3f58c469dfc28ead1fd192eaaebd1) ) ROM_LOAD( "jst-06m.4h", 0x0400000, 0x400000, CRC(4248988e) SHA1(4bdf7cac17d70ea85aa2002fc6b21a64d05e6e5a) ) ROM_LOAD( "jst-07m.5h", 0x0800000, 0x400000, CRC(c84c5a16) SHA1(5c0ca7454189c766f1ca7305504ff1867007c8e6) ) @@ -3379,7 +3477,7 @@ ROM_START( jgakuen1 ) ROM_REGION32_LE( 0x80000, "countryrom", 0 ) ROM_LOAD( "jstj_04.2h", 0x0000000, 0x080000, CRC(28b8000a) SHA1(9ebf74b453d775cadca9c2d7d8e2c7eb57bb9a38) ) - ROM_REGION32_LE( 0x3000000, "maskroms", 0 ) + ROM_REGION32_LE( 0x3000000, "bankedroms", 0 ) ROM_LOAD( "jst-05m.3h", 0x0000000, 0x400000, CRC(723372b8) SHA1(2a7c95d1f9a3f58c469dfc28ead1fd192eaaebd1) ) ROM_LOAD( "jst-06m.4h", 0x0400000, 0x400000, CRC(4248988e) SHA1(4bdf7cac17d70ea85aa2002fc6b21a64d05e6e5a) ) ROM_LOAD( "jst-07m.5h", 0x0800000, 0x400000, CRC(c84c5a16) SHA1(5c0ca7454189c766f1ca7305504ff1867007c8e6) ) @@ -3414,7 +3512,7 @@ ROM_START( sfex2 ) ROM_REGION32_LE( 0x80000, "countryrom", 0 ) ROM_LOAD( "ex2u_04a.2h", 0x0000000, 0x080000, CRC(8dc5317f) SHA1(c35224caf70662a0e45a74cbead294a51f9b9e16) ) - ROM_REGION32_LE( 0x3000000, "maskroms", 0 ) + ROM_REGION32_LE( 0x3000000, "bankedroms", 0 ) ROM_LOAD( "ex2-05m.3h", 0x0000000, 0x800000, CRC(78726b17) SHA1(2da449df335ef133ebc3997bbad73ef4137f4771) ) ROM_LOAD( "ex2-06m.4h", 0x0800000, 0x800000, CRC(be1075ed) SHA1(36dc673372f30f8b3ff5689ae568c5cd01fe2c07) ) ROM_LOAD( "ex2-07m.5h", 0x1000000, 0x800000, CRC(6496c6ed) SHA1(054bcecbb04033abea14d9ffe6634b2bd11ca88b) ) @@ -3438,7 +3536,7 @@ ROM_START( sfex2u1 ) ROM_REGION32_LE( 0x80000, "countryrom", 0 ) ROM_LOAD( "ex2u_04.2h", 0x0000000, 0x080000, CRC(eb417c2c) SHA1(bd47d0a1d911af4457c795ec348c847c2cf9e721) ) - ROM_REGION32_LE( 0x3000000, "maskroms", 0 ) + ROM_REGION32_LE( 0x3000000, "bankedroms", 0 ) ROM_LOAD( "ex2-05m.3h", 0x0000000, 0x800000, CRC(78726b17) SHA1(2da449df335ef133ebc3997bbad73ef4137f4771) ) ROM_LOAD( "ex2-06m.4h", 0x0800000, 0x800000, CRC(be1075ed) SHA1(36dc673372f30f8b3ff5689ae568c5cd01fe2c07) ) ROM_LOAD( "ex2-07m.5h", 0x1000000, 0x800000, CRC(6496c6ed) SHA1(054bcecbb04033abea14d9ffe6634b2bd11ca88b) ) @@ -3462,7 +3560,7 @@ ROM_START( sfex2a ) ROM_REGION32_LE( 0x80000, "countryrom", 0 ) ROM_LOAD( "ex2a_04.2h", 0x0000000, 0x080000, CRC(ac9a872d) SHA1(4e237f5e2e5de58e587e9abc5767509b8d750004) ) - ROM_REGION32_LE( 0x3000000, "maskroms", 0 ) + ROM_REGION32_LE( 0x3000000, "bankedroms", 0 ) ROM_LOAD( "ex2-05m.3h", 0x0000000, 0x800000, CRC(78726b17) SHA1(2da449df335ef133ebc3997bbad73ef4137f4771) ) ROM_LOAD( "ex2-06m.4h", 0x0800000, 0x800000, CRC(be1075ed) SHA1(36dc673372f30f8b3ff5689ae568c5cd01fe2c07) ) ROM_LOAD( "ex2-07m.5h", 0x1000000, 0x800000, CRC(6496c6ed) SHA1(054bcecbb04033abea14d9ffe6634b2bd11ca88b) ) @@ -3486,7 +3584,7 @@ ROM_START( sfex2h ) ROM_REGION32_LE( 0x80000, "countryrom", 0 ) ROM_LOAD( "ex2h_04.2h", 0x0000000, 0x080000, CRC(68f2ef80) SHA1(212bb3c0d935c64f5e3b20e427e06d97404709d8) ) - ROM_REGION32_LE( 0x3000000, "maskroms", 0 ) + ROM_REGION32_LE( 0x3000000, "bankedroms", 0 ) ROM_LOAD( "ex2-05m.3h", 0x0000000, 0x800000, CRC(78726b17) SHA1(2da449df335ef133ebc3997bbad73ef4137f4771) ) ROM_LOAD( "ex2-06m.4h", 0x0800000, 0x800000, CRC(be1075ed) SHA1(36dc673372f30f8b3ff5689ae568c5cd01fe2c07) ) ROM_LOAD( "ex2-07m.5h", 0x1000000, 0x800000, CRC(6496c6ed) SHA1(054bcecbb04033abea14d9ffe6634b2bd11ca88b) ) @@ -3510,7 +3608,7 @@ ROM_START( sfex2j ) ROM_REGION32_LE( 0x80000, "countryrom", 0 ) ROM_LOAD( "ex2j_04.2h", 0x0000000, 0x080000, CRC(5d603586) SHA1(ff546d3bd011d6441e9672b88bab763d3cd89be2) ) - ROM_REGION32_LE( 0x3000000, "maskroms", 0 ) + ROM_REGION32_LE( 0x3000000, "bankedroms", 0 ) ROM_LOAD( "ex2-05m.3h", 0x0000000, 0x800000, CRC(78726b17) SHA1(2da449df335ef133ebc3997bbad73ef4137f4771) ) ROM_LOAD( "ex2-06m.4h", 0x0800000, 0x800000, CRC(be1075ed) SHA1(36dc673372f30f8b3ff5689ae568c5cd01fe2c07) ) ROM_LOAD( "ex2-07m.5h", 0x1000000, 0x800000, CRC(6496c6ed) SHA1(054bcecbb04033abea14d9ffe6634b2bd11ca88b) ) @@ -3534,7 +3632,7 @@ ROM_START( plsmaswd ) ROM_REGION32_LE( 0x80000, "countryrom", 0 ) ROM_LOAD( "sg2u_04.2h", 0x0000000, 0x080000, CRC(154187c0) SHA1(58cc0e9d32786b1c1d64ecee4667190456b36ef6) ) - ROM_REGION32_LE( 0x3000000, "maskroms", 0 ) + ROM_REGION32_LE( 0x3000000, "bankedroms", 0 ) ROM_LOAD( "sg2-05m.3h", 0x0000000, 0x800000, CRC(f1759236) SHA1(fbe3a820a8c571dfb186eae68346e6461168ed48) ) ROM_LOAD( "sg2-06m.4h", 0x0800000, 0x800000, CRC(33de4f72) SHA1(ab32af76b5682e3d9f67dadbaed35abc043912b4) ) ROM_LOAD( "sg2-07m.5h", 0x1000000, 0x800000, CRC(72f724ba) SHA1(e6658b495d308d1de6710f87b5b9d346008b0c5a) ) @@ -3559,7 +3657,7 @@ ROM_START( plsmaswda ) ROM_REGION32_LE( 0x80000, "countryrom", 0 ) ROM_LOAD( "sg2a_04.2h", 0x0000000, 0x080000, CRC(66e5dada) SHA1(f2e50ee963b8a6aadf25a17b3ff6dcb428b8bdb2) ) - ROM_REGION32_LE( 0x3000000, "maskroms", 0 ) + ROM_REGION32_LE( 0x3000000, "bankedroms", 0 ) ROM_LOAD( "sg2-05m.3h", 0x0000000, 0x800000, CRC(f1759236) SHA1(fbe3a820a8c571dfb186eae68346e6461168ed48) ) ROM_LOAD( "sg2-06m.4h", 0x0800000, 0x800000, CRC(33de4f72) SHA1(ab32af76b5682e3d9f67dadbaed35abc043912b4) ) ROM_LOAD( "sg2-07m.5h", 0x1000000, 0x800000, CRC(72f724ba) SHA1(e6658b495d308d1de6710f87b5b9d346008b0c5a) ) @@ -3584,7 +3682,7 @@ ROM_START( stargld2 ) ROM_REGION32_LE( 0x80000, "countryrom", 0 ) ROM_LOAD( "sg2j_04.2h", 0x0000000, 0x080000, CRC(cf4ce6ac) SHA1(52b6f61d79671c9c108b3dfbd3c2ac333285412c) ) - ROM_REGION32_LE( 0x3000000, "maskroms", 0 ) + ROM_REGION32_LE( 0x3000000, "bankedroms", 0 ) ROM_LOAD( "sg2-05m.3h", 0x0000000, 0x800000, CRC(f1759236) SHA1(fbe3a820a8c571dfb186eae68346e6461168ed48) ) ROM_LOAD( "sg2-06m.4h", 0x0800000, 0x800000, CRC(33de4f72) SHA1(ab32af76b5682e3d9f67dadbaed35abc043912b4) ) ROM_LOAD( "sg2-07m.5h", 0x1000000, 0x800000, CRC(72f724ba) SHA1(e6658b495d308d1de6710f87b5b9d346008b0c5a) ) @@ -3609,7 +3707,7 @@ ROM_START( tgmj ) ROM_REGION32_LE( 0x80000, "countryrom", 0 ) ROM_LOAD( "atej_04.2h", 0x0000000, 0x080000, CRC(bb4bbb96) SHA1(808f4b29493e74efd661d561d11cbec2f4afd1c8) ) - ROM_REGION32_LE( 0x3000000, "maskroms", 0 ) + ROM_REGION32_LE( 0x3000000, "bankedroms", 0 ) ROM_LOAD( "ate-05m.3h", 0x0000000, 0x400000, CRC(50977f5a) SHA1(78c2b1965957ff1756c25b76e549f11fc0001153) ) ROM_LOAD( "ate-06m.4h", 0x0400000, 0x400000, CRC(05973f16) SHA1(c9262e8de14c4a9489f7050316012913c1caf0ff) ) @@ -3630,7 +3728,7 @@ ROM_START( techromn ) ROM_REGION32_LE( 0x80000, "countryrom", 0 ) ROM_LOAD( "kioe_04.2h", 0x0000000, 0x080000, CRC(ebd33b09) SHA1(3f0226d275efc7b97c8d3431211f948aa1271d34) ) - ROM_REGION32_LE( 0x3000000, "maskroms", 0 ) + ROM_REGION32_LE( 0x3000000, "bankedroms", 0 ) ROM_LOAD( "kio-05m.3h", 0x0000000, 0x800000, CRC(98e9eb24) SHA1(144773296c213ab09d626c915f90bb74e24487f0) ) ROM_LOAD( "kio-06m.4h", 0x0800000, 0x800000, CRC(be8d7d73) SHA1(bcbbbd0b83503f2ed32527444e0da3afd774d3f7) ) ROM_LOAD( "kio-07m.5h", 0x1000000, 0x800000, CRC(ffd81f18) SHA1(f8387a9d45e79f97ccdffabe755638a60f80ccf5) ) @@ -3656,7 +3754,7 @@ ROM_START( techromnu ) ROM_REGION32_LE( 0x80000, "countryrom", 0 ) ROM_LOAD( "kiou_04.2h", 0x0000000, 0x080000, CRC(08aca34a) SHA1(768a37f719af5d96993db5592b6505b013e0d6f4) ) - ROM_REGION32_LE( 0x3000000, "maskroms", 0 ) + ROM_REGION32_LE( 0x3000000, "bankedroms", 0 ) ROM_LOAD( "kio-05m.3h", 0x0000000, 0x800000, CRC(98e9eb24) SHA1(144773296c213ab09d626c915f90bb74e24487f0) ) ROM_LOAD( "kio-06m.4h", 0x0800000, 0x800000, CRC(be8d7d73) SHA1(bcbbbd0b83503f2ed32527444e0da3afd774d3f7) ) ROM_LOAD( "kio-07m.5h", 0x1000000, 0x800000, CRC(ffd81f18) SHA1(f8387a9d45e79f97ccdffabe755638a60f80ccf5) ) @@ -3682,7 +3780,7 @@ ROM_START( kikaioh ) ROM_REGION32_LE( 0x80000, "countryrom", 0 ) ROM_LOAD( "kioj_04.2h", 0x0000000, 0x080000, CRC(3a2a3bc8) SHA1(3c4ae3cfe00a7f60ab2196ae042dab4a8eb6f597) ) - ROM_REGION32_LE( 0x3000000, "maskroms", 0 ) + ROM_REGION32_LE( 0x3000000, "bankedroms", 0 ) ROM_LOAD( "kio-05m.3h", 0x0000000, 0x800000, CRC(98e9eb24) SHA1(144773296c213ab09d626c915f90bb74e24487f0) ) ROM_LOAD( "kio-06m.4h", 0x0800000, 0x800000, CRC(be8d7d73) SHA1(bcbbbd0b83503f2ed32527444e0da3afd774d3f7) ) ROM_LOAD( "kio-07m.5h", 0x1000000, 0x800000, CRC(ffd81f18) SHA1(f8387a9d45e79f97ccdffabe755638a60f80ccf5) ) @@ -3708,7 +3806,7 @@ ROM_START( sfex2p ) ROM_REGION32_LE( 0x80000, "countryrom", 0 ) ROM_LOAD( "x2pu_04.2h", 0x0000000, 0x080000, CRC(2938118c) SHA1(4bdeeb9aa3dd54ef44aa3fc73d78d65297b1ed25) ) - ROM_REGION32_LE( 0x3000000, "maskroms", 0 ) + ROM_REGION32_LE( 0x3000000, "bankedroms", 0 ) ROM_LOAD( "x2p-05m.3h", 0x0000000, 0x800000, CRC(4ee3110f) SHA1(704f8dca7d0b698659af9e3271ea5072dfd42b8b) ) ROM_LOAD( "x2p-06m.4h", 0x0800000, 0x800000, CRC(4cd53a45) SHA1(39499ea6c9aa51c71f4fe44cc02f93d5a39e14ec) ) ROM_LOAD( "x2p-07m.5h", 0x1000000, 0x800000, CRC(11207c2a) SHA1(0182652819f1c3a36e7b42e34ef86d2455a2dd90) ) @@ -3734,7 +3832,7 @@ ROM_START( sfex2pa ) ROM_REGION32_LE( 0x80000, "countryrom", 0 ) ROM_LOAD( "x2pa_04.2h", 0x0000000, 0x080000, CRC(c437d602) SHA1(150f0dfd9f2e4f9adc11f8960da1e6be250456b1) ) - ROM_REGION32_LE( 0x3000000, "maskroms", 0 ) + ROM_REGION32_LE( 0x3000000, "bankedroms", 0 ) ROM_LOAD( "x2p-05m.3h", 0x0000000, 0x800000, CRC(4ee3110f) SHA1(704f8dca7d0b698659af9e3271ea5072dfd42b8b) ) ROM_LOAD( "x2p-06m.4h", 0x0800000, 0x800000, CRC(4cd53a45) SHA1(39499ea6c9aa51c71f4fe44cc02f93d5a39e14ec) ) ROM_LOAD( "x2p-07m.5h", 0x1000000, 0x800000, CRC(11207c2a) SHA1(0182652819f1c3a36e7b42e34ef86d2455a2dd90) ) @@ -3760,7 +3858,7 @@ ROM_START( sfex2ph ) ROM_REGION32_LE( 0x80000, "countryrom", 0 ) ROM_LOAD( "x2ph_04.2h", 0x0000000, 0x080000, CRC(a4f07439) SHA1(630be537062134da2d01866b9587e5c119c198bb) ) - ROM_REGION32_LE( 0x3000000, "maskroms", 0 ) + ROM_REGION32_LE( 0x3000000, "bankedroms", 0 ) ROM_LOAD( "x2p-05m.3h", 0x0000000, 0x800000, CRC(4ee3110f) SHA1(704f8dca7d0b698659af9e3271ea5072dfd42b8b) ) ROM_LOAD( "x2p-06m.4h", 0x0800000, 0x800000, CRC(4cd53a45) SHA1(39499ea6c9aa51c71f4fe44cc02f93d5a39e14ec) ) ROM_LOAD( "x2p-07m.5h", 0x1000000, 0x800000, CRC(11207c2a) SHA1(0182652819f1c3a36e7b42e34ef86d2455a2dd90) ) @@ -3786,7 +3884,7 @@ ROM_START( sfex2pj ) ROM_REGION32_LE( 0x80000, "countryrom", 0 ) ROM_LOAD( "x2pj_04.2h", 0x0000000, 0x080000, CRC(c6d0aea3) SHA1(f48ee889dd743109f830063da3eb0f687db2d86c) ) - ROM_REGION32_LE( 0x3000000, "maskroms", 0 ) + ROM_REGION32_LE( 0x3000000, "bankedroms", 0 ) ROM_LOAD( "x2p-05m.3h", 0x0000000, 0x800000, CRC(4ee3110f) SHA1(704f8dca7d0b698659af9e3271ea5072dfd42b8b) ) ROM_LOAD( "x2p-06m.4h", 0x0800000, 0x800000, CRC(4cd53a45) SHA1(39499ea6c9aa51c71f4fe44cc02f93d5a39e14ec) ) ROM_LOAD( "x2p-07m.5h", 0x1000000, 0x800000, CRC(11207c2a) SHA1(0182652819f1c3a36e7b42e34ef86d2455a2dd90) ) @@ -3812,7 +3910,7 @@ ROM_START( strider2 ) ROM_REGION32_LE( 0x80000, "countryrom", 0 ) ROM_LOAD( "hr2u_04.2h", 0x0000000, 0x080000, CRC(b28b01c6) SHA1(ad40f550ce14f09cf34d51b9b0b7154c31c8936e) ) - ROM_REGION32_LE( 0x3000000, "maskroms", 0 ) + ROM_REGION32_LE( 0x3000000, "bankedroms", 0 ) ROM_LOAD( "hr2-05m.3h", 0x0000000, 0x800000, CRC(18716fe8) SHA1(bb923f18120086054cd6fd91f77d27a190c1eed4) ) ROM_LOAD( "hr2-06m.4h", 0x0800000, 0x800000, CRC(6f13b69c) SHA1(9a14ecc72631bc44053af71fe7e3934bedf1a71e) ) ROM_LOAD( "hr2-07m.5h", 0x1000000, 0x800000, CRC(3925701b) SHA1(d93218d2b97cc0fc6c30221bd6b5e955520fbc46) ) @@ -3838,7 +3936,7 @@ ROM_START( strider2a ) ROM_REGION32_LE( 0x80000, "countryrom", 0 ) ROM_LOAD( "hr2a_04.2h", 0x0000000, 0x080000, CRC(56ff9394) SHA1(fe8417965d945210ac098c6678c02f1c678bd13b) ) - ROM_REGION32_LE( 0x3000000, "maskroms", 0 ) + ROM_REGION32_LE( 0x3000000, "bankedroms", 0 ) ROM_LOAD( "hr2-05m.3h", 0x0000000, 0x800000, CRC(18716fe8) SHA1(bb923f18120086054cd6fd91f77d27a190c1eed4) ) ROM_LOAD( "hr2-06m.4h", 0x0800000, 0x800000, CRC(6f13b69c) SHA1(9a14ecc72631bc44053af71fe7e3934bedf1a71e) ) ROM_LOAD( "hr2-07m.5h", 0x1000000, 0x800000, CRC(3925701b) SHA1(d93218d2b97cc0fc6c30221bd6b5e955520fbc46) ) @@ -3864,7 +3962,7 @@ ROM_START( shiryu2 ) ROM_REGION32_LE( 0x80000, "countryrom", 0 ) ROM_LOAD( "hr2j_04.2h", 0x0000000, 0x080000, CRC(0824ee5f) SHA1(a296ffe03f0d947deb9803d05de3c240a26b52bb) ) - ROM_REGION32_LE( 0x3000000, "maskroms", 0 ) + ROM_REGION32_LE( 0x3000000, "bankedroms", 0 ) ROM_LOAD( "hr2-05m.3h", 0x0000000, 0x800000, CRC(18716fe8) SHA1(bb923f18120086054cd6fd91f77d27a190c1eed4) ) ROM_LOAD( "hr2-06m.4h", 0x0800000, 0x800000, CRC(6f13b69c) SHA1(9a14ecc72631bc44053af71fe7e3934bedf1a71e) ) ROM_LOAD( "hr2-07m.5h", 0x1000000, 0x800000, CRC(3925701b) SHA1(d93218d2b97cc0fc6c30221bd6b5e955520fbc46) ) @@ -4102,7 +4200,7 @@ ROM_END ROM_START( flamegun ) TPS_BIOS - ROM_REGION32_LE( 0x03400000, "bankedroms", 0 ) + ROM_REGION32_LE( 0x03800000, "bankedroms", 0 ) ROM_LOAD16_BYTE( "flamegun.119", 0x0000001, 0x100000, CRC(bc8e9e29) SHA1(02e4f079f0ed864dbc056d5f64d33a0522c034fd) ) ROM_LOAD16_BYTE( "flamegun.120", 0x0000000, 0x100000, CRC(387f3070) SHA1(6b12765f1d3ec5f3d1cdfd961fba72a319d65ff4) ) ROM_LOAD( "fg00.216", 0x0400000, 0x400000, CRC(f33736ca) SHA1(7b18f9fef1df913b7ed3a2c97e9c4925790d86c5) ) @@ -4125,7 +4223,7 @@ ROM_END ROM_START( flamegunj ) TPS_BIOS - ROM_REGION32_LE( 0x03400000, "bankedroms", 0 ) + ROM_REGION32_LE( 0x03800000, "bankedroms", 0 ) ROM_LOAD16_BYTE( "fg_1.119", 0x0000001, 0x100000, CRC(1f2aa527) SHA1(de3a20d9aeb745fe82cd1d87bde26876e088483a) ) ROM_LOAD16_BYTE( "fg_2.120", 0x0000000, 0x100000, CRC(a2cd4cad) SHA1(bf542eeb6e768b3e86bacdc79ab04be394ce3e63) ) ROM_LOAD( "fg00.216", 0x0400000, 0x400000, CRC(f33736ca) SHA1(7b18f9fef1df913b7ed3a2c97e9c4925790d86c5) ) @@ -4148,7 +4246,7 @@ ROM_END ROM_START( lpadv ) TPS_BIOS - ROM_REGION32_LE( 0xc00000, "bankedroms", 0 ) + ROM_REGION32_LE( 0x1000000, "bankedroms", 0 ) ROM_LOAD16_BYTE( "lp_3.u0119", 0x000001, 0x100000, CRC(18cade44) SHA1(8a44156224c77c51f4f6ca61a0168e48dfcc6eda) ) ROM_LOAD16_BYTE( "lp_4.u0120", 0x000000, 0x100000, CRC(12fffc02) SHA1(3294b65e4a0bbf501785565dd0c1f36f9bcea969) ) ROM_LOAD( "rp00.u0216", 0x400000, 0x400000, CRC(d759d0d4) SHA1(47b009a5dfa81611276b1376bdab44dfad597e85) ) @@ -4781,9 +4879,9 @@ ROM_START( beastrzrb ) /* bootleg board */ ROM_REGION( 0x080000, "audiocpu", 0 ) /* http://www.atmel.com/dyn/products/product_card.asp?family_id=604&family_name=8051+Architecture&part_id=1939 */ - ROM_LOAD( "at89c4051", 0x000000, 0x001000, NO_DUMP ) /* cat 702 replacement or sound cpu? */ + ROM_LOAD( "at89c4051", 0x000000, 0x001000, NO_DUMP ) /* undumped internal ROM */ - ROM_REGION( 0x400000, "ymf", 0 ) + ROM_REGION( 0x180000, "oki", 0 ) ROM_LOAD( "27c4096.1", 0x000000, 0x080000, CRC(217734a1) SHA1(de4f519215123c09b3b5f27509b4d74604b5e03d) ) ROM_LOAD( "27c4096.2", 0x080000, 0x080000, CRC(d1f2a9b2) SHA1(d1475a453ce4e3b9f2ff59abedf0f57ba3c408fe) ) ROM_LOAD( "27c240.3", 0x100000, 0x080000, CRC(509cdc8b) SHA1(8b92b79be09de56e7d40c2d02fcbeca92bb60226) ) /* bad dump? (only contains 8k of data) */ @@ -5301,7 +5399,7 @@ GAME( 1997, gdarius2, coh1000t, coh1002tb, znt, zn_state, coh1000tb, ROT GAME( 1997, coh1002e, 0, coh1002e, znt, zn_state, 0, ROT0, "Eighting / Raizing", "PS Arcade 95", MACHINE_IS_BIOS_ROOT ) GAME( 1997, beastrzr, coh1002e, coh1002e, znt, zn_state, 0, ROT0, "Eighting / Raizing", "Beastorizer (USA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND ) GAME( 1997, bldyroar, beastrzr, coh1002e, znt, zn_state, 0, ROT0, "Eighting / Raizing", "Bloody Roar (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND ) -GAME( 1997, beastrzrb, beastrzr, coh1002e, znt, zn_state, 0, ROT0, "bootleg", "Beastorizer (USA bootleg)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) +GAME( 1997, beastrzrb, beastrzr, beastrzrb, znt, zn_state, 0, ROT0, "bootleg", "Beastorizer (USA bootleg)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* The region on these is determined from the NVRAM, it can't be changed from the test menu, it's pre-programmed */ GAME( 1998, bldyror2, coh1002e, coh1002e, bldyror2, zn_state, 0, ROT0, "Eighting / Raizing", "Bloody Roar 2 (World)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND ) // locks up if you coin up during the fmw with interlace enabled -- cgit v1.2.3