From 38c0aeec42cd75e1a335ffbd6ccd6142530f3f5a Mon Sep 17 00:00:00 2001
From: scawful <justin.scofield@outlook.com>
Date: Wed, 21 Aug 2024 19:33:55 -0400
Subject: [PATCH] maku tree housekeeping

---
 Overworld/special_areas.asm    | 14 +++++++-------
 Sprites/Bosses/kydrog_boss.asm | 10 +++++-----
 Sprites/NPCs/korok.asm         |  2 +-
 Sprites/NPCs/maku_tree.asm     | 10 +++++++---
 4 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/Overworld/special_areas.asm b/Overworld/special_areas.asm
index 24b81ab..c1dcfee 100644
--- a/Overworld/special_areas.asm
+++ b/Overworld/special_areas.asm
@@ -462,17 +462,17 @@ LoadSpecialOverworld:
   db $2F, $2F, $2F, $2F
 
   .palette_prop_a
-  db $0A, $0A, $0A, $0A
-  db $02, $02, $02, $0A
-  db $02, $02, $0A, $02
-  db $02, $02, $02, $0A
-  db $02, $02, $02, $0A
-  db $02, $02, $02, $0A
+  db $0A, $0A, $0A, $0A ; 0x00 - Maku Tree
+  db $02, $02, $02, $0A ; 0x01 - Tree House
+  db $01, $01, $04, $01 ; 0x02 - Zora Falls
+  db $02, $02, $02, $0A ; 0x03 - Zora Falls
+  db $02, $02, $02, $0A ; 0x04 - Tree House
+  db $02, $02, $02, $0A ; 0x05 - Tiny House
 
   .palette_prop_b
   db $01, $08, $08, $08
   db $00, $00, $00, $00
-  db $00, $00, $08, $00
+  db $00, $00, $00, $00
   db $00, $00, $00, $02
   db $00, $00, $00, $00
   db $00, $00, $00, $00
diff --git a/Sprites/Bosses/kydrog_boss.asm b/Sprites/Bosses/kydrog_boss.asm
index 1749568..6663dd2 100644
--- a/Sprites/Bosses/kydrog_boss.asm
+++ b/Sprites/Bosses/kydrog_boss.asm
@@ -64,7 +64,7 @@ Sprite_KydrogBoss_Long:
 
 Sprite_KydrogBoss_CheckIfDead:
 {
-  LDA $0D80, X : CMP.b #$09 : BEQ .not_dead
+  LDA.w SprAction, X : CMP.b #$09 : BEQ .not_dead
     ; If health is negative, set back to zero
     LDA $0E50, X : CMP.b #$C3 : BCC .health_not_negative
       LDA.b #$00 : STA $0E50, X
@@ -73,7 +73,7 @@ Sprite_KydrogBoss_CheckIfDead:
     LDA $0E50, X : BNE .not_dead
       PHX 
       LDA.b #$04 : STA $0DD0, X ;kill sprite boss style
-      LDA.b #$09 : STA $0D80, X ;go to KydrogBoss_Death stage
+      LDA.b #$09 : STA.w SprAction, X ;go to KydrogBoss_Death stage
       STZ.w $0D90,X
 
       LDA.b #$E0 : STA.w $0DF0,X
@@ -501,7 +501,7 @@ CheckForNextPhase:
     LDA SprHealth,X : CMP.b #$20 : BCC .phase_three
     LDA !KydrogPhase : CMP.b #$01 : BEQ .return
     LDA #$80 : STA $0E50, X
-    LDA #$01 : STA $0D80, X
+    LDA #$01 : STA SprAction, X
     STA !KydrogPhase
     INC.w SprFlash, X
     RTS
@@ -510,13 +510,13 @@ CheckForNextPhase:
     LDA SprHealth,X : CMP.b #$20 : BCC .phase_four
     LDA !KydrogPhase : CMP.b #$02 : BEQ .return
     LDA #$80 : STA $0E50, X
-    LDA #$02 : STA $0D80, X
+    LDA #$02 : STA SprAction, X
     STA !KydrogPhase
     RTS
 
   .phase_four
 
-    LDA #$03 : STA $0D80, X
+    LDA #$03 : STA SprAction, X
     STA !KydrogPhase
   .return
     RTS
diff --git a/Sprites/NPCs/korok.asm b/Sprites/NPCs/korok.asm
index bc749a5..078498c 100644
--- 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
 }
diff --git a/Sprites/NPCs/maku_tree.asm b/Sprites/NPCs/maku_tree.asm
index 62c4a8f..0f603e0 100644
--- 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
   }