DREAMWEB: Move 'restoreall' from dreamgen

5 files changed, 84 insertions, 83 deletions

diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index 0f098c54b7..7bf66cbdaa 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -298,6 +298,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'makeheader',
 	'savefilewrite',
 	'storeit',
+	'restoreall',
 	], skip_output = [
 	# These functions are processed but not output
 	'dreamweb',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 1cf54291d8..516011739f 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -12747,86 +12747,6 @@ void DreamGenContext::restorereels() {
 	closefile();
 }
 
-void DreamGenContext::restoreall() {
-	STACK_CHECK;
-	al = data.byte(kLocation);
-	getroomdata();
-	dx = bx;
-	openfile();
-	readheader();
-	allocateload();
-	ds = ax;
-	data.word(kBackdrop) = ax;
-	dx = (0);
-	loadseg();
-	ds = data.word(kWorkspace);
-	dx = (0);
-	cx = 132*66;
-	al = 0;
-	fillspace();
-	loadseg();
-	sortoutmap();
-	allocateload();
-	data.word(kSetframes) = ax;
-	ds = ax;
-	dx = (0);
-	loadseg();
-	dontloadseg();
-	allocateload();
-	data.word(kReel1) = ax;
-	ds = ax;
-	dx = 0;
-	loadseg();
-	allocateload();
-	data.word(kReel2) = ax;
-	ds = ax;
-	dx = 0;
-	loadseg();
-	allocateload();
-	data.word(kReel3) = ax;
-	ds = ax;
-	dx = 0;
-	loadseg();
-	allocateload();
-	data.word(kReels) = ax;
-	ds = ax;
-	dx = 0;
-	loadseg();
-	allocateload();
-	data.word(kPeople) = ax;
-	ds = ax;
-	dx = 0;
-	loadseg();
-	allocateload();
-	data.word(kSetdesc) = ax;
-	ds = ax;
-	dx = 0;
-	loadseg();
-	allocateload();
-	data.word(kBlockdesc) = ax;
-	ds = ax;
-	dx = 0;
-	loadseg();
-	allocateload();
-	data.word(kRoomdesc) = ax;
-	ds = ax;
-	dx = 0;
-	loadseg();
-	allocateload();
-	data.word(kFreeframes) = ax;
-	ds = ax;
-	dx = 0;
-	loadseg();
-	dontloadseg();
-	allocateload();
-	data.word(kFreedesc) = ax;
-	ds = ax;
-	dx = (0);
-	loadseg();
-	closefile();
-	setallchanges();
-}
-
 void DreamGenContext::allocateload() {
 	STACK_CHECK;
 	push(es);
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 886b8d5989..5c9d860698 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -55,7 +55,6 @@ public:
 	static const uint16 addr_getridoftemp = 0xcb70;
 	static const uint16 addr_allocateload = 0xcb68;
 	static const uint16 addr_dontloadseg = 0xcb64;
-	static const uint16 addr_restoreall = 0xcb44;
 	static const uint16 addr_restorereels = 0xcb40;
 	static const uint16 addr_getridofall = 0xcb3c;
 	static const uint16 addr_getridofreels = 0xcb38;
@@ -1399,7 +1398,7 @@ public:
 	void wearwatch();
 	void runintroseq();
 	//void doblocks();
-	void restoreall();
+	void nextcolon();
 	//void delpointer();
 	void attendant();
 	void nextsymbol();
@@ -1417,7 +1416,6 @@ public:
 	//void frameoutfx();
 	void blank();
 	void drinker();
-	void nextcolon();
 	void placefreeobject();
 	void allpalette();
 	//void loopchannel0();
@@ -1836,6 +1834,7 @@ public:
 	//void placesetobject();
 	//void drawflags();
 	void zoomonoff();
+	//void restoreall();
 	void updatesymboltop();
 	//void showryanpage();
 	//void printlogo();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 01a7657330..275b4026e3 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -2334,5 +2334,85 @@ void DreamGenContext::usetempcharset() {
 	data.word(kCurrentset) = data.word(kTempcharset);
 }
 
+void DreamGenContext::restoreall() {
+	STACK_CHECK;
+	al = data.byte(kLocation);
+	getroomdata();
+	dx = bx;
+	openfile();
+	readheader();
+	allocateload();
+	ds = ax;
+	data.word(kBackdrop) = ax;
+	dx = (0);
+	loadseg();
+	ds = data.word(kWorkspace);
+	dx = (0);
+	cx = 132*66;
+	al = 0;
+	fillspace();
+	loadseg();
+	sortoutmap();
+	allocateload();
+	data.word(kSetframes) = ax;
+	ds = ax;
+	dx = (0);
+	loadseg();
+	dontloadseg();
+	allocateload();
+	data.word(kReel1) = ax;
+	ds = ax;
+	dx = 0;
+	loadseg();
+	allocateload();
+	data.word(kReel2) = ax;
+	ds = ax;
+	dx = 0;
+	loadseg();
+	allocateload();
+	data.word(kReel3) = ax;
+	ds = ax;
+	dx = 0;
+	loadseg();
+	allocateload();
+	data.word(kReels) = ax;
+	ds = ax;
+	dx = 0;
+	loadseg();
+	allocateload();
+	data.word(kPeople) = ax;
+	ds = ax;
+	dx = 0;
+	loadseg();
+	allocateload();
+	data.word(kSetdesc) = ax;
+	ds = ax;
+	dx = 0;
+	loadseg();
+	allocateload();
+	data.word(kBlockdesc) = ax;
+	ds = ax;
+	dx = 0;
+	loadseg();
+	allocateload();
+	data.word(kRoomdesc) = ax;
+	ds = ax;
+	dx = 0;
+	loadseg();
+	allocateload();
+	data.word(kFreeframes) = ax;
+	ds = ax;
+	dx = 0;
+	loadseg();
+	dontloadseg();
+	allocateload();
+	data.word(kFreedesc) = ax;
+	ds = ax;
+	dx = (0);
+	loadseg();
+	closefile();
+	setallchanges();
+}
+
 } /*namespace dreamgen */
 
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index c4f126a1be..5eca504b67 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -349,4 +349,5 @@
 	void saveposition(unsigned int slot, const uint8 *descbuf);
 	void openforsave(unsigned int slot);
 	void openforload(unsigned int slot);
+	void restoreall();