mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-09-06 19:01:05 -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_nest.cpp
-34
View File
@@ -14,19 +14,15 @@
#include "d/d_procname.h"
#include "f_op/f_op_camera_mng.h"
/* 80504950-80504954 000008 0004+00 2/2 0/0 0/0 .bss None */
static bool l_hioInit;
/* 80504960-8050496C 000018 000C+00 7/7 0/0 0/0 .bss l_HIO */
static daE_Nest_HIO_c l_HIO;
/* 80500F8C-80500FB0 0000EC 0024+00 1/1 0/0 0/0 .text __ct__14daE_Nest_HIO_cFv */
daE_Nest_HIO_c::daE_Nest_HIO_c() {
field_0x4 = -1;
mScale = 1.0f;
}
/* 80500FB0-80501040 000110 0090+00 1/1 0/0 0/0 .text hahen_draw__FP12e_nest_class */
static void hahen_draw(e_nest_class* i_this) {
nest_hahen_s* debris = i_this->mDebris;
g_env_light.settingTevStruct(0, &i_this->current.pos, &i_this->tevStr);
@@ -38,7 +34,6 @@ static void hahen_draw(e_nest_class* i_this) {
}
}
/* 80501040-805011CC 0001A0 018C+00 1/1 0/0 0/0 .text s_bomb_sub__FPvPv */
static void* s_bomb_sub(void* i_actor, void* i_debris) {
if (fopAcM_IsActor(i_actor)) {
fopAc_ac_c* actor = static_cast<fopAc_ac_c*>(i_actor);
@@ -56,8 +51,6 @@ static void* s_bomb_sub(void* i_actor, void* i_debris) {
return NULL;
}
/* 805011CC-805017FC 00032C 0630+00 1/1 0/0 0/0 .text
* hahen_normal__FP12e_nest_classP12nest_hahen_s */
static void hahen_normal(e_nest_class* i_this, nest_hahen_s* i_debris) {
fopAc_ac_c* a_this = static_cast<fopAc_ac_c*>(i_this);
dBgS_LinChk lin_chk;
@@ -158,7 +151,6 @@ static void hahen_normal(e_nest_class* i_this, nest_hahen_s* i_debris) {
}
}
/* 805017FC-80501930 00095C 0134+00 1/1 0/0 0/0 .text hahen_move__FP12e_nest_class */
static void hahen_move(e_nest_class* i_this) {
nest_hahen_s* debris = i_this->mDebris;
dBgS_LinChk lin_chk;
@@ -183,7 +175,6 @@ static void hahen_move(e_nest_class* i_this) {
}
}
/* 80501930-80501A40 000A90 0110+00 1/0 0/0 0/0 .text daE_Nest_Draw__FP12e_nest_class */
static int daE_Nest_Draw(e_nest_class* i_this) {
g_env_light.settingTevStruct(0, &i_this->current.pos, &i_this->tevStr);
if (i_this->mBreakStage != 0) {
@@ -206,7 +197,6 @@ static int daE_Nest_Draw(e_nest_class* i_this) {
}
}
/* 80501A40-80501BDC 000BA0 019C+00 2/2 0/0 0/0 .text mtx_cc_set__FP12e_nest_class */
static void mtx_cc_set(e_nest_class* i_this) {
mDoMtx_stack_c::transS(i_this->current.pos.x, i_this->current.pos.y, i_this->current.pos.z);
mDoMtx_stack_c::YrotM(i_this->mRotation.y);
@@ -237,7 +227,6 @@ static void mtx_cc_set(e_nest_class* i_this) {
}
}
/* 80501BDC-805020D0 000D3C 04F4+00 1/1 0/0 0/0 .text e_nest_normal__FP12e_nest_class */
static void e_nest_normal(e_nest_class* i_this) {
fopAc_ac_c* a_this = static_cast<fopAc_ac_c*>(i_this);
if (i_this->mHitTimer != 0) {
@@ -345,7 +334,6 @@ static void e_nest_normal(e_nest_class* i_this) {
}
}
/* 805020D0-80502280 001230 01B0+00 1/1 0/0 0/0 .text wall_angle_get__FP12e_nest_class */
static s16 wall_angle_get(e_nest_class* i_this) {
fopAc_ac_c* a_this = static_cast<fopAc_ac_c*>(i_this);
dBgS_LinChk lin_chk;
@@ -374,7 +362,6 @@ static s16 wall_angle_get(e_nest_class* i_this) {
return cM_atan2s(vec1.x, vec1.z) + 0x4000;
}
/* 80502280-805025C4 0013E0 0344+00 1/1 0/0 0/0 .text e_nest_drop__FP12e_nest_class */
static void e_nest_drop(e_nest_class* i_this) {
if (i_this->mAcch.ChkGroundHit()) {
if (i_this->mKnockDown != 0) {
@@ -443,7 +430,6 @@ static void e_nest_drop(e_nest_class* i_this) {
cLib_addCalcAngleS2(&i_this->mSpin, 0, 1, 100);
}
/* 805025C4-80502730 001724 016C+00 1/1 0/0 0/0 .text e_nest_carry__FP12e_nest_class */
static s8 e_nest_carry(e_nest_class* i_this) {
fopAc_ac_c* player = dComIfGp_getPlayer(0);
i_this->speed.y = 0.0f;
@@ -489,7 +475,6 @@ static s8 e_nest_carry(e_nest_class* i_this) {
return ret;
}
/* 80502730-8050284C 001890 011C+00 1/1 0/0 0/0 .text water_check__FP12e_nest_class */
static int water_check(e_nest_class* i_this) {
dBgS_LinChk lin_chk;
cXyz vec;
@@ -510,8 +495,6 @@ static int water_check(e_nest_class* i_this) {
}
}
/* 8050284C-80502AD4 0019AC 0288+00 1/1 0/0 0/0 .text simple_bg_check__FP12e_nest_class
*/
static int simple_bg_check(e_nest_class* i_this) {
fopAc_ac_c* a_this = static_cast<fopAc_ac_c*>(i_this);
cXyz vec2, vec3, vec1;
@@ -540,7 +523,6 @@ static int simple_bg_check(e_nest_class* i_this) {
return false;
}
/* 80502AD4-80502D30 001C34 025C+00 1/1 0/0 0/0 .text e_nest_float__FP12e_nest_class */
static void e_nest_float(e_nest_class* i_this) {
cLib_addCalc0(&i_this->speed.y, 1.0f, 0.25f);
i_this->current.pos += i_this->speed;
@@ -586,7 +568,6 @@ static void e_nest_float(e_nest_class* i_this) {
}
}
/* 80502D30-80503120 001E90 03F0+00 1/1 0/0 0/0 .text e_nest_hahen__FP12e_nest_class */
static void e_nest_hahen(e_nest_class* i_this) {
fopAc_ac_c* a_this = static_cast<fopAc_ac_c*>(i_this);
daPy_py_c* player = static_cast<daPy_py_c*>(dComIfGp_getPlayer(0));
@@ -653,7 +634,6 @@ static void e_nest_hahen(e_nest_class* i_this) {
}
}
/* 80503120-805031CC 002280 00AC+00 1/1 0/0 0/0 .text e_nest_hook__FP12e_nest_class */
static void e_nest_hook(e_nest_class* i_this) {
i_this->mIframes = 10;
@@ -677,8 +657,6 @@ static void e_nest_hook(e_nest_class* i_this) {
}
}
/* 805031CC-80503668 00232C 049C+00 1/1 0/0 0/0 .text bee_nest_action__FP12e_nest_class
*/
static void bee_nest_action(e_nest_class* i_this) {
i_this->attention_info.position = i_this->eyePos = i_this->current.pos;
i_this->eyePos.y += i_this->scale.x * -80.0f;
@@ -792,7 +770,6 @@ static void bee_nest_action(e_nest_class* i_this) {
mtx_cc_set(i_this);
}
/* 80503668-805036E0 0027C8 0078+00 1/1 0/0 0/0 .text shot_b_sub__FPvPv */
static void* shot_b_sub(void* i_actor, void* i_data) {
daPy_py_c* player = static_cast<daPy_py_c*>(dComIfGp_getPlayer(0));
if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_BOOMERANG
@@ -803,7 +780,6 @@ static void* shot_b_sub(void* i_actor, void* i_data) {
return NULL;
}
/* 805036E0-80503984 002840 02A4+00 1/1 0/0 0/0 .text demo_camera__FP12e_nest_class */
static void demo_camera(e_nest_class* i_this) {
camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
s8 end_demo = false;
@@ -860,8 +836,6 @@ static void demo_camera(e_nest_class* i_this) {
}
}
/* 80503984-80503E24 002AE4 04A0+00 1/0 0/0 0/0 .text daE_Nest_Execute__FP12e_nest_class
*/
static int daE_Nest_Execute(e_nest_class* i_this) {
cXyz vec1, vec2;
@@ -939,14 +913,10 @@ static int daE_Nest_Execute(e_nest_class* i_this) {
return 1;
}
/* 80503E24-80503E2C 002F84 0008+00 1/0 0/0 0/0 .text daE_Nest_IsDelete__FP12e_nest_class
*/
static int daE_Nest_IsDelete(e_nest_class* param_0) {
return 1;
}
/* 80503E2C-80503EA0 002F8C 0074+00 1/0 0/0 0/0 .text daE_Nest_Delete__FP12e_nest_class
*/
static int daE_Nest_Delete(e_nest_class* i_this) {
dComIfG_resDelete(&i_this->mPhase, "E_nest");
@@ -962,7 +932,6 @@ static int daE_Nest_Delete(e_nest_class* i_this) {
return 1;
}
/* 80503EA0-80503FCC 003000 012C+00 1/1 0/0 0/0 .text useHeapInit__FP10fopAc_ac_c */
static int useHeapInit(fopAc_ac_c* i_this) {
e_nest_class* _this = static_cast<e_nest_class*>(i_this);
@@ -987,7 +956,6 @@ static int useHeapInit(fopAc_ac_c* i_this) {
return 1;
}
/* 80503FCC-805044AC 00312C 04E0+00 1/0 0/0 0/0 .text daE_Nest_Create__FP10fopAc_ac_c */
static cPhs__Step daE_Nest_Create(fopAc_ac_c* i_this) {
fopAcM_ct(i_this, e_nest_class);
e_nest_class* _this = static_cast<e_nest_class*>(i_this);
@@ -1092,7 +1060,6 @@ static cPhs__Step daE_Nest_Create(fopAc_ac_c* i_this) {
return step;
}
/* 805048A4-805048C4 -00001 0020+00 1/0 0/0 0/0 .data l_daE_Nest_Method */
static actor_method_class l_daE_Nest_Method = {
(process_method_func)daE_Nest_Create,
(process_method_func)daE_Nest_Delete,
@@ -1101,7 +1068,6 @@ static actor_method_class l_daE_Nest_Method = {
(process_method_func)daE_Nest_Draw,
};
/* 805048C4-805048F4 -00001 0030+00 0/0 0/0 1/0 .data g_profile_E_NEST */
extern actor_process_profile_definition g_profile_E_NEST = {
fpcLy_CURRENT_e,
7,