alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Pull Requests 1 Releases Activity

Fix crash when Old Man exits out of his House entrance

Browse Source
This commit is contained in:
codemann8
2025-07-11 04:54:28 -05:00
parent d75d912c7d
commit 7164c3159d
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
follower.asm
View File

@@ -4,6 +4,8 @@ org $81EBB6
JSL MaybeSetZeldaCheckpoint JSL MaybeSetZeldaCheckpoint
org $899FA1 org $899FA1
db $FF, $FF, $FF ; disable timed follower messages db $FF, $FF, $FF ; disable timed follower messages
org $89A647
JSL MaybeSkipFollowerTrigger : NOP
org $89F544 org $89F544
JSL MaybeDeleteFollowersOnDeath JSL MaybeDeleteFollowersOnDeath
@@ -95,6 +97,14 @@ org $86BDB4
JSL SpriteDraw_LocksmithFollower JSL SpriteDraw_LocksmithFollower
pullpc 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: MaybeDeleteFollowersOnDeath:
LDA.l FollowerTravelAllowed : CMP.b #$02 : BNE .vanilla LDA.l FollowerTravelAllowed : CMP.b #$02 : BNE .vanilla
; s+q = favor keeping current follower ; s+q = favor keeping current follower