Merge branch 'main' into overworld_kara

2021-07-01 23:02:23 -07:00
parent b8dc86d7c5 04a07025ef
commit 01abf889d7
12 changed files with 228 additions and 71 deletions
--- a/utilities.asm
+++ b/utilities.asm
@@ -243,7 +243,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