diff options
Diffstat (limited to 'src/mame/drivers/ninjakd2.c')
-rw-r--r-- | src/mame/drivers/ninjakd2.c | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/src/mame/drivers/ninjakd2.c b/src/mame/drivers/ninjakd2.c index a7db299dc8b..61b0b59fe6b 100644 --- a/src/mame/drivers/ninjakd2.c +++ b/src/mame/drivers/ninjakd2.c @@ -172,11 +172,11 @@ static INTERRUPT_GEN( ninjakd2_interrupt ) } -static MACHINE_RESET( ninjakd2 ) +void ninjakd2_state::machine_reset() { /* initialize main Z80 bank */ - machine.root_device().membank("bank1")->configure_entries(0, 8, machine.root_device().memregion("maincpu")->base() + 0x10000, 0x4000); - machine.root_device().membank("bank1")->set_entry(0); + machine().root_device().membank("bank1")->configure_entries(0, 8, machine().root_device().memregion("maincpu")->base() + 0x10000, 0x4000); + machine().root_device().membank("bank1")->set_entry(0); } static void robokid_init_banks(running_machine &machine) @@ -187,16 +187,16 @@ static void robokid_init_banks(running_machine &machine) machine.root_device().membank("bank1")->set_entry(0); } -static MACHINE_RESET( robokid ) +MACHINE_RESET_MEMBER(ninjakd2_state,robokid) { - robokid_init_banks(machine); + robokid_init_banks(machine()); } -static MACHINE_RESET( omegaf ) +MACHINE_RESET_MEMBER(ninjakd2_state,omegaf) { - robokid_init_banks(machine); + robokid_init_banks(machine()); - omegaf_io_protection_reset(machine); + omegaf_io_protection_reset(machine()); } @@ -945,7 +945,6 @@ static MACHINE_CONFIG_START( ninjakd2, ninjakd2_state ) MCFG_CPU_PROGRAM_MAP(ninjakd2_sound_cpu) MCFG_CPU_IO_MAP(ninjakd2_sound_io) - MCFG_MACHINE_RESET(ninjakd2) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -958,7 +957,6 @@ static MACHINE_CONFIG_START( ninjakd2, ninjakd2_state ) MCFG_GFXDECODE(ninjakd2) MCFG_PALETTE_LENGTH(0x300) - MCFG_VIDEO_START(ninjakd2) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -988,7 +986,7 @@ static MACHINE_CONFIG_DERIVED( mnight, ninjakd2 ) MCFG_CPU_PROGRAM_MAP(mnight_main_cpu) /* video hardware */ - MCFG_VIDEO_START(mnight) + MCFG_VIDEO_START_OVERRIDE(ninjakd2_state,mnight) /* sound hardware */ MCFG_DEVICE_REMOVE("pcm") @@ -1002,7 +1000,7 @@ static MACHINE_CONFIG_DERIVED( arkarea, ninjakd2 ) MCFG_CPU_PROGRAM_MAP(mnight_main_cpu) /* video hardware */ - MCFG_VIDEO_START(arkarea) + MCFG_VIDEO_START_OVERRIDE(ninjakd2_state,arkarea) /* sound hardware */ MCFG_DEVICE_REMOVE("pcm") @@ -1015,13 +1013,13 @@ static MACHINE_CONFIG_DERIVED( robokid, mnight ) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(robokid_main_cpu) - MCFG_MACHINE_RESET(robokid) + MCFG_MACHINE_RESET_OVERRIDE(ninjakd2_state,robokid) /* video hardware */ MCFG_GFXDECODE(robokid) MCFG_PALETTE_LENGTH(0x400) // RAM is this large, but still only 0x300 colors used - MCFG_VIDEO_START(robokid) + MCFG_VIDEO_START_OVERRIDE(ninjakd2_state,robokid) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_STATIC(robokid) MACHINE_CONFIG_END @@ -1033,10 +1031,10 @@ static MACHINE_CONFIG_DERIVED( omegaf, robokid ) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(omegaf_main_cpu) - MCFG_MACHINE_RESET(omegaf) + MCFG_MACHINE_RESET_OVERRIDE(ninjakd2_state,omegaf) /* video hardware */ - MCFG_VIDEO_START(omegaf) + MCFG_VIDEO_START_OVERRIDE(ninjakd2_state,omegaf) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_STATIC(omegaf) MACHINE_CONFIG_END |