diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua
index 00f0e7814d5..d55d9af8154 100644
--- a/scripts/target/mame/arcade.lua
+++ b/scripts/target/mame/arcade.lua
@@ -2211,6 +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/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 975c033e9d5..26f59376f13 100644
--- a/src/mame/arcade.flt
+++ b/src/mame/arcade.flt
@@ -671,6 +671,7 @@ kpontoon.cpp
 kpython.cpp
 ksayakyu.cpp
 ksys573.cpp
+kungfum2.cpp
 kungfur.cpp
 kurukuru.cpp
 kyugo.cpp
diff --git a/src/mame/drivers/kungfum2.cpp b/src/mame/drivers/kungfum2.cpp
new file mode 100644
index 00000000000..58748b4edb7
--- /dev/null
+++ b/src/mame/drivers/kungfum2.cpp
@@ -0,0 +1,331 @@
+// license:GPL-2.0+
+// copyright-holders:Jonas Jago
+
+#include "emu.h"
+#include "includes/m62.h"
+#include "includes/iremipt.h"
+
+class kungfum2_state : public m62_state
+{
+public:
+	kungfum2_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);
+
+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);
+
+	void kungfum2_io83_w(uint8_t data);
+	void kungfum2_io84_w(uint8_t data);
+
+	TILE_GET_INFO_MEMBER(get_kungfum2_bg_tile_info);
+	DECLARE_VIDEO_START(kungfum2);
+
+	std::vector<uint8_t> m_kungfum2_tileram;
+
+	required_region_ptr<uint8_t> m_blitterdatarom;
+	required_shared_ptr<uint8_t> m_blittercmdram;
+};
+
+
+TILE_GET_INFO_MEMBER(kungfum2_state::get_kungfum2_bg_tile_info)
+{
+	int code = m_kungfum2_tileram[(tile_index << 1)];
+	int color = m_kungfum2_tileram[(tile_index << 1) | 1];
+
+	tileinfo.set(0, code | ((color & 0xc0)<< 2), color & 0x1f, 0);
+
+	if ((tile_index / 64) < 6 || ((color & 0x1f) >> 1) > 0x0c)
+		tileinfo.category = 1;
+	else
+		tileinfo.category = 0;
+}
+
+
+VIDEO_START_MEMBER(kungfum2_state,kungfum2)
+{
+	// tileram is private to blitter
+	m_kungfum2_tileram.resize(64*32*2);
+	save_item(NAME(m_kungfum2_tileram));
+
+	m62_start(tilemap_get_info_delegate(*this, FUNC(kungfum2_state::get_kungfum2_bg_tile_info)), 32, 0, 8, 8, 64, 32);
+}
+
+uint8_t kungfum2_state::kungfum2_blitter_r(offs_t offset)
+{
+	return 0xfe;
+}
+
+void kungfum2_state::kungfum2_blitter_w(offs_t offset, uint8_t data)
+{
+	m_blittercmdram[offset] = data;
+
+	if (offset == 0x00)
+	{
+		if (data == 0x14)
+		{
+			//logerror("%s: blitter: draw text from ROM\n", machine().describe_context());
+
+			uint16_t blitterromptr = m_blittercmdram[0x001] * 2;
+			uint16_t blitterromdataptr = m_blitterdatarom[blitterromptr] | (m_blitterdatarom[blitterromptr + 1] << 8);
+
+			uint8_t blitdat = m_blitterdatarom[blitterromdataptr++];
+			while (blitdat != 0x00)
+			{
+				if (blitdat == 0x01)
+				{
+					// change color value during blit
+					m_blittercmdram[0x004] = m_blitterdatarom[blitterromdataptr++];
+				}
+				else if (blitdat == 0x02)
+				{
+					// change position params during blit
+					m_blittercmdram[0x002] = m_blitterdatarom[blitterromdataptr++];
+					m_blittercmdram[0x003] = m_blitterdatarom[blitterromdataptr++];
+				}
+				else
+				{
+					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_bg_tilemap->mark_tile_dirty((position&0xfff) >> 1);
+
+					position += 2;
+					m_blittercmdram[0x002] = position & 0xff;
+					m_blittercmdram[0x003] = (position & 0xff00) >> 8;
+				}
+
+				blitdat = m_blitterdatarom[blitterromdataptr++];
+			}
+		}
+		else if (data == 0x08) // clear layer to fixed value
+		{
+			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_bg_tilemap->mark_tile_dirty((position &0xfff) >> 1);
+			}
+		}
+		else if (data == 0x02)
+		{
+			//logerror("%s: blitter: draw level from ROM(2)\n", machine().describe_context());
+		}
+		else if (data == 0x01)
+		{
+			//logerror("%s: blitter: draw level from ROM(1)\n", machine().describe_context());
+		}
+		else if (data == 0x0a)
+		{
+			// level data is in custom format. draws 14x4 tile blocks. compression?
+			//logerror("%s: blitter: draw level from ROM initialize\n", machine().describe_context());
+
+			//uint16_t blitterromptr = m_blittercmdram[0x001] << 1;
+			//uint16_t blitterromdataptr = m_blitterdatarom[0x200 + blitterromptr] | (m_blitterdatarom[0x200 + blitterromptr + 1] << 8);
+			//logerror("source address is % 04x\n", blitterromdataptr);
+		}
+		else if (data == 0x05)
+		{
+			//logerror("%s: blitter: draw level ROM on level 3+\n", machine().describe_context());
+		}
+		else if (data == 0x0f)
+		{
+			//logerror("%s: blitter: draw title animation flames\n", machine().describe_context());
+		}
+		else if (data == 0x0d)
+		{
+			//logerror("%s: blitter: draw title animation flames(2)\n", machine().describe_context());
+		}
+		else if (data == 0x10)
+		{
+			//logerror("%s: blitter: coin up\n", machine().describe_context());
+		}
+		else if (data == 0xFE)
+		{
+			//logerror("%s: blitter: start up\n", machine().describe_context());
+		}
+		else
+		{
+			//logerror("%s: blitter: unknown\n", machine().describe_context());
+		}
+	}
+	else
+	{
+		// higher offsets used for score & timer display
+	}
+}
+
+void kungfum2_state::kungfum2_io83_w(uint8_t data)
+{
+	// before blitter commands
+	//logerror("%s: kungfum2_io83_w: %02x\n",machine().describe_context(),data);
+}
+
+void kungfum2_state::kungfum2_io84_w(uint8_t data)
+{
+	//logerror("%s: kungfum2_io84_w: %02x\n",machine().describe_context(),data);
+}
+
+void kungfum2_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(0xe000, 0xefff).ram();
+}
+
+void kungfum2_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(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::kungfum2_io83_w));
+	map(0x84, 0x84).w(FUNC(kungfum2_state::kungfum2_io84_w));
+}
+
+void kungfum2_state::kungfum2(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);
+
+	MCFG_VIDEO_START_OVERRIDE(kungfum2_state,kungfum2)
+}
+
+
+
+static INPUT_PORTS_START( kungfum2 )
+	PORT_START("SYSTEM")
+	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
+	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
+	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_IMPULSE(19)
+	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN1 )
+	PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
+
+	PORT_START("P1")
+	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
+	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
+	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
+	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
+	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
+	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 )
+	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
+	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 )
+
+	PORT_START("P2")
+	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
+	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
+	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
+	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
+	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_COIN2 )
+	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
+	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
+	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
+
+	PORT_START("DSW2")
+	PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW2:1")
+	PORT_DIPSETTING(    0x01, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
+	PORT_DIPNAME( 0x02, 0x00, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW2:2")
+	PORT_DIPSETTING(    0x00, DEF_STR( Upright ) )
+	PORT_DIPSETTING(    0x02, DEF_STR( Cocktail ) )
+	PORT_DIPNAME( 0x04, 0x04, "Coin Mode" ) PORT_DIPLOCATION("SW2:3")
+	PORT_DIPSETTING(    0x04, "Mode 1" )
+	PORT_DIPSETTING(    0x00, "Mode 2" )
+	PORT_DIPNAME( 0x08, 0x08, "Slow Motion Mode (Cheat)" ) PORT_DIPLOCATION("SW2:4")
+	PORT_DIPSETTING(    0x08, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
+	PORT_DIPNAME( 0x10, 0x10, "Freeze (Cheat)" ) PORT_DIPLOCATION("SW2:5")
+	PORT_DIPSETTING(    0x10, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
+	PORT_DIPNAME( 0x20, 0x20, "Level Selection Mode (Cheat)" ) PORT_DIPLOCATION("SW2:6")
+	PORT_DIPSETTING(    0x20, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
+	PORT_DIPNAME( 0x40, 0x40, "Invulnerability (Cheat)" ) PORT_DIPLOCATION("SW2:7")
+	PORT_DIPSETTING(    0x40, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
+	PORT_SERVICE_DIPLOC( 0x80, IP_ACTIVE_LOW, "SW2:8" )
+
+	PORT_START("DSW1")
+	PORT_DIPNAME( 0x01, 0x01, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW1:1")
+	PORT_DIPSETTING(    0x01, DEF_STR( Easy ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( Hard ) )
+	PORT_DIPNAME( 0x02, 0x02, "Energy Loss" ) PORT_DIPLOCATION("SW1:2")
+	PORT_DIPSETTING(    0x02, "Slow" )
+	PORT_DIPSETTING(    0x00, "Fast" )
+	PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW1:3,4")
+	PORT_DIPSETTING(    0x08, "2" )
+	PORT_DIPSETTING(    0x0c, "3" )
+	PORT_DIPSETTING(    0x04, "4" )
+	PORT_DIPSETTING(    0x00, "5" )
+	IREM_Z80_COINAGE_TYPE_3_LOC(SW1)
+INPUT_PORTS_END
+
+
+ROM_START( kungfum2 )
+	ROM_REGION( 0x30000, "maincpu", 0 ) /* main CPU */
+	ROM_LOAD( "km-a.4e", 0x00000, 0x04000, CRC(083632aa) SHA1(0a52c6162b2fb55057735a54c59f7cb88d870593) )
+	ROM_LOAD( "km-a.4d", 0x04000, 0x04000, CRC(08b14684) SHA1(8d60abe5f06e1b3ce465ec740df3f4ee8e9398bc) )
+	ROM_LOAD( "km-z.7j", 0x08000, 0x04000, CRC(2bd2aa83) SHA1(422ef2a64f040a0974311ff692726c6f3a8f8b13) )
+
+	ROM_REGION( 0x8000, "blitterdat", 0 )
+	ROM_LOAD( "km-z.4h", 0x00000, 0x08000, CRC(252bb4a9) SHA1(2a69ee113950ea58895b42102bbb5263865ace9d) )
+
+	ROM_REGION( 0x10000, "irem_audio:iremsound", 0 )
+	ROM_LOAD( "km-a.3a",     0x4000, 0x04000, CRC(bb709dd6) SHA1(aa491ec2d64b096927546b4362fa41c4784659c9) )
+	ROM_LOAD( "km-a.3d",     0x8000, 0x04000, CRC(ef8551cb) SHA1(2a26feeae8ea7ddc5d899592bc4c17b40571fe8f) )
+	ROM_LOAD( "km-a.3f",     0xc000, 0x04000, CRC(bec93bdc) SHA1(e287d3e689e18b192d686f313c63b6ed4e10a83f) )
+
+	ROM_REGION( 0x18000, "gfx1", 0 )
+	ROM_LOAD( "km-z.3a",      0x10000, 0x8000, CRC(0bb7fda0) SHA1(aaab12b5e5402f3bbd1a2700ecc65dc588f0e590) )
+	ROM_LOAD( "km-z.3c",      0x08000, 0x8000, CRC(a99be837) SHA1(48b720462b359ef3551d50b8a41d2e3a2e146a60) )
+	ROM_LOAD( "km-z.3d",      0x00000, 0x8000, CRC(a8007429) SHA1(5e315ba41bbb2248cf49b1fd0a1601c08bf891b4) )
+
+	ROM_REGION( 0x30000, "gfx2", 0 )
+	ROM_LOAD( "km-b.4k",    0x00000, 0x4000, CRC(7e8bec97) SHA1(6ca5939bd64df63124de997b53c9ac9975450ab5) )
+	ROM_LOAD( "km-b.4f",    0x04000, 0x4000, CRC(3a75305b) SHA1(f62e7a293647be8aabbdd0b366459f634de593c6) )
+	ROM_LOAD( "km-b.4l",    0x08000, 0x4000, CRC(fe746127) SHA1(53f446a28466e0a749c27aa2eeb7d7bad4bd8d9b) )
+	ROM_LOAD( "km-b.4h",    0x0c000, 0x4000, CRC(f322c5dd) SHA1(03cb9658f31853f1ba41d8bf7e8cbc87353cc432) )
+	ROM_LOAD( "km-b.3n",    0x10000, 0x4000, CRC(b88a4d16) SHA1(2ab45a4bf44b5827def8166b30faa08514e7a814) )
+	ROM_LOAD( "km-b.4n",    0x14000, 0x4000, CRC(f92be992) SHA1(dd3ddc1ba76ceba71435a63c43f1be24a3272011) )
+	ROM_LOAD( "km-b.4m",    0x18000, 0x4000, CRC(53623913) SHA1(efb3de824df15b95e5eb91b5907ae2232501e3e3) )
+	ROM_LOAD( "km-b.3m",    0x1c000, 0x4000, CRC(1d1ec6f2) SHA1(fcdaf34529166701aad87d013176f4709cb5d540) )
+	ROM_LOAD( "km-b.4c",    0x20000, 0x4000, CRC(31cb5b98) SHA1(54bb88d668c59ec5248098a053a99132a121df74) )
+	ROM_LOAD( "km-b.4e",    0x24000, 0x4000, CRC(942e60fc) SHA1(d14553854b8300e80d7556b3be47544c537daac3) )
+	ROM_LOAD( "km-b.4d",    0x28000, 0x4000, CRC(90a03502) SHA1(bf4efc5e170f8ae479411eef98d8c38bb32d2648) )
+	ROM_LOAD( "km-b.4a",    0x2c000, 0x4000, CRC(018509c2) SHA1(844f3d79a4f358ccce1023deb76c052914570aed))
+
+	ROM_REGION( 0x300, "spr_color_proms", 0 )
+	ROM_LOAD( "km-b.1m",    0x0000, 0x0100, CRC(73638418) SHA1(ad3f9cf08d334e76294bd796b7f8849014f05b8e) )
+	ROM_LOAD( "km-b.1n",    0x0100, 0x0100, CRC(7967dfdf) SHA1(95f5aac75ce902287c0d0ada6ee9e1e1bd9d87c0) )
+	ROM_LOAD( "km-b.1l",    0x0200, 0x0100, CRC(4f44ef5c) SHA1(094e6ab24a5663208fc9d54203ed200c9e4a9fc3) )
+
+	ROM_REGION( 0x300, "chr_color_proms", 0 )
+	ROM_LOAD( "km-z-1j",    0x0000, 0x0100, CRC(1da0ad7f) SHA1(3b3ba444efa8f5481c64b3c9ef1c0ab6561c9f16) )
+	ROM_LOAD( "km-z-1h",    0x0100, 0x0100, CRC(23a217c0) SHA1(723738cd8875c5bb449be2da75ef0b04cca8dd55) )
+	ROM_LOAD( "km-z-1f",    0x0200, 0x0100, CRC(ec9df4f2) SHA1(702f7d536a5f79987342521c66d703153a888010) )
+
+	ROM_REGION( 0x20, "spr_height_prom", 0 )
+	ROM_LOAD( "km-b.5p",    0x0000, 0x0020, CRC(33409e90) SHA1(b84f7df9c27aa18255099b0473c6088c6fd7adfa) )
+
+	ROM_REGION( 0x100, "timing", 0 )
+	ROM_LOAD( "km-b.6f",    0x0000, 0x0100,CRC(82c20d12) SHA1(268903f7d9be58a70d030b02bf31a2d6b5b6e249) )
+ROM_END
+
+GAME( 1986, kungfum2,  0,        kungfum2, kungfum2,  kungfum2_state, empty_init, ROT0,   "Irem", "Kung Fu Master 2", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
diff --git a/src/mame/includes/m62.h b/src/mame/includes/m62.h
index c79bb5306cd..e0594c8daea 100644
--- a/src/mame/includes/m62.h
+++ b/src/mame/includes/m62.h
@@ -12,24 +12,24 @@
 class m62_state : public driver_device
 {
 public:
-	m62_state(const machine_config &mconfig, device_type type, const char *tag) :
-		driver_device(mconfig, type, tag),
-		m_spriteram(*this, "spriteram"),
-		m_m62_tileram(*this, "m62_tileram"),
-		m_m62_textram(*this, "m62_textram"),
-		m_scrollram(*this, "scrollram"),
-		m_sprite_height_prom(*this, "spr_height_prom"),
-		m_sprite_color_proms(*this, "spr_color_proms"),
-		m_chr_color_proms(*this, "chr_color_proms"),
-		m_fg_color_proms(*this, "fg_color_proms"),
-		m_maincpu(*this, "maincpu"),
-		m_fg_decode(*this, "fg_decode"),
-		m_spr_decode(*this, "spr_decode"),
-		m_chr_decode(*this, "chr_decode"),
-		m_fg_palette(*this, "fg_palette"),
-		m_spr_palette(*this, "spr_palette"),
-		m_chr_palette(*this, "chr_palette"),
-		m_audio(*this, "irem_audio")
+	m62_state(const machine_config &mconfig, device_type type, const char *tag)
+		: driver_device(mconfig, type, tag)
+		, m_maincpu(*this, "maincpu")
+		, m_audio(*this, "irem_audio")
+		, m_spriteram(*this, "spriteram")
+		, m_m62_tileram(*this, "m62_tileram")
+		, m_m62_textram(*this, "m62_textram")
+		, m_scrollram(*this, "scrollram")
+		, m_sprite_height_prom(*this, "spr_height_prom")
+		, m_sprite_color_proms(*this, "spr_color_proms")
+		, m_chr_color_proms(*this, "chr_color_proms")
+		, m_fg_color_proms(*this, "fg_color_proms")
+		, m_fg_decode(*this, "fg_decode")
+		, m_spr_decode(*this, "spr_decode")
+		, m_chr_decode(*this, "chr_decode")
+		, m_fg_palette(*this, "fg_palette")
+		, m_spr_palette(*this, "spr_palette")
+		, m_chr_palette(*this, "chr_palette")
 	{ }
 
 	void ldrun2(machine_config &config);
@@ -53,16 +53,24 @@ public:
 	void init_kidniki();
 	void init_battroad();
 
+protected:
+	required_device<cpu_device> m_maincpu;
+	required_device<irem_audio_device> m_audio;
+	tilemap_t*             m_bg_tilemap;
+	void m62_flipscreen_w(uint8_t data);
+	void m62_hscroll_low_w(uint8_t data);
+	void m62_hscroll_high_w(uint8_t data);
+	void m62_start(tilemap_get_info_delegate tile_get_info, int rows, int cols, int x1, int y1, int x2, int y2);
+
 private:
 	/* memory pointers */
 	required_shared_ptr<uint8_t> m_spriteram;
 
-	required_shared_ptr<uint8_t> m_m62_tileram;
+	optional_shared_ptr<uint8_t> m_m62_tileram;
 	optional_shared_ptr<uint8_t> m_m62_textram;
 	optional_shared_ptr<uint8_t> m_scrollram;
 
 	/* video-related */
-	tilemap_t*             m_bg_tilemap;
 	tilemap_t*             m_fg_tilemap;
 	int                  m_flipscreen;
 	required_region_ptr<uint8_t> m_sprite_height_prom;
@@ -88,9 +96,6 @@ private:
 	void spelunkr_bankswitch_w(uint8_t data);
 	void spelunk2_bankswitch_w(uint8_t data);
 	void youjyudn_bankswitch_w(uint8_t data);
-	void m62_flipscreen_w(uint8_t data);
-	void m62_hscroll_low_w(uint8_t data);
-	void m62_hscroll_high_w(uint8_t data);
 	void m62_vscroll_low_w(uint8_t data);
 	void m62_vscroll_high_w(uint8_t data);
 	void m62_tileram_w(offs_t offset, uint8_t data);
@@ -153,16 +158,13 @@ private:
 	void m62_amplify_contrast(bool include_fg);
 	void register_savestate();
 	void draw_sprites(bitmap_rgb32 &bitmap, const rectangle &cliprect, int colormask, int prioritymask, int priority);
-	void m62_start(tilemap_get_info_delegate tile_get_info, int rows, int cols, int x1, int y1, int x2, int y2);
 	void m62_textlayer(tilemap_get_info_delegate tile_get_info, int rows, int cols, int x1, int y1, int x2, int y2);
-	required_device<cpu_device> m_maincpu;
 	optional_device<gfxdecode_device> m_fg_decode;
 	required_device<gfxdecode_device> m_spr_decode;
 	required_device<gfxdecode_device> m_chr_decode;
 	optional_device<palette_device> m_fg_palette;
 	required_device<palette_device> m_spr_palette;
 	required_device<palette_device> m_chr_palette;
-	required_device<irem_audio_device> m_audio;
 
 	void battroad_io_map(address_map &map);
 	void battroad_map(address_map &map);
diff --git a/src/mame/mame.lst b/src/mame/mame.lst
index 1ede5566813..1312e2db36a 100644
--- a/src/mame/mame.lst
+++ b/src/mame/mame.lst
@@ -19821,6 +19821,9 @@ sys573                          //
 @source:ktm3.cpp
 ktm3                            // (c) 1980 Synertek Systems Corp.
 
+@source:kungfum2.cpp
+kungfum2                        // (c) 1986 Irem
+
 @source:kungfur.cpp
 kungfur                         // (c) 1987