From cbfe45982027141d118a46f13fb99d13d2dfefae Mon Sep 17 00:00:00 2001
From: scawful <justin.scofield@outlook.com>
Date: Tue, 10 Dec 2024 20:15:27 -0500
Subject: [PATCH] Move Minecart Track tile type behavior to followers.asm

---
 Dungeons/Objects/object_handler.asm | 17 -----------------
 Sprites/NPCs/followers.asm          | 19 ++++++++++++++++++-
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/Dungeons/Objects/object_handler.asm b/Dungeons/Objects/object_handler.asm
index 7da85b3..4752842 100644
--- a/Dungeons/Objects/object_handler.asm
+++ b/Dungeons/Objects/object_handler.asm
@@ -5,23 +5,6 @@ TileBehavior_Nothing = $07DC54
 TileBehavior_Pit = $07DC8B
 TileBehavior_Door = $07DD0A
 
-; Minecart Track tile types
-org $07D938
-  dw TileBehavior_Nothing ; 0xB0 UW LR
-  dw TileBehavior_Nothing ; 0xB1 UW UD
-  dw TileBehavior_Nothing ; 0xB2 UW TL
-  dw TileBehavior_Nothing ; 0xB3 UW BL
-  dw TileBehavior_Nothing ; 0xB4 UW TR
-  dw TileBehavior_Nothing ; 0xB5 UW BR
-  dw TileBehavior_Nothing ; 0xB6 UW Any
-  dw TileBehavior_Nothing ; 0xB7 UW Stop Top
-  dw TileBehavior_Nothing ; 0xB8 UW Stop Bottom
-  dw TileBehavior_Nothing ; 0xB9 UW Stop Left
-  dw TileBehavior_Nothing ; 0xBA UW Stop Right
-  dw TileBehavior_Pit     ; 0xBB UW Pit LR
-  dw TileBehavior_Pit     ; 0xBC UW Pit UD
-  dw TileBehavior_Pit     ; 0xBD UW Any
-
 org $018262 ; Object ID 0x31
   dw ExpandedObject
 
diff --git a/Sprites/NPCs/followers.asm b/Sprites/NPCs/followers.asm
index 22417f4..445c393 100644
--- a/Sprites/NPCs/followers.asm
+++ b/Sprites/NPCs/followers.asm
@@ -939,7 +939,7 @@ CheckForFollowerIntraroomTransition:
   RTL
 }
 
-; 0x08
+; 0x09
 LinkState_Minecart:
 {
   PHB : PHK : PLB
@@ -1009,6 +1009,23 @@ org $07A5F7
 
 assert pc() <= $07A64B
 
+; Minecart Track tile types
+org $07D938
+  dw TileBehavior_Nothing ; 0xB0 UW LR
+  dw TileBehavior_Nothing ; 0xB1 UW UD
+  dw TileBehavior_Nothing ; 0xB2 UW TL
+  dw TileBehavior_Nothing ; 0xB3 UW BL
+  dw TileBehavior_Nothing ; 0xB4 UW TR
+  dw TileBehavior_Nothing ; 0xB5 UW BR
+  dw TileBehavior_Nothing ; 0xB6 UW Any
+  dw TileBehavior_Nothing ; 0xB7 UW Stop Top
+  dw TileBehavior_Nothing ; 0xB8 UW Stop Bottom
+  dw TileBehavior_Nothing ; 0xB9 UW Stop Left
+  dw TileBehavior_Nothing ; 0xBA UW Stop Right
+  dw TileBehavior_Nothing ; TileBehavior_Pit     ; 0xBB UW Pit LR
+  dw TileBehavior_Nothing ; TileBehavior_Pit     ; 0xBC UW Pit UD
+  dw TileBehavior_Nothing ; TileBehavior_Pit     ; 0xBD UW Any
+
 ; Follower_OldManUnused
 org $09A41F
   JSL CheckForMinecartFollowerDraw