diff options
Diffstat (limited to 'engines/kyra/script_v1.cpp')
| -rw-r--r-- | engines/kyra/script_v1.cpp | 298 | 
1 files changed, 149 insertions, 149 deletions
diff --git a/engines/kyra/script_v1.cpp b/engines/kyra/script_v1.cpp index fd0480bb4b..e349fec21e 100644 --- a/engines/kyra/script_v1.cpp +++ b/engines/kyra/script_v1.cpp @@ -38,7 +38,7 @@  namespace Kyra {  int KyraEngine_v1::o1_magicInMouseItem(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1magicInMouseItem(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_magicInMouseItem(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));  	magicInMouseItem(stackPos(0), stackPos(1), -1);  	return 0;  } @@ -46,10 +46,10 @@ int KyraEngine_v1::o1_magicInMouseItem(ScriptState *script) {  int KyraEngine_v1::o1_characterSays(ScriptState *script) {  	_skipFlag = false;  	if (_flags.isTalkie) { -		debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1characterSays(%p) (%d, '%s', %d, %d)", (const void *)script, stackPos(0), stackPosString(1), stackPos(2), stackPos(3)); +		debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_characterSays(%p) (%d, '%s', %d, %d)", (const void *)script, stackPos(0), stackPosString(1), stackPos(2), stackPos(3));  		characterSays(stackPos(0), stackPosString(1), stackPos(2), stackPos(3));  	} else { -		debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1characterSays(%p) ('%s', %d, %d)", (const void *)script, stackPosString(0), stackPos(1), stackPos(2)); +		debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_characterSays(%p) ('%s', %d, %d)", (const void *)script, stackPosString(0), stackPos(1), stackPos(2));  		const char *string = stackPosString(0);  		if ((_flags.platform == Common::kPlatformFMTowns || _flags.platform == Common::kPlatformPC98) && _flags.lang == Common::JA_JPN) { @@ -75,7 +75,7 @@ int KyraEngine_v1::o1_characterSays(ScriptState *script) {  }  int KyraEngine_v1::o1_pauseTicks(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1pauseTicks(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_pauseTicks(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));  	if (stackPos(1)) {  		warning("STUB: special o1_pauseTicks");  		// delete this after correct implementing @@ -87,23 +87,23 @@ int KyraEngine_v1::o1_pauseTicks(ScriptState *script) {  }  int KyraEngine_v1::o1_drawSceneAnimShape(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1drawSceneAnimShape(%p) (%d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_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_v1::o1_queryGameFlag(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1queryGameFlag(%p) (0x%X)", (const void *)script, stackPos(0)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_queryGameFlag(%p) (0x%X)", (const void *)script, stackPos(0));  	return queryGameFlag(stackPos(0));  }  int KyraEngine_v1::o1_setGameFlag(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1setGameFlag(%p) (0x%X)", (const void *)script, stackPos(0)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_setGameFlag(%p) (0x%X)", (const void *)script, stackPos(0));  	return setGameFlag(stackPos(0));  }  int KyraEngine_v1::o1_resetGameFlag(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1resetGameFlag(%p) (0x%X)", (const void *)script, stackPos(0)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_resetGameFlag(%p) (0x%X)", (const void *)script, stackPos(0));  	return resetGameFlag(stackPos(0));  } @@ -113,7 +113,7 @@ int KyraEngine_v1::o1_runNPCScript(ScriptState *script) {  }  int KyraEngine_v1::o1_setSpecialExitList(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1setSpecialExitList(%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)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_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); @@ -123,19 +123,19 @@ int KyraEngine_v1::o1_setSpecialExitList(ScriptState *script) {  }  int KyraEngine_v1::o1_blockInWalkableRegion(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1blockInWalkableRegion(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_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_v1::o1_blockOutWalkableRegion(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1blockOutWalkableRegion(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_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_v1::o1_walkPlayerToPoint(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1walkPlayerToPoint(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_walkPlayerToPoint(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3));  	int normalTimers = stackPos(2);  	if (!normalTimers) { @@ -163,7 +163,7 @@ int KyraEngine_v1::o1_walkPlayerToPoint(ScriptState *script) {  }  int KyraEngine_v1::o1_dropItemInScene(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1dropItemInScene(%p) (%d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_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); @@ -188,7 +188,7 @@ int KyraEngine_v1::o1_dropItemInScene(ScriptState *script) {  }  int KyraEngine_v1::o1_drawAnimShapeIntoScene(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1drawAnimShapeIntoScene(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_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); @@ -206,49 +206,49 @@ int KyraEngine_v1::o1_drawAnimShapeIntoScene(ScriptState *script) {  }  int KyraEngine_v1::o1_createMouseItem(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1createMouseItem(%p) (%d)", (const void *)script, stackPos(0)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_createMouseItem(%p) (%d)", (const void *)script, stackPos(0));  	createMouseItem(stackPos(0));  	return 0;  }  int KyraEngine_v1::o1_savePageToDisk(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1savePageToDisk(%p) ('%s', %d)", (const void *)script, stackPosString(0), stackPos(1)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_savePageToDisk(%p) ('%s', %d)", (const void *)script, stackPosString(0), stackPos(1));  	_screen->savePageToDisk(stackPosString(0), stackPos(1));  	return 0;  }  int KyraEngine_v1::o1_sceneAnimOn(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1sceneAnimOn(%p) (%d)", (const void *)script, stackPos(0)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_sceneAnimOn(%p) (%d)", (const void *)script, stackPos(0));  	_sprites->_anims[stackPos(0)].play = true;  	return 0;  }  int KyraEngine_v1::o1_sceneAnimOff(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1sceneAnimOff(%p) (%d)", (const void *)script, stackPos(0)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_sceneAnimOff(%p) (%d)", (const void *)script, stackPos(0));  	_sprites->_anims[stackPos(0)].play = false;  	return 0;  }  int KyraEngine_v1::o1_getElapsedSeconds(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1getElapsedSeconds(%p) ()", (const void *)script); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_getElapsedSeconds(%p) ()", (const void *)script);  	return _system->getMillis() / 1000;  }  int KyraEngine_v1::o1_mouseIsPointer(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1mouseIsPointer(%p) ()", (const void *)script); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_mouseIsPointer(%p) ()", (const void *)script);  	if (_itemInHand == -1)  		return 1;  	return 0;  }  int KyraEngine_v1::o1_destroyMouseItem(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1destroyMouseItem(%p) ()", (const void *)script); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_destroyMouseItem(%p) ()", (const void *)script);  	destroyMouseItem();  	return 0;  }  int KyraEngine_v1::o1_runSceneAnimUntilDone(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1runSceneAnimUntilDone(%p) (%d)", (const void *)script, stackPos(0)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_runSceneAnimUntilDone(%p) (%d)", (const void *)script, stackPos(0));  	_screen->hideMouse();  	_animator->restoreAllObjectBackgrounds();  	_sprites->_anims[stackPos(0)].play = true; @@ -267,59 +267,59 @@ int KyraEngine_v1::o1_runSceneAnimUntilDone(ScriptState *script) {  int KyraEngine_v1::o1_fadeSpecialPalette(ScriptState *script) {  	if (_flags.platform == Common::kPlatformAmiga) { -		debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1fadeSpecialPalette(%p) (%d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2)); +		debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_fadeSpecialPalette(%p) (%d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2));  		if (_currentCharacter->sceneId != 45) {  			if (stackPos(0) == 13) {  				memcpy(_screen->getPalette(0), _screen->getPalette(0) + 384*3, 32*3);  				_screen->setScreenPalette(_screen->getPalette(0));  			}  		} else { -			warning("KyraEngine_v1::o1fadeSpecialPalette not implemented"); +			warning("KyraEngine_v1::o1_fadeSpecialPalette not implemented");  		}  	} else { -		debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1fadeSpecialPalette(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3)); +		debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_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_v1::o1_playAdlibSound(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1playAdlibSound(%p) (%d)", (const void *)script, stackPos(0)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_playAdlibSound(%p) (%d)", (const void *)script, stackPos(0));  	snd_playSoundEffect(stackPos(0));  	return 0;  }  int KyraEngine_v1::o1_playAdlibScore(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1playAdlibScore(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_playAdlibScore(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));  	snd_playWanderScoreViaMap(stackPos(0), stackPos(1));  	return 0;  }  int KyraEngine_v1::o1_phaseInSameScene(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1phaseInSameScene(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_phaseInSameScene(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));  	transcendScenes(stackPos(0), stackPos(1));  	return 0;  }  int KyraEngine_v1::o1_setScenePhasingFlag(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1setScenePhasingFlag(%p) ()", (const void *)script); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_setScenePhasingFlag(%p) ()", (const void *)script);  	_scenePhasingFlag = 1;  	return 1;  }  int KyraEngine_v1::o1_resetScenePhasingFlag(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1resetScenePhasingFlag(%p) ()", (const void *)script); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_resetScenePhasingFlag(%p) ()", (const void *)script);  	_scenePhasingFlag = 0;  	return 0;  }  int KyraEngine_v1::o1_queryScenePhasingFlag(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1queryScenePhasingFlag(%p) ()", (const void *)script); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_queryScenePhasingFlag(%p) ()", (const void *)script);  	return _scenePhasingFlag;  }  int KyraEngine_v1::o1_sceneToDirection(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1sceneToDirection(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_sceneToDirection(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));  	assert(stackPos(0) < _roomTableSize);  	Room *curRoom = &_roomTable[stackPos(0)];  	uint16 returnValue = 0xFFFF; @@ -349,7 +349,7 @@ int KyraEngine_v1::o1_sceneToDirection(ScriptState *script) {  }  int KyraEngine_v1::o1_setBirthstoneGem(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1setBirthstoneGem(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_setBirthstoneGem(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));  	int index = stackPos(0);  	if (index < 4 && index >= 0) {  		_birthstoneGemTable[index] = stackPos(1); @@ -359,19 +359,19 @@ int KyraEngine_v1::o1_setBirthstoneGem(ScriptState *script) {  }  int KyraEngine_v1::o1_placeItemInGenericMapScene(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1placeItemInGenericMapScene(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_placeItemInGenericMapScene(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));  	placeItemInGenericMapScene(stackPos(0), stackPos(1));  	return 0;  }  int KyraEngine_v1::o1_setBrandonStatusBit(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1setBrandonStatusBit(%p) (%d)", (const void *)script, stackPos(0)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_setBrandonStatusBit(%p) (%d)", (const void *)script, stackPos(0));  	_brandonStatusBit |= stackPos(0);  	return 0;  }  int KyraEngine_v1::o1_pauseSeconds(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1pauseSeconds(%p) (%d)", (const void *)script, stackPos(0)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_pauseSeconds(%p) (%d)", (const void *)script, stackPos(0));  	if (stackPos(0) > 0 && !_skipFlag)  		delay(stackPos(0)*1000, true);  	_skipFlag = false; @@ -379,7 +379,7 @@ int KyraEngine_v1::o1_pauseSeconds(ScriptState *script) {  }  int KyraEngine_v1::o1_getCharactersLocation(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1getCharactersLocation(%p) (%d)", (const void *)script, stackPos(0)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_getCharactersLocation(%p) (%d)", (const void *)script, stackPos(0));  	return _characterList[stackPos(0)].sceneId;  } @@ -389,31 +389,31 @@ int KyraEngine_v1::o1_runNPCSubscript(ScriptState *script) {  }  int KyraEngine_v1::o1_magicOutMouseItem(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1magicOutMouseItem(%p) (%d)", (const void *)script, stackPos(0)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_magicOutMouseItem(%p) (%d)", (const void *)script, stackPos(0));  	magicOutMouseItem(stackPos(0), -1);  	return 0;  }  int KyraEngine_v1::o1_internalAnimOn(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1internalAnimOn(%p) (%d)", (const void *)script, stackPos(0)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_internalAnimOn(%p) (%d)", (const void *)script, stackPos(0));  	_animator->sprites()[stackPos(0)].active = 1;  	return 0;  }  int KyraEngine_v1::o1_forceBrandonToNormal(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1forceBrandonToNormal(%p) ()", (const void *)script); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_forceBrandonToNormal(%p) ()", (const void *)script);  	checkAmuletAnimFlags();  	return 0;  }  int KyraEngine_v1::o1_poisonDeathNow(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1poisonDeathNow(%p) ()", (const void *)script); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_poisonDeathNow(%p) ()", (const void *)script);  	seq_poisonDeathNow(1);  	return 0;  }  int KyraEngine_v1::o1_setScaleMode(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1setScaleMode(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_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); @@ -431,7 +431,7 @@ int KyraEngine_v1::o1_setScaleMode(ScriptState *script) {  }  int KyraEngine_v1::o1_openWSAFile(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1openWSAFile(%p) ('%s', %d, %d, %d)", (const void *)script, stackPosString(0), stackPos(1), stackPos(2), stackPos(3)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_openWSAFile(%p) ('%s', %d, %d, %d)", (const void *)script, stackPosString(0), stackPos(1), stackPos(2), stackPos(3));  	const char *filename = stackPosString(0);  	int wsaIndex = stackPos(1); @@ -443,7 +443,7 @@ int KyraEngine_v1::o1_openWSAFile(ScriptState *script) {  }  int KyraEngine_v1::o1_closeWSAFile(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1closeWSAFile(%p) (%d)", (const void *)script, stackPos(0)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_closeWSAFile(%p) (%d)", (const void *)script, stackPos(0));  	int wsaIndex = stackPos(0);  	if (_movieObjects[wsaIndex]) @@ -453,7 +453,7 @@ int KyraEngine_v1::o1_closeWSAFile(ScriptState *script) {  }  int KyraEngine_v1::o1_runWSAFromBeginningToEnd(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1runWSAFromBeginningToEnd(%p) (%d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_runWSAFromBeginningToEnd(%p) (%d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4));  	_screen->hideMouse(); @@ -494,7 +494,7 @@ int KyraEngine_v1::o1_runWSAFromBeginningToEnd(ScriptState *script) {  }  int KyraEngine_v1::o1_displayWSAFrame(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1displayWSAFrame(%p) (%d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_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); @@ -521,13 +521,13 @@ int KyraEngine_v1::o1_displayWSAFrame(ScriptState *script) {  }  int KyraEngine_v1::o1_enterNewScene(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1enterNewScene(%p) (%d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_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_v1::o1_setSpecialEnterXAndY(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1setSpecialEnterXAndY(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_setSpecialEnterXAndY(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));  	_brandonPosX = stackPos(0);  	_brandonPosY = stackPos(1);  	if (_brandonPosX + 1 == 0 && _brandonPosY + 1 == 0) @@ -536,7 +536,7 @@ int KyraEngine_v1::o1_setSpecialEnterXAndY(ScriptState *script) {  }  int KyraEngine_v1::o1_runWSAFrames(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1runWSAFrames(%p) (%d, %d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_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); @@ -563,7 +563,7 @@ int KyraEngine_v1::o1_runWSAFrames(ScriptState *script) {  }  int KyraEngine_v1::o1_popBrandonIntoScene(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1popBrandonIntoScene(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_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); @@ -612,7 +612,7 @@ int KyraEngine_v1::o1_popBrandonIntoScene(ScriptState *script) {  }  int KyraEngine_v1::o1_restoreAllObjectBackgrounds(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1restoreAllObjectBackgrounds(%p) (%d)", (const void *)script, stackPos(0)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_restoreAllObjectBackgrounds(%p) (%d)", (const void *)script, stackPos(0));  	int disable = stackPos(0);  	int activeBackup = 0;  	if (disable) { @@ -626,13 +626,13 @@ int KyraEngine_v1::o1_restoreAllObjectBackgrounds(ScriptState *script) {  }  int KyraEngine_v1::o1_setCustomPaletteRange(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1setCustomPaletteRange(%p) (%d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_setCustomPaletteRange(%p) (%d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2));  	memcpy(_screen->getPalette(1) + stackPos(1)*3, _specialPalettes[stackPos(0)], stackPos(2)*3);  	return 0;  }  int KyraEngine_v1::o1_loadPageFromDisk(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1loadPageFromDisk(%p) ('%s', %d)", (const void *)script, stackPosString(0), stackPos(1)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_loadPageFromDisk(%p) ('%s', %d)", (const void *)script, stackPosString(0), stackPos(1));  	_screen->loadPageFromDisk(stackPosString(0), stackPos(1));  	_animator->_updateScreen = true;  	return 0; @@ -640,7 +640,7 @@ int KyraEngine_v1::o1_loadPageFromDisk(ScriptState *script) {  int KyraEngine_v1::o1_customPrintTalkString(ScriptState *script) {  	if (_flags.isTalkie) { -		debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1customPrintTalkString(%p) (%d, '%s', %d, %d, %d)", (const void *)script, stackPos(0), stackPosString(1), stackPos(2), stackPos(3), stackPos(4) & 0xFF); +		debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_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(); @@ -650,7 +650,7 @@ int KyraEngine_v1::o1_customPrintTalkString(ScriptState *script) {  		if (textEnabled())  			_text->printTalkTextMessage(stackPosString(1), stackPos(2), stackPos(3), stackPos(4) & 0xFF, 0, 2);  	} else { -		debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1customPrintTalkString(%p) ('%s', %d, %d, %d)", (const void *)script, stackPosString(0), stackPos(1), stackPos(2), stackPos(3) & 0xFF); +		debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_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);  	} @@ -659,7 +659,7 @@ int KyraEngine_v1::o1_customPrintTalkString(ScriptState *script) {  }  int KyraEngine_v1::o1_restoreCustomPrintBackground(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1restoreCustomPrintBackground(%p) ()", (const void *)script); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_restoreCustomPrintBackground(%p) ()", (const void *)script);  	snd_voiceWaitForFinish();  	snd_stopVoice();  	_text->restoreTalkTextMessageBkgd(2, 0); @@ -667,29 +667,29 @@ int KyraEngine_v1::o1_restoreCustomPrintBackground(ScriptState *script) {  }  int KyraEngine_v1::o1_hideMouse(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1hideMouse(%p) ()", (const void *)script); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_hideMouse(%p) ()", (const void *)script);  	_screen->hideMouse();  	return 0;  }  int KyraEngine_v1::o1_showMouse(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1showMouse(%p) ()", (const void *)script); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_showMouse(%p) ()", (const void *)script);  	_screen->showMouse();  	return 0;  }  int KyraEngine_v1::o1_getCharacterX(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1getCharacterX(%p) (%d)", (const void *)script, stackPos(0)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_getCharacterX(%p) (%d)", (const void *)script, stackPos(0));  	return _characterList[stackPos(0)].x1;  }  int KyraEngine_v1::o1_getCharacterY(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1getCharacterY(%p) (%d)", (const void *)script, stackPos(0)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_getCharacterY(%p) (%d)", (const void *)script, stackPos(0));  	return _characterList[stackPos(0)].y1;  }  int KyraEngine_v1::o1_changeCharactersFacing(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1changeCharactersFacing(%p) (%d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_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); @@ -707,7 +707,7 @@ int KyraEngine_v1::o1_changeCharactersFacing(ScriptState *script) {  }  int KyraEngine_v1::o1_copyWSARegion(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1copyWSARegion(%p) (%d, %d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_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); @@ -720,7 +720,7 @@ int KyraEngine_v1::o1_copyWSARegion(ScriptState *script) {  }  int KyraEngine_v1::o1_printText(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1printText(%p) ('%s', %d, %d, 0x%X, 0x%X)", (const void *)script, stackPosString(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_printText(%p) ('%s', %d, %d, 0x%X, 0x%X)", (const void *)script, stackPosString(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4));  	if (_flags.lang == Common::JA_JPN && stackPos(3) == 7)  		_screen->printText(stackPosString(0), stackPos(1), stackPos(2), 0, 0x80);  	else @@ -730,7 +730,7 @@ int KyraEngine_v1::o1_printText(ScriptState *script) {  }  int KyraEngine_v1::o1_random(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1random(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_random(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));  	assert(stackPos(0) < stackPos(1));  	return _rnd.getRandomNumberRng(stackPos(0), stackPos(1));  } @@ -741,7 +741,7 @@ int KyraEngine_v1::o1_loadSoundFile(ScriptState *script) {  }  int KyraEngine_v1::o1_displayWSAFrameOnHidPage(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1displayWSAFrameOnHidPage(%p) (%d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_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); @@ -770,7 +770,7 @@ int KyraEngine_v1::o1_displayWSAFrameOnHidPage(ScriptState *script) {  }  int KyraEngine_v1::o1_displayWSASequentialFrames(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1displayWSASequentialFrames(%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)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_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); @@ -846,7 +846,7 @@ int KyraEngine_v1::o1_displayWSASequentialFrames(ScriptState *script) {  }  int KyraEngine_v1::o1_drawCharacterStanding(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1drawCharacterStanding(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_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); @@ -861,13 +861,13 @@ int KyraEngine_v1::o1_drawCharacterStanding(ScriptState *script) {  }  int KyraEngine_v1::o1_internalAnimOff(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1internalAnimOff(%p) (%d)", (const void *)script, stackPos(0)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_internalAnimOff(%p) (%d)", (const void *)script, stackPos(0));  	_animator->sprites()[stackPos(0)].active = 0;  	return 0;  }  int KyraEngine_v1::o1_changeCharactersXAndY(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1changeCharactersXAndY(%p) (%d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_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); @@ -883,25 +883,25 @@ int KyraEngine_v1::o1_changeCharactersXAndY(ScriptState *script) {  }  int KyraEngine_v1::o1_clearSceneAnimatorBeacon(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1clearSceneAnimatorBeacon(%p) ()", (const void *)script); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_clearSceneAnimatorBeacon(%p) ()", (const void *)script);  	_sprites->_sceneAnimatorBeaconFlag = 0;  	return 0;  }  int KyraEngine_v1::o1_querySceneAnimatorBeacon(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1querySceneAnimatorBeacon(%p) ()", (const void *)script); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_querySceneAnimatorBeacon(%p) ()", (const void *)script);  	return _sprites->_sceneAnimatorBeaconFlag;  }  int KyraEngine_v1::o1_refreshSceneAnimator(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1refreshSceneAnimator(%p) ()", (const void *)script); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_refreshSceneAnimator(%p) ()", (const void *)script);  	_sprites->updateSceneAnims();  	_animator->updateAllObjectShapes();  	return 0;  }  int KyraEngine_v1::o1_placeItemInOffScene(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1placeItemInOffScene(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_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); @@ -920,7 +920,7 @@ int KyraEngine_v1::o1_placeItemInOffScene(ScriptState *script) {  }  int KyraEngine_v1::o1_wipeDownMouseItem(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1wipeDownMouseItem(%p) (%d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_wipeDownMouseItem(%p) (%d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2));  	_screen->hideMouse();  	wipeDownMouseItem(stackPos(1), stackPos(2));  	destroyMouseItem(); @@ -929,7 +929,7 @@ int KyraEngine_v1::o1_wipeDownMouseItem(ScriptState *script) {  }  int KyraEngine_v1::o1_placeCharacterInOtherScene(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1placeCharacterInOtherScene(%p) (%d, %d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_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); @@ -946,7 +946,7 @@ int KyraEngine_v1::o1_placeCharacterInOtherScene(ScriptState *script) {  }  int KyraEngine_v1::o1_getKey(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1getKey(%p) ()", (const void *)script); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_getKey(%p) ()", (const void *)script);  	waitForEvent();  	return 0;  } @@ -957,7 +957,7 @@ int KyraEngine_v1::o1_specificItemInInventory(ScriptState *script) {  }  int KyraEngine_v1::o1_popMobileNPCIntoScene(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1popMobileNPCIntoScene(%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)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_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); @@ -993,7 +993,7 @@ int KyraEngine_v1::o1_unhideMobileCharacter(ScriptState *script) {  }  int KyraEngine_v1::o1_setCharactersLocation(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1setCharactersLocation(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_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); @@ -1010,7 +1010,7 @@ int KyraEngine_v1::o1_setCharactersLocation(ScriptState *script) {  }  int KyraEngine_v1::o1_walkCharacterToPoint(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1walkCharacterToPoint(%p) (%d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_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); @@ -1092,7 +1092,7 @@ int KyraEngine_v1::o1_walkCharacterToPoint(ScriptState *script) {  }  int KyraEngine_v1::o1_specialEventDisplayBrynnsNote(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1specialEventDisplayBrynnsNote(%p) ()", (const void *)script); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_specialEventDisplayBrynnsNote(%p) ()", (const void *)script);  	_screen->hideMouse();  	_screen->savePageToDisk("HIDPAGE.TMP", 2);  	_screen->savePageToDisk("SEENPAGE.TMP", 0); @@ -1114,7 +1114,7 @@ int KyraEngine_v1::o1_specialEventDisplayBrynnsNote(ScriptState *script) {  }  int KyraEngine_v1::o1_specialEventRemoveBrynnsNote(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1specialEventRemoveBrynnsNote(%p) ()", (const void *)script); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_specialEventRemoveBrynnsNote(%p) ()", (const void *)script);  	_screen->hideMouse();  	_screen->loadPageFromDisk("SEENPAGE.TMP", 0);  	_screen->loadPageFromDisk("HIDPAGE.TMP", 2); @@ -1125,13 +1125,13 @@ int KyraEngine_v1::o1_specialEventRemoveBrynnsNote(ScriptState *script) {  }  int KyraEngine_v1::o1_setLogicPage(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1setLogicPage(%p) (%d)", (const void *)script, stackPos(0)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_setLogicPage(%p) (%d)", (const void *)script, stackPos(0));  	_screen->_curPage = stackPos(0);  	return stackPos(0);  }  int KyraEngine_v1::o1_fatPrint(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1fatPrint(%p) ('%s', %d, %d, %d, %d, %d)", (const void *)script, stackPosString(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_fatPrint(%p) ('%s', %d, %d, %d, %d, %d)", (const void *)script, stackPosString(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5));  	// Workround for bug #1582672 ("KYRA1: Text crippled and drawn wrong")  	// I'm not sure how the original handels this, since it seems to call @@ -1144,13 +1144,13 @@ int KyraEngine_v1::o1_fatPrint(ScriptState *script) {  }  int KyraEngine_v1::o1_preserveAllObjectBackgrounds(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1preserveAllObjectBackgrounds(%p) ()", (const void *)script); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_preserveAllObjectBackgrounds(%p) ()", (const void *)script);  	_animator->preserveAllBackgrounds();  	return 0;  }  int KyraEngine_v1::o1_updateSceneAnimations(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1updateSceneAnimations(%p) (%d)", (const void *)script, stackPos(0)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_updateSceneAnimations(%p) (%d)", (const void *)script, stackPos(0));  	int times = stackPos(0);  	while (times--) {  		_sprites->updateSceneAnims(); @@ -1160,23 +1160,23 @@ int KyraEngine_v1::o1_updateSceneAnimations(ScriptState *script) {  }  int KyraEngine_v1::o1_sceneAnimationActive(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1sceneAnimationActive(%p) (%d)", (const void *)script, stackPos(0)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_sceneAnimationActive(%p) (%d)", (const void *)script, stackPos(0));  	return _sprites->_anims[stackPos(0)].play;  }  int KyraEngine_v1::o1_setCharactersMovementDelay(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1setCharactersMovementDelay(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_setCharactersMovementDelay(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));  	_timer->setDelay(stackPos(0)+5, stackPos(1));  	return 0;  }  int KyraEngine_v1::o1_getCharactersFacing(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1getCharactersFacing(%p) (%d)", (const void *)script, stackPos(0)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_getCharactersFacing(%p) (%d)", (const void *)script, stackPos(0));  	return _characterList[stackPos(0)].facing;  }  int KyraEngine_v1::o1_bkgdScrollSceneAndMasksRight(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1bkgdScrollSceneAndMasksRight(%p) (%d)", (const void *)script, stackPos(0)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_bkgdScrollSceneAndMasksRight(%p) (%d)", (const void *)script, stackPos(0));  	_screen->copyBackgroundBlock(stackPos(0), 2, 0);  	_screen->copyBackgroundBlock2(stackPos(0));  	// update the whole screen @@ -1186,13 +1186,13 @@ int KyraEngine_v1::o1_bkgdScrollSceneAndMasksRight(ScriptState *script) {  }  int KyraEngine_v1::o1_dispelMagicAnimation(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1dispelMagicAnimation(%p) ()", (const void *)script); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_dispelMagicAnimation(%p) ()", (const void *)script);  	seq_dispelMagicAnimation();  	return 0;  }  int KyraEngine_v1::o1_findBrightestFireberry(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1findBrightestFireberry(%p) ()", (const void *)script); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_findBrightestFireberry(%p) ()", (const void *)script);  	if (_currentCharacter->sceneId >= 187 && _currentCharacter->sceneId <= 198)  		return 29; @@ -1236,7 +1236,7 @@ int KyraEngine_v1::o1_findBrightestFireberry(ScriptState *script) {  }  int KyraEngine_v1::o1_setFireberryGlowPalette(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1setFireberryGlowPalette(%p) (%d)", (const void *)script, stackPos(0)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_setFireberryGlowPalette(%p) (%d)", (const void *)script, stackPos(0));  	int palIndex = 0;  	switch (stackPos(0)) {  	case 0x1E: @@ -1273,19 +1273,19 @@ int KyraEngine_v1::o1_setFireberryGlowPalette(ScriptState *script) {  }  int KyraEngine_v1::o1_setDeathHandlerFlag(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1setDeathHandlerFlag(%p) (%d)", (const void *)script, stackPos(0)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_setDeathHandlerFlag(%p) (%d)", (const void *)script, stackPos(0));  	_deathHandler = stackPos(0);  	return 0;  }  int KyraEngine_v1::o1_drinkPotionAnimation(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1drinkPotionAnimation(%p) (%d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_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_v1::o1_makeAmuletAppear(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1makeAmuletAppear(%p) ()", (const void *)script); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_makeAmuletAppear(%p) ()", (const void *)script);  	WSAMovieV1 amulet(this);  	amulet.open("AMULET.WSA", 1, 0);  	amulet.setX(224); @@ -1326,7 +1326,7 @@ int KyraEngine_v1::o1_makeAmuletAppear(ScriptState *script) {  }  int KyraEngine_v1::o1_drawItemShapeIntoScene(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1drawItemShapeIntoScene(%p) (%d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_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); @@ -1353,13 +1353,13 @@ int KyraEngine_v1::o1_drawItemShapeIntoScene(ScriptState *script) {  }  int KyraEngine_v1::o1_setCharactersCurrentFrame(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1setCharactersCurrentFrame(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_setCharactersCurrentFrame(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));  	_characterList[stackPos(0)].currentAnimFrame = stackPos(1);  	return 0;  }  int KyraEngine_v1::o1_waitForConfirmationMouseClick(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1waitForConfirmationMouseClick(%p) ()", (const void *)script); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_waitForConfirmationMouseClick(%p) ()", (const void *)script);  	// if (mouseEnabled) {  	while (!_mousePressFlag) {  		updateMousePointer(); @@ -1389,18 +1389,18 @@ int KyraEngine_v1::o1_pageFlip(ScriptState *script) {  }  int KyraEngine_v1::o1_setSceneFile(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1setSceneFile(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_setSceneFile(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));  	setSceneFile(stackPos(0), stackPos(1));  	return 0;  }  int KyraEngine_v1::o1_getItemInMarbleVase(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1getItemInMarbleVase(%p) ()", (const void *)script); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_getItemInMarbleVase(%p) ()", (const void *)script);  	return _marbleVaseItem;  }  int KyraEngine_v1::o1_setItemInMarbleVase(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1setItemInMarbleVase(%p) (%d)", (const void *)script, stackPos(0)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_setItemInMarbleVase(%p) (%d)", (const void *)script, stackPos(0));  	_marbleVaseItem = stackPos(0);  	return 0;  } @@ -1416,7 +1416,7 @@ int KyraEngine_v1::o1_intPrint(ScriptState *script) {  }  int KyraEngine_v1::o1_shakeScreen(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1shakeScreen(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_shakeScreen(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));  	int waitTicks = stackPos(1);  	int times = stackPos(0); @@ -1429,57 +1429,57 @@ int KyraEngine_v1::o1_shakeScreen(ScriptState *script) {  }  int KyraEngine_v1::o1_createAmuletJewel(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1createAmuletJewel(%p) (%d)", (const void *)script, stackPos(0)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_createAmuletJewel(%p) (%d)", (const void *)script, stackPos(0));  	seq_createAmuletJewel(stackPos(0), 0, 0, 0);  	return 0;  }  int KyraEngine_v1::o1_setSceneAnimCurrXY(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1setSceneAnimCurrXY(%p) (%d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_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_v1::o1_poisonBrandonAndRemaps(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1poisonBrandonAndRemaps(%p) ()", (const void *)script); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_poisonBrandonAndRemaps(%p) ()", (const void *)script);  	setBrandonPoisonFlags(1);  	return 0;  }  int KyraEngine_v1::o1_fillFlaskWithWater(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1fillFlaskWithWater(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_fillFlaskWithWater(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));  	seq_fillFlaskWithWater(stackPos(0), stackPos(1));  	return 0;  }  int KyraEngine_v1::o1_getCharactersMovementDelay(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1getCharactersMovementDelay(%p) (%d)", (const void *)script, stackPos(0)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_getCharactersMovementDelay(%p) (%d)", (const void *)script, stackPos(0));  	return _timer->getDelay(stackPos(0)+5);  }  int KyraEngine_v1::o1_getBirthstoneGem(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1getBirthstoneGem(%p) (%d)", (const void *)script, stackPos(0)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_getBirthstoneGem(%p) (%d)", (const void *)script, stackPos(0));  	if (stackPos(0) < 4)  		return _birthstoneGemTable[stackPos(0)];  	return 0;  }  int KyraEngine_v1::o1_queryBrandonStatusBit(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1queryBrandonStatusBit(%p) (%d)", (const void *)script, stackPos(0)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_queryBrandonStatusBit(%p) (%d)", (const void *)script, stackPos(0));  	if (_brandonStatusBit & stackPos(0))  		return 1;  	return 0;  }  int KyraEngine_v1::o1_playFluteAnimation(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1playFluteAnimation(%p) ()", (const void *)script); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_playFluteAnimation(%p) ()", (const void *)script);  	seq_playFluteAnimation();  	return 0;  }  int KyraEngine_v1::o1_playWinterScrollSequence(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1playWinterScrollSequence(%p) (%d)", (const void *)script, stackPos(0)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_playWinterScrollSequence(%p) (%d)", (const void *)script, stackPos(0));  	if (!stackPos(0))  		seq_winterScroll2();  	else @@ -1488,40 +1488,40 @@ int KyraEngine_v1::o1_playWinterScrollSequence(ScriptState *script) {  }  int KyraEngine_v1::o1_getIdolGem(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1getIdolGem(%p) (%d)", (const void *)script, stackPos(0)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_getIdolGem(%p) (%d)", (const void *)script, stackPos(0));  	return _idolGemsTable[stackPos(0)];  }  int KyraEngine_v1::o1_setIdolGem(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1setIdolGem(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_setIdolGem(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));  	_idolGemsTable[stackPos(0)] = stackPos(1);  	return 0;  }  int KyraEngine_v1::o1_totalItemsInScene(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1totalItemsInScene(%p) (%d)", (const void *)script, stackPos(0)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_totalItemsInScene(%p) (%d)", (const void *)script, stackPos(0));  	return countItemsInScene(stackPos(0));  }  int KyraEngine_v1::o1_restoreBrandonsMovementDelay(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1restoreBrandonsMovementDelay(%p) ()", (const void *)script); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_restoreBrandonsMovementDelay(%p) ()", (const void *)script);  	setWalkspeed(_configWalkspeed);  	return 0;  }  int KyraEngine_v1::o1_setMousePos(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1setMousePos(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_setMousePos(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));  	_system->warpMouse(stackPos(0), stackPos(1));  	return 0;  }  int KyraEngine_v1::o1_getMouseState(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1getMouseState(%p) ()", (const void *)script); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_getMouseState(%p) ()", (const void *)script);  	return _mouseState;  }  int KyraEngine_v1::o1_setEntranceMouseCursorTrack(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1setEntranceMouseCursorTrack(%p) (%d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_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; @@ -1531,19 +1531,19 @@ int KyraEngine_v1::o1_setEntranceMouseCursorTrack(ScriptState *script) {  }  int KyraEngine_v1::o1_itemAppearsOnGround(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1itemAppearsOnGround(%p) (%d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_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_v1::o1_setNoDrawShapesFlag(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1setNoDrawShapesFlag(%p) (%d)", (const void *)script, stackPos(0)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_setNoDrawShapesFlag(%p) (%d)", (const void *)script, stackPos(0));  	_animator->_noDrawShapesFlag = stackPos(0);  	return 0;  }  int KyraEngine_v1::o1_fadeEntirePalette(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1fadeEntirePalette(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_fadeEntirePalette(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));  	int cmd = stackPos(0);  	uint8 *fadePal = 0; @@ -1583,7 +1583,7 @@ int KyraEngine_v1::o1_fadeEntirePalette(ScriptState *script) {  }  int KyraEngine_v1::o1_itemOnGroundHere(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1itemOnGroundHere(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_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) { @@ -1594,18 +1594,18 @@ int KyraEngine_v1::o1_itemOnGroundHere(ScriptState *script) {  }  int KyraEngine_v1::o1_queryCauldronState(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1queryCauldronState(%p) ()", (const void *)script); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_queryCauldronState(%p) ()", (const void *)script);  	return _cauldronState;  }  int KyraEngine_v1::o1_setCauldronState(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1setCauldronState(%p) (%d)", (const void *)script, stackPos(0)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_setCauldronState(%p) (%d)", (const void *)script, stackPos(0));  	_cauldronState = stackPos(0);  	return _cauldronState;  }  int KyraEngine_v1::o1_queryCrystalState(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1queryCrystalState(%p) (%d)", (const void *)script, stackPos(0)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_queryCrystalState(%p) (%d)", (const void *)script, stackPos(0));  	if (!stackPos(0))  		return _crystalState[0];  	else if (stackPos(0) == 1) @@ -1614,7 +1614,7 @@ int KyraEngine_v1::o1_queryCrystalState(ScriptState *script) {  }  int KyraEngine_v1::o1_setCrystalState(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1setCrystalState(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_setCrystalState(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));  	if (!stackPos(0))  		_crystalState[0] = stackPos(1);  	else if (stackPos(0) == 1) @@ -1628,7 +1628,7 @@ int KyraEngine_v1::o1_setPaletteRange(ScriptState *script) {  }  int KyraEngine_v1::o1_shrinkBrandonDown(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1shrinkBrandonDown(%p) (%d)", (const void *)script, stackPos(0)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_shrinkBrandonDown(%p) (%d)", (const void *)script, stackPos(0));  	int delayTime = stackPos(0);  	checkAmuletAnimFlags();  	int scaleValue = _scaleTable[_currentCharacter->y1]; @@ -1654,7 +1654,7 @@ int KyraEngine_v1::o1_shrinkBrandonDown(ScriptState *script) {  }  int KyraEngine_v1::o1_growBrandonUp(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1growBrandonUp(%p) ()", (const void *)script); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_growBrandonUp(%p) ()", (const void *)script);  	int scaleValue = _scaleTable[_currentCharacter->y1];  	int scale = 0;  	if (_scaleMode) @@ -1675,26 +1675,26 @@ int KyraEngine_v1::o1_growBrandonUp(ScriptState *script) {  }  int KyraEngine_v1::o1_setBrandonScaleXAndY(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1setBrandonScaleXAndY(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_setBrandonScaleXAndY(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));  	_animator->_brandonScaleX = stackPos(0);  	_animator->_brandonScaleY = stackPos(1);  	return 0;  }  int KyraEngine_v1::o1_resetScaleMode(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1resetScaleMode(%p) ()", (const void *)script); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_resetScaleMode(%p) ()", (const void *)script);  	_scaleMode = 0;  	return 0;  }  int KyraEngine_v1::o1_getScaleDepthTableValue(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1getScaleDepthTableValue(%p) (%d)", (const void *)script, stackPos(0)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_getScaleDepthTableValue(%p) (%d)", (const void *)script, stackPos(0));  	assert(stackPos(0) < ARRAYSIZE(_scaleTable));  	return _scaleTable[stackPos(0)];  }  int KyraEngine_v1::o1_setScaleDepthTableValue(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1setScaleDepthTableValue(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_setScaleDepthTableValue(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));  	assert(stackPos(0) < ARRAYSIZE(_scaleTable));  	_scaleTable[stackPos(0)] = stackPos(1);  	return stackPos(1); @@ -1702,10 +1702,10 @@ int KyraEngine_v1::o1_setScaleDepthTableValue(ScriptState *script) {  int KyraEngine_v1::o1_message(ScriptState *script) {  	if (_flags.isTalkie) { -		debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1message(%p) (%d, '%s', %d)", (const void *)script, stackPos(0), stackPosString(1), stackPos(2)); +		debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_message(%p) (%d, '%s', %d)", (const void *)script, stackPos(0), stackPosString(1), stackPos(2));  		drawSentenceCommand(stackPosString(1), stackPos(2));  	} else { -		debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1message(%p) ('%s', %d)", (const void *)script, stackPosString(0), stackPos(1)); +		debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_message(%p) ('%s', %d)", (const void *)script, stackPosString(0), stackPos(1));  		drawSentenceCommand(stackPosString(0), stackPos(1));  	} @@ -1713,38 +1713,38 @@ int KyraEngine_v1::o1_message(ScriptState *script) {  }  int KyraEngine_v1::o1_checkClickOnNPC(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1checkClickOnNPC(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_checkClickOnNPC(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));  	return checkForNPCScriptRun(stackPos(0), stackPos(1));  }  int KyraEngine_v1::o1_getFoyerItem(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1getFoyerItem(%p) (%d)", (const void *)script, stackPos(0)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_getFoyerItem(%p) (%d)", (const void *)script, stackPos(0));  	assert(stackPos(0) < ARRAYSIZE(_foyerItemTable));  	return _foyerItemTable[stackPos(0)];  }  int KyraEngine_v1::o1_setFoyerItem(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1setFoyerItem(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_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_v1::o1_setNoItemDropRegion(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1setNoItemDropRegion(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_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_v1::o1_walkMalcolmOn(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1walkMalcolmOn(%p) ()", (const void *)script); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_walkMalcolmOn(%p) ()", (const void *)script);  	if (!_malcolmFlag)  		_malcolmFlag = 1;  	return 0;  }  int KyraEngine_v1::o1_passiveProtection(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1passiveProtection(%p) ()", (const void *)script); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_passiveProtection(%p) ()", (const void *)script);  	return 1;  } @@ -1754,24 +1754,24 @@ int KyraEngine_v1::o1_setPlayingLoop(ScriptState *script) {  }  int KyraEngine_v1::o1_brandonToStoneSequence(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1brandonToStoneSequence(%p) ()", (const void *)script); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_brandonToStoneSequence(%p) ()", (const void *)script);  	seq_brandonToStone();  	return 0;  }  int KyraEngine_v1::o1_brandonHealingSequence(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1brandonHealingSequence(%p) ()", (const void *)script); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_brandonHealingSequence(%p) ()", (const void *)script);  	seq_brandonHealing();  	return 0;  }  int KyraEngine_v1::o1_protectCommandLine(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1protectCommandLine(%p) (%d)", (const void *)script, stackPos(0)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_protectCommandLine(%p) (%d)", (const void *)script, stackPos(0));  	return stackPos(0);  }  int KyraEngine_v1::o1_pauseMusicSeconds(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1pauseMusicSeconds(%p) ()", (const void *)script); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_pauseMusicSeconds(%p) ()", (const void *)script);  	// if music disabled  	//     return  	o1_pauseSeconds(script); @@ -1784,13 +1784,13 @@ int KyraEngine_v1::o1_resetMaskRegion(ScriptState *script) {  }  int KyraEngine_v1::o1_setPaletteChangeFlag(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1setPaletteChangeFlag(%p) (%d)", (const void *)script, stackPos(0)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_setPaletteChangeFlag(%p) (%d)", (const void *)script, stackPos(0));  	_paletteChanged = stackPos(0);  	return _paletteChanged;  }  int KyraEngine_v1::o1_fillRect(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1fillRect(%p) (%d, %d, %d, %d, %d, 0x%X)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_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)); @@ -1799,19 +1799,19 @@ int KyraEngine_v1::o1_fillRect(ScriptState *script) {  }  int KyraEngine_v1::o1_vocUnload(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1vocUnload(%p) ()", (const void *)script); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_vocUnload(%p) ()", (const void *)script);  	// this should unload all voc files (not needed)  	return 0;  }  int KyraEngine_v1::o1_vocLoad(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1vocLoad(%p) (%d)", (const void *)script, stackPos(0)); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_vocLoad(%p) (%d)", (const void *)script, stackPos(0));  	// this should load the specified voc file (not needed)  	return 0;  }  int KyraEngine_v1::o1_dummy(ScriptState *script) { -	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1dummy(%p) ()", (const void *)script); +	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_dummy(%p) ()", (const void *)script);  	return 0;  }  | 
