From 363f710d02259f5539328a8308b6e314dfc5243a Mon Sep 17 00:00:00 2001
From: 4am <a2_4am@sent.com>
Date: Sun, 2 Mar 2025 17:52:13 -0500
Subject: [PATCH] sync decompress-SHR-to-completion fix

---
 src/glue.decompress.a | 8 ++++++--
 src/glue.launch.a     | 2 +-
 src/ui.attract.shr.a  | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/glue.decompress.a b/src/glue.decompress.a
index 76066bc..8fc7256 100644
--- a/src/glue.decompress.a
+++ b/src/glue.decompress.a
@@ -6,6 +6,7 @@
 ; Public functions
 ; - DecompressGameHelp
 ; - DecompressSHR
+; - DecompressAuxSHROnIdle
 ; - DecompressAuxSHR
 ; - DecompressDHGR
 ; - DecompressHGR
@@ -49,15 +50,18 @@ DecompressSHR
          bne   DecompressAfterLoad   ; always branches
 
 ;------------------------------------------------------------------------------
-; DecompressAuxSHR
+; DecompressAuxSHR/DecompressAuxSHROnIdle
 ;
 ; in:    compressed SHR data at $1FF8/aux
 ;        file size in sizelo2/sizehi2 as set by ProRWTS2
 ; out:   decompressed SHR data at $2000..$9FFF/aux
 ;        also see notes in DecompressAfterLoad
 ;------------------------------------------------------------------------------
-DecompressAuxSHR
+DecompressAuxSHROnIdle
          bit   SHRRTS                ; V=1 -> allow early exit on keypress
+         !byte $A9
+DecompressAuxSHR
+         clv                         ; V=0 -> always complete decompression
          ldx   #kDecompressInAuxMem  ; data is in auxmem
          ldy   #$A0
          lda   #$1F                  ; target address (hi) -1
diff --git a/src/glue.launch.a b/src/glue.launch.a
index fefde91..31f8355 100644
--- a/src/glue.launch.a
+++ b/src/glue.launch.a
@@ -166,7 +166,7 @@ PlayGameInAY
 @loadLaunchArtwork128K
          lda   gPreloadStatus
          bne   @resumeBackgroundDecompression
-+        jsr   LoadAuxIndexedSHRFile
+         jsr   LoadAuxIndexedSHRFile
          jsr   PreSHRMode
          jsr   DecompressAuxSHR
          jmp   @showLaunchArtwork128K
diff --git a/src/ui.attract.shr.a b/src/ui.attract.shr.a
index 92d5f5c..e9efef1 100644
--- a/src/ui.attract.shr.a
+++ b/src/ui.attract.shr.a
@@ -287,7 +287,7 @@ LoadLaunchArtworkInBackground
          lda   #%00000001
          sta   gPreloadStatus
          jsr   PreSHRMode
-         jsr   DecompressAuxSHR
+         jsr   DecompressAuxSHROnIdle
          lda   KBD
          bmi   @turnOffLinearizeAndExit
          lda   #%11111111