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

added limits for progressive bows

Browse Source
This commit is contained in:
Kat
2019-08-25 13:46:10 -04:00
parent 4994cfb994
commit 5af7d13cb0
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
newitems.asm
View File

@@ -462,7 +462,7 @@ AddReceivedItemExpanded:
LDA !PROGRESSIVE_SHIELD : !ADD.b #$40 : STA !PROGRESSIVE_SHIELD : BRL .done LDA !PROGRESSIVE_SHIELD : !ADD.b #$40 : STA !PROGRESSIVE_SHIELD : BRL .done
++ : CMP.b #$60 : BNE ++ ; Progressive Armor ++ : CMP.b #$60 : BNE ++ ; Progressive Armor
LDA $7EF35B : CMP.l ProgressiveArmorLimit : !BLT + 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 + : CMP.b #$00 : BNE + ; No Armor
LDA.b #$22 : STA $02D8 : BRA .done LDA.b #$22 : STA $02D8 : BRA .done
+ ; Everything Else + ; Everything Else
@@ -473,7 +473,9 @@ AddReceivedItemExpanded:
+ ; Everything Else + ; Everything Else
LDA.b #$1C : STA $02D8 : BRA .done LDA.b #$1C : STA $02D8 : BRA .done
++ : CMP.b #$64 : BNE ++ : -- ; Progressive Bow ++ : 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 LDA.b #$3A : STA $02D8 : BRA .done
+ ; Any Bow + ; Any Bow
LDA.b #$3B : STA $02D8 : BRA .done LDA.b #$3B : STA $02D8 : BRA .done

6
tables.asm
View File

@@ -399,8 +399,12 @@ BottleLimit:
db #$04 ; #$04 - 4 Bottles (default) db #$04 ; #$04 - 4 Bottles (default)
BottleLimitReplacement: BottleLimitReplacement:
db #$47 ; #$47 - 20 Rupees (default) 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 org $3080A0 ; PC 0x1800A0 - 0x1800A4
Bugfix_MirrorlessSQToLW: Bugfix_MirrorlessSQToLW: