Moved some more console commands to ScummVM's debug console

svn-id: r41126

9 files changed, 566 insertions, 436 deletions

diff --git a/engines/sci/console.cpp b/engines/sci/console.cpp
index cd06d63848..df8ca8f1ce 100644
--- a/engines/sci/console.cpp
+++ b/engines/sci/console.cpp
@@ -36,6 +36,8 @@
 #include "sci/gfx/gfx_state_internal.h"
 #include "sci/gfx/gfx_widgets.h"	// for getPort
 #include "sci/sfx/songlib.h"	// for songlib_t
+#include "sci/sfx/iterator.h"	// for SCI_SONG_ITERATOR_TYPE_SCI0
+#include "sci/sfx/sci_midi.h"
 #include "sci/vocabulary.h"
 
 #include "common/savefile.h"
@@ -44,55 +46,84 @@ namespace Sci {
 
 extern EngineState *g_EngineState;
 
+int debug_sleeptime_factor = 1;
 int _kdebug_cheap_event_hack = 0;
 bool _kdebug_track_mouse_clicks = false;
+int _weak_validations = 1; // Some validation errors are reduced to warnings if non-0
 
 Console::Console(SciEngine *vm) : GUI::Debugger() {
 	_vm = vm;
 
-	DCmd_Register("version",			WRAP_METHOD(Console, cmdGetVersion));
+	// Kernel
 //	DCmd_Register("classes",			WRAP_METHOD(Console, cmdClasses));	// TODO
 	DCmd_Register("opcodes",			WRAP_METHOD(Console, cmdOpcodes));
 	DCmd_Register("selectors",			WRAP_METHOD(Console, cmdSelectors));
 	DCmd_Register("kernel_names",		WRAP_METHOD(Console, cmdKernelNames));
+	DCmd_Register("registers",			WRAP_METHOD(Console, cmdRegisters));
+	DCmd_Register("dissect_script",		WRAP_METHOD(Console, cmdDissectScript));
+	DCmd_Register("weak_validations",	WRAP_METHOD(Console, cmdWeakValidations));
+	// Parser
 	DCmd_Register("suffixes",			WRAP_METHOD(Console, cmdSuffixes));
+	DCmd_Register("parse_grammar",		WRAP_METHOD(Console, cmdParseGrammar));
 	DCmd_Register("parser_nodes",		WRAP_METHOD(Console, cmdParserNodes));
 	DCmd_Register("parser_words",		WRAP_METHOD(Console, cmdParserWords));
+	// Resources
 	DCmd_Register("hexdump",			WRAP_METHOD(Console, cmdHexDump));
-	DCmd_Register("dissect_script",		WRAP_METHOD(Console, cmdDissectScript));
-	DCmd_Register("room",				WRAP_METHOD(Console, cmdRoomNumber));
-	DCmd_Register("size",				WRAP_METHOD(Console, cmdResourceSize));
+	DCmd_Register("resource_id",		WRAP_METHOD(Console, cmdResourceId));
+	DCmd_Register("resource_size",		WRAP_METHOD(Console, cmdResourceSize));
 	DCmd_Register("resource_types",		WRAP_METHOD(Console, cmdResourceTypes));
-	DCmd_Register("sci0_palette",		WRAP_METHOD(Console, cmdSci0Palette));
-	DCmd_Register("hexgrep",			WRAP_METHOD(Console, cmdHexgrep));
 	DCmd_Register("list",				WRAP_METHOD(Console, cmdList));
-	DCmd_Register("clear_screen",		WRAP_METHOD(Console, cmdClearScreen));
-	DCmd_Register("redraw_screen",		WRAP_METHOD(Console, cmdRedrawScreen));
+	DCmd_Register("hexgrep",			WRAP_METHOD(Console, cmdHexgrep));
+	// Game
 	DCmd_Register("save_game",			WRAP_METHOD(Console, cmdSaveGame));
 	DCmd_Register("restore_game",		WRAP_METHOD(Console, cmdRestoreGame));
 	DCmd_Register("restart_game",		WRAP_METHOD(Console, cmdRestartGame));
+	DCmd_Register("version",			WRAP_METHOD(Console, cmdGetVersion));
+	DCmd_Register("room",				WRAP_METHOD(Console, cmdRoomNumber));
+	// Graphics
+	DCmd_Register("sci0_palette",		WRAP_METHOD(Console, cmdSci0Palette));
+	DCmd_Register("clear_screen",		WRAP_METHOD(Console, cmdClearScreen));
+	DCmd_Register("redraw_screen",		WRAP_METHOD(Console, cmdRedrawScreen));
 	DCmd_Register("class_table",		WRAP_METHOD(Console, cmdClassTable));
 	DCmd_Register("sentence_fragments",	WRAP_METHOD(Console, cmdSentenceFragments));
 	DCmd_Register("draw_pic",			WRAP_METHOD(Console, cmdDrawPic));
 	DCmd_Register("draw_rect",			WRAP_METHOD(Console, cmdDrawRect));
+	DCmd_Register("draw_cel",			WRAP_METHOD(Console, cmdDrawCel));
+	DCmd_Register("view_info",			WRAP_METHOD(Console, cmdViewInfo));
+	DCmd_Register("update_zone",		WRAP_METHOD(Console, cmdUpdateZone));
+	DCmd_Register("propagate_zone",		WRAP_METHOD(Console, cmdPropagateZone));
 	DCmd_Register("fill_screen",		WRAP_METHOD(Console, cmdFillScreen));
 	DCmd_Register("current_port",		WRAP_METHOD(Console, cmdCurrentPort));
 	DCmd_Register("print_port",			WRAP_METHOD(Console, cmdPrintPort));
-	DCmd_Register("parse_grammar",		WRAP_METHOD(Console, cmdParseGrammar));
 	DCmd_Register("visual_state",		WRAP_METHOD(Console, cmdVisualState));
+	DCmd_Register("flush_visual",		WRAP_METHOD(Console, cmdFlushPorts));
 	DCmd_Register("dynamic_views",		WRAP_METHOD(Console, cmdDynamicViews));
 	DCmd_Register("dropped_views",		WRAP_METHOD(Console, cmdDroppedViews));
+	DCmd_Register("priority_bands",		WRAP_METHOD(Console, cmdPriorityBands));
 	DCmd_Register("status_bar",			WRAP_METHOD(Console, cmdStatusBarColors));
+	DCmd_Register("show_map",			WRAP_METHOD(Console, cmdShowMap));
+	// Events
 	DCmd_Register("simkey",				WRAP_METHOD(Console, cmdSimulateKey));
 	DCmd_Register("track_mouse",		WRAP_METHOD(Console, cmdTrackMouse));
+	// Segments
 	DCmd_Register("segment_table",		WRAP_METHOD(Console, cmdPrintSegmentTable));
 	DCmd_Register("segment_info",		WRAP_METHOD(Console, cmdSegmentInfo));
 	DCmd_Register("segment_kill",		WRAP_METHOD(Console, cmdKillSegment));
-	DCmd_Register("show_map",			WRAP_METHOD(Console, cmdShowMap));
-	DCmd_Register("songlib",			WRAP_METHOD(Console, cmdSongLib));
-	DCmd_Register("gc",					WRAP_METHOD(Console, cmdInvokeGC));
+	// Garbage collection
+	DCmd_Register("gc",					WRAP_METHOD(Console, cmdGCInvoke));
 	DCmd_Register("gc_objects",			WRAP_METHOD(Console, cmdGCObjects));
+	DCmd_Register("gc_interval",		WRAP_METHOD(Console, cmdGCInterval));
+	// VM
+	DCmd_Register("vm_varlist",			WRAP_METHOD(Console, cmdVMVarlist));
+	DCmd_Register("stack",				WRAP_METHOD(Console, cmdStack));
+	DCmd_Register("sleep_factor",		WRAP_METHOD(Console, cmdSleepFactor));
+	DCmd_Register("script_steps",		WRAP_METHOD(Console, cmdScriptSteps));
 	DCmd_Register("exit",				WRAP_METHOD(Console, cmdExit));
+	// Music/SFX
+	DCmd_Register("songlib",			WRAP_METHOD(Console, cmdSongLib));
+	DCmd_Register("is_sample",			WRAP_METHOD(Console, cmdIsSample));
+	DCmd_Register("sfx01_header",		WRAP_METHOD(Console, cmdSfx01Header));
+	DCmd_Register("sfx01_track",		WRAP_METHOD(Console, cmdSfx01Track));
 
 	// These were in sci.cpp
 	/*
@@ -184,6 +215,24 @@ bool Console::cmdParserWords(int argc, const char **argv) {
 	return true;
 }
 
+bool Console::cmdRegisters(int argc, const char **argv) {
+	DebugPrintf("Current register values:\n");
+#if 0
+		// TODO: p_restadjust
+	sciprintf("acc=%04x:%04x prev=%04x:%04x &rest=%x\n", PRINT_REG(g_EngineState->r_acc), PRINT_REG(g_EngineState->r_prev), *p_restadjust);
+#endif
+
+	if (!g_EngineState->_executionStack.empty()) {
+#if 0
+		// TODO: p_pc, p_objp, p_pp, p_sp
+		sciprintf("pc=%04x:%04x obj=%04x:%04x fp=ST:%04x sp=ST:%04x\n", PRINT_REG(*p_pc), PRINT_REG(*p_objp), PRINT_STK(*p_pp), PRINT_STK(*p_sp));
+#endif
+	} else
+		sciprintf("<no execution stack: pc,obj,fp omitted>\n");
+
+	return true;
+}
+
 bool Console::cmdHexDump(int argc, const char **argv) {
 	if (argc != 3) {
 		DebugPrintf("Usage: %s <resource type> <resource number>\n", argv[0]);
@@ -214,6 +263,19 @@ bool Console::cmdHexDump(int argc, const char **argv) {
 	return true;
 }
 
+bool Console::cmdResourceId(int argc, const char **argv) {
+	if (argc != 2) {
+		DebugPrintf("Identifies a resource number by splitting it up in resource type and resource number\n");
+		DebugPrintf("Usage: %s <resource number>\n", argv[0]);
+		return true;
+	}
+
+	int id = atoi(argv[1]);
+	DebugPrintf("%s.%d (0x%x)\n", getResourceTypeName((ResourceType)(id >> 11)), id & 0x7ff, id & 0x7ff);
+
+	return true;
+}
+
 bool Console::cmdDissectScript(int argc, const char **argv) {
 	if (argc != 2) {
 		DebugPrintf("Examines a script\n");
@@ -226,6 +288,26 @@ bool Console::cmdDissectScript(int argc, const char **argv) {
 	return true;
 }
 
+bool Console::cmdWeakValidations(int argc, const char **argv) {
+	if (argc != 2) {
+		DebugPrintf("Turns some validation errors into warnings\n");
+		DebugPrintf("Usage: %s <on/off>\n", argv[0]);
+		DebugPrintf("Weak validations are currently %s\n", (_weak_validations ? "on" : "off"));
+		return true;
+	}
+
+	DebugPrintf("Weak validations are currently %s\n", (_weak_validations ? "on" : "off"));
+	if (!scumm_stricmp(argv[1], "on")) {
+		DebugPrintf("Turning weak validations on\n");
+		_weak_validations = 1;
+	} else if (!scumm_stricmp(argv[1], "off")) {
+		DebugPrintf("Turning weak validations off\n");
+		_weak_validations = 0;
+	}
+
+	return true;
+}
+
 bool Console::cmdRoomNumber(int argc, const char **argv) {
 	DebugPrintf("Current room number is %d\n", g_EngineState->currentRoomNumber());
 
@@ -602,6 +684,116 @@ bool Console::cmdDrawRect(int argc, const char **argv) {
 	return false;
 }
 
+bool Console::cmdDrawCel(int argc, const char **argv) {
+	if (argc != 4) {
+		DebugPrintf("Draws a single view cel to the center of the\n  screen\n\n");
+		DebugPrintf("Usage: %s <view> <loop> <cel> <palette>\n", argv[0]);
+		return true;
+	}
+
+	int view = atoi(argv[1]);
+	int loop = atoi(argv[2]);
+	int cel = atoi(argv[3]);
+	int palette = atoi(argv[4]);
+
+	gfxop_set_clip_zone(g_EngineState->gfx_state, gfx_rect_fullscreen);
+	gfxop_draw_cel(g_EngineState->gfx_state, view, loop, cel, Common::Point(160, 100), g_EngineState->ega_colors[0], palette);
+	gfxop_update(g_EngineState->gfx_state);
+
+	return false;
+}
+
+bool Console::cmdViewInfo(int argc, const char **argv) {
+	if (argc != 2) {
+		DebugPrintf("Displays the number of loops and cels of each loop\n");
+		DebugPrintf("for the specified view resource and palette.");
+		DebugPrintf("Usage: %s <view> <palette>\n", argv[0]);
+		return true;
+	}
+
+	int view = atoi(argv[1]);
+	int palette = atoi(argv[2]);
+	int loops, i;
+	gfxr_view_t *view_pixmaps = NULL;
+	gfx_color_t transparent = { PaletteEntry(), 0, -1, -1, 0 };
+
+	DebugPrintf("Resource view.%d ", view);
+
+	loops = gfxop_lookup_view_get_loops(g_EngineState->gfx_state, view);
+
+	if (loops < 0)
+		DebugPrintf("does not exist.\n");
+	else {
+		DebugPrintf("has %d loops:\n", loops);
+
+		for (i = 0; i < loops; i++) {
+			int j, cels;
+
+			DebugPrintf("Loop %d: %d cels.\n", i, cels = gfxop_lookup_view_get_cels(g_EngineState->gfx_state, view, i));
+			for (j = 0; j < cels; j++) {
+				int width;
+				int height;
+				Common::Point mod;
+
+				// Show pixmap on screen
+				view_pixmaps = g_EngineState->gfx_state->gfxResMan->getView(view, &i, &j, palette);
+				gfxop_draw_cel(g_EngineState->gfx_state, view, i, j, Common::Point(0,0), transparent, palette);
+
+				gfxop_get_cel_parameters(g_EngineState->gfx_state, view, i, j, &width, &height, &mod);
+
+				DebugPrintf("   cel %d: size %dx%d, adj+(%d,%d)\n", j, width, height, mod.x, mod.y);
+			}
+		}
+	}
+
+	return true;
+}
+
+bool Console::cmdUpdateZone(int argc, const char **argv) {
+	if (argc != 4) {
+		DebugPrintf("Propagates a rectangular area from the back buffer to the front buffer\n");
+		DebugPrintf("Usage: %s <x> <y> <width> <height>\n", argv[0]);
+		return true;
+	}
+
+	int x = atoi(argv[1]);
+	int y = atoi(argv[2]);
+	int width = atoi(argv[3]);
+	int height = atoi(argv[4]);
+
+	g_EngineState->gfx_state->driver->update(g_EngineState->gfx_state->driver, gfx_rect(x, y, width, height),
+										Common::Point(x, y), GFX_BUFFER_FRONT);
+
+	return false;
+}
+
+bool Console::cmdPropagateZone(int argc, const char **argv) {
+	if (argc != 5) {
+		DebugPrintf("Propagates a rectangular area from a lower graphics buffer to a higher one\n");
+		DebugPrintf("Usage: %s <x> <y> <width> <height> <map>\n", argv[0]);
+		DebugPrintf("Where <map> can be 0 or 1\n");
+		return true;
+	}
+
+	int x = atoi(argv[1]);
+	int y = atoi(argv[2]);
+	int width = atoi(argv[3]);
+	int height = atoi(argv[4]);
+	int map = CLIP<int>(atoi(argv[5]), 0, 1);
+	rect_t rect = gfx_rect(x, y, width, height);
+
+	gfxop_set_clip_zone(g_EngineState->gfx_state, gfx_rect_fullscreen);
+
+	if (map == 1)
+		gfxop_clear_box(g_EngineState->gfx_state, rect);
+	else
+		gfxop_update_box(g_EngineState->gfx_state, rect);
+	gfxop_update(g_EngineState->gfx_state);
+	gfxop_sleep(g_EngineState->gfx_state, 0);
+
+	return false;
+}
+
 bool Console::cmdFillScreen(int argc, const char **argv) {
 	if (argc != 2) {
 		DebugPrintf("Fills the screen with one of the EGA colors\n");
@@ -615,6 +807,7 @@ bool Console::cmdFillScreen(int argc, const char **argv) {
 	gfxop_set_clip_zone(g_EngineState->gfx_state, gfx_rect_fullscreen);
 	gfxop_fill_box(g_EngineState->gfx_state, gfx_rect_fullscreen, g_EngineState->ega_colors[col]);
 	gfxop_update(g_EngineState->gfx_state);
+
 	return false;
 }
 
@@ -677,6 +870,16 @@ bool Console::cmdVisualState(int argc, const char **argv) {
 	return true;
 }
 
+bool Console::cmdFlushPorts(int argc, const char **argv) {
+	gfxop_set_pointer_cursor(g_EngineState->gfx_state, GFXOP_NO_POINTER);
+	DebugPrintf("Flushing dynamically allocated ports (for memory profiling)...\n");
+	delete g_EngineState->visual;
+	g_EngineState->gfx_state->gfxResMan->freeAllResources();
+	g_EngineState->visual = NULL;
+
+	return true;
+}
+
 bool Console::cmdDynamicViews(int argc, const char **argv) {
 	DebugPrintf("List of active dynamic views:\n");
 
@@ -699,6 +902,19 @@ bool Console::cmdDroppedViews(int argc, const char **argv) {
 	return true;
 }
 
+bool Console::cmdPriorityBands(int argc, const char **argv) {
+	if (argc != 2) {
+		DebugPrintf("Priority bands start at y=%d. They end at y=%d\n", g_EngineState->priority_first, g_EngineState->priority_last);
+		DebugPrintf("Use %d <priority band> to print the start of priority for the specified priority band (0 - 15)\n", argv[0]);
+		return true;
+	}
+
+	int zone = CLIP<int>(atoi(argv[1]), 0, 15);
+	DebugPrintf("Zone %x starts at y=%d\n", zone, _find_priority_band(g_EngineState, zone));
+
+	return true;
+}
+
 bool Console::cmdStatusBarColors(int argc, const char **argv) {
 	if (argc != 3) {
 		DebugPrintf("Sets the colors of the status bar\n");
@@ -1075,7 +1291,7 @@ bool Console::cmdSongLib(int argc, const char **argv) {
 	return true;
 }
 
-bool Console::cmdInvokeGC(int argc, const char **argv) {
+bool Console::cmdGCInvoke(int argc, const char **argv) {
 	DebugPrintf("Performing garbage collection...\n");
 	run_gc(g_EngineState);
 	return true;
@@ -1094,6 +1310,309 @@ bool Console::cmdGCObjects(int argc, const char **argv) {
 	return true;
 }
 
+bool Console::cmdGCInterval(int argc, const char **argv) {
+	if (argc != 2) {
+		DebugPrintf("Sets the number of kernel calls in between garbage collections.\n");
+		DebugPrintf("Usage: %s <number>\n", argv[0]);
+		DebugPrintf("Number of kernel calls in between garbage collections is currently %d.", script_gc_interval);
+		return true;
+	}
+
+	DebugPrintf("Number of kernel calls in between garbage collections was %d, setting it to %d\n", script_gc_interval, atoi(argv[1]));
+	script_gc_interval = atoi(argv[1]);
+
+	return true;
+}
+
+bool Console::cmdVMVarlist(int argc, const char **argv) {
+	const char *varnames[] = {"global", "local", "temp", "param"};
+
+	DebugPrintf("Addresses of variables in the VM:\n");
+
+#if 0
+	// TODO: p_var_segs, p_vars, p_var_base, p_var_max
+
+	for (int i = 0; i < 4; i++) {
+		DebugPrintf("%s vars at %04x:%04x ", varnames[i], PRINT_REG(make_reg(p_var_segs[i], p_vars[i] - p_var_base[i])));
+		if (p_var_max)
+			DebugPrintf("  total %d", p_var_max[i]);
+		DebugPrintf("\n");
+	}
+#endif
+
+	return true;
+}
+
+bool Console::cmdStack(int argc, const char **argv) {
+	if (argc != 2) {
+		DebugPrintf("Dumps the specified number of stack elements.\n");
+		DebugPrintf("Usage: %s <elements>\n", argv[0]);
+		return true;
+	}
+
+	if (g_EngineState->_executionStack.empty()) {
+		DebugPrintf("No exec stack!");
+		return true;
+	}
+
+	ExecStack &xs = g_EngineState->_executionStack.back();
+	int nr = atoi(argv[1]);
+
+	for (int i = nr; i > 0; i--) {
+		if ((xs.sp - xs.fp - i) == 0)
+			DebugPrintf("-- temp variables --\n");
+		if (xs.sp - i >= g_EngineState->stack_base)
+			DebugPrintf("ST:%04x = %04x:%04x\n", (unsigned)(xs.sp - i - g_EngineState->stack_base), PRINT_REG(xs.sp[-i]));
+	}
+
+	return true;
+}
+
+bool Console::cmdSleepFactor(int argc, const char **argv) {
+	if (argc != 2) {
+		DebugPrintf("Factor to multiply with wait times in kWait().\n");
+		DebugPrintf("Set to 0 to speed up games.\n");
+		DebugPrintf("Usage: %s <factor>\n", argv[0]);
+		DebugPrintf("Sleep factor is currently %d.", debug_sleeptime_factor);
+		return true;
+	}
+
+	DebugPrintf("Sleep factor was %d, setting it to %d\n", debug_sleeptime_factor, atoi(argv[1]));
+	debug_sleeptime_factor = atoi(argv[1]);
+
+	return true;
+}
+
+bool Console::cmdScriptSteps(int argc, const char **argv) {
+	DebugPrintf("Number of executed SCI operations: %d\n", script_step_counter);
+	return true;
+}
+
+bool Console::cmdIsSample(int argc, const char **argv) {
+	if (argc != 2) {
+		DebugPrintf("Tests whether a given sound resource is a PCM sample, \n");
+		DebugPrintf("and displays information on it if it is.\n");
+		DebugPrintf("Usage: %s <sample id>\n", argv[0]);
+		return true;
+	}
+
+	Resource *song = _vm->getResMgr()->findResource(kResourceTypeSound, atoi(argv[1]), 0);
+	SongIterator *songit;
+	Audio::AudioStream *data;
+
+	if (!song) {
+		DebugPrintf("Not a sound resource!\n");
+		return true;
+	}
+
+	songit = songit_new(song->data, song->size, SCI_SONG_ITERATOR_TYPE_SCI0, 0xcaffe /* What do I care about the ID? */);
+
+	if (!songit) {
+		DebugPrintf("Could not convert to song iterator!\n");
+		return true;
+	}
+
+	if ((data = songit->getAudioStream())) {
+		// TODO
+/*
+		DebugPrintf("\nIs sample (encoding %dHz/%s/%04x)", data->conf.rate, (data->conf.stereo) ?
+		          ((data->conf.stereo == SFX_PCM_STEREO_LR) ? "stereo-LR" : "stereo-RL") : "mono", data->conf.format);
+*/
+		delete data;
+	} else
+		DebugPrintf("Valid song, but not a sample.\n");
+
+	delete songit;
+
+	return true;
+}
+
+bool Console::cmdSfx01Header(int argc, const char **argv) {
+	if (argc != 2) {
+		DebugPrintf("Dumps the header of a SCI01 song\n");
+		DebugPrintf("Usage: %s <track>\n", argv[0]);
+		return true;
+	}
+
+	Resource *song = _vm->getResMgr()->findResource(kResourceTypeSound, atoi(argv[1]), 0);
+
+	if (!song) {
+		DebugPrintf("Doesn't exist\n");
+		return true;
+	}
+
+	uint32 offset = 0;
+
+	DebugPrintf("SCI01 song track mappings:\n");
+
+	if (*song->data == 0xf0) // SCI1 priority spec
+		offset = 8;
+
+	if (song->size <= 0)
+		return 1;
+
+	while (song->data[offset] != 0xff) {
+		byte device_id = song->data[offset];
+		DebugPrintf("* Device %02x:\n", device_id);
+		offset++;
+
+		if (offset + 1 >= song->size)
+			return 1;
+
+		while (song->data[offset] != 0xff) {
+			int track_offset;
+			int end;
+			byte header1, header2;
+
+			if (offset + 7 >= song->size)
+				return 1;
+
+			offset += 2;
+
+			track_offset = READ_LE_UINT16(song->data + offset);
+			header1 = song->data[track_offset];
+			header2 = song->data[track_offset+1];
+			track_offset += 2;
+
+			end = READ_LE_UINT16(song->data + offset + 2);
+			DebugPrintf("  - %04x -- %04x", track_offset, track_offset + end);
+
+			if (track_offset == 0xfe)
+				DebugPrintf(" (PCM data)\n");
+			else
+				DebugPrintf(" (channel %d, special %d, %d playing notes, %d foo)\n",
+				          header1 & 0xf, header1 >> 4, header2 & 0xf, header2 >> 4);
+			offset += 4;
+		}
+		offset++;
+	}
+
+	return true;
+}
+
+static int _parse_ticks(byte *data, int *offset_p, int size) {
+	int ticks = 0;
+	int tempticks;
+	int offset = 0;
+
+	do {
+		tempticks = data[offset++];
+		ticks += (tempticks == SCI_MIDI_TIME_EXPANSION_PREFIX) ? SCI_MIDI_TIME_EXPANSION_LENGTH : tempticks;
+	} while (tempticks == SCI_MIDI_TIME_EXPANSION_PREFIX && offset < size);
+
+	if (offset_p)
+		*offset_p = offset;
+
+	return ticks;
+}
+
+// Specialised for SCI01 tracks (this affects the way cumulative cues are treated)
+static void midi_hexdump(byte *data, int size, int notational_offset) {
+	int offset = 0;
+	int prev = 0;
+	const int MIDI_cmdlen[16] = {0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 2, 1, 1, 2, 0};
+
+	if (*data == 0xf0) // SCI1 priority spec
+		offset = 8;
+
+	while (offset < size) {
+		int old_offset = offset;
+		int offset_mod;
+		int time = _parse_ticks(data + offset, &offset_mod, size);
+		int cmd;
+		int pleft;
+		int firstarg = 0;
+		int i;
+		int blanks = 0;
+
+		offset += offset_mod;
+		printf("  [%04x] %d\t",
+		        old_offset + notational_offset, time);
+
+		cmd = data[offset];
+		if (!(cmd & 0x80)) {
+			cmd = prev;
+			if (prev < 0x80) {
+				printf("Track broken at %x after"
+				        " offset mod of %d\n",
+				        offset + notational_offset, offset_mod);
+				Common::hexdump(data, size, 16, notational_offset);
+				return;
+			}
+			printf("(rs %02x) ", cmd);
+			blanks += 8;
+		} else {
+			++offset;
+			printf("%02x ", cmd);
+			blanks += 3;
+		}
+		prev = cmd;
+
+		pleft = MIDI_cmdlen[cmd >> 4];
+		if (SCI_MIDI_CONTROLLER(cmd) && data[offset] == SCI_MIDI_CUMULATIVE_CUE)
+			--pleft; // This is SCI(0)1 specific
+
+		for (i = 0; i < pleft; i++) {
+			if (i == 0)
+				firstarg = data[offset];
+			printf("%02x ", data[offset++]);
+			blanks += 3;
+		}
+
+		while (blanks < 16) {
+			blanks += 4;
+			printf("    ");
+		}
+
+		while (blanks < 20) {
+			++blanks;
+			printf(" ");
+		}
+
+		if (cmd == SCI_MIDI_EOT)
+			printf(";; EOT");
+		else if (cmd == SCI_MIDI_SET_SIGNAL) {
+			if (firstarg == SCI_MIDI_SET_SIGNAL_LOOP)
+				printf(";; LOOP point");
+			else
+				printf(";; CUE (%d)", firstarg);
+		} else if (SCI_MIDI_CONTROLLER(cmd)) {
+			if (firstarg == SCI_MIDI_CUMULATIVE_CUE)
+				printf(";; CUE (cumulative)");
+			else if (firstarg == SCI_MIDI_RESET_ON_SUSPEND)
+				printf(";; RESET-ON-SUSPEND flag");
+		}
+		printf("\n");
+
+		if (old_offset >= offset) {
+			printf("-- Not moving forward anymore,"
+			        " aborting (%x/%x)\n", offset, old_offset);
+			return;
+		}
+	}
+}
+
+bool Console::cmdSfx01Track(int argc, const char **argv) {
+	if (argc != 3) {
+		DebugPrintf("Dumps a track of a SCI01 song\n");
+		DebugPrintf("Usage: %s <track> <offset>\n", argv[0]);
+		return true;
+	}
+
+	Resource *song = _vm->getResMgr()->findResource(kResourceTypeSound, atoi(argv[1]), 0);
+
+	int offset = atoi(argv[2]);
+
+	if (!song) {
+		DebugPrintf("Doesn't exist\n");
+		return true;
+	}
+
+	midi_hexdump(song->data + offset, song->size, offset);
+
+	return true;
+}
+
 bool Console::cmdExit(int argc, const char **argv) {
 	if (argc != 2) {
 		DebugPrintf("%s game - exit gracefully\n", argv[0]);
diff --git a/engines/sci/console.h b/engines/sci/console.h
index f4033e18eb..652079556e 100644
--- a/engines/sci/console.h
+++ b/engines/sci/console.h
@@ -47,7 +47,9 @@ private:
 	bool cmdKernelNames(int argc, const char **argv);
 	bool cmdSuffixes(int argc, const char **argv);
 	bool cmdHexDump(int argc, const char **argv);
+	bool cmdResourceId(int argc, const char **argv);
 	bool cmdDissectScript(int argc, const char **argv);
+	bool cmdWeakValidations(int argc, const char **argv);
 	bool cmdRoomNumber(int argc, const char **argv);
 	bool cmdResourceSize(int argc, const char **argv);
 	bool cmdResourceTypes(int argc, const char **argv);
@@ -63,15 +65,22 @@ private:
 	bool cmdSentenceFragments(int argc, const char **argv);
 	bool cmdParserNodes(int argc, const char **argv);
 	bool cmdParserWords(int argc, const char **argv);
+	bool cmdRegisters(int argc, const char **argv);
 	bool cmdDrawPic(int argc, const char **argv);
 	bool cmdDrawRect(int argc, const char **argv);
+	bool cmdDrawCel(int argc, const char **argv);
+	bool cmdViewInfo(int argc, const char **argv);
+	bool cmdUpdateZone(int argc, const char **argv);
+	bool cmdPropagateZone(int argc, const char **argv);
 	bool cmdFillScreen(int argc, const char **argv);
 	bool cmdCurrentPort(int argc, const char **argv);
 	bool cmdPrintPort(int argc, const char **argv);
 	bool cmdParseGrammar(int argc, const char **argv);
 	bool cmdVisualState(int argc, const char **argv);
+	bool cmdFlushPorts(int argc, const char **argv);
 	bool cmdDynamicViews(int argc, const char **argv);
 	bool cmdDroppedViews(int argc, const char **argv);
+	bool cmdPriorityBands(int argc, const char **argv);
 	bool cmdStatusBarColors(int argc, const char **argv);
 	bool cmdSimulateKey(int argc, const char **argv);
 	bool cmdTrackMouse(int argc, const char **argv);
@@ -80,8 +89,16 @@ private:
 	bool cmdKillSegment(int argc, const char **argv);
 	bool cmdShowMap(int argc, const char **argv);
 	bool cmdSongLib(int argc, const char **argv);
-	bool cmdInvokeGC(int argc, const char **argv);
+	bool cmdGCInvoke(int argc, const char **argv);
 	bool cmdGCObjects(int argc, const char **argv);
+	bool cmdGCInterval(int argc, const char **argv);
+	bool cmdVMVarlist(int argc, const char **argv);
+	bool cmdStack(int argc, const char **argv);
+	bool cmdSleepFactor(int argc, const char **argv);
+	bool cmdIsSample(int argc, const char **argv);
+	bool cmdSfx01Header(int argc, const char **argv);
+	bool cmdSfx01Track(int argc, const char **argv);
+	bool cmdScriptSteps(int argc, const char **argv);
 	bool cmdExit(int argc, const char **argv);
 
 	bool segmentInfo(int nr);
diff --git a/engines/sci/engine/kgraphics.cpp b/engines/sci/engine/kgraphics.cpp
index ab981e01f0..4c4be0242c 100644
--- a/engines/sci/engine/kgraphics.cpp
+++ b/engines/sci/engine/kgraphics.cpp
@@ -27,6 +27,7 @@
 #include "common/events.h"
 
 #include "sci/sci.h"
+#include "sci/console.h"	// for debug_sleeptime_factor
 #include "sci/resource.h"
 #include "sci/engine/state.h"
 #include "sci/engine/kernel.h"
@@ -646,7 +647,7 @@ reg_t kTextSize(EngineState *s, int funct_nr, int argc, reg_t *argv) {
 	return s->r_acc;
 }
 
-int debug_sleeptime_factor = 1;
+extern int debug_sleeptime_factor;
 
 reg_t kWait(EngineState *s, int funct_nr, int argc, reg_t *argv) {
 	uint32 time;
diff --git a/engines/sci/engine/klists.cpp b/engines/sci/engine/klists.cpp
index 9570ec48e1..029954d00f 100644
--- a/engines/sci/engine/klists.cpp
+++ b/engines/sci/engine/klists.cpp
@@ -36,8 +36,7 @@ Node *lookup_node(EngineState *s, reg_t addr) {
 	if (!mobj) {
 		// FIXME: This occurs right at the beginning of SQ4, when walking north from the first screen. It doesn't
 		// seem to have any apparent ill-effects, though, so it's been changed to non-fatal, for now
-		//sciprintf("%s, L%d: Attempt to use non-node %04x:%04x as list node\n", __FILE__, __LINE__, PRINT_REG(addr));
-		//script_debug_flag = 1;
+		//error("%s, L%d: Attempt to use non-node %04x:%04x as list node\n", __FILE__, __LINE__, PRINT_REG(addr));
 		warning("Attempt to use non-node %04x:%04x as list node", PRINT_REG(addr));
 		return NULL;
 	}
diff --git a/engines/sci/engine/scriptdebug.cpp b/engines/sci/engine/scriptdebug.cpp
index 1f57d666db..5d353eab48 100644
--- a/engines/sci/engine/scriptdebug.cpp
+++ b/engines/sci/engine/scriptdebug.cpp
@@ -46,14 +46,12 @@
 
 namespace Sci {
 
-extern int debug_sleeptime_factor;
 int _debugstate_valid = 0; // Set to 1 while script_debug is running
 int _debug_step_running = 0; // Set to >0 to allow multiple stepping
 int _debug_commands_not_hooked = 1; // Commands not hooked to the console yet?
 int _debug_seeking = 0; // Stepping forward until some special condition is met
 int _debug_seek_level = 0; // Used for seekers that want to check their exec stack depth
 int _debug_seek_special = 0;  // Used for special seeks(1)
-int _weak_validations = 1; // Some validation errors are reduced to warnings if non-0
 reg_t _debug_seek_reg = NULL_REG;  // Used for special seeks(2)
 
 #define _DEBUG_SEEK_NOTHING 0
@@ -73,8 +71,6 @@ static reg_t **p_vars;
 static reg_t **p_var_base;
 static int *p_var_max; // May be NULL even in valid state!
 
-static const int MIDI_cmdlen[16] = {0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 2, 1, 1, 2, 0};
-
 char inputbuf[256] = "";
 
 union cmd_param_t {
@@ -124,178 +120,6 @@ static const char *_debug_get_input() {
 	return inputbuf;
 }
 
-static int _parse_ticks(byte *data, int *offset_p, int size) {
-	int ticks = 0;
-	int tempticks;
-	int offset = 0;
-
-	do {
-		tempticks = data[offset++];
-		ticks += (tempticks == SCI_MIDI_TIME_EXPANSION_PREFIX) ? SCI_MIDI_TIME_EXPANSION_LENGTH : tempticks;
-	} while (tempticks == SCI_MIDI_TIME_EXPANSION_PREFIX && offset < size);
-
-	if (offset_p)
-		*offset_p = offset;
-
-	return ticks;
-}
-
-static void midi_hexdump(byte *data, int size, int notational_offset) { // Specialised for SCI01 tracks (this affects the way cumulative cues are treated )
-	int offset = 0;
-	int prev = 0;
-
-	if (*data == 0xf0) // SCI1 priority spec
-		offset = 8;
-
-	while (offset < size) {
-		int old_offset = offset;
-		int offset_mod;
-		int time = _parse_ticks(data + offset, &offset_mod, size);
-		int cmd;
-		int pleft;
-		int firstarg = 0;
-		int i;
-		int blanks = 0;
-
-		offset += offset_mod;
-		fprintf(stderr, "  [%04x] %d\t",
-		        old_offset + notational_offset, time);
-
-		cmd = data[offset];
-		if (!(cmd & 0x80)) {
-			cmd = prev;
-			if (prev < 0x80) {
-				fprintf(stderr, "Track broken at %x after"
-				        " offset mod of %d\n",
-				        offset + notational_offset, offset_mod);
-				Common::hexdump(data, size, 16, notational_offset);
-				return;
-			}
-			fprintf(stderr, "(rs %02x) ", cmd);
-			blanks += 8;
-		} else {
-			++offset;
-			fprintf(stderr, "%02x ", cmd);
-			blanks += 3;
-		}
-		prev = cmd;
-
-		pleft = MIDI_cmdlen[cmd >> 4];
-		if (SCI_MIDI_CONTROLLER(cmd) && data[offset] == SCI_MIDI_CUMULATIVE_CUE)
-			--pleft; // This is SCI(0)1 specific
-
-		for (i = 0; i < pleft; i++) {
-			if (i == 0)
-				firstarg = data[offset];
-			fprintf(stderr, "%02x ", data[offset++]);
-			blanks += 3;
-		}
-
-		while (blanks < 16) {
-			blanks += 4;
-			fprintf(stderr, "    ");
-		}
-
-		while (blanks < 20) {
-			++blanks;
-			fprintf(stderr, " ");
-		}
-
-		if (cmd == SCI_MIDI_EOT)
-			fprintf(stderr, ";; EOT");
-		else if (cmd == SCI_MIDI_SET_SIGNAL) {
-			if (firstarg == SCI_MIDI_SET_SIGNAL_LOOP)
-				fprintf(stderr, ";; LOOP point");
-			else
-				fprintf(stderr, ";; CUE (%d)", firstarg);
-		} else if (SCI_MIDI_CONTROLLER(cmd)) {
-			if (firstarg == SCI_MIDI_CUMULATIVE_CUE)
-				fprintf(stderr, ";; CUE (cumulative)");
-			else if (firstarg == SCI_MIDI_RESET_ON_SUSPEND)
-				fprintf(stderr, ";; RESET-ON-SUSPEND flag");
-		}
-		fprintf(stderr, "\n");
-
-		if (old_offset >= offset) {
-			fprintf(stderr, "-- Not moving forward anymore,"
-			        " aborting (%x/%x)\n", offset, old_offset);
-			return;
-		}
-	}
-}
-
-int c_sfx_01_header_dump(EngineState *s, const Common::Array<cmd_param_t> &cmdParams) {
-	Resource *song = s->resmgr->findResource(kResourceTypeSound, cmdParams[0].val, 0);
-
-	if (!song) {
-		sciprintf("Doesn't exist\n");
-		return 1;
-	}
-
-	uint32 offset = 0;
-
-	sciprintf("SCI01 song track mappings:\n");
-
-	if (*song->data == 0xf0) // SCI1 priority spec
-		offset = 8;
-
-	if (song->size <= 0)
-		return 1;
-
-	while (song->data[offset] != 0xff) {
-		byte device_id = song->data[offset];
-		sciprintf("* Device %02x:\n", device_id);
-		offset++;
-
-		if (offset + 1 >= song->size)
-			return 1;
-
-		while (song->data[offset] != 0xff) {
-			int track_offset;
-			int end;
-			byte header1, header2;
-
-			if (offset + 7 >= song->size)
-				return 1;
-
-			offset += 2;
-
-			track_offset = READ_LE_UINT16(song->data + offset);
-			header1 = song->data[track_offset];
-			header2 = song->data[track_offset+1];
-			track_offset += 2;
-
-			end = READ_LE_UINT16(song->data + offset + 2);
-			sciprintf("  - %04x -- %04x", track_offset, track_offset + end);
-
-			if (track_offset == 0xfe)
-				sciprintf(" (PCM data)\n");
-			else
-				sciprintf(" (channel %d, special %d, %d playing notes, %d foo)\n",
-				          header1 & 0xf, header1 >> 4, header2 & 0xf, header2 >> 4);
-			offset += 4;
-		}
-		offset++;
-	}
-
-	return 0;
-}
-
-int c_sfx_01_track(EngineState *s, const Common::Array<cmd_param_t> &cmdParams) {
-	Resource *song = s->resmgr->findResource(kResourceTypeSound, cmdParams[0].val, 0);
-
-	int offset = cmdParams[1].val;
-
-	if (!song) {
-		sciprintf("Doesn't exist\n");
-		return 1;
-	}
-
-	midi_hexdump(song->data + offset, song->size, offset);
-
-	return 0;
-}
-
 static int show_node(EngineState *s, reg_t addr) {
 	MemObject *mobj = GET_SEGMENT(*s->seg_manager, addr.segment, MEM_OBJ_LISTS);
 
@@ -451,10 +275,6 @@ int c_debuginfo(EngineState *s) {
 	return 0;
 }
 
-int c_debuginfo(EngineState *s, const Common::Array<cmd_param_t> &cmdParams) {
-	return c_debuginfo(s);
-}
-
 int c_step(EngineState *s, const Common::Array<cmd_param_t> &cmdParams) {
 	_debugstate_valid = 0;
 	if (cmdParams.size() && (cmdParams[0].val > 0))
@@ -508,49 +328,6 @@ int c_stepover(EngineState *s, const Common::Array<cmd_param_t> &cmdParams) {
 }
 #endif
 
-int c_viewinfo(EngineState *s, const Common::Array<cmd_param_t> &cmdParams) {
-	int view = cmdParams[0].val;
-	int palette = cmdParams[1].val;
-	int loops, i;
-	gfxr_view_t *view_pixmaps = NULL;
-	gfx_color_t transparent = { PaletteEntry(), 0, -1, -1, 0 };
-
-	if (!s) {
-		sciprintf("Not in debug state\n");
-		return 1;
-	}
-	sciprintf("Resource view.%d ", view);
-
-	loops = gfxop_lookup_view_get_loops(s->gfx_state, view);
-
-	if (loops < 0)
-		sciprintf("does not exist.\n");
-	else {
-		sciprintf("has %d loops:\n", loops);
-
-		for (i = 0; i < loops; i++) {
-			int j, cels;
-
-			sciprintf("Loop %d: %d cels.\n", i, cels = gfxop_lookup_view_get_cels(s->gfx_state, view, i));
-			for (j = 0; j < cels; j++) {
-				int width;
-				int height;
-				Common::Point mod;
-
-				// Show pixmap on screen
-				view_pixmaps = s->gfx_state->gfxResMan->getView(view, &i, &j, palette);
-				gfxop_draw_cel(s->gfx_state, view, i, j, Common::Point(0,0), transparent, palette);
-
-				gfxop_get_cel_parameters(s->gfx_state, view, i, j, &width, &height, &mod);
-
-				sciprintf("   cel %d: size %dx%d, adj+(%d,%d)\n", j, width, height, mod.x, mod.y);
-			}
-		}
-	}
-
-	return 0;
-}
-
 enum {
 	_parse_eoi,
 	_parse_token_pareno,
@@ -675,29 +452,6 @@ int c_parse(EngineState *s, const Common::Array<cmd_param_t> &cmdParams) {
 	return 0;
 }
 
-int c_stack(EngineState *s, const Common::Array<cmd_param_t> &cmdParams) {
-	if (!s) {
-		sciprintf("Not in debug state\n");
-		return 1;
-	}
-
-	if (s->_executionStack.empty()) {
-		sciprintf("No exec stack!");
-		return 1;
-	}
-
-	ExecStack &xs = s->_executionStack.back();
-
-	for (int i = cmdParams[0].val ; i > 0; i--) {
-		if ((xs.sp - xs.fp - i) == 0)
-			sciprintf("-- temp variables --\n");
-		if (xs.sp - i >= s->stack_base)
-			sciprintf("ST:%04x = %04x:%04x\n", PRINT_STK(xs.sp - i), PRINT_REG(xs.sp[-i]));
-	}
-
-	return 0;
-}
-
 const char *selector_name(EngineState *s, int selector) {
 	if (selector >= 0 && selector < (int)s->_kernel->getSelectorNamesSize())
 		return s->_kernel->getSelectorName(selector).c_str();
@@ -982,23 +736,9 @@ reg_t disassemble(EngineState *s, reg_t pos, int print_bw_tag, int print_bytecod
 	return retval;
 }
 
-static const char *varnames[] = {"global", "local", "temp", "param"};
-static const char *varabbrev = "gltp";
-
-int c_vmvarlist(EngineState *s, const Common::Array<cmd_param_t> &cmdParams) {
-	int i;
-
-	for (i = 0;i < 4;i++) {
-		sciprintf("%s vars at %04x:%04x ", varnames[i], PRINT_REG(make_reg(p_var_segs[i], p_vars[i] - p_var_base[i])));
-		if (p_var_max)
-			sciprintf("  total %d", p_var_max[i]);
-		sciprintf("\n");
-	}
-
-	return 0;
-}
-
 int c_vmvars(EngineState *s, const Common::Array<cmd_param_t> &cmdParams) {
+	const char *varnames[] = {"global", "local", "temp", "param"};
+	const char *varabbrev = "gltp";
 	const char *vartype_pre = strchr(varabbrev, *cmdParams[0].str);
 	int vartype;
 	int idx = cmdParams[1].val;
@@ -1103,26 +843,6 @@ static int c_backtrace(EngineState *s, const Common::Array<cmd_param_t> &cmdPara
 	return 0;
 }
 
-static int c_gfx_priority(EngineState *s, const Common::Array<cmd_param_t> &cmdParams) {
-	if (!_debugstate_valid) {
-		sciprintf("Not in debug state\n");
-		return 1;
-	}
-
-	if (cmdParams.size()) {
-		int zone = cmdParams[0].val;
-		if (zone < 0)
-			zone = 0;
-		if (zone > 15) zone = 15;
-
-		sciprintf("Zone %x starts at y=%d\n", zone, PRIORITY_BAND_FIRST(zone));
-	} else {
-		sciprintf("Priority bands start at y=%d\nThey end at y=%d\n", s->priority_first, s->priority_last);
-	}
-
-	return 0;
-}
-
 #ifdef GFXW_DEBUG_WIDGETS
 extern GfxWidget *debug_widgets[];
 extern int debug_widget_pos;
@@ -1153,50 +873,6 @@ static int c_gfx_print_widget(EngineState *s, const Common::Array<cmd_param_t> &
 }
 #endif
 
-static int c_gfx_draw_cel(EngineState *s, const Common::Array<cmd_param_t> &cmdParams) {
-	int view = cmdParams[0].val;
-	int loop = cmdParams[1].val;
-	int cel = cmdParams[2].val;
-	int palette = cmdParams[3].val;
-
-	if (!s) {
-		sciprintf("Not in debug state!\n");
-		return 1;
-	}
-
-	gfxop_set_clip_zone(s->gfx_state, gfx_rect_fullscreen);
-	gfxop_draw_cel(s->gfx_state, view, loop, cel, Common::Point(160, 100), s->ega_colors[0], palette);
-	gfxop_update(s->gfx_state);
-
-	return 0;
-}
-
-static int c_gfx_propagate_rect(EngineState *s, const Common::Array<cmd_param_t> &cmdParams) {
-	int map = cmdParams[4].val;
-	rect_t rect;
-
-	if (!s) {
-		sciprintf("Not in debug state!\n");
-		return 1;
-	}
-
-	if (map < 0 || map > 1)
-		map = 0;
-
-	gfxop_set_clip_zone(s->gfx_state, gfx_rect_fullscreen);
-
-	rect = gfx_rect(cmdParams[0].val, cmdParams[1].val, cmdParams[2].val, cmdParams[3].val);
-
-	if (map == 1)
-		gfxop_clear_box(s->gfx_state, rect);
-	else
-		gfxop_update_box(s->gfx_state, rect);
-	gfxop_update(s->gfx_state);
-	gfxop_sleep(s->gfx_state, 0);
-
-	return 0;
-}
-
 #define GETRECT(ll, rr, tt, bb) \
 	ll = GET_SELECTOR(pos, ll); \
 	rr = GET_SELECTOR(pos, rr); \
@@ -1271,16 +947,6 @@ static int c_gfx_draw_viewobj(EngineState *s, const Common::Array<cmd_param_t> &
 }
 #endif
 
-static int c_gfx_update_zone(EngineState *s, const Common::Array<cmd_param_t> &cmdParams) {
-	if (!_debugstate_valid) {
-		sciprintf("Not in debug state\n");
-		return 1;
-	}
-
-	return s->gfx_state->driver->update(s->gfx_state->driver, gfx_rect(cmdParams[0].val, cmdParams[1].val, cmdParams[2].val, cmdParams[3].val),
-										Common::Point(cmdParams[0].val, cmdParams[1].val), GFX_BUFFER_FRONT);
-}
-
 static int c_disasm_addr(EngineState *s, const Common::Array<cmd_param_t> &cmdParams) {
 	reg_t vpc = cmdParams[0].reg;
 	int op_count = 1;
@@ -1464,13 +1130,6 @@ static int c_send(EngineState *s, const Common::Array<cmd_param_t> &cmdParams) {
 	return 0;
 }
 
-static int c_resource_id(EngineState *s, const Common::Array<cmd_param_t> &cmdParams) {
-	int id = cmdParams[0].val;
-
-	sciprintf("%s.%d (0x%x)\n", getResourceTypeName((ResourceType)(id >> 11)), id & 0x7ff, id & 0x7ff);
-
-	return 0;
-}
 
 struct generic_config_flag_t {
 	const char *name;
@@ -1496,37 +1155,6 @@ static int c_sfx_remove(EngineState *s, const Common::Array<cmd_param_t> &cmdPar
 	return 0;
 }
 
-static int c_is_sample(EngineState *s, const Common::Array<cmd_param_t> &cmdParams) {
-	Resource *song = s->resmgr->findResource(kResourceTypeSound, cmdParams[0].val, 0);
-	SongIterator *songit;
-	Audio::AudioStream *data;
-
-	if (!song) {
-		warning("Not a sound resource");
-		return 1;
-	}
-
-	songit = songit_new(song->data, song->size, SCI_SONG_ITERATOR_TYPE_SCI0, 0xcaffe /* What do I care about the ID? */);
-
-	if (!songit) {
-		warning("Error-- Could not convert to song iterator");
-		return 1;
-	}
-
-	if ((data = songit->getAudioStream())) {
-/*
-		warning("\nIs sample (encoding %dHz/%s/%04x)", data->conf.rate, (data->conf.stereo) ?
-		          ((data->conf.stereo == SFX_PCM_STEREO_LR) ? "stereo-LR" : "stereo-RL") : "mono", data->conf.format);
-*/
-		delete data;
-	} else
-		sciprintf("Valid song, but not a sample.\n");
-
-	delete songit;
-
-	return 0;
-}
-
 #define GETRECT(ll, rr, tt, bb) \
 	ll = GET_SELECTOR(pos, ll); \
 	rr = GET_SELECTOR(pos, rr); \
@@ -1981,9 +1609,7 @@ void script_debug(EngineState *s, reg_t *pc, StackPtr *sp, StackPtr *pp, reg_t *
 			_debug_commands_not_hooked = 0;
 
 			con_hook_command(c_sfx_remove, "sfx_remove", "!a", "Kills a playing sound.");
-			con_hook_command(c_debuginfo, "registers", "", "Displays all current register values");
 			con_hook_command(c_vmvars, "vmvars", "!sia*", "Displays or changes variables in the VM\n\nFirst parameter is either g(lobal), l(ocal), t(emp) or p(aram).\nSecond parameter is the var number\nThird parameter (if specified) is the value to set the variable to");
-			con_hook_command(c_vmvarlist, "vmvarlist", "!", "Displays the addresses of variables in the VM");
 			con_hook_command(c_step, "s", "i*", "Executes one or several operations\n\nEXAMPLES\n\n"
 			                 "    s 4\n\n  Execute 4 commands\n\n    s\n\n  Execute next command");
 #if 0
@@ -2001,7 +1627,6 @@ void script_debug(EngineState *s, reg_t *pc, StackPtr *sp, StackPtr *pp, reg_t *
 			                 "\n\nSEE ALSO\n\n  vo.1, accobj.1");
 			con_hook_command(c_accobj, "accobj", "!", "Displays information about an\n  object or class at the\n"
 			                 "address indexed by acc.\n\nSEE ALSO\n\n  obj.1, vo.1");
-			con_hook_command(c_stack, "stack", "i", "Dumps the specified number of stack elements");
 			con_hook_command(c_backtrace, "bt", "", "Dumps the send/self/super/call/calle/callb stack");
 			con_hook_command(c_snk, "snk", "s*", "Steps forward until it hits the next\n  callk operation.\n"
 			                 "  If invoked with a parameter, it will\n  look for that specific callk.\n");
@@ -2009,8 +1634,6 @@ void script_debug(EngineState *s, reg_t *pc, StackPtr *sp, StackPtr *pp, reg_t *
 			con_hook_command(c_set_acc, "set_acc", "!a", "Sets the accumulator");
 			con_hook_command(c_send, "send", "!asa*", "Sends a message to an object\nExample: send ?fooScript cue");
 			con_hook_command(c_sret, "sret", "", "Steps forward until ret is called\n  on the current execution stack\n  level.");
-			con_hook_command(c_resource_id, "resource_id", "i", "Identifies a resource number by\n"
-			                 "  splitting it up in resource type\n  and resource number.");
 			con_hook_command(c_bpx, "bpx", "s", "Sets a breakpoint on the execution of\n  the specified method.\n\n  EXAMPLE:\n"
 			                 "  bpx ego::doit\n\n  May also be used to set a breakpoint\n  that applies whenever an object\n"
 			                 "  of a specific type is touched:\n  bpx foo::\n");
@@ -2018,8 +1641,6 @@ void script_debug(EngineState *s, reg_t *pc, StackPtr *sp, StackPtr *pp, reg_t *
 			con_hook_command(c_bplist, "bplist", "", "Lists all breakpoints.\n");
 			con_hook_command(c_bpdel, "bpdel", "i", "Deletes a breakpoint with specified index.");
 			con_hook_command(c_go, "go", "", "Executes the script.\n");
-			con_hook_command(c_viewinfo, "viewinfo", "ii", "Displays the number of loops\n  and cels of each loop"
-			                 " for the\n  specified view resource and palette.");
 			con_hook_command(c_parse, "parse", "s", "Parses a sequence of words and prints\n  the resulting parse tree.\n"
 			                 "  The word sequence must be provided as a\n  single string.");
 			con_hook_command(c_set_parse_nodes, "set_parse_nodes", "s*", "Sets the contents of all parse nodes.\n"
@@ -2029,25 +1650,12 @@ void script_debug(EngineState *s, reg_t *pc, StackPtr *sp, StackPtr *pp, reg_t *
 			con_hook_command(c_gfx_print_widget, "gfx_print_widget", "i*", "If called with no parameters, it\n  shows which widgets are active.\n"
 			                 "  With parameters, it lists the\n  widget corresponding to the\n  numerical index specified (for\n  each parameter).");
 #endif
-			con_hook_command(c_gfx_propagate_rect,
-			                 "gfx_propagate_rect",
-			                 "iiiii",
-			                 "Propagates a lower gfx buffer to a\n"
-			                 "  higher gfx buffer.\n\nUSAGE\n\n"
-			                 "  gfx_propagate_rect <x> <y> <xl> <yl> <buf>\n");
-			con_hook_command(c_gfx_update_zone, "gfx_update_zone", "iiii", "Propagates a rectangular area from\n  the back buffer to the front buffer"
-			                 "\n\nUSAGE\n\n"
-			                 "  gfx_update_zone <x> <y> <xl> <yl>");
+
 #if 0
 			// TODO: Re-enable con:draw_viewobj
 			con_hook_command(c_gfx_draw_viewobj, "draw_viewobj", "i", "Draws the nsRect and brRect of a\n  dynview object.\n\n  nsRect is green, brRect\n"
 			                 "  is blue.\n");
 #endif
-			con_hook_command(c_gfx_draw_cel, "gfx_draw_cel", "iiii", "Draws a single view\n  cel to the center of the\n  screen\n\n"
-			                 "USAGE\n  gfx_draw_cel <view> <loop> <cel> <palette>\n");
-			con_hook_command(c_gfx_priority, "gfx_priority", "i*", "Prints information about priority\n  bands\nUSAGE\n\n  gfx_priority\n\n"
-			                 "  will print the min and max values\n  for the priority bands\n\n  gfx_priority <val>\n\n  Print start of the priority\n"
-			                 "  band for the specified\n  priority\n");
 			con_hook_command(c_vo, "vo", "!a",
 			                 "Examines an object\n\n"
 			                 "SEE ALSO\n\n"
@@ -2064,20 +1672,6 @@ void script_debug(EngineState *s, reg_t *pc, StackPtr *sp, StackPtr *pp, reg_t *
 			con_hook_command(c_shownode, "shownode", "!a",
 			                 "Prints information about a list node\n"
 			                 "  or list base.\n\n");
-			con_hook_command(c_is_sample, "is-sample", "i",
-			                 "Tests whether a given sound resource\n"
-			                 "  is a PCM sample, and displays infor-\n"
-			                 "  mation on it if it is.\n\n");
-			con_hook_command(c_sfx_01_header_dump, "sfx-01-header", "i",
-			                 "Dumps the header of an SCI01 song\n\n"
-			                 "SEE ALSO\n\n"
-			                 "  sfx-01-track.1\n\n");
-			con_hook_command(c_sfx_01_track, "sfx-01-track", "ii",
-			                 "Dumps a track from an SCI01 song\n\n"
-			                 "USAGE\n\n"
-			                 "  sfx-01-track <song> <offset>\n\n"
-			                 "SEE ALSO\n\n"
-			                 "  sfx-01-header.1\n\n");
 			con_hook_command(c_gc_show_reachable, "gc-list-reachable", "!a",
 			                 "Prints all addresses directly reachable from\n"
 			                 "  the memory object specified as parameter.\n\n"
@@ -2099,14 +1693,7 @@ void script_debug(EngineState *s, reg_t *pc, StackPtr *sp, StackPtr *pp, reg_t *
 			                 "  gc-all-reachable.1");
 
 /*
-			con_hook_int(&script_debug_flag, "script_debug_flag", "Set != 0 to enable debugger\n");
 			con_hook_int(&script_abort_flag, "script_abort_flag", "Set != 0 to abort execution\n");
-			con_hook_int(&script_step_counter, "script_step_counter", "# of executed SCI operations\n");
-			con_hook_int(&_weak_validations, "weak_validations", "Set != 0 to turn some validation errors\n"
-			             "  into warnings\n");
-
-			con_hook_int(&script_gc_interval, "gc-interval", "Number of kernel calls in between gcs");
-			con_hook_int(&debug_sleeptime_factor, "sleep-factor", "Factor to multiply with wait times\n  Set to 0 to speed up games");
 */
 		} // If commands were not hooked up
 	}
diff --git a/engines/sci/engine/vm.cpp b/engines/sci/engine/vm.cpp
index ef50039cf0..355c2b8ee2 100644
--- a/engines/sci/engine/vm.cpp
+++ b/engines/sci/engine/vm.cpp
@@ -27,6 +27,7 @@
 #include "common/stack.h"
 
 #include "sci/sci.h"
+#include "sci/console.h"	// for _weak_validations
 #include "sci/resource.h"
 #include "sci/engine/state.h"
 #include "sci/engine/intmap.h"
@@ -1609,7 +1610,6 @@ int script_instantiate_common(EngineState *s, int script_nr, Resource **script,
 
 	if (!*script || (s->version >= SCI_VERSION_1_1 && !heap)) {
 		sciprintf("Script 0x%x requested but not found\n", script_nr);
-		//script_debug_flag = script_error_flag = 1;
 		if (s->version >= SCI_VERSION_1_1) {
 			if (*heap)
 				sciprintf("Inconsistency: heap resource WAS found\n");
diff --git a/engines/sci/gfx/operations.cpp b/engines/sci/gfx/operations.cpp
index fbfeda3649..14be83b9aa 100644
--- a/engines/sci/gfx/operations.cpp
+++ b/engines/sci/gfx/operations.cpp
@@ -1455,8 +1455,8 @@ static sci_event_t scummvm_get_event(gfx_driver_t *drv) {
 			input.character = ev.kbd.ascii;
 
 			// Debug console
-			if (ev.kbd.flags == Common::KBD_CTRL && ev.kbd.keycode == Common::KEYCODE_d) {
-
+			if (ev.kbd.flags == Common::KBD_CTRL && ev.kbd.keycode == Common::KEYCODE_d) {	
+				// Open debug console
 				((Sci::SciEngine*)g_engine)->_console->attach();
 				((Sci::SciEngine*)g_engine)->_console->onFrame();
 
diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp
index a7e2541792..52e2798b23 100644
--- a/engines/sci/sci.cpp
+++ b/engines/sci/sci.cpp
@@ -308,4 +308,10 @@ Common::String SciEngine::unwrapFilename(const Common::String &name) const {
 	return name;
 }
 
+void SciEngine::pauseEngineIntern(bool pause) {
+	// TODO: pause music and game script execution here
+
+	_mixer->pauseAll(pause);
+}
+
 } // End of namespace Sci
diff --git a/engines/sci/sci.h b/engines/sci/sci.h
index 2fcb285a4f..954a20cd5b 100644
--- a/engines/sci/sci.h
+++ b/engines/sci/sci.h
@@ -139,6 +139,7 @@ public:
 
 	// Engine APIs
 	virtual Common::Error run();
+	void pauseEngineIntern(bool pause);
 	virtual GUI::Debugger *getDebugger();
 
 	const char* getGameID() const;