From 1a010a37abfa56c500e8c69896ea9cff77b7d818 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sun, 16 Feb 2014 10:50:25 -0800 Subject: [PATCH] Return an error for invalid voice in keyoff. Can't reproduce no error and Every Extend Extra doesn't even seem to be reporting it. Most likely it would be happy with the error code anyway. --- Core/HLE/sceSas.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Core/HLE/sceSas.cpp b/Core/HLE/sceSas.cpp index 8625e40233..633cb428ce 100644 --- a/Core/HLE/sceSas.cpp +++ b/Core/HLE/sceSas.cpp @@ -299,11 +299,7 @@ u32 sceSasSetKeyOn(u32 core, int voiceNum) { // sceSasSetKeyOff can be used to start sounds, that just sound during the Release phase! u32 sceSasSetKeyOff(u32 core, int voiceNum) { - if (voiceNum == -1) { - // TODO: Some games (like Every Extend Extra) deliberately pass voiceNum = -1. Does that mean all voices? for now let's ignore. - WARN_LOG_REPORT(SCESAS, "sceSasSetKeyOff(%08x, %i) - voiceNum = -1???", core, voiceNum); - return 0; - } else if (voiceNum >= PSP_SAS_VOICES_MAX || voiceNum < 0) { + if (voiceNum >= PSP_SAS_VOICES_MAX || voiceNum < 0) { WARN_LOG(SCESAS, "%s: invalid voicenum %d", __FUNCTION__, voiceNum); return ERROR_SAS_INVALID_VOICE; } else {