From 0565c472eaa67085e84ef2a8782b31b2d50150ef Mon Sep 17 00:00:00 2001 From: Kevin Cathcart Date: Wed, 28 Mar 2018 20:37:25 -0400 Subject: [PATCH 1/2] Death respawn without mirror in light world --- darkworldspawn.asm | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/darkworldspawn.asm b/darkworldspawn.asm index ef06482..aa17414 100644 --- a/darkworldspawn.asm +++ b/darkworldspawn.asm @@ -50,12 +50,8 @@ SetDeathWorldChecked: BRA .pyramid + - LDA $7EF3C5 : CMP.b #$03 : !BGE .done; thing we originally did - skip if agahnim 1 is dead - - LDA.b #$00 : STA $7EF3CA : STA $7E0FFF ; set the world to the light world if he's still alive - LDA $7EF3CC : CMP #$07 : BNE .done : LDA.b #$08 : STA $7EF3CC ; convert frog to dwarf - .done -RTL +JMP DoWorldFix + .pyramid LDA #$40 : STA $7EF3CA ; set flag to dark world LDA $7EF3CC : CMP #$08 : BNE + : LDA.b #$07 : STA $7EF3CC : + ; convert dwarf to frog From 63226e661058f99084ba57ab892b4e95cfcf92e1 Mon Sep 17 00:00:00 2001 From: Kevin Cathcart Date: Wed, 28 Mar 2018 20:45:53 -0400 Subject: [PATCH 2/2] Clean up whitespace --- darkworldspawn.asm | 2 -- 1 file changed, 2 deletions(-) diff --git a/darkworldspawn.asm b/darkworldspawn.asm index aa17414..565c255 100644 --- a/darkworldspawn.asm +++ b/darkworldspawn.asm @@ -49,9 +49,7 @@ SetDeathWorldChecked: LDA $A0 : BNE + : LDA GanonPyramidRespawn : BEQ + ; check if we died in ganon's room and pyramid respawn is enabled BRA .pyramid + - JMP DoWorldFix - .pyramid LDA #$40 : STA $7EF3CA ; set flag to dark world LDA $7EF3CC : CMP #$08 : BNE + : LDA.b #$07 : STA $7EF3CC : + ; convert dwarf to frog