From a353b6e7ceaf7e48e2b06ffda58a871ddffbb2ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philip=20Dub=C3=A9?=
 <159546+serprex@users.noreply.github.com>
Date: Fri, 18 Sep 2026 14:54:24 +0000
Subject: Shuffle Scarecrow Song (#7205)

---
 soh/src/code/code_800EC960.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'soh/src/code')

diff --git a/soh/src/code/code_800EC960.c b/soh/src/code/code_800EC960.c
index b8aa5c8bf..31fc49de4 100644
--- a/soh/src/code/code_800EC960.c
+++ b/soh/src/code/code_800EC960.c
@@ -2090,7 +2090,8 @@ void AudioOcarina_PlaybackSong(void) {
                 }
                 return;
             } else {
-                sPlaybackNoteTimer -= nextNoteTimerStep;
+                // SoH [Fix] several audio tasks can run between updates, don't wrap below zero
+                sPlaybackNoteTimer -= MIN(nextNoteTimerStep, sPlaybackNoteTimer);
             }
 
             // Update volume
-- 
cgit v1.2.3