flute fix and crystal door lock

2018-09-01 23:08:05 -04:00
parent 96e3db602b
commit 9155d43a50
3 changed files with 8 additions and 2 deletions
--- a/entrances.asm
+++ b/entrances.asm
@@ -9,7 +9,12 @@ LockAgahnimDoors:
 		LDA.w #$0000 : RTL
 	+ : CMP.w #$0001 : BNE +
 		JSR.w OldLockAgahnimDoors : RTL
+	+ : CMP.w #$0002 : BNE +
+		LDA $7EF37A : AND.w #$007F : CMP.w #$007F : BEQ .unlock
+			LDA.w #$0001
+			RTL
 	+
+	.unlock
 	LDA.w #$0000 ; fallback to never locked
 RTL
 ;--------------------------------------------------------------------------------
--- a/hooks.asm
+++ b/hooks.asm
@@ -1917,7 +1917,8 @@ JSL.l OnEnterWater : NOP
 org $0AB8E5 ; <- 538E5
 JSL.l FloodGateAndMasterSwordFollowerReset
 JSL.l IncrementFlute
-NOP #32
+STZ $1000 : STZ $1001
+NOP #26
 ;--------------------------------------------------------------------------------
 org $02AA87 ; <- 12A87
 JSL.l OnOWTransition
--- a/tables.asm
+++ b/tables.asm
@@ -747,7 +747,7 @@ db #$08 ; #$08 = 1 Heart (default) - #$02 = 1/4 Heart
 ;================================================================================
 org $308169 ; PC 0x180169
 AgahnimDoorStyle:
-db #$01 ; #00 = Never Locked - #$01 = Locked During Escape (default)
+db #$02 ; #00 = Never Locked - #$01 = Locked During Escape (default) - #$02 = Locked Without 7 Crystals
 ;================================================================================
 org $30816A ; PC 0x18016A
 FreeItemText: