From a2818e479e21c8e115222899a0247c8d7f6cd6d8 Mon Sep 17 00:00:00 2001
From: Karkat <north@tinymagnet.com>
Date: Fri, 16 Mar 2018 14:44:56 -0400
Subject: [PATCH] =?UTF-8?q?ganon=20spawn=20fix=20453/=E2=88=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 darkworldspawn.asm | 8 ++++++--
 events.asm         | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/darkworldspawn.asm b/darkworldspawn.asm
index 26cef6a..ef06482 100644
--- a/darkworldspawn.asm
+++ b/darkworldspawn.asm
@@ -24,6 +24,12 @@ DarkWorldFlagSet:
 	LDA $1B : BNE + ; skip this unless indoors - THIS PART FIXES THE OTHER FUCKUP WITH THE PYRAMID SPAWN IN GLITCHED
 		LDA $A0 : BEQ .done ; skip if we died in ganon's room
 	+
+	JSL.l DoWorldFix
+	.done
+	PLA
+RTL
+;--------------------------------------------------------------------------------
+DoWorldFix:
 	LDA.l Bugfix_MirrorlessSQToLW : BEQ +
 		LDA $7EF353 : BEQ .noMirror ; check if we have the mirror
 	+
@@ -34,9 +40,7 @@ DarkWorldFlagSet:
 	LDA #$00 : STA $7EF3CA ; set flag to light world
 	LDA $7EF3CC : CMP #$07 : BNE + : LDA.b #$08 : STA $7EF3CC : + ; convert frog to dwarf
 	.done
-	PLA
 RTL
-
 ;--------------------------------------------------------------------------------
 SetDeathWorldChecked:
 	LDA $1B : BEQ + ; skip this for indoors
diff --git a/events.asm b/events.asm
index 960abb5..855d2d0 100644
--- a/events.asm
+++ b/events.asm
@@ -66,7 +66,7 @@ OnFileLoad:
 		JSL.l OnNewFile
 		LDA.b #$FF : STA !FRESH_FILE_MARKER
 	+
-	JSL.l DarkWorldFlagSet
+	JSL.l DoWorldFix
 	JSL.l MasterSwordFollowerClear
 	JSL.l InitOpenMode
 	LDA #$FF : STA !RNG_ITEM_LOCK_IN ; reset rng item lock-in