diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua index 0055d50f895..44e7d5dd37e 100644 --- a/scripts/target/mame/arcade.lua +++ b/scripts/target/mame/arcade.lua @@ -2211,7 +2211,7 @@ files { MAME_DIR .. "src/mame/drivers/m62.cpp", MAME_DIR .. "src/mame/includes/m62.h", MAME_DIR .. "src/mame/video/m62.cpp", - MAME_DIR .. "src/mame/drivers/kungfum2.cpp", + MAME_DIR .. "src/mame/drivers/m62_bkungfu.cpp", MAME_DIR .. "src/mame/drivers/spartanxtec.cpp", MAME_DIR .. "src/mame/drivers/m63.cpp", MAME_DIR .. "src/mame/drivers/m72.cpp", diff --git a/src/mame/arcade.flt b/src/mame/arcade.flt index efbc9d2c657..2a11adcdf3f 100644 --- a/src/mame/arcade.flt +++ b/src/mame/arcade.flt @@ -671,7 +671,6 @@ kpontoon.cpp kpython.cpp ksayakyu.cpp ksys573.cpp -kungfum2.cpp kungfur.cpp kurukuru.cpp kyugo.cpp @@ -721,6 +720,7 @@ m52.cpp m57.cpp m58.cpp m62.cpp +m62_bkungfu.cpp m63.cpp m72.cpp m79amb.cpp diff --git a/src/mame/drivers/kungfum2.cpp b/src/mame/drivers/m62_bkungfu.cpp similarity index 85% rename from src/mame/drivers/kungfum2.cpp rename to src/mame/drivers/m62_bkungfu.cpp index c203b986e80..89058aa1e10 100644 --- a/src/mame/drivers/kungfum2.cpp +++ b/src/mame/drivers/m62_bkungfu.cpp @@ -13,28 +13,28 @@ TODO: #include "includes/m62.h" #include "includes/iremipt.h" -class kungfum2_state : public m62_state +class m62_bkungfu_state : public m62_state { public: - kungfum2_state(const machine_config &mconfig, device_type type, const char *tag) + m62_bkungfu_state(const machine_config &mconfig, device_type type, const char *tag) : m62_state(mconfig, type, tag) , m_blitterdatarom(*this, "blitterdat") , m_blittercmdram(*this, "blittercmdram") { } - void kungfum2(machine_config& config); + void bkungfu(machine_config& config); private: void mem_map(address_map& map); void io_map(address_map& map); - uint8_t kungfum2_blitter_r(offs_t offset); - void kungfum2_blitter_w(offs_t offset, uint8_t data); + uint8_t bkungfu_blitter_r(offs_t offset); + void bkungfu_blitter_w(offs_t offset, uint8_t data); - TILE_GET_INFO_MEMBER(get_kungfum2_bg_tile_info); - DECLARE_VIDEO_START(kungfum2); + TILE_GET_INFO_MEMBER(get_bkungfu_bg_tile_info); + DECLARE_VIDEO_START(bkungfu); - std::vector m_kungfum2_tileram; + std::vector m_bkungfu_tileram; required_region_ptr m_blitterdatarom; required_shared_ptr m_blittercmdram; @@ -46,10 +46,10 @@ private: Video *******************************************************************************/ -TILE_GET_INFO_MEMBER(kungfum2_state::get_kungfum2_bg_tile_info) +TILE_GET_INFO_MEMBER(m62_bkungfu_state::get_bkungfu_bg_tile_info) { - int code = m_kungfum2_tileram[(tile_index << 1)]; - int color = m_kungfum2_tileram[(tile_index << 1) | 1]; + int code = m_bkungfu_tileram[(tile_index << 1)]; + int color = m_bkungfu_tileram[(tile_index << 1) | 1]; tileinfo.set(0, code | ((color & 0xe0) << 3) | (m_kidniki_background_bank << 11), color & 0x1f, 0); @@ -59,13 +59,13 @@ TILE_GET_INFO_MEMBER(kungfum2_state::get_kungfum2_bg_tile_info) tileinfo.category = 0; } -VIDEO_START_MEMBER(kungfum2_state,kungfum2) +VIDEO_START_MEMBER(m62_bkungfu_state,bkungfu) { // tileram is private to blitter - m_kungfum2_tileram.resize(64*32*2); - save_item(NAME(m_kungfum2_tileram)); + m_bkungfu_tileram.resize(64*32*2); + save_item(NAME(m_bkungfu_tileram)); - m62_start(tilemap_get_info_delegate(*this, FUNC(kungfum2_state::get_kungfum2_bg_tile_info)), 32, 0, 8, 8, 64, 32); + m62_start(tilemap_get_info_delegate(*this, FUNC(m62_bkungfu_state::get_bkungfu_bg_tile_info)), 32, 0, 8, 8, 64, 32); } @@ -74,12 +74,12 @@ VIDEO_START_MEMBER(kungfum2_state,kungfum2) Blitter *******************************************************************************/ -uint8_t kungfum2_state::kungfum2_blitter_r(offs_t offset) +uint8_t m62_bkungfu_state::bkungfu_blitter_r(offs_t offset) { return 0xfe; } -void kungfum2_state::kungfum2_blitter_w(offs_t offset, uint8_t data) +void m62_bkungfu_state::bkungfu_blitter_w(offs_t offset, uint8_t data) { m_blittercmdram[offset] = data; @@ -110,8 +110,8 @@ void kungfum2_state::kungfum2_blitter_w(offs_t offset, uint8_t data) { uint16_t position = (m_blittercmdram[0x003] << 8) | m_blittercmdram[0x002]; - m_kungfum2_tileram[(position) & 0xfff] = blitdat; - m_kungfum2_tileram[(position + 1) & 0xfff] = m_blittercmdram[0x004]; + m_bkungfu_tileram[(position) & 0xfff] = blitdat; + m_bkungfu_tileram[(position + 1) & 0xfff] = m_blittercmdram[0x004]; m_bg_tilemap->mark_tile_dirty((position&0xfff) >> 1); position += 2; @@ -126,8 +126,8 @@ void kungfum2_state::kungfum2_blitter_w(offs_t offset, uint8_t data) { for (int position = 0; position < 0x1000; position += 2) { - m_kungfum2_tileram[(position) & 0xfff] = m_blittercmdram[0x002]; - m_kungfum2_tileram[(position + 1) & 0xfff] = m_blittercmdram[0x001]; + m_bkungfu_tileram[(position) & 0xfff] = m_blittercmdram[0x002]; + m_bkungfu_tileram[(position + 1) & 0xfff] = m_blittercmdram[0x001]; m_bg_tilemap->mark_tile_dirty((position &0xfff) >> 1); } } @@ -185,25 +185,25 @@ void kungfum2_state::kungfum2_blitter_w(offs_t offset, uint8_t data) Address Maps *******************************************************************************/ -void kungfum2_state::mem_map(address_map& map) +void m62_bkungfu_state::mem_map(address_map& map) { map(0x0000, 0xbfff).rom(); map(0xc000, 0xc0ff).ram().share("spriteram"); - map(0xc800, 0xcfff).rw(FUNC(kungfum2_state::kungfum2_blitter_r), FUNC(kungfum2_state::kungfum2_blitter_w)).share("blittercmdram"); + map(0xc800, 0xcfff).rw(FUNC(m62_bkungfu_state::bkungfu_blitter_r), FUNC(m62_bkungfu_state::bkungfu_blitter_w)).share("blittercmdram"); map(0xe000, 0xefff).ram(); } -void kungfum2_state::io_map(address_map &map) +void m62_bkungfu_state::io_map(address_map &map) { map.global_mask(0xff); map(0x00, 0x00).portr("SYSTEM").w(m_audio, FUNC(irem_audio_device::cmd_w)); - map(0x01, 0x01).portr("P1").w(FUNC(kungfum2_state::m62_flipscreen_w)); /* + coin counters */ + map(0x01, 0x01).portr("P1").w(FUNC(m62_bkungfu_state::m62_flipscreen_w)); /* + coin counters */ map(0x02, 0x02).portr("P2"); map(0x03, 0x03).portr("DSW1"); map(0x04, 0x04).portr("DSW2"); - map(0x81, 0x81).w(FUNC(kungfum2_state::m62_hscroll_high_w)); - map(0x80, 0x80).w(FUNC(kungfum2_state::m62_hscroll_low_w)); - map(0x83, 0x83).w(FUNC(kungfum2_state::kidniki_background_bank_w)); + map(0x81, 0x81).w(FUNC(m62_bkungfu_state::m62_hscroll_high_w)); + map(0x80, 0x80).w(FUNC(m62_bkungfu_state::m62_hscroll_low_w)); + map(0x83, 0x83).w(FUNC(m62_bkungfu_state::kidniki_background_bank_w)); //map(0x84, 0x84).nopw(); } @@ -213,7 +213,7 @@ void kungfum2_state::io_map(address_map &map) Input Ports *******************************************************************************/ -static INPUT_PORTS_START( kungfum2 ) +static INPUT_PORTS_START( bkungfu ) PORT_START("SYSTEM") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 ) @@ -286,14 +286,14 @@ INPUT_PORTS_END Machine Configs *******************************************************************************/ -void kungfum2_state::kungfum2(machine_config& config) +void m62_bkungfu_state::bkungfu(machine_config& config) { kungfum(config); - m_maincpu->set_addrmap(AS_PROGRAM, &kungfum2_state::mem_map); - m_maincpu->set_addrmap(AS_IO, &kungfum2_state::io_map); + m_maincpu->set_addrmap(AS_PROGRAM, &m62_bkungfu_state::mem_map); + m_maincpu->set_addrmap(AS_IO, &m62_bkungfu_state::io_map); - MCFG_VIDEO_START_OVERRIDE(kungfum2_state,kungfum2) + MCFG_VIDEO_START_OVERRIDE(m62_bkungfu_state,bkungfu) } @@ -302,7 +302,7 @@ void kungfum2_state::kungfum2(machine_config& config) ROM Definitions *******************************************************************************/ -ROM_START( kungfum2 ) +ROM_START( bkungfu ) ROM_REGION( 0x10000, "maincpu", 0 ) ROM_LOAD( "km-a.4e", 0x00000, 0x4000, CRC(083632aa) SHA1(0a52c6162b2fb55057735a54c59f7cb88d870593) ) ROM_LOAD( "km-a.4d", 0x04000, 0x4000, CRC(08b14684) SHA1(8d60abe5f06e1b3ce465ec740df3f4ee8e9398bc) ) @@ -361,5 +361,5 @@ ROM_END Drivers *******************************************************************************/ -// YEAR NAME PARENT MACHINE INPUT CLASS INIT ROT COMPANY FULLNAME FLAGS -GAME( 1987, kungfum2, 0, kungfum2, kungfum2, kungfum2_state, empty_init, ROT0, "Irem", "Beyond Kung-Fu (location test)", MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION | MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS ) +// YEAR NAME PARENT MACHINE INPUT CLASS INIT ROT COMPANY FULLNAME FLAGS +GAME( 1987, bkungfu, 0, bkungfu, bkungfu, m62_bkungfu_state, empty_init, ROT0, "Irem", "Beyond Kung-Fu (location test)", MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION | MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS ) diff --git a/src/mame/mame.lst b/src/mame/mame.lst index 6cc89580627..96437ebc4e2 100644 --- a/src/mame/mame.lst +++ b/src/mame/mame.lst @@ -19826,9 +19826,6 @@ sys573 // @source:ktm3.cpp ktm3 // (c) 1980 Synertek Systems Corp. -@source:kungfum2.cpp -kungfum2 // (c) 1986 Irem - @source:kungfur.cpp kungfur // (c) 1987 @@ -20400,6 +20397,9 @@ spelunkrj // (c) 1985 licensed from Broderbund yanchamr // (c) 1986 (Japan) youjyudn // (c) 1986 (Japan) +@source:m62_bkungfu.cpp +bkungfu // (c) 1987 Irem + @source:m63.cpp atomboy // M63 (c) 1985 Irem + Memetron license atomboya // M63 (c) 1985 Irem + Memetron license