mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-07-11 15:28:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

M_do_controller_pad split and partially matched (#36)

Browse Source 
* m_Do_controller_pad split

* Attempt to match and match mDoCPd_c::recalibrate

* Fix Merge Errors

* clang-format

Co-authored-by: Pheenoh <pheenoh@gmail.com>
This commit is contained in:
jdflyer
2021-01-02 00:02:19 -07:00
committed by GitHub
parent 69faf591d4
commit e42d44e6cb
70 changed files with 1604 additions and 1043 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/JUtility/JUTGamePad/JUTGamePad.h
+6 -6
View File
@@ -7,13 +7,14 @@
#include "os/OS.h"
#include "pad/pad.h"
typedef u32 EPadPort;
typedef u32 EStickMode;
typedef u32 EWhichStick;
class JUTGamePad : public JKRDisposer {
struct JUTGamePad : public JKRDisposer {
public:
JUTGamePad(EPadPort port);
// typedef u32 EPadPort;
enum EPadPort { Port_1 = 0, Port_2 = 0, Port_3 = 0, Port_4 = 0 };
JUTGamePad(JUTGamePad::EPadPort port);
virtual ~JUTGamePad();
void initList();
@@ -26,7 +27,7 @@ public:
void stopPatternedRumble() { this->rumble.stopPatternedRumble(this->pad_port); }
static void checkResetSwitch();
static void clearForReset();
static JUTGamePad* getGamePad(s32 pad_index);
static JUTGamePad* getGamePad(int pad_index);
static bool recalibrate(PADMask pad_mask);
struct CButton {
@@ -91,7 +92,6 @@ public:
u8* field_0x10;
};
private:
CButton buttons;
CStick control_stick;
CStick c_stick;
@@ -135,7 +135,7 @@ extern float lbl_80456028; // JUTGamePad::CStick::clear() init to
extern bool lbl_804514E4[4]; // JUTGamePad::CRumble::mStatus (static?)
extern PADMask lbl_804514E8; // JUTGamePad::CRumble::mEnabled (static?)
extern PADMask lbl_803CC5F0[4]; // JUTGamePad::CRumble::sChannelMask
extern s32 lbl_804514DC; // JUTGamePad::sAnalogMode
extern s32 sAnalogMode; // JUTGamePad::sAnalogMode
extern bool lbl_804514D0; // JUTGamePad::mIsPadListInitialized
extern JSUList<JUTGamePad> lbl_804343E4; // JUTGamePad::mPadList
// extern JSUPtrList lbl_804343E4; // JUTGamePad::mPadList