DREAMWEB: Move 'loadroomssample' from dreamgen

5 files changed, 24 insertions, 24 deletions

diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index d38fca921a..63c9377665 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -229,6 +229,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'textforend',
 	'textformonk',
 	'twodigitnum',
+	'loadroomssample',
 	], skip_output = [
 	# These functions are processed but not output
 	'dreamweb',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 41ed80e37f..8f88560f7f 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -14208,26 +14208,6 @@ void DreamGenContext::loadtemptext() {
 	data.word(kTextfile1) = ax;
 }
 
-void DreamGenContext::loadroomssample() {
-	STACK_CHECK;
-	al = data.byte(kRoomssample);
-	_cmp(al, 255);
-	if (flags.z())
-		return /* (loadedalready) */;
-	_cmp(al, data.byte(kCurrentsample));
-	if (flags.z())
-		return /* (loadedalready) */;
-	data.byte(kCurrentsample) = al;
-	al = data.byte(kCurrentsample);
-	cl = '0';
-	twodigitnum();
-	di = 1896;
-	_xchg(al, ah);
-	cs.word(di+10) = ax;
-	dx = di;
-	loadsecondsample();
-}
-
 void DreamGenContext::getridofreels() {
 	STACK_CHECK;
 	_cmp(data.byte(kRoomloaded), 0);
@@ -16188,7 +16168,6 @@ void DreamGenContext::__dispatch_call(uint16 addr) {
 		case addr_loadtempcharset: loadtempcharset(); break;
 		case addr_standardload: standardload(); break;
 		case addr_loadtemptext: loadtemptext(); break;
-		case addr_loadroomssample: loadroomssample(); break;
 		case addr_getridofreels: getridofreels(); break;
 		case addr_getridofall: getridofall(); break;
 		case addr_restorereels: restorereels(); break;
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 63783c0cf7..a89fb435b3 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -64,7 +64,6 @@ public:
 	static const uint16 addr_restorereels = 0xcb40;
 	static const uint16 addr_getridofall = 0xcb3c;
 	static const uint16 addr_getridofreels = 0xcb38;
-	static const uint16 addr_loadroomssample = 0xcb34;
 	static const uint16 addr_loadtemptext = 0xcb2c;
 	static const uint16 addr_standardload = 0xcb28;
 	static const uint16 addr_loadtempcharset = 0xcb24;
@@ -1342,7 +1341,7 @@ public:
 	void bartender();
 	void eden();
 	void showdiary();
-	void purgealocation();
+	//void loadroomssample();
 	//void updatepeople();
 	//void addtopeoplelist();
 	void hangoncurs();
@@ -1593,7 +1592,7 @@ public:
 	void enablesoundint();
 	void madmanstelly();
 	void constant();
-	void loadroomssample();
+	void purgealocation();
 	void sparkydrip();
 	//void paltostartpal();
 	void bossman();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 8e7a0761c8..2817465251 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -2054,5 +2054,25 @@ void DreamGenContext::twodigitnum() {
 	al = digit2;
 }
 
+void DreamGenContext::loadroomssample() {
+	STACK_CHECK;
+	al = data.byte(kRoomssample);
+	_cmp(al, 255);
+	if (flags.z())
+		return /* (loadedalready) */;
+	_cmp(al, data.byte(kCurrentsample));
+	if (flags.z())
+		return /* (loadedalready) */;
+	data.byte(kCurrentsample) = al;
+	al = data.byte(kCurrentsample);
+	cl = '0';
+	twodigitnum();
+	di = 1896;
+	_xchg(al, ah);
+	cs.word(di+10) = ax;
+	dx = di;
+	loadsecondsample();
+}
+
 } /*namespace dreamgen */
 
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index aa47a62cbb..09d93d05f8 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -275,4 +275,5 @@
 	void textforend();
 	void twodigitnum(uint8 num, uint8 baseChar, uint8 *digit1, uint8 *digit2);
 	void twodigitnum();
+	void loadroomssample();