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

add anti kirby hatted actions

Browse Source
This commit is contained in:
scawful
2024-06-28 19:33:55 -04:00
parent 01f9bcb9ce
commit 5551f165fd
1 changed files with 38 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
Sprites/Enemies/anti_kirby.asm
View File

@@ -101,6 +101,8 @@ Sprite_AntiKirby_Main:
dw AntiKirby_BeginSuck dw AntiKirby_BeginSuck
dw AntiKirby_Sucking dw AntiKirby_Sucking
dw AntiKirby_Full dw AntiKirby_Full
dw AntiKirby_Hatted
dw AntiKirby_HattedHurt
dw AntiKirby_Death dw AntiKirby_Death
AntiKirby_Main: AntiKirby_Main:
@@ -127,7 +129,7 @@ Sprite_AntiKirby_Main:
.NoDamage .NoDamage
%DoDamageToPlayerSameLayerOnContact() %DoDamageToPlayerSameLayerOnContact()
%MoveTowardPlayer(10) %MoveTowardPlayer(8)
JSL Sprite_BounceFromTileCollision JSL Sprite_BounceFromTileCollision
JSL Sprite_PlayerCantPassThrough JSL Sprite_PlayerCantPassThrough
@@ -191,8 +193,9 @@ Sprite_AntiKirby_Main:
.dont_tongue_link .dont_tongue_link
JSL Sprite_DirectionToFacePlayer JSL Sprite_DirectionToFacePlayer
LDA.b $0E : CLC : ADC.b #$10 : CMP.b #$10 : BCS .NotDone LDA.b $0E : CMP.b #$10 : BCS .NotDone
LDA.b $0F : CLC : ADC.b #$10 : CMP.b #$10 : BCS .NotDone LDA.b $0F : CMP.b #$10 : BCS .NotDone
%SetTimerA($60)
INC.w SprAction, X INC.w SprAction, X
RTS RTS
.NotDone .NotDone
@@ -207,17 +210,40 @@ Sprite_AntiKirby_Main:
%PlayAnimation(6, 6, 10) ; Full %PlayAnimation(6, 6, 10) ; Full
LDA.w SprTimerA, X : BNE .lickylicky LDA.w SprTimerA, X : BNE .lickylicky
STZ.w SprAction, X INC.w SprAction, X
%SetTimerA($60)
LDA.b #$10
STA.w SprTimerA, X
STZ.w SprFrame, X
STZ.w SprMiscG, X STZ.w SprMiscG, X
RTS RTS
.lickylicky .lickylicky
RTS
}
AntiKirby_Hatted:
{
%PlayAnimation(7, 9, 10) ; Hatted
%DoDamageToPlayerSameLayerOnContact()
%MoveTowardPlayer(8)
JSL Sprite_BounceFromTileCollision
JSL Sprite_PlayerCantPassThrough
JSL Sprite_CheckDamageFromPlayerLong : BCC .NoDamage
LDA #!RecoilTime : STA SprTimerA, X
%GotoAction(7) ; Hurt
RTS
.NoDamage
RTS
}
AntiKirby_HattedHurt:
{
%PlayAnimation(10, 10, 10) ; Hatted Hurt
LDA SprTimerA, X : BNE .NotDone
LDA.b #$07 : STA.w SprFrame, X
%GotoAction(5)
.NotDone
RTS RTS
} }
@@ -407,12 +433,14 @@ Sprite_AntiKirby_Draw:
db $22, $23 db $22, $23
db $22, $23 db $22, $23
.properties .properties
; Normal Kirby
db $33 db $33
db $33 db $33
db $33 db $33
db $33 db $33
db $33 db $33
db $33 db $33
; Link hat kirby
db $3B, $3B db $3B, $3B
db $3B, $3B db $3B, $3B
db $3B, $3B db $3B, $3B