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

add ZoraMask.fall_into_pit

Browse Source
This commit is contained in:
scawful
2024-07-05 21:40:12 -04:00
parent 90b5b6f292
commit 33c6655471
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Masks/zora_mask.asm
View File

@@ -75,9 +75,9 @@ pullpc ; Bank07 Free Space from Deku Mask
LinkState_UsingZoraMask: LinkState_UsingZoraMask:
{ {
; Check if the mask is equipped ; Check if the mask is equipped
LDA $02B2 : CMP #$02 : BNE .normal : CLC LDA $02B2 : CMP #$02 : BNE .normal
; Check if we are in water or not ; Check if we are in water or not
LDA $5D : CMP #$04 : BEQ .swimming : CLC LDA $5D : CMP #$04 : BEQ .swimming
.normal .normal
; Return to normal state ; Return to normal state
@@ -135,9 +135,9 @@ LinkState_UsingZoraMask:
.dungeon .dungeon
{ {
; Check if we are in water or not ; Check if we are in water or not
LDA $5D : CMP #$04 : BNE .return_dungeon : CLC LDA $5D : CMP #$04 : BNE .return_dungeon
; Check if already underwater ; Check if already underwater
LDA !ZoraDiving : BNE .return_dungeon : CLC LDA !ZoraDiving : BNE .return_dungeon
; Check the Y button and clear state if activated ; Check the Y button and clear state if activated
JSR Link_CheckNewY_ButtonPress : BCC .return_dungeon JSR Link_CheckNewY_ButtonPress : BCC .return_dungeon
LDA $3A : AND.b #$BF : STA $3A LDA $3A : AND.b #$BF : STA $3A
@@ -170,7 +170,7 @@ org $0782D2
CLC CLC
RTS RTS
warnpc $078364 warnpc $0782DA
pullpc pullpc
@@ -183,13 +183,12 @@ pullpc
; Check precise tile types for interaction ; Check precise tile types for interaction
LDA $0114 : CMP #$85 : BEQ .player_is_falling LDA $0114 : CMP #$85 : BEQ .player_is_falling
LDA $0114 : CMP #$09 : BEQ .player_is_falling CMP #$09 : BEQ .player_is_falling
LDA $5B : CMP #$02 : BEQ .dungeon_stairs CMP #$20 : BEQ .fall_into_pit
; Check if the ground level is safe ; Check if the ground level is safe
; Otherwise, eject the player back to the surface ; Otherwise, eject the player back to the surface
LDA $0114 : BNE .remove_dive : CLC LDA $0114 : BNE .remove_dive
; CMP.b #$09 : BEQ .remove_dive
; Check the Y button and clear state if activated ; Check the Y button and clear state if activated
JSR Link_CheckNewY_ButtonPress : BCC .return_default JSR Link_CheckNewY_ButtonPress : BCC .return_default
@@ -220,6 +219,9 @@ pullpc
.return_default .return_default
STZ $0302 STZ $0302
RTS RTS
.fall_into_pit
JSR $9427
JMP .return_default
} }
pushpc pushpc