mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-17 04:31:37 -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_rotTrap.cpp
-28
View File
@@ -8,7 +8,6 @@
#include "d/actor/d_a_obj_rotTrap.h"
#include "d/d_s_play.h"
/* 80CBF8AC-80CBF8F8 0000EC 004C+00 1/1 0/0 0/0 .text __ct__15daRotTrap_HIO_cFv */
daRotTrap_HIO_c::daRotTrap_HIO_c() {
vibration = 3;
rotate_time = 4.5f;
@@ -18,10 +17,8 @@ daRotTrap_HIO_c::daRotTrap_HIO_c() {
acc = 150;
}
/* 80CC0AC4-80CC0AD4 000014 0010+00 4/4 0/0 0/0 .bss l_HIO */
static daRotTrap_HIO_c l_HIO;
/* 80CC080C-80CC083C 000004 0030+00 1/1 0/0 0/0 .rodata mCcDObjInfo__11daRotTrap_c */
dCcD_SrcGObjInf const daRotTrap_c::mCcDObjInfo = {
{0, {{AT_TYPE_800, 0x1, 0x1F}, {0x0, 0x0}, {0}}},
{dCcD_SE_SWORD, 0, 1, 0, 0},
@@ -29,13 +26,11 @@ dCcD_SrcGObjInf const daRotTrap_c::mCcDObjInfo = {
{0}
};
/* 80CC0880-80CC08C4 000020 0044+00 2/2 0/0 0/0 .data mCcDCyl__11daRotTrap_c */
dCcD_SrcCyl daRotTrap_c::mCcDCyl = {
mCcDObjInfo,
{{0.0f, 0.0f, 0.0f}, 0.0f, 0.0f}
};
/* 80CC08C4-80CC096C 000064 00A8+00 0/1 0/0 0/0 .data atPos */
static Vec atPos[] = {
{-37.0f, 130.0f, -200.0f},
{-37.0f, 130.0f, -300.0f},
@@ -53,7 +48,6 @@ static Vec atPos[] = {
{37.0f, 130.0f, 800.0f},
};
/* 80CC096C-80CC09A4 00010C 0038+00 0/1 0/0 0/0 .data atR */
static f32 atR[] = {
50.0f,
50.0f,
@@ -71,7 +65,6 @@ static f32 atR[] = {
50.0f,
};
/* 80CBF940-80CBF9D8 000180 0098+00 2/2 0/0 0/0 .text setBaseMtx__11daRotTrap_cFv */
void daRotTrap_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);
@@ -81,7 +74,6 @@ void daRotTrap_c::setBaseMtx() {
MTXCopy(mDoMtx_stack_c::get(), mBgMtx);
}
/* 80CBF9D8-80CBFAC8 000218 00F0+00 1/0 0/0 0/0 .text CreateHeap__11daRotTrap_cFv */
int daRotTrap_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("P_kama", 4);
JUT_ASSERT(214, modelData != NULL);
@@ -100,7 +92,6 @@ int daRotTrap_c::CreateHeap() {
return 1;
}
/* 80CBFAC8-80CBFC88 000308 01C0+00 1/1 0/0 0/0 .text create__11daRotTrap_cFv */
int daRotTrap_c::create() {
fopAcM_ct(this, daRotTrap_c);
@@ -135,7 +126,6 @@ int daRotTrap_c::create() {
return phase_state;
}
/* 80CBFEC4-80CBFF1C 000704 0058+00 1/0 0/0 0/0 .text Execute__11daRotTrap_cFPPA3_A4_f */
int daRotTrap_c::Execute(Mtx** param_0) {
procMain();
*param_0 = &mpModel->getBaseTRMtx();
@@ -144,7 +134,6 @@ int daRotTrap_c::Execute(Mtx** param_0) {
return 1;
}
/* 80CBFF1C-80CC00AC 00075C 0190+00 1/1 0/0 0/0 .text procMain__11daRotTrap_cFv */
void daRotTrap_c::procMain() {
static void (daRotTrap_c::*mode_proc[])() = {
&daRotTrap_c::modeWait,
@@ -204,7 +193,6 @@ void daRotTrap_c::procMain() {
}
}
/* 80CC00AC-80CC0120 0008EC 0074+00 1/1 0/0 0/0 .text init_modeWait__11daRotTrap_cFv */
void daRotTrap_c::init_modeWait() {
if (mpBgW != NULL) {
dComIfG_Bgsp().Release(mpBgW);
@@ -218,7 +206,6 @@ void daRotTrap_c::init_modeWait() {
mMode = 0;
}
/* 80CC0120-80CC0180 000960 0060+00 1/0 0/0 0/0 .text modeWait__11daRotTrap_cFv */
void daRotTrap_c::modeWait() {
if (fopAcM_isSwitch(this, mSwbit)) {
init_modeAcc();
@@ -229,7 +216,6 @@ void daRotTrap_c::modeWait() {
}
}
/* 80CC0180-80CC027C 0009C0 00FC+00 1/1 0/0 0/0 .text init_modeAcc__11daRotTrap_cFv */
void daRotTrap_c::init_modeAcc() {
if (mpBgW2 != NULL) {
dComIfG_Bgsp().Release(mpBgW2);
@@ -247,7 +233,6 @@ void daRotTrap_c::init_modeAcc() {
mMode = 1;
}
/* 80CC027C-80CC034C 000ABC 00D0+00 1/0 0/0 0/0 .text modeAcc__11daRotTrap_cFv */
void daRotTrap_c::modeAcc() {
mDoAud_seStartLevel(Z2SE_OBJ_RL_SWD_LV, &current.pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
BOOL temp_r30 = cLib_chaseAngleS(&field_0x5b2, field_0x5b0, field_0x5b0 / l_HIO.acc);
@@ -259,13 +244,11 @@ void daRotTrap_c::modeAcc() {
}
}
/* 80CC034C-80CC0360 000B8C 0014+00 2/2 0/0 0/0 .text init_modeMove__11daRotTrap_cFv */
void daRotTrap_c::init_modeMove() {
field_0x5ae = 0;
mMode = 2;
}
/* 80CC0360-80CC0440 000BA0 00E0+00 1/0 0/0 0/0 .text modeMove__11daRotTrap_cFv */
void daRotTrap_c::modeMove() {
mDoAud_seStartLevel(Z2SE_OBJ_RL_SWD_LV, &current.pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
field_0x5b0 = cM_deg2s(360.0f / (30.0f * l_HIO.rotate_time));
@@ -277,7 +260,6 @@ void daRotTrap_c::modeMove() {
seSet();
}
/* 80CC0440-80CC0548 000C80 0108+00 2/2 0/0 0/0 .text seSet__11daRotTrap_cFv */
void daRotTrap_c::seSet() {
if (shape_angle.y & 0x8000) {
if (field_0x5ae == 0) {
@@ -290,7 +272,6 @@ void daRotTrap_c::seSet() {
}
}
/* 80CC0548-80CC05EC 000D88 00A4+00 1/0 0/0 0/0 .text Draw__11daRotTrap_cFv */
int daRotTrap_c::Draw() {
g_env_light.settingTevStruct(16, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -301,7 +282,6 @@ int daRotTrap_c::Draw() {
return 1;
}
/* 80CC05EC-80CC0654 000E2C 0068+00 1/0 0/0 0/0 .text Delete__11daRotTrap_cFv */
int daRotTrap_c::Delete() {
dComIfG_resDelete(&mPhase, "P_kama");
@@ -312,30 +292,23 @@ int daRotTrap_c::Delete() {
return 1;
}
/* 80CC0654-80CC0680 000E94 002C+00 1/0 0/0 0/0 .text daRotTrap_Draw__FP11daRotTrap_c */
static int daRotTrap_Draw(daRotTrap_c* i_this) {
return i_this->MoveBGDraw();
}
/* 80CC0680-80CC06A0 000EC0 0020+00 1/0 0/0 0/0 .text daRotTrap_Execute__FP11daRotTrap_c
*/
static int daRotTrap_Execute(daRotTrap_c* i_this) {
return i_this->MoveBGExecute();
}
/* 80CC06A0-80CC06C0 000EE0 0020+00 1/0 0/0 0/0 .text daRotTrap_Delete__FP11daRotTrap_c
*/
static int daRotTrap_Delete(daRotTrap_c* i_this) {
return i_this->MoveBGDelete();
}
/* 80CC06C0-80CC06E0 000F00 0020+00 1/0 0/0 0/0 .text daRotTrap_Create__FP10fopAc_ac_c */
static int daRotTrap_Create(fopAc_ac_c* i_this) {
fpc_ProcID id = fopAcM_GetID(i_this);
return ((daRotTrap_c*)i_this)->create();
}
/* 80CC09EC-80CC0A0C -00001 0020+00 1/0 0/0 0/0 .data l_daRotTrap_Method */
static actor_method_class l_daRotTrap_Method = {
(process_method_func)daRotTrap_Create,
(process_method_func)daRotTrap_Delete,
@@ -344,7 +317,6 @@ static actor_method_class l_daRotTrap_Method = {
(process_method_func)daRotTrap_Draw,
};
/* 80CC0A0C-80CC0A3C -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_RotTrap */
extern actor_process_profile_definition g_profile_Obj_RotTrap = {
fpcLy_CURRENT_e, // mLayerID
3, // mListID