add LoadPeacetimeSprites, use part0 after events for new spriteset

This commit is contained in:
scawful
2024-09-04 06:52:01 -04:00
parent 841be325d5
commit dcc5907e48

View File

@@ -446,6 +446,9 @@ GlovesFix:
CheckIfNight:
{
JSR LoadPeacetimeSprites : BCS +
RTL
+
LDA.l $7EF3C5 : CMP.b #$02 : BCC .day_time
LDA $7EE000 : CMP.b #$12 : BCS .night_time
LDA $7EE000 : CMP.b #$06 : BCC .night_time
@@ -479,9 +482,11 @@ ColorBgFix:
pushpc
; Overworld_LoadSprites
org $09C4E3
JSL CheckIfNight
; Sprite_LoadGraphicsProperties_light_world_only
org $00FC6A
JSL CheckIfNight16Bit
@@ -562,6 +567,9 @@ pullpc
CheckIfNight16Bit:
{
JSR LoadPeacetimeSprites : BCS +
RTL
+
; Don't change the spriteset during the intro sequence
LDA.l $7EF3C5 : AND.w #$00FF : CMP.w #$0002 : BCC .day_time
; 0x12 = 18 hours or 6 pm
@@ -577,6 +585,24 @@ CheckIfNight16Bit:
RTL
}
LoadPeacetimeSprites:
{
; Map 2E, 2F if CRYSTALS && 0x10 == 0
LDA $8A : CMP.b #$2E : BEQ .tail_palace
CMP.b #$2F : BEQ .tail_palace
JMP +
.tail_palace
LDA.l CRYSTALS : AND #$10 : BNE .load_peacetime
JMP +
.load_peacetime
LDA.b #$01
CLC
RTS
+
SEC
RTS
}
FixSaveAndQuit:
{
LDA #$08 : STA $7EE000