add far left and far right head anims to kydreeok head

Sprites/Bosses/kydreeok_head.asm

@@ -14,7 +14,7 @@
 !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
+!Hitbox             = 09  ; 00 to 31, can be viewed in sprite draw tool
 !Persist            = 00  ; 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
@@ -38,7 +38,7 @@ Sprite_KydreeokHead_Long:
 {
     PHB : PHK : PLB
 
-    LDA SprAction, X : CMP #$03 : BEQ .no_head
+    LDA SprAction, X : CMP #$05 : BEQ .no_head
       JSR Sprite_KydreeokHead_Draw
     .no_head
 
@@ -58,6 +58,7 @@ Sprite_KydreeokHead_Prep:
 
   LDA.b #$C0 : STA.w SprHealth, X
   LDA.b #$09 : STA.w SprBump,   X ; bump damage type 
+  STZ.w SprMiscE, X
 
   PLB
   RTL
@@ -77,7 +78,9 @@ Sprite_KydreeokHead_Main:
   dw KydreeokHead_ForwardAnim ; 0x00
   dw KydreeokHead_RightAnim   ; 0x01
   dw KydreeokHead_LeftAnim    ; 0x02
-  dw KydreeokHead_SummonFire  ; 0x03
+  dw KydreeokHead_FarRight    ; 0x03
+  dw KydreeokHead_FarLeft     ; 0x04
+  dw KydreeokHead_SummonFire  ; 0x05
 
   ; -------------------------------------------------------
   ; 0x00
@@ -91,27 +94,23 @@ Sprite_KydreeokHead_Main:
       JSL Sprite_CheckDamageFromPlayerLong
       %DoDamageToPlayerSameLayerOnContact()
 
-      LDA.w SprTimerA, X : BNE .no_speed_change
+      JSR KydreeokHead_RotationMove
-        JSL   GetRandomInt : AND #$0F : TAY
-        LDA.w SpeedTable, Y : STA.w SprXSpeed, X
-        JSL   GetRandomInt : AND #$0F : TAY
-        LDA.w SpeedTable, Y : STA.w SprYSpeed, X
-      .no_speed_change
-      JSL Sprite_Move
-
-      ; JSR AdjustMovementSpeed
-      JSR KydreeokHead_NeckControl
-      JSR MoveWithBody
-
-      JSR RotateHeadUsingSpeedValues
 
       JSR RandomlyAttack
 
+      LDA.b #$20 : STA.w SprTimerA, X
       JSL Sprite_IsToRightOfPlayer : TYA : BNE .not_right
+        JSR GetDistance8bit : CMP #$0B : BCC .not_far
+          %GotoAction(3)
+          RTS
+        .not_far
         %GotoAction(1)
         RTS
       .not_right
-        LDA.b #$40 : STA.w SprTimerA, X
+      JSR GetDistance8bit : CMP #$0B : BCC .not_far2
+        %GotoAction(4)
+        RTS
+      .not_far2
       %GotoAction(2)
       RTS
   }
@@ -128,19 +127,8 @@ Sprite_KydreeokHead_Main:
       JSL Sprite_CheckDamageFromPlayerLong
       %DoDamageToPlayerSameLayerOnContact()
 
-      LDA.w SprTimerA, X : BNE .no_speed_change
+      JSR KydreeokHead_RotationMove
-      JSL   GetRandomInt : AND #$0F : TAY
-      LDA.w SpeedTable, Y : STA.w SprXSpeed, X
-      JSL   GetRandomInt : AND #$0F : TAY
-      LDA.w SpeedTable, Y : STA.w SprYSpeed, X
-      .no_speed_change
-      JSL Sprite_Move
 
-      ; JSR AdjustMovementSpeed
-      JSR KydreeokHead_NeckControl
-      JSR MoveWithBody
-
-      JSR RotateHeadUsingSpeedValues
       JSR RandomlyAttack
 
       JSL Sprite_IsToRightOfPlayer : TYA : BNE .not_right
@@ -160,8 +148,7 @@ Sprite_KydreeokHead_Main:
     JSL Sprite_CheckDamageFromPlayerLong
     %DoDamageToPlayerSameLayerOnContact()
 
-    JSR KydreeokHead_NeckControl
+    JSR KydreeokHead_RotationMove
-    JSR MoveWithBody
 
     JSR RandomlyAttack
 
@@ -173,6 +160,41 @@ Sprite_KydreeokHead_Main:
 
   ; -------------------------------------------------------
   ; 0x03
