KYRA: (EOB/LOL) - rename some vars

(all cases of Eob to EoB, all cases of Lol to LoL, all cases of LolEobCommon to RpgCommon)

1 files changed, 477 insertions, 477 deletions

diff --git a/engines/kyra/resource.h b/engines/kyra/resource.h
index 072b4187c1..f5d70e084c 100644
--- a/engines/kyra/resource.h
+++ b/engines/kyra/resource.h
@@ -252,464 +252,464 @@ enum KyraResources {
 	k3ItemStringMap,
 
 #if defined(ENABLE_EOB) || defined(ENABLE_LOL)
-	kLolEobCommonMoreStrings,
-	kLolEobCommonDscShapeIndex,
-	kLolEobCommonDscX,
-	kLolEobCommonDscTileIndex,
-	kLolEobCommonDscUnk2,
-	kLolEobCommonDscDoorShapeIndex,
-	kLolEobCommonDscDimData1,
-	kLolEobCommonDscDimData2,
-	kLolEobCommonDscBlockMap,
-	kLolEobCommonDscDimMap,
-	kLolEobCommonDscDoorY2,
-	kLolEobCommonDscBlockIndex,
-
-	kEobBaseChargenStrings1,
-	kEobBaseChargenStrings2,
-	kEobBaseChargenStartLevels,
-	kEobBaseChargenStatStrings,
-	kEobBaseChargenRaceSexStrings,
-	kEobBaseChargenClassStrings,
-	kEobBaseChargenAlignmentStrings,
-	kEobBaseChargenEnterGameStrings,
-	kEobBaseChargenClassMinStats,
-	kEobBaseChargenRaceMinStats,
-	kEobBaseChargenRaceMaxStats,
-
-	kEobBaseSaveThrowTable1,
-	kEobBaseSaveThrowTable2,
-	kEobBaseSaveThrowTable3,
-	kEobBaseSaveThrowTable4,
-	kEobBaseSaveThrwLvlIndex,
-	kEobBaseSaveThrwModDiv,
-	kEobBaseSaveThrwModExt,
-
-	kEobBasePryDoorStrings,
-	kEobBaseWarningStrings,
-
-	kEobBaseItemSuffixStringsRings,
-	kEobBaseItemSuffixStringsPotions,
-	kEobBaseItemSuffixStringsWands,
+	kRpgCommonMoreStrings,
+	kRpgCommonDscShapeIndex,
+	kRpgCommonDscX,
+	kRpgCommonDscTileIndex,
+	kRpgCommonDscUnk2,
+	kRpgCommonDscDoorShapeIndex,
+	kRpgCommonDscDimData1,
+	kRpgCommonDscDimData2,
+	kRpgCommonDscBlockMap,
+	kRpgCommonDscDimMap,
+	kRpgCommonDscDoorY2,
+	kRpgCommonDscBlockIndex,
+
+	kEoBBaseChargenStrings1,
+	kEoBBaseChargenStrings2,
+	kEoBBaseChargenStartLevels,
+	kEoBBaseChargenStatStrings,
+	kEoBBaseChargenRaceSexStrings,
+	kEoBBaseChargenClassStrings,
+	kEoBBaseChargenAlignmentStrings,
+	kEoBBaseChargenEnterGameStrings,
+	kEoBBaseChargenClassMinStats,
+	kEoBBaseChargenRaceMinStats,
+	kEoBBaseChargenRaceMaxStats,
+
+	kEoBBaseSaveThrowTable1,
+	kEoBBaseSaveThrowTable2,
+	kEoBBaseSaveThrowTable3,
+	kEoBBaseSaveThrowTable4,
+	kEoBBaseSaveThrwLvlIndex,
+	kEoBBaseSaveThrwModDiv,
+	kEoBBaseSaveThrwModExt,
+
+	kEoBBasePryDoorStrings,
+	kEoBBaseWarningStrings,
+
+	kEoBBaseItemSuffixStringsRings,
+	kEoBBaseItemSuffixStringsPotions,
+	kEoBBaseItemSuffixStringsWands,
 	
-	kEobBaseRipItemStrings,
-	kEobBaseCursedString,
-	kEobBaseEnchantedString,
-	kEobBaseMagicObjectStrings,
-	kEobBaseMagicObjectString5,
-	kEobBasePatternSuffix,
-	kEobBasePatternGrFix1,
-	kEobBasePatternGrFix2,
-	kEobBaseValidateArmorString,
-	kEobBaseValidateCursedString,
-	kEobBaseValidateNoDropString,
-	kEobBasePotionStrings,
-	kEobBaseWandStrings,
-	kEobBaseItemMisuseStrings,
-
-	kEobBaseTakenStrings,
-	kEobBasePotionEffectStrings,
-
-	kEobBaseYesNoStrings,
-	kEobBaseNpcMaxStrings,
-	kEobBaseOkStrings,
-	kEobBaseNpcJoinStrings,
-	kEobBaseCancelStrings,
-	kEobBaseAbortStrings,
-
-	kEobBaseMenuStringsMain,
-	kEobBaseMenuStringsSaveLoad,
-	kEobBaseMenuStringsOnOff,
-	kEobBaseMenuStringsSpells,
-	kEobBaseMenuStringsRest,
-	kEobBaseMenuStringsDrop,
-	kEobBaseMenuStringsExit,
-	kEobBaseMenuStringsStarve,
-	kEobBaseMenuStringsScribe,
-	kEobBaseMenuStringsDrop2,
-	kEobBaseMenuStringsHead,
-	kEobBaseMenuStringsPoison,
-	kEobBaseMenuStringsMgc,
-	kEobBaseMenuStringsPrefs,
-	kEobBaseMenuStringsRest2,
-	kEobBaseMenuStringsRest3,
-	kEobBaseMenuStringsRest4,
-	kEobBaseMenuStringsDefeat,
-	kEobBaseMenuStringsTransfer,
-	kEobBaseMenuStringsSpec,
-	kEobBaseMenuStringsSpellNo,
-	kEobBaseMenuYesNoStrings,
-
-	kEobBaseSpellLevelsMage,
-	kEobBaseSpellLevelsCleric,
-	kEobBaseNumSpellsCleric,
-	kEobBaseNumSpellsWisAdj,
-	kEobBaseNumSpellsPal,
-	kEobBaseNumSpellsMage,
-
-	kEobBaseCharGuiStringsHp,
-	kEobBaseCharGuiStringsWp1,
-	kEobBaseCharGuiStringsWp2,
-	kEobBaseCharGuiStringsWr,
-	kEobBaseCharGuiStringsSt1,
-	kEobBaseCharGuiStringsSt2,
-	kEobBaseCharGuiStringsIn,
-
-	kEobBaseCharStatusStrings7,
-	kEobBaseCharStatusStrings81,
-	kEobBaseCharStatusStrings82,
-	kEobBaseCharStatusStrings9,
-	kEobBaseCharStatusStrings12,
-	kEobBaseCharStatusStrings131,
-	kEobBaseCharStatusStrings132,
-
-	kEobBaseLevelGainStrings,
-	kEobBaseExperienceTable0,
-	kEobBaseExperienceTable1,
-	kEobBaseExperienceTable2,
-	kEobBaseExperienceTable3,
-	kEobBaseExperienceTable4,
-
-	kEobBaseClassModifierFlags,
-
-	kEobBaseMonsterStepTable01,
-	kEobBaseMonsterStepTable02,
-	kEobBaseMonsterStepTable1,
-	kEobBaseMonsterStepTable2,
-	kEobBaseMonsterStepTable3,
-	kEobBaseMonsterCloseAttPosTable1,
-	kEobBaseMonsterCloseAttPosTable21,
-	kEobBaseMonsterCloseAttPosTable22,
-	kEobBaseMonsterCloseAttUnkTable,
-	kEobBaseMonsterCloseAttChkTable1,
-	kEobBaseMonsterCloseAttChkTable2,
-	kEobBaseMonsterCloseAttDstTable1,
-	kEobBaseMonsterCloseAttDstTable2,
-
-	kEobBaseMonsterProximityTable,
-	kEobBaseFindBlockMonstersTable,
-	kEobBaseMonsterDirChangeTable,
-	kEobBaseMonsterDistAttStrings,
-
-	kEobBaseEncodeMonsterDefs,
-	kEobBaseNpcPresets,
-
-	kEobBaseWllFlagPreset,
-	kEobBaseDscShapeCoords,
-
-	kEobBaseDscDoorScaleOffs,
-	kEobBaseDscDoorScaleMult1,
-	kEobBaseDscDoorScaleMult2,
-	kEobBaseDscDoorScaleMult3,
-	kEobBaseDscDoorScaleMult4,
-	kEobBaseDscDoorScaleMult5,
-	kEobBaseDscDoorScaleMult6,
-	kEobBaseDscDoorType5Offs,
-	kEobBaseDscDoorXE,
-	kEobBaseDscDoorY1,
-	kEobBaseDscDoorY3,
-	kEobBaseDscDoorY4,
-	kEobBaseDscDoorY5,
-	kEobBaseDscDoorY6,
-	kEobBaseDscDoorY7,
-	kEobBaseDscDoorCoordsExt,
-
-	kEobBaseDscItemPosIndex,
-	kEobBaseDscItemShpX,
-	kEobBaseDscItemScaleIndex,
-	kEobBaseDscItemTileIndex,
-	kEobBaseDscItemShapeMap,
-
-	kEobBaseDscMonsterFrmOffsTbl1,
-	kEobBaseDscMonsterFrmOffsTbl2,
-
-	kEobBaseInvSlotX,
-	kEobBaseInvSlotY,
-	kEobBaseSlotValidationFlags,
-
-	kEobBaseProjectileWeaponTypes,
-	kEobBaseWandTypes,
-
-	kEobBaseDrawObjPosIndex,
-	kEobBaseFlightObjFlipIndex,
-	kEobBaseFlightObjShpMap,
-	kEobBaseFlightObjSclIndex,
-
-	kEobBaseDscTelptrShpCoords,
-
-	kEobBasePortalSeqData,
-	kEobBaseManDef,
-	kEobBaseManWord,
-	kEobBaseManPrompt,
-
-	kEobBaseBookNumbers,
-	kEobBaseMageSpellsList,
-	kEobBaseClericSpellsList,
-	kEobBaseSpellNames,
-	kEobBaseMagicStrings1,
-	kEobBaseMagicStrings2,
-	kEobBaseMagicStrings3,
-	kEobBaseMagicStrings4,
-	kEobBaseMagicStrings6,
-	kEobBaseMagicStrings7,
-	kEobBaseMagicStrings8,
-
-	kEobBaseExpObjectTlMode,
-	kEobBaseExpObjectTblIndex,
-	kEobBaseExpObjectShpStart,
-	kEobBaseExpObjectTbl1,
-	kEobBaseExpObjectTbl2,
-	kEobBaseExpObjectTbl3,
-	kEobBaseExpObjectY,
-
-	kEobBaseSparkDefSteps,
-	kEobBaseSparkDefSubSteps,
-	kEobBaseSparkDefShift,
-	kEobBaseSparkDefAdd,
-	kEobBaseSparkDefX,
-	kEobBaseSparkDefY,
-	kEobBaseSparkOfFlags1,
-	kEobBaseSparkOfFlags2,
-	kEobBaseSparkOfShift,
-	kEobBaseSparkOfX,
-	kEobBaseSparkOfY,
-
-	kEobBaseSpellProperties,
-	kEobBaseMagicFlightProps,
-	kEobBaseTurnUndeadEffect,
-	kEobBaseBurningHandsDest,
-	kEobBaseConeOfColdDest1,
-	kEobBaseConeOfColdDest2,
-	kEobBaseConeOfColdDest3,
-	kEobBaseConeOfColdDest4,
-	kEobBaseConeOfColdGfxTbl,
-
-	kEob1MainMenuStrings,
-	kEob1BonusStrings,
-
-	kEob1IntroFilesOpening,
-	kEob1IntroFilesTower,
-	kEob1IntroFilesOrb,
-	kEob1IntroFilesWdEntry,
-	kEob1IntroFilesKing,
-	kEob1IntroFilesHands,
-	kEob1IntroFilesWdExit,
-	kEob1IntroFilesTunnel,
-	kEob1IntroOpeningFrmDelay,
-	kEob1IntroWdEncodeX,
-	kEob1IntroWdEncodeY,
-	kEob1IntroWdEncodeWH,
-	kEob1IntroWdDsX,
-	kEob1IntroWdDsY,
-	kEob1IntroTvlX1,
-	kEob1IntroTvlY1,
-	kEob1IntroTvlX2,
-	kEob1IntroTvlY2,
-	kEob1IntroTvlW,
-	kEob1IntroTvlH,
-
-	kEob1DoorShapeDefs,
-	kEob1DoorSwitchShapeDefs,
-	kEob1DoorSwitchCoords,
-	kEob1MonsterProperties,
-
-	kEob1EnemyMageSpellList,
-	kEob1EnemyMageSfx,
-	kEob1BeholderSpellList,
-	kEob1BeholderSfx,
-
-	kEob1TurnUndeadString,
-
-	kEob1NpcShpData,
-	kEob1NpcSubShpIndex1,
-	kEob1NpcSubShpIndex2,
-	kEob1NpcSubShpY,
-	kEob1Npc0Strings,
-	kEob1Npc11Strings,
-	kEob1Npc12Strings,
-	kEob1Npc21Strings,
-	kEob1Npc22Strings,
-	kEob1Npc31Strings,
-	kEob1Npc32Strings,
-	kEob1Npc4Strings,
-	kEob1Npc5Strings,
-	kEob1Npc6Strings,
-	kEob1Npc7Strings,
-
-	kEob2MainMenuStrings,
-	kEob2TransferConvertTable,
-	kEob2TransferExpTable,
-
-	kEob2IntroStrings,
-	kEob2IntroCPSFiles,
-	kEob2IntroSeqData00,
- 	kEob2IntroSeqData01,
- 	kEob2IntroSeqData02,
- 	kEob2IntroSeqData03,
- 	kEob2IntroSeqData04,
- 	kEob2IntroSeqData05,
- 	kEob2IntroSeqData06,
- 	kEob2IntroSeqData07,
- 	kEob2IntroSeqData08,
- 	kEob2IntroSeqData09,
- 	kEob2IntroSeqData10,
- 	kEob2IntroSeqData11,
- 	kEob2IntroSeqData12,
- 	kEob2IntroSeqData13,
- 	kEob2IntroSeqData14,
- 	kEob2IntroSeqData15,
- 	kEob2IntroSeqData16,
- 	kEob2IntroSeqData17,
- 	kEob2IntroSeqData18,
- 	kEob2IntroSeqData19,
- 	kEob2IntroSeqData20,
- 	kEob2IntroSeqData21,
- 	kEob2IntroSeqData22,
- 	kEob2IntroSeqData23,
- 	kEob2IntroSeqData24,
- 	kEob2IntroSeqData25,
- 	kEob2IntroSeqData26,
- 	kEob2IntroSeqData27,
- 	kEob2IntroSeqData28,
- 	kEob2IntroSeqData29,
- 	kEob2IntroSeqData30,
- 	kEob2IntroSeqData31,
- 	kEob2IntroSeqData32,
- 	kEob2IntroSeqData33,
- 	kEob2IntroSeqData34,
- 	kEob2IntroSeqData35,
- 	kEob2IntroSeqData36,
- 	kEob2IntroSeqData37,
- 	kEob2IntroSeqData38,
- 	kEob2IntroSeqData39,
- 	kEob2IntroSeqData40,
- 	kEob2IntroSeqData41,
- 	kEob2IntroSeqData42,
- 	kEob2IntroSeqData43,
-	kEob2IntroShapes00,
- 	kEob2IntroShapes01,
- 	kEob2IntroShapes04,
- 	kEob2IntroShapes07,
-
-	kEob2FinaleStrings,
-	kEob2CreditsData,
-	kEob2FinaleCPSFiles,
-	kEob2FinaleSeqData00,
- 	kEob2FinaleSeqData01,
- 	kEob2FinaleSeqData02,
- 	kEob2FinaleSeqData03,
- 	kEob2FinaleSeqData04,
- 	kEob2FinaleSeqData05,
- 	kEob2FinaleSeqData06,
- 	kEob2FinaleSeqData07,
- 	kEob2FinaleSeqData08,
- 	kEob2FinaleSeqData09,
- 	kEob2FinaleSeqData10,
- 	kEob2FinaleSeqData11,
- 	kEob2FinaleSeqData12,
- 	kEob2FinaleSeqData13,
- 	kEob2FinaleSeqData14,
- 	kEob2FinaleSeqData15,
- 	kEob2FinaleSeqData16,
- 	kEob2FinaleSeqData17,
- 	kEob2FinaleSeqData18,
- 	kEob2FinaleSeqData19,
- 	kEob2FinaleSeqData20,
-	kEob2FinaleShapes00,
- 	kEob2FinaleShapes03,
- 	kEob2FinaleShapes07,
- 	kEob2FinaleShapes09,
- 	kEob2FinaleShapes10,
-
-	kEob2NpcShapeData,
-	kEob2Npc1Strings,
-	kEob2Npc2Strings,
-	kEob2MonsterDustStrings,
-
-	kEob2DreamSteps,
-	kEob2KheldranStrings,
-	kEob2HornStrings,
-	kEob2HornSounds,
-
-	kEob2WallOfForceDsX,
-	kEob2WallOfForceDsY,
-	kEob2WallOfForceNumW,
-	kEob2WallOfForceNumH,
-	kEob2WallOfForceShpId,
-
-	kLolIngamePakFiles,
-	kLolCharacterDefs,
-	kLolIngameSfxFiles,
-	kLolIngameSfxIndex,
-	kLolMusicTrackMap,
-	kLolIngameGMSfxIndex,
-	kLolIngameMT32SfxIndex,
-	kLolIngamePcSpkSfxIndex,
-	kLolSpellProperties,
-	kLolGameShapeMap,
-	kLolSceneItemOffs,
-	kLolCharInvIndex,
-	kLolCharInvDefs,
-	kLolCharDefsMan,
-	kLolCharDefsWoman,
-	kLolCharDefsKieran,
-	kLolCharDefsAkshel,
-	kLolExpRequirements,
-	kLolMonsterModifiers,
-	kLolMonsterShiftOffsets,
-	kLolMonsterDirFlags,
-	kLolMonsterScaleY,
-	kLolMonsterScaleX,
-	kLolMonsterScaleWH,
-	kLolFlyingObjectShp,
-	kLolInventoryDesc,
-
-	kLolLevelShpList,
-	kLolLevelDatList,
-	kLolCompassDefs,
-	kLolItemPrices,
-	kLolStashSetup,
-
-	kLolDscWalls,
-	kLolDscOvlMap,
-	kLolDscScaleWidthData,
-	kLolDscScaleHeightData,
-	kLolBaseDscY,
-
-	kLolDscDoorScale,
-	kLolDscDoor4,
-	kLolDscDoorX,
-	kLolDscDoorY,
-	kLolDscOvlIndex,
-
-	kLolScrollXTop,
-	kLolScrollYTop,
-	kLolScrollXBottom,
-	kLolScrollYBottom,
-
-	kLolButtonDefs,
-	kLolButtonList1,
-	kLolButtonList2,
-	kLolButtonList3,
-	kLolButtonList4,
-	kLolButtonList5,
-	kLolButtonList6,
-	kLolButtonList7,
-	kLolButtonList8,
-
-	kLolLegendData,
-	kLolMapCursorOvl,
-	kLolMapStringId,
-
-	kLolSpellbookAnim,
-	kLolSpellbookCoords,
-	kLolHealShapeFrames,
-	kLolLightningDefs,
-	kLolFireballCoords,
-
-	kLolCredits,
-
-	kLolHistory,
+	kEoBBaseRipItemStrings,
+	kEoBBaseCursedString,
+	kEoBBaseEnchantedString,
+	kEoBBaseMagicObjectStrings,
+	kEoBBaseMagicObjectString5,
+	kEoBBasePatternSuffix,
+	kEoBBasePatternGrFix1,
+	kEoBBasePatternGrFix2,
+	kEoBBaseValidateArmorString,
+	kEoBBaseValidateCursedString,
+	kEoBBaseValidateNoDropString,
+	kEoBBasePotionStrings,
+	kEoBBaseWandStrings,
+	kEoBBaseItemMisuseStrings,
+
+	kEoBBaseTakenStrings,
+	kEoBBasePotionEffectStrings,
+
+	kEoBBaseYesNoStrings,
+	kEoBBaseNpcMaxStrings,
+	kEoBBaseOkStrings,
+	kEoBBaseNpcJoinStrings,
+	kEoBBaseCancelStrings,
+	kEoBBaseAbortStrings,
+
+	kEoBBaseMenuStringsMain,
+	kEoBBaseMenuStringsSaveLoad,
+	kEoBBaseMenuStringsOnOff,
+	kEoBBaseMenuStringsSpells,
+	kEoBBaseMenuStringsRest,
+	kEoBBaseMenuStringsDrop,
+	kEoBBaseMenuStringsExit,
+	kEoBBaseMenuStringsStarve,
+	kEoBBaseMenuStringsScribe,
+	kEoBBaseMenuStringsDrop2,
+	kEoBBaseMenuStringsHead,
+	kEoBBaseMenuStringsPoison,
+	kEoBBaseMenuStringsMgc,
+	kEoBBaseMenuStringsPrefs,
+	kEoBBaseMenuStringsRest2,
+	kEoBBaseMenuStringsRest3,
+	kEoBBaseMenuStringsRest4,
+	kEoBBaseMenuStringsDefeat,
+	kEoBBaseMenuStringsTransfer,
+	kEoBBaseMenuStringsSpec,
+	kEoBBaseMenuStringsSpellNo,
+	kEoBBaseMenuYesNoStrings,
+
+	kEoBBaseSpellLevelsMage,
+	kEoBBaseSpellLevelsCleric,
+	kEoBBaseNumSpellsCleric,
+	kEoBBaseNumSpellsWisAdj,
+	kEoBBaseNumSpellsPal,
+	kEoBBaseNumSpellsMage,
+
+	kEoBBaseCharGuiStringsHp,
+	kEoBBaseCharGuiStringsWp1,
+	kEoBBaseCharGuiStringsWp2,
+	kEoBBaseCharGuiStringsWr,
+	kEoBBaseCharGuiStringsSt1,
+	kEoBBaseCharGuiStringsSt2,
+	kEoBBaseCharGuiStringsIn,
+
+	kEoBBaseCharStatusStrings7,
+	kEoBBaseCharStatusStrings81,
+	kEoBBaseCharStatusStrings82,
+	kEoBBaseCharStatusStrings9,
+	kEoBBaseCharStatusStrings12,
+	kEoBBaseCharStatusStrings131,
+	kEoBBaseCharStatusStrings132,
+
+	kEoBBaseLevelGainStrings,
+	kEoBBaseExperienceTable0,
+	kEoBBaseExperienceTable1,
+	kEoBBaseExperienceTable2,
+	kEoBBaseExperienceTable3,
+	kEoBBaseExperienceTable4,
+
+	kEoBBaseClassModifierFlags,
+
+	kEoBBaseMonsterStepTable01,
+	kEoBBaseMonsterStepTable02,
+	kEoBBaseMonsterStepTable1,
+	kEoBBaseMonsterStepTable2,
+	kEoBBaseMonsterStepTable3,
+	kEoBBaseMonsterCloseAttPosTable1,
+	kEoBBaseMonsterCloseAttPosTable21,
+	kEoBBaseMonsterCloseAttPosTable22,
+	kEoBBaseMonsterCloseAttUnkTable,
+	kEoBBaseMonsterCloseAttChkTable1,
+	kEoBBaseMonsterCloseAttChkTable2,
+	kEoBBaseMonsterCloseAttDstTable1,
+	kEoBBaseMonsterCloseAttDstTable2,
+
+	kEoBBaseMonsterProximityTable,
+	kEoBBaseFindBlockMonstersTable,
+	kEoBBaseMonsterDirChangeTable,
+	kEoBBaseMonsterDistAttStrings,
+
+	kEoBBaseEncodeMonsterDefs,
+	kEoBBaseNpcPresets,
+
+	kEoBBaseWllFlagPreset,
+	kEoBBaseDscShapeCoords,
+
+	kEoBBaseDscDoorScaleOffs,
+	kEoBBaseDscDoorScaleMult1,
+	kEoBBaseDscDoorScaleMult2,
+	kEoBBaseDscDoorScaleMult3,
+	kEoBBaseDscDoorScaleMult4,
+	kEoBBaseDscDoorScaleMult5,
+	kEoBBaseDscDoorScaleMult6,
+	kEoBBaseDscDoorType5Offs,
+	kEoBBaseDscDoorXE,
+	kEoBBaseDscDoorY1,
+	kEoBBaseDscDoorY3,
+	kEoBBaseDscDoorY4,
+	kEoBBaseDscDoorY5,
+	kEoBBaseDscDoorY6,
+	kEoBBaseDscDoorY7,
+	kEoBBaseDscDoorCoordsExt,
+
+	kEoBBaseDscItemPosIndex,
+	kEoBBaseDscItemShpX,
+	kEoBBaseDscItemScaleIndex,
+	kEoBBaseDscItemTileIndex,
+	kEoBBaseDscItemShapeMap,
+
+	kEoBBaseDscMonsterFrmOffsTbl1,
+	kEoBBaseDscMonsterFrmOffsTbl2,
+
+	kEoBBaseInvSlotX,
+	kEoBBaseInvSlotY,
+	kEoBBaseSlotValidationFlags,
+
+	kEoBBaseProjectileWeaponTypes,
+	kEoBBaseWandTypes,
+
+	kEoBBaseDrawObjPosIndex,
+	kEoBBaseFlightObjFlipIndex,
+	kEoBBaseFlightObjShpMap,
+	kEoBBaseFlightObjSclIndex,
+
+	kEoBBaseDscTelptrShpCoords,
+
+	kEoBBasePortalSeqData,
+	kEoBBaseManDef,
+	kEoBBaseManWord,
+	kEoBBaseManPrompt,
+
+	kEoBBaseBookNumbers,
+	kEoBBaseMageSpellsList,
+	kEoBBaseClericSpellsList,
+	kEoBBaseSpellNames,
+	kEoBBaseMagicStrings1,
+	kEoBBaseMagicStrings2,
+	kEoBBaseMagicStrings3,
+	kEoBBaseMagicStrings4,
+	kEoBBaseMagicStrings6,
+	kEoBBaseMagicStrings7,
+	kEoBBaseMagicStrings8,
+
+	kEoBBaseExpObjectTlMode,
+	kEoBBaseExpObjectTblIndex,
+	kEoBBaseExpObjectShpStart,
+	kEoBBaseExpObjectTbl1,
+	kEoBBaseExpObjectTbl2,
+	kEoBBaseExpObjectTbl3,
+	kEoBBaseExpObjectY,
+
+	kEoBBaseSparkDefSteps,
+	kEoBBaseSparkDefSubSteps,
+	kEoBBaseSparkDefShift,
+	kEoBBaseSparkDefAdd,
+	kEoBBaseSparkDefX,
+	kEoBBaseSparkDefY,
+	kEoBBaseSparkOfFlags1,
+	kEoBBaseSparkOfFlags2,
+	kEoBBaseSparkOfShift,
+	kEoBBaseSparkOfX,
+	kEoBBaseSparkOfY,
+
+	kEoBBaseSpellProperties,
+	kEoBBaseMagicFlightProps,
+	kEoBBaseTurnUndeadEffect,
+	kEoBBaseBurningHandsDest,
+	kEoBBaseConeOfColdDest1,
+	kEoBBaseConeOfColdDest2,
+	kEoBBaseConeOfColdDest3,
+	kEoBBaseConeOfColdDest4,
+	kEoBBaseConeOfColdGfxTbl,
+
+	kEoB1MainMenuStrings,
+	kEoB1BonusStrings,
+
+	kEoB1IntroFilesOpening,
+	kEoB1IntroFilesTower,
+	kEoB1IntroFilesOrb,
+	kEoB1IntroFilesWdEntry,
+	kEoB1IntroFilesKing,
+	kEoB1IntroFilesHands,
+	kEoB1IntroFilesWdExit,
+	kEoB1IntroFilesTunnel,
+	kEoB1IntroOpeningFrmDelay,
+	kEoB1IntroWdEncodeX,
+	kEoB1IntroWdEncodeY,
+	kEoB1IntroWdEncodeWH,
+	kEoB1IntroWdDsX,
+	kEoB1IntroWdDsY,
+	kEoB1IntroTvlX1,
+	kEoB1IntroTvlY1,
+	kEoB1IntroTvlX2,
+	kEoB1IntroTvlY2,
+	kEoB1IntroTvlW,
+	kEoB1IntroTvlH,
+
+	kEoB1DoorShapeDefs,
+	kEoB1DoorSwitchShapeDefs,
+	kEoB1DoorSwitchCoords,
+	kEoB1MonsterProperties,
+
+	kEoB1EnemyMageSpellList,
+	kEoB1EnemyMageSfx,
+	kEoB1BeholderSpellList,
+	kEoB1BeholderSfx,
+
+	kEoB1TurnUndeadString,
+
+	kEoB1NpcShpData,
+	kEoB1NpcSubShpIndex1,
+	kEoB1NpcSubShpIndex2,
+	kEoB1NpcSubShpY,
+	kEoB1Npc0Strings,
+	kEoB1Npc11Strings,
+	kEoB1Npc12Strings,
+	kEoB1Npc21Strings,
+	kEoB1Npc22Strings,
+	kEoB1Npc31Strings,
+	kEoB1Npc32Strings,
+	kEoB1Npc4Strings,
+	kEoB1Npc5Strings,
+	kEoB1Npc6Strings,
+	kEoB1Npc7Strings,
+
+	kEoB2MainMenuStrings,
+	kEoB2TransferConvertTable,
+	kEoB2TransferExpTable,
+
+	kEoB2IntroStrings,
+	kEoB2IntroCPSFiles,
+	kEoB2IntroSeqData00,
+ 	kEoB2IntroSeqData01,
+ 	kEoB2IntroSeqData02,
+ 	kEoB2IntroSeqData03,
+ 	kEoB2IntroSeqData04,
+ 	kEoB2IntroSeqData05,
+ 	kEoB2IntroSeqData06,
+ 	kEoB2IntroSeqData07,
+ 	kEoB2IntroSeqData08,
+ 	kEoB2IntroSeqData09,
+ 	kEoB2IntroSeqData10,
+ 	kEoB2IntroSeqData11,
+ 	kEoB2IntroSeqData12,
+ 	kEoB2IntroSeqData13,
+ 	kEoB2IntroSeqData14,
+ 	kEoB2IntroSeqData15,
+ 	kEoB2IntroSeqData16,
+ 	kEoB2IntroSeqData17,
+ 	kEoB2IntroSeqData18,
+ 	kEoB2IntroSeqData19,
+ 	kEoB2IntroSeqData20,
+ 	kEoB2IntroSeqData21,
+ 	kEoB2IntroSeqData22,
+ 	kEoB2IntroSeqData23,
+ 	kEoB2IntroSeqData24,
+ 	kEoB2IntroSeqData25,
+ 	kEoB2IntroSeqData26,
+ 	kEoB2IntroSeqData27,
+ 	kEoB2IntroSeqData28,
+ 	kEoB2IntroSeqData29,
+ 	kEoB2IntroSeqData30,
+ 	kEoB2IntroSeqData31,
+ 	kEoB2IntroSeqData32,
+ 	kEoB2IntroSeqData33,
+ 	kEoB2IntroSeqData34,
+ 	kEoB2IntroSeqData35,
+ 	kEoB2IntroSeqData36,
+ 	kEoB2IntroSeqData37,
+ 	kEoB2IntroSeqData38,
+ 	kEoB2IntroSeqData39,
+ 	kEoB2IntroSeqData40,
+ 	kEoB2IntroSeqData41,
+ 	kEoB2IntroSeqData42,
+ 	kEoB2IntroSeqData43,
+	kEoB2IntroShapes00,
+ 	kEoB2IntroShapes01,
+ 	kEoB2IntroShapes04,
+ 	kEoB2IntroShapes07,
+
+	kEoB2FinaleStrings,
+	kEoB2CreditsData,
+	kEoB2FinaleCPSFiles,
+	kEoB2FinaleSeqData00,
+ 	kEoB2FinaleSeqData01,
+ 	kEoB2FinaleSeqData02,
+ 	kEoB2FinaleSeqData03,
+ 	kEoB2FinaleSeqData04,
+ 	kEoB2FinaleSeqData05,
+ 	kEoB2FinaleSeqData06,
+ 	kEoB2FinaleSeqData07,
+ 	kEoB2FinaleSeqData08,
+ 	kEoB2FinaleSeqData09,
+ 	kEoB2FinaleSeqData10,
+ 	kEoB2FinaleSeqData11,
+ 	kEoB2FinaleSeqData12,
+ 	kEoB2FinaleSeqData13,
+ 	kEoB2FinaleSeqData14,
+ 	kEoB2FinaleSeqData15,
+ 	kEoB2FinaleSeqData16,
+ 	kEoB2FinaleSeqData17,
+ 	kEoB2FinaleSeqData18,
+ 	kEoB2FinaleSeqData19,
+ 	kEoB2FinaleSeqData20,
+	kEoB2FinaleShapes00,
+ 	kEoB2FinaleShapes03,
+ 	kEoB2FinaleShapes07,
+ 	kEoB2FinaleShapes09,
+ 	kEoB2FinaleShapes10,
+
+	kEoB2NpcShapeData,
+	kEoB2Npc1Strings,
+	kEoB2Npc2Strings,
+	kEoB2MonsterDustStrings,
+
+	kEoB2DreamSteps,
+	kEoB2KheldranStrings,
+	kEoB2HornStrings,
+	kEoB2HornSounds,
+
+	kEoB2WallOfForceDsX,
+	kEoB2WallOfForceDsY,
+	kEoB2WallOfForceNumW,
+	kEoB2WallOfForceNumH,
+	kEoB2WallOfForceShpId,
+
+	kLoLIngamePakFiles,
+	kLoLCharacterDefs,
+	kLoLIngameSfxFiles,
+	kLoLIngameSfxIndex,
+	kLoLMusicTrackMap,
+	kLoLIngameGMSfxIndex,
+	kLoLIngameMT32SfxIndex,
+	kLoLIngamePcSpkSfxIndex,
+	kLoLSpellProperties,
+	kLoLGameShapeMap,
+	kLoLSceneItemOffs,
+	kLoLCharInvIndex,
+	kLoLCharInvDefs,
+	kLoLCharDefsMan,
+	kLoLCharDefsWoman,
+	kLoLCharDefsKieran,
+	kLoLCharDefsAkshel,
+	kLoLExpRequirements,
+	kLoLMonsterModifiers,
+	kLoLMonsterShiftOffsets,
+	kLoLMonsterDirFlags,
+	kLoLMonsterScaleY,
+	kLoLMonsterScaleX,
+	kLoLMonsterScaleWH,
+	kLoLFlyingObjectShp,
+	kLoLInventoryDesc,
+
+	kLoLLevelShpList,
+	kLoLLevelDatList,
+	kLoLCompassDefs,
+	kLoLItemPrices,
+	kLoLStashSetup,
+
+	kLoLDscWalls,
+	kLoLDscOvlMap,
+	kLoLDscScaleWidthData,
+	kLoLDscScaleHeightData,
+	kLoLBaseDscY,
+
+	kLoLDscDoorScale,
+	kLoLDscDoor4,
+	kLoLDscDoorX,
+	kLoLDscDoorY,
+	kLoLDscOvlIndex,
+
+	kLoLScrollXTop,
+	kLoLScrollYTop,
+	kLoLScrollXBottom,
+	kLoLScrollYBottom,
+
+	kLoLButtonDefs,
+	kLoLButtonList1,
+	kLoLButtonList2,
+	kLoLButtonList3,
+	kLoLButtonList4,
+	kLoLButtonList5,
+	kLoLButtonList6,
+	kLoLButtonList7,
+	kLoLButtonList8,
+
+	kLoLLegendData,
+	kLoLMapCursorOvl,
+	kLoLMapStringId,
+
+	kLoLSpellbookAnim,
+	kLoLSpellbookCoords,
+	kLoLHealShapeFrames,
+	kLoLLightningDefs,
+	kLoLFireballCoords,
+
+	kLoLCredits,
+
+	kLoLHistory,
 #endif // ENABLE_EOB || ENABLE_LOL
 
 	kMaxResIDs
@@ -751,9 +751,9 @@ public:
 	const LoLButtonDef *loadButtonDefs(int id, int &entries);
 #endif // ENABLE_LOL
 #ifdef ENABLE_EOB
-	const EobSequenceStep *loadEob2SeqData(int id, int &entries);
-	const EobShapeDef *loadEob2ShapeData(int id, int &entries);
-	const EobCharacter *loadEobNpcData(int id, int &entries);
+	const EoBSequenceStep *loadEoB2SeqData(int id, int &entries);
+	const EoBShapeDef *loadEoB2ShapeData(int id, int &entries);
+	const EoBCharacter *loadEoBNpcData(int id, int &entries);
 #endif // ENABLE_EOB
 
 	// use '-1' to prefetch/unload all ids
@@ -794,9 +794,9 @@ private:
 	bool loadButtonDefs(Common::SeekableReadStream &stream, void *&ptr, int &size);
 #endif // ENABLE_LOL
 #ifdef ENABLE_EOB
-	bool loadEob2SeqData(Common::SeekableReadStream &stream, void *&ptr, int &size);
-	bool loadEob2ShapeData(Common::SeekableReadStream &stream, void *&ptr, int &size);
-	bool loadEobNpcData(Common::SeekableReadStream &stream, void *&ptr, int &size);
+	bool loadEoB2SeqData(Common::SeekableReadStream &stream, void *&ptr, int &size);
+	bool loadEoB2ShapeData(Common::SeekableReadStream &stream, void *&ptr, int &size);
+	bool loadEoBNpcData(Common::SeekableReadStream &stream, void *&ptr, int &size);
 #endif // ENABLE_EOB
 
 	void freeDummy(void *&ptr, int &size);
@@ -820,9 +820,9 @@ private:
 	void freeButtonDefs(void *&ptr, int &size);
 #endif // ENABLE_LOL
 #ifdef ENABLE_EOB
-	void freeEob2SeqData(void *&ptr, int &size);
-	void freeEob2ShapeData(void *&ptr, int &size);
-	void freeEobNpcData(void *&ptr, int &size);
+	void freeEoB2SeqData(void *&ptr, int &size);
+	void freeEoB2ShapeData(void *&ptr, int &size);
+	void freeEoBNpcData(void *&ptr, int &size);
 #endif // ENABLE_EOB
 
 	enum ResTypes {
@@ -836,17 +836,17 @@ private:
 		k2ShpAnimDataV1 = 6,
 		k2ShpAnimDataV2 = 7,
 
-		kLolCharData = 8,
-		kLolSpellData = 9,
-		kLolCompassData = 10,
-		kLolFlightShpData = 11,
-		kLolButtonData = 12,
-		kLolRawDataBe16 = 13,
-		kLolRawDataBe32 = 14,
-
-		kEob2SequenceData = 15,
-		kEob2ShapeData = 16,
-		kEobNpcData = 17
+		kLoLCharData = 8,
+		kLoLSpellData = 9,
+		kLoLCompassData = 10,
+		kLoLFlightShpData = 11,
+		kLoLButtonData = 12,
+		kLoLRawDataBe16 = 13,
+		kLoLRawDataBe32 = 14,
+
+		kEoB2SequenceData = 15,
+		kEoB2ShapeData = 16,
+		kEoBNpcData = 17
 	};
 
 	struct FileType {