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

Fix potions to work normally in Spike cave

Browse Source
This commit is contained in:
sporchia
2018-01-19 22:18:21 -05:00
parent 39b20f9a05
commit d0efce2e98
1 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
potions.asm
View File

@@ -4,15 +4,22 @@
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
!BUSY_HEALTH = $7F5092 !BUSY_HEALTH = $7F5092
RefillHealth: RefillHealth:
;STA $FFFFFF REP #$20 ; set 16-bit accumulator
LDA.l PotionHealthRefill : CMP.b #$A0 : !BGE + LDA $A0 ; these are all decimal because i got them that way
CMP.w #279 : BNE + ; Spike Cave bottles work normally
SEP #$20 ; set 8-bit accumulator
LDA #$A0
BRA .done
+
SEP #$20 ; set 8-bit accumulator
LDA.l PotionHealthRefill : CMP.b #$A0 : !BGE .done
LDA !BUSY_HEALTH : BNE ++ LDA !BUSY_HEALTH : BNE ++
LDA.l PotionHealthRefill ; load refill amount LDA.l PotionHealthRefill ; load refill amount
!ADD $7EF36D ; add to current health !ADD $7EF36D ; add to current health
CMP $7EF36C : !BLT +++ : LDA $7EF36C : +++ CMP $7EF36C : !BLT +++ : LDA $7EF36C : +++
STA !BUSY_HEALTH STA !BUSY_HEALTH
++ ++
LDA $7EF36D : CMP.l !BUSY_HEALTH : !BLT ++ LDA $7EF36D : CMP.l !BUSY_HEALTH : !BLT ++
LDA.b #$00 : STA $7EF372 LDA.b #$00 : STA $7EF372
LDA $020A : BNE .notDone LDA $020A : BNE .notDone
@@ -24,8 +31,8 @@ RefillHealth:
.notDone .notDone
CLC CLC
RTL RTL
+ .done
; Check goal health versus actual health. ; Check goal health versus actual health.
; if(actual < goal) then branch. ; if(actual < goal) then branch.
LDA $7EF36D : CMP $7EF36C : BCC .refillAllHealth LDA $7EF36D : CMP $7EF36C : BCC .refillAllHealth
@@ -44,14 +51,22 @@ RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
!BUSY_MAGIC = $7F5093 !BUSY_MAGIC = $7F5093
RefillMagic: RefillMagic:
LDA.l PotionMagicRefill : CMP.b #$80 : !BGE + REP #$20 ; set 16-bit accumulator
LDA $A0 ; these are all decimal because i got them that way
CMP.w #279 : BNE + ; Spike Cave bottles work normally
SEP #$20 ; set 8-bit accumulator
LDA #$80
BRA .done
+
SEP #$20 ; set 8-bit accumulator
LDA.l PotionMagicRefill : CMP.b #$80 : !BGE .done
LDA !BUSY_MAGIC : BNE ++ LDA !BUSY_MAGIC : BNE ++
LDA.l PotionMagicRefill ; load refill amount LDA.l PotionMagicRefill ; load refill amount
!ADD $7EF36E ; add to current magic !ADD $7EF36E ; add to current magic
CMP.b #$80 : !BLT +++ : LDA.b #$80 : +++ CMP.b #$80 : !BLT +++ : LDA.b #$80 : +++
STA !BUSY_MAGIC STA !BUSY_MAGIC
++ ++
LDA $7EF36E : CMP.l !BUSY_MAGIC : !BLT ++ LDA $7EF36E : CMP.l !BUSY_MAGIC : !BLT ++
LDA.b #$00 : STA !BUSY_MAGIC LDA.b #$00 : STA !BUSY_MAGIC
SEC SEC
@@ -60,8 +75,8 @@ RefillMagic:
LDA.b #$01 : STA $7EF373 ; refill some magic LDA.b #$01 : STA $7EF373 ; refill some magic
CLC CLC
RTL RTL
+ .done
SEP #$30 SEP #$30
; Check if Link's magic meter is full ; Check if Link's magic meter is full
LDA $7EF36E : CMP.b #$80 LDA $7EF36E : CMP.b #$80
@@ -74,4 +89,4 @@ RefillMagic:
; Set the carry, signifying we're done filling it. ; Set the carry, signifying we're done filling it.
SEP #$31 SEP #$31
RTL RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------