From cc12372627f6b8684edc9acb1f86bf990c1c508d Mon Sep 17 00:00:00 2001 From: Bonta <40473493+Bonta0@users.noreply.github.com> Date: Tue, 22 Jun 2021 02:31:52 +0200 Subject: [PATCH 1/2] Stats: Track chest turns --- LTTP_RND_GeneralBugfixes.asm | 2 +- events.asm | 5 +++++ stats.asm | 13 ++++++++++++- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/LTTP_RND_GeneralBugfixes.asm b/LTTP_RND_GeneralBugfixes.asm index ff6eac4..333ac6a 100644 --- a/LTTP_RND_GeneralBugfixes.asm +++ b/LTTP_RND_GeneralBugfixes.asm @@ -55,7 +55,7 @@ db #$20, #$19, #$08, #$31 ; year/month/day !SRAM_SINK = "$7EF41E" ; <- change this (conflicts with Programmable item 3) ;$7EF418 - Goal Item Counter ;$7EF419 - Service Sequence -;$7EF420 - $7EF466 - Stat Tracking Bank 1 (overlaps with RNG Item Flags) +;$7EF420 - $7EF468 - Stat Tracking Bank 1 (overlaps with RNG Item Flags) ;$7EF450 - $7EF45F - RNG Item (Single) Flags ;$7EF4A0 - $7EF4A7 - Service Request Block !FRESH_FILE_MARKER = "$7EF4F0" ; zero if fresh file diff --git a/events.asm b/events.asm index bf17db1..d4849fc 100644 --- a/events.asm +++ b/events.asm @@ -234,6 +234,11 @@ PostItemAnimation: LDA.b #$00 : STA $7F509F + + LDA.w $02E9 : CMP.b #$01 : BNE + + LDA.b $2F : BEQ + + JSL.l IncrementChestTurnCounter + + + STZ $02E9 : LDA $0C5E, X ; thing we wrote over to get here RTL ;-------------------------------------------------------------------------------- diff --git a/stats.asm b/stats.asm index 0b0f433..4a4fdd3 100644 --- a/stats.asm +++ b/stats.asm @@ -1,7 +1,7 @@ ;================================================================================ ; Stat Tracking ;================================================================================ -; $7EF420 - $7EF466 - Stat Tracking +; $7EF420 - $7EF468 - Stat Tracking ;-------------------------------------------------------------------------------- ; $7EF420 - bonk counter ;-------------------------------------------------------------------------------- @@ -137,6 +137,8 @@ ;-------------------------------------------------------------------------------- ; $7EF466w[2] - mirror timestamp (high) ;-------------------------------------------------------------------------------- +; $7EF468 - chest turn counter +;-------------------------------------------------------------------------------- ;-------------------------------------------------------------------------------- !LOCK_STATS = "$7EF443" @@ -324,6 +326,15 @@ IncrementFairyRevivalCounter: PLA RTL ;-------------------------------------------------------------------------------- +!CHESTTURN_COUNTER = "$7EF468" +IncrementChestTurnCounter: + PHA + LDA !LOCK_STATS : BNE + + LDA !CHESTTURN_COUNTER : INC : STA !CHESTTURN_COUNTER + + + PLA +RTL +;-------------------------------------------------------------------------------- !CHEST_COUNTER = "$7EF442" IncrementChestCounter: LDA.b #$01 : STA $02E9 ; thing we wrote over From 1531f7a8e24ad395ad04348a8736ebb63df4d8a8 Mon Sep 17 00:00:00 2001 From: Bonta <40473493+Bonta0@users.noreply.github.com> Date: Sun, 20 Jun 2021 23:03:55 +0200 Subject: [PATCH 2/2] Credits: Display chest turns --- stats/creditsnew.asm | 21 ++++++++++++--------- stats/statConfig.asm | 3 ++- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/stats/creditsnew.asm b/stats/creditsnew.asm index 228dae3..b99402a 100644 --- a/stats/creditsnew.asm +++ b/stats/creditsnew.asm @@ -642,6 +642,10 @@ endif %blankline() +%bigcreditsleft("CHEST TURNS") + +%blankline() + %bigcreditsleft("BONKS") %blankline() @@ -682,9 +686,6 @@ endif %blankline() -%emptyline() -%emptyline() -%emptyline() %emptyline() %emptyline() %bigcreditsleft("COLLECTION RATE /216") @@ -724,18 +725,20 @@ endif !GOLD_SWORD_Y = 339 !GT_BIG_KEY_X = 23 !GT_BIG_KEY_Y = 346 +!CHEST_TURNS_X = 26 +!CHEST_TURNS_Y = 349 !BONKS_X = 26 -!BONKS_Y = 349 +!BONKS_Y = 352 !SAVE_AND_QUITS_X = 26 -!SAVE_AND_QUITS_Y = 352 +!SAVE_AND_QUITS_Y = 355 !DEATHS_X = 26 -!DEATHS_Y = 355 +!DEATHS_Y = 358 !FAERIE_REVIVALS_X = 26 -!FAERIE_REVIVALS_Y = 358 +!FAERIE_REVIVALS_Y = 361 !TOTAL_MENU_TIME_X = 19 -!TOTAL_MENU_TIME_Y = 361 +!TOTAL_MENU_TIME_Y = 364 !TOTAL_LAG_TIME_X = 19 -!TOTAL_LAG_TIME_Y = 364 +!TOTAL_LAG_TIME_Y = 367 !COLLECTION_RATE_X = 22 !COLLECTION_RATE_Y = 380 !TOTAL_TIME_X = 19 diff --git a/stats/statConfig.asm b/stats/statConfig.asm index c2602ae..8fa3194 100755 --- a/stats/statConfig.asm +++ b/stats/statConfig.asm @@ -10,6 +10,7 @@ %AddStat($7EF426, 0, 4, 04, 2, !TEMPERED_SWORD_X, !TEMPERED_SWORD_Y) %AddStat($7EF426, 0, 0, 04, 2, !GOLD_SWORD_X, !GOLD_SWORD_Y) %AddStat($7EF42A, 0, 0, 05, 2, !GT_BIG_KEY_X, !GT_BIG_KEY_Y) +%AddStat($7EF468, 0, 0, 08, 3, !CHEST_TURNS_X, !CHEST_TURNS_Y) %AddStat($7EF420, 0, 0, 08, 3, !BONKS_X, !BONKS_Y) %AddStat($7EF42D, 0, 0, 08, 2, !SAVE_AND_QUITS_X, !SAVE_AND_QUITS_Y) %AddStat($7EF449, 0, 0, 08, 2, !DEATHS_X, !DEATHS_Y) @@ -17,4 +18,4 @@ %AddStat($7EF444, 1, 8, 32, 4, !TOTAL_MENU_TIME_X, !TOTAL_MENU_TIME_Y) %AddStat($7F5038, 1, 0, 32, 4, !TOTAL_LAG_TIME_X, !TOTAL_LAG_TIME_Y) %AddStat($7EF423, 0, 0, 08, 3, !COLLECTION_RATE_X, !COLLECTION_RATE_Y) -%AddStat($7EF43E, 1, 0, 32, 4, !TOTAL_TIME_X, !TOTAL_TIME_Y) \ No newline at end of file +%AddStat($7EF43E, 1, 0, 32, 4, !TOTAL_TIME_X, !TOTAL_TIME_Y)