maku tree housekeeping

2024-08-21 19:33:55 -04:00
parent 4143b82247
commit 38c0aeec42
4 changed files with 20 additions and 16 deletions
--- a/Sprites/NPCs/korok.asm
+++ b/Sprites/NPCs/korok.asm
@@ -65,7 +65,7 @@ Sprite_Korok_Long:
 Sprite_Korok_Prep:
 {
  PHB : PHK : PLB
-  JSL GetRandomInt : AND.b #$02 : STA.w SprSubtype, X
+  JSL GetRandomInt : AND.b #$03 : STA.w SprSubtype, X
  PLB
  RTL
 }
--- a/Sprites/NPCs/maku_tree.asm
+++ b/Sprites/NPCs/maku_tree.asm
@@ -53,6 +53,9 @@ Sprite_MakuTree_Prep:
 {
  PHB : PHK : PLB

+  ; Play the Maku Song
+  LDA.b #$03 : STA.w $012C
+
  PLB
  RTL
 }
@@ -128,8 +131,9 @@ Sprite_MakuTree_Main:

  MakuTree_OfferTheDreamer:
  {
-    %ShowUnconditionalMessage($013C) 
-    INC.w SprAction, X
+    %ShowSolicitedMessage($013C) : BCC .no_talk
+      INC.w SprAction, X
+    .no_talk
    RTS
  }

@@ -142,7 +146,7 @@ Sprite_MakuTree_Main:
    INC.w SprAction, X
    RTS
    .said_no
-    %GotoAction(3)
+    %GotoAction(4)
    RTS
  }