Fixed issue with Old Man follower infinite pit fall

2026-01-17 00:51:26 -06:00
parent 3c41d7ff39
commit 7898e2149f
2 changed files with 14 additions and 1 deletions
--- a/follower.asm
+++ b/follower.asm
@@ -23,7 +23,7 @@ JSL SpritePrep_OldManFollower : NOP #2 : db $F0 ; BEQ
 org $9DFF18
 JSL SpriteDraw_OldManFollower
 org $9EE9BC
-JSL Follower_CheckMessageCollision
+JSL OldMan_WaitForCollision
 org $9EE9CC
 JSL OldMan_BecomeFollower : NOP #2

@@ -631,6 +631,15 @@ SpriteDraw_OldManFollower:
 dw 0,  0 : db $AC, $00, $00, $02
 dw 0,  8 : db $AE, $00, $00, $02

+OldMan_WaitForCollision:
+    PHA
+    LDA.w LinkIFrames : BEQ +
+        PLA : CLC
+        RTL
+    +
+    PLA
+    JML Follower_CheckMessageCollision
+
 OldMan_BecomeFollower:
    LDA.l FollowerTravelAllowed : CMP.b #$02 : BCC .set_follower_and_despawn
        PLA : PLA