mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-18 04:48:21 -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_e_ms.cpp
+2 -33
View File
@@ -14,8 +14,8 @@
class daE_MS_HIO_c : public JORReflexible {
public:
/* 80725B8C */ daE_MS_HIO_c();
/* 8072900C */ virtual ~daE_MS_HIO_c() {};
daE_MS_HIO_c();
virtual ~daE_MS_HIO_c() {};
void genMessage(JORMContext*);
@@ -27,7 +27,6 @@ public:
/* 0x18 */ f32 mPlayerDistanceLimit;
};
/* 80725B8C-80725BD4 0000EC 0048+00 1/1 0/0 0/0 .text __ct__12daE_MS_HIO_cFv */
daE_MS_HIO_c::daE_MS_HIO_c() {
field_0x4 = -1;
mScale = 1.0f;
@@ -37,14 +36,12 @@ daE_MS_HIO_c::daE_MS_HIO_c() {
mPlayerDistanceLimit = 450.0f;
}
/* 80725BD4-80725C80 000134 00AC+00 7/7 0/0 0/0 .text anm_init__FP10e_ms_classifUcf */
static void anm_init(e_ms_class* i_this, int param_2, f32 param_3, u8 param_4, f32 param_5) {
i_this->mpModelMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("E_MS", param_2), param_4,
param_3, param_5, 0.0f, -1.0f);
i_this->mNextSound = param_2;
}
/* 80725C80-80725CCC 0001E0 004C+00 3/3 0/0 0/0 .text pl_check__FP10e_ms_classf */
static int pl_check(e_ms_class* i_this, f32 i_dist) {
fopAc_ac_c* player = dComIfGp_getPlayer(0);
if (i_this->mPlayerDistance < i_dist && !fopAcM_otherBgCheck(i_this, player)) {
@@ -54,7 +51,6 @@ static int pl_check(e_ms_class* i_this, f32 i_dist) {
return 0;
}
/* 80725CCC-80725DEC 00022C 0120+00 1/0 0/0 0/0 .text daE_MS_Draw__FP10e_ms_class */
static int daE_MS_Draw(e_ms_class* i_this) {
if (i_this->field_0xba5) {
return 1;
@@ -77,7 +73,6 @@ static int daE_MS_Draw(e_ms_class* i_this) {
return 1;
}
/* 80725DEC-80725ED4 00034C 00E8+00 2/2 0/0 0/0 .text sibuki_set__FP10e_ms_class */
static void sibuki_set(e_ms_class* i_this) {
if (!i_this->mCooldown2) {
i_this->mCooldown2 = 20;
@@ -92,7 +87,6 @@ static void sibuki_set(e_ms_class* i_this) {
}
}
/* 80725ED4-80725FF0 000434 011C+00 1/1 0/0 0/0 .text ms_disappear__FP10e_ms_class */
static void ms_disappear(e_ms_class* i_this) {
fopAcM_createDisappear(i_this, &i_this->eyePos, 10, 0, 0x26);
int no = (fopAcM_GetParam(i_this) >> 0x10) & 0xff;
@@ -114,20 +108,15 @@ static void ms_disappear(e_ms_class* i_this) {
}
}
/* 807297FC-80729800 -00001 0004+00 2/2 0/0 0/0 .bss None */
/* 807297FD 0003+00 data_807297FD None */
static u8 hioInit;
/* 8072980C-80729828 000054 001C+00 7/8 0/0 0/0 .bss l_HIO */
static daE_MS_HIO_c l_HIO;
/* 80729828-80729878 000070 0050+00 2/2 0/0 0/0 .bss target_info */
static fopAc_ac_c* target_info[20];
/* 80729878-8072987C 0000C0 0004+00 2/2 0/0 0/0 .bss target_info_count */
static int target_info_count;
/* 80725FF0-8072606C 000550 007C+00 1/1 0/0 0/0 .text s_d_sub__FPvPv */
static void* s_d_sub(void* param_1, void* param_2) {
daObjCarry_c* i_this = (daObjCarry_c*)param_1;
if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == PROC_Obj_Carry && i_this->getType() == daObjCarry_c::TYPE_DOKURO &&
@@ -140,7 +129,6 @@ static void* s_d_sub(void* param_1, void* param_2) {
return NULL;
}
/* 8072606C-807261E8 0005CC 017C+00 1/1 0/0 0/0 .text search_dokuro__FP10e_ms_class */
static fopAc_ac_c* search_dokuro(e_ms_class* i_this) {
fopAc_ac_c* actor = (fopAc_ac_c*)i_this;
target_info_count = 0;
@@ -181,7 +169,6 @@ static fopAc_ac_c* search_dokuro(e_ms_class* i_this) {
return NULL;
}
/* 807261E8-80726360 000748 0178+00 1/1 0/0 0/0 .text way_set__FP10e_ms_class */
static int way_set(e_ms_class* i_this) {
fopAc_ac_c* actor = i_this;
@@ -214,7 +201,6 @@ static int way_set(e_ms_class* i_this) {
return 0;
}
/* 80726360-80726730 0008C0 03D0+00 1/1 0/0 0/0 .text e_ms_normal__FP10e_ms_class */
static s8 e_ms_normal(e_ms_class* i_this) {
fopAc_ac_c* actor = (fopAc_ac_c*)i_this;
f32 fVar1 = 0.0f;
@@ -296,7 +282,6 @@ static s8 e_ms_normal(e_ms_class* i_this) {
return rv;
}
/* 80726730-80726A70 000C90 0340+00 1/1 0/0 0/0 .text e_ms_attack__FP10e_ms_class */
static s8 e_ms_attack(e_ms_class* i_this) {
f32 fVar1 = 0.0f;
s8 rv = 1;
@@ -367,7 +352,6 @@ static s8 e_ms_attack(e_ms_class* i_this) {
return rv;
}
/* 80726A70-80726F54 000FD0 04E4+00 1/1 0/0 0/0 .text search_ground_1__FP10e_ms_class */
static void search_ground_1(e_ms_class* i_this) {
fopAc_ac_c* actor = (fopAc_ac_c*)i_this;
dBgS_LinChk dStack_174;
@@ -422,7 +406,6 @@ static void search_ground_1(e_ms_class* i_this) {
}
}
/* 80726F58-80727100 0014B8 01A8+00 1/1 0/0 0/0 .text e_ms_swim__FP10e_ms_class */
static void e_ms_swim(e_ms_class* i_this) {
s16 sVar3 = 0;
switch (i_this->mMode) {
@@ -460,7 +443,6 @@ static void e_ms_swim(e_ms_class* i_this) {
}
}
/* 80727100-807274D8 001660 03D8+00 1/1 0/0 0/0 .text e_ms_dokuro__FP10e_ms_class */
static void e_ms_dokuro(e_ms_class* i_this) {
daObjCarry_c* mObjCarry = (daObjCarry_c*)fopAcM_SearchByID(i_this->mSkullID);
@@ -524,7 +506,6 @@ static void e_ms_dokuro(e_ms_class* i_this) {
}
}
/* 807274D8-80727704 001A38 022C+00 1/1 0/0 0/0 .text e_ms_damage__FP10e_ms_class */
static void e_ms_damage(e_ms_class* i_this) {
i_this->mCooldown1 = 6;
switch (i_this->mMode) {
@@ -571,7 +552,6 @@ static void e_ms_damage(e_ms_class* i_this) {
}
}
/* 80727704-80727834 001C64 0130+00 1/1 0/0 0/0 .text e_ms_wolfbite__FP10e_ms_class */
static void e_ms_wolfbite(e_ms_class* i_this) {
fopAc_ac_c* actor = (fopAc_ac_c*)i_this;
daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
@@ -596,7 +576,6 @@ static void e_ms_wolfbite(e_ms_class* i_this) {
}
}
/* 80727834-80727894 001D94 0060+00 1/1 0/0 0/0 .text e_ms_standby__FP10e_ms_class */
static void e_ms_standby(e_ms_class* i_this) {
i_this->mCooldown1 = 6;
if (dComIfGs_isSwitch(i_this->field_0x5b8, fopAcM_GetRoomNo(i_this))) {
@@ -606,7 +585,6 @@ static void e_ms_standby(e_ms_class* i_this) {
}
}
/* 80727894-80727A20 001DF4 018C+00 1/1 0/0 0/0 .text damage_check__FP10e_ms_class */
static void damage_check(e_ms_class* i_this) {
daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
if (i_this->mCooldown1 == 0) {
@@ -652,7 +630,6 @@ static void damage_check(e_ms_class* i_this) {
}
}
/* 80727A20-8072803C 001F80 061C+00 2/1 0/0 0/0 .text action__FP10e_ms_class */
static void action(e_ms_class* i_this) {
fopAc_ac_c* actor = i_this;
i_this->mPlayerDistance = fopAcM_searchPlayerDistance(actor);
@@ -801,7 +778,6 @@ static void action(e_ms_class* i_this) {
setMidnaBindEffect((fopEn_enemy_c*)actor, &i_this->mSound, &i_this->eyePos, &eff_size);
}
/* 8072803C-80728464 00259C 0428+00 1/1 0/0 0/0 .text anm_se_set__FP10e_ms_class */
static void anm_se_set(e_ms_class* i_this) {
s8 step = 0;
int sound = i_this->mNextSound;
@@ -862,7 +838,6 @@ static void anm_se_set(e_ms_class* i_this) {
}
}
/* 80728464-80728920 0029C4 04BC+00 2/1 0/0 0/0 .text daE_MS_Execute__FP10e_ms_class */
static int daE_MS_Execute(e_ms_class* i_this) {
cXyz sp34;
cXyz sp40;
@@ -967,12 +942,10 @@ static int daE_MS_Execute(e_ms_class* i_this) {
return 1;
}
/* 80728920-80728928 002E80 0008+00 1/0 0/0 0/0 .text daE_MS_IsDelete__FP10e_ms_class */
static int daE_MS_IsDelete(e_ms_class* i_this) {
return 1;
}
/* 80728928-80728990 002E88 0068+00 1/0 0/0 0/0 .text daE_MS_Delete__FP10e_ms_class */
static int daE_MS_Delete(e_ms_class* i_this) {
dComIfG_resDelete(&i_this->mPhaseReq, "E_MS");
if (i_this->mHIOInit) {
@@ -986,7 +959,6 @@ static int daE_MS_Delete(e_ms_class* i_this) {
return 1;
}
/* 80728990-80728A88 002EF0 00F8+00 1/1 0/0 0/0 .text useHeapInit__FP10fopAc_ac_c */
static int useHeapInit(fopAc_ac_c* actor) {
e_ms_class* i_this = (e_ms_class*)actor;
mDoExt_McaMorfSO* mMorf =
@@ -1001,7 +973,6 @@ static int useHeapInit(fopAc_ac_c* actor) {
return 1;
}
/* 80728A88-80728DF8 002FE8 0370+00 1/0 0/0 0/0 .text daE_MS_Create__FP10fopAc_ac_c */
static int daE_MS_Create(fopAc_ac_c* actor) {
static dCcD_SrcSph cc_sph_src = {
{
@@ -1085,14 +1056,12 @@ static int daE_MS_Create(fopAc_ac_c* actor) {
return phase;
}
/* 807296FC-8072971C -00001 0020+00 1/0 0/0 0/0 .data l_daE_MS_Method */
static actor_method_class l_daE_MS_Method = {
(process_method_func)daE_MS_Create, (process_method_func)daE_MS_Delete,
(process_method_func)daE_MS_Execute, (process_method_func)daE_MS_IsDelete,
(process_method_func)daE_MS_Draw,
};
/* 8072971C-8072974C -00001 0030+00 0/0 0/0 1/0 .data g_profile_E_MS */
extern actor_process_profile_definition g_profile_E_MS = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID