Merged in DR v1.2.0.8

doorrando/drhooks.asm

@@ -181,6 +181,8 @@ JSL RainPrevention : BCC + : RTS : NOP : +
 org $9edabf ; <- sprite_energy_ball.asm : 86-7 Sprite_EnergyBall (LDA.b #$10 : LDX.b #$00)
 JSL StandardAgaDmg
 
+org $89F7B2 ; 09F7B2 Module17_01 S&Q
+JSL StandardSaveAndQuit
 
 org $89a681 ; < - similar to talalong.asm : 1157 (JSL Main_ShowTextMessage)
 JSL BlindsAtticHint : NOP #2

doorrando/overrides.asm

@@ -121,6 +121,14 @@ StandardAgaDmg:
 		LDA.b #$10 ; hurt him!
 	+ RTL ; A is zero if the AND results in zero and then Agahnim's invincible!
 
+StandardSaveAndQuit:
+	LDA.b #$0F : STA.b $95 ; what we wrote over
+	LDA.l ProgressFlags : AND #$04 : BNE +
+	LDA.l DRMode : BEQ +
+	LDA.l StartingEntrance : CMP.b #$02 : BCC +
+		LDA.b #$03 : STA.l StartingEntrance  ; set spawn to uncle if >=
++ RTL
+
 ; note: this skips both maiden dialog triggers if the hole is open
 BlindsAtticHint:
 	REP #$20

hooks.asm

@@ -188,6 +188,9 @@ db Password_Tilemap>>16
 org $0CD527 ; <- 65527 : Bank0C.asm : 2913 (LDA.w #$0004 : STA $02) [LDA.w #$0006 : STA $02]
 JSL.l DrawPlayerFile : NOP ; hijack hearts draw routine to draw a full inventory
 
+; Random incredible patch that I should add right now - File Select Fairy
+org $1BF029+1 : db $10
+
 org $0ccdd5 ; Bank0C.asm:1881 (LDX.w #$00FD)
 JSL.l AltBufferTable : NOP #8 ; Selection screen
 org $0cd393 ; Bank0c.asm:2674 (LDX.w #$00FD)