Merge branch 'master' into DRMain

# Conflicts: # LTTP_RND_GeneralBugfixes.asm # events.asm # hooks.asm # stats.asm # stats/creditsnew.asm # stats/statConfig.asm # swordswap.asm # utilities.asm
2021-07-07 11:15:11 -07:00
parent e9aec2ba86 264f7b26bc
commit aee82fa319
21 changed files with 700 additions and 176 deletions
--- a/utilities.asm
+++ b/utilities.asm
@@ -240,7 +240,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