Add toggle of bugnet-on-B

This commit is contained in:
2023-09-01 16:55:45 -05:00
parent 7a56ce4cb7
commit a587bf29ae
3 changed files with 12 additions and 4 deletions

View File

@@ -84,6 +84,11 @@ RTL
STA.l FluteEquipment ; store set item
LDA.b #$20 : STA.w SFX3 ; menu select sound
BRA .captured
+ CMP.b #$0E : BNE + ; bugnet
LDA.l SpecialWeapons : CMP.b #$08 : BNE .error
LDA.l InventoryTracking+1 : EOR.b #$80 : STA.l InventoryTracking+1
LDA.b #$20 : STA.w SFX3 ; menu select sound
BRA .captured
+
CMP.b #$10 : BNE .error : JSL.l ProcessBottleMenu : BRA .captured : +
CLC
@@ -392,6 +397,8 @@ AddYMarker:
LDA.l InventoryTracking : BIT.w #$04 : BEQ .drawNormal ; make sure we have shovel
AND.w #$03 : BNE .drawYBubble ; make sure we have one of the flutes
BRA .drawNormal
+ CMP.w #$000E : BNE + ; bugnet
LDA.l SpecialWeapons : AND.w #$00FF : CMP.w #$0008 : BEQ .drawYBubble : BRA .drawNormal
+ CMP.w #$10 : BEQ .drawJarMarker
.drawNormal

View File

@@ -466,7 +466,7 @@ CheckDetonateBomb:
.next_ancilla
DEX
BPL .check_ancilla
BRA .done
JMP .done
.not_bomb_mode
LDA.l SpecialWeapons : CMP.b #$06 : BEQ .release_bee
CMP.b #$07 : BEQ .hammer
@@ -480,6 +480,7 @@ CheckDetonateBomb:
RTL
.net
LDA.l BugNetEquipment : BEQ .done
LDA.l InventoryTracking+1 : BIT.b #$80 : BNE .done
LDA.b $3A : ORA.b #$40 : STA.b $3A
LDA.b #$07 : STA.w $0304
JSL Link_UseBugNetLong

View File

@@ -172,12 +172,12 @@ CurrentGenericKeys: skip 1 ; Generic small keys
;================================================================================
; Tracking & Indicators ($7EF38C - $7EF3F0)
;--------------------------------------------------------------------------------
InventoryTracking: skip 2 ; - - - - - - o q b r m p n s k f (bitfield)
InventoryTracking: skip 2 ; 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
; q = Quickswap locked
BowTracking: skip 1 ; b s p f - - - - - - - - - - - - (bitfield)
; q = Quickswap locked | 2 = Item on B
BowTracking: skip 1 ; 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