alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #190 from cassidoxa/keys_hud

Browse Source 
Fix file select HUD I broke
This commit is contained in:
Lexi Rose
2023-03-13 20:49:11 -05:00
committed by GitHub
parent 5a0990638c 5ef08d934c
commit c7c5ac23a8
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
fileselect.asm
View File

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

2
inventory.asm
View File

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

2
sram.asm
View File

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