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

replace sprite labels, more cleanup

Browse Source
This commit is contained in:
scawful
2024-07-07 11:11:10 -04:00
parent 1f2bb46559
commit 8c1ff13681
14 changed files with 55 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Sprites/Enemies/anti_kirby.asm
View File

@@ -122,7 +122,7 @@ Sprite_AntiKirby_Main:
%PlayAnimation(0, 2, 10) ; Start
JSL Sprite_CheckDamageFromPlayerLong : BCC .NoDamage
JSL Sprite_CheckDamageFromPlayer : BCC .NoDamage
LDA #!RecoilTime : STA.w SprTimerA, X
%GotoAction(1) ; Hurt
RTS
@@ -152,7 +152,7 @@ Sprite_AntiKirby_Main:
{
%PlayAnimation(4, 5, 10) ; Suck
JSL Sprite_CheckDamageFromPlayerLong : BCC .NoDamage
JSL Sprite_CheckDamageFromPlayer : BCC .NoDamage
LDA #!RecoilTime : STA.w SprTimerA, X
%GotoAction(1) ; Hurt
RTS
@@ -234,7 +234,7 @@ Sprite_AntiKirby_Main:
JSL Sprite_BounceFromTileCollision
JSL Sprite_PlayerCantPassThrough
JSL Sprite_CheckDamageFromPlayerLong : BCC .NoDamage
JSL Sprite_CheckDamageFromPlayer : BCC .NoDamage
LDA #!RecoilTime : STA.w SprTimerA, X
%GotoAction(6) ; Hurt
.NoDamage

2
Sprites/Enemies/deku_scrub_enemy.asm
View File

@@ -221,7 +221,7 @@ Sprite_DekuScrubEnemy_Main:
STZ.w SprState, X
.no_collision
JSL Sprite_CheckDamageFromPlayerLong : BCC .no_damage
JSL Sprite_CheckDamageFromPlayer : BCC .no_damage
; Apply force in the opposite direction
LDA #-16 : STA.w SprYSpeed, X
.no_damage

4
Sprites/Enemies/pols_voice.asm
View File

@@ -88,7 +88,7 @@ Sprite_PolsVoice_Main:
%GotoAction(1)
.not_done
JSL Sprite_CheckDamageFromPlayerLong : BCC .no_damage
JSL Sprite_CheckDamageFromPlayer : BCC .no_damage
JSL Sprite_DirectionToFacePlayer
; Apply the speed positive or negative speed
@@ -124,7 +124,7 @@ Sprite_PolsVoice_Main:
LDA SprTimerA, X : BNE .not_done
%GotoAction(0)
.not_done
JSL Sprite_CheckDamageFromPlayerLong : BCC .no_damage
JSL Sprite_CheckDamageFromPlayer : BCC .no_damage
JSL Sprite_InvertSpeed_XY
.no_damage
RTS

2
Sprites/Enemies/sea_urchin.asm
View File

@@ -69,7 +69,7 @@ Sprite_SeaUrchin_Main:
%DoDamageToPlayerSameLayerOnContact()
JSL Sprite_CheckDamageFromPlayerLong
JSL Sprite_CheckDamageFromPlayer
BCC .NoDamage
%GotoAction(1)