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

fairy revival counter

Browse Source
This commit is contained in:
Karkat
2018-01-06 22:48:26 -05:00
parent 7a77e900bf
commit f500950e51
2 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
hooks.asm
View File

@@ -106,6 +106,9 @@ JSL.l IncrementSmallKeys
org $00F945 ; <- 7945 - Bank00.asm : 8557 (JSL SavePalaceDeaths) org $00F945 ; <- 7945 - Bank00.asm : 8557 (JSL SavePalaceDeaths)
JSL.l StatTransitionCounter ; we're not bothering to restore the instruction we wrote over JSL.l StatTransitionCounter ; we're not bothering to restore the instruction we wrote over
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
org $09F443 ; <- 4F443 - module_death.asm : 257 (STA $7EF35C, X)
JSL.l IncrementFairyRevivalCounter
;--------------------------------------------------------------------------------
org $02B6F3 ; <- 136F3 - Bank02.asm : 8600 (LDA.b #$0F : STA $10) org $02B6F3 ; <- 136F3 - Bank02.asm : 8600 (LDA.b #$0F : STA $10)
JSL.l DungeonExitTransition JSL.l DungeonExitTransition
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------

24
stats.asm
View File

@@ -115,7 +115,7 @@
; s - swordless bosses ; s - swordless bosses
; c - capacity upgrades ; c - capacity upgrades
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
; $7EF453 - unused ; $7EF453 - fairy revival counter
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
; $7EF454w[2] - challenge timer (low) ; $7EF454w[2] - challenge timer (low)
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
@@ -224,6 +224,18 @@ IncrementSmallKeys:
PLX PLX
RTL RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
IncrementSmallKeysNoPrimary:
STA $7EF36F ; thing we wrote over, write small key count
PHX
LDA !LOCK_STATS : BNE +
JSL AddInventory_incrementKeyLong
+
JSL.l UpdateKeys
JSL.l HUD_RebuildLong
PLX
RTL
;--------------------------------------------------------------------------------
DecrementSmallKeys: DecrementSmallKeys:
STA $7EF36F ; thing we wrote over, write small key count STA $7EF36F ; thing we wrote over, write small key count
JSL.l UpdateKeys JSL.l UpdateKeys
@@ -248,6 +260,16 @@ IncrementDeathCounter:
PLA PLA
RTL RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
!FAIRY_COUNTER = "$7EF453"
IncrementFairyRevivalCounter:
STA $7EF35C, X ; thing we wrote over
PHA
LDA !LOCK_STATS : BNE +
LDA !FAIRY_COUNTER : INC : STA !FAIRY_COUNTER
+
PLA
RTL
;--------------------------------------------------------------------------------
!CHEST_COUNTER = "$7EF442" !CHEST_COUNTER = "$7EF442"
IncrementChestCounter: IncrementChestCounter:
LDA.b #$01 : STA $02E9 ; thing we wrote over LDA.b #$01 : STA $02E9 ; thing we wrote over