summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Osso <mesgnet@yahoo.it>2015-01-09 15:17:17 +0100
committer Osso <mesgnet@yahoo.it>2015-01-09 15:17:17 +0100
commitf4be822a4dda8bafeba72c6038636a47806cb83b (patch)
tree365728c9c649ea2733459388b510201234310ea1
parent8ab98240bcbbbd155993701b9c31358668c2d05a (diff)
parent4c423a0e66be7d2cd02d43460d86a7cb128fdb46 (diff)
Merge pull request #98 from p1pkin/naomi#0
new NOT WORKING
-rw-r--r--src/mame/drivers/naomi.c25
-rw-r--r--src/mame/mame.lst7
2 files changed, 21 insertions, 11 deletions
diff --git a/src/mame/drivers/naomi.c b/src/mame/drivers/naomi.c
index 46873f74359..20763dea10b 100644
--- a/src/mame/drivers/naomi.c
+++ b/src/mame/drivers/naomi.c
@@ -4189,6 +4189,7 @@ ROM_START( crakndj2 )
ROM_LOAD( "rom6.ic6s", 0x3000000, 0x800000, CRC(6832dd9f) SHA1(753c1fc998ef4522fae3e93b64f8c442d94e3e97) )
// note: this fails the ROM test on hardware with the same CRC, so it's not a "bad dump" in the traditional sense.
// we need someone with a second cartridge to verify if this is a Sega screwup or simply a damaged chip on this cart.
+ // ROM test passes good with last two zero bytes replaced by 0x09 0x51
ROM_LOAD( "rom7.ic7s", 0x3800000, 0x800000, BAD_DUMP CRC(9b59e856) SHA1(7da728695cac132bb0ac59116ca400fff913f966) )
ROM_LOAD( "rom8.ic8s", 0x4000000, 0x800000, CRC(9bea71f4) SHA1(fa3734b072404612e29ed96b3bcb8d416fbe86e3) )
ROM_LOAD( "rom9.ic9s", 0x4800000, 0x800000, CRC(6029839d) SHA1(04c078e9422bf34a02f0b618a54981cd615da47d) )
@@ -7371,6 +7372,18 @@ ROM_START( confmiss )
ROM_LOAD("317-0298-com.pic", 0x00, 0x4000, CRC(15971bf6) SHA1(815152ab05edb1789a26898cfd66b5a7c4a1f765) )
ROM_END
+ROM_START( shaktam )
+ NAOMIGD_BIOS
+ NAOMI_DEFAULT_EEPROM
+
+ DISK_REGION( "gdrom" )
+ DISK_IMAGE_READONLY( "gds-0002b", 0, SHA1(c656497b44d5ca4743aa1a8d836af2bfa3484dd5) )
+
+ ROM_REGION( 0x4000, "pic", ROMREGION_ERASEFF)
+ // key PIC is missing
+ ROM_LOAD("317-xxxx-com.pic", 0x00, 0x4000, BAD_DUMP CRC(034b7299) SHA1(45118d5f65b21ae599e3ca8e35df847135708d44) )
+ROM_END
+
ROM_START( sprtjam )
NAOMIGD_BIOS
NAOMI_DEFAULT_EEPROM
@@ -7378,11 +7391,9 @@ ROM_START( sprtjam )
DISK_REGION( "gdrom" )
DISK_IMAGE_READONLY( "gds-0003", 0, SHA1(79a0d8e1aa3e6f660ef4f302d9d54c1a6d2057e3) )
+ ROM_REGION( 0x4000, "pic", ROMREGION_ERASEFF)
//PIC16C622A (317-0300-COM)
//(sticker 253-5508-0300)
- //ROM_LOAD("317-0300-com.data", 0x00, 0x50, CRC(9a08413f) SHA1(d57649dcc3af578d55a93dd7a3f41da62d580f54) )
-
- ROM_REGION( 0x4000, "pic", ROMREGION_ERASEFF)
ROM_LOAD("317-0300-com.pic", 0x00, 0x4000, CRC(19a97214) SHA1(bcee1af2c16daabc7a0f723e1f9281a7c95600c6) )
ROM_END
@@ -9087,12 +9098,12 @@ GAME( 2003, puyofevp, naomi, naomim1, naomi, naomi_state, naomi, ROT0, "Sega", "
/* 0001 */ GAME( 2000, confmiss, naomigd, naomigd, hotd2, naomi_state, naomigd, ROT0, "Sega", "Confidential Mission (GDS-0001)", GAME_FLAGS )
// 0002 Shakatto Tambourine (GDS-0002)
// 0002A Shakatto Tambourine (Rev A) (GDS-0002A)
-// 0002B Shakatto Tambourine (Rev B) (GDS-0002B)
+/* 0002B */ GAME( 2000, shaktam, naomigd, naomigd, shaktamb, naomi_state, naomigd, ROT0, "Sega", "Shakatto Tambourine (Rev B) (GDS-0002B)", GAME_FLAGS )
/* 0003 */ GAME( 2000, sprtjam, naomigd, naomigd, naomi, naomi_state, naomigd, ROT0, "Sega", "Sports Jam (GDS-0003)", GAME_FLAGS )
/* 0004 */ GAME( 2000, slashout, naomigd, naomigd, naomi, naomi_state, naomigd, ROT0, "Sega", "Slashout (GDS-0004)", GAME_FLAGS )
/* 0005 */ GAME( 2001, spkrbtl, naomigd, naomigd, naomi, naomi_state, naomigd, ROT0, "Sega", "Spikers Battle (GDS-0005)", GAME_FLAGS )
/* 0006 */ GAME( 2001, vstrik3, naomi2, naomi2gd, naomi, naomi_state, naomi2, ROT0, "Sega", "Virtua Striker 3 Ver. 2002 (GDS-0006)", GAME_FLAGS )
-// 0007 Shakatto Tambourine Motto Norinori Shinkyoku Tsuika
+// 0007
/* 0008 */ GAME( 2001, monkeyba, naomigd, naomigd, monkeyba,naomi_state, naomigd, ROT0, "Sega", "Monkey Ball (GDS-0008)", GAME_FLAGS )
// 0009 Dynamic Golf / Virtua Golf
/* 0009A */ GAME( 2001, dygolf, naomigd, naomigd, naomi, naomi_state, naomigd, ROT0, "Sega", "Dynamic Golf / Virtua Golf (Rev A) (GDS-0009A)", GAME_FLAGS )
@@ -9102,11 +9113,11 @@ GAME( 2003, puyofevp, naomi, naomim1, naomi, naomi_state, naomi, ROT0, "Sega", "
// 0012A Virtua Fighter 4 (Rev A)
/* 0012B */ GAME( 2001, vf4b, vf4, naomi2gd, naomi, naomi_state, naomi2, ROT0, "Sega", "Virtua Fighter 4 (Rev B) (GDS-0012B)", GAME_FLAGS )
/* 0012C */ GAME( 2001, vf4c, vf4, naomi2gd, naomi, naomi_state, naomi2, ROT0, "Sega", "Virtua Fighter 4 (Rev C) (GDS-0012C)", GAME_FLAGS )
-/* 0013 */ GAME( 2001, shaktmsp, naomigd, naomigd, shaktamb, naomi_state, naomigd, ROT0, "Sega", "Shakatto Tambourine 2K1 SPR (GDS-0013)", GAME_FLAGS )
+/* 0013 */ GAME( 2001, shaktmsp, naomigd, naomigd, shaktamb, naomi_state, naomigd, ROT0, "Sega", "Shakatto Tambourine Motto Norinori Shinkyoku Tsuika (2K1 SPR) (GDS-0013)", GAME_FLAGS )
/* 0014 */ GAME( 2001, beachspi, naomi2, naomi2gd, naomi, naomi_state, naomi2, ROT0, "Sega", "Beach Spikers (GDS-0014)", GAME_FLAGS )
// 0015 Virtua Tennis 2 / Power Smash 2
/* 0015A */ GAME( 2001, vtennis2, naomigd, naomigd, naomi, naomi_state, naomigd, ROT0, "Sega", "Virtua Tennis 2 / Power Smash 2 (Rev A) (GDS-0015A)", GAME_FLAGS )
-/* 0016 */ GAME( 2001, shaktamb, naomigd, naomigd, shaktamb, naomi_state, naomigd, ROT0, "Sega", "Shakatto Tambourine Cho Powerup Chu 2K1 AUT (GDS-0016)", GAME_FLAGS )
+/* 0016 */ GAME( 2001, shaktamb, naomigd, naomigd, shaktamb, naomi_state, naomigd, ROT0, "Sega", "Shakatto Tambourine Cho Powerup Chu (2K1 AUT) (GDS-0016)", GAME_FLAGS )
/* 0017 */ GAME( 2001, keyboard, naomigd, naomigd, naomi, naomi_state, naomigd, ROT0, "Sega", "La Keyboard (GDS-0017)", GAME_FLAGS )
/* 0018 */ GAME( 2001, lupinsho, naomigd, naomigd, hotd2, naomi_state, naomigd, ROT0, "Sega / Eighting", "Lupin The Third - The Shooting (GDS-0018)", GAME_FLAGS )
// 0018A Lupin The Third - The Shooting (Rev A)
diff --git a/src/mame/mame.lst b/src/mame/mame.lst
index c2ca0921b38..6d041420b56 100644
--- a/src/mame/mame.lst
+++ b/src/mame/mame.lst
@@ -5374,11 +5374,11 @@ ninjaslt1 // 2000.11 Ninja Assault (NJA1 Ver. A)
ninjaslt2 // 2000.11 Ninja Assault (NJA2 Ver. A)
ninjaslt // 2000.11 Ninja Assault (NJA3 Ver. A)
ninjaslt4 // 2000.11 Ninja Assault (NJA4 Ver. A)
- // 2000.11 Shakatto Tambourine (Rev B)
wwfroyal // 2000.11 WWF Royal Rumble
sprtjam // 2000.11.13 Sports Jam
pjustic // 2000.12 Moero Justice Gakuen / Project Justice
samba2k // 2000.12 Samba de Amigo Ver.2000
+shaktam // 2000.12.28 Shakatto Tambourine (Rev B)
// 2000.?? Boat Race Ocean Heats
csmash // 2000.?? Cosmic Smash
csmasho // 2000.?? Cosmic Smash (original)
@@ -5388,9 +5388,8 @@ f355twn2 // 2001.01 F355 Challenge 2 Twin
sfz3ugd // 2001.02 Street Fighter ZERO3 Upper
gundmgd // 2001.03 Mobile Suit Gundam: Federation Vs. Zeon (GD-ROM)
gundmct // 2001.03 Mobile Suit Gundam: Federation Vs. Zeon (cartridge)
+shaktmsp // 2001.04.04 Shakatto Tambourine Motto Norinori Shinkyoku Tsuika (2K1 SPR)
dygolf // 2001.04.27 Dynamic Golf / Virtua Golf (Rev A)
- // 2001.04 Shakatto Tambourine Motto Norinori Shinkyoku Tsuika
-shaktmsp // 2001.04.04 Shakatto Tambourine 2K1 SPR
monkeyba // 2001.05 Monkey Ball
zerogu2 // 2001.05 Zero Gunner 2
cvsgd // 2001.06 Capcom Vs. SNK Millennium Fight 2000 Pro
@@ -5410,7 +5409,7 @@ gundmxgd // 2001.09 Mobile Suit Gundam: Federation Vs. Zeon DX
derbyoc2 // 2001.10 Derby Owners Club II (Rev B)
inunoos // 2001.10 Inu No Osanpo / Dog Walking (Rev A)
vtenis2c // 2001.10 Virtua Tennis 2 / Power Smash 2 (cartridge)
-shaktamb // 2001.10.17 Shakatto Tambourine Cho Powerup Chu 2K1 AUT
+shaktamb // 2001.10.17 Shakatto Tambourine Cho Powerup Chu (2K1 AUT)
keyboard // 2001.11 La Keyboard
ikaruga // 2001.12 Ikaruga
lupinsho // 2001.12 Lupin the Third: the Shooting