DREAMWEB: Remove more unused functions and blobs

5 files changed, 153 insertions, 325 deletions

diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index 1a4a3763e8..86815806a1 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -45,6 +45,17 @@ p = parser(skip_binary_data = [
 	# saveload.asm
 	'loadlist',
 	'savelist',
+	'gameerror1',
+	'gameerror2',
+	'gameerror3',
+	'gameerror4',
+	'gameerror5',
+	'gameerror6',
+	'gameerror7',
+	'gameerror8',
+	'error2patch',
+	'error6patch',
+	'gameinfo',
 	'endgametext1',
 	# sblaster.asm
 	'dmaaddresses',
@@ -165,6 +176,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'entercode',
 	'entersymbol',
 	'eraseoldobs',
+	'error',
 	'examineob',
 	'examineobtext',
 	'facerightway',
@@ -191,6 +203,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'frameoutnm',
 	'frameoutv',
 	'gamer',
+	'generalerror',
 	'getbackfromob',
 	'getblockofpixel',
 	'getdimension',
@@ -310,6 +323,8 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'quickquit2',
 	'random',
 	'randomaccess',
+	'randomnum1',
+	'randomnum2',
 	'randomnumber',
 	'readabyte',
 	'readheader',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 567da5c5eb..2939d54971 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -5273,14 +5273,14 @@ void DreamGenContext::getDestInfo() {
 	push(ax);
 	dx = data;
 	es = dx;
-	si = 3983;
+	si = 2930;
 	_add(si, ax);
 	cl = es.byte(si);
 	ax = pop();
 	push(cx);
 	dx = data;
 	es = dx;
-	si = 3999;
+	si = 2946;
 	_add(si, ax);
 	ax = pop();
 }
@@ -5457,7 +5457,7 @@ clearedlocations:
 	bx = ax;
 	dx = data;
 	es = dx;
-	_add(bx, 3983);
+	_add(bx, 2930);
 	es.byte(bx) = 0;
 }
 
@@ -5670,7 +5670,7 @@ void DreamGenContext::delChar() {
 	si = data.word(kCurpos);
 	_add(si, si);
 	es = cs;
-	_add(si, 4017);
+	_add(si, 2964);
 	es.byte(si) = 0;
 	al = es.byte(si+1);
 	ah = 0;
@@ -5697,7 +5697,7 @@ void DreamGenContext::execCommand() {
 	es = cs;
 	bx = offset_comlist;
 	ds = cs;
-	si = 4017;
+	si = 2964;
 	al = ds.byte(si);
 	_cmp(al, 0);
 	if (!flags.z())
@@ -5892,7 +5892,7 @@ notyetassigned:
 	push(bx);
 	_add(bx, 2);
 	ds = cs;
-	si = 4017;
+	si = 2964;
 checkpass:
 	_lodsw();
 	ah = es.byte(bx);
@@ -6220,7 +6220,7 @@ void DreamGenContext::parser() {
 	al = '=';
 	_stosb();
 	ds = cs;
-	si = 4017;
+	si = 2964;
 notspace1:
 	_lodsw();
 	_cmp(al, 32);
@@ -9844,7 +9844,7 @@ void DreamGenContext::getNamePos() {
 	_mul(cx);
 	dx = data;
 	es = dx;
-	bx = 4551;
+	bx = 3498;
 	_add(bx, ax);
 	al = data.byte(kCursorpos);
 	ah = 0;
@@ -9998,7 +9998,7 @@ void DreamGenContext::showNames() {
 	STACK_CHECK;
 	dx = data;
 	es = dx;
-	si = 4551+1;
+	si = 3498+1;
 	di = (60)+21;
 	bx = (52)+10;
 	cl = 0;
@@ -10518,7 +10518,7 @@ void DreamGenContext::clearChanges() {
 	di = 0;
 	_stosw(cx, true);
 	es = cs;
-	di = 3983;
+	di = 2930;
 	al = 1;
 	_stosb(2);
 	al = 0;
@@ -11257,37 +11257,6 @@ nokey:
 	data.byte(kCurrentkey) = 0;
 }
 
-void DreamGenContext::randomNum1() {
-	STACK_CHECK;
-	push(ds);
-	push(es);
-	push(di);
-	push(bx);
-	push(cx);
-	randomNumber();
-	cx = pop();
-	bx = pop();
-	di = pop();
-	es = pop();
-	ds = pop();
-}
-
-void DreamGenContext::randomNum2() {
-	STACK_CHECK;
-	push(ds);
-	push(es);
-	push(di);
-	push(bx);
-	push(ax);
-	randomNumber();
-	cl = al;
-	ax = pop();
-	bx = pop();
-	di = pop();
-	es = pop();
-	ds = pop();
-}
-
 void DreamGenContext::getRidOfReels() {
 	STACK_CHECK;
 	_cmp(data.byte(kRoomloaded), 0);
@@ -11659,275 +11628,143 @@ void DreamGenContext::__start() {
 		//0x0a20: ...> .o.P .... .p..
 		0x00, 0x48, 0xc8, 0x00, 0x00, 0x40, 0x01, 0x00, 0x00, 0xc8, 0x00, 0xa0, 0xca, 0xff, 0xff, 0x0d, 
 		//0x0a30: .H.. .@.. .... ....
-		0x0a, 0x0d, 0x0a, 0x44, 0x72, 0x65, 0x61, 0x6d, 0x77, 0x65, 0x62, 0x20, 0x68, 0x61, 0x73, 0x20, 
-		//0x0a40: ...D ream web  has 
-		0x61, 0x6e, 0x20, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x3a, 0x0d, 0x0a, 0x55, 0x6e, 0x61, 0x62, 0x6c, 
-		//0x0a50: an E rror :..U nabl
-		0x65, 0x20, 0x74, 0x6f, 0x20, 0x61, 0x6c, 0x6c, 0x6f, 0x63, 0x61, 0x74, 0x65, 0x20, 0x45, 0x78, 
-		//0x0a60: e to  all ocat e Ex
-		0x70, 0x61, 0x6e, 0x64, 0x65, 0x64, 0x20, 0x4d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x2e, 0x0d, 0x0a, 
-		//0x0a70: pand ed M emor y...
-		0x0d, 0x0a, 0x24, 0x0d, 0x0a, 0x0d, 0x0a, 0x44, 0x72, 0x65, 0x61, 0x6d, 0x77, 0x65, 0x62, 0x20, 
-		//0x0a80: ..$. ...D ream web 
-		0x68, 0x61, 0x73, 0x20, 0x61, 0x6e, 0x20, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x3a, 0x0d, 0x0a, 0x53, 
-		//0x0a90: has  an E rror :..S
-		0x6f, 0x75, 0x6e, 0x64, 0x20, 0x42, 0x6c, 0x61, 0x73, 0x74, 0x65, 0x72, 0x20, 0x63, 0x61, 0x72, 
-		//0x0aa0: ound  Bla ster  car
-		0x64, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x20, 0x61, 0x74, 0x20, 0x61, 
-		//0x0ab0: d no t fo und  at a
-		0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x20, 0x32, 0x32, 0x30, 0x20, 0x48, 0x65, 0x78, 0x2e, 0x0d, 
-		//0x0ac0: ddre ss 2 20 H ex..
-		0x0a, 0x0d, 0x0a, 0x24, 0x0d, 0x0a, 0x0d, 0x0a, 0x44, 0x72, 0x65, 0x61, 0x6d, 0x77, 0x65, 0x62, 
-		//0x0ad0: ...$ .... Drea mweb
-		0x20, 0x68, 0x61, 0x73, 0x20, 0x61, 0x6e, 0x20, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x3a, 0x0d, 0x0a, 
-		//0x0ae0:  has  an  Erro r:..
-		0x4f, 0x75, 0x74, 0x20, 0x6f, 0x66, 0x20, 0x42, 0x61, 0x73, 0x65, 0x20, 0x4d, 0x65, 0x6d, 0x6f, 
-		//0x0af0: Out  of B ase  Memo
-		0x72, 0x79, 0x2e, 0x0d, 0x0a, 0x0d, 0x0a, 0x24, 0x0d, 0x0a, 0x0d, 0x0a, 0x44, 0x72, 0x65, 0x61, 
-		//0x0b00: ry.. ...$ .... Drea
-		0x6d, 0x77, 0x65, 0x62, 0x20, 0x68, 0x61, 0x73, 0x20, 0x61, 0x6e, 0x20, 0x45, 0x72, 0x72, 0x6f, 
-		//0x0b10: mweb  has  an  Erro
-		0x72, 0x3a, 0x0d, 0x0a, 0x4d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x20, 0x44, 0x65, 0x61, 0x6c, 0x6c, 
-		//0x0b20: r:.. Memo ry D eall
-		0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x70, 0x72, 0x6f, 0x62, 0x6c, 0x65, 0x6d, 0x2e, 
-		//0x0b30: ocat ion  prob lem.
-		0x0d, 0x0a, 0x0d, 0x0a, 0x24, 0x0d, 0x0a, 0x0d, 0x0a, 0x44, 0x72, 0x65, 0x61, 0x6d, 0x77, 0x65, 
-		//0x0b40: .... $... .Dre amwe
-		0x62, 0x20, 0x68, 0x61, 0x73, 0x20, 0x61, 0x6e, 0x20, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x3a, 0x0d, 
-		//0x0b50: b ha s an  Err or:.
-		0x0a, 0x41, 0x74, 0x20, 0x6c, 0x65, 0x61, 0x73, 0x74, 0x20, 0x35, 0x39, 0x30, 0x4b, 0x20, 0x6f, 
-		//0x0b60: .At  leas t 59 0K o
-		0x66, 0x20, 0x62, 0x61, 0x73, 0x65, 0x20, 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x20, 0x69, 0x73, 
-		//0x0b70: f ba se m emor y is
-		0x20, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x64, 0x2e, 0x0d, 0x0a, 0x0d, 0x0a, 0x24, 0x0d, 
-		//0x0b80:  req uire d... ..$.
-		0x0a, 0x0d, 0x0a, 0x44, 0x72, 0x65, 0x61, 0x6d, 0x77, 0x65, 0x62, 0x20, 0x68, 0x61, 0x73, 0x20, 
-		//0x0b90: ...D ream web  has 
-		0x61, 0x6e, 0x20, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x3a, 0x0d, 0x0a, 0x53, 0x6f, 0x75, 0x6e, 0x64, 
-		//0x0ba0: an E rror :..S ound
-		0x20, 0x42, 0x6c, 0x61, 0x73, 0x74, 0x65, 0x72, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x66, 0x6f, 0x75, 
-		//0x0bb0:  Bla ster  not  fou
-		0x6e, 0x64, 0x20, 0x6f, 0x6e, 0x20, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x75, 0x70, 0x74, 0x20, 0x30, 
-		//0x0bc0: nd o n in teru pt 0
-		0x0d, 0x0a, 0x0d, 0x0a, 0x24, 0x0d, 0x0a, 0x0d, 0x0a, 0x44, 0x72, 0x65, 0x61, 0x6d, 0x77, 0x65, 
-		//0x0bd0: .... $... .Dre amwe
-		0x62, 0x20, 0x68, 0x61, 0x73, 0x20, 0x61, 0x6e, 0x20, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x3a, 0x0d, 
-		//0x0be0: b ha s an  Err or:.
-		0x0a, 0x55, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x20, 0x74, 0x6f, 0x20, 0x73, 0x65, 0x6c, 0x65, 0x63, 
-		//0x0bf0: .Una ble  to s elec
-		0x74, 0x20, 0x45, 0x4d, 0x4d, 0x20, 0x70, 0x61, 0x67, 0x65, 0x2e, 0x0d, 0x0a, 0x0d, 0x0a, 0x24, 
-		//0x0c00: t EM M pa ge.. ...$
-		0x0d, 0x0a, 0x0d, 0x0a, 0x44, 0x72, 0x65, 0x61, 0x6d, 0x77, 0x65, 0x62, 0x20, 0x68, 0x61, 0x73, 
-		//0x0c10: .... Drea mweb  has
-		0x20, 0x61, 0x6e, 0x20, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x3a, 0x0d, 0x0a, 0x46, 0x69, 0x6c, 0x65, 
-		//0x0c20:  an  Erro r:.. File
-		0x20, 0x6e, 0x6f, 0x74, 0x20, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x2e, 0x63, 0x0d, 0x0a, 0x0d, 0x0a, 
-		//0x0c30:  not  fou nd.c ....
-		0x24, 0x44, 0x72, 0x65, 0x61, 0x6d, 0x77, 0x65, 0x62, 0x20, 0x6c, 0x6f, 0x6f, 0x6b, 0x73, 0x20, 
-		//0x0c40: $Dre amwe b lo oks 
-		0x66, 0x6f, 0x72, 0x20, 0x53, 0x6f, 0x75, 0x6e, 0x64, 0x20, 0x42, 0x6c, 0x61, 0x73, 0x74, 0x65, 
-		//0x0c50: for  Soun d Bl aste
-		0x72, 0x20, 0x69, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x69, 0x6e, 
-		//0x0c60: r in form atio n in
-		0x0d, 0x0a, 0x74, 0x68, 0x65, 0x20, 0x42, 0x4c, 0x41, 0x53, 0x54, 0x45, 0x52, 0x20, 0x65, 0x6e, 
-		//0x0c70: ..th e BL ASTE R en
-		0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x20, 0x76, 0x61, 0x72, 0x69, 0x61, 0x62, 
-		//0x0c80: viro nmen t va riab
-		0x6c, 0x65, 0x20, 0x28, 0x69, 0x6e, 0x20, 0x79, 0x6f, 0x75, 0x72, 0x20, 0x41, 0x55, 0x54, 0x4f, 
-		//0x0c90: le ( in y our  AUTO
-		0x45, 0x58, 0x45, 0x43, 0x2e, 0x42, 0x41, 0x54, 0x29, 0x0d, 0x0a, 0x0d, 0x0a, 0x49, 0x66, 0x20, 
-		//0x0ca0: EXEC .BAT )... .If 
-		0x74, 0x68, 0x69, 0x73, 0x20, 0x69, 0x73, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x66, 0x6f, 0x75, 0x6e, 
-		//0x0cb0: this  is  not  foun
-		0x64, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x20, 0x49, 0x52, 0x51, 0x20, 0x37, 0x2c, 0x20, 0x44, 0x4d, 
-		//0x0cc0: d th en I RQ 7 , DM
-		0x41, 0x20, 0x63, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x20, 0x31, 0x20, 0x61, 0x6e, 0x64, 0x20, 
-		//0x0cd0: A ch anne l 1  and 
-		0x62, 0x61, 0x73, 0x65, 0x0d, 0x0a, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x20, 0x32, 0x32, 
-		//0x0ce0: base ..ad dres s 22
-		0x30, 0x68, 0x20, 0x61, 0x72, 0x65, 0x20, 0x61, 0x73, 0x73, 0x75, 0x6d, 0x65, 0x64, 0x2e, 0x0d, 
-		//0x0cf0: 0h a re a ssum ed..
-		0x0a, 0x0d, 0x0a, 0x54, 0x6f, 0x20, 0x61, 0x6c, 0x74, 0x65, 0x72, 0x20, 0x61, 0x6e, 0x79, 0x20, 
-		//0x0d00: ...T o al ter  any 
-		0x6f, 0x72, 0x20, 0x61, 0x6c, 0x6c, 0x20, 0x6f, 0x66, 0x20, 0x74, 0x68, 0x65, 0x73, 0x65, 0x20, 
-		//0x0d10: or a ll o f th ese 
-		0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x20, 0x79, 0x6f, 0x75, 0x20, 0x63, 0x61, 0x6e, 
-		//0x0d20: sett ings  you  can
-		0x20, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x79, 0x20, 0x74, 0x68, 0x65, 0x6d, 0x0d, 0x0a, 0x6f, 
-		//0x0d30:  spe cify  the m..o
-		0x6e, 0x20, 0x74, 0x68, 0x65, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x20, 0x6c, 0x69, 
-		//0x0d40: n th e co mman d li
-		0x6e, 0x65, 0x2e, 0x20, 0x46, 0x6f, 0x72, 0x20, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x3a, 
-		//0x0d50: ne.  For  exam ple:
-		0x0d, 0x0a, 0x0d, 0x0a, 0x54, 0x79, 0x70, 0x65, 0x20, 0x20, 0x20, 0x20, 0x44, 0x52, 0x45, 0x41, 
-		//0x0d60: .... Type      DREA
-		0x4d, 0x57, 0x45, 0x42, 0x20, 0x49, 0x37, 0x20, 0x41, 0x32, 0x32, 0x30, 0x20, 0x44, 0x31, 0x20, 
-		//0x0d70: MWEB  I7  A220  D1 
-		0x20, 0x20, 0x20, 0x74, 0x6f, 0x20, 0x72, 0x75, 0x6e, 0x20, 0x44, 0x72, 0x65, 0x61, 0x6d, 0x77, 
-		//0x0d80:    t o ru n Dr eamw
-		0x65, 0x62, 0x20, 0x6f, 0x6e, 0x20, 0x49, 0x52, 0x51, 0x20, 0x37, 0x2c, 0x20, 0x44, 0x4d, 0x41, 
-		//0x0d90: eb o n IR Q 7,  DMA
-		0x0d, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
-		//0x0da0: ..                 
+		0x0a, 0x0d, 0x0a, 0x24, 0x81, 0x00, 0xb8, 0x00, 0x52, 0x00, 0x80, 0x00, 0xc0, 0xc8, 0x50, 0x00, 
+		//0x0a40: ...$ .... R... ..P.
+		0x93, 0x00, 0x3e, 0x00, 0x6f, 0x00, 0x80, 0xc8, 0xb7, 0x00, 0xfa, 0x00, 0x3e, 0x00, 0x6f, 0x00, 
+		//0x0a50: ..>. o... .... >.o.
+		0xc4, 0xc8, 0x00, 0x00, 0x40, 0x01, 0x00, 0x00, 0xc8, 0x00, 0xa0, 0xca, 0xff, 0xff, 0x53, 0x50, 
+		//0x0a60: .... @... .... ..SP
+		0x45, 0x45, 0x43, 0x48, 0x52, 0x32, 0x34, 0x43, 0x30, 0x30, 0x30, 0x35, 0x2e, 0x52, 0x41, 0x57, 
+		//0x0a70: EECH R24C 0005 .RAW
+		0x00, 0x4f, 0x42, 0x4a, 0x45, 0x43, 0x54, 0x20, 0x4e, 0x41, 0x4d, 0x45, 0x20, 0x4f, 0x4e, 0x45, 
+		//0x0a80: .OBJ ECT  NAME  ONE
 		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
-		//0x0db0:                    
-		0x20, 0x63, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x20, 0x31, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x62, 
-		//0x0dc0:  cha nnel  1 a nd b
-		0x61, 0x73, 0x65, 0x20, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x20, 0x32, 0x32, 0x30, 0x68, 
-		//0x0dd0: ase  addr ess  220h
-		0x0d, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 
-		//0x0de0: ..          DR EAMW
-		0x45, 0x42, 0x20, 0x49, 0x35, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
-		//0x0df0: EB I 5             
-		0x20, 0x74, 0x6f, 0x20, 0x72, 0x75, 0x6e, 0x20, 0x44, 0x72, 0x65, 0x61, 0x6d, 0x77, 0x65, 0x62, 
-		//0x0e00:  to  run  Drea mweb
-		0x20, 0x6f, 0x6e, 0x20, 0x49, 0x52, 0x51, 0x20, 0x35, 0x20, 0x61, 0x6e, 0x64, 0x0d, 0x0a, 0x20, 
-		//0x0e10:  on  IRQ  5 an d.. 
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
-		//0x0e20:                    
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x64, 0x65, 
-		//0x0e30:                  de
-		0x66, 0x61, 0x75, 0x6c, 0x74, 0x20, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x20, 0x6f, 0x66, 
-		//0x0e40: faul t ad dres s of
-		0x20, 0x32, 0x32, 0x30, 0x68, 0x2c, 0x20, 0x44, 0x4d, 0x41, 0x20, 0x31, 0x0d, 0x0a, 0x0d, 0x0a, 
-		//0x0e50:  220 h, D MA 1 ....
-		0x24, 0x81, 0x00, 0xb8, 0x00, 0x52, 0x00, 0x80, 0x00, 0xc0, 0xc8, 0x50, 0x00, 0x93, 0x00, 0x3e, 
-		//0x0e60: $... .R.. ...P ...>
-		0x00, 0x6f, 0x00, 0x80, 0xc8, 0xb7, 0x00, 0xfa, 0x00, 0x3e, 0x00, 0x6f, 0x00, 0xc4, 0xc8, 0x00, 
-		//0x0e70: .o.. .... .>.o ....
-		0x00, 0x40, 0x01, 0x00, 0x00, 0xc8, 0x00, 0xa0, 0xca, 0xff, 0xff, 0x53, 0x50, 0x45, 0x45, 0x43, 
-		//0x0e80: .@.. .... ...S PEEC
-		0x48, 0x52, 0x32, 0x34, 0x43, 0x30, 0x30, 0x30, 0x35, 0x2e, 0x52, 0x41, 0x57, 0x00, 0x4f, 0x42, 
-		//0x0e90: HR24 C000 5.RA W.OB
-		0x4a, 0x45, 0x43, 0x54, 0x20, 0x4e, 0x41, 0x4d, 0x45, 0x20, 0x4f, 0x4e, 0x45, 0x20, 0x20, 0x20, 
-		//0x0ea0: JECT  NAM E ON E   
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
-		//0x0eb0:                    
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x10, 0x12, 0x12, 0x11, 0x10, 0x10, 0x10, 0x01, 0x01, 
-		//0x0ec0:        .. .... ....
-		0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 
-		//0x0ed0: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 
-		//0x0ee0: .... .... .... ...D
-		0x3a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x0ef0: :... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 
-		//0x0f00: .... .... .... ...D
-		0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x20, 0x44, 0x41, 0x54, 0x41, 0x20, 0x46, 0x49, 0x4c, 
-		//0x0f10: REAM WEB  DATA  FIL
-		0x45, 0x20, 0x43, 0x4f, 0x50, 0x59, 0x52, 0x49, 0x47, 0x48, 0x54, 0x20, 0x31, 0x39, 0x39, 0x32, 
-		//0x0f20: E CO PYRI GHT  1992
-		0x20, 0x43, 0x52, 0x45, 0x41, 0x54, 0x49, 0x56, 0x45, 0x20, 0x52, 0x45, 0x41, 0x4c, 0x49, 0x54, 
-		//0x0f30:  CRE ATIV E RE ALIT
-		0x59, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x0f40: Y... .... .... ....
+		//0x0a90:                    
+		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x10, 0x12, 0x12, 0x11, 0x10, 0x10, 
+		//0x0aa0:            ... ....
+		0x10, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
+		//0x0ab0: .... .... .... ....
+		0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+		//0x0ac0: .... .... .... ....
+		0x00, 0x00, 0x44, 0x3a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+		//0x0ad0: ..D: .... .... ....
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+		//0x0ae0: .... .... .... ....
+		0x00, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x20, 0x44, 0x41, 0x54, 0x41, 0x20, 
+		//0x0af0: ..DR EAMW EB D ATA 
+		0x46, 0x49, 0x4c, 0x45, 0x20, 0x43, 0x4f, 0x50, 0x59, 0x52, 0x49, 0x47, 0x48, 0x54, 0x20, 0x31, 
+		//0x0b00: FILE  COP YRIG HT 1
+		0x39, 0x39, 0x32, 0x20, 0x43, 0x52, 0x45, 0x41, 0x54, 0x49, 0x56, 0x45, 0x20, 0x52, 0x45, 0x41, 
+		//0x0b10: 992  CREA TIVE  REA
+		0x4c, 0x49, 0x54, 0x59, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+		//0x0b20: LITY .... .... ....
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+		//0x0b30: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x0f50: .... .... .... ....
+		//0x0b40: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x0f60: .... .... .... ....
+		//0x0b50: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x0f70: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 
-		//0x0f80: .... .... .... ....
-		0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 
-		//0x0f90: .... .... .... ....
-		0x00, 0x03, 0x02, 0x04, 0x01, 0x0a, 0x09, 0x08, 0x06, 0x0b, 0x04, 0x07, 0x07, 0x00, 0x00, 0x00, 
-		//0x0fa0: .... .... .... ....
+		//0x0b60: .... .... .... ....
+		0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+		//0x0b70: .... .... .... ....
+		0x00, 0x00, 0x05, 0x00, 0x03, 0x02, 0x04, 0x01, 0x0a, 0x09, 0x08, 0x06, 0x0b, 0x04, 0x07, 0x07, 
+		//0x0b80: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x0fb0: .... .... .... ....
+		//0x0b90: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x0fc0: .... .... .... ....
+		//0x0ba0: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x0fd0: .... .... .... ....
+		//0x0bb0: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x0fe0: .... .... .... ....
+		//0x0bc0: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x0ff0: .... .... .... ....
+		//0x0bd0: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x1000: .... .... .... ....
+		//0x0be0: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x1010: .... .... .... ....
+		//0x0bf0: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x1020: .... .... .... ....
-		0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-		//0x1030: .... .... .... ....
+		//0x0c00: .... .... .... ....
+		0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+		//0x0c10: .... .... .... ....
 		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-		//0x1040: .... .... .... ....
+		//0x0c20: .... .... .... ....
 		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-		//0x1050: .... .... .... ....
+		//0x0c30: .... .... .... ....
 		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-		//0x1060: .... .... .... ....
+		//0x0c40: .... .... .... ....
 		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-		//0x1070: .... .... .... ....
+		//0x0c50: .... .... .... ....
 		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-		//0x1080: .... .... .... ....
+		//0x0c60: .... .... .... ....
 		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-		//0x1090: .... .... .... ....
+		//0x0c70: .... .... .... ....
 		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-		//0x10a0: .... .... .... ....
+		//0x0c80: .... .... .... ....
 		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-		//0x10b0: .... .... .... ....
+		//0x0c90: .... .... .... ....
 		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-		//0x10c0: .... .... .... ....
+		//0x0ca0: .... .... .... ....
 		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-		//0x10d0: .... .... .... ....
+		//0x0cb0: .... .... .... ....
 		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-		//0x10e0: .... .... .... ....
+		//0x0cc0: .... .... .... ....
 		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-		//0x10f0: .... .... .... ....
+		//0x0cd0: .... .... .... ....
 		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-		//0x1100: .... .... .... ....
+		//0x0ce0: .... .... .... ....
 		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-		//0x1110: .... .... .... ....
+		//0x0cf0: .... .... .... ....
 		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-		//0x1120: .... .... .... ....
+		//0x0d00: .... .... .... ....
 		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-		//0x1130: .... .... .... ....
+		//0x0d10: .... .... .... ....
 		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-		//0x1140: .... .... .... ....
+		//0x0d20: .... .... .... ....
 		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-		//0x1150: .... .... .... ....
+		//0x0d30: .... .... .... ....
 		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-		//0x1160: .... .... .... ....
+		//0x0d40: .... .... .... ....
 		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-		//0x1170: .... .... .... ....
+		//0x0d50: .... .... .... ....
 		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-		//0x1180: .... .... .... ....
+		//0x0d60: .... .... .... ....
 		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-		//0x1190: .... .... .... ....
+		//0x0d70: .... .... .... ....
 		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-		//0x11a0: .... .... .... ....
+		//0x0d80: .... .... .... ....
 		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-		//0x11b0: .... .... .... ....
-		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
-		//0x11c0: .... .... .... ....
-		0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
-		//0x11d0: .... .... .... ....
-		0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 
-		//0x11e0: .... .... .... ....
-		0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 
-		//0x11f0: .... .... .... ....
+		//0x0d90: .... .... .... ....
+		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 
+		//0x0da0: .... .... .... ....
 		0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x00, 0x01, 0x01, 0x01, 
-		//0x1200: .... .... .... ....
+		//0x0db0: .... .... .... ....
 		0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x00, 0x01, 0x01, 
-		//0x1210: .... .... .... ....
+		//0x0dc0: .... .... .... ....
 		0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x00, 0x01, 
-		//0x1220: .... .... .... ....
-		0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x44, 0x52, 
-		//0x1230: .... .... .... ..DR
-		0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x44, 0x30, 0x30, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 
-		//0x1240: EAMW EB.D 00.D REAM
-		0x57, 0x45, 0x42, 0x2e, 0x44, 0x30, 0x31, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 
-		//0x1250: WEB. D01. DREA MWEB
-		0x2e, 0x44, 0x30, 0x32, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x44, 0x30, 
-		//0x1260: .D02 .DRE AMWE B.D0
-		0x33, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x44, 0x30, 0x34, 0x00, 0x44, 
-		//0x1270: 3.DR EAMW EB.D 04.D
-		0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x44, 0x30, 0x35, 0x00, 0x44, 0x52, 0x45, 0x41, 
-		//0x1280: REAM WEB. D05. DREA
-		0x4d, 0x57, 0x45, 0x42, 0x2e, 0x44, 0x30, 0x36, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 
-		//0x1290: MWEB .D06 .DRE AMWE
-		0x42, 0x2e, 0x44, 0x45, 0x4d, 0x00, 0x00, 0x00, 0x00, };
+		//0x0dd0: .... .... .... ....
+		0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x00, 
+		//0x0de0: .... .... .... ....
+		0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 
+		//0x0df0: .... .... .... ....
+		0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
+		//0x0e00: .... .... .... ....
+		0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
+		//0x0e10: .... .... .... ....
+		0x01, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x44, 0x30, 0x30, 0x00, 0x44, 0x52, 
+		//0x0e20: .DRE AMWE B.D0 0.DR
+		0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x44, 0x30, 0x31, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 
+		//0x0e30: EAMW EB.D 01.D REAM
+		0x57, 0x45, 0x42, 0x2e, 0x44, 0x30, 0x32, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 
+		//0x0e40: WEB. D02. DREA MWEB
+		0x2e, 0x44, 0x30, 0x33, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x44, 0x30, 
+		//0x0e50: .D03 .DRE AMWE B.D0
+		0x34, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x44, 0x30, 0x35, 0x00, 0x44, 
+		//0x0e60: 4.DR EAMW EB.D 05.D
+		0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x44, 0x30, 0x36, 0x00, 0x44, 0x52, 0x45, 0x41, 
+		//0x0e70: REAM WEB. D06. DREA
+		0x4d, 0x57, 0x45, 0x42, 0x2e, 0x44, 0x45, 0x4d, 0x00, 0x00, 0x00, 0x00, };
 	ds.assign(src, src + sizeof(src));
 	dreamweb(); 
 }
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index d4dd4ad1c4..ed072d21b6 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -37,34 +37,23 @@ public:
 #include "stubs.h" // Allow hand-reversed functions to have a signature different than void f()
 
 	static const uint16 offset_money1poke = 0x09b9;
+	static const uint16 offset_operand1 = 0x098f;
 	static const uint16 offset_comlist = 0x08e9;
+	static const uint16 offset_opslist = 0x09eb;
 	static const uint16 offset_destlist = 0x08ab;
-	static const uint16 offset_gameinfo = 0x0c41;
-	static const uint16 offset_error6patch = 0x0bcf;
-	static const uint16 offset_diarylist = 0x09c1;
-	static const uint16 offset_quitlist = 0x0895;
-	static const uint16 offset_openchangesize = 0x0873;
-	static const uint16 offset_gameerror5 = 0x0b45;
-	static const uint16 offset_gameerror7 = 0x0bd5;
-	static const uint16 offset_gameerror1 = 0x0a3f;
+	static const uint16 offset_speechfilename = 0x0a6e;
+	static const uint16 offset_keybuffer = 0x0ac2;
+	static const uint16 offset_decidelist = 0x0a44;
 	static const uint16 offset_talklist = 0x0875;
-	static const uint16 offset_rootdir = 0x099d;
-	static const uint16 offset_gameerror3 = 0x0ad4;
-	static const uint16 offset_operand1 = 0x098f;
-	static const uint16 offset_speechfilename = 0x0e8b;
+	static const uint16 offset_openchangesize = 0x0873;
+	static const uint16 offset_diarylist = 0x09c1;
 	static const uint16 offset_discopslist = 0x0a15;
-	static const uint16 offset_speechfile = 0x0e91;
-	static const uint16 offset_decidelist = 0x0e61;
-	static const uint16 offset_gameerror4 = 0x0b08;
-	static const uint16 offset_commandline = 0x0e9e;
-	static const uint16 offset_opslist = 0x09eb;
-	static const uint16 offset_money2poke = 0x09be;
-	static const uint16 offset_error2patch = 0x0ac7;
-	static const uint16 offset_gameerror8 = 0x0c10;
-	static const uint16 offset_keybuffer = 0x0edf;
-	static const uint16 offset_gameerror2 = 0x0a83;
+	static const uint16 offset_rootdir = 0x099d;
+	static const uint16 offset_commandline = 0x0a81;
+	static const uint16 offset_quitlist = 0x0895;
 	static const uint16 offset_keys = 0x0925;
-	static const uint16 offset_gameerror6 = 0x0b8f;
+	static const uint16 offset_money2poke = 0x09be;
+	static const uint16 offset_speechfile = 0x0a74;
 	static const uint16 kStartvars = 0;
 	static const uint16 kProgresspoints = 1;
 	static const uint16 kWatchon = 2;
@@ -522,22 +511,22 @@ public:
 	static const uint16 kTitle7graphics = 2137;
 	static const uint16 kPalettescreen = 2150;
 	static const uint16 kCurrentfile = 2475;
-	static const uint16 kFileheader = 3855;
-	static const uint16 kFiledata = 3905;
-	static const uint16 kExtradata = 3945;
-	static const uint16 kMadeuproomdat = 3951;
-	static const uint16 kRoomscango = 3983;
-	static const uint16 kRoompics = 3999;
-	static const uint16 kOplist = 4014;
-	static const uint16 kInputline = 4017;
-	static const uint16 kLinedata = 4145;
-	static const uint16 kPresslist = 4545;
-	static const uint16 kSavenames = 4551;
-	static const uint16 kSavefiles = 4670;
-	static const uint16 kRecname = 4761;
-	static const uint16 kQuitrequested = 4774;
-	static const uint16 kSubtitles = 4775;
-	static const uint16 kForeignrelease = 4776;
+	static const uint16 kFileheader = 2802;
+	static const uint16 kFiledata = 2852;
+	static const uint16 kExtradata = 2892;
+	static const uint16 kMadeuproomdat = 2898;
+	static const uint16 kRoomscango = 2930;
+	static const uint16 kRoompics = 2946;
+	static const uint16 kOplist = 2961;
+	static const uint16 kInputline = 2964;
+	static const uint16 kLinedata = 3092;
+	static const uint16 kPresslist = 3492;
+	static const uint16 kSavenames = 3498;
+	static const uint16 kSavefiles = 3617;
+	static const uint16 kRecname = 3708;
+	static const uint16 kQuitrequested = 3721;
+	static const uint16 kSubtitles = 3722;
+	static const uint16 kForeignrelease = 3723;
 	static const uint16 kBlocktextdat = (0);
 	static const uint16 kPersonframes = (0);
 	static const uint16 kDebuglevel1 = (0);
@@ -604,12 +593,12 @@ public:
 	static const uint16 kLenofmapstore = (22*8*20*8);
 	static const uint16 kUndertextsizex = (228);
 	static const uint16 kNumchanges = (250);
+	static const uint16 kHeaderlen = (2898-2802);
 	static const uint16 kUndertimedysize = (30);
 	static const uint16 kExframeslen = (30000);
 	static const uint16 kTablesize = (32);
 	static const uint16 kScreenwidth = (320);
 	static const uint16 kKeypadx = (36+112);
-	static const uint16 kHeaderlen = (3951-3855);
 	static const uint16 kItempicsize = (44);
 	static const uint16 kDiaryy = (48+12);
 	static const uint16 kOpsy = (52);
@@ -885,7 +874,6 @@ public:
 	void useStereo();
 	void candles2();
 	void pickupOb();
-	void error();
 	void showOpBox();
 	void clearBeforeLoad();
 	void bibleQuote();
@@ -963,7 +951,6 @@ public:
 	void monkSpeaking();
 	void clearRest();
 	void madmanRun();
-	void randomNum1();
 	void keeper();
 	void afterNewRoom();
 	void getExAd();
@@ -972,7 +959,6 @@ public:
 	void checkForShake();
 	void useButtonA();
 	void fadeScreenUp();
-	void generalError();
 	void mode640x480();
 	void openEden();
 	void execCommand();
@@ -1015,7 +1001,6 @@ public:
 	void quitKey();
 	void processTrigger();
 	void readDestIcon();
-	void randomNum2();
 	void loadSecondSample();
 	void transferConToEx();
 	void businessMan();
diff --git a/engines/dreamweb/sprite.cpp b/engines/dreamweb/sprite.cpp
index 5e4822728c..dae62d7752 100644
--- a/engines/dreamweb/sprite.cpp
+++ b/engines/dreamweb/sprite.cpp
@@ -289,8 +289,7 @@ void DreamGenContext::constant(Sprite *sprite, SetObject *objData) {
 }
 
 void DreamGenContext::random(Sprite *sprite, SetObject *objData) {
-	randomNum1();
-	uint16 r = ax;
+	uint8 r = engine->randomNumber();
 	sprite->frameNumber = objData->frames[r&7];
 }
 
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 9cdcef814f..ee167f3147 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -1124,14 +1124,6 @@ void DreamGenContext::loadSeg() {
 	flags._c = false;
 }
 
-void DreamGenContext::error() {
-	::error("error");
-}
-
-void DreamGenContext::generalError() {
-	::error("generalError");
-}
-
 void DreamGenContext::DOSReturn() {
 	_cmp(data.byte(kCommandtype), 250);
 	if (!flags.z()) {