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>

10 files changed, 18 insertions, 5 deletions

diff --git a/src/d/d_a/d_a_alink.cpp b/src/d/d_a/d_a_alink.cpp
index fe0e09956f..1c71ed7942 100644
--- a/src/d/d_a/d_a_alink.cpp
+++ b/src/d/d_a/d_a_alink.cpp
@@ -6,6 +6,7 @@
 #include "Z2AudioLib/Z2SeqMgr/Z2SeqMgr.h"
 #include "f/f_pc/f_pc_manager.h"
 #include "f/f_pc/f_pc_searcher.h"
+#include "m_Do/m_Do_controller_pad/m_Do_controller_pad.h"
 
 u32 daAlink_c::getE3Zhint(void) {
     return 0;
diff --git a/src/d/d_attention.cpp b/src/d/d_attention.cpp
index f84860ad82..f64c11b78c 100644
--- a/src/d/d_attention.cpp
+++ b/src/d/d_attention.cpp
@@ -5,6 +5,7 @@
 #include "d/d_com/d_com_inf_game/d_com_inf_game.h"
 #include "f/f_pc/f_pc_searcher.h"
 #include "global.h"
+#include "m_Do/m_Do_controller_pad/m_Do_controller_pad.h"
 
 extern "C" {
 // padLockButton__25@unnamed@d_attention_cpp@Fl
diff --git a/src/d/d_camera.cpp b/src/d/d_camera.cpp
index 5c7148f9e2..45c0cb84bc 100644
--- a/src/d/d_camera.cpp
+++ b/src/d/d_camera.cpp
@@ -7,6 +7,7 @@
 #include "d/d_com/d_com_inf_game/d_com_inf_game.h"
 #include "f/f_pc/f_pc_searcher.h"
 #include "global.h"
+#include "m_Do/m_Do_controller_pad/m_Do_controller_pad.h"
 
 extern "C" {
 // limitf__22@unnamed@d_camera_cpp@Ffff
diff --git a/src/d/d_lib.cpp b/src/d/d_lib.cpp
index a341f4a556..6e4faf0575 100644
--- a/src/d/d_lib.cpp
+++ b/src/d/d_lib.cpp
@@ -1,6 +1,7 @@
 #include "d/d_lib/d_lib.h"
 #include "JSystem/JUtility/JUTGamePad/JUTGamePad.h"
 #include "d/d_event/d_event/d_event.h"
+#include "global.h"
 #include "m_Do/m_Do_controller_pad/m_Do_controller_pad.h"
 #include "os/OS.h"
 
@@ -63,19 +64,19 @@ asm void STControl::Yinit(void) {
 #endif
 
 double STControl::getValueStick() {
-    return m_cpadInfo.interface.length_from_neutral;
+    return (double)m_cpadInfo[0].mMainStickValue;
 }
 
 s16 STControl::getAngleStick() {
-    return m_cpadInfo.interface.controlStick_angle;
+    return m_cpadInfo[0].mMainStickAngle;
 }
 
 double CSTControl::getValueStick() {
-    return m_cpadInfo.interface.cStick_length_from_neutral;
+    return (double)m_cpadInfo[0].mCStickValue;
 }
 
 s16 CSTControl::getAngleStick() {
-    return m_cpadInfo.interface.cStick_angle;
+    return m_cpadInfo[0].mCStickAngle;
 }
 
 asm u32 STControl::checkTrigger() {
diff --git a/src/d/d_meter/d_meter_map.cpp b/src/d/d_meter/d_meter_map.cpp
index 0987b7bc1a..0b80e48859 100644
--- a/src/d/d_meter/d_meter_map.cpp
+++ b/src/d/d_meter/d_meter_map.cpp
@@ -3,6 +3,7 @@
 #include "Z2AudioLib/Z2SeMgr/Z2SeMgr.h"
 #include "d/d_com/d_com_inf_game/d_com_inf_game.h"
 #include "global.h"
+#include "m_Do/m_Do_controller_pad/m_Do_controller_pad.h"
 
 extern "C" {
 // isEnableDispMap__11dMeterMap_cFv
diff --git a/src/d/d_save/d_save.cpp b/src/d/d_save/d_save.cpp
index 146a8d9411..731b006853 100644
--- a/src/d/d_save/d_save.cpp
+++ b/src/d/d_save/d_save.cpp
@@ -1,6 +1,7 @@
 #include "d/d_save/d_save/d_save.h"
 
 #include "d/d_com/d_com_inf_game/d_com_inf_game.h"
+#include "d/d_save/d_save_init/d_save_init.h"
 #include "os/OS.h"
 
 u8 dSv_item_rename(u8 item_id) {
diff --git a/src/d/d_save/d_save_init.cpp b/src/d/d_save/d_save_init.cpp
index 4bf93c8658..a6abb16008 100644
--- a/src/d/d_save/d_save_init.cpp
+++ b/src/d/d_save/d_save_init.cpp
@@ -1 +1,5 @@
-// ok
+#include "d/d_save/d_save_init/d_save_init.h"
+
+void setInitEventBit() {
+    return;
+}
\ No newline at end of file
diff --git a/src/m_Do/m_Do_Reset.cpp b/src/m_Do/m_Do_Reset.cpp
index fc2e52f793..cd4123a595 100644
--- a/src/m_Do/m_Do_Reset.cpp
+++ b/src/m_Do/m_Do_Reset.cpp
@@ -1,5 +1,6 @@
 #include "m_Do/m_Do_reset/m_Do_reset.h"
 #include "JSystem/JUtility/JUTXfb/JUTXfb.h"
+#include "SComponent/c_API_controller_pad.h"
 #include "dvd/dvd.h"
 #include "global.h"
 
diff --git a/src/m_Do/m_Do_controller_pad.cpp b/src/m_Do/m_Do_controller_pad.cpp
index a79db0473e..649bd56044 100644
--- a/src/m_Do/m_Do_controller_pad.cpp
+++ b/src/m_Do/m_Do_controller_pad.cpp
@@ -6,6 +6,7 @@
 #include "pad/pad.h"
 
 #ifdef NONMATCHING
+// TODO: change the cpadinfo stuff to use the new type of m_cpadInfo
 void mDoCPd_c::create() {
     JUTGamePad* JUTGamePad_ptr;
     cpadInfo* m_cpadInfo_addr;
diff --git a/src/m_Do/m_Do_main.cpp b/src/m_Do/m_Do_main.cpp
index 46c3e9ac4b..3d0babdfa8 100644
--- a/src/m_Do/m_Do_main.cpp
+++ b/src/m_Do/m_Do_main.cpp
@@ -1,4 +1,5 @@
 #include "m_Do/m_Do_main/m_Do_main.h"
+#include "SComponent/c_API_controller_pad.h"
 #include "d/d_com/d_com_inf_game/d_com_inf_game.h"
 #include "dvd/dvd.h"
 #include "global.h"