DREAMWEB: Omit a number of unused binary blobs

This commit is contained in:
Willem Jan Palenstijn 2011-12-03 18:46:03 +01:00
parent 94fffc4327
commit b011591b32
5 changed files with 760 additions and 1188 deletions

View File

@ -375,7 +375,7 @@ invlist1: dw 273,320,157,198,getbackfromob
dw inventx+167,inventx+167+(18*3),inventy-18,inventy-2,incryanpage
dw inventx
openchangesize: dw inventx+(4*itempicsize)
dw inventy+100,inventy+100+itempicsize,useopened
invlist1continued: dw inventy+100,inventy+100+itempicsize,useopened
dw inventx,inventx+(5*itempicsize)
dw inventy,inventy+(2*itempicsize),intoinv
dw 0,320,0,200,blank

View File

@ -25,6 +25,35 @@ from tasm.parser import parser
from tasm.cpp import cpp
p = parser(skip_binary_data = [
# These data blobs are not output
# dreamweb.asm
'roomdata',
'mainlist',
'mainlist2',
'menulist',
'folderlist',
'stak',
'keyconverttab',
# keypad.asm
'keypadlist',
# object.asm
'invlist1', 'invlist1continued',
'examlist',
'withlist1',
# saveload.asm
'loadlist',
'savelist',
'endgametext1',
# sblaster.asm
'dmaaddresses',
# sprite.asm
'reelcalls',
'facelist',
'rainlocations',
# use.asm
'uselist',
# vgagrafx.asm
'shaketable',
])
p.strip_path = 3
context = p.parse('dreamweb/dreamweb.asm')
@ -117,6 +146,7 @@ generator = cpp(context, "DreamGen", blacklist = [
'dolook',
'domix',
'doorway',
'doshake',
'drawflags',
'drawfloor',
'dumpblink',

File diff suppressed because it is too large Load Diff

View File

@ -36,38 +36,37 @@ public:
void __start();
#include "stubs.h" // Allow hand-reversed functions to have a signature different than void f()
static const uint16 offset_quitlist = 0x0a84;
static const uint16 offset_gameerror8 = 0x113f;
static const uint16 offset_gameerror5 = 0x1074;
static const uint16 offset_error2patch = 0x0ff6;
static const uint16 offset_openchangesize = 0x0a1c;
static const uint16 offset_keys = 0x0b14;
static const uint16 offset_gameerror2 = 0x0fb2;
static const uint16 offset_gameerror6 = 0x10be;
static const uint16 offset_speechfile = 0x13f1;
static const uint16 offset_atmospherelist = 0x147e;
static const uint16 offset_gameerror4 = 0x1037;
static const uint16 offset_gameerror1 = 0x0f6e;
static const uint16 offset_gameinfo = 0x1170;
static const uint16 offset_opslist = 0x0ec6;
static const uint16 offset_money2poke = 0x0d97;
static const uint16 offset_talklist = 0x0a64;
static const uint16 offset_comlist = 0x0ad8;
static const uint16 offset_money1poke = 0x0d92;
static const uint16 offset_gameerror7 = 0x1104;
static const uint16 offset_discopslist = 0x0f1a;
static const uint16 offset_commandline = 0x16d7;
static const uint16 offset_destlist = 0x0a9a;
static const uint16 offset_shaketable = 0x06af;
static const uint16 offset_error6patch = 0x10fe;
static const uint16 offset_keybuffer = 0x1718;
static const uint16 offset_speechfilename = 0x13eb;
static const uint16 offset_rootdir = 0x0b8c;
static const uint16 offset_gameerror3 = 0x1003;
static const uint16 offset_diarylist = 0x0e9c;
static const uint16 offset_decidelist = 0x13c1;
static const uint16 offset_symbollist = 0x0e5e;
static const uint16 offset_operand1 = 0x0b7e;
static const uint16 offset_speechfile = 0x0ecf;
static const uint16 offset_money1poke = 0x09b9;
static const uint16 offset_gameerror2 = 0x0ac1;
static const uint16 offset_destlist = 0x08ab;
static const uint16 offset_error6patch = 0x0c0d;
static const uint16 offset_operand1 = 0x098f;
static const uint16 offset_gameerror4 = 0x0b46;
static const uint16 offset_keybuffer = 0x1176;
static const uint16 offset_comlist = 0x08e9;
static const uint16 offset_quitlist = 0x0895;
static const uint16 offset_decidelist = 0x0e9f;
static const uint16 offset_gameerror6 = 0x0bcd;
static const uint16 offset_gameerror8 = 0x0c4e;
static const uint16 offset_diarylist = 0x09ff;
static const uint16 offset_gameinfo = 0x0c7f;
static const uint16 offset_gameerror5 = 0x0b83;
static const uint16 offset_talklist = 0x0875;
static const uint16 offset_rootdir = 0x099d;
static const uint16 offset_gameerror1 = 0x0a7d;
static const uint16 offset_gameerror3 = 0x0b12;
static const uint16 offset_gameerror7 = 0x0c13;
static const uint16 offset_symbollist = 0x09c1;
static const uint16 offset_speechfilename = 0x0ec9;
static const uint16 offset_discopslist = 0x0a53;
static const uint16 offset_atmospherelist = 0x0edc;
static const uint16 offset_error2patch = 0x0b05;
static const uint16 offset_money2poke = 0x09be;
static const uint16 offset_opslist = 0x0a29;
static const uint16 offset_openchangesize = 0x0873;
static const uint16 offset_commandline = 0x1135;
static const uint16 offset_keys = 0x0925;
static const uint16 kStartvars = 0;
static const uint16 kProgresspoints = 1;
static const uint16 kWatchon = 2;
@ -446,105 +445,101 @@ public:
static const uint16 kGameerror = 531;
static const uint16 kHowmuchalloc = 532;
static const uint16 kReelroutines = 534;
static const uint16 kReelcalls = 991;
static const uint16 kRoombyroom = 1214;
static const uint16 kR0 = 1326;
static const uint16 kR1 = 1327;
static const uint16 kR2 = 1331;
static const uint16 kR6 = 1350;
static const uint16 kR8 = 1357;
static const uint16 kR9 = 1373;
static const uint16 kR10 = 1380;
static const uint16 kR11 = 1384;
static const uint16 kR12 = 1388;
static const uint16 kR13 = 1392;
static const uint16 kR14 = 1405;
static const uint16 kR20 = 1439;
static const uint16 kR22 = 1461;
static const uint16 kR23 = 1492;
static const uint16 kR25 = 1505;
static const uint16 kR26 = 1527;
static const uint16 kR27 = 1549;
static const uint16 kR28 = 1574;
static const uint16 kR29 = 1593;
static const uint16 kR45 = 1609;
static const uint16 kR46 = 1616;
static const uint16 kR47 = 1653;
static const uint16 kR52 = 1666;
static const uint16 kR53 = 1670;
static const uint16 kR55 = 1677;
static const uint16 kSpritename1 = 1819;
static const uint16 kSpritename3 = 1832;
static const uint16 kIdname = 1845;
static const uint16 kCharacterset1 = 1857;
static const uint16 kCharacterset2 = 1870;
static const uint16 kCharacterset3 = 1883;
static const uint16 kSamplename = 1896;
static const uint16 kBasicsample = 1909;
static const uint16 kIcongraphics0 = 1922;
static const uint16 kIcongraphics1 = 1935;
static const uint16 kExtragraphics1 = 1948;
static const uint16 kIcongraphics8 = 1961;
static const uint16 kMongraphicname = 1974;
static const uint16 kMongraphics2 = 1987;
static const uint16 kCityname = 2000;
static const uint16 kTravelgraphic1 = 2013;
static const uint16 kTravelgraphic2 = 2026;
static const uint16 kDiarygraphic = 2039;
static const uint16 kMonitorfile1 = 2052;
static const uint16 kMonitorfile2 = 2065;
static const uint16 kMonitorfile10 = 2078;
static const uint16 kMonitorfile11 = 2091;
static const uint16 kMonitorfile12 = 2104;
static const uint16 kMonitorfile13 = 2117;
static const uint16 kMonitorfile20 = 2130;
static const uint16 kMonitorfile21 = 2143;
static const uint16 kMonitorfile22 = 2156;
static const uint16 kMonitorfile23 = 2169;
static const uint16 kMonitorfile24 = 2182;
static const uint16 kFoldertext = 2195;
static const uint16 kDiarytext = 2208;
static const uint16 kPuzzletextname = 2221;
static const uint16 kTraveltextname = 2234;
static const uint16 kIntrotextname = 2247;
static const uint16 kEndtextname = 2260;
static const uint16 kCommandtextname = 2273;
static const uint16 kVolumetabname = 2286;
static const uint16 kFoldergraphic1 = 2299;
static const uint16 kFoldergraphic2 = 2312;
static const uint16 kFoldergraphic3 = 2325;
static const uint16 kSymbolgraphic = 2338;
static const uint16 kGungraphic = 2351;
static const uint16 kMonkface = 2364;
static const uint16 kTitle0graphics = 2377;
static const uint16 kTitle1graphics = 2390;
static const uint16 kTitle2graphics = 2403;
static const uint16 kTitle3graphics = 2416;
static const uint16 kTitle4graphics = 2429;
static const uint16 kTitle5graphics = 2442;
static const uint16 kTitle6graphics = 2455;
static const uint16 kTitle7graphics = 2468;
static const uint16 kPalettescreen = 2481;
static const uint16 kCurrentfile = 2970;
static const uint16 kDmaaddresses = 5118;
static const uint16 kFileheader = 6091;
static const uint16 kFiledata = 6141;
static const uint16 kExtradata = 6181;
static const uint16 kRoomdata = 6187;
static const uint16 kMadeuproomdat = 7979;
static const uint16 kRoomscango = 8011;
static const uint16 kRoompics = 8027;
static const uint16 kOplist = 8042;
static const uint16 kInputline = 8045;
static const uint16 kLinedata = 8173;
static const uint16 kPresslist = 8573;
static const uint16 kSavenames = 8579;
static const uint16 kSavefiles = 8698;
static const uint16 kRecname = 8789;
static const uint16 kQuitrequested = 8802;
static const uint16 kSubtitles = 8803;
static const uint16 kForeignrelease = 8804;
static const uint16 kStak = 8805;
static const uint16 kRoombyroom = 991;
static const uint16 kR0 = 1103;
static const uint16 kR1 = 1104;
static const uint16 kR2 = 1108;
static const uint16 kR6 = 1127;
static const uint16 kR8 = 1134;
static const uint16 kR9 = 1150;
static const uint16 kR10 = 1157;
static const uint16 kR11 = 1161;
static const uint16 kR12 = 1165;
static const uint16 kR13 = 1169;
static const uint16 kR14 = 1182;
static const uint16 kR20 = 1216;
static const uint16 kR22 = 1238;
static const uint16 kR23 = 1269;
static const uint16 kR25 = 1282;
static const uint16 kR26 = 1304;
static const uint16 kR27 = 1326;
static const uint16 kR28 = 1351;
static const uint16 kR29 = 1370;
static const uint16 kR45 = 1386;
static const uint16 kR46 = 1393;
static const uint16 kR47 = 1430;
static const uint16 kR52 = 1443;
static const uint16 kR53 = 1447;
static const uint16 kR55 = 1454;
static const uint16 kSpritename1 = 1488;
static const uint16 kSpritename3 = 1501;
static const uint16 kIdname = 1514;
static const uint16 kCharacterset1 = 1526;
static const uint16 kCharacterset2 = 1539;
static const uint16 kCharacterset3 = 1552;
static const uint16 kSamplename = 1565;
static const uint16 kBasicsample = 1578;
static const uint16 kIcongraphics0 = 1591;
static const uint16 kIcongraphics1 = 1604;
static const uint16 kExtragraphics1 = 1617;
static const uint16 kIcongraphics8 = 1630;
static const uint16 kMongraphicname = 1643;
static const uint16 kMongraphics2 = 1656;
static const uint16 kCityname = 1669;
static const uint16 kTravelgraphic1 = 1682;
static const uint16 kTravelgraphic2 = 1695;
static const uint16 kDiarygraphic = 1708;
static const uint16 kMonitorfile1 = 1721;
static const uint16 kMonitorfile2 = 1734;
static const uint16 kMonitorfile10 = 1747;
static const uint16 kMonitorfile11 = 1760;
static const uint16 kMonitorfile12 = 1773;
static const uint16 kMonitorfile13 = 1786;
static const uint16 kMonitorfile20 = 1799;
static const uint16 kMonitorfile21 = 1812;
static const uint16 kMonitorfile22 = 1825;
static const uint16 kMonitorfile23 = 1838;
static const uint16 kMonitorfile24 = 1851;
static const uint16 kFoldertext = 1864;
static const uint16 kDiarytext = 1877;
static const uint16 kPuzzletextname = 1890;
static const uint16 kTraveltextname = 1903;
static const uint16 kIntrotextname = 1916;
static const uint16 kEndtextname = 1929;
static const uint16 kCommandtextname = 1942;
static const uint16 kVolumetabname = 1955;
static const uint16 kFoldergraphic1 = 1968;
static const uint16 kFoldergraphic2 = 1981;
static const uint16 kFoldergraphic3 = 1994;
static const uint16 kSymbolgraphic = 2007;
static const uint16 kGungraphic = 2020;
static const uint16 kMonkface = 2033;
static const uint16 kTitle0graphics = 2046;
static const uint16 kTitle1graphics = 2059;
static const uint16 kTitle2graphics = 2072;
static const uint16 kTitle3graphics = 2085;
static const uint16 kTitle4graphics = 2098;
static const uint16 kTitle5graphics = 2111;
static const uint16 kTitle6graphics = 2124;
static const uint16 kTitle7graphics = 2137;
static const uint16 kPalettescreen = 2150;
static const uint16 kCurrentfile = 2475;
static const uint16 kFileheader = 4518;
static const uint16 kFiledata = 4568;
static const uint16 kExtradata = 4608;
static const uint16 kMadeuproomdat = 4614;
static const uint16 kRoomscango = 4646;
static const uint16 kRoompics = 4662;
static const uint16 kOplist = 4677;
static const uint16 kInputline = 4680;
static const uint16 kLinedata = 4808;
static const uint16 kPresslist = 5208;
static const uint16 kSavenames = 5214;
static const uint16 kSavefiles = 5333;
static const uint16 kRecname = 5424;
static const uint16 kQuitrequested = 5437;
static const uint16 kSubtitles = 5438;
static const uint16 kForeignrelease = 5439;
static const uint16 kBlocktextdat = (0);
static const uint16 kPersonframes = (0);
static const uint16 kDebuglevel1 = (0);
@ -617,6 +612,7 @@ public:
static const uint16 kScreenwidth = (320);
static const uint16 kKeypadx = (36+112);
static const uint16 kItempicsize = (44);
static const uint16 kHeaderlen = (4614-4518);
static const uint16 kDiaryy = (48+12);
static const uint16 kOpsy = (52);
static const uint16 kSymboly = (56);
@ -624,7 +620,6 @@ public:
static const uint16 kMenuy = (60);
static const uint16 kOpsx = (60);
static const uint16 kMaplength = (60);
static const uint16 kHeaderlen = (6187-6091);
static const uint16 kSymbolx = (64);
static const uint16 kSetdatlen = (64*128);
static const uint16 kMapwidth = (66);
@ -689,7 +684,6 @@ public:
void useElevator2();
void keyboardRead();
void getOpenedSize();
void doShake();
void resetKeyboard();
void soundStartup();
void sLabDoorA();
@ -785,7 +779,6 @@ public:
void putUnderZoom();
void vSync();
void findInvPos();
void liftNoise();
void workoutFrames();
void dumpSymBox();
void dumpSymbol();
@ -912,7 +905,7 @@ public:
void signOn();
void deleteExText();
void foghornSound();
void showLoadOps();
void liftNoise();
void examIcon();
void showGun();
void louisChair();
@ -1039,6 +1032,7 @@ public:
void useHole();
void useObject();
void fadeToWhite();
void showLoadOps();
};
}

View File

@ -57,7 +57,6 @@
void workToScreenCPP();
void multiGet();
void multiGet(uint8 *dst, uint16 x, uint16 y, uint8 width, uint8 height);
void convertKey();
void cls();
void printSprites();
void quickQuit();
@ -423,4 +422,5 @@
void loadGame();
void saveGame();
void zoomOnOff();
void doShake();