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

Add MagicBean event to OcarinaEffect_SummonStorms

Browse Source
This commit is contained in:
scawful
2024-12-15 16:16:28 -05:00
parent be4a5d9b8c
commit c430f9c4a9
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Items/ocarina.asm
View File

@@ -254,7 +254,8 @@ org $2B8000
OcarinaEffect_SummonStorms: OcarinaEffect_SummonStorms:
{ {
; Dismiss the rain in the Zora area where it is already raining ; Dismiss the rain in the Zora area where it is already raining
LDA.w $8A : CMP.b #$1E : BEQ .checkForEvent LDA.w $8A : CMP.b #$00 : BEQ .check_for_magic_bean
CMP.b #$1E : BEQ .checkForEvent
CMP.b #$2E : BEQ .dismissStorms CMP.b #$2E : BEQ .dismissStorms
CMP.b #$2F : BEQ .dismissStorms CMP.b #$2F : BEQ .dismissStorms
; Check for areas which should not be allowed to have rain ; Check for areas which should not be allowed to have rain
@@ -289,6 +290,16 @@ OcarinaEffect_SummonStorms:
.checkForEvent .checkForEvent
JSR CheckForZoraEvent : BCC .errorBeep JSR CheckForZoraEvent : BCC .errorBeep
JMP .dismissStorms JMP .dismissStorms
.check_for_magic_bean
LDA.b #Sprite_BeanVendor : LDX.b #$00
JSL Sprite_CheckForPresence : BCC .not_active
; Check that it's the magic bean planted
LDA.l MagicBeanProg
AND.b #$04
STA.l MagicBeanProg
.not_active
RTL
} }
; Y: E8 06, X: 48 0C ; Y: E8 06, X: 48 0C