Merge remote branch 'upstream/master' into pegasus

21 files changed, 598 insertions, 36 deletions

diff --git a/devtools/tasmrecover/dreamweb/backdrop.asm b/devtools/tasmrecover/dreamweb/backdrop.asm
index ec0e4959b3..f588e7d02b 100644
--- a/devtools/tasmrecover/dreamweb/backdrop.asm
+++ b/devtools/tasmrecover/dreamweb/backdrop.asm
@@ -1,4 +1,4 @@
-;Copyright (c) 1990-2011 by Neil Dodwell
+;Copyright (c) 1990-2012 by Neil Dodwell
 ;Released with permission from Neil Dodwell under GPLv2
 ;See LICENSE file for full license text
 ;----------------------------------------------Code to draw floor and panel----
diff --git a/devtools/tasmrecover/dreamweb/debug.asm b/devtools/tasmrecover/dreamweb/debug.asm
index 951da4fa3f..f4321de7bf 100644
--- a/devtools/tasmrecover/dreamweb/debug.asm
+++ b/devtools/tasmrecover/dreamweb/debug.asm
@@ -1,4 +1,4 @@
-;Copyright (c) 1990-2011 by Neil Dodwell
+;Copyright (c) 1990-2012 by Neil Dodwell
 ;Released with permission from Neil Dodwell under GPLv2
 ;See LICENSE file for full license text
 
diff --git a/devtools/tasmrecover/dreamweb/dreamweb.asm b/devtools/tasmrecover/dreamweb/dreamweb.asm
index fa3a4f7957..28165a51ab 100644
--- a/devtools/tasmrecover/dreamweb/dreamweb.asm
+++ b/devtools/tasmrecover/dreamweb/dreamweb.asm
@@ -1,4 +1,4 @@
-;Copyright (c) 1990-2011 by Neil Dodwell
+;Copyright (c) 1990-2012 by Neil Dodwell
 ;Released with permission from Neil Dodwell under GPLv2
 ;See LICENSE file for full license text
 
diff --git a/devtools/tasmrecover/dreamweb/keypad.asm b/devtools/tasmrecover/dreamweb/keypad.asm
index 6eee2fa11c..29542937c1 100644
--- a/devtools/tasmrecover/dreamweb/keypad.asm
+++ b/devtools/tasmrecover/dreamweb/keypad.asm
@@ -1,4 +1,4 @@
-;Copyright (c) 1990-2011 by Neil Dodwell
+;Copyright (c) 1990-2012 by Neil Dodwell
 ;Released with permission from Neil Dodwell under GPLv2
 ;See LICENSE file for full license text
 Entercode	proc	near
diff --git a/devtools/tasmrecover/dreamweb/look.asm b/devtools/tasmrecover/dreamweb/look.asm
index a5a8b8055e..81fa663e19 100644
--- a/devtools/tasmrecover/dreamweb/look.asm
+++ b/devtools/tasmrecover/dreamweb/look.asm
@@ -1,4 +1,4 @@
-;Copyright (c) 1990-2011 by Neil Dodwell
+;Copyright (c) 1990-2012 by Neil Dodwell
 ;Released with permission from Neil Dodwell under GPLv2
 ;See LICENSE file for full license text
 ;---------------------------------------------------------------Look-routine----
diff --git a/devtools/tasmrecover/dreamweb/monitor.asm b/devtools/tasmrecover/dreamweb/monitor.asm
index 5354e9f7d5..25075e7eb7 100644
--- a/devtools/tasmrecover/dreamweb/monitor.asm
+++ b/devtools/tasmrecover/dreamweb/monitor.asm
@@ -1,4 +1,4 @@
-;Copyright (c) 1990-2011 by Neil Dodwell
+;Copyright (c) 1990-2012 by Neil Dodwell
 ;Released with permission from Neil Dodwell under GPLv2
 ;See LICENSE file for full license text
 Usemon	proc	near
diff --git a/devtools/tasmrecover/dreamweb/newplace.asm b/devtools/tasmrecover/dreamweb/newplace.asm
index b06a351f5f..d2f54509dd 100644
--- a/devtools/tasmrecover/dreamweb/newplace.asm
+++ b/devtools/tasmrecover/dreamweb/newplace.asm
@@ -1,4 +1,4 @@
-;Copyright (c) 1990-2011 by Neil Dodwell
+;Copyright (c) 1990-2012 by Neil Dodwell
 ;Released with permission from Neil Dodwell under GPLv2
 ;See LICENSE file for full license text
 ;----------------------------------------------------Choosing a new location----
diff --git a/devtools/tasmrecover/dreamweb/object.asm b/devtools/tasmrecover/dreamweb/object.asm
index 6a5f7c30a8..f7068d2cb0 100644
--- a/devtools/tasmrecover/dreamweb/object.asm
+++ b/devtools/tasmrecover/dreamweb/object.asm
@@ -1,4 +1,4 @@
-;Copyright (c) 1990-2011 by Neil Dodwell
+;Copyright (c) 1990-2012 by Neil Dodwell
 ;Released with permission from Neil Dodwell under GPLv2
 ;See LICENSE file for full license text
 ;---------------------------------------------------------Inventory printer----
