alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Pull Requests 1 Releases Activity

Revert "Fix mixing progressive/non-progressive swords and shields"

Browse Source 
This reverts commit 9bcb72f7bc.
This commit is contained in:
karafruit
2022-10-12 15:55:18 -07:00
parent 9bcb72f7bc
commit 9d079dbd0f
6 changed files with 61 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
newitems.asm
View File

@@ -474,7 +474,7 @@ AddReceivedItemExpanded:
LDA.b #$4F : STA $02D8
+++ : JMP .done
++ : CMP.b #$5E : BNE ++ ; Progressive Sword
LDA ProgressiveSwords : CMP.l ProgressiveSwordLimit : !BLT +
LDA SwordEquipment : CMP.l ProgressiveSwordLimit : !BLT +
LDA.l ProgressiveSwordReplacement : STA $02D8 : JMP .done
+ : CMP.b #$00 : BNE + ; No Sword
LDA.b #$49 : STA $02D8 : JMP .done
@@ -485,7 +485,7 @@ AddReceivedItemExpanded:
+ ; Everything Else
LDA.b #$03 : STA $02D8 : JMP .done
++ : CMP.b #$5F : BNE ++ ; Progressive Shield
LDA ProgressiveShields : CMP.l ProgressiveShieldLimit : !BLT +
LDA ShieldEquipment : CMP.l ProgressiveShieldLimit : !BLT +
LDA.l ProgressiveShieldReplacement : STA $02D8 : JMP .done
+ : CMP.b #$00 : BNE + ; No Shield
LDA.b #$04 : STA $02D8 : JMP .done