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

Merge remote-tracking branch 'baserom/master' into MergeDecompression

Browse Source 
# Conflicts:
#	inventory.asm
#	newhud.asm
This commit is contained in:
aerinon
2023-09-08 13:49:16 -06:00
parent e772b4a931 bc3dd5c186
commit 2561737236
14 changed files with 29 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
newhud.asm
View File

@@ -65,7 +65,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
@@ -126,7 +126,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
@@ -151,7 +151,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
@@ -201,7 +201,7 @@ NewHUD_DrawPrizeIcon:
;================================================================================
NewHUD_DrawItemCounter:
REP #$20
LDA.w UpdateHUD : BNE .continue
LDA.w UpdateHUDFlag : BNE .continue
.early_exit
JMP NewHUD_DrawMagicMeter
.continue
@@ -279,7 +279,7 @@ NewHUD_DrawMagicMeter:
;================================================================================
NewHUD_DoneDrawing:
STZ.w UpdateHUD
STZ.w UpdateHUDFlag
PLB
RTL