mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-18 20:57:46 -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_flag.cpp
-23
View File
@@ -15,7 +15,6 @@ daObjFlag_c::M_attrs const daObjFlag_c::M_attr = {
12000.0f, 3000.0f, 12000.0f
};
/* 80BEB778-80BEB8F0 000078 0178+00 1/1 0/0 0/0 .text create_init__11daObjFlag_cFv */
void daObjFlag_c::create_init() {
field_0x5dc = (*(u32*)dComIfG_getObjectRes(daSetBgObj_c::getArcName(this), "spec.dat")) & 0xffff;
mPos = cXyz(current.pos.x, current.pos.y + field_0x5dc, current.pos.z);
@@ -32,7 +31,6 @@ void daObjFlag_c::create_init() {
initBaseMtx();
}
/* 80BEB8F0-80BEB984 0001F0 0094+00 1/1 0/0 0/0 .text initBaseMtx__11daObjFlag_cFv */
void daObjFlag_c::initBaseMtx() {
mDoMtx_stack_c::transS(current.pos);
mpModel2->setBaseTRMtx(mDoMtx_stack_c::get());
@@ -45,13 +43,11 @@ void daObjFlag_c::initBaseMtx() {
}
}
/* 80BEB984-80BEB9AC 000284 0028+00 1/1 0/0 0/0 .text getJointAngle__11daObjFlag_cFP5csXyzi */
void daObjFlag_c::getJointAngle(csXyz* i_angle, int i_index) {
csXyz* joint = &mFlagJoints[i_index].mJoint1;
*i_angle = *joint;
}
/* 80BEB9AC-80BEBC58 0002AC 02AC+00 1/1 0/0 0/0 .text calcJointAngle__11daObjFlag_cFv */
void daObjFlag_c::calcJointAngle() {
f32 power;
cXyz direction;
@@ -95,8 +91,6 @@ void daObjFlag_c::calcJointAngle() {
}
}
/* 80BEBC58-80BEBDAC 000558 0154+00 1/1 0/0 0/0 .text
* calcAngleSwingZ__11daObjFlag_cFP11FlagJoint_cf */
void daObjFlag_c::calcAngleSwingZ(FlagJoint_c* param_0, f32 param_1) {
f32 swing = param_1 * -(attr().field_0x0e / 0.7f) + attr().field_0x0e / 0.7f;
f32 tmp = attr().field_0x1a * cM_ssin(field_0x5e8);
@@ -116,8 +110,6 @@ void daObjFlag_c::calcJointAngle() {
param_0->mRv += (s16)(param_1 * attr().field_0x30);
}
/* 80BEBDAC-80BEBE64 0006AC 00B8+00 1/1 0/0 0/0 .text
* calcAngleSwingX__11daObjFlag_cFP11FlagJoint_cf */
void daObjFlag_c::calcAngleSwingX(FlagJoint_c* param_0, f32 param_1) {
float tmp = 16384.0f / attr().field_0x08;
float swing = tmp * param_1 - 16384.0f;
@@ -132,7 +124,6 @@ void daObjFlag_c::calcAngleSwingX(FlagJoint_c* param_0, f32 param_1) {
}
}
/* 80BEBE64-80BEBFC8 000764 0164+00 1/1 0/0 0/0 .text getSwingY__11daObjFlag_cFf */
f32 daObjFlag_c::getSwingY(f32 param_0) {
f32 swing = param_0 * 6666.6665f;
if(swing > 4000.0f) {
@@ -163,7 +154,6 @@ f32 daObjFlag_c::getSwingY(f32 param_0) {
return (int)(short)((swing + var3) + var4 + var5);
}
/* 80BEBFC8-80BEC0B8 0008C8 00F0+00 1/1 0/0 0/0 .text nodeCallBack__FP8J3DJointi */
static int nodeCallBack(J3DJoint* joint, int param_1) {
switch(param_1) {
default:
@@ -232,7 +222,6 @@ inline int daObjFlag_c::createHeap() {
return 1;
}
/* 80BEC0B8-80BEC234 0009B8 017C+00 1/1 0/0 0/0 .text createSolidHeap__FP10fopAc_ac_c */
static int createSolidHeap(fopAc_ac_c* i_actor) {
daObjFlag_c* i_this = static_cast<daObjFlag_c*>(i_actor);
return i_this->createHeap();
@@ -254,7 +243,6 @@ inline int daObjFlag_c::draw() {
return 1;
}
/* 80BEC234-80BEC300 000B34 00CC+00 1/0 0/0 0/0 .text daObjFlag_Draw__FP11daObjFlag_c */
static int daObjFlag_Draw(daObjFlag_c* param_0) {
return param_0->draw();
}
@@ -268,27 +256,20 @@ inline int daObjFlag_c::execute() {
return 1;
}
/* 80BEC300-80BEC338 000C00 0038+00 1/0 0/0 0/0 .text daObjFlag_Execute__FP11daObjFlag_c
*/
static int daObjFlag_Execute(daObjFlag_c* param_0) {
return param_0->execute();
}
/* 80BEC338-80BEC340 000C38 0008+00 1/0 0/0 0/0 .text daObjFlag_IsDelete__FP11daObjFlag_c
*/
static bool daObjFlag_IsDelete(daObjFlag_c* param_0) {
return true;
}
/* 80BEC340-80BEC3BC 000C40 007C+00 1/0 0/0 0/0 .text daObjFlag_Delete__FP11daObjFlag_c
*/
static int daObjFlag_Delete(daObjFlag_c* param_0) {
param_0->~daObjFlag_c();
return 1;
}
/* 80BEC3BC-80BEC3F8 000CBC 003C+00 2/2 0/0 0/0 .text __dt__11FlagJoint_cFv */
FlagJoint_c::~FlagJoint_c() {}
inline int daObjFlag_c::create() {
@@ -311,15 +292,12 @@ inline int daObjFlag_c::create() {
return phase_state;
}
/* 80BEC3F8-80BEC4E0 000CF8 00E8+00 1/0 0/0 0/0 .text daObjFlag_Create__FP10fopAc_ac_c */
static int daObjFlag_Create(fopAc_ac_c* param_0) {
return static_cast<daObjFlag_c*>(param_0)->create();
}
/* 80BEC4E0-80BEC4E4 000DE0 0004+00 1/1 0/0 0/0 .text __ct__11FlagJoint_cFv */
FlagJoint_c::FlagJoint_c() {}
/* 80BEC580-80BEC5A0 -00001 0020+00 1/0 0/0 0/0 .data l_daObjFlag_Method */
static actor_method_class l_daObjFlag_Method = {
(process_method_func)daObjFlag_Create,
(process_method_func)daObjFlag_Delete,
@@ -328,7 +306,6 @@ static actor_method_class l_daObjFlag_Method = {
(process_method_func)daObjFlag_Draw,
};
/* 80BEC5A0-80BEC5D0 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Flag */
extern actor_process_profile_definition g_profile_Obj_Flag = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID