diff --git a/src/mame/dynax/dynax.cpp b/src/mame/dynax/dynax.cpp
index 99b62d91ca4..09ce829525a 100644
--- a/src/mame/dynax/dynax.cpp
+++ b/src/mame/dynax/dynax.cpp
@@ -7448,7 +7448,7 @@ GAME( 1991, ougonhaib1, ougonhai, ougonhaib1, tenkai,   dynax_state,       empty
 GAME( 1991, ougonhaib2, ougonhai, ougonhaib1, tenkai,   dynax_state,       empty_init,    ROT0,   "bootleg",                   "Mahjong Ougon no Hai (Japan bootleg set 2, medal)",             MACHINE_SUPPORTS_SAVE )
 GAME( 1991, ougonhaib3, ougonhai, ougonhaib1, tenkai,   dynax_state,       empty_init,    ROT0,   "bootleg",                   "Mahjong Ougon no Hai (Japan bootleg set 3, medal)",             MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
 GAME( 1994, mjreach,    0,        mjreach,    mjreach,  dynax_state,       empty_init,    ROT0,   "Dynax",                     "Mahjong Reach (Ver. 1.00)",                                     MACHINE_SUPPORTS_SAVE )
-GAME( 1994, mjreachbl,  mjreach,  mjreach,    mjreach,  dynax_state,       empty_init,    ROT0,   "bootleg",                   "Mahjong Reach (Ver 1.00, bootleg)",                             MACHINE_SUPPORTS_SAVE )
+GAME( 1994, mjreachbl,  mjreach,  mjreach,    mjreach,  dynax_state,       empty_init,    ROT0,   "bootleg",                   "Mahjong Reach (Ver. 1.00, bootleg)",                            MACHINE_SUPPORTS_SAVE )
 GAME( 1994, mjreachp2,  mjreach,  mjreachp2,  mjreach,  dynax_state,       empty_init,    ROT0,   "Dynax",                     "Mahjong Reach Part II (Ver. D88)",                              MACHINE_SUPPORTS_SAVE )
 GAME( 1994, cdracula,   0,        cdracula,   cdracula, cdracula_state,    empty_init,    ROT0,   "Yun Sung (Escape license)", "Castle Of Dracula",                                             MACHINE_SUPPORTS_SAVE ) // not a Dynax board
 GAME( 1995, shpeng,     0,        sprtmtch,   drgpunch, dynax_state,       empty_init,    ROT0,   "WSAC Systems?",             "Sea Hunter Penguin",                                            MACHINE_NO_COCKTAIL | MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE ) // not a Dynax board. PROMs?
diff --git a/src/mame/irem/blackjack92.cpp b/src/mame/irem/blackjack92.cpp
index 3c1e102cb2c..8c40f50000c 100644
--- a/src/mame/irem/blackjack92.cpp
+++ b/src/mame/irem/blackjack92.cpp
@@ -142,11 +142,11 @@ void blackjack_state::main_io_map(address_map &map)
 	map(0x5000, 0x5000).portr("IN0"); // ??
 	map(0x8000, 0x8fff).ram().w(FUNC(blackjack_state::tileram_w)).share(m_tileram);
 	map(0x9000, 0x9fff).ram().w(FUNC(blackjack_state::colorram_w)).share(m_colorram);
-	map(0xa000, 0xafff).ram(); // again writes at the same locations of the former two
+	map(0xa000, 0xafff).ram(); // again writes at the same offsets of the former two
 	map(0xb000, 0xbfff).ram();
 	map(0xc000, 0xcfff).ram(); // writes here
 	map(0xd000, 0xdfff).ram();
-	map(0xe000, 0xefff).ram(); // writes at the same locations of 0xc000-0xcfff
+	map(0xe000, 0xefff).ram(); // writes at the same offsets of 0xc000-0xcfff
 	map(0xf000, 0xffff).ram();
 }
 
diff --git a/src/mame/mame.lst b/src/mame/mame.lst
index 8fc2261c86d..8078d731f8b 100644
--- a/src/mame/mame.lst
+++ b/src/mame/mame.lst
@@ -34128,6 +34128,9 @@ sectrzont                       // (c) 1984 + Alice (on Tecfri PCB)
 seicross                        // (c) 1984 + Alice
 seicrossa                       // (c) 1984 + Alice
 
+@source:nichibutsu/shettle.cpp
+shettle                         // (c) 1984
+
 @source:nichibutsu/terracre.cpp
 amatelas                        // (c) 1986
 amazon                          // (c) 1986
@@ -34148,7 +34151,6 @@ tubepb                          // (c) 1984 + bootleg
 
 @source:nichibutsu/wiping.cpp
 rugrats                         // (c) 1983
-shettle                         // (c) 1984
 wiping                          // (c) 1982
 
 @source:nintendo/aleck64.cpp
diff --git a/src/mame/nichibutsu/shettle.cpp b/src/mame/nichibutsu/shettle.cpp
new file mode 100644
index 00000000000..cd269c2805b
--- /dev/null
+++ b/src/mame/nichibutsu/shettle.cpp
@@ -0,0 +1,493 @@
+// license:BSD-3-Clause
+// copyright-holders:
+
+/*
+Alone Shettle Crew
+1994
+Copyright New Digimatic but almost surely developed in Japan.
+
+2-PCB stack
+main PCB is marked: "PC-082A" on component side
+sub PCB is marked: "MADE IN JAPAN", "SCO-102B(C)1983 GRC" on component side
+main PCB is labelled: "NEW DIGIMATIC GARANZIA 6 MESI DATA OTTOBRE 1984" on component side
+
+Hardware has similarities with that of various Nichibutsu games of the same era.
+
+TODO:
+- what is the 24-pin chip marked Z4? Same is present on Clash Road. Maybe some kind of protection?;
+- input reading isn't probably totally correct (see weird lives DIPs);
+- colors are completely wrong according to available pictures;
+- cocktail mode sprite positioning is wrong.
+*/
+
+
+#include "emu.h"
+
+#include "wiping_a.h"
+
+#include "cpu/z80/z80.h"
+#include "machine/74259.h"
+#include "video/resnet.h"
+
+#include "emupal.h"
+#include "screen.h"
+#include "speaker.h"
+
+
+namespace {
+
+class shettle_state : public driver_device
+{
+public:
+	shettle_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_gfxdecode(*this, "gfxdecode"),
+		m_palette(*this, "palette"),
+		m_videoram(*this, "videoram"),
+		m_colorram(*this, "colorram"),
+		m_spriteram(*this, "spriteram"),
+		m_io_port(*this, { "IN0", "IN1", "DSW1", "DSW2" })
+	{ }
+
+	void shettle(machine_config &config);
+
+protected:
+	virtual void machine_start() override;
+
+private:
+	required_device<cpu_device> m_maincpu;
+	required_device<cpu_device> m_audiocpu;
+	required_device<gfxdecode_device> m_gfxdecode;
+	required_device<palette_device> m_palette;
+
+	required_shared_ptr<uint8_t> m_videoram;
+	required_shared_ptr<uint8_t> m_colorram;
+	required_shared_ptr<uint8_t> m_spriteram;
+
+	required_ioport_array<4> m_io_port;
+
+	uint8_t m_main_irq_mask = 0;
+	uint8_t m_sound_irq_mask = 0;
+
+	uint8_t ports_r(offs_t offset);
+	void main_irq_mask_w(int state);
+	void sound_irq_mask_w(int state);
+
+	void palette(palette_device &palette) const;
+
+	uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+
+	INTERRUPT_GEN_MEMBER(vblank_irq);
+	INTERRUPT_GEN_MEMBER(sound_timer_irq);
+
+	void main_map(address_map &map);
+	void sound_map(address_map &map);
+};
+
+
+/***************************************************************************
+
+  Convert the color PROMs into a more useable format.
+
+***************************************************************************/
+
+void shettle_state::palette(palette_device &palette) const // TODO: wrong, colors don't match available reference pics
+{
+	const uint8_t *color_prom = memregion("proms")->base();
+	static constexpr int resistances_rg[3] = { 1000, 470, 220 };
+	static constexpr int resistances_b [2] = { 470, 220 };
+
+	// compute the color output resistor weights
+	double rweights[3], gweights[3], bweights[2];
+	compute_resistor_weights(0, 255, -1.0,
+			3, &resistances_rg[0], rweights, 470, 0,
+			3, &resistances_rg[0], gweights, 470, 0,
+			2, &resistances_b[0],  bweights, 470, 0);
+
+	// create a lookup table for the palette
+	for (int i = 0; i < 0x20; i++)
+	{
+		int bit0, bit1, bit2;
+
+		// red component
+		bit0 = BIT(color_prom[i], 0);
+		bit1 = BIT(color_prom[i], 1);
+		bit2 = BIT(color_prom[i], 2);
+		int const r = combine_weights(rweights, bit0, bit1, bit2);
+
+		// green component
+		bit0 = BIT(color_prom[i], 3);
+		bit1 = BIT(color_prom[i], 4);
+		bit2 = BIT(color_prom[i], 5);
+		int const g = combine_weights(gweights, bit0, bit1, bit2);
+
+		// blue component
+		bit0 = BIT(color_prom[i], 6);
+		bit1 = BIT(color_prom[i], 7);
+		int const b = combine_weights(bweights, bit0, bit1);
+
+		palette.set_indirect_color(i, rgb_t(r, g, b));
+	}
+
+	// color_prom now points to the beginning of the lookup table
+	color_prom += 0x20;
+
+	// chars and sprites use colors 0-15
+	for (int i = 0; i < 0x200; i++)
+	{
+		uint8_t const ctabentry = color_prom[i ^ 0x03] & 0x0f;
+		palette.set_pen_indirect(i, ctabentry);
+	}
+}
+
+uint32_t shettle_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
+{
+	for (int offs = 0x3ff; offs > 0; offs--)
+	{
+		int sx, sy;
+
+		int const mx = offs % 32;
+		int const my = offs / 32;
+
+		if (my < 2)
+		{
+			sx = my + 34;
+			sy = mx - 2;
+		}
+		else if (my >= 30)
+		{
+			sx = my - 30;
+			sy = mx - 2;
+		}
+		else
+		{
+			sx = mx + 2;
+			sy = my - 2;
+		}
+
+		if (flip_screen())
+		{
+			sx = 35 - sx;
+			sy = 27 - sy;
+		}
+
+		m_gfxdecode->gfx(0)->opaque(bitmap, cliprect,
+				m_videoram[offs],
+				m_colorram[offs] & 0x3f,
+				flip_screen(), flip_screen(),
+				sx * 8, sy * 8);
+	}
+
+	// Note, we're counting up on purpose
+
+	for (int offs = m_spriteram.bytes() - 8; offs >= 0; offs -= 8)
+	{
+		int x = m_spriteram[offs + 3] + 0x0b;
+		int y = 224 - m_spriteram[offs + 2];
+
+		int code = (m_spriteram[offs + 0] & 0x3f) | (m_spriteram[offs + 4] << 6);
+
+		int color = m_spriteram[offs + 1] & 0x0f; // TODO: check this
+
+		int flipx = m_spriteram[offs + 0] & 0x80;
+		int flipy = m_spriteram[offs + 0] & 0x40;
+
+		if (flip_screen())
+		{
+			x = 240 - x; // TODO: wrong
+			flipx = !flipx;
+			y = 224 - y;
+			flipy = !flipy;
+		}
+
+		m_gfxdecode->gfx(1)->transpen(bitmap, cliprect, code, color, flipx, flipy, x, y, 0);
+	}
+
+	// redraw high priority chars
+	for (int offs = 0x3ff; offs > 0; offs--)
+	{
+		if (m_colorram[offs] & 0x80)
+		{
+			int sx, sy;
+
+			int const mx = offs % 32;
+			int const my = offs / 32;
+
+			if (my < 2)
+			{
+				sx = my + 34;
+				sy = mx - 2;
+			}
+			else if (my >= 30)
+			{
+				sx = my - 30;
+				sy = mx - 2;
+			}
+			else
+			{
+				sx = mx + 2;
+				sy = my - 2;
+			}
+
+			if (flip_screen())
+			{
+				sx = 35 - sx;
+				sy = 27 - sy;
+			}
+
+			m_gfxdecode->gfx(0)->opaque(bitmap, cliprect,
+					m_videoram[offs],
+					m_colorram[offs] & 0x3f,
+					flip_screen(), flip_screen(),
+					sx * 8, sy * 8);
+			}
+	}
+
+	return 0;
+}
+
+
+void shettle_state::machine_start()
+{
+	save_item(NAME(m_main_irq_mask));
+	save_item(NAME(m_sound_irq_mask));
+}
+
+uint8_t shettle_state::ports_r(offs_t offset)
+{
+	int res = 0;
+
+	for (int i = 0; i < 4; i++)
+		res |= BIT(m_io_port[i]->read(), offset) << i;
+
+	return res | 0xf0;
+}
+
+// irq / reset controls like in clshroad.cpp
+
+void shettle_state::main_irq_mask_w(int state)
+{
+	m_main_irq_mask = state;
+}
+
+void shettle_state::sound_irq_mask_w(int state)
+{
+	m_sound_irq_mask = state;
+}
+
+INTERRUPT_GEN_MEMBER(shettle_state::vblank_irq)
+{
+	if (m_main_irq_mask)
+		device.execute().set_input_line(0, HOLD_LINE);
+}
+
+INTERRUPT_GEN_MEMBER(shettle_state::sound_timer_irq)
+{
+	if (m_sound_irq_mask)
+		device.execute().set_input_line(0, HOLD_LINE);
+}
+
+
+void shettle_state::main_map(address_map &map)
+{
+	map(0x0000, 0x7fff).rom(); // TODO: some reads after 0x5fff. Interactions with the Z4 chip?
+	map(0x8000, 0x83ff).ram().share(m_videoram);
+	map(0x8400, 0x87ff).ram().share(m_colorram);
+	map(0x8e00, 0x8fff).ram().share(m_spriteram);
+	map(0x9000, 0x93ff).ram();
+	map(0x9600, 0x97ff).ram().share("main_sound");
+	map(0xa000, 0xa007).w("mainlatch", FUNC(ls259_device::write_d0));
+	map(0xa100, 0xa107).r(FUNC(shettle_state::ports_r));
+}
+
+void shettle_state::sound_map(address_map &map)
+{
+	map(0x0000, 0x1fff).rom();
+	map(0x4000, 0x7fff).w("wiping", FUNC(wiping_sound_device::sound_w));
+	map(0x9600, 0x97ff).ram().share("main_sound");
+	map(0xa000, 0xa007).w("mainlatch", FUNC(ls259_device::write_d0));
+}
+
+
+static INPUT_PORTS_START( shettle )
+	PORT_START("IN0")
+	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP )
+	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN )
+	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT )
+	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT )
+	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_COCKTAIL
+	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_COCKTAIL
+	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_COCKTAIL
+	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_COCKTAIL
+
+	PORT_START("IN1")
+	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 )
+	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_COCKTAIL
+	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
+	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNKNOWN )
+	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_UNKNOWN )
+	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_START1 )
+	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START2 )
+	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_COIN1 )
+
+	PORT_START("DSW1")
+	PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW1:1")
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x01, DEF_STR( On ) )
+	PORT_DIPNAME( 0x02, 0x00, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW1:2")
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x02, DEF_STR( On ) )
+	PORT_DIPNAME( 0x04, 0x00, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW1:3")
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x04, DEF_STR( On ) )
+	PORT_DIPNAME( 0x08, 0x00, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW1:4")
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x08, DEF_STR( On ) )
+	PORT_DIPNAME( 0x10, 0x00, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW1:5")
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x10, DEF_STR( On ) )
+	PORT_DIPNAME( 0x20, 0x00, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW1:6")
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x20, DEF_STR( On ) )
+	PORT_DIPNAME( 0x40, 0x00, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW1:7")
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x40, DEF_STR( On ) )
+	PORT_DIPNAME( 0x80, 0x00, "Infinite Lives (Cheat)" )  PORT_DIPLOCATION("SW1:8")
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x80, DEF_STR( On ) )
+
+	PORT_START("DSW2")
+	PORT_DIPNAME( 0x05, 0x00, "0x01" ) PORT_DIPLOCATION("SW2:1,3")
+	PORT_DIPSETTING(    0x04, DEF_STR( 2C_1C ) )
+	PORT_DIPSETTING(    0x05, DEF_STR( 2C_2C ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( 1C_1C ) )
+	PORT_DIPSETTING(    0x01, DEF_STR( 1C_2C ) )
+	PORT_DIPNAME (0x02, 0x00, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW2:2")
+	PORT_DIPSETTING(    0x02, DEF_STR( Upright ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( Cocktail ) )
+	PORT_DIPNAME( 0x08, 0x00, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW2:4")
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x08, DEF_STR( On ) )
+	PORT_DIPNAME( 0x10, 0x00, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:5")
+	PORT_DIPSETTING(    0x00, "3" )
+	PORT_DIPSETTING(    0x10, "5" )
+	PORT_DIPNAME( 0x20, 0x00, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW2:6")
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x20, DEF_STR( On ) )
+	PORT_DIPNAME( 0x40, 0x00, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW2:7")
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x40, DEF_STR( On ) )
+	PORT_DIPNAME( 0x80, 0x00, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW2:8")
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x80, DEF_STR( On ) )
+INPUT_PORTS_END
+
+
+static const gfx_layout charlayout =
+{
+	8,8,    // 8*8 characters
+	256,    // 256 characters
+	2,  // 2 bits per pixel
+	{ 0, 4 },   // the two bitplanes are packed in one byte
+	{ 0, 1, 2, 3, 8+0, 8+1, 8+2, 8+3 },
+	{ 0*16, 1*16, 2*16, 3*16, 4*16, 5*16, 6*16, 7*16 },
+	16*8    // every char takes 16 consecutive bytes
+};
+
+static const gfx_layout spritelayout =
+{
+	16,16,  // 16*16 sprites
+	128,    // 128 sprites
+	2,  // 2 bits per pixel
+	{ 0, 4 },   // the two bitplanes are packed in one byte
+	{ 0, 1, 2, 3, 8+0, 8+1, 8+2, 8+3,
+			16*8+0, 16*8+1, 16*8+2, 16*8+3, 17*8+0, 17*8+1, 17*8+2, 17*8+3 },
+	{ 0*16, 1*16, 2*16, 3*16, 4*16, 5*16, 6*16, 7*16,
+			16*16, 17*16, 18*16, 19*16, 20*16, 21*16, 22*16, 23*16 },
+	64*8    // every sprite takes 64 consecutive bytes
+};
+
+static GFXDECODE_START( gfx_wiping )
+	GFXDECODE_ENTRY( "chars",   0, charlayout,      0, 64 )
+	GFXDECODE_ENTRY( "sprites", 0, spritelayout, 64*4, 64 )
+GFXDECODE_END
+
+
+void shettle_state::shettle(machine_config &config)
+{
+	// basic machine hardware
+	Z80(config, m_maincpu, 18.432_MHz_XTAL / 6); // 3.072 MHz
+	m_maincpu->set_addrmap(AS_PROGRAM, &shettle_state::main_map);
+	m_maincpu->set_vblank_int("screen", FUNC(shettle_state::vblank_irq));
+
+	Z80(config, m_audiocpu, 18.432_MHz_XTAL / 6); // 3.072 MHz
+	m_audiocpu->set_addrmap(AS_PROGRAM, &shettle_state::sound_map);
+	m_audiocpu->set_periodic_int(FUNC(shettle_state::sound_timer_irq), attotime::from_hz(120));    // periodic interrupt, don't know about the frequency
+
+	config.set_maximum_quantum(attotime::from_hz(18.432_MHz_XTAL / 6 / 512)); // 6000 Hz
+
+	ls259_device &mainlatch(LS259(config, "mainlatch")); // 5A
+	mainlatch.q_out_cb<0>().set_inputline(m_audiocpu, INPUT_LINE_RESET).invert();
+	mainlatch.q_out_cb<1>().set(FUNC(shettle_state::main_irq_mask_w));
+	mainlatch.q_out_cb<3>().set(FUNC(shettle_state::sound_irq_mask_w));
+	mainlatch.q_out_cb<4>().set(FUNC(shettle_state::flip_screen_set));
+
+	// video hardware
+	screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
+	screen.set_raw(18.432_MHz_XTAL / 3, 384, 0, 288, 264, 0, 224); // unknown, single XTAL on PCB & 288x224 suggests 60.606060 Hz like Galaxian HW
+	screen.set_screen_update(FUNC(shettle_state::screen_update));
+	screen.set_palette(m_palette);
+
+	GFXDECODE(config, m_gfxdecode, m_palette, gfx_wiping);
+	PALETTE(config, m_palette, FUNC(shettle_state::palette), 64 * 4 + 64 * 4, 32);
+
+	// sound hardware
+	SPEAKER(config, "mono").front_center();
+
+	WIPING_CUSTOM(config, "wiping", 96'000 / 2).add_route(ALL_OUTPUTS, "mono", 1.0); // 48000 Hz?
+}
+
+
+/***************************************************************************
+
+  Game driver(s)
+
+***************************************************************************/
+
+ROM_START( shettle )
+	ROM_REGION( 0x8000, "maincpu", 0 )
+	ROM_LOAD( "1.bin", 0x00000, 0x2000, CRC(e2b25df4) SHA1(781e09ca2ef03ded468b768261074f6e4a25720b) )
+	ROM_LOAD( "2.bin", 0x02000, 0x2000, CRC(a24bf4ad) SHA1(fbe00dfb6ce2306c59e459440f403c3c5f49bdd3) )
+	ROM_LOAD( "3.bin", 0x04000, 0x2000, CRC(b88e8213) SHA1(e3745ad1c25eaf8019dd9d46e3480f2ca8c5a7cf) )
+	ROM_FILL(          0x06000, 0x2000, 0x00 ) // Accessed, could this range map to the Z4 device ?!
+
+	ROM_REGION( 0x10000, "audiocpu", 0 )
+	ROM_LOAD( "d.bin", 0x0000, 0x2000, CRC(1e2e7365) SHA1(ad6d0c94d5cb172d3a29523706ccd901a72e90be) )
+
+	ROM_REGION( 0x1000, "chars", 0 )
+	ROM_LOAD( "0.5d", 0x0000, 0x1000, CRC(fa6261da) SHA1(e7ab7eb2ab2ba2497d06606861a804d317d306ff) )
+
+	ROM_REGION( 0x2000, "sprites", 0 )
+	ROM_LOAD( "e.bin", 0x0000, 0x2000, CRC(a3cef381) SHA1(ed511f5b695f0abdbaea8414d9de260f696f5318) )
+
+	ROM_REGION( 0x0340, "proms", 0 )
+	ROM_LOAD( "prom-4.2f",  0x0000, 0x0020, CRC(befab139) SHA1(748c49437067d2d0a99b359bb5d53841a22b4760) ) // MMI 6331 - palette. Only 16 colors?
+	ROM_LOAD( "prom-6.4h",  0x0020, 0x0100, CRC(1abbc864) SHA1(a28d35cb2492f74f847858475aef669c38c3574a) ) // char lookup table? (near 0.5d ROM)
+	ROM_LOAD( "prom-5.3r",  0x0120, 0x0100, CRC(0f64edb9) SHA1(e1bc4acc0778ca13a3a2b8caa653bbf54a3507f9) ) // sprite lookup table? (next to e.4r ROM)
+	ROM_LOAD( "prom-7.7b",  0x0220, 0x0100, CRC(9e824f74) SHA1(03fcde2546b87286038ef93a6939c1c325f74998) ) // unknown (almost identical to clshroad.g10 in clshroad.cpp)
+	ROM_LOAD( "prom-1.bin", 0x0320, 0x0020, CRC(1afc04f0) SHA1(38207cf3e15bac7034ac06469b95708d22b57da4) ) // MMI 6331 - timing? (same as clashrd.g4 in clshroad.cpp)
+
+	ROM_REGION( 0x2000, "wiping:samples", 0 )
+	ROM_LOAD( "4.bin", 0x0000, 0x2000, CRC(c9da4245) SHA1(961c3b52b7608a35493d753a3b482713198fd2eb) )
+
+	ROM_REGION( 0x0200, "wiping:soundproms", 0 ) // 4bit->8bit sample expansion PROMs
+	ROM_LOAD( "prom-2.bin", 0x0000, 0x0100, CRC(bd2c080b) SHA1(9782bb5001e96db56bc29df398187f700bce4f8e) ) // low 4 bits, same as wiping, clshroad, firebatl
+	ROM_LOAD( "prom-3.bin", 0x0100, 0x0100, CRC(4017a2a6) SHA1(dadef2de7a1119758c8e6d397aa42815b0218889) ) // high 4 bits, same as wiping, clshroad, firebatl
+ROM_END
+
+} // anonymous namespace
+
+
+GAME( 1984, shettle, 0,      shettle, shettle, shettle_state, empty_init, ROT90, "New Digimatic", "Alone Shettle Crew", MACHINE_NOT_WORKING | MACHINE_WRONG_COLORS | MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/nichibutsu/wiping.cpp b/src/mame/nichibutsu/wiping.cpp
index ac9e6435374..435b6d388a9 100644
--- a/src/mame/nichibutsu/wiping.cpp
+++ b/src/mame/nichibutsu/wiping.cpp
@@ -77,6 +77,7 @@ public:
 protected:
 	virtual void machine_start() override;
 
+private:
 	required_device<cpu_device> m_maincpu;
 	required_device<cpu_device> m_audiocpu;
 	required_device<gfxdecode_device> m_gfxdecode;
@@ -86,7 +87,7 @@ protected:
 	required_shared_ptr<uint8_t> m_colorram;
 	required_shared_ptr<uint8_t> m_spriteram;
 
-	optional_ioport_array<8> m_io_port;
+	required_ioport_array<8> m_io_port;
 
 	uint8_t m_flipscreen = 0;
 	uint8_t m_main_irq_mask = 0;
@@ -108,17 +109,6 @@ protected:
 	void sound_map(address_map &map);
 };
 
-class shettle_state : public wiping_state
-{
-public:
-	using wiping_state::wiping_state;
-
-	void shettle(machine_config &config);
-
-private:
-	void main_map(address_map &map);
-	void sound_map(address_map &map);
-};
 
 /***************************************************************************
 
@@ -353,33 +343,6 @@ void wiping_state::sound_map(address_map &map)
 	map(0xa000, 0xa007).w("mainlatch", FUNC(ls259_device::write_d0));
 }
 
-void shettle_state::main_map(address_map &map)
-{
-	map(0x0000, 0x7fff).rom(); // TODO: some reads after 0x5fff. Interactions with the Z4 chip?
-	map(0x8000, 0x83ff).ram().share(m_videoram);
-	map(0x8400, 0x87ff).ram().share(m_colorram);
-	map(0x8e00, 0x8fff).ram().share(m_spriteram); // TODO: is it really here?
-	map(0x9000, 0x93ff).ram();
-	map(0x9600, 0x97ff).ram().share("main_sound");
-	map(0xa000, 0xa007).w("mainlatch", FUNC(ls259_device::write_d0));
-	map(0xa100, 0xa100).portr("IN0"); // TODO: inputs seem to be read in some convoluted way, but apparently not exactly the same as Wiping
-	map(0xa101, 0xa101).portr("IN1");
-	map(0xa102, 0xa102).portr("IN2");
-	map(0xa103, 0xa103).portr("IN3");
-	map(0xa104, 0xa104).portr("IN4");
-	map(0xa105, 0xa105).portr("IN5");
-	map(0xa106, 0xa106).portr("IN6");
-	map(0xa107, 0xa107).portr("IN7");
-}
-
-void shettle_state::sound_map(address_map &map)
-{
-	map(0x0000, 0x1fff).rom();
-	map(0x4000, 0x7fff).w("wiping", FUNC(wiping_sound_device::sound_w));
-	map(0x9600, 0x97ff).ram().share("main_sound");
-	map(0xa000, 0xa007).w("mainlatch", FUNC(ls259_device::write_d0));
-}
-
 
 static INPUT_PORTS_START( wiping )
 	PORT_START("P1")    // 0
@@ -459,52 +422,6 @@ static INPUT_PORTS_START( rugrats )
 	PORT_DIPSETTING(    0x80, "150000 300000" )
 INPUT_PORTS_END
 
-static INPUT_PORTS_START( shettle ) // TODO: will have to be redone once the correct way to read the inputs is found
-	PORT_START("IN0")
-	PORT_DIPUNKNOWN_DIPLOC( 0x01, 0x01, "SW1:1" )
-	PORT_DIPUNKNOWN_DIPLOC( 0x02, 0x02, "SW1:2" )
-	PORT_DIPUNKNOWN_DIPLOC( 0x04, 0x04, "SW1:3" )
-	PORT_DIPUNKNOWN_DIPLOC( 0x08, 0x08, "SW1:4" ) // TODO: 0x00 1C_1C, 0x01 1C_2C
-	PORT_DIPUNKNOWN_DIPLOC( 0x10, 0x10, "SW1:5" )
-	PORT_DIPUNKNOWN_DIPLOC( 0x20, 0x20, "SW1:6" )
-	PORT_DIPUNKNOWN_DIPLOC( 0x40, 0x40, "SW1:7" )
-	PORT_DIPUNKNOWN_DIPLOC( 0x80, 0x80, "SW1:8" )
-
-	PORT_START("IN1")
-	PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNKNOWN )
-
-	PORT_START("IN2")
-	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) // TODO: player 1 movement related, verify when sprites are drawn
-	PORT_BIT( 0xfe, IP_ACTIVE_HIGH, IPT_UNKNOWN )
-
-	PORT_START("IN3")
-	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) // TODO: player 1 movement related, verify when sprites are drawn
-	PORT_BIT( 0xfe, IP_ACTIVE_HIGH, IPT_UNKNOWN )
-
-	PORT_START("IN4")
-	PORT_DIPUNKNOWN_DIPLOC( 0x01, 0x01, "SW2:1" )
-	PORT_DIPUNKNOWN_DIPLOC( 0x02, 0x02, "SW2:2" )
-	PORT_DIPUNKNOWN_DIPLOC( 0x04, 0x04, "SW2:3" )
-	PORT_DIPUNKNOWN_DIPLOC( 0x08, 0x08, "SW2:4" ) // TODO: 0x00 3 lives, 0x01 5 lives
-	PORT_DIPUNKNOWN_DIPLOC( 0x10, 0x10, "SW2:5" )
-	PORT_DIPUNKNOWN_DIPLOC( 0x20, 0x20, "SW2:6" )
-	PORT_DIPUNKNOWN_DIPLOC( 0x40, 0x40, "SW2:7" )
-	PORT_DIPUNKNOWN_DIPLOC( 0x80, 0x80, "SW2:8" )
-
-	PORT_START("IN5")
-	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START1 )
-	PORT_BIT( 0xfd, IP_ACTIVE_HIGH, IPT_UNKNOWN )
-
-	PORT_START("IN6")
-	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_COCKTAIL // TODO: player 2 movement related, verify when sprites are drawn
-	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 )
-	PORT_BIT( 0xfc, IP_ACTIVE_HIGH, IPT_UNKNOWN )
-
-	PORT_START("IN7")
-	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_COCKTAIL // TODO: player 2 movement related, verify when sprites are drawn
-	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN1 )
-	PORT_BIT( 0xfc, IP_ACTIVE_HIGH, IPT_UNKNOWN )
-INPUT_PORTS_END
 
 
 static const gfx_layout charlayout =
@@ -588,20 +505,7 @@ void wiping_state::wiping(machine_config &config)
 	WIPING_CUSTOM(config, "wiping", 96'000 / 2).add_route(ALL_OUTPUTS, "mono", 1.0); // 48000 Hz?
 }
 
-void shettle_state::shettle(machine_config &config)
-{
-	wiping(config);
 
-	m_maincpu->set_addrmap(AS_PROGRAM, &shettle_state::main_map);
-
-	m_audiocpu->set_addrmap(AS_PROGRAM, &shettle_state::sound_map);
-
-	ls259_device &mainlatch(LS259(config.replace(), "mainlatch")); // TODO: verify this
-	mainlatch.q_out_cb<0>().set_inputline(m_audiocpu, INPUT_LINE_RESET).invert();
-	mainlatch.q_out_cb<1>().set(FUNC(shettle_state::main_irq_mask_w));
-	mainlatch.q_out_cb<3>().set(FUNC(shettle_state::sound_irq_mask_w));
-	mainlatch.q_out_cb<4>().set(FUNC(shettle_state::flipscreen_w));
-}
 
 /***************************************************************************
 
@@ -667,46 +571,8 @@ ROM_START( rugrats )
 	ROM_LOAD( "e9.9e",     0x0100, 0x0100, CRC(4017a2a6) SHA1(dadef2de7a1119758c8e6d397aa42815b0218889) )    // high 4 bits
 ROM_END
 
-// main PCB is marked: "PC-082A" on component side
-// sub PCB is marked: "MADE IN JAPAN", "SCO-102B(C)1983 GRC" on component side
-// main PCB is labeled: "NEW DIGIMATIC GARANZIA 6 MESI DATA OTTOBRE 1984" on component side
-// 2x D780C, 18.432 MHz XTAL, 2x 8 DIP switches banks
-// hardware seems to have similarities both with Wiping (video hardware) and the later Clash-Road / Fire Battle (inputs, sound hook-up)
-// has an unidentified "Z4" 24-pin chip, just like Fire Battle
-ROM_START( shettle )
-	ROM_REGION( 0x8000, "maincpu", 0 )
-	ROM_LOAD( "1.bin", 0x00000, 0x2000, CRC(e2b25df4) SHA1(781e09ca2ef03ded468b768261074f6e4a25720b) )
-	ROM_LOAD( "2.bin", 0x02000, 0x2000, CRC(a24bf4ad) SHA1(fbe00dfb6ce2306c59e459440f403c3c5f49bdd3) )
-	ROM_LOAD( "3.bin", 0x04000, 0x2000, CRC(b88e8213) SHA1(e3745ad1c25eaf8019dd9d46e3480f2ca8c5a7cf) )
-	ROM_FILL(          0x06000, 0x2000, 0x00 ) // Accessed, could this range map to the Z4 device ?!
-
-	ROM_REGION( 0x10000, "audiocpu", 0 )
-	ROM_LOAD( "d.bin", 0x0000, 0x2000, CRC(1e2e7365) SHA1(ad6d0c94d5cb172d3a29523706ccd901a72e90be) )
-
-	ROM_REGION( 0x1000, "chars", 0 )
-	ROM_LOAD( "0.5d", 0x0000, 0x1000, CRC(fa6261da) SHA1(e7ab7eb2ab2ba2497d06606861a804d317d306ff) )
-
-	ROM_REGION( 0x2000, "sprites", 0 )
-	ROM_LOAD( "e.bin", 0x0000, 0x2000, CRC(a3cef381) SHA1(ed511f5b695f0abdbaea8414d9de260f696f5318) )
-
-	ROM_REGION( 0x0340, "proms", 0 )
-	ROM_LOAD( "prom-4.2f",  0x0000, 0x0020, CRC(befab139) SHA1(748c49437067d2d0a99b359bb5d53841a22b4760) ) // MMI 6331 - palette. Only 16 colors?
-	ROM_LOAD( "prom-6.4h",  0x0020, 0x0100, CRC(1abbc864) SHA1(a28d35cb2492f74f847858475aef669c38c3574a) ) // char lookup table? (near 0.5d ROM)
-	ROM_LOAD( "prom-5.3r",  0x0120, 0x0100, CRC(0f64edb9) SHA1(e1bc4acc0778ca13a3a2b8caa653bbf54a3507f9) ) // sprite lookup table? (next to e.4r ROM)
-	ROM_LOAD( "prom-7.7b",  0x0220, 0x0100, CRC(9e824f74) SHA1(03fcde2546b87286038ef93a6939c1c325f74998) ) // unknown (almost identical to clshroad.g10 in clshroad.cpp)
-	ROM_LOAD( "prom-1.bin", 0x0320, 0x0020, CRC(1afc04f0) SHA1(38207cf3e15bac7034ac06469b95708d22b57da4) ) // MMI 6331 - timing? (same as clashrd.g4 in clshroad.cpp)
-
-	ROM_REGION( 0x2000, "wiping:samples", 0 )
-	ROM_LOAD( "4.bin", 0x0000, 0x2000, CRC(c9da4245) SHA1(961c3b52b7608a35493d753a3b482713198fd2eb) )
-
-	ROM_REGION( 0x0200, "wiping:soundproms", 0 ) // 4bit->8bit sample expansion PROMs
-	ROM_LOAD( "prom-2.bin", 0x0000, 0x0100, CRC(bd2c080b) SHA1(9782bb5001e96db56bc29df398187f700bce4f8e) ) // low 4 bits, same as wiping, clshroad, firebatl
-	ROM_LOAD( "prom-3.bin", 0x0100, 0x0100, CRC(4017a2a6) SHA1(dadef2de7a1119758c8e6d397aa42815b0218889) ) // high 4 bits, same as wiping, clshroad, firebatl
-ROM_END
-
 } // anonymous namespace
 
 
-GAME( 1982, wiping,  0,      wiping,  wiping,  wiping_state,  empty_init, ROT90, "Nichibutsu",    "Wiping",             MACHINE_SUPPORTS_SAVE )
-GAME( 1983, rugrats, wiping, wiping,  rugrats, wiping_state,  empty_init, ROT90, "Nichibutsu",    "Rug Rats",           MACHINE_SUPPORTS_SAVE )
-GAME( 1984, shettle, 0,      shettle, shettle, shettle_state, empty_init, ROT90, "New Digimatic", "Alone Shettle Crew", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE )
+GAME( 1982, wiping,  0,      wiping, wiping,  wiping_state, empty_init, ROT90, "Nichibutsu", "Wiping",   MACHINE_SUPPORTS_SAVE )
+GAME( 1983, rugrats, wiping, wiping, rugrats, wiping_state, empty_init, ROT90, "Nichibutsu", "Rug Rats", MACHINE_SUPPORTS_SAVE )