mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-08-16 20:27:36 -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:
@@ -9,7 +9,6 @@
|
||||
#include "d/d_com_inf_game.h"
|
||||
#include "d/d_procname.h"
|
||||
|
||||
/* 80BAD474-80BAD4B8 000000 0044+00 2/2 0/0 0/0 .rodata l_cyl_src */
|
||||
const static dCcD_SrcCyl l_cyl_src = {
|
||||
{
|
||||
{0x0, {{0x0, 0x0, 0x1f}, {0xd8000000, 0x11}, 0x78}}, // mObj
|
||||
@@ -24,16 +23,13 @@ const static dCcD_SrcCyl l_cyl_src = {
|
||||
} // mCyl
|
||||
};
|
||||
|
||||
/* 80BAD4D4-80BAD4D8 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */
|
||||
static char* l_arcName = "M_BBox";
|
||||
|
||||
/* 80BACD38-80BACD74 000078 003C+00 1/1 0/0 0/0 .text initBaseMtx__11daObjBBox_cFv */
|
||||
void daObjBBox_c::initBaseMtx() {
|
||||
mpModel->setBaseScale(scale);
|
||||
setBaseMtx();
|
||||
}
|
||||
|
||||
/* 80BACD74-80BACDD8 0000B4 0064+00 2/2 0/0 0/0 .text setBaseMtx__11daObjBBox_cFv */
|
||||
void daObjBBox_c::setBaseMtx() {
|
||||
mDoMtx_stack_c::transS(current.pos);
|
||||
mDoMtx_stack_c::YrotM(shape_angle.y);
|
||||
@@ -41,7 +37,6 @@ void daObjBBox_c::setBaseMtx() {
|
||||
MTXCopy(mDoMtx_stack_c::get(), mBgMtx);
|
||||
}
|
||||
|
||||
/* 80BACDD8-80BACE50 000118 0078+00 1/0 0/0 0/0 .text Create__11daObjBBox_cFv */
|
||||
int daObjBBox_c::Create() {
|
||||
initBaseMtx();
|
||||
fopAcM_SetMtx(this, mpModel->mBaseTransformMtx);
|
||||
@@ -52,14 +47,12 @@ int daObjBBox_c::Create() {
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 80BACE50-80BACEC0 000190 0070+00 1/0 0/0 0/0 .text CreateHeap__11daObjBBox_cFv */
|
||||
int daObjBBox_c::CreateHeap() {
|
||||
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4);
|
||||
mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
|
||||
return mpModel != NULL ? 1 : 0;
|
||||
}
|
||||
|
||||
/* 80BACEC0-80BAD030 000200 0170+00 1/1 0/0 0/0 .text create1st__11daObjBBox_cFv */
|
||||
int daObjBBox_c::create1st() {
|
||||
fopAcM_ct(this, daObjBBox_c);
|
||||
|
||||
@@ -76,7 +69,6 @@ int daObjBBox_c::create1st() {
|
||||
return phase;
|
||||
}
|
||||
|
||||
/* 80BAD0C0-80BAD234 000400 0174+00 1/0 0/0 0/0 .text Execute__11daObjBBox_cFPPA3_A4_f */
|
||||
int daObjBBox_c::Execute(Mtx** i_mtx) {
|
||||
static const u16 particle_id[5] = {
|
||||
0x83B0, 0x83B1, 0x83B2, 0x83B3, 0x83B4,
|
||||
@@ -102,7 +94,6 @@ int daObjBBox_c::Execute(Mtx** i_mtx) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 80BAD234-80BAD2D8 000574 00A4+00 1/0 0/0 0/0 .text Draw__11daObjBBox_cFv */
|
||||
int daObjBBox_c::Draw() {
|
||||
g_env_light.settingTevStruct(0x10, ¤t.pos, &tevStr);
|
||||
g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
|
||||
@@ -112,34 +103,28 @@ int daObjBBox_c::Draw() {
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 80BAD2D8-80BAD30C 000618 0034+00 1/0 0/0 0/0 .text Delete__11daObjBBox_cFv */
|
||||
int daObjBBox_c::Delete() {
|
||||
dComIfG_resDelete(&mPhaseReq, l_arcName);
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 80BAD30C-80BAD400 00064C 00F4+00 1/0 0/0 0/0 .text daObjBBox_create1st__FP11daObjBBox_c */
|
||||
static int daObjBBox_create1st(daObjBBox_c* i_this) {
|
||||
fopAcM_ct(i_this, daObjBBox_c);
|
||||
return i_this->create1st();
|
||||
}
|
||||
|
||||
/* 80BAD400-80BAD420 000740 0020+00 1/0 0/0 0/0 .text daObjBBox_MoveBGDelete__FP11daObjBBox_c */
|
||||
static int daObjBBox_MoveBGDelete(daObjBBox_c* i_this) {
|
||||
return i_this->MoveBGDelete();
|
||||
}
|
||||
|
||||
/* 80BAD420-80BAD440 000760 0020+00 1/0 0/0 0/0 .text daObjBBox_MoveBGExecute__FP11daObjBBox_c */
|
||||
static int daObjBBox_MoveBGExecute(daObjBBox_c* i_this) {
|
||||
return i_this->MoveBGExecute();
|
||||
}
|
||||
|
||||
/* 80BAD440-80BAD46C 000780 002C+00 1/0 0/0 0/0 .text daObjBBox_MoveBGDraw__FP11daObjBBox_c */
|
||||
static int daObjBBox_MoveBGDraw(daObjBBox_c* i_this) {
|
||||
return i_this->MoveBGDraw();
|
||||
}
|
||||
|
||||
/* 80BAD4D8-80BAD4F8 -00001 0020+00 1/0 0/0 0/0 .data daObjBBox_METHODS */
|
||||
static actor_method_class daObjBBox_METHODS = {
|
||||
(process_method_func)daObjBBox_create1st,
|
||||
(process_method_func)daObjBBox_MoveBGDelete,
|
||||
@@ -148,7 +133,6 @@ static actor_method_class daObjBBox_METHODS = {
|
||||
(process_method_func)daObjBBox_MoveBGDraw,
|
||||
};
|
||||
|
||||
/* 80BAD4F8-80BAD528 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_BBox */
|
||||
extern actor_process_profile_definition g_profile_Obj_BBox = {
|
||||
fpcLy_CURRENT_e,
|
||||
3,
|
||||
|
||||
Reference in New Issue
Block a user