diff --git a/src/mame/drivers/kaneko16.c b/src/mame/drivers/kaneko16.c index 82a98a5c03d..5a92e70a039 100644 --- a/src/mame/drivers/kaneko16.c +++ b/src/mame/drivers/kaneko16.c @@ -3347,8 +3347,10 @@ ROUTINES: ***************************************************************************/ -// some bad graphic roms -// sound roms should probably also be checked.. +// sound banking for music still seems to be wrong see http://www.youtube.com/watch?v=lz4gY9d7uxw +// (sound is missing on the VS. screen) +// the 'green garbage' on the VS logo shown in the video doesn't happen on the real PCB, it appears to be an encoding artifact +// on the videos uploaded by this poster ROM_START( shogwarr ) ROM_REGION( 0x040000, "maincpu", 0 ) /* 68000 Code */ @@ -3358,12 +3360,12 @@ ROM_START( shogwarr ) ROM_REGION( 0x020000, "cpu1", 0 ) /* MCU Code */ ROM_LOAD( "fb040a.u33", 0x000000, 0x020000, CRC(4b62c4d9) SHA1(35c943dde70438a411714070e42a84366db5ef83) ) - ROM_REGION( 0x1000000, "gfx1", ROMREGION_ERASEFF ) /* Sprites */ /* not sure these are all correct size */ + ROM_REGION( 0x1000000, "gfx1", ROMREGION_ERASEFF ) /* Sprites */ ROM_LOAD( "fb-020a.u1", 0x000000, 0x100000, CRC(87e55c6d) SHA1(87886c045d7c30b8dee3c8fb0bf8f2cdbc5fd7fb) ) ROM_LOAD( "fb020b.u2", 0x100000, 0x100000, CRC(276b9d7b) SHA1(7a154f65b4737f2b6ac8effa3352711079f571dc) ) ROM_LOAD( "fb021a.u3", 0x200000, 0x100000, CRC(7da15d37) SHA1(345cf2242e8210a697294a45197f2b3b974de885) ) ROM_LOAD( "fb021b.u4", 0x300000, 0x100000, CRC(6a512d7b) SHA1(7fc3002d23262a9a590a283ea9e111e38d889ef2) ) - ROM_LOAD( "fb022a.u5", 0x400000, 0x080000, BAD_DUMP CRC(60aa1282) SHA1(4648816016e00df3256226ba5134f6e5bb429909) ) // half size? + ROM_LOAD( "fb-22a.u5", 0x400000, 0x100000, CRC(9039e5d3) SHA1(222452cd7947f7c99c68e495835cca62e0449b5c) ) ROM_LOAD( "fb-22b.u6", 0x500000, 0x100000, CRC(96ac9e54) SHA1(2b066375963dc57fe2ce89d65f6c0a9d183a838d) ) ROM_LOAD( "fb023.u7", 0x600000, 0x100000, CRC(132794bd) SHA1(bcc73c3183c59a4b66f79d04774773b8a9239501) ) @@ -3371,13 +3373,21 @@ ROM_START( shogwarr ) ROM_LOAD( "fb010.u65", 0x000000, 0x100000, CRC(296ffd92) SHA1(183a28e4594c428deb4726ed22d5166592b94b60) ) // 42 pin mask rom ROM_LOAD( "fb011.u66", 0x100000, 0x080000, CRC(500a0367) SHA1(6dc5190f81b21f59ee56a3b2332c8d86d6599782) ) // 40 pin mask rom (verified correct) - ROM_REGION( 0x400000*16, "oki1", 0 ) /* Samples */ - ROM_LOAD( "fb000e.u42", 0x000000, 0x080000, CRC(969f1465) SHA1(4f56d1ad341b08f4db41b7ab2498740612ff7c3d) ) // 2 x $40000 - ROM_LOAD( "fb001e.u43", 0x080000, 0x080000, CRC(f524aaa1) SHA1(006a886f9df2e57c51b61c6cea70a6574fc20304) ) // 2 x $40000 + ROM_REGION( 0x300000, "samples", 0 ) + /* OKI 1 */ + ROM_LOAD( "fb001e.u43", 0x000000, 0x080000, CRC(f524aaa1) SHA1(006a886f9df2e57c51b61c6cea70a6574fc20304) ) + ROM_LOAD( "fb000e.u42", 0x080000, 0x080000, CRC(969f1465) SHA1(4f56d1ad341b08f4db41b7ab2498740612ff7c3d) ) - ROM_REGION( 0x400000*16, "oki2", 0 ) /* Samples */ - ROM_LOAD( "fb002.u44", 0x000000, 0x080000, CRC(05d7c2a9) SHA1(e34d395985caec10139a22daa179bb185df157d6) ) // 2 x $40000 - ROM_LOAD( "fb003.u45", 0x080000, 0x080000, CRC(405722e9) SHA1(92e51093d50f74f650ba137f5fc2910e0f85337e) ) // 2 x $40000 + /* OKI 2 */ + ROM_LOAD( "fb-003.u44", 0x100000, 0x100000, CRC(0aea4ac5) SHA1(8f3b30e505b0ba51c140a0a2c071680d4fa05db9) ) + ROM_LOAD( "fb-002.u45", 0x200000, 0x100000, CRC(010acc17) SHA1(2dc0897c7778eacf6bce12ff0adbadb307ea6c17) ) + + /* Sound data is copied here during driver init */ + ROM_REGION( 0x400000*16, "oki1", 0 ) + ROM_FILL( 0x00000, 0x400000*16, 0x00 ) + + ROM_REGION( 0x400000*16, "oki2", 0 ) + ROM_FILL( 0x00000, 0x400000*16, 0x00 ) ROM_END /*************************************************************************** @@ -3417,26 +3427,34 @@ ROM_START( shogwarre ) ROM_REGION( 0x020000, "cpu1", 0 ) /* MCU Code */ ROM_LOAD( "fb040e.u33", 0x000000, 0x020000, CRC(299d0746) SHA1(67fe3a47ab01fa02ce2bb5836c2041986c19d875) ) - ROM_REGION( 0x1000000, "gfx1", ROMREGION_ERASEFF ) /* Sprites */ /* not sure these are all correct size */ + ROM_REGION( 0x1000000, "gfx1", ROMREGION_ERASEFF ) /* Sprites */ ROM_LOAD( "fb-020a.u1", 0x000000, 0x100000, CRC(87e55c6d) SHA1(87886c045d7c30b8dee3c8fb0bf8f2cdbc5fd7fb) ) ROM_LOAD( "fb020b.u2", 0x100000, 0x100000, CRC(276b9d7b) SHA1(7a154f65b4737f2b6ac8effa3352711079f571dc) ) ROM_LOAD( "fb021a.u3", 0x200000, 0x100000, CRC(7da15d37) SHA1(345cf2242e8210a697294a45197f2b3b974de885) ) ROM_LOAD( "fb021b.u4", 0x300000, 0x100000, CRC(6a512d7b) SHA1(7fc3002d23262a9a590a283ea9e111e38d889ef2) ) - ROM_LOAD( "fb022a.u5", 0x400000, 0x080000, BAD_DUMP CRC(60aa1282) SHA1(4648816016e00df3256226ba5134f6e5bb429909) ) // half size? + ROM_LOAD( "fb-22a.u5", 0x400000, 0x100000, CRC(9039e5d3) SHA1(222452cd7947f7c99c68e495835cca62e0449b5c) ) ROM_LOAD( "fb-22b.u6", 0x500000, 0x100000, CRC(96ac9e54) SHA1(2b066375963dc57fe2ce89d65f6c0a9d183a838d) ) ROM_LOAD( "fb023.u7", 0x600000, 0x100000, CRC(132794bd) SHA1(bcc73c3183c59a4b66f79d04774773b8a9239501) ) ROM_REGION( 0x400000, "gfx2", 0 ) /* Tiles (scrambled) */ ROM_LOAD( "fb010.u65", 0x000000, 0x100000, CRC(296ffd92) SHA1(183a28e4594c428deb4726ed22d5166592b94b60) ) // 42 pin mask rom ROM_LOAD( "fb011.u66", 0x100000, 0x080000, CRC(500a0367) SHA1(6dc5190f81b21f59ee56a3b2332c8d86d6599782) ) // 40 pin mask rom (verified correct) + + ROM_REGION( 0x300000, "samples", 0 ) + /* OKI 1 */ + ROM_LOAD( "fb001e.u43", 0x000000, 0x080000, CRC(f524aaa1) SHA1(006a886f9df2e57c51b61c6cea70a6574fc20304) ) + ROM_LOAD( "fb000e.u42", 0x080000, 0x080000, CRC(969f1465) SHA1(4f56d1ad341b08f4db41b7ab2498740612ff7c3d) ) - ROM_REGION( 0x400000*16, "oki1", 0 ) /* Samples */ - ROM_LOAD( "fb000e.u42", 0x000000, 0x080000, CRC(969f1465) SHA1(4f56d1ad341b08f4db41b7ab2498740612ff7c3d) ) // 2 x $40000 - ROM_LOAD( "fb001e.u43", 0x080000, 0x080000, CRC(f524aaa1) SHA1(006a886f9df2e57c51b61c6cea70a6574fc20304) ) // 2 x $40000 + /* OKI 2 */ + ROM_LOAD( "fb-003.u44", 0x100000, 0x100000, CRC(0aea4ac5) SHA1(8f3b30e505b0ba51c140a0a2c071680d4fa05db9) ) + ROM_LOAD( "fb-002.u45", 0x200000, 0x100000, CRC(010acc17) SHA1(2dc0897c7778eacf6bce12ff0adbadb307ea6c17) ) + + /* Sound data is copied here during driver init */ + ROM_REGION( 0x400000*16, "oki1", 0 ) + ROM_FILL( 0x00000, 0x400000*16, 0x00 ) - ROM_REGION( 0x400000*16, "oki2", 0 ) /* Samples */ - ROM_LOAD( "fb002.u44", 0x000000, 0x080000, CRC(05d7c2a9) SHA1(e34d395985caec10139a22daa179bb185df157d6) ) // 2 x $40000 - ROM_LOAD( "fb003.u45", 0x080000, 0x080000, CRC(405722e9) SHA1(92e51093d50f74f650ba137f5fc2910e0f85337e) ) // 2 x $40000 + ROM_REGION( 0x400000*16, "oki2", 0 ) + ROM_FILL( 0x00000, 0x400000*16, 0x00 ) ROM_END /*************************************************************************** @@ -3485,12 +3503,12 @@ ROM_START( fjbuster ) // Fujiyama Buster - Japan version of Shogun Warriors ROM_REGION( 0x020000, "cpu1", 0 ) /* MCU Code */ ROM_LOAD( "fb040j.u33", 0x000000, 0x020000, CRC(299d0746) SHA1(67fe3a47ab01fa02ce2bb5836c2041986c19d875) ) - ROM_REGION( 0x1000000, "gfx1", ROMREGION_ERASEFF ) /* Sprites */ /* not sure these are all correct size */ + ROM_REGION( 0x1000000, "gfx1", ROMREGION_ERASEFF ) /* Sprites */ ROM_LOAD( "fb-020a.u1", 0x000000, 0x100000, CRC(87e55c6d) SHA1(87886c045d7c30b8dee3c8fb0bf8f2cdbc5fd7fb) ) ROM_LOAD( "fb020b.u2", 0x100000, 0x100000, CRC(276b9d7b) SHA1(7a154f65b4737f2b6ac8effa3352711079f571dc) ) ROM_LOAD( "fb021a.u3", 0x200000, 0x100000, CRC(7da15d37) SHA1(345cf2242e8210a697294a45197f2b3b974de885) ) ROM_LOAD( "fb021b.u4", 0x300000, 0x100000, CRC(6a512d7b) SHA1(7fc3002d23262a9a590a283ea9e111e38d889ef2) ) - ROM_LOAD( "fb022a.u5", 0x400000, 0x080000, BAD_DUMP CRC(60aa1282) SHA1(4648816016e00df3256226ba5134f6e5bb429909) ) // half size? + ROM_LOAD( "fb-22a.u5", 0x400000, 0x100000, CRC(9039e5d3) SHA1(222452cd7947f7c99c68e495835cca62e0449b5c) ) ROM_LOAD( "fb-22b.u6", 0x500000, 0x100000, CRC(96ac9e54) SHA1(2b066375963dc57fe2ce89d65f6c0a9d183a838d) ) ROM_LOAD( "fb023.u7", 0x600000, 0x100000, CRC(132794bd) SHA1(bcc73c3183c59a4b66f79d04774773b8a9239501) ) @@ -3498,13 +3516,22 @@ ROM_START( fjbuster ) // Fujiyama Buster - Japan version of Shogun Warriors ROM_LOAD( "fb010.u65", 0x000000, 0x100000, CRC(296ffd92) SHA1(183a28e4594c428deb4726ed22d5166592b94b60) ) // 42 pin mask rom ROM_LOAD( "fb011.u66", 0x100000, 0x080000, CRC(500a0367) SHA1(6dc5190f81b21f59ee56a3b2332c8d86d6599782) ) // 40 pin mask rom (verified correct) - ROM_REGION( 0x400000*16, "oki1", 0 ) /* Samples */ - ROM_LOAD( "fb000j.u43", 0x000000, 0x080000, CRC(a7522555) SHA1(ea88d90dda20bc309f98a1924c41551e7708e6af) ) // 2 x $40000 - ROM_LOAD( "fb001j_u.101", 0x080000, 0x080000, CRC(07d4e8e2) SHA1(0de911f452ddeb54b0b435b9c1cf5d5881175d44) ) // 2 x $40000 + + ROM_REGION( 0x300000, "samples", 0 ) + /* OKI 1 */ + ROM_LOAD( "fb000j.u43", 0x000000, 0x080000, CRC(a7522555) SHA1(ea88d90dda20bc309f98a1924c41551e7708e6af) ) + ROM_LOAD( "fb001j_u.101", 0x080000, 0x080000, CRC(07d4e8e2) SHA1(0de911f452ddeb54b0b435b9c1cf5d5881175d44) ) - ROM_REGION( 0x400000*16, "oki2", 0 ) /* Samples */ - ROM_LOAD( "fb002.u44", 0x000000, 0x080000, CRC(05d7c2a9) SHA1(e34d395985caec10139a22daa179bb185df157d6) ) // 2 x $40000 - ROM_LOAD( "fb003.u45", 0x080000, 0x080000, CRC(405722e9) SHA1(92e51093d50f74f650ba137f5fc2910e0f85337e) ) // 2 x $40000 + /* OKI 2 */ + ROM_LOAD( "fb-003.u44", 0x100000, 0x100000, CRC(0aea4ac5) SHA1(8f3b30e505b0ba51c140a0a2c071680d4fa05db9) ) + ROM_LOAD( "fb-002.u45", 0x200000, 0x100000, CRC(010acc17) SHA1(2dc0897c7778eacf6bce12ff0adbadb307ea6c17) ) + + /* Sound data is copied here during driver init */ + ROM_REGION( 0x400000*16, "oki1", 0 ) + ROM_FILL( 0x00000, 0x400000*16, 0x00 ) + + ROM_REGION( 0x400000*16, "oki2", 0 ) + ROM_FILL( 0x00000, 0x400000*16, 0x00 ) ROM_END /*************************************************************************** @@ -3884,7 +3911,7 @@ GAME( 1992, brapboysj,brapboys, shogwarr, brapboys, brapboys, ROT0, "K /* Non-working games (mainly due to bad gfx roms) */ -GAME( 1992, shogwarr, 0, shogwarr, shogwarr, calc3, ROT0, "Kaneko", "Shogun Warriors (US)", GAME_NOT_WORKING ) -GAME( 1992, shogwarre,shogwarr, shogwarr, shogwarr, calc3, ROT0, "Kaneko", "Shogun Warriors (World)", GAME_NOT_WORKING ) -GAME( 1992, fjbuster, shogwarr, shogwarr, shogwarr, calc3, ROT0, "Kaneko", "Fujiyama Buster (Japan)", GAME_NOT_WORKING ) +GAME( 1992, shogwarr, 0, shogwarr, shogwarr, brapboys, ROT0, "Kaneko", "Shogun Warriors (US)", GAME_IMPERFECT_SOUND ) +GAME( 1992, shogwarre,shogwarr, shogwarr, shogwarr, brapboys, ROT0, "Kaneko", "Shogun Warriors (World)", GAME_IMPERFECT_SOUND ) +GAME( 1992, fjbuster, shogwarr, shogwarr, shogwarr, brapboys, ROT0, "Kaneko", "Fujiyama Buster (Japan)", GAME_IMPERFECT_SOUND )