mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-30 07:34:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

project cleanup (#2895)

Browse Source 
* some wii OS fixes

* remove old dol2asm comments

* remove dol2asm.h

* remove function address comments

* normalize ATTRIBUTE_ALIGN usage

* DECL_WEAK macro

* fix gcc attribute weak macro

* wrap more mwcc specific things in ifdefs

* fixes

* fix revo sdk version flags

* fixes
This commit is contained in:
TakaRikka
2025-11-30 14:23:42 -08:00
committed by GitHub
parent dee0667b5a
commit dfa8efa97b
2375 changed files with 24683 additions and 71069 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/d_msg_scrn_explain.cpp
-25
View File
@@ -31,8 +31,6 @@ static dMsgScrnExplain_c::ProcFunc move_process[] = {
&dMsgScrnExplain_c::move_select_proc, &dMsgScrnExplain_c::close_proc,
};
/* 8023CC88-8023D538 2375C8 08B0+00 0/0 2/2 0/0 .text __ct__17dMsgScrnExplain_cFP9STControlUcbUc
*/
dMsgScrnExplain_c::dMsgScrnExplain_c(STControl* i_stick, u8 param_1, bool param_2, u8 param_3) {
mpStick = i_stick;
field_0x54 = 0;
@@ -191,7 +189,6 @@ dMsgScrnExplain_c::dMsgScrnExplain_c(STControl* i_stick, u8 param_1, bool param_
mpMg_c[1]->translate(vtxCenter2.x + field_0x50, vtxCenter2.y);
}
/* 8023D538-8023D7D8 237E78 02A0+00 1/0 0/0 0/0 .text __dt__17dMsgScrnExplain_cFv */
dMsgScrnExplain_c::~dMsgScrnExplain_c() {
delete mpString_c;
mpString_c = NULL;
@@ -244,7 +241,6 @@ dMsgScrnExplain_c::~dMsgScrnExplain_c() {
dComIfGp_getMsgCommonArchive()->removeResourceAll();
}
/* 8023D7D8-8023D918 238118 0140+00 0/0 4/4 0/0 .text move__17dMsgScrnExplain_cFv */
void dMsgScrnExplain_c::move() {
u8 currentStatus = mStatus;
@@ -268,8 +264,6 @@ void dMsgScrnExplain_c::move() {
g_MsgObject_HIO_c.mBoxTalkScaleY);
}
/* 8023D918-8023DAD0 238258 01B8+00 0/0 3/3 0/0 .text draw__17dMsgScrnExplain_cFP13J2DOrthoGraph
*/
void dMsgScrnExplain_c::draw(J2DOrthoGraph* i_graf) {
if (mStatus == 0 || mStatus == 1) {
return;
@@ -312,16 +306,12 @@ void dMsgScrnExplain_c::draw(J2DOrthoGraph* i_graf) {
}
}
/* 8023DAD0-8023DAD4 238410 0004+00 1/0 0/0 0/0 .text wait_init__17dMsgScrnExplain_cFv */
void dMsgScrnExplain_c::wait_init() {}
/* 8023DAD4-8023DAD8 238414 0004+00 1/0 0/0 0/0 .text wait_proc__17dMsgScrnExplain_cFv */
void dMsgScrnExplain_c::wait_proc() {}
/* 8023DAD8-8023DADC 238418 0004+00 2/1 0/0 0/0 .text open_request_init__17dMsgScrnExplain_cFv */
void dMsgScrnExplain_c::open_request_init() {}
/* 8023DADC-8023DBE4 23841C 0108+00 1/0 0/0 0/0 .text open_request_proc__17dMsgScrnExplain_cFv */
void dMsgScrnExplain_c::open_request_proc() {
J2DTextBox* uVar1;
J2DTextBox* uVar6 = NULL;
@@ -354,7 +344,6 @@ void dMsgScrnExplain_c::open_request_proc() {
}
}
/* 8023DBE4-8023DC7C 238524 0098+00 1/0 0/0 0/0 .text open_init__17dMsgScrnExplain_cFv */
void dMsgScrnExplain_c::open_init() {
field_0x5a = 0;
field_0x48 = 608.0f;
@@ -364,7 +353,6 @@ void dMsgScrnExplain_c::open_init() {
mDoAud_seStart(Z2SE_SY_EXP_WIN_OPEN, 0, 0, 0);
}
/* 8023DC7C-8023DD90 2385BC 0114+00 1/0 0/0 0/0 .text open_proc__17dMsgScrnExplain_cFv */
void dMsgScrnExplain_c::open_proc() {
field_0x5a++;
if (field_0x5a >= 5) {
@@ -386,12 +374,10 @@ void dMsgScrnExplain_c::open_proc() {
}
}
/* 8023DD90-8023DDB4 2386D0 0024+00 1/0 0/0 0/0 .text move_init__17dMsgScrnExplain_cFv */
void dMsgScrnExplain_c::move_init() {
mpArrow_c->arwAnimeInit();
}
/* 8023DDB4-8023DE8C 2386F4 00D8+00 1/0 0/0 0/0 .text move_proc__17dMsgScrnExplain_cFv */
void dMsgScrnExplain_c::move_proc() {
if (mKeyWaitTimer > 0) {
mKeyWaitTimer--;
@@ -410,7 +396,6 @@ void dMsgScrnExplain_c::move_proc() {
}
}
/* 8023DE8C-8023E0F4 2387CC 0268+00 1/0 0/0 0/0 .text move_select_init__17dMsgScrnExplain_cFv */
void dMsgScrnExplain_c::move_select_init() {
char msg_buf_yes[8];
char msg_buf_no[8];
@@ -463,7 +448,6 @@ void dMsgScrnExplain_c::move_select_init() {
mpArrow_c->arwAnimeInit();
}
/* 8023E0F4-8023E43C 238A34 0348+00 1/0 0/0 0/0 .text move_select_proc__17dMsgScrnExplain_cFv */
void dMsgScrnExplain_c::move_select_proc() {
if (mKeyWaitTimer > 0) {
mKeyWaitTimer--;
@@ -520,14 +504,10 @@ void dMsgScrnExplain_c::move_select_proc() {
}
}
/* 8023E43C-8023E448 238D7C 000C+00 1/0 0/0 0/0 .text close_init__17dMsgScrnExplain_cFv
*/
void dMsgScrnExplain_c::close_init() {
field_0x5a = 5;
}
/* 8023E448-8023E558 238D88 0110+00 1/0 0/0 0/0 .text close_proc__17dMsgScrnExplain_cFv
*/
void dMsgScrnExplain_c::close_proc() {
bool iVar1;
if (mpSelect_c != NULL) {
@@ -554,8 +534,6 @@ void dMsgScrnExplain_c::close_proc() {
}
}
/* 8023E558-8023E5CC 238E98 0074+00 0/0 7/7 0/0 .text openExplain__17dMsgScrnExplain_cFUlUcUcUcb
*/
bool dMsgScrnExplain_c::openExplain(u32 param_0, u8 param_1, u8 param_2, u8 param_3, bool param_4) {
bool rv = false;
@@ -578,7 +556,6 @@ bool dMsgScrnExplain_c::openExplain(u32 param_0, u8 param_1, u8 param_2, u8 para
return rv;
}
/* 8023E5CC-8023E640 238F0C 0074+00 2/2 0/0 0/0 .text getAlphaRatio__17dMsgScrnExplain_cFv */
f32 dMsgScrnExplain_c::getAlphaRatio() {
switch (mStatus) {
case 2:
@@ -591,12 +568,10 @@ f32 dMsgScrnExplain_c::getAlphaRatio() {
}
}
/* 8023E640-8023E654 238F80 0014+00 1/1 0/0 0/0 .text checkTriggerA__17dMsgScrnExplain_cFv */
bool dMsgScrnExplain_c::checkTriggerA() {
return mDoCPd_c::getTrigA(PAD_1);
}
/* 8023E654-8023E668 238F94 0014+00 1/1 0/0 0/0 .text checkTriggerB__17dMsgScrnExplain_cFv */
bool dMsgScrnExplain_c::checkTriggerB() {
return mDoCPd_c::getTrigB(PAD_1);
}