diff options
Diffstat (limited to 'src/mame/drivers/othunder.c')
-rw-r--r-- | src/mame/drivers/othunder.c | 36 |
1 files changed, 11 insertions, 25 deletions
diff --git a/src/mame/drivers/othunder.c b/src/mame/drivers/othunder.c index ec04fa72a3a..ea27c4c11cf 100644 --- a/src/mame/drivers/othunder.c +++ b/src/mame/drivers/othunder.c @@ -376,16 +376,9 @@ WRITE16_MEMBER(othunder_state::othunder_lightgun_w) SOUND *****************************************/ -void othunder_state::reset_sound_region() -{ - membank("bank10")->set_entry(m_banknum); -} - - WRITE8_MEMBER(othunder_state::sound_bankswitch_w) { - m_banknum = data & 7; - reset_sound_region(); + membank("z80bank")->set_entry(data & 3); } WRITE16_MEMBER(othunder_state::othunder_sound_w) @@ -457,7 +450,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( z80_sound_map, AS_PROGRAM, 8, othunder_state ) AM_RANGE(0x0000, 0x3fff) AM_ROM - AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank10") + AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("z80bank") AM_RANGE(0xc000, 0xdfff) AM_RAM AM_RANGE(0xe000, 0xe003) AM_DEVREADWRITE("ymsnd", ym2610_device, read, write) AM_RANGE(0xe200, 0xe200) AM_READNOP AM_DEVWRITE("tc0140syt", tc0140syt_device, slave_port_w) @@ -625,20 +618,17 @@ WRITE_LINE_MEMBER(othunder_state::irqhandler) void othunder_state::machine_start() { - membank("bank10")->configure_entries(0, 4, memregion("audiocpu")->base() + 0xc000, 0x4000); + membank("z80bank")->configure_entries(0, 4, memregion("audiocpu")->base(), 0x4000); save_item(NAME(m_vblank_irq)); save_item(NAME(m_ad_irq)); - save_item(NAME(m_banknum)); save_item(NAME(m_pan)); - machine().save().register_postload(save_prepost_delegate(FUNC(othunder_state::reset_sound_region), this)); } void othunder_state::machine_reset() { m_vblank_irq = 0; m_ad_irq = 0; - m_banknum = 0; } static MACHINE_CONFIG_START( othunder, othunder_state ) @@ -727,9 +717,8 @@ ROM_START( othunder ) ROM_LOAD16_BYTE( "b67-14.61", 0x40000, 0x20000, CRC(7f3dd724) SHA1(2f2eeae0ee31e20082237b9a947c6848771eb73c) ) ROM_LOAD16_BYTE( "b67-15.62", 0x40001, 0x20000, CRC(e84f62d0) SHA1(3b4a55a14dee7d592467fde9a75bde64deabd27d) ) - ROM_REGION( 0x1c000, "audiocpu", 0 ) /* sound cpu */ - ROM_LOAD( "b67-13.40", 0x00000, 0x04000, CRC(2936b4b1) SHA1(39b41643464dd89e456ab6eb15a0ff0aef30afde) ) - ROM_CONTINUE( 0x10000, 0x0c000 ) /* banked stuff */ + ROM_REGION( 0x10000, "audiocpu", 0 ) /* sound cpu */ + ROM_LOAD( "b67-13.40", 0x00000, 0x10000, CRC(2936b4b1) SHA1(39b41643464dd89e456ab6eb15a0ff0aef30afde) ) ROM_REGION( 0x80000, "gfx1", 0 ) ROM_LOAD( "b67-06.66", 0x00000, 0x80000, CRC(b9a38d64) SHA1(7ae8165b444d9da6ccdbc4a769535bcbb6738aaa) ) /* SCN */ @@ -766,9 +755,8 @@ ROM_START( othunderu ) ROM_LOAD16_BYTE( "b67-14.61", 0x40000, 0x20000, CRC(7f3dd724) SHA1(2f2eeae0ee31e20082237b9a947c6848771eb73c) ) ROM_LOAD16_BYTE( "b67-15.62", 0x40001, 0x20000, CRC(e84f62d0) SHA1(3b4a55a14dee7d592467fde9a75bde64deabd27d) ) - ROM_REGION( 0x1c000, "audiocpu", 0 ) /* sound cpu */ - ROM_LOAD( "b67-13.40", 0x00000, 0x04000, CRC(2936b4b1) SHA1(39b41643464dd89e456ab6eb15a0ff0aef30afde) ) - ROM_CONTINUE( 0x10000, 0x0c000 ) /* banked stuff */ + ROM_REGION( 0x10000, "audiocpu", 0 ) /* sound cpu */ + ROM_LOAD( "b67-13.40", 0x00000, 0x10000, CRC(2936b4b1) SHA1(39b41643464dd89e456ab6eb15a0ff0aef30afde) ) ROM_REGION( 0x80000, "gfx1", 0 ) ROM_LOAD( "b67-06.66", 0x00000, 0x80000, CRC(b9a38d64) SHA1(7ae8165b444d9da6ccdbc4a769535bcbb6738aaa) ) /* SCN */ @@ -805,9 +793,8 @@ ROM_START( othunderuo ) ROM_LOAD16_BYTE( "b67-14.61", 0x40000, 0x20000, CRC(7f3dd724) SHA1(2f2eeae0ee31e20082237b9a947c6848771eb73c) ) ROM_LOAD16_BYTE( "b67-15.62", 0x40001, 0x20000, CRC(e84f62d0) SHA1(3b4a55a14dee7d592467fde9a75bde64deabd27d) ) - ROM_REGION( 0x1c000, "audiocpu", 0 ) /* sound cpu */ - ROM_LOAD( "b67-13.40", 0x00000, 0x04000, CRC(2936b4b1) SHA1(39b41643464dd89e456ab6eb15a0ff0aef30afde) ) - ROM_CONTINUE( 0x10000, 0x0c000 ) /* banked stuff */ + ROM_REGION( 0x10000, "audiocpu", 0 ) /* sound cpu */ + ROM_LOAD( "b67-13.40", 0x00000, 0x10000, CRC(2936b4b1) SHA1(39b41643464dd89e456ab6eb15a0ff0aef30afde) ) ROM_REGION( 0x80000, "gfx1", 0 ) ROM_LOAD( "b67-06.66", 0x00000, 0x80000, CRC(b9a38d64) SHA1(7ae8165b444d9da6ccdbc4a769535bcbb6738aaa) ) /* SCN */ @@ -844,9 +831,8 @@ ROM_START( othunderj ) ROM_LOAD16_BYTE( "b67-14.61", 0x40000, 0x20000, CRC(7f3dd724) SHA1(2f2eeae0ee31e20082237b9a947c6848771eb73c) ) ROM_LOAD16_BYTE( "b67-15.62", 0x40001, 0x20000, CRC(e84f62d0) SHA1(3b4a55a14dee7d592467fde9a75bde64deabd27d) ) - ROM_REGION( 0x1c000, "audiocpu", 0 ) /* sound cpu */ - ROM_LOAD( "b67-13.40", 0x00000, 0x04000, CRC(2936b4b1) SHA1(39b41643464dd89e456ab6eb15a0ff0aef30afde) ) - ROM_CONTINUE( 0x10000, 0x0c000 ) /* banked stuff */ + ROM_REGION( 0x10000, "audiocpu", 0 ) /* sound cpu */ + ROM_LOAD( "b67-13.40", 0x00000, 0x10000, CRC(2936b4b1) SHA1(39b41643464dd89e456ab6eb15a0ff0aef30afde) ) ROM_REGION( 0x80000, "gfx1", 0 ) ROM_LOAD( "b67-06.66", 0x00000, 0x80000, CRC(b9a38d64) SHA1(7ae8165b444d9da6ccdbc4a769535bcbb6738aaa) ) /* SCN */ |