3 files changed, 28 insertions, 30 deletions
diff --git a/engines/agos/agos.cpp b/engines/agos/agos.cpp
index fb5c268fa0..0d9da48657 100644
--- a/engines/agos/agos.cpp
+++ b/engines/agos/agos.cpp
@@ -837,26 +837,6 @@ void AGOSEngine::pause() {
 }
 
 int AGOSEngine::go() {
-	if (getGameType() == GType_ELVIRA1 && getPlatform() == Common::kPlatformAtariST &&
-		(getFeatures() & GF_DEMO)) {
-		int i;
-
-		while(1) {
-			for (i = 1; i < 4; i++) {
-				setWindowImageEx(3, 9902 + i);
-				debug(0, "Displaying image %d", 9902 + i);
-				delay(1000);
-
-			}
-
-			for (i = 4; i < 16; i++) {
-				setWindowImageEx(4, 9902 + i);
-				debug(0, "Displaying image %d", 9902 + i);
-				delay(1000);
-			}
-		}
-	}
-
 	loadGamePcFile();
 
 	addTimeEvent(0, 1);
@@ -877,6 +857,26 @@ int AGOSEngine::go() {
 
 	vc34_setMouseOff();
 
+	if (getGameType() == GType_ELVIRA1 && getPlatform() == Common::kPlatformAtariST &&
+		(getFeatures() & GF_DEMO)) {
+		int i;
+
+		while(1) {
+			for (i = 1; i < 4; i++) {
+				setWindowImageEx(3, 9902 + i);
+				debug(0, "Displaying image %d", 9902 + i);
+				delay(1000);
+
+			}
+
+			for (i = 4; i < 16; i++) {
+				setWindowImageEx(4, 9902 + i);
+				debug(0, "Displaying image %d", 9902 + i);
+				delay(1000);
+			}
+		}
+	}
+
 	if (getGameType() == GType_ELVIRA1 && getFeatures() & GF_DEMO) {
 		loadMusic(0);
 	}
@@ -887,11 +887,9 @@ int AGOSEngine::go() {
 		_moviePlay->play();
 	}
 
-	//runSubroutine101();
+	runSubroutine101();
 	permitInput();
 
-	setWindowImageEx(3, 911);
-
 	while (1) {
 		waitForInput();
 		handleVerbClicked(_verbHitArea);
diff --git a/engines/agos/res.cpp b/engines/agos/res.cpp
index 4b227b6100..e1a4129fb1 100644
--- a/engines/agos/res.cpp
+++ b/engines/agos/res.cpp
@@ -680,10 +680,12 @@ void AGOSEngine::loadVGAVideoFile(uint id, uint type) {
 		if (getPlatform() == Common::kPlatformAcorn) {
 			sprintf(filename, "%.3d%d.DAT", id, type);
 		} else if (getPlatform() == Common::kPlatformAmiga || getPlatform() == Common::kPlatformAtariST) {
-			//if (getFeatures() & GF_TALKIE) {
-				sprintf(filename, "%.2d%d.out", id, type);
-			/* } else if (getGameType() == GType_ELVIRA1 && getFeatures() & GF_DEMO) {
-				if (id == 20)
+			if (getFeatures() & GF_TALKIE) {
+				sprintf(filename, "%.3d%d.out", id, type);
+			} else if (getGameType() == GType_ELVIRA1 && getFeatures() & GF_DEMO) {
+				if (getPlatform() == Common::kPlatformAtariST)
+					sprintf(filename, "%.2d%d.out", id, type);
+				else if (id == 20)
 					sprintf(filename, "D%d.out", type);
 				else if (id == 26)
 					sprintf(filename, "J%d.out", type);
@@ -699,7 +701,7 @@ void AGOSEngine::loadVGAVideoFile(uint id, uint type) {
 				sprintf(filename, "%.2d%d.pkd", id, type);
 			} else {
 				sprintf(filename, "%.3d%d.pkd", id, type);
-			} */
+			}
 		} else {
 			if (getGameType() == GType_ELVIRA1 || getGameType() == GType_ELVIRA2 || getGameType() == GType_WW) {
 				sprintf(filename, "%.2d%d.VGA", id, type);
diff --git a/engines/agos/subroutine.cpp b/engines/agos/subroutine.cpp
index a9cd57a20a..d3ecb3fa28 100644
--- a/engines/agos/subroutine.cpp
+++ b/engines/agos/subroutine.cpp
@@ -483,8 +483,6 @@ Subroutine *AGOSEngine::createSubroutine(uint id) {
 SubroutineLine *AGOSEngine::createSubroutineLine(Subroutine *sub, int where) {
 	SubroutineLine *sl, *cur_sl = NULL, *last_sl = NULL;
 
-	printf("sub->id %d\n", sub->id);
-
 	if (sub->id == 0)
 		sl = (SubroutineLine *)allocateTable(SUBROUTINE_LINE_BIG_SIZE);
 	else