mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-08-21 13:36:50 -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:
@@ -8,23 +8,19 @@
|
||||
#include "d/actor/d_a_obj_fireWood2.h"
|
||||
#include "m_Do/m_Do_hostIO.h"
|
||||
|
||||
/* 80BE824C-80BE8288 0000EC 003C+00 1/1 0/0 0/0 .text __ct__17daFireWood2_HIO_cFv */
|
||||
daFireWood2_HIO_c::daFireWood2_HIO_c() {
|
||||
mFlameOffsetY = 15.0f;
|
||||
mCollisionDiameter = 25.0f;
|
||||
mCollisionHeight = 50.0f;
|
||||
}
|
||||
|
||||
/* 80BE82D0-80BE8328 000170 0058+00 2/2 0/0 0/0 .text setBaseMtx__13daFireWood2_cFv */
|
||||
void daFireWood2_c::setBaseMtx() {
|
||||
mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
|
||||
mDoMtx_stack_c::ZXYrotM(current.angle.x, current.angle.y, current.angle.z);
|
||||
}
|
||||
|
||||
/* 80BE908C-80BE909C 000014 0010+00 3/3 0/0 0/0 .bss l_HIO */
|
||||
static daFireWood2_HIO_c l_HIO;
|
||||
|
||||
/* 80BE8F40-80BE8F70 00000C 0030+00 1/1 0/0 0/0 .rodata mCcDObjInfo__13daFireWood2_c */
|
||||
const dCcD_SrcGObjInf daFireWood2_c::mCcDObjInfo = {
|
||||
{0, {{AT_TYPE_LANTERN_SWING, 0, 0x13}, {0xD8FBFFFF, 0x1F}, {0x79}}},
|
||||
{dCcD_SE_SWORD, 0, 0, dCcD_MTRL_NONE, 0},
|
||||
@@ -32,7 +28,6 @@ const dCcD_SrcGObjInf daFireWood2_c::mCcDObjInfo = {
|
||||
{0},
|
||||
};
|
||||
|
||||
/* 80BE8F98-80BE8FDC 000000 0044+00 2/2 0/0 0/0 .data mCcDCyl__13daFireWood2_c */
|
||||
dCcD_SrcCyl daFireWood2_c::mCcDCyl = {
|
||||
daFireWood2_c::mCcDObjInfo,
|
||||
{
|
||||
@@ -42,13 +37,11 @@ dCcD_SrcCyl daFireWood2_c::mCcDCyl = {
|
||||
} // mCyl
|
||||
};
|
||||
|
||||
/* 80BE8FDC-80BE8FF4 000044 0018+00 1/1 0/0 0/0 .data l_cull_box */
|
||||
static cull_box l_cull_box = {
|
||||
{-50.0f, 0.0f, -50.0f},
|
||||
{50.0f, 100.0f, 50.0f},
|
||||
};
|
||||
|
||||
/* 80BE8328-80BE85B0 0001C8 0288+00 1/1 0/0 0/0 .text create__13daFireWood2_cFv */
|
||||
int daFireWood2_c::create() {
|
||||
fopAcM_ct(this, daFireWood2_c);
|
||||
|
||||
@@ -107,7 +100,6 @@ int daFireWood2_c::create() {
|
||||
return cPhs_COMPLEATE_e;
|
||||
}
|
||||
|
||||
/* 80BE8640-80BE86CC 0004E0 008C+00 1/1 0/0 0/0 .text lightInit__13daFireWood2_cFv */
|
||||
void daFireWood2_c::lightInit() {
|
||||
mLightPos = mFlamePos;
|
||||
mLightPos.y += 10.0f;
|
||||
@@ -124,22 +116,18 @@ void daFireWood2_c::lightInit() {
|
||||
}
|
||||
}
|
||||
|
||||
/* 80BE86CC-80BE86FC 00056C 0030+00 2/2 0/0 0/0 .text setLight__13daFireWood2_cFv */
|
||||
void daFireWood2_c::setLight() {
|
||||
if (mIsPLight) {
|
||||
dKy_plight_set(&mLightInfluence);
|
||||
}
|
||||
}
|
||||
|
||||
/* 80BE86FC-80BE872C 00059C 0030+00 1/1 0/0 0/0 .text cutLight__13daFireWood2_cFv */
|
||||
void daFireWood2_c::cutLight() {
|
||||
if (mIsPLight) {
|
||||
dKy_plight_cut(&mLightInfluence);
|
||||
}
|
||||
}
|
||||
|
||||
/* 80BE872C-80BE87DC 0005CC 00B0+00 1/1 0/0 0/0 .text pointLightProc__13daFireWood2_cFv
|
||||
*/
|
||||
void daFireWood2_c::pointLightProc() {
|
||||
if (!mIsPLight) {
|
||||
GXColor color = {0xBC, 0x66, 0x42, 0xFF};
|
||||
@@ -156,7 +144,6 @@ void daFireWood2_c::pointLightProc() {
|
||||
}
|
||||
}
|
||||
|
||||
/* 80BE87DC-80BE8D98 00067C 05BC+00 1/1 0/0 0/0 .text Execute__13daFireWood2_cFv */
|
||||
int daFireWood2_c::Execute() {
|
||||
u8 is_switch = fopAcM_isSwitch(this, fopAcM_GetParam(this) & 0xFF);
|
||||
|
||||
@@ -251,12 +238,10 @@ int daFireWood2_c::Execute() {
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 80BE8D98-80BE8DA0 000C38 0008+00 1/1 0/0 0/0 .text Draw__13daFireWood2_cFv */
|
||||
int daFireWood2_c::Draw() {
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 80BE8DA0-80BE8DD4 000C40 0034+00 1/1 0/0 0/0 .text Delete__13daFireWood2_cFv */
|
||||
int daFireWood2_c::Delete() {
|
||||
if (mIsPLight) {
|
||||
dKy_plight_cut(&mLightInfluence);
|
||||
@@ -265,36 +250,28 @@ int daFireWood2_c::Delete() {
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 80BE8DD4-80BE8DF4 000C74 0020+00 1/0 0/0 0/0 .text daFireWood2_Draw__FP13daFireWood2_c
|
||||
*/
|
||||
static int daFireWood2_Draw(daFireWood2_c* i_this) {
|
||||
return i_this->Draw();
|
||||
}
|
||||
|
||||
/* 80BE8DF4-80BE8E14 000C94 0020+00 1/0 0/0 0/0 .text daFireWood2_Execute__FP13daFireWood2_c */
|
||||
static int daFireWood2_Execute(daFireWood2_c* i_this) {
|
||||
return i_this->Execute();
|
||||
}
|
||||
|
||||
/* 80BE8E14-80BE8E34 000CB4 0020+00 1/0 0/0 0/0 .text daFireWood2_Delete__FP13daFireWood2_c */
|
||||
static int daFireWood2_Delete(daFireWood2_c* i_this) {
|
||||
return i_this->Delete();
|
||||
}
|
||||
|
||||
/* 80BE8E34-80BE8E54 000CD4 0020+00 1/0 0/0 0/0 .text daFireWood2_Create__FP10fopAc_ac_c
|
||||
*/
|
||||
static int daFireWood2_Create(fopAc_ac_c* i_this) {
|
||||
return ((daFireWood2_c*)i_this)->create();
|
||||
}
|
||||
|
||||
/* 80BE8FF4-80BE9014 -00001 0020+00 1/0 0/0 0/0 .data l_daFireWood2_Method */
|
||||
static actor_method_class l_daFireWood2_Method = {
|
||||
(process_method_func)daFireWood2_Create, (process_method_func)daFireWood2_Delete,
|
||||
(process_method_func)daFireWood2_Execute, (process_method_func)NULL,
|
||||
(process_method_func)daFireWood2_Draw,
|
||||
};
|
||||
|
||||
/* 80BE9014-80BE9044 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_FireWood2 */
|
||||
extern actor_process_profile_definition g_profile_Obj_FireWood2 = {
|
||||
fpcLy_CURRENT_e, // mLayerID
|
||||
3, // mListID
|
||||
|
||||
Reference in New Issue
Block a user