Merge remote-tracking branch 'baserom/master' into MergeDecompression

# Conflicts:
#	npcitems.asm
This commit is contained in:
aerinon
2023-09-09 13:13:18 -06:00
4 changed files with 14 additions and 7 deletions

View File

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