mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-15 04:02:50 -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_lv4Gate.cpp
-24
View File
@@ -9,16 +9,13 @@
#include "d/d_com_inf_game.h"
#include "d/d_procname.h"
/* 80C5F52C-80C5F538 000014 000C+00 3/3 0/0 0/0 .bss l_HIO */
static daLv4Gate_HIO_c l_HIO;
/* 80C5EB6C-80C5EB9C 0000EC 0030+00 1/1 0/0 0/0 .text __ct__15daLv4Gate_HIO_cFv */
daLv4Gate_HIO_c::daLv4Gate_HIO_c() {
mMoveSpeed = 2.0f;
mShockStrength = 3;
}
/* 80C5EBE4-80C5EC80 000164 009C+00 2/2 0/0 0/0 .text setBaseMtx__11daLv4Gate_cFv */
void daLv4Gate_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);
@@ -28,7 +25,6 @@ void daLv4Gate_c::setBaseMtx() {
mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
}
/* 80C5EC80-80C5ECEC 000200 006C+00 1/0 0/0 0/0 .text CreateHeap__11daLv4Gate_cFv */
int daLv4Gate_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("L4Gate", 4);
@@ -40,7 +36,6 @@ int daLv4Gate_c::CreateHeap() {
return 1;
}
/* 80C5ECEC-80C5EE54 00026C 0168+00 1/1 0/0 0/0 .text create__11daLv4Gate_cFv */
int daLv4Gate_c::create() {
fopAcM_ct(this, daLv4Gate_c);
@@ -82,7 +77,6 @@ int daLv4Gate_c::create() {
return phase;
}
/* 80C5EE54-80C5EEA4 0003D4 0050+00 1/0 0/0 0/0 .text Execute__11daLv4Gate_cFPPA3_A4_f */
int daLv4Gate_c::Execute(Mtx** i_mtxP) {
moveGate();
*i_mtxP = &mpModel->getBaseTRMtx();
@@ -91,7 +85,6 @@ int daLv4Gate_c::Execute(Mtx** i_mtxP) {
return 1;
}
/* 80C5EEA4-80C5EF48 000424 00A4+00 1/1 0/0 0/0 .text moveGate__11daLv4Gate_cFv */
void daLv4Gate_c::moveGate() {
typedef void (daLv4Gate_c::*modeFunc)();
static modeFunc mode_proc[] = {&daLv4Gate_c::modeWait, &daLv4Gate_c::modeMove,
@@ -100,12 +93,10 @@ void daLv4Gate_c::moveGate() {
(this->*mode_proc[mMode])();
}
/* 80C5EF48-80C5EF54 0004C8 000C+00 1/1 0/0 0/0 .text init_modeWait__11daLv4Gate_cFv */
void daLv4Gate_c::init_modeWait() {
mMode = MODE_WAIT_e;
}
/* 80C5EF54-80C5EFB0 0004D4 005C+00 1/0 0/0 0/0 .text modeWait__11daLv4Gate_cFv */
void daLv4Gate_c::modeWait() {
mInitMove = fopAcM_isSwitch(this, fopAcM_GetParam(this) & 0xFF);
if (mInitMove) {
@@ -113,12 +104,10 @@ void daLv4Gate_c::modeWait() {
}
}
/* 80C5EFB0-80C5EFBC 000530 000C+00 1/1 0/0 0/0 .text init_modeMove__11daLv4Gate_cFv */
void daLv4Gate_c::init_modeMove() {
mMode = MODE_MOVE_e;
}
/* 80C5EFBC-80C5F0C4 00053C 0108+00 1/0 0/0 0/0 .text modeMove__11daLv4Gate_cFv */
void daLv4Gate_c::modeMove() {
mDoMtx_stack_c::ZXYrotS(shape_angle.x, shape_angle.y, shape_angle.z);
@@ -134,8 +123,6 @@ void daLv4Gate_c::modeMove() {
}
}
/* 80C5F0C4-80C5F1E4 000644 0120+00 2/2 0/0 0/0 .text init_modeMoveEnd__11daLv4Gate_cFv
*/
void daLv4Gate_c::init_modeMoveEnd() {
if (!mGateOpened) {
mDoMtx_stack_c::ZXYrotS(shape_angle.x, shape_angle.y, shape_angle.z);
@@ -153,10 +140,8 @@ void daLv4Gate_c::init_modeMoveEnd() {
mMode = MODE_MOVE_END_e;
}
/* 80C5F1E4-80C5F1E8 000764 0004+00 1/0 0/0 0/0 .text modeMoveEnd__11daLv4Gate_cFv */
void daLv4Gate_c::modeMoveEnd() {}
/* 80C5F1E8-80C5F28C 000768 00A4+00 1/0 0/0 0/0 .text Draw__11daLv4Gate_cFv */
int daLv4Gate_c::Draw() {
g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -167,42 +152,33 @@ int daLv4Gate_c::Draw() {
return 1;
}
/* 80C5F28C-80C5F2BC 00080C 0030+00 1/0 0/0 0/0 .text Delete__11daLv4Gate_cFv */
int daLv4Gate_c::Delete() {
dComIfG_resDelete(&mPhase, "L4Gate");
return 1;
}
/* 80C5F2BC-80C5F2E8 00083C 002C+00 1/0 0/0 0/0 .text daLv4Gate_Draw__FP11daLv4Gate_c */
static int daLv4Gate_Draw(daLv4Gate_c* i_this) {
return i_this->MoveBGDraw();
}
/* 80C5F2E8-80C5F308 000868 0020+00 1/0 0/0 0/0 .text daLv4Gate_Execute__FP11daLv4Gate_c
*/
static int daLv4Gate_Execute(daLv4Gate_c* i_this) {
return i_this->MoveBGExecute();
}
/* 80C5F308-80C5F328 000888 0020+00 1/0 0/0 0/0 .text daLv4Gate_Delete__FP11daLv4Gate_c
*/
static int daLv4Gate_Delete(daLv4Gate_c* i_this) {
return i_this->MoveBGDelete();
}
/* 80C5F328-80C5F348 0008A8 0020+00 1/0 0/0 0/0 .text daLv4Gate_Create__FP10fopAc_ac_c */
static int daLv4Gate_Create(fopAc_ac_c* i_this) {
return static_cast<daLv4Gate_c*>(i_this)->create();
}
/* 80C5F484-80C5F4A4 -00001 0020+00 1/0 0/0 0/0 .data l_daLv4Gate_Method */
static actor_method_class l_daLv4Gate_Method = {
(process_method_func)daLv4Gate_Create, (process_method_func)daLv4Gate_Delete,
(process_method_func)daLv4Gate_Execute, (process_method_func)NULL,
(process_method_func)daLv4Gate_Draw,
};
/* 80C5F4A4-80C5F4D4 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Lv4Gate */
extern actor_process_profile_definition g_profile_Obj_Lv4Gate = {
fpcLy_CURRENT_e,
3,