summaryrefslogtreecommitdiff
path: root/src/m_Do
diff options
context:
space:
mode:
authorLagoLunatic <LagoLunatic@users.noreply.github.com>2025-12-23 18:53:10 -0500
committerGitHub <noreply@github.com>2025-12-23 15:53:10 -0800
commit877889c5105e59ee3aa4e57e53d3b0c5ffcfca77 (patch)
tree154eddaea39971210e088cb828f80d38b998f998 /src/m_Do
parent6ef13c620a46aed5fea525699a4832a1ad6e4d1f (diff)
Clean up code, remove fakematches, add UNUSED, enable warnings (#2992)
* Remove NDEBUG_DEFINED fakematch, clean up getName temps * Fix ifdef * Fix bad JSystem pch ifdef breaking decomp.me * Remove Acch Chk fakematches * Private Acch fields * Fix some clangd errors in headers * Add UNUSED macro for matching debug parameters * Enable clangd unused-parameter warning * Remove extern from initializers Probably added by dol2asm? * Fix process profile definitions * Remove leftover dol2asm address comments * Remove some unnecessary double casts * Enable some more clangd warnings * Fix missing usages of fopAcM_ct * Fix wrong enum usage * Fix more fakematches
Diffstat (limited to 'src/m_Do')
-rw-r--r--src/m_Do/m_Do_audio.cpp3
-rw-r--r--src/m_Do/m_Do_ext.cpp18
-rw-r--r--src/m_Do/m_Do_graphic.cpp10
-rw-r--r--src/m_Do/m_Do_main.cpp3
-rw-r--r--src/m_Do/m_Do_mtx.cpp2
5 files changed, 4 insertions, 32 deletions
diff --git a/src/m_Do/m_Do_audio.cpp b/src/m_Do/m_Do_audio.cpp
index 4a1479d1b7..07e593642c 100644
--- a/src/m_Do/m_Do_audio.cpp
+++ b/src/m_Do/m_Do_audio.cpp
@@ -18,9 +18,6 @@
#include <revolution/sc.h>
#endif
-/* 80450BB8 0001+00 data_80450BB8 None */
-/* 80450BB9 0001+00 data_80450BB9 None */
-/* 80450BBA 0002+00 data_80450BBA None */
bool mDoAud_zelAudio_c::mInitFlag;
bool mDoAud_zelAudio_c::mResetFlag;
diff --git a/src/m_Do/m_Do_ext.cpp b/src/m_Do/m_Do_ext.cpp
index b1c6ab26ce..f8c2d65728 100644
--- a/src/m_Do/m_Do_ext.cpp
+++ b/src/m_Do/m_Do_ext.cpp
@@ -1060,9 +1060,6 @@ void mDoExt_morf_c::frameUpdate() {
mFrameCtrl.update();
}
-/* 8000FC4C-8000FD10 00A58C 00C4+00 0/0 0/0 34/34 .text
- * __ct__14mDoExt_McaMorfFP12J3DModelDataP25mDoExt_McaMorfCallBack1_cP25mDoExt_McaMorfCallBack2_cP15J3DAnmTransformifiiiPvUlUl
- */
mDoExt_McaMorf::mDoExt_McaMorf(J3DModelData* modelData, mDoExt_McaMorfCallBack1_c* callback1,
mDoExt_McaMorfCallBack2_c* callback2, J3DAnmTransform* anmTransform,
int param_4, f32 param_5, int param_6, int param_7, int param_8,
@@ -1079,9 +1076,6 @@ mDoExt_McaMorf::~mDoExt_McaMorf() {
}
}
-/* 8000FD94-80010074 00A6D4 02E0+00 1/1 0/0 0/0 .text
- * create__14mDoExt_McaMorfFP12J3DModelDataP25mDoExt_McaMorfCallBack1_cP25mDoExt_McaMorfCallBack2_cP15J3DAnmTransformifiiiPvUlUl
- */
int mDoExt_McaMorf::create(J3DModelData* modelData, mDoExt_McaMorfCallBack1_c* callback1,
mDoExt_McaMorfCallBack2_c* callback2, J3DAnmTransform* anmTransform,
int param_4, f32 param_5, int param_6, int param_7, int param_8,
@@ -1320,9 +1314,6 @@ void mDoExt_McaMorf::getTransform(u16 param_0, J3DTransformInfo* param_1) {
}
}
-/* 800107D0-80010888 00B110 00B8+00 0/0 2/2 222/222 .text
- * __ct__16mDoExt_McaMorfSOFP12J3DModelDataP25mDoExt_McaMorfCallBack1_cP25mDoExt_McaMorfCallBack2_cP15J3DAnmTransformifiiP10Z2CreatureUlUl
- */
mDoExt_McaMorfSO::mDoExt_McaMorfSO(J3DModelData* param_0, mDoExt_McaMorfCallBack1_c* param_1,
mDoExt_McaMorfCallBack2_c* param_2, J3DAnmTransform* param_3,
int param_4, f32 param_5, int param_6, int param_7,
@@ -1337,9 +1328,6 @@ mDoExt_McaMorfSO::~mDoExt_McaMorfSO() {
stopZelAnime();
}
-/* 800108F0-80010B68 00B230 0278+00 1/1 0/0 0/0 .text
- * create__16mDoExt_McaMorfSOFP12J3DModelDataP25mDoExt_McaMorfCallBack1_cP25mDoExt_McaMorfCallBack2_cP15J3DAnmTransformifiiP10Z2CreatureUlUl
- */
int mDoExt_McaMorfSO::create(J3DModelData* i_modelData, mDoExt_McaMorfCallBack1_c* param_1,
mDoExt_McaMorfCallBack2_c* param_2, J3DAnmTransform* param_3,
int param_4, f32 param_5, int param_6, int param_7,
@@ -1618,9 +1606,6 @@ void mDoExt_McaMorfSO::stopZelAnime() {
}
}
-/* 80011348-800113FC 00BC88 00B4+00 0/0 0/0 1/1 .text
- * __ct__15mDoExt_McaMorf2FP12J3DModelDataP25mDoExt_McaMorfCallBack1_cP25mDoExt_McaMorfCallBack2_cP15J3DAnmTransformP15J3DAnmTransformifiiP10Z2CreatureUlUl
- */
mDoExt_McaMorf2::mDoExt_McaMorf2(J3DModelData* param_0, mDoExt_McaMorfCallBack1_c* param_1,
mDoExt_McaMorfCallBack2_c* param_2, J3DAnmTransform* param_3,
J3DAnmTransform* param_4, int param_5, f32 param_6, int param_7,
@@ -1633,9 +1618,6 @@ mDoExt_McaMorf2::~mDoExt_McaMorf2() {
stopZelAnime();
}
-/* 80011464-800116B4 00BDA4 0250+00 1/1 0/0 0/0 .text
- * create__15mDoExt_McaMorf2FP12J3DModelDataP25mDoExt_McaMorfCallBack1_cP25mDoExt_McaMorfCallBack2_cP15J3DAnmTransformP15J3DAnmTransformifiiP10Z2CreatureUlUl
- */
int mDoExt_McaMorf2::create(J3DModelData* param_0, mDoExt_McaMorfCallBack1_c* param_1,
mDoExt_McaMorfCallBack2_c* param_2, J3DAnmTransform* param_3,
J3DAnmTransform* param_4, int param_5, f32 param_6, int param_7,
diff --git a/src/m_Do/m_Do_graphic.cpp b/src/m_Do/m_Do_graphic.cpp
index 38f0b3dfb1..a34af824f4 100644
--- a/src/m_Do/m_Do_graphic.cpp
+++ b/src/m_Do/m_Do_graphic.cpp
@@ -266,10 +266,6 @@ GXColor mDoGph_gInf_c::mBackColor = {0, 0, 0, 0};
GXColor mDoGph_gInf_c::mFadeColor = {0, 0, 0, 0};
-/* 80450BE4 0001+00 data_80450BE4 None */
-/* 80450BE5 0001+00 data_80450BE5 None */
-/* 80450BE6 0001+00 mFade__13mDoGph_gInf_c None */
-/* 80450BE7 0001+00 data_80450BE7 None */
u8 mDoGph_gInf_c::mBlureFlag;
u8 mDoGph_gInf_c::mBlureRate;
@@ -1006,7 +1002,7 @@ static void drawDepth2(view_class* param_0, view_port_class* param_1, int param_
}
static void trimming(view_class* param_0, view_port_class* param_1) {
- (void)param_0;
+ UNUSED(param_0);
s16 y_orig = (int)param_1->y_orig & ~7;
s16 y_orig_pos = y_orig < 0 ? 0 : y_orig;
@@ -1275,8 +1271,8 @@ void mDoGph_gInf_c::bloom_c::draw() {
}
static void retry_captue_frame(view_class* param_0, view_port_class* param_1, int param_2) {
- (void)param_0;
- (void)param_2;
+ UNUSED(param_0);
+ UNUSED(param_2);
s16 x_orig = (int)param_1->x_orig & 0xFFFFFFF8;
s16 y_orig = (int)param_1->y_orig & 0xFFFFFFF8;
diff --git a/src/m_Do/m_Do_main.cpp b/src/m_Do/m_Do_main.cpp
index 53f955b453..430bbadc9b 100644
--- a/src/m_Do/m_Do_main.cpp
+++ b/src/m_Do/m_Do_main.cpp
@@ -195,14 +195,12 @@ OSTime mDoMain::sPowerOnTime;
OSTime mDoMain::sHungUpTime;
-/* 80450B18 0001+00 data_80450B18 None */
static u8 mDisplayHeapSize;
#if DEBUG
static u8 mReportDisable;
#endif
-/* 80450B19 0001+00 data_80450B19 None */
static u8 mSelectHeapBar;
#if DEBUG
@@ -210,7 +208,6 @@ static u8 mVisibleHeapBar;
static u8 mPrintFrameLine;
#endif
-/* 80450B1A 0002+00 data_80450B1A None */
static u8 mCheckHeap;
#if DEBUG
diff --git a/src/m_Do/m_Do_mtx.cpp b/src/m_Do/m_Do_mtx.cpp
index 379e7f2a80..3b8bcd137e 100644
--- a/src/m_Do/m_Do_mtx.cpp
+++ b/src/m_Do/m_Do_mtx.cpp
@@ -23,7 +23,7 @@ static mDoMtx_stack_c mDoMtx_stack;
static mDoMtx_quatStack_c mDoMtx_quatStack;
-extern Mtx g_mDoMtx_identity = {
+Mtx g_mDoMtx_identity = {
{1.0f, 0.0f, 0.0f, 0.0f},
{0.0f, 1.0f, 0.0f, 0.0f},
{0.0f, 0.0f, 1.0f, 0.0f},