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

utilities: Progressive Bow overflow narrow sprites

Browse Source
This commit is contained in:
cassidy
2021-09-06 20:16:41 -04:00
parent bbc8228175
commit 9f1933d8c0
1 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
utilities.asm
View File

@@ -314,32 +314,44 @@ IsNarrowSprite:
LDA.l BottleLimitReplacement LDA.l BottleLimitReplacement
JSL.l IsNarrowSprite JSL.l IsNarrowSprite
JMP .done JMP .done
+ : BRA .continue + : JMP .continue
.notBottle .notBottle
CMP.b #$5E : BNE ++ ; Progressive Sword CMP.b #$5E : BNE ++ ; Progressive Sword
LDA $7EF359 : CMP.l ProgressiveSwordLimit : !BLT + ; Progressive Sword Limit LDA $7EF359 : CMP.l ProgressiveSwordLimit : !BLT + ; Progressive Sword Limit
LDA.l ProgressiveSwordReplacement LDA.l ProgressiveSwordReplacement
JSL.l IsNarrowSprite JSL.l IsNarrowSprite
BRA .done JMP .done
+ : BRA .continue + : JMP .continue
++ : CMP.b #$5F : BNE ++ ; Progressive Shield ++ CMP.b #$5F : BNE ++ ; Progressive Shield
LDA !PROGRESSIVE_SHIELD : AND #$C0 : BNE + : SEC : BRA .done ; No Shield LDA !PROGRESSIVE_SHIELD : AND #$C0 : BNE + : SEC : JMP .done ; No Shield
+ : LSR #6 : CMP.l ProgressiveShieldLimit : !BLT + ; Progressive Shield Limit + : LSR #6 : CMP.l ProgressiveShieldLimit : !BLT .continue
LDA.l ProgressiveShieldReplacement LDA.l ProgressiveShieldReplacement
JSL.l IsNarrowSprite JSL.l IsNarrowSprite
BRA .done JMP .done
++ CMP.b #$60 : BNE ++ ; Progressive Armor ++ CMP.b #$60 : BNE ++ ; Progressive Armor
LDA $7EF35B : CMP.l ProgressiveArmorLimit : !BLT + ; Progressive Armor Limit LDA $7EF35B : CMP.l ProgressiveArmorLimit : !BLT .continue
LDA.l ProgressiveArmorReplacement LDA.l ProgressiveArmorReplacement
JSL.l IsNarrowSprite JSL.l IsNarrowSprite
BRA .done JMP .done
+ +
++ CMP.b #$62 : BNE ++ ; RNG Item (Single) ++ CMP.b #$62 : BNE ++ ; RNG Item (Single)
JSL.l GetRNGItemSingle : BRA .continue JSL.l GetRNGItemSingle : JMP .continue
++ CMP.b #$63 : BNE ++ ; RNG Item (Multi) ++ CMP.b #$63 : BNE ++ ; RNG Item (Multi)
JSL.l GetRNGItemMulti JSL.l GetRNGItemMulti
++ ++ CMP.b #$64 : BEQ .progressivebow ; Progressive Bow
CMP.b #$65 : BNE .continue ; Progressive Bow (alt)
.progressivebow
LDA $7EF38E : BIT #$A0 : BEQ .continue ; No Progressive Bows
LDX.b #$0 ; Bow counter
CMP #$80 : BEQ + ; We have only one of two
CMP #$20 : BEQ + ; progressive bows
INX
+
INX
TXA : CMP.l ProgressiveBowLimit : !BLT .continue
LDA.l ProgressiveBowReplacement
JSL.l IsNarrowSprite
JMP .done
.continue .continue
;-------- ;--------