From f30c7d9ea47ad915d646bdb6d454eb0158ecb6c4 Mon Sep 17 00:00:00 2001
From: scawful <justin.scofield@outlook.com>
Date: Mon, 20 May 2024 17:56:31 -0400
Subject: [PATCH] Spawn minecart sprite from follower in the correct movement
 state

---
 Sprites/Objects/minecart.asm | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/Sprites/Objects/minecart.asm b/Sprites/Objects/minecart.asm
index d98ffe9..7a46a05 100644
--- a/Sprites/Objects/minecart.asm
+++ b/Sprites/Objects/minecart.asm
@@ -1005,13 +1005,33 @@ DrawMinecartFollower:
 {
   JSL $099EFC
 
+  LDX $012B 
+  LDA .direction_to_anim, X
+  STA $02CF
+
   JSR FollowerDraw_CachePosition
   JSR MinecartFollower_Top
-
-  JSR FollowerDraw_CachePosition
   JSR MinecartFollower_Bottom
 
+  LDA.b $11 : BNE .dont_spawn
+    LDA !LinkInCart : BEQ .dont_spawn
+      LDA.b #$A3 
+      JSL Sprite_SpawnDynamically
+      TYX
+      JSL Sprite_SetSpawnedCoords
+      LDA POSY : STA SprY, X
+      LDA POSYH : STA SprYH, X
+      LDA POSX : STA SprX, X
+      LDA POSXH : STA SprXH, X
+      LDA.w !MinecartDirection : CLC : ADC.b #$04 : STA.w SprSubtype, X
+      
+      JSL Sprite_Minecart_Prep
+      LDA.b #$00 : STA.l $7EF3CC
+  .dont_spawn
   RTS
+
+.direction_to_anim
+  db $02, $00, $02, $00
 }
 
 FollowerDraw_CachePosition: