summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author MetalliC <0vetal0@gmail.com>2017-12-13 23:51:03 +0200
committer GitHub <noreply@github.com>2017-12-13 23:51:03 +0200
commit6435f7b004ad07842e9a4af20bfacdf60b67e215 (patch)
treeefcab28558a438d1966227e4279152f2685e07e0
parent23eb4caaf80c54426a3050446995bbe963267bd0 (diff)
parente2e6328720dbef23008a44ae3aa5d3f766c27b20 (diff)
Merge pull request #2930 from DavidHaywood/101217
dumped internal rom for kof98umh igs036 [Morten Shearman Kirkegaard, Peter Wilhelmsen]
-rw-r--r--src/mame/drivers/pgm2.cpp37
-rw-r--r--src/mame/includes/pgm2.h1
-rw-r--r--src/mame/machine/igs036crypt.cpp25
-rw-r--r--src/mame/machine/igs036crypt.h1
4 files changed, 29 insertions, 35 deletions
diff --git a/src/mame/drivers/pgm2.cpp b/src/mame/drivers/pgm2.cpp
index 3a61710eae0..f7b2cdd139d 100644
--- a/src/mame/drivers/pgm2.cpp
+++ b/src/mame/drivers/pgm2.cpp
@@ -845,7 +845,7 @@ all others: SPANSION S99-50070
ROM_REGION( 0x200000, "tiles", ROMREGION_ERASEFF ) \
ROM_LOAD( "ig-d3_text.u1", 0x00000000, 0x0200000, CRC(9a0ea82e) SHA1(7844fd7e46c3fbb2164060f160da528254fd177e) ) \
\
- ROM_REGION( 0x2000000, "bgtile", ROMREGION_ERASEFF ) \
+ ROM_REGION( 0x2000000, "bgtile", ROMREGION_ERASE00 ) \
/* bgl/bgh unpopulated (no background tilemap) */ \
\
ROM_REGION( 0x08000000, "sprites_mask", 0 ) /* 1bpp sprite mask data */ \
@@ -866,7 +866,7 @@ all others: SPANSION S99-50070
ROM_START( kof98umh )
ROM_REGION( 0x04000, "maincpu", 0 )
- ROM_LOAD( "kof98uhm_igs036.rom", 0x00000000, 0x0004000, NO_DUMP ) // CRC(3ed2e50f) SHA1(35310045d375d9dda36c325e35257123a7b5b8c7)
+ ROM_LOAD( "kof98umh_internal_rom.bin", 0x00000000, 0x0004000, CRC(3ed2e50f) SHA1(35310045d375d9dda36c325e35257123a7b5b8c7) )
ROM_REGION( 0x1000000, "user1", 0 )
ROM_LOAD( "kof98umh_v100cn.u4", 0x00000000, 0x1000000, CRC(2ea91e3b) SHA1(5a586bb99cc4f1b02e0db462d5aff721512e0640) )
@@ -974,6 +974,25 @@ READ32_MEMBER(pgm2_state::kov2nl_speedup_r)
return m_mainram[0x20470 / 4];
}
+READ32_MEMBER(pgm2_state::kof98umh_speedup_r)
+{
+ int pc = space.device().safe_pc();
+
+ if (pc == 0x100028f6)
+ {
+ if ((m_mainram[0x00060 / 4] == 0x00) && (m_mainram[0x00064 / 4] == 0x00))
+ space.device().execute().spin_until_interrupt();
+ }
+ /*
+ else
+ {
+ printf("pc is %08x\n", pc);
+ }
+ */
+
+ return m_mainram[0x00060 / 4];
+}
+
// for games with the internal ROMs fully dumped that provide the sprite key and program rom key at runtime
void pgm2_state::common_encryption_init()
@@ -1067,19 +1086,13 @@ DRIVER_INIT_MEMBER(pgm2_state, kov3_100)
DRIVER_INIT_MEMBER(pgm2_state,kof98umh)
{
- uint16_t *src = (uint16_t *)memregion("sprites_mask")->base();
+ common_encryption_init();
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x20000060, 0x20000063, read32_delegate(FUNC(pgm2_state::kof98umh_speedup_r),this));
+}
+
- iga_u12_decode(src, 0x08000000, 0x21df);
- iga_u16_decode(src, 0x08000000, 0x8692);
- m_sprite_predecrypted = 1;
- src = (uint16_t *)memregion("sprites_colour")->base();
- sprite_colour_decode(src, 0x20000000);
- igs036_decryptor decrypter(kof98umh_key);
- decrypter.decrypter_rom(memregion("user1"));
- m_has_decrypted = 1;
-}
/* PGM2 */
diff --git a/src/mame/includes/pgm2.h b/src/mame/includes/pgm2.h
index de986d1b5a3..6964760ee8c 100644
--- a/src/mame/includes/pgm2.h
+++ b/src/mame/includes/pgm2.h
@@ -57,6 +57,7 @@ public:
DECLARE_READ32_MEMBER(orleg2_speedup_r);
DECLARE_READ32_MEMBER(kov2nl_speedup_r);
+ DECLARE_READ32_MEMBER(kof98umh_speedup_r);
DECLARE_READ8_MEMBER(encryption_r);
DECLARE_WRITE8_MEMBER(encryption_w);
diff --git a/src/mame/machine/igs036crypt.cpp b/src/mame/machine/igs036crypt.cpp
index ee427748084..3d1255396b4 100644
--- a/src/mame/machine/igs036crypt.cpp
+++ b/src/mame/machine/igs036crypt.cpp
@@ -310,9 +310,9 @@ const uint8_t kov3_key[0x100] = {
0x10, 0x09, 0xe0, 0x39, 0x02, 0xfe, 0x47, 0x44, 0x2a, 0x51, 0x21, 0x49, 0x04, 0x1d, 0x2d, 0xed,
};
-// DDPDOJ & KOF98UMH caused lots of problems to the automatic recovery
-// process, so they have needed a good amount of manual examination.
-// It is much more probable for these keys to still contain errors
+// DDPDOJ caused lots of problems to the automatic recovery
+// process, so needed a good amount of manual examination.
+// It is much more probable for this key to still contain errors
// than for the other ones.
const uint8_t ddpdoj_key[0x100] = {
@@ -333,22 +333,3 @@ const uint8_t ddpdoj_key[0x100] = {
0x83, 0x0b, 0xe2, 0x5b, 0xe4, 0x2c, 0x42, 0xa2, 0x42, 0x6a, 0x3b, 0x22, 0x25, 0x89, 0x47, 0x0b,
0xe3, 0xa9, 0xd3, 0xf3, 0x26, 0x02, 0x62, 0x53, 0x00, 0xd3, 0x23, 0x2b, 0x74, 0xa2, 0x1e, 0x1a,
};
-
-const uint8_t kof98umh_key[0x100] = {
- 0x80, 0x95, 0x10, 0x25, 0x26, 0x83, 0x22, 0x07, 0x95, 0xb4, 0x94, 0xb0, 0x8c, 0x2c, 0x87, 0x82,
- 0x80, 0x82, 0x96, 0x1d, 0x12, 0x10, 0x05, 0x1f, 0x14, 0x09, 0x9c, 0x0f, 0x00, 0x1b, 0x82, 0x8b,
- 0x96, 0x8a, 0xa3, 0xa7, 0x85, 0x86, 0xa6, 0xab, 0x80, 0x03, 0x0c, 0x8a, 0x03, 0x26, 0x27, 0xa4,
- 0x30, 0xa1, 0x85, 0x01, 0xb6, 0xb6, 0xa1, 0xab, 0x9b, 0x83, 0x82, 0x8a, 0x15, 0x26, 0x9c, 0x87,
- 0xf1, 0xb3, 0x13, 0x61, 0xa2, 0x83, 0xa4, 0x4b, 0x01, 0x68, 0x99, 0xc5, 0x07, 0x4f, 0x46, 0xc6,
- 0x14, 0x0e, 0x55, 0x03, 0x06, 0x01, 0xc6, 0x80, 0x55, 0xda, 0x51, 0x48, 0xca, 0x0e, 0xde, 0xcd,
- 0x60, 0xf6, 0x82, 0xd5, 0x83, 0xea, 0x26, 0x03, 0x56, 0x2a, 0x72, 0x80, 0xc5, 0x08, 0xec, 0x26,
- 0x15, 0x21, 0x90, 0xa2, 0xf2, 0x41, 0x54, 0x42, 0xea, 0x35, 0x0f, 0x01, 0xd4, 0x3b, 0xb3, 0x4d,
- 0x30, 0x9b, 0x17, 0xaa, 0x20, 0x29, 0x26, 0x88, 0x91, 0xa0, 0x9f, 0xaa, 0x2e, 0x8b, 0x2e, 0xad,
- 0x96, 0x93, 0x85, 0x8b, 0x92, 0x1e, 0x13, 0x98, 0x86, 0x04, 0x94, 0x16, 0x15, 0x0d, 0x17, 0x88,
- 0xa1, 0x2a, 0x12, 0x0c, 0x26, 0x09, 0x82, 0x29, 0x93, 0x82, 0x10, 0x0b, 0x21, 0xaf, 0x87, 0x8a,
- 0x04, 0x9e, 0x04, 0xa1, 0x27, 0xbf, 0x03, 0x2a, 0x90, 0x2f, 0x8a, 0x86, 0x1c, 0x34, 0x13, 0x8e,
- 0x07, 0x8b, 0xb3, 0xe0, 0x67, 0x02, 0x64, 0x4f, 0x07, 0x68, 0xac, 0x84, 0xae, 0xec, 0x63, 0x4e,
- 0x87, 0x0f, 0x56, 0x14, 0x54, 0x06, 0xc5, 0x81, 0x51, 0x96, 0xcf, 0x16, 0x49, 0x99, 0x49, 0xdd,
- 0x25, 0xc6, 0xc3, 0xe9, 0xa2, 0xe5, 0x63, 0x05, 0x13, 0x8a, 0xa4, 0x25, 0x26, 0x29, 0x6a, 0xe0,
- 0xc3, 0x6e, 0xc1, 0x99, 0xc1, 0xe2, 0x47, 0xa1, 0x4c, 0xa1, 0x14, 0x11, 0x4d, 0x32, 0x3f, 0x80,
-};
diff --git a/src/mame/machine/igs036crypt.h b/src/mame/machine/igs036crypt.h
index 8ccb0c6af78..69386dd2c22 100644
--- a/src/mame/machine/igs036crypt.h
+++ b/src/mame/machine/igs036crypt.h
@@ -30,6 +30,5 @@ extern const uint8_t cjddzsp_key[0x100];
extern const uint8_t cjdh2_key[0x100];
extern const uint8_t kov3_key[0x100];
extern const uint8_t ddpdoj_key[0x100];
-extern const uint8_t kof98umh_key[0x100];
#endif