Reworked kyra debug output system. Now he have special kyra intern debug levels + the global debug levels, for now I enable all kyra debug levels if the global debug level is not -1. see 'toggle_debug' in the kyra debugger and kyra.h for the different levels. (This is just the beginning of it anyway, for example the sound debug level isn't used for now)

svn-id: r20678

1 files changed, 143 insertions, 143 deletions

diff --git a/engines/kyra/script_v1.cpp b/engines/kyra/script_v1.cpp
index 08ff4a6d9f..a10135459d 100644
--- a/engines/kyra/script_v1.cpp
+++ b/engines/kyra/script_v1.cpp
@@ -35,7 +35,7 @@ namespace Kyra {
 #define stackPosString(x) (char*)&script->dataPtr->text[READ_BE_UINT16(&((uint16 *)script->dataPtr->text)[stackPos(x)])]
 
 int KyraEngine::cmd_magicInMouseItem(ScriptState *script) {
-	debug(3, "cmd_magicInMouseItem(0x%X) (%d, %d)", script, stackPos(0), stackPos(1));
+	debug(3, kDebugLevelScriptFuncs, "cmd_magicInMouseItem(0x%X) (%d, %d)", script, stackPos(0), stackPos(1));
 	magicInMouseItem(stackPos(0), stackPos(1), -1);
 	return 0;
 }
@@ -43,12 +43,12 @@ int KyraEngine::cmd_magicInMouseItem(ScriptState *script) {
 int KyraEngine::cmd_characterSays(ScriptState *script) {
 	_skipFlag = false;
 	if (_features & GF_TALKIE) {
-		debug(3, "cmd_characterSays(0x%X) (%d, '%s', %d, %d)", script, stackPos(0), stackPosString(1), stackPos(2), stackPos(3));
+		debug(3, kDebugLevelScriptFuncs, "cmd_characterSays(0x%X) (%d, '%s', %d, %d)", script, stackPos(0), stackPosString(1), stackPos(2), stackPos(3));
 		snd_voiceWaitForFinish();
 		snd_playVoiceFile(stackPos(0));
 		characterSays(stackPosString(1), stackPos(2), stackPos(3));
 	} else {
-		debug(3, "cmd_characterSays(0x%X) ('%s', %d, %d)", script, stackPosString(0), stackPos(1), stackPos(2));
+		debug(3, kDebugLevelScriptFuncs, "cmd_characterSays(0x%X) ('%s', %d, %d)", script, stackPosString(0), stackPos(1), stackPos(2));
 		characterSays(stackPosString(0), stackPos(1), stackPos(2));
 	}
 
@@ -56,7 +56,7 @@ int KyraEngine::cmd_characterSays(ScriptState *script) {
 }
 
 int KyraEngine::cmd_pauseTicks(ScriptState *script) {
-	debug(3, "cmd_pauseTicks(0x%X) (%d, %d)", script, stackPos(0), stackPos(1));
+	debug(3, kDebugLevelScriptFuncs, "cmd_pauseTicks(0x%X) (%d, %d)", script, stackPos(0), stackPos(1));
 	if (stackPos(1)) {
 		warning("STUB: special cmd_pauseTicks");
 		// delete this after correct implementing
@@ -68,23 +68,23 @@ int KyraEngine::cmd_pauseTicks(ScriptState *script) {
 }
 
 int KyraEngine::cmd_drawSceneAnimShape(ScriptState *script) {
-	debug(3, "cmd_drawSceneAnimShape(0x%X) (%d, %d, %d, %d, %d)", script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4));
+	debug(3, kDebugLevelScriptFuncs, "cmd_drawSceneAnimShape(0x%X) (%d, %d, %d, %d, %d)", 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) {
-	debug(3, "cmd_queryGameFlag(0x%X) (0x%X)", script, stackPos(0));
+	debug(3, kDebugLevelScriptFuncs, "cmd_queryGameFlag(0x%X) (0x%X)", script, stackPos(0));
 	return queryGameFlag(stackPos(0));
 }
 
 int KyraEngine::cmd_setGameFlag(ScriptState *script) {
-	debug(3, "cmd_setGameFlag(0x%X) (0x%X)", script, stackPos(0));
+	debug(3, kDebugLevelScriptFuncs, "cmd_setGameFlag(0x%X) (0x%X)", script, stackPos(0));
 	return setGameFlag(stackPos(0));
 }
 
 int KyraEngine::cmd_resetGameFlag(ScriptState *script) {
-	debug(3, "cmd_resetGameFlag(0x%X) (0x%X)", script, stackPos(0));
+	debug(3, kDebugLevelScriptFuncs, "cmd_resetGameFlag(0x%X) (0x%X)", script, stackPos(0));
 	return resetGameFlag(stackPos(0));
 }
 
@@ -94,7 +94,7 @@ int KyraEngine::cmd_runNPCScript(ScriptState *script) {
 }
 
 int KyraEngine::cmd_setSpecialExitList(ScriptState *script) {
-	debug(3, "cmd_setSpecialExitList(0x%X) (%d, %d, %d, %d, %d, %d, %d, %d, %d, %d)", script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5), stackPos(6), stackPos(7), stackPos(8), stackPos(9));
+	debug(3, kDebugLevelScriptFuncs, "cmd_setSpecialExitList(0x%X) (%d, %d, %d, %d, %d, %d, %d, %d, %d, %d)", 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);
@@ -105,19 +105,19 @@ int KyraEngine::cmd_setSpecialExitList(ScriptState *script) {
 }
 
 int KyraEngine::cmd_blockInWalkableRegion(ScriptState *script) {
-	debug(3, "cmd_blockInWalkableRegion(0x%X) (%d, %d, %d, %d)", script, stackPos(0), stackPos(1), stackPos(2), stackPos(3));
+	debug(3, kDebugLevelScriptFuncs, "cmd_blockInWalkableRegion(0x%X) (%d, %d, %d, %d)", 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) {
-	debug(3, "cmd_blockOutWalkableRegion(0x%X) (%d, %d, %d, %d)", script, stackPos(0), stackPos(1), stackPos(2), stackPos(3));
+	debug(3, kDebugLevelScriptFuncs, "cmd_blockOutWalkableRegion(0x%X) (%d, %d, %d, %d)", 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) {
-	debug(3, "cmd_walkPlayerToPoint(0x%X) (%d, %d, %d, %d)", script, stackPos(0), stackPos(1), stackPos(2), stackPos(3));
+	debug(3, kDebugLevelScriptFuncs, "cmd_walkPlayerToPoint(0x%X) (%d, %d, %d, %d)", script, stackPos(0), stackPos(1), stackPos(2), stackPos(3));
 
 	int normalTimers = stackPos(2);
 	if (!normalTimers) {
@@ -146,7 +146,7 @@ int KyraEngine::cmd_walkPlayerToPoint(ScriptState *script) {
 }
 
 int KyraEngine::cmd_dropItemInScene(ScriptState *script) {
-	debug(3, "cmd_dropItemInScene(0x%X) (%d, %d, %d)", script, stackPos(0), stackPos(1), stackPos(2));
+	debug(3, kDebugLevelScriptFuncs, "cmd_dropItemInScene(0x%X) (%d, %d, %d)", script, stackPos(0), stackPos(1), stackPos(2));
 	int item = stackPos(0);
 	int xpos = stackPos(1);
 	int ypos = stackPos(2);
@@ -172,7 +172,7 @@ int KyraEngine::cmd_dropItemInScene(ScriptState *script) {
 }
 
 int KyraEngine::cmd_drawAnimShapeIntoScene(ScriptState *script) {
-	debug(3, "cmd_drawAnimShapeIntoScene(0x%X) (%d, %d, %d, %d)", stackPos(0), stackPos(1), stackPos(2), stackPos(3));
+	debug(3, kDebugLevelScriptFuncs, "cmd_drawAnimShapeIntoScene(0x%X) (%d, %d, %d, %d)", stackPos(0), stackPos(1), stackPos(2), stackPos(3));
 	_screen->hideMouse();
 	_animator->restoreAllObjectBackgrounds();
 	int shape = stackPos(0);
@@ -190,36 +190,36 @@ int KyraEngine::cmd_drawAnimShapeIntoScene(ScriptState *script) {
 }
 
 int KyraEngine::cmd_createMouseItem(ScriptState *script) {
-	debug(3, "cmd_createMouseItem(0x%X) (%d)", script, stackPos(0));
+	debug(3, kDebugLevelScriptFuncs, "cmd_createMouseItem(0x%X) (%d)", script, stackPos(0));
 	createMouseItem(stackPos(0));
 	return 0;
 }
 
 int KyraEngine::cmd_savePageToDisk(ScriptState *script) {
-	debug(3, "cmd_savePageToDisk(0x%X) ('%s', %d)", script, stackPosString(0), stackPos(1));
+	debug(3, kDebugLevelScriptFuncs, "cmd_savePageToDisk(0x%X) ('%s', %d)", script, stackPosString(0), stackPos(1));
 	_screen->savePageToDisk(stackPosString(0), stackPos(1));
 	return 0;
 }
 
 int KyraEngine::cmd_sceneAnimOn(ScriptState *script) {
-	debug(3, "cmd_sceneAnimOn(0x%X) (%d)", script, stackPos(0));
+	debug(3, kDebugLevelScriptFuncs, "cmd_sceneAnimOn(0x%X) (%d)", script, stackPos(0));
 	_sprites->_anims[stackPos(0)].play = true;
 	return 0;
 }
 
 int KyraEngine::cmd_sceneAnimOff(ScriptState *script) {
-	debug(3, "cmd_sceneAnimOff(0x%X) (%d)", script, stackPos(0));
+	debug(3, kDebugLevelScriptFuncs, "cmd_sceneAnimOff(0x%X) (%d)", script, stackPos(0));
 	_sprites->_anims[stackPos(0)].play = false;
 	return 0;
 }
 
 int KyraEngine::cmd_getElapsedSeconds(ScriptState *script) {
-	debug(3, "cmd_getElapsedSeconds(0x%X) ()", script);
+	debug(3, kDebugLevelScriptFuncs, "cmd_getElapsedSeconds(0x%X) ()", script);
 	return _system->getMillis() / 1000;
 }
 
 int KyraEngine::cmd_mouseIsPointer(ScriptState *script) {
-	debug(3, "cmd_mouseIsPointer(0x%X) ()", script);
+	debug(3, kDebugLevelScriptFuncs, "cmd_mouseIsPointer(0x%X) ()", script);
 	if (_itemInHand == -1) {
 		return 1;
 	}
@@ -227,13 +227,13 @@ int KyraEngine::cmd_mouseIsPointer(ScriptState *script) {
 }
 
 int KyraEngine::cmd_destroyMouseItem(ScriptState *script) {
-	debug(3, "cmd_destroyMouseItem(0x%X) ()", script);
+	debug(3, kDebugLevelScriptFuncs, "cmd_destroyMouseItem(0x%X) ()", script);
 	destroyMouseItem();
 	return 0;
 }
 
 int KyraEngine::cmd_runSceneAnimUntilDone(ScriptState *script) {
-	debug(3, "cmd_runSceneAnimUntilDone(0x%X) (%d)", script, stackPos(0));
+	debug(3, kDebugLevelScriptFuncs, "cmd_runSceneAnimUntilDone(0x%X) (%d)", script, stackPos(0));
 	_screen->hideMouse();
 	_animator->restoreAllObjectBackgrounds();
 	_sprites->_anims[stackPos(0)].play = true;
@@ -251,48 +251,48 @@ int KyraEngine::cmd_runSceneAnimUntilDone(ScriptState *script) {
 }
 
 int KyraEngine::cmd_fadeSpecialPalette(ScriptState *script) {
-	debug(3, "cmd_fadeSpecialPalette(0x%X) (%d, %d, %d, %d)", script, stackPos(0), stackPos(1), stackPos(2), stackPos(3));
+	debug(3, kDebugLevelScriptFuncs, "cmd_fadeSpecialPalette(0x%X) (%d, %d, %d, %d)", 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) {
-	debug(3, "cmd_playAdlibSound(0x%X) (%d)", script, stackPos(0));
+	debug(3, kDebugLevelScriptFuncs, "cmd_playAdlibSound(0x%X) (%d)", script, stackPos(0));
 	snd_playSoundEffect(stackPos(0));
 	return 0;
 }
 
 int KyraEngine::cmd_playAdlibScore(ScriptState *script) {
-	debug(3, "cmd_playAdlibScore(0x%X) (%d, %d)", script, stackPos(0), stackPos(1));
+	debug(3, kDebugLevelScriptFuncs, "cmd_playAdlibScore(0x%X) (%d, %d)", script, stackPos(0), stackPos(1));
 	snd_playWanderScoreViaMap(stackPos(0), stackPos(1));
 	return 0;
 }
 
 int KyraEngine::cmd_phaseInSameScene(ScriptState *script) {
-	debug(3, "cmd_phaseInSameScene(0x%X) (%d, %d)", script, stackPos(0), stackPos(1));
+	debug(3, kDebugLevelScriptFuncs, "cmd_phaseInSameScene(0x%X) (%d, %d)", script, stackPos(0), stackPos(1));
 	transcendScenes(stackPos(0), stackPos(1));
 	return 0;
 }
 
 int KyraEngine::cmd_setScenePhasingFlag(ScriptState *script) {
-	debug(3, "cmd_setScenePhasingFlag(0x%X) ()", script);
+	debug(3, kDebugLevelScriptFuncs, "cmd_setScenePhasingFlag(0x%X) ()", script);
 	_scenePhasingFlag = 1;
 	return 1;
 }
 
 int KyraEngine::cmd_resetScenePhasingFlag(ScriptState *script) {
-	debug(3, "cmd_resetScenePhasingFlag(0x%X) ()", script);
+	debug(3, kDebugLevelScriptFuncs, "cmd_resetScenePhasingFlag(0x%X) ()", script);
 	_scenePhasingFlag = 0;
 	return 0;
 }
 
 int KyraEngine::cmd_queryScenePhasingFlag(ScriptState *script) {
-	debug(3, "cmd_queryScenePhasingFlag(0x%X) ()", script);
+	debug(3, kDebugLevelScriptFuncs, "cmd_queryScenePhasingFlag(0x%X) ()", script);
 	return _scenePhasingFlag;
 }
 
 int KyraEngine::cmd_sceneToDirection(ScriptState *script) {
-	debug(3, "cmd_sceneToDirection(0x%X) (%d, %d)", script, stackPos(0), stackPos(1));
+	debug(3, kDebugLevelScriptFuncs, "cmd_sceneToDirection(0x%X) (%d, %d)", script, stackPos(0), stackPos(1));
 	assert(stackPos(0) < _roomTableSize);
 	Room *curRoom = &_roomTable[stackPos(0)];
 	uint16 returnValue = 0xFFFF;
@@ -322,7 +322,7 @@ int KyraEngine::cmd_sceneToDirection(ScriptState *script) {
 }
 
 int KyraEngine::cmd_setBirthstoneGem(ScriptState *script) {
-	debug(3, "cmd_setBirthstoneGem(0x%X) (%d, %d)", script, stackPos(0), stackPos(1));
+	debug(3, kDebugLevelScriptFuncs, "cmd_setBirthstoneGem(0x%X) (%d, %d)", script, stackPos(0), stackPos(1));
 	int index = stackPos(0);
 	if (index < 4 && index >= 0) {
 		_birthstoneGemTable[index] = stackPos(1);
@@ -332,19 +332,19 @@ int KyraEngine::cmd_setBirthstoneGem(ScriptState *script) {
 }
 
 int KyraEngine::cmd_placeItemInGenericMapScene(ScriptState *script) {
-	debug(3, "cmd_placeItemInGenericMapScene(0x%X) (%d, %d)", script, stackPos(0), stackPos(1));
+	debug(3, kDebugLevelScriptFuncs, "cmd_placeItemInGenericMapScene(0x%X) (%d, %d)", script, stackPos(0), stackPos(1));
 	placeItemInGenericMapScene(stackPos(0), stackPos(1));
 	return 0;
 }
 
 int KyraEngine::cmd_setBrandonStatusBit(ScriptState *script) {
-	debug(3, "cmd_setBrandonStatusBit(0x%X) (%d)", script, stackPos(0));
+	debug(3, kDebugLevelScriptFuncs, "cmd_setBrandonStatusBit(0x%X) (%d)", script, stackPos(0));
 	_brandonStatusBit |= stackPos(0);
 	return 0;
 }
 
 int KyraEngine::cmd_pauseSeconds(ScriptState *script) {
-	debug(3, "cmd_pauseSeconds(0x%X) (%d)", script, stackPos(0));
+	debug(3, kDebugLevelScriptFuncs, "cmd_pauseSeconds(0x%X) (%d)", script, stackPos(0));
 	if (stackPos(0) > 0 && !_skipFlag)
 		delay(stackPos(0)*1000, true);
 	_skipFlag = false;
@@ -352,7 +352,7 @@ int KyraEngine::cmd_pauseSeconds(ScriptState *script) {
 }
 
 int KyraEngine::cmd_getCharactersLocation(ScriptState *script) {
-	debug(3, "cmd_getCharactersLocation(0x%X) (%d)", script, stackPos(0));
+	debug(3, kDebugLevelScriptFuncs, "cmd_getCharactersLocation(0x%X) (%d)", script, stackPos(0));
 	return _characterList[stackPos(0)].sceneId;
 }
 
@@ -362,31 +362,31 @@ int KyraEngine::cmd_runNPCSubscript(ScriptState *script) {
 }
 
 int KyraEngine::cmd_magicOutMouseItem(ScriptState *script) {
-	debug(3, "cmd_magicOutMouseItem(0x%X) (%d)", script, stackPos(0));
+	debug(3, kDebugLevelScriptFuncs, "cmd_magicOutMouseItem(0x%X) (%d)", script, stackPos(0));
 	magicOutMouseItem(stackPos(0), -1);
 	return 0;
 }
 
 int KyraEngine::cmd_internalAnimOn(ScriptState *script) {
-	debug(3, "cmd_internalAnimOn(0x%X) (%d)", script, stackPos(0));
+	debug(3, kDebugLevelScriptFuncs, "cmd_internalAnimOn(0x%X) (%d)", script, stackPos(0));
 	_animator->sprites()[stackPos(0)].active = 1;
 	return 0;
 }
 
 int KyraEngine::cmd_forceBrandonToNormal(ScriptState *script) {
-	debug(3, "cmd_forceBrandonToNormal(0x%X) ()", script);
+	debug(3, kDebugLevelScriptFuncs, "cmd_forceBrandonToNormal(0x%X) ()", script);
 	checkAmuletAnimFlags();
 	return 0;
 }
 
 int KyraEngine::cmd_poisonDeathNow(ScriptState *script) {
-	debug(3, "cmd_poisonDeathNow(0x%X) ()", script);
+	debug(3, kDebugLevelScriptFuncs, "cmd_poisonDeathNow(0x%X) ()", script);
 	seq_poisonDeathNow(1);
 	return 0;
 }
 
 int KyraEngine::cmd_setScaleMode(ScriptState *script) {
-	debug(3, "cmd_setScaleMode(0x%X) (%d, %d, %d, %d)", script, stackPos(0), stackPos(1), stackPos(2), stackPos(3));
+	debug(3, kDebugLevelScriptFuncs, "cmd_setScaleMode(0x%X) (%d, %d, %d, %d)", script, stackPos(0), stackPos(1), stackPos(2), stackPos(3));
 	int len = stackPos(0);
 	int setValue1 = stackPos(1);
 	int start2 = stackPos(2);
@@ -407,7 +407,7 @@ int KyraEngine::cmd_setScaleMode(ScriptState *script) {
 }
 
 int KyraEngine::cmd_openWSAFile(ScriptState *script) {
-	debug(3, "cmd_openWSAFile(0x%X) ('%s', %d, %d)", script, stackPosString(0), stackPos(1), stackPos(2));
+	debug(3, kDebugLevelScriptFuncs, "cmd_openWSAFile(0x%X) ('%s', %d, %d)", script, stackPosString(0), stackPos(1), stackPos(2));
 	
 	char *filename = stackPosString(0);
 	int wsaIndex = stackPos(1);
@@ -419,7 +419,7 @@ int KyraEngine::cmd_openWSAFile(ScriptState *script) {
 }
 
 int KyraEngine::cmd_closeWSAFile(ScriptState *script) {
-	debug(3, "cmd_closeWSAFile(0x%X) (%d)", script, stackPos(0));
+	debug(3, kDebugLevelScriptFuncs, "cmd_closeWSAFile(0x%X) (%d)", script, stackPos(0));
 	
 	int wsaIndex = stackPos(0);
 	if (_movieObjects[wsaIndex]) {
@@ -430,7 +430,7 @@ int KyraEngine::cmd_closeWSAFile(ScriptState *script) {
 }
 
 int KyraEngine::cmd_runWSAFromBeginningToEnd(ScriptState *script) {
-	debug(3, "cmd_runWSAFromBeginningToEnd(0x%X) (%d, %d, %d, %d, %d)", script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4));
+	debug(3, kDebugLevelScriptFuncs, "cmd_runWSAFromBeginningToEnd(0x%X) (%d, %d, %d, %d, %d)", script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4));
 	
 	_screen->hideMouse();
 	
@@ -471,7 +471,7 @@ int KyraEngine::cmd_runWSAFromBeginningToEnd(ScriptState *script) {
 }
 
 int KyraEngine::cmd_displayWSAFrame(ScriptState *script) {
-	debug(3, "cmd_displayWSAFrame(0x%X) (%d, %d, %d, %d, %d)", script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4));
+	debug(3, kDebugLevelScriptFuncs, "cmd_displayWSAFrame(0x%X) (%d, %d, %d, %d, %d)", script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4));
 	int frame = stackPos(0);
 	int xpos = stackPos(1);
 	int ypos = stackPos(2);
@@ -495,13 +495,13 @@ int KyraEngine::cmd_displayWSAFrame(ScriptState *script) {
 }
 
 int KyraEngine::cmd_enterNewScene(ScriptState *script) {
-	debug(3, "cmd_enterNewScene(0x%X) (%d, %d, %d, %d, %d)", script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4));
+	debug(3, kDebugLevelScriptFuncs, "cmd_enterNewScene(0x%X) (%d, %d, %d, %d, %d)", 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) {
-	debug(3, "cmd_setSpecialEnterXAndY(0x%X) (%d, %d)", script, stackPos(0), stackPos(1));
+	debug(3, kDebugLevelScriptFuncs, "cmd_setSpecialEnterXAndY(0x%X) (%d, %d)", script, stackPos(0), stackPos(1));
 	_brandonPosX = stackPos(0);
 	_brandonPosY = stackPos(1);
 	if (_brandonPosX + 1 == 0 && _brandonPosY + 1 == 0)
@@ -510,7 +510,7 @@ int KyraEngine::cmd_setSpecialEnterXAndY(ScriptState *script) {
 }
 
 int KyraEngine::cmd_runWSAFrames(ScriptState *script) {
-	debug(3, "cmd_runWSAFrames(0x%X) (%d, %d, %d, %d, %d, %d)", script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5));
+	debug(3, kDebugLevelScriptFuncs, "cmd_runWSAFrames(0x%X) (%d, %d, %d, %d, %d, %d)", 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);
@@ -537,7 +537,7 @@ int KyraEngine::cmd_runWSAFrames(ScriptState *script) {
 }
 
 int KyraEngine::cmd_popBrandonIntoScene(ScriptState *script) {
-	debug(3, "cmd_popBrandonIntoScene(0x%X) (%d, %d, %d, %d)", script, stackPos(0), stackPos(1), stackPos(2), stackPos(3));
+	debug(3, kDebugLevelScriptFuncs, "cmd_popBrandonIntoScene(0x%X) (%d, %d, %d, %d)", 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);
@@ -587,13 +587,13 @@ int KyraEngine::cmd_popBrandonIntoScene(ScriptState *script) {
 }
 
 int KyraEngine::cmd_restoreAllObjectBackgrounds(ScriptState *script) {
-	debug(3, "cmd_restoreAllObjectBackgrounds(0x%X) ()", script);
+	debug(3, kDebugLevelScriptFuncs, "cmd_restoreAllObjectBackgrounds(0x%X) ()", script);
 	_animator->restoreAllObjectBackgrounds();
 	return 0;
 }
 
 int KyraEngine::cmd_setCustomPaletteRange(ScriptState *script) {
-	debug(3, "cmd_setCustomPaletteRange(0x%X) (%d, %d, %d)", script, stackPos(0), stackPos(1), stackPos(2));
+	debug(3, kDebugLevelScriptFuncs, "cmd_setCustomPaletteRange(0x%X) (%d, %d, %d)", 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);
@@ -601,7 +601,7 @@ int KyraEngine::cmd_setCustomPaletteRange(ScriptState *script) {
 }
 
 int KyraEngine::cmd_loadPageFromDisk(ScriptState *script) {
-	debug(3, "cmd_loadPageFromDisk(0x%X) ('%s', %d)", script, stackPosString(0), stackPos(1));
+	debug(3, kDebugLevelScriptFuncs, "cmd_loadPageFromDisk(0x%X) ('%s', %d)", script, stackPosString(0), stackPos(1));
 	_screen->loadPageFromDisk(stackPosString(0), stackPos(1));
 	_animator->_updateScreen = true;
 	return 0;
@@ -609,13 +609,13 @@ int KyraEngine::cmd_loadPageFromDisk(ScriptState *script) {
 
 int KyraEngine::cmd_customPrintTalkString(ScriptState *script) {
 	if (_features & GF_TALKIE) {
-		debug(3, "cmd_customPrintTalkString(0x%X) (%d, '%s', %d, %d, %d)", script, stackPos(0), stackPosString(1), stackPos(2), stackPos(3), stackPos(4) & 0xFF);
+		debug(3, kDebugLevelScriptFuncs, "cmd_customPrintTalkString(0x%X) (%d, '%s', %d, %d, %d)", script, stackPos(0), stackPosString(1), stackPos(2), stackPos(3), stackPos(4) & 0xFF);
 		snd_voiceWaitForFinish();
 		snd_playVoiceFile(stackPos(0));
 		_skipFlag = false;
 		_text->printTalkTextMessage(stackPosString(1), stackPos(2), stackPos(3), stackPos(4) & 0xFF, 0, 2);
 	} else {
-		debug(3, "cmd_customPrintTalkString(0x%X) ('%s', %d, %d, %d)", script, stackPosString(0), stackPos(1), stackPos(2), stackPos(3) & 0xFF);
+		debug(3, kDebugLevelScriptFuncs, "cmd_customPrintTalkString(0x%X) ('%s', %d, %d, %d)", 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);
 	}
@@ -624,35 +624,35 @@ int KyraEngine::cmd_customPrintTalkString(ScriptState *script) {
 }
 
 int KyraEngine::cmd_restoreCustomPrintBackground(ScriptState *script) {
-	debug(3, "cmd_restoreCustomPrintBackground(0x%X) ()", script);
+	debug(3, kDebugLevelScriptFuncs, "cmd_restoreCustomPrintBackground(0x%X) ()", script);
 	_text->restoreTalkTextMessageBkgd(2, 0);
 	return 0;
 }
 
 int KyraEngine::cmd_hideMouse(ScriptState *script) {
-	debug(3, "cmd_hideMouse(0x%X) ()", script);
+	debug(3, kDebugLevelScriptFuncs, "cmd_hideMouse(0x%X) ()", script);
 	_screen->hideMouse();
 	return 0;
 }
 
 int KyraEngine::cmd_showMouse(ScriptState *script) {
-	debug(3, "cmd_showMouse(0x%X) ()", script);
+	debug(3, kDebugLevelScriptFuncs, "cmd_showMouse(0x%X) ()", script);
 	_screen->showMouse();
 	return 0;
 }
 
 int KyraEngine::cmd_getCharacterX(ScriptState *script) {
-	debug(3, "cmd_getCharacterX(0x%X) (%d)", script, stackPos(0));
+	debug(3, kDebugLevelScriptFuncs, "cmd_getCharacterX(0x%X) (%d)", script, stackPos(0));
 	return _characterList[stackPos(0)].x1;
 }
 
 int KyraEngine::cmd_getCharacterY(ScriptState *script) {
-	debug(3, "cmd_getCharacterY(0x%X) (%d)", script, stackPos(0));
+	debug(3, kDebugLevelScriptFuncs, "cmd_getCharacterY(0x%X) (%d)", script, stackPos(0));
 	return _characterList[stackPos(0)].y1;
 }
 
 int KyraEngine::cmd_changeCharactersFacing(ScriptState *script) {
-	debug(3, "cmd_changeCharactersFacing(0x%X) (%d, %d, %d)", script, stackPos(0), stackPos(1), stackPos(2));
+	debug(3, kDebugLevelScriptFuncs, "cmd_changeCharactersFacing(0x%X) (%d, %d, %d)", script, stackPos(0), stackPos(1), stackPos(2));
 	int character = stackPos(0);
 	int facing = stackPos(1);
 	int newAnimFrame = stackPos(2);
@@ -671,7 +671,7 @@ int KyraEngine::cmd_changeCharactersFacing(ScriptState *script) {
 }
 
 int KyraEngine::cmd_copyWSARegion(ScriptState *script) {
-	debug(3, "cmd_copyWSARegion(0x%X) (%d, %d, %d, %d, %d, %d)", script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5));
+	debug(3, kDebugLevelScriptFuncs, "cmd_copyWSARegion(0x%X) (%d, %d, %d, %d, %d, %d)", 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);
@@ -684,14 +684,14 @@ int KyraEngine::cmd_copyWSARegion(ScriptState *script) {
 }
 
 int KyraEngine::cmd_printText(ScriptState *script) {
-	debug(3, "cmd_printText(0x%X) ('%s', %d, %d, 0x%X, 0x%X)", script, stackPosString(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4));
+	debug(3, kDebugLevelScriptFuncs, "cmd_printText(0x%X) ('%s', %d, %d, 0x%X, 0x%X)", 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) {
-	debug(3, "cmd_random(0x%X) (%d, %d)", script, stackPos(0), stackPos(1));
+	debug(3, kDebugLevelScriptFuncs, "cmd_random(0x%X) (%d, %d)", script, stackPos(0), stackPos(1));
 	assert(stackPos(0) < stackPos(1));
 	return _rnd.getRandomNumberRng(stackPos(0), stackPos(1));
 }
@@ -702,7 +702,7 @@ int KyraEngine::cmd_loadSoundFile(ScriptState *script) {
 }
 
 int KyraEngine::cmd_displayWSAFrameOnHidPage(ScriptState *script) {
-	debug(3, "cmd_displayWSAFrameOnHidPage(0x%X) (%d, %d, %d, %d, %d)", script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4));
+	debug(3, kDebugLevelScriptFuncs, "cmd_displayWSAFrameOnHidPage(0x%X) (%d, %d, %d, %d, %d)", script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4));
 	int frame = stackPos(0);
 	int xpos = stackPos(1);
 	int ypos = stackPos(2);
@@ -728,7 +728,7 @@ int KyraEngine::cmd_displayWSAFrameOnHidPage(ScriptState *script) {
 }
 
 int KyraEngine::cmd_displayWSASequentialFrames(ScriptState *script) {
-	debug(3, "cmd_displayWSASequentialFrames(0x%X) (%d, %d, %d, %d, %d, %d, %d)", script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5), stackPos(6));
+	debug(3, kDebugLevelScriptFuncs, "cmd_displayWSASequentialFrames(0x%X) (%d, %d, %d, %d, %d, %d, %d)", 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);
@@ -786,7 +786,7 @@ int KyraEngine::cmd_displayWSASequentialFrames(ScriptState *script) {
 }
 
 int KyraEngine::cmd_drawCharacterStanding(ScriptState *script) {
-	debug(3, "cmd_drawCharacterStanding(0x%X) (%d, %d, %d, %d)", script, stackPos(0), stackPos(1), stackPos(2), stackPos(3));
+	debug(3, kDebugLevelScriptFuncs, "cmd_drawCharacterStanding(0x%X) (%d, %d, %d, %d)", script, stackPos(0), stackPos(1), stackPos(2), stackPos(3));
 	int character = stackPos(0);
 	int animFrame = stackPos(1);
 	int newFacing = stackPos(2);
@@ -803,13 +803,13 @@ int KyraEngine::cmd_drawCharacterStanding(ScriptState *script) {
 }
 
 int KyraEngine::cmd_internalAnimOff(ScriptState *script) {
-	debug(3, "cmd_internalAnimOff(0x%X) (%d)", script, stackPos(0));
+	debug(3, kDebugLevelScriptFuncs, "cmd_internalAnimOff(0x%X) (%d)", script, stackPos(0));
 	_animator->sprites()[stackPos(0)].active = 0;
 	return 0;
 }
 
 int KyraEngine::cmd_changeCharactersXAndY(ScriptState *script) {
-	debug(3, "cmd_changeCharactersXAndY(0x%X) (%d, %d, %d)", script, stackPos(0), stackPos(1), stackPos(2));
+	debug(3, kDebugLevelScriptFuncs, "cmd_changeCharactersXAndY(0x%X) (%d, %d, %d)", script, stackPos(0), stackPos(1), stackPos(2));
 	Character *ch = &_characterList[stackPos(0)];
 	int16 x = stackPos(1);
 	int16 y = stackPos(2);
@@ -825,25 +825,25 @@ int KyraEngine::cmd_changeCharactersXAndY(ScriptState *script) {
 }
 
 int KyraEngine::cmd_clearSceneAnimatorBeacon(ScriptState *script) {
-	debug(3, "cmd_clearSceneAnimatorBeacon(0x%X) ()", script);
+	debug(3, kDebugLevelScriptFuncs, "cmd_clearSceneAnimatorBeacon(0x%X) ()", script);
 	_sprites->_sceneAnimatorBeaconFlag = 0;
 	return 0;
 }
 
 int KyraEngine::cmd_querySceneAnimatorBeacon(ScriptState *script) {
-	debug(3, "cmd_querySceneAnimatorBeacon(0x%X) ()", script);
+	debug(3, kDebugLevelScriptFuncs, "cmd_querySceneAnimatorBeacon(0x%X) ()", script);
 	return _sprites->_sceneAnimatorBeaconFlag;
 }
 
 int KyraEngine::cmd_refreshSceneAnimator(ScriptState *script) {
-	debug(3, "cmd_refreshSceneAnimator(0x%X) ()", script);
+	debug(3, kDebugLevelScriptFuncs, "cmd_refreshSceneAnimator(0x%X) ()", script);
 	_sprites->updateSceneAnims();
 	_animator->updateAllObjectShapes();
 	return 0;
 }
 
 int KyraEngine::cmd_placeItemInOffScene(ScriptState *script) {
-	debug(3, "cmd_placeItemInOffScene(0x%X) (%d, %d, %d, %d)", script, stackPos(0), stackPos(1), stackPos(2), stackPos(3));
+	debug(3, kDebugLevelScriptFuncs, "cmd_placeItemInOffScene(0x%X) (%d, %d, %d, %d)", script, stackPos(0), stackPos(1), stackPos(2), stackPos(3));
 	int item = stackPos(0);
 	int xpos = stackPos(1);
 	int ypos = stackPos(2);
@@ -862,7 +862,7 @@ int KyraEngine::cmd_placeItemInOffScene(ScriptState *script) {
 }
 
 int KyraEngine::cmd_wipeDownMouseItem(ScriptState *script) {
-	debug(3, "cmd_wipeDownMouseItem(0x%X) (%d, %d, %d)", script, stackPos(0), stackPos(1), stackPos(2));
+	debug(3, kDebugLevelScriptFuncs, "cmd_wipeDownMouseItem(0x%X) (%d, %d, %d)", script, stackPos(0), stackPos(1), stackPos(2));
 	_screen->hideMouse();
 	wipeDownMouseItem(stackPos(1), stackPos(2));
 	destroyMouseItem();
@@ -871,7 +871,7 @@ int KyraEngine::cmd_wipeDownMouseItem(ScriptState *script) {
 }
 
 int KyraEngine::cmd_placeCharacterInOtherScene(ScriptState *script) {
-	debug(3, "cmd_placeCharacterInOtherScene(0x%X) (%d, %d, %d, %d, %d, %d)", script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5));
+	debug(3, kDebugLevelScriptFuncs, "cmd_placeCharacterInOtherScene(0x%X) (%d, %d, %d, %d, %d, %d)", 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);
@@ -888,7 +888,7 @@ int KyraEngine::cmd_placeCharacterInOtherScene(ScriptState *script) {
 }
 
 int KyraEngine::cmd_getKey(ScriptState *script) {
-	debug(3, "cmd_getKey(0x%X) ()", script);
+	debug(3, kDebugLevelScriptFuncs, "cmd_getKey(0x%X) ()", script);
 	waitForEvent();
 	return 0;
 }
@@ -899,7 +899,7 @@ int KyraEngine::cmd_specificItemInInventory(ScriptState *script) {
 }
 
 int KyraEngine::cmd_popMobileNPCIntoScene(ScriptState *script) {
-	debug(3, "cmd_popMobileNPCIntoScene(0x%X) (%d, %d, %d, %d, %d, %d)", script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), (int16)(stackPos(4) & 0xFFFC), (int8)(stackPos(5) & 0xFE));
+	debug(3, kDebugLevelScriptFuncs, "cmd_popMobileNPCIntoScene(0x%X) (%d, %d, %d, %d, %d, %d)", 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);
@@ -935,7 +935,7 @@ int KyraEngine::cmd_unhideMobileCharacter(ScriptState *script) {
 }
 
 int KyraEngine::cmd_setCharactersLocation(ScriptState *script) {
-	debug(3, "cmd_setCharactersLocation(0x%X) (%d, %d)", script, stackPos(0), stackPos(1));
+	debug(3, kDebugLevelScriptFuncs, "cmd_setCharactersLocation(0x%X) (%d, %d)", script, stackPos(0), stackPos(1));
 	Character *ch = &_characterList[stackPos(0)];
 	AnimObject *animObj = &_animator->actors()[stackPos(0)];
 	int newScene = stackPos(1);
@@ -952,7 +952,7 @@ int KyraEngine::cmd_setCharactersLocation(ScriptState *script) {
 }
 
 int KyraEngine::cmd_walkCharacterToPoint(ScriptState *script) {
-	debug(3, "cmd_walkCharacterToPoint(0x%X) (%d, %d, %d)", script, stackPos(0), stackPos(1), stackPos(2));
+	debug(3, kDebugLevelScriptFuncs, "cmd_walkCharacterToPoint(0x%X) (%d, %d, %d)", script, stackPos(0), stackPos(1), stackPos(2));
 	int character = stackPos(0);
 	int toX = stackPos(1);
 	int toY = stackPos(2);
@@ -1035,7 +1035,7 @@ int KyraEngine::cmd_walkCharacterToPoint(ScriptState *script) {
 }
 
 int KyraEngine::cmd_specialEventDisplayBrynnsNote(ScriptState *script) {
-	debug(3, "cmd_specialEventDisplayBrynnsNote(0x%X) ()", script);
+	debug(3, kDebugLevelScriptFuncs, "cmd_specialEventDisplayBrynnsNote(0x%X) ()", script);
 	_screen->hideMouse();
 	_screen->savePageToDisk("HIDPAGE.TMP", 2);
 	_screen->savePageToDisk("SEENPAGE.TMP", 0);
@@ -1058,7 +1058,7 @@ int KyraEngine::cmd_specialEventDisplayBrynnsNote(ScriptState *script) {
 }
 
 int KyraEngine::cmd_specialEventRemoveBrynnsNote(ScriptState *script) {
-	debug(3, "cmd_specialEventRemoveBrynnsNote(0x%X) ()", script);
+	debug(3, kDebugLevelScriptFuncs, "cmd_specialEventRemoveBrynnsNote(0x%X) ()", script);
 	_screen->hideMouse();
 	_screen->loadPageFromDisk("SEENPAGE.TMP", 0);
 	_screen->loadPageFromDisk("HIDPAGE.TMP", 2);
@@ -1069,25 +1069,25 @@ int KyraEngine::cmd_specialEventRemoveBrynnsNote(ScriptState *script) {
 }
 
 int KyraEngine::cmd_setLogicPage(ScriptState *script) {
-	debug(3, "cmd_setLogicPage(0x%X) (%d)", script, stackPos(0));
+	debug(3, kDebugLevelScriptFuncs, "cmd_setLogicPage(0x%X) (%d)", script, stackPos(0));
 	_screen->_curPage = stackPos(0);
 	return stackPos(0);
 }
 
 int KyraEngine::cmd_fatPrint(ScriptState *script) {
-	debug(3, "cmd_fatPrint(0x%X) ('%s', %d, %d, %d, %d, %d)", script, stackPosString(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5));
+	debug(3, kDebugLevelScriptFuncs, "cmd_fatPrint(0x%X) ('%s', %d, %d, %d, %d, %d)", 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) {
-	debug(3, "cmd_preserveAllObjectBackgrounds(0x%X) ()", script);
+	debug(3, kDebugLevelScriptFuncs, "cmd_preserveAllObjectBackgrounds(0x%X) ()", script);
 	_animator->preserveAllBackgrounds();
 	return 0;
 }
 
 int KyraEngine::cmd_updateSceneAnimations(ScriptState *script) {
-	debug(3, "cmd_updateSceneAnimations(0x%X) (%d)", script, stackPos(0));
+	debug(3, kDebugLevelScriptFuncs, "cmd_updateSceneAnimations(0x%X) (%d)", script, stackPos(0));
 	if (stackPos(0)) {
 		_sprites->updateSceneAnims();
 		_animator->updateAllObjectShapes();
@@ -1096,23 +1096,23 @@ int KyraEngine::cmd_updateSceneAnimations(ScriptState *script) {
 }
 
 int KyraEngine::cmd_sceneAnimationActive(ScriptState *script) {
-	debug(3, "cmd_sceneAnimationActive(0x%X) (%d)", script, stackPos(0));
+	debug(3, kDebugLevelScriptFuncs, "cmd_sceneAnimationActive(0x%X) (%d)", script, stackPos(0));
 	return _sprites->_anims[stackPos(0)].play;
 }
 
 int KyraEngine::cmd_setCharactersMovementDelay(ScriptState *script) {
-	debug(3, "cmd_setCharactersMovementDelay(0x%X) (%d, %d)", script, stackPos(0), stackPos(1));
+	debug(3, kDebugLevelScriptFuncs, "cmd_setCharactersMovementDelay(0x%X) (%d, %d)", script, stackPos(0), stackPos(1));
 	setTimerDelay(stackPos(0)+5, stackPos(1));
 	return 0;
 }
 
 int KyraEngine::cmd_getCharactersFacing(ScriptState *script) {
-	debug(3, "cmd_getCharactersFacing(0x%X) (%d)", script, stackPos(0));
+	debug(3, kDebugLevelScriptFuncs, "cmd_getCharactersFacing(0x%X) (%d)", script, stackPos(0));
 	return _characterList[stackPos(0)].facing;
 }
 
 int KyraEngine::cmd_bkgdScrollSceneAndMasksRight(ScriptState *script) {
-	debug(3, "cmd_bkgdScrollSceneAndMasksRight(0x%X) (%d)", script, stackPos(0));
+	debug(3, kDebugLevelScriptFuncs, "cmd_bkgdScrollSceneAndMasksRight(0x%X) (%d)", script, stackPos(0));
 	_screen->copyBackgroundBlock(stackPos(0), 2, 0);
 	_screen->copyBackgroundBlock2(stackPos(0));
 	// update the whole screen
@@ -1122,13 +1122,13 @@ int KyraEngine::cmd_bkgdScrollSceneAndMasksRight(ScriptState *script) {
 }
 
 int KyraEngine::cmd_dispelMagicAnimation(ScriptState *script) {
-	debug(3, "cmd_dispelMagicAnimation(0x%X) ()", script);
+	debug(3, kDebugLevelScriptFuncs, "cmd_dispelMagicAnimation(0x%X) ()", script);
 	seq_dispelMagicAnimation();
 	return 0;
 }
 
 int KyraEngine::cmd_findBrightestFireberry(ScriptState *script) {
-	debug(3, "cmd_findBrightestFireberry(0x%X) ()", script);
+	debug(3, kDebugLevelScriptFuncs, "cmd_findBrightestFireberry(0x%X) ()", script);
 	if (_currentCharacter->sceneId >= 187 && _currentCharacter->sceneId <= 198) {
 		return 29;
 	}
@@ -1171,7 +1171,7 @@ int KyraEngine::cmd_findBrightestFireberry(ScriptState *script) {
 }
 
 int KyraEngine::cmd_setFireberryGlowPalette(ScriptState *script) {
-	debug(3, "cmd_setFireberryGlowPalette(0x%X) (%d)", script, stackPos(0));
+	debug(3, kDebugLevelScriptFuncs, "cmd_setFireberryGlowPalette(0x%X) (%d)", script, stackPos(0));
 	int palIndex = 0;
 	switch (stackPos(0)) {
 		case 0x1E:
@@ -1209,19 +1209,19 @@ int KyraEngine::cmd_setFireberryGlowPalette(ScriptState *script) {
 }
 
 int KyraEngine::cmd_setDeathHandlerFlag(ScriptState *script) {
-	debug(3, "cmd_setDeathHandlerFlag(0x%X) (%d)", script, stackPos(0));
+	debug(3, kDebugLevelScriptFuncs, "cmd_setDeathHandlerFlag(0x%X) (%d)", script, stackPos(0));
 	_deathHandler = stackPos(0);
 	return 0;
 }
 
 int KyraEngine::cmd_drinkPotionAnimation(ScriptState *script) {
-	debug(3, "cmd_drinkPotionAnimation(0x%X) (%d, %d, %d)", script, stackPos(0), stackPos(1), stackPos(2));
+	debug(3, kDebugLevelScriptFuncs, "cmd_drinkPotionAnimation(0x%X) (%d, %d, %d)", script, stackPos(0), stackPos(1), stackPos(2));
 	seq_playDrinkPotionAnim(stackPos(0), stackPos(1), stackPos(2));
 	return 0;
 }
 
 int KyraEngine::cmd_makeAmuletAppear(ScriptState *script) {
-	debug(3, "cmd_makeAmuletAppear(0x%X) ()", script);
+	debug(3, kDebugLevelScriptFuncs, "cmd_makeAmuletAppear(0x%X) ()", script);
 	WSAMovieV1 amulet(this);
 	amulet.open("AMULET.WSA", 1, 0);
 	amulet._drawPage = 0;
@@ -1266,7 +1266,7 @@ int KyraEngine::cmd_makeAmuletAppear(ScriptState *script) {
 }
 
 int KyraEngine::cmd_drawItemShapeIntoScene(ScriptState *script) {
-	debug(3, "cmd_drawItemShapeIntoScene(0x%X) (%d, %d, %d, %d, %d)", script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4));
+	debug(3, kDebugLevelScriptFuncs, "cmd_drawItemShapeIntoScene(0x%X) (%d, %d, %d, %d, %d)", script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4));
 	int item = stackPos(0);
 	int x = stackPos(1);
 	int y = stackPos(2);
@@ -1290,13 +1290,13 @@ int KyraEngine::cmd_drawItemShapeIntoScene(ScriptState *script) {
 }
 
 int KyraEngine::cmd_setCharactersCurrentFrame(ScriptState *script) {
-	debug(3, "cmd_setCharactersCurrentFrame(0x%X) (%d, %d)", script, stackPos(0), stackPos(1));
+	debug(3, kDebugLevelScriptFuncs, "cmd_setCharactersCurrentFrame(0x%X) (%d, %d)", script, stackPos(0), stackPos(1));
 	_characterList[stackPos(0)].currentAnimFrame = stackPos(1);
 	return 0;
 }
 
 int KyraEngine::cmd_waitForConfirmationMouseClick(ScriptState *script) {
-	debug(3, "cmd_waitForConfirmationMouseClick(0x%X) ()", script);
+	debug(3, kDebugLevelScriptFuncs, "cmd_waitForConfirmationMouseClick(0x%X) ()", script);
 	// if (mouseEnabled) {
 	while (!_mousePressFlag) {
 		updateMousePointer();
@@ -1324,18 +1324,18 @@ int KyraEngine::cmd_pageFlip(ScriptState *script) {
 }
 
 int KyraEngine::cmd_setSceneFile(ScriptState *script) {
-	debug(3, "cmd_setSceneFile(0x%X) (%d, %d)", script, stackPos(0), stackPos(1));
+	debug(3, kDebugLevelScriptFuncs, "cmd_setSceneFile(0x%X) (%d, %d)", script, stackPos(0), stackPos(1));
 	setSceneFile(stackPos(0), stackPos(1));
 	return 0;
 }
 
 int KyraEngine::cmd_getItemInMarbleVase(ScriptState *script) {
-	debug(3, "cmd_getItemInMarbleVase(0x%X) ()", script);
+	debug(3, kDebugLevelScriptFuncs, "cmd_getItemInMarbleVase(0x%X) ()", script);
 	return _marbleVaseItem;
 }
 
 int KyraEngine::cmd_setItemInMarbleVase(ScriptState *script) {
-	debug(3, "cmd_setItemInMarbleVase(0x%X) (%d)", script, stackPos(0));
+	debug(3, kDebugLevelScriptFuncs, "cmd_setItemInMarbleVase(0x%X) (%d)", script, stackPos(0));
 	_marbleVaseItem = stackPos(0);
 	return 0;
 }
@@ -1356,37 +1356,37 @@ int KyraEngine::cmd_shakeScreen(ScriptState *script) {
 }
 
 int KyraEngine::cmd_createAmuletJewel(ScriptState *script) {
-	debug(3, "cmd_createAmuletJewel(0x%X) (%d)", script, stackPos(0));
+	debug(3, kDebugLevelScriptFuncs, "cmd_createAmuletJewel(0x%X) (%d)", script, stackPos(0));
 	seq_createAmuletJewel(stackPos(0), 0, 0, 0);
 	return 0;
 }
 
 int KyraEngine::cmd_setSceneAnimCurrXY(ScriptState *script) {
-	debug(3, "cmd_setSceneAnimCurrXY(0x%X) (%d, %d, %d)", script, stackPos(0), stackPos(1), stackPos(2));
+	debug(3, kDebugLevelScriptFuncs, "cmd_setSceneAnimCurrXY(0x%X) (%d, %d, %d)", 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) {
-	debug(3, "cmd_poisonBrandonAndRemaps(0x%X) ()", script);
+	debug(3, kDebugLevelScriptFuncs, "cmd_poisonBrandonAndRemaps(0x%X) ()", script);
 	setBrandonPoisonFlags(1);
 	return 0;
 }
 
 int KyraEngine::cmd_fillFlaskWithWater(ScriptState *script) {
-	debug(3, "cmd_fillFlaskWithWater(0x%X) (%d, %d)", script, stackPos(0), stackPos(1));
+	debug(3, kDebugLevelScriptFuncs, "cmd_fillFlaskWithWater(0x%X) (%d, %d)", script, stackPos(0), stackPos(1));
 	seq_fillFlaskWithWater(stackPos(0), stackPos(1));
 	return 0;
 }
 
 int KyraEngine::cmd_getCharactersMovementDelay(ScriptState *script) {
-	debug(3, "cmd_getCharactersMovementDelay(0x%X) (%d)", script, stackPos(0));
+	debug(3, kDebugLevelScriptFuncs, "cmd_getCharactersMovementDelay(0x%X) (%d)", script, stackPos(0));
 	return getTimerDelay(stackPos(0)+5);
 }
 
 int KyraEngine::cmd_getBirthstoneGem(ScriptState *script) {
-	debug(3, "cmd_getBirthstoneGem(0x%X) (%d)", script, stackPos(0));
+	debug(3, kDebugLevelScriptFuncs, "cmd_getBirthstoneGem(0x%X) (%d)", script, stackPos(0));
 	if (stackPos(0) < 4) {
 		return _birthstoneGemTable[stackPos(0)];
 	}
@@ -1394,7 +1394,7 @@ int KyraEngine::cmd_getBirthstoneGem(ScriptState *script) {
 }
 
 int KyraEngine::cmd_queryBrandonStatusBit(ScriptState *script) {
-	debug(3, "cmd_queryBrandonStatusBit(0x%X) (%d)", script, stackPos(0));
+	debug(3, kDebugLevelScriptFuncs, "cmd_queryBrandonStatusBit(0x%X) (%d)", script, stackPos(0));
 	if (_brandonStatusBit & stackPos(0)) {
 		return 1;
 	}
@@ -1402,13 +1402,13 @@ int KyraEngine::cmd_queryBrandonStatusBit(ScriptState *script) {
 }
 
 int KyraEngine::cmd_playFluteAnimation(ScriptState *script) {
-	debug(3, "cmd_playFluteAnimation(0x%X) ()", script);
+	debug(3, kDebugLevelScriptFuncs, "cmd_playFluteAnimation(0x%X) ()", script);
 	seq_playFluteAnimation();
 	return 0;
 }
 
 int KyraEngine::cmd_playWinterScrollSequence(ScriptState *script) {
-	debug(3, "cmd_playWinterScrollSequence(0x%X) (%d)", script, stackPos(0));
+	debug(3, kDebugLevelScriptFuncs, "cmd_playWinterScrollSequence(0x%X) (%d)", script, stackPos(0));
 	if (!stackPos(0)) {
 		seq_winterScroll2();
 	} else {
@@ -1418,30 +1418,30 @@ int KyraEngine::cmd_playWinterScrollSequence(ScriptState *script) {
 }
 
 int KyraEngine::cmd_getIdolGem(ScriptState *script) {
-	debug(3, "cmd_getIdolGem(0x%X) (%d)", script, stackPos(0));
+	debug(3, kDebugLevelScriptFuncs, "cmd_getIdolGem(0x%X) (%d)", script, stackPos(0));
 	return _idolGemsTable[stackPos(0)];;
 }
 
 int KyraEngine::cmd_setIdolGem(ScriptState *script) {
-	debug(3, "cmd_setIdolGem(0x%X) (%d, %d)", script, stackPos(0), stackPos(1));
+	debug(3, kDebugLevelScriptFuncs, "cmd_setIdolGem(0x%X) (%d, %d)", script, stackPos(0), stackPos(1));
 	_idolGemsTable[stackPos(0)] = stackPos(1);
 	return 0;
 }
 
 int KyraEngine::cmd_totalItemsInScene(ScriptState *script) {
-	debug(3, "cmd_totalItemsInScene(0x%X) (%d)", script, stackPos(0));
+	debug(3, kDebugLevelScriptFuncs, "cmd_totalItemsInScene(0x%X) (%d)", script, stackPos(0));
 	return countItemsInScene(stackPos(0));
 }
 
 int KyraEngine::cmd_restoreBrandonsMovementDelay(ScriptState *script) {
-	debug(3, "cmd_restoreBrandonsMovementDelay(0x%X) ()", script);
+	debug(3, kDebugLevelScriptFuncs, "cmd_restoreBrandonsMovementDelay(0x%X) ()", script);
 	//TODO: Use movement set by menu, instead of 5.
 	setTimerDelay(5, 5);
 	return 0;
 }
 
 int KyraEngine::cmd_setMousePos(ScriptState *script) {
-	debug(3, "cmd_setMousePos(0x%X) (%d, %d)", script, stackPos(0), stackPos(1));
+	debug(3, kDebugLevelScriptFuncs, "cmd_setMousePos(0x%X) (%d, %d)", script, stackPos(0), stackPos(1));
 	_system->warpMouse(stackPos(0), stackPos(1));
 	_mouseX = stackPos(0);
 	_mouseY = stackPos(1);
@@ -1449,12 +1449,12 @@ int KyraEngine::cmd_setMousePos(ScriptState *script) {
 }
 
 int KyraEngine::cmd_getMouseState(ScriptState *script) {
-	debug(3, "cmd_getMouseState(0x%X) ()", script);
+	debug(3, kDebugLevelScriptFuncs, "cmd_getMouseState(0x%X) ()", script);
 	return _mouseState;
 }
 
 int KyraEngine::cmd_setEntranceMouseCursorTrack(ScriptState *script) {
-	debug(3, "cmd_setEntranceMouseCursorTrack(0x%X) (%d, %d, %d, %d, %d)", script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4));
+	debug(3, kDebugLevelScriptFuncs, "cmd_setEntranceMouseCursorTrack(0x%X) (%d, %d, %d, %d, %d)", 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;
@@ -1464,13 +1464,13 @@ int KyraEngine::cmd_setEntranceMouseCursorTrack(ScriptState *script) {
 }
 
 int KyraEngine::cmd_itemAppearsOnGround(ScriptState *script) {
-	debug(3, "cmd_itemAppearsOnGround(0x%X) (%d, %d, %d)", script, stackPos(0), stackPos(1), stackPos(2));
+	debug(3, kDebugLevelScriptFuncs, "cmd_itemAppearsOnGround(0x%X) (%d, %d, %d)", 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) {
-	debug(3, "cmd_setNoDrawShapesFlag(0x%X) (%d)", script, stackPos(0));
+	debug(3, kDebugLevelScriptFuncs, "cmd_setNoDrawShapesFlag(0x%X) (%d)", script, stackPos(0));
 	_animator->_noDrawShapesFlag = stackPos(0);
 	return 0;
 }
@@ -1481,7 +1481,7 @@ int KyraEngine::cmd_fadeEntirePalette(ScriptState *script) {
 }
 
 int KyraEngine::cmd_itemOnGroundHere(ScriptState *script) {
-	debug(3, "cmd_itemOnGroundHere(0x%X) (%d, %d)", script, stackPos(0), stackPos(1));
+	debug(3, kDebugLevelScriptFuncs, "cmd_itemOnGroundHere(0x%X) (%d, %d)", script, stackPos(0), stackPos(1));
 	assert(stackPos(0) < _roomTableSize);
 	Room *curRoom = &_roomTable[stackPos(0)];
 	for (int i = 0; i < 12; ++i) {
@@ -1492,18 +1492,18 @@ int KyraEngine::cmd_itemOnGroundHere(ScriptState *script) {
 }
 
 int KyraEngine::cmd_queryCauldronState(ScriptState *script) {
-	debug(3, "cmd_queryCauldronState(0x%X) ()", script);
+	debug(3, kDebugLevelScriptFuncs, "cmd_queryCauldronState(0x%X) ()", script);
 	return _cauldronState;
 }
 
 int KyraEngine::cmd_setCauldronState(ScriptState *script) {
-	debug(3, "cmd_setCauldronState(0x%X) (%d)", script, stackPos(0));
+	debug(3, kDebugLevelScriptFuncs, "cmd_setCauldronState(0x%X) (%d)", script, stackPos(0));
 	_cauldronState = stackPos(0);
 	return _cauldronState;
 }
 
 int KyraEngine::cmd_queryCrystalState(ScriptState *script) {
-	debug(3, "cmd_queryCrystalState(0x%X) (%d)", script, stackPos(0));
+	debug(3, kDebugLevelScriptFuncs, "cmd_queryCrystalState(0x%X) (%d)", script, stackPos(0));
 	if (!stackPos(0)) {
 		return _crystalState[0];
 	} else if (stackPos(0) == 1) {
@@ -1513,7 +1513,7 @@ int KyraEngine::cmd_queryCrystalState(ScriptState *script) {
 }
 
 int KyraEngine::cmd_setCrystalState(ScriptState *script) {
-	debug(3, "cmd_setCrystalState(0x%X) (%d)", script, stackPos(0), stackPos(1));
+	debug(3, kDebugLevelScriptFuncs, "cmd_setCrystalState(0x%X) (%d)", script, stackPos(0), stackPos(1));
 	if (!stackPos(0)) {
 		_crystalState[0] = stackPos(1);
 	} else if (stackPos(0) == 1) {
@@ -1528,7 +1528,7 @@ int KyraEngine::cmd_setPaletteRange(ScriptState *script) {
 }
 
 int KyraEngine::cmd_shrinkBrandonDown(ScriptState *script) {
-	debug(3, "cmd_shrinkBrandonDown(0x%X) (%d)", script, stackPos(0));
+	debug(3, kDebugLevelScriptFuncs, "cmd_shrinkBrandonDown(0x%X) (%d)", script, stackPos(0));
 	int delayTime = stackPos(0);
 	checkAmuletAnimFlags();
 	int scaleValue = _scaleTable[_currentCharacter->y1];
@@ -1553,7 +1553,7 @@ int KyraEngine::cmd_shrinkBrandonDown(ScriptState *script) {
 }
 
 int KyraEngine::cmd_growBrandonUp(ScriptState *script) {
-	debug(3, "cmd_growBrandonUp(0x%X) ()", script);
+	debug(3, kDebugLevelScriptFuncs, "cmd_growBrandonUp(0x%X) ()", script);
 	int scaleValue = _scaleTable[_currentCharacter->y1];
 	int scale = 0;
 	if (_scaleMode) {
@@ -1574,26 +1574,26 @@ int KyraEngine::cmd_growBrandonUp(ScriptState *script) {
 }
 
 int KyraEngine::cmd_setBrandonScaleXAndY(ScriptState *script) {
-	debug(3, "cmd_setBrandonScaleXAndY(0x%X) (%d, %d)", script, stackPos(0), stackPos(1));
+	debug(3, kDebugLevelScriptFuncs, "cmd_setBrandonScaleXAndY(0x%X) (%d, %d)", script, stackPos(0), stackPos(1));
 	_animator->_brandonScaleX = stackPos(0);
 	_animator->_brandonScaleY = stackPos(1);
 	return 0;
 }
 
 int KyraEngine::cmd_resetScaleMode(ScriptState *script) {
-	debug(3, "cmd_resetScaleMode(0x%X) ()", script);
+	debug(3, kDebugLevelScriptFuncs, "cmd_resetScaleMode(0x%X) ()", script);
 	_scaleMode = 0;
 	return 0;
 }
 
 int KyraEngine::cmd_getScaleDepthTableValue(ScriptState *script) {
-	debug(3, "cmd_getScaleDepthTableValue(0x%X) (%d)", script, stackPos(0));
+	debug(3, kDebugLevelScriptFuncs, "cmd_getScaleDepthTableValue(0x%X) (%d)", script, stackPos(0));
 	assert(stackPos(0) < ARRAYSIZE(_scaleTable));
 	return _scaleTable[stackPos(0)];
 }
 
 int KyraEngine::cmd_setScaleDepthTableValue(ScriptState *script) {
-	debug(3, "cmd_setScaleDepthTableValue(0x%X) (%d, %d)", script, stackPos(0), stackPos(1));
+	debug(3, kDebugLevelScriptFuncs, "cmd_setScaleDepthTableValue(0x%X) (%d, %d)", script, stackPos(0), stackPos(1));
 	assert(stackPos(0) < ARRAYSIZE(_scaleTable));
 	_scaleTable[stackPos(0)] = stackPos(1);
 	return stackPos(1);
@@ -1601,10 +1601,10 @@ int KyraEngine::cmd_setScaleDepthTableValue(ScriptState *script) {
 
 int KyraEngine::cmd_message(ScriptState *script) {
 	if (_features & GF_TALKIE) {
-		debug(3, "cmd_message(0x%X) (%d, '%s', %d)", script, stackPos(0), stackPosString(1), stackPos(2));
+		debug(3, kDebugLevelScriptFuncs, "cmd_message(0x%X) (%d, '%s', %d)", script, stackPos(0), stackPosString(1), stackPos(2));
 		drawSentenceCommand(stackPosString(1), stackPos(2));
 	} else {
-		debug(3, "cmd_message(0x%X) ('%s', %d)", script, stackPosString(0), stackPos(1));
+		debug(3, kDebugLevelScriptFuncs, "cmd_message(0x%X) ('%s', %d)", script, stackPosString(0), stackPos(1));
 		drawSentenceCommand(stackPosString(0), stackPos(1));
 	}
 
@@ -1612,38 +1612,38 @@ int KyraEngine::cmd_message(ScriptState *script) {
 }
 
 int KyraEngine::cmd_checkClickOnNPC(ScriptState *script) {
-	debug(3, "cmd_checkClickOnNPC(0x%X) (%d, %d)", script, stackPos(0), stackPos(1));
+	debug(3, kDebugLevelScriptFuncs, "cmd_checkClickOnNPC(0x%X) (%d, %d)", script, stackPos(0), stackPos(1));
 	return checkForNPCScriptRun(stackPos(0), stackPos(1));
 }
 
 int KyraEngine::cmd_getFoyerItem(ScriptState *script) {
-	debug(3, "cmd_getFoyerItem(0x%X) (%d)", stackPos(0));
+	debug(3, kDebugLevelScriptFuncs, "cmd_getFoyerItem(0x%X) (%d)", stackPos(0));
 	assert(stackPos(0) < ARRAYSIZE(_foyerItemTable));
 	return _foyerItemTable[stackPos(0)];
 }
 
 int KyraEngine::cmd_setFoyerItem(ScriptState *script) {
-	debug(3, "cmd_setFoyerItem(0x%X) (%d, %d)", stackPos(0), stackPos(1));
+	debug(3, kDebugLevelScriptFuncs, "cmd_setFoyerItem(0x%X) (%d, %d)", stackPos(0), stackPos(1));
 	assert(stackPos(0) < ARRAYSIZE(_foyerItemTable));
 	_foyerItemTable[stackPos(0)] = stackPos(1);
 	return stackPos(1);
 }
 
 int KyraEngine::cmd_setNoItemDropRegion(ScriptState *script) {
-	debug(3, "cmd_setNoItemDropRegion(0x%X) (%d, %d, %d, %d)", script, stackPos(0), stackPos(1), stackPos(2), stackPos(3));
+	debug(3, kDebugLevelScriptFuncs, "cmd_setNoItemDropRegion(0x%X) (%d, %d, %d, %d)", 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) {
-	debug(3, "cmd_walkMalcolmOn(0x%X) ()", script);
+	debug(3, kDebugLevelScriptFuncs, "cmd_walkMalcolmOn(0x%X) ()", script);
 	if (!_malcolmFlag)
 		_malcolmFlag = 1;
 	return 0;
 }
 
 int KyraEngine::cmd_passiveProtection(ScriptState *script) {
-	debug(3, "cmd_passiveProtection(0x%X) ()", script);
+	debug(3, kDebugLevelScriptFuncs, "cmd_passiveProtection(0x%X) ()", script);
 	return 1;
 }
 
@@ -1658,13 +1658,13 @@ int KyraEngine::cmd_brandonToStoneSequence(ScriptState *script) {
 }
 
 int KyraEngine::cmd_brandonHealingSequence(ScriptState *script) {
-	debug(3, "cmd_brandonHealingSequence(0x%X) ()", script);
+	debug(3, kDebugLevelScriptFuncs, "cmd_brandonHealingSequence(0x%X) ()", script);
 	seq_brandonHealing();
 	return 0;
 }
 
 int KyraEngine::cmd_protectCommandLine(ScriptState *script) {
-	debug(3, "cmd_protectCommandLine(0x%X) (%d)", script, stackPos(0));
+	debug(3, kDebugLevelScriptFuncs, "cmd_protectCommandLine(0x%X) (%d)", script, stackPos(0));
 	return stackPos(0);
 }
 
@@ -1679,13 +1679,13 @@ int KyraEngine::cmd_resetMaskRegion(ScriptState *script) {
 }
 
 int KyraEngine::cmd_setPaletteChangeFlag(ScriptState *script) {
-	debug(3, "cmd_setPaletteChangeFlag(0x%X) (%d)", script, stackPos(0));
+	debug(3, kDebugLevelScriptFuncs, "cmd_setPaletteChangeFlag(0x%X) (%d)", script, stackPos(0));
 	_paletteChanged = stackPos(0);
 	return _paletteChanged;
 }
 
 int KyraEngine::cmd_fillRect(ScriptState *script) {
-	debug(3, "cmd_fillRect(0x%X) (%d, %d, %d, %d, %d, 0x%X)", script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5));
+	debug(3, kDebugLevelScriptFuncs, "cmd_fillRect(0x%X) (%d, %d, %d, %d, %d, 0x%X)", 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));
@@ -1694,19 +1694,19 @@ int KyraEngine::cmd_fillRect(ScriptState *script) {
 }
 
 int KyraEngine::cmd_vocUnload(ScriptState *script) {
-	debug(3, "cmd_vocUnload(0x%X) ()", script);
+	debug(3, kDebugLevelScriptFuncs, "cmd_vocUnload(0x%X) ()", script);
 	// this should unload all voc files (not needed)
 	return 0;
 }
 
 int KyraEngine::cmd_vocLoad(ScriptState *script) {
-	debug(3, "cmd_vocLoad(0x%X) (%d)", script, stackPos(0));
+	debug(3, kDebugLevelScriptFuncs, "cmd_vocLoad(0x%X) (%d)", script, stackPos(0));
 	// this should load the specified voc file (not needed)
 	return 0;
 }
 
 int KyraEngine::cmd_dummy(ScriptState *script) {
-	debug(3, "cmd_dummy(0x%X) ()", script);
+	debug(3, kDebugLevelScriptFuncs, "cmd_dummy(0x%X) ()", script);
 	return 0;
 }