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

add todos for deku mask movement

Browse Source
This commit is contained in:
scawful
2024-05-30 14:24:25 -04:00
parent 917b71bd7f
commit 27c97c6d8f
1 changed files with 46 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
Masks/mask_routines.asm
View File

@@ -375,13 +375,18 @@ HandleCamera:
HandleMovement: HandleMovement:
{ {
; TODO: Check for collision here and prevent movement
LDA $F0 : AND #$08 : BEQ .not_up LDA $F0 : AND #$08 : BEQ .not_up
LDA $20 : CLC : ADC #-1 : STA $20 LDA $20 : CLC : ADC #-1 : STA $20
LDY #$00 : JSL DragPlayer LDY #$00 : JSL DragPlayer
LDA #$01 : STA $031C LDA #$01 : STA $031C
LDA #$05 : STA $3D LDA #$05 : STA $3D
STZ $2F STZ $2F
; TODO: Handle overworld scroll camera gracefully
; DEC.b $E8 ; DEC.b $E8
; DEC.w $0618 : DEC.w $0618
; DEC.w $061A : DEC.w $061A
.not_up .not_up
LDA $F0 : AND #$04 : BEQ .not_down LDA $F0 : AND #$04 : BEQ .not_down
LDA $20 : CLC : ADC #1 : STA $20 LDA $20 : CLC : ADC #1 : STA $20
@@ -390,6 +395,8 @@ HandleMovement:
LDA #$05 : STA $3D LDA #$05 : STA $3D
LDA #$02 : STA $2F LDA #$02 : STA $2F
; INC.b $E8 ; INC.b $E8
; DEC.w $0618 : DEC.w $0618
; DEC.w $061A : DEC.w $061A
.not_down .not_down
LDA $F0 : AND #$02 : BEQ .not_left LDA $F0 : AND #$02 : BEQ .not_left
LDA $22 : CLC : ADC #-1 : STA $22 LDA $22 : CLC : ADC #-1 : STA $22
@@ -407,8 +414,6 @@ HandleMovement:
LDA #$06 : STA $2F LDA #$06 : STA $2F
; INC.b $E2 ; INC.b $E2
.not_right .not_right
LDA.w $22 : STA $0FD8 : LDA.w $23 : STA $0FD9
LDA.w $20 : STA $0FDA : LDA.w $21 : STA $0FDB
RTS RTS
} }
@@ -439,38 +444,27 @@ DekuLink_HoverBasedOnInput:
; Reset LinkState to Default ; Reset LinkState to Default
STZ $5D STZ $5D
#_08B6A5: LDA.b #$01 LDA.b #$01 : STA.w $0AAA
#_08B6A7: STA.w $0AAA
#_08B6AA: STZ.w $0324 STZ.w $0324 : STZ.w $031C : STZ.w $031D
#_08B6AD: STZ.w $031C
#_08B6B0: STZ.w $031D
#_08B6B3: STZ.b $50 STZ.b $50 : STZ.b $3D
#_08B6B5: STZ.b $3D
#_08B6B7: STZ.w $0FC1 STZ.w $0FC1
#_08B6BA: STZ.w $011A STZ.w $011A : STZ.w $011B : STZ.w $011C : STZ.w $011D
#_08B6BD: STZ.w $011B
#_08B6C0: STZ.w $011C
#_08B6C3: STZ.w $011D
.no_turtle_rock_trigger .no_turtle_rock_trigger
#_08B6E4: LDY.b #$00 LDY.b #$00
#_08B6E6: LDA.b $3C LDA.b $3C : BEQ .no_sword_charge
#_08B6E8: BEQ .no_sword_charge
#_08B6EA: LDA.b $F0 LDA.b $F0 : AND.b #$80 : TAY
#_08B6EC: AND.b #$80
#_08B6EE: TAY
.no_sword_charge .no_sword_charge
#_08B6EF: STY.b $3A STY.b $3A
#_08B6F1: STZ.b $5E STZ.b $5E : STZ.w $0325
#_08B6F3: STZ.w $0325
; Set height at end of hover ; Set height at end of hover
; This makes it so the landing animation timer looks correct ; This makes it so the landing animation timer looks correct
; Floating for a bit, then slowly landing on the ground ; Floating for a bit, then slowly landing on the ground