From 95a6ee24cd9856d3cfaaf6dedca2080156050e5b Mon Sep 17 00:00:00 2001
From: scawful <justin.scofield@outlook.com>
Date: Mon, 17 Jun 2024 00:39:36 -0400
Subject: [PATCH] add ThrownSprite_TileAndSpriteInteraction to puffstool, use
 gravity timer

---
 Sprites/Enemies/puffstool.asm       | 4 +++-
 Sprites/ZSpriteLib/sprite_hooks.asm | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Sprites/Enemies/puffstool.asm b/Sprites/Enemies/puffstool.asm
index c2c2841..6a1e51e 100644
--- a/Sprites/Enemies/puffstool.asm
+++ b/Sprites/Enemies/puffstool.asm
@@ -80,12 +80,13 @@ Sprite_Puffstool_Main:
 
     JSL Sprite_Move
     JSL Sprite_DamageFlash_Long
+    JSL ThrownSprite_TileAndSpriteInteraction_long
 
     JSL Sprite_CheckDamageFromPlayer : BCC .no_dano
       
       %GotoAction(1)
       LDA.b #$60 : STA.w SprTimerA, X
-      LDA.b #$60 : STA.w SprTimerF, X
+      LDA.b #$20 : STA.w SprTimerF, X
     .no_dano
 
     RTS
@@ -97,6 +98,7 @@ Sprite_Puffstool_Main:
 
     JSL Sprite_CheckIfLifted
     JSL Sprite_DamageFlash_Long
+    JSL ThrownSprite_TileAndSpriteInteraction_long
 
     LDA.w SprTimerA, X : BNE + 
       %GotoAction(0)
diff --git a/Sprites/ZSpriteLib/sprite_hooks.asm b/Sprites/ZSpriteLib/sprite_hooks.asm
index 33e8826..131d0d6 100644
--- a/Sprites/ZSpriteLib/sprite_hooks.asm
+++ b/Sprites/ZSpriteLib/sprite_hooks.asm
@@ -390,6 +390,8 @@ Sprite_SetSpawnedCoordinates = $09AE64
 
 Guard_ParrySwordAttacks = $06EB5E
 
+ThrownSprite_TileAndSpriteInteraction_long = $06DFF2
+
 ; =========================================================
 ; Local functions which may be useful for sprites
 ; Sprite_AttemptZapDamage - 06EC02