Sprite housekeeping

2024-11-21 21:29:50 -05:00
parent d4843293f2
commit daf8d4c39d
3 changed files with 107 additions and 133 deletions
--- a/Sprites/Enemies/booki.asm
+++ b/Sprites/Enemies/booki.asm
@@ -11,7 +11,7 @@
 !DeathAnimation     = 00  ; 00 = normal death, 01 = no death animation
 !ImperviousAll      = 00  ; 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 
+!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
@@ -37,17 +37,13 @@
 Sprite_Booki_Long:
 {
  PHB : PHK : PLB
-
-  JSR Sprite_Booki_Draw ; Call the draw code
+  JSR Sprite_Booki_Draw
  JSL Sprite_DrawShadow
-  JSL Sprite_CheckActive   ; Check if game is not paused
-  BCC .SpriteIsNotActive   ; Skip Main code is sprite is innactive
-
-  JSR Sprite_Booki_Main ; Call the main sprite code
-
+  JSL Sprite_CheckActive : BCC .SpriteIsNotActive
+    JSR Sprite_Booki_Main
  .SpriteIsNotActive
-  PLB ; Get back the databank we stored previously
-  RTL ; Go back to original code
+  PLB
+  RTL
 }

 ; =========================================================
@@ -55,11 +51,9 @@ Sprite_Booki_Long:
 Sprite_Booki_Prep:
 {
  PHB : PHK : PLB
-    
  LDA.l SWORD : DEC A : TAY
  LDA.w .health, Y : STA.w SprHealth, X
  STZ.w SprMiscB, X
-
  PLB
  RTL

@@ -153,7 +147,7 @@ Sprite_Booki_Move:

    PHX
    JSL Sprite_DirectionToFacePlayer
-    
+
    LDA.b $0E : CMP.b #$1A : BCS .NotTooClose
    LDA.b $0F : CMP.b #$1A : BCS .NotTooClose
      LDA.b #$01 : STA.w SprMiscB, X
@@ -169,7 +163,7 @@ Sprite_Booki_Move:
  {
    JSL GetRandomInt : AND.b #$04
    JSL Sprite_FloatAwayFromPlayer
-    
+
    PHX
    JSL Sprite_DirectionToFacePlayer
    LDA.b $0E : CMP.b #$1B : BCC .NotTooClose
@@ -193,7 +187,7 @@ Sprite_Booki_Draw:

  LDA.w SprGfx, X : CLC : ADC.w SprFrame, X : TAY;Animation Frame
  LDA .start_index, Y : STA $06
-  
+
  LDA.w SprFlash, X : STA $08
  LDA.w SprMiscC, X : STA $09

@@ -203,17 +197,17 @@ Sprite_Booki_Draw:
  .nextTile

  PHX ; Save current Tile Index?
-      
+
  TXA : CLC : ADC $06 ; Add Animation Index Offset

  PHA ; Keep the value with animation index offset?

-  ASL A : TAX 
+  ASL A : TAX

  REP #$20

  LDA $00 : STA ($90), Y
-  AND.w #$0100 : STA $0E 
+  AND.w #$0100 : STA $0E
  INY
  LDA $02 : STA ($90), Y
  CLC : ADC #$0010 : CMP.w #$0100
@@ -236,14 +230,14 @@ Sprite_Booki_Draw:
  .Prop
  ORA $08 : STA ($90), Y

-  PHY 
-      
+  PHY
+
  TYA : LSR #2 : TAY
-      
+
  LDA.b #$02 : ORA $0F : STA ($92), Y ; store size in oam buffer
-      
+
  PLY : INY
-      
+
  PLX : DEX : BPL .nextTile

  PLX
@@ -268,4 +262,4 @@ Sprite_Booki_Draw:
  db $2C
  db $0C
  db $0E
-}
+}
--- a/Sprites/Enemies/poltergeist.asm
+++ b/Sprites/Enemies/poltergeist.asm
@@ -34,97 +34,82 @@

 Sprite_Poltergeist_Long:
 {
-    PHB : PHK : PLB
-
-    JSR Sprite_Poltergeist_Draw ; Call the draw code
-
-    LDA $E0 : CMP #$F0 : BNE .onscreen
-        LDA.w SprMiscA, X : BEQ .SpriteIsNotActive
-            STZ.w SprState, X ; kill the sprite if offscreen and activated
-
-            .onscreen
-
-            JSL Sprite_CheckActive   ; Check if game is not paused
-            BCC .SpriteIsNotActive   ; Skip Main code is sprite is innactive
-                JSR Sprite_Poltergeist_Main ; Call the main sprite code
-
-    .SpriteIsNotActive
-
-    PLB ; Get back the databank we stored previously
-    RTL ; Go back to original code
+  PHB : PHK : PLB
+  JSR Sprite_Poltergeist_Draw
+  LDA $E0 : CMP #$F0 : BNE .onscreen
+    LDA.w SprMiscA, X : BEQ .SpriteIsNotActive
+      STZ.w SprState, X ; kill the sprite if offscreen and activated
+  .onscreen
+  JSL Sprite_CheckActive : BCC .SpriteIsNotActive
+    JSR Sprite_Poltergeist_Main
+  .SpriteIsNotActive
+  PLB
+  RTL
 }

 ; =========================================================

 Sprite_Poltergeist_Prep:
 {
-    PHB : PHK : PLB
+  PHB : PHK : PLB

-    LDA #$00 : STA.w SprHitbox, X ; Persist
-    LDA #$00 : STA.w SprDefl, X ; Sprite persist in dungeon
-    LDA #$02 : STA.w SprNbrOAM, X ;1 tile by default
-    LDA #$01 : STA.w SprAction, X ; by default it's a chair
+  LDA #$00 : STA.w SprHitbox, X ; Persist
+  LDA #$00 : STA.w SprDefl, X ; Sprite persist in dungeon
+  LDA #$02 : STA.w SprNbrOAM, X ;1 tile by default
+  LDA #$01 : STA.w SprAction, X ; by default it's a chair

-    LDA.w SprSubtype, X : CMP #$10 : BNE .notPictureFrame
-        STZ.w SprMiscA, X
-        STZ.w SprAction, X
-        JMP .done
+  LDA.w SprSubtype, X : CMP #$10 : BNE .notPictureFrame
+      STZ.w SprMiscA, X
+      STZ.w SprAction, X
+      JMP .done
+  .notPictureFrame

-    .notPictureFrame
+  CMP #$11 : BNE .notAxe
+      LDA #$07 : STA.w SprFrame, X
+      LDA #$02 : STA.w SprAction, X
+      LDA #$04 : STA.w SprNbrOAM, X
+      BRA .done
+  .notAxe

-    CMP #$11 : BNE .notAxe
-        LDA #$07 : STA.w SprFrame, X
-        LDA #$02 : STA.w SprAction, X
-        LDA #$04 : STA.w SprNbrOAM, X
-        BRA .done
+  CMP #$12 : BNE .notKnife
+      LDA #15 : STA.w SprFrame, X
+      LDA #$02 : STA.w SprAction, X
+      BRA .done
+  .notKnife

-    .notAxe
+  CMP #$13 : BNE .notFork
+      LDA #37 : STA.w SprFrame, X
+      LDA #$02 : STA.w SprAction, X
+      BRA .done
+  .notFork

-    CMP #$12 : BNE .notKnife
-        LDA #15 : STA.w SprFrame, X
-        LDA #$02 : STA.w SprAction, X
-        BRA .done
+  CMP #$14 : BNE .notBed
+      LDA #5 : STA.w SprFrame, X
+      LDA #$01 : STA.w SprAction, X
+      LDA #$06 : STA.w SprNbrOAM, X
+      BRA .done
+  .notBed

-    .notKnife
+  CMP #$15 : BNE .notDoor
+      LDA #36 : STA.w SprFrame, X
+      LDA #$01 : STA.w SprAction, X
+      LDA #$04 : STA.w SprNbrOAM, X
+      LDA.w SprY, X : SEC : SBC #$0C : STA.w SprY, X
+      LDA.w SprX, X : CLC : ADC #$08 : STA.w SprX, X
+      BRA .done
+  .notDoor

-    CMP #$13 : BNE .notFork
-        LDA #37 : STA.w SprFrame, X
-        LDA #$02 : STA.w SprAction, X
-        BRA .done
+  LDA.w SprSubtype, X : AND #$08 : BNE .secondset ;2nd set
+      LDA.w SprSubtype, X : CLC : ADC #23 : STA.w SprFrame, X
+      BRA .done
+  .secondset

-    .notFork
+  LDA.w SprSubtype, X : AND #$07 : CLC : ADC #30 : STA.w SprFrame, X
+  LDA.w SprSubtype, X

-    CMP #$14 : BNE .notBed
-        LDA #5 : STA.w SprFrame, X
-        LDA #$01 : STA.w SprAction, X
-        LDA #$06 : STA.w SprNbrOAM, X
-        BRA .done
-
-    .notBed
-
-    CMP #$15 : BNE .notDoor
-        LDA #36 : STA.w SprFrame, X
-        LDA #$01 : STA.w SprAction, X
-        LDA #$04 : STA.w SprNbrOAM, X
-        LDA.w SprY, X : SEC : SBC #$0C : STA.w SprY, X
-        LDA.w SprX, X : CLC : ADC #$08 : STA.w SprX, X
-        BRA .done
-
-    .notDoor
-
-    LDA.w SprSubtype, X : AND #$08 : BNE .secondset ;2nd set
-        LDA.w SprSubtype, X : CLC : ADC #23 : STA.w SprFrame, X
-        BRA .done
-
-    .secondset
-
-    LDA.w SprSubtype, X : AND #$07 : CLC : ADC #30 : STA.w SprFrame, X
-    LDA.w SprSubtype, X
-
-    .done
-
-    PLB
-    RTL
+  .done
+  PLB
+  RTL
 }

 ; Subtype:
@@ -153,12 +138,12 @@ Sprite_Poltergeist_Prep:

 Sprite_Poltergeist_Main:
 {
-    LDA.w SprAction, X : JSL UseImplicitRegIndexedLocalJumpTable
+  LDA.w SprAction, X : JSL UseImplicitRegIndexedLocalJumpTable

-    dw PictureFrame
-    dw Chair
-    dw Axe
-    dw SpawnerTester
+  dw PictureFrame
+  dw Chair
+  dw Axe
+  dw SpawnerTester
 }

 PictureFrame:
@@ -392,23 +377,20 @@ Axe:

 PlayAxe:
 {
-    %PlayAnimation(7, 14, 6)
-
-    RTS
+  %PlayAnimation(7, 14, 6)
+  RTS
 }

 PlayFork:
 {
-    %PlayAnimation(37, 44, 6)
-
-    RTS
+  %PlayAnimation(37, 44, 6)
+  RTS
 }

 PlayKnife:
 {
-    %PlayAnimation(15, 22, 6)
-
-    RTS
+  %PlayAnimation(15, 22, 6)
+  RTS
 }

 SpawnerTester: