From ee5621137fa3a0f668738159450b03fea68a93e3 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Thu, 27 Jul 2006 20:30:51 +0000
Subject: - renaming all opcodes from cmd_* to c1_* - changing ScriptHelper
 functions so it will be useable for kyra2 and kyra3 too - unbreaking
 savegames (increasing the VERSION number since the game flags table got
 resized to be useable for kyra3)

svn-id: r23612
---
 engines/kyra/kyra.cpp      |  14 +-
 engines/kyra/kyra.h        | 319 +++++++++++-----------
 engines/kyra/saveload.cpp  |   5 +-
 engines/kyra/scene.cpp     |   2 +-
 engines/kyra/script.cpp    |  11 +-
 engines/kyra/script.h      |   6 +-
 engines/kyra/script_v1.cpp | 640 ++++++++++++++++++++++-----------------------
 engines/kyra/staticres.cpp | 314 +++++++++++-----------
 8 files changed, 658 insertions(+), 653 deletions(-)

diff --git a/engines/kyra/kyra.cpp b/engines/kyra/kyra.cpp
index 299f93c5b4..6ad8c4f4f8 100644
--- a/engines/kyra/kyra.cpp
+++ b/engines/kyra/kyra.cpp
@@ -479,7 +479,7 @@ void KyraEngine::startup() {
 	_animator->initAnimStateList();
 	setCharactersInDefaultScene();
 
-	if (!_scriptInterpreter->loadScript("_STARTUP.EMC", _npcScriptData, _opcodeTable, _opcodeTableSize, 0)) {
+	if (!_scriptInterpreter->loadScript("_STARTUP.EMC", _npcScriptData, 0)) {
 		error("Could not load \"_STARTUP.EMC\" script");
 	}
 	_scriptInterpreter->initScript(_scriptMain, _npcScriptData);
@@ -491,7 +491,7 @@ void KyraEngine::startup() {
 	}
 	
 	_scriptInterpreter->unloadScript(_npcScriptData);
-	if (!_scriptInterpreter->loadScript("_NPC.EMC", _npcScriptData, _opcodeTable, _opcodeTableSize, 0)) {
+	if (!_scriptInterpreter->loadScript("_NPC.EMC", _npcScriptData, 0)) {
 		error("Could not load \"_NPC.EMC\" script");
 	}
 	
@@ -1113,4 +1113,14 @@ void KyraEngine::runNpcScript(int func) {
 	}
 }
 
+int KyraEngine::runOpcode(ScriptState *script, uint8 opcode) {
+	debugC(9, kDebugLevelMain | kDebugLevelScript, "KyraEngine::runOpcode(%p, %d)", (void *)script, opcode);
+	assert(opcode < _opcodeTableSize);
+	if (_opcodeTable[opcode] == &KyraEngine::c1_dummy)
+		warning("calling unimplemented opcode(0x%.02X)", opcode);
+	int val = (this->*_opcodeTable[opcode])(script);
+	assert(script);
+	return val;
+}
+
 } // End of namespace Kyra
diff --git a/engines/kyra/kyra.h b/engines/kyra/kyra.h
index d015c5e708..70182400eb 100644
--- a/engines/kyra/kyra.h
+++ b/engines/kyra/kyra.h
@@ -70,7 +70,7 @@ enum {
 // TODO: this is just the start of makeing the debug output of the kyra engine a bit more useable
 // in the future we maybe merge some flags  and/or create new ones
 enum kDebugLevels {
-	kDebugLevelScriptFuncs = 1 << 0,		// prints debug output of cmd_* functions
+	kDebugLevelScriptFuncs = 1 << 0,		// prints debug output of c1_* functions
 	kDebugLevelScript = 1 << 1,				// prints debug output of "ScriptHelper" functions
 	kDebugLevelSprites = 1 << 2,			// prints debug output of "Sprites" functions
 	kDebugLevelScreen = 1 << 3,				// prints debug output of "Screen" functions
@@ -330,164 +330,165 @@ public:
 	int mouseX() { return _mouseX; }
 	int mouseY() { return _mouseY; }
 	
-	// all opcode procs (maybe that is somehow useless atm)
-	int cmd_magicInMouseItem(ScriptState *script);
-	int cmd_characterSays(ScriptState *script);
-	int cmd_pauseTicks(ScriptState *script);
-	int cmd_drawSceneAnimShape(ScriptState *script);
-	int cmd_queryGameFlag(ScriptState *script);
-	int cmd_setGameFlag(ScriptState *script);
-	int cmd_resetGameFlag(ScriptState *script);
-	int cmd_runNPCScript(ScriptState *script);
-	int cmd_setSpecialExitList(ScriptState *script);
-	int cmd_blockInWalkableRegion(ScriptState *script);
-	int cmd_blockOutWalkableRegion(ScriptState *script);
-	int cmd_walkPlayerToPoint(ScriptState *script);
-	int cmd_dropItemInScene(ScriptState *script);
-	int cmd_drawAnimShapeIntoScene(ScriptState *script);
-	int cmd_createMouseItem(ScriptState *script);
-	int cmd_savePageToDisk(ScriptState *script);
-	int cmd_sceneAnimOn(ScriptState *script);
-	int cmd_sceneAnimOff(ScriptState *script);
-	int cmd_getElapsedSeconds(ScriptState *script);
-	int cmd_mouseIsPointer(ScriptState *script);
-	int cmd_destroyMouseItem(ScriptState *script);
-	int cmd_runSceneAnimUntilDone(ScriptState *script);
-	int cmd_fadeSpecialPalette(ScriptState *script);
-	int cmd_playAdlibSound(ScriptState *script);
-	int cmd_playAdlibScore(ScriptState *script);
-	int cmd_phaseInSameScene(ScriptState *script);
-	int cmd_setScenePhasingFlag(ScriptState *script);
-	int cmd_resetScenePhasingFlag(ScriptState *script);
-	int cmd_queryScenePhasingFlag(ScriptState *script);
-	int cmd_sceneToDirection(ScriptState *script);
-	int cmd_setBirthstoneGem(ScriptState *script);
-	int cmd_placeItemInGenericMapScene(ScriptState *script);
-	int cmd_setBrandonStatusBit(ScriptState *script);
-	int cmd_pauseSeconds(ScriptState *script);
-	int cmd_getCharactersLocation(ScriptState *script);
-	int cmd_runNPCSubscript(ScriptState *script);
-	int cmd_magicOutMouseItem(ScriptState *script);
-	int cmd_internalAnimOn(ScriptState *script);
-	int cmd_forceBrandonToNormal(ScriptState *script);
-	int cmd_poisonDeathNow(ScriptState *script);
-	int cmd_setScaleMode(ScriptState *script);
-	int cmd_openWSAFile(ScriptState *script);
-	int cmd_closeWSAFile(ScriptState *script);
-	int cmd_runWSAFromBeginningToEnd(ScriptState *script);
-	int cmd_displayWSAFrame(ScriptState *script);
-	int cmd_enterNewScene(ScriptState *script);
-	int cmd_setSpecialEnterXAndY(ScriptState *script);
-	int cmd_runWSAFrames(ScriptState *script);
-	int cmd_popBrandonIntoScene(ScriptState *script);
-	int cmd_restoreAllObjectBackgrounds(ScriptState *script);
-	int cmd_setCustomPaletteRange(ScriptState *script);
-	int cmd_loadPageFromDisk(ScriptState *script);
-	int cmd_customPrintTalkString(ScriptState *script);
-	int cmd_restoreCustomPrintBackground(ScriptState *script);
-	int cmd_hideMouse(ScriptState *script);
-	int cmd_showMouse(ScriptState *script);
-	int cmd_getCharacterX(ScriptState *script);
-	int cmd_getCharacterY(ScriptState *script);
-	int cmd_changeCharactersFacing(ScriptState *script);
-	int cmd_copyWSARegion(ScriptState *script);
-	int cmd_printText(ScriptState *script);
-	int cmd_random(ScriptState *script);
-	int cmd_loadSoundFile(ScriptState *script);
-	int cmd_displayWSAFrameOnHidPage(ScriptState *script);
-	int cmd_displayWSASequentialFrames(ScriptState *script);
-	int cmd_drawCharacterStanding(ScriptState *script);
-	int cmd_internalAnimOff(ScriptState *script);
-	int cmd_changeCharactersXAndY(ScriptState *script);
-	int cmd_clearSceneAnimatorBeacon(ScriptState *script);
-	int cmd_querySceneAnimatorBeacon(ScriptState *script);
-	int cmd_refreshSceneAnimator(ScriptState *script);
-	int cmd_placeItemInOffScene(ScriptState *script);
-	int cmd_wipeDownMouseItem(ScriptState *script);
-	int cmd_placeCharacterInOtherScene(ScriptState *script);
-	int cmd_getKey(ScriptState *script);
-	int cmd_specificItemInInventory(ScriptState *script);
-	int cmd_popMobileNPCIntoScene(ScriptState *script);
-	int cmd_mobileCharacterInScene(ScriptState *script);
-	int cmd_hideMobileCharacter(ScriptState *script);
-	int cmd_unhideMobileCharacter(ScriptState *script);
-	int cmd_setCharactersLocation(ScriptState *script);
-	int cmd_walkCharacterToPoint(ScriptState *script);
-	int cmd_specialEventDisplayBrynnsNote(ScriptState *script);
-	int cmd_specialEventRemoveBrynnsNote(ScriptState *script);
-	int cmd_setLogicPage(ScriptState *script);
-	int cmd_fatPrint(ScriptState *script);
-	int cmd_preserveAllObjectBackgrounds(ScriptState *script);
-	int cmd_updateSceneAnimations(ScriptState *script);
-	int cmd_sceneAnimationActive(ScriptState *script);
-	int cmd_setCharactersMovementDelay(ScriptState *script);
-	int cmd_getCharactersFacing(ScriptState *script);
-	int cmd_bkgdScrollSceneAndMasksRight(ScriptState *script);
-	int cmd_dispelMagicAnimation(ScriptState *script);
-	int cmd_findBrightestFireberry(ScriptState *script);
-	int cmd_setFireberryGlowPalette(ScriptState *script);
-	int cmd_setDeathHandlerFlag(ScriptState *script);
-	int cmd_drinkPotionAnimation(ScriptState *script);
-	int cmd_makeAmuletAppear(ScriptState *script);
-	int cmd_drawItemShapeIntoScene(ScriptState *script);
-	int cmd_setCharactersCurrentFrame(ScriptState *script);
-	int cmd_waitForConfirmationMouseClick(ScriptState *script);
-	int cmd_pageFlip(ScriptState *script);
-	int cmd_setSceneFile(ScriptState *script);
-	int cmd_getItemInMarbleVase(ScriptState *script);
-	int cmd_setItemInMarbleVase(ScriptState *script);
-	int cmd_addItemToInventory(ScriptState *script);
-	int cmd_intPrint(ScriptState *script);
-	int cmd_shakeScreen(ScriptState *script);
-	int cmd_createAmuletJewel(ScriptState *script);
-	int cmd_setSceneAnimCurrXY(ScriptState *script);
-	int cmd_poisonBrandonAndRemaps(ScriptState *script);
-	int cmd_fillFlaskWithWater(ScriptState *script);
-	int cmd_getCharactersMovementDelay(ScriptState *script);
-	int cmd_getBirthstoneGem(ScriptState *script);
-	int cmd_queryBrandonStatusBit(ScriptState *script);
-	int cmd_playFluteAnimation(ScriptState *script);
-	int cmd_playWinterScrollSequence(ScriptState *script);
-	int cmd_getIdolGem(ScriptState *script);
-	int cmd_setIdolGem(ScriptState *script);
-	int cmd_totalItemsInScene(ScriptState *script);
-	int cmd_restoreBrandonsMovementDelay(ScriptState *script);
-	int cmd_setMousePos(ScriptState *script);
-	int cmd_getMouseState(ScriptState *script);
-	int cmd_setEntranceMouseCursorTrack(ScriptState *script);
-	int cmd_itemAppearsOnGround(ScriptState *script);
-	int cmd_setNoDrawShapesFlag(ScriptState *script);
-	int cmd_fadeEntirePalette(ScriptState *script);
-	int cmd_itemOnGroundHere(ScriptState *script);
-	int cmd_queryCauldronState(ScriptState *script);
-	int cmd_setCauldronState(ScriptState *script);
-	int cmd_queryCrystalState(ScriptState *script);
-	int cmd_setCrystalState(ScriptState *script);
-	int cmd_setPaletteRange(ScriptState *script);
-	int cmd_shrinkBrandonDown(ScriptState *script);
-	int cmd_growBrandonUp(ScriptState *script);
-	int cmd_setBrandonScaleXAndY(ScriptState *script);
-	int cmd_resetScaleMode(ScriptState *script);
-	int cmd_getScaleDepthTableValue(ScriptState *script);
-	int cmd_setScaleDepthTableValue(ScriptState *script);
-	int cmd_message(ScriptState *script);
-	int cmd_checkClickOnNPC(ScriptState *script);
-	int cmd_getFoyerItem(ScriptState *script);
-	int cmd_setFoyerItem(ScriptState *script);
-	int cmd_setNoItemDropRegion(ScriptState *script);
-	int cmd_walkMalcolmOn(ScriptState *script);
-	int cmd_passiveProtection(ScriptState *script);
-	int cmd_setPlayingLoop(ScriptState *script);
-	int cmd_brandonToStoneSequence(ScriptState *script);
-	int cmd_brandonHealingSequence(ScriptState *script);
-	int cmd_protectCommandLine(ScriptState *script);
-	int cmd_pauseMusicSeconds(ScriptState *script);
-	int cmd_resetMaskRegion(ScriptState *script);
-	int cmd_setPaletteChangeFlag(ScriptState *script);
-	int cmd_fillRect(ScriptState *script);
-	int cmd_dummy(ScriptState *script);
-	int cmd_vocUnload(ScriptState *script);
-	int cmd_vocLoad(ScriptState *script);
+	virtual int runOpcode(ScriptState *script, uint8 opcode);
+protected:
+	int c1_magicInMouseItem(ScriptState *script);
+	int c1_characterSays(ScriptState *script);
+	int c1_pauseTicks(ScriptState *script);
+	int c1_drawSceneAnimShape(ScriptState *script);
+	int c1_queryGameFlag(ScriptState *script);
+	int c1_setGameFlag(ScriptState *script);
+	int c1_resetGameFlag(ScriptState *script);
+	int c1_runNPCScript(ScriptState *script);
+	int c1_setSpecialExitList(ScriptState *script);
+	int c1_blockInWalkableRegion(ScriptState *script);
+	int c1_blockOutWalkableRegion(ScriptState *script);
+	int c1_walkPlayerToPoint(ScriptState *script);
+	int c1_dropItemInScene(ScriptState *script);
+	int c1_drawAnimShapeIntoScene(ScriptState *script);
+	int c1_createMouseItem(ScriptState *script);
+	int c1_savePageToDisk(ScriptState *script);
+	int c1_sceneAnimOn(ScriptState *script);
+	int c1_sceneAnimOff(ScriptState *script);
+	int c1_getElapsedSeconds(ScriptState *script);
+	int c1_mouseIsPointer(ScriptState *script);
+	int c1_destroyMouseItem(ScriptState *script);
+	int c1_runSceneAnimUntilDone(ScriptState *script);
+	int c1_fadeSpecialPalette(ScriptState *script);
+	int c1_playAdlibSound(ScriptState *script);
+	int c1_playAdlibScore(ScriptState *script);
+	int c1_phaseInSameScene(ScriptState *script);
+	int c1_setScenePhasingFlag(ScriptState *script);
+	int c1_resetScenePhasingFlag(ScriptState *script);
+	int c1_queryScenePhasingFlag(ScriptState *script);
+	int c1_sceneToDirection(ScriptState *script);
+	int c1_setBirthstoneGem(ScriptState *script);
+	int c1_placeItemInGenericMapScene(ScriptState *script);
+	int c1_setBrandonStatusBit(ScriptState *script);
+	int c1_pauseSeconds(ScriptState *script);
+	int c1_getCharactersLocation(ScriptState *script);
+	int c1_runNPCSubscript(ScriptState *script);
+	int c1_magicOutMouseItem(ScriptState *script);
+	int c1_internalAnimOn(ScriptState *script);
+	int c1_forceBrandonToNormal(ScriptState *script);
+	int c1_poisonDeathNow(ScriptState *script);
+	int c1_setScaleMode(ScriptState *script);
+	int c1_openWSAFile(ScriptState *script);
+	int c1_closeWSAFile(ScriptState *script);
+	int c1_runWSAFromBeginningToEnd(ScriptState *script);
+	int c1_displayWSAFrame(ScriptState *script);
+	int c1_enterNewScene(ScriptState *script);
+	int c1_setSpecialEnterXAndY(ScriptState *script);
+	int c1_runWSAFrames(ScriptState *script);
+	int c1_popBrandonIntoScene(ScriptState *script);
+	int c1_restoreAllObjectBackgrounds(ScriptState *script);
+	int c1_setCustomPaletteRange(ScriptState *script);
+	int c1_loadPageFromDisk(ScriptState *script);
+	int c1_customPrintTalkString(ScriptState *script);
+	int c1_restoreCustomPrintBackground(ScriptState *script);
+	int c1_hideMouse(ScriptState *script);
+	int c1_showMouse(ScriptState *script);
+	int c1_getCharacterX(ScriptState *script);
+	int c1_getCharacterY(ScriptState *script);
+	int c1_changeCharactersFacing(ScriptState *script);
+	int c1_copyWSARegion(ScriptState *script);
+	int c1_printText(ScriptState *script);
+	int c1_random(ScriptState *script);
+	int c1_loadSoundFile(ScriptState *script);
+	int c1_displayWSAFrameOnHidPage(ScriptState *script);
+	int c1_displayWSASequentialFrames(ScriptState *script);
+	int c1_drawCharacterStanding(ScriptState *script);
+	int c1_internalAnimOff(ScriptState *script);
+	int c1_changeCharactersXAndY(ScriptState *script);
+	int c1_clearSceneAnimatorBeacon(ScriptState *script);
+	int c1_querySceneAnimatorBeacon(ScriptState *script);
+	int c1_refreshSceneAnimator(ScriptState *script);
+	int c1_placeItemInOffScene(ScriptState *script);
+	int c1_wipeDownMouseItem(ScriptState *script);
+	int c1_placeCharacterInOtherScene(ScriptState *script);
+	int c1_getKey(ScriptState *script);
+	int c1_specificItemInInventory(ScriptState *script);
+	int c1_popMobileNPCIntoScene(ScriptState *script);
+	int c1_mobileCharacterInScene(ScriptState *script);
+	int c1_hideMobileCharacter(ScriptState *script);
+	int c1_unhideMobileCharacter(ScriptState *script);
+	int c1_setCharactersLocation(ScriptState *script);
+	int c1_walkCharacterToPoint(ScriptState *script);
+	int c1_specialEventDisplayBrynnsNote(ScriptState *script);
+	int c1_specialEventRemoveBrynnsNote(ScriptState *script);
+	int c1_setLogicPage(ScriptState *script);
+	int c1_fatPrint(ScriptState *script);
+	int c1_preserveAllObjectBackgrounds(ScriptState *script);
+	int c1_updateSceneAnimations(ScriptState *script);
+	int c1_sceneAnimationActive(ScriptState *script);
+	int c1_setCharactersMovementDelay(ScriptState *script);
+	int c1_getCharactersFacing(ScriptState *script);
+	int c1_bkgdScrollSceneAndMasksRight(ScriptState *script);
+	int c1_dispelMagicAnimation(ScriptState *script);
+	int c1_findBrightestFireberry(ScriptState *script);
+	int c1_setFireberryGlowPalette(ScriptState *script);
+	int c1_setDeathHandlerFlag(ScriptState *script);
+	int c1_drinkPotionAnimation(ScriptState *script);
+	int c1_makeAmuletAppear(ScriptState *script);
+	int c1_drawItemShapeIntoScene(ScriptState *script);
+	int c1_setCharactersCurrentFrame(ScriptState *script);
+	int c1_waitForConfirmationMouseClick(ScriptState *script);
+	int c1_pageFlip(ScriptState *script);
+	int c1_setSceneFile(ScriptState *script);
+	int c1_getItemInMarbleVase(ScriptState *script);
+	int c1_setItemInMarbleVase(ScriptState *script);
+	int c1_addItemToInventory(ScriptState *script);
+	int c1_intPrint(ScriptState *script);
+	int c1_shakeScreen(ScriptState *script);
+	int c1_createAmuletJewel(ScriptState *script);
+	int c1_setSceneAnimCurrXY(ScriptState *script);
+	int c1_poisonBrandonAndRemaps(ScriptState *script);
+	int c1_fillFlaskWithWater(ScriptState *script);
+	int c1_getCharactersMovementDelay(ScriptState *script);
+	int c1_getBirthstoneGem(ScriptState *script);
+	int c1_queryBrandonStatusBit(ScriptState *script);
+	int c1_playFluteAnimation(ScriptState *script);
+	int c1_playWinterScrollSequence(ScriptState *script);
+	int c1_getIdolGem(ScriptState *script);
+	int c1_setIdolGem(ScriptState *script);
+	int c1_totalItemsInScene(ScriptState *script);
+	int c1_restoreBrandonsMovementDelay(ScriptState *script);
+	int c1_setMousePos(ScriptState *script);
+	int c1_getMouseState(ScriptState *script);
+	int c1_setEntranceMouseCursorTrack(ScriptState *script);
+	int c1_itemAppearsOnGround(ScriptState *script);
+	int c1_setNoDrawShapesFlag(ScriptState *script);
+	int c1_fadeEntirePalette(ScriptState *script);
+	int c1_itemOnGroundHere(ScriptState *script);
+	int c1_queryCauldronState(ScriptState *script);
+	int c1_setCauldronState(ScriptState *script);
+	int c1_queryCrystalState(ScriptState *script);
+	int c1_setCrystalState(ScriptState *script);
+	int c1_setPaletteRange(ScriptState *script);
+	int c1_shrinkBrandonDown(ScriptState *script);
+	int c1_growBrandonUp(ScriptState *script);
+	int c1_setBrandonScaleXAndY(ScriptState *script);
+	int c1_resetScaleMode(ScriptState *script);
+	int c1_getScaleDepthTableValue(ScriptState *script);
+	int c1_setScaleDepthTableValue(ScriptState *script);
+	int c1_message(ScriptState *script);
+	int c1_checkClickOnNPC(ScriptState *script);
+	int c1_getFoyerItem(ScriptState *script);
+	int c1_setFoyerItem(ScriptState *script);
+	int c1_setNoItemDropRegion(ScriptState *script);
+	int c1_walkMalcolmOn(ScriptState *script);
+	int c1_passiveProtection(ScriptState *script);
+	int c1_setPlayingLoop(ScriptState *script);
+	int c1_brandonToStoneSequence(ScriptState *script);
+	int c1_brandonHealingSequence(ScriptState *script);
+	int c1_protectCommandLine(ScriptState *script);
+	int c1_pauseMusicSeconds(ScriptState *script);
+	int c1_resetMaskRegion(ScriptState *script);
+	int c1_setPaletteChangeFlag(ScriptState *script);
+	int c1_fillRect(ScriptState *script);
+	int c1_dummy(ScriptState *script);
+	int c1_vocUnload(ScriptState *script);
+	int c1_vocLoad(ScriptState *script);
 
 protected:
 
diff --git a/engines/kyra/saveload.cpp b/engines/kyra/saveload.cpp
index 13caa36ed9..d34dc66097 100644
--- a/engines/kyra/saveload.cpp
+++ b/engines/kyra/saveload.cpp
@@ -30,7 +30,7 @@
 #include "kyra/screen.h"
 #include "kyra/resource.h"
 
-#define CURRENT_VERSION 5
+#define CURRENT_VERSION 6
 
 namespace Kyra {
 void KyraEngine::loadGame(const char *fileName) {
@@ -145,8 +145,9 @@ void KyraEngine::loadGame(const char *fileName) {
 	}
 	_timerNextRun = 0;
 
+	memset(_flagsTable, 0, sizeof(_flagsTable));
 	uint32 flagsSize = in->readUint32BE();
-	assert(flagsSize == sizeof(_flagsTable));
+	assert(flagsSize <= sizeof(_flagsTable));
 	in->read(_flagsTable, flagsSize);
 
 	for (int i = 0; i < _roomTableSize; ++i) {
diff --git a/engines/kyra/scene.cpp b/engines/kyra/scene.cpp
index f015c12373..d202088f56 100644
--- a/engines/kyra/scene.cpp
+++ b/engines/kyra/scene.cpp
@@ -471,7 +471,7 @@ void KyraEngine::startSceneScript(int brandonAlive) {
 	strcpy(fileNameBuffer, _roomFilenameTable[tableId]);
 	strcat(fileNameBuffer, ".EMC");
 	_scriptInterpreter->unloadScript(_scriptClickData);
-	_scriptInterpreter->loadScript(fileNameBuffer, _scriptClickData, _opcodeTable, _opcodeTableSize, 0);
+	_scriptInterpreter->loadScript(fileNameBuffer, _scriptClickData, 0);
 	_scriptInterpreter->startScript(_scriptClick, 0);
 	_scriptClick->variables[0] = _currentCharacter->sceneId;
 	_scriptClick->variables[7] = brandonAlive;
diff --git a/engines/kyra/script.cpp b/engines/kyra/script.cpp
index 38bfa908a1..5266369a08 100644
--- a/engines/kyra/script.cpp
+++ b/engines/kyra/script.cpp
@@ -71,7 +71,7 @@ ScriptHelper::ScriptHelper(KyraEngine *vm) : _vm(vm) {
 ScriptHelper::~ScriptHelper() {
 }
 
-bool ScriptHelper::loadScript(const char *filename, ScriptData *scriptData, KyraEngine::OpcodeProc *opcodes, int opcodeSize, byte *specialPtr) {
+bool ScriptHelper::loadScript(const char *filename, ScriptData *scriptData, byte *specialPtr) {
 	uint32 size = 0;
 	uint8 *data = _vm->resource()->fileData(filename, &size);	
 	byte *curData = data;
@@ -149,8 +149,6 @@ bool ScriptHelper::loadScript(const char *filename, ScriptData *scriptData, Kyra
 		return false;
 	}
 	scriptData->dataSize = chunkSize / 2;
-	scriptData->opcodes = opcodes;
-	scriptData->opcodeSize = opcodeSize;
 	
 	delete [] data;
 	return true;
@@ -389,12 +387,7 @@ void ScriptHelper::c1_subSP(ScriptState* script) {
 }
 
 void ScriptHelper::c1_execOpcode(ScriptState* script) {
-	assert((uint8)_parameter < script->dataPtr->opcodeSize);
-	if (script->dataPtr->opcodes[(uint8)_parameter] == &KyraEngine::cmd_dummy)
-		warning("calling unimplemented opcode(0x%.02X)", (uint8)_parameter);
-	int val = (_vm->*script->dataPtr->opcodes[(uint8)_parameter])(script);
-	assert(script);
-	script->retValue = val;
+	script->retValue = _vm->runOpcode(script, (uint8)_parameter);
 }
 
 void ScriptHelper::c1_ifNotJmp(ScriptState* script) {
diff --git a/engines/kyra/script.h b/engines/kyra/script.h
index 72bcb0f4ed..51c533537d 100644
--- a/engines/kyra/script.h
+++ b/engines/kyra/script.h
@@ -31,9 +31,9 @@ struct ScriptData {
 	byte *data;
 	byte *ordr;
 	uint16 dataSize;
-	KyraEngine::OpcodeProc *opcodes;
-	int opcodeSize;
 	uint16 mustBeFreed;
+	
+	int opcodeTable;	// indicates which opcode table to use (for Kyra3)
 };
 
 struct ScriptState {
@@ -51,7 +51,7 @@ public:
 	ScriptHelper(KyraEngine *vm);
 	virtual ~ScriptHelper();
 	
-	bool loadScript(const char *filename, ScriptData *data, KyraEngine::OpcodeProc *opcodes, int opcodeSize, byte *specialPtr = 0);
+	bool loadScript(const char *filename, ScriptData *data, byte *specialPtr = 0);
 	void unloadScript(ScriptData *data);
 	
 	void initScript(ScriptState *scriptState, ScriptData *data);
diff --git a/engines/kyra/script_v1.cpp b/engines/kyra/script_v1.cpp
index b315a92b4a..55b74dc8cb 100644
--- a/engines/kyra/script_v1.cpp
+++ b/engines/kyra/script_v1.cpp
@@ -35,16 +35,16 @@ namespace Kyra {
 #define stackPos(x) script->stack[script->sp+x]
 #define stackPosString(x) (char*)&script->dataPtr->text[READ_BE_UINT16(&((uint16 *)script->dataPtr->text)[stackPos(x)])]
 
-int KyraEngine::cmd_magicInMouseItem(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_magicInMouseItem(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
+int KyraEngine::c1_magicInMouseItem(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_magicInMouseItem(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
 	magicInMouseItem(stackPos(0), stackPos(1), -1);
 	return 0;
 }
 
-int KyraEngine::cmd_characterSays(ScriptState *script) {
+int KyraEngine::c1_characterSays(ScriptState *script) {
 	_skipFlag = false;
 	if (_features & GF_TALKIE) {
-		debugC(3, kDebugLevelScriptFuncs, "cmd_characterSays(%p) (%d, '%s', %d, %d)", (const void *)script, stackPos(0), stackPosString(1), stackPos(2), stackPos(3));
+		debugC(3, kDebugLevelScriptFuncs, "c1_characterSays(%p) (%d, '%s', %d, %d)", (const void *)script, stackPos(0), stackPosString(1), stackPos(2), stackPos(3));
 		if (speechEnabled()) {
 			snd_voiceWaitForFinish();
 			snd_playVoiceFile(stackPos(0));
@@ -52,17 +52,17 @@ int KyraEngine::cmd_characterSays(ScriptState *script) {
 		if (textEnabled())
 			characterSays(stackPosString(1), stackPos(2), stackPos(3));
 	} else {
-		debugC(3, kDebugLevelScriptFuncs, "cmd_characterSays(%p) ('%s', %d, %d)", (const void *)script, stackPosString(0), stackPos(1), stackPos(2));
+		debugC(3, kDebugLevelScriptFuncs, "c1_characterSays(%p) ('%s', %d, %d)", (const void *)script, stackPosString(0), stackPos(1), stackPos(2));
 		characterSays(stackPosString(0), stackPos(1), stackPos(2));
 	}
 
 	return 0;
 }
 
-int KyraEngine::cmd_pauseTicks(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_pauseTicks(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
+int KyraEngine::c1_pauseTicks(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_pauseTicks(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
 	if (stackPos(1)) {
-		warning("STUB: special cmd_pauseTicks");
+		warning("STUB: special c1_pauseTicks");
 		// delete this after correct implementing
 		delayWithTicks(stackPos(0));
 	} else {
@@ -71,34 +71,34 @@ int KyraEngine::cmd_pauseTicks(ScriptState *script) {
 	return 0;
 }
 
-int KyraEngine::cmd_drawSceneAnimShape(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_drawSceneAnimShape(%p) (%d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4));
+int KyraEngine::c1_drawSceneAnimShape(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_drawSceneAnimShape(%p) (%d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4));
 	_screen->drawShape(stackPos(4), _sprites->_sceneShapes[stackPos(0)], stackPos(1), stackPos(2), 0, (stackPos(3) != 0) ? 1 : 0);
 	return 0;
 }
 
-int KyraEngine::cmd_queryGameFlag(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_queryGameFlag(%p) (0x%X)", (const void *)script, stackPos(0));
+int KyraEngine::c1_queryGameFlag(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_queryGameFlag(%p) (0x%X)", (const void *)script, stackPos(0));
 	return queryGameFlag(stackPos(0));
 }
 
-int KyraEngine::cmd_setGameFlag(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_setGameFlag(%p) (0x%X)", (const void *)script, stackPos(0));
+int KyraEngine::c1_setGameFlag(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_setGameFlag(%p) (0x%X)", (const void *)script, stackPos(0));
 	return setGameFlag(stackPos(0));
 }
 
-int KyraEngine::cmd_resetGameFlag(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_resetGameFlag(%p) (0x%X)", (const void *)script, stackPos(0));
+int KyraEngine::c1_resetGameFlag(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_resetGameFlag(%p) (0x%X)", (const void *)script, stackPos(0));
 	return resetGameFlag(stackPos(0));
 }
 
-int KyraEngine::cmd_runNPCScript(ScriptState *script) {
-	warning("STUB: cmd_runNPCScript");
+int KyraEngine::c1_runNPCScript(ScriptState *script) {
+	warning("STUB: c1_runNPCScript");
 	return 0;
 }
 
-int KyraEngine::cmd_setSpecialExitList(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_setSpecialExitList(%p) (%d, %d, %d, %d, %d, %d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5), stackPos(6), stackPos(7), stackPos(8), stackPos(9));
+int KyraEngine::c1_setSpecialExitList(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_setSpecialExitList(%p) (%d, %d, %d, %d, %d, %d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5), stackPos(6), stackPos(7), stackPos(8), stackPos(9));
 	
 	for (int i = 0; i < 10; ++i) {
 		_exitList[i] = stackPos(i);
@@ -108,20 +108,20 @@ int KyraEngine::cmd_setSpecialExitList(ScriptState *script) {
 	return 0;
 }
 
-int KyraEngine::cmd_blockInWalkableRegion(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_blockInWalkableRegion(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3));
+int KyraEngine::c1_blockInWalkableRegion(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_blockInWalkableRegion(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3));
 	_screen->blockInRegion(stackPos(0), stackPos(1), stackPos(2)-stackPos(0)+1, stackPos(3)-stackPos(1)+1);
 	return 0;
 }
 
-int KyraEngine::cmd_blockOutWalkableRegion(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_blockOutWalkableRegion(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3));
+int KyraEngine::c1_blockOutWalkableRegion(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_blockOutWalkableRegion(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3));
 	_screen->blockOutRegion(stackPos(0), stackPos(1), stackPos(2)-stackPos(0)+1, stackPos(3)-stackPos(1)+1);
 	return 0;
 }
 
-int KyraEngine::cmd_walkPlayerToPoint(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_walkPlayerToPoint(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3));
+int KyraEngine::c1_walkPlayerToPoint(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_walkPlayerToPoint(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3));
 
 	int normalTimers = stackPos(2);
 	if (!normalTimers) {
@@ -149,8 +149,8 @@ int KyraEngine::cmd_walkPlayerToPoint(ScriptState *script) {
 	return 0;
 }
 
-int KyraEngine::cmd_dropItemInScene(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_dropItemInScene(%p) (%d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2));
+int KyraEngine::c1_dropItemInScene(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_dropItemInScene(%p) (%d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2));
 	int item = stackPos(0);
 	int xpos = stackPos(1);
 	int ypos = stackPos(2);
@@ -175,8 +175,8 @@ int KyraEngine::cmd_dropItemInScene(ScriptState *script) {
 	return 0;
 }
 
-int KyraEngine::cmd_drawAnimShapeIntoScene(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_drawAnimShapeIntoScene(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3));
+int KyraEngine::c1_drawAnimShapeIntoScene(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_drawAnimShapeIntoScene(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3));
 	_screen->hideMouse();
 	_animator->restoreAllObjectBackgrounds();
 	int shape = stackPos(0);
@@ -193,51 +193,51 @@ int KyraEngine::cmd_drawAnimShapeIntoScene(ScriptState *script) {
 	return 0;
 }
 
-int KyraEngine::cmd_createMouseItem(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_createMouseItem(%p) (%d)", (const void *)script, stackPos(0));
+int KyraEngine::c1_createMouseItem(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_createMouseItem(%p) (%d)", (const void *)script, stackPos(0));
 	createMouseItem(stackPos(0));
 	return 0;
 }
 
-int KyraEngine::cmd_savePageToDisk(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_savePageToDisk(%p) ('%s', %d)", (const void *)script, stackPosString(0), stackPos(1));
+int KyraEngine::c1_savePageToDisk(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_savePageToDisk(%p) ('%s', %d)", (const void *)script, stackPosString(0), stackPos(1));
 	_screen->savePageToDisk(stackPosString(0), stackPos(1));
 	return 0;
 }
 
-int KyraEngine::cmd_sceneAnimOn(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_sceneAnimOn(%p) (%d)", (const void *)script, stackPos(0));
+int KyraEngine::c1_sceneAnimOn(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_sceneAnimOn(%p) (%d)", (const void *)script, stackPos(0));
 	_sprites->_anims[stackPos(0)].play = true;
 	return 0;
 }
 
-int KyraEngine::cmd_sceneAnimOff(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_sceneAnimOff(%p) (%d)", (const void *)script, stackPos(0));
+int KyraEngine::c1_sceneAnimOff(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_sceneAnimOff(%p) (%d)", (const void *)script, stackPos(0));
 	_sprites->_anims[stackPos(0)].play = false;
 	return 0;
 }
 
-int KyraEngine::cmd_getElapsedSeconds(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_getElapsedSeconds(%p) ()", (const void *)script);
+int KyraEngine::c1_getElapsedSeconds(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_getElapsedSeconds(%p) ()", (const void *)script);
 	return _system->getMillis() / 1000;
 }
 
-int KyraEngine::cmd_mouseIsPointer(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_mouseIsPointer(%p) ()", (const void *)script);
+int KyraEngine::c1_mouseIsPointer(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_mouseIsPointer(%p) ()", (const void *)script);
 	if (_itemInHand == -1) {
 		return 1;
 	}
 	return 0;
 }
 
-int KyraEngine::cmd_destroyMouseItem(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_destroyMouseItem(%p) ()", (const void *)script);
+int KyraEngine::c1_destroyMouseItem(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_destroyMouseItem(%p) ()", (const void *)script);
 	destroyMouseItem();
 	return 0;
 }
 
-int KyraEngine::cmd_runSceneAnimUntilDone(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_runSceneAnimUntilDone(%p) (%d)", (const void *)script, stackPos(0));
+int KyraEngine::c1_runSceneAnimUntilDone(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_runSceneAnimUntilDone(%p) (%d)", (const void *)script, stackPos(0));
 	_screen->hideMouse();
 	_animator->restoreAllObjectBackgrounds();
 	_sprites->_anims[stackPos(0)].play = true;
@@ -254,49 +254,49 @@ int KyraEngine::cmd_runSceneAnimUntilDone(ScriptState *script) {
 	return 0;
 }
 
-int KyraEngine::cmd_fadeSpecialPalette(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_fadeSpecialPalette(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3));
+int KyraEngine::c1_fadeSpecialPalette(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_fadeSpecialPalette(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3));
 	_screen->fadeSpecialPalette(stackPos(0), stackPos(1), stackPos(2), stackPos(3));
 	return 0;
 }
 
-int KyraEngine::cmd_playAdlibSound(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_playAdlibSound(%p) (%d)", (const void *)script, stackPos(0));
+int KyraEngine::c1_playAdlibSound(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_playAdlibSound(%p) (%d)", (const void *)script, stackPos(0));
 	snd_playSoundEffect(stackPos(0));
 	return 0;
 }
 
-int KyraEngine::cmd_playAdlibScore(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_playAdlibScore(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
+int KyraEngine::c1_playAdlibScore(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_playAdlibScore(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
 	snd_playWanderScoreViaMap(stackPos(0), stackPos(1));
 	return 0;
 }
 
-int KyraEngine::cmd_phaseInSameScene(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_phaseInSameScene(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
+int KyraEngine::c1_phaseInSameScene(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_phaseInSameScene(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
 	transcendScenes(stackPos(0), stackPos(1));
 	return 0;
 }
 
-int KyraEngine::cmd_setScenePhasingFlag(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_setScenePhasingFlag(%p) ()", (const void *)script);
+int KyraEngine::c1_setScenePhasingFlag(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_setScenePhasingFlag(%p) ()", (const void *)script);
 	_scenePhasingFlag = 1;
 	return 1;
 }
 
-int KyraEngine::cmd_resetScenePhasingFlag(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_resetScenePhasingFlag(%p) ()", (const void *)script);
+int KyraEngine::c1_resetScenePhasingFlag(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_resetScenePhasingFlag(%p) ()", (const void *)script);
 	_scenePhasingFlag = 0;
 	return 0;
 }
 
-int KyraEngine::cmd_queryScenePhasingFlag(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_queryScenePhasingFlag(%p) ()", (const void *)script);
+int KyraEngine::c1_queryScenePhasingFlag(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_queryScenePhasingFlag(%p) ()", (const void *)script);
 	return _scenePhasingFlag;
 }
 
-int KyraEngine::cmd_sceneToDirection(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_sceneToDirection(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
+int KyraEngine::c1_sceneToDirection(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_sceneToDirection(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
 	assert(stackPos(0) < _roomTableSize);
 	Room *curRoom = &_roomTable[stackPos(0)];
 	uint16 returnValue = 0xFFFF;
@@ -325,8 +325,8 @@ int KyraEngine::cmd_sceneToDirection(ScriptState *script) {
 	return returnValue;
 }
 
-int KyraEngine::cmd_setBirthstoneGem(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_setBirthstoneGem(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
+int KyraEngine::c1_setBirthstoneGem(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_setBirthstoneGem(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
 	int index = stackPos(0);
 	if (index < 4 && index >= 0) {
 		_birthstoneGemTable[index] = stackPos(1);
@@ -335,62 +335,62 @@ int KyraEngine::cmd_setBirthstoneGem(ScriptState *script) {
 	return 0;
 }
 
-int KyraEngine::cmd_placeItemInGenericMapScene(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_placeItemInGenericMapScene(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
+int KyraEngine::c1_placeItemInGenericMapScene(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_placeItemInGenericMapScene(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
 	placeItemInGenericMapScene(stackPos(0), stackPos(1));
 	return 0;
 }
 
-int KyraEngine::cmd_setBrandonStatusBit(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_setBrandonStatusBit(%p) (%d)", (const void *)script, stackPos(0));
+int KyraEngine::c1_setBrandonStatusBit(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_setBrandonStatusBit(%p) (%d)", (const void *)script, stackPos(0));
 	_brandonStatusBit |= stackPos(0);
 	return 0;
 }
 
-int KyraEngine::cmd_pauseSeconds(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_pauseSeconds(%p) (%d)", (const void *)script, stackPos(0));
+int KyraEngine::c1_pauseSeconds(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_pauseSeconds(%p) (%d)", (const void *)script, stackPos(0));
 	if (stackPos(0) > 0 && !_skipFlag)
 		delay(stackPos(0)*1000, true);
 	_skipFlag = false;
 	return 0;
 }
 
-int KyraEngine::cmd_getCharactersLocation(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_getCharactersLocation(%p) (%d)", (const void *)script, stackPos(0));
+int KyraEngine::c1_getCharactersLocation(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_getCharactersLocation(%p) (%d)", (const void *)script, stackPos(0));
 	return _characterList[stackPos(0)].sceneId;
 }
 
-int KyraEngine::cmd_runNPCSubscript(ScriptState *script) {
-	warning("STUB: cmd_runNPCSubscript");
+int KyraEngine::c1_runNPCSubscript(ScriptState *script) {
+	warning("STUB: c1_runNPCSubscript");
 	return 0;
 }
 
-int KyraEngine::cmd_magicOutMouseItem(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_magicOutMouseItem(%p) (%d)", (const void *)script, stackPos(0));
+int KyraEngine::c1_magicOutMouseItem(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_magicOutMouseItem(%p) (%d)", (const void *)script, stackPos(0));
 	magicOutMouseItem(stackPos(0), -1);
 	return 0;
 }
 
-int KyraEngine::cmd_internalAnimOn(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_internalAnimOn(%p) (%d)", (const void *)script, stackPos(0));
+int KyraEngine::c1_internalAnimOn(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_internalAnimOn(%p) (%d)", (const void *)script, stackPos(0));
 	_animator->sprites()[stackPos(0)].active = 1;
 	return 0;
 }
 
-int KyraEngine::cmd_forceBrandonToNormal(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_forceBrandonToNormal(%p) ()", (const void *)script);
+int KyraEngine::c1_forceBrandonToNormal(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_forceBrandonToNormal(%p) ()", (const void *)script);
 	checkAmuletAnimFlags();
 	return 0;
 }
 
-int KyraEngine::cmd_poisonDeathNow(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_poisonDeathNow(%p) ()", (const void *)script);
+int KyraEngine::c1_poisonDeathNow(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_poisonDeathNow(%p) ()", (const void *)script);
 	seq_poisonDeathNow(1);
 	return 0;
 }
 
-int KyraEngine::cmd_setScaleMode(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_setScaleMode(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3));
+int KyraEngine::c1_setScaleMode(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_setScaleMode(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3));
 	int len = stackPos(0);
 	int setValue1 = stackPos(1);
 	int start2 = stackPos(2);
@@ -410,8 +410,8 @@ int KyraEngine::cmd_setScaleMode(ScriptState *script) {
 	return _scaleMode;
 }
 
-int KyraEngine::cmd_openWSAFile(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_openWSAFile(%p) ('%s', %d, %d, %d)", (const void *)script, stackPosString(0), stackPos(1), stackPos(2), stackPos(3));
+int KyraEngine::c1_openWSAFile(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_openWSAFile(%p) ('%s', %d, %d, %d)", (const void *)script, stackPosString(0), stackPos(1), stackPos(2), stackPos(3));
 	
 	char *filename = stackPosString(0);
 	int wsaIndex = stackPos(1);
@@ -422,8 +422,8 @@ int KyraEngine::cmd_openWSAFile(ScriptState *script) {
 	return 0;
 }
 
-int KyraEngine::cmd_closeWSAFile(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_closeWSAFile(%p) (%d)", (const void *)script, stackPos(0));
+int KyraEngine::c1_closeWSAFile(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_closeWSAFile(%p) (%d)", (const void *)script, stackPos(0));
 	
 	int wsaIndex = stackPos(0);
 	if (_movieObjects[wsaIndex]) {
@@ -433,8 +433,8 @@ int KyraEngine::cmd_closeWSAFile(ScriptState *script) {
 	return 0;
 }
 
-int KyraEngine::cmd_runWSAFromBeginningToEnd(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_runWSAFromBeginningToEnd(%p) (%d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4));
+int KyraEngine::c1_runWSAFromBeginningToEnd(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_runWSAFromBeginningToEnd(%p) (%d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4));
 	
 	_screen->hideMouse();
 	
@@ -474,8 +474,8 @@ int KyraEngine::cmd_runWSAFromBeginningToEnd(ScriptState *script) {
 	return 0;
 }
 
-int KyraEngine::cmd_displayWSAFrame(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_displayWSAFrame(%p) (%d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4));
+int KyraEngine::c1_displayWSAFrame(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_displayWSAFrame(%p) (%d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4));
 	int frame = stackPos(0);
 	int xpos = stackPos(1);
 	int ypos = stackPos(2);
@@ -501,14 +501,14 @@ int KyraEngine::cmd_displayWSAFrame(ScriptState *script) {
 	return 0;
 }
 
-int KyraEngine::cmd_enterNewScene(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_enterNewScene(%p) (%d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4));
+int KyraEngine::c1_enterNewScene(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_enterNewScene(%p) (%d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4));
 	enterNewScene(stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4));
 	return 0;
 }
 
-int KyraEngine::cmd_setSpecialEnterXAndY(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_setSpecialEnterXAndY(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
+int KyraEngine::c1_setSpecialEnterXAndY(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_setSpecialEnterXAndY(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
 	_brandonPosX = stackPos(0);
 	_brandonPosY = stackPos(1);
 	if (_brandonPosX + 1 == 0 && _brandonPosY + 1 == 0)
@@ -516,8 +516,8 @@ int KyraEngine::cmd_setSpecialEnterXAndY(ScriptState *script) {
 	return 0;
 }
 
-int KyraEngine::cmd_runWSAFrames(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_runWSAFrames(%p) (%d, %d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5));
+int KyraEngine::c1_runWSAFrames(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_runWSAFrames(%p) (%d, %d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5));
 	int xpos = stackPos(0);
 	int ypos = stackPos(1);
 	int delayTime = stackPos(2);
@@ -543,8 +543,8 @@ int KyraEngine::cmd_runWSAFrames(ScriptState *script) {
 	return 0;
 }
 
-int KyraEngine::cmd_popBrandonIntoScene(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_popBrandonIntoScene(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3));
+int KyraEngine::c1_popBrandonIntoScene(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_popBrandonIntoScene(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3));
 	int changeScaleMode = stackPos(3);
 	int xpos = (int16)(stackPos(0) & 0xFFFC);
 	int ypos = (int16)(stackPos(1) & 0xFFFE);
@@ -593,30 +593,30 @@ int KyraEngine::cmd_popBrandonIntoScene(ScriptState *script) {
 	return 0;
 }
 
-int KyraEngine::cmd_restoreAllObjectBackgrounds(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_restoreAllObjectBackgrounds(%p) ()", (const void *)script);
+int KyraEngine::c1_restoreAllObjectBackgrounds(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_restoreAllObjectBackgrounds(%p) ()", (const void *)script);
 	_animator->restoreAllObjectBackgrounds();
 	return 0;
 }
 
-int KyraEngine::cmd_setCustomPaletteRange(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_setCustomPaletteRange(%p) (%d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2));
+int KyraEngine::c1_setCustomPaletteRange(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_setCustomPaletteRange(%p) (%d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2));
 	uint8 *screenPal = _screen->_currentPalette;
 	memcpy(&screenPal[stackPos(1)*3], _specialPalettes[stackPos(0)], stackPos(2)*3);
 	_screen->setScreenPalette(screenPal);
 	return 0;
 }
 
-int KyraEngine::cmd_loadPageFromDisk(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_loadPageFromDisk(%p) ('%s', %d)", (const void *)script, stackPosString(0), stackPos(1));
+int KyraEngine::c1_loadPageFromDisk(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_loadPageFromDisk(%p) ('%s', %d)", (const void *)script, stackPosString(0), stackPos(1));
 	_screen->loadPageFromDisk(stackPosString(0), stackPos(1));
 	_animator->_updateScreen = true;
 	return 0;
 }
 
-int KyraEngine::cmd_customPrintTalkString(ScriptState *script) {
+int KyraEngine::c1_customPrintTalkString(ScriptState *script) {
 	if (_features & GF_TALKIE) {
-		debugC(3, kDebugLevelScriptFuncs, "cmd_customPrintTalkString(%p) (%d, '%s', %d, %d, %d)", (const void *)script, stackPos(0), stackPosString(1), stackPos(2), stackPos(3), stackPos(4) & 0xFF);
+		debugC(3, kDebugLevelScriptFuncs, "c1_customPrintTalkString(%p) (%d, '%s', %d, %d, %d)", (const void *)script, stackPos(0), stackPosString(1), stackPos(2), stackPos(3), stackPos(4) & 0xFF);
 
 		if (speechEnabled()) {
 			snd_voiceWaitForFinish();
@@ -626,7 +626,7 @@ int KyraEngine::cmd_customPrintTalkString(ScriptState *script) {
 		if (textEnabled())
 			_text->printTalkTextMessage(stackPosString(1), stackPos(2), stackPos(3), stackPos(4) & 0xFF, 0, 2);
 	} else {
-		debugC(3, kDebugLevelScriptFuncs, "cmd_customPrintTalkString(%p) ('%s', %d, %d, %d)", (const void *)script, stackPosString(0), stackPos(1), stackPos(2), stackPos(3) & 0xFF);
+		debugC(3, kDebugLevelScriptFuncs, "c1_customPrintTalkString(%p) ('%s', %d, %d, %d)", (const void *)script, stackPosString(0), stackPos(1), stackPos(2), stackPos(3) & 0xFF);
 		_skipFlag = false;
 		_text->printTalkTextMessage(stackPosString(0), stackPos(1), stackPos(2), stackPos(3) & 0xFF, 0, 2);
 	}
@@ -634,36 +634,36 @@ int KyraEngine::cmd_customPrintTalkString(ScriptState *script) {
 	return 0;
 }
 
-int KyraEngine::cmd_restoreCustomPrintBackground(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_restoreCustomPrintBackground(%p) ()", (const void *)script);
+int KyraEngine::c1_restoreCustomPrintBackground(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_restoreCustomPrintBackground(%p) ()", (const void *)script);
 	_text->restoreTalkTextMessageBkgd(2, 0);
 	return 0;
 }
 
-int KyraEngine::cmd_hideMouse(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_hideMouse(%p) ()", (const void *)script);
+int KyraEngine::c1_hideMouse(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_hideMouse(%p) ()", (const void *)script);
 	_screen->hideMouse();
 	return 0;
 }
 
-int KyraEngine::cmd_showMouse(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_showMouse(%p) ()", (const void *)script);
+int KyraEngine::c1_showMouse(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_showMouse(%p) ()", (const void *)script);
 	_screen->showMouse();
 	return 0;
 }
 
-int KyraEngine::cmd_getCharacterX(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_getCharacterX(%p) (%d)", (const void *)script, stackPos(0));
+int KyraEngine::c1_getCharacterX(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_getCharacterX(%p) (%d)", (const void *)script, stackPos(0));
 	return _characterList[stackPos(0)].x1;
 }
 
-int KyraEngine::cmd_getCharacterY(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_getCharacterY(%p) (%d)", (const void *)script, stackPos(0));
+int KyraEngine::c1_getCharacterY(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_getCharacterY(%p) (%d)", (const void *)script, stackPos(0));
 	return _characterList[stackPos(0)].y1;
 }
 
-int KyraEngine::cmd_changeCharactersFacing(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_changeCharactersFacing(%p) (%d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2));
+int KyraEngine::c1_changeCharactersFacing(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_changeCharactersFacing(%p) (%d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2));
 	int character = stackPos(0);
 	int facing = stackPos(1);
 	int newAnimFrame = stackPos(2);
@@ -681,8 +681,8 @@ int KyraEngine::cmd_changeCharactersFacing(ScriptState *script) {
 	return 0;
 }
 
-int KyraEngine::cmd_copyWSARegion(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_copyWSARegion(%p) (%d, %d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5));
+int KyraEngine::c1_copyWSARegion(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_copyWSARegion(%p) (%d, %d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5));
 	int xpos = stackPos(0);
 	int ypos = stackPos(1);
 	int width = stackPos(2);
@@ -694,26 +694,26 @@ int KyraEngine::cmd_copyWSARegion(ScriptState *script) {
 	return 0;
 }
 
-int KyraEngine::cmd_printText(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_printText(%p) ('%s', %d, %d, 0x%X, 0x%X)", (const void *)script, stackPosString(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4));
+int KyraEngine::c1_printText(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_printText(%p) ('%s', %d, %d, 0x%X, 0x%X)", (const void *)script, stackPosString(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4));
 	_screen->printText(stackPosString(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4));
 	_screen->updateScreen();
 	return 0;
 }
 
-int KyraEngine::cmd_random(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_random(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
+int KyraEngine::c1_random(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_random(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
 	assert(stackPos(0) < stackPos(1));
 	return _rnd.getRandomNumberRng(stackPos(0), stackPos(1));
 }
 
-int KyraEngine::cmd_loadSoundFile(ScriptState *script) {
-	warning("STUB: cmd_loadSoundFile");
+int KyraEngine::c1_loadSoundFile(ScriptState *script) {
+	warning("STUB: c1_loadSoundFile");
 	return 0;
 }
 
-int KyraEngine::cmd_displayWSAFrameOnHidPage(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_displayWSAFrameOnHidPage(%p) (%d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4));
+int KyraEngine::c1_displayWSAFrameOnHidPage(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_displayWSAFrameOnHidPage(%p) (%d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4));
 	int frame = stackPos(0);
 	int xpos = stackPos(1);
 	int ypos = stackPos(2);
@@ -741,8 +741,8 @@ int KyraEngine::cmd_displayWSAFrameOnHidPage(ScriptState *script) {
 	return 0;
 }
 
-int KyraEngine::cmd_displayWSASequentialFrames(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_displayWSASequentialFrames(%p) (%d, %d, %d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5), stackPos(6));
+int KyraEngine::c1_displayWSASequentialFrames(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_displayWSASequentialFrames(%p) (%d, %d, %d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5), stackPos(6));
 	int startFrame = stackPos(0);
 	int endFrame = stackPos(1);
 	int xpos = stackPos(2);
@@ -819,8 +819,8 @@ int KyraEngine::cmd_displayWSASequentialFrames(ScriptState *script) {
 	return 0;
 }
 
-int KyraEngine::cmd_drawCharacterStanding(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_drawCharacterStanding(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3));
+int KyraEngine::c1_drawCharacterStanding(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_drawCharacterStanding(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3));
 	int character = stackPos(0);
 	int animFrame = stackPos(1);
 	int newFacing = stackPos(2);
@@ -836,14 +836,14 @@ int KyraEngine::cmd_drawCharacterStanding(ScriptState *script) {
 	return 0;
 }
 
-int KyraEngine::cmd_internalAnimOff(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_internalAnimOff(%p) (%d)", (const void *)script, stackPos(0));
+int KyraEngine::c1_internalAnimOff(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_internalAnimOff(%p) (%d)", (const void *)script, stackPos(0));
 	_animator->sprites()[stackPos(0)].active = 0;
 	return 0;
 }
 
-int KyraEngine::cmd_changeCharactersXAndY(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_changeCharactersXAndY(%p) (%d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2));
+int KyraEngine::c1_changeCharactersXAndY(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_changeCharactersXAndY(%p) (%d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2));
 	Character *ch = &_characterList[stackPos(0)];
 	int16 x = stackPos(1);
 	int16 y = stackPos(2);
@@ -858,26 +858,26 @@ int KyraEngine::cmd_changeCharactersXAndY(ScriptState *script) {
 	return 0;
 }
 
-int KyraEngine::cmd_clearSceneAnimatorBeacon(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_clearSceneAnimatorBeacon(%p) ()", (const void *)script);
+int KyraEngine::c1_clearSceneAnimatorBeacon(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_clearSceneAnimatorBeacon(%p) ()", (const void *)script);
 	_sprites->_sceneAnimatorBeaconFlag = 0;
 	return 0;
 }
 
-int KyraEngine::cmd_querySceneAnimatorBeacon(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_querySceneAnimatorBeacon(%p) ()", (const void *)script);
+int KyraEngine::c1_querySceneAnimatorBeacon(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_querySceneAnimatorBeacon(%p) ()", (const void *)script);
 	return _sprites->_sceneAnimatorBeaconFlag;
 }
 
-int KyraEngine::cmd_refreshSceneAnimator(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_refreshSceneAnimator(%p) ()", (const void *)script);
+int KyraEngine::c1_refreshSceneAnimator(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_refreshSceneAnimator(%p) ()", (const void *)script);
 	_sprites->updateSceneAnims();
 	_animator->updateAllObjectShapes();
 	return 0;
 }
 
-int KyraEngine::cmd_placeItemInOffScene(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_placeItemInOffScene(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3));
+int KyraEngine::c1_placeItemInOffScene(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_placeItemInOffScene(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3));
 	int item = stackPos(0);
 	int xpos = stackPos(1);
 	int ypos = stackPos(2);
@@ -895,8 +895,8 @@ int KyraEngine::cmd_placeItemInOffScene(ScriptState *script) {
 	return 0;
 }
 
-int KyraEngine::cmd_wipeDownMouseItem(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_wipeDownMouseItem(%p) (%d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2));
+int KyraEngine::c1_wipeDownMouseItem(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_wipeDownMouseItem(%p) (%d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2));
 	_screen->hideMouse();
 	wipeDownMouseItem(stackPos(1), stackPos(2));
 	destroyMouseItem();
@@ -904,8 +904,8 @@ int KyraEngine::cmd_wipeDownMouseItem(ScriptState *script) {
 	return 0;
 }
 
-int KyraEngine::cmd_placeCharacterInOtherScene(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_placeCharacterInOtherScene(%p) (%d, %d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5));
+int KyraEngine::c1_placeCharacterInOtherScene(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_placeCharacterInOtherScene(%p) (%d, %d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5));
 	int id = stackPos(0);
 	int sceneId = stackPos(1);
 	int xpos = (int16)(stackPos(2) & 0xFFFC);
@@ -921,19 +921,19 @@ int KyraEngine::cmd_placeCharacterInOtherScene(ScriptState *script) {
 	return 0;
 }
 
-int KyraEngine::cmd_getKey(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_getKey(%p) ()", (const void *)script);
+int KyraEngine::c1_getKey(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_getKey(%p) ()", (const void *)script);
 	waitForEvent();
 	return 0;
 }
 
-int KyraEngine::cmd_specificItemInInventory(ScriptState *script) {
-	warning("STUB: cmd_specificItemInInventory");
+int KyraEngine::c1_specificItemInInventory(ScriptState *script) {
+	warning("STUB: c1_specificItemInInventory");
 	return 0;
 }
 
-int KyraEngine::cmd_popMobileNPCIntoScene(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_popMobileNPCIntoScene(%p) (%d, %d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), (int16)(stackPos(4) & 0xFFFC), (int8)(stackPos(5) & 0xFE));
+int KyraEngine::c1_popMobileNPCIntoScene(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_popMobileNPCIntoScene(%p) (%d, %d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), (int16)(stackPos(4) & 0xFFFC), (int8)(stackPos(5) & 0xFE));
 	int character = stackPos(0);
 	int sceneId = stackPos(1);
 	int animFrame = stackPos(2);
@@ -953,23 +953,23 @@ int KyraEngine::cmd_popMobileNPCIntoScene(ScriptState *script) {
 	return 0;
 }
 
-int KyraEngine::cmd_mobileCharacterInScene(ScriptState *script) {
-	warning("STUB: cmd_mobileCharacterInScene");
+int KyraEngine::c1_mobileCharacterInScene(ScriptState *script) {
+	warning("STUB: c1_mobileCharacterInScene");
 	return 0;
 }
 
-int KyraEngine::cmd_hideMobileCharacter(ScriptState *script) {
-	warning("STUB: cmd_hideMobileCharacter");
+int KyraEngine::c1_hideMobileCharacter(ScriptState *script) {
+	warning("STUB: c1_hideMobileCharacter");
 	return 0;
 }
 
-int KyraEngine::cmd_unhideMobileCharacter(ScriptState *script) {
-	warning("STUB: cmd_unhideMobileCharacter");
+int KyraEngine::c1_unhideMobileCharacter(ScriptState *script) {
+	warning("STUB: c1_unhideMobileCharacter");
 	return 0;
 }
 
-int KyraEngine::cmd_setCharactersLocation(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_setCharactersLocation(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
+int KyraEngine::c1_setCharactersLocation(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_setCharactersLocation(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
 	Character *ch = &_characterList[stackPos(0)];
 	AnimObject *animObj = &_animator->actors()[stackPos(0)];
 	int newScene = stackPos(1);
@@ -985,8 +985,8 @@ int KyraEngine::cmd_setCharactersLocation(ScriptState *script) {
 	return 0;
 }
 
-int KyraEngine::cmd_walkCharacterToPoint(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_walkCharacterToPoint(%p) (%d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2));
+int KyraEngine::c1_walkCharacterToPoint(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_walkCharacterToPoint(%p) (%d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2));
 	int character = stackPos(0);
 	int toX = stackPos(1);
 	int toY = stackPos(2);
@@ -1068,8 +1068,8 @@ int KyraEngine::cmd_walkCharacterToPoint(ScriptState *script) {
 	return 0;
 }
 
-int KyraEngine::cmd_specialEventDisplayBrynnsNote(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_specialEventDisplayBrynnsNote(%p) ()", (const void *)script);
+int KyraEngine::c1_specialEventDisplayBrynnsNote(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_specialEventDisplayBrynnsNote(%p) ()", (const void *)script);
 	_screen->hideMouse();
 	_screen->savePageToDisk("HIDPAGE.TMP", 2);
 	_screen->savePageToDisk("SEENPAGE.TMP", 0);
@@ -1091,8 +1091,8 @@ int KyraEngine::cmd_specialEventDisplayBrynnsNote(ScriptState *script) {
 	return 0;
 }
 
-int KyraEngine::cmd_specialEventRemoveBrynnsNote(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_specialEventRemoveBrynnsNote(%p) ()", (const void *)script);
+int KyraEngine::c1_specialEventRemoveBrynnsNote(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_specialEventRemoveBrynnsNote(%p) ()", (const void *)script);
 	_screen->hideMouse();
 	_screen->loadPageFromDisk("SEENPAGE.TMP", 0);
 	_screen->loadPageFromDisk("HIDPAGE.TMP", 2);
@@ -1102,26 +1102,26 @@ int KyraEngine::cmd_specialEventRemoveBrynnsNote(ScriptState *script) {
 	return 0;
 }
 
-int KyraEngine::cmd_setLogicPage(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_setLogicPage(%p) (%d)", (const void *)script, stackPos(0));
+int KyraEngine::c1_setLogicPage(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_setLogicPage(%p) (%d)", (const void *)script, stackPos(0));
 	_screen->_curPage = stackPos(0);
 	return stackPos(0);
 }
 
-int KyraEngine::cmd_fatPrint(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_fatPrint(%p) ('%s', %d, %d, %d, %d, %d)", (const void *)script, stackPosString(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5));
+int KyraEngine::c1_fatPrint(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_fatPrint(%p) ('%s', %d, %d, %d, %d, %d)", (const void *)script, stackPosString(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5));
 	_text->printText(stackPosString(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5));
 	return 0;
 }
 
-int KyraEngine::cmd_preserveAllObjectBackgrounds(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_preserveAllObjectBackgrounds(%p) ()", (const void *)script);
+int KyraEngine::c1_preserveAllObjectBackgrounds(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_preserveAllObjectBackgrounds(%p) ()", (const void *)script);
 	_animator->preserveAllBackgrounds();
 	return 0;
 }
 
-int KyraEngine::cmd_updateSceneAnimations(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_updateSceneAnimations(%p) (%d)", (const void *)script, stackPos(0));
+int KyraEngine::c1_updateSceneAnimations(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_updateSceneAnimations(%p) (%d)", (const void *)script, stackPos(0));
 	if (stackPos(0)) {
 		_sprites->updateSceneAnims();
 		_animator->updateAllObjectShapes();
@@ -1129,24 +1129,24 @@ int KyraEngine::cmd_updateSceneAnimations(ScriptState *script) {
 	return 0;
 }
 
-int KyraEngine::cmd_sceneAnimationActive(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_sceneAnimationActive(%p) (%d)", (const void *)script, stackPos(0));
+int KyraEngine::c1_sceneAnimationActive(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_sceneAnimationActive(%p) (%d)", (const void *)script, stackPos(0));
 	return _sprites->_anims[stackPos(0)].play;
 }
 
-int KyraEngine::cmd_setCharactersMovementDelay(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_setCharactersMovementDelay(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
+int KyraEngine::c1_setCharactersMovementDelay(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_setCharactersMovementDelay(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
 	setTimerDelay(stackPos(0)+5, stackPos(1));
 	return 0;
 }
 
-int KyraEngine::cmd_getCharactersFacing(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_getCharactersFacing(%p) (%d)", (const void *)script, stackPos(0));
+int KyraEngine::c1_getCharactersFacing(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_getCharactersFacing(%p) (%d)", (const void *)script, stackPos(0));
 	return _characterList[stackPos(0)].facing;
 }
 
-int KyraEngine::cmd_bkgdScrollSceneAndMasksRight(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_bkgdScrollSceneAndMasksRight(%p) (%d)", (const void *)script, stackPos(0));
+int KyraEngine::c1_bkgdScrollSceneAndMasksRight(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_bkgdScrollSceneAndMasksRight(%p) (%d)", (const void *)script, stackPos(0));
 	_screen->copyBackgroundBlock(stackPos(0), 2, 0);
 	_screen->copyBackgroundBlock2(stackPos(0));
 	// update the whole screen
@@ -1155,14 +1155,14 @@ int KyraEngine::cmd_bkgdScrollSceneAndMasksRight(ScriptState *script) {
 	return 0;
 }
 
-int KyraEngine::cmd_dispelMagicAnimation(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_dispelMagicAnimation(%p) ()", (const void *)script);
+int KyraEngine::c1_dispelMagicAnimation(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_dispelMagicAnimation(%p) ()", (const void *)script);
 	seq_dispelMagicAnimation();
 	return 0;
 }
 
-int KyraEngine::cmd_findBrightestFireberry(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_findBrightestFireberry(%p) ()", (const void *)script);
+int KyraEngine::c1_findBrightestFireberry(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_findBrightestFireberry(%p) ()", (const void *)script);
 	if (_currentCharacter->sceneId >= 187 && _currentCharacter->sceneId <= 198) {
 		return 29;
 	}
@@ -1204,8 +1204,8 @@ int KyraEngine::cmd_findBrightestFireberry(ScriptState *script) {
 	return brightestFireberry;
 }
 
-int KyraEngine::cmd_setFireberryGlowPalette(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_setFireberryGlowPalette(%p) (%d)", (const void *)script, stackPos(0));
+int KyraEngine::c1_setFireberryGlowPalette(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_setFireberryGlowPalette(%p) (%d)", (const void *)script, stackPos(0));
 	int palIndex = 0;
 	switch (stackPos(0)) {
 	case 0x1E:
@@ -1242,20 +1242,20 @@ int KyraEngine::cmd_setFireberryGlowPalette(ScriptState *script) {
 	return 0;
 }
 
-int KyraEngine::cmd_setDeathHandlerFlag(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_setDeathHandlerFlag(%p) (%d)", (const void *)script, stackPos(0));
+int KyraEngine::c1_setDeathHandlerFlag(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_setDeathHandlerFlag(%p) (%d)", (const void *)script, stackPos(0));
 	_deathHandler = stackPos(0);
 	return 0;
 }
 
-int KyraEngine::cmd_drinkPotionAnimation(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_drinkPotionAnimation(%p) (%d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2));
+int KyraEngine::c1_drinkPotionAnimation(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_drinkPotionAnimation(%p) (%d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2));
 	seq_playDrinkPotionAnim(stackPos(0), stackPos(1), stackPos(2));
 	return 0;
 }
 
-int KyraEngine::cmd_makeAmuletAppear(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_makeAmuletAppear(%p) ()", (const void *)script);
+int KyraEngine::c1_makeAmuletAppear(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_makeAmuletAppear(%p) ()", (const void *)script);
 	WSAMovieV1 amulet(this);
 	amulet.open("AMULET.WSA", 1, 0);
 	amulet.setX(224);
@@ -1299,8 +1299,8 @@ int KyraEngine::cmd_makeAmuletAppear(ScriptState *script) {
 	return 0;
 }
 
-int KyraEngine::cmd_drawItemShapeIntoScene(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_drawItemShapeIntoScene(%p) (%d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4));
+int KyraEngine::c1_drawItemShapeIntoScene(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_drawItemShapeIntoScene(%p) (%d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4));
 	int item = stackPos(0);
 	int x = stackPos(1);
 	int y = stackPos(2);
@@ -1323,14 +1323,14 @@ int KyraEngine::cmd_drawItemShapeIntoScene(ScriptState *script) {
 	return 0;
 }
 
-int KyraEngine::cmd_setCharactersCurrentFrame(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_setCharactersCurrentFrame(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
+int KyraEngine::c1_setCharactersCurrentFrame(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_setCharactersCurrentFrame(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
 	_characterList[stackPos(0)].currentAnimFrame = stackPos(1);
 	return 0;
 }
 
-int KyraEngine::cmd_waitForConfirmationMouseClick(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_waitForConfirmationMouseClick(%p) ()", (const void *)script);
+int KyraEngine::c1_waitForConfirmationMouseClick(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_waitForConfirmationMouseClick(%p) ()", (const void *)script);
 	// if (mouseEnabled) {
 	while (!_mousePressFlag) {
 		updateMousePointer();
@@ -1353,40 +1353,40 @@ int KyraEngine::cmd_waitForConfirmationMouseClick(ScriptState *script) {
 	return 0;
 }
 
-int KyraEngine::cmd_pageFlip(ScriptState *script) {
-	warning("STUB: cmd_pageFlip");
+int KyraEngine::c1_pageFlip(ScriptState *script) {
+	warning("STUB: c1_pageFlip");
 	return 0;
 }
 
-int KyraEngine::cmd_setSceneFile(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_setSceneFile(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
+int KyraEngine::c1_setSceneFile(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_setSceneFile(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
 	setSceneFile(stackPos(0), stackPos(1));
 	return 0;
 }
 
-int KyraEngine::cmd_getItemInMarbleVase(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_getItemInMarbleVase(%p) ()", (const void *)script);
+int KyraEngine::c1_getItemInMarbleVase(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_getItemInMarbleVase(%p) ()", (const void *)script);
 	return _marbleVaseItem;
 }
 
-int KyraEngine::cmd_setItemInMarbleVase(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_setItemInMarbleVase(%p) (%d)", (const void *)script, stackPos(0));
+int KyraEngine::c1_setItemInMarbleVase(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_setItemInMarbleVase(%p) (%d)", (const void *)script, stackPos(0));
 	_marbleVaseItem = stackPos(0);
 	return 0;
 }
 
-int KyraEngine::cmd_addItemToInventory(ScriptState *script) {
-	warning("STUB: cmd_addItemToInventory");
+int KyraEngine::c1_addItemToInventory(ScriptState *script) {
+	warning("STUB: c1_addItemToInventory");
 	return 0;
 }
 
-int KyraEngine::cmd_intPrint(ScriptState *script) {
-	warning("STUB: cmd_intPrint");
+int KyraEngine::c1_intPrint(ScriptState *script) {
+	warning("STUB: c1_intPrint");
 	return 0;
 }
 
-int KyraEngine::cmd_shakeScreen(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_shakeScreen(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
+int KyraEngine::c1_shakeScreen(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_shakeScreen(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
 	int waitTicks = stackPos(1);
 	int times = stackPos(0);
 
@@ -1398,60 +1398,60 @@ int KyraEngine::cmd_shakeScreen(ScriptState *script) {
 	return 0;
 }
 
-int KyraEngine::cmd_createAmuletJewel(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_createAmuletJewel(%p) (%d)", (const void *)script, stackPos(0));
+int KyraEngine::c1_createAmuletJewel(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_createAmuletJewel(%p) (%d)", (const void *)script, stackPos(0));
 	seq_createAmuletJewel(stackPos(0), 0, 0, 0);
 	return 0;
 }
 
-int KyraEngine::cmd_setSceneAnimCurrXY(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_setSceneAnimCurrXY(%p) (%d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2));
+int KyraEngine::c1_setSceneAnimCurrXY(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_setSceneAnimCurrXY(%p) (%d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2));
 	_sprites->_anims[stackPos(0)].x = stackPos(1);
 	_sprites->_anims[stackPos(0)].y = stackPos(2);
 	return 0;
 }
 
-int KyraEngine::cmd_poisonBrandonAndRemaps(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_poisonBrandonAndRemaps(%p) ()", (const void *)script);
+int KyraEngine::c1_poisonBrandonAndRemaps(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_poisonBrandonAndRemaps(%p) ()", (const void *)script);
 	setBrandonPoisonFlags(1);
 	return 0;
 }
 
-int KyraEngine::cmd_fillFlaskWithWater(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_fillFlaskWithWater(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
+int KyraEngine::c1_fillFlaskWithWater(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_fillFlaskWithWater(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
 	seq_fillFlaskWithWater(stackPos(0), stackPos(1));
 	return 0;
 }
 
-int KyraEngine::cmd_getCharactersMovementDelay(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_getCharactersMovementDelay(%p) (%d)", (const void *)script, stackPos(0));
+int KyraEngine::c1_getCharactersMovementDelay(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_getCharactersMovementDelay(%p) (%d)", (const void *)script, stackPos(0));
 	return getTimerDelay(stackPos(0)+5);
 }
 
-int KyraEngine::cmd_getBirthstoneGem(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_getBirthstoneGem(%p) (%d)", (const void *)script, stackPos(0));
+int KyraEngine::c1_getBirthstoneGem(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_getBirthstoneGem(%p) (%d)", (const void *)script, stackPos(0));
 	if (stackPos(0) < 4) {
 		return _birthstoneGemTable[stackPos(0)];
 	}
 	return 0;
 }
 
-int KyraEngine::cmd_queryBrandonStatusBit(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_queryBrandonStatusBit(%p) (%d)", (const void *)script, stackPos(0));
+int KyraEngine::c1_queryBrandonStatusBit(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_queryBrandonStatusBit(%p) (%d)", (const void *)script, stackPos(0));
 	if (_brandonStatusBit & stackPos(0)) {
 		return 1;
 	}
 	return 0;
 }
 
-int KyraEngine::cmd_playFluteAnimation(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_playFluteAnimation(%p) ()", (const void *)script);
+int KyraEngine::c1_playFluteAnimation(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_playFluteAnimation(%p) ()", (const void *)script);
 	seq_playFluteAnimation();
 	return 0;
 }
 
-int KyraEngine::cmd_playWinterScrollSequence(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_playWinterScrollSequence(%p) (%d)", (const void *)script, stackPos(0));
+int KyraEngine::c1_playWinterScrollSequence(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_playWinterScrollSequence(%p) (%d)", (const void *)script, stackPos(0));
 	if (!stackPos(0)) {
 		seq_winterScroll2();
 	} else {
@@ -1460,43 +1460,43 @@ int KyraEngine::cmd_playWinterScrollSequence(ScriptState *script) {
 	return 0;
 }
 
-int KyraEngine::cmd_getIdolGem(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_getIdolGem(%p) (%d)", (const void *)script, stackPos(0));
+int KyraEngine::c1_getIdolGem(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_getIdolGem(%p) (%d)", (const void *)script, stackPos(0));
 	return _idolGemsTable[stackPos(0)];;
 }
 
-int KyraEngine::cmd_setIdolGem(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_setIdolGem(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
+int KyraEngine::c1_setIdolGem(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_setIdolGem(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
 	_idolGemsTable[stackPos(0)] = stackPos(1);
 	return 0;
 }
 
-int KyraEngine::cmd_totalItemsInScene(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_totalItemsInScene(%p) (%d)", (const void *)script, stackPos(0));
+int KyraEngine::c1_totalItemsInScene(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_totalItemsInScene(%p) (%d)", (const void *)script, stackPos(0));
 	return countItemsInScene(stackPos(0));
 }
 
-int KyraEngine::cmd_restoreBrandonsMovementDelay(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_restoreBrandonsMovementDelay(%p) ()", (const void *)script);
+int KyraEngine::c1_restoreBrandonsMovementDelay(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_restoreBrandonsMovementDelay(%p) ()", (const void *)script);
 	setWalkspeed(_configWalkspeed);	
 	return 0;
 }
 
-int KyraEngine::cmd_setMousePos(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_setMousePos(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
+int KyraEngine::c1_setMousePos(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_setMousePos(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
 	_system->warpMouse(stackPos(0), stackPos(1));
 	_mouseX = stackPos(0);
 	_mouseY = stackPos(1);
 	return 0;
 }
 
-int KyraEngine::cmd_getMouseState(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_getMouseState(%p) ()", (const void *)script);
+int KyraEngine::c1_getMouseState(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_getMouseState(%p) ()", (const void *)script);
 	return _mouseState;
 }
 
-int KyraEngine::cmd_setEntranceMouseCursorTrack(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_setEntranceMouseCursorTrack(%p) (%d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4));
+int KyraEngine::c1_setEntranceMouseCursorTrack(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_setEntranceMouseCursorTrack(%p) (%d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4));
 	_entranceMouseCursorTracks[0] = stackPos(0);
 	_entranceMouseCursorTracks[1] = stackPos(1);
 	_entranceMouseCursorTracks[2] = stackPos(0) + stackPos(2) - 1;
@@ -1505,20 +1505,20 @@ int KyraEngine::cmd_setEntranceMouseCursorTrack(ScriptState *script) {
 	return 0;
 }
 
-int KyraEngine::cmd_itemAppearsOnGround(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_itemAppearsOnGround(%p) (%d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2));
+int KyraEngine::c1_itemAppearsOnGround(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_itemAppearsOnGround(%p) (%d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2));
 	processItemDrop(_currentCharacter->sceneId, stackPos(0), stackPos(1), stackPos(2), 2, 0);
 	return 0;
 }
 
-int KyraEngine::cmd_setNoDrawShapesFlag(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_setNoDrawShapesFlag(%p) (%d)", (const void *)script, stackPos(0));
+int KyraEngine::c1_setNoDrawShapesFlag(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_setNoDrawShapesFlag(%p) (%d)", (const void *)script, stackPos(0));
 	_animator->_noDrawShapesFlag = stackPos(0);
 	return 0;
 }
 
-int KyraEngine::cmd_fadeEntirePalette(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_fadeEntirePalette(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
+int KyraEngine::c1_fadeEntirePalette(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_fadeEntirePalette(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
 	int cmd = stackPos(0);
 	uint8 *fadePal = 0;
 	if (cmd == 0) {
@@ -1530,7 +1530,7 @@ int KyraEngine::cmd_fadeEntirePalette(ScriptState *script) {
 		memset(fadePal, 0, sizeof(uint8)*768);
 	} else if (cmd == 1) {
 		//fadePal = _screen->getPalette(3);
-		warning("unimplemented cmd_fadeEntirePalette function");
+		warning("unimplemented c1_fadeEntirePalette function");
 		return 0;
 	} else if (cmd == 2) {
 		// HACK
@@ -1543,8 +1543,8 @@ int KyraEngine::cmd_fadeEntirePalette(ScriptState *script) {
 	return 0;
 }
 
-int KyraEngine::cmd_itemOnGroundHere(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_itemOnGroundHere(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
+int KyraEngine::c1_itemOnGroundHere(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_itemOnGroundHere(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
 	assert(stackPos(0) < _roomTableSize);
 	Room *curRoom = &_roomTable[stackPos(0)];
 	for (int i = 0; i < 12; ++i) {
@@ -1554,19 +1554,19 @@ int KyraEngine::cmd_itemOnGroundHere(ScriptState *script) {
 	return 0;
 }
 
-int KyraEngine::cmd_queryCauldronState(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_queryCauldronState(%p) ()", (const void *)script);
+int KyraEngine::c1_queryCauldronState(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_queryCauldronState(%p) ()", (const void *)script);
 	return _cauldronState;
 }
 
-int KyraEngine::cmd_setCauldronState(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_setCauldronState(%p) (%d)", (const void *)script, stackPos(0));
+int KyraEngine::c1_setCauldronState(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_setCauldronState(%p) (%d)", (const void *)script, stackPos(0));
 	_cauldronState = stackPos(0);
 	return _cauldronState;
 }
 
-int KyraEngine::cmd_queryCrystalState(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_queryCrystalState(%p) (%d)", (const void *)script, stackPos(0));
+int KyraEngine::c1_queryCrystalState(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_queryCrystalState(%p) (%d)", (const void *)script, stackPos(0));
 	if (!stackPos(0)) {
 		return _crystalState[0];
 	} else if (stackPos(0) == 1) {
@@ -1575,8 +1575,8 @@ int KyraEngine::cmd_queryCrystalState(ScriptState *script) {
 	return -1;
 }
 
-int KyraEngine::cmd_setCrystalState(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_setCrystalState(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
+int KyraEngine::c1_setCrystalState(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_setCrystalState(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
 	if (!stackPos(0)) {
 		_crystalState[0] = stackPos(1);
 	} else if (stackPos(0) == 1) {
@@ -1585,13 +1585,13 @@ int KyraEngine::cmd_setCrystalState(ScriptState *script) {
 	return stackPos(1);
 }
 
-int KyraEngine::cmd_setPaletteRange(ScriptState *script) {
-	warning("STUB: cmd_setPaletteRange");
+int KyraEngine::c1_setPaletteRange(ScriptState *script) {
+	warning("STUB: c1_setPaletteRange");
 	return 0;
 }
 
-int KyraEngine::cmd_shrinkBrandonDown(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_shrinkBrandonDown(%p) (%d)", (const void *)script, stackPos(0));
+int KyraEngine::c1_shrinkBrandonDown(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_shrinkBrandonDown(%p) (%d)", (const void *)script, stackPos(0));
 	int delayTime = stackPos(0);
 	checkAmuletAnimFlags();
 	int scaleValue = _scaleTable[_currentCharacter->y1];
@@ -1615,8 +1615,8 @@ int KyraEngine::cmd_shrinkBrandonDown(ScriptState *script) {
 	return 0;
 }
 
-int KyraEngine::cmd_growBrandonUp(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_growBrandonUp(%p) ()", (const void *)script);
+int KyraEngine::c1_growBrandonUp(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_growBrandonUp(%p) ()", (const void *)script);
 	int scaleValue = _scaleTable[_currentCharacter->y1];
 	int scale = 0;
 	if (_scaleMode) {
@@ -1636,123 +1636,123 @@ int KyraEngine::cmd_growBrandonUp(ScriptState *script) {
 	return 0;
 }
 
-int KyraEngine::cmd_setBrandonScaleXAndY(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_setBrandonScaleXAndY(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
+int KyraEngine::c1_setBrandonScaleXAndY(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_setBrandonScaleXAndY(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
 	_animator->_brandonScaleX = stackPos(0);
 	_animator->_brandonScaleY = stackPos(1);
 	return 0;
 }
 
-int KyraEngine::cmd_resetScaleMode(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_resetScaleMode(%p) ()", (const void *)script);
+int KyraEngine::c1_resetScaleMode(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_resetScaleMode(%p) ()", (const void *)script);
 	_scaleMode = 0;
 	return 0;
 }
 
-int KyraEngine::cmd_getScaleDepthTableValue(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_getScaleDepthTableValue(%p) (%d)", (const void *)script, stackPos(0));
+int KyraEngine::c1_getScaleDepthTableValue(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_getScaleDepthTableValue(%p) (%d)", (const void *)script, stackPos(0));
 	assert(stackPos(0) < ARRAYSIZE(_scaleTable));
 	return _scaleTable[stackPos(0)];
 }
 
-int KyraEngine::cmd_setScaleDepthTableValue(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_setScaleDepthTableValue(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
+int KyraEngine::c1_setScaleDepthTableValue(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_setScaleDepthTableValue(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
 	assert(stackPos(0) < ARRAYSIZE(_scaleTable));
 	_scaleTable[stackPos(0)] = stackPos(1);
 	return stackPos(1);
 }
 
-int KyraEngine::cmd_message(ScriptState *script) {
+int KyraEngine::c1_message(ScriptState *script) {
 	if (_features & GF_TALKIE) {
-		debugC(3, kDebugLevelScriptFuncs, "cmd_message(%p) (%d, '%s', %d)", (const void *)script, stackPos(0), stackPosString(1), stackPos(2));
+		debugC(3, kDebugLevelScriptFuncs, "c1_message(%p) (%d, '%s', %d)", (const void *)script, stackPos(0), stackPosString(1), stackPos(2));
 		drawSentenceCommand(stackPosString(1), stackPos(2));
 	} else {
-		debugC(3, kDebugLevelScriptFuncs, "cmd_message(%p) ('%s', %d)", (const void *)script, stackPosString(0), stackPos(1));
+		debugC(3, kDebugLevelScriptFuncs, "c1_message(%p) ('%s', %d)", (const void *)script, stackPosString(0), stackPos(1));
 		drawSentenceCommand(stackPosString(0), stackPos(1));
 	}
 
 	return 0;
 }
 
-int KyraEngine::cmd_checkClickOnNPC(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_checkClickOnNPC(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
+int KyraEngine::c1_checkClickOnNPC(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_checkClickOnNPC(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
 	return checkForNPCScriptRun(stackPos(0), stackPos(1));
 }
 
-int KyraEngine::cmd_getFoyerItem(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_getFoyerItem(%p) (%d)", (const void *)script, stackPos(0));
+int KyraEngine::c1_getFoyerItem(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_getFoyerItem(%p) (%d)", (const void *)script, stackPos(0));
 	assert(stackPos(0) < ARRAYSIZE(_foyerItemTable));
 	return _foyerItemTable[stackPos(0)];
 }
 
-int KyraEngine::cmd_setFoyerItem(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_setFoyerItem(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
+int KyraEngine::c1_setFoyerItem(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_setFoyerItem(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
 	assert(stackPos(0) < ARRAYSIZE(_foyerItemTable));
 	_foyerItemTable[stackPos(0)] = stackPos(1);
 	return stackPos(1);
 }
 
-int KyraEngine::cmd_setNoItemDropRegion(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_setNoItemDropRegion(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3));
+int KyraEngine::c1_setNoItemDropRegion(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_setNoItemDropRegion(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3));
 	addToNoDropRects(stackPos(0), stackPos(1), stackPos(2), stackPos(3));
 	return 0;
 }
 
-int KyraEngine::cmd_walkMalcolmOn(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_walkMalcolmOn(%p) ()", (const void *)script);
+int KyraEngine::c1_walkMalcolmOn(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_walkMalcolmOn(%p) ()", (const void *)script);
 	if (!_malcolmFlag)
 		_malcolmFlag = 1;
 	return 0;
 }
 
-int KyraEngine::cmd_passiveProtection(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_passiveProtection(%p) ()", (const void *)script);
+int KyraEngine::c1_passiveProtection(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_passiveProtection(%p) ()", (const void *)script);
 	return 1;
 }
 
-int KyraEngine::cmd_setPlayingLoop(ScriptState *script) {
-	warning("STUB: cmd_setPlayingLoop");
+int KyraEngine::c1_setPlayingLoop(ScriptState *script) {
+	warning("STUB: c1_setPlayingLoop");
 	return 0;
 }
 
-int KyraEngine::cmd_brandonToStoneSequence(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_brandonToStoneSequence(%p) ()", (const void *)script);
+int KyraEngine::c1_brandonToStoneSequence(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_brandonToStoneSequence(%p) ()", (const void *)script);
 	seq_brandonToStone();
 	return 0;
 }
 
-int KyraEngine::cmd_brandonHealingSequence(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_brandonHealingSequence(%p) ()", (const void *)script);
+int KyraEngine::c1_brandonHealingSequence(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_brandonHealingSequence(%p) ()", (const void *)script);
 	seq_brandonHealing();
 	return 0;
 }
 
-int KyraEngine::cmd_protectCommandLine(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_protectCommandLine(%p) (%d)", (const void *)script, stackPos(0));
+int KyraEngine::c1_protectCommandLine(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_protectCommandLine(%p) (%d)", (const void *)script, stackPos(0));
 	return stackPos(0);
 }
 
-int KyraEngine::cmd_pauseMusicSeconds(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_pauseMusicSeconds(%p) ()", (const void *)script);
+int KyraEngine::c1_pauseMusicSeconds(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_pauseMusicSeconds(%p) ()", (const void *)script);
 	// if music disabled
 	//     return
-	cmd_pauseSeconds(script);
+	c1_pauseSeconds(script);
 	return 0;
 }
 
-int KyraEngine::cmd_resetMaskRegion(ScriptState *script) {
-	warning("STUB: cmd_resetMaskRegion");
+int KyraEngine::c1_resetMaskRegion(ScriptState *script) {
+	warning("STUB: c1_resetMaskRegion");
 	return 0;
 }
 
-int KyraEngine::cmd_setPaletteChangeFlag(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_setPaletteChangeFlag(%p) (%d)", (const void *)script, stackPos(0));
+int KyraEngine::c1_setPaletteChangeFlag(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_setPaletteChangeFlag(%p) (%d)", (const void *)script, stackPos(0));
 	_paletteChanged = stackPos(0);
 	return _paletteChanged;
 }
 
-int KyraEngine::cmd_fillRect(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_fillRect(%p) (%d, %d, %d, %d, %d, 0x%X)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5));
+int KyraEngine::c1_fillRect(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_fillRect(%p) (%d, %d, %d, %d, %d, 0x%X)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5));
 	int videoPageBackup = _screen->_curPage;
 	_screen->_curPage = stackPos(0);
 	_screen->fillRect(stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5));
@@ -1760,20 +1760,20 @@ int KyraEngine::cmd_fillRect(ScriptState *script) {
 	return 0;
 }
 
-int KyraEngine::cmd_vocUnload(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_vocUnload(%p) ()", (const void *)script);
+int KyraEngine::c1_vocUnload(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_vocUnload(%p) ()", (const void *)script);
 	// this should unload all voc files (not needed)
 	return 0;
 }
 
-int KyraEngine::cmd_vocLoad(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_vocLoad(%p) (%d)", (const void *)script, stackPos(0));
+int KyraEngine::c1_vocLoad(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_vocLoad(%p) (%d)", (const void *)script, stackPos(0));
 	// this should load the specified voc file (not needed)
 	return 0;
 }
 
-int KyraEngine::cmd_dummy(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "cmd_dummy(%p) ()", (const void *)script);
+int KyraEngine::c1_dummy(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "c1_dummy(%p) ()", (const void *)script);
 	return 0;
 }
 
diff --git a/engines/kyra/staticres.cpp b/engines/kyra/staticres.cpp
index 03fe9020cc..04254301e6 100644
--- a/engines/kyra/staticres.cpp
+++ b/engines/kyra/staticres.cpp
@@ -815,201 +815,201 @@ const int Screen::_screenDimTableCountK3 = ARRAYSIZE(_screenDimTableK3);
 void KyraEngine::setupOpcodeTable() {
 	static OpcodeProc opcodeTable[] = {
 		// 0x00
-		Opcode(cmd_magicInMouseItem),
-		Opcode(cmd_characterSays),
-		Opcode(cmd_pauseTicks),
-		Opcode(cmd_drawSceneAnimShape),
+		Opcode(c1_magicInMouseItem),
+		Opcode(c1_characterSays),
+		Opcode(c1_pauseTicks),
+		Opcode(c1_drawSceneAnimShape),
 		// 0x04
-		Opcode(cmd_queryGameFlag),
-		Opcode(cmd_setGameFlag),
-		Opcode(cmd_resetGameFlag),
-		Opcode(cmd_runNPCScript),
+		Opcode(c1_queryGameFlag),
+		Opcode(c1_setGameFlag),
+		Opcode(c1_resetGameFlag),
+		Opcode(c1_runNPCScript),
 		// 0x08
-		Opcode(cmd_setSpecialExitList),
-		Opcode(cmd_blockInWalkableRegion),
-		Opcode(cmd_blockOutWalkableRegion),
-		Opcode(cmd_walkPlayerToPoint),
+		Opcode(c1_setSpecialExitList),
+		Opcode(c1_blockInWalkableRegion),
+		Opcode(c1_blockOutWalkableRegion),
+		Opcode(c1_walkPlayerToPoint),
 		// 0x0c
-		Opcode(cmd_dropItemInScene),
-		Opcode(cmd_drawAnimShapeIntoScene),
-		Opcode(cmd_createMouseItem),
-		Opcode(cmd_savePageToDisk),
+		Opcode(c1_dropItemInScene),
+		Opcode(c1_drawAnimShapeIntoScene),
+		Opcode(c1_createMouseItem),
+		Opcode(c1_savePageToDisk),
 		// 0x10
-		Opcode(cmd_sceneAnimOn),
-		Opcode(cmd_sceneAnimOff),
-		Opcode(cmd_getElapsedSeconds),
-		Opcode(cmd_mouseIsPointer),
+		Opcode(c1_sceneAnimOn),
+		Opcode(c1_sceneAnimOff),
+		Opcode(c1_getElapsedSeconds),
+		Opcode(c1_mouseIsPointer),
 		// 0x14
-		Opcode(cmd_destroyMouseItem),
-		Opcode(cmd_runSceneAnimUntilDone),
-		Opcode(cmd_fadeSpecialPalette),
-		Opcode(cmd_playAdlibSound),
+		Opcode(c1_destroyMouseItem),
+		Opcode(c1_runSceneAnimUntilDone),
+		Opcode(c1_fadeSpecialPalette),
+		Opcode(c1_playAdlibSound),
 		// 0x18
-		Opcode(cmd_playAdlibScore),
-		Opcode(cmd_phaseInSameScene),
-		Opcode(cmd_setScenePhasingFlag),
-		Opcode(cmd_resetScenePhasingFlag),
+		Opcode(c1_playAdlibScore),
+		Opcode(c1_phaseInSameScene),
+		Opcode(c1_setScenePhasingFlag),
+		Opcode(c1_resetScenePhasingFlag),
 		// 0x1c
-		Opcode(cmd_queryScenePhasingFlag),
-		Opcode(cmd_sceneToDirection),
-		Opcode(cmd_setBirthstoneGem),
-		Opcode(cmd_placeItemInGenericMapScene),
+		Opcode(c1_queryScenePhasingFlag),
+		Opcode(c1_sceneToDirection),
+		Opcode(c1_setBirthstoneGem),
+		Opcode(c1_placeItemInGenericMapScene),
 		// 0x20
-		Opcode(cmd_setBrandonStatusBit),
-		Opcode(cmd_pauseSeconds),
-		Opcode(cmd_getCharactersLocation),
-		Opcode(cmd_runNPCSubscript),
+		Opcode(c1_setBrandonStatusBit),
+		Opcode(c1_pauseSeconds),
+		Opcode(c1_getCharactersLocation),
+		Opcode(c1_runNPCSubscript),
 		// 0x24
-		Opcode(cmd_magicOutMouseItem),
-		Opcode(cmd_internalAnimOn),
-		Opcode(cmd_forceBrandonToNormal),
-		Opcode(cmd_poisonDeathNow),
+		Opcode(c1_magicOutMouseItem),
+		Opcode(c1_internalAnimOn),
+		Opcode(c1_forceBrandonToNormal),
+		Opcode(c1_poisonDeathNow),
 		// 0x28
-		Opcode(cmd_setScaleMode),
-		Opcode(cmd_openWSAFile),
-		Opcode(cmd_closeWSAFile),
-		Opcode(cmd_runWSAFromBeginningToEnd),
+		Opcode(c1_setScaleMode),
+		Opcode(c1_openWSAFile),
+		Opcode(c1_closeWSAFile),
+		Opcode(c1_runWSAFromBeginningToEnd),
 		// 0x2c
-		Opcode(cmd_displayWSAFrame),
-		Opcode(cmd_enterNewScene),
-		Opcode(cmd_setSpecialEnterXAndY),
-		Opcode(cmd_runWSAFrames),
+		Opcode(c1_displayWSAFrame),
+		Opcode(c1_enterNewScene),
+		Opcode(c1_setSpecialEnterXAndY),
+		Opcode(c1_runWSAFrames),
 		// 0x30
-		Opcode(cmd_popBrandonIntoScene),
-		Opcode(cmd_restoreAllObjectBackgrounds),
-		Opcode(cmd_setCustomPaletteRange),
-		Opcode(cmd_loadPageFromDisk),
+		Opcode(c1_popBrandonIntoScene),
+		Opcode(c1_restoreAllObjectBackgrounds),
+		Opcode(c1_setCustomPaletteRange),
+		Opcode(c1_loadPageFromDisk),
 		// 0x34
-		Opcode(cmd_customPrintTalkString),
-		Opcode(cmd_restoreCustomPrintBackground),
-		Opcode(cmd_hideMouse),
-		Opcode(cmd_showMouse),
+		Opcode(c1_customPrintTalkString),
+		Opcode(c1_restoreCustomPrintBackground),
+		Opcode(c1_hideMouse),
+		Opcode(c1_showMouse),
 		// 0x38
-		Opcode(cmd_getCharacterX),
-		Opcode(cmd_getCharacterY),
-		Opcode(cmd_changeCharactersFacing),
-		Opcode(cmd_copyWSARegion),
+		Opcode(c1_getCharacterX),
+		Opcode(c1_getCharacterY),
+		Opcode(c1_changeCharactersFacing),
+		Opcode(c1_copyWSARegion),
 		// 0x3c
-		Opcode(cmd_printText),
-		Opcode(cmd_random),
-		Opcode(cmd_loadSoundFile),
-		Opcode(cmd_displayWSAFrameOnHidPage),
+		Opcode(c1_printText),
+		Opcode(c1_random),
+		Opcode(c1_loadSoundFile),
+		Opcode(c1_displayWSAFrameOnHidPage),
 		// 0x40
-		Opcode(cmd_displayWSASequentialFrames),
-		Opcode(cmd_drawCharacterStanding),
-		Opcode(cmd_internalAnimOff),
-		Opcode(cmd_changeCharactersXAndY),
+		Opcode(c1_displayWSASequentialFrames),
+		Opcode(c1_drawCharacterStanding),
+		Opcode(c1_internalAnimOff),
+		Opcode(c1_changeCharactersXAndY),
 		// 0x44
-		Opcode(cmd_clearSceneAnimatorBeacon),
-		Opcode(cmd_querySceneAnimatorBeacon),
-		Opcode(cmd_refreshSceneAnimator),
-		Opcode(cmd_placeItemInOffScene),
+		Opcode(c1_clearSceneAnimatorBeacon),
+		Opcode(c1_querySceneAnimatorBeacon),
+		Opcode(c1_refreshSceneAnimator),
+		Opcode(c1_placeItemInOffScene),
 		// 0x48
-		Opcode(cmd_wipeDownMouseItem),
-		Opcode(cmd_placeCharacterInOtherScene),
-		Opcode(cmd_getKey),
-		Opcode(cmd_specificItemInInventory),
+		Opcode(c1_wipeDownMouseItem),
+		Opcode(c1_placeCharacterInOtherScene),
+		Opcode(c1_getKey),
+		Opcode(c1_specificItemInInventory),
 		// 0x4c
-		Opcode(cmd_popMobileNPCIntoScene),
-		Opcode(cmd_mobileCharacterInScene),
-		Opcode(cmd_hideMobileCharacter),
-		Opcode(cmd_unhideMobileCharacter),
+		Opcode(c1_popMobileNPCIntoScene),
+		Opcode(c1_mobileCharacterInScene),
+		Opcode(c1_hideMobileCharacter),
+		Opcode(c1_unhideMobileCharacter),
 		// 0x50
-		Opcode(cmd_setCharactersLocation),
-		Opcode(cmd_walkCharacterToPoint),
-		Opcode(cmd_specialEventDisplayBrynnsNote),
-		Opcode(cmd_specialEventRemoveBrynnsNote),
+		Opcode(c1_setCharactersLocation),
+		Opcode(c1_walkCharacterToPoint),
+		Opcode(c1_specialEventDisplayBrynnsNote),
+		Opcode(c1_specialEventRemoveBrynnsNote),
 		// 0x54
-		Opcode(cmd_setLogicPage),
-		Opcode(cmd_fatPrint),
-		Opcode(cmd_preserveAllObjectBackgrounds),
-		Opcode(cmd_updateSceneAnimations),
+		Opcode(c1_setLogicPage),
+		Opcode(c1_fatPrint),
+		Opcode(c1_preserveAllObjectBackgrounds),
+		Opcode(c1_updateSceneAnimations),
 		// 0x58
-		Opcode(cmd_sceneAnimationActive),
-		Opcode(cmd_setCharactersMovementDelay),
-		Opcode(cmd_getCharactersFacing),
-		Opcode(cmd_bkgdScrollSceneAndMasksRight),
+		Opcode(c1_sceneAnimationActive),
+		Opcode(c1_setCharactersMovementDelay),
+		Opcode(c1_getCharactersFacing),
+		Opcode(c1_bkgdScrollSceneAndMasksRight),
 		// 0x5c
-		Opcode(cmd_dispelMagicAnimation),
-		Opcode(cmd_findBrightestFireberry),
-		Opcode(cmd_setFireberryGlowPalette),
-		Opcode(cmd_setDeathHandlerFlag),
+		Opcode(c1_dispelMagicAnimation),
+		Opcode(c1_findBrightestFireberry),
+		Opcode(c1_setFireberryGlowPalette),
+		Opcode(c1_setDeathHandlerFlag),
 		// 0x60
-		Opcode(cmd_drinkPotionAnimation),
-		Opcode(cmd_makeAmuletAppear),
-		Opcode(cmd_drawItemShapeIntoScene),
-		Opcode(cmd_setCharactersCurrentFrame),
+		Opcode(c1_drinkPotionAnimation),
+		Opcode(c1_makeAmuletAppear),
+		Opcode(c1_drawItemShapeIntoScene),
+		Opcode(c1_setCharactersCurrentFrame),
 		// 0x64
-		Opcode(cmd_waitForConfirmationMouseClick),
-		Opcode(cmd_pageFlip),
-		Opcode(cmd_setSceneFile),
-		Opcode(cmd_getItemInMarbleVase),
+		Opcode(c1_waitForConfirmationMouseClick),
+		Opcode(c1_pageFlip),
+		Opcode(c1_setSceneFile),
+		Opcode(c1_getItemInMarbleVase),
 		// 0x68
-		Opcode(cmd_setItemInMarbleVase),
-		Opcode(cmd_addItemToInventory),
-		Opcode(cmd_intPrint),
-		Opcode(cmd_shakeScreen),
+		Opcode(c1_setItemInMarbleVase),
+		Opcode(c1_addItemToInventory),
+		Opcode(c1_intPrint),
+		Opcode(c1_shakeScreen),
 		// 0x6c
-		Opcode(cmd_createAmuletJewel),
-		Opcode(cmd_setSceneAnimCurrXY),
-		Opcode(cmd_poisonBrandonAndRemaps),
-		Opcode(cmd_fillFlaskWithWater),
+		Opcode(c1_createAmuletJewel),
+		Opcode(c1_setSceneAnimCurrXY),
+		Opcode(c1_poisonBrandonAndRemaps),
+		Opcode(c1_fillFlaskWithWater),
 		// 0x70
-		Opcode(cmd_getCharactersMovementDelay),
-		Opcode(cmd_getBirthstoneGem),
-		Opcode(cmd_queryBrandonStatusBit),
-		Opcode(cmd_playFluteAnimation),
+		Opcode(c1_getCharactersMovementDelay),
+		Opcode(c1_getBirthstoneGem),
+		Opcode(c1_queryBrandonStatusBit),
+		Opcode(c1_playFluteAnimation),
 		// 0x74
-		Opcode(cmd_playWinterScrollSequence),
-		Opcode(cmd_getIdolGem),
-		Opcode(cmd_setIdolGem),
-		Opcode(cmd_totalItemsInScene),
+		Opcode(c1_playWinterScrollSequence),
+		Opcode(c1_getIdolGem),
+		Opcode(c1_setIdolGem),
+		Opcode(c1_totalItemsInScene),
 		// 0x78
-		Opcode(cmd_restoreBrandonsMovementDelay),
-		Opcode(cmd_setMousePos),
-		Opcode(cmd_getMouseState),
-		Opcode(cmd_setEntranceMouseCursorTrack),
+		Opcode(c1_restoreBrandonsMovementDelay),
+		Opcode(c1_setMousePos),
+		Opcode(c1_getMouseState),
+		Opcode(c1_setEntranceMouseCursorTrack),
 		// 0x7c
-		Opcode(cmd_itemAppearsOnGround),
-		Opcode(cmd_setNoDrawShapesFlag),
-		Opcode(cmd_fadeEntirePalette),
-		Opcode(cmd_itemOnGroundHere),
+		Opcode(c1_itemAppearsOnGround),
+		Opcode(c1_setNoDrawShapesFlag),
+		Opcode(c1_fadeEntirePalette),
+		Opcode(c1_itemOnGroundHere),
 		// 0x80
-		Opcode(cmd_queryCauldronState),
-		Opcode(cmd_setCauldronState),
-		Opcode(cmd_queryCrystalState),
-		Opcode(cmd_setCrystalState),
+		Opcode(c1_queryCauldronState),
+		Opcode(c1_setCauldronState),
+		Opcode(c1_queryCrystalState),
+		Opcode(c1_setCrystalState),
 		// 0x84
-		Opcode(cmd_setPaletteRange),
-		Opcode(cmd_shrinkBrandonDown),
-		Opcode(cmd_growBrandonUp),
-		Opcode(cmd_setBrandonScaleXAndY),
+		Opcode(c1_setPaletteRange),
+		Opcode(c1_shrinkBrandonDown),
+		Opcode(c1_growBrandonUp),
+		Opcode(c1_setBrandonScaleXAndY),
 		// 0x88
-		Opcode(cmd_resetScaleMode),
-		Opcode(cmd_getScaleDepthTableValue),
-		Opcode(cmd_setScaleDepthTableValue),
-		Opcode(cmd_message),
+		Opcode(c1_resetScaleMode),
+		Opcode(c1_getScaleDepthTableValue),
+		Opcode(c1_setScaleDepthTableValue),
+		Opcode(c1_message),
 		// 0x8c
-		Opcode(cmd_checkClickOnNPC),
-		Opcode(cmd_getFoyerItem),
-		Opcode(cmd_setFoyerItem),
-		Opcode(cmd_setNoItemDropRegion),
+		Opcode(c1_checkClickOnNPC),
+		Opcode(c1_getFoyerItem),
+		Opcode(c1_setFoyerItem),
+		Opcode(c1_setNoItemDropRegion),
 		// 0x90
-		Opcode(cmd_walkMalcolmOn),
-		Opcode(cmd_passiveProtection),
-		Opcode(cmd_setPlayingLoop),
-		Opcode(cmd_brandonToStoneSequence),
+		Opcode(c1_walkMalcolmOn),
+		Opcode(c1_passiveProtection),
+		Opcode(c1_setPlayingLoop),
+		Opcode(c1_brandonToStoneSequence),
 		// 0x94
-		Opcode(cmd_brandonHealingSequence),
-		Opcode(cmd_protectCommandLine),
-		Opcode(cmd_pauseMusicSeconds),
-		Opcode(cmd_resetMaskRegion),
+		Opcode(c1_brandonHealingSequence),
+		Opcode(c1_protectCommandLine),
+		Opcode(c1_pauseMusicSeconds),
+		Opcode(c1_resetMaskRegion),
 		// 0x98
-		Opcode(cmd_setPaletteChangeFlag),
-		Opcode(cmd_fillRect),
-		Opcode(cmd_vocUnload),
-		Opcode(cmd_vocLoad),
-		Opcode(cmd_dummy)
+		Opcode(c1_setPaletteChangeFlag),
+		Opcode(c1_fillRect),
+		Opcode(c1_vocUnload),
+		Opcode(c1_vocLoad),
+		Opcode(c1_dummy)
 	};
 	
 	_opcodeTable = opcodeTable;
-- 
cgit v1.2.3