Fix ZSOW vs Day/Night Sprites: Use Oracle_CheckIfNight and move ZSOW include to end

2025-11-22 19:39:18 -05:00
parent a8ff3ef0f9
commit d41dcdadb9
2 changed files with 4 additions and 4 deletions
--- 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)
--- 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