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

fix: skip map check only when maps aren't shuffled

Browse Source
This commit is contained in:
aerinon
2025-11-20 10:04:53 -07:00
parent 70a23191ba
commit 5936b08497
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
doorrando/hudadditions.asm
View File

@@ -71,6 +71,9 @@ DRHUD_DrawCurrentDungeonIndicator: ; mX
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.l FreeItemText : BIT.w #$0040 : BEQ .skip_map_check
LDA.w MapField : AND.l DungeonMask, X : BEQ DRHUD_Finished
.skip_map_check
TXA : LSR : BNE .dungeon_id TXA : LSR : BNE .dungeon_id
INC INC
.dungeon_id .dungeon_id
@@ -143,15 +146,19 @@ 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
plx : sep #$30 : lda.l ChestKeys, x : sta.b Scrap02 LDA.l FreeItemText : BIT.w #$0040 : BEQ .skip_map_check
lda.l GenericKeys : bne +++ LDA.l MapField : AND.l DungeonMask, x : BEQ .key_info_done ; must have map, if shuffled
lda.b Scrap02 : !SUB.l DungeonCollectedKeys, x : sta.b Scrap02 .skip_map_check
+++ lda.b Scrap02 plx : sep #$30 : lda.l ChestKeys, x : sta.b Scrap02
rep #$30 lda.l GenericKeys : bne +++
jsr ConvertToDisplay2 : sta.w $1644, y ; small key totals lda.b Scrap02 : !SUB.l DungeonCollectedKeys, x : sta.b Scrap02
bra .skipStack +++ lda.b Scrap02
+ plx rep #$30
.skipStack iny #2 jsr ConvertToDisplay2 : sta.w $1644, y ; small key totals
bra .skipStack
.key_info_done
plx
.skipStack iny #2
cpx.w #$000d : beq + cpx.w #$000d : beq +
lda.w #$24f5 : sta.w $1644, y lda.w #$24f5 : sta.w $1644, y
+ +