Update MagicBean song of storms logic

2024-12-15 17:56:35 -05:00
parent a428d736f5
commit 3b9352620e
1 changed files with 10 additions and 5 deletions
--- a/Items/ocarina.asm
+++ b/Items/ocarina.asm
@@ -259,6 +259,7 @@ OcarinaEffect_SummonStorms:
    CMP.b #$28 : BEQ .errorBeep
    CMP.b #$29 : BEQ .errorBeep

+  .summon_or_dismiss
    ; If the rain is already summoned, dismiss it
    LDA.l $7EE00E : BEQ .summonStorms
      .dismissStorms
@@ -287,9 +288,13 @@ OcarinaEffect_SummonStorms:
  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 #$01 : BEQ +
+                          AND.b #$04 : BNE +
      LDA.l MagicBeanProg
-    AND.b #$04
+      ORA.b #$04
      STA.l MagicBeanProg
+    +
+    JMP .summon_or_dismiss
  .not_active
  RTL
 }