KYRA: (EOB) - implement memorize/pray spells menu

4 files changed, 32 insertions, 32 deletions

diff --git a/devtools/create_kyradat/create_kyradat.cpp b/devtools/create_kyradat/create_kyradat.cpp
index 066ae337cf..298d8b264e 100644
--- a/devtools/create_kyradat/create_kyradat.cpp
+++ b/devtools/create_kyradat/create_kyradat.cpp
@@ -275,10 +275,10 @@ const ExtractFilename extractFilenames[] = {
 
 	{ kEobBaseSpellLevelsMage, kTypeRawData, false },
 	{ kEobBaseSpellLevelsCleric, kTypeRawData, false },
-	{ kEobBaseSpellMps1, kTypeRawData, false },
-	{ kEobBaseSpellMps2, kTypeRawData, false },
-	{ kEobBaseSpellMps3, kTypeRawData, false },
-	{ kEobBaseSpellMps4, kTypeRawData, false },
+	{ kEobBaseNumSpellsCleric, kTypeRawData, false },
+	{ kEobBaseNumSpellsWisAdj, kTypeRawData, false },
+	{ kEobBaseNumSpellsPal, kTypeRawData, false },
+	{ kEobBaseNumSpellsMage, kTypeRawData, false },
 	
 	{ kEobBaseCharGuiStringsHp, kTypeStringList, true },
 	{ kEobBaseCharGuiStringsWp1, kTypeStringList, true },
@@ -1367,14 +1367,14 @@ const char *getIdString(const int id) {
 		return "kEobBaseSpellLevelsMage";
 	case kEobBaseSpellLevelsCleric:
 		return "kEobBaseSpellLevelsCleric";
-	case kEobBaseSpellMps1:
-		return "kEobBaseSpellMps1";
-	case kEobBaseSpellMps2:
-		return "kEobBaseSpellMps2";
-	case kEobBaseSpellMps3:
-		return "kEobBaseSpellMps3";
-	case kEobBaseSpellMps4:
-		return "kEobBaseSpellMps4";
+	case kEobBaseNumSpellsCleric:
+		return "kEobBaseNumSpellsCleric";
+	case kEobBaseNumSpellsWisAdj:
+		return "kEobBaseNumSpellsWisAdj";
+	case kEobBaseNumSpellsPal:
+		return "kEobBaseNumSpellsPal";
+	case kEobBaseNumSpellsMage:
+		return "kEobBaseNumSpellsMage";
 	case kEobBaseCharGuiStringsHp:
 		return "kEobBaseCharGuiStringsHp";
 	case kEobBaseCharGuiStringsWp1:
diff --git a/devtools/create_kyradat/create_kyradat.h b/devtools/create_kyradat/create_kyradat.h
index 3c27b55d67..e2702c496e 100644
--- a/devtools/create_kyradat/create_kyradat.h
+++ b/devtools/create_kyradat/create_kyradat.h
@@ -250,10 +250,10 @@ enum kExtractID {
 
 	kEobBaseSpellLevelsMage,
 	kEobBaseSpellLevelsCleric,
-	kEobBaseSpellMps1,
-	kEobBaseSpellMps2,
-	kEobBaseSpellMps3,
-	kEobBaseSpellMps4,
+	kEobBaseNumSpellsCleric,
+	kEobBaseNumSpellsWisAdj,
+	kEobBaseNumSpellsPal,
+	kEobBaseNumSpellsMage,
 
 	kEobBaseCharGuiStringsHp,
 	kEobBaseCharGuiStringsWp1,
diff --git a/devtools/create_kyradat/games.cpp b/devtools/create_kyradat/games.cpp
index bf98deb910..f98f712c15 100644
--- a/devtools/create_kyradat/games.cpp
+++ b/devtools/create_kyradat/games.cpp
@@ -1097,10 +1097,10 @@ const int eob1FloppyNeed[] = {
 
 	kEobBaseSpellLevelsMage,
 	kEobBaseSpellLevelsCleric,
-	kEobBaseSpellMps1,
-	kEobBaseSpellMps2,
-	kEobBaseSpellMps3,
-	kEobBaseSpellMps4,
+	kEobBaseNumSpellsCleric,
+	kEobBaseNumSpellsWisAdj,
+	kEobBaseNumSpellsPal,
+	kEobBaseNumSpellsMage,
 	
 	kEobBaseCharGuiStringsHp,
 	kEobBaseCharGuiStringsWp1,
@@ -1285,10 +1285,10 @@ const int eob2FloppyNeed[] = {
 
 	kEobBaseSpellLevelsMage,
 	kEobBaseSpellLevelsCleric,
-	kEobBaseSpellMps1,
-	kEobBaseSpellMps2,
-	kEobBaseSpellMps3,
-	kEobBaseSpellMps4,
+	kEobBaseNumSpellsCleric,
+	kEobBaseNumSpellsWisAdj,
+	kEobBaseNumSpellsPal,
+	kEobBaseNumSpellsMage,
 
 	kEobBaseCharGuiStringsHp,
 	kEobBaseCharGuiStringsWp2,
diff --git a/devtools/create_kyradat/tables.cpp b/devtools/create_kyradat/tables.cpp
index ae49b48dd7..b1f54d2cf3 100644
--- a/devtools/create_kyradat/tables.cpp
+++ b/devtools/create_kyradat/tables.cpp
@@ -1687,25 +1687,25 @@ const ExtractEntrySearchData kEobBaseSpellLevelsClericProvider[] = {
 	EXTRACT_END_ENTRY
 };
 
-const ExtractEntrySearchData kEobBaseSpellMps1Provider[] = {
+const ExtractEntrySearchData kEobBaseNumSpellsClericProvider[] = {
 	{ 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[] = {
+const ExtractEntrySearchData kEobBaseNumSpellsWisAdjProvider[] = {
 	{ 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[] = {
+const ExtractEntrySearchData kEobBaseNumSpellsPalProvider[] = {
 	{ 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[] = {
+const ExtractEntrySearchData kEobBaseNumSpellsMageProvider[] = {
 	{ 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
@@ -3437,10 +3437,10 @@ const ExtractEntry extractProviders[] = {
 
 	{ kEobBaseSpellLevelsMage, kEobBaseSpellLevelsMageProvider },
 	{ kEobBaseSpellLevelsCleric, kEobBaseSpellLevelsClericProvider },
-	{ kEobBaseSpellMps1, kEobBaseSpellMps1Provider },
-	{ kEobBaseSpellMps2, kEobBaseSpellMps2Provider },
-	{ kEobBaseSpellMps3, kEobBaseSpellMps3Provider },
-	{ kEobBaseSpellMps4, kEobBaseSpellMps4Provider },
+	{ kEobBaseNumSpellsCleric, kEobBaseNumSpellsClericProvider },
+	{ kEobBaseNumSpellsWisAdj, kEobBaseNumSpellsWisAdjProvider },
+	{ kEobBaseNumSpellsPal, kEobBaseNumSpellsPalProvider },
+	{ kEobBaseNumSpellsMage, kEobBaseNumSpellsMageProvider },
 
 	{ kEobBaseCharGuiStringsHp, kEobBaseCharGuiStringsHpProvider },
 	{ kEobBaseCharGuiStringsWp1, kEobBaseCharGuiStringsWp1Provider },