5 files changed, 29 insertions, 48 deletions

diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index ddbff9f0d6..95f9974750 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -247,12 +247,16 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'drunk',
 	'dumpblink',
 	'dumpeverything',
+	'dumpkeypad',
 	'dumpmap',
 	'dumpmenu',
 	'dumppointer',
+	'dumpsymbol',
+	'dumpsymbox',
 	'dumptextline',
 	'dumptimedtext',
 	'dumpwatch',
+	'dumpzoom',
 	'eden',
 	'edeninbath',
 	'edenscdplayer',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index c1a611edb8..9ee1685629 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -6328,15 +6328,6 @@ doqk:
 	data.byte(kGetback) = 1;
 }
 
-void DreamGenContext::dumpKeypad() {
-	STACK_CHECK;
-	di = (36+112)-3;
-	bx = (72)-4;
-	cl = 120;
-	ch = 90;
-	multiDump();
-}
-
 void DreamGenContext::quitSymbol() {
 	STACK_CHECK;
 	_cmp(data.byte(kSymboltopx), 24);
@@ -6364,16 +6355,6 @@ doqs:
 	data.byte(kGetback) = 1;
 }
 
-void DreamGenContext::dumpSymbol() {
-	STACK_CHECK;
-	data.byte(kNewtextline) = 0;
-	di = (64);
-	bx = (56)+20;
-	cl = 104;
-	ch = 60;
-	multiDump();
-}
-
 void DreamGenContext::updateSymbolTop() {
 	STACK_CHECK;
 	_cmp(data.byte(kSymboltopdir), 0);
@@ -6462,19 +6443,6 @@ notwrapbackb:
 	data.byte(kSymbolbotdir) = 0;
 }
 
-void DreamGenContext::dumpSymBox() {
-	STACK_CHECK;
-	_cmp(data.word(kDumpx), -1);
-	if (flags.z())
-		return /* (nodumpsym) */;
-	di = data.word(kDumpx);
-	bx = data.word(kDumpy);
-	cl = 30;
-	ch = 77;
-	multiDump();
-	data.word(kDumpx) = -1;
-}
-
 void DreamGenContext::useDiary() {
 	STACK_CHECK;
 	getRidOfReels();
@@ -8008,18 +7976,6 @@ void DreamGenContext::getUnderZoom() {
 	multiGet();
 }
 
-void DreamGenContext::dumpZoom() {
-	STACK_CHECK;
-	_cmp(data.byte(kZoomon), 1);
-	if (!flags.z())
-		return /* (notzoomon) */;
-	di = (8)+5;
-	bx = (132)+4;
-	cl = 46;
-	ch = 40;
-	multiDump();
-}
-
 void DreamGenContext::putUnderZoom() {
 	STACK_CHECK;
 	di = (8)+5;
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 7d1b469b66..0c3bf809cd 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -581,8 +581,6 @@ public:
 	void showDiary();
 	void outOfOpen();
 	void dirCom();
-	void dumpKeypad();
-	void dumpZoom();
 	void endGameSeq();
 	void findFirstPath();
 	void useSLab();
@@ -632,7 +630,6 @@ public:
 	void vSync();
 	void findInvPos();
 	void workoutFrames();
-	void dumpSymBox();
 	void rollEndCredits();
 	void interviewer();
 	void getKeyAndLogo();
@@ -646,7 +643,6 @@ public:
 	void introMagic2();
 	void introMagic3();
 	void showDiaryPage();
-	void dumpSymbol();
 	void transferToEx();
 	void reExFromInv();
 	void examineInventory();
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index f91d849ece..8dc7e60c67 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -574,5 +574,9 @@
 	void redes();
 	void isSetObOnMap();
 	bool isSetObOnMap(uint8 index);
+	void dumpKeypad();
+	void dumpSymbol();
+	void dumpSymBox();
+	void dumpZoom();
 
 #endif
diff --git a/engines/dreamweb/vgagrafx.cpp b/engines/dreamweb/vgagrafx.cpp
index 3e1d97e5ca..1e678d059b 100644
--- a/engines/dreamweb/vgagrafx.cpp
+++ b/engines/dreamweb/vgagrafx.cpp
@@ -497,4 +497,25 @@ void DreamGenContext::createPanel2() {
 	showFrame(engine->icons2(), 160, 0, 5, 2);
 }
 
+void DreamGenContext::dumpKeypad() {
+	multiDump((36 + 112) - 3, 72 - 4, 120, 90);
+}
+
+void DreamGenContext::dumpSymbol() {
+	data.byte(kNewtextline) = 0;
+	multiDump(64, 56 + 20, 104, 60);
+}
+
+void DreamGenContext::dumpZoom() {
+	if (data.byte(kZoomon) == 1)
+		multiDump(8 + 5, 132 + 4, 46, 40);
+}
+
+void DreamGenContext::dumpSymBox() {
+	if (data.word(kDumpx) != 0xFFFF) {
+		multiDump(data.word(kDumpx), data.word(kDumpy), 30, 77);
+		data.word(kDumpx) = 0xFFFF;
+	}
+}
+
 } // End of namespace DreamGen