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

Fixed issue with drawing A items on HUD with DR menu

Browse Source
This commit is contained in:
codemann8
2024-08-16 21:41:43 -05:00
parent 016ccfd687
commit c7c97196fb
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doorrando/hudadditions.asm
View File

@@ -112,8 +112,7 @@ dw $0000, $0000, $0000, $0000, $000a, $000a, $000a, $0014, $000a, $0014, $0000,
DrHudDungeonItemsAdditions: DrHudDungeonItemsAdditions:
{ {
jsl DrawHUDDungeonItems jsl DrawHUDDungeonItems
lda.l DRMode : cmp.b #$02 : beq + : rtl lda.l DRMode : cmp.b #$02 : beq + : rtl : +
+
phx : phy : php phx : phy : php
rep #$30 rep #$30
@@ -170,7 +169,6 @@ DrHudDungeonItemsAdditions:
+ inx #2 : cpx.w #$001b : bcs ++ : JMP - + inx #2 : cpx.w #$001b : bcs ++ : JMP -
++ ++
lda.l HudFlag : and.w #$0020 : bne + : JMP ++ : + lda.l HudFlag : and.w #$0020 : bne + : JMP ++ : +
lda.l HUDDungeonItems : and.w #$000c : bne + : JMP ++ : +
; map symbols (do I want these) ; note compass symbol is 2c20 ; map symbols (do I want these) ; note compass symbol is 2c20
lda.w #$2821 : sta.w $1606 : sta.w $1610 : sta.w $161a : sta.w $1624 lda.w #$2821 : sta.w $1606 : sta.w $1610 : sta.w $161a : sta.w $1624
; blank out a couple thing from old hud ; blank out a couple thing from old hud

7
pendantcrystalhud.asm
View File

@@ -158,6 +158,7 @@ RTL
;$389 = Ganon's Tower ;$389 = Ganon's Tower
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
DrawBootsInMenuLocation: DrawBootsInMenuLocation:
LDA.l DRMode : AND.w #$00FF : CMP.w #$0002 : BEQ +
LDA.l HUDDungeonItems : BNE + LDA.l HUDDungeonItems : BNE +
LDA.w #$1608 : STA.b Scrap00 LDA.w #$1608 : STA.b Scrap00
RTL RTL
@@ -166,6 +167,7 @@ DrawBootsInMenuLocation:
RTL RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
DrawGlovesInMenuLocation: DrawGlovesInMenuLocation:
LDA.l DRMode : AND.w #$00FF : CMP.w #$0002 : BEQ +
LDA.l HUDDungeonItems : BNE + LDA.l HUDDungeonItems : BNE +
LDA.w #$1610 : STA.b Scrap00 LDA.w #$1610 : STA.b Scrap00
RTL RTL
@@ -174,6 +176,7 @@ DrawGlovesInMenuLocation:
RTL RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
DrawFlippersInMenuLocation: DrawFlippersInMenuLocation:
LDA.l DRMode : AND.w #$00FF : CMP.w #$0002 : BEQ +
LDA.l HUDDungeonItems : BNE + LDA.l HUDDungeonItems : BNE +
LDA.w #$1618 : STA.b Scrap00 LDA.w #$1618 : STA.b Scrap00
RTL RTL
@@ -182,6 +185,7 @@ DrawFlippersInMenuLocation:
RTL RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
DrawMoonPearlInMenuLocation: DrawMoonPearlInMenuLocation:
LDA.l DRMode : AND.w #$00FF : CMP.w #$0002 : BEQ +
LDA.l HUDDungeonItems : BNE + LDA.l HUDDungeonItems : BNE +
LDA.w #$1620 : STA.b Scrap00 LDA.w #$1620 : STA.b Scrap00
RTL RTL
@@ -190,8 +194,9 @@ DrawMoonPearlInMenuLocation:
RTL RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
DrawHUDDungeonItems: DrawHUDDungeonItems:
LDA.l DRMode : CMP.b #$02 : BEQ ++
LDA.l HUDDungeonItems : BEQ .return LDA.l HUDDungeonItems : BEQ .return
JMP .continue ++ JMP .continue
.return .return
RTL RTL