cleanup mermaid/maple

Sprites/NPCs/mermaid.asm

@@ -33,6 +33,7 @@
 
 
 Sprite_Mermaid_Long:
+{
   PHB : PHK : PLB
 
   LDA.w SprMiscE, X : BEQ .MermaidDraw
@@ -49,6 +50,7 @@ JSR Sprite_Mermaid_Main ; Call the main sprite code
   .SpriteIsNotActive
   PLB ; Get back the databank we stored previously
   RTL ; Go back to original code
+}
 
 
 Sprite_Mermaid_Prep:
@@ -67,17 +69,18 @@ Sprite_Mermaid_Prep:
 
 
 Sprite_Mermaid_Main:
-LDA.w SprAction, X; Load the SprAction
-JSL UseImplicitRegIndexedLocalJumpTable; Goto the SprAction we are currently in
+{
+  LDA.w SprAction, X
+  JSL UseImplicitRegIndexedLocalJumpTable
   dw MermaidWait
   dw MermaidDive
   dw MermaidSwim
   dw MapleIdle
 
-
   MermaidWait:
   {
     %PlayAnimation(0,0, 20)
+    JSL Sprite_PlayerCantPassThrough
     
     LDA.w SprTimerA, X : BNE +
     LDA.b #$20 : STA.w SprTimerA, X
@@ -101,7 +104,6 @@ RTS
 
   MermaidSwim:
   {
-
     %PlayAnimation(3,3, 20)
     JSL Sprite_Move
 
@@ -110,7 +112,6 @@ LDA.w SprTimerA, X : BEQ +
     +
 
     RTS
-
   }
 
   MapleIdle:
@@ -119,6 +120,7 @@ MapleIdle:
     JSL Sprite_PlayerCantPassThrough
     RTS
   }
+}
 
 Sprite_Mermaid_Draw:
 {