summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2015-03-13 21:54:57 +1100
committer Vas Crabb <vas@vastheman.com>2015-03-13 22:17:34 +1100
commite78fe921cfa5c9831a201b2124b02110dac8af60 (patch)
tree1bdb388a2aa7eae3117970998599442b73e1df70
parente23dec8bf21d356c993ac10a642e25499b3c41b1 (diff)
More refined and clickable layouts for the fruities
-rw-r--r--src/mame/drivers/goldstar.c6
-rw-r--r--src/mame/layout/cmaster.lay2
-rw-r--r--src/mame/layout/cmasterb.lay2
-rw-r--r--src/mame/layout/cmasterc.lay2
-rw-r--r--src/mame/layout/cmpacman.lay2
-rw-r--r--src/mame/layout/cmv4.lay2
-rw-r--r--src/mame/layout/goldstar.lay24
-rw-r--r--src/mame/layout/nfb96.lay109
-rw-r--r--src/mame/layout/nfb96tx.lay262
-rw-r--r--src/mame/layout/skill98.lay253
-rw-r--r--src/mame/mame.mak2
11 files changed, 593 insertions, 73 deletions
diff --git a/src/mame/drivers/goldstar.c b/src/mame/drivers/goldstar.c
index d6c126b4ba7..b55af56df68 100644
--- a/src/mame/drivers/goldstar.c
+++ b/src/mame/drivers/goldstar.c
@@ -166,8 +166,10 @@
#include "goldstar.lh"
#include "lucky8.lh"
#include "nfb96.lh"
+#include "nfb96tx.lh"
#include "pokonl97.lh"
#include "roypok96.lh"
+#include "skill98.lh"
#include "tonypok.lh"
@@ -13035,7 +13037,7 @@ GAME( 1991, magoddsd, magodds, magodds, magoddsc, wingco_state, magoddsc,
GAMEL( 1997, schery97, 0, amcoe1, schery97, cmaster_state, schery97, ROT0, "Amcoe", "Skill Cherry '97 (Talking ver. sc3.52)", 0, layout_nfb96 ) /* running in CB hardware */
GAMEL( 1997, schery97a, schery97, amcoe1, schery97, cmaster_state, schery97a, ROT0, "Amcoe", "Skill Cherry '97 (Talking ver. sc3.52c4)", 0, layout_nfb96 ) /* running in C4 hardware */
-GAMEL( 1998, skill98, 0, amcoe1, schery97, cmaster_state, skill98, ROT0, "Amcoe", "Skill '98 (Talking ver. s98-1.33)", 0, layout_nfb96 )
+GAMEL( 1998, skill98, 0, amcoe1, schery97, cmaster_state, skill98, ROT0, "Amcoe", "Skill '98 (Talking ver. s98-1.33)", 0, layout_skill98 )
GAMEL( 1997, pokonl97, 0, amcoe1, pokonl97, cmaster_state, po33, ROT0, "Amcoe", "Poker Only '97 (Talking ver. 3.3)", 0, layout_pokonl97 )
GAME( 1998, match98, 0, amcoe1a, match98, cmaster_state, match133, ROT0, "Amcoe", "Match '98 (ver. 1.33)", 0 )
@@ -13052,7 +13054,7 @@ GAMEL( 1996, nc96, 0, amcoe2, nfb96, cmaster_state, nfb96_c1,
GAMEL( 1996, nc96a, nc96, amcoe2, nfb96, cmaster_state, nfb96_c1, ROT0, "Amcoe", "New Cherry '96 Special Edition (v3.62, C1 PCB)", 0, layout_nfb96 ) /* C1 Sub-PCB */
GAMEL( 1996, nc96b, nc96, amcoe2, nfb96, cmaster_state, nfb96_d, ROT0, "Amcoe", "New Cherry '96 Special Edition (v3.54, D PCB)", 0, layout_nfb96 ) /* D Sub-PCB */
GAMEL( 1996, nc96c, nc96, amcoe2, nfb96, cmaster_state, nfb96_dk, ROT0, "Amcoe", "New Cherry '96 Special Edition (v3.62, DK PCB)", 0, layout_nfb96 ) /* DK Sub-PCB */
-GAMEL( 2000, nc96txt, nc96, amcoe2, nfb96tx, cmaster_state, nfb96_c2, ROT0, "Amcoe", "New Cherry '96 Special Edition (v1.32 Texas XT, C2 PCB)", 0, layout_nfb96 ) /* ver. tc1.32axt C2 Sub-PCB */
+GAMEL( 2000, nc96txt, nc96, amcoe2, nfb96tx, cmaster_state, nfb96_c2, ROT0, "Amcoe", "New Cherry '96 Special Edition (v1.32 Texas XT, C2 PCB)", 0, layout_nfb96tx ) /* ver. tc1.32axt C2 Sub-PCB */
GAME( 2009, fb2010, 0, amcoe2, nfb96tx, cmaster_state, fb2010, ROT0, "Amcoe", "Fruit Bonus 2010", GAME_NOT_WORKING ) // no gfx dumped
diff --git a/src/mame/layout/cmaster.lay b/src/mame/layout/cmaster.lay
index 82a1b22f670..f423f79e36a 100644
--- a/src/mame/layout/cmaster.lay
+++ b/src/mame/layout/cmaster.lay
@@ -32,7 +32,7 @@
<rect state="0">
<color red="0.5" green="0.0" blue="0.0" />
</rect>
- <text string="SMALL">
+ <text string="SMALL/INFO">
<color red="0.0" green="0.0" blue="0.0" />
<bounds x="0" y="0.1" width="1" height="0.4" />
</text>
diff --git a/src/mame/layout/cmasterb.lay b/src/mame/layout/cmasterb.lay
index df39c2f13e6..00f61ca3f7b 100644
--- a/src/mame/layout/cmasterb.lay
+++ b/src/mame/layout/cmasterb.lay
@@ -32,7 +32,7 @@
<rect state="0">
<color red="0.5" green="0.0" blue="0.0" />
</rect>
- <text string="SMALL">
+ <text string="SMALL/INFO">
<color red="0.0" green="0.0" blue="0.0" />
<bounds x="0" y="0.1" width="1" height="0.4" />
</text>
diff --git a/src/mame/layout/cmasterc.lay b/src/mame/layout/cmasterc.lay
index d9b0f43209b..b0c787281c9 100644
--- a/src/mame/layout/cmasterc.lay
+++ b/src/mame/layout/cmasterc.lay
@@ -49,7 +49,7 @@
<rect state="0">
<color red="0.5" green="0.0" blue="0.0" />
</rect>
- <text string="SMALL">
+ <text string="SMALL/INFO">
<color red="0.0" green="0.0" blue="0.0" />
<bounds x="0" y="0.1" width="1" height="0.4" />
</text>
diff --git a/src/mame/layout/cmpacman.lay b/src/mame/layout/cmpacman.lay
index af48e1a1541..7f7513bbc7c 100644
--- a/src/mame/layout/cmpacman.lay
+++ b/src/mame/layout/cmpacman.lay
@@ -32,7 +32,7 @@
<rect state="0">
<color red="0.5" green="0.0" blue="0.0" />
</rect>
- <text string="SMALL">
+ <text string="SMALL/INFO">
<color red="0.0" green="0.0" blue="0.0" />
<bounds x="0" y="0.1" width="1" height="0.4" />
</text>
diff --git a/src/mame/layout/cmv4.lay b/src/mame/layout/cmv4.lay
index 2fc6dfffb27..3581c676be7 100644
--- a/src/mame/layout/cmv4.lay
+++ b/src/mame/layout/cmv4.lay
@@ -32,7 +32,7 @@
<rect state="0">
<color red="0.5" green="0.0" blue="0.0" />
</rect>
- <text string="SMALL">
+ <text string="SMALL/INFO">
<color red="0.0" green="0.0" blue="0.0" />
<bounds x="0" y="0.1" width="1" height="0.4" />
</text>
diff --git a/src/mame/layout/goldstar.lay b/src/mame/layout/goldstar.lay
index cf2ede71722..81507522930 100644
--- a/src/mame/layout/goldstar.lay
+++ b/src/mame/layout/goldstar.lay
@@ -242,50 +242,50 @@
<!-- define lamps -->
- <bezel name="lamp0" element="betred_b">
+ <bezel name="lamp0" element="betred_b" inputtag="IN0" inputmask="0x04">
<bounds x="2.05" y="3.08" width="0.50" height="0.34" />
</bezel>
- <bezel name="lamp0" element="betred">
+ <bezel name="lamp0" element="betred" inputtag="IN0" inputmask="0x04">
<bounds x="2.07" y="3.10" width="0.46" height="0.30" />
</bezel>
- <bezel name="lamp1" element="stop_b">
+ <bezel name="lamp1" element="stop_b" inputtag="IN0" inputmask="0x08">
<bounds x="1.25" y="3.08" width="0.50" height="0.34" />
</bezel>
- <bezel name="lamp1" element="stop3">
+ <bezel name="lamp1" element="stop3" inputtag="IN0" inputmask="0x08">
<bounds x="1.27" y="3.10" width="0.46" height="0.30" />
</bezel>
- <bezel name="lamp2" element="betblue_b">
+ <bezel name="lamp2" element="betblue_b" inputtag="IN0" inputmask="0x10">
<bounds x="2.65" y="3.08" width="0.50" height="0.34" />
</bezel>
- <bezel name="lamp2" element="betblue">
+ <bezel name="lamp2" element="betblue" inputtag="IN0" inputmask="0x10">
<bounds x="2.67" y="3.10" width="0.46" height="0.30" />
</bezel>
- <bezel name="lamp3" element="stop_b">
+ <bezel name="lamp3" element="stop_b" inputtag="IN0" inputmask="0x20">
<bounds x="0.05" y="3.08" width="0.50" height="0.34" />
</bezel>
- <bezel name="lamp3" element="stop1">
+ <bezel name="lamp3" element="stop1" inputtag="IN0" inputmask="0x20">
<bounds x="0.07" y="3.10" width="0.46" height="0.30" />
</bezel>
- <bezel name="lamp4" element="stop_b">
+ <bezel name="lamp4" element="stop_b" inputtag="IN0" inputmask="0x40">
<bounds x="0.65" y="3.08" width="0.50" height="0.34" />
</bezel>
- <bezel name="lamp4" element="stop2">
+ <bezel name="lamp4" element="stop2" inputtag="IN0" inputmask="0x40">
<bounds x="0.67" y="3.10" width="0.46" height="0.30" />
</bezel>
- <bezel name="lamp5" element="start_b">
+ <bezel name="lamp5" element="start_b" inputtag="IN0" inputmask="0x80">
<bounds x="3.45" y="3.08" width="0.50" height="0.34" />
</bezel>
- <bezel name="lamp5" element="start">
+ <bezel name="lamp5" element="start" inputtag="IN0" inputmask="0x80">
<bounds x="3.47" y="3.10" width="0.46" height="0.30" />
</bezel>
diff --git a/src/mame/layout/nfb96.lay b/src/mame/layout/nfb96.lay
index c45fb01e452..c8dbb22cea4 100644
--- a/src/mame/layout/nfb96.lay
+++ b/src/mame/layout/nfb96.lay
@@ -17,11 +17,11 @@
</rect>
<text string="BIG">
<color red="0.0" green="0.0" blue="0.0" />
- <bounds x="0" y="0.35" width="1" height="0.25" />
+ <bounds x="0" y="0.1" width="1" height="0.4" />
</text>
<text string="STOP ALL">
<color red="0.0" green="0.0" blue="0.0" />
- <bounds x="0" y="0.6" width="1" height="0.25" />
+ <bounds x="0" y="0.5" width="1" height="0.4" />
</text>
</element>
@@ -30,15 +30,15 @@
<color red="1.0" green="0.0" blue="0.0" />
</rect>
<rect state="0">
- <color red="0.15" green="0.0" blue="0.0" />
+ <color red="0.5" green="0.0" blue="0.0" />
</rect>
<text string="DOUBLE">
<color red="0.0" green="0.0" blue="0.0" />
- <bounds x="0" y="0.1" width="1" height="0.25" />
+ <bounds x="0" y="0.1" width="1" height="0.4" />
</text>
<text string="STOP 1">
<color red="0.0" green="0.0" blue="0.0" />
- <bounds x="0" y="0.6" width="1" height="0.25" />
+ <bounds x="0" y="0.5" width="1" height="0.4" />
</text>
</element>
@@ -47,19 +47,15 @@
<color red="1.0" green="0.0" blue="0.0" />
</rect>
<rect state="0">
- <color red="0.15" green="0.0" blue="0.0" />
+ <color red="0.5" green="0.0" blue="0.0" />
</rect>
- <text string="INFO">
- <color red="0.0" green="0.0" blue="0.0" />
- <bounds x="0" y="0.1" width="1" height="0.25" />
- </text>
- <text string="SMALL">
+ <text string="SMALL/INFO">
<color red="0.0" green="0.0" blue="0.0" />
- <bounds x="0" y="0.35" width="1" height="0.25" />
+ <bounds x="0" y="0.1" width="1" height="0.4" />
</text>
<text string="STOP 2">
<color red="0.0" green="0.0" blue="0.0" />
- <bounds x="0" y="0.6" width="1" height="0.25" />
+ <bounds x="0" y="0.5" width="1" height="0.4" />
</text>
</element>
@@ -68,19 +64,15 @@
<color red="1.0" green="0.0" blue="0.0" />
</rect>
<rect state="0">
- <color red="0.15" green="0.0" blue="0.0" />
+ <color red="0.5" green="0.0" blue="0.0" />
</rect>
- <text string="TAKE">
- <color red="0.0" green="0.0" blue="0.0" />
- <bounds x="0" y="0.1" width="1" height="0.25" />
- </text>
- <text string="SELECT">
+ <text string="TAKE/SELECT">
<color red="0.0" green="0.0" blue="0.0" />
- <bounds x="0" y="0.35" width="1" height="0.25" />
+ <bounds x="0" y="0.1" width="1" height="0.4" />
</text>
<text string="STOP 3">
<color red="0.0" green="0.0" blue="0.0" />
- <bounds x="0" y="0.6" width="1" height="0.25" />
+ <bounds x="0" y="0.5" width="1" height="0.4" />
</text>
</element>
@@ -93,7 +85,7 @@
</rect>
<text string="START">
<color red="0.0" green="0.0" blue="0.0" />
- <bounds x="0" y="0.35" width="1" height="0.25" />
+ <bounds x="0" y="0.3" width="1" height="0.4" />
</text>
</element>
@@ -106,7 +98,7 @@
</rect>
<text string="PLAY">
<color red="0.0" green="0.0" blue="0.0" />
- <bounds x="0" y="0.35" width="1" height="0.25" />
+ <bounds x="0" y="0.3" width="1" height="0.4" />
</text>
</element>
@@ -119,7 +111,7 @@
</rect>
</element>
- <element name="stop_b" defstate="0">
+ <element name="big_b" defstate="0">
<rect state="1">
<color red="0.7" green="0.0" blue="0.0" />
</rect>
@@ -128,6 +120,15 @@
</rect>
</element>
+ <element name="stop_b" defstate="0">
+ <rect state="1">
+ <color red="0.7" green="0.0" blue="0.0" />
+ </rect>
+ <rect state="0">
+ <color red="0.4" green="0.0" blue="0.0" />
+ </rect>
+ </element>
+
<element name="bet_b" defstate="0">
<rect state="1">
<color red="0.7" green="0.0" blue="0.7" />
@@ -184,77 +185,77 @@
</screen>
<bezel element="cpanel">
- <bounds left="0" right="4" top="3" bottom="3.50" />
+ <bounds left="0" right="4" top="3" bottom="3.40" />
</bezel>
<bezel element="cpanel1">
- <bounds left="0" right="4" top="3.01" bottom="3.49" />
+ <bounds left="0" right="4" top="3.01" bottom="3.39" />
</bezel>
<bezel element="cpanel2">
- <bounds left="0" right="4" top="3.02" bottom="3.48" />
+ <bounds left="0" right="4" top="3.02" bottom="3.38" />
</bezel>
<bezel element="cpanel3">
- <bounds left="0" right="4" top="3.03" bottom="3.47" />
+ <bounds left="0" right="4" top="3.03" bottom="3.37" />
</bezel>
<bezel element="cpanel4">
- <bounds left="0" right="4" top="3.04" bottom="3.46" />
+ <bounds left="0" right="4" top="3.04" bottom="3.36" />
</bezel>
<bezel element="cpanel">
- <bounds left="0" right="4" top="3.05" bottom="3.45" />
+ <bounds left="0" right="4" top="3.05" bottom="3.35" />
</bezel>
<!-- define lamps -->
- <bezel name="lamp3" element="bet_b">
- <bounds x="0.05" y="3.08" width="0.40" height="0.34" />
+ <bezel name="lamp3" element="bet_b" inputtag="IN0" inputmask="0x20">
+ <bounds x="0.05" y="3.08" width="0.40" height="0.24" />
</bezel>
- <bezel name="lamp3" element="bet">
- <bounds x="0.07" y="3.10" width="0.36" height="0.30" />
+ <bezel name="lamp3" element="bet" inputtag="IN0" inputmask="0x80">
+ <bounds x="0.07" y="3.10" width="0.36" height="0.20" />
</bezel>
- <bezel name="lamp0" element="stop_b">
- <bounds x="0.75" y="3.08" width="0.50" height="0.34" />
+ <bezel name="lamp0" element="big_b" inputtag="IN0" inputmask="0x04">
+ <bounds x="0.75" y="3.08" width="0.50" height="0.24" />
</bezel>
- <bezel name="lamp0" element="big">
- <bounds x="0.77" y="3.10" width="0.46" height="0.30" />
+ <bezel name="lamp0" element="big" inputtag="IN0" inputmask="0x04">
+ <bounds x="0.77" y="3.10" width="0.46" height="0.20" />
</bezel>
- <bezel name="lamp1" element="stop_b">
- <bounds x="1.4" y="3.08" width="0.50" height="0.34" />
+ <bezel name="lamp1" element="stop_b" inputtag="IN0" inputmask="0x08">
+ <bounds x="1.4" y="3.08" width="0.50" height="0.24" />
</bezel>
- <bezel name="lamp1" element="dup">
- <bounds x="1.42" y="3.10" width="0.46" height="0.30" />
+ <bezel name="lamp1" element="dup" inputtag="IN0" inputmask="0x08">
+ <bounds x="1.42" y="3.10" width="0.46" height="0.20" />
</bezel>
- <bezel name="lamp4" element="stop_b">
- <bounds x="2.05" y="3.08" width="0.50" height="0.34" />
+ <bezel name="lamp4" element="stop_b" inputtag="IN0" inputmask="0x40">
+ <bounds x="2.05" y="3.08" width="0.50" height="0.24" />
</bezel>
- <bezel name="lamp4" element="small">
- <bounds x="2.07" y="3.10" width="0.46" height="0.30" />
+ <bezel name="lamp4" element="small" inputtag="IN0" inputmask="0x40">
+ <bounds x="2.07" y="3.10" width="0.46" height="0.20" />
</bezel>
- <bezel name="lamp2" element="stop_b">
- <bounds x="2.7" y="3.08" width="0.50" height="0.34" />
+ <bezel name="lamp2" element="stop_b" inputtag="IN0" inputmask="0x10">
+ <bounds x="2.7" y="3.08" width="0.50" height="0.24" />
</bezel>
- <bezel name="lamp2" element="take">
- <bounds x="2.72" y="3.10" width="0.46" height="0.30" />
+ <bezel name="lamp2" element="take" inputtag="IN0" inputmask="0x10">
+ <bounds x="2.72" y="3.10" width="0.46" height="0.20" />
</bezel>
- <bezel name="lamp5" element="start_b">
- <bounds x="3.45" y="3.08" width="0.50" height="0.34" />
+ <bezel name="lamp5" element="start_b" inputtag="IN0" inputmask="0x80">
+ <bounds x="3.45" y="3.08" width="0.50" height="0.24" />
</bezel>
- <bezel name="lamp5" element="start">
- <bounds x="3.47" y="3.10" width="0.46" height="0.30" />
+ <bezel name="lamp5" element="start" inputtag="IN0" inputmask="0x80">
+ <bounds x="3.47" y="3.10" width="0.46" height="0.20" />
</bezel>
</view>
diff --git a/src/mame/layout/nfb96tx.lay b/src/mame/layout/nfb96tx.lay
new file mode 100644
index 00000000000..4373d2a3546
--- /dev/null
+++ b/src/mame/layout/nfb96tx.lay
@@ -0,0 +1,262 @@
+<?xml version="1.0"?>
+<mamelayout version="2">
+<!--
+ New Fruit Bonus '96 control panel
+ May or may not match arrangement/colour of real control panel
+ Written by Vas Crabb.
+-->
+
+<!-- define button-lamps -->
+
+ <element name="big" defstate="0">
+ <rect state="1">
+ <color red="1.0" green="0.0" blue="0.0" />
+ </rect>
+ <rect state="0">
+ <color red="0.15" green="0.0" blue="0.0" />
+ </rect>
+ <text string="BIG">
+ <color red="0.0" green="0.0" blue="0.0" />
+ <bounds x="0" y="0.1" width="1" height="0.4" />
+ </text>
+ <text string="STOP ALL">
+ <color red="0.0" green="0.0" blue="0.0" />
+ <bounds x="0" y="0.5" width="1" height="0.4" />
+ </text>
+ </element>
+
+ <element name="dup" defstate="0">
+ <rect state="1">
+ <color red="1.0" green="0.0" blue="0.0" />
+ </rect>
+ <rect state="0">
+ <color red="0.5" green="0.0" blue="0.0" />
+ </rect>
+ <text string="DOUBLE">
+ <color red="0.0" green="0.0" blue="0.0" />
+ <bounds x="0" y="0.1" width="1" height="0.4" />
+ </text>
+ <text string="STOP 1">
+ <color red="0.0" green="0.0" blue="0.0" />
+ <bounds x="0" y="0.5" width="1" height="0.4" />
+ </text>
+ </element>
+
+ <element name="small" defstate="0">
+ <rect state="1">
+ <color red="1.0" green="0.0" blue="0.0" />
+ </rect>
+ <rect state="0">
+ <color red="0.5" green="0.0" blue="0.0" />
+ </rect>
+ <text string="SMALL">
+ <color red="0.0" green="0.0" blue="0.0" />
+ <bounds x="0" y="0.1" width="1" height="0.4" />
+ </text>
+ <text string="STOP 2">
+ <color red="0.0" green="0.0" blue="0.0" />
+ <bounds x="0" y="0.5" width="1" height="0.4" />
+ </text>
+ </element>
+
+ <element name="take" defstate="0">
+ <rect state="1">
+ <color red="1.0" green="0.0" blue="0.0" />
+ </rect>
+ <rect state="0">
+ <color red="0.5" green="0.0" blue="0.0" />
+ </rect>
+ <text string="TAKE/SELECT">
+ <color red="0.0" green="0.0" blue="0.0" />
+ <bounds x="0" y="0.1" width="1" height="0.4" />
+ </text>
+ <text string="STOP 3">
+ <color red="0.0" green="0.0" blue="0.0" />
+ <bounds x="0" y="0.5" width="1" height="0.4" />
+ </text>
+ </element>
+
+ <element name="start" defstate="0">
+ <rect state="1">
+ <color red="0.0" green="1.0" blue="0.0" />
+ </rect>
+ <rect state="0">
+ <color red="0.0" green="0.15" blue="0.0" />
+ </rect>
+ <text string="START">
+ <color red="0.0" green="0.0" blue="0.0" />
+ <bounds x="0" y="0.3" width="1" height="0.4" />
+ </text>
+ </element>
+
+ <element name="bet" defstate="0">
+ <rect state="1">
+ <color red="1.0" green="0.0" blue="1.0" />
+ </rect>
+ <rect state="0">
+ <color red="0.15" green="0.0" blue="0.15" />
+ </rect>
+ <text string="PLAY">
+ <color red="0.0" green="0.0" blue="0.0" />
+ <bounds x="0" y="0.3" width="1" height="0.4" />
+ </text>
+ </element>
+
+
+<!-- define basic elements -->
+
+ <element name="cpanel">
+ <rect>
+ <color red="0.0" green="0.0" blue="0.0" />
+ </rect>
+ </element>
+
+ <element name="big_b" defstate="0">
+ <rect state="1">
+ <color red="0.7" green="0.0" blue="0.0" />
+ </rect>
+ <rect state="0">
+ <color red="0.1" green="0.0" blue="0.0" />
+ </rect>
+ </element>
+
+ <element name="stop_b" defstate="0">
+ <rect state="1">
+ <color red="0.7" green="0.0" blue="0.0" />
+ </rect>
+ <rect state="0">
+ <color red="0.4" green="0.0" blue="0.0" />
+ </rect>
+ </element>
+
+ <element name="bet_b" defstate="0">
+ <rect state="1">
+ <color red="0.7" green="0.0" blue="0.7" />
+ </rect>
+ <rect state="0">
+ <color red="0.1" green="0.0" blue="0.1" />
+ </rect>
+ </element>
+
+ <element name="start_b" defstate="0">
+ <rect state="1">
+ <color red="0.0" green="0.7" blue="0.0" />
+ </rect>
+ <rect state="0">
+ <color red="0.0" green="0.1" blue="0.0" />
+ </rect>
+ </element>
+
+
+
+<!-- define cpanel degradee elements -->
+
+
+ <element name="cpanel1">
+ <rect>
+ <color red="0.20" green="0.20" blue="0.20" />
+ </rect>
+ </element>
+
+ <element name="cpanel2">
+ <rect>
+ <color red="0.15" green="0.15" blue="0.15" />
+ </rect>
+ </element>
+
+ <element name="cpanel3">
+ <rect>
+ <color red="0.10" green="0.10" blue="0.10" />
+ </rect>
+ </element>
+
+ <element name="cpanel4">
+ <rect>
+ <color red="0.05" green="0.05" blue="0.05" />
+ </rect>
+ </element>
+
+
+<!-- define background -->
+
+ <view name="Button Lamps">
+ <screen index="0">
+ <bounds left="0" top="0" right="4" bottom="3" />
+ </screen>
+
+ <bezel element="cpanel">
+ <bounds left="0" right="4" top="3" bottom="3.40" />
+ </bezel>
+
+ <bezel element="cpanel1">
+ <bounds left="0" right="4" top="3.01" bottom="3.39" />
+ </bezel>
+
+ <bezel element="cpanel2">
+ <bounds left="0" right="4" top="3.02" bottom="3.38" />
+ </bezel>
+
+ <bezel element="cpanel3">
+ <bounds left="0" right="4" top="3.03" bottom="3.37" />
+ </bezel>
+
+ <bezel element="cpanel4">
+ <bounds left="0" right="4" top="3.04" bottom="3.36" />
+ </bezel>
+
+ <bezel element="cpanel">
+ <bounds left="0" right="4" top="3.05" bottom="3.35" />
+ </bezel>
+
+
+<!-- define lamps -->
+
+ <bezel name="lamp3" element="bet_b" inputtag="IN0" inputmask="0x20">
+ <bounds x="0.05" y="3.08" width="0.40" height="0.24" />
+ </bezel>
+ <bezel name="lamp3" element="bet" inputtag="IN0" inputmask="0x80">
+ <bounds x="0.07" y="3.10" width="0.36" height="0.20" />
+ </bezel>
+
+
+ <bezel name="lamp0" element="big_b" inputtag="IN0" inputmask="0x04">
+ <bounds x="0.75" y="3.08" width="0.50" height="0.24" />
+ </bezel>
+ <bezel name="lamp0" element="big" inputtag="IN0" inputmask="0x04">
+ <bounds x="0.77" y="3.10" width="0.46" height="0.20" />
+ </bezel>
+
+
+ <bezel name="lamp1" element="stop_b" inputtag="IN0" inputmask="0x08">
+ <bounds x="1.4" y="3.08" width="0.50" height="0.24" />
+ </bezel>
+ <bezel name="lamp1" element="dup" inputtag="IN0" inputmask="0x08">
+ <bounds x="1.42" y="3.10" width="0.46" height="0.20" />
+ </bezel>
+
+
+ <bezel name="lamp4" element="stop_b" inputtag="IN0" inputmask="0x40">
+ <bounds x="2.05" y="3.08" width="0.50" height="0.24" />
+ </bezel>
+ <bezel name="lamp4" element="small" inputtag="IN0" inputmask="0x40">
+ <bounds x="2.07" y="3.10" width="0.46" height="0.20" />
+ </bezel>
+
+
+ <bezel name="lamp2" element="stop_b" inputtag="IN0" inputmask="0x10">
+ <bounds x="2.7" y="3.08" width="0.50" height="0.24" />
+ </bezel>
+ <bezel name="lamp2" element="take" inputtag="IN0" inputmask="0x10">
+ <bounds x="2.72" y="3.10" width="0.46" height="0.20" />
+ </bezel>
+
+
+ <bezel name="lamp5" element="start_b" inputtag="IN0" inputmask="0x80">
+ <bounds x="3.45" y="3.08" width="0.50" height="0.24" />
+ </bezel>
+ <bezel name="lamp5" element="start" inputtag="IN0" inputmask="0x80">
+ <bounds x="3.47" y="3.10" width="0.46" height="0.20" />
+ </bezel>
+
+ </view>
+</mamelayout>
diff --git a/src/mame/layout/skill98.lay b/src/mame/layout/skill98.lay
new file mode 100644
index 00000000000..0ae14c87420
--- /dev/null
+++ b/src/mame/layout/skill98.lay
@@ -0,0 +1,253 @@
+<?xml version="1.0"?>
+<mamelayout version="2">
+<!--
+ Skill '96 control panel
+ May or may not match arrangement/colour of real control panel
+ Written by Vas Crabb.
+-->
+
+<!-- define button-lamps -->
+
+ <element name="big" defstate="0">
+ <rect state="1">
+ <color red="1.0" green="0.0" blue="0.0" />
+ </rect>
+ <rect state="0">
+ <color red="0.5" green="0.0" blue="0.0" />
+ </rect>
+ <text string="BIG">
+ <color red="0.0" green="0.0" blue="0.0" />
+ <bounds x="0" y="0.1" width="1" height="0.4" />
+ </text>
+ <text string="STOP ALL">
+ <color red="0.0" green="0.0" blue="0.0" />
+ <bounds x="0" y="0.5" width="1" height="0.4" />
+ </text>
+ </element>
+
+ <element name="dup" defstate="0">
+ <rect state="1">
+ <color red="1.0" green="0.0" blue="0.0" />
+ </rect>
+ <rect state="0">
+ <color red="0.5" green="0.0" blue="0.0" />
+ </rect>
+ <text string="DOUBLE">
+ <color red="0.0" green="0.0" blue="0.0" />
+ <bounds x="0" y="0.1" width="1" height="0.4" />
+ </text>
+ <text string="STOP 1">
+ <color red="0.0" green="0.0" blue="0.0" />
+ <bounds x="0" y="0.5" width="1" height="0.4" />
+ </text>
+ </element>
+
+ <element name="small" defstate="0">
+ <rect state="1">
+ <color red="1.0" green="0.0" blue="0.0" />
+ </rect>
+ <rect state="0">
+ <color red="0.5" green="0.0" blue="0.0" />
+ </rect>
+ <text string="SMALL/INFO">
+ <color red="0.0" green="0.0" blue="0.0" />
+ <bounds x="0" y="0.1" width="1" height="0.4" />
+ </text>
+ <text string="STOP 2">
+ <color red="0.0" green="0.0" blue="0.0" />
+ <bounds x="0" y="0.5" width="1" height="0.4" />
+ </text>
+ </element>
+
+ <element name="take" defstate="0">
+ <rect state="1">
+ <color red="1.0" green="0.0" blue="0.0" />
+ </rect>
+ <rect state="0">
+ <color red="0.5" green="0.0" blue="0.0" />
+ </rect>
+ <text string="TAKE/SELECT">
+ <color red="0.0" green="0.0" blue="0.0" />
+ <bounds x="0" y="0.1" width="1" height="0.4" />
+ </text>
+ <text string="STOP 3">
+ <color red="0.0" green="0.0" blue="0.0" />
+ <bounds x="0" y="0.5" width="1" height="0.4" />
+ </text>
+ </element>
+
+ <element name="start" defstate="0">
+ <rect state="1">
+ <color red="0.0" green="1.0" blue="0.0" />
+ </rect>
+ <rect state="0">
+ <color red="0.0" green="0.15" blue="0.0" />
+ </rect>
+ <text string="START">
+ <color red="0.0" green="0.0" blue="0.0" />
+ <bounds x="0" y="0.3" width="1" height="0.4" />
+ </text>
+ </element>
+
+ <element name="bet" defstate="0">
+ <rect state="1">
+ <color red="1.0" green="0.0" blue="1.0" />
+ </rect>
+ <rect state="0">
+ <color red="0.15" green="0.0" blue="0.15" />
+ </rect>
+ <text string="PLAY">
+ <color red="0.0" green="0.0" blue="0.0" />
+ <bounds x="0" y="0.3" width="1" height="0.4" />
+ </text>
+ </element>
+
+
+<!-- define basic elements -->
+
+ <element name="cpanel">
+ <rect>
+ <color red="0.0" green="0.0" blue="0.0" />
+ </rect>
+ </element>
+
+ <element name="stop_b" defstate="0">
+ <rect state="1">
+ <color red="0.7" green="0.0" blue="0.0" />
+ </rect>
+ <rect state="0">
+ <color red="0.4" green="0.0" blue="0.0" />
+ </rect>
+ </element>
+
+ <element name="bet_b" defstate="0">
+ <rect state="1">
+ <color red="0.7" green="0.0" blue="0.7" />
+ </rect>
+ <rect state="0">
+ <color red="0.1" green="0.0" blue="0.1" />
+ </rect>
+ </element>
+
+ <element name="start_b" defstate="0">
+ <rect state="1">
+ <color red="0.0" green="0.7" blue="0.0" />
+ </rect>
+ <rect state="0">
+ <color red="0.0" green="0.1" blue="0.0" />
+ </rect>
+ </element>
+
+
+
+<!-- define cpanel degradee elements -->
+
+
+ <element name="cpanel1">
+ <rect>
+ <color red="0.20" green="0.20" blue="0.20" />
+ </rect>
+ </element>
+
+ <element name="cpanel2">
+ <rect>
+ <color red="0.15" green="0.15" blue="0.15" />
+ </rect>
+ </element>
+
+ <element name="cpanel3">
+ <rect>
+ <color red="0.10" green="0.10" blue="0.10" />
+ </rect>
+ </element>
+
+ <element name="cpanel4">
+ <rect>
+ <color red="0.05" green="0.05" blue="0.05" />
+ </rect>
+ </element>
+
+
+<!-- define background -->
+
+ <view name="Button Lamps">
+ <screen index="0">
+ <bounds left="0" top="0" right="4" bottom="3" />
+ </screen>
+
+ <bezel element="cpanel">
+ <bounds left="0" right="4" top="3" bottom="3.40" />
+ </bezel>
+
+ <bezel element="cpanel1">
+ <bounds left="0" right="4" top="3.01" bottom="3.39" />
+ </bezel>
+
+ <bezel element="cpanel2">
+ <bounds left="0" right="4" top="3.02" bottom="3.38" />
+ </bezel>
+
+ <bezel element="cpanel3">
+ <bounds left="0" right="4" top="3.03" bottom="3.37" />
+ </bezel>
+
+ <bezel element="cpanel4">
+ <bounds left="0" right="4" top="3.04" bottom="3.36" />
+ </bezel>
+
+ <bezel element="cpanel">
+ <bounds left="0" right="4" top="3.05" bottom="3.35" />
+ </bezel>
+
+
+<!-- define lamps -->
+
+ <bezel name="lamp3" element="bet_b" inputtag="IN0" inputmask="0x20">
+ <bounds x="0.05" y="3.08" width="0.40" height="0.24" />
+ </bezel>
+ <bezel name="lamp3" element="bet" inputtag="IN0" inputmask="0x80">
+ <bounds x="0.07" y="3.10" width="0.36" height="0.20" />
+ </bezel>
+
+
+ <bezel name="lamp0" element="stop_b" inputtag="IN0" inputmask="0x04">
+ <bounds x="0.75" y="3.08" width="0.50" height="0.24" />
+ </bezel>
+ <bezel name="lamp0" element="big" inputtag="IN0" inputmask="0x04">
+ <bounds x="0.77" y="3.10" width="0.46" height="0.20" />
+ </bezel>
+
+
+ <bezel name="lamp1" element="stop_b" inputtag="IN0" inputmask="0x08">
+ <bounds x="1.4" y="3.08" width="0.50" height="0.24" />
+ </bezel>
+ <bezel name="lamp1" element="dup" inputtag="IN0" inputmask="0x08">
+ <bounds x="1.42" y="3.10" width="0.46" height="0.20" />
+ </bezel>
+
+
+ <bezel name="lamp4" element="stop_b" inputtag="IN0" inputmask="0x40">
+ <bounds x="2.05" y="3.08" width="0.50" height="0.24" />
+ </bezel>
+ <bezel name="lamp4" element="small" inputtag="IN0" inputmask="0x40">
+ <bounds x="2.07" y="3.10" width="0.46" height="0.20" />
+ </bezel>
+
+
+ <bezel name="lamp2" element="stop_b" inputtag="IN0" inputmask="0x10">
+ <bounds x="2.7" y="3.08" width="0.50" height="0.24" />
+ </bezel>
+ <bezel name="lamp2" element="take" inputtag="IN0" inputmask="0x10">
+ <bounds x="2.72" y="3.10" width="0.46" height="0.20" />
+ </bezel>
+
+
+ <bezel name="lamp5" element="start_b" inputtag="IN0" inputmask="0x80">
+ <bounds x="3.45" y="3.08" width="0.50" height="0.24" />
+ </bezel>
+ <bezel name="lamp5" element="start" inputtag="IN0" inputmask="0x80">
+ <bounds x="3.47" y="3.10" width="0.46" height="0.20" />
+ </bezel>
+
+ </view>
+</mamelayout>
diff --git a/src/mame/mame.mak b/src/mame/mame.mak
index ee68f57dfd7..edefdb39d97 100644
--- a/src/mame/mame.mak
+++ b/src/mame/mame.mak
@@ -2683,8 +2683,10 @@ $(DRIVERS)/goldstar.o: $(LAYOUT)/goldstar.lh \
$(LAYOUT)/crazybon.lh \
$(LAYOUT)/lucky8.lh \
$(LAYOUT)/nfb96.lh \
+ $(LAYOUT)/nfb96tx.lh \
$(LAYOUT)/pokonl97.lh \
$(LAYOUT)/roypok96.lh \
+ $(LAYOUT)/skill98.lh \
$(LAYOUT)/tonypok.lh
$(DRIVERS)/grchamp.o: $(LAYOUT)/grchamp.lh