From 690a9e40037f18dc387ffb28ea98567bbe6416f4 Mon Sep 17 00:00:00 2001
From: scawful <justin.scofield@outlook.com>
Date: Sun, 6 Oct 2024 09:40:40 -0400
Subject: [PATCH] Add SetupDistanceFromSprite macro

---
 Sprites/Enemies/business_scrub.asm   |  5 +----
 Sprites/ZSpriteLib/sprite_macros.asm | 12 ++++++++++--
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/Sprites/Enemies/business_scrub.asm b/Sprites/Enemies/business_scrub.asm
index 5a9c27f..641f944 100644
--- a/Sprites/Enemies/business_scrub.asm
+++ b/Sprites/Enemies/business_scrub.asm
@@ -135,10 +135,7 @@ Sprite_DekuScrubEnemy_Main:
       INC.w SprAction, X
     .not_done
 
-    LDA.w POSX : STA $02
-    LDA.w POSY : STA $03
-    LDA.w SprX, X : STA $04
-    LDA.w SprY, X : STA $05
+    %SetupDistanceFromSprite()
     JSL GetDistance8bit_Long : CMP #$18 : BCS .not_too_close
       %GotoAction(0)
     .not_too_close
diff --git a/Sprites/ZSpriteLib/sprite_macros.asm b/Sprites/ZSpriteLib/sprite_macros.asm
index ab9105d..ee7ddc4 100644
--- a/Sprites/ZSpriteLib/sprite_macros.asm
+++ b/Sprites/ZSpriteLib/sprite_macros.asm
@@ -210,9 +210,17 @@ macro SetTimerF(length)
 endmacro
 
 macro NextAction()
-  INC $0D80, X 
+  INC $0D80, X
 endmacro
 
 macro GetTilePos(x, y)
   LDX.w #((<y>*$80)+(<x>*$02))
-endmacro
\ No newline at end of file
+endmacro
+
+macro SetupDistanceFromSprite()
+  LDA.w POSX : STA $02
+  LDA.w POSY : STA $03
+  LDA.w SprX, X : STA $04
+  LDA.w SprY, X : STA $05
+endmacro
+