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>
This commit is contained in:
Erin Moon
2021-01-03 00:04:15 -06:00
committed by GitHub
parent b679127675
commit 5c4ac052c3
38 changed files with 137 additions and 128 deletions
+1
View File
@@ -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;
+1
View File
@@ -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
+1
View File
@@ -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
+5 -4
View File
@@ -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() {
+1
View File
@@ -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
+1
View File
@@ -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) {
+5 -1
View File
@@ -1 +1,5 @@
// ok
#include "d/d_save/d_save_init/d_save_init.h"
void setInitEventBit() {
return;
}