From c7a4d817c09e93182fbc547e8a13ce104389e0e9 Mon Sep 17 00:00:00 2001
From: aerinon <randall.rupper@sirsidynix.com>
Date: Mon, 24 May 2021 15:12:09 -0600
Subject: [PATCH] Changes from DR

---
 doortables.asm   | 10 +++++++---
 dr_lobby.asm     | 15 +++++++--------
 drhooks.asm      |  2 +-
 hudadditions.asm |  2 +-
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/doortables.asm b/doortables.asm
index 2c0140e..dbbdb3c 100644
--- a/doortables.asm
+++ b/doortables.asm
@@ -669,6 +669,10 @@ db $07,$07,$02,$02,$02,$02,$07,$07,$07,$20,$20,$07,$20,$20,$20,$07
 ;27f300
 
 ;
-org $27ff00
-SancDarkWorldFlag:
-db 0
+;org $27ff00
+
+org $27fff0
+LinksHouseDarkWorld:
+dw $ffff
+SanctuaryDarkWorld:
+dw $ffff
\ No newline at end of file
diff --git a/dr_lobby.asm b/dr_lobby.asm
index 2c1b9c8..1cac9d1 100644
--- a/dr_lobby.asm
+++ b/dr_lobby.asm
@@ -1,10 +1,9 @@
-CheckDarkWorldSanc:
+CheckDarkWorldSpawn:
 	STA $A0 : STA $048E ; what we wrote over
-	LDA.l InvertedMode : AND #$00FF : BNE +
-	LDA.l SancDarkWorldFlag : AND #$00FF : BEQ +
-		SEP #$30
-		LDA $A0 : CMP #$12 : BNE ++
-		LDA.l $7EF357 : BNE ++ ; moon pearl?
-			LDA #$17 : STA $5D : INC $02E0 : LDA.b #$40 : STA !DARK_WORLD
-		++ REP #$30
+	LDA.l DRFlags : AND #$0200 : BEQ + ; skip if the flag isn't set
+	LDA.l $7EF357 : AND #$00FF : BNE + ; moon pearl?
+	LDA.l LinksHouseDarkWorld : CMP $A0 : BEQ ++
+	LDA.l SanctuaryDarkWorld : CMP $A0 : BNE +
+		++ SEP #$30 : LDA #$17 : STA $5D
+		   INC $02E0 : LDA.b #$40 : STA !DARK_WORLD : REP #$30
 + RTL
diff --git a/drhooks.asm b/drhooks.asm
index c4939e9..6739de3 100644
--- a/drhooks.asm
+++ b/drhooks.asm
@@ -165,7 +165,7 @@ org $08c450 ; <- ancilla_receive_item.asm : 146-148 (STY $5D : STZ $02D8)
 JSL RetrieveBunnyState : NOP
 
 org $02d9ce ; <- Bank02.asm : Dungeon_LoadEntrance 10829 (STA $A0 : STA $048E)
-JSL CheckDarkWorldSanc : NOP
+JSL CheckDarkWorldSpawn : NOP
 
 org $01891e ; <- Bank 01.asm : 991 Dungeon_LoadType2Object (LDA $00 : XBA : AND.w #$00FF)
 JSL RainPrevention : NOP #2
diff --git a/hudadditions.asm b/hudadditions.asm
index f5e4a11..7f9eb34 100644
--- a/hudadditions.asm
+++ b/hudadditions.asm
@@ -8,7 +8,7 @@ DrHudOverride:
 HudAdditions:
 {
     lda.l DRFlags : and #$0008 : beq ++
-		LDA.w #$28A4 : STA !GOAL_DRAW_ADDRESS
+;		LDA.w #$28A4 : STA !GOAL_DRAW_ADDRESS
 		lda $7EF423
         jsr HudHexToDec4DigitCopy
 		LDX.b $05 : TXA : ORA.w #$2400 : STA !GOAL_DRAW_ADDRESS+2 ; draw 100's digit