let's dev 5/30/17

Dwarf follower gets Zelda’s graphics when spawning at Sanctuary
(KK) Lumberjack tree issue when you defeat Agahnim before rescuing Zelda (then fix Escape Cape logic)
Remove the locked doors fix we put in pre Zelda rescue
Double check castle warp/gate, Zelda in her cell, old man, castle doors, any other post-Aga stuff
(KK/VT) “Make Ganon invulnerable to all swords” flag/switch (to correctly control the Goal)

entrances.asm

@@ -3,13 +3,24 @@
 ; Returns: 0=Unlocked - 1=Locked
 ;--------------------------------------------------------------------------------
 LockAgahnimDoors:
+	LDA.l AgahnimDoorStyle
+	BNE +
+		;#$0 = Never Locked
+		LDA.w #$0000 : RTL
+	+ : CMP.w #$0001 : BNE +
+		JSR.w OldLockAgahnimDoors : RTL
+	+
+	LDA.w #$0000 ; fallback to never locked
+RTL
+;--------------------------------------------------------------------------------
+OldLockAgahnimDoors:
 	LDA $7EF3C5 : AND.w #$000F : CMP.w #$0002 : !BGE + ; if we rescued zelda, skip
 		LDA $22 : CMP.w #1992 : !BLT + ; door too far left, skip
 				  CMP.w #2088 : !BGE + ; door too rat right, skip
 		LDA $20 : CMP.w #1720 : !BGE + ; door too low, skip
 			LDA.w #$0001
-RTL
+RTS
 	+
 	LDA.w #$0000
-RTL
+RTS
 ;--------------------------------------------------------------------------------