diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2025-11-30 14:23:42 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-11-30 15:23:42 -0700 |
| commit | a6e76c0841cae03cae0c0e6ac75c32f979043093 (patch) | |
| tree | 76b5f590c59c6abdf2c80d0a3d5c0ccb31ebd0fe /src/d/actor/d_a_obj_lv4EdShutter.cpp | |
| parent | 434415337d268e405b09f6b72935a7e918e4cfe7 (diff) | |
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
Diffstat (limited to 'src/d/actor/d_a_obj_lv4EdShutter.cpp')
| -rw-r--r-- | src/d/actor/d_a_obj_lv4EdShutter.cpp | 33 |
1 files changed, 2 insertions, 31 deletions
diff --git a/src/d/actor/d_a_obj_lv4EdShutter.cpp b/src/d/actor/d_a_obj_lv4EdShutter.cpp index 88acd5fbe7..389e2960c9 100644 --- a/src/d/actor/d_a_obj_lv4EdShutter.cpp +++ b/src/d/actor/d_a_obj_lv4EdShutter.cpp @@ -9,8 +9,8 @@ class daLv4EdShutter_HIO_c : public mDoHIO_entry_c { public: - /* 80C5DDAC */ daLv4EdShutter_HIO_c(); - /* 80C5E72C */ virtual ~daLv4EdShutter_HIO_c() {} + daLv4EdShutter_HIO_c(); + virtual ~daLv4EdShutter_HIO_c() {} void genMessage(JORMContext*); @@ -20,7 +20,6 @@ public: /* 0x0E */ u8 field_0xe; }; -/* 80C5DDAC-80C5DDF0 0000EC 0044+00 1/1 0/0 0/0 .text __ct__20daLv4EdShutter_HIO_cFv */ daLv4EdShutter_HIO_c::daLv4EdShutter_HIO_c() { close_max_speed = 80.0f; open_speed_max = 40.0f; @@ -28,7 +27,6 @@ daLv4EdShutter_HIO_c::daLv4EdShutter_HIO_c() { field_0xe = 4; } -/* 80C5DE38-80C5DEC8 000178 0090+00 2/2 0/0 0/0 .text setBaseMtx__16daLv4EdShutter_cFv */ void daLv4EdShutter_c::setBaseMtx() { mDoMtx_stack_c::transS(current.pos.x, current.pos.y + mMovePos, current.pos.z); mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, 0); @@ -36,7 +34,6 @@ void daLv4EdShutter_c::setBaseMtx() { mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); } -/* 80C5DEC8-80C5DF34 000208 006C+00 1/0 0/0 0/0 .text CreateHeap__16daLv4EdShutter_cFv */ int daLv4EdShutter_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("P_AShtr", 4); JUT_ASSERT(165, modelData != NULL); @@ -48,7 +45,6 @@ int daLv4EdShutter_c::CreateHeap() { return 1; } -/* 80C5DF34-80C5E0A4 000274 0170+00 1/1 0/0 0/0 .text create__16daLv4EdShutter_cFv */ int daLv4EdShutter_c::create() { fopAcM_ct(this, daLv4EdShutter_c); @@ -79,7 +75,6 @@ int daLv4EdShutter_c::create() { return phase_state; } -/* 80C5E0A4-80C5E0F4 0003E4 0050+00 1/0 0/0 0/0 .text Execute__16daLv4EdShutter_cFPPA3_A4_f */ int daLv4EdShutter_c::Execute(Mtx** param_0) { move(); *param_0 = &mpModel->getBaseTRMtx(); @@ -87,10 +82,8 @@ int daLv4EdShutter_c::Execute(Mtx** param_0) { return 1; } -/* 80C5EA64-80C5EA74 000014 0010+00 3/3 0/0 0/0 .bss l_HIO */ static daLv4EdShutter_HIO_c l_HIO; -/* 80C5E0F4-80C5E1B0 000434 00BC+00 1/1 0/0 0/0 .text move__16daLv4EdShutter_cFv */ void daLv4EdShutter_c::move() { static void (daLv4EdShutter_c::*mode_proc[])() = { &daLv4EdShutter_c::modeWait, @@ -102,14 +95,11 @@ void daLv4EdShutter_c::move() { (this->*mode_proc[mMode])(); } -/* 80C5E1B0-80C5E1C8 0004F0 0018+00 3/3 0/0 0/0 .text init_modeWait__16daLv4EdShutter_cFv - */ void daLv4EdShutter_c::init_modeWait() { mWaitTimer = getWaitTime(); mMode = 0; } -/* 80C5E1C8-80C5E2E0 000508 0118+00 1/0 0/0 0/0 .text modeWait__16daLv4EdShutter_cFv */ void daLv4EdShutter_c::modeWait() { if (mStatus == 0) { if (fopAcM_isSwitch(this, mCloseSw)) { @@ -136,8 +126,6 @@ void daLv4EdShutter_c::modeWait() { } } -/* 80C5E2E0-80C5E394 000620 00B4+00 1/1 0/0 0/0 .text init_modeOpen__16daLv4EdShutter_cFv - */ void daLv4EdShutter_c::init_modeOpen() { mMoveSpeed = l_HIO.open_speed_max; @@ -147,7 +135,6 @@ void daLv4EdShutter_c::init_modeOpen() { mMode = 1; } -/* 80C5E394-80C5E464 0006D4 00D0+00 1/0 0/0 0/0 .text modeOpen__16daLv4EdShutter_cFv */ void daLv4EdShutter_c::modeOpen() { f32 remaining = cLib_addCalc(&mMovePos, -300.0f, 0.3f, mMoveSpeed, 5.0f); if (remaining == 0.0f) { @@ -163,7 +150,6 @@ void daLv4EdShutter_c::modeOpen() { } } -/* 80C5E464-80C5E518 0007A4 00B4+00 1/1 0/0 0/0 .text init_modeClose__16daLv4EdShutter_cFv */ void daLv4EdShutter_c::init_modeClose() { mMoveSpeed = l_HIO.close_max_speed; @@ -173,7 +159,6 @@ void daLv4EdShutter_c::init_modeClose() { mMode = 2; } -/* 80C5E518-80C5E584 000858 006C+00 1/0 0/0 0/0 .text modeClose__16daLv4EdShutter_cFv */ void daLv4EdShutter_c::modeClose() { f32 remaining = cLib_addCalc(&mMovePos, 0.0f, 0.3f, mMoveSpeed, 5.0f); if (remaining == 0.0f) { @@ -182,16 +167,12 @@ void daLv4EdShutter_c::modeClose() { } } -/* 80C5E584-80C5E590 0008C4 000C+00 2/2 0/0 0/0 .text init_modeEnd__16daLv4EdShutter_cFv - */ void daLv4EdShutter_c::init_modeEnd() { mMode = 3; } -/* 80C5E590-80C5E594 0008D0 0004+00 1/0 0/0 0/0 .text modeEnd__16daLv4EdShutter_cFv */ void daLv4EdShutter_c::modeEnd() {} -/* 80C5E594-80C5E5CC 0008D4 0038+00 2/1 0/0 0/0 .text eventStart__16daLv4EdShutter_cFv */ bool daLv4EdShutter_c::eventStart() { if (mStatus == 0) { init_modeClose(); @@ -202,7 +183,6 @@ bool daLv4EdShutter_c::eventStart() { return true; } -/* 80C5E5CC-80C5E670 00090C 00A4+00 1/0 0/0 0/0 .text Draw__16daLv4EdShutter_cFv */ int daLv4EdShutter_c::Draw() { g_env_light.settingTevStruct(16, ¤t.pos, &tevStr); g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr); @@ -213,35 +193,27 @@ int daLv4EdShutter_c::Draw() { return 1; } -/* 80C5E670-80C5E6A0 0009B0 0030+00 1/0 0/0 0/0 .text Delete__16daLv4EdShutter_cFv */ int daLv4EdShutter_c::Delete() { dComIfG_resDelete(&mPhase, "P_AShtr"); return 1; } -/* 80C5E6A0-80C5E6CC 0009E0 002C+00 1/0 0/0 0/0 .text daLv4EdShutter_Draw__FP16daLv4EdShutter_c */ static int daLv4EdShutter_Draw(daLv4EdShutter_c* i_this) { return i_this->MoveBGDraw(); } -/* 80C5E6CC-80C5E6EC 000A0C 0020+00 1/0 0/0 0/0 .text daLv4EdShutter_Execute__FP16daLv4EdShutter_c - */ static int daLv4EdShutter_Execute(daLv4EdShutter_c* i_this) { return i_this->MoveBGExecute(); } -/* 80C5E6EC-80C5E70C 000A2C 0020+00 1/0 0/0 0/0 .text daLv4EdShutter_Delete__FP16daLv4EdShutter_c - */ static int daLv4EdShutter_Delete(daLv4EdShutter_c* i_this) { return i_this->MoveBGDelete(); } -/* 80C5E70C-80C5E72C 000A4C 0020+00 1/0 0/0 0/0 .text daLv4EdShutter_Create__FP10fopAc_ac_c */ static int daLv4EdShutter_Create(fopAc_ac_c* i_this) { return ((daLv4EdShutter_c*)i_this)->create(); } -/* 80C5E984-80C5E9A4 -00001 0020+00 1/0 0/0 0/0 .data l_daLv4EdShutter_Method */ static actor_method_class l_daLv4EdShutter_Method = { (process_method_func)daLv4EdShutter_Create, (process_method_func)daLv4EdShutter_Delete, @@ -250,7 +222,6 @@ static actor_method_class l_daLv4EdShutter_Method = { (process_method_func)daLv4EdShutter_Draw, }; -/* 80C5E9A4-80C5E9D4 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Lv4EdShutter */ extern actor_process_profile_definition g_profile_Obj_Lv4EdShutter = { fpcLy_CURRENT_e, // mLayerID 3, // mListID |
