summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGravatarGravatar Roberto Fresca <robbie@robertofresca.com>2019-08-15 03:44:18 +0200
committerGravatarGravatar Roberto Fresca <robbie@robertofresca.com>2019-08-15 03:44:18 +0200
commit55f2845d542a2ee2f588febc5a1bae47599becd1 (patch) (github)
tree0653ce1998d0377b48aebb71c4ff3673396cb927 /src
parent42ff929ce06dc0c769dce656ca0ba0226202a05f (diff)
parent0206a81e1d718d1d2b21f7109c2e8bb95a8344b3 (diff)
downloadmame-55f2845d542a2ee2f588febc5a1bae47599becd1.tar.bz2
mame-55f2845d542a2ee2f588febc5a1bae47599becd1.zip
Merge branch 'master' of https://github.com/mamedev/mame
Diffstat (limited to 'src')
-rw-r--r--src/mame/drivers/clshroad.cpp8
-rw-r--r--src/mame/drivers/firetrap.cpp12
-rw-r--r--src/mame/drivers/kingobox.cpp16
-rw-r--r--src/mame/drivers/thedeep.cpp37
-rw-r--r--src/mame/drivers/tsamurai.cpp6
5 files changed, 34 insertions, 45 deletions
diff --git a/src/mame/drivers/clshroad.cpp b/src/mame/drivers/clshroad.cpp
index f908f05a46b..db482e48c6c 100644
--- a/src/mame/drivers/clshroad.cpp
+++ b/src/mame/drivers/clshroad.cpp
@@ -567,7 +567,7 @@ void clshroad_state::init_firebatl()
ROM[0x05C8] = 0x23;
}
-GAME( 1984, firebatl, 0, firebatl, firebatl, clshroad_state, init_firebatl, ROT90, "Wood Place Inc. (Taito license)", "Fire Battle", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1986, clshroad, 0, clshroad, clshroad, clshroad_state, empty_init, ROT0, "Wood Place Inc.", "Clash-Road", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, clshroads, clshroad, clshroad, clshroad, clshroad_state, empty_init, ROT0, "Wood Place Inc. (Status Game Corp. license)", "Clash-Road (Status license)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, clshroadd, clshroad, clshroad, clshroad, clshroad_state, empty_init, ROT0, "Wood Place Inc. (Data East license)", "Clash-Road (Data East license)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, firebatl, 0, firebatl, firebatl, clshroad_state, init_firebatl, ROT90, "Woodplace Inc. (Taito license)", "Fire Battle", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1986, clshroad, 0, clshroad, clshroad, clshroad_state, empty_init, ROT0, "Woodplace Inc.", "Clash-Road", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, clshroads, clshroad, clshroad, clshroad, clshroad_state, empty_init, ROT0, "Woodplace Inc. (Status Game Corp. license)", "Clash-Road (Status license)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, clshroadd, clshroad, clshroad, clshroad, clshroad_state, empty_init, ROT0, "Woodplace Inc. (Data East license)", "Clash-Road (Data East license)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/firetrap.cpp b/src/mame/drivers/firetrap.cpp
index 84573b9b47b..2659ba9a019 100644
--- a/src/mame/drivers/firetrap.cpp
+++ b/src/mame/drivers/firetrap.cpp
@@ -717,7 +717,7 @@ ROM_START( firetrap )
ROM_REGION( 0x20000, "maincpu", 0 ) /* 64k for code + 64k for banked ROMs */
ROM_LOAD( "di-02.4a", 0x00000, 0x8000, CRC(3d1e4bf7) SHA1(ee903b469619f49edb1727fb545c9a6085f50746) )
ROM_LOAD( "di-01.3a", 0x10000, 0x8000, CRC(9bbae38b) SHA1(dc1d3ed5da71bfb104fd54fc70c56833f31d281f) )
- ROM_LOAD( "di-00.2a", 0x18000, 0x8000, CRC(d0dad7de) SHA1(8783ebf6ddfef32f6036913d403f76c1545b813d) )
+ ROM_LOAD( "di-00-a.2a", 0x18000, 0x8000, CRC(f39e2cf4) SHA1(ce77a65089937906d8a41076a3f29ad6f45fda9d) ) // this rom has data at 3FD7 where it seems to be blanked out in firetrap, as well as other changes
ROM_REGION( 0x18000, "audiocpu", 0 ) /* 64k for the sound CPU + 32k for banked ROMs */
ROM_LOAD( "di-17.10j", 0x08000, 0x8000, CRC(8605f6b9) SHA1(4fba88f34afd91d2cbc578b3b70f5399b8844390) )
@@ -781,7 +781,7 @@ ROM_START( firetrapa )
ROM_REGION( 0x20000, "maincpu", 0 ) /* 64k for code + 64k for banked ROMs */
ROM_LOAD( "di-02.4a", 0x00000, 0x8000, CRC(3d1e4bf7) SHA1(ee903b469619f49edb1727fb545c9a6085f50746) )
ROM_LOAD( "di-01.3a", 0x10000, 0x8000, CRC(9bbae38b) SHA1(dc1d3ed5da71bfb104fd54fc70c56833f31d281f) )
- ROM_LOAD( "di-00-a.2a.bin", 0x18000, 0x8000, CRC(f39e2cf4) SHA1(ce77a65089937906d8a41076a3f29ad6f45fda9d) ) // this rom has data at 3FD7 where it seems to be blanked out in firetrap, as well as other changes
+ ROM_LOAD( "di-00.2a", 0x18000, 0x8000, CRC(d0dad7de) SHA1(8783ebf6ddfef32f6036913d403f76c1545b813d) )
ROM_REGION( 0x18000, "audiocpu", 0 ) /* 64k for the sound CPU + 32k for banked ROMs */
ROM_LOAD( "di-17.10j", 0x08000, 0x8000, CRC(8605f6b9) SHA1(4fba88f34afd91d2cbc578b3b70f5399b8844390) )
@@ -969,7 +969,7 @@ ROM_END
-GAME( 1986, firetrap, 0, firetrap, firetrap, firetrap_state, empty_init, ROT90, "Wood Place Inc. (Data East USA license)", "Fire Trap (US, set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, firetrapa, firetrap, firetrap, firetrap, firetrap_state, empty_init, ROT90, "Wood Place Inc. (Data East USA license)", "Fire Trap (US, set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, firetrapj, firetrap, firetrap, firetrapj, firetrap_state, empty_init, ROT90, "Wood Place Inc.", "Fire Trap (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, firetrapbl, firetrap, firetrapbl, firetrapbl, firetrap_state, empty_init, ROT90, "bootleg", "Fire Trap (Japan bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, firetrap, 0, firetrap, firetrap, firetrap_state, empty_init, ROT90, "Woodplace Inc. (Data East USA license)", "Fire Trap (US, rev A)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, firetrapa, firetrap, firetrap, firetrap, firetrap_state, empty_init, ROT90, "Woodplace Inc. (Data East USA license)", "Fire Trap (US)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, firetrapj, firetrap, firetrap, firetrapj, firetrap_state, empty_init, ROT90, "Woodplace Inc.", "Fire Trap (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, firetrapbl, firetrap, firetrapbl, firetrapbl, firetrap_state, empty_init, ROT90, "bootleg", "Fire Trap (Japan bootleg)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/kingobox.cpp b/src/mame/drivers/kingobox.cpp
index 3e7265daf9f..349c1804716 100644
--- a/src/mame/drivers/kingobox.cpp
+++ b/src/mame/drivers/kingobox.cpp
@@ -2,8 +2,8 @@
// copyright-holders:Ernesto Corvi
/***************************************************************************
-King of Boxer - (c) 1985 Wood Place Inc.
-Ring King - (c) 1985 Data East USA Inc. / Wood Place Inc.
+King of Boxer - (c) 1985 Woodplace Inc.
+Ring King - (c) 1985 Data East USA Inc. / Woodplace Inc.
Driver by:
Ernesto Corvi
@@ -865,9 +865,9 @@ void kingofb_state::init_ringkingw()
}
-GAME( 1985, kingofb, 0, kingofb, kingofb, kingofb_state, empty_init, ROT90, "Wood Place Inc.", "King of Boxer (World)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, kingofbj, kingofb, kingofb, kingofb, kingofb_state, empty_init, ROT90, "Wood Place Inc.", "King of Boxer (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, ringkingw, kingofb, kingofb, kingofb, kingofb_state, init_ringkingw, ROT90, "Wood Place Inc.", "Ring King (US, Wood Place Inc.)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, ringking, kingofb, ringking, ringking, kingofb_state, empty_init, ROT90, "Wood Place Inc. (Data East USA license)", "Ring King (US set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, ringking2, kingofb, ringking, ringking, kingofb_state, empty_init, ROT90, "Wood Place Inc. (Data East USA license)", "Ring King (US set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, ringking3, kingofb, kingofb, kingofb, kingofb_state, init_ringking3, ROT90, "Wood Place Inc. (Data East USA license)", "Ring King (US set 3)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, kingofb, 0, kingofb, kingofb, kingofb_state, empty_init, ROT90, "Woodplace Inc.", "King of Boxer (World)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, kingofbj, kingofb, kingofb, kingofb, kingofb_state, empty_init, ROT90, "Woodplace Inc.", "King of Boxer (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, ringkingw, kingofb, kingofb, kingofb, kingofb_state, init_ringkingw, ROT90, "Woodplace Inc.", "Ring King (US, Wood Place Inc.)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, ringking, kingofb, ringking, ringking, kingofb_state, empty_init, ROT90, "Woodplace Inc. (Data East USA license)", "Ring King (US set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, ringking2, kingofb, ringking, ringking, kingofb_state, empty_init, ROT90, "Woodplace Inc. (Data East USA license)", "Ring King (US set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, ringking3, kingofb, kingofb, kingofb, kingofb_state, init_ringking3, ROT90, "Woodplace Inc. (Data East USA license)", "Ring King (US set 3)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/thedeep.cpp b/src/mame/drivers/thedeep.cpp
index eed9144504f..bb5887edb91 100644
--- a/src/mame/drivers/thedeep.cpp
+++ b/src/mame/drivers/thedeep.cpp
@@ -6,16 +6,20 @@
driver by Luca Elia (l.elia@tin.it)
-Main CPU : Z80 (LH0080B @ 6MHz) + i8751 (Intel C8751H-88, protection)
-Sound CPU : 65C02 (R65C02P2 @ 2MHz)
+Board : DE-0298-1
+
+Main CPU : Z80 (LH0080B @ 6MHz) + i8751 (Intel C8751H-88 @ 8MHz, protection)
+
+Sound CPU : 65C02 (R65C02P2 @ 1.5MHz)
-Sound Chips : YM2203C
+Sound Chips : YM2203C (@ 3MHz)
Video Chips : L7B0073 DATA EAST MXC 06 8746
L7A0072 DATA EAST BAC 06 VAE8713
-Board : DE-0298-1
+XTAL : 12.000MHz, 8.000MHz
+
Notes:
@@ -24,6 +28,9 @@ Notes:
- One ROM (FI-1) is not used.
+NOTE: There is manual for Run Deep which is (c) 1988 by World Games. Is Cream Co, Ltd
+ the legitimate license and World Games the US distributors?
+
***************************************************************************/
#include "emu.h"
@@ -388,24 +395,6 @@ void thedeep_state::thedeep(machine_config &config)
***************************************************************************/
-/***************************************************************************
-
-Here are the proms for The Deep!
-NOTE: This game is Vertical.
-I couldn't test this board so I don't know the manufacturer, sorry.
-1 Z80
-1 R6502
-1 YM 2203
-1 OSC 12 Mhz
-1 OSC 8 Mhz
-1 MPU 8751 (which is read-protected)
-
-If you need more info or if this package doesn't
-Work, mail me.
-
-..............CaBBe!...................................
-
-***************************************************************************/
ROM_START( thedeep )
ROM_REGION( 0x20000, "maincpu", 0 ) /* Z80 Code */
@@ -471,5 +460,5 @@ ROM_START( rundeep )
ROM_LOAD( "fi-3", 0x400, 0x200, CRC(f61a9686) SHA1(24082f60b72268d240ceca6999bdf18872625cd2) )
ROM_END
-GAME( 1987, thedeep, 0, thedeep, thedeep, thedeep_state, empty_init, ROT270, "Wood Place Inc.", "The Deep (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, rundeep, thedeep, thedeep, thedeep, thedeep_state, empty_init, ROT270, "bootleg (Cream)", "Run Deep", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, thedeep, 0, thedeep, thedeep, thedeep_state, empty_init, ROT270, "Woodplace Inc.", "The Deep (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, rundeep, thedeep, thedeep, thedeep, thedeep_state, empty_init, ROT270, "Cream Co, Ltd.", "Run Deep", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/tsamurai.cpp b/src/mame/drivers/tsamurai.cpp
index 1b6cde80e5f..88127246244 100644
--- a/src/mame/drivers/tsamurai.cpp
+++ b/src/mame/drivers/tsamurai.cpp
@@ -1412,8 +1412,8 @@ GAME( 1985, nunchaku, ladymstr, tsamurai, nunchaku, tsamurai_state, empty_init
GAME( 1985, yamagchi, 0, tsamurai, yamagchi, tsamurai_state, empty_init, ROT90, "Kaneko / Taito", "Go Go Mr. Yamaguchi / Yuke Yuke Yamaguchi-kun", MACHINE_IMPERFECT_COLORS | MACHINE_SUPPORTS_SAVE )
-GAME( 1986, m660, 0, m660, m660, tsamurai_state, empty_init, ROT90, "Wood Place Inc. (Taito America Corporation license)", "Mission 660 (US)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, m660j, m660, m660, m660, tsamurai_state, empty_init, ROT90, "Wood Place Inc. (Taito Corporation license)", "Mission 660 (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, m660, 0, m660, m660, tsamurai_state, empty_init, ROT90, "Wood Place Co. Ltd. (Taito America Corporation license)", "Mission 660 (US)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, m660j, m660, m660, m660, tsamurai_state, empty_init, ROT90, "Wood Place Co. Ltd. (Taito Corporation license)", "Mission 660 (Japan)", MACHINE_SUPPORTS_SAVE )
GAME( 1986, m660b, m660, m660, m660, tsamurai_state, empty_init, ROT90, "bootleg", "Mission 660 (bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, alphaxz, m660, m660, m660, tsamurai_state, empty_init, ROT90, "Ed Co. Ltd. (Wood Place Inc. license)", "The Alphax Z (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, alphaxz, m660, m660, m660, tsamurai_state, empty_init, ROT90, "Ed Co. Ltd. (Wood Place Co. Ltd. license)", "The Alphax Z (Japan)", MACHINE_SUPPORTS_SAVE )
GAME( 1986, the26thz, m660, m660, m660, tsamurai_state, init_the26thz, ROT90, "Ed Co. Ltd. (Taito license)", "The 26th Z (Japan, location test)", MACHINE_SUPPORTS_SAVE )