mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-16 20:27:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

project cleanup (#2895)

Browse Source 
* 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:
TakaRikka
2025-11-30 14:23:42 -08:00
committed by GitHub
parent dee0667b5a
commit dfa8efa97b
2375 changed files with 24683 additions and 71069 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_obj_ikada.cpp
-18
View File
@@ -13,12 +13,10 @@ static f32 dummy() {
return 0.0f;
}
/* 80C269B8-80C26A20 000078 0068+00 1/1 0/0 0/0 .text RideOn_Angle__12daObjIkada_cFRsfsf */
void daObjIkada_c::RideOn_Angle(s16& param_1, f32 param_2, s16 param_3, f32 param_4) {
cLib_addCalcAngleS(&param_1, param_3 * (param_2 / param_4), 1, 0x100, 1);
}
/* 80C26A20-80C26C50 0000E0 0230+00 1/1 0/0 0/0 .text Check_RideOn__12daObjIkada_cFv */
BOOL daObjIkada_c::Check_RideOn() {
daPy_py_c* player = daPy_getPlayerActorClass();
cXyz& pos = fopAcM_GetPosition(player);
@@ -46,13 +44,11 @@ BOOL daObjIkada_c::Check_RideOn() {
return FALSE;
}
/* 80C26C50-80C26C7C 000310 002C+00 1/1 0/0 0/0 .text initBaseMtx__12daObjIkada_cFv */
void daObjIkada_c::initBaseMtx() {
fopAcM_SetMtx(this, mpModel->getBaseTRMtx());
setBaseMtx();
}
/* 80C26C7C-80C26CD8 00033C 005C+00 2/2 0/0 0/0 .text setBaseMtx__12daObjIkada_cFv */
void daObjIkada_c::setBaseMtx() {
mDoMtx_stack_c::transS(current.pos);
mDoMtx_stack_c::ZXYrotM(shape_angle);
@@ -60,7 +56,6 @@ void daObjIkada_c::setBaseMtx() {
MTXCopy(mDoMtx_stack_c::get(), mBgMtx);
}
/* 80C26CD8-80C26D3C 000398 0064+00 1/1 0/0 0/0 .text rideCallBack__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c */
static void rideCallBack(dBgW* param_1, fopAc_ac_c* a_this, fopAc_ac_c* param_3) {
daObjIkada_c* i_this = (daObjIkada_c*)a_this;
daPy_py_c* player = daPy_getPlayerActorClass();
@@ -72,32 +67,26 @@ static void rideCallBack(dBgW* param_1, fopAc_ac_c* a_this, fopAc_ac_c* param_3)
i_this->Check_RideOn();
}
/* 80C26D3C-80C26D68 0003FC 002C+00 1/0 0/0 0/0 .text daObjIkada_Draw__FP12daObjIkada_c */
static int daObjIkada_Draw(daObjIkada_c* i_this) {
return i_this->MoveBGDraw();
}
/* 80C26D68-80C26D88 000428 0020+00 1/0 0/0 0/0 .text daObjIkada_Execute__FP12daObjIkada_c */
static int daObjIkada_Execute(daObjIkada_c* i_this) {
return i_this->MoveBGExecute();
}
/* 80C26D88-80C26D90 000448 0008+00 1/0 0/0 0/0 .text daObjIkada_IsDelete__FP12daObjIkada_c */
static int daObjIkada_IsDelete(daObjIkada_c* i_this) {
return 1;
}
/* 80C26D90-80C26DB4 000450 0024+00 1/0 0/0 0/0 .text daObjIkada_Delete__FP12daObjIkada_c */
static int daObjIkada_Delete(daObjIkada_c* i_this) {
fpc_ProcID id = fopAcM_GetID(i_this);
i_this->MoveBGDelete();
return 1;
}
/* 80C27584-80C27588 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */
static char* l_arcName = "M_Ikada";
/* 80C27028-80C270A0 0006E8 0078+00 1/0 0/0 0/0 .text CreateHeap__12daObjIkada_cFv */
int daObjIkada_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, "M_Ikada.bmd");
JUT_ASSERT(82, modelData != NULL);
@@ -136,21 +125,18 @@ cPhs__Step daObjIkada_c::create() {
return phase;
}
/* 80C26DB4-80C26FB8 000474 0204+00 1/0 0/0 0/0 .text daObjIkada_Create__FP10fopAc_ac_c */
static int daObjIkada_Create(fopAc_ac_c* a_this) {
daObjIkada_c* i_this = (daObjIkada_c*)a_this;
fpc_ProcID id = fopAcM_GetID(a_this);
return i_this->create();
}
/* 80C270A0-80C270E0 000760 0040+00 1/0 0/0 0/0 .text Create__12daObjIkada_cFv */
int daObjIkada_c::Create() {
initBaseMtx();
mpBgW->SetRideCallback(rideCallBack);
return cPhs_COMPLEATE_e;
}
/* 80C270E0-80C27400 0007A0 0320+00 1/0 0/0 0/0 .text Execute__12daObjIkada_cFPPA3_A4_f */
int daObjIkada_c::Execute(Mtx** mtx) {
daPy_py_c* player = daPy_getPlayerActorClass();
cXyz& unk = fopAcM_GetPosition(player);
@@ -196,7 +182,6 @@ int daObjIkada_c::Execute(Mtx** mtx) {
return 1;
}
/* 80C27400-80C274A4 000AC0 00A4+00 1/0 0/0 0/0 .text Draw__12daObjIkada_cFv */
int daObjIkada_c::Draw() {
g_env_light.settingTevStruct(16, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -206,13 +191,11 @@ int daObjIkada_c::Draw() {
return 1;
}
/* 80C274A4-80C274D8 000B64 0034+00 1/0 0/0 0/0 .text Delete__12daObjIkada_cFv */
int daObjIkada_c::Delete() {
dComIfG_resDelete(&mPhase, l_arcName);
return 1;
}
/* 80C27588-80C275A8 -00001 0020+00 1/0 0/0 0/0 .data l_daObjIkada_Method */
static actor_method_class l_daObjIkada_Method = {
(process_method_func)daObjIkada_Create,
(process_method_func)daObjIkada_Delete,
@@ -221,7 +204,6 @@ static actor_method_class l_daObjIkada_Method = {
(process_method_func)daObjIkada_Draw,
};
/* 80C275A8-80C275D8 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Ikada */
extern actor_process_profile_definition g_profile_Obj_Ikada = {
fpcLy_CURRENT_e, // mLayerID
3, // mListID