scawful/oracle-of-secrets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add milk bottle item, heals 5 hearts

Browse Source
This commit is contained in:
scawful
2024-07-05 17:19:09 -04:00
parent 7905bae709
commit 1d7c560b85
4 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Items/bottle_net.asm
View File

@@ -125,9 +125,15 @@ LinkItem_Bottles:
CMP.b #$05 : BEQ .LinkItem_BluePotion CMP.b #$05 : BEQ .LinkItem_BluePotion
CMP.b #$06 : BEQ .fairy CMP.b #$06 : BEQ .fairy
CMP.b #$09 : BEQ .magic_bean CMP.b #$09 : BEQ .magic_bean
CMP.b #$0A : BEQ .milk_bottle
BRL .LinkItem_BeeBottle BRL .LinkItem_BeeBottle
.milk_bottle
LDA.l $7EF36C : CMP.l $7EF36D : BEQ .LinkItem_UselessBottle
JSL Bottle_DrinkMilk
RTS
.magic_bean .magic_bean
JSL ReleaseMagicBean JSL ReleaseMagicBean
RTS RTS
@@ -219,5 +225,12 @@ LinkGoBeep:
BRA LinkItem_Bottles_bottle_exit 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 print "End of Items/bottle_net.asm ", pc
pushpc pushpc

1
Menu/menu_gfx_table.asm
View File

@@ -127,6 +127,7 @@ BottlesGFX:
dw $2837, $2838, $2839, $283A ; Bee dw $2837, $2838, $2839, $283A ; Bee
dw $2837, $2838, $2839, $283A ; Good bee dw $2837, $2838, $2839, $283A ; Good bee
dw $2837, $2838, $3CF7, $3CF8 ; Magic Bean dw $2837, $2838, $3CF7, $3CF8 ; Magic Bean
dw $2837, $2838, $3CFB, $3CFC ; Milk Bottle
; --------------------------------------------------------- ; ---------------------------------------------------------

12
Menu/menu_hud.asm
View File

@@ -404,7 +404,7 @@ HudItems:
; hammer, lamp, fire rod, ice rod, mirror, bottle2 ; hammer, lamp, fire rod, ice rod, mirror, bottle2
dw $F701, $F6F1, $F6A1, $F6B1, $F7C1, $F751 dw $F701, $F6F1, $F6A1, $F6B1, $F7C1, $F751
; flute, book, somaria, byrna, feather, bottle3 ; 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 ; deku, zora, wolf, bunny, stone, bottle4
dw $F6E1, $F821, $F6D1, $F7B9, $F811, $F751 dw $F6E1, $F821, $F6D1, $F7B9, $F811, $F751
} }
@@ -485,18 +485,12 @@ org $0DF751
dw $2837, $2838, $2839, $283A ; Bee dw $2837, $2838, $2839, $283A ; Bee
dw $2837, $2838, $2839, $283A ; Good bee dw $2837, $2838, $2839, $283A ; Good bee
dw $2837, $2838, $3CF7, $3CF8 ; Magic Bean dw $2837, $2838, $3CF7, $3CF8 ; Magic Bean
dw $2837, $2838, $3CFB, $3CFC ; Milk Bottle
; Somaria (Unchanged) org $0DF7A9
; org $0DF799
; dw $20F5, $20F5, $20F5, $20F5 ; No somaria
org $0DF7A1
dw $20F5, $20F5, $20F5, $20F5 ; No somaria dw $20F5, $20F5, $20F5, $20F5 ; No somaria
dw $24DC, $24DD, $24EC, $24ED ; Cane of Somaria dw $24DC, $24DD, $24EC, $24ED ; Cane of Somaria
; Byrna
; org $0DF7A9
; dw $2CDC, $2CDD, $2CEC, $2CED ; Cane of Byrna
; org $0DF7B1
org $0DF8A9 org $0DF8A9
dw $2C82, $2C83, $2C8B, $2C8C ; Fishing Rod dw $2C82, $2C83, $2C8B, $2C8C ; Fishing Rod
dw $2CF0, $24F1, $30EC, $E4F0 ; Portal Rod dw $2CF0, $24F1, $30EC, $E4F0 ; Portal Rod

1
Menu/menu_text.asm
View File

@@ -143,6 +143,7 @@ Menu_BottleItems:
dw "_____BEE______ " dw "_____BEE______ "
dw "__GOOD_BEE____ " dw "__GOOD_BEE____ "
dw "_MAGIC_BEAN___ " dw "_MAGIC_BEAN___ "
dw "_MILK_BOTTLE__ "
Menu_GoldstarLabel: Menu_GoldstarLabel:
dw "__GOLD_STAR___ " dw "__GOLD_STAR___ "