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

Merge branch 'main' into kara

Browse Source
This commit is contained in:
karafruit
2023-09-09 11:06:13 -05:00
parent 468d1e3ec4 fcbde59a1e
commit 13e558b8eb
16 changed files with 170 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
newhud.asm
View File

@@ -72,7 +72,7 @@ NewHUD_DrawArrows:
;================================================================================
NewHUD_DrawGoal:
REP #$20
LDA.w UpdateHUD : BEQ .no_goal
LDA.w UpdateHUDFlag : BEQ .no_goal
LDA.l GoalItemRequirement : BEQ .no_goal
LDA.l GoalItemIcon : STA.w HUDGoalIndicator
@@ -129,7 +129,7 @@ NewHUD_DrawKeys:
;================================================================================
NewHUD_DrawDungeonCounters:
LDA.w UpdateHUD : BEQ NewHUD_DrawPrizeIcon
LDA.w UpdateHUDFlag : BEQ NewHUD_DrawPrizeIcon
LDA.l CompassMode : ORA.l MapHUDMode : BIT.b #$03 : BEQ NewHUD_DrawPrizeIcon
LDX.b IndoorsFlag : BNE +
JMP.w NewHUD_DrawMagicMeter
@@ -154,7 +154,7 @@ NewHUD_DrawPrizeIcon:
LDA.b GameMode
CMP.b #$12 : BEQ .no_prize
CMP.b #$0E : BEQ +
LDA.w UpdateHUD : BEQ NewHUD_DrawItemCounter
LDA.w UpdateHUDFlag : BEQ NewHUD_DrawItemCounter
+
LDA.w DungeonID
CMP.b #$1A : BCS .no_prize
@@ -204,7 +204,7 @@ NewHUD_DrawPrizeIcon:
;================================================================================
NewHUD_DrawItemCounter:
REP #$20
LDA.w UpdateHUD : BEQ NewHUD_DrawMagicMeter
LDA.w UpdateHUDFlag : BEQ NewHUD_DrawMagicMeter
LDA.l ItemCounterHUD : AND.w #$00FF : BEQ NewHUD_DrawMagicMeter
LDA.w #!SlashTile : STA.w HUDGoalIndicator+$08
LDA.l TotalItemCount : CMP.w #1000 : BCS .item_four_digits
@@ -270,7 +270,7 @@ NewHUD_DrawMagicMeter:
;================================================================================
NewHUD_DoneDrawing:
STZ.w UpdateHUD
STZ.w UpdateHUDFlag
PLB
RTL