diff --git a/src/mame/drivers/ultraman.cpp b/src/mame/drivers/ultraman.cpp index f9859d1eae0..67d6bd5facb 100644 --- a/src/mame/drivers/ultraman.cpp +++ b/src/mame/drivers/ultraman.cpp @@ -42,12 +42,12 @@ void ultraman_state::main_map(address_map &map) map(0x1c0021, 0x1c0021).w(m_soundlatch, FUNC(generic_latch_8_device::write)); map(0x1c0029, 0x1c0029).w(m_soundnmi, FUNC(input_merger_device::in_set<0>)); map(0x1c0030, 0x1c0031).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); - map(0x204000, 0x204fff).rw(m_k051316_1, FUNC(k051316_device::read), FUNC(k051316_device::write)).umask16(0x00ff); /* K051316 #0 RAM */ - map(0x205000, 0x205fff).rw(m_k051316_2, FUNC(k051316_device::read), FUNC(k051316_device::write)).umask16(0x00ff); /* K051316 #1 RAM */ - map(0x206000, 0x206fff).rw(m_k051316_3, FUNC(k051316_device::read), FUNC(k051316_device::write)).umask16(0x00ff); /* K051316 #2 RAM */ - map(0x207f80, 0x207f9f).w(m_k051316_1, FUNC(k051316_device::ctrl_w)).umask16(0x00ff); /* K051316 #0 registers */ - map(0x207fa0, 0x207fbf).w(m_k051316_2, FUNC(k051316_device::ctrl_w)).umask16(0x00ff); /* K051316 #1 registers */ - map(0x207fc0, 0x207fdf).w(m_k051316_3, FUNC(k051316_device::ctrl_w)).umask16(0x00ff); /* K051316 #2 registers */ + map(0x204000, 0x204fff).rw(m_k051316[0], FUNC(k051316_device::read), FUNC(k051316_device::write)).umask16(0x00ff); /* K051316 #0 RAM */ + map(0x205000, 0x205fff).rw(m_k051316[1], FUNC(k051316_device::read), FUNC(k051316_device::write)).umask16(0x00ff); /* K051316 #1 RAM */ + map(0x206000, 0x206fff).rw(m_k051316[2], FUNC(k051316_device::read), FUNC(k051316_device::write)).umask16(0x00ff); /* K051316 #2 RAM */ + map(0x207f80, 0x207f9f).w(m_k051316[0], FUNC(k051316_device::ctrl_w)).umask16(0x00ff); /* K051316 #0 registers */ + map(0x207fa0, 0x207fbf).w(m_k051316[1], FUNC(k051316_device::ctrl_w)).umask16(0x00ff); /* K051316 #1 registers */ + map(0x207fc0, 0x207fdf).w(m_k051316[2], FUNC(k051316_device::ctrl_w)).umask16(0x00ff); /* K051316 #2 registers */ map(0x304000, 0x30400f).rw(m_k051960, FUNC(k051960_device::k051937_r), FUNC(k051960_device::k051937_w)).umask16(0x00ff); /* Sprite control */ map(0x304800, 0x304fff).rw(m_k051960, FUNC(k051960_device::k051960_r), FUNC(k051960_device::k051960_w)).umask16(0x00ff); /* Sprite RAM */ } @@ -160,16 +160,14 @@ INPUT_PORTS_END void ultraman_state::machine_start() { - save_item(NAME(m_bank0)); - save_item(NAME(m_bank1)); - save_item(NAME(m_bank2)); + save_item(NAME(m_bank)); } void ultraman_state::machine_reset() { - m_bank0 = -1; - m_bank1 = -1; - m_bank2 = -1; + m_bank[0] = -1; + m_bank[1] = -1; + m_bank[2] = -1; m_soundnmi->in_w<0>(0); } diff --git a/src/mame/includes/ultraman.h b/src/mame/includes/ultraman.h index ffa2625d238..d17e673d037 100644 --- a/src/mame/includes/ultraman.h +++ b/src/mame/includes/ultraman.h @@ -16,26 +16,22 @@ class ultraman_state : public driver_device { public: ultraman_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu"), - m_audiocpu(*this, "audiocpu"), - m_k051316_1(*this, "k051316_1"), - m_k051316_2(*this, "k051316_2"), - m_k051316_3(*this, "k051316_3"), - m_k051960(*this, "k051960"), - m_soundlatch(*this, "soundlatch"), - m_soundnmi(*this, "soundnmi") { } + : driver_device(mconfig, type, tag) + , m_maincpu(*this, "maincpu") + , m_audiocpu(*this, "audiocpu") + , m_k051316(*this, "k051316_%u", 1) + , m_k051960(*this, "k051960") + , m_soundlatch(*this, "soundlatch") + , m_soundnmi(*this, "soundnmi") + { + } - int m_bank0; - int m_bank1; - int m_bank2; + int m_bank[3]; /* devices */ required_device m_maincpu; required_device m_audiocpu; - required_device m_k051316_1; - required_device m_k051316_2; - required_device m_k051316_3; + required_device_array m_k051316; required_device m_k051960; required_device m_soundlatch; required_device m_soundnmi; diff --git a/src/mame/video/ultraman.cpp b/src/mame/video/ultraman.cpp index 38390784150..89455909f53 100644 --- a/src/mame/video/ultraman.cpp +++ b/src/mame/video/ultraman.cpp @@ -29,7 +29,7 @@ K051316_CB_MEMBER(ultraman_state::zoom_callback_1) { enum { zoom_colorbase_1 = 0 / 16 }; - *code |= ((*color & 0x07) << 8) | (m_bank0 << 11); + *code |= ((*color & 0x07) << 8) | (m_bank[0] << 11); *color = zoom_colorbase_1 + ((*color & 0xf8) >> 3); } @@ -37,14 +37,14 @@ K051316_CB_MEMBER(ultraman_state::zoom_callback_2) { enum { zoom_colorbase_2 = 1024 / 16 }; - *code |= ((*color & 0x07) << 8) | (m_bank1 << 11); + *code |= ((*color & 0x07) << 8) | (m_bank[1] << 11); *color = zoom_colorbase_2 + ((*color & 0xf8) >> 3); } K051316_CB_MEMBER(ultraman_state::zoom_callback_3) { enum { zoom_colorbase_3 = 2048 / 16 }; - *code |= ((*color & 0x07) << 8) | (m_bank2 << 11); + *code |= ((*color & 0x07) << 8) | (m_bank[2] << 11); *color = zoom_colorbase_3 + ((*color & 0xf8) >> 3); } @@ -69,28 +69,28 @@ WRITE16_MEMBER(ultraman_state::ultraman_gfxctrl_w) bit 6: coin counter 1 bit 7: coin counter 2 */ - m_k051316_1->wraparound_enable(data & 0x01); + m_k051316[0]->wraparound_enable(data & 0x01); - if (m_bank0 != ((data & 0x02) >> 1)) + if (m_bank[0] != ((data & 0x02) >> 1)) { - m_bank0 = (data & 0x02) >> 1; - m_k051316_1->mark_tmap_dirty(); + m_bank[0] = (data & 0x02) >> 1; + m_k051316[0]->mark_tmap_dirty(); } - m_k051316_2->wraparound_enable(data & 0x04); + m_k051316[1]->wraparound_enable(data & 0x04); - if (m_bank1 != ((data & 0x08) >> 3)) + if (m_bank[1] != ((data & 0x08) >> 3)) { - m_bank1 = (data & 0x08) >> 3; - m_k051316_2->mark_tmap_dirty(); + m_bank[1] = (data & 0x08) >> 3; + m_k051316[1]->mark_tmap_dirty(); } - m_k051316_3->wraparound_enable(data & 0x10); + m_k051316[2]->wraparound_enable(data & 0x10); - if (m_bank2 != ((data & 0x20) >> 5)) + if (m_bank[2] != ((data & 0x20) >> 5)) { - m_bank2 = (data & 0x20) >> 5; - m_k051316_3->mark_tmap_dirty(); + m_bank[2] = (data & 0x20) >> 5; + m_k051316[2]->mark_tmap_dirty(); } machine().bookkeeping().coin_counter_w(0, data & 0x40); @@ -110,9 +110,9 @@ uint32_t ultraman_state::screen_update_ultraman(screen_device &screen, bitmap_in { screen.priority().fill(0, cliprect); - m_k051316_3->zoom_draw(screen, bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0); - m_k051316_2->zoom_draw(screen, bitmap, cliprect, 0, 0); - m_k051316_1->zoom_draw(screen, bitmap, cliprect, 0, 1); + m_k051316[2]->zoom_draw(screen, bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0); + m_k051316[1]->zoom_draw(screen, bitmap, cliprect, 0, 0); + m_k051316[0]->zoom_draw(screen, bitmap, cliprect, 0, 1); m_k051960->k051960_sprites_draw(bitmap, cliprect, screen.priority(), -1, -1); return 0; }