From 7f51ac8fe524a03a80f054603ab8a15ed52f421e Mon Sep 17 00:00:00 2001 From: angelosa Date: Fri, 21 Mar 2025 20:56:27 +0100 Subject: [PATCH] tatsumi: bulk replace screen_update suffixes, m_rotatingsprites -> m_sprites --- src/mame/tatsumi/apache3.cpp | 34 +++++++++++++------------- src/mame/tatsumi/cyclwarr.cpp | 46 +++++++++++++++++------------------ src/mame/tatsumi/kingdrby.cpp | 6 ++--- src/mame/tatsumi/lockon.cpp | 4 +-- src/mame/tatsumi/lockon.h | 4 +-- src/mame/tatsumi/lockon_v.cpp | 4 +-- src/mame/tatsumi/roundup5.cpp | 28 ++++++++++----------- src/mame/tatsumi/tatsumi.h | 4 +-- 8 files changed, 65 insertions(+), 65 deletions(-) diff --git a/src/mame/tatsumi/apache3.cpp b/src/mame/tatsumi/apache3.cpp index b76e5cdb2aa..b981fe1da68 100644 --- a/src/mame/tatsumi/apache3.cpp +++ b/src/mame/tatsumi/apache3.cpp @@ -57,7 +57,7 @@ private: void apache3_road_z_w(uint16_t data); void apache3_road_x_w(offs_t offset, uint8_t data); - uint32_t screen_update_apache3(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); void apache3_68000_reset(int state); void apache3_68000_map(address_map &map) ATTR_COLD; @@ -181,19 +181,19 @@ void apache3_state::video_start() m_tx_layer->set_transparent_pen(0); } -uint32_t apache3_state::screen_update_apache3(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) +uint32_t apache3_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) { - m_rotatingsprites->update_cluts(); + m_sprites->update_cluts(); m_tx_layer->set_scrollx(0,24); bitmap.fill(m_palette->pen(0), cliprect); screen.priority().fill(0, cliprect); - m_rotatingsprites->draw_sprites(screen.priority(),cliprect,1,(m_sprite_control_ram[0xe0]&0x1000) ? 0x1000 : 0); // Alpha pass only + m_sprites->draw_sprites(screen.priority(),cliprect,1,(m_sprite_control_ram[0xe0]&0x1000) ? 0x1000 : 0); // Alpha pass only draw_sky(bitmap, cliprect, 256, m_apache3_rotate_ctrl[1]); apply_shadow_bitmap(bitmap,cliprect,screen.priority(), 0); // draw_ground(bitmap, cliprect); - m_rotatingsprites->draw_sprites(bitmap,cliprect,0, (m_sprite_control_ram[0x20]&0x1000) ? 0x1000 : 0); + m_sprites->draw_sprites(bitmap,cliprect,0, (m_sprite_control_ram[0x20]&0x1000) ? 0x1000 : 0); m_tx_layer->draw(screen, bitmap, cliprect, 0,0); return 0; } @@ -468,13 +468,13 @@ void apache3_state::apache3(machine_config &config) /* video hardware */ screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); screen.set_raw(apache3_state::CLOCK_2 / 8, 400, 0, 320, 272, 0, 240); // TODO: Hook up CRTC - screen.set_screen_update(FUNC(apache3_state::screen_update_apache3)); + screen.set_screen_update(FUNC(apache3_state::screen_update)); - TZB215_SPRITES(config, m_rotatingsprites, 0, 0x800); - m_rotatingsprites->set_sprite_palette_base(0); - m_rotatingsprites->set_palette("rotatingsprites:palette_clut"); - m_rotatingsprites->set_basepalette(m_palette); - m_rotatingsprites->set_spriteram(m_spriteram); + TZB215_SPRITES(config, m_sprites, 0, 0x800); + m_sprites->set_sprite_palette_base(0); + m_sprites->set_palette("sprites:palette_clut"); + m_sprites->set_basepalette(m_palette); + m_sprites->set_spriteram(m_spriteram); GFXDECODE(config, m_gfxdecode, m_palette, gfx_apache3); PALETTE(config, m_palette).set_format(palette_device::xRGB_555, 2048); // 2048 real colours @@ -518,7 +518,7 @@ ROM_START( apache3 ) ROM_REGION( 0x10000, "sound_rom", 0 ) /* 64k code for sound V20 */ ROM_LOAD( "ap-27d.151", 0x00000, 0x10000, CRC(294b4d79) SHA1(2b03418a12a2aaf3919b98161d8d0ce6ae29a2bb) ) - ROM_REGION( 0x100000, "rotatingsprites:sprites_l", 0) + ROM_REGION( 0x100000, "sprites:sprites_l", 0) ROM_LOAD32_BYTE( "ap-00c.15", 0x000000, 0x20000, CRC(ad1ddc2b) SHA1(81f64663c4892ab5fb0e2dc99513dbfee73f15b8) ) ROM_LOAD32_BYTE( "ap-01c.22", 0x000001, 0x20000, CRC(6286ff00) SHA1(920da4a3a441dbf54ad86c0f4fb6f47a867e9cda) ) ROM_LOAD32_BYTE( "ap-04c.58", 0x000002, 0x20000, CRC(dc6d55e4) SHA1(9f48f8d6aa1a329a71913139a8d5a50d95a9b9e5) ) @@ -528,7 +528,7 @@ ROM_START( apache3 ) ROM_LOAD32_BYTE( "ap-06c.71", 0x080002, 0x20000, CRC(0ea90e55) SHA1(b16d6b8be4853797507d3e5c933a9dd1d451308e) ) ROM_LOAD32_BYTE( "ap-07c.75", 0x080003, 0x20000, CRC(ba685543) SHA1(140a2b708d4e4de4d207fc2c4a96a5cab8639988) ) - ROM_REGION( 0x100000, "rotatingsprites:sprites_h", 0) + ROM_REGION( 0x100000, "sprites:sprites_h", 0) ROM_LOAD32_BYTE( "ap-08c.14", 0x000000, 0x20000, CRC(6437b580) SHA1(2b2ba42add18bbec04fbcf53645a8d44b972e26a) ) ROM_LOAD32_BYTE( "ap-09c.21", 0x000001, 0x20000, CRC(54d18ef9) SHA1(40ebc6ea49b2a501fe843d60bec8c32d07f2d25d) ) ROM_LOAD32_BYTE( "ap-12c.57", 0x000002, 0x20000, CRC(f95cf5cf) SHA1(ce373c648cbf3e4863bbc3a1175efe065c75eb13) ) @@ -567,7 +567,7 @@ ROM_START( apache3a ) ROM_REGION( 0x10000, "sound_rom", 0 ) /* 64k code for sound V20 */ ROM_LOAD( "ap-27d.151", 0x00000, 0x10000, CRC(294b4d79) SHA1(2b03418a12a2aaf3919b98161d8d0ce6ae29a2bb) ) - ROM_REGION( 0x100000, "rotatingsprites:sprites_l", 0) + ROM_REGION( 0x100000, "sprites:sprites_l", 0) ROM_LOAD32_BYTE( "ap-00c.15", 0x000000, 0x20000, CRC(ad1ddc2b) SHA1(81f64663c4892ab5fb0e2dc99513dbfee73f15b8) ) ROM_LOAD32_BYTE( "ap-01c.22", 0x000001, 0x20000, CRC(6286ff00) SHA1(920da4a3a441dbf54ad86c0f4fb6f47a867e9cda) ) ROM_LOAD32_BYTE( "ap-04c.58", 0x000002, 0x20000, CRC(dc6d55e4) SHA1(9f48f8d6aa1a329a71913139a8d5a50d95a9b9e5) ) @@ -577,7 +577,7 @@ ROM_START( apache3a ) ROM_LOAD32_BYTE( "ap-06c.71", 0x080002, 0x20000, CRC(0ea90e55) SHA1(b16d6b8be4853797507d3e5c933a9dd1d451308e) ) ROM_LOAD32_BYTE( "ap-07c.75", 0x080003, 0x20000, CRC(ba685543) SHA1(140a2b708d4e4de4d207fc2c4a96a5cab8639988) ) - ROM_REGION( 0x100000, "rotatingsprites:sprites_h", 0) + ROM_REGION( 0x100000, "sprites:sprites_h", 0) ROM_LOAD32_BYTE( "ap-08c.14", 0x000000, 0x20000, CRC(6437b580) SHA1(2b2ba42add18bbec04fbcf53645a8d44b972e26a) ) ROM_LOAD32_BYTE( "ap-09c.21", 0x000001, 0x20000, CRC(54d18ef9) SHA1(40ebc6ea49b2a501fe843d60bec8c32d07f2d25d) ) ROM_LOAD32_BYTE( "ap-12c.57", 0x000002, 0x20000, CRC(f95cf5cf) SHA1(ce373c648cbf3e4863bbc3a1175efe065c75eb13) ) @@ -616,7 +616,7 @@ ROM_START( apache3b ) ROM_REGION( 0x10000, "sound_rom", 0 ) /* 64k code for sound V20 */ ROM_LOAD( "ap-27d.151", 0x00000, 0x10000, CRC(294b4d79) SHA1(2b03418a12a2aaf3919b98161d8d0ce6ae29a2bb) ) - ROM_REGION( 0x100000, "rotatingsprites:sprites_l", 0) + ROM_REGION( 0x100000, "sprites:sprites_l", 0) ROM_LOAD32_BYTE( "ap-00c.15", 0x000000, 0x20000, CRC(ad1ddc2b) SHA1(81f64663c4892ab5fb0e2dc99513dbfee73f15b8) ) ROM_LOAD32_BYTE( "ap-01c.22", 0x000001, 0x20000, CRC(6286ff00) SHA1(920da4a3a441dbf54ad86c0f4fb6f47a867e9cda) ) ROM_LOAD32_BYTE( "ap-04c.58", 0x000002, 0x20000, CRC(dc6d55e4) SHA1(9f48f8d6aa1a329a71913139a8d5a50d95a9b9e5) ) @@ -626,7 +626,7 @@ ROM_START( apache3b ) ROM_LOAD32_BYTE( "ap-06c.71", 0x080002, 0x20000, CRC(0ea90e55) SHA1(b16d6b8be4853797507d3e5c933a9dd1d451308e) ) ROM_LOAD32_BYTE( "ap-07c.75", 0x080003, 0x20000, CRC(ba685543) SHA1(140a2b708d4e4de4d207fc2c4a96a5cab8639988) ) - ROM_REGION( 0x100000, "rotatingsprites:sprites_h", 0) + ROM_REGION( 0x100000, "sprites:sprites_h", 0) ROM_LOAD32_BYTE( "ap-08c.14", 0x000000, 0x20000, CRC(6437b580) SHA1(2b2ba42add18bbec04fbcf53645a8d44b972e26a) ) ROM_LOAD32_BYTE( "ap-09c.21", 0x000001, 0x20000, CRC(54d18ef9) SHA1(40ebc6ea49b2a501fe843d60bec8c32d07f2d25d) ) ROM_LOAD32_BYTE( "ap-12c.57", 0x000002, 0x20000, CRC(f95cf5cf) SHA1(ce373c648cbf3e4863bbc3a1175efe065c75eb13) ) diff --git a/src/mame/tatsumi/cyclwarr.cpp b/src/mame/tatsumi/cyclwarr.cpp index 35359b9c6f1..f97ce1d47ac 100644 --- a/src/mame/tatsumi/cyclwarr.cpp +++ b/src/mame/tatsumi/cyclwarr.cpp @@ -178,7 +178,7 @@ private: template TILE_GET_INFO_MEMBER(get_tile_info_cyclwarr_road); - uint32_t screen_update_cyclwarr(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); void common_map(address_map &map) ATTR_COLD; void master_map(address_map &map) ATTR_COLD; @@ -442,7 +442,7 @@ void cyclwarr_state::draw_bg_layers(screen_device &screen, bitmap_rgb32 &bitmap, draw_bg(screen, bitmap, cliprect, m_layer[0], &m_cyclwarr_videoram[0][0x200], &m_cyclwarr_videoram[0][0x300], m_layer_page_size[0], false, hi_priority); } -uint32_t cyclwarr_state::screen_update_cyclwarr(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) +uint32_t cyclwarr_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) { m_bigfight_bank=m_bigfight_a40000[0]; if (m_bigfight_bank!=m_bigfight_last_bank) @@ -453,7 +453,7 @@ uint32_t cyclwarr_state::screen_update_cyclwarr(screen_device &screen, bitmap_rg } m_bigfight_last_bank=m_bigfight_bank; } - m_rotatingsprites->update_cluts(); + m_sprites->update_cluts(); bitmap.fill(m_palette->pen(0), cliprect); @@ -468,10 +468,10 @@ uint32_t cyclwarr_state::screen_update_cyclwarr(screen_device &screen, bitmap_rg // popmessage("%04x %04x %04x %04x",m_video_config[0],m_video_config[1],m_video_config[2],m_video_config[3]); screen.priority().fill(0, cliprect); - m_rotatingsprites->draw_sprites(screen.priority(),cliprect,1,(m_sprite_control_ram[0xe0]&0x1000) ? 0x1000 : 0); // Alpha pass only + m_sprites->draw_sprites(screen.priority(),cliprect,1,(m_sprite_control_ram[0xe0]&0x1000) ? 0x1000 : 0); // Alpha pass only draw_bg_layers(screen, bitmap, cliprect, 0); apply_shadow_bitmap(bitmap,cliprect,screen.priority(), m_mixing_control & 1); - m_rotatingsprites->draw_sprites(bitmap,cliprect,0,(m_sprite_control_ram[0xe0]&0x1000) ? 0x1000 : 0); + m_sprites->draw_sprites(bitmap,cliprect,0,(m_sprite_control_ram[0xe0]&0x1000) ? 0x1000 : 0); draw_bg_layers(screen, bitmap, cliprect, 1); return 0; } @@ -962,13 +962,13 @@ void cyclwarr_state::cyclwarr(machine_config &config) /* video hardware */ screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); screen.set_raw(cyclwarr_state::CLOCK_2 / 8, 400, 0, 320, 272, 0, 240); // TODO: Hook up CRTC - screen.set_screen_update(FUNC(cyclwarr_state::screen_update_cyclwarr)); + screen.set_screen_update(FUNC(cyclwarr_state::screen_update)); - TZB315_SPRITES(config, m_rotatingsprites, 0, 0x1000); - m_rotatingsprites->set_sprite_palette_base(4096); - m_rotatingsprites->set_palette("rotatingsprites:palette_clut"); - m_rotatingsprites->set_basepalette(m_palette); - m_rotatingsprites->set_spriteram(m_spriteram); + TZB315_SPRITES(config, m_sprites, 0, 0x1000); + m_sprites->set_sprite_palette_base(4096); + m_sprites->set_palette("sprites:palette_clut"); + m_sprites->set_basepalette(m_palette); + m_sprites->set_spriteram(m_spriteram); GFXDECODE(config, m_gfxdecode, m_palette, gfx_cyclwarr); PALETTE(config, m_palette).set_format(palette_device::xRGB_555, 8192); @@ -1024,7 +1024,7 @@ ROM_START( cyclwarr ) ROM_REGION( 0x10000, "audiocpu", 0 ) /* 64k code for sound Z80 */ ROM_LOAD( "cw26a.ic91", 0x000000, 0x10000, CRC(f7a70e3a) SHA1(5581633bf1f15d7f5c1e03de897d65d60f9f1e33) ) - ROM_REGION( 0x100000, "rotatingsprites:sprites_l", 0) + ROM_REGION( 0x100000, "sprites:sprites_l", 0) ROM_LOAD32_BYTE( "cw00a.ic26", 0x000000, 0x20000, CRC(058a77f1) SHA1(93f99fcf6ce6714d76af6f6e930115516f0379d3) ) ROM_LOAD32_BYTE( "cw08a.ic45", 0x000001, 0x20000, CRC(f53993e7) SHA1(ef2d502ab180d2bc0bdb698c2878fdee9a2c33a8) ) ROM_LOAD32_BYTE( "cw02a.ic28", 0x000002, 0x20000, CRC(4dadf3cb) SHA1(e42c56e295a443cb605d48eba23a16fab3c86525) ) @@ -1034,7 +1034,7 @@ ROM_START( cyclwarr ) ROM_LOAD32_BYTE( "cw03a.ic29", 0x080002, 0x20000, CRC(3ca6f98e) SHA1(8526fe38d3b4c66e09049ba18651a9e7255d85d6) ) ROM_LOAD32_BYTE( "cw11a.ic48", 0x080003, 0x20000, CRC(5d760392) SHA1(7bbda2880af4659c267193ce10ed887a1b54a981) ) - ROM_REGION( 0x100000, "rotatingsprites:sprites_h", 0) + ROM_REGION( 0x100000, "sprites:sprites_h", 0) ROM_LOAD32_BYTE( "cw04a.ic30", 0x000000, 0x20000, CRC(f05f594d) SHA1(80effaa517b2154c013419e0bc05fd0797b74c8d) ) ROM_LOAD32_BYTE( "cw12a.ic49", 0x000001, 0x20000, CRC(4ac07e8b) SHA1(f9de96fba39d5752d61b8f6be87fb605694624ed) ) ROM_LOAD32_BYTE( "cw06a.ic32", 0x000002, 0x20000, CRC(f628edc9) SHA1(473f7ec28000e6bf72782c1c3f4afb5e021bd430) ) @@ -1081,7 +1081,7 @@ ROM_START( cyclwarra ) ROM_REGION( 0x10000, "audiocpu", 0 ) /* 64k code for sound Z80 */ ROM_LOAD( "cw26a.ic91", 0x000000, 0x10000, CRC(f7a70e3a) SHA1(5581633bf1f15d7f5c1e03de897d65d60f9f1e33) ) - ROM_REGION( 0x100000, "rotatingsprites:sprites_l", 0) + ROM_REGION( 0x100000, "sprites:sprites_l", 0) ROM_LOAD32_BYTE( "cw00a.ic26", 0x000000, 0x20000, CRC(058a77f1) SHA1(93f99fcf6ce6714d76af6f6e930115516f0379d3) ) ROM_LOAD32_BYTE( "cw08a.ic45", 0x000001, 0x20000, CRC(f53993e7) SHA1(ef2d502ab180d2bc0bdb698c2878fdee9a2c33a8) ) ROM_LOAD32_BYTE( "cw02a.ic28", 0x000002, 0x20000, CRC(4dadf3cb) SHA1(e42c56e295a443cb605d48eba23a16fab3c86525) ) @@ -1091,7 +1091,7 @@ ROM_START( cyclwarra ) ROM_LOAD32_BYTE( "cw03a.ic29", 0x080002, 0x20000, CRC(3ca6f98e) SHA1(8526fe38d3b4c66e09049ba18651a9e7255d85d6) ) ROM_LOAD32_BYTE( "cw11a.ic48", 0x080003, 0x20000, CRC(5d760392) SHA1(7bbda2880af4659c267193ce10ed887a1b54a981) ) - ROM_REGION( 0x100000, "rotatingsprites:sprites_h", 0) + ROM_REGION( 0x100000, "sprites:sprites_h", 0) ROM_LOAD32_BYTE( "cw04a.ic30", 0x000000, 0x20000, CRC(f05f594d) SHA1(80effaa517b2154c013419e0bc05fd0797b74c8d) ) ROM_LOAD32_BYTE( "cw12a.ic49", 0x000001, 0x20000, CRC(4ac07e8b) SHA1(f9de96fba39d5752d61b8f6be87fb605694624ed) ) ROM_LOAD32_BYTE( "cw06a.ic32", 0x000002, 0x20000, CRC(f628edc9) SHA1(473f7ec28000e6bf72782c1c3f4afb5e021bd430) ) @@ -1138,7 +1138,7 @@ ROM_START( cyclwarrb ) ROM_REGION( 0x10000, "audiocpu", 0 ) /* 64k code for sound Z80 */ ROM_LOAD( "cw26.ic91", 0x000000, 0x10000, CRC(a6485a3a) SHA1(b4fcf541efe48b3ca32065221fe2f59476a4f96a) ) - ROM_REGION( 0x100000, "rotatingsprites:sprites_l", 0) + ROM_REGION( 0x100000, "sprites:sprites_l", 0) ROM_LOAD32_BYTE( "cw00.ic26", 0x000000, 0x20000, CRC(ba00c582) SHA1(2cd645b828595acbe62e2f7aad037fcbdc5a543f) ) ROM_LOAD32_BYTE( "cw08.ic45", 0x000001, 0x20000, CRC(1583e576) SHA1(646762d1d181231090a18698378f60d09f26f49f) ) ROM_LOAD32_BYTE( "cw02.ic28", 0x000002, 0x20000, CRC(8376a744) SHA1(633d20199382f760adfb528f5b13730ddf9016e3) ) @@ -1148,7 +1148,7 @@ ROM_START( cyclwarrb ) ROM_LOAD32_BYTE( "cw03.ic29", 0x080002, 0x20000, CRC(951ed812) SHA1(b3db6b467fd626936568773367099c9abcabfab6) ) ROM_LOAD32_BYTE( "cw11.ic48", 0x080003, 0x20000, CRC(a7e5bf0b) SHA1(883b943d40f4516a21692beffb12514ad9301f20) ) - ROM_REGION( 0x100000, "rotatingsprites:sprites_h", 0) + ROM_REGION( 0x100000, "sprites:sprites_h", 0) ROM_LOAD32_BYTE( "cw04.ic30", 0x000000, 0x20000, CRC(890ea7b1) SHA1(737e58800aa6863aff043ba46c9cebc8ba6c1501) ) ROM_LOAD32_BYTE( "cw12.ic49", 0x000001, 0x20000, CRC(1587e96d) SHA1(2ffcb27d90ef29bc79d0a29f46a1d43565935a15) ) ROM_LOAD32_BYTE( "cw06.ic32", 0x000002, 0x20000, CRC(47decb23) SHA1(4868c01035175698cb8af7aae80627b51583213f) ) @@ -1187,13 +1187,13 @@ ROM_START( bigfight ) ROM_REGION( 0x10000, "audiocpu", 0 ) /* 64k code for sound Z80 */ ROM_LOAD( "rom20.ic91", 0x000000, 0x10000, CRC(b3add091) SHA1(8a67bfff75c13fe4d9b89d30449199200d11cea7) ) // == bf36b.ic91 - ROM_REGION( 0x200000, "rotatingsprites:sprites_l", 0 ) + ROM_REGION( 0x200000, "sprites:sprites_l", 0 ) ROM_LOAD32_BYTE( "rom0.ic26", 0x000000, 0x80000, CRC(a4a3c8d6) SHA1(b5365d9bc6068260c23ba9d5971c7c7d7cc07a97) ) ROM_LOAD32_BYTE( "rom8.ic45", 0x000001, 0x80000, CRC(220956ed) SHA1(68e0ba1e850101b4cc2778819dfa76f04d88d2d6) ) ROM_LOAD32_BYTE( "rom2.ic28", 0x000002, 0x80000, CRC(c4f6d243) SHA1(e23b241b5a40b332165a34e2f1bc4366973b2070) ) ROM_LOAD32_BYTE( "rom10.ic47", 0x000003, 0x80000, CRC(0212d472) SHA1(5549461195fd7b6b43c0174462d7fe1a1bac24e9) ) - ROM_REGION( 0x200000, "rotatingsprites:sprites_h", 0 ) + ROM_REGION( 0x200000, "sprites:sprites_h", 0 ) ROM_LOAD32_BYTE( "rom4.ic30", 0x000000, 0x80000, CRC(999ff7e9) SHA1(a53b06ad084722d7a52fcf01c52967f68620e609) ) ROM_LOAD32_BYTE( "rom12.ic49", 0x000001, 0x80000, CRC(cb4c1f0b) SHA1(32d64b78ed3d5971eb5d25be2c38e6f2c9048f74) ) ROM_LOAD32_BYTE( "rom6.ic32", 0x000002, 0x80000, CRC(f70e2d47) SHA1(00517b5f3b2deb6f3f3bd12df421e63884c22b2e) ) @@ -1235,7 +1235,7 @@ ROM_START( bigfightj ) // ABA-011 main board + ABA-012 daughter board ROM_REGION( 0x10000, "audiocpu", 0 ) /* 64k code for sound Z80 */ ROM_LOAD( "bf36b.ic91", 0x000000, 0x10000, CRC(b3add091) SHA1(8a67bfff75c13fe4d9b89d30449199200d11cea7) ) // rev B - ROM_REGION( 0x200000, "rotatingsprites:sprites_l", 0 ) + ROM_REGION( 0x200000, "sprites:sprites_l", 0 ) ROM_LOAD32_BYTE( "bf00d.ic26", 0x000000, 0x40000, CRC(f506d508) SHA1(86255631ac139f1b5c0f5d6e54a0858625497a1e) ) // all rev D ROM_LOAD32_BYTE( "bf08d.ic45", 0x000001, 0x40000, CRC(4bf948b9) SHA1(c65b95c454d04c7e4a0cf426ac2d45ddc5e8885e) ) ROM_LOAD32_BYTE( "bf02d.ic28", 0x000002, 0x40000, CRC(af30acf7) SHA1(8f4778b33abb18b113d5d27c0e957d633557c988) ) @@ -1244,9 +1244,9 @@ ROM_START( bigfightj ) // ABA-011 main board + ABA-012 daughter board ROM_LOAD32_BYTE( "bf09d.ic46", 0x100001, 0x20000, CRC(284837ed) SHA1(b1c130b45ff0f22985962240c47b7b01df6ac636) ) ROM_LOAD32_BYTE( "bf03d.ic29", 0x100002, 0x20000, CRC(2ba0398e) SHA1(ec9a29b661b18980c07a446afc89becb1ebddd57) ) ROM_LOAD32_BYTE( "bf11d.ic48", 0x100003, 0x20000, CRC(3f2fa72f) SHA1(4b4821b6933ea753e092f11d80bcc7698f85ccf2) ) - ROM_COPY("rotatingsprites:sprites_l", 0x100000, 0x180000, 0x080000 ) + ROM_COPY("sprites:sprites_l", 0x100000, 0x180000, 0x080000 ) - ROM_REGION( 0x200000, "rotatingsprites:sprites_h", 0) + ROM_REGION( 0x200000, "sprites:sprites_h", 0) ROM_LOAD32_BYTE( "bf04d.ic30", 0x000000, 0x40000, CRC(6203d320) SHA1(d58225d8a362971a0eb63c94abc1e8c76198fd2a) ) // all rev D ROM_LOAD32_BYTE( "bf12d.ic49", 0x000001, 0x40000, CRC(d261dfa7) SHA1(e787901112780e9770300999722fc80aa1d7ab18) ) ROM_LOAD32_BYTE( "bf06d.ic32", 0x000002, 0x40000, CRC(be187c3c) SHA1(46383eb40c0caeb1bc636630a4d849aa2d1a12d2) ) @@ -1255,7 +1255,7 @@ ROM_START( bigfightj ) // ABA-011 main board + ABA-012 daughter board ROM_LOAD32_BYTE( "bf13d.ic50", 0x100001, 0x20000, CRC(1e46cd79) SHA1(c81c96b287a6cc91d3ab4dd8043153814560be3d) ) ROM_LOAD32_BYTE( "bf07d.ic33", 0x100002, 0x20000, CRC(4940b0bb) SHA1(762f21055921093349ca09c35ef516bde6330aa8) ) ROM_LOAD32_BYTE( "bf15d.ic52", 0x100003, 0x20000, CRC(dab0c80a) SHA1(a172937c9599acbd77dcac02ea7e43f576d66d8c) ) - ROM_COPY("rotatingsprites:sprites_h", 0x100000, 0x180000, 0x080000 ) + ROM_COPY("sprites:sprites_h", 0x100000, 0x180000, 0x080000 ) ROM_REGION( 0x20000, "cw_tileclut", 0 ) ROM_LOAD( "bf27.ic128", 0x000000, 0x20000, CRC(da027dcf) SHA1(47d18a8a273fea72cb3ad3d58166fe38ca28a860) ) diff --git a/src/mame/tatsumi/kingdrby.cpp b/src/mame/tatsumi/kingdrby.cpp index 3527f0cdf83..affba9c3bff 100644 --- a/src/mame/tatsumi/kingdrby.cpp +++ b/src/mame/tatsumi/kingdrby.cpp @@ -130,7 +130,7 @@ private: TILE_GET_INFO_MEMBER(get_sc1_tile_info); void kingdrby_palette(palette_device &palette) const; void kingdrbb_palette(palette_device &palette) const; - uint32_t screen_update_kingdrby(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); void draw_sprites(bitmap_rgb32 &bitmap, const rectangle &cliprect); void cowrace_sound_io(address_map &map) ATTR_COLD; @@ -274,7 +274,7 @@ void kingdrby_state::draw_sprites(bitmap_rgb32 &bitmap, const rectangle &cliprec } } -uint32_t kingdrby_state::screen_update_kingdrby(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) +uint32_t kingdrby_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) { const rectangle &visarea = screen.visible_area(); rectangle clip; @@ -1010,7 +1010,7 @@ void kingdrby_state::kingdrby(machine_config &config) screen.set_vblank_time(ATTOSECONDS_IN_USEC(2500)); /* not accurate */ screen.set_size(256, 256); screen.set_visarea(0, 256-1, 0, 224-1); /* controlled by CRTC */ - screen.set_screen_update(FUNC(kingdrby_state::screen_update_kingdrby)); + screen.set_screen_update(FUNC(kingdrby_state::screen_update)); mc6845_device &crtc(MC6845(config, "crtc", CLK_1/32)); /* 53.333 Hz. guess */ crtc.set_screen("screen"); diff --git a/src/mame/tatsumi/lockon.cpp b/src/mame/tatsumi/lockon.cpp index 311d622a1c5..b9a78d3432d 100644 --- a/src/mame/tatsumi/lockon.cpp +++ b/src/mame/tatsumi/lockon.cpp @@ -489,8 +489,8 @@ void lockon_state::lockon(machine_config &config) SCREEN(config, m_screen, SCREEN_TYPE_RASTER); m_screen->set_video_attributes(VIDEO_UPDATE_AFTER_VBLANK); m_screen->set_raw(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART); - m_screen->set_screen_update(FUNC(lockon_state::screen_update_lockon)); - m_screen->screen_vblank().set(FUNC(lockon_state::screen_vblank_lockon)); + m_screen->set_screen_update(FUNC(lockon_state::screen_update)); + m_screen->screen_vblank().set(FUNC(lockon_state::screen_vblank)); m_screen->set_palette(m_palette); GFXDECODE(config, m_gfxdecode, m_palette, gfx_lockon); diff --git a/src/mame/tatsumi/lockon.h b/src/mame/tatsumi/lockon.h index 4a5870407d2..5dc8fead4b4 100644 --- a/src/mame/tatsumi/lockon.h +++ b/src/mame/tatsumi/lockon.h @@ -141,8 +141,8 @@ private: void ym2203_out_b(uint8_t data); TILE_GET_INFO_MEMBER(get_lockon_tile_info); void lockon_palette(palette_device &palette) const; - uint32_t screen_update_lockon(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - void screen_vblank_lockon(int state); + uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void screen_vblank(int state); TIMER_CALLBACK_MEMBER(cursor_callback); TIMER_CALLBACK_MEMBER(bufend_callback); void scene_draw(); diff --git a/src/mame/tatsumi/lockon_v.cpp b/src/mame/tatsumi/lockon_v.cpp index f4e0e7ed56e..7e3f9cb854a 100644 --- a/src/mame/tatsumi/lockon_v.cpp +++ b/src/mame/tatsumi/lockon_v.cpp @@ -884,7 +884,7 @@ void lockon_state::video_start() save_pointer(NAME(m_obj_pal_ram), 2048); } -uint32_t lockon_state::screen_update_lockon(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) +uint32_t lockon_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { /* If screen output is disabled, fill with black */ if (!BIT(m_ctrl_reg, 7)) @@ -905,7 +905,7 @@ uint32_t lockon_state::screen_update_lockon(screen_device &screen, bitmap_ind16 return 0; } -void lockon_state::screen_vblank_lockon(int state) +void lockon_state::screen_vblank(int state) { // on falling edge if (!state) diff --git a/src/mame/tatsumi/roundup5.cpp b/src/mame/tatsumi/roundup5.cpp index 5a3d0ebeb5a..2c56addb9e4 100644 --- a/src/mame/tatsumi/roundup5.cpp +++ b/src/mame/tatsumi/roundup5.cpp @@ -60,7 +60,7 @@ private: void gfxdata_w(offs_t offset, uint8_t data); void output_w(uint8_t data); - uint32_t screen_update_roundup5(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); void roundup5_68000_map(address_map &map) ATTR_COLD; void roundup5_v30_map(address_map &map) ATTR_COLD; @@ -386,21 +386,21 @@ void roundup5_state::draw_landscape(bitmap_rgb32 &bitmap, const rectangle &clipr } } -uint32_t roundup5_state::screen_update_roundup5(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) +uint32_t roundup5_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) { int tx_start_addr; tx_start_addr = (m_hd6445_reg[0xc] << 8) | (m_hd6445_reg[0xd]); tx_start_addr &= 0x3fff; - m_rotatingsprites->update_cluts(); + m_sprites->update_cluts(); m_tx_layer->set_scrollx(0,24); m_tx_layer->set_scrolly(0,(tx_start_addr >> 4) | m_hd6445_reg[0x1d]); bitmap.fill(m_palette->pen(384), cliprect); // todo screen.priority().fill(0, cliprect); - m_rotatingsprites->draw_sprites(screen.priority(),cliprect,1,(m_sprite_control_ram[0xe0]&0x1000) ? 0x1000 : 0); // Alpha pass only + m_sprites->draw_sprites(screen.priority(),cliprect,1,(m_sprite_control_ram[0xe0]&0x1000) ? 0x1000 : 0); // Alpha pass only draw_landscape(bitmap,cliprect,0); draw_landscape(bitmap,cliprect,1); draw_road(bitmap,cliprect); @@ -408,11 +408,11 @@ uint32_t roundup5_state::screen_update_roundup5(screen_device &screen, bitmap_rg if(m_control_word & 0x80) // enabled on map screen after a play { m_tx_layer->draw(screen, bitmap, cliprect, 0,0); - m_rotatingsprites->draw_sprites(bitmap,cliprect,0,(m_sprite_control_ram[0xe0]&0x1000) ? 0x1000 : 0); // Full pass + m_sprites->draw_sprites(bitmap,cliprect,0,(m_sprite_control_ram[0xe0]&0x1000) ? 0x1000 : 0); // Full pass } else { - m_rotatingsprites->draw_sprites(bitmap,cliprect,0,(m_sprite_control_ram[0xe0]&0x1000) ? 0x1000 : 0); // Full pass + m_sprites->draw_sprites(bitmap,cliprect,0,(m_sprite_control_ram[0xe0]&0x1000) ? 0x1000 : 0); // Full pass m_tx_layer->draw(screen, bitmap, cliprect, 0,0); } return 0; @@ -706,13 +706,13 @@ void roundup5_state::roundup5(machine_config &config) /* video hardware */ screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); screen.set_raw(roundup5_state::CLOCK_2 / 8, 400, 0, 320, 272, 0, 240); // TODO: Hook up CRTC - screen.set_screen_update(FUNC(roundup5_state::screen_update_roundup5)); + screen.set_screen_update(FUNC(roundup5_state::screen_update)); - TZB315_SPRITES(config, m_rotatingsprites, 0, 0x800); // confirmed TZB315, even if it has the smaller CLUT like Apache 3 / TZB215 - m_rotatingsprites->set_sprite_palette_base(512); - m_rotatingsprites->set_palette("rotatingsprites:palette_clut"); - m_rotatingsprites->set_basepalette(m_palette); - m_rotatingsprites->set_spriteram(m_spriteram); + TZB315_SPRITES(config, m_sprites, 0, 0x800); // confirmed TZB315, even if it has the smaller CLUT like Apache 3 / TZB215 + m_sprites->set_sprite_palette_base(512); + m_sprites->set_palette("sprites:palette_clut"); + m_sprites->set_basepalette(m_palette); + m_sprites->set_spriteram(m_spriteram); GFXDECODE(config, m_gfxdecode, m_palette, gfx_roundup5); PALETTE(config, m_palette).set_format(palette_device::xRGB_555, 1024); // 1024 real colours @@ -749,7 +749,7 @@ ROM_START( roundup5 ) ROM_REGION( 0x10000, "audiocpu", 0 ) /* 64k code for sound Z80 */ ROM_LOAD( "ru-28d", 0x000000, 0x10000, CRC(df36c6c5) SHA1(c046482043f6b54c55696ba3d339ffb11d78f674) ) - ROM_REGION( 0x0c0000, "rotatingsprites:sprites_l", 0) + ROM_REGION( 0x0c0000, "sprites:sprites_l", 0) ROM_LOAD32_BYTE( "ru-00b", 0x000000, 0x20000, CRC(388a0647) SHA1(e4ab43832872f44c0fe1aaede4372cc00ca7d32b) ) ROM_LOAD32_BYTE( "ru-02b", 0x000001, 0x20000, CRC(eff33945) SHA1(3f4c3aaa11ccf945c2f898dfdf815705d8539e21) ) ROM_LOAD32_BYTE( "ru-04b", 0x000002, 0x20000, CRC(40fda247) SHA1(f5fbc07fda024baedf35ac209210e94df9f15065) ) @@ -759,7 +759,7 @@ ROM_START( roundup5 ) ROM_LOAD32_BYTE( "ru-05b", 0x080002, 0x10000, CRC(23dd10e1) SHA1(f30ff1a8c7ed9bc567b901cbdd202028fffb9f80) ) ROM_LOAD32_BYTE( "ru-07b", 0x080003, 0x10000, CRC(bb40f46e) SHA1(da694e16d19f60a0dee47551f00f3e50b2d5dcaf) ) - ROM_REGION( 0x0c0000, "rotatingsprites:sprites_h", 0) + ROM_REGION( 0x0c0000, "sprites:sprites_h", 0) ROM_LOAD32_BYTE( "ru-08b", 0x000000, 0x20000, CRC(01729e3c) SHA1(1445287fde0b993d053aab73efafc902a6b7e2cc) ) ROM_LOAD32_BYTE( "ru-10b", 0x000001, 0x20000, CRC(cd2357a7) SHA1(313460a74244325ce2c659816f2b738f3dc5358a) ) ROM_LOAD32_BYTE( "ru-12b", 0x000002, 0x20000, CRC(ca63b1f8) SHA1(a50ef8259745dc166eb0a1b2c812ff620818a755) ) diff --git a/src/mame/tatsumi/tatsumi.h b/src/mame/tatsumi/tatsumi.h index 477aa3144f8..295776dad63 100644 --- a/src/mame/tatsumi/tatsumi.h +++ b/src/mame/tatsumi/tatsumi.h @@ -25,7 +25,7 @@ public: , m_subcpu(*this, "sub") , m_ym2151(*this, "ymsnd") , m_oki(*this, "oki") - , m_rotatingsprites(*this, "rotatingsprites") + , m_sprites(*this, "sprites") , m_gfxdecode(*this, "gfxdecode") , m_palette(*this, "palette") , m_videoram(*this, "videoram") @@ -44,7 +44,7 @@ protected: required_device m_subcpu; optional_device m_ym2151; required_device m_oki; - required_device m_rotatingsprites; + required_device m_sprites; required_device m_gfxdecode; required_device m_palette;