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

add todo for zora mask resurfacing bug

Browse Source
This commit is contained in:
scawful
2024-05-02 01:48:24 -04:00
parent 4a00ba331d
commit bae34e1acd
1 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
Masks/zora_mask.asm
View File

@@ -25,7 +25,7 @@ UpdateZoraPalette:
RTL RTL
} }
; ============================================================================= ; =========================================================
; TODO: Change from "bunny palette" to blue zora palette colors ; TODO: Change from "bunny palette" to blue zora palette colors
zora_palette: zora_palette:
@@ -40,12 +40,12 @@ zora_palette:
; dw #$6565, #$7271, #$2AB7, #$477E, #$1997, #$14B5, #$459B, #$69F2 ; dw #$6565, #$7271, #$2AB7, #$477E, #$1997, #$14B5, #$459B, #$69F2
; dw #$7AB8, #$2609, #$19D8, #$3D95, #$567C, #$1890, #$52F6, #$2357, #$0000 ; dw #$7AB8, #$2609, #$19D8, #$3D95, #$567C, #$1890, #$52F6, #$2357, #$0000
; ============================================================================= ; =========================================================
org $0998FC org $0998FC
AddTransitionSplash: AddTransitionSplash:
; ============================================================================= ; =========================================================
; Replaces Bombos medallion ; Replaces Bombos medallion
org $07A569 org $07A569
@@ -78,14 +78,14 @@ LinkItem_ZoraMask:
warnpc $07A5CE warnpc $07A5CE
; ============================================================================= ; =========================================================
; End of LinkState_Swimming ; End of LinkState_Swimming
org $079781 org $079781
JSR LinkState_UsingZoraMask JSR LinkState_UsingZoraMask
RTS RTS
; ============================================================================= ; =========================================================
pullpc ; Bank07 Free Space from Deku Mask pullpc ; Bank07 Free Space from Deku Mask
LinkState_UsingZoraMask: LinkState_UsingZoraMask:
@@ -108,7 +108,7 @@ LinkState_UsingZoraMask:
; Check if we are indoors or outdoors ; Check if we are indoors or outdoors
LDA $1B : BNE .dungeon ; z flag is 1 LDA $1B : BNE .dungeon ; z flag is 1
; OVERWORLD ----------------------------------------------------------------- ; OVERWORLD ---------------------------------------------
.overworld .overworld
{ {
; Check the Y button and clear state if activated ; Check the Y button and clear state if activated
@@ -148,7 +148,7 @@ LinkState_UsingZoraMask:
RTS RTS
} }
; DUNGEON DIVE -------------------------------------------------------------- ; DUNGEON DIVE ------------------------------------------
.dungeon .dungeon
{ {
; Check if we are in water or not ; Check if we are in water or not
@@ -172,16 +172,10 @@ LinkState_UsingZoraMask:
STZ $5D ; reset player to ground state STZ $5D ; reset player to ground state
STZ $EE ; move link to lower level STZ $EE ; move link to lower level
LDA #$72 LDA #$72 : STA $9A ; Set layer
STA $9A ; Set layer LDA #$08 : STA $5E ; Set the player speed
STZ $0345 ; Reset deep water flag
LDA #$08 LDA #$01 : STA !ZoraDiving ; Set the player underwater flag
STA $5E ; Set the player speed
STZ $0345 ; Reset deep water flag
LDA #$01
STA !ZoraDiving ; Set the player underwater flag
.return_dungeon .return_dungeon
JSR $E8F0 ; HandleIndoorCameraAndDoors JSR $E8F0 ; HandleIndoorCameraAndDoors
@@ -202,14 +196,17 @@ warnpc $078364
pullpc pullpc
.dungeon_resurface .dungeon_resurface ; TODO: Fix resurfacing bug.
{ {
LDA $1B : BEQ .return_default ; We are in overworld actually LDA $1B : BEQ .return_default ; We are in overworld actually
; Check if we are swimming ; Check if we are swimming
LDA $5D : CMP #$04 : BNE .return_default LDA $5D : CMP #$04 : BNE .return_default
; Check if the player is actually diving ; Check if the player is actually diving
LDA !ZoraDiving : BEQ .return_default LDA !ZoraDiving : BEQ .return_default
; 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 LDA $0114 : CMP #$09 : BEQ .player_is_falling
LDA $5B : CMP #$02 : BEQ .dungeon_stairs LDA $5B : CMP #$02 : BEQ .dungeon_stairs