Sprite housekeeping

Sprites/all_sprites.asm

@@ -56,14 +56,17 @@ incsrc "Sprites/minecart.asm"
 print  "End of minecart.asm               ",  pc
 
 incsrc "Sprites/twinrova.asm"
+print  "End of twinrova.asm               ",  pc
 
 incsrc "Sprites/portal_sprite.asm"
+print  "End of portal_sprite.asm          ",  pc
 
 incsrc "Sprites/impa.asm"
 print  "End of impa.asm                   ",  pc
 
+incsrc "Sprites/poltergeist.asm"
+print  "End of poltergeist.asm            ",  pc
 
 incsrc "Sprites/bug_net_kid.asm"
 
-
 warnpc $2B8000

Sprites/bug_net_kid.asm

@@ -1,3 +1,5 @@
+pushpc
+
 org $07F4D0
 Sprite_CheckIfPlayerPreoccupied:
 
@@ -54,3 +56,5 @@ BugNetKid_GrantBugNet:
     
     RTS
 }
+
+pullpc

Sprites/impa.asm

@@ -1,5 +1,6 @@
+pushpc
 ; Impa Fix
 org $05EBCF
   LDA $7EF359 : CMP.b #$04
 
-  
+pullpc

Sprites/minecart.asm

@@ -9,12 +9,12 @@
 !Health             = 00  ; Number of Health the sprite have
 !Damage             = 00  ; (08 is a whole heart), 04 is half heart
 !DeathAnimation     = 00  ; 00 = normal death, 01 = no death animation
-!ImperviousAll      = 00             ; 00 = Can be attack, 01 = attack will clink on it
+!ImperviousAll      = 01  ; 00 = Can be attack, 01 = attack will clink on it
 !SmallShadow        = 00  ; 01 = small shadow, 00 = no shadow
 !Shadow             = 00  ; 00 = don't draw shadow, 01 = draw a shadow 
 !Palette            = 00  ; Unused in this template (can be 0 to 7)
 !Hitbox             = 00  ; 00 to 31, can be viewed in sprite draw tool
-!Persist            = 00             ; 01 = your sprite continue to live offscreen
+!Persist            = 01  ; 01 = your sprite continue to live offscreen
 !Statis             = 00  ; 00 = is sprite is alive?, (kill all enemies room)
 !CollisionLayer     = 00  ; 01 = will check both layer for collision
 !CanFall            = 00  ; 01 sprite can fall in hole, 01 = can't fall
@@ -36,7 +36,6 @@
 
 ;==============================================================================
 
