From 5e97ef3c42803daf786d28f05a48c257331bf7e8 Mon Sep 17 00:00:00 2001
From: scawful <justin.scofield@outlook.com>
Date: Thu, 13 Jun 2024 12:00:31 -0400
Subject: [PATCH] add deku butler and deku princess subtypes

---
 Sprites/NPCs/deku_scrub.asm | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/Sprites/NPCs/deku_scrub.asm b/Sprites/NPCs/deku_scrub.asm
index c74cefd..4782b31 100644
--- a/Sprites/NPCs/deku_scrub.asm
+++ b/Sprites/NPCs/deku_scrub.asm
@@ -52,6 +52,9 @@ Sprite_DekuScrub_Prep:
 {
   PHB : PHK : PLB
 
+  LDA.w SprSubtype, X : CMP.b #$01 : BEQ .DekuButler
+                        CMP.b #$02 : BEQ .DekuPrincess
+
   LDA.l $7EF301
   BEQ   .PlayIntro
     LDA.b #$04 : STA.w SprAction, X
@@ -59,14 +62,23 @@ Sprite_DekuScrub_Prep:
 
   PLB
   RTL
+
+  .DekuButler
+  LDA.b #$05 : STA.w SprAction, X
+  PLB
+  RTL
+  .DekuPrincess
+  LDA.b #$06 : STA.w SprAction, X
+  PLB
+  RTL
 }
 
 ; =============================================================================
 
 Sprite_DekuScrub_Main:
 {
-  LDA.w SprAction, X                        ; Load the SprAction
-  JSL   UseImplicitRegIndexedLocalJumpTable ; Goto the SprAction we are currently in
+  LDA.w SprAction, X                       
+  JSL   UseImplicitRegIndexedLocalJumpTable
 
   dw EstadoInactivo
   dw QuiereCuracion
@@ -118,8 +130,8 @@ Sprite_DekuScrub_Main:
 
     LDY   #$11 : STZ $02E9     ; Give the Deku Mask
     JSL   Link_ReceiveItem
-    LDA   #$01 : STA.l $7EF301
-    LDA.b #$00 : STA $0DD0, X
+    LDA.b #$01 : STA.l $7EF301
+    %GotoAction(4)
   +
     RTS
   }