diff options
Diffstat (limited to 'src/mame/includes')
653 files changed, 3723 insertions, 1340 deletions
diff --git a/src/mame/includes/1942.h b/src/mame/includes/1942.h index 28c4e919bf6..4e7735743e1 100644 --- a/src/mame/includes/1942.h +++ b/src/mame/includes/1942.h @@ -35,6 +35,10 @@ public: DECLARE_DRIVER_INIT(1942); TILE_GET_INFO_MEMBER(get_fg_tile_info); TILE_GET_INFO_MEMBER(get_bg_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); }; diff --git a/src/mame/includes/1943.h b/src/mame/includes/1943.h index b113b7e2f99..86e16c5e803 100644 --- a/src/mame/includes/1943.h +++ b/src/mame/includes/1943.h @@ -43,6 +43,9 @@ public: TILE_GET_INFO_MEMBER(c1943_get_bg2_tile_info); TILE_GET_INFO_MEMBER(c1943_get_bg_tile_info); TILE_GET_INFO_MEMBER(c1943_get_fg_tile_info); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); }; diff --git a/src/mame/includes/20pacgal.h b/src/mame/includes/20pacgal.h index cba880bf267..6c8439af996 100644 --- a/src/mame/includes/20pacgal.h +++ b/src/mame/includes/20pacgal.h @@ -52,6 +52,8 @@ public: DECLARE_WRITE8_MEMBER(sprite_lookup_w); DECLARE_DRIVER_INIT(25pacman); DECLARE_DRIVER_INIT(20pacgal); + virtual void machine_start(); + virtual void machine_reset(); }; diff --git a/src/mame/includes/3do.h b/src/mame/includes/3do.h index cd15d8049e8..d540b867906 100644 --- a/src/mame/includes/3do.h +++ b/src/mame/includes/3do.h @@ -185,6 +185,8 @@ public: DECLARE_WRITE32_MEMBER(_3do_madam_w); DECLARE_READ32_MEMBER(_3do_clio_r); DECLARE_WRITE32_MEMBER(_3do_clio_w); + virtual void machine_reset(); + DECLARE_VIDEO_START(_3do); }; /*----------- defined in machine/3do.c -----------*/ @@ -198,7 +200,7 @@ void _3do_madam_init( running_machine &machine ); void _3do_clio_init( running_machine &machine, screen_device *screen ); -VIDEO_START( _3do ); + SCREEN_UPDATE_RGB32( _3do ); #endif /* _3DO_H_ */ diff --git a/src/mame/includes/40love.h b/src/mame/includes/40love.h index 3734af5784e..9d455cdec4d 100644 --- a/src/mame/includes/40love.h +++ b/src/mame/includes/40love.h @@ -87,12 +87,20 @@ public: DECLARE_DRIVER_INIT(undoukai); DECLARE_DRIVER_INIT(40love); TILE_GET_INFO_MEMBER(get_bg_tile_info); + virtual void video_start(); + virtual void palette_init(); + DECLARE_MACHINE_START(40love); + DECLARE_MACHINE_RESET(40love); + DECLARE_MACHINE_START(undoukai); + DECLARE_MACHINE_RESET(undoukai); + DECLARE_MACHINE_RESET(common); + DECLARE_MACHINE_RESET(ta7630); }; /*----------- defined in video/40love.c -----------*/ -VIDEO_START( fortyl ); + SCREEN_UPDATE_IND16( fortyl ); -PALETTE_INIT( fortyl ); + diff --git a/src/mame/includes/4enraya.h b/src/mame/includes/4enraya.h index 8be18aeccba..d4303f2c4ff 100644 --- a/src/mame/includes/4enraya.h +++ b/src/mame/includes/4enraya.h @@ -30,11 +30,15 @@ public: DECLARE_WRITE8_MEMBER(sound_control_w); DECLARE_DRIVER_INIT(unkpacg); TILE_GET_INFO_MEMBER(get_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/4enraya.c -----------*/ -VIDEO_START( 4enraya ); + SCREEN_UPDATE_IND16( 4enraya ); diff --git a/src/mame/includes/8080bw.h b/src/mame/includes/8080bw.h index 35e7ea37209..6df00a4198c 100644 --- a/src/mame/includes/8080bw.h +++ b/src/mame/includes/8080bw.h @@ -63,12 +63,23 @@ public: DECLARE_WRITE8_MEMBER(invmulti_bank_w); DECLARE_DRIVER_INIT(invmulti); DECLARE_DRIVER_INIT(vortex); + DECLARE_MACHINE_START(extra_8080bw); + DECLARE_MACHINE_START(schaser); + DECLARE_MACHINE_RESET(schaser); + DECLARE_MACHINE_START(polaris); + DECLARE_MACHINE_START(darthvdr); + DECLARE_MACHINE_RESET(darthvdr); + DECLARE_MACHINE_RESET(invmulti); + DECLARE_MACHINE_START(extra_8080bw_sh); + DECLARE_MACHINE_START(extra_8080bw_vh); + DECLARE_MACHINE_START(schaser_sh); + DECLARE_MACHINE_RESET(schaser_sh); }; /*----------- defined in audio/8080bw.c -----------*/ -MACHINE_START( extra_8080bw_sh ); + extern const samples_interface lrescue_samples_interface; @@ -80,15 +91,15 @@ WRITE8_DEVICE_HANDLER( polaris_sh_port_2_w ); WRITE8_DEVICE_HANDLER( polaris_sh_port_3_w ); DISCRETE_SOUND_EXTERN( polaris ); -MACHINE_RESET( schaser_sh ); -MACHINE_START( schaser_sh ); + + extern const sn76477_interface schaser_sn76477_interface; DISCRETE_SOUND_EXTERN( schaser ); /*----------- defined in video/8080bw.c -----------*/ -MACHINE_START( extra_8080bw_vh ); + SCREEN_UPDATE_RGB32( invadpt2 ); SCREEN_UPDATE_RGB32( ballbomb ); diff --git a/src/mame/includes/88games.h b/src/mame/includes/88games.h index 92fd8278989..2e21faee9cf 100644 --- a/src/mame/includes/88games.h +++ b/src/mame/includes/88games.h @@ -44,6 +44,8 @@ public: DECLARE_WRITE8_MEMBER(speech_msg_w); DECLARE_READ8_MEMBER(k052109_051960_r); DECLARE_WRITE8_MEMBER(k052109_051960_w); + virtual void machine_start(); + virtual void machine_reset(); }; diff --git a/src/mame/includes/actfancr.h b/src/mame/includes/actfancr.h index a53876a56a5..823979bb320 100644 --- a/src/mame/includes/actfancr.h +++ b/src/mame/includes/actfancr.h @@ -28,6 +28,11 @@ public: DECLARE_READ8_MEMBER(triothep_control_r); DECLARE_WRITE8_MEMBER(actfancr_sound_w); DECLARE_WRITE8_MEMBER(actfancr_buffer_spriteram_w); + virtual void video_start(); + DECLARE_MACHINE_START(actfancr); + DECLARE_MACHINE_RESET(actfancr); + DECLARE_MACHINE_START(triothep); + DECLARE_MACHINE_RESET(triothep); }; @@ -40,6 +45,6 @@ WRITE8_HANDLER( actfancr_pf2_data_w ); READ8_HANDLER( actfancr_pf2_data_r ); WRITE8_HANDLER( actfancr_pf2_control_w ); -VIDEO_START( actfancr ); + SCREEN_UPDATE_IND16( actfancr ); diff --git a/src/mame/includes/aeroboto.h b/src/mame/includes/aeroboto.h index 1128338f0dd..389e3da57e6 100644 --- a/src/mame/includes/aeroboto.h +++ b/src/mame/includes/aeroboto.h @@ -55,11 +55,14 @@ public: DECLARE_WRITE8_MEMBER(aeroboto_videoram_w); DECLARE_WRITE8_MEMBER(aeroboto_tilecolor_w); TILE_GET_INFO_MEMBER(get_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; /*----------- defined in video/aeroboto.c -----------*/ -VIDEO_START( aeroboto ); + SCREEN_UPDATE_IND16( aeroboto ); diff --git a/src/mame/includes/aerofgt.h b/src/mame/includes/aerofgt.h index 6c65b9e37ba..8f7278dd5ae 100644 --- a/src/mame/includes/aerofgt.h +++ b/src/mame/includes/aerofgt.h @@ -74,6 +74,15 @@ public: TILE_GET_INFO_MEMBER(spinlbrk_bg1_tile_info); TILE_GET_INFO_MEMBER(get_bg1_tile_info); TILE_GET_INFO_MEMBER(get_bg2_tile_info); + DECLARE_MACHINE_START(aerofgt); + DECLARE_MACHINE_RESET(aerofgt); + DECLARE_VIDEO_START(pspikes); + DECLARE_MACHINE_START(common); + DECLARE_MACHINE_RESET(common); + DECLARE_VIDEO_START(karatblz); + DECLARE_VIDEO_START(spinlbrk); + DECLARE_VIDEO_START(turbofrc); + DECLARE_VIDEO_START(wbbc97); }; @@ -81,11 +90,11 @@ public: -VIDEO_START( pspikes ); -VIDEO_START( karatblz ); -VIDEO_START( spinlbrk ); -VIDEO_START( turbofrc ); -VIDEO_START( wbbc97 ); + + + + + SCREEN_UPDATE_IND16( pspikes ); SCREEN_UPDATE_IND16( pspikesb ); SCREEN_UPDATE_IND16( spikes91 ); diff --git a/src/mame/includes/airbustr.h b/src/mame/includes/airbustr.h index e5f674dfb09..bd5776ab0d5 100644 --- a/src/mame/includes/airbustr.h +++ b/src/mame/includes/airbustr.h @@ -63,12 +63,15 @@ public: DECLARE_DRIVER_INIT(airbustr); TILE_GET_INFO_MEMBER(get_fg_tile_info); TILE_GET_INFO_MEMBER(get_bg_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; /*----------- defined in video/airbustr.c -----------*/ -VIDEO_START( airbustr ); + SCREEN_UPDATE_IND16( airbustr ); SCREEN_VBLANK( airbustr ); diff --git a/src/mame/includes/ajax.h b/src/mame/includes/ajax.h index 2cf8a647b91..32022c6d9b9 100644 --- a/src/mame/includes/ajax.h +++ b/src/mame/includes/ajax.h @@ -33,18 +33,21 @@ public: DECLARE_WRITE8_MEMBER(ajax_bankswitch_w); DECLARE_WRITE8_MEMBER(ajax_lamps_w); DECLARE_WRITE8_MEMBER(k007232_extvol_w); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; /*----------- defined in machine/ajax.c -----------*/ -MACHINE_START( ajax ); -MACHINE_RESET( ajax ); + + INTERRUPT_GEN( ajax_interrupt ); /*----------- defined in video/ajax.c -----------*/ -VIDEO_START( ajax ); + SCREEN_UPDATE_IND16( ajax ); extern void ajax_tile_callback(running_machine &machine, int layer,int bank,int *code,int *color,int *flags,int *priority); diff --git a/src/mame/includes/aliens.h b/src/mame/includes/aliens.h index 92bcb293652..f15d7badd33 100644 --- a/src/mame/includes/aliens.h +++ b/src/mame/includes/aliens.h @@ -35,6 +35,9 @@ public: DECLARE_READ8_MEMBER(k052109_051960_r); DECLARE_WRITE8_MEMBER(k052109_051960_w); DECLARE_WRITE8_MEMBER(aliens_snd_bankswitch_w); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; /*----------- defined in video/aliens.c -----------*/ @@ -42,5 +45,5 @@ public: extern void aliens_tile_callback(running_machine &machine, int layer,int bank,int *code,int *color, int *flags, int *priority); extern void aliens_sprite_callback(running_machine &machine, int *code,int *color,int *priority_mask,int *shadow); -VIDEO_START( aliens ); + SCREEN_UPDATE_IND16( aliens ); diff --git a/src/mame/includes/alpha68k.h b/src/mame/includes/alpha68k.h index 7741e36c0ad..179913aa331 100644 --- a/src/mame/includes/alpha68k.h +++ b/src/mame/includes/alpha68k.h @@ -89,6 +89,15 @@ public: DECLARE_DRIVER_INIT(kyros); DECLARE_DRIVER_INIT(sstingry); TILE_GET_INFO_MEMBER(get_tile_info); + DECLARE_MACHINE_START(common); + DECLARE_MACHINE_RESET(common); + DECLARE_PALETTE_INIT(kyros); + DECLARE_PALETTE_INIT(paddlem); + DECLARE_MACHINE_START(alpha68k_II); + DECLARE_MACHINE_RESET(alpha68k_II); + DECLARE_VIDEO_START(alpha68k); + DECLARE_MACHINE_START(alpha68k_V); + DECLARE_MACHINE_RESET(alpha68k_V); }; /* game_id - used to deal with a few game specific situations */ @@ -102,10 +111,10 @@ enum /*----------- defined in video/alpha68k.c -----------*/ -PALETTE_INIT( kyros ); -PALETTE_INIT( paddlem ); -VIDEO_START( alpha68k ); + + + SCREEN_UPDATE_IND16( kyros ); SCREEN_UPDATE_IND16( sstingry ); diff --git a/src/mame/includes/ambush.h b/src/mame/includes/ambush.h index e7adf9ad9f7..b61ebc8ab57 100644 --- a/src/mame/includes/ambush.h +++ b/src/mame/includes/ambush.h @@ -24,10 +24,11 @@ public: DECLARE_WRITE8_MEMBER(ambush_coin_counter_w); DECLARE_WRITE8_MEMBER(flip_screen_w); + virtual void palette_init(); }; /*----------- defined in video/ambush.c -----------*/ -PALETTE_INIT( ambush ); + SCREEN_UPDATE_IND16( ambush ); diff --git a/src/mame/includes/amiga.h b/src/mame/includes/amiga.h index 1556dc9ec80..c0a0c1828cd 100644 --- a/src/mame/includes/amiga.h +++ b/src/mame/includes/amiga.h @@ -432,6 +432,11 @@ public: DECLARE_DRIVER_INIT(mquake); DECLARE_DRIVER_INIT(amiga); DECLARE_DRIVER_INIT(cdtv); + DECLARE_MACHINE_RESET(mquake); + DECLARE_MACHINE_RESET(amiga); + DECLARE_VIDEO_START(amiga); + DECLARE_PALETTE_INIT(amiga); + DECLARE_VIDEO_START(amiga_aga); }; @@ -443,7 +448,7 @@ void amiga_chip_ram_w8(amiga_state *state, offs_t offset, UINT8 data); void amiga_machine_config(running_machine &machine, const amiga_machine_interface *intf); -MACHINE_RESET( amiga ); + READ16_HANDLER( amiga_cia_r ); WRITE16_HANDLER( amiga_cia_w ); @@ -498,8 +503,8 @@ void amiga_audio_data_w(device_t *device, int which, UINT16 data); extern const UINT16 amiga_expand_byte[256]; -PALETTE_INIT( amiga ); -VIDEO_START( amiga ); + + SCREEN_UPDATE_IND16( amiga ); void amiga_copper_setpc(running_machine &machine, UINT32 pc); @@ -513,7 +518,7 @@ void amiga_sprite_enable_comparitor(running_machine &machine, int which, int ena /*----------- defined in video/amigaaga.c -----------*/ -VIDEO_START( amiga_aga ); + SCREEN_UPDATE_RGB32( amiga_aga ); void amiga_aga_render_scanline(running_machine &machine, bitmap_rgb32 &bitmap, int scanline); diff --git a/src/mame/includes/ampoker2.h b/src/mame/includes/ampoker2.h index 73b092b930a..f5a80a8cf00 100644 --- a/src/mame/includes/ampoker2.h +++ b/src/mame/includes/ampoker2.h @@ -20,12 +20,15 @@ public: DECLARE_DRIVER_INIT(piccolop); TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(s2k_get_bg_tile_info); + virtual void video_start(); + virtual void palette_init(); + DECLARE_VIDEO_START(sigma2k); }; /*----------- defined in video/ampoker2.c -----------*/ -PALETTE_INIT( ampoker2 ); -VIDEO_START( ampoker2 ); -VIDEO_START( sigma2k ); + + + SCREEN_UPDATE_IND16( ampoker2 ); diff --git a/src/mame/includes/amspdwy.h b/src/mame/includes/amspdwy.h index 809b1dd3544..a65890127da 100644 --- a/src/mame/includes/amspdwy.h +++ b/src/mame/includes/amspdwy.h @@ -40,11 +40,14 @@ public: DECLARE_READ8_MEMBER(amspdwy_sound_r); TILE_GET_INFO_MEMBER(get_tile_info); TILEMAP_MAPPER_MEMBER(tilemap_scan_cols_back); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; /*----------- defined in video/amspdwy.c -----------*/ -VIDEO_START( amspdwy ); + SCREEN_UPDATE_IND16( amspdwy ); diff --git a/src/mame/includes/angelkds.h b/src/mame/includes/angelkds.h index 4570beaa12f..c60aff1f91d 100644 --- a/src/mame/includes/angelkds.h +++ b/src/mame/includes/angelkds.h @@ -56,6 +56,9 @@ public: TILE_GET_INFO_MEMBER(get_tx_tile_info); TILE_GET_INFO_MEMBER(get_bgtop_tile_info); TILE_GET_INFO_MEMBER(get_bgbot_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; @@ -64,5 +67,5 @@ public: -VIDEO_START( angelkds ); + SCREEN_UPDATE_IND16( angelkds ); diff --git a/src/mame/includes/appoooh.h b/src/mame/includes/appoooh.h index babe6d152a2..7b040ec841a 100644 --- a/src/mame/includes/appoooh.h +++ b/src/mame/includes/appoooh.h @@ -45,6 +45,11 @@ public: DECLARE_DRIVER_INIT(robowresb); TILE_GET_INFO_MEMBER(get_fg_tile_info); TILE_GET_INFO_MEMBER(get_bg_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + DECLARE_VIDEO_START(appoooh); + DECLARE_PALETTE_INIT(appoooh); + DECLARE_PALETTE_INIT(robowres); }; #define CHR1_OFST 0x00 /* palette page of char set #1 */ @@ -53,8 +58,8 @@ public: /* ----------- defined in video/appoooh.c -----------*/ -PALETTE_INIT( appoooh ); -PALETTE_INIT( robowres ); -VIDEO_START( appoooh ); + + + SCREEN_UPDATE_IND16( appoooh ); SCREEN_UPDATE_IND16( robowres ); diff --git a/src/mame/includes/aquarium.h b/src/mame/includes/aquarium.h index 2e404f362fa..9594e37f92c 100644 --- a/src/mame/includes/aquarium.h +++ b/src/mame/includes/aquarium.h @@ -43,11 +43,14 @@ public: TILE_GET_INFO_MEMBER(get_aquarium_txt_tile_info); TILE_GET_INFO_MEMBER(get_aquarium_mid_tile_info); TILE_GET_INFO_MEMBER(get_aquarium_bak_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; /*----------- defined in video/aquarium.c -----------*/ -VIDEO_START(aquarium); + SCREEN_UPDATE_IND16(aquarium); diff --git a/src/mame/includes/arabian.h b/src/mame/includes/arabian.h index 031c9d83cce..39427f2b9f5 100644 --- a/src/mame/includes/arabian.h +++ b/src/mame/includes/arabian.h @@ -38,12 +38,16 @@ public: DECLARE_WRITE8_MEMBER(arabian_videoram_w); DECLARE_WRITE8_MEMBER(ay8910_porta_w); DECLARE_WRITE8_MEMBER(ay8910_portb_w); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/arabian.c -----------*/ -PALETTE_INIT( arabian ); -VIDEO_START( arabian ); + + SCREEN_UPDATE_IND16( arabian ); diff --git a/src/mame/includes/arcadecl.h b/src/mame/includes/arcadecl.h index 7d2750d253a..a2f3cd9044e 100644 --- a/src/mame/includes/arcadecl.h +++ b/src/mame/includes/arcadecl.h @@ -18,9 +18,12 @@ public: UINT8 m_has_mo; DECLARE_WRITE16_MEMBER(latch_w); DECLARE_DRIVER_INIT(sparkz); + DECLARE_MACHINE_START(arcadecl); + DECLARE_MACHINE_RESET(arcadecl); + DECLARE_VIDEO_START(arcadecl); }; /*----------- defined in video/arcadecl.c -----------*/ -VIDEO_START( arcadecl ); + SCREEN_UPDATE_IND16( arcadecl ); diff --git a/src/mame/includes/argus.h b/src/mame/includes/argus.h index 5c004e704b8..778c60fd280 100644 --- a/src/mame/includes/argus.h +++ b/src/mame/includes/argus.h @@ -74,17 +74,23 @@ public: TILE_GET_INFO_MEMBER(butasan_get_tx_tile_info); TILE_GET_INFO_MEMBER(butasan_get_bg0_tile_info); TILE_GET_INFO_MEMBER(butasan_get_bg1_tile_info); + DECLARE_VIDEO_START(argus); + DECLARE_VIDEO_RESET(argus); + DECLARE_VIDEO_START(valtric); + DECLARE_VIDEO_RESET(valtric); + DECLARE_VIDEO_START(butasan); + DECLARE_VIDEO_RESET(butasan); }; /*----------- defined in video/argus.c -----------*/ -VIDEO_START( argus ); -VIDEO_START( valtric ); -VIDEO_START( butasan ); -VIDEO_RESET( argus ); -VIDEO_RESET( valtric ); -VIDEO_RESET( butasan ); + + + + + + SCREEN_UPDATE_RGB32( argus ); SCREEN_UPDATE_RGB32( valtric ); SCREEN_UPDATE_RGB32( butasan ); diff --git a/src/mame/includes/arkanoid.h b/src/mame/includes/arkanoid.h index a235e834be1..d6823e81342 100644 --- a/src/mame/includes/arkanoid.h +++ b/src/mame/includes/arkanoid.h @@ -74,6 +74,9 @@ public: DECLARE_DRIVER_INIT(arkbloc2); DECLARE_DRIVER_INIT(arkangc); TILE_GET_INFO_MEMBER(get_bg_tile_info); + DECLARE_MACHINE_START(arkanoid); + DECLARE_MACHINE_RESET(arkanoid); + DECLARE_VIDEO_START(arkanoid); }; diff --git a/src/mame/includes/armedf.h b/src/mame/includes/armedf.h index a72071602ab..183f6759aba 100644 --- a/src/mame/includes/armedf.h +++ b/src/mame/includes/armedf.h @@ -75,6 +75,10 @@ public: TILE_GET_INFO_MEMBER(get_armedf_tx_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); TILE_GET_INFO_MEMBER(get_bg_tile_info); + DECLARE_MACHINE_START(armedf); + DECLARE_MACHINE_RESET(armedf); + DECLARE_VIDEO_START(terraf); + DECLARE_VIDEO_START(armedf); }; class bigfghtr_state : public armedf_state @@ -95,11 +99,13 @@ public: DECLARE_WRITE16_MEMBER(sharedram_w); DECLARE_READ16_MEMBER(sharedram_r); DECLARE_DRIVER_INIT(bigfghtr); + DECLARE_MACHINE_START(bigfghtr); + DECLARE_MACHINE_RESET(bigfghtr); }; /*----------- defined in video/armedf.c -----------*/ SCREEN_UPDATE_IND16( armedf ); -VIDEO_START( armedf ); -VIDEO_START( terraf ); + + diff --git a/src/mame/includes/artmagic.h b/src/mame/includes/artmagic.h index 9deae3cfde2..c0298c17601 100644 --- a/src/mame/includes/artmagic.h +++ b/src/mame/includes/artmagic.h @@ -46,12 +46,15 @@ public: DECLARE_DRIVER_INIT(cheesech); DECLARE_DRIVER_INIT(ultennis); DECLARE_DRIVER_INIT(stonebal); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; /*----------- defined in video/artmagic.c -----------*/ -VIDEO_START( artmagic ); + void artmagic_to_shiftreg(address_space *space, offs_t address, UINT16 *data); void artmagic_from_shiftreg(address_space *space, offs_t address, UINT16 *data); diff --git a/src/mame/includes/ashnojoe.h b/src/mame/includes/ashnojoe.h index 7a69af2630e..32f0b02ea77 100644 --- a/src/mame/includes/ashnojoe.h +++ b/src/mame/includes/ashnojoe.h @@ -70,11 +70,14 @@ public: TILE_GET_INFO_MEMBER(get_joe_tile_info_5); TILE_GET_INFO_MEMBER(get_joe_tile_info_6); TILE_GET_INFO_MEMBER(get_joe_tile_info_7); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; /*----------- defined in video/ashnojoe.c -----------*/ -VIDEO_START( ashnojoe ); + SCREEN_UPDATE_IND16( ashnojoe ); diff --git a/src/mame/includes/asterix.h b/src/mame/includes/asterix.h index 7dcce5c6f24..995fefb9af2 100644 --- a/src/mame/includes/asterix.h +++ b/src/mame/includes/asterix.h @@ -40,6 +40,8 @@ public: DECLARE_WRITE16_MEMBER(asterix_spritebank_w); DECLARE_READ8_MEMBER(asterix_sound_r); DECLARE_DRIVER_INIT(asterix); + virtual void machine_start(); + virtual void machine_reset(); }; diff --git a/src/mame/includes/asteroid.h b/src/mame/includes/asteroid.h index 4509ad08658..073cb3c684f 100644 --- a/src/mame/includes/asteroid.h +++ b/src/mame/includes/asteroid.h @@ -28,6 +28,7 @@ public: DECLARE_CUSTOM_INPUT_MEMBER(clock_r); DECLARE_DRIVER_INIT(asterock); DECLARE_DRIVER_INIT(asteroidb); + virtual void machine_reset(); }; @@ -39,7 +40,7 @@ INTERRUPT_GEN( llander_interrupt ); -MACHINE_RESET( asteroid ); + /*----------- defined in audio/asteroid.c -----------*/ diff --git a/src/mame/includes/astrocde.h b/src/mame/includes/astrocde.h index 4ec0cb3720d..320a1f709fe 100644 --- a/src/mame/includes/astrocde.h +++ b/src/mame/includes/astrocde.h @@ -116,16 +116,20 @@ public: DECLARE_DRIVER_INIT(ebases); DECLARE_DRIVER_INIT(gorf); DECLARE_DRIVER_INIT(astrocde); + virtual void video_start(); + virtual void palette_init(); + DECLARE_VIDEO_START(profpac); + DECLARE_PALETTE_INIT(profpac); }; /*----------- defined in video/astrocde.c -----------*/ -PALETTE_INIT( astrocde ); -PALETTE_INIT( profpac ); -VIDEO_START( astrocde ); -VIDEO_START( profpac ); + + + + SCREEN_UPDATE_IND16( astrocde ); SCREEN_UPDATE_IND16( profpac ); diff --git a/src/mame/includes/astrof.h b/src/mame/includes/astrof.h index 4f434165248..e2c6134eb26 100644 --- a/src/mame/includes/astrof.h +++ b/src/mame/includes/astrof.h @@ -62,6 +62,12 @@ public: DECLARE_DRIVER_INIT(afire); DECLARE_DRIVER_INIT(abattle); DECLARE_DRIVER_INIT(sstarbtl); + virtual void video_start(); + DECLARE_MACHINE_START(astrof); + DECLARE_MACHINE_START(abattle); + DECLARE_MACHINE_RESET(abattle); + DECLARE_MACHINE_START(spfghmk2); + DECLARE_MACHINE_START(tomahawk); }; /*----------- defined in audio/astrof.c -----------*/ diff --git a/src/mame/includes/asuka.h b/src/mame/includes/asuka.h index 4113f4a4b8c..12564a98b97 100644 --- a/src/mame/includes/asuka.h +++ b/src/mame/includes/asuka.h @@ -45,6 +45,8 @@ public: DECLARE_WRITE8_MEMBER(sound_bankswitch_2151_w); DECLARE_WRITE8_MEMBER(asuka_msm5205_start_w); DECLARE_WRITE8_MEMBER(asuka_msm5205_stop_w); + virtual void machine_start(); + virtual void machine_reset(); }; diff --git a/src/mame/includes/atarifb.h b/src/mame/includes/atarifb.h index f8e5c29666a..dbcd15e78d1 100644 --- a/src/mame/includes/atarifb.h +++ b/src/mame/includes/atarifb.h @@ -75,6 +75,10 @@ public: TILE_GET_INFO_MEMBER(alpha1_get_tile_info); TILE_GET_INFO_MEMBER(alpha2_get_tile_info); TILE_GET_INFO_MEMBER(field_get_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); }; @@ -93,7 +97,7 @@ DISCRETE_SOUND_EXTERN( abaseb ); /*----------- defined in video/atarifb.c -----------*/ -VIDEO_START( atarifb ); + SCREEN_UPDATE_IND16( atarifb ); SCREEN_UPDATE_IND16( abaseb ); SCREEN_UPDATE_IND16( soccer ); diff --git a/src/mame/includes/atarig1.h b/src/mame/includes/atarig1.h index dd6b6505321..46f161d813d 100644 --- a/src/mame/includes/atarig1.h +++ b/src/mame/includes/atarig1.h @@ -46,13 +46,16 @@ public: DECLARE_DRIVER_INIT(pitfightb); TILE_GET_INFO_MEMBER(get_alpha_tile_info); TILE_GET_INFO_MEMBER(get_playfield_tile_info); + DECLARE_MACHINE_START(atarig1); + DECLARE_MACHINE_RESET(atarig1); + DECLARE_VIDEO_START(atarig1); }; /*----------- defined in video/atarig1.c -----------*/ -VIDEO_START( atarig1 ); + SCREEN_VBLANK( atarig1 ); SCREEN_UPDATE_IND16( atarig1 ); diff --git a/src/mame/includes/atarig42.h b/src/mame/includes/atarig42.h index beda5e4adb9..5a186e6ced3 100644 --- a/src/mame/includes/atarig42.h +++ b/src/mame/includes/atarig42.h @@ -49,12 +49,15 @@ public: TILE_GET_INFO_MEMBER(get_alpha_tile_info); TILE_GET_INFO_MEMBER(get_playfield_tile_info); TILEMAP_MAPPER_MEMBER(atarig42_playfield_scan); + DECLARE_MACHINE_START(atarig42); + DECLARE_MACHINE_RESET(atarig42); + DECLARE_VIDEO_START(atarig42); }; /*----------- defined in video/atarig42.c -----------*/ -VIDEO_START( atarig42 ); + SCREEN_VBLANK( atarig42 ); SCREEN_UPDATE_IND16( atarig42 ); diff --git a/src/mame/includes/atarigt.h b/src/mame/includes/atarigt.h index 14c33073570..7acf6c434ed 100644 --- a/src/mame/includes/atarigt.h +++ b/src/mame/includes/atarigt.h @@ -68,6 +68,9 @@ public: TILE_GET_INFO_MEMBER(get_alpha_tile_info); TILE_GET_INFO_MEMBER(get_playfield_tile_info); TILEMAP_MAPPER_MEMBER(atarigt_playfield_scan); + DECLARE_MACHINE_START(atarigt); + DECLARE_MACHINE_RESET(atarigt); + DECLARE_VIDEO_START(atarigt); }; @@ -75,7 +78,7 @@ public: -VIDEO_START( atarigt ); + SCREEN_VBLANK( atarigt ); SCREEN_UPDATE_RGB32( atarigt ); diff --git a/src/mame/includes/atarigx2.h b/src/mame/includes/atarigx2.h index c0dee7c1b53..8346db4a94b 100644 --- a/src/mame/includes/atarigx2.h +++ b/src/mame/includes/atarigx2.h @@ -43,12 +43,15 @@ public: TILE_GET_INFO_MEMBER(get_alpha_tile_info); TILE_GET_INFO_MEMBER(get_playfield_tile_info); TILEMAP_MAPPER_MEMBER(atarigx2_playfield_scan); + DECLARE_MACHINE_START(atarigx2); + DECLARE_MACHINE_RESET(atarigx2); + DECLARE_VIDEO_START(atarigx2); }; /*----------- defined in video/atarigx2.c -----------*/ -VIDEO_START( atarigx2 ); + SCREEN_VBLANK( atarigx2 ); SCREEN_UPDATE_IND16( atarigx2 ); diff --git a/src/mame/includes/atarisy1.h b/src/mame/includes/atarisy1.h index 985b22df3e3..cba6b99d6b9 100644 --- a/src/mame/includes/atarisy1.h +++ b/src/mame/includes/atarisy1.h @@ -61,6 +61,9 @@ public: DECLARE_DRIVER_INIT(indytemp); TILE_GET_INFO_MEMBER(get_alpha_tile_info); TILE_GET_INFO_MEMBER(get_playfield_tile_info); + DECLARE_MACHINE_START(atarisy1); + DECLARE_MACHINE_RESET(atarisy1); + DECLARE_VIDEO_START(atarisy1); }; @@ -78,5 +81,5 @@ WRITE16_HANDLER( atarisy1_xscroll_w ); WRITE16_HANDLER( atarisy1_yscroll_w ); WRITE16_HANDLER( atarisy1_priority_w ); -VIDEO_START( atarisy1 ); + SCREEN_UPDATE_IND16( atarisy1 ); diff --git a/src/mame/includes/atarisy2.h b/src/mame/includes/atarisy2.h index 9279911c47d..fdd4ba0f4d4 100644 --- a/src/mame/includes/atarisy2.h +++ b/src/mame/includes/atarisy2.h @@ -75,6 +75,9 @@ public: DECLARE_DRIVER_INIT(720); TILE_GET_INFO_MEMBER(get_alpha_tile_info); TILE_GET_INFO_MEMBER(get_playfield_tile_info); + DECLARE_MACHINE_START(atarisy2); + DECLARE_MACHINE_RESET(atarisy2); + DECLARE_VIDEO_START(atarisy2); }; @@ -89,5 +92,5 @@ WRITE16_HANDLER( atarisy2_xscroll_w ); WRITE16_HANDLER( atarisy2_videoram_w ); WRITE16_HANDLER( atarisy2_paletteram_w ); -VIDEO_START( atarisy2 ); + SCREEN_UPDATE_IND16( atarisy2 ); diff --git a/src/mame/includes/atetris.h b/src/mame/includes/atetris.h index 8ada7da6978..1b7eb93ff7a 100644 --- a/src/mame/includes/atetris.h +++ b/src/mame/includes/atetris.h @@ -28,10 +28,13 @@ public: DECLARE_WRITE8_MEMBER(atetris_videoram_w); DECLARE_DRIVER_INIT(atetris); TILE_GET_INFO_MEMBER(get_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; /*----------- defined in video/atetris.c -----------*/ -VIDEO_START( atetris ); + SCREEN_UPDATE_IND16( atetris ); diff --git a/src/mame/includes/avalnche.h b/src/mame/includes/avalnche.h index d36e5c3ae1e..1341d792cc5 100644 --- a/src/mame/includes/avalnche.h +++ b/src/mame/includes/avalnche.h @@ -23,6 +23,8 @@ public: DECLARE_WRITE8_MEMBER(avalance_credit_1_lamp_w); DECLARE_WRITE8_MEMBER(avalance_credit_2_lamp_w); DECLARE_WRITE8_MEMBER(avalance_start_lamp_w); + virtual void machine_start(); + virtual void machine_reset(); }; /*----------- defined in audio/avalnche.c -----------*/ diff --git a/src/mame/includes/aztarac.h b/src/mame/includes/aztarac.h index 28c3fd4a3f2..faf54e5ea7f 100644 --- a/src/mame/includes/aztarac.h +++ b/src/mame/includes/aztarac.h @@ -25,6 +25,8 @@ public: DECLARE_READ8_MEMBER(aztarac_snd_command_r); DECLARE_READ8_MEMBER(aztarac_snd_status_r); DECLARE_WRITE8_MEMBER(aztarac_snd_status_w); + virtual void machine_reset(); + virtual void video_start(); }; /*----------- defined in audio/aztarac.c -----------*/ @@ -37,5 +39,5 @@ INTERRUPT_GEN( aztarac_snd_timed_irq ); /*----------- defined in video/aztarac.c -----------*/ -VIDEO_START( aztarac ); + diff --git a/src/mame/includes/badlands.h b/src/mame/includes/badlands.h index aa822224aa6..9a6a478f4d8 100644 --- a/src/mame/includes/badlands.h +++ b/src/mame/includes/badlands.h @@ -26,6 +26,10 @@ public: DECLARE_READ16_MEMBER(badlandsb_unk_r); DECLARE_DRIVER_INIT(badlands); TILE_GET_INFO_MEMBER(get_playfield_tile_info); + DECLARE_MACHINE_START(badlands); + DECLARE_MACHINE_RESET(badlands); + DECLARE_VIDEO_START(badlands); + DECLARE_MACHINE_RESET(badlandsb); }; @@ -33,5 +37,5 @@ public: WRITE16_HANDLER( badlands_pf_bank_w ); -VIDEO_START( badlands ); + SCREEN_UPDATE_IND16( badlands ); diff --git a/src/mame/includes/bagman.h b/src/mame/includes/bagman.h index f9449b14380..c0727672f9b 100644 --- a/src/mame/includes/bagman.h +++ b/src/mame/includes/bagman.h @@ -44,6 +44,9 @@ public: DECLARE_READ8_MEMBER(dial_input_p2_r); DECLARE_DRIVER_INIT(bagman); TILE_GET_INFO_MEMBER(get_bg_tile_info); + DECLARE_MACHINE_RESET(bagman); + DECLARE_VIDEO_START(bagman); + DECLARE_PALETTE_INIT(bagman); }; @@ -69,12 +72,12 @@ public: /*----------- defined in machine/bagman.c -----------*/ -MACHINE_RESET( bagman ); + /*----------- defined in video/bagman.c -----------*/ -PALETTE_INIT( bagman ); -VIDEO_START( bagman ); + + SCREEN_UPDATE_IND16( bagman ); diff --git a/src/mame/includes/balsente.h b/src/mame/includes/balsente.h index a5127cdf3e2..f93c866dd62 100644 --- a/src/mame/includes/balsente.h +++ b/src/mame/includes/balsente.h @@ -189,6 +189,9 @@ public: DECLARE_DRIVER_INIT(minigolf2); DECLARE_DRIVER_INIT(nametune); DECLARE_DRIVER_INIT(gghost); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; @@ -196,8 +199,8 @@ public: TIMER_DEVICE_CALLBACK( balsente_interrupt_timer ); -MACHINE_START( balsente ); -MACHINE_RESET( balsente ); + + void balsente_noise_gen(device_t *device, int count, short *buffer); @@ -220,6 +223,6 @@ TIMER_DEVICE_CALLBACK( balsente_clock_counter_0_ff ); /*----------- defined in video/balsente.c -----------*/ -VIDEO_START( balsente ); + SCREEN_UPDATE_IND16( balsente ); diff --git a/src/mame/includes/bankp.h b/src/mame/includes/bankp.h index e8238f2c247..89508da3797 100644 --- a/src/mame/includes/bankp.h +++ b/src/mame/includes/bankp.h @@ -35,14 +35,17 @@ public: DECLARE_WRITE8_MEMBER(bankp_out_w); TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/bankp.c -----------*/ -PALETTE_INIT( bankp ); -VIDEO_START( bankp ); + + SCREEN_UPDATE_IND16( bankp ); diff --git a/src/mame/includes/baraduke.h b/src/mame/includes/baraduke.h index 4417ad00c89..a43c30335ef 100644 --- a/src/mame/includes/baraduke.h +++ b/src/mame/includes/baraduke.h @@ -36,12 +36,14 @@ public: TILE_GET_INFO_MEMBER(tx_get_tile_info); TILE_GET_INFO_MEMBER(get_tile_info0); TILE_GET_INFO_MEMBER(get_tile_info1); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/baraduke.c -----------*/ -VIDEO_START( baraduke ); + SCREEN_UPDATE_IND16( baraduke ); SCREEN_VBLANK( baraduke ); -PALETTE_INIT( baraduke ); + diff --git a/src/mame/includes/batman.h b/src/mame/includes/batman.h index 96db20385cc..aa8cfe9e423 100644 --- a/src/mame/includes/batman.h +++ b/src/mame/includes/batman.h @@ -23,12 +23,15 @@ public: TILE_GET_INFO_MEMBER(get_alpha_tile_info); TILE_GET_INFO_MEMBER(get_playfield_tile_info); TILE_GET_INFO_MEMBER(get_playfield2_tile_info); + DECLARE_MACHINE_START(batman); + DECLARE_MACHINE_RESET(batman); + DECLARE_VIDEO_START(batman); }; /*----------- defined in video/batman.c -----------*/ -VIDEO_START( batman ); + SCREEN_UPDATE_IND16( batman ); void batman_scanline_update(screen_device &screen, int scanline); diff --git a/src/mame/includes/battlane.h b/src/mame/includes/battlane.h index 37ab96a049d..5510fa98e01 100644 --- a/src/mame/includes/battlane.h +++ b/src/mame/includes/battlane.h @@ -35,11 +35,14 @@ public: DECLARE_WRITE8_MEMBER(battlane_video_ctrl_w); TILE_GET_INFO_MEMBER(get_tile_info_bg); TILEMAP_MAPPER_MEMBER(battlane_tilemap_scan_rows_2x2); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; /*----------- defined in video/battlane.c -----------*/ -VIDEO_START( battlane ); + SCREEN_UPDATE_IND16( battlane ); diff --git a/src/mame/includes/battlera.h b/src/mame/includes/battlera.h index ffb57322d2b..4421c3e290d 100644 --- a/src/mame/includes/battlera.h +++ b/src/mame/includes/battlera.h @@ -39,13 +39,14 @@ public: DECLARE_READ8_MEMBER(HuC6270_data_r); DECLARE_WRITE8_MEMBER(HuC6270_data_w); DECLARE_WRITE8_MEMBER(battlera_adpcm_reset_w); + virtual void video_start(); }; /*----------- defined in video/battlera.c -----------*/ SCREEN_UPDATE_IND16( battlera ); -VIDEO_START( battlera ); + TIMER_DEVICE_CALLBACK( battlera_irq ); diff --git a/src/mame/includes/battlex.h b/src/mame/includes/battlex.h index e8ec6157344..d6c7479cd6c 100644 --- a/src/mame/includes/battlex.h +++ b/src/mame/includes/battlex.h @@ -32,6 +32,9 @@ public: DECLARE_CUSTOM_INPUT_MEMBER(battlex_in0_b4_r); DECLARE_DRIVER_INIT(battlex); TILE_GET_INFO_MEMBER(get_bg_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; diff --git a/src/mame/includes/battlnts.h b/src/mame/includes/battlnts.h index 0d6c1fbf8c4..ebb30af1d28 100644 --- a/src/mame/includes/battlnts.h +++ b/src/mame/includes/battlnts.h @@ -26,6 +26,8 @@ public: DECLARE_WRITE8_MEMBER(battlnts_bankswitch_w); DECLARE_WRITE8_MEMBER(battlnts_spritebank_w); DECLARE_DRIVER_INIT(rackemup); + virtual void machine_start(); + virtual void machine_reset(); }; /*----------- defined in video/battlnts.c -----------*/ diff --git a/src/mame/includes/bbusters.h b/src/mame/includes/bbusters.h index 5b59182be6d..98a452842ff 100644 --- a/src/mame/includes/bbusters.h +++ b/src/mame/includes/bbusters.h @@ -52,13 +52,15 @@ public: TILE_GET_INFO_MEMBER(get_bbusters_tile_info); TILE_GET_INFO_MEMBER(get_pf1_tile_info); TILE_GET_INFO_MEMBER(get_pf2_tile_info); + DECLARE_VIDEO_START(bbuster); + DECLARE_VIDEO_START(mechatt); }; /*----------- defined in video/bbusters.c -----------*/ -VIDEO_START( bbuster ); -VIDEO_START( mechatt ); + + SCREEN_UPDATE_IND16( bbuster ); SCREEN_UPDATE_IND16( mechatt ); diff --git a/src/mame/includes/beezer.h b/src/mame/includes/beezer.h index fcdd2b2b2d0..5cfbbe931de 100644 --- a/src/mame/includes/beezer.h +++ b/src/mame/includes/beezer.h @@ -16,6 +16,7 @@ public: DECLARE_WRITE8_MEMBER(beezer_map_w); DECLARE_READ8_MEMBER(beezer_line_r); DECLARE_DRIVER_INIT(beezer); + virtual void machine_start(); }; diff --git a/src/mame/includes/bfm_sc45.h b/src/mame/includes/bfm_sc45.h index 247714a2b97..9a34c14db87 100644 --- a/src/mame/includes/bfm_sc45.h +++ b/src/mame/includes/bfm_sc45.h @@ -111,6 +111,8 @@ public: DECLARE_DRIVER_INIT(sc4ggame); DECLARE_DRIVER_INIT(sc4gggtb); DECLARE_DRIVER_INIT(sc4ggg); + DECLARE_MACHINE_START(sc4); + DECLARE_MACHINE_RESET(sc4); }; class sc4_adder4_state : public sc4_state @@ -126,7 +128,7 @@ public: DECLARE_READ32_MEMBER(adder4_mem_r); DECLARE_WRITE32_MEMBER(adder4_mem_w); - + DECLARE_MACHINE_START(adder4); // devices required_device<cpu_device> m_adder4cpu; diff --git a/src/mame/includes/bigevglf.h b/src/mame/includes/bigevglf.h index 0e19b88b06e..a951cb9d68d 100644 --- a/src/mame/includes/bigevglf.h +++ b/src/mame/includes/bigevglf.h @@ -86,6 +86,9 @@ public: DECLARE_WRITE8_MEMBER(bigevglf_vidram_w); DECLARE_READ8_MEMBER(bigevglf_vidram_r); DECLARE_DRIVER_INIT(bigevglf); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; @@ -96,7 +99,7 @@ public: /*----------- defined in video/bigevglf.c -----------*/ -VIDEO_START( bigevglf ); + SCREEN_UPDATE_IND16( bigevglf ); diff --git a/src/mame/includes/bigstrkb.h b/src/mame/includes/bigstrkb.h index f4af6bb8950..eb7e2d94d23 100644 --- a/src/mame/includes/bigstrkb.h +++ b/src/mame/includes/bigstrkb.h @@ -29,10 +29,11 @@ public: TILE_GET_INFO_MEMBER(get_bsb_tile_info); TILE_GET_INFO_MEMBER(get_bsb_tile2_info); TILE_GET_INFO_MEMBER(get_bsb_tile3_info); + virtual void video_start(); }; /*----------- defined in video/bigstrkb.c -----------*/ -VIDEO_START(bigstrkb); + SCREEN_UPDATE_IND16(bigstrkb); diff --git a/src/mame/includes/bionicc.h b/src/mame/includes/bionicc.h index 23b9c8985f3..c5ebcd326d0 100644 --- a/src/mame/includes/bionicc.h +++ b/src/mame/includes/bionicc.h @@ -47,11 +47,14 @@ public: TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); TILE_GET_INFO_MEMBER(get_tx_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; /*----------- defined in video/bionicc.c -----------*/ -VIDEO_START( bionicc ); + SCREEN_UPDATE_IND16( bionicc ); diff --git a/src/mame/includes/bishi.h b/src/mame/includes/bishi.h index 77062c571ca..1b7537eba24 100644 --- a/src/mame/includes/bishi.h +++ b/src/mame/includes/bishi.h @@ -36,11 +36,14 @@ public: DECLARE_WRITE16_MEMBER(control2_w); DECLARE_READ16_MEMBER(bishi_mirror_r); DECLARE_READ16_MEMBER(bishi_K056832_rom_r); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; /*----------- defined in video/bishi.c -----------*/ extern void bishi_tile_callback(running_machine &machine, int layer, int *code, int *color, int *flags); -VIDEO_START(bishi); + SCREEN_UPDATE_RGB32(bishi); diff --git a/src/mame/includes/bking.h b/src/mame/includes/bking.h index da4b4b0525e..336f8342e19 100644 --- a/src/mame/includes/bking.h +++ b/src/mame/includes/bking.h @@ -80,6 +80,13 @@ public: DECLARE_WRITE8_MEMBER(unk_w); DECLARE_WRITE8_MEMBER(port_b_w); TILE_GET_INFO_MEMBER(get_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); + DECLARE_MACHINE_START(bking3); + DECLARE_MACHINE_RESET(bking3); + DECLARE_MACHINE_RESET(common); }; @@ -87,7 +94,7 @@ public: -PALETTE_INIT( bking ); -VIDEO_START( bking ); + + SCREEN_UPDATE_IND16( bking ); SCREEN_VBLANK( bking ); diff --git a/src/mame/includes/bladestl.h b/src/mame/includes/bladestl.h index 7f44743c808..36bb51d3af0 100644 --- a/src/mame/includes/bladestl.h +++ b/src/mame/includes/bladestl.h @@ -31,13 +31,16 @@ public: DECLARE_WRITE8_MEMBER(bladestl_port_B_w); DECLARE_READ8_MEMBER(bladestl_speech_busy_r); DECLARE_WRITE8_MEMBER(bladestl_speech_ctrl_w); + virtual void machine_start(); + virtual void machine_reset(); + virtual void palette_init(); }; /*----------- defined in video/bladestl.c -----------*/ -PALETTE_INIT( bladestl ); + SCREEN_UPDATE_IND16( bladestl ); diff --git a/src/mame/includes/blktiger.h b/src/mame/includes/blktiger.h index 8e1cd2a668d..5e55faccdba 100644 --- a/src/mame/includes/blktiger.h +++ b/src/mame/includes/blktiger.h @@ -59,6 +59,9 @@ public: TILEMAP_MAPPER_MEMBER(bg4x8_scan); TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_tx_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; @@ -66,5 +69,5 @@ public: -VIDEO_START( blktiger ); + SCREEN_UPDATE_IND16( blktiger ); diff --git a/src/mame/includes/blmbycar.h b/src/mame/includes/blmbycar.h index daf7ce1d595..774d180f23e 100644 --- a/src/mame/includes/blmbycar.h +++ b/src/mame/includes/blmbycar.h @@ -44,6 +44,11 @@ public: DECLARE_DRIVER_INIT(blmbycar); TILE_GET_INFO_MEMBER(get_tile_info_0); TILE_GET_INFO_MEMBER(get_tile_info_1); + virtual void video_start(); + DECLARE_MACHINE_START(blmbycar); + DECLARE_MACHINE_RESET(blmbycar); + DECLARE_MACHINE_START(watrball); + DECLARE_MACHINE_RESET(watrball); }; @@ -51,5 +56,5 @@ public: -VIDEO_START( blmbycar ); + SCREEN_UPDATE_IND16( blmbycar ); diff --git a/src/mame/includes/blockade.h b/src/mame/includes/blockade.h index 5940825e96e..d98e059599a 100644 --- a/src/mame/includes/blockade.h +++ b/src/mame/includes/blockade.h @@ -22,13 +22,17 @@ public: DECLARE_WRITE8_MEMBER(blockade_env_on_w); DECLARE_WRITE8_MEMBER(blockade_env_off_w); TILE_GET_INFO_MEMBER(get_bg_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/blockade.c -----------*/ -VIDEO_START( blockade ); + SCREEN_UPDATE_IND16( blockade ); /*----------- defined in audio/blockade.c -----------*/ diff --git a/src/mame/includes/blockhl.h b/src/mame/includes/blockhl.h index c46e4426694..6505aacef91 100644 --- a/src/mame/includes/blockhl.h +++ b/src/mame/includes/blockhl.h @@ -33,6 +33,9 @@ public: DECLARE_WRITE8_MEMBER(blockhl_sh_irqtrigger_w); DECLARE_READ8_MEMBER(k052109_051960_r); DECLARE_WRITE8_MEMBER(k052109_051960_w); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; /*----------- defined in video/blockhl.c -----------*/ @@ -40,5 +43,5 @@ public: extern void blockhl_tile_callback(running_machine &machine, int layer,int bank,int *code,int *color, int *flags, int *priority); extern void blockhl_sprite_callback(running_machine &machine, int *code,int *color,int *priority,int *shadow); -VIDEO_START( blockhl ); + SCREEN_UPDATE_IND16( blockhl ); diff --git a/src/mame/includes/blockout.h b/src/mame/includes/blockout.h index b2d69633c04..d80d3938d0e 100644 --- a/src/mame/includes/blockout.h +++ b/src/mame/includes/blockout.h @@ -31,11 +31,14 @@ public: DECLARE_WRITE16_MEMBER(blockout_paletteram_w); DECLARE_WRITE16_MEMBER(blockout_frontcolor_w); DECLARE_WRITE16_MEMBER(blockout_videoram_w); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; /*----------- defined in video/blockout.c -----------*/ -VIDEO_START( blockout ); + SCREEN_UPDATE_IND16( blockout ); diff --git a/src/mame/includes/bloodbro.h b/src/mame/includes/bloodbro.h index 732f06ba4f6..3eba36e490b 100644 --- a/src/mame/includes/bloodbro.h +++ b/src/mame/includes/bloodbro.h @@ -25,6 +25,7 @@ public: TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); TILE_GET_INFO_MEMBER(get_tx_tile_info); + virtual void video_start(); }; @@ -34,4 +35,4 @@ public: SCREEN_UPDATE_IND16( bloodbro ); SCREEN_UPDATE_IND16( weststry ); SCREEN_UPDATE_IND16( skysmash ); -VIDEO_START( bloodbro ); + diff --git a/src/mame/includes/blstroid.h b/src/mame/includes/blstroid.h index 4e681054581..5ce9edf5a4a 100644 --- a/src/mame/includes/blstroid.h +++ b/src/mame/includes/blstroid.h @@ -18,12 +18,15 @@ public: DECLARE_READ16_MEMBER(inputs_r); DECLARE_DRIVER_INIT(blstroid); TILE_GET_INFO_MEMBER(get_playfield_tile_info); + DECLARE_MACHINE_START(blstroid); + DECLARE_MACHINE_RESET(blstroid); + DECLARE_VIDEO_START(blstroid); }; /*----------- defined in video/blstroid.c -----------*/ -VIDEO_START( blstroid ); + SCREEN_UPDATE_IND16( blstroid ); void blstroid_scanline_update(screen_device &screen, int scanline); diff --git a/src/mame/includes/blueprnt.h b/src/mame/includes/blueprnt.h index 79a323d9c57..b570f2c3c0b 100644 --- a/src/mame/includes/blueprnt.h +++ b/src/mame/includes/blueprnt.h @@ -37,12 +37,16 @@ public: DECLARE_WRITE8_MEMBER(blueprnt_flipscreen_w); DECLARE_WRITE8_MEMBER(dipsw_w); TILE_GET_INFO_MEMBER(get_bg_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/blueprnt.c -----------*/ -PALETTE_INIT( blueprnt ); -VIDEO_START( blueprnt ); + + SCREEN_UPDATE_IND16( blueprnt ); diff --git a/src/mame/includes/bogeyman.h b/src/mame/includes/bogeyman.h index d4065e6ad72..11a500f5a7b 100644 --- a/src/mame/includes/bogeyman.h +++ b/src/mame/includes/bogeyman.h @@ -41,12 +41,16 @@ public: DECLARE_WRITE8_MEMBER(bogeyman_colbank_w); TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/bogeyman.c -----------*/ -PALETTE_INIT( bogeyman ); -VIDEO_START( bogeyman ); + + SCREEN_UPDATE_IND16( bogeyman ); diff --git a/src/mame/includes/bombjack.h b/src/mame/includes/bombjack.h index c9544cee253..23fd5609f14 100644 --- a/src/mame/includes/bombjack.h +++ b/src/mame/includes/bombjack.h @@ -36,11 +36,14 @@ public: DECLARE_WRITE8_MEMBER(bombjack_flipscreen_w); TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; /*----------- defined in video/bombjack.c -----------*/ -VIDEO_START( bombjack ); + SCREEN_UPDATE_IND16( bombjack ); diff --git a/src/mame/includes/boogwing.h b/src/mame/includes/boogwing.h index fa4888a009f..808b5cc97eb 100644 --- a/src/mame/includes/boogwing.h +++ b/src/mame/includes/boogwing.h @@ -46,11 +46,12 @@ public: DECLARE_WRITE8_MEMBER(sound_bankswitch_w); DECLARE_DRIVER_INIT(boogwing); + virtual void video_start(); }; /*----------- defined in video/boogwing.c -----------*/ -VIDEO_START( boogwing ); + SCREEN_UPDATE_RGB32( boogwing ); diff --git a/src/mame/includes/bottom9.h b/src/mame/includes/bottom9.h index 9d0cfa095d1..a195e71c5c5 100644 --- a/src/mame/includes/bottom9.h +++ b/src/mame/includes/bottom9.h @@ -43,6 +43,9 @@ public: DECLARE_WRITE8_MEMBER(bottom9_sh_irqtrigger_w); DECLARE_WRITE8_MEMBER(nmi_enable_w); DECLARE_WRITE8_MEMBER(sound_bank_w); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; /*----------- defined in video/bottom9.c -----------*/ @@ -51,5 +54,5 @@ extern void bottom9_tile_callback(running_machine &machine, int layer,int bank,i extern void bottom9_sprite_callback(running_machine &machine, int *code,int *color,int *priority,int *shadow); extern void bottom9_zoom_callback(running_machine &machine, int *code,int *color,int *flags); -VIDEO_START( bottom9 ); + SCREEN_UPDATE_IND16( bottom9 ); diff --git a/src/mame/includes/brkthru.h b/src/mame/includes/brkthru.h index 73e554f1580..78eb8da0ba8 100644 --- a/src/mame/includes/brkthru.h +++ b/src/mame/includes/brkthru.h @@ -41,11 +41,15 @@ public: DECLARE_DRIVER_INIT(brkthru); TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/brkthru.c -----------*/ -VIDEO_START( brkthru ); -PALETTE_INIT( brkthru ); + + SCREEN_UPDATE_IND16( brkthru ); diff --git a/src/mame/includes/bsktball.h b/src/mame/includes/bsktball.h index 3a74df9efde..ad4135e81d7 100644 --- a/src/mame/includes/bsktball.h +++ b/src/mame/includes/bsktball.h @@ -51,6 +51,10 @@ public: DECLARE_WRITE8_MEMBER(bsktball_led2_w); DECLARE_WRITE8_MEMBER(bsktball_videoram_w); TILE_GET_INFO_MEMBER(get_bg_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); }; @@ -70,6 +74,6 @@ DISCRETE_SOUND_EXTERN( bsktball ); /*----------- defined in video/bsktball.c -----------*/ -VIDEO_START( bsktball ); + SCREEN_UPDATE_IND16( bsktball ); diff --git a/src/mame/includes/btime.h b/src/mame/includes/btime.h index 87131c57755..0386803d107 100644 --- a/src/mame/includes/btime.h +++ b/src/mame/includes/btime.h @@ -98,6 +98,15 @@ public: DECLARE_DRIVER_INIT(protennb); DECLARE_DRIVER_INIT(disco); DECLARE_DRIVER_INIT(lnc); + DECLARE_MACHINE_START(btime); + DECLARE_MACHINE_RESET(btime); + DECLARE_VIDEO_START(btime); + DECLARE_PALETTE_INIT(btime); + DECLARE_MACHINE_RESET(lnc); + DECLARE_PALETTE_INIT(lnc); + DECLARE_MACHINE_START(mmonkey); + DECLARE_MACHINE_RESET(mmonkey); + DECLARE_VIDEO_START(bnj); }; @@ -107,11 +116,11 @@ public: /*----------- defined in video/btime.c -----------*/ -PALETTE_INIT( btime ); -PALETTE_INIT( lnc ); -VIDEO_START( btime ); -VIDEO_START( bnj ); + + + + SCREEN_UPDATE_IND16( btime ); SCREEN_UPDATE_IND16( cookrace ); diff --git a/src/mame/includes/bublbobl.h b/src/mame/includes/bublbobl.h index a7a78d0813e..e208458e9b9 100644 --- a/src/mame/includes/bublbobl.h +++ b/src/mame/includes/bublbobl.h @@ -98,6 +98,16 @@ public: DECLARE_DRIVER_INIT(tokio); DECLARE_DRIVER_INIT(dland); DECLARE_DRIVER_INIT(bublbobl); + DECLARE_MACHINE_START(tokio); + DECLARE_MACHINE_RESET(tokio); + DECLARE_MACHINE_START(bublbobl); + DECLARE_MACHINE_RESET(bublbobl); + DECLARE_MACHINE_START(boblbobl); + DECLARE_MACHINE_RESET(boblbobl); + DECLARE_MACHINE_START(bub68705); + DECLARE_MACHINE_RESET(bub68705); + DECLARE_MACHINE_START(common); + DECLARE_MACHINE_RESET(common); }; diff --git a/src/mame/includes/buggychl.h b/src/mame/includes/buggychl.h index e4a76c393f7..be90dc901ea 100644 --- a/src/mame/includes/buggychl.h +++ b/src/mame/includes/buggychl.h @@ -51,12 +51,16 @@ public: DECLARE_WRITE8_MEMBER(port_b_0_w); DECLARE_WRITE8_MEMBER(port_a_1_w); DECLARE_WRITE8_MEMBER(port_b_1_w); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/buggychl.c -----------*/ -PALETTE_INIT( buggychl ); -VIDEO_START( buggychl ); + + SCREEN_UPDATE_IND16( buggychl ); diff --git a/src/mame/includes/bwing.h b/src/mame/includes/bwing.h index 4e1815d35f3..97c0f797d67 100644 --- a/src/mame/includes/bwing.h +++ b/src/mame/includes/bwing.h @@ -71,6 +71,9 @@ public: TILE_GET_INFO_MEMBER(get_bgtileinfo); TILE_GET_INFO_MEMBER(get_charinfo); TILEMAP_MAPPER_MEMBER(bwing_scan_cols); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; @@ -79,5 +82,5 @@ public: extern const gfx_layout bwing_tilelayout; -VIDEO_START( bwing ); + SCREEN_UPDATE_IND16( bwing ); diff --git a/src/mame/includes/bzone.h b/src/mame/includes/bzone.h index 69352a887ad..bf9811a2ec2 100644 --- a/src/mame/includes/bzone.h +++ b/src/mame/includes/bzone.h @@ -24,6 +24,8 @@ public: DECLARE_READ8_MEMBER(redbaron_joy_r); DECLARE_WRITE8_MEMBER(redbaron_joysound_w); DECLARE_DRIVER_INIT(bradley); + virtual void machine_start(); + DECLARE_MACHINE_START(redbaron); }; diff --git a/src/mame/includes/cabal.h b/src/mame/includes/cabal.h index d22eccd21d2..f3ca802b640 100644 --- a/src/mame/includes/cabal.h +++ b/src/mame/includes/cabal.h @@ -32,6 +32,8 @@ public: DECLARE_DRIVER_INIT(cabalbl2); TILE_GET_INFO_MEMBER(get_back_tile_info); TILE_GET_INFO_MEMBER(get_text_tile_info); + virtual void video_start(); + DECLARE_MACHINE_RESET(cabalbl); }; diff --git a/src/mame/includes/calomega.h b/src/mame/includes/calomega.h index d86603a9376..be0f556aebd 100644 --- a/src/mame/includes/calomega.h +++ b/src/mame/includes/calomega.h @@ -41,11 +41,13 @@ public: DECLARE_DRIVER_INIT(comg080); DECLARE_DRIVER_INIT(jjpoker); TILE_GET_INFO_MEMBER(get_bg_tile_info); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/calomega.c -----------*/ -PALETTE_INIT( calomega ); -VIDEO_START( calomega ); + + SCREEN_UPDATE_IND16( calomega ); diff --git a/src/mame/includes/canyon.h b/src/mame/includes/canyon.h index d25c9190e5a..41cd04bd469 100644 --- a/src/mame/includes/canyon.h +++ b/src/mame/includes/canyon.h @@ -34,6 +34,8 @@ public: DECLARE_WRITE8_MEMBER(canyon_led_w); DECLARE_WRITE8_MEMBER(canyon_videoram_w); TILE_GET_INFO_MEMBER(get_bg_tile_info); + virtual void video_start(); + virtual void palette_init(); }; @@ -49,6 +51,6 @@ DISCRETE_SOUND_EXTERN( canyon ); /*----------- defined in video/canyon.c -----------*/ -VIDEO_START( canyon ); + SCREEN_UPDATE_IND16( canyon ); diff --git a/src/mame/includes/capbowl.h b/src/mame/includes/capbowl.h index 0d3d507876d..ab1620364b7 100644 --- a/src/mame/includes/capbowl.h +++ b/src/mame/includes/capbowl.h @@ -37,11 +37,14 @@ public: DECLARE_WRITE8_MEMBER(bowlrama_blitter_w); DECLARE_READ8_MEMBER(bowlrama_blitter_r); DECLARE_DRIVER_INIT(capbowl); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; /*----------- defined in video/capbowl.c -----------*/ -VIDEO_START( capbowl ); + SCREEN_UPDATE_RGB32( capbowl ); diff --git a/src/mame/includes/carjmbre.h b/src/mame/includes/carjmbre.h index d89ce945e5b..4b621fc49ff 100644 --- a/src/mame/includes/carjmbre.h +++ b/src/mame/includes/carjmbre.h @@ -28,6 +28,9 @@ public: DECLARE_WRITE8_MEMBER(carjmbre_8806_w); DECLARE_WRITE8_MEMBER(carjmbre_videoram_w); TILE_GET_INFO_MEMBER(get_carjmbre_tile_info); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); }; @@ -35,8 +38,8 @@ public: /*----------- defined in video/carjmbre.c -----------*/ -PALETTE_INIT( carjmbre ); -VIDEO_START( carjmbre ); + + SCREEN_UPDATE_IND16( carjmbre ); diff --git a/src/mame/includes/carpolo.h b/src/mame/includes/carpolo.h index 342e85696a1..1d928bca4f1 100644 --- a/src/mame/includes/carpolo.h +++ b/src/mame/includes/carpolo.h @@ -62,6 +62,10 @@ public: DECLARE_WRITE8_MEMBER(carpolo_car_border_interrupt_clear_w); DECLARE_WRITE8_MEMBER(carpolo_timer_interrupt_clear_w); DECLARE_DRIVER_INIT(carpolo); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); }; @@ -77,8 +81,8 @@ WRITE_LINE_DEVICE_HANDLER( carpolo_7474_2s_2_q_cb ); WRITE_LINE_DEVICE_HANDLER( carpolo_7474_2u_1_q_cb ); WRITE_LINE_DEVICE_HANDLER( carpolo_7474_2u_2_q_cb ); -MACHINE_START( carpolo ); -MACHINE_RESET( carpolo ); + + @@ -94,7 +98,7 @@ void carpolo_generate_car_border_interrupt(running_machine &machine, int car, in /*----------- defined in video/carpolo.c -----------*/ -PALETTE_INIT( carpolo ); -VIDEO_START( carpolo ); + + SCREEN_UPDATE_IND16( carpolo ); SCREEN_VBLANK( carpolo ); diff --git a/src/mame/includes/cave.h b/src/mame/includes/cave.h index 5724622c460..902aa8613d7 100644 --- a/src/mame/includes/cave.h +++ b/src/mame/includes/cave.h @@ -186,26 +186,40 @@ public: TILE_GET_INFO_MEMBER(get_tile_info_1); TILE_GET_INFO_MEMBER(get_tile_info_2); TILE_GET_INFO_MEMBER(get_tile_info_3); + DECLARE_MACHINE_START(cave); + DECLARE_MACHINE_RESET(cave); + DECLARE_VIDEO_START(cave_2_layers); + DECLARE_PALETTE_INIT(dfeveron); + DECLARE_VIDEO_START(cave_3_layers); + DECLARE_PALETTE_INIT(ddonpach); + DECLARE_PALETTE_INIT(cave); + DECLARE_VIDEO_START(cave_1_layer); + DECLARE_PALETTE_INIT(korokoro); + DECLARE_PALETTE_INIT(mazinger); + DECLARE_VIDEO_START(cave_4_layers); + DECLARE_PALETTE_INIT(pwrinst2); + DECLARE_VIDEO_START(sailormn_3_layers); + DECLARE_PALETTE_INIT(sailormn); }; /*----------- defined in video/cave.c -----------*/ -PALETTE_INIT( cave ); -PALETTE_INIT( ddonpach ); -PALETTE_INIT( dfeveron ); -PALETTE_INIT( mazinger ); -PALETTE_INIT( sailormn ); -PALETTE_INIT( pwrinst2 ); -PALETTE_INIT( korokoro ); -VIDEO_START( cave_1_layer ); -VIDEO_START( cave_2_layers ); -VIDEO_START( cave_3_layers ); -VIDEO_START( cave_4_layers ); -VIDEO_START( sailormn_3_layers ); + + + + + + + + + + + + SCREEN_UPDATE_IND16( cave ); diff --git a/src/mame/includes/cbasebal.h b/src/mame/includes/cbasebal.h index d779be81752..2a18d197cd7 100644 --- a/src/mame/includes/cbasebal.h +++ b/src/mame/includes/cbasebal.h @@ -45,10 +45,13 @@ public: DECLARE_DRIVER_INIT(cbasebal); TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; /*----------- defined in video/cbasebal.c -----------*/ -VIDEO_START( cbasebal ); + SCREEN_UPDATE_IND16( cbasebal ); diff --git a/src/mame/includes/cbuster.h b/src/mame/includes/cbuster.h index 6159c82d45e..ee839201453 100644 --- a/src/mame/includes/cbuster.h +++ b/src/mame/includes/cbuster.h @@ -39,6 +39,9 @@ public: DECLARE_WRITE16_MEMBER(twocrude_palette_24bit_rg_w); DECLARE_WRITE16_MEMBER(twocrude_palette_24bit_b_w); DECLARE_DRIVER_INIT(twocrude); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; @@ -46,5 +49,5 @@ public: /*----------- defined in video/cbuster.c -----------*/ -VIDEO_START( twocrude ); + SCREEN_UPDATE_RGB32( twocrude ); diff --git a/src/mame/includes/ccastles.h b/src/mame/includes/ccastles.h index 55248b63bc4..1f36204c9ca 100644 --- a/src/mame/includes/ccastles.h +++ b/src/mame/includes/ccastles.h @@ -64,13 +64,16 @@ public: DECLARE_WRITE8_MEMBER(ccastles_bitmode_w); DECLARE_WRITE8_MEMBER(ccastles_bitmode_addr_w); DECLARE_CUSTOM_INPUT_MEMBER(get_vblank); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; /*----------- defined in video/ccastles.c -----------*/ -VIDEO_START( ccastles ); + SCREEN_UPDATE_IND16( ccastles ); diff --git a/src/mame/includes/cchasm.h b/src/mame/includes/cchasm.h index ec2f257cdb4..a014bfe8040 100644 --- a/src/mame/includes/cchasm.h +++ b/src/mame/includes/cchasm.h @@ -31,6 +31,7 @@ public: DECLARE_READ16_MEMBER(cchasm_io_r); INPUT_CHANGED_MEMBER(cchasm_set_coin_flag); DECLARE_WRITE_LINE_MEMBER(cchasm_6840_irq); + virtual void video_start(); }; @@ -46,5 +47,5 @@ SOUND_START( cchasm ); /*----------- defined in video/cchasm.c -----------*/ -VIDEO_START( cchasm ); + diff --git a/src/mame/includes/cclimber.h b/src/mame/includes/cclimber.h index 47c21af7004..8c5bd208b0e 100644 --- a/src/mame/includes/cclimber.h +++ b/src/mame/includes/cclimber.h @@ -58,6 +58,14 @@ public: TILE_GET_INFO_MEMBER(cclimber_get_bs_tile_info); TILE_GET_INFO_MEMBER(toprollr_get_bs_tile_info); TILE_GET_INFO_MEMBER(toproller_get_bg_tile_info); + DECLARE_MACHINE_RESET(cclimber); + DECLARE_VIDEO_START(cclimber); + DECLARE_PALETTE_INIT(cclimber); + DECLARE_VIDEO_START(swimmer); + DECLARE_PALETTE_INIT(swimmer); + DECLARE_PALETTE_INIT(yamato); + DECLARE_VIDEO_START(toprollr); + DECLARE_PALETTE_INIT(toprollr); }; @@ -67,17 +75,17 @@ public: /*----------- defined in video/cclimber.c -----------*/ -PALETTE_INIT( cclimber ); -VIDEO_START( cclimber ); + + SCREEN_UPDATE_IND16( cclimber ); -PALETTE_INIT( swimmer ); -VIDEO_START( swimmer ); + + SCREEN_UPDATE_IND16( swimmer ); -PALETTE_INIT( yamato ); + SCREEN_UPDATE_IND16( yamato ); -PALETTE_INIT( toprollr ); -VIDEO_START( toprollr ); + + SCREEN_UPDATE_IND16( toprollr ); diff --git a/src/mame/includes/cdi.h b/src/mame/includes/cdi.h index 214e03eae05..a1541ee692d 100644 --- a/src/mame/includes/cdi.h +++ b/src/mame/includes/cdi.h @@ -32,6 +32,19 @@ public: mcd212_regs_t m_mcd212_regs; mcd212_ab_t m_mcd212_ab; DECLARE_INPUT_CHANGED_MEMBER(mcu_input); + virtual void machine_start(); + virtual void video_start(); + DECLARE_MACHINE_RESET(cdi); + DECLARE_MACHINE_RESET(quizrd12); + DECLARE_MACHINE_RESET(quizrd17); + DECLARE_MACHINE_RESET(quizrd18); + DECLARE_MACHINE_RESET(quizrd22); + DECLARE_MACHINE_RESET(quizrd23); + DECLARE_MACHINE_RESET(quizrd32); + DECLARE_MACHINE_RESET(quizrd34); + DECLARE_MACHINE_RESET(quizrr40); + DECLARE_MACHINE_RESET(quizrr41); + DECLARE_MACHINE_RESET(quizrr42); }; /*----------- debug defines -----------*/ diff --git a/src/mame/includes/centiped.h b/src/mame/includes/centiped.h index a1b937cebc3..6847e228805 100644 --- a/src/mame/includes/centiped.h +++ b/src/mame/includes/centiped.h @@ -67,17 +67,25 @@ public: TILE_GET_INFO_MEMBER(warlords_get_tile_info); TILE_GET_INFO_MEMBER(milliped_get_tile_info); TILE_GET_INFO_MEMBER(bullsdrt_get_tile_info); + DECLARE_MACHINE_START(centiped); + DECLARE_MACHINE_RESET(centiped); + DECLARE_VIDEO_START(centiped); + DECLARE_VIDEO_START(bullsdrt); + DECLARE_MACHINE_RESET(magworm); + DECLARE_VIDEO_START(milliped); + DECLARE_VIDEO_START(warlords); + DECLARE_PALETTE_INIT(warlords); }; /*----------- defined in video/centiped.c -----------*/ -PALETTE_INIT( warlords ); -VIDEO_START( centiped ); -VIDEO_START( milliped ); -VIDEO_START( warlords ); -VIDEO_START( bullsdrt ); + + + + + SCREEN_UPDATE_IND16( centiped ); SCREEN_UPDATE_IND16( milliped ); diff --git a/src/mame/includes/chaknpop.h b/src/mame/includes/chaknpop.h index d217ee0aa02..e518a772969 100644 --- a/src/mame/includes/chaknpop.h +++ b/src/mame/includes/chaknpop.h @@ -48,6 +48,10 @@ public: DECLARE_WRITE8_MEMBER(unknown_port_1_w); DECLARE_WRITE8_MEMBER(unknown_port_2_w); TILE_GET_INFO_MEMBER(chaknpop_get_tx_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); }; @@ -58,7 +62,7 @@ public: /*----------- defined in video/chaknpop.c -----------*/ -PALETTE_INIT( chaknpop ); -VIDEO_START( chaknpop ); + + SCREEN_UPDATE_IND16( chaknpop ); diff --git a/src/mame/includes/champbas.h b/src/mame/includes/champbas.h index 8e392f5dee6..cac5bdf9bd8 100644 --- a/src/mame/includes/champbas.h +++ b/src/mame/includes/champbas.h @@ -53,16 +53,23 @@ public: DECLARE_DRIVER_INIT(champbas); TILE_GET_INFO_MEMBER(champbas_get_bg_tile_info); TILE_GET_INFO_MEMBER(exctsccr_get_bg_tile_info); + DECLARE_MACHINE_START(champbas); + DECLARE_MACHINE_RESET(champbas); + DECLARE_VIDEO_START(champbas); + DECLARE_PALETTE_INIT(champbas); + DECLARE_MACHINE_START(exctsccr); + DECLARE_VIDEO_START(exctsccr); + DECLARE_PALETTE_INIT(exctsccr); }; /*----------- defined in video/champbas.c -----------*/ -PALETTE_INIT( champbas ); -PALETTE_INIT( exctsccr ); -VIDEO_START( champbas ); -VIDEO_START( exctsccr ); + + + + SCREEN_UPDATE_IND16( champbas ); SCREEN_UPDATE_IND16( exctsccr ); diff --git a/src/mame/includes/changela.h b/src/mame/includes/changela.h index 50864f7e3ca..d336e1ed15c 100644 --- a/src/mame/includes/changela.h +++ b/src/mame/includes/changela.h @@ -85,10 +85,13 @@ public: DECLARE_READ8_MEMBER(changela_mem_device_r); DECLARE_WRITE8_MEMBER(changela_slope_rom_addr_hi_w); DECLARE_WRITE8_MEMBER(changela_slope_rom_addr_lo_w); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; /*----------- defined in video/changela.c -----------*/ -VIDEO_START( changela ); + SCREEN_UPDATE_IND16( changela ); diff --git a/src/mame/includes/cheekyms.h b/src/mame/includes/cheekyms.h index 0491a4010c1..fbc74469be5 100644 --- a/src/mame/includes/cheekyms.h +++ b/src/mame/includes/cheekyms.h @@ -32,11 +32,14 @@ public: DECLARE_WRITE8_MEMBER(cheekyms_port_80_w); DECLARE_INPUT_CHANGED_MEMBER(coin_inserted); TILE_GET_INFO_MEMBER(cheekyms_get_tile_info); + virtual void machine_start(); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/cheekyms.c -----------*/ -PALETTE_INIT( cheekyms ); -VIDEO_START( cheekyms ); + + SCREEN_UPDATE_IND16( cheekyms ); diff --git a/src/mame/includes/chqflag.h b/src/mame/includes/chqflag.h index bd1b8bd6b2f..834a432b303 100644 --- a/src/mame/includes/chqflag.h +++ b/src/mame/includes/chqflag.h @@ -40,6 +40,9 @@ public: DECLARE_WRITE8_MEMBER(chqflag_sh_irqtrigger_w); DECLARE_WRITE8_MEMBER(k007232_bankswitch_w); DECLARE_WRITE8_MEMBER(k007232_extvolume_w); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; /*----------- defined in video/chqflag.c -----------*/ @@ -48,5 +51,5 @@ extern void chqflag_sprite_callback(running_machine &machine, int *code,int *col extern void chqflag_zoom_callback_0(running_machine &machine, int *code,int *color,int *flags); extern void chqflag_zoom_callback_1(running_machine &machine, int *code,int *color,int *flags); -VIDEO_START( chqflag ); + SCREEN_UPDATE_IND16( chqflag ); diff --git a/src/mame/includes/cinemat.h b/src/mame/includes/cinemat.h index 89418fa52cf..81cbbbbd4da 100644 --- a/src/mame/includes/cinemat.h +++ b/src/mame/includes/cinemat.h @@ -57,6 +57,13 @@ public: DECLARE_DRIVER_INIT(tailg); DECLARE_DRIVER_INIT(sundance); DECLARE_DRIVER_INIT(qb3); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); + DECLARE_VIDEO_START(cinemat_16level); + DECLARE_VIDEO_START(cinemat_64level); + DECLARE_VIDEO_START(cinemat_color); + DECLARE_VIDEO_START(cinemat_qb3color); }; @@ -85,11 +92,11 @@ MACHINE_CONFIG_EXTERN( qb3_sound ); void cinemat_vector_callback(device_t *device, INT16 sx, INT16 sy, INT16 ex, INT16 ey, UINT8 shift); -VIDEO_START( cinemat_bilevel ); -VIDEO_START( cinemat_16level ); -VIDEO_START( cinemat_64level ); -VIDEO_START( cinemat_color ); -VIDEO_START( cinemat_qb3color ); + + + + + SCREEN_UPDATE_RGB32( cinemat ); SCREEN_UPDATE_RGB32( spacewar ); diff --git a/src/mame/includes/circus.h b/src/mame/includes/circus.h index 9f9b1a6f92a..d6a337c2996 100644 --- a/src/mame/includes/circus.h +++ b/src/mame/includes/circus.h @@ -33,6 +33,9 @@ public: DECLARE_DRIVER_INIT(robotbwl); DECLARE_DRIVER_INIT(crash); TILE_GET_INFO_MEMBER(get_bg_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; diff --git a/src/mame/includes/circusc.h b/src/mame/includes/circusc.h index 5b790f8f7d1..5dfc0c7d9df 100644 --- a/src/mame/includes/circusc.h +++ b/src/mame/includes/circusc.h @@ -53,12 +53,16 @@ public: DECLARE_WRITE8_MEMBER(circusc_flipscreen_w); DECLARE_DRIVER_INIT(circusc); TILE_GET_INFO_MEMBER(get_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/circusc.c -----------*/ -VIDEO_START( circusc ); -PALETTE_INIT( circusc ); + + SCREEN_UPDATE_IND16( circusc ); diff --git a/src/mame/includes/cischeat.h b/src/mame/includes/cischeat.h index 5fcaf2e6538..8a7234c8b87 100644 --- a/src/mame/includes/cischeat.h +++ b/src/mame/includes/cischeat.h @@ -77,6 +77,9 @@ public: TILEMAP_MAPPER_MEMBER(cischeat_scan_16x16); TILE_GET_INFO_MEMBER(cischeat_get_scroll_tile_info_8x8); TILE_GET_INFO_MEMBER(cischeat_get_scroll_tile_info_16x16); + DECLARE_VIDEO_START(bigrun); + DECLARE_VIDEO_START(f1gpstar); + DECLARE_VIDEO_START(cischeat); }; @@ -85,9 +88,9 @@ public: -VIDEO_START( bigrun ); -VIDEO_START( cischeat ); -VIDEO_START( f1gpstar ); + + + SCREEN_UPDATE_IND16( bigrun ); SCREEN_UPDATE_IND16( cischeat ); diff --git a/src/mame/includes/citycon.h b/src/mame/includes/citycon.h index 0f6cfc016bb..eee487c1d13 100644 --- a/src/mame/includes/citycon.h +++ b/src/mame/includes/citycon.h @@ -37,6 +37,9 @@ public: TILEMAP_MAPPER_MEMBER(citycon_scan); TILE_GET_INFO_MEMBER(get_fg_tile_info); TILE_GET_INFO_MEMBER(get_bg_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; @@ -44,4 +47,4 @@ public: SCREEN_UPDATE_IND16( citycon ); -VIDEO_START( citycon ); + diff --git a/src/mame/includes/cloak.h b/src/mame/includes/cloak.h index 1561483cba0..0dce9078f26 100644 --- a/src/mame/includes/cloak.h +++ b/src/mame/includes/cloak.h @@ -39,6 +39,7 @@ public: void set_current_bitmap_videoram_pointer(); void adjust_xy(int offset); TILE_GET_INFO_MEMBER(get_bg_tile_info); + virtual void video_start(); }; @@ -46,5 +47,5 @@ public: -VIDEO_START( cloak ); + SCREEN_UPDATE_IND16( cloak ); diff --git a/src/mame/includes/cloud9.h b/src/mame/includes/cloud9.h index f1f50407f4a..5ffc8ab3d6d 100644 --- a/src/mame/includes/cloud9.h +++ b/src/mame/includes/cloud9.h @@ -55,12 +55,15 @@ public: DECLARE_WRITE8_MEMBER(cloud9_bitmode_w); DECLARE_WRITE8_MEMBER(cloud9_bitmode_addr_w); DECLARE_CUSTOM_INPUT_MEMBER(get_vblank); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; /*----------- defined in video/cloud9.c -----------*/ -VIDEO_START( cloud9 ); + SCREEN_UPDATE_IND16( cloud9 ); diff --git a/src/mame/includes/clshroad.h b/src/mame/includes/clshroad.h index 7e709f588e1..7f56d5fbaeb 100644 --- a/src/mame/includes/clshroad.h +++ b/src/mame/includes/clshroad.h @@ -25,14 +25,19 @@ public: TILEMAP_MAPPER_MEMBER(tilemap_scan_rows_extra); TILE_GET_INFO_MEMBER(get_tile_info_fb1); TILE_GET_INFO_MEMBER(get_tile_info_1); + virtual void machine_reset(); + DECLARE_VIDEO_START(firebatl); + DECLARE_PALETTE_INIT(firebatl); + DECLARE_VIDEO_START(clshroad); + DECLARE_PALETTE_INIT(clshroad); }; /*----------- defined in video/clshroad.c -----------*/ -PALETTE_INIT( firebatl ); -PALETTE_INIT( clshroad ); -VIDEO_START( firebatl ); -VIDEO_START( clshroad ); + + + + SCREEN_UPDATE_IND16( clshroad ); diff --git a/src/mame/includes/cninja.h b/src/mame/includes/cninja.h index dd1cd44b4f6..f1eb3e28bb3 100644 --- a/src/mame/includes/cninja.h +++ b/src/mame/includes/cninja.h @@ -61,12 +61,16 @@ public: DECLARE_DRIVER_INIT(stoneage); DECLARE_DRIVER_INIT(mutantf); DECLARE_DRIVER_INIT(cninja); + virtual void machine_start(); + virtual void machine_reset(); + DECLARE_VIDEO_START(stoneage); + DECLARE_VIDEO_START(mutantf); }; /*----------- defined in video/cninja.c -----------*/ -VIDEO_START( stoneage ); -VIDEO_START( mutantf ); + + SCREEN_UPDATE_IND16( cninja ); SCREEN_UPDATE_IND16( cninjabl ); diff --git a/src/mame/includes/combatsc.h b/src/mame/includes/combatsc.h index 18ed314b29f..37827657264 100644 --- a/src/mame/includes/combatsc.h +++ b/src/mame/includes/combatsc.h @@ -72,6 +72,13 @@ public: TILE_GET_INFO_MEMBER(get_tile_info0_bootleg); TILE_GET_INFO_MEMBER(get_tile_info1_bootleg); TILE_GET_INFO_MEMBER(get_text_info_bootleg); + virtual void machine_reset(); + DECLARE_MACHINE_START(combatsc); + DECLARE_VIDEO_START(combatsc); + DECLARE_PALETTE_INIT(combatsc); + DECLARE_MACHINE_START(combatscb); + DECLARE_VIDEO_START(combatscb); + DECLARE_PALETTE_INIT(combatscb); }; @@ -79,9 +86,9 @@ public: -PALETTE_INIT( combatsc ); -PALETTE_INIT( combatscb ); -VIDEO_START( combatsc ); -VIDEO_START( combatscb ); + + + + SCREEN_UPDATE_IND16( combatscb ); SCREEN_UPDATE_IND16( combatsc ); diff --git a/src/mame/includes/commando.h b/src/mame/includes/commando.h index 358174b5bb9..95c1e13707c 100644 --- a/src/mame/includes/commando.h +++ b/src/mame/includes/commando.h @@ -43,6 +43,9 @@ public: DECLARE_DRIVER_INIT(commando); TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; @@ -50,5 +53,5 @@ public: /*----------- defined in video/commando.c -----------*/ -VIDEO_START( commando ); + SCREEN_UPDATE_IND16( commando ); diff --git a/src/mame/includes/compgolf.h b/src/mame/includes/compgolf.h index 0100d0e8bab..3a6dc92a16d 100644 --- a/src/mame/includes/compgolf.h +++ b/src/mame/includes/compgolf.h @@ -37,11 +37,15 @@ public: TILE_GET_INFO_MEMBER(get_text_info); TILEMAP_MAPPER_MEMBER(back_scan); TILE_GET_INFO_MEMBER(get_back_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/compgolf.c -----------*/ -PALETTE_INIT ( compgolf ); -VIDEO_START ( compgolf ); + + SCREEN_UPDATE_IND16( compgolf ); diff --git a/src/mame/includes/contra.h b/src/mame/includes/contra.h index d4da776e63a..5aa20715699 100644 --- a/src/mame/includes/contra.h +++ b/src/mame/includes/contra.h @@ -57,14 +57,17 @@ public: TILE_GET_INFO_MEMBER(get_fg_tile_info); TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_tx_tile_info); + virtual void machine_start(); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/contra.c -----------*/ -PALETTE_INIT( contra ); + SCREEN_UPDATE_IND16( contra ); -VIDEO_START( contra ); + diff --git a/src/mame/includes/coolpool.h b/src/mame/includes/coolpool.h index a356df158ef..7303afa0e03 100644 --- a/src/mame/includes/coolpool.h +++ b/src/mame/includes/coolpool.h @@ -56,4 +56,6 @@ public: DECLARE_DRIVER_INIT(coolpool); DECLARE_DRIVER_INIT(amerdart); DECLARE_DRIVER_INIT(9ballsht); + DECLARE_MACHINE_RESET(amerdart); + DECLARE_MACHINE_RESET(coolpool); }; diff --git a/src/mame/includes/cop01.h b/src/mame/includes/cop01.h index 872626bd256..d2e499cf974 100644 --- a/src/mame/includes/cop01.h +++ b/src/mame/includes/cop01.h @@ -42,6 +42,10 @@ public: DECLARE_DRIVER_INIT(mightguy); TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); }; @@ -49,7 +53,7 @@ public: /*----------- defined in video/cop01.c -----------*/ -PALETTE_INIT( cop01 ); -VIDEO_START( cop01 ); + + SCREEN_UPDATE_IND16( cop01 ); diff --git a/src/mame/includes/copsnrob.h b/src/mame/includes/copsnrob.h index fb44f9f021d..bc6a94e330f 100644 --- a/src/mame/includes/copsnrob.h +++ b/src/mame/includes/copsnrob.h @@ -33,6 +33,9 @@ public: DECLARE_READ8_MEMBER(copsnrob_misc_r); DECLARE_WRITE8_MEMBER(copsnrob_misc2_w); DECLARE_WRITE8_MEMBER(copsnrob_misc_w); + virtual void machine_start(); + virtual void machine_reset(); + virtual void palette_init(); }; diff --git a/src/mame/includes/cosmic.h b/src/mame/includes/cosmic.h index 4f353129349..e35cf989230 100644 --- a/src/mame/includes/cosmic.h +++ b/src/mame/includes/cosmic.h @@ -62,17 +62,24 @@ public: DECLARE_DRIVER_INIT(nomnlnd); DECLARE_DRIVER_INIT(cosmica); DECLARE_DRIVER_INIT(panic); + DECLARE_MACHINE_START(cosmic); + DECLARE_MACHINE_RESET(cosmic); + DECLARE_PALETTE_INIT(cosmicg); + DECLARE_PALETTE_INIT(panic); + DECLARE_PALETTE_INIT(cosmica); + DECLARE_PALETTE_INIT(magspot); + DECLARE_PALETTE_INIT(nomnlnd); }; /*----------- defined in video/cosmic.c -----------*/ -PALETTE_INIT( panic ); -PALETTE_INIT( cosmica ); -PALETTE_INIT( cosmicg ); -PALETTE_INIT( magspot ); -PALETTE_INIT( nomnlnd ); + + + + + SCREEN_UPDATE_IND16( panic ); SCREEN_UPDATE_IND16( magspot ); diff --git a/src/mame/includes/cps1.h b/src/mame/includes/cps1.h index e21c8f2ad5e..83b48d84ac0 100644 --- a/src/mame/includes/cps1.h +++ b/src/mame/includes/cps1.h @@ -198,6 +198,17 @@ public: TILE_GET_INFO_MEMBER(get_tile0_info); TILE_GET_INFO_MEMBER(get_tile1_info); TILE_GET_INFO_MEMBER(get_tile2_info); + DECLARE_MACHINE_START(cps1); + DECLARE_VIDEO_START(cps1); + DECLARE_MACHINE_START(common); + DECLARE_MACHINE_START(cps2); + DECLARE_VIDEO_START(cps2); + DECLARE_MACHINE_START(fcrash); + DECLARE_MACHINE_RESET(fcrash); + DECLARE_MACHINE_START(kodb); + DECLARE_MACHINE_START(qsound); + DECLARE_MACHINE_RESET(cps); + DECLARE_VIDEO_START(cps); }; /*----------- defined in drivers/cps1.c -----------*/ @@ -214,8 +225,8 @@ GFXDECODE_EXTERN( cps1 ); -VIDEO_START( cps1 ); -VIDEO_START( cps2 ); + + SCREEN_UPDATE_IND16( cps1 ); SCREEN_VBLANK( cps1 ); diff --git a/src/mame/includes/cps3.h b/src/mame/includes/cps3.h index 51672666992..75e934fd322 100644 --- a/src/mame/includes/cps3.h +++ b/src/mame/includes/cps3.h @@ -103,6 +103,8 @@ public: DECLARE_DRIVER_INIT(jojo); DECLARE_DRIVER_INIT(jojoba); DECLARE_DRIVER_INIT(sfiii2); + virtual void machine_reset(); + virtual void video_start(); }; diff --git a/src/mame/includes/crbaloon.h b/src/mame/includes/crbaloon.h index ede36fec682..ff234adfa7f 100644 --- a/src/mame/includes/crbaloon.h +++ b/src/mame/includes/crbaloon.h @@ -33,6 +33,9 @@ public: DECLARE_WRITE8_MEMBER(crbaloon_colorram_w); DECLARE_CUSTOM_INPUT_MEMBER(pc3092_r); TILE_GET_INFO_MEMBER(get_bg_tile_info); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); }; @@ -50,8 +53,8 @@ MACHINE_CONFIG_EXTERN( crbaloon_audio ); /*----------- defined in video/crbaloon.c -----------*/ -PALETTE_INIT( crbaloon ); -VIDEO_START( crbaloon ); + + SCREEN_UPDATE_IND16( crbaloon ); diff --git a/src/mame/includes/crgolf.h b/src/mame/includes/crgolf.h index adfc944cc72..1c1252d04f6 100644 --- a/src/mame/includes/crgolf.h +++ b/src/mame/includes/crgolf.h @@ -50,6 +50,9 @@ public: DECLARE_READ8_MEMBER(crgolf_videoram_r); DECLARE_WRITE8_MEMBER(crgolfhi_sample_w); DECLARE_DRIVER_INIT(crgolfhi); + virtual void machine_start(); + virtual void machine_reset(); + DECLARE_VIDEO_START(crgolf); }; /*----------- defined in video/crgolf.c -----------*/ diff --git a/src/mame/includes/crimfght.h b/src/mame/includes/crimfght.h index 473163e285d..b4a3f722c3f 100644 --- a/src/mame/includes/crimfght.h +++ b/src/mame/includes/crimfght.h @@ -28,6 +28,9 @@ public: DECLARE_READ8_MEMBER(k052109_051960_r); DECLARE_WRITE8_MEMBER(k052109_051960_w); DECLARE_WRITE8_MEMBER(crimfght_snd_bankswitch_w); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; /*----------- defined in video/crimfght.c -----------*/ @@ -35,5 +38,5 @@ public: extern void crimfght_tile_callback(running_machine &machine, int layer,int bank,int *code,int *color,int *flags,int *priority); extern void crimfght_sprite_callback(running_machine &machine, int *code,int *color,int *priority,int *shadow); -VIDEO_START( crimfght ); + SCREEN_UPDATE_IND16( crimfght ); diff --git a/src/mame/includes/crospang.h b/src/mame/includes/crospang.h index 8976830e285..c882f581dd9 100644 --- a/src/mame/includes/crospang.h +++ b/src/mame/includes/crospang.h @@ -41,12 +41,15 @@ public: DECLARE_DRIVER_INIT(crospang); TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; /*----------- defined in video/crospang.c -----------*/ -VIDEO_START( crospang ); + SCREEN_UPDATE_IND16( crospang ); diff --git a/src/mame/includes/crshrace.h b/src/mame/includes/crshrace.h index a69c5a3680b..4cb86af129e 100644 --- a/src/mame/includes/crshrace.h +++ b/src/mame/includes/crshrace.h @@ -47,11 +47,14 @@ public: DECLARE_DRIVER_INIT(crshrace); TILE_GET_INFO_MEMBER(get_tile_info1); TILE_GET_INFO_MEMBER(get_tile_info2); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; /*----------- defined in video/crshrace.c -----------*/ -VIDEO_START( crshrace ); + SCREEN_VBLANK( crshrace ); SCREEN_UPDATE_IND16( crshrace ); diff --git a/src/mame/includes/cvs.h b/src/mame/includes/cvs.h index 690ec5bd984..6872a3e5fc4 100644 --- a/src/mame/includes/cvs.h +++ b/src/mame/includes/cvs.h @@ -100,13 +100,17 @@ public: DECLARE_DRIVER_INIT(hero); DECLARE_DRIVER_INIT(superbik); DECLARE_DRIVER_INIT(hunchbaka); + DECLARE_MACHINE_START(cvs); + DECLARE_MACHINE_RESET(cvs); + DECLARE_VIDEO_START(cvs); + DECLARE_PALETTE_INIT(cvs); }; /*----------- defined in drivers/cvs.c -----------*/ -MACHINE_START( cvs ); -MACHINE_RESET( cvs ); + + /*----------- defined in video/cvs.c -----------*/ @@ -116,6 +120,6 @@ void cvs_init_stars( running_machine &machine ); void cvs_scroll_stars( running_machine &machine ); void cvs_update_stars(running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect, const pen_t star_pen, bool update_always); -PALETTE_INIT( cvs ); + SCREEN_UPDATE_IND16( cvs ); -VIDEO_START( cvs ); + diff --git a/src/mame/includes/cyberbal.h b/src/mame/includes/cyberbal.h index 85b6b6cde0d..bc6abce608e 100644 --- a/src/mame/includes/cyberbal.h +++ b/src/mame/includes/cyberbal.h @@ -48,6 +48,11 @@ public: TILE_GET_INFO_MEMBER(get_alpha2_tile_info); TILE_GET_INFO_MEMBER(get_playfield_tile_info); TILE_GET_INFO_MEMBER(get_playfield2_tile_info); + DECLARE_MACHINE_START(cyberbal); + DECLARE_MACHINE_RESET(cyberbal); + DECLARE_VIDEO_START(cyberbal); + DECLARE_MACHINE_RESET(cyberbal2p); + DECLARE_VIDEO_START(cyberbal2p); }; @@ -68,8 +73,8 @@ READ16_HANDLER( cyberbal_paletteram_1_r ); WRITE16_HANDLER( cyberbal_paletteram_0_w ); WRITE16_HANDLER( cyberbal_paletteram_1_w ); -VIDEO_START( cyberbal ); -VIDEO_START( cyberbal2p ); + + SCREEN_UPDATE_IND16( cyberbal_left ); SCREEN_UPDATE_IND16( cyberbal_right ); SCREEN_UPDATE_IND16( cyberbal2p ); diff --git a/src/mame/includes/darius.h b/src/mame/includes/darius.h index 471721c7048..8d2e99d0355 100644 --- a/src/mame/includes/darius.h +++ b/src/mame/includes/darius.h @@ -87,13 +87,16 @@ public: DECLARE_WRITE8_MEMBER(adpcm_data_w); DECLARE_DRIVER_INIT(darius); TILE_GET_INFO_MEMBER(get_fg_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; /*----------- defined in video/darius.c -----------*/ -VIDEO_START( darius ); + SCREEN_UPDATE_IND16( darius_left ); SCREEN_UPDATE_IND16( darius_middle ); SCREEN_UPDATE_IND16( darius_right ); diff --git a/src/mame/includes/darkmist.h b/src/mame/includes/darkmist.h index c38cd9dbed2..72451679dd0 100644 --- a/src/mame/includes/darkmist.h +++ b/src/mame/includes/darkmist.h @@ -25,12 +25,14 @@ public: TILE_GET_INFO_MEMBER(get_bgtile_info); TILE_GET_INFO_MEMBER(get_fgtile_info); TILE_GET_INFO_MEMBER(get_txttile_info); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/darkmist.c -----------*/ -VIDEO_START( darkmist ); + SCREEN_UPDATE_IND16( darkmist ); -PALETTE_INIT( darkmist ); + diff --git a/src/mame/includes/darkseal.h b/src/mame/includes/darkseal.h index 1399463f7b4..4ab5ae04a89 100644 --- a/src/mame/includes/darkseal.h +++ b/src/mame/includes/darkseal.h @@ -29,11 +29,12 @@ public: DECLARE_WRITE16_MEMBER(darkseal_palette_24bit_rg_w); DECLARE_WRITE16_MEMBER(darkseal_palette_24bit_b_w); DECLARE_DRIVER_INIT(darkseal); + virtual void video_start(); }; /*----------- defined in video/darkseal.c -----------*/ -VIDEO_START( darkseal ); + SCREEN_UPDATE_IND16( darkseal ); diff --git a/src/mame/includes/dassault.h b/src/mame/includes/dassault.h index 8b72f2710e2..3e452903a11 100644 --- a/src/mame/includes/dassault.h +++ b/src/mame/includes/dassault.h @@ -58,11 +58,12 @@ public: DECLARE_WRITE8_MEMBER(sound_bankswitch_w); DECLARE_DRIVER_INIT(thndzone); DECLARE_DRIVER_INIT(dassault); + virtual void video_start(); }; /*----------- defined in video/dassault.c -----------*/ -VIDEO_START(dassault); + SCREEN_UPDATE_RGB32( dassault ); diff --git a/src/mame/includes/dbz.h b/src/mame/includes/dbz.h index bc0766d9451..3c413499fe7 100644 --- a/src/mame/includes/dbz.h +++ b/src/mame/includes/dbz.h @@ -47,6 +47,9 @@ public: DECLARE_DRIVER_INIT(dbz2); TILE_GET_INFO_MEMBER(get_dbz_bg2_tile_info); TILE_GET_INFO_MEMBER(get_dbz_bg1_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; @@ -56,5 +59,5 @@ extern void dbz_sprite_callback(running_machine &machine, int *code, int *color, extern void dbz_tile_callback(running_machine &machine, int layer, int *code, int *color, int *flags); -VIDEO_START(dbz); + SCREEN_UPDATE_IND16(dbz); diff --git a/src/mame/includes/dc.h b/src/mame/includes/dc.h index c5b2e7e3be9..ccc3cbb83f0 100644 --- a/src/mame/includes/dc.h +++ b/src/mame/includes/dc.h @@ -92,6 +92,10 @@ class dc_state : public driver_device DECLARE_DRIVER_INIT(dc); DECLARE_DRIVER_INIT(dcus); DECLARE_DRIVER_INIT(dcjp); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); + DECLARE_MACHINE_RESET(naomi); }; /*----------- defined in machine/dc.c -----------*/ @@ -117,8 +121,8 @@ WRITE64_DEVICE_HANDLER( dc_aica_reg_w ); READ32_DEVICE_HANDLER( dc_arm_aica_r ); WRITE32_DEVICE_HANDLER( dc_arm_aica_w ); -MACHINE_START( dc ); -MACHINE_RESET( dc ); + + int dc_compute_interrupt_level(running_machine &machine); void dc_update_interrupt_status(running_machine &machine); @@ -302,7 +306,7 @@ READ32_HANDLER( elan_regs_r ); WRITE32_HANDLER( elan_regs_w ); WRITE64_HANDLER( ta_fifo_poly_w ); WRITE64_HANDLER( ta_fifo_yuv_w ); -VIDEO_START(dc); + SCREEN_UPDATE_RGB32(dc); /*--------------- CORE registers --------------*/ diff --git a/src/mame/includes/dcheese.h b/src/mame/includes/dcheese.h index 02673bad8e4..19cc406fce5 100644 --- a/src/mame/includes/dcheese.h +++ b/src/mame/includes/dcheese.h @@ -43,6 +43,9 @@ public: DECLARE_WRITE16_MEMBER(madmax_blitter_unknown_w); DECLARE_READ16_MEMBER(madmax_blitter_vidparam_r); DECLARE_CUSTOM_INPUT_MEMBER(sound_latch_state_r); + virtual void machine_start(); + virtual void video_start(); + virtual void palette_init(); }; @@ -53,8 +56,8 @@ void dcheese_signal_irq(running_machine &machine, int which); /*----------- defined in video/dcheese.c -----------*/ -PALETTE_INIT( dcheese ); -VIDEO_START( dcheese ); + + SCREEN_UPDATE_IND16( dcheese ); diff --git a/src/mame/includes/dcon.h b/src/mame/includes/dcon.h index 8d8e042af61..9a603ced17b 100644 --- a/src/mame/includes/dcon.h +++ b/src/mame/includes/dcon.h @@ -36,12 +36,13 @@ public: TILE_GET_INFO_MEMBER(get_fore_tile_info); TILE_GET_INFO_MEMBER(get_mid_tile_info); TILE_GET_INFO_MEMBER(get_text_tile_info); + virtual void video_start(); }; /*----------- defined in video/dcon.c -----------*/ -VIDEO_START( dcon ); + SCREEN_UPDATE_IND16( dcon ); SCREEN_UPDATE_IND16( sdgndmps ); diff --git a/src/mame/includes/dday.h b/src/mame/includes/dday.h index d05ca6dc7f3..02e4c3ffc04 100644 --- a/src/mame/includes/dday.h +++ b/src/mame/includes/dday.h @@ -46,12 +46,16 @@ public: TILE_GET_INFO_MEMBER(get_fg_tile_info); TILE_GET_INFO_MEMBER(get_text_tile_info); TILE_GET_INFO_MEMBER(get_sl_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/dday.c -----------*/ -PALETTE_INIT( dday ); -VIDEO_START( dday ); + + SCREEN_UPDATE_IND16( dday ); diff --git a/src/mame/includes/ddragon.h b/src/mame/includes/ddragon.h index e6b0b02a752..06ea3f2146d 100644 --- a/src/mame/includes/ddragon.h +++ b/src/mame/includes/ddragon.h @@ -93,13 +93,19 @@ public: TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); TILE_GET_INFO_MEMBER(get_fg_16color_tile_info); + DECLARE_MACHINE_START(chinagat); + DECLARE_MACHINE_RESET(chinagat); + DECLARE_VIDEO_START(chinagat); + DECLARE_MACHINE_START(ddragon); + DECLARE_MACHINE_RESET(ddragon); + DECLARE_VIDEO_START(ddragon); }; /*----------- defined in video/ddragon.c -----------*/ -VIDEO_START( chinagat ); -VIDEO_START( ddragon ); + + SCREEN_UPDATE_IND16( ddragon ); diff --git a/src/mame/includes/ddragon3.h b/src/mame/includes/ddragon3.h index 01df3309691..77a34430107 100644 --- a/src/mame/includes/ddragon3.h +++ b/src/mame/includes/ddragon3.h @@ -44,6 +44,9 @@ public: DECLARE_WRITE8_MEMBER(oki_bankswitch_w); TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; diff --git a/src/mame/includes/ddribble.h b/src/mame/includes/ddribble.h index ecd830f4f3f..e67be5d2e32 100644 --- a/src/mame/includes/ddribble.h +++ b/src/mame/includes/ddribble.h @@ -55,11 +55,15 @@ public: TILEMAP_MAPPER_MEMBER(tilemap_scan); TILE_GET_INFO_MEMBER(get_fg_tile_info); TILE_GET_INFO_MEMBER(get_bg_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/ddribble.c -----------*/ -PALETTE_INIT( ddribble ); -VIDEO_START( ddribble ); + + SCREEN_UPDATE_IND16( ddribble ); diff --git a/src/mame/includes/deadang.h b/src/mame/includes/deadang.h index de856487cb0..4f905012aad 100644 --- a/src/mame/includes/deadang.h +++ b/src/mame/includes/deadang.h @@ -31,11 +31,12 @@ public: TILE_GET_INFO_MEMBER(get_pf2_tile_info); TILE_GET_INFO_MEMBER(get_pf1_tile_info); TILE_GET_INFO_MEMBER(get_text_tile_info); + virtual void video_start(); }; /*----------- defined in video/deadang.c -----------*/ -VIDEO_START( deadang ); + SCREEN_UPDATE_IND16( deadang ); diff --git a/src/mame/includes/dec0.h b/src/mame/includes/dec0.h index 78d5a6078d9..233a1b8767d 100644 --- a/src/mame/includes/dec0.h +++ b/src/mame/includes/dec0.h @@ -69,6 +69,9 @@ public: DECLARE_DRIVER_INIT(birdtry); DECLARE_DRIVER_INIT(baddudes); DECLARE_DRIVER_INIT(midresb); + DECLARE_VIDEO_START(dec0); + DECLARE_MACHINE_RESET(slyspy); + DECLARE_VIDEO_START(dec0_nodma); }; @@ -91,17 +94,17 @@ public: COMBINE_DATA(&m_automat_scroll_regs[offset]); } UINT16 m_automat_scroll_regs[4]; - - + + DECLARE_VIDEO_START(automat); }; /*----------- defined in video/dec0.c -----------*/ /* Video emulation definitions */ -VIDEO_START( dec0 ); -VIDEO_START( dec0_nodma ); -VIDEO_START( automat ); + + + SCREEN_UPDATE_IND16( hbarrel ); SCREEN_UPDATE_IND16( baddudes ); SCREEN_UPDATE_IND16( birdtry ); diff --git a/src/mame/includes/dec8.h b/src/mame/includes/dec8.h index 32cdb205350..020e77f916f 100644 --- a/src/mame/includes/dec8.h +++ b/src/mame/includes/dec8.h @@ -110,12 +110,23 @@ public: TILE_GET_INFO_MEMBER(get_srdarwin_tile_info); TILE_GET_INFO_MEMBER(get_gondo_fix_tile_info); TILE_GET_INFO_MEMBER(get_gondo_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + DECLARE_VIDEO_START(lastmisn); + DECLARE_VIDEO_START(shackled); + DECLARE_VIDEO_START(gondo); + DECLARE_VIDEO_START(garyoret); + DECLARE_VIDEO_START(ghostb); + DECLARE_PALETTE_INIT(ghostb); + DECLARE_VIDEO_START(oscar); + DECLARE_VIDEO_START(srdarwin); + DECLARE_VIDEO_START(cobracom); }; /*----------- defined in video/dec8.c -----------*/ -PALETTE_INIT( ghostb ); + SCREEN_UPDATE_IND16( cobracom ); SCREEN_UPDATE_IND16( ghostb ); SCREEN_UPDATE_IND16( srdarwin ); @@ -124,14 +135,14 @@ SCREEN_UPDATE_IND16( garyoret ); SCREEN_UPDATE_IND16( lastmisn ); SCREEN_UPDATE_IND16( shackled ); SCREEN_UPDATE_IND16( oscar ); -VIDEO_START( cobracom ); -VIDEO_START( oscar ); -VIDEO_START( ghostb ); -VIDEO_START( lastmisn ); -VIDEO_START( shackled ); -VIDEO_START( srdarwin ); -VIDEO_START( gondo ); -VIDEO_START( garyoret ); + + + + + + + + WRITE8_HANDLER( dec8_bac06_0_w ); WRITE8_HANDLER( dec8_bac06_1_w ); diff --git a/src/mame/includes/deco32.h b/src/mame/includes/deco32.h index d3b48628e7d..43ae08312d9 100644 --- a/src/mame/includes/deco32.h +++ b/src/mame/includes/deco32.h @@ -101,6 +101,10 @@ public: DECLARE_DRIVER_INIT(nslasher); DECLARE_DRIVER_INIT(captaven); DECLARE_DRIVER_INIT(fghthist); + DECLARE_MACHINE_RESET(deco32); + DECLARE_VIDEO_START(captaven); + DECLARE_VIDEO_START(fghthist); + DECLARE_VIDEO_START(nslasher); }; class dragngun_state : public deco32_state @@ -125,17 +129,19 @@ public: DECLARE_WRITE32_MEMBER(dragngun_spriteram_dma_w); DECLARE_DRIVER_INIT(dragngun); DECLARE_DRIVER_INIT(lockload); + DECLARE_VIDEO_START(dragngun); + DECLARE_VIDEO_START(lockload); }; /*----------- defined in video/deco32.c -----------*/ -VIDEO_START( captaven ); -VIDEO_START( fghthist ); -VIDEO_START( dragngun ); -VIDEO_START( lockload ); -VIDEO_START( nslasher ); + + + + + SCREEN_VBLANK( captaven ); SCREEN_VBLANK( dragngun ); diff --git a/src/mame/includes/deco_mlc.h b/src/mame/includes/deco_mlc.h index d2a795a3d7e..a924bd0dc9a 100644 --- a/src/mame/includes/deco_mlc.h +++ b/src/mame/includes/deco_mlc.h @@ -34,11 +34,13 @@ public: DECLARE_WRITE32_MEMBER(avengrs_eprom_w); DECLARE_DRIVER_INIT(mlc); DECLARE_DRIVER_INIT(avengrgs); + DECLARE_MACHINE_RESET(mlc); + DECLARE_VIDEO_START(mlc); }; /*----------- defined in video/deco_mlc.c -----------*/ -VIDEO_START( mlc ); + SCREEN_UPDATE_RGB32( mlc ); SCREEN_VBLANK( mlc ); diff --git a/src/mame/includes/deniam.h b/src/mame/includes/deniam.h index 23748fb8504..6d99fc156d7 100644 --- a/src/mame/includes/deniam.h +++ b/src/mame/includes/deniam.h @@ -57,12 +57,15 @@ public: TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); TILE_GET_INFO_MEMBER(get_tx_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; /*----------- defined in video/deniam.c -----------*/ -VIDEO_START( deniam ); + SCREEN_UPDATE_IND16( deniam ); diff --git a/src/mame/includes/dietgo.h b/src/mame/includes/dietgo.h index 9800bc9a5b7..3af8bc7ec6c 100644 --- a/src/mame/includes/dietgo.h +++ b/src/mame/includes/dietgo.h @@ -24,6 +24,7 @@ public: cpu_device *m_audiocpu; device_t *m_deco_tilegen1; DECLARE_DRIVER_INIT(dietgo); + virtual void machine_start(); }; diff --git a/src/mame/includes/djboy.h b/src/mame/includes/djboy.h index 022992fd612..34dd56a410b 100644 --- a/src/mame/includes/djboy.h +++ b/src/mame/includes/djboy.h @@ -68,12 +68,15 @@ public: DECLARE_DRIVER_INIT(djboy); DECLARE_DRIVER_INIT(djboyj); TILE_GET_INFO_MEMBER(get_bg_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; /*----------- defined in video/djboy.c -----------*/ -VIDEO_START( djboy ); + SCREEN_UPDATE_IND16( djboy ); SCREEN_VBLANK( djboy ); diff --git a/src/mame/includes/djmain.h b/src/mame/includes/djmain.h index d659a59a5f5..7c54b1e42b7 100644 --- a/src/mame/includes/djmain.h +++ b/src/mame/includes/djmain.h @@ -50,12 +50,15 @@ public: DECLARE_DRIVER_INIT(bmcompm2); DECLARE_DRIVER_INIT(bmcorerm); DECLARE_DRIVER_INIT(bmclubmx); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; /*----------- defined in video/djmain.c -----------*/ SCREEN_UPDATE_RGB32( djmain ); -VIDEO_START( djmain ); + void djmain_tile_callback(running_machine& machine, int layer, int *code, int *color, int *flags); diff --git a/src/mame/includes/dkong.h b/src/mame/includes/dkong.h index a7796e43984..6f583e79cb0 100644 --- a/src/mame/includes/dkong.h +++ b/src/mame/includes/dkong.h @@ -239,18 +239,32 @@ public: DECLARE_DRIVER_INIT(dkongx); TILE_GET_INFO_MEMBER(dkong_bg_tile_info); TILE_GET_INFO_MEMBER(radarscp1_bg_tile_info); + DECLARE_MACHINE_START(dkong2b); + DECLARE_MACHINE_RESET(dkong); + DECLARE_VIDEO_START(dkong); + DECLARE_VIDEO_START(dkong_base); + DECLARE_PALETTE_INIT(dkong2b); + DECLARE_MACHINE_START(dkong3); + DECLARE_PALETTE_INIT(dkong3); + DECLARE_MACHINE_START(radarscp); + DECLARE_PALETTE_INIT(radarscp); + DECLARE_MACHINE_START(radarscp1); + DECLARE_PALETTE_INIT(radarscp1); + DECLARE_MACHINE_START(s2650); + DECLARE_MACHINE_RESET(strtheat); + DECLARE_MACHINE_RESET(drakton); }; /*----------- defined in video/dkong.c -----------*/ -PALETTE_INIT( dkong2b ); -PALETTE_INIT( radarscp ); -PALETTE_INIT( radarscp1 ); -PALETTE_INIT( dkong3 ); -VIDEO_START( dkong ); + + + + + SCREEN_UPDATE_IND16( dkong ); SCREEN_UPDATE_IND16( pestplce ); SCREEN_UPDATE_IND16( spclforc ); diff --git a/src/mame/includes/docastle.h b/src/mame/includes/docastle.h index ecb9be5006f..1074a677c53 100644 --- a/src/mame/includes/docastle.h +++ b/src/mame/includes/docastle.h @@ -42,6 +42,11 @@ public: DECLARE_READ8_MEMBER(idsoccer_adpcm_status_r); DECLARE_WRITE8_MEMBER(idsoccer_adpcm_w); TILE_GET_INFO_MEMBER(get_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); + DECLARE_VIDEO_START(dorunrun); }; @@ -51,8 +56,8 @@ public: /*----------- defined in video/docastle.c -----------*/ -PALETTE_INIT( docastle ); -VIDEO_START( docastle ); -VIDEO_START( dorunrun ); + + + SCREEN_UPDATE_IND16( docastle ); diff --git a/src/mame/includes/dogfgt.h b/src/mame/includes/dogfgt.h index 4cde28bf9c0..1658e487da4 100644 --- a/src/mame/includes/dogfgt.h +++ b/src/mame/includes/dogfgt.h @@ -48,12 +48,16 @@ public: DECLARE_WRITE8_MEMBER(dogfgt_scroll_w); DECLARE_WRITE8_MEMBER(dogfgt_1800_w); TILE_GET_INFO_MEMBER(get_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/dogfgt.c -----------*/ -PALETTE_INIT( dogfgt ); -VIDEO_START( dogfgt ); + + SCREEN_UPDATE_IND16( dogfgt ); diff --git a/src/mame/includes/dooyong.h b/src/mame/includes/dooyong.h index 8f684f56d91..4395642c4cf 100644 --- a/src/mame/includes/dooyong.h +++ b/src/mame/includes/dooyong.h @@ -69,6 +69,16 @@ public: TILE_GET_INFO_MEMBER(get_fg2_tile_info); TILE_GET_INFO_MEMBER(flytiger_get_fg_tile_info); TILE_GET_INFO_MEMBER(get_tx_tile_info); + DECLARE_MACHINE_START(lastday); + DECLARE_MACHINE_RESET(sound_ym2203); + DECLARE_VIDEO_START(lastday); + DECLARE_VIDEO_START(gulfstrm); + DECLARE_VIDEO_START(pollux); + DECLARE_VIDEO_START(bluehawk); + DECLARE_VIDEO_START(flytiger); + DECLARE_VIDEO_START(primella); + DECLARE_VIDEO_START(rshark); + DECLARE_VIDEO_START(popbingo); }; @@ -87,11 +97,11 @@ SCREEN_UPDATE_IND16( primella ); SCREEN_UPDATE_IND16( rshark ); SCREEN_UPDATE_IND16( popbingo ); -VIDEO_START( lastday ); -VIDEO_START( gulfstrm ); -VIDEO_START( pollux ); -VIDEO_START( bluehawk ); -VIDEO_START( flytiger ); -VIDEO_START( primella ); -VIDEO_START( rshark ); -VIDEO_START( popbingo ); + + + + + + + + diff --git a/src/mame/includes/dragrace.h b/src/mame/includes/dragrace.h index a034243c607..9457c178580 100644 --- a/src/mame/includes/dragrace.h +++ b/src/mame/includes/dragrace.h @@ -49,6 +49,10 @@ public: DECLARE_READ8_MEMBER(dragrace_steering_r); DECLARE_READ8_MEMBER(dragrace_scanline_r); TILE_GET_INFO_MEMBER(get_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); }; @@ -58,5 +62,5 @@ DISCRETE_SOUND_EXTERN( dragrace ); /*----------- defined in video/dragrace.c -----------*/ -VIDEO_START( dragrace ); + SCREEN_UPDATE_IND16( dragrace ); diff --git a/src/mame/includes/drgnmst.h b/src/mame/includes/drgnmst.h index 3c1e466c1c9..9be41569a96 100644 --- a/src/mame/includes/drgnmst.h +++ b/src/mame/includes/drgnmst.h @@ -63,11 +63,14 @@ public: TILEMAP_MAPPER_MEMBER(drgnmst_fg_tilemap_scan_cols); TILEMAP_MAPPER_MEMBER(drgnmst_md_tilemap_scan_cols); TILEMAP_MAPPER_MEMBER(drgnmst_bg_tilemap_scan_cols); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; /*----------- defined in video/drgnmst.c -----------*/ -VIDEO_START(drgnmst); + SCREEN_UPDATE_IND16(drgnmst); diff --git a/src/mame/includes/dribling.h b/src/mame/includes/dribling.h index 79250c0d332..9000ef094d9 100644 --- a/src/mame/includes/dribling.h +++ b/src/mame/includes/dribling.h @@ -43,10 +43,13 @@ public: DECLARE_WRITE8_MEMBER(sound_w); DECLARE_WRITE8_MEMBER(pb_w); DECLARE_WRITE8_MEMBER(shr_w); + virtual void machine_start(); + virtual void machine_reset(); + virtual void palette_init(); }; /*----------- defined in video/dribling.c -----------*/ -PALETTE_INIT( dribling ); + SCREEN_UPDATE_IND16( dribling ); diff --git a/src/mame/includes/drmicro.h b/src/mame/includes/drmicro.h index 40df8d10bf5..84f09f27484 100644 --- a/src/mame/includes/drmicro.h +++ b/src/mame/includes/drmicro.h @@ -30,12 +30,16 @@ public: DECLARE_WRITE8_MEMBER(drmicro_videoram_w); TILE_GET_INFO_MEMBER(get_bg1_tile_info); TILE_GET_INFO_MEMBER(get_bg2_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/drmicro.c -----------*/ -PALETTE_INIT( drmicro ); -VIDEO_START( drmicro ); + + SCREEN_UPDATE_IND16( drmicro ); diff --git a/src/mame/includes/dynax.h b/src/mame/includes/dynax.h index 658a94f1c0a..740ba66c4ff 100644 --- a/src/mame/includes/dynax.h +++ b/src/mame/includes/dynax.h @@ -428,6 +428,41 @@ public: DECLARE_DRIVER_INIT(rongrong); DECLARE_DRIVER_INIT(momotaro); + DECLARE_MACHINE_START(ddenlovr); + DECLARE_MACHINE_RESET(ddenlovr); + DECLARE_VIDEO_START(ddenlovr); + DECLARE_MACHINE_START(rongrong); + DECLARE_MACHINE_START(mmpanic); + DECLARE_VIDEO_START(mmpanic); + DECLARE_MACHINE_START(hanakanz); + DECLARE_VIDEO_START(hanakanz); + DECLARE_MACHINE_START(sryudens); + DECLARE_VIDEO_START(mjflove); + DECLARE_MACHINE_START(seljan2); + DECLARE_MACHINE_START(mjflove); + DECLARE_MACHINE_START(hanamai); + DECLARE_MACHINE_RESET(dynax); + DECLARE_VIDEO_START(hanamai); + DECLARE_PALETTE_INIT(sprtmtch); + DECLARE_MACHINE_START(hnoridur); + DECLARE_VIDEO_START(hnoridur); + DECLARE_VIDEO_START(sprtmtch); + DECLARE_VIDEO_START(mjdialq2); + DECLARE_MACHINE_START(jantouki); + DECLARE_VIDEO_START(jantouki); + DECLARE_MACHINE_START(htengoku); + DECLARE_VIDEO_START(htengoku); + DECLARE_MACHINE_START(tenkai); + DECLARE_VIDEO_START(mjelctrn); + DECLARE_MACHINE_START(gekisha); + DECLARE_MACHINE_RESET(gekisha); + DECLARE_MACHINE_START(funkyfig); + DECLARE_MACHINE_START(mjmyster); + DECLARE_MACHINE_START(hparadis); + DECLARE_VIDEO_START(mcnpshnt); + DECLARE_VIDEO_START(neruton); + DECLARE_MACHINE_START(dynax); + DECLARE_MACHINE_RESET(adpcm); }; //----------- defined in drivers/dynax.c ----------- @@ -438,15 +473,15 @@ void mjelctrn_update_irq(running_machine &machine); void neruton_update_irq(running_machine &machine); //----------- defined in video/dynax.c ----------- -VIDEO_START( hanamai ); -VIDEO_START( hnoridur ); -VIDEO_START( mcnpshnt ); -VIDEO_START( sprtmtch ); -VIDEO_START( mjdialq2 ); -VIDEO_START( jantouki ); -VIDEO_START( mjelctrn ); -VIDEO_START( neruton ); -VIDEO_START( htengoku ); + + + + + + + + + SCREEN_UPDATE_IND16( hanamai ); SCREEN_UPDATE_IND16( hnoridur ); @@ -456,10 +491,10 @@ SCREEN_UPDATE_IND16( jantouki_top ); SCREEN_UPDATE_IND16( jantouki_bottom ); SCREEN_UPDATE_IND16( htengoku ); -PALETTE_INIT( sprtmtch ); + //----------- defined in drivers/ddenlovr.c ----------- -VIDEO_START(ddenlovr); + SCREEN_UPDATE_IND16(ddenlovr); diff --git a/src/mame/includes/dynduke.h b/src/mame/includes/dynduke.h index 0b9ba79bde4..7836ff3238c 100644 --- a/src/mame/includes/dynduke.h +++ b/src/mame/includes/dynduke.h @@ -39,10 +39,11 @@ public: TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); TILE_GET_INFO_MEMBER(get_tx_tile_info); + virtual void video_start(); }; /*----------- defined in video/dynduke.c -----------*/ -VIDEO_START( dynduke ); + SCREEN_UPDATE_IND16( dynduke ); diff --git a/src/mame/includes/eolith.h b/src/mame/includes/eolith.h index 56ce69a968a..37e8b19a607 100644 --- a/src/mame/includes/eolith.h +++ b/src/mame/includes/eolith.h @@ -37,10 +37,12 @@ public: DECLARE_DRIVER_INIT(hidctch3); DECLARE_DRIVER_INIT(hidctch2); DECLARE_DRIVER_INIT(landbrka); + DECLARE_MACHINE_RESET(eolith); + DECLARE_VIDEO_START(eolith); }; /*----------- defined in video/eolith.c -----------*/ -VIDEO_START( eolith ); + SCREEN_UPDATE_IND16( eolith ); diff --git a/src/mame/includes/epos.h b/src/mame/includes/epos.h index c29abdb91ca..7f89328ca2b 100644 --- a/src/mame/includes/epos.h +++ b/src/mame/includes/epos.h @@ -23,6 +23,9 @@ public: DECLARE_WRITE8_MEMBER(epos_port_1_w); DECLARE_WRITE8_MEMBER(write_prtc); DECLARE_DRIVER_INIT(dealer); + virtual void machine_reset(); + DECLARE_MACHINE_START(epos); + DECLARE_MACHINE_START(dealer); }; diff --git a/src/mame/includes/eprom.h b/src/mame/includes/eprom.h index 344be12e3e6..500bde3bd83 100644 --- a/src/mame/includes/eprom.h +++ b/src/mame/includes/eprom.h @@ -27,15 +27,19 @@ public: TILE_GET_INFO_MEMBER(get_alpha_tile_info); TILE_GET_INFO_MEMBER(get_playfield_tile_info); TILE_GET_INFO_MEMBER(guts_get_playfield_tile_info); + DECLARE_MACHINE_START(eprom); + DECLARE_MACHINE_RESET(eprom); + DECLARE_VIDEO_START(eprom); + DECLARE_VIDEO_START(guts); }; /*----------- defined in video/eprom.c -----------*/ -VIDEO_START( eprom ); + SCREEN_UPDATE_IND16( eprom ); -VIDEO_START( guts ); + SCREEN_UPDATE_IND16( guts ); void eprom_scanline_update(screen_device &screen, int scanline); diff --git a/src/mame/includes/equites.h b/src/mame/includes/equites.h index a51fcb18f56..b2a5cf18c6a 100644 --- a/src/mame/includes/equites.h +++ b/src/mame/includes/equites.h @@ -98,6 +98,12 @@ public: TILE_GET_INFO_MEMBER(splndrbt_fg_info); TILE_GET_INFO_MEMBER(equites_bg_info); TILE_GET_INFO_MEMBER(splndrbt_bg_info); + DECLARE_MACHINE_START(equites); + DECLARE_MACHINE_RESET(equites); + DECLARE_VIDEO_START(equites); + DECLARE_PALETTE_INIT(equites); + DECLARE_VIDEO_START(splndrbt); + DECLARE_PALETTE_INIT(splndrbt); }; diff --git a/src/mame/includes/esd16.h b/src/mame/includes/esd16.h index 3c50bf8a111..58a0090a4e5 100644 --- a/src/mame/includes/esd16.h +++ b/src/mame/includes/esd16.h @@ -60,11 +60,14 @@ public: TILE_GET_INFO_MEMBER(get_tile_info_0_16x16); TILE_GET_INFO_MEMBER(get_tile_info_1); TILE_GET_INFO_MEMBER(get_tile_info_1_16x16); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; /*----------- defined in video/esd16.c -----------*/ -VIDEO_START( esd16 ); + SCREEN_UPDATE_IND16( hedpanic ); diff --git a/src/mame/includes/espial.h b/src/mame/includes/espial.h index 2ffc5c44210..a4852fe86e0 100644 --- a/src/mame/includes/espial.h +++ b/src/mame/includes/espial.h @@ -46,11 +46,16 @@ public: DECLARE_WRITE8_MEMBER(espial_scrollram_w); DECLARE_WRITE8_MEMBER(espial_flipscreen_w); TILE_GET_INFO_MEMBER(get_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); + DECLARE_VIDEO_START(netwars); }; /*----------- defined in video/espial.c -----------*/ -PALETTE_INIT( espial ); -VIDEO_START( espial ); -VIDEO_START( netwars ); + + + SCREEN_UPDATE_IND16( espial ); diff --git a/src/mame/includes/esripsys.h b/src/mame/includes/esripsys.h index afc280cbeee..3cf65ccb32d 100644 --- a/src/mame/includes/esripsys.h +++ b/src/mame/includes/esripsys.h @@ -91,12 +91,13 @@ public: DECLARE_WRITE_LINE_MEMBER(ptm_irq); DECLARE_WRITE8_MEMBER(esripsys_dac_w); DECLARE_DRIVER_INIT(esripsys); + virtual void video_start(); }; /*----------- defined in video/esripsys.c -----------*/ -VIDEO_START( esripsys ); + SCREEN_UPDATE_RGB32( esripsys ); INTERRUPT_GEN( esripsys_vblank_irq ); diff --git a/src/mame/includes/exedexes.h b/src/mame/includes/exedexes.h index 0ab9c5f1f60..f0a1f90e2c6 100644 --- a/src/mame/includes/exedexes.h +++ b/src/mame/includes/exedexes.h @@ -44,6 +44,10 @@ public: TILE_GET_INFO_MEMBER(get_tx_tile_info); TILEMAP_MAPPER_MEMBER(exedexes_bg_tilemap_scan); TILEMAP_MAPPER_MEMBER(exedexes_fg_tilemap_scan); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); }; diff --git a/src/mame/includes/exerion.h b/src/mame/includes/exerion.h index 8a33d9d9550..c109b417cdc 100644 --- a/src/mame/includes/exerion.h +++ b/src/mame/includes/exerion.h @@ -57,13 +57,17 @@ public: DECLARE_WRITE8_MEMBER(exerion_portb_w); DECLARE_DRIVER_INIT(exerion); DECLARE_DRIVER_INIT(exerionb); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/exerion.c -----------*/ -PALETTE_INIT( exerion ); -VIDEO_START( exerion ); + + SCREEN_UPDATE_IND16( exerion ); diff --git a/src/mame/includes/exidy.h b/src/mame/includes/exidy.h index e20d0d2b506..7130bdb38dd 100644 --- a/src/mame/includes/exidy.h +++ b/src/mame/includes/exidy.h @@ -65,13 +65,15 @@ public: DECLARE_DRIVER_INIT(venture); DECLARE_DRIVER_INIT(spectar); DECLARE_DRIVER_INIT(phantoma); + virtual void video_start(); + DECLARE_MACHINE_START(teetert); }; /*----------- defined in video/exidy.c -----------*/ void exidy_video_config(running_machine &machine, UINT8 _collision_mask, UINT8 _collision_invert, int _is_2bpp); -VIDEO_START( exidy ); + SCREEN_UPDATE_IND16( exidy ); INTERRUPT_GEN( exidy_vblank_interrupt ); diff --git a/src/mame/includes/exidy440.h b/src/mame/includes/exidy440.h index 046d1ed797c..e708c691720 100644 --- a/src/mame/includes/exidy440.h +++ b/src/mame/includes/exidy440.h @@ -63,6 +63,10 @@ public: DECLARE_DRIVER_INIT(yukon); DECLARE_DRIVER_INIT(exidy440); DECLARE_DRIVER_INIT(claypign); + virtual void machine_start(); + virtual void machine_reset(); + DECLARE_VIDEO_START(exidy440); + DECLARE_VIDEO_START(topsecex); }; diff --git a/src/mame/includes/exprraid.h b/src/mame/includes/exprraid.h index e63afc1098b..4368b628a81 100644 --- a/src/mame/includes/exprraid.h +++ b/src/mame/includes/exprraid.h @@ -50,6 +50,9 @@ public: DECLARE_DRIVER_INIT(wexpressb3); TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; diff --git a/src/mame/includes/exterm.h b/src/mame/includes/exterm.h index d85c80235fb..6f34004a33a 100644 --- a/src/mame/includes/exterm.h +++ b/src/mame/includes/exterm.h @@ -34,12 +34,13 @@ public: DECLARE_WRITE8_MEMBER(sound_control_w); DECLARE_WRITE8_MEMBER(ym2151_data_latch_w); DECLARE_WRITE8_MEMBER(sound_slave_dac_w); + virtual void palette_init(); }; /*----------- defined in video/exterm.c -----------*/ -PALETTE_INIT( exterm ); + void exterm_scanline_update(screen_device &screen, bitmap_ind16 &bitmap, int scanline, const tms34010_display_params *params); void exterm_to_shiftreg_master(address_space *space, UINT32 address, UINT16* shiftreg); diff --git a/src/mame/includes/f1gp.h b/src/mame/includes/f1gp.h index e08d456b982..5b7dbecf845 100644 --- a/src/mame/includes/f1gp.h +++ b/src/mame/includes/f1gp.h @@ -67,14 +67,20 @@ public: TILE_GET_INFO_MEMBER(f1gp_get_roz_tile_info); TILE_GET_INFO_MEMBER(f1gp2_get_roz_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); + DECLARE_MACHINE_START(f1gp); + DECLARE_MACHINE_RESET(f1gp); + DECLARE_VIDEO_START(f1gp); + DECLARE_MACHINE_START(f1gpb); + DECLARE_VIDEO_START(f1gpb); + DECLARE_VIDEO_START(f1gp2); }; /*----------- defined in video/f1gp.c -----------*/ -VIDEO_START( f1gp ); -VIDEO_START( f1gpb ); -VIDEO_START( f1gp2 ); + + + SCREEN_UPDATE_IND16( f1gp ); SCREEN_UPDATE_IND16( f1gpb ); SCREEN_UPDATE_IND16( f1gp2 ); diff --git a/src/mame/includes/fantland.h b/src/mame/includes/fantland.h index de3cfa6b33f..cd7a4ff570c 100644 --- a/src/mame/includes/fantland.h +++ b/src/mame/includes/fantland.h @@ -43,6 +43,10 @@ public: DECLARE_READ8_MEMBER(borntofi_inputs_r); DECLARE_WRITE8_MEMBER(borntofi_msm5205_w); DECLARE_CUSTOM_INPUT_MEMBER(wheelrun_wheel_r); + DECLARE_MACHINE_START(fantland); + DECLARE_MACHINE_RESET(fantland); + DECLARE_MACHINE_START(borntofi); + DECLARE_MACHINE_RESET(borntofi); }; diff --git a/src/mame/includes/fastfred.h b/src/mame/includes/fastfred.h index b8826e37dab..efaef2a7255 100644 --- a/src/mame/includes/fastfred.h +++ b/src/mame/includes/fastfred.h @@ -57,13 +57,17 @@ public: TILE_GET_INFO_MEMBER(imago_get_tile_info_bg); TILE_GET_INFO_MEMBER(imago_get_tile_info_fg); TILE_GET_INFO_MEMBER(imago_get_tile_info_web); + DECLARE_VIDEO_START(fastfred); + DECLARE_PALETTE_INIT(fastfred); + DECLARE_MACHINE_START(imago); + DECLARE_VIDEO_START(imago); }; /*----------- defined in video/fastfred.c -----------*/ -PALETTE_INIT( fastfred ); -VIDEO_START( fastfred ); + + WRITE8_HANDLER( fastfred_videoram_w ); WRITE8_HANDLER( fastfred_attributes_w ); WRITE8_HANDLER( fastfred_charbank1_w ); @@ -74,7 +78,7 @@ WRITE8_HANDLER( fastfred_flip_screen_x_w ); WRITE8_HANDLER( fastfred_flip_screen_y_w ); SCREEN_UPDATE_IND16( fastfred ); -VIDEO_START( imago ); + SCREEN_UPDATE_IND16( imago ); WRITE8_HANDLER( imago_fg_videoram_w ); WRITE8_HANDLER( imago_charbank_w ); diff --git a/src/mame/includes/fastlane.h b/src/mame/includes/fastlane.h index ba9aaef3ef9..fba26616aac 100644 --- a/src/mame/includes/fastlane.h +++ b/src/mame/includes/fastlane.h @@ -45,6 +45,9 @@ public: DECLARE_WRITE8_MEMBER(fastlane_k2_k007232_w); TILE_GET_INFO_MEMBER(get_tile_info0); TILE_GET_INFO_MEMBER(get_tile_info1); + virtual void machine_start(); + virtual void video_start(); + virtual void palette_init(); }; @@ -53,6 +56,6 @@ public: /*----------- defined in video/fastlane.c -----------*/ -PALETTE_INIT( fastlane ); -VIDEO_START( fastlane ); + + SCREEN_UPDATE_IND16( fastlane ); diff --git a/src/mame/includes/fcombat.h b/src/mame/includes/fcombat.h index d991618f230..f8e9c261169 100644 --- a/src/mame/includes/fcombat.h +++ b/src/mame/includes/fcombat.h @@ -62,13 +62,17 @@ public: DECLARE_INPUT_CHANGED_MEMBER(coin_inserted); DECLARE_DRIVER_INIT(fcombat); TILE_GET_INFO_MEMBER(get_bg_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/fcombat.c -----------*/ -PALETTE_INIT( fcombat ); -VIDEO_START( fcombat ); + + SCREEN_UPDATE_IND16( fcombat ); diff --git a/src/mame/includes/fgoal.h b/src/mame/includes/fgoal.h index 82152707a46..a4a239c4549 100644 --- a/src/mame/includes/fgoal.h +++ b/src/mame/includes/fgoal.h @@ -42,12 +42,16 @@ public: DECLARE_WRITE8_MEMBER(fgoal_ypos_w); DECLARE_WRITE8_MEMBER(fgoal_xpos_w); DECLARE_CUSTOM_INPUT_MEMBER(fgoal_80_r); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/fgoal.c -----------*/ -VIDEO_START( fgoal ); + SCREEN_UPDATE_IND16( fgoal ); diff --git a/src/mame/includes/finalizr.h b/src/mame/includes/finalizr.h index 468bb79d851..1ea3aee2a33 100644 --- a/src/mame/includes/finalizr.h +++ b/src/mame/includes/finalizr.h @@ -49,12 +49,16 @@ public: DECLARE_DRIVER_INIT(finalizr); TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/finalizr.c -----------*/ -PALETTE_INIT( finalizr ); -VIDEO_START( finalizr ); + + SCREEN_UPDATE_IND16( finalizr ); diff --git a/src/mame/includes/firetrap.h b/src/mame/includes/firetrap.h index 4ffd4ef1f7e..87f62f5f14f 100644 --- a/src/mame/includes/firetrap.h +++ b/src/mame/includes/firetrap.h @@ -66,12 +66,16 @@ public: TILE_GET_INFO_MEMBER(get_fg_tile_info); TILE_GET_INFO_MEMBER(get_bg1_tile_info); TILE_GET_INFO_MEMBER(get_bg2_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/firetrap.c -----------*/ -PALETTE_INIT( firetrap ); -VIDEO_START( firetrap ); + + SCREEN_UPDATE_IND16( firetrap ); diff --git a/src/mame/includes/firetrk.h b/src/mame/includes/firetrk.h index a6628bb8e60..2c885938a2e 100644 --- a/src/mame/includes/firetrk.h +++ b/src/mame/includes/firetrk.h @@ -95,6 +95,12 @@ public: TILE_GET_INFO_MEMBER(firetrk_get_tile_info2); TILE_GET_INFO_MEMBER(superbug_get_tile_info2); TILE_GET_INFO_MEMBER(montecar_get_tile_info2); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); + DECLARE_VIDEO_START(superbug); + DECLARE_VIDEO_START(montecar); + DECLARE_PALETTE_INIT(montecar); }; @@ -115,11 +121,11 @@ DISCRETE_SOUND_EXTERN( montecar ); /*----------- defined in video/firetrk.c -----------*/ -PALETTE_INIT( firetrk ); -PALETTE_INIT( montecar ); -VIDEO_START( firetrk ); -VIDEO_START( superbug ); -VIDEO_START( montecar ); + + + + + SCREEN_UPDATE_IND16( firetrk ); SCREEN_UPDATE_IND16( superbug ); SCREEN_UPDATE_IND16( montecar ); diff --git a/src/mame/includes/fitfight.h b/src/mame/includes/fitfight.h index cef7a5e50fa..8b77faa2d47 100644 --- a/src/mame/includes/fitfight.h +++ b/src/mame/includes/fitfight.h @@ -58,11 +58,14 @@ public: TILE_GET_INFO_MEMBER(get_fof_bak_tile_info); TILE_GET_INFO_MEMBER(get_fof_mid_tile_info); TILE_GET_INFO_MEMBER(get_fof_txt_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; /*----------- defined in video/fitfight.c -----------*/ -VIDEO_START(fitfight); + SCREEN_UPDATE_IND16(fitfight); diff --git a/src/mame/includes/flkatck.h b/src/mame/includes/flkatck.h index aa04064f1a6..73077ee489a 100644 --- a/src/mame/includes/flkatck.h +++ b/src/mame/includes/flkatck.h @@ -35,6 +35,9 @@ public: DECLARE_WRITE8_MEMBER(flkatck_k007121_regs_w); TILE_GET_INFO_MEMBER(get_tile_info_A); TILE_GET_INFO_MEMBER(get_tile_info_B); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; @@ -44,5 +47,5 @@ public: /*----------- defined in video/flkatck.c -----------*/ -VIDEO_START( flkatck ); + SCREEN_UPDATE_IND16( flkatck ); diff --git a/src/mame/includes/flower.h b/src/mame/includes/flower.h index d616c8c64d1..98e9cd7b032 100644 --- a/src/mame/includes/flower.h +++ b/src/mame/includes/flower.h @@ -38,6 +38,8 @@ public: TILE_GET_INFO_MEMBER(get_bg0_tile_info); TILE_GET_INFO_MEMBER(get_bg1_tile_info); TILE_GET_INFO_MEMBER(get_text_tile_info); + virtual void video_start(); + virtual void palette_init(); }; @@ -76,5 +78,5 @@ extern const device_type FLOWER; SCREEN_UPDATE_IND16( flower ); -VIDEO_START( flower ); -PALETTE_INIT( flower ); + + diff --git a/src/mame/includes/flstory.h b/src/mame/includes/flstory.h index 74872280f98..7736a4963a5 100644 --- a/src/mame/includes/flstory.h +++ b/src/mame/includes/flstory.h @@ -107,6 +107,13 @@ public: TILE_GET_INFO_MEMBER(get_tile_info); TILE_GET_INFO_MEMBER(victnine_get_tile_info); TILE_GET_INFO_MEMBER(get_rumba_tile_info); + virtual void machine_start(); + DECLARE_MACHINE_RESET(flstory); + DECLARE_VIDEO_START(flstory); + DECLARE_VIDEO_START(victnine); + DECLARE_MACHINE_RESET(rumba); + DECLARE_VIDEO_START(rumba); + DECLARE_MACHINE_RESET(ta7630); }; @@ -116,10 +123,10 @@ public: /*----------- defined in video/flstory.c -----------*/ -VIDEO_START( flstory ); + SCREEN_UPDATE_IND16( flstory ); -VIDEO_START( victnine ); + SCREEN_UPDATE_IND16( victnine ); -VIDEO_START( rumba ); + SCREEN_UPDATE_IND16( rumba ); diff --git a/src/mame/includes/foodf.h b/src/mame/includes/foodf.h index 64f105a38e0..5e18a461772 100644 --- a/src/mame/includes/foodf.h +++ b/src/mame/includes/foodf.h @@ -32,10 +32,13 @@ public: void foodf_set_flip(int flip); DECLARE_READ8_MEMBER(pot_r); TILE_GET_INFO_MEMBER(get_playfield_tile_info); + DECLARE_MACHINE_START(foodf); + DECLARE_MACHINE_RESET(foodf); + DECLARE_VIDEO_START(foodf); }; /*----------- defined in video/foodf.c -----------*/ -VIDEO_START( foodf ); + SCREEN_UPDATE_IND16( foodf ); diff --git a/src/mame/includes/freekick.h b/src/mame/includes/freekick.h index 883e4ebe195..bf316121ea2 100644 --- a/src/mame/includes/freekick.h +++ b/src/mame/includes/freekick.h @@ -42,12 +42,18 @@ public: DECLARE_DRIVER_INIT(gigasb); DECLARE_DRIVER_INIT(pbillrds); TILE_GET_INFO_MEMBER(get_freek_tile_info); + virtual void video_start(); + DECLARE_MACHINE_START(pbillrd); + DECLARE_MACHINE_RESET(freekick); + DECLARE_MACHINE_START(freekick); + DECLARE_MACHINE_START(oigas); + DECLARE_MACHINE_RESET(oigas); }; /*----------- defined in video/freekick.c -----------*/ -VIDEO_START(freekick); + SCREEN_UPDATE_IND16(gigas); SCREEN_UPDATE_IND16(pbillrd); SCREEN_UPDATE_IND16(freekick); diff --git a/src/mame/includes/fromanc2.h b/src/mame/includes/fromanc2.h index 89fbb387a7e..011f12e54b1 100644 --- a/src/mame/includes/fromanc2.h +++ b/src/mame/includes/fromanc2.h @@ -97,6 +97,12 @@ public: TILE_GET_INFO_MEMBER(fromancr_get_v1_l0_tile_info); TILE_GET_INFO_MEMBER(fromancr_get_v1_l1_tile_info); TILE_GET_INFO_MEMBER(fromancr_get_v1_l2_tile_info); + virtual void machine_reset(); + DECLARE_MACHINE_START(fromanc2); + DECLARE_VIDEO_START(fromanc2); + DECLARE_VIDEO_START(fromancr); + DECLARE_MACHINE_START(fromanc4); + DECLARE_VIDEO_START(fromanc4); }; @@ -106,8 +112,8 @@ public: SCREEN_UPDATE_IND16( fromanc2_left ); SCREEN_UPDATE_IND16( fromanc2_right ); -VIDEO_START( fromanc2 ); -VIDEO_START( fromancr ); -VIDEO_START( fromanc4 ); + + + void fromancr_gfxbank_w(running_machine &machine, int data); diff --git a/src/mame/includes/fromance.h b/src/mame/includes/fromance.h index 5aa61e0b1de..c04f17ab586 100644 --- a/src/mame/includes/fromance.h +++ b/src/mame/includes/fromance.h @@ -76,15 +76,23 @@ public: TILE_GET_INFO_MEMBER(get_fromance_fg_tile_info); TILE_GET_INFO_MEMBER(get_nekkyoku_bg_tile_info); TILE_GET_INFO_MEMBER(get_nekkyoku_fg_tile_info); + DECLARE_MACHINE_START(fromance); + DECLARE_MACHINE_RESET(fromance); + DECLARE_VIDEO_START(nekkyoku); + DECLARE_VIDEO_START(fromance); + DECLARE_MACHINE_START(pipedrm); + DECLARE_MACHINE_RESET(pipedrm); + DECLARE_VIDEO_START(pipedrm); + DECLARE_VIDEO_START(hatris); }; /*----------- defined in video/fromance.c -----------*/ -VIDEO_START( fromance ); -VIDEO_START( nekkyoku ); -VIDEO_START( pipedrm ); -VIDEO_START( hatris ); + + + + SCREEN_UPDATE_IND16( fromance ); SCREEN_UPDATE_IND16( pipedrm ); diff --git a/src/mame/includes/funkybee.h b/src/mame/includes/funkybee.h index 63f16ea8c54..01982f7c969 100644 --- a/src/mame/includes/funkybee.h +++ b/src/mame/includes/funkybee.h @@ -24,12 +24,16 @@ public: DECLARE_WRITE8_MEMBER(funkybee_flipscreen_w); TILE_GET_INFO_MEMBER(get_bg_tile_info); TILEMAP_MAPPER_MEMBER(funkybee_tilemap_scan); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/funkybee.c -----------*/ -PALETTE_INIT( funkybee ); -VIDEO_START( funkybee ); + + SCREEN_UPDATE_IND16( funkybee ); diff --git a/src/mame/includes/funkyjet.h b/src/mame/includes/funkyjet.h index b0ad7b11a2f..0fba2b1b57d 100644 --- a/src/mame/includes/funkyjet.h +++ b/src/mame/includes/funkyjet.h @@ -24,6 +24,7 @@ public: cpu_device *m_audiocpu; device_t *m_deco_tilegen1; DECLARE_DRIVER_INIT(funkyjet); + virtual void machine_start(); }; diff --git a/src/mame/includes/funworld.h b/src/mame/includes/funworld.h index b0cc5ed5aa4..eae6578398e 100644 --- a/src/mame/includes/funworld.h +++ b/src/mame/includes/funworld.h @@ -26,12 +26,15 @@ public: DECLARE_DRIVER_INIT(tabblue); DECLARE_DRIVER_INIT(magicd2a); TILE_GET_INFO_MEMBER(get_bg_tile_info); + DECLARE_VIDEO_START(funworld); + DECLARE_PALETTE_INIT(funworld); + DECLARE_VIDEO_START(magicrd2); }; /*----------- defined in video/funworld.c -----------*/ -PALETTE_INIT( funworld ); -VIDEO_START( funworld ); -VIDEO_START( magicrd2 ); + + + SCREEN_UPDATE_IND16( funworld ); diff --git a/src/mame/includes/funybubl.h b/src/mame/includes/funybubl.h index fd248247b36..1385c90d680 100644 --- a/src/mame/includes/funybubl.h +++ b/src/mame/includes/funybubl.h @@ -20,6 +20,8 @@ public: DECLARE_WRITE8_MEMBER(funybubl_soundcommand_w); DECLARE_WRITE8_MEMBER(funybubl_paldatawrite); DECLARE_WRITE8_MEMBER(funybubl_oki_bank_sw); + virtual void machine_start(); + virtual void video_start(); }; @@ -27,5 +29,5 @@ public: /*----------- defined in video/funybubl.c -----------*/ -VIDEO_START(funybubl); + SCREEN_UPDATE_IND16(funybubl); diff --git a/src/mame/includes/fuukifg2.h b/src/mame/includes/fuukifg2.h index 504c5054fc8..af7d9b01023 100644 --- a/src/mame/includes/fuukifg2.h +++ b/src/mame/includes/fuukifg2.h @@ -40,11 +40,14 @@ public: TILE_GET_INFO_MEMBER(get_tile_info_1); TILE_GET_INFO_MEMBER(get_tile_info_2); TILE_GET_INFO_MEMBER(get_tile_info_3); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; /*----------- defined in video/fuukifg2.c -----------*/ -VIDEO_START( fuuki16 ); + SCREEN_UPDATE_IND16( fuuki16 ); diff --git a/src/mame/includes/fuukifg3.h b/src/mame/includes/fuukifg3.h index 15f522c9441..ff7e607eb49 100644 --- a/src/mame/includes/fuukifg3.h +++ b/src/mame/includes/fuukifg3.h @@ -58,12 +58,15 @@ public: TILE_GET_INFO_MEMBER(get_tile_info_1); TILE_GET_INFO_MEMBER(get_tile_info_2); TILE_GET_INFO_MEMBER(get_tile_info_3); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; /*----------- defined in video/fuuki32.c -----------*/ -VIDEO_START( fuuki32 ); + SCREEN_UPDATE_IND16( fuuki32 ); SCREEN_VBLANK( fuuki32 ); diff --git a/src/mame/includes/gaelco.h b/src/mame/includes/gaelco.h index cbf51e671e5..e43d8fca7cd 100644 --- a/src/mame/includes/gaelco.h +++ b/src/mame/includes/gaelco.h @@ -36,6 +36,9 @@ public: DECLARE_WRITE16_MEMBER(gaelco_vram_w); TILE_GET_INFO_MEMBER(get_tile_info_gaelco_screen0); TILE_GET_INFO_MEMBER(get_tile_info_gaelco_screen1); + virtual void machine_start(); + DECLARE_VIDEO_START(bigkarnk); + DECLARE_VIDEO_START(maniacsq); }; @@ -43,8 +46,8 @@ public: /*----------- defined in video/gaelco.c -----------*/ -VIDEO_START( bigkarnk ); -VIDEO_START( maniacsq ); + + SCREEN_UPDATE_IND16( bigkarnk ); SCREEN_UPDATE_IND16( maniacsq ); diff --git a/src/mame/includes/gaelco2.h b/src/mame/includes/gaelco2.h index 7129cdd9c59..17661fc6fb4 100644 --- a/src/mame/includes/gaelco2.h +++ b/src/mame/includes/gaelco2.h @@ -47,6 +47,8 @@ public: TILE_GET_INFO_MEMBER(get_tile_info_gaelco2_screen1); TILE_GET_INFO_MEMBER(get_tile_info_gaelco2_screen0_dual); TILE_GET_INFO_MEMBER(get_tile_info_gaelco2_screen1_dual); + DECLARE_VIDEO_START(gaelco2); + DECLARE_VIDEO_START(gaelco2_dual); }; @@ -60,7 +62,7 @@ WRITE16_DEVICE_HANDLER( gaelco2_eeprom_data_w ); /*----------- defined in video/gaelco2.c -----------*/ SCREEN_UPDATE_IND16( gaelco2 ); -VIDEO_START( gaelco2 ); + SCREEN_UPDATE_IND16( gaelco2_left ); SCREEN_UPDATE_IND16( gaelco2_right ); -VIDEO_START( gaelco2_dual ); + diff --git a/src/mame/includes/gaelco3d.h b/src/mame/includes/gaelco3d.h index 0a11c17f579..2efeb54723f 100644 --- a/src/mame/includes/gaelco3d.h +++ b/src/mame/includes/gaelco3d.h @@ -110,6 +110,11 @@ public: DECLARE_WRITE16_MEMBER(eeprom_clock_w); DECLARE_WRITE16_MEMBER(eeprom_cs_w); DECLARE_DRIVER_INIT(gaelco3d); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); + DECLARE_MACHINE_RESET(gaelco3d2); + DECLARE_MACHINE_RESET(common); }; @@ -118,5 +123,5 @@ public: void gaelco3d_render(screen_device &screen); -VIDEO_START( gaelco3d ); + SCREEN_UPDATE_IND16( gaelco3d ); diff --git a/src/mame/includes/gaiden.h b/src/mame/includes/gaiden.h index 25947a92d01..08e7363ca20 100644 --- a/src/mame/includes/gaiden.h +++ b/src/mame/includes/gaiden.h @@ -77,15 +77,21 @@ public: TILE_GET_INFO_MEMBER(get_fg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info_raiga); TILE_GET_INFO_MEMBER(get_tx_tile_info); + DECLARE_MACHINE_START(raiga); + DECLARE_MACHINE_RESET(raiga); + DECLARE_VIDEO_START(gaiden); + DECLARE_VIDEO_START(drgnbowl); + DECLARE_VIDEO_START(mastninj); + DECLARE_VIDEO_START(raiga); }; /*----------- defined in video/gaiden.c -----------*/ -VIDEO_START( gaiden ); -VIDEO_START( raiga ); -VIDEO_START( drgnbowl ); -VIDEO_START( mastninj ); + + + + SCREEN_UPDATE_RGB32( gaiden ); SCREEN_UPDATE_RGB32( raiga ); diff --git a/src/mame/includes/galaga.h b/src/mame/includes/galaga.h index 74653e4f5d5..9961977afcc 100644 --- a/src/mame/includes/galaga.h +++ b/src/mame/includes/galaga.h @@ -52,6 +52,10 @@ public: DECLARE_DRIVER_INIT(gatsbee); TILEMAP_MAPPER_MEMBER(tilemap_scan); TILE_GET_INFO_MEMBER(get_tile_info); + DECLARE_MACHINE_START(galaga); + DECLARE_MACHINE_RESET(galaga); + DECLARE_VIDEO_START(galaga); + DECLARE_PALETTE_INIT(galaga); }; class xevious_state : public galaga_state @@ -81,6 +85,11 @@ public: DECLARE_DRIVER_INIT(battles); TILE_GET_INFO_MEMBER(get_fg_tile_info); TILE_GET_INFO_MEMBER(get_bg_tile_info); + DECLARE_VIDEO_START(xevious); + DECLARE_PALETTE_INIT(xevious); + DECLARE_MACHINE_RESET(xevios); + DECLARE_PALETTE_INIT(battles); + DECLARE_MACHINE_RESET(battles); }; @@ -108,6 +117,8 @@ public: TILEMAP_MAPPER_MEMBER(fg_tilemap_scan); TILE_GET_INFO_MEMBER(bg_get_tile_info); TILE_GET_INFO_MEMBER(fg_get_tile_info); + DECLARE_VIDEO_START(bosco); + DECLARE_PALETTE_INIT(bosco); }; class digdug_state : public galaga_state @@ -131,6 +142,8 @@ public: TILEMAP_MAPPER_MEMBER(tilemap_scan); TILE_GET_INFO_MEMBER(bg_get_tile_info); TILE_GET_INFO_MEMBER(tx_get_tile_info); + DECLARE_VIDEO_START(digdug); + DECLARE_PALETTE_INIT(digdug); }; @@ -141,9 +154,9 @@ WRITE8_HANDLER( bosco_videoram_w ); WRITE8_HANDLER( bosco_scrollx_w ); WRITE8_HANDLER( bosco_scrolly_w ); WRITE8_HANDLER( bosco_starclr_w ); -VIDEO_START( bosco ); + SCREEN_UPDATE_IND16( bosco ); -PALETTE_INIT( bosco ); + SCREEN_VBLANK( bosco ); /* update starfield */ /*----------- defined in audio/galaga.c -----------*/ @@ -162,8 +175,8 @@ struct star extern const struct star star_seed_tab[]; -PALETTE_INIT( galaga ); -VIDEO_START( galaga ); + + SCREEN_UPDATE_IND16( galaga ); SCREEN_VBLANK( galaga ); /* update starfield */ @@ -176,11 +189,11 @@ WRITE8_HANDLER( xevious_bg_colorram_w ); WRITE8_HANDLER( xevious_vh_latch_w ); WRITE8_HANDLER( xevious_bs_w ); READ8_HANDLER( xevious_bb_r ); -VIDEO_START( xevious ); -PALETTE_INIT( xevious ); + + SCREEN_UPDATE_IND16( xevious ); -PALETTE_INIT( battles ); + /*----------- defined in machine/xevious.c -----------*/ @@ -206,6 +219,6 @@ INTERRUPT_GEN( battles_interrupt_4 ); WRITE8_HANDLER( digdug_videoram_w ); WRITE8_HANDLER( digdug_PORT_w ); -VIDEO_START( digdug ); + SCREEN_UPDATE_IND16( digdug ); -PALETTE_INIT( digdug ); + diff --git a/src/mame/includes/galastrm.h b/src/mame/includes/galastrm.h index 11a495805d3..a6ef24ac06e 100644 --- a/src/mame/includes/galastrm.h +++ b/src/mame/includes/galastrm.h @@ -46,10 +46,11 @@ public: DECLARE_WRITE32_MEMBER(galastrm_adstick_ctrl_w); DECLARE_CUSTOM_INPUT_MEMBER(frame_counter_r); DECLARE_CUSTOM_INPUT_MEMBER(coin_word_r); + virtual void video_start(); }; /*----------- defined in video/galastrm.c -----------*/ -VIDEO_START( galastrm ); + SCREEN_UPDATE_IND16( galastrm ); diff --git a/src/mame/includes/galaxia.h b/src/mame/includes/galaxia.h index ce3eeece749..e613ac17bdf 100644 --- a/src/mame/includes/galaxia.h +++ b/src/mame/includes/galaxia.h @@ -22,15 +22,19 @@ public: DECLARE_READ8_MEMBER(galaxia_collision_clear); TILE_GET_INFO_MEMBER(get_galaxia_bg_tile_info); TILE_GET_INFO_MEMBER(get_astrowar_bg_tile_info); + DECLARE_VIDEO_START(galaxia); + DECLARE_PALETTE_INIT(galaxia); + DECLARE_VIDEO_START(astrowar); + DECLARE_PALETTE_INIT(astrowar); }; /*----------- defined in video/galaxia.c -----------*/ -PALETTE_INIT( galaxia ); -PALETTE_INIT( astrowar ); -VIDEO_START( galaxia ); -VIDEO_START( astrowar ); + + + + SCREEN_UPDATE_IND16( galaxia ); SCREEN_UPDATE_IND16( astrowar ); diff --git a/src/mame/includes/galaxian.h b/src/mame/includes/galaxian.h index bb02c65fb49..2b131fbfdcc 100644 --- a/src/mame/includes/galaxian.h +++ b/src/mame/includes/galaxian.h @@ -219,15 +219,19 @@ public: DECLARE_DRIVER_INIT(calipso); DECLARE_DRIVER_INIT(moonwar); TILE_GET_INFO_MEMBER(bg_get_tile_info); + virtual void video_start(); + virtual void palette_init(); + DECLARE_PALETTE_INIT(moonwar); + void tenspot_set_game_bank(running_machine& machine, int bank, int from_game); }; /*----------- defined in video/galaxian.c -----------*/ -PALETTE_INIT( galaxian ); -PALETTE_INIT( moonwar ); -VIDEO_START( galaxian ); + + + SCREEN_UPDATE_RGB32( galaxian ); @@ -288,9 +292,3 @@ void calipso_extend_sprite_info(running_machine &machine, const UINT8 *base, UIN /* Jumpbug extensions */ void jumpbug_extend_tile_info(running_machine &machine, UINT16 *code, UINT8 *color, UINT8 attrib, UINT8 x); void jumpbug_extend_sprite_info(running_machine &machine, const UINT8 *base, UINT8 *sx, UINT8 *sy, UINT8 *flipx, UINT8 *flipy, UINT16 *code, UINT8 *color); - -/*----------- defined in drivers/galaxian.c -----------*/ - -/* Ten Spot extensions */ -void tenspot_set_game_bank(running_machine &machine, int bank, int from_game); - diff --git a/src/mame/includes/galaxold.h b/src/mame/includes/galaxold.h index 86a738eb690..83123ff1ba9 100644 --- a/src/mame/includes/galaxold.h +++ b/src/mame/includes/galaxold.h @@ -142,48 +142,82 @@ public: TILE_GET_INFO_MEMBER(dambustr_get_tile_info2); TILE_GET_INFO_MEMBER(get_tile_info); TILE_GET_INFO_MEMBER(rockclim_get_tile_info); + DECLARE_MACHINE_RESET(galaxold); + DECLARE_VIDEO_START(galaxold); + DECLARE_PALETTE_INIT(galaxold); + DECLARE_VIDEO_START(drivfrcg); + DECLARE_PALETTE_INIT(rockclim); + DECLARE_VIDEO_START(racknrol); + DECLARE_VIDEO_START(batman2); + DECLARE_VIDEO_START(mooncrst); + DECLARE_VIDEO_START(scrambold); + DECLARE_PALETTE_INIT(scrambold); + DECLARE_VIDEO_START(pisces); + DECLARE_MACHINE_RESET(devilfsg); + DECLARE_VIDEO_START(dkongjrm); + DECLARE_VIDEO_START(rockclim); + DECLARE_VIDEO_START(galaxold_plain); + DECLARE_VIDEO_START(bongo); + DECLARE_MACHINE_RESET(hunchbkg); + DECLARE_VIDEO_START(ckongs); + DECLARE_PALETTE_INIT(stratgyx); + DECLARE_PALETTE_INIT(darkplnt); + DECLARE_PALETTE_INIT(minefld); + DECLARE_PALETTE_INIT(rescue); + DECLARE_PALETTE_INIT(mariner); + DECLARE_PALETTE_INIT(dambustr); + DECLARE_PALETTE_INIT(turtles); + DECLARE_VIDEO_START(darkplnt); + DECLARE_VIDEO_START(rescue); + DECLARE_VIDEO_START(minefld); + DECLARE_VIDEO_START(stratgyx); + DECLARE_VIDEO_START(mariner); + DECLARE_VIDEO_START(mimonkey); + DECLARE_VIDEO_START(scorpion); + DECLARE_VIDEO_START(ad2083); + DECLARE_VIDEO_START(dambustr); }; /*----------- defined in video/galaxold.c -----------*/ -PALETTE_INIT( galaxold ); -PALETTE_INIT( scrambold ); -PALETTE_INIT( darkplnt ); -PALETTE_INIT( rescue ); -PALETTE_INIT( minefld ); -PALETTE_INIT( stratgyx ); -PALETTE_INIT( mariner ); -PALETTE_INIT( rockclim ); -PALETTE_INIT( dambustr ); -PALETTE_INIT( turtles ); - -VIDEO_START( dambustr ); - - - - - -VIDEO_START( galaxold_plain ); -VIDEO_START( galaxold ); -VIDEO_START( mooncrst ); -VIDEO_START( pisces ); -VIDEO_START( batman2 ); -VIDEO_START( dkongjrm ); -VIDEO_START( scrambold ); -VIDEO_START( darkplnt ); -VIDEO_START( rescue ); -VIDEO_START( minefld ); -VIDEO_START( stratgyx ); -VIDEO_START( mimonkey ); -VIDEO_START( mariner ); -VIDEO_START( ckongs ); -VIDEO_START( rockclim ); -VIDEO_START( drivfrcg ); -VIDEO_START( bongo ); -VIDEO_START( scorpion ); -VIDEO_START( racknrol ); -VIDEO_START( ad2083 ); + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + void galaxold_init_stars(running_machine &machine, int colors_offset); void galaxold_draw_stars(running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -201,9 +235,9 @@ WRITE_LINE_DEVICE_HANDLER( galaxold_7474_9m_2_q_callback ); WRITE_LINE_DEVICE_HANDLER( galaxold_7474_9m_1_callback ); -MACHINE_RESET( galaxold ); -MACHINE_RESET( devilfsg ); -MACHINE_RESET( hunchbkg ); + + + #define galaxold_coin_counter_0_w galaxold_coin_counter_w diff --git a/src/mame/includes/galivan.h b/src/mame/includes/galivan.h index 62980846ab9..fa9fc2dbe3e 100644 --- a/src/mame/includes/galivan.h +++ b/src/mame/includes/galivan.h @@ -49,6 +49,13 @@ public: TILE_GET_INFO_MEMBER(get_tx_tile_info); TILE_GET_INFO_MEMBER(ninjemak_get_bg_tile_info); TILE_GET_INFO_MEMBER(ninjemak_get_tx_tile_info); + virtual void palette_init(); + DECLARE_MACHINE_START(galivan); + DECLARE_MACHINE_RESET(galivan); + DECLARE_VIDEO_START(galivan); + DECLARE_MACHINE_START(ninjemak); + DECLARE_MACHINE_RESET(ninjemak); + DECLARE_VIDEO_START(ninjemak); }; @@ -58,9 +65,9 @@ public: WRITE8_HANDLER( ninjemak_scrollx_w ); WRITE8_HANDLER( ninjemak_scrolly_w ); -PALETTE_INIT( galivan ); -VIDEO_START( galivan ); -VIDEO_START( ninjemak ); + + + SCREEN_UPDATE_IND16( galivan ); SCREEN_UPDATE_IND16( ninjemak ); diff --git a/src/mame/includes/galpani2.h b/src/mame/includes/galpani2.h index d5d4b3b2284..b5bdd96cccc 100644 --- a/src/mame/includes/galpani2.h +++ b/src/mame/includes/galpani2.h @@ -47,13 +47,16 @@ public: DECLARE_WRITE16_MEMBER(galpani2_eeprom_w); DECLARE_WRITE8_MEMBER(galpani2_oki1_bank_w); DECLARE_WRITE8_MEMBER(galpani2_oki2_bank_w); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/galpani2.c -----------*/ -PALETTE_INIT( galpani2 ); -VIDEO_START( galpani2 ); + + SCREEN_UPDATE_IND16( galpani2 ); WRITE16_HANDLER( galpani2_palette_0_w ); diff --git a/src/mame/includes/galpanic.h b/src/mame/includes/galpanic.h index c3463d1d4a0..5b0419793d0 100644 --- a/src/mame/includes/galpanic.h +++ b/src/mame/includes/galpanic.h @@ -22,15 +22,17 @@ public: DECLARE_READ16_MEMBER(comad_timer_r); DECLARE_READ16_MEMBER(zipzap_random_read); DECLARE_READ8_MEMBER(comad_okim6295_r); + DECLARE_VIDEO_START(galpanic); + DECLARE_PALETTE_INIT(galpanic); }; /*----------- defined in video/galpanic.c -----------*/ -PALETTE_INIT( galpanic ); + WRITE16_HANDLER( galpanic_bgvideoram_w ); WRITE16_HANDLER( galpanic_paletteram_w ); -VIDEO_START( galpanic ); + SCREEN_UPDATE_IND16( galpanic ); SCREEN_UPDATE_IND16( comad ); diff --git a/src/mame/includes/galspnbl.h b/src/mame/includes/galspnbl.h index 35e7e9f2373..4474fe42b39 100644 --- a/src/mame/includes/galspnbl.h +++ b/src/mame/includes/galspnbl.h @@ -27,11 +27,13 @@ public: /* devices */ cpu_device *m_audiocpu; DECLARE_WRITE16_MEMBER(soundcommand_w); + virtual void machine_start(); + virtual void palette_init(); }; /*----------- defined in video/galspnbl.c -----------*/ -PALETTE_INIT( galspnbl ); + SCREEN_UPDATE_IND16( galspnbl ); diff --git a/src/mame/includes/gameplan.h b/src/mame/includes/gameplan.h index 6fd6286565c..c44d13a4826 100644 --- a/src/mame/includes/gameplan.h +++ b/src/mame/includes/gameplan.h @@ -59,6 +59,15 @@ public: DECLARE_WRITE8_MEMBER(audio_trigger_w); DECLARE_WRITE_LINE_MEMBER(r6532_irq); DECLARE_WRITE8_MEMBER(r6532_soundlatch_w); + DECLARE_MACHINE_START(gameplan); + DECLARE_MACHINE_RESET(gameplan); + DECLARE_MACHINE_START(trvquest); + DECLARE_MACHINE_RESET(trvquest); + DECLARE_VIDEO_START(gameplan); + DECLARE_VIDEO_RESET(gameplan); + DECLARE_VIDEO_START(leprechn); + DECLARE_VIDEO_START(trvquest); + DECLARE_VIDEO_START(common); }; diff --git a/src/mame/includes/gaplus.h b/src/mame/includes/gaplus.h index b5631c5f7c4..654fe521df1 100644 --- a/src/mame/includes/gaplus.h +++ b/src/mame/includes/gaplus.h @@ -42,6 +42,9 @@ public: DECLARE_DRIVER_INIT(gaplus); TILEMAP_MAPPER_MEMBER(tilemap_scan); TILE_GET_INFO_MEMBER(get_tile_info); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); }; @@ -51,7 +54,7 @@ public: /*----------- defined in video/gaplus.c -----------*/ -VIDEO_START( gaplus ); -PALETTE_INIT( gaplus ); + + SCREEN_UPDATE_IND16( gaplus ); SCREEN_VBLANK( gaplus ); /* update starfields */ diff --git a/src/mame/includes/gatron.h b/src/mame/includes/gatron.h index 64abb10d69d..cb9112ad92d 100644 --- a/src/mame/includes/gatron.h +++ b/src/mame/includes/gatron.h @@ -11,12 +11,14 @@ public: DECLARE_WRITE8_MEMBER(gat_videoram_w); DECLARE_WRITE8_MEMBER(output_port_1_w); TILE_GET_INFO_MEMBER(get_bg_tile_info); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/gatron.c -----------*/ -PALETTE_INIT( gat ); -VIDEO_START( gat ); + + SCREEN_UPDATE_IND16( gat ); diff --git a/src/mame/includes/gauntlet.h b/src/mame/includes/gauntlet.h index 1916710e860..75ea02b7ba6 100644 --- a/src/mame/includes/gauntlet.h +++ b/src/mame/includes/gauntlet.h @@ -27,6 +27,9 @@ public: DECLARE_DRIVER_INIT(vindctr2); TILE_GET_INFO_MEMBER(get_alpha_tile_info); TILE_GET_INFO_MEMBER(get_playfield_tile_info); + DECLARE_MACHINE_START(gauntlet); + DECLARE_MACHINE_RESET(gauntlet); + DECLARE_VIDEO_START(gauntlet); }; @@ -35,5 +38,5 @@ public: WRITE16_HANDLER( gauntlet_xscroll_w ); WRITE16_HANDLER( gauntlet_yscroll_w ); -VIDEO_START( gauntlet ); + SCREEN_UPDATE_IND16( gauntlet ); diff --git a/src/mame/includes/gberet.h b/src/mame/includes/gberet.h index c326ab20d1b..8c9c8b1a324 100644 --- a/src/mame/includes/gberet.h +++ b/src/mame/includes/gberet.h @@ -51,13 +51,17 @@ public: DECLARE_WRITE8_MEMBER(gberetb_scroll_w); DECLARE_DRIVER_INIT(mrgoemon); TILE_GET_INFO_MEMBER(get_bg_tile_info); + DECLARE_MACHINE_START(gberet); + DECLARE_MACHINE_RESET(gberet); + DECLARE_VIDEO_START(gberet); + DECLARE_PALETTE_INIT(gberet); }; /*----------- defined in video/gberet.c -----------*/ -PALETTE_INIT( gberet ); -VIDEO_START( gberet ); + + SCREEN_UPDATE_IND16( gberet ); SCREEN_UPDATE_IND16( gberetb ); diff --git a/src/mame/includes/gbusters.h b/src/mame/includes/gbusters.h index f8563064da5..a213322029e 100644 --- a/src/mame/includes/gbusters.h +++ b/src/mame/includes/gbusters.h @@ -37,6 +37,9 @@ public: DECLARE_READ8_MEMBER(k052109_051960_r); DECLARE_WRITE8_MEMBER(k052109_051960_w); DECLARE_WRITE8_MEMBER(gbusters_snd_bankswitch_w); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; /*----------- defined in video/gbusters.c -----------*/ @@ -44,5 +47,5 @@ public: extern void gbusters_tile_callback(running_machine &machine, int layer,int bank,int *code,int *color,int *flags, int *priority); extern void gbusters_sprite_callback(running_machine &machine, int *code,int *color,int *priority,int *shadow); -VIDEO_START( gbusters ); + SCREEN_UPDATE_IND16( gbusters ); diff --git a/src/mame/includes/gcpinbal.h b/src/mame/includes/gcpinbal.h index 862849482e9..1acbad10df1 100644 --- a/src/mame/includes/gcpinbal.h +++ b/src/mame/includes/gcpinbal.h @@ -55,11 +55,14 @@ public: TILE_GET_INFO_MEMBER(get_bg0_tile_info); TILE_GET_INFO_MEMBER(get_bg1_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; /*----------- defined in video/gcpinbal.c -----------*/ -VIDEO_START( gcpinbal ); + SCREEN_UPDATE_IND16( gcpinbal ); diff --git a/src/mame/includes/gijoe.h b/src/mame/includes/gijoe.h index 1c6f17b6c68..12e9803360b 100644 --- a/src/mame/includes/gijoe.h +++ b/src/mame/includes/gijoe.h @@ -41,6 +41,9 @@ public: DECLARE_WRITE16_MEMBER(sound_cmd_w); DECLARE_WRITE16_MEMBER(sound_irq_w); DECLARE_READ16_MEMBER(sound_status_r); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; /*----------- defined in video/gijoe.c -----------*/ @@ -48,5 +51,5 @@ public: extern void gijoe_sprite_callback(running_machine &machine, int *code, int *color, int *priority_mask); extern void gijoe_tile_callback(running_machine &machine, int layer, int *code, int *color, int *flags); -VIDEO_START( gijoe ); + SCREEN_UPDATE_IND16( gijoe ); diff --git a/src/mame/includes/ginganin.h b/src/mame/includes/ginganin.h index 904757d9d68..ebf9d09962e 100644 --- a/src/mame/includes/ginganin.h +++ b/src/mame/includes/ginganin.h @@ -42,6 +42,9 @@ public: TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); TILE_GET_INFO_MEMBER(get_txt_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; @@ -49,5 +52,5 @@ public: /*----------- defined in video/ginganin.c -----------*/ -VIDEO_START( ginganin ); + SCREEN_UPDATE_IND16( ginganin ); diff --git a/src/mame/includes/gladiatr.h b/src/mame/includes/gladiatr.h index 315fdeea8f2..75faf3e3291 100644 --- a/src/mame/includes/gladiatr.h +++ b/src/mame/includes/gladiatr.h @@ -60,11 +60,15 @@ public: DECLARE_DRIVER_INIT(ppking); TILE_GET_INFO_MEMBER(bg_get_tile_info); TILE_GET_INFO_MEMBER(fg_get_tile_info); + DECLARE_MACHINE_RESET(ppking); + DECLARE_VIDEO_START(ppking); + DECLARE_MACHINE_RESET(gladiator); + DECLARE_VIDEO_START(gladiatr); }; /*----------- defined in video/gladiatr.c -----------*/ -VIDEO_START( ppking ); + SCREEN_UPDATE_IND16( ppking ); -VIDEO_START( gladiatr ); + SCREEN_UPDATE_IND16( gladiatr ); diff --git a/src/mame/includes/glass.h b/src/mame/includes/glass.h index 30d0f0f4f25..276d6abb848 100644 --- a/src/mame/includes/glass.h +++ b/src/mame/includes/glass.h @@ -43,11 +43,14 @@ public: DECLARE_DRIVER_INIT(glass); TILE_GET_INFO_MEMBER(get_tile_info_glass_screen0); TILE_GET_INFO_MEMBER(get_tile_info_glass_screen1); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; /*----------- defined in video/glass.c -----------*/ -VIDEO_START( glass ); + SCREEN_UPDATE_IND16( glass ); diff --git a/src/mame/includes/gng.h b/src/mame/includes/gng.h index 59ae789c049..46462a65cac 100644 --- a/src/mame/includes/gng.h +++ b/src/mame/includes/gng.h @@ -39,11 +39,14 @@ public: DECLARE_DRIVER_INIT(diamond); TILE_GET_INFO_MEMBER(get_fg_tile_info); TILE_GET_INFO_MEMBER(get_bg_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; /*----------- defined in video/gng.c -----------*/ -VIDEO_START( gng ); + SCREEN_UPDATE_IND16( gng ); diff --git a/src/mame/includes/goal92.h b/src/mame/includes/goal92.h index bbf029752e7..26e70ae57bb 100644 --- a/src/mame/includes/goal92.h +++ b/src/mame/includes/goal92.h @@ -48,6 +48,9 @@ public: TILE_GET_INFO_MEMBER(get_text_tile_info); TILE_GET_INFO_MEMBER(get_back_tile_info); TILE_GET_INFO_MEMBER(get_fore_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; @@ -57,6 +60,6 @@ public: /*----------- defined in video/goal92.c -----------*/ -VIDEO_START( goal92 ); + SCREEN_UPDATE_IND16( goal92 ); SCREEN_VBLANK( goal92 ); diff --git a/src/mame/includes/goindol.h b/src/mame/includes/goindol.h index d7dd720f01b..846adef7b11 100644 --- a/src/mame/includes/goindol.h +++ b/src/mame/includes/goindol.h @@ -44,6 +44,9 @@ public: DECLARE_DRIVER_INIT(goindol); TILE_GET_INFO_MEMBER(get_fg_tile_info); TILE_GET_INFO_MEMBER(get_bg_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; @@ -51,5 +54,5 @@ public: /*----------- defined in video/goindol.c -----------*/ -VIDEO_START( goindol ); + SCREEN_UPDATE_IND16( goindol ); diff --git a/src/mame/includes/goldstar.h b/src/mame/includes/goldstar.h index 3d51d8db658..3e376fa3995 100644 --- a/src/mame/includes/goldstar.h +++ b/src/mame/includes/goldstar.h @@ -132,6 +132,15 @@ public: TILE_GET_INFO_MEMBER(get_unkch_reel1_tile_info); TILE_GET_INFO_MEMBER(get_unkch_reel2_tile_info); TILE_GET_INFO_MEMBER(get_unkch_reel3_tile_info); + DECLARE_VIDEO_START(goldstar); + DECLARE_PALETTE_INIT(cm); + DECLARE_VIDEO_START(cherrym); + DECLARE_PALETTE_INIT(cmast91); + DECLARE_PALETTE_INIT(lucky8); + DECLARE_VIDEO_START(bingowng); + DECLARE_VIDEO_START(magical); + DECLARE_PALETTE_INIT(magodds); + DECLARE_VIDEO_START(unkch); }; @@ -140,11 +149,11 @@ public: -VIDEO_START( goldstar ); -VIDEO_START( bingowng ); -VIDEO_START( cherrym ); -VIDEO_START( unkch ); -VIDEO_START( magical ); + + + + + SCREEN_UPDATE_IND16( goldstar ); SCREEN_UPDATE_IND16( bingowng ); SCREEN_UPDATE_IND16( cmast91 ); diff --git a/src/mame/includes/gomoku.h b/src/mame/includes/gomoku.h index fe93f8a22f0..c64e3248d69 100644 --- a/src/mame/includes/gomoku.h +++ b/src/mame/includes/gomoku.h @@ -23,6 +23,8 @@ public: DECLARE_WRITE8_MEMBER(gomoku_flipscreen_w); DECLARE_WRITE8_MEMBER(gomoku_bg_dispsw_w); TILE_GET_INFO_MEMBER(get_fg_tile_info); + virtual void video_start(); + virtual void palette_init(); }; @@ -58,7 +60,7 @@ extern const device_type GOMOKU; /*----------- defined in video/gomoku.c -----------*/ -PALETTE_INIT( gomoku ); -VIDEO_START( gomoku ); + + SCREEN_UPDATE_IND16( gomoku ); diff --git a/src/mame/includes/gotcha.h b/src/mame/includes/gotcha.h index b4f18145cde..700adde88db 100644 --- a/src/mame/includes/gotcha.h +++ b/src/mame/includes/gotcha.h @@ -38,12 +38,15 @@ public: TILEMAP_MAPPER_MEMBER(gotcha_tilemap_scan); TILE_GET_INFO_MEMBER(fg_get_tile_info); TILE_GET_INFO_MEMBER(bg_get_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; /*----------- defined in video/gotcha.c -----------*/ -VIDEO_START( gotcha ); + SCREEN_UPDATE_IND16( gotcha ); diff --git a/src/mame/includes/gottlieb.h b/src/mame/includes/gottlieb.h index 977492f609f..e851eb9c80c 100644 --- a/src/mame/includes/gottlieb.h +++ b/src/mame/includes/gottlieb.h @@ -297,14 +297,18 @@ public: DECLARE_DRIVER_INIT(stooges); TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_screwloo_bg_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); + DECLARE_VIDEO_START(screwloo); }; /*----------- defined in video/gottlieb.c -----------*/ -VIDEO_START( gottlieb ); -VIDEO_START( screwloo ); + + SCREEN_UPDATE_RGB32( gottlieb ); #if USE_FAKE_VOTRAX diff --git a/src/mame/includes/gotya.h b/src/mame/includes/gotya.h index 33278051bea..fc92059c0d5 100644 --- a/src/mame/includes/gotya.h +++ b/src/mame/includes/gotya.h @@ -33,6 +33,10 @@ public: DECLARE_WRITE8_MEMBER(gotya_soundlatch_w); TILE_GET_INFO_MEMBER(get_bg_tile_info); TILEMAP_MAPPER_MEMBER(tilemap_scan_rows_thehand); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); }; @@ -43,6 +47,6 @@ public: /*----------- defined in video/gotya.c -----------*/ -PALETTE_INIT( gotya ); -VIDEO_START( gotya ); + + SCREEN_UPDATE_IND16( gotya ); diff --git a/src/mame/includes/gradius3.h b/src/mame/includes/gradius3.h index e68c3019327..7e75c797905 100644 --- a/src/mame/includes/gradius3.h +++ b/src/mame/includes/gradius3.h @@ -45,6 +45,9 @@ public: DECLARE_READ16_MEMBER(gradius3_gfxrom_r); DECLARE_WRITE16_MEMBER(gradius3_gfxram_w); DECLARE_WRITE8_MEMBER(sound_bank_w); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; /*----------- defined in video/gradius3.c -----------*/ @@ -53,5 +56,5 @@ extern void gradius3_sprite_callback(running_machine &machine, int *code,int *co extern void gradius3_tile_callback(running_machine &machine, int layer,int bank,int *code,int *color,int *flags,int *priority); -VIDEO_START( gradius3 ); + SCREEN_UPDATE_IND16( gradius3 ); diff --git a/src/mame/includes/grchamp.h b/src/mame/includes/grchamp.h index 6ce5df21057..4aef969b861 100644 --- a/src/mame/includes/grchamp.h +++ b/src/mame/includes/grchamp.h @@ -68,6 +68,9 @@ public: TILE_GET_INFO_MEMBER(get_right_tile_info); TILE_GET_INFO_MEMBER(get_center_tile_info); TILEMAP_MAPPER_MEMBER(get_memory_offset); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); }; /* Discrete Sound Input Nodes */ @@ -87,6 +90,6 @@ DISCRETE_SOUND_EXTERN( grchamp ); /*----------- defined in video/grchamp.c -----------*/ -PALETTE_INIT( grchamp ); -VIDEO_START( grchamp ); + + SCREEN_UPDATE_RGB32( grchamp ); diff --git a/src/mame/includes/gridlee.h b/src/mame/includes/gridlee.h index a642efea617..438cd457df2 100644 --- a/src/mame/includes/gridlee.h +++ b/src/mame/includes/gridlee.h @@ -51,6 +51,10 @@ public: DECLARE_WRITE8_MEMBER(gridlee_cocktail_flip_w); DECLARE_WRITE8_MEMBER(gridlee_videoram_w); DECLARE_WRITE8_MEMBER(gridlee_palette_select_w); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); }; @@ -87,7 +91,7 @@ extern const device_type GRIDLEE; /* video driver data & functions */ -PALETTE_INIT( gridlee ); -VIDEO_START( gridlee ); + + SCREEN_UPDATE_IND16( gridlee ); diff --git a/src/mame/includes/groundfx.h b/src/mame/includes/groundfx.h index fddd4393b33..0edd1b04747 100644 --- a/src/mame/includes/groundfx.h +++ b/src/mame/includes/groundfx.h @@ -36,10 +36,11 @@ public: DECLARE_CUSTOM_INPUT_MEMBER(frame_counter_r); DECLARE_CUSTOM_INPUT_MEMBER(coin_word_r); DECLARE_DRIVER_INIT(groundfx); + virtual void video_start(); }; /*----------- defined in video/groundfx.c -----------*/ -VIDEO_START( groundfx ); + SCREEN_UPDATE_IND16( groundfx ); diff --git a/src/mame/includes/gstriker.h b/src/mame/includes/gstriker.h index 92b7045b88b..8b01b101a27 100644 --- a/src/mame/includes/gstriker.h +++ b/src/mame/includes/gstriker.h @@ -101,6 +101,9 @@ public: TILE_GET_INFO_MEMBER(VS920A_get_tile_info); TILE_GET_INFO_MEMBER(MB60553_get_tile_info); TILEMAP_MAPPER_MEMBER(twc94_scan); + DECLARE_VIDEO_START(gstriker); + DECLARE_VIDEO_START(vgoalsoc); + DECLARE_VIDEO_START(twrldc94); }; @@ -108,7 +111,7 @@ public: SCREEN_UPDATE_IND16( gstriker ); -VIDEO_START( gstriker ); -VIDEO_START( twrldc94 ); -VIDEO_START( vgoalsoc ); + + + #endif diff --git a/src/mame/includes/gsword.h b/src/mame/includes/gsword.h index 0ae68b1bd83..8ad28f5dddf 100644 --- a/src/mame/includes/gsword.h +++ b/src/mame/includes/gsword.h @@ -40,13 +40,18 @@ public: DECLARE_DRIVER_INIT(gsword); DECLARE_DRIVER_INIT(gsword2); TILE_GET_INFO_MEMBER(get_bg_tile_info); + virtual void video_start(); + DECLARE_MACHINE_RESET(gsword); + DECLARE_PALETTE_INIT(gsword); + DECLARE_MACHINE_RESET(josvolly); + DECLARE_PALETTE_INIT(josvolly); }; /*----------- defined in video/gsword.c -----------*/ -PALETTE_INIT( josvolly ); -PALETTE_INIT( gsword ); -VIDEO_START( gsword ); + + + SCREEN_UPDATE_IND16( gsword ); diff --git a/src/mame/includes/gumbo.h b/src/mame/includes/gumbo.h index 2771f40f265..a8cc7f7f251 100644 --- a/src/mame/includes/gumbo.h +++ b/src/mame/includes/gumbo.h @@ -24,11 +24,12 @@ public: DECLARE_WRITE16_MEMBER(gumbo_fg_videoram_w); TILE_GET_INFO_MEMBER(get_gumbo_bg_tile_info); TILE_GET_INFO_MEMBER(get_gumbo_fg_tile_info); + virtual void video_start(); }; /*----------- defined in video/gumbo.c -----------*/ -VIDEO_START( gumbo ); + SCREEN_UPDATE_IND16( gumbo ); diff --git a/src/mame/includes/gunbustr.h b/src/mame/includes/gunbustr.h index a96b18a341a..00adcc7731f 100644 --- a/src/mame/includes/gunbustr.h +++ b/src/mame/includes/gunbustr.h @@ -38,10 +38,11 @@ public: DECLARE_CUSTOM_INPUT_MEMBER(coin_word_r); DECLARE_DRIVER_INIT(gunbustrj); DECLARE_DRIVER_INIT(gunbustr); + virtual void video_start(); }; /*----------- defined in video/gunbustr.c -----------*/ -VIDEO_START( gunbustr ); + SCREEN_UPDATE_IND16( gunbustr ); diff --git a/src/mame/includes/gundealr.h b/src/mame/includes/gundealr.h index 959cf9ae801..64863066691 100644 --- a/src/mame/includes/gundealr.h +++ b/src/mame/includes/gundealr.h @@ -38,6 +38,9 @@ public: TILE_GET_INFO_MEMBER(get_bg_tile_info); TILEMAP_MAPPER_MEMBER(gundealr_scan); TILE_GET_INFO_MEMBER(get_fg_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; @@ -46,4 +49,4 @@ public: SCREEN_UPDATE_IND16( gundealr ); -VIDEO_START( gundealr ); + diff --git a/src/mame/includes/gunsmoke.h b/src/mame/includes/gunsmoke.h index 2c93589e431..6f34b101179 100644 --- a/src/mame/includes/gunsmoke.h +++ b/src/mame/includes/gunsmoke.h @@ -36,13 +36,17 @@ public: DECLARE_WRITE8_MEMBER(gunsmoke_d806_w); TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/gunsmoke.c -----------*/ -PALETTE_INIT( gunsmoke ); -VIDEO_START( gunsmoke ); + + SCREEN_UPDATE_IND16( gunsmoke ); diff --git a/src/mame/includes/gyruss.h b/src/mame/includes/gyruss.h index 1dd7b6189c2..b22c9b29620 100644 --- a/src/mame/includes/gyruss.h +++ b/src/mame/includes/gyruss.h @@ -50,11 +50,14 @@ public: DECLARE_WRITE8_MEMBER(gyruss_filter1_w); DECLARE_DRIVER_INIT(gyruss); TILE_GET_INFO_MEMBER(gyruss_get_tile_info); + virtual void machine_start(); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/gyruss.c -----------*/ -PALETTE_INIT( gyruss ); -VIDEO_START( gyruss ); + + SCREEN_UPDATE_IND16( gyruss ); diff --git a/src/mame/includes/hanaawas.h b/src/mame/includes/hanaawas.h index d80fe7fa55e..9c4ee04cf49 100644 --- a/src/mame/includes/hanaawas.h +++ b/src/mame/includes/hanaawas.h @@ -26,6 +26,10 @@ public: DECLARE_WRITE8_MEMBER(hanaawas_videoram_w); DECLARE_WRITE8_MEMBER(hanaawas_colorram_w); TILE_GET_INFO_MEMBER(get_bg_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); }; @@ -33,6 +37,6 @@ public: WRITE8_DEVICE_HANDLER( hanaawas_portB_w ); -PALETTE_INIT( hanaawas ); -VIDEO_START( hanaawas ); + + SCREEN_UPDATE_IND16( hanaawas ); diff --git a/src/mame/includes/harddriv.h b/src/mame/includes/harddriv.h index 324a13e7feb..4f231628332 100644 --- a/src/mame/includes/harddriv.h +++ b/src/mame/includes/harddriv.h @@ -214,14 +214,17 @@ public: DECLARE_DRIVER_INIT(harddriv); DECLARE_DRIVER_INIT(steeltalp); DECLARE_DRIVER_INIT(stunrun); + DECLARE_MACHINE_START(harddriv); + DECLARE_MACHINE_RESET(harddriv); + DECLARE_VIDEO_START(harddriv); }; /*----------- defined in machine/harddriv.c -----------*/ /* Driver/Multisync board */ -MACHINE_START( harddriv ); -MACHINE_RESET( harddriv ); + + INTERRUPT_GEN( hd68k_irq_gen ); WRITE16_HANDLER( hd68k_irq_ack_w ); @@ -352,7 +355,7 @@ WRITE16_DEVICE_HANDLER( hdsnddsp_dac_w ); /*----------- defined in video/harddriv.c -----------*/ -VIDEO_START( harddriv ); + void hdgsp_write_to_shiftreg(address_space *space, UINT32 address, UINT16 *shiftreg); void hdgsp_read_from_shiftreg(address_space *space, UINT32 address, UINT16 *shiftreg); diff --git a/src/mame/includes/hcastle.h b/src/mame/includes/hcastle.h index 9053457f416..0b6e93182b1 100644 --- a/src/mame/includes/hcastle.h +++ b/src/mame/includes/hcastle.h @@ -51,12 +51,16 @@ public: TILEMAP_MAPPER_MEMBER(tilemap_scan); TILE_GET_INFO_MEMBER(get_fg_tile_info); TILE_GET_INFO_MEMBER(get_bg_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/hcastle.c -----------*/ -PALETTE_INIT( hcastle ); + SCREEN_UPDATE_IND16( hcastle ); -VIDEO_START( hcastle ); + diff --git a/src/mame/includes/hexion.h b/src/mame/includes/hexion.h index 4a5e176be10..03e57f27b51 100644 --- a/src/mame/includes/hexion.h +++ b/src/mame/includes/hexion.h @@ -21,11 +21,12 @@ public: DECLARE_WRITE_LINE_MEMBER(hexion_nmi_ack_w); TILE_GET_INFO_MEMBER(get_tile_info0); TILE_GET_INFO_MEMBER(get_tile_info1); + virtual void video_start(); }; /*----------- defined in video/hexion.c -----------*/ -VIDEO_START( hexion ); + SCREEN_UPDATE_IND16( hexion ); diff --git a/src/mame/includes/higemaru.h b/src/mame/includes/higemaru.h index dde1e7b2278..9ec141751fb 100644 --- a/src/mame/includes/higemaru.h +++ b/src/mame/includes/higemaru.h @@ -24,12 +24,14 @@ public: DECLARE_WRITE8_MEMBER(higemaru_colorram_w); DECLARE_WRITE8_MEMBER(higemaru_c800_w); TILE_GET_INFO_MEMBER(get_bg_tile_info); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/higemaru.c -----------*/ -PALETTE_INIT( higemaru ); -VIDEO_START( higemaru ); + + SCREEN_UPDATE_IND16( higemaru ); diff --git a/src/mame/includes/himesiki.h b/src/mame/includes/himesiki.h index bc9ce4b0442..19aa31a9735 100644 --- a/src/mame/includes/himesiki.h +++ b/src/mame/includes/himesiki.h @@ -30,11 +30,14 @@ public: DECLARE_WRITE8_MEMBER(himesiki_scrollx_w); DECLARE_WRITE8_MEMBER(himesiki_flip_w); TILE_GET_INFO_MEMBER(get_bg_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; /*----------- defined in video/himesiki.c -----------*/ -VIDEO_START( himesiki ); + SCREEN_UPDATE_IND16( himesiki ); diff --git a/src/mame/includes/hitme.h b/src/mame/includes/hitme.h index a332aeed642..e648bd2ac3c 100644 --- a/src/mame/includes/hitme.h +++ b/src/mame/includes/hitme.h @@ -35,6 +35,10 @@ public: DECLARE_WRITE8_MEMBER(output_port_0_w); DECLARE_WRITE8_MEMBER(output_port_1_w); TILE_GET_INFO_MEMBER(get_hitme_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); + DECLARE_VIDEO_START(barricad); }; diff --git a/src/mame/includes/hnayayoi.h b/src/mame/includes/hnayayoi.h index 5c3b7a36bbe..7f1df9d738b 100644 --- a/src/mame/includes/hnayayoi.h +++ b/src/mame/includes/hnayayoi.h @@ -32,12 +32,16 @@ public: DECLARE_WRITE8_MEMBER(adpcm_reset_w); DECLARE_WRITE8_MEMBER(adpcm_reset_inv_w); DECLARE_DRIVER_INIT(hnfubuki); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); + DECLARE_VIDEO_START(untoucha); }; /*----------- defined in video/hnayayoi.c -----------*/ -VIDEO_START( hnayayoi ); -VIDEO_START( untoucha ); + + SCREEN_UPDATE_IND16( hnayayoi ); diff --git a/src/mame/includes/hng64.h b/src/mame/includes/hng64.h index 505d10e3e7e..485df979fe7 100644 --- a/src/mame/includes/hng64.h +++ b/src/mame/includes/hng64.h @@ -183,6 +183,9 @@ public: TILE_GET_INFO_MEMBER(get_hng64_tile2_16x16_info); TILE_GET_INFO_MEMBER(get_hng64_tile3_8x8_info); TILE_GET_INFO_MEMBER(get_hng64_tile3_16x16_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; @@ -190,6 +193,6 @@ public: void hng64_command3d(running_machine& machine, const UINT16* packet); -VIDEO_START( hng64 ); + SCREEN_UPDATE_RGB32( hng64 ); SCREEN_VBLANK( hng64 ); diff --git a/src/mame/includes/holeland.h b/src/mame/includes/holeland.h index 41efe94501d..5eca165bba8 100644 --- a/src/mame/includes/holeland.h +++ b/src/mame/includes/holeland.h @@ -29,13 +29,15 @@ public: DECLARE_WRITE8_MEMBER(holeland_flipscreen_w); TILE_GET_INFO_MEMBER(holeland_get_tile_info); TILE_GET_INFO_MEMBER(crzrally_get_tile_info); + DECLARE_VIDEO_START(holeland); + DECLARE_VIDEO_START(crzrally); }; /*----------- defined in video/holeland.c -----------*/ -VIDEO_START( holeland ); -VIDEO_START( crzrally ); + + SCREEN_UPDATE_IND16( holeland ); SCREEN_UPDATE_IND16( crzrally ); diff --git a/src/mame/includes/homedata.h b/src/mame/includes/homedata.h index dc5c158a136..38c50b1c169 100644 --- a/src/mame/includes/homedata.h +++ b/src/mame/includes/homedata.h @@ -105,6 +105,21 @@ public: TILE_GET_INFO_MEMBER(mirderby_get_info1_0); TILE_GET_INFO_MEMBER(mirderby_get_info0_1); TILE_GET_INFO_MEMBER(mirderby_get_info1_1); + DECLARE_MACHINE_START(homedata); + DECLARE_MACHINE_RESET(homedata); + DECLARE_VIDEO_START(mrokumei); + DECLARE_PALETTE_INIT(mrokumei); + DECLARE_MACHINE_START(reikaids); + DECLARE_MACHINE_RESET(reikaids); + DECLARE_VIDEO_START(reikaids); + DECLARE_PALETTE_INIT(reikaids); + DECLARE_MACHINE_START(pteacher); + DECLARE_MACHINE_RESET(pteacher); + DECLARE_VIDEO_START(pteacher); + DECLARE_PALETTE_INIT(pteacher); + DECLARE_VIDEO_START(mirderby); + DECLARE_PALETTE_INIT(mirderby); + DECLARE_VIDEO_START(lemnangl); }; @@ -112,16 +127,16 @@ public: /*----------- defined in video/homedata.c -----------*/ -PALETTE_INIT( mrokumei ); -PALETTE_INIT( reikaids ); -PALETTE_INIT( pteacher ); -PALETTE_INIT( mirderby ); -VIDEO_START( mrokumei ); -VIDEO_START( reikaids ); -VIDEO_START( pteacher ); -VIDEO_START( lemnangl ); -VIDEO_START( mirderby ); + + + + + + + + + SCREEN_UPDATE_IND16( mrokumei ); SCREEN_UPDATE_IND16( reikaids ); SCREEN_UPDATE_IND16( pteacher ); diff --git a/src/mame/includes/homerun.h b/src/mame/includes/homerun.h index 594bd9505a1..a68a4a91ac9 100644 --- a/src/mame/includes/homerun.h +++ b/src/mame/includes/homerun.h @@ -49,6 +49,9 @@ public: DECLARE_CUSTOM_INPUT_MEMBER(ganjaja_hopper_status_r); TILE_GET_INFO_MEMBER(get_homerun_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; @@ -56,5 +59,5 @@ public: WRITE8_DEVICE_HANDLER( homerun_banking_w ); -VIDEO_START(homerun); + SCREEN_UPDATE_IND16(homerun); diff --git a/src/mame/includes/hyhoo.h b/src/mame/includes/hyhoo.h index 8830da5d825..0c143720801 100644 --- a/src/mame/includes/hyhoo.h +++ b/src/mame/includes/hyhoo.h @@ -22,11 +22,12 @@ public: DECLARE_WRITE8_MEMBER(hyhoo_romsel_w); DECLARE_DRIVER_INIT(hyhoo2); DECLARE_DRIVER_INIT(hyhoo); + virtual void video_start(); }; /*----------- defined in video/hyhoo.c -----------*/ SCREEN_UPDATE_RGB32( hyhoo ); -VIDEO_START( hyhoo ); + diff --git a/src/mame/includes/hyperspt.h b/src/mame/includes/hyperspt.h index 7af7682d6cf..f9260d05736 100644 --- a/src/mame/includes/hyperspt.h +++ b/src/mame/includes/hyperspt.h @@ -39,13 +39,16 @@ public: DECLARE_WRITE8_MEMBER( konami_SN76496_w ) { m_sn->write(space, offset, m_SN76496_latch); }; TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(roadf_get_bg_tile_info); + virtual void video_start(); + virtual void palette_init(); + DECLARE_VIDEO_START(roadf); }; /*----------- defined in video/hyperspt.c -----------*/ -PALETTE_INIT( hyperspt ); -VIDEO_START( hyperspt ); + + SCREEN_UPDATE_IND16( hyperspt ); -VIDEO_START( roadf ); + diff --git a/src/mame/includes/hyprduel.h b/src/mame/includes/hyprduel.h index 4c2accb1d14..1e4dda27e78 100644 --- a/src/mame/includes/hyprduel.h +++ b/src/mame/includes/hyprduel.h @@ -83,6 +83,12 @@ public: TILE_GET_INFO_MEMBER(get_tile_info_0_8bit); TILE_GET_INFO_MEMBER(get_tile_info_1_8bit); TILE_GET_INFO_MEMBER(get_tile_info_2_8bit); + virtual void machine_reset(); + DECLARE_MACHINE_START(hyprduel); + DECLARE_VIDEO_START(hyprduel_14220); + DECLARE_MACHINE_START(magerror); + DECLARE_VIDEO_START(magerror_14220); + DECLARE_VIDEO_START(common_14220); }; @@ -91,6 +97,6 @@ public: -VIDEO_START( hyprduel_14220 ); -VIDEO_START( magerror_14220 ); + + SCREEN_UPDATE_IND16( hyprduel ); diff --git a/src/mame/includes/ikki.h b/src/mame/includes/ikki.h index 2eb2e9ba401..fb1eee520e7 100644 --- a/src/mame/includes/ikki.h +++ b/src/mame/includes/ikki.h @@ -31,12 +31,16 @@ public: DECLARE_READ8_MEMBER(ikki_e000_r); DECLARE_WRITE8_MEMBER(ikki_coin_counters); DECLARE_WRITE8_MEMBER(ikki_scrn_ctrl_w); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/ikki.c -----------*/ -PALETTE_INIT( ikki ); -VIDEO_START( ikki ); + + SCREEN_UPDATE_IND16( ikki ); diff --git a/src/mame/includes/inufuku.h b/src/mame/includes/inufuku.h index 601372b70ca..76e104a51d5 100644 --- a/src/mame/includes/inufuku.h +++ b/src/mame/includes/inufuku.h @@ -46,6 +46,9 @@ public: DECLARE_CUSTOM_INPUT_MEMBER(soundflag_r); TILE_GET_INFO_MEMBER(get_inufuku_bg_tile_info); TILE_GET_INFO_MEMBER(get_inufuku_tx_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; @@ -53,4 +56,4 @@ public: SCREEN_UPDATE_IND16( inufuku ); -VIDEO_START( inufuku ); + diff --git a/src/mame/includes/iqblock.h b/src/mame/includes/iqblock.h index 697784b804d..081042cec65 100644 --- a/src/mame/includes/iqblock.h +++ b/src/mame/includes/iqblock.h @@ -28,11 +28,12 @@ public: DECLARE_DRIVER_INIT(iqblock); TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); + virtual void video_start(); }; /*----------- defined in video/iqblock.c -----------*/ -VIDEO_START( iqblock ); + SCREEN_UPDATE_IND16( iqblock ); diff --git a/src/mame/includes/irobot.h b/src/mame/includes/irobot.h index cf677b3b7e0..b8cacd80035 100644 --- a/src/mame/includes/irobot.h +++ b/src/mame/includes/irobot.h @@ -74,11 +74,14 @@ public: DECLARE_READ8_MEMBER(irobot_status_r); DECLARE_WRITE8_MEMBER(irobot_paletteram_w); DECLARE_DRIVER_INIT(irobot); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in machine/irobot.c -----------*/ -MACHINE_RESET( irobot ); + TIMER_DEVICE_CALLBACK( irobot_irvg_done_callback ); TIMER_DEVICE_CALLBACK( irobot_irmb_done_callback ); @@ -87,8 +90,8 @@ TIMER_DEVICE_CALLBACK( irobot_irmb_done_callback ); /*----------- defined in video/irobot.c -----------*/ -PALETTE_INIT( irobot ); -VIDEO_START( irobot ); + + SCREEN_UPDATE_IND16( irobot ); diff --git a/src/mame/includes/ironhors.h b/src/mame/includes/ironhors.h index b6a651fe8a0..75f9bd652b3 100644 --- a/src/mame/includes/ironhors.h +++ b/src/mame/includes/ironhors.h @@ -43,14 +43,19 @@ public: DECLARE_READ8_MEMBER(farwest_soundlatch_r); TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(farwest_get_bg_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); + DECLARE_VIDEO_START(farwest); }; /*----------- defined in video/ironhors.c -----------*/ -PALETTE_INIT( ironhors ); -VIDEO_START( ironhors ); + + SCREEN_UPDATE_IND16( ironhors ); -VIDEO_START( farwest ); + SCREEN_UPDATE_IND16( farwest ); diff --git a/src/mame/includes/itech32.h b/src/mame/includes/itech32.h index 7dd8de95e21..921aa219df6 100644 --- a/src/mame/includes/itech32.h +++ b/src/mame/includes/itech32.h @@ -154,6 +154,9 @@ public: DECLARE_DRIVER_INIT(timekill); DECLARE_DRIVER_INIT(gt3d); DECLARE_DRIVER_INIT(gt3dl); + virtual void machine_reset(); + virtual void video_start(); + DECLARE_MACHINE_RESET(drivedge); }; @@ -164,7 +167,7 @@ void itech32_update_interrupts(running_machine &machine, int vint, int xint, int /*----------- defined in video/itech32.c -----------*/ -VIDEO_START( itech32 ); + diff --git a/src/mame/includes/itech8.h b/src/mame/includes/itech8.h index d7def93a1c2..82087689489 100644 --- a/src/mame/includes/itech8.h +++ b/src/mame/includes/itech8.h @@ -85,6 +85,10 @@ public: DECLARE_DRIVER_INIT(arligntn); DECLARE_DRIVER_INIT(hstennis); DECLARE_DRIVER_INIT(sstrike); + virtual void machine_reset(); + virtual void video_start(); + DECLARE_VIDEO_START(slikshot); + DECLARE_MACHINE_START(sstrike); }; @@ -102,13 +106,13 @@ READ8_HANDLER( slikshot_z80_r ); READ8_HANDLER( slikshot_z80_control_r ); WRITE8_HANDLER( slikshot_z80_control_w ); -VIDEO_START( slikshot ); + SCREEN_UPDATE_RGB32( slikshot ); /*----------- defined in video/itech8.c -----------*/ -VIDEO_START( itech8 ); + diff --git a/src/mame/includes/jack.h b/src/mame/includes/jack.h index fcad472a7ea..cf8b956c04b 100644 --- a/src/mame/includes/jack.h +++ b/src/mame/includes/jack.h @@ -50,15 +50,20 @@ public: TILE_GET_INFO_MEMBER(get_bg_tile_info); TILEMAP_MAPPER_MEMBER(tilemap_scan_cols_flipy); TILE_GET_INFO_MEMBER(joinem_get_bg_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); + DECLARE_VIDEO_START(joinem); + DECLARE_PALETTE_INIT(joinem); }; /*----------- defined in video/jack.c -----------*/ -VIDEO_START( jack ); + SCREEN_UPDATE_IND16( jack ); -PALETTE_INIT( joinem ); -VIDEO_START( joinem ); + + SCREEN_UPDATE_IND16( joinem ); diff --git a/src/mame/includes/jackal.h b/src/mame/includes/jackal.h index 9a4f3d981bb..6ed63b00196 100644 --- a/src/mame/includes/jackal.h +++ b/src/mame/includes/jackal.h @@ -38,6 +38,10 @@ public: DECLARE_WRITE8_MEMBER(jackal_voram_w); DECLARE_WRITE8_MEMBER(jackal_spriteram_w); TILE_GET_INFO_MEMBER(get_bg_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); }; @@ -45,6 +49,6 @@ public: void jackal_mark_tile_dirty(running_machine &machine, int offset); -PALETTE_INIT( jackal ); -VIDEO_START( jackal ); + + SCREEN_UPDATE_IND16( jackal ); diff --git a/src/mame/includes/jailbrek.h b/src/mame/includes/jailbrek.h index 78d028a8008..0c13bfa3ca1 100644 --- a/src/mame/includes/jailbrek.h +++ b/src/mame/includes/jailbrek.h @@ -38,12 +38,16 @@ public: DECLARE_WRITE8_MEMBER(jailbrek_speech_w); DECLARE_DRIVER_INIT(jailbrek); TILE_GET_INFO_MEMBER(get_bg_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/jailbrek.c -----------*/ -PALETTE_INIT( jailbrek ); -VIDEO_START( jailbrek ); + + SCREEN_UPDATE_IND16( jailbrek ); diff --git a/src/mame/includes/jedi.h b/src/mame/includes/jedi.h index c6b9ee710c7..b5d4fc7ca49 100644 --- a/src/mame/includes/jedi.h +++ b/src/mame/includes/jedi.h @@ -73,6 +73,9 @@ public: DECLARE_WRITE8_MEMBER(speech_strobe_w); DECLARE_READ8_MEMBER(speech_ready_r); DECLARE_WRITE8_MEMBER(speech_reset_w); + virtual void machine_start(); + virtual void machine_reset(); + DECLARE_VIDEO_START(jedi); }; diff --git a/src/mame/includes/jpmimpct.h b/src/mame/includes/jpmimpct.h index 1ebba11791f..7429fcaa78b 100644 --- a/src/mame/includes/jpmimpct.h +++ b/src/mame/includes/jpmimpct.h @@ -103,6 +103,11 @@ public: DECLARE_WRITE8_MEMBER(payen_a_w); DECLARE_WRITE8_MEMBER(display_c_w); DECLARE_DRIVER_INIT(j6fbcrz); + DECLARE_MACHINE_START(jpmimpct); + DECLARE_MACHINE_RESET(jpmimpct); + DECLARE_VIDEO_START(jpmimpct); + DECLARE_MACHINE_START(impctawp); + DECLARE_MACHINE_RESET(impctawp); }; @@ -113,4 +118,4 @@ void jpmimpct_to_shiftreg(address_space *space, UINT32 address, UINT16 *shiftreg void jpmimpct_from_shiftreg(address_space *space, UINT32 address, UINT16 *shiftreg); void jpmimpct_scanline_update(screen_device &screen, bitmap_rgb32 &bitmap, int scanline, const tms34010_display_params *params); -VIDEO_START( jpmimpct ); + diff --git a/src/mame/includes/kaneko16.h b/src/mame/includes/kaneko16.h index 5a5ab686f6f..e4a2a694f3b 100644 --- a/src/mame/includes/kaneko16.h +++ b/src/mame/includes/kaneko16.h @@ -60,6 +60,9 @@ public: DECLARE_DRIVER_INIT(samplebank); + DECLARE_MACHINE_RESET(gtmr); + DECLARE_VIDEO_START(kaneko16); + DECLARE_MACHINE_RESET(mgcrystl); }; class kaneko16_gtmr_state : public kaneko16_state @@ -107,7 +110,8 @@ public: DECLARE_WRITE16_MEMBER(kaneko16_bg15_reg_w); DECLARE_DRIVER_INIT(berlwall); - + DECLARE_PALETTE_INIT(berlwall); + DECLARE_VIDEO_START(berlwall); }; class kaneko16_shogwarr_state : public kaneko16_state @@ -130,14 +134,14 @@ public: /*----------- defined in drivers/kaneko16.c -----------*/ -MACHINE_RESET( kaneko16 ); + /*----------- defined in video/kaneko16.c -----------*/ -PALETTE_INIT( berlwall ); -VIDEO_START( kaneko16 ); -VIDEO_START( berlwall ); + + + SCREEN_UPDATE_IND16( kaneko16 ); SCREEN_UPDATE_IND16( berlwall ); diff --git a/src/mame/includes/kangaroo.h b/src/mame/includes/kangaroo.h index b2acc91a8ad..6981d38d718 100644 --- a/src/mame/includes/kangaroo.h +++ b/src/mame/includes/kangaroo.h @@ -26,6 +26,10 @@ public: DECLARE_WRITE8_MEMBER(kangaroo_coin_counter_w); DECLARE_WRITE8_MEMBER(kangaroo_videoram_w); DECLARE_WRITE8_MEMBER(kangaroo_video_control_w); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); + DECLARE_MACHINE_START(kangaroo_mcu); }; @@ -33,6 +37,6 @@ public: /*----------- defined in video/kangaroo.c -----------*/ -VIDEO_START( kangaroo ); + SCREEN_UPDATE_RGB32( kangaroo ); diff --git a/src/mame/includes/karnov.h b/src/mame/includes/karnov.h index 49484e605bb..7508c24f824 100644 --- a/src/mame/includes/karnov.h +++ b/src/mame/includes/karnov.h @@ -52,6 +52,11 @@ public: DECLARE_DRIVER_INIT(chelnovj); DECLARE_DRIVER_INIT(chelnov); TILE_GET_INFO_MEMBER(get_fix_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void palette_init(); + DECLARE_VIDEO_START(karnov); + DECLARE_VIDEO_START(wndrplnt); }; enum { @@ -69,7 +74,7 @@ enum { void karnov_flipscreen_w(running_machine &machine, int data); -PALETTE_INIT( karnov ); -VIDEO_START( karnov ); -VIDEO_START( wndrplnt ); + + + SCREEN_UPDATE_IND16( karnov ); diff --git a/src/mame/includes/kchamp.h b/src/mame/includes/kchamp.h index 5fffb7fdbbb..d74e95a085a 100644 --- a/src/mame/includes/kchamp.h +++ b/src/mame/includes/kchamp.h @@ -43,13 +43,18 @@ public: DECLARE_DRIVER_INIT(kchampvs); DECLARE_DRIVER_INIT(kchampvs2); TILE_GET_INFO_MEMBER(get_bg_tile_info); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); + DECLARE_MACHINE_START(kchampvs); + DECLARE_MACHINE_START(kchamp); }; /*----------- defined in video/kchamp.c -----------*/ -PALETTE_INIT( kchamp ); -VIDEO_START( kchamp ); + + SCREEN_UPDATE_IND16( kchamp ); SCREEN_UPDATE_IND16( kchampvs ); diff --git a/src/mame/includes/kickgoal.h b/src/mame/includes/kickgoal.h index 82c1aa8167d..2fa7101d350 100644 --- a/src/mame/includes/kickgoal.h +++ b/src/mame/includes/kickgoal.h @@ -70,12 +70,16 @@ public: TILEMAP_MAPPER_MEMBER(tilemap_scan_kicksbg); TILEMAP_MAPPER_MEMBER(tilemap_scan_kicksbg2); TILEMAP_MAPPER_MEMBER(tilemap_scan_actionhwbg2); + virtual void machine_start(); + virtual void machine_reset(); + DECLARE_VIDEO_START(kickgoal); + DECLARE_VIDEO_START(actionhw); }; /*----------- defined in video/kickgoal.c -----------*/ -VIDEO_START( actionhw ); -VIDEO_START( kickgoal ); + + SCREEN_UPDATE_IND16( kickgoal ); diff --git a/src/mame/includes/kingobox.h b/src/mame/includes/kingobox.h index a0178164a6f..22497c4a47e 100644 --- a/src/mame/includes/kingobox.h +++ b/src/mame/includes/kingobox.h @@ -50,16 +50,22 @@ public: TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); TILE_GET_INFO_MEMBER(ringking_get_bg_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + DECLARE_VIDEO_START(kingofb); + DECLARE_PALETTE_INIT(kingofb); + DECLARE_VIDEO_START(ringking); + DECLARE_PALETTE_INIT(ringking); }; /*----------- defined in video/kingobox.c -----------*/ -PALETTE_INIT( kingofb ); -VIDEO_START( kingofb ); + + SCREEN_UPDATE_IND16( kingofb ); -PALETTE_INIT( ringking ); -VIDEO_START( ringking ); + + SCREEN_UPDATE_IND16( ringking ); diff --git a/src/mame/includes/klax.h b/src/mame/includes/klax.h index 3861a147c24..1788fb9f293 100644 --- a/src/mame/includes/klax.h +++ b/src/mame/includes/klax.h @@ -13,6 +13,9 @@ public: : atarigen_state(mconfig, type, tag) { } DECLARE_WRITE16_MEMBER(interrupt_ack_w); TILE_GET_INFO_MEMBER(get_playfield_tile_info); + DECLARE_MACHINE_START(klax); + DECLARE_MACHINE_RESET(klax); + DECLARE_VIDEO_START(klax); }; @@ -20,5 +23,5 @@ public: WRITE16_HANDLER( klax_latch_w ); -VIDEO_START( klax ); + SCREEN_UPDATE_IND16( klax ); diff --git a/src/mame/includes/kncljoe.h b/src/mame/includes/kncljoe.h index b49acd6b411..d477826ef72 100644 --- a/src/mame/includes/kncljoe.h +++ b/src/mame/includes/kncljoe.h @@ -41,6 +41,10 @@ public: DECLARE_READ8_MEMBER(m6803_port2_r); DECLARE_WRITE8_MEMBER(unused_w); TILE_GET_INFO_MEMBER(get_bg_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); }; @@ -48,6 +52,6 @@ public: /*----------- defined in video/kncljoe.c -----------*/ -PALETTE_INIT( kncljoe ); -VIDEO_START( kncljoe ); + + SCREEN_UPDATE_IND16( kncljoe ); diff --git a/src/mame/includes/konamigx.h b/src/mame/includes/konamigx.h index 91017dae6ea..f8f70462fad 100644 --- a/src/mame/includes/konamigx.h +++ b/src/mame/includes/konamigx.h @@ -61,6 +61,20 @@ public: TILE_GET_INFO_MEMBER(get_gx_psac3_alt_tile_info); TILE_GET_INFO_MEMBER(get_gx_psac1a_tile_info); TILE_GET_INFO_MEMBER(get_gx_psac1b_tile_info); + DECLARE_MACHINE_START(konamigx); + DECLARE_MACHINE_RESET(konamigx); + DECLARE_VIDEO_START(konamigx_5bpp); + DECLARE_VIDEO_START(dragoonj); + DECLARE_VIDEO_START(le2); + DECLARE_VIDEO_START(konamigx_6bpp); + DECLARE_VIDEO_START(konamigx_6bpp_2); + DECLARE_VIDEO_START(opengolf); + DECLARE_VIDEO_START(racinfrc); + DECLARE_VIDEO_START(konamigx_type3); + DECLARE_VIDEO_START(konamigx_type4); + DECLARE_VIDEO_START(konamigx_type4_vsn); + DECLARE_VIDEO_START(konamigx_type4_sd2); + DECLARE_VIDEO_START(winspike); }; @@ -134,18 +148,18 @@ void konamigx_mixer_primode(int mode); void konamigx_objdma(void); extern UINT16 *K053247_ram; -VIDEO_START(konamigx_5bpp); -VIDEO_START(konamigx_6bpp); -VIDEO_START(konamigx_6bpp_2); -VIDEO_START(konamigx_type3); -VIDEO_START(konamigx_type4); -VIDEO_START(konamigx_type4_sd2); -VIDEO_START(konamigx_type4_vsn); -VIDEO_START(le2); -VIDEO_START(dragoonj); -VIDEO_START(winspike); -VIDEO_START(opengolf); -VIDEO_START(racinfrc); + + + + + + + + + + + + SCREEN_UPDATE_RGB32(konamigx); SCREEN_UPDATE_RGB32(konamigx_left); SCREEN_UPDATE_RGB32(konamigx_right); diff --git a/src/mame/includes/kopunch.h b/src/mame/includes/kopunch.h index 6f8a8cfa9f8..eea6782bcac 100644 --- a/src/mame/includes/kopunch.h +++ b/src/mame/includes/kopunch.h @@ -38,11 +38,15 @@ public: DECLARE_INPUT_CHANGED_MEMBER(right_coin_inserted); TILE_GET_INFO_MEMBER(get_fg_tile_info); TILE_GET_INFO_MEMBER(get_bg_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/kopunch.c -----------*/ -PALETTE_INIT( kopunch ); -VIDEO_START( kopunch ); + + SCREEN_UPDATE_IND16( kopunch ); diff --git a/src/mame/includes/ksayakyu.h b/src/mame/includes/ksayakyu.h index 658281bc7c9..45b48c4c671 100644 --- a/src/mame/includes/ksayakyu.h +++ b/src/mame/includes/ksayakyu.h @@ -35,11 +35,15 @@ public: DECLARE_WRITE8_MEMBER(dummy3_w); TILE_GET_INFO_MEMBER(get_ksayakyu_tile_info); TILE_GET_INFO_MEMBER(get_text_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/ksayakyu.c -----------*/ -PALETTE_INIT( ksayakyu ); -VIDEO_START( ksayakyu ); + + SCREEN_UPDATE_IND16( ksayakyu ); diff --git a/src/mame/includes/kyugo.h b/src/mame/includes/kyugo.h index bd24ae87004..53be22eeae5 100644 --- a/src/mame/includes/kyugo.h +++ b/src/mame/includes/kyugo.h @@ -55,6 +55,9 @@ public: DECLARE_DRIVER_INIT(gyrodine); TILE_GET_INFO_MEMBER(get_fg_tile_info); TILE_GET_INFO_MEMBER(get_bg_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; @@ -62,5 +65,5 @@ public: -VIDEO_START( kyugo ); + SCREEN_UPDATE_IND16( kyugo ); diff --git a/src/mame/includes/labyrunr.h b/src/mame/includes/labyrunr.h index 252166ba374..a83a6084ef2 100644 --- a/src/mame/includes/labyrunr.h +++ b/src/mame/includes/labyrunr.h @@ -38,6 +38,9 @@ public: DECLARE_WRITE8_MEMBER(labyrunr_vram2_w); TILE_GET_INFO_MEMBER(get_tile_info0); TILE_GET_INFO_MEMBER(get_tile_info1); + virtual void machine_start(); + virtual void video_start(); + virtual void palette_init(); }; @@ -45,6 +48,6 @@ public: -PALETTE_INIT( labyrunr ); -VIDEO_START( labyrunr ); + + SCREEN_UPDATE_IND16( labyrunr ); diff --git a/src/mame/includes/ladybug.h b/src/mame/includes/ladybug.h index b694c06e8fb..95f5cefe82e 100644 --- a/src/mame/includes/ladybug.h +++ b/src/mame/includes/ladybug.h @@ -65,18 +65,29 @@ public: TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_grid_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); + DECLARE_MACHINE_START(ladybug); + DECLARE_VIDEO_START(ladybug); + DECLARE_PALETTE_INIT(ladybug); + DECLARE_MACHINE_START(sraider); + DECLARE_MACHINE_RESET(sraider); + DECLARE_VIDEO_START(sraider); + DECLARE_PALETTE_INIT(sraider); + DECLARE_MACHINE_START(redclash); + DECLARE_MACHINE_RESET(redclash); + DECLARE_VIDEO_START(redclash); + DECLARE_PALETTE_INIT(redclash); }; /*----------- defined in video/ladybug.c -----------*/ -PALETTE_INIT( ladybug ); -VIDEO_START( ladybug ); + + SCREEN_UPDATE_IND16( ladybug ); -PALETTE_INIT( sraider ); -VIDEO_START( sraider ); + + SCREEN_UPDATE_IND16( sraider ); SCREEN_VBLANK( sraider ); @@ -91,8 +102,8 @@ WRITE8_HANDLER( redclash_star1_w ); WRITE8_HANDLER( redclash_star2_w ); WRITE8_HANDLER( redclash_star_reset_w ); -PALETTE_INIT( redclash ); -VIDEO_START( redclash ); + + SCREEN_UPDATE_IND16( redclash ); SCREEN_VBLANK( redclash ); diff --git a/src/mame/includes/ladyfrog.h b/src/mame/includes/ladyfrog.h index 35c3515e307..e1bfdc30c70 100644 --- a/src/mame/includes/ladyfrog.h +++ b/src/mame/includes/ladyfrog.h @@ -53,6 +53,11 @@ public: DECLARE_WRITE8_MEMBER(ladyfrog_scrlram_w); DECLARE_WRITE8_MEMBER(unk_w); TILE_GET_INFO_MEMBER(get_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); + DECLARE_VIDEO_START(toucheme); + DECLARE_VIDEO_START(ladyfrog_common); }; @@ -60,6 +65,6 @@ public: -VIDEO_START( ladyfrog ); -VIDEO_START( toucheme ); + + SCREEN_UPDATE_IND16( ladyfrog ); diff --git a/src/mame/includes/laserbat.h b/src/mame/includes/laserbat.h index b11c5c7ebeb..ef186bdce48 100644 --- a/src/mame/includes/laserbat.h +++ b/src/mame/includes/laserbat.h @@ -78,6 +78,9 @@ public: DECLARE_WRITE8_MEMBER(zaccaria_port0a_w); DECLARE_WRITE8_MEMBER(zaccaria_port0b_w); TILE_GET_INFO_MEMBER(get_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; diff --git a/src/mame/includes/lasso.h b/src/mame/includes/lasso.h index d6540610f5d..ba82d3cab88 100644 --- a/src/mame/includes/lasso.h +++ b/src/mame/includes/lasso.h @@ -57,18 +57,27 @@ public: TILE_GET_INFO_MEMBER(lasso_get_bg_tile_info); TILE_GET_INFO_MEMBER(wwjgtin_get_track_tile_info); TILE_GET_INFO_MEMBER(pinbo_get_bg_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); + DECLARE_MACHINE_START(wwjgtin); + DECLARE_MACHINE_RESET(wwjgtin); + DECLARE_VIDEO_START(wwjgtin); + DECLARE_PALETTE_INIT(wwjgtin); + DECLARE_VIDEO_START(pinbo); }; /*----------- defined in video/lasso.c -----------*/ -PALETTE_INIT( lasso ); -PALETTE_INIT( wwjgtin ); -VIDEO_START( lasso ); -VIDEO_START( wwjgtin ); -VIDEO_START( pinbo ); + + + + + SCREEN_UPDATE_IND16( lasso ); SCREEN_UPDATE_IND16( chameleo ); diff --git a/src/mame/includes/lastduel.h b/src/mame/includes/lastduel.h index 16e14f5e1dc..fbab77a587e 100644 --- a/src/mame/includes/lastduel.h +++ b/src/mame/includes/lastduel.h @@ -53,12 +53,17 @@ public: TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); TILE_GET_INFO_MEMBER(get_fix_info); + virtual void machine_reset(); + DECLARE_MACHINE_START(lastduel); + DECLARE_VIDEO_START(lastduel); + DECLARE_MACHINE_START(madgear); + DECLARE_VIDEO_START(madgear); }; /*----------- defined in video/lastduel.c -----------*/ -VIDEO_START( lastduel ); -VIDEO_START( madgear ); + + SCREEN_UPDATE_IND16( lastduel ); SCREEN_UPDATE_IND16( madgear ); diff --git a/src/mame/includes/lazercmd.h b/src/mame/includes/lazercmd.h index 54f599f93e7..e46cf6d923e 100644 --- a/src/mame/includes/lazercmd.h +++ b/src/mame/includes/lazercmd.h @@ -53,6 +53,9 @@ public: DECLARE_DRIVER_INIT(lazercmd); DECLARE_DRIVER_INIT(bbonk); DECLARE_DRIVER_INIT(medlanes); + virtual void machine_start(); + virtual void machine_reset(); + virtual void palette_init(); }; diff --git a/src/mame/includes/legionna.h b/src/mame/includes/legionna.h index c2515d2892d..e8865efdd61 100644 --- a/src/mame/includes/legionna.h +++ b/src/mame/includes/legionna.h @@ -44,6 +44,11 @@ public: TILE_GET_INFO_MEMBER(get_fore_tile_info); TILE_GET_INFO_MEMBER(get_fore_tile_info_denji); TILE_GET_INFO_MEMBER(get_text_tile_info); + DECLARE_VIDEO_START(legionna); + DECLARE_VIDEO_START(godzilla); + DECLARE_VIDEO_START(denjinmk); + DECLARE_VIDEO_START(grainbow); + DECLARE_VIDEO_START(cupsoc); }; @@ -52,11 +57,11 @@ public: void heatbrl_setgfxbank(running_machine &machine, UINT16 data); void denjinmk_setgfxbank(running_machine &machine, UINT16 data); -VIDEO_START( legionna ); -VIDEO_START( cupsoc ); -VIDEO_START( denjinmk ); -VIDEO_START( grainbow ); -VIDEO_START( godzilla ); + + + + + SCREEN_UPDATE_IND16( legionna ); SCREEN_UPDATE_IND16( godzilla ); SCREEN_UPDATE_IND16( grainbow ); diff --git a/src/mame/includes/leland.h b/src/mame/includes/leland.h index e1e0bbafc70..434ea584d87 100644 --- a/src/mame/includes/leland.h +++ b/src/mame/includes/leland.h @@ -134,6 +134,12 @@ public: DECLARE_DRIVER_INIT(indyheat); DECLARE_DRIVER_INIT(brutforc); DECLARE_DRIVER_INIT(asylum); + DECLARE_MACHINE_START(ataxx); + DECLARE_MACHINE_RESET(ataxx); + DECLARE_MACHINE_START(leland); + DECLARE_MACHINE_RESET(leland); + DECLARE_VIDEO_START(leland); + DECLARE_VIDEO_START(ataxx); }; @@ -152,10 +158,10 @@ public: -MACHINE_START( leland ); -MACHINE_RESET( leland ); -MACHINE_START( ataxx ); -MACHINE_RESET( ataxx ); + + + + INTERRUPT_GEN( leland_master_interrupt ); diff --git a/src/mame/includes/lemmings.h b/src/mame/includes/lemmings.h index 29fdc2a51a1..ed0c779437d 100644 --- a/src/mame/includes/lemmings.h +++ b/src/mame/includes/lemmings.h @@ -41,13 +41,15 @@ public: DECLARE_WRITE16_MEMBER(lemmings_pixel_1_w); DECLARE_WRITE16_MEMBER(lemmings_vram_w); TILE_GET_INFO_MEMBER(get_tile_info); + virtual void machine_start(); + virtual void video_start(); }; /*----------- defined in video/lemmings.c -----------*/ -VIDEO_START( lemmings ); + SCREEN_VBLANK( lemmings ); SCREEN_UPDATE_RGB32( lemmings ); diff --git a/src/mame/includes/lethal.h b/src/mame/includes/lethal.h index ed0a027c6b3..cb45a1b31cc 100644 --- a/src/mame/includes/lethal.h +++ b/src/mame/includes/lethal.h @@ -36,6 +36,9 @@ public: DECLARE_READ8_MEMBER(gunsaux_r); DECLARE_WRITE8_MEMBER(lethalen_palette_control); DECLARE_DRIVER_INIT(lethalen); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; /*----------- defined in video/lethal.c -----------*/ @@ -44,5 +47,5 @@ extern void lethalen_sprite_callback(running_machine &machine, int *code, int *c extern void lethalen_tile_callback(running_machine &machine, int layer, int *code, int *color, int *flags); -VIDEO_START(lethalen); + SCREEN_UPDATE_IND16(lethalen); diff --git a/src/mame/includes/lethalj.h b/src/mame/includes/lethalj.h index cb8669d7116..1481c8f7e50 100644 --- a/src/mame/includes/lethalj.h +++ b/src/mame/includes/lethalj.h @@ -28,13 +28,14 @@ public: DECLARE_DRIVER_INIT(cfarm); DECLARE_DRIVER_INIT(ripribit); DECLARE_DRIVER_INIT(cclownz); + virtual void video_start(); }; /*----------- defined in video/lethalj.c -----------*/ -VIDEO_START( lethalj ); + void lethalj_scanline_update(screen_device &screen, bitmap_ind16 &bitmap, int scanline, const tms34010_display_params *params); diff --git a/src/mame/includes/liberate.h b/src/mame/includes/liberate.h index d683e133184..f626820cb33 100644 --- a/src/mame/includes/liberate.h +++ b/src/mame/includes/liberate.h @@ -56,19 +56,26 @@ public: TILE_GET_INFO_MEMBER(get_back_tile_info); TILE_GET_INFO_MEMBER(get_fix_tile_info); TILE_GET_INFO_MEMBER(prosport_get_back_tile_info); + DECLARE_MACHINE_START(liberate); + DECLARE_MACHINE_RESET(liberate); + DECLARE_VIDEO_START(liberate); + DECLARE_PALETTE_INIT(liberate); + DECLARE_VIDEO_START(prosport); + DECLARE_VIDEO_START(boomrang); + DECLARE_VIDEO_START(prosoccr); }; /*----------- defined in video/liberate.c -----------*/ -PALETTE_INIT( liberate ); + SCREEN_UPDATE_IND16( prosoccr ); SCREEN_UPDATE_IND16( prosport ); SCREEN_UPDATE_IND16( liberate ); SCREEN_UPDATE_IND16( boomrang ); -VIDEO_START( prosoccr ); -VIDEO_START( prosport ); -VIDEO_START( boomrang ); -VIDEO_START( liberate ); + + + + diff --git a/src/mame/includes/lkage.h b/src/mame/includes/lkage.h index 2fd0568233c..755521ee5f1 100644 --- a/src/mame/includes/lkage.h +++ b/src/mame/includes/lkage.h @@ -79,6 +79,9 @@ public: TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); TILE_GET_INFO_MEMBER(get_tx_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; /*----------- defined in machine/lkage.c -----------*/ @@ -87,6 +90,6 @@ public: /*----------- defined in video/lkage.c -----------*/ -VIDEO_START( lkage ); + SCREEN_UPDATE_IND16( lkage ); diff --git a/src/mame/includes/lockon.h b/src/mame/includes/lockon.h index 372671a3b08..b353e4cb969 100644 --- a/src/mame/includes/lockon.h +++ b/src/mame/includes/lockon.h @@ -99,13 +99,17 @@ public: DECLARE_WRITE8_MEMBER(sound_vol); DECLARE_WRITE8_MEMBER(ym2203_out_b); TILE_GET_INFO_MEMBER(get_lockon_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/lockon.c -----------*/ -PALETTE_INIT( lockon ); -VIDEO_START( lockon ); + + SCREEN_UPDATE_IND16( lockon ); SCREEN_VBLANK( lockon ); diff --git a/src/mame/includes/lordgun.h b/src/mame/includes/lordgun.h index 2a22a769b61..2d8884d4907 100644 --- a/src/mame/includes/lordgun.h +++ b/src/mame/includes/lordgun.h @@ -63,6 +63,7 @@ public: TILE_GET_INFO_MEMBER(get_tile_info_1); TILE_GET_INFO_MEMBER(get_tile_info_2); TILE_GET_INFO_MEMBER(get_tile_info_3); + virtual void video_start(); }; @@ -72,5 +73,5 @@ public: float lordgun_crosshair_mapper(const ioport_field *field, float linear_value); void lordgun_update_gun(running_machine &machine, int i); -VIDEO_START( lordgun ); + SCREEN_UPDATE_IND16( lordgun ); diff --git a/src/mame/includes/lsasquad.h b/src/mame/includes/lsasquad.h index 67aae1834ae..711418c0c58 100644 --- a/src/mame/includes/lsasquad.h +++ b/src/mame/includes/lsasquad.h @@ -57,6 +57,8 @@ public: DECLARE_READ8_MEMBER(lsasquad_mcu_status_r); DECLARE_READ8_MEMBER(daikaiju_mcu_status_r); DECLARE_WRITE8_MEMBER(unk); + DECLARE_MACHINE_START(lsasquad); + DECLARE_MACHINE_RESET(lsasquad); }; /*----------- defined in machine/lsasquad.c -----------*/ diff --git a/src/mame/includes/lucky74.h b/src/mame/includes/lucky74.h index d54452833b3..25ff273b753 100644 --- a/src/mame/includes/lucky74.h +++ b/src/mame/includes/lucky74.h @@ -37,11 +37,13 @@ public: DECLARE_WRITE8_MEMBER(lamps_b_w); TILE_GET_INFO_MEMBER(get_fg_tile_info); TILE_GET_INFO_MEMBER(get_bg_tile_info); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/lucky74.c -----------*/ -PALETTE_INIT( lucky74 ); -VIDEO_START( lucky74 ); + + SCREEN_UPDATE_IND16( lucky74 ); diff --git a/src/mame/includes/lvcards.h b/src/mame/includes/lvcards.h index 79c41a3a140..7476ef8d5af 100644 --- a/src/mame/includes/lvcards.h +++ b/src/mame/includes/lvcards.h @@ -18,13 +18,18 @@ public: DECLARE_WRITE8_MEMBER(lvcards_videoram_w); DECLARE_WRITE8_MEMBER(lvcards_colorram_w); TILE_GET_INFO_MEMBER(get_bg_tile_info); + virtual void video_start(); + virtual void palette_init(); + DECLARE_MACHINE_START(lvpoker); + DECLARE_MACHINE_RESET(lvpoker); + DECLARE_PALETTE_INIT(ponttehk); }; /*----------- defined in video/lvcards.c -----------*/ -PALETTE_INIT( lvcards ); -PALETTE_INIT( ponttehk ); -VIDEO_START( lvcards ); + + + SCREEN_UPDATE_IND16( lvcards ); diff --git a/src/mame/includes/lwings.h b/src/mame/includes/lwings.h index f9c4310776b..9862966ec8c 100644 --- a/src/mame/includes/lwings.h +++ b/src/mame/includes/lwings.h @@ -53,14 +53,19 @@ public: TILE_GET_INFO_MEMBER(lwings_get_bg1_tile_info); TILE_GET_INFO_MEMBER(trojan_get_bg1_tile_info); TILE_GET_INFO_MEMBER(get_bg2_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); + DECLARE_VIDEO_START(trojan); + DECLARE_VIDEO_START(avengers); }; /*----------- defined in video/lwings.c -----------*/ -VIDEO_START( lwings ); -VIDEO_START( trojan ); -VIDEO_START( avengers ); + + + SCREEN_UPDATE_IND16( lwings ); SCREEN_UPDATE_IND16( trojan ); diff --git a/src/mame/includes/m10.h b/src/mame/includes/m10.h index 740c80bbcba..1b0ba989117 100644 --- a/src/mame/includes/m10.h +++ b/src/mame/includes/m10.h @@ -81,6 +81,11 @@ public: DECLARE_DRIVER_INIT(ipminva1); TILEMAP_MAPPER_MEMBER(tilemap_scan); TILE_GET_INFO_MEMBER(get_tile_info); + DECLARE_MACHINE_START(m10); + DECLARE_MACHINE_RESET(m10); + DECLARE_VIDEO_START(m10); + DECLARE_PALETTE_INIT(m10); + DECLARE_VIDEO_START(m15); }; @@ -91,5 +96,5 @@ public: SCREEN_UPDATE_IND16( m10 ); SCREEN_UPDATE_IND16( m15 ); -VIDEO_START( m10 ); -VIDEO_START( m15 ); + + diff --git a/src/mame/includes/m107.h b/src/mame/includes/m107.h index 01027aea311..b7d439faa25 100644 --- a/src/mame/includes/m107.h +++ b/src/mame/includes/m107.h @@ -48,10 +48,12 @@ public: DECLARE_DRIVER_INIT(dsoccr94); DECLARE_DRIVER_INIT(wpksoc); TILE_GET_INFO_MEMBER(get_pf_tile_info); + virtual void machine_start(); + virtual void video_start(); }; /*----------- defined in video/m107.c -----------*/ SCREEN_UPDATE_IND16( m107 ); -VIDEO_START( m107 ); + diff --git a/src/mame/includes/m52.h b/src/mame/includes/m52.h index af1ea802cac..c39aff93fcc 100644 --- a/src/mame/includes/m52.h +++ b/src/mame/includes/m52.h @@ -31,11 +31,14 @@ public: DECLARE_WRITE8_MEMBER(m52_flipscreen_w); DECLARE_WRITE8_MEMBER(alpha1v_flipscreen_w); TILE_GET_INFO_MEMBER(get_tile_info); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/m52.c -----------*/ -PALETTE_INIT( m52 ); -VIDEO_START( m52 ); + + SCREEN_UPDATE_IND16( m52 ); diff --git a/src/mame/includes/m57.h b/src/mame/includes/m57.h index b42d25d8581..2471f0ec430 100644 --- a/src/mame/includes/m57.h +++ b/src/mame/includes/m57.h @@ -18,11 +18,13 @@ public: DECLARE_WRITE8_MEMBER(m57_videoram_w); DECLARE_WRITE8_MEMBER(m57_flipscreen_w); TILE_GET_INFO_MEMBER(get_tile_info); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/m57.c -----------*/ -PALETTE_INIT( m57 ); -VIDEO_START( m57 ); + + SCREEN_UPDATE_IND16( m57 ); diff --git a/src/mame/includes/m58.h b/src/mame/includes/m58.h index feb1621e3a1..11f0041f3fa 100644 --- a/src/mame/includes/m58.h +++ b/src/mame/includes/m58.h @@ -28,11 +28,13 @@ public: DECLARE_DRIVER_INIT(yard85); TILE_GET_INFO_MEMBER(yard_get_bg_tile_info); TILEMAP_MAPPER_MEMBER(yard_tilemap_scan_rows); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/m58.c -----------*/ -PALETTE_INIT( yard ); -VIDEO_START( yard ); + + SCREEN_UPDATE_IND16( yard ); diff --git a/src/mame/includes/m62.h b/src/mame/includes/m62.h index fb2a743cf2a..fb7f1a57006 100644 --- a/src/mame/includes/m62.h +++ b/src/mame/includes/m62.h @@ -78,6 +78,23 @@ public: TILE_GET_INFO_MEMBER(get_youjyudn_bg_tile_info); TILE_GET_INFO_MEMBER(get_youjyudn_fg_tile_info); TILE_GET_INFO_MEMBER(get_horizon_bg_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); + DECLARE_VIDEO_START(kungfum); + DECLARE_VIDEO_START(battroad); + DECLARE_PALETTE_INIT(battroad); + DECLARE_VIDEO_START(ldrun2); + DECLARE_VIDEO_START(ldrun4); + DECLARE_VIDEO_START(lotlot); + DECLARE_PALETTE_INIT(lotlot); + DECLARE_VIDEO_START(kidniki); + DECLARE_VIDEO_START(spelunkr); + DECLARE_VIDEO_START(spelunk2); + DECLARE_PALETTE_INIT(spelunk2); + DECLARE_VIDEO_START(youjyudn); + DECLARE_VIDEO_START(horizon); }; @@ -85,22 +102,22 @@ public: -PALETTE_INIT( m62 ); -PALETTE_INIT( lotlot ); -PALETTE_INIT( battroad ); -PALETTE_INIT( spelunk2 ); -VIDEO_START( battroad ); -VIDEO_START( horizon ); -VIDEO_START( kidniki ); -VIDEO_START( kungfum ); -VIDEO_START( ldrun ); -VIDEO_START( ldrun2 ); -VIDEO_START( ldrun4 ); -VIDEO_START( lotlot ); -VIDEO_START( spelunkr ); -VIDEO_START( spelunk2 ); -VIDEO_START( youjyudn ); + + + + + + + + + + + + + + + SCREEN_UPDATE_IND16( battroad ); SCREEN_UPDATE_IND16( horizon ); diff --git a/src/mame/includes/m72.h b/src/mame/includes/m72.h index 13e61171b4c..81c618b63b2 100644 --- a/src/mame/includes/m72.h +++ b/src/mame/includes/m72.h @@ -103,18 +103,30 @@ public: TILE_GET_INFO_MEMBER(rtype2_get_bg_tile_info); TILE_GET_INFO_MEMBER(rtype2_get_fg_tile_info); TILEMAP_MAPPER_MEMBER(majtitle_scan_rows); + DECLARE_MACHINE_START(m72); + DECLARE_MACHINE_RESET(m72); + DECLARE_VIDEO_START(m72); + DECLARE_MACHINE_RESET(xmultipl); + DECLARE_VIDEO_START(xmultipl); + DECLARE_VIDEO_START(hharry); + DECLARE_VIDEO_START(rtype2); + DECLARE_VIDEO_START(majtitle); + DECLARE_VIDEO_START(hharryu); + DECLARE_VIDEO_START(poundfor); + DECLARE_MACHINE_START(kengo); + DECLARE_MACHINE_RESET(kengo); }; /*----------- defined in video/m72.c -----------*/ -VIDEO_START( m72 ); -VIDEO_START( rtype2 ); -VIDEO_START( majtitle ); -VIDEO_START( hharry ); -VIDEO_START( poundfor ); -VIDEO_START( xmultipl ); -VIDEO_START( hharryu ); + + + + + + + SCREEN_UPDATE_IND16( m72 ); diff --git a/src/mame/includes/m90.h b/src/mame/includes/m90.h index 2c2f0d23398..36e178f6e6f 100644 --- a/src/mame/includes/m90.h +++ b/src/mame/includes/m90.h @@ -36,14 +36,18 @@ public: TILE_GET_INFO_MEMBER(dynablsb_get_pf1w_tile_info); TILE_GET_INFO_MEMBER(dynablsb_get_pf2_tile_info); TILE_GET_INFO_MEMBER(dynablsb_get_pf2w_tile_info); + virtual void machine_start(); + virtual void video_start(); + DECLARE_VIDEO_START(bomblord); + DECLARE_VIDEO_START(dynablsb); }; /*----------- defined in video/m90.c -----------*/ -VIDEO_START( m90 ); -VIDEO_START( dynablsb ); -VIDEO_START( bomblord ); + + + SCREEN_UPDATE_IND16( m90 ); SCREEN_UPDATE_IND16( dynablsb ); SCREEN_UPDATE_IND16( bomblord ); diff --git a/src/mame/includes/m92.h b/src/mame/includes/m92.h index 5954d0e2be3..f8a58ee4ca2 100644 --- a/src/mame/includes/m92.h +++ b/src/mame/includes/m92.h @@ -71,6 +71,10 @@ public: DECLARE_DRIVER_INIT(m92); DECLARE_DRIVER_INIT(m92_bank); TILE_GET_INFO_MEMBER(get_pf_tile_info); + DECLARE_MACHINE_START(m92); + DECLARE_MACHINE_RESET(m92); + DECLARE_VIDEO_START(m92); + DECLARE_VIDEO_START(ppan); }; @@ -82,7 +86,7 @@ extern void m92_sprite_interrupt(running_machine &machine); /*----------- defined in video/m92.c -----------*/ -VIDEO_START( m92 ); + SCREEN_UPDATE_IND16( m92 ); -VIDEO_START( ppan ); + SCREEN_UPDATE_IND16( ppan ); diff --git a/src/mame/includes/macrossp.h b/src/mame/includes/macrossp.h index 4dcca1896a7..6cabf8ef32f 100644 --- a/src/mame/includes/macrossp.h +++ b/src/mame/includes/macrossp.h @@ -68,11 +68,14 @@ public: TILE_GET_INFO_MEMBER(get_macrossp_scrb_tile_info); TILE_GET_INFO_MEMBER(get_macrossp_scrc_tile_info); TILE_GET_INFO_MEMBER(get_macrossp_text_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; /*----------- defined in video/macrossp.c -----------*/ -VIDEO_START(macrossp); + SCREEN_UPDATE_RGB32(macrossp); SCREEN_VBLANK(macrossp); diff --git a/src/mame/includes/madalien.h b/src/mame/includes/madalien.h index 6f3ffdf087d..b9642cdd760 100644 --- a/src/mame/includes/madalien.h +++ b/src/mame/includes/madalien.h @@ -60,6 +60,8 @@ public: TILE_GET_INFO_MEMBER(get_tile_info_BG_1); TILE_GET_INFO_MEMBER(get_tile_info_BG_2); TILE_GET_INFO_MEMBER(get_tile_info_FG); + DECLARE_VIDEO_START(madalien); + DECLARE_PALETTE_INIT(madalien); }; diff --git a/src/mame/includes/madmotor.h b/src/mame/includes/madmotor.h index beb525c0258..e24e8f5e51b 100644 --- a/src/mame/includes/madmotor.h +++ b/src/mame/includes/madmotor.h @@ -23,10 +23,13 @@ public: cpu_device *m_audiocpu; DECLARE_WRITE16_MEMBER(madmotor_sound_w); DECLARE_DRIVER_INIT(madmotor); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; /*----------- defined in video/madmotor.c -----------*/ -VIDEO_START( madmotor ); + SCREEN_UPDATE_IND16( madmotor ); diff --git a/src/mame/includes/magmax.h b/src/mame/includes/magmax.h index b46d2e8818b..95e9a1623ee 100644 --- a/src/mame/includes/magmax.h +++ b/src/mame/includes/magmax.h @@ -29,11 +29,15 @@ public: DECLARE_WRITE16_MEMBER(magmax_vreg_w); DECLARE_WRITE8_MEMBER(ay8910_portB_0_w); DECLARE_WRITE8_MEMBER(ay8910_portA_0_w); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/magmax.c -----------*/ -PALETTE_INIT( magmax ); + SCREEN_UPDATE_IND16( magmax ); -VIDEO_START( magmax ); + diff --git a/src/mame/includes/mainevt.h b/src/mame/includes/mainevt.h index e2879d4a9f5..784fca40f10 100644 --- a/src/mame/includes/mainevt.h +++ b/src/mame/includes/mainevt.h @@ -39,6 +39,10 @@ public: DECLARE_WRITE8_MEMBER(k052109_051960_w); DECLARE_READ8_MEMBER(mainevt_sh_busy_r); DECLARE_WRITE8_MEMBER(dv_sh_bankswitch_w); + virtual void machine_start(); + virtual void machine_reset(); + DECLARE_VIDEO_START(mainevt); + DECLARE_VIDEO_START(dv); }; /*----------- defined in video/mainevt.c -----------*/ @@ -48,8 +52,8 @@ extern void dv_tile_callback(running_machine &machine, int layer,int bank,int *c extern void mainevt_sprite_callback(running_machine &machine, int *code,int *color,int *priority_mask,int *shadow); extern void dv_sprite_callback(running_machine &machine, int *code,int *color,int *priority,int *shadow); -VIDEO_START( mainevt ); -VIDEO_START( dv ); + + SCREEN_UPDATE_IND16( mainevt ); SCREEN_UPDATE_IND16( dv ); diff --git a/src/mame/includes/mainsnk.h b/src/mame/includes/mainsnk.h index bb70b19bedc..5bda13459e2 100644 --- a/src/mame/includes/mainsnk.h +++ b/src/mame/includes/mainsnk.h @@ -25,11 +25,13 @@ public: TILEMAP_MAPPER_MEMBER(marvins_tx_scan_cols); TILE_GET_INFO_MEMBER(get_tx_tile_info); TILE_GET_INFO_MEMBER(get_bg_tile_info); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/mainsnk.c -----------*/ -PALETTE_INIT(mainsnk); -VIDEO_START(mainsnk); + + SCREEN_UPDATE_IND16(mainsnk); diff --git a/src/mame/includes/malzak.h b/src/mame/includes/malzak.h index dc172400aa9..098d0e9eb50 100644 --- a/src/mame/includes/malzak.h +++ b/src/mame/includes/malzak.h @@ -31,6 +31,9 @@ public: DECLARE_WRITE8_MEMBER(portc0_w); DECLARE_READ8_MEMBER(collision_r); DECLARE_WRITE8_MEMBER(malzak_playfield_w); + virtual void machine_start(); + virtual void machine_reset(); + virtual void palette_init(); }; diff --git a/src/mame/includes/mappy.h b/src/mame/includes/mappy.h index 28f28cb0200..18a8c6d8eb5 100644 --- a/src/mame/includes/mappy.h +++ b/src/mame/includes/mappy.h @@ -39,18 +39,28 @@ public: TILE_GET_INFO_MEMBER(superpac_get_tile_info); TILE_GET_INFO_MEMBER(phozon_get_tile_info); TILE_GET_INFO_MEMBER(mappy_get_tile_info); + DECLARE_MACHINE_START(mappy); + DECLARE_MACHINE_RESET(superpac); + DECLARE_VIDEO_START(superpac); + DECLARE_PALETTE_INIT(superpac); + DECLARE_MACHINE_RESET(phozon); + DECLARE_VIDEO_START(phozon); + DECLARE_PALETTE_INIT(phozon); + DECLARE_MACHINE_RESET(mappy); + DECLARE_VIDEO_START(mappy); + DECLARE_PALETTE_INIT(mappy); }; /*----------- defined in video/mappy.c -----------*/ -VIDEO_START( phozon ); -PALETTE_INIT( phozon ); + + SCREEN_UPDATE_IND16( phozon ); -PALETTE_INIT( superpac ); -PALETTE_INIT( mappy ); -VIDEO_START( superpac ); -VIDEO_START( mappy ); + + + + SCREEN_UPDATE_IND16( superpac ); SCREEN_UPDATE_IND16( mappy ); diff --git a/src/mame/includes/marineb.h b/src/mame/includes/marineb.h index 2842b7817ef..82f49c003ec 100644 --- a/src/mame/includes/marineb.h +++ b/src/mame/includes/marineb.h @@ -34,14 +34,19 @@ public: DECLARE_WRITE8_MEMBER(marineb_flipscreen_x_w); DECLARE_WRITE8_MEMBER(marineb_flipscreen_y_w); TILE_GET_INFO_MEMBER(get_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); + DECLARE_MACHINE_RESET(springer); }; /*----------- defined in video/marineb.c -----------*/ -PALETTE_INIT( marineb ); -VIDEO_START( marineb ); + + SCREEN_UPDATE_IND16( marineb ); SCREEN_UPDATE_IND16( changes ); SCREEN_UPDATE_IND16( springer ); diff --git a/src/mame/includes/mario.h b/src/mame/includes/mario.h index 447eb41f9aa..26207f78fbe 100644 --- a/src/mame/includes/mario.h +++ b/src/mame/includes/mario.h @@ -79,13 +79,15 @@ public: DECLARE_WRITE8_MEMBER(mario_sh3_w); DECLARE_WRITE8_MEMBER(mario_z80dma_rdy_w); TILE_GET_INFO_MEMBER(get_bg_tile_info); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/mario.c -----------*/ -PALETTE_INIT( mario ); -VIDEO_START( mario ); + + SCREEN_UPDATE_IND16( mario ); diff --git a/src/mame/includes/markham.h b/src/mame/includes/markham.h index 1eb05442164..06121c50f20 100644 --- a/src/mame/includes/markham.h +++ b/src/mame/includes/markham.h @@ -24,12 +24,14 @@ public: DECLARE_WRITE8_MEMBER(markham_videoram_w); DECLARE_WRITE8_MEMBER(markham_flipscreen_w); TILE_GET_INFO_MEMBER(get_bg_tile_info); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/markham.c -----------*/ -PALETTE_INIT( markham ); -VIDEO_START( markham ); + + SCREEN_UPDATE_IND16( markham ); diff --git a/src/mame/includes/matmania.h b/src/mame/includes/matmania.h index 502a7cb131c..59f2f7d3d4b 100644 --- a/src/mame/includes/matmania.h +++ b/src/mame/includes/matmania.h @@ -54,6 +54,11 @@ public: DECLARE_WRITE8_MEMBER(matmania_sh_command_w); DECLARE_WRITE8_MEMBER(maniach_sh_command_w); DECLARE_WRITE8_MEMBER(matmania_paletteram_w); + virtual void video_start(); + virtual void palette_init(); + DECLARE_MACHINE_START(matmania); + DECLARE_MACHINE_START(maniach); + DECLARE_MACHINE_RESET(maniach); }; /*----------- defined in machine/maniach.c -----------*/ @@ -74,7 +79,7 @@ READ8_HANDLER( maniach_mcu_status_r ); /*----------- defined in video/matmania.c -----------*/ -PALETTE_INIT( matmania ); + SCREEN_UPDATE_IND16( maniach ); -VIDEO_START( matmania ); + SCREEN_UPDATE_IND16( matmania ); diff --git a/src/mame/includes/mcatadv.h b/src/mame/includes/mcatadv.h index c65e3f503b6..0aee1ae9e8e 100644 --- a/src/mame/includes/mcatadv.h +++ b/src/mame/includes/mcatadv.h @@ -39,11 +39,13 @@ public: DECLARE_WRITE16_MEMBER(mcatadv_videoram2_w); TILE_GET_INFO_MEMBER(get_mcatadv_tile_info1); TILE_GET_INFO_MEMBER(get_mcatadv_tile_info2); + virtual void machine_start(); + virtual void video_start(); }; /*----------- defined in video/mcatadv.c -----------*/ SCREEN_UPDATE_IND16( mcatadv ); -VIDEO_START( mcatadv ); + SCREEN_VBLANK( mcatadv ); diff --git a/src/mame/includes/mcr.h b/src/mame/includes/mcr.h index 3a7115f6974..95f5a7f4ae0 100644 --- a/src/mame/includes/mcr.h +++ b/src/mame/includes/mcr.h @@ -96,6 +96,10 @@ public: TILE_GET_INFO_MEMBER(mcr_90009_get_tile_info); TILE_GET_INFO_MEMBER(mcr_90010_get_tile_info); TILE_GET_INFO_MEMBER(mcr_91490_get_tile_info); + DECLARE_MACHINE_START(mcr); + DECLARE_MACHINE_RESET(mcr); + DECLARE_VIDEO_START(mcr); + DECLARE_MACHINE_START(nflfoot); }; @@ -120,9 +124,9 @@ extern const gfx_layout mcr_sprite_layout; extern UINT32 mcr_cpu_board; extern UINT32 mcr_sprite_board; -MACHINE_START( mcr ); -MACHINE_RESET( mcr ); -MACHINE_START( nflfoot ); + + + TIMER_DEVICE_CALLBACK( mcr_interrupt ); TIMER_DEVICE_CALLBACK( mcr_ipu_interrupt ); @@ -135,7 +139,7 @@ TIMER_DEVICE_CALLBACK( mcr_ipu_interrupt ); extern INT8 mcr12_sprite_xoffs; extern INT8 mcr12_sprite_xoffs_flip; -VIDEO_START( mcr ); + diff --git a/src/mame/includes/mcr3.h b/src/mame/includes/mcr3.h index baafe136458..4cf71a137c8 100644 --- a/src/mame/includes/mcr3.h +++ b/src/mame/includes/mcr3.h @@ -60,16 +60,19 @@ public: TILEMAP_MAPPER_MEMBER(spyhunt_bg_scan); TILE_GET_INFO_MEMBER(spyhunt_get_bg_tile_info); TILE_GET_INFO_MEMBER(spyhunt_get_alpha_tile_info); + DECLARE_VIDEO_START(mcrmono); + DECLARE_VIDEO_START(spyhunt); + DECLARE_PALETTE_INIT(spyhunt); }; /*----------- defined in video/mcr3.c -----------*/ -VIDEO_START( mcrmono ); -VIDEO_START( spyhunt ); -PALETTE_INIT( spyhunt ); + + + SCREEN_UPDATE_IND16( mcr3 ); SCREEN_UPDATE_IND16( spyhunt ); diff --git a/src/mame/includes/mcr68.h b/src/mame/includes/mcr68.h index c75fae3a16d..f785b4e1c02 100644 --- a/src/mame/includes/mcr68.h +++ b/src/mame/includes/mcr68.h @@ -90,6 +90,12 @@ public: TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(zwackery_get_bg_tile_info); TILE_GET_INFO_MEMBER(zwackery_get_fg_tile_info); + DECLARE_MACHINE_START(zwackery); + DECLARE_MACHINE_RESET(zwackery); + DECLARE_VIDEO_START(zwackery); + DECLARE_MACHINE_START(mcr68); + DECLARE_MACHINE_RESET(mcr68); + DECLARE_VIDEO_START(mcr68); }; /*----------- defined in machine/mcr68.c -----------*/ @@ -99,10 +105,10 @@ extern const pia6821_interface zwackery_pia1_intf; extern const pia6821_interface zwackery_pia2_intf; -MACHINE_START( mcr68 ); -MACHINE_RESET( mcr68 ); -MACHINE_START( zwackery ); -MACHINE_RESET( zwackery ); + + + + INTERRUPT_GEN( mcr68_interrupt ); @@ -111,9 +117,9 @@ INTERRUPT_GEN( mcr68_interrupt ); /*----------- defined in video/mcr68.c -----------*/ -VIDEO_START( mcr68 ); + SCREEN_UPDATE_IND16( mcr68 ); -VIDEO_START( zwackery ); + SCREEN_UPDATE_IND16( zwackery ); diff --git a/src/mame/includes/meadows.h b/src/mame/includes/meadows.h index ce4c02af3aa..4c5227f6ec3 100644 --- a/src/mame/includes/meadows.h +++ b/src/mame/includes/meadows.h @@ -43,6 +43,8 @@ public: DECLARE_DRIVER_INIT(minferno); DECLARE_DRIVER_INIT(gypsyjug); TILE_GET_INFO_MEMBER(get_tile_info); + virtual void video_start(); + virtual void palette_init(); }; @@ -55,6 +57,6 @@ void meadows_sh_update(running_machine &machine); /*----------- defined in video/meadows.c -----------*/ -VIDEO_START( meadows ); + SCREEN_UPDATE_IND16( meadows ); diff --git a/src/mame/includes/megadriv.h b/src/mame/includes/megadriv.h index 0e62083a6be..0a24994ad7f 100644 --- a/src/mame/includes/megadriv.h +++ b/src/mame/includes/megadriv.h @@ -270,6 +270,10 @@ public: DECLARE_DRIVER_INIT(pclubjv4); DECLARE_DRIVER_INIT(pclubjv5); void segac2_common_init(running_machine& machine, int (*func)(int in)); + DECLARE_VIDEO_START(segac2_new); + DECLARE_MACHINE_START(segac2); + DECLARE_MACHINE_RESET(segac2); + }; class mplay_state : public md_base_state @@ -306,6 +310,8 @@ public: UINT16 *m_ic36_ram; DECLARE_WRITE_LINE_MEMBER( int_callback ); DECLARE_DRIVER_INIT(megaplay); + DECLARE_VIDEO_START(megplay); + DECLARE_MACHINE_RESET(megaplay); }; class mtech_state : public md_base_state @@ -339,6 +345,8 @@ public: UINT8* m_megatech_banked_ram; DECLARE_DRIVER_INIT(mt_crt); DECLARE_DRIVER_INIT(mt_slot); + DECLARE_VIDEO_START(mtnew); + DECLARE_MACHINE_RESET(mtnew); }; typedef struct _megadriv_cart megadriv_cart; @@ -390,14 +398,6 @@ public: }; -class pico_state : public md_cons_state -{ -public: - pico_state(const machine_config &mconfig, device_type type, const char *tag) - : md_cons_state(mconfig, type, tag) { } - - UINT8 m_page_register; -}; class mdsvp_state : public md_cons_state { diff --git a/src/mame/includes/megasys1.h b/src/mame/includes/megasys1.h index 7d1865ffa03..d8106359d3c 100644 --- a/src/mame/includes/megasys1.h +++ b/src/mame/includes/megasys1.h @@ -106,16 +106,20 @@ public: TILEMAP_MAPPER_MEMBER(megasys1_scan_16x16); TILE_GET_INFO_MEMBER(megasys1_get_scroll_tile_info_8x8); TILE_GET_INFO_MEMBER(megasys1_get_scroll_tile_info_16x16); + DECLARE_MACHINE_RESET(megasys1); + DECLARE_VIDEO_START(megasys1); + DECLARE_PALETTE_INIT(megasys1); + DECLARE_MACHINE_RESET(megasys1_hachoo); }; /*----------- defined in video/megasys1.c -----------*/ -VIDEO_START( megasys1 ); + SCREEN_UPDATE_IND16( megasys1 ); SCREEN_VBLANK( megasys1 ); -PALETTE_INIT( megasys1 ); + diff --git a/src/mame/includes/megazone.h b/src/mame/includes/megazone.h index 2547412fd3b..78fb6dfdaf4 100644 --- a/src/mame/includes/megazone.h +++ b/src/mame/includes/megazone.h @@ -47,6 +47,10 @@ public: DECLARE_READ8_MEMBER(megazone_port_a_r); DECLARE_WRITE8_MEMBER(megazone_port_b_w); DECLARE_DRIVER_INIT(megazone); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); }; @@ -54,6 +58,6 @@ public: /*----------- defined in video/megazone.c -----------*/ -PALETTE_INIT( megazone ); -VIDEO_START( megazone ); + + SCREEN_UPDATE_IND16( megazone ); diff --git a/src/mame/includes/mermaid.h b/src/mame/includes/mermaid.h index 9a0bb44d8f5..2b2a0729639 100644 --- a/src/mame/includes/mermaid.h +++ b/src/mame/includes/mermaid.h @@ -72,6 +72,11 @@ public: DECLARE_READ8_MEMBER(mermaid_collision_r); TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); + DECLARE_PALETTE_INIT(rougien); }; @@ -79,8 +84,8 @@ public: /*----------- defined in video/mermaid.c -----------*/ -PALETTE_INIT( mermaid ); -PALETTE_INIT( rougien ); -VIDEO_START( mermaid ); + + + SCREEN_UPDATE_IND16( mermaid ); SCREEN_VBLANK( mermaid ); diff --git a/src/mame/includes/metalmx.h b/src/mame/includes/metalmx.h index bbd9ceb3d83..382c20ead1f 100644 --- a/src/mame/includes/metalmx.h +++ b/src/mame/includes/metalmx.h @@ -46,4 +46,6 @@ public: DECLARE_WRITE32_MEMBER(host_vram_w); DECLARE_WRITE32_MEMBER(timer_w); DECLARE_DRIVER_INIT(metalmx); + virtual void machine_reset(); + virtual void video_start(); }; diff --git a/src/mame/includes/metlclsh.h b/src/mame/includes/metlclsh.h index c1a7126404c..9494549d9ae 100644 --- a/src/mame/includes/metlclsh.h +++ b/src/mame/includes/metlclsh.h @@ -46,11 +46,14 @@ public: TILEMAP_MAPPER_MEMBER(metlclsh_bgtilemap_scan); TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; /*----------- defined in video/metlclsh.c -----------*/ -VIDEO_START( metlclsh ); + SCREEN_UPDATE_IND16( metlclsh ); diff --git a/src/mame/includes/metro.h b/src/mame/includes/metro.h index 91398221313..eaf76144a2b 100644 --- a/src/mame/includes/metro.h +++ b/src/mame/includes/metro.h @@ -154,17 +154,24 @@ public: TILE_GET_INFO_MEMBER(metro_k053936_get_tile_info); TILE_GET_INFO_MEMBER(metro_k053936_gstrik2_get_tile_info); TILEMAP_MAPPER_MEMBER(tilemap_scan_gstrik2); + DECLARE_MACHINE_START(metro); + DECLARE_MACHINE_RESET(metro); + DECLARE_VIDEO_START(metro_i4220); + DECLARE_VIDEO_START(metro_i4100); + DECLARE_VIDEO_START(metro_i4300); + DECLARE_VIDEO_START(blzntrnd); + DECLARE_VIDEO_START(gstrik2); }; /*----------- defined in video/metro.c -----------*/ -VIDEO_START( metro_i4100 ); -VIDEO_START( metro_i4220 ); -VIDEO_START( metro_i4300 ); -VIDEO_START( blzntrnd ); -VIDEO_START( gstrik2 ); + + + + + SCREEN_UPDATE_IND16( metro ); diff --git a/src/mame/includes/mexico86.h b/src/mame/includes/mexico86.h index be84b81c66a..ec3cafac569 100644 --- a/src/mame/includes/mexico86.h +++ b/src/mame/includes/mexico86.h @@ -51,6 +51,8 @@ public: DECLARE_WRITE8_MEMBER(mexico86_68705_ddr_b_w); DECLARE_WRITE8_MEMBER(mexico86_bankswitch_w); DECLARE_READ8_MEMBER(kiki_ym2203_r); + virtual void machine_start(); + virtual void machine_reset(); }; diff --git a/src/mame/includes/mhavoc.h b/src/mame/includes/mhavoc.h index 2e58eb6444c..d4bfaf59ec0 100644 --- a/src/mame/includes/mhavoc.h +++ b/src/mame/includes/mhavoc.h @@ -60,6 +60,8 @@ public: DECLARE_CUSTOM_INPUT_MEMBER(alpha_xmtd_r); DECLARE_CUSTOM_INPUT_MEMBER(clock_r); DECLARE_DRIVER_INIT(mhavocrv); + virtual void machine_start(); + virtual void machine_reset(); }; @@ -68,7 +70,7 @@ public: TIMER_DEVICE_CALLBACK( mhavoc_cpu_irq_clock ); -MACHINE_START( mhavoc ); -MACHINE_RESET( mhavoc ); + + diff --git a/src/mame/includes/micro3d.h b/src/mame/includes/micro3d.h index dfcb903b967..cbc7ae979d7 100644 --- a/src/mame/includes/micro3d.h +++ b/src/mame/includes/micro3d.h @@ -111,6 +111,9 @@ public: DECLARE_READ8_MEMBER(micro3d_sound_io_r); DECLARE_DRIVER_INIT(micro3d); DECLARE_DRIVER_INIT(botss); + virtual void machine_reset(); + virtual void video_start(); + virtual void video_reset(); }; typedef struct _micro3d_vtx_ @@ -126,7 +129,7 @@ UINT8 micro3d_duart_input_r(device_t *device); void micro3d_duart_output_w(device_t *device, UINT8 data); void micro3d_duart_tx(device_t *device, int channel, UINT8 data); -MACHINE_RESET( micro3d ); + /*----------- defined in audio/micro3d.c -----------*/ @@ -163,8 +166,8 @@ extern const device_type MICRO3D; /*----------- defined in video/micro3d.c -----------*/ -VIDEO_START( micro3d ); -VIDEO_RESET( micro3d ); + + void micro3d_tms_interrupt(device_t *device, int state); void micro3d_scanline_update(screen_device &screen, bitmap_ind16 &bitmap, int scanline, const tms34010_display_params *params); diff --git a/src/mame/includes/midtunit.h b/src/mame/includes/midtunit.h index 5545e6653be..39b7bb3f024 100644 --- a/src/mame/includes/midtunit.h +++ b/src/mame/includes/midtunit.h @@ -63,6 +63,8 @@ public: DECLARE_DRIVER_INIT(nbajam); DECLARE_DRIVER_INIT(jdreddp); DECLARE_DRIVER_INIT(mk2); + DECLARE_MACHINE_RESET(midtunit); + DECLARE_VIDEO_START(midtunit); }; /*----------- defined in machine/midtunit.c -----------*/ @@ -70,7 +72,7 @@ public: -MACHINE_RESET( midtunit ); + @@ -78,9 +80,9 @@ MACHINE_RESET( midtunit ); extern UINT8 midtunit_gfx_rom_large; -VIDEO_START( midtunit ); -VIDEO_START( midwunit ); -VIDEO_START( midxunit ); + + + diff --git a/src/mame/includes/midvunit.h b/src/mame/includes/midvunit.h index 37773172225..458c39e6105 100644 --- a/src/mame/includes/midvunit.h +++ b/src/mame/includes/midvunit.h @@ -115,6 +115,10 @@ public: DECLARE_DRIVER_INIT(crusnusa); void init_crusnwld_common(offs_t speedup); void init_crusnusa_common(offs_t speedup); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); + DECLARE_MACHINE_RESET(midvplus); }; @@ -127,5 +131,5 @@ public: -VIDEO_START( midvunit ); + SCREEN_UPDATE_IND16( midvunit ); diff --git a/src/mame/includes/midwunit.h b/src/mame/includes/midwunit.h index 7dd9d6e6a3d..5778e8ec0cd 100644 --- a/src/mame/includes/midwunit.h +++ b/src/mame/includes/midwunit.h @@ -39,6 +39,8 @@ public: DECLARE_DRIVER_INIT(rmpgwt); DECLARE_DRIVER_INIT(umk3r11); DECLARE_DRIVER_INIT(mk3r20); + DECLARE_MACHINE_RESET(midwunit); + DECLARE_VIDEO_START(midwunit); }; /*----------- defined in machine/midwunit.c -----------*/ @@ -48,6 +50,6 @@ public: -MACHINE_RESET( midwunit ); + diff --git a/src/mame/includes/midxunit.h b/src/mame/includes/midxunit.h index 29a05fcdb99..5c48bc9e2fb 100644 --- a/src/mame/includes/midxunit.h +++ b/src/mame/includes/midxunit.h @@ -35,6 +35,8 @@ public: DECLARE_READ16_MEMBER(midxunit_sound_state_r); DECLARE_WRITE16_MEMBER(midxunit_sound_w); DECLARE_DRIVER_INIT(revx); + DECLARE_MACHINE_RESET(midxunit); + DECLARE_VIDEO_START(midxunit); }; @@ -45,6 +47,6 @@ public: -MACHINE_RESET( midxunit ); + diff --git a/src/mame/includes/midyunit.h b/src/mame/includes/midyunit.h index fe5fb21ec8a..38f6f269138 100644 --- a/src/mame/includes/midyunit.h +++ b/src/mame/includes/midyunit.h @@ -101,6 +101,12 @@ public: DECLARE_DRIVER_INIT(hiimpact); DECLARE_DRIVER_INIT(mkyturbo); DECLARE_DRIVER_INIT(term2la2); + DECLARE_MACHINE_RESET(midyunit); + DECLARE_VIDEO_START(midzunit); + DECLARE_VIDEO_START(midyunit_4bit); + DECLARE_VIDEO_START(midyunit_6bit); + DECLARE_VIDEO_START(mkyawdim); + DECLARE_VIDEO_START(common); }; @@ -110,16 +116,16 @@ public: -MACHINE_RESET( midyunit ); + /*----------- defined in video/midyunit.c -----------*/ -VIDEO_START( midyunit_4bit ); -VIDEO_START( midyunit_6bit ); -VIDEO_START( mkyawdim ); -VIDEO_START( midzunit ); + + + + diff --git a/src/mame/includes/midzeus.h b/src/mame/includes/midzeus.h index 2b96d05fb53..06329351d33 100644 --- a/src/mame/includes/midzeus.h +++ b/src/mame/includes/midzeus.h @@ -52,18 +52,22 @@ public: DECLARE_DRIVER_INIT(mk4); DECLARE_DRIVER_INIT(thegrid); DECLARE_DRIVER_INIT(crusnexo); + DECLARE_MACHINE_START(midzeus); + DECLARE_MACHINE_RESET(midzeus); + DECLARE_VIDEO_START(midzeus); + DECLARE_VIDEO_START(midzeus2); }; /*----------- defined in video/midzeus.c -----------*/ -VIDEO_START( midzeus ); + SCREEN_UPDATE_IND16( midzeus ); /*----------- defined in video/midzeus2.c -----------*/ -VIDEO_START( midzeus2 ); + SCREEN_UPDATE_RGB32( midzeus2 ); READ32_HANDLER( zeus2_r ); diff --git a/src/mame/includes/mikie.h b/src/mame/includes/mikie.h index b8a5c047cb1..e43e2aebbaf 100644 --- a/src/mame/includes/mikie.h +++ b/src/mame/includes/mikie.h @@ -39,12 +39,16 @@ public: DECLARE_WRITE8_MEMBER(mikie_palettebank_w); DECLARE_WRITE8_MEMBER(mikie_flipscreen_w); TILE_GET_INFO_MEMBER(get_bg_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/mikie.c -----------*/ -PALETTE_INIT( mikie ); -VIDEO_START( mikie ); + + SCREEN_UPDATE_IND16( mikie ); diff --git a/src/mame/includes/mitchell.h b/src/mame/includes/mitchell.h index 19138ae2afa..ef776411831 100644 --- a/src/mame/includes/mitchell.h +++ b/src/mame/includes/mitchell.h @@ -97,6 +97,9 @@ public: DECLARE_DRIVER_INIT(blockbl); DECLARE_DRIVER_INIT(dokaben); TILE_GET_INFO_MEMBER(get_tile_info); + DECLARE_MACHINE_START(mitchell); + DECLARE_MACHINE_RESET(mitchell); + DECLARE_VIDEO_START(pang); }; @@ -105,5 +108,5 @@ public: -VIDEO_START( pang ); + SCREEN_UPDATE_IND16( pang ); diff --git a/src/mame/includes/mjkjidai.h b/src/mame/includes/mjkjidai.h index a1a3e2ef77a..208fea9fb77 100644 --- a/src/mame/includes/mjkjidai.h +++ b/src/mame/includes/mjkjidai.h @@ -27,12 +27,13 @@ public: DECLARE_WRITE8_MEMBER(mjkjidai_ctrl_w); DECLARE_WRITE8_MEMBER(adpcm_w); TILE_GET_INFO_MEMBER(get_tile_info); + virtual void video_start(); }; /*----------- defined in video/mjkjidai.c -----------*/ -VIDEO_START( mjkjidai ); + SCREEN_UPDATE_IND16( mjkjidai ); diff --git a/src/mame/includes/model1.h b/src/mame/includes/model1.h index 6064510ea7a..7a109e0ffc8 100644 --- a/src/mame/includes/model1.h +++ b/src/mame/includes/model1.h @@ -130,6 +130,10 @@ public: DECLARE_WRITE16_MEMBER(model1_listctl_w); DECLARE_WRITE16_MEMBER(m1_snd_mpcm_bnk1_w); DECLARE_WRITE16_MEMBER(m1_snd_mpcm_bnk2_w); + DECLARE_MACHINE_START(model1); + DECLARE_MACHINE_RESET(model1); + DECLARE_VIDEO_START(model1); + DECLARE_MACHINE_RESET(model1_vr); }; @@ -141,7 +145,7 @@ extern const mb86233_cpu_core model1_vr_tgp_config; ADDRESS_MAP_EXTERN( model1_vr_tgp_map, 32 ); -MACHINE_START( model1 ); + void model1_vr_tgp_reset( running_machine &machine ); void model1_tgp_reset(running_machine &machine, int swa); @@ -149,7 +153,7 @@ void model1_tgp_reset(running_machine &machine, int swa); /*----------- defined in video/model1.c -----------*/ -VIDEO_START(model1); + SCREEN_UPDATE_RGB32(model1); SCREEN_VBLANK(model1); diff --git a/src/mame/includes/model2.h b/src/mame/includes/model2.h index 93c876095c6..a6a23144787 100644 --- a/src/mame/includes/model2.h +++ b/src/mame/includes/model2.h @@ -154,12 +154,20 @@ public: DECLARE_DRIVER_INIT(doa); DECLARE_DRIVER_INIT(zerogun); DECLARE_DRIVER_INIT(sgt24h); + DECLARE_MACHINE_START(model2); + DECLARE_MACHINE_RESET(model2o); + DECLARE_VIDEO_START(model2); + DECLARE_MACHINE_RESET(model2); + DECLARE_MACHINE_RESET(model2b); + DECLARE_MACHINE_RESET(model2c); + DECLARE_MACHINE_RESET(model2_common); + DECLARE_MACHINE_RESET(model2_scsp); }; /*----------- defined in video/model2.c -----------*/ -VIDEO_START(model2); + SCREEN_UPDATE_RGB32(model2); void model2_3d_set_zclip( running_machine &machine, UINT8 clip ); diff --git a/src/mame/includes/model3.h b/src/mame/includes/model3.h index 53d8cfb4b00..54de373c64f 100644 --- a/src/mame/includes/model3.h +++ b/src/mame/includes/model3.h @@ -188,6 +188,15 @@ public: DECLARE_DRIVER_INIT(dayto2pe); DECLARE_DRIVER_INIT(spikeout); DECLARE_DRIVER_INIT(model3_15); + virtual void video_start(); + DECLARE_MACHINE_START(model3_10); + DECLARE_MACHINE_RESET(model3_10); + DECLARE_MACHINE_START(model3_15); + DECLARE_MACHINE_RESET(model3_15); + DECLARE_MACHINE_START(model3_20); + DECLARE_MACHINE_RESET(model3_20); + DECLARE_MACHINE_START(model3_21); + DECLARE_MACHINE_RESET(model3_21); }; @@ -207,7 +216,7 @@ void model3_tap_reset(running_machine &machine); /*----------- defined in video/model3.c -----------*/ -VIDEO_START(model3); + SCREEN_UPDATE_IND16(model3); void real3d_display_list_end(running_machine &machine); diff --git a/src/mame/includes/momoko.h b/src/mame/includes/momoko.h index e7c8874aa61..36a52861f40 100644 --- a/src/mame/includes/momoko.h +++ b/src/mame/includes/momoko.h @@ -43,6 +43,8 @@ public: DECLARE_WRITE8_MEMBER(momoko_bg_select_w); DECLARE_WRITE8_MEMBER(momoko_bg_priority_w); DECLARE_WRITE8_MEMBER(momoko_flipscreen_w); + virtual void machine_start(); + virtual void machine_reset(); }; diff --git a/src/mame/includes/moo.h b/src/mame/includes/moo.h index 6f4d68f1d79..87b6e7e5d73 100644 --- a/src/mame/includes/moo.h +++ b/src/mame/includes/moo.h @@ -50,6 +50,9 @@ public: DECLARE_WRITE16_MEMBER(moo_prot_w); DECLARE_WRITE16_MEMBER(moobl_oki_bank_w); DECLARE_DRIVER_INIT(moo); + DECLARE_MACHINE_START(moo); + DECLARE_MACHINE_RESET(moo); + DECLARE_VIDEO_START(moo); }; @@ -59,5 +62,5 @@ public: extern void moo_tile_callback(running_machine &machine, int layer, int *code, int *color, int *flags); extern void moo_sprite_callback(running_machine &machine, int *code, int *color, int *priority_mask); -VIDEO_START(moo); + SCREEN_UPDATE_RGB32(moo); diff --git a/src/mame/includes/mosaic.h b/src/mame/includes/mosaic.h index 460d67d87d9..b7127c64855 100644 --- a/src/mame/includes/mosaic.h +++ b/src/mame/includes/mosaic.h @@ -31,11 +31,14 @@ public: DECLARE_WRITE8_MEMBER(mosaic_bgvideoram_w); TILE_GET_INFO_MEMBER(get_fg_tile_info); TILE_GET_INFO_MEMBER(get_bg_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; /*----------- defined in video/mosaic.c -----------*/ -VIDEO_START( mosaic ); + SCREEN_UPDATE_IND16( mosaic ); diff --git a/src/mame/includes/mouser.h b/src/mame/includes/mouser.h index b0c532d6614..865941784a7 100644 --- a/src/mame/includes/mouser.h +++ b/src/mame/includes/mouser.h @@ -32,10 +32,13 @@ public: DECLARE_WRITE8_MEMBER(mouser_flip_screen_x_w); DECLARE_WRITE8_MEMBER(mouser_flip_screen_y_w); DECLARE_DRIVER_INIT(mouser); + virtual void machine_start(); + virtual void machine_reset(); + virtual void palette_init(); }; /*----------- defined in video/mouser.c -----------*/ -PALETTE_INIT( mouser ); + SCREEN_UPDATE_IND16( mouser ); diff --git a/src/mame/includes/mpu4.h b/src/mame/includes/mpu4.h index bac61e427e7..79fa6d43c20 100644 --- a/src/mame/includes/mpu4.h +++ b/src/mame/includes/mpu4.h @@ -249,6 +249,12 @@ public: DECLARE_DRIVER_INIT(m_grtecpss); DECLARE_DRIVER_INIT(connect4); DECLARE_DRIVER_INIT(m4altreels); + DECLARE_MACHINE_START(mod2); + DECLARE_MACHINE_RESET(mpu4); + DECLARE_MACHINE_START(mpu4yam); + DECLARE_MACHINE_START(mpu4oki); + DECLARE_MACHINE_START(mpu4bwb); + DECLARE_MACHINE_START(mpu4cry); }; /* mpu4.c, used by mpu4vid.c */ diff --git a/src/mame/includes/mrdo.h b/src/mame/includes/mrdo.h index 3438b630306..e8a804f47c3 100644 --- a/src/mame/includes/mrdo.h +++ b/src/mame/includes/mrdo.h @@ -30,12 +30,14 @@ public: DECLARE_WRITE8_MEMBER(mrdo_flipscreen_w); TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/mrdo.c -----------*/ -PALETTE_INIT( mrdo ); -VIDEO_START( mrdo ); + + SCREEN_UPDATE_IND16( mrdo ); diff --git a/src/mame/includes/mrflea.h b/src/mame/includes/mrflea.h index 1994ab4ffff..12b934f448f 100644 --- a/src/mame/includes/mrflea.h +++ b/src/mame/includes/mrflea.h @@ -42,6 +42,8 @@ public: DECLARE_WRITE8_MEMBER(mrflea_gfx_bank_w); DECLARE_WRITE8_MEMBER(mrflea_videoram_w); DECLARE_WRITE8_MEMBER(mrflea_spriteram_w); + virtual void machine_start(); + virtual void machine_reset(); }; diff --git a/src/mame/includes/mrjong.h b/src/mame/includes/mrjong.h index 1ea65b89728..0f690203776 100644 --- a/src/mame/includes/mrjong.h +++ b/src/mame/includes/mrjong.h @@ -23,12 +23,14 @@ public: DECLARE_WRITE8_MEMBER(mrjong_colorram_w); DECLARE_WRITE8_MEMBER(mrjong_flipscreen_w); TILE_GET_INFO_MEMBER(get_bg_tile_info); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/mrjong.c -----------*/ -PALETTE_INIT( mrjong ); -VIDEO_START( mrjong ); + + SCREEN_UPDATE_IND16( mrjong ); diff --git a/src/mame/includes/ms32.h b/src/mame/includes/ms32.h index 9a7a8ed4909..9a5e11510a3 100644 --- a/src/mame/includes/ms32.h +++ b/src/mame/includes/ms32.h @@ -84,6 +84,9 @@ public: TILE_GET_INFO_MEMBER(get_ms32_roz_tile_info); TILE_GET_INFO_MEMBER(get_ms32_bg_tile_info); TILE_GET_INFO_MEMBER(get_ms32_extra_tile_info); + virtual void machine_reset(); + virtual void video_start(); + DECLARE_VIDEO_START(f1superb); }; @@ -93,6 +96,6 @@ public: -VIDEO_START( ms32 ); -VIDEO_START( f1superb ); + + SCREEN_UPDATE_RGB32( ms32 ); diff --git a/src/mame/includes/msisaac.h b/src/mame/includes/msisaac.h index 256b3236203..7777bc45e40 100644 --- a/src/mame/includes/msisaac.h +++ b/src/mame/includes/msisaac.h @@ -68,6 +68,10 @@ public: TILE_GET_INFO_MEMBER(get_fg_tile_info); TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_bg2_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); + DECLARE_MACHINE_RESET(ta7630); }; @@ -76,4 +80,4 @@ public: SCREEN_UPDATE_IND16( msisaac ); -VIDEO_START( msisaac ); + diff --git a/src/mame/includes/mugsmash.h b/src/mame/includes/mugsmash.h index 2658ac5eadc..66365f244d7 100644 --- a/src/mame/includes/mugsmash.h +++ b/src/mame/includes/mugsmash.h @@ -28,11 +28,13 @@ public: DECLARE_WRITE16_MEMBER(mugsmash_reg_w); TILE_GET_INFO_MEMBER(get_mugsmash_tile_info1); TILE_GET_INFO_MEMBER(get_mugsmash_tile_info2); + virtual void machine_start(); + virtual void video_start(); }; /*----------- defined in video/mugsmash.c -----------*/ -VIDEO_START( mugsmash ); + SCREEN_UPDATE_IND16( mugsmash ); diff --git a/src/mame/includes/munchmo.h b/src/mame/includes/munchmo.h index 1eece77c81d..1a80270efe1 100644 --- a/src/mame/includes/munchmo.h +++ b/src/mame/includes/munchmo.h @@ -42,12 +42,16 @@ public: DECLARE_WRITE8_MEMBER(mnchmobl_flipscreen_w); DECLARE_READ8_MEMBER(munchmo_ay1reset_r); DECLARE_READ8_MEMBER(munchmo_ay2reset_r); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/munchmo.c -----------*/ -PALETTE_INIT( mnchmobl ); -VIDEO_START( mnchmobl ); + + SCREEN_UPDATE_IND16( mnchmobl ); diff --git a/src/mame/includes/mustache.h b/src/mame/includes/mustache.h index 41dcac15b37..272af74622d 100644 --- a/src/mame/includes/mustache.h +++ b/src/mame/includes/mustache.h @@ -16,11 +16,14 @@ public: DECLARE_WRITE8_MEMBER(mustache_scroll_w); DECLARE_DRIVER_INIT(mustache); TILE_GET_INFO_MEMBER(get_bg_tile_info); + virtual void machine_start(); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/mustache.c -----------*/ -VIDEO_START( mustache ); + SCREEN_UPDATE_IND16( mustache ); -PALETTE_INIT( mustache ); + diff --git a/src/mame/includes/mw8080bw.h b/src/mame/includes/mw8080bw.h index edf3a2b8e45..f4fe858cb10 100644 --- a/src/mame/includes/mw8080bw.h +++ b/src/mame/includes/mw8080bw.h @@ -128,6 +128,17 @@ public: DECLARE_WRITE8_MEMBER(bowler_audio_4_w); DECLARE_WRITE8_MEMBER(bowler_audio_5_w); DECLARE_WRITE8_MEMBER(bowler_audio_6_w); + DECLARE_MACHINE_START(mw8080bw); + DECLARE_MACHINE_RESET(mw8080bw); + DECLARE_MACHINE_START(maze); + DECLARE_MACHINE_START(boothill); + DECLARE_MACHINE_START(desertgu); + DECLARE_MACHINE_START(gmissile); + DECLARE_MACHINE_START(m4); + DECLARE_MACHINE_START(clowns); + DECLARE_MACHINE_START(spcenctr); + DECLARE_MACHINE_START(phantom2); + DECLARE_MACHINE_START(invaders); }; @@ -182,8 +193,8 @@ int invaders_is_cabinet_cocktail(running_machine &machine); /*----------- defined in machine/mw8080bw.c -----------*/ -MACHINE_START( mw8080bw ); -MACHINE_RESET( mw8080bw ); + + /*----------- defined in audio/mw8080bw.c -----------*/ diff --git a/src/mame/includes/mystston.h b/src/mame/includes/mystston.h index 96e14b840b4..c1c43040f78 100644 --- a/src/mame/includes/mystston.h +++ b/src/mame/includes/mystston.h @@ -44,6 +44,8 @@ public: DECLARE_INPUT_CHANGED_MEMBER(coin_inserted); TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); + DECLARE_VIDEO_START(mystston); + DECLARE_VIDEO_RESET(mystston); }; diff --git a/src/mame/includes/mystwarr.h b/src/mame/includes/mystwarr.h index 719d4923bc7..3ea0f031a8e 100644 --- a/src/mame/includes/mystwarr.h +++ b/src/mame/includes/mystwarr.h @@ -54,17 +54,30 @@ public: DECLARE_READ16_MEMBER(ddd_053936_tilerom_2_r); TILE_GET_INFO_MEMBER(get_gai_936_tile_info); TILE_GET_INFO_MEMBER(get_ult_936_tile_info); + DECLARE_MACHINE_START(mystwarr); + DECLARE_MACHINE_RESET(mystwarr); + DECLARE_VIDEO_START(mystwarr); + DECLARE_MACHINE_RESET(viostorm); + DECLARE_VIDEO_START(viostorm); + DECLARE_MACHINE_RESET(metamrph); + DECLARE_VIDEO_START(metamrph); + DECLARE_MACHINE_RESET(dadandrn); + DECLARE_VIDEO_START(dadandrn); + DECLARE_MACHINE_RESET(gaiapols); + DECLARE_VIDEO_START(gaiapols); + DECLARE_MACHINE_RESET(martchmp); + DECLARE_VIDEO_START(martchmp); }; /*----------- defined in video/mystwarr.c -----------*/ -VIDEO_START( gaiapols ); -VIDEO_START( dadandrn ); -VIDEO_START( viostorm ); -VIDEO_START( metamrph ); -VIDEO_START( martchmp ); -VIDEO_START( mystwarr ); + + + + + + SCREEN_UPDATE_RGB32( dadandrn ); SCREEN_UPDATE_RGB32( mystwarr ); SCREEN_UPDATE_RGB32( metamrph ); diff --git a/src/mame/includes/n64.h b/src/mame/includes/n64.h index fb5ec9768f3..0d79cd0da5a 100644 --- a/src/mame/includes/n64.h +++ b/src/mame/includes/n64.h @@ -20,6 +20,9 @@ public: n64_rdp *m_rdp; DECLARE_DRIVER_INIT(aleck64); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; /*----------- devices -----------*/ @@ -282,7 +285,7 @@ extern WRITE32_DEVICE_HANDLER( n64_sp_reg_w ); extern READ32_DEVICE_HANDLER( n64_dp_reg_r ); extern WRITE32_DEVICE_HANDLER( n64_dp_reg_w ); -MACHINE_START( n64 ); -MACHINE_RESET( n64 ); + + #endif diff --git a/src/mame/includes/n8080.h b/src/mame/includes/n8080.h index 80f10bb7c59..8b670a66aae 100644 --- a/src/mame/includes/n8080.h +++ b/src/mame/includes/n8080.h @@ -58,6 +58,25 @@ public: DECLARE_WRITE8_MEMBER(helifire_sound_ctrl_w); DECLARE_WRITE_LINE_MEMBER(n8080_inte_callback); DECLARE_WRITE8_MEMBER(n8080_status_callback); + DECLARE_MACHINE_START(spacefev); + DECLARE_MACHINE_RESET(spacefev); + DECLARE_VIDEO_START(spacefev); + DECLARE_PALETTE_INIT(n8080); + DECLARE_MACHINE_START(sheriff); + DECLARE_MACHINE_RESET(sheriff); + DECLARE_VIDEO_START(sheriff); + DECLARE_MACHINE_START(helifire); + DECLARE_MACHINE_RESET(helifire); + DECLARE_VIDEO_START(helifire); + DECLARE_PALETTE_INIT(helifire); + DECLARE_MACHINE_START(spacefev_sound); + DECLARE_MACHINE_RESET(spacefev_sound); + DECLARE_MACHINE_START(sheriff_sound); + DECLARE_MACHINE_RESET(sheriff_sound); + DECLARE_MACHINE_START(helifire_sound); + DECLARE_MACHINE_RESET(helifire_sound); + DECLARE_MACHINE_START(n8080); + DECLARE_MACHINE_RESET(n8080); }; @@ -65,12 +84,12 @@ public: /*----------- defined in video/n8080.c -----------*/ -PALETTE_INIT( n8080 ); -PALETTE_INIT( helifire ); -VIDEO_START( spacefev ); -VIDEO_START( sheriff ); -VIDEO_START( helifire ); + + + + + SCREEN_UPDATE_IND16( spacefev ); SCREEN_UPDATE_IND16( sheriff ); SCREEN_UPDATE_IND16( helifire ); @@ -84,10 +103,10 @@ MACHINE_CONFIG_EXTERN( spacefev_sound ); MACHINE_CONFIG_EXTERN( sheriff_sound ); MACHINE_CONFIG_EXTERN( helifire_sound ); -MACHINE_START( spacefev_sound ); -MACHINE_START( sheriff_sound ); -MACHINE_START( helifire_sound ); -MACHINE_RESET( spacefev_sound ); -MACHINE_RESET( sheriff_sound ); -MACHINE_RESET( helifire_sound ); + + + + + + diff --git a/src/mame/includes/namcofl.h b/src/mame/includes/namcofl.h index 3a15030be7c..d03346d2813 100644 --- a/src/mame/includes/namcofl.h +++ b/src/mame/includes/namcofl.h @@ -54,11 +54,14 @@ public: DECLARE_WRITE32_MEMBER(namcofl_spritebank_w); DECLARE_DRIVER_INIT(speedrcr); DECLARE_DRIVER_INIT(finalapr); + DECLARE_MACHINE_START(namcofl); + DECLARE_MACHINE_RESET(namcofl); + DECLARE_VIDEO_START(namcofl); }; /*----------- defined in video/namcofl.c -----------*/ -VIDEO_START( namcofl ); + SCREEN_UPDATE_IND16( namcofl ); diff --git a/src/mame/includes/namcona1.h b/src/mame/includes/namcona1.h index c94f749a2af..3a57fdd7fa6 100644 --- a/src/mame/includes/namcona1.h +++ b/src/mame/includes/namcona1.h @@ -107,6 +107,9 @@ public: TILE_GET_INFO_MEMBER(tilemap_get_info2); TILE_GET_INFO_MEMBER(tilemap_get_info3); TILE_GET_INFO_MEMBER(roz_get_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; diff --git a/src/mame/includes/namconb1.h b/src/mame/includes/namconb1.h index 0be313d6338..360171ffe53 100644 --- a/src/mame/includes/namconb1.h +++ b/src/mame/includes/namconb1.h @@ -72,13 +72,16 @@ public: DECLARE_DRIVER_INIT(gslgr94j); DECLARE_DRIVER_INIT(outfxies); DECLARE_DRIVER_INIT(gslgr94u); + DECLARE_MACHINE_START(namconb); + DECLARE_VIDEO_START(namconb1); + DECLARE_VIDEO_START(namconb2); }; /*----------- defined in video/namconb1.c -----------*/ SCREEN_UPDATE_IND16( namconb1 ); -VIDEO_START( namconb1 ); + SCREEN_UPDATE_IND16( namconb2 ); -VIDEO_START( namconb2 ); + diff --git a/src/mame/includes/namcond1.h b/src/mame/includes/namcond1.h index a80d24d95f7..c0e9b64ed23 100644 --- a/src/mame/includes/namcond1.h +++ b/src/mame/includes/namcond1.h @@ -25,12 +25,14 @@ public: DECLARE_READ16_MEMBER(namcond1_cuskey_r); DECLARE_WRITE16_MEMBER(namcond1_shared_ram_w); DECLARE_WRITE16_MEMBER(namcond1_cuskey_w); + virtual void machine_start(); + virtual void machine_reset(); }; /*----------- defined in machine/namcond1.c -----------*/ -MACHINE_START( namcond1 ); -MACHINE_RESET( namcond1 ); + + diff --git a/src/mame/includes/namcos1.h b/src/mame/includes/namcos1.h index 3698cbbcb33..41f94a48baa 100644 --- a/src/mame/includes/namcos1.h +++ b/src/mame/includes/namcos1.h @@ -91,6 +91,8 @@ public: TILE_GET_INFO_MEMBER(bg_get_info3); TILE_GET_INFO_MEMBER(fg_get_info4); TILE_GET_INFO_MEMBER(fg_get_info5); + virtual void machine_reset(); + virtual void video_start(); }; @@ -104,7 +106,7 @@ void namcos1_init_DACs(running_machine &machine); -MACHINE_RESET( namcos1 ); + /*----------- defined in video/namcos1.c -----------*/ @@ -115,6 +117,6 @@ WRITE8_HANDLER( namcos1_paletteram_w ); READ8_HANDLER( namcos1_spriteram_r ); WRITE8_HANDLER( namcos1_spriteram_w ); -VIDEO_START( namcos1 ); + SCREEN_UPDATE_IND16( namcos1 ); SCREEN_VBLANK( namcos1 ); diff --git a/src/mame/includes/namcos2.h b/src/mame/includes/namcos2.h index 924985fc966..3f74d382d3c 100644 --- a/src/mame/includes/namcos2.h +++ b/src/mame/includes/namcos2.h @@ -159,7 +159,8 @@ public: DECLARE_WRITE16_MEMBER( c355_obj_ram_w ); DECLARE_READ16_MEMBER( c355_obj_position_r ); DECLARE_WRITE16_MEMBER( c355_obj_position_w ); - + DECLARE_MACHINE_START(namcos2); + DECLARE_MACHINE_RESET(namcos2); protected: // C355 Motion Object internals template<class _BitmapClass> @@ -296,9 +297,6 @@ public: extern void (*namcos2_kickstart)(running_machine &machine, int internal); -MACHINE_START( namcos2 ); -MACHINE_RESET( namcos2 ); - READ16_HANDLER( namcos2_flap_prot_r ); /**************************************************************/ diff --git a/src/mame/includes/namcos21.h b/src/mame/includes/namcos21.h index fca20db01f2..252b985e0d7 100644 --- a/src/mame/includes/namcos21.h +++ b/src/mame/includes/namcos21.h @@ -152,6 +152,8 @@ public: DECLARE_DRIVER_INIT(solvalou); DECLARE_DRIVER_INIT(cybsled); DECLARE_DRIVER_INIT(aircomb); + DECLARE_MACHINE_START(namcos21); + DECLARE_VIDEO_START(namcos21); }; diff --git a/src/mame/includes/namcos22.h b/src/mame/includes/namcos22.h index cba4ec7d6c0..8b52c66025c 100644 --- a/src/mame/includes/namcos22.h +++ b/src/mame/includes/namcos22.h @@ -250,15 +250,19 @@ public: DECLARE_DRIVER_INIT(ridgeraj); DECLARE_DRIVER_INIT(alpinesa); TILE_GET_INFO_MEMBER(TextTilemapGetInfo); + virtual void machine_reset(); + DECLARE_VIDEO_START(namcos22s); + DECLARE_VIDEO_START(namcos22); + DECLARE_VIDEO_START(common); }; /*----------- defined in video/namcos22.c -----------*/ -VIDEO_START( namcos22 ); + SCREEN_UPDATE_RGB32( namcos22 ); -VIDEO_START( namcos22s ); + SCREEN_UPDATE_RGB32( namcos22s ); void namcos22_draw_direct_poly( running_machine &machine, const UINT16 *pSource ); diff --git a/src/mame/includes/namcos86.h b/src/mame/includes/namcos86.h index ca600df2197..e0445915ced 100644 --- a/src/mame/includes/namcos86.h +++ b/src/mame/includes/namcos86.h @@ -49,13 +49,16 @@ public: TILE_GET_INFO_MEMBER(get_tile_info1); TILE_GET_INFO_MEMBER(get_tile_info2); TILE_GET_INFO_MEMBER(get_tile_info3); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/namcos86.c -----------*/ -PALETTE_INIT( namcos86 ); -VIDEO_START( namcos86 ); + + SCREEN_UPDATE_IND16( namcos86 ); SCREEN_VBLANK( namcos86 ); diff --git a/src/mame/includes/naughtyb.h b/src/mame/includes/naughtyb.h index 3c64a972d34..f079e33db0b 100644 --- a/src/mame/includes/naughtyb.h +++ b/src/mame/includes/naughtyb.h @@ -29,12 +29,14 @@ public: DECLARE_INPUT_CHANGED_MEMBER(coin_inserted); DECLARE_DRIVER_INIT(trvmstr); DECLARE_DRIVER_INIT(popflame); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/naughtyb.c -----------*/ -VIDEO_START( naughtyb ); -PALETTE_INIT( naughtyb ); + + SCREEN_UPDATE_IND16( naughtyb ); diff --git a/src/mame/includes/nbmj8688.h b/src/mame/includes/nbmj8688.h index 624970cb946..ca7b964195e 100644 --- a/src/mame/includes/nbmj8688.h +++ b/src/mame/includes/nbmj8688.h @@ -78,22 +78,31 @@ public: DECLARE_DRIVER_INIT(crystalg); DECLARE_DRIVER_INIT(citylove); DECLARE_DRIVER_INIT(kanatuen); + DECLARE_VIDEO_START(mbmj8688_pure_12bit); + DECLARE_PALETTE_INIT(mbmj8688_12bit); + DECLARE_VIDEO_START(mbmj8688_pure_16bit_LCD); + DECLARE_PALETTE_INIT(mbmj8688_16bit); + DECLARE_VIDEO_START(mbmj8688_8bit); + DECLARE_PALETTE_INIT(mbmj8688_8bit); + DECLARE_VIDEO_START(mbmj8688_hybrid_16bit); + DECLARE_VIDEO_START(mbmj8688_hybrid_12bit); + DECLARE_VIDEO_START(mbmj8688_pure_16bit); }; /*----------- defined in video/nbmj8688.c -----------*/ -PALETTE_INIT( mbmj8688_8bit ); -PALETTE_INIT( mbmj8688_12bit ); -PALETTE_INIT( mbmj8688_16bit ); + + + SCREEN_UPDATE_IND16( mbmj8688 ); SCREEN_UPDATE_IND16( mbmj8688_lcd0 ); SCREEN_UPDATE_IND16( mbmj8688_lcd1 ); -VIDEO_START( mbmj8688_8bit ); -VIDEO_START( mbmj8688_hybrid_12bit ); -VIDEO_START( mbmj8688_pure_12bit ); -VIDEO_START( mbmj8688_hybrid_16bit ); -VIDEO_START( mbmj8688_pure_16bit ); -VIDEO_START( mbmj8688_pure_16bit_LCD ); + + + + + + diff --git a/src/mame/includes/nbmj8891.h b/src/mame/includes/nbmj8891.h index 65bdb1dbc20..765fbd89ec0 100644 --- a/src/mame/includes/nbmj8891.h +++ b/src/mame/includes/nbmj8891.h @@ -71,12 +71,14 @@ public: DECLARE_DRIVER_INIT(lovehous); DECLARE_DRIVER_INIT(club90s); DECLARE_DRIVER_INIT(maiko); + virtual void video_start(); + DECLARE_VIDEO_START(nbmj8891_1layer); }; /*----------- defined in video/nbmj8891.c -----------*/ SCREEN_UPDATE_IND16( nbmj8891 ); -VIDEO_START( nbmj8891_1layer ); -VIDEO_START( nbmj8891_2layer ); + + diff --git a/src/mame/includes/nbmj8900.h b/src/mame/includes/nbmj8900.h index fd403849e0b..7dfe9e09676 100644 --- a/src/mame/includes/nbmj8900.h +++ b/src/mame/includes/nbmj8900.h @@ -43,11 +43,12 @@ public: DECLARE_WRITE8_MEMBER(nbmj8900_romsel_w); DECLARE_DRIVER_INIT(togenkyo); DECLARE_DRIVER_INIT(ohpaipee); + virtual void video_start(); }; /*----------- defined in video/nbmj8900.c -----------*/ SCREEN_UPDATE_IND16( nbmj8900 ); -VIDEO_START( nbmj8900_2layer ); + diff --git a/src/mame/includes/nbmj8991.h b/src/mame/includes/nbmj8991.h index 27f606552cf..fc9d05340c4 100644 --- a/src/mame/includes/nbmj8991.h +++ b/src/mame/includes/nbmj8991.h @@ -49,6 +49,8 @@ public: DECLARE_DRIVER_INIT(mcontest); DECLARE_DRIVER_INIT(finalbny); DECLARE_DRIVER_INIT(qmhayaku); + DECLARE_MACHINE_RESET(nbmj8991); + DECLARE_VIDEO_START(nbmj8991); }; @@ -56,5 +58,5 @@ public: SCREEN_UPDATE_IND16( nbmj8991_type1 ); SCREEN_UPDATE_IND16( nbmj8991_type2 ); -VIDEO_START( nbmj8991 ); + diff --git a/src/mame/includes/nbmj9195.h b/src/mame/includes/nbmj9195.h index 720ab4d915f..8132f04deb1 100644 --- a/src/mame/includes/nbmj9195.h +++ b/src/mame/includes/nbmj9195.h @@ -106,15 +106,19 @@ public: DECLARE_WRITE8_MEMBER(nbmj9195_clut_0_w); DECLARE_WRITE8_MEMBER(nbmj9195_clut_1_w); DECLARE_DRIVER_INIT(nbmj9195); + virtual void machine_reset(); + virtual void video_start(); + DECLARE_VIDEO_START(nbmj9195_1layer); + DECLARE_VIDEO_START(nbmj9195_nb22090); }; /*----------- defined in video/nbmj9195.c -----------*/ SCREEN_UPDATE_IND16( nbmj9195 ); -VIDEO_START( nbmj9195_1layer ); -VIDEO_START( nbmj9195_2layer ); -VIDEO_START( nbmj9195_nb22090 ); + + + diff --git a/src/mame/includes/nemesis.h b/src/mame/includes/nemesis.h index 3600bb3a71a..d99d8c7e58c 100644 --- a/src/mame/includes/nemesis.h +++ b/src/mame/includes/nemesis.h @@ -81,6 +81,9 @@ public: DECLARE_WRITE8_MEMBER(city_sound_bank_w); TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; @@ -88,5 +91,5 @@ public: -VIDEO_START( nemesis ); + SCREEN_UPDATE_IND16( nemesis ); diff --git a/src/mame/includes/neogeo.h b/src/mame/includes/neogeo.h index f8d58fab082..a04537e9f02 100644 --- a/src/mame/includes/neogeo.h +++ b/src/mame/includes/neogeo.h @@ -203,6 +203,10 @@ public: DECLARE_DRIVER_INIT(sbp); DECLARE_DRIVER_INIT(mvs); void mvs_install_protection(device_image_interface& image); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); + virtual void video_reset(); }; @@ -302,8 +306,8 @@ void matrimbl_decrypt(running_machine &machine); /*----------- defined in video/neogeo.c -----------*/ -VIDEO_START( neogeo ); -VIDEO_RESET( neogeo ); + + SCREEN_UPDATE_RGB32( neogeo ); diff --git a/src/mame/includes/news.h b/src/mame/includes/news.h index c0d450e3a25..234753e5dad 100644 --- a/src/mame/includes/news.h +++ b/src/mame/includes/news.h @@ -21,11 +21,14 @@ public: DECLARE_WRITE8_MEMBER(news_bgpic_w); TILE_GET_INFO_MEMBER(get_fg_tile_info); TILE_GET_INFO_MEMBER(get_bg_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; /*----------- defined in video/news.c -----------*/ -VIDEO_START( news ); + SCREEN_UPDATE_IND16( news ); diff --git a/src/mame/includes/ninjakd2.h b/src/mame/includes/ninjakd2.h index 0f6960f77b4..202e4fce064 100644 --- a/src/mame/includes/ninjakd2.h +++ b/src/mame/includes/ninjakd2.h @@ -64,6 +64,14 @@ public: TILE_GET_INFO_MEMBER(robokid_get_bg0_tile_info); TILE_GET_INFO_MEMBER(robokid_get_bg1_tile_info); TILE_GET_INFO_MEMBER(robokid_get_bg2_tile_info); + virtual void machine_reset(); + virtual void video_start(); + DECLARE_VIDEO_START(mnight); + DECLARE_VIDEO_START(arkarea); + DECLARE_MACHINE_RESET(robokid); + DECLARE_VIDEO_START(robokid); + DECLARE_MACHINE_RESET(omegaf); + DECLARE_VIDEO_START(omegaf); }; diff --git a/src/mame/includes/ninjaw.h b/src/mame/includes/ninjaw.h index 423f1c2cd43..9bdc574d5dc 100644 --- a/src/mame/includes/ninjaw.h +++ b/src/mame/includes/ninjaw.h @@ -40,12 +40,15 @@ public: DECLARE_READ16_MEMBER(ninjaw_sound_r); DECLARE_WRITE8_MEMBER(ninjaw_pancontrol); DECLARE_WRITE16_MEMBER(tc0100scn_triple_screen_w); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; /*----------- defined in video/ninjaw.c -----------*/ -VIDEO_START( ninjaw ); + SCREEN_UPDATE_IND16( ninjaw_left ); SCREEN_UPDATE_IND16( ninjaw_middle ); SCREEN_UPDATE_IND16( ninjaw_right ); diff --git a/src/mame/includes/nitedrvr.h b/src/mame/includes/nitedrvr.h index 6a441a85511..e1054f41872 100644 --- a/src/mame/includes/nitedrvr.h +++ b/src/mame/includes/nitedrvr.h @@ -53,6 +53,9 @@ public: DECLARE_WRITE8_MEMBER(nitedrvr_videoram_w); DECLARE_WRITE8_MEMBER(nitedrvr_hvc_w); TILE_GET_INFO_MEMBER(get_bg_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; @@ -61,8 +64,8 @@ public: TIMER_DEVICE_CALLBACK( nitedrvr_crash_toggle_callback ); -MACHINE_RESET( nitedrvr ); -MACHINE_START( nitedrvr ); + + /*----------- defined in audio/nitedrvr.c -----------*/ @@ -73,5 +76,5 @@ DISCRETE_SOUND_EXTERN( nitedrvr ); /*----------- defined in video/nitedrvr.c -----------*/ -VIDEO_START( nitedrvr ); + SCREEN_UPDATE_IND16( nitedrvr ); diff --git a/src/mame/includes/niyanpai.h b/src/mame/includes/niyanpai.h index 919a4d377a1..d2df48f8008 100644 --- a/src/mame/includes/niyanpai.h +++ b/src/mame/includes/niyanpai.h @@ -77,12 +77,14 @@ public: DECLARE_WRITE16_MEMBER(niyanpai_clutsel_2_w); DECLARE_CUSTOM_INPUT_MEMBER(musobana_outcoin_flag_r); DECLARE_DRIVER_INIT(niyanpai); + virtual void machine_reset(); + virtual void video_start(); }; /*----------- defined in video/niyanpai.c -----------*/ SCREEN_UPDATE_IND16( niyanpai ); -VIDEO_START( niyanpai ); + diff --git a/src/mame/includes/nmk16.h b/src/mame/includes/nmk16.h index f07b301f1fd..79ae1d6677b 100644 --- a/src/mame/includes/nmk16.h +++ b/src/mame/includes/nmk16.h @@ -115,6 +115,18 @@ public: TILE_GET_INFO_MEMBER(macross_get_tx_tile_info); TILE_GET_INFO_MEMBER(bjtwin_get_bg_tile_info); TILE_GET_INFO_MEMBER(get_tile_info_0_8bit); + DECLARE_MACHINE_RESET(mustang_sound); + DECLARE_VIDEO_START(macross); + DECLARE_MACHINE_RESET(NMK004); + DECLARE_VIDEO_START(bioship); + DECLARE_VIDEO_START(strahl); + DECLARE_VIDEO_START(gunnail); + DECLARE_VIDEO_START(macross2); + DECLARE_VIDEO_START(raphero); + DECLARE_VIDEO_START(bjtwin); + DECLARE_VIDEO_START(afega); + DECLARE_VIDEO_START(firehawk); + DECLARE_VIDEO_START(grdnstrm); }; @@ -122,13 +134,13 @@ public: -VIDEO_START( macross ); -VIDEO_START( gunnail ); -VIDEO_START( macross2 ); -VIDEO_START( raphero ); -VIDEO_START( bjtwin ); -VIDEO_START( bioship ); -VIDEO_START( strahl ); + + + + + + + SCREEN_UPDATE_IND16( macross ); SCREEN_UPDATE_IND16( manybloc ); SCREEN_UPDATE_IND16( tharrier ); @@ -140,9 +152,9 @@ SCREEN_UPDATE_IND16( bjtwin ); SCREEN_VBLANK( nmk ); SCREEN_VBLANK( strahl ); -VIDEO_START( afega ); -VIDEO_START( grdnstrm ); -VIDEO_START( firehawk ); + + + SCREEN_UPDATE_IND16( afega ); SCREEN_UPDATE_IND16( redhawkb ); SCREEN_UPDATE_IND16(redhawki ); diff --git a/src/mame/includes/norautp.h b/src/mame/includes/norautp.h index 8e30ae1598f..bebc4616313 100644 --- a/src/mame/includes/norautp.h +++ b/src/mame/includes/norautp.h @@ -25,6 +25,8 @@ public: DECLARE_DRIVER_INIT(ssa); DECLARE_DRIVER_INIT(enc); DECLARE_DRIVER_INIT(deb); + virtual void video_start(); + virtual void palette_init(); }; diff --git a/src/mame/includes/nova2001.h b/src/mame/includes/nova2001.h index 5e1d2c52b5d..2ef3c84b52e 100644 --- a/src/mame/includes/nova2001.h +++ b/src/mame/includes/nova2001.h @@ -34,6 +34,12 @@ public: TILE_GET_INFO_MEMBER(pkunwar_get_bg_tile_info); TILE_GET_INFO_MEMBER(raiders5_get_bg_tile_info); TILE_GET_INFO_MEMBER(raiders5_get_fg_tile_info); + DECLARE_VIDEO_START(nova2001); + DECLARE_PALETTE_INIT(nova2001); + DECLARE_MACHINE_START(ninjakun); + DECLARE_VIDEO_START(ninjakun); + DECLARE_VIDEO_START(pkunwar); + DECLARE_VIDEO_START(raiders5); }; diff --git a/src/mame/includes/nycaptor.h b/src/mame/includes/nycaptor.h index d92a9f937ce..8327792f3d9 100644 --- a/src/mame/includes/nycaptor.h +++ b/src/mame/includes/nycaptor.h @@ -99,6 +99,10 @@ public: DECLARE_DRIVER_INIT(bronx); DECLARE_DRIVER_INIT(nycaptor); TILE_GET_INFO_MEMBER(get_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); + DECLARE_MACHINE_RESET(ta7630); }; @@ -111,5 +115,5 @@ public: -VIDEO_START( nycaptor ); + SCREEN_UPDATE_IND16( nycaptor ); diff --git a/src/mame/includes/offtwall.h b/src/mame/includes/offtwall.h index 03d6de4b6af..0770c479ac9 100644 --- a/src/mame/includes/offtwall.h +++ b/src/mame/includes/offtwall.h @@ -30,10 +30,13 @@ public: DECLARE_DRIVER_INIT(offtwall); DECLARE_DRIVER_INIT(offtwalc); TILE_GET_INFO_MEMBER(get_playfield_tile_info); + DECLARE_MACHINE_START(offtwall); + DECLARE_MACHINE_RESET(offtwall); + DECLARE_VIDEO_START(offtwall); }; /*----------- defined in video/offtwall.c -----------*/ -VIDEO_START( offtwall ); + SCREEN_UPDATE_IND16( offtwall ); diff --git a/src/mame/includes/ohmygod.h b/src/mame/includes/ohmygod.h index 37bf4978b44..9c1341c97c0 100644 --- a/src/mame/includes/ohmygod.h +++ b/src/mame/includes/ohmygod.h @@ -34,11 +34,14 @@ public: DECLARE_DRIVER_INIT(ohmygod); DECLARE_DRIVER_INIT(naname); TILE_GET_INFO_MEMBER(get_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; /*----------- defined in video/ohmygod.c -----------*/ -VIDEO_START( ohmygod ); + SCREEN_UPDATE_IND16( ohmygod ); diff --git a/src/mame/includes/ojankohs.h b/src/mame/includes/ojankohs.h index fce069022db..80e3da148a6 100644 --- a/src/mame/includes/ojankohs.h +++ b/src/mame/includes/ojankohs.h @@ -61,17 +61,26 @@ public: DECLARE_READ8_MEMBER(ojankohs_ay8910_1_r); TILE_GET_INFO_MEMBER(ojankohs_get_tile_info); TILE_GET_INFO_MEMBER(ojankoy_get_tile_info); + virtual void machine_reset(); + DECLARE_MACHINE_START(ojankohs); + DECLARE_VIDEO_START(ojankohs); + DECLARE_MACHINE_START(ojankoy); + DECLARE_VIDEO_START(ojankoy); + DECLARE_PALETTE_INIT(ojankoy); + DECLARE_MACHINE_START(ojankoc); + DECLARE_VIDEO_START(ojankoc); + DECLARE_MACHINE_START(common); }; /*----------- defined in video/ojankohs.c -----------*/ -PALETTE_INIT( ojankoy ); -VIDEO_START( ojankohs ); -VIDEO_START( ojankoy ); -VIDEO_START( ojankoc ); + + + + SCREEN_UPDATE_IND16( ojankohs ); SCREEN_UPDATE_IND16( ojankoc ); diff --git a/src/mame/includes/oneshot.h b/src/mame/includes/oneshot.h index 63f331d21a5..70e4004147b 100644 --- a/src/mame/includes/oneshot.h +++ b/src/mame/includes/oneshot.h @@ -46,11 +46,14 @@ public: TILE_GET_INFO_MEMBER(get_oneshot_bg_tile_info); TILE_GET_INFO_MEMBER(get_oneshot_mid_tile_info); TILE_GET_INFO_MEMBER(get_oneshot_fg_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; /*----------- defined in video/oneshot.c -----------*/ -VIDEO_START( oneshot ); + SCREEN_UPDATE_IND16( oneshot ); SCREEN_UPDATE_IND16( maddonna ); diff --git a/src/mame/includes/opwolf.h b/src/mame/includes/opwolf.h index 769ab092088..7e55ecf67cf 100644 --- a/src/mame/includes/opwolf.h +++ b/src/mame/includes/opwolf.h @@ -70,6 +70,8 @@ public: DECLARE_WRITE8_MEMBER(opwolf_adpcm_c_w); DECLARE_DRIVER_INIT(opwolf); DECLARE_DRIVER_INIT(opwolfb); + virtual void machine_start(); + DECLARE_MACHINE_RESET(opwolf); }; diff --git a/src/mame/includes/orbit.h b/src/mame/includes/orbit.h index ffd4abaede4..c6c0dc5365c 100644 --- a/src/mame/includes/orbit.h +++ b/src/mame/includes/orbit.h @@ -40,6 +40,9 @@ public: DECLARE_WRITE8_MEMBER(orbit_misc_w); DECLARE_WRITE8_MEMBER(orbit_playfield_w); TILE_GET_INFO_MEMBER(get_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; @@ -54,6 +57,6 @@ DISCRETE_SOUND_EXTERN( orbit ); /*----------- defined in video/orbit.c -----------*/ -VIDEO_START( orbit ); + SCREEN_UPDATE_IND16( orbit ); diff --git a/src/mame/includes/othldrby.h b/src/mame/includes/othldrby.h index 8b8179fede5..bdbdefd3ee7 100644 --- a/src/mame/includes/othldrby.h +++ b/src/mame/includes/othldrby.h @@ -38,12 +38,15 @@ public: TILE_GET_INFO_MEMBER(get_tile_info0); TILE_GET_INFO_MEMBER(get_tile_info1); TILE_GET_INFO_MEMBER(get_tile_info2); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; /*----------- defined in video/othldrby.c -----------*/ -VIDEO_START( othldrby ); + SCREEN_VBLANK( othldrby ); SCREEN_UPDATE_IND16( othldrby ); diff --git a/src/mame/includes/othunder.h b/src/mame/includes/othunder.h index 02f2eddba84..717dc6e8269 100644 --- a/src/mame/includes/othunder.h +++ b/src/mame/includes/othunder.h @@ -59,10 +59,13 @@ public: DECLARE_WRITE16_MEMBER(othunder_sound_w); DECLARE_READ16_MEMBER(othunder_sound_r); DECLARE_WRITE8_MEMBER(othunder_TC0310FAM_w); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; /*----------- defined in video/othunder.c -----------*/ -VIDEO_START( othunder ); + SCREEN_UPDATE_IND16( othunder ); diff --git a/src/mame/includes/overdriv.h b/src/mame/includes/overdriv.h index 9bd37de01c3..ef28ac6c9bf 100644 --- a/src/mame/includes/overdriv.h +++ b/src/mame/includes/overdriv.h @@ -40,6 +40,8 @@ public: DECLARE_WRITE16_MEMBER(overdriv_cpuB_irq6_w); DECLARE_READ8_MEMBER(overdriv_1_sound_r); DECLARE_READ8_MEMBER(overdriv_2_sound_r); + virtual void machine_start(); + virtual void machine_reset(); }; /*----------- defined in video/overdriv.c -----------*/ diff --git a/src/mame/includes/pacland.h b/src/mame/includes/pacland.h index 8339f726a8e..20f7fef81c9 100644 --- a/src/mame/includes/pacland.h +++ b/src/mame/includes/pacland.h @@ -35,12 +35,14 @@ public: DECLARE_WRITE8_MEMBER(pacland_bankswitch_w); TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/pacland.c -----------*/ -PALETTE_INIT( pacland ); -VIDEO_START( pacland ); + + SCREEN_UPDATE_IND16( pacland ); diff --git a/src/mame/includes/pacman.h b/src/mame/includes/pacman.h index 0ecc08c03a4..a84a5560d26 100644 --- a/src/mame/includes/pacman.h +++ b/src/mame/includes/pacman.h @@ -122,23 +122,35 @@ public: TILE_GET_INFO_MEMBER(s2650_get_tile_info); TILEMAP_MAPPER_MEMBER(jrpacman_scan_rows); TILE_GET_INFO_MEMBER(jrpacman_get_tile_info); + DECLARE_VIDEO_START(pacman); + DECLARE_PALETTE_INIT(pacman); + DECLARE_VIDEO_START(birdiy); + DECLARE_MACHINE_START(theglobp); + DECLARE_MACHINE_RESET(theglobp); + DECLARE_MACHINE_START(acitya); + DECLARE_MACHINE_RESET(acitya); + DECLARE_VIDEO_START(s2650games); + DECLARE_MACHINE_RESET(mschamp); + DECLARE_MACHINE_RESET(superabc); + DECLARE_VIDEO_START(pengo); + DECLARE_VIDEO_START(jrpacman); }; /*----------- defined in video/pacman.c -----------*/ -PALETTE_INIT( pacman ); -VIDEO_START( pacman ); + + SCREEN_UPDATE_IND16( pacman ); -VIDEO_START( pengo ); -VIDEO_START( s2650games ); + + SCREEN_UPDATE_IND16( s2650games ); -VIDEO_START( jrpacman ); -VIDEO_START( birdiy ); + + /*----------- defined in machine/pacplus.c -----------*/ @@ -153,13 +165,13 @@ void jumpshot_decode(running_machine &machine); /*----------- defined in machine/theglobp.c -----------*/ -MACHINE_START( theglobp ); -MACHINE_RESET( theglobp ); + + READ8_HANDLER( theglobp_decrypt_rom ); /*----------- defined in machine/acitya.c -------------*/ -MACHINE_START( acitya ); -MACHINE_RESET( acitya ); + + READ8_HANDLER( acitya_decrypt_rom ); diff --git a/src/mame/includes/pandoras.h b/src/mame/includes/pandoras.h index 74edfe0f84d..080e1383b3f 100644 --- a/src/mame/includes/pandoras.h +++ b/src/mame/includes/pandoras.h @@ -46,14 +46,18 @@ public: DECLARE_READ8_MEMBER(pandoras_portA_r); DECLARE_READ8_MEMBER(pandoras_portB_r); TILE_GET_INFO_MEMBER(get_tile_info0); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/pandoras.c -----------*/ -PALETTE_INIT( pandoras ); -VIDEO_START( pandoras ); + + SCREEN_UPDATE_IND16( pandoras ); diff --git a/src/mame/includes/paradise.h b/src/mame/includes/paradise.h index 3e504a01bcd..25c4b75b45c 100644 --- a/src/mame/includes/paradise.h +++ b/src/mame/includes/paradise.h @@ -48,6 +48,9 @@ public: TILE_GET_INFO_MEMBER(get_tile_info_0); TILE_GET_INFO_MEMBER(get_tile_info_1); TILE_GET_INFO_MEMBER(get_tile_info_2); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; /*----------- defined in video/paradise.c -----------*/ @@ -55,7 +58,7 @@ public: -VIDEO_START( paradise ); + SCREEN_UPDATE_IND16( paradise ); SCREEN_UPDATE_IND16( torus ); diff --git a/src/mame/includes/parodius.h b/src/mame/includes/parodius.h index 040e7832648..eab4542bf7c 100644 --- a/src/mame/includes/parodius.h +++ b/src/mame/includes/parodius.h @@ -40,6 +40,8 @@ public: DECLARE_WRITE8_MEMBER(parodius_sh_irqtrigger_w); DECLARE_WRITE8_MEMBER(sound_arm_nmi_w); DECLARE_READ8_MEMBER(parodius_sound_r); + virtual void machine_start(); + virtual void machine_reset(); }; /*----------- defined in video/parodius.c -----------*/ diff --git a/src/mame/includes/pass.h b/src/mame/includes/pass.h index 92090b39411..2c6ed102c2a 100644 --- a/src/mame/includes/pass.h +++ b/src/mame/includes/pass.h @@ -15,11 +15,12 @@ public: DECLARE_WRITE16_MEMBER(pass_fg_videoram_w); TILE_GET_INFO_MEMBER(get_pass_bg_tile_info); TILE_GET_INFO_MEMBER(get_pass_fg_tile_info); + virtual void video_start(); }; /*----------- defined in video/pass.c -----------*/ -VIDEO_START( pass ); + SCREEN_UPDATE_IND16( pass ); diff --git a/src/mame/includes/pastelg.h b/src/mame/includes/pastelg.h index 1a3fe88a6b0..b447f2d8afc 100644 --- a/src/mame/includes/pastelg.h +++ b/src/mame/includes/pastelg.h @@ -32,14 +32,16 @@ public: DECLARE_WRITE8_MEMBER(pastelg_romsel_w); DECLARE_CUSTOM_INPUT_MEMBER(nb1413m3_hackbusyflag_r); DECLARE_DRIVER_INIT(pastelg); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/pastelg.c -----------*/ -PALETTE_INIT( pastelg ); + SCREEN_UPDATE_IND16( pastelg ); -VIDEO_START( pastelg ); + int pastelg_blitter_src_addr_r(address_space *space); diff --git a/src/mame/includes/pbaction.h b/src/mame/includes/pbaction.h index bbd513ac6bd..ed769309ecf 100644 --- a/src/mame/includes/pbaction.h +++ b/src/mame/includes/pbaction.h @@ -48,6 +48,9 @@ public: DECLARE_DRIVER_INIT(pbactio4); TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; diff --git a/src/mame/includes/pcktgal.h b/src/mame/includes/pcktgal.h index 697c980c242..0482b9d3fb7 100644 --- a/src/mame/includes/pcktgal.h +++ b/src/mame/includes/pcktgal.h @@ -16,12 +16,13 @@ public: DECLARE_DRIVER_INIT(pcktgal); DECLARE_DRIVER_INIT(deco222); DECLARE_DRIVER_INIT(graphics); + virtual void palette_init(); }; /*----------- defined in video/pcktgal.c -----------*/ -PALETTE_INIT( pcktgal ); + SCREEN_UPDATE_IND16( pcktgal ); SCREEN_UPDATE_IND16( pcktgalb ); diff --git a/src/mame/includes/pgm.h b/src/mame/includes/pgm.h index 045640a0be1..dc0dab72abb 100644 --- a/src/mame/includes/pgm.h +++ b/src/mame/includes/pgm.h @@ -111,6 +111,9 @@ public: DECLARE_DRIVER_INIT(pstar); TILE_GET_INFO_MEMBER(get_pgm_tx_tilemap_tile_info); TILE_GET_INFO_MEMBER(get_pgm_bg_tilemap_tile_info); + DECLARE_VIDEO_START(pgm); + DECLARE_MACHINE_START(pgm); + DECLARE_MACHINE_RESET(pgm); }; @@ -198,6 +201,7 @@ public: DECLARE_DRIVER_INIT(kov); DECLARE_DRIVER_INIT(kovboot); DECLARE_DRIVER_INIT(oldsplus); + DECLARE_MACHINE_START(pgm_arm_type1); }; /* for machine/pgmprot2.c type games */ @@ -225,6 +229,7 @@ public: DECLARE_DRIVER_INIT(ddp2); DECLARE_DRIVER_INIT(dw2001); DECLARE_DRIVER_INIT(dwpc); + DECLARE_MACHINE_START(pgm_arm_type2); }; @@ -254,6 +259,7 @@ public: DECLARE_DRIVER_INIT(killbldp); DECLARE_DRIVER_INIT(dmnfrnt); DECLARE_DRIVER_INIT(happy6); + DECLARE_MACHINE_START(pgm_arm_type3); }; @@ -275,6 +281,8 @@ public: DECLARE_DRIVER_INIT(killbld); DECLARE_DRIVER_INIT(drgw3); + DECLARE_MACHINE_RESET(killbld); + DECLARE_MACHINE_RESET(dw3); }; /* for machine/pgmprot6.c type games */ @@ -295,6 +303,7 @@ public: required_shared_ptr<UINT16> m_sharedprotram; DECLARE_DRIVER_INIT(olds); + DECLARE_MACHINE_RESET(olds); }; @@ -321,8 +330,8 @@ ADDRESS_MAP_EXTERN( pgm_mem, 16 ); ADDRESS_MAP_EXTERN( pgm_basic_mem, 16 ); ADDRESS_MAP_EXTERN( pgm_base_mem, 16 ); -MACHINE_START( pgm ); -MACHINE_RESET( pgm ); + + /*----------- defined in machine/pgmcrypt.c -----------*/ @@ -419,6 +428,6 @@ INPUT_PORTS_EXTERN( olds ); /*----------- defined in video/pgm.c -----------*/ -VIDEO_START( pgm ); + SCREEN_VBLANK( pgm ); SCREEN_UPDATE_IND16( pgm ); diff --git a/src/mame/includes/phoenix.h b/src/mame/includes/phoenix.h index d84c76267bc..ab96fc49ac0 100644 --- a/src/mame/includes/phoenix.h +++ b/src/mame/includes/phoenix.h @@ -30,6 +30,11 @@ public: DECLARE_DRIVER_INIT(condor); TILE_GET_INFO_MEMBER(get_fg_tile_info); TILE_GET_INFO_MEMBER(get_bg_tile_info); + DECLARE_MACHINE_RESET(phoenix); + DECLARE_VIDEO_START(phoenix); + DECLARE_PALETTE_INIT(phoenix); + DECLARE_PALETTE_INIT(survival); + DECLARE_PALETTE_INIT(pleiads); }; @@ -80,10 +85,10 @@ extern const device_type PHOENIX; /*----------- defined in video/phoenix.c -----------*/ -PALETTE_INIT( phoenix ); -PALETTE_INIT( survival ); -PALETTE_INIT( pleiads ); -VIDEO_START( phoenix ); + + + + SCREEN_UPDATE_IND16( phoenix ); diff --git a/src/mame/includes/pingpong.h b/src/mame/includes/pingpong.h index a03f5fea454..02733b7c414 100644 --- a/src/mame/includes/pingpong.h +++ b/src/mame/includes/pingpong.h @@ -24,12 +24,14 @@ public: DECLARE_DRIVER_INIT(cashquiz); DECLARE_DRIVER_INIT(merlinmm); TILE_GET_INFO_MEMBER(get_bg_tile_info); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/pingpong.c -----------*/ -PALETTE_INIT( pingpong ); -VIDEO_START( pingpong ); + + SCREEN_UPDATE_IND16( pingpong ); diff --git a/src/mame/includes/pirates.h b/src/mame/includes/pirates.h index 73c13252730..c938b3d581e 100644 --- a/src/mame/includes/pirates.h +++ b/src/mame/includes/pirates.h @@ -28,11 +28,12 @@ public: TILE_GET_INFO_MEMBER(get_tx_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); TILE_GET_INFO_MEMBER(get_bg_tile_info); + virtual void video_start(); }; /*----------- defined in video/pirates.c -----------*/ -VIDEO_START( pirates ); + SCREEN_UPDATE_IND16( pirates ); diff --git a/src/mame/includes/pitnrun.h b/src/mame/includes/pitnrun.h index 8bfcf5939f8..3996bdbba42 100644 --- a/src/mame/includes/pitnrun.h +++ b/src/mame/includes/pitnrun.h @@ -48,6 +48,9 @@ public: DECLARE_WRITE8_MEMBER(pitnrun_color_select_w); TILE_GET_INFO_MEMBER(get_tile_info1); TILE_GET_INFO_MEMBER(get_tile_info2); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); }; @@ -55,13 +58,13 @@ public: -MACHINE_RESET( pitnrun ); + /*----------- defined in video/pitnrun.c -----------*/ -PALETTE_INIT(pitnrun); -VIDEO_START(pitnrun); + + SCREEN_UPDATE_IND16(pitnrun); diff --git a/src/mame/includes/pktgaldx.h b/src/mame/includes/pktgaldx.h index d4bb1bc3ba1..b463e8e54dc 100644 --- a/src/mame/includes/pktgaldx.h +++ b/src/mame/includes/pktgaldx.h @@ -31,6 +31,7 @@ public: DECLARE_READ16_MEMBER(pckgaldx_protection_r); DECLARE_WRITE16_MEMBER(pktgaldx_oki_bank_w); DECLARE_DRIVER_INIT(pktgaldx); + virtual void machine_start(); }; diff --git a/src/mame/includes/playch10.h b/src/mame/includes/playch10.h index 588b9e6545a..350556ff19b 100644 --- a/src/mame/includes/playch10.h +++ b/src/mame/includes/playch10.h @@ -108,14 +108,20 @@ public: DECLARE_DRIVER_INIT(pciboard); DECLARE_DRIVER_INIT(pcaboard); TILE_GET_INFO_MEMBER(get_bg_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); + DECLARE_MACHINE_START(playch10_hboard); + DECLARE_VIDEO_START(playch10_hboard); }; /*----------- defined in machine/playch10.c -----------*/ -MACHINE_RESET( pc10 ); -MACHINE_START( pc10 ); -MACHINE_START( playch10_hboard ); + + + @@ -124,8 +130,8 @@ MACHINE_START( playch10_hboard ); extern const ppu2c0x_interface playch10_ppu_interface; extern const ppu2c0x_interface playch10_ppu_interface_hboard; -PALETTE_INIT( playch10 ); -VIDEO_START( playch10 ); -VIDEO_START( playch10_hboard ); + + + SCREEN_UPDATE_IND16( playch10_top ); SCREEN_UPDATE_IND16( playch10_bottom ); diff --git a/src/mame/includes/playmark.h b/src/mame/includes/playmark.h index e885d3fff89..bce16c9475e 100644 --- a/src/mame/includes/playmark.h +++ b/src/mame/includes/playmark.h @@ -88,17 +88,28 @@ public: TILE_GET_INFO_MEMBER(hrdtimes_get_fg_tile_info); TILE_GET_INFO_MEMBER(hrdtimes_get_bg_tile_info); TILE_GET_INFO_MEMBER(powerbal_get_bg_tile_info); + DECLARE_MACHINE_START(playmark); + DECLARE_MACHINE_RESET(playmark); + DECLARE_VIDEO_START(bigtwin); + DECLARE_VIDEO_START(bigtwinb); + DECLARE_VIDEO_START(wbeachvl); + DECLARE_VIDEO_START(excelsr); + DECLARE_VIDEO_START(hotmind); + DECLARE_VIDEO_START(hrdtimes); + DECLARE_MACHINE_START(powerbal); + DECLARE_MACHINE_RESET(powerbal); + DECLARE_VIDEO_START(powerbal); }; /*----------- defined in video/playmark.c -----------*/ -VIDEO_START( bigtwin ); -VIDEO_START( bigtwinb ); -VIDEO_START( wbeachvl ); -VIDEO_START( excelsr ); -VIDEO_START( hotmind ); -VIDEO_START( hrdtimes ); + + + + + + SCREEN_UPDATE_IND16( bigtwin ); SCREEN_UPDATE_IND16( bigtwinb ); diff --git a/src/mame/includes/plygonet.h b/src/mame/includes/plygonet.h index 65deff9de1d..85eb60468dd 100644 --- a/src/mame/includes/plygonet.h +++ b/src/mame/includes/plygonet.h @@ -70,10 +70,12 @@ public: TILE_GET_INFO_MEMBER(roz_get_tile_info); TILEMAP_MAPPER_MEMBER(plygonet_scan); TILEMAP_MAPPER_MEMBER(plygonet_scan_cols); + virtual void machine_start(); + virtual void video_start(); }; /*----------- defined in video/plygonet.c -----------*/ -VIDEO_START( polygonet ); + SCREEN_UPDATE_IND16( polygonet ); diff --git a/src/mame/includes/pokechmp.h b/src/mame/includes/pokechmp.h index 426aaaa4f7f..5fbf747cec6 100644 --- a/src/mame/includes/pokechmp.h +++ b/src/mame/includes/pokechmp.h @@ -16,11 +16,12 @@ public: DECLARE_WRITE8_MEMBER(pokechmp_flipscreen_w); DECLARE_DRIVER_INIT(pokechmp); TILE_GET_INFO_MEMBER(get_bg_tile_info); + virtual void video_start(); }; /*----------- defined in video/pokechmp.c -----------*/ -VIDEO_START( pokechmp ); + SCREEN_UPDATE_IND16( pokechmp ); diff --git a/src/mame/includes/polepos.h b/src/mame/includes/polepos.h index 4400bd715ef..53f6b4fb97a 100644 --- a/src/mame/includes/polepos.h +++ b/src/mame/includes/polepos.h @@ -76,6 +76,9 @@ public: DECLARE_DRIVER_INIT(polepos2); TILE_GET_INFO_MEMBER(bg_get_tile_info); TILE_GET_INFO_MEMBER(tx_get_tile_info); + DECLARE_MACHINE_RESET(polepos); + DECLARE_VIDEO_START(polepos); + DECLARE_PALETTE_INIT(polepos); }; @@ -114,8 +117,8 @@ DISCRETE_SOUND_EXTERN( polepos ); /*----------- defined in video/polepos.c -----------*/ -VIDEO_START( polepos ); -PALETTE_INIT( polepos ); + + SCREEN_UPDATE_IND16( polepos ); diff --git a/src/mame/includes/policetr.h b/src/mame/includes/policetr.h index a4cb1f778a3..93daebe8a3d 100644 --- a/src/mame/includes/policetr.h +++ b/src/mame/includes/policetr.h @@ -45,6 +45,7 @@ public: DECLARE_DRIVER_INIT(policetr); DECLARE_DRIVER_INIT(sshooter); DECLARE_DRIVER_INIT(plctr13b); + virtual void video_start(); }; @@ -52,5 +53,5 @@ public: -VIDEO_START( policetr ); + SCREEN_UPDATE_IND16( policetr ); diff --git a/src/mame/includes/polyplay.h b/src/mame/includes/polyplay.h index 4c78ad7e947..d8e303e9c47 100644 --- a/src/mame/includes/polyplay.h +++ b/src/mame/includes/polyplay.h @@ -29,6 +29,9 @@ public: DECLARE_WRITE8_MEMBER(polyplay_start_timer2); DECLARE_READ8_MEMBER(polyplay_random_read); DECLARE_WRITE8_MEMBER(polyplay_characterram_w); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); }; @@ -43,6 +46,6 @@ SAMPLES_START( polyplay_sh_start ); /*----------- defined in video/polyplay.c -----------*/ -PALETTE_INIT( polyplay ); -VIDEO_START( polyplay ); + + SCREEN_UPDATE_IND16( polyplay ); diff --git a/src/mame/includes/poolshrk.h b/src/mame/includes/poolshrk.h index af83d1bbcd8..cbd5a6c3a5c 100644 --- a/src/mame/includes/poolshrk.h +++ b/src/mame/includes/poolshrk.h @@ -29,6 +29,8 @@ public: DECLARE_READ8_MEMBER(poolshrk_irq_reset_r); DECLARE_DRIVER_INIT(poolshrk); TILE_GET_INFO_MEMBER(get_tile_info); + virtual void video_start(); + virtual void palette_init(); }; @@ -44,6 +46,6 @@ DISCRETE_SOUND_EXTERN( poolshrk ); /*----------- defined in video/poolshrk.c -----------*/ -VIDEO_START( poolshrk ); + SCREEN_UPDATE_IND16( poolshrk ); diff --git a/src/mame/includes/pooyan.h b/src/mame/includes/pooyan.h index 995eed7bf37..62c7edd0bc9 100644 --- a/src/mame/includes/pooyan.h +++ b/src/mame/includes/pooyan.h @@ -28,12 +28,16 @@ public: DECLARE_WRITE8_MEMBER(pooyan_colorram_w); DECLARE_WRITE8_MEMBER(pooyan_flipscreen_w); TILE_GET_INFO_MEMBER(get_bg_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/pooyan.c -----------*/ -PALETTE_INIT( pooyan ); -VIDEO_START( pooyan ); + + SCREEN_UPDATE_IND16( pooyan ); diff --git a/src/mame/includes/popeye.h b/src/mame/includes/popeye.h index 0fe2513117f..4a7d5be62ce 100644 --- a/src/mame/includes/popeye.h +++ b/src/mame/includes/popeye.h @@ -36,14 +36,18 @@ public: DECLARE_DRIVER_INIT(skyskipr); DECLARE_DRIVER_INIT(popeye); TILE_GET_INFO_MEMBER(get_fg_tile_info); + virtual void video_start(); + virtual void palette_init(); + DECLARE_VIDEO_START(popeye); + DECLARE_PALETTE_INIT(popeyebl); }; /*----------- defined in video/popeye.c -----------*/ -PALETTE_INIT( popeye ); -PALETTE_INIT( popeyebl ); -VIDEO_START( skyskipr ); -VIDEO_START( popeye ); + + + + SCREEN_UPDATE_IND16( popeye ); diff --git a/src/mame/includes/popper.h b/src/mame/includes/popper.h index 4397d0cb50a..08c888d5231 100644 --- a/src/mame/includes/popper.h +++ b/src/mame/includes/popper.h @@ -50,13 +50,17 @@ public: TILE_GET_INFO_MEMBER(get_popper_p0_tile_info); TILE_GET_INFO_MEMBER(get_popper_ol_p123_tile_info); TILE_GET_INFO_MEMBER(get_popper_ol_p0_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/popper.c -----------*/ -PALETTE_INIT( popper ); -VIDEO_START( popper ); + + SCREEN_UPDATE_IND16( popper ); diff --git a/src/mame/includes/portrait.h b/src/mame/includes/portrait.h index 7b4290c8f5f..0e9612dc006 100644 --- a/src/mame/includes/portrait.h +++ b/src/mame/includes/portrait.h @@ -20,11 +20,13 @@ public: DECLARE_WRITE8_MEMBER(portrait_fgvideo_write); TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/portrait.c -----------*/ -PALETTE_INIT( portrait ); -VIDEO_START( portrait ); + + SCREEN_UPDATE_IND16( portrait ); diff --git a/src/mame/includes/powerins.h b/src/mame/includes/powerins.h index 1baa033b54e..8b7efe035d3 100644 --- a/src/mame/includes/powerins.h +++ b/src/mame/includes/powerins.h @@ -28,6 +28,8 @@ public: TILE_GET_INFO_MEMBER(get_tile_info_0); TILEMAP_MAPPER_MEMBER(powerins_get_memory_offset_0); TILE_GET_INFO_MEMBER(get_tile_info_1); + virtual void machine_reset(); + virtual void video_start(); }; @@ -36,5 +38,5 @@ public: -VIDEO_START( powerins ); + SCREEN_UPDATE_IND16( powerins ); diff --git a/src/mame/includes/prehisle.h b/src/mame/includes/prehisle.h index 8b21489ed1e..841ef34ccb6 100644 --- a/src/mame/includes/prehisle.h +++ b/src/mame/includes/prehisle.h @@ -26,11 +26,12 @@ public: TILE_GET_INFO_MEMBER(get_bg2_tile_info); TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); + virtual void video_start(); }; /*----------- defined in video/prehisle.c -----------*/ -VIDEO_START( prehisle ); + SCREEN_UPDATE_IND16( prehisle ); diff --git a/src/mame/includes/psikyo.h b/src/mame/includes/psikyo.h index e3de8741d19..47894006c24 100644 --- a/src/mame/includes/psikyo.h +++ b/src/mame/includes/psikyo.h @@ -85,6 +85,10 @@ public: DECLARE_DRIVER_INIT(gunbird); TILE_GET_INFO_MEMBER(get_tile_info_0); TILE_GET_INFO_MEMBER(get_tile_info_1); + virtual void machine_start(); + virtual void machine_reset(); + DECLARE_VIDEO_START(sngkace); + DECLARE_VIDEO_START(psikyo); }; @@ -93,8 +97,8 @@ public: void psikyo_switch_banks(running_machine &machine, int tmap, int bank); -VIDEO_START( sngkace ); -VIDEO_START( psikyo ); + + SCREEN_UPDATE_IND16( psikyo ); SCREEN_UPDATE_IND16( psikyo_bootleg ); SCREEN_VBLANK( psikyo ); diff --git a/src/mame/includes/psikyo4.h b/src/mame/includes/psikyo4.h index 98d4a5e8dfb..3600465fe0c 100644 --- a/src/mame/includes/psikyo4.h +++ b/src/mame/includes/psikyo4.h @@ -47,11 +47,14 @@ public: DECLARE_WRITE32_MEMBER(ps4_eeprom_w); DECLARE_READ32_MEMBER(ps4_eeprom_r); DECLARE_DRIVER_INIT(hotgmck); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; /*----------- defined in video/psikyo4.c -----------*/ -VIDEO_START( psikyo4 ); + SCREEN_UPDATE_IND16( psikyo4_left ); SCREEN_UPDATE_IND16( psikyo4_right ); diff --git a/src/mame/includes/psikyosh.h b/src/mame/includes/psikyosh.h index 516fd721fe9..da9a5e7437e 100644 --- a/src/mame/includes/psikyosh.h +++ b/src/mame/includes/psikyosh.h @@ -63,10 +63,12 @@ public: DECLARE_DRIVER_INIT(dragnblz); DECLARE_DRIVER_INIT(gunbird2); DECLARE_DRIVER_INIT(s1945ii); + virtual void machine_start(); + virtual void video_start(); }; /*----------- defined in video/psikyosh.c -----------*/ -VIDEO_START( psikyosh ); + SCREEN_UPDATE_RGB32( psikyosh ); SCREEN_VBLANK( psikyosh ); diff --git a/src/mame/includes/psychic5.h b/src/mame/includes/psychic5.h index 575c72e443d..8ab2988b2b9 100644 --- a/src/mame/includes/psychic5.h +++ b/src/mame/includes/psychic5.h @@ -40,6 +40,11 @@ public: DECLARE_WRITE8_MEMBER(bombsa_unknown_w); TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); + virtual void machine_reset(); + DECLARE_VIDEO_START(psychic5); + DECLARE_VIDEO_RESET(psychic5); + DECLARE_VIDEO_START(bombsa); + DECLARE_VIDEO_RESET(bombsa); }; @@ -47,11 +52,11 @@ public: -VIDEO_START( psychic5 ); -VIDEO_RESET( psychic5 ); + + SCREEN_UPDATE_RGB32( psychic5 ); -VIDEO_START( bombsa ); -VIDEO_RESET( bombsa ); + + SCREEN_UPDATE_RGB32( bombsa ); diff --git a/src/mame/includes/punchout.h b/src/mame/includes/punchout.h index 8941aeab1aa..3d7c378f08a 100644 --- a/src/mame/includes/punchout.h +++ b/src/mame/includes/punchout.h @@ -60,14 +60,17 @@ public: TILE_GET_INFO_MEMBER(armwrest_fg_get_info); TILEMAP_MAPPER_MEMBER(armwrest_bs1_scan); TILEMAP_MAPPER_MEMBER(armwrest_bs1_scan_flipx); + virtual void machine_reset(); + virtual void video_start(); + DECLARE_VIDEO_START(armwrest); }; /*----------- defined in video/punchout.c -----------*/ -VIDEO_START( punchout ); -VIDEO_START( armwrest ); + + SCREEN_UPDATE_IND16( punchout_top ); SCREEN_UPDATE_IND16( punchout_bottom ); SCREEN_UPDATE_IND16( armwrest_top ); diff --git a/src/mame/includes/pushman.h b/src/mame/includes/pushman.h index 9e52f65e1a7..f65f5bf4ec6 100644 --- a/src/mame/includes/pushman.h +++ b/src/mame/includes/pushman.h @@ -44,12 +44,16 @@ public: TILEMAP_MAPPER_MEMBER(background_scan_rows); TILE_GET_INFO_MEMBER(get_back_tile_info); TILE_GET_INFO_MEMBER(get_text_tile_info); + virtual void machine_start(); + virtual void video_start(); + DECLARE_MACHINE_RESET(pushman); + DECLARE_MACHINE_RESET(bballs); }; /*----------- defined in video/pushman.c -----------*/ -VIDEO_START( pushman ); + SCREEN_UPDATE_IND16( pushman ); diff --git a/src/mame/includes/qdrmfgp.h b/src/mame/includes/qdrmfgp.h index f7200bb554c..a386b8d0953 100644 --- a/src/mame/includes/qdrmfgp.h +++ b/src/mame/includes/qdrmfgp.h @@ -33,12 +33,17 @@ public: DECLARE_WRITE16_MEMBER(ide_alt_w); DECLARE_WRITE_LINE_MEMBER(qdrmfgp_irq3_ack_w); DECLARE_WRITE_LINE_MEMBER(qdrmfgp_irq4_ack_w); + virtual void machine_reset(); + DECLARE_MACHINE_START(qdrmfgp); + DECLARE_VIDEO_START(qdrmfgp); + DECLARE_MACHINE_START(qdrmfgp2); + DECLARE_VIDEO_START(qdrmfgp2); }; /*----------- defined in video/qdrmfgp.c -----------*/ -VIDEO_START( qdrmfgp ); -VIDEO_START( qdrmfgp2 ); + + SCREEN_UPDATE_IND16( qdrmfgp ); void qdrmfgp_tile_callback(running_machine &machine, int layer, int *code, int *color, int *flags); diff --git a/src/mame/includes/qix.h b/src/mame/includes/qix.h index b83be78e851..394c287f792 100644 --- a/src/mame/includes/qix.h +++ b/src/mame/includes/qix.h @@ -81,6 +81,9 @@ public: DECLARE_DRIVER_INIT(slither); DECLARE_DRIVER_INIT(zookeep); DECLARE_DRIVER_INIT(kram3); + virtual void machine_reset(); + DECLARE_MACHINE_START(qixmcu); + DECLARE_VIDEO_START(qix); }; @@ -95,8 +98,8 @@ extern const pia6821_interface slither_pia_1_intf; extern const pia6821_interface slither_pia_2_intf; -MACHINE_START( qixmcu ); -MACHINE_RESET( qix ); + + diff --git a/src/mame/includes/quasar.h b/src/mame/includes/quasar.h index b430fe6b6a0..aa3f1f654d9 100644 --- a/src/mame/includes/quasar.h +++ b/src/mame/includes/quasar.h @@ -24,11 +24,15 @@ public: DECLARE_WRITE8_MEMBER(quasar_sh_command_w); DECLARE_READ8_MEMBER(quasar_sh_command_r); DECLARE_READ8_MEMBER(audio_t1_r); + DECLARE_MACHINE_START(quasar); + DECLARE_MACHINE_RESET(quasar); + DECLARE_VIDEO_START(quasar); + DECLARE_PALETTE_INIT(quasar); }; /*----------- defined in video/quasar.c -----------*/ -PALETTE_INIT( quasar ); + SCREEN_UPDATE_IND16( quasar ); -VIDEO_START( quasar ); + diff --git a/src/mame/includes/quizdna.h b/src/mame/includes/quizdna.h index 3587cff481d..7ff554d8047 100644 --- a/src/mame/includes/quizdna.h +++ b/src/mame/includes/quizdna.h @@ -23,12 +23,13 @@ public: DECLARE_WRITE8_MEMBER(paletteram_xBGR_RRRR_GGGG_BBBB_w); TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); + virtual void video_start(); }; /*----------- defined in video/quizdna.c -----------*/ -VIDEO_START( quizdna ); + SCREEN_UPDATE_IND16( quizdna ); diff --git a/src/mame/includes/quizpani.h b/src/mame/includes/quizpani.h index ac2cb7e7ba2..a95c44d410d 100644 --- a/src/mame/includes/quizpani.h +++ b/src/mame/includes/quizpani.h @@ -20,11 +20,12 @@ public: TILEMAP_MAPPER_MEMBER(bg_scan); TILE_GET_INFO_MEMBER(bg_tile_info); TILE_GET_INFO_MEMBER(txt_tile_info); + virtual void video_start(); }; /*----------- defined in video/quizpani.c -----------*/ -VIDEO_START( quizpani ); + SCREEN_UPDATE_IND16( quizpani ); diff --git a/src/mame/includes/raiden.h b/src/mame/includes/raiden.h index 0abe5f16d43..288288cbffc 100644 --- a/src/mame/includes/raiden.h +++ b/src/mame/includes/raiden.h @@ -37,11 +37,13 @@ public: TILE_GET_INFO_MEMBER(get_back_tile_info); TILE_GET_INFO_MEMBER(get_fore_tile_info); TILE_GET_INFO_MEMBER(get_text_tile_info); + virtual void video_start(); + DECLARE_VIDEO_START(raidena); }; /*----------- defined in video/raiden.c -----------*/ -VIDEO_START( raiden ); -VIDEO_START( raidena ); + + SCREEN_UPDATE_IND16( raiden ); diff --git a/src/mame/includes/raiden2.h b/src/mame/includes/raiden2.h index 403c80170b5..366f22c1ac7 100644 --- a/src/mame/includes/raiden2.h +++ b/src/mame/includes/raiden2.h @@ -143,6 +143,11 @@ public: TILE_GET_INFO_MEMBER(get_mid_tile_info); TILE_GET_INFO_MEMBER(get_fore_tile_info); TILE_GET_INFO_MEMBER(get_text_tile_info); + DECLARE_MACHINE_RESET(raiden2); + DECLARE_VIDEO_START(raiden2); + DECLARE_MACHINE_RESET(zeroteam); + DECLARE_MACHINE_RESET(xsedae); + DECLARE_MACHINE_RESET(raidendx); }; diff --git a/src/mame/includes/rainbow.h b/src/mame/includes/rainbow.h index baa26b090b0..891cec7520c 100644 --- a/src/mame/includes/rainbow.h +++ b/src/mame/includes/rainbow.h @@ -45,6 +45,8 @@ public: DECLARE_DRIVER_INIT(jumping); DECLARE_DRIVER_INIT(rbislande); DECLARE_DRIVER_INIT(rbisland); + virtual void machine_start(); + DECLARE_VIDEO_START(jumping); }; @@ -56,6 +58,6 @@ void rbisland_cchip_init(running_machine &machine, int version); /*----------- defined in video/rainbow.c -----------*/ SCREEN_UPDATE_IND16( rainbow ); -VIDEO_START( jumping ); + SCREEN_UPDATE_IND16( jumping ); diff --git a/src/mame/includes/rallyx.h b/src/mame/includes/rallyx.h index 8b4d0cbe1f6..b4e1ad021af 100644 --- a/src/mame/includes/rallyx.h +++ b/src/mame/includes/rallyx.h @@ -53,18 +53,26 @@ public: TILE_GET_INFO_MEMBER(rallyx_fg_get_tile_info); TILE_GET_INFO_MEMBER(locomotn_bg_get_tile_info); TILE_GET_INFO_MEMBER(locomotn_fg_get_tile_info); + DECLARE_MACHINE_START(rallyx); + DECLARE_MACHINE_RESET(rallyx); + DECLARE_VIDEO_START(rallyx); + DECLARE_PALETTE_INIT(rallyx); + DECLARE_VIDEO_START(jungler); + DECLARE_PALETTE_INIT(jungler); + DECLARE_VIDEO_START(locomotn); + DECLARE_VIDEO_START(commsega); }; /*----------- defined in video/rallyx.c -----------*/ -PALETTE_INIT( rallyx ); -PALETTE_INIT( jungler ); -VIDEO_START( rallyx ); -VIDEO_START( jungler ); -VIDEO_START( locomotn ); -VIDEO_START( commsega ); + + + + + + SCREEN_UPDATE_IND16( rallyx ); SCREEN_UPDATE_IND16( jungler ); SCREEN_UPDATE_IND16( locomotn ); diff --git a/src/mame/includes/rampart.h b/src/mame/includes/rampart.h index 71766d0fe6a..d7ef5466c2e 100644 --- a/src/mame/includes/rampart.h +++ b/src/mame/includes/rampart.h @@ -17,10 +17,13 @@ public: UINT8 m_has_mo; DECLARE_WRITE16_MEMBER(latch_w); DECLARE_DRIVER_INIT(rampart); + DECLARE_MACHINE_START(rampart); + DECLARE_MACHINE_RESET(rampart); + DECLARE_VIDEO_START(rampart); }; /*----------- defined in video/rampart.c -----------*/ -VIDEO_START( rampart ); + SCREEN_UPDATE_IND16( rampart ); diff --git a/src/mame/includes/rastan.h b/src/mame/includes/rastan.h index 5ec21d43c84..654f464576b 100644 --- a/src/mame/includes/rastan.h +++ b/src/mame/includes/rastan.h @@ -31,6 +31,8 @@ public: DECLARE_WRITE8_MEMBER(rastan_bankswitch_w); DECLARE_WRITE8_MEMBER(rastan_msm5205_start_w); DECLARE_WRITE8_MEMBER(rastan_msm5205_stop_w); + virtual void machine_start(); + virtual void machine_reset(); }; diff --git a/src/mame/includes/realbrk.h b/src/mame/includes/realbrk.h index 53d04be8bdc..eef4200d951 100644 --- a/src/mame/includes/realbrk.h +++ b/src/mame/includes/realbrk.h @@ -43,6 +43,7 @@ public: TILE_GET_INFO_MEMBER(get_tile_info_0); TILE_GET_INFO_MEMBER(get_tile_info_1); TILE_GET_INFO_MEMBER(get_tile_info_2); + virtual void video_start(); }; @@ -51,7 +52,7 @@ public: #ifndef REALBRK_H #define REALBRK_H -VIDEO_START(realbrk); + SCREEN_UPDATE_IND16(realbrk); SCREEN_UPDATE_IND16(dai2kaku); diff --git a/src/mame/includes/redalert.h b/src/mame/includes/redalert.h index a694c61a061..8b873b1374f 100644 --- a/src/mame/includes/redalert.h +++ b/src/mame/includes/redalert.h @@ -35,6 +35,8 @@ public: DECLARE_WRITE8_MEMBER(redalert_ay8910_latch_2_w); DECLARE_WRITE8_MEMBER(redalert_voice_command_w); DECLARE_WRITE8_MEMBER(demoneye_audio_command_w); + DECLARE_VIDEO_START(redalert); + DECLARE_VIDEO_START(ww3); }; diff --git a/src/mame/includes/relief.h b/src/mame/includes/relief.h index a0b545ee7bc..a61e5071a20 100644 --- a/src/mame/includes/relief.h +++ b/src/mame/includes/relief.h @@ -23,10 +23,13 @@ public: DECLARE_DRIVER_INIT(relief); TILE_GET_INFO_MEMBER(get_playfield_tile_info); TILE_GET_INFO_MEMBER(get_playfield2_tile_info); + DECLARE_MACHINE_START(relief); + DECLARE_MACHINE_RESET(relief); + DECLARE_VIDEO_START(relief); }; /*----------- defined in video/relief.c -----------*/ -VIDEO_START( relief ); + SCREEN_UPDATE_IND16( relief ); diff --git a/src/mame/includes/renegade.h b/src/mame/includes/renegade.h index a0a1b1fb5cd..c4f70f47a71 100644 --- a/src/mame/includes/renegade.h +++ b/src/mame/includes/renegade.h @@ -69,10 +69,13 @@ public: DECLARE_DRIVER_INIT(renegade); TILE_GET_INFO_MEMBER(get_bg_tilemap_info); TILE_GET_INFO_MEMBER(get_fg_tilemap_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; /*----------- defined in video/renegade.c -----------*/ SCREEN_UPDATE_IND16( renegade ); -VIDEO_START( renegade ); + diff --git a/src/mame/includes/retofinv.h b/src/mame/includes/retofinv.h index 87babf9b685..b185def5ec0 100644 --- a/src/mame/includes/retofinv.h +++ b/src/mame/includes/retofinv.h @@ -59,6 +59,8 @@ public: TILEMAP_MAPPER_MEMBER(tilemap_scan); TILE_GET_INFO_MEMBER(bg_get_tile_info); TILE_GET_INFO_MEMBER(fg_get_tile_info); + virtual void video_start(); + virtual void palette_init(); }; @@ -68,6 +70,6 @@ public: /*----------- defined in video/retofinv.c -----------*/ -VIDEO_START( retofinv ); -PALETTE_INIT( retofinv ); + + SCREEN_UPDATE_IND16( retofinv ); diff --git a/src/mame/includes/rltennis.h b/src/mame/includes/rltennis.h index ad24cd6330b..e66766090a3 100644 --- a/src/mame/includes/rltennis.h +++ b/src/mame/includes/rltennis.h @@ -43,10 +43,13 @@ public: DECLARE_WRITE16_MEMBER(rlt_snd1_w); DECLARE_WRITE16_MEMBER(rlt_snd2_w); DECLARE_WRITE16_MEMBER(rlt_blitter_w); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; -VIDEO_START( rltennis ); + SCREEN_UPDATE_IND16( rltennis ); diff --git a/src/mame/includes/rockrage.h b/src/mame/includes/rockrage.h index 4e527ed20c3..6e83ff6a021 100644 --- a/src/mame/includes/rockrage.h +++ b/src/mame/includes/rockrage.h @@ -27,6 +27,9 @@ public: DECLARE_WRITE8_MEMBER(rockrage_vreg_w); DECLARE_READ8_MEMBER(rockrage_VLM5030_busy_r); DECLARE_WRITE8_MEMBER(rockrage_speech_w); + virtual void machine_start(); + virtual void machine_reset(); + virtual void palette_init(); }; @@ -34,7 +37,7 @@ public: SCREEN_UPDATE_IND16( rockrage ); -PALETTE_INIT( rockrage ); + void rockrage_tile_callback(running_machine &machine, int layer, int bank, int *code, int *color, int *flags); void rockrage_sprite_callback(running_machine &machine, int *code, int *color); diff --git a/src/mame/includes/rocnrope.h b/src/mame/includes/rocnrope.h index 3161aac1743..ffa304d6e5e 100644 --- a/src/mame/includes/rocnrope.h +++ b/src/mame/includes/rocnrope.h @@ -26,11 +26,13 @@ public: DECLARE_DRIVER_INIT(rocnrope); DECLARE_DRIVER_INIT(rocnropk); TILE_GET_INFO_MEMBER(get_bg_tile_info); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/rocnrope.c -----------*/ -PALETTE_INIT( rocnrope ); -VIDEO_START( rocnrope ); + + SCREEN_UPDATE_IND16( rocnrope ); diff --git a/src/mame/includes/rohga.h b/src/mame/includes/rohga.h index fd72bfabf4b..4c19e285132 100644 --- a/src/mame/includes/rohga.h +++ b/src/mame/includes/rohga.h @@ -54,6 +54,9 @@ public: DECLARE_DRIVER_INIT(nitrobal); DECLARE_DRIVER_INIT(schmeisr); DECLARE_DRIVER_INIT(rohga); + DECLARE_VIDEO_START(rohga); + DECLARE_VIDEO_START(wizdfire); + DECLARE_VIDEO_START(schmeisr); }; @@ -61,9 +64,9 @@ public: /*----------- defined in video/rohga.c -----------*/ -VIDEO_START( rohga ); -VIDEO_START( schmeisr ); -VIDEO_START( wizdfire ); + + + SCREEN_UPDATE_IND16( rohga ); diff --git a/src/mame/includes/rollerg.h b/src/mame/includes/rollerg.h index 6af58cda337..382f13e184b 100644 --- a/src/mame/includes/rollerg.h +++ b/src/mame/includes/rollerg.h @@ -33,6 +33,9 @@ public: DECLARE_READ8_MEMBER(pip_r); DECLARE_READ8_MEMBER(rollerg_sound_r); DECLARE_WRITE_LINE_MEMBER(rollerg_irq_ack_w); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; /*----------- defined in video/rollerg.c -----------*/ @@ -40,5 +43,5 @@ public: extern void rollerg_sprite_callback(running_machine &machine, int *code,int *color,int *priority_mask); extern void rollerg_zoom_callback(running_machine &machine, int *code,int *color,int *flags); -VIDEO_START( rollerg ); + SCREEN_UPDATE_IND16( rollerg ); diff --git a/src/mame/includes/rollrace.h b/src/mame/includes/rollrace.h index f45948d19ea..c147800b7cd 100644 --- a/src/mame/includes/rollrace.h +++ b/src/mame/includes/rollrace.h @@ -33,12 +33,13 @@ public: DECLARE_WRITE8_MEMBER(rollrace_backgroundcolor_w); DECLARE_WRITE8_MEMBER(rollrace_flipy_w); DECLARE_WRITE8_MEMBER(rollrace_flipx_w); + virtual void palette_init(); }; /*----------- defined in video/rollrace.c -----------*/ -PALETTE_INIT( rollrace ); + SCREEN_UPDATE_IND16( rollrace ); diff --git a/src/mame/includes/rpunch.h b/src/mame/includes/rpunch.h index 733b3016600..45ffa2f584d 100644 --- a/src/mame/includes/rpunch.h +++ b/src/mame/includes/rpunch.h @@ -37,11 +37,13 @@ public: DECLARE_DRIVER_INIT(svolley); TILE_GET_INFO_MEMBER(get_bg0_tile_info); TILE_GET_INFO_MEMBER(get_bg1_tile_info); + virtual void machine_reset(); + virtual void video_start(); }; /*----------- defined in video/rpunch.c -----------*/ -VIDEO_START( rpunch ); + SCREEN_UPDATE_IND16( rpunch ); diff --git a/src/mame/includes/runaway.h b/src/mame/includes/runaway.h index 24bf48b21ec..a44d0584bfb 100644 --- a/src/mame/includes/runaway.h +++ b/src/mame/includes/runaway.h @@ -20,13 +20,17 @@ public: DECLARE_READ8_MEMBER(runaway_pot_r); TILE_GET_INFO_MEMBER(runaway_get_tile_info); TILE_GET_INFO_MEMBER(qwak_get_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); + DECLARE_VIDEO_START(qwak); }; /*----------- defined in video/runaway.c -----------*/ -VIDEO_START( runaway ); -VIDEO_START( qwak ); + + SCREEN_UPDATE_IND16( runaway ); SCREEN_UPDATE_IND16( qwak ); diff --git a/src/mame/includes/rungun.h b/src/mame/includes/rungun.h index f4b64d9b2af..d1801db80bc 100644 --- a/src/mame/includes/rungun.h +++ b/src/mame/includes/rungun.h @@ -49,6 +49,9 @@ public: DECLARE_WRITE16_MEMBER(rng_936_videoram_w); TILE_GET_INFO_MEMBER(ttl_get_tile_info); TILE_GET_INFO_MEMBER(get_rng_936_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; @@ -59,5 +62,5 @@ public: extern void rng_sprite_callback(running_machine &machine, int *code, int *color, int *priority_mask); -VIDEO_START( rng ); + SCREEN_UPDATE_IND16( rng ); diff --git a/src/mame/includes/sauro.h b/src/mame/includes/sauro.h index f5903627636..dd5fe188ea9 100644 --- a/src/mame/includes/sauro.h +++ b/src/mame/includes/sauro.h @@ -34,14 +34,16 @@ public: DECLARE_DRIVER_INIT(tecfri); TILE_GET_INFO_MEMBER(get_tile_info_bg); TILE_GET_INFO_MEMBER(get_tile_info_fg); + DECLARE_VIDEO_START(trckydoc); + DECLARE_VIDEO_START(sauro); }; /*----------- defined in video/sauro.c -----------*/ -VIDEO_START( sauro ); -VIDEO_START( trckydoc ); + + SCREEN_UPDATE_IND16( sauro ); SCREEN_UPDATE_IND16( trckydoc ); diff --git a/src/mame/includes/sbasketb.h b/src/mame/includes/sbasketb.h index 47813fb4de4..a0d6b169266 100644 --- a/src/mame/includes/sbasketb.h +++ b/src/mame/includes/sbasketb.h @@ -40,11 +40,13 @@ public: DECLARE_WRITE8_MEMBER( konami_SN76496_latch_w ) { m_SN76496_latch = data; }; DECLARE_WRITE8_MEMBER( konami_SN76496_w ) { m_sn->write(space, offset, m_SN76496_latch); }; TILE_GET_INFO_MEMBER(get_bg_tile_info); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/sbasketb.c -----------*/ -PALETTE_INIT( sbasketb ); -VIDEO_START( sbasketb ); + + SCREEN_UPDATE_IND16( sbasketb ); diff --git a/src/mame/includes/sbugger.h b/src/mame/includes/sbugger.h index 02abcf82f36..8066761ba4f 100644 --- a/src/mame/includes/sbugger.h +++ b/src/mame/includes/sbugger.h @@ -14,11 +14,13 @@ public: DECLARE_WRITE8_MEMBER(sbugger_videoram_attr_w); DECLARE_WRITE_LINE_MEMBER(sbugger_interrupt); TILE_GET_INFO_MEMBER(get_sbugger_tile_info); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/sbugger.c -----------*/ -PALETTE_INIT(sbugger); + SCREEN_UPDATE_IND16(sbugger); -VIDEO_START(sbugger); + diff --git a/src/mame/includes/scotrsht.h b/src/mame/includes/scotrsht.h index 838000f7353..f816464f68f 100644 --- a/src/mame/includes/scotrsht.h +++ b/src/mame/includes/scotrsht.h @@ -23,12 +23,14 @@ public: DECLARE_WRITE8_MEMBER(scotrsht_charbank_w); DECLARE_WRITE8_MEMBER(scotrsht_palettebank_w); TILE_GET_INFO_MEMBER(scotrsht_get_bg_tile_info); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/scotrsht.c -----------*/ -PALETTE_INIT( scotrsht ); -VIDEO_START( scotrsht ); + + SCREEN_UPDATE_IND16( scotrsht ); diff --git a/src/mame/includes/scramble.h b/src/mame/includes/scramble.h index 84bb5ac4043..1bc298f31f2 100644 --- a/src/mame/includes/scramble.h +++ b/src/mame/includes/scramble.h @@ -51,6 +51,8 @@ public: DECLARE_DRIVER_INIT(hustler); DECLARE_DRIVER_INIT(hustlerd); DECLARE_DRIVER_INIT(billiard); + DECLARE_MACHINE_RESET(scramble); + DECLARE_MACHINE_RESET(explorer); }; @@ -61,8 +63,8 @@ extern const i8255_interface(scramble_ppi_1_intf); extern const i8255_interface(stratgyx_ppi_1_intf); -MACHINE_RESET( scramble ); -MACHINE_RESET( explorer ); + + READ8_HANDLER( triplep_pip_r ); READ8_HANDLER( triplep_pap_r ); diff --git a/src/mame/includes/sderby.h b/src/mame/includes/sderby.h index 9339619cdf7..8c7e08139ee 100644 --- a/src/mame/includes/sderby.h +++ b/src/mame/includes/sderby.h @@ -32,11 +32,12 @@ public: TILE_GET_INFO_MEMBER(get_sderby_tile_info); TILE_GET_INFO_MEMBER(get_sderby_md_tile_info); TILE_GET_INFO_MEMBER(get_sderby_fg_tile_info); + virtual void video_start(); }; /*----------- defined in video/sderby.c -----------*/ -VIDEO_START( sderby ); + SCREEN_UPDATE_IND16( sderby ); SCREEN_UPDATE_IND16( pmroulet ); diff --git a/src/mame/includes/segag80r.h b/src/mame/includes/segag80r.h index b15aa9c668d..603ff41f14e 100644 --- a/src/mame/includes/segag80r.h +++ b/src/mame/includes/segag80r.h @@ -96,6 +96,8 @@ public: TILE_GET_INFO_MEMBER(spaceod_get_tile_info); TILEMAP_MAPPER_MEMBER(spaceod_scan_rows); TILE_GET_INFO_MEMBER(bg_get_tile_info); + virtual void machine_start(); + virtual void video_start(); }; @@ -122,7 +124,7 @@ INTERRUPT_GEN( segag80r_vblank_start ); -VIDEO_START( segag80r ); + SCREEN_UPDATE_IND16( segag80r ); diff --git a/src/mame/includes/segag80v.h b/src/mame/includes/segag80v.h index 2d5cdbb05ee..10a76f5dd98 100644 --- a/src/mame/includes/segag80v.h +++ b/src/mame/includes/segag80v.h @@ -50,6 +50,8 @@ public: DECLARE_DRIVER_INIT(elim2); DECLARE_DRIVER_INIT(tacscan); DECLARE_DRIVER_INIT(spacfury); + virtual void machine_start(); + virtual void video_start(); }; @@ -59,5 +61,5 @@ public: /*----------- defined in video/segag80v.c -----------*/ -VIDEO_START( segag80v ); + SCREEN_UPDATE_RGB32( segag80v ); diff --git a/src/mame/includes/segas24.h b/src/mame/includes/segas24.h index f2107b728a5..1d6658da177 100644 --- a/src/mame/includes/segas24.h +++ b/src/mame/includes/segas24.h @@ -110,6 +110,8 @@ public: DECLARE_DRIVER_INIT(dcclubfd); DECLARE_DRIVER_INIT(qsww); DECLARE_DRIVER_INIT(sgmast); + virtual void machine_start(); + virtual void machine_reset(); }; /*----------- defined in video/segas24.c -----------*/ diff --git a/src/mame/includes/segas32.h b/src/mame/includes/segas32.h index 20c91908206..020a9e9d358 100644 --- a/src/mame/includes/segas32.h +++ b/src/mame/includes/segas32.h @@ -171,6 +171,9 @@ public: DECLARE_DRIVER_INIT(f1lap); DECLARE_DRIVER_INIT(orunners); TILE_GET_INFO_MEMBER(get_tile_info); + DECLARE_MACHINE_RESET(system32); + DECLARE_VIDEO_START(system32); + DECLARE_VIDEO_START(multi32); }; @@ -190,8 +193,8 @@ void decrypt_ga2_protrom(running_machine &machine); /*----------- defined in video/segas32.c -----------*/ -VIDEO_START(system32); -VIDEO_START(multi32); + + SCREEN_UPDATE_RGB32(system32); SCREEN_UPDATE_RGB32(multi32_left); SCREEN_UPDATE_RGB32(multi32_right); diff --git a/src/mame/includes/seibuspi.h b/src/mame/includes/seibuspi.h index 98a56d0eb92..fd0fea2ecd7 100644 --- a/src/mame/includes/seibuspi.h +++ b/src/mame/includes/seibuspi.h @@ -106,6 +106,13 @@ public: TILE_GET_INFO_MEMBER(get_back_tile_info); TILE_GET_INFO_MEMBER(get_mid_tile_info); TILE_GET_INFO_MEMBER(get_fore_tile_info); + DECLARE_MACHINE_START(spi); + DECLARE_MACHINE_RESET(spi); + DECLARE_VIDEO_START(spi); + DECLARE_MACHINE_RESET(seibu386); + DECLARE_VIDEO_START(sys386f2); + DECLARE_MACHINE_START(sxx2f); + DECLARE_MACHINE_RESET(sxx2f); }; @@ -116,10 +123,10 @@ void seibuspi_sprite_decrypt(UINT8 *src, int romsize); /*----------- defined in video/seibuspi.c -----------*/ -VIDEO_START( spi ); + SCREEN_UPDATE_RGB32( spi ); -VIDEO_START( sys386f2 ); + SCREEN_UPDATE_RGB32( sys386f2 ); diff --git a/src/mame/includes/seicross.h b/src/mame/includes/seicross.h index abb013b96cd..2b7e7f592c1 100644 --- a/src/mame/includes/seicross.h +++ b/src/mame/includes/seicross.h @@ -26,12 +26,15 @@ public: DECLARE_READ8_MEMBER(friskyt_portB_r); DECLARE_WRITE8_MEMBER(friskyt_portB_w); TILE_GET_INFO_MEMBER(get_bg_tile_info); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/seicross.c -----------*/ -PALETTE_INIT( seicross ); -VIDEO_START( seicross ); + + SCREEN_UPDATE_IND16( seicross ); diff --git a/src/mame/includes/senjyo.h b/src/mame/includes/senjyo.h index a1863d58344..c80d1ac1a4c 100644 --- a/src/mame/includes/senjyo.h +++ b/src/mame/includes/senjyo.h @@ -79,6 +79,8 @@ public: TILE_GET_INFO_MEMBER(starforc_bg1_tile_info); TILE_GET_INFO_MEMBER(get_bg2_tile_info); TILE_GET_INFO_MEMBER(get_bg3_tile_info); + virtual void machine_reset(); + virtual void video_start(); }; @@ -92,5 +94,5 @@ extern const z80ctc_interface senjyo_ctc_intf; /*----------- defined in video/senjyo.c -----------*/ -VIDEO_START( senjyo ); + SCREEN_UPDATE_IND16( senjyo ); diff --git a/src/mame/includes/seta.h b/src/mame/includes/seta.h index 15e79213865..8521de13e17 100644 --- a/src/mame/includes/seta.h +++ b/src/mame/includes/seta.h @@ -177,6 +177,21 @@ public: TILE_GET_INFO_MEMBER(get_tile_info_1); TILE_GET_INFO_MEMBER(get_tile_info_2); TILE_GET_INFO_MEMBER(get_tile_info_3); + DECLARE_VIDEO_START(seta_no_layers); + DECLARE_VIDEO_START(twineagl_1_layer); + DECLARE_VIDEO_START(seta_1_layer); + DECLARE_MACHINE_RESET(calibr50); + DECLARE_PALETTE_INIT(usclssic); + DECLARE_VIDEO_START(seta_2_layers); + DECLARE_PALETTE_INIT(blandia); + DECLARE_PALETTE_INIT(setaroul); + DECLARE_PALETTE_INIT(zingzip); + DECLARE_MACHINE_START(wrofaero); + DECLARE_PALETTE_INIT(gundhara); + DECLARE_PALETTE_INIT(jjsquawk); + DECLARE_MACHINE_START(keroppi); + DECLARE_VIDEO_START(oisipuzl_2_layers); + DECLARE_PALETTE_INIT(inttoote); }; /*----------- defined in video/seta.c -----------*/ @@ -185,19 +200,19 @@ void seta_coin_lockout_w(running_machine &machine, int data); -PALETTE_INIT( blandia ); -PALETTE_INIT( gundhara ); -PALETTE_INIT( inttoote ); -PALETTE_INIT( setaroul ); -PALETTE_INIT( jjsquawk ); -PALETTE_INIT( usclssic ); -PALETTE_INIT( zingzip ); -VIDEO_START( seta_no_layers); -VIDEO_START( twineagl_1_layer); -VIDEO_START( seta_1_layer); -VIDEO_START( seta_2_layers); -VIDEO_START( oisipuzl_2_layers ); + + + + + + + + + + + + SCREEN_UPDATE_IND16( seta ); SCREEN_UPDATE_IND16( seta_no_layers ); diff --git a/src/mame/includes/seta2.h b/src/mame/includes/seta2.h index fdfb3a1bf4c..63ee6af7e4d 100644 --- a/src/mame/includes/seta2.h +++ b/src/mame/includes/seta2.h @@ -65,13 +65,17 @@ public: DECLARE_DRIVER_INIT(funcube3); DECLARE_DRIVER_INIT(funcube); DECLARE_DRIVER_INIT(funcube2); + DECLARE_VIDEO_START(seta2); + DECLARE_MACHINE_RESET(funcube); + DECLARE_VIDEO_START(seta2_yoffset); + DECLARE_VIDEO_START(seta2_xoffset); }; /*----------- defined in video/seta2.c -----------*/ -VIDEO_START( seta2 ); -VIDEO_START( seta2_xoffset ); -VIDEO_START( seta2_yoffset ); + + + SCREEN_UPDATE_IND16( seta2 ); SCREEN_VBLANK( seta2 ); diff --git a/src/mame/includes/sf.h b/src/mame/includes/sf.h index 4e0132072de..a7b2e55facc 100644 --- a/src/mame/includes/sf.h +++ b/src/mame/includes/sf.h @@ -44,11 +44,14 @@ public: TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); TILE_GET_INFO_MEMBER(get_tx_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; /*----------- defined in video/sf.c -----------*/ -VIDEO_START( sf ); + SCREEN_UPDATE_IND16( sf ); diff --git a/src/mame/includes/shadfrce.h b/src/mame/includes/shadfrce.h index 8732e699ac7..72f27a56e95 100644 --- a/src/mame/includes/shadfrce.h +++ b/src/mame/includes/shadfrce.h @@ -41,11 +41,12 @@ public: TILE_GET_INFO_MEMBER(get_shadfrce_fgtile_info); TILE_GET_INFO_MEMBER(get_shadfrce_bg0tile_info); TILE_GET_INFO_MEMBER(get_shadfrce_bg1tile_info); + virtual void video_start(); }; /*----------- defined in video/shadfrce.c -----------*/ -VIDEO_START( shadfrce ); + SCREEN_VBLANK(shadfrce); SCREEN_UPDATE_IND16( shadfrce ); diff --git a/src/mame/includes/shangha3.h b/src/mame/includes/shangha3.h index 7b320b4dc70..e7f2f694fa4 100644 --- a/src/mame/includes/shangha3.h +++ b/src/mame/includes/shangha3.h @@ -26,10 +26,11 @@ public: DECLARE_WRITE16_MEMBER(shangha3_blitter_go_w); DECLARE_DRIVER_INIT(shangha3); DECLARE_DRIVER_INIT(heberpop); + virtual void video_start(); }; /*----------- defined in video/shangha3.c -----------*/ -VIDEO_START( shangha3 ); + SCREEN_UPDATE_IND16( shangha3 ); diff --git a/src/mame/includes/shangkid.h b/src/mame/includes/shangkid.h index 4bd94c9eb6f..08423bb136e 100644 --- a/src/mame/includes/shangkid.h +++ b/src/mame/includes/shangkid.h @@ -26,14 +26,18 @@ public: DECLARE_DRIVER_INIT(shangkid); DECLARE_DRIVER_INIT(chinhero); TILE_GET_INFO_MEMBER(get_bg_tile_info); + DECLARE_MACHINE_RESET(chinhero); + DECLARE_VIDEO_START(shangkid); + DECLARE_PALETTE_INIT(dynamski); + DECLARE_MACHINE_RESET(shangkid); }; /*----------- defined in video/shangkid.c -----------*/ -VIDEO_START( shangkid ); + SCREEN_UPDATE_IND16( shangkid ); -PALETTE_INIT( dynamski ); + SCREEN_UPDATE_IND16( dynamski ); diff --git a/src/mame/includes/shaolins.h b/src/mame/includes/shaolins.h index 607fab84ac0..312604bbd2b 100644 --- a/src/mame/includes/shaolins.h +++ b/src/mame/includes/shaolins.h @@ -23,12 +23,14 @@ public: DECLARE_WRITE8_MEMBER(shaolins_scroll_w); DECLARE_WRITE8_MEMBER(shaolins_nmi_w); TILE_GET_INFO_MEMBER(get_bg_tile_info); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/sauro.c -----------*/ -PALETTE_INIT( shaolins ); -VIDEO_START( shaolins ); + + SCREEN_UPDATE_IND16( shaolins ); diff --git a/src/mame/includes/shisen.h b/src/mame/includes/shisen.h index 1f457367034..e6cc91bf381 100644 --- a/src/mame/includes/shisen.h +++ b/src/mame/includes/shisen.h @@ -16,11 +16,12 @@ public: DECLARE_WRITE8_MEMBER(sichuan2_bankswitch_w); DECLARE_WRITE8_MEMBER(sichuan2_paletteram_w); TILE_GET_INFO_MEMBER(get_bg_tile_info); + virtual void video_start(); }; /*----------- defined in video/shisen.c -----------*/ -VIDEO_START( sichuan2 ); + SCREEN_UPDATE_IND16( sichuan2 ); diff --git a/src/mame/includes/shootout.h b/src/mame/includes/shootout.h index df97c995e00..2ff285ee8af 100644 --- a/src/mame/includes/shootout.h +++ b/src/mame/includes/shootout.h @@ -24,13 +24,15 @@ public: DECLARE_DRIVER_INIT(shootout); TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/shootout.c -----------*/ -PALETTE_INIT( shootout ); -VIDEO_START( shootout ); + + SCREEN_UPDATE_IND16( shootout ); SCREEN_UPDATE_IND16( shootouj ); diff --git a/src/mame/includes/shuuz.h b/src/mame/includes/shuuz.h index be18dcc8a14..ad2fc6ce04f 100644 --- a/src/mame/includes/shuuz.h +++ b/src/mame/includes/shuuz.h @@ -19,10 +19,13 @@ public: DECLARE_READ16_MEMBER(leta_r); DECLARE_READ16_MEMBER(special_port0_r); TILE_GET_INFO_MEMBER(get_playfield_tile_info); + DECLARE_MACHINE_START(shuuz); + DECLARE_MACHINE_RESET(shuuz); + DECLARE_VIDEO_START(shuuz); }; /*----------- defined in video/shuuz.c -----------*/ -VIDEO_START( shuuz ); + SCREEN_UPDATE_IND16( shuuz ); diff --git a/src/mame/includes/sidearms.h b/src/mame/includes/sidearms.h index aadefee35c0..07a1cdb7b39 100644 --- a/src/mame/includes/sidearms.h +++ b/src/mame/includes/sidearms.h @@ -50,10 +50,11 @@ public: TILE_GET_INFO_MEMBER(get_philko_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); TILEMAP_MAPPER_MEMBER(sidearms_tilemap_scan); + virtual void video_start(); }; /*----------- defined in video/sidearms.c -----------*/ -VIDEO_START( sidearms ); + SCREEN_UPDATE_IND16( sidearms ); diff --git a/src/mame/includes/sidepckt.h b/src/mame/includes/sidepckt.h index 0e237b8074f..ba9898417da 100644 --- a/src/mame/includes/sidepckt.h +++ b/src/mame/includes/sidepckt.h @@ -26,12 +26,14 @@ public: DECLARE_DRIVER_INIT(sidepckt); DECLARE_DRIVER_INIT(sidepctj); TILE_GET_INFO_MEMBER(get_tile_info); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/sidepckt.c -----------*/ -PALETTE_INIT( sidepckt ); -VIDEO_START( sidepckt ); + + SCREEN_UPDATE_IND16( sidepckt ); diff --git a/src/mame/includes/silkroad.h b/src/mame/includes/silkroad.h index a5a9d87d9a8..62abdc06594 100644 --- a/src/mame/includes/silkroad.h +++ b/src/mame/includes/silkroad.h @@ -27,10 +27,11 @@ public: TILE_GET_INFO_MEMBER(get_fg_tile_info); TILE_GET_INFO_MEMBER(get_fg2_tile_info); TILE_GET_INFO_MEMBER(get_fg3_tile_info); + virtual void video_start(); }; /*----------- defined in video/silkroad.c -----------*/ -VIDEO_START(silkroad); + SCREEN_UPDATE_IND16(silkroad); diff --git a/src/mame/includes/simpl156.h b/src/mame/includes/simpl156.h index 4e5bc40d292..fa48b16170f 100644 --- a/src/mame/includes/simpl156.h +++ b/src/mame/includes/simpl156.h @@ -57,11 +57,12 @@ public: DECLARE_DRIVER_INIT(prtytime); DECLARE_DRIVER_INIT(osman); DECLARE_DRIVER_INIT(chainrec); + virtual void video_start(); }; /*----------- defined in video/simpl156.c -----------*/ -VIDEO_START( simpl156 ); + SCREEN_UPDATE_IND16( simpl156 ); diff --git a/src/mame/includes/simpsons.h b/src/mame/includes/simpsons.h index 302c0f582f8..bb4634b2404 100644 --- a/src/mame/includes/simpsons.h +++ b/src/mame/includes/simpsons.h @@ -37,13 +37,15 @@ public: DECLARE_WRITE8_MEMBER(simpsons_k052109_w); DECLARE_READ8_MEMBER(simpsons_k053247_r); DECLARE_WRITE8_MEMBER(simpsons_k053247_w); + virtual void machine_start(); + virtual void machine_reset(); }; /*----------- defined in machine/simpsons.c -----------*/ READ8_DEVICE_HANDLER( simpsons_sound_r ); -MACHINE_RESET( simpsons ); -MACHINE_START( simpsons ); + + /*----------- defined in video/simpsons.c -----------*/ diff --git a/src/mame/includes/skullxbo.h b/src/mame/includes/skullxbo.h index 31b4cf68ec4..1b61d505191 100644 --- a/src/mame/includes/skullxbo.h +++ b/src/mame/includes/skullxbo.h @@ -17,6 +17,9 @@ public: DECLARE_DRIVER_INIT(skullxbo); TILE_GET_INFO_MEMBER(get_alpha_tile_info); TILE_GET_INFO_MEMBER(get_playfield_tile_info); + DECLARE_MACHINE_START(skullxbo); + DECLARE_MACHINE_RESET(skullxbo); + DECLARE_VIDEO_START(skullxbo); }; @@ -27,7 +30,7 @@ WRITE16_HANDLER( skullxbo_xscroll_w ); WRITE16_HANDLER( skullxbo_yscroll_w ); WRITE16_HANDLER( skullxbo_mobmsb_w ); -VIDEO_START( skullxbo ); + SCREEN_UPDATE_IND16( skullxbo ); void skullxbo_scanline_update(running_machine &machine, int param); diff --git a/src/mame/includes/skydiver.h b/src/mame/includes/skydiver.h index c0fb43b9b3b..81f486d91ae 100644 --- a/src/mame/includes/skydiver.h +++ b/src/mame/includes/skydiver.h @@ -47,6 +47,9 @@ public: DECLARE_WRITE8_MEMBER(skydiver_sound_enable_w); DECLARE_WRITE8_MEMBER(skydiver_whistle_w); TILE_GET_INFO_MEMBER(get_tile_info); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); }; @@ -57,6 +60,6 @@ DISCRETE_SOUND_EXTERN( skydiver ); /*----------- defined in video/skydiver.c -----------*/ -MACHINE_RESET( skydiver ); -VIDEO_START( skydiver ); + + SCREEN_UPDATE_IND16( skydiver ); diff --git a/src/mame/includes/skyfox.h b/src/mame/includes/skyfox.h index 6e96231a00c..67db54511bb 100644 --- a/src/mame/includes/skyfox.h +++ b/src/mame/includes/skyfox.h @@ -28,12 +28,15 @@ public: DECLARE_WRITE8_MEMBER(skyfox_vregs_w); DECLARE_INPUT_CHANGED_MEMBER(coin_inserted); DECLARE_DRIVER_INIT(skyfox); + virtual void machine_start(); + virtual void machine_reset(); + virtual void palette_init(); }; /*----------- defined in video/skyfox.c -----------*/ -PALETTE_INIT( skyfox ); + SCREEN_UPDATE_IND16( skyfox ); diff --git a/src/mame/includes/skykid.h b/src/mame/includes/skykid.h index acdf94d1e8e..06c4fd74bf5 100644 --- a/src/mame/includes/skykid.h +++ b/src/mame/includes/skykid.h @@ -37,12 +37,15 @@ public: TILEMAP_MAPPER_MEMBER(tx_tilemap_scan); TILE_GET_INFO_MEMBER(tx_get_tile_info); TILE_GET_INFO_MEMBER(bg_get_tile_info); + virtual void machine_start(); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/skykid.c -----------*/ -VIDEO_START( skykid ); + SCREEN_UPDATE_IND16( skykid ); -PALETTE_INIT( skykid ); + diff --git a/src/mame/includes/skyraid.h b/src/mame/includes/skyraid.h index d500096c9f8..43930d54e71 100644 --- a/src/mame/includes/skyraid.h +++ b/src/mame/includes/skyraid.h @@ -23,6 +23,8 @@ public: DECLARE_WRITE8_MEMBER(skyraid_range_w); DECLARE_WRITE8_MEMBER(skyraid_offset_w); DECLARE_WRITE8_MEMBER(skyraid_scroll_w); + virtual void video_start(); + virtual void palette_init(); }; @@ -35,5 +37,5 @@ WRITE8_DEVICE_HANDLER( skyraid_sound_w ); /*----------- defined in video/skyraid.c -----------*/ -VIDEO_START(skyraid); + SCREEN_UPDATE_IND16(skyraid); diff --git a/src/mame/includes/slapfght.h b/src/mame/includes/slapfght.h index 1f0c2f0a584..26f9ba3e920 100644 --- a/src/mame/includes/slapfght.h +++ b/src/mame/includes/slapfght.h @@ -120,6 +120,9 @@ public: TILE_GET_INFO_MEMBER(get_pf_tile_info); TILE_GET_INFO_MEMBER(get_pf1_tile_info); TILE_GET_INFO_MEMBER(get_fix_tile_info); + DECLARE_MACHINE_RESET(slapfight); + DECLARE_VIDEO_START(perfrman); + DECLARE_VIDEO_START(slapfight); }; @@ -139,7 +142,7 @@ public: /*----------- defined in machine/slapfght.c -----------*/ -MACHINE_RESET( slapfight ); + @@ -155,6 +158,6 @@ INTERRUPT_GEN( getstar_interrupt ); SCREEN_UPDATE_IND16( slapfight ); SCREEN_UPDATE_IND16( perfrman ); -VIDEO_START( slapfight ); -VIDEO_START( perfrman ); + + diff --git a/src/mame/includes/slapshot.h b/src/mame/includes/slapshot.h index 2755312a154..91354dd4517 100644 --- a/src/mame/includes/slapshot.h +++ b/src/mame/includes/slapshot.h @@ -62,11 +62,13 @@ public: DECLARE_WRITE16_MEMBER(slapshot_msb_sound_w); DECLARE_READ16_MEMBER(slapshot_msb_sound_r); DECLARE_DRIVER_INIT(slapshot); + virtual void machine_start(); + virtual void video_start(); }; /*----------- defined in video/slapshot.c -----------*/ -VIDEO_START( slapshot ); + SCREEN_UPDATE_IND16( slapshot ); SCREEN_VBLANK( taito_no_buffer ); diff --git a/src/mame/includes/snk.h b/src/mame/includes/snk.h index 2e144c9755a..3cac9e7c625 100644 --- a/src/mame/includes/snk.h +++ b/src/mame/includes/snk.h @@ -151,24 +151,23 @@ public: TILE_GET_INFO_MEMBER(tnk3_get_bg_tile_info); TILE_GET_INFO_MEMBER(ikari_get_bg_tile_info); TILE_GET_INFO_MEMBER(gwar_get_bg_tile_info); + DECLARE_VIDEO_START(marvins); + DECLARE_PALETTE_INIT(tnk3); + DECLARE_VIDEO_START(jcross); + DECLARE_VIDEO_START(tnk3); + DECLARE_VIDEO_START(ikari); + DECLARE_VIDEO_START(gwar); + DECLARE_VIDEO_START(tdfever); + DECLARE_VIDEO_START(sgladiat); + DECLARE_VIDEO_START(hal21); + DECLARE_VIDEO_START(aso); + DECLARE_VIDEO_START(psychos); + DECLARE_VIDEO_START(snk_3bpp_shadow); + DECLARE_VIDEO_START(snk_4bpp_shadow); }; /*----------- defined in video/snk.c -----------*/ - -extern PALETTE_INIT( tnk3 ); - -extern VIDEO_START( marvins ); -extern VIDEO_START( jcross ); -extern VIDEO_START( sgladiat ); -extern VIDEO_START( hal21 ); -extern VIDEO_START( aso ); -extern VIDEO_START( tnk3 ); -extern VIDEO_START( ikari ); -extern VIDEO_START( gwar ); -extern VIDEO_START( psychos ); -extern VIDEO_START( tdfever ); - extern SCREEN_UPDATE_IND16( marvins ); extern SCREEN_UPDATE_IND16( tnk3 ); extern SCREEN_UPDATE_IND16( ikari ); diff --git a/src/mame/includes/snk6502.h b/src/mame/includes/snk6502.h index b6ce8ea613a..82d187f74d2 100644 --- a/src/mame/includes/snk6502.h +++ b/src/mame/includes/snk6502.h @@ -51,6 +51,15 @@ public: TILE_GET_INFO_MEMBER(get_fg_tile_info); TILE_GET_INFO_MEMBER(satansat_get_bg_tile_info); TILE_GET_INFO_MEMBER(satansat_get_fg_tile_info); + DECLARE_MACHINE_RESET(sasuke); + DECLARE_VIDEO_START(satansat); + DECLARE_PALETTE_INIT(satansat); + DECLARE_MACHINE_RESET(vanguard); + DECLARE_VIDEO_START(snk6502); + DECLARE_PALETTE_INIT(snk6502); + DECLARE_MACHINE_RESET(satansat); + DECLARE_MACHINE_RESET(pballoon); + DECLARE_VIDEO_START(pballoon); }; @@ -108,12 +117,12 @@ DISCRETE_SOUND_EXTERN( fantasy ); /*----------- defined in video/snk6502.c -----------*/ -PALETTE_INIT( snk6502 ); -VIDEO_START( snk6502 ); + + SCREEN_UPDATE_IND16( snk6502 ); -VIDEO_START( pballoon ); -PALETTE_INIT( satansat ); -VIDEO_START( satansat ); + + + diff --git a/src/mame/includes/snk68.h b/src/mame/includes/snk68.h index 41e9330d4ff..58d10ce8172 100644 --- a/src/mame/includes/snk68.h +++ b/src/mame/includes/snk68.h @@ -41,11 +41,13 @@ public: DECLARE_DRIVER_INIT(searchar); TILE_GET_INFO_MEMBER(get_pow_tile_info); TILE_GET_INFO_MEMBER(get_searchar_tile_info); + virtual void video_start(); + DECLARE_VIDEO_START(searchar); }; /*----------- defined in video/snk68.c -----------*/ -VIDEO_START( pow ); -VIDEO_START( searchar ); + + SCREEN_UPDATE_IND16( pow ); diff --git a/src/mame/includes/snookr10.h b/src/mame/includes/snookr10.h index b1bf2c1dbfa..83d3611bb26 100644 --- a/src/mame/includes/snookr10.h +++ b/src/mame/includes/snookr10.h @@ -24,14 +24,18 @@ public: DECLARE_WRITE8_MEMBER(snookr10_colorram_w); TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(apple10_get_bg_tile_info); + virtual void video_start(); + virtual void palette_init(); + DECLARE_VIDEO_START(apple10); + DECLARE_PALETTE_INIT(apple10); }; /*----------- defined in video/snookr10.c -----------*/ -PALETTE_INIT( snookr10 ); -PALETTE_INIT( apple10 ); -VIDEO_START( snookr10 ); -VIDEO_START( apple10 ); + + + + SCREEN_UPDATE_IND16( snookr10 ); diff --git a/src/mame/includes/snowbros.h b/src/mame/includes/snowbros.h index bb7c1aefd64..25faa52daa5 100644 --- a/src/mame/includes/snowbros.h +++ b/src/mame/includes/snowbros.h @@ -41,5 +41,7 @@ public: DECLARE_DRIVER_INIT(4in1boot); DECLARE_DRIVER_INIT(3in1semi); DECLARE_DRIVER_INIT(cookbib2); + DECLARE_MACHINE_RESET(semiprot); + DECLARE_MACHINE_RESET(finalttr); }; diff --git a/src/mame/includes/solomon.h b/src/mame/includes/solomon.h index 8d35e517896..0f35ec04171 100644 --- a/src/mame/includes/solomon.h +++ b/src/mame/includes/solomon.h @@ -29,11 +29,12 @@ public: DECLARE_WRITE8_MEMBER(solomon_flipscreen_w); TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); + virtual void video_start(); }; /*----------- defined in video/solomon.c -----------*/ -VIDEO_START( solomon ); + SCREEN_UPDATE_IND16( solomon ); diff --git a/src/mame/includes/sonson.h b/src/mame/includes/sonson.h index 747ce2e9c0b..d28fd47f40c 100644 --- a/src/mame/includes/sonson.h +++ b/src/mame/includes/sonson.h @@ -34,12 +34,16 @@ public: DECLARE_WRITE8_MEMBER(sonson_scrollx_w); DECLARE_WRITE8_MEMBER(sonson_flipscreen_w); TILE_GET_INFO_MEMBER(get_bg_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/sonson.c -----------*/ -PALETTE_INIT( sonson ); -VIDEO_START( sonson ); + + SCREEN_UPDATE_IND16( sonson ); diff --git a/src/mame/includes/spacefb.h b/src/mame/includes/spacefb.h index 1f26eb92aa7..5875a4d36a6 100644 --- a/src/mame/includes/spacefb.h +++ b/src/mame/includes/spacefb.h @@ -46,6 +46,9 @@ public: DECLARE_READ8_MEMBER(spacefb_audio_t0_r); DECLARE_READ8_MEMBER(spacefb_audio_t1_r); DECLARE_WRITE8_MEMBER(spacefb_port_1_w); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; @@ -57,6 +60,6 @@ MACHINE_CONFIG_EXTERN( spacefb_audio ); /*----------- defined in video/spacefb.c -----------*/ -VIDEO_START( spacefb ); + SCREEN_UPDATE_RGB32( spacefb ); diff --git a/src/mame/includes/spbactn.h b/src/mame/includes/spbactn.h index 3422c1e1b81..a9eb91e9044 100644 --- a/src/mame/includes/spbactn.h +++ b/src/mame/includes/spbactn.h @@ -14,10 +14,11 @@ public: bitmap_ind16 m_tile_bitmap_bg; bitmap_ind16 m_tile_bitmap_fg; DECLARE_WRITE16_MEMBER(soundcommand_w); + virtual void video_start(); }; /*----------- defined in video/spbactn.c -----------*/ -VIDEO_START( spbactn ); + SCREEN_UPDATE_RGB32( spbactn ); diff --git a/src/mame/includes/spcforce.h b/src/mame/includes/spcforce.h index 60272ef52af..500bb505269 100644 --- a/src/mame/includes/spcforce.h +++ b/src/mame/includes/spcforce.h @@ -32,6 +32,7 @@ public: DECLARE_WRITE8_MEMBER(spcforce_soundtrigger_w); DECLARE_WRITE8_MEMBER(irq_mask_w); DECLARE_WRITE8_MEMBER(spcforce_flip_screen_w); + virtual void palette_init(); }; diff --git a/src/mame/includes/spdodgeb.h b/src/mame/includes/spdodgeb.h index 58152174922..a64fab0fbd5 100644 --- a/src/mame/includes/spdodgeb.h +++ b/src/mame/includes/spdodgeb.h @@ -43,12 +43,15 @@ public: DECLARE_WRITE8_MEMBER(spdodgeb_videoram_w); TILEMAP_MAPPER_MEMBER(background_scan); TILE_GET_INFO_MEMBER(get_bg_tile_info); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/spdodgeb.c -----------*/ -PALETTE_INIT( spdodgeb ); -VIDEO_START( spdodgeb ); + + SCREEN_UPDATE_IND16( spdodgeb ); TIMER_DEVICE_CALLBACK( spdodgeb_interrupt ); diff --git a/src/mame/includes/speedatk.h b/src/mame/includes/speedatk.h index 14e601783aa..a7ca9a90fb1 100644 --- a/src/mame/includes/speedatk.h +++ b/src/mame/includes/speedatk.h @@ -24,11 +24,13 @@ public: DECLARE_WRITE8_MEMBER(speedatk_colorram_w); DECLARE_WRITE8_MEMBER(speedatk_6845_w); DECLARE_WRITE8_MEMBER(speedatk_output_w); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/speedatk.c -----------*/ -PALETTE_INIT( speedatk ); -VIDEO_START( speedatk ); + + SCREEN_UPDATE_IND16( speedatk ); diff --git a/src/mame/includes/speedbal.h b/src/mame/includes/speedbal.h index a98f76f805e..c1bc7b38fff 100644 --- a/src/mame/includes/speedbal.h +++ b/src/mame/includes/speedbal.h @@ -17,10 +17,11 @@ public: DECLARE_WRITE8_MEMBER(speedbal_background_videoram_w); TILE_GET_INFO_MEMBER(get_tile_info_bg); TILE_GET_INFO_MEMBER(get_tile_info_fg); + virtual void video_start(); }; /*----------- defined in video/speedbal.c -----------*/ -VIDEO_START( speedbal ); + SCREEN_UPDATE_IND16( speedbal ); diff --git a/src/mame/includes/speedspn.h b/src/mame/includes/speedspn.h index 77c49abe362..a06293c51d4 100644 --- a/src/mame/includes/speedspn.h +++ b/src/mame/includes/speedspn.h @@ -20,12 +20,13 @@ public: DECLARE_WRITE8_MEMBER(speedspn_global_display_w); DECLARE_WRITE8_MEMBER(oki_banking_w); TILE_GET_INFO_MEMBER(get_speedspn_tile_info); + virtual void video_start(); }; /*----------- defined in video/speedspn.c -----------*/ -VIDEO_START( speedspn ); + SCREEN_UPDATE_IND16( speedspn ); diff --git a/src/mame/includes/spiders.h b/src/mame/includes/spiders.h index 097393fb0d7..42db9bc7904 100644 --- a/src/mame/includes/spiders.h +++ b/src/mame/includes/spiders.h @@ -28,6 +28,7 @@ public: DECLARE_WRITE_LINE_MEMBER(display_enable_changed); DECLARE_WRITE8_MEMBER(gfx_rom_intf_w); DECLARE_READ8_MEMBER(gfx_rom_r); + virtual void machine_start(); }; diff --git a/src/mame/includes/splash.h b/src/mame/includes/splash.h index 9a49d7b0884..0a44e3dcd46 100644 --- a/src/mame/includes/splash.h +++ b/src/mame/includes/splash.h @@ -59,11 +59,14 @@ public: DECLARE_DRIVER_INIT(rebus); TILE_GET_INFO_MEMBER(get_tile_info_splash_tilemap0); TILE_GET_INFO_MEMBER(get_tile_info_splash_tilemap1); + virtual void video_start(); + DECLARE_MACHINE_RESET(splash); + DECLARE_MACHINE_RESET(funystrp); }; /*----------- defined in video/splash.c -----------*/ -VIDEO_START( splash ); + SCREEN_UPDATE_IND16( splash ); SCREEN_UPDATE_IND16( funystrp ); diff --git a/src/mame/includes/sprcros2.h b/src/mame/includes/sprcros2.h index b3b1db5566e..7a3ca78c867 100644 --- a/src/mame/includes/sprcros2.h +++ b/src/mame/includes/sprcros2.h @@ -27,12 +27,15 @@ public: DECLARE_WRITE8_MEMBER(sprcros2_bgscrolly_w); TILE_GET_INFO_MEMBER(get_sprcros2_bgtile_info); TILE_GET_INFO_MEMBER(get_sprcros2_fgtile_info); + virtual void machine_start(); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/sprcros2.c -----------*/ -PALETTE_INIT( sprcros2 ); -VIDEO_START( sprcros2 ); + + SCREEN_UPDATE_IND16( sprcros2 ); diff --git a/src/mame/includes/sprint2.h b/src/mame/includes/sprint2.h index ddca0f2bfcd..3d6f0ab5b8c 100644 --- a/src/mame/includes/sprint2.h +++ b/src/mame/includes/sprint2.h @@ -62,6 +62,8 @@ public: DECLARE_DRIVER_INIT(sprint2); DECLARE_DRIVER_INIT(dominos); TILE_GET_INFO_MEMBER(get_tile_info); + virtual void video_start(); + virtual void palette_init(); }; @@ -76,8 +78,8 @@ DISCRETE_SOUND_EXTERN( dominos ); -PALETTE_INIT( sprint2 ); + SCREEN_UPDATE_IND16( sprint2 ); -VIDEO_START( sprint2 ); + SCREEN_VBLANK( sprint2 ); diff --git a/src/mame/includes/sprint4.h b/src/mame/includes/sprint4.h index 4b01410ded2..866602eda5a 100644 --- a/src/mame/includes/sprint4.h +++ b/src/mame/includes/sprint4.h @@ -35,14 +35,17 @@ public: DECLARE_WRITE8_MEMBER(sprint4_bang_w); DECLARE_WRITE8_MEMBER(sprint4_attract_w); TILE_GET_INFO_MEMBER(sprint4_tile_info); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/sprint4.c -----------*/ -PALETTE_INIT( sprint4 ); + SCREEN_VBLANK( sprint4 ); -VIDEO_START( sprint4 ); + SCREEN_UPDATE_IND16( sprint4 ); diff --git a/src/mame/includes/sprint8.h b/src/mame/includes/sprint8.h index 62f720aa3bd..6889c4bfe2c 100644 --- a/src/mame/includes/sprint8.h +++ b/src/mame/includes/sprint8.h @@ -32,6 +32,9 @@ public: DECLARE_WRITE8_MEMBER(sprint8_video_ram_w); TILE_GET_INFO_MEMBER(get_tile_info1); TILE_GET_INFO_MEMBER(get_tile_info2); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); }; @@ -42,9 +45,9 @@ void sprint8_set_collision(running_machine &machine, int n); /*----------- defined in video/sprint8.c -----------*/ -PALETTE_INIT( sprint8 ); + SCREEN_VBLANK( sprint8 ); -VIDEO_START( sprint8 ); + SCREEN_UPDATE_IND16( sprint8 ); diff --git a/src/mame/includes/spy.h b/src/mame/includes/spy.h index 2c696e9fe4c..4fe5469b7ae 100644 --- a/src/mame/includes/spy.h +++ b/src/mame/includes/spy.h @@ -41,6 +41,9 @@ public: DECLARE_WRITE8_MEMBER(sound_bank_w); DECLARE_READ8_MEMBER(k052109_051960_r); DECLARE_WRITE8_MEMBER(k052109_051960_w); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; @@ -49,5 +52,5 @@ public: extern void spy_tile_callback(running_machine &machine, int layer,int bank,int *code,int *color,int *flags,int *priority); extern void spy_sprite_callback(running_machine &machine, int *code,int *color,int *priority_mask,int *shadow); -VIDEO_START( spy ); + SCREEN_UPDATE_IND16( spy ); diff --git a/src/mame/includes/srmp2.h b/src/mame/includes/srmp2.h index 3417712e6c5..765ffff91df 100644 --- a/src/mame/includes/srmp2.h +++ b/src/mame/includes/srmp2.h @@ -41,13 +41,18 @@ public: DECLARE_WRITE8_MEMBER(rmgoldyh_rombank_w); DECLARE_WRITE16_MEMBER(srmp2_adpcm_code_w); DECLARE_WRITE8_MEMBER(srmp3_adpcm_code_w); + DECLARE_MACHINE_START(srmp2); + DECLARE_PALETTE_INIT(srmp2); + DECLARE_MACHINE_START(srmp3); + DECLARE_PALETTE_INIT(srmp3); + DECLARE_MACHINE_START(rmgoldyh); }; /*----------- defined in video/srmp2.c -----------*/ -PALETTE_INIT( srmp2 ); + SCREEN_UPDATE_IND16( srmp2 ); -PALETTE_INIT( srmp3 ); + SCREEN_UPDATE_IND16( srmp3 ); SCREEN_UPDATE_IND16( mjyuugi ); diff --git a/src/mame/includes/srumbler.h b/src/mame/includes/srumbler.h index 9296aa1a0a1..a0d576ea114 100644 --- a/src/mame/includes/srumbler.h +++ b/src/mame/includes/srumbler.h @@ -25,12 +25,14 @@ public: DECLARE_WRITE8_MEMBER(srumbler_scroll_w); TILE_GET_INFO_MEMBER(get_fg_tile_info); TILE_GET_INFO_MEMBER(get_bg_tile_info); + virtual void machine_start(); + virtual void video_start(); }; /*----------- defined in video/srumbler.c -----------*/ -VIDEO_START( srumbler ); + SCREEN_UPDATE_IND16( srumbler ); SCREEN_VBLANK( srumbler ); diff --git a/src/mame/includes/sshangha.h b/src/mame/includes/sshangha.h index 957700ecef6..50108875a50 100644 --- a/src/mame/includes/sshangha.h +++ b/src/mame/includes/sshangha.h @@ -47,11 +47,13 @@ public: DECLARE_WRITE16_MEMBER(paletteram16_xbgr_word_be_tilehigh_w); DECLARE_WRITE16_MEMBER(sshangha_video_w); DECLARE_DRIVER_INIT(sshangha); + virtual void machine_reset(); + virtual void video_start(); }; /*----------- defined in video/sshangha.c -----------*/ -VIDEO_START( sshangha ); + SCREEN_UPDATE_RGB32( sshangha ); diff --git a/src/mame/includes/sslam.h b/src/mame/includes/sslam.h index 3d55e5c60a3..55701cfe5ee 100644 --- a/src/mame/includes/sslam.h +++ b/src/mame/includes/sslam.h @@ -48,12 +48,14 @@ public: TILE_GET_INFO_MEMBER(get_sslam_md_tile_info); TILE_GET_INFO_MEMBER(get_sslam_bg_tile_info); TILE_GET_INFO_MEMBER(get_powerbls_bg_tile_info); + DECLARE_VIDEO_START(sslam); + DECLARE_VIDEO_START(powerbls); }; /*----------- defined in video/sslam.c -----------*/ -VIDEO_START(sslam); -VIDEO_START(powerbls); + + SCREEN_UPDATE_IND16(sslam); SCREEN_UPDATE_IND16(powerbls); diff --git a/src/mame/includes/ssozumo.h b/src/mame/includes/ssozumo.h index 1a7258c1da8..c57e826b526 100644 --- a/src/mame/includes/ssozumo.h +++ b/src/mame/includes/ssozumo.h @@ -33,12 +33,14 @@ public: DECLARE_INPUT_CHANGED_MEMBER(coin_inserted); TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/ssozumo.c -----------*/ -PALETTE_INIT( ssozumo ); -VIDEO_START( ssozumo ); + + SCREEN_UPDATE_IND16( ssozumo ); diff --git a/src/mame/includes/sspeedr.h b/src/mame/includes/sspeedr.h index fddcef2fdf2..4d4fc25b721 100644 --- a/src/mame/includes/sspeedr.h +++ b/src/mame/includes/sspeedr.h @@ -33,6 +33,8 @@ public: DECLARE_WRITE8_MEMBER(sspeedr_track_horz_2_w); DECLARE_WRITE8_MEMBER(sspeedr_track_vert_w); DECLARE_WRITE8_MEMBER(sspeedr_track_ice_w); + virtual void video_start(); + virtual void palette_init(); }; @@ -41,6 +43,6 @@ public: -VIDEO_START( sspeedr ); + SCREEN_UPDATE_IND16( sspeedr ); SCREEN_VBLANK( sspeedr ); diff --git a/src/mame/includes/ssrj.h b/src/mame/includes/ssrj.h index 5a09f6dec8c..bd6168f3884 100644 --- a/src/mame/includes/ssrj.h +++ b/src/mame/includes/ssrj.h @@ -26,13 +26,16 @@ public: TILE_GET_INFO_MEMBER(get_tile_info1); TILE_GET_INFO_MEMBER(get_tile_info2); TILE_GET_INFO_MEMBER(get_tile_info4); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/ssrj.c -----------*/ -VIDEO_START( ssrj ); + SCREEN_UPDATE_IND16( ssrj ); SCREEN_VBLANK( ssrj ); -PALETTE_INIT( ssrj ); + diff --git a/src/mame/includes/ssv.h b/src/mame/includes/ssv.h index fa57476c9cb..fa68efa6a0a 100644 --- a/src/mame/includes/ssv.h +++ b/src/mame/includes/ssv.h @@ -121,15 +121,19 @@ public: DECLARE_DRIVER_INIT(twineag2); DECLARE_DRIVER_INIT(mslider); TILE_GET_INFO_MEMBER(get_tile_info_0); + virtual void machine_reset(); + virtual void video_start(); + DECLARE_VIDEO_START(gdfs); + DECLARE_VIDEO_START(eaglshot); }; /*----------- defined in video/ssv.c -----------*/ void ssv_enable_video(running_machine &machine, int enable); -VIDEO_START( ssv ); -VIDEO_START( eaglshot ); -VIDEO_START( gdfs ); + + + SCREEN_UPDATE_IND16( ssv ); SCREEN_UPDATE_IND16( eaglshot ); diff --git a/src/mame/includes/st0016.h b/src/mame/includes/st0016.h index b8b424800b0..a20fa4e348f 100644 --- a/src/mame/includes/st0016.h +++ b/src/mame/includes/st0016.h @@ -36,6 +36,7 @@ public: DECLARE_DRIVER_INIT(mayjinsn); DECLARE_DRIVER_INIT(mayjisn2); DECLARE_DRIVER_INIT(renju); + DECLARE_VIDEO_START(st0016); }; #define ISMACS (st0016_game&0x80) @@ -69,5 +70,5 @@ extern UINT8 *st0016_charram; void st0016_draw_screen(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); -VIDEO_START(st0016); + SCREEN_UPDATE_IND16(st0016); diff --git a/src/mame/includes/stactics.h b/src/mame/includes/stactics.h index a7fea14de28..b6c9b23bd80 100644 --- a/src/mame/includes/stactics.h +++ b/src/mame/includes/stactics.h @@ -56,6 +56,9 @@ public: DECLARE_CUSTOM_INPUT_MEMBER(stactics_get_not_shot_arrive); DECLARE_CUSTOM_INPUT_MEMBER(get_motor_not_ready); DECLARE_CUSTOM_INPUT_MEMBER(get_rng); + virtual void machine_start(); + DECLARE_VIDEO_START(stactics); + DECLARE_PALETTE_INIT(stactics); }; diff --git a/src/mame/includes/stadhero.h b/src/mame/includes/stadhero.h index b1a333daa29..43453b0db71 100644 --- a/src/mame/includes/stadhero.h +++ b/src/mame/includes/stadhero.h @@ -14,11 +14,12 @@ public: DECLARE_WRITE16_MEMBER(stadhero_control_w); DECLARE_WRITE16_MEMBER(stadhero_pf1_data_w); TILE_GET_INFO_MEMBER(get_pf1_tile_info); + virtual void video_start(); }; /*----------- defined in video/stadhero.c -----------*/ -VIDEO_START( stadhero ); + SCREEN_UPDATE_IND16( stadhero ); diff --git a/src/mame/includes/starcrus.h b/src/mame/includes/starcrus.h index e542c2a909f..a0fb8bda970 100644 --- a/src/mame/includes/starcrus.h +++ b/src/mame/includes/starcrus.h @@ -49,10 +49,11 @@ public: DECLARE_WRITE8_MEMBER(starcrus_proj_parm_1_w); DECLARE_WRITE8_MEMBER(starcrus_proj_parm_2_w); DECLARE_READ8_MEMBER(starcrus_coll_det_r); + virtual void video_start(); }; /*----------- defined in video/starcrus.c -----------*/ -VIDEO_START( starcrus ); + SCREEN_UPDATE_IND16( starcrus ); diff --git a/src/mame/includes/starfire.h b/src/mame/includes/starfire.h index 07c7f693ddf..b97ab955e3a 100644 --- a/src/mame/includes/starfire.h +++ b/src/mame/includes/starfire.h @@ -42,11 +42,12 @@ public: DECLARE_READ8_MEMBER(starfire_videoram_r); DECLARE_DRIVER_INIT(starfire); DECLARE_DRIVER_INIT(fireone); + virtual void video_start(); }; /*----------- defined in video/starfire.c -----------*/ SCREEN_UPDATE_RGB32( starfire ); -VIDEO_START( starfire ); + diff --git a/src/mame/includes/starshp1.h b/src/mame/includes/starshp1.h index 44e0c701dba..9cf0fc3bd66 100644 --- a/src/mame/includes/starshp1.h +++ b/src/mame/includes/starshp1.h @@ -76,6 +76,8 @@ public: DECLARE_WRITE8_MEMBER(starshp1_audio_w); DECLARE_WRITE8_MEMBER(starshp1_analog_out_w); TILE_GET_INFO_MEMBER(get_tile_info); + virtual void video_start(); + virtual void palette_init(); }; @@ -83,10 +85,10 @@ public: -PALETTE_INIT( starshp1 ); + SCREEN_UPDATE_IND16( starshp1 ); SCREEN_VBLANK( starshp1 ); -VIDEO_START( starshp1 ); + /*----------- defined in audio/starshp1.c -----------*/ diff --git a/src/mame/includes/starwars.h b/src/mame/includes/starwars.h index cf54bcc27df..ab48474255e 100644 --- a/src/mame/includes/starwars.h +++ b/src/mame/includes/starwars.h @@ -61,6 +61,7 @@ public: DECLARE_DIRECT_UPDATE_MEMBER(esb_setdirect); DECLARE_DRIVER_INIT(esb); DECLARE_DRIVER_INIT(starwars); + virtual void machine_reset(); }; diff --git a/src/mame/includes/stfight.h b/src/mame/includes/stfight.h index ed2f18b6828..5163d551db6 100644 --- a/src/mame/includes/stfight.h +++ b/src/mame/includes/stfight.h @@ -42,12 +42,15 @@ public: TILEMAP_MAPPER_MEMBER(bg_scan); TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_tx_tile_info); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in machine/stfight.c -----------*/ -MACHINE_RESET( stfight ); + INTERRUPT_GEN( stfight_vb_interrupt ); void stfight_adpcm_int(device_t *device); WRITE8_DEVICE_HANDLER( stfight_adpcm_control_w ); @@ -55,6 +58,6 @@ WRITE8_DEVICE_HANDLER( stfight_adpcm_control_w ); /*----------- defined in video/stfight.c -----------*/ -PALETTE_INIT( stfight ); -VIDEO_START( stfight ); + + SCREEN_UPDATE_IND16( stfight ); diff --git a/src/mame/includes/stlforce.h b/src/mame/includes/stlforce.h index 6d3b750c034..00fd9df6c79 100644 --- a/src/mame/includes/stlforce.h +++ b/src/mame/includes/stlforce.h @@ -42,10 +42,11 @@ public: TILE_GET_INFO_MEMBER(get_stlforce_mlow_tile_info); TILE_GET_INFO_MEMBER(get_stlforce_mhigh_tile_info); TILE_GET_INFO_MEMBER(get_stlforce_tx_tile_info); + virtual void video_start(); }; /*----------- defined in video/stlforce.c -----------*/ -VIDEO_START( stlforce ); + SCREEN_UPDATE_IND16( stlforce ); diff --git a/src/mame/includes/strnskil.h b/src/mame/includes/strnskil.h index 329a97afbd3..676779b48fa 100644 --- a/src/mame/includes/strnskil.h +++ b/src/mame/includes/strnskil.h @@ -28,12 +28,14 @@ public: DECLARE_DRIVER_INIT(banbam); DECLARE_DRIVER_INIT(pettanp); TILE_GET_INFO_MEMBER(get_bg_tile_info); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/strnskil.c -----------*/ -PALETTE_INIT( strnskil ); -VIDEO_START( strnskil ); + + SCREEN_UPDATE_IND16( strnskil ); diff --git a/src/mame/includes/stv.h b/src/mame/includes/stv.h index afbf7f31b33..e95bdb01c8d 100644 --- a/src/mame/includes/stv.h +++ b/src/mame/includes/stv.h @@ -193,6 +193,11 @@ public: DECLARE_DRIVER_INIT(saturnus); DECLARE_DRIVER_INIT(saturneu); DECLARE_DRIVER_INIT(saturnjp); + DECLARE_MACHINE_START(saturn); + DECLARE_MACHINE_RESET(saturn); + DECLARE_VIDEO_START(stv_vdp2); + DECLARE_MACHINE_START(stv); + DECLARE_MACHINE_RESET(stv); }; #define MASTER_CLOCK_352 57272720 @@ -256,7 +261,7 @@ WRITE32_HANDLER ( saturn_vdp2_vram_w ); WRITE32_HANDLER ( saturn_vdp2_cram_w ); WRITE16_HANDLER ( saturn_vdp2_regs_w ); -VIDEO_START ( stv_vdp2 ); + SCREEN_UPDATE_RGB32( stv_vdp2 ); #if NEW_VIDEO_CODE SCREEN_UPDATE_RGB32( saturn ); diff --git a/src/mame/includes/subs.h b/src/mame/includes/subs.h index b8d104fc9b6..4b94c224123 100644 --- a/src/mame/includes/subs.h +++ b/src/mame/includes/subs.h @@ -40,12 +40,14 @@ public: DECLARE_WRITE8_MEMBER(subs_lamp2_w); DECLARE_WRITE8_MEMBER(subs_invert1_w); DECLARE_WRITE8_MEMBER(subs_invert2_w); + virtual void machine_reset(); + virtual void palette_init(); }; /*----------- defined in machine/subs.c -----------*/ -MACHINE_RESET( subs ); + INTERRUPT_GEN( subs_interrupt ); diff --git a/src/mame/includes/suna16.h b/src/mame/includes/suna16.h index 3664707cfc6..8b041909e2f 100644 --- a/src/mame/includes/suna16.h +++ b/src/mame/includes/suna16.h @@ -34,6 +34,8 @@ public: DECLARE_WRITE8_MEMBER(bssoccer_DAC4_w); DECLARE_WRITE8_MEMBER(bestbest_ay8910_port_a_w); DECLARE_DRIVER_INIT(uballoon); + virtual void video_start(); + DECLARE_MACHINE_RESET(uballoon); }; @@ -41,6 +43,6 @@ public: -VIDEO_START( suna16 ); + SCREEN_UPDATE_IND16( suna16 ); SCREEN_UPDATE_IND16( bestbest ); diff --git a/src/mame/includes/suna8.h b/src/mame/includes/suna8.h index a454d82a339..ae8e8e020de 100644 --- a/src/mame/includes/suna8.h +++ b/src/mame/includes/suna8.h @@ -98,6 +98,11 @@ public: DECLARE_DRIVER_INIT(brickzn); DECLARE_DRIVER_INIT(hardhead); DECLARE_DRIVER_INIT(suna8); + DECLARE_VIDEO_START(suna8_textdim12); + DECLARE_VIDEO_START(suna8_textdim8); + DECLARE_MACHINE_RESET(brickzn); + DECLARE_VIDEO_START(suna8_textdim0); + DECLARE_MACHINE_RESET(hardhea2); }; @@ -113,7 +118,7 @@ SAMPLES_START( suna8_sh_start ); -VIDEO_START( suna8_textdim0 ); -VIDEO_START( suna8_textdim8 ); -VIDEO_START( suna8_textdim12 ); + + + SCREEN_UPDATE_IND16( suna8 ); diff --git a/src/mame/includes/supbtime.h b/src/mame/includes/supbtime.h index ef9cda5108d..70ed5b58bd8 100644 --- a/src/mame/includes/supbtime.h +++ b/src/mame/includes/supbtime.h @@ -27,6 +27,7 @@ public: device_t *m_deco_tilegen1; DECLARE_READ16_MEMBER(supbtime_controls_r); DECLARE_WRITE16_MEMBER(sound_w); + virtual void machine_start(); }; diff --git a/src/mame/includes/superchs.h b/src/mame/includes/superchs.h index 29ca298d48c..15d24389159 100644 --- a/src/mame/includes/superchs.h +++ b/src/mame/includes/superchs.h @@ -37,10 +37,11 @@ public: DECLARE_READ32_MEMBER(main_cycle_r); DECLARE_READ16_MEMBER(sub_cycle_r); DECLARE_DRIVER_INIT(superchs); + virtual void video_start(); }; /*----------- defined in video/superchs.c -----------*/ -VIDEO_START( superchs ); + SCREEN_UPDATE_IND16( superchs ); diff --git a/src/mame/includes/superqix.h b/src/mame/includes/superqix.h index c8b1154393a..4120e28a03f 100644 --- a/src/mame/includes/superqix.h +++ b/src/mame/includes/superqix.h @@ -72,13 +72,17 @@ public: DECLARE_DRIVER_INIT(sqixa); TILE_GET_INFO_MEMBER(pb_get_bg_tile_info); TILE_GET_INFO_MEMBER(sqix_get_bg_tile_info); + DECLARE_MACHINE_START(pbillian); + DECLARE_VIDEO_START(pbillian); + DECLARE_MACHINE_START(superqix); + DECLARE_VIDEO_START(superqix); }; /*----------- defined in video/superqix.c -----------*/ -VIDEO_START( pbillian ); + SCREEN_UPDATE_IND16( pbillian ); -VIDEO_START( superqix ); + SCREEN_UPDATE_IND16( superqix ); diff --git a/src/mame/includes/suprloco.h b/src/mame/includes/suprloco.h index d8154a70333..4c0320b8c1e 100644 --- a/src/mame/includes/suprloco.h +++ b/src/mame/includes/suprloco.h @@ -20,11 +20,13 @@ public: DECLARE_READ8_MEMBER(suprloco_control_r); DECLARE_DRIVER_INIT(suprloco); TILE_GET_INFO_MEMBER(get_tile_info); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/suprloco.c -----------*/ -PALETTE_INIT( suprloco ); -VIDEO_START( suprloco ); + + SCREEN_UPDATE_IND16( suprloco ); diff --git a/src/mame/includes/suprnova.h b/src/mame/includes/suprnova.h index ccb2f841eba..ea9bc48f5e9 100644 --- a/src/mame/includes/suprnova.h +++ b/src/mame/includes/suprnova.h @@ -126,6 +126,14 @@ public: DECLARE_DRIVER_INIT(ryouran); TILE_GET_INFO_MEMBER(get_tilemap_A_tile_info); TILE_GET_INFO_MEMBER(get_tilemap_B_tile_info); + virtual void machine_reset(); + virtual void video_start(); + virtual void video_reset(); + DECLARE_MACHINE_RESET(sknsa); + DECLARE_MACHINE_RESET(sknsj); + DECLARE_MACHINE_RESET(sknsu); + DECLARE_MACHINE_RESET(sknse); + DECLARE_MACHINE_RESET(sknsk); }; @@ -138,7 +146,7 @@ void skns_draw_sprites( UINT8* gfx_source, size_t gfx_length, UINT32* sprite_regs ); -VIDEO_START(skns); -VIDEO_RESET(skns); + + SCREEN_VBLANK(skns); SCREEN_UPDATE_RGB32(skns); diff --git a/src/mame/includes/suprridr.h b/src/mame/includes/suprridr.h index 1e4f4758611..d9131985992 100644 --- a/src/mame/includes/suprridr.h +++ b/src/mame/includes/suprridr.h @@ -38,13 +38,15 @@ public: DECLARE_READ8_MEMBER(sound_data_r); TILE_GET_INFO_MEMBER(get_tile_info); TILE_GET_INFO_MEMBER(get_tile_info2); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/suprridr.c -----------*/ -VIDEO_START( suprridr ); -PALETTE_INIT( suprridr ); + + int suprridr_is_screen_flipped(running_machine &machine); diff --git a/src/mame/includes/suprslam.h b/src/mame/includes/suprslam.h index 212af1f83a5..7ad0a1d061f 100644 --- a/src/mame/includes/suprslam.h +++ b/src/mame/includes/suprslam.h @@ -46,11 +46,14 @@ public: DECLARE_WRITE16_MEMBER(suprslam_bank_w); TILE_GET_INFO_MEMBER(get_suprslam_tile_info); TILE_GET_INFO_MEMBER(get_suprslam_bg_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; /*----------- defined in video/suprslam.c -----------*/ -VIDEO_START( suprslam ); + SCREEN_UPDATE_IND16( suprslam ); diff --git a/src/mame/includes/surpratk.h b/src/mame/includes/surpratk.h index 263c6b674a7..8631bd3a116 100644 --- a/src/mame/includes/surpratk.h +++ b/src/mame/includes/surpratk.h @@ -32,6 +32,8 @@ public: DECLARE_WRITE8_MEMBER(bankedram_w); DECLARE_WRITE8_MEMBER(surpratk_videobank_w); DECLARE_WRITE8_MEMBER(surpratk_5fc0_w); + virtual void machine_start(); + virtual void machine_reset(); }; /*----------- defined in video/surpratk.c -----------*/ diff --git a/src/mame/includes/system1.h b/src/mame/includes/system1.h index 679f7eb47f1..407806c6300 100644 --- a/src/mame/includes/system1.h +++ b/src/mame/includes/system1.h @@ -99,13 +99,18 @@ public: DECLARE_DRIVER_INIT(gardia); DECLARE_DRIVER_INIT(spatter); TILE_GET_INFO_MEMBER(tile_get_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); + DECLARE_MACHINE_START(system2); + DECLARE_VIDEO_START(system2); }; /*----------- defined in video/system1.c -----------*/ -VIDEO_START( system1 ); -VIDEO_START( system2 ); + + WRITE8_DEVICE_HANDLER( system1_videoram_bank_w ); diff --git a/src/mame/includes/system16.h b/src/mame/includes/system16.h index db789899af8..43dd9f42112 100644 --- a/src/mame/includes/system16.h +++ b/src/mame/includes/system16.h @@ -183,14 +183,16 @@ public: TILE_GET_INFO_MEMBER(get_s16a_bootleg_tile_infotxt); TILE_GET_INFO_MEMBER(get_s16a_bootleg_tile_info0); TILE_GET_INFO_MEMBER(get_s16a_bootleg_tile_info1); + DECLARE_VIDEO_START(system16); + DECLARE_VIDEO_START(system18old); + DECLARE_VIDEO_START(s16a_bootleg_shinobi); + DECLARE_VIDEO_START(s16a_bootleg_passsht); + DECLARE_VIDEO_START(s16a_bootleg_wb3bl); + DECLARE_VIDEO_START(s16a_bootleg); }; /*----------- defined in video/system16.c -----------*/ -extern VIDEO_START( s16a_bootleg ); -extern VIDEO_START( s16a_bootleg_wb3bl ); -extern VIDEO_START( s16a_bootleg_shinobi ); -extern VIDEO_START( s16a_bootleg_passsht ); extern SCREEN_UPDATE_IND16( s16a_bootleg ); extern SCREEN_UPDATE_IND16( s16a_bootleg_passht4b ); diff --git a/src/mame/includes/tagteam.h b/src/mame/includes/tagteam.h index 38e41a36b61..6a00b1becc5 100644 --- a/src/mame/includes/tagteam.h +++ b/src/mame/includes/tagteam.h @@ -25,12 +25,14 @@ public: DECLARE_WRITE8_MEMBER(tagteam_flipscreen_w); DECLARE_INPUT_CHANGED_MEMBER(coin_inserted); TILE_GET_INFO_MEMBER(get_bg_tile_info); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/tagteam.c -----------*/ -PALETTE_INIT( tagteam ); -VIDEO_START( tagteam ); + + SCREEN_UPDATE_IND16( tagteam ); diff --git a/src/mame/includes/tail2nos.h b/src/mame/includes/tail2nos.h index cea15f07321..539481da45d 100644 --- a/src/mame/includes/tail2nos.h +++ b/src/mame/includes/tail2nos.h @@ -35,6 +35,9 @@ public: DECLARE_WRITE16_MEMBER(tail2nos_gfxbank_w); DECLARE_WRITE8_MEMBER(sound_bankswitch_w); TILE_GET_INFO_MEMBER(get_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; @@ -43,5 +46,5 @@ public: extern void tail2nos_zoom_callback(running_machine &machine, int *code,int *color,int *flags); -VIDEO_START( tail2nos ); + SCREEN_UPDATE_IND16( tail2nos ); diff --git a/src/mame/includes/taito_b.h b/src/mame/includes/taito_b.h index fb1c111e11c..21c2c171e4f 100644 --- a/src/mame/includes/taito_b.h +++ b/src/mame/includes/taito_b.h @@ -61,6 +61,15 @@ public: DECLARE_WRITE16_MEMBER(tc0180vcu_framebuffer_word_w); DECLARE_INPUT_CHANGED_MEMBER(realpunc_sensor); DECLARE_DRIVER_INIT(taito_b); + virtual void machine_start(); + virtual void machine_reset(); + DECLARE_VIDEO_START(taitob_color_order0); + DECLARE_VIDEO_START(taitob_color_order1); + DECLARE_VIDEO_START(taitob_color_order2); + DECLARE_VIDEO_START(hitice); + DECLARE_VIDEO_RESET(hitice); + DECLARE_VIDEO_START(realpunc); + DECLARE_VIDEO_START(taitob_core); }; @@ -69,13 +78,13 @@ public: -VIDEO_START( taitob_color_order0 ); -VIDEO_START( taitob_color_order1 ); -VIDEO_START( taitob_color_order2 ); -VIDEO_START( hitice ); -VIDEO_START( realpunc ); -VIDEO_RESET( hitice ); + + + + + + SCREEN_UPDATE_RGB32( realpunc ); SCREEN_UPDATE_IND16( taitob ); diff --git a/src/mame/includes/taito_f2.h b/src/mame/includes/taito_f2.h index 126a1d3c82a..1dfd5f49bd3 100644 --- a/src/mame/includes/taito_f2.h +++ b/src/mame/includes/taito_f2.h @@ -103,34 +103,60 @@ public: DECLARE_DRIVER_INIT(cameltry); DECLARE_DRIVER_INIT(mjnquest); DECLARE_DRIVER_INIT(finalb); + DECLARE_MACHINE_START(f2); + DECLARE_VIDEO_START(taitof2_default); + DECLARE_MACHINE_START(common); + DECLARE_VIDEO_START(taitof2_dondokod); + DECLARE_VIDEO_START(taitof2_driftout); + DECLARE_VIDEO_START(taitof2_finalb); + DECLARE_VIDEO_START(taitof2_megab); + DECLARE_VIDEO_START(taitof2_thundfox); + DECLARE_VIDEO_START(taitof2_ssi); + DECLARE_VIDEO_START(taitof2_gunfront); + DECLARE_VIDEO_START(taitof2_growl); + DECLARE_VIDEO_START(taitof2_mjnquest); + DECLARE_VIDEO_START(taitof2_footchmp); + DECLARE_VIDEO_START(taitof2_hthero); + DECLARE_VIDEO_START(taitof2_koshien); + DECLARE_VIDEO_START(taitof2_yuyugogo); + DECLARE_VIDEO_START(taitof2_ninjak); + DECLARE_VIDEO_START(taitof2_solfigtr); + DECLARE_VIDEO_START(taitof2_pulirula); + DECLARE_VIDEO_START(taitof2_metalb); + DECLARE_VIDEO_START(taitof2_qzchikyu); + DECLARE_VIDEO_START(taitof2_yesnoj); + DECLARE_VIDEO_START(taitof2_deadconx); + DECLARE_VIDEO_START(taitof2_deadconxj); + DECLARE_VIDEO_START(taitof2_dinorex); + DECLARE_VIDEO_START(taitof2_quiz); }; /*----------- defined in video/taito_f2.c -----------*/ -VIDEO_START( taitof2_default ); -VIDEO_START( taitof2_quiz ); -VIDEO_START( taitof2_finalb ); -VIDEO_START( taitof2_megab ); -VIDEO_START( taitof2_solfigtr ); -VIDEO_START( taitof2_koshien ); -VIDEO_START( taitof2_driftout ); -VIDEO_START( taitof2_dondokod ); -VIDEO_START( taitof2_thundfox ); -VIDEO_START( taitof2_growl ); -VIDEO_START( taitof2_yuyugogo ); -VIDEO_START( taitof2_mjnquest ); -VIDEO_START( taitof2_footchmp ); -VIDEO_START( taitof2_hthero ); -VIDEO_START( taitof2_ssi ); -VIDEO_START( taitof2_gunfront ); -VIDEO_START( taitof2_ninjak ); -VIDEO_START( taitof2_pulirula ); -VIDEO_START( taitof2_metalb ); -VIDEO_START( taitof2_qzchikyu ); -VIDEO_START( taitof2_yesnoj ); -VIDEO_START( taitof2_deadconx ); -VIDEO_START( taitof2_deadconxj ); -VIDEO_START( taitof2_dinorex ); + + + + + + + + + + + + + + + + + + + + + + + + SCREEN_VBLANK( taitof2_no_buffer ); SCREEN_VBLANK( taitof2_full_buffer_delayed ); SCREEN_VBLANK( taitof2_partial_buffer_delayed ); diff --git a/src/mame/includes/taito_f3.h b/src/mame/includes/taito_f3.h index 750b76ae29f..3da24e10e49 100644 --- a/src/mame/includes/taito_f3.h +++ b/src/mame/includes/taito_f3.h @@ -268,12 +268,14 @@ public: TILE_GET_INFO_MEMBER(get_tile_info8); TILE_GET_INFO_MEMBER(get_tile_info_vram); TILE_GET_INFO_MEMBER(get_tile_info_pixel); + DECLARE_MACHINE_START(f3); + DECLARE_VIDEO_START(f3); }; /*----------- defined in video/taito_f3.c -----------*/ -VIDEO_START( f3 ); + SCREEN_UPDATE_RGB32( f3 ); SCREEN_VBLANK( f3 ); diff --git a/src/mame/includes/taito_h.h b/src/mame/includes/taito_h.h index 943a440d330..2e81a887648 100644 --- a/src/mame/includes/taito_h.h +++ b/src/mame/includes/taito_h.h @@ -25,6 +25,8 @@ public: device_t *m_tc0220ioc; DECLARE_READ8_MEMBER(syvalion_input_bypass_r); DECLARE_WRITE8_MEMBER(sound_bankswitch_w); + virtual void machine_start(); + virtual void machine_reset(); }; /*----------- defined in video/taito_h.c -----------*/ diff --git a/src/mame/includes/taito_l.h b/src/mame/includes/taito_l.h index 67e271c8821..53205a9697b 100644 --- a/src/mame/includes/taito_l.h +++ b/src/mame/includes/taito_l.h @@ -107,12 +107,24 @@ public: TILE_GET_INFO_MEMBER(get_bg18_tile_info); TILE_GET_INFO_MEMBER(get_bg19_tile_info); TILE_GET_INFO_MEMBER(get_ch1a_tile_info); + DECLARE_MACHINE_START(taito_l); + DECLARE_MACHINE_RESET(fhawk); + DECLARE_VIDEO_START(taitol); + DECLARE_MACHINE_RESET(kurikint); + DECLARE_MACHINE_RESET(plotting); + DECLARE_MACHINE_RESET(evilston); + DECLARE_MACHINE_RESET(champwr); + DECLARE_MACHINE_RESET(raimais); + DECLARE_MACHINE_RESET(puzznic); + DECLARE_MACHINE_RESET(horshoes); + DECLARE_MACHINE_RESET(palamed); + DECLARE_MACHINE_RESET(cachat); }; /*----------- defined in video/taito_l.c -----------*/ SCREEN_VBLANK( taitol ); -VIDEO_START( taitol ); + SCREEN_UPDATE_IND16( taitol ); void taitol_chardef14_m(running_machine &machine, int offset); diff --git a/src/mame/includes/taito_o.h b/src/mame/includes/taito_o.h index bf690fe84b8..8110f2f5040 100644 --- a/src/mame/includes/taito_o.h +++ b/src/mame/includes/taito_o.h @@ -18,6 +18,7 @@ public: device_t *m_tc0080vco; DECLARE_WRITE16_MEMBER(io_w); DECLARE_READ16_MEMBER(io_r); + virtual void machine_start(); }; /*----------- defined in video/taito_o.c -----------*/ diff --git a/src/mame/includes/taito_z.h b/src/mame/includes/taito_z.h index f76ac41aa6e..2a94a266fb0 100644 --- a/src/mame/includes/taito_z.h +++ b/src/mame/includes/taito_z.h @@ -73,12 +73,16 @@ public: DECLARE_CUSTOM_INPUT_MEMBER(taitoz_pedal_r); DECLARE_DRIVER_INIT(taitoz); DECLARE_DRIVER_INIT(bshark); + DECLARE_MACHINE_START(taitoz); + DECLARE_MACHINE_RESET(taitoz); + DECLARE_VIDEO_START(taitoz); + DECLARE_MACHINE_START(bshark); }; /*----------- defined in video/taito_z.c -----------*/ -VIDEO_START( taitoz ); + SCREEN_UPDATE_IND16( contcirc ); SCREEN_UPDATE_IND16( chasehq ); diff --git a/src/mame/includes/taitoair.h b/src/mame/includes/taitoair.h index f146f49221e..9f4b5f36a56 100644 --- a/src/mame/includes/taitoair.h +++ b/src/mame/includes/taitoair.h @@ -79,12 +79,15 @@ public: DECLARE_WRITE16_MEMBER(dsp_rasterize_w); DECLARE_READ16_MEMBER(dsp_x_return_r); DECLARE_READ16_MEMBER(dsp_y_return_r); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; /*----------- defined in video/taitoair.c -----------*/ SCREEN_UPDATE_IND16( taitoair ); -VIDEO_START( taitoair ); + diff --git a/src/mame/includes/taitojc.h b/src/mame/includes/taitojc.h index f8c75ec7305..da3a46862ae 100644 --- a/src/mame/includes/taitojc.h +++ b/src/mame/includes/taitojc.h @@ -157,6 +157,8 @@ public: DECLARE_DRIVER_INIT(dangcurv); DECLARE_DRIVER_INIT(taitojc); TILE_GET_INFO_MEMBER(taitojc_tile_info); + virtual void machine_reset(); + virtual void video_start(); }; @@ -165,7 +167,7 @@ public: void taitojc_clear_frame(running_machine &machine); void taitojc_render_polygons(running_machine &machine, UINT16 *polygon_fifo, int length); -VIDEO_START(taitojc); + SCREEN_UPDATE_IND16(taitojc); SCREEN_UPDATE_IND16(dendego); diff --git a/src/mame/includes/taitosj.h b/src/mame/includes/taitosj.h index 3039da4aa8b..681a9ef2d3c 100644 --- a/src/mame/includes/taitosj.h +++ b/src/mame/includes/taitosj.h @@ -85,18 +85,21 @@ public: DECLARE_DRIVER_INIT(taitosj); DECLARE_DRIVER_INIT(junglhbr); DECLARE_DRIVER_INIT(spacecr); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; /*----------- defined in machine/taitosj.c -----------*/ -MACHINE_START( taitosj ); -MACHINE_RESET( taitosj ); + + /*----------- defined in video/taitosj.c -----------*/ -VIDEO_START( taitosj ); + SCREEN_UPDATE_IND16( taitosj ); SCREEN_UPDATE_IND16( kikstart ); diff --git a/src/mame/includes/tank8.h b/src/mame/includes/tank8.h index 4001ad8d862..f91aa944d00 100644 --- a/src/mame/includes/tank8.h +++ b/src/mame/includes/tank8.h @@ -56,6 +56,9 @@ public: DECLARE_WRITE8_MEMBER(tank8_motor_w); DECLARE_DRIVER_INIT(decode); TILE_GET_INFO_MEMBER(tank8_get_tile_info); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); }; @@ -71,9 +74,9 @@ void tank8_set_collision(running_machine &machine, int index); /*----------- defined in video/tank8.c -----------*/ -PALETTE_INIT( tank8 ); + SCREEN_VBLANK( tank8 ); -VIDEO_START( tank8 ); + SCREEN_UPDATE_IND16( tank8 ); diff --git a/src/mame/includes/tankbatt.h b/src/mame/includes/tankbatt.h index 9172b9df5e9..5c8ffae47f7 100644 --- a/src/mame/includes/tankbatt.h +++ b/src/mame/includes/tankbatt.h @@ -27,12 +27,14 @@ public: DECLARE_WRITE8_MEMBER(tankbatt_videoram_w); DECLARE_INPUT_CHANGED_MEMBER(coin_inserted); TILE_GET_INFO_MEMBER(get_bg_tile_info); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/tankbatt.c -----------*/ -PALETTE_INIT( tankbatt ); -VIDEO_START( tankbatt ); + + SCREEN_UPDATE_IND16( tankbatt ); diff --git a/src/mame/includes/tankbust.h b/src/mame/includes/tankbust.h index 1bce8779b78..3023f0567b8 100644 --- a/src/mame/includes/tankbust.h +++ b/src/mame/includes/tankbust.h @@ -39,12 +39,15 @@ public: DECLARE_READ8_MEMBER(tankbust_soundtimer_r); TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_txt_tile_info); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/tankbust.c -----------*/ -VIDEO_START( tankbust ); + SCREEN_UPDATE_IND16( tankbust ); diff --git a/src/mame/includes/taotaido.h b/src/mame/includes/taotaido.h index b9cb6e08dfa..3becb7a55f7 100644 --- a/src/mame/includes/taotaido.h +++ b/src/mame/includes/taotaido.h @@ -29,11 +29,12 @@ public: DECLARE_WRITE16_MEMBER(taotaido_bgvideoram_w); TILE_GET_INFO_MEMBER(taotaido_bg_tile_info); TILEMAP_MAPPER_MEMBER(taotaido_tilemap_scan_rows); + virtual void video_start(); }; /*----------- defined in video/taotaido.c -----------*/ -VIDEO_START( taotaido ); + SCREEN_UPDATE_IND16( taotaido ); SCREEN_VBLANK( taotaido ); diff --git a/src/mame/includes/targeth.h b/src/mame/includes/targeth.h index b04edcb8211..7d1629b3566 100644 --- a/src/mame/includes/targeth.h +++ b/src/mame/includes/targeth.h @@ -19,10 +19,11 @@ public: DECLARE_WRITE16_MEMBER(targeth_vram_w); TILE_GET_INFO_MEMBER(get_tile_info_targeth_screen0); TILE_GET_INFO_MEMBER(get_tile_info_targeth_screen1); + virtual void video_start(); }; /*----------- defined in video/targeth.c -----------*/ -VIDEO_START( targeth ); + SCREEN_UPDATE_IND16( targeth ); diff --git a/src/mame/includes/tatsumi.h b/src/mame/includes/tatsumi.h index f9af3a96357..3a02c61c95d 100644 --- a/src/mame/includes/tatsumi.h +++ b/src/mame/includes/tatsumi.h @@ -115,6 +115,11 @@ public: TILE_GET_INFO_MEMBER(get_text_tile_info); TILE_GET_INFO_MEMBER(get_tile_info_bigfight_0); TILE_GET_INFO_MEMBER(get_tile_info_bigfight_1); + DECLARE_MACHINE_RESET(apache3); + DECLARE_VIDEO_START(apache3); + DECLARE_VIDEO_START(roundup5); + DECLARE_VIDEO_START(cyclwarr); + DECLARE_VIDEO_START(bigfight); }; @@ -131,10 +136,10 @@ void tatsumi_reset(running_machine &machine); -VIDEO_START( apache3 ); -VIDEO_START( roundup5 ); -VIDEO_START( cyclwarr ); -VIDEO_START( bigfight ); + + + + SCREEN_UPDATE_RGB32( roundup5 ); SCREEN_UPDATE_RGB32( apache3 ); diff --git a/src/mame/includes/tbowl.h b/src/mame/includes/tbowl.h index cab6a639027..6961a53d227 100644 --- a/src/mame/includes/tbowl.h +++ b/src/mame/includes/tbowl.h @@ -48,6 +48,8 @@ public: TILE_GET_INFO_MEMBER(get_tx_tile_info); TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_bg2_tile_info); + virtual void machine_reset(); + virtual void video_start(); }; @@ -55,7 +57,7 @@ public: -VIDEO_START( tbowl ); + SCREEN_UPDATE_IND16( tbowl_left ); SCREEN_UPDATE_IND16( tbowl_right ); diff --git a/src/mame/includes/tceptor.h b/src/mame/includes/tceptor.h index e860020048b..19199f0ff0e 100644 --- a/src/mame/includes/tceptor.h +++ b/src/mame/includes/tceptor.h @@ -56,13 +56,17 @@ public: TILE_GET_INFO_MEMBER(get_tx_tile_info); TILE_GET_INFO_MEMBER(get_bg1_tile_info); TILE_GET_INFO_MEMBER(get_bg2_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/tceptor.c -----------*/ -PALETTE_INIT( tceptor ); -VIDEO_START( tceptor ); + + SCREEN_UPDATE_IND16( tceptor_2d ); SCREEN_UPDATE_IND16( tceptor_3d_left ); SCREEN_UPDATE_IND16( tceptor_3d_right ); diff --git a/src/mame/includes/tecmo.h b/src/mame/includes/tecmo.h index ec58bf24fcb..90448b7c5dc 100644 --- a/src/mame/includes/tecmo.h +++ b/src/mame/includes/tecmo.h @@ -46,11 +46,13 @@ public: TILE_GET_INFO_MEMBER(gemini_get_bg_tile_info); TILE_GET_INFO_MEMBER(gemini_get_fg_tile_info); TILE_GET_INFO_MEMBER(get_tx_tile_info); + DECLARE_MACHINE_RESET(rygar); + DECLARE_VIDEO_START(tecmo); }; /*----------- defined in video/tecmo.c -----------*/ -VIDEO_START( tecmo ); + SCREEN_UPDATE_IND16( tecmo ); diff --git a/src/mame/includes/tecmo16.h b/src/mame/includes/tecmo16.h index 93093817cd2..6db07f1fcb0 100644 --- a/src/mame/includes/tecmo16.h +++ b/src/mame/includes/tecmo16.h @@ -46,6 +46,9 @@ public: TILE_GET_INFO_MEMBER(fg_get_tile_info); TILE_GET_INFO_MEMBER(bg_get_tile_info); TILE_GET_INFO_MEMBER(tx_get_tile_info); + virtual void video_start(); + DECLARE_VIDEO_START(ginkun); + DECLARE_VIDEO_START(riot); }; @@ -53,7 +56,7 @@ public: -VIDEO_START( fstarfrc ); -VIDEO_START( ginkun ); -VIDEO_START( riot ); + + + SCREEN_UPDATE_RGB32( tecmo16 ); diff --git a/src/mame/includes/tecmosys.h b/src/mame/includes/tecmosys.h index a0341240a52..544a57f18be 100644 --- a/src/mame/includes/tecmosys.h +++ b/src/mame/includes/tecmosys.h @@ -77,6 +77,8 @@ public: TILE_GET_INFO_MEMBER(get_bg1tile_info); TILE_GET_INFO_MEMBER(get_bg2tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); + virtual void machine_start(); + virtual void video_start(); }; @@ -90,4 +92,4 @@ void tecmosys_prot_init(running_machine &machine, int which); SCREEN_UPDATE_RGB32(tecmosys); -VIDEO_START(tecmosys); + diff --git a/src/mame/includes/tehkanwc.h b/src/mame/includes/tehkanwc.h index c92e37e2284..a7822883a1b 100644 --- a/src/mame/includes/tehkanwc.h +++ b/src/mame/includes/tehkanwc.h @@ -45,6 +45,7 @@ public: DECLARE_DRIVER_INIT(teedoff); TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); + virtual void video_start(); }; diff --git a/src/mame/includes/terracre.h b/src/mame/includes/terracre.h index 981ca2311b3..3ff643d5ed4 100644 --- a/src/mame/includes/terracre.h +++ b/src/mame/includes/terracre.h @@ -33,11 +33,14 @@ public: DECLARE_DRIVER_INIT(horekid); TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); + virtual void video_start(); + virtual void palette_init(); + DECLARE_MACHINE_START(amazon); }; /*----------- defined in video/terracre.c -----------*/ -PALETTE_INIT( amazon ); -VIDEO_START( amazon ); + + SCREEN_UPDATE_IND16( amazon ); diff --git a/src/mame/includes/tetrisp2.h b/src/mame/includes/tetrisp2.h index 438fab5502d..be45e93012d 100644 --- a/src/mame/includes/tetrisp2.h +++ b/src/mame/includes/tetrisp2.h @@ -102,6 +102,10 @@ public: TILE_GET_INFO_MEMBER(get_tile_info_rocknms_sub_fg); TILE_GET_INFO_MEMBER(get_tile_info_rocknms_sub_rot); TILE_GET_INFO_MEMBER(stepstag_get_tile_info_fg); + DECLARE_VIDEO_START(tetrisp2); + DECLARE_VIDEO_START(nndmseal); + DECLARE_VIDEO_START(rockntread); + DECLARE_VIDEO_START(rocknms); }; class stepstag_state : public tetrisp2_state @@ -120,6 +124,7 @@ public: DECLARE_WRITE16_MEMBER(stepstag_leds_w); DECLARE_WRITE16_MEMBER( stepstag_palette_w ); DECLARE_DRIVER_INIT(stepstag); + DECLARE_VIDEO_START(stepstag); }; /*----------- defined in video/tetrisp2.c -----------*/ @@ -127,19 +132,19 @@ public: -VIDEO_START( tetrisp2 ); + SCREEN_UPDATE_IND16( tetrisp2 ); -VIDEO_START( rockntread ); + SCREEN_UPDATE_IND16( rockntread ); -VIDEO_START( rocknms ); + SCREEN_UPDATE_RGB32( rocknms_left ); SCREEN_UPDATE_RGB32( rocknms_right ); -VIDEO_START( nndmseal ); -VIDEO_START( stepstag ); + + SCREEN_UPDATE_IND16( stepstag_left ); SCREEN_UPDATE_IND16( stepstag_mid ); SCREEN_UPDATE_IND16( stepstag_right ); diff --git a/src/mame/includes/thedeep.h b/src/mame/includes/thedeep.h index 9ff2b8de7da..f7446afe6cc 100644 --- a/src/mame/includes/thedeep.h +++ b/src/mame/includes/thedeep.h @@ -46,13 +46,16 @@ public: TILEMAP_MAPPER_MEMBER(tilemap_scan_rows_back); TILE_GET_INFO_MEMBER(get_tile_info_0); TILE_GET_INFO_MEMBER(get_tile_info_1); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/thedeep.c -----------*/ -PALETTE_INIT( thedeep ); -VIDEO_START( thedeep ); + + SCREEN_UPDATE_IND16( thedeep ); diff --git a/src/mame/includes/thepit.h b/src/mame/includes/thepit.h index d90825561c2..9b4f84cd7ab 100644 --- a/src/mame/includes/thepit.h +++ b/src/mame/includes/thepit.h @@ -35,12 +35,15 @@ public: DECLARE_DRIVER_INIT(rtriv); TILE_GET_INFO_MEMBER(solid_get_tile_info); TILE_GET_INFO_MEMBER(get_tile_info); + virtual void video_start(); + virtual void palette_init(); + DECLARE_PALETTE_INIT(suprmous); }; /*----------- defined in video/thepit.c -----------*/ -PALETTE_INIT( thepit ); -PALETTE_INIT( suprmous ); -VIDEO_START( thepit ); + + + SCREEN_UPDATE_IND16( thepit ); diff --git a/src/mame/includes/thief.h b/src/mame/includes/thief.h index 434180db8eb..f229008760f 100644 --- a/src/mame/includes/thief.h +++ b/src/mame/includes/thief.h @@ -32,11 +32,12 @@ public: DECLARE_WRITE8_MEMBER(thief_coprocessor_w); DECLARE_WRITE8_MEMBER(tape_control_w); DECLARE_DRIVER_INIT(thief); + virtual void video_start(); }; /*----------- defined in video/thief.c -----------*/ -VIDEO_START( thief ); + SCREEN_UPDATE_IND16( thief ); diff --git a/src/mame/includes/thoop2.h b/src/mame/includes/thoop2.h index e0f0a6797d1..1fec90792d1 100644 --- a/src/mame/includes/thoop2.h +++ b/src/mame/includes/thoop2.h @@ -19,10 +19,11 @@ public: DECLARE_WRITE16_MEMBER(thoop2_vram_w); TILE_GET_INFO_MEMBER(get_tile_info_thoop2_screen0); TILE_GET_INFO_MEMBER(get_tile_info_thoop2_screen1); + virtual void video_start(); }; /*----------- defined in video/thoop2.c -----------*/ -VIDEO_START( thoop2 ); + SCREEN_UPDATE_IND16( thoop2 ); diff --git a/src/mame/includes/thunderj.h b/src/mame/includes/thunderj.h index 14a20aa616f..3c082872e1d 100644 --- a/src/mame/includes/thunderj.h +++ b/src/mame/includes/thunderj.h @@ -21,10 +21,13 @@ public: TILE_GET_INFO_MEMBER(get_alpha_tile_info); TILE_GET_INFO_MEMBER(get_playfield_tile_info); TILE_GET_INFO_MEMBER(get_playfield2_tile_info); + DECLARE_MACHINE_START(thunderj); + DECLARE_MACHINE_RESET(thunderj); + DECLARE_VIDEO_START(thunderj); }; /*----------- defined in video/thunderj.c -----------*/ -VIDEO_START( thunderj ); + SCREEN_UPDATE_IND16( thunderj ); diff --git a/src/mame/includes/thunderx.h b/src/mame/includes/thunderx.h index a4252d50d0c..b0614d553db 100644 --- a/src/mame/includes/thunderx.h +++ b/src/mame/includes/thunderx.h @@ -45,6 +45,11 @@ public: DECLARE_READ8_MEMBER(k052109_051960_r); DECLARE_WRITE8_MEMBER(k052109_051960_w); DECLARE_WRITE8_MEMBER(scontra_snd_bankswitch_w); + virtual void video_start(); + DECLARE_MACHINE_START(scontra); + DECLARE_MACHINE_RESET(scontra); + DECLARE_MACHINE_START(thunderx); + DECLARE_MACHINE_RESET(thunderx); }; @@ -53,5 +58,5 @@ public: extern void thunderx_tile_callback(running_machine &machine, int layer,int bank,int *code,int *color,int *flags,int *priority); extern void thunderx_sprite_callback(running_machine &machine, int *code,int *color,int *priority_mask,int *shadow); -VIDEO_START( scontra ); + SCREEN_UPDATE_IND16( scontra ); diff --git a/src/mame/includes/tiamc1.h b/src/mame/includes/tiamc1.h index b1353aaec63..06a077c2bef 100644 --- a/src/mame/includes/tiamc1.h +++ b/src/mame/includes/tiamc1.h @@ -30,6 +30,9 @@ public: DECLARE_WRITE8_MEMBER(tiamc1_palette_w); TILE_GET_INFO_MEMBER(get_bg1_tile_info); TILE_GET_INFO_MEMBER(get_bg2_tile_info); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); }; @@ -66,7 +69,7 @@ WRITE8_DEVICE_HANDLER( tiamc1_timer1_gate_w ); /*----------- defined in video/tiamc1.c -----------*/ -PALETTE_INIT( tiamc1 ); -VIDEO_START( tiamc1 ); + + SCREEN_UPDATE_IND16( tiamc1 ); diff --git a/src/mame/includes/tigeroad.h b/src/mame/includes/tigeroad.h index fe27f1947ed..84cf7715938 100644 --- a/src/mame/includes/tigeroad.h +++ b/src/mame/includes/tigeroad.h @@ -26,10 +26,11 @@ public: TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); TILEMAP_MAPPER_MEMBER(tigeroad_tilemap_scan); + virtual void video_start(); }; /*----------- defined in video/tigeroad.c -----------*/ -VIDEO_START( tigeroad ); + SCREEN_UPDATE_IND16( tigeroad ); diff --git a/src/mame/includes/timelimt.h b/src/mame/includes/timelimt.h index 64a7dda4e4f..59007202114 100644 --- a/src/mame/includes/timelimt.h +++ b/src/mame/includes/timelimt.h @@ -24,12 +24,16 @@ public: DECLARE_WRITE8_MEMBER(timelimt_scroll_y_w); TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/timelimt.c -----------*/ -VIDEO_START( timelimt ); -PALETTE_INIT( timelimt ); + + SCREEN_UPDATE_IND16( timelimt ); diff --git a/src/mame/includes/timeplt.h b/src/mame/includes/timeplt.h index 44acdeae6fa..ed13097c20a 100644 --- a/src/mame/includes/timeplt.h +++ b/src/mame/includes/timeplt.h @@ -45,13 +45,18 @@ public: DECLARE_WRITE8_MEMBER(chkun_sound_w); TILE_GET_INFO_MEMBER(get_tile_info); TILE_GET_INFO_MEMBER(get_chkun_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); + DECLARE_VIDEO_START(chkun); }; /*----------- defined in video/timeplt.c -----------*/ -PALETTE_INIT( timeplt ); -VIDEO_START( timeplt ); -VIDEO_START( chkun ); + + + SCREEN_UPDATE_IND16( timeplt ); diff --git a/src/mame/includes/tmnt.h b/src/mame/includes/tmnt.h index a986a5a040e..4021243e5a3 100644 --- a/src/mame/includes/tmnt.h +++ b/src/mame/includes/tmnt.h @@ -121,6 +121,17 @@ public: DECLARE_DRIVER_INIT(cuebrick); TILE_GET_INFO_MEMBER(glfgreat_get_roz_tile_info); TILE_GET_INFO_MEMBER(prmrsocr_get_roz_tile_info); + DECLARE_MACHINE_START(common); + DECLARE_MACHINE_RESET(common); + DECLARE_VIDEO_START(cuebrick); + DECLARE_VIDEO_START(mia); + DECLARE_MACHINE_RESET(tmnt); + DECLARE_VIDEO_START(tmnt); + DECLARE_VIDEO_START(lgtnfght); + DECLARE_VIDEO_START(blswhstl); + DECLARE_VIDEO_START(glfgreat); + DECLARE_MACHINE_START(prmrsocr); + DECLARE_VIDEO_START(prmrsocr); }; @@ -140,13 +151,13 @@ extern void blswhstl_sprite_callback(running_machine &machine, int *code,int *co extern void prmrsocr_sprite_callback(running_machine &machine, int *code,int *color,int *priority_mask); -VIDEO_START( cuebrick ); -VIDEO_START( mia ); -VIDEO_START( tmnt ); -VIDEO_START( lgtnfght ); -VIDEO_START( blswhstl ); -VIDEO_START( glfgreat ); -VIDEO_START( prmrsocr ); + + + + + + + SCREEN_UPDATE_IND16( mia ); SCREEN_UPDATE_IND16( tmnt ); diff --git a/src/mame/includes/tnzs.h b/src/mame/includes/tnzs.h index 800a22282b1..c880a55172a 100644 --- a/src/mame/includes/tnzs.h +++ b/src/mame/includes/tnzs.h @@ -91,6 +91,11 @@ public: DECLARE_DRIVER_INIT(kageki); DECLARE_DRIVER_INIT(chukatai); DECLARE_DRIVER_INIT(tnzsb); + DECLARE_MACHINE_START(tnzs); + DECLARE_MACHINE_RESET(tnzs); + DECLARE_PALETTE_INIT(arknoid2); + DECLARE_MACHINE_START(jpopnics); + DECLARE_MACHINE_RESET(jpopnics); }; @@ -99,14 +104,14 @@ public: INTERRUPT_GEN( arknoid2_interrupt ); -MACHINE_START( tnzs ); -MACHINE_RESET( tnzs ); -MACHINE_RESET( jpopnics ); -MACHINE_START( jpopnics ); + + + + /*----------- defined in video/tnzs.c -----------*/ -PALETTE_INIT( arknoid2 ); + SCREEN_UPDATE_IND16( tnzs ); SCREEN_VBLANK( tnzs ); diff --git a/src/mame/includes/toaplan1.h b/src/mame/includes/toaplan1.h index 061c5615140..5eb70418eb9 100644 --- a/src/mame/includes/toaplan1.h +++ b/src/mame/includes/toaplan1.h @@ -132,6 +132,12 @@ public: TILE_GET_INFO_MEMBER(get_pf2_tile_info); TILE_GET_INFO_MEMBER(get_pf3_tile_info); TILE_GET_INFO_MEMBER(get_pf4_tile_info); + DECLARE_MACHINE_RESET(toaplan1); + DECLARE_VIDEO_START(rallybik); + DECLARE_VIDEO_START(toaplan1); + DECLARE_MACHINE_RESET(zerowing); + DECLARE_MACHINE_RESET(demonwld); + DECLARE_MACHINE_RESET(vimana); }; @@ -140,10 +146,9 @@ public: INTERRUPT_GEN( toaplan1_interrupt ); -MACHINE_RESET( toaplan1 ); -MACHINE_RESET( demonwld ); -MACHINE_RESET( vimana ); -MACHINE_RESET( zerowing ); /* hack for ZeroWing/OutZone. See video */ + + + void toaplan1_driver_savestate(running_machine &machine); void demonwld_driver_savestate(running_machine &machine); @@ -158,7 +163,7 @@ void vimana_driver_savestate(running_machine &machine); SCREEN_VBLANK( rallybik ); SCREEN_VBLANK( toaplan1 ); SCREEN_VBLANK( samesame ); -VIDEO_START( rallybik ); -VIDEO_START( toaplan1 ); + + SCREEN_UPDATE_IND16( rallybik ); SCREEN_UPDATE_IND16( toaplan1 ); diff --git a/src/mame/includes/toaplan2.h b/src/mame/includes/toaplan2.h index 2b3a6936980..698047ef63e 100644 --- a/src/mame/includes/toaplan2.h +++ b/src/mame/includes/toaplan2.h @@ -110,16 +110,25 @@ public: DECLARE_DRIVER_INIT(vfive); DECLARE_DRIVER_INIT(batrider); TILE_GET_INFO_MEMBER(get_text_tile_info); + DECLARE_MACHINE_START(toaplan2); + DECLARE_MACHINE_RESET(toaplan2); + DECLARE_VIDEO_START(toaplan2); + DECLARE_MACHINE_RESET(ghox); + DECLARE_VIDEO_START(truxton2); + DECLARE_VIDEO_START(fixeightbl); + DECLARE_VIDEO_START(bgaregga); + DECLARE_VIDEO_START(batrider); + DECLARE_VIDEO_START(bgareggabl); }; /*----------- defined in video/toaplan2.c -----------*/ -VIDEO_START( toaplan2 ); -VIDEO_START( truxton2 ); -VIDEO_START( fixeightbl ); -VIDEO_START( bgaregga ); -VIDEO_START( batrider ); -VIDEO_START( bgareggabl ); + + + + + + SCREEN_UPDATE_IND16( toaplan2 ); SCREEN_UPDATE_IND16( truxton2 ); diff --git a/src/mame/includes/toki.h b/src/mame/includes/toki.h index ae30fc43be4..3a6de58bb85 100644 --- a/src/mame/includes/toki.h +++ b/src/mame/includes/toki.h @@ -37,11 +37,12 @@ public: TILE_GET_INFO_MEMBER(get_text_tile_info); TILE_GET_INFO_MEMBER(get_back_tile_info); TILE_GET_INFO_MEMBER(get_fore_tile_info); + virtual void video_start(); }; /*----------- defined in video/toki.c -----------*/ -VIDEO_START( toki ); + SCREEN_UPDATE_IND16( toki ); SCREEN_UPDATE_IND16( tokib ); diff --git a/src/mame/includes/toobin.h b/src/mame/includes/toobin.h index ff883a3001f..127f1000e7a 100644 --- a/src/mame/includes/toobin.h +++ b/src/mame/includes/toobin.h @@ -22,6 +22,9 @@ public: DECLARE_DRIVER_INIT(toobin); TILE_GET_INFO_MEMBER(get_alpha_tile_info); TILE_GET_INFO_MEMBER(get_playfield_tile_info); + DECLARE_MACHINE_START(toobin); + DECLARE_MACHINE_RESET(toobin); + DECLARE_VIDEO_START(toobin); }; @@ -33,5 +36,5 @@ WRITE16_HANDLER( toobin_xscroll_w ); WRITE16_HANDLER( toobin_yscroll_w ); WRITE16_HANDLER( toobin_slip_w ); -VIDEO_START( toobin ); + SCREEN_UPDATE_RGB32( toobin ); diff --git a/src/mame/includes/topspeed.h b/src/mame/includes/topspeed.h index 322773f8d4a..b354a4a8704 100644 --- a/src/mame/includes/topspeed.h +++ b/src/mame/includes/topspeed.h @@ -52,6 +52,8 @@ public: DECLARE_WRITE8_MEMBER(sound_bankswitch_w); DECLARE_WRITE8_MEMBER(topspeed_msm5205_command_w); DECLARE_CUSTOM_INPUT_MEMBER(topspeed_pedal_r); + virtual void machine_start(); + virtual void machine_reset(); }; diff --git a/src/mame/includes/toypop.h b/src/mame/includes/toypop.h index d5b2584489d..d5c9120814c 100644 --- a/src/mame/includes/toypop.h +++ b/src/mame/includes/toypop.h @@ -46,11 +46,14 @@ public: DECLARE_WRITE8_MEMBER(flip); TILEMAP_MAPPER_MEMBER(tilemap_scan); TILE_GET_INFO_MEMBER(get_tile_info); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/toypop.c -----------*/ -VIDEO_START( toypop ); + SCREEN_UPDATE_IND16( toypop ); -PALETTE_INIT( toypop ); + diff --git a/src/mame/includes/tp84.h b/src/mame/includes/tp84.h index 57e8b58d996..f38e4dc2834 100644 --- a/src/mame/includes/tp84.h +++ b/src/mame/includes/tp84.h @@ -37,12 +37,15 @@ public: DECLARE_READ8_MEMBER(tp84_scanline_r); TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); + virtual void machine_start(); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/tp84.c -----------*/ -PALETTE_INIT( tp84 ); -VIDEO_START( tp84 ); + + SCREEN_UPDATE_IND16( tp84 ); diff --git a/src/mame/includes/trackfld.h b/src/mame/includes/trackfld.h index d7d4206daee..d6199ad94c1 100644 --- a/src/mame/includes/trackfld.h +++ b/src/mame/includes/trackfld.h @@ -60,14 +60,19 @@ public: DECLARE_WRITE8_MEMBER( konami_SN76496_latch_w ) { m_SN76496_latch = data; }; DECLARE_WRITE8_MEMBER( konami_SN76496_w ) { m_sn->write(space, offset, m_SN76496_latch); }; TILE_GET_INFO_MEMBER(get_bg_tile_info); + DECLARE_MACHINE_START(trackfld); + DECLARE_MACHINE_RESET(trackfld); + DECLARE_VIDEO_START(trackfld); + DECLARE_PALETTE_INIT(trackfld); + DECLARE_VIDEO_START(atlantol); }; /*----------- defined in video/trackfld.c -----------*/ -PALETTE_INIT( trackfld ); -VIDEO_START( trackfld ); + + SCREEN_UPDATE_IND16( trackfld ); -VIDEO_START( atlantol ); + diff --git a/src/mame/includes/travrusa.h b/src/mame/includes/travrusa.h index c2dc9590a02..d98a838de2b 100644 --- a/src/mame/includes/travrusa.h +++ b/src/mame/includes/travrusa.h @@ -20,12 +20,16 @@ public: DECLARE_DRIVER_INIT(shtridra); DECLARE_DRIVER_INIT(motorace); TILE_GET_INFO_MEMBER(get_tile_info); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); + DECLARE_PALETTE_INIT(shtrider); }; /*----------- defined in video/travrusa.c -----------*/ -PALETTE_INIT( travrusa ); -PALETTE_INIT( shtrider ); -VIDEO_START( travrusa ); + + + SCREEN_UPDATE_IND16( travrusa ); diff --git a/src/mame/includes/triplhnt.h b/src/mame/includes/triplhnt.h index 75ea8857a5b..1a1f9affbd9 100644 --- a/src/mame/includes/triplhnt.h +++ b/src/mame/includes/triplhnt.h @@ -48,6 +48,8 @@ public: DECLARE_READ8_MEMBER(triplhnt_da_latch_r); DECLARE_DRIVER_INIT(triplhnt); TILE_GET_INFO_MEMBER(get_tile_info); + virtual void video_start(); + virtual void palette_init(); }; @@ -64,7 +66,7 @@ extern const samples_interface triplhnt_samples_interface; /*----------- defined in video/triplhnt.c -----------*/ -VIDEO_START( triplhnt ); + SCREEN_UPDATE_IND16( triplhnt ); diff --git a/src/mame/includes/truco.h b/src/mame/includes/truco.h index 3a8e169f447..46717833a17 100644 --- a/src/mame/includes/truco.h +++ b/src/mame/includes/truco.h @@ -14,10 +14,12 @@ public: DECLARE_WRITE8_MEMBER(portb_w); DECLARE_WRITE8_MEMBER(pia_irqa_w); DECLARE_WRITE8_MEMBER(pia_irqb_w); + virtual void machine_reset(); + virtual void palette_init(); }; /*----------- defined in video/truco.c -----------*/ SCREEN_UPDATE_IND16( truco ); -PALETTE_INIT( truco ); + diff --git a/src/mame/includes/trucocl.h b/src/mame/includes/trucocl.h index ec0ac290c95..064de31f262 100644 --- a/src/mame/includes/trucocl.h +++ b/src/mame/includes/trucocl.h @@ -19,11 +19,13 @@ public: DECLARE_WRITE8_MEMBER(audio_dac_w); DECLARE_DRIVER_INIT(trucocl); TILE_GET_INFO_MEMBER(get_bg_tile_info); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/trucocl.c -----------*/ -PALETTE_INIT( trucocl ); -VIDEO_START( trucocl ); + + SCREEN_UPDATE_IND16( trucocl ); diff --git a/src/mame/includes/tryout.h b/src/mame/includes/tryout.h index 3c79b196437..a105af08149 100644 --- a/src/mame/includes/tryout.h +++ b/src/mame/includes/tryout.h @@ -32,12 +32,14 @@ public: TILE_GET_INFO_MEMBER(get_bg_tile_info); TILEMAP_MAPPER_MEMBER(get_fg_memory_offset); TILEMAP_MAPPER_MEMBER(get_bg_memory_offset); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/tryout.c -----------*/ -PALETTE_INIT( tryout ); -VIDEO_START( tryout ); + + SCREEN_UPDATE_IND16( tryout ); diff --git a/src/mame/includes/tsamurai.h b/src/mame/includes/tsamurai.h index 1508859cadd..7001cf56380 100644 --- a/src/mame/includes/tsamurai.h +++ b/src/mame/includes/tsamurai.h @@ -55,6 +55,8 @@ public: TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); TILE_GET_INFO_MEMBER(get_vsgongf_tile_info); + DECLARE_VIDEO_START(tsamurai); + DECLARE_VIDEO_START(vsgongf); }; @@ -63,8 +65,8 @@ public: -VIDEO_START( tsamurai ); + SCREEN_UPDATE_IND16( tsamurai ); -VIDEO_START( vsgongf ); + SCREEN_UPDATE_IND16( vsgongf ); diff --git a/src/mame/includes/tubep.h b/src/mame/includes/tubep.h index 7bde8cb2d17..f50cecd6605 100644 --- a/src/mame/includes/tubep.h +++ b/src/mame/includes/tubep.h @@ -68,18 +68,26 @@ public: DECLARE_WRITE8_MEMBER(ay8910_portB_1_w); DECLARE_WRITE8_MEMBER(ay8910_portA_2_w); DECLARE_WRITE8_MEMBER(ay8910_portB_2_w); + DECLARE_MACHINE_START(tubep); + DECLARE_MACHINE_RESET(tubep); + DECLARE_VIDEO_START(tubep); + DECLARE_VIDEO_RESET(tubep); + DECLARE_PALETTE_INIT(tubep); + DECLARE_MACHINE_START(rjammer); + DECLARE_MACHINE_RESET(rjammer); + DECLARE_PALETTE_INIT(rjammer); }; /*----------- defined in video/tubep.c -----------*/ void tubep_vblank_end(running_machine &machine); -PALETTE_INIT( tubep ); + SCREEN_UPDATE_IND16( tubep ); -PALETTE_INIT( rjammer ); + SCREEN_UPDATE_IND16( rjammer ); -VIDEO_START( tubep ); -VIDEO_RESET( tubep ); + + diff --git a/src/mame/includes/tumbleb.h b/src/mame/includes/tumbleb.h index 15b1275f0f8..cf6b0066741 100644 --- a/src/mame/includes/tumbleb.h +++ b/src/mame/includes/tumbleb.h @@ -83,17 +83,25 @@ public: TILE_GET_INFO_MEMBER(pangpang_get_bg1_tile_info); TILE_GET_INFO_MEMBER(pangpang_get_bg2_tile_info); TILE_GET_INFO_MEMBER(pangpang_get_fg_tile_info); + DECLARE_MACHINE_START(tumbleb); + DECLARE_MACHINE_RESET(tumbleb); + DECLARE_VIDEO_START(tumblepb); + DECLARE_VIDEO_START(fncywld); + DECLARE_MACHINE_RESET(htchctch); + DECLARE_VIDEO_START(suprtrio); + DECLARE_VIDEO_START(pangpang); + DECLARE_VIDEO_START(sdfight); }; /*----------- defined in video/tumbleb.c -----------*/ -VIDEO_START( tumblepb ); -VIDEO_START( fncywld ); -VIDEO_START( sdfight ); -VIDEO_START( suprtrio ); -VIDEO_START( pangpang ); + + + + + SCREEN_UPDATE_IND16( tumblepb ); SCREEN_UPDATE_IND16( jumpkids ); diff --git a/src/mame/includes/tumblep.h b/src/mame/includes/tumblep.h index ce9b0c99f24..235348539ab 100644 --- a/src/mame/includes/tumblep.h +++ b/src/mame/includes/tumblep.h @@ -29,6 +29,7 @@ public: DECLARE_READ16_MEMBER(tumblepop_controls_r); DECLARE_WRITE16_MEMBER(tumblep_oki_w); DECLARE_DRIVER_INIT(tumblep); + virtual void machine_start(); }; diff --git a/src/mame/includes/tunhunt.h b/src/mame/includes/tunhunt.h index 31d8377bf50..b8ab9f1108e 100644 --- a/src/mame/includes/tunhunt.h +++ b/src/mame/includes/tunhunt.h @@ -22,12 +22,14 @@ public: DECLARE_READ8_MEMBER(dsw2_3r); DECLARE_READ8_MEMBER(dsw2_4r); TILE_GET_INFO_MEMBER(get_fg_tile_info); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/tunhunt.c -----------*/ -PALETTE_INIT( tunhunt ); -VIDEO_START( tunhunt ); + + SCREEN_UPDATE_IND16( tunhunt ); diff --git a/src/mame/includes/turbo.h b/src/mame/includes/turbo.h index 8b0e05ef537..0c6f0cf60c9 100644 --- a/src/mame/includes/turbo.h +++ b/src/mame/includes/turbo.h @@ -122,6 +122,12 @@ public: DECLARE_DRIVER_INIT(buckrog_enc); DECLARE_DRIVER_INIT(turbo_enc); TILE_GET_INFO_MEMBER(get_fg_tile_info); + DECLARE_VIDEO_START(turbo); + DECLARE_PALETTE_INIT(turbo); + DECLARE_PALETTE_INIT(subroc3d); + DECLARE_MACHINE_RESET(buckrog); + DECLARE_VIDEO_START(buckrog); + DECLARE_PALETTE_INIT(buckrog); }; @@ -145,14 +151,14 @@ WRITE8_DEVICE_HANDLER( buckrog_sound_b_w ); /*----------- defined in video/turbo.c -----------*/ -PALETTE_INIT( turbo ); -VIDEO_START( turbo ); + + SCREEN_UPDATE_IND16( turbo ); -PALETTE_INIT( subroc3d ); + SCREEN_UPDATE_IND16( subroc3d ); -PALETTE_INIT( buckrog ); -VIDEO_START( buckrog ); + + SCREEN_UPDATE_IND16( buckrog ); diff --git a/src/mame/includes/tutankhm.h b/src/mame/includes/tutankhm.h index f49328d49b7..7a9d6d8cd60 100644 --- a/src/mame/includes/tutankhm.h +++ b/src/mame/includes/tutankhm.h @@ -29,6 +29,8 @@ public: DECLARE_WRITE8_MEMBER(tutankhm_coin_counter_w); DECLARE_WRITE8_MEMBER(tutankhm_flip_screen_x_w); DECLARE_WRITE8_MEMBER(tutankhm_flip_screen_y_w); + DECLARE_MACHINE_START(tutankhm); + DECLARE_MACHINE_RESET(tutankhm); }; diff --git a/src/mame/includes/twin16.h b/src/mame/includes/twin16.h index ed5eac7e0d6..ed6b4bb061a 100644 --- a/src/mame/includes/twin16.h +++ b/src/mame/includes/twin16.h @@ -58,6 +58,9 @@ public: DECLARE_DRIVER_INIT(twin16); DECLARE_DRIVER_INIT(cuebrickj); TILE_GET_INFO_MEMBER(get_text_tile_info); + DECLARE_MACHINE_START(twin16); + DECLARE_MACHINE_RESET(twin16); + DECLARE_VIDEO_START(twin16); }; @@ -69,7 +72,7 @@ int twin16_spriteram_process_enable( running_machine &machine ); /*----------- defined in video/twin16.c -----------*/ -VIDEO_START( twin16 ); + SCREEN_UPDATE_IND16( twin16 ); SCREEN_VBLANK( twin16 ); diff --git a/src/mame/includes/twincobr.h b/src/mame/includes/twincobr.h index 1a63717aac8..a9ee1688bc8 100644 --- a/src/mame/includes/twincobr.h +++ b/src/mame/includes/twincobr.h @@ -101,6 +101,9 @@ public: TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); TILE_GET_INFO_MEMBER(get_tx_tile_info); + DECLARE_MACHINE_RESET(twincobr); + DECLARE_VIDEO_START(toaplan0); + DECLARE_MACHINE_RESET(wardner); }; @@ -109,8 +112,8 @@ public: INTERRUPT_GEN( twincobr_interrupt ); INTERRUPT_GEN( wardner_interrupt ); -MACHINE_RESET( twincobr ); -MACHINE_RESET( wardner ); + + extern void twincobr_driver_savestate(running_machine &machine); @@ -122,5 +125,5 @@ extern const mc6845_interface twincobr_mc6845_intf; extern void twincobr_flipscreen(running_machine &machine, int flip); extern void twincobr_display(running_machine &machine, int enable); -VIDEO_START( toaplan0 ); + SCREEN_UPDATE_IND16( toaplan0 ); diff --git a/src/mame/includes/tx1.h b/src/mame/includes/tx1.h index eb6046bd7a5..510807d225f 100644 --- a/src/mame/includes/tx1.h +++ b/src/mame/includes/tx1.h @@ -161,14 +161,21 @@ public: DECLARE_WRITE8_MEMBER(bb_coin_cnt_w); DECLARE_READ8_MEMBER(tx1_ppi_porta_r); DECLARE_READ8_MEMBER(tx1_ppi_portb_r); + DECLARE_MACHINE_RESET(tx1); + DECLARE_VIDEO_START(tx1); + DECLARE_PALETTE_INIT(tx1); + DECLARE_MACHINE_RESET(buggyboy); + DECLARE_VIDEO_START(buggyboy); + DECLARE_PALETTE_INIT(buggyboy); + DECLARE_VIDEO_START(buggybjr); }; /*----------- defined in machine/tx1.c -----------*/ -MACHINE_RESET( tx1 ); -MACHINE_RESET( buggyboy ); + + /*----------- defined in audio/tx1.c -----------*/ READ8_DEVICE_HANDLER( tx1_pit8253_r ); @@ -228,19 +235,19 @@ extern const device_type BUGGYBOY; /*----------- defined in video/tx1.c -----------*/ -PALETTE_INIT( tx1 ); -VIDEO_START( tx1 ); + + SCREEN_UPDATE_IND16( tx1_left ); SCREEN_UPDATE_IND16( tx1_middle ); SCREEN_UPDATE_IND16( tx1_right ); SCREEN_VBLANK( tx1 ); -PALETTE_INIT( buggyboy ); -VIDEO_START( buggyboy ); + + SCREEN_UPDATE_IND16( buggyboy_left ); SCREEN_UPDATE_IND16( buggyboy_middle ); SCREEN_UPDATE_IND16( buggyboy_right ); SCREEN_VBLANK( buggyboy ); -VIDEO_START( buggybjr ); + SCREEN_UPDATE_IND16( buggybjr ); diff --git a/src/mame/includes/ultraman.h b/src/mame/includes/ultraman.h index e30ab97c5f1..495bde95ee3 100644 --- a/src/mame/includes/ultraman.h +++ b/src/mame/includes/ultraman.h @@ -30,6 +30,9 @@ public: DECLARE_WRITE16_MEMBER(sound_cmd_w); DECLARE_WRITE16_MEMBER(sound_irq_trigger_w); DECLARE_WRITE16_MEMBER(ultraman_gfxctrl_w); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; @@ -42,5 +45,5 @@ extern void ultraman_zoom_callback_1(running_machine &machine, int *code,int *co extern void ultraman_zoom_callback_2(running_machine &machine, int *code,int *color,int *flags); -VIDEO_START( ultraman ); + SCREEN_UPDATE_IND16( ultraman ); diff --git a/src/mame/includes/ultratnk.h b/src/mame/includes/ultratnk.h index b6fdd71a258..d6caca2243a 100644 --- a/src/mame/includes/ultratnk.h +++ b/src/mame/includes/ultratnk.h @@ -36,13 +36,16 @@ public: DECLARE_WRITE8_MEMBER(ultratnk_attract_w); DECLARE_WRITE8_MEMBER(ultratnk_explosion_w); TILE_GET_INFO_MEMBER(ultratnk_tile_info); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/ultratnk.c -----------*/ -PALETTE_INIT( ultratnk ); -VIDEO_START( ultratnk ); + + SCREEN_UPDATE_IND16( ultratnk ); SCREEN_VBLANK( ultratnk ); diff --git a/src/mame/includes/undrfire.h b/src/mame/includes/undrfire.h index 3fb824e9bfd..0bea56867a9 100644 --- a/src/mame/includes/undrfire.h +++ b/src/mame/includes/undrfire.h @@ -42,11 +42,12 @@ public: DECLARE_CUSTOM_INPUT_MEMBER(frame_counter_r); DECLARE_DRIVER_INIT(undrfire); DECLARE_DRIVER_INIT(cbombers); + virtual void video_start(); }; /*----------- defined in video/undrfire.c -----------*/ -VIDEO_START( undrfire ); + SCREEN_UPDATE_IND16( undrfire ); SCREEN_UPDATE_IND16( cbombers ); diff --git a/src/mame/includes/unico.h b/src/mame/includes/unico.h index 09701eeae4b..f37d0ece0ab 100644 --- a/src/mame/includes/unico.h +++ b/src/mame/includes/unico.h @@ -36,6 +36,10 @@ public: DECLARE_WRITE32_MEMBER(zeropnt2_eeprom_w); TILE_GET_INFO_MEMBER(get_tile_info); TILE_GET_INFO_MEMBER(get_tile_info32); + DECLARE_MACHINE_RESET(unico); + DECLARE_VIDEO_START(unico); + DECLARE_MACHINE_RESET(zeropt); + DECLARE_VIDEO_START(zeropnt2); }; @@ -43,9 +47,9 @@ public: -VIDEO_START( unico ); + SCREEN_UPDATE_IND16( unico ); -VIDEO_START( zeropnt2 ); + SCREEN_UPDATE_IND16( zeropnt2 ); diff --git a/src/mame/includes/usgames.h b/src/mame/includes/usgames.h index 62109c2b541..36cbc34c3a2 100644 --- a/src/mame/includes/usgames.h +++ b/src/mame/includes/usgames.h @@ -15,11 +15,13 @@ public: DECLARE_WRITE8_MEMBER(usgames_videoram_w); DECLARE_WRITE8_MEMBER(usgames_charram_w); TILE_GET_INFO_MEMBER(get_usgames_tile_info); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/usgames.c -----------*/ -VIDEO_START( usgames ); -PALETTE_INIT( usgames ); + + SCREEN_UPDATE_IND16( usgames ); diff --git a/src/mame/includes/vaportra.h b/src/mame/includes/vaportra.h index 0e797ff6e97..ade3f583c82 100644 --- a/src/mame/includes/vaportra.h +++ b/src/mame/includes/vaportra.h @@ -35,6 +35,8 @@ public: DECLARE_WRITE16_MEMBER(vaportra_palette_24bit_rg_w); DECLARE_WRITE16_MEMBER(vaportra_palette_24bit_b_w); DECLARE_DRIVER_INIT(vaportra); + virtual void machine_start(); + virtual void machine_reset(); }; diff --git a/src/mame/includes/vastar.h b/src/mame/includes/vastar.h index 24cc7df4db1..4e94dfabf7c 100644 --- a/src/mame/includes/vastar.h +++ b/src/mame/includes/vastar.h @@ -44,11 +44,13 @@ public: TILE_GET_INFO_MEMBER(get_fg_tile_info); TILE_GET_INFO_MEMBER(get_bg1_tile_info); TILE_GET_INFO_MEMBER(get_bg2_tile_info); + virtual void machine_reset(); + virtual void video_start(); }; /*----------- defined in video/vastar.c -----------*/ -VIDEO_START( vastar ); + SCREEN_UPDATE_IND16( vastar ); diff --git a/src/mame/includes/vball.h b/src/mame/includes/vball.h index 2a273551022..4b40c572fb5 100644 --- a/src/mame/includes/vball.h +++ b/src/mame/includes/vball.h @@ -30,12 +30,13 @@ public: DECLARE_WRITE8_MEMBER(vb_attrib_w); TILEMAP_MAPPER_MEMBER(background_scan); TILE_GET_INFO_MEMBER(get_bg_tile_info); + virtual void video_start(); }; /*----------- defined in video/vball.c -----------*/ -VIDEO_START( vb ); + SCREEN_UPDATE_IND16( vb ); void vb_bgprombank_w(running_machine &machine, int bank); void vb_spprombank_w(running_machine &machine, int bank); diff --git a/src/mame/includes/vectrex.h b/src/mame/includes/vectrex.h index 11361470757..74e03f1d61a 100644 --- a/src/mame/includes/vectrex.h +++ b/src/mame/includes/vectrex.h @@ -67,6 +67,8 @@ public: DECLARE_WRITE8_MEMBER(vectrex_via_w); DECLARE_WRITE8_MEMBER(raaspec_led_w); DECLARE_DRIVER_INIT(vectrex); + virtual void video_start(); + DECLARE_VIDEO_START(raaspec); }; @@ -91,10 +93,10 @@ READ8_DEVICE_HANDLER( vectrex_s1_via_pb_r ); extern const via6522_interface vectrex_via6522_interface; extern const via6522_interface spectrum1_via6522_interface; -VIDEO_START( vectrex ); + SCREEN_UPDATE_RGB32( vectrex ); -VIDEO_START( raaspec ); + diff --git a/src/mame/includes/vendetta.h b/src/mame/includes/vendetta.h index e508d24aa6e..934309599cc 100644 --- a/src/mame/includes/vendetta.h +++ b/src/mame/includes/vendetta.h @@ -41,6 +41,8 @@ public: DECLARE_READ8_MEMBER(vendetta_sound_r); DECLARE_DRIVER_INIT(vendetta); DECLARE_DRIVER_INIT(esckids); + virtual void machine_start(); + virtual void machine_reset(); }; /*----------- defined in video/vendetta.c -----------*/ diff --git a/src/mame/includes/vertigo.h b/src/mame/includes/vertigo.h index fa830715abc..11bdc20d770 100644 --- a/src/mame/includes/vertigo.h +++ b/src/mame/includes/vertigo.h @@ -108,6 +108,8 @@ public: DECLARE_WRITE16_MEMBER(vertigo_motor_w); DECLARE_READ16_MEMBER(vertigo_pit8254_lsb_r); DECLARE_WRITE16_MEMBER(vertigo_pit8254_lsb_w); + virtual void machine_start(); + virtual void machine_reset(); }; @@ -119,8 +121,8 @@ extern const struct pit8253_config vertigo_pit8254_config; INTERRUPT_GEN( vertigo_interrupt ); -MACHINE_START( vertigo ); -MACHINE_RESET( vertigo ); + + /*----------- defined in video/vertigo.c -----------*/ diff --git a/src/mame/includes/vicdual.h b/src/mame/includes/vicdual.h index 19e58ec0d5e..f4f51b49937 100644 --- a/src/mame/includes/vicdual.h +++ b/src/mame/includes/vicdual.h @@ -74,6 +74,7 @@ public: DECLARE_CUSTOM_INPUT_MEMBER(brdrline_lives); DECLARE_CUSTOM_INPUT_MEMBER(samurai_protection_r); DECLARE_INPUT_CHANGED_MEMBER(coin_changed); + DECLARE_MACHINE_START(frogs_audio); }; @@ -92,7 +93,7 @@ SCREEN_UPDATE_RGB32( vicdual_bw_or_color ); /*----------- defined in audio/vicdual.c -----------*/ -MACHINE_START( frogs_audio ); + MACHINE_CONFIG_EXTERN( frogs_audio ); MACHINE_CONFIG_EXTERN( headon_audio ); WRITE8_HANDLER( frogs_audio_w ); diff --git a/src/mame/includes/victory.h b/src/mame/includes/victory.h index ef374e61af5..041fe04b501 100644 --- a/src/mame/includes/victory.h +++ b/src/mame/includes/victory.h @@ -60,12 +60,13 @@ public: DECLARE_WRITE8_MEMBER(victory_paletteram_w); DECLARE_READ8_MEMBER(victory_video_control_r); DECLARE_WRITE8_MEMBER(victory_video_control_w); + virtual void video_start(); }; /*----------- defined in video/victory.c -----------*/ -VIDEO_START( victory ); + SCREEN_UPDATE_IND16( victory ); INTERRUPT_GEN( victory_vblank_interrupt ); diff --git a/src/mame/includes/videopin.h b/src/mame/includes/videopin.h index c4dc48b1678..2970e5b2efb 100644 --- a/src/mame/includes/videopin.h +++ b/src/mame/includes/videopin.h @@ -39,6 +39,8 @@ public: DECLARE_WRITE8_MEMBER(videopin_note_dvsr_w); TILEMAP_MAPPER_MEMBER(get_memory_offset); TILE_GET_INFO_MEMBER(get_tile_info); + virtual void machine_reset(); + virtual void video_start(); }; @@ -50,6 +52,6 @@ DISCRETE_SOUND_EXTERN( videopin ); /*----------- defined in video/videopin.c -----------*/ -VIDEO_START( videopin ); + SCREEN_UPDATE_IND16( videopin ); diff --git a/src/mame/includes/vigilant.h b/src/mame/includes/vigilant.h index ae8165027d2..b9baa56bab5 100644 --- a/src/mame/includes/vigilant.h +++ b/src/mame/includes/vigilant.h @@ -24,12 +24,14 @@ public: DECLARE_WRITE8_MEMBER(vigilant_horiz_scroll_w); DECLARE_WRITE8_MEMBER(vigilant_rear_horiz_scroll_w); DECLARE_WRITE8_MEMBER(vigilant_rear_color_w); + virtual void video_start(); + virtual void video_reset(); }; /*----------- defined in video/vigilant.c -----------*/ -VIDEO_START( vigilant ); -VIDEO_RESET( vigilant ); + + SCREEN_UPDATE_IND16( vigilant ); SCREEN_UPDATE_IND16( kikcubic ); diff --git a/src/mame/includes/vindictr.h b/src/mame/includes/vindictr.h index 042187ac060..5c6824fe562 100644 --- a/src/mame/includes/vindictr.h +++ b/src/mame/includes/vindictr.h @@ -19,6 +19,9 @@ public: DECLARE_DRIVER_INIT(vindictr); TILE_GET_INFO_MEMBER(get_alpha_tile_info); TILE_GET_INFO_MEMBER(get_playfield_tile_info); + DECLARE_MACHINE_START(vindictr); + DECLARE_MACHINE_RESET(vindictr); + DECLARE_VIDEO_START(vindictr); }; @@ -26,7 +29,7 @@ public: WRITE16_HANDLER( vindictr_paletteram_w ); -VIDEO_START( vindictr ); + SCREEN_UPDATE_IND16( vindictr ); void vindictr_scanline_update(screen_device &screen, int scanline); diff --git a/src/mame/includes/volfied.h b/src/mame/includes/volfied.h index 0b171f04c4f..ebad428220c 100644 --- a/src/mame/includes/volfied.h +++ b/src/mame/includes/volfied.h @@ -40,6 +40,9 @@ public: DECLARE_READ16_MEMBER(volfied_video_ctrl_r); DECLARE_WRITE16_MEMBER(volfied_video_mask_w); DECLARE_WRITE16_MEMBER(volfied_sprite_ctrl_w); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; @@ -55,4 +58,4 @@ void volfied_cchip_reset(running_machine &machine); SCREEN_UPDATE_IND16( volfied ); -VIDEO_START( volfied ); + diff --git a/src/mame/includes/vsnes.h b/src/mame/includes/vsnes.h index 17121705ae6..2c03d5477f9 100644 --- a/src/mame/includes/vsnes.h +++ b/src/mame/includes/vsnes.h @@ -91,17 +91,25 @@ public: DECLARE_DRIVER_INIT(platoon); DECLARE_DRIVER_INIT(rbibb); DECLARE_DRIVER_INIT(vsdual); + DECLARE_MACHINE_START(vsnes); + DECLARE_MACHINE_RESET(vsnes); + DECLARE_VIDEO_START(vsnes); + DECLARE_PALETTE_INIT(vsnes); + DECLARE_MACHINE_START(vsdual); + DECLARE_MACHINE_RESET(vsdual); + DECLARE_VIDEO_START(vsdual); + DECLARE_PALETTE_INIT(vsdual); }; /*----------- defined in video/vsnes.c -----------*/ -VIDEO_START( vsnes ); -PALETTE_INIT( vsnes ); + + SCREEN_UPDATE_IND16( vsnes ); -VIDEO_START( vsdual ); + SCREEN_UPDATE_IND16( vsnes_bottom ); -PALETTE_INIT( vsdual ); + extern const ppu2c0x_interface vsnes_ppu_interface_1; extern const ppu2c0x_interface vsnes_ppu_interface_2; @@ -109,9 +117,9 @@ extern const ppu2c0x_interface vsnes_ppu_interface_2; /*----------- defined in machine/vsnes.c -----------*/ -MACHINE_RESET( vsnes ); -MACHINE_RESET( vsdual ); -MACHINE_START( vsnes ); -MACHINE_START( vsdual ); + + + + diff --git a/src/mame/includes/vulgus.h b/src/mame/includes/vulgus.h index 663908a2d82..c414aa754c3 100644 --- a/src/mame/includes/vulgus.h +++ b/src/mame/includes/vulgus.h @@ -23,12 +23,14 @@ public: DECLARE_WRITE8_MEMBER(vulgus_palette_bank_w); TILE_GET_INFO_MEMBER(get_fg_tile_info); TILE_GET_INFO_MEMBER(get_bg_tile_info); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/vulgus.c -----------*/ -VIDEO_START( vulgus ); -PALETTE_INIT( vulgus ); + + SCREEN_UPDATE_IND16( vulgus ); diff --git a/src/mame/includes/warpwarp.h b/src/mame/includes/warpwarp.h index 4ed68d8dc9b..5639f696940 100644 --- a/src/mame/includes/warpwarp.h +++ b/src/mame/includes/warpwarp.h @@ -40,17 +40,23 @@ public: TILE_GET_INFO_MEMBER(geebee_get_tile_info); TILE_GET_INFO_MEMBER(navarone_get_tile_info); TILE_GET_INFO_MEMBER(warpwarp_get_tile_info); + DECLARE_VIDEO_START(geebee); + DECLARE_PALETTE_INIT(geebee); + DECLARE_VIDEO_START(warpwarp); + DECLARE_PALETTE_INIT(warpwarp); + DECLARE_VIDEO_START(navarone); + DECLARE_PALETTE_INIT(navarone); }; /*----------- defined in video/warpwarp.c -----------*/ -PALETTE_INIT( geebee ); -PALETTE_INIT( navarone ); -PALETTE_INIT( warpwarp ); -VIDEO_START( geebee ); -VIDEO_START( navarone ); -VIDEO_START( warpwarp ); + + + + + + SCREEN_UPDATE_IND16( geebee ); diff --git a/src/mame/includes/warriorb.h b/src/mame/includes/warriorb.h index 1d34c5857dc..7d29ec141b0 100644 --- a/src/mame/includes/warriorb.h +++ b/src/mame/includes/warriorb.h @@ -35,11 +35,14 @@ public: DECLARE_READ16_MEMBER(warriorb_sound_r); DECLARE_WRITE8_MEMBER(warriorb_pancontrol); DECLARE_WRITE16_MEMBER(tc0100scn_dual_screen_w); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; /*----------- defined in video/warriorb.c -----------*/ -VIDEO_START( warriorb ); + SCREEN_UPDATE_IND16( warriorb_left ); SCREEN_UPDATE_IND16( warriorb_right ); diff --git a/src/mame/includes/wc90.h b/src/mame/includes/wc90.h index 52e571e98c5..8565c5e14cf 100644 --- a/src/mame/includes/wc90.h +++ b/src/mame/includes/wc90.h @@ -50,11 +50,13 @@ public: TILE_GET_INFO_MEMBER(get_tx_tile_info); TILE_GET_INFO_MEMBER(track_get_bg_tile_info); TILE_GET_INFO_MEMBER(track_get_fg_tile_info); + virtual void video_start(); + DECLARE_VIDEO_START(wc90t); }; /*----------- defined in video/wc90.c -----------*/ -VIDEO_START( wc90 ); -VIDEO_START( wc90t ); + + SCREEN_UPDATE_IND16( wc90 ); diff --git a/src/mame/includes/wc90b.h b/src/mame/includes/wc90b.h index ba15e4edc70..986588dbeb8 100644 --- a/src/mame/includes/wc90b.h +++ b/src/mame/includes/wc90b.h @@ -38,11 +38,12 @@ public: TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); TILE_GET_INFO_MEMBER(get_tx_tile_info); + virtual void video_start(); }; /*----------- defined in video/wc90b.c -----------*/ -VIDEO_START( wc90b ); + SCREEN_UPDATE_IND16( wc90b ); diff --git a/src/mame/includes/wecleman.h b/src/mame/includes/wecleman.h index b34d689571d..bf684e6ac68 100644 --- a/src/mame/includes/wecleman.h +++ b/src/mame/includes/wecleman.h @@ -72,15 +72,19 @@ public: TILE_GET_INFO_MEMBER(wecleman_get_txt_tile_info); TILE_GET_INFO_MEMBER(wecleman_get_bg_tile_info); TILE_GET_INFO_MEMBER(wecleman_get_fg_tile_info); + DECLARE_MACHINE_RESET(wecleman); + DECLARE_VIDEO_START(wecleman); + DECLARE_MACHINE_RESET(hotchase); + DECLARE_VIDEO_START(hotchase); }; /*----------- defined in video/wecleman.c -----------*/ SCREEN_UPDATE_RGB32( wecleman ); -VIDEO_START( wecleman ); + SCREEN_UPDATE_IND16( hotchase ); -VIDEO_START( hotchase ); + void hotchase_zoom_callback_0(running_machine &machine, int *code,int *color,int *flags); void hotchase_zoom_callback_1(running_machine &machine, int *code,int *color,int *flags); diff --git a/src/mame/includes/welltris.h b/src/mame/includes/welltris.h index 94262a964ee..b026f9bb6b1 100644 --- a/src/mame/includes/welltris.h +++ b/src/mame/includes/welltris.h @@ -34,11 +34,12 @@ public: DECLARE_DRIVER_INIT(quiz18k); DECLARE_DRIVER_INIT(welltris); TILE_GET_INFO_MEMBER(get_welltris_tile_info); + virtual void video_start(); }; /*----------- defined in video/welltris.c -----------*/ -VIDEO_START( welltris ); + SCREEN_UPDATE_IND16( welltris ); diff --git a/src/mame/includes/wgp.h b/src/mame/includes/wgp.h index 7fa09419dc4..4d6703a6f4a 100644 --- a/src/mame/includes/wgp.h +++ b/src/mame/includes/wgp.h @@ -64,6 +64,10 @@ public: TILE_GET_INFO_MEMBER(get_piv0_tile_info); TILE_GET_INFO_MEMBER(get_piv1_tile_info); TILE_GET_INFO_MEMBER(get_piv2_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); + DECLARE_VIDEO_START(wgp2); }; @@ -71,6 +75,6 @@ public: -VIDEO_START( wgp ); -VIDEO_START( wgp2 ); + + SCREEN_UPDATE_IND16( wgp ); diff --git a/src/mame/includes/williams.h b/src/mame/includes/williams.h index d11d3110e86..9544fc09604 100644 --- a/src/mame/includes/williams.h +++ b/src/mame/includes/williams.h @@ -91,6 +91,19 @@ public: DECLARE_DRIVER_INIT(robotron); DECLARE_DRIVER_INIT(bubbles); TILE_GET_INFO_MEMBER(get_tile_info); + DECLARE_MACHINE_START(defender); + DECLARE_MACHINE_RESET(defender); + DECLARE_VIDEO_START(williams); + DECLARE_MACHINE_START(williams2); + DECLARE_MACHINE_RESET(williams2); + DECLARE_VIDEO_START(williams2); + DECLARE_MACHINE_START(williams); + DECLARE_MACHINE_RESET(williams); + DECLARE_MACHINE_START(blaster); + DECLARE_MACHINE_RESET(blaster); + DECLARE_VIDEO_START(blaster); + DECLARE_MACHINE_START(williams_common); + DECLARE_MACHINE_RESET(williams_common); }; @@ -103,6 +116,9 @@ public: required_device<williams_cvsd_sound_device> m_cvsd_sound; DECLARE_DRIVER_INIT(joust2); + DECLARE_MACHINE_START(joust2); + DECLARE_MACHINE_RESET(joust2); + }; /*----------- defined in drivers/williams.c -----------*/ @@ -148,16 +164,16 @@ TIMER_DEVICE_CALLBACK( williams2_va11_callback ); TIMER_DEVICE_CALLBACK( williams2_endscreen_callback ); /* initialization */ -MACHINE_START( defender ); -MACHINE_RESET( defender ); -MACHINE_START( williams ); -MACHINE_RESET( williams ); -MACHINE_START( blaster ); -MACHINE_RESET( blaster ); -MACHINE_START( williams2 ); -MACHINE_RESET( williams2 ); -MACHINE_START( joust2 ); -MACHINE_RESET( joust2 ); + + + + + + + + + + /* banking */ @@ -175,9 +191,9 @@ MACHINE_RESET( joust2 ); #define WILLIAMS_TILEMAP_JOUST2 2 /* IC79 is a 74LS157 selector jumpered to be disabled */ -VIDEO_START( williams ); -VIDEO_START( blaster ); -VIDEO_START( williams2 ); + + + SCREEN_UPDATE_RGB32( williams ); SCREEN_UPDATE_RGB32( blaster ); diff --git a/src/mame/includes/wiping.h b/src/mame/includes/wiping.h index 67c1c6ca919..53ebc05980a 100644 --- a/src/mame/includes/wiping.h +++ b/src/mame/includes/wiping.h @@ -20,11 +20,12 @@ public: DECLARE_WRITE8_MEMBER(main_irq_mask_w); DECLARE_WRITE8_MEMBER(sound_irq_mask_w); DECLARE_WRITE8_MEMBER(wiping_flipscreen_w); + virtual void palette_init(); }; /*----------- defined in video/wiping.c -----------*/ -PALETTE_INIT( wiping ); + SCREEN_UPDATE_IND16( wiping ); diff --git a/src/mame/includes/wiz.h b/src/mame/includes/wiz.h index 2575ba254bd..e9917a196c2 100644 --- a/src/mame/includes/wiz.h +++ b/src/mame/includes/wiz.h @@ -45,14 +45,17 @@ public: DECLARE_DRIVER_INIT(wiz); DECLARE_DRIVER_INIT(scion); DECLARE_DRIVER_INIT(stinger); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/wiz.c -----------*/ -VIDEO_START( wiz ); -PALETTE_INIT( wiz ); + + SCREEN_UPDATE_IND16( wiz ); SCREEN_UPDATE_IND16( stinger ); SCREEN_UPDATE_IND16( kungfut ); diff --git a/src/mame/includes/wolfpack.h b/src/mame/includes/wolfpack.h index 2e3b4da3681..53c0507c40a 100644 --- a/src/mame/includes/wolfpack.h +++ b/src/mame/includes/wolfpack.h @@ -51,13 +51,16 @@ public: DECLARE_CUSTOM_INPUT_MEMBER(wolfpack_dial_r); DECLARE_WRITE8_MEMBER(wolfpack_word_w); DECLARE_WRITE8_MEMBER(wolfpack_start_speech_w); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/wolfpack.c -----------*/ -PALETTE_INIT( wolfpack ); + SCREEN_UPDATE_IND16( wolfpack ); -VIDEO_START( wolfpack ); + SCREEN_VBLANK( wolfpack ); diff --git a/src/mame/includes/wrally.h b/src/mame/includes/wrally.h index fee79c41330..4d25c00ef16 100644 --- a/src/mame/includes/wrally.h +++ b/src/mame/includes/wrally.h @@ -23,6 +23,7 @@ public: DECLARE_WRITE16_MEMBER(wrally_coin_lockout_w); TILE_GET_INFO_MEMBER(get_tile_info_wrally_screen0); TILE_GET_INFO_MEMBER(get_tile_info_wrally_screen1); + virtual void video_start(); }; @@ -31,6 +32,6 @@ public: /*----------- defined in video/wrally.c -----------*/ -VIDEO_START( wrally ); + SCREEN_UPDATE_IND16( wrally ); diff --git a/src/mame/includes/wwfsstar.h b/src/mame/includes/wwfsstar.h index 868592b332c..9124a128968 100644 --- a/src/mame/includes/wwfsstar.h +++ b/src/mame/includes/wwfsstar.h @@ -25,10 +25,11 @@ public: TILE_GET_INFO_MEMBER(get_fg0_tile_info); TILEMAP_MAPPER_MEMBER(bg0_scan); TILE_GET_INFO_MEMBER(get_bg0_tile_info); + virtual void video_start(); }; /*----------- defined in video/wwfsstar.c -----------*/ -VIDEO_START( wwfsstar ); + SCREEN_UPDATE_IND16( wwfsstar ); diff --git a/src/mame/includes/wwfwfest.h b/src/mame/includes/wwfwfest.h index 4e719e5b1a0..dd64cf1ad8a 100644 --- a/src/mame/includes/wwfwfest.h +++ b/src/mame/includes/wwfwfest.h @@ -41,11 +41,13 @@ public: TILE_GET_INFO_MEMBER(get_fg0_tile_info); TILE_GET_INFO_MEMBER(get_bg0_tile_info); TILE_GET_INFO_MEMBER(get_bg1_tile_info); + virtual void video_start(); + DECLARE_VIDEO_START(wwfwfstb); }; /*----------- defined in video/wwfwfest.c -----------*/ -VIDEO_START( wwfwfest ); -VIDEO_START( wwfwfstb ); + + SCREEN_UPDATE_IND16( wwfwfest ); diff --git a/src/mame/includes/xain.h b/src/mame/includes/xain.h index 8c15fd3b586..c8ebdc53cdc 100644 --- a/src/mame/includes/xain.h +++ b/src/mame/includes/xain.h @@ -66,10 +66,12 @@ public: TILE_GET_INFO_MEMBER(get_bgram0_tile_info); TILE_GET_INFO_MEMBER(get_bgram1_tile_info); TILE_GET_INFO_MEMBER(get_char_tile_info); + virtual void machine_start(); + virtual void video_start(); }; /*----------- defined in video/xain.c -----------*/ SCREEN_UPDATE_IND16( xain ); -VIDEO_START( xain ); + diff --git a/src/mame/includes/xexex.h b/src/mame/includes/xexex.h index 33e12d45c83..a0424b07513 100644 --- a/src/mame/includes/xexex.h +++ b/src/mame/includes/xexex.h @@ -61,6 +61,9 @@ public: DECLARE_READ16_MEMBER(sound_status_r); DECLARE_WRITE8_MEMBER(sound_bankswitch_w); DECLARE_DRIVER_INIT(xexex); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; @@ -69,5 +72,5 @@ public: extern void xexex_sprite_callback(running_machine &machine, int *code, int *color, int *priority_mask); extern void xexex_tile_callback(running_machine &machine, int layer, int *code, int *color, int *flags); -VIDEO_START( xexex ); + SCREEN_UPDATE_RGB32( xexex ); diff --git a/src/mame/includes/xmen.h b/src/mame/includes/xmen.h index dda0adc49b8..92e79176be9 100644 --- a/src/mame/includes/xmen.h +++ b/src/mame/includes/xmen.h @@ -46,6 +46,9 @@ public: DECLARE_WRITE16_MEMBER(xmen_18fa00_w); DECLARE_WRITE8_MEMBER(sound_bankswitch_w); DECLARE_CUSTOM_INPUT_MEMBER(xmen_frame_r); + virtual void machine_start(); + virtual void machine_reset(); + DECLARE_VIDEO_START(xmen6p); }; /*----------- defined in video/xmen.c -----------*/ @@ -53,7 +56,7 @@ public: void xmen_tile_callback(running_machine &machine, int layer,int bank,int *code,int *color,int *flags,int *priority); void xmen_sprite_callback(running_machine &machine, int *code,int *color,int *priority_mask); -VIDEO_START( xmen6p ); + SCREEN_UPDATE_IND16( xmen ); SCREEN_UPDATE_IND16( xmen6p_left ); SCREEN_UPDATE_IND16( xmen6p_right ); diff --git a/src/mame/includes/xorworld.h b/src/mame/includes/xorworld.h index e0668151cbb..9b12ef2756b 100644 --- a/src/mame/includes/xorworld.h +++ b/src/mame/includes/xorworld.h @@ -17,12 +17,14 @@ public: DECLARE_WRITE16_MEMBER(eeprom_data_w); DECLARE_DRIVER_INIT(xorworld); TILE_GET_INFO_MEMBER(get_bg_tile_info); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/xorworld.c -----------*/ -PALETTE_INIT( xorworld ); -VIDEO_START( xorworld ); + + SCREEN_UPDATE_IND16( xorworld ); diff --git a/src/mame/includes/xxmissio.h b/src/mame/includes/xxmissio.h index 7c7e1056298..3afe59db01e 100644 --- a/src/mame/includes/xxmissio.h +++ b/src/mame/includes/xxmissio.h @@ -26,12 +26,14 @@ public: DECLARE_CUSTOM_INPUT_MEMBER(xxmissio_status_r); TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); + virtual void machine_start(); + virtual void video_start(); }; /*----------- defined in video/xxmissio.c -----------*/ -VIDEO_START( xxmissio ); + SCREEN_UPDATE_IND16( xxmissio ); WRITE8_DEVICE_HANDLER( xxmissio_scroll_x_w ); diff --git a/src/mame/includes/xybots.h b/src/mame/includes/xybots.h index a99497d847f..e81bb6a7926 100644 --- a/src/mame/includes/xybots.h +++ b/src/mame/includes/xybots.h @@ -17,10 +17,13 @@ public: DECLARE_DRIVER_INIT(xybots); TILE_GET_INFO_MEMBER(get_alpha_tile_info); TILE_GET_INFO_MEMBER(get_playfield_tile_info); + DECLARE_MACHINE_START(xybots); + DECLARE_MACHINE_RESET(xybots); + DECLARE_VIDEO_START(xybots); }; /*----------- defined in video/xybots.c -----------*/ -VIDEO_START( xybots ); + SCREEN_UPDATE_IND16( xybots ); diff --git a/src/mame/includes/xyonix.h b/src/mame/includes/xyonix.h index bda321b957b..d55177f34d8 100644 --- a/src/mame/includes/xyonix.h +++ b/src/mame/includes/xyonix.h @@ -17,11 +17,13 @@ public: DECLARE_WRITE8_MEMBER(xyonix_io_w); DECLARE_WRITE8_MEMBER(xyonix_vidram_w); TILE_GET_INFO_MEMBER(get_xyonix_tile_info); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/xyonix.c -----------*/ -PALETTE_INIT( xyonix ); -VIDEO_START(xyonix); + + SCREEN_UPDATE_IND16(xyonix); diff --git a/src/mame/includes/yiear.h b/src/mame/includes/yiear.h index f136939c3ed..c64efbd960e 100644 --- a/src/mame/includes/yiear.h +++ b/src/mame/includes/yiear.h @@ -31,12 +31,16 @@ public: DECLARE_WRITE8_MEMBER( konami_SN76496_latch_w ) { m_SN76496_latch = data; }; DECLARE_WRITE8_MEMBER( konami_SN76496_w ) { m_sn->write(space, offset, m_SN76496_latch); }; TILE_GET_INFO_MEMBER(get_bg_tile_info); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/yiear.c -----------*/ -PALETTE_INIT( yiear ); -VIDEO_START( yiear ); + + SCREEN_UPDATE_IND16( yiear ); diff --git a/src/mame/includes/yunsun16.h b/src/mame/includes/yunsun16.h index 229798491f4..38ec8242d7d 100644 --- a/src/mame/includes/yunsun16.h +++ b/src/mame/includes/yunsun16.h @@ -41,11 +41,14 @@ public: TILEMAP_MAPPER_MEMBER(yunsun16_tilemap_scan_pages); TILE_GET_INFO_MEMBER(get_tile_info_0); TILE_GET_INFO_MEMBER(get_tile_info_1); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; /*----------- defined in video/yunsun16.c -----------*/ -VIDEO_START( yunsun16 ); + SCREEN_UPDATE_IND16( yunsun16 ); diff --git a/src/mame/includes/yunsung8.h b/src/mame/includes/yunsung8.h index fb5ac0f8a68..316780e6f51 100644 --- a/src/mame/includes/yunsung8.h +++ b/src/mame/includes/yunsung8.h @@ -36,11 +36,14 @@ public: DECLARE_WRITE8_MEMBER(yunsung8_sound_bankswitch_w); TILE_GET_INFO_MEMBER(get_tile_info_0); TILE_GET_INFO_MEMBER(get_tile_info_1); + virtual void machine_start(); + virtual void machine_reset(); + virtual void video_start(); }; /*----------- defined in video/yunsung8.c -----------*/ -VIDEO_START( yunsung8 ); + SCREEN_UPDATE_IND16( yunsung8 ); diff --git a/src/mame/includes/zac2650.h b/src/mame/includes/zac2650.h index d77de393845..841290e8367 100644 --- a/src/mame/includes/zac2650.h +++ b/src/mame/includes/zac2650.h @@ -19,12 +19,14 @@ public: DECLARE_WRITE8_MEMBER(zac_s2636_w); DECLARE_READ8_MEMBER(tinvader_port_0_r); TILE_GET_INFO_MEMBER(get_bg_tile_info); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/zac2650.c -----------*/ -VIDEO_START( tinvader ); + SCREEN_UPDATE_IND16( tinvader ); diff --git a/src/mame/includes/zaccaria.h b/src/mame/includes/zaccaria.h index 2d0cc4d7964..e4c0478555c 100644 --- a/src/mame/includes/zaccaria.h +++ b/src/mame/includes/zaccaria.h @@ -42,11 +42,13 @@ public: DECLARE_WRITE8_MEMBER(zaccaria_port1b_w); DECLARE_WRITE8_MEMBER(mc1408_data_w); TILE_GET_INFO_MEMBER(get_tile_info); + virtual void video_start(); + virtual void palette_init(); }; /*----------- defined in video/zaccaria.c -----------*/ -PALETTE_INIT( zaccaria ); -VIDEO_START( zaccaria ); + + SCREEN_UPDATE_IND16( zaccaria ); diff --git a/src/mame/includes/zaxxon.h b/src/mame/includes/zaxxon.h index ba6458d58bd..bffdb6acce1 100644 --- a/src/mame/includes/zaxxon.h +++ b/src/mame/includes/zaxxon.h @@ -63,6 +63,11 @@ public: TILE_GET_INFO_MEMBER(zaxxon_get_fg_tile_info); TILE_GET_INFO_MEMBER(razmataz_get_fg_tile_info); TILE_GET_INFO_MEMBER(congo_get_fg_tile_info); + virtual void machine_start(); + virtual void video_start(); + virtual void palette_init(); + DECLARE_VIDEO_START(razmataz); + DECLARE_VIDEO_START(congo); }; @@ -84,11 +89,11 @@ MACHINE_CONFIG_EXTERN( congo_samples ); -PALETTE_INIT( zaxxon ); -VIDEO_START( zaxxon ); -VIDEO_START( razmataz ); -VIDEO_START( congo ); + + + + SCREEN_UPDATE_IND16( zaxxon ); SCREEN_UPDATE_IND16( razmataz ); diff --git a/src/mame/includes/zodiack.h b/src/mame/includes/zodiack.h index a741f5f3404..2b0d6eed9fe 100644 --- a/src/mame/includes/zodiack.h +++ b/src/mame/includes/zodiack.h @@ -62,10 +62,11 @@ protected: // driver_device overrides virtual void machine_start(); virtual void machine_reset(); - - virtual void video_start(); +public: + virtual void video_start(); TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); + DECLARE_PALETTE_INIT(zodiack); }; class percuss_state : public zodiack_state @@ -77,4 +78,4 @@ public: }; // in video/zodiack.c -PALETTE_INIT( zodiack ); + |