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

feat: hud shows all keys, instead of chest keys. Dropped Map requirement for key info.

Browse Source
This commit is contained in:
aerinon
2025-11-18 15:19:28 -07:00
parent 08ecc9b673
commit fee689e583
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
doorrando/hudadditions.asm
View File

@@ -69,15 +69,14 @@ DRHUD_DrawCurrentDungeonIndicator: ; mX
STY.w HUDCurrentDungeonWorld STY.w HUDCurrentDungeonWorld
DRHUD_DrawKeyCounter: DRHUD_DrawKeyCounter:
LDA.l DRFlags : AND.b #$04 : BEQ DRHUD_Finished LDA.l DRFlags : AND.b #$04 : BEQ DRHUD_Finished
REP #$20 REP #$20
LDA.w MapField : AND.l DungeonMask, X : BEQ DRHUD_Finished
TXA : LSR : TAX TXA : LSR : TAX
LDA.l GenericKeys : AND.w #$00FF : BNE .total_only LDA.l GenericKeys : AND.w #$00FF : BNE .total_only
LDA.w DungeonCollectedKeys, X : JSR ConvertToDisplay : STA.w HUDKeysObtained LDA.w DungeonKeys, X : JSR ConvertToDisplay : STA.w HUDKeysObtained
LDA.w #!SlashTile : STA.w HUDKeysSlash LDA.w #!SlashTile : STA.w HUDKeysSlash
.total_only .total_only
LDA.l ChestKeys, x : JSR ConvertToDisplay : STA.w HUDKeysTotal LDA.l TotalKeys, x : JSR ConvertToDisplay : STA.w HUDKeysTotal
DRHUD_Finished: DRHUD_Finished:
PLB : RTL PLB : RTL
@@ -141,14 +140,13 @@ DrHudDungeonItemsAdditions:
jsr ConvertToDisplay2 : sta.w $1644, y jsr ConvertToDisplay2 : sta.w $1644, y
+ iny #2 : lda.w #$24f5 : sta.w $1644, y + iny #2 : lda.w #$24f5 : sta.w $1644, y
phx : ldx.b Scrap00 phx : ldx.b Scrap00
lda.l MapField : and.l DungeonMask, x : beq + ; must have map plx : sep #$30 : lda.l ChestKeys, x : sta.b Scrap02
plx : sep #$30 : lda.l ChestKeys, x : sta.b Scrap02 lda.l GenericKeys : bne +++
lda.l GenericKeys : bne +++ lda.b Scrap02 : !SUB.l DungeonCollectedKeys, x : sta.b Scrap02
lda.b Scrap02 : !SUB.l DungeonCollectedKeys, x : sta.b Scrap02 +++ lda.b Scrap02
+++ lda.b Scrap02 rep #$30
rep #$30 jsr ConvertToDisplay2 : sta.w $1644, y ; small key totals
jsr ConvertToDisplay2 : sta.w $1644, y ; small key totals bra .skipStack
bra .skipStack
+ plx + plx
.skipStack iny #2 .skipStack iny #2
cpx.w #$000d : beq + cpx.w #$000d : beq +