From d41dcdadb933277701c795aba92403c35ddd3d32 Mon Sep 17 00:00:00 2001
From: scawful <justin.scofield@outlook.com>
Date: Sat, 22 Nov 2025 19:39:18 -0500
Subject: [PATCH] Fix ZSOW vs Day/Night Sprites: Use Oracle_CheckIfNight and
 move ZSOW include to end

---
 Oracle_main.asm                 | 6 +++---
 Overworld/ZSCustomOverworld.asm | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Oracle_main.asm b/Oracle_main.asm
index 7bc1b44..2ac4ae5 100644
--- a/Oracle_main.asm
+++ b/Oracle_main.asm
@@ -39,9 +39,6 @@
 incsrc "Util/macros.asm"
 incsrc "Core/structs.asm"
 
-incsrc "Overworld/ZSCustomOverworld.asm"
-%log_end("ZSCustomOverworld.asm", !LOG_OVERWORLD)
-
 ; Vanilla WRAM and SRAM
 incsrc "Core/ram.asm"
 
@@ -81,3 +78,6 @@ namespace Oracle
   print "Finished applying patches"
 }
 namespace off
+
+incsrc "Overworld/ZSCustomOverworld.asm"
+%log_end("ZSCustomOverworld.asm", !LOG_OVERWORLD)
diff --git a/Overworld/ZSCustomOverworld.asm b/Overworld/ZSCustomOverworld.asm
index 556b3b9..f1b04f0 100644
--- a/Overworld/ZSCustomOverworld.asm
+++ b/Overworld/ZSCustomOverworld.asm
@@ -5243,7 +5243,7 @@ LoadOverworldSprites_Interupt:
                       STZ.w $0FBA
 
     ; What phase are we in?
-    LDA.l $7EF3C5 : ASL : TAY
+    JSL Oracle_CheckIfNight : ASL : TAY
 
     REP #$30