diff --git a/newitems.asm b/newitems.asm index 9d34a1a..03ece80 100755 --- a/newitems.asm +++ b/newitems.asm @@ -462,7 +462,7 @@ AddReceivedItemExpanded: LDA !PROGRESSIVE_SHIELD : !ADD.b #$40 : STA !PROGRESSIVE_SHIELD : BRL .done ++ : CMP.b #$60 : BNE ++ ; Progressive Armor LDA $7EF35B : CMP.l ProgressiveArmorLimit : !BLT + - LDA.l ProgressiveArmorReplacement : STA $02D8 : BRA .done + LDA.l ProgressiveArmorReplacement : STA $02D8 : BRL .done + : CMP.b #$00 : BNE + ; No Armor LDA.b #$22 : STA $02D8 : BRA .done + ; Everything Else @@ -473,7 +473,9 @@ AddReceivedItemExpanded: + ; Everything Else LDA.b #$1C : STA $02D8 : BRA .done ++ : CMP.b #$64 : BNE ++ : -- ; Progressive Bow - LDA $7EF340 : BNE + ; No Bow + LDA $7EF340 : CMP.l ProgressiveBowLimit : !BLT + + LDA.l ProgressiveBowReplacement : STA $02D8 : BRL .done + + : CMP.b #$00 : BNE + ; No Bow LDA.b #$3A : STA $02D8 : BRA .done + ; Any Bow LDA.b #$3B : STA $02D8 : BRA .done diff --git a/tables.asm b/tables.asm index a0ac340..95130ab 100644 --- a/tables.asm +++ b/tables.asm @@ -399,8 +399,12 @@ BottleLimit: db #$04 ; #$04 - 4 Bottles (default) BottleLimitReplacement: db #$47 ; #$47 - 20 Rupees (default) +ProgressiveBowLimit: +db #$02 ; #$02 - 2 Bows (default) +ProgressiveBowReplacement: +db #$47 ; #$47 - 20 Rupees (default) ;-------------------------------------------------------------------------------- -; 0x180098 - 0x18009F (unused) +; 0x18009A - 0x18009F (unused) ;-------------------------------------------------------------------------------- org $3080A0 ; PC 0x1800A0 - 0x1800A4 Bugfix_MirrorlessSQToLW: