summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--scripts/target/mame/arcade.lua1
-rw-r--r--src/mame/arcade.flt1
-rw-r--r--src/mame/drivers/missbamby.cpp10
-rw-r--r--src/mame/drivers/regama.cpp67
-rw-r--r--src/mame/mame.lst4
5 files changed, 11 insertions, 72 deletions
diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua
index bc33b4ce28f..7d6b768d072 100644
--- a/scripts/target/mame/arcade.lua
+++ b/scripts/target/mame/arcade.lua
@@ -4661,7 +4661,6 @@ files {
MAME_DIR .. "src/mame/drivers/play_1.cpp",
MAME_DIR .. "src/mame/drivers/play_2.cpp",
MAME_DIR .. "src/mame/drivers/play_3.cpp",
- MAME_DIR .. "src/mame/drivers/regama.cpp",
MAME_DIR .. "src/mame/drivers/rowamet.cpp",
MAME_DIR .. "src/mame/drivers/s11.cpp",
MAME_DIR .. "src/mame/includes/s11.h",
diff --git a/src/mame/arcade.flt b/src/mame/arcade.flt
index 62d58fc3a7d..7b433f1e4ea 100644
--- a/src/mame/arcade.flt
+++ b/src/mame/arcade.flt
@@ -1026,7 +1026,6 @@ re900.cpp
realbrk.cpp
redalert.cpp
redclash.cpp
-regama.cpp
relief.cpp
renegade.cpp
retofinv.cpp
diff --git a/src/mame/drivers/missbamby.cpp b/src/mame/drivers/missbamby.cpp
index 532c6ccf950..4034624f1b2 100644
--- a/src/mame/drivers/missbamby.cpp
+++ b/src/mame/drivers/missbamby.cpp
@@ -221,6 +221,15 @@ ROM_START( unkslot )
ROM_LOAD( "n83s23n.bin", 0x00, 0x20, CRC(ea598b2c) SHA1(c0d6367ed2381a4a0f22780773ff4777569e88ab) )
ROM_END
+// PINBALL
+// CPU: 1 x I8085A
+// IO: 1 x I8155
+// Sound: 1 x AY8910
+ROM_START( trebol )
+ ROM_REGION(0x4000, "maincpu", 0)
+ ROM_LOAD( "m69.bin", 0x0000, 0x2000, CRC(8fb8cd39) SHA1(4ed505d06b489ce83316fdaa39f7ce128011fb4b) )
+ROM_END
+
} // Anonymous namespace
@@ -229,3 +238,4 @@ GAME( 1981, luckyplr, 0, missbamby, missbamby, missbamby_state, empty_init, ROT0
GAME( 198?, msbamby, 0, missbamby, missbamby, missbamby_state, empty_init, ROT0, "Automatics Pasqual", "Miss Bamby", MACHINE_IS_SKELETON_MECHANICAL )
GAME( 198?, unkslot, 0, missbamby, missbamby, missbamby_state, empty_init, ROT0, "<unknown>", "unknown MGA or Costa Net slot machine", MACHINE_IS_SKELETON_MECHANICAL )
GAME( 1983, gwinner, 0, gldwinner, missbamby, missbamby_state, empty_init, ROT0, "Reben SA", "Golden Winner", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 1985, trebol, 0, missbamby, missbamby, missbamby_state, empty_init, ROT0, "Regama", "Trebol", MACHINE_IS_SKELETON_MECHANICAL )
diff --git a/src/mame/drivers/regama.cpp b/src/mame/drivers/regama.cpp
deleted file mode 100644
index d11fd010305..00000000000
--- a/src/mame/drivers/regama.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:
-// PINBALL
-/*
-Skeleton driver for Regama's Trebol.
-Hardware listing and ROM definitions from PinMAME.
-
-
-Hardware:
-CPU: 1 x I8085A
-IO: 1 x I8155
-Sound: 1 x AY8910
-*/
-
-#include "emu.h"
-#include "machine/genpin.h"
-#include "cpu/i8085/i8085.h"
-#include "machine/i8155.h"
-#include "sound/ay8910.h"
-
-class regama_state : public genpin_class
-{
-public:
- regama_state(const machine_config &mconfig, device_type type, const char *tag)
- : genpin_class(mconfig, type, tag)
- , m_maincpu(*this, "maincpu") { }
-
- void regama(machine_config &config);
-
-private:
- void maincpu_map(address_map &map);
-
- required_device<cpu_device> m_maincpu;
-};
-
-void regama_state::maincpu_map(address_map &map)
-{
- map(0x0000, 0x1fff).ram();
-}
-
-
-static INPUT_PORTS_START( regama )
- PORT_START("DSW0")
- PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
-INPUT_PORTS_END
-
-
-void regama_state::regama(machine_config &config)
-{
- I8085A(config, m_maincpu, 6144000 / 2);
- m_maincpu->set_addrmap(AS_PROGRAM, &regama_state::maincpu_map);
-
- I8155(config, "i8155", 6144000 / 2);
-
- genpin_audio(config);
-
- AY8910(config, "ay", 6144000 / 2);
-}
-
-
-ROM_START(trebol)
- ROM_REGION(0x2000, "maincpu", 0)
- ROM_LOAD("m69.bin", 0x0000, 0x2000, CRC(8fb8cd39) SHA1(4ed505d06b489ce83316fdaa39f7ce128011fb4b))
-ROM_END
-
-
-GAME( 1985, trebol, 0, regama, regama, regama_state, empty_init, ROT0, "Regama", "Trebol", MACHINE_IS_SKELETON_MECHANICAL )
diff --git a/src/mame/mame.lst b/src/mame/mame.lst
index ef86d249ff0..faf616c0358 100644
--- a/src/mame/mame.lst
+++ b/src/mame/mame.lst
@@ -23178,6 +23178,7 @@ gwinner // (c) 1983 Reben
luckyplr // (c) 1981 Cirsa
minisupf // (c) 1981 Cirsa
msbamby // (c) 198? Automatics Pasqual
+trebol // 1985 Regama
unkslot // (c) 198? MGA or Costa Net?
@source:missile.cpp
@@ -35526,9 +35527,6 @@ zerohour // 8011 (c) Universal
zerohoura // 8011 (c) Universal
zerohouri //
-@source:regama.cpp
-trebol // 1985 Regama
-
@source:regence.cpp
regence