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

add journal flags to deku scrub, mask salesman, ranch girl

Browse Source
This commit is contained in:
scawful
2025-12-08 22:08:18 -05:00
parent 2d62553065
commit 9b4ee7a9a1
3 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Sprites/NPCs/deku_scrub.asm
View File

@@ -99,6 +99,8 @@ Sprite_DekuScrub_Main:
%PlayAnimation(0, 1, 16) %PlayAnimation(0, 1, 16)
JSL Sprite_PlayerCantPassThrough JSL Sprite_PlayerCantPassThrough
%ShowSolicitedMessage($140) : BCC .no_hablaba %ShowSolicitedMessage($140) : BCC .no_hablaba
; Set journal flag: Found withering Deku Scrub
LDA.l SideQuestProg : ORA.b #$04 : STA.l SideQuestProg
%GotoAction(1) %GotoAction(1)
.no_hablaba .no_hablaba
RTS RTS
@@ -109,6 +111,8 @@ Sprite_DekuScrub_Main:
%PlayAnimation(0, 1, 16) %PlayAnimation(0, 1, 16)
LDA.b SongFlag : CMP.b #$01 : BNE .ninguna_cancion LDA.b SongFlag : CMP.b #$01 : BNE .ninguna_cancion
STZ.b SongFlag 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 LDA.b #$C0 : STA.w SprTimerD, X
%GotoAction(2) %GotoAction(2)
.ninguna_cancion .ninguna_cancion

4
Sprites/NPCs/mask_salesman.asm
View File

@@ -111,6 +111,8 @@ Sprite_MaskSalesman_Main:
NoOcarina: NoOcarina:
{ {
%PlayAnimation(0, 1, 16) %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! %ShowUnconditionalMessage($E9) ; Go get the Ocarina first!
%GotoAction(0) %GotoAction(0)
RTS RTS
@@ -129,6 +131,8 @@ Sprite_MaskSalesman_Main:
TeachLinkSong: TeachLinkSong:
{ {
LDA #$02 : STA $7EF34C ; Increment the number of songs Link has 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 LDA.b #$13
STA.w $0CF8 STA.w $0CF8
JSL $0DBB67 ; Link_CalculateSFXPan JSL $0DBB67 ; Link_CalculateSFXPan

2
Sprites/NPCs/ranch_girl.asm
View File

@@ -9,6 +9,8 @@ Sprite_CheckIfActive_Bank1A = $1AF954
RanchGirl_Message: RanchGirl_Message:
{ {
LDA $7EF34C : CMP.b #$01 : BCS .has_ocarina 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) %ShowUnconditionalMessage($017D)
LDA #$01 : STA.w SprMiscD, X LDA #$01 : STA.w SprMiscD, X
RTL RTL