From 7164c3159dfb70c4b0c6a18aef9e857d96862ba4 Mon Sep 17 00:00:00 2001
From: codemann8 <codemann8@gmail.com>
Date: Fri, 11 Jul 2025 04:54:28 -0500
Subject: [PATCH] Fix crash when Old Man exits out of his House entrance

---
 follower.asm | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/follower.asm b/follower.asm
index ae6a777..7b4631a 100644
--- a/follower.asm
+++ b/follower.asm
@@ -4,6 +4,8 @@ org $81EBB6
 JSL MaybeSetZeldaCheckpoint
 org $899FA1
 db $FF, $FF, $FF ; disable timed follower messages
+org $89A647
+JSL MaybeSkipFollowerTrigger : NOP
 org $89F544
 JSL MaybeDeleteFollowersOnDeath
 
@@ -95,6 +97,14 @@ org $86BDB4
 JSL SpriteDraw_LocksmithFollower
 pullpc
 
+MaybeSkipFollowerTrigger:
+    LDA.b GameMode : AND.w #$00FF : CMP.w #$0010 : BNE .normal
+.no_trigger
+    INC : RTL
+.normal
+    LDA.w $02F2 : AND.b Scrap06 ; what we wrote over
+    RTL
+
 MaybeDeleteFollowersOnDeath:
     LDA.l FollowerTravelAllowed : CMP.b #$02 : BNE .vanilla
         ; s+q = favor keeping current follower