From a1ec93846ea2f5e48f0db2c39e2810b10d4cf93b Mon Sep 17 00:00:00 2001
From: Dima353 <75039669+Dima353@users.noreply.github.com>
Date: Sun, 16 Feb 2025 16:55:56 +0300
Subject: [PATCH] Swap the actions of buttons A and B

---
 src/core/Frontend.cpp | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/core/Frontend.cpp b/src/core/Frontend.cpp
index 0348b956..4f2eed64 100644
--- a/src/core/Frontend.cpp
+++ b/src/core/Frontend.cpp
@@ -104,8 +104,8 @@ int GetOptionCount(int screen)
 #define GetBackJustUp GetTriangleJustUp
 #define GetBackJustDown GetTriangleJustDown
 #elif defined(CIRCLE_BACK_BUTTON)
-#define GetBackJustUp GetCircleJustUp
-#define GetBackJustDown GetCircleJustDown
+#define GetBackJustUp GetCrossJustUp
+#define GetBackJustDown GetCrossJustDown
 #else
 #define GetBackJustUp GetSquareJustUp
 #define GetBackJustDown GetSquareJustDown
@@ -542,7 +542,7 @@ CMenuManager::ProcessList(bool &goBack, bool &optionSelected)
 	}
 
 #ifndef TIDY_UP_PBP
-	if (CPad::GetPad(0)->GetEnterJustDown() || CPad::GetPad(0)->GetCrossJustDown()) {
+	if (CPad::GetPad(0)->GetEnterJustDown() || CPad::GetPad(0)->GetCircleJustDown()) {
 		m_bShowMouse = 0;
 		optionSelected = true;
 	}
@@ -4349,7 +4349,7 @@ CMenuManager::ProcessButtonPresses(void)
 
 	} else if (isPlainTextScreen(m_nCurrScreen)) {
 #ifndef TIDY_UP_PBP
-		if (CPad::GetPad(0)->GetEnterJustDown() || CPad::GetPad(0)->GetCrossJustDown() || CPad::GetPad(0)->GetLeftMouseJustDown()) {
+		if (CPad::GetPad(0)->GetEnterJustDown() || CPad::GetPad(0)->GetCircleJustDown() || CPad::GetPad(0)->GetLeftMouseJustDown()) {
 			optionSelected = true;
 		}
 		if (CPad::GetPad(0)->GetEscapeJustDown() || CPad::GetPad(0)->GetBackJustUp()) {
@@ -4371,12 +4371,12 @@ CMenuManager::ProcessButtonPresses(void)
 
 #ifndef TIDY_UP_PBP
 		if ((m_nCurrOption == 0) && (m_nCurrScreen == MENUPAGE_PAUSE_MENU)) {
-			if (CPad::GetPad(0)->GetEnterJustUp() || CPad::GetPad(0)->GetCrossJustUp()) {
+			if (CPad::GetPad(0)->GetEnterJustUp() || CPad::GetPad(0)->GetCircleJustUp()) {
 				m_bShowMouse = false;
 				optionSelected = true;
 			}
 		} else {
-			if (CPad::GetPad(0)->GetEnterJustDown() || CPad::GetPad(0)->GetCrossJustDown()) {
+			if (CPad::GetPad(0)->GetEnterJustDown() || CPad::GetPad(0)->GetCircleJustDown()) {
 				m_bShowMouse = false;
 				optionSelected = true;
 			}
@@ -4681,7 +4681,7 @@ CMenuManager::ProcessButtonPresses(void)
 	// Centralized enter/back (except some conditions)
 #ifdef TIDY_UP_PBP
 	if (aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_Action != MENUACTION_RESUME) {
-		if (CPad::GetPad(0)->GetEnterJustDown() || CPad::GetPad(0)->GetCrossJustDown() ||
+		if (CPad::GetPad(0)->GetEnterJustDown() || CPad::GetPad(0)->GetCircleJustDown() ||
 			(isPlainTextScreen(m_nCurrScreen) && CPad::GetPad(0)->GetLeftMouseJustDown())) {
 
 			if (!isPlainTextScreen(m_nCurrScreen))
@@ -4690,7 +4690,7 @@ CMenuManager::ProcessButtonPresses(void)
 			optionSelected = true;
 		}
 	} else {
-		if (CPad::GetPad(0)->GetEnterJustUp() || CPad::GetPad(0)->GetCrossJustUp()) {
+		if (CPad::GetPad(0)->GetEnterJustUp() || CPad::GetPad(0)->GetCircleJustUp()) {
 			m_bShowMouse = false;
 			optionSelected = true;
 		}
@@ -4722,7 +4722,7 @@ CMenuManager::ProcessButtonPresses(void)
 			DMAudio.PlayFrontEndTrack(m_PrefsRadioStation, TRUE);
 		return;
 	} else if (bottomBarActive) {
-		if (CPad::GetPad(0)->GetEnterJustDown() || CPad::GetPad(0)->GetCrossJustDown()) {
+		if (CPad::GetPad(0)->GetEnterJustDown() || CPad::GetPad(0)->GetCircleJustDown()) {
 			DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NAVIGATION, 0);
 			bottomBarActive = false;
 
@@ -6464,7 +6464,7 @@ CMenuManager::PrintMap(void)
 
 	// Adding marker
 	if (m_nMenuFadeAlpha >= 255) {
-		if (CPad::GetPad(0)->GetRightMouseJustDown() || CPad::GetPad(0)->GetCrossJustDown()) {
+		if (CPad::GetPad(0)->GetRightMouseJustDown() || CPad::GetPad(0)->GetCircleJustDown()) {
 			if (mapCrosshair.y > fMapCenterY - fMapSize && mapCrosshair.y < fMapCenterY + fMapSize &&
 				mapCrosshair.x > fMapCenterX - fMapSize && mapCrosshair.x < fMapCenterX + fMapSize) {
 
@@ -6496,7 +6496,7 @@ CMenuManager::PrintMap(void)
 		fMapCenterY -= CPad::GetPad(0)->GetLeftStickY() / 128.0f * 20.0f;
 	}
 
-	if (CPad::GetPad(0)->GetMouseWheelDown() || CPad::GetPad(0)->GetPageDown() || CPad::GetPad(0)->GetRightShoulder2()) {
+	if (CPad::GetPad(0)->GetMouseWheelDown() || CPad::GetPad(0)->GetPageDown() || CPad::GetPad(0)->GetLeftShoulder1()) {
 		if (CPad::GetPad(0)->GetMouseWheelDown())
 			ZOOM(mapCrosshair.x, mapCrosshair.y, false);
 		else