From b16f7b4994b598af942eaeec89a70491f6f8dc05 Mon Sep 17 00:00:00 2001 From: Bonta <40473493+Bonta0@users.noreply.github.com> Date: Sun, 20 Jun 2021 15:15:55 +0200 Subject: [PATCH] Stats: Fix bonk counter --- LTTP_RND_GeneralBugfixes.asm | 3 +++ stats.asm | 7 ++----- tables.asm | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/LTTP_RND_GeneralBugfixes.asm b/LTTP_RND_GeneralBugfixes.asm index ff6eac4..51e4c31 100644 --- a/LTTP_RND_GeneralBugfixes.asm +++ b/LTTP_RND_GeneralBugfixes.asm @@ -570,6 +570,9 @@ AddDashTremor: org $099D04 AddAncillaLong: +org $099D1A +Ancilla_CheckIfAlreadyExistsLong: + org $09AE64 Sprite_SetSpawnedCoords: diff --git a/stats.asm b/stats.asm index 0b0f433..ba0f786 100644 --- a/stats.asm +++ b/stats.asm @@ -142,17 +142,14 @@ !LOCK_STATS = "$7EF443" ;-------------------------------------------------------------------------------- !BONK_COUNTER = "$7EF420" -!BONK_REPEAT = "$7F503F" -!LOOP_FRAMES_LOW = "$7EF42E" StatBonkCounter: PHA + JSL Ancilla_CheckIfAlreadyExistsLong : BCS + LDA !LOCK_STATS : BNE + - LDA !LOOP_FRAMES_LOW : !SUB !BONK_REPEAT : CMP #30 : !BLT + - LDA !LOOP_FRAMES_LOW : STA !BONK_REPEAT LDA !BONK_COUNTER : INC CMP.b #100 : BEQ + ; decimal 100 STA !BONK_COUNTER - + + + PLA JSL.l AddDashTremor ; thing we wrote over RTL diff --git a/tables.asm b/tables.asm index 8095852..9192213 100644 --- a/tables.asm +++ b/tables.asm @@ -1471,7 +1471,7 @@ dw #9999 ; Rupee Limit ; $7F503C - Stats Rupee Total ; $7F503D - Stats Rupee Total ; $7F503E - Stats Item Total -; $7F503F - Bonk Repeat +; $7F503F - Unused ; $7F5040 - Free Item Dialog Temporary ; $7F5041 - Epilepsy Safety Timer ; $7F5042 - Tile Upload Offset Override (Low)