summaryrefslogtreecommitdiff
path: root/include/m_Do
diff options
context:
space:
mode:
authorTakaRikka <38417346+TakaRikka@users.noreply.github.com>2022-04-28 13:58:43 -0700
committerGitHub <noreply@github.com>2022-04-28 16:58:43 -0400
commitd91b1294bbe8bbe802bb49e0db9019ca26bbefbd (patch)
treeafa001295c4a119e68225e9d6a26fe9584dbf504 /include/m_Do
parent07c5152e5acff18c08a92b3c773583ae0114c5f4 (diff)
d_name / d_s_name (#194)
* d_name * scnname
Diffstat (limited to 'include/m_Do')
-rw-r--r--include/m_Do/m_Do_audio.h12
-rw-r--r--include/m_Do/m_Do_graphic.h4
-rw-r--r--include/m_Do/m_Do_machine.h2
-rw-r--r--include/m_Do/m_Do_mtx.h2
4 files changed, 20 insertions, 0 deletions
diff --git a/include/m_Do/m_Do_audio.h b/include/m_Do/m_Do_audio.h
index c5ee806886..c589030a83 100644
--- a/include/m_Do/m_Do_audio.h
+++ b/include/m_Do/m_Do_audio.h
@@ -44,6 +44,18 @@ inline void mDoAud_bgmSetSwordUsing(s32 id) {
Z2AudioMgr::getInterface()->mSeqMgr.bgmSetSwordUsing(id);
}
+inline void mDoAud_bgmStart(u32 id) {
+ Z2AudioMgr::getInterface()->mSeqMgr.bgmStart(id, 0, 0);
+}
+
+inline void mDoAud_bgmStreamPrepare(u32 param_0) {
+ Z2AudioMgr::getInterface()->mSeqMgr.bgmStreamPrepare(param_0);
+}
+
+inline void mDoAud_bgmStreamPlay() {
+ Z2AudioMgr::getInterface()->mSeqMgr.bgmStreamPlay();
+}
+
inline void mDoAud_setHour(s32 hour) {
Z2AudioMgr::getInterface()->mStatusMgr.setHour(hour);
}
diff --git a/include/m_Do/m_Do_graphic.h b/include/m_Do/m_Do_graphic.h
index dee9991aa0..57222b1de9 100644
--- a/include/m_Do/m_Do_graphic.h
+++ b/include/m_Do/m_Do_graphic.h
@@ -10,6 +10,7 @@ int mDoGph_Create();
extern u8 struct_80450BE4; // Blure
extern u8 data_80450BE6; // Fade
+extern bool data_80450BE7; // AutoForcus
struct ResTIMG;
class mDoGph_gInf_c {
@@ -47,8 +48,11 @@ public:
static void endFrame() { JFWDisplay::getManager()->endFrame(); }
static void offFade() { data_80450BE6 = 0; }
static void offBlure() { struct_80450BE4 = 0; }
+ static void offAutoForcus() { data_80450BE7 = 0; }
static void setTickRate(u32 rate) { JFWDisplay::getManager()->setTickRate(rate); }
static void waitBlanking(int wait) { JFWDisplay::getManager()->waitBlanking(wait); }
+ static f32 getWidthF() { return 608.0f; }
+ static f32 getHeightF() { return 448.0f; }
static GXTexObj mFrameBufferTexObj;
static GXTexObj mZbufferTexObj;
diff --git a/include/m_Do/m_Do_machine.h b/include/m_Do/m_Do_machine.h
index 5871f47a9c..8ea5888795 100644
--- a/include/m_Do/m_Do_machine.h
+++ b/include/m_Do/m_Do_machine.h
@@ -21,6 +21,8 @@ class mDoMch_render_c {
public:
static void setRenderModeObj(GXRenderModeObj* obj) { mRenderModeObj = obj; }
static void setProgressiveMode() { setRenderModeObj(&g_ntscZeldaProg); }
+ static u16 getEfbHeight() { return mRenderModeObj->efb_height; }
+ static u16 getFbWidth() { return mRenderModeObj->fb_width; }
static GXRenderModeObj* getRenderModeObj() { return mRenderModeObj; }
diff --git a/include/m_Do/m_Do_mtx.h b/include/m_Do/m_Do_mtx.h
index df5699d1f5..1a238d69b3 100644
--- a/include/m_Do/m_Do_mtx.h
+++ b/include/m_Do/m_Do_mtx.h
@@ -16,6 +16,8 @@ void mDoMtx_YrotS(Mtx, s16);
void mDoMtx_XrotS(Mtx, s16);
void mDoMtx_YrotM(Mtx, s16);
void mDoMtx_MtxToRot(CMtxP, csXyz*);
+void mDoMtx_lookAt(f32 (*param_0)[4], Vec const* param_1, Vec const* param_2, s16 param_3);
+void mDoMtx_concatProjView(f32 const (*param_0)[4], f32 const (*param_1)[4], f32 (*param_2)[4]);
class mDoMtx_stack_c {
public: