diff options
| -rwxr-xr-x | devtools/tasmrecover/tasm-recover | 1 | ||||
| -rw-r--r-- | engines/dreamweb/dreamgen.cpp | 25 | ||||
| -rw-r--r-- | engines/dreamweb/dreamgen.h | 3 | ||||
| -rw-r--r-- | engines/dreamweb/stubs.h | 1 | ||||
| -rw-r--r-- | engines/dreamweb/vgafades.cpp | 15 |
5 files changed, 18 insertions, 27 deletions
diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index 6beea36424..b388858824 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -242,6 +242,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'delcurs', 'hangoncurs', 'fadeupyellows', + 'fadeupmonfirst', 'loadroomssample', 'printlogo', ], skip_output = [ diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp index 29cb4bf0ec..95ec50f6f5 100644 --- a/engines/dreamweb/dreamgen.cpp +++ b/engines/dreamweb/dreamgen.cpp @@ -2745,30 +2745,6 @@ void DreamGenContext::fadeupmon() { hangon(); } -void DreamGenContext::fadeupmonfirst() { - STACK_CHECK; - paltostartpal(); - paltoendpal(); - es = data.word(kBuffers); - di = (0+(228*13)+32+60+(32*32)+(11*10*3))+(231*3); - cx = 3*8; - ax = 0; - _stosb(cx, true); - di = (0+(228*13)+32+60+(32*32)+(11*10*3))+(246*3); - _stosb(); - _stosw(); - data.byte(kFadedirection) = 1; - data.byte(kFadecount) = 63; - data.byte(kColourpos) = 0; - data.byte(kNumtofade) = 128; - cx = 64; - hangon(); - al = 26; - playchannel1(); - cx = 64; - hangon(); -} - void DreamGenContext::initialmoncols() { STACK_CHECK; paltostartpal(); @@ -15472,7 +15448,6 @@ void DreamGenContext::__dispatch_call(uint16 addr) { case addr_dumpcurrent: dumpcurrent(); break; case addr_fadedownmon: fadedownmon(); break; case addr_fadeupmon: fadeupmon(); break; - case addr_fadeupmonfirst: fadeupmonfirst(); break; case addr_initialmoncols: initialmoncols(); break; case addr_titles: titles(); break; case addr_endgame: endgame(); break; diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h index 970ebc7690..dd6ffb75cb 100644 --- a/engines/dreamweb/dreamgen.h +++ b/engines/dreamweb/dreamgen.h @@ -473,7 +473,6 @@ public: static const uint16 addr_endgame = 0xc2c4; static const uint16 addr_titles = 0xc2c0; static const uint16 addr_initialmoncols = 0xc2bc; - static const uint16 addr_fadeupmonfirst = 0xc2b4; static const uint16 addr_fadeupmon = 0xc2b0; static const uint16 addr_fadedownmon = 0xc2ac; static const uint16 addr_dumpcurrent = 0xc2a8; @@ -1260,7 +1259,7 @@ public: //void fillspace(); //void multiget(); //void autosetwalk(); - void fadeupmonfirst(); + //void fadeupmonfirst(); void drawfloor(); void loadkeypad(); //void findsource(); diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h index ad86481297..5ada5b7f91 100644 --- a/engines/dreamweb/stubs.h +++ b/engines/dreamweb/stubs.h @@ -293,5 +293,6 @@ void readsetdata(); void loadroomssample(); void fadeupyellows(); + void fadeupmonfirst(); void printlogo(); diff --git a/engines/dreamweb/vgafades.cpp b/engines/dreamweb/vgafades.cpp index ef03831997..6e0dd665f6 100644 --- a/engines/dreamweb/vgafades.cpp +++ b/engines/dreamweb/vgafades.cpp @@ -94,5 +94,20 @@ void DreamGenContext::fadeupyellows() { hangon(128); } +void DreamGenContext::fadeupmonfirst() { + paltostartpal(); + paltoendpal(); + memset(startPalette() + 231*3, 0, 8*3); + memset(startPalette() + 246*3, 0, 1*3); + data.byte(kFadedirection) = 1; + data.byte(kFadecount) = 63; + data.byte(kColourpos) = 0; + data.byte(kNumtofade) = 128; + hangon(64); + al = 26; + playchannel1(); + hangon(64); +} + } /*namespace dreamgen */ |