DREAMWEB: 'loadMenu' ported to C++

5 files changed, 9 insertions, 11 deletions

diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index 2324bfd377..9d0added80 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -254,6 +254,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'fadeupmonfirst',
 	'loadroomssample',
 	'printlogo',
+	'loadmenu',
 	'usemenu',
 	'usemon',
 	'scrollmonitor',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index d014fb26f1..fe10fc2d06 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -9187,14 +9187,6 @@ menuframeok:
 	showFrame();
 }
 
-void DreamGenContext::loadMenu() {
-	STACK_CHECK;
-	dx = 1832;
-	loadIntoTemp();
-	dx = 1987;
-	loadIntoTemp2();
-}
-
 void DreamGenContext::enterSymbol() {
 	STACK_CHECK;
 	data.byte(kManisoffscreen) = 1;
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index f9a51ad9b4..86aa288767 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -737,7 +737,7 @@ public:
 	void getUnderZoom();
 	void candles();
 	void backObject();
-	void rollEndCredits2();
+	void allocateMem();
 	void reminders();
 	void selectSlot2();
 	void runTap();
@@ -815,7 +815,6 @@ public:
 	void selectOb();
 	void usePlinth();
 	void useCooker();
-	void loadMenu();
 	void checkForEMM();
 	void receptionist();
 	void selectSlot();
@@ -933,7 +932,7 @@ public:
 	void showDiaryKeys();
 	void dontLoadSeg();
 	void intro3Text();
-	void allocateMem();
+	void rollEndCredits2();
 	void useOpened();
 	void inventory();
 	void fillOpen();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index a60a39c361..8b284803d9 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -2726,6 +2726,11 @@ void DreamGenContext::workToScreenM() {
 	delPointer();
 }
 
+void DreamGenContext::loadMenu() {
+	loadIntoTemp("DREAMWEB.S02");
+	loadIntoTemp2("DREAMWEB.G07");
+}
+
 void DreamGenContext::useMenu() {
 	getRidOfReels();
 	loadMenu();
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 6e6487430d..4b2ec565e8 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -303,6 +303,7 @@
 	void fadeupYellows();
 	void fadeupMonFirst();
 	void printLogo();
+	void loadMenu();
 	void useMenu();
 	void useMon();
 	void scrollMonitor();