From 29b95cffe4b290453a3c6dd8ed8d7e6e82d8d6a5 Mon Sep 17 00:00:00 2001
From: rsn8887 <rsn8887@users.noreply.github.com>
Date: Wed, 19 Dec 2018 21:07:41 -0600
Subject: [PATCH] improve button order in custom control menu

---
 src/gp2x/menu/menu_controls.cpp | 34 ++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/gp2x/menu/menu_controls.cpp b/src/gp2x/menu/menu_controls.cpp
index cafc292..3c88f6d 100755
--- a/src/gp2x/menu/menu_controls.cpp
+++ b/src/gp2x/menu/menu_controls.cpp
@@ -57,9 +57,9 @@ enum {
   MENUCONTROLS_DOWN,
   MENUCONTROLS_LEFT,
   MENUCONTROLS_RIGHT,
+  MENUCONTROLS_A,
   MENUCONTROLS_Y,
   MENUCONTROLS_X,
-  MENUCONTROLS_A,
   MENUCONTROLS_B,
   MENUCONTROLS_L,
   MENUCONTROLS_R,
@@ -548,12 +548,27 @@ static void draw_controlsMenu(int c)
 			write_text(tabstop1-4,menuLine,mapping);
 	}
 
-	// MENUCONTROLS_Y
+	// MENUCONTROLS_A
 #ifdef __SWITCH__
 	menuLine+=2;
 #else
 	menuLine+=3;
 #endif
+#if defined(__PSP2__)
+	write_text(leftMargin,menuLine,"Square");
+#elif defined(__SWITCH__)
+	write_text(leftMargin,menuLine,"   Y");
+#else
+	write_text(leftMargin,menuLine,"   (A)");
+#endif
+	getMapping(mainMenu_custom_A[ctrlNr]);
+	if ((menuControls!=MENUCONTROLS_A)||(bb))
+		write_text_inv(tabstop1-4,menuLine,mapping);
+	else
+		write_text(tabstop1-4,menuLine,mapping);
+
+	// MENUCONTROLS_Y
+	menuLine+=2;
 #if defined(__PSP2__)
 	write_text(leftMargin,menuLine,"Triangle");
 #elif defined(__SWITCH__)
@@ -582,21 +597,6 @@ static void draw_controlsMenu(int c)
 	else
 		write_text(tabstop1-4,menuLine,mapping);
 
-	// MENUCONTROLS_A
-	menuLine+=2;
-#if defined(__PSP2__)
-	write_text(leftMargin,menuLine,"Square");
-#elif defined(__SWITCH__)
-	write_text(leftMargin,menuLine,"   Y");
-#else
-	write_text(leftMargin,menuLine,"   (A)");
-#endif
-	getMapping(mainMenu_custom_A[ctrlNr]);
-	if ((menuControls!=MENUCONTROLS_A)||(bb))
-		write_text_inv(tabstop1-4,menuLine,mapping);
-	else
-		write_text(tabstop1-4,menuLine,mapping);
-
 	// MENUCONTROLS_B
 	menuLine+=2;
 #if defined(__PSP2__)