summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2008-11-08 19:27:50 +0000
committer Aaron Giles <aaron@aarongiles.com>2008-11-08 19:27:50 +0000
commit274be4757cef9e628b9e6e54a280e4d0a1635673 (patch)
treedf2dca0632ecc6eba6079e8a6387d208e3f53cae /src
parentb67d1cd7cbfbd208d13c4f34b26791ea9875ef7d (diff)
From: Corrado Tomaselli [mailto:corrado.to@tiscali.it]
Sent: Saturday, November 01, 2008 7:14 PM To: submit@mamedev.org Subject: psycho nics oscar revision change I changed Psicho Nics Oscar (japan revision 0) to (world revision 0) since there is no japan disclaimer
Diffstat (limited to 'src')
-rw-r--r--src/mame/drivers/dec8.c32
-rw-r--r--src/mame/mamedriv.c6
2 files changed, 19 insertions, 19 deletions
diff --git a/src/mame/drivers/dec8.c b/src/mame/drivers/dec8.c
index 06dabd374f0..ab856420e9f 100644
--- a/src/mame/drivers/dec8.c
+++ b/src/mame/drivers/dec8.c
@@ -1425,7 +1425,7 @@ static INPUT_PORTS_START( oscar )
PORT_DIPSETTING( 0x80, DEF_STR( Yes ) )
INPUT_PORTS_END
-static INPUT_PORTS_START( oscarj0 )
+static INPUT_PORTS_START( oscaru )
PORT_START("IN0")
PLAYER1_JOYSTICK
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 )
@@ -2999,14 +2999,14 @@ ROM_END
ROM_START( oscar )
ROM_REGION( 0x20000, "main", 0 )
- ROM_LOAD( "ed10", 0x08000, 0x08000, CRC(f9b0d4d4) SHA1(dc2aba978ba96f365027c7be5714728d5d7fb802) )
+ ROM_LOAD( "du10", 0x08000, 0x08000, CRC(120040d8) SHA1(22d5f84f3ca724cbf39dfc4790f2175ba4945aaf) )
ROM_LOAD( "ed09", 0x10000, 0x10000, CRC(e2d4bba9) SHA1(99f0310debe51f4bcd00b5fdaedc1caf2eeccdeb) )
ROM_REGION( 0x10000, "sub", 0 ) /* CPU 2, 1st 16k is empty */
- ROM_LOAD( "ed11", 0x0000, 0x10000, CRC(10e5d919) SHA1(13bc3497cb4aaa6dd272853819212ad63656f8a7) )
+ ROM_LOAD( "du11", 0x0000, 0x10000, CRC(ff45c440) SHA1(4769944bcfebcdcba7ed7d5133d4d9f98890d75c) )
ROM_REGION( 2*0x10000, "audio", 0 ) /* 64K for sound CPU + 64k for decrypted opcodes */
- ROM_LOAD( "ed12", 0x8000, 0x8000, CRC(432031c5) SHA1(af2deea48b98eb0f9e85a4fb1486021f999f9abd) )
+ ROM_LOAD( "ed12", 0x8000, 0x8000, CRC(432031c5) SHA1(af2deea48b98eb0f9e85a4fb1486021f999f9abd) )
ROM_REGION( 0x1000, "cpu3", 0 ) /* ID8751H MCU */
ROM_LOAD( "id8751h.mcu", 0x0000, 0x1000, NO_DUMP )
@@ -3025,21 +3025,18 @@ ROM_START( oscar )
ROM_LOAD( "ed03", 0x20000, 0x10000, CRC(4fc4fb0f) SHA1(0906762a3adbffe765e072255262fedaa78bdb2a) )
ROM_LOAD( "ed00", 0x40000, 0x10000, CRC(ac201f2d) SHA1(77f13eb6a1a44444ca9b25363031451b0d68c988) )
ROM_LOAD( "ed02", 0x60000, 0x10000, CRC(7ddc5651) SHA1(f5ec5245cf3d9d4d9c1df6a8128c24565e331317) )
-
- ROM_REGION( 512, "proms", 0 )
- ROM_LOAD( "du-13.bin", 0x00000, 0x200, CRC(bea1f87e) SHA1(f5215992e4b53c9cd4c7e0b20ff5cfdce3ab6d02) ) /* Priority (Not yet used) */
ROM_END
-ROM_START( oscarj0 )
+ROM_START( oscaru )
ROM_REGION( 0x20000, "main", 0 )
- ROM_LOAD( "du10", 0x08000, 0x08000, CRC(120040d8) SHA1(22d5f84f3ca724cbf39dfc4790f2175ba4945aaf) )
+ ROM_LOAD( "ed10", 0x08000, 0x08000, CRC(f9b0d4d4) SHA1(dc2aba978ba96f365027c7be5714728d5d7fb802) )
ROM_LOAD( "ed09", 0x10000, 0x10000, CRC(e2d4bba9) SHA1(99f0310debe51f4bcd00b5fdaedc1caf2eeccdeb) )
ROM_REGION( 0x10000, "sub", 0 ) /* CPU 2, 1st 16k is empty */
- ROM_LOAD( "du11", 0x0000, 0x10000, CRC(ff45c440) SHA1(4769944bcfebcdcba7ed7d5133d4d9f98890d75c) )
+ ROM_LOAD( "ed11", 0x0000, 0x10000, CRC(10e5d919) SHA1(13bc3497cb4aaa6dd272853819212ad63656f8a7) )
ROM_REGION( 2*0x10000, "audio", 0 ) /* 64K for sound CPU + 64k for decrypted opcodes */
- ROM_LOAD( "ed12", 0x8000, 0x8000, CRC(432031c5) SHA1(af2deea48b98eb0f9e85a4fb1486021f999f9abd) )
+ ROM_LOAD( "ed12", 0x8000, 0x8000, CRC(432031c5) SHA1(af2deea48b98eb0f9e85a4fb1486021f999f9abd) )
ROM_REGION( 0x1000, "cpu3", 0 ) /* ID8751H MCU */
ROM_LOAD( "id8751h.mcu", 0x0000, 0x1000, NO_DUMP )
@@ -3058,6 +3055,9 @@ ROM_START( oscarj0 )
ROM_LOAD( "ed03", 0x20000, 0x10000, CRC(4fc4fb0f) SHA1(0906762a3adbffe765e072255262fedaa78bdb2a) )
ROM_LOAD( "ed00", 0x40000, 0x10000, CRC(ac201f2d) SHA1(77f13eb6a1a44444ca9b25363031451b0d68c988) )
ROM_LOAD( "ed02", 0x60000, 0x10000, CRC(7ddc5651) SHA1(f5ec5245cf3d9d4d9c1df6a8128c24565e331317) )
+
+ ROM_REGION( 512, "proms", 0 )
+ ROM_LOAD( "du-13.bin", 0x00000, 0x200, CRC(bea1f87e) SHA1(f5215992e4b53c9cd4c7e0b20ff5cfdce3ab6d02) ) /* Priority (Not yet used) */
ROM_END
ROM_START( oscarj1 )
@@ -3093,7 +3093,7 @@ ROM_START( oscarj1 )
ROM_LOAD( "du-13.bin", 0x00000, 0x200, CRC(bea1f87e) SHA1(f5215992e4b53c9cd4c7e0b20ff5cfdce3ab6d02) ) /* Priority (Not yet used) */
ROM_END
-ROM_START( oscarj )
+ROM_START( oscarj2 )
ROM_REGION( 0x20000, "main", 0 )
ROM_LOAD( "oscr10-2.bin", 0x08000, 0x08000, CRC(114e898d) SHA1(1072ccabe6d53c50cdfa1e27d5d848ecdd6559cc) ) /* DU10-2 */
ROM_LOAD( "ed09", 0x10000, 0x10000, CRC(e2d4bba9) SHA1(99f0310debe51f4bcd00b5fdaedc1caf2eeccdeb) )
@@ -3527,10 +3527,10 @@ GAME( 1987, srdarwin, 0, srdarwin, srdarwin, deco222, ROT270, "Data East
GAME( 1987, srdarwnj, srdarwin, srdarwin, srdarwin, deco222, ROT270, "Data East Corporation", "Super Real Darwin (Japan)", 0 )
GAME( 1987, gondo, 0, gondo, gondo, 0, ROT270, "Data East USA", "Gondomania (US)", 0 )
GAME( 1987, makyosen, gondo, gondo, gondo, 0, ROT270, "Data East Corporation", "Makyou Senshi (Japan)", 0 )
-GAME( 1988, oscar, 0, oscar, oscar, deco222, ROT0, "Data East USA", "Psycho-Nics Oscar (US)", 0 )
-GAME( 1987, oscarj, oscar, oscar, oscar, deco222, ROT0, "Data East Corporation", "Psycho-Nics Oscar (Japan revision 2)", 0 )
-GAME( 1987, oscarj1, oscar, oscar, oscar, deco222, ROT0, "Data East Corporation", "Psycho-Nics Oscar (Japan revision 1)", 0 )
-GAME( 1987, oscarj0, oscar, oscar, oscarj0, deco222, ROT0, "Data East Corporation", "Psycho-Nics Oscar (Japan revision 0)", 0 )
+GAME( 1988, oscar, 0, oscar, oscar, deco222, ROT0, "Data East Corporation", "Psycho-Nics Oscar (World revision 0)", 0 )
+GAME( 1987, oscaru, oscar, oscar, oscaru, deco222, ROT0, "Data East USA", "Psycho-Nics Oscar (US)", 0 )
+GAME( 1987, oscarj1, oscar, oscar, oscaru, deco222, ROT0, "Data East Corporation", "Psycho-Nics Oscar (Japan revision 1)", 0 )
+GAME( 1987, oscarj2, oscar, oscar, oscaru, deco222, ROT0, "Data East Corporation", "Psycho-Nics Oscar (Japan revision 2)", 0 )
GAME( 1986, lastmisn, 0, lastmiss, lastmisn, 0, ROT270, "Data East USA", "Last Mission (US revision 6)", 0 )
GAME( 1986, lastmsno, lastmisn, lastmiss, lastmisn, 0, ROT270, "Data East USA", "Last Mission (US revision 5)", 0 )
GAME( 1986, lastmsnj, lastmisn, lastmiss, lastmsnj, 0, ROT270, "Data East Corporation", "Last Mission (Japan)", 0 )
diff --git a/src/mame/mamedriv.c b/src/mame/mamedriv.c
index c05c2ee6853..c6c09e953ce 100644
--- a/src/mame/mamedriv.c
+++ b/src/mame/mamedriv.c
@@ -4287,10 +4287,10 @@ BOMULEUL CHAJARA SEGA ST-V 1997/04/11
DRIVER( garyoret ) /* (c) 1987 Data East Corporation (Japan) */
DRIVER( cobracom ) /* (c) 1988 Data East Corporation (World) */
DRIVER( cobracmj ) /* (c) 1988 Data East Corporation (Japan) */
- DRIVER( oscar ) /* (c) 1988 Data East USA (US) */
- DRIVER( oscarj ) /* (c) 1987 Data East Corporation (Japan) */
+ DRIVER( oscar ) /* (c) 1988 Data East Corporation (World) */
+ DRIVER( oscaru ) /* (c) 1987 Data East USA (US) */
DRIVER( oscarj1 ) /* (c) 1987 Data East Corporation (Japan) */
- DRIVER( oscarj0 ) /* (c) 1987 Data East Corporation (Japan) */
+ DRIVER( oscarj2 ) /* (c) 1987 Data East Corporation (Japan) */
/* Data East 16-bit games */
DRIVER( karnov ) /* (c) 1987 Data East USA (US) */