Add todo to handle boss death based on kydreeok head health

Sprites/Bosses/kydreeok.asm

@@ -1,6 +1,7 @@
 ; =========================================================
 ; Sprite Properties
 ; =========================================================
+
 !SPRID              = $7A ; The sprite ID you are overwriting (HEX)
 !NbrTiles           = 10  ; Number of tiles used in a frame
 !Harmless           = 00  ; 00 = Sprite is Harmful,  01 = Sprite is Harmless
@@ -36,11 +37,9 @@ Sprite_Kydreeok_Long:
 {
     PHB : PHK : PLB
 
-  JSR Sprite_Kydreeok_Draw ; Call the draw code
+    JSR Sprite_Kydreeok_Draw
-  JSL Sprite_CheckActive   ; Check if game is not paused
+    JSL Sprite_CheckActive : BCC .SpriteIsNotActive  
-  BCC .SpriteIsNotActive   ; Skip Main code is sprite is innactive
+      JSR Sprite_Kydreeok_Main
-
-  JSR Sprite_Kydreeok_Main ; Call the main sprite code
 
   .SpriteIsNotActive
     PLB ; Get back the databank we stored previously
@@ -48,33 +47,30 @@ Sprite_Kydreeok_Long:
 }
 
 ; =========================================================
+; TODO: Handle boss death based on left and right head health
 
 Sprite_Kydreeok_Prep:
 {
   PHB : PHK : PLB
     
   LDA   #$40 : STA SprTimerA, X
-  LDA.b #$08 : STA $36          ;stores initial movement speeds
+  LDA.b #$08 : STA $36          ; Stores initial movement speeds
-  LDA.b #$06 : STA $0428        ;allows BG1 to move
+  LDA.b #$06 : STA $0428        ; Allows BG1 to move
 
   ; Cache the origin position of the sprite.
   LDA SprX, X : STA SprMiscA, X 
   LDA SprY, X : STA SprMiscB, X
 
-  JSR SpawnLeftHead
+  JSR SpawnLeftHead : JSR SpawnRightHead
-  JSR SpawnRightHead
 
-  STZ.w Neck1_OffsetX
+  STZ.w Neck1_OffsetX : STZ.w Neck1_OffsetY
-  STZ.w Neck1_OffsetY
+  STZ.w Neck2_OffsetX : STZ.w Neck2_OffsetY
-  STZ.w Neck2_OffsetX
-  STZ.w Neck2_OffsetY
 
   PLB
   RTL
 }
 
