Merge pull request #196 from NeonNyan/1.2_analog

1.2 + 1 Analog Controls

src/include/constants.h

@@ -4689,6 +4689,10 @@ enum weaponnum {
 #define BUTTON_RADIAL         D_JPAD
 #define BUTTON_ALTMODE        L_TRIG
 
+#define BUTTON_CROUCH_CYCLE   CONT_8000             
+#define BUTTON_HALF_CROUCH    CONT_4000             
+#define BUTTON_FULL_CROUCH    CONT_2000             
+
 #define MOUSEAIM_CLASSIC 0 // crosshair moves around the screen in aim mode
 #define MOUSEAIM_LOCKED 1  // crosshair locked to the center of the screen in aim mode
 

src/include/game/bondwalk.h

@@ -6,6 +6,7 @@
 
 void bwalkInit(void);
 void bwalkSetSwayTarget(s32 value);
+void bwalkSetSwayTargetf(f32 value);
 void bwalkAdjustCrouchPos(s32 value);
 void bwalk0f0c3b38(struct coord *param_1, struct defaultobj *obj);
 s32 bwalkTryMoveUpwards(f32 amount);

src/include/game/debug.h

@@ -46,7 +46,7 @@ void dmenuNavigateDown(void);
 Gfx *dmenuRender(Gfx *gdl);
 
 void debugUpdateMenu(void);
-bool debugProcessInput(s8 stickx, s8 sticky, u16 buttons, u16 buttonsthisframe);
+bool debugProcessInput(s8 stickx, s8 sticky, u32 buttons, u32 buttonsthisframe);
 bool debugIsLineModeEnabled(void);
 
 extern s32 var800786f4nb;

src/include/lib/joy.h

@@ -26,16 +26,21 @@ void joyReadData(void);
 void joysHandleRetrace(void);
 void joy00014810(bool value);
 s32 joyGetNumSamples(void);
+s32 joyGetRStickXOnSample(s32 samplenum, s8 contpadnum);
+s32 joyGetRStickYOnSample(s32 samplenum, s8 contpadnum);
 s32 joyGetStickXOnSample(s32 samplenum, s8 contpadnum);
 s32 joyGetStickYOnSample(s32 samplenum, s8 contpadnum);
 s32 joyGetStickYOnSampleIndex(s32 samplenum, s8 contpadnum);
-u16 joyGetButtonsOnSample(s32 samplenum, s8 contpadnum, u16 mask);
-u16 joyGetButtonsPressedOnSample(s32 samplenum, s8 contpadnum, u16 mask);
-s32 joyCountButtonsOnSpecificSamples(u32 *arg0, s8 contpadnum, u16 mask);
+s32 joyGetRStickYOnSampleIndex(s32 samplenum, s8 contpadnum);
+u32 joyGetButtonsOnSample(s32 samplenum, s8 contpadnum, u32 mask);
+u32 joyGetButtonsPressedOnSample(s32 samplenum, s8 contpadnum, u32 mask);
+s32 joyCountButtonsOnSpecificSamples(u32 *arg0, s8 contpadnum, u32 mask);
 s8 joyGetStickX(s8 contpadnum);
 s8 joyGetStickY(s8 contpadnum);
-u16 joyGetButtons(s8 contpadnum, u16 mask);
-u16 joyGetButtonsPressedThisFrame(s8 contpadnum, u16 mask);
+s8 joyGetRStickX(s8 contpadnum);
+s8 joyGetRStickY(s8 contpadnum);
+u32 joyGetButtons(s8 contpadnum, u32 mask);
+u32 joyGetButtonsPressedThisFrame(s8 contpadnum, u32 mask);
 bool joyIsCyclicPollingEnabled(void);
 
 #if VERSION >= VERSION_NTSC_1_0

src/include/types.h

@@ -5076,6 +5076,7 @@ struct movedata {
 #ifndef PLATFORM_N64
 	/*    */ f32 freelookdx; // how much the mouse moved ...
 	/*    */ f32 freelookdy; // ... scaled by sensitivity
+	/*    */ f32 analoglean; // how much we're trying to lean
 #endif
 
 };