Skip to content

Port HackerSM64 PR #373 #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
someone2639 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Port HackerSM64 PR #373 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions include/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#define BETA_TRIPLE_JUMP

#ifndef CONFIG_H
#define CONFIG_H
// ULTRASM64-EXTBOUNDS CONFIG FLAGS NEAR BOTTOM
Expand Down
6 changes: 6 additions & 0 deletions src/game/mario_actions_moving.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,13 @@ s32 set_triple_jump_action(struct MarioState *m, UNUSED u32 action, UNUSED u32 a
return set_mario_action(m, ACT_FLYING_TRIPLE_JUMP, 0);
} else if (m->forwardVel > 20.0f) {
if (m->canTripleJump || m->unlockEverything) {
#ifdef BETA_TRIPLE_JUMP
m->vel[1] = 69.f;
m->forwardVel *= 0.8f;
return set_mario_action(m, ACT_TWIRLING, 0);
#else
return set_mario_action(m, ACT_TRIPLE_JUMP, 0);
#endif
}
else {
return set_mario_action(m, ACT_IDLE, 0);
Expand Down