mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-08-10 19:17:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #385 from hatal175/PlayerBounceUpdate

Browse Source
This commit is contained in:
notyourav
2022-02-17 00:09:03 -08:00
committed by GitHub
parent 277c7f5fe6 6687b733f8
commit 2c39b8ccf9
2 changed files with 3 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/player.c
+3 -5
View File
@@ -700,8 +700,7 @@ static void PlayerBounceInit(Entity* this) {
ResetPlayerVelocity();
}
// minor regalloc
static NONMATCH("asm/non_matching/player/PlayerBounceUpdate.inc", void PlayerBounceUpdate(Entity* this)) {
static void PlayerBounceUpdate(Entity* this) {
UpdateAnimationSingleFrame(this);
sub_080085B0(this);
UpdatePlayerMovement();
@@ -712,10 +711,10 @@ static NONMATCH("asm/non_matching/player/PlayerBounceUpdate.inc", void PlayerBou
gPlayerState.jump_status = 0;
if (RunQueuedAction() || sub_08079D48())
if (RunQueuedAction())
return;
if (gPlayerState.swim_state != 0) {
if (sub_08079D48() || gPlayerState.swim_state != 0) {
gPlayerState.jump_status = 0;
ResetPlayerAnimationAndAction();
return;
@@ -742,7 +741,6 @@ static NONMATCH("asm/non_matching/player/PlayerBounceUpdate.inc", void PlayerBou
if ((gPlayerState.flags & PL_MINISH) == 0)
gPlayerState.animation = DEFAULT_ANIM;
}
END_NONMATCH
static void sub_08070E7C(Entity* this) {
if (--this->actionDelay == 0) {