DREAMWEB: 'loadfolder' ported to C++

5 files changed, 12 insertions, 16 deletions

diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index dab9dfbe31..fbc10e3a1b 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -302,6 +302,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'restorereels',
 	'allocateload',
 	'viewfolder',
+	'loadfolder',
 	'showfolder',
 	'showleftpage',
 	'showrightpage',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 40cd84e80f..225f0af6a2 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -9740,20 +9740,6 @@ void DreamGenContext::loadmenu() {
 	loadintotemp2();
 }
 
-void DreamGenContext::loadfolder() {
-	STACK_CHECK;
-	dx = 2299;
-	loadintotemp();
-	dx = 2312;
-	loadintotemp2();
-	dx = 2325;
-	loadintotemp3();
-	dx = 1883;
-	loadtempcharset();
-	dx = 2195;
-	loadtemptext();
-}
-
 void DreamGenContext::entersymbol() {
 	STACK_CHECK;
 	data.byte(kManisoffscreen) = 1;
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 3faae24f4d..67740e8ddd 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -176,7 +176,6 @@ public:
 	static const uint16 addr_settopleft = 0xc7e0;
 	static const uint16 addr_quitsymbol = 0xc7dc;
 	static const uint16 addr_entersymbol = 0xc7d8;
-	static const uint16 addr_loadfolder = 0xc7c4;
 	static const uint16 addr_loadmenu = 0xc7b0;
 	static const uint16 addr_showmenu = 0xc7ac;
 	static const uint16 addr_dumpmenu = 0xc79c;
@@ -1152,7 +1151,7 @@ public:
 	void removeemm();
 	//void frameoutbh();
 	void getobtextstart();
-	void loadfolder();
+	//void loadfolder();
 	void dumpdiarykeys();
 	//void dumppointer();
 	//void look();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 17f762dad5..fa3b59d9d1 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -2306,6 +2306,15 @@ void DreamGenContext::restorereels() {
 	closefile();
 }
 
+void DreamGenContext::loadfolder() {
+	loadintotemp("DREAMWEB.G09");
+	loadintotemp2("DREAMWEB.G10");
+	loadintotemp3("DREAMWEB.G11");
+	loadtempcharset("DREAMWEB.C02");
+	dx = kFoldertext; // "DREAMWEB.T50"
+	loadtemptext();
+}
+
 void DreamGenContext::showfolder() {
 	data.byte(kCommandtype) = 255;
 	if (data.byte(kFolderpage)) {
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index bffa07a343..16be8ee717 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -356,6 +356,7 @@
 	void restorereels();
 	void viewfolder();
 	void checkFolderCoords();
+	void loadfolder();
 	void showfolder();
 	void showleftpage();
 	void showrightpage();