summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2008-10-09 09:32:07 +0000
committer Aaron Giles <aaron@aarongiles.com>2008-10-09 09:32:07 +0000
commit39a8efbdfbdc8e2f76d9df055c213adcd27fd011 (patch)
treedb34e78f9573c9f755a2a439b79cb904057ca5cb /src
parent1b0d9feb585487c7857e6580c44ad294c6b14e0e (diff)
> From: Andrea Turci [mailto:aturci@gmail.com]
> Sent: Saturday, October 04, 2008 10:16 PM > To: submit@mamedev.org > Cc: ANY > Subject: Some stuff > > Diff aganist 127u6 > > New stuff > > Mk3 p4.0 (revision 1.0 in test menu, but marked P4.0 on chip label) > Decathlete V1.001 > > revisited stuff > > Gpworld brake-gas issue should be fine, I cannot enter into the test > menu to > find out is gas is gas and brake is brake or swapped > > Thanks Andrea
Diffstat (limited to 'src')
-rw-r--r--src/mame/drivers/gpworld.c29
-rw-r--r--src/mame/drivers/midwunit.c39
-rw-r--r--src/mame/drivers/stv.c19
-rw-r--r--src/mame/mamedriv.c2
4 files changed, 83 insertions, 6 deletions
diff --git a/src/mame/drivers/gpworld.c b/src/mame/drivers/gpworld.c
index 6afaf5d0c1c..af68cd86f99 100644
--- a/src/mame/drivers/gpworld.c
+++ b/src/mame/drivers/gpworld.c
@@ -49,6 +49,7 @@ static UINT8 nmi_enable;
static UINT8 start_lamp;
static UINT8 ldp_read_latch;
static UINT8 ldp_write_latch;
+static UINT8 brake_gas;
static UINT8* tile_RAM;
static UINT8* sprite_RAM;
@@ -225,6 +226,15 @@ static READ8_HANDLER( ldp_read )
return ldp_read_latch;
}
+static READ8_HANDLER( pedal_in )
+{
+ if (brake_gas)
+ return input_port_read(machine, "INACCEL");
+
+ return input_port_read(machine, "INBRAKE");
+
+}
+
/* WRITES */
static WRITE8_HANDLER( ldp_write )
{
@@ -235,11 +245,16 @@ static WRITE8_HANDLER( misc_io_write )
{
start_lamp = (data & 0x04) >> 1;
nmi_enable = (data & 0x40) >> 6;
-/* dunno = (data & 0x80) >> 7; */
+ /* dunno = (data & 0x80) >> 7; */ //coin counter???
logerror("NMI : %x (0x%x)\n", nmi_enable, data);
}
+static WRITE8_HANDLER( brake_gas_write )
+{
+ brake_gas = data & 0x01;
+}
+
static WRITE8_HANDLER( palette_write )
{
/* This is all just a (bad) guess */
@@ -268,10 +283,10 @@ static ADDRESS_MAP_START( mainmem, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xd000,0xd7ff) AM_RAM AM_BASE(&tile_RAM)
AM_RANGE(0xd800,0xd800) AM_READWRITE(ldp_read,ldp_write)
/* AM_RANGE(0xd801,0xd801) AM_READ(???) */
- AM_RANGE(0xda00,0xda00) AM_READ_PORT("INWHEEL")
+ AM_RANGE(0xda00,0xda00) AM_READ_PORT("INWHEEL") //8255 here....
/* AM_RANGE(0xda01,0xda01) AM_WRITE(???) */ /* These inputs are interesting - there are writes and reads all over these addr's */
-/* AM_RANGE(0xda02,0xda02) AM_READ_PORT("???") */ /* Reads here during the input test. */
- AM_RANGE(0xda20,0xda20) AM_READ_PORT("INACCEL") /* Seems to control both the brake and accel at once - maybe tied to 0xda02? Or to the writes here... */
+ AM_RANGE(0xda02,0xda02) AM_WRITE(brake_gas_write) /*bit 0 select gas/brake input */
+ AM_RANGE(0xda20,0xda20) AM_READ(pedal_in)
AM_RANGE(0xe000,0xffff) AM_RAM /* Potentially not all work RAM? */
ADDRESS_MAP_END
@@ -320,9 +335,12 @@ static INPUT_PORTS_START( gpworld )
PORT_BIT ( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME( "STRONG LEFT" ) PORT_CODE( KEYCODE_E )
PORT_BIT ( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME( "FIERCE LEFT" ) PORT_CODE( KEYCODE_W )
- PORT_START("INACCEL") /* both accelerator & brake right now :P */
+ PORT_START("INACCEL")
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_SENSITIVITY(30) PORT_KEYDELTA(10) PORT_PLAYER(1)
+ PORT_START("INBRAKE")
+ PORT_BIT( 0xff, 0x00, IPT_PEDAL2 ) PORT_SENSITIVITY(30) PORT_KEYDELTA(10) PORT_PLAYER(1)
+
PORT_START("DSW1")
PORT_DIPNAME( 0xf0, 0xf0, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:1,2,3,4")
PORT_DIPSETTING( 0x70, DEF_STR( 4C_1C ) )
@@ -490,6 +508,7 @@ static DRIVER_INIT( gpworld )
{
nmi_enable = 0;
start_lamp = 0;
+ brake_gas = 0;
ldp_write_latch = ldp_read_latch = 0;
}
diff --git a/src/mame/drivers/midwunit.c b/src/mame/drivers/midwunit.c
index 3dba9d8bb75..6ae5a07de42 100644
--- a/src/mame/drivers/midwunit.c
+++ b/src/mame/drivers/midwunit.c
@@ -779,6 +779,44 @@ ROM_START( mk3r10 )
ROM_END
+ROM_START( mk3p40 )
+ ROM_REGION16_LE( 0x800000, "dcs", ROMREGION_ERASEFF ) /* sound data */
+ ROM_LOAD16_BYTE( "umk3-u2.bin", 0x000000, 0x100000, CRC(3838cfe5) SHA1(e3d2901f3bae1362742fc6ee0aa31c9f63b4dfa3) )
+ ROM_LOAD16_BYTE( "umk3-u3.bin", 0x200000, 0x100000, CRC(856fe411) SHA1(6165ebecfce7500e948d84492ffa19eed7f47091) )
+ ROM_LOAD16_BYTE( "umk3-u4.bin", 0x400000, 0x100000, CRC(428a406f) SHA1(e70ec83cd054de0da1e178720ed0035b8887f797) )
+ ROM_LOAD16_BYTE( "umk3-u5.bin", 0x600000, 0x100000, CRC(3b98a09f) SHA1(edf1d02a56dcf3349e6b4bb4097acfe7592305f4) )
+
+ ROM_REGION16_LE( 0x100000, "user1", 0 ) /* 34010 code */
+ ROM_LOAD16_BYTE( "mk3p40.u54", 0x00000, 0x80000, CRC(4dfb0748) SHA1(8c628a51642c940de8abb795be36123e4008ce15) )
+ ROM_LOAD16_BYTE( "mk3p40.u63", 0x00001, 0x80000, CRC(f25a8083) SHA1(ff11462d23d9e16f6ee0d77bf85caa996df32618) )
+
+ ROM_REGION( 0x2000000, "gfx1", 0 )
+ ROM_LOAD( "umk-u133.bin", 0x0000000, 0x100000, CRC(79b94667) SHA1(31bba640c351fdccc6685cadb74dd79a3f910ce8) )
+ ROM_LOAD( "umk-u132.bin", 0x0100000, 0x100000, CRC(13e95228) SHA1(405b05f5a5a55667c2be17d4b399129bdacefd90) )
+ ROM_LOAD( "umk-u131.bin", 0x0200000, 0x100000, CRC(41001e30) SHA1(2cec91116771951c0380cec5debf4cbb40c14c61) )
+ ROM_LOAD( "umk-u130.bin", 0x0300000, 0x100000, CRC(49379dd7) SHA1(e6dfab4e23d9cc38ae56c1bbf10ccd160e8fad5e) )
+
+ ROM_LOAD( "umk-u129.bin", 0x0400000, 0x100000, CRC(a8b41803) SHA1(9697e35e8bb51d6d36b1d7ae47377b446e57682f) )
+ ROM_LOAD( "umk-u128.bin", 0x0500000, 0x100000, CRC(b410d72f) SHA1(ac5c1c6f744186540f4ab100d9bd4ce6007e600b) )
+ ROM_LOAD( "umk-u127.bin", 0x0600000, 0x100000, CRC(bd985be7) SHA1(f5183abea2e5eb2c2c8cefa72c9ed321679f5128) )
+ ROM_LOAD( "umk-u126.bin", 0x0700000, 0x100000, CRC(e7c32cf4) SHA1(94ea7b2eed7dae66f5dd676c20d6b360140e3e0e) )
+
+ ROM_LOAD( "umk-u125.bin", 0x0800000, 0x100000, CRC(9a52227e) SHA1(0474a14fa8dbfea0b0889c1d1756b86391683558) )
+ ROM_LOAD( "umk-u124.bin", 0x0900000, 0x100000, CRC(5c750ebc) SHA1(45d68af1a56994376e086d840502453c8d6be700) )
+ ROM_LOAD( "umk-u123.bin", 0x0a00000, 0x100000, CRC(f0ab88a8) SHA1(cdc9dc12e162255845c6627b1e35182b7e8502d0) )
+ ROM_LOAD( "umk-u122.bin", 0x0b00000, 0x100000, CRC(9b87cdac) SHA1(a5f8db559293978f23e6f105543d8b2e170a2e0d) )
+
+ ROM_LOAD( "mk3-u121.bin", 0x0c00000, 0x100000, CRC(b6c6296a) SHA1(7b92a92d65493bb201daf5ece6f00140f017ac51) )
+ ROM_LOAD( "mk3-u120.bin", 0x0d00000, 0x100000, CRC(8d1ccc3b) SHA1(35d91c00113718a08a9d56eb04366f8cf4069ba6) )
+ ROM_LOAD( "mk3-u119.bin", 0x0e00000, 0x100000, CRC(63215b59) SHA1(709bce15fba1520bcba40f0a5cb614542f1b460f) )
+ ROM_LOAD( "mk3-u118.bin", 0x0f00000, 0x100000, CRC(8b681e34) SHA1(524104ba2eb2deb3cfae9760e6b2125ce6b6633e) )
+
+ ROM_LOAD( "mk3-u117.bin", 0x1000000, 0x080000, CRC(1ab20377) SHA1(0c0d14464d8b23a60e0693669af2ddb82655eff8) )
+ ROM_LOAD( "mk3-u116.bin", 0x1100000, 0x080000, CRC(ba246ad0) SHA1(ec6bdd4b9cd3007bb66bb8de36d148abb30e7f11) )
+ ROM_LOAD( "mk3-u115.bin", 0x1200000, 0x080000, CRC(3ee8b124) SHA1(1523d51e36d3c336b134a562da36a29ba137c0f6) )
+ ROM_LOAD( "mk3-u114.bin", 0x1300000, 0x080000, CRC(a8d99922) SHA1(04ff8d85448701070672f44dbf5bcfd744f1bc8a) )
+ROM_END
+
ROM_START( umk3 )
ROM_REGION16_LE( 0x800000, "dcs", ROMREGION_ERASEFF ) /* sound data */
ROM_LOAD16_BYTE( "umk3-u2.bin", 0x000000, 0x100000, CRC(3838cfe5) SHA1(e3d2901f3bae1362742fc6ee0aa31c9f63b4dfa3) )
@@ -1192,6 +1230,7 @@ ROM_END
GAME( 1994, mk3, 0, wunit, mk3, mk3, ROT0, "Midway", "Mortal Kombat 3 (rev 2.1)", GAME_SUPPORTS_SAVE )
GAME( 1994, mk3r20, mk3, wunit, mk3, mk3r20, ROT0, "Midway", "Mortal Kombat 3 (rev 2.0)", GAME_SUPPORTS_SAVE )
GAME( 1994, mk3r10, mk3, wunit, mk3, mk3r10, ROT0, "Midway", "Mortal Kombat 3 (rev 1.0)", GAME_SUPPORTS_SAVE )
+GAME( 1994, mk3p40, mk3, wunit, mk3, mk3r10, ROT0, "Midway", "Mortal Kombat 3 (rev 1 chip label p4.0)", GAME_SUPPORTS_SAVE )
GAME( 1994, umk3, mk3, wunit, mk3, umk3, ROT0, "Midway", "Ultimate Mortal Kombat 3 (rev 1.2)", GAME_SUPPORTS_SAVE )
GAME( 1994, umk3r11, mk3, wunit, mk3, umk3r11, ROT0, "Midway", "Ultimate Mortal Kombat 3 (rev 1.1)", GAME_SUPPORTS_SAVE )
GAME( 1994, umk3r10, mk3, wunit, mk3, umk3r11, ROT0, "Midway", "Ultimate Mortal Kombat 3 (rev 1.0)", GAME_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/stv.c b/src/mame/drivers/stv.c
index c84a0856854..19f8ca2be14 100644
--- a/src/mame/drivers/stv.c
+++ b/src/mame/drivers/stv.c
@@ -2805,6 +2805,21 @@ ROM_START( decathlt )
STV_BIOS
ROM_REGION32_BE( 0x3000000, "user1", 0 ) /* SH2 code */
+ ROM_LOAD( "epr18967.a", 0x0000000, 0x0100000, CRC(c0446674) SHA1(4917089d95613c9d2a936ed9fe3ebd22f461aa4f) )
+ ROM_RELOAD ( 0x0100000, 0x0100000 )
+ ROM_RELOAD ( 0x0200000, 0x0100000 )
+ ROM_RELOAD ( 0x0300000, 0x0100000 )
+ ROM_LOAD16_WORD_SWAP( "mpr18968.2", 0x0400000, 0x0400000, CRC(11a891de) SHA1(1a4fa8d7e07e1d8fdc8122ef8a5b93723c007cda) ) // good (was .1)
+ ROM_LOAD16_WORD_SWAP( "mpr18969.3", 0x0800000, 0x0400000, CRC(199cc47d) SHA1(d78f7c6be7e9b43e208244c5c8722245f4c653e1) ) // good (was .2)
+ ROM_LOAD16_WORD_SWAP( "mpr18970.4", 0x0c00000, 0x0400000, CRC(8b7a509e) SHA1(8f4d36a858231764ed09b26a1141d1f055eee092) ) // good (was .3)
+ ROM_LOAD16_WORD_SWAP( "mpr18971.5", 0x1000000, 0x0400000, CRC(c87c443b) SHA1(f2fedb35c80e5c4855c7aebff88186397f4d51bc) ) // good (was .4)
+ ROM_LOAD16_WORD_SWAP( "mpr18972.6", 0x1400000, 0x0400000, CRC(45c64fca) SHA1(ae2f678b9885426ce99b615b7f62a451f9ef83f9) ) // good (was .5)
+ROM_END
+
+ROM_START( decathlo )
+ STV_BIOS
+
+ ROM_REGION32_BE( 0x3000000, "user1", 0 ) /* SH2 code */
ROM_LOAD( "epr18967.13", 0x0000000, 0x0100000, CRC(c0446674) SHA1(4917089d95613c9d2a936ed9fe3ebd22f461aa4f) )
ROM_RELOAD ( 0x0100000, 0x0100000 )
ROM_RELOAD ( 0x0200000, 0x0100000 )
@@ -3773,7 +3788,9 @@ GAME( 1997, stress, stvbios, stv, stv, ic13, ROT0, "Sega",
GAME( 1998, elandore, stvbios, stv, stv, elandore, ROT0, "Sai-Mate", "Elan Doree - Legend of Dragon (JUET 980922 V1.006)", GAME_UNEMULATED_PROTECTION | GAME_IMPERFECT_SOUND | GAME_NOT_WORKING )//japanese name?
GAME( 1995, vfremix, stvbios, stv, stv, vfremix, ROT0, "Sega", "Virtua Fighter Remix (JUETBKAL 950428 V1.000)", GAME_IMPERFECT_SOUND | GAME_NOT_WORKING )
GAME( 1997, findlove, stvbios, stv, stv, ic13, ROT0, "Daiki / FCF", "Find Love (J 971212 V1.000)", GAME_IMPERFECT_SOUND | GAME_NOT_WORKING )
-GAME( 1996, decathlt, stvbios, stv, stv, decathlt, ROT0, "Sega", "Decathlete (JUET 960424 V1.000)", GAME_NO_SOUND | GAME_NOT_WORKING | GAME_UNEMULATED_PROTECTION )
+GAME( 1996, decathlt, stvbios, stv, stv, decathlt, ROT0, "Sega", "Decathlete (JUET 960709 V1.001)", GAME_NO_SOUND | GAME_NOT_WORKING | GAME_UNEMULATED_PROTECTION )
+GAME( 1996, decathlo, decathlt, stv, stv, decathlt, ROT0, "Sega", "Decathlete (JUET 960424 V1.000)", GAME_NO_SOUND | GAME_NOT_WORKING | GAME_UNEMULATED_PROTECTION )
+
/* not working,black screen */
GAME( 1999, ffreveng, stvbios, stv, stv, ffreveng, ROT0, "Capcom", "Final Fight Revenge (JUET 990714 V1.000)", GAME_UNEMULATED_PROTECTION | GAME_NO_SOUND | GAME_NOT_WORKING )
diff --git a/src/mame/mamedriv.c b/src/mame/mamedriv.c
index 4eee9abca01..0a48bfba049 100644
--- a/src/mame/mamedriv.c
+++ b/src/mame/mamedriv.c
@@ -3744,6 +3744,7 @@ Sep.1994 Quiz Ghost Hunter
DRIVER( cotton2 ) /* (c) 1997 Success */
DRIVER( cottonbm ) /* (c) 1998 Success */
DRIVER( decathlt ) /* (c) 1995 */
+ DRIVER( decathlo ) /* (c) 1995 */
DRIVER( diehard ) /* (c) 1996 */
DRIVER( dnmtdeka ) /* (c) 1996 */
DRIVER( ejihon ) /* (c) 1995 */
@@ -6144,6 +6145,7 @@ BOMULEUL CHAJARA SEGA ST-V 1997/04/11
DRIVER( mk3 ) /* (c) 1994 Midway */
DRIVER( mk3r20 ) /* (c) 1994 Midway */
DRIVER( mk3r10 ) /* (c) 1994 Midway */
+ DRIVER( mk3p40 ) /* (c) 1994 Midway */
DRIVER( umk3 ) /* (c) 1994 Midway */
DRIVER( umk3r11 ) /* (c) 1994 Midway */
DRIVER( umk3r10 ) /* (c) 1994 Midway */