From cca13cba32cba1779dd450c9f1cabdf25a3dc093 Mon Sep 17 00:00:00 2001 From: scawful Date: Sun, 19 Jan 2025 13:46:25 -0500 Subject: [PATCH] Add fire and ice attack to keese on timer --- Sprites/Enemies/keese.asm | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/Sprites/Enemies/keese.asm b/Sprites/Enemies/keese.asm index 19d2cee..d87cbf0 100644 --- a/Sprites/Enemies/keese.asm +++ b/Sprites/Enemies/keese.asm @@ -72,7 +72,7 @@ Sprite_Keese_Prep: Sprite_Keese_Main: { LDA.w SprAction, X - JSL UseImplicitRegIndexedLocalJumpTable + JSL JumpTableLocal dw Keese_Idle dw Keese_FlyAround @@ -98,12 +98,9 @@ Sprite_Keese_Main: JSL Sprite_BounceFromTileCollision JSL GetRandomInt : AND.b #$1F : BNE + - LDA.w SprSubtype, X : BEQ ++ - JSL Sprite_Twinrova_FireAttack - JMP + - ++ - ; Ice Attack + LDA.b #$40 : STA.w SprTimerC, X + + JSR Sprite_Keese_Attack LDA.w SprTimerA, X : AND.b #$10 : BNE + JSL Sprite_ProjectSpeedTowardsPlayer @@ -119,6 +116,19 @@ Sprite_Keese_Main: } } +Sprite_Keese_Attack: +{ + LDA.w SprTimerC, X : BEQ + + LDA.w SprSubtype, X : BEQ ++ + JSL Sprite_Twinrova_FireAttack + JMP + + ++ + JSL Sprite_SpawnSparkleGarnish + JSL BlindLaser_SpawnTrailGarnish + + + RTS +} + Sprite_Keese_Draw: { JSL Sprite_PrepOamCoord