mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-16 12:24:45 -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/actor/d_a_dshutter.cpp
-31
View File
@@ -9,24 +9,20 @@
#include "SSystem/SComponent/c_math.h"
#include "Z2AudioLib/Z2Instances.h"
/* 80467F7C-80467F88 -00001 000C+00 2/2 0/0 0/0 .data l_arcName */
static char* l_arcName[] = {
"K_tetd",
"S_bsaku00",
"S_lv7saku",
};
/* 80467498-8046751C 000078 0084+00 1/1 0/0 0/0 .text __dt__7daDsh_cFv */
daDsh_c::~daDsh_c() {}
/* 80467F04-80467F10 000000 000C+00 2/2 0/0 0/0 .rodata l_bmd */
static int const l_bmd[] = {
4,
4,
4,
};
/* 8046751C-8046759C 0000FC 0080+00 1/0 0/0 0/0 .text CreateHeap__7daDsh_cFv */
int daDsh_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName[mType], l_bmd[mType]);
@@ -38,7 +34,6 @@ int daDsh_c::CreateHeap() {
return 1;
}
/* 8046759C-80467640 00017C 00A4+00 1/0 0/0 0/0 .text Draw__7daDsh_cFv */
int daDsh_c::Draw() {
g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -49,7 +44,6 @@ int daDsh_c::Draw() {
return 1;
}
/* 80467640-80467694 000220 0054+00 1/0 0/0 0/0 .text Execute__7daDsh_cFPPA3_A4_f */
int daDsh_c::Execute(Mtx** param_0) {
callExecute();
setMtx();
@@ -58,7 +52,6 @@ int daDsh_c::Execute(Mtx** param_0) {
return 1;
}
/* 80467694-80467708 000274 0074+00 2/2 0/0 0/0 .text setMtx__7daDsh_cFv */
void daDsh_c::setMtx() {
mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
mDoMtx_stack_c::YrotM(shape_angle.y);
@@ -67,13 +60,11 @@ void daDsh_c::setMtx() {
MTXCopy(mDoMtx_stack_c::get(), mBgMtx);
}
/* 80467708-8046772C 0002E8 0024+00 5/5 0/0 0/0 .text setAction__7daDsh_cFPQ27daDsh_c8action_c */
void daDsh_c::setAction(daDsh_c::action_c* i_action) {
mpAction = i_action;
callInit();
}
/* 8046772C-8046777C 00030C 0050+00 1/1 0/0 0/0 .text callInit__7daDsh_cFv */
int daDsh_c::callInit() {
if (mpAction->getInit() == NULL) {
return 1;
@@ -82,7 +73,6 @@ int daDsh_c::callInit() {
return (this->*mpAction->getInit())();
}
/* 8046777C-804677D4 00035C 0058+00 1/1 0/0 0/0 .text callExecute__7daDsh_cFv */
int daDsh_c::callExecute() {
if (mpAction->getExecute() == NULL) {
return 1;
@@ -91,19 +81,15 @@ int daDsh_c::callExecute() {
return (this->*mpAction->getExecute())();
}
/* 804677D4-804677E4 0003B4 0010+00 1/0 0/0 0/0 .text initOpenWait__7daDsh_cFv */
int daDsh_c::initOpenWait() {
current.pos.y = home.pos.y;
return 1;
}
/* 804680B0-804680C8 000040 0018+00 2/3 0/0 0/0 .bss l_openWaitAction */
static daDsh_c::action_c l_openWaitAction(&daDsh_c::initOpenWait, &daDsh_c::executeOpenWait);
/* 804680C8-804680E0 000058 0018+00 1/2 0/0 0/0 .bss l_openAction */
static daDsh_c::action_c l_openAction(&daDsh_c::initOpen, &daDsh_c::executeOpen);
/* 804677E4-80467840 0003C4 005C+00 1/0 0/0 0/0 .text executeOpenWait__7daDsh_cFv */
int daDsh_c::executeOpenWait() {
if (fopAcM_isSwitch(this, mSw)) {
setAction(&l_openAction);
@@ -112,13 +98,10 @@ int daDsh_c::executeOpenWait() {
return 1;
}
/* 80467F10-80467F1C 00000C 000C+00 1/1 0/0 0/0 .rodata l_dzb */
static int const l_dzb[] = {7, 7, 7};
/* 80467F1C-80467F28 000018 000C+00 1/1 0/0 0/0 .rodata l_heap_size */
static u32 const l_heap_size[] = {0xC10, 0xC10, 0x3D60};
/* 80467840-80467988 000420 0148+00 1/0 0/0 0/0 .text initOpen__7daDsh_cFv */
int daDsh_c::initOpen() {
mTiltTime = getOpenTiltTime();
speed.y = 0.0f;
@@ -137,10 +120,8 @@ int daDsh_c::initOpen() {
return 1;
}
/* 804680E0-804680F8 000070 0018+00 2/3 0/0 0/0 .bss l_closeWaitAction */
static daDsh_c::action_c l_closeWaitAction(&daDsh_c::initCloseWait, &daDsh_c::executeCloseWait);
/* 80467988-80467A64 000568 00DC+00 1/0 0/0 0/0 .text executeOpen__7daDsh_cFv */
int daDsh_c::executeOpen() {
if (mTiltTime != 0) {
current.pos.y = home.pos.y + cM_rndFX(2.0f);
@@ -164,16 +145,13 @@ int daDsh_c::executeOpen() {
return 1;
}
/* 80467A64-80467A80 000644 001C+00 1/0 0/0 0/0 .text initCloseWait__7daDsh_cFv */
int daDsh_c::initCloseWait() {
current.pos.y = home.pos.y - OPEN_SIZE;
return 1;
}
/* 804680F8-80468110 000088 0018+00 1/2 0/0 0/0 .bss l_closeAction */
static daDsh_c::action_c l_closeAction(&daDsh_c::initClose, &daDsh_c::executeClose);
/* 80467A80-80467ADC 000660 005C+00 1/0 0/0 0/0 .text executeCloseWait__7daDsh_cFv */
int daDsh_c::executeCloseWait() {
if (!fopAcM_isSwitch(this, mSw)) {
setAction(&l_closeAction);
@@ -182,7 +160,6 @@ int daDsh_c::executeCloseWait() {
return 1;
}
/* 80467ADC-80467B04 0006BC 0028+00 1/0 0/0 0/0 .text initClose__7daDsh_cFv */
int daDsh_c::initClose() {
mTiltTime = getCloseTiltTime();
speed.y = 0.0f;
@@ -191,7 +168,6 @@ int daDsh_c::initClose() {
return 1;
}
/* 80467B04-80467BE0 0006E4 00DC+00 1/0 0/0 0/0 .text executeClose__7daDsh_cFv */
int daDsh_c::executeClose() {
if (mTiltTime != 0) {
current.pos.y = (home.pos.y - OPEN_SIZE) + cM_rndFX(2.0f);
@@ -214,22 +190,18 @@ int daDsh_c::executeClose() {
return 1;
}
/* 80467BE0-80467C0C 0007C0 002C+00 1/0 0/0 0/0 .text daDsh_Draw__FP7daDsh_c */
static int daDsh_Draw(daDsh_c* i_this) {
return i_this->MoveBGDraw();
}
/* 80467C0C-80467C2C 0007EC 0020+00 1/0 0/0 0/0 .text daDsh_Execute__FP7daDsh_c */
static int daDsh_Execute(daDsh_c* i_this) {
return i_this->MoveBGExecute();
}
/* 80467C2C-80467C34 00080C 0008+00 1/0 0/0 0/0 .text daDsh_IsDelete__FP7daDsh_c */
static int daDsh_IsDelete(daDsh_c* i_this) {
return 1;
}
/* 80467C34-80467C7C 000814 0048+00 1/0 0/0 0/0 .text daDsh_Delete__FP7daDsh_c */
static int daDsh_Delete(daDsh_c* i_this) {
int ret = i_this->MoveBGDelete();
i_this->~daDsh_c();
@@ -238,7 +210,6 @@ static int daDsh_Delete(daDsh_c* i_this) {
AUDIO_INSTANCES;
/* 80467C7C-80467DF8 00085C 017C+00 1/0 0/0 0/0 .text daDsh_Create__FP10fopAc_ac_c */
int daDsh_c::create() {
fopAcM_ct(this, daDsh_c);
@@ -268,14 +239,12 @@ static int daDsh_Create(fopAc_ac_c* i_this) {
return static_cast<daDsh_c*>(i_this)->create();
}
/* 80467FF0-80468010 -00001 0020+00 1/0 0/0 0/0 .data l_daDsh_Method */
static actor_method_class l_daDsh_Method = {
(process_method_func)daDsh_Create, (process_method_func)daDsh_Delete,
(process_method_func)daDsh_Execute, (process_method_func)daDsh_IsDelete,
(process_method_func)daDsh_Draw,
};
/* 80468010-80468044 -00001 0034+00 0/0 0/0 1/0 .data g_profile_DSHUTTER */
extern actor_process_profile_definition2 g_profile_DSHUTTER = {
{
fpcLy_CURRENT_e, // mLayerID