diff --git a/Sprites/Bosses/kydrog_boss.asm b/Sprites/Bosses/kydrog_boss.asm index 4e25389..ef535bc 100644 --- a/Sprites/Bosses/kydrog_boss.asm +++ b/Sprites/Bosses/kydrog_boss.asm @@ -405,11 +405,10 @@ Sprite_KydrogBoss_Main: %PlayAnimation(0, 0, 10) JSL Sprite_KillFriends - LDA $0DA0, X : INC : CMP.b #$08 : BNE .dontReset + LDA.w SprFlash, X : INC : CMP.b #$08 : BNE .dontReset LDA.b #$00 - - .dontReset - STA $0DA0, X + .dontReset + STA.w SprFlash, X RTS } @@ -424,7 +423,6 @@ Sprite_KydrogBoss_Main: ; Increase the Z for a bit until he is off screen LDA SprHeight, X : CLC : ADC.b #$04 STA.w SprHeight, X : CMP.b #$B0 : BCC .not_off_screen - ; LDA #$40 : STA.w SprTimerD, X %GotoAction($0B) .not_off_screen @@ -505,7 +503,7 @@ CheckForNextPhase: LDA #$80 : STA $0E50, X LDA #$01 : STA $0D80, X STA !KydrogPhase - INC $0DA0, X + INC.w SprFlash, X RTS .phase_three @@ -577,38 +575,6 @@ KydrogBoss_Set_Damage: ; ========================================================= -Sprite_DamageFlash_Long: -{ - PHB : PHK : PLB - - JSR Sprite_Damage_Flash - - PLB - RTL -} - -; ========================================================= - -Sprite_Damage_Flash: -{ - LDA $0EF0, X : BEQ .dontFlash - ; Change the palette to the next in the cycle - LDA $0DA0, X : INC : CMP.b #$08 : BNE .dontReset - LDA.b #$00 - - .dontReset - STA $0DA0, X - BRA .flash - -.dontFlash - STZ $0DA0, X - -.flash - RTS -} - -; ========================================================= - Sprite_Offspring_SpawnHead: { JSL GetRandomInt : AND.b #$3F : BNE .normal_head @@ -744,8 +710,7 @@ Sprite_KydrogBoss_Draw: LDA .start_index, Y : STA $06 ; Needs to be 16 bit ; Y = 00, 02, 04, 06 SEP #$20 - ; Store Palette thing - LDA $0DA0, X : STA $08 + LDA.w SprFlash, X : STA $08 PHX ; Store Sprite ID diff --git a/Sprites/Bosses/twinrova.asm b/Sprites/Bosses/twinrova.asm index 8d6b463..ee4fe9f 100644 --- a/Sprites/Bosses/twinrova.asm +++ b/Sprites/Bosses/twinrova.asm @@ -892,8 +892,7 @@ Sprite_Twinrova_Draw: LDA $0DC0, X : CLC : ADC $0D90, X : TAY;Animation Frame LDA .start_index, Y : STA $06 - ; Store Palette thing - LDA $0DA0, X : STA $08 + LDA.w SprFlash, X : STA $08 PHX LDX .nbr_of_tiles, Y ;amount of tiles -1 diff --git a/Sprites/Bosses/wolfos.asm b/Sprites/Bosses/wolfos.asm index 9aa5d33..7fd7dc4 100644 --- a/Sprites/Bosses/wolfos.asm +++ b/Sprites/Bosses/wolfos.asm @@ -337,9 +337,7 @@ Sprite_Wolfos_Draw: LDA $0DC0, X : CLC : ADC $0D90, X : TAY ;Animation Frame LDA .start_index, Y : STA $06 - - ; Store Palette thing - LDA $0DA0, X : STA $08 + LDA.w SprFlash, X : STA $08 PHX LDX .nbr_of_tiles, Y ;amount of tiles -1 diff --git a/Sprites/Enemies/anti_kirby.asm b/Sprites/Enemies/anti_kirby.asm index 4b3fde7..52c0ba2 100644 --- a/Sprites/Enemies/anti_kirby.asm +++ b/Sprites/Enemies/anti_kirby.asm @@ -336,7 +336,7 @@ Sprite_AntiKirby_Draw: LDA SprGfx, X : CLC : ADC SprFrame, X : TAY;Animation Frame LDA .start_index, Y : STA $06 - LDA.w SprMiscA, X : STA $08 + LDA.w SprFlash, X : STA $08 LDA.w SprMiscC, X : STA $09 PHX diff --git a/Sprites/Enemies/booki.asm b/Sprites/Enemies/booki.asm index 7501724..7b06db6 100644 --- a/Sprites/Enemies/booki.asm +++ b/Sprites/Enemies/booki.asm @@ -193,7 +193,8 @@ Sprite_Booki_Draw: LDA SprGfx, X : CLC : ADC SprFrame, X : TAY;Animation Frame LDA .start_index, Y : STA $06 - LDA.w SprMiscA, X : STA $08 + + LDA.w SprFlash, X : STA $08 LDA.w SprMiscC, X : STA $09 PHX diff --git a/Sprites/Enemies/darknut.asm b/Sprites/Enemies/darknut.asm index b32dcdb..bcea23e 100644 --- a/Sprites/Enemies/darknut.asm +++ b/Sprites/Enemies/darknut.asm @@ -39,6 +39,7 @@ Sprite_Darknut_Long: PHB : PHK : PLB JSR Sprite_Darknut_Draw ; Call the draw code + JSL Sprite_DrawShadow JSL Sprite_CheckActive ; Check if game is not paused BCC .SpriteIsNotActive ; Skip Main code is sprite is innactive @@ -143,8 +144,8 @@ Sprite_Darknut_Draw: LDA $0DC0, X : CLC : ADC $0D90, X : TAY;Animation Frame LDA .start_index, Y : STA $06 - LDA.w SprMiscA, X : STA $08 + LDA.w SprFlash, X : STA $08 PHX LDX .nbr_of_tiles, Y ;amount of tiles -1 diff --git a/Sprites/Enemies/goriya.asm b/Sprites/Enemies/goriya.asm index 13175f6..4c16c7e 100644 --- a/Sprites/Enemies/goriya.asm +++ b/Sprites/Enemies/goriya.asm @@ -295,7 +295,7 @@ Sprite_Goriya_Draw: LDA.w SprGfx, X : CLC : ADC.w SprFrame, X : TAY;Animation Frame LDA.w .start_index, Y : STA $06 - LDA.w SprMiscA, X : STA $08 + LDA.w SprFlash, X : STA $08 PHX LDX .nbr_of_tiles, Y ;amount of tiles - 1 @@ -389,7 +389,7 @@ Sprite_Boomerang_Draw: LDA SprGfx, X : CLC : ADC SprFrame, X : TAY;Animation Frame LDA .start_index, Y : STA $06 - LDA.w SprMiscA, X : STA $08 + LDA.w SprFlash, X : STA $08 PHX diff --git a/Sprites/Enemies/pols_voice.asm b/Sprites/Enemies/pols_voice.asm index 4b29670..cc46dc0 100644 --- a/Sprites/Enemies/pols_voice.asm +++ b/Sprites/Enemies/pols_voice.asm @@ -143,7 +143,7 @@ Sprite_PolsVoice_Draw: LDA $0DC0, X : CLC : ADC $0D90, X : TAY;Animation Frame LDA .start_index, Y : STA $06 - LDA $0DA0, X : STA $08 + LDA.w SprFlash, X : STA $08 PHX LDX .nbr_of_tiles, Y ;amount of tiles -1 diff --git a/Sprites/Enemies/puffstool.asm b/Sprites/Enemies/puffstool.asm index c0d7229..0cf6d87 100644 --- a/Sprites/Enemies/puffstool.asm +++ b/Sprites/Enemies/puffstool.asm @@ -214,7 +214,7 @@ Sprite_Puffstool_Draw: LDA $0DC0, X : CLC : ADC $0D90, X : TAY;Animation Frame LDA .start_index, Y : STA $06 - LDA.w SprMiscA, X : STA $08 ; Palette damage flash + LDA.w SprFlash, X : STA $08 ; Palette damage flash PHX LDX .nbr_of_tiles, Y ;amount of tiles -1 diff --git a/Sprites/Enemies/thunder_ghost.asm b/Sprites/Enemies/thunder_ghost.asm index 57f2088..5c0380d 100644 --- a/Sprites/Enemies/thunder_ghost.asm +++ b/Sprites/Enemies/thunder_ghost.asm @@ -224,7 +224,7 @@ Sprite_ThunderGhost_Draw: LDA $0DC0, X : CLC : ADC $0D90, X : TAY;Animation Frame LDA .start_index, Y : STA $06 - LDA.w SprMiscA, X : STA $08 + LDA.w SprFlash, X : STA $08 PHX