Some name consistency changes.

svn-id: r46014

4 files changed, 35 insertions, 35 deletions

diff --git a/tools/create_kyradat/create_kyradat.cpp b/tools/create_kyradat/create_kyradat.cpp
index dc20400acd..dad9e3289d 100644
--- a/tools/create_kyradat/create_kyradat.cpp
+++ b/tools/create_kyradat/create_kyradat.cpp
@@ -153,13 +153,13 @@ const ExtractFilename extractFilenames[] = {
 	{ kCreditsStrings, kTypeRawData, "CREDITS" },
 
 	// FM-TOWNS specific
-	{ kKyra1TownsSFXwdTable, kTypeTownsWDSfxTable, "SFXWDTABLE" },
-	{ kKyra1TownsSFXbtTable, kTypeRawData, "SFXBTTABLE" },
-	{ kKyra1TownsCDATable, kTypeRawData, "CDATABLE" },
+	{ kTOWNSSfxWDTable, kTypeTownsWDSfxTable, "SFXWDTABLE" },
+	{ kTOWNSSfxBTTable, kTypeRawData, "SFXBTTABLE" },
+	{ kTOWNSCDATable, kTypeRawData, "CDATABLE" },
 
 	// PC98 specific
-	{ kKyra1PC98StoryStrings, kTypeLanguageList, "INTROSTORY" },
-	{ kKyra1PC98IntroSfx, kTypeRawData, "INTROSFX" },
+	{ kPC98StoryStrings, kTypeLanguageList, "INTROSTORY" },
+	{ kPC98IntroSfx, kTypeRawData, "INTROSFX" },
 
 	// AMIGA specific
 	{ kAmigaIntroSFXTable, kTypeAmigaSfxTable, "SFXINTRO" },
@@ -789,16 +789,16 @@ const char *getIdString(const int id) {
 		return "kGUIStrings";
 	case kConfigStrings:
 		return "kConfigStrings";
-	case kKyra1TownsSFXwdTable:
-		return "kKyra1TownsSFXwdTable";
-	case kKyra1TownsSFXbtTable:
-		return "kKyra1TownsSFXbtTable";
-	case kKyra1TownsCDATable:
-		return "kKyra1TownsCDATable";
-	case kKyra1PC98StoryStrings:
-		return "kKyra1PC98StoryStrings";
-	case kKyra1PC98IntroSfx:
-		return "kKyra1PC98IntroSfx";
+	case kTOWNSSfxWDTable:
+		return "kTOWNSSfxWDTable";
+	case kTOWNSSfxBTTable:
+		return "kTOWNSSfxBTTable";
+	case kTOWNSCDATable:
+		return "kTOWNSCDATable";
+	case kPC98StoryStrings:
+		return "kPC98StoryStrings";
+	case kPC98IntroSfx:
+		return "kPC98IntroSfx";
 	case kCreditsStrings:
 		return "kCreditsStrings";
 	case kAmigaIntroSFXTable:
diff --git a/tools/create_kyradat/create_kyradat.h b/tools/create_kyradat/create_kyradat.h
index c7a560cff5..4bf4fb2eda 100644
--- a/tools/create_kyradat/create_kyradat.h
+++ b/tools/create_kyradat/create_kyradat.h
@@ -144,11 +144,11 @@ enum kExtractID {
 	kGUIStrings,
 	kConfigStrings,
 
-	kKyra1TownsSFXwdTable,
-	kKyra1TownsSFXbtTable,
-	kKyra1TownsCDATable,
-	kKyra1PC98StoryStrings,
-	kKyra1PC98IntroSfx,
+	kTOWNSSfxWDTable,
+	kTOWNSSfxBTTable,
+	kTOWNSCDATable,
+	kPC98StoryStrings,
+	kPC98IntroSfx,
 	kCreditsStrings,
 
 	kAmigaIntroSFXTable,
diff --git a/tools/create_kyradat/games.cpp b/tools/create_kyradat/games.cpp
index a3c8ac0e2c..f27c4cd76c 100644
--- a/tools/create_kyradat/games.cpp
+++ b/tools/create_kyradat/games.cpp
@@ -423,9 +423,9 @@ const int kyra1TownsNeed[] = {
 	kNewGameString,
 	kConfigStrings,
 
-	kKyra1TownsSFXwdTable,
-	kKyra1TownsSFXbtTable,
-	kKyra1TownsCDATable,
+	kTOWNSSfxWDTable,
+	kTOWNSSfxBTTable,
+	kTOWNSCDATable,
 	kAudioTracks,
 	kCreditsStrings,
 	-1
@@ -514,8 +514,8 @@ const int kyra1PC98Need[] = {
 	kNewGameString,
 	kConfigStrings,
 
-	kKyra1PC98StoryStrings,
-	kKyra1PC98IntroSfx,
+	kPC98StoryStrings,
+	kPC98IntroSfx,
 	kCreditsStrings,
 	-1
 };
diff --git a/tools/create_kyradat/tables.cpp b/tools/create_kyradat/tables.cpp
index e0d1497a3f..461cdaf65e 100644
--- a/tools/create_kyradat/tables.cpp
+++ b/tools/create_kyradat/tables.cpp
@@ -966,31 +966,31 @@ const ExtractEntrySearchData kConfigStringsProvider[] = {
 	EXTRACT_END_ENTRY
 };
 
-const ExtractEntrySearchData kKyra1TownsSFXwdTableProvider[] = {
+const ExtractEntrySearchData kTOWNSSfxWDTableProvider[] = {
 	{ 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 kKyra1TownsSFXbtTableProvider[] = {
+const ExtractEntrySearchData kTOWNSSfxBTTableProvider[] = {
 	{ 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 kKyra1TownsCDATableProvider[] = {
+const ExtractEntrySearchData kTOWNSCDATableProvider[] = {
 	{ UNK_LANG, kPlatformFMTowns, { 0x000002C4, 0x0000C5ED, { { 0x76, 0x86, 0x77, 0xF9, 0x85, 0x23, 0x32, 0x56, 0x3C, 0x06, 0x03, 0xCF, 0x0C, 0x49, 0x94, 0xB5 } } } },
 
 	EXTRACT_END_ENTRY
 };
 
-const ExtractEntrySearchData kKyra1PC98StoryStringsProvider[] = {
+const ExtractEntrySearchData kPC98StoryStringsProvider[] = {
 	{ JA_JPN, kPlatformPC98, { 0x00000054, 0x00002FAD, { { 0xCB, 0x25, 0xD1, 0xFA, 0x65, 0xCE, 0xD5, 0xE6, 0xAD, 0xE3, 0x48, 0x25, 0xC8, 0x51, 0xC6, 0x12 } } } },
 
 	EXTRACT_END_ENTRY
 };
 
-const ExtractEntrySearchData kKyra1PC98IntroSfxProvider[] = {
+const ExtractEntrySearchData kPC98IntroSfxProvider[] = {
 	{ UNK_LANG, kPlatformPC98, { 0x00000300, 0x00017445, { { 0xC3, 0x54, 0x4A, 0x58, 0x00, 0x33, 0xEA, 0xF1, 0x20, 0xA8, 0x0C, 0xDE, 0x7A, 0x94, 0xAB, 0x5E } } } },
 
 	EXTRACT_END_ENTRY
@@ -1817,11 +1817,11 @@ const ExtractEntry extractProviders[] = {
 	{ kPaletteList33, kPaletteList33Provider },
 	{ kGUIStrings, kGUIStringsProvider },
 	{ kConfigStrings, kConfigStringsProvider },
-	{ kKyra1TownsSFXwdTable, kKyra1TownsSFXwdTableProvider },
-	{ kKyra1TownsSFXbtTable, kKyra1TownsSFXbtTableProvider },
-	{ kKyra1TownsCDATable, kKyra1TownsCDATableProvider },
-	{ kKyra1PC98StoryStrings, kKyra1PC98StoryStringsProvider },
-	{ kKyra1PC98IntroSfx, kKyra1PC98IntroSfxProvider },
+	{ kTOWNSSfxWDTable, kTOWNSSfxWDTableProvider },
+	{ kTOWNSSfxBTTable, kTOWNSSfxBTTableProvider },
+	{ kTOWNSCDATable, kTOWNSCDATableProvider },
+	{ kPC98StoryStrings, kPC98StoryStringsProvider },
+	{ kPC98IntroSfx, kPC98IntroSfxProvider },
 	{ kCreditsStrings, kCreditsStringsProvider },
 	{ kAmigaIntroSFXTable, kAmigaIntroSFXTableProvider },
 	{ kAmigaGameSFXTable, kAmigaGameSFXTableProvider },