From 916aeba828395058c9b75745165bfb14e0f15deb Mon Sep 17 00:00:00 2001
From: Mateo <74278948+pish-pish@users.noreply.github.com>
Date: Mon, 11 Nov 2024 18:34:13 -0500
Subject: [PATCH] match Game::NaviPelletState::exec (#220)

---
 include/JSystem/JUtility/JUTGamePad.h | 2 ++
 src/plugProjectKandoU/naviState.cpp   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/include/JSystem/JUtility/JUTGamePad.h b/include/JSystem/JUtility/JUTGamePad.h
index 88914dae1..15e65af10 100644
--- 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
index 8d70b9863..dc0aff547 100644
--- 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();