mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-18 20:57:46 -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_lv6Lblock.cpp
-27
View File
@@ -7,19 +7,16 @@
#include "d/actor/d_a_obj_lv6Lblock.h"
/* 80C73D04-80C73D0C 000020 0008+00 1/1 0/0 0/0 .data l_liftUpMax */
static f32 l_liftUpMax[] = {
300.0f,
150.0f,
};
/* 80C733EC-80C7341C 0000EC 0030+00 1/1 0/0 0/0 .text __ct__17daLv6Lblock_HIO_cFv */
daLv6Lblock_HIO_c::daLv6Lblock_HIO_c() {
speed = 15.0f;
unk_0xc = 3;
}
/* 80C73464-80C734EC 000164 0088+00 2/2 0/0 0/0 .text setBaseMtx__13daLv6Lblock_cFv */
void daLv6Lblock_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);
@@ -27,7 +24,6 @@ void daLv6Lblock_c::setBaseMtx() {
mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
}
/* 80C734EC-80C73558 0001EC 006C+00 1/0 0/0 0/0 .text CreateHeap__13daLv6Lblock_cFv */
int daLv6Lblock_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("L6Lblock", 4);
JUT_ASSERT(177, modelData != NULL);
@@ -40,7 +36,6 @@ int daLv6Lblock_c::CreateHeap() {
return 1;
}
/* 80C73558-80C736C0 000258 0168+00 1/1 0/0 0/0 .text create__13daLv6Lblock_cFv */
int daLv6Lblock_c::create() {
fopAcM_ct(this, daLv6Lblock_c);
@@ -77,13 +72,10 @@ int daLv6Lblock_c::create() {
return phase_state;
}
/* 80C736C0-80C7370C 0003C0 004C+00 2/2 0/0 0/0 .text isSwitch__13daLv6Lblock_cFv */
u8 daLv6Lblock_c::isSwitch() {
return mSwState ^ fopAcM_isSwitch(this, mSwbit);
}
/* 80C7370C-80C7375C 00040C 0050+00 1/0 0/0 0/0 .text Execute__13daLv6Lblock_cFPPA3_A4_f
*/
int daLv6Lblock_c::Execute(Mtx** param_0) {
moveBlock();
*param_0 = &mpModel->getBaseTRMtx();
@@ -91,10 +83,8 @@ int daLv6Lblock_c::Execute(Mtx** param_0) {
return 1;
}
/* 80C73DFC-80C73E0C 000014 0010+00 3/3 0/0 0/0 .bss l_HIO */
static daLv6Lblock_HIO_c l_HIO;
/* 80C7375C-80C73850 00045C 00F4+00 1/1 0/0 0/0 .text moveBlock__13daLv6Lblock_cFv */
void daLv6Lblock_c::moveBlock() {
static void (daLv6Lblock_c::*mode_proc[])() = {
&daLv6Lblock_c::modeWait,
@@ -116,21 +106,16 @@ void daLv6Lblock_c::moveBlock() {
(this->*mode_proc[mMode])();
}
/* 80C73850-80C7385C 000550 000C+00 3/3 0/0 0/0 .text init_modeWait__13daLv6Lblock_cFv */
void daLv6Lblock_c::init_modeWait() {
mMode = 0;
}
/* 80C7385C-80C73860 00055C 0004+00 1/0 0/0 0/0 .text modeWait__13daLv6Lblock_cFv */
void daLv6Lblock_c::modeWait() {}
/* 80C73860-80C7386C 000560 000C+00 1/1 0/0 0/0 .text init_modeLiftUp__13daLv6Lblock_cFv
*/
void daLv6Lblock_c::init_modeLiftUp() {
mMode = 1;
}
/* 80C7386C-80C7398C 00056C 0120+00 1/0 0/0 0/0 .text modeLiftUp__13daLv6Lblock_cFv */
void daLv6Lblock_c::modeLiftUp() {
f32 dist_to_target = cLib_addCalc(&current.pos.y, mBaseHeight + mMaxHeight, 0.1f, l_HIO.speed, 5.0f);
mDoAud_seStartLevel(Z2SE_OBJ_L6_UD_BLOCK_UP, &current.pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
@@ -141,12 +126,10 @@ void daLv6Lblock_c::modeLiftUp() {
}
}
/* 80C7398C-80C73998 00068C 000C+00 1/1 0/0 0/0 .text init_modeLiftDown__13daLv6Lblock_cFv */
void daLv6Lblock_c::init_modeLiftDown() {
mMode = 2;
}
/* 80C73998-80C73AB0 000698 0118+00 1/0 0/0 0/0 .text modeLiftDown__13daLv6Lblock_cFv */
void daLv6Lblock_c::modeLiftDown() {
f32 dist_to_target = cLib_addCalc(&current.pos.y, mBaseHeight, 0.1f, l_HIO.speed, 5.0f);
mDoAud_seStartLevel(Z2SE_OBJ_L6_UD_BLOCK_DW, &current.pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
@@ -157,7 +140,6 @@ void daLv6Lblock_c::modeLiftDown() {
}
}
/* 80C73AB0-80C73B54 0007B0 00A4+00 1/0 0/0 0/0 .text Draw__13daLv6Lblock_cFv */
int daLv6Lblock_c::Draw() {
g_env_light.settingTevStruct(16, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -168,35 +150,27 @@ int daLv6Lblock_c::Draw() {
return 1;
}
/* 80C73B54-80C73B84 000854 0030+00 1/0 0/0 0/0 .text Delete__13daLv6Lblock_cFv */
int daLv6Lblock_c::Delete() {
dComIfG_resDelete(&mPhase, "L6Lblock");
return 1;
}
/* 80C73B84-80C73BB0 000884 002C+00 1/0 0/0 0/0 .text daLv6Lblock_Draw__FP13daLv6Lblock_c
*/
static int daLv6Lblock_Draw(daLv6Lblock_c* i_this) {
return i_this->MoveBGDraw();
}
/* 80C73BB0-80C73BD0 0008B0 0020+00 1/0 0/0 0/0 .text daLv6Lblock_Execute__FP13daLv6Lblock_c */
static int daLv6Lblock_Execute(daLv6Lblock_c* i_this) {
return i_this->MoveBGExecute();
}
/* 80C73BD0-80C73BF0 0008D0 0020+00 1/0 0/0 0/0 .text daLv6Lblock_Delete__FP13daLv6Lblock_c */
static int daLv6Lblock_Delete(daLv6Lblock_c* i_this) {
return i_this->MoveBGDelete();
}
/* 80C73BF0-80C73C10 0008F0 0020+00 1/0 0/0 0/0 .text daLv6Lblock_Create__FP10fopAc_ac_c
*/
static int daLv6Lblock_Create(fopAc_ac_c* i_this) {
return ((daLv6Lblock_c*)i_this)->create();
}
/* 80C73D54-80C73D74 -00001 0020+00 1/0 0/0 0/0 .data l_daLv6Lblock_Method */
static actor_method_class l_daLv6Lblock_Method = {
(process_method_func)daLv6Lblock_Create,
(process_method_func)daLv6Lblock_Delete,
@@ -205,7 +179,6 @@ static actor_method_class l_daLv6Lblock_Method = {
(process_method_func)daLv6Lblock_Draw,
};
/* 80C73D74-80C73DA4 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Lv6Lblock */
extern actor_process_profile_definition g_profile_Obj_Lv6Lblock = {
fpcLy_CURRENT_e, // mLayerID
3, // mListID