mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-17 20:43:07 -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_tk2.cpp
-24
View File
@@ -38,13 +38,10 @@ enum Mode { // Not sure if these are correct...
/* 0xC */ MODE_TK2_WAIT01,
};
/* 807BBF40-807BBF44 000008 0004+00 2/2 0/0 0/0 .bss None */
static bool hioInit;
/* 807BBF50-807BBF6C 000018 001C+00 6/6 0/0 0/0 .bss l_HIO */
static daE_TK2_HIO_c l_HIO;
/* 807BA56C-807BA5B4 0000EC 0048+00 1/1 0/0 0/0 .text __ct__13daE_TK2_HIO_cFv */
daE_TK2_HIO_c::daE_TK2_HIO_c() {
field_0x04 = -1;
mRadiusScale = 2.3f;
@@ -54,7 +51,6 @@ daE_TK2_HIO_c::daE_TK2_HIO_c() {
mSpeedModifier2 = 25.0f;
}
/* 807BA5B4-807BA660 000134 00AC+00 4/4 0/0 0/0 .text anm_init__FP11e_tk2_classifUcf */
static void anm_init(e_tk2_class* i_this, int i_index, f32 i_morf, u8 i_attr, f32 i_rate) {
J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes("E_tk2", i_index);
@@ -62,7 +58,6 @@ static void anm_init(e_tk2_class* i_this, int i_index, f32 i_morf, u8 i_attr, f3
i_this->mAnim = i_index;
}
/* 807BA660-807BA6D0 0001E0 0070+00 1/0 0/0 0/0 .text daE_TK2_Draw__FP11e_tk2_class */
static int daE_TK2_Draw(e_tk2_class* i_this) {
J3DModel* model = i_this->mpMorf->getModel();
@@ -72,8 +67,6 @@ static int daE_TK2_Draw(e_tk2_class* i_this) {
return 1;
}
/* 807BA6D0-807BA7A8 000250 00D8+00 1/1 0/0 0/0 .text other_bg_check__FP11e_tk2_classP10fopAc_ac_c
*/
static int other_bg_check(e_tk2_class* i_this, fopAc_ac_c* i_ac) {
fopAc_ac_c* actor = i_this;
dBgS_LinChk line_check;
@@ -94,7 +87,6 @@ static int other_bg_check(e_tk2_class* i_this, fopAc_ac_c* i_ac) {
}
}
/* 807BA7A8-807BA824 000328 007C+00 2/2 0/0 0/0 .text pl_check__FP11e_tk2_classfs */
static int pl_check(e_tk2_class* i_this, f32 i_limit, s16 i_max_diff) {
fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -108,7 +100,6 @@ static int pl_check(e_tk2_class* i_this, f32 i_limit, s16 i_max_diff) {
return 0;
}
/* 807BA824-807BA940 0003A4 011C+00 1/1 0/0 0/0 .text damage_check__FP11e_tk2_class */
static void damage_check(e_tk2_class* i_this) {
if (i_this->mInvincibilityTimer == 0) {
i_this->mStts.Move();
@@ -149,7 +140,6 @@ static void damage_check(e_tk2_class* i_this) {
}
}
/* 807BA940-807BA9E8 0004C0 00A8+00 1/1 0/0 0/0 .text e_tk2_wait_0__FP11e_tk2_class */
static void e_tk2_wait_0(e_tk2_class* i_this) {
i_this->mAttentionOFF = true;
@@ -170,7 +160,6 @@ static void e_tk2_wait_0(e_tk2_class* i_this) {
cLib_addCalcAngleS2(&i_this->shape_angle.y, i_this->mSomeAngle, 0x10, 0x400);
}
/* 807BA9E8-807BACF8 000568 0310+00 2/1 0/0 0/0 .text e_tk2_find__FP11e_tk2_class */
static void e_tk2_find(e_tk2_class* i_this) {
switch (i_this->mMode) {
case MODE_TK2_NONE:
@@ -246,7 +235,6 @@ static void e_tk2_find(e_tk2_class* i_this) {
cLib_addCalcAngleS2(&(i_this)->shape_angle.y, i_this->mPlayerAngleY, 4, 0x800);
}
/* 807BACF8-807BAED0 000878 01D8+00 1/1 0/0 0/0 .text e_tk2_attack__FP11e_tk2_class */
static void e_tk2_attack(e_tk2_class* i_this) {
switch (i_this->mMode) {
case MODE_TK2_NONE:
@@ -283,7 +271,6 @@ static void e_tk2_attack(e_tk2_class* i_this) {
cLib_addCalcAngleS2(&i_this->shape_angle.y, i_this->mPlayerAngleY, 4, 0x800);
}
/* 807BAED0-807BAF60 000A50 0090+00 1/1 0/0 0/0 .text e_tk2_s_damage__FP11e_tk2_class */
static void e_tk2_s_damage(e_tk2_class* i_this) {
switch (i_this->mMode) {
case MODE_TK2_NONE:
@@ -300,7 +287,6 @@ static void e_tk2_s_damage(e_tk2_class* i_this) {
}
}
/* 807BAF60-807BB028 000AE0 00C8+00 1/1 0/0 0/0 .text e_tk2_damage__FP11e_tk2_class */
static void e_tk2_damage(e_tk2_class* i_this) {
i_this->mInvincibilityTimer = 6;
i_this->mAttentionOFF = true;
@@ -320,7 +306,6 @@ static void e_tk2_damage(e_tk2_class* i_this) {
}
}
/* 807BB028-807BB128 000BA8 0100+00 1/1 0/0 0/0 .text action__FP11e_tk2_class */
static void action(e_tk2_class* i_this) {
fopAc_ac_c* actor = i_this;
i_this->mPlayerAngleY = fopAcM_searchPlayerAngleY(actor);
@@ -355,7 +340,6 @@ static void action(e_tk2_class* i_this) {
}
}
/* 807BB128-807BB7E4 000CA8 06BC+00 2/1 0/0 0/0 .text daE_TK2_Execute__FP11e_tk2_class */
static int daE_TK2_Execute(e_tk2_class* i_this) {
cXyz cStack_94;
cXyz cStack_a0;
@@ -472,13 +456,10 @@ static int daE_TK2_Execute(e_tk2_class* i_this) {
return 1;
}
/* 807BB7E4-807BB7EC 001364 0008+00 1/0 0/0 0/0 .text daE_TK2_IsDelete__FP11e_tk2_class
*/
static int daE_TK2_IsDelete(e_tk2_class* i_this) {
return 1;
}
/* 807BB7EC-807BB854 00136C 0068+00 1/0 0/0 0/0 .text daE_TK2_Delete__FP11e_tk2_class */
static int daE_TK2_Delete(e_tk2_class* i_this) {
dComIfG_resDelete(&i_this->mPhaseReq, "E_tk2");
if (i_this->mInitHIO) {
@@ -490,7 +471,6 @@ static int daE_TK2_Delete(e_tk2_class* i_this) {
return 1;
}
/* 807BB854-807BB94C 0013D4 00F8+00 1/1 0/0 0/0 .text useHeapInit__FP10fopAc_ac_c */
static int useHeapInit(fopAc_ac_c* a_this) {
e_tk2_class* i_this = static_cast<e_tk2_class*>(a_this);
@@ -506,7 +486,6 @@ static int useHeapInit(fopAc_ac_c* a_this) {
return 1;
}
/* 807BBE5C-807BBE9C 000034 0040+00 1/1 0/0 0/0 .data cc_sph_src$4256 */
static dCcD_SrcSph cc_sph_src = {
{
{0x0, {{0x0, 0x0, 0xd}, {0xd8fbfdff, 0x3}, 0x75}}, // mObj
@@ -519,7 +498,6 @@ static dCcD_SrcSph cc_sph_src = {
} // mSphAttr
};
/* 807BB94C-807BBC00 0014CC 02B4+00 1/0 0/0 0/0 .text daE_TK2_Create__FP10fopAc_ac_c */
static int daE_TK2_Create(fopAc_ac_c* i_this) {
fopAcM_ct(i_this, e_tk2_class);
e_tk2_class* a_this = static_cast<e_tk2_class*>(i_this);
@@ -567,14 +545,12 @@ static int daE_TK2_Create(fopAc_ac_c* i_this) {
return phase;
}
/* 807BBE9C-807BBEBC -00001 0020+00 1/0 0/0 0/0 .data l_daE_TK2_Method */
static actor_method_class l_daE_TK2_Method = {
(process_method_func)daE_TK2_Create, (process_method_func)daE_TK2_Delete,
(process_method_func)daE_TK2_Execute, (process_method_func)daE_TK2_IsDelete,
(process_method_func)daE_TK2_Draw,
};
/* 807BBEBC-807BBEEC -00001 0030+00 0/0 0/0 1/0 .data g_profile_E_TK2 */
extern actor_process_profile_definition g_profile_E_TK2 = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID