mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-17 12:39:27 -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_firepillar.cpp
-26
View File
@@ -11,24 +11,20 @@
#include "d/d_debug_viewer.h"
#include "f_op/f_op_actor_mng.h"
/* 80BE9118-80BE9138 000078 0020+00 1/1 0/0 0/0 .text initBaseMtx__14daObjFPillar_cFv */
void daObjFPillar_c::initBaseMtx() {
setBaseMtx();
}
/* 80BE9138-80BE9190 000098 0058+00 1/1 0/0 0/0 .text setBaseMtx__14daObjFPillar_cFv */
void daObjFPillar_c::setBaseMtx() {
mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z);
}
/* 80BE9ADC-80BE9AF4 000020 0018+00 1/1 0/0 0/0 .data l_cull_box */
static f32 l_cull_box[6] = {
-30.0f, -10.0f, -30.0f,
30.0f, 60.0f, 30.0f,
};
/* 80BE9AF4-80BE9B40 000038 004C+00 1/1 0/0 0/0 .data l_cps_src */
static dCcD_SrcCps l_cps_src = {
{
{0x0, {{0x100, 0x1, 0x1d}, {0x0, 0x0}, 0x0}}, // mObj
@@ -41,7 +37,6 @@ static dCcD_SrcCps l_cps_src = {
} // mCpsAttr
};
/* 80BE9190-80BE9230 0000F0 00A0+00 1/1 0/0 0/0 .text Create__14daObjFPillar_cFv */
int daObjFPillar_c::Create() {
initBaseMtx();
mStts.Init(0, 0xff, this);
@@ -58,7 +53,6 @@ int daObjFPillar_c::Create() {
return 1;
}
/* 80BE9230-80BE9360 000190 0130+00 1/1 0/0 0/0 .text create__14daObjFPillar_cFv */
int daObjFPillar_c::create() {
fopAcM_ct(this, daObjFPillar_c);
int rv = Create();
@@ -68,7 +62,6 @@ int daObjFPillar_c::create() {
return cPhs_COMPLEATE_e;
}
/* 80BE94E4-80BE9610 000444 012C+00 1/1 0/0 0/0 .text execute__14daObjFPillar_cFv */
int daObjFPillar_c::execute() {
action();
mCylScale.x = scale.x;
@@ -87,7 +80,6 @@ int daObjFPillar_c::execute() {
return 1;
}
/* 80BE9610-80BE96B4 000570 00A4+00 1/1 0/0 0/0 .text action__14daObjFPillar_cFv */
void daObjFPillar_c::action() {
static daObjFPillar_c::actionFunc l_func[3] = {
&daObjFPillar_c::actionOff,
@@ -97,8 +89,6 @@ void daObjFPillar_c::action() {
(this->*(l_func[mAction]))();
}
/* 80BE96B4-80BE96E0 000614 002C+00 2/2 0/0 0/0 .text actionOffInit__14daObjFPillar_cFv
*/
void daObjFPillar_c::actionOffInit() {
u8 bVar1 = daObjFPillar_prm::getArg0(this);
if (bVar1 == 0xff) {
@@ -108,7 +98,6 @@ void daObjFPillar_c::actionOffInit() {
mAction = ACTION_OFF;
}
/* 80BE96E0-80BE9784 000640 00A4+00 1/0 0/0 0/0 .text actionOff__14daObjFPillar_cFv */
void daObjFPillar_c::actionOff() {
cLib_chaseF(&mCylScale.y, 0.0f, scale.y * 0.1f);
if (mActionTimer == 0) {
@@ -124,7 +113,6 @@ void daObjFPillar_c::actionOff() {
}
}
/* 80BE9784-80BE97B8 0006E4 0034+00 1/1 0/0 0/0 .text actionOnWaitInit__14daObjFPillar_cFv */
void daObjFPillar_c::actionOnWaitInit() {
u8 bVar1 = daObjFPillar_prm::getArg1(this);
if (bVar1 == 0xff) {
@@ -135,7 +123,6 @@ void daObjFPillar_c::actionOnWaitInit() {
mAction = ACTION_ON_WAIT;
}
/* 80BE97B8-80BE986C 000718 00B4+00 1/0 0/0 0/0 .text actionOnWait__14daObjFPillar_cFv */
void daObjFPillar_c::actionOnWait() {
cLib_chaseF(&mCylScale.y, scale.y * 0.1f, scale.y * 0.02f);
if (mActionTimer == 0) {
@@ -153,7 +140,6 @@ void daObjFPillar_c::actionOnWait() {
}
}
/* 80BE986C-80BE98A0 0007CC 0034+00 1/1 0/0 0/0 .text actionOnInit__14daObjFPillar_cFv */
void daObjFPillar_c::actionOnInit() {
u8 bVar1 = daObjFPillar_prm::getArg2(this);
if (bVar1 == 0xff) {
@@ -164,7 +150,6 @@ void daObjFPillar_c::actionOnInit() {
mAction = ACTION_ON;
}
/* 80BE98A0-80BE9980 000800 00E0+00 1/0 0/0 0/0 .text actionOn__14daObjFPillar_cFv */
void daObjFPillar_c::actionOn() {
f32 target = scale.y;
if (mActionTimer == 0) {
@@ -186,8 +171,6 @@ void daObjFPillar_c::actionOn() {
}
}
/* 80BE9980-80BE9984 0008E0 0004+00 1/1 0/0 0/0 .text drawCylinder__FP4cXyzP4cXyzP5csXyz
*/
static void drawCylinder(cXyz* pos, cXyz* scale, csXyz* angle) {
static GXColor const color = {0xFF,00,00,0x60};
@@ -203,41 +186,33 @@ static void drawCylinder(cXyz* pos, cXyz* scale, csXyz* angle) {
#endif
}
/* 80BE9984-80BE99B8 0008E4 0034+00 1/1 0/0 0/0 .text draw__14daObjFPillar_cFv */
int daObjFPillar_c::draw() {
drawCylinder(&current.pos, &mCylScale, &current.angle);
return 1;
}
/* 80BE99B8-80BE99C0 000918 0008+00 1/1 0/0 0/0 .text _delete__14daObjFPillar_cFv */
int daObjFPillar_c::_delete() {
return 1;
}
/* 80BE99C0-80BE99E0 000920 0020+00 1/0 0/0 0/0 .text daObjFPillar_Draw__FP14daObjFPillar_c */
static int daObjFPillar_Draw(daObjFPillar_c* i_this) {
return i_this->draw();
}
/* 80BE99E0-80BE9A00 000940 0020+00 1/0 0/0 0/0 .text daObjFPillar_Execute__FP14daObjFPillar_c */
static int daObjFPillar_Execute(daObjFPillar_c* i_this) {
return i_this->execute();
}
/* 80BE9A00-80BE9A20 000960 0020+00 1/0 0/0 0/0 .text daObjFPillar_Delete__FP14daObjFPillar_c */
static int daObjFPillar_Delete(daObjFPillar_c* i_this) {
fopAcM_GetID(i_this);
return i_this->_delete();
}
/* 80BE9A20-80BE9A40 000980 0020+00 1/0 0/0 0/0 .text daObjFPillar_Create__FP10fopAc_ac_c
*/
static int daObjFPillar_Create(fopAc_ac_c* i_this) {
fopAcM_GetID(i_this);
return static_cast<daObjFPillar_c*>(i_this)->create();
}
/* 80BE9B88-80BE9BA8 -00001 0020+00 1/0 0/0 0/0 .data l_daObjFPillar_Method */
static actor_method_class l_daObjFPillar_Method = {
(process_method_func)daObjFPillar_Create,
(process_method_func)daObjFPillar_Delete,
@@ -246,7 +221,6 @@ static actor_method_class l_daObjFPillar_Method = {
(process_method_func)daObjFPillar_Draw,
};
/* 80BE9BA8-80BE9BD8 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_FirePillar */
extern actor_process_profile_definition g_profile_Obj_FirePillar = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID