mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-19 05:02:12 -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 434415337d
commit a6e76c0841
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_lv6SwGate.cpp
-31
View File
@@ -29,21 +29,16 @@ void daLv6SwGate_HIO_c::genMessage(JORMContext* context)
}
#endif
/* 80C75754-80C7576C 000014 0018+00 4/4 0/0 0/0 .bss l_HIO */
static daLv6SwGate_HIO_c l_HIO;
/* 80C75530-80C75560 00000C 0030+00 1/1 0/0 0/0 .rodata mCcDObjInfo__13daLv6SwGate_c */
const dCcD_SrcGObjInf daLv6SwGate_c::mCcDObjInfo = {
{0, {{0, 0, 0}, {0x400, 0x11}, {0x79}}}, {1, 0, 0, 0, 0}, {0xA, 0, 0, 0, 0}, {0}
};
/* 80C755B8-80C755FC 000020 0044+00 2/2 0/0 0/0 .data mCcDCyl__13daLv6SwGate_c */
dCcD_SrcCyl daLv6SwGate_c::mCcDCyl = {mCcDObjInfo};
/* 80C755FC-80C75614 000064 0018+00 1/1 0/0 0/0 .data l_cull_box */
static cull_box l_cull_box = {-1200.0f, -300.0f, -100.0f, 1200.0f, 300.0f, 100.0f};
/* 80C74004-80C74158 0001E4 0154+00 2/2 0/0 0/0 .text setBaseMtx__13daLv6SwGate_cFv */
void daLv6SwGate_c::setBaseMtx() {
mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z);
@@ -59,7 +54,6 @@ void daLv6SwGate_c::setBaseMtx() {
MTXCopy(mDoMtx_stack_c::get(), mMtx);
}
/* 80C74158-80C7429C 000338 0144+00 1/0 0/0 0/0 .text CreateHeap__13daLv6SwGate_cFv */
int daLv6SwGate_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("L6SwGate", 4);
JUT_ASSERT(273, modelData != NULL);
@@ -84,7 +78,6 @@ int daLv6SwGate_c::CreateHeap() {
return TRUE;
}
/* 80C7429C-80C744E4 00047C 0248+00 1/1 0/0 0/0 .text create__13daLv6SwGate_cFv */
int daLv6SwGate_c::create() {
fopAcM_ct(this, daLv6SwGate_c);
if (getSw2() != 0xff && fopAcM_isSwitch(this, getSw2())) {
@@ -128,13 +121,10 @@ int daLv6SwGate_c::create() {
return phase;
}
/* 80C74720-80C7476C 000900 004C+00 2/2 0/0 0/0 .text isSwitch__13daLv6SwGate_cFv */
u8 daLv6SwGate_c::isSwitch() {
return fopAcM_isSwitch(this, mUnderylingSwitch) ^ mUnderlyingSwitchState;
}
/* 80C7476C-80C74A3C 00094C 02D0+00 1/0 0/0 0/0 .text Execute__13daLv6SwGate_cFPPA3_A4_f
*/
int daLv6SwGate_c::Execute(Mtx** i_pMTx) {
moveGate();
for (int i = 0; i < 12; i++) {
@@ -181,7 +171,6 @@ enum DALV6SWGATE_C_MODE {
DALV6SWGATE_C_MODE_BREAK,
};
/* 80C74A3C-80C74B48 000C1C 010C+00 1/1 0/0 0/0 .text moveGate__13daLv6SwGate_cFv */
void daLv6SwGate_c::moveGate() {
typedef void (daLv6SwGate_c::*func_call)();
const static func_call mode_proc[] = {
@@ -203,22 +192,18 @@ void daLv6SwGate_c::moveGate() {
(this->*mode_proc[mMode])();
}
/* 80C74B48-80C74B54 000D28 000C+00 3/3 0/0 0/0 .text init_modeWait__13daLv6SwGate_cFv */
void daLv6SwGate_c::init_modeWait() {
mMode = DALV6SWGATE_C_MODE_WAIT;
}
/* 80C74B54-80C74B58 000D34 0004+00 1/0 0/0 0/0 .text modeWait__13daLv6SwGate_cFv */
void daLv6SwGate_c::modeWait() {
return;
}
/* 80C74B58-80C74B64 000D38 000C+00 1/1 0/0 0/0 .text init_modeOpen__13daLv6SwGate_cFv */
void daLv6SwGate_c::init_modeOpen() {
mMode = DALV6SWGATE_C_MODE_OPEN;
}
/* 80C74B64-80C74C7C 000D44 0118+00 1/0 0/0 0/0 .text modeOpen__13daLv6SwGate_cFv */
void daLv6SwGate_c::modeOpen() {
f32 calc = cLib_addCalc(&mMovementAmount, l_HIO.mMovementAmount, 0.1f, l_HIO.mSpeed, 5.0f);
mDoAud_seStartLevel(Z2SE_OBJ_L6_SW_GATE_OP_MV, &current.pos, 0,
@@ -230,14 +215,11 @@ void daLv6SwGate_c::modeOpen() {
}
}
/* 80C74C7C-80C74C94 000E5C 0018+00 1/1 0/0 0/0 .text init_modeClose__13daLv6SwGate_cFv
*/
void daLv6SwGate_c::init_modeClose() {
fopAcM_SetSpeedF(this, 0.0f);
mMode = DALV6SWGATE_C_MODE_CLOSE;
}
/* 80C74C94-80C74DBC 000E74 0128+00 1/0 0/0 0/0 .text modeClose__13daLv6SwGate_cFv */
void daLv6SwGate_c::modeClose() {
int unused = cLib_chaseF(&speedF, l_HIO.mMaximumSpeed, l_HIO.mAcceleration);
f32 calc = cLib_addCalc(&mMovementAmount, 0.0f, 1.0f, fopAcM_GetSpeedF(this), 5.0f);
@@ -250,15 +232,12 @@ void daLv6SwGate_c::modeClose() {
}
}
/* 80C74DBC-80C74E40 000F9C 0084+00 1/1 0/0 0/0 .text init_modeBreak__13daLv6SwGate_cFv
*/
void daLv6SwGate_c::init_modeBreak() {
OS_REPORT("== break! ==\n");
mDoAud_seStart(Z2SE_OBJ_TRAP_BREAK, &current.pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
mMode = DALV6SWGATE_C_MODE_BREAK;
}
/* 80C74E40-80C7524C 001020 040C+00 1/0 0/0 0/0 .text modeBreak__13daLv6SwGate_cFv */
void daLv6SwGate_c::modeBreak() {
cXyz p(-150.0f - mMovementAmount, 0.0f, 0.0f);
mDoMtx_stack_c::ZXYrotS(shape_angle.x, shape_angle.y, shape_angle.z);
@@ -286,7 +265,6 @@ void daLv6SwGate_c::modeBreak() {
fopAcM_delete(this);
}
/* 80C7524C-80C752F8 00142C 00AC+00 1/0 0/0 0/0 .text Draw__13daLv6SwGate_cFv */
int daLv6SwGate_c::Draw() {
g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(mModel1, &tevStr);
@@ -297,7 +275,6 @@ int daLv6SwGate_c::Draw() {
return TRUE;
}
/* 80C752F8-80C75360 0014D8 0068+00 1/0 0/0 0/0 .text Delete__13daLv6SwGate_cFv */
int daLv6SwGate_c::Delete() {
dComIfG_resDelete(&mPhase, "L6SwGate");
if (mpBgW != NULL && mpBgW->ChkUsed()) {
@@ -309,32 +286,25 @@ int daLv6SwGate_c::Delete() {
return TRUE;
}
/* 80C75360-80C7538C 001540 002C+00 1/0 0/0 0/0 .text daLv6SwGate_Draw__FP13daLv6SwGate_c
*/
static int daLv6SwGate_Draw(daLv6SwGate_c* i_this) {
return i_this->MoveBGDraw();
}
/* 80C7538C-80C753AC 00156C 0020+00 1/0 0/0 0/0 .text daLv6SwGate_Execute__FP13daLv6SwGate_c */
static int daLv6SwGate_Execute(daLv6SwGate_c* i_this) {
return i_this->MoveBGExecute();
}
/* 80C753AC-80C753CC 00158C 0020+00 1/0 0/0 0/0 .text daLv6SwGate_Delete__FP13daLv6SwGate_c */
static int daLv6SwGate_Delete(daLv6SwGate_c* i_this) {
fpc_ProcID id = fopAcM_GetID(i_this);
return i_this->MoveBGDelete();
}
/* 80C753CC-80C753EC 0015AC 0020+00 1/0 0/0 0/0 .text daLv6SwGate_Create__FP10fopAc_ac_c
*/
static int daLv6SwGate_Create(fopAc_ac_c* i_this) {
daLv6SwGate_c* this_gate = (daLv6SwGate_c*)i_this;
fpc_ProcID id = fopAcM_GetID(i_this);
return this_gate->create();
}
/* 80C75674-80C75694 -00001 0020+00 1/0 0/0 0/0 .data l_daLv6SwGate_Method */
static actor_method_class l_daLv6SwGate_Method = {
(process_method_func)daLv6SwGate_Create,
(process_method_func)daLv6SwGate_Delete,
@@ -343,7 +313,6 @@ static actor_method_class l_daLv6SwGate_Method = {
(process_method_func)daLv6SwGate_Draw,
};
/* 80C75694-80C756C4 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Lv6SwGate */
extern actor_process_profile_definition g_profile_Obj_Lv6SwGate = {
fpcLy_CURRENT_e, // mLayerID
3, // mListID