Set splitting and moving some roms to another driver because they were misplaced involving mpu5.c and pluto5.c. As a result of the previous cleanups there were still some redundant structure left around which can be reduced in esd16.c - From Haze (nw)

2025-05-22 21:58:57 +03:00 · 2012-07-29 00:58:36 +00:00 · 2012-07-29 00:58:36 +00:00 · 17c681f42b
commit 17c681f42b
parent 6780d718ca
5 changed files with 571 additions and 376 deletions
--- a/src/mame/drivers/esd16.c
+++ b/src/mame/drivers/esd16.c
@ -81,7 +81,6 @@ ToDo:

 ***************************************************************************/

-
 WRITE16_MEMBER(esd16_state::esd16_sound_command_w)
 {
 	if (ACCESSING_BITS_0_7)
@ -92,58 +91,6 @@ WRITE16_MEMBER(esd16_state::esd16_sound_command_w)
 	}
 }

-/*
- Lines starting with an empty comment in the following MemoryReadAddress
- arrays are there for debug (e.g. the game does not read from those ranges
- AFAIK)
-*/
-
-static ADDRESS_MAP_START( multchmp_map, AS_PROGRAM, 16, esd16_state )
-	AM_RANGE(0x000000, 0x07ffff) AM_ROM									// ROM
-	AM_RANGE(0x100000, 0x10ffff) AM_RAM									// RAM
-	AM_RANGE(0x200000, 0x2005ff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")	// Palette
-/**/AM_RANGE(0x300000, 0x3007ff) AM_RAM AM_SHARE("spriteram") AM_MIRROR(0x000800)				// Sprites (Mirrored)
-/**/AM_RANGE(0x400000, 0x403fff) AM_RAM_WRITE(esd16_vram_0_w) AM_SHARE("vram_0")				// Layers
-/**/AM_RANGE(0x420000, 0x423fff) AM_RAM_WRITE(esd16_vram_1_w) AM_SHARE("vram_1")				//
-/**/AM_RANGE(0x500000, 0x500003) AM_RAM AM_SHARE("scroll_0")							// Scroll
-/**/AM_RANGE(0x500004, 0x500007) AM_RAM AM_SHARE("scroll_1")							//
-	AM_RANGE(0x500008, 0x500009) AM_WRITEONLY AM_SHARE("platform_x")
-	AM_RANGE(0x50000a, 0x50000b) AM_WRITEONLY AM_SHARE("platform_y")
-	AM_RANGE(0x50000c, 0x50000d) AM_WRITENOP								// ??
-	AM_RANGE(0x50000e, 0x50000f) AM_WRITEONLY AM_SHARE("head_layersize")					// ??
-	AM_RANGE(0x600002, 0x600003) AM_READ_PORT("P1_P2")
-	AM_RANGE(0x600004, 0x600005) AM_READ_PORT("SYSTEM")
-	AM_RANGE(0x600006, 0x600007) AM_READ_PORT("DSW")
-	AM_RANGE(0x600008, 0x600009) AM_WRITE(esd16_tilemap0_color_w)						// Flip Screen + Tilemap0 palette banking
-	AM_RANGE(0x60000a, 0x60000b) AM_WRITENOP								// ? 2
-	AM_RANGE(0x60000c, 0x60000d) AM_WRITE(esd16_sound_command_w)						// To Sound CPU
-	AM_RANGE(0x700008, 0x70000b) AM_READNOP									// ? Only read once
-ADDRESS_MAP_END
-
-
-static ADDRESS_MAP_START( jumppop_map, AS_PROGRAM, 16, esd16_state )
-	AM_RANGE(0x000000, 0x07ffff) AM_ROM
-	AM_RANGE(0x120000, 0x123fff) AM_RAM
-	AM_RANGE(0x140000, 0x1407ff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
-/**/AM_RANGE(0x160000, 0x1607ff) AM_RAM AM_SHARE("spriteram") AM_MIRROR(0x000800)							// Sprites
-	AM_RANGE(0x180000, 0x180001) AM_NOP									// IRQ ack?
-	AM_RANGE(0x180002, 0x180003) AM_READ_PORT("P1_P2")
-	AM_RANGE(0x180004, 0x180005) AM_READ_PORT("SYSTEM")
-	AM_RANGE(0x180006, 0x180007) AM_READ_PORT("DSW")
-	AM_RANGE(0x180008, 0x180009) AM_WRITE(esd16_tilemap0_color_jumppop_w)					// Flip Screen + Tilemap0 palette banking
-	AM_RANGE(0x18000c, 0x18000d) AM_WRITE(esd16_sound_command_w)
-	AM_RANGE(0x1a0000, 0x1a7fff) AM_RAM
-/**/AM_RANGE(0x300000, 0x303fff) AM_RAM_WRITE(esd16_vram_0_w) AM_SHARE("vram_0")				// Layers
-/**/AM_RANGE(0x320000, 0x323fff) AM_RAM_WRITE(esd16_vram_1_w) AM_SHARE("vram_1")				//
-/**/AM_RANGE(0x380000, 0x380003) AM_RAM AM_SHARE("scroll_0")							// Scroll
-/**/AM_RANGE(0x380004, 0x380007) AM_RAM AM_SHARE("scroll_1")							//
-	AM_RANGE(0x380008, 0x380009) AM_WRITEONLY AM_SHARE("platform_x")
-	AM_RANGE(0x38000a, 0x38000b) AM_WRITEONLY AM_SHARE("platform_y")
-	AM_RANGE(0x38000c, 0x38000d) AM_WRITENOP								// ??
-	AM_RANGE(0x38000e, 0x38000f) AM_WRITEONLY AM_SHARE("head_layersize")					// ??
-ADDRESS_MAP_END
-
-
 WRITE16_MEMBER(esd16_state::hedpanic_platform_w)
 {
 	int offsets = m_headpanic_platform_x[0] + 0x40 * m_headpanic_platform_y[0];
@ -172,83 +119,114 @@ WRITE16_MEMBER(esd16_state::esd_eeprom_w)
 //  logerror("(0x%06x) Unk EEPROM write: %04x %04x\n", cpu_get_pc(&space.device()), data, mem_mask);
 }

+
+#define ESD16_IO_AREA_DSW( _BASE ) \
+	AM_RANGE(_BASE + 0x0, _BASE + 0x1) AM_WRITENOP /* Irq Ack */ \
+	AM_RANGE(_BASE + 0x2, _BASE + 0x3) AM_READ_PORT("P1_P2") \
+	AM_RANGE(_BASE + 0x4, _BASE + 0x5) AM_READ_PORT("SYSTEM") \
+	AM_RANGE(_BASE + 0x6, _BASE + 0x7) AM_READ_PORT("DSW") \
+	AM_RANGE(_BASE + 0x8, _BASE + 0x9) AM_WRITE(esd16_tilemap0_color_w) \
+	AM_RANGE(_BASE + 0xa, _BASE + 0xb) AM_WRITENOP /* Unknown */ \
+	AM_RANGE(_BASE + 0xc, _BASE + 0xd) AM_WRITE(esd16_sound_command_w) \
+	AM_RANGE(_BASE + 0xe, _BASE + 0xf) AM_WRITENOP /* n/c */ \
+
+#define ESD16_IO_AREA_EEPROM( _BASE ) \
+	AM_RANGE(_BASE + 0x0, _BASE + 0x1) AM_WRITENOP /* Irq Ack */ \
+	AM_RANGE(_BASE + 0x2, _BASE + 0x3) AM_READ_PORT("P1_P2") \
+	AM_RANGE(_BASE + 0x4, _BASE + 0x5) AM_READ_PORT("SYSTEM") \
+	AM_RANGE(_BASE + 0x6, _BASE + 0x7) AM_READ(esd_eeprom_r) \
+	AM_RANGE(_BASE + 0x8, _BASE + 0x9) AM_WRITE(esd16_tilemap0_color_w) \
+	AM_RANGE(_BASE + 0xa, _BASE + 0xb) AM_WRITENOP /* Unknown */ \
+	AM_RANGE(_BASE + 0xc, _BASE + 0xd) AM_WRITE(esd16_sound_command_w) \
+	AM_RANGE(_BASE + 0xe, _BASE + 0xf) AM_WRITE(esd_eeprom_w) \
+
+#define ESD16_VID_ATTR_AREA( _BASE ) \
+	AM_RANGE(_BASE + 0x0, _BASE + 0x3) AM_WRITEONLY AM_SHARE("scroll_0") \
+	AM_RANGE(_BASE + 0x4, _BASE + 0x7) AM_WRITEONLY AM_SHARE("scroll_1") \
+	AM_RANGE(_BASE + 0x8, _BASE + 0x9) AM_WRITEONLY AM_SHARE("platform_x") \
+	AM_RANGE(_BASE + 0xa, _BASE + 0xb) AM_WRITEONLY AM_SHARE("platform_y") \
+	AM_RANGE(_BASE + 0xc, _BASE + 0xd) AM_WRITENOP \
+	AM_RANGE(_BASE + 0xe, _BASE + 0xf) AM_WRITEONLY AM_SHARE("head_layersize") \
+
+#define ESD16_PALETTE_AREA( _BASE ) \
+	AM_RANGE(_BASE + 0x000, _BASE + 0xfff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram") \
+
+#define ESD16_SPRITE_AREA( _BASE ) \
+	AM_RANGE(_BASE + 0x000, _BASE + 0x7ff) AM_WRITEONLY AM_SHARE("spriteram") AM_MIRROR(0x000800) \
+
+#define ESD16_VRAM_AREA( _BASE ) \
+	AM_RANGE(_BASE + 0x00000, _BASE + 0x03fff) AM_WRITE(esd16_vram_0_w) AM_SHARE("vram_0") AM_MIRROR(0x4000) \
+	AM_RANGE(_BASE + 0x20000, _BASE + 0x23fff) AM_WRITE(esd16_vram_1_w) AM_SHARE("vram_1") AM_MIRROR(0x4000) \
+
+/*** Memory Maps ***/
+
+static ADDRESS_MAP_START( multchmp_map, AS_PROGRAM, 16, esd16_state )
+	AM_RANGE(0x000000, 0x07ffff) AM_ROM
+	AM_RANGE(0x100000, 0x10ffff) AM_RAM
+
+	ESD16_PALETTE_AREA(  0x200000 )
+	ESD16_SPRITE_AREA(   0x300000 )
+	ESD16_VRAM_AREA(     0x400000 )
+	ESD16_VID_ATTR_AREA( 0x500000 )
+	ESD16_IO_AREA_DSW(   0x600000 )
+
+	AM_RANGE(0x700008, 0x70000b) AM_READNOP	// unused protection?
+ADDRESS_MAP_END
+
+static ADDRESS_MAP_START( jumppop_map, AS_PROGRAM, 16, esd16_state )
+	AM_RANGE(0x000000, 0x07ffff) AM_ROM
+	AM_RANGE(0x120000, 0x123fff) AM_RAM
+	AM_RANGE(0x1a0000, 0x1a7fff) AM_RAM
+
+	AM_RANGE(0x180008, 0x180009) AM_WRITE(esd16_tilemap0_color_jumppop_w) // todo
+
+	ESD16_PALETTE_AREA(  0x140000 ) 
+	ESD16_SPRITE_AREA(   0x160000 )
+	ESD16_IO_AREA_DSW(   0x180000 )
+	ESD16_VRAM_AREA(     0x300000 )
+	ESD16_VID_ATTR_AREA( 0x380000 )
+ADDRESS_MAP_END
+
 static ADDRESS_MAP_START( hedpanic_map, AS_PROGRAM, 16, esd16_state )
-	AM_RANGE(0x000000, 0x07ffff) AM_ROM									// ROM
-	AM_RANGE(0x100000, 0x10ffff) AM_RAM									// RAM
-	AM_RANGE(0x800000, 0x800fff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")	// Palette
-	AM_RANGE(0x900000, 0x9007ff) AM_WRITEONLY AM_SHARE("spriteram")	AM_MIRROR(0x000800)					// Sprites
-	AM_RANGE(0xa00000, 0xa03fff) AM_WRITE(esd16_vram_0_w) AM_SHARE("vram_0")				// Layers
-	AM_RANGE(0xa20000, 0xa23fff) AM_WRITE(esd16_vram_1_w) AM_SHARE("vram_1")				//
-	AM_RANGE(0xa24000, 0xa27fff) AM_WRITE(esd16_vram_1_w) AM_SHARE("vram_1")				// mirror?
-	AM_RANGE(0xb00000, 0xb00003) AM_WRITEONLY AM_SHARE("scroll_0")						// Scroll
-	AM_RANGE(0xb00004, 0xb00007) AM_WRITEONLY AM_SHARE("scroll_1")						//
-	AM_RANGE(0xb00008, 0xb00009) AM_WRITEONLY AM_SHARE("platform_x")
-	AM_RANGE(0xb0000a, 0xb0000b) AM_WRITEONLY AM_SHARE("platform_y")
-	AM_RANGE(0xb0000c, 0xb0000d) AM_WRITENOP								// ??
-	AM_RANGE(0xb0000e, 0xb0000f) AM_WRITEONLY AM_SHARE("head_layersize")					// ??
-	AM_RANGE(0xc00000, 0xc00001) AM_WRITENOP								// IRQ Ack
-	AM_RANGE(0xc00002, 0xc00003) AM_READ_PORT("P1_P2")
-	AM_RANGE(0xc00004, 0xc00005) AM_READ_PORT("SYSTEM")
-	AM_RANGE(0xc00006, 0xc00007) AM_READ(esd_eeprom_r)
-	AM_RANGE(0xc00008, 0xc00009) AM_WRITE(esd16_tilemap0_color_w)						// Flip Screen + Tileamp0 palette banking
-	AM_RANGE(0xc0000a, 0xc0000b) AM_WRITENOP								// ? 2 not checked
-	AM_RANGE(0xc0000c, 0xc0000d) AM_WRITE(esd16_sound_command_w)						// To Sound CPU // ok
-	AM_RANGE(0xc0000e, 0xc0000f) AM_WRITE(esd_eeprom_w)
-	AM_RANGE(0xd00008, 0xd00009) AM_WRITE(hedpanic_platform_w)
+	AM_RANGE(0x000000, 0x07ffff) AM_ROM
+	AM_RANGE(0x100000, 0x10ffff) AM_RAM
+
+	ESD16_PALETTE_AREA(   0x800000 )
+	ESD16_SPRITE_AREA(    0x900000 )
+	ESD16_VRAM_AREA(      0xa00000 )
+	ESD16_VID_ATTR_AREA(  0xb00000 )
+	ESD16_IO_AREA_EEPROM( 0xc00000 )
+
+	AM_RANGE(0xd00008, 0xd00009) AM_WRITE(hedpanic_platform_w) // protection
 ADDRESS_MAP_END

 /* Multi Champ Deluxe, like Head Panic but different addresses */

 static ADDRESS_MAP_START( mchampdx_map, AS_PROGRAM, 16, esd16_state )
-	AM_RANGE(0x000000, 0x07ffff) AM_ROM									// ROM
-	AM_RANGE(0x200000, 0x20ffff) AM_RAM									// RAM
-	AM_RANGE(0x300000, 0x303fff) AM_WRITE(esd16_vram_0_w) AM_SHARE("vram_0")				// Layers
-	AM_RANGE(0x320000, 0x323fff) AM_WRITE(esd16_vram_1_w) AM_SHARE("vram_1")				//
-	AM_RANGE(0x324000, 0x327fff) AM_WRITE(esd16_vram_1_w) AM_SHARE("vram_1")				// mirror?
-	AM_RANGE(0x400000, 0x400fff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")	// Palette
-	AM_RANGE(0x500000, 0x500001) AM_WRITENOP								// IRQ Ack
-	AM_RANGE(0x500002, 0x500003) AM_READ_PORT("P1_P2")
-	AM_RANGE(0x500004, 0x500005) AM_READ_PORT("SYSTEM")
-	AM_RANGE(0x500006, 0x500007) AM_READ(esd_eeprom_r)
-	AM_RANGE(0x500008, 0x500009) AM_WRITE(esd16_tilemap0_color_w)						// Flip Screen + Tileamp0 palette banking
-	AM_RANGE(0x50000a, 0x50000b) AM_WRITENOP								// ? 2 not checked
-	AM_RANGE(0x50000c, 0x50000d) AM_WRITE(esd16_sound_command_w)						// To Sound CPU // ok
-	AM_RANGE(0x50000e, 0x50000f) AM_WRITE(esd_eeprom_w)
-	AM_RANGE(0x600000, 0x6007ff) AM_WRITEONLY AM_SHARE("spriteram") AM_MIRROR(0x000800)						// Sprites
-	AM_RANGE(0x700000, 0x700003) AM_WRITEONLY AM_SHARE("scroll_0")						// Scroll
-	AM_RANGE(0x700004, 0x700007) AM_WRITEONLY AM_SHARE("scroll_1")						//
-	AM_RANGE(0x700008, 0x700009) AM_WRITEONLY AM_SHARE("platform_x")					// not used in mchampdx?
-	AM_RANGE(0x70000a, 0x70000b) AM_WRITEONLY AM_SHARE("platform_y")					// not used in mchampdx?
-	AM_RANGE(0x70000c, 0x70000d) AM_WRITENOP								// ??
-	AM_RANGE(0x70000e, 0x70000f) AM_WRITEONLY AM_SHARE("head_layersize")					// ??
+	AM_RANGE(0x000000, 0x07ffff) AM_ROM
+	AM_RANGE(0x200000, 0x20ffff) AM_RAM
+
+	ESD16_VRAM_AREA(      0x300000 )
+	ESD16_PALETTE_AREA(   0x400000 )
+	ESD16_IO_AREA_EEPROM( 0x500000 )
+	ESD16_SPRITE_AREA(    0x600000 )
+	ESD16_VID_ATTR_AREA(  0x700000 )
+
 	AM_RANGE(0xd00008, 0xd00009) AM_WRITE(hedpanic_platform_w)						// not used in mchampdx?
 ADDRESS_MAP_END

 /* Tang Tang & Deluxe 5 - like the others but again with different addresses */

 static ADDRESS_MAP_START( tangtang_map, AS_PROGRAM, 16, esd16_state )
-	AM_RANGE(0x000000, 0x07ffff) AM_ROM									// ROM
-	AM_RANGE(0x100000, 0x100fff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")	// RAM
-	AM_RANGE(0x200000, 0x2007ff) AM_WRITEONLY AM_SHARE("spriteram")	AM_MIRROR(0x000800)					// Sprites
-	AM_RANGE(0x300000, 0x303fff) AM_WRITE(esd16_vram_0_w) AM_SHARE("vram_0")				// Layers
-	AM_RANGE(0x320000, 0x323fff) AM_WRITE(esd16_vram_1_w) AM_SHARE("vram_1")				//
-	AM_RANGE(0x324000, 0x327fff) AM_WRITE(esd16_vram_1_w) AM_SHARE("vram_1")				// mirror?
-	AM_RANGE(0x400000, 0x400003) AM_WRITEONLY AM_SHARE("scroll_0")						// Scroll
-	AM_RANGE(0x400004, 0x400007) AM_WRITEONLY AM_SHARE("scroll_1")						//
-	AM_RANGE(0x400008, 0x400009) AM_WRITEONLY AM_SHARE("platform_x")					// not used in mchampdx?
-	AM_RANGE(0x40000a, 0x40000b) AM_WRITEONLY AM_SHARE("platform_y")					// not used in mchampdx?
-	AM_RANGE(0x40000c, 0x40000d) AM_WRITENOP								// ??
-	AM_RANGE(0x40000e, 0x40000f) AM_WRITEONLY AM_SHARE("head_layersize")					// ??
-	AM_RANGE(0x500000, 0x500001) AM_WRITENOP								// IRQ Ack
-	AM_RANGE(0x500002, 0x500003) AM_READ_PORT("P1_P2")
-	AM_RANGE(0x500004, 0x500005) AM_READ_PORT("SYSTEM")
-	AM_RANGE(0x500006, 0x500007) AM_READ(esd_eeprom_r)
-	AM_RANGE(0x500008, 0x500009) AM_WRITE(esd16_tilemap0_color_w)   					// Flip Screen + Tileamp0 palette banking
-	AM_RANGE(0x50000a, 0x50000b) AM_WRITENOP								// ? 2 not checked
-	AM_RANGE(0x50000c, 0x50000d) AM_WRITE(esd16_sound_command_w)						// To Sound CPU // ok
-	AM_RANGE(0x50000e, 0x50000f) AM_WRITE(esd_eeprom_w)
+	AM_RANGE(0x000000, 0x07ffff) AM_ROM
+	AM_RANGE(0x700000, 0x70ffff) AM_RAM
+
+	ESD16_PALETTE_AREA(   0x100000 )
+	ESD16_SPRITE_AREA(    0x200000 )
+	ESD16_VRAM_AREA(      0x300000 )
+	ESD16_VID_ATTR_AREA(  0x400000 )
+	ESD16_IO_AREA_EEPROM( 0x500000 )
 	AM_RANGE(0x600008, 0x600009) AM_WRITE(hedpanic_platform_w)
-	AM_RANGE(0x700000, 0x70ffff) AM_RAM									// main ram
 ADDRESS_MAP_END


@ -374,7 +352,7 @@ static INPUT_PORTS_START( jumppop )
 INPUT_PORTS_END

 static INPUT_PORTS_START( multchmp )
-	PORT_START("P1_P2")	// $600002.w
+	PORT_START("P1_P2")
 	PORT_BIT(  0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
 	PORT_BIT(  0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
 	PORT_BIT(  0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
@ -393,7 +371,7 @@ static INPUT_PORTS_START( multchmp )
 	PORT_BIT(  0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )	// Resets the test mode
 	PORT_BIT(  0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )

-	PORT_START("SYSTEM")	// $600005.b
+	PORT_START("SYSTEM")
 	PORT_BIT(  0x0001, IP_ACTIVE_LOW, IPT_COIN1   )
 	PORT_BIT(  0x0002, IP_ACTIVE_LOW, IPT_COIN2   )
 	PORT_BIT(  0x0004, IP_ACTIVE_LOW, IPT_START1  )
@ -404,7 +382,7 @@ static INPUT_PORTS_START( multchmp )
 	PORT_BIT(  0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
 	PORT_BIT(  0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )

-	PORT_START("DSW")	// $600006.w
+	PORT_START("DSW")
 	PORT_SERVICE_DIPLOC(  0x0001, IP_ACTIVE_LOW, "SW1:1" )
 	PORT_DIPNAME( 0x0002, 0x0002, "Coinage Type" )			PORT_DIPLOCATION("SW1:2")
 	PORT_DIPSETTING(      0x0002, "1" )
@ -454,7 +432,7 @@ INPUT_PORTS_END


 static INPUT_PORTS_START( hedpanic )
-	PORT_START("P1_P2")	// $600002.w
+	PORT_START("P1_P2")
 	PORT_BIT(  0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
 	PORT_BIT(  0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
 	PORT_BIT(  0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
@ -473,7 +451,7 @@ static INPUT_PORTS_START( hedpanic )
 	PORT_BIT(  0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
 	PORT_BIT(  0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )

-	PORT_START("SYSTEM")	// $600005.b
+	PORT_START("SYSTEM")
 	PORT_BIT(  0x0001, IP_ACTIVE_LOW, IPT_COIN1   )
 	PORT_BIT(  0x0002, IP_ACTIVE_LOW, IPT_COIN2   )
 	PORT_BIT(  0x0004, IP_ACTIVE_LOW, IPT_START1  )
@ -491,7 +469,7 @@ INPUT_PORTS_END


 static INPUT_PORTS_START( swatpolc )
-	PORT_START("P1_P2")	// $600002.w
+	PORT_START("P1_P2")
 	PORT_BIT(  0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
 	PORT_BIT(  0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
 	PORT_BIT(  0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
@ -510,7 +488,7 @@ static INPUT_PORTS_START( swatpolc )
 	PORT_BIT(  0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
 	PORT_BIT(  0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )

-	PORT_START("SYSTEM")	// $600005.b
+	PORT_START("SYSTEM")
 	PORT_BIT(  0x0001, IP_ACTIVE_LOW, IPT_COIN1   )
 	PORT_BIT(  0x0002, IP_ACTIVE_LOW, IPT_COIN2   )
 	PORT_BIT(  0x0004, IP_ACTIVE_LOW, IPT_START1  )
@ -592,19 +570,6 @@ static GFXDECODE_START( esd16 )
 	GFXDECODE_ENTRY( "bgs", 0, hedpanic_layout_16x16x8,   0x000, 2 ) // [1] Layers
 GFXDECODE_END

-
-static GFXDECODE_START( hedpanic )
-	GFXDECODE_ENTRY( "spr", 0, hedpanic_sprite_16x16x5, 0x200, 8 ) // [0] Sprites
-	GFXDECODE_ENTRY( "bgs", 0, hedpanic_layout_8x8x8,   0x000, 4 ) // [1] Layers
-	GFXDECODE_ENTRY( "bgs", 0, hedpanic_layout_16x16x8, 0x000, 4 ) // [2] Layers
-GFXDECODE_END
-
-static GFXDECODE_START( tangtang )
-	GFXDECODE_ENTRY( "spr", 0, hedpanic_sprite_16x16x5, 0x200, 8 ) // [0] Sprites
-	GFXDECODE_ENTRY( "bgs", 0, hedpanic_layout_8x8x8,   0x000, 4 ) // [1] Layers
-	GFXDECODE_ENTRY( "bgs", 0, hedpanic_layout_16x16x8, 0x000, 4 ) // [2] Layers
-GFXDECODE_END
-
 static GFXDECODE_START( jumppop )
 	GFXDECODE_ENTRY( "spr", 0, jumppop_sprite_16x16x4,	0x000, 0x40 )	/* Sprites 16x16 */ // has 4bpp sprites, unlike the others
 	GFXDECODE_ENTRY( "bgs", 0, hedpanic_layout_8x8x8,	0x000, 4 )	/* Characters 8x8 */
@ -678,7 +643,7 @@ static MACHINE_CONFIG_START( esd16, esd16_state )
 	decospr_device::set_flipallx(*device, 1);

 	MCFG_GFXDECODE(esd16)
-	MCFG_PALETTE_LENGTH(768)
+	MCFG_PALETTE_LENGTH(0x1000/2)

 	MCFG_VIDEO_START(esd16)

@ -712,51 +677,7 @@ static MACHINE_CONFIG_DERIVED( jumppop, esd16 )
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
 MACHINE_CONFIG_END

-
-static MACHINE_CONFIG_DERIVED( hedpanic, esd16 )
-
-	/* basic machine hardware */
-
-	MCFG_CPU_MODIFY("maincpu")
-	MCFG_CPU_PROGRAM_MAP(hedpanic_map)
-
-	MCFG_EEPROM_93C46_ADD("eeprom")
-
-	MCFG_PALETTE_LENGTH(0x1000/2)
-
-	MCFG_GFXDECODE(hedpanic)
-	MCFG_SCREEN_MODIFY("screen")
-	MCFG_SCREEN_UPDATE_STATIC(hedpanic)
-
-	MCFG_DEVICE_MODIFY("spritegen")
-	decospr_device::set_offsets(*device, -0x18,-0x100);
-MACHINE_CONFIG_END
-
-
-static MACHINE_CONFIG_DERIVED( mchampdx, hedpanic )
-
-	/* basic machine hardware */
-
-	MCFG_CPU_MODIFY("maincpu")
-	MCFG_CPU_PROGRAM_MAP(mchampdx_map)
-MACHINE_CONFIG_END
-
-static MACHINE_CONFIG_DERIVED( tangtang, hedpanic )
-
-	/* basic machine hardware */
-
-	MCFG_CPU_MODIFY("maincpu")
-	MCFG_CPU_PROGRAM_MAP(tangtang_map)
-
-	MCFG_GFXDECODE(tangtang)
-MACHINE_CONFIG_END
-
-static MACHINE_CONFIG_DERIVED( swatpolc, hedpanic )
-
-	/* basic machine hardware */
-
-	MCFG_GFXDECODE(tangtang)
-MACHINE_CONFIG_END
+/* The ESD 05-28-99 PCB adds an EEPROM */

 static MACHINE_CONFIG_DERIVED( hedpanio, esd16 )
 	/* basic machine hardware */
@ -764,12 +685,30 @@ static MACHINE_CONFIG_DERIVED( hedpanio, esd16 )
 	MCFG_CPU_PROGRAM_MAP(hedpanic_map)

 	MCFG_EEPROM_93C46_ADD("eeprom")
-
-	MCFG_PALETTE_LENGTH(0x1000/2)
-
-	MCFG_GFXDECODE(hedpanic)
 MACHINE_CONFIG_END

+/* The ESD 08-26-1999 PCBs take that further and modify the sprite offsets */
+
+static MACHINE_CONFIG_DERIVED( hedpanic, hedpanio )
+	MCFG_DEVICE_MODIFY("spritegen")
+	decospr_device::set_offsets(*device, -0x18,-0x100);
+MACHINE_CONFIG_END
+
+/* ESD 08-26-1999 PCBs with different memory maps */
+
+static MACHINE_CONFIG_DERIVED( mchampdx, hedpanic )
+	MCFG_CPU_MODIFY("maincpu")
+	MCFG_CPU_PROGRAM_MAP(mchampdx_map)
+MACHINE_CONFIG_END
+
+static MACHINE_CONFIG_DERIVED( tangtang, hedpanic )
+	MCFG_CPU_MODIFY("maincpu")
+	MCFG_CPU_PROGRAM_MAP(tangtang_map)
+MACHINE_CONFIG_END
+
+
+
+


 /***************************************************************************
@ -1570,5 +1509,5 @@ GAME( 2000, hedpanicf,hedpanic, hedpanic, hedpanic, 0, ROT0, "ESD / Fuuki", "Hea
 /* ESD - This PCB looks identical to the ESD 08-26-1999 PCB */
 GAME( 2000, deluxe5,  0,        tangtang, hedpanic, 0, ROT0, "ESD",         "Deluxe 5 (ver. 0107, 07/01/2000)", GAME_SUPPORTS_SAVE )
 GAME( 2000, tangtang, 0,        tangtang, hedpanic, 0, ROT0, "ESD",         "Tang Tang (ver. 0526, 26/05/2000)", GAME_SUPPORTS_SAVE )
-GAME( 2001, swatpolc, 0,        swatpolc, swatpolc, 0, ROT0, "ESD",         "SWAT Police", GAME_SUPPORTS_SAVE )
+GAME( 2001, swatpolc, 0,        hedpanic, swatpolc, 0, ROT0, "ESD",         "SWAT Police", GAME_SUPPORTS_SAVE )

--- a/src/mame/drivers/mpu5.c
+++ b/src/mame/drivers/mpu5.c
@ -1925,9 +1925,16 @@ ROM_START( m5ewn )
 	ROM_LOAD16_BYTE( "ewyn03h.p1", 0x000000, 0x080000, CRC(1d56fb1a) SHA1(68a8d88b9b9e141e8945251fa7712eae97f92455) )
 	ROM_LOAD16_BYTE( "ewyn03s.p1", 0x000000, 0x080000, CRC(fd38a3b6) SHA1(e3f524abf0e8977bf893aaacadefcdb9fa735442) )
 	ROM_LOAD16_BYTE( "ewyn03y.p1", 0x000000, 0x080000, CRC(0272423f) SHA1(dc560366c5497b93d33b80a622c3296cfae9a157) )
-	ROM_LOAD16_BYTE( "ewyn08.p2", 0x000000, 0x080000, CRC(f92b9097) SHA1(93ee983527aa4605e33fac6812c3fe1a49225224) )
-	ROM_LOAD16_BYTE( "ewyn08.p3", 0x000000, 0x080000, CRC(079e1138) SHA1(c9bb5ece68cec07d4eb497e9486eeb3bdcaeb940) )
-	ROM_LOAD16_BYTE( "ewyn08.p4", 0x000000, 0x080000, CRC(6aa11324) SHA1(6e62fec68eca4db43e5feaca3d79907ae662f1a8) )
+ROM_END
+
+ROM_START( m5ewn08 )
+	ROM_REGION( 0x400000, "maincpu", 0 )
+	ROM_LOAD16_BYTE( "ewyn08s.p1", 0x000000, 0x080000, CRC(03b5c72a) SHA1(0c8f148140fb691aca7fcc1520eecdf81601bc10) )
+	ROM_LOAD16_BYTE( "ewyn08.p2", 0x000001, 0x080000, CRC(f92b9097) SHA1(93ee983527aa4605e33fac6812c3fe1a49225224) )
+	ROM_LOAD16_BYTE( "ewyn08.p3", 0x100000, 0x080000, CRC(079e1138) SHA1(c9bb5ece68cec07d4eb497e9486eeb3bdcaeb940) )
+	ROM_LOAD16_BYTE( "ewyn08.p4", 0x100001, 0x080000, CRC(6aa11324) SHA1(6e62fec68eca4db43e5feaca3d79907ae662f1a8) )
+
+	ROM_REGION( 0x100000, "altrevs", 0 ) /* Alternate revision Prg ROMs, to be sorted into clones */
 	ROM_LOAD16_BYTE( "ewyn08ad.p1", 0x000000, 0x080000, CRC(f10430a7) SHA1(5e9444214543e986821e8a0ec4d9ee4ffb251964) )
 	ROM_LOAD16_BYTE( "ewyn08b.p1", 0x000000, 0x080000, CRC(91ff4334) SHA1(2d5cded32a4aac6e4589980f9ef3a9811bf2f258) )
 	ROM_LOAD16_BYTE( "ewyn08bd.p1", 0x000000, 0x080000, CRC(da571a74) SHA1(eb4427f66d5bcf11036c5a2e4d340639ed77fa01) )
@ -1935,15 +1942,9 @@ ROM_START( m5ewn )
 	ROM_LOAD16_BYTE( "ewyn08dy.p1", 0x000000, 0x080000, CRC(b421e1fb) SHA1(93463bab7b7ccfe6585a9cea6c4ca408fa9f7fbd) )
 	ROM_LOAD16_BYTE( "ewyn08h.p1", 0x000000, 0x080000, CRC(d71a86d7) SHA1(d86c5768455958eeb885cfd38fb62f9e63d087ba) )
 	ROM_LOAD16_BYTE( "ewyn08r.p1", 0x000000, 0x080000, CRC(f6ebc1e3) SHA1(23f6befdf9a138f79b9348c1cbba03b0e7644b73) )
-	ROM_LOAD16_BYTE( "ewyn08s.p1", 0x000000, 0x080000, CRC(03b5c72a) SHA1(0c8f148140fb691aca7fcc1520eecdf81601bc10) )
 	ROM_LOAD16_BYTE( "ewyn08y.p1", 0x000000, 0x080000, CRC(a538b5fa) SHA1(3597cf36627f5c57362e5c9664b58fe4a2abeff2) )
-	// from a different game / hw type?
-	//ROM_LOAD16_BYTE( "ewn1a26", 0x000000, 0x000400, CRC(a92760b7) SHA1(dfef0dab7799a4b4975755c1584efca81a3798c4) )
-	//ROM_LOAD16_BYTE( "ewn26.2", 0x000000, 0x000400, CRC(bd24e59e) SHA1(038ed23283a7b61e873f543de32b685630fcdb97) )
-	//ROM_LOAD16_BYTE( "ewn26.3", 0x000000, 0x000400, CRC(a3280b35) SHA1(2771c81735c69ae3efb02715ac97901dae434e72) )
 ROM_END

-
 ROM_START( m5elband )
 	ROM_REGION( 0x400000, "maincpu", 0 )
 	ROM_LOAD16_BYTE( "eba_14s.p1", 0x000000, 0x080000, CRC(087880ac) SHA1(34a83b282af945fd1f42498ff019a3ca1ff84948) )
@ -1967,11 +1968,23 @@ ROM_START( m5elim )
 	ROM_LOAD16_BYTE( "elim02r.p1", 0x000000, 0x080000, CRC(caa11fe5) SHA1(8f720dc7c1c9bf417e90cd92be9df31861e105e6) )
 	ROM_LOAD16_BYTE( "elim02s.p1", 0x000000, 0x080000, CRC(3f626dee) SHA1(3c482e90f8fdbed1e3e91db980073e99ada9e6bb) )
 	ROM_LOAD16_BYTE( "elim02y.p1", 0x000000, 0x080000, CRC(f16a9961) SHA1(35e18bb70e8e5b096526242ef9400630d675e704) )
-	ROM_LOAD16_BYTE( "elim03s", 0x000000, 0x080000, CRC(6903d0d0) SHA1(01af2abc7f88e7e9ebfbe668727f5ff52658a5e1) )
-	ROM_LOAD16_BYTE( "elim03.p2", 0x0000, 0x080000, CRC(3262eb5a) SHA1(62bbfebb32e16fb7f5945a6b523c619401117a1f) )
-	ROM_LOAD16_BYTE( "elim04.p2", 0x000000, 0x080000, CRC(4f17729a) SHA1(8854a8fd571a8de6b49fec6c172ec0a5f5f1622f) )
-	ROM_LOAD16_BYTE( "elim04.p3", 0x000000, 0x080000, CRC(1387646a) SHA1(00c6157c07398c6e5b4e6ead6a8cca88e38f298d) )
-	ROM_LOAD16_BYTE( "elim04.p4", 0x000000, 0x080000, CRC(99f609d4) SHA1(53803bc0f4712b7772f525f2b65ad3ca8b1e6122) )
+ROM_END
+
+ROM_START( m5elim03 )
+	ROM_REGION( 0x400000, "maincpu", 0 )
+	ROM_LOAD16_BYTE( "elim03s", 0x00000, 0x080000, CRC(6903d0d0) SHA1(01af2abc7f88e7e9ebfbe668727f5ff52658a5e1) )
+	ROM_LOAD16_BYTE( "elim03.p2", 0x00001, 0x080000, CRC(3262eb5a) SHA1(62bbfebb32e16fb7f5945a6b523c619401117a1f) )
+	/* 3+4? */
+ROM_END
+
+ROM_START( m5elim04 )
+	ROM_REGION( 0x400000, "maincpu", 0 )
+	ROM_LOAD16_BYTE( "elim04s.p1", 0x000000, 0x080000, CRC(56b13411) SHA1(5fa183c45ee5b4527650171ab7bbb4afa95eb577) )
+	ROM_LOAD16_BYTE( "elim04.p2", 0x000001, 0x080000, CRC(4f17729a) SHA1(8854a8fd571a8de6b49fec6c172ec0a5f5f1622f) )
+	ROM_LOAD16_BYTE( "elim04.p3", 0x100000, 0x080000, CRC(1387646a) SHA1(00c6157c07398c6e5b4e6ead6a8cca88e38f298d) )
+	ROM_LOAD16_BYTE( "elim04.p4", 0x100001, 0x080000, CRC(99f609d4) SHA1(53803bc0f4712b7772f525f2b65ad3ca8b1e6122) )
+
+	ROM_REGION( 0x100000, "altrevs", 0 ) /* Alternate revision Prg ROMs, to be sorted into clones */
 	ROM_LOAD16_BYTE( "elim04ad.p1", 0x000000, 0x080000, CRC(f23ed4db) SHA1(990dc8b10931745a7a9ab24d4502d70bc7f28d1d) )
 	ROM_LOAD16_BYTE( "elim04b.p1", 0x000000, 0x080000, CRC(3e18df20) SHA1(7a68900770bdf624e14ae8e2ec05fbb7c2dee91a) )
 	ROM_LOAD16_BYTE( "elim04bd.p1", 0x000000, 0x080000, CRC(9594c18e) SHA1(e17c3cda1d8e3812a1dbd2126a006ce4eed6acb7) )
@ -1979,7 +1992,6 @@ ROM_START( m5elim )
 	ROM_LOAD16_BYTE( "elim04dy.p1", 0x000000, 0x080000, CRC(e252526a) SHA1(cb871e437dd7d165a2e4845d3e5e7e34e0821a05) )
 	ROM_LOAD16_BYTE( "elim04h.p1", 0x000000, 0x080000, CRC(a7e8dfd2) SHA1(86beb9501833effb94687571af5e66d27333593b) )
 	ROM_LOAD16_BYTE( "elim04r.p1", 0x000000, 0x080000, CRC(ed73666d) SHA1(4063e483a252c2092ad70fdb50e25eae72c585ad) )
-	ROM_LOAD16_BYTE( "elim04s.p1", 0x000000, 0x080000, CRC(56b13411) SHA1(5fa183c45ee5b4527650171ab7bbb4afa95eb577) )
 	ROM_LOAD16_BYTE( "elim04y.p1", 0x000000, 0x080000, CRC(6706869b) SHA1(13fa227fcc01db7f3143ec6d9aa20054dd112884) )
 ROM_END

@ -2075,15 +2087,20 @@ ROM_START( m5fortby )
 	ROM_LOAD16_BYTE( "fboy03r.p1", 0x000000, 0x080000, CRC(cd560670) SHA1(c4ceac1a2b466188b661ea7b7439dfbfbef1d777) )
 	ROM_LOAD16_BYTE( "fboy03s.p1", 0x000000, 0x080000, CRC(28723ee6) SHA1(427f10b3c40c8a7656e3478685a94cfe47eade0d) )
 	ROM_LOAD16_BYTE( "fboy03y.p1", 0x000000, 0x080000, CRC(e30d4e1b) SHA1(f6353b525807b3e797dad3e4a1ef5a47eb699aa7) )
-	ROM_LOAD16_BYTE( "fbtr01.p2", 0x000000, 0x080000, CRC(2eb06307) SHA1(be31e555b0f392b0124365e26c66b9e18cadc53f) )
-	//ROM_LOAD16_BYTE( "fbtr01.p3", 0x000000, 0x080000, CRC(5c7eb266) SHA1(42c8ed84b274906daa06a773ff5bbb48a98a495d) )
-	//ROM_LOAD16_BYTE( "fbtr01.p4", 0x000000, 0x080000, CRC(a9e4bcc6) SHA1(0ebad4a51756029980e20a5fbc648e2d799b5583) )
-	ROM_LOAD16_BYTE( "fbtr01d.p1", 0x000000, 0x080000, CRC(f09961ef) SHA1(fc273fd38f321f537c7b405f971a7e8d8ff95c4f) )
-	ROM_LOAD16_BYTE( "fbtr01dy.p1", 0x000000, 0x080000, CRC(a30fed6e) SHA1(25cfa3c36fe37d86f74a853f033fbd632fd11380) )
-	ROM_LOAD16_BYTE( "fbtr01s.p1", 0x000000, 0x080000, CRC(ca6c0f4c) SHA1(b15a86f7540e454062074f655b5fad1d7ef09347) )
-	ROM_LOAD16_BYTE( "fbtr01y.p1", 0x000000, 0x080000, CRC(99fa83cd) SHA1(7adc35e8c8aaf02e1af34c6034cf08c4cc91b85a) )
 ROM_END

+ROM_START( m5fortby01 )
+	ROM_REGION( 0x400000, "maincpu", 0 )
+	ROM_LOAD16_BYTE( "fbtr01s.p1", 0x000000, 0x080000, CRC(ca6c0f4c) SHA1(b15a86f7540e454062074f655b5fad1d7ef09347) )
+	ROM_LOAD16_BYTE( "fbtr01.p2", 0x000001, 0x080000, CRC(2eb06307) SHA1(be31e555b0f392b0124365e26c66b9e18cadc53f) )
+	ROM_LOAD16_BYTE( "fbtr01.p3", 0x100000, 0x080000, CRC(5c7eb266) SHA1(42c8ed84b274906daa06a773ff5bbb48a98a495d) ) // == 03
+	ROM_LOAD16_BYTE( "fbtr01.p4", 0x100001, 0x080000, CRC(a9e4bcc6) SHA1(0ebad4a51756029980e20a5fbc648e2d799b5583) ) // == 03
+
+	ROM_REGION( 0x100000, "altrevs", 0 ) /* Alternate revision Prg ROMs, to be sorted into clones */
+	ROM_LOAD16_BYTE( "fbtr01d.p1", 0x000000, 0x080000, CRC(f09961ef) SHA1(fc273fd38f321f537c7b405f971a7e8d8ff95c4f) )
+	ROM_LOAD16_BYTE( "fbtr01dy.p1", 0x000000, 0x080000, CRC(a30fed6e) SHA1(25cfa3c36fe37d86f74a853f033fbd632fd11380) )
+	ROM_LOAD16_BYTE( "fbtr01y.p1", 0x000000, 0x080000, CRC(99fa83cd) SHA1(7adc35e8c8aaf02e1af34c6034cf08c4cc91b85a) )
+ROM_END

 ROM_START( m5frnzy )
 	ROM_REGION( 0x400000, "maincpu", 0 )
@ -2102,9 +2119,14 @@ ROM_START( m5frnzy )
 	ROM_LOAD16_BYTE( "frnz10r.p1", 0x000000, 0x080000, CRC(bc1ad6a2) SHA1(1018187f8811c52043edc2303e8290d72201cc3e) )
 	ROM_LOAD16_BYTE( "frnz10s.p1", 0x000000, 0x080000, CRC(de4efa95) SHA1(ff1ebacd48ae9a4ab46bd4568f61bca8af63e811) )
 	ROM_LOAD16_BYTE( "frnz10y.p1", 0x000000, 0x080000, CRC(cf6f2a57) SHA1(069e8c935fa455bc973d439d51ecf655d9717f4e) )
-	ROM_LOAD16_BYTE( "frenzy.p2",  0x000000, 0x080000, CRC(ede2528d) SHA1(5e536648807e734d9a5dc4599cf0abf7c98c4163) )
-	ROM_LOAD16_BYTE( "frenzy.p3",  0x000000, 0x080000, CRC(371069c4) SHA1(dbd192a7f20473ca52d85188ef5b964e33c5f271) )
-	ROM_LOAD16_BYTE( "frenzy.p4",  0x000000, 0x080000, CRC(b8be736d) SHA1(7ca620ace6bb872239d9cf33189921caee64a75a) )
+ROM_END
+
+ROM_START( m5frnzya )
+	ROM_REGION( 0x400000, "maincpu", 0 )
+	ROM_LOAD16_BYTE( "frenzy.p1",  0x000000, 0x080000, NO_DUMP )
+	ROM_LOAD16_BYTE( "frenzy.p2",  0x000001, 0x080000, CRC(ede2528d) SHA1(5e536648807e734d9a5dc4599cf0abf7c98c4163) )
+	ROM_LOAD16_BYTE( "frenzy.p3",  0x100000, 0x080000, CRC(371069c4) SHA1(dbd192a7f20473ca52d85188ef5b964e33c5f271) )
+	ROM_LOAD16_BYTE( "frenzy.p4",  0x100001, 0x080000, CRC(b8be736d) SHA1(7ca620ace6bb872239d9cf33189921caee64a75a) )
 ROM_END

 ROM_START( m5fnfair )
@ -2172,9 +2194,16 @@ ROM_START( m5funsun )
 	ROM_LOAD16_BYTE( "fitr01dy.p1", 0x000000, 0x080000, CRC(8bfbb42f) SHA1(6c00554ef181d40e23cd50e511cee9c786416251) )
 	ROM_LOAD16_BYTE( "fitr01s.p1", 0x000000, 0x080000, CRC(9554834b) SHA1(c63ee3fea33b3ed215bcc713526393a9d598f57f) )
 	ROM_LOAD16_BYTE( "fitr01y.p1", 0x000000, 0x080000, CRC(4b4cc769) SHA1(b5d18d5fc7db269d56dde31260dbf10a4d9c4ae8) )
-	ROM_LOAD16_BYTE( "fits03.p2", 0x000000, 0x080000, CRC(5096b567) SHA1(154e26895bcbf9000cc9f4fb20f5796832aa4c7c) )
-	//ROM_LOAD16_BYTE( "fits03.p3", 0x000000, 0x080000, CRC(ba3ecd13) SHA1(aaf03ef6e7230a1ba88201540da019ad7ae573e6) )
-	//ROM_LOAD16_BYTE( "fits03.p4", 0x000000, 0x080000, CRC(3aa10886) SHA1(0b69434e0d139e48c48da0a086b8728db27a01e7) )
+ROM_END
+
+ROM_START( m5funsun03 )
+	ROM_REGION( 0x400000, "maincpu", 0 )
+	ROM_LOAD16_BYTE( "fits03s.p1", 0x000000, 0x080000, CRC(2057779f) SHA1(663147880ba1ddc28f57e4469d13eccdd5e959fc) )
+	ROM_LOAD16_BYTE( "fits03.p2", 0x000001, 0x080000, CRC(5096b567) SHA1(154e26895bcbf9000cc9f4fb20f5796832aa4c7c) )
+	ROM_LOAD16_BYTE( "fits03.p3", 0x100000, 0x080000, CRC(ba3ecd13) SHA1(aaf03ef6e7230a1ba88201540da019ad7ae573e6) ) // == 01
+	ROM_LOAD16_BYTE( "fits03.p4", 0x100001, 0x080000, CRC(3aa10886) SHA1(0b69434e0d139e48c48da0a086b8728db27a01e7) ) // == 01
+
+	ROM_REGION( 0x100000, "altrevs", 0 ) /* Alternate revision Prg ROMs, to be sorted into clones */
 	ROM_LOAD16_BYTE( "fits03ad.p1", 0x000000, 0x080000, CRC(01ce15f8) SHA1(8af226ce837dee4d470892c0a1c8b10769be4246) )
 	ROM_LOAD16_BYTE( "fits03b.p1", 0x000000, 0x080000, CRC(fac8a7bf) SHA1(1e81c51bb318dc8f6ac8f1321a9be3a584edc61a) )
 	ROM_LOAD16_BYTE( "fits03d.p1", 0x000000, 0x080000, CRC(23d82301) SHA1(7657a882e7e6df4db400fe0227b36f105e1be4ba) )
@ -2182,7 +2211,6 @@ ROM_START( m5funsun )
 	ROM_LOAD16_BYTE( "fits03h.p1", 0x000000, 0x080000, CRC(43c3ee4e) SHA1(ba24ecd1bc0acc8230062063496ab82f7a268878) )
 	ROM_LOAD16_BYTE( "fits03k.p1", 0x000000, 0x080000, CRC(a40d7159) SHA1(3fc076127caaba43fb28210ef226783daa456f1a) )
 	ROM_LOAD16_BYTE( "fits03r.p1", 0x000000, 0x080000, CRC(4a10afaa) SHA1(733af64415b3bd9da140ed0776ca84e64bdeea01) )
-	ROM_LOAD16_BYTE( "fits03s.p1", 0x000000, 0x080000, CRC(2057779f) SHA1(663147880ba1ddc28f57e4469d13eccdd5e959fc) )
 	ROM_LOAD16_BYTE( "fits03y.p1", 0x000000, 0x080000, CRC(49a29e47) SHA1(144ef11dd2bc89a625a8ff4d3eeed62cae401784) )
 ROM_END

@ -2231,28 +2259,50 @@ ROM_START( m5grush )
 	ROM_LOAD16_BYTE( "gldr02r.p1", 0x000000, 0x080000, CRC(cdc86903) SHA1(0fa139fa83b9be893826fa7680bf60feab68c5fb) )
 	ROM_LOAD16_BYTE( "gldr02s.p1", 0x000000, 0x080000, CRC(3bc119be) SHA1(436e5723402de85e2dc34ac3f75ffaeaed9ee18b) )
 	ROM_LOAD16_BYTE( "gldr02y.p1", 0x000000, 0x080000, CRC(59ec5574) SHA1(e85f5dc2f2aa6abed9b57199e8ac9f63ab25500c) )
-	ROM_LOAD16_BYTE( "gldr03s", 0x000000, 0x080000, CRC(1030dc21) SHA1(d824494fb378504225077bd4bac4dde8349f9d0b) )
-	ROM_LOAD16_BYTE( "gldr10.p2", 0x000000, 0x080000, CRC(6688a3ee) SHA1(51bac67cc39ed55c4ca1e5f7904eacc76ce186ba) )
+ROM_END
+
+ROM_START( m5grush10 )
+	ROM_REGION( 0x400000, "maincpu", 0 )
+	ROM_LOAD16_BYTE( "gldr10s.p1", 0x000000, 0x080000, CRC(f1702b48) SHA1(50c9c88edd12c38506a7dfbcf0fac25cdb1c5979) )
+	ROM_LOAD16_BYTE( "gldr10.p2", 0x000001, 0x080000, CRC(6688a3ee) SHA1(51bac67cc39ed55c4ca1e5f7904eacc76ce186ba) )
+
+	ROM_REGION( 0x100000, "altrevs", 0 ) /* Alternate revision Prg ROMs, to be sorted into clones */
 	ROM_LOAD16_BYTE( "gldr10ad.p1", 0x000000, 0x080000, CRC(76bda2d8) SHA1(4295078c8143127e58d08da3490ee92572c67477) )
 	ROM_LOAD16_BYTE( "gldr10b.p1", 0x000000, 0x080000, CRC(5eac62a0) SHA1(ca588ebd67e8d5bd0765c21e96c1c0ca26e83b24) )
 	ROM_LOAD16_BYTE( "gldr10bd.p1", 0x000000, 0x080000, CRC(d2c160ff) SHA1(b23badc310d4484d5850c2b6434a1057b74c1c2e) )
 	ROM_LOAD16_BYTE( "gldr10d.p1", 0x000000, 0x080000, CRC(30fee695) SHA1(e6af80e875b04cc3e3d57cb4c7b094027997beb9) )
 	ROM_LOAD16_BYTE( "gldr10dy.p1", 0x000000, 0x080000, CRC(584abd42) SHA1(56a2ace6f2e2a825b5232b2a3e68276362bdcd4b) )
 	ROM_LOAD16_BYTE( "gldr10r.p1", 0x000000, 0x080000, CRC(e563cd7f) SHA1(d0facc5904f55129ae328ece4775573af92b71d1) )
-	ROM_LOAD16_BYTE( "gldr10s.p1", 0x000000, 0x080000, CRC(f1702b48) SHA1(50c9c88edd12c38506a7dfbcf0fac25cdb1c5979) )
 	ROM_LOAD16_BYTE( "gldr10y.p1", 0x000000, 0x080000, CRC(99c4709f) SHA1(45e5969873f797bcc52b725f1de7a5073f45ed0c) )
-	ROM_LOAD16_BYTE( "grsd04.p2", 0x000000, 0x080000, CRC(76539325) SHA1(9dd5ed167ed8aa5e69a6bcd036f1fdc51465e32b) )
+ROM_END
+
+ROM_START( m5grush04 )
+	ROM_REGION( 0x400000, "maincpu", 0 )
+	ROM_LOAD16_BYTE( "grsd04s.p1", 0x000000, 0x080000, CRC(feab336f) SHA1(aa5c0e5156428f10171d5cb18320608f02299713) )
+	ROM_LOAD16_BYTE( "grsd04.p2", 0x000001, 0x080000, CRC(76539325) SHA1(9dd5ed167ed8aa5e69a6bcd036f1fdc51465e32b) )
+
+	ROM_REGION( 0x100000, "altrevs", 0 ) /* Alternate revision Prg ROMs, to be sorted into clones */
 	ROM_LOAD16_BYTE( "grsd04ad.p1", 0x000000, 0x080000, CRC(048534ea) SHA1(80cf04c66b3bb7287f5fd73517d22e220e0eed14) )
 	ROM_LOAD16_BYTE( "grsd04b.p1", 0x000000, 0x080000, CRC(1c799582) SHA1(753189da17aba0fb65fdca8c0fe3e6c3fc94b57b) )
 	ROM_LOAD16_BYTE( "grsd04bd.p1", 0x000000, 0x080000, CRC(f4aaffd5) SHA1(09e21297cfd21c0eaab214fcebd97a4f2318cd0a) )
 	ROM_LOAD16_BYTE( "grsd04d.p1", 0x000000, 0x080000, CRC(0bd25272) SHA1(81bd2c924acb38cfe60a06ebb667913e7b347f77) )
 	ROM_LOAD16_BYTE( "grsd04dy.p1", 0x000000, 0x080000, CRC(96708ccb) SHA1(d784530d9369094abe909d1f5ac5a2efb874e5e9) )
 	ROM_LOAD16_BYTE( "grsd04r.p1", 0x000000, 0x080000, CRC(f5d40d04) SHA1(47e28f392b7c6584057de92d206a9e50997a5705) )
-	ROM_LOAD16_BYTE( "grsd04s.p1", 0x000000, 0x080000, CRC(feab336f) SHA1(aa5c0e5156428f10171d5cb18320608f02299713) )
 	ROM_LOAD16_BYTE( "grsd04y.p1", 0x000000, 0x080000, CRC(6309edd6) SHA1(b804d30106d824f697ebeccb5858286846d054c5) )
-	ROM_LOAD16_BYTE( "grtr01y.p1", 0x000000, 0x080000, CRC(5b03d1ea) SHA1(7ac6c24aa421f024edb70e4a1a14b9f56c9f96f0) )
+ROM_END
+
+ROM_START( m5grush03 )
+	ROM_REGION( 0x400000, "maincpu", 0 )
+	ROM_LOAD16_BYTE( "gldr03s.p1", 0x000000, 0x080000, CRC(1030dc21) SHA1(d824494fb378504225077bd4bac4dde8349f9d0b) )
+	ROM_LOAD16_BYTE( "gldr03.p2", 0x000001, 0x080000, NO_DUMP )
+ROM_END
+
+ROM_START( m5grush02 )
+	ROM_REGION( 0x400000, "maincpu", 0 )
 	ROM_LOAD16_BYTE( "grtr02.p1", 0x000000, 0x080000, CRC(95be0322) SHA1(688022cbbaf241dccc3b74951b5f03390a9e075c) )
-	ROM_LOAD16_BYTE( "grtr02.p2", 0x000000, 0x080000, CRC(38898d47) SHA1(a5b171d2653d31c3e92aa1ab7093e4721e7621a7) )
+	ROM_LOAD16_BYTE( "grtr02.p2", 0x000001, 0x080000, CRC(38898d47) SHA1(a5b171d2653d31c3e92aa1ab7093e4721e7621a7) )
+
+	ROM_REGION( 0x100000, "altrevs", 0 ) /* Alternate revision Prg ROMs, to be sorted into clones */
 	ROM_LOAD16_BYTE( "grtr02ad.p1", 0x000000, 0x080000, CRC(8bd2d74d) SHA1(3f111cfd7f933d3222a706bc192cc18b7f23151f) )
 	ROM_LOAD16_BYTE( "grtr02b.p1", 0x000000, 0x080000, CRC(c7f629b8) SHA1(839758636de9a9c23ecaad87d99845773d60bc61) )
 	ROM_LOAD16_BYTE( "grtr02bd.p1", 0x000000, 0x080000, CRC(39fa0d64) SHA1(ff5aee25d026501967932297ac042be1ed9731f3) )
@ -2263,10 +2313,18 @@ ROM_START( m5grush )
 	ROM_LOAD16_BYTE( "grtr02s.p1", 0x000000, 0x080000, CRC(95be0322) SHA1(688022cbbaf241dccc3b74951b5f03390a9e075c) )
 ROM_END

+ROM_START( m5grush01 )
+	ROM_REGION( 0x400000, "maincpu", 0 )
+	ROM_LOAD16_BYTE( "grtr01y.p1", 0x000000, 0x080000, CRC(5b03d1ea) SHA1(7ac6c24aa421f024edb70e4a1a14b9f56c9f96f0) )
+	ROM_LOAD16_BYTE( "grtr01.p2", 0x000001, 0x080000, NO_DUMP )
+ROM_END
+
+
+

 ROM_START( m5grush5 )
 	ROM_REGION( 0x400000, "maincpu", 0 )
-	ROM_LOAD16_BYTE( "g5tr01.p1", 0x000000, 0x080000, CRC(efb9c1ea) SHA1(9c89af90bcc4fd4fe140e0ab92c6190a047efdf7) )
+	ROM_LOAD16_BYTE( "g5tr01s.p1", 0x000000, 0x080000, CRC(efb9c1ea) SHA1(9c89af90bcc4fd4fe140e0ab92c6190a047efdf7) )
 	ROM_LOAD16_BYTE( "g5tr01.p2", 0x000001, 0x080000, CRC(fd371a85) SHA1(ea209ab3083db78e1018c884d02fd717a8661eb7) )
 	ROM_LOAD16_BYTE( "g5tr01.p3", 0x100000, 0x080000, CRC(529b3d07) SHA1(527c35ee1170c94a95fcf69f15453fb9b2593615) )
 	ROM_LOAD16_BYTE( "g5tr01.p4", 0x100001, 0x080000, CRC(af4c3e53) SHA1(6639e612052482a74a3661397d2f1bd23968c23e) )
@ -2278,21 +2336,27 @@ ROM_START( m5grush5 )
 	ROM_LOAD16_BYTE( "g5tr01d.p1", 0x000000, 0x080000, CRC(c377f374) SHA1(139c68bb162fba3fe0b26da68fb4ba79bbb8824c) )
 	ROM_LOAD16_BYTE( "g5tr01dy.p1", 0x000000, 0x080000, CRC(00a13991) SHA1(90614a3d2182f98bc3522a28e78a7a9f694f15d8) )
 	ROM_LOAD16_BYTE( "g5tr01k.p1", 0x000000, 0x080000, CRC(109ac66c) SHA1(b80f17626a620e10be52d367d4bf4aeea8fb1ad4) )
-	//ROM_LOAD16_BYTE( "g5tr01s.p1", 0x000000, 0x080000, CRC(efb9c1ea) SHA1(9c89af90bcc4fd4fe140e0ab92c6190a047efdf7) )
 	ROM_LOAD16_BYTE( "g5tr01y.p1", 0x000000, 0x080000, CRC(2c6f0b0f) SHA1(e49fe2f57fc33552d706b8629253e0955923cb1e) )
-	ROM_LOAD16_BYTE( "grfl04.p2", 0x000000, 0x080000, CRC(d27fae8b) SHA1(4ccf6f7e99aef7ac1fe39254ea0a6202a7d30e56) )
-	ROM_LOAD16_BYTE( "grfl04.p3", 0x000000, 0x080000, CRC(c21685d5) SHA1(a7bcc3024960f4db51d14b57dcd1073ed602b107) )
-	ROM_LOAD16_BYTE( "grfl04.p4", 0x000000, 0x080000, CRC(3daa1bf3) SHA1(fafe2b5b6632a54f438e552f15ebcaf483c0607b) )
+ROM_END
+
+ROM_START( m5grush504 )
+	ROM_REGION( 0x400000, "maincpu", 0 )
+	ROM_LOAD16_BYTE( "grfl04s.p1", 0x000000, 0x080000, CRC(9150b119) SHA1(4ca0228f65dea9dac9525ceab34c0951a8bf0322) )
+	ROM_LOAD16_BYTE( "grfl04.p2", 0x000001, 0x080000, CRC(d27fae8b) SHA1(4ccf6f7e99aef7ac1fe39254ea0a6202a7d30e56) )
+	ROM_LOAD16_BYTE( "grfl04.p3", 0x100000, 0x080000, CRC(c21685d5) SHA1(a7bcc3024960f4db51d14b57dcd1073ed602b107) )
+	ROM_LOAD16_BYTE( "grfl04.p4", 0x100001, 0x080000, CRC(3daa1bf3) SHA1(fafe2b5b6632a54f438e552f15ebcaf483c0607b) )
+
+	ROM_REGION( 0x100000, "altrevs", 0 ) /* Alternate revision Prg ROMs, to be sorted into clones */
 	ROM_LOAD16_BYTE( "grfl04ad.p1", 0x000000, 0x080000, CRC(79dec127) SHA1(e8c97c35d458fe3aed62a8fd5f88e08d55315fe7) )
 	ROM_LOAD16_BYTE( "grfl04b.p1", 0x000000, 0x080000, CRC(0fabe21b) SHA1(d5d5a6c93d009ffea7aa5b3e2da8da22df7e7959) )
 	ROM_LOAD16_BYTE( "grfl04bd.p1", 0x000000, 0x080000, CRC(d7d523d6) SHA1(668bc8bc0649041d4db6dd421ca072f1fd1370cf) )
 	ROM_LOAD16_BYTE( "grfl04d.p1", 0x000000, 0x080000, CRC(ba12b0fd) SHA1(043c27be7d5004f0c9932f4f3342339f830cd8bf) )
 	ROM_LOAD16_BYTE( "grfl04dy.p1", 0x000000, 0x080000, CRC(ae039b83) SHA1(e58c902a8b9f2503c1ba50ad7e74826b5bfc0273) )
 	ROM_LOAD16_BYTE( "grfl04r.p1", 0x000000, 0x080000, CRC(bca46ee5) SHA1(f365d9e2bd1fea4013e9d0a89b058caacb079442) )
-	ROM_LOAD16_BYTE( "grfl04s.p1", 0x000000, 0x080000, CRC(9150b119) SHA1(4ca0228f65dea9dac9525ceab34c0951a8bf0322) )
 	ROM_LOAD16_BYTE( "grfl04y.p1", 0x000000, 0x080000, CRC(85419a67) SHA1(de985d51436e09ddfd603385c255b1f15095e866) )
 ROM_END

+
 ROM_START( m5gruss )
 	ROM_REGION( 0x400000, "maincpu", 0 )
 	ROM_LOAD16_BYTE( "rstr01ad.p1", 0x000000, 0x080000, CRC(a2ffa9ef) SHA1(61bd3575799f6257d8d963a9196efc8696540fda) )
@ -2313,16 +2377,19 @@ ROM_START( m5grusst )
 	ROM_REGION( 0x400000, "maincpu", 0 )
 	ROM_LOAD16_BYTE( "grst05.p1", 0x000000, 0x080000, CRC(67e3a3a9) SHA1(35ee60697bb24eac77a0c90490e5155bc3e9aec3) )
 	ROM_LOAD16_BYTE( "grst05.p2", 0x000001, 0x080000, CRC(ce2e7167) SHA1(999d16d947ecef74a4a7a655031a344918ec8a8b) )
-
-	ROM_REGION( 0x100000, "altrevs", 0 ) /* Alternate revision Prg ROMs, to be sorted into clones */
-	ROM_LOAD16_BYTE( "grtb04.p1", 0x000000, 0x080000, CRC(06bcea34) SHA1(2a53c35581c27c13584141ac37f3368ec5b45cc9) )
-	ROM_LOAD16_BYTE( "grtb04.p2", 0x000000, 0x080000, CRC(640c300a) SHA1(b1973fd785e272dde56cd33bdf755dbe38079ec7) )
-
-	//Gold Rush Stampede Three Player Stand Up (Barcrest) [Rom].zip....
-	ROM_LOAD16_BYTE( "gr3b03.p1", 0x0000, 0x080000, CRC(4c8e3b99) SHA1(5e5b41433c9a1a0b1dbddbdebf1504cf54e0bb2f) )
-	ROM_LOAD16_BYTE( "gr3b03.p2", 0x0000, 0x080000, CRC(4ddb0a6b) SHA1(62b9b828583e34fe993945d3c554085e3cf292b6) )
 ROM_END

+ROM_START( m5grusst04 )
+	ROM_REGION( 0x400000, "maincpu", 0 )
+	ROM_LOAD16_BYTE( "grtb04.p1", 0x000000, 0x080000, CRC(06bcea34) SHA1(2a53c35581c27c13584141ac37f3368ec5b45cc9) )
+	ROM_LOAD16_BYTE( "grtb04.p2", 0x000001, 0x080000, CRC(640c300a) SHA1(b1973fd785e272dde56cd33bdf755dbe38079ec7) )
+ROM_END
+
+ROM_START( m5grusst03 )	// Gold Rush Stampede Three Player Stand Up (Barcrest) [Rom].zip....
+	ROM_REGION( 0x400000, "maincpu", 0 )
+	ROM_LOAD16_BYTE( "gr3b03.p1", 0x00000, 0x080000, CRC(4c8e3b99) SHA1(5e5b41433c9a1a0b1dbddbdebf1504cf54e0bb2f) )
+	ROM_LOAD16_BYTE( "gr3b03.p2", 0x00001, 0x080000, CRC(4ddb0a6b) SHA1(62b9b828583e34fe993945d3c554085e3cf292b6) )
+ROM_END

 ROM_START( m5gstrik )
 	ROM_REGION( 0x400000, "maincpu", 0 )
@ -2332,14 +2399,6 @@ ROM_START( m5gstrik )
 	ROM_LOAD16_BYTE( "gost03.p4", 0x100001, 0x080000, CRC(50e63933) SHA1(501caf831c11d603079807f3fd0570f0991a5f9c) )

 	ROM_REGION( 0x100000, "altrevs", 0 ) /* Alternate revision Prg ROMs, to be sorted into clones */
-	ROM_LOAD16_BYTE( "g1tr01d.p1", 0x000000, 0x080000, CRC(cdfe3366) SHA1(22ef7acb1827d26562cb4c4371c42c9441208d9b) )
-	ROM_LOAD16_BYTE( "g1tr02.p2", 0x000000, 0x080000, CRC(7d3118e9) SHA1(a4ccf46d15125c67e6e17b117bc3a880b46b47e7) )
-	//ROM_LOAD16_BYTE( "g1tr02.p3", 0x000000, 0x080000, CRC(befbf489) SHA1(d198c27bafaddfd9c2c522be84b2a7aae52f712a) )
-	//ROM_LOAD16_BYTE( "g1tr02.p4", 0x000000, 0x080000, CRC(50e63933) SHA1(501caf831c11d603079807f3fd0570f0991a5f9c) )
-	ROM_LOAD16_BYTE( "g1tr02dy.p1", 0x000000, 0x080000, CRC(e9c967ea) SHA1(1a2806e5b95e11aa5a80d7e434ebb40eba057aac) )
-	ROM_LOAD16_BYTE( "g1tr02k.p1", 0x000000, 0x080000, CRC(d892e461) SHA1(72185d4c8e6670a0ec87f3807d4c465b1ea2ea89) )
-	ROM_LOAD16_BYTE( "g1tr02s.p1", 0x000000, 0x080000, CRC(3881b4f7) SHA1(dc3cdc56ca9df0a4dec83976f79c042368403beb) )
-	ROM_LOAD16_BYTE( "g1tr02y.p1", 0x000000, 0x080000, CRC(9d3f2d28) SHA1(fa0cc57f0e58489c2b8408c479525b99a2ca6ebd) )
 	ROM_LOAD16_BYTE( "gost03b.p1", 0x000000, 0x080000, CRC(1c4d7fa0) SHA1(25f38ffe450caa5b3005ae215dc745beb253c519) )
 	ROM_LOAD16_BYTE( "gost03bd.p1", 0x000000, 0x080000, CRC(45e31179) SHA1(1c204f6ffaa95f42c79e6ff10231ee4bd6b2c40c) )
 	ROM_LOAD16_BYTE( "gost03d.p1", 0x000000, 0x080000, CRC(9c00b5af) SHA1(20d16404bf4c4cdf0fac76b7a0ef10df360a4001) )
@ -2348,9 +2407,16 @@ ROM_START( m5gstrik )
 	ROM_LOAD16_BYTE( "gost03r.p1", 0x000000, 0x080000, CRC(92cb81aa) SHA1(8ebb1654bcac8c971e6d73829c139696911bbe5c) )
 	ROM_LOAD16_BYTE( "gost03s.p1", 0x000000, 0x080000, CRC(c5aedb76) SHA1(b4ee6ebc54262b0081b1a118cd1e7eae4223affd) )
 	ROM_LOAD16_BYTE( "gost03y.p1", 0x000000, 0x080000, CRC(00d3c696) SHA1(f350a56df5c4f9c937d3b815428e8332fdf855f9) )
-	ROM_LOAD16_BYTE( "gost11.p2", 0x000000, 0x080000, CRC(8b778220) SHA1(136b95d43e521da8698a94e9bf827e120744c7c1) )
-	//ROM_LOAD16_BYTE( "gost11.p3", 0x000000, 0x080000, CRC(befbf489) SHA1(d198c27bafaddfd9c2c522be84b2a7aae52f712a) )
-	//ROM_LOAD16_BYTE( "gost11.p4", 0x000000, 0x080000, CRC(50e63933) SHA1(501caf831c11d603079807f3fd0570f0991a5f9c) )
+ROM_END
+
+ROM_START( m5gstrik11 )
+	ROM_REGION( 0x400000, "maincpu", 0 )
+	ROM_LOAD16_BYTE( "gost11s.p1", 0x000000, 0x080000, CRC(a44b737f) SHA1(b5ae06c8bcd053b46ca5b19d206b3fb6f146ddd8) )
+	ROM_LOAD16_BYTE( "gost11.p2", 0x000001, 0x080000, CRC(8b778220) SHA1(136b95d43e521da8698a94e9bf827e120744c7c1) )
+	ROM_LOAD16_BYTE( "gost11.p3", 0x100000, 0x080000, CRC(befbf489) SHA1(d198c27bafaddfd9c2c522be84b2a7aae52f712a) ) // == 03
+	ROM_LOAD16_BYTE( "gost11.p4", 0x100001, 0x080000, CRC(50e63933) SHA1(501caf831c11d603079807f3fd0570f0991a5f9c) ) // == 03
+
+	ROM_REGION( 0x100000, "altrevs", 0 ) /* Alternate revision Prg ROMs, to be sorted into clones */
 	ROM_LOAD16_BYTE( "gost11ad.p1", 0x000000, 0x080000, CRC(be12b3fb) SHA1(2f5846f8afa12e31404e1adad1b7241d65add54e) )
 	ROM_LOAD16_BYTE( "gost11b.p1", 0x000000, 0x080000, CRC(4766cff8) SHA1(701b1ce621240fcf769f5769117cd5aea9d7587d) )
 	ROM_LOAD16_BYTE( "gost11bd.p1", 0x000000, 0x080000, CRC(8defecfd) SHA1(77c4c72d5faf7da797df238bb8940ee6762701db) )
@ -2359,24 +2425,48 @@ ROM_START( m5gstrik )
 	ROM_LOAD16_BYTE( "gost11h.p1", 0x000000, 0x080000, CRC(fb2ef23a) SHA1(0bf2478cd18df7f9053c43552d0a72499514616d) )
 	ROM_LOAD16_BYTE( "gost11k.p1", 0x000000, 0x080000, CRC(8101b8c3) SHA1(da194096b8d662bdc95b238b06e21b53be469131) )
 	ROM_LOAD16_BYTE( "gost11r.p1", 0x000000, 0x080000, CRC(059e0329) SHA1(372382cbc6ab64f2a455b4a5ebced5b5ebed9243) )
-	ROM_LOAD16_BYTE( "gost11s.p1", 0x000000, 0x080000, CRC(a44b737f) SHA1(b5ae06c8bcd053b46ca5b19d206b3fb6f146ddd8) )
 	ROM_LOAD16_BYTE( "gost11y.p1", 0x000000, 0x080000, CRC(e15546e0) SHA1(8024c85cca4c09e1e526660d6ef1760c1bd6943c) )
-	ROM_LOAD16_BYTE( "gotr01.p2", 0x000000, 0x080000, CRC(000f6663) SHA1(f79f52c5d4af6cf576db9c529b868b34cd203026) )
-	//ROM_LOAD16_BYTE( "gotr01.p3", 0x000000, 0x080000, CRC(befbf489) SHA1(d198c27bafaddfd9c2c522be84b2a7aae52f712a) )
-	//ROM_LOAD16_BYTE( "gotr01.p4", 0x000000, 0x080000, CRC(50e63933) SHA1(501caf831c11d603079807f3fd0570f0991a5f9c) )
+ROM_END
+
+ROM_START( m5gstrik02 )
+	ROM_REGION( 0x400000, "maincpu", 0 )
+	ROM_LOAD16_BYTE( "g1tr02s.p1", 0x000000, 0x080000, CRC(3881b4f7) SHA1(dc3cdc56ca9df0a4dec83976f79c042368403beb) )
+	ROM_LOAD16_BYTE( "g1tr02.p2", 0x000001, 0x080000, CRC(7d3118e9) SHA1(a4ccf46d15125c67e6e17b117bc3a880b46b47e7) )
+	ROM_LOAD16_BYTE( "g1tr02.p3", 0x100000, 0x080000, CRC(befbf489) SHA1(d198c27bafaddfd9c2c522be84b2a7aae52f712a) ) // == 03
+	ROM_LOAD16_BYTE( "g1tr02.p4", 0x100001, 0x080000, CRC(50e63933) SHA1(501caf831c11d603079807f3fd0570f0991a5f9c) ) // == 03
+	
+	ROM_REGION( 0x100000, "altrevs", 0 ) /* Alternate revision Prg ROMs, to be sorted into clones */
+	ROM_LOAD16_BYTE( "g1tr02dy.p1", 0x000000, 0x080000, CRC(e9c967ea) SHA1(1a2806e5b95e11aa5a80d7e434ebb40eba057aac) )
+	ROM_LOAD16_BYTE( "g1tr02k.p1", 0x000000, 0x080000, CRC(d892e461) SHA1(72185d4c8e6670a0ec87f3807d4c465b1ea2ea89) )
+	ROM_LOAD16_BYTE( "g1tr02y.p1", 0x000000, 0x080000, CRC(9d3f2d28) SHA1(fa0cc57f0e58489c2b8408c479525b99a2ca6ebd) )
+ROM_END
+
+ROM_START( m5gstrik01 )
+	ROM_REGION( 0x400000, "maincpu", 0 )
+	ROM_LOAD16_BYTE( "gotr01s.p1", 0x000000, 0x080000, CRC(b7b74ea3) SHA1(aededf597114db939f5b2ead31f04018383ad4bc) )
+	ROM_LOAD16_BYTE( "gotr01.p2", 0x000001, 0x080000, CRC(000f6663) SHA1(f79f52c5d4af6cf576db9c529b868b34cd203026) )
+	ROM_LOAD16_BYTE( "gotr01.p3", 0x100000, 0x080000, CRC(befbf489) SHA1(d198c27bafaddfd9c2c522be84b2a7aae52f712a) ) // == 03
+	ROM_LOAD16_BYTE( "gotr01.p4", 0x100001, 0x080000, CRC(50e63933) SHA1(501caf831c11d603079807f3fd0570f0991a5f9c) ) // == 03
+	
+	ROM_REGION( 0x100000, "altrevs", 0 ) /* Alternate revision Prg ROMs, to be sorted into clones */	
 	ROM_LOAD16_BYTE( "gotr01d.p1", 0x000000, 0x080000, CRC(171a5db8) SHA1(4b10705efafcc456c2a26f9a80bbb9f7c67cea9b) )
 	ROM_LOAD16_BYTE( "gotr01dy.p1", 0x000000, 0x080000, CRC(715102e2) SHA1(af067bb2a80793391cb350e15f7f364f9ed3ee22) )
 	ROM_LOAD16_BYTE( "gotr01k.p1", 0x000000, 0x080000, CRC(c57930cb) SHA1(3d24482169dc207b5d8ff9819fff8661df19bc79) )
-	ROM_LOAD16_BYTE( "gotr01s.p1", 0x000000, 0x080000, CRC(b7b74ea3) SHA1(aededf597114db939f5b2ead31f04018383ad4bc) )
 	ROM_LOAD16_BYTE( "gotr01y.p1", 0x000000, 0x080000, CRC(d1fc11f9) SHA1(b62e59b3130a4a737c186f507e1a762c83740789) )
+ROM_END

+ROM_START( m5gstrik01a )
+	ROM_REGION( 0x400000, "maincpu", 0 )
+	ROM_LOAD16_BYTE( "g1tr01d.p1", 0x000000, 0x080000, CRC(cdfe3366) SHA1(22ef7acb1827d26562cb4c4371c42c9441208d9b) )
+	ROM_LOAD16_BYTE( "g1tr01.p2", 0x000001, 0x080000, NO_DUMP )
+	/* 3+4 */
+ROM_END

-	//ROM_LOAD16_BYTE( "gs20mp1.bin", 0x000000, 0x008000, CRC(409e0375) SHA1(da231769cd439bc665634d73b0b18f31da332b47) )
-	//ROM_LOAD16_BYTE( "gs20mp2.bin", 0x000000, 0x002000, CRC(4979bc57) SHA1(53683600c8b3140deab8eac55786460b45c3b143) )
-
-	ROM_LOAD( "gold_st.p1", 0x0000, 0x080000, CRC(3bb4032f) SHA1(30d9b2160e9fc55b9691abbdfe32be3a548e94fa) )
-	ROM_LOAD( "gold_st.p2", 0x0000, 0x080000, CRC(b890145f) SHA1(3351fe5926a30bf5b665ebd8bbcaaf5c74b4a218) )
-
+ROM_START( m5gstrika )
+	ROM_REGION( 0x400000, "maincpu", 0 )
+	ROM_LOAD( "gold_st.p1", 0x00000, 0x080000, CRC(3bb4032f) SHA1(30d9b2160e9fc55b9691abbdfe32be3a548e94fa) )
+	ROM_LOAD( "gold_st.p2", 0x00001, 0x080000, CRC(b890145f) SHA1(3351fe5926a30bf5b665ebd8bbcaaf5c74b4a218) )
+	/* 3+4 */
 ROM_END

 ROM_START( m5gsstrk )
@ -2387,15 +2477,6 @@ ROM_START( m5gsstrk )
 	ROM_LOAD16_BYTE( "ss2501.p4", 0x100001, 0x080000, CRC(e782daee) SHA1(cfef53a8223dbb40ab4384d3796a53c06bbf6649) )

 	ROM_REGION( 0x100000, "altrevs", 0 ) /* Alternate revision Prg ROMs, to be sorted into clones */
-	ROM_LOAD16_BYTE( "gstk07.p2", 0x000000, 0x080000, CRC(6a9baa5f) SHA1(c5ad8367ff449c2dc8a2a010917a95d80dabedfd) )
-	ROM_LOAD16_BYTE( "gstk07ad.p1", 0x000000, 0x080000, CRC(0e44d457) SHA1(35687eabb8141365454f9110a47662dd99de629e) )
-	ROM_LOAD16_BYTE( "gstk07b.p1", 0x000000, 0x080000, CRC(7608df0d) SHA1(af75559a7d79fb38d50efa718b7674efb54affa6) )
-	ROM_LOAD16_BYTE( "gstk07bd.p1", 0x000000, 0x080000, CRC(5eb69cac) SHA1(6fa06d50b8a1b6a16a4ece90001128d402dd5188) )
-	ROM_LOAD16_BYTE( "gstk07d.p1", 0x000000, 0x080000, CRC(1c701e20) SHA1(1d74c0a48b6128969491df5ca7d081aa95de01fe) )
-	ROM_LOAD16_BYTE( "gstk07dy.p1", 0x000000, 0x080000, CRC(2678a410) SHA1(4e27d63b872ee8ebd2e6c9801ad5a4f2474e4f41) )
-	ROM_LOAD16_BYTE( "gstk07r.p1", 0x000000, 0x080000, CRC(3d5e5962) SHA1(642456567713f72f239ae12179abe2a93adb1f45) )
-	ROM_LOAD16_BYTE( "gstk07s.p1", 0x000000, 0x080000, CRC(f8a84259) SHA1(514bd4403ba464e732d9dded684c0a15c13811e4) )
-	ROM_LOAD16_BYTE( "gstk07y.p1", 0x000000, 0x080000, CRC(c2a0f869) SHA1(3105a6ff654bfdfed323312a9b6172f3c5da5e18) )
 	ROM_LOAD16_BYTE( "ss2501b.p1", 0x000000, 0x080000, CRC(78254183) SHA1(f3347bc4b414bc6b649d53780ca3157d97091d7c) )
 	ROM_LOAD16_BYTE( "ss2501bd.p1", 0x000000, 0x080000, CRC(e7a23406) SHA1(c72f118f32ad9f2f2b19a6c8b455f44b44d9c404) )
 	ROM_LOAD16_BYTE( "ss2501d.p1", 0x000000, 0x080000, CRC(904a509f) SHA1(fe6d63161d4cffd0adc835e10291d740f6f83021) )
@ -2406,6 +2487,22 @@ ROM_START( m5gsstrk )
 	ROM_LOAD16_BYTE( "ss2501y.p1", 0x000000, 0x080000, CRC(cbaecce5) SHA1(478742d6850bbbbf83ce84471f952727b05db236) )
 ROM_END

+ROM_START( m5gsstrk07 )
+	ROM_REGION( 0x400000, "maincpu", 0 )
+	ROM_LOAD16_BYTE( "gstk07s.p1", 0x000000, 0x080000, CRC(f8a84259) SHA1(514bd4403ba464e732d9dded684c0a15c13811e4) )
+	ROM_LOAD16_BYTE( "gstk07.p2", 0x000001, 0x080000, CRC(6a9baa5f) SHA1(c5ad8367ff449c2dc8a2a010917a95d80dabedfd) )
+	/* 3+4 */
+
+	ROM_REGION( 0x100000, "altrevs", 0 ) /* Alternate revision Prg ROMs, to be sorted into clones */
+	ROM_LOAD16_BYTE( "gstk07ad.p1", 0x000000, 0x080000, CRC(0e44d457) SHA1(35687eabb8141365454f9110a47662dd99de629e) )
+	ROM_LOAD16_BYTE( "gstk07b.p1", 0x000000, 0x080000, CRC(7608df0d) SHA1(af75559a7d79fb38d50efa718b7674efb54affa6) )
+	ROM_LOAD16_BYTE( "gstk07bd.p1", 0x000000, 0x080000, CRC(5eb69cac) SHA1(6fa06d50b8a1b6a16a4ece90001128d402dd5188) )
+	ROM_LOAD16_BYTE( "gstk07d.p1", 0x000000, 0x080000, CRC(1c701e20) SHA1(1d74c0a48b6128969491df5ca7d081aa95de01fe) )
+	ROM_LOAD16_BYTE( "gstk07dy.p1", 0x000000, 0x080000, CRC(2678a410) SHA1(4e27d63b872ee8ebd2e6c9801ad5a4f2474e4f41) )
+	ROM_LOAD16_BYTE( "gstk07r.p1", 0x000000, 0x080000, CRC(3d5e5962) SHA1(642456567713f72f239ae12179abe2a93adb1f45) )
+	ROM_LOAD16_BYTE( "gstk07y.p1", 0x000000, 0x080000, CRC(c2a0f869) SHA1(3105a6ff654bfdfed323312a9b6172f3c5da5e18) )
+ROM_END
+

 ROM_START( m5gdrag )
 	ROM_REGION( 0x400000, "maincpu", 0 )
@ -2438,15 +2535,21 @@ ROM_START( m5gdrgcl )
 	ROM_LOAD16_BYTE( "gdgc04f.p1", 0x000000, 0x080000, CRC(ea80dd8d) SHA1(7323b6f904d47b840a3ccff634ac2f12f1b29728) )
 	ROM_LOAD16_BYTE( "gdgc04s.p1", 0x000000, 0x080000, CRC(dfc898ed) SHA1(159fd9c14717eb3dd1bb25e4d44aff91c1c6aa1e) )
 	ROM_LOAD16_BYTE( "gdgc04z.p1", 0x000000, 0x080000, CRC(91be4c46) SHA1(20bf32d99e7f3e8da04167649fe3a3e7f2993a77) )
-	ROM_LOAD16_BYTE( "gdgc05.p2", 0x000000, 0x080000, CRC(68020883) SHA1(563b14c1c7bf5adac4c23eac10d01d17473a24f0) )
+ROM_END
+
+ROM_START( m5gdrgcl05 )
+	ROM_REGION( 0x400000, "maincpu", 0 )
+	ROM_LOAD16_BYTE( "gdgc05s.p1", 0x000000, 0x080000, CRC(af4d242f) SHA1(35b8cbb6e8a299901f96231d1084dc94ec793139) )
+	ROM_LOAD16_BYTE( "gdgc05.p2", 0x000001, 0x080000, CRC(68020883) SHA1(563b14c1c7bf5adac4c23eac10d01d17473a24f0) )
+	/* 3+4 */
+
+	ROM_REGION( 0x100000, "altrevs", 0 ) /* Alternate revision Prg ROMs, to be sorted into clones */
 	ROM_LOAD16_BYTE( "gdgc05d.p1", 0x000000, 0x080000, CRC(281b610b) SHA1(2660a246786418b04a975918abc12fd95b7ae0d4) )
 	ROM_LOAD16_BYTE( "gdgc05dz.p1", 0x000000, 0x080000, CRC(891d128e) SHA1(7db770c90c7f13e490bf836372ae69d957c09840) )
 	ROM_LOAD16_BYTE( "gdgc05f.p1", 0x000000, 0x080000, CRC(97fa9ce4) SHA1(4a7d0f7c90c72316337109b2aae8b77a226afa59) )
-	ROM_LOAD16_BYTE( "gdgc05s.p1", 0x000000, 0x080000, CRC(af4d242f) SHA1(35b8cbb6e8a299901f96231d1084dc94ec793139) )
 	ROM_LOAD16_BYTE( "gdgc05z.p1", 0x000000, 0x080000, CRC(7814760f) SHA1(05a8b3b332924356f5077bf64a5b23ab4226fa14) )
 ROM_END

-
 ROM_START( m5gkeys )
 	ROM_REGION( 0x400000, "maincpu", 0 )
 	ROM_LOAD16_BYTE( "gok10_5s.p1", 0x000000, 0x080000, CRC(8a9caf39) SHA1(b19e03b94baff64dbc438fc13659bb4d864995cf) )
@ -2551,22 +2654,6 @@ ROM_START( m5hifly )
 	ROM_LOAD16_BYTE( "hfly05.p4", 0x100001, 0x080000, CRC(9a62c206) SHA1(d9f97ce751608bd51bc18525dbc4d40b2652a6fe) )

 	ROM_REGION( 0x100000, "altrevs", 0 ) /* Alternate revision Prg ROMs, to be sorted into clones */
-	//ROM_LOAD16_BYTE( "hfly03.p3", 0x000000, 0x080000, CRC(550b0228) SHA1(eb5ae4710b83aa1072fd3da68b12163fec5ebbea) )
-	//ROM_LOAD16_BYTE( "hfly03.p4", 0x000000, 0x080000, CRC(9a62c206) SHA1(d9f97ce751608bd51bc18525dbc4d40b2652a6fe) )
-	ROM_LOAD16_BYTE( "hfly03r.p1", 0x000000, 0x080000, CRC(ccce8657) SHA1(b7b461efd78ee6d7c7fbff2c3586ec44dfec4427) )
-	ROM_LOAD16_BYTE( "hfly03s.p1", 0x000000, 0x080000, CRC(45fb2a8a) SHA1(e811ba052c004c3db2f7972c26d969e9180028c9) )
-	ROM_LOAD16_BYTE( "hfly04.p2", 0x000000, 0x080000, CRC(08701661) SHA1(c947316204c547debc9f55cb9fd6d15c313d7670) )
-	//ROM_LOAD16_BYTE( "hfly04.p3", 0x000000, 0x080000, CRC(550b0228) SHA1(eb5ae4710b83aa1072fd3da68b12163fec5ebbea) )
-	//ROM_LOAD16_BYTE( "hfly04.p4", 0x000000, 0x080000, CRC(9a62c206) SHA1(d9f97ce751608bd51bc18525dbc4d40b2652a6fe) )
-	ROM_LOAD16_BYTE( "hfly04ad.p1", 0x000000, 0x080000, CRC(d9bd7c64) SHA1(408493cba5946854f82c819d3fbf55e702feea45) )
-	ROM_LOAD16_BYTE( "hfly04b.p1", 0x000000, 0x080000, CRC(554df194) SHA1(56884e1f3371d6ee3b50f7f773dff47b097a6bc9) )
-	ROM_LOAD16_BYTE( "hfly04bd.p1", 0x000000, 0x080000, CRC(8bb599b8) SHA1(0a978826c893a300ba8316dfc4d962af548b18ca) )
-	ROM_LOAD16_BYTE( "hfly04d.p1", 0x000000, 0x080000, CRC(cca22a8d) SHA1(502c2279b5d6dbdc8b03e406668eb69e52ac6939) )
-	ROM_LOAD16_BYTE( "hfly04dy.p1", 0x000000, 0x080000, CRC(42bad05f) SHA1(b96f9587e91915a8d0f1669fae2e4a4a1f537086) )
-	ROM_LOAD16_BYTE( "hfly04k.p1", 0x000000, 0x080000, CRC(41a85902) SHA1(d3df84867ebb4781bc9720dfcdeee03d3ee854bd) )
-	ROM_LOAD16_BYTE( "hfly04r.p1", 0x000000, 0x080000, CRC(c4de26f0) SHA1(b2ce57b3bfce33791f6df99a2a0711d5c7b65865) )
-	ROM_LOAD16_BYTE( "hfly04s.p1", 0x000000, 0x080000, CRC(e735d98c) SHA1(3dc314fd5a32b544acf19909a5f6d901111bf341) )
-	ROM_LOAD16_BYTE( "hfly04y.p1", 0x000000, 0x080000, CRC(692d235e) SHA1(02573892a0db3bad78782192605f38d5463a4d4c) )
 	ROM_LOAD16_BYTE( "hfly05b.p1", 0x000000, 0x080000, CRC(0a51422b) SHA1(0b8f366ca403a2a2317185eb2db0e04be4acd665) )
 	ROM_LOAD16_BYTE( "hfly05bd.p1", 0x000000, 0x080000, CRC(9afcfc65) SHA1(f85cf64db7e7f60076b9d0499f32a429297d8f9c) )
 	ROM_LOAD16_BYTE( "hfly05d.p1", 0x000000, 0x080000, CRC(dfdfe8e0) SHA1(bb9b6d825b6f09d76a7a95de350e98f5ca0b1b73) )
@ -2575,11 +2662,40 @@ ROM_START( m5hifly )
 	ROM_LOAD16_BYTE( "hfly05r.p1", 0x000000, 0x080000, CRC(8c1414f0) SHA1(b14ec649fd901dd8212f81481a1f872991b05357) )
 	ROM_LOAD16_BYTE( "hfly05s.p1", 0x000000, 0x080000, CRC(fb6700e9) SHA1(874b7553e1e338d65d3a686c29e34d555bd0b68c) )
 	ROM_LOAD16_BYTE( "hfly05y.p1", 0x000000, 0x080000, CRC(53be1c89) SHA1(699d6a30bdd332f29ca48f4eb4e8336039a873bb) )
-	ROM_LOAD16_BYTE( "hfly0_3.p2", 0x000000, 0x080000, CRC(eb2e557f) SHA1(a958db766de05884fdbc85611c539bfe78f19855) )
+ROM_END
+
+ROM_START( m5hifly03 )
+	ROM_REGION( 0x400000, "maincpu", 0 )
+	ROM_LOAD16_BYTE( "hfly03s.p1", 0x000000, 0x080000, CRC(45fb2a8a) SHA1(e811ba052c004c3db2f7972c26d969e9180028c9) )
+	ROM_LOAD16_BYTE( "hfly0_3.p2", 0x000001, 0x080000, CRC(eb2e557f) SHA1(a958db766de05884fdbc85611c539bfe78f19855) )
+	ROM_LOAD16_BYTE( "hfly03.p3", 0x100000, 0x080000, CRC(550b0228) SHA1(eb5ae4710b83aa1072fd3da68b12163fec5ebbea) ) // == 05
+	ROM_LOAD16_BYTE( "hfly03.p4", 0x100001, 0x080000, CRC(9a62c206) SHA1(d9f97ce751608bd51bc18525dbc4d40b2652a6fe) ) // == 05
+
+	ROM_REGION( 0x100000, "altrevs", 0 ) /* Alternate revision Prg ROMs, to be sorted into clones */
+	ROM_LOAD16_BYTE( "hfly03r.p1", 0x000000, 0x080000, CRC(ccce8657) SHA1(b7b461efd78ee6d7c7fbff2c3586ec44dfec4427) )
 	ROM_LOAD16_BYTE( "hfly0_3d.p1", 0x000000, 0x080000, CRC(0b6dbc3b) SHA1(3fb0861a2d97aa707957d94d99d938721037ad7e) )
 	ROM_LOAD16_BYTE( "hfly0_3y.p1", 0x000000, 0x080000, CRC(662e8239) SHA1(6f2fc2cf89c9b3734154ae64875ade0cba4721ec) )
 ROM_END

+ROM_START( m5hifly04 )
+	ROM_REGION( 0x400000, "maincpu", 0 )
+	ROM_LOAD16_BYTE( "hfly04s.p1", 0x000000, 0x080000, CRC(e735d98c) SHA1(3dc314fd5a32b544acf19909a5f6d901111bf341) )
+	ROM_LOAD16_BYTE( "hfly04.p2", 0x000001, 0x080000, CRC(08701661) SHA1(c947316204c547debc9f55cb9fd6d15c313d7670) )
+	ROM_LOAD16_BYTE( "hfly04.p3", 0x100000, 0x080000, CRC(550b0228) SHA1(eb5ae4710b83aa1072fd3da68b12163fec5ebbea) ) // == 05
+	ROM_LOAD16_BYTE( "hfly04.p4", 0x100001, 0x080000, CRC(9a62c206) SHA1(d9f97ce751608bd51bc18525dbc4d40b2652a6fe) ) // == 05
+
+	ROM_REGION( 0x100000, "altrevs", 0 ) /* Alternate revision Prg ROMs, to be sorted into clones */
+	ROM_LOAD16_BYTE( "hfly04ad.p1", 0x000000, 0x080000, CRC(d9bd7c64) SHA1(408493cba5946854f82c819d3fbf55e702feea45) )
+	ROM_LOAD16_BYTE( "hfly04b.p1", 0x000000, 0x080000, CRC(554df194) SHA1(56884e1f3371d6ee3b50f7f773dff47b097a6bc9) )
+	ROM_LOAD16_BYTE( "hfly04bd.p1", 0x000000, 0x080000, CRC(8bb599b8) SHA1(0a978826c893a300ba8316dfc4d962af548b18ca) )
+	ROM_LOAD16_BYTE( "hfly04d.p1", 0x000000, 0x080000, CRC(cca22a8d) SHA1(502c2279b5d6dbdc8b03e406668eb69e52ac6939) )
+	ROM_LOAD16_BYTE( "hfly04dy.p1", 0x000000, 0x080000, CRC(42bad05f) SHA1(b96f9587e91915a8d0f1669fae2e4a4a1f537086) )
+	ROM_LOAD16_BYTE( "hfly04k.p1", 0x000000, 0x080000, CRC(41a85902) SHA1(d3df84867ebb4781bc9720dfcdeee03d3ee854bd) )
+	ROM_LOAD16_BYTE( "hfly04r.p1", 0x000000, 0x080000, CRC(c4de26f0) SHA1(b2ce57b3bfce33791f6df99a2a0711d5c7b65865) )
+	ROM_LOAD16_BYTE( "hfly04y.p1", 0x000000, 0x080000, CRC(692d235e) SHA1(02573892a0db3bad78782192605f38d5463a4d4c) )
+ROM_END
+
+

 ROM_START( m5hisprt )
 	ROM_REGION( 0x400000, "maincpu", 0 )
@ -2615,7 +2731,7 @@ ROM_END

 ROM_START( m5holy )
 	ROM_REGION( 0x400000, "maincpu", 0 )
-	ROM_LOAD16_BYTE( "holy05.p1", 0x000000, 0x080000, CRC(aca48863) SHA1(69832c2d08a01cfd93ac23aaf82c51fdb6636b78) )
+	ROM_LOAD16_BYTE( "holy05s.p1", 0x000000, 0x080000, CRC(aca48863) SHA1(69832c2d08a01cfd93ac23aaf82c51fdb6636b78) )
 	ROM_LOAD16_BYTE( "holy05.p2", 0x000001, 0x080000, CRC(be3773ac) SHA1(31762b2b17d9c505184a760c8159f0d9558dc6b7) )
 	ROM_LOAD16_BYTE( "holy05.p3", 0x100000, 0x080000, CRC(169f72ee) SHA1(ee8052d54fdc4d06d7cc2851c45af07eb4c080cd) )
 	ROM_LOAD16_BYTE( "holy05.p4", 0x100001, 0x080000, CRC(15931f2b) SHA1(4692e58cc04375505c9238614896af070ea8d01a) )
@ -2628,17 +2744,21 @@ ROM_START( m5holy )
 	ROM_LOAD16_BYTE( "holy05dy.p1", 0x000000, 0x080000, CRC(0be16c35) SHA1(57dc11440d83447c732261447f46b8f83fc862e0) )
 	ROM_LOAD16_BYTE( "holy05k.p1", 0x000000, 0x080000, CRC(35aa76a4) SHA1(b0a1d500cd7112b6d2e5be1cdf386690f93a4c47) )
 	ROM_LOAD16_BYTE( "holy05r.p1", 0x000000, 0x080000, CRC(3bf3359e) SHA1(b6f6d67ee4f00bba9c57c68317609a7bc857895f) )
-	//ROM_LOAD16_BYTE( "holy05s.p1", 0x000000, 0x080000, CRC(aca48863) SHA1(69832c2d08a01cfd93ac23aaf82c51fdb6636b78) )
 	ROM_LOAD16_BYTE( "holy05y.p1", 0x000000, 0x080000, CRC(c35f60b6) SHA1(e7f4b5e83460bf4c0c5145d719a31a4af5b7216f) )
-	ROM_LOAD16_BYTE( "hotr10.p2", 0x000000, 0x080000, CRC(966bcfec) SHA1(d48e240b3cd566d188dba7adb660798cc39b39f8) )
-	//ROM_LOAD16_BYTE( "hotr10.p3", 0x000000, 0x080000, CRC(169f72ee) SHA1(ee8052d54fdc4d06d7cc2851c45af07eb4c080cd) )
-	//ROM_LOAD16_BYTE( "hotr10.p4", 0x000000, 0x080000, CRC(15931f2b) SHA1(4692e58cc04375505c9238614896af070ea8d01a) )
-	ROM_LOAD16_BYTE( "hotr10d.p1", 0x000000, 0x080000, CRC(1f279622) SHA1(0c56f0638f536618de31388a67cc57ceb75a85bd) )
-	ROM_LOAD16_BYTE( "hotr10dy.p1", 0x000000, 0x080000, CRC(8b89a405) SHA1(e22c22696b246139c0c423dd909dc83ecf88c11a) )
-	ROM_LOAD16_BYTE( "hotr10s.p1", 0x000000, 0x080000, CRC(d08dbe97) SHA1(e17997d4f7460dcf62bda98a1d18d409a38f320a) )
-	ROM_LOAD16_BYTE( "hotr10y.p1", 0x000000, 0x080000, CRC(44238cb0) SHA1(9f6bc48ba2ed100da14faa1513eab465f48eb81c) )
 ROM_END

+ROM_START( m5holy10 )
+	ROM_REGION( 0x400000, "maincpu", 0 )
+	ROM_LOAD16_BYTE( "hotr10s.p1", 0x000000, 0x080000, CRC(d08dbe97) SHA1(e17997d4f7460dcf62bda98a1d18d409a38f320a) )
+	ROM_LOAD16_BYTE( "hotr10.p2", 0x000000, 0x080000, CRC(966bcfec) SHA1(d48e240b3cd566d188dba7adb660798cc39b39f8) )
+	ROM_LOAD16_BYTE( "hotr10.p3", 0x000000, 0x080000, CRC(169f72ee) SHA1(ee8052d54fdc4d06d7cc2851c45af07eb4c080cd) ) // == 05
+	ROM_LOAD16_BYTE( "hotr10.p4", 0x000000, 0x080000, CRC(15931f2b) SHA1(4692e58cc04375505c9238614896af070ea8d01a) ) // == 05
+
+	ROM_REGION( 0x100000, "altrevs", 0 ) /* Alternate revision Prg ROMs, to be sorted into clones */
+	ROM_LOAD16_BYTE( "hotr10d.p1", 0x000000, 0x080000, CRC(1f279622) SHA1(0c56f0638f536618de31388a67cc57ceb75a85bd) )
+	ROM_LOAD16_BYTE( "hotr10dy.p1", 0x000000, 0x080000, CRC(8b89a405) SHA1(e22c22696b246139c0c423dd909dc83ecf88c11a) )
+	ROM_LOAD16_BYTE( "hotr10y.p1", 0x000000, 0x080000, CRC(44238cb0) SHA1(9f6bc48ba2ed100da14faa1513eab465f48eb81c) )
+ROM_END

 ROM_START( m5hopidl )
 	ROM_REGION( 0x400000, "maincpu", 0 )
@ -2694,10 +2814,6 @@ ROM_START( m5hotstf )
 	ROM_LOAD16_BYTE( "hstf04.p4", 0x100001, 0x080000, CRC(1ac1df11) SHA1(d105cc09d23d1e106b1740fb9894cbdd6d070610) )

 	ROM_REGION( 0x100000, "altrevs", 0 ) /* Alternate revision Prg ROMs, to be sorted into clones */
-	ROM_LOAD16_BYTE( "hst0-04d.u1", 0x000000, 0x080000, CRC(2affa3aa) SHA1(ed3c5a0380f7d823e05164cbce85a85211fd2755) )
-	ROM_LOAD16_BYTE( "hst0-04g.u1", 0x000000, 0x080000, CRC(4bcbd10b) SHA1(c7a9c0b3cec6dafd699b67b51823b86f354c665c) )
-	ROM_LOAD16_BYTE( "hst0-07d.u1", 0x000000, 0x080000, CRC(baccf4e6) SHA1(bd3f6c5e1a43779f278b481dd08860be22c565a2) )
-	ROM_LOAD16_BYTE( "hst0-07g.u1", 0x000000, 0x080000, CRC(dbf88647) SHA1(c2bdabae0e4234b245541983bb8e7d43636816c9) )
 	ROM_LOAD16_BYTE( "hstf04b.p1", 0x000000, 0x080000, CRC(1f38e2cc) SHA1(101f381b6da5b58f2ee6214e312068599f5d4633) )
 	ROM_LOAD16_BYTE( "hstf04bd.p1", 0x000000, 0x080000, CRC(f3f5efaa) SHA1(12f95359ae93aca8d815785396cf43e5e85fc39a) )
 	ROM_LOAD16_BYTE( "hstf04d.p1", 0x000000, 0x080000, CRC(5a3a0714) SHA1(476c3ada4e532546cef8dddfe925557d6abf64ca) )
@ -2706,18 +2822,9 @@ ROM_START( m5hotstf )
 	ROM_LOAD16_BYTE( "hstf04r.p1", 0x000000, 0x080000, CRC(c9859cc4) SHA1(77dadc6825abe8c593b15474de820ecfc7547740) )
 	ROM_LOAD16_BYTE( "hstf04s.p1", 0x000000, 0x080000, CRC(43fc71c9) SHA1(c2acbd43355b3926a75a283f9a91c1f59fb6644c) )
 	ROM_LOAD16_BYTE( "hstf04y.p1", 0x000000, 0x080000, CRC(0590a68b) SHA1(42fe07729eededb840eb466a4850e3f567907f40) )
-	ROM_LOAD16_BYTE( "hstv0-04.u1", 0x000000, 0x080000, CRC(23043c19) SHA1(03c7b2eda9b4d975aeba3eea091b11016df35047) )
-	ROM_LOAD16_BYTE( "hstv0-04.u2", 0x000000, 0x080000, CRC(941294dc) SHA1(359f3dac97c869f9cec5367d14aa95edced7c2de) )
-	ROM_LOAD16_BYTE( "hstv0-06.u1", 0x000000, 0x080000, CRC(e09f928c) SHA1(fafd8bb8c1f9e1904ef7a4dfe89eaf5a8ec6398e) )
-	ROM_LOAD16_BYTE( "hstv0-06.u2", 0x000000, 0x080000, CRC(2f9a53cc) SHA1(63e7ec37c6ee177e3d33ff2c649f743a8585bce4) )
-	ROM_LOAD16_BYTE( "hstv0-07.u1", 0x000000, 0x080000, CRC(b3376b55) SHA1(4c5b6f104318bea7efefb8535921a8527429392e) )
-	ROM_LOAD16_BYTE( "hstv0-07.u2", 0x000000, 0x080000, CRC(adde3b86) SHA1(95b65b9ae2c2034370c895803eb5dcac0a69a77a) )
-	ROM_LOAD16_BYTE( "hstv006d.u1", 0x000000, 0x080000, CRC(e9640d3f) SHA1(a51a6c3a8301fc19d15a07a4f1d1c86d13ef9141) )
-	ROM_LOAD16_BYTE( "hstv006g.u1", 0x000000, 0x080000, CRC(88507f9e) SHA1(acf1e26d7ddc6270c4025079516ad58c85630b50) )
 ROM_END


-
 ROM_START( m5hula )
 	ROM_REGION( 0x400000, "maincpu", 0 )
 	ROM_LOAD16_BYTE( "hula0_2.p1", 0x000000, 0x080000, CRC(df4db504) SHA1(c2bc7e8b90282e782faa295c2cba7588b9f8b75f) )
@ -2805,15 +2912,6 @@ ROM_START( m5jackpt )
 	ROM_LOAD16_BYTE( "jptr01.p4", 0x100001, 0x080000, CRC(de478607) SHA1(0fcc0a910ce437aea4c41257d0eb7fa52084a180) )

 	ROM_REGION( 0x100000, "altrevs", 0 ) /* Alternate revision Prg ROMs, to be sorted into clones */
-	ROM_LOAD16_BYTE( "eers07.p2", 0x000000, 0x080000, CRC(af0a522b) SHA1(04c8881931fa8165410cefbf1c7394057b42c004) )
-	ROM_LOAD16_BYTE( "eers07ad.p1", 0x000000, 0x080000, CRC(7fc0aed5) SHA1(45fca729cc8b0c9f9d22a38200b1e76a996c5e50) )
-	ROM_LOAD16_BYTE( "eers07b.p1", 0x000000, 0x080000, CRC(cf4ced92) SHA1(5d5d1da03f3c8b697fc251d955fd61730d9ca768) )
-	ROM_LOAD16_BYTE( "eers07bd.p1", 0x000000, 0x080000, CRC(99b8b3f1) SHA1(80ec7c7a4fa0f7cbe0f4a390a556166a3855e5c8) )
-	ROM_LOAD16_BYTE( "eers07dy.p1", 0x000000, 0x080000, CRC(3b9db5df) SHA1(8c73139db1824562cc495d70ac4c89697f16e4b5) )
-	ROM_LOAD16_BYTE( "eers07h.p1", 0x000000, 0x080000, CRC(f7204ffc) SHA1(3d6946db64a4749628032ec361d91468ec15324b) )
-	ROM_LOAD16_BYTE( "eers07r.p1", 0x000000, 0x080000, CRC(0d774597) SHA1(1292363c63aaf14f7707feaa8444646ff7a464f4) )
-	ROM_LOAD16_BYTE( "eers07s.p1", 0x000000, 0x080000, CRC(7de13003) SHA1(2e59f2d54f30c11315f2c74ff077e109e1bc0e2d) )
-	ROM_LOAD16_BYTE( "eers07y.p1", 0x000000, 0x080000, CRC(6d69ebbc) SHA1(321fb10a1a6a88775474054c7a3cb9c69ee9eb20) )
 	ROM_LOAD16_BYTE( "j1tr01.p2", 0x000000, 0x080000, CRC(fefc764f) SHA1(996f5f19746049c6d7d643d719a1c4bdad30af5e) )
 	//ROM_LOAD16_BYTE( "j1tr01.p3", 0x000000, 0x080000, CRC(28665fbd) SHA1(ee3963f6c77304251d6f721e982a8ff22ca449b6) )
 	//ROM_LOAD16_BYTE( "j1tr01.p4", 0x000000, 0x080000, CRC(de478607) SHA1(0fcc0a910ce437aea4c41257d0eb7fa52084a180) )
@ -2827,6 +2925,23 @@ ROM_START( m5jackpt )
 	ROM_LOAD16_BYTE( "jptr01y.p1", 0x000000, 0x080000, CRC(95fcc33f) SHA1(8efad2cbadf9327d99a0bdde39ad919cdf6a3dc3) )
 ROM_END

+ROM_START( m5jackpt07 )
+	ROM_REGION( 0x400000, "maincpu", 0 )
+	ROM_LOAD16_BYTE( "eers07s.p1", 0x000000, 0x080000, CRC(7de13003) SHA1(2e59f2d54f30c11315f2c74ff077e109e1bc0e2d) )
+	ROM_LOAD16_BYTE( "eers07.p2", 0x000001, 0x080000, CRC(af0a522b) SHA1(04c8881931fa8165410cefbf1c7394057b42c004) )
+	/* 3+4? */
+
+	ROM_REGION( 0x100000, "altrevs", 0 ) /* Alternate revision Prg ROMs, to be sorted into clones */
+	ROM_LOAD16_BYTE( "eers07ad.p1", 0x000000, 0x080000, CRC(7fc0aed5) SHA1(45fca729cc8b0c9f9d22a38200b1e76a996c5e50) )
+	ROM_LOAD16_BYTE( "eers07b.p1", 0x000000, 0x080000, CRC(cf4ced92) SHA1(5d5d1da03f3c8b697fc251d955fd61730d9ca768) )
+	ROM_LOAD16_BYTE( "eers07bd.p1", 0x000000, 0x080000, CRC(99b8b3f1) SHA1(80ec7c7a4fa0f7cbe0f4a390a556166a3855e5c8) )
+	ROM_LOAD16_BYTE( "eers07dy.p1", 0x000000, 0x080000, CRC(3b9db5df) SHA1(8c73139db1824562cc495d70ac4c89697f16e4b5) )
+	ROM_LOAD16_BYTE( "eers07h.p1", 0x000000, 0x080000, CRC(f7204ffc) SHA1(3d6946db64a4749628032ec361d91468ec15324b) )
+	ROM_LOAD16_BYTE( "eers07r.p1", 0x000000, 0x080000, CRC(0d774597) SHA1(1292363c63aaf14f7707feaa8444646ff7a464f4) )
+	ROM_LOAD16_BYTE( "eers07y.p1", 0x000000, 0x080000, CRC(6d69ebbc) SHA1(321fb10a1a6a88775474054c7a3cb9c69ee9eb20) )
+ROM_END
+
+

 ROM_START( m5jackp2 )
 	ROM_REGION( 0x400000, "maincpu", 0 )
@ -2848,8 +2963,13 @@ ROM_START( m5jackp2 )
 	ROM_LOAD16_BYTE( "jer202r.p1", 0x000000, 0x080000, CRC(533d1258) SHA1(3b25dff9130c91a9dc66481687577e184284e4f2) )
 	ROM_LOAD16_BYTE( "jer202s.p1", 0x000000, 0x080000, CRC(3c4f5471) SHA1(9b2da0f4031d6c184979f5b7a659f3f6de228232) )
 	ROM_LOAD16_BYTE( "jer202y.p1", 0x000000, 0x080000, CRC(20deb0a0) SHA1(92f99e2e2788f7860f7058cc2e26d2422511d3be) )
-	ROM_LOAD16_BYTE( "j pot 2.p1", 0x0000, 0x080000, CRC(f2dddbee) SHA1(e6dbd0925998eb8574599b496996740c4af5b5c2) )
-	ROM_LOAD16_BYTE( "j pot 2.p2", 0x0000, 0x080000, CRC(f37fa1c9) SHA1(03bfb641d04c98d375f548d074a1c44cb18f1a4b) )
+ROM_END
+
+ROM_START( m5jackp2a )
+	ROM_REGION( 0x400000, "maincpu", 0 )
+	ROM_LOAD16_BYTE( "j pot 2.p1", 0x00000, 0x080000, CRC(f2dddbee) SHA1(e6dbd0925998eb8574599b496996740c4af5b5c2) )
+	ROM_LOAD16_BYTE( "j pot 2.p2", 0x00001, 0x080000, CRC(f37fa1c9) SHA1(03bfb641d04c98d375f548d074a1c44cb18f1a4b) )
+	/* 3+4 */
 ROM_END

 ROM_START( m5jlyjwl )
@ -2867,6 +2987,15 @@ ROM_START( m5jlyjwl )
 	ROM_LOAD16_BYTE( "jjew08r.p1", 0x000000, 0x080000, CRC(d240f87e) SHA1(aeddc410409cadf294c58f2232a56ad9e44477d3) )
 	ROM_LOAD16_BYTE( "jjew08s.p1", 0x000000, 0x080000, CRC(e60beff3) SHA1(9247be2107d67a369a9cb4ed2fa12b06c4bfddfb) )
 	ROM_LOAD16_BYTE( "jjew08y.p1", 0x000000, 0x080000, CRC(888fcdad) SHA1(97959813cdf70e5edf51524fe8cbe23cedfba7fe) )
+ROM_END
+
+ROM_START( m5jlyjwl01 )
+	ROM_REGION( 0x400000, "maincpu", 0 )
+	ROM_LOAD16_BYTE( "jjtr01s.p1", 0x000000, 0x080000, CRC(2ef26a11) SHA1(9fd06ec5d2640acd9f181d80caf7887ea4d4a968) )
+	ROM_LOAD16_BYTE( "jjtr0_1.p2", 0x000001, 0x080000, CRC(8bad641c) SHA1(2bebfdd2970ac2c0bd518a1bb66d6a55db271d21) )
+	/* 3+4 */
+
+	ROM_REGION( 0x100000, "altrevs", 0 ) /* Alternate revision Prg ROMs, to be sorted into clones */
 	ROM_LOAD16_BYTE( "jjtr01ad.p1", 0x000000, 0x080000, CRC(357bb3a6) SHA1(22153d92208946eb39e0b20231d6f4eb8e5ddc52) )
 	ROM_LOAD16_BYTE( "jjtr01b.p1", 0x000000, 0x080000, CRC(611a03dc) SHA1(19adf916e0938efc5669a81fbe22d4b25f93378c) )
 	ROM_LOAD16_BYTE( "jjtr01bd.p1", 0x000000, 0x080000, CRC(c1b2d846) SHA1(357fba36b94ee38b342a233f2b31fd6e60f5bb8b) )
@ -2874,33 +3003,38 @@ ROM_START( m5jlyjwl )
 	ROM_LOAD16_BYTE( "jjtr01dy.p1", 0x000000, 0x080000, CRC(12abcd67) SHA1(f616cb3beddf2447099f804bdfe94ec910699fb8) )
 	ROM_LOAD16_BYTE( "jjtr01k.p1", 0x000000, 0x080000, CRC(ce336566) SHA1(089140d7be81cf79b496c3487bb558dd22ccd1e9) )
 	ROM_LOAD16_BYTE( "jjtr01r.p1", 0x000000, 0x080000, CRC(d1ded7e9) SHA1(a207f7b1a6671615a8c9ff567405f69391cf071e) )
-	ROM_LOAD16_BYTE( "jjtr01s.p1", 0x000000, 0x080000, CRC(2ef26a11) SHA1(9fd06ec5d2640acd9f181d80caf7887ea4d4a968) )
 	ROM_LOAD16_BYTE( "jjtr01y.p1", 0x000000, 0x080000, CRC(2938fc69) SHA1(4437e4a1a7ff8e065b7edb7614e16762e8999faa) )
-	ROM_LOAD16_BYTE( "jjtr0_1.p2", 0x000000, 0x080000, CRC(8bad641c) SHA1(2bebfdd2970ac2c0bd518a1bb66d6a55db271d21) )
-	ROM_LOAD16_BYTE( "jjtr0_2.p2", 0x000000, 0x080000, CRC(74cabc43) SHA1(86a8a5332a4dc32bb917335583fc2b99e1b5f4a1) )
+ROM_END
+
+ROM_START( m5jlyjwl02 )
+	ROM_REGION( 0x400000, "maincpu", 0 )
+	ROM_LOAD16_BYTE( "jjtr0_2s.p1", 0x000000, 0x080000, CRC(ff853137) SHA1(4bdb2fa0e171e6fde371a7f40ab242fa8ab6cb3a) )
+	ROM_LOAD16_BYTE( "jjtr0_2.p2", 0x000001, 0x080000, CRC(74cabc43) SHA1(86a8a5332a4dc32bb917335583fc2b99e1b5f4a1) )
+	/* 3+4 */
+
+	ROM_REGION( 0x100000, "altrevs", 0 ) /* Alternate revision Prg ROMs, to be sorted into clones */
 	ROM_LOAD16_BYTE( "jjtr0_2b.p1", 0x000000, 0x080000, CRC(5151f589) SHA1(672a5caaac2a1ee1af03464ec95f4779c094d902) )
 	ROM_LOAD16_BYTE( "jjtr0_2d.p1", 0x000000, 0x080000, CRC(1eea4e2a) SHA1(eeb13db33831e339da61cb736ff45ec23a0ccbfd) )
 	ROM_LOAD16_BYTE( "jjtr0_2k.p1", 0x000000, 0x080000, CRC(24ed4580) SHA1(3f0ece7c4264c9cf00710212c77e0033ebc15fcb) )
 	ROM_LOAD16_BYTE( "jjtr0_2r.p1", 0x000000, 0x080000, CRC(481062e9) SHA1(11486b0499b191e6cbd4920b3e4e3c6a3e4b2f62) )
-	ROM_LOAD16_BYTE( "jjtr0_2s.p1", 0x000000, 0x080000, CRC(ff853137) SHA1(4bdb2fa0e171e6fde371a7f40ab242fa8ab6cb3a) )
 	ROM_LOAD16_BYTE( "jjtr0_2y.p1", 0x000000, 0x080000, CRC(23f8463e) SHA1(5b5fb325379cf0af1b946d630d032237a182adbf) )
 ROM_END


-
 ROM_START( m5jlyrog )
 	ROM_REGION( 0x400000, "maincpu", 0 )
 	ROM_LOAD16_BYTE( "jolr0_1.p1", 0x000000, 0x080000, CRC(1001217e) SHA1(b6a4766426a88f8e1432c0af4e16344da8b4fa56) )
 	ROM_LOAD16_BYTE( "jolr0_1.p2", 0x000001, 0x080000, CRC(dc501165) SHA1(0391f58392ca2c784ea17cf8cf23e0e48533b4a0) )
 	ROM_LOAD16_BYTE( "jolr0_1.p3", 0x100000, 0x080000, CRC(640e9ee8) SHA1(b9fb8a84c076154cff1754fab8247fa140ab2f23) )
 	ROM_LOAD16_BYTE( "jolr0_1.p4", 0x100001, 0x080000, CRC(eaac6094) SHA1(0ca89a956208caa8ab16e1bbfb267265ac167300) )
-
-	ROM_REGION( 0x100000, "altrevs", 0 ) /* Alternate revision Prg ROMs, to be sorted into clones */
-	ROM_LOAD16_BYTE( "jrtb0_1.p1", 0x000000, 0x080000, CRC(95980094) SHA1(04a3385c84267e56eb35b42c9cc5e26c80f68ff5) )
-	ROM_LOAD16_BYTE( "jrtb0_1.p2", 0x000000, 0x080000, CRC(065cc5f1) SHA1(ddb5cca97405111988932fa25011f145cf9864ea) )
 ROM_END

-
+ROM_START( m5jlyroga )
+	ROM_REGION( 0x400000, "maincpu", 0 )
+	ROM_LOAD16_BYTE( "jrtb0_1.p1", 0x000000, 0x080000, CRC(95980094) SHA1(04a3385c84267e56eb35b42c9cc5e26c80f68ff5) )
+	ROM_LOAD16_BYTE( "jrtb0_1.p2", 0x000001, 0x080000, CRC(065cc5f1) SHA1(ddb5cca97405111988932fa25011f145cf9864ea) )
+	/* 3+4? */
+ROM_END

 ROM_START( m5jmpjok )
 	ROM_REGION( 0x400000, "maincpu", 0 )
@ -5386,10 +5520,13 @@ ROM_START( m5beans ) // full_of_beans_(barcrest)_[c01_800_25jp].hex
 	ROM_LOAD16_BYTE( "m5beans_p2", 0x000001, 0x080000, CRC(f43d445d) SHA1(a8c30397aac4572161d895b82e0b73138370ea7f) )
 	ROM_LOAD16_BYTE( "m5beans_p3", 0x100000, 0x080000, CRC(30a824de) SHA1(19289f4ecc28b52842c49f3ab4d657c550f17044) )
 	ROM_LOAD16_BYTE( "m5beans_p4", 0x100001, 0x080000, CRC(f3d6513c) SHA1(641a3e2ad31a8a5626fe71ded03dd0ce51c2b506) )
+ROM_END

-	ROM_REGION( 0x400000, "altrevs", 0 )
-	ROM_LOAD( "fbean.p1", 0x0000, 0x080000, CRC(32a3aeb9) SHA1(1cb8ce5dc1011422c3109ad09b4a1ef6a17a0711) )
-	ROM_LOAD( "fbean.p2", 0x0000, 0x080000, CRC(94dffb0a) SHA1(600b54233b45d95a89030673887037b77d0c6e84) )
+ROM_START( m5beansa )
+	ROM_REGION( 0x400000, "maincpu", 0 )
+	ROM_LOAD16_BYTE( "fbean.p1", 0x00000, 0x080000, CRC(32a3aeb9) SHA1(1cb8ce5dc1011422c3109ad09b4a1ef6a17a0711) )
+	ROM_LOAD16_BYTE( "fbean.p2", 0x00001, 0x080000, CRC(94dffb0a) SHA1(600b54233b45d95a89030673887037b77d0c6e84) )
+	/* 3+4? */
 ROM_END

 ROM_START( m5bling ) // bling_king_crazy_(barcrest)_[c01_800_25jp].hex
@ -5429,29 +5566,9 @@ ROM_END



-ROM_START( m5egr ) // elvis_gold_rush_(barcrest)_[c01_800_25jp].hex
-	ROM_REGION( 0x400000, "maincpu", 0 )
-	ROM_LOAD16_BYTE( "m5egr_p1", 0x000000, 0x080000, CRC(07a5b281) SHA1(cd755089a6a5db5d6923e3fb1660d2748af57b4e) )
-	ROM_LOAD16_BYTE( "m5egr_p2", 0x000001, 0x080000, CRC(2f0a54dc) SHA1(c0a4fd277b6b8cae9109222961c4c86f0a9b9103) )
-	ROM_LOAD16_BYTE( "m5egr_p3", 0x100000, 0x080000, CRC(a485956c) SHA1(9d16ef5d060ee663d7f68b9f5bd00ccad7a58825) )
-	ROM_LOAD16_BYTE( "m5egr_p4", 0x100001, 0x080000, CRC(84fe0436) SHA1(f8a072ae19314dde195e4fde5032aba041e72703) )
-ROM_END

-ROM_START( m5egss ) // elvis_gold_super_streak_(barcrest)_[c01_800_25jp].hex
-	ROM_REGION( 0x400000, "maincpu", 0 )
-	ROM_LOAD16_BYTE( "m5egss_p1", 0x000000, 0x080000, CRC(40b520b3) SHA1(2d8e827a00dba1f09e66cb0329ba332fc05335bb) )
-	ROM_LOAD16_BYTE( "m5egss_p2", 0x000001, 0x080000, CRC(47504b14) SHA1(82ee76f4299dc9b92b774eb4ecfbc618a90465ab) )
-	ROM_LOAD16_BYTE( "m5egss_p3", 0x100000, 0x080000, CRC(f8f38e74) SHA1(25a815f7c694eca441116cde78c6159b8640b4b9) )
-	ROM_LOAD16_BYTE( "m5egss_p4", 0x100001, 0x080000, CRC(4e68217a) SHA1(172cb7bd733b6c9f5da64ca50b9ad8457c0491b8) )
-ROM_END

-ROM_START( m5evgrhr ) // elvis_gold_red_hot_roll_(barcrest)_[c01_800_25jp].hex
-	ROM_REGION( 0x400000, "maincpu", 0 )
-	ROM_LOAD16_BYTE( "m5evgrhr_p1", 0x000000, 0x080000, CRC(43a5f54e) SHA1(bf84a27da357206bed44abac72802a0572923066) )
-	ROM_LOAD16_BYTE( "m5evgrhr_p2", 0x000001, 0x080000, CRC(6fc39a43) SHA1(6c8711f5c76dd1e2f3d14f89da6ef7a98c833049) )
-	ROM_LOAD16_BYTE( "m5evgrhr_p3", 0x100000, 0x080000, CRC(3a9a1c94) SHA1(f135904aa4b33d709830c5baebbc604d7b2873ee) )
-	ROM_LOAD16_BYTE( "m5evgrhr_p4", 0x100001, 0x080000, CRC(235dee6d) SHA1(fbc6c82cac5cad16f1190193109de78844d2e482) )
-ROM_END
+


 ROM_START( m5fire ) // all_fired_up_(barcrest)_[c01_800_25jp].hex
@ -5641,6 +5758,14 @@ ROM_START( m5eggold )
 	//ROM_LOAD16_BYTE( "egosjbd1.7_2", 0x000000, 0x080000, CRC(578bf881) SHA1(6df7d60171f8edce7e291eeeec01d4d87ed37742) )
 ROM_END

+ROM_START( m5egr ) // elvis_gold_rush_(barcrest)_[c01_800_25jp].hex
+	ROM_REGION( 0x400000, "maincpu", 0 )
+	ROM_LOAD16_BYTE( "m5egr_p1", 0x000000, 0x080000, CRC(07a5b281) SHA1(cd755089a6a5db5d6923e3fb1660d2748af57b4e) )
+	ROM_LOAD16_BYTE( "m5egr_p2", 0x000001, 0x080000, CRC(2f0a54dc) SHA1(c0a4fd277b6b8cae9109222961c4c86f0a9b9103) )
+	ROM_LOAD16_BYTE( "m5egr_p3", 0x100000, 0x080000, CRC(a485956c) SHA1(9d16ef5d060ee663d7f68b9f5bd00ccad7a58825) )
+	ROM_LOAD16_BYTE( "m5egr_p4", 0x100001, 0x080000, CRC(84fe0436) SHA1(f8a072ae19314dde195e4fde5032aba041e72703) )
+ROM_END
+
 ROM_START( m5egra ) // these should probably be split into odd/even
 	ROM_REGION( 0x400000, "maincpu", 0 )
 	ROM_LOAD( "egrw0_2.bin", 0x000000, 0x200000, CRC(7e4743d7) SHA1(2beb4600b7d05b8a6552101b13c804044c69fb86) )
@ -5651,6 +5776,14 @@ ROM_START( m5egra ) // these should probably be split into odd/even
 	ROM_LOAD( "egrw0_2de.bin", 0x000000, 0x200000, CRC(171ba8e0) SHA1(191b7142b405df5d591fc1b9513a7ba3856bf613) )
 ROM_END

+ROM_START( m5evgrhr ) // elvis_gold_red_hot_roll_(barcrest)_[c01_800_25jp].hex
+	ROM_REGION( 0x400000, "maincpu", 0 )
+	ROM_LOAD16_BYTE( "m5evgrhr_p1", 0x000000, 0x080000, CRC(43a5f54e) SHA1(bf84a27da357206bed44abac72802a0572923066) )
+	ROM_LOAD16_BYTE( "m5evgrhr_p2", 0x000001, 0x080000, CRC(6fc39a43) SHA1(6c8711f5c76dd1e2f3d14f89da6ef7a98c833049) )
+	ROM_LOAD16_BYTE( "m5evgrhr_p3", 0x100000, 0x080000, CRC(3a9a1c94) SHA1(f135904aa4b33d709830c5baebbc604d7b2873ee) )
+	ROM_LOAD16_BYTE( "m5evgrhr_p4", 0x100001, 0x080000, CRC(235dee6d) SHA1(fbc6c82cac5cad16f1190193109de78844d2e482) )
+ROM_END
+
 ROM_START( m5evgrhra ) // these should probably be split into odd/even
 	ROM_REGION( 0x400000, "maincpu", 0 )
 	ROM_LOAD( "errw0_2.bin", 0x000000, 0x200000, CRC(2b352b8b) SHA1(4c514f304d4d5eee53c450059edb62eabde8838e) )
@ -5661,6 +5794,14 @@ ROM_START( m5evgrhra ) // these should probably be split into odd/even
 	ROM_LOAD( "errw0_2de.bin", 0x000000, 0x200000, CRC(72f3ed0d) SHA1(0dec445dc21aadfcbd35ce7f2fbc216e9abaa723) )
 ROM_END

+ROM_START( m5egss ) // elvis_gold_super_streak_(barcrest)_[c01_800_25jp].hex
+	ROM_REGION( 0x400000, "maincpu", 0 )
+	ROM_LOAD16_BYTE( "m5egss_p1", 0x000000, 0x080000, CRC(40b520b3) SHA1(2d8e827a00dba1f09e66cb0329ba332fc05335bb) )
+	ROM_LOAD16_BYTE( "m5egss_p2", 0x000001, 0x080000, CRC(47504b14) SHA1(82ee76f4299dc9b92b774eb4ecfbc618a90465ab) )
+	ROM_LOAD16_BYTE( "m5egss_p3", 0x100000, 0x080000, CRC(f8f38e74) SHA1(25a815f7c694eca441116cde78c6159b8640b4b9) )
+	ROM_LOAD16_BYTE( "m5egss_p4", 0x100001, 0x080000, CRC(4e68217a) SHA1(172cb7bd733b6c9f5da64ca50b9ad8457c0491b8) )
+ROM_END
+
 ROM_START( m5egssa )
 	ROM_REGION( 0x400000, "maincpu", 0 )
 	ROM_LOAD( "essw0_1.bin", 0x000000, 0x200000, CRC(069a7b18) SHA1(da08a297de367b226d41d81905600c070c02634e) )
@ -6512,42 +6653,105 @@ GAME( 199?, m5draclb	,0,			mpu5, mpu5, 0, ROT0, "Barcrest","Ooh Aah Dracula Club
 GAME( 199?, m5draclb07	,m5draclb,	mpu5, mpu5, 0, ROT0, "Barcrest","Ooh Aah Dracula Club (Barcrest) (MPU5) (set 2)", GAME_IS_SKELETON_MECHANICAL )
 GAME( 199?, m5draclb01	,m5draclb,	mpu5, mpu5, 0, ROT0, "Barcrest","Ooh Aah Dracula Club (Barcrest) (MPU5) (set 3)", GAME_IS_SKELETON_MECHANICAL )

-GAME( 199?, m5ewn		,0,			mpu5, mpu5, 0, ROT0, "Barcrest","Each Way Nudge (Barcrest) (MPU5)", GAME_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5elim		,0,			mpu5, mpu5, 0, ROT0, "Barcrest","Eliminator (Barcrest) (MPU5)", GAME_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5ewn		,0,			mpu5, mpu5, 0, ROT0, "Barcrest","Each Way Nudge (Barcrest) (MPU5) (set 1)", GAME_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5ewn08		,m5ewn,		mpu5, mpu5, 0, ROT0, "Barcrest","Each Way Nudge (Barcrest) (MPU5) (set 2)", GAME_IS_SKELETON_MECHANICAL )
+
+GAME( 199?, m5elim		,0,			mpu5, mpu5, 0, ROT0, "Barcrest","Eliminator (Barcrest) (MPU5) (set 1)", GAME_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5elim03	,0,			mpu5, mpu5, 0, ROT0, "Barcrest","Eliminator (Barcrest) (MPU5) (set 2)", GAME_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5elim04	,0,			mpu5, mpu5, 0, ROT0, "Barcrest","Eliminator (Barcrest) (MPU5) (set 3)", GAME_IS_SKELETON_MECHANICAL )
+
 GAME( 199?, m5egr		,0,			mpu5, mpu5, 0, ROT0, "Barcrest","Elvis Gold Rush (Barcrest) (MPU5, set 1)", GAME_IS_SKELETON_MECHANICAL )
 GAME( 199?, m5egra		,m5egr,		mpu5, mpu5, 0, ROT0, "Barcrest","Elvis Gold Rush (Barcrest) (MPU5, set 2)", GAME_IS_SKELETON_MECHANICAL )
+
 GAME( 199?, m5egss		,0,			mpu5, mpu5, 0, ROT0, "Barcrest","Elvis Gold Super Streak (Barcrest) (MPU5, set 1)", GAME_IS_SKELETON_MECHANICAL )
 GAME( 199?, m5egssa		,m5egss,	mpu5, mpu5, 0, ROT0, "Barcrest","Elvis Gold Super Streak (Barcrest) (MPU5, set 2)", GAME_IS_SKELETON_MECHANICAL )
+
 GAME( 199?, m5evgrhr	,0,			mpu5, mpu5, 0, ROT0, "Barcrest","Elvis Gold Red Hot Roll (Barcrest) (MPU5, set 1)", GAME_IS_SKELETON_MECHANICAL )
 GAME( 199?, m5evgrhra	,m5evgrhr,	mpu5, mpu5, 0, ROT0, "Barcrest","Elvis Gold Red Hot Roll (Barcrest) (MPU5, set 2)", GAME_IS_SKELETON_MECHANICAL )
+
 GAME( 199?, m5xchn		,0,			mpu5, mpu5, 0, ROT0, "Barcrest","Exchanges Unlimited (Barcrest) (MPU5)", GAME_IS_SKELETON_MECHANICAL )
+
 GAME( 199?, m5firebl	,0,			mpu5, mpu5, 0, ROT0, "Barcrest","Fireball (Barcrest) (MPU5)", GAME_IS_SKELETON_MECHANICAL )
+
 GAME( 199?, m5flipcr	,0,			mpu5, mpu5, 0, ROT0, "Barcrest","Flippin Crazy (Barcrest) (MPU5)", GAME_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5fortby	,0,			mpu5, mpu5, 0, ROT0, "Barcrest","Fort Boyard (Barcrest) (MPU5)", GAME_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5frnzy		,0,			mpu5, mpu5, 0, ROT0, "Barcrest","Frenzy (Barcrest) (MPU5)", GAME_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5beans		,0,			mpu5, mpu5, 0, ROT0, "Barcrest","Full Of Beans (Barcrest) (MPU5)", GAME_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5funsun	,0,			mpu5, mpu5, 0, ROT0, "Barcrest","Fun In The Sun (Barcrest) (MPU5)", GAME_IS_SKELETON_MECHANICAL )
+
+GAME( 199?, m5fortby	,0,			mpu5, mpu5, 0, ROT0, "Barcrest","Fort Boyard (Barcrest) (MPU5) (set 1)", GAME_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5fortby01	,m5fortby,	mpu5, mpu5, 0, ROT0, "Barcrest","Fort Boyard (Barcrest) (MPU5) (set 2)", GAME_IS_SKELETON_MECHANICAL )
+
+GAME( 199?, m5frnzy		,0,			mpu5, mpu5, 0, ROT0, "Barcrest","Frenzy (Barcrest) (MPU5) (set 1)", GAME_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5frnzya	,m5frnzy,	mpu5, mpu5, 0, ROT0, "Barcrest","Frenzy (Barcrest) (MPU5) (set 2)", GAME_IS_SKELETON_MECHANICAL )
+
+GAME( 199?, m5beans		,0,			mpu5, mpu5, 0, ROT0, "Barcrest","Full Of Beans (Barcrest) (MPU5) (set 1)", GAME_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5beansa	,m5beans,	mpu5, mpu5, 0, ROT0, "Barcrest","Full Of Beans (Barcrest) (MPU5) (set 2)", GAME_IS_SKELETON_MECHANICAL )
+
+GAME( 199?, m5funsun	,0,			mpu5, mpu5, 0, ROT0, "Barcrest","Fun In The Sun (Barcrest) (MPU5) (set 1)", GAME_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5funsun03	,m5funsun,	mpu5, mpu5, 0, ROT0, "Barcrest","Fun In The Sun (Barcrest) (MPU5) (set 2)", GAME_IS_SKELETON_MECHANICAL )
+
 GAME( 199?, m5gimmie	,0,			mpu5, mpu5, 0, ROT0, "Barcrest","Gimmie Gimmie Gimmie (Barcrest) (MPU5)", GAME_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5grush		,0,			mpu5, mpu5, 0, ROT0, "Barcrest","Gold Rush (Barcrest) (MPU5)", GAME_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5grush5	,0,			mpu5, mpu5, 0, ROT0, "Barcrest","Gold Rush Five Liner (Barcrest) (MPU5)", GAME_IS_SKELETON_MECHANICAL )
+
+GAME( 199?, m5grush		,0,			mpu5, mpu5, 0, ROT0, "Barcrest","Gold Rush (Barcrest) (MPU5) (set 1)", GAME_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5grush10	,m5grush,	mpu5, mpu5, 0, ROT0, "Barcrest","Gold Rush (Barcrest) (MPU5) (set 2)", GAME_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5grush04	,m5grush,	mpu5, mpu5, 0, ROT0, "Barcrest","Gold Rush (Barcrest) (MPU5) (set 3)", GAME_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5grush03	,m5grush,	mpu5, mpu5, 0, ROT0, "Barcrest","Gold Rush (Barcrest) (MPU5) (set 4)", GAME_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5grush02	,m5grush,	mpu5, mpu5, 0, ROT0, "Barcrest","Gold Rush (Barcrest) (MPU5) (set 5)", GAME_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5grush01	,m5grush,	mpu5, mpu5, 0, ROT0, "Barcrest","Gold Rush (Barcrest) (MPU5) (set 6)", GAME_IS_SKELETON_MECHANICAL )
+
+GAME( 199?, m5grush5	,0,			mpu5, mpu5, 0, ROT0, "Barcrest","Gold Rush Five Liner (Barcrest) (MPU5) (set 1)", GAME_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5grush504	,m5grush5,	mpu5, mpu5, 0, ROT0, "Barcrest","Gold Rush Five Liner (Barcrest) (MPU5) (set 2)", GAME_IS_SKELETON_MECHANICAL )
+
 GAME( 199?, m5gruss		,0,			mpu5, mpu5, 0, ROT0, "Barcrest","Gold Rush Sit Down (Barcrest) (MPU5)", GAME_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5grusst	,0,			mpu5, mpu5, 0, ROT0, "Barcrest","Gold Rush Stampede (Barcrest) (MPU5)", GAME_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5gstrik	,0,			mpu5, mpu5, 0, ROT0, "Barcrest","Gold Strike (Barcrest) (MPU5)", GAME_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5gsstrk	,0,			mpu5, mpu5, 0, ROT0, "Barcrest","Gold Super Streak (Barcrest) (MPU5)", GAME_IS_SKELETON_MECHANICAL )
+
+GAME( 199?, m5grusst	,0,			mpu5, mpu5, 0, ROT0, "Barcrest","Gold Rush Stampede (Barcrest) (MPU5) (set 1)", GAME_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5grusst04	,m5grusst,	mpu5, mpu5, 0, ROT0, "Barcrest","Gold Rush Stampede (Barcrest) (MPU5) (set 2)", GAME_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5grusst03	,m5grusst,	mpu5, mpu5, 0, ROT0, "Barcrest","Gold Rush Stampede (Barcrest) (MPU5) (set 3)", GAME_IS_SKELETON_MECHANICAL )
+
+GAME( 199?, m5gstrik	,0,			mpu5, mpu5, 0, ROT0, "Barcrest","Gold Strike (Barcrest) (MPU5) (set 1)", GAME_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5gstrik11	,m5gstrik,	mpu5, mpu5, 0, ROT0, "Barcrest","Gold Strike (Barcrest) (MPU5) (set 2)", GAME_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5gstrik02	,m5gstrik,	mpu5, mpu5, 0, ROT0, "Barcrest","Gold Strike (Barcrest) (MPU5) (set 3)", GAME_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5gstrik01	,m5gstrik,	mpu5, mpu5, 0, ROT0, "Barcrest","Gold Strike (Barcrest) (MPU5) (set 4)", GAME_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5gstrik01a	,m5gstrik,	mpu5, mpu5, 0, ROT0, "Barcrest","Gold Strike (Barcrest) (MPU5) (set 5)", GAME_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5gstrika	,m5gstrik,	mpu5, mpu5, 0, ROT0, "Barcrest","Gold Strike (Barcrest) (MPU5) (set 6)", GAME_IS_SKELETON_MECHANICAL )
+
+GAME( 199?, m5gsstrk	,0,			mpu5, mpu5, 0, ROT0, "Barcrest","Gold Super Streak (Barcrest) (MPU5) (set 1)", GAME_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5gsstrk07	,m5gsstrk,	mpu5, mpu5, 0, ROT0, "Barcrest","Gold Super Streak (Barcrest) (MPU5) (set 2)", GAME_IS_SKELETON_MECHANICAL )
+
 GAME( 199?, m5gdrag		,0,			mpu5, mpu5, 0, ROT0, "Barcrest","Golden Dragon (Barcrest) (MPU5)", GAME_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5gdrgcl	,0,			mpu5, mpu5, 0, ROT0, "Barcrest","Golden Dragon Club (Barcrest) (MPU5)", GAME_IS_SKELETON_MECHANICAL )
+
+GAME( 199?, m5gdrgcl	,0,			mpu5, mpu5, 0, ROT0, "Barcrest","Golden Dragon Club (Barcrest) (MPU5) (set 1)", GAME_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5gdrgcl05	,m5gdrgcl,	mpu5, mpu5, 0, ROT0, "Barcrest","Golden Dragon Club (Barcrest) (MPU5) (set 2)", GAME_IS_SKELETON_MECHANICAL )
+
 GAME( 199?, m5gkeys		,0,			mpu5, mpu5, 0, ROT0, "Barcrest","Golden Keys (Barcrest) (MPU5)", GAME_IS_SKELETON_MECHANICAL )
+
 GAME( 199?, m5hellrz	,0,			mpu5, mpu5, 0, ROT0, "Barcrest","Hellraiser (Barcrest) (MPU5)", GAME_IS_SKELETON_MECHANICAL )
+
 GAME( 199?, m5hlsumo	,0,			mpu5, mpu5, 0, ROT0, "Barcrest","Hi Lo Sumo (Barcrest) (MPU5)", GAME_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5hifly		,0,			mpu5, mpu5, 0, ROT0, "Barcrest","High Flyer (Barcrest) (MPU5)", GAME_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5holy		,0,			mpu5, mpu5, 0, ROT0, "Barcrest","The Holy Grail (Barcrest) (MPU5)", GAME_IS_SKELETON_MECHANICAL )
+
+GAME( 199?, m5hifly		,0,			mpu5, mpu5, 0, ROT0, "Barcrest","High Flyer (Barcrest) (MPU5) (set 1)", GAME_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5hifly03	,m5hifly,	mpu5, mpu5, 0, ROT0, "Barcrest","High Flyer (Barcrest) (MPU5) (set 2)", GAME_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5hifly04	,m5hifly,	mpu5, mpu5, 0, ROT0, "Barcrest","High Flyer (Barcrest) (MPU5) (set 3)", GAME_IS_SKELETON_MECHANICAL )
+
+GAME( 199?, m5holy		,0,			mpu5, mpu5, 0, ROT0, "Barcrest","The Holy Grail (Barcrest) (MPU5) (set 1)", GAME_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5holy10	,m5holy,	mpu5, mpu5, 0, ROT0, "Barcrest","The Holy Grail (Barcrest) (MPU5) (set 2)", GAME_IS_SKELETON_MECHANICAL )
+
 GAME( 199?, m5hotslt	,0,			mpu5, mpu5, 0, ROT0, "Barcrest","Hot Slot (Barcrest) (MPU5)", GAME_IS_SKELETON_MECHANICAL )
+
 GAME( 199?, m5hotstf	,0,			mpu5, mpu5, 0, ROT0, "Barcrest","Hot Stuff (Barcrest) (MPU5)", GAME_IS_SKELETON_MECHANICAL )
+
 GAME( 199?, m5hypvip	,0,			mpu5, mpu5, 0, ROT0, "Barcrest","Hyper Viper (Barcrest) (MPU5)", GAME_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5jackpt	,0,			mpu5, mpu5, 0, ROT0, "Barcrest","Jackpoteers (Barcrest) (MPU5)", GAME_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5jackp2	,0,			mpu5, mpu5, 0, ROT0, "Barcrest","Jackpoteers 2 (Barcrest) (MPU5)", GAME_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5jlyjwl	,0,			mpu5, mpu5, 0, ROT0, "Barcrest","Jolly Jewels (Barcrest) (MPU5)", GAME_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5jlyrog	,0,			mpu5, mpu5, 0, ROT0, "Barcrest","Jolly Roger (Barcrest) (MPU5)", GAME_IS_SKELETON_MECHANICAL )
+
+GAME( 199?, m5jackpt	,0,			mpu5, mpu5, 0, ROT0, "Barcrest","Jackpoteers (Barcrest) (MPU5) (set 1)", GAME_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5jackpt07	,m5jackpt,	mpu5, mpu5, 0, ROT0, "Barcrest","Jackpoteers (Barcrest) (MPU5) (set 2)", GAME_IS_SKELETON_MECHANICAL )
+
+GAME( 199?, m5jackp2	,0,			mpu5, mpu5, 0, ROT0, "Barcrest","Jackpoteers 2 (Barcrest) (MPU5) (set 1)", GAME_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5jackp2a	,m5jackp2,	mpu5, mpu5, 0, ROT0, "Barcrest","Jackpoteers 2 (Barcrest) (MPU5) (set 2)", GAME_IS_SKELETON_MECHANICAL )
+
+GAME( 199?, m5jlyjwl	,0,			mpu5, mpu5, 0, ROT0, "Barcrest","Jolly Jewels (Barcrest) (MPU5) (set 1)", GAME_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5jlyjwl01	,m5jlyjwl,	mpu5, mpu5, 0, ROT0, "Barcrest","Jolly Jewels (Barcrest) (MPU5) (set 2)", GAME_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5jlyjwl02	,m5jlyjwl,	mpu5, mpu5, 0, ROT0, "Barcrest","Jolly Jewels (Barcrest) (MPU5) (set 3)", GAME_IS_SKELETON_MECHANICAL )
+
+GAME( 199?, m5jlyrog	,0,			mpu5, mpu5, 0, ROT0, "Barcrest","Jolly Roger (Barcrest) (MPU5) (set 1)", GAME_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5jlyroga	,m5jlyrog,	mpu5, mpu5, 0, ROT0, "Barcrest","Jolly Roger (Barcrest) (MPU5) (set 2)", GAME_IS_SKELETON_MECHANICAL )
+
 GAME( 199?, m5kkebab	,0,			mpu5, mpu5, 0, ROT0, "Barcrest","King Kebab (Barcrest) (MPU5)", GAME_IS_SKELETON_MECHANICAL )
 GAME( 199?, m5kingko	,0,			mpu5, mpu5, 0, ROT0, "Barcrest","King KO (Barcrest) (MPU5)", GAME_IS_SKELETON_MECHANICAL )
 GAME( 199?, m5lotta		,0,			mpu5, mpu5, 0, ROT0, "Barcrest","Lotta Luck (Barcrest) (MPU5)", GAME_IS_SKELETON_MECHANICAL )
--- a/src/mame/drivers/pluto5.c
+++ b/src/mame/drivers/pluto5.c
@ -549,6 +549,27 @@ ROM_START( hb_ydd )
 	ROM_LOAD16_BYTE( "80001040.p2", 0x00001, 0x080000, CRC(046b5e10) SHA1(364024d5b8750d457c368ab2afd99a8118aaa309) )
 ROM_END

+ROM_START( hb_hotst )
+	ROM_REGION( 0x400000, "maincpu", ROMREGION_ERASE00 )
+	ROM_LOAD16_BYTE( "hstv0-04.u1", 0x000000, 0x080000, CRC(23043c19) SHA1(03c7b2eda9b4d975aeba3eea091b11016df35047) )
+	ROM_LOAD16_BYTE( "hstv0-04.u2", 0x000001, 0x080000, CRC(941294dc) SHA1(359f3dac97c869f9cec5367d14aa95edced7c2de) )
+
+	ROM_REGION( 0x400000, "altrevs", ROMREGION_ERASE00 )
+	ROM_LOAD16_BYTE( "hst0-04d.u1", 0x000000, 0x080000, CRC(2affa3aa) SHA1(ed3c5a0380f7d823e05164cbce85a85211fd2755) )
+	ROM_LOAD16_BYTE( "hst0-04g.u1", 0x000000, 0x080000, CRC(4bcbd10b) SHA1(c7a9c0b3cec6dafd699b67b51823b86f354c665c) )
+
+	ROM_LOAD16_BYTE( "hstv006d.u1", 0x000000, 0x080000, CRC(e9640d3f) SHA1(a51a6c3a8301fc19d15a07a4f1d1c86d13ef9141) )
+	ROM_LOAD16_BYTE( "hstv006g.u1", 0x000000, 0x080000, CRC(88507f9e) SHA1(acf1e26d7ddc6270c4025079516ad58c85630b50) )
+	ROM_LOAD16_BYTE( "hstv0-06.u1", 0x000000, 0x080000, CRC(e09f928c) SHA1(fafd8bb8c1f9e1904ef7a4dfe89eaf5a8ec6398e) )
+	ROM_LOAD16_BYTE( "hstv0-06.u2", 0x000001, 0x080000, CRC(2f9a53cc) SHA1(63e7ec37c6ee177e3d33ff2c649f743a8585bce4) )
+
+	ROM_LOAD16_BYTE( "hst0-07d.u1", 0x000000, 0x080000, CRC(baccf4e6) SHA1(bd3f6c5e1a43779f278b481dd08860be22c565a2) )
+	ROM_LOAD16_BYTE( "hst0-07g.u1", 0x000000, 0x080000, CRC(dbf88647) SHA1(c2bdabae0e4234b245541983bb8e7d43636816c9) )
+	ROM_LOAD16_BYTE( "hstv0-07.u1", 0x000000, 0x080000, CRC(b3376b55) SHA1(4c5b6f104318bea7efefb8535921a8527429392e) )
+	ROM_LOAD16_BYTE( "hstv0-07.u2", 0x000001, 0x080000, CRC(adde3b86) SHA1(95b65b9ae2c2034370c895803eb5dcac0a69a77a) )
+ROM_END
+
+


 extern void astra_addresslines( UINT16* src, size_t srcsize, int small );
@ -575,7 +596,6 @@ static DRIVER_INIT( hb )
 	#endif
 }

-
 GAME( 200?, hb_cr		,0,			pluto5, pluto5, hb, ROT0, "Qps","Cash Raker (Qps)", GAME_IS_SKELETON_MECHANICAL )
 GAME( 200?, hb_bar7		,0,			pluto5, pluto5, hb, ROT0, "Fairgames","Bar Seven (Fairgames)", GAME_IS_SKELETON_MECHANICAL )
 GAME( 200?, hb_bigx		,0,			pluto5, pluto5, hb, ROT0, "Jpm","Big X (Jpm)", GAME_IS_SKELETON_MECHANICAL )
@ -596,3 +616,5 @@ GAME( 200?, hb_rhv		,0,			pluto5, pluto5, hb, ROT0, "Qps","Red Hot Voucher (Qps)
 GAME( 200?, hb_ringb	,0,			pluto5, pluto5, hb, ROT0, "Jpm","Ring A Bell (Jpm)", GAME_IS_SKELETON_MECHANICAL )
 GAME( 200?, hb_rckrl	,0,			pluto5, pluto5, hb, ROT0, "Qps","Rock 'n' Roll (Qps)", GAME_IS_SKELETON_MECHANICAL )
 GAME( 200?, hb_ydd		,0,			pluto5, pluto5, hb, ROT0, "Qps","Yabba-Dabba-Dough (Qps)", GAME_IS_SKELETON_MECHANICAL )
+
+GAME( 200?, hb_hotst	,0,			pluto5, pluto5, hb, ROT0, "Barcrest?","Hot Stuff (Barcrest?)", GAME_IS_SKELETON_MECHANICAL ) // was in a Barcrest MPU5 set, but I doubt it is
--- a/src/mame/includes/esd16.h
+++ b/src/mame/includes/esd16.h
@ -46,7 +46,6 @@ public:
 	/* devices */
 	device_t *m_audio_cpu;
 	eeprom_device *m_eeprom;
-	DECLARE_WRITE16_MEMBER(esd16_spriteram_w);
 	DECLARE_WRITE16_MEMBER(esd16_sound_command_w);
 	DECLARE_WRITE16_MEMBER(hedpanic_platform_w);
 	DECLARE_READ16_MEMBER(esd_eeprom_r);
--- a/src/mame/mame.lst
+++ b/src/mame/mame.lst
@ -19021,7 +19021,10 @@ m5draclb	// Ooh Aah Dracula Club (Barcrest)
 m5draclb07	//
 m5draclb01	//
 m5ewn		// Each Way Nudge (Barcrest)
+m5ewn08		//
 m5elim		// Eliminator (Barcrest)
+m5elim03	//
+m5elim04	//
 m5egr		// Elvis Gold Rush (Barcrest)
 m5egra		//
 m5egss		// Elvis Gold Super Streak (Barcrest)
@ -19032,30 +19035,57 @@ m5xchn		// Exchanges Unlimited (Barcrest)
 m5firebl	// Fireball (Barcrest)
 m5flipcr	// Flippin Crazy (Barcrest)
 m5fortby	// Fort Boyard (Barcrest)
+m5fortby01	//
 m5frnzy		// Frenzy (Barcrest)
+m5frnzya	//
 m5beans		// Full Of Beans (Barcrest)
+m5beansa	//
 m5funsun	// Fun In The Sun (Barcrest)
+m5funsun03	//
 m5gimmie	// Gimmie Gimmie Gimmie (Barcrest)
 m5grush		// Gold Rush (Barcrest)
+m5grush10	//
+m5grush04	//
+m5grush03	//
+m5grush02	//
+m5grush01	//
 m5grush5	// Gold Rush Five Liner (Barcrest)
+m5grush504	//
 m5gruss		// Gold Rush Sit Down (Barcrest)
 m5grusst	// Gold Rush Stampede (Barcrest)
+m5grusst04	//
+m5grusst03	//
 m5gstrik	// Gold Strike (Barcrest)
+m5gstrik11	//
+m5gstrik02	//
+m5gstrik01	//
+m5gstrik01a	//
+m5gstrika	//
 m5gsstrk	// Gold Super Streak (Barcrest)
+m5gsstrk07	//
 m5gdrag		// Golden Dragon (Barcrest)
 m5gdrgcl	// Golden Dragon Club (Barcrest)
+m5gdrgcl05	//
 m5gkeys		// Golden Keys (Barcrest)
 m5hellrz	// Hellraiser (Barcrest)
 m5hlsumo	// Hi Lo Sumo (Barcrest)
 m5hifly		// High Flyer (Barcrest)
+m5hifly03	//
+m5hifly04	//
 m5holy		// The Holy Grail (Barcrest)
+m5holy10	//
 m5hotslt	// Hot Slot (Barcrest)
 m5hotstf	// Hot Stuff (Barcrest)
 m5hypvip	// Hyper Viper (Barcrest)
 m5jackpt	// Jackpoteers (Barcrest)
+m5jackpt07	//
 m5jackp2	// Jackpoteers 2 (Barcrest)
+m5jackp2a	//
 m5jlyjwl	// Jolly Jewels (Barcrest)
+m5jlyjwl01	//
+m5jlyjwl02  //
 m5jlyrog	// Jolly Roger (Barcrest)
+m5jlyroga	//
 m5kkebab	// King Kebab (Barcrest)
 m5kingko	// King KO (Barcrest)
 m5lotta		// Lotta Luck (Barcrest)
@ -20318,6 +20348,7 @@ hb_rhv		// Red Hot Voucher (Qps)
 hb_ringb	// Ring A Bell (Jpm)
 hb_rckrl	// Rock 'n' Roll (Qps)
 hb_ydd		// Yabba-Dabba-Dough (Qps)
+hb_hotst	// Hot Stuff??

 /* Summit Coin */