Adapted create_kyradat to use an automatic offset search. (Hopefully no regressions).

svn-id: r44118

1 files changed, 123 insertions, 85 deletions

diff --git a/tools/create_kyradat/misc.h b/tools/create_kyradat/misc.h
index 3c252f32a8..28a6303f83 100644
--- a/tools/create_kyradat/misc.h
+++ b/tools/create_kyradat/misc.h
@@ -202,7 +202,7 @@ const int kyra1DemoCDNeed[] = {
 	-1
 };
 
-const int kyra1TownsEngNeed[] = {
+const int kyra1TownsNeed[] = {
 	kKallakWritingSeq,
 	kMalcolmTreeSeq,
 	kWestwoodLogoSeq,
@@ -293,32 +293,6 @@ const int kyra1TownsEngNeed[] = {
 	-1
 };
 
-const int kyra1TownsJapNeed[] = {
-	kIntroStrings,
-	kItemNames,
-	kTakenStrings,
-	kPlacedStrings,
-	kDroppedStrings,
-	kNoDropStrings,
-	kPutDownString,
-	kWaitAmuletString,
-	kBlackJewelString,
-	kHealingTipString,
-	kPoisonGoneString,
-	kThePoisonStrings,
-	kFluteStrings,
-	kWispJewelStrings,
-	kMagicJewelStrings,
-	kFlaskFullString,
-	kFullFlaskString,
-	kOutroHomeString,
-	kVeryCleverString,
-	kGUIStrings,
-	kNewGameString,
-	kConfigStrings,
-	-1
-};
-
 const int kyra1AmigaNeed[] = {
 	kKallakWritingSeq,
 	kMalcolmTreeSeq,
@@ -374,7 +348,7 @@ const int kyra1AmigaNeed[] = {
 	-1
 };
 
-const int kyra2CDFile1EngNeed[] = {
+const int kyra2CDFile1Need[] = {
 	k2SeqplayPakFiles,
 	k2SeqplayCredits,
 	k2SeqplayCreditsSpecial,
@@ -387,25 +361,7 @@ const int kyra2CDFile1EngNeed[] = {
 	-1
 };
 
-const int kyra2CDFile1FreNeed[] = {
-	k2SeqplayStrings,
-	k2SeqplayTlkFiles,
-	-1
-};
-
-const int kyra2CDFile1GerNeed[] = {
-	k2SeqplayStrings,
-	k2SeqplayTlkFiles,
-	-1
-};
-
-const int kyra2CDFile1ItaNeed[] = {
-	k2SeqplayStrings,
-	k2SeqplayTlkFiles,
-	-1
-};
-
-const int kyra2CDFile2EngNeed[] = {
+const int kyra2CDFile2Need[] = {
 	k2IngameSfxFiles,
 	k2IngameSfxIndex,
 	k2IngameTracks,
@@ -414,11 +370,13 @@ const int kyra2CDFile2EngNeed[] = {
 	-1
 };
 
-const int kyra2CDFile2FreNeed[] = {
-	-1
-};
-
-const int kyra2CDFile2GerNeed[] = {
+const int kyra2CDDemoNeed[] = {
+	k2IngameSfxFiles,
+	k2IngameSfxIndex,
+	k2IngameTracks,
+	k2IngameTalkObjIndex,
+	k2IngameItemAnimData,
+	k2IngameTlkDemoStrings,
 	-1
 };
 
@@ -442,7 +400,7 @@ const int kyra2FloppyFile2Need[] = {
 	-1
 };
 
-const int kyra2TownsFile1EngNeed[] = {
+const int kyra2TownsFile1Need[] = {
 	k2SeqplayPakFiles,
 	k2SeqplayStrings,
 	k2SeqplaySfxFiles,
@@ -452,12 +410,7 @@ const int kyra2TownsFile1EngNeed[] = {
 	-1
 };
 
-const int kyra2TownsFile1JapNeed[] = {
-	k2SeqplayStrings,
-	-1
-};
-
-const int kyra2TownsFile2EngNeed[] = {
+const int kyra2TownsFile2Need[] = {
 	k2IngamePakFiles,
 	k2IngameSfxFilesTns,
 	k2IngameSfxIndex,
@@ -468,10 +421,6 @@ const int kyra2TownsFile2EngNeed[] = {
 	-1
 };
 
-const int kyra2TownsFile2JapNeed[] = {
-	-1
-};
-
 const int kyra2DemoNeed[] = {
 	k2SeqplayPakFiles,
 	k2SeqplaySeqData,
@@ -581,7 +530,7 @@ const int lolFloppyNeed[] = {
 	-1
 };
 
-const int lolCDFile1ENeed[] = {
+const int lolCDFile1Need[] = {
 	kLolHistory,
 	-1
 };
@@ -680,36 +629,39 @@ const int lolDemoNeed[] = {
 const GameNeed gameNeedTable[] = {
 	{ kKyra1, -1, kyra1FloppyNeed },
 	{ kKyra1, kTalkieVersion, kyra1CDNeed },
-	{ kKyra1, kFMTownsVersionE , kyra1TownsEngNeed },
-	{ kKyra1, kFMTownsVersionJ, kyra1TownsJapNeed },
+	{ kKyra1, kFMTownsVersionE , kyra1TownsNeed },
+	{ kKyra1, kFMTownsVersionJ, kyra1TownsNeed },
 	{ kKyra1, kAmigaVersion, kyra1AmigaNeed },
 	{ kKyra1, kDemoVersion, kyra1DemoNeed },
 	{ kKyra1, kDemoCDVersion, kyra1DemoCDNeed },
 
 	{ kKyra2, k2FloppyFile1, kyra2FloppyFile1Need },
 	{ kKyra2, k2FloppyFile2, kyra2FloppyFile2Need },
-	{ kKyra2, k2CDFile1E, kyra2CDFile1EngNeed },
-	{ kKyra2, k2CDFile1F, kyra2CDFile1FreNeed },
-	{ kKyra2, k2CDFile1G, kyra2CDFile1GerNeed },
-	{ kKyra2, k2CDFile1I, kyra2CDFile1ItaNeed }, // Italian fan translation
-	{ kKyra2, k2CDFile2E, kyra2CDFile2EngNeed },
-	{ kKyra2, k2CDFile2F, kyra2CDFile2FreNeed },
-	{ kKyra2, k2CDFile2G, kyra2CDFile2GerNeed },
-	{ kKyra2, k2TownsFile1E , kyra2TownsFile1EngNeed },
-	{ kKyra2, k2TownsFile1J, kyra2TownsFile1JapNeed },
-	{ kKyra2, k2TownsFile2E , kyra2TownsFile2EngNeed },
-	{ kKyra2, k2TownsFile2J, kyra2TownsFile2JapNeed },
-	{ kKyra2, k2DemoVersion, kyra2DemoNeed},
-	{ kKyra2, k2DemoVersionTlkE, kyra2TlkDemoNeed},
-	{ kKyra2, k2DemoVersionTlkF, kyra2TlkDemoNeed},
-	{ kKyra2, k2DemoVersionTlkG, kyra2TlkDemoNeed},
-	{ kLol, k2DemoLol, lolDemoNeed},
+	{ kKyra2, k2CDFile1E, kyra2CDFile1Need },
+	{ kKyra2, k2CDFile1F, kyra2CDFile1Need },
+	{ kKyra2, k2CDFile1G, kyra2CDFile1Need },
+	{ kKyra2, k2CDFile1I, kyra2CDFile1Need }, // Italian fan translation
+	{ kKyra2, k2CDFile2E, kyra2CDFile2Need },
+	{ kKyra2, k2CDFile2F, kyra2CDFile2Need },
+	{ kKyra2, k2CDFile2G, kyra2CDFile2Need },
+	{ kKyra2, k2CDDemoE, kyra2CDDemoNeed },
+	{ kKyra2, k2CDDemoF, kyra2CDDemoNeed },
+	{ kKyra2, k2CDDemoG, kyra2CDDemoNeed },
+	{ kKyra2, k2TownsFile1E , kyra2TownsFile1Need },
+	{ kKyra2, k2TownsFile1J, kyra2TownsFile1Need },
+	{ kKyra2, k2TownsFile2E , kyra2TownsFile2Need },
+	{ kKyra2, k2TownsFile2J, kyra2TownsFile2Need },
+	{ kKyra2, k2DemoVersion, kyra2DemoNeed },
+	{ kKyra2, k2DemoVersionTlkE, kyra2TlkDemoNeed },
+	{ kKyra2, k2DemoVersionTlkF, kyra2TlkDemoNeed },
+	{ kKyra2, k2DemoVersionTlkG, kyra2TlkDemoNeed },
+	{ kLol, k2DemoLol, lolDemoNeed },
 
 	{ kKyra3, -1, kyra3Need },
 
 	{ kLol, -1, lolFloppyNeed },
-	{ kLol, kLolCD, lolCDFile1ENeed },
-	{ kLol, kLolCD, lolCDFile2Need },
+	{ kLol, kLolCD1, lolCDFile1Need },
+	{ kLol, kLolCD2, lolCDFile2Need },
 
 	{ -1, -1, 0 }
 };
@@ -729,6 +681,9 @@ const SpecialExtension specialTable[] = {
 	{ k2CDFile2E, "CD" },
 	{ k2CDFile2F, "CD" },
 	{ k2CDFile2G, "CD" },
+	{ k2CDDemoE, "CD" },
+	{ k2CDDemoF, "CD" },
+	{ k2CDDemoG, "CD" },
 
 	{ k2TownsFile1E, "TNS" },
 	{ k2TownsFile1J, "TNS" },
@@ -737,7 +692,8 @@ const SpecialExtension specialTable[] = {
 	{ k2DemoVersion, "DEM" },
 	{ k2DemoLol, "DEM" },
 
-	{ kLolCD, "CD" },
+	{ kLolCD1, "CD" },
+	{ kLolCD2, "CD" },
 
 	{ -1, 0 }
 };
@@ -751,3 +707,85 @@ const Language languageTable[] = {
 	{ JA_JPN, "JPN" },
 	{ -1, 0 }
 };
+
+const Game kyra1Games[] = {
+	// Demos
+	{ kKyra1, EN_ANY, kDemoVersion, "7b7504c8560ffc914d34c44c71b3094c" },
+	{ kKyra1, EN_ANY, kDemoCDVersion, "226fdba99cb11ef1047131d9a50e6292" },
+
+	// Amiga
+	{ kKyra1, EN_ANY, kAmigaVersion, "b620564b6b7e0787b053ca9e35bd9f52" },
+
+	// Floppy
+	{ kKyra1, EN_ANY, -1, "76a4fc84e173cadb6369785787e1546e" },
+	{ kKyra1, DE_DEU, -1, "9442d6f7db6a41f3dd4aa4de5d36e107" },
+	{ kKyra1, FR_FRA, -1, "aa9d6d78d8b199deaf48efeca6d19af2" },
+	{ kKyra1, IT_ITA, -1, "5d7550306b369a3492f9f3402702477c" },
+	{ kKyra1, ES_ESP, -1, "9ff130d2558bcd674d4074849d93c362" },
+
+	// Talkie
+	{ kKyra1, EN_ANY, kTalkieVersion, "1ebc18f3e7fbb72474a55cb0fa089ed4" },
+	{ kKyra1, DE_DEU, kTalkieVersion, "c65d381184f98ac26d9efd2d45baef51" },
+	{ kKyra1, FR_FRA, kTalkieVersion, "307c5d4a554d9068ac3d326e350ae4a6" },
+	{ kKyra1, IT_ITA, kTalkieVersion, "d0f1752098236083d81b9497bd2b6989" }, // Italian fan translation
+
+	// FM-TOWNS
+	{ kKyra1, EN_ANY, kFMTownsVersionE, "5a3ad60ccd0f2e29463e0368cd14a60d" },
+	{ kKyra1, JA_JPN, kFMTownsVersionJ, "5a3ad60ccd0f2e29463e0368cd14a60d" },
+
+	GAME_DUMMY_ENTRY
+};
+
+const Game kyra2Games[] = {
+	// demos
+	{ kKyra2, EN_ANY, k2DemoVersion, "a620a37579dd44ab0403482285e3897f" },
+	{ kKyra2, EN_ANY, k2CDDemoE, "fa54d8abfe05f9186c05f7de7eaf1480" },
+	{ kKyra2, FR_FRA, k2CDDemoF, "fa54d8abfe05f9186c05f7de7eaf1480" },
+	{ kKyra2, DE_DEU, k2CDDemoG, "fa54d8abfe05f9186c05f7de7eaf1480" },
+
+	// floppy games
+	{ kKyra2, EN_ANY, k2FloppyFile1, "9b0f5e57b5a2ed88b5b989cbb402b6c7" },
+	{ kKyra2, FR_FRA, k2FloppyFile1, "df31cc9e37e1cf68df2fdc75ddf2d87b" },
+	{ kKyra2, DE_DEU, k2FloppyFile1, "0ca4f9a1438264a4c63c3218e064ed3b" },
+	{ kKyra2, IT_ITA, k2FloppyFile1, "178d3ab913f61bfba21d2fb196405e8c" },
+	{ kKyra2, EN_ANY, k2FloppyFile2, "7c3eadbe5122722cf2e5e1611e19dfb9" },
+	{ kKyra2, FR_FRA, k2FloppyFile2, "fc2c6782778e6c6d5a553d1cb73c98ad" },
+	{ kKyra2, DE_DEU, k2FloppyFile2, "0d9b0eb7b0ad889ec942d74d80dde1bf" },
+	{ kKyra2, IT_ITA, k2FloppyFile2, "3a61ed6b7c00ddae383a0361799e2ba6" },
+
+	// talkie games
+	{ kKyra2, EN_ANY, k2CDFile1E, "85bbc1cc6c4cef6ad31fc6ee79518efb" },
+	{ kKyra2, FR_FRA, k2CDFile1F, "85bbc1cc6c4cef6ad31fc6ee79518efb" },
+	{ kKyra2, DE_DEU, k2CDFile1G, "85bbc1cc6c4cef6ad31fc6ee79518efb" },
+	{ kKyra2, EN_ANY, k2CDFile2E, "e20d0d2e500f01e399ec588247a7e213" },
+	{ kKyra2, FR_FRA, k2CDFile2F, "e20d0d2e500f01e399ec588247a7e213" },
+	{ kKyra2, DE_DEU, k2CDFile2G, "e20d0d2e500f01e399ec588247a7e213" },
+	{ kKyra2, IT_ITA, k2CDFile1I, "130795aa8f2333250c895dae9028b9bb" }, // Italian Fan Translation (using same offsets as English)
+
+	// FM-TOWNS games
+	{ kKyra2, EN_ANY, k2TownsFile1E, "74f50d79c919cc8e7196c24942ce43d7" },
+	{ kKyra2, JA_JPN, k2TownsFile1J, "74f50d79c919cc8e7196c24942ce43d7" },
+	{ kKyra2, EN_ANY, k2TownsFile2E, "a9a7fd4f05d00090e9e8bda073e6d431" },
+	{ kKyra2, JA_JPN, k2TownsFile2J, "a9a7fd4f05d00090e9e8bda073e6d431" },
+
+	GAME_DUMMY_ENTRY
+};
+
+const Game kyra3Games[] = {
+	{ kKyra3, EN_ANY, -1, "bf68701eb591d0b72219f314c0d32688" },
+	GAME_DUMMY_ENTRY
+};
+
+const Game lolGames[] = {
+	// DOS demo
+	{ kLol, EN_ANY, k2DemoLol, "30bb5af87d38adb47d3e6ce06b1cb042" },
+
+	// DOS floppy
+	{ kLol, EN_ANY, -1, "6b843869772c1b779e1386be868c15dd" },
+
+	// DOS CD
+	{ kLol, EN_ANY, kLolCD1, "9d1778314de80598c0b0d032e2a1a1cf" },
+	{ kLol, EN_ANY, kLolCD2, "263998ec600afca1cc7b935c473df670" },
+
+	GAME_DUMMY_ENTRY
+};