KYRA: added HOF PC-98 static data to kyra.dat

svn-id: r46180

6 files changed, 41 insertions, 5 deletions

diff --git a/dists/engine-data/kyra.dat b/dists/engine-data/kyra.dat
index f96675f74f..e96ecc0cb5 100644
--- a/dists/engine-data/kyra.dat
+++ b/dists/engine-data/kyra.dat
diff --git a/engines/kyra/staticres.cpp b/engines/kyra/staticres.cpp
index b348642606..8a2f5079d8 100644
--- a/engines/kyra/staticres.cpp
+++ b/engines/kyra/staticres.cpp
@@ -45,7 +45,7 @@
 
 namespace Kyra {
 
-#define RESFILE_VERSION 69
+#define RESFILE_VERSION 70
 
 namespace {
 bool checkKyraDat(Common::SeekableReadStream *file) {
diff --git a/tools/create_kyradat/create_kyradat.cpp b/tools/create_kyradat/create_kyradat.cpp
index ae498992c2..f880298cfc 100644
--- a/tools/create_kyradat/create_kyradat.cpp
+++ b/tools/create_kyradat/create_kyradat.cpp
@@ -42,7 +42,7 @@
 #include <map>
 
 enum {
-	kKyraDatVersion = 69
+	kKyraDatVersion = 70
 };
 
 const ExtractFilename extractFilenames[] = {
diff --git a/tools/create_kyradat/extract.cpp b/tools/create_kyradat/extract.cpp
index 4a6055d498..c70ae75e9a 100644
--- a/tools/create_kyradat/extract.cpp
+++ b/tools/create_kyradat/extract.cpp
@@ -461,7 +461,7 @@ bool extractHofSeqData(PAKFile &out, const ExtractInformation *info, const byte
 				output += 28;
 
 				if (info->platform == kPlatformFMTowns) { // startupCommand + finalCommand
-					memcpy(output , ptr, 2);
+					memcpy(output, ptr, 2);
 					ptr += 2;
 					output += 2;
 				} else {
diff --git a/tools/create_kyradat/games.cpp b/tools/create_kyradat/games.cpp
index 44de387409..cdd154ebf6 100644
--- a/tools/create_kyradat/games.cpp
+++ b/tools/create_kyradat/games.cpp
@@ -76,6 +76,9 @@ const Game kyra2Games[] = {
 	// FM-TOWNS games
 	{ kKyra2, { EN_ANY, JA_JPN, -1 }, kPlatformFMTowns, kNoSpecial, { "74f50d79c919cc8e7196c24942ce43d7", "a9a7fd4f05d00090e9e8bda073e6d431" } },
 
+	// PC-98
+	{ kKyra2, { EN_ANY, JA_JPN, -1 }, kPlatformPC98, kNoSpecial, { "9bbf9a69be956db072b485929b416082", "f55fda3e60c4956ce6e72b24d2ae1a07" } },
+
 	GAME_DUMMY_ENTRY
 };
 
@@ -627,6 +630,23 @@ const int kyra2TownsNeed[] = {
 	-1
 };
 
+const int kyra2PC98Need[] = {
+	k2SeqplayPakFiles,
+	k2SeqplayStrings,
+	k2SeqplaySfxFiles,
+	k2SeqplaySeqData,
+	//k2SeqplayIntroCDA,
+	//k2SeqplayFinaleCDA,
+	k2IngamePakFiles,
+	k2IngameSfxFiles,
+	k2IngameSfxIndex,
+	//k2IngameCDA,
+	k2IngameTalkObjIndex,
+	k2IngameTimJpStrings,
+	k2IngameShapeAnimData,
+	-1
+};
+
 const int kyra2DemoNeed[] = {
 	k2SeqplayPakFiles,
 	k2SeqplaySeqData,
@@ -935,6 +955,8 @@ const GameNeed gameNeedTable[] = {
 
 	{ kKyra2, kPlatformFMTowns, kNoSpecial, kyra2TownsNeed },
 
+	{ kKyra2, kPlatformPC98, kNoSpecial, kyra2PC98Need },
+
 	{ kKyra2, kPlatformPC, kDemoVersion, kyra2DemoNeed },
 
 	{ kLol, kPlatformPC, kDemoVersion, lolDemoNeed },
diff --git a/tools/create_kyradat/tables.cpp b/tools/create_kyradat/tables.cpp
index 17e1c73f8d..e3ede16f85 100644
--- a/tools/create_kyradat/tables.cpp
+++ b/tools/create_kyradat/tables.cpp
@@ -1020,7 +1020,8 @@ const ExtractEntrySearchData k1AmigaGameSFXTableProvider[] = {
 };
 
 const ExtractEntrySearchData k2SeqplayPakFilesProvider[] = {
-	{ UNK_LANG, kPlatformPC, { 0x00000022, 0x000008E0, { { 0xB7, 0x3B, 0x51, 0x46, 0x78, 0x2D, 0x4D, 0x82, 0xD4, 0x30, 0xFC, 0x6E, 0xC4, 0x5B, 0x27, 0x3E } } } }, // floppy
+	{ UNK_LANG, kPlatformUnknown, { 0x00000022, 0x000008E0, { { 0xB7, 0x3B, 0x51, 0x46, 0x78, 0x2D, 0x4D, 0x82, 0xD4, 0x30, 0xFC, 0x6E, 0xC4, 0x5B, 0x27, 0x3E } } } }, // DOS floppy + PC98
+	
 	{ UNK_LANG, kPlatformPC, { 0x00000046, 0x0000121A, { { 0x42, 0xC2, 0x5A, 0xDC, 0x27, 0x2D, 0xB4, 0x44, 0x85, 0x58, 0x0F, 0xB6, 0x6D, 0x76, 0x04, 0x4F } } } }, // CD
 	{ UNK_LANG, kPlatformPC, { 0x00000014, 0x000004FA, { { 0xBB, 0x4C, 0x16, 0xEB, 0x56, 0xEF, 0xAC, 0x68, 0x6B, 0x49, 0x96, 0x3A, 0x9F, 0x00, 0x75, 0xF6 } } } }, // demo
 	{ UNK_LANG, kPlatformPC, { 0x0000000C, 0x00000308, { { 0xC0, 0xAC, 0x10, 0xF1, 0x12, 0xD1, 0x21, 0x92, 0xA1, 0x62, 0x5B, 0x6E, 0xCF, 0x88, 0x32, 0x7C } } } }, // Lands of Lore demo
@@ -1050,6 +1051,9 @@ const ExtractEntrySearchData k2SeqplayStringsProvider[] = {
 	{ EN_ANY, kPlatformFMTowns, { 0x00000990, 0x00030C61, { { 0x60, 0x51, 0x11, 0x83, 0x3F, 0x06, 0xC3, 0xA3, 0xE0, 0xC0, 0x2F, 0x41, 0x29, 0xDE, 0x65, 0xB1 } } } },
 	{ JA_JPN, kPlatformFMTowns, { 0x000008A8, 0x00036831, { { 0x56, 0x5B, 0x23, 0x61, 0xE8, 0x3B, 0xE1, 0x36, 0xD6, 0x62, 0xD0, 0x84, 0x00, 0x04, 0x05, 0xAD } } } },
 
+	{ EN_ANY, kPlatformPC98, { 0x000008F4, 0x00030C61, { { 0xA4, 0x4C, 0xD9, 0x05, 0x65, 0x24, 0xE5, 0x3E, 0x6C, 0x8B, 0xEE, 0x8D, 0x4F, 0x09, 0x6F, 0x00 } } } },
+	{ JA_JPN, kPlatformPC98, { 0x000007F5, 0x00036831, { { 0xF7, 0xCF, 0xF1, 0x2B, 0x26, 0x1E, 0xEC, 0xC8, 0x13, 0xDE, 0xC7, 0x71, 0x72, 0x05, 0x0F, 0xA7 } } } },
+
 	EXTRACT_END_ENTRY
 };
 
@@ -1061,6 +1065,8 @@ const ExtractEntrySearchData k2SeqplaySfxFilesProvider[] = {
 
 	{ UNK_LANG, kPlatformFMTowns, { 0x000001A3, 0x00008098, { { 0xA9, 0xD2, 0xE2, 0x32, 0x59, 0xC4, 0x97, 0x74, 0x11, 0x49, 0x8F, 0x2B, 0xBF, 0x00, 0xF9, 0xF1 } } } },
 
+	{ UNK_LANG, kPlatformPC98, { 0x00000173, 0x00008098, { { 0x29, 0xA6, 0xF1, 0x2D, 0x35, 0x38, 0xFD, 0x3B, 0xF0, 0xB1, 0xE1, 0xFE, 0x45, 0xB1, 0x43, 0xAE } } } },
+
 	EXTRACT_END_ENTRY
 };
 
@@ -1084,6 +1090,8 @@ const ExtractEntrySearchData k2SeqplaySeqDataProvider[] = {
 
 	{ UNK_LANG, kPlatformFMTowns, { 0x000006BC, 0x0000DCE3, { { 0x27, 0x09, 0x22, 0xDC, 0xED, 0xDE, 0x88, 0xAE, 0xDB, 0x97, 0x52, 0x12, 0x96, 0x8D, 0x8D, 0x37 } } } },
 
+	{ UNK_LANG, kPlatformPC98, { 0x000006BE, 0x0000E043, { { 0x35, 0xA0, 0xF1, 0x14, 0xC7, 0x60, 0x80, 0x35, 0xA2, 0xDB, 0xF2, 0x73, 0x96, 0xC0, 0xAE, 0x84 } } } },
+
 	EXTRACT_END_ENTRY
 };
 
@@ -1139,12 +1147,15 @@ const ExtractEntrySearchData k2IngamePakFilesProvider[] = {
 
 	{ UNK_LANG, kPlatformFMTowns, { 0x0000011C, 0x00003FB8, { { 0x66, 0x34, 0xE8, 0x1C, 0xF9, 0xFF, 0x84, 0x90, 0x20, 0x71, 0x42, 0xA3, 0x2C, 0x4A, 0xE9, 0x46 } } } },
 
+	{ UNK_LANG, kPlatformPC98, { 0x000000F4, 0x00003F57, { { 0x8A, 0xA7, 0x2C, 0xB9, 0x6E, 0x8D, 0x95, 0xBF, 0xF8, 0xB9, 0x98, 0x63, 0x20, 0xF8, 0xB0, 0x7B } } } },
+
 	EXTRACT_END_ENTRY
 };
 
 const ExtractEntrySearchData k2IngameSfxFilesProvider[] = {
 	{ UNK_LANG, kPlatformPC, { 0x000006F1, 0x0001545E, { { 0xD3, 0x8A, 0xA1, 0xD4, 0x83, 0x77, 0x96, 0x6D, 0x87, 0xB1, 0x71, 0x8F, 0x38, 0x6A, 0x34, 0xDC } } } },
 	{ UNK_LANG, kPlatformFMTowns, { 0x00000967, 0x0002101A, { { 0x09, 0xC7, 0xB7, 0x2A, 0x76, 0xF1, 0x4B, 0x87, 0xC5, 0x83, 0xFF, 0xF3, 0xDB, 0x3C, 0x66, 0x60 } } } },
+	{ UNK_LANG, kPlatformPC98, 	{ 0x000006F1, 0x0001545E, { { 0xD3, 0x8A, 0xA1, 0xD4, 0x83, 0x77, 0x96, 0x6D, 0x87, 0xB1, 0x71, 0x8F, 0x38, 0x6A, 0x34, 0xDC } } } },
 
 	EXTRACT_END_ENTRY
 };
@@ -1177,11 +1188,14 @@ const ExtractEntrySearchData k2IngameTalkObjIndexProvider[] = {
 
 	{ UNK_LANG, kPlatformFMTowns, { 0x0000007A, 0x00000744, { { 0x74, 0x84, 0xB4, 0xA6, 0x9D, 0x91, 0xBF, 0x24, 0x1E, 0xD5, 0xDE, 0xD4, 0x73, 0x93, 0x1F, 0xE6 } } } },
 
+	{ UNK_LANG, kPlatformPC98, { 0x00000078, 0x0000099D, { { 0x2F, 0x06, 0x8D, 0x4E, 0x76, 0x9E, 0x92, 0xFD, 0x43, 0xA4, 0x12, 0xED, 0xBA, 0x30, 0xFE, 0x94 } } } },
+
 	EXTRACT_END_ENTRY
 };
 
 const ExtractEntrySearchData k2IngameTimJpStringsProvider[] = {
-	{ UNK_LANG, kPlatformUnknown, { 0x0000002D, 0x00001302, { { 0x15, 0x29, 0xFD, 0xB1, 0xEB, 0xC0, 0x00, 0xA4, 0x19, 0xDA, 0xC7, 0x2E, 0x17, 0x0F, 0x3F, 0xB7 } } } },
+	{ UNK_LANG, kPlatformFMTowns, { 0x0000002D, 0x00001302, { { 0x15, 0x29, 0xFD, 0xB1, 0xEB, 0xC0, 0x00, 0xA4, 0x19, 0xDA, 0xC7, 0x2E, 0x17, 0x0F, 0x3F, 0xB7 } } } },
+	{ UNK_LANG, kPlatformPC98, { 0x0000002C, 0x00001302, { { 0xAB, 0xBA, 0xC8, 0x2A, 0xD0, 0xD1, 0x1C, 0xEA, 0x6F, 0x35, 0x12, 0x5D, 0x85, 0xFB, 0x92, 0x84 } } } },
 
 	EXTRACT_END_ENTRY
 };