From bfbc7f16b1fa0d5486be7e4d097ae246100a820f Mon Sep 17 00:00:00 2001 From: codemann8 Date: Wed, 19 Jan 2022 00:23:24 -0600 Subject: [PATCH] Fixed issue with spawning on Pyramid/HC Ledge with old man --- darkworldspawn.asm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/darkworldspawn.asm b/darkworldspawn.asm index aefa8ba..1dc7a8a 100644 --- a/darkworldspawn.asm +++ b/darkworldspawn.asm @@ -10,6 +10,7 @@ DoWorldFix: LDA InvertedMode : BEQ + JMP DoWorldFix_Inverted + + LDA $7EF3CC : CMP #$04 : BEQ .aga1Alive ; if old man following, skip mirror/aga check LDA.l Bugfix_MirrorlessSQToLW : BEQ .skip_mirror_check LDA $7EF353 : AND #$02 : BEQ .noMirror ; check if we have the mirror .skip_mirror_check ; alt entrance point @@ -53,6 +54,7 @@ JMP DoWorldFix_skip_mirror_check RTL ;================================================================================ DoWorldFix_Inverted: + LDA $7EF3CC : CMP #$04 : BEQ .aga1Alive ; if old man following, skip mirror/aga check LDA.l Bugfix_MirrorlessSQToLW : BEQ .skip_mirror_check LDA $7EF353 : AND #$02 : BEQ .noMirror ; check if we have the mirror .skip_mirror_check ; alt entrance point @@ -79,7 +81,7 @@ SetDeathWorldChecked_Inverted: LDA GanonPyramidRespawn : BNE .castle ; if flag is set, force respawn at pyramid on death to ganon ++ .outdoors -JMP DoWorldFix +JMP DoWorldFix_Inverted .dungeon LDA Bugfix_PreAgaDWDungeonDeathToFakeDW : BNE .done ; if the bugfix is enabled, we do nothing on death in dungeon