Rename a heap of controller symbols

src/include/game/data/data_000000.h

@@ -113,18 +113,18 @@ extern u32 var8005edf0;
 extern u32 var8005ee10;
 extern u32 var8005ee14;
 extern u32 var8005ee18;
-extern struct contdata *var8005ee60;
+extern struct contdata *g_ContDataPtr;
 extern bool g_ContBusy;
 extern u32 var8005ee68;
-extern u32 var8005ee6c[4];
-extern u32 var8005ee7c[4];
-extern u32 var8005ee8c[4];
-extern u32 var8005ee9c[4];
+extern u32 g_ContBadReadsStickX[4];
+extern u32 g_ContBadReadsStickY[4];
+extern u32 g_ContBadReadsButtons[4];
+extern u32 g_ContBadReadsButtonsPressed[4];
 extern u8 g_ConnectedControllers;
 extern bool g_ContInitDone;
 extern u32 g_ContNeedsInit;
 extern u32 var8005eebc;
-extern s32 var8005eecc;
+extern s32 g_ContNextPfsStateIndex;
 extern u32 var8005eedc;
 extern s32 var8005eee0;
 extern s32 var8005eee4;

src/include/gvars/gvars.h

@@ -461,9 +461,9 @@ extern u32 var80099900;
 extern u32 var80099a00;
 extern OSMesg var80099a20;
 extern OSMesgQueue var80099a40;
-extern struct contdata var80099a60[2];
+extern struct contdata g_ContData[2];
 extern u32 var80099c64;
-extern s32 var80099e68[4];
+extern s32 g_ContDisableCooldown[4];
 extern OSMesgQueue var80099e78;
 extern OSMesg var80099e90;
 extern OSMesg var80099eb8;
@@ -475,7 +475,7 @@ extern OSMesgQueue var80099f00;
 extern OSMesg var80099f18;
 extern OSMesgQueue var80099f20;
 extern OSContStatus var80099f38[4];
-extern u8 var80099f48[4];
+extern u8 g_ContPfsStates[100];
 extern u32 var8009a874;
 extern u32 var8009a878;
 extern u32 var8009a87c;

src/include/lib/lib_13900.h

@@ -9,16 +9,16 @@ void func00013974(u32 value);
 u32 func00013980(void);
 void func0001398c(s32 value);
 void func000139c8(void);
-s32 func000139e8(void);
-void func00013a40(u8 arg0);
+s32 contShiftPfsStates(void);
+void contRecordPfsState(u8 pfsstate);
 void contCheckPfs(s32 arg0);
-void func00013c4c(s8 index);
+void contSetPfsTemporarilyPlugged(s8 index);
 void contSystemInit(void);
-void func00013dd4(void);
+void contDisableTemporarily(void);
 void func00013dfc(void);
 void func00013e84(void);
 u32 contGetConnectedControllers(void);
-void func00014058(struct contdata *contdata);
+void contConsumeSamples(struct contdata *contdata);
 void func00014238(void);
 void contDebugJoy(void);
 s32 contStartReadData(OSMesgQueue *mq);
@@ -26,16 +26,16 @@ void contReadData(void);
 void contPoll(void);
 void func00014810(bool value);
 s32 contGetNumSamples(void);
-s32 func00014848(s32 samplenum, s8 contpadnum);
-s32 func00014904(s32 samplenum, s8 contpadnum);
-s32 func000149c0(s32 samplenum, s8 contpadnum);
-u16 func00014a78(s32 samplenum, s8 contpadnum, u16 mask);
-u16 func00014b50(s32 samplenum, s8 contpadnum, u16 mask);
-s32 func00014c98(u32 *arg0, s8 contpadnum, u16 mask);
+s32 contGetStickXOnSample(s32 samplenum, s8 contpadnum);
+s32 contGetStickYOnSample(s32 samplenum, s8 contpadnum);
+s32 contGetStickYOnSampleIndex(s32 samplenum, s8 contpadnum);
+u16 contGetButtonsOnSample(s32 samplenum, s8 contpadnum, u16 mask);
+u16 contGetButtonsPressedOnSample(s32 samplenum, s8 contpadnum, u16 mask);
+s32 contCountButtonsOnSpecificSamples(u32 *arg0, s8 contpadnum, u16 mask);
 s8 contGetStickX(s8 contpadnum);
 s8 contGetStickY(s8 contpadnum);
 u16 contGetButtons(s8 contpadnum, u16 mask);
-u16 func00015020(s8 contpadnum, u16 mask);
+u16 contGetButtonsPressedThisFrame(s8 contpadnum, u16 mask);
 s32 func000150c4(void);
 void func000150e8(void);
 void func00015144(void);

src/include/types.h

@@ -7092,12 +7092,12 @@ struct contsample {
 
 struct contdata {
 	struct contsample samples[20];
-	s32 unk1e0;
-	s32 unk1e4;
-	s32 unk1e8;
-	s32 unk1ec;
-	u16 unk1f0[4];
-	u16 unk1f8[4];
+	s32 curlast;
+	s32 curstart;
+	s32 nextlast;
+	s32 nextsecondlast;
+	u16 buttonspressed[4];
+	u16 buttonsreleased[4];
 	s32 unk200;
 };