From f034a5c1082cce1834ce3ff91e06d62d9b17204b Mon Sep 17 00:00:00 2001
From: scawful <justin.scofield@outlook.com>
Date: Fri, 20 Dec 2024 17:22:37 -0500
Subject: [PATCH] Restore Minecart sprite behavior

---
 Sprites/NPCs/followers.asm | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Sprites/NPCs/followers.asm b/Sprites/NPCs/followers.asm
index 445c393..118c46f 100644
--- a/Sprites/NPCs/followers.asm
+++ b/Sprites/NPCs/followers.asm
@@ -795,12 +795,14 @@ MinecartFollower_TransitionToSprite:
   .finish_prep
   LDA.w POSYH : STA.w SprYH, X
   LDA.w POSXH : STA.w SprXH, X
-  LDA.w !MinecartDirection : CLC : ADC.b #$04 : STA.w SprSubtype, X
+  LDA.w !MinecartDirection
+  CLC : ADC.b #$04
+  STA.w SprSubtype, X
 
   LDA Minecart_AnimDirection, X : STA $0D90, X
   JSL Sprite_Minecart_Prep
   LDA.b #$00 : STA.l $7EF3CC
-  RTS
+  RTL
 }
 
 ; Minecart Follower Main Routine and Draw
@@ -818,8 +820,8 @@ DrawMinecartFollower:
   ; Check the current submodule in the underworld
   LDA.b $11 : BNE .dont_spawn
     LDA !LinkInCart : BEQ .dont_spawn
-      LDA.b #$09 : STA.b LinkState
-      ;JSR MinecartFollower_TransitionToSprite
+      ;LDA.b #$09 : STA.b LinkState
+      JSL MinecartFollower_TransitionToSprite
   .dont_spawn
   RTS
 }