-; =============================================================================
+; =========================================================
-
 
 Sprite_Kydreeok_Main:
 {
@@ -87,7 +83,8 @@ Sprite_Kydreeok_Main:
   dw Kydreeok_MoveXorY     ; 03
   dw Kydreeok_KeepWalking  ; 04
 
-
+  ; -------------------------------------------------------
+  ; 0x00
   Kydreeok_Start:
   {
       %StartOnFrame(0)
@@ -105,6 +102,8 @@ Sprite_Kydreeok_Main:
       RTS
   }
 
+  ; -------------------------------------------------------
+  ; 0x01
   Kydreeok_StageControl:
   {
       %StartOnFrame(0)
@@ -127,6 +126,8 @@ Sprite_Kydreeok_Main:
       RTS
   }
 
+  ; -------------------------------------------------------
+  ; 0x02
   Kydreeok_MoveXandY:
   {
       %StartOnFrame(0)
@@ -150,16 +151,15 @@ Sprite_Kydreeok_Main:
       RTS
   }
 
-  
+  ; -------------------------------------------------------
+  ; 0x03
   Kydreeok_MoveXorY:
   {
       %StartOnFrame(0)
       %PlayAnimation(0, 2, 10)
 
-    PHX ;saves X so we can use it later
+      PHX
-
+      LDA $36 : STA $00
-    LDA $36
-    STA $00
       JSR Sprite_ApplySpeedTowardsPlayerXOrY
       JSL Sprite_BounceFromTileCollision     ; JSR StopIfOutOfBounds
       JSR StopIfOutOfBounds
@@ -167,14 +167,14 @@ Sprite_Kydreeok_Main:
 
       JSL Sprite_CheckDamageFromPlayerLong
       %DoDamageToPlayerSameLayerOnContact()
-
+      PLX
-    PLX ;restores X
 
       %GotoAction(4)
-
       RTS
   }
 
+  ; -------------------------------------------------------
+  ; 0x04
   Kydreeok_KeepWalking:
   {
       %StartOnFrame(0)
@@ -220,6 +220,8 @@ Sprite_Kydreeok_Main:
 
 }
 
+; =========================================================
+
 SpawnLeftHead:
 {
     LDA #$CF
@@ -230,19 +232,16 @@ SpawnLeftHead:
     LDA.b #$00 : STA $0E30, Y
         
     PHX
-
     ; code that controls where to spawn the offspring.
     REP #$20
     LDA $0FD8 : SEC : SBC.w #$000F
     SEP #$20
-    STA $0D10,       Y
+    STA $0D10, Y : XBA : STA $0D30, Y
-    XBA : STA $0D30, Y
 
     REP #$20
     LDA $0FDA : SEC : SBC.w #$000F
     SEP #$20
-    STA $0D00,       Y
+    STA $0D00, Y : XBA : STA $0D20, Y
-    XBA : STA $0D20, Y
 
     LDA.w SprX,     Y
     STA.w SprMiscA, Y : STA.w $19EA : STA.w $19EC : STA.w $19EE
@@ -253,14 +252,14 @@ SpawnLeftHead:
 
     STZ $0D60, X
     STZ $0D70, X
-        
     PLX
         
   .return
-
     RTS
 }
 
+; =========================================================
+
 SpawnRightHead:
 {
     LDA #$CF
@@ -272,19 +271,16 @@ SpawnRightHead:
     LDA.b #$01 : STA $0E30, Y
         
     PHX
-
     ; code that controls where to spawn the offspring.
     REP #$20
     LDA $0FD8 : CLC : ADC.w #$000C
     SEP #$20
-    STA $0D10,       Y
+    STA $0D10, Y : XBA : STA $0D30, Y
-    XBA : STA $0D30, Y
 
     REP #$20
     LDA $0FDA : SEC : SBC.w #$000F
     SEP #$20
-    STA $0D00,       Y
+    STA $0D00, Y : XBA : STA $0D20, Y
-    XBA : STA $0D20, Y
 
     LDA.w SprX, Y : STA.w SprX, Y
     STA.w SprMiscA, Y : STA.w $19F0 : STA.w $19F2 : STA.w $19F4
@@ -295,95 +291,62 @@ SpawnRightHead:
 
     STZ $0D60, X
     STZ $0D70, X
-        
     PLX
         
   .return
-
     RTS
 }
 
+; =========================================================
+; Originally from Trinexx_MoveBody $1DB2E5
 
-; ==============================================================================
 MoveBody:
 {
     ; Handle the shell bg movement
     ; Trinexx_MoveBody
-    #_1DB2E5: LDA.w $0D10, X
+    LDA.w $0D10, X : PHA
-    #_1DB2E8: PHA
+    LDA.w $0D00, X : PHA
 
-    #_1DB2E9: LDA.w $0D00, X
+    JSL Sprite_Move
-    #_1DB2EC: PHA
 
-    #_1DB2ED: JSL Sprite_Move
+    PLA
-
+    LDY.b #$00 : SEC : SBC.w $0D00, X : STA.w $0310
-    #_1DB2F0: PLA
+    BPL .pos_y_low
-    #_1DB2F1: LDY.b #$00
+    DEY
-
-    #_1DB2F3: SEC
-    #_1DB2F4: SBC.w $0D00, X
-    #_1DB2F7: STA.w $0310
-    #_1DB2FA: BPL .pos_y_low
-
-    #_1DB2FC: DEY
 
   .pos_y_low
-    #_1DB2FD: STY.w $0311
+    STY.w $0311
 
     ; -----------------------------------------------------
 
-    #_1DB300: PLA
+    PLA
-    #_1DB301: LDY.b #$00
+    LDY.b #$00 : SEC : SBC.w $0D10, X : STA.w $0312
+    BPL .pos_x_low
 
-    #_1DB303: SEC
+    DEY
-    #_1DB304: SBC.w $0D10, X
-    #_1DB307: STA.w $0312
-    #_1DB30A: BPL .pos_x_low
-
-    #_1DB30C: DEY
 
   .pos_x_low
-    #_1DB30D: STY.w $0313
+    STY.w $0313
 
     ; -----------------------------------------------------
 
-    #_1DB310: LDA.b #$01
+    LDA.b #$01 : STA.w $0428
-    #_1DB312: STA.w $0428
 
+    LDA.w $0D00, X : SEC : SBC.b #$0C : STA.w $0DB0, X
 
-    #_1DB318: LDA.w $0D00, X
+    LDA.w $0B08 : SEC : SBC.w $0D10, X
-    #_1DB31B: SEC
+                  CLC : ADC.b #$02 
-    #_1DB31C: SBC.b #$0C
+                  CMP.b #$04 : BCS .not_at_target
-    #_1DB31E: STA.w $0DB0, X
 
-    #_1DB321: LDA.w $0B08
+    LDA.w $0B09 : SEC : SBC.w $0D00, X 
-    #_1DB324: SEC
+                  CLC : ADC.b #$02
-    #_1DB325: SBC.w $0D10, X
+                  CMP.b #$04 : BCS .not_at_target
-    #_1DB328: CLC
-    #_1DB329: ADC.b #$02
 
-    #_1DB32B: CMP.b #$04
+  .adjust_phase ; Unused?
-    #_1DB32D: BCS .not_at_target
+    STZ.w $0D80, X
-
+    LDA.b #$30 : STA.w $0DF0, X
-    #_1DB32F: LDA.w $0B09
-    #_1DB332: SEC
-    #_1DB333: SBC.w $0D00, X
-    #_1DB336: CLC
-    #_1DB337: ADC.b #$02
-
-    #_1DB339: CMP.b #$04
-    #_1DB33B: BCS .not_at_target
-
-  .adjust_phase
-    #_1DB33D: STZ.w $0D80, X
-
-    #_1DB340: LDA.b #$30
-    #_1DB342: STA.w $0DF0, X
 
   .not_at_target
-
-    ; JSR AdjustChildrenPos
-
     ; LayerEffect_Trinexx $0AFEF0
     REP   #$20
     LDA.w $0422 : CLC : ADC.w $0312 : STA.w $0422
@@ -391,11 +354,10 @@ MoveBody:
     STZ.w $0312 : STZ.w $0310
     SEP   #$20
 
-
     RTS
 }
 
-; ==============================================================================
+; =========================================================
 
 StopIfOutOfBounds:
 {
@@ -470,6 +432,7 @@ StopIfOutOfBounds:
     RTS
 }
 
+; =========================================================
 
 Sprite_ApplySpeedTowardsPlayerXOrY:
 {
@@ -564,6 +527,8 @@ Sprite_ApplySpeedTowardsPlayerXOrY:
                 RTS
 }
 
+; =========================================================
+
 ApplyPalette:
 {
     REP #$20 ;Set A in 16bit mode
@@ -589,20 +554,20 @@ ApplyPalette:
     RTS
 }
 
-; =============================================================================
+; =========================================================
 
 Sprite_Kydreeok_Draw:
+{
     JSL Sprite_PrepOamCoord
     JSL Sprite_OAM_AllocateDeferToPlayer
 
     LDA $0DC0, X : CLC : ADC $0D90, X : TAY;Animation Frame
     LDA .start_index, Y : STA $06
 
-
     PHX
     LDX   .nbr_of_tiles, Y ;amount of tiles -1
     LDY.b #$00
-  .nextTile
+  .next_tile
 
     PHX ; Save current Tile Index?
         
@@ -640,7 +605,7 @@ Sprite_Kydreeok_Draw:
         
     PLY : INY
         
-  PLX : DEX : BPL .nextTile
+    PLX : DEX : BPL .next_tile
 
     PLX
 
@@ -671,3 +636,4 @@ Sprite_Kydreeok_Draw:
     db $02, $02, $02, $02, $02, $02, $02, $02, $02, $02
     db $02, $02, $02, $02, $02, $02, $02, $02, $02, $02
     db $02, $02, $02, $02, $02, $02, $02, $02, $02, $02
+}

Sprites/Bosses/kydreeok_head.asm

@@ -1,4 +1,7 @@
 ; =========================================================
+; Kydreeok Head sprite
+; Child sprite of the Kydreeok boss
+; =========================================================
 
 !SPRID              = $CF ; The sprite ID you are overwriting (HEX)
 !NbrTiles           = 06  ; Number of tiles used in a frame
@@ -34,15 +37,14 @@
 Sprite_KydreeokHead_Long:
 {
     PHB : PHK : PLB
+    LDA SprAction, X : CMP #$02 : BEQ .no_head
+      JSR Sprite_KydreeokHead_Draw
 
-  LDA $0D80, X : CMP #$02 : BEQ .no_head
+  .no_head
-  JSR Sprite_KydreeokHead_Draw           ; Call the draw code
+    JSL Sprite_CheckActive : BCC .not_active
-.no_head
+      JSR Sprite_KydreeokHead_Main
-  JSL Sprite_CheckActive       ; Check if game is not paused
-  BCC .SpriteIsNotActive
-  JSR Sprite_KydreeokHead_Main ; Call the main sprite code
 
-  .SpriteIsNotActive
+  .not_active
     PLB ; Get back the databank we stored previously
     RTL ; Go back to original code
 }
@@ -53,8 +55,8 @@ Sprite_KydreeokHead_Prep:
 {
   PHB : PHK : PLB
     
-  ; Add more code here to initialize data
+  ; TODO: Set sprite properties for damage and health
-
+  ; TODO: Handle head death in conjunction with Kydreeok
 
   PLB
   RTL
@@ -62,17 +64,21 @@ Sprite_KydreeokHead_Prep:
 
 ; =========================================================
 
+SpeedTable:
+  db $00, $02, $04, $06, $07, $01, $06, $03
+  db 0, -2, -4, -6, -7, -1, -6, -3
+
 Sprite_KydreeokHead_Main:
 {
   LDA.w SprAction, X
   JSL   UseImplicitRegIndexedLocalJumpTable
 
-  dw KydreeokHead_ForwardAnim
+  dw KydreeokHead_ForwardAnim ; 0x00
-  dw KydreeokHead_SideAnim
+  dw KydreeokHead_SideAnim    ; 0x01
-
+  dw KydreeokHead_SummonFire  ; 0x02
-  dw KydreeokHead_SummonFire
-
 
+  ; -------------------------------------------------------
+  ; 0x00
   KydreeokHead_ForwardAnim:
   {
       %StartOnFrame(0)
@@ -85,9 +91,9 @@ Sprite_KydreeokHead_Main:
 
       LDA.w SprTimerA, X : BNE .noSpeedChange
       JSL   GetRandomInt : AND #$0F : TAY
-      LDA.w tableSpeed, Y : STA.w SprXSpeed, X
+      LDA.w SpeedTable, Y : STA.w SprXSpeed, X
       JSL   GetRandomInt : AND #$0F : TAY
-      LDA.w tableSpeed, Y : STA.w SprYSpeed, X
+      LDA.w SpeedTable, Y : STA.w SprYSpeed, X
       ; LDA #$40 : STA.w SprTimerA, X
     .noSpeedChange
       
@@ -119,10 +125,11 @@ Sprite_KydreeokHead_Main:
       JSL Sprite_IsToRightOfPlayer : TYA : BNE .not_right
         %GotoAction(1)
     .not_right
-      
       RTS
   }
 
+  ; -------------------------------------------------------
+  ; 0x01
   KydreeokHead_SideAnim:
   {
       %StartOnFrame(3)
@@ -135,9 +142,9 @@ Sprite_KydreeokHead_Main:
 
       LDA.w SprTimerA, X : BNE .noSpeedChange
       JSL   GetRandomInt : AND #$0F : TAY
-      LDA.w tableSpeed, Y : STA.w SprXSpeed, X
+      LDA.w SpeedTable, Y : STA.w SprXSpeed, X
       JSL   GetRandomInt : AND #$0F : TAY
-      LDA.w tableSpeed, Y : STA.w SprYSpeed, X
+      LDA.w SpeedTable, Y : STA.w SprYSpeed, X
       ; LDA #$40 : STA.w SprTimerA, X
     .noSpeedChange
       JSL Sprite_Move
@@ -156,6 +163,8 @@ Sprite_KydreeokHead_Main:
       RTS
   }
 
+  ; -------------------------------------------------------
+  ; 0x02
   KydreeokHead_SummonFire:
   {
     ; %StartOnFrame(5)
@@ -166,18 +175,18 @@ Sprite_KydreeokHead_Main:
     %DoDamageToPlayerSameLayerOnContact()
 
     JSR Sprite_Twinrova_FireAttack
-
     JSL Sprite_Move
     
     LDA SprTimerA,        X : BNE .not_done
       LDA #$00 : STA $0DD0, X
-
   .not_done
     RTS
   }
 
 }
 
+; =========================================================
+
 CoordinateBasedRotation:
 {
     LDA Neck_Index : TAY
@@ -200,11 +209,15 @@ CoordinateBasedRotation:
 
 ; Table for X coordinates (based on a radius of 8)
 X_Coords:
-    db  8, 11,  8,  3, -4, -9, -12, -9, -4,  3,  8, 11,  8,  3, -4, -9  ; X values
+    db  8, 11,  8,  3, -4, -9, -12, -9
+    db -4,  3,  8, 11,  8,  3, -4, -9
 
 ; Table for Y coordinates (based on a radius of 8)
 Y_Coords:
-    db  0, -3, -8, -11, -15, -15, -11, -8, -3,  0,  3,  8, 11, 15, 15, 11  ; Y values
+    db  0, -3, -8, -11, -15, -15, -11, -8
+    db -3,  0,  3,  8, 11, 15, 15, 11
+
+; =========================================================
 
 RotateHeadUsingSpeedValues:
 {
@@ -223,22 +236,29 @@ RotateHeadUsingSpeedValues:
 }
 
 XSpeedSin:
-db 0,   3,   6,   9,  12,  15,  18,  20,  23,  25
+{
-db 27,  28,  30,  31,  31,  32
+  db 0,   3,   6,   9,  12,  15,  18,  20,  23,  25
+  db 27,  28,  30,  31,  31,  32
+}
+
 YSpeedSin:
-db 32,  32,  31,  31
+{
-db 30,  28,  27,  25,  23,  20,  18,  15,  12,   9
+  db 32,  32,  31,  31
-db 6,   3,   0,  -3,  -6,  -9, -12, -15, -18, -20
+  db 30,  28,  27,  25,  23,  20,  18,  15,  12,   9
-db -23, -25, -27, -28, -30, -31, -31, -32, -32, -32
+  db 6,   3,   0,  -3,  -6,  -9, -12, -15, -18, -20
-db -31, -31, -30, -28, -27, -25, -23, -20, -18, -15
+  db -23, -25, -27, -28, -30, -31, -31, -32, -32, -32
-db -12,  -9,  -6,  -3 
+  db -31, -31, -30, -28, -27, -25, -23, -20, -18, -15
-db 0,   3,   6,   9,  12,  15,  18,  20,  23,  25
+  db -12,  -9,  -6,  -3 
-db 27,  28,  30,  31,  31,  32,  32,  32,  31,  31
+  db 0,   3,   6,   9,  12,  15,  18,  20,  23,  25
-db 30,  28,  27,  25,  23,  20,  18,  15,  12,   9
+  db 27,  28,  30,  31,  31,  32,  32,  32,  31,  31
-db 6,   3,   0,  -3,  -6,  -9, -12, -15, -18, -20
+  db 30,  28,  27,  25,  23,  20,  18,  15,  12,   9
-db -23, -25, -27, -28, -30, -31, -31, -32, -32, -32
+  db 6,   3,   0,  -3,  -6,  -9, -12, -15, -18, -20
-db -31, -31, -30, -28, -27, -25, -23, -20, -18, -15
+  db -23, -25, -27, -28, -30, -31, -31, -32, -32, -32
-db -12,  -9,  -6,  -3 
+  db -31, -31, -30, -28, -27, -25, -23, -20, -18, -15
+  db -12,  -9,  -6,  -3 
+}
+
+; =========================================================
 
 RandomlyAttack:
 {
@@ -248,14 +268,15 @@ RandomlyAttack:
       LDA   #$CF
       JSL   Sprite_SpawnDynamically
       JSL   Sprite_SetSpawnedCoords
-  ;JSL $09B020
+      ;JSL $09B020 ; Fireball_SpawnTrailGarnish
-  LDA.b #$02 : STA $0D80,       Y
+      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
@@ -314,6 +335,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:
 {
@@ -322,30 +347,25 @@ 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
 }
 
-tableSpeed:
+; =========================================================
-  db $00, $02, $04, $06, $07, $01, $06, $03
+; Based on Zarby Gleeok code
-  db 0, -2, -4, -6, -7, -1, -6, -3
 
 KydreeokHead_NeckControl:
 {
@@ -539,14 +559,13 @@ KydreeokHead_NeckControl:
     LDA.b $08 : STA.w SprXSpeed, X
     LDA.b $09 : STA.w SprYSpeed, X
 
-
-
     RTS
 }
 
+; =========================================================
+; This is here for reference.
 
-
+Sprite_KydreeokHead_DrawNeck_Data:
-Sprite_KydreeokHead_DrawNeck:
 {
   .start_index
     db $12
@@ -566,6 +585,71 @@ Sprite_KydreeokHead_DrawNeck:
 
 ; =========================================================
 
+Sprite_KydreeokHead_DrawNeck:
+{
+    ; Dumb draw neck code
+    LDA.w SprSubtype, X : BNE .neck2
+      LDA.w $19EA : STA.w $0FD8
+      LDA.w $19EB : STA.w $0FDA
+      JSR   .DrawNeckPart
+
+      LDA.w $19EC : STA.w $0FD8
+      LDA.w $19ED : STA.w $0FDA
+      JSR   .DrawNeckPart
+
+      LDA.w $19EE : STA.w $0FD8
+      LDA.w $19EF : STA.w $0FDA
+      JSR   .DrawNeckPart
+
+    BRA   .skipNeck
+  .neck2
+    ; Dumb draw neck code
+    LDA.w $19F0 : STA.w $0FD8
+    LDA.w $19F1 : STA.w $0FDA
+    JSR   .DrawNeckPart
+
+    LDA.w $19F2 : STA.w $0FD8
+    LDA.w $19F3 : STA.w $0FDA
+    JSR   .DrawNeckPart
+
+    LDA.w $19F4 : STA.w $0FD8
+    LDA.w $19F5 : STA.w $0FDA
+    JSR   .DrawNeckPart
+
+    .skipNeck
+      LDA.b $08 : STA.w $0FD8
+      LDA.b $09 : STA.w $0FDA
+    .skipNeck2
+      RTS
+
+  .DrawNeckPart
+    PHY
+    JSL Sprite_PrepOamCoord
+    PLY
+
+    REP #$20
+    LDA   $00 : STA ($90), Y : AND.w #$0100 : STA $0E : INY
+    LDA   $02 : STA ($90), Y : CLC   : ADC #$0010 : CMP.w #$0100
+    SEP   #$20
+    BCC   .on_screen_y2
+      LDA.b #$F0 : STA ($90), Y ; Put the sprite out of the way
+      STA   $0E
+    .on_screen_y2
+      INY
+      LDA #$2E : STA ($90), Y
+      INY
+      LDA #$39 : STA ($90), Y
+
+      PHY 
+      TYA : LSR #2 : TAY
+      LDA #$02 : ORA $0F : STA ($92), Y ; store size in oam buffer
+      PLY : INY
+
+      RTS
+}
+
+; =========================================================
+
 Sprite_KydreeokHead_Draw:
 {
     JSL Sprite_PrepOamCoord
@@ -613,83 +697,7 @@ Sprite_KydreeokHead_Draw:
 
     PLX
 
-    {
+    JMP Sprite_KydreeokHead_DrawNeck
-      ; Dumb draw neck code
-      LDA.w SprSubtype, X : BNE .neck2
-
-      LDA.w $19EA : STA.w $0FD8
-      LDA.w $19EB : STA.w $0FDA
-      JSR   .DrawNeckPart
-
-
-      LDA.w $19EC : STA.w $0FD8
-      LDA.w $19ED : STA.w $0FDA
-      JSR   .DrawNeckPart
-
-      LDA.w $19EE : STA.w $0FD8
-      LDA.w $19EF : STA.w $0FDA
-      JSR   .DrawNeckPart
-
-      BRA   .skipNeck
-      .neck2
-      ; Dumb draw neck code
-      LDA.w $19F0 : STA.w $0FD8
-      LDA.w $19F1 : STA.w $0FDA
-      JSR   .DrawNeckPart
-
-      LDA.w $19F2 : STA.w $0FD8
-      LDA.w $19F3 : STA.w $0FDA
-      JSR   .DrawNeckPart
-
-      LDA.w $19F4 : STA.w $0FD8
-      LDA.w $19F5 : STA.w $0FDA
-      JSR   .DrawNeckPart
-
-      .skipNeck
-
-      LDA.b $08 : STA.w $0FD8
-      LDA.b $09 : STA.w $0FDA
-      .skipNeck2
-      RTS
-
-
-
-      .DrawNeckPart
-      PHY
-      JSL Sprite_PrepOamCoord
-      PLY
-
-      REP #$20
-
-      LDA   $00 : STA ($90), Y
-      AND.w #$0100 : STA $0E
-      INY
-      LDA   $02 : STA ($90), Y
-      CLC   : ADC #$0010 : CMP.w #$0100
-      SEP   #$20
-      BCC   .on_screen_y2
-
-      LDA.b #$F0 : STA ($90), Y ;Put the sprite out of the way
-      STA   $0E
-      .on_screen_y2
-
-      INY
-      LDA #$2E : STA ($90), Y
-      INY
-      LDA #$39 : STA ($90), Y
-
-      PHY 
-          
-      TYA : LSR #2 : TAY
-          
-      LDA #$02 : ORA $0F : STA ($92), Y ; store size in oam buffer
-          
-      PLY : INY
-
-      RTS
-    }
-
-    RTS
 
   .start_index
     db $00, $02, $04, $06, $0A, $0E

Sprites/Bosses/twinrova.asm

@@ -4,6 +4,7 @@
 ; Overrides Blind and the Blind Maiden to create a new 
 ; boss sequence. 
 ;
+;
 ; =========================================================
 
 !SPRID              = $CE ; The sprite ID you are overwriting (HEX)
@@ -58,16 +59,20 @@ Sprite_Twinrova_Long:
 
 Sprite_Twinrova_CheckIfDead:
 {
-    LDA SprAction, X : CMP.b #$0A : BEQ .not_dead
+    LDA $0D80, X : CMP.b #$0A : BEQ .not_dead
+
     ; If health is negative, set back to zero
-      LDA SprHealth, X : CMP.b #$44 : BCC .health_not_negative
+    LDA $0E50, X : CMP.b #$44 : BCC .health_not_negative
-        LDA.b #$00 : STA SprHealth, X
+      LDA.b #$00 : STA $0E50, X
 
   .health_not_negative
-      LDA SprHealth, X : BNE .not_dead
+
+    LDA $0E50, X : BNE .not_dead
       PHX 
+
       LDA.b #$04 : STA $0DD0, X ; Kill sprite boss style
-        LDA.b #$0A : STA SprAction, X ; Go to Twinrova_Dead stage
+      LDA.b #$0A : STA $0D80, X ; Go to Twinrova_Dead stage
+
       PLX
   .not_dead
     RTS
@@ -79,8 +84,9 @@ Sprite_Twinrova_Prep:
 {
     PHB : PHK : PLB
     
+    ; PrepareBattle
     LDA.l $7EF3CC : CMP.b #$06 : BEQ .despawn
-      LDA.b #$40 : STA SprHealth, X ; Health
+      LDA.b #$40 : STA $0E50, X ; Health
       LDA.b #$04 : STA $0CD2, X ; Bump damage type (4 hearts, green tunic)
 
       %SetSpriteSpeedX(15)
@@ -168,20 +174,17 @@ Sprite_Twinrova_Main:
   dw Twinrova_KotakeMode    ; 0x09
   dw Twinrova_Dead          ; 0x0A
 
-  ; -------------------------------------------------------
   ; 0x00
-  ; TODO: Separate MoveState phases into action 0 and 1
   Twinrova_Init:
   {
       %GotoAction(01)
       RTS
   }
 
-  ; -------------------------------------------------------
   ; 0x01
   Twinrova_MoveState:
   {
-      LDA SprHealth, X : CMP.b #$20 : BCS .phase_1
+      LDA $0E50, X : CMP.b #$20 : BCS .phase_1
       ; -------------------------------------------
       ; Phase 2
       LDA SprTimerE, X : BNE .kotake
@@ -203,27 +206,27 @@ Sprite_Twinrova_Main:
 
       JSL GetRandomInt : AND.b #$3F : BNE +
         LDA.b #$20 : STA.w SprTimerD, X
-        STZ   $AC      ; Set the fire attack
+        STZ   $AC
         %GotoAction(4) ; Prepare Attack
         RTS
     +
 
       JSL GetRandomInt : AND.b #$3F : BNE ++
         LDA.b #$20 : STA.w SprTimerD, X
-        LDA   #$01 : STA $AC ; Set the ice attack
+        LDA   #$01 : STA $AC
         %GotoAction(4) ; Prepare Attack
         RTS
     ++
 
-      JSL Sprite_IsBelowPlayer : TYA : BNE .MoveBackwards ; If 1, 
+      JSL Sprite_IsBelowPlayer ; Check if sprite is below player
-        %GotoAction(2) ; MoveForwards
+      TYA : BNE .MoveBackwards ; If 1, 
+        %GotoAction(2)
         RTS
     .MoveBackwards
-      %GotoAction(3) ; MoveBackwards
+      %GotoAction(3)
       RTS
   }
 
-  ; -------------------------------------------------------
   ; 0x02 - TODO: Implement Twinrova_MoveForwards
   Twinrova_MoveForwards:
   {
@@ -241,7 +244,6 @@ Sprite_Twinrova_Main:
       RTS
   }
 
-  ; -------------------------------------------------------
   ; 0x03 - TODO: Implement Twinrova_MoveBackwards
   Twinrova_MoveBackwards:
   {
@@ -259,7 +261,6 @@ Sprite_Twinrova_Main:
       RTS
   }
 
-  ; -------------------------------------------------------
   ; 0x04
   Twinrova_PrepareAttack:
   {
@@ -284,7 +285,6 @@ Sprite_Twinrova_Main:
       RTS
   }
 
-  ; -------------------------------------------------------
   ; 0x05
   Twinrova_FireAttack:
   {
@@ -299,7 +299,6 @@ Sprite_Twinrova_Main:
       RTS
   }
 
-  ; -------------------------------------------------------
   ; 0x06
   Twinrova_IceAttack:
   {
@@ -314,7 +313,6 @@ Sprite_Twinrova_Main:
       RTS
   }
 
-  ; -------------------------------------------------------
   ; 0x07
   Twinrova_Hurt:
   {
@@ -334,7 +332,6 @@ Sprite_Twinrova_Main:
       RTS
   }
 
-  ; -------------------------------------------------------
   ; 0x08
   Twinrova_KoumeMode:
   {
@@ -355,7 +352,6 @@ Sprite_Twinrova_Main:
       RTS
   }
 
-  ; -------------------------------------------------------
   ; 0x09
   Twinrova_KotakeMode:
   {
@@ -376,7 +372,6 @@ Sprite_Twinrova_Main:
       RTS
   }
 
-  ; -------------------------------------------------------
   ; 0x0A
   Twinrova_Dead:
   {
@@ -387,9 +382,6 @@ Sprite_Twinrova_Main:
 }
 
 ; =========================================================
-; TODO: Create a new parent sprite for the Twinrova attacks
-; so that the velocity and movement aren't applied to the 
-; parent sprite itself.
 
 ; Reused function from TrinexxBreath.
 TrinexxBreath_AltEntry:
@@ -422,32 +414,68 @@ Sprite_Twinrova_FireAttack:
 ; $1DBDD6 - TrinexxFire_AddFireGarnish
 AddFireGarnish:
 {
-    INC.w SprDelay, X : LDA SprDelay, X : AND.b #$07 : BNE .return
+    INC $0E80, X : LDA $0E80, X : AND.b #$07 : BNE .return
       LDA.b #$2A : JSL Sound_SetSfx2PanLong
       LDA.b #$1D : PHX : TXY : TAX : STA $00
 
   .next_slot
-    LDA $7FF800, X : BEQ .free_slot ; Search for free Garnish slot
+    LDA $7FF800, X : BEQ .free_slot
       DEX : BPL .next_slot
         DEC $0FF8 : BPL .use_search_index
           LDA $00 : STA $0FF8
+
   .use_search_index
     LDX $0FF8
+
   .free_slot
-    ; Set garnish ID, set garnish handled flag, set garnish parent sprite
+    LDA.b #$10 : STA $7FF800, X : STA $0FB4
-    LDA.b #$10 : STA $7FF800, X : STA $0FB4 : TYA : STA $7FF92C, X
+    TYA : STA $7FF92C, X
-    LDA.w SprX, Y  : STA $7FF83C, X                    ; Garnish XL
+    
-    LDA.w SprXH, Y : STA $7FF878, X                    ; Garnish XH
+    LDA.w SprX, Y : STA $7FF83C, X
-    LDA.w SprY, Y  : CLC : ADC.b #$10 : STA $7FF81E, X ; Garnish YL
+    LDA.w SprXH, Y : STA $7FF878, X
-    LDA.w SprYH, Y : ADC.b #$00 : STA $7FF85A, X       ; Garnish YH
+    LDA.w SprY, Y : CLC : ADC.b #$10 : STA $7FF81E, X
-    LDA.b #$7F : STA $7FF90E, X : STX $00              ; Set garnish timer 
+    LDA.w SprYH, Y : ADC.b #$00 : STA $7FF85A, X
+    
+    LDA.b #$7F : STA $7FF90E, X
+    STX $00
     PLX
 
   .return
     RTS
 }
 
-; =========================================================
+; $1DBD65 - TrinexxBreath_ice_add_ice_garnish
+AddIceGarnishV2:
+{
+    INC $0E80, X : LDA $0E80, X : AND.b #$07 : BNE .return
+      LDA.b #$14 : JSL Sound_SetSfx3PanLong
+      LDA.b #$1D : PHX : TXY : TAX : STA $00
+
+  .next_slot
+    LDA $7FF800, X : BEQ .free_slot
+      DEX : BPL .next_slot
+        DEC $0FF8 : BPL .use_search_index
+          LDA.b #$00 : STA $0FF8
+
+  .use_search_index
+    LDX $0FF8
+
+  .free_slot
+    LDA.b #$0C : STA $7FF800, X : STA $0FB4
+    TYA : STA $7FF92C, X
+    
+    LDA.w SprX, Y : STA $7FF83C, X
+    LDA.w SprXH, Y : STA $7FF878, X
+    LDA.w SprY, Y : CLC : ADC.b #$10 : STA $7FF81E, X
+    LDA.w SprYH, Y : ADC.b #$00 : STA $7FF85A, X
+    
+    LDA.b #$7F : STA $7FF90E, X : STX $00
+    
+    PLX
+
+  .return
+    RTS
+}
 
 Sprite_Twinrova_IceAttack:
 {
@@ -458,35 +486,8 @@ Sprite_Twinrova_IceAttack:
     JMP TrinexxBreath_AltEntry
 }
 
-; $1DBD65 - TrinexxBreath_ice_add_ice_garnish
-AddIceGarnishV2:
-{
-    INC.w SprDelay, X : LDA SprDelay, X : AND.b #$07 : BNE .return
-      LDA.b #$14 : JSL Sound_SetSfx3PanLong
-      LDA.b #$1D : PHX : TXY : TAX : STA $00
-
-  .next_slot
-    LDA $7FF800, X : BEQ .free_slot ; Search for free Garnish slot
-      DEX : BPL .next_slot
-        DEC $0FF8 : BPL .use_search_index
-          LDA.b #$00 : STA $0FF8
-    .use_search_index
-      LDX $0FF8
-  .free_slot
-    ; Set garnish ID, set garnish handled flag, set garnish parent sprite
-    LDA.b #$0C : STA $7FF800, X : STA $0FB4 : TYA : STA $7FF92C, X
-    LDA.w SprX, Y : STA $7FF83C, X                    ; Garnish XL
-    LDA.w SprXH, Y : STA $7FF878, X                   ; Garnish XH
-    LDA.w SprY, Y : CLC : ADC.b #$10 : STA $7FF81E, X ; Garnish YL
-    LDA.w SprYH, Y : ADC.b #$00 : STA $7FF85A, X      ; Garnish YH
-    LDA.b #$7F : STA $7FF90E, X : STX $00             ; Set garnish timer
-    PLX
-
-  .return
-    RTS
-}
-
 ; =========================================================
+
 ; Overwrite vanilla Trinexx ice garnish
 ; Plays like a simple ice cloud animation now.
 
@@ -504,17 +505,19 @@ org $09B459
 org $09B5D6
   Garnish_SetOamPropsAndSmallSize:
 
-; SpriteData_Bump - Ice Garnish 
-org $0DB266+$CD
-  db $04
-
 org $09B33F
 TrinexxIce_Pool:
 {
   .chr
-    db $2E, $2E, $2C, $2C
+    db $2E
+    db $2E
+    db $2C
+    db $2C
   .properties
-    db $35, $35, $35, $35
+    db $35
+    db $35
+    db $35
+    db $35
 }
 
 org $09B34F
@@ -536,6 +539,10 @@ Garnish_TrinexxIce:
 }
 warnpc $09B3B8
 
+; Ice Garnish 
+org $0DB266+$CD
+  db $04
+
 pullpc
 
 ; =========================================================
@@ -603,6 +610,8 @@ Sprite_Twinrova_Draw:
 
     RTS
 
+
+; =========================================================
   .start_index
     db $00, $04, $08, $0C, $10, $14, $18, $1C, $22, $26, $2A, $2E
   .nbr_of_tiles
@@ -679,19 +688,25 @@ Sprite_Twinrova_Draw:
 ApplyTwinrovaGraphics:
 {
     PHX 
+
     REP #$20             ; A = 16, XY = 8
     LDX #$80 : STX $2100 ; turn the screen off (required)
+
     LDX #$80 : STX $2115   ; Set the video port register every time we write it increase by 1
     LDA #$5000 : STA $2116 ; Destination of the DMA $5800 in vram <- this need to be divided by 2
     LDA #$1801 : STA $4300 ; DMA Transfer Mode and destination register 
                            ; "001 => 2 registers write once (2 bytes: p, p+1)"
     LDA.w #TwinrovaGraphics : STA $4302     ; Source address where you want gfx from ROM
     LDX.b #TwinrovaGraphics>>16 : STX $4304
-    LDA   #$2000 : STA $4305                ; Size of the transfer 4 sheets of $800 each
+    LDA   #$2000 : STA $4305                ; size of the transfer 4 sheets of $800 each
     LDX   #$01 : STX $420B                  ; Do the DMA 
-    LDX #$0F : STX $2100                    ; Turn the screen back on
+
+    LDX #$0F : STX $2100 ;turn the screen back on
+
     SEP #$30
+
     PLX
+
     RTL
 
   TwinrovaGraphics:
@@ -796,16 +811,13 @@ Follower_CheckBlindTrigger:
 }
 
 ; =========================================================
-; Called during Blind Maiden section of Follower_BasicMover
+; Called during the BlindMaiden section of Follower_BasicMover
-; to spawn Twinrova from the Blind Maiden.
+; to spawn Twinrova in the room. 
 
-; TODO: Figure out why the sprite disappears after graphics
-; are transferred in. It seems to be unrelated to the 
-; graphics code, but rather related to the BlindMaiden 
-; spawn code.
 org $1DA03C
 Blind_SpawnFromMaiden:
 {
+  ; Load the Twinrova graphics
   JSL ApplyTwinrovaGraphics
 
   LDX.b #$00 ; Load the boss into sprite index 0
@@ -885,13 +897,11 @@ SpritePrep_Blind_PrepareBattle:
 warnpc $1DA0B1
 
 ; =========================================================
-; TODO: Decide if we want to use this garnish in the fight.
-; Currently unused.
 
 org $1DA0B1
 BlindLaser_SpawnTrailGarnish:
 {
-    #_1DA0B1: LDA.w SprDelay,X
+    #_1DA0B1: LDA.w $0E80,X
     #_1DA0B4: AND.b #$00
     #_1DA0B6: BNE .exit