From dfc22ffa8f544e702f2aef8eddb21d777408c8c9 Mon Sep 17 00:00:00 2001
From: LLCoolDave <llcooldave@gmail.com>
Date: Thu, 3 Aug 2017 18:49:17 +0200
Subject: [PATCH] Add GanonPyramidRespawn flag at 0x180170 to enable/disable
 respawning on Pyramid after Death to Ganon. Useful for Entrance Randomizer
 with shuffled Ganon or Plandomizer.

---
 darkworldspawn.asm | 2 +-
 tables.asm         | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/darkworldspawn.asm b/darkworldspawn.asm
index 3502c0c..0207705 100644
--- a/darkworldspawn.asm
+++ b/darkworldspawn.asm
@@ -52,7 +52,7 @@ SetDeathWorldChecked:
 	+
 	LDA $7EF3C5 : CMP.b #$03 : !BGE .done; thing we originally did - skip if agahnim 1 is dead
 	
-	LDA $1B : BNE + : LDA $A0 : BNE + ; check if we died in ganon's room
+	LDA $1B : BNE + : LDA $A0 : BNE + : LDA GanonPyramidRespawn : BEQ + ; check if we died in ganon's room and pyramid respawn is enabled
 		LDA !FORCE_PYRAMID : ORA.b #$08 : STA !FORCE_PYRAMID ; set pyramid flag
 		BRL DarkWorldFlagSet_pyramid
 	+
diff --git a/tables.asm b/tables.asm
index 1ab3e99..863eded 100644
--- a/tables.asm
+++ b/tables.asm
@@ -676,6 +676,10 @@ org $308169 ; PC 0x180169
 AgahnimDoorStyle:
 db #$00 ; #00 = Never Locked - #$01 = Locked During Escape (default)
 ;================================================================================
+org $308170 ; PC 0x180170
+GanonPyramidRespawn:
+db #$01 ; #00 = Do not respawn on Pyramid after Death - #$01 = Respawn on Pyramid after Death (default)
+;================================================================================
 org $30816A ; PC 0x18016A
 FreeItemText:
 db #$01 ; #00 = Off - #$01 = On (default)