From 4b727b870d151b6edb559f65235f28654ed3ebbe Mon Sep 17 00:00:00 2001
From: scawful <justin.scofield@outlook.com>
Date: Sat, 30 Mar 2024 11:52:20 -0400
Subject: [PATCH] Format movement and random attack code

---
 Sprites/Bosses/kydreeok_head.asm | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/Sprites/Bosses/kydreeok_head.asm b/Sprites/Bosses/kydreeok_head.asm
index 3ddb6a5..ec75f63 100644
--- a/Sprites/Bosses/kydreeok_head.asm
+++ b/Sprites/Bosses/kydreeok_head.asm
@@ -260,19 +260,20 @@ YSpeedSin:
 RandomlyAttack:
 {
   JSL   GetRandomInt : AND #$7F : BNE .no_attack
-  CLC
-  JSL   GetRandomInt : AND #$0F : BNE .no_attack
-  LDA   #$CF
-  JSL   Sprite_SpawnDynamically
-  JSL   Sprite_SetSpawnedCoords
-  ;JSL $09B020
-  LDA.b #$02 : STA $0D80,       Y
-  LDA   #$10 : STA.w SprTimerA, Y
+    CLC
+    JSL   GetRandomInt : AND #$0F : BNE .no_attack
+      LDA   #$CF
+      JSL   Sprite_SpawnDynamically
+      JSL   Sprite_SetSpawnedCoords
+      ;JSL $09B020 ; Fireball_SpawnTrailGarnish
+      LDA.b #$02 : STA.w SprAction, Y
+      LDA   #$10 : STA.w SprTimerA, Y
 .no_attack
-
   RTS
 }
 
+; =========================================================
+
 Offspring1_Neck1_X = $19EA
 Offspring1_Neck2_X = $19EC
 Offspring1_Neck3_X = $19EE
@@ -331,6 +332,10 @@ MoveWithBody:
     RTS
 }
 
+; =========================================================
+; 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:
 {
@@ -339,24 +344,20 @@ AdjustMovementSpeed:
       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
 }