Portal Rod Portal Sprite cleanup

Sprites/Objects/portal_sprite.asm

@@ -1,4 +1,3 @@
-
 ; =========================================================
 ; Portal Sprite
 ; =========================================================
@@ -39,16 +38,12 @@
 Sprite_Portal_Long:
 {
   PHB : PHK : PLB
-
-  JSR Sprite_Portal_Draw ; Call the draw code
-  JSL Sprite_CheckActive ; Check if game is not paused
-  BCC .SpriteIsNotActive ; Skip Main code is sprite is innactive
-
-  JSR Sprite_Portal_Main ; Call the main sprite code
-
-.SpriteIsNotActive
-  PLB ; Get back the databank we stored previously
-  RTL ; Go back to original code
+  JSR Sprite_Portal_Draw
+  JSL Sprite_CheckActive : BCC .SpriteIsNotActive
+    JSR Sprite_Portal_Main
+  .SpriteIsNotActive
+  PLB
+  RTL
 
 }
 
@@ -58,13 +53,11 @@ Sprite_Portal_Long:
 Sprite_Portal_Prep:
 {
   PHB : PHK : PLB
-  
   ; Persist outside of camera
   LDA #$00 : STA.w SprDefl, X
   LDA.w SprHitbox, X : AND.b #$C0 : STA.w SprHitbox, X
   STZ.w SprTileDie, X
   LDA.b #$FF : STA.w SprBulletproof, X
-
   PLB
   RTL
 }
@@ -115,7 +108,6 @@ Sprite_Portal_Main:
       LDA.w SprY, X : STA.w OrangePortal_X
       LDA.w SprX, X : STA.w OrangePortal_Y
       LDA.b #$01 : STA.w SprSubtype, X
-      
       %GotoAction(2)
       RTS
     .BluePortal
@@ -142,7 +134,6 @@ Sprite_Portal_Main:
     LDA.w SprTimerD, X : BNE .NoOverlap
       JSL Link_SetupHitBox
       JSL $0683EA          ; Sprite_SetupHitbox_long
-      
       JSL CheckIfHitBoxesOverlap : BCC .NoOverlap
       CLC
 
@@ -174,14 +165,12 @@ Sprite_Portal_Main:
     ; JSL $01FF28 ; Player_CacheStatePriorToHandler
 
     LDA $1B : BEQ .outdoors
-    %GotoAction(4) ; OrangePortal_WarpDungeon
-    
-    .NoOverlap
-    RTS
+      %GotoAction(4) ; OrangePortal_WarpDungeon
+      .NoOverlap
+      RTS
 
     .outdoors
     %GotoAction(6) ; OrangePortal_WarpOverworld
-
     RTS
   }
 
@@ -237,7 +226,6 @@ Sprite_Portal_Main:
     STA.w OrangePortal_X
     PLX
 
-
     LDA #$14 : STA $11
     %GotoAction(2) ; Return to OrangePortal
     RTS
@@ -259,10 +247,8 @@ Sprite_Portal_Main:
     LDA #$40 : STA.w SprTimerD, X
 
     PLX
-
     LDA #$01 : STA $5D
-   ;LDA #$2A : STA $11
-
+    ;LDA #$2A : STA $11
     %GotoAction(1) ; Return to BluePortal
     RTS
   }
@@ -424,4 +410,3 @@ Sprite_Portal_Draw:
   db $22
   db $62
 }
-