mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-16 20:27:36 -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_obj_cblock.cpp
-32
View File
@@ -40,34 +40,27 @@ public:
/* 0x1C */ f32 field_0x1c;
};
/* 80BC6C9C-80BC6CA8 000054 000C+00 1/2 0/0 0/0 .bss l_chainOffset */
static cXyz l_chainOffset(0.0f, 105.0f, 30.0f);
/* 80BC6CB4-80BC6CC4 00006C 000C+04 0/1 0/0 0/0 .bss l_smokeSetOffset */
static cXyz l_smokeSetOffset(0.0f, 0.0f, -200.0f);
#if !DEBUG
static s32 unused_bss_70 = 0;
#endif
/* ############################################################################################## */
/* 80BC6A38-80BC6A50 000000 0018+00 5/5 0/0 0/0 .rodata l_cull_box */
static Vec const l_cull_box[2] = {
{-250.0f, 0.0f, -450.0f},
{250.0f, 250.0f, 400.0f},
};
/* 80BC6AF4-80BC6AF8 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */
static char* l_arcName = "P_Cblock";
/* 80BC6AF8-80BC6B28 000024 0030+00 0/0 0/0 0/0 .data l_side_co_offset */
static f32 l_side_co_offset[12] = {
-255.0f, 0.0f, -30.0f, -135.0f,
0.0f, -30.0f, 135, 0.0f,
-30.0f, 255.0f, 0.0f, -30.0f,
};
/* 80BC6B28-80BC6B6C 000054 0044+00 1/1 0/0 0/0 .data l_cyl_src */
static dCcD_SrcCyl l_cyl_src = {
{
{0x0, {{0x0, 0x0, 0x0}, {0x0, 0x0}, 0x19}}, // mObj
@@ -111,13 +104,11 @@ void daObjCBlk_HIO_c::genMessage(JORMContext* ctx) {
static daObjCBlk_HIO_c l_HIO;
#endif
/* 80BC5A0C-80BC5A48 0000EC 003C+00 1/1 0/0 0/0 .text initBaseMtx__11daObjCBlk_cFv */
void daObjCBlk_c::initBaseMtx() {
model1->setBaseScale(scale);
setBaseMtx();
}
/* 80BC5A48-80BC5ABC 000128 0074+00 1/1 0/0 0/0 .text setBaseMtx__11daObjCBlk_cFv */
void daObjCBlk_c::setBaseMtx() {
mDoMtx_stack_c::transS(current.pos.x, current.pos.y,current.pos.z);
mDoMtx_stack_c::YrotM(shape_angle.y);
@@ -125,7 +116,6 @@ void daObjCBlk_c::setBaseMtx() {
MTXCopy(mDoMtx_stack_c::get(), mBgMtx);
}
/* 80BC5ABC-80BC5CBC 00019C 0200+00 1/0 0/0 0/0 .text Create__11daObjCBlk_cFv */
int daObjCBlk_c::Create() {
u8 pathId = getPathID();
roomPath = dPath_GetRoomPath(pathId, fopAcM_GetHomeRoomNo(this));
@@ -167,7 +157,6 @@ int daObjCBlk_c::Create() {
return 1;
}
/* 80BC5CF8-80BC5E58 0003D8 0160+00 1/0 0/0 0/0 .text CreateHeap__11daObjCBlk_cFv */
int daObjCBlk_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4);
JUT_ASSERT(350, modelData != NULL);
@@ -198,15 +187,12 @@ int daObjCBlk_c::CreateHeap() {
return 1;
}
/* 80BC5E58-80BC5E94 000538 003C+00 1/1 0/0 0/0 .text __dt__Q211daObjCBlk_c7chain_sFv */
daObjCBlk_c::chain_s::~chain_s() {
}
/* 80BC5E94-80BC5E98 000574 0004+00 1/1 0/0 0/0 .text __ct__Q211daObjCBlk_c7chain_sFv */
daObjCBlk_c::chain_s::chain_s() {
}
/* 80BC5E98-80BC6020 000578 0188+00 1/1 0/0 0/0 .text create__11daObjCBlk_cFv */
int daObjCBlk_c::create() {
fopAcM_ct(this, daObjCBlk_c);
int rv = dComIfG_resLoad(&phase, l_arcName);
@@ -224,7 +210,6 @@ int daObjCBlk_c::create() {
return rv;
}
/* 80BC6260-80BC6270 000940 0010+00 1/0 0/0 0/0 .text Execute__11daObjCBlk_cFPPA3_A4_f */
int daObjCBlk_c::Execute(f32 (**mtx)[3][4]) {
*mtx = &mBgMtx;
return 1;
@@ -245,12 +230,10 @@ static void dummy5() {
}
#endif
/* 80BC6270-80BC627C 000950 000C+00 2/2 0/0 0/0 .text initWait__11daObjCBlk_cFv */
void daObjCBlk_c::initWait() {
field_0xc1f = 0;
}
/* 80BC627C-80BC6414 00095C 0198+00 1/0 0/0 0/0 .text modeWait__11daObjCBlk_cFv */
void daObjCBlk_c::modeWait() {
daPy_py_c* player = daPy_getPlayerActorClass();
bool bVar1 = false;
@@ -287,7 +270,6 @@ void daObjCBlk_c::modeWait() {
}
}
/* 80BC6414-80BC6430 000AF4 001C+00 1/1 0/0 0/0 .text initWalk__11daObjCBlk_cFv */
void daObjCBlk_c::initWalk() {
u8 travelTime = TRAVEL_TIME;
walkTimer = travelTime;
@@ -295,7 +277,6 @@ void daObjCBlk_c::initWalk() {
field_0xc1f = 1;
}
/* 80BC6430-80BC65CC 000B10 019C+00 1/0 0/0 0/0 .text modeWalk__11daObjCBlk_cFv */
void daObjCBlk_c::modeWalk() {
u8 travelTime = TRAVEL_TIME;
f32 travelDist = TRAVEL_DIST;
@@ -315,7 +296,6 @@ void daObjCBlk_c::modeWalk() {
}
}
/* 80BC65CC-80BC6648 000CAC 007C+00 2/2 0/0 0/0 .text getChainBasePos__11daObjCBlk_cFP4cXyz */
void daObjCBlk_c::getChainBasePos(cXyz* pPos) {
*pPos = l_chainOffset;
mDoMtx_stack_c::transS(current.pos);
@@ -323,7 +303,6 @@ void daObjCBlk_c::getChainBasePos(cXyz* pPos) {
mDoMtx_stack_c::multVec(pPos, pPos);
}
/* 80BC6648-80BC66DC 000D28 0094+00 2/2 0/0 0/0 .text setPower__11daObjCBlk_cFf */
void daObjCBlk_c::setPower(f32 power) {
daPy_py_c* player = daPy_getPlayerActorClass();
chain_s* pChain = chains + 5;
@@ -359,7 +338,6 @@ static f32 dummy2() {
return f0 + f1 * (f2 - f3 * (f4 - f5 * (f6 - f7 * f8 - (f7 - f9))));
}
/* 80BC66DC-80BC6868 000DBC 018C+00 1/1 0/0 0/0 .text checkWall__11daObjCBlk_cFv */
BOOL daObjCBlk_c::checkWall() {
cXyz acStack_30[2] = {cXyz(-95.0f, 5.0f, 1.0f), cXyz(95.0f, 5.0f, 1.0f)};
cXyz cStack_40(0.0f, 0.0f, 1.0f);
@@ -384,12 +362,10 @@ BOOL daObjCBlk_c::checkWall() {
return rv;
}
/* 80BC6868-80BC6870 000F48 0008+00 1/0 0/0 0/0 .text Draw__11daObjCBlk_cFv */
int daObjCBlk_c::Draw() {
return 1;
}
/* 80BC6870-80BC68A4 000F50 0034+00 1/0 0/0 0/0 .text Delete__11daObjCBlk_cFv */
int daObjCBlk_c::Delete() {
dComIfG_resDelete(&phase, l_arcName);
#if DEBUG
@@ -398,25 +374,19 @@ int daObjCBlk_c::Delete() {
return 1;
}
/* 80BC68A4-80BC68D0 000F84 002C+00 1/0 0/0 0/0 .text daObjCBlk_Draw__FP11daObjCBlk_c */
static int daObjCBlk_Draw(daObjCBlk_c* i_this) {
return i_this->MoveBGDraw();
}
/* 80BC68D0-80BC68F0 000FB0 0020+00 1/0 0/0 0/0 .text daObjCBlk_Execute__FP11daObjCBlk_c
*/
static int daObjCBlk_Execute(daObjCBlk_c* i_this) {
return i_this->MoveBGExecute();
}
/* 80BC68F0-80BC6910 000FD0 0020+00 1/0 0/0 0/0 .text daObjCBlk_Delete__FP11daObjCBlk_c
*/
static int daObjCBlk_Delete(daObjCBlk_c* i_this) {
fpc_ProcID unusedId = fopAcM_GetID(i_this);
return i_this->MoveBGDelete();
}
/* 80BC6910-80BC6930 000FF0 0020+00 1/0 0/0 0/0 .text daObjCBlk_Create__FP10fopAc_ac_c */
static int daObjCBlk_Create(fopAc_ac_c* i_this) {
daObjCBlk_c* cblock = static_cast<daObjCBlk_c*>(i_this);
fpc_ProcID unusedId = fopAcM_GetID(i_this);
@@ -433,7 +403,6 @@ static const u32 dummy3[3] = {
AUDIO_INSTANCES;
/* 80BC6B9C-80BC6BBC -00001 0020+00 1/0 0/0 0/0 .data l_daObjCBlk_Method */
static actor_method_class l_daObjCBlk_Method = {
(process_method_func)daObjCBlk_Create,
(process_method_func)daObjCBlk_Delete,
@@ -442,7 +411,6 @@ static actor_method_class l_daObjCBlk_Method = {
(process_method_func)daObjCBlk_Draw,
};
/* 80BC6BBC-80BC6BEC -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_ChainBlock */
extern actor_process_profile_definition g_profile_Obj_ChainBlock = {
fpcLy_CURRENT_e, // mLayerID
3, // mListID