[Scummvm-cvs-logs] scummvm master -> 4d4a63bb91c042b26bda680fe2fff22aa334acc0

tramboi bertrand_augereau at yahoo.fr
Sun Dec 4 15:31:04 CET 2011


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
4d4a63bb91 DREAMWEB: Hardcoded a few filenames


Commit: 4d4a63bb91c042b26bda680fe2fff22aa334acc0
    https://github.com/scummvm/scummvm/commit/4d4a63bb91c042b26bda680fe2fff22aa334acc0
Author: Bertrand Augereau (bertrand_augereau at yahoo.fr)
Date: 2011-12-04T08:28:39-08:00

Commit Message:
DREAMWEB: Hardcoded a few filenames

Changed paths:
    devtools/tasmrecover/tasm-recover
    engines/dreamweb/dreamgen.cpp
    engines/dreamweb/dreamgen.h
    engines/dreamweb/stubs.cpp



diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index 8d95609..e62a32e 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -27,6 +27,7 @@ from tasm.cpp import cpp
 p = parser(skip_binary_data = [
 	# These data blobs are not output
 	# dreamweb.asm
+	'characterset1',
 	'roomdata',
 	'mainlist',
 	'mainlist2',
@@ -42,6 +43,9 @@ p = parser(skip_binary_data = [
 	'filedata',
 	'extradata',
 	'keybuffer',
+	'spritename1',
+	'icongraphics0',
+	'icongraphics1',
 	# keypad.asm
 	'keypadlist',
 	'symbollist',
@@ -87,6 +91,8 @@ p = parser(skip_binary_data = [
 	'mongraphics2',
 	'spritename3',
 	'mongraphicname',
+	'puzzletextname',
+	'commandtextname',
 	'characterset2',
 	'monitorfile1',
 	'monitorfile2',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 43d5fd2..df37b9f 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -2046,7 +2046,7 @@ void DreamGenContext::showGun() {
 	data.byte(kRoomssample) = 34;
 	loadRoomsSample();
 	data.byte(kVolume) = 0;
-	dx = 1250;
+	dx = 1172;
 	loadIntoTemp();
 	createPanel2();
 	ds = data.word(kTempgraphics);
@@ -2069,7 +2069,7 @@ void DreamGenContext::showGun() {
 	al = 12;
 	ah = 0;
 	playChannel0();
-	dx = 1211;
+	dx = 1146;
 	loadTempText();
 	rollEndCredits2();
 	getRidOfTempText();
@@ -2327,7 +2327,7 @@ void DreamGenContext::titles() {
 
 void DreamGenContext::endGame() {
 	STACK_CHECK;
-	dx = 1211;
+	dx = 1146;
 	loadTempText();
 	monkSpeaking();
 	gettingShot();
@@ -2342,7 +2342,7 @@ void DreamGenContext::monkSpeaking() {
 	STACK_CHECK;
 	data.byte(kRoomssample) = 35;
 	loadRoomsSample();
-	dx = 1263;
+	dx = 1185;
 	loadIntoTemp();
 	clearWork();
 	showMonk();
@@ -2409,7 +2409,7 @@ void DreamGenContext::gettingShot() {
 void DreamGenContext::bibleQuote() {
 	STACK_CHECK;
 	mode640x480();
-	dx = 1276;
+	dx = 1198;
 	showPCX();
 	fadeScreenUps();
 	cx = 80;
@@ -2448,7 +2448,7 @@ hangonloope:
 
 void DreamGenContext::intro() {
 	STACK_CHECK;
-	dx = 1198;
+	dx = 1133;
 	loadTempText();
 	loadPalFromIFF();
 	setMode();
@@ -2581,7 +2581,7 @@ void DreamGenContext::realCredits() {
 	mode640x480();
 	cx = 35;
 	hangOn();
-	dx = 1289;
+	dx = 1211;
 	showPCX();
 	al = 12;
 	ah = 0;
@@ -2603,7 +2603,7 @@ void DreamGenContext::realCredits() {
 	_cmp(data.byte(kLasthardkey), 1);
 	if (flags.z())
 		goto realcreditsearly;
-	dx = 1302;
+	dx = 1224;
 	showPCX();
 	al = 12;
 	ah = 0;
@@ -2625,7 +2625,7 @@ void DreamGenContext::realCredits() {
 	_cmp(data.byte(kLasthardkey), 1);
 	if (flags.z())
 		goto realcreditsearly;
-	dx = 1315;
+	dx = 1237;
 	showPCX();
 	al = 12;
 	ah = 0;
@@ -2647,7 +2647,7 @@ void DreamGenContext::realCredits() {
 	_cmp(data.byte(kLasthardkey), 1);
 	if (flags.z())
 		goto realcreditsearly;
-	dx = 1328;
+	dx = 1250;
 	showPCX();
 	al = 12;
 	ah = 0;
@@ -2669,7 +2669,7 @@ void DreamGenContext::realCredits() {
 	_cmp(data.byte(kLasthardkey), 1);
 	if (flags.z())
 		goto realcreditsearly;
-	dx = 1341;
+	dx = 1263;
 	showPCX();
 	al = 12;
 	ah = 0;
@@ -2691,7 +2691,7 @@ void DreamGenContext::realCredits() {
 	_cmp(data.byte(kLasthardkey), 1);
 	if (flags.z())
 		goto realcreditsearly;
-	dx = 1354;
+	dx = 1276;
 	showPCX();
 	fadeScreenUps();
 	cx = 60;
@@ -5122,14 +5122,14 @@ void DreamGenContext::getDestInfo() {
 	push(ax);
 	dx = data;
 	es = dx;
-	si = 2016;
+	si = 1938;
 	_add(si, ax);
 	cl = es.byte(si);
 	ax = pop();
 	push(cx);
 	dx = data;
 	es = dx;
-	si = 2032;
+	si = 1954;
 	_add(si, ax);
 	ax = pop();
 }
@@ -5306,23 +5306,23 @@ clearedlocations:
 	bx = ax;
 	dx = data;
 	es = dx;
-	_add(bx, 2016);
+	_add(bx, 1938);
 	es.byte(bx) = 0;
 }
 
 void DreamGenContext::readDestIcon() {
 	STACK_CHECK;
-	dx = 1133;
+	dx = 1081;
 	loadIntoTemp();
-	dx = 1146;
+	dx = 1094;
 	loadIntoTemp2();
-	dx = 1107;
+	dx = 1055;
 	loadIntoTemp3();
 }
 
 void DreamGenContext::readCityPic() {
 	STACK_CHECK;
-	dx = 1120;
+	dx = 1068;
 	loadIntoTemp();
 }
 
@@ -5421,7 +5421,7 @@ void DreamGenContext::delChar() {
 	si = data.word(kCurpos);
 	_add(si, si);
 	es = cs;
-	_add(si, 2050);
+	_add(si, 1972);
 	es.byte(si) = 0;
 	al = es.byte(si+1);
 	ah = 0;
@@ -5448,7 +5448,7 @@ void DreamGenContext::execCommand() {
 	es = cs;
 	bx = offset_comlist;
 	ds = cs;
-	si = 2050;
+	si = 1972;
 	al = ds.byte(si);
 	_cmp(al, 0);
 	if (!flags.z())
@@ -5541,7 +5541,7 @@ dirroot:
 	si = offset_rootdir;
 	_inc(si);
 	es = cs;
-	di = 1705;
+	di = 1627;
 	_inc(di);
 	cx = 12;
 	_movsb(cx, true);
@@ -5643,7 +5643,7 @@ notyetassigned:
 	push(bx);
 	_add(bx, 2);
 	ds = cs;
-	si = 2050;
+	si = 1972;
 checkpass:
 	_lodsw();
 	ah = es.byte(bx);
@@ -5714,7 +5714,7 @@ void DreamGenContext::read() {
 	return;
 okcom:
 	es = cs;
-	di = 1705;
+	di = 1627;
 	ax = data.word(kTextfile1);
 	data.word(kMonsource) = ax;
 	ds = ax;
@@ -5844,7 +5844,7 @@ keyok2:
 	ds = cs;
 	si = offset_operand1+1;
 	es = cs;
-	di = 1705+1;
+	di = 1627+1;
 	cx = 12;
 	_movsb(cx, true);
 	monitorLogo();
@@ -5971,7 +5971,7 @@ void DreamGenContext::parser() {
 	al = '=';
 	_stosb();
 	ds = cs;
-	si = 2050;
+	si = 1972;
 notspace1:
 	_lodsw();
 	_cmp(al, 32);
@@ -8794,7 +8794,7 @@ nowinch:
 
 void DreamGenContext::loadKeypad() {
 	STACK_CHECK;
-	dx = 1094;
+	dx = 1042;
 	loadIntoTemp();
 }
 
@@ -9131,11 +9131,11 @@ void DreamGenContext::dumpSymBox() {
 void DreamGenContext::useDiary() {
 	STACK_CHECK;
 	getRidOfReels();
-	dx = 1159;
+	dx = 1107;
 	loadIntoTemp();
-	dx = 1172;
+	dx = 1120;
 	loadTempText();
-	dx = 1029;
+	dx = 1003;
 	loadTempCharset();
 	createPanel();
 	showIcon();
@@ -9462,7 +9462,7 @@ opsblock1:
 
 void DreamGenContext::loadSaveBox() {
 	STACK_CHECK;
-	dx = 1107;
+	dx = 1055;
 	loadIntoTemp();
 }
 
@@ -9595,7 +9595,7 @@ void DreamGenContext::getNamePos() {
 	_mul(cx);
 	dx = data;
 	es = dx;
-	bx = 2184;
+	bx = 2106;
 	_add(bx, ax);
 	al = data.byte(kCursorpos);
 	ah = 0;
@@ -9749,7 +9749,7 @@ void DreamGenContext::showNames() {
 	STACK_CHECK;
 	dx = data;
 	es = dx;
-	si = 2184+1;
+	si = 2106+1;
 	di = (60)+21;
 	bx = (52)+10;
 	cl = 0;
@@ -10269,7 +10269,7 @@ void DreamGenContext::clearChanges() {
 	di = 0;
 	_stosw(cx, true);
 	es = cs;
-	di = 2016;
+	di = 1938;
 	al = 1;
 	_stosb(2);
 	al = 0;
@@ -11089,139 +11089,139 @@ void DreamGenContext::__start() {
 		//0x03b0: .... .... .... ....
 		0x14, 0x00, 0x00, 0x32, 0x14, 0x00, 0x0b, 0x0b, 0x1e, 0x00, 0x00, 0x32, 0x14, 0x00, 0x0b, 0x16, 
 		//0x03c0: ...2 .... ...2 ....
-		0x14, 0x00, 0x00, 0x32, 0x14, 0x00, 0x0e, 0x21, 0x28, 0x00, 0x00, 0x32, 0x14, 0x00, 0xff, 0x44, 
-		//0x03d0: ...2 ...! (..2 ...D
-		0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x53, 0x30, 0x30, 0x00, 0x49, 0x4e, 0x53, 0x54, 
-		//0x03e0: REAM WEB. S00. INST
-		0x41, 0x4c, 0x4c, 0x2e, 0x44, 0x41, 0x54, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 
-		//0x03f0: ALL. DAT. DREA MWEB
-		0x2e, 0x43, 0x30, 0x30, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x43, 0x30, 
-		//0x0400: .C00 .DRE AMWE B.C0
-		0x32, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x56, 0x30, 0x30, 0x00, 0x44, 
-		//0x0410: 2.DR EAMW EB.V 00.D
-		0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x56, 0x39, 0x39, 0x00, 0x44, 0x52, 0x45, 0x41, 
-		//0x0420: REAM WEB. V99. DREA
-		0x4d, 0x57, 0x45, 0x42, 0x2e, 0x47, 0x30, 0x30, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 
-		//0x0430: MWEB .G00 .DRE AMWE
-		0x42, 0x2e, 0x47, 0x30, 0x31, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x47, 
-		//0x0440: B.G0 1.DR EAMW EB.G
-		0x30, 0x32, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x47, 0x30, 0x38, 0x00, 
-		//0x0450: 02.D REAM WEB. G08.
-		0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x47, 0x30, 0x34, 0x00, 0x44, 0x52, 0x45, 
-		//0x0460: DREA MWEB .G04 .DRE
-		0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x47, 0x30, 0x35, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 
-		//0x0470: AMWE B.G0 5.DR EAMW
-		0x45, 0x42, 0x2e, 0x47, 0x30, 0x36, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 
-		//0x0480: EB.G 06.D REAM WEB.
-		0x47, 0x31, 0x34, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x54, 0x35, 0x31, 
-		//0x0490: G14. DREA MWEB .T51
-		0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x54, 0x38, 0x30, 0x00, 0x44, 0x52, 
-		//0x04a0: .DRE AMWE B.T8 0.DR
-		0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x54, 0x38, 0x32, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 
-		//0x04b0: EAMW EB.T 82.D REAM
-		0x57, 0x45, 0x42, 0x2e, 0x54, 0x38, 0x33, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 
-		//0x04c0: WEB. T83. DREA MWEB
-		0x2e, 0x54, 0x38, 0x34, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x56, 0x4f, 
-		//0x04d0: .T84 .DRE AMWE B.VO
-		0x4c, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x47, 0x31, 0x33, 0x00, 0x44, 
-		//0x04e0: L.DR EAMW EB.G 13.D
-		0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x47, 0x31, 0x35, 0x00, 0x44, 0x52, 0x45, 0x41, 
-		//0x04f0: REAM WEB. G15. DREA
-		0x4d, 0x57, 0x45, 0x42, 0x2e, 0x49, 0x30, 0x30, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 
-		//0x0500: MWEB .I00 .DRE AMWE
-		0x42, 0x2e, 0x49, 0x30, 0x31, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x49, 
-		//0x0510: B.I0 1.DR EAMW EB.I
-		0x30, 0x32, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x49, 0x30, 0x33, 0x00, 
-		//0x0520: 02.D REAM WEB. I03.
-		0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x49, 0x30, 0x34, 0x00, 0x44, 0x52, 0x45, 
-		//0x0530: DREA MWEB .I04 .DRE
-		0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x49, 0x30, 0x35, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 
-		//0x0540: AMWE B.I0 5.DR EAMW
-		0x45, 0x42, 0x2e, 0x49, 0x30, 0x36, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 
-		//0x0550: EB.I 06.D REAM WEB.
-		0x49, 0x30, 0x37, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x50, 0x41, 0x4c, 
-		//0x0560: I07. DREA MWEB .PAL
-		0x00, 0x00, 0x01, 0x11, 0x01, 0x40, 0x01, 0x9d, 0x00, 0xc6, 0x00, 0x7c, 0xc4, 0xf0, 0x00, 0x22, 
-		//0x0570: .... . at .. ...| ..."
-		0x01, 0x02, 0x00, 0x2c, 0x00, 0x94, 0xc4, 0x00, 0x00, 0x40, 0x01, 0x00, 0x00, 0xc8, 0x00, 0xa0, 
-		//0x0580: ..., .... . at .. ....
-		0xca, 0xff, 0xff, 0x11, 0x01, 0x40, 0x01, 0x9d, 0x00, 0xc6, 0x00, 0x7c, 0xc4, 0x00, 0x00, 0x40, 
-		//0x0590: .... . at .. ...| ...@
-		0x01, 0x00, 0x00, 0xc8, 0x00, 0xa0, 0xca, 0xff, 0xff, 0xee, 0x00, 0x02, 0x01, 0x04, 0x00, 0x2c, 
-		//0x05a0: .... .... .... ...,
-		0x00, 0xc8, 0xc4, 0x68, 0x00, 0x7c, 0x00, 0x04, 0x00, 0x2c, 0x00, 0xcc, 0xc4, 0x18, 0x01, 0x34, 
-		//0x05b0: ...h .|.. .,.. ...4
-		0x01, 0x04, 0x00, 0x2c, 0x00, 0xb0, 0xc4, 0x68, 0x00, 0xd8, 0x00, 0x8a, 0x00, 0xc0, 0x00, 0xd0, 
-		//0x05c0: ..., ...h .... ....
-		0xc4, 0x11, 0x01, 0x40, 0x01, 0x9d, 0x00, 0xc6, 0x00, 0x7c, 0xc4, 0x00, 0x00, 0x40, 0x01, 0x00, 
-		//0x05d0: ...@ .... .|.. . at ..
-		0x00, 0xc8, 0x00, 0xa0, 0xca, 0xff, 0xff, 0x45, 0x58, 0x49, 0x54, 0x20, 0x20, 0x20, 0x20, 0x20, 
-		//0x05e0: .... ...E XIT      
-		0x20, 0x48, 0x45, 0x4c, 0x50, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x4c, 0x49, 0x53, 0x54, 0x20, 
-		//0x05f0:  HEL P       L IST 
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x52, 0x45, 0x41, 0x44, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x4c, 
-		//0x0600:       REA D       L
-		0x4f, 0x47, 0x4f, 0x4e, 0x20, 0x20, 0x20, 0x20, 0x20, 0x4b, 0x45, 0x59, 0x53, 0x20, 0x20, 0x20, 
-		//0x0610: OGON       KEY S   
-		0x20, 0x20, 0x20, 0x01, 0x00, 0x50, 0x55, 0x42, 0x4c, 0x49, 0x43, 0x20, 0x20, 0x20, 0x20, 0x20, 
-		//0x0620:    . .PUB LIC      
-		0x20, 0x50, 0x55, 0x42, 0x4c, 0x49, 0x43, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0x42, 
-		//0x0630:  PUB LIC       ...B
-		0x4c, 0x41, 0x43, 0x4b, 0x44, 0x52, 0x41, 0x47, 0x4f, 0x4e, 0x20, 0x52, 0x59, 0x41, 0x4e, 0x20, 
-		//0x0640: LACK DRAG ON R YAN 
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0x48, 0x45, 0x4e, 0x44, 0x52, 0x49, 0x58, 
-		//0x0650:        .. .HEN DRIX
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x4c, 0x4f, 0x55, 0x49, 0x53, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
-		//0x0660:       LOU IS       
-		0x00, 0x00, 0x00, 0x53, 0x45, 0x50, 0x54, 0x49, 0x4d, 0x55, 0x53, 0x20, 0x20, 0x20, 0x20, 0x42, 
-		//0x0670: ...S EPTI MUS     B
-		0x45, 0x43, 0x4b, 0x45, 0x54, 0x54, 0x20, 0x20, 0x20, 0x20, 0x00, 0xff, 0xff, 0x20, 0x20, 0x20, 
-		//0x0680: ECKE TT     .. .   
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x22, 0x52, 0x4f, 0x4f, 0x54, 
-		//0x0690:             ." ROOT
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x22, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
-		//0x06a0:           ."       
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x30, 0x30, 0x30, 0x30, 0x00, 0x30, 0x30, 0x00, 0xba, 
-		//0x06b0:        .0 000. 00..
-		0x00, 0xca, 0x00, 0x9d, 0x00, 0xad, 0x00, 0x1c, 0xc8, 0xf3, 0x00, 0x03, 0x01, 0x83, 0x00, 0x93, 
-		//0x06c0: .... .... .... ....
-		0x00, 0x18, 0xc8, 0x0c, 0x01, 0x1c, 0x01, 0xa8, 0x00, 0xb8, 0x00, 0x50, 0xc7, 0x00, 0x00, 0x40, 
-		//0x06d0: .... .... ...P ...@
-		0x01, 0x00, 0x00, 0xc8, 0x00, 0xa0, 0xca, 0xff, 0xff, 0x77, 0x00, 0xae, 0x00, 0x52, 0x00, 0x80, 
-		//0x06e0: .... .... .w.. .R..
-		0x00, 0x34, 0xc8, 0x46, 0x00, 0x89, 0x00, 0x3e, 0x00, 0x6f, 0x00, 0x80, 0xc8, 0xbc, 0x00, 0xfa, 
-		//0x06f0: .4.F ...> .o.. ....
-		0x00, 0x44, 0x00, 0x98, 0x00, 0x4c, 0xc8, 0x00, 0x00, 0x40, 0x01, 0x00, 0x00, 0xc8, 0x00, 0xa0, 
-		//0x0700: .D.. .L.. . at .. ....
-		0xca, 0xff, 0xff, 0x77, 0x00, 0xae, 0x00, 0x52, 0x00, 0x80, 0x00, 0x44, 0xc8, 0x46, 0x00, 0x8b, 
-		//0x0710: ...w ...R ...D .F..
-		0x00, 0x3e, 0x00, 0x6f, 0x00, 0x50, 0xc8, 0xec, 0x00, 0xfc, 0x00, 0x70, 0x00, 0x80, 0x00, 0x48, 
-		//0x0720: .>.o .P.. ...p ...H
-		0xc8, 0x00, 0x00, 0x40, 0x01, 0x00, 0x00, 0xc8, 0x00, 0xa0, 0xca, 0xff, 0xff, 0x0d, 0x0a, 0x0d, 
-		//0x0730: ...@ .... .... ....
-		0x0a, 0x24, 0x81, 0x00, 0xb8, 0x00, 0x52, 0x00, 0x80, 0x00, 0xc0, 0xc8, 0x50, 0x00, 0x93, 0x00, 
-		//0x0740: .$.. ..R. .... P...
-		0x3e, 0x00, 0x6f, 0x00, 0x80, 0xc8, 0xb7, 0x00, 0xfa, 0x00, 0x3e, 0x00, 0x6f, 0x00, 0xc4, 0xc8, 
-		//0x0750: >.o. .... ..>. o...
-		0x00, 0x00, 0x40, 0x01, 0x00, 0x00, 0xc8, 0x00, 0xa0, 0xca, 0xff, 0xff, 0x53, 0x50, 0x45, 0x45, 
-		//0x0760: .. at . .... .... SPEE
-		0x43, 0x48, 0x52, 0x32, 0x34, 0x43, 0x30, 0x30, 0x30, 0x35, 0x2e, 0x52, 0x41, 0x57, 0x00, 0x4f, 
-		//0x0770: CHR2 4C00 05.R AW.O
-		0x42, 0x4a, 0x45, 0x43, 0x54, 0x20, 0x4e, 0x41, 0x4d, 0x45, 0x20, 0x4f, 0x4e, 0x45, 0x20, 0x20, 
-		//0x0780: BJEC T NA ME O NE  
+		0x14, 0x00, 0x00, 0x32, 0x14, 0x00, 0x0e, 0x21, 0x28, 0x00, 0x00, 0x32, 0x14, 0x00, 0xff, 0x49, 
+		//0x03d0: ...2 ...! (..2 ...I
+		0x4e, 0x53, 0x54, 0x41, 0x4c, 0x4c, 0x2e, 0x44, 0x41, 0x54, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 
+		//0x03e0: NSTA LL.D AT.D REAM
+		0x57, 0x45, 0x42, 0x2e, 0x43, 0x30, 0x32, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 
+		//0x03f0: WEB. C02. DREA MWEB
+		0x2e, 0x56, 0x30, 0x30, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x56, 0x39, 
+		//0x0400: .V00 .DRE AMWE B.V9
+		0x39, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x47, 0x30, 0x32, 0x00, 0x44, 
+		//0x0410: 9.DR EAMW EB.G 02.D
+		0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x47, 0x30, 0x38, 0x00, 0x44, 0x52, 0x45, 0x41, 
+		//0x0420: REAM WEB. G08. DREA
+		0x4d, 0x57, 0x45, 0x42, 0x2e, 0x47, 0x30, 0x34, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 
+		//0x0430: MWEB .G04 .DRE AMWE
+		0x42, 0x2e, 0x47, 0x30, 0x35, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x47, 
+		//0x0440: B.G0 5.DR EAMW EB.G
+		0x30, 0x36, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x47, 0x31, 0x34, 0x00, 
+		//0x0450: 06.D REAM WEB. G14.
+		0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x54, 0x35, 0x31, 0x00, 0x44, 0x52, 0x45, 
+		//0x0460: DREA MWEB .T51 .DRE
+		0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x54, 0x38, 0x32, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 
+		//0x0470: AMWE B.T8 2.DR EAMW
+		0x45, 0x42, 0x2e, 0x54, 0x38, 0x33, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 
+		//0x0480: EB.T 83.D REAM WEB.
+		0x56, 0x4f, 0x4c, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x47, 0x31, 0x33, 
+		//0x0490: VOL. DREA MWEB .G13
+		0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x47, 0x31, 0x35, 0x00, 0x44, 0x52, 
+		//0x04a0: .DRE AMWE B.G1 5.DR
+		0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x49, 0x30, 0x30, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 
+		//0x04b0: EAMW EB.I 00.D REAM
+		0x57, 0x45, 0x42, 0x2e, 0x49, 0x30, 0x31, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 
+		//0x04c0: WEB. I01. DREA MWEB
+		0x2e, 0x49, 0x30, 0x32, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x49, 0x30, 
+		//0x04d0: .I02 .DRE AMWE B.I0
+		0x33, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x49, 0x30, 0x34, 0x00, 0x44, 
+		//0x04e0: 3.DR EAMW EB.I 04.D
+		0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x49, 0x30, 0x35, 0x00, 0x44, 0x52, 0x45, 0x41, 
+		//0x04f0: REAM WEB. I05. DREA
+		0x4d, 0x57, 0x45, 0x42, 0x2e, 0x49, 0x30, 0x36, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 
+		//0x0500: MWEB .I06 .DRE AMWE
+		0x42, 0x2e, 0x49, 0x30, 0x37, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x50, 
+		//0x0510: B.I0 7.DR EAMW EB.P
+		0x41, 0x4c, 0x00, 0x00, 0x01, 0x11, 0x01, 0x40, 0x01, 0x9d, 0x00, 0xc6, 0x00, 0x7c, 0xc4, 0xf0, 
+		//0x0520: AL.. ...@ .... .|..
+		0x00, 0x22, 0x01, 0x02, 0x00, 0x2c, 0x00, 0x94, 0xc4, 0x00, 0x00, 0x40, 0x01, 0x00, 0x00, 0xc8, 
+		//0x0530: .".. .,.. ...@ ....
+		0x00, 0xa0, 0xca, 0xff, 0xff, 0x11, 0x01, 0x40, 0x01, 0x9d, 0x00, 0xc6, 0x00, 0x7c, 0xc4, 0x00, 
+		//0x0540: .... ...@ .... .|..
+		0x00, 0x40, 0x01, 0x00, 0x00, 0xc8, 0x00, 0xa0, 0xca, 0xff, 0xff, 0xee, 0x00, 0x02, 0x01, 0x04, 
+		//0x0550: . at .. .... .... ....
+		0x00, 0x2c, 0x00, 0xc8, 0xc4, 0x68, 0x00, 0x7c, 0x00, 0x04, 0x00, 0x2c, 0x00, 0xcc, 0xc4, 0x18, 
+		//0x0560: .,.. .h.| ..., ....
+		0x01, 0x34, 0x01, 0x04, 0x00, 0x2c, 0x00, 0xb0, 0xc4, 0x68, 0x00, 0xd8, 0x00, 0x8a, 0x00, 0xc0, 
+		//0x0570: .4.. .,.. .h.. ....
+		0x00, 0xd0, 0xc4, 0x11, 0x01, 0x40, 0x01, 0x9d, 0x00, 0xc6, 0x00, 0x7c, 0xc4, 0x00, 0x00, 0x40, 
+		//0x0580: .... . at .. ...| ...@
+		0x01, 0x00, 0x00, 0xc8, 0x00, 0xa0, 0xca, 0xff, 0xff, 0x45, 0x58, 0x49, 0x54, 0x20, 0x20, 0x20, 
+		//0x0590: .... .... .EXI T   
+		0x20, 0x20, 0x20, 0x48, 0x45, 0x4c, 0x50, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x4c, 0x49, 0x53, 
+		//0x05a0:    H ELP        LIS
+		0x54, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x52, 0x45, 0x41, 0x44, 0x20, 0x20, 0x20, 0x20, 0x20, 
+		//0x05b0: T       R EAD      
+		0x20, 0x4c, 0x4f, 0x47, 0x4f, 0x4e, 0x20, 0x20, 0x20, 0x20, 0x20, 0x4b, 0x45, 0x59, 0x53, 0x20, 
+		//0x05c0:  LOG ON      K EYS 
+		0x20, 0x20, 0x20, 0x20, 0x20, 0x01, 0x00, 0x50, 0x55, 0x42, 0x4c, 0x49, 0x43, 0x20, 0x20, 0x20, 
+		//0x05d0:       ..P UBLI C   
+		0x20, 0x20, 0x20, 0x50, 0x55, 0x42, 0x4c, 0x49, 0x43, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 
+		//0x05e0:    P UBLI C      ..
+		0x00, 0x42, 0x4c, 0x41, 0x43, 0x4b, 0x44, 0x52, 0x41, 0x47, 0x4f, 0x4e, 0x20, 0x52, 0x59, 0x41, 
+		//0x05f0: .BLA CKDR AGON  RYA
+		0x4e, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0x48, 0x45, 0x4e, 0x44, 0x52, 
+		//0x0600: N         ...H ENDR
+		0x49, 0x58, 0x20, 0x20, 0x20, 0x20, 0x20, 0x4c, 0x4f, 0x55, 0x49, 0x53, 0x20, 0x20, 0x20, 0x20, 
+		//0x0610: IX      L OUIS     
+		0x20, 0x20, 0x00, 0x00, 0x00, 0x53, 0x45, 0x50, 0x54, 0x49, 0x4d, 0x55, 0x53, 0x20, 0x20, 0x20, 
+		//0x0620:   .. .SEP TIMU S   
+		0x20, 0x42, 0x45, 0x43, 0x4b, 0x45, 0x54, 0x54, 0x20, 0x20, 0x20, 0x20, 0x00, 0xff, 0xff, 0x20, 
+		//0x0630:  BEC KETT      ... 
+		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x22, 0x52, 0x4f, 
+		//0x0640:                ."RO
+		0x4f, 0x54, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x22, 0x20, 0x20, 0x20, 0x20, 
+		//0x0650: OT          ."     
+		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x30, 0x30, 0x30, 0x30, 0x00, 0x30, 0x30, 
+		//0x0660:           .000 0.00
+		0x00, 0xba, 0x00, 0xca, 0x00, 0x9d, 0x00, 0xad, 0x00, 0x1c, 0xc8, 0xf3, 0x00, 0x03, 0x01, 0x83, 
+		//0x0670: .... .... .... ....
+		0x00, 0x93, 0x00, 0x18, 0xc8, 0x0c, 0x01, 0x1c, 0x01, 0xa8, 0x00, 0xb8, 0x00, 0x50, 0xc7, 0x00, 
+		//0x0680: .... .... .... .P..
+		0x00, 0x40, 0x01, 0x00, 0x00, 0xc8, 0x00, 0xa0, 0xca, 0xff, 0xff, 0x77, 0x00, 0xae, 0x00, 0x52, 
+		//0x0690: . at .. .... ...w ...R
+		0x00, 0x80, 0x00, 0x34, 0xc8, 0x46, 0x00, 0x89, 0x00, 0x3e, 0x00, 0x6f, 0x00, 0x80, 0xc8, 0xbc, 
+		//0x06a0: ...4 .F.. .>.o ....
+		0x00, 0xfa, 0x00, 0x44, 0x00, 0x98, 0x00, 0x4c, 0xc8, 0x00, 0x00, 0x40, 0x01, 0x00, 0x00, 0xc8, 
+		//0x06b0: ...D ...L ...@ ....
+		0x00, 0xa0, 0xca, 0xff, 0xff, 0x77, 0x00, 0xae, 0x00, 0x52, 0x00, 0x80, 0x00, 0x44, 0xc8, 0x46, 
+		//0x06c0: .... .w.. .R.. .D.F
+		0x00, 0x8b, 0x00, 0x3e, 0x00, 0x6f, 0x00, 0x50, 0xc8, 0xec, 0x00, 0xfc, 0x00, 0x70, 0x00, 0x80, 
+		//0x06d0: ...> .o.P .... .p..
+		0x00, 0x48, 0xc8, 0x00, 0x00, 0x40, 0x01, 0x00, 0x00, 0xc8, 0x00, 0xa0, 0xca, 0xff, 0xff, 0x0d, 
+		//0x06e0: .H.. . at .. .... ....
+		0x0a, 0x0d, 0x0a, 0x24, 0x81, 0x00, 0xb8, 0x00, 0x52, 0x00, 0x80, 0x00, 0xc0, 0xc8, 0x50, 0x00, 
+		//0x06f0: ...$ .... R... ..P.
+		0x93, 0x00, 0x3e, 0x00, 0x6f, 0x00, 0x80, 0xc8, 0xb7, 0x00, 0xfa, 0x00, 0x3e, 0x00, 0x6f, 0x00, 
+		//0x0700: ..>. o... .... >.o.
+		0xc4, 0xc8, 0x00, 0x00, 0x40, 0x01, 0x00, 0x00, 0xc8, 0x00, 0xa0, 0xca, 0xff, 0xff, 0x53, 0x50, 
+		//0x0710: .... @... .... ..SP
+		0x45, 0x45, 0x43, 0x48, 0x52, 0x32, 0x34, 0x43, 0x30, 0x30, 0x30, 0x35, 0x2e, 0x52, 0x41, 0x57, 
+		//0x0720: EECH R24C 0005 .RAW
+		0x00, 0x4f, 0x42, 0x4a, 0x45, 0x43, 0x54, 0x20, 0x4e, 0x41, 0x4d, 0x45, 0x20, 0x4f, 0x4e, 0x45, 
+		//0x0730: .OBJ ECT  NAME  ONE
 		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
-		//0x0790:                    
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x10, 0x12, 0x12, 0x11, 0x10, 0x10, 0x10, 0x01, 
-		//0x07a0:         . .... ....
-		0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
+		//0x0740:                    
+		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x10, 0x12, 0x12, 0x11, 0x10, 0x10, 
+		//0x0750:            ... ....
+		0x10, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
+		//0x0760: .... .... .... ....
+		0x02, 0x02, 0x44, 0x3a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+		//0x0770: ..D: .... .... ....
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+		//0x0780: .... .... .... ....
+		0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+		//0x0790: .... .... .... ....
+		0x00, 0x00, 0x05, 0x00, 0x03, 0x02, 0x04, 0x01, 0x0a, 0x09, 0x08, 0x06, 0x0b, 0x04, 0x07, 0x07, 
+		//0x07a0: .... .... .... ....
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x07b0: .... .... .... ....
-		0x44, 0x3a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x07c0: D:.. .... .... ....
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+		//0x07c0: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x07d0: .... .... .... ....
-		0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x07e0: .... .... .... ....
-		0x05, 0x00, 0x03, 0x02, 0x04, 0x01, 0x0a, 0x09, 0x08, 0x06, 0x0b, 0x04, 0x07, 0x07, 0x00, 0x00, 
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x07f0: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0800: .... .... .... ....
@@ -11229,43 +11229,33 @@ void DreamGenContext::__start() {
 		//0x0810: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0820: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+		0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 
 		//0x0830: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+		0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x00, 0x01, 0x01, 0x01, 
 		//0x0840: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+		0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x00, 0x01, 0x01, 
 		//0x0850: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+		0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x00, 0x01, 
 		//0x0860: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+		0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x00, 
 		//0x0870: .... .... .... ....
-		0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
+		0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 
 		//0x0880: .... .... .... ....
-		0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 
+		0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
 		//0x0890: .... .... .... ....
-		0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 
+		0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
 		//0x08a0: .... .... .... ....
-		0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x00, 0x01, 0x01, 0x01, 
-		//0x08b0: .... .... .... ....
-		0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x00, 0x01, 0x01, 
-		//0x08c0: .... .... .... ....
-		0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x00, 0x01, 
-		//0x08d0: .... .... .... ....
-		0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x00, 
-		//0x08e0: .... .... .... ....
-		0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x44, 
-		//0x08f0: .... .... .... ...D
-		0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x44, 0x30, 0x30, 0x00, 0x44, 0x52, 0x45, 0x41, 
-		//0x0900: REAM WEB. D00. DREA
-		0x4d, 0x57, 0x45, 0x42, 0x2e, 0x44, 0x30, 0x31, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 
-		//0x0910: MWEB .D01 .DRE AMWE
-		0x42, 0x2e, 0x44, 0x30, 0x32, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x44, 
-		//0x0920: B.D0 2.DR EAMW EB.D
-		0x30, 0x33, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x44, 0x30, 0x34, 0x00, 
-		//0x0930: 03.D REAM WEB. D04.
-		0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x44, 0x30, 0x35, 0x00, 0x44, 0x52, 0x45, 
-		//0x0940: DREA MWEB .D05 .DRE
-		0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x44, 0x30, 0x36, 0x00, 0x00, 0x00, 0x00, };
+		0x01, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x44, 0x30, 0x30, 0x00, 0x44, 0x52, 
+		//0x08b0: .DRE AMWE B.D0 0.DR
+		0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x44, 0x30, 0x31, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 
+		//0x08c0: EAMW EB.D 01.D REAM
+		0x57, 0x45, 0x42, 0x2e, 0x44, 0x30, 0x32, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 
+		//0x08d0: WEB. D02. DREA MWEB
+		0x2e, 0x44, 0x30, 0x33, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x44, 0x30, 
+		//0x08e0: .D03 .DRE AMWE B.D0
+		0x34, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x44, 0x30, 0x35, 0x00, 0x44, 
+		//0x08f0: 4.DR EAMW EB.D 05.D
+		0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x44, 0x30, 0x36, 0x00, 0x00, 0x00, 0x00, };
 	ds.assign(src, src + sizeof(src));
 	dreamweb(); 
 }
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 9117c93..a157831 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -36,23 +36,23 @@ public:
 	void __start();
 #include "stubs.h" // Allow hand-reversed functions to have a signature different than void f()
 
-	static const uint16 offset_commandline = 0x077f;
-	static const uint16 offset_money2poke = 0x06bc;
-	static const uint16 offset_keys = 0x0623;
-	static const uint16 offset_money1poke = 0x06b7;
-	static const uint16 offset_diarylist = 0x06bf;
-	static const uint16 offset_decidelist = 0x0742;
-	static const uint16 offset_operand1 = 0x068d;
-	static const uint16 offset_rootdir = 0x069b;
-	static const uint16 offset_opslist = 0x06e9;
-	static const uint16 offset_discopslist = 0x0713;
-	static const uint16 offset_comlist = 0x05e7;
-	static const uint16 offset_quitlist = 0x0593;
-	static const uint16 offset_speechfilename = 0x076c;
-	static const uint16 offset_talklist = 0x0573;
-	static const uint16 offset_openchangesize = 0x0571;
-	static const uint16 offset_destlist = 0x05a9;
-	static const uint16 offset_speechfile = 0x0772;
+	static const uint16 offset_diarylist = 0x0671;
+	static const uint16 offset_discopslist = 0x06c5;
+	static const uint16 offset_money2poke = 0x066e;
+	static const uint16 offset_quitlist = 0x0545;
+	static const uint16 offset_commandline = 0x0731;
+	static const uint16 offset_keys = 0x05d5;
+	static const uint16 offset_rootdir = 0x064d;
+	static const uint16 offset_money1poke = 0x0669;
+	static const uint16 offset_comlist = 0x0599;
+	static const uint16 offset_opslist = 0x069b;
+	static const uint16 offset_destlist = 0x055b;
+	static const uint16 offset_speechfilename = 0x071e;
+	static const uint16 offset_openchangesize = 0x0523;
+	static const uint16 offset_operand1 = 0x063f;
+	static const uint16 offset_decidelist = 0x06f4;
+	static const uint16 offset_talklist = 0x0525;
+	static const uint16 offset_speechfile = 0x0724;
 	static const uint16 kStartvars = 0;
 	static const uint16 kProgresspoints = 1;
 	static const uint16 kWatchon = 2;
@@ -431,48 +431,42 @@ public:
 	static const uint16 kGameerror = 531;
 	static const uint16 kHowmuchalloc = 532;
 	static const uint16 kReelroutines = 534;
-	static const uint16 kSpritename1 = 991;
-	static const uint16 kIdname = 1004;
-	static const uint16 kCharacterset1 = 1016;
-	static const uint16 kCharacterset3 = 1029;
-	static const uint16 kSamplename = 1042;
-	static const uint16 kBasicsample = 1055;
-	static const uint16 kIcongraphics0 = 1068;
-	static const uint16 kIcongraphics1 = 1081;
-	static const uint16 kExtragraphics1 = 1094;
-	static const uint16 kIcongraphics8 = 1107;
-	static const uint16 kCityname = 1120;
-	static const uint16 kTravelgraphic1 = 1133;
-	static const uint16 kTravelgraphic2 = 1146;
-	static const uint16 kDiarygraphic = 1159;
-	static const uint16 kDiarytext = 1172;
-	static const uint16 kPuzzletextname = 1185;
-	static const uint16 kIntrotextname = 1198;
-	static const uint16 kEndtextname = 1211;
-	static const uint16 kCommandtextname = 1224;
-	static const uint16 kVolumetabname = 1237;
-	static const uint16 kGungraphic = 1250;
-	static const uint16 kMonkface = 1263;
-	static const uint16 kTitle0graphics = 1276;
-	static const uint16 kTitle1graphics = 1289;
-	static const uint16 kTitle2graphics = 1302;
-	static const uint16 kTitle3graphics = 1315;
-	static const uint16 kTitle4graphics = 1328;
-	static const uint16 kTitle5graphics = 1341;
-	static const uint16 kTitle6graphics = 1354;
-	static const uint16 kTitle7graphics = 1367;
-	static const uint16 kPalettescreen = 1380;
-	static const uint16 kCurrentfile = 1705;
-	static const uint16 kRoomscango = 2016;
-	static const uint16 kRoompics = 2032;
-	static const uint16 kOplist = 2047;
-	static const uint16 kInputline = 2050;
-	static const uint16 kPresslist = 2178;
-	static const uint16 kSavenames = 2184;
-	static const uint16 kSavefiles = 2303;
-	static const uint16 kQuitrequested = 2394;
-	static const uint16 kSubtitles = 2395;
-	static const uint16 kForeignrelease = 2396;
+	static const uint16 kIdname = 991;
+	static const uint16 kCharacterset3 = 1003;
+	static const uint16 kSamplename = 1016;
+	static const uint16 kBasicsample = 1029;
+	static const uint16 kExtragraphics1 = 1042;
+	static const uint16 kIcongraphics8 = 1055;
+	static const uint16 kCityname = 1068;
+	static const uint16 kTravelgraphic1 = 1081;
+	static const uint16 kTravelgraphic2 = 1094;
+	static const uint16 kDiarygraphic = 1107;
+	static const uint16 kDiarytext = 1120;
+	static const uint16 kIntrotextname = 1133;
+	static const uint16 kEndtextname = 1146;
+	static const uint16 kVolumetabname = 1159;
+	static const uint16 kGungraphic = 1172;
+	static const uint16 kMonkface = 1185;
+	static const uint16 kTitle0graphics = 1198;
+	static const uint16 kTitle1graphics = 1211;
+	static const uint16 kTitle2graphics = 1224;
+	static const uint16 kTitle3graphics = 1237;
+	static const uint16 kTitle4graphics = 1250;
+	static const uint16 kTitle5graphics = 1263;
+	static const uint16 kTitle6graphics = 1276;
+	static const uint16 kTitle7graphics = 1289;
+	static const uint16 kPalettescreen = 1302;
+	static const uint16 kCurrentfile = 1627;
+	static const uint16 kRoomscango = 1938;
+	static const uint16 kRoompics = 1954;
+	static const uint16 kOplist = 1969;
+	static const uint16 kInputline = 1972;
+	static const uint16 kPresslist = 2100;
+	static const uint16 kSavenames = 2106;
+	static const uint16 kSavefiles = 2225;
+	static const uint16 kQuitrequested = 2316;
+	static const uint16 kSubtitles = 2317;
+	static const uint16 kForeignrelease = 2318;
 	static const uint16 kBlocktextdat = (0);
 	static const uint16 kPersonframes = (0);
 	static const uint16 kDebuglevel1 = (0);
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 754d4af..25a40cb 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -2455,12 +2455,12 @@ void DreamGenContext::loadRoomsSample() {
 }
 
 void DreamGenContext::readSetData() {
-	data.word(kCharset1) = standardLoad((const char *)cs.ptr(kCharacterset1, 0));
-	data.word(kIcons1) = standardLoad((const char *)cs.ptr(kIcongraphics0, 0));
-	data.word(kIcons2) = standardLoad((const char *)cs.ptr(kIcongraphics1, 0));
-	data.word(kMainsprites) = standardLoad((const char *)cs.ptr(kSpritename1, 0));
-	data.word(kPuzzletext) = standardLoad((const char *)cs.ptr(kPuzzletextname, 0));
-	data.word(kCommandtext) = standardLoad((const char *)cs.ptr(kCommandtextname, 0));
+	data.word(kCharset1) = standardLoad("DREAMWEB.C00");
+	data.word(kIcons1) = standardLoad("DREAMWEB.G00");
+	data.word(kIcons2) = standardLoad("DREAMWEB.G01");
+	data.word(kMainsprites) = standardLoad("DREAMWEB.S00");
+	data.word(kPuzzletext) = standardLoad("DREAMWEB.T80");
+	data.word(kCommandtext) = standardLoad("DREAMWEB.T84");
 	ax = data.word(kCharset1);
 	data.word(kCurrentset) = ax;
 	if (data.byte(kSoundint) == 0xff)






More information about the Scummvm-git-logs mailing list