KYRA: (EOB) - lots of bug fixes, mostly for EOB II

4 files changed, 18 insertions, 7 deletions

diff --git a/devtools/create_kyradat/create_kyradat.cpp b/devtools/create_kyradat/create_kyradat.cpp
index ad56fb44c2..11e868f3ed 100644
--- a/devtools/create_kyradat/create_kyradat.cpp
+++ b/devtools/create_kyradat/create_kyradat.cpp
@@ -570,7 +570,8 @@ const ExtractFilename extractFilenames[] = {
 	{ kEob2Npc1Strings, kTypeStringList, true },
 	{ kEob2Npc2Strings, kTypeStringList, true },
 	{ kEob2MonsterDustStrings, kTypeStringList, true },
-	{ kEob2DranFoolsStrings, kTypeStringList, true },
+	{ kEob2DreamSteps, kTypeRawData, false },
+	{ kEob2KheldranStrings, kTypeStringList, true },
 	{ kEob2HornStrings, kTypeStringList, true },
 	{ kEob2HornSounds, kTypeRawData, false },
 	{ kEob2WallOfForceDsX, kLolTypeRaw16, false },
@@ -1991,8 +1992,10 @@ const char *getIdString(const int id) {
 		return "kEob2Npc2Strings";
 	case kEob2MonsterDustStrings:
 		return "kEob2MonsterDustStrings";
-	case kEob2DranFoolsStrings:
-		return "kEob2DranFoolsStrings";
+	case kEob2DreamSteps:
+		return "kEob2DreamSteps";
+	case kEob2KheldranStrings:
+		return "kEob2KheldranStrings";
 	case kEob2HornStrings:
 		return "kEob2HornStrings";
 	case kEob2HornSounds:
diff --git a/devtools/create_kyradat/create_kyradat.h b/devtools/create_kyradat/create_kyradat.h
index d7bcc4d986..4ac94755e7 100644
--- a/devtools/create_kyradat/create_kyradat.h
+++ b/devtools/create_kyradat/create_kyradat.h
@@ -552,7 +552,8 @@ enum kExtractID {
 	kEob2Npc2Strings,
 	kEob2MonsterDustStrings,
 
-	kEob2DranFoolsStrings,
+	kEob2DreamSteps,
+	kEob2KheldranStrings,
 	kEob2HornStrings,
 	kEob2HornSounds,
 
diff --git a/devtools/create_kyradat/games.cpp b/devtools/create_kyradat/games.cpp
index 78baeb6b39..cc81abaa39 100644
--- a/devtools/create_kyradat/games.cpp
+++ b/devtools/create_kyradat/games.cpp
@@ -1594,7 +1594,8 @@ const int eob2FloppyNeed[] = {
 	kEob2Npc1Strings,
 	kEob2Npc2Strings,
 	kEob2MonsterDustStrings,
-	kEob2DranFoolsStrings,
+	kEob2DreamSteps,
+	kEob2KheldranStrings,
 	kEob2HornStrings,
 	kEob2HornSounds,
 	kEob2WallOfForceDsX,
diff --git a/devtools/create_kyradat/tables.cpp b/devtools/create_kyradat/tables.cpp
index 239ee6e1bd..064b3c80ae 100644
--- a/devtools/create_kyradat/tables.cpp
+++ b/devtools/create_kyradat/tables.cpp
@@ -3187,7 +3187,12 @@ const ExtractEntrySearchData kEob2MonsterDustStringsProvider[] = {
 	EXTRACT_END_ENTRY
 };
 
-const ExtractEntrySearchData kEob2DranFoolsStringsProvider[] = {
+const ExtractEntrySearchData kEob2DreamStepsProvider[] = {
+	{ UNK_LANG, kPlatformUnknown, { 0x0000000E, 0x00000114, { { 0x27, 0x32, 0xCB, 0x89, 0x27, 0xC5, 0xDD, 0x91, 0xBE, 0x97, 0x62, 0xF5, 0x76, 0xF7, 0xCD, 0x25 } } } },
+	EXTRACT_END_ENTRY
+};
+
+const ExtractEntrySearchData kEob2KheldranStringsProvider[] = {
 	{ EN_ANY, kPlatformUnknown, { 0x0000001A, 0x00000887, { { 0xA6, 0xB4, 0x45, 0x1B, 0x33, 0x54, 0x36, 0xAD, 0x1D, 0xB1, 0xDA, 0xC3, 0x12, 0x85, 0x3C, 0x58 } } } },
 	{ DE_DEU, kPlatformUnknown, { 0x00000012, 0x00000511, { { 0xEE, 0x21, 0xA8, 0x6E, 0xF7, 0xEC, 0x9A, 0x8D, 0xBA, 0x8D, 0xE3, 0x4A, 0x17, 0x15, 0xCA, 0x8C } } } },
 	EXTRACT_END_ENTRY
@@ -4198,7 +4203,8 @@ const ExtractEntry extractProviders[] = {
 	{ kEob2Npc1Strings, kEob2Npc1StringsProvider },
 	{ kEob2Npc2Strings, kEob2Npc2StringsProvider },
 	{ kEob2MonsterDustStrings, kEob2MonsterDustStringsProvider },
-	{ kEob2DranFoolsStrings, kEob2DranFoolsStringsProvider },
+	{ kEob2DreamSteps, kEob2DreamStepsProvider },
+	{ kEob2KheldranStrings, kEob2KheldranStringsProvider },
 	{ kEob2HornStrings, kEob2HornStringsProvider },
 	{ kEob2HornSounds, kEob2HornSoundsProvider },
 	{ kEob2WallOfForceDsX, kEob2WallOfForceDsXProvider },