mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-08-20 13:24:40 -04:00
project cleanup (#2895)
* 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:
@@ -11,7 +11,6 @@
|
||||
#include "d/d_s_play.h"
|
||||
#include "m_Do/m_Do_lib.h"
|
||||
|
||||
/* 804681F8-804682F8 000078 0100+00 1/1 0/0 0/0 .text hahen_draw__FP8ep_class */
|
||||
static void hahen_draw(ep_class* i_this) {
|
||||
fopAc_ac_c* a_this = i_this;
|
||||
ep_hahen_s* epHahenS = i_this->mHahen;
|
||||
@@ -34,7 +33,6 @@ static void hahen_draw(ep_class* i_this) {
|
||||
}
|
||||
}
|
||||
|
||||
/* 804682F8-80468A70 000178 0778+00 2/2 0/0 0/0 .text move_calc__FP8ep_classP10ep_hahen_s */
|
||||
static int move_calc(ep_class* i_this, ep_hahen_s* hahen_s) {
|
||||
fopAc_ac_c* a_this = i_this;
|
||||
static u16 w_eff_id[4] = {
|
||||
@@ -153,12 +151,10 @@ static int move_calc(ep_class* i_this, ep_hahen_s* hahen_s) {
|
||||
return rv;
|
||||
}
|
||||
|
||||
/* 80468A70-80468A90 0008F0 0020+00 1/1 0/0 0/0 .text hahen_normal__FP8ep_classP10ep_hahen_s */
|
||||
static void hahen_normal(ep_class* i_this, ep_hahen_s* hahen_s) {
|
||||
move_calc(i_this, hahen_s);
|
||||
}
|
||||
|
||||
/* 80468A90-80468E50 000910 03C0+00 1/1 0/0 0/0 .text hahen_water__FP8ep_classP10ep_hahen_s */
|
||||
static void hahen_water(ep_class* i_this, ep_hahen_s* hahen_s) {
|
||||
fopAc_ac_c* a_this = i_this;
|
||||
fopAc_ac_c* player = dComIfGp_getPlayer(0);
|
||||
@@ -214,7 +210,6 @@ static void hahen_water(ep_class* i_this, ep_hahen_s* hahen_s) {
|
||||
fopAcM_effHamonSet(&hahen_s->field_0xa0, &hahen_s->field_0x4, 1.0f, 0.05f);
|
||||
}
|
||||
|
||||
/* 80468E50-80469034 000CD0 01E4+00 1/1 0/0 0/0 .text hahen_carry__FP8ep_classP10ep_hahen_s */
|
||||
static void hahen_carry(ep_class* i_this, ep_hahen_s* hahen_s) {
|
||||
fopAc_ac_c* player = dComIfGp_getPlayer(0);
|
||||
|
||||
@@ -257,7 +252,6 @@ static void hahen_carry(ep_class* i_this, ep_hahen_s* hahen_s) {
|
||||
}
|
||||
}
|
||||
|
||||
/* 80469034-804690F8 000EB4 00C4+00 1/1 0/0 0/0 .text hahen_cast__FP8ep_classP10ep_hahen_s */
|
||||
static void hahen_cast(ep_class* i_this, ep_hahen_s* hahen_s) {
|
||||
cXyz local_1c, local_28;
|
||||
|
||||
@@ -279,7 +273,6 @@ static void hahen_cast(ep_class* i_this, ep_hahen_s* hahen_s) {
|
||||
dComIfG_Ccsp()->Set(&i_this->mSph2);
|
||||
}
|
||||
|
||||
/* 804690F8-80469568 000F78 0470+00 1/1 0/0 0/0 .text hahen_move__FP8ep_class */
|
||||
static void hahen_move(ep_class* i_this) {
|
||||
fopAc_ac_c* a_this = i_this;
|
||||
ep_hahen_s* epHahenS;
|
||||
@@ -355,7 +348,6 @@ static void hahen_move(ep_class* i_this) {
|
||||
}
|
||||
}
|
||||
|
||||
/* 80469568-804695F8 0013E8 0090+00 1/0 0/0 0/0 .text daEp_Draw__FP8ep_class */
|
||||
static int daEp_Draw(ep_class* i_this) {
|
||||
if (i_this->mpModel) {
|
||||
if (i_this->field_0x602 != 1) {
|
||||
@@ -372,7 +364,6 @@ static int daEp_Draw(ep_class* i_this) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 804695F8-80469658 001478 0060+00 2/2 0/0 0/0 .text ep_switch_event_end__FP8ep_class */
|
||||
static BOOL ep_switch_event_end(ep_class* i_this) {
|
||||
int rv = FALSE;
|
||||
if (dComIfGp_evmng_endCheck("SHOKUDAI_SWITCH") != 0) {
|
||||
@@ -382,7 +373,6 @@ static BOOL ep_switch_event_end(ep_class* i_this) {
|
||||
return rv;
|
||||
}
|
||||
|
||||
/* 80469658-80469700 0014D8 00A8+00 1/1 0/0 0/0 .text ep_switch_event_begin__FP8ep_class */
|
||||
static BOOL ep_switch_event_begin(ep_class* i_this) {
|
||||
BOOL rv = 0;
|
||||
|
||||
@@ -399,7 +389,6 @@ static BOOL ep_switch_event_begin(ep_class* i_this) {
|
||||
return rv;
|
||||
}
|
||||
|
||||
/* 80469700-804697F4 001580 00F4+00 1/1 0/0 0/0 .text ep_switch_event_move__FP8ep_class */
|
||||
static int ep_switch_event_move(ep_class* i_this) {
|
||||
static char* actions[2] = {
|
||||
"WAIT",
|
||||
@@ -430,7 +419,6 @@ static int ep_switch_event_move(ep_class* i_this) {
|
||||
return rv;
|
||||
}
|
||||
|
||||
/* 804697F4-80469EDC 001674 06E8+00 1/1 0/0 0/0 .text ep_move__FP8ep_class */
|
||||
static void ep_move(ep_class* i_this) {
|
||||
static u16 l_particle_fire_A[2] = {
|
||||
0x0100, 0x8110,
|
||||
@@ -616,7 +604,6 @@ static void ep_move(ep_class* i_this) {
|
||||
return;
|
||||
}
|
||||
|
||||
/* 80469EDC-8046A0A8 001D5C 01CC+00 1/1 0/0 0/0 .text daEp_set_mtx__FP8ep_class */
|
||||
static void daEp_set_mtx(ep_class* i_this) {
|
||||
if (i_this->mpModel) {
|
||||
f32 fVar1 = 70.0f;
|
||||
@@ -656,7 +643,6 @@ static void daEp_set_mtx(ep_class* i_this) {
|
||||
}
|
||||
}
|
||||
|
||||
/* 8046A0A8-8046A6D4 001F28 062C+00 1/0 0/0 0/0 .text daEp_Execute__FP8ep_class */
|
||||
static int daEp_Execute(ep_class* i_this) {
|
||||
static u16 eff_name[3] = {
|
||||
0x8340, 0x8341, 0x8342,
|
||||
@@ -797,24 +783,20 @@ static int daEp_Execute(ep_class* i_this) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 8046A6D4-8046A6DC 002554 0008+00 1/0 0/0 0/0 .text daEp_IsDelete__FP8ep_class */
|
||||
static int daEp_IsDelete(ep_class* i_this) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 8046A6DC-8046A724 00255C 0048+00 1/0 0/0 0/0 .text daEp_Delete__FP8ep_class */
|
||||
static int daEp_Delete(ep_class* i_this) {
|
||||
dComIfG_resDelete(&i_this->mPhase, "Ep");
|
||||
dKy_plight_cut(&i_this->mLightInf);
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 8046B13C-8046B15C 000044 0020+00 1/1 0/0 0/0 .data model_d */
|
||||
static int model_d[8] = {
|
||||
3,4, 5, 6, 6, 6, 6, 6,
|
||||
};
|
||||
|
||||
/* 8046A724-8046A858 0025A4 0134+00 1/1 0/0 0/0 .text daEp_CreateHeap__FP10fopAc_ac_c */
|
||||
static int daEp_CreateHeap(fopAc_ac_c* a_this) {
|
||||
ep_class* i_this = (ep_class*)a_this;
|
||||
|
||||
@@ -843,7 +825,6 @@ static int daEp_CreateHeap(fopAc_ac_c* a_this) {
|
||||
|
||||
}
|
||||
|
||||
/* 8046A858-8046A8D4 0026D8 007C+00 1/1 0/0 0/0 .text daEp_CreateInit__FP10fopAc_ac_c */
|
||||
static void daEp_CreateInit(fopAc_ac_c* a_this) {
|
||||
ep_class* i_this = (ep_class*)a_this;
|
||||
|
||||
@@ -857,7 +838,6 @@ static void daEp_CreateInit(fopAc_ac_c* a_this) {
|
||||
i_this->field_0x602 = 0;
|
||||
}
|
||||
|
||||
/* 8046A8D4-8046AB2C 002754 0258+00 1/0 0/0 0/0 .text daEp_Create__FP10fopAc_ac_c */
|
||||
static int daEp_Create(fopAc_ac_c* a_this) {
|
||||
static dCcD_SrcSph sph_src = {
|
||||
{
|
||||
@@ -966,7 +946,6 @@ static int daEp_Create(fopAc_ac_c* a_this) {
|
||||
return rv;
|
||||
}
|
||||
|
||||
/* 8046B220-8046B240 -00001 0020+00 1/0 0/0 0/0 .data l_daEp_Method */
|
||||
static actor_method_class l_daEp_Method = {
|
||||
(process_method_func)daEp_Create,
|
||||
(process_method_func)daEp_Delete,
|
||||
@@ -975,7 +954,6 @@ static actor_method_class l_daEp_Method = {
|
||||
(process_method_func)daEp_Draw,
|
||||
};
|
||||
|
||||
/* 8046B240-8046B270 -00001 0030+00 0/0 0/0 1/0 .data g_profile_EP */
|
||||
extern actor_process_profile_definition g_profile_EP = {
|
||||
fpcLy_CURRENT_e,
|
||||
7,
|
||||
|
||||
Reference in New Issue
Block a user