Fix ZSOW vs Day/Night Sprites: Use Oracle_CheckIfNight and move ZSOW include to end
This commit is contained in:
@@ -39,9 +39,6 @@
|
|||||||
incsrc "Util/macros.asm"
|
incsrc "Util/macros.asm"
|
||||||
incsrc "Core/structs.asm"
|
incsrc "Core/structs.asm"
|
||||||
|
|
||||||
incsrc "Overworld/ZSCustomOverworld.asm"
|
|
||||||
%log_end("ZSCustomOverworld.asm", !LOG_OVERWORLD)
|
|
||||||
|
|
||||||
; Vanilla WRAM and SRAM
|
; Vanilla WRAM and SRAM
|
||||||
incsrc "Core/ram.asm"
|
incsrc "Core/ram.asm"
|
||||||
|
|
||||||
@@ -81,3 +78,6 @@ namespace Oracle
|
|||||||
print "Finished applying patches"
|
print "Finished applying patches"
|
||||||
}
|
}
|
||||||
namespace off
|
namespace off
|
||||||
|
|
||||||
|
incsrc "Overworld/ZSCustomOverworld.asm"
|
||||||
|
%log_end("ZSCustomOverworld.asm", !LOG_OVERWORLD)
|
||||||
|
|||||||
@@ -5243,7 +5243,7 @@ LoadOverworldSprites_Interupt:
|
|||||||
STZ.w $0FBA
|
STZ.w $0FBA
|
||||||
|
|
||||||
; What phase are we in?
|
; What phase are we in?
|
||||||
LDA.l $7EF3C5 : ASL : TAY
|
JSL Oracle_CheckIfNight : ASL : TAY
|
||||||
|
|
||||||
REP #$30
|
REP #$30
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user