summaryrefslogtreecommitdiff
path: root/include/m_Do
diff options
context:
space:
mode:
authorTakaRikka <38417346+TakaRikka@users.noreply.github.com>2022-12-19 11:06:32 -0800
committerGitHub <noreply@github.com>2022-12-19 12:06:32 -0700
commitca71275bbecc7db9a4eeca3a6ac4215b66de4318 (patch)
treec2851f8cec211216fe0cb6a31a0260a62fc3bf53 /include/m_Do
parent1114b13da81ab0b52fd4bb56a32f32331a21e581 (diff)
big d_a_alink pass (#214)
* d_a_alink pass1 wip * more d_a_alink work * remove asm * more daalink work * 20% dol code decompiled * fixed some nonmatchings for building * a few daalink functions and labeling some HIO data
Diffstat (limited to 'include/m_Do')
-rw-r--r--include/m_Do/m_Do_audio.h1
-rw-r--r--include/m_Do/m_Do_controller_pad.h1
-rw-r--r--include/m_Do/m_Do_ext.h3
-rw-r--r--include/m_Do/m_Do_machine.h1
-rw-r--r--include/m_Do/m_Do_main.h2
-rw-r--r--include/m_Do/m_Do_mtx.h11
6 files changed, 17 insertions, 2 deletions
diff --git a/include/m_Do/m_Do_audio.h b/include/m_Do/m_Do_audio.h
index f205d388d1..3cc4b62160 100644
--- a/include/m_Do/m_Do_audio.h
+++ b/include/m_Do/m_Do_audio.h
@@ -38,6 +38,7 @@ public:
extern JKRSolidHeap* g_mDoAud_audioHeap;
+void mDoAud_Execute();
void mDoAud_resetProcess();
bool mDoAud_resetRecover();
void mDoAud_setSceneName(char const* spot, s32 room, s32 layer);
diff --git a/include/m_Do/m_Do_controller_pad.h b/include/m_Do/m_Do_controller_pad.h
index 161420fca6..1737fe56fd 100644
--- a/include/m_Do/m_Do_controller_pad.h
+++ b/include/m_Do/m_Do_controller_pad.h
@@ -52,6 +52,7 @@ public:
static f32 getStickY(u32 pad) { return getCpadInfo(pad).mMainStickPosY; }
static f32 getStickValue(u32 pad) { return getCpadInfo(pad).mMainStickValue; }
static s16 getStickAngle(u32 pad) { return getCpadInfo(pad).mMainStickAngle; }
+ static s16 getStickAngle3D(u32 pad) { return getCpadInfo(pad).mMainStickAngle; }
static f32 getSubStickX(u32 pad) { return getCpadInfo(pad).mCStickPosX; }
static f32 getSubStickY(u32 pad) { return getCpadInfo(pad).mCStickPosY; }
static f32 getSubStickValue(u32 pad) { return getCpadInfo(pad).mCStickValue; }
diff --git a/include/m_Do/m_Do_ext.h b/include/m_Do/m_Do_ext.h
index 550109b9c2..2cf1ce8edc 100644
--- a/include/m_Do/m_Do_ext.h
+++ b/include/m_Do/m_Do_ext.h
@@ -182,6 +182,7 @@ public:
/* 80140E2C */ mDoExt_AnmRatioPack();
void setRatio(f32 ratio) { mRatio = ratio; }
+ f32 getRatio() { return mRatio; }
J3DAnmTransform* getAnmTransform() { return mAnmTransform; }
void setAnmTransform(J3DAnmTransform* anm) { mAnmTransform = anm; }
@@ -359,6 +360,7 @@ public:
/* 8000F8CC */ void decOldFrameMorfCounter();
f32 getOldFrameRate() { return mOldFrameRate; }
+ J3DTransformInfo* getOldFrameTransInfo(int i) { return &mOldFrameTransInfo[i]; }
private:
/* 0x00 */ bool mOldFrameFlg;
@@ -500,6 +502,7 @@ void mDoExt_modelUpdateDL(J3DModel* i_model);
J3DModel* mDoExt_J3DModel__create(J3DModelData* i_modelData, u32 param_1, u32 param_2);
void mDoExt_setAraCacheSize(u32 size);
int mDoExt_resIDToIndex(JKRArchive* p_archive, u16 id);
+void mDoExt_modelEntryDL(J3DModel* i_model);
struct JUTFont;
JUTFont* mDoExt_getMesgFont();
diff --git a/include/m_Do/m_Do_machine.h b/include/m_Do/m_Do_machine.h
index 70bfe4ddd3..88cf77a4eb 100644
--- a/include/m_Do/m_Do_machine.h
+++ b/include/m_Do/m_Do_machine.h
@@ -15,6 +15,7 @@ void exceptionRestart();
void myExceptionCallback(u16, OSContext*, u32, u32);
void my_SysPrintHeap(char const*, void*, u32);
void mDoMch_HeapCheckAll();
+int mDoMch_Create();
extern GXRenderModeObj g_ntscZeldaProg;
diff --git a/include/m_Do/m_Do_main.h b/include/m_Do/m_Do_main.h
index c006df31ec..b012752efe 100644
--- a/include/m_Do/m_Do_main.h
+++ b/include/m_Do/m_Do_main.h
@@ -6,7 +6,7 @@
#include "dolphin/types.h"
void version_check();
-void* LOAD_COPYDATE(void*);
+s32 LOAD_COPYDATE(void*);
class HeapCheck {
public:
diff --git a/include/m_Do/m_Do_mtx.h b/include/m_Do/m_Do_mtx.h
index 1f9d82853c..f2103edf58 100644
--- a/include/m_Do/m_Do_mtx.h
+++ b/include/m_Do/m_Do_mtx.h
@@ -25,6 +25,14 @@ inline void mDoMtx_multVecSR(Mtx m, const Vec* src, Vec* dst) {
PSMTXMultVecSR(m, src, dst);
}
+inline void mDoMtx_multVec(Mtx m, const Vec* src, Vec* dst) {
+ PSMTXMultVec(m, src, dst);
+}
+
+inline void mDoMtx_copy(const Mtx src, Mtx dst) {
+ PSMTXCopy(src, dst);
+}
+
class mDoMtx_stack_c {
public:
/* 8000CCC8 */ static bool push();
@@ -46,6 +54,7 @@ public:
static void transS(f32 x, f32 y, f32 z) { PSMTXTrans(now, x, y, z); }
static void scaleS(f32 x, f32 y, f32 z) { PSMTXScale(now, x, y, z); }
static void multVec(const Vec* a, Vec* b) { PSMTXMultVec(now, a, b); }
+ static void multVecSR(const Vec* a, Vec* b) { PSMTXMultVecSR(now, a, b); }
static void XYZrotS(s16 x, s16 y, s16 z) { mDoMtx_XYZrotS(now, x, y, z); }
static void XYZrotM(s16 x, s16 y, s16 z) { mDoMtx_XYZrotM(now, x, y, z); }
static void ZXYrotS(s16 x, s16 y, s16 z) { mDoMtx_ZXYrotS(now, x, y, z); }
@@ -55,7 +64,7 @@ public:
static void XrotM(s16 x) { mDoMtx_XrotM(now, x); }
static void inverse() { PSMTXInverse(now, now); }
static void concat(const Mtx m) { PSMTXConcat(now, m, now); }
- static void copy(Mtx m) { PSMTXCopy(now, m); }
+ static void copy(const Mtx m) { PSMTXCopy(m, now); }
static Mtx now;
static Mtx buffer[16];