Merge remote-tracking branch 'baserom/master' into MergeDecompression
# Conflicts: # npcitems.asm
This commit is contained in:
2
sram.asm
2
sram.asm
@@ -179,7 +179,7 @@ InventoryTracking: skip 2 ; - - - - - - o q b r m p n s k f (bitfield)
|
||||
; p = Magic Powder | n = Mushroom Past | s = Shovel
|
||||
; k = Inactive Flute | f = Active Flute | o = Any bomb acquired
|
||||
; q = Quickswap locked
|
||||
BowTracking: skip 2 ; b s p f - - - - - - - - - - - - (bitfield)
|
||||
BowTracking: skip 2 ; - - - - - - - - b s p f - - - - (bitfield)
|
||||
; b = Any Bow | s = Silver Arrows Upgrade | p = Second Progressive Bow
|
||||
; f = First progressive bow
|
||||
; The front end writes two distinct progressive bow items. p
|
||||
|
||||
Reference in New Issue
Block a user