4 files changed, 72 insertions, 83 deletions

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index c8eeca25cd..565034047f 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -5805,14 +5805,6 @@ douse:
 	useRoutine();
 }
 
-void DreamGenContext::wheelSound() {
-	STACK_CHECK;
-	al = 17;
-	playChannel1();
-	showFirstUse();
-	putBackObStuff();
-}
-
 void DreamGenContext::runTap() {
 	STACK_CHECK;
 	_cmp(data.byte(kWithobject), 255);
@@ -5862,14 +5854,6 @@ cupfromtapfull:
 	putBackObStuff();
 }
 
-void DreamGenContext::playGuitar() {
-	STACK_CHECK;
-	al = 14;
-	playChannel1();
-	showFirstUse();
-	putBackObStuff();
-}
-
 void DreamGenContext::hotelControl() {
 	STACK_CHECK;
 	_cmp(data.byte(kReallocation), 21);
@@ -5886,14 +5870,6 @@ notrightcont:
 	putBackObStuff();
 }
 
-void DreamGenContext::hotelBell() {
-	STACK_CHECK;
-	al = 12;
-	playChannel1();
-	showFirstUse();
-	putBackObStuff();
-}
-
 void DreamGenContext::openTomb() {
 	STACK_CHECK;
 	_inc(data.byte(kProgresspoints));
@@ -7345,13 +7321,6 @@ axeoncontrols:
 	putBackObStuff();
 }
 
-void DreamGenContext::useHatch() {
-	STACK_CHECK;
-	showFirstUse();
-	data.byte(kNewlocation) = 40;
-	data.byte(kGetback) = 1;
-}
-
 void DreamGenContext::useWire() {
 	STACK_CHECK;
 	_cmp(data.byte(kWithobject), 255);
@@ -7425,39 +7394,6 @@ havecutwire:
 	data.byte(kGetback) = 1;
 }
 
-void DreamGenContext::useElevator1() {
-	STACK_CHECK;
-	showFirstUse();
-	selectLocation();
-	data.byte(kGetback) = 1;
-}
-
-void DreamGenContext::useElevator3() {
-	STACK_CHECK;
-	showFirstUse();
-	data.byte(kCounttoclose) = 20;
-	data.byte(kNewlocation) = 34;
-	data.word(kReeltowatch) = 46;
-	data.word(kEndwatchreel) = 63;
-	data.byte(kWatchspeed) = 1;
-	data.byte(kSpeedcount) = 1;
-	data.word(kWatchingtime) = 80;
-	data.byte(kGetback) = 1;
-}
-
-void DreamGenContext::useElevator4() {
-	STACK_CHECK;
-	showFirstUse();
-	data.word(kReeltowatch) = 0;
-	data.word(kEndwatchreel) = 11;
-	data.byte(kWatchspeed) = 1;
-	data.byte(kSpeedcount) = 1;
-	data.byte(kCounttoclose) = 20;
-	data.word(kWatchingtime) = 80;
-	data.byte(kGetback) = 1;
-	data.byte(kNewlocation) = 24;
-}
-
 void DreamGenContext::useElevator2() {
 	STACK_CHECK;
 	_cmp(data.byte(kLocation), 23);
@@ -8071,17 +8007,6 @@ void DreamGenContext::setupTimedUse() {
 	data.word(kTimedoffset) = bx;
 }
 
-void DreamGenContext::edensCDPlayer() {
-	STACK_CHECK;
-	showFirstUse();
-	data.word(kWatchingtime) = 18*2;
-	data.word(kReeltowatch) = 25;
-	data.word(kEndwatchreel) = 42;
-	data.byte(kWatchspeed) = 1;
-	data.byte(kSpeedcount) = 1;
-	data.byte(kGetback) = 1;
-}
-
 void DreamGenContext::useWall() {
 	STACK_CHECK;
 	showFirstUse();
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 3033fda5fd..d67c2ad1e6 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -579,8 +579,6 @@ public:
 	void introMonks2();
 	void additionalText();
 	void useElevator5();
-	void useElevator4();
-	void useElevator1();
 	void greyscaleSum();
 	void useElevator2();
 	void keyboardRead();
@@ -630,7 +628,6 @@ public:
 	void openPoolBoss();
 	void usePlate();
 	void lookInInterface();
-	void hotelBell();
 	void loadSpeech();
 	void adjustLeft();
 	void callEdensLift();
@@ -639,7 +636,6 @@ public:
 	void getFreeAd();
 	void showArrows();
 	void walkIntoRoom();
-	void useHatch();
 	void printOuterMon();
 	void showDecisions();
 	void removeObFromInv();
@@ -731,8 +727,6 @@ public:
 	void deleteExFrame();
 	void bossMan();
 	void DOSReturn();
-	void wheelSound();
-	void playGuitar();
 	void searchForSame();
 	void chewy();
 	void getBack1();
@@ -799,7 +793,6 @@ public:
 	void swapWithOpen();
 	void dreamweb();
 	void dropError();
-	void edensCDPlayer();
 	void callEdensDLift();
 	void checkInside();
 	void gates();
@@ -834,7 +827,6 @@ public:
 	void openFile();
 	void showPuzText();
 	void incRyanPage();
-	void useElevator3();
 	void findExObject();
 	void clearChanges();
 	void useChurchHole();
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 73bd68e841..a258424ceb 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -370,6 +370,14 @@
 	void restoreReels();
 	void enterSymbol();
 	void viewFolder();
+	void edensCDPlayer();
+	void hotelBell();
+	void playGuitar();
+	void useElevator1();
+	void useElevator3();
+	void useElevator4();
+	void useHatch();
+	void wheelSound();
 	void checkFolderCoords();
 	void loadFolder();
 	void showFolder();
diff --git a/engines/dreamweb/use.cpp b/engines/dreamweb/use.cpp
index fa11967ffc..39423b392c 100644
--- a/engines/dreamweb/use.cpp
+++ b/engines/dreamweb/use.cpp
@@ -223,5 +223,69 @@ void DreamGenContext::viewFolder() {
 	workToScreenM();
 }
 
+void DreamGenContext::edensCDPlayer() {
+	showFirstUse();
+	data.word(kWatchingtime) = 18 * 2;
+	data.word(kReeltowatch) = 25;
+	data.word(kEndwatchreel) = 42;
+	data.byte(kWatchspeed) = 1;
+	data.byte(kSpeedcount) = 1;
+	data.byte(kGetback) = 1;
+}
+
+void DreamGenContext::hotelBell() {
+	playChannel1(12);
+	showFirstUse();
+	putBackObStuff();
+}
+
+void DreamGenContext::playGuitar() {
+	playChannel1(14);
+	showFirstUse();
+	putBackObStuff();
+}
+
+void DreamGenContext::useElevator1() {
+	showFirstUse();
+	selectLocation();
+	data.byte(kGetback) = 1;
+}
+
+void DreamGenContext::useElevator3() {
+	showFirstUse();
+	data.byte(kCounttoclose) = 20;
+	data.byte(kNewlocation) = 34;
+	data.word(kReeltowatch) = 46;
+	data.word(kEndwatchreel) = 63;
+	data.byte(kWatchspeed) = 1;
+	data.byte(kSpeedcount) = 1;
+	data.word(kWatchingtime) = 80;
+	data.byte(kGetback) = 1;
+}
+
+void DreamGenContext::useElevator4() {
+	showFirstUse();
+	data.word(kReeltowatch) = 0;
+	data.word(kEndwatchreel) = 11;
+	data.byte(kWatchspeed) = 1;
+	data.byte(kSpeedcount) = 1;
+	data.byte(kCounttoclose) = 20;
+	data.word(kWatchingtime) = 80;
+	data.byte(kGetback) = 1;
+	data.byte(kNewlocation) = 24;
+}
+
+void DreamGenContext::useHatch() {
+	showFirstUse();
+	data.byte(kNewlocation) = 40;
+	data.byte(kGetback) = 1;
+}
+
+void DreamGenContext::wheelSound() {
+	playChannel1(17);
+	showFirstUse();
+	putBackObStuff();
+}
+
 } /*namespace dreamgen */