From 3a84630d41e27cd56f1eb3dcd2b537db7b82b64a Mon Sep 17 00:00:00 2001
From: scawful <justin.scofield@outlook.com>
Date: Thu, 29 Aug 2024 21:46:41 -0400
Subject: [PATCH] update goron sprite, include in game

---
 Sprites/NPCs/goron.asm  | 29 +++++++++++++++++++++++++----
 Sprites/all_sprites.asm |  3 +++
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/Sprites/NPCs/goron.asm b/Sprites/NPCs/goron.asm
index d6b68e6..da98b85 100644
--- a/Sprites/NPCs/goron.asm
+++ b/Sprites/NPCs/goron.asm
@@ -1,7 +1,8 @@
+; Goron Sprite
 
-!SPRID              = $00; The sprite ID you are overwriting (HEX)
-!NbrTiles           = 00 ; Number of tiles used in a frame
-!Harmless           = 00  ; 00 = Sprite is Harmful,  01 = Sprite is Harmless
+!SPRID              = $F2 ; The sprite ID you are overwriting (HEX)
+!NbrTiles           = 04  ; Number of tiles used in a frame
+!Harmless           = 01  ; 00 = Sprite is Harmful,  01 = Sprite is Harmless
 !HVelocity          = 00  ; Is your sprite going super fast? put 01 if it is
 !Health             = 00  ; Number of Health the sprite have
 !Damage             = 00  ; (08 is a whole heart), 04 is half heart
@@ -38,7 +39,7 @@ Sprite_Goron_Long:
   .kalyxo
   JSR Sprite_KalyxoGoron_Draw
   +
-
+  JSL Sprite_DrawShadow
   JSL Sprite_CheckActive
   BCC .SpriteIsNotActive
 
@@ -64,15 +65,35 @@ Sprite_Goron_Main:
   JSL UseImplicitRegIndexedLocalJumpTable
 
   dw KalyxoGoron_Main
+
   dw EonGoron_Main
+  dw EonGoron_Sing
+  dw EonGoron_Punch
 
   KalyxoGoron_Main:
   {
+    JSL Sprite_PlayerCantPassThrough
     RTS
   }
 
   EonGoron_Main:
   {
+    %PlayAnimation(0, 1, 10)
+    JSL Sprite_PlayerCantPassThrough
+    RTS
+  }
+
+  EonGoron_Sing:
+  {
+    %PlayAnimation(2, 3, 10)
+    JSL Sprite_PlayerCantPassThrough
+    RTS
+  }
+
+  EonGoron_Punch:
+  {
+    %PlayAnimation(4, 5, 10)
+    JSL Sprite_PlayerCantPassThrough
     RTS
   }
 }
diff --git a/Sprites/all_sprites.asm b/Sprites/all_sprites.asm
index 8132c53..a6b6661 100644
--- a/Sprites/all_sprites.asm
+++ b/Sprites/all_sprites.asm
@@ -271,6 +271,9 @@ print "End of eon_owl.asm                ", pc
 incsrc "Sprites/NPCs/fortune_teller.asm"
 print  "End of fortune_teller.asm         ", pc
 
+incsrc "Sprites/NPCs/goron.asm"
+print  "End of goron.asm                  ", pc
+
 ; =========================================================
 
 ; Sprite Recoil and Death