alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Pull Requests 1 Releases Activity

Merge pull request #9 from ardnaxelarak/DRMain

Browse Source 
Fix drawing C/P indicator and Stat Tracking
This commit is contained in:
aerinon
2021-07-09 10:38:20 -07:00
committed by GitHub
parent aee82fa319 0054be1e4b
commit 1c9936d231
3 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
newhud.asm
View File

@@ -145,9 +145,10 @@ SEP #$30
SEP #$20 SEP #$20
LDA.b $1B : BEQ .noprize LDA.b $1B : BEQ .noprize
LDX.w $040C
CPX #$1A : !BGE .noprize
LDX.w $040C : BMI .noprize CPX #$04 : !BLT .noprize
CPX #$08 : BEQ .noprize
REP #$20 REP #$20
@@ -156,9 +157,10 @@ SEP #$30
LDA.l $7EF368 LDA.l $7EF368
AND.l DungeonItemMasks,X AND.l DungeonItemMasks,X
BEQ .doneprize BEQ .noprize
.drawprize .drawprize
TXA : LSR : TAX
LDA.l CrystalPendantFlags_2, X LDA.l CrystalPendantFlags_2, X
AND.w #$0040 : BNE .is_crystal AND.w #$0040 : BNE .is_crystal

10
stats.asm
View File

@@ -1,7 +1,7 @@
;================================================================================ ;================================================================================
; Stat Tracking ; Stat Tracking
;================================================================================ ;================================================================================
; $7EF420 - $7EF468 - Stat Tracking ; $7EF420 - $7EF46D - Stat Tracking
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
; $7EF420 - bonk counter ; $7EF420 - bonk counter
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
@@ -108,7 +108,7 @@
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
; $7EF466w[2] - mirror timestamp (high) ; $7EF466w[2] - mirror timestamp (high)
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
; $7EF468 - chest turn counter ; $7EF468w[2] - locations before mirror
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
; $7EF46A mmkkkkkk ; $7EF46A mmkkkkkk
; m - mail counter ; m - mail counter
@@ -116,7 +116,9 @@
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
; $7EF46Bw[2] - Dungeon prizes collected by dungeon location. ; $7EF46Bw[2] - Dungeon prizes collected by dungeon location.
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
; $7EF46D - 7EF49F - Free space ; $7EF46D - chest turns counter
;--------------------------------------------------------------------------------
; $7EF46E - 7EF49F - Free space
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
; $7EF4A0 - 7EF4A7 - Service Request ; $7EF4A0 - 7EF4A7 - Service Request
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
@@ -318,7 +320,7 @@ IncrementFairyRevivalCounter:
PLA PLA
RTL RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
!CHESTTURN_COUNTER = "$7EF468" !CHESTTURN_COUNTER = "$7EF46D"
IncrementChestTurnCounter: IncrementChestTurnCounter:
PHA PHA
LDA !LOCK_STATS : BNE + LDA !LOCK_STATS : BNE +

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($7EF46A, 0, 0, 16, 5, !DAMAGETAKEN_X, !DAMAGETAKEN_Y) %AddStat($7EF4AA, 0, 0, 16, 5, !DAMAGETAKEN_X, !DAMAGETAKEN_Y)
%AddStat($7EF46C, 0, 0, 16, 5, !MAGICUSED_X, !MAGICUSED_Y) %AddStat($7EF4AC, 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)