From 8f05076b076adf494509d1ae5cbd2a6a07b25afa Mon Sep 17 00:00:00 2001 From: 987123879113 <63495610+987123879113@users.noreply.github.com> Date: Sun, 7 May 2023 18:30:41 +0900 Subject: konami/firebeat: Update pop'n music to use DVD CHDs + add clones for popnanm and popnanm2 to allow for working license and expire license modes (#11195) --- src/mame/konami/firebeat.cpp | 77 +++++++++++++++++++++++++++++++++----------- src/mame/mame.lst | 2 ++ 2 files changed, 61 insertions(+), 18 deletions(-) diff --git a/src/mame/konami/firebeat.cpp b/src/mame/konami/firebeat.cpp index af4dcb4a842..dd417d6bd65 100644 --- a/src/mame/konami/firebeat.cpp +++ b/src/mame/konami/firebeat.cpp @@ -2396,7 +2396,7 @@ ROM_START( popn5 ) DISK_IMAGE_READONLY( "a04jaa01", 0, SHA1(87136ddad1d786b4d5f04381fcbf679ab666e6c9) ) DISK_REGION( "spu_ata:0:dvdrom:image" ) // data DVD-ROM - DISK_IMAGE_READONLY( "a04jaa02", 0, SHA1(49a017dde76f84829f6e99a678524c40665c3bfd) ) + DISK_IMAGE_READONLY( "a04jaa02", 0, SHA1(058167a6ac910183a701920021cfbc0933428e97) ) ROM_REGION(0x1038, "rtc", ROMREGION_ERASE00) // Default unlocked RTC ROM_LOAD("rtc", 0x0000, 0x1038, CRC(adeba6fc) SHA1(a2266696bb0a68e2b70a07d580a3b471e72fa587)) @@ -2416,7 +2416,7 @@ ROM_START( popn6 ) DISK_IMAGE_READONLY( "gqa16jaa01", 0, SHA1(7a7e475d06c74a273f821fdfde0743b33d566e4c) ) DISK_REGION( "spu_ata:0:dvdrom:image" ) // data DVD-ROM - DISK_IMAGE( "gqa16jaa02", 0, SHA1(e39067300e9440ff19cb98c1abc234fa3d5b26d1) ) + DISK_IMAGE( "gqa16jaa02", 0, SHA1(18abf1a9dbf61faebd44c8dc1d6decbaaca826a2) ) ROM_REGION(0x1038, "rtc", ROMREGION_ERASE00) // Default unlocked RTC ROM_LOAD("rtc", 0x0000, 0x1038, CRC(9935427c) SHA1(f7095ea6360ca61d1e2914cf184e50e50777a168)) @@ -2436,7 +2436,7 @@ ROM_START( popn7 ) DISK_IMAGE_READONLY( "b00jab01", 0, SHA1(259c733ca4d30281205b46b7bf8d60c9d01aa818) ) DISK_REGION( "spu_ata:0:dvdrom:image" ) // data DVD-ROM - DISK_IMAGE_READONLY( "b00jaa02", 0, SHA1(c8ce2f8ee6aeeedef9c110a59e68fcec7b669ad6) ) + DISK_IMAGE_READONLY( "b00jaa02", 0, SHA1(43201334acb20f529baa50c24494b7f0a4bf3d0d) ) ROM_REGION(0x1038, "rtc", ROMREGION_ERASE00) // Default unlocked RTC ROM_LOAD("rtc", 0x0000, 0x1038, CRC(fce30919) SHA1(9f875f5fe6ab6591ec024afc0a91966befa73ede)) @@ -2456,7 +2456,7 @@ ROM_START( popn8 ) DISK_IMAGE_READONLY( "gqb30jaa01", 0, SHA1(0ff3e40e3717ce23337b3a2438bdaca01cba9e30) ) DISK_REGION( "spu_ata:0:dvdrom:image" ) // data DVD-ROM - DISK_IMAGE_READONLY( "gqb30jaa02", 0, SHA1(f067d502c23efe0267aada5706f5bc7a54605942) ) + DISK_IMAGE_READONLY( "gqb30jaa02", 0, SHA1(69d26af2bd85a5a510049fd2f6e36bcabee81fd1) ) ROM_REGION(0x1038, "rtc", ROMREGION_ERASE00) // Default unlocked RTC ROM_LOAD("rtc", 0x0000, 0x1038, CRC(1a91f33a) SHA1(510b5cbacb218e5588f3b725733e095b7914dcdb)) @@ -2466,6 +2466,26 @@ ROM_START( popnanm ) ROM_REGION32_BE(0x80000, "user1", 0) ROM_LOAD16_WORD_SWAP("a02jaa03.21e", 0x00000, 0x80000, CRC(43ecc093) SHA1(637df5b546cf7409dd4752dc471674fe2a046599)) + ROM_REGION(0xc8, "user2", ROMREGION_ERASE00) // Security dongle + ROM_LOAD("gq987_gc987_forever", 0x00, 0xc8, CRC(ddd976b6) SHA1(91b49585886b8b1618401ca43ec3bde09896b782)) // Modified to set the period to 00/00 for forever license mode + + ROM_REGION(0x80000, "audiocpu", 0) // SPU 68K program + ROM_LOAD16_WORD_SWAP("a02jaa04.3q", 0x00000, 0x80000, CRC(8c6000dd) SHA1(94ab2a66879839411eac6c673b25143d15836683)) + + DISK_REGION( "ata:0:cdrom:image" ) // program CD-ROM + DISK_IMAGE_READONLY( "gq987jaa01", 0, SHA1(ee1f9cf480c01ef356451cec30e5303d6c433758) ) + + DISK_REGION( "spu_ata:0:dvdrom:image" ) // data DVD-ROM + DISK_IMAGE_READONLY( "gq987jaa02", 0, SHA1(47f90cc940af50c8d91751ec27b45070a95d4d58) ) + + ROM_REGION(0x1038, "rtc", ROMREGION_ERASE00) // Default unlocked RTC + ROM_LOAD("rtc", 0x0000, 0x1038, CRC(b08b454d) SHA1(33fc12ab148a379925b7b77016efba747f3b13cc)) +ROM_END + +ROM_START( popnanma ) + ROM_REGION32_BE(0x80000, "user1", 0) + ROM_LOAD16_WORD_SWAP("a02jaa03.21e", 0x00000, 0x80000, CRC(43ecc093) SHA1(637df5b546cf7409dd4752dc471674fe2a046599)) + ROM_REGION(0xc8, "user2", ROMREGION_ERASE00) // Security dongle ROM_LOAD("gq987_gc987", 0x00, 0xc8, CRC(c77bb0fc) SHA1(7228f334d6662f764c2b0417bfd415f30ac919d7)) @@ -2476,7 +2496,7 @@ ROM_START( popnanm ) DISK_IMAGE_READONLY( "gq987jaa01", 0, SHA1(ee1f9cf480c01ef356451cec30e5303d6c433758) ) DISK_REGION( "spu_ata:0:dvdrom:image" ) // data DVD-ROM - DISK_IMAGE_READONLY( "gq987jaa02", 0, SHA1(d72515bac3fcd9f28c39fa1402292009734df678) ) + DISK_IMAGE_READONLY( "gq987jaa02", 0, SHA1(47f90cc940af50c8d91751ec27b45070a95d4d58) ) ROM_REGION(0x1038, "rtc", ROMREGION_ERASE00) // Default unlocked RTC ROM_LOAD("rtc", 0x0000, 0x1038, CRC(b08b454d) SHA1(33fc12ab148a379925b7b77016efba747f3b13cc)) @@ -2486,6 +2506,26 @@ ROM_START( popnanm2 ) ROM_REGION32_BE(0x80000, "user1", 0) ROM_LOAD16_WORD_SWAP("a02jaa03.21e", 0x00000, 0x80000, CRC(43ecc093) SHA1(637df5b546cf7409dd4752dc471674fe2a046599)) + ROM_REGION(0xc8, "user2", ROMREGION_ERASE00) // Security dongle + ROM_LOAD("gca02ja_gca02jb_gea02ja_forever", 0x00, 0xc8, CRC(63b22ee0) SHA1(60f384140ea80e886e45a56a37811d86133674a4)) // Modified to set the period to 00/00 for forever license mode + + ROM_REGION(0x80000, "audiocpu", 0) // SPU 68K program + ROM_LOAD16_WORD_SWAP("a02jaa04.3q", 0x00000, 0x80000, CRC(8c6000dd) SHA1(94ab2a66879839411eac6c673b25143d15836683)) + + DISK_REGION( "ata:0:cdrom:image" ) // program CD-ROM + DISK_IMAGE_READONLY( "gea02jaa01", 0, SHA1(e81203b6812336c4d00476377193340031ef11b1) ) + + DISK_REGION( "spu_ata:0:dvdrom:image" ) // data DVD-ROM + DISK_IMAGE_READONLY( "gea02jaa02", 0, SHA1(b482d0898cafeafcb020d81d40bd8915c0440f1e) ) + + ROM_REGION(0x1038, "rtc", ROMREGION_ERASE00) // Default unlocked RTC + ROM_LOAD("rtc", 0x0000, 0x1038, CRC(90fcfeab) SHA1(f96e27e661259dc9e7f25a99bee9ffd6584fc1b8)) +ROM_END + +ROM_START( popnanm2a ) + ROM_REGION32_BE(0x80000, "user1", 0) + ROM_LOAD16_WORD_SWAP("a02jaa03.21e", 0x00000, 0x80000, CRC(43ecc093) SHA1(637df5b546cf7409dd4752dc471674fe2a046599)) + ROM_REGION(0xc8, "user2", ROMREGION_ERASE00) // Security dongle ROM_LOAD("gca02ja_gca02jb_gea02ja", 0x00, 0xc8, CRC(7910e8aa) SHA1(e296a50e846ad13a98953b6804e9e4c22cf3a389)) @@ -2496,7 +2536,7 @@ ROM_START( popnanm2 ) DISK_IMAGE_READONLY( "gea02jaa01", 0, SHA1(e81203b6812336c4d00476377193340031ef11b1) ) DISK_REGION( "spu_ata:0:dvdrom:image" ) // data DVD-ROM - DISK_IMAGE_READONLY( "gea02jaa02", 0, SHA1(7212e399779f37a5dcb8317a8f635a3b3f620aa9) ) + DISK_IMAGE_READONLY( "gea02jaa02", 0, SHA1(b482d0898cafeafcb020d81d40bd8915c0440f1e) ) ROM_REGION(0x1038, "rtc", ROMREGION_ERASE00) // Default unlocked RTC ROM_LOAD("rtc", 0x0000, 0x1038, CRC(90fcfeab) SHA1(f96e27e661259dc9e7f25a99bee9ffd6584fc1b8)) @@ -2516,7 +2556,7 @@ ROM_START( popnmt ) DISK_IMAGE_READONLY( "976jaa01", 0, SHA1(622a9350107e9fb17609ea1a234ca35489915da7) ) DISK_REGION( "spu_ata:0:dvdrom:image" ) // data DVD-ROM - DISK_IMAGE_READONLY( "976jaa02", 0, SHA1(3881bb1e4deb829ba272c541cb7d203924571f3b) ) + DISK_IMAGE_READONLY( "976jaa02", 0, SHA1(8a5fda9d98fbf7c9d702bf650fb131a89925eb2b) ) ROM_REGION(0x1038, "rtc", ROMREGION_ERASE00) // Default unlocked RTC ROM_LOAD("rtc", 0x0000, 0x1038, CRC(a51bdc10) SHA1(99b759d9a575129abec556d381f3a041453d7136)) @@ -2537,7 +2577,7 @@ ROM_START( popnmt2 ) DISK_IMAGE_READONLY( "976jba01", 0, SHA1(f8a70ca0718dc222cebbef238b5954494503d315) ) DISK_REGION( "spu_ata:0:dvdrom:image" ) // data DVD-ROM - DISK_IMAGE_READONLY( "976jaa02", 0, SHA1(3881bb1e4deb829ba272c541cb7d203924571f3b) ) + DISK_IMAGE_READONLY( "976jaa02", 0, SHA1(8a5fda9d98fbf7c9d702bf650fb131a89925eb2b) ) ROM_REGION(0x1038, "rtc", ROMREGION_ERASE00) // Default unlocked RTC ROM_LOAD("rtc", 0x0000, 0x1038, CRC(a51bdc10) SHA1(99b759d9a575129abec556d381f3a041453d7136)) @@ -2659,16 +2699,17 @@ GAMEL( 2000, kbh, kbm, firebeat_kbm, kbm, firebeat_kbm_state, init_kbm_overse GAMEL( 2000, kbm2nd, 0, firebeat_kbm, kbm, firebeat_kbm_state, init_kbm_jp, ROT270, "Konami", "Keyboardmania 2nd Mix", MACHINE_IMPERFECT_SOUND, layout_firebeat ) GAMEL( 2001, kbm3rd, 0, firebeat_kbm, kbm, firebeat_kbm_state, init_kbm_jp, ROT270, "Konami", "Keyboardmania 3rd Mix", MACHINE_IMPERFECT_SOUND, layout_firebeat ) -// Requires DVD CHD support. Once DVD CHD support is implemented then MACHINE_NOT_WORKING can be removed -GAME( 2000, popn4, 0, firebeat_popn, popn, firebeat_popn_state, init_popn_jp, ROT0, "Konami", "Pop'n Music 4", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND ) -GAME( 2000, popn5, 0, firebeat_popn, popn, firebeat_popn_state, init_popn_jp, ROT0, "Konami", "Pop'n Music 5", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND ) -GAME( 2001, popn6, 0, firebeat_popn, popn, firebeat_popn_state, init_popn_jp, ROT0, "Konami", "Pop'n Music 6", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND ) -GAME( 2001, popn7, 0, firebeat_popn, popn, firebeat_popn_state, init_popn_jp, ROT0, "Konami", "Pop'n Music 7", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND ) -GAME( 2002, popn8, 0, firebeat_popn, popn, firebeat_popn_state, init_popn_jp, ROT0, "Konami", "Pop'n Music 8", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND ) -GAME( 2000, popnmt, 0, firebeat_popn, popn, firebeat_popn_state, init_popn_rental, ROT0, "Konami", "Pop'n Music Mickey Tunes", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND ) -GAME( 2000, popnmt2, popnmt, firebeat_popn, popn, firebeat_popn_state, init_popn_rental, ROT0, "Konami", "Pop'n Music Mickey Tunes!", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND ) -GAME( 2000, popnanm, 0, firebeat_popn, popn, firebeat_popn_state, init_popn_jp, ROT0, "Konami", "Pop'n Music Animelo", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND ) -GAME( 2001, popnanm2, 0, firebeat_popn, popn, firebeat_popn_state, init_popn_jp, ROT0, "Konami", "Pop'n Music Animelo 2", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND ) +GAME( 2000, popn4, 0, firebeat_popn, popn, firebeat_popn_state, init_popn_jp, ROT0, "Konami", "Pop'n Music 4", MACHINE_IMPERFECT_SOUND ) +GAME( 2000, popn5, 0, firebeat_popn, popn, firebeat_popn_state, init_popn_jp, ROT0, "Konami", "Pop'n Music 5", MACHINE_IMPERFECT_SOUND ) +GAME( 2001, popn6, 0, firebeat_popn, popn, firebeat_popn_state, init_popn_jp, ROT0, "Konami", "Pop'n Music 6", MACHINE_IMPERFECT_SOUND ) +GAME( 2001, popn7, 0, firebeat_popn, popn, firebeat_popn_state, init_popn_jp, ROT0, "Konami", "Pop'n Music 7", MACHINE_IMPERFECT_SOUND ) +GAME( 2002, popn8, 0, firebeat_popn, popn, firebeat_popn_state, init_popn_jp, ROT0, "Konami", "Pop'n Music 8", MACHINE_IMPERFECT_SOUND ) +GAME( 2000, popnmt, 0, firebeat_popn, popn, firebeat_popn_state, init_popn_rental, ROT0, "Konami", "Pop'n Music Mickey Tunes", MACHINE_IMPERFECT_SOUND ) +GAME( 2000, popnmt2, popnmt, firebeat_popn, popn, firebeat_popn_state, init_popn_rental, ROT0, "Konami", "Pop'n Music Mickey Tunes!", MACHINE_IMPERFECT_SOUND ) +GAME( 2000, popnanm, 0, firebeat_popn, popn, firebeat_popn_state, init_popn_jp, ROT0, "Konami", "Pop'n Music Animelo", MACHINE_IMPERFECT_SOUND ) +GAME( 2000, popnanma, popnanm, firebeat_popn, popn, firebeat_popn_state, init_popn_jp, ROT0, "Konami", "Pop'n Music Animelo (license expired)", MACHINE_IMPERFECT_SOUND ) +GAME( 2001, popnanm2, 0, firebeat_popn, popn, firebeat_popn_state, init_popn_jp, ROT0, "Konami", "Pop'n Music Animelo 2", MACHINE_IMPERFECT_SOUND ) +GAME( 2001, popnanm2a, popnanm2, firebeat_popn, popn, firebeat_popn_state, init_popn_jp, ROT0, "Konami", "Pop'n Music Animelo 2 (license expired)", MACHINE_IMPERFECT_SOUND ) // Requires ST-224 emulation for optional toggleable external effects, but otherwise is fully playable GAME( 2000, bm3, 0, firebeat_bm3, bm3, firebeat_bm3_state, init_bm3, ROT0, "Konami", "Beatmania III", MACHINE_IMPERFECT_SOUND ) diff --git a/src/mame/mame.lst b/src/mame/mame.lst index cb08d4805ae..9a973adfec3 100755 --- a/src/mame/mame.lst +++ b/src/mame/mame.lst @@ -23364,7 +23364,9 @@ popn8 // GQB30 (c) 2002 (Japan) popnmt // GQ976 (c) 2000 (Japan) popnmt2 // GQ976 (c) 2000 (Japan) popnanm // GQ987 (c) 2000 (Japan) +popnanma // GQ987 (c) 2000 (Japan) popnanm2 // GEA02 (c) 2001 (Japan) +popnanm2a // GEA02 (c) 2001 (Japan) ppd // GQ977 (c) 2000 (Korea) ppp // GQ977 (c) 2000 (Japan) ppp11 // GQ977 (c) 2000 (Japan) -- cgit v1.2.3