KYRA: (EOB) - add static resources for memorize/pray menu

7 files changed, 104 insertions, 0 deletions

diff --git a/devtools/create_kyradat/create_kyradat.cpp b/devtools/create_kyradat/create_kyradat.cpp
index 96c878715b..066ae337cf 100644
--- a/devtools/create_kyradat/create_kyradat.cpp
+++ b/devtools/create_kyradat/create_kyradat.cpp
@@ -272,6 +272,13 @@ const ExtractFilename extractFilenames[] = {
 	{ kEobBaseMenuStringsTransfer, kTypeStringList, true },
 	{ kEobBaseMenuStringsSpec, kTypeStringList, true },
 	{ kEobBaseMenuStringsSpellNo, kTypeStringList, false },
+
+	{ kEobBaseSpellLevelsMage, kTypeRawData, false },
+	{ kEobBaseSpellLevelsCleric, kTypeRawData, false },
+	{ kEobBaseSpellMps1, kTypeRawData, false },
+	{ kEobBaseSpellMps2, kTypeRawData, false },
+	{ kEobBaseSpellMps3, kTypeRawData, false },
+	{ kEobBaseSpellMps4, kTypeRawData, false },
 	
 	{ kEobBaseCharGuiStringsHp, kTypeStringList, true },
 	{ kEobBaseCharGuiStringsWp1, kTypeStringList, true },
@@ -1356,6 +1363,18 @@ const char *getIdString(const int id) {
 		return "kEobBaseMenuStringsSpec";
 	case kEobBaseMenuStringsSpellNo:
 		return "kEobBaseMenuStringsSpellNo";
+	case kEobBaseSpellLevelsMage:
+		return "kEobBaseSpellLevelsMage";
+	case kEobBaseSpellLevelsCleric:
+		return "kEobBaseSpellLevelsCleric";
+	case kEobBaseSpellMps1:
+		return "kEobBaseSpellMps1";
+	case kEobBaseSpellMps2:
+		return "kEobBaseSpellMps2";
+	case kEobBaseSpellMps3:
+		return "kEobBaseSpellMps3";
+	case kEobBaseSpellMps4:
+		return "kEobBaseSpellMps4";
 	case kEobBaseCharGuiStringsHp:
 		return "kEobBaseCharGuiStringsHp";
 	case kEobBaseCharGuiStringsWp1:
diff --git a/devtools/create_kyradat/create_kyradat.h b/devtools/create_kyradat/create_kyradat.h
index fc575086c6..3c27b55d67 100644
--- a/devtools/create_kyradat/create_kyradat.h
+++ b/devtools/create_kyradat/create_kyradat.h
@@ -248,6 +248,13 @@ enum kExtractID {
 	kEobBaseMenuStringsSpec,
 	kEobBaseMenuStringsSpellNo,
 
+	kEobBaseSpellLevelsMage,
+	kEobBaseSpellLevelsCleric,
+	kEobBaseSpellMps1,
+	kEobBaseSpellMps2,
+	kEobBaseSpellMps3,
+	kEobBaseSpellMps4,
+
 	kEobBaseCharGuiStringsHp,
 	kEobBaseCharGuiStringsWp1,
 	kEobBaseCharGuiStringsWp2,
diff --git a/devtools/create_kyradat/games.cpp b/devtools/create_kyradat/games.cpp
index 423c726d8d..bf98deb910 100644
--- a/devtools/create_kyradat/games.cpp
+++ b/devtools/create_kyradat/games.cpp
@@ -1094,6 +1094,13 @@ const int eob1FloppyNeed[] = {
 	kEobBaseMenuStringsRest2,
 	kEobBaseMenuStringsRest4,
 	kEobBaseMenuStringsDefeat,
+
+	kEobBaseSpellLevelsMage,
+	kEobBaseSpellLevelsCleric,
+	kEobBaseSpellMps1,
+	kEobBaseSpellMps2,
+	kEobBaseSpellMps3,
+	kEobBaseSpellMps4,
 	
 	kEobBaseCharGuiStringsHp,
 	kEobBaseCharGuiStringsWp1,
@@ -1276,6 +1283,13 @@ const int eob2FloppyNeed[] = {
 	kEobBaseMenuStringsSpec,
 	kEobBaseMenuStringsSpellNo,
 
+	kEobBaseSpellLevelsMage,
+	kEobBaseSpellLevelsCleric,
+	kEobBaseSpellMps1,
+	kEobBaseSpellMps2,
+	kEobBaseSpellMps3,
+	kEobBaseSpellMps4,
+
 	kEobBaseCharGuiStringsHp,
 	kEobBaseCharGuiStringsWp2,
 	kEobBaseCharGuiStringsWr,
diff --git a/devtools/create_kyradat/tables.cpp b/devtools/create_kyradat/tables.cpp
index b8b32bc189..ae49b48dd7 100644
--- a/devtools/create_kyradat/tables.cpp
+++ b/devtools/create_kyradat/tables.cpp
@@ -1675,6 +1675,42 @@ const ExtractEntrySearchData kEobBaseMenuStringsSpellNoProvider[] = {
 	EXTRACT_END_ENTRY
 };
 
+const ExtractEntrySearchData kEobBaseSpellLevelsMageProvider[] = {
+	{ UNK_LANG, kPlatformUnknown, { 0x0000001A, 0x00000042, { { 0x4F, 0xA3, 0x70, 0x0F, 0x6D, 0xB4, 0xC2, 0xAF, 0x12, 0xB4, 0x2E, 0x26, 0xEF, 0x0B, 0x37, 0x92 } } } }, // EOB1
+	{ UNK_LANG, kPlatformUnknown, { 0x00000023, 0x00000074, { { 0xBE, 0x10, 0xFA, 0xD9, 0xB3, 0xB0, 0x4E, 0x73, 0xC9, 0xA1, 0xE2, 0xCE, 0xE8, 0xEC, 0x85, 0x0F } } } }, // EOB2
+	EXTRACT_END_ENTRY
+};
+
+const ExtractEntrySearchData kEobBaseSpellLevelsClericProvider[] = {
+	{ UNK_LANG, kPlatformUnknown, { 0x00000019, 0x00000045, { { 0x9E, 0xDA, 0xF2, 0x94, 0x3E, 0x0B, 0xA0, 0x23, 0x08, 0x41, 0xD5, 0x3C, 0x61, 0x77, 0xFD, 0x78 } } } }, // EOB1
+	{ UNK_LANG, kPlatformUnknown, { 0x0000001D, 0x00000066, { { 0xDB, 0x7F, 0x93, 0xE2, 0x2E, 0xCF, 0x69, 0xCC, 0x2A, 0xEF, 0x7C, 0x1E, 0x92, 0x6B, 0x51, 0x4E } } } }, // EOB2
+	EXTRACT_END_ENTRY
+};
+
+const ExtractEntrySearchData kEobBaseSpellMps1Provider[] = {
+	{ UNK_LANG, kPlatformUnknown, { 0x00000032, 0x0000004C, { { 0x87, 0xDD, 0xD0, 0xF8, 0x52, 0x84, 0x26, 0xC4, 0x9C, 0x5D, 0x0E, 0x46, 0x1A, 0xE8, 0x19, 0xD6 } } } }, // EOB1
+	{ UNK_LANG, kPlatformUnknown, { 0x00000088, 0x00000114, { { 0xA0, 0xB7, 0x2F, 0xED, 0x50, 0xE7, 0xC6, 0x11, 0xC9, 0x25, 0xB2, 0xB9, 0x81, 0xFB, 0xD8, 0x59 } } } }, // EOB2
+	EXTRACT_END_ENTRY
+};
+
+const ExtractEntrySearchData kEobBaseSpellMps2Provider[] = {
+	{ UNK_LANG, kPlatformUnknown, { 0x00000028, 0x0000001D, { { 0xA5, 0xCA, 0x1D, 0x96, 0xAE, 0x89, 0xBC, 0x7A, 0x32, 0x50, 0xCE, 0x44, 0x5D, 0x93, 0x25, 0x4B } } } }, // EOB1
+	{ UNK_LANG, kPlatformUnknown, { 0x00000040, 0x0000001D, { { 0x07, 0x31, 0x0D, 0x12, 0x55, 0x11, 0x11, 0xB6, 0x68, 0xC7, 0xEE, 0xDE, 0xC6, 0xED, 0x82, 0x5A } } } }, // EOB2
+	EXTRACT_END_ENTRY
+};
+
+const ExtractEntrySearchData kEobBaseSpellMps3Provider[] = {
+	{ UNK_LANG, kPlatformUnknown, { 0x0000003C, 0x00000012, { { 0x96, 0x7E, 0x17, 0x9E, 0xFD, 0x39, 0xC9, 0x3A, 0xB7, 0x3E, 0x8D, 0xA8, 0xED, 0xA3, 0x07, 0xEB } } } }, // EOB1
+	{ UNK_LANG, kPlatformUnknown, { 0x00000088, 0x0000002F, { { 0x19, 0x1A, 0x9B, 0x42, 0xA0, 0x67, 0x10, 0x1A, 0xAC, 0x00, 0x0F, 0xF7, 0xBE, 0x04, 0x61, 0x36 } } } }, // EOB2
+	EXTRACT_END_ENTRY
+};
+
+const ExtractEntrySearchData kEobBaseSpellMps4Provider[] = {
+	{ UNK_LANG, kPlatformUnknown, { 0x00000037, 0x0000005E, { { 0x61, 0x30, 0x1A, 0x74, 0x9B, 0x4C, 0x8C, 0x83, 0xD5, 0xE6, 0x39, 0x6E, 0xCA, 0x18, 0x16, 0x63 } } } }, // EOB1
+	{ UNK_LANG, kPlatformUnknown, { 0x00000114, 0x00000102, { { 0x33, 0xEE, 0x32, 0x9C, 0xB2, 0xB3, 0x60, 0x66, 0x91, 0xE0, 0x90, 0x0E, 0x8F, 0xE1, 0xA5, 0x4A } } } }, // EOB2
+	EXTRACT_END_ENTRY
+};
+
 const ExtractEntrySearchData kEobBaseCharGuiStringsHpProvider[] = {
 	{ EN_ANY, kPlatformUnknown, { 0x0000000F, 0x00000352, { { 0x9C, 0x13, 0x3D, 0x2A, 0x68, 0x11, 0x81, 0xA4, 0x77, 0x54, 0x47, 0x43, 0xA1, 0xDA, 0x55, 0x50 } } } }, 
 	{ DE_DEU, kPlatformUnknown, { 0x0000000E, 0x000002AC, { { 0xBB, 0xD5, 0x36, 0xB2, 0x8A, 0x60, 0x78, 0x04, 0x46, 0x2D, 0x35, 0x59, 0x3E, 0x42, 0xB9, 0x83 } } } },	// Eob 1
@@ -3399,6 +3435,13 @@ const ExtractEntry extractProviders[] = {
 	{ kEobBaseMenuStringsSpec, kEobBaseMenuStringsSpecProvider },
 	{ kEobBaseMenuStringsSpellNo, kEobBaseMenuStringsSpellNoProvider },
 
+	{ kEobBaseSpellLevelsMage, kEobBaseSpellLevelsMageProvider },
+	{ kEobBaseSpellLevelsCleric, kEobBaseSpellLevelsClericProvider },
+	{ kEobBaseSpellMps1, kEobBaseSpellMps1Provider },
+	{ kEobBaseSpellMps2, kEobBaseSpellMps2Provider },
+	{ kEobBaseSpellMps3, kEobBaseSpellMps3Provider },
+	{ kEobBaseSpellMps4, kEobBaseSpellMps4Provider },
+
 	{ kEobBaseCharGuiStringsHp, kEobBaseCharGuiStringsHpProvider },
 	{ kEobBaseCharGuiStringsWp1, kEobBaseCharGuiStringsWp1Provider },
 	{ kEobBaseCharGuiStringsWp2, kEobBaseCharGuiStringsWp2Provider },
diff --git a/engines/kyra/eobcommon.h b/engines/kyra/eobcommon.h
index ede25dd140..2e4df6aa1c 100644
--- a/engines/kyra/eobcommon.h
+++ b/engines/kyra/eobcommon.h
@@ -1007,6 +1007,13 @@ protected:
 	const char *const *_menuStringsSpec;
 	const char *const *_menuStringsSpellNo;
 
+	const uint8 *_spellLevelsMage;
+	const uint8 *_spellLevelsCleric;
+	const uint8 *_spellLevelsMps1;
+	const uint8 *_spellLevelsMps2;
+	const uint8 *_spellLevelsMps3;
+	const uint8 *_spellLevelsMps4;
+
 	// sound
 	void snd_playSoundEffect(int id, int volume=0xFF);
 };
diff --git a/engines/kyra/resource.h b/engines/kyra/resource.h
index fa4dd10893..5d9554c31f 100644
--- a/engines/kyra/resource.h
+++ b/engines/kyra/resource.h
@@ -321,6 +321,13 @@ enum KyraResources {
 	kEobBaseMenuStringsSpec,
 	kEobBaseMenuStringsSpellNo,
 
+	kEobBaseSpellLevelsMage,
+	kEobBaseSpellLevelsCleric,
+	kEobBaseSpellMps1,
+	kEobBaseSpellMps2,
+	kEobBaseSpellMps3,
+	kEobBaseSpellMps4,
+
 	kEobBaseCharGuiStringsHp,
 	kEobBaseCharGuiStringsWp1,
 	kEobBaseCharGuiStringsWp2,
diff --git a/engines/kyra/staticres_eob.cpp b/engines/kyra/staticres_eob.cpp
index a9746004bd..7908bc28ee 100644
--- a/engines/kyra/staticres_eob.cpp
+++ b/engines/kyra/staticres_eob.cpp
@@ -388,6 +388,13 @@ void EobCoreEngine::initStaticResource() {
 	_menuStringsSpec = _staticres->loadStrings(kEobBaseMenuStringsSpec, temp);
 	_menuStringsSpellNo = _staticres->loadStrings(kEobBaseMenuStringsSpellNo, temp);
 
+	_spellLevelsMage = _staticres->loadRawData(kEobBaseSpellLevelsMage, temp);
+	_spellLevelsCleric = _staticres->loadRawData(kEobBaseSpellLevelsCleric, temp);
+	_spellLevelsMps1 = _staticres->loadRawData(kEobBaseSpellMps1, temp);
+	_spellLevelsMps2 = _staticres->loadRawData(kEobBaseSpellMps2, temp);
+	_spellLevelsMps3 = _staticres->loadRawData(kEobBaseSpellMps3, temp);
+	_spellLevelsMps4 = _staticres->loadRawData(kEobBaseSpellMps4, temp);
+
 	_characterGuiStringsHp = _staticres->loadStrings(kEobBaseCharGuiStringsHp, temp);
 	_characterGuiStringsWp = _staticres->loadStrings(_flags.gameID == GI_EOB2 ? kEobBaseCharGuiStringsWp2 : kEobBaseCharGuiStringsWp1, temp);
 	_characterGuiStringsWr = _staticres->loadStrings(kEobBaseCharGuiStringsWr, temp);