From ed8cf3f205dfc4410a2d9d8bdf40f611cf90e68a Mon Sep 17 00:00:00 2001
From: scawful <justin.scofield@outlook.com>
Date: Fri, 16 Aug 2024 13:53:02 -0400
Subject: [PATCH] todos for rain overlay song of storms

---
 Items/ocarina.asm               | 12 ++++++++++--
 Masks/gbc_form.asm              |  4 ++--
 Overworld/ZCustomOverworld2.asm |  6 +++---
 Overworld/custom_gfx.asm        | 23 -----------------------
 4 files changed, 15 insertions(+), 30 deletions(-)

diff --git a/Items/ocarina.asm b/Items/ocarina.asm
index 53ff9fc..4cd5830 100644
--- a/Items/ocarina.asm
+++ b/Items/ocarina.asm
@@ -271,8 +271,8 @@ print "Bank07 Free Space: ", pc
 
 ; ZS OW
 ; Load the rain overlay by default for the song of storms
-org $02B011
-  LDX #$009F
+; org $02B011
+;   LDX #$009F
 
 org $2B8000
 OcarinaEffect_SummonStorms:
@@ -335,6 +335,9 @@ 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
@@ -349,6 +352,7 @@ CheckRealTable:
   
   JML RainAnimation_Overridden_skipMovement
 }
+endif
 
 ResetOcarinaFlag:
 {
@@ -432,6 +436,9 @@ 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:
@@ -490,3 +497,4 @@ RainAnimation_Overridden:
     RTL
 }
 warnpc $02A52D
+endif
\ No newline at end of file
diff --git a/Masks/gbc_form.asm b/Masks/gbc_form.asm
index 7af4dc6..115a7d9 100644
--- a/Masks/gbc_form.asm
+++ b/Masks/gbc_form.asm
@@ -80,10 +80,10 @@ LoadOverworld_CheckForGbcLink:
       JSL UpdateGbcPalette
       JMP .return
    
-.return_lw
+  .return_lw
   STZ.w $02B2
   
-.return
+  .return
   JSL Palette_ArmorAndGloves
   STZ.b $B0
   STZ.b $11
diff --git a/Overworld/ZCustomOverworld2.asm b/Overworld/ZCustomOverworld2.asm
index cbd715c..e86b5dc 100644
--- a/Overworld/ZCustomOverworld2.asm
+++ b/Overworld/ZCustomOverworld2.asm
@@ -147,13 +147,13 @@ Pool:
     ; phase. Default is $FF.
     org $288146 ; $140146
     .EnableBeginningRain ; 0x01
-    db $FF
+    db $00
 
     ; When non 0 this will disable the ambiant sound that plays in the mire
     ; area after the event is triggered. Default is $FF.
     org $288147 ; $140147
     .EnableRainMireEvent ; 0x01
-    db $FF
+    db $00
 
     ; When non 0 this will make the game reload all gfx in between OW
     ; transitions. Default is $FF.
@@ -989,7 +989,7 @@ PreOverworld_LoadProperties_LoadMain:
     STZ.b $EE   ; Reset Link layer to BG2
     STZ.w $0476 ; Another layer flag
         
-    INC.b $11 ; SCAWFUL: We should verify what submodule this is moving to.
+    INC.b $11 ; Move to Overworld_LoadSubscreenAndSilenceSFX1
     INC.b $16 ; NMI HUD Update flag
         
     STZ.w $0402 : STZ.w $0403
diff --git a/Overworld/custom_gfx.asm b/Overworld/custom_gfx.asm
index 229affc..dc53a50 100644
--- a/Overworld/custom_gfx.asm
+++ b/Overworld/custom_gfx.asm
@@ -1,10 +1,3 @@
-org $02E94A
-  JSL CheckForSpecialAreaGraphics
-
-org $0ED5A8
-  OverworldPalettesLoader:
-
-; ==============================================================================
 
 org $3F8000
 CheckForChangeGraphicsNormalLoadBoat:
@@ -19,22 +12,6 @@ CheckForChangeGraphicsNormalLoadBoat:
     RTL
 }
 
-CheckForSpecialAreaGraphics: 
-{
-  JSL OverworldPalettesLoader
-  
-  LDA $8A : CMP.b #$81 : BNE .korok_area
-
-  PHB : PHK : PLB
-  JSL ApplyKorokSpriteSheets
-  PLB
-
-  .korok_area
-
-  RTL
-
-}
-
 ; ==============================================================================
 
 ApplyGraphics1: