diff --git a/hardmode.asm b/hardmode.asm index 0bda634..1b7fe8b 100644 --- a/hardmode.asm +++ b/hardmode.asm @@ -33,7 +33,7 @@ CalculateByrnaUsage: PLX ++ LDA $7EF36E ; thing we wrote over -RTL + JML IncrementMagicUseCounterByrna ;-------------------------------------------------------------------------------- CalculateCapeUsage: LDA $1B : BEQ ++ @@ -51,8 +51,7 @@ CalculateCapeUsage: LDA.l HardModeExclusionCapeUsage, X : STA $4C ; set cape decrement timer PLX ++ - LDA $7EF36E ; thing we wrote over -RTL + JML IncrementMagicUseCounterOne ;-------------------------------------------------------------------------------- ActivateInvulnerabilityOrDont: LDA $1B : BEQ .nowhere_special diff --git a/stats.asm b/stats.asm index f76b0e1..4263c5d 100644 --- a/stats.asm +++ b/stats.asm @@ -383,7 +383,7 @@ IncrementDamageTakenCounter_Eight: ++ STA.l !DAMAGE_COUNTER + PLP PLA -RTL + RTL IncrementDamageTakenCounter_Arb: PHP @@ -398,10 +398,12 @@ IncrementDamageTakenCounter_Arb: + PLP LDA.l $7EF36D -RTL + RTL IncrementMagicUseCounter: STA.l $7EF36E + +IncrementMagicUseCounterByrna: PHA : PHP LDA !LOCK_STATS : BNE + REP #$21 @@ -413,7 +415,18 @@ IncrementMagicUseCounter: ++ STA.l !MAGIC_COUNTER + PLP : PLA -RTL + RTL + +IncrementMagicUseCounterOne: + LDA !LOCK_STATS : BNE + + REP #$20 + LDA.l !MAGIC_COUNTER + INC + BEQ ++ + STA.l !MAGIC_COUNTER +++ SEP #$20 ++ LDA.l $7EF36E + RTL ;-------------------------------------------------------------------------------- !OW_MIRROR_COUNTER = "$7EF43A"