diff --git a/inventory.asm b/inventory.asm
index 565bbf3..1a9defd 100644
--- a/inventory.asm
+++ b/inventory.asm
@@ -52,7 +52,7 @@ RTL
 RTL
 	.b_pressed
 	JSR CanPressB : BCC .b_error
-	LDA.w ItemCursor : CMP.l ItemOnB : BNE .set_b
+	LDA.w $0202 : CMP.l ItemOnB : BNE .set_b
 	LDA.b #$00
 	.set_b
 	STA.l ItemOnB
@@ -132,10 +132,10 @@ CanPressB:
 	PHY : PHP : SEP #$30
 	LDA.l AllowedItemOnB : BEQ .no
 	CMP.b #$FF : BEQ .skip_allow_check
-	CMP.w ItemCursor : BNE .no
+	CMP.w $0202 : BNE .no
 	.skip_allow_check
 	PHX
-	LDA.w ItemCursor : TAX
+	LDA.w $0202 : TAX
 	LDA.l ValidItemOnB, X : BNE .plx_and_no
 	PLX
 	PLP : PLY
@@ -831,7 +831,7 @@ AddYMarker:
 
 	.drawYBubble
 	JSR CanPressB : BCC .drawY
-	LDA.w MenuBlink : AND.w #$0020 : BNE .drawBBubble
+	LDA.w $0207 : AND.w #$0020 : BNE .drawBBubble
 	.drawY
 	LDA.w #$3D4F
 	BRA .drawTile
diff --git a/special_weapons.asm b/special_weapons.asm
index d80f8b5..b9a24eb 100644
--- a/special_weapons.asm
+++ b/special_weapons.asm
@@ -595,14 +595,15 @@ RTS
 ;--------------------------------------------------------------------------------
 CheckBugNet:
 LDA.w $037A : AND.b #$10 : BEQ .done ; normal behavior if not bugnet
+PHP ; we want to preserve the carry bit
 LDA.l SpecialWeapons : CMP.b #$08 : BNE .return_10 ; normal behavior if not bugnet mode
 .bugnet_mode
 LDA.w $0E20, X : CMP.b #$E3 : BEQ .return_10 ; normal behavior if fairy
                  CMP.b #$79 : BEQ .return_10 ; normal behavior if bee
                  CMP.b #$B2 : BEQ .return_10 ; normal behavior if bee
-LDA.b #$00 : BRA .done
+PLP : LDA.b #$00 : RTL
 .return_10
-LDA.b #$10
+PLP : LDA.b #$10
 .done
 RTL
 ;--------------------------------------------------------------------------------