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

Add LinkGoBeep to bottle_net

Browse Source
This commit is contained in:
scawful
2023-08-01 10:24:34 -04:00
parent a330dc4c9b
commit c36b06b837
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Items/bottle_net.asm
View File

@@ -132,7 +132,7 @@ LinkItem_Bottles:
LDA.l $7EF36C : CMP.l $7EF36D : BNE .can_drink_red LDA.l $7EF36C : CMP.l $7EF36D : BNE .can_drink_red
.LinkItem_UselessBottle: .LinkItem_UselessBottle:
BRL $07A955 ; LinkGoBeep TODO(scawful): Investigate BRL LinkGoBeep ; BRL $07A955 ; LinkGoBeep TODO(scawful): Investigate
.can_drink_red: .can_drink_red:
LDA.b #$02 : STA.l $7EF35C, X : STZ.w $0301 LDA.b #$02 : STA.l $7EF35C, X : STZ.w $0301
@@ -148,18 +148,18 @@ LinkItem_Bottles:
.LinkItem_GreenPotion: .LinkItem_GreenPotion:
LDA $7EF36E : CMP.b #$80 : BNE .can_drink LDA $7EF36E : CMP.b #$80 : BNE .can_drink
BRL $07A955 ; LinkGoBeep TODO(scawful): Investigate BRL LinkGoBeep ; LinkGoBeep TODO(scawful): Investigate
.can_drink: .can_drink:
LDA $02 : STA $7EF35C, X : STZ $0301 LDA $02 : STA $7EF35C, X : STZ $0301
LDA #$01 : STA.l $7EF373
; submodule ???? ; submodule ????
LDA.b #$08 : STA $11 LDA.b #$04 : STA.b $11
LDA $10 : STA $010C LDA.b $10 : STA.w $010C
; Go to text mode ; Go to text mode
LDA.b #$0E : STA $10 LDA.b #$0E : STA.b $10
LDA.b #$07 : STA $0208 LDA.b #$07 : STA.w $0208
JSL $0DFA58 ; RebuildHUD_long TODO(scawful) JSL $0DFA58 ; RebuildHUD_long TODO(scawful)
BRA .bottle_exit BRA .bottle_exit
@@ -167,7 +167,7 @@ LinkItem_Bottles:
.LinkItem_BluePotion: .LinkItem_BluePotion:
LDA $7EF36C : CMP $7EF36D : BNE .useBluePotion LDA $7EF36C : CMP $7EF36D : BNE .useBluePotion
LDA $7EF36E : CMP.b #$80 : BNE .useBluePotion LDA $7EF36E : CMP.b #$80 : BNE .useBluePotion
BRL $07A955 BRL LinkGoBeep ; BRL $07A955
.useBluePotion .useBluePotion
LDA.b #$02 : STA $7EF35C, X : STZ $0301 LDA.b #$02 : STA $7EF35C, X : STZ $0301
@@ -186,7 +186,7 @@ LinkItem_Bottles:
.LinkItem_FairyBottle: .LinkItem_FairyBottle:
STZ.w $0301 STZ.w $0301
JSL PlayerItem_SpawnFaerie : BPL .released JSL PlayerItem_SpawnFaerie : BPL .released
BRL $07A955 BRL LinkGoBeep ; BRL $07A955
.released: .released:
LDA.b #$02 : STA.l $7EF35C, X LDA.b #$02 : STA.l $7EF35C, X
@@ -196,7 +196,7 @@ LinkItem_Bottles:
.LinkItem_BeeBottle: .LinkItem_BeeBottle:
STZ.w $0301 STZ.w $0301
JSL PlayerItem_ReleaseBee : BPL .bee_spawn_success JSL PlayerItem_ReleaseBee : BPL .bee_spawn_success
BRL $07A955 ; LinkGoBeep BRL LinkGoBeep ; BRL $07A955 ; LinkGoBeep
.bee_spawn_success .bee_spawn_success
LDA.b #$02 : STA.l $7EF35C, X LDA.b #$02 : STA.l $7EF35C, X
@@ -206,6 +206,12 @@ LinkItem_Bottles:
RTS RTS
} }
LinkGoBeep:
{
LDA.b #$3C : JSR Player_DoSfx2
BRA LinkItem_Bottles_bottle_exit
}
print pc print pc
; ============================================================================= ; =============================================================================