diff --git a/Sprites/NPCs/deku_scrub.asm b/Sprites/NPCs/deku_scrub.asm index 8474cfd..85093b1 100644 --- a/Sprites/NPCs/deku_scrub.asm +++ b/Sprites/NPCs/deku_scrub.asm @@ -99,6 +99,8 @@ Sprite_DekuScrub_Main: %PlayAnimation(0, 1, 16) JSL Sprite_PlayerCantPassThrough %ShowSolicitedMessage($140) : BCC .no_hablaba + ; Set journal flag: Found withering Deku Scrub + LDA.l SideQuestProg : ORA.b #$04 : STA.l SideQuestProg %GotoAction(1) .no_hablaba RTS @@ -109,6 +111,8 @@ Sprite_DekuScrub_Main: %PlayAnimation(0, 1, 16) LDA.b SongFlag : CMP.b #$01 : BNE .ninguna_cancion STZ.b SongFlag + ; Set journal flag: Deku Scrub soul freed + LDA.l SideQuestProg2 : ORA.b #$10 : STA.l SideQuestProg2 LDA.b #$C0 : STA.w SprTimerD, X %GotoAction(2) .ninguna_cancion diff --git a/Sprites/NPCs/mask_salesman.asm b/Sprites/NPCs/mask_salesman.asm index 10896d9..600df5f 100644 --- a/Sprites/NPCs/mask_salesman.asm +++ b/Sprites/NPCs/mask_salesman.asm @@ -111,6 +111,8 @@ Sprite_MaskSalesman_Main: NoOcarina: { %PlayAnimation(0, 1, 16) + ; Set journal flag: Met Mask Salesman (hint to get Ocarina) + LDA.l SideQuestProg : ORA.b #$01 : STA.l SideQuestProg %ShowUnconditionalMessage($E9) ; Go get the Ocarina first! %GotoAction(0) RTS @@ -129,6 +131,8 @@ Sprite_MaskSalesman_Main: TeachLinkSong: { LDA #$02 : STA $7EF34C ; Increment the number of songs Link has + ; Set journal flag: Mask Salesman taught Song of Healing + LDA.l SideQuestProg2 : ORA.b #$04 : STA.l SideQuestProg2 LDA.b #$13 STA.w $0CF8 JSL $0DBB67 ; Link_CalculateSFXPan diff --git a/Sprites/NPCs/ranch_girl.asm b/Sprites/NPCs/ranch_girl.asm index f0dc213..1653f2c 100644 --- a/Sprites/NPCs/ranch_girl.asm +++ b/Sprites/NPCs/ranch_girl.asm @@ -9,6 +9,8 @@ Sprite_CheckIfActive_Bank1A = $1AF954 RanchGirl_Message: { LDA $7EF34C : CMP.b #$01 : BCS .has_ocarina + ; Set journal flag: Ranch Girl transformed back (curse broken) + LDA.l SideQuestProg2 : ORA.b #$01 : STA.l SideQuestProg2 %ShowUnconditionalMessage($017D) LDA #$01 : STA.w SprMiscD, X RTL