From c60cbbc869e398731b91baaafe9279475b8a25a4 Mon Sep 17 00:00:00 2001
From: Bonta <40473493+Bonta0@users.noreply.github.com>
Date: Sun, 20 Jun 2021 12:38:56 +0200
Subject: [PATCH] Utilities: Fix progressive bow sprite replacement

---
 utilities.asm | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/utilities.asm b/utilities.asm
index a9209f3..fa059fa 100644
--- a/utilities.asm
+++ b/utilities.asm
@@ -89,8 +89,12 @@ RTL
 		+ ; Everything Else
 			LDA.b #$2E : RTL
 	++ : CMP.b #$F8 : BNE ++ ; Progressive Bow
-		LDA $7EF340
-		CMP.b #$00 : BNE + ; No Bow
+		LDA $7EF340 : INC : LSR
+		CMP.l ProgressiveBowLimit : !BLT +
+			LDA.l ProgressiveBowReplacement
+			JSL.l GetSpriteID
+			RTL
+		+ : CMP.b #$00 : BNE + ; No Bow
 			LDA.b #$29 : RTL
 		+ ; Any Bow
 			LDA.b #$2A : RTL
@@ -225,7 +229,12 @@ RTL
 		+ ; Everything Else
 			LDA.b #$08 : RTL
 	++ : CMP.b #$F8 : BNE ++ ; Progressive Bow
-		LDA $7EF354 : BNE + ; No Bow
+		LDA $7EF340 : INC : LSR
+		CMP.l ProgressiveBowLimit : !BLT +
+			LDA.l ProgressiveBowReplacement
+			JSL.l GetSpritePalette
+			RTL
+		+ : CMP.b #$00 : BNE + ; No Bow
 			LDA.b #$08 : RTL
 		+ ; Any Bow
 			LDA.b #$02 : RTL