Merged DR v1.0.1.1

floodgatesoftlock.asm

@@ -12,7 +12,7 @@ FloodGateReset:
 	+
 FloodGateResetInner:
 	    LDA.l Bugfix_SwampWaterLevel : BEQ .done
-	    LDA.l DRMode : BEQ .check_room_35; Only do the check for room 37 if on door rando
+	    LDA DRMode : BEQ .check_room_35; Only do the check for room 37 if on door rando
 	    LDA.l SwampDrain1HasItem : BEQ .flipper_check
 		LDA $7F666F : AND.b #$80 : BEQ .drain_room_37 ; Check if key in room 37 has been collected.
 		.flipper_check

keydrop/standing_items.asm

@@ -235,15 +235,30 @@ SaveMajorItemDrop:
 	INC.w SpawnedItemFlag
 	TAY : LDA.w #$0008
 	CPY.w #$0036 : BNE +  ; Red Rupee
-		LDA.w #$0016 : BRA .done
+		LDA.w #$0016 : BRA .substitute
 	+ CPY.w #$0044 : BNE + ; 10 pack arrows
-		LDA.w #$0017 : BRA .done
+		LDA.w #$0017 : BRA .substitute
 	+ CPY.w #$0028 : BNE + ; 3 pack bombs
-		LDA.w #$0018 : BRA .done
+		LDA.w #$0018 : BRA .substitute
-	+ CPY.w #$0031 : BNE .done ; 10 pack bombs
+	+ CPY.w #$0031 : BNE + ; 10 pack bombs
-		LDA.w #$0019
+		LDA.w #$0019 : BRA .substitute
-	.done STA $0B9C ; indicates we should use the key routines or a substitute
+	+ STA $0B9C ; indicates we should use the key routines or a substitute
-	RTL
+RTL
+	.substitute
+	PHA
+		TXA : ASL : STA.b $00
+		LDA.w #$001F : SBC $00
+		TAX : LDA.l BitFieldMasks, X : STA $00
+		LDA.b $A0 : ASL : TAX
+		LDA.l $7EF580, X
+		AND.b $00
+		BNE .exit
+		LDA.l $7EF580, X : ORA $00 : STA.l $7EF580, X
+	PLA : STA $0B9C
+RTL
+	.exit
+	PLA : STZ.w $0B9C
+RTL
 
 ShouldCountNormalPot:
 	INY : INY : LDA [$00], Y : AND #$00FF : CMP #$0080 : BCS .clear