+  KydreeokHead_FarRight:
+  {
+    %PlayAnimation(9,11,10)
+    %MoveTowardPlayer(15)
+
+    JSL Sprite_CheckDamageFromPlayerLong
+    %DoDamageToPlayerSameLayerOnContact()
+
+    JSR KydreeokHead_RotationMove
+    
+    LDA SprTimerA, X : BNE .not_done
+      %GotoAction(0)
+    .not_done
+    RTS
+  }
+
+  ; -------------------------------------------------------
+  ; 0x04
+  KydreeokHead_FarLeft:
+  {
+    %PlayAnimation(12,14,10)
+    %MoveTowardPlayer(15)
+
+    JSL Sprite_CheckDamageFromPlayerLong
+    %DoDamageToPlayerSameLayerOnContact()
+
+    JSR KydreeokHead_RotationMove
+    
+    LDA SprTimerA, X : BNE .not_done
+       %GotoAction(0)
+    .not_done
+    RTS
+  }
+
+
   KydreeokHead_SummonFire:
   {
     %MoveTowardPlayer(15)
@@ -191,6 +213,25 @@ Sprite_KydreeokHead_Main:
 
 }
 
+KydreeokHead_RotationMove:
+{
+
+  JSL   GetRandomInt : AND #$0F : TAY
+  LDA.w SpeedTable, Y : STA.w SprXSpeed, X : STA $00
+  JSL   GetRandomInt : AND #$0F : TAY
+  LDA.w SpeedTable, Y : STA.w SprYSpeed, X : STA $01
+  ; JSL Sprite_Move
+
+  JSR KydreeokHead_NeckControl
+  JSR MoveWithBody
+
+  JSR RotateHeadUsingSpeedValues
+
+
+  
+  RTS
+}
+
 ; =========================================================
 
 CoordinateBasedRotation:
@@ -277,7 +318,7 @@ RandomlyAttack:
       JSL   Sprite_SpawnDynamically
       JSL   Sprite_SetSpawnedCoords
       JSL $09B020 ; Fireball_SpawnTrailGarnish
-      LDA.b #$03 : STA.w SprAction, Y
+      LDA.b #$05 : STA.w SprAction, Y
       LDA   #$20 : STA.w SprTimerA, Y
   .no_attack
   RTS
@@ -288,28 +329,30 @@ RandomlyAttack:
 MoveWithBody:
 {
   LDA   Kydreeok_Id : TAY
-  CPX.w Offspring2_Id : BEQ .DoMove
+  CPX.w Offspring2_Id : BEQ .neck2_move
-  CPX.w Offspring3_Id : BEQ .MoveNeck3
+
-    ; The first neck
     LDA.w SprX, Y : SEC : SBC #$0F
     STA.w SprMiscA, X
-    STA.w $19EA
+    STA.w $19EA : DEC
-    ; STA.w $19EC : STA.w $19EE : STA.w SprX, X
+    STA.w $19EC : DEC
+    STA.w $19EE 
+    ; STA.w SprX, X
 
     LDA.w SprY, Y : SEC : SBC #$0F
-
     STA.w SprMiscB, X
     STA.w $19EB
-    ; STA.w $19ED : STA.w $19EF :  STA.w SprY, X
+    ; STA.w $19ED
+    ; STA.w $19EF 
+    ; STA.w SprY, X
+    RTS
 
-    JMP .return
+  .neck2_move
-.DoMove
-    ; The other neck
     LDA.w SprX, Y : CLC : ADC #$0C
-  
     STA.w SprMiscA, X
-    STA.w $19F0
+    STA.w $19F0 : INC
-    ; STA.w $19F2 : STA.w $19F4 : STA.w SprX, X
+    STA.w $19F2 : INC
+    STA.w $19F4 
+    ; STA.w SprX, X
 
     LDA.w SprY, Y : SEC : SBC #$0F
     
@@ -321,44 +364,16 @@ MoveWithBody:
   .return
   RTS
     
-.MoveNeck3
+; CPX.w Offspring3_Id : BEQ .MoveNeck3
-    ; The third neck
+; .MoveNeck3
-    LDA.w SprX,     Y : SEC : SBC #$0F
+    ; ; The third neck
-    ; STA.w SprX,     X
+    ; LDA.w SprX,     Y : SEC : SBC #$0F
-    STA.w SprMiscA, X
+    ; ; STA.w SprX,     X
-    STA.w $1A78
+    ; STA.w SprMiscA, X
-    ; STA.w $1A7A
+    ; STA.w $1A78
-    ; STA.w $1A7C
+    ; ; STA.w $1A7A
-    JMP   .return
+    ; ; STA.w $1A7C
-}
+    ; JMP   .return
-
-; =========================================================
-; Adjusts the movement speed of the sprite based on its 
-; position. This came from Zarby's Gleeok code and causes 
-; some weird movement with the current implementation.
-
-AdjustMovementSpeed:
-{
-    LDA.w SprX,     X : SEC : SBC #$16        ; X-32
-    CMP.w SprMiscA, X : BCC .biggerthanorigin
-      LDA #-8 : STA.w SprXSpeed, X
-  .biggerthanorigin
-
-    LDA.w SprX,     X : CLC : ADC #$16       ; X+32
-    CMP.w SprMiscA, X : BCS .lowerthanorigin
-      LDA #$08 : STA.w SprXSpeed, X
-  .lowerthanorigin
-
-    LDA.w SprY,     X : SEC : SBC #$00         ; X-32
-    CMP.w SprMiscB, X : BCC .biggerthanorigin2
-      LDA #-8 : STA.w SprYSpeed, X
-  .biggerthanorigin2
-
-    LDA.w SprY,     X : CLC : ADC #$20        ; X+32
-    CMP.w SprMiscB, X : BCS .lowerthanorigin2
-      LDA #$08 : STA.w SprYSpeed, X
-  .lowerthanorigin2
-    RTS
 }
 
 ; =========================================================
