From aa50be2e15619dfc14685fe00bb74a919af0e538 Mon Sep 17 00:00:00 2001
From: scawful <justin.scofield@outlook.com>
Date: Tue, 10 Dec 2024 17:55:10 -0500
Subject: [PATCH] Move ZSpriteLib files to Core

---
 .../ZSpriteLib => Core}/sprite_functions.asm    | 17 ++++-------------
 {Sprites/ZSpriteLib => Core}/sprite_macros.asm  |  0
 .../ZSpriteLib => Core}/sprite_new_table.asm    |  0
 3 files changed, 4 insertions(+), 13 deletions(-)
 rename {Sprites/ZSpriteLib => Core}/sprite_functions.asm (98%)
 rename {Sprites/ZSpriteLib => Core}/sprite_macros.asm (100%)
 rename {Sprites/ZSpriteLib => Core}/sprite_new_table.asm (100%)

diff --git a/Sprites/ZSpriteLib/sprite_functions.asm b/Core/sprite_functions.asm
similarity index 98%
rename from Sprites/ZSpriteLib/sprite_functions.asm
rename to Core/sprite_functions.asm
index 45242e4..c36b527 100644
--- a/Sprites/ZSpriteLib/sprite_functions.asm
+++ b/Core/sprite_functions.asm
@@ -93,13 +93,6 @@ Sprite_MoveAltitude:
   RTL
 }
 
-Sprite_GetDirectionToFacePlayer:
-{
-  JSL Sprite_DirectionToFacePlayer
-
-  RTL
-}
-
 ; =========================================================
 ; make the sprite bounce toward player
 ; movement, collision are handled by this function
@@ -308,19 +301,17 @@ Sprite_DamageFlash_Long:
   RTL
 }
 
-; =========================================================
-
 Sprite_Damage_Flash:
 {
-  LDA $0EF0, X : BEQ .dontFlash
+  LDA.w SprDeath, X : BEQ .dont_flash
     ; Change the palette to the next in the cycle
-    LDA.w SprFlash, X : INC : CMP.b #$08 : BNE .dontReset
+    LDA.w SprFlash, X : INC : CMP.b #$08 : BNE .dont_reset
       LDA.b #$00
-    .dontReset
+    .dont_reset
     STA.w SprFlash, X
     BRA .flash
 
-  .dontFlash
+  .dont_flash
   STZ.w SprFlash, X
 
   .flash
diff --git a/Sprites/ZSpriteLib/sprite_macros.asm b/Core/sprite_macros.asm
similarity index 100%
rename from Sprites/ZSpriteLib/sprite_macros.asm
rename to Core/sprite_macros.asm
diff --git a/Sprites/ZSpriteLib/sprite_new_table.asm b/Core/sprite_new_table.asm
similarity index 100%
rename from Sprites/ZSpriteLib/sprite_new_table.asm
rename to Core/sprite_new_table.asm