diff options
| author | 2025-09-11 18:21:18 +0200 | |
|---|---|---|
| committer | 2025-09-11 18:21:18 +0200 | |
| commit | 57c3150a1a9a56d490ba8f5df1d16001504f331d (patch) | |
| tree | c60e37ceceefa64a1bf79891f62977199e01c139 | |
| parent | 2629b62d0d8e173584d6ca2084cefcef3081a7e8 (diff) | |
k007121: rename set_spr_dx to set_sprite_offsets similar to how these displacement functions are named on other konami chip devices
| -rw-r--r-- | src/mame/konami/contra.cpp | 4 | ||||
| -rw-r--r-- | src/mame/konami/fastlane.cpp | 2 | ||||
| -rw-r--r-- | src/mame/konami/flkatck.cpp | 2 | ||||
| -rw-r--r-- | src/mame/konami/k007121.cpp | 2 | ||||
| -rw-r--r-- | src/mame/konami/k007121.h | 4 | ||||
| -rw-r--r-- | src/mame/konami/labyrunr.cpp | 2 | ||||
| -rw-r--r-- | src/mame/konami/pingpong.cpp | 1 |
7 files changed, 9 insertions, 8 deletions
diff --git a/src/mame/konami/contra.cpp b/src/mame/konami/contra.cpp index bfdb8957084..345e43a2bcf 100644 --- a/src/mame/konami/contra.cpp +++ b/src/mame/konami/contra.cpp @@ -613,14 +613,14 @@ void contra_state::contra(machine_config &config) m_palette->set_endianness(ENDIANNESS_LITTLE); K007121(config, m_k007121[0], 0, gfx_contra_1, m_palette, m_screen); - m_k007121[0]->set_spr_dx(40, 16); + m_k007121[0]->set_sprite_offsets(40, 16); m_k007121[0]->set_irq_cb().set_inputline(m_maincpu, HD6309_IRQ_LINE); m_k007121[0]->set_flipscreen_cb().set(FUNC(contra_state::flipscreen_w<0>)); m_k007121[0]->set_flipscreen_cb().append(FUNC(contra_state::flipscreen_w<2>)); m_k007121[0]->set_sprite_callback(FUNC(contra_state::sprite_callback)); K007121(config, m_k007121[1], 0, gfx_contra_2, m_palette, m_screen); - m_k007121[1]->set_spr_dx(40, 16); + m_k007121[1]->set_sprite_offsets(40, 16); m_k007121[1]->set_flipscreen_cb().set(FUNC(contra_state::flipscreen_w<1>)); m_k007121[1]->set_sprite_callback(FUNC(contra_state::sprite_callback)); diff --git a/src/mame/konami/fastlane.cpp b/src/mame/konami/fastlane.cpp index f5b387ccd5f..c5fa846ca58 100644 --- a/src/mame/konami/fastlane.cpp +++ b/src/mame/konami/fastlane.cpp @@ -358,7 +358,7 @@ void fastlane_state::fastlane(machine_config &config) PALETTE(config, m_palette, FUNC(fastlane_state::palette)).set_format(palette_device::xBGR_555, 1024*16, 0x400); K007121(config, m_k007121, 0, gfx_fastlane, m_palette, m_screen); - m_k007121->set_spr_dx(40, 16); + m_k007121->set_sprite_offsets(40, 16); m_k007121->set_irq_cb().set_inputline(m_maincpu, HD6309_IRQ_LINE); m_k007121->set_nmi_cb().set_inputline(m_maincpu, INPUT_LINE_NMI); m_k007121->set_flipscreen_cb().set(FUNC(fastlane_state::flipscreen_w)); diff --git a/src/mame/konami/flkatck.cpp b/src/mame/konami/flkatck.cpp index 6dd7130d1e3..80e201535fe 100644 --- a/src/mame/konami/flkatck.cpp +++ b/src/mame/konami/flkatck.cpp @@ -403,7 +403,7 @@ void flkatck_state::flkatck(machine_config &config) PALETTE(config, "palette").set_format(palette_device::xBGR_555, 512).set_endianness(ENDIANNESS_LITTLE); K007121(config, m_k007121, 0, gfx_flkatck, "palette", "screen"); - m_k007121->set_spr_dx(40, 16); + m_k007121->set_sprite_offsets(40, 16); m_k007121->set_irq_cb().set_inputline(m_maincpu, HD6309_IRQ_LINE); m_k007121->set_flipscreen_cb().set(FUNC(flkatck_state::flipscreen_w)); diff --git a/src/mame/konami/k007121.cpp b/src/mame/konami/k007121.cpp index 45701044bbe..7982b98f554 100644 --- a/src/mame/konami/k007121.cpp +++ b/src/mame/konami/k007121.cpp @@ -16,7 +16,7 @@ ROM is 0x80000 bytes (addressed 16 bits at a time). Tile and sprite data both come from the same ROM space. Like the 005885, external circuitry can cause tiles and sprites to be fetched from different ROMs (used by Haunted Castle). -The chip will render a maximum of 264 64-pixel sprite blocks, presumably one +The chip will process a maximum of 264 64-pixel sprite blocks, presumably one per scanline. There is no limit on the number of sprites, including per-scanline, other than bumping into the 264 sprite block limit. Games often append 17 off-screen 32x32 sprites after their active sprite list so they bump into the diff --git a/src/mame/konami/k007121.h b/src/mame/konami/k007121.h index d4355dc0951..93b91ea634e 100644 --- a/src/mame/konami/k007121.h +++ b/src/mame/konami/k007121.h @@ -24,14 +24,14 @@ public: k007121_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // configuration - void set_spr_dx(int dx, int flip_dx) + void set_sprite_offsets(int dx, int flip_dx) { m_spr_dx = dx; m_spr_flip_dx = flip_dx; } auto set_irq_cb() { return m_irq_cb.bind(); } - //auto set_firq_cb() { return m_firq_cb.bind(); } // unused + auto set_firq_cb() { return m_firq_cb.bind(); } auto set_nmi_cb() { return m_nmi_cb.bind(); } auto set_flipscreen_cb() { return m_flipscreen_cb.bind(); } template <typename... T> void set_sprite_callback(T &&... args) { m_sprite_cb.set(std::forward<T>(args)...); } diff --git a/src/mame/konami/labyrunr.cpp b/src/mame/konami/labyrunr.cpp index b508e545d51..f64243f7dd4 100644 --- a/src/mame/konami/labyrunr.cpp +++ b/src/mame/konami/labyrunr.cpp @@ -444,7 +444,7 @@ void labyrunr_state::labyrunr(machine_config &config) m_palette->set_format(palette_device::xBGR_555, 8*16*16, 128); K007121(config, m_k007121, 0, gfx_labyrunr, m_palette, "screen"); - m_k007121->set_spr_dx(40, 16); + m_k007121->set_sprite_offsets(40, 16); m_k007121->set_irq_cb().set_inputline(m_maincpu, HD6309_IRQ_LINE); m_k007121->set_nmi_cb().set_inputline(m_maincpu, INPUT_LINE_NMI); m_k007121->set_flipscreen_cb().set(FUNC(labyrunr_state::flipscreen_w)); diff --git a/src/mame/konami/pingpong.cpp b/src/mame/konami/pingpong.cpp index f236af61f45..1ff56422b7f 100644 --- a/src/mame/konami/pingpong.cpp +++ b/src/mame/konami/pingpong.cpp @@ -703,6 +703,7 @@ void pingpong_state::pingpong(machine_config &config) Z80(config, m_maincpu, 18.432_MHz_XTAL / 6); // 3.072 MHz (probably) m_maincpu->set_addrmap(AS_PROGRAM, &pingpong_state::pingpong_map); TIMER(config, "scantimer").configure_scanline(FUNC(pingpong_state::pingpong_interrupt), "screen", 0, 1); + WATCHDOG_TIMER(config, "watchdog"); // video hardware |
