diff --git a/doorrando/hudadditions.asm b/doorrando/hudadditions.asm index 3c77ea6..f6bca98 100644 --- a/doorrando/hudadditions.asm +++ b/doorrando/hudadditions.asm @@ -112,8 +112,7 @@ dw $0000, $0000, $0000, $0000, $000a, $000a, $000a, $0014, $000a, $0014, $0000, DrHudDungeonItemsAdditions: { jsl DrawHUDDungeonItems - lda.l DRMode : cmp.b #$02 : beq + : rtl - + + lda.l DRMode : cmp.b #$02 : beq + : rtl : + phx : phy : php rep #$30 @@ -170,7 +169,6 @@ DrHudDungeonItemsAdditions: + inx #2 : cpx.w #$001b : bcs ++ : 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 lda.w #$2821 : sta.w $1606 : sta.w $1610 : sta.w $161a : sta.w $1624 ; blank out a couple thing from old hud diff --git a/pendantcrystalhud.asm b/pendantcrystalhud.asm index 12952c6..c6f14e2 100644 --- a/pendantcrystalhud.asm +++ b/pendantcrystalhud.asm @@ -158,6 +158,7 @@ RTL ;$389 = Ganon's Tower ;-------------------------------------------------------------------------------- DrawBootsInMenuLocation: + LDA.l DRMode : AND.w #$00FF : CMP.w #$0002 : BEQ + LDA.l HUDDungeonItems : BNE + LDA.w #$1608 : STA.b Scrap00 RTL @@ -166,6 +167,7 @@ DrawBootsInMenuLocation: RTL ;-------------------------------------------------------------------------------- DrawGlovesInMenuLocation: + LDA.l DRMode : AND.w #$00FF : CMP.w #$0002 : BEQ + LDA.l HUDDungeonItems : BNE + LDA.w #$1610 : STA.b Scrap00 RTL @@ -174,6 +176,7 @@ DrawGlovesInMenuLocation: RTL ;-------------------------------------------------------------------------------- DrawFlippersInMenuLocation: + LDA.l DRMode : AND.w #$00FF : CMP.w #$0002 : BEQ + LDA.l HUDDungeonItems : BNE + LDA.w #$1618 : STA.b Scrap00 RTL @@ -182,6 +185,7 @@ DrawFlippersInMenuLocation: RTL ;-------------------------------------------------------------------------------- DrawMoonPearlInMenuLocation: + LDA.l DRMode : AND.w #$00FF : CMP.w #$0002 : BEQ + LDA.l HUDDungeonItems : BNE + LDA.w #$1620 : STA.b Scrap00 RTL @@ -190,8 +194,9 @@ DrawMoonPearlInMenuLocation: RTL ;-------------------------------------------------------------------------------- DrawHUDDungeonItems: + LDA.l DRMode : CMP.b #$02 : BEQ ++ LDA.l HUDDungeonItems : BEQ .return - JMP .continue + ++ JMP .continue .return RTL