mirror of
https://github.com/projectPiki/pikmin2.git
synced 2024-11-23 13:29:55 +00:00
match Game::NaviPelletState::exec (#220)
This commit is contained in:
parent
8542e5e018
commit
916aeba828
@ -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),
|
||||
};
|
||||
|
||||
|
@ -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();
|
||||
|
Loading…
Reference in New Issue
Block a user