diff --git a/Items/bottle_net.asm b/Items/bottle_net.asm index 30a43cf..c117aa0 100644 --- a/Items/bottle_net.asm +++ b/Items/bottle_net.asm @@ -125,9 +125,15 @@ LinkItem_Bottles: CMP.b #$05 : BEQ .LinkItem_BluePotion CMP.b #$06 : BEQ .fairy CMP.b #$09 : BEQ .magic_bean - + CMP.b #$0A : BEQ .milk_bottle + BRL .LinkItem_BeeBottle +.milk_bottle + LDA.l $7EF36C : CMP.l $7EF36D : BEQ .LinkItem_UselessBottle + JSL Bottle_DrinkMilk + RTS + .magic_bean JSL ReleaseMagicBean RTS @@ -219,5 +225,12 @@ LinkGoBeep: BRA LinkItem_Bottles_bottle_exit } +Bottle_DrinkMilk: +{ + LDA.b #$28 : STA.l $7EF372 ; Heal 5 hearts + LDA.b #$02 : STA.l $7EF35C, X : STZ.w $0301 + RTL +} + print "End of Items/bottle_net.asm ", pc pushpc \ No newline at end of file diff --git a/Menu/menu_gfx_table.asm b/Menu/menu_gfx_table.asm index 4717e93..c486884 100644 --- a/Menu/menu_gfx_table.asm +++ b/Menu/menu_gfx_table.asm @@ -127,6 +127,7 @@ BottlesGFX: dw $2837, $2838, $2839, $283A ; Bee dw $2837, $2838, $2839, $283A ; Good bee dw $2837, $2838, $3CF7, $3CF8 ; Magic Bean + dw $2837, $2838, $3CFB, $3CFC ; Milk Bottle ; --------------------------------------------------------- diff --git a/Menu/menu_hud.asm b/Menu/menu_hud.asm index 6ce2eb6..20b9b5b 100644 --- a/Menu/menu_hud.asm +++ b/Menu/menu_hud.asm @@ -404,7 +404,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, $F7A1, $F8A9, $F729, $F751 + dw $F859, $F741, $F7A9, $F8A9, $F729, $F751 ; deku, zora, wolf, bunny, stone, bottle4 dw $F6E1, $F821, $F6D1, $F7B9, $F811, $F751 } @@ -485,18 +485,12 @@ org $0DF751 dw $2837, $2838, $2839, $283A ; Bee dw $2837, $2838, $2839, $283A ; Good bee dw $2837, $2838, $3CF7, $3CF8 ; Magic Bean + dw $2837, $2838, $3CFB, $3CFC ; Milk Bottle -; Somaria (Unchanged) -; org $0DF799 -; dw $20F5, $20F5, $20F5, $20F5 ; No somaria -org $0DF7A1 +org $0DF7A9 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 $0DF7B1 org $0DF8A9 dw $2C82, $2C83, $2C8B, $2C8C ; Fishing Rod dw $2CF0, $24F1, $30EC, $E4F0 ; Portal Rod diff --git a/Menu/menu_text.asm b/Menu/menu_text.asm index 5dccfc4..2a17b90 100644 --- a/Menu/menu_text.asm +++ b/Menu/menu_text.asm @@ -143,6 +143,7 @@ Menu_BottleItems: dw "_____BEE______ " dw "__GOOD_BEE____ " dw "_MAGIC_BEAN___ " + dw "_MILK_BOTTLE__ " Menu_GoldstarLabel: dw "__GOLD_STAR___ "