From 7bb8de561b9b0e114daaff12b615b2f947e757df Mon Sep 17 00:00:00 2001
From: Travis Howell <kirben@scummvm.org>
Date: Tue, 15 Mar 2005 01:19:36 +0000
Subject: [PATCH] Off by one.

svn-id: r17138
---
 scumm/costume.cpp | 2 +-
 scumm/scumm.cpp   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scumm/costume.cpp b/scumm/costume.cpp
index 057b6ae1ebf..f181b518df0 100644
--- a/scumm/costume.cpp
+++ b/scumm/costume.cpp
@@ -855,7 +855,7 @@ void ScummEngine::cost_decodeNESCostumeGfx() {
 		byte *patTable = getResourceAddress(rtCostume, v1MMNEScostTables[n][4]);
 		int j = 0;
 		int i = 3;
-		int maxSprites = 256; //patTable[3];
+		int maxSprites = 257; //patTable[3];
 		int len = READ_LE_UINT16(patTable);
 
 		if (maxSprites == 0)
diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp
index 716dc415aed..1b531331f50 100644
--- a/scumm/scumm.cpp
+++ b/scumm/scumm.cpp
@@ -1583,7 +1583,7 @@ void ScummEngine::setupMusic(int midi) {
 		_musicEngine = new Player_V2A(this);
 	} else if ((_features & GF_AMIGA) && (_version == 3)) {
 		_musicEngine = new Player_V3A(this);
-	} else if ((_features & GF_AMIGA) && (_version < 5)) {
+	} else if (((_features & GF_AMIGA) && (_version < 5)) || (_features & GF_NES)) {
 		_musicEngine = NULL;
 	} else if (((_midiDriver == MD_PCJR) || (_midiDriver == MD_PCSPK)) && ((_version > 2) && (_version < 5))) {
 		_musicEngine = new Player_V2(this, _midiDriver != MD_PCSPK);