From ed9d5dd48b92315b02db9102f514fda15281d107 Mon Sep 17 00:00:00 2001 From: scawful Date: Mon, 26 Aug 2024 08:00:20 -0400 Subject: [PATCH] fix song of time activation bug --- Overworld/time_system.asm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Overworld/time_system.asm b/Overworld/time_system.asm index 0484316..d41c0cd 100644 --- a/Overworld/time_system.asm +++ b/Overworld/time_system.asm @@ -214,11 +214,15 @@ CheckForSongOfTime: LDA.b #$00 : STA.l $7EE002 LDA.l $7EE000 : CMP.b #$06 : BNE ++ - LDA.b #$3F : STA.l $7EE002 + LDA.l $7EE001 : BNE ++ + LDA.b #$3F : STA.l $7EE002 + STZ $FE ++ LDA.l $7EE000 : CMP.b #$12 : BNE ++ - LDA.b #$3F : STA.l $7EE002 + LDA.l $7EE001 : BNE ++ + LDA.b #$3F : STA.l $7EE002 + STZ $FE ++ + RTS @@ -503,7 +507,7 @@ endif ; ZS OW - CheckForChangeGraphicsTransitionLoad if ZS_CUSTOM_OW_V2 = 1 -org $2893FD +org $289447 JSL SubAreasFix else org $2885F9