Merge branch 'main' into kara

compasses.asm

@@ -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

fileselect.asm

@@ -234,7 +234,7 @@ DrawPlayerFileShared:
 	; %fs_drawItemBasic(EquipmentSRAM+$03,3,18,FileSelectItems_bombs)
 
 	; Powder
-	LDA.l InventoryTrackingSRAM : AND.w #$1000 : BEQ +
+	LDA.l InventoryTrackingSRAM : AND.w #$0010 : BEQ +
 		%fs_drawItem(3,20,FileSelectItems_powder)
 		BRA ++
 	+
@@ -242,7 +242,7 @@ DrawPlayerFileShared:
 	++
 
 	; Mushroom
-	LDA.l InventoryTrackingSRAM : AND.w #$2800 : BEQ +
+	LDA.l InventoryTrackingSRAM : AND.w #$0028 : BEQ +
 		%fs_drawItem(3,18,FileSelectItems_mushroom)
 		BRA ++
 	+
@@ -250,7 +250,7 @@ DrawPlayerFileShared:
 	++
 
 	; Flute
-	LDA.l InventoryTrackingSRAM : AND.w #$0300 : BEQ +
+	LDA.l InventoryTrackingSRAM : AND.w #$0003 : BEQ +
 		%fs_drawItem(7,16,FileSelectItems_flute)
 		BRA ++
 	+
@@ -258,7 +258,7 @@ DrawPlayerFileShared:
 	++
 
 	; Shovel
-	LDA.l InventoryTrackingSRAM : AND.w #$0400 : BEQ +
+	LDA.l InventoryTrackingSRAM : AND.w #$0004 : BEQ +
 		%fs_drawItem(9,12,FileSelectItems_shovel)
 		BRA ++
 	+

inventory.asm

@@ -2,7 +2,7 @@
 ; Inventory Updates
 ;================================================================================
 ; InventoryTracking
-; brmpnskf ------oq
+; ------oq brmpnskf
 ; b = blue boomerang   | -
 ; r = red boomerang    | -
 ; m = mushroom current | -

sram.asm

@@ -172,7 +172,7 @@ CurrentGenericKeys: skip 1      ; Generic small keys
 ;================================================================================
 ; Tracking & Indicators ($7EF38C - $7EF3F0)
 ;--------------------------------------------------------------------------------
-InventoryTracking: skip 2       ; b r m p n s k f  - - - - - - o q (bitfield)
+InventoryTracking: skip 2       ; - - - - - - o q  b r m p n s k f (bitfield)
                                 ; b = Blue Boomerang   | r = Red Boomerang  | m = Mushroom Current
                                 ; p = Magic Powder     | n = Mushroom Past  | s = Shovel
                                 ; k = Inactive Flute   | f = Active Flute   | o = Any bomb acquired

tables.asm

@@ -146,7 +146,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: