2 files changed, 18 insertions, 8 deletions

diff --git a/tools/create_kyradat/amiga.h b/tools/create_kyradat/amiga.h
index 26fcddf614..3b3aa2d5a5 100644
--- a/tools/create_kyradat/amiga.h
+++ b/tools/create_kyradat/amiga.h
@@ -14,7 +14,7 @@ const ExtractEntry kyra1AmigaEng[] = {
 	{ kCharacterImageFilenames, 0x0000C814, 0x0000C904 },
 	{ kDefaultShapes, 0x00039230, 0x000396BA },
 	{ kItemNames, 0x0001A3B8, 0x0001A738 },
-	{ kTakenStrings, 0x0000F9F4, 0x0000FAF0 },
+	{ kTakenStrings, 0x0000FAE8, 0x0000FAF0 },
 	{ kPlacedStrings, 0x0000FAF0, 0x0000FAFA },
 	{ kDroppedStrings, 0x000101F2, 0x000101FC },
 	{ kNoDropStrings, 0x0000C98E, 0x0000C9D6 },
@@ -39,8 +39,8 @@ const ExtractEntry kyra1AmigaEng[] = {
 	{ kBranStoneShapes, 0x00039C32, 0x00039CA0 },
 	{ kWispJewelStrings, 0x00004A54, 0x00004AAA },
 	{ kMagicJewelStrings, 0x00004AAA, 0x00004ABE },
-	{ kFlaskFullString, 0x00017B04, 0x00017B9E },
-	{ kFullFlaskString, 0x00017B9E, 0x00017BBA },
+	{ kFlaskFullString, 0x00017B9E, 0x00017BBA },
+	{ kFullFlaskString, 0x00017B04, 0x00017B9E },
 	{ kOutroReunionSeq, 0x00030A4A, 0x00030F94 },
 	{ kOutroHomeString, 0x0000C6FA, 0x0000C6FF },
 	{ kVeryCleverString, 0x0000B322, 0x0000B354 },
diff --git a/tools/create_kyradat/create_kyradat.cpp b/tools/create_kyradat/create_kyradat.cpp
index ead0c232b1..780282bab2 100644
--- a/tools/create_kyradat/create_kyradat.cpp
+++ b/tools/create_kyradat/create_kyradat.cpp
@@ -31,7 +31,7 @@
 #include "md5.h"
 
 enum {
-	kKyraDatVersion = 48,
+	kKyraDatVersion = 49,
 	kIndexSize = 12
 };
 
@@ -498,7 +498,11 @@ bool extractStrings(PAKFile &out, const Game *g, const byte *data, const uint32
 	for (uint32 i = 0; i < size; ++i) {
 		if (!data[i]) {
 			if (g->special == kAmigaVersion) {
-				if (!((i + 1) & 0x1))
+				if (i + 1 >= size)
+					++entries;
+				else if (!data[i+1] && !(i & 1))
+					continue;
+				else
 					++entries;
 			} else {
 				++entries;
@@ -554,6 +558,7 @@ bool extractStrings(PAKFile &out, const Game *g, const byte *data, const uint32
 
 	uint8 *buffer = new uint8[targetsize];
 	assert(buffer);
+	memset(buffer, 0, targetsize);
 	uint8 *output = buffer;
 	const uint8 *input = (const uint8*) data;
 
@@ -561,7 +566,7 @@ bool extractStrings(PAKFile &out, const Game *g, const byte *data, const uint32
 	if (g->special == kFMTownsVersionE || g->special == kFMTownsVersionJ ||
 		g->special == k2TownsFile1E || g->special == k2TownsFile1J ||
 		g->special == k2TownsFile2E || g->special == k2TownsFile2J || fmtPatch == 5) {
-		const byte * c = data + size;
+		const byte *c = data + size;
 		do {
 			if (fmtPatch == 2 && input - data == 0x3C0 && input[0x10] == 0x32) {
 				memcpy(output, input, 0x0F);
@@ -611,8 +616,13 @@ bool extractStrings(PAKFile &out, const Game *g, const byte *data, const uint32
 		// we need to strip some aligment zeros out here
 		int dstPos = 0;
 		for (uint32 i = 0; i < size; ++i) {
-			if (!data[i] && ((i+1) & 0x1))
-				continue;
+			if (!data[i] && !(i & 1)) {
+				if (i + 1 > size)
+					continue;
+				else if (i + 1 < size && !data[i+1])
+					continue;
+			}
+
 			*output++ = data[i];
 			++dstPos;
 		}