diff --git a/devtools/tasmrecover/dreamweb/print.asm b/devtools/tasmrecover/dreamweb/print.asm
index 7cbb45c08b..22ca61b8b1 100644
--- a/devtools/tasmrecover/dreamweb/print.asm
+++ b/devtools/tasmrecover/dreamweb/print.asm
@@ -1,4 +1,4 @@
-;Copyright (c) 1990-2011 by Neil Dodwell
+;Copyright (c) 1990-2012 by Neil Dodwell
 ;Released with permission from Neil Dodwell under GPLv2
 ;See LICENSE file for full license text
 Printchar	proc	near
diff --git a/devtools/tasmrecover/dreamweb/saveload.asm b/devtools/tasmrecover/dreamweb/saveload.asm
index f3c92d36f6..a49b527d01 100644
--- a/devtools/tasmrecover/dreamweb/saveload.asm
+++ b/devtools/tasmrecover/dreamweb/saveload.asm
@@ -1,4 +1,4 @@
-;Copyright (c) 1990-2011 by Neil Dodwell
+;Copyright (c) 1990-2012 by Neil Dodwell
 ;Released with permission from Neil Dodwell under GPLv2
 ;See LICENSE file for full license text
 
diff --git a/devtools/tasmrecover/dreamweb/sblaster.asm b/devtools/tasmrecover/dreamweb/sblaster.asm
index 7a271e9c90..5eef2dbfd8 100644
--- a/devtools/tasmrecover/dreamweb/sblaster.asm
+++ b/devtools/tasmrecover/dreamweb/sblaster.asm
@@ -1,4 +1,4 @@
-;Copyright (c) 1990-2011 by Neil Dodwell
+;Copyright (c) 1990-2012 by Neil Dodwell
 ;Released with permission from Neil Dodwell under GPLv2
 ;See LICENSE file for full license text
 ; Creative Reality Sound Blaster Drivers . (C) 1994 Creative Reality
diff --git a/devtools/tasmrecover/dreamweb/sprite.asm b/devtools/tasmrecover/dreamweb/sprite.asm
index 06b06c76e3..c6a75063a0 100644
--- a/devtools/tasmrecover/dreamweb/sprite.asm
+++ b/devtools/tasmrecover/dreamweb/sprite.asm
@@ -1,4 +1,4 @@
-;Copyright (c) 1990-2011 by Neil Dodwell
+;Copyright (c) 1990-2012 by Neil Dodwell
 ;Released with permission from Neil Dodwell under GPLv2
 ;See LICENSE file for full license text
 ;------------------------------------------------------------People Routines----
@@ -244,7 +244,7 @@ Reelroutines	db	1,44,0 	;Room number and x,y
 	db	255
 
 
-Lenofreelrouts	equ	$-reelroutines
+Lenofreelrouts	equ 457 ; $-reelroutines
 
 
 Reelcalls	dw	gamer,sparkydrip,eden,edeninbath,sparky,smokebloke
diff --git a/devtools/tasmrecover/dreamweb/talk.asm b/devtools/tasmrecover/dreamweb/talk.asm
index 4d6b381881..91cbb96c6e 100644
--- a/devtools/tasmrecover/dreamweb/talk.asm
+++ b/devtools/tasmrecover/dreamweb/talk.asm
@@ -1,4 +1,4 @@
-;Copyright (c) 1990-2011 by Neil Dodwell
+;Copyright (c) 1990-2012 by Neil Dodwell
 ;Released with permission from Neil Dodwell under GPLv2
 ;See LICENSE file for full license text
 Talk	proc	near
diff --git a/devtools/tasmrecover/dreamweb/titles.asm b/devtools/tasmrecover/dreamweb/titles.asm
index 52f58867ed..f2e96f9c78 100644
--- a/devtools/tasmrecover/dreamweb/titles.asm
+++ b/devtools/tasmrecover/dreamweb/titles.asm
@@ -1,4 +1,4 @@
-;Copyright (c) 1990-2011 by Neil Dodwell
+;Copyright (c) 1990-2012 by Neil Dodwell
 ;Released with permission from Neil Dodwell under GPLv2
 ;See LICENSE file for full license text
 
diff --git a/devtools/tasmrecover/dreamweb/use.asm b/devtools/tasmrecover/dreamweb/use.asm
index 78917d50f4..f8c64f6f45 100644
--- a/devtools/tasmrecover/dreamweb/use.asm
+++ b/devtools/tasmrecover/dreamweb/use.asm
@@ -1,4 +1,4 @@
-;Copyright (c) 1990-2011 by Neil Dodwell
+;Copyright (c) 1990-2012 by Neil Dodwell
 ;Released with permission from Neil Dodwell under GPLv2
 ;See LICENSE file for full license text
 
