summaryrefslogtreecommitdiff
path: root/include/m_Do
diff options
context:
space:
mode:
authorErin Moon <erin@hecke.rs>2021-01-03 00:04:15 -0600
committerGitHub <noreply@github.com>2021-01-03 01:04:15 -0500
commit5c4ac052c3eadf70cfb4810341ccfbbba22869e2 (patch)
tree37f1e2f9a5d7f0ba7313c7229fa60bac11dcb453 /include/m_Do
parentb6791276753f676f07e5251d823b0969208f1dc8 (diff)
decomp some small files, do some cleanup (#42)
* remove leftover asm: JSUList.s * d_save_init: decomp * JMath/random: decomp * J3DUDL: fixup label * JAUClusterSound: decomp * c_API_controller_pad: decomp, elaborate globals/types * clang-format * don't add guards to functions.h * semantic merge of m_cpadInfo stuff * fix undef symbols Co-authored-by: Pheenoh <pheenoh@gmail.com>
Diffstat (limited to 'include/m_Do')
-rw-r--r--include/m_Do/m_Do_controller_pad/m_Do_controller_pad.h44
1 files changed, 5 insertions, 39 deletions
diff --git a/include/m_Do/m_Do_controller_pad/m_Do_controller_pad.h b/include/m_Do/m_Do_controller_pad/m_Do_controller_pad.h
index fd4d7d0b6a..05b8f1d773 100644
--- a/include/m_Do/m_Do_controller_pad/m_Do_controller_pad.h
+++ b/include/m_Do/m_Do_controller_pad/m_Do_controller_pad.h
@@ -2,7 +2,10 @@
#define __M_DO_CONTROLLER_PAD_H_
#include "JSystem/JUtility/JUTGamePad/JUTGamePad.h"
-#include "global.h"
+#include "SComponent/c_API_controller_pad.h"
+
+extern JUTGamePad* lbl_803DD2D8[4]; // m_Do_controller_pad::mDoCPd_c::m_gamePad
+extern interface_of_controller_pad m_cpadInfo[4]; // m_Do_controller_pad::mDoCPd_c::m_cpadInfo
struct g_HIO_struct {
u32 field_0x0;
@@ -66,49 +69,12 @@ struct g_HIO_struct {
u8 field_0x43;
};
-struct interface_of_controller_pad {
- float stick_x;
- float stick_y;
- float length_from_neutral;
- s16 controlStick_angle;
- u8 field_0xe;
- u8 field_0xf;
- float cStick_x;
- float cStick_y;
- float cStick_length_from_neutral;
- s16 cStick_angle;
- u8 field_0x1e;
- u8 field_0x1f;
- float analog_a;
- float analog_b;
- float trigger_left;
- float trigger_right;
- u32 button_flags;
- u32 field_0x34;
- s8 error_value;
- bool field_0x39;
- bool field_0x3a;
- bool field_0x3b;
- bool field_0x3c;
-};
-
-struct cpadInfo {
- interface_of_controller_pad interface;
- cpadInfo* unk1;
- f32 stickValue;
- s16 stickAngle;
- u8 p2[0x8];
- f32 CstickValue;
- s16 CstickAngle;
- u8 p3[0xE2];
-};
-
struct mDoCPd_c {
void create();
void read();
static void convert(interface_of_controller_pad* controllerInteface, JUTGamePad* gamePad);
static void LRlockCheck(interface_of_controller_pad* controllerInterface);
- void recalibrate(void);
+ static void recalibrate(void);
JUTGamePad* gamePad;
};