mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-09-06 02:48:15 -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_lv4digsand.cpp
-29
View File
@@ -11,14 +11,11 @@
#include "d/d_item.h"
#include <cmath.h>
/* 80C66B18-80C66B54 000078 003C+00 1/1 0/0 0/0 .text initBaseMtx__16daObjL4DigSand_cFv
*/
void daObjL4DigSand_c::initBaseMtx() {
mpModel->setBaseScale(scale);
setBaseMtx();
}
/* 80C66B54-80C66BC8 0000B4 0074+00 2/2 0/0 0/0 .text setBaseMtx__16daObjL4DigSand_cFv */
void daObjL4DigSand_c::setBaseMtx() {
mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
mDoMtx_stack_c::YrotM(shape_angle.y);
@@ -26,7 +23,6 @@ void daObjL4DigSand_c::setBaseMtx() {
MTXCopy(mDoMtx_stack_c::get(), mBgMtx);
}
/* 80C66BC8-80C66C24 000128 005C+00 1/0 0/0 0/0 .text Create__16daObjL4DigSand_cFv */
int daObjL4DigSand_c::Create() {
initBaseMtx();
fopAcM_SetMtx(this, mpModel->getBaseTRMtx());
@@ -37,10 +33,8 @@ int daObjL4DigSand_c::Create() {
return 1;
}
/* 80C6760C-80C67610 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */
static char* l_arcName = "P_DSand";
/* 80C66C24-80C66C94 000184 0070+00 1/0 0/0 0/0 .text CreateHeap__16daObjL4DigSand_cFv */
int daObjL4DigSand_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4);
JUT_ASSERT(0x9B, modelData != NULL);
@@ -53,7 +47,6 @@ int daObjL4DigSand_c::CreateHeap() {
return 1;
}
/* 80C66C94-80C66D40 0001F4 00AC+00 1/1 0/0 0/0 .text create1st__16daObjL4DigSand_cFv */
int daObjL4DigSand_c::create1st() {
if (fopAcM_isSwitch(this, getSwNo())) {
return cPhs_ERROR_e;
@@ -70,7 +63,6 @@ int daObjL4DigSand_c::create1st() {
return phase_state;
}
/* 80C66D40-80C66DD0 0002A0 0090+00 1/0 0/0 0/0 .text Execute__16daObjL4DigSand_cFPPA3_A4_f */
int daObjL4DigSand_c::Execute(Mtx** param_0) {
if (daPy_py_c::checkNowWolf() && checkItemGet(fpcNm_ITEM_SMELL_POH, 1)) {
attention_info.flags = fopAc_AttnFlag_ETC_e;
@@ -85,7 +77,6 @@ int daObjL4DigSand_c::Execute(Mtx** param_0) {
return 1;
}
/* 80C66DD0-80C66E74 000330 00A4+00 1/1 0/0 0/0 .text action__16daObjL4DigSand_cFv */
void daObjL4DigSand_c::action() {
typedef void (daObjL4DigSand_c::*mode_func)();
static mode_func l_func[] = {
@@ -97,20 +88,16 @@ void daObjL4DigSand_c::action() {
(this->*l_func[mMode])();
}
/* 80C66E74-80C66E80 0003D4 000C+00 1/1 0/0 0/0 .text mode_init_wait__16daObjL4DigSand_cFv */
void daObjL4DigSand_c::mode_init_wait() {
mMode = 0;
}
/* 80C66E80-80C66EAC 0003E0 002C+00 1/0 0/0 0/0 .text mode_wait__16daObjL4DigSand_cFv */
void daObjL4DigSand_c::mode_wait() {
if (field_0x941 == 1) {
mode_init_dig();
}
}
/* 80C66EAC-80C66F84 00040C 00D8+00 1/1 0/0 0/0 .text mode_init_dig__16daObjL4DigSand_cFv
*/
void daObjL4DigSand_c::mode_init_dig() {
dBgS_ObjGndChk gndchk;
gndchk.SetActorPid(base.base.id);
@@ -131,7 +118,6 @@ void daObjL4DigSand_c::mode_init_dig() {
mMode = 1;
}
/* 80C66FFC-80C670AC 00055C 00B0+00 1/0 0/0 0/0 .text mode_dig__16daObjL4DigSand_cFv */
void daObjL4DigSand_c::mode_dig() {
if (cLib_calcTimer<u8>(&mTimer) == 0) {
f32 var_f31 = std::fabs(((current.pos.y - mGroundY) + 10.0f) / 15.0f);
@@ -145,18 +131,14 @@ void daObjL4DigSand_c::mode_dig() {
}
}
/* 80C670AC-80C67100 00060C 0054+00 1/1 0/0 0/0 .text mode_init_end__16daObjL4DigSand_cFv
*/
void daObjL4DigSand_c::mode_init_end() {
fopAcM_onSwitch(this, getSwNo());
fopAcM_delete(this);
mMode = 2;
}
/* 80C67100-80C67104 000660 0004+00 1/0 0/0 0/0 .text mode_end__16daObjL4DigSand_cFv */
void daObjL4DigSand_c::mode_end() {}
/* 80C67104-80C671A8 000664 00A4+00 1/0 0/0 0/0 .text Draw__16daObjL4DigSand_cFv */
int daObjL4DigSand_c::Draw() {
g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -167,38 +149,28 @@ int daObjL4DigSand_c::Draw() {
return 1;
}
/* 80C671A8-80C671DC 000708 0034+00 1/0 0/0 0/0 .text Delete__16daObjL4DigSand_cFv */
int daObjL4DigSand_c::Delete() {
dComIfG_resDelete(&mPhase, l_arcName);
return 1;
}
/* 80C671DC-80C67308 00073C 012C+00 1/0 0/0 0/0 .text
* daObjL4DigSand_create1st__FP16daObjL4DigSand_c */
static int daObjL4DigSand_create1st(daObjL4DigSand_c* i_this) {
fopAcM_ct(i_this, daObjL4DigSand_c);
return i_this->create1st();
}
/* 80C674D4-80C674F4 000A34 0020+00 1/0 0/0 0/0 .text
* daObjL4DigSand_MoveBGDelete__FP16daObjL4DigSand_c */
static int daObjL4DigSand_MoveBGDelete(daObjL4DigSand_c* i_this) {
return i_this->MoveBGDelete();
}
/* 80C674F4-80C67514 000A54 0020+00 1/0 0/0 0/0 .text
* daObjL4DigSand_MoveBGExecute__FP16daObjL4DigSand_c */
static int daObjL4DigSand_MoveBGExecute(daObjL4DigSand_c* i_this) {
return i_this->MoveBGExecute();
}
/* 80C67514-80C67540 000A74 002C+00 1/0 0/0 0/0 .text
* daObjL4DigSand_MoveBGDraw__FP16daObjL4DigSand_c */
static int daObjL4DigSand_MoveBGDraw(daObjL4DigSand_c* i_this) {
return i_this->MoveBGDraw();
}
/* 80C67658-80C67678 -00001 0020+00 1/0 0/0 0/0 .data daObjL4DigSand_METHODS */
static actor_method_class daObjL4DigSand_METHODS = {
(process_method_func)daObjL4DigSand_create1st,
(process_method_func)daObjL4DigSand_MoveBGDelete,
@@ -207,7 +179,6 @@ static actor_method_class daObjL4DigSand_METHODS = {
(process_method_func)daObjL4DigSand_MoveBGDraw,
};
/* 80C67678-80C676A8 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Lv4DigSand */
extern actor_process_profile_definition g_profile_Obj_Lv4DigSand = {
fpcLy_CURRENT_e, // mLayerID
3, // mListID