[Scummvm-cvs-logs] scummvm master -> 4aca1957125fafd8726ee0a6c19abbc23b7abc5d
wjp
wjp at usecode.org
Sat Dec 3 21:17:40 CET 2011
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
edd26e7b56 DREAMWEB: Move 'loadpersonal', 'loadnews', 'loadcart' out of dreamgen
5b3f8fab27 DREAMWEB: Convert 'loadpersonal', 'loadnews', 'loadcart'
4aca195712 DREAMWEB: Clean up last remaining kFileheader/kFiledata usage
Commit: edd26e7b560b31c00635f54f64b63d05b45074ae
https://github.com/scummvm/scummvm/commit/edd26e7b560b31c00635f54f64b63d05b45074ae
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2011-12-03T11:47:12-08:00
Commit Message:
DREAMWEB: Move 'loadpersonal', 'loadnews', 'loadcart' out of dreamgen
Changed paths:
devtools/tasmrecover/tasm-recover
engines/dreamweb/dreamgen.cpp
engines/dreamweb/dreamgen.h
engines/dreamweb/monitor.cpp
engines/dreamweb/stubs.h
diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index 0896f05..3235df7 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -256,14 +256,17 @@ generator = cpp(context, "DreamGen", blacklist = [
'kernchars',
'lastfolder',
'liftsprite',
+ 'loadcart',
'loadfolder',
'loadgame',
'loadintotemp',
'loadintotemp2',
'loadintotemp3',
'loadmenu',
+ 'loadnews',
'loadold',
'loadpalfromiff',
+ 'loadpersonal',
'loadposition',
'loadroom',
'loadroomssample',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 7a66a05..117f676 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -5505,104 +5505,6 @@ void DreamGenContext::printOuterMon() {
showFrame();
}
-void DreamGenContext::loadPersonal() {
- STACK_CHECK;
- al = data.byte(kLocation);
- dx = 1669;
- _cmp(al, 0);
- if (flags.z())
- goto foundpersonal;
- _cmp(al, 42);
- if (flags.z())
- goto foundpersonal;
- dx = 1682;
- _cmp(al, 2);
- if (flags.z())
- goto foundpersonal;
-foundpersonal:
- openFile();
- readHeader();
- bx = es.word(di);
- push(bx);
- cl = 4;
- _shr(bx, cl);
- allocateMem();
- data.word(kTextfile1) = ax;
- ds = ax;
- cx = pop();
- dx = 0;
- readFromFile();
- closeFile();
-}
-
-void DreamGenContext::loadNews() {
- STACK_CHECK;
- al = data.byte(kNewsitem);
- dx = 1695;
- _cmp(al, 0);
- if (flags.z())
- goto foundnews;
- dx = 1708;
- _cmp(al, 1);
- if (flags.z())
- goto foundnews;
- dx = 1721;
- _cmp(al, 2);
- if (flags.z())
- goto foundnews;
- dx = 1734;
-foundnews:
- openFile();
- readHeader();
- bx = es.word(di);
- push(bx);
- cl = 4;
- _shr(bx, cl);
- allocateMem();
- data.word(kTextfile2) = ax;
- ds = ax;
- cx = pop();
- dx = 0;
- readFromFile();
- closeFile();
-}
-
-void DreamGenContext::loadCart() {
- STACK_CHECK;
- lookInInterface();
- dx = 1747;
- _cmp(al, 0);
- if (flags.z())
- goto gotcart;
- dx = 1760;
- _cmp(al, 1);
- if (flags.z())
- goto gotcart;
- dx = 1773;
- _cmp(al, 2);
- if (flags.z())
- goto gotcart;
- dx = 1786;
- _cmp(al, 3);
- if (flags.z())
- goto gotcart;
- dx = 1799;
-gotcart:
- openFile();
- readHeader();
- bx = es.word(di);
- push(bx);
- cl = 4;
- _shr(bx, cl);
- allocateMem();
- data.word(kTextfile3) = ax;
- ds = ax;
- cx = pop();
- dx = 0;
- readFromFile();
- closeFile();
-}
-
void DreamGenContext::lookInInterface() {
STACK_CHECK;
al = 'I';
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 01a1bd6..592c0fe 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -671,7 +671,6 @@ public:
void mouseCall();
void train();
void fadeDownMon();
- void loadCart();
void bartender();
void showDiary();
void sLabDoorF();
@@ -806,7 +805,6 @@ public:
void setKeyboardInt();
void priest();
void printmessage2();
- void loadNews();
void wearShades();
void hangOnPQ();
void findOpenPos();
@@ -905,7 +903,6 @@ public:
void fadeScreenUps();
void hotelControl();
void mugger();
- void loadPersonal();
void gettingShot();
void setTopLeft();
void searchForString();
diff --git a/engines/dreamweb/monitor.cpp b/engines/dreamweb/monitor.cpp
index 405cb11..c1b2259 100644
--- a/engines/dreamweb/monitor.cpp
+++ b/engines/dreamweb/monitor.cpp
@@ -265,6 +265,103 @@ void DreamGenContext::turnOnPower() {
powerLightOn();
}
+void DreamGenContext::loadPersonal() {
+ STACK_CHECK;
+ al = data.byte(kLocation);
+ dx = 1669;
+ _cmp(al, 0);
+ if (flags.z())
+ goto foundpersonal;
+ _cmp(al, 42);
+ if (flags.z())
+ goto foundpersonal;
+ dx = 1682;
+ _cmp(al, 2);
+ if (flags.z())
+ goto foundpersonal;
+foundpersonal:
+ openFile();
+ readHeader();
+ bx = es.word(di);
+ push(bx);
+ cl = 4;
+ _shr(bx, cl);
+ allocateMem();
+ data.word(kTextfile1) = ax;
+ ds = ax;
+ cx = pop();
+ dx = 0;
+ readFromFile();
+ closeFile();
+}
+
+void DreamGenContext::loadNews() {
+ STACK_CHECK;
+ al = data.byte(kNewsitem);
+ dx = 1695;
+ _cmp(al, 0);
+ if (flags.z())
+ goto foundnews;
+ dx = 1708;
+ _cmp(al, 1);
+ if (flags.z())
+ goto foundnews;
+ dx = 1721;
+ _cmp(al, 2);
+ if (flags.z())
+ goto foundnews;
+ dx = 1734;
+foundnews:
+ openFile();
+ readHeader();
+ bx = es.word(di);
+ push(bx);
+ cl = 4;
+ _shr(bx, cl);
+ allocateMem();
+ data.word(kTextfile2) = ax;
+ ds = ax;
+ cx = pop();
+ dx = 0;
+ readFromFile();
+ closeFile();
+}
+
+void DreamGenContext::loadCart() {
+ STACK_CHECK;
+ lookInInterface();
+ dx = 1747;
+ _cmp(al, 0);
+ if (flags.z())
+ goto gotcart;
+ dx = 1760;
+ _cmp(al, 1);
+ if (flags.z())
+ goto gotcart;
+ dx = 1773;
+ _cmp(al, 2);
+ if (flags.z())
+ goto gotcart;
+ dx = 1786;
+ _cmp(al, 3);
+ if (flags.z())
+ goto gotcart;
+ dx = 1799;
+gotcart:
+ openFile();
+ readHeader();
+ bx = es.word(di);
+ push(bx);
+ cl = 4;
+ _shr(bx, cl);
+ allocateMem();
+ data.word(kTextfile3) = ax;
+ ds = ax;
+ cx = pop();
+ dx = 0;
+ readFromFile();
+ closeFile();
+}
} /*namespace dreamgen */
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 967c1f1..d600c42 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -426,4 +426,7 @@
void zoomOnOff();
void doShake();
void atmospheres();
+ void loadPersonal();
+ void loadNews();
+ void loadCart();
Commit: 5b3f8fab275f8ac59acba488a2e90d678389ad1c
https://github.com/scummvm/scummvm/commit/5b3f8fab275f8ac59acba488a2e90d678389ad1c
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2011-12-03T12:00:15-08:00
Commit Message:
DREAMWEB: Convert 'loadpersonal', 'loadnews', 'loadcart'
Changed paths:
devtools/tasmrecover/tasm-recover
engines/dreamweb/dreamgen.cpp
engines/dreamweb/dreamgen.h
engines/dreamweb/monitor.cpp
diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index 3235df7..2384ba6 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -80,6 +80,17 @@ p = parser(skip_binary_data = [
'spritename3',
'mongraphicname',
'characterset2',
+ 'monitorfile1',
+ 'monitorfile2',
+ 'monitorfile10',
+ 'monitorfile11',
+ 'monitorfile12',
+ 'monitorfile13',
+ 'monitorfile20',
+ 'monitorfile21',
+ 'monitorfile22',
+ 'monitorfile23',
+ 'monitorfile24',
])
p.strip_path = 3
context = p.parse('dreamweb/dreamweb.asm')
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 117f676..354eeea 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -2187,7 +2187,7 @@ void DreamGenContext::showGun() {
data.byte(kRoomssample) = 34;
loadRoomsSample();
data.byte(kVolume) = 0;
- dx = 1890;
+ dx = 1747;
loadIntoTemp();
createPanel2();
ds = data.word(kTempgraphics);
@@ -2210,7 +2210,7 @@ void DreamGenContext::showGun() {
al = 12;
ah = 0;
playChannel0();
- dx = 1851;
+ dx = 1708;
loadTempText();
rollEndCredits2();
getRidOfTempText();
@@ -2468,7 +2468,7 @@ void DreamGenContext::titles() {
void DreamGenContext::endGame() {
STACK_CHECK;
- dx = 1851;
+ dx = 1708;
loadTempText();
monkSpeaking();
gettingShot();
@@ -2483,7 +2483,7 @@ void DreamGenContext::monkSpeaking() {
STACK_CHECK;
data.byte(kRoomssample) = 35;
loadRoomsSample();
- dx = 1903;
+ dx = 1760;
loadIntoTemp();
clearWork();
showMonk();
@@ -2550,7 +2550,7 @@ void DreamGenContext::gettingShot() {
void DreamGenContext::bibleQuote() {
STACK_CHECK;
mode640x480();
- dx = 1916;
+ dx = 1773;
showPCX();
fadeScreenUps();
cx = 80;
@@ -2589,7 +2589,7 @@ hangonloope:
void DreamGenContext::intro() {
STACK_CHECK;
- dx = 1838;
+ dx = 1695;
loadTempText();
loadPalFromIFF();
setMode();
@@ -2722,7 +2722,7 @@ void DreamGenContext::realCredits() {
mode640x480();
cx = 35;
hangOn();
- dx = 1929;
+ dx = 1786;
showPCX();
al = 12;
ah = 0;
@@ -2744,7 +2744,7 @@ void DreamGenContext::realCredits() {
_cmp(data.byte(kLasthardkey), 1);
if (flags.z())
goto realcreditsearly;
- dx = 1942;
+ dx = 1799;
showPCX();
al = 12;
ah = 0;
@@ -2766,7 +2766,7 @@ void DreamGenContext::realCredits() {
_cmp(data.byte(kLasthardkey), 1);
if (flags.z())
goto realcreditsearly;
- dx = 1955;
+ dx = 1812;
showPCX();
al = 12;
ah = 0;
@@ -2788,7 +2788,7 @@ void DreamGenContext::realCredits() {
_cmp(data.byte(kLasthardkey), 1);
if (flags.z())
goto realcreditsearly;
- dx = 1968;
+ dx = 1825;
showPCX();
al = 12;
ah = 0;
@@ -2810,7 +2810,7 @@ void DreamGenContext::realCredits() {
_cmp(data.byte(kLasthardkey), 1);
if (flags.z())
goto realcreditsearly;
- dx = 1981;
+ dx = 1838;
showPCX();
al = 12;
ah = 0;
@@ -2832,7 +2832,7 @@ void DreamGenContext::realCredits() {
_cmp(data.byte(kLasthardkey), 1);
if (flags.z())
goto realcreditsearly;
- dx = 1994;
+ dx = 1851;
showPCX();
fadeScreenUps();
cx = 60;
@@ -5273,14 +5273,14 @@ void DreamGenContext::getDestInfo() {
push(ax);
dx = data;
es = dx;
- si = 2768;
+ si = 2625;
_add(si, ax);
cl = es.byte(si);
ax = pop();
push(cx);
dx = data;
es = dx;
- si = 2784;
+ si = 2641;
_add(si, ax);
ax = pop();
}
@@ -5457,7 +5457,7 @@ clearedlocations:
bx = ax;
dx = data;
es = dx;
- _add(bx, 2768);
+ _add(bx, 2625);
es.byte(bx) = 0;
}
@@ -5572,7 +5572,7 @@ void DreamGenContext::delChar() {
si = data.word(kCurpos);
_add(si, si);
es = cs;
- _add(si, 2802);
+ _add(si, 2659);
es.byte(si) = 0;
al = es.byte(si+1);
ah = 0;
@@ -5599,7 +5599,7 @@ void DreamGenContext::execCommand() {
es = cs;
bx = offset_comlist;
ds = cs;
- si = 2802;
+ si = 2659;
al = ds.byte(si);
_cmp(al, 0);
if (!flags.z())
@@ -5692,7 +5692,7 @@ dirroot:
si = offset_rootdir;
_inc(si);
es = cs;
- di = 2345;
+ di = 2202;
_inc(di);
cx = 12;
_movsb(cx, true);
@@ -5794,7 +5794,7 @@ notyetassigned:
push(bx);
_add(bx, 2);
ds = cs;
- si = 2802;
+ si = 2659;
checkpass:
_lodsw();
ah = es.byte(bx);
@@ -5865,7 +5865,7 @@ void DreamGenContext::read() {
return;
okcom:
es = cs;
- di = 2345;
+ di = 2202;
ax = data.word(kTextfile1);
data.word(kMonsource) = ax;
ds = ax;
@@ -5995,7 +5995,7 @@ keyok2:
ds = cs;
si = offset_operand1+1;
es = cs;
- di = 2345+1;
+ di = 2202+1;
cx = 12;
_movsb(cx, true);
monitorLogo();
@@ -6122,7 +6122,7 @@ void DreamGenContext::parser() {
al = '=';
_stosb();
ds = cs;
- si = 2802;
+ si = 2659;
notspace1:
_lodsw();
_cmp(al, 32);
@@ -9284,7 +9284,7 @@ void DreamGenContext::useDiary() {
getRidOfReels();
dx = 1656;
loadIntoTemp();
- dx = 1812;
+ dx = 1669;
loadTempText();
dx = 1526;
loadTempCharset();
@@ -9746,7 +9746,7 @@ void DreamGenContext::getNamePos() {
_mul(cx);
dx = data;
es = dx;
- bx = 2936;
+ bx = 2793;
_add(bx, ax);
al = data.byte(kCursorpos);
ah = 0;
@@ -9900,7 +9900,7 @@ void DreamGenContext::showNames() {
STACK_CHECK;
dx = data;
es = dx;
- si = 2936+1;
+ si = 2793+1;
di = (60)+21;
bx = (52)+10;
cl = 0;
@@ -10420,7 +10420,7 @@ void DreamGenContext::clearChanges() {
di = 0;
_stosw(cx, true);
es = cs;
- di = 2768;
+ di = 2625;
al = 1;
_stosb(2);
al = 0;
@@ -11410,191 +11410,173 @@ void DreamGenContext::__start() {
//0x0660: EAMW EB.G 05.D REAM
0x57, 0x45, 0x42, 0x2e, 0x47, 0x30, 0x36, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42,
//0x0670: WEB. G06. DREA MWEB
- 0x2e, 0x47, 0x31, 0x34, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x54, 0x30,
- //0x0680: .G14 .DRE AMWE B.T0
- 0x31, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x54, 0x30, 0x32, 0x00, 0x44,
- //0x0690: 1.DR EAMW EB.T 02.D
- 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x54, 0x31, 0x30, 0x00, 0x44, 0x52, 0x45, 0x41,
- //0x06a0: REAM WEB. T10. DREA
- 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x54, 0x31, 0x31, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45,
- //0x06b0: MWEB .T11 .DRE AMWE
- 0x42, 0x2e, 0x54, 0x31, 0x32, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x54,
- //0x06c0: B.T1 2.DR EAMW EB.T
- 0x31, 0x33, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x54, 0x32, 0x30, 0x00,
- //0x06d0: 13.D REAM WEB. T20.
- 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x54, 0x32, 0x31, 0x00, 0x44, 0x52, 0x45,
- //0x06e0: DREA MWEB .T21 .DRE
- 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x54, 0x32, 0x32, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57,
- //0x06f0: AMWE B.T2 2.DR EAMW
- 0x45, 0x42, 0x2e, 0x54, 0x32, 0x33, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e,
- //0x0700: EB.T 23.D REAM WEB.
- 0x54, 0x32, 0x34, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x54, 0x35, 0x31,
- //0x0710: T24. DREA MWEB .T51
- 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x54, 0x38, 0x30, 0x00, 0x44, 0x52,
- //0x0720: .DRE AMWE B.T8 0.DR
- 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x54, 0x38, 0x32, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d,
- //0x0730: EAMW EB.T 82.D REAM
- 0x57, 0x45, 0x42, 0x2e, 0x54, 0x38, 0x33, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42,
- //0x0740: WEB. T83. DREA MWEB
- 0x2e, 0x54, 0x38, 0x34, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x56, 0x4f,
- //0x0750: .T84 .DRE AMWE B.VO
- 0x4c, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x47, 0x31, 0x33, 0x00, 0x44,
- //0x0760: L.DR EAMW EB.G 13.D
- 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x47, 0x31, 0x35, 0x00, 0x44, 0x52, 0x45, 0x41,
- //0x0770: REAM WEB. G15. DREA
- 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x49, 0x30, 0x30, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45,
- //0x0780: MWEB .I00 .DRE AMWE
- 0x42, 0x2e, 0x49, 0x30, 0x31, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x49,
- //0x0790: B.I0 1.DR EAMW EB.I
- 0x30, 0x32, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x49, 0x30, 0x33, 0x00,
- //0x07a0: 02.D REAM WEB. I03.
- 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x49, 0x30, 0x34, 0x00, 0x44, 0x52, 0x45,
- //0x07b0: DREA MWEB .I04 .DRE
- 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x49, 0x30, 0x35, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57,
- //0x07c0: AMWE B.I0 5.DR EAMW
- 0x45, 0x42, 0x2e, 0x49, 0x30, 0x36, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e,
- //0x07d0: EB.I 06.D REAM WEB.
- 0x49, 0x30, 0x37, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x50, 0x41, 0x4c,
- //0x07e0: I07. DREA MWEB .PAL
- 0x00, 0x00, 0x01, 0x11, 0x01, 0x40, 0x01, 0x9d, 0x00, 0xc6, 0x00, 0x7c, 0xc4, 0xf0, 0x00, 0x22,
- //0x07f0: .... . at .. ...| ..."
- 0x01, 0x02, 0x00, 0x2c, 0x00, 0x94, 0xc4, 0x00, 0x00, 0x40, 0x01, 0x00, 0x00, 0xc8, 0x00, 0xa0,
- //0x0800: ..., .... . at .. ....
- 0xca, 0xff, 0xff, 0x11, 0x01, 0x40, 0x01, 0x9d, 0x00, 0xc6, 0x00, 0x7c, 0xc4, 0x00, 0x00, 0x40,
- //0x0810: .... . at .. ...| ...@
- 0x01, 0x00, 0x00, 0xc8, 0x00, 0xa0, 0xca, 0xff, 0xff, 0xee, 0x00, 0x02, 0x01, 0x04, 0x00, 0x2c,
- //0x0820: .... .... .... ...,
- 0x00, 0xc8, 0xc4, 0x68, 0x00, 0x7c, 0x00, 0x04, 0x00, 0x2c, 0x00, 0xcc, 0xc4, 0x18, 0x01, 0x34,
- //0x0830: ...h .|.. .,.. ...4
- 0x01, 0x04, 0x00, 0x2c, 0x00, 0xb0, 0xc4, 0x68, 0x00, 0xd8, 0x00, 0x8a, 0x00, 0xc0, 0x00, 0xd0,
- //0x0840: ..., ...h .... ....
- 0xc4, 0x11, 0x01, 0x40, 0x01, 0x9d, 0x00, 0xc6, 0x00, 0x7c, 0xc4, 0x00, 0x00, 0x40, 0x01, 0x00,
- //0x0850: ...@ .... .|.. . at ..
- 0x00, 0xc8, 0x00, 0xa0, 0xca, 0xff, 0xff, 0x45, 0x58, 0x49, 0x54, 0x20, 0x20, 0x20, 0x20, 0x20,
- //0x0860: .... ...E XIT
- 0x20, 0x48, 0x45, 0x4c, 0x50, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x4c, 0x49, 0x53, 0x54, 0x20,
- //0x0870: HEL P L IST
- 0x20, 0x20, 0x20, 0x20, 0x20, 0x52, 0x45, 0x41, 0x44, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x4c,
- //0x0880: REA D L
- 0x4f, 0x47, 0x4f, 0x4e, 0x20, 0x20, 0x20, 0x20, 0x20, 0x4b, 0x45, 0x59, 0x53, 0x20, 0x20, 0x20,
- //0x0890: OGON KEY S
- 0x20, 0x20, 0x20, 0x01, 0x00, 0x50, 0x55, 0x42, 0x4c, 0x49, 0x43, 0x20, 0x20, 0x20, 0x20, 0x20,
- //0x08a0: . .PUB LIC
- 0x20, 0x50, 0x55, 0x42, 0x4c, 0x49, 0x43, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0x42,
- //0x08b0: PUB LIC ...B
- 0x4c, 0x41, 0x43, 0x4b, 0x44, 0x52, 0x41, 0x47, 0x4f, 0x4e, 0x20, 0x52, 0x59, 0x41, 0x4e, 0x20,
- //0x08c0: LACK DRAG ON R YAN
- 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0x48, 0x45, 0x4e, 0x44, 0x52, 0x49, 0x58,
- //0x08d0: .. .HEN DRIX
- 0x20, 0x20, 0x20, 0x20, 0x20, 0x4c, 0x4f, 0x55, 0x49, 0x53, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
- //0x08e0: LOU IS
- 0x00, 0x00, 0x00, 0x53, 0x45, 0x50, 0x54, 0x49, 0x4d, 0x55, 0x53, 0x20, 0x20, 0x20, 0x20, 0x42,
- //0x08f0: ...S EPTI MUS B
- 0x45, 0x43, 0x4b, 0x45, 0x54, 0x54, 0x20, 0x20, 0x20, 0x20, 0x00, 0xff, 0xff, 0x20, 0x20, 0x20,
- //0x0900: ECKE TT .. .
- 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x22, 0x52, 0x4f, 0x4f, 0x54,
- //0x0910: ." ROOT
- 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x22, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
- //0x0920: ."
- 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x30, 0x30, 0x30, 0x30, 0x00, 0x30, 0x30, 0x00, 0xba,
- //0x0930: .0 000. 00..
- 0x00, 0xca, 0x00, 0x9d, 0x00, 0xad, 0x00, 0x1c, 0xc8, 0xf3, 0x00, 0x03, 0x01, 0x83, 0x00, 0x93,
- //0x0940: .... .... .... ....
- 0x00, 0x18, 0xc8, 0x0c, 0x01, 0x1c, 0x01, 0xa8, 0x00, 0xb8, 0x00, 0x50, 0xc7, 0x00, 0x00, 0x40,
- //0x0950: .... .... ...P ...@
- 0x01, 0x00, 0x00, 0xc8, 0x00, 0xa0, 0xca, 0xff, 0xff, 0x77, 0x00, 0xae, 0x00, 0x52, 0x00, 0x80,
- //0x0960: .... .... .w.. .R..
- 0x00, 0x34, 0xc8, 0x46, 0x00, 0x89, 0x00, 0x3e, 0x00, 0x6f, 0x00, 0x80, 0xc8, 0xbc, 0x00, 0xfa,
- //0x0970: .4.F ...> .o.. ....
- 0x00, 0x44, 0x00, 0x98, 0x00, 0x4c, 0xc8, 0x00, 0x00, 0x40, 0x01, 0x00, 0x00, 0xc8, 0x00, 0xa0,
- //0x0980: .D.. .L.. . at .. ....
- 0xca, 0xff, 0xff, 0x77, 0x00, 0xae, 0x00, 0x52, 0x00, 0x80, 0x00, 0x44, 0xc8, 0x46, 0x00, 0x8b,
- //0x0990: ...w ...R ...D .F..
- 0x00, 0x3e, 0x00, 0x6f, 0x00, 0x50, 0xc8, 0xec, 0x00, 0xfc, 0x00, 0x70, 0x00, 0x80, 0x00, 0x48,
- //0x09a0: .>.o .P.. ...p ...H
- 0xc8, 0x00, 0x00, 0x40, 0x01, 0x00, 0x00, 0xc8, 0x00, 0xa0, 0xca, 0xff, 0xff, 0x0d, 0x0a, 0x0d,
- //0x09b0: ...@ .... .... ....
- 0x0a, 0x24, 0x81, 0x00, 0xb8, 0x00, 0x52, 0x00, 0x80, 0x00, 0xc0, 0xc8, 0x50, 0x00, 0x93, 0x00,
- //0x09c0: .$.. ..R. .... P...
- 0x3e, 0x00, 0x6f, 0x00, 0x80, 0xc8, 0xb7, 0x00, 0xfa, 0x00, 0x3e, 0x00, 0x6f, 0x00, 0xc4, 0xc8,
- //0x09d0: >.o. .... ..>. o...
- 0x00, 0x00, 0x40, 0x01, 0x00, 0x00, 0xc8, 0x00, 0xa0, 0xca, 0xff, 0xff, 0x53, 0x50, 0x45, 0x45,
- //0x09e0: .. at . .... .... SPEE
- 0x43, 0x48, 0x52, 0x32, 0x34, 0x43, 0x30, 0x30, 0x30, 0x35, 0x2e, 0x52, 0x41, 0x57, 0x00, 0x4f,
- //0x09f0: CHR2 4C00 05.R AW.O
- 0x42, 0x4a, 0x45, 0x43, 0x54, 0x20, 0x4e, 0x41, 0x4d, 0x45, 0x20, 0x4f, 0x4e, 0x45, 0x20, 0x20,
- //0x0a00: BJEC T NA ME O NE
+ 0x2e, 0x47, 0x31, 0x34, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x54, 0x35,
+ //0x0680: .G14 .DRE AMWE B.T5
+ 0x31, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x54, 0x38, 0x30, 0x00, 0x44,
+ //0x0690: 1.DR EAMW EB.T 80.D
+ 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x54, 0x38, 0x32, 0x00, 0x44, 0x52, 0x45, 0x41,
+ //0x06a0: REAM WEB. T82. DREA
+ 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x54, 0x38, 0x33, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45,
+ //0x06b0: MWEB .T83 .DRE AMWE
+ 0x42, 0x2e, 0x54, 0x38, 0x34, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x56,
+ //0x06c0: B.T8 4.DR EAMW EB.V
+ 0x4f, 0x4c, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x47, 0x31, 0x33, 0x00,
+ //0x06d0: OL.D REAM WEB. G13.
+ 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x47, 0x31, 0x35, 0x00, 0x44, 0x52, 0x45,
+ //0x06e0: DREA MWEB .G15 .DRE
+ 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x49, 0x30, 0x30, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57,
+ //0x06f0: AMWE B.I0 0.DR EAMW
+ 0x45, 0x42, 0x2e, 0x49, 0x30, 0x31, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e,
+ //0x0700: EB.I 01.D REAM WEB.
+ 0x49, 0x30, 0x32, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x49, 0x30, 0x33,
+ //0x0710: I02. DREA MWEB .I03
+ 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x49, 0x30, 0x34, 0x00, 0x44, 0x52,
+ //0x0720: .DRE AMWE B.I0 4.DR
+ 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x49, 0x30, 0x35, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d,
+ //0x0730: EAMW EB.I 05.D REAM
+ 0x57, 0x45, 0x42, 0x2e, 0x49, 0x30, 0x36, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42,
+ //0x0740: WEB. I06. DREA MWEB
+ 0x2e, 0x49, 0x30, 0x37, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x50, 0x41,
+ //0x0750: .I07 .DRE AMWE B.PA
+ 0x4c, 0x00, 0x00, 0x01, 0x11, 0x01, 0x40, 0x01, 0x9d, 0x00, 0xc6, 0x00, 0x7c, 0xc4, 0xf0, 0x00,
+ //0x0760: L... .. at . .... |...
+ 0x22, 0x01, 0x02, 0x00, 0x2c, 0x00, 0x94, 0xc4, 0x00, 0x00, 0x40, 0x01, 0x00, 0x00, 0xc8, 0x00,
+ //0x0770: "... ,... .. at . ....
+ 0xa0, 0xca, 0xff, 0xff, 0x11, 0x01, 0x40, 0x01, 0x9d, 0x00, 0xc6, 0x00, 0x7c, 0xc4, 0x00, 0x00,
+ //0x0780: .... .. at . .... |...
+ 0x40, 0x01, 0x00, 0x00, 0xc8, 0x00, 0xa0, 0xca, 0xff, 0xff, 0xee, 0x00, 0x02, 0x01, 0x04, 0x00,
+ //0x0790: @... .... .... ....
+ 0x2c, 0x00, 0xc8, 0xc4, 0x68, 0x00, 0x7c, 0x00, 0x04, 0x00, 0x2c, 0x00, 0xcc, 0xc4, 0x18, 0x01,
+ //0x07a0: ,... h.|. ..,. ....
+ 0x34, 0x01, 0x04, 0x00, 0x2c, 0x00, 0xb0, 0xc4, 0x68, 0x00, 0xd8, 0x00, 0x8a, 0x00, 0xc0, 0x00,
+ //0x07b0: 4... ,... h... ....
+ 0xd0, 0xc4, 0x11, 0x01, 0x40, 0x01, 0x9d, 0x00, 0xc6, 0x00, 0x7c, 0xc4, 0x00, 0x00, 0x40, 0x01,
+ //0x07c0: .... @... ..|. .. at .
+ 0x00, 0x00, 0xc8, 0x00, 0xa0, 0xca, 0xff, 0xff, 0x45, 0x58, 0x49, 0x54, 0x20, 0x20, 0x20, 0x20,
+ //0x07d0: .... .... EXIT
+ 0x20, 0x20, 0x48, 0x45, 0x4c, 0x50, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x4c, 0x49, 0x53, 0x54,
+ //0x07e0: HE LP LIST
+ 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x52, 0x45, 0x41, 0x44, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+ //0x07f0: RE AD
+ 0x4c, 0x4f, 0x47, 0x4f, 0x4e, 0x20, 0x20, 0x20, 0x20, 0x20, 0x4b, 0x45, 0x59, 0x53, 0x20, 0x20,
+ //0x0800: LOGO N KE YS
+ 0x20, 0x20, 0x20, 0x20, 0x01, 0x00, 0x50, 0x55, 0x42, 0x4c, 0x49, 0x43, 0x20, 0x20, 0x20, 0x20,
+ //0x0810: ..PU BLIC
+ 0x20, 0x20, 0x50, 0x55, 0x42, 0x4c, 0x49, 0x43, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00,
+ //0x0820: PU BLIC ...
+ 0x42, 0x4c, 0x41, 0x43, 0x4b, 0x44, 0x52, 0x41, 0x47, 0x4f, 0x4e, 0x20, 0x52, 0x59, 0x41, 0x4e,
+ //0x0830: BLAC KDRA GON RYAN
+ 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0x48, 0x45, 0x4e, 0x44, 0x52, 0x49,
+ //0x0840: . ..HE NDRI
+ 0x58, 0x20, 0x20, 0x20, 0x20, 0x20, 0x4c, 0x4f, 0x55, 0x49, 0x53, 0x20, 0x20, 0x20, 0x20, 0x20,
+ //0x0850: X LO UIS
+ 0x20, 0x00, 0x00, 0x00, 0x53, 0x45, 0x50, 0x54, 0x49, 0x4d, 0x55, 0x53, 0x20, 0x20, 0x20, 0x20,
+ //0x0860: ... SEPT IMUS
+ 0x42, 0x45, 0x43, 0x4b, 0x45, 0x54, 0x54, 0x20, 0x20, 0x20, 0x20, 0x00, 0xff, 0xff, 0x20, 0x20,
+ //0x0870: BECK ETT . ..
+ 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x22, 0x52, 0x4f, 0x4f,
+ //0x0880: . "ROO
+ 0x54, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x22, 0x20, 0x20, 0x20, 0x20, 0x20,
+ //0x0890: T ."
+ 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x30, 0x30, 0x30, 0x30, 0x00, 0x30, 0x30, 0x00,
+ //0x08a0: . 0000 .00.
+ 0xba, 0x00, 0xca, 0x00, 0x9d, 0x00, 0xad, 0x00, 0x1c, 0xc8, 0xf3, 0x00, 0x03, 0x01, 0x83, 0x00,
+ //0x08b0: .... .... .... ....
+ 0x93, 0x00, 0x18, 0xc8, 0x0c, 0x01, 0x1c, 0x01, 0xa8, 0x00, 0xb8, 0x00, 0x50, 0xc7, 0x00, 0x00,
+ //0x08c0: .... .... .... P...
+ 0x40, 0x01, 0x00, 0x00, 0xc8, 0x00, 0xa0, 0xca, 0xff, 0xff, 0x77, 0x00, 0xae, 0x00, 0x52, 0x00,
+ //0x08d0: @... .... ..w. ..R.
+ 0x80, 0x00, 0x34, 0xc8, 0x46, 0x00, 0x89, 0x00, 0x3e, 0x00, 0x6f, 0x00, 0x80, 0xc8, 0xbc, 0x00,
+ //0x08e0: ..4. F... >.o. ....
+ 0xfa, 0x00, 0x44, 0x00, 0x98, 0x00, 0x4c, 0xc8, 0x00, 0x00, 0x40, 0x01, 0x00, 0x00, 0xc8, 0x00,
+ //0x08f0: ..D. ..L. .. at . ....
+ 0xa0, 0xca, 0xff, 0xff, 0x77, 0x00, 0xae, 0x00, 0x52, 0x00, 0x80, 0x00, 0x44, 0xc8, 0x46, 0x00,
+ //0x0900: .... w... R... D.F.
+ 0x8b, 0x00, 0x3e, 0x00, 0x6f, 0x00, 0x50, 0xc8, 0xec, 0x00, 0xfc, 0x00, 0x70, 0x00, 0x80, 0x00,
+ //0x0910: ..>. o.P. .... p...
+ 0x48, 0xc8, 0x00, 0x00, 0x40, 0x01, 0x00, 0x00, 0xc8, 0x00, 0xa0, 0xca, 0xff, 0xff, 0x0d, 0x0a,
+ //0x0920: H... @... .... ....
+ 0x0d, 0x0a, 0x24, 0x81, 0x00, 0xb8, 0x00, 0x52, 0x00, 0x80, 0x00, 0xc0, 0xc8, 0x50, 0x00, 0x93,
+ //0x0930: ..$. ...R .... .P..
+ 0x00, 0x3e, 0x00, 0x6f, 0x00, 0x80, 0xc8, 0xb7, 0x00, 0xfa, 0x00, 0x3e, 0x00, 0x6f, 0x00, 0xc4,
+ //0x0940: .>.o .... ...> .o..
+ 0xc8, 0x00, 0x00, 0x40, 0x01, 0x00, 0x00, 0xc8, 0x00, 0xa0, 0xca, 0xff, 0xff, 0x53, 0x50, 0x45,
+ //0x0950: ...@ .... .... .SPE
+ 0x45, 0x43, 0x48, 0x52, 0x32, 0x34, 0x43, 0x30, 0x30, 0x30, 0x35, 0x2e, 0x52, 0x41, 0x57, 0x00,
+ //0x0960: ECHR 24C0 005. RAW.
+ 0x4f, 0x42, 0x4a, 0x45, 0x43, 0x54, 0x20, 0x4e, 0x41, 0x4d, 0x45, 0x20, 0x4f, 0x4e, 0x45, 0x20,
+ //0x0970: OBJE CT N AME ONE
0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
- //0x0a10:
- 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x10, 0x12, 0x12, 0x11, 0x10, 0x10, 0x10, 0x01,
- //0x0a20: . .... ....
- 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
- //0x0a30: .... .... .... ....
+ //0x0980:
+ 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x10, 0x12, 0x12, 0x11, 0x10, 0x10, 0x10,
+ //0x0990: .... ....
+ 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
+ //0x09a0: .... .... .... ....
+ 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ //0x09b0: .... .... .... ....
+ 0x00, 0x44, 0x3a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ //0x09c0: .D:. .... .... ....
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ //0x09d0: .... .... .... ....
+ 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x20, 0x44, 0x41, 0x54, 0x41, 0x20, 0x46,
+ //0x09e0: .DRE AMWE B DA TA F
+ 0x49, 0x4c, 0x45, 0x20, 0x43, 0x4f, 0x50, 0x59, 0x52, 0x49, 0x47, 0x48, 0x54, 0x20, 0x31, 0x39,
+ //0x09f0: ILE COPY RIGH T 19
+ 0x39, 0x32, 0x20, 0x43, 0x52, 0x45, 0x41, 0x54, 0x49, 0x56, 0x45, 0x20, 0x52, 0x45, 0x41, 0x4c,
+ //0x0a00: 92 C REAT IVE REAL
+ 0x49, 0x54, 0x59, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ //0x0a10: ITY. .... .... ....
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ //0x0a20: .... .... .... ....
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ //0x0a30: .... .... .... ....
+ 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
//0x0a40: .... .... .... ....
- 0x44, 0x3a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- //0x0a50: D:.. .... .... ....
+ 0x00, 0x05, 0x00, 0x03, 0x02, 0x04, 0x01, 0x0a, 0x09, 0x08, 0x06, 0x0b, 0x04, 0x07, 0x07, 0x00,
+ //0x0a50: .... .... .... ....
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
//0x0a60: .... .... .... ....
- 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x20, 0x44, 0x41, 0x54, 0x41, 0x20, 0x46, 0x49,
- //0x0a70: DREA MWEB DAT A FI
- 0x4c, 0x45, 0x20, 0x43, 0x4f, 0x50, 0x59, 0x52, 0x49, 0x47, 0x48, 0x54, 0x20, 0x31, 0x39, 0x39,
- //0x0a80: LE C OPYR IGHT 199
- 0x32, 0x20, 0x43, 0x52, 0x45, 0x41, 0x54, 0x49, 0x56, 0x45, 0x20, 0x52, 0x45, 0x41, 0x4c, 0x49,
- //0x0a90: 2 CR EATI VE R EALI
- 0x54, 0x59, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- //0x0aa0: TY.. .... .... ....
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ //0x0a70: .... .... .... ....
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ //0x0a80: .... .... .... ....
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ //0x0a90: .... .... .... ....
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ //0x0aa0: .... .... .... ....
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
//0x0ab0: .... .... .... ....
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
//0x0ac0: .... .... .... ....
- 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,
//0x0ad0: .... .... .... ....
- 0x05, 0x00, 0x03, 0x02, 0x04, 0x01, 0x0a, 0x09, 0x08, 0x06, 0x0b, 0x04, 0x07, 0x07, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01,
//0x0ae0: .... .... .... ....
- 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, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01,
//0x0af0: .... .... .... ....
- 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,
//0x0b00: .... .... .... ....
- 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,
//0x0b10: .... .... .... ....
- 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,
//0x0b20: .... .... .... ....
- 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,
//0x0b30: .... .... .... ....
- 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, 0x01, 0x02,
//0x0b40: .... .... .... ....
- 0x00, 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, 0x01,
//0x0b50: .... .... .... ....
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- //0x0b60: .... .... .... ....
- 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
- //0x0b70: .... .... .... ....
- 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01,
- //0x0b80: .... .... .... ....
- 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01,
- //0x0b90: .... .... .... ....
- 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x00, 0x01, 0x01, 0x01,
- //0x0ba0: .... .... .... ....
- 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x00, 0x01, 0x01,
- //0x0bb0: .... .... .... ....
- 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x00, 0x01,
- //0x0bc0: .... .... .... ....
- 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x00,
- //0x0bd0: .... .... .... ....
- 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x44,
- //0x0be0: .... .... .... ...D
- 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x44, 0x30, 0x30, 0x00, 0x44, 0x52, 0x45, 0x41,
- //0x0bf0: REAM WEB. D00. DREA
- 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x44, 0x30, 0x31, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45,
- //0x0c00: MWEB .D01 .DRE AMWE
- 0x42, 0x2e, 0x44, 0x30, 0x32, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x44,
- //0x0c10: B.D0 2.DR EAMW EB.D
- 0x30, 0x33, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x44, 0x30, 0x34, 0x00,
- //0x0c20: 03.D REAM WEB. D04.
- 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x44, 0x30, 0x35, 0x00, 0x44, 0x52, 0x45,
- //0x0c30: DREA MWEB .D05 .DRE
- 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x44, 0x30, 0x36, 0x00, 0x00, 0x00, 0x00, };
+ 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x44, 0x30, 0x30, 0x00, 0x44, 0x52, 0x45,
+ //0x0b60: DREA MWEB .D00 .DRE
+ 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x44, 0x30, 0x31, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57,
+ //0x0b70: AMWE B.D0 1.DR EAMW
+ 0x45, 0x42, 0x2e, 0x44, 0x30, 0x32, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e,
+ //0x0b80: EB.D 02.D REAM WEB.
+ 0x44, 0x30, 0x33, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x44, 0x30, 0x34,
+ //0x0b90: D03. DREA MWEB .D04
+ 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x44, 0x30, 0x35, 0x00, 0x44, 0x52,
+ //0x0ba0: .DRE AMWE B.D0 5.DR
+ 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 592c0fe..7b2b1e8 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -36,24 +36,24 @@ public:
void __start();
#include "stubs.h" // Allow hand-reversed functions to have a signature different than void f()
- static const uint16 offset_commandline = 0x09ff;
- static const uint16 offset_money2poke = 0x093c;
- static const uint16 offset_keys = 0x08a3;
- static const uint16 offset_keybuffer = 0x0a40;
- static const uint16 offset_diarylist = 0x093f;
- static const uint16 offset_decidelist = 0x09c2;
- static const uint16 offset_rootdir = 0x091b;
- static const uint16 offset_opslist = 0x0969;
- static const uint16 offset_discopslist = 0x0993;
- static const uint16 offset_comlist = 0x0867;
- static const uint16 offset_quitlist = 0x0813;
- static const uint16 offset_speechfilename = 0x09ec;
- static const uint16 offset_talklist = 0x07f3;
- static const uint16 offset_operand1 = 0x090d;
- static const uint16 offset_openchangesize = 0x07f1;
- static const uint16 offset_money1poke = 0x0937;
- static const uint16 offset_destlist = 0x0829;
- static const uint16 offset_speechfile = 0x09f2;
+ static const uint16 offset_talklist = 0x0764;
+ static const uint16 offset_money2poke = 0x08ad;
+ static const uint16 offset_speechfilename = 0x095d;
+ static const uint16 offset_discopslist = 0x0904;
+ static const uint16 offset_commandline = 0x0970;
+ static const uint16 offset_quitlist = 0x0784;
+ static const uint16 offset_speechfile = 0x0963;
+ static const uint16 offset_keybuffer = 0x09b1;
+ static const uint16 offset_operand1 = 0x087e;
+ static const uint16 offset_opslist = 0x08da;
+ static const uint16 offset_diarylist = 0x08b0;
+ static const uint16 offset_decidelist = 0x0933;
+ static const uint16 offset_comlist = 0x07d8;
+ static const uint16 offset_destlist = 0x079a;
+ static const uint16 offset_keys = 0x0814;
+ static const uint16 offset_openchangesize = 0x0762;
+ static const uint16 offset_money1poke = 0x08a8;
+ static const uint16 offset_rootdir = 0x088c;
static const uint16 kStartvars = 0;
static const uint16 kProgresspoints = 1;
static const uint16 kWatchon = 2;
@@ -472,48 +472,37 @@ public:
static const uint16 kTravelgraphic1 = 1630;
static const uint16 kTravelgraphic2 = 1643;
static const uint16 kDiarygraphic = 1656;
- static const uint16 kMonitorfile1 = 1669;
- static const uint16 kMonitorfile2 = 1682;
- static const uint16 kMonitorfile10 = 1695;
- static const uint16 kMonitorfile11 = 1708;
- static const uint16 kMonitorfile12 = 1721;
- static const uint16 kMonitorfile13 = 1734;
- static const uint16 kMonitorfile20 = 1747;
- static const uint16 kMonitorfile21 = 1760;
- static const uint16 kMonitorfile22 = 1773;
- static const uint16 kMonitorfile23 = 1786;
- static const uint16 kMonitorfile24 = 1799;
- static const uint16 kDiarytext = 1812;
- static const uint16 kPuzzletextname = 1825;
- static const uint16 kIntrotextname = 1838;
- static const uint16 kEndtextname = 1851;
- static const uint16 kCommandtextname = 1864;
- static const uint16 kVolumetabname = 1877;
- static const uint16 kGungraphic = 1890;
- static const uint16 kMonkface = 1903;
- static const uint16 kTitle0graphics = 1916;
- static const uint16 kTitle1graphics = 1929;
- static const uint16 kTitle2graphics = 1942;
- static const uint16 kTitle3graphics = 1955;
- static const uint16 kTitle4graphics = 1968;
- static const uint16 kTitle5graphics = 1981;
- static const uint16 kTitle6graphics = 1994;
- static const uint16 kTitle7graphics = 2007;
- static const uint16 kPalettescreen = 2020;
- static const uint16 kCurrentfile = 2345;
- static const uint16 kFileheader = 2672;
- static const uint16 kFiledata = 2722;
- static const uint16 kExtradata = 2762;
- static const uint16 kRoomscango = 2768;
- static const uint16 kRoompics = 2784;
- static const uint16 kOplist = 2799;
- static const uint16 kInputline = 2802;
- static const uint16 kPresslist = 2930;
- static const uint16 kSavenames = 2936;
- static const uint16 kSavefiles = 3055;
- static const uint16 kQuitrequested = 3146;
- static const uint16 kSubtitles = 3147;
- static const uint16 kForeignrelease = 3148;
+ static const uint16 kDiarytext = 1669;
+ static const uint16 kPuzzletextname = 1682;
+ static const uint16 kIntrotextname = 1695;
+ static const uint16 kEndtextname = 1708;
+ static const uint16 kCommandtextname = 1721;
+ static const uint16 kVolumetabname = 1734;
+ static const uint16 kGungraphic = 1747;
+ static const uint16 kMonkface = 1760;
+ static const uint16 kTitle0graphics = 1773;
+ static const uint16 kTitle1graphics = 1786;
+ static const uint16 kTitle2graphics = 1799;
+ static const uint16 kTitle3graphics = 1812;
+ static const uint16 kTitle4graphics = 1825;
+ static const uint16 kTitle5graphics = 1838;
+ static const uint16 kTitle6graphics = 1851;
+ static const uint16 kTitle7graphics = 1864;
+ static const uint16 kPalettescreen = 1877;
+ static const uint16 kCurrentfile = 2202;
+ static const uint16 kFileheader = 2529;
+ static const uint16 kFiledata = 2579;
+ static const uint16 kExtradata = 2619;
+ static const uint16 kRoomscango = 2625;
+ static const uint16 kRoompics = 2641;
+ static const uint16 kOplist = 2656;
+ static const uint16 kInputline = 2659;
+ static const uint16 kPresslist = 2787;
+ static const uint16 kSavenames = 2793;
+ static const uint16 kSavefiles = 2912;
+ static const uint16 kQuitrequested = 3003;
+ static const uint16 kSubtitles = 3004;
+ static const uint16 kForeignrelease = 3005;
static const uint16 kBlocktextdat = (0);
static const uint16 kPersonframes = (0);
static const uint16 kDebuglevel1 = (0);
@@ -580,7 +569,7 @@ public:
static const uint16 kLenofmapstore = (22*8*20*8);
static const uint16 kUndertextsizex = (228);
static const uint16 kNumchanges = (250);
- static const uint16 kHeaderlen = (2768-2672);
+ static const uint16 kHeaderlen = (2625-2529);
static const uint16 kUndertimedysize = (30);
static const uint16 kExframeslen = (30000);
static const uint16 kTablesize = (32);
diff --git a/engines/dreamweb/monitor.cpp b/engines/dreamweb/monitor.cpp
index c1b2259..88df606 100644
--- a/engines/dreamweb/monitor.cpp
+++ b/engines/dreamweb/monitor.cpp
@@ -266,101 +266,37 @@ void DreamGenContext::turnOnPower() {
}
void DreamGenContext::loadPersonal() {
- STACK_CHECK;
- al = data.byte(kLocation);
- dx = 1669;
- _cmp(al, 0);
- if (flags.z())
- goto foundpersonal;
- _cmp(al, 42);
- if (flags.z())
- goto foundpersonal;
- dx = 1682;
- _cmp(al, 2);
- if (flags.z())
- goto foundpersonal;
-foundpersonal:
- openFile();
- readHeader();
- bx = es.word(di);
- push(bx);
- cl = 4;
- _shr(bx, cl);
- allocateMem();
- data.word(kTextfile1) = ax;
- ds = ax;
- cx = pop();
- dx = 0;
- readFromFile();
- closeFile();
+ if (data.byte(kLocation) == 0 || data.byte(kLocation) == 42)
+ data.word(kTextfile1) = standardLoad("DREAMWEB.T01"); // monitor file 1
+ else
+ data.word(kTextfile1) = standardLoad("DREAMWEB.T02"); // monitor file 2
}
void DreamGenContext::loadNews() {
- STACK_CHECK;
- al = data.byte(kNewsitem);
- dx = 1695;
- _cmp(al, 0);
- if (flags.z())
- goto foundnews;
- dx = 1708;
- _cmp(al, 1);
- if (flags.z())
- goto foundnews;
- dx = 1721;
- _cmp(al, 2);
- if (flags.z())
- goto foundnews;
- dx = 1734;
-foundnews:
- openFile();
- readHeader();
- bx = es.word(di);
- push(bx);
- cl = 4;
- _shr(bx, cl);
- allocateMem();
- data.word(kTextfile2) = ax;
- ds = ax;
- cx = pop();
- dx = 0;
- readFromFile();
- closeFile();
+ // textfile2 holds information accessible by anyone
+ if (data.byte(kNewsitem) == 0)
+ data.word(kTextfile2) = standardLoad("DREAMWEB.T10"); // monitor file 10
+ else if (data.byte(kNewsitem) == 1)
+ data.word(kTextfile2) = standardLoad("DREAMWEB.T11"); // monitor file 11
+ else if (data.byte(kNewsitem) == 2)
+ data.word(kTextfile2) = standardLoad("DREAMWEB.T12"); // monitor file 12
+ else
+ data.word(kTextfile2) = standardLoad("DREAMWEB.T13"); // monitor file 13
}
void DreamGenContext::loadCart() {
- STACK_CHECK;
lookInInterface();
- dx = 1747;
- _cmp(al, 0);
- if (flags.z())
- goto gotcart;
- dx = 1760;
- _cmp(al, 1);
- if (flags.z())
- goto gotcart;
- dx = 1773;
- _cmp(al, 2);
- if (flags.z())
- goto gotcart;
- dx = 1786;
- _cmp(al, 3);
- if (flags.z())
- goto gotcart;
- dx = 1799;
-gotcart:
- openFile();
- readHeader();
- bx = es.word(di);
- push(bx);
- cl = 4;
- _shr(bx, cl);
- allocateMem();
- data.word(kTextfile3) = ax;
- ds = ax;
- cx = pop();
- dx = 0;
- readFromFile();
- closeFile();
+
+ if (al == 0)
+ data.word(kTextfile3) = standardLoad("DREAMWEB.T20"); // monitor file 20
+ else if (al == 1)
+ data.word(kTextfile3) = standardLoad("DREAMWEB.T21"); // monitor file 21
+ else if (al == 2)
+ data.word(kTextfile3) = standardLoad("DREAMWEB.T22"); // monitor file 22
+ else if (al == 3)
+ data.word(kTextfile3) = standardLoad("DREAMWEB.T23"); // monitor file 23
+ else
+ data.word(kTextfile3) = standardLoad("DREAMWEB.T24"); // monitor file 24
}
} /*namespace dreamgen */
Commit: 4aca1957125fafd8726ee0a6c19abbc23b7abc5d
https://github.com/scummvm/scummvm/commit/4aca1957125fafd8726ee0a6c19abbc23b7abc5d
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2011-12-03T12:15:40-08:00
Commit Message:
DREAMWEB: Clean up last remaining kFileheader/kFiledata usage
Changed paths:
devtools/tasmrecover/dreamweb/dreamweb.asm
devtools/tasmrecover/tasm-recover
engines/dreamweb/dreamgen.cpp
engines/dreamweb/dreamgen.h
engines/dreamweb/stubs.cpp
diff --git a/devtools/tasmrecover/dreamweb/dreamweb.asm b/devtools/tasmrecover/dreamweb/dreamweb.asm
index d8a728c..fa3a4f7 100644
--- a/devtools/tasmrecover/dreamweb/dreamweb.asm
+++ b/devtools/tasmrecover/dreamweb/dreamweb.asm
@@ -5916,7 +5916,7 @@ Fileheader db "DREAMWEB DATA FILE "
db "CREATIVE REALITY"
Filedata dw 20 dup (0)
Extradata db 6 dup (0)
-Headerlen equ $-Fileheader
+Headerlen equ 96 ; $-Fileheader
Roomdata db "DREAMWEB.R00",0 ;Ryan's apartment
diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index 2384ba6..150bc0f 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -38,6 +38,9 @@ p = parser(skip_binary_data = [
'linedata',
'madeuproomdat',
'recname',
+ 'fileheader',
+ 'filedata',
+ 'extradata',
# keypad.asm
'keypadlist',
'symbollist',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 354eeea..f089297 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 = 2625;
+ si = 2529;
_add(si, ax);
cl = es.byte(si);
ax = pop();
push(cx);
dx = data;
es = dx;
- si = 2641;
+ si = 2545;
_add(si, ax);
ax = pop();
}
@@ -5457,7 +5457,7 @@ clearedlocations:
bx = ax;
dx = data;
es = dx;
- _add(bx, 2625);
+ _add(bx, 2529);
es.byte(bx) = 0;
}
@@ -5572,7 +5572,7 @@ void DreamGenContext::delChar() {
si = data.word(kCurpos);
_add(si, si);
es = cs;
- _add(si, 2659);
+ _add(si, 2563);
es.byte(si) = 0;
al = es.byte(si+1);
ah = 0;
@@ -5599,7 +5599,7 @@ void DreamGenContext::execCommand() {
es = cs;
bx = offset_comlist;
ds = cs;
- si = 2659;
+ si = 2563;
al = ds.byte(si);
_cmp(al, 0);
if (!flags.z())
@@ -5794,7 +5794,7 @@ notyetassigned:
push(bx);
_add(bx, 2);
ds = cs;
- si = 2659;
+ si = 2563;
checkpass:
_lodsw();
ah = es.byte(bx);
@@ -6122,7 +6122,7 @@ void DreamGenContext::parser() {
al = '=';
_stosb();
ds = cs;
- si = 2659;
+ si = 2563;
notspace1:
_lodsw();
_cmp(al, 32);
@@ -9746,7 +9746,7 @@ void DreamGenContext::getNamePos() {
_mul(cx);
dx = data;
es = dx;
- bx = 2793;
+ bx = 2697;
_add(bx, ax);
al = data.byte(kCursorpos);
ah = 0;
@@ -9900,7 +9900,7 @@ void DreamGenContext::showNames() {
STACK_CHECK;
dx = data;
es = dx;
- si = 2793+1;
+ si = 2697+1;
di = (60)+21;
bx = (52)+10;
cl = 0;
@@ -10420,7 +10420,7 @@ void DreamGenContext::clearChanges() {
di = 0;
_stosw(cx, true);
es = cs;
- di = 2625;
+ di = 2529;
al = 1;
_stosb(2);
al = 0;
@@ -11518,64 +11518,52 @@ void DreamGenContext::__start() {
//0x09c0: .D:. .... .... ....
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
//0x09d0: .... .... .... ....
- 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x20, 0x44, 0x41, 0x54, 0x41, 0x20, 0x46,
- //0x09e0: .DRE AMWE B DA TA F
- 0x49, 0x4c, 0x45, 0x20, 0x43, 0x4f, 0x50, 0x59, 0x52, 0x49, 0x47, 0x48, 0x54, 0x20, 0x31, 0x39,
- //0x09f0: ILE COPY RIGH T 19
- 0x39, 0x32, 0x20, 0x43, 0x52, 0x45, 0x41, 0x54, 0x49, 0x56, 0x45, 0x20, 0x52, 0x45, 0x41, 0x4c,
- //0x0a00: 92 C REAT IVE REAL
- 0x49, 0x54, 0x59, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- //0x0a10: ITY. .... .... ....
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- //0x0a20: .... .... .... ....
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- //0x0a30: .... .... .... ....
0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- //0x0a40: .... .... .... ....
+ //0x09e0: .... .... .... ....
0x00, 0x05, 0x00, 0x03, 0x02, 0x04, 0x01, 0x0a, 0x09, 0x08, 0x06, 0x0b, 0x04, 0x07, 0x07, 0x00,
- //0x0a50: .... .... .... ....
+ //0x09f0: .... .... .... ....
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- //0x0a60: .... .... .... ....
+ //0x0a00: .... .... .... ....
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- //0x0a70: .... .... .... ....
+ //0x0a10: .... .... .... ....
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- //0x0a80: .... .... .... ....
+ //0x0a20: .... .... .... ....
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- //0x0a90: .... .... .... ....
+ //0x0a30: .... .... .... ....
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- //0x0aa0: .... .... .... ....
+ //0x0a40: .... .... .... ....
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- //0x0ab0: .... .... .... ....
+ //0x0a50: .... .... .... ....
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- //0x0ac0: .... .... .... ....
+ //0x0a60: .... .... .... ....
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- //0x0ad0: .... .... .... ....
+ //0x0a70: .... .... .... ....
0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01,
- //0x0ae0: .... .... .... ....
+ //0x0a80: .... .... .... ....
0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01,
- //0x0af0: .... .... .... ....
+ //0x0a90: .... .... .... ....
0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x00, 0x01, 0x01, 0x01,
- //0x0b00: .... .... .... ....
+ //0x0aa0: .... .... .... ....
0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x00, 0x01, 0x01,
- //0x0b10: .... .... .... ....
+ //0x0ab0: .... .... .... ....
0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x00, 0x01,
- //0x0b20: .... .... .... ....
+ //0x0ac0: .... .... .... ....
0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x00,
- //0x0b30: .... .... .... ....
+ //0x0ad0: .... .... .... ....
0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02,
- //0x0b40: .... .... .... ....
+ //0x0ae0: .... .... .... ....
0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
- //0x0b50: .... .... .... ....
+ //0x0af0: .... .... .... ....
0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x44, 0x30, 0x30, 0x00, 0x44, 0x52, 0x45,
- //0x0b60: DREA MWEB .D00 .DRE
+ //0x0b00: DREA MWEB .D00 .DRE
0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x44, 0x30, 0x31, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57,
- //0x0b70: AMWE B.D0 1.DR EAMW
+ //0x0b10: AMWE B.D0 1.DR EAMW
0x45, 0x42, 0x2e, 0x44, 0x30, 0x32, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e,
- //0x0b80: EB.D 02.D REAM WEB.
+ //0x0b20: EB.D 02.D REAM WEB.
0x44, 0x30, 0x33, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x44, 0x30, 0x34,
- //0x0b90: D03. DREA MWEB .D04
+ //0x0b30: D03. DREA MWEB .D04
0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x44, 0x30, 0x35, 0x00, 0x44, 0x52,
- //0x0ba0: .DRE AMWE B.D0 5.DR
+ //0x0b40: .DRE AMWE B.D0 5.DR
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 7b2b1e8..4d1244f 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -490,19 +490,16 @@ public:
static const uint16 kTitle7graphics = 1864;
static const uint16 kPalettescreen = 1877;
static const uint16 kCurrentfile = 2202;
- static const uint16 kFileheader = 2529;
- static const uint16 kFiledata = 2579;
- static const uint16 kExtradata = 2619;
- static const uint16 kRoomscango = 2625;
- static const uint16 kRoompics = 2641;
- static const uint16 kOplist = 2656;
- static const uint16 kInputline = 2659;
- static const uint16 kPresslist = 2787;
- static const uint16 kSavenames = 2793;
- static const uint16 kSavefiles = 2912;
- static const uint16 kQuitrequested = 3003;
- static const uint16 kSubtitles = 3004;
- static const uint16 kForeignrelease = 3005;
+ static const uint16 kRoomscango = 2529;
+ static const uint16 kRoompics = 2545;
+ static const uint16 kOplist = 2560;
+ static const uint16 kInputline = 2563;
+ static const uint16 kPresslist = 2691;
+ static const uint16 kSavenames = 2697;
+ static const uint16 kSavefiles = 2816;
+ static const uint16 kQuitrequested = 2907;
+ static const uint16 kSubtitles = 2908;
+ static const uint16 kForeignrelease = 2909;
static const uint16 kBlocktextdat = (0);
static const uint16 kPersonframes = (0);
static const uint16 kDebuglevel1 = (0);
@@ -569,7 +566,6 @@ public:
static const uint16 kLenofmapstore = (22*8*20*8);
static const uint16 kUndertextsizex = (228);
static const uint16 kNumchanges = (250);
- static const uint16 kHeaderlen = (2625-2529);
static const uint16 kUndertimedysize = (30);
static const uint16 kExframeslen = (30000);
static const uint16 kTablesize = (32);
@@ -594,6 +590,7 @@ public:
static const uint16 kZoomx = (8);
static const uint16 kInventx = (80);
static const uint16 kMenux = (80+40);
+ static const uint16 kHeaderlen = (96);
static const uint16 kLenofreelrouts = (991-534);
void useWire();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 14f8d9e..f671bfd 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -1235,12 +1235,6 @@ void DreamGenContext::makeBackOb(SetObject *objData) {
sprite->animFrame = 0;
}
-void DreamGenContext::readHeader() {
- ax = engine->readFromFile(cs.ptr(kFileheader, kHeaderlen), kHeaderlen);
- es = cs;
- di = kFiledata;
-}
-
uint16 DreamGenContext::allocateAndLoad(unsigned int size) {
// allocatemem adds 32 bytes, so it doesn't matter that size/16 rounds down
uint16 result = allocateMem(size / 16);
@@ -2689,12 +2683,14 @@ void DreamGenContext::restoreReels() {
engine->openFile(room.name);
cs.word(kHandle) = 1; //only one handle
flags._c = false;
- readHeader();
+
+ FileHeader header;
+ engine->readFromFile((uint8 *)&header, sizeof(FileHeader));
// read segment lengths from room file header
int len[15];
for (int i = 0; i < 15; ++i)
- len[i] = cs.word(kFiledata + 2*i);
+ len[i] = header.len(i);
engine->skipBytes(len[0]);
engine->skipBytes(len[1]);
More information about the Scummvm-git-logs
mailing list