From 269702a41d84861c784cfd7c20e4b4682f540c07 Mon Sep 17 00:00:00 2001
From: scawful <justin.scofield@outlook.com>
Date: Mon, 20 May 2024 17:57:02 -0400
Subject: [PATCH] Set cart follower during Interroom Transition

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

diff --git a/Sprites/Objects/minecart.asm b/Sprites/Objects/minecart.asm
index 7a46a05..2084afb 100644
--- a/Sprites/Objects/minecart.asm
+++ b/Sprites/Objects/minecart.asm
@@ -1128,17 +1128,33 @@ CheckForMinecartFollowerDraw:
     JSR DrawMinecartFollower
     
   .not_minecart
-    LDA.b #$10
-    STA.b $5E
+    ; LDA.b #$10
+    ; STA.b $5E
     PLB 
     RTL
 }
 
+CheckForFollowerInterroomTransition:
+{
+  PHB : PHK : PLB
+  LDA.w !LinkInCart : BEQ .not_in_cart
+    LDA.b #$0B : STA $7EF3CC
+  .not_in_cart
+  PLB
+  JSL $01873A ; Underworld_LoadRoom
+  RTL
+}
+
 pushpc
 
 ; Follower_OldManUnused
 org $09A41F
   JSL CheckForMinecartFollowerDraw
+  RTS
+
+; Module07_02_01_LoadNextRoom
+org $028A5B
+  JSL CheckForFollowerInterroomTransition
 
 pullpc