Changes from DR

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
+;org $27ff00
-SancDarkWorldFlag:
+
-db 0
+org $27fff0
+LinksHouseDarkWorld:
+dw $ffff
+SanctuaryDarkWorld:
+dw $ffff

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 DRFlags : AND #$0200 : BEQ + ; skip if the flag isn't set
-	LDA.l SancDarkWorldFlag : AND #$00FF : BEQ +
+	LDA.l $7EF357 : AND #$00FF : BNE + ; moon pearl?
-		SEP #$30
+	LDA.l LinksHouseDarkWorld : CMP $A0 : BEQ ++
-		LDA $A0 : CMP #$12 : BNE ++
+	LDA.l SanctuaryDarkWorld : CMP $A0 : BNE +
-		LDA.l $7EF357 : BNE ++ ; moon pearl?
+		++ SEP #$30 : LDA #$17 : STA $5D
-			LDA #$17 : STA $5D : INC $02E0 : LDA.b #$40 : STA !DARK_WORLD
+		   INC $02E0 : LDA.b #$40 : STA !DARK_WORLD : REP #$30
-		++ REP #$30
 + RTL

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

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