mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-08-18 20:57:46 -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,7 +8,6 @@
|
||||
#include "d/actor/d_a_obj_swspinner.h"
|
||||
#include "d/d_procname.h"
|
||||
|
||||
/* 80CFFF78-80D00174 000078 01FC+00 1/1 0/0 0/0 .text search_spinner_sub__FPvPv */
|
||||
static void* search_spinner_sub(void* i_actor, void* i_data) {
|
||||
daSpinner_c* spinner = (daSpinner_c*)i_actor;
|
||||
daObjSwSpinner_c* sw = (daObjSwSpinner_c*)i_data;
|
||||
@@ -31,15 +30,12 @@ static void* search_spinner_sub(void* i_actor, void* i_data) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* 80D00174-80D001CC 000274 0058+00 1/1 0/0 0/0 .text initBaseMtx__16daObjSwSpinner_cFv
|
||||
*/
|
||||
void daObjSwSpinner_c::initBaseMtx() {
|
||||
mpModelA->setBaseScale(scale);
|
||||
mpModelB->setBaseScale(scale);
|
||||
setBaseMtx();
|
||||
}
|
||||
|
||||
/* 80D001CC-80D00284 0002CC 00B8+00 2/2 0/0 0/0 .text setBaseMtx__16daObjSwSpinner_cFv */
|
||||
void daObjSwSpinner_c::setBaseMtx() {
|
||||
mDoMtx_stack_c::transS(current.pos);
|
||||
mDoMtx_stack_c::YrotM(shape_angle.y);
|
||||
@@ -54,7 +50,6 @@ void daObjSwSpinner_c::setBaseMtx() {
|
||||
MTXCopy(mDoMtx_stack_c::get(), mBgMtx);
|
||||
}
|
||||
|
||||
/* 80D00284-80D0035C 000384 00D8+00 1/0 0/0 0/0 .text Create__16daObjSwSpinner_cFv */
|
||||
int daObjSwSpinner_c::Create() {
|
||||
if (fopAcM_isSwitch(this, getSwbit2())) {
|
||||
mPartBHeight = 50.0f;
|
||||
@@ -75,10 +70,8 @@ int daObjSwSpinner_c::Create() {
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 80D00AE0-80D00AE4 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */
|
||||
static char* l_arcName = "P_Sswitch";
|
||||
|
||||
/* 80D0035C-80D00498 00045C 013C+00 1/0 0/0 0/0 .text CreateHeap__16daObjSwSpinner_cFv */
|
||||
int daObjSwSpinner_c::CreateHeap() {
|
||||
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4);
|
||||
JUT_ASSERT(0xED, modelData != NULL);
|
||||
@@ -103,7 +96,6 @@ int daObjSwSpinner_c::CreateHeap() {
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 80D00498-80D00518 000598 0080+00 1/1 0/0 0/0 .text create1st__16daObjSwSpinner_cFv */
|
||||
int daObjSwSpinner_c::create1st() {
|
||||
int phase = dComIfG_resLoad(&mPhase, l_arcName);
|
||||
if (phase == cPhs_COMPLEATE_e) {
|
||||
@@ -116,7 +108,6 @@ int daObjSwSpinner_c::create1st() {
|
||||
return phase;
|
||||
}
|
||||
|
||||
/* 80D00518-80D00890 000618 0378+00 1/0 0/0 0/0 .text Execute__16daObjSwSpinner_cFPPA3_A4_f */
|
||||
int daObjSwSpinner_c::Execute(Mtx** param_0) {
|
||||
daSpinner_c* spinner = NULL;
|
||||
mPrevAngle = shape_angle.y;
|
||||
@@ -187,7 +178,6 @@ int daObjSwSpinner_c::Execute(Mtx** param_0) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 80D00890-80D00954 000990 00C4+00 1/0 0/0 0/0 .text Draw__16daObjSwSpinner_cFv */
|
||||
int daObjSwSpinner_c::Draw() {
|
||||
g_env_light.settingTevStruct(16, ¤t.pos, &tevStr);
|
||||
g_env_light.setLightTevColorType_MAJI(mpModelA, &tevStr);
|
||||
@@ -200,7 +190,6 @@ int daObjSwSpinner_c::Draw() {
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 80D00954-80D009C0 000A54 006C+00 1/0 0/0 0/0 .text Delete__16daObjSwSpinner_cFv */
|
||||
int daObjSwSpinner_c::Delete() {
|
||||
if (mpBgW2 != NULL && mpBgW2->ChkUsed()) {
|
||||
dComIfG_Bgsp().Release(mpBgW2);
|
||||
@@ -210,32 +199,23 @@ int daObjSwSpinner_c::Delete() {
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 80D009C0-80D00A20 000AC0 0060+00 1/0 0/0 0/0 .text
|
||||
* daObjSwSpinner_create1st__FP16daObjSwSpinner_c */
|
||||
static int daObjSwSpinner_create1st(daObjSwSpinner_c* i_this) {
|
||||
fopAcM_ct(i_this, daObjSwSpinner_c);
|
||||
return i_this->create1st();
|
||||
}
|
||||
|
||||
/* 80D00A20-80D00A40 000B20 0020+00 1/0 0/0 0/0 .text
|
||||
* daObjSwSpinner_MoveBGDelete__FP16daObjSwSpinner_c */
|
||||
static int daObjSwSpinner_MoveBGDelete(daObjSwSpinner_c* i_this) {
|
||||
return i_this->MoveBGDelete();
|
||||
}
|
||||
|
||||
/* 80D00A40-80D00A60 000B40 0020+00 1/0 0/0 0/0 .text
|
||||
* daObjSwSpinner_MoveBGExecute__FP16daObjSwSpinner_c */
|
||||
static int daObjSwSpinner_MoveBGExecute(daObjSwSpinner_c* i_this) {
|
||||
return i_this->MoveBGExecute();
|
||||
}
|
||||
|
||||
/* 80D00A60-80D00A8C 000B60 002C+00 1/0 0/0 0/0 .text
|
||||
* daObjSwSpinner_MoveBGDraw__FP16daObjSwSpinner_c */
|
||||
static int daObjSwSpinner_MoveBGDraw(daObjSwSpinner_c* i_this) {
|
||||
return i_this->MoveBGDraw();
|
||||
}
|
||||
|
||||
/* 80D00AE4-80D00B04 -00001 0020+00 1/0 0/0 0/0 .data daObjSwSpinner_METHODS */
|
||||
static actor_method_class daObjSwSpinner_METHODS = {
|
||||
(process_method_func)daObjSwSpinner_create1st,
|
||||
(process_method_func)daObjSwSpinner_MoveBGDelete,
|
||||
@@ -244,7 +224,6 @@ static actor_method_class daObjSwSpinner_METHODS = {
|
||||
(process_method_func)daObjSwSpinner_MoveBGDraw,
|
||||
};
|
||||
|
||||
/* 80D00B04-80D00B34 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_SwSpinner */
|
||||
extern actor_process_profile_definition g_profile_Obj_SwSpinner = {
|
||||
fpcLy_CURRENT_e, // mLayerID
|
||||
3, // mListID
|
||||
|
||||
Reference in New Issue
Block a user