Fix crash when Old Man exits out of his House entrance

2025-07-11 04:54:28 -05:00
parent d75d912c7d
commit 7164c3159d
1 changed files with 10 additions and 0 deletions
--- 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