scawful/oracle-of-secrets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enable LoadPeacetimeSprites, add Zora Sanctuary map peacetime

Browse Source
This commit is contained in:
scawful
2024-10-08 20:47:56 -04:00
parent 88c76f7aa5
commit 13b6a8997c
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Overworld/time_system.asm
View File

@@ -434,9 +434,9 @@ GlovesFix:
CheckIfNight: CheckIfNight:
{ {
;JSR LoadPeacetimeSprites : BCS + JSR LoadPeacetimeSprites : BCS +
; RTL RTL
;+ +
LDA.l $7EF3C5 : CMP.b #$02 : BCC .day_time LDA.l $7EF3C5 : CMP.b #$02 : BCC .day_time
LDA $7EE000 : CMP.b #$12 : BCS .night_time LDA $7EE000 : CMP.b #$12 : BCS .night_time
LDA $7EE000 : CMP.b #$06 : BCC .night_time LDA $7EE000 : CMP.b #$06 : BCC .night_time
@@ -470,9 +470,12 @@ ColorBgFix:
CheckIfNight16Bit: CheckIfNight16Bit:
{ {
;JSR LoadPeacetimeSprites : BCS + SEP #$30
; RTL JSR LoadPeacetimeSprites : BCS +
;+ REP #$30
RTL
+
REP #$30
; Don't change the spriteset during the intro sequence ; Don't change the spriteset during the intro sequence
LDA.l $7EF3C5 : AND.w #$00FF : CMP.w #$0002 : BCC .day_time LDA.l $7EF3C5 : AND.w #$00FF : CMP.w #$0002 : BCC .day_time
; 0x12 = 18 hours or 6 pm ; 0x12 = 18 hours or 6 pm
@@ -493,10 +496,14 @@ LoadPeacetimeSprites:
; Map 2E, 2F if CRYSTALS && 0x10 == 0 ; Map 2E, 2F if CRYSTALS && 0x10 == 0
LDA $8A : CMP.b #$2E : BEQ .tail_palace LDA $8A : CMP.b #$2E : BEQ .tail_palace
CMP.b #$2F : BEQ .tail_palace CMP.b #$2F : BEQ .tail_palace
CMP.b #$1E : BEQ .zora_sanctuary
JMP + JMP +
.tail_palace .tail_palace
LDA.l CRYSTALS : AND #$10 : BNE .load_peacetime LDA.l CRYSTALS : AND #$10 : BNE .load_peacetime
JMP + JMP +
.zora_sanctuary
LDA.l CRYSTALS : AND #$20 : BNE .load_peacetime
JMP +
.load_peacetime .load_peacetime
LDA.b #$01 LDA.b #$01
CLC CLC