From 651d00d32058c8e35f0bc6f747fce531330c35a8 Mon Sep 17 00:00:00 2001 From: cassidoxa Date: Sun, 9 Oct 2022 17:09:43 -0400 Subject: [PATCH] Progressive shields, swords, and mail use highest item level to determine upgrade --- newitems.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/newitems.asm b/newitems.asm index 4492761..2891759 100755 --- a/newitems.asm +++ b/newitems.asm @@ -449,7 +449,7 @@ AddReceivedItemExpanded: LDA.b #$4F : STA $02D8 +++ : JMP .done ++ : CMP.b #$5E : BNE ++ ; Progressive Sword - LDA SwordEquipment : CMP.l ProgressiveSwordLimit : !BLT + + LDA HighestSword : CMP.l ProgressiveSwordLimit : !BLT + LDA.l ProgressiveSwordReplacement : STA $02D8 : JMP .done + : CMP.b #$00 : BNE + ; No Sword LDA.b #$49 : STA $02D8 : JMP .done @@ -460,7 +460,7 @@ AddReceivedItemExpanded: + ; Everything Else LDA.b #$03 : STA $02D8 : JMP .done ++ : CMP.b #$5F : BNE ++ ; Progressive Shield - LDA ShieldEquipment : CMP.l ProgressiveShieldLimit : !BLT + + LDA HighestShield : CMP.l ProgressiveShieldLimit : !BLT + LDA.l ProgressiveShieldReplacement : STA $02D8 : JMP .done + : CMP.b #$00 : BNE + ; No Shield LDA.b #$04 : STA $02D8 : JMP .done @@ -469,7 +469,7 @@ AddReceivedItemExpanded: + ; Everything Else LDA.b #$06 : STA $02D8 : JMP .done ++ : CMP.b #$60 : BNE ++ ; Progressive Armor - LDA ArmorEquipment : CMP.l ProgressiveArmorLimit : !BLT + + LDA HighestMail : CMP.l ProgressiveArmorLimit : !BLT + LDA.l ProgressiveArmorReplacement : STA $02D8 : JMP .done + : CMP.b #$00 : BNE + ; No Armor LDA.b #$22 : STA $02D8 : JMP .done