Merge pull request #19 from KevinCathcart/FakeWorldFix

Create a flag to toggle off Fake Worlds

darkworldspawn.asm

@@ -61,6 +61,12 @@ SetDeathWorldChecked:
 	PLA
 RTL
 ;--------------------------------------------------------------------------------
+FakeWorldFix:
+	LDA FixFakeWorld : BEQ +
+		LDA $8A : AND.b #$40 : STA $7EF3CA
+	+
+RTL
+;--------------------------------------------------------------------------------
 MasterSwordFollowerClear:
 	LDA $7EF3CC
 	CMP #$0E : BEQ .clear ; clear master sword follower

inventory.asm

@@ -830,6 +830,7 @@ RTL
 ;--------------------------------------------------------------------------------
 ClearOWKeys:
 	PHA
+	JSL.l FakeWorldFix
 	LDA.l GenericKeys : BEQ +
 		PLA : LDA $7EF38B : STA $7EF36F
 		RTL

tables.asm

@@ -728,6 +728,13 @@ org $308173 ; PC 0x180173
 Bob:
 db #$01 ; #00 = Off - #$01 = On (Default)
 ;================================================================================
+org $308174 ; PC 0x180174
+; Flag to fix Fake Light World/Fake Dark World as caused by leaving the underworld
+; to the other world (As can be caused by EG, Certain underworld clips, or Entance Randomizer).
+; Currently, Fake Worlds triggered by other causes like YBA's Fake Flute, are not affected.
+FixFakeWorld:
+db #$00 ; #00 = Fix Off (Default) - #$01 = Fix On
+;================================================================================
 org $308190 ; PC 0x180190
 TimerStyle:
 db #$00 ; #$00 = Off (Default) - #$01 Countdown - #$02 = Stopwatch