From be0389ffbb369116898a04cc5a6d66855ad880d8 Mon Sep 17 00:00:00 2001 From: spannerisms <32842036+spannerisms@users.noreply.github.com> Date: Thu, 24 Jun 2021 08:36:04 -0400 Subject: [PATCH] stats --- hooks.asm | 8 ++++++++ stats.asm | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+) diff --git a/hooks.asm b/hooks.asm index 19e5532..f057e2d 100755 --- a/hooks.asm +++ b/hooks.asm @@ -2646,3 +2646,11 @@ JSL FastCreditsCutsceneTimer org $0EE773 JSL FastTextScroll : NOP + +;================================================================================ +org $01FFEE : JSL IncrementDamageTakenCounter_Eight ; overworld pit +org $079506 : JSL IncrementDamageTakenCounter_Eight ; underworld pit + +org $0780C6 : JSL IncrementDamageTakenCounter_Arb + +org $07B0B1 : JSL IncrementMagicUseCounter \ No newline at end of file diff --git a/stats.asm b/stats.asm index 0b0f433..637dfe2 100644 --- a/stats.asm +++ b/stats.asm @@ -360,6 +360,45 @@ IncrementBigChestCounter: + PLA RTL +;-------------------------------------------------------------------------------- +IncrementDamageTakenCounter_Eight: + STA.l $7EF36D + PHA : PHP + LDA !LOCK_STATS : BNE + + REP #$21 + LDA.l !DAMAGE_COUNTER + ADC.w #$0008 + STA.l !DAMAGECOUNTER ++ PLP + PLA +RTL + +IncrementDamageTakenCounter_Arb: + PHP + LDA !LOCK_STATS : BNE + + REP #$21 + LDA.b $00 + AND.b #$00FF + ADC.l !DAMAGE_COUNTER + STA.l !DAMAGE_COUNTER ++ PLP + + LDA.l $7EF36D +RTL + +IncrementMagicUseCounter: + STA.l $7EF36E + PHA : PHP + LDA !LOCK_STATS : BNE + + REP #$21 + LDA.b $00 + AND.b #$00FF + ADC.l !MAGIC_COUNTER + STA.l !MAGIC_COUNTER ++ PLP : PLA + +RTL + ;-------------------------------------------------------------------------------- !OW_MIRROR_COUNTER = "$7EF43A" IncrementOWMirror: