scawful/oracle-of-secrets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Kirby consume player attack improvement

Browse Source
This commit is contained in:
scawful
2024-12-02 13:03:43 -05:00
parent 5a5dc38712
commit bbe79f23e3
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Sprites/Enemies/anti_kirby.asm
View File

@@ -120,8 +120,6 @@ Sprite_AntiKirby_Main:
%DoDamageToPlayerSameLayerOnContact() %DoDamageToPlayerSameLayerOnContact()
%MoveTowardPlayer(8) %MoveTowardPlayer(8)
JSL Sprite_BounceFromTileCollision JSL Sprite_BounceFromTileCollision
JSL Sprite_PlayerCantPassThrough
RTS RTS
} }
@@ -176,6 +174,9 @@ Sprite_AntiKirby_Main:
JSL Sprite_DirectionToFacePlayer JSL Sprite_DirectionToFacePlayer
LDA.b $0E : CMP.b #$10 : BCS .NotDone LDA.b $0E : CMP.b #$10 : BCS .NotDone
LDA.b $0F : CMP.b #$10 : BCS .NotDone LDA.b $0F : CMP.b #$10 : BCS .NotDone
LDA POSX : STA.w SprMiscB, X
LDA POSY : STA.w SprMiscA, X
LDA.b #$0C : STA.b $4B
%SetTimerA($80) %SetTimerA($80)
LDA.b #$0A : STA.w SprFrame, X LDA.b #$0A : STA.w SprFrame, X
INC.w SprAction, X INC.w SprAction, X
@@ -190,10 +191,13 @@ Sprite_AntiKirby_Main:
AntiKirby_Full: AntiKirby_Full:
{ {
%PlayAnimation(10, 10, 10) %PlayAnimation(10, 10, 10)
LDA.w SprMiscA, X : STA.b POSY
LDA.w SprMiscB, X : STA.b POSX
LDA.w SprTimerA, X : BNE + LDA.w SprTimerA, X : BNE +
INC.w SprAction, X INC.w SprAction, X
%SetTimerA($60) %SetTimerA($60)
STZ.w SprMiscG, X STZ.w SprMiscG, X
STZ.b $4B
RTS RTS
+ +
RTS RTS
@@ -205,7 +209,6 @@ Sprite_AntiKirby_Main:
%DoDamageToPlayerSameLayerOnContact() %DoDamageToPlayerSameLayerOnContact()
%MoveTowardPlayer(8) %MoveTowardPlayer(8)
JSL Sprite_BounceFromTileCollision JSL Sprite_BounceFromTileCollision
JSL Sprite_PlayerCantPassThrough
JSL Sprite_CheckDamageFromPlayer : BCC .NoDamage JSL Sprite_CheckDamageFromPlayer : BCC .NoDamage
LDA #!RecoilTime : STA.w SprTimerA, X LDA #!RecoilTime : STA.w SprTimerA, X
%GotoAction(6) ; Hurt %GotoAction(6) ; Hurt