mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-07-01 12:18:52 -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_lv4PoGate.cpp
-37
View File
@@ -9,7 +9,6 @@
#include "d/d_com_inf_game.h"
#include "d/d_procname.h"
/* 80C5FBEC-80C5FC5C 0000EC 0070+00 1/1 0/0 0/0 .text __ct__17daLv4PoGate_HIO_cFv */
daLv4PoGate_HIO_c::daLv4PoGate_HIO_c() {
mOpenSpeed = 10.0f;
mCloseStep1Speed = 10.0f;
@@ -23,7 +22,6 @@ daLv4PoGate_HIO_c::daLv4PoGate_HIO_c() {
mShockStrength = 3;
}
/* 80C5FCA4-80C5FD40 0001A4 009C+00 2/2 0/0 0/0 .text setBaseMtx__13daLv4PoGate_cFv */
void daLv4PoGate_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);
@@ -33,7 +31,6 @@ void daLv4PoGate_c::setBaseMtx() {
mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
}
/* 80C5FD40-80C5FDAC 000240 006C+00 1/0 0/0 0/0 .text CreateHeap__13daLv4PoGate_cFv */
int daLv4PoGate_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("L4R02Gate", 4);
@@ -45,7 +42,6 @@ int daLv4PoGate_c::CreateHeap() {
return 1;
}
/* 80C5FDAC-80C5FEDC 0002AC 0130+00 1/1 0/0 0/0 .text create__13daLv4PoGate_cFv */
int daLv4PoGate_c::create() {
fopAcM_ct(this, daLv4PoGate_c);
@@ -76,8 +72,6 @@ int daLv4PoGate_c::create() {
return phase;
}
/* 80C5FEDC-80C5FF2C 0003DC 0050+00 1/0 0/0 0/0 .text Execute__13daLv4PoGate_cFPPA3_A4_f
*/
int daLv4PoGate_c::Execute(Mtx** param_0) {
moveGate();
*param_0 = &mpModel->getBaseTRMtx();
@@ -86,10 +80,8 @@ int daLv4PoGate_c::Execute(Mtx** param_0) {
return 1;
}
/* 80C609C4-80C609EC 000014 0028+00 9/9 0/0 0/0 .bss l_HIO */
static daLv4PoGate_HIO_c l_HIO;
/* 80C5FF2C-80C60090 00042C 0164+00 1/1 0/0 0/0 .text moveGate__13daLv4PoGate_cFv */
void daLv4PoGate_c::moveGate() {
typedef void (daLv4PoGate_c::*modeFunc)();
static modeFunc mode_proc[] = {
@@ -113,15 +105,12 @@ void daLv4PoGate_c::moveGate() {
(this->*mode_proc[mMode])();
}
/* 80C60090-80C6009C 000590 000C+00 3/3 0/0 0/0 .text init_modeWait__13daLv4PoGate_cFv */
void daLv4PoGate_c::init_modeWait() {
mMode = MODE_WAIT_e;
}
/* 80C6009C-80C600A0 00059C 0004+00 1/0 0/0 0/0 .text modeWait__13daLv4PoGate_cFv */
void daLv4PoGate_c::modeWait() {}
/* 80C600A0-80C60150 0005A0 00B0+00 1/1 0/0 0/0 .text init_modeMoveOpen__13daLv4PoGate_cFv */
void daLv4PoGate_c::init_modeMoveOpen() {
cXyz sound_pos(current.pos);
sound_pos.y = home.pos.y;
@@ -131,7 +120,6 @@ void daLv4PoGate_c::init_modeMoveOpen() {
mMode = MODE_MOVE_OPEN_e;
}
/* 80C60150-80C60200 000650 00B0+00 1/0 0/0 0/0 .text modeMoveOpen__13daLv4PoGate_cFv */
void daLv4PoGate_c::modeMoveOpen() {
if (cLib_addCalc(&mMoveValue, mMoveTarget, 0.5f, l_HIO.mOpenSpeed, 0.5f) == 0.0f) {
mDoAud_seStart(Z2SE_READ_RIDDLE_A, NULL, 0, 0);
@@ -140,7 +128,6 @@ void daLv4PoGate_c::modeMoveOpen() {
}
}
/* 80C60200-80C602B0 000700 00B0+00 1/1 0/0 0/0 .text init_modeMoveClose__13daLv4PoGate_cFv */
void daLv4PoGate_c::init_modeMoveClose() {
cXyz sound_pos(current.pos);
sound_pos.y = home.pos.y;
@@ -150,7 +137,6 @@ void daLv4PoGate_c::init_modeMoveClose() {
mMode = MODE_MOVE_CLOSE_e;
}
/* 80C602B0-80C6031C 0007B0 006C+00 1/0 0/0 0/0 .text modeMoveClose__13daLv4PoGate_cFv */
void daLv4PoGate_c::modeMoveClose() {
if (cLib_addCalc(&mMoveValue, l_HIO.mCloseStep1Amount, 0.5f, l_HIO.mCloseStep1Speed, 0.1f) ==
0.0f)
@@ -159,13 +145,11 @@ void daLv4PoGate_c::modeMoveClose() {
}
}
/* 80C6031C-80C60338 00081C 001C+00 1/1 0/0 0/0 .text init_modeMoveCloseWait__13daLv4PoGate_cFv */
void daLv4PoGate_c::init_modeMoveCloseWait() {
mCloseWaitTime = l_HIO.mCloseStep1Wait;
mMode = MODE_MOVE_CLOSE_WAIT_e;
}
/* 80C60338-80C60370 000838 0038+00 1/0 0/0 0/0 .text modeMoveCloseWait__13daLv4PoGate_cFv */
void daLv4PoGate_c::modeMoveCloseWait() {
if (mCloseWaitTime != 0) {
mCloseWaitTime--;
@@ -174,13 +158,10 @@ void daLv4PoGate_c::modeMoveCloseWait() {
}
}
/* 80C60370-80C6037C 000870 000C+00 1/1 0/0 0/0 .text init_modeMoveClose2__13daLv4PoGate_cFv */
void daLv4PoGate_c::init_modeMoveClose2() {
mMode = MODE_MOVE_CLOSE2_e;
}
/* 80C6037C-80C603E0 00087C 0064+00 1/0 0/0 0/0 .text modeMoveClose2__13daLv4PoGate_cFv
*/
void daLv4PoGate_c::modeMoveClose2() {
if (cLib_addCalc(&mMoveValue, l_HIO.mCloseStep2Amount, 0.5f, l_HIO.mCloseStep2Speed, 0.5f) ==
0.0f)
@@ -189,14 +170,11 @@ void daLv4PoGate_c::modeMoveClose2() {
}
}
/* 80C603E0-80C603FC 0008E0 001C+00 1/1 0/0 0/0 .text init_modeMoveClose2Wait__13daLv4PoGate_cFv
*/
void daLv4PoGate_c::init_modeMoveClose2Wait() {
mCloseWaitTime = l_HIO.mCloseStep2Wait;
mMode = MODE_MOVE_CLOSE2_WAIT_e;
}
/* 80C603FC-80C60434 0008FC 0038+00 1/0 0/0 0/0 .text modeMoveClose2Wait__13daLv4PoGate_cFv */
void daLv4PoGate_c::modeMoveClose2Wait() {
if (mCloseWaitTime != 0) {
mCloseWaitTime--;
@@ -205,14 +183,11 @@ void daLv4PoGate_c::modeMoveClose2Wait() {
}
}
/* 80C60434-80C60450 000934 001C+00 1/1 0/0 0/0 .text init_modeMoveClose3__13daLv4PoGate_cFv */
void daLv4PoGate_c::init_modeMoveClose3() {
fopAcM_SetSpeedF(this, l_HIO.mCloseStep3Speed);
mMode = MODE_MOVE_CLOSE3_e;
}
/* 80C60450-80C604D8 000950 0088+00 1/0 0/0 0/0 .text modeMoveClose3__13daLv4PoGate_cFv
*/
void daLv4PoGate_c::modeMoveClose3() {
cLib_chaseF(&speedF, l_HIO.mCloseStep3Max, l_HIO.mCloseStep3Max / 30.0f);
@@ -222,12 +197,10 @@ void daLv4PoGate_c::modeMoveClose3() {
}
}
/* 80C604D8-80C60534 0009D8 005C+00 2/2 0/0 0/0 .text setSe__13daLv4PoGate_cFv */
void daLv4PoGate_c::setSe() {
dComIfGp_getVibration().StartShock(l_HIO.mShockStrength, 15, cXyz(0.0f, 1.0f, 0.0f));
}
/* 80C60534-80C605F8 000A34 00C4+00 2/2 0/0 0/0 .text setEffect__13daLv4PoGate_cFi */
void daLv4PoGate_c::setEffect(int param_0) {
static u16 const particle_id[] = {0x88C9, 0x88CA, 0x88CB, 0x88CC, 0x88CD,
0x88CE, 0x88CF, 0x88D0, 0x88D1, 0x88D2};
@@ -249,7 +222,6 @@ void daLv4PoGate_c::setEffect(int param_0) {
}
}
/* 80C605F8-80C6069C 000AF8 00A4+00 1/0 0/0 0/0 .text Draw__13daLv4PoGate_cFv */
int daLv4PoGate_c::Draw() {
g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -260,42 +232,33 @@ int daLv4PoGate_c::Draw() {
return 1;
}
/* 80C6069C-80C606CC 000B9C 0030+00 1/0 0/0 0/0 .text Delete__13daLv4PoGate_cFv */
int daLv4PoGate_c::Delete() {
dComIfG_resDelete(&mPhase, "L4R02Gate");
return 1;
}
/* 80C606CC-80C606F8 000BCC 002C+00 1/0 0/0 0/0 .text daLv4PoGate_Draw__FP13daLv4PoGate_c
*/
static int daLv4PoGate_Draw(daLv4PoGate_c* i_this) {
return i_this->MoveBGDraw();
}
/* 80C606F8-80C60718 000BF8 0020+00 1/0 0/0 0/0 .text daLv4PoGate_Execute__FP13daLv4PoGate_c */
static int daLv4PoGate_Execute(daLv4PoGate_c* i_this) {
return i_this->MoveBGExecute();
}
/* 80C60718-80C60738 000C18 0020+00 1/0 0/0 0/0 .text daLv4PoGate_Delete__FP13daLv4PoGate_c */
static int daLv4PoGate_Delete(daLv4PoGate_c* i_this) {
return i_this->MoveBGDelete();
}
/* 80C60738-80C60758 000C38 0020+00 1/0 0/0 0/0 .text daLv4PoGate_Create__FP10fopAc_ac_c
*/
static int daLv4PoGate_Create(fopAc_ac_c* i_this) {
return static_cast<daLv4PoGate_c*>(i_this)->create();
}
/* 80C6091C-80C6093C -00001 0020+00 1/0 0/0 0/0 .data l_daLv4PoGate_Method */
static actor_method_class l_daLv4PoGate_Method = {
(process_method_func)daLv4PoGate_Create, (process_method_func)daLv4PoGate_Delete,
(process_method_func)daLv4PoGate_Execute, (process_method_func)NULL,
(process_method_func)daLv4PoGate_Draw,
};
/* 80C6093C-80C6096C -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Lv4PoGate */
extern actor_process_profile_definition g_profile_Obj_Lv4PoGate = {
fpcLy_CURRENT_e,
3,