mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-07-07 22:22:05 -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 434415337d
commit a6e76c0841
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_obj_bmshutter.cpp
-29
View File
@@ -20,7 +20,6 @@ static const Vec l_check_area[4] = {
-250.0, 0.0, 100.0, // unknown
};
/* 80BB9A58-80BB9AE4 000078 008C+00 1/1 0/0 0/0 .text initBaseMtx__11daObjBmSh_cFv */
void daObjBmSh_c::initBaseMtx() {
mModel->setBaseScale(scale);
@@ -33,7 +32,6 @@ void daObjBmSh_c::initBaseMtx() {
setBaseMtx();
}
/* 80BB9AE4-80BB9B84 000104 00A0+00 2/2 0/0 0/0 .text setBaseMtx__11daObjBmSh_cFv */
void daObjBmSh_c::setBaseMtx() {
mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
mDoMtx_stack_c::YrotM(shape_angle.y);
@@ -45,7 +43,6 @@ void daObjBmSh_c::setBaseMtx() {
return;
}
/* 80BB9B84-80BB9C50 0001A4 00CC+00 1/0 0/0 0/0 .text Create__11daObjBmSh_cFv */
int daObjBmSh_c::Create() {
initBaseMtx();
@@ -70,7 +67,6 @@ int daObjBmSh_c::Create() {
return 1;
}
/* 80BB9C50-80BB9CC0 000270 0070+00 1/0 0/0 0/0 .text CreateHeap__11daObjBmSh_cFv */
int daObjBmSh_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4);
mModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
@@ -80,7 +76,6 @@ int daObjBmSh_c::CreateHeap() {
return true;
}
/* 80BB9CC0-80BB9DB4 0002E0 00F4+00 1/1 0/0 0/0 .text create__11daObjBmSh_cFv */
int daObjBmSh_c::create() {
fopAcM_ct(this, daObjBmSh_c);
@@ -106,7 +101,6 @@ int daObjBmSh_c::create() {
return ret;
}
/* 80BB9DB4-80BB9F34 0003D4 0180+00 1/0 0/0 0/0 .text Execute__11daObjBmSh_cFPPA3_A4_f */
int daObjBmSh_c::Execute(Mtx** param_0) {
daPy_py_c* player = dComIfGp_getLinkPlayer();
if (player->checkFrontRollCrash()) {
@@ -132,7 +126,6 @@ int daObjBmSh_c::Execute(Mtx** param_0) {
return 1;
}
/* 80BB9F34-80BB9FBC 000554 0088+00 2/2 0/0 0/0 .text checkSw__11daObjBmSh_cFv */
int daObjBmSh_c::checkSw() {
u32 swbit2 = getSwbit2();
u8 nSwitches = getSwNum();
@@ -145,7 +138,6 @@ int daObjBmSh_c::checkSw() {
return true;
}
/* 80BB9FBC-80BBA044 0005DC 0088+00 2/2 0/0 0/0 .text checkAnySw__11daObjBmSh_cFv */
int daObjBmSh_c::checkAnySw() {
u32 swbit2 = getSwbit2();
u8 nSwitches = getSwNum();
@@ -158,12 +150,10 @@ int daObjBmSh_c::checkAnySw() {
return false;
}
/* 80BBA044-80BBA080 000664 003C+00 2/2 0/0 0/0 .text checkMySw__11daObjBmSh_cFv */
int daObjBmSh_c::checkMySw() {
return fopAcM_isSwitch(this, getSwbit3());
}
/* 80BBA080-80BBA13C 0006A0 00BC+00 1/1 0/0 0/0 .text event_proc_call__11daObjBmSh_cFv */
void daObjBmSh_c::event_proc_call() {
typedef void (daObjBmSh_c::*actionFunc)();
static actionFunc l_func[] = {
@@ -175,7 +165,6 @@ void daObjBmSh_c::event_proc_call() {
(this->*l_func[mAction])();
}
/* 80BBA13C-80BBA1A4 00075C 0068+00 1/0 0/0 0/0 .text actionWait__11daObjBmSh_cFv */
void daObjBmSh_c::actionWait() {
if (checkSw()) {
setAction(daObjBmSh_Action_ORDER_EVENT_e);
@@ -184,8 +173,6 @@ void daObjBmSh_c::actionWait() {
}
}
/* 80BBA1A4-80BBA20C 0007C4 0068+00 1/0 0/0 0/0 .text actionOrderEvent__11daObjBmSh_cFv
*/
void daObjBmSh_c::actionOrderEvent() {
if (eventInfo.checkCommandDemoAccrpt()) {
setAction(daObjBmSh_Action_EVENT_e);
@@ -195,7 +182,6 @@ void daObjBmSh_c::actionOrderEvent() {
}
}
/* 80BBA20C-80BBA268 00082C 005C+00 1/0 0/0 0/0 .text actionEvent__11daObjBmSh_cFv */
void daObjBmSh_c::actionEvent() {
if (dComIfGp_evmng_endCheck(mEventIdx)) {
setAction(daObjBmSh_Action_DEAD_e);
@@ -204,12 +190,10 @@ void daObjBmSh_c::actionEvent() {
return;
}
/* 80BBA268-80BBA26C 000888 0004+00 1/0 0/0 0/0 .text actionDead__11daObjBmSh_cFv */
void daObjBmSh_c::actionDead() {
/* empty function */
}
/* 80BBA26C-80BBA394 00088C 0128+00 1/1 0/0 0/0 .text mode_proc_call__11daObjBmSh_cFv */
void daObjBmSh_c::mode_proc_call() {
typedef void (daObjBmSh_c::*mode_func)();
static mode_func l_func[] = {
@@ -225,7 +209,6 @@ void daObjBmSh_c::mode_proc_call() {
cLib_addCalc0(&mShakeIntensity, 1.0f / 20.0f, 10.0f);
}
/* 80BBA394-80BBA5B4 0009B4 0220+00 1/0 0/0 0/0 .text modeWait__11daObjBmSh_cFv */
void daObjBmSh_c::modeWait() {
checkAnySw();
int checkedSw = checkSw();
@@ -256,7 +239,6 @@ void daObjBmSh_c::modeWait() {
}
}
/* 80BBA5B4-80BBA640 000BD4 008C+00 1/0 0/0 0/0 .text modeMove__11daObjBmSh_cFv */
void daObjBmSh_c::modeMove() {
cLib_addCalcAngleS2(&mRotation.x, 0, 5, 256);
cLib_addCalcAngleS2(&mRotation.z, 0, 5, 256);
@@ -266,12 +248,10 @@ void daObjBmSh_c::modeMove() {
return;
}
/* 80BBA640-80BBA644 000C60 0004+00 1/0 0/0 0/0 .text modeEnd__11daObjBmSh_cFv */
void daObjBmSh_c::modeEnd() {
/* empty function */
}
/* 80BBA644-80BBA6E8 000C64 00A4+00 1/0 0/0 0/0 .text Draw__11daObjBmSh_cFv */
int daObjBmSh_c::Draw() {
g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(mModel->mModelData, &tevStr);
@@ -283,39 +263,31 @@ int daObjBmSh_c::Draw() {
return 1;
}
/* 80BBA6E8-80BBA71C 000D08 0034+00 1/0 0/0 0/0 .text Delete__11daObjBmSh_cFv */
int daObjBmSh_c::Delete() {
dComIfG_resDelete(&mPhase, l_arcName);
return 1;
}
/* 80BBA71C-80BBA748 000D3C 002C+00 1/0 0/0 0/0 .text daObjBmSh_Draw__FP11daObjBmSh_c */
int daObjBmSh_Draw(daObjBmSh_c* i_this) {
fopAcM_GetID(i_this);
return static_cast<daObjBmSh_c*>(i_this)->Draw();
}
/* 80BBA748-80BBA768 000D68 0020+00 1/0 0/0 0/0 .text daObjBmSh_Execute__FP11daObjBmSh_c
*/
int daObjBmSh_Execute(daObjBmSh_c* i_this) {
fopAcM_GetID(i_this);
return static_cast<dBgS_MoveBgActor*>(i_this)->MoveBGExecute();
}
/* 80BBA768-80BBA788 000D88 0020+00 1/0 0/0 0/0 .text daObjBmSh_Delete__FP11daObjBmSh_c
*/
int daObjBmSh_Delete(daObjBmSh_c* i_this) {
fopAcM_GetID(i_this);
return static_cast<dBgS_MoveBgActor*>(i_this)->MoveBGDelete();
}
/* 80BBA788-80BBA7A8 000DA8 0020+00 1/0 0/0 0/0 .text daObjBmSh_Create__FP10fopAc_ac_c */
int daObjBmSh_Create(fopAc_ac_c* i_this) {
fopAcM_GetID(i_this);
return static_cast<daObjBmSh_c*>(i_this)->create();
}
/* 80BBA8F8-80BBA918 -00001 0020+00 1/0 0/0 0/0 .data l_daObjBmSh_Method */
static actor_method_class l_daObjBmSh_Method = {
(process_method_func)daObjBmSh_Create,
(process_method_func)daObjBmSh_Delete,
@@ -324,7 +296,6 @@ static actor_method_class l_daObjBmSh_Method = {
(process_method_func)daObjBmSh_Draw,
};
/* 80BBA918-80BBA948 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_BoomShutter */
extern actor_process_profile_definition g_profile_Obj_BoomShutter = {
fpcLy_CURRENT_e, // mLayerID
3, // mListID