alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

flute fix and crystal door lock

Browse Source
This commit is contained in:
Kat
2018-09-01 23:08:05 -04:00
parent 96e3db602b
commit 9155d43a50
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
entrances.asm
View File

@@ -9,7 +9,12 @@ LockAgahnimDoors:
LDA.w #$0000 : RTL LDA.w #$0000 : RTL
+ : CMP.w #$0001 : BNE + + : CMP.w #$0001 : BNE +
JSR.w OldLockAgahnimDoors : RTL 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 LDA.w #$0000 ; fallback to never locked
RTL RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------

3
hooks.asm
View File

@@ -1917,7 +1917,8 @@ JSL.l OnEnterWater : NOP
org $0AB8E5 ; <- 538E5 org $0AB8E5 ; <- 538E5
JSL.l FloodGateAndMasterSwordFollowerReset JSL.l FloodGateAndMasterSwordFollowerReset
JSL.l IncrementFlute JSL.l IncrementFlute
NOP #32 STZ $1000 : STZ $1001
NOP #26
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
org $02AA87 ; <- 12A87 org $02AA87 ; <- 12A87
JSL.l OnOWTransition JSL.l OnOWTransition

2
tables.asm
View File

@@ -747,7 +747,7 @@ db #$08 ; #$08 = 1 Heart (default) - #$02 = 1/4 Heart
;================================================================================ ;================================================================================
org $308169 ; PC 0x180169 org $308169 ; PC 0x180169
AgahnimDoorStyle: 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 org $30816A ; PC 0x18016A
FreeItemText: FreeItemText: