match Game::NaviPelletState::exec (#220)

This commit is contained in:
Mateo 2024-11-11 18:34:13 -05:00 committed by GitHub
parent 8542e5e018
commit 916aeba828
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 1 deletions

View File

@ -71,6 +71,8 @@ struct JUTGamePad : public JKRDisposer {
PRESS_DOWN = (PRESS_DPAD_DOWN | ANALOG_DOWN),
PRESS_UP = (PRESS_DPAD_UP | ANALOG_UP),
PRESS_ABX = (PRESS_A | PRESS_B | PRESS_X),
PRESS_ABXY = (PRESS_A | PRESS_B | PRESS_X | PRESS_Y),
PRESS_ABXYLRZ = (PRESS_A | PRESS_B | PRESS_X | PRESS_Y | PRESS_L | PRESS_R | PRESS_Z),
};

View File

@ -6064,7 +6064,7 @@ void NaviPelletState::exec(Navi* navi)
if (mState == 1 || mState == 0) {
if (navi->mController1
&& navi->mController1->getButtonDown() & (Controller::PRESS_Z | Controller::PRESS_R | Controller::PRESS_L)) {
&& navi->mController1->isButtonDown(Controller::PRESS_ABX | Controller::PRESS_DPAD)) {
if (mDoForceWakeup) {
navi->mAnimSpeed = 60.0f;
navi->finishMotion();