Add Zora_HandleDialogue

2024-10-25 16:56:18 -04:00
parent 324532f614
commit d35abce142
1 changed files with 16 additions and 1 deletions
--- 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