cleanup mermaid/maple

Sprites/NPCs/mermaid.asm

@@ -33,22 +33,24 @@
 
 
 Sprite_Mermaid_Long:
-PHB : PHK : PLB
+{
+  PHB : PHK : PLB
 
-LDA.w SprMiscE, X : BEQ .MermaidDraw
+  LDA.w SprMiscE, X : BEQ .MermaidDraw
-  JSR Sprite_Maple_Draw
+    JSR Sprite_Maple_Draw
-  JMP .Continue
+    JMP .Continue
-.MermaidDraw
+  .MermaidDraw
-JSR Sprite_Mermaid_Draw ; Call the draw code
+  JSR Sprite_Mermaid_Draw ; Call the draw code
-.Continue
+  .Continue
-JSL Sprite_CheckActive   ; Check if game is not paused
+  JSL Sprite_CheckActive   ; Check if game is not paused
-BCC .SpriteIsNotActive   ; Skip Main code is sprite is innactive
+  BCC .SpriteIsNotActive   ; Skip Main code is sprite is innactive
 
-JSR Sprite_Mermaid_Main ; Call the main sprite code
+  JSR Sprite_Mermaid_Main ; Call the main sprite code
 
-.SpriteIsNotActive
+  .SpriteIsNotActive
-PLB ; Get back the databank we stored previously
+  PLB ; Get back the databank we stored previously
-RTL ; Go back to original code
+  RTL ; Go back to original code
+}
 
 
 Sprite_Mermaid_Prep:
@@ -67,57 +69,57 @@ Sprite_Mermaid_Prep:
 
 
 Sprite_Mermaid_Main:
-LDA.w SprAction, X; Load the SprAction
-JSL UseImplicitRegIndexedLocalJumpTable; Goto the SprAction we are currently in
-dw MermaidWait
-dw MermaidDive
-dw MermaidSwim
-dw MapleIdle
-
-
-MermaidWait:
 {
-%PlayAnimation(0,0, 20)
+  LDA.w SprAction, X
+  JSL UseImplicitRegIndexedLocalJumpTable
+  dw MermaidWait
+  dw MermaidDive
+  dw MermaidSwim
+  dw MapleIdle
 
-LDA.w SprTimerA, X : BNE +
+  MermaidWait:
-LDA.b #$20 : STA.w SprTimerA, X
+  {
-INC.w SprAction, X
+    %PlayAnimation(0,0, 20)
-+
+    JSL Sprite_PlayerCantPassThrough
-RTS
+    
-}
+    LDA.w SprTimerA, X : BNE +
+    LDA.b #$20 : STA.w SprTimerA, X
+    INC.w SprAction, X
+    +
+    RTS
+  }
 
-MermaidDive:
+  MermaidDive:
-{
+  {
-%PlayAnimation(1,2, 14)
+    %PlayAnimation(1,2, 14)
 
-LDA.w SprTimerA, X : BNE +
+    LDA.w SprTimerA, X : BNE +
-INC.w SprAction, X
+    INC.w SprAction, X
-LDA.b #-10 : STA.w SprXSpeed, X
+    LDA.b #-10 : STA.w SprXSpeed, X
-LDA.b #$02 : STA.w SprTimerA, X
+    LDA.b #$02 : STA.w SprTimerA, X
-+
+    +
 
-RTS
+    RTS
-}
+  }
 
-MermaidSwim:
+  MermaidSwim:
-{
+  {
+    %PlayAnimation(3,3, 20)
+    JSL Sprite_Move
 
-%PlayAnimation(3,3, 20)
+    LDA.w SprTimerA, X : BEQ +
-JSL Sprite_Move
+      JSR SpawnSplash
+    +
 
-LDA.w SprTimerA, X : BEQ +
+    RTS
-  JSR SpawnSplash
+  }
-+
 
-RTS
+  MapleIdle:
-
+  {
-}
+    %PlayAnimation(0,1,16)
-
+    JSL Sprite_PlayerCantPassThrough
-MapleIdle:
+    RTS
-{
+  }
-  %PlayAnimation(0,1,16)
-  JSL Sprite_PlayerCantPassThrough
-  RTS
 }
 
 Sprite_Mermaid_Draw: