match Game::NaviPelletState::exec

projectPiki · Nov 5, 2024 · 4c2293d · 4c2293d
1 parent 8542e5e
commit 4c2293d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/include/JSystem/JUtility/JUTGamePad.h b/include/JSystem/JUtility/JUTGamePad.h
@@ -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),
 	};
 

diff --git a/src/plugProjectKandoU/naviState.cpp b/src/plugProjectKandoU/naviState.cpp
@@ -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();