diff --git a/LTTP_RND_GeneralBugfixes.asm b/LTTP_RND_GeneralBugfixes.asm index 7eeeb24..d2b7ca5 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 - $7EF468 - Stat Tracking Bank 1 (overlaps with RNG Item Flags) +;$7EF420 - $7EF46D - 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/stats.asm b/stats.asm index 4bd3699..f76b0e1 100644 --- a/stats.asm +++ b/stats.asm @@ -369,8 +369,8 @@ IncrementBigChestCounter: PLA RTL ;-------------------------------------------------------------------------------- -!DAMAGE_COUNTER = "$FFFFFF" -!MAGIC_COUNTER = "$FFFFFF" +!DAMAGE_COUNTER = $7EF46A +!MAGIC_COUNTER = $7EF46C IncrementDamageTakenCounter_Eight: STA.l $7EF36D PHA : PHP @@ -378,7 +378,9 @@ IncrementDamageTakenCounter_Eight: REP #$21 LDA.l !DAMAGE_COUNTER ADC.w #$0008 - STA.l !DAMAGE_COUNTER + BCC ++ + LDA.w #$FFFF +++ STA.l !DAMAGE_COUNTER + PLP PLA RTL @@ -390,7 +392,9 @@ IncrementDamageTakenCounter_Arb: LDA.b $00 AND.w #$00FF ADC.l !DAMAGE_COUNTER - STA.l !DAMAGE_COUNTER + BCC ++ + LDA.w #$FFFF +++ STA.l !DAMAGE_COUNTER + PLP LDA.l $7EF36D @@ -404,7 +408,9 @@ IncrementMagicUseCounter: LDA.b $00 AND.w #$00FF ADC.l !MAGIC_COUNTER - STA.l !MAGIC_COUNTER + BCC ++ + LDA.w #$FFFF +++ STA.l !MAGIC_COUNTER + PLP : PLA RTL diff --git a/stats/creditsnew.asm b/stats/creditsnew.asm index a8e8ef0..dae6d8b 100644 --- a/stats/creditsnew.asm +++ b/stats/creditsnew.asm @@ -639,11 +639,11 @@ endif %blankline() %blankline() -%bigcreditsleft("GT BIG KEY /22") +%bigcreditsleft("DAMAGE TAKEN") %blankline() -%bigcreditsleft("CHEST TURNS") +%bigcreditsleft("MAGIC USED") %blankline() @@ -724,10 +724,10 @@ endif !TEMPERED_SWORD_Y = 336 !GOLD_SWORD_X = 23 !GOLD_SWORD_Y = 339 -!GT_BIG_KEY_X = 23 -!GT_BIG_KEY_Y = 346 -!CHEST_TURNS_X = 26 -!CHEST_TURNS_Y = 349 +!DAMAGETAKEN_X = 26 +!DAMAGETAKEN_Y = 346 +!MAGICUSED_X = 26 +!MAGICUSED_Y = 349 !BONKS_X = 26 !BONKS_Y = 352 !SAVE_AND_QUITS_X = 26 diff --git a/stats/main.asm b/stats/main.asm index 0a666ad..314de0e 100755 --- a/stats/main.asm +++ b/stats/main.asm @@ -60,6 +60,7 @@ ValueCaps: dw 99 dw 999 dw 9999 + dw 9999 ; TODO - 5 digits need to be fixed at a later date BitMasks: dw $FFFF diff --git a/stats/statConfig.asm b/stats/statConfig.asm index 8fa3194..d921b94 100755 --- a/stats/statConfig.asm +++ b/stats/statConfig.asm @@ -9,8 +9,8 @@ %AddStat($7EF425, 0, 0, 04, 2, !MASTER_SWORD_X, !MASTER_SWORD_Y) %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($7EF46A, 0, 0, 16, 5, !DAMAGETAKEN_X, !DAMAGETAKEN_Y) +%AddStat($7EF46C, 0, 0, 16, 5, !MAGICUSED_X, !MAGICUSED_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)