From 555f5383a4d388cb52d7374602741edea7a86309 Mon Sep 17 00:00:00 2001
From: scawful <justin.scofield@outlook.com>
Date: Fri, 14 Jun 2024 11:04:22 -0400
Subject: [PATCH] add magic bean bottle to menu and hud

---
 Menu/menu_draw.asm      | 15 ++++-----------
 Menu/menu_gfx_table.asm |  1 +
 Menu/menu_hud.asm       | 14 ++++++++++----
 Menu/menu_text.asm      |  2 ++
 4 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/Menu/menu_draw.asm b/Menu/menu_draw.asm
index acb6230..a898c1d 100644
--- a/Menu/menu_draw.asm
+++ b/Menu/menu_draw.asm
@@ -338,20 +338,13 @@ DrawYItems:
     JSR DrawMenuItem
   .no_book
 
-  ; LDA.l $7EF350 : CMP.w #$00 : BEQ .no_somaria
-  ;   LDA.w SomariaOrByrna : BNE .spoof_somaria
-  ; .spoof_somaria
-
-    ; LDA.w #$01 : STA.w ShortSpoof : LDA.w #ShortSpoof
-    LDA.w #$7EF350
-    LDX.w #menu_offset(13,9)
-    LDY.w #SomariaGFX
-    JSR DrawMenuItem
-  .no_somaria
+  LDA.w #$7EF350
+  LDX.w #menu_offset(13,9)
+  LDY.w #SomariaGFX
+  JSR DrawMenuItem
 
   LDA.w #$7EF351
   LDX.w #menu_offset(13,13)
-  ;LDY.w #ByrnaGFX
   LDY.w #FishingRodGFX
   JSR DrawMenuItem
 
diff --git a/Menu/menu_gfx_table.asm b/Menu/menu_gfx_table.asm
index 80001a8..f4d9484 100644
--- a/Menu/menu_gfx_table.asm
+++ b/Menu/menu_gfx_table.asm
@@ -125,6 +125,7 @@ BottlesGFX:
 	dw $2855, $6855, $2C57, $2C5A ; Fairy
 	dw $2837, $2838, $2839, $283A ; Bee
 	dw $2837, $2838, $2839, $283A ; Good bee
+  dw $2837, $2838, $3CF7, $3CF8 ; Magic Bean
 
 ; ---------------------------------------------------------
 
diff --git a/Menu/menu_hud.asm b/Menu/menu_hud.asm
index 2c47a8d..598a913 100644
--- a/Menu/menu_hud.asm
+++ b/Menu/menu_hud.asm
@@ -399,7 +399,7 @@ HudItems:
   ;  hammer, lamp,      fire rod, ice rod, mirror,  bottle2
   dw $F701,  $F6F1,     $F6A1,    $F6B1,   $F7C1,   $F751
   ;  flute,  book,      somaria,  byrna,   feather, bottle3
-  dw $F859,  $F741,     $F799,    $F7A9,   $F729,   $F751
+  dw $F859,  $F741,     $F7A1,    $F7A9,   $F729,   $F751
   ;  deku,   zora,      wolf,     bunny,   stone,   bottle4
   dw $F6E1,  $F821,     $F6D1,    $F7B9,   $F811,   $F751
 }
@@ -478,15 +478,21 @@ org $0DF751
   dw $2855, $6855, $2C57, $2C5A ; Fairy
   dw $2837, $2838, $2839, $283A ; Bee
   dw $2837, $2838, $2839, $283A ; Good bee
+  dw $2837, $2838, $3CF7, $3CF8 ; Magic Bean
 
 ; Somaria (Unchanged)
+; org $0DF799
+;   dw $20F5, $20F5, $20F5, $20F5 ; No somaria
+org $0DF7A1
+  dw $20F5, $20F5, $20F5, $20F5 ; No somaria
+  dw $24DC, $24DD, $24EC, $24ED ; Cane of Somaria
 
 ; Byrna
-org $0DF7A9
-  dw $2CDC, $2CDD, $2CEC, $2CED ; Cane of Byrna
+; org $0DF7A9
+  ; dw $2CDC, $2CDD, $2CEC, $2CED ; Cane of Byrna
+org $0DF7B1
   dw $2C82, $2C83, $2C8B, $2C8C ; Fishing Rod
 
-
 ; Deku (Quake)
 org $0DF6E1
   dw $20F5, $20F5, $20F5, $20F5 ; No bombos
diff --git a/Menu/menu_text.asm b/Menu/menu_text.asm
index 49fe20f..996d739 100644
--- a/Menu/menu_text.asm
+++ b/Menu/menu_text.asm
@@ -141,7 +141,9 @@ Menu_BottleItems:
   dw "_GREEN_POTION_  "
   dw "_BLUE_POTION__  "
   dw "____FAIRY_____  "
+  dw "_____BEE______  "
   dw "__GOOD_BEE____  "
+  dw "_MAGIC_BEAN___  "
 
 Menu_GoldstarLabel:
   dw "__GOLD_STAR___  "