From a36068fb04fd6ea81761fe629c56a4981c4ffac6 Mon Sep 17 00:00:00 2001 From: aerinon Date: Wed, 15 Jun 2022 23:49:20 -0600 Subject: [PATCH 1/2] Fix for Zelda despawning near maiden cell --- doorrando/overrides.asm | 7 +++++++ hooks.asm | 9 ++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/doorrando/overrides.asm b/doorrando/overrides.asm index a8338ac..30d8e59 100644 --- a/doorrando/overrides.asm +++ b/doorrando/overrides.asm @@ -152,3 +152,10 @@ BlindsAtticHint: SEP #$20 : RTL ; skip the dialog box if the hole is already open + SEP #$20 : JML Main_ShowTextMessage +BlindZeldaDespawnFix: + CMP.b #01 : BEQ + ; don't despawn zelda + CMP.b #06 : BEQ + ; don't despawn blind + PLA : PLA : PEA.w SpritePrep_BlindMaiden_despawn_follower-1 : RTL + + PLA : PLA : PEA.w SpritePrep_BlindMaiden_kill_the_girl-1 : RTL + + diff --git a/hooks.asm b/hooks.asm index e85870e..84959ff 100755 --- a/hooks.asm +++ b/hooks.asm @@ -2584,7 +2584,14 @@ JSL.l QuickSwap org $0689AB ; <- 309AB - sprite_prep.asm: 647 (LDA $7EF3CC : CMP.b #$06 : BEQ .killSprite) ; Note: In JP 1.0 we have: (CMP.b #$00 : BNE .killSprite) appling US bugfix ; Prevent followers from causing blind/maiden to despawn: -CMP.b #$06 : db #$F0 ; BEQ +; Door rando: let zelda despawn the maiden. +JSL BlindZeldaDespawnFix + +org $0689AF +SpritePrep_BlindMaiden_despawn_follower: ; this is the normal execution path + +org $0689C9 +SpritePrep_BlindMaiden_kill_the_girl: ; not the follower ;-------------------------------------------------------------------------------- ; Fix old man purple chest issues using the same method as above org $1EE906 ; <- F6906 - sprite_old_mountain_man.asm : 31 (LDA $7EF3CC : CMP.b #$00 : BNE .already_have_tagalong) From ae1fde65f4656ab43618329d98dac2aa83eeeef3 Mon Sep 17 00:00:00 2001 From: aerinon Date: Thu, 16 Jun 2022 06:45:11 -0600 Subject: [PATCH 2/2] Fix for followers despawning near maiden cell --- doorrando/overrides.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doorrando/overrides.asm b/doorrando/overrides.asm index 30d8e59..7516be6 100644 --- a/doorrando/overrides.asm +++ b/doorrando/overrides.asm @@ -153,8 +153,8 @@ BlindsAtticHint: + SEP #$20 : JML Main_ShowTextMessage BlindZeldaDespawnFix: - CMP.b #01 : BEQ + ; don't despawn zelda - CMP.b #06 : BEQ + ; don't despawn blind + CMP.b #06 : BEQ + + LDA.w $0D00,X : BEQ + ; don't despawn follower if maiden isn't "present" PLA : PLA : PEA.w SpritePrep_BlindMaiden_despawn_follower-1 : RTL + PLA : PLA : PEA.w SpritePrep_BlindMaiden_kill_the_girl-1 : RTL