From 87784b769321869a9d68cf244da95dc97bd1ee54 Mon Sep 17 00:00:00 2001
From: scawful <justin.scofield@outlook.com>
Date: Sun, 8 Dec 2024 20:12:56 -0500
Subject: [PATCH] minecart subtype bug fix

---
 Sprites/NPCs/followers.asm   | 2 +-
 Sprites/Objects/minecart.asm | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Sprites/NPCs/followers.asm b/Sprites/NPCs/followers.asm
index f7e56ae..8a8e1d8 100644
--- a/Sprites/NPCs/followers.asm
+++ b/Sprites/NPCs/followers.asm
@@ -819,7 +819,7 @@ DrawMinecartFollower:
       .finish_prep
       LDA.w POSYH : STA.w SprYH, X
       LDA.w POSXH : STA.w SprXH, X
-      LDA.w !MinecartDirection : CLC : ADC.b #$03 : STA.w SprSubtype, X
+      LDA.w !MinecartDirection : CLC : ADC.b #$04 : STA.w SprSubtype, X
 
       LDA .direction_to_anim, X : STA $0D90, X
       JSL Sprite_Minecart_Prep
diff --git a/Sprites/Objects/minecart.asm b/Sprites/Objects/minecart.asm
index a235cb7..555b028 100644
--- a/Sprites/Objects/minecart.asm
+++ b/Sprites/Objects/minecart.asm
@@ -110,7 +110,7 @@ Sprite_Minecart_Prep:
 
   ; If the subtype is > 4, then it's an active cart
   LDA.w SprSubtype, X : CMP.b #$04 : BCC +
-    LDA.w SprSubtype, X : SEC : SBC.b #$03 : STA.w SprSubtype, X
+    LDA.w SprSubtype, X : SEC : SBC.b #$04 : STA.w SprSubtype, X
     LDA.b #$01 : STA.w SprMiscF, X ; Set the auto-move flag
   +
 
@@ -171,7 +171,7 @@ endmacro
 macro MoveCart()
   JSR HandleTileDirections
   JSR HandleDynamicSwitchTileDirections
-  LDA #$35 : STA $012E                  ; Cart SFX
+  LDA #$35 : STA $012E ; Cart SFX
 endmacro
 
 macro StopCart()
@@ -627,7 +627,7 @@ HandleTileDirections:
   JSR CheckForOutOfBounds
   JSR CheckForStopTiles
   JSR CheckForCornerTiles : BCC .done
-  JSR CheckForTrackTiles
+  ; JSR CheckForTrackTiles
   .done
   LDA #$0F : STA.w SprTimerA, X
   RTS