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

prevent maku tree from giving you heart container again

Browse Source
This commit is contained in:
scawful
2024-06-30 11:13:38 -04:00
parent 4454892a43
commit 8a4d974bc6
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Sprites/NPCs/maku_tree.asm
View File

@@ -67,25 +67,25 @@ Sprite_MakuTree_Main:
dw MakuTree_Handler dw MakuTree_Handler
dw MakuTree_MeetLink dw MakuTree_MeetLink
dw MakuTree_GiveMoonPearl dw MakuTree_GiveMoonPearl
dw MakuTree_HasMetLink
MakuTree_Handler: MakuTree_Handler:
{ {
; Check the progress flags ; Check the progress flags
LDA $7EF3D4 : CMP.b #$01 : BEQ .has_met_link LDA.l $7EF3D4 : CMP.b #$01 : BEQ .has_met_link
%GotoAction(1) %GotoAction(1)
RTS RTS
.has_met_link .has_met_link
%ShowSolicitedMessage($22) %GotoAction(3)
LDA.l $7EF3D6 : ORA.b #$02 : STA.l $7EF3D6
RTS RTS
} }
MakuTree_MeetLink: MakuTree_MeetLink:
{ {
%ShowSolicitedMessage($20) : BCC .no_talk %ShowSolicitedMessage($20) : BCC .no_talk
LDA #$01 : STA $7EF3D4 LDA.b #$01 : STA.l $7EF3D4
LDA #$01 : STA $7EF3C7 ; Mark the Hall of Secrets LDA.b #$01 : STA.l $7EF3C7 ; Mark the Hall of Secrets
LDA.l $7EF3D6 : ORA.b #$02 : STA.l $7EF3D6 LDA.l $7EF3D6 : ORA.b #$02 : STA.l $7EF3D6
%GotoAction(2) %GotoAction(2)
.no_talk .no_talk
@@ -96,7 +96,15 @@ Sprite_MakuTree_Main:
{ {
; Give Link a heart container ; Give Link a heart container
LDY #$3E : JSL Link_ReceiveItem LDY #$3E : JSL Link_ReceiveItem
%GotoAction(0) %GotoAction(3)
RTS
}
MakuTree_HasMetLink:
{
%ShowSolicitedMessage($22) : BCC .no_talk
LDA.l $7EF3D6 : ORA.b #$02 : STA.l $7EF3D6
.no_talk
RTS RTS
} }