diff --git a/devtools/tasmrecover/dreamweb/vars.asm b/devtools/tasmrecover/dreamweb/vars.asm
index 6d34074528..99592233d3 100644
--- a/devtools/tasmrecover/dreamweb/vars.asm
+++ b/devtools/tasmrecover/dreamweb/vars.asm
@@ -1,4 +1,4 @@
-;Copyright (c) 1990-2011 by Neil Dodwell
+;Copyright (c) 1990-2012 by Neil Dodwell
 ;Released with permission from Neil Dodwell under GPLv2
 ;See LICENSE file for full license text
 ;---------------------------------------------------Equates and definitions----
diff --git a/devtools/tasmrecover/dreamweb/vgafades.asm b/devtools/tasmrecover/dreamweb/vgafades.asm
index a1043d9cf5..a39ae5d297 100644
--- a/devtools/tasmrecover/dreamweb/vgafades.asm
+++ b/devtools/tasmrecover/dreamweb/vgafades.asm
@@ -1,4 +1,4 @@
-;Copyright (c) 1990-2011 by Neil Dodwell
+;Copyright (c) 1990-2012 by Neil Dodwell
 ;Released with permission from Neil Dodwell under GPLv2
 ;See LICENSE file for full license text
 Fadedos	proc	near
diff --git a/devtools/tasmrecover/dreamweb/vgagrafx.asm b/devtools/tasmrecover/dreamweb/vgagrafx.asm
index 4ba1b16ba1..368ad3c501 100644
--- a/devtools/tasmrecover/dreamweb/vgagrafx.asm
+++ b/devtools/tasmrecover/dreamweb/vgagrafx.asm
@@ -1,4 +1,4 @@
-;Copyright (c) 1990-2011 by Neil Dodwell
+;Copyright (c) 1990-2012 by Neil Dodwell
 ;Released with permission from Neil Dodwell under GPLv2
 ;See LICENSE file for full license text
 Screenwidth	equ	320		;physical width of screen
diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index 7c89ab44f5..e46b2efaa8 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -41,17 +41,37 @@ p = parser(skip_binary_data = [
 	'recname',
 	'fileheader',
 	'filedata',
+	'foreignrelease',
 	'extradata',
 	'keybuffer',
 	'spritename1',
+	'subtitles',
 	'icongraphics0',
 	'icongraphics1',
 	'savenames',
 	'volumetabname',
+	'commandline',
+	'openchangesize',
+	'roompics',
+	'roomscango',
+	'oplist',
+	'presslist',
+	'inputline',
+	'flashmousetab',
+	'id',
+	'place',
+	'blinktab',
+	'quitrequested',
 	# keypad.asm
 	'keypadlist',
 	'symbollist',
 	'diarylist',
+	# monitor.asm
+	'comlist',
+	'keys',
+	'rootdir',
+	'operand1',
+	'currentfile',
 	# newplace.asm
 	'destlist',
 	# object.asm
@@ -72,6 +92,7 @@ p = parser(skip_binary_data = [
 	'gameerror8',
 	'error2patch',
 	'error6patch',
+	'error8patch',
 	'gameinfo',
 	'endgametext1',
 	'savefiles',
@@ -82,7 +103,10 @@ p = parser(skip_binary_data = [
 	'dmaaddresses',
 	'speechfilename',
 	'speechfile',
+	'speechlength',
+	'soundbufferwrite',
 	# sprite.asm
+	'reelroutines',
 	'reelcalls',
 	'facelist',
 	'rainlocations',
@@ -104,14 +128,21 @@ p = parser(skip_binary_data = [
 	'title6graphics',
 	# use.asm
 	'uselist',
+	'money1poke',
+	'money2poke',
 	# vars.asm
 	'currentset',
+	'currentsample',
+	'ch0playing',
+	'ch0repeat',
+	'ch1playing',
 	'icons1',
 	'icons2',
 	'tempcharset',
 	'currentframe',
 	'takeoff',
 	'reelpointer',
+	'roomssample',
 	'needsoundbuff',
 	'oldint8seg',
 	'oldint8add',
@@ -148,6 +179,415 @@ p = parser(skip_binary_data = [
 	'ch1blocksplayed',
 	'soundemmpage',
 	'speechemmpage',
+	'speechloaded',
+	'lineroutine',
+	'increment1',
+	'increment2',
+	'keypadax',
+	'keypadcx',
+	'soundbuffer',
+	'cursloc',
+	'liftsoundcount',
+	'playblock',
+	'gotfrom',
+	'flagx',
+	'flagy',
+	'lastflagex',
+	'keynum',
+	'newlogonum',
+	'currentex',
+	'currentfree',
+	'frsegment',
+	'dataad',
+	'framesad',
+	'objectx',
+	'objecty',
+	'savesize',
+	'savesource',
+	'savex',
+	'savey',
+	'persondata',
+	'talknum',
+	'saidno',
+	'prioritydep',
+	'currentkey2',
+	'mustload',
+	'answered',
+	'slotdata',
+	'thisslot',
+	'slotflags',
+	'numberinroom',
+	'currentcel',
+	'oldselection',
+	'stopwalking',
+	'mouseon',
+	'played',
+	'timer1',
+	'timer2',
+	'timer3',
+	'volume',
+	'volumeto',
+	'volumedirection',
+	'volumecount',
+	'wholetimer',
+	'wongame',
+	'timer1to',
+	'timer2to',
+	'timer3to',
+	'oldsubject',
+	'buffers',
+	'itemtotran',
+	'symboltolight',
+	'symbol1',
+	'symbol2',
+	'symbol3',
+	'symbolnum',
+	'monsource',
+	'netseg',
+	'netpoint',
+	'cursorstate',
+	'ch0blockstocopy',
+	'ch1blockstocopy',
+	'sounddata',
+	'sounddata2',
+	'mapstore',
+	'mapdata',
+	'backdrops',
+	'textfile1',
+	'textfile2',
+	'textfile3',
+	'puzzletext',
+	'commandtext',
+	'traveltext',
+	'tempgraphics',
+	'tempgraphics2',
+	'tempgraphics3',
+	'tempsprites',
+	'charset1',
+	'extras',
+	'freeframes',
+	'setframes',
+	'reel1',
+	'reel2',
+	'reel3',
+	'setdesc',
+	'blockdesc',
+	'roomdesc',
+	'freedesc',
+	'people',
+	'reels',
+	'setdat',
+	'freedat',
+	'speechcount',
+	'charshift',
+	'kerning',
+	'brightness',
+	'roomloaded',
+	'didzoom',
+	'linespacing',
+	'textaddressx',
+	'textaddressy',
+	'textlen',
+	'lastxpos',
+	'icontop',
+	'iconleft',
+	'itemframe',
+	'roomad',
+	'withobject',
+	'withtype',
+	'lookcounter',
+	'command',
+	'commandtype',
+	'oldcommandtype',
+	'objecttype',
+	'getback',
+	'invopen',
+	'mainmode',
+	'pickup',
+	'lastinvpos',
+	'examagain',
+	'newtextline',
+	'openedob',
+	'openedtype',
+	'oldmapadx',
+	'oldmapady',
+	'mapadx',
+	'mapady',
+	'mapoffsetx',
+	'mapoffsety',
+	'mapxstart',
+	'mapystart',
+	'mapxsize',
+	'mapysize',
+	'havedoneobs',
+	'manisoffscreen',
+	'rainspace',
+	'facing',
+	'leavedirection',
+	'turntoface',
+	'turndirection',
+	'maintimer',
+	'introcount',
+	'arrowad',
+	'currentkey',
+	'oldkey',
+	'useddirection',
+	'timercount',
+	'oldtimercount',
+	'mapx',
+	'mapy',
+	'newscreen',
+	'ryanx',
+	'ryany',
+	'lastflag',
+	'offsetx',
+	'offsety',
+	'currentob',
+	'destpos',
+	'reallocation',
+	'roomnum',
+	'nowinnewroom',
+	'resetmanxy',
+	'newlocation',
+	'autolocation',
+	'doorcheck1',
+	'doorcheck2',
+	'doorcheck3',
+	'doorcheck4',
+	'mousex',
+	'mousey',
+	'mousebutton',
+	'mousebutton1',
+	'mousebutton2',
+	'mousebutton3',
+	'mousebutton4',
+	'oldbutton',
+	'oldx',
+	'oldy',
+	'lastbutton',
+	'oldpointerx',
+	'oldpointery',
+	'delherex',
+	'delherey',
+	'pointerxs',
+	'pointerys',
+	'delxs',
+	'delys',
+	'pointerframe',
+	'pointerpower',
+	'auxpointerframe',
+	'pointermode',
+	'pointerspeed',
+	'pointercount',
+	'inmaparea',
+	'talkmode',
+	'talkpos',
+	'character',
+	'watchdump',
+	'logonum',
+	'oldlogonum',
+	'pressed',
+	'presspointer',
+	'graphicpress',
+	'presscount',
+	'lightcount',
+	'folderpage',
+	'diarypage',
+	'menucount',
+	'symboltopx',
+	'symboltopnum',
+	'symboltopdir',
+	'symbolbotx',
+	'symbolbotnum',
+	'symbolbotdir',
+	'dumpx',
+	'dumpy',
+	'walkandexam',
+	'walkexamtype',
+	'walkexamnum',
+	'curslocx',
+	'curslocy',
+	'curpos',
+	'monadx',
+	'monady',
+	'numtodo',
+	'timecount',
+	'counttotimed',
+	'timedseg',
+	'timedoffset',
+	'timedy',
+	'timedx',
+	'needtodumptimed',
+	'loadingorsave',
+	'currentslot',
+	'cursorpos',
+	'colourpos',
+	'fadedirection',
+	'numtofade',
+	'fadecount',
+	'addtogreen',
+	'addtored',
+	'addtoblue',
+	'lastsoundreel',
+	'volume',
+	'volumeto',
+	'volumedirection',
+	'volumecount',
+	'lasthardkey',
+	'bufferin',
+	'bufferout',
+	'workspace',
+	'mainsprites',
+	'backdrop',
+	'recordspace',
+	'blinkframe',
+	'blinkcount',
+	'reasseschanges',
+	'pointerspath',
+	'manspath',
+	'pointerfirstpath',
+	'finaldest',
+	'destination',
+	'linestartx',
+	'linestarty',
+	'lineendx',
+	'lineendy',
+	'linepointer',
+	'linedirection',
+	'linelength',
+	# vars.asm - saved vars
+	'startvars',
+	'progresspoints',
+	'watchon',
+	'shadeson',
+	'secondcount',
+	'minutecount',
+	'hourcount',
+	'zoomon',
+	'location',
+	'expos',
+	'exframepos',
+	'extextpos',
+	'card1money',
+	'listpos',
+	'ryanpage',
+	'watchingtime',
+	'reeltowatch',
+	'endwatchreel',
+	'speedcount',
+	'watchspeed',
+	'reeltohold',
+	'endofholdreel',
+	'watchmode',
+	'destafterhold',
+	'newsitem',
+	'liftflag',
+	'liftpath',
+	'lockstatus',
+	'doorpath',
+	'counttoopen',
+	'counttoclose',
+	'rockstardead',
+	'generaldead',
+	'sartaindead',
+	'aidedead',
+	'beenmugged',
+	'gunpassflag',
+	'canmovealtar',
+	'talkedtoattendant',
+	'talkedtosparky',
+	'talkedtoboss',
+	'talkedtorecep',
+	'cardpassflag',
+	'madmanflag',
+	'keeperflag',
+	'lasttrigger',
+	'mandead',
+	'seed',
+	'seed',
+	'seed',
+	'needtotravel',
+	'throughdoor',
+	'newobs',
+	'ryanon',
+	'combatcount',
+	'lastweapon',
+	'dreamnumber',
+	'roomafterdream',
+	'shakecounter',
+	# vars.asm - constants
+	'openinvlist',
+	'ryaninvlist',
+	'pointerback',
+	'mapflags',
+	'startpal',
+	'endpal',
+	'maingamepal',
+	'spritetable',
+	'setlist',
+	'freelist',
+	'exlist',
+	'peoplelist',
+	'zoomspace',
+	'printedlist',
+	'listofchanges',
+	'undertimedtext',
+	'rainlist',
+	'initialreelrouts',
+	'initialvars',
+	'lengthofbuffer',
+	'lenofreelrouts',
+	'reellist',
+	'intext',
+	'lengthofmap',
+	'blocktext',
+	'blocks',
+	'frframes',
+	'frames',
+	'persontxtdat',
+	'persontext',
+	'tablesize',
+	'undertextsizex',	# defined in dreambase.h
+	'undertextsizey',	# defined in dreambase.h
+	'lengthofvars',		# defined in dreambase.h
+	'lenofmapstore',	# defined in dreambase.h
+	'keypadx',
+	'keypady',
+	'settext',
+	'freetext',
+	'setdatlen',
+	'textstart',
+	'maplen',
+	'maplength',
+	'undertimedysize',
+	'blocktextdat',
+	'personframes',
+	'map',
+	'settextdat',
+	'textunder',
+	'pathdata',
+	'framedata',
+	'flags',
+	'intextdat',
+	'freetextdat',
+	'frframedata',
+	'zoomx',
+	'zoomy',
+	'menux',
+	'menuy',
+	'headerlen',
+	'freedatlen',
+	'diaryx',
+	'diaryy',
+	'inventx',
+	'inventy',
+	'screenwidth',
+	'mapwidth',
+	'opsx',
+	'opsy',
+	'symbolx',
+	'symboly',
+	'numchanges',
 	# vgagrafx.asm
 	'cityname',
 	'extragraphics1',
@@ -187,7 +627,7 @@ p = parser(skip_binary_data = [
 	'diarytext',
 	'title7graphics',
 	'handle',
-	# 'basicsample', # This can't be removed due to tasm-recover limitations
+	'basicsample',
 	'endtextname',
 	'gungraphic',
 	'monkface',
@@ -204,10 +644,15 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'actualload',
 	'actualsave',
 	'addalong',
+	'additionaltext',
 	'addlength',
 	'addtopeoplelist',
 	'addtopresslist',
+	'adjustdown',
+	'adjustleft',
 	'adjustlen',
+	'adjustright',
+	'adjustup',
 	'advisor',
 	'afterintroroom',
 	'afternewroom',
@@ -226,6 +671,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'autolook',
 	'autosetwalk',
 	'backobject',
+	'bartender',
 	'barwoman',
 	'biblequote',
 	'blank',
@@ -234,6 +680,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'bossman',
 	'bothchannels',
 	'bresenhams',
+	'businessman',
 	'buttoneight',
 	'buttonenter',
 	'buttonfive',
@@ -265,6 +712,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'checkcoords',
 	'checkdest',
 	'checkforemm',
+	'checkforexit',
 	'checkforshake',
 	'checkifex',
 	'checkiffree',
@@ -272,11 +720,15 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'checkifperson',
 	'checkifset',
 	'checkinput',
+	'checkinside',
+	'checkobjectsize',
 	'checkone',
 	'checksoundint',
 	'checkspeed',
 	'chewy',
 	'clearbeforeload',
+	'clearbuffers',
+	'clearchanges',
 	'clearendpal',
 	'clearpalette',
 	'clearreels',
@@ -306,15 +758,21 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'decide',
 	'delchar',
 	'delcurs',
+	'deleteexframe',
+	'deleteextext',
+	'deleteexobject',
 	'deletetaken',
 	'deleverything',
 	'delpointer',
 	'delsprite',
 	'deltextline',
 	'delthisone',
+	'describeob',
 	'destselect',
 	'diarykeyp',
 	'diarykeyn',
+	'dircom',
+	'dirfile',
 	'disablepath',
 	'disablesoundint',
 	'discops',
@@ -329,15 +787,20 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'dontloadseg',
 	'doorway',
 	'dosaveload',
+	'dosometalk',
 	'dosreturn',
 	'doshake',
 	'drawflags',
 	'drawfloor',
+	'drawitall',
+	'dreamweb',
 	'drinker',
 	'droperror',
+	'dropobject',
 	'drunk',
 	'dumpblink',
 	'dumpcurrent',
+	'dumpdiarykeys',
 	'dumpeverything',
 	'dumpkeypad',
 	'dumpmap',
@@ -352,11 +815,15 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'eden',
 	'edeninbath',
 	'edenscdplayer',
+	'emergencypurge',
 	'enablesoundint',
 	'endgame',
+	'endgameseq',
 	'endpaltostart',
 	'entercode',
 	'entersymbol',
+	'entryanims',
+	'entrytexts',
 	'eraseoldobs',
 	'error',
 	'errormessage1',
@@ -366,29 +833,43 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'examinventory',
 	'examineob',
 	'examineobtext',
+	'execcommand',
 	'facerightway',
 	'fadecalculation',
 	'fadedos',
+	'fadedownmon',
 	'fadefromwhite',
 	'fadescreenup',
 	'fadescreenups',
 	'fadescreenuphalf',
 	'fadescreendown',
 	'fadescreendowns',
+	'fadescreendownhalf',
 	'fadetowhite',
+	'fadeupmon',
 	'fadeupmonfirst',
 	'fadeupyellows',
 	'femalefan',
+	'fillopen',
 	'fillryan',
 	'fillspace',
 	'finalframe',
+	'findallopen',
 	'findallryan',
+	'findexobject',
+	'findfirstpath',
+	'findinvpos',
 	'findlen',
 	'findnextcolon',
 	'findobname',
+	'findopenpos',
 	'findormake',
+	'findpathofpoint',
+	'findpuztext',
 	'findroominloc',
+	'findsetobject',
 	'findsource',
+	'findtext1',
 	'findxyfrompath',
 	'finishedwalking',
 	'folderexit',
@@ -401,21 +882,30 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'gamer',
 	'gates',
 	'generalerror',
+	'getanyad',
 	'getanyaddir',
 	'getback1',
 	'getbackfromob',
 	'getbackfromops',
 	'getbacktoops',
 	'getblockofpixel',
+	'getdestinfo',
 	'getdimension',
+	'geteitherad',
+	'getexad',
 	'getexpos',
 	'getflagunderp',
+	'getfreead',
+	'getkeyandlogo',
 	'getlocation',
 	'getmapad',
 	'getnamepos',
 	'getnextword',
 	'getnumber',
+	'getobtextstart',
+	'getopenedsize',
 	'getpersframe',
+	'getpersontext',
 	'getreelframeax',
 	'getreelstart',
 	'getridofall',
@@ -429,8 +919,10 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'getridoftemptext',
 	'getroomdata',
 	'getroomspaths',
+	'getsetad',
 	'gettime',
 	'gettingshot',
+	'getundercentre',
 	'getundermenu',
 	'getundertimed',
 	'getunderzoom',
@@ -445,14 +937,20 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'hangonp',
 	'hangonpq',
 	'hangonw',
+	'heavy',
+	'helicopter',
 	'hotelbell',
 	'hotelcontrol',
+	'identifyob',
+	'incryanpage',
 	'initialinv',
+	'initialmoncols',
 	'initman',
 	'initrain',
 	'input',
 	'interupttest',
 	'interviewer',
+	'intoinv',
 	'intro',
 	'intro1text',
 	'intro2text',
@@ -467,6 +965,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'isitdescribed',
 	'isitright',
 	'isitworn',
+	'isryanholding',
 	'issetobonmap',
 	'keeper',
 	'kernchars',
@@ -499,11 +998,15 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'loadtempcharset',
 	'loadtemptext',
 	'loadtraveltext',
+	'locationpic',
 	'lockeddoorway',
 	'locklightoff',
 	'locklighton',
 	'lockmon',
 	'look',
+	'lookatcard',
+	'lookatplace',
+	'lookininterface',
 	'loopchannel0',
 	'louis',
 	'louischair',
@@ -515,6 +1018,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'mainman',
 	'mainscreen',
 	'makebackob',
+	'makecaps',
 	'makeheader',
 	'makemainscreen',
 	'makename',
@@ -529,6 +1033,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'middlepanel',
 	'mode640x480',
 	'modifychar',
+	'moneypoke',
 	'monitorlogo',
 	'monkandryan',
 	'monks2text',
@@ -538,6 +1043,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'moretalk',
 	'mousecall',
 	'movemap',
+	'mugger',
 	'multidump',
 	'multiget',
 	'multiput',
@@ -545,9 +1051,11 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'neterror',
 	'newgame',
 	'newplace',
+	'nextcolon',
 	'nextdest',
 	'nextfolder',
 	'nextsymbol',
+	'nothelderror',
 	'obicons',
 	'obname',
 	'obpicture',
@@ -564,6 +1072,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'openhoteldoor2',
 	'openinv',
 	'openlouis',
+	'openob',
 	'openpoolboss',
 	'openryan',
 	'opensarters',
@@ -572,12 +1081,16 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'openyourneighbour',
 	'othersmoker',
 	'out22c',
+	'outofinv',
+	'outofopen',
 	'paltoendpal',
 	'paltostartpal',
 	'panelicons1',
 	'paneltomap',
 	'parseblaster',
+	'parser',
 	'personnametext',
+	'pickupconts',
 	'pickupob',
 	'pitinterupt',
 	'pixelcheckset',
@@ -587,6 +1100,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'playchannel1',
 	'playguitar',
 	'plotreel',
+	'poolguard',
 	'powerlightoff',
 	'powerlighton',
 	'priest',
@@ -598,11 +1112,16 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'printdirect',
 	'printlogo',
 	'printmessage',
+	'printmessage2',
 	'printoutermon',
 	'printslow',
 	'printsprites',
 	'printundermon',
+	'processtrigger',
+	'purgealocation',
+	'purgeanitem',
 	'putbackobstuff',
+	'putundercentre',
 	'putundermenu',
 	'putundertimed',
 	'putunderzoom',
@@ -615,6 +1134,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'randomnum1',
 	'randomnum2',
 	'randomnumber',
+	'read',
 	'readabyte',
 	'readcitypic',
 	'readdesticon',
@@ -629,21 +1149,30 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'readoneblock',
 	'readsetdata',
 	'realcredits',
+	'receptionist',
 	'reconstruct',
 	'redes',
 	'redrawmainscrn',
 	'reelsonscreen',
+	'reexfrominv',
 	'reexfromopen',
+	'reminders',
 	'removeemm',
+	'removefreeobject',
 	'removesetobject',
+	'removeobfrominv',
 	'resetkeyboard',
+	'resetlocation',
 	'restoreall',
 	'restoreems',
 	'restorereels',
 	'rockstar',
+	'rollem',
 	'rollendcredits',
 	'rollendcredits2',
 	'roomname',
+	'runendseq',
+	'runtap',
 	'runintroseq',
 	'saveems',
 	'savefileread',
@@ -655,9 +1184,15 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'scanfornames',
 	'screenupdate',
 	'scrollmonitor',
+	'searchforfiles',
+	'searchforsame',
+	'searchforstring',
 	'security',
 	'seecommandtail',
 	'selectlocation',
+	'selectob',
+	'selectopenob',
+	'selectslot',
 	'selectslot2',
 	'set16colpalette',
 	'setallchanges',
@@ -667,12 +1202,14 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'setlocation',
 	'setmode',
 	'setmouse',
+	'setpickup',
 	'setsoundoff',
 	'settopleft',
 	'settopright',
 	'setupemm',
 	'setuppit',
 	'setuptimedtemp',
+	'setuptimeduse',
 	'setwalk',
 	'showallex',
 	'showallfree',
@@ -684,6 +1221,8 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'showcurrentfile',
 	'showdecisions',
 	'showdiary',
+	'showdiarykeys',
+	'showdiarypage',
 	'showdiscops',
 	'showexit',
 	'showfirstuse',
@@ -694,6 +1233,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'showgun',
 	'showicon',
 	'showkeypad',
+	'showkeys',
 	'showleftpage',
 	'showloadops',
 	'showmainops',
@@ -714,10 +1254,12 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'showryanpage',
 	'showsaveops',
 	'showseconduse',
+	'showslots',
 	'showsymbol',
 	'showtime',
 	'showwatch',
 	'showword',
+	'signon',
 	'singlekey',
 	'sitdowninbar',
 	'slabdoora',
@@ -741,10 +1283,13 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'startdmablock',
 	'startloading',
 	'startpaltoend',
+	'starttalk',
 	'startup',
 	'startup1',
 	'steady',
 	'storeit',
+	'swapwithinv',
+	'swapwithopen',
 	'switchryanoff',
 	'switchryanon',
 	'talk',
@@ -753,9 +1298,13 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'textformonk',
 	'titles',
 	'train',
+	'transfercontoex',
 	'transferinv',
+	'transfermap',
 	'transfertext',
+	'transfertoex',
 	'trapdoor',
+	'triggermessage',
 	'trysoundalloc',
 	'turnanypathoff',
 	'turnanypathon',
@@ -765,16 +1314,22 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'twodigitnum',
 	'undertextline',
 	'updatepeople',
+	'updatesymboltop',
+	'updatesymbolbot',
+	'usealtar',
+	'useaxe',
 	'usebalcony',
 	'usebuttona',
 	'usecardreader1',
 	'usecardreader2',
 	'usecardreader3',
 	'usecart',
+	'usecashcard',
 	'usecharset1',
 	'usechurchgate',
 	'usechurchhole',
 	'useclearbox',
+	'usecontrol',
 	'usecooker',
 	'usecoveredbox',
 	'usediary',
@@ -786,7 +1341,10 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'useelevator5',
 	'useelvdoor',
 	'usefullcart',
+	'usegun',
+	'usehandle',
 	'usehole',
+	'usekey',
 	'useladder',
 	'useladderb',
 	'uselighter',
@@ -794,12 +1352,17 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'usemenu',
 	'usemon',
 	'useobject',
+	'useopenbox',
+	'useopened',
+	'usepipe',
 	'useplate',
 	'useplinth',
 	'usepoolreader',
 	'userailing',
 	'useroutine',
 	'useshield',
+	'useslab',
+	'usestereo',
 	'usetempcharset',
 	'usetext',
 	'usetimedtext',
@@ -823,6 +1386,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'wheelsound',
 	'widedoor',
 	'width160',
+	'withwhat',
 	'workoutframes',
 	'worktoscreen',
 	'worktoscreenm',
@@ -832,7 +1396,6 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'zoomonoff',
 	], skip_output = [
 	# These functions are processed but not output
-	'dreamweb',
 	], skip_dispatch_call = True, skip_addr_constants = True,
 	header_omit_blacklisted = True,
 	function_name_remapping = {
@@ -1244,7 +1807,6 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'nextdest' : 'nextDest',
 	'nextfolder' : 'nextFolder',
 	'nextsymbol' : 'nextSymbol',
-	'nothelderror' : 'notHeldError',
 	'obicons' : 'obIcons',
 	'obname' : 'obName',
 	'obpicture' : 'obPicture',
@@ -1301,7 +1863,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'printdirect' : 'printDirect',
 	'printlogo' : 'printLogo',
 	'printmessage' : 'printMessage',
-	'printmessage2' : 'printmessage2',
+	'printmessage2' : 'printMessage2',
 	'printoutermon' : 'printOuterMon',
 	'printslow' : 'printSlow',
 	'printsprites' : 'printSprites',
@@ -1450,12 +2012,12 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'signon' : 'signOn',
 	'singlekey' : 'singleKey',
 	'sitdowninbar' : 'sitDownInBar',
-	'slabdoora' : 'sLabDoorA',
-	'slabdoorb' : 'sLabDoorB',
-	'slabdoorc' : 'sLabDoorC',
-	'slabdoord' : 'sLabDoorD',
-	'slabdoore' : 'sLabDoorE',
-	'slabdoorf' : 'sLabDoorF',
+	'slabdoora' : 'slabDoorA',
+	'slabdoorb' : 'slabDoorB',
+	'slabdoorc' : 'slabDoorC',
+	'slabdoord' : 'slabDoorD',
+	'slabdoore' : 'slabDoorE',
+	'slabdoorf' : 'slabDoorF',
 	'smallcandle' : 'smallCandle',
 	'smokebloke' : 'smokeBloke',
 	'soldier1' : 'soldier1',
@@ -1547,7 +2109,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'userailing' : 'useRailing',
 	'useroutine' : 'useRoutine',
 	'useshield' : 'useShield',
-	'useslab' : 'useSLab',
+	'useslab' : 'useSlab',
 	'usestereo' : 'useStereo',
 	'usetempcharset' : 'useTempCharset',
 	'usetext' : 'useText',
diff --git a/devtools/tasmrecover/tasm/cpp.py b/devtools/tasmrecover/tasm/cpp.py
index 686aea9ee9..e1f8228ab7 100644
--- a/devtools/tasmrecover/tasm/cpp.py
+++ b/devtools/tasmrecover/tasm/cpp.py
@@ -653,10 +653,6 @@ public:
 			self.hd.write(
 """	void __dispatch_call(uint16 addr);
 """)
-		self.hd.write(
-"""#include "stubs.h" // Allow hand-reversed functions to have a signature different than void f()
-
-""")
 
 
 		for p in set(self.methods):
diff --git a/devtools/tasmrecover/tasm/parser.py b/devtools/tasmrecover/tasm/parser.py
index 6fd3567b01..0782fff22f 100644
--- a/devtools/tasmrecover/tasm/parser.py
+++ b/devtools/tasmrecover/tasm/parser.py
@@ -253,8 +253,12 @@ class parser:
 			if len(cmd) >= 3:
 				cmd1 = cmd[1]
 				if cmd1 == 'equ':
-					v = cmd[2]
-					self.set_global(cmd0, op.const(self.fix_dollar(v)))
+					if not (cmd0.lower() in self.skip_binary_data):
+						v = cmd[2]
+						self.set_global(cmd0, op.const(self.fix_dollar(v)))
+					else:
+						print "skipping binary data for %s" % (cmd0.lower(),)
+						skipping_binary_data = True
 				elif cmd1 == 'db' or cmd1 == 'dw' or cmd1 == 'dd':
 					if not (cmd0.lower() in self.skip_binary_data):
 						binary_width = {'b': 1, 'w': 2, 'd': 4}[cmd1[1]]