mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-19 13:03:33 -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_lv4SlideWall.cpp
-26
View File
@@ -7,14 +7,12 @@
#include "d/actor/d_a_obj_lv4SlideWall.h"
/* 80C61E2C-80C61E68 0000EC 003C+00 1/1 0/0 0/0 .text __ct__15daSldWall_HIO_cFv */
daSldWall_HIO_c::daSldWall_HIO_c() {
move_amount = 900.0f;
speed = 4.0f;
vibration = 3;
}
/* 80C61EB0-80C61F4C 000170 009C+00 2/2 0/0 0/0 .text setBaseMtx__11daSldWall_cFv */
void daSldWall_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);
@@ -23,7 +21,6 @@ void daSldWall_c::setBaseMtx() {
mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
}
/* 80C61F4C-80C61FB8 00020C 006C+00 1/0 0/0 0/0 .text CreateHeap__11daSldWall_cFv */
int daSldWall_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("L4SldWall", 4);
JUT_ASSERT(160, modelData != NULL);
@@ -35,10 +32,8 @@ int daSldWall_c::CreateHeap() {
return 1;
}
/* 80C627DC-80C627EC 000014 0010+00 5/5 0/0 0/0 .bss l_HIO */
static daSldWall_HIO_c l_HIO;
/* 80C61FB8-80C620E4 000278 012C+00 1/1 0/0 0/0 .text create__11daSldWall_cFv */
int daSldWall_c::create() {
fopAcM_ct(this, daSldWall_c);
@@ -70,7 +65,6 @@ int daSldWall_c::create() {
return phase_state;
}
/* 80C620E4-80C62134 0003A4 0050+00 1/0 0/0 0/0 .text Execute__11daSldWall_cFPPA3_A4_f */
int daSldWall_c::Execute(Mtx** param_0) {
moveWall();
*param_0 = &mpModel->getBaseTRMtx();
@@ -78,7 +72,6 @@ int daSldWall_c::Execute(Mtx** param_0) {
return 1;
}
/* 80C62134-80C62238 0003F4 0104+00 1/1 0/0 0/0 .text moveWall__11daSldWall_cFv */
void daSldWall_c::moveWall() {
static void (daSldWall_c::*mode_proc[])() = {
&daSldWall_c::modeWait,
@@ -100,21 +93,16 @@ void daSldWall_c::moveWall() {
(this->*mode_proc[mMode])();
}
/* 80C62238-80C62244 0004F8 000C+00 3/3 0/0 0/0 .text init_modeWait__11daSldWall_cFv */
void daSldWall_c::init_modeWait() {
mMode = 0;
}
/* 80C62244-80C62248 000504 0004+00 1/0 0/0 0/0 .text modeWait__11daSldWall_cFv */
void daSldWall_c::modeWait() {}
/* 80C62248-80C62254 000508 000C+00 1/1 0/0 0/0 .text init_modeMoveOpen__11daSldWall_cFv
*/
void daSldWall_c::init_modeMoveOpen() {
mMode = 1;
}
/* 80C62254-80C62314 000514 00C0+00 1/0 0/0 0/0 .text modeMoveOpen__11daSldWall_cFv */
void daSldWall_c::modeMoveOpen() {
mDoAud_seStartLevel(0x801b1, &current.pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
@@ -125,13 +113,10 @@ void daSldWall_c::modeMoveOpen() {
}
}
/* 80C62314-80C62320 0005D4 000C+00 1/1 0/0 0/0 .text init_modeMoveClose__11daSldWall_cFv
*/
void daSldWall_c::init_modeMoveClose() {
mMode = 2;
}
/* 80C62320-80C623E0 0005E0 00C0+00 1/0 0/0 0/0 .text modeMoveClose__11daSldWall_cFv */
void daSldWall_c::modeMoveClose() {
mDoAud_seStartLevel(0x801b1, &current.pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
@@ -142,13 +127,11 @@ void daSldWall_c::modeMoveClose() {
}
}
/* 80C623E0-80C6249C 0006A0 00BC+00 2/2 0/0 0/0 .text setSe__11daSldWall_cFv */
void daSldWall_c::setSe() {
mDoAud_seStart(0x801b2, &current.pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
dComIfGp_getVibration().StartShock(l_HIO.vibration, 0xF, cXyz(0.0f, 1.0f, 0.0f));
}
/* 80C6249C-80C62540 00075C 00A4+00 1/0 0/0 0/0 .text Draw__11daSldWall_cFv */
int daSldWall_c::Draw() {
g_env_light.settingTevStruct(16, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -159,7 +142,6 @@ int daSldWall_c::Draw() {
return 1;
}
/* 80C62540-80C62570 000800 0030+00 1/0 0/0 0/0 .text Delete__11daSldWall_cFv */
int daSldWall_c::Delete() {
dComIfG_resDelete(&mPhase, "L4SldWall");
@@ -169,29 +151,22 @@ int daSldWall_c::Delete() {
return 1;
}
/* 80C62570-80C6259C 000830 002C+00 1/0 0/0 0/0 .text daSldWall_Draw__FP11daSldWall_c */
static int daSldWall_Draw(daSldWall_c* i_this) {
return i_this->MoveBGDraw();
}
/* 80C6259C-80C625BC 00085C 0020+00 1/0 0/0 0/0 .text daSldWall_Execute__FP11daSldWall_c
*/
static int daSldWall_Execute(daSldWall_c* i_this) {
return i_this->MoveBGExecute();
}
/* 80C625BC-80C625DC 00087C 0020+00 1/0 0/0 0/0 .text daSldWall_Delete__FP11daSldWall_c
*/
static int daSldWall_Delete(daSldWall_c* i_this) {
return i_this->MoveBGDelete();
}
/* 80C625DC-80C625FC 00089C 0020+00 1/0 0/0 0/0 .text daSldWall_Create__FP10fopAc_ac_c */
static int daSldWall_Create(fopAc_ac_c* i_this) {
return ((daSldWall_c*)i_this)->create();
}
/* 80C62738-80C62758 -00001 0020+00 1/0 0/0 0/0 .data l_daSldWall_Method */
static actor_method_class l_daSldWall_Method = {
(process_method_func)daSldWall_Create,
(process_method_func)daSldWall_Delete,
@@ -200,7 +175,6 @@ static actor_method_class l_daSldWall_Method = {
(process_method_func)daSldWall_Draw,
};
/* 80C62758-80C62788 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Lv4SlideWall */
extern actor_process_profile_definition g_profile_Obj_Lv4SlideWall = {
fpcLy_CURRENT_e, // mLayerID
3, // mListID