From 0b01f75f8057fb7bc7281276aade520ae545d0f6 Mon Sep 17 00:00:00 2001
From: Kara Alexandra <ardnaxelarak@gmail.com>
Date: Sun, 3 Sep 2023 18:22:25 -0500
Subject: [PATCH] Show B indicator in menu when can switch item to B button

---
 c2807_v4.bin  | Bin 2048 -> 2048 bytes
 c2807_v4.gfx  | Bin 1486 -> 1500 bytes
 inventory.asm |  59 ++++++++++++++++++++++++++++++++++++++++++--------
 item_on_b.asm |   4 ++--
 4 files changed, 52 insertions(+), 11 deletions(-)

diff --git a/c2807_v4.bin b/c2807_v4.bin
index 8bf96b686101fa0a76240beca6dd3b2f70c005e3..6724fac343796af425ae90add87693eb12bb469f 100644
GIT binary patch
delta 46
zcmZn=Xb{-2fmz`H|HuDt{-5%H1`yu_vL_#4Hsbq#{Qu_vn*R-fc=LbvMJy};u-P2*

delta 46
zcmV+}0MY+|5P%S{umceOfBnDv-}mqD_uu=!{eS+GzymT4<Nw+Jl>eCjl>gcP<Nu-r
E1iF15_W%F@

diff --git a/c2807_v4.gfx b/c2807_v4.gfx
index da7073ce4a627e6fd778b8c38da7d02a1b0848ff..fdd58b13dc5f273a193cedf57a53b2befd826916 100644
GIT binary patch
delta 104
zcmV-u0GI#H3)~B^y8=rA<otzV0vwe8nE#aj+5hAJ{(t?y```EP@Au#Pzx{vy`~Trc
z|G)s@CI1Y^*Q?hl?-AE2*Q@_WgWv-a|Fi!o|1tk5|Fi!`<NuTS0+9;`!v6aHhW`Bg
KkHE8(13Cf?>O+bE

delta 71
zcmV-N0J#6$3(gC$y8;&x<oy1B{lEL)_wVob-}}G)fBuiK0|JxW0vHd4Vgd$~|Cs-j
d|Jg+U;{=li1Ca^_!v6aHhW`AJud|{9Is*RWDEj~a

diff --git a/inventory.asm b/inventory.asm
index 8990e9a..565bbf3 100644
--- a/inventory.asm
+++ b/inventory.asm
@@ -51,14 +51,8 @@ RTL
 	JSL.l ResetEquipment
 RTL
 	.b_pressed
-	PHX
-	LDA.l AllowedItemOnB : BEQ .b_error
-	CMP.b #$FF : BEQ .skip_allow_check
-	CMP.w $0202 : BNE .b_error
-	.skip_allow_check
-	LDA.w $0202 : TAX
-	LDA.l ValidItemOnB, X : BNE .b_error
-	TXA : CMP.l ItemOnB : BNE .set_b
+	JSR CanPressB : BCC .b_error
+	LDA.w ItemCursor : CMP.l ItemOnB : BNE .set_b
 	LDA.b #$00
 	.set_b
 	STA.l ItemOnB
@@ -66,7 +60,6 @@ RTL
 	.b_error
 	LDA.b #$3C : STA.w $012E ; error sound
 	.b_done
-	PLX
 	SEC
 RTL
 	.y_pressed ; Note: used as entry point by quickswap code. Must preserve X. 
@@ -135,6 +128,27 @@ RTL
 	SEC
 RTL
 ;--------------------------------------------------------------------------------
+CanPressB:
+	PHY : PHP : SEP #$30
+	LDA.l AllowedItemOnB : BEQ .no
+	CMP.b #$FF : BEQ .skip_allow_check
+	CMP.w ItemCursor : BNE .no
+	.skip_allow_check
+	PHX
+	LDA.w ItemCursor : TAX
+	LDA.l ValidItemOnB, X : BNE .plx_and_no
+	PLX
+	PLP : PLY
+	SEC
+	RTS
+	.plx_and_no
+	PLX
+	.no
+	PLP : PLY
+	CLC
+	RTS
+;--------------------------------------------------------------------------------
+
 
 ;--------------------------------------------------------------------------------
 ;ProcessBottleMenu:
@@ -807,6 +821,7 @@ AddYMarker:
 	+ CMP.w #$10 : BEQ .drawJarMarker
 
 	.drawNormal
+	JSR CanPressB : BCS .drawBBubble
 	LDA.w #$7C60
 	BRA .drawTile
 
@@ -815,12 +830,20 @@ AddYMarker:
 	LDA $0207 : AND.w #$0020 : BNE .drawXBubble
 
 	.drawYBubble
+	JSR CanPressB : BCC .drawY
+	LDA.w MenuBlink : AND.w #$0020 : BNE .drawBBubble
+	.drawY
 	LDA.w #$3D4F
 	BRA .drawTile
 
 	.drawXBubble
 	JSR MakeCircleBlue
 	LDA.w #$2D3E
+	BRA .drawTile
+
+	.drawBBubble
+	JSR MakeCircleRed
+	LDA.w #$293F
 
 	.drawTile
 	STA $FFC4, Y
@@ -849,6 +872,24 @@ MakeCircleBlue:
 	LDA $0084, Y : AND.w #$EFFF : STA $0084, Y
 	LDA $007E, Y : AND.w #$EFFF : STA $007E, Y
 RTS
+MakeCircleRed:
+	LDA.w $FFC0, Y : AND.w #$EBFF : STA.w $FFC0, Y
+	LDA.w $FFC2, Y : AND.w #$EBFF : STA.w $FFC2, Y
+ 
+	LDA.w $FFFE, Y : AND.w #$EBFF : STA.w $FFFE, Y
+	LDA.w $0004, Y : AND.w #$EBFF : STA.w $0004, Y
+
+	LDA.w $003E, Y : AND.w #$EBFF : STA.w $003E, Y
+	LDA.w $0044, Y : AND.w #$EBFF : STA.w $0044, Y
+
+	LDA.w $0080, Y : AND.w #$EBFF : STA.w $0080, Y
+	LDA.w $0082, Y : AND.w #$EBFF : STA.w $0082, Y
+
+	LDA.w $FFBE, Y : AND.w #$EBFF : STA.w $FFBE, Y
+	LDA.w $FFC4, Y : AND.w #$EBFF : STA.w $FFC4, Y
+	LDA.w $0084, Y : AND.w #$EBFF : STA.w $0084, Y
+	LDA.w $007E, Y : AND.w #$EBFF : STA.w $007E, Y
+RTS
 ;--------------------------------------------------------------------------------
 
 ;--------------------------------------------------------------------------------
diff --git a/item_on_b.asm b/item_on_b.asm
index b84a107..e86ff97 100644
--- a/item_on_b.asm
+++ b/item_on_b.asm
@@ -25,7 +25,7 @@ DrawBIndicator:
 	LDA.l ItemOnB : AND.w #$00FF : BEQ .done
 	DEC : ASL : TAX
 	LDA.l ItemMenuLocations, X : TAX
-	LDA.w #$3D3F
+	LDA.w #$3D3B
 	STA.w $0042, X
 
 .done ; what we wrote over
@@ -75,7 +75,7 @@ UseItem:
 	.not_somaria
 	LDA.l ValidItemOnB, X : BNE .normal
 	LDA.b $3A : ORA.b #$40 : STA.b $3A
-	LDA.l $8DFA35, X : STA.w $0304
+	LDA.l $0DFA35, X : STA.w $0304
 	CPX.b #$06 : BEQ .fire_rod
 	CPX.b #$07 : BNE .not_rod
 	.ice_rod