aboutsummaryrefslogtreecommitdiff
path: root/tools/create_kyradat
diff options
context:
space:
mode:
Diffstat (limited to 'tools/create_kyradat')
-rw-r--r--tools/create_kyradat/Makefile4
-rw-r--r--tools/create_kyradat/create_kyradat.cpp100
-rw-r--r--tools/create_kyradat/create_kyradat.h8
-rw-r--r--tools/create_kyradat/hof_floppy.h2
-rw-r--r--tools/create_kyradat/hof_towns.h2
-rw-r--r--tools/create_kyradat/md5.cpp2
-rw-r--r--tools/create_kyradat/pak.cpp38
-rw-r--r--tools/create_kyradat/pak.h12
-rw-r--r--tools/create_kyradat/towns.h16
-rw-r--r--tools/create_kyradat/util.h2
10 files changed, 93 insertions, 93 deletions
diff --git a/tools/create_kyradat/Makefile b/tools/create_kyradat/Makefile
index 7319ad0658..b4deafe6d4 100644
--- a/tools/create_kyradat/Makefile
+++ b/tools/create_kyradat/Makefile
@@ -1,10 +1,10 @@
CXX ?= g++
CC ?= gcc
-LDFLAGS ?=
+LDFLAGS ?=
CXXFLAGS ?= -O2
CFLAGS ?= -O2
-CPPFLAGS ?=
+CPPFLAGS ?=
BIN=create_kyradat
diff --git a/tools/create_kyradat/create_kyradat.cpp b/tools/create_kyradat/create_kyradat.cpp
index af002b5935..1fcd9ae882 100644
--- a/tools/create_kyradat/create_kyradat.cpp
+++ b/tools/create_kyradat/create_kyradat.cpp
@@ -123,7 +123,7 @@ const ExtractFilename extractFilenames[] = {
// GUI strings table
{ kGUIStrings, kTypeLanguageList, "GUISTRINGS" },
{ kConfigStrings, kTypeLanguageList, "CONFIGSTRINGS" },
-
+
// ROOM table/filenames
{ kRoomList, kTypeRoomList, "ROOM-TABLE.ROOM" },
{ kRoomFilenames, kTypeStringList, "ROOM-FILENAMES.TXT" },
@@ -186,7 +186,7 @@ const ExtractFilename extractFilenames[] = {
{ kPaletteList31, kTypeRawData, "PALTABLE31.PAL" },
{ kPaletteList32, kTypeRawData, "PALTABLE32.PAL" },
{ kPaletteList33, kTypeRawData, "PALTABLE33.PAL" },
-
+
// FM-TOWNS specific
{ kKyra1TownsSFXwdTable, kTypeRawData, "SFXWDTABLE" },
{ kKyra1TownsSFXbtTable, kTypeRawData, "SFXBTTABLE" },
@@ -205,14 +205,14 @@ const ExtractFilename extractFilenames[] = {
{ k2SeqplayTlkFiles, kTypeLanguageList, "S_TLKFILES" },
{ k2SeqplaySeqData, k2TypeSeqData, "S_DATA.SEQ" },
{ k2SeqplayIntroTracks, kTypeStringList, "S_INTRO.TRA" },
- { k2SeqplayFinaleTracks, kTypeStringList, "S_FINALE.TRA" },
+ { k2SeqplayFinaleTracks, kTypeStringList, "S_FINALE.TRA" },
{ k2SeqplayIntroCDA, kTypeRawData, "S_INTRO.CDA" },
{ k2SeqplayFinaleCDA, kTypeRawData, "S_FINALE.CDA" },
// Ingame
{ k2IngamePakFiles, kTypeStringList, "I_PAKFILES.TXT" },
{ k2IngameSfxFiles, kTypeStringList, "I_SFXFILES.TXT" },
- { k2IngameSfxIndex, kTypeRawData, "I_SFXINDEX.TRA" },
+ { k2IngameSfxIndex, kTypeRawData, "I_SFXINDEX.TRA" },
{ k2IngameTracks, kTypeStringList, "I_TRACKS.TRA" },
{ k2IngameCDA, kTypeRawData, "I_TRACKS.CDA" },
@@ -253,9 +253,9 @@ bool getFilename(char *dstFilename, const Game *g, const int id) {
void createFilename(char *dstFilename, const int gid, const int lang, const int special, const char *filename) {
strcpy(dstFilename, filename);
- static const char *gidExtensions[] = { "", ".K2", ".K3" };
+ static const char *gidExtensions[] = { "", ".K2", ".K3" };
strcat(dstFilename, gidExtensions[gid]);
-
+
for (const SpecialExtension *specialE = specialTable; specialE->special != -1; ++specialE) {
if (specialE->special == special) {
strcat(dstFilename, ".");
@@ -276,9 +276,9 @@ void createLangFilename(char *dstFilename, const int gid, const int lang, const
}
}
- static const char *gidExtensions[] = { "", ".K2", ".K3" };
+ static const char *gidExtensions[] = { "", ".K2", ".K3" };
strcat(dstFilename, gidExtensions[gid]);
-
+
for (const SpecialExtension *specialE = specialTable; specialE->special != -1; ++specialE) {
if (specialE->special == special) {
strcat(dstFilename, ".");
@@ -314,13 +314,13 @@ int hashEntries(const Game *game, const GameNeed *need, const PAKFile *file) {
hash += *i;
continue;
}
-
+
if (file) {
filename[0] = 0;
if (!getFilename(filename, game, *i))
error("couldn't find filename for id %d", *i);
-
+
PAKFile::cFileList *list = file->getFileList();
if (list && list->findEntry(filename) != 0)
hash += *i;
@@ -328,7 +328,7 @@ int hashEntries(const Game *game, const GameNeed *need, const PAKFile *file) {
}
return hash;
-}
+}
bool hasNeededEntries(const Game *game, const PAKFile *file) {
for (const GameNeed *need = gameNeedTable; need->game != -1; ++need) {
@@ -383,7 +383,7 @@ bool extractStrings(PAKFile &out, const Game *g, const byte *data, const uint32
targetsize--;
}
if (fmtPatch == 1) {
- // Here is the first step of the extra treatment for all fm-towns string arrays that
+ // Here is the first step of the extra treatment for all fm-towns string arrays that
// contain more than one string and which the original code
// addresses via stringname[boolJapanese].
// We simply skip every other string
@@ -406,7 +406,7 @@ bool extractStrings(PAKFile &out, const Game *g, const byte *data, const uint32
}
}
}
-
+
if (fmtPatch == 2) {
if (g->special == kFMTownsVersionE)
targetsize--;
@@ -423,7 +423,7 @@ bool extractStrings(PAKFile &out, const Game *g, const byte *data, const uint32
if (fmtPatch == 4) {
targetsize -= 9;
}
-
+
uint8 *buffer = new uint8[targetsize];
assert(buffer);
uint8 *output = buffer;
@@ -465,7 +465,7 @@ bool extractStrings(PAKFile &out, const Game *g, const byte *data, const uint32
}
if (fmtPatch == 1) {
- // Here is the extra treatment for all fm-towns string arrays that
+ // Here is the extra treatment for all fm-towns string arrays that
// contain more than one string and which the original code
// addresses via stringname[boolJapanese].
// We simply skip every other string
@@ -610,7 +610,7 @@ bool extractHofSeqData(PAKFile &out, const Game *g, const byte *data, const uint
memcpy(output , ptr, 30);
ptr += 30;
output += 30;
-
+
if (g->special == k2TownsFile1E) {
memcpy(output , ptr, 2);
ptr += 2;
@@ -620,7 +620,7 @@ bool extractHofSeqData(PAKFile &out, const Game *g, const byte *data, const uint
ptr += 2;
*output++ = READ_LE_UINT16(ptr) & 0xff;
ptr += 2;
- }
+ }
memcpy(output, ptr, 14);
ptr += 18;
@@ -651,7 +651,7 @@ bool extractHofSeqData(PAKFile &out, const Game *g, const byte *data, const uint
memcpy(output, ctrStart, ctrSize);
output += ctrSize;
}
- }
+ }
numNestedSequences++;
uint16 relOffs = (uint16) (output - buffer);
@@ -674,7 +674,7 @@ bool extractHofSeqData(PAKFile &out, const Game *g, const byte *data, const uint
controlOffs = 0;
//else if (controlOffs)
// debug(1, "assigning frame control with output file offset 0x%x to item %s (output file offset: 0x%x)", controlOffs, cc, relOffs);
-
+
WRITE_LE_UINT16(output, controlOffs);
if (g->special != k2DemoVersion)
ptr += 4;
@@ -726,7 +726,7 @@ bool extractHofSeqData(PAKFile &out, const Game *g, const byte *data, const uint
assert(finBuffer);
uint16 diff = headerSize - finHeaderSize;
uint16 *finHeader = (uint16*) finBuffer;
-
+
for (int i = 1; i < finHeaderSize; i++)
WRITE_LE_UINT16(&finHeader[i], (READ_LE_UINT16(&header[i]) - diff));
WRITE_LE_UINT16(finHeader, numSequences);
@@ -760,7 +760,7 @@ int extractHofSeqData_checkString(const void *ptr, uint8 checkSize) {
while (c--) {
if (*s > 31 && *s < 123)
t++;
- s++;
+ s++;
}
if (t == checkSize)
@@ -781,7 +781,7 @@ int extractHofSeqData_isSequence(const void *ptr, const Game *g, uint32 maxCheck
if (maxCheckSize < 30)
return -2;
-
+
const uint8 * s = (const uint8*)ptr;
int c1 = extractHofSeqData_checkString(s + 2, 6);
int c2 = extractHofSeqData_checkString(s + 16, 6);
@@ -806,11 +806,11 @@ int extractHofSeqData_isSequence(const void *ptr, const Game *g, uint32 maxCheck
if (c0 == 0 && c5 == 4 && c3 == 0 && c4 == 0) {
if (maxCheckSize >= 41 && READ_LE_UINT32(s + 34) && !(s[39] | s[41]) && s[40] > s[38])
return 1;
- }
+ }
if (c0 == 0 && c5 && c1 == 1 && c4 == -1 && s[20])
return 0;
-
+
return -1;
}
@@ -876,7 +876,7 @@ uint32 getFeatures(const Game *g) {
features |= GF_ITALIAN;
else if (g->lang == JA_JPN)
features |= GF_JAPANESE;
-
+
return features;
}
@@ -895,7 +895,7 @@ bool updateIndex(byte *dst, const int dstSize, const Game *g) {
bool checkIndex(const byte *s, const int srcSize) {
if ((size_t)srcSize < sizeof(uint32))
- return false;
+ return false;
uint32 version = READ_BE_UINT32(s);
return (version == kKyraDatVersion);
}
@@ -903,28 +903,28 @@ bool checkIndex(const byte *s, const int srcSize) {
bool updateIndex(PAKFile &out, const Game *g) {
char filename[32];
createFilename(filename, g->game, -1, g->special, "INDEX");
-
+
byte *index = new byte[kIndexSize];
assert(index);
memset(index, 0, kIndexSize);
-
+
uint32 size = 0;
const uint8 *data = out.getFileData(filename, &size);
if (data)
memcpy(index, data, size);
-
+
if (!updateIndex(index, kIndexSize, g)) {
delete [] index;
return false;
}
-
+
out.removeFile(filename);
if (!out.addFile(filename, index, kIndexSize)) {
fprintf(stderr, "ERROR: couldn't update %s file", filename);
delete [] index;
return false;
}
-
+
return true;
}
@@ -955,7 +955,7 @@ int main(int argc, char *argv[]) {
printHelp(argv[0]);
return -1;
}
-
+
PAKFile out;
out.loadFile(argv[1], false);
@@ -969,10 +969,10 @@ int main(int argc, char *argv[]) {
uint32 size = fileSize(input);
fseek(input, 0, SEEK_SET);
-
+
byte *buffer = new uint8[size];
assert(buffer);
-
+
if (fread(buffer, 1, size, input) != size) {
warning("couldn't read from file '%s', skipping it", argv[i]);
delete [] buffer;
@@ -980,23 +980,23 @@ int main(int argc, char *argv[]) {
continue;
}
fclose(input);
-
+
const Game *g = findGame(buffer, size);
if (!g) {
warning("skipping unknown file '%s'", argv[i]);
delete [] buffer;
continue;
}
-
+
if (!hasNeededEntries(g, &out)) {
warning("file '%s' is missing offset entries and thus can't be processed", argv[i]);
delete [] buffer;
continue;
}
-
+
if (!process(out, g, buffer, size))
fprintf(stderr, "ERROR: couldn't process file '%s'", argv[i]);
-
+
if (g->special == kFMTownsVersionE || g->special == k2TownsFile1E || g->special == k2TownsFile2E ||
g->special == k2CDFile1E || g->special == k2CDFile2E) {
// This is for executables which contain support for at least 2 languages
@@ -1022,7 +1022,7 @@ int main(int argc, char *argv[]) {
if (!process(out, g, buffer, size))
fprintf(stderr, "ERROR: couldn't process file '%s'", argv[i]);
}
-
+
delete [] buffer;
}
@@ -1038,7 +1038,7 @@ int main(int argc, char *argv[]) {
if (fwrite(digest, 1, 16, f) != 16)
error("couldn't write md5sum to file '%s'", argv[1]);
fclose(f);
-
+
return 0;
}
@@ -1055,7 +1055,7 @@ bool process(PAKFile &out, const Game *g, const byte *data, const uint32 size) {
fprintf(stderr, "ERROR: couldn't get filename for id %d\n", i->id);
return false;
}
-
+
const ExtractFilename *fDesc = getFilenameDesc(i->id);
if (!fDesc) {
@@ -1064,16 +1064,16 @@ bool process(PAKFile &out, const Game *g, const byte *data, const uint32 size) {
}
const ExtractType *tDesc = findExtractType(fDesc->type);
-
+
if (!tDesc) {
fprintf(stderr, "ERROR: couldn't find type description for id %d\n", i->id);
return false;
}
-
+
PAKFile::cFileList *list = out.getFileList();
if (list && list->findEntry(filename) != 0)
continue;
-
+
int patch = 0;
if (g->special == kFMTownsVersionE || g->special == kFMTownsVersionJ) {
// FM Towns files that need addional patches
@@ -1081,14 +1081,14 @@ bool process(PAKFile &out, const Game *g, const byte *data, const uint32 size) {
i->id == kThePoisonStrings || i->id == kFluteStrings || i->id == kWispJewelStrings)
patch = 1;
else if (i->id == kIntroStrings || i->id == kKyra1TownsSFXwdTable)
- patch = 2;
+ patch = 2;
}
if (g->special == k2TownsFile1E || g->special == k2TownsFile1J) {
if (i->id == k2SeqplayStrings)
patch = 3;
}
-
+
if (g->special == k2FloppyFile2) {
if (i->id == k2IngamePakFiles)
patch = 4;
@@ -1097,8 +1097,8 @@ bool process(PAKFile &out, const Game *g, const byte *data, const uint32 size) {
if (g->special == k2FloppyFile2 || g->special == k2CDFile2E) {
if (i->id == k2IngameSfxFiles)
patch = 5;
- }
-
+ }
+
if (!tDesc->extract(out, g, data + i->startOff, i->endOff - i->startOff, filename, patch)) {
fprintf(stderr, "ERROR: couldn't extract id %d\n", i->id);
return false;
@@ -1140,11 +1140,11 @@ const Game *findGame(const byte *buffer, const uint32 size) {
md5_starts(&ctx);
md5_update(&ctx, buffer, size);
md5_finish(&ctx, digest);
-
+
for (int j = 0; j < 16; ++j) {
sprintf(md5str + j*2, "%02x", (int)digest[j]);
}
-
+
for (const Game **i = gameDescs; *i != 0; ++i) {
for (const Game *p = *i; p->game != -1; ++p) {
if (strcmp(md5str, p->md5) == 0)
diff --git a/tools/create_kyradat/create_kyradat.h b/tools/create_kyradat/create_kyradat.h
index 85c5f8973d..9a5c2ce033 100644
--- a/tools/create_kyradat/create_kyradat.h
+++ b/tools/create_kyradat/create_kyradat.h
@@ -62,7 +62,7 @@ enum kExtractID {
kAudioTracks,
kAudioTracksIntro,
-
+
kItemNames,
kTakenStrings,
kPlacedStrings,
@@ -85,7 +85,7 @@ enum kExtractID {
kVeryCleverString,
kNewGameString,
-
+
kDefaultShapes,
kHealing1Shapes,
kHealing2Shapes,
@@ -135,7 +135,7 @@ enum kExtractID {
kGUIStrings,
kConfigStrings,
-
+
kKyra1TownsSFXwdTable,
kKyra1TownsSFXbtTable,
kKyra1TownsCDATable,
@@ -158,7 +158,7 @@ enum kExtractID {
k2IngameSfxIndex,
k2IngameTracks,
k2IngameCDA,
-
+
kMaxResIDs
};
diff --git a/tools/create_kyradat/hof_floppy.h b/tools/create_kyradat/hof_floppy.h
index c446b513b4..a4aee16ced 100644
--- a/tools/create_kyradat/hof_floppy.h
+++ b/tools/create_kyradat/hof_floppy.h
@@ -59,6 +59,6 @@ const Game kyra2FloppyGames[] = {
{ kKyra2, DE_DEU, k2FloppyFile1, "0ca4f9a1438264a4c63c3218e064ed3b", kyra2File1G},
{ kKyra2, EN_ANY, k2FloppyFile2, "7c3eadbe5122722cf2e5e1611e19dfb9", kyra2File2E},
{ kKyra2, FR_FRA, k2FloppyFile2, "fc2c6782778e6c6d5a553d1cb73c98ad", kyra2File2F},
- { kKyra2, DE_DEU, k2FloppyFile2, "0d9b0eb7b0ad889ec942d74d80dde1bf", kyra2File2G},
+ { kKyra2, DE_DEU, k2FloppyFile2, "0d9b0eb7b0ad889ec942d74d80dde1bf", kyra2File2G},
GAME_DUMMY_ENTRY
};
diff --git a/tools/create_kyradat/hof_towns.h b/tools/create_kyradat/hof_towns.h
index 5455e153bb..e6f3d11197 100644
--- a/tools/create_kyradat/hof_towns.h
+++ b/tools/create_kyradat/hof_towns.h
@@ -17,7 +17,7 @@ const ExtractEntry kyra2File2FMTownsE[] = {
{ k2IngamePakFiles, 0x00000540, 0x0000065C },
{ k2IngameSfxFiles, 0x00003E3C, 0x000047A3 },
{ k2IngameSfxIndex, 0x00013980, 0x00013CD8 },
- { k2IngameCDA, 0x0001808C, 0x000181BC },
+ { k2IngameCDA, 0x0001808C, 0x000181BC },
{ -1, 0, 0 }
};
diff --git a/tools/create_kyradat/md5.cpp b/tools/create_kyradat/md5.cpp
index 8f23d2c958..73ec80d9b0 100644
--- a/tools/create_kyradat/md5.cpp
+++ b/tools/create_kyradat/md5.cpp
@@ -243,7 +243,7 @@ bool md5_file(const char *name, uint8 digest[16], uint32 length) {
md5_starts(&ctx);
-
+
while ((i = (uint32)fread(buf, 1, readlen, f)) > 0) {
md5_update(&ctx, buf, i);
diff --git a/tools/create_kyradat/pak.cpp b/tools/create_kyradat/pak.cpp
index 63e9792d23..f3446df291 100644
--- a/tools/create_kyradat/pak.cpp
+++ b/tools/create_kyradat/pak.cpp
@@ -39,21 +39,21 @@ bool PAKFile::loadFile(const char *file, const bool isAmiga) {
// TODO: get rid of temp. buffer
uint8 *buffer = new uint8[filesize];
assert(buffer);
-
+
fread(buffer, filesize, 1, pakfile);
-
+
fclose(pakfile);
-
+
const char *currentName = 0;
-
+
uint32 startoffset = _isAmiga ? READ_BE_UINT32(buffer) : READ_LE_UINT32(buffer);
uint32 endoffset = 0;
uint8* position = buffer + 4;
-
+
while (true) {
uint32 strlgt = strlen((const char*)position);
currentName = (const char*)position;
-
+
if (!(*currentName))
break;
@@ -65,19 +65,19 @@ bool PAKFile::loadFile(const char *file, const bool isAmiga) {
endoffset = filesize;
}
position += 4;
-
+
uint8 *data = new uint8[endoffset - startoffset];
assert(data);
memcpy(data, buffer + startoffset, endoffset - startoffset);
addFile(currentName, data, endoffset - startoffset);
data = 0;
-
+
if (endoffset == filesize)
break;
-
+
startoffset = endoffset;
}
-
+
delete [] buffer;
return true;
}
@@ -91,11 +91,11 @@ bool PAKFile::saveFile(const char *file) {
error("couldn't open file '%s' for writing", file);
return false;
}
-
+
// TODO: implement error handling
uint32 startAddr = _fileList->getTableSize()+5+4;
static const char *zeroName = "\0\0\0\0\0";
-
+
uint32 curAddr = startAddr;
for (FileList *cur = _fileList; cur; cur = cur->next) {
if (_isAmiga)
@@ -110,11 +110,11 @@ bool PAKFile::saveFile(const char *file) {
else
writeUint32LE(f, curAddr);
fwrite(zeroName, 1, 5, f);
-
+
for (FileList *cur = _fileList; cur; cur = cur->next)
fwrite(cur->data, 1, cur->size, f);
-
- fclose(f);
+
+ fclose(f);
return true;
}
@@ -176,7 +176,7 @@ const uint8 *PAKFile::getFileData(const char *file, uint32 *size) {
if (!cur)
return 0;
-
+
if (size)
*size = cur->size;
return cur->data;
@@ -187,13 +187,13 @@ bool PAKFile::addFile(const char *name, const char *file) {
error("entry '%s' already exists");
return false;
}
-
+
FILE *f = fopen(file, "rb");
if (!f) {
error("couldn't open file '%s'", file);
return false;
}
-
+
uint32 filesize = fileSize(f);
uint8 *data = new uint8[filesize];
assert(data);
@@ -201,7 +201,7 @@ bool PAKFile::addFile(const char *name, const char *file) {
error("couldn't read from file '%s'", file);
return false;
}
- fclose(f);
+ fclose(f);
return addFile(name, data, filesize);
}
diff --git a/tools/create_kyradat/pak.h b/tools/create_kyradat/pak.h
index f81e0be011..1634411f4c 100644
--- a/tools/create_kyradat/pak.h
+++ b/tools/create_kyradat/pak.h
@@ -34,7 +34,7 @@ public:
bool loadFile(const char *file, const bool isAmiga);
bool saveFile(const char *file);
void clearFile() { delete _fileList; _fileList = 0; }
-
+
const uint32 getFileSize() const { return _fileList->getTableSize()+5+4+_fileList->getFileSize(); }
void drawFileList();
@@ -47,7 +47,7 @@ public:
bool addFile(const char *name, const char *file);
bool addFile(const char *name, uint8 *data, uint32 size);
-
+
bool removeFile(const char *name);
public:
struct FileList {
@@ -57,7 +57,7 @@ public:
delete [] data;
delete next;
}
-
+
FileList *findEntry(const char *f) {
for (FileList *cur = this; cur; cur = cur->next) {
if (scumm_stricmp(cur->filename, f) != 0)
@@ -66,7 +66,7 @@ public:
}
return 0;
}
-
+
const FileList *findEntry(const char *f) const {
for (const FileList *cur = this; cur; cur = cur->next) {
if (scumm_stricmp(cur->filename, f) != 0)
@@ -92,12 +92,12 @@ public:
char *filename;
uint32 size;
uint8 *data;
-
+
FileList *next;
};
typedef const FileList cFileList;
-
+
cFileList *getFileList() const { return _fileList; }
private:
FileList *_fileList;
diff --git a/tools/create_kyradat/towns.h b/tools/create_kyradat/towns.h
index 4df7c05b0e..4e632ec571 100644
--- a/tools/create_kyradat/towns.h
+++ b/tools/create_kyradat/towns.h
@@ -10,12 +10,12 @@ const ExtractEntry kyra1FMTownsE[] = {
{ kIntroCOLStrings, 0x00027E06, 0x00027E36 },
{ kIntroStrings, 0x00027E36, 0x0002837B },
{ kRoomList, 0x0002FF90, 0x00036478 },
- { kRoomFilenames, 0x00028B20, 0x00028E6C},
+ { kRoomFilenames, 0x00028B20, 0x00028E6C},
{ kCharacterImageFilenames, 0x0002606E, 0x00026165 },
{ kDefaultShapes, 0x00037CF9, 0x00038183 },
- { kItemNames, 0x00029724, 0x00029C29 },
+ { kItemNames, 0x00029724, 0x00029C29 },
{ kTakenStrings, 0x00028978, 0x00028994 },
- { kPlacedStrings, 0x000289A0, 0x000289A9 },
+ { kPlacedStrings, 0x000289A0, 0x000289A9 },
{ kDroppedStrings, 0x000289E4, 0x000289EE },
{ kNoDropStrings, 0x00027C0E, 0x00027C88 },
{ kAmuleteAnimSeq, 0x0002A814, 0x0002A83E },
@@ -52,7 +52,7 @@ const ExtractEntry kyra1FMTownsE[] = {
{ kPaletteList31, 0x0002ED27, 0x0002ED4E },
{ kPaletteList32, 0x0002ED4F, 0x0002ED76 },
{ kPaletteList33, 0x0002ED77, 0x0002EDB3 },
- { kPutDownString, 0x00025BD6, 0x00025BFC },
+ { kPutDownString, 0x00025BD6, 0x00025BFC },
{ kWaitAmuletString, 0x00025C2A, 0x00025C67 },
{ kBlackJewelString, 0x00025C96, 0x00025CB9 },
{ kHealingTipString, 0x00025CF2, 0x00025D1F },
@@ -89,13 +89,13 @@ const ExtractEntry kyra1FMTownsE[] = {
};
const ExtractEntry kyra1FMTownsJ[] = {
- { kIntroStrings, 0x0002837C, 0x00028977 },
- { kItemNames, 0x00029C2C, 0x0002A1B3 },
+ { kIntroStrings, 0x0002837C, 0x00028977 },
+ { kItemNames, 0x00029C2C, 0x0002A1B3 },
{ kTakenStrings, 0x00028980, 0x0002899F },
- { kPlacedStrings, 0x000289AC, 0x000289B9 },
+ { kPlacedStrings, 0x000289AC, 0x000289B9 },
{ kDroppedStrings, 0x000289F0, 0x000289FB },
{ kNoDropStrings, 0x00027C3E, 0x00027C9F },
- { kPutDownString, 0x00025BFE, 0x00025C27 },
+ { kPutDownString, 0x00025BFE, 0x00025C27 },
{ kWaitAmuletString, 0x00025C6A, 0x00025C93 },
{ kBlackJewelString, 0x00025CBA, 0x00025CEF },
{ kHealingTipString, 0x00025D22, 0x00025D4D },
diff --git a/tools/create_kyradat/util.h b/tools/create_kyradat/util.h
index c22e07f523..8ce6e8acb2 100644
--- a/tools/create_kyradat/util.h
+++ b/tools/create_kyradat/util.h
@@ -80,7 +80,7 @@ typedef uint8 bool;
#define START_PACK_STRUCTS pack(push, 1)
#define END_PACK_STRUCTS pack(pop)
-
+
#elif defined(__MINGW32__)
#define scumm_stricmp stricmp
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-29 08:14:56 +0000