scawful/oracle-of-secrets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Zora link bug fix with falling

Browse Source
This commit is contained in:
scawful
2023-10-07 19:28:17 -04:00
parent fda5f22481
commit 3d02012114
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Masks/zora_mask.asm
View File

@@ -214,8 +214,8 @@ pullpc
; Check if the player is actually diving ; Check if the player is actually diving
LDA $0AAB : BEQ .return_default LDA $0AAB : BEQ .return_default
LDA $0114 : CMP #$85 : BEQ .return_default LDA $0114 : CMP #$85 : BEQ .player_is_falling
LDA $0114 : CMP #$09 : BEQ .return_default LDA $0114 : CMP #$09 : BEQ .player_is_falling
LDA $5B : CMP #$02 : BEQ .dungeon_stairs LDA $5B : CMP #$02 : BEQ .dungeon_stairs
; Check if the ground level is safe ; Check if the ground level is safe
@@ -231,11 +231,12 @@ pullpc
LDA.b #$15 : LDY.b #$00 : JSL AddTransitionSplash LDA.b #$15 : LDY.b #$00 : JSL AddTransitionSplash
.remove_dive .remove_dive
LDA #$04 : STA $5D ; Set Link to Swimming State LDA #$04 : STA $5D ; Set Link to Swimming State
.player_is_falling
LDA #$01 : STA $EE ; Set Link to upper level LDA #$01 : STA $EE ; Set Link to upper level
STA $0345 ; Set deep water flag STA $0345 ; Set deep water flag
; Remove Diving Effects ; Remove Diving Effects
.player_is_falling
LDA $67 : AND #$01 : STA $2F LDA $67 : AND #$01 : STA $2F
STZ $5E ; Reset speed to normal STZ $5E ; Reset speed to normal
STZ $0AAB ; Reset underwater flag STZ $0AAB ; Reset underwater flag