summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
author SomeRandomGuyIdk <49554779+SomeRandomGuyIdk@users.noreply.github.com>2022-08-09 18:14:24 +0300
committer GitHub <noreply@github.com>2022-08-10 01:14:24 +1000
commit2b06874b86ffbe524b1c1e7d5c40dad784c7757a (patch)
tree3083de31fd3cb751eb8d2ccedbd0471c6d389300 /src
parentd41ef939fd39af3f8c70eb0b11745f16a1bd5e41 (diff)
jpm/jpmsru.cpp: Added Lite a Line, and cleaned up the driver. (#10197)
* Added a postload callback to fix j_ewnc not updating reels after loading a save state. * Changed order of display digit outputs to reflect actual order in the memory map. * Cleaned up layouts. New machines marked not working ------------------ Lite a Line (Dutch) (JPM) (SRU) (revision 52)
Diffstat (limited to 'src')
-rw-r--r--src/mame/barcrest/mpu1.cpp12
-rw-r--r--src/mame/jpm/jpmsru.cpp334
-rw-r--r--src/mame/layout/j_cnudgr.lay14
-rw-r--r--src/mame/layout/j_dud.lay14
-rw-r--r--src/mame/layout/j_ewn.lay14
-rw-r--r--src/mame/layout/j_ews.lay14
-rw-r--r--src/mame/layout/j_ewsbl.lay144
-rw-r--r--src/mame/layout/j_ewsdlx.lay14
-rw-r--r--src/mame/layout/j_la.lay14
-rw-r--r--src/mame/layout/j_lal.lay373
-rw-r--r--src/mame/layout/j_lan.lay14
-rw-r--r--src/mame/layout/j_lc.lay14
-rw-r--r--src/mame/layout/j_lt.lay14
-rw-r--r--src/mame/layout/j_ndu.lay14
-rw-r--r--src/mame/layout/j_plus2.lay14
-rw-r--r--src/mame/layout/j_ssh.lay14
-rw-r--r--src/mame/layout/j_sup2p.lay14
-rw-r--r--src/mame/layout/j_super2.lay14
-rw-r--r--src/mame/layout/j_supsh.lay14
-rw-r--r--src/mame/layout/jpmsru.lay27
-rw-r--r--src/mame/layout/m_bappl2.lay6
-rw-r--r--src/mame/layout/m_bapple.lay6
-rw-r--r--src/mame/layout/m_gndgit.lay6
-rw-r--r--src/mame/layout/m_lndg.lay6
-rw-r--r--src/mame/layout/m_mtchit.lay6
-rw-r--r--src/mame/layout/m_mtchup.lay6
-rw-r--r--src/mame/layout/mpu1.lay6
-rw-r--r--src/mame/mame.lst1
28 files changed, 710 insertions, 433 deletions
diff --git a/src/mame/barcrest/mpu1.cpp b/src/mame/barcrest/mpu1.cpp
index 74d22adfce9..26183513aeb 100644
--- a/src/mame/barcrest/mpu1.cpp
+++ b/src/mame/barcrest/mpu1.cpp
@@ -510,9 +510,9 @@ ROM_END
#define GAME_FLAGS MACHINE_NOT_WORKING|MACHINE_MECHANICAL|MACHINE_REQUIRES_ARTWORK|MACHINE_SUPPORTS_SAVE
-GAMEL(1978, m_gndgit, 0, mpu1, m_gndgit, mpu1_state, empty_init, ROT0, "Barcrest", "Golden Nudge It (Barcrest) (MPU1) (5p Stake, £1 Jackpot)", GAME_FLAGS, layout_m_gndgit )
-GAMEL(1979, m_mtchit, 0, mpu1, m_mtchit, mpu1_state, empty_init, ROT0, "Barcrest", "Match It (Barcrest) (MPU1) (5p Stake, £1 Jackpot)", GAME_FLAGS, layout_m_mtchit )
-GAMEL(1981, m_mtchup, 0, mpu1, m_mtchup, mpu1_state, empty_init, ROT0, "Barcrest", "Match Up (Barcrest) (MPU1) (10p Stake, £2 Jackpot)", GAME_FLAGS, layout_m_mtchup )
-GAMEL(1980?, m_lndg, 0, mpu1_lg, m_lndg, mpu1_state, empty_init, ROT0, "Leisure Games", "Lucky Nudge (Leisure Games) (MPU1) (5p Stake, £1 Jackpot)", GAME_FLAGS, layout_m_lndg )
-GAMEL(1980?, m_bapple, 0, mpu1_lg, m_lndg, mpu1_state, empty_init, ROT0, "Leisure Games", "Big Apple (Leisure Games) (MPU1) (5p Stake, £1 Jackpot)", GAME_FLAGS, layout_m_bapple )
-GAMEL(1981?, m_bappl2, 0, mpu1_lg, m_lndg, mpu1_state, empty_init, ROT0, "Leisure Games", "Big Apple (Leisure Games) (MPU1) (5p Stake, £2 Jackpot)", GAME_FLAGS, layout_m_bappl2 ) // Remade version with different sounds etc.
+GAMEL(1978, m_gndgit, 0, mpu1, m_gndgit, mpu1_state, empty_init, ROT0, "Barcrest", u8"Golden Nudge It (Barcrest) (MPU1) (5p Stake, £1 Jackpot)", GAME_FLAGS, layout_m_gndgit )
+GAMEL(1979, m_mtchit, 0, mpu1, m_mtchit, mpu1_state, empty_init, ROT0, "Barcrest", u8"Match It (Barcrest) (MPU1) (5p Stake, £1 Jackpot)", GAME_FLAGS, layout_m_mtchit )
+GAMEL(1981, m_mtchup, 0, mpu1, m_mtchup, mpu1_state, empty_init, ROT0, "Barcrest", u8"Match Up (Barcrest) (MPU1) (10p Stake, £2 Jackpot)", GAME_FLAGS, layout_m_mtchup )
+GAMEL(1980?, m_lndg, 0, mpu1_lg, m_lndg, mpu1_state, empty_init, ROT0, "Leisure Games", u8"Lucky Nudge (Leisure Games) (MPU1) (5p Stake, £1 Jackpot)", GAME_FLAGS, layout_m_lndg )
+GAMEL(1980?, m_bapple, 0, mpu1_lg, m_lndg, mpu1_state, empty_init, ROT0, "Leisure Games", u8"Big Apple (Leisure Games) (MPU1) (5p Stake, £1 Jackpot)", GAME_FLAGS, layout_m_bapple )
+GAMEL(1981?, m_bappl2, 0, mpu1_lg, m_lndg, mpu1_state, empty_init, ROT0, "Leisure Games", u8"Big Apple (Leisure Games) (MPU1) (5p Stake, £2 Jackpot)", GAME_FLAGS, layout_m_bappl2 ) // Remade version with different sounds etc.
diff --git a/src/mame/jpm/jpmsru.cpp b/src/mame/jpm/jpmsru.cpp
index d6a544e658d..a919808daef 100644
--- a/src/mame/jpm/jpmsru.cpp
+++ b/src/mame/jpm/jpmsru.cpp
@@ -58,6 +58,8 @@
#include "netlist/nl_setup.h"
+namespace {
+
#include "jpmsru.lh"
#include "j_cnudgr.lh"
#include "j_dud.lh"
@@ -65,6 +67,7 @@
#include "j_ews.lh"
#include "j_ewsdlx.lh"
#include "j_la.lh"
+#include "j_lal.lh"
#include "j_lan.lh"
#include "j_lc.lh"
#include "j_lt.lh"
@@ -106,12 +109,12 @@ public:
void ews(machine_config &config);
void lt(machine_config &config);
void sup2p(machine_config &config);
-
- void init_jpmsru();
+ void lal(machine_config &config);
template <unsigned N> DECLARE_READ_LINE_MEMBER(opto_r) { return m_opto[N]; }
protected:
virtual void machine_start() override;
+ virtual void device_post_load() override;
template <unsigned N> DECLARE_WRITE_LINE_MEMBER(opto_cb) { m_opto[N] = state; }
@@ -131,6 +134,7 @@ protected:
void out_lamp_w(offs_t offset, uint8_t data);
void out_lamp_ext_w(offs_t offset, uint8_t data);
void out_disp_w(offs_t offset, uint8_t data);
+ void out_disp_6digit_w(offs_t offset, uint8_t data);
void out_payout_cash_w(offs_t offset, uint8_t data);
void out_payout_token_w(offs_t offset, uint8_t data);
void out_payout_2x50p_a_w(offs_t offset, uint8_t data);
@@ -154,16 +158,16 @@ protected:
void outputs_super2(address_map &map);
void outputs_ews(address_map &map);
void outputs_sup2p(address_map &map);
+ void outputs_lal(address_map &map);
- bool m_int1;
- bool m_int2;
- bool m_int1_en;
- bool m_int2_en;
- int m_reelbits[4];
+ uint8_t m_int1;
+ uint8_t m_int2;
+ uint8_t m_int1_en;
+ uint8_t m_int2_en;
+ uint8_t m_reelbits[4];
bool m_opto[4];
- int m_disp_digit;
- bool m_disp_d1;
- bool m_disp_d2;
+ uint8_t m_disp_digit;
+ bool m_disp_select[6];
uint8_t m_logicext_addr;
bool m_logicext_data;
bool m_busext_bdir;
@@ -178,7 +182,7 @@ protected:
required_ioport_array<4> m_inputs;
required_device_array<stepper_device, 4> m_reel;
output_finder<104> m_lamp;
- output_finder<2> m_digits;
+ output_finder<6> m_digits;
required_device_array<netlist_mame_logic_input_device, 6> m_audio_in;
required_device<fruit_samples_device> m_samples;
@@ -233,6 +237,7 @@ void jpmsru_state::jpmsru_6k_map(address_map &map)
void jpmsru_state::jpmsru_io(address_map &map)
{
+ map.global_mask(0xff);
map(0x00, 0x2f).r(FUNC(jpmsru_state::inputs_r));
map(0x00, 0x1f).w(FUNC(jpmsru_state::reel_w));
map(0x70, 0x7b).w(FUNC(jpmsru_state::audio_w));
@@ -405,6 +410,18 @@ void jpmsru_dac_state::outputs_lc(address_map &map)
map(0x6e, 0x6f).w(FUNC(jpmsru_dac_state::out_50p_lockout_w));
}
+void jpmsru_state::outputs_lal(address_map &map)
+{
+ jpmsru_busext_io(map);
+
+ map(0x3a, 0x3b).w(FUNC(jpmsru_state::out_meter_w<0>));
+ map(0x3e, 0x3f).w(FUNC(jpmsru_state::out_payout_cash_w));
+ map(0x42, 0x55).w(FUNC(jpmsru_state::out_disp_6digit_w));
+ map(0x5c, 0x6b).w(FUNC(jpmsru_state::out_logicext_w)); // Last bit (reset) is cut off, not used or earlier extender board with no reset line?
+ map(0x6c, 0x6d).w(FUNC(jpmsru_state::out_meter_w<1>));
+ map(0x6e, 0x6f).w(FUNC(jpmsru_state::out_coin_lockout_w));
+}
+
uint8_t jpmsru_state::inputs_r(offs_t offset)
{
return BIT(m_inputs[(offset & 0x18) >> 3]->read(), offset & 0x7);
@@ -448,13 +465,32 @@ void jpmsru_state::out_disp_w(offs_t offset, uint8_t data)
case 1:
case 2:
case 3: m_disp_digit = (m_disp_digit & ~(1 << offset)) | (data ? 0 : (1 << offset)); break;
- case 4: m_disp_d1 = data; break;
- case 5: m_disp_d2 = data; break;
+ case 4:
+ case 5: m_disp_select[offset - 4] = data; break;
}
static constexpr uint8_t patterns[16] = { 0x3f,0x06,0x5b,0x4f,0x66,0x6d,0x7d,0x07,0x7f,0x6f,0,0,0,0,0,0 };
- if(m_disp_d1) m_digits[1] = patterns[m_disp_digit];
- if(m_disp_d2) m_digits[0] = patterns[m_disp_digit];
+ for(int i = 0; i < 2; i++) if(m_disp_select[i]) m_digits[i] = patterns[m_disp_digit];
+}
+
+void jpmsru_state::out_disp_6digit_w(offs_t offset, uint8_t data)
+{
+ switch(offset)
+ {
+ case 0:
+ case 1:
+ case 2:
+ case 3: m_disp_digit = (m_disp_digit & ~(1 << offset)) | (data ? 0 : (1 << offset)); break;
+ case 4:
+ case 5:
+ case 6:
+ case 7:
+ case 8:
+ case 9: m_disp_select[offset - 4] = data; break;
+ }
+
+ static constexpr uint8_t patterns[16] = { 0x3f,0x06,0x5b,0x4f,0x66,0x6d,0x7d,0x07,0x7f,0x6f,0,0,0,0,0,0 };
+ for(int i = 0; i < 6; i++) if(m_disp_select[i]) m_digits[i] = patterns[m_disp_digit];
}
template<unsigned Meter>
@@ -507,8 +543,8 @@ void jpmsru_state::out_logicext_w(offs_t offset, uint8_t data)
{
switch(offset)
{
- case 0: out_lamp_ext_w(m_logicext_addr, m_logicext_data); break; /* j_lc has solely lamps as outputs and is the only dumped
- game to use this, so keep things simple for now */
+ case 0: out_lamp_ext_w(m_logicext_addr, !m_logicext_data); break; /* All dumped games use solely lamps as outputs,
+ so keep things simple for now */
case 1: m_logicext_data = data; break;
case 2:
case 3:
@@ -661,11 +697,11 @@ static INPUT_PORTS_START( j_ewn )
PORT_INCLUDE( jpmsru_inputs )
PORT_MODIFY("IN1")
- PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_POKER_HOLD1 ) PORT_NAME("Hold 1")
- PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_POKER_HOLD2 ) PORT_NAME("Hold 2")
- PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_POKER_HOLD3 ) PORT_NAME("Hold 3")
+ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_POKER_HOLD1 )
+ PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_POKER_HOLD2 )
+ PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_POKER_HOLD3 )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_POKER_CANCEL ) PORT_NAME("Cancel/Gamble")
- PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START1 ) PORT_NAME("Start")
+ PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("Nudge Down")
PORT_MODIFY("IN2")
@@ -746,11 +782,11 @@ static INPUT_PORTS_START( j_ewn1 )
PORT_INCLUDE( jpmsru_inputs )
PORT_MODIFY("IN1")
- PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_POKER_HOLD1 ) PORT_NAME("Hold 1")
- PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_POKER_HOLD2 ) PORT_NAME("Hold 2")
- PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_POKER_HOLD3 ) PORT_NAME("Hold 3")
+ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_POKER_HOLD1 )
+ PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_POKER_HOLD2 )
+ PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_POKER_HOLD3 )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_POKER_CANCEL ) PORT_NAME("Cancel/Gamble")
- PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START1 ) PORT_NAME("Start")
+ PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("Nudge Down")
PORT_MODIFY("IN2")
@@ -770,11 +806,11 @@ static INPUT_PORTS_START( j_ndu )
PORT_INCLUDE( jpmsru_inputs )
PORT_MODIFY("IN1")
- PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_POKER_HOLD1 ) PORT_NAME("Hold 1")
- PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_POKER_HOLD2 ) PORT_NAME("Hold 2")
- PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_POKER_HOLD3 ) PORT_NAME("Hold 3")
+ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_POKER_HOLD1 )
+ PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_POKER_HOLD2 )
+ PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_POKER_HOLD3 )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_POKER_CANCEL ) PORT_NAME("Cancel/Gamble")
- PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START1 ) PORT_NAME("Start")
+ PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("Nudge Down")
PORT_MODIFY("IN2")
@@ -853,11 +889,11 @@ static INPUT_PORTS_START( j_dud )
PORT_INCLUDE( jpmsru_inputs )
PORT_MODIFY("IN1")
- PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_POKER_HOLD1 ) PORT_NAME("Hold 1")
- PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_POKER_HOLD2 ) PORT_NAME("Hold 2")
- PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_POKER_HOLD3 ) PORT_NAME("Hold 3")
+ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_POKER_HOLD1 )
+ PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_POKER_HOLD2 )
+ PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_POKER_HOLD3 )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_POKER_CANCEL ) PORT_NAME("Cancel/Gamble")
- PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START1 ) PORT_NAME("Start")
+ PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("Nudge Down")
PORT_MODIFY("IN2")
@@ -877,11 +913,11 @@ static INPUT_PORTS_START( j_lan )
PORT_INCLUDE( jpmsru_inputs )
PORT_MODIFY("IN1")
- PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_POKER_HOLD1 ) PORT_NAME("Hold 1")
- PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_POKER_HOLD2 ) PORT_NAME("Hold 2")
- PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_POKER_HOLD3 ) PORT_NAME("Hold 3")
+ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_POKER_HOLD1 )
+ PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_POKER_HOLD2 )
+ PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_POKER_HOLD3 )
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("Nudge Up")
- PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START1 ) PORT_NAME("Start")
+ PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_POKER_CANCEL ) PORT_NAME("Cancel/Gamble")
PORT_MODIFY("IN2")
@@ -919,15 +955,15 @@ static INPUT_PORTS_START( j_ews )
PORT_CONFSETTING( 0x80, "10p" )
PORT_MODIFY("IN1")
- PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_POKER_HOLD1 ) PORT_NAME("Hold 1")
- PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_POKER_HOLD2 ) PORT_NAME("Hold 2")
- PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_POKER_HOLD3 ) PORT_NAME("Hold 3")
+ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_POKER_HOLD1 )
+ PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_POKER_HOLD2 )
+ PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_POKER_HOLD3 )
PORT_DIPNAME( 0x08, 0x00, "Percentage Stabiliser" )
PORT_DIPSETTING( 0x00, DEF_STR(Off) )
PORT_DIPSETTING( 0x08, DEF_STR(On) )
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("Nudge Up")
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("Shuffle")
- PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START1 ) PORT_NAME("Start")
+ PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_POKER_CANCEL ) PORT_NAME("Cancel/Gamble")
PORT_MODIFY("IN2")
@@ -989,12 +1025,12 @@ static INPUT_PORTS_START( j_lt )
PORT_INCLUDE( jpmsru_inputs )
PORT_MODIFY("IN1")
- PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_POKER_HOLD1 ) PORT_NAME("Hold 1")
- PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_POKER_HOLD2 ) PORT_NAME("Hold 2")
- PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_POKER_HOLD3 ) PORT_NAME("Hold 3")
+ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_POKER_HOLD1 )
+ PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_POKER_HOLD2 )
+ PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_POKER_HOLD3 )
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("Nudge Up")
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("Shuffle")
- PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START1 ) PORT_NAME("Start")
+ PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_POKER_CANCEL ) PORT_NAME("Cancel/Gamble")
PORT_MODIFY("IN2")
@@ -1030,7 +1066,7 @@ static INPUT_PORTS_START( j_sup2p )
PORT_DIPSETTING( 0x08, DEF_STR(On) )
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("Nudge Up")
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("Shuffle")
- PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START1 ) PORT_NAME("Start")
+ PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_POKER_CANCEL ) PORT_NAME("Cancel/Gamble")
PORT_MODIFY("IN2")
@@ -1053,11 +1089,11 @@ static INPUT_PORTS_START( j_la )
PORT_CONFSETTING( 0x80, "2p" )
PORT_MODIFY("IN1")
- PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_POKER_HOLD1 ) PORT_NAME("Hold 1")
- PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_POKER_HOLD2 ) PORT_NAME("Hold 2")
- PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_POKER_HOLD3 ) PORT_NAME("Hold 3")
+ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_POKER_HOLD1 )
+ PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_POKER_HOLD2 )
+ PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_POKER_HOLD3 )
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("Nudge Up")
- PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START1 ) PORT_NAME("Start")
+ PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_POKER_CANCEL ) PORT_NAME("Cancel/Gamble")
PORT_MODIFY("IN2")
@@ -1075,11 +1111,11 @@ static INPUT_PORTS_START( j_cnudgr )
PORT_INCLUDE( jpmsru_inputs )
PORT_MODIFY("IN1")
- PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_POKER_HOLD1 ) PORT_NAME("Hold 1")
- PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_POKER_HOLD2 ) PORT_NAME("Hold 2")
- PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_POKER_HOLD3 ) PORT_NAME("Hold 3")
+ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_POKER_HOLD1 )
+ PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_POKER_HOLD2 )
+ PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_POKER_HOLD3 )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_POKER_CANCEL ) PORT_NAME("Cancel/Gamble")
- PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START1 ) PORT_NAME("Start")
+ PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("Feature Stop")
PORT_MODIFY("IN2")
@@ -1095,13 +1131,13 @@ static INPUT_PORTS_START( j_lc )
PORT_CONFSETTING( 0x80, "Lucky Casino (£100, 10p stake)" )
PORT_MODIFY("IN1")
- PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_POKER_HOLD1 ) PORT_NAME("Hold 1")
- PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_POKER_HOLD2 ) PORT_NAME("Hold 2")
- PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_POKER_HOLD3 ) PORT_NAME("Hold 3")
+ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_POKER_HOLD1 )
+ PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_POKER_HOLD2 )
+ PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_POKER_HOLD3 )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_POKER_HOLD4 ) PORT_NAME("Hold 4")
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_SERVICE ) PORT_NAME("Self Test")
- PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_POKER_CANCEL ) PORT_NAME("Cancel")
- PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START1 ) PORT_NAME("Start")
+ PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_POKER_CANCEL )
+ PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START1 )
PORT_DIPNAME( 0x80, 0x00, "Win Freeze" )
PORT_DIPSETTING( 0x00, DEF_STR(Off) )
PORT_DIPSETTING( 0x80, DEF_STR(On) )
@@ -1135,24 +1171,102 @@ static INPUT_PORTS_START( j_lc )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_INTERLOCK ) PORT_NAME("Back Door") PORT_CODE(KEYCODE_Q) PORT_TOGGLE
INPUT_PORTS_END
+static INPUT_PORTS_START( j_lal )
+ PORT_INCLUDE( jpmsru_inputs )
+
+ PORT_MODIFY("IN1")
+ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_POKER_HOLD1 )
+ PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_POKER_HOLD2 )
+ PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_POKER_HOLD3 )
+ PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_POKER_HOLD4 )
+ PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_SERVICE2 ) PORT_NAME("Dump Credits")
+ PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("Cancel/Collect")
+ PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START1 ) PORT_NAME("Start/Gamble")
+ PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("Take Bonus Points")
+
+ PORT_MODIFY("IN2")
+ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_GAMBLE_PAYOUT )
+ PORT_DIPNAME( 0x02, 0x00, "Test Hold" )
+ PORT_DIPSETTING( 0x00, "Off" )
+ PORT_DIPSETTING( 0x02, "On" )
+ PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNUSED ) // No refill key
+ PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_NAME("0,25 Fl") PORT_IMPULSE(1)
+ PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_COIN3 ) PORT_NAME("1 Fl") PORT_IMPULSE(1)
+ PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_COIN2 ) PORT_NAME("0,50 Fl") PORT_IMPULSE(1)
+ PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_COIN4 ) PORT_NAME("2,50 Fl") PORT_IMPULSE(1)
+
+ PORT_START("DIP0")
+ PORT_DIPNAME( 0x0f, 0x00, "Credit limit" )
+ PORT_DIPSETTING( 0x00, "None" )
+ PORT_DIPSETTING( 0x01, "50" )
+ PORT_DIPSETTING( 0x02, "70" )
+ PORT_DIPSETTING( 0x04, "100" )
+ PORT_DIPSETTING( 0x08, "200" )
+ PORT_DIPNAME( 0x10, 0x10, "Coin lockout" )
+ PORT_DIPSETTING( 0x00, "Disabled (always locked)" )
+ PORT_DIPSETTING( 0x10, "Enabled" )
+ PORT_DIPUNUSED( 0x20, 0x00 )
+ PORT_DIPUNUSED( 0x40, 0x00 )
+ PORT_DIPUNUSED( 0x80, 0x00 )
+
+ PORT_START("DIP1")
+ PORT_DIPUNUSED( 0x01, 0x00 )
+ PORT_DIPUNUSED( 0x02, 0x00 )
+ PORT_DIPUNUSED( 0x04, 0x00 )
+ PORT_DIPUNUSED( 0x08, 0x00 )
+ PORT_DIPNAME( 0xf0, 0x00, "Special symbol block chance" )
+ // Chance for every spin of the machine blocking double bar from appearing on reel 2 and single/triple bar on reel 3
+ PORT_DIPSETTING( 0xf0, "36%" )
+ PORT_DIPSETTING( 0xe0, "38%" )
+ PORT_DIPSETTING( 0xd0, "40%" )
+ PORT_DIPSETTING( 0xc0, "42%" )
+ PORT_DIPSETTING( 0xb0, "44%" )
+ PORT_DIPSETTING( 0xa0, "46%" )
+ PORT_DIPSETTING( 0x90, "48%" )
+ PORT_DIPSETTING( 0x00, "50%" )
+ PORT_DIPSETTING( 0x10, "52%" )
+ PORT_DIPSETTING( 0x20, "54%" )
+ PORT_DIPSETTING( 0x30, "56%" )
+ PORT_DIPSETTING( 0x40, "58%" )
+ PORT_DIPSETTING( 0x50, "60%" )
+ PORT_DIPSETTING( 0x60, "62%" )
+ PORT_DIPSETTING( 0x70, "64%" )
+
+ PORT_START("DIP2")
+ PORT_DIPNAME( 0x0f, 0x00, "Gamble win chance" )
+ PORT_DIPSETTING( 0x0f, "36%" )
+ PORT_DIPSETTING( 0x0e, "38%" )
+ PORT_DIPSETTING( 0x0d, "40%" )
+ PORT_DIPSETTING( 0x0c, "42%" )
+ PORT_DIPSETTING( 0x0b, "44%" )
+ PORT_DIPSETTING( 0x0a, "46%" )
+ PORT_DIPSETTING( 0x09, "48%" )
+ PORT_DIPSETTING( 0x00, "50%" )
+ PORT_DIPSETTING( 0x01, "52%" )
+ PORT_DIPSETTING( 0x02, "54%" )
+ PORT_DIPSETTING( 0x03, "56%" )
+ PORT_DIPSETTING( 0x04, "58%" )
+ PORT_DIPSETTING( 0x05, "60%" )
+ PORT_DIPSETTING( 0x06, "62%" )
+ PORT_DIPSETTING( 0x07, "64%" )
+ PORT_DIPUNUSED( 0x10, 0x00 )
+ PORT_DIPUNUSED( 0x20, 0x00 )
+ PORT_DIPUNUSED( 0x40, 0x00 )
+ PORT_DIPUNUSED( 0x80, 0x00 )
+INPUT_PORTS_END
+
void jpmsru_state::machine_start()
{
m_lamp.resolve();
m_digits.resolve();
- save_item(NAME(m_reelbits[0]));
- save_item(NAME(m_reelbits[1]));
- save_item(NAME(m_reelbits[2]));
- save_item(NAME(m_reelbits[3]));
+ save_item(NAME(m_reelbits));
save_item(NAME(m_int1));
save_item(NAME(m_int2));
save_item(NAME(m_int1_en));
save_item(NAME(m_int2_en));
save_item(NAME(m_disp_digit));
-}
-void jpmsru_state::init_jpmsru()
-{
m_int1 = 0;
m_int2 = 0;
m_reelbits[0] = 0;
@@ -1162,6 +1276,13 @@ void jpmsru_state::init_jpmsru()
m_disp_digit = 0;
m_busext_mode = 0;
m_busext_addr = 0;
+ m_logicext_addr = 0;
+}
+
+void jpmsru_state::device_post_load()
+{
+ const char reelnames[4][6] = { "reel1", "reel2", "reel3", "reel4" };
+ for(int i = 0; i < 3; i++) awp_draw_reel(machine(), reelnames[i], *m_reel[i]);
}
// Base SRU with 3K ROM card
@@ -1295,6 +1416,12 @@ void jpmsru_dac_state::lc(machine_config &config)
DAC_1BIT(config, m_dac, 0).add_route(ALL_OUTPUTS, "mono", 0.5);
}
+void jpmsru_state::lal(machine_config &config)
+{
+ jpmsru_3k_busext(config);
+ m_maincpu->set_addrmap(AS_IO, &jpmsru_state::outputs_lal);
+}
+
ROM_START( j_ewn )
ROM_REGION( 0x10000, "maincpu", 0 )
ROM_LOAD( "ewn20.1", 0x0000, 0x400, CRC(e90f686b) SHA1(aec88647c6289b01149b2816845a568481b1d37f) )
@@ -1531,39 +1658,50 @@ ROM_START( j_lca )
ROM_LOAD( "lc8.5", 0x1800, 0x400, CRC(76a720bc) SHA1(c7e6a8e2e2d1b5e6fcfd560ce7a93c4b5775cef8) )
ROM_END
+ROM_START( j_lal )
+ ROM_REGION( 0x10000, "maincpu", 0 )
+ ROM_LOAD( "lal52.1", 0x0000, 0x400, CRC(b436dca1) SHA1(9c74eca6a20409b2f5804356aba9ca75f6b2ca90) )
+ ROM_LOAD( "lal52.2", 0x0400, 0x400, CRC(757ac03b) SHA1(e7c081f133e59e51298831e93ebd539f6d8e193b) )
+ ROM_LOAD( "lal52.3", 0x0800, 0x400, CRC(332e606b) SHA1(846983383a9f7ea781177712a3e4532902ae86f7) )
+ROM_END
+
+} // anonymous namespace
+
#define GAME_FLAGS MACHINE_NOT_WORKING|MACHINE_MECHANICAL|MACHINE_REQUIRES_ARTWORK|MACHINE_SUPPORTS_SAVE
// AWP
-GAMEL( 1979?, j_ewn, 0, ewn, j_ewn, jpmsru_state, init_jpmsru, ROT0, "JPM", "Each Way Nudger (JPM) (SRU) (revision 20, 5p Stake, £1 Jackpot)", GAME_FLAGS, layout_j_ewn )
-GAMEL( 1981?, j_ewna, j_ewn, ewn2, j_ewn2, jpmsru_state, init_jpmsru, ROT0, "JPM", "Each Way Nudger (JPM) (SRU) (revision 26A, £2 Jackpot)", GAME_FLAGS, layout_j_ewn )
-GAMEL( 1981?, j_ewnb, j_ewn, ewn2, j_ewn2, jpmsru_state, init_jpmsru, ROT0, "JPM", "Each Way Nudger (JPM) (SRU) (£2 Jackpot)", GAME_FLAGS, layout_j_ewn )
-GAMEL( 1979?, j_ewnc, j_ewn, ewn, j_ewn, jpmsru_state, init_jpmsru, ROT0, "JPM", "Each Way Nudger (JPM) (SRU) (5p Stake, £1 Jackpot)", GAME_FLAGS, layout_j_ewn ) // Earlier revision
-GAMEL( 1979?, j_ewnd, j_ewn, ewn2, j_ewn1, jpmsru_state, init_jpmsru, ROT0, "JPM", "Each Way Nudger (JPM) (SRU) (revision 23C, 5p Stake, £1 Jackpot)", GAME_FLAGS, layout_j_ewn )
-GAMEL( 1979?, j_ndu, 0, ndu, j_ndu, jpmsru_state, init_jpmsru, ROT0, "JPM", "Nudge Double Up (JPM) (SRU) (revision 17, 5p Stake, £1 Jackpot)", GAME_FLAGS, layout_j_ndu )
-GAMEL( 1979?, j_ndua, j_ndu, ndu, j_ndu, jpmsru_state, init_jpmsru, ROT0, "JPM", "Nudge Double Up (JPM) (SRU) (revision 17, 5p Stake, £1 Jackpot, lower %)", GAME_FLAGS, layout_j_ndu )
-GAMEL( 1979?, j_ndub, j_ndu, ndu, j_ndu, jpmsru_state, init_jpmsru, ROT0, "JPM", "Nudge Double Up (JPM) (SRU) (5p Stake, £1 Jackpot)", GAME_FLAGS, layout_j_ndu )
-GAMEL( 1980?, j_dud, 0, dud, j_dud, jpmsru_state, init_jpmsru, ROT0, "JPM", "Nudge Double Up Deluxe (JPM) (SRU) (revision 10, 5p Stake, £1 Jackpot)", GAME_FLAGS, layout_j_dud )
-GAMEL( 1981?, j_duda, j_dud, dud, j_dud2, jpmsru_state, init_jpmsru, ROT0, "JPM", "Nudge Double Up Deluxe (JPM) (SRU) (£2 Jackpot)", GAME_FLAGS, layout_j_dud )
-GAMEL( 1981?, j_dudb, j_dud, dud, j_dud2, jpmsru_state, init_jpmsru, ROT0, "JPM", "Nudge Double Up Deluxe (JPM) (SRU) (revision 12, £2 Jackpot)", GAME_FLAGS, layout_j_dud )
-GAMEL( 1981?, j_dt, j_dud, dud, j_dud2, jpmsru_state, init_jpmsru, ROT0, "JPM", "Double Top (JPM) (SRU) (revision 13, £2 Jackpot)", GAME_FLAGS, layout_j_dud )
-GAMEL( 1980?, j_lan, 0, lan, j_lan, jpmsru_state, init_jpmsru, ROT0, "JPM", "Lite A Nudge (JPM) (SRU) (revision 17F, 5p Stake, £1 Jackpot)", GAME_FLAGS, layout_j_lan )
-GAMEL( 1981?, j_lana, j_lan, lan, j_lan2, jpmsru_state, init_jpmsru, ROT0, "JPM", "Lite A Nudge (JPM) (SRU) (£2 Jackpot)", GAME_FLAGS, layout_j_lan )
-GAMEL( 1980?, j_lanb, j_lan, lan, j_lan, jpmsru_state, init_jpmsru, ROT0, "JPM", "Lite A Nudge (JPM) (SRU) (5p Stake, £1 Jackpot)", GAME_FLAGS, layout_j_lan )
-GAMEL( 198?, j_super2, j_lan, super2, j_super2, jpmsru_state, init_jpmsru, ROT0, "<unknown>", "Super 2 (SRU) (2p Stake, £1 Jackpot)", GAME_FLAGS, layout_j_super2 ) // £1/2p rebuild of Lite A Nudge
-GAMEL( 1981, j_ews, 0, ews, j_ews, jpmsru_state, init_jpmsru, ROT0, "JPM", "Each Way Shuffle (JPM) (SRU) (revision 8A, £2 Jackpot)", GAME_FLAGS, layout_j_ews )
-GAMEL( 1981, j_ewsa, j_ews, ews, j_ews, jpmsru_state, init_jpmsru, ROT0, "JPM", "Each Way Shuffle (JPM) (SRU) (revision 13A, £2 Jackpot)", GAME_FLAGS, layout_j_ews )
-GAMEL( 1981, j_ewsb, j_ews, ews, j_ews, jpmsru_state, init_jpmsru, ROT0, "JPM", "Each Way Shuffle (JPM) (SRU) (revision 13C, £2 Jackpot)", GAME_FLAGS, layout_j_ews )
-GAMEL( 1983?, j_ewsdlx, j_ews, ews, j_ewsdlx, jpmsru_state, init_jpmsru, ROT0, "CTL", "Each Way Shuffle Deluxe (CTL) (SRU) (£3 Jackpot)", GAME_FLAGS, layout_j_ewsdlx ) // £3 rebuild of Each Way Shuffle
-GAMEL( 1983?, j_ssh, j_ews, ews, j_ssh, jpmsru_state, init_jpmsru, ROT0, "CTL", "Silver Shuffle (CTL) (SRU) (2p Stake, £1.50 Jackpot)", GAME_FLAGS, layout_j_ssh ) // £1.50/2p rebuild of Each Way Shuffle
-GAMEL( 1983?, j_supsh, j_ews, ews, j_supsh, jpmsru_state, init_jpmsru, ROT0, "Louth Coin", "Super Shuffle (Louth Coin) (SRU) (10p Stake, £3 Jackpot)", GAME_FLAGS, layout_j_supsh ) // Rebuild of Each Way Shuffle, adds an extra symbol
-GAMEL( 1983?, j_supsha, j_ews, ews, j_supsha, jpmsru_state, init_jpmsru, ROT0, "Louth Coin", "Super Shuffle (Louth Coin) (SRU) (5p Stake, £1.50 Jackpot)", GAME_FLAGS, layout_j_supsh )
-GAMEL( 1981, j_lt, 0, lt, j_lt, jpmsru_state, init_jpmsru, ROT0, "JPM", "Lucky 2's (JPM) (SRU) (revision 9, 10p Stake, £2 Jackpot)", GAME_FLAGS, layout_j_lt )
-GAMEL( 1982, j_ts, j_lt, lt, j_lt, jpmsru_state, init_jpmsru, ROT0, "JPM", "Two Step (JPM) (SRU) (5p Stake, £2 Jackpot)", GAME_FLAGS, layout_j_lt )
-GAMEL( 198?, j_plus2, j_lt, lt, j_plus2, jpmsru_state, init_jpmsru, ROT0, "CTL", "Plus 2 (CTL) (SRU) (2p Stake, £1 Jackpot)", GAME_FLAGS, layout_j_plus2 ) // £1/2p rebuild of Lucky 2's
-GAMEL( 1983?, j_goldn2, j_lt, lt, j_plus2, jpmsru_state, init_jpmsru, ROT0, "CTL", "Golden 2's (CTL) (SRU) (2p Stake, £1.50 Jackpot)", GAME_FLAGS, layout_j_plus2 ) // £1.50 JP version of above
-GAMEL( 198?, j_sup2p, 0, sup2p, j_sup2p, jpmsru_state, init_jpmsru, ROT0, "Mdm", "Super 2p Shuffle (Mdm) (SRU) (2p Stake, £1 Jackpot)", GAME_FLAGS, layout_j_sup2p )
-GAMEL( 1983?, j_la, 0, lan, j_la, jpmsru_state, init_jpmsru, ROT0, "<unknown>", "Lucky Aces (SRU) (£1.50 Jackpot)", GAME_FLAGS, layout_j_la )
-GAMEL( 198?, j_cnudgr, 0, lan, j_cnudgr, jpmsru_state, init_jpmsru, ROT0, "<unknown>", "Cash Nudger? (SRU) (5p Stake, £2 Jackpot)", GAME_FLAGS, layout_j_cnudgr )
+GAMEL( 1979?, j_ewn, 0, ewn, j_ewn, jpmsru_state, empty_init, ROT0, "JPM", u8"Each Way Nudger (JPM) (SRU) (revision 20, 5p Stake, £1 Jackpot)", GAME_FLAGS, layout_j_ewn )
+GAMEL( 1981?, j_ewna, j_ewn, ewn2, j_ewn2, jpmsru_state, empty_init, ROT0, "JPM", u8"Each Way Nudger (JPM) (SRU) (revision 26A, £2 Jackpot)", GAME_FLAGS, layout_j_ewn )
+GAMEL( 1981?, j_ewnb, j_ewn, ewn2, j_ewn2, jpmsru_state, empty_init, ROT0, "JPM", u8"Each Way Nudger (JPM) (SRU) (£2 Jackpot)", GAME_FLAGS, layout_j_ewn )
+GAMEL( 1979?, j_ewnc, j_ewn, ewn, j_ewn, jpmsru_state, empty_init, ROT0, "JPM", u8"Each Way Nudger (JPM) (SRU) (5p Stake, £1 Jackpot)", GAME_FLAGS, layout_j_ewn ) // Earlier revision
+GAMEL( 1979?, j_ewnd, j_ewn, ewn2, j_ewn1, jpmsru_state, empty_init, ROT0, "JPM", u8"Each Way Nudger (JPM) (SRU) (revision 23C, 5p Stake, £1 Jackpot)", GAME_FLAGS, layout_j_ewn )
+GAMEL( 1979?, j_ndu, 0, ndu, j_ndu, jpmsru_state, empty_init, ROT0, "JPM", u8"Nudge Double Up (JPM) (SRU) (revision 17, 5p Stake, £1 Jackpot)", GAME_FLAGS, layout_j_ndu )
+GAMEL( 1979?, j_ndua, j_ndu, ndu, j_ndu, jpmsru_state, empty_init, ROT0, "JPM", u8"Nudge Double Up (JPM) (SRU) (revision 17, 5p Stake, £1 Jackpot, lower %)", GAME_FLAGS, layout_j_ndu )
+GAMEL( 1979?, j_ndub, j_ndu, ndu, j_ndu, jpmsru_state, empty_init, ROT0, "JPM", u8"Nudge Double Up (JPM) (SRU) (5p Stake, £1 Jackpot)", GAME_FLAGS, layout_j_ndu )
+GAMEL( 1980?, j_dud, 0, dud, j_dud, jpmsru_state, empty_init, ROT0, "JPM", u8"Nudge Double Up Deluxe (JPM) (SRU) (revision 10, 5p Stake, £1 Jackpot)", GAME_FLAGS, layout_j_dud )
+GAMEL( 1981?, j_duda, j_dud, dud, j_dud2, jpmsru_state, empty_init, ROT0, "JPM", u8"Nudge Double Up Deluxe (JPM) (SRU) (£2 Jackpot)", GAME_FLAGS, layout_j_dud )
+GAMEL( 1981?, j_dudb, j_dud, dud, j_dud2, jpmsru_state, empty_init, ROT0, "JPM", u8"Nudge Double Up Deluxe (JPM) (SRU) (revision 12, £2 Jackpot)", GAME_FLAGS, layout_j_dud )
+GAMEL( 1981?, j_dt, j_dud, dud, j_dud2, jpmsru_state, empty_init, ROT0, "JPM", u8"Double Top (JPM) (SRU) (revision 13, £2 Jackpot)", GAME_FLAGS, layout_j_dud )
+GAMEL( 1980?, j_lan, 0, lan, j_lan, jpmsru_state, empty_init, ROT0, "JPM", u8"Lite A Nudge (JPM) (SRU) (revision 17F, 5p Stake, £1 Jackpot)", GAME_FLAGS, layout_j_lan )
+GAMEL( 1981?, j_lana, j_lan, lan, j_lan2, jpmsru_state, empty_init, ROT0, "JPM", u8"Lite A Nudge (JPM) (SRU) (£2 Jackpot)", GAME_FLAGS, layout_j_lan )
+GAMEL( 1980?, j_lanb, j_lan, lan, j_lan, jpmsru_state, empty_init, ROT0, "JPM", u8"Lite A Nudge (JPM) (SRU) (5p Stake, £1 Jackpot)", GAME_FLAGS, layout_j_lan )
+GAMEL( 198?, j_super2, j_lan, super2, j_super2, jpmsru_state, empty_init, ROT0, "<unknown>", u8"Super 2 (SRU) (2p Stake, £1 Jackpot)", GAME_FLAGS, layout_j_super2 ) // £1/2p rebuild of Lite A Nudge
+GAMEL( 1981, j_ews, 0, ews, j_ews, jpmsru_state, empty_init, ROT0, "JPM", u8"Each Way Shuffle (JPM) (SRU) (revision 8A, £2 Jackpot)", GAME_FLAGS, layout_j_ews )
+GAMEL( 1981, j_ewsa, j_ews, ews, j_ews, jpmsru_state, empty_init, ROT0, "JPM", u8"Each Way Shuffle (JPM) (SRU) (revision 13A, £2 Jackpot)", GAME_FLAGS, layout_j_ews )
+GAMEL( 1981, j_ewsb, j_ews, ews, j_ews, jpmsru_state, empty_init, ROT0, "JPM", u8"Each Way Shuffle (JPM) (SRU) (revision 13C, £2 Jackpot)", GAME_FLAGS, layout_j_ews )
+GAMEL( 1983?, j_ewsdlx, j_ews, ews, j_ewsdlx, jpmsru_state, empty_init, ROT0, "CTL", u8"Each Way Shuffle Deluxe (CTL) (SRU) (£3 Jackpot)", GAME_FLAGS, layout_j_ewsdlx ) // £3 rebuild of Each Way Shuffle
+GAMEL( 1983?, j_ssh, j_ews, ews, j_ssh, jpmsru_state, empty_init, ROT0, "CTL", u8"Silver Shuffle (CTL) (SRU) (2p Stake, £1.50 Jackpot)", GAME_FLAGS, layout_j_ssh ) // £1.50/2p rebuild of Each Way Shuffle
+GAMEL( 1983?, j_supsh, j_ews, ews, j_supsh, jpmsru_state, empty_init, ROT0, "Louth Coin", u8"Super Shuffle (Louth Coin) (SRU) (10p Stake, £3 Jackpot)", GAME_FLAGS, layout_j_supsh ) // Rebuild of Each Way Shuffle, adds an extra symbol
+GAMEL( 1983?, j_supsha, j_ews, ews, j_supsha, jpmsru_state, empty_init, ROT0, "Louth Coin", u8"Super Shuffle (Louth Coin) (SRU) (5p Stake, £1.50 Jackpot)", GAME_FLAGS, layout_j_supsh )
+GAMEL( 1981, j_lt, 0, lt, j_lt, jpmsru_state, empty_init, ROT0, "JPM", u8"Lucky 2's (JPM) (SRU) (revision 9, 10p Stake, £2 Jackpot)", GAME_FLAGS, layout_j_lt )
+GAMEL( 1982, j_ts, j_lt, lt, j_lt, jpmsru_state, empty_init, ROT0, "JPM", u8"Two Step (JPM) (SRU) (5p Stake, £2 Jackpot)", GAME_FLAGS, layout_j_lt )
+GAMEL( 198?, j_plus2, j_lt, lt, j_plus2, jpmsru_state, empty_init, ROT0, "CTL", u8"Plus 2 (CTL) (SRU) (2p Stake, £1 Jackpot)", GAME_FLAGS, layout_j_plus2 ) // £1/2p rebuild of Lucky 2's
+GAMEL( 1983?, j_goldn2, j_lt, lt, j_plus2, jpmsru_state, empty_init, ROT0, "CTL", u8"Golden 2's (CTL) (SRU) (2p Stake, £1.50 Jackpot)", GAME_FLAGS, layout_j_plus2 ) // £1.50 JP version of above
+GAMEL( 198?, j_sup2p, 0, sup2p, j_sup2p, jpmsru_state, empty_init, ROT0, "Mdm", u8"Super 2p Shuffle (Mdm) (SRU) (2p Stake, £1 Jackpot)", GAME_FLAGS, layout_j_sup2p )
+GAMEL( 1983?, j_la, 0, lan, j_la, jpmsru_state, empty_init, ROT0, "<unknown>", u8"Lucky Aces (SRU) (£1.50 Jackpot)", GAME_FLAGS, layout_j_la )
+GAMEL( 198?, j_cnudgr, 0, lan, j_cnudgr, jpmsru_state, empty_init, ROT0, "<unknown>", u8"Cash Nudger? (SRU) (5p Stake, £2 Jackpot)", GAME_FLAGS, layout_j_cnudgr )
// Club
-GAMEL( 1981, j_lc, 0, lc, j_lc, jpmsru_dac_state, init_jpmsru, ROT0, "JPM", "Lucky Casino (JPM) (SRU) (revision 8A)", GAME_FLAGS, layout_j_lc )
-GAMEL( 1981, j_lca, j_lc, lc, j_lc, jpmsru_dac_state, init_jpmsru, ROT0, "JPM", "Lucky Casino (JPM) (SRU) (revision 8, lower %)", GAME_FLAGS, layout_j_lc ) // Smaller hold chance, probably revision 8B/8C
+GAMEL( 1981, j_lc, 0, lc, j_lc, jpmsru_dac_state, empty_init, ROT0, "JPM", "Lucky Casino (JPM) (SRU) (revision 8A)", GAME_FLAGS, layout_j_lc )
+GAMEL( 1981, j_lca, j_lc, lc, j_lc, jpmsru_dac_state, empty_init, ROT0, "JPM", "Lucky Casino (JPM) (SRU) (revision 8, lower %)", GAME_FLAGS, layout_j_lc ) // Smaller hold chance, probably revision 8B/8C
+// Dutch
+GAMEL( 1979?, j_lal, 0, lal, j_lal, jpmsru_state, empty_init, ROT0, "JPM", "Lite a Line (Dutch) (JPM) (SRU) (revision 52)", GAME_FLAGS, layout_j_lal )
diff --git a/src/mame/layout/j_cnudgr.lay b/src/mame/layout/j_cnudgr.lay
index 988ffc5a82e..7416baedb3f 100644
--- a/src/mame/layout/j_cnudgr.lay
+++ b/src/mame/layout/j_cnudgr.lay
@@ -5,12 +5,10 @@ license:CC0
-->
<mamelayout version="2">
<element name="matrixlamp">
- <rect state ="0">
- <bounds x="0" y="0" width="7" height="7" />
+ <rect state="0">
<color red="0.7" green="0.7" blue="0.7" />
</rect>
- <rect state ="1">
- <bounds x="0" y="0" width="7" height="7" />
+ <rect state="1">
<color red="0.95" green="0.95" blue="0.43" />
</rect>
</element>
@@ -25,12 +23,8 @@ license:CC0
</rect>
</element>
<element name="text_credits">
- <rect>
- <color red="0.0" green="0.0" blue="0.0"/>
- </rect>
<text string="Plays">
<color red="1.0" green="1.0" blue="1.0"/>
- <bounds x="0.05" y="0.05" width="0.90" height="0.90"/>
</text>
</element>
<element name="Reel 1">
@@ -123,8 +117,8 @@ license:CC0
<element ref="rect_black">
<bounds x="20" y="350" width="150" height="1"/>
</element>
- <element name="digit0" ref="LCD"><bounds x="170" y="390" width="18" height="30" /></element>
- <element name="digit1" ref="LCD"><bounds x="194" y="390" width="18" height="30" /></element>
+ <element name="digit1" ref="LCD"><bounds x="170" y="390" width="18" height="30" /></element>
+ <element name="digit0" ref="LCD"><bounds x="194" y="390" width="18" height="30" /></element>
<element ref="text_credits">
<bounds x="170" y="420" width="36" height="15"/>
</element>
diff --git a/src/mame/layout/j_dud.lay b/src/mame/layout/j_dud.lay
index 983f330a04f..ed622a9d25e 100644
--- a/src/mame/layout/j_dud.lay
+++ b/src/mame/layout/j_dud.lay
@@ -5,12 +5,10 @@ license:CC0
-->
<mamelayout version="2">
<element name="matrixlamp">
- <rect state ="0">
- <bounds x="0" y="0" width="7" height="7" />
+ <rect state="0">
<color red="0.7" green="0.7" blue="0.7" />
</rect>
- <rect state ="1">
- <bounds x="0" y="0" width="7" height="7" />
+ <rect state="1">
<color red="0.95" green="0.95" blue="0.43" />
</rect>
</element>
@@ -25,12 +23,8 @@ license:CC0
</rect>
</element>
<element name="text_credits">
- <rect>
- <color red="0.0" green="0.0" blue="0.0"/>
- </rect>
<text string="Plays">
<color red="1.0" green="1.0" blue="1.0"/>
- <bounds x="0.05" y="0.05" width="0.90" height="0.90"/>
</text>
</element>
<element name="Reel 1">
@@ -123,8 +117,8 @@ license:CC0
<element ref="rect_black">
<bounds x="20" y="350" width="150" height="1"/>
</element>
- <element name="digit0" ref="LCD"><bounds x="170" y="390" width="18" height="30" /></element>
- <element name="digit1" ref="LCD"><bounds x="194" y="390" width="18" height="30" /></element>
+ <element name="digit1" ref="LCD"><bounds x="170" y="390" width="18" height="30" /></element>
+ <element name="digit0" ref="LCD"><bounds x="194" y="390" width="18" height="30" /></element>
<element ref="text_credits">
<bounds x="170" y="420" width="36" height="15"/>
</element>
diff --git a/src/mame/layout/j_ewn.lay b/src/mame/layout/j_ewn.lay
index 8ab29c9c862..e7aefe7e165 100644
--- a/src/mame/layout/j_ewn.lay
+++ b/src/mame/layout/j_ewn.lay
@@ -5,12 +5,10 @@ license:CC0
-->
<mamelayout version="2">
<element name="matrixlamp">
- <rect state ="0">
- <bounds x="0" y="0" width="7" height="7" />
+ <rect state="0">
<color red="0.7" green="0.7" blue="0.7" />
</rect>
- <rect state ="1">
- <bounds x="0" y="0" width="7" height="7" />
+ <rect state="1">
<color red="0.95" green="0.95" blue="0.43" />
</rect>
</element>
@@ -25,12 +23,8 @@ license:CC0
</rect>
</element>
<element name="text_credits">
- <rect>
- <color red="0.0" green="0.0" blue="0.0"/>
- </rect>
<text string="Plays">
<color red="1.0" green="1.0" blue="1.0"/>
- <bounds x="0.05" y="0.05" width="0.90" height="0.90"/>
</text>
</element>
<element name="Reel 1">
@@ -123,8 +117,8 @@ license:CC0
<element ref="rect_black">
<bounds x="20" y="350" width="150" height="1"/>
</element>
- <element name="digit0" ref="LCD"><bounds x="170" y="390" width="18" height="30" /></element>
- <element name="digit1" ref="LCD"><bounds x="194" y="390" width="18" height="30" /></element>
+ <element name="digit1" ref="LCD"><bounds x="170" y="390" width="18" height="30" /></element>
+ <element name="digit0" ref="LCD"><bounds x="194" y="390" width="18" height="30" /></element>
<element ref="text_credits">
<bounds x="170" y="420" width="36" height="15"/>
</element>
diff --git a/src/mame/layout/j_ews.lay b/src/mame/layout/j_ews.lay
index 89a5da514c7..d9b939005af 100644
--- a/src/mame/layout/j_ews.lay
+++ b/src/mame/layout/j_ews.lay
@@ -5,12 +5,10 @@ license:CC0
-->
<mamelayout version="2">
<element name="matrixlamp">
- <rect state ="0">
- <bounds x="0" y="0" width="7" height="7" />
+ <rect state="0">
<color red="0.7" green="0.7" blue="0.7" />
</rect>
- <rect state ="1">
- <bounds x="0" y="0" width="7" height="7" />
+ <rect state="1">
<color red="0.95" green="0.95" blue="0.43" />
</rect>
</element>
@@ -25,12 +23,8 @@ license:CC0
</rect>
</element>
<element name="text_credits">
- <rect>
- <color red="0.0" green="0.0" blue="0.0"/>
- </rect>
<text string="Plays">
<color red="1.0" green="1.0" blue="1.0"/>
- <bounds x="0.05" y="0.05" width="0.90" height="0.90"/>
</text>
</element>
<element name="Reel 1">
@@ -123,8 +117,8 @@ license:CC0
<element ref="rect_black">
<bounds x="20" y="350" width="150" height="1"/>
</element>
- <element name="digit0" ref="LCD"><bounds x="170" y="390" width="18" height="30" /></element>
- <element name="digit1" ref="LCD"><bounds x="194" y="390" width="18" height="30" /></element>
+ <element name="digit1" ref="LCD"><bounds x="170" y="390" width="18" height="30" /></element>
+ <element name="digit0" ref="LCD"><bounds x="194" y="390" width="18" height="30" /></element>
<element ref="text_credits">
<bounds x="170" y="420" width="36" height="15"/>
</element>
diff --git a/src/mame/layout/j_ewsbl.lay b/src/mame/layout/j_ewsbl.lay
deleted file mode 100644
index da0d73abe31..00000000000
--- a/src/mame/layout/j_ewsbl.lay
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0"?>
-<!--
-Each Way Shuffle (bootleg)
-license:CC0
--->
-<mamelayout version="2">
- <element name="matrixlamp">
- <rect state ="0">
- <bounds x="0" y="0" width="7" height="7" />
- <color red="0.7" green="0.7" blue="0.7" />
- </rect>
- <rect state ="1">
- <bounds x="0" y="0" width="7" height="7" />
- <color red="0.95" green="0.95" blue="0.43" />
- </rect>
- </element>
- <element name="rect_white">
- <rect>
- <color red="1.0" green="1.0" blue="1.0"/>
- </rect>
- </element>
- <element name="rect_black">
- <rect>
- <color red="0.0" green="0.0" blue="0.0"/>
- </rect>
- </element>
- <element name="text_credits">
- <rect>
- <color red="0.0" green="0.0" blue="0.0"/>
- </rect>
- <text string="Plays">
- <color red="1.0" green="1.0" blue="1.0"/>
- <bounds x="0.05" y="0.05" width="0.90" height="0.90"/>
- </text>
- </element>
- <element name="Reel 1">
- <rect> <bounds x="0" y="0" width="100" height="400"/> <color alpha="0.0"/> </rect>
- <text string="Melon"> <bounds x="0" y="40" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
- <text string="Pear"> <bounds x="0" y="60" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
- <text string="Bell"> <bounds x="0" y="80" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
- <text string="Cherry"> <bounds x="0" y="100" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
- <text string="Bell"> <bounds x="0" y="120" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
- <text string="Pear"> <bounds x="0" y="140" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
- <text string="Cherry"> <bounds x="0" y="160" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
- <text string="Bell"> <bounds x="0" y="180" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
- <text string="Pear"> <bounds x="0" y="200" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
- <text string="Orange"> <bounds x="0" y="220" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
- <text string="Bell"> <bounds x="0" y="240" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
- <text string="Grapes"> <bounds x="0" y="260" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
- <text string="Cherry"> <bounds x="0" y="280" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
- <text string="Pear"> <bounds x="0" y="300" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
- <text string="Cherry"> <bounds x="0" y="320" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
- <text string="Orange"> <bounds x="0" y="340" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
- <text string="Pear"> <bounds x="0" y="360" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
- <text string="Jackpot"> <bounds x="0" y="380" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
- <text string="Plum"> <bounds x="0" y="0" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
- <text string="JPM"> <bounds x="0" y="20" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
- </element>
- <element name="Reel 2">
- <rect> <bounds x="0" y="0" width="100" height="400"/> <color alpha="0.0"/> </rect>
- <text string="Orange"> <bounds x="0" y="40" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
- <text string="Plum"> <bounds x="0" y="60" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
- <text string="Melon"> <bounds x="0" y="80" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
- <text string="Plum"> <bounds x="0" y="100" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
- <text string="Grapes"> <bounds x="0" y="120" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
- <text string="Melon"> <bounds x="0" y="140" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
- <text string="Orange"> <bounds x="0" y="160" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
- <text string="Plum"> <bounds x="0" y="180" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
- <text string="Cherry"> <bounds x="0" y="200" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
- <text string="Grapes"> <bounds x="0" y="220" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
- <text string="Plum"> <bounds x="0" y="240" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
- <text string="Pear"> <bounds x="0" y="260" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
- <text string="Grapes"> <bounds x="0" y="280" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
- <text string="Melon"> <bounds x="0" y="300" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
- <text string="Bell"> <bounds x="0" y="320" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
- <text string="Plum"> <bounds x="0" y="340" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
- <text string="Jackpot"> <bounds x="0" y="360" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
- <text string="Plum"> <bounds x="0" y="380" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
- <text string="Grapes"> <bounds x="0" y="0" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
- <text string="JPM"> <bounds x="0" y="20" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
- </element>
- <element name="Reel 3">
- <rect> <bounds x="0" y="0" width="100" height="400"/> <color alpha="0.0"/> </rect>
- <text string="Orange"> <bounds x="0" y="40" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
- <text string="Plum"> <bounds x="0" y="60" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
- <text string="Jackpot"> <bounds x="0" y="80" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
- <text string="Orange"> <bounds x="0" y="100" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
- <text string="Cherry"> <bounds x="0" y="120" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
- <text string="Bell"> <bounds x="0" y="140" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
- <text string="Melon"> <bounds x="0" y="160" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
- <text string="Cherry"> <bounds x="0" y="180" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
- <text string="Orange"> <bounds x="0" y="200" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
- <text string="Cherry"> <bounds x="0" y="220" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
- <text string="Orange"> <bounds x="0" y="240" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
- <text string="Pear"> <bounds x="0" y="260" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
- <text string="Cherry"> <bounds x="0" y="280" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
- <text string="Pear"> <bounds x="0" y="300" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
- <text string="Plum"> <bounds x="0" y="320" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
- <text string="Orange"> <bounds x="0" y="340" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
- <text string="Grapes"> <bounds x="0" y="360" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
- <text string="Cherry"> <bounds x="0" y="380" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
- <text string="Bell"> <bounds x="0" y="0" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
- <text string="JPM"> <bounds x="0" y="20" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
- </element>
- <element name="LCD" defstate="0">
- <led7seg>
- <color red="0.9" green="0.0" blue="0.0" />
- </led7seg>
- </element>
-
- <view name="AWP Simulated Video (No Artwork)">
- <repeat count="3">
- <param name="i" start="1" increment="1" />
- <param name="x" start="20" increment="50" />
- <element ref="rect_white">
- <bounds x="~x~" y="300" width="30" height="100"/>
- </element>
- <element ref="Reel ~i~" state="0">
- <bounds x="~x~" y="300" width="30" height="100"/>
- <yscroll name="sreel~i~" size="0.25" wrap="yes" min="65536" max="0"/>
- </element>
- </repeat>
- <element ref="rect_black">
- <bounds x="20" y="350" width="150" height="1"/>
- </element>
- <element name="digit0" ref="LCD"><bounds x="170" y="390" width="18" height="30" /></element>
- <element name="digit1" ref="LCD"><bounds x="194" y="390" width="18" height="30" /></element>
- <element ref="text_credits">
- <bounds x="170" y="420" width="36" height="15"/>
- </element>
- <repeat count="7">
- <param name="i" start="0" increment="8" />
- <param name="y" start="0" increment="8" />
- <repeat count="8">
- <param name="j" start="~i~" increment="1" />
- <param name="x" start="0" increment="8" />
- <element name="lamp~j~" ref="matrixlamp" state="0">
- <bounds x="~x~" y="~y~" width="7" height="7"/>
- </element>
- </repeat>
- </repeat>
- </view>
-</mamelayout>
-
diff --git a/src/mame/layout/j_ewsdlx.lay b/src/mame/layout/j_ewsdlx.lay
index 1676fe8d9c2..4d2c58f92cb 100644
--- a/src/mame/layout/j_ewsdlx.lay
+++ b/src/mame/layout/j_ewsdlx.lay
@@ -5,12 +5,10 @@ license:CC0
-->
<mamelayout version="2">
<element name="matrixlamp">
- <rect state ="0">
- <bounds x="0" y="0" width="7" height="7" />
+ <rect state="0">
<color red="0.7" green="0.7" blue="0.7" />
</rect>
- <rect state ="1">
- <bounds x="0" y="0" width="7" height="7" />
+ <rect state="1">
<color red="0.95" green="0.95" blue="0.43" />
</rect>
</element>
@@ -25,12 +23,8 @@ license:CC0
</rect>
</element>
<element name="text_credits">
- <rect>
- <color red="0.0" green="0.0" blue="0.0"/>
- </rect>
<text string="Plays">
<color red="1.0" green="1.0" blue="1.0"/>
- <bounds x="0.05" y="0.05" width="0.90" height="0.90"/>
</text>
</element>
<element name="Reel 1">
@@ -123,8 +117,8 @@ license:CC0
<element ref="rect_black">
<bounds x="20" y="350" width="150" height="1"/>
</element>
- <element name="digit0" ref="LCD"><bounds x="170" y="390" width="18" height="30" /></element>
- <element name="digit1" ref="LCD"><bounds x="194" y="390" width="18" height="30" /></element>
+ <element name="digit1" ref="LCD"><bounds x="170" y="390" width="18" height="30" /></element>
+ <element name="digit0" ref="LCD"><bounds x="194" y="390" width="18" height="30" /></element>
<element ref="text_credits">
<bounds x="170" y="420" width="36" height="15"/>
</element>
diff --git a/src/mame/layout/j_la.lay b/src/mame/layout/j_la.lay
index ed6c93b6a85..01e526201c4 100644
--- a/src/mame/layout/j_la.lay
+++ b/src/mame/layout/j_la.lay
@@ -5,12 +5,10 @@ license:CC0
-->
<mamelayout version="2">
<element name="matrixlamp">
- <rect state ="0">
- <bounds x="0" y="0" width="7" height="7" />
+ <rect state="0">
<color red="0.7" green="0.7" blue="0.7" />
</rect>
- <rect state ="1">
- <bounds x="0" y="0" width="7" height="7" />
+ <rect state="1">
<color red="0.95" green="0.95" blue="0.43" />
</rect>
</element>
@@ -25,12 +23,8 @@ license:CC0
</rect>
</element>
<element name="text_credits">
- <rect>
- <color red="0.0" green="0.0" blue="0.0"/>
- </rect>
<text string="Plays">
<color red="1.0" green="1.0" blue="1.0"/>
- <bounds x="0.05" y="0.05" width="0.90" height="0.90"/>
</text>
</element>
<element name="Reel 1">
@@ -123,8 +117,8 @@ license:CC0
<element ref="rect_black">
<bounds x="20" y="350" width="150" height="1"/>
</element>
- <element name="digit0" ref="LCD"><bounds x="170" y="390" width="18" height="30" /></element>
- <element name="digit1" ref="LCD"><bounds x="194" y="390" width="18" height="30" /></element>
+ <element name="digit1" ref="LCD"><bounds x="170" y="390" width="18" height="30" /></element>
+ <element name="digit0" ref="LCD"><bounds x="194" y="390" width="18" height="30" /></element>
<element ref="text_credits">
<bounds x="170" y="420" width="36" height="15"/>
</element>
diff --git a/src/mame/layout/j_lal.lay b/src/mame/layout/j_lal.lay
new file mode 100644
index 00000000000..24c86ce724a
--- /dev/null
+++ b/src/mame/layout/j_lal.lay
@@ -0,0 +1,373 @@
+<?xml version="1.0"?>
+<!--
+Lite a Line
+license:CC0
+-->
+<mamelayout version="2">
+ <element name="matrixlamp">
+ <rect state="0">
+ <color red="0.7" green="0.7" blue="0.7" />
+ </rect>
+ <rect state="1">
+ <color red="0.95" green="0.95" blue="0.43" />
+ </rect>
+ </element>
+ <element name="rect_white">
+ <rect>
+ <color red="1.0" green="1.0" blue="1.0"/>
+ </rect>
+ </element>
+ <element name="rect_black">
+ <rect>
+ <color red="0.0" green="0.0" blue="0.0"/>
+ </rect>
+ </element>
+ <element name="text_credits">
+ <text string="Credits">
+ <color red="1.0" green="1.0" blue="1.0"/>
+ </text>
+ </element>
+ <element name="text_bonus">
+ <text string="Bonus">
+ <color red="1.0" green="1.0" blue="1.0"/>
+ </text>
+ </element>
+ <element name="lamp_melon">
+ <text string="Melon" state="0">
+ <color red="0.25" green="0.25" blue="0.25"/>
+ </text>
+ <text string="Melon" state="1">
+ <color red="1.0" green="1.0" blue="1.0"/>
+ </text>
+ </element>
+ <element name="lamp_pear">
+ <text string="Pear" state="0">
+ <color red="0.25" green="0.25" blue="0.25"/>
+ </text>
+ <text string="Pear" state="1">
+ <color red="1.0" green="1.0" blue="1.0"/>
+ </text>
+ </element>
+ <element name="lamp_grapes">
+ <text string="Grapes" state="0">
+ <color red="0.25" green="0.25" blue="0.25"/>
+ </text>
+ <text string="Grapes" state="1">
+ <color red="1.0" green="1.0" blue="1.0"/>
+ </text>
+ </element>
+ <element name="lamp_bell">
+ <text string="Bell" state="0">
+ <color red="0.25" green="0.25" blue="0.25"/>
+ </text>
+ <text string="Bell" state="1">
+ <color red="1.0" green="1.0" blue="1.0"/>
+ </text>
+ </element>
+ <element name="lamp_plum">
+ <text string="Plum" state="0">
+ <color red="0.25" green="0.25" blue="0.25"/>
+ </text>
+ <text string="Plum" state="1">
+ <color red="1.0" green="1.0" blue="1.0"/>
+ </text>
+ </element>
+ <element name="lamp_orange">
+ <text string="Orange" state="0">
+ <color red="0.25" green="0.25" blue="0.25"/>
+ </text>
+ <text string="Orange" state="1">
+ <color red="1.0" green="1.0" blue="1.0"/>
+ </text>
+ </element>
+ <element name="lamp_lemon">
+ <text string="Lemon" state="0">
+ <color red="0.25" green="0.25" blue="0.25"/>
+ </text>
+ <text string="Lemon" state="1">
+ <color red="1.0" green="1.0" blue="1.0"/>
+ </text>
+ </element>
+ <element name="lamp_arrow">
+ <text string="->" state="0">
+ <color red="0.25" green="0.25" blue="0.25"/>
+ </text>
+ <text string="->" state="1">
+ <color red="1.0" green="1.0" blue="1.0"/>
+ </text>
+ </element>
+ <element name="lamp_5credits">
+ <text string="5 Credits" state="0">
+ <color red="0.25" green="0.25" blue="0.25"/>
+ </text>
+ <text string="5 Credits" state="1">
+ <color red="1.0" green="1.0" blue="1.0"/>
+ </text>
+ </element>
+ <element name="lamp_10credits">
+ <text string="10 Credits" state="0">
+ <color red="0.25" green="0.25" blue="0.25"/>
+ </text>
+ <text string="10 Credits" state="1">
+ <color red="1.0" green="1.0" blue="1.0"/>
+ </text>
+ </element>
+ <element name="lamp_20credits">
+ <text string="20 Credits" state="0">
+ <color red="0.25" green="0.25" blue="0.25"/>
+ </text>
+ <text string="20 Credits" state="1">
+ <color red="1.0" green="1.0" blue="1.0"/>
+ </text>
+ </element>
+ <element name="lamp_4bonus">
+ <text string="4 Bonus Pts" state="0">
+ <color red="0.25" green="0.25" blue="0.25"/>
+ </text>
+ <text string="4 Bonus Pts" state="1">
+ <color red="1.0" green="1.0" blue="1.0"/>
+ </text>
+ </element>
+ <element name="lamp_8bonus">
+ <text string="8 Bonus Pts" state="0">
+ <color red="0.25" green="0.25" blue="0.25"/>
+ </text>
+ <text string="8 Bonus Pts" state="1">
+ <color red="1.0" green="1.0" blue="1.0"/>
+ </text>
+ </element>
+ <element name="lamp_16bonus">
+ <text string="16 Bonus Pts" state="0">
+ <color red="0.25" green="0.25" blue="0.25"/>
+ </text>
+ <text string="16 Bonus Pts" state="1">
+ <color red="1.0" green="1.0" blue="1.0"/>
+ </text>
+ </element>
+ <element name="lamp_double">
+ <text string="Double" state="0">
+ <color red="0.25" green="0.25" blue="0.25"/>
+ </text>
+ <text string="Double" state="1">
+ <color red="1.0" green="1.0" blue="1.0"/>
+ </text>
+ </element>
+ <element name="lamp_nothing">
+ <text string="Nothing" state="0">
+ <color red="0.25" green="0.25" blue="0.25"/>
+ </text>
+ <text string="Nothing" state="1">
+ <color red="1.0" green="1.0" blue="1.0"/>
+ </text>
+ </element>
+ <element name="Reel 1">
+ <rect> <bounds x="0" y="0" width="100" height="400"/> <color alpha="0.0"/> </rect>
+ <text string="JPM"> <bounds x="0" y="20" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
+ <text string="Plum"> <bounds x="0" y="40" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
+ <text string="Bell"> <bounds x="0" y="60" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
+ <text string="Grapes"> <bounds x="0" y="80" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
+ <text string="Single Bar"> <bounds x="0" y="100" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
+ <text string="Melon"> <bounds x="0" y="120" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
+ <text string="Lemon"> <bounds x="0" y="140" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
+ <text string="Melon"> <bounds x="0" y="160" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
+ <text string="Orange*"> <bounds x="0" y="180" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
+ <text string="Double Bar"> <bounds x="0" y="200" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
+ <text string="Melon"> <bounds x="0" y="220" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
+ <text string="Lemon"> <bounds x="0" y="240" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
+ <text string="Melon"> <bounds x="0" y="260" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
+ <text string="Plum*"> <bounds x="0" y="280" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
+ <text string="Bell"> <bounds x="0" y="300" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
+ <text string="Grapes"> <bounds x="0" y="320" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
+ <text string="Orange"> <bounds x="0" y="340" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
+ <text string="Plum"> <bounds x="0" y="360" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
+ <text string="Pear"> <bounds x="0" y="380" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
+ <text string="Triple Bar"> <bounds x="0" y="0" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
+ </element>
+ <element name="Reel 2">
+ <rect> <bounds x="0" y="0" width="100" height="400"/> <color alpha="0.0"/> </rect>
+ <text string="Pear"> <bounds x="0" y="20" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
+ <text string="Lemon"> <bounds x="0" y="40" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
+ <text string="Pear"> <bounds x="0" y="60" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
+ <text string="Grapes"> <bounds x="0" y="80" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
+ <text string="Bell"> <bounds x="0" y="100" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
+ <text string="Single Bar"> <bounds x="0" y="120" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
+ <text string="Lemon*"> <bounds x="0" y="140" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
+ <text string="Pear"> <bounds x="0" y="160" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
+ <text string="Plum"> <bounds x="0" y="180" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
+ <text string="Double Bar"> <bounds x="0" y="200" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
+ <text string="Pear"> <bounds x="0" y="220" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
+ <text string="Orange"> <bounds x="0" y="240" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
+ <text string="Pear*"> <bounds x="0" y="260" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
+ <text string="JPM"> <bounds x="0" y="280" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
+ <text string="Orange"> <bounds x="0" y="300" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
+ <text string="Lemon"> <bounds x="0" y="320" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
+ <text string="Plum*"> <bounds x="0" y="340" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
+ <text string="Melon"> <bounds x="0" y="360" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
+ <text string="Lemon"> <bounds x="0" y="380" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
+ <text string="Triple Bar"> <bounds x="0" y="0" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
+ </element>
+ <element name="Reel 3">
+ <rect> <bounds x="0" y="0" width="100" height="400"/> <color alpha="0.0"/> </rect>
+ <text string="Orange"> <bounds x="0" y="20" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
+ <text string="Plum"> <bounds x="0" y="40" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
+ <text string="Lemon"> <bounds x="0" y="60" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
+ <text string="Bell*"> <bounds x="0" y="80" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
+ <text string="Plum"> <bounds x="0" y="100" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
+ <text string="Melon"> <bounds x="0" y="120" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
+ <text string="Pear"> <bounds x="0" y="140" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
+ <text string="Grapes"> <bounds x="0" y="160" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
+ <text string="Lemon"> <bounds x="0" y="180" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
+ <text string="Double Bar"> <bounds x="0" y="200" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
+ <text string="Orange"> <bounds x="0" y="220" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
+ <text string="Bell"> <bounds x="0" y="240" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
+ <text string="7"> <bounds x="0" y="260" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
+ <text string="Melon*"> <bounds x="0" y="280" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
+ <text string="Single Bar"> <bounds x="0" y="300" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
+ <text string="Grapes"> <bounds x="0" y="320" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
+ <text string="Melon"> <bounds x="0" y="340" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
+ <text string="Grapes"> <bounds x="0" y="360" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
+ <text string="Melon"> <bounds x="0" y="380" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
+ <text string="Triple Bar"> <bounds x="0" y="0" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
+ </element>
+ <element name="Reel 4">
+ <rect> <bounds x="0" y="0" width="100" height="400"/> <color alpha="0.0"/> </rect>
+ <text string="Plum"> <bounds x="0" y="20" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
+ <text string="Pear"> <bounds x="0" y="40" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
+ <text string="Plum"> <bounds x="0" y="60" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
+ <text string="Single Bar"> <bounds x="0" y="80" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
+ <text string="Orange*"> <bounds x="0" y="100" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
+ <text string="Melon"> <bounds x="0" y="120" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
+ <text string="Lemon"> <bounds x="0" y="140" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
+ <text string="Grapes"> <bounds x="0" y="160" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
+ <text string="Bell"> <bounds x="0" y="180" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
+ <text string="Double Bar"> <bounds x="0" y="200" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
+ <text string="Lemon*"> <bounds x="0" y="220" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
+ <text string="Melon"> <bounds x="0" y="240" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
+ <text string="Pear"> <bounds x="0" y="260" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
+ <text string="Plum"> <bounds x="0" y="280" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
+ <text string="Orange"> <bounds x="0" y="300" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
+ <text string="Bell"> <bounds x="0" y="320" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
+ <text string="Melon*"> <bounds x="0" y="340" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
+ <text string="Pear"> <bounds x="0" y="360" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
+ <text string="7"> <bounds x="0" y="380" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
+ <text string="Triple Bar"> <bounds x="0" y="0" width="100" height="20"/> <color red="0.0" green="0.0" blue="0.0"/> </text>
+ </element>
+ <element name="LCD" defstate="0">
+ <led7seg>
+ <color red="0.9" green="0.0" blue="0.0" />
+ </led7seg>
+ </element>
+
+ <view name="AWP Simulated Video (No Artwork)">
+ <repeat count="4">
+ <param name="i" start="1" increment="1" />
+ <param name="x" start="20" increment="60" />
+ <element ref="rect_white">
+ <bounds x="~x~" y="260" width="40" height="80"/>
+ </element>
+ <element ref="Reel ~i~" state="0">
+ <bounds x="~x~" y="260" width="40" height="80"/>
+ <yscroll name="sreel~i~" size="0.15" wrap="yes" min="65536" max="0"/>
+ </element>
+ </repeat>
+ <element ref="rect_black">
+ <bounds x="20" y="300" width="240" height="1"/>
+ </element>
+ <element name="digit3" ref="LCD"><bounds x="212" y="350" width="18" height="30" /></element>
+ <element name="digit2" ref="LCD"><bounds x="236" y="350" width="18" height="30" /></element>
+ <element name="digit1" ref="LCD"><bounds x="260" y="350" width="18" height="30" /></element>
+ <element name="digit0" ref="LCD"><bounds x="284" y="350" width="18" height="30" /></element>
+ <element name="digit5" ref="LCD"><bounds x="10" y="350" width="18" height="30" /></element>
+ <element name="digit4" ref="LCD"><bounds x="34" y="350" width="18" height="30" /></element>
+ <element ref="text_bonus">
+ <bounds x="12" y="380" width="36" height="15"/>
+ </element>
+ <element ref="text_credits">
+ <bounds x="240" y="380" width="36" height="15"/>
+ </element>
+ <repeat count="5">
+ <param name="i" start="0" increment="8" />
+ <param name="y" start="0" increment="8" />
+ <repeat count="8">
+ <param name="j" start="~i~" increment="1" />
+ <param name="x" start="0" increment="8" />
+ <element name="lamp~j~" ref="matrixlamp" state="0">
+ <bounds x="~x~" y="~y~" width="7" height="7"/>
+ </element>
+ </repeat>
+ </repeat>
+ <repeat count="7">
+ <param name="i" start="40" increment="8" />
+ <param name="y" start="48" increment="8" />
+ <repeat count="8">
+ <param name="j" start="~i~" increment="1" />
+ <param name="x" start="0" increment="8" />
+ <element name="lamp~j~" ref="matrixlamp" state="0">
+ <bounds x="~x~" y="~y~" width="7" height="7"/>
+ </element>
+ </repeat>
+ </repeat>
+ <repeat count="7">
+ <param name="y" start="130" increment="15" />
+ <param name="L" start="68" increment="1" />
+ <element name="lamp~L~" ref="lamp_arrow" state="0">
+ <bounds x="0" y="~y~" width="20" height="10"/>
+ </element>
+ </repeat>
+ <repeat count="4">
+ <param name="x" start="20" increment="60" />
+ <param name="L1" start="40" increment="1" />
+ <param name="L2" start="44" increment="1" />
+ <param name="L3" start="48" increment="1" />
+ <param name="L4" start="52" increment="1" />
+ <param name="L5" start="56" increment="1" />
+ <param name="L6" start="60" increment="1" />
+ <param name="L7" start="64" increment="1" />
+ <element name="lamp~L1~" ref="lamp_melon" state="0">
+ <bounds x="~x~" y="130" width="40" height="10"/>
+ </element>
+ <element name="lamp~L2~" ref="lamp_pear" state="0">
+ <bounds x="~x~" y="145" width="40" height="10"/>
+ </element>
+ <element name="lamp~L3~" ref="lamp_grapes" state="0">
+ <bounds x="~x~" y="160" width="40" height="10"/>
+ </element>
+ <element name="lamp~L4~" ref="lamp_bell" state="0">
+ <bounds x="~x~" y="175" width="40" height="10"/>
+ </element>
+ <element name="lamp~L5~" ref="lamp_plum" state="0">
+ <bounds x="~x~" y="190" width="40" height="10"/>
+ </element>
+ <element name="lamp~L6~" ref="lamp_orange" state="0">
+ <bounds x="~x~" y="205" width="40" height="10"/>
+ </element>
+ <element name="lamp~L7~" ref="lamp_lemon" state="0">
+ <bounds x="~x~" y="220" width="40" height="10"/>
+ </element>
+ </repeat>
+ <element name="lamp75" ref="lamp_5credits" state="0">
+ <bounds x="64" y="20" width="40" height="30"/>
+ </element>
+ <element name="lamp76" ref="lamp_10credits" state="0">
+ <bounds x="104" y="20" width="40" height="30"/>
+ </element>
+ <element name="lamp77" ref="lamp_20credits" state="0">
+ <bounds x="144" y="20" width="40" height="30"/>
+ </element>
+ <element name="lamp78" ref="lamp_4bonus" state="0">
+ <bounds x="184" y="20" width="40" height="30"/>
+ </element>
+ <element name="lamp79" ref="lamp_8bonus" state="0">
+ <bounds x="224" y="20" width="40" height="30"/>
+ </element>
+ <element name="lamp80" ref="lamp_16bonus" state="0">
+ <bounds x="264" y="20" width="40" height="30"/>
+ </element>
+ <element name="lamp9" ref="lamp_double" state="0">
+ <bounds x="100" y="60" width="40" height="30"/>
+ </element>
+ <element name="lamp10" ref="lamp_nothing" state="0">
+ <bounds x="200" y="60" width="50" height="30"/>
+ </element>
+ </view>
+</mamelayout>
diff --git a/src/mame/layout/j_lan.lay b/src/mame/layout/j_lan.lay
index c8bcb48ae10..f26cd107824 100644
--- a/src/mame/layout/j_lan.lay
+++ b/src/mame/layout/j_lan.lay
@@ -5,12 +5,10 @@ license:CC0
-->
<mamelayout version="2">
<element name="matrixlamp">
- <rect state ="0">
- <bounds x="0" y="0" width="7" height="7" />
+ <rect state="0">
<color red="0.7" green="0.7" blue="0.7" />
</rect>
- <rect state ="1">
- <bounds x="0" y="0" width="7" height="7" />
+ <rect state="1">
<color red="0.95" green="0.95" blue="0.43" />
</rect>
</element>
@@ -25,12 +23,8 @@ license:CC0
</rect>
</element>
<element name="text_credits">
- <rect>
- <color red="0.0" green="0.0" blue="0.0"/>
- </rect>
<text string="Plays">
<color red="1.0" green="1.0" blue="1.0"/>
- <bounds x="0.05" y="0.05" width="0.90" height="0.90"/>
</text>
</element>
<element name="Reel 1">
@@ -123,8 +117,8 @@ license:CC0
<element ref="rect_black">
<bounds x="20" y="350" width="150" height="1"/>
</element>
- <element name="digit0" ref="LCD"><bounds x="170" y="390" width="18" height="30" /></element>
- <element name="digit1" ref="LCD"><bounds x="194" y="390" width="18" height="30" /></element>
+ <element name="digit1" ref="LCD"><bounds x="170" y="390" width="18" height="30" /></element>
+ <element name="digit0" ref="LCD"><bounds x="194" y="390" width="18" height="30" /></element>
<element ref="text_credits">
<bounds x="170" y="420" width="36" height="15"/>
</element>
diff --git a/src/mame/layout/j_lc.lay b/src/mame/layout/j_lc.lay
index b9d4f1b09a4..cce4eb620fd 100644
--- a/src/mame/layout/j_lc.lay
+++ b/src/mame/layout/j_lc.lay
@@ -5,12 +5,10 @@ license:CC0
-->
<mamelayout version="2">
<element name="matrixlamp">
- <rect state ="0">
- <bounds x="0" y="0" width="7" height="7" />
+ <rect state="0">
<color red="0.7" green="0.7" blue="0.7" />
</rect>
- <rect state ="1">
- <bounds x="0" y="0" width="7" height="7" />
+ <rect state="1">
<color red="0.95" green="0.95" blue="0.43" />
</rect>
</element>
@@ -25,12 +23,8 @@ license:CC0
</rect>
</element>
<element name="text_credits">
- <rect>
- <color red="0.0" green="0.0" blue="0.0"/>
- </rect>
<text string="Plays">
<color red="1.0" green="1.0" blue="1.0"/>
- <bounds x="0.05" y="0.05" width="0.90" height="0.90"/>
</text>
</element>
<element name="Reel 1">
@@ -146,8 +140,8 @@ license:CC0
<element ref="rect_black">
<bounds x="20" y="360" width="240" height="1"/>
</element>
- <element name="digit0" ref="LCD"><bounds x="260" y="390" width="18" height="30" /></element>
- <element name="digit1" ref="LCD"><bounds x="284" y="390" width="18" height="30" /></element>
+ <element name="digit1" ref="LCD"><bounds x="260" y="390" width="18" height="30" /></element>
+ <element name="digit0" ref="LCD"><bounds x="284" y="390" width="18" height="30" /></element>
<element ref="text_credits">
<bounds x="260" y="420" width="36" height="15"/>
</element>
diff --git a/src/mame/layout/j_lt.lay b/src/mame/layout/j_lt.lay
index bc55e2e8e00..fe5e9d510f2 100644
--- a/src/mame/layout/j_lt.lay
+++ b/src/mame/layout/j_lt.lay
@@ -5,12 +5,10 @@ license:CC0
-->
<mamelayout version="2">
<element name="matrixlamp">
- <rect state ="0">
- <bounds x="0" y="0" width="7" height="7" />
+ <rect state="0">
<color red="0.7" green="0.7" blue="0.7" />
</rect>
- <rect state ="1">
- <bounds x="0" y="0" width="7" height="7" />
+ <rect state="1">
<color red="0.95" green="0.95" blue="0.43" />
</rect>
</element>
@@ -25,12 +23,8 @@ license:CC0
</rect>
</element>
<element name="text_credits">
- <rect>
- <color red="0.0" green="0.0" blue="0.0"/>
- </rect>
<text string="Plays">
<color red="1.0" green="1.0" blue="1.0"/>
- <bounds x="0.05" y="0.05" width="0.90" height="0.90"/>
</text>
</element>
<element name="Reel 1">
@@ -123,8 +117,8 @@ license:CC0
<element ref="rect_black">
<bounds x="20" y="350" width="150" height="1"/>
</element>
- <element name="digit0" ref="LCD"><bounds x="170" y="390" width="18" height="30" /></element>
- <element name="digit1" ref="LCD"><bounds x="194" y="390" width="18" height="30" /></element>
+ <element name="digit1" ref="LCD"><bounds x="170" y="390" width="18" height="30" /></element>
+ <element name="digit0" ref="LCD"><bounds x="194" y="390" width="18" height="30" /></element>
<element ref="text_credits">
<bounds x="170" y="420" width="36" height="15"/>
</element>
diff --git a/src/mame/layout/j_ndu.lay b/src/mame/layout/j_ndu.lay
index 1ad7e977c3a..c92e86d6570 100644
--- a/src/mame/layout/j_ndu.lay
+++ b/src/mame/layout/j_ndu.lay
@@ -5,12 +5,10 @@ license:CC0
-->
<mamelayout version="2">
<element name="matrixlamp">
- <rect state ="0">
- <bounds x="0" y="0" width="7" height="7" />
+ <rect state="0">
<color red="0.7" green="0.7" blue="0.7" />
</rect>
- <rect state ="1">
- <bounds x="0" y="0" width="7" height="7" />
+ <rect state="1">
<color red="0.95" green="0.95" blue="0.43" />
</rect>
</element>
@@ -25,12 +23,8 @@ license:CC0
</rect>
</element>
<element name="text_credits">
- <rect>
- <color red="0.0" green="0.0" blue="0.0"/>
- </rect>
<text string="Plays">
<color red="1.0" green="1.0" blue="1.0"/>
- <bounds x="0.05" y="0.05" width="0.90" height="0.90"/>
</text>
</element>
<element name="Reel 1">
@@ -123,8 +117,8 @@ license:CC0
<element ref="rect_black">
<bounds x="20" y="350" width="150" height="1"/>
</element>
- <element name="digit0" ref="LCD"><bounds x="170" y="390" width="18" height="30" /></element>
- <element name="digit1" ref="LCD"><bounds x="194" y="390" width="18" height="30" /></element>
+ <element name="digit1" ref="LCD"><bounds x="170" y="390" width="18" height="30" /></element>
+ <element name="digit0" ref="LCD"><bounds x="194" y="390" width="18" height="30" /></element>
<element ref="text_credits">
<bounds x="170" y="420" width="36" height="15"/>
</element>
diff --git a/src/mame/layout/j_plus2.lay b/src/mame/layout/j_plus2.lay
index ae197fd6d29..326c2c3e78d 100644
--- a/src/mame/layout/j_plus2.lay
+++ b/src/mame/layout/j_plus2.lay
@@ -5,12 +5,10 @@ license:CC0
-->
<mamelayout version="2">
<element name="matrixlamp">
- <rect state ="0">
- <bounds x="0" y="0" width="7" height="7" />
+ <rect state="0">
<color red="0.7" green="0.7" blue="0.7" />
</rect>
- <rect state ="1">
- <bounds x="0" y="0" width="7" height="7" />
+ <rect state="1">
<color red="0.95" green="0.95" blue="0.43" />
</rect>
</element>
@@ -25,12 +23,8 @@ license:CC0
</rect>
</element>
<element name="text_credits">
- <rect>
- <color red="0.0" green="0.0" blue="0.0"/>
- </rect>
<text string="Plays">
<color red="1.0" green="1.0" blue="1.0"/>
- <bounds x="0.05" y="0.05" width="0.90" height="0.90"/>
</text>
</element>
<element name="Reel 1">
@@ -123,8 +117,8 @@ license:CC0
<element ref="rect_black">
<bounds x="20" y="350" width="150" height="1"/>
</element>
- <element name="digit0" ref="LCD"><bounds x="170" y="390" width="18" height="30" /></element>
- <element name="digit1" ref="LCD"><bounds x="194" y="390" width="18" height="30" /></element>
+ <element name="digit1" ref="LCD"><bounds x="170" y="390" width="18" height="30" /></element>
+ <element name="digit0" ref="LCD"><bounds x="194" y="390" width="18" height="30" /></element>
<element ref="text_credits">
<bounds x="170" y="420" width="36" height="15"/>
</element>
diff --git a/src/mame/layout/j_ssh.lay b/src/mame/layout/j_ssh.lay
index cd5ffa7c435..197dd15a126 100644
--- a/src/mame/layout/j_ssh.lay
+++ b/src/mame/layout/j_ssh.lay
@@ -5,12 +5,10 @@ license:CC0
-->
<mamelayout version="2">
<element name="matrixlamp">
- <rect state ="0">
- <bounds x="0" y="0" width="7" height="7" />
+ <rect state="0">
<color red="0.7" green="0.7" blue="0.7" />
</rect>
- <rect state ="1">
- <bounds x="0" y="0" width="7" height="7" />
+ <rect state="1">
<color red="0.95" green="0.95" blue="0.43" />
</rect>
</element>
@@ -25,12 +23,8 @@ license:CC0
</rect>
</element>
<element name="text_credits">
- <rect>
- <color red="0.0" green="0.0" blue="0.0"/>
- </rect>
<text string="Plays">
<color red="1.0" green="1.0" blue="1.0"/>
- <bounds x="0.05" y="0.05" width="0.90" height="0.90"/>
</text>
</element>
<element name="Reel 1">
@@ -123,8 +117,8 @@ license:CC0
<element ref="rect_black">
<bounds x="20" y="350" width="150" height="1"/>
</element>
- <element name="digit0" ref="LCD"><bounds x="170" y="390" width="18" height="30" /></element>
- <element name="digit1" ref="LCD"><bounds x="194" y="390" width="18" height="30" /></element>
+ <element name="digit1" ref="LCD"><bounds x="170" y="390" width="18" height="30" /></element>
+ <element name="digit0" ref="LCD"><bounds x="194" y="390" width="18" height="30" /></element>
<element ref="text_credits">
<bounds x="170" y="420" width="36" height="15"/>
</element>
diff --git a/src/mame/layout/j_sup2p.lay b/src/mame/layout/j_sup2p.lay
index 6a3fe04c0ae..d3ed33c23c4 100644
--- a/src/mame/layout/j_sup2p.lay
+++ b/src/mame/layout/j_sup2p.lay
@@ -5,12 +5,10 @@ license:CC0
-->
<mamelayout version="2">
<element name="matrixlamp">
- <rect state ="0">
- <bounds x="0" y="0" width="7" height="7" />
+ <rect state="0">
<color red="0.7" green="0.7" blue="0.7" />
</rect>
- <rect state ="1">
- <bounds x="0" y="0" width="7" height="7" />
+ <rect state="1">
<color red="0.95" green="0.95" blue="0.43" />
</rect>
</element>
@@ -25,12 +23,8 @@ license:CC0
</rect>
</element>
<element name="text_credits">
- <rect>
- <color red="0.0" green="0.0" blue="0.0"/>
- </rect>
<text string="Plays">
<color red="1.0" green="1.0" blue="1.0"/>
- <bounds x="0.05" y="0.05" width="0.90" height="0.90"/>
</text>
</element>
<element name="Reel 1">
@@ -123,8 +117,8 @@ license:CC0
<element ref="rect_black">
<bounds x="20" y="350" width="150" height="1"/>
</element>
- <element name="digit0" ref="LCD"><bounds x="170" y="390" width="18" height="30" /></element>
- <element name="digit1" ref="LCD"><bounds x="194" y="390" width="18" height="30" /></element>
+ <element name="digit1" ref="LCD"><bounds x="170" y="390" width="18" height="30" /></element>
+ <element name="digit0" ref="LCD"><bounds x="194" y="390" width="18" height="30" /></element>
<element ref="text_credits">
<bounds x="170" y="420" width="36" height="15"/>
</element>
diff --git a/src/mame/layout/j_super2.lay b/src/mame/layout/j_super2.lay
index 133ec608a57..acf7deba522 100644
--- a/src/mame/layout/j_super2.lay
+++ b/src/mame/layout/j_super2.lay
@@ -5,12 +5,10 @@ license:CC0
-->
<mamelayout version="2">
<element name="matrixlamp">
- <rect state ="0">
- <bounds x="0" y="0" width="7" height="7" />
+ <rect state="0">
<color red="0.7" green="0.7" blue="0.7" />
</rect>
- <rect state ="1">
- <bounds x="0" y="0" width="7" height="7" />
+ <rect state="1">
<color red="0.95" green="0.95" blue="0.43" />
</rect>
</element>
@@ -25,12 +23,8 @@ license:CC0
</rect>
</element>
<element name="text_credits">
- <rect>
- <color red="0.0" green="0.0" blue="0.0"/>
- </rect>
<text string="Plays">
<color red="1.0" green="1.0" blue="1.0"/>
- <bounds x="0.05" y="0.05" width="0.90" height="0.90"/>
</text>
</element>
<element name="Reel 1">
@@ -123,8 +117,8 @@ license:CC0
<element ref="rect_black">
<bounds x="20" y="350" width="150" height="1"/>
</element>
- <element name="digit0" ref="LCD"><bounds x="170" y="390" width="18" height="30" /></element>
- <element name="digit1" ref="LCD"><bounds x="194" y="390" width="18" height="30" /></element>
+ <element name="digit1" ref="LCD"><bounds x="170" y="390" width="18" height="30" /></element>
+ <element name="digit0" ref="LCD"><bounds x="194" y="390" width="18" height="30" /></element>
<element ref="text_credits">
<bounds x="170" y="420" width="36" height="15"/>
</element>
diff --git a/src/mame/layout/j_supsh.lay b/src/mame/layout/j_supsh.lay
index 0c39e8a5f40..08dd7902e9d 100644
--- a/src/mame/layout/j_supsh.lay
+++ b/src/mame/layout/j_supsh.lay
@@ -5,12 +5,10 @@ license:CC0
-->
<mamelayout version="2">
<element name="matrixlamp">
- <rect state ="0">
- <bounds x="0" y="0" width="7" height="7" />
+ <rect state="0">
<color red="0.7" green="0.7" blue="0.7" />
</rect>
- <rect state ="1">
- <bounds x="0" y="0" width="7" height="7" />
+ <rect state="1">
<color red="0.95" green="0.95" blue="0.43" />
</rect>
</element>
@@ -25,12 +23,8 @@ license:CC0
</rect>
</element>
<element name="text_credits">
- <rect>
- <color red="0.0" green="0.0" blue="0.0"/>
- </rect>
<text string="Plays">
<color red="1.0" green="1.0" blue="1.0"/>
- <bounds x="0.05" y="0.05" width="0.90" height="0.90"/>
</text>
</element>
<element name="Reel 1">
@@ -123,8 +117,8 @@ license:CC0
<element ref="rect_black">
<bounds x="20" y="350" width="150" height="1"/>
</element>
- <element name="digit0" ref="LCD"><bounds x="170" y="390" width="18" height="30" /></element>
- <element name="digit1" ref="LCD"><bounds x="194" y="390" width="18" height="30" /></element>
+ <element name="digit1" ref="LCD"><bounds x="170" y="390" width="18" height="30" /></element>
+ <element name="digit0" ref="LCD"><bounds x="194" y="390" width="18" height="30" /></element>
<element ref="text_credits">
<bounds x="170" y="420" width="36" height="15"/>
</element>
diff --git a/src/mame/layout/jpmsru.lay b/src/mame/layout/jpmsru.lay
index 4f5a71483d7..f065f7378f7 100644
--- a/src/mame/layout/jpmsru.lay
+++ b/src/mame/layout/jpmsru.lay
@@ -4,12 +4,10 @@ license:CC0
-->
<mamelayout version="2">
<element name="matrixlamp">
- <rect state ="0">
- <bounds x="0" y="0" width="7" height="7" />
+ <rect state="0">
<color red="0.7" green="0.7" blue="0.7" />
</rect>
- <rect state ="1">
- <bounds x="0" y="0" width="7" height="7" />
+ <rect state="1">
<color red="0.95" green="0.95" blue="0.43" />
</rect>
</element>
@@ -59,9 +57,13 @@ license:CC0
<yscroll name="sreel~i~" size="0.25" wrap="yes" min="65536" max="0"/>
</element>
</repeat>
- <element name="digit0" ref="LCD"><bounds x="220" y="350" width="24" height="40" /></element>
- <element name="digit1" ref="LCD"><bounds x="244" y="350" width="24" height="40" /></element>
- <repeat count="13">
+ <element name="digit5" ref="LCD"><bounds x="20" y="250" width="24" height="40" /></element>
+ <element name="digit4" ref="LCD"><bounds x="44" y="250" width="24" height="40" /></element>
+ <element name="digit3" ref="LCD"><bounds x="68" y="250" width="24" height="40" /></element>
+ <element name="digit2" ref="LCD"><bounds x="92" y="250" width="24" height="40" /></element>
+ <element name="digit1" ref="LCD"><bounds x="116" y="250" width="24" height="40" /></element>
+ <element name="digit0" ref="LCD"><bounds x="140" y="250" width="24" height="40" /></element>
+ <repeat count="5">
<param name="i" start="0" increment="8" />
<param name="y" start="0" increment="8" />
<repeat count="8">
@@ -72,6 +74,17 @@ license:CC0
</element>
</repeat>
</repeat>
+ <repeat count="7">
+ <param name="i" start="40" increment="8" />
+ <param name="y" start="48" increment="8" />
+ <repeat count="8">
+ <param name="j" start="~i~" increment="1" />
+ <param name="x" start="0" increment="8" />
+ <element name="lamp~j~" ref="matrixlamp" state="0">
+ <bounds x="~x~" y="~y~" width="7" height="7"/>
+ </element>
+ </repeat>
+ </repeat>
</view>
</mamelayout>
diff --git a/src/mame/layout/m_bappl2.lay b/src/mame/layout/m_bappl2.lay
index 7e9c6f9d568..e755ea14264 100644
--- a/src/mame/layout/m_bappl2.lay
+++ b/src/mame/layout/m_bappl2.lay
@@ -5,12 +5,10 @@ license:CC0
-->
<mamelayout version="2">
<element name="matrixlamp">
- <rect state ="0">
- <bounds x="0" y="0" width="11" height="11" />
+ <rect state="0">
<color red="0.7" green="0.7" blue="0.7" />
</rect>
- <rect state ="1">
- <bounds x="0" y="0" width="11" height="11" />
+ <rect state="1">
<color red="0.95" green="0.95" blue="0.43" />
</rect>
</element>
diff --git a/src/mame/layout/m_bapple.lay b/src/mame/layout/m_bapple.lay
index 34059ba521b..3f88a27e0d0 100644
--- a/src/mame/layout/m_bapple.lay
+++ b/src/mame/layout/m_bapple.lay
@@ -5,12 +5,10 @@ license:CC0
-->
<mamelayout version="2">
<element name="matrixlamp">
- <rect state ="0">
- <bounds x="0" y="0" width="11" height="11" />
+ <rect state="0">
<color red="0.7" green="0.7" blue="0.7" />
</rect>
- <rect state ="1">
- <bounds x="0" y="0" width="11" height="11" />
+ <rect state="1">
<color red="0.95" green="0.95" blue="0.43" />
</rect>
</element>
diff --git a/src/mame/layout/m_gndgit.lay b/src/mame/layout/m_gndgit.lay
index 974fff81f03..3fddc574ad3 100644
--- a/src/mame/layout/m_gndgit.lay
+++ b/src/mame/layout/m_gndgit.lay
@@ -5,12 +5,10 @@ license:CC0
-->
<mamelayout version="2">
<element name="matrixlamp">
- <rect state ="0">
- <bounds x="0" y="0" width="11" height="11" />
+ <rect state="0">
<color red="0.7" green="0.7" blue="0.7" />
</rect>
- <rect state ="1">
- <bounds x="0" y="0" width="11" height="11" />
+ <rect state="1">
<color red="0.95" green="0.95" blue="0.43" />
</rect>
</element>
diff --git a/src/mame/layout/m_lndg.lay b/src/mame/layout/m_lndg.lay
index 6e42399c119..87f991da82e 100644
--- a/src/mame/layout/m_lndg.lay
+++ b/src/mame/layout/m_lndg.lay
@@ -5,12 +5,10 @@ license:CC0
-->
<mamelayout version="2">
<element name="matrixlamp">
- <rect state ="0">
- <bounds x="0" y="0" width="11" height="11" />
+ <rect state="0">
<color red="0.7" green="0.7" blue="0.7" />
</rect>
- <rect state ="1">
- <bounds x="0" y="0" width="11" height="11" />
+ <rect state="1">
<color red="0.95" green="0.95" blue="0.43" />
</rect>
</element>
diff --git a/src/mame/layout/m_mtchit.lay b/src/mame/layout/m_mtchit.lay
index 094de2acb4b..09021e97de5 100644
--- a/src/mame/layout/m_mtchit.lay
+++ b/src/mame/layout/m_mtchit.lay
@@ -5,12 +5,10 @@ license:CC0
-->
<mamelayout version="2">
<element name="matrixlamp">
- <rect state ="0">
- <bounds x="0" y="0" width="11" height="11" />
+ <rect state="0">
<color red="0.7" green="0.7" blue="0.7" />
</rect>
- <rect state ="1">
- <bounds x="0" y="0" width="11" height="11" />
+ <rect state="1">
<color red="0.95" green="0.95" blue="0.43" />
</rect>
</element>
diff --git a/src/mame/layout/m_mtchup.lay b/src/mame/layout/m_mtchup.lay
index 1051aea3753..96cd57b7df8 100644
--- a/src/mame/layout/m_mtchup.lay
+++ b/src/mame/layout/m_mtchup.lay
@@ -5,12 +5,10 @@ license:CC0
-->
<mamelayout version="2">
<element name="matrixlamp">
- <rect state ="0">
- <bounds x="0" y="0" width="11" height="11" />
+ <rect state="0">
<color red="0.7" green="0.7" blue="0.7" />
</rect>
- <rect state ="1">
- <bounds x="0" y="0" width="11" height="11" />
+ <rect state="1">
<color red="0.95" green="0.95" blue="0.43" />
</rect>
</element>
diff --git a/src/mame/layout/mpu1.lay b/src/mame/layout/mpu1.lay
index 9f48dd42afa..694561f4673 100644
--- a/src/mame/layout/mpu1.lay
+++ b/src/mame/layout/mpu1.lay
@@ -4,12 +4,10 @@ license:CC0
-->
<mamelayout version="2">
<element name="matrixlamp">
- <rect state ="0">
- <bounds x="0" y="0" width="11" height="11" />
+ <rect state="0">
<color red="0.7" green="0.7" blue="0.7" />
</rect>
- <rect state ="1">
- <bounds x="0" y="0" width="11" height="11" />
+ <rect state="1">
<color red="0.95" green="0.95" blue="0.43" />
</rect>
</element>
diff --git a/src/mame/mame.lst b/src/mame/mame.lst
index c08debb0452..13920265dfa 100644
--- a/src/mame/mame.lst
+++ b/src/mame/mame.lst
@@ -19189,6 +19189,7 @@ j_ewsb //
j_ewsdlx // Each Way Shuffle Deluxe (CTL)
j_goldn2 // Golden 2's (CTL)
j_la // Lucky Aces
+j_lal // Lite a Line (JPM)
j_lan // Lite A Nudge (JPM)
j_lana //
j_lanb //