@@ -773,8 +788,6 @@ Sprite_KydreeokHead_DrawNeck:
 Sprite_KydreeokHead_Draw:
 {
     JSL Sprite_PrepOamCoord
-    ; LDA.b #$03
-    ; JSL OAM_AllocateFromRegionC
     JSL Sprite_OAM_AllocateDeferToPlayer
 
     LDA $0DC0, X : CLC : ADC $0D90, X : TAY;Animation Frame
@@ -822,9 +835,9 @@ Sprite_KydreeokHead_Draw:
     JMP Sprite_KydreeokHead_DrawNeck
 
   .start_index
-    db $00, $02, $04, $06, $0A, $0E, $12, $16, $1A, $1E
+    db $00, $02, $04, $06, $0A, $0E, $12, $16, $1A, $1E, $22, $26, $2A, $2E, $32, $36
   .nbr_of_tiles
-    db 1, 1, 1, 3, 3, 3, 3, 3, 3
+    db 1, 1, 1, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3
   .x_offsets
     dw 0, 0
     dw 0, 0
@@ -835,6 +848,13 @@ Sprite_KydreeokHead_Draw:
     dw -8, 8, -8, 8
     dw 8, -8, -8, 8
     dw -8, 8, 8, -8
+
+    dw -8, 8, -8, 8
+    dw -8, 8, -8, 8
+    dw -8, 8, -8, 8
+    dw 8, -8, 8, -8
+    dw 8, -8, 8, -8
+    dw 8, -8, 8, -8
   .y_offsets
     dw -8, 8
     dw -8, 8
@@ -845,6 +865,13 @@ dw -8, 8, 8, -8
     dw -8, -8, 8, 8
     dw -8, -8, 8, 8
     dw -8, -8, 8, 8
+
+    dw -8, -8, 8, 8
+    dw -8, -8, 8, 8
+    dw -8, -8, 8, 8
+    dw -8, -8, 8, 8
+    dw -8, -8, 8, 8
+    dw -8, -8, 8, 8
   .chr
     db $40, $60
     db $42, $62
@@ -855,6 +882,13 @@ dw -8, -8, 8, 8
     db $48, $46, $68, $66
     db $08, $0A, $2A, $28
     db $4C, $4A, $6A, $6C
+
+    db $80, $82, $A0, $A2
+    db $84, $86, $A4, $A6
+    db $88, $8A, $A8, $AA
+    db $80, $82, $A0, $A2
+    db $84, $86, $A4, $A6
+    db $88, $8A, $A8, $AA
   .properties
     db $39, $39
     db $39, $39
@@ -865,6 +899,13 @@ db $4C, $4A, $6A, $6C
     db $79, $79, $79, $79
     db $79, $79, $79, $79
     db $79, $79, $79, $79
+
+    db $39, $39, $39, $39
+    db $39, $39, $39, $39
+    db $39, $39, $39, $39
+    db $79, $79, $79, $79
+    db $79, $79, $79, $79
+    db $79, $79, $79, $79
   .sizes
     db $02, $02
     db $02, $02
@@ -875,6 +916,13 @@ db $79, $79, $79, $79
     db $02, $02, $02, $02
     db $02, $02, $02, $02
     db $02, $02, $02, $02
+
+    db $02, $02, $02, $02
+    db $02, $02, $02, $02
+    db $02, $02, $02, $02
+    db $02, $02, $02, $02
+    db $02, $02, $02, $02
+    db $02, $02, $02, $02
 }
 
 GetDistance8bit: