falso
/
tmc
mirror of https://github.com/zeldaret/tmc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Match PlayerJumpInit

This commit is contained in:
Rose 2023-12-17 14:46:17 -05:00
parent 5bac16fe21
commit 1eba642381
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/player.c
View File

@ -834,7 +834,7 @@ static void PlayerJump(Entity* this) {
} }
static void PlayerJumpInit(Entity* this) { static void PlayerJumpInit(Entity* this) {
u32 temp; s32 temp;
this->subAction++; this->subAction++;
@ -858,8 +858,11 @@ static void PlayerJumpInit(Entity* this) {
this->direction = Direction8FromAnimationState(AnimationStateWalk(this->animationState)); this->direction = Direction8FromAnimationState(AnimationStateWalk(this->animationState));
temp = sub_08079FC4(1); temp = sub_08079FC4(1);
asm("lsl r0, r0, #0x4");
this->zVelocity = (temp - 4) * 64 * 64; temp <<= 4;
temp -= 4;
temp <<= 12;
this->zVelocity = temp;
this->speed = JUMP_SPEED_FWD; this->speed = JUMP_SPEED_FWD;
DeleteClones(); DeleteClones();
@ -2265,11 +2268,13 @@ static void sub_08072B5C(Entity* this) {
sub_08004542(this); sub_08004542(this);
} }
this->subAction++; this->subAction++;
temp <<= 4; temp <<= 4;
temp -= 4; temp -= 4;
temp <<= 12; temp <<= 12;
this->zVelocity = temp; this->zVelocity = temp;
this->speed = Q_8_8(1.0);
this->speed = JUMP_SPEED_FWD;
gPlayerState.animation = ANIM_JUMP; gPlayerState.animation = ANIM_JUMP;
SoundReq(SFX_PLY_JUMP); SoundReq(SFX_PLY_JUMP);
} }