KYRA: (EOB) - implement some gui functionality, some bug fixes, etc.

1 files changed, 167 insertions, 13 deletions

diff --git a/devtools/create_kyradat/tables.cpp b/devtools/create_kyradat/tables.cpp
index 7457f4fd45..c45b3d4c26 100644
--- a/devtools/create_kyradat/tables.cpp
+++ b/devtools/create_kyradat/tables.cpp
@@ -137,7 +137,7 @@ const ExtractEntrySearchData k1OutroReunionSeqProvider[] = {
 	{ UNK_LANG, kPlatformPC, { 0x00000547, 0x0000781C, { { 0xCF, 0xD6, 0x1D, 0x3D, 0x14, 0x40, 0x88, 0x35, 0x36, 0x4F, 0x0B, 0x1F, 0x9A, 0x1C, 0x3D, 0xAC } } } }, // floppy
 	{ UNK_LANG, kPlatformPC, { 0x00000547, 0x000077E0, { { 0x80, 0xC4, 0xFC, 0xD5, 0xEB, 0xAA, 0xA5, 0x87, 0x58, 0x5E, 0xAA, 0xE7, 0x01, 0x8F, 0x59, 0x3F } } } }, // floppy
 	{ UNK_LANG, kPlatformPC, { 0x000005E5, 0x00008918, { { 0x6A, 0x33, 0x8C, 0xB0, 0x16, 0x57, 0x2D, 0xEB, 0xB2, 0xE1, 0x64, 0x80, 0x98, 0x99, 0x98, 0x19 } } } }, // CD
-	
+
 	{ UNK_LANG, kPlatformAmiga, { 0x0000054A, 0x0000785F, { { 0x55, 0xEA, 0xB8, 0x7F, 0x3A, 0x86, 0xCD, 0xA6, 0xBC, 0xA7, 0x9A, 0x39, 0xED, 0xF5, 0x30, 0x0A } } } },
 
 	{ UNK_LANG, kPlatformUnknown, { 0x00000547, 0x00007876, { { 0x7A, 0xC7, 0x80, 0x34, 0x7A, 0x1B, 0xAB, 0xF8, 0xA7, 0x2F, 0x63, 0x3C, 0xDA, 0x89, 0x3F, 0x82 } } } }, // some floppy DOS + FM-TOWNS
@@ -1452,19 +1452,124 @@ const ExtractEntrySearchData kEobBaseWarningStringsProvider[] = {
 	EXTRACT_END_ENTRY
 };
 
-const ExtractEntrySearchData kEobBaseItemSuffixStringsProvider[] = {
-	{ EN_ANY, kPlatformUnknown, { 0x000000BF, 0x00004241, { { 0x5B, 0x5E, 0xD4, 0x55, 0x86, 0x18, 0x9B, 0x99, 0x5D, 0x39, 0x5A, 0x3F, 0xF7, 0xF0, 0x3B, 0x42 } } } },	// EOB 1
-	{ EN_ANY, kPlatformUnknown, { 0x000000CC, 0x00004708, { { 0xF9, 0x04, 0x46, 0x9D, 0xD3, 0xF4, 0xFA, 0xE2, 0x12, 0x79, 0xBB, 0x00, 0x20, 0xE7, 0xB7, 0x35 } } } },	// EOB 2
-	{ DE_DEU, kPlatformUnknown, { 0x000000CA, 0x000047A4, { { 0x89, 0x01, 0x88, 0x85, 0x19, 0x6A, 0xEE, 0xC9, 0x62, 0x65, 0x7E, 0xB7, 0xE6, 0x27, 0xB0, 0x53 } } } },	// EOB 1
-	{ DE_DEU, kPlatformUnknown, { 0x00000109, 0x00005CAF, { { 0xB0, 0x39, 0xF9, 0xAE, 0x04, 0x3A, 0x96, 0xED, 0x55, 0x0E, 0xB4, 0x0F, 0x53, 0x62, 0x6D, 0xD6 } } } },	// EOB 2
+const ExtractEntrySearchData kEobBaseItemSuffixStringsRingsProvider[] = {
+	{ EN_ANY, kPlatformUnknown, { 0x0000002B, 0x00000F7B, { { 0x8A, 0x27, 0x87, 0x81, 0x5F, 0x74, 0x27, 0xA9, 0x5E, 0x1B, 0xEE, 0xC0, 0xF7, 0x22, 0x8F, 0x57 } } } },
+	{ DE_DEU, kPlatformUnknown, { 0x00000022, 0x00000C02, { { 0x7D, 0x5F, 0x40, 0xEA, 0xAD, 0xDD, 0x1B, 0xA0, 0xA6, 0xE0, 0x57, 0x7D, 0x0D, 0x60, 0xF4, 0x2C } } } },	// EOB 1
+	{ DE_DEU, kPlatformUnknown, { 0x0000002E, 0x00000FF2, { { 0xE1, 0x50, 0xB7, 0xE2, 0xEF, 0xAD, 0x5B, 0x6D, 0x27, 0x35, 0x9C, 0xE7, 0x2D, 0xB2, 0x2E, 0xD0 } } } },	// EOB 2
+	EXTRACT_END_ENTRY
+};
+
+const ExtractEntrySearchData kEobBaseItemSuffixStringsPotionsProvider[] = {
+	{ EN_ANY, kPlatformUnknown, { 0x00000054, 0x00001DDB, { { 0xB6, 0x78, 0xD9, 0x09, 0x1D, 0x09, 0x63, 0xF8, 0x96, 0x74, 0xF0, 0x75, 0x23, 0xF5, 0xD4, 0xC4 } } } },
+	{ DE_DEU, kPlatformUnknown, { 0x00000064, 0x000024ED, { { 0x10, 0x5A, 0xB8, 0xCA, 0x0F, 0x0D, 0x44, 0x19, 0x9D, 0x3D, 0x76, 0x54, 0xA1, 0x69, 0x97, 0x8B } } } },	// EOB 1
+	{ DE_DEU, kPlatformUnknown, { 0x0000006F, 0x00002792, { { 0x1A, 0x71, 0x2B, 0xCC, 0xCA, 0xDA, 0xF6, 0xED, 0x5E, 0xF0, 0x24, 0x20, 0xD7, 0x2D, 0x18, 0x49 } } } },	// EOB 2
+	EXTRACT_END_ENTRY
+};
+
+const ExtractEntrySearchData kEobBaseItemSuffixStringsWandsProvider[] = {
+	{ EN_ANY, kPlatformUnknown, { 0x0000003C, 0x000014EB, { { 0xB5, 0x38, 0x35, 0x57, 0xF2, 0xF8, 0x0E, 0xBA, 0x75, 0x03, 0x1C, 0xCD, 0x46, 0x7D, 0x03, 0x83 } } } },	// EOB 1
+	{ EN_ANY, kPlatformUnknown, { 0x0000004A, 0x000019B2, { { 0x44, 0x10, 0xE4, 0xAF, 0xAB, 0x19, 0x25, 0x87, 0x2B, 0x15, 0x1C, 0x4C, 0x03, 0x50, 0x41, 0xC4 } } } },	// EOB 2
+	{ DE_DEU, kPlatformUnknown, { 0x00000040, 0x000016B5, { { 0xEC, 0xF4, 0x71, 0xC1, 0x69, 0x5C, 0xF9, 0xC1, 0xED, 0xC1, 0xED, 0x0C, 0x25, 0x3E, 0x13, 0xB1 } } } },	// EOB 1
+	{ DE_DEU, kPlatformUnknown, { 0x00000069, 0x0000252B, { { 0x12, 0x06, 0xEA, 0x2F, 0xAF, 0x47, 0x55, 0x52, 0xB6, 0xD9, 0x11, 0xA4, 0x4F, 0x30, 0xCE, 0x9D } } } },	// EOB 2
+	EXTRACT_END_ENTRY
+};
+
+const ExtractEntrySearchData kEobBaseRipItemStringsProvider[] = {
+	{ EN_ANY, kPlatformUnknown, { 0x00000025, 0x00000AEA, { { 0x7A, 0x2D, 0x03, 0xA5, 0x94, 0xD1, 0xA2, 0x2C, 0x41, 0x1F, 0xEB, 0x5C, 0xFB, 0xB2, 0xC6, 0x9E } } } },
+	{ DE_DEU, kPlatformUnknown, { 0x00000024, 0x00000B1B, { { 0xD0, 0x26, 0x19, 0x0B, 0xA5, 0x8A, 0x38, 0x73, 0x14, 0x25, 0x40, 0x5D, 0x24, 0xB8, 0x4E, 0xC5 } } } },	// EOB 1
+	{ DE_DEU, kPlatformUnknown, { 0x0000002E, 0x00000D38, { { 0xCE, 0xC5, 0x00, 0x63, 0xBB, 0xF0, 0xC4, 0x0D, 0x50, 0x2B, 0x82, 0x1C, 0xC0, 0xCD, 0xF1, 0xAF } } } },	// EOB 2
+	EXTRACT_END_ENTRY
+};
+
+const ExtractEntrySearchData kEobBaseCursedStringProvider[] = {
+	{ EN_ANY, kPlatformUnknown, { 0x0000000D, 0x000003C7, { { 0x7F, 0x6B, 0x6A, 0xFE, 0x63, 0xF4, 0x17, 0xAF, 0xFD, 0x00, 0x31, 0x4A, 0x20, 0x9E, 0x8C, 0xEB } } } },	// EOB 1
+	{ EN_ANY, kPlatformUnknown, { 0x0000000D, 0x000003C7, { { 0x59, 0xD8, 0x84, 0x25, 0xE0, 0x06, 0x51, 0xA4, 0x70, 0xC5, 0x78, 0x22, 0xF0, 0x2D, 0xA0, 0x43 } } } },	// EOB 2
+	{ DE_DEU, kPlatformUnknown, { 0x00000010, 0x00000514, { { 0x97, 0x41, 0xA6, 0xAE, 0xF8, 0xA8, 0x3E, 0x85, 0xA8, 0x16, 0x01, 0x15, 0x0E, 0x46, 0x13, 0x45 } } } },	// EOB 1
+	{ DE_DEU, kPlatformUnknown, { 0x00000013, 0x000005A5, { { 0xEC, 0xD3, 0xA5, 0xD2, 0xAD, 0x7C, 0x5E, 0x0F, 0x42, 0xBC, 0x6E, 0xDE, 0x7E, 0x36, 0x0B, 0x43 } } } },	// EOB 2
+	EXTRACT_END_ENTRY
+};
+
+const ExtractEntrySearchData kEobBaseEnchantedStringProvider[] = {
+	{ UNK_LANG, kPlatformUnknown, { 0x00000007, 0x0000016C, { { 0x98, 0x62, 0xD3, 0xA3, 0x11, 0xAE, 0x0A, 0xBA, 0x8F, 0xE8, 0x30, 0x0B, 0xDC, 0x12, 0x90, 0x3B } } } },	// EOB 1
+	{ UNK_LANG, kPlatformUnknown, { 0x00000007, 0x0000016C, { { 0x01, 0x91, 0xBD, 0x89, 0xAE, 0x0E, 0x71, 0xEE, 0xBE, 0x31, 0xD9, 0x55, 0x21, 0x61, 0x19, 0xAE } } } },	// EOB 2
+	EXTRACT_END_ENTRY
+};
+
+const ExtractEntrySearchData kEobBaseMagicObjectStringsProvider[] = {
+	{ EN_ANY, kPlatformUnknown, { 0x0000002B, 0x00000E7D, { { 0x7E, 0x8F, 0x17, 0xEB, 0xE5, 0x5D, 0xEB, 0x9A, 0x84, 0xFF, 0x86, 0x6A, 0x01, 0x3E, 0x04, 0x84 } } } },
+	{ DE_DEU, kPlatformUnknown, { 0x0000003A, 0x000014E4, { { 0x3D, 0x34, 0x3C, 0xCA, 0xDC, 0xD1, 0xCF, 0x15, 0x69, 0x57, 0xC3, 0xB1, 0x58, 0xDF, 0xE9, 0x9D } } } },	// EOB 1
+	{ DE_DEU, kPlatformUnknown, { 0x0000002A, 0x00000EE4, { { 0x9C, 0x38, 0x4B, 0x9B, 0x67, 0x30, 0x4E, 0x88, 0xA9, 0xA2, 0xF8, 0x78, 0x8E, 0xC7, 0xC3, 0x86 } } } },	// EOB 2
+	EXTRACT_END_ENTRY
+};
+
+const ExtractEntrySearchData kEobBaseMagicObject5StringProvider[] = {
+	{ EN_ANY, kPlatformUnknown, { 0x00000006, 0x000001FE, { { 0x74, 0x8D, 0xB9, 0x76, 0xD2, 0x2F, 0x60, 0xD2, 0x36, 0x45, 0x98, 0x4C, 0x0A, 0xE5, 0xE5, 0x0D } } } },
+	{ DE_DEU, kPlatformUnknown, { 0x00000006, 0x00000204, { { 0xE4, 0xC1, 0xAD, 0x71, 0x87, 0x80, 0x9D, 0x97, 0x91, 0x80, 0x3F, 0x71, 0xD3, 0x62, 0x06, 0xD5 } } } }, // EOB 1
+	{ DE_DEU, kPlatformUnknown, { 0x00000007, 0x0000027A, { { 0x44, 0x47, 0x79, 0x46, 0x9B, 0xE5, 0xBD, 0x3C, 0xE8, 0x8D, 0xC6, 0xC5, 0x4E, 0x88, 0x13, 0xC0 } } } }, // EOB 2
+	EXTRACT_END_ENTRY
+};
+
+const ExtractEntrySearchData kEobBasePatternSuffixProvider[] = {
+	{ EN_ANY, kPlatformUnknown, { 0x00000009, 0x00000245, { { 0x67, 0x3F, 0x33, 0xA5, 0x3B, 0x5D, 0x2C, 0x9E, 0x15, 0x82, 0x04, 0xE2, 0xD7, 0x34, 0x42, 0x24 } } } },
+	{ DE_DEU, kPlatformUnknown, { 0x00000006, 0x0000015D, { { 0x33, 0xD6, 0x91, 0x2D, 0xED, 0xE1, 0x43, 0x42, 0x23, 0xB9, 0xE9, 0x3D, 0x48, 0x82, 0x92, 0x1E } } } },	// EOB 1
+	{ DE_DEU, kPlatformUnknown, { 0x00000008, 0x00000219, { { 0xCD, 0xDC, 0x7F, 0x8B, 0xBE, 0xD6, 0x05, 0x37, 0xDA, 0xDC, 0x11, 0xC3, 0x1E, 0x7A, 0xE7, 0x13 } } } },	// EOB 2
+	EXTRACT_END_ENTRY
+};
+
+const ExtractEntrySearchData kEobBasePatternGrFix1Provider[] = {
+	{ EN_ANY, kPlatformUnknown, { 0x00000009, 0x00000245, { { 0x67, 0x3F, 0x33, 0xA5, 0x3B, 0x5D, 0x2C, 0x9E, 0x15, 0x82, 0x04, 0xE2, 0xD7, 0x34, 0x42, 0x24 } } } },
+	{ DE_DEU, kPlatformUnknown, { 0x00000006, 0x0000015D, { { 0x33, 0xD6, 0x91, 0x2D, 0xED, 0xE1, 0x43, 0x42, 0x23, 0xB9, 0xE9, 0x3D, 0x48, 0x82, 0x92, 0x1E } } } },	// EOB 1
+	{ DE_DEU, kPlatformUnknown, { 0x00000007, 0x0000018A, { { 0x02, 0x5C, 0x86, 0xD9, 0x62, 0x0C, 0x71, 0xB3, 0x77, 0x9C, 0x7B, 0xBC, 0x4D, 0x5B, 0xDB, 0xE7 } } } },	// EOB 2
+	EXTRACT_END_ENTRY
+};
+
+const ExtractEntrySearchData kEobBasePatternGrFix2Provider[] = {
+	{ EN_ANY, kPlatformUnknown, { 0x00000009, 0x00000245, { { 0x67, 0x3F, 0x33, 0xA5, 0x3B, 0x5D, 0x2C, 0x9E, 0x15, 0x82, 0x04, 0xE2, 0xD7, 0x34, 0x42, 0x24 } } } },
+	{ DE_DEU, kPlatformUnknown, { 0x00000006, 0x0000015D, { { 0x33, 0xD6, 0x91, 0x2D, 0xED, 0xE1, 0x43, 0x42, 0x23, 0xB9, 0xE9, 0x3D, 0x48, 0x82, 0x92, 0x1E } } } },	// EOB 1
+	{ DE_DEU, kPlatformUnknown, { 0x00000006, 0x00000150, { { 0x48, 0xBE, 0xED, 0xD3, 0xA5, 0x2E, 0xCD, 0xE0, 0x34, 0xBA, 0xA6, 0x8D, 0x7D, 0x00, 0xA2, 0xFF } } } },	// EOB 2
 	EXTRACT_END_ENTRY
 };
 
-const ExtractEntrySearchData kEobBaseItemExtraStringsProvider[] = {
-	{ EN_ANY, kPlatformUnknown, { 0x00000161, 0x000072D6, { { 0x15, 0xD3, 0x0A, 0x45, 0xCD, 0xD7, 0xC5, 0x93, 0x17, 0x3E, 0x1A, 0x0D, 0xAD, 0x50, 0xC2, 0x5E } } } },	// EOB 1
-	{ EN_ANY, kPlatformUnknown, { 0x00000221, 0x0000B466, { { 0x6E, 0x24, 0x2C, 0xCE, 0x32, 0xC4, 0xF4, 0x4F, 0xC1, 0x79, 0x9A, 0x1C, 0x61, 0xB2, 0x08, 0x4F } } } },	// EOB 2
-	{ DE_DEU, kPlatformUnknown, { 0x00000191, 0x000087C3, { { 0x3B, 0x27, 0x8D, 0xFF, 0x88, 0x2D, 0x0D, 0x92, 0x47, 0xC5, 0x50, 0xB5, 0x36, 0x01, 0xCC, 0x58 } } } },	// EOB 1
-	{ DE_DEU, kPlatformUnknown, { 0x00000281, 0x0000D8BF, { { 0x7D, 0xB7, 0x06, 0x9D, 0x1E, 0x1D, 0x87, 0xAF, 0xD4, 0x40, 0xAF, 0xF9, 0xCD, 0xE3, 0x1E, 0x02 } } } },	// EOB 2
+const ExtractEntrySearchData kEobBaseValidateArmorStringProvider[] = {
+	{ EN_ANY, kPlatformUnknown, { 0x00000023, 0x00000B78, { { 0xC2, 0x33, 0x6B, 0xB9, 0xE1, 0x5E, 0x88, 0x5E, 0x22, 0xF2, 0x97, 0x83, 0xF8, 0xC8, 0x8C, 0xAB } } } },
+	{ DE_DEU, kPlatformUnknown, { 0x00000026, 0x00000D19, { { 0xAD, 0x19, 0xE2, 0xDE, 0x04, 0xF9, 0x8F, 0x92, 0xAC, 0x1A, 0x05, 0xEA, 0x7B, 0xB5, 0x9F, 0x09 } } } },	// EOB 1
+	{ DE_DEU, kPlatformUnknown, { 0x00000029, 0x00000E7A, { { 0xEC, 0xA8, 0x2E, 0x8D, 0xB1, 0xC8, 0x0F, 0xCD, 0x24, 0xBD, 0x4B, 0x39, 0x16, 0xC9, 0x53, 0x08 } } } },	// EOB 2
+	EXTRACT_END_ENTRY
+};
+
+const ExtractEntrySearchData kEobBaseValidateCursedStringProvider[] = {
+	{ EN_ANY, kPlatformUnknown, { 0x0000002E, 0x00000F35, { { 0xE7, 0x0E, 0xA1, 0xCE, 0xCC, 0x13, 0xBC, 0x4B, 0x2B, 0x19, 0xEB, 0xA4, 0x05, 0xCF, 0xCF, 0x65 } } } },
+	{ DE_DEU, kPlatformUnknown, { 0x00000037, 0x000012D8, { { 0x3C, 0x7F, 0x16, 0xCE, 0x40, 0x58, 0xF1, 0x3A, 0xAB, 0x4C, 0x37, 0x82, 0x32, 0x88, 0xA4, 0x2D } } } },
+	EXTRACT_END_ENTRY
+};
+
+const ExtractEntrySearchData kEobBaseValidateNoDropStringProvider[] = {
+	{ EN_ANY, kPlatformUnknown, { 0x0000001F, 0x00000A8F, { { 0x61, 0x99, 0x3E, 0x36, 0x49, 0x19, 0xB4, 0xE4, 0xBC, 0xFA, 0xB5, 0x71, 0x0E, 0xD6, 0x15, 0x3C } } } },	// EOB 1
+	{ EN_ANY, kPlatformUnknown, { 0x00000020, 0x00000AB6, { { 0xAA, 0x0E, 0x64, 0xD1, 0xA2, 0xA6, 0x62, 0x76, 0x51, 0xDF, 0x9E, 0x76, 0x85, 0x42, 0xE1, 0x4A } } } },	// EOB 2
+	{ DE_DEU, kPlatformUnknown, { 0x00000024, 0x00000C31, { { 0x10, 0xD9, 0x55, 0x69, 0xFE, 0x0A, 0x8C, 0xE5, 0xF7, 0x05, 0x5F, 0x09, 0x3B, 0xC9, 0x93, 0x38 } } } },	// EOB 1
+	{ DE_DEU, kPlatformUnknown, { 0x00000027, 0x00000D9F, { { 0xA5, 0xF0, 0x8E, 0x78, 0x0A, 0x37, 0x31, 0xDC, 0xE0, 0xDF, 0xE5, 0xCB, 0x86, 0xDC, 0x21, 0x73 } } } },	// EOB 2
+	EXTRACT_END_ENTRY
+};
+
+const ExtractEntrySearchData kEobBasePotionStringsProvider[] = {
+	{ EN_ANY, kPlatformUnknown, { 0x00000017, 0x0000070E, { { 0xD9, 0xCB, 0x26, 0xB6, 0x6F, 0x17, 0x12, 0xB7, 0xB0, 0x95, 0x1B, 0x2A, 0xD8, 0x83, 0x0D, 0x2B } } } },
+	{ DE_DEU, kPlatformUnknown, { 0x0000001E, 0x000009BD, { { 0xCA, 0xD0, 0x29, 0xB0, 0x7A, 0x2B, 0x0B, 0x69, 0xCA, 0xA4, 0xCA, 0x97, 0xCF, 0x8B, 0x03, 0xAD } } } },	// EOB 1
+	{ DE_DEU, kPlatformUnknown, { 0x0000001D, 0x00000964, { { 0x5D, 0xE2, 0xA5, 0x0D, 0x72, 0xE9, 0x8F, 0xC9, 0xFA, 0xF3, 0x41, 0x5A, 0x3F, 0x33, 0xAA, 0x15 } } } },	// EOB 2
+	EXTRACT_END_ENTRY
+};
+
+const ExtractEntrySearchData kEobBaseWandStringProvider[] = {
+	{ EN_ANY, kPlatformUnknown, { 0x00000035, 0x000011EC, { { 0x7C, 0x3D, 0xF1, 0x28, 0x0C, 0x23, 0xD3, 0x18, 0xEE, 0xAD, 0xA7, 0xF4, 0x58, 0xD7, 0x1C, 0x8E } } } },	// EOB 1
+	{ EN_ANY, kPlatformUnknown, { 0x00000029, 0x00000E47, { { 0xED, 0x2E, 0xD4, 0x4D, 0xDB, 0x90, 0x3F, 0xD0, 0xFB, 0x95, 0xB8, 0xF2, 0xCF, 0x06, 0x08, 0xAF } } } },	// EOB 2
+	{ DE_DEU, kPlatformUnknown, { 0x00000046, 0x0000186E, { { 0x54, 0x8F, 0x53, 0x34, 0xE8, 0x81, 0x76, 0x71, 0x53, 0x3F, 0x99, 0xE7, 0xCF, 0xB7, 0xC9, 0xD9 } } } },	// EOB 1
+	{ DE_DEU, kPlatformUnknown, { 0x0000002F, 0x00001070, { { 0x86, 0x18, 0x00, 0x54, 0x05, 0x3D, 0xC2, 0x26, 0xA7, 0xD9, 0x68, 0xE6, 0xC2, 0x0D, 0x26, 0x99 } } } },	// EOB 2
+	EXTRACT_END_ENTRY
+};
+
+const ExtractEntrySearchData kEobBaseItemMisuseStringsProvider[] = {
+	{ EN_ANY, kPlatformUnknown, { 0x00000066, 0x000022F6, { { 0xE8, 0xB9, 0x07, 0x61, 0x29, 0x90, 0xB0, 0x22, 0x30, 0xC5, 0x0F, 0xAD, 0xCA, 0x6C, 0x83, 0xC6 } } } },
+	{ DE_DEU, kPlatformUnknown, { 0x00000068, 0x00002472, { { 0xCA, 0xD7, 0xFD, 0x5B, 0x65, 0x72, 0xC7, 0x15, 0xB3, 0xFE, 0xFC, 0xEF, 0x53, 0xFB, 0x57, 0x6C } } } },	// EOB 1
+	{ DE_DEU, kPlatformUnknown, { 0x0000007E, 0x00002C87, { { 0x5E, 0x11, 0xC9, 0x93, 0xF4, 0xAB, 0x1A, 0x9D, 0xA7, 0x62, 0x71, 0x94, 0x37, 0xCA, 0xE2, 0x25 } } } },	// EOB 2
 	EXTRACT_END_ENTRY
 };
 
@@ -1983,6 +2088,19 @@ const ExtractEntrySearchData kEobBaseSlotValidationFlagsProvider[] = {
 	EXTRACT_END_ENTRY
 };
 
+const ExtractEntrySearchData kEobBaseProjectileWeaponTypesProvider[] = {
+	{ UNK_LANG, kPlatformPC, { 0x0000000D, 0x0000063E, { { 0xA6, 0x75, 0x6C, 0x39, 0x96, 0xCB, 0xA7, 0xC2, 0x31, 0xE0, 0x2A, 0x75, 0x30, 0x96, 0x58, 0x05 } } } }, // EOB 1
+	{ UNK_LANG, kPlatformPC, { 0x0000000C, 0x0000063E, { { 0x3E, 0x99, 0x6D, 0xE4, 0x6B, 0xC8, 0x49, 0x1B, 0x17, 0xD2, 0xBE, 0x9B, 0xE0, 0xCD, 0xA1, 0xC2 } } } }, // EOB 1
+	{ UNK_LANG, kPlatformPC, { 0x0000000F, 0x00000829, { { 0x9F, 0x6A, 0x13, 0x8A, 0xA7, 0x40, 0xE8, 0x40, 0x2E, 0x87, 0x49, 0x6B, 0x67, 0xED, 0xE8, 0xCE } } } }, // EOB 2
+	EXTRACT_END_ENTRY
+};
+
+const ExtractEntrySearchData kEobBaseWandTypesProvider[] = {
+	{ UNK_LANG, kPlatformPC, { 0x00000007, 0x00000162, { { 0xDB, 0x5D, 0x34, 0x70, 0x41, 0xAB, 0x8F, 0x75, 0xC8, 0x61, 0x8E, 0x44, 0x82, 0xCF, 0x28, 0x03 } } } }, // EOB 1
+	{ UNK_LANG, kPlatformPC, { 0x00000008, 0x00000175, { { 0x01, 0xC2, 0xF0, 0xC6, 0x1C, 0xD0, 0x14, 0xD9, 0xB8, 0xF5, 0x9C, 0xFC, 0x22, 0xE4, 0xA0, 0xA7 } } } }, // EOB 2
+	EXTRACT_END_ENTRY
+};
+
 const ExtractEntrySearchData kEobBaseDrawObjPosIndexProvider[] = {
 	{ UNK_LANG, kPlatformPC, { 0x00000014, 0x00000028, { { 0x44, 0x46, 0x8C, 0x94, 0x76, 0x24, 0x08, 0xC7, 0x1F, 0x1B, 0x10, 0xD7, 0xDF, 0x18, 0x6C, 0x0D } } } },
 	EXTRACT_END_ENTRY
@@ -2778,6 +2896,18 @@ const ExtractEntrySearchData kEob2DranFoolsStringsProvider[] = {
 	EXTRACT_END_ENTRY
 };
 
+const ExtractEntrySearchData kEob2HornStringsProvider[] = {
+	{ EN_ANY, kPlatformUnknown, { 0x0000009A, 0x00003541, { { 0xA5, 0x4D, 0x88, 0xAC, 0x1C, 0xCD, 0x57, 0xD4, 0x1E, 0x9F, 0xAE, 0x13, 0x46, 0xAD, 0xA0, 0x22 } } } },
+	{ DE_DEU, kPlatformUnknown, { 0x000000AB, 0x00003B6C, { { 0x36, 0x34, 0xB3, 0xB1, 0x55, 0x66, 0x7A, 0x90, 0x97, 0x01, 0xDC, 0x4A, 0xAF, 0x17, 0x6B, 0x5A } } } },
+	EXTRACT_END_ENTRY
+};
+
+const ExtractEntrySearchData kEob2HornSoundsProvider[] = {
+	{ UNK_LANG, kPlatformPC, { 0x00000004, 0x00000106, { { 0x3E, 0x7B, 0x96, 0xFD, 0xCA, 0x4E, 0xA7, 0xA6, 0xB8, 0x82, 0x67, 0xCF, 0x93, 0x86, 0xE4, 0x45 } } } },
+
+	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 } } } },
@@ -3412,8 +3542,26 @@ const ExtractEntry extractProviders[] = {
 	
 	{ kEobBasePryDoorStrings, kEobBasePryDoorStringsProvider },
 	{ kEobBaseWarningStrings, kEobBaseWarningStringsProvider },
-	{ kEobBaseItemSuffixStrings, kEobBaseItemSuffixStringsProvider },
-	{ kEobBaseItemExtraStrings, kEobBaseItemExtraStringsProvider },
+
+	{ kEobBaseItemSuffixStringsRings, kEobBaseItemSuffixStringsRingsProvider },
+	{ kEobBaseItemSuffixStringsPotions, kEobBaseItemSuffixStringsPotionsProvider },
+	{ kEobBaseItemSuffixStringsWands, kEobBaseItemSuffixStringsWandsProvider },
+
+	{ kEobBaseRipItemStrings, kEobBaseRipItemStringsProvider },
+	{ kEobBaseCursedString, kEobBaseCursedStringProvider },
+	{ kEobBaseEnchantedString, kEobBaseEnchantedStringProvider },
+	{ kEobBaseMagicObjectStrings, kEobBaseMagicObjectStringsProvider },
+	{ kEobBaseMagicObject5String, kEobBaseMagicObject5StringProvider },
+	{ kEobBasePatternSuffix, kEobBasePatternSuffixProvider },
+	{ kEobBasePatternGrFix1, kEobBasePatternGrFix1Provider },
+	{ kEobBasePatternGrFix2, kEobBasePatternGrFix2Provider },
+	{ kEobBaseValidateArmorString, kEobBaseValidateArmorStringProvider },
+	{ kEobBaseValidateCursedString, kEobBaseValidateCursedStringProvider },
+	{ kEobBaseValidateNoDropString, kEobBaseValidateNoDropStringProvider },
+	{ kEobBasePotionStrings, kEobBasePotionStringsProvider },
+	{ kEobBaseWandString, kEobBaseWandStringProvider },
+	{ kEobBaseItemMisuseStrings, kEobBaseItemMisuseStringsProvider },
+
 	{ kEobBaseTakenStrings, kEobBaseTakenStringsProvider },
 	{ kEobBasePotionEffectStrings, kEobBasePotionEffectStringsProvider },
 
@@ -3507,6 +3655,10 @@ const ExtractEntry extractProviders[] = {
 	{ kEobBaseInvSlotX, kEobBaseInvSlotXProvider },
 	{ kEobBaseInvSlotY, kEobBaseInvSlotYProvider },
 	{ kEobBaseSlotValidationFlags, kEobBaseSlotValidationFlagsProvider },
+
+	{ kEobBaseProjectileWeaponTypes, kEobBaseProjectileWeaponTypesProvider },
+	{ kEobBaseWandTypes, kEobBaseWandTypesProvider },
+
 	{ kEobBaseDrawObjPosIndex, kEobBaseDrawObjPosIndexProvider },
 	{ kEobBaseFlightObjFlipIndex, kEobBaseFlightObjFlipIndexProvider },
 	{ kEobBaseFlightObjShpMap, kEobBaseFlightObjShpMapProvider },
@@ -3667,6 +3819,8 @@ const ExtractEntry extractProviders[] = {
 	{ kEob2Npc2Strings, kEob2Npc2StringsProvider },
 	{ kEob2MonsterDustStrings, kEob2MonsterDustStringsProvider },
 	{ kEob2DranFoolsStrings, kEob2DranFoolsStringsProvider },
+	{ kEob2HornStrings, kEob2HornStringsProvider },
+	{ kEob2HornSounds, kEob2HornSoundsProvider },
 	
 	{ kLolIngamePakFiles, kLolIngamePakFilesProvider },
 	{ kLolCharacterDefs, kLolCharacterDefsProvider },