-print               "Minecart: ", pc
 Sprite_Minecart_Long:
 {
   PHB : PHK : PLB
@@ -55,6 +54,16 @@ Sprite_Minecart_Long:
 
 ;==============================================================================
 
+; $0DE0[0x10] - (Sprite) ;functions
+;     udlr 
+;     0 - up
+;     1 - down
+;     2 - left
+;     3 - right
+
+!MinecartSpeed     = 20
+!MinecartDirection = $012B
+
 Sprite_Minecart_Prep:
 {
   PHB : PHK : PLB
@@ -76,6 +85,7 @@ Sprite_Minecart_Prep:
                       CMP.b #$03 : BEQ .west
 
   .north
+    LDA #$01 : STA !MinecartDirection
     %GotoAction(1) ; Minecart_MoveNorth
     JMP .done
   .east
@@ -95,6 +105,8 @@ Sprite_Minecart_Prep:
 ;==============================================================================
 
 macro HandlePlayerCamera()
+    LDA $22 : SEC : SBC $3F : STA $31
+    LDA $20 : SEC : SBC $3E : STA $30
     PHX 
     JSL $07E6A6                       ; Link_HandleMovingAnimation_FullLongEntry
     JSL $07F42F                       ; HandleIndoorCameraAndDoors_Long
@@ -102,9 +114,6 @@ macro HandlePlayerCamera()
     PLX 
 endmacro
 
-!MinecartSpeed     = 20
-!MinecartDirection = $012B
-
 Sprite_Minecart_Main:
 {
   LDA.w SprAction, X                        ; Load the SprAction
@@ -155,10 +164,12 @@ Sprite_Minecart_Main:
     LDA $0FDA : SEC : SBC #$0B : STA $20 ; Adjust player pos 
     
     LDA !MinecartDirection : BNE .opposite_direction
+      LDA #$01 : STA $0DE0, X
       %GotoAction(4)  ; Minecart_MoveSouth
       RTS
       
     .opposite_direction
+      LDA #$00 : STA $0DE0, X
       %GotoAction(2)  ; Minecart_MoveNorth
     .not_on_platform
     .not_ready
@@ -171,17 +182,15 @@ Sprite_Minecart_Main:
   {
     %PlayAnimation(2,3,8)
     LDA.b #-!MinecartSpeed : STA SprYSpeed, X
-    LDA   #$35 : STA $012E
-
     JSL   Sprite_MoveVert
-    LDA SprY, X : SEC : SBC #$04 : STA $20
+
-    LDA $0FD8 : CLC : ADC #$02 : STA $22   ; X 
+    ; LDA SprY, X : SEC : SBC #$04 : STA $20
+    ; LDA $0FD8 : CLC : ADC #$02 : STA $22   ; X 
+
     JSR DragPlayer
-    
     %HandlePlayerCamera()
-    
     JSR HandleTileDirections
-
+    LDA #$35 : STA $012E
 
     RTS
   }
@@ -191,21 +200,17 @@ Sprite_Minecart_Main:
   Minecart_MoveEast:
   {
     %PlayAnimation(0,1,8)
-    %HandlePlayerCamera()
     
     LDA.b #!MinecartSpeed : STA $0D50, X
     JSL   Sprite_MoveHoriz
-    LDA   #$35 : STA $012E
     
     ; Make Link move with the minecart 
-    LDA SprX, X : STA $22
+    ; LDA SprX, X : STA $22
     
     JSR DragPlayer
-
     %HandlePlayerCamera()
-  
     JSR HandleTileDirections
-
+    LDA #$35 : STA $012E
 
     RTS
   }
@@ -217,14 +222,15 @@ Sprite_Minecart_Main:
     %PlayAnimation(2,3,8)
 
     LDA.b #!MinecartSpeed : STA SprYSpeed, X
-
     JSL   Sprite_MoveVert
-    LDA SprY, X : SEC : SBC #$04 : STA $20
-    LDA $0FD8 : CLC : ADC #$02 : STA $22   ; X 
 
+    ; LDA SprY, X : SEC : SBC #$04 : STA $20
+    ; LDA $0FD8 : CLC : ADC #$02 : STA $22   ; X 
+
+    JSR DragPlayer
     %HandlePlayerCamera()
-
     JSR HandleTileDirections
+    LDA #$35 : STA $012E
 
     LDA $40 : SEC : SBC.b #$FF : STA $40
     LDA $68 : SEC : SBC.b #$FF : STA $68
@@ -240,29 +246,14 @@ Sprite_Minecart_Main:
     %PlayAnimation(0,1,8)
     LDA.b #-!MinecartSpeed : STA $0D50, X
     JSL   Sprite_MoveHoriz
-    LDA   #$35 : STA $012E
     
     ; Make Link move with the minecart 
-    LDA SprX, X : STA $22
+    ; LDA SprX, X : STA $22
 
     JSR DragPlayer
-
-    JSR HandleTileDirections
-
-    ; ; Set Minecart sprite coords to look for tile attributes
-    ; LDA.w SprY,  X : CLC : ADC.b #$04 : STA.b $00
-    ; LDA.w SprYH, X : STA.b $01
-    
-    ; LDA.w SprX,  X : STA.b $02
-    ; LDA.w SprXH, X : STA.b $03
-    
-    ; LDA.b #$00 : JSL Sprite_GetTileAttr
-    
-    ; ; Check for bottom left corner tile 
-    ; LDA $0FA5 : CMP.b #$B1 : BNE .continue
-    
-
     %HandlePlayerCamera()
+    JSR HandleTileDirections
+    LDA #$35 : STA $012E
 
     RTS
   }
@@ -297,7 +288,6 @@ macro SwapSubtype()
     STA SprSubtype, X ; Store the new direction subtype
 endmacro
 
-print pc
 HandleTileDirections:
 {
     ; Setup Minecart position to look for tile IDs
@@ -400,7 +390,6 @@ HandleTileDirections:
     }
         
   .check_direction
-        print pc
         LDA SprSubtype, X
         BNE .not_zero
         
@@ -425,18 +414,22 @@ HandleTileDirections:
 
     .move_north
         LDA #$00 : STA SprSubtype, X
+        STA $0DE0,                 X
         %GotoAction(2) ; Minecart_MoveNorth
         RTS
     .move_east
         LDA #$01 : STA SprSubtype, X
+        LDA #$03 : STA $0DE0,      X
         %GotoAction(3) ; Minecart_MoveEast
         RTS
     .move_south
         LDA #$02 : STA SprSubtype, X
+        LDA #$01 : STA $0DE0,      X
         %GotoAction(4) ; Minecart_MoveSouth
         RTS
     .move_west
         LDA #$03 : STA SprSubtype, X
+        LDA #$02 : STA $0DE0,      X
         %GotoAction(5) ; Minecart_MoveWest
     .done
         RTS
@@ -468,7 +461,7 @@ DragPlayer:
   .SomariaPlatform_DragLink
     REP #$20
     
-    LDA $0FD8 : SEC : SBC.w #$0008 : CMP $22 : BEQ .x_done
+    LDA $0FD8 : SEC : SBC.w #$0002 : CMP $22 : BEQ .x_done
                                           BPL .x_too_low
     
     DEC $0B7C

Sprites/portal_sprite.asm

@@ -3,7 +3,7 @@
 ; Portal Sprite
 ; =========================================================
 
-!SPRID              = $B6 ; The sprite ID you are overwriting (HEX)
+!SPRID              = $B8 ; The sprite ID you are overwriting (HEX)
 !NbrTiles           = 01  ; Number of tiles used in a frame
 !Harmless           = 00  ; 00 = Sprite is Harmful,  01 = Sprite is Harmless
 !HVelocity          = 00  ; Is your sprite going super fast? put 01 if it is
@@ -60,6 +60,7 @@ Sprite_Portal_Prep:
   PHB : PHK : PLB
   
   ; Persist outside of camera  
+  LDA #$00 : STA $0CAA, X 
   LDA SprHitbox, X : AND.b #$20 : STA SprHitbox, X
 
   PLB

Sprites/twinrova.asm

@@ -703,7 +703,6 @@ db $02, $02, $02, $02
 db $02, $02, $02, $02
 }
 
-print "TWINROVA ============ ", pc
 ApplyTwinrovaGraphics:
 {
   PHX