From 75fb2c352e5baded1d3b5b10cd24ea34f7a4f956 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20R=C3=B3=C5=BCa=C5=84ski?=
 <tomasz.rozanski@fastmail.com>
Date: Sat, 20 Jun 2020 18:24:06 +0200
Subject: [PATCH] Small code cleanup.

---
 includes/vst_input.h | 52 ++++++++++++++++++++++----------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/includes/vst_input.h b/includes/vst_input.h
index d8c5571..fa8d2ea 100644
--- a/includes/vst_input.h
+++ b/includes/vst_input.h
@@ -4,14 +4,6 @@
 // Controller input
 #define OFFSET_CONTROLLER_INPUT 0x8005E1C0
 
-#define MASK_CONTROLLER_INPUT_SELECT 0x0100
-#define MASK_CONTROLLER_INPUT_L3 0x0200
-#define MASK_CONTROLLER_INPUT_R3 0x0400
-#define MASK_CONTROLLER_INPUT_START 0x0800
-#define MASK_CONTROLLER_INPUT_UP 0x1000
-#define MASK_CONTROLLER_INPUT_RIGHT 0x2000
-#define MASK_CONTROLLER_INPUT_DOWN 0x4000
-#define MASK_CONTROLLER_INPUT_LEFT 0x8000
 #define MASK_CONTROLLER_INPUT_L2 0x0001
 #define MASK_CONTROLLER_INPUT_R2 0x0002
 #define MASK_CONTROLLER_INPUT_L1 0x0004
@@ -20,16 +12,16 @@
 #define MASK_CONTROLLER_INPUT_CIRCLE 0x0020
 #define MASK_CONTROLLER_INPUT_CROSS 0x0040
 #define MASK_CONTROLLER_INPUT_SQUARE 0x0080
+#define MASK_CONTROLLER_INPUT_SELECT 0x0100
+#define MASK_CONTROLLER_INPUT_L3 0x0200
+#define MASK_CONTROLLER_INPUT_R3 0x0400
+#define MASK_CONTROLLER_INPUT_START 0x0800
+#define MASK_CONTROLLER_INPUT_UP 0x1000
+#define MASK_CONTROLLER_INPUT_RIGHT 0x2000
+#define MASK_CONTROLLER_INPUT_DOWN 0x4000
+#define MASK_CONTROLLER_INPUT_LEFT 0x8000
 
 char *ControllerInputNames[16] = { //
-  "Select", //
-  "L3", //
-  "R3", //
-  "Start", //
-  "Up", //
-  "Right", //
-  "Down", //
-  "Left", //
   "L2", //
   "R2", //
   "L1", //
@@ -37,10 +29,26 @@ char *ControllerInputNames[16] = { //
   "Triangle", //
   "Circle", //
   "Cross", //
-  "Square"
+  "Square", //
+  "Select", //
+  "L3", //
+  "R3", //
+  "Start", //
+  "Up", //
+  "Right", //
+  "Down", //
+  "Left"
 };
 
 u16 ControllerInputMasks[16] = { //
+  MASK_CONTROLLER_INPUT_L2, //
+  MASK_CONTROLLER_INPUT_R2, //
+  MASK_CONTROLLER_INPUT_L1, //
+  MASK_CONTROLLER_INPUT_R1, //
+  MASK_CONTROLLER_INPUT_TRIANGLE, //
+  MASK_CONTROLLER_INPUT_CIRCLE, //
+  MASK_CONTROLLER_INPUT_CROSS, //
+  MASK_CONTROLLER_INPUT_SQUARE, //
   MASK_CONTROLLER_INPUT_SELECT, //
   MASK_CONTROLLER_INPUT_L3, //
   MASK_CONTROLLER_INPUT_R3, //
@@ -48,15 +56,7 @@ u16 ControllerInputMasks[16] = { //
   MASK_CONTROLLER_INPUT_UP, //
   MASK_CONTROLLER_INPUT_RIGHT,
   MASK_CONTROLLER_INPUT_DOWN, //
-  MASK_CONTROLLER_INPUT_LEFT,
-  MASK_CONTROLLER_INPUT_L2, //
-  MASK_CONTROLLER_INPUT_R2, //
-  MASK_CONTROLLER_INPUT_L1, //
-  MASK_CONTROLLER_INPUT_R1, //
-  MASK_CONTROLLER_INPUT_TRIANGLE,
-  MASK_CONTROLLER_INPUT_CIRCLE, //
-  MASK_CONTROLLER_INPUT_CROSS, //
-  MASK_CONTROLLER_INPUT_SQUARE
+  MASK_CONTROLLER_INPUT_LEFT
 };
 
 void