From a970d02d9836630fcac4509a61cd48362ea99b8f Mon Sep 17 00:00:00 2001
From: ineed bots <ineedbots@pbot.org>
Date: Sun, 10 Sep 2023 20:49:09 -0600
Subject: [PATCH] Fix these enums

---
 src/game/enums.hpp | 41 ++++++++++++++++++++++++-----------------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/src/game/enums.hpp b/src/game/enums.hpp
index a3059a4..d133fce 100644
--- a/src/game/enums.hpp
+++ b/src/game/enums.hpp
@@ -1288,6 +1288,14 @@ namespace game
 		LOC_SEL_INPUT_CANCEL = 0x5,
 	};
 
+	enum KeyCatcherFlag_t : __int32
+	{
+		KEY_CATCHER_FLAG_CONSOLE = 0x1,
+		KEY_CATCHER_FLAG_LOCATION_SELECTION = 0x8,
+		KEY_CATCHER_FLAG_IN_POPUP = 0x10,
+		KEY_CATCHER_FLAG_CHAT = 0x20,
+	};
+
 	enum GamepadPhysicalAxis
 	{
 		GPAD_PHYSAXIS_RSTICK_X = 0x0,
@@ -1878,26 +1886,25 @@ namespace game
 		SPHERE_MAY_HIT_V1 = 0x3,
 	};
 
-	enum GamePadButton : __int32
+	enum GamePadButton
 	{
 		GPAD_NONE = 0x0,
-		GPAD_UP = 0x10000008,
-		GPAD_DOWN = 0x10000004,
-		GPAD_LEFT = 0x10000001,
-		GPAD_RIGHT = 0x10000002,
+		GPAD_UP = 0x10000001,
+		GPAD_DOWN = 0x10000002,
+		GPAD_LEFT = 0x10000004,
+		GPAD_RIGHT = 0x10000008,
 		GPAD_START = 0x10000010,
-		GPAD_BACK = 0x10004800,
-		GPAD_L3 = 0x10005000,
-		GPAD_R3 = 0x10004000,
-		GPAD_A = 0x10000800,
-		GPAD_B = 0x10001000,
-		GPAD_X = 0x10000100,
-		GPAD_Y = 0x10000200,
-		GPAD_L_SHLDR = 0x10006000,
-		GPAD_R_SHLDR = 0x10004400,
-		GPAD_L_TRIG = 0x10002000,
-		GPAD_R_TRIG = 0x10000400,
-		GPAD_HOME = 0x10008000,
+		GPAD_BACK = 0x10000020,
+		GPAD_L3 = 0x10000040,
+		GPAD_R3 = 0x10000080,
+		GPAD_A = 0x10001000,
+		GPAD_B = 0x10002000,
+		GPAD_X = 0x10004000,
+		GPAD_Y = 0x10008000,
+		GPAD_L_SHLDR = 0x10000100,
+		GPAD_R_SHLDR = 0x10000200,
+		GPAD_L_TRIG = 0x20000000,
+		GPAD_R_TRIG = 0x20000001,
 	};
 
 	enum sysEventType_t