alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

damage/magic stats

Browse Source
This commit is contained in:
spannerisms
2021-07-03 09:25:33 -04:00
parent bdd16bc20f
commit 00c59c791f
5 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
LTTP_RND_GeneralBugfixes.asm
View File

@@ -55,7 +55,7 @@ db #$20, #$19, #$08, #$31 ; year/month/day
!SRAM_SINK = "$7EF41E" ; <- change this (conflicts with Programmable item 3) !SRAM_SINK = "$7EF41E" ; <- change this (conflicts with Programmable item 3)
;$7EF418 - Goal Item Counter ;$7EF418 - Goal Item Counter
;$7EF419 - Service Sequence ;$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 ;$7EF450 - $7EF45F - RNG Item (Single) Flags
;$7EF4A0 - $7EF4A7 - Service Request Block ;$7EF4A0 - $7EF4A7 - Service Request Block
!FRESH_FILE_MARKER = "$7EF4F0" ; zero if fresh file !FRESH_FILE_MARKER = "$7EF4F0" ; zero if fresh file

16
stats.asm
View File

@@ -369,8 +369,8 @@ IncrementBigChestCounter:
PLA PLA
RTL RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
!DAMAGE_COUNTER = "$FFFFFF" !DAMAGE_COUNTER = $7EF46A
!MAGIC_COUNTER = "$FFFFFF" !MAGIC_COUNTER = $7EF46C
IncrementDamageTakenCounter_Eight: IncrementDamageTakenCounter_Eight:
STA.l $7EF36D STA.l $7EF36D
PHA : PHP PHA : PHP
@@ -378,7 +378,9 @@ IncrementDamageTakenCounter_Eight:
REP #$21 REP #$21
LDA.l !DAMAGE_COUNTER LDA.l !DAMAGE_COUNTER
ADC.w #$0008 ADC.w #$0008
STA.l !DAMAGE_COUNTER BCC ++
LDA.w #$FFFF
++ STA.l !DAMAGE_COUNTER
+ PLP + PLP
PLA PLA
RTL RTL
@@ -390,7 +392,9 @@ IncrementDamageTakenCounter_Arb:
LDA.b $00 LDA.b $00
AND.w #$00FF AND.w #$00FF
ADC.l !DAMAGE_COUNTER ADC.l !DAMAGE_COUNTER
STA.l !DAMAGE_COUNTER BCC ++
LDA.w #$FFFF
++ STA.l !DAMAGE_COUNTER
+ PLP + PLP
LDA.l $7EF36D LDA.l $7EF36D
@@ -404,7 +408,9 @@ IncrementMagicUseCounter:
LDA.b $00 LDA.b $00
AND.w #$00FF AND.w #$00FF
ADC.l !MAGIC_COUNTER ADC.l !MAGIC_COUNTER
STA.l !MAGIC_COUNTER BCC ++
LDA.w #$FFFF
++ STA.l !MAGIC_COUNTER
+ PLP : PLA + PLP : PLA
RTL RTL

12
stats/creditsnew.asm
View File

@@ -639,11 +639,11 @@ endif
%blankline() %blankline()
%blankline() %blankline()
%bigcreditsleft("GT BIG KEY /22") %bigcreditsleft("DAMAGE TAKEN")
%blankline() %blankline()
%bigcreditsleft("CHEST TURNS") %bigcreditsleft("MAGIC USED")
%blankline() %blankline()
@@ -724,10 +724,10 @@ endif
!TEMPERED_SWORD_Y = 336 !TEMPERED_SWORD_Y = 336
!GOLD_SWORD_X = 23 !GOLD_SWORD_X = 23
!GOLD_SWORD_Y = 339 !GOLD_SWORD_Y = 339
!GT_BIG_KEY_X = 23 !DAMAGETAKEN_X = 26
!GT_BIG_KEY_Y = 346 !DAMAGETAKEN_Y = 346
!CHEST_TURNS_X = 26 !MAGICUSED_X = 26
!CHEST_TURNS_Y = 349 !MAGICUSED_Y = 349
!BONKS_X = 26 !BONKS_X = 26
!BONKS_Y = 352 !BONKS_Y = 352
!SAVE_AND_QUITS_X = 26 !SAVE_AND_QUITS_X = 26

1
stats/main.asm
View File

@@ -60,6 +60,7 @@ ValueCaps:
dw 99 dw 99
dw 999 dw 999
dw 9999 dw 9999
dw 9999 ; TODO - 5 digits need to be fixed at a later date
BitMasks: BitMasks:
dw $FFFF dw $FFFF

4
stats/statConfig.asm
View File

@@ -9,8 +9,8 @@
%AddStat($7EF425, 0, 0, 04, 2, !MASTER_SWORD_X, !MASTER_SWORD_Y) %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, 4, 04, 2, !TEMPERED_SWORD_X, !TEMPERED_SWORD_Y)
%AddStat($7EF426, 0, 0, 04, 2, !GOLD_SWORD_X, !GOLD_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($7EF46A, 0, 0, 16, 5, !DAMAGETAKEN_X, !DAMAGETAKEN_Y)
%AddStat($7EF468, 0, 0, 08, 3, !CHEST_TURNS_X, !CHEST_TURNS_Y) %AddStat($7EF46C, 0, 0, 16, 5, !MAGICUSED_X, !MAGICUSED_Y)
%AddStat($7EF420, 0, 0, 08, 3, !BONKS_X, !BONKS_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($7EF42D, 0, 0, 08, 2, !SAVE_AND_QUITS_X, !SAVE_AND_QUITS_Y)
%AddStat($7EF449, 0, 0, 08, 2, !DEATHS_X, !DEATHS_Y) %AddStat($7EF449, 0, 0, 08, 2, !DEATHS_X, !DEATHS_Y)