Decompile contGetStickX

src/include/game/data/data_000000.h

@@ -113,12 +113,13 @@ extern u32 var8005edf0;
 extern u32 var8005ee10;
 extern u32 var8005ee14;
 extern u32 var8005ee18;
+extern struct contdata *var8005ee60;
 extern u32 var8005ee68;
-extern u32 var8005ee6c;
+extern u32 var8005ee6c[4];
 extern u32 var8005ee7c;
 extern u32 var8005ee8c;
 extern u32 var8005ee9c;
-extern u32 var8005eeac;
+extern u8 var8005eeac;
 extern u32 var8005eeb8;
 extern u32 var8005eebc;
 extern u32 var8005eecc;

src/include/gvars/gvars.h

@@ -461,9 +461,9 @@ extern u32 var80099900;
 extern u32 var80099a00;
 extern OSMesg var80099a20;
 extern OSMesgQueue var80099a40;
-extern u32 var80099a60;
+extern struct contdata var80099a60;
 extern u32 var80099c64;
-extern u32 var80099e68;
+extern s32 var80099e68[4];
 extern OSMesgQueue var80099e78;
 extern u32 var80099e90;
 extern u32 var80099eb8;

src/include/lib/lib_13900.h

@@ -32,7 +32,7 @@ s32 func000149c0(u32 samplenum, s8 contpadnum);
 u32 func00014a78(u32 samplenum, s8 contpadnum, u32 buttons);
 u32 func00014b50(u32 samplenum, s8 contpadnum, u32 buttons);
 u32 func00014c98(u32 *arg0, s8 contpadnum, u32 buttons);
-s8 func00014e10(s8 contpadnum);
+s8 contGetStickX(s8 contpadnum);
 s8 func00014eb8(s8 contpadnum);
 u16 func00014f60(s8 contpadnum, u16 arg1);
 u16 func00015020(s8 contpadnum, u16 arg1);

src/include/types.h

@@ -7086,4 +7086,21 @@ struct stageallocation {
 	char *string;
 };
 
+struct contsample {
+	OSContPad pads[4];
+};
+
+struct contdata {
+	struct contsample samples[20];
+	s32 index;
+	s32 unk1e4;
+	s32 unk1e8;
+	s32 unk1ec;
+	s32 unk1f0;
+	s32 unk1f4;
+	s32 unk1f8;
+	s32 unk1fc;
+	s32 unk200;
+};
+
 #endif