From a4ddf1eb22d7306ab8066993f2d4695504bfa153 Mon Sep 17 00:00:00 2001
From: scawful <justin.scofield@outlook.com>
Date: Sat, 17 Aug 2024 18:53:47 -0400
Subject: [PATCH] restore song of storms for ZSCustomOverworldV2

---
 Items/ocarina.asm               | 14 +-------------
 Overworld/ZCustomOverworld2.asm |  2 +-
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/Items/ocarina.asm b/Items/ocarina.asm
index 4cd5830..89a68c1 100644
--- a/Items/ocarina.asm
+++ b/Items/ocarina.asm
@@ -269,11 +269,6 @@ Link_HandleCardinalCollision_Long:
 
 print "Bank07 Free Space: ", pc
 
-; ZS OW
-; Load the rain overlay by default for the song of storms
-; org $02B011
-;   LDX #$009F
-
 org $2B8000
 OcarinaEffect_SummonStorms:
 {
@@ -335,9 +330,7 @@ PlayThunderAndRain:
   RTL
 }
 
-if ZS_CUSTOM_OW_V2 = 1
-; TODO: Setup Song of Storms and Rain Overlay for V2
-else
+
 CheckRealTable:
 {
   LDA $7EE00E : CMP #$00 : BEQ .continue
@@ -352,7 +345,6 @@ CheckRealTable:
   
   JML RainAnimation_Overridden_skipMovement
 }
-endif
 
 ResetOcarinaFlag:
 {
@@ -436,9 +428,6 @@ org $02F210 ; OverworldTransitionScrollAndLoadMap
   JSL ResetOcarinaFlag
 }
 
-if ZS_CUSTOM_OW_V2 = 1
-; TODO: Setup Song of Storms and Rain Overlay for V2
-else 
 ; ZS OW
 org $02A4CD
 RainAnimation_Overridden:
@@ -497,4 +486,3 @@ RainAnimation_Overridden:
     RTL
 }
 warnpc $02A52D
-endif
\ No newline at end of file
diff --git a/Overworld/ZCustomOverworld2.asm b/Overworld/ZCustomOverworld2.asm
index eb2b4b6..de28e5b 100644
--- a/Overworld/ZCustomOverworld2.asm
+++ b/Overworld/ZCustomOverworld2.asm
@@ -1251,7 +1251,7 @@ CustomOverworld_LoadSubscreenOverlay_PostInit:
     ; pyramid one by default.
     CPX.w #$00FF : BNE .notFF
         ; The pyramid background.
-        LDX.w #$0096
+        LDX.w #$009F
 
     .notFF