mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-21 05:34:10 -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_e_dk.cpp
-38
View File
@@ -74,7 +74,6 @@ static dCcD_SrcSph cc_dk_core_src = {
{ { { 0.0f, 0.0f, 0.0f }, 40.0f, } } // mSphAttr
};
/* 806AA1EC-806AA228 0000EC 003C+00 1/1 0/0 0/0 .text __ct__12daE_DK_HIO_cFv */
daE_DK_HIO_c::daE_DK_HIO_c() {
field_0x4 = -1;
model_size = 2.0f;
@@ -86,7 +85,6 @@ daE_DK_HIO_c::daE_DK_HIO_c() {
static u32 const dk_brk_name[2] = { BRK_DK_WAIT, BRK_DK_ATTACK };
static u32 const dk_btk_name[2] = { BTK_DK_WAIT, BTK_DK_ATTACK };
/* 806AA228-806AA5A8 000128 0380+00 1/1 0/0 0/0 .text draw__8daE_DK_cFv */
int daE_DK_c::draw() {
J3DModel* model = mpMorfSO->getModel();
J3DModel* modelCore = mpCoreMorfSO->getModel();
@@ -154,12 +152,10 @@ int daE_DK_c::draw() {
return 1;
}
/* 806AA5A8-806AA5C8 0004A8 0020+00 1/0 0/0 0/0 .text daE_DK_Draw__FP8daE_DK_c */
static int daE_DK_Draw(daE_DK_c* i_this) {
return i_this->draw();
}
/* 806AA5C8-806AA68C 0004C8 00C4+00 5/5 0/0 0/0 .text setBck__8daE_DK_cFiUcff */
void daE_DK_c::setBck(int i_resIndex, u8 i_attr, f32 i_morf, f32 i_rate) {
field_0x6a0 = 0;
if (i_resIndex == BCK_DK_CHARGE || i_resIndex == BCK_DK_ATTACK) {
@@ -170,19 +166,16 @@ void daE_DK_c::setBck(int i_resIndex, u8 i_attr, f32 i_morf, f32 i_rate) {
i_attr, i_morf, i_rate, 0.0f, -1.0f);
}
/* 806AA68C-806AA730 00058C 00A4+00 5/5 0/0 0/0 .text setBckCore__8daE_DK_cFiUcff */
void daE_DK_c::setBckCore(int i_resIndex, u8 i_attr, f32 i_morf, f32 i_rate) {
mpCoreMorfSO->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("E_DK", i_resIndex),
i_attr, i_morf, i_rate, 0.0f, -1.0f);
}
/* 806AA730-806AA73C 000630 000C+00 6/6 0/0 0/0 .text setActionMode__8daE_DK_cFii */
void daE_DK_c::setActionMode(int i_actionMode, int i_moveMode) {
mActionMode = i_actionMode;
mMoveMode = i_moveMode;
}
/* 806AA73C-806AA8B0 00063C 0174+00 1/1 0/0 0/0 .text damage_check__8daE_DK_cFv */
void daE_DK_c::damage_check() {
if (field_0x694 == 0 && field_0x6a2 == 0) {
mStts.Move();
@@ -226,13 +219,10 @@ void daE_DK_c::damage_check() {
}
}
/* 806AD7F8-806AD7FC 000008 0004+00 2/2 0/0 0/0 .bss None */
static u8 data_806AD7F8;
/* 806AD808-806AD820 000018 0018+00 9/9 0/0 0/0 .bss l_HIO */
static daE_DK_HIO_c l_HIO;
/* 806AA8B0-806AAB18 0007B0 0268+00 2/2 0/0 0/0 .text checkPlayerSearch__8daE_DK_cFv */
bool daE_DK_c::checkPlayerSearch() {
if (current.pos.abs(home.pos) > field_0x6a8) {
return 0;
@@ -249,7 +239,6 @@ bool daE_DK_c::checkPlayerSearch() {
return 1;
}
/* 806AAB18-806AAC24 000A18 010C+00 2/2 0/0 0/0 .text checkPlayerAttack__8daE_DK_cFf */
int daE_DK_c::checkPlayerAttack(f32 param_0) {
if (field_0x69c == 0) {
f32 dist = fopAcM_searchPlayerDistance(this);
@@ -272,7 +261,6 @@ int daE_DK_c::checkPlayerAttack(f32 param_0) {
return 0;
}
/* 806AAC24-806AAD68 000B24 0144+00 1/1 0/0 0/0 .text checkWaterHeight__8daE_DK_cFv */
void daE_DK_c::checkWaterHeight() {
dBgS_ObjGndChk_Spl gndChk;
Vec gndChkPos;
@@ -295,8 +283,6 @@ void daE_DK_c::checkWaterHeight() {
}
}
/* 806AAD68-806AAE10 000C68 00A8+00 1/1 0/0 0/0 .text
* SphBgcCallBack__8daE_DK_cFP11dBgS_SphChkP10cBgD_Vtx_tiiiP8cM3dGPlaPv */
void daE_DK_c::SphBgcCallBack(dBgS_SphChk* param_0, cBgD_Vtx_t* param_1, int param_2,
int param_3, int param_4, cM3dGPla* param_5, void* param_6) {
fopAc_ac_c* actor = (fopAc_ac_c*)param_6;
@@ -323,7 +309,6 @@ void daE_DK_c::SphBgcCallBack(dBgS_SphChk* param_0, cBgD_Vtx_t* param_1, int par
}
}
/* 806AAE10-806AB054 000D10 0244+00 1/1 0/0 0/0 .text setElectricEffect__8daE_DK_cFv */
void daE_DK_c::setElectricEffect() {
static u16 elect_effect_name[6] = {
0x84BE, 0x84BF, 0x84C0, 0x84C1, 0x84C2, 0x84C3,
@@ -359,7 +344,6 @@ void daE_DK_c::setElectricEffect() {
mCreatureSound.startCreatureSoundLevel(Z2SE_EN_DK_ATTACK, 0, -1);
}
/* 806AB054-806AB158 000F54 0104+00 1/1 0/0 0/0 .text setCoreDeadEffect__8daE_DK_cFv */
void daE_DK_c::setCoreDeadEffect() {
cXyz emitterPos;
cXyz emitterScale(l_HIO.model_size, l_HIO.model_size, l_HIO.model_size);
@@ -377,7 +361,6 @@ void daE_DK_c::setCoreDeadEffect() {
-1, NULL, NULL, NULL);
}
/* 806AB158-806AB29C 001058 0144+00 1/1 0/0 0/0 .text setBodyDeadEffect__8daE_DK_cFv */
void daE_DK_c::setBodyDeadEffect() {
static u16 dead_effect_name[2] = {
0x860D,
@@ -404,7 +387,6 @@ void daE_DK_c::setBodyDeadEffect() {
}
}
/* 806AB29C-806AB684 00119C 03E8+00 1/1 0/0 0/0 .text executeWait__8daE_DK_cFv */
void daE_DK_c::executeWait() {
cXyz dirFromHome;
switch (mMoveMode) {
@@ -469,7 +451,6 @@ void daE_DK_c::executeWait() {
}
}
/* 806AB684-806ABA78 001584 03F4+00 1/1 0/0 0/0 .text executeChase__8daE_DK_cFv */
void daE_DK_c::executeChase() {
cXyz dirFromHome;
switch (mMoveMode) {
@@ -534,7 +515,6 @@ void daE_DK_c::executeChase() {
}
}
/* 806ABA78-806ABCC8 001978 0250+00 1/1 0/0 0/0 .text executeAttack__8daE_DK_cFv */
void daE_DK_c::executeAttack() {
switch (mMoveMode) {
case 0: {
@@ -589,7 +569,6 @@ void daE_DK_c::executeAttack() {
}
}
/* 806ABCC8-806ABE3C 001BC8 0174+00 1/1 0/0 0/0 .text executeDamage__8daE_DK_cFv */
void daE_DK_c::executeDamage() {
switch (mMoveMode) {
case 0:
@@ -630,7 +609,6 @@ void daE_DK_c::executeDamage() {
}
}
/* 806ABE3C-806ABF6C 001D3C 0130+00 1/1 0/0 0/0 .text BodyDeathMove__8daE_DK_cFv */
void daE_DK_c::BodyDeathMove() {
cLib_chaseF(&field_0x6ac, -2.0f, 0.2f);
cLib_chaseF(&field_0x6b0, 0.0f, 0.2f);
@@ -652,7 +630,6 @@ void daE_DK_c::BodyDeathMove() {
}
}
/* 806ABF6C-806AC390 001E6C 0424+00 1/1 0/0 0/0 .text executeDeath__8daE_DK_cFv */
void daE_DK_c::executeDeath() {
cXyz itemPos;
switch (mMoveMode) {
@@ -779,7 +756,6 @@ void daE_DK_c::executeDeath() {
}
}
/* 806AC390-806AC5BC 002290 022C+00 1/1 0/0 0/0 .text action__8daE_DK_cFv */
void daE_DK_c::action() {
checkWaterHeight();
@@ -845,7 +821,6 @@ void daE_DK_c::action() {
mpCoreMorfSO->play(0, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
}
/* 806AC5BC-806AC754 0024BC 0198+00 1/1 0/0 0/0 .text mtx_set__8daE_DK_cFv */
void daE_DK_c::mtx_set() {
if (field_0x6a2 == 0) {
mDoMtx_stack_c::transS(current.pos.x, current.pos.y + 100.0f, current.pos.z);
@@ -877,7 +852,6 @@ void daE_DK_c::mtx_set() {
mpCoreMorfSO->modelCalc();
}
/* 806AC754-806AC968 002654 0214+00 1/1 0/0 0/0 .text cc_set__8daE_DK_cFv */
void daE_DK_c::cc_set() {
cXyz sphCenter;
@@ -915,7 +889,6 @@ void daE_DK_c::cc_set() {
}
}
/* 806AC968-806AC9E8 002868 0080+00 1/1 0/0 0/0 .text execute__8daE_DK_cFv */
int daE_DK_c::execute() {
if (field_0x698 != 0) {
field_0x698--;
@@ -934,17 +907,14 @@ int daE_DK_c::execute() {
return 1;
}
/* 806AC9E8-806ACA08 0028E8 0020+00 2/1 0/0 0/0 .text daE_DK_Execute__FP8daE_DK_c */
static int daE_DK_Execute(daE_DK_c* i_this) {
return i_this->execute();
}
/* 806ACA08-806ACA10 002908 0008+00 1/0 0/0 0/0 .text daE_DK_IsDelete__FP8daE_DK_c */
static int daE_DK_IsDelete(daE_DK_c* i_this) {
return 1;
}
/* 806ACA10-806ACA84 002910 0074+00 1/1 0/0 0/0 .text _delete__8daE_DK_cFv */
int daE_DK_c::_delete() {
dComIfG_resDelete(&mPhaseReq, "E_DK");
@@ -960,13 +930,11 @@ int daE_DK_c::_delete() {
return 1;
}
/* 806ACA84-806ACAA4 002984 0020+00 1/0 0/0 0/0 .text daE_DK_Delete__FP8daE_DK_c */
static int daE_DK_Delete(daE_DK_c* i_this) {
fpc_ProcID unusedId = fopAcM_GetID(i_this); // debug match
return i_this->_delete();
}
/* 806ACAA4-806ACDAC 0029A4 0308+00 1/1 0/0 0/0 .text CreateHeap__8daE_DK_cFv */
int daE_DK_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_DK", BMDR_DK);
JUT_ASSERT(1488, modelData != NULL);
@@ -1017,13 +985,11 @@ int daE_DK_c::CreateHeap() {
}
}
/* 806ACDF4-806ACE14 002CF4 0020+00 1/1 0/0 0/0 .text useHeapInit__FP10fopAc_ac_c */
static int useHeapInit(fopAc_ac_c* i_this) {
daE_DK_c* dk = (daE_DK_c*)i_this;
return dk->CreateHeap();
}
/* 806ACE14-806AD0AC 002D14 0298+00 1/1 0/0 0/0 .text create__8daE_DK_cFv */
int daE_DK_c::create() {
fopAcM_ct(this, daE_DK_c);
@@ -1099,16 +1065,13 @@ int daE_DK_c::create() {
return loadRes;
}
/* 806AD0AC-806AD25C 002FAC 01B0+00 1/1 0/0 0/0 .text __ct__8daE_DK_cFv */
daE_DK_c::daE_DK_c() {
}
/* 806AD428-806AD448 003328 0020+00 1/0 0/0 0/0 .text daE_DK_Create__FP8daE_DK_c */
static int daE_DK_Create(daE_DK_c* i_this) {
return i_this->create();
}
/* 806AD724-806AD744 -00001 0020+00 1/0 0/0 0/0 .data l_daE_DK_Method */
static actor_method_class l_daE_DK_Method = {
(process_method_func)daE_DK_Create,
(process_method_func)daE_DK_Delete,
@@ -1117,7 +1080,6 @@ static actor_method_class l_daE_DK_Method = {
(process_method_func)daE_DK_Draw,
};
/* 806AD744-806AD774 -00001 0030+00 0/0 0/0 1/0 .data g_profile_E_DK */
extern actor_process_profile_definition g_profile_E_DK = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID