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

update moosh fly movement anim

Browse Source
This commit is contained in:
scawful
2024-07-08 22:02:26 -04:00
parent b937582c87
commit c2d6b9ce06
2 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Masks/mask_routines.asm
View File

@@ -347,19 +347,15 @@ Link_TransformMoosh:
; This is used to change the animation during 0x0A (Using Quake Medallion) ; This is used to change the animation during 0x0A (Using Quake Medallion)
DekuLink_SpinOrRecoil: DekuLink_SpinOrRecoil:
{ {
TAY
LDA DekuFloating : BEQ .spin LDA DekuFloating : BEQ .spin
TYA LDA.w !CurrentMask : CMP.b #$07 : BNE +
LDY.b #$1C
JML $0DA435 ; JML $0DA40B
+
LDY.b #$05 ; Recoil LDY.b #$05 ; Recoil
JML $0DA435 ; JML $0DA40B JML $0DA435 ; JML $0DA40B
.spin .spin
; Moosh form configuration ; Moosh form configuration
LDA.w $02B2 : CMP.b #$07 : BEQ +
TYA
LDY.b #$16 ; Pushing
JML $0DA435
+
TYA
LDY.b #$1B ; Spin and die LDY.b #$1B ; Spin and die
JML $0DA40B JML $0DA40B
} }
@@ -463,16 +459,15 @@ DekuLink_HoverBasedOnInput:
{ {
PHB : PHK : PLB PHB : PHK : PLB
#_0782A7: STZ.b $2A STZ.b $2A
#_0782A9: STZ.b $2B STZ.b $2B
#_0782AB: STZ.b $6B STZ.b $6B
#_0782AD: STZ.b $48 STZ.b $48
JSR HandleMovement JSR HandleMovement
JSL Link_HandleCardinalCollision_Long JSL Link_HandleCardinalCollision_Long
JSL Link_HandleVelocityAndSandDrag JSL Link_HandleVelocityAndSandDrag
JSL Link_HandleMovingAnimation_FullLongEntry
STZ.w $0302 STZ.w $0302

3
Masks/moosh.asm
View File

@@ -23,8 +23,7 @@ Link_HoverIfMooshWantsToDash:
{ {
LDA.w !CurrentMask : CMP.b #$07 : BNE .return LDA.w !CurrentMask : CMP.b #$07 : BNE .return
JSL PrepareQuakeSpell JSL PrepareQuakeSpell
LDA.b #$0A : STA.b $5D RTL
.return .return
JSL Link_HandleMovingAnimation_FullLongEntry JSL Link_HandleMovingAnimation_FullLongEntry
RTL RTL