Set cart follower during Interroom Transition

2024-05-20 17:57:02 -04:00
parent f30c7d9ea4
commit 269702a41d
1 changed files with 18 additions and 2 deletions
--- 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