5 files changed, 28 insertions, 16 deletions

diff --git a/engines/kyra/resource/resource.h b/engines/kyra/resource/resource.h
index 02415cf4ff..cbd442fcc1 100644
--- a/engines/kyra/resource/resource.h
+++ b/engines/kyra/resource/resource.h
@@ -492,9 +492,9 @@ enum KyraResources {
 	kEoBBaseSoundFilesIntro,
 	kEoBBaseSoundFilesIngame,
 	kEoBBaseSoundFilesFinale,
+	kEoBBaseLevelSounds1,
+	kEoBBaseLevelSounds2,
 
-	kEoB1BaseLevelSounds1,
-	kEoB1BaseLevelSounds2,
 	kEoB1MainMenuStrings,
 	kEoB1BonusStrings,
 
@@ -632,6 +632,9 @@ enum KyraResources {
 	kEoB2IntroShapes01,
 	kEoB2IntroShapes04,
 	kEoB2IntroShapes07,
+	kEoB2IntroShapes13,
+	kEoB2IntroShapes14,
+	kEoB2IntroShapes15,
 
 	kEoB2FinaleStrings,
 	kEoB2CreditsData,
@@ -930,6 +933,12 @@ enum KyraResources {
 	kEoB2PcmSoundEffectsIntro,
 	kEoB2PcmSoundEffectsFinale,
 
+	kEoB2SoundMapExtra,
+	kEoB2SoundIndex1,
+	kEoB2SoundIndex2,
+	kEoB2SoundFilesIngame2,
+	kEoB2MonsterSoundPatchData,
+
 	kLoLIngamePakFiles,
 	kLoLCharacterDefs,
 	kLoLIngameSfxFiles,
diff --git a/engines/kyra/resource/staticres.cpp b/engines/kyra/resource/staticres.cpp
index e569cf1479..fcf3158f5e 100644
--- a/engines/kyra/resource/staticres.cpp
+++ b/engines/kyra/resource/staticres.cpp
@@ -39,7 +39,7 @@
 
 namespace Kyra {
 
-#define RESFILE_VERSION 93
+#define RESFILE_VERSION 94
 
 namespace {
 bool checkKyraDat(Common::SeekableReadStream *file) {
diff --git a/engines/kyra/resource/staticres_eob.cpp b/engines/kyra/resource/staticres_eob.cpp
index 7ff439d202..a75c464573 100644
--- a/engines/kyra/resource/staticres_eob.cpp
+++ b/engines/kyra/resource/staticres_eob.cpp
@@ -24,6 +24,8 @@
 #include "kyra/resource/resource.h"
 #include "kyra/sound/sound_intern.h"
 
+#include "common/memstream.h"
+
 
 namespace Kyra {
 
@@ -1390,18 +1392,19 @@ void DarkMoonEngine::initSpells() {
 	EoBCoreEngine::initSpells();
 
 	int temp;
-	const uint8 *src = _staticres->loadRawData(kEoBBaseSpellProperties, temp);
+	const uint8 *data = _staticres->loadRawData(kEoBBaseSpellProperties, temp);
+	Common::MemoryReadStreamEndian *src = new Common::MemoryReadStreamEndian(data, temp, _flags.platform == Common::kPlatformAmiga);
 
 	for (int i = 0; i < _numSpells; i++) {
 		EoBSpell *s = &_spells[i];
-		src += 8;
-		s->flags = READ_LE_UINT16(src);
-		src += 10;
-		s->sound = *src++;
-		s->effectFlags = READ_LE_UINT32(src);
-		src += 4;
-		s->damageFlags = READ_LE_UINT16(src);
-		src += 2;
+		src->skip(8);
+		s->flags = src->readUint16();
+		src->skip(8);
+		s->sound = src->readByte();
+		if (_flags.platform == Common::kPlatformAmiga)
+			src->skip(1);
+		s->effectFlags = src->readUint32();
+		s->damageFlags = src->readUint16();
 	}
 }
 
diff --git a/engines/kyra/sequence/sequences_darkmoon.cpp b/engines/kyra/sequence/sequences_darkmoon.cpp
index 56bcbba633..c1fd9e6f69 100644
--- a/engines/kyra/sequence/sequences_darkmoon.cpp
+++ b/engines/kyra/sequence/sequences_darkmoon.cpp
@@ -833,11 +833,11 @@ void DarkMoonEngine::seq_playFinale() {
 		snd_playSong(_flags.platform == Common::kPlatformFMTowns ? 16 : 1);
 
 	int temp = 0;
-	const uint8 *creditsData = (_flags.platform == Common::kPlatformFMTowns) ? _res->fileData("CREDITS.TXT", 0) : _staticres->loadRawData(kEoB2CreditsData, temp);
+	const uint8 *creditsData = (_flags.platform != Common::kPlatformDOS) ? _res->fileData("CREDITS.TXT", 0) : _staticres->loadRawData(kEoB2CreditsData, temp);
 	
 	seq_playCredits(&sq, creditsData, 18, 2, 6, 2);
 	
-	if (_flags.platform == Common::kPlatformFMTowns)
+	if (_flags.platform != Common::kPlatformDOS)
 		delete[] creditsData;
 
 	sq.delay(90);
diff --git a/engines/kyra/sound/sound_amiga_eob.cpp b/engines/kyra/sound/sound_amiga_eob.cpp
index d2cf976ec9..eccf380a69 100644
--- a/engines/kyra/sound/sound_amiga_eob.cpp
+++ b/engines/kyra/sound/sound_amiga_eob.cpp
@@ -52,8 +52,8 @@ bool SoundAmiga_EoB::init() {
 		return false;
 
 	int temp = 0;
-	_levelSoundList1 = _vm->staticres()->loadStrings(kEoB1BaseLevelSounds1, temp);
-	_levelSoundList2 = _vm->staticres()->loadStrings(kEoB1BaseLevelSounds2, temp);
+	_levelSoundList1 = _vm->staticres()->loadStrings(kEoBBaseLevelSounds1, temp);
+	_levelSoundList2 = _vm->staticres()->loadStrings(kEoBBaseLevelSounds2, temp);
 
 	_ready = true;
 	return true;