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:
@@ -13,7 +13,6 @@
|
||||
#include "d/d_meter2_info.h"
|
||||
#include "d/d_msg_object.h"
|
||||
|
||||
/* 80D06C1C-80D06C20 -00001 0004+00 4/4 0/0 0/0 .data l_arcName */
|
||||
static char* l_arcName = "Table";
|
||||
|
||||
void daObjTable_c::initBaseMtx() {
|
||||
@@ -42,36 +41,27 @@ int daObjTable_c::create() {
|
||||
return phase_state;
|
||||
}
|
||||
|
||||
/* 80D06438-80D06464 000078 002C+00 1/0 0/0 0/0 .text daObjTable_Draw__FP12daObjTable_c
|
||||
*/
|
||||
static int daObjTable_Draw(daObjTable_c* i_this) {
|
||||
return i_this->Draw();
|
||||
}
|
||||
|
||||
/* 80D06464-80D06484 0000A4 0020+00 1/0 0/0 0/0 .text daObjTable_Execute__FP12daObjTable_c */
|
||||
static int daObjTable_Execute(daObjTable_c* i_this) {
|
||||
return i_this->MoveBGExecute();
|
||||
}
|
||||
|
||||
/* 80D06484-80D0648C 0000C4 0008+00 1/0 0/0 0/0 .text daObjTable_IsDelete__FP12daObjTable_c */
|
||||
static int daObjTable_IsDelete(daObjTable_c* i_this) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 80D0648C-80D064B0 0000CC 0024+00 1/0 0/0 0/0 .text daObjTable_Delete__FP12daObjTable_c
|
||||
*/
|
||||
static int daObjTable_Delete(daObjTable_c* i_this) {
|
||||
i_this->MoveBGDelete();
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 80D064B0-80D06560 0000F0 00B0+00 1/0 0/0 0/0 .text daObjTable_Create__FP10fopAc_ac_c
|
||||
*/
|
||||
static int daObjTable_Create(fopAc_ac_c* i_this) {
|
||||
return static_cast<daObjTable_c*>(i_this)->create();
|
||||
}
|
||||
|
||||
/* 80D06560-80D065D0 0001A0 0070+00 1/0 0/0 0/0 .text CreateHeap__12daObjTable_cFv */
|
||||
int daObjTable_c::CreateHeap() {
|
||||
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 5);
|
||||
mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
|
||||
@@ -82,7 +72,6 @@ int daObjTable_c::CreateHeap() {
|
||||
return true;
|
||||
}
|
||||
|
||||
/* 80D065D0-80D0695C 000210 038C+00 1/0 0/0 0/0 .text Create__12daObjTable_cFv */
|
||||
int daObjTable_c::Create() {
|
||||
fopAcM_setCullSizeBox2(this, mpModel->getModelData());
|
||||
if (dKy_darkworld_check() || dComIfGs_isStageSwitch(0x18, 0x4b)) {
|
||||
@@ -148,8 +137,6 @@ int daObjTable_c::Create() {
|
||||
return cPhs_COMPLEATE_e;
|
||||
}
|
||||
|
||||
/* 80D0695C-80D06AD8 00059C 017C+00 1/0 0/0 0/0 .text Execute__12daObjTable_cFPPA3_A4_f
|
||||
*/
|
||||
int daObjTable_c::Execute(Mtx** i_mtx) {
|
||||
eventInfo.onCondition(1);
|
||||
|
||||
@@ -180,7 +167,6 @@ int daObjTable_c::Execute(Mtx** i_mtx) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 80D06AD8-80D06BC8 000718 00F0+00 1/0 0/0 0/0 .text Draw__12daObjTable_cFv */
|
||||
int daObjTable_c::Draw() {
|
||||
g_env_light.settingTevStruct(0x10, ¤t.pos, &tevStr);
|
||||
g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
|
||||
@@ -196,20 +182,17 @@ int daObjTable_c::Draw() {
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 80D06BC8-80D06BFC 000808 0034+00 1/0 0/0 0/0 .text Delete__12daObjTable_cFv */
|
||||
int daObjTable_c::Delete() {
|
||||
dComIfG_resDelete(&mPhaseReq, l_arcName);
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 80D06C20-80D06C40 -00001 0020+00 1/0 0/0 0/0 .data l_daObjTable_Method */
|
||||
static actor_method_class l_daObjTable_Method = {
|
||||
(process_method_func)daObjTable_Create, (process_method_func)daObjTable_Delete,
|
||||
(process_method_func)daObjTable_Execute, (process_method_func)daObjTable_IsDelete,
|
||||
(process_method_func)daObjTable_Draw,
|
||||
};
|
||||
|
||||
/* 80D06C40-80D06C70 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Table */
|
||||
extern actor_process_profile_definition g_profile_Obj_Table = {
|
||||
fpcLy_CURRENT_e,
|
||||
3,
|
||||
|
||||
Reference in New Issue
Block a user