- Got rid of hardcoded filename list for kyra.dat

- Synced static resource definitions between KYRA main codebase and create_kyradat
- Rebuilt kyra.dat

svn-id: r46047

1 files changed, 26 insertions, 39 deletions

diff --git a/tools/create_kyradat/tables.cpp b/tools/create_kyradat/tables.cpp
index 53f1cc9494..1c7f574af9 100644
--- a/tools/create_kyradat/tables.cpp
+++ b/tools/create_kyradat/tables.cpp
@@ -965,19 +965,19 @@ const ExtractEntrySearchData k1ConfigStringsProvider[] = {
 	EXTRACT_END_ENTRY
 };
 
-const ExtractEntrySearchData k1TOWNSSfxWDTableProvider[] = {
+const ExtractEntrySearchData k1TownsSFXwdTableProvider[] = {
 	{ UNK_LANG, kPlatformFMTowns, { 0x00012608, 0x006717A1, { { 0x34, 0xDD, 0x2D, 0xA5, 0x14, 0x05, 0xEE, 0x2F, 0x93, 0x7C, 0x78, 0x4D, 0xCA, 0x13, 0xED, 0x93 } } } },
 
 	EXTRACT_END_ENTRY
 };
 
-const ExtractEntrySearchData k1TOWNSSfxBTTableProvider[] = {
+const ExtractEntrySearchData k1TownsSFXbtTableProvider[] = {
 	{ UNK_LANG, kPlatformFMTowns, { 0x00000100, 0x00007FFE, { { 0xEF, 0x3D, 0x9F, 0x31, 0xE7, 0x19, 0x1E, 0x4F, 0xF3, 0x66, 0x42, 0xC8, 0x0D, 0x89, 0x96, 0x20 } } } },
 
 	EXTRACT_END_ENTRY
 };
 
-const ExtractEntrySearchData k1TOWNSCDATableProvider[] = {
+const ExtractEntrySearchData k1TownsCDATableProvider[] = {
 	{ UNK_LANG, kPlatformFMTowns, { 0x000002C4, 0x0000C5ED, { { 0x76, 0x86, 0x77, 0xF9, 0x85, 0x23, 0x32, 0x56, 0x3C, 0x06, 0x03, 0xCF, 0x0C, 0x49, 0x94, 0xB5 } } } },
 
 	EXTRACT_END_ENTRY
@@ -1142,13 +1142,8 @@ const ExtractEntrySearchData k2IngamePakFilesProvider[] = {
 };
 
 const ExtractEntrySearchData k2IngameSfxFilesProvider[] = {
-	{ UNK_LANG, kPlatformUnknown, { 0x000006F1, 0x0001545E, { { 0xD3, 0x8A, 0xA1, 0xD4, 0x83, 0x77, 0x96, 0x6D, 0x87, 0xB1, 0x71, 0x8F, 0x38, 0x6A, 0x34, 0xDC } } } },
-
-	EXTRACT_END_ENTRY
-};
-
-const ExtractEntrySearchData k2IngameSfxFilesTnsProvider[] = {
-	{ UNK_LANG, kPlatformUnknown, { 0x00000967, 0x0002101A, { { 0x09, 0xC7, 0xB7, 0x2A, 0x76, 0xF1, 0x4B, 0x87, 0xC5, 0x83, 0xFF, 0xF3, 0xDB, 0x3C, 0x66, 0x60 } } } },
+	{ 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 } } } },
 
 	EXTRACT_END_ENTRY
 };
@@ -1190,7 +1185,7 @@ const ExtractEntrySearchData k2IngameTimJpStringsProvider[] = {
 	EXTRACT_END_ENTRY
 };
 
-const ExtractEntrySearchData k2IngameItemAnimDataProvider[] = {
+const ExtractEntrySearchData k2IngameShapeAnimDataProvider[] = {
 	{ UNK_LANG, kPlatformPC, { 0x00000348, 0x0001AAEB, { { 0x67, 0xD1, 0x03, 0xBF, 0x4B, 0xEC, 0x80, 0x26, 0x5D, 0x1D, 0x0E, 0x5B, 0xF1, 0xE8, 0x4C, 0x64 } } } }, // CD
 
 	{ UNK_LANG, kPlatformUnknown, { 0x00000348, 0x00002473, { { 0xBC, 0x18, 0x51, 0xFA, 0x51, 0x1D, 0x24, 0x7D, 0x44, 0xD0, 0xE2, 0x38, 0x31, 0x33, 0x3B, 0x56 } } } }, // floppy + FM-TOWNS
@@ -1254,12 +1249,6 @@ const ExtractEntrySearchData k3ItemStringMapProvider[] = {
 	EXTRACT_END_ENTRY
 };
 
-const ExtractEntrySearchData kLolSeqplayIntroTracksProvider[] = {
-	{ UNK_LANG, kPlatformPC, { 0x0000001A, 0x0000096C, { { 0xC2, 0xBD, 0x2C, 0x65, 0xD3, 0xFE, 0xF1, 0x6A, 0xE7, 0x34, 0x18, 0x0C, 0x86, 0x95, 0x66, 0x35 } } } },
-
-	EXTRACT_END_ENTRY
-};
-
 const ExtractEntrySearchData kLolIngamePakFilesProvider[] = {
 	{ UNK_LANG, kPlatformPC, { 0x00000088, 0x0000224F, { { 0xDA, 0x24, 0x18, 0xA3, 0xEF, 0x16, 0x70, 0x8F, 0xA8, 0xC2, 0x2E, 0xC2, 0xED, 0x39, 0x03, 0xD1 } } } },
 	{ UNK_LANG, kPlatformPC98, { 0x00000084, 0x00002125, { { 0x7A, 0x89, 0xE2, 0x36, 0xEC, 0x6F, 0x52, 0x2B, 0xEF, 0xBA, 0x3D, 0x28, 0x54, 0xDA, 0xFB, 0x72 } } } },
@@ -1295,19 +1284,19 @@ const ExtractEntrySearchData kLolMusicTrackMapProvider[] = {
 	EXTRACT_END_ENTRY
 };
 
-const ExtractEntrySearchData kLolGMSfxIndexProvider[] = {
+const ExtractEntrySearchData kLolIngameGMSfxIndexProvider[] = {
 	{ UNK_LANG, kPlatformPC, { 0x000000FA, 0x00006281, { { 0x25, 0x89, 0xB0, 0x3B, 0x12, 0x09, 0x02, 0xF6, 0xFE, 0x76, 0xD5, 0xC9, 0x5B, 0x88, 0xAC, 0xAA } } } },
 
 	EXTRACT_END_ENTRY
 };
 
-const ExtractEntrySearchData kLolMT32SfxIndexProvider[] = {
+const ExtractEntrySearchData kLolIngameMT32SfxIndexProvider[] = {
 	{ UNK_LANG, kPlatformPC, { 0x000000FA, 0x00006579, { { 0x16, 0x40, 0x1C, 0x09, 0x69, 0xA9, 0x0D, 0x6D, 0x4B, 0x0C, 0x99, 0xF0, 0x40, 0x5D, 0xBB, 0x6E } } } },
 
 	EXTRACT_END_ENTRY
 };
 
-const ExtractEntrySearchData kLolPcSpkSfxIndexProvider[] = {
+const ExtractEntrySearchData kLolIngamePcSpkSfxIndexProvider[] = {
 	{ UNK_LANG, kPlatformPC, { 0x000000FA, 0x00005EFC, { { 0xA3, 0x5C, 0x69, 0xED, 0x13, 0xEC, 0x08, 0x0E, 0xFA, 0x72, 0x83, 0x0D, 0xD7, 0x8D, 0x9C, 0x70 } } } },
 
 	EXTRACT_END_ENTRY
@@ -1381,7 +1370,7 @@ const ExtractEntrySearchData kLolMonsterModifiersProvider[] = {
 	EXTRACT_END_ENTRY
 };
 
-const ExtractEntrySearchData kLolMonsterLevelOffsetsProvider[] = {
+const ExtractEntrySearchData kLolMonsterShiftOffsetsProvider[] = {
 	{ UNK_LANG, kPlatformUnknown, { 0x00000020, 0x00000803, { { 0x30, 0x55, 0x74, 0x0D, 0xC7, 0x3B, 0xD9, 0x5C, 0x26, 0xF0, 0x4E, 0x8F, 0xE4, 0x4D, 0xCB, 0x2A } } } },
 
 	EXTRACT_END_ENTRY
@@ -1412,7 +1401,7 @@ const ExtractEntrySearchData kLolMonsterScaleWHProvider[] = {
 	EXTRACT_END_ENTRY
 };
 
-const ExtractEntrySearchData kLolFlyingItemShpProvider[] = {
+const ExtractEntrySearchData kLolFlyingObjectShpProvider[] = {
 	{ UNK_LANG, kPlatformUnknown, { 0x00000082, 0x00000252, { { 0xDE, 0x9D, 0x89, 0xAF, 0x0F, 0x50, 0x14, 0x60, 0x68, 0xAF, 0x19, 0xD8, 0x54, 0x8A, 0x36, 0x27 } } } },
 
 	EXTRACT_END_ENTRY
@@ -1461,13 +1450,13 @@ const ExtractEntrySearchData kLolDscUnk1Provider[] = {
 	EXTRACT_END_ENTRY
 };
 
-const ExtractEntrySearchData kLolDscShapeIndex1Provider[] = {
+const ExtractEntrySearchData kLolDscShapeIndexProvider[] = {
 	{ UNK_LANG, kPlatformUnknown, { 0x00000024, 0x00000728, { { 0x14, 0xBA, 0x6D, 0x5C, 0x7D, 0x20, 0x0D, 0x35, 0xA7, 0xB0, 0x8D, 0x2F, 0x1D, 0x2A, 0x49, 0xA4 } } } },
 
 	EXTRACT_END_ENTRY
 };
 
-const ExtractEntrySearchData kLolDscShapeIndex2Provider[] = {
+const ExtractEntrySearchData kLolDscOvlMapProvider[] = {
 	{ UNK_LANG, kPlatformUnknown, { 0x0000000A, 0x0000001F, { { 0x9C, 0xF2, 0xCC, 0x48, 0x42, 0xC6, 0x76, 0x83, 0xD3, 0x1A, 0x43, 0x42, 0x7F, 0xEF, 0x19, 0x0F } } } },
 
 	EXTRACT_END_ENTRY
@@ -1539,7 +1528,7 @@ const ExtractEntrySearchData kLolDscDimMapProvider[] = {
 	EXTRACT_END_ENTRY
 };
 
-const ExtractEntrySearchData kLolDscShapeOvlIndexProvider[] = {
+const ExtractEntrySearchData kLolDscOvlIndexProvider[] = {
 	{ UNK_LANG, kPlatformUnknown, { 0x00000028, 0x00000048, { { 0x3E, 0x8E, 0x62, 0xAF, 0xD1, 0x28, 0x39, 0x73, 0x0D, 0xD8, 0x4A, 0xA7, 0xF4, 0xD7, 0x32, 0x25 } } } },
 
 	EXTRACT_END_ENTRY
@@ -1816,9 +1805,9 @@ const ExtractEntry extractProviders[] = {
 	{ k1SpecialPalette33, k1SpecialPalette33Provider },
 	{ k1GUIStrings, k1GUIStringsProvider },
 	{ k1ConfigStrings, k1ConfigStringsProvider },
-	{ k1TOWNSSfxWDTable, k1TOWNSSfxWDTableProvider },
-	{ k1TOWNSSfxBTTable, k1TOWNSSfxBTTableProvider },
-	{ k1TOWNSCDATable, k1TOWNSCDATableProvider },
+	{ k1TownsSFXwdTable, k1TownsSFXwdTableProvider },
+	{ k1TownsSFXbtTable, k1TownsSFXbtTableProvider },
+	{ k1TownsCDATable, k1TownsCDATableProvider },
 	{ k1PC98StoryStrings, k1PC98StoryStringsProvider },
 	{ k1PC98IntroSfx, k1PC98IntroSfxProvider },
 	{ k1CreditsStrings, k1CreditsStringsProvider },
@@ -1838,13 +1827,12 @@ const ExtractEntry extractProviders[] = {
 	{ k2SeqplayShapeAnimData, k2SeqplayShapeAnimDataProvider },
 	{ k2IngamePakFiles, k2IngamePakFilesProvider },
 	{ k2IngameSfxFiles, k2IngameSfxFilesProvider },
-	{ k2IngameSfxFilesTns, k2IngameSfxFilesTnsProvider },
 	{ k2IngameSfxIndex, k2IngameSfxIndexProvider },
 	{ k2IngameTracks, k2IngameTracksProvider },
 	{ k2IngameCDA, k2IngameCDAProvider },
 	{ k2IngameTalkObjIndex, k2IngameTalkObjIndexProvider },
 	{ k2IngameTimJpStrings, k2IngameTimJpStringsProvider },
-	{ k2IngameItemAnimData, k2IngameItemAnimDataProvider },
+	{ k2IngameShapeAnimData, k2IngameShapeAnimDataProvider },
 	{ k2IngameTlkDemoStrings, k2IngameTlkDemoStringsProvider },
 	{ k3MainMenuStrings, k3MainMenuStringsProvider },
 	{ k3MusicFiles, k3MusicFilesProvider },
@@ -1854,15 +1842,14 @@ const ExtractEntry extractProviders[] = {
 	{ k3ItemAnimData, k3ItemAnimDataProvider },
 	{ k3ItemMagicTable, k3ItemMagicTableProvider },
 	{ k3ItemStringMap, k3ItemStringMapProvider },
-	{ kLolSeqplayIntroTracks, kLolSeqplayIntroTracksProvider },
 	{ kLolIngamePakFiles, kLolIngamePakFilesProvider },
 	{ kLolCharacterDefs, kLolCharacterDefsProvider },
 	{ kLolIngameSfxFiles, kLolIngameSfxFilesProvider },
 	{ kLolIngameSfxIndex, kLolIngameSfxIndexProvider },
 	{ kLolMusicTrackMap, kLolMusicTrackMapProvider },
-	{ kLolGMSfxIndex, kLolGMSfxIndexProvider },
-	{ kLolMT32SfxIndex, kLolMT32SfxIndexProvider },
-	{ kLolPcSpkSfxIndex, kLolPcSpkSfxIndexProvider },
+	{ kLolIngameGMSfxIndex, kLolIngameGMSfxIndexProvider },
+	{ kLolIngameMT32SfxIndex, kLolIngameMT32SfxIndexProvider },
+	{ kLolIngamePcSpkSfxIndex, kLolIngamePcSpkSfxIndexProvider },
 	{ kLolSpellProperties, kLolSpellPropertiesProvider },
 	{ kLolGameShapeMap, kLolGameShapeMapProvider },
 	{ kLolSceneItemOffs, kLolSceneItemOffsProvider },
@@ -1874,12 +1861,12 @@ const ExtractEntry extractProviders[] = {
 	{ kLolCharDefsAkshel, kLolCharDefsAkshelProvider },
 	{ kLolExpRequirements, kLolExpRequirementsProvider },
 	{ kLolMonsterModifiers, kLolMonsterModifiersProvider },
-	{ kLolMonsterLevelOffsets, kLolMonsterLevelOffsetsProvider },
+	{ kLolMonsterShiftOffsets, kLolMonsterShiftOffsetsProvider },
 	{ kLolMonsterDirFlags, kLolMonsterDirFlagsProvider },
 	{ kLolMonsterScaleY, kLolMonsterScaleYProvider },
 	{ kLolMonsterScaleX, kLolMonsterScaleXProvider },
 	{ kLolMonsterScaleWH, kLolMonsterScaleWHProvider },
-	{ kLolFlyingItemShp, kLolFlyingItemShpProvider },
+	{ kLolFlyingObjectShp, kLolFlyingObjectShpProvider },
 	{ kLolInventoryDesc, kLolInventoryDescProvider },
 	{ kLolLevelShpList, kLolLevelShpListProvider },
 	{ kLolLevelDatList, kLolLevelDatListProvider },
@@ -1887,8 +1874,8 @@ const ExtractEntry extractProviders[] = {
 	{ kLolItemPrices, kLolItemPricesProvider },
 	{ kLolStashSetup, kLolStashSetupProvider },
 	{ kLolDscUnk1, kLolDscUnk1Provider },
-	{ kLolDscShapeIndex1, kLolDscShapeIndex1Provider },
-	{ kLolDscShapeIndex2, kLolDscShapeIndex2Provider },
+	{ kLolDscShapeIndex, kLolDscShapeIndexProvider },
+	{ kLolDscOvlMap, kLolDscOvlMapProvider },
 	{ kLolDscScaleWidthData, kLolDscScaleWidthDataProvider },
 	{ kLolDscScaleHeightData, kLolDscScaleHeightDataProvider },
 	{ kLolDscX, kLolDscXProvider },
@@ -1900,7 +1887,7 @@ const ExtractEntry extractProviders[] = {
 	{ kLolDscDimData2, kLolDscDimData2Provider },
 	{ kLolDscBlockMap, kLolDscBlockMapProvider },
 	{ kLolDscDimMap, kLolDscDimMapProvider },
-	{ kLolDscShapeOvlIndex, kLolDscShapeOvlIndexProvider },
+	{ kLolDscOvlIndex, kLolDscOvlIndexProvider },
 	{ kLolDscBlockIndex, kLolDscBlockIndexProvider },
 	{ kLolDscDoor1, kLolDscDoor1Provider },
 	{ kLolDscDoorScale, kLolDscDoorScaleProvider },