From d338d4bc0a8657b777691b6cde00a8442a532928 Mon Sep 17 00:00:00 2001
From: scawful <justin.scofield@outlook.com>
Date: Wed, 19 Jun 2024 11:25:33 -0400
Subject: [PATCH] make song of storms trigger zora event, dismiss rain

---
 Items/ocarina.asm | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/Items/ocarina.asm b/Items/ocarina.asm
index 082cf64..5251e73 100644
--- a/Items/ocarina.asm
+++ b/Items/ocarina.asm
@@ -225,7 +225,7 @@ org $3C8000
 OcarinaEffect_SummonStorms:
 {
   ; Dismiss the rain in the Zora area where it is already raining
-  LDA.w $8A : CMP.b #$1E : BEQ .dismissStorms
+  LDA.w $8A : CMP.b #$1E : BEQ .checkForEvent
               CMP.b #$2E : BEQ .dismissStorms
               CMP.b #$2F : BEQ .dismissStorms
     ; Check for areas which should not be allowed to have rain
@@ -256,6 +256,20 @@ OcarinaEffect_SummonStorms:
   .errorBeep
     LDA.b #$3C : STA.w $012E ; Error beep
     RTL
+
+  .checkForEvent
+    JSR CheckForZoraEvent
+    JMP .dismissStorms
+}
+
+; Y: E8 06, X: 48 0C
+CheckForZoraEvent:
+{
+  LDA $20 : CMP.w #$06E8 : BNE .notZora
+  LDA $22 : CMP.w #$0C48 : BNE .notZora
+  LDA.b #$01 : STA $04C6
+  .notZora
+  RTS
 }
 
 PlayThunderAndRain: