From 1dbaf028ca983c97882b0cb3423a4c98b497615e Mon Sep 17 00:00:00 2001
From: scawful <justin.scofield@outlook.com>
Date: Sat, 21 Dec 2024 16:54:37 -0500
Subject: [PATCH] Add maple.asm

---
 Sprites/NPCs/maple.asm   | 28 ++++++++++++++++++++++++++++
 Sprites/NPCs/mermaid.asm | 29 -----------------------------
 Sprites/all_sprites.asm  |  2 ++
 3 files changed, 30 insertions(+), 29 deletions(-)
 create mode 100644 Sprites/NPCs/maple.asm

diff --git a/Sprites/NPCs/maple.asm b/Sprites/NPCs/maple.asm
new file mode 100644
index 0000000..bf084f1
--- /dev/null
+++ b/Sprites/NPCs/maple.asm
@@ -0,0 +1,28 @@
+MapleHandler:
+{
+  LDA.w SprAction, X
+  JSL JumpTableLocal
+
+  dw Maple_Idle
+  dw Maple_HandleDreams
+
+  Maple_Idle:
+  {
+    %PlayAnimation(0,1,16)
+    JSL Sprite_PlayerCantPassThrough
+    %ShowSolicitedMessage($01B3) : BCC +
+      INC.w SprAction, X
+    +
+    RTS
+  }
+
+  Maple_HandleDreams:
+  {
+    LDA.l $7EF351 : BEQ +
+      LDA.b #$02 : STA.l $7EF351
+      LDA.b #$1B : STA.w $012F
+      STZ.w SprAction, X
+    +
+    RTS
+  }
+}
diff --git a/Sprites/NPCs/mermaid.asm b/Sprites/NPCs/mermaid.asm
index f881da4..e6957aa 100644
--- a/Sprites/NPCs/mermaid.asm
+++ b/Sprites/NPCs/mermaid.asm
@@ -31,7 +31,6 @@
 
 %Set_Sprite_Properties(Sprite_Mermaid_Prep, Sprite_Mermaid_Long)
 
-
 Sprite_Mermaid_Long:
 {
   PHB : PHK : PLB
@@ -139,34 +138,6 @@ Sprite_Mermaid_Main:
     }
   }
 
-  MapleHandler:
-  {
-    LDA.w SprAction, X
-    JSL JumpTableLocal
-
-    dw Maple_Idle
-    dw Maple_HandleDreams
-
-    Maple_Idle:
-    {
-      %PlayAnimation(0,1,16)
-      %ShowSolicitedMessage($01B3) : BCC +
-        INC.w SprAction, X
-      +
-      RTS
-    }
-
-    Maple_HandleDreams:
-    {
-      LDA.l $7EF351 : BEQ +
-        LDA.b #$02 : STA.l $7EF351
-        LDA.b #$1B : STA.w $012F
-        STZ.w SprAction, X
-      +
-      RTS
-    }
-  }
-
   LibrarianHandler:
   {
     LDA.w SprAction, X
diff --git a/Sprites/all_sprites.asm b/Sprites/all_sprites.asm
index 898543f..2ad8b9b 100644
--- a/Sprites/all_sprites.asm
+++ b/Sprites/all_sprites.asm
@@ -35,6 +35,8 @@ Sprite_Maple     = $F0 ; Subtype 1
 Sprite_Librarian = $F0 ; Subtype 2
 incsrc "Sprites/NPCs/mermaid.asm"
 print  "End of mermaid.asm                ", pc
+incsrc "Sprites/NPCs/maple.asm"
+print  "End of maple.asm                  ", pc
 
 Sprite_Manhandla = $88
 incsrc "Sprites/Bosses/manhandla.asm"