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

Merge pull request #191 from cassidoxa/keys_hud

Browse Source 
Properly mask HUD item flags
This commit is contained in:
Lexi Rose
2023-03-15 11:50:57 -05:00
committed by GitHub
parent c7c5ac23a8 0505cc28e1
commit 23ecf41b33
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
compasses.asm
View File

@@ -13,7 +13,7 @@ RTL
DrawCompassCounts: DrawCompassCounts:
PHX PHX
LDA.l CompassMode : BEQ .done LDA.l CompassMode : AND.w #$00FF : BEQ .done
BIT.w #$0002 : BNE + ; if CompassMode==2, we don't check for the compass BIT.w #$0002 : BNE + ; if CompassMode==2, we don't check for the compass
LDA.l CompassField : AND.l DungeonItemMasks, X ; Load compass values to A, mask with dungeon item masks LDA.l CompassField : AND.l DungeonItemMasks, X ; Load compass values to A, mask with dungeon item masks
BEQ .done ; skip if we don't have compass BEQ .done ; skip if we don't have compass
@@ -40,7 +40,7 @@ RTS
DrawMapCounts: DrawMapCounts:
PHX PHX
LDA.l MapHUDMode : BEQ .done LDA.l MapHUDMode : AND.w #$00FF : BEQ .done
BIT.w #$0002 : BNE + ; if MapHUDMode==2, we don't check for map BIT.w #$0002 : BNE + ; if MapHUDMode==2, we don't check for map
LDA.l MapField : AND.l DungeonItemMasks, X ; Load map values to A, mask with dungeon item masks LDA.l MapField : AND.l DungeonItemMasks, X ; Load map values to A, mask with dungeon item masks
BEQ .done ; skip if we don't have map BEQ .done ; skip if we don't have map

2
tables.asm
View File

@@ -120,7 +120,7 @@ db #$01 ; #$00 = Off - #$01 = On (default)
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
; 0x180039 (Unused) ; 0x180039 (Unused)
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
org $30803A ; PC 0x18003B - PC 0x18003C org $30803A ; PC 0x18003A-0x18003C
MapHUDMode: MapHUDMode:
db #$00 ; #$00 = Off (default) - #$01 = Display Dungeon Count w/Map - #$02 = Display Dungeon Count Always db #$00 ; #$00 = Off (default) - #$01 = Display Dungeon Count w/Map - #$02 = Display Dungeon Count Always
MapMode: MapMode: