From bbc8228175e023347d0e017925008ebe8bd81a9f Mon Sep 17 00:00:00 2001 From: cassidy Date: Mon, 6 Sep 2021 17:21:48 -0400 Subject: [PATCH] utilities: Fix shields overflowing with narrow sprites --- utilities.asm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/utilities.asm b/utilities.asm index fa059fa..fad70c6 100644 --- a/utilities.asm +++ b/utilities.asm @@ -324,13 +324,10 @@ IsNarrowSprite: + : BRA .continue ++ : CMP.b #$5F : BNE ++ ; Progressive Shield LDA !PROGRESSIVE_SHIELD : AND #$C0 : BNE + : SEC : BRA .done ; No Shield - LSR #6 : CMP.l ProgressiveShieldLimit : !BLT + ; Progressive Shield Limit + + : LSR #6 : CMP.l ProgressiveShieldLimit : !BLT + ; Progressive Shield Limit LDA.l ProgressiveShieldReplacement JSL.l IsNarrowSprite BRA .done - + - ;LDA $7EF35A : BNE + : SEC : BRA .done : +; No Shield - BRA .false ; Everything Else ++ CMP.b #$60 : BNE ++ ; Progressive Armor LDA $7EF35B : CMP.l ProgressiveArmorLimit : !BLT + ; Progressive Armor Limit LDA.l ProgressiveArmorReplacement