DREAMWEB: Move 'textformonk' and 'textforend' from dreamgen

5 files changed, 181 insertions, 180 deletions

diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index c27c96345b..b54d1dc948 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -225,6 +225,8 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'getundermenu',
 	'putundermenu',
 	'showoutermenu',
+	'textforend',
+	'textformonk',
 	], skip_output = [
 	# These functions are processed but not output
 	'dreamweb',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 40bb16d84d..12ab6b8e8e 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -1716,179 +1716,6 @@ void DreamGenContext::priesttext() {
 	setuptimeduse();
 }
 
-void DreamGenContext::textforend() {
-	STACK_CHECK;
-	_cmp(data.byte(kIntrocount), 20);
-	if (!flags.z())
-		goto notendtext1;
-	al = 0;
-	bl = 34;
-	bh = 20;
-	cx = 60;
-	goto gotendtext;
-notendtext1:
-	_cmp(data.byte(kIntrocount), 50);
-	if (!flags.z())
-		goto notendtext2;
-	al = 1;
-	bl = 34;
-	bh = 20;
-	cx = 60;
-	goto gotendtext;
-notendtext2:
-	_cmp(data.byte(kIntrocount), 85);
-	if (!flags.z())
-		return /* (notendtext3) */;
-	al = 2;
-	bl = 34;
-	bh = 20;
-	cx = 60;
-	goto gotendtext;
-	return;
-gotendtext:
-	dx = 1;
-	ah = 83;
-	setuptimedtemp();
-}
-
-void DreamGenContext::textformonk() {
-	STACK_CHECK;
-	_cmp(data.byte(kIntrocount), 1);
-	if (!flags.z())
-		goto notmonktext1;
-	al = 19;
-	bl = 68;
-	bh = 154;
-	cx = 120;
-	goto gotmonktext;
-notmonktext1:
-	_cmp(data.byte(kIntrocount), 5);
-	if (!flags.z())
-		goto notmonktext2;
-	al = 20;
-	bl = 68;
-	bh = 38;
-	cx = 120;
-	goto gotmonktext;
-notmonktext2:
-	_cmp(data.byte(kIntrocount), 9);
-	if (!flags.z())
-		goto notmonktext3;
-	al = 21;
-	bl = 48;
-	bh = 154;
-	cx = 120;
-	goto gotmonktext;
-notmonktext3:
-	_cmp(data.byte(kIntrocount), 13);
-	if (!flags.z())
-		goto notmonktext4;
-	al = 22;
-	bl = 68;
-	bh = 38;
-	cx = 120;
-	goto gotmonktext;
-notmonktext4:
-	_cmp(data.byte(kIntrocount), 15);
-	if (!flags.z())
-		goto notmonktext5;
-	al = 23;
-	bl = 68;
-	bh = 154;
-	cx = 120;
-	goto gotmonktext;
-notmonktext5:
-	_cmp(data.byte(kIntrocount), 21);
-	if (!flags.z())
-		goto notmonktext6;
-	al = 24;
-	bl = 68;
-	bh = 38;
-	cx = 120;
-	goto gotmonktext;
-notmonktext6:
-	_cmp(data.byte(kIntrocount), 25);
-	if (!flags.z())
-		goto notmonktext7;
-	al = 25;
-	bl = 68;
-	bh = 154;
-	cx = 120;
-	goto gotmonktext;
-notmonktext7:
-	_cmp(data.byte(kIntrocount), 29);
-	if (!flags.z())
-		goto notmonktext8;
-	al = 26;
-	bl = 68;
-	bh = 38;
-	cx = 120;
-	goto gotmonktext;
-notmonktext8:
-	_cmp(data.byte(kIntrocount), 33);
-	if (!flags.z())
-		goto notmonktext9;
-	al = 27;
-	bl = 68;
-	bh = 154;
-	cx = 120;
-	goto gotmonktext;
-notmonktext9:
-	_cmp(data.byte(kIntrocount), 37);
-	if (!flags.z())
-		goto notmonktext10;
-	al = 28;
-	bl = 68;
-	bh = 154;
-	cx = 120;
-	goto gotmonktext;
-notmonktext10:
-	_cmp(data.byte(kIntrocount), 41);
-	if (!flags.z())
-		goto notmonktext11;
-	al = 29;
-	bl = 68;
-	bh = 38;
-	cx = 120;
-	goto gotmonktext;
-notmonktext11:
-	_cmp(data.byte(kIntrocount), 45);
-	if (!flags.z())
-		goto notmonktext12;
-	al = 30;
-	bl = 68;
-	bh = 154;
-	cx = 120;
-	goto gotmonktext;
-notmonktext12:
-	_cmp(data.byte(kIntrocount), 52);
-	if (!flags.z())
-		goto notmonktext13;
-	al = 31;
-	bl = 68;
-	bh = 154;
-	cx = 220;
-	goto gotmonktext;
-notmonktext13:
-	_cmp(data.byte(kIntrocount), 53);
-	if (!flags.z())
-		return /* (notendtitles) */;
-	fadescreendowns();
-	data.byte(kVolumeto) = 7;
-	data.byte(kVolumedirection) = 1;
-	return;
-gotmonktext:
-	dx = 1;
-	ah = 82;
-	_cmp(data.byte(kCh1playing), 255);
-	if (flags.z())
-		goto oktalk;
-	_dec(data.byte(kIntrocount));
-	return;
-oktalk:
-	setuptimedtemp();
-}
-
 void DreamGenContext::drunk() {
 	STACK_CHECK;
 	_cmp(data.byte(kGeneraldead), 0);
@@ -15968,8 +15795,6 @@ void DreamGenContext::__dispatch_call(uint16 addr) {
 		case addr_madmanstelly: madmanstelly(); break;
 		case addr_madman: madman(); break;
 		case addr_priesttext: priesttext(); break;
-		case addr_textforend: textforend(); break;
-		case addr_textformonk: textformonk(); break;
 		case addr_drunk: drunk(); break;
 		case addr_advisor: advisor(); break;
 		case addr_copper: copper(); break;
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 6f2939895a..8c319bd665 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -540,8 +540,6 @@ public:
 	static const uint16 addr_copper = 0xc0fc;
 	static const uint16 addr_advisor = 0xc0f8;
 	static const uint16 addr_drunk = 0xc0f4;
-	static const uint16 addr_textformonk = 0xc0f0;
-	static const uint16 addr_textforend = 0xc0ec;
 	static const uint16 addr_priesttext = 0xc0e8;
 	static const uint16 addr_madman = 0xc0dc;
 	static const uint16 addr_madmanstelly = 0xc0d8;
@@ -1227,7 +1225,6 @@ public:
 	void startdmablock();
 	void useopenbox();
 	void clearbuffers();
-	//void getyad();
 	void neterror();
 	void storeit();
 	//void lockeddoorway();
@@ -1541,6 +1538,7 @@ public:
 	void fadeupmon();
 	//void paltoendpal();
 	void fadetowhite();
+	//void textformonk();
 	void loadsavebox();
 	void soundend();
 	void redes();
@@ -1607,7 +1605,7 @@ public:
 	void nothelderror();
 	//void readheader();
 	void getsetad();
-	void textformonk();
+	//void getyad();
 	void reconstruct();
 	void soldier1();
 	//void animpointer();
@@ -1736,7 +1734,7 @@ public:
 	void twodigitnum();
 	//void madmantext();
 	void dumpcurrent();
-	void textforend();
+	//void textforend();
 	void showdiarykeys();
 	void dontloadseg();
 	//void madmode();
diff --git a/engines/dreamweb/sprite.cpp b/engines/dreamweb/sprite.cpp
index 34b0729535..a267094e1f 100644
--- a/engines/dreamweb/sprite.cpp
+++ b/engines/dreamweb/sprite.cpp
@@ -1020,5 +1020,178 @@ void DreamGenContext::initrain() {
 	rain->x = 0xff;
 }
 
+void DreamGenContext::textforend() {
+	STACK_CHECK;
+	_cmp(data.byte(kIntrocount), 20);
+	if (!flags.z())
+		goto notendtext1;
+	al = 0;
+	bl = 34;
+	bh = 20;
+	cx = 60;
+	goto gotendtext;
+notendtext1:
+	_cmp(data.byte(kIntrocount), 50);
+	if (!flags.z())
+		goto notendtext2;
+	al = 1;
+	bl = 34;
+	bh = 20;
+	cx = 60;
+	goto gotendtext;
+notendtext2:
+	_cmp(data.byte(kIntrocount), 85);
+	if (!flags.z())
+		return /* (notendtext3) */;
+	al = 2;
+	bl = 34;
+	bh = 20;
+	cx = 60;
+	goto gotendtext;
+	return;
+gotendtext:
+	dx = 1;
+	ah = 83;
+	setuptimedtemp();
+}
+
+void DreamGenContext::textformonk() {
+	STACK_CHECK;
+	_cmp(data.byte(kIntrocount), 1);
+	if (!flags.z())
+		goto notmonktext1;
+	al = 19;
+	bl = 68;
+	bh = 154;
+	cx = 120;
+	goto gotmonktext;
+notmonktext1:
+	_cmp(data.byte(kIntrocount), 5);
+	if (!flags.z())
+		goto notmonktext2;
+	al = 20;
+	bl = 68;
+	bh = 38;
+	cx = 120;
+	goto gotmonktext;
+notmonktext2:
+	_cmp(data.byte(kIntrocount), 9);
+	if (!flags.z())
+		goto notmonktext3;
+	al = 21;
+	bl = 48;
+	bh = 154;
+	cx = 120;
+	goto gotmonktext;
+notmonktext3:
+	_cmp(data.byte(kIntrocount), 13);
+	if (!flags.z())
+		goto notmonktext4;
+	al = 22;
+	bl = 68;
+	bh = 38;
+	cx = 120;
+	goto gotmonktext;
+notmonktext4:
+	_cmp(data.byte(kIntrocount), 15);
+	if (!flags.z())
+		goto notmonktext5;
+	al = 23;
+	bl = 68;
+	bh = 154;
+	cx = 120;
+	goto gotmonktext;
+notmonktext5:
+	_cmp(data.byte(kIntrocount), 21);
+	if (!flags.z())
+		goto notmonktext6;
+	al = 24;
+	bl = 68;
+	bh = 38;
+	cx = 120;
+	goto gotmonktext;
+notmonktext6:
+	_cmp(data.byte(kIntrocount), 25);
+	if (!flags.z())
+		goto notmonktext7;
+	al = 25;
+	bl = 68;
+	bh = 154;
+	cx = 120;
+	goto gotmonktext;
+notmonktext7:
+	_cmp(data.byte(kIntrocount), 29);
+	if (!flags.z())
+		goto notmonktext8;
+	al = 26;
+	bl = 68;
+	bh = 38;
+	cx = 120;
+	goto gotmonktext;
+notmonktext8:
+	_cmp(data.byte(kIntrocount), 33);
+	if (!flags.z())
+		goto notmonktext9;
+	al = 27;
+	bl = 68;
+	bh = 154;
+	cx = 120;
+	goto gotmonktext;
+notmonktext9:
+	_cmp(data.byte(kIntrocount), 37);
+	if (!flags.z())
+		goto notmonktext10;
+	al = 28;
+	bl = 68;
+	bh = 154;
+	cx = 120;
+	goto gotmonktext;
+notmonktext10:
+	_cmp(data.byte(kIntrocount), 41);
+	if (!flags.z())
+		goto notmonktext11;
+	al = 29;
+	bl = 68;
+	bh = 38;
+	cx = 120;
+	goto gotmonktext;
+notmonktext11:
+	_cmp(data.byte(kIntrocount), 45);
+	if (!flags.z())
+		goto notmonktext12;
+	al = 30;
+	bl = 68;
+	bh = 154;
+	cx = 120;
+	goto gotmonktext;
+notmonktext12:
+	_cmp(data.byte(kIntrocount), 52);
+	if (!flags.z())
+		goto notmonktext13;
+	al = 31;
+	bl = 68;
+	bh = 154;
+	cx = 220;
+	goto gotmonktext;
+notmonktext13:
+	_cmp(data.byte(kIntrocount), 53);
+	if (!flags.z())
+		return /* (notendtitles) */;
+	fadescreendowns();
+	data.byte(kVolumeto) = 7;
+	data.byte(kVolumedirection) = 1;
+	return;
+gotmonktext:
+	dx = 1;
+	ah = 82;
+	_cmp(data.byte(kCh1playing), 255);
+	if (flags.z())
+		goto oktalk;
+	_dec(data.byte(kIntrocount));
+	return;
+oktalk:
+	setuptimedtemp();
+}
+
 } /*namespace dreamgen */
 
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 90d3178a7c..5688e8c7b4 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -270,4 +270,7 @@
 	void loadroom();
 	void getundermenu();
 	void putundermenu();
+	void textformonk();
+	void textforend();
+