mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-06-24 23:53:12 -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:
@@ -7,20 +7,16 @@
|
||||
|
||||
#include "d/actor/d_a_obj_timeFire.h"
|
||||
#include "d/d_com_inf_game.h"
|
||||
#include "dol2asm.h"
|
||||
|
||||
/* 80D0E8EC-80D0E910 0000EC 0024+00 1/1 0/0 0/0 .text __ct__16daTimeFire_HIO_cFv */
|
||||
daTimeFire_HIO_c::daTimeFire_HIO_c() {
|
||||
field_0x4 = 20;
|
||||
}
|
||||
|
||||
/* 80D0E958-80D0E9B0 000158 0058+00 1/1 0/0 0/0 .text setBaseMtx__12daTimeFire_cFv */
|
||||
void daTimeFire_c::setBaseMtx() {
|
||||
mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
|
||||
mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z);
|
||||
}
|
||||
|
||||
/* 80D0E9B0-80D0EACC 0001B0 011C+00 1/1 0/0 0/0 .text create__12daTimeFire_cFv */
|
||||
int daTimeFire_c::create() {
|
||||
fopAcM_ct(this, daTimeFire_c);
|
||||
setBaseMtx();
|
||||
@@ -44,7 +40,6 @@ int daTimeFire_c::create() {
|
||||
return cPhs_COMPLEATE_e;
|
||||
}
|
||||
|
||||
/* 80D0EACC-80D0EB40 0002CC 0074+00 1/1 0/0 0/0 .text lightInit__12daTimeFire_cFv */
|
||||
void daTimeFire_c::lightInit() {
|
||||
field_0x594 = field_0x570;
|
||||
field_0x594.y += 10.0f;
|
||||
@@ -56,17 +51,14 @@ void daTimeFire_c::lightInit() {
|
||||
mLightInfluence.mFluctuation = 1.0f;
|
||||
}
|
||||
|
||||
/* 80D0EB40-80D0EB64 000340 0024+00 2/2 0/0 0/0 .text setLight__12daTimeFire_cFv */
|
||||
void daTimeFire_c::setLight() {
|
||||
dKy_plight_set(&mLightInfluence);
|
||||
}
|
||||
|
||||
/* 80D0EB64-80D0EB88 000364 0024+00 2/2 0/0 0/0 .text cutLight__12daTimeFire_cFv */
|
||||
void daTimeFire_c::cutLight() {
|
||||
dKy_plight_cut(&mLightInfluence);
|
||||
}
|
||||
|
||||
/* 80D0EB88-80D0ED68 000388 01E0+00 1/1 0/0 0/0 .text Execute__12daTimeFire_cFv */
|
||||
int daTimeFire_c::Execute() {
|
||||
bool prevFireCheck = field_0x56c;
|
||||
field_0x56c = fireCheck(0);
|
||||
@@ -89,7 +81,6 @@ int daTimeFire_c::Execute() {
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 80D0ED68-80D0EF88 000568 0220+00 2/2 0/0 0/0 .text fireCheck__12daTimeFire_cFUc */
|
||||
bool daTimeFire_c::fireCheck(u8 param_1) {
|
||||
bool inTime = false;
|
||||
BOOL isSw;
|
||||
@@ -128,44 +119,33 @@ bool daTimeFire_c::fireCheck(u8 param_1) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* 80D0EF88-80D0EF90 000788 0008+00 1/1 0/0 0/0 .text Draw__12daTimeFire_cFv */
|
||||
int daTimeFire_c::Draw() {
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 80D0EF90-80D0EFB8 000790 0028+00 1/1 0/0 0/0 .text Delete__12daTimeFire_cFv */
|
||||
int daTimeFire_c::Delete() {
|
||||
dKy_plight_cut(&mLightInfluence);
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 80D0EFB8-80D0EFD8 0007B8 0020+00 1/0 0/0 0/0 .text daTimeFire_Draw__FP12daTimeFire_c
|
||||
*/
|
||||
static int daTimeFire_Draw(daTimeFire_c* i_this) {
|
||||
return i_this->Draw();
|
||||
}
|
||||
|
||||
/* 80D0EFD8-80D0EFF8 0007D8 0020+00 1/0 0/0 0/0 .text daTimeFire_Execute__FP12daTimeFire_c */
|
||||
static int daTimeFire_Execute(daTimeFire_c* i_this) {
|
||||
return i_this->Execute();
|
||||
}
|
||||
|
||||
/* 80D0EFF8-80D0F018 0007F8 0020+00 1/0 0/0 0/0 .text daTimeFire_Delete__FP12daTimeFire_c
|
||||
*/
|
||||
static int daTimeFire_Delete(daTimeFire_c* i_this) {
|
||||
return i_this->Delete();
|
||||
}
|
||||
|
||||
/* 80D0F018-80D0F038 000818 0020+00 1/0 0/0 0/0 .text daTimeFire_Create__FP10fopAc_ac_c
|
||||
*/
|
||||
static int daTimeFire_Create(fopAc_ac_c* i_this) {
|
||||
return static_cast<daTimeFire_c*>(i_this)->create();
|
||||
}
|
||||
|
||||
/* 80D0F17C-80D0F184 000014 0008+00 1/1 0/0 0/0 .bss l_HIO */
|
||||
static daTimeFire_HIO_c l_HIO;
|
||||
|
||||
/* 80D0F100-80D0F120 -00001 0020+00 1/0 0/0 0/0 .data l_daTimeFire_Method */
|
||||
static actor_method_class l_daTimeFire_Method = {
|
||||
(process_method_func)daTimeFire_Create,
|
||||
(process_method_func)daTimeFire_Delete,
|
||||
@@ -174,7 +154,6 @@ static actor_method_class l_daTimeFire_Method = {
|
||||
(process_method_func)daTimeFire_Draw,
|
||||
};
|
||||
|
||||
/* 80D0F120-80D0F150 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_TimeFire */
|
||||
extern actor_process_profile_definition g_profile_Obj_TimeFire = {
|
||||
fpcLy_CURRENT_e, // mLayerID
|
||||
7, // mListID
|
||||
|
||||
Reference in New Issue
Block a user