DREAMWEB: Regenerate dreamgen.* omitting unused dispatch_call function.

3 files changed, 3 insertions, 524 deletions

diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index c86da47a69..101d277e9b 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -283,5 +283,5 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'inventory',
 	'mainscreen',
 	'doload',
-	], skip_dispatch_call = False)
+	], skip_dispatch_call = True)
 generator.generate('dreamweb') #start routine
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index d12023644b..36947ee2ab 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -14573,525 +14573,5 @@ void DreamGenContext::__start() {
 dreamweb(); 
 }
 
-void DreamGenContext::__dispatch_call(uint16 addr) {
-	switch(addr) {
-		case addr_alleybarksound: alleybarksound(); break;
-		case addr_intromusic: intromusic(); break;
-		case addr_foghornsound: foghornsound(); break;
-		case addr_receptionist: receptionist(); break;
-		case addr_smokebloke: smokebloke(); break;
-		case addr_attendant: attendant(); break;
-		case addr_manasleep: manasleep(); break;
-		case addr_eden: eden(); break;
-		case addr_edeninbath: edeninbath(); break;
-		case addr_malefan: malefan(); break;
-		case addr_femalefan: femalefan(); break;
-		case addr_louis: louis(); break;
-		case addr_louischair: louischair(); break;
-		case addr_manasleep2: manasleep2(); break;
-		case addr_mansatstill: mansatstill(); break;
-		case addr_tattooman: tattooman(); break;
-		case addr_drinker: drinker(); break;
-		case addr_bartender: bartender(); break;
-		case addr_othersmoker: othersmoker(); break;
-		case addr_barwoman: barwoman(); break;
-		case addr_interviewer: interviewer(); break;
-		case addr_soldier1: soldier1(); break;
-		case addr_rockstar: rockstar(); break;
-		case addr_helicopter: helicopter(); break;
-		case addr_mugger: mugger(); break;
-		case addr_aide: aide(); break;
-		case addr_businessman: businessman(); break;
-		case addr_poolguard: poolguard(); break;
-		case addr_security: security(); break;
-		case addr_heavy: heavy(); break;
-		case addr_bossman: bossman(); break;
-		case addr_gamer: gamer(); break;
-		case addr_sparkydrip: sparkydrip(); break;
-		case addr_carparkdrip: carparkdrip(); break;
-		case addr_keeper: keeper(); break;
-		case addr_candles1: candles1(); break;
-		case addr_smallcandle: smallcandle(); break;
-		case addr_intromagic1: intromagic1(); break;
-		case addr_candles: candles(); break;
-		case addr_candles2: candles2(); break;
-		case addr_gates: gates(); break;
-		case addr_intromagic2: intromagic2(); break;
-		case addr_intromagic3: intromagic3(); break;
-		case addr_intromonks1: intromonks1(); break;
-		case addr_intromonks2: intromonks2(); break;
-		case addr_handclap: handclap(); break;
-		case addr_monks2text: monks2text(); break;
-		case addr_intro1text: intro1text(); break;
-		case addr_intro2text: intro2text(); break;
-		case addr_intro3text: intro3text(); break;
-		case addr_monkandryan: monkandryan(); break;
-		case addr_endgameseq: endgameseq(); break;
-		case addr_rollendcredits: rollendcredits(); break;
-		case addr_priest: priest(); break;
-		case addr_madmanstelly: madmanstelly(); break;
-		case addr_madman: madman(); break;
-		case addr_priesttext: priesttext(); break;
-		case addr_drunk: drunk(); break;
-		case addr_advisor: advisor(); break;
-		case addr_copper: copper(); break;
-		case addr_sparky: sparky(); break;
-		case addr_train: train(); break;
-		case addr_checkspeed: checkspeed(); break;
-		case addr_mainman: mainman(); break;
-		case addr_checkforexit: checkforexit(); break;
-		case addr_adjustdown: adjustdown(); break;
-		case addr_adjustup: adjustup(); break;
-		case addr_adjustleft: adjustleft(); break;
-		case addr_adjustright: adjustright(); break;
-		case addr_reminders: reminders(); break;
-		case addr_backobject: backobject(); break;
-		case addr_liftnoise: liftnoise(); break;
-		case addr_random: random(); break;
-		case addr_steady: steady(); break;
-		case addr_constant: constant(); break;
-		case addr_reelsonscreen: reelsonscreen(); break;
-		case addr_soundonreels: soundonreels(); break;
-		case addr_reconstruct: reconstruct(); break;
-		case addr_deleverything: deleverything(); break;
-		case addr_showpcx: showpcx(); break;
-		case addr_setmode: setmode(); break;
-		case addr_vsync: vsync(); break;
-		case addr_doshake: doshake(); break;
-		case addr_transfermap: transfermap(); break;
-		case addr_fadedos: fadedos(); break;
-		case addr_dofade: dofade(); break;
-		case addr_clearpalette: clearpalette(); break;
-		case addr_fadescreenup: fadescreenup(); break;
-		case addr_fadetowhite: fadetowhite(); break;
-		case addr_fadefromwhite: fadefromwhite(); break;
-		case addr_fadescreenups: fadescreenups(); break;
-		case addr_fadescreendownhalf: fadescreendownhalf(); break;
-		case addr_fadescreenuphalf: fadescreenuphalf(); break;
-		case addr_fadescreendown: fadescreendown(); break;
-		case addr_fadescreendowns: fadescreendowns(); break;
-		case addr_showgun: showgun(); break;
-		case addr_rollendcredits2: rollendcredits2(); break;
-		case addr_rollem: rollem(); break;
-		case addr_greyscalesum: greyscalesum(); break;
-		case addr_showgroup: showgroup(); break;
-		case addr_allpalette: allpalette(); break;
-		case addr_dumpcurrent: dumpcurrent(); break;
-		case addr_fadedownmon: fadedownmon(); break;
-		case addr_fadeupmon: fadeupmon(); break;
-		case addr_initialmoncols: initialmoncols(); break;
-		case addr_titles: titles(); break;
-		case addr_endgame: endgame(); break;
-		case addr_monkspeaking: monkspeaking(); break;
-		case addr_showmonk: showmonk(); break;
-		case addr_gettingshot: gettingshot(); break;
-		case addr_credits: credits(); break;
-		case addr_biblequote: biblequote(); break;
-		case addr_hangone: hangone(); break;
-		case addr_intro: intro(); break;
-		case addr_runintroseq: runintroseq(); break;
-		case addr_runendseq: runendseq(); break;
-		case addr_loadintroroom: loadintroroom(); break;
-		case addr_mode640x480: mode640x480(); break;
-		case addr_set16colpalette: set16colpalette(); break;
-		case addr_realcredits: realcredits(); break;
-		case addr_fillopen: fillopen(); break;
-		case addr_findallopen: findallopen(); break;
-		case addr_makemainscreen: makemainscreen(); break;
-		case addr_getbackfromob: getbackfromob(); break;
-		case addr_incryanpage: incryanpage(); break;
-		case addr_openinv: openinv(); break;
-		case addr_openob: openob(); break;
-		case addr_examicon: examicon(); break;
-		case addr_describeob: describeob(); break;
-		case addr_additionaltext: additionaltext(); break;
-		case addr_obsthatdothings: obsthatdothings(); break;
-		case addr_getobtextstart: getobtextstart(); break;
-		case addr_searchforsame: searchforsame(); break;
-		case addr_inventory: inventory(); break;
-		case addr_setpickup: setpickup(); break;
-		case addr_examinventory: examinventory(); break;
-		case addr_reexfrominv: reexfrominv(); break;
-		case addr_reexfromopen: reexfromopen(); break;
-		case addr_swapwithinv: swapwithinv(); break;
-		case addr_swapwithopen: swapwithopen(); break;
-		case addr_intoinv: intoinv(); break;
-		case addr_outofinv: outofinv(); break;
-		case addr_getfreead: getfreead(); break;
-		case addr_getexad: getexad(); break;
-		case addr_geteitherad: geteitherad(); break;
-		case addr_getanyad: getanyad(); break;
-		case addr_getanyaddir: getanyaddir(); break;
-		case addr_getopenedsize: getopenedsize(); break;
-		case addr_getsetad: getsetad(); break;
-		case addr_findinvpos: findinvpos(); break;
-		case addr_findopenpos: findopenpos(); break;
-		case addr_dropobject: dropobject(); break;
-		case addr_droperror: droperror(); break;
-		case addr_cantdrop: cantdrop(); break;
-		case addr_removeobfrominv: removeobfrominv(); break;
-		case addr_selectopenob: selectopenob(); break;
-		case addr_useopened: useopened(); break;
-		case addr_errormessage1: errormessage1(); break;
-		case addr_errormessage2: errormessage2(); break;
-		case addr_errormessage3: errormessage3(); break;
-		case addr_checkobjectsize: checkobjectsize(); break;
-		case addr_outofopen: outofopen(); break;
-		case addr_transfertoex: transfertoex(); break;
-		case addr_pickupconts: pickupconts(); break;
-		case addr_transfercontoex: transfercontoex(); break;
-		case addr_purgealocation: purgealocation(); break;
-		case addr_emergencypurge: emergencypurge(); break;
-		case addr_purgeanitem: purgeanitem(); break;
-		case addr_deleteexobject: deleteexobject(); break;
-		case addr_deleteexframe: deleteexframe(); break;
-		case addr_deleteextext: deleteextext(); break;
-		case addr_blockget: blockget(); break;
-		case addr_drawfloor: drawfloor(); break;
-		case addr_autolook: autolook(); break;
-		case addr_look: look(); break;
-		case addr_dolook: dolook(); break;
-		case addr_redrawmainscrn: redrawmainscrn(); break;
-		case addr_getback1: getback1(); break;
-		case addr_talk: talk(); break;
-		case addr_starttalk: starttalk(); break;
-		case addr_getpersontext: getpersontext(); break;
-		case addr_moretalk: moretalk(); break;
-		case addr_dosometalk: dosometalk(); break;
-		case addr_hangonpq: hangonpq(); break;
-		case addr_redes: redes(); break;
-		case addr_newplace: newplace(); break;
-		case addr_selectlocation: selectlocation(); break;
-		case addr_lookatplace: lookatplace(); break;
-		case addr_getundercentre: getundercentre(); break;
-		case addr_putundercentre: putundercentre(); break;
-		case addr_locationpic: locationpic(); break;
-		case addr_getdestinfo: getdestinfo(); break;
-		case addr_showarrows: showarrows(); break;
-		case addr_nextdest: nextdest(); break;
-		case addr_lastdest: lastdest(); break;
-		case addr_destselect: destselect(); break;
-		case addr_getlocation: getlocation(); break;
-		case addr_setlocation: setlocation(); break;
-		case addr_resetlocation: resetlocation(); break;
-		case addr_readdesticon: readdesticon(); break;
-		case addr_readcitypic: readcitypic(); break;
-		case addr_printoutermon: printoutermon(); break;
-		case addr_loadpersonal: loadpersonal(); break;
-		case addr_loadnews: loadnews(); break;
-		case addr_loadcart: loadcart(); break;
-		case addr_lookininterface: lookininterface(); break;
-		case addr_locklighton: locklighton(); break;
-		case addr_locklightoff: locklightoff(); break;
-		case addr_makecaps: makecaps(); break;
-		case addr_delchar: delchar(); break;
-		case addr_execcommand: execcommand(); break;
-		case addr_dircom: dircom(); break;
-		case addr_searchforfiles: searchforfiles(); break;
-		case addr_signon: signon(); break;
-		case addr_showkeys: showkeys(); break;
-		case addr_read: read(); break;
-		case addr_dirfile: dirfile(); break;
-		case addr_getkeyandlogo: getkeyandlogo(); break;
-		case addr_searchforstring: searchforstring(); break;
-		case addr_parser: parser(); break;
-		case addr_monitorlogo: monitorlogo(); break;
-		case addr_processtrigger: processtrigger(); break;
-		case addr_triggermessage: triggermessage(); break;
-		case addr_useobject: useobject(); break;
-		case addr_wheelsound: wheelsound(); break;
-		case addr_runtap: runtap(); break;
-		case addr_playguitar: playguitar(); break;
-		case addr_hotelcontrol: hotelcontrol(); break;
-		case addr_hotelbell: hotelbell(); break;
-		case addr_opentomb: opentomb(); break;
-		case addr_usetrainer: usetrainer(); break;
-		case addr_nothelderror: nothelderror(); break;
-		case addr_usepipe: usepipe(); break;
-		case addr_usefullcart: usefullcart(); break;
-		case addr_useplinth: useplinth(); break;
-		case addr_chewy: chewy(); break;
-		case addr_useladder: useladder(); break;
-		case addr_useladderb: useladderb(); break;
-		case addr_slabdoora: slabdoora(); break;
-		case addr_slabdoorb: slabdoorb(); break;
-		case addr_slabdoord: slabdoord(); break;
-		case addr_slabdoorc: slabdoorc(); break;
-		case addr_slabdoore: slabdoore(); break;
-		case addr_slabdoorf: slabdoorf(); break;
-		case addr_useslab: useslab(); break;
-		case addr_usecart: usecart(); break;
-		case addr_useclearbox: useclearbox(); break;
-		case addr_usecoveredbox: usecoveredbox(); break;
-		case addr_userailing: userailing(); break;
-		case addr_useopenbox: useopenbox(); break;
-		case addr_wearwatch: wearwatch(); break;
-		case addr_wearshades: wearshades(); break;
-		case addr_sitdowninbar: sitdowninbar(); break;
-		case addr_usechurchhole: usechurchhole(); break;
-		case addr_usehole: usehole(); break;
-		case addr_usealtar: usealtar(); break;
-		case addr_opentvdoor: opentvdoor(); break;
-		case addr_usedryer: usedryer(); break;
-		case addr_openlouis: openlouis(); break;
-		case addr_nextcolon: nextcolon(); break;
-		case addr_openyourneighbour: openyourneighbour(); break;
-		case addr_usewindow: usewindow(); break;
-		case addr_usebalcony: usebalcony(); break;
-		case addr_openryan: openryan(); break;
-		case addr_openpoolboss: openpoolboss(); break;
-		case addr_openeden: openeden(); break;
-		case addr_opensarters: opensarters(); break;
-		case addr_isitright: isitright(); break;
-		case addr_drawitall: drawitall(); break;
-		case addr_openhoteldoor: openhoteldoor(); break;
-		case addr_openhoteldoor2: openhoteldoor2(); break;
-		case addr_grafittidoor: grafittidoor(); break;
-		case addr_trapdoor: trapdoor(); break;
-		case addr_callhotellift: callhotellift(); break;
-		case addr_calledenslift: calledenslift(); break;
-		case addr_calledensdlift: calledensdlift(); break;
-		case addr_usepoolreader: usepoolreader(); break;
-		case addr_uselighter: uselighter(); break;
-		case addr_showseconduse: showseconduse(); break;
-		case addr_usecardreader1: usecardreader1(); break;
-		case addr_usecardreader2: usecardreader2(); break;
-		case addr_usecardreader3: usecardreader3(); break;
-		case addr_usecashcard: usecashcard(); break;
-		case addr_lookatcard: lookatcard(); break;
-		case addr_moneypoke: moneypoke(); break;
-		case addr_usecontrol: usecontrol(); break;
-		case addr_usehatch: usehatch(); break;
-		case addr_usewire: usewire(); break;
-		case addr_usehandle: usehandle(); break;
-		case addr_useelevator1: useelevator1(); break;
-		case addr_showfirstuse: showfirstuse(); break;
-		case addr_useelevator3: useelevator3(); break;
-		case addr_useelevator4: useelevator4(); break;
-		case addr_useelevator2: useelevator2(); break;
-		case addr_useelevator5: useelevator5(); break;
-		case addr_usekey: usekey(); break;
-		case addr_usestereo: usestereo(); break;
-		case addr_usecooker: usecooker(); break;
-		case addr_useaxe: useaxe(); break;
-		case addr_useelvdoor: useelvdoor(); break;
-		case addr_withwhat: withwhat(); break;
-		case addr_selectob: selectob(); break;
-		case addr_findsetobject: findsetobject(); break;
-		case addr_findexobject: findexobject(); break;
-		case addr_isryanholding: isryanholding(); break;
-		case addr_checkinside: checkinside(); break;
-		case addr_putbackobstuff: putbackobstuff(); break;
-		case addr_showpuztext: showpuztext(); break;
-		case addr_findpuztext: findpuztext(); break;
-		case addr_issetobonmap: issetobonmap(); break;
-		case addr_placefreeobject: placefreeobject(); break;
-		case addr_removefreeobject: removefreeobject(); break;
-		case addr_autoappear: autoappear(); break;
-		case addr_setuptimeduse: setuptimeduse(); break;
-		case addr_edenscdplayer: edenscdplayer(); break;
-		case addr_usewall: usewall(); break;
-		case addr_usechurchgate: usechurchgate(); break;
-		case addr_usegun: usegun(); break;
-		case addr_useshield: useshield(); break;
-		case addr_usebuttona: usebuttona(); break;
-		case addr_useplate: useplate(); break;
-		case addr_usewinch: usewinch(); break;
-		case addr_entercode: entercode(); break;
-		case addr_loadkeypad: loadkeypad(); break;
-		case addr_quitkey: quitkey(); break;
-		case addr_addtopresslist: addtopresslist(); break;
-		case addr_buttonone: buttonone(); break;
-		case addr_buttontwo: buttontwo(); break;
-		case addr_buttonthree: buttonthree(); break;
-		case addr_buttonfour: buttonfour(); break;
-		case addr_buttonfive: buttonfive(); break;
-		case addr_buttonsix: buttonsix(); break;
-		case addr_buttonseven: buttonseven(); break;
-		case addr_buttoneight: buttoneight(); break;
-		case addr_buttonnine: buttonnine(); break;
-		case addr_buttonnought: buttonnought(); break;
-		case addr_buttonenter: buttonenter(); break;
-		case addr_buttonpress: buttonpress(); break;
-		case addr_showouterpad: showouterpad(); break;
-		case addr_showkeypad: showkeypad(); break;
-		case addr_singlekey: singlekey(); break;
-		case addr_dumpkeypad: dumpkeypad(); break;
-		case addr_usemenu: usemenu(); break;
-		case addr_dumpmenu: dumpmenu(); break;
-		case addr_showmenu: showmenu(); break;
-		case addr_loadmenu: loadmenu(); break;
-		case addr_viewfolder: viewfolder(); break;
-		case addr_nextfolder: nextfolder(); break;
-		case addr_folderhints: folderhints(); break;
-		case addr_lastfolder: lastfolder(); break;
-		case addr_loadfolder: loadfolder(); break;
-		case addr_showfolder: showfolder(); break;
-		case addr_folderexit: folderexit(); break;
-		case addr_showleftpage: showleftpage(); break;
-		case addr_showrightpage: showrightpage(); break;
-		case addr_entersymbol: entersymbol(); break;
-		case addr_quitsymbol: quitsymbol(); break;
-		case addr_settopleft: settopleft(); break;
-		case addr_settopright: settopright(); break;
-		case addr_setbotleft: setbotleft(); break;
-		case addr_setbotright: setbotright(); break;
-		case addr_dumpsymbol: dumpsymbol(); break;
-		case addr_showsymbol: showsymbol(); break;
-		case addr_nextsymbol: nextsymbol(); break;
-		case addr_updatesymboltop: updatesymboltop(); break;
-		case addr_updatesymbolbot: updatesymbolbot(); break;
-		case addr_dumpsymbox: dumpsymbox(); break;
-		case addr_usediary: usediary(); break;
-		case addr_showdiary: showdiary(); break;
-		case addr_showdiarykeys: showdiarykeys(); break;
-		case addr_dumpdiarykeys: dumpdiarykeys(); break;
-		case addr_diarykeyp: diarykeyp(); break;
-		case addr_diarykeyn: diarykeyn(); break;
-		case addr_showdiarypage: showdiarypage(); break;
-		case addr_findtext1: findtext1(); break;
-		case addr_zoomonoff: zoomonoff(); break;
-		case addr_dosaveload: dosaveload(); break;
-		case addr_getbackfromops: getbackfromops(); break;
-		case addr_showdiscops: showdiscops(); break;
-		case addr_loadsavebox: loadsavebox(); break;
-		case addr_loadgame: loadgame(); break;
-		case addr_getbacktoops: getbacktoops(); break;
-		case addr_discops: discops(); break;
-		case addr_savegame: savegame(); break;
-		case addr_actualsave: actualsave(); break;
-		case addr_actualload: actualload(); break;
-		case addr_selectslot2: selectslot2(); break;
-		case addr_checkinput: checkinput(); break;
-		case addr_getnamepos: getnamepos(); break;
-		case addr_showopbox: showopbox(); break;
-		case addr_showloadops: showloadops(); break;
-		case addr_showsaveops: showsaveops(); break;
-		case addr_selectslot: selectslot(); break;
-		case addr_showslots: showslots(); break;
-		case addr_shownames: shownames(); break;
-		case addr_dosreturn: dosreturn(); break;
-		case addr_error: error(); break;
-		case addr_savefilewrite: savefilewrite(); break;
-		case addr_savefileread: savefileread(); break;
-		case addr_saveposition: saveposition(); break;
-		case addr_loadposition: loadposition(); break;
-		case addr_loadseg: loadseg(); break;
-		case addr_makeheader: makeheader(); break;
-		case addr_storeit: storeit(); break;
-		case addr_saveseg: saveseg(); break;
-		case addr_scanfornames: scanfornames(); break;
-		case addr_decide: decide(); break;
-		case addr_showdecisions: showdecisions(); break;
-		case addr_newgame: newgame(); break;
-		case addr_loadold: loadold(); break;
-		case addr_loadspeech: loadspeech(); break;
-		case addr_createname: createname(); break;
-		case addr_loadsample: loadsample(); break;
-		case addr_loadsecondsample: loadsecondsample(); break;
-		case addr_soundstartup: soundstartup(); break;
-		case addr_trysoundalloc: trysoundalloc(); break;
-		case addr_setsoundoff: setsoundoff(); break;
-		case addr_checksoundint: checksoundint(); break;
-		case addr_enablesoundint: enablesoundint(); break;
-		case addr_disablesoundint: disablesoundint(); break;
-		case addr_interupttest: interupttest(); break;
-		case addr_soundend: soundend(); break;
-		case addr_out22c: out22c(); break;
-		case addr_volumeadjust: volumeadjust(); break;
-		case addr_channel0only: channel0only(); break;
-		case addr_channel1only: channel1only(); break;
-		case addr_bothchannels: bothchannels(); break;
-		case addr_saveems: saveems(); break;
-		case addr_restoreems: restoreems(); break;
-		case addr_dmaend: dmaend(); break;
-		case addr_startdmablock: startdmablock(); break;
-		case addr_setuppit: setuppit(); break;
-		case addr_getridofpit: getridofpit(); break;
-		case addr_pitinterupt: pitinterupt(); break;
-		case addr_dreamweb: dreamweb(); break;
-		case addr_entrytexts: entrytexts(); break;
-		case addr_entryanims: entryanims(); break;
-		case addr_initialinv: initialinv(); break;
-		case addr_pickupob: pickupob(); break;
-		case addr_setupemm: setupemm(); break;
-		case addr_removeemm: removeemm(); break;
-		case addr_checkforemm: checkforemm(); break;
-		case addr_allocatebuffers: allocatebuffers(); break;
-		case addr_clearbuffers: clearbuffers(); break;
-		case addr_clearchanges: clearchanges(); break;
-		case addr_clearbeforeload: clearbeforeload(); break;
-		case addr_clearreels: clearreels(); break;
-		case addr_clearrest: clearrest(); break;
-		case addr_deallocatemem: deallocatemem(); break;
-		case addr_allocatemem: allocatemem(); break;
-		case addr_watchreel: watchreel(); break;
-		case addr_checkforshake: checkforshake(); break;
-		case addr_showbyte: showbyte(); break;
-		case addr_onedigit: onedigit(); break;
-		case addr_showword: showword(); break;
-		case addr_convnum: convnum(); break;
-		case addr_mainscreen: mainscreen(); break;
-		case addr_madmanrun: madmanrun(); break;
-		case addr_identifyob: identifyob(); break;
-		case addr_findpathofpoint: findpathofpoint(); break;
-		case addr_findfirstpath: findfirstpath(); break;
-		case addr_afternewroom: afternewroom(); break;
-		case addr_atmospheres: atmospheres(); break;
-		case addr_walkintoroom: walkintoroom(); break;
-		case addr_afterintroroom: afterintroroom(); break;
-		case addr_printmessage2: printmessage2(); break;
-		case addr_setwalk: setwalk(); break;
-		case addr_workoutframes: workoutframes(); break;
-		case addr_middlepanel: middlepanel(); break;
-		case addr_showman: showman(); break;
-		case addr_usecharset1: usecharset1(); break;
-		case addr_usetempcharset: usetempcharset(); break;
-		case addr_showexit: showexit(); break;
-		case addr_panelicons1: panelicons1(); break;
-		case addr_gettime: gettime(); break;
-		case addr_worktoscreenm: worktoscreenm(); break;
-		case addr_blank: blank(); break;
-		case addr_allpointer: allpointer(); break;
-		case addr_hangonw: hangonw(); break;
-		case addr_getunderzoom: getunderzoom(); break;
-		case addr_dumpzoom: dumpzoom(); break;
-		case addr_putunderzoom: putunderzoom(); break;
-		case addr_undertextline: undertextline(); break;
-		case addr_setmouse: setmouse(); break;
-		case addr_mousecall: mousecall(); break;
-		case addr_readkey: readkey(); break;
-		case addr_randomnum1: randomnum1(); break;
-		case addr_randomnum2: randomnum2(); break;
-		case addr_loadtraveltext: loadtraveltext(); break;
-		case addr_loadtemptext: loadtemptext(); break;
-		case addr_getridofreels: getridofreels(); break;
-		case addr_getridofall: getridofall(); break;
-		case addr_restorereels: restorereels(); break;
-		case addr_restoreall: restoreall(); break;
-		case addr_disablepath: disablepath(); break;
-		case addr_dontloadseg: dontloadseg(); break;
-		case addr_allocateload: allocateload(); break;
-		case addr_getridoftemp: getridoftemp(); break;
-		case addr_getridoftemptext: getridoftemptext(); break;
-		case addr_getridoftemp2: getridoftemp2(); break;
-		case addr_getridoftemp3: getridoftemp3(); break;
-		case addr_getridoftempcharset: getridoftempcharset(); break;
-		case addr_getridoftempsp: getridoftempsp(); break;
-		case addr_createfile: createfile(); break;
-		case addr_openfile: openfile(); break;
-		case addr_openfilefromc: openfilefromc(); break;
-		case addr_openfilenocheck: openfilenocheck(); break;
-		case addr_openforsave: openforsave(); break;
-		case addr_closefile: closefile(); break;
-		case addr_readfromfile: readfromfile(); break;
-		case addr_setkeyboardint: setkeyboardint(); break;
-		case addr_resetkeyboard: resetkeyboard(); break;
-		case addr_keyboardread: keyboardread(); break;
-		case addr_doload: doload(); break;
-		case addr_generalerror: generalerror(); break;
-		default: ::error("invalid call to %04x dispatched", (uint16)ax);
-	}
-}
 
 } /*namespace*/
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 5309059d95..a48ca277a1 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -35,7 +35,6 @@ namespace DreamGen {
 class DreamGenContext : public Context {
 public:
 	void __start();
-	void __dispatch_call(uint16 addr);
 #include "stubs.h" // Allow hand-reversed functions to have a signature different than void f()
 
 	static const uint16 addr_dreamweb = 0xc948;
@@ -1184,7 +1183,6 @@ public:
 	void clearbuffers();
 	//void neterror();
 	void storeit();
-	//void lockeddoorway();
 	//void isitworn();
 	//void putundertimed();
 	//void dumpmap();
@@ -1468,7 +1466,6 @@ public:
 	//void showcity();
 	void dumpsymbol();
 	void disablepath();
-	//void convicons();
 	void buttonsix();
 	void intro2text();
 	void showouterpad();
@@ -1840,12 +1837,14 @@ public:
 	void usechurchgate();
 	void monkandryan();
 	void allocatebuffers();
+	//void convicons();
 	void swapwithinv();
 	void usecontrol();
 	void buttonseven();
 	void redrawmainscrn();
 	void showgroup();
 	//void findallryan();
+	//void lockeddoorway();
 	//void channel0tran();
 	void buttonpress();
 	//void parseblaster();