diff --git a/src/mame/drivers/asteroid.c b/src/mame/drivers/asteroid.c index 194c8cf4efe..bcd4628f632 100644 --- a/src/mame/drivers/asteroid.c +++ b/src/mame/drivers/asteroid.c @@ -690,15 +690,13 @@ static MACHINE_CONFIG_DERIVED( llander, asteroid ) MCFG_CPU_PROGRAM_MAP(llander_map) MCFG_CPU_PERIODIC_INT_DRIVER(asteroid_state, llander_interrupt, (double)MASTER_CLOCK/4096/12) - MCFG_MACHINE_RESET(avgdvg) + MCFG_MACHINE_RESET_OVERRIDE(asteroid_state, llander) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_REFRESH_RATE(40) MCFG_SCREEN_VISIBLE_AREA(522, 1566, 270, 1070) MCFG_SCREEN_UPDATE_DEVICE("vector", vector_device, screen_update) - MCFG_VIDEO_START(dvg) - /* sound hardware */ MCFG_SOUND_REPLACE("discrete", DISCRETE, 0) MCFG_SOUND_CONFIG_DISCRETE(llander) diff --git a/src/mame/includes/asteroid.h b/src/mame/includes/asteroid.h index 38f64884281..66188c11a5f 100644 --- a/src/mame/includes/asteroid.h +++ b/src/mame/includes/asteroid.h @@ -42,6 +42,7 @@ public: DECLARE_WRITE8_MEMBER(asteroid_noise_reset_w); DECLARE_WRITE8_MEMBER(llander_snd_reset_w); DECLARE_WRITE8_MEMBER(llander_sounds_w); + DECLARE_MACHINE_RESET(llander); required_device m_maincpu; }; diff --git a/src/mame/machine/asteroid.c b/src/mame/machine/asteroid.c index effaeb543aa..b04697434dd 100644 --- a/src/mame/machine/asteroid.c +++ b/src/mame/machine/asteroid.c @@ -136,3 +136,8 @@ void asteroid_state::machine_reset() asteroid_bank_switch_w(m_maincpu->space(AS_PROGRAM), 0, 0); avgdvg_reset_w(m_maincpu->space(AS_PROGRAM), 0, 0); } + +MACHINE_RESET_MEMBER(asteroid_state, llander) +{ + avgdvg_reset_w(m_maincpu->space(AS_PROGRAM), 0, 0); +} \ No newline at end of file diff --git a/src/mame/video/avgdvg.c b/src/mame/video/avgdvg.c index 86e81478855..0c400c66723 100644 --- a/src/mame/video/avgdvg.c +++ b/src/mame/video/avgdvg.c @@ -1285,12 +1285,6 @@ WRITE16_HANDLER( avgdvg_reset_word_w ) avgdvg_reset_w (space,0,0); } -MACHINE_RESET( avgdvg ) -{ - avgdvg_reset_w (machine.device("maincpu")->memory().space(AS_PROGRAM),0,0); -} - - /************************************* * * Configuration of VG variants diff --git a/src/mame/video/avgdvg.h b/src/mame/video/avgdvg.h index be5c80d303e..e14d9cb7ae4 100644 --- a/src/mame/video/avgdvg.h +++ b/src/mame/video/avgdvg.h @@ -20,6 +20,4 @@ VIDEO_START( avg_quantum ); VIDEO_START( avg_bzone ); VIDEO_START( avg_tomcat ); -MACHINE_RESET( avgdvg ); - #endif