Cleanup HE debug msgs

svn-id: r20506

8 files changed, 35 insertions, 69 deletions

diff --git a/scumm/script_v100he.cpp b/scumm/script_v100he.cpp
index 9b1a3e8183..8be1cc2248 100644
--- a/scumm/script_v100he.cpp
+++ b/scumm/script_v100he.cpp
@@ -430,7 +430,6 @@ void ScummEngine_v100he::o100_actorOps() {
 		for (i = 0; i < k; ++i) {
 			a->setUserCondition(args[i] & 0x7F, args[i] & 0x80);
 		}
-		debug(1,"o100_actorOps: case 22 (%d)", k);
 		break;
 	case 25:		// SO_COSTUME
 		a->setActorCostume(pop());
@@ -440,7 +439,7 @@ void ScummEngine_v100he::o100_actorOps() {
 		break;
 	case 32:
 		i = pop();
-		debug(1,"o100_actorOps: case 32 (%d)", i);
+		debug(0,"o100_actorOps: case 32 (%d)", i);
 		break;
 	case 52:		// SO_ACTOR_NAME
 		copyScriptString(string, sizeof(string));
@@ -585,7 +584,7 @@ void ScummEngine_v100he::o100_arrayOps() {
 
 	byte subOp = fetchScriptByte();
 	int array = fetchScriptWord();
-	debug(1,"o100_arrayOps: array %d case %d", array, subOp);
+	debug(9,"o100_arrayOps: array %d case %d", array, subOp);
 
 	switch (subOp) {
 	case 35:
@@ -906,7 +905,6 @@ void ScummEngine_v100he::o100_setSpriteGroupInfo() {
 
 	byte subOp = fetchScriptByte();
 
-	debug(1,"o100_setSpriteGroupInfo (%d)", subOp);
 	switch (subOp) {
 	case 0:
 		_curSpriteGroupId = pop();
@@ -1372,7 +1370,6 @@ void ScummEngine_v100he::o100_wizImageOps() {
 	default:
 		error("o100_wizImageOps: Unknown case %d", subOp);
 	}
-	debug(1,"o100_wizImageOps (%d)", subOp);
 }
 
 void ScummEngine_v100he::o100_dim2dim2Array() {
@@ -1510,7 +1507,6 @@ void ScummEngine_v100he::o100_paletteOps() {
 	default:
 		error("o100_paletteOps: Unknown case %d", subOp);
 	}
-	debug(1, "o100_paletteOps (%d)", subOp);
 }
 
 void ScummEngine_v100he::o100_jumpToScriptUnk() {
@@ -1683,10 +1679,8 @@ void ScummEngine_v100he::o100_startSound() {
 		var = pop();
 		_heSndSoundId = pop();
 		_sound->setSoundVar(_heSndSoundId, var, value);
-		debug(0,"o100_startSound: case 83 (snd %d, var %d, value %d)", _heSndSoundId, var, value);
 		break;
 	case 92:
-		debug(0, "o100_startSound: case 92 (ID %d, Offset %d, Channel %d, Flags %d)", _heSndSoundId, _heSndOffset, _heSndChannel, _heSndFlags);
 		_sound->addSoundToQueue(_heSndSoundId, _heSndOffset, _heSndChannel, _heSndFlags);
 		break;
 	case 128:
@@ -1734,7 +1728,6 @@ void ScummEngine_v100he::o100_setSpriteInfo() {
 
 	byte subOp = fetchScriptByte();
 
-	debug(1,"o100_setSpriteInfo (%d)", subOp);
 	switch (subOp) {
 	case 0:
 		_curMaxSpriteId = pop();
@@ -2230,7 +2223,7 @@ void ScummEngine_v100he::o100_videoOps() {
 		error("o100_videoOps: unhandled case %d", subOp);
 	}
 
-	debug(0,"o100_videoOps stub (%d)", subOp);
+	debug(1,"o100_videoOps stub (%d)", subOp);
 }
 
 void ScummEngine_v100he::o100_wait() {
@@ -2296,7 +2289,6 @@ void ScummEngine_v100he::o100_writeFile() {
 	default:
 		error("o100_writeFile: default case %d", subOp);
 	}
-	debug(1, "o100_writeFile: slot %d, subOp %d", slot, subOp);
 }
 
 void ScummEngine_v100he::o100_isResourceLoaded() {
@@ -2368,7 +2360,6 @@ void ScummEngine_v100he::o100_getSpriteGroupInfo() {
 
 	byte subOp = fetchScriptByte();
 
-	debug(1,"o100_getSpriteGroupInfo (%d)", subOp);
 	switch (subOp) {
 	case 5:
 		spriteGroupId = pop();
@@ -2573,7 +2564,6 @@ void ScummEngine_v100he::o100_getPaletteData() {
 	default:
 		error("o100_getPaletteData: Unknown case %d", subOp);
 	}
-	debug(0, "o100_getPaletteData stub (%d)", subOp);
 }
 
 void ScummEngine_v100he::o100_readFile() {
@@ -2608,7 +2598,6 @@ void ScummEngine_v100he::o100_readFile() {
 	default:
 		error("o100_readFile: default case %d", subOp);
 	}
-	debug(1, "o100_readFile: slot %d, subOp %d val %d", slot, subOp, val);
 }
 
 void ScummEngine_v100he::o100_getSpriteInfo() {
@@ -2618,7 +2607,6 @@ void ScummEngine_v100he::o100_getSpriteInfo() {
 
 	byte subOp = fetchScriptByte();
 
-	debug(1,"o100_getSpriteInfo (%d)", subOp);
 	switch (subOp) {
 	case 3:
 		spriteId = pop();
@@ -2881,7 +2869,7 @@ void ScummEngine_v100he::o100_getVideoData() {
 	}
 
 	push(-1);
-	debug(0,"o100_getVideoData stub (%d)", subOp);
+	debug(1,"o100_getVideoData stub (%d)", subOp);
 }
 
 void ScummEngine_v100he::decodeParseString(int m, int n) {
diff --git a/scumm/script_v72he.cpp b/scumm/script_v72he.cpp
index 3501a88d41..b887920a13 100644
--- a/scumm/script_v72he.cpp
+++ b/scumm/script_v72he.cpp
@@ -397,7 +397,7 @@ ScummEngine_v72he::ArrayHeader *ScummEngine_v72he::defineArray(int array, int ty
 
 	id = findFreeArrayId();
 
-	debug(5,"defineArray (array %d, dim2start %d, dim2end %d dim1start %d dim1end %d", id, dim2start, dim2end, dim1start, dim1end);
+	debug(9,"defineArray (array %d, dim2start %d, dim2end %d dim1start %d dim1end %d", id, dim2start, dim2end, dim1start, dim1end);
 
 	if (array & 0x80000000) {
 		error("Can't define bit variable as array pointer");
@@ -429,7 +429,7 @@ ScummEngine_v72he::ArrayHeader *ScummEngine_v72he::defineArray(int array, int ty
 }
 
 int ScummEngine_v72he::readArray(int array, int idx2, int idx1) {
-	debug(5, "readArray (array %d, idx2 %d, idx1 %d)", readVar(array), idx2, idx1);
+	debug(9, "readArray (array %d, idx2 %d, idx1 %d)", readVar(array), idx2, idx1);
 
 	if (readVar(array) == 0)
 		error("readArray: Reference to zeroed array pointer");
@@ -465,7 +465,7 @@ int ScummEngine_v72he::readArray(int array, int idx2, int idx1) {
 }
 
 void ScummEngine_v72he::writeArray(int array, int idx2, int idx1, int value) {
-	debug(5, "writeArray (array %d, idx2 %d, idx1 %d, value %d)", readVar(array), idx2, idx1, value);
+	debug(9, "writeArray (array %d, idx2 %d, idx1 %d, value %d)", readVar(array), idx2, idx1, value);
 
 	if (readVar(array) == 0)
 		error("writeArray: Reference to zeroed array pointer");
@@ -525,7 +525,7 @@ void ScummEngine_v72he::readArrayFromIndexFile() {
 }
 
 int ScummEngine_v72he::convertFilePath(byte *dst, bool setFilePath) {
-	debug(0, "convertFilePath: original filePath is %s", dst);
+	debug(1, "convertFilePath: original filePath is %s", dst);
 
 	// Switch all \ to / for portablity
 	int len = resStrLen(dst) + 1;
@@ -552,7 +552,7 @@ int ScummEngine_v72he::convertFilePath(byte *dst, bool setFilePath) {
 			sprintf(filePath, "%s%s", _saveFileMan->getSavePath(), dst + r);
 		}
 		strcpy((char *)dst, filePath);
-		debug(0, "convertFilePath: filePath is %s", dst);
+		debug(1, "convertFilePath: filePath is %s", dst);
 	}
 
 	return r;
@@ -1157,7 +1157,7 @@ void ScummEngine_v72he::o72_actorOps() {
 		break;
 	case 68: // HE 90+
 		k = pop();
-		debug(1,"o72_actorOps: case 68 (%d)", k);
+		debug(0,"o72_actorOps: case 68 (%d)", k);
 		break;
 	case 76:		// SO_COSTUME
 		a->setActorCostume(pop());
@@ -1434,7 +1434,7 @@ void ScummEngine_v72he::o72_arrayOps() {
 
 	byte subOp = fetchScriptByte();
 	int array = fetchScriptWord();
-	debug(1,"o72_arrayOps: array %d case %d", array, subOp);
+	debug(9,"o72_arrayOps: array %d case %d", array, subOp);
 
 	switch (subOp) {
 	case 7:			// SO_ASSIGN_STRING
@@ -1745,7 +1745,7 @@ void ScummEngine_v72he::o72_openFile() {
 	mode = pop();
 	copyScriptString(filename, sizeof(filename));
 
-	debug(0,"Original filename %s", filename);
+	debug(1,"Original filename %s", filename);
 
 	// There are Macintosh specific versions of HE7.2 games.
 	if (_heversion >= 80 && _platform == Common::kPlatformMacintosh) {
@@ -1764,7 +1764,7 @@ void ScummEngine_v72he::o72_openFile() {
 	}
 
 	int r = convertFilePath(filename);
-	debug(0,"Final filename to %s", filename + r);
+	debug(1,"Final filename to %s", filename + r);
 
 	slot = -1;
 	for (i = 1; i < 17; i++) {
@@ -1840,7 +1840,6 @@ void ScummEngine_v72he::o72_readFile() {
 	default:
 		error("o72_readFile: default case %d", subOp);
 	}
-	debug(1, "o72_readFile: slot %d, subOp %d val %d", slot, subOp, val);
 }
 
 void ScummEngine_v72he::writeFileFromArray(int slot, int32 resID) {
@@ -1873,7 +1872,6 @@ void ScummEngine_v72he::o72_writeFile() {
 	default:
 		error("o72_writeFile: default case %d", subOp);
 	}
-	debug(1, "o72_writeFile: slot %d, subOp %d", slot, subOp);
 }
 
 void ScummEngine_v72he::o72_findAllObjects() {
@@ -2051,7 +2049,6 @@ void ScummEngine_v72he::checkArrayLimits(int array, int dim2start, int dim2end,
 void ScummEngine_v72he::copyArray(int array1, int a1_dim2start, int a1_dim2end, int a1_dim1start, int a1_dim1end,
 				int array2, int a2_dim2start, int a2_dim2end, int a2_dim1start, int a2_dim1end)
 {
-	debug(5, "ScummEngine_v72he::copyArray(%d, [%d,%d,%d,%d], %d, [%d,%d,%d,%d])", array1, a1_dim2start, a1_dim2end, a1_dim1start, a1_dim1end, array2, a2_dim2start, a2_dim2end, a2_dim1start, a2_dim1end);
 	byte *dst, *src;
 	int dstPitch, srcPitch;
 	int rowSize;
@@ -2169,7 +2166,7 @@ void ScummEngine_v72he::o72_readINI() {
 		error("o72_readINI: default type %d", subOp);
 	}
 
-	debug(0, "o72_readINI: Option %s", option);
+	debug(1, "o72_readINI: Option %s", option);
 }
 
 void ScummEngine_v72he::o72_writeINI() {
@@ -2184,7 +2181,7 @@ void ScummEngine_v72he::o72_writeINI() {
 		value = pop();
 		copyScriptString(option, sizeof(option));
 		ConfMan.set((char *)option, value);
-		debug(0, "o72_writeINI: Option %s Value %d", option, value);
+		debug(1, "o72_writeINI: Option %s Value %d", option, value);
 		break;
 	case 77: // HE 100
 	case 7: // string
@@ -2204,7 +2201,7 @@ void ScummEngine_v72he::o72_writeINI() {
 			return;
 
 		ConfMan.set((char *)option, (char *)string);
-		debug(0, "o72_writeINI: Option %s String %s", option, string);
+		debug(1, "o72_writeINI: Option %s String %s", option, string);
 		break;
 	default:
 		error("o72_writeINI: default type %d", subOp);
diff --git a/scumm/script_v7he.cpp b/scumm/script_v7he.cpp
index ef0f1addd5..0c1b867afa 100644
--- a/scumm/script_v7he.cpp
+++ b/scumm/script_v7he.cpp
@@ -437,12 +437,10 @@ void ScummEngine_v70he::o70_startSound() {
 		var = pop();
 		_heSndSoundId = pop();
 		_sound->setSoundVar(_heSndSoundId, var, value);
-		debug(0,"o70_startSound: case 23 (snd %d, var %d, value %d)", _heSndSoundId, var, value);
 		break;
 	case 25:
 		value = pop();
 		_heSndSoundId = pop();
-		debug(0, "o70_startSound: case 25 (ID %d, Offset 0, Channel 0, Flags 8)", _heSndSoundId);
 		_sound->addSoundToQueue(_heSndSoundId, 0, 0, 8);
 	case 56:
 		_heSndFlags |= 16;
@@ -469,7 +467,6 @@ void ScummEngine_v70he::o70_startSound() {
 		_heSndFlags |= 1;
 		break;
 	case 255:
-		debug(0, "o70_startSound (ID %d, Offset %d, Channel %d, Flags %d)", _heSndSoundId, _heSndOffset, _heSndChannel, _heSndFlags);
 		_sound->addSoundToQueue(_heSndSoundId, _heSndOffset, _heSndChannel, _heSndFlags);
 		_heSndFlags = 0;
 		break;
@@ -783,7 +780,6 @@ void ScummEngine_v70he::o70_kernelSetFunctions() {
 
 	num = getStackList(args, ARRAYSIZE(args));
 
-	debug(1, "o70_kernelSetFunctions: case %d (param count %d)", args[0], num);
 	switch (args[0]) {
 	case 1:
 		// Used to restore images when decorating cake in
@@ -975,7 +971,7 @@ void ScummEngine_v70he::o70_readINI() {
 	default:
 		error("o70_readINI: default type %d", type);
 	}
-	debug(0, "o70_readINI: Option %s", option);
+	debug(1, "o70_readINI: Option %s", option);
 }
 
 void ScummEngine_v70he::o70_writeINI() {
@@ -993,14 +989,14 @@ void ScummEngine_v70he::o70_writeINI() {
 	switch (type) {
 	case 1: // number
 		ConfMan.set((char *)option, value);
-		debug(0, "o70_writeINI: Option %s Value %d", option, value);
+		debug(1, "o70_writeINI: Option %s Value %d", option, value);
 		break;
 	case 2: // string
 		convertMessageToString(_scriptPointer, string, sizeof(string));
 		len = resStrLen(_scriptPointer);
 		_scriptPointer += len + 1;
 		ConfMan.set((char *)option, (char *)string);
-		debug(0, "o70_writeINI: Option %s String %s", option, string);
+		debug(1, "o70_writeINI: Option %s String %s", option, string);
 		break;
 	default:
 		error("o70_writeINI: default type %d", type);
diff --git a/scumm/script_v80he.cpp b/scumm/script_v80he.cpp
index a810332c94..43a15db209 100644
--- a/scumm/script_v80he.cpp
+++ b/scumm/script_v80he.cpp
@@ -481,7 +481,7 @@ void ScummEngine_v80he::o80_readConfigFile() {
 		error("o80_readConfigFile: default type %d", subOp);
 	}
 
-	debug(0, "o80_readConfigFile: Filename %s Section %s Option %s Value %s", filename, section, option, entry.c_str());
+	debug(1, "o80_readConfigFile: Filename %s Section %s Option %s Value %s", filename, section, option, entry.c_str());
 }
 
 void ScummEngine_v80he::o80_writeConfigFile() {
@@ -516,7 +516,7 @@ void ScummEngine_v80he::o80_writeConfigFile() {
 	ConfFile.loadFromFile((const char *)filename);
 	ConfFile.setKey((char *)option, (char *)section, (char *)string);
 	ConfFile.saveToFile((const char *)filename);
-	debug(0,"o80_writeConfigFile: Filename %s Section %s Option %s String %s", filename, section, option, string);
+	debug(1,"o80_writeConfigFile: Filename %s Section %s Option %s String %s", filename, section, option, string);
 }
 
 void ScummEngine_v80he::o80_cursorCommand() {
@@ -609,8 +609,6 @@ void ScummEngine_v80he::o80_drawWizPolygon() {
  * @param id	the id of an actor, wizimage or color (low bit) & flag (high bit)
  */
 void ScummEngine_v80he::drawLine(int x1, int y1, int x, int y, int step, int type, int id) {
-	debug(0,"drawLine: x1 %d y1 %d x %d y %d, step %d type %d id %d", x1, y1, x, y, step, type, id);
-
 	if (step < 0) {
 		step = -step;
 	}
diff --git a/scumm/script_v90he.cpp b/scumm/script_v90he.cpp
index 6708d072a2..64ad859c2e 100644
--- a/scumm/script_v90he.cpp
+++ b/scumm/script_v90he.cpp
@@ -555,7 +555,7 @@ void ScummEngine_v90he::o90_videoOps() {
 		error("o90_videoOps: unhandled case %d", subOp);
 	}
 
-	debug(0, "o90_videoOps stub (%d)", subOp);
+	debug(1, "o90_videoOps stub (%d)", subOp);
 }
 
 void ScummEngine_v90he::o90_getVideoData() {
@@ -588,7 +588,7 @@ void ScummEngine_v90he::o90_getVideoData() {
 	}
 
 	push(-1);
-	debug(0, "o90_getVideoData stub (%d)", subOp);
+	debug(1, "o90_getVideoData stub (%d)", subOp);
 }
 
 void ScummEngine_v90he::o90_wizImageOps() {
@@ -808,8 +808,6 @@ void ScummEngine_v90he::o90_wizImageOps() {
 	default:
 		error("o90_wizImageOps: unhandled case %d", subOp);
 	}
-
-	debug(1, "o90_wizImageOps (%d)", subOp);
 }
 
 void ScummEngine_v90he::o90_getDistanceBetweenPoints() {
@@ -864,7 +862,6 @@ void ScummEngine_v90he::o90_getSpriteInfo() {
 	byte subOp = fetchScriptByte();
 	subOp -= 30;
 
-	debug(1, "o90_getSpriteInfo (%d)", subOp);
 	switch (subOp) {
 	case 0:
 		spriteId = pop();
@@ -1119,7 +1116,6 @@ void ScummEngine_v90he::o90_setSpriteInfo() {
 	byte subOp = fetchScriptByte();
 	subOp -= 34;
 
-	debug(1, "o90_setSpriteInfo (%d)", subOp);
 	switch (subOp) {
 	case 0:
 		args[0] = pop();
@@ -1450,7 +1446,6 @@ void ScummEngine_v90he::o90_getSpriteGroupInfo() {
 
 	byte subOp = fetchScriptByte();
 
-	debug(1, "o90_getSpriteGroupInfo (%d)", subOp);
 	switch (subOp) {
 	case 8: // HE 99+
 		spriteGroupId = pop();
@@ -1532,7 +1527,6 @@ void ScummEngine_v90he::o90_setSpriteGroupInfo() {
 	byte subOp = fetchScriptByte();
 	subOp -= 37;
 
-	debug(1, "o90_setSpriteGroupInfo (%d)", subOp);
 	switch (subOp) {
 	case 0:
 		type = pop() - 1;
@@ -2272,7 +2266,7 @@ static int compareDwordArrayReverse(const void *a, const void *b) {
 }
 
 void ScummEngine_v90he::sortArray(int array, int dim2start, int dim2end, int dim1start, int dim1end, int sortOrder) {
-	debug(5, "sortArray(%d, [%d,%d,%d,%d], %d)", array, dim2start, dim2end, dim1start, dim1end, sortOrder);
+	debug(9, "sortArray(%d, [%d,%d,%d,%d], %d)", array, dim2start, dim2end, dim1start, dim1end, sortOrder);
 
 	assert(dim1start == dim1end);
 	checkArrayLimits(array, dim2start, dim2end, dim1start, dim1end);
@@ -2381,7 +2375,6 @@ void ScummEngine_v90he::o90_getObjectData() {
 	default:
 		error("o90_getObjectData: Unknown case %d", subOp);
 	}
-	debug(1, "o90_getObjectData (%d)", subOp);
 }
 
 void ScummEngine_v90he::o90_getPaletteData() {
@@ -2430,7 +2423,6 @@ void ScummEngine_v90he::o90_getPaletteData() {
 	default:
 		error("o90_getPaletteData: Unknown case %d", subOp);
 	}
-	debug(1, "o90_getPaletteData stub (%d)", subOp);
 }
 
 void ScummEngine_v90he::o90_paletteOps() {
@@ -2502,7 +2494,6 @@ void ScummEngine_v90he::o90_paletteOps() {
 	default:
 		error("o90_paletteOps: Unknown case %d", subOp);
 	}
-	debug(1, "o90_paletteOps (%d)", subOp);
 }
 
 void ScummEngine_v90he::o90_fontUnk() {
@@ -2584,7 +2575,6 @@ void ScummEngine_v90he::o90_kernelSetFunctions() {
 
 	num = getStackList(args, ARRAYSIZE(args));
 
-	debug(1, "o90_kernelSetFunctions: case %d (param count %d)", args[0], num);
 	switch (args[0]) {
 	case 20:
 		a = derefActor(args[1], "o90_kernelSetFunctions: 20");
diff --git a/scumm/sound_he.cpp b/scumm/sound_he.cpp
index 838fb5f685..8cf2084f1f 100644
--- a/scumm/sound_he.cpp
+++ b/scumm/sound_he.cpp
@@ -107,7 +107,7 @@ int Sound::getSoundVar(int sound, int var) {
 	}
 
 	if (chan != -1) {
-		debug(1, "getSoundVar: sound %d var %d result %d", sound, var, _heChannel[chan].soundVars[var]);
+		debug(5, "getSoundVar: sound %d var %d result %d", sound, var, _heChannel[chan].soundVars[var]);
 		return _heChannel[chan].soundVars[var];
 	} else {
 		return 0;
@@ -124,7 +124,7 @@ void Sound::setSoundVar(int sound, int var, int val) {
 	}
 
 	if (chan != -1) {
-		debug(1, "setSoundVar: sound %d var %d val %d", sound, var, val);
+		debug(5, "setSoundVar: sound %d var %d val %d", sound, var, val);
 		_heChannel[chan].soundVars[var] = val;
 	}
 }
@@ -149,7 +149,7 @@ void Sound::setupHEMusicFile() {
 		total_size = musicFile.readUint32BE();
 		musicFile.seek(16, SEEK_SET);
 		_heMusicTracks = musicFile.readUint32LE();
-		debug(0, "Total music tracks %d", _heMusicTracks);
+		debug(5, "Total music tracks %d", _heMusicTracks);
 
 		int musicStart = (_vm->_heversion >= 80) ? 56 : 20;
 		musicFile.seek(musicStart, SEEK_SET);
@@ -220,7 +220,7 @@ void Sound::processSoundCode() {
 				break;
 			}
 
-			debug(1, "Channel %d Timer %d Time %d", chan, tmr, time);
+			debug(5, "Channel %d Timer %d Time %d", chan, tmr, time);
 			if (time >= tmr)
 				break;
 
@@ -241,7 +241,7 @@ void Sound::processSoundOpcodes(int sound, byte *codePtr, int *soundVars) {
 		opcode = (opcode & 0xFFF) >> 4;
 		arg = opcode & 3;
 		opcode &= ~3;
-		debug(1, "processSoundOpcodes: sound %d opcode %d", sound, opcode);
+		debug(5, "processSoundOpcodes: sound %d opcode %d", sound, opcode);
 		switch (opcode) {
 		case 0: // Continue
 			break;
@@ -319,7 +319,7 @@ void Sound::playHESound(int soundID, int heOffset, int heChannel, int heFlags) {
 	if (heChannel == -1)
 		heChannel = (_vm->VAR_RESERVED_SOUND_CHANNELS != 0xFF) ? findFreeSoundChannel() : 1;
 
-	debug(0,"playHESound: soundID %d heOffset %d heChannel %d heFlags %d", soundID, heOffset, heChannel, heFlags);
+	debug(5,"playHESound: soundID %d heOffset %d heChannel %d heFlags %d", soundID, heOffset, heChannel, heFlags);
 
 	if (soundID >= 10000) {
 		// Special codes, used in pjgames
diff --git a/scumm/sprite_he.cpp b/scumm/sprite_he.cpp
index eb47a0a01e..6c9dae3553 100644
--- a/scumm/sprite_he.cpp
+++ b/scumm/sprite_he.cpp
@@ -97,7 +97,7 @@ void Sprite::getSpriteBounds(int spriteId, bool checkGroup, Common::Rect &bound)
 // spriteInfoGet functions
 //
 int Sprite::findSpriteWithClassOf(int x_pos, int y_pos, int spriteGroupId, int type, int num, int *args) {
-	debug(1, "findSprite: x %d, y %d, spriteGroup %d, type %d, num %d", x_pos, y_pos, spriteGroupId, type, num);
+	debug(2, "findSprite: x %d, y %d, spriteGroup %d, type %d, num %d", x_pos, y_pos, spriteGroupId, type, num);
 	Common::Point pos[1];
 	bool cond;
 	int code, classId;
diff --git a/scumm/wiz_he.cpp b/scumm/wiz_he.cpp
index bf67aa1653..dbe65fd195 100644
--- a/scumm/wiz_he.cpp
+++ b/scumm/wiz_he.cpp
@@ -50,7 +50,6 @@ void Wiz::polygonClear() {
 void Wiz::polygonLoad(const uint8 *polData) {
 	int slots = READ_LE_UINT32(polData);
 	polData += 4;
-	debug(1, "Loading %d polygon slots", slots);
 
 	bool flag = 1;
 	int id, points, vert1x, vert1y, vert2x, vert2y, vert3x, vert3y, vert4x, vert4y;
@@ -444,10 +443,10 @@ void Wiz::copyRawWizImage(uint8 *dst, const uint8 *src, int dstw, int dsth, int
 
 void Wiz::decompressWizImage(uint8 *dst, int dstPitch, const Common::Rect &dstRect, const uint8 *src, const Common::Rect &srcRect, int flags, const uint8 *palPtr, const uint8 *xmapPtr) {
 	if (flags & kWIFFlipX) {
-		debug(0, "decompressWizImage: Unhandled flag kWIFFlipX");
+		debug(1, "decompressWizImage: Unhandled flag kWIFFlipX");
 	}
 	if (flags & kWIFFlipY) {
-		debug(0, "decompressWizImage: Unhandled flag kWIFFlipY");
+		debug(1, "decompressWizImage: Unhandled flag kWIFFlipY");
 	}
 
 	const uint8 *dataPtr, *dataPtrNext;
@@ -1214,7 +1213,6 @@ void Wiz::drawWizComplexPolygon(int resNum, int state, int po_x, int po_y, int s
 }
 
 void Wiz::drawWizPolygon(int resNum, int state, int id, int flags, int shadow, int dstResNum, int palette) {
-	debug(1, "drawWizPolygon(resNum %d, id %d, flags 0x%X, shadow %d palette %d)", resNum, id, flags, shadow, palette);
 	int i;
 	WizPolygon *wp = NULL;
 	for (i = 0; i < ARRAYSIZE(_polygons); ++i) {
@@ -1234,7 +1232,7 @@ void Wiz::drawWizPolygon(int resNum, int state, int id, int flags, int shadow, i
 }
 
 void Wiz::drawWizPolygonTransform(int resNum, int state, Common::Point *wp, int flags, int shadow, int dstResNum, int palette) {
-	debug(1, "drawWizPolygonTransform(resNum %d, flags 0x%X, shadow %d dstResNum %d palette %d)", resNum, flags, shadow, dstResNum, palette);
+	debug(2, "drawWizPolygonTransform(resNum %d, flags 0x%X, shadow %d dstResNum %d palette %d)", resNum, flags, shadow, dstResNum, palette);
 	int i;
 
 	if (flags & 0x800000) {
@@ -1507,7 +1505,6 @@ void Wiz::displayWizComplexImage(const WizParameters *params) {
 }
 
 void Wiz::createWizEmptyImage(const WizParameters *params) {
-	debug(1, "ScummEngine_v90he::createWizEmptyImage(%d, %d, %d)", params->img.resNum, params->resDefImgW, params->resDefImgH);
 	int img_w = 640;
 	if (params->processFlags & kWPFUseDefImgWidth) {
 		img_w = params->resDefImgW;
@@ -1772,7 +1769,7 @@ void Wiz::processWizImage(const WizParameters *params) {
 	char buf[512];
 	unsigned int i;
 
-	debug(5, "processWizImage: processMode %d", params->processMode);
+	debug(2, "processWizImage: processMode %d", params->processMode);
 	switch (params->processMode) {
 	case 0:
 		// Used in racedemo