Merge with upstream

include/m_Do/m_Do_controller_pad.h

@@ -60,6 +60,7 @@ public:
     static f32 getAnalogR(u32 pad) { return getCpadInfo(pad).mTriggerRight; }
     static f32 getAnalogL(u32 pad) { return getCpadInfo(pad).mTriggerLeft; }
     static BOOL isConnect(u32 pad) { return JUTGamePad::getPortStatus(pad) == 0; }
+    static void stopMotorHard(u32 pad) { return m_gamePad[pad]->stopMotorHard(); }
     static void stopMotorWaveHard(u32 pad) { return m_gamePad[pad]->stopMotorWaveHard(); }
 
     static JUTGamePad* m_gamePad[4];

include/m_Do/m_Do_lib.h

@@ -16,5 +16,6 @@ struct mDoLib_clipper {
 void mDoLib_project(Vec* param_0, Vec* param_1);
 bool mDoLib_setResTimgObj(ResTIMG const* res, GXTexObj* o_texObj, u32 param_2,
                           GXTlutObj* o_tlutObj);
+void mDoLib_pos2camera(Vec* param_0, Vec* param_1);
 
 #endif /* M_DO_M_DO_LIB_H */

include/m_Do/m_Do_mtx.h

@@ -33,6 +33,10 @@ inline void mDoMtx_copy(const Mtx src, Mtx dst) {
     PSMTXCopy(src, dst);
 }
 
+inline void mDoMtx_trans(Mtx m, f32 x, f32 y, f32 z) {
+    PSMTXTrans(m,x,y,z);
+}
+
 class mDoMtx_stack_c {
 public:
     /* 8000CCC8 */ static bool push();