diff --git a/darkworldspawn.asm b/darkworldspawn.asm index af3e219..0c2da73 100644 --- a/darkworldspawn.asm +++ b/darkworldspawn.asm @@ -49,13 +49,7 @@ SetDeathWorldChecked: LDA $A0 : BNE + : LDA GanonPyramidRespawn : BEQ + ; check if we died in ganon's room and pyramid respawn is enabled 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