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

Fix mixing progressive/non-progressive swords and shields

Browse Source
This commit is contained in:
karafruit
2022-10-08 15:34:15 -07:00
parent f93a817ed3
commit d05169d5e2
6 changed files with 30 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
newitems.asm
View File

@@ -523,7 +523,7 @@ AddReceivedItemExpanded:
+++ : JMP .done
++ : CMP.b #$5E : BNE ++ ; Progressive Sword
LDA !MULTIWORLD_ITEM_PLAYER_ID : BNE +
LDA HighestSword : CMP.l ProgressiveSwordLimit : !BLT +
LDA ProgressiveSwords : CMP.l ProgressiveSwordLimit : !BLT +
LDA.l ProgressiveSwordReplacement : STA $02D8 : JMP .done
+
LDA SwordEquipment : CMP.b #$FF : BNE + ; Swordless
@@ -545,10 +545,10 @@ AddReceivedItemExpanded:
+++ ; Everything Else
LDA.b #$06 : STA $02D8 : JMP .done
+
LDA HighestShield : CMP.l ProgressiveShieldLimit : !BLT +
LDA ProgressiveShields : CMP.l ProgressiveShieldLimit : !BLT +
LDA.l ProgressiveShieldReplacement : STA $02D8 : JMP .done
+
LDA HighestShield : BNE + ; No Shield
LDA ProgressiveShields : BNE + ; No Shield
LDA.b #$04 : BRA .shielddone
+ : CMP.b #$01 : BNE + ; Fighter Shield
LDA.b #$05 : BRA .shielddone