Merge pull request #191 from cassidoxa/keys_hud

Properly mask HUD item flags
This commit is contained in:
Lexi Rose
2023-03-15 11:50:57 -05:00
committed by GitHub
2 changed files with 3 additions and 3 deletions

View File

@@ -13,7 +13,7 @@ RTL
DrawCompassCounts:
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
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
@@ -40,7 +40,7 @@ RTS
DrawMapCounts:
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
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

View File

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