From 358f50be18c69a6f309a399352fddcf0658b02ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Oliva?= <olivarra1@gmail.com>
Date: Tue, 11 Jan 2022 20:29:00 +0100
Subject: [PATCH] fix sfx kicking out wrong music channels

---
 pico8_ps4/audio.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pico8_ps4/audio.cpp b/pico8_ps4/audio.cpp
index e3cf839..29ac2d4 100644
--- a/pico8_ps4/audio.cpp
+++ b/pico8_ps4/audio.cpp
@@ -250,10 +250,10 @@ void AudioManager::playSfx(int n, int channel, int offset, int length)
 			}
 		}
 
-		// Option 3. Kick the first non-reserved channel to play yours
-		for (int c = 0; channel == -1 && c < CHANNELS; c++) {
+		// Option 3. Kick the first non-reserved channel to play yours, beginning from the end
+		for (int c = CHANNELS-1; channel == -1 && c >= 0; c--) {
 			Channel ch = this->channels[c];
-			if (!ch.reserved) {
+			if (!ch.reserved && ch.music_timing < 0) {
 				channel = c;
 			}
 		}
@@ -334,12 +334,12 @@ void AudioManager::playNextPattern()
 
 	// Try next one
 	int next_addr = addr + 4;
-	bool has_data = (
-		(p8_memory[addr] & 0x40) |
-		(p8_memory[addr + 1] & 0x40) |
-		(p8_memory[addr + 2] & 0x40) |
-		(p8_memory[addr + 3] & 0x40)
-		) > 0;
+	bool has_data = ( // If anyone of them is 0, then we have data, because a 1 means the channel is disabled
+		(p8_memory[next_addr] & 0x20) &
+		(p8_memory[next_addr + 1] & 0x20) &
+		(p8_memory[next_addr + 2] & 0x20) &
+		(p8_memory[next_addr + 3] & 0x20)
+		) == 0;
 	if (has_data) {
 		this->playPattern(this->pattern + 1);
 	}