diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index b97cf5cd361..76cbca9a407 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -505,6 +505,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'printdirect', 'printlogo', 'printmessage', + 'printoutermon', 'printslow', 'printsprites', 'printundermon', @@ -578,6 +579,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'showallex', 'showallfree', 'showallobs', + 'showarrows', 'showblink', 'showbyte', 'showcity', diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp index aff617e5ada..8fc7ca1f5e6 100644 --- a/engines/dreamweb/dreamgen.cpp +++ b/engines/dreamweb/dreamgen.cpp @@ -3658,28 +3658,6 @@ void DreamGenContext::getDestInfo() { ax = pop(); } -void DreamGenContext::showArrows() { - STACK_CHECK; - di = 116-12; - bx = 16; - ds = data.word(kTempgraphics); - al = 0; - ah = 0; - showFrame(); - di = 226+12; - bx = 16; - ds = data.word(kTempgraphics); - al = 1; - ah = 0; - showFrame(); - di = 280; - bx = 14; - ds = data.word(kTempgraphics); - al = 2; - ah = 0; - showFrame(); -} - void DreamGenContext::resetLocation() { STACK_CHECK; push(ax); @@ -3731,34 +3709,6 @@ clearedlocations: es.byte(bx) = 0; } -void DreamGenContext::printOuterMon() { - STACK_CHECK; - di = 40; - bx = 32; - ds = data.word(kTempgraphics); - al = 1; - ah = 0; - showFrame(); - di = 264; - bx = 32; - ds = data.word(kTempgraphics); - al = 2; - ah = 0; - showFrame(); - di = 40; - bx = 12; - ds = data.word(kTempgraphics); - al = 3; - ah = 0; - showFrame(); - di = 40; - bx = 164; - ds = data.word(kTempgraphics); - al = 4; - ah = 0; - showFrame(); -} - void DreamGenContext::lookInInterface() { STACK_CHECK; al = 'I'; diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h index a981fd8d78f..39711a4ee98 100644 --- a/engines/dreamweb/dreamgen.h +++ b/engines/dreamweb/dreamgen.h @@ -595,8 +595,6 @@ public: void deleteExText(); void entryAnims(); void getFreeAd(); - void showArrows(); - void printOuterMon(); void showDecisions(); void removeObFromInv(); void heavy(); diff --git a/engines/dreamweb/monitor.cpp b/engines/dreamweb/monitor.cpp index f552b71c006..40bf8ed1be4 100644 --- a/engines/dreamweb/monitor.cpp +++ b/engines/dreamweb/monitor.cpp @@ -278,6 +278,13 @@ void DreamGenContext::turnOnPower() { powerLightOn(); } +void DreamGenContext::printOuterMon() { + showFrame(tempGraphics(), 40, 32, 1, 0); + showFrame(tempGraphics(), 264, 32, 2, 0); + showFrame(tempGraphics(), 40, 12, 3, 0); + showFrame(tempGraphics(), 40, 164, 4, 0); +} + void DreamGenContext::loadPersonal() { if (data.byte(kLocation) == 0 || data.byte(kLocation) == 42) data.word(kTextfile1) = standardLoad("DREAMWEB.T01"); // monitor file 1 diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp index 79917424249..587346a898e 100644 --- a/engines/dreamweb/stubs.cpp +++ b/engines/dreamweb/stubs.cpp @@ -3779,4 +3779,10 @@ void DreamGenContext::examineInventory() { workToScreenM(); } +void DreamGenContext::showArrows() { + showFrame(tempGraphics(), 116 - 12, 16, 0, 0); + showFrame(tempGraphics(), 226 + 12, 16, 1, 0); + showFrame(tempGraphics(), 280, 14, 2, 0); +} + } // End of namespace DreamGen diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h index 9e33b029c3e..92a703bc638 100644 --- a/engines/dreamweb/stubs.h +++ b/engines/dreamweb/stubs.h @@ -558,5 +558,7 @@ void getTime(); void set16ColPalette(); void examineInventory(); + void printOuterMon(); + void showArrows(); #endif