From d35abce1427bb3a565ec1b271d80d4bd8f3b69ea Mon Sep 17 00:00:00 2001 From: scawful Date: Fri, 25 Oct 2024 16:56:18 -0400 Subject: [PATCH] Add Zora_HandleDialogue --- Sprites/NPCs/zora.asm | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/Sprites/NPCs/zora.asm b/Sprites/NPCs/zora.asm index eee26f9..7293f65 100644 --- a/Sprites/NPCs/zora.asm +++ b/Sprites/NPCs/zora.asm @@ -64,7 +64,7 @@ Sprite_Zora_Main: JSR Zora_TrackHeadToPlayer JSL Sprite_PlayerCantPassThrough - %ShowSolicitedMessage($01A4) + JSR Zora_HandleDialogue LDA.w SprAction, X JSL UseImplicitRegIndexedLocalJumpTable @@ -102,6 +102,21 @@ Zora_TrackHeadToPlayer: RTS } +Zora_HandleDialogue: +{ + LDA.l CRYSTALS : AND.b #$20 : BEQ +++ + %ShowSolicitedMessage($01A6) + JMP ++ + +++ + LDA.w SprAction, X : BEQ + + %ShowSolicitedMessage($01A5) + JMP ++ + + + %ShowSolicitedMessage($01A4) + ++ + RTS +} + Sprite_Zora_Draw: { JSL Sprite_PrepOamCoord