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

add ThrownSprite_TileAndSpriteInteraction to puffstool, use gravity timer

Browse Source
This commit is contained in:
scawful
2024-06-17 00:39:36 -04:00
parent 3319e775c1
commit 95a6ee24cd
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Sprites/Enemies/puffstool.asm
View File

@@ -80,12 +80,13 @@ Sprite_Puffstool_Main:
JSL Sprite_Move JSL Sprite_Move
JSL Sprite_DamageFlash_Long JSL Sprite_DamageFlash_Long
JSL ThrownSprite_TileAndSpriteInteraction_long
JSL Sprite_CheckDamageFromPlayer : BCC .no_dano JSL Sprite_CheckDamageFromPlayer : BCC .no_dano
%GotoAction(1) %GotoAction(1)
LDA.b #$60 : STA.w SprTimerA, X LDA.b #$60 : STA.w SprTimerA, X
LDA.b #$60 : STA.w SprTimerF, X LDA.b #$20 : STA.w SprTimerF, X
.no_dano .no_dano
RTS RTS
@@ -97,6 +98,7 @@ Sprite_Puffstool_Main:
JSL Sprite_CheckIfLifted JSL Sprite_CheckIfLifted
JSL Sprite_DamageFlash_Long JSL Sprite_DamageFlash_Long
JSL ThrownSprite_TileAndSpriteInteraction_long
LDA.w SprTimerA, X : BNE + LDA.w SprTimerA, X : BNE +
%GotoAction(0) %GotoAction(0)

2
Sprites/ZSpriteLib/sprite_hooks.asm
View File

@@ -390,6 +390,8 @@ Sprite_SetSpawnedCoordinates = $09AE64
Guard_ParrySwordAttacks = $06EB5E Guard_ParrySwordAttacks = $06EB5E
ThrownSprite_TileAndSpriteInteraction_long = $06DFF2
; ========================================================= ; =========================================================
; Local functions which may be useful for sprites ; Local functions which may be useful for sprites
; Sprite_AttemptZapDamage - 06EC02 ; Sprite_AttemptZapDamage - 06EC02