KYRA: (EOB) - implement npc sequences and fix some bugs

5 files changed, 191 insertions, 1 deletions

diff --git a/devtools/create_kyradat/create_kyradat.cpp b/devtools/create_kyradat/create_kyradat.cpp
index 276564bc64..68fc8cc5b7 100644
--- a/devtools/create_kyradat/create_kyradat.cpp
+++ b/devtools/create_kyradat/create_kyradat.cpp
@@ -409,6 +409,22 @@ const ExtractFilename extractFilenames[] = {
 	{ kEob1MonsterDistAttSfx17, kTypeRawData, false },
 	{ kEob1TurnUndeadString, kTypeStringList, true },
 
+	{ kEob1NpcShpData, kTypeRawData, false },
+	{ kEob1NpcSubShpIndex1, kTypeRawData, false },
+	{ kEob1NpcSubShpIndex2, kTypeRawData, false },
+	{ kEob1NpcSubShpY, kTypeRawData, false },
+	{ kEob1Npc0Strings, kTypeStringList, true },
+	{ kEob1Npc11Strings, kTypeStringList, true },
+	{ kEob1Npc12Strings, kTypeStringList, true },
+	{ kEob1Npc21Strings, kTypeStringList, true },
+	{ kEob1Npc22Strings, kTypeStringList, true },
+	{ kEob1Npc31Strings, kTypeStringList, true },
+	{ kEob1Npc32Strings, kTypeStringList, true },
+	{ kEob1Npc4Strings, kTypeStringList, true },
+	{ kEob1Npc5Strings, kTypeStringList, true },
+	{ kEob1Npc6Strings, kTypeStringList, true },
+	{ kEob1Npc7Strings, kTypeStringList, true },
+
 	// EYE OF THE BEHOLDER II
 	{ kEob2MainMenuStrings, kTypeStringList, true },
 
@@ -1624,6 +1640,36 @@ const char *getIdString(const int id) {
 		return "kEob1MonsterDistAttSfx17";
 	case kEob1TurnUndeadString:
 		return "kEob1TurnUndeadString";
+	case kEob1NpcShpData:
+		return "kEob1NpcShpData";
+	case kEob1NpcSubShpIndex1:
+		return "kEob1NpcSubShpIndex1";
+	case kEob1NpcSubShpIndex2:
+		return "kEob1NpcSubShpIndex2";
+	case kEob1NpcSubShpY:
+		return "kEob1NpcSubShpY";
+	case kEob1Npc0Strings:
+		return "kEob1Npc0Strings";
+	case kEob1Npc11Strings:
+		return "kEob1Npc11Strings";
+	case kEob1Npc12Strings:
+		return "kEob1Npc12Strings";
+	case kEob1Npc21Strings:
+		return "kEob1Npc21Strings";
+	case kEob1Npc22Strings:
+		return "kEob1Npc22Strings";
+	case kEob1Npc31Strings:
+		return "kEob1Npc31Strings";
+	case kEob1Npc32Strings:
+		return "kEob1Npc32Strings";
+	case kEob1Npc4Strings:
+		return "kEob1Npc4Strings";
+	case kEob1Npc5Strings:
+		return "kEob1Npc5Strings";
+	case kEob1Npc6Strings:
+		return "kEob1Npc6Strings";
+	case kEob1Npc7Strings:
+		return "kEob1Npc7Strings";
 	case kEob2MainMenuStrings:
 		return "kEob2MainMenuStrings";
 	case kEob2IntroStrings:
diff --git a/devtools/create_kyradat/create_kyradat.h b/devtools/create_kyradat/create_kyradat.h
index a587147974..54fd91b394 100644
--- a/devtools/create_kyradat/create_kyradat.h
+++ b/devtools/create_kyradat/create_kyradat.h
@@ -410,6 +410,22 @@ enum kExtractID {
 	kEob1MonsterDistAttSfx17,
 	kEob1TurnUndeadString,
 
+	kEob1NpcShpData,
+	kEob1NpcSubShpIndex1,
+	kEob1NpcSubShpIndex2,
+	kEob1NpcSubShpY,
+	kEob1Npc0Strings,
+	kEob1Npc11Strings,
+	kEob1Npc12Strings,
+	kEob1Npc21Strings,
+	kEob1Npc22Strings,
+	kEob1Npc31Strings,
+	kEob1Npc32Strings,
+	kEob1Npc4Strings,
+	kEob1Npc5Strings,
+	kEob1Npc6Strings,
+	kEob1Npc7Strings,
+
 	kEob2MainMenuStrings,
 	kEob2IntroStrings,
 	kEob2IntroCPSFiles,
diff --git a/devtools/create_kyradat/extract.cpp b/devtools/create_kyradat/extract.cpp
index c9ece8223a..b330c469c6 100644
--- a/devtools/create_kyradat/extract.cpp
+++ b/devtools/create_kyradat/extract.cpp
@@ -1114,7 +1114,7 @@ bool extractEobNpcData(PAKFile &out, const ExtractInformation *info, const byte
 			WRITE_BE_UINT32(dst, READ_LE_UINT32(src));
 			src += 4; dst += 4;
 			// skipping lots of zero space
-			src += 60;
+			src += 64;
 			WRITE_BE_UINT32(dst, READ_LE_UINT32(src));
 			src += 4; dst += 4;
 			for (int ii = 0; ii < 27; ii++) {
diff --git a/devtools/create_kyradat/games.cpp b/devtools/create_kyradat/games.cpp
index 4ab12028c2..5f710507f4 100644
--- a/devtools/create_kyradat/games.cpp
+++ b/devtools/create_kyradat/games.cpp
@@ -1065,6 +1065,22 @@ const int eob1FloppyNeed[] = {
 	kEob1MonsterDistAttSfx17,
 	kEob1TurnUndeadString,
 
+	kEob1NpcShpData,
+	kEob1NpcSubShpIndex1,
+	kEob1NpcSubShpIndex2,
+	kEob1NpcSubShpY,
+	kEob1Npc0Strings,
+	kEob1Npc11Strings,
+	kEob1Npc12Strings,
+	kEob1Npc21Strings,
+	kEob1Npc22Strings,
+	kEob1Npc31Strings,
+	kEob1Npc32Strings,
+	kEob1Npc4Strings,
+	kEob1Npc5Strings,
+	kEob1Npc6Strings,
+	kEob1Npc7Strings,
+
 	kEobBasePryDoorStrings,
 	kEobBaseWarningStrings,
 
diff --git a/devtools/create_kyradat/tables.cpp b/devtools/create_kyradat/tables.cpp
index 46239c2bee..663652d4be 100644
--- a/devtools/create_kyradat/tables.cpp
+++ b/devtools/create_kyradat/tables.cpp
@@ -2368,6 +2368,102 @@ const ExtractEntrySearchData kEob1TurnUndeadStringProvider[] = {
 	EXTRACT_END_ENTRY
 };
 
+const ExtractEntrySearchData kEob1NpcShpDataProvider[] = {
+	{ UNK_LANG, kPlatformPC, { 0x0000004C, 0x00000A42, { { 0x70, 0x21, 0x85, 0x8C, 0xD4, 0x04, 0xAA, 0x20, 0x1D, 0x0E, 0x9D, 0xB7, 0x74, 0x58, 0xCC, 0x0C } } } },
+	EXTRACT_END_ENTRY
+};
+
+const ExtractEntrySearchData kEob1NpcSubShpIndex1Provider[] = {
+	{ UNK_LANG, kPlatformPC, { 0x00000006, 0x00000035, { { 0x9A, 0x83, 0xF9, 0xA4, 0x27, 0xBA, 0xFC, 0xD2, 0xDE, 0x03, 0x65, 0xF2, 0xFA, 0x37, 0xDA, 0xF1 } } } },
+	EXTRACT_END_ENTRY
+};
+
+const ExtractEntrySearchData kEob1NpcSubShpIndex2Provider[] = {
+	{ UNK_LANG, kPlatformPC, { 0x00000006, 0x00000051, { { 0x7E, 0xAC, 0x0E, 0x54, 0x59, 0x5D, 0xF6, 0x53, 0x03, 0x22, 0x1D, 0xC7, 0xFC, 0x16, 0xC8, 0x88 } } } },
+	EXTRACT_END_ENTRY
+};
+
+const ExtractEntrySearchData kEob1NpcSubShpYProvider[] = {
+	{ UNK_LANG, kPlatformPC, { 0x00000006, 0x00000143, { { 0xC1, 0xED, 0x93, 0x5E, 0x84, 0xCE, 0x48, 0xCF, 0x4C, 0xF3, 0x9C, 0x93, 0xBF, 0xFE, 0xB8, 0x6F } } } },
+	EXTRACT_END_ENTRY
+};
+
+const ExtractEntrySearchData kEob1Npc0StringsProvider[] = {
+	{ EN_ANY, kPlatformUnknown, { 0x00000044, 0x000016E2, { { 0x7C, 0x28, 0x72, 0xC9, 0x57, 0xF5, 0xAB, 0x02, 0xD1, 0x42, 0xE8, 0xA3, 0xF9, 0x33, 0x70, 0xEE } } } },
+	{ DE_DEU, kPlatformUnknown, { 0x00000050, 0x00001B13, { { 0x69, 0x05, 0xEB, 0xB6, 0x86, 0x81, 0xAC, 0x09, 0x53, 0x35, 0x4D, 0x55, 0xF3, 0x13, 0x6F, 0xC0 } } } },
+
+	EXTRACT_END_ENTRY
+};
+
+const ExtractEntrySearchData kEob1Npc11StringsProvider[] = {
+	{ EN_ANY, kPlatformUnknown, { 0x0000001B, 0x00000928, { { 0x86, 0x08, 0x95, 0x6B, 0xBF, 0x12, 0x2D, 0xF9, 0x62, 0x25, 0xD9, 0xAE, 0x25, 0x10, 0xDF, 0xDC } } } },
+	{ DE_DEU, kPlatformUnknown, { 0x0000001A, 0x000008DB, { { 0xBD, 0xBB, 0x48, 0x8E, 0x04, 0x7D, 0xE4, 0x78, 0xBB, 0x59, 0x6E, 0x86, 0xE1, 0x06, 0x27, 0x50 } } } },
+
+	EXTRACT_END_ENTRY
+};
+
+const ExtractEntrySearchData kEob1Npc12StringsProvider[] = {
+	{ EN_ANY, kPlatformUnknown, { 0x00000016, 0x0000079C, { { 0x22, 0x57, 0x3A, 0x9C, 0x7C, 0xDB, 0x55, 0xD0, 0x9C, 0x84, 0x28, 0xA6, 0x9D, 0x40, 0x38, 0x6E } } } },
+	{ DE_DEU, kPlatformUnknown, { 0x00000014, 0x000006ED, { { 0x88, 0x1C, 0x09, 0x61, 0x5D, 0x9D, 0xDE, 0x8A, 0x54, 0x1C, 0x40, 0xCF, 0x28, 0x2B, 0x52, 0x9D } } } },
+
+	EXTRACT_END_ENTRY
+};
+
+const ExtractEntrySearchData kEob1Npc21StringsProvider[] = {
+	{ EN_ANY, kPlatformUnknown, { 0x00000014, 0x000006FD, { { 0x55, 0x77, 0x2F, 0xB0, 0xB3, 0x2D, 0x81, 0x29, 0xDE, 0x71, 0x83, 0x41, 0x06, 0x5B, 0x72, 0x21 } } } },
+	{ DE_DEU, kPlatformUnknown, { 0x00000015, 0x00000748, { { 0x3E, 0x15, 0x27, 0xFD, 0x76, 0xFB, 0x14, 0x8C, 0xF6, 0x14, 0x3E, 0x20, 0x0A, 0x04, 0xF5, 0x32 } } } },
+
+	EXTRACT_END_ENTRY
+};
+
+const ExtractEntrySearchData kEob1Npc22StringsProvider[] = {
+	{ EN_ANY, kPlatformUnknown, { 0x0000000F, 0x000004D4, { { 0xE5, 0x97, 0x06, 0x45, 0x6A, 0xAC, 0x96, 0x6D, 0x0A, 0xC9, 0xDF, 0x8F, 0x96, 0x2D, 0x01, 0x5D } } } },
+	{ DE_DEU, kPlatformUnknown, { 0x0000000D, 0x00000439, { { 0x87, 0xCB, 0x17, 0xD2, 0xC8, 0x7F, 0x34, 0xDA, 0x82, 0x30, 0xB2, 0x68, 0xB0, 0x10, 0xD9, 0x52 } } } },
+
+	EXTRACT_END_ENTRY
+};
+
+const ExtractEntrySearchData kEob1Npc31StringsProvider[] = {
+	{ EN_ANY, kPlatformUnknown, { 0x00000011, 0x00000597, { { 0x5C, 0xEB, 0x0A, 0xE6, 0xB1, 0x37, 0x0E, 0x8F, 0x14, 0xB4, 0x68, 0x86, 0xE5, 0xD2, 0xDE, 0xC7 } } } },
+	{ DE_DEU, kPlatformUnknown, { 0x00000012, 0x00000603, { { 0x8E, 0x68, 0x55, 0xCD, 0x29, 0x1E, 0x3C, 0x06, 0x7B, 0x97, 0xE1, 0x07, 0x49, 0x09, 0xF0, 0x57 } } } },
+
+	EXTRACT_END_ENTRY
+};
+
+const ExtractEntrySearchData kEob1Npc32StringsProvider[] = {
+	{ EN_ANY, kPlatformUnknown, { 0x00000020, 0x00000AE4, { { 0xED, 0x09, 0x04, 0xEC, 0xE3, 0x43, 0xDA, 0xEE, 0x5D, 0x78, 0x32, 0x63, 0x68, 0xFC, 0x4F, 0x9E } } } },
+	{ DE_DEU, kPlatformUnknown, { 0x00000020, 0x00000B13, { { 0x87, 0x40, 0x88, 0xA5, 0xE2, 0x6F, 0x83, 0xBC, 0x99, 0x2B, 0xD3, 0xF5, 0x8D, 0x6B, 0x6E, 0x7D } } } },
+
+	EXTRACT_END_ENTRY
+};
+
+const ExtractEntrySearchData kEob1Npc4StringsProvider[] = {
+	{ EN_ANY, kPlatformUnknown, { 0x0000000D, 0x0000043C, { { 0x2C, 0xE7, 0xE5, 0xAA, 0xF3, 0x50, 0xA8, 0x6D, 0xC2, 0xC6, 0x88, 0xFE, 0x12, 0x96, 0xFE, 0x54 } } } },
+	{ DE_DEU, kPlatformUnknown, { 0x00000014, 0x00000720, { { 0xF8, 0x58, 0x9A, 0xDB, 0xE5, 0x3F, 0x67, 0x53, 0x1F, 0x27, 0x2E, 0x8D, 0x6E, 0xAD, 0x45, 0xF5 } } } },
+
+	EXTRACT_END_ENTRY
+};
+
+const ExtractEntrySearchData kEob1Npc5StringsProvider[] = {
+	{ EN_ANY, kPlatformUnknown, { 0x00000021, 0x00000ABC, { { 0xF1, 0xB5, 0x9E, 0x51, 0x9E, 0xF8, 0x84, 0x95, 0x55, 0x55, 0xE7, 0xDF, 0x36, 0xE1, 0x78, 0x9A } } } },
+	{ DE_DEU, kPlatformUnknown, { 0x0000001D, 0x00000A8C, { { 0x4A, 0xAE, 0x5B, 0x3B, 0xAD, 0x18, 0x91, 0x3F, 0xC9, 0x5A, 0x82, 0x5D, 0xA7, 0x06, 0x1A, 0xAE } } } },
+
+	EXTRACT_END_ENTRY
+};
+
+const ExtractEntrySearchData kEob1Npc6StringsProvider[] = {
+	{ EN_ANY, kPlatformUnknown, { 0x00000011, 0x00000612, { { 0x1B, 0xE2, 0x23, 0xD9, 0x00, 0x5C, 0xB9, 0x54, 0xCE, 0xA7, 0x6A, 0x51, 0xF6, 0xBB, 0x8A, 0xC9 } } } },
+	{ DE_DEU, kPlatformUnknown, { 0x00000012, 0x00000647, { { 0x6C, 0x3F, 0xE2, 0xD0, 0xB0, 0x75, 0x2D, 0x73, 0xEE, 0x6F, 0x17, 0x74, 0xAA, 0x7D, 0xA2, 0x21 } } } },
+
+	EXTRACT_END_ENTRY
+};
+
+const ExtractEntrySearchData kEob1Npc7StringsProvider[] = {
+	{ EN_ANY, kPlatformUnknown, { 0x00000018, 0x00000777, { { 0x60, 0xB4, 0x17, 0x72, 0x89, 0x87, 0x47, 0xE3, 0xD9, 0xC3, 0x59, 0x16, 0xFD, 0x03, 0x31, 0xD4 } } } },
+	{ DE_DEU, kPlatformUnknown, { 0x00000016, 0x000007B6, { { 0xAE, 0xB6, 0x3C, 0x14, 0x2B, 0x34, 0xB8, 0x7C, 0xCF, 0x87, 0xDA, 0x70, 0xBF, 0x0D, 0xAB, 0xE2 } } } },
+
+	EXTRACT_END_ENTRY
+};
 
 const ExtractEntrySearchData kEob2MainMenuStringsProvider[] = {
 	{ EN_ANY, kPlatformUnknown, { 0x0000005F, 0x000017BE, { { 0x77, 0x8A, 0x50, 0x9F, 0x42, 0xD8, 0x00, 0x05, 0x60, 0x2A, 0x80, 0x25, 0x00, 0xDC, 0x7C, 0x92 } } } },
@@ -3725,6 +3821,22 @@ const ExtractEntry extractProviders[] = {
 	{ kEob1MonsterDistAttSfx17, kEob1MonsterDistAttSfx17Provider },
 	{ kEob1TurnUndeadString, kEob1TurnUndeadStringProvider },
 
+	{ kEob1NpcShpData, kEob1NpcShpDataProvider },
+	{ kEob1NpcSubShpIndex1, kEob1NpcSubShpIndex1Provider },
+	{ kEob1NpcSubShpIndex2, kEob1NpcSubShpIndex2Provider },
+	{ kEob1NpcSubShpY, kEob1NpcSubShpYProvider },
+	{ kEob1Npc0Strings, kEob1Npc0StringsProvider },
+	{ kEob1Npc11Strings, kEob1Npc11StringsProvider },
+	{ kEob1Npc12Strings, kEob1Npc12StringsProvider },
+	{ kEob1Npc21Strings, kEob1Npc21StringsProvider },
+	{ kEob1Npc22Strings, kEob1Npc22StringsProvider },
+	{ kEob1Npc31Strings, kEob1Npc31StringsProvider },
+	{ kEob1Npc32Strings, kEob1Npc32StringsProvider },
+	{ kEob1Npc4Strings, kEob1Npc4StringsProvider },
+	{ kEob1Npc5Strings, kEob1Npc5StringsProvider },
+	{ kEob1Npc6Strings, kEob1Npc6StringsProvider },
+	{ kEob1Npc7Strings, kEob1Npc7StringsProvider },
+
 	{ kEob2MainMenuStrings, kEob2MainMenuStringsProvider },
 	{ kEob2IntroStrings, kEob2IntroStringsProvider },
 	{ kEob2IntroCPSFiles, kEob2IntroCPSFilesProvider },