mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-08-29 09:10:04 -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_rfHole.cpp
-28
View File
@@ -9,7 +9,6 @@
#include "d/d_com_inf_game.h"
#include "d/d_bg_w.h"
/* 80CB8E6C-80CB8EBC 0000EC 0050+00 1/1 0/0 0/0 .text __ct__14daRfHole_HIO_cFv */
daRfHole_HIO_c::daRfHole_HIO_c() {
field_0x04 = 130.0f;
field_0x08 = 200.0f;
@@ -19,7 +18,6 @@ daRfHole_HIO_c::daRfHole_HIO_c() {
field_0x15 = 4;
}
/* 80CB8F04-80CB8F8C 000184 0088+00 2/2 0/0 0/0 .text setBaseMtx__10daRfHole_cFv */
void daRfHole_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 +25,6 @@ void daRfHole_c::setBaseMtx() {
mModel->setBaseTRMtx(mDoMtx_stack_c::get());
}
/* 80CB8F8C-80CB8FF8 00020C 006C+00 1/0 0/0 0/0 .text CreateHeap__10daRfHole_cFv */
int daRfHole_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Otosiana", 4);
JUT_ASSERT(167, modelData!=NULL);
@@ -35,7 +32,6 @@ int daRfHole_c::CreateHeap() {
return mModel != NULL ? 1 : 0;
}
/* 80CB8FF8-80CB9148 000278 0150+00 1/1 0/0 0/0 .text create__10daRfHole_cFv */
int daRfHole_c::create() {
fopAcM_ct(this, daRfHole_c);
int rv = dComIfG_resLoad(&mPhase, "Otosiana");
@@ -63,18 +59,14 @@ int daRfHole_c::create() {
return rv;
}
/* 80CB9148-80CB9194 0003C8 004C+00 1/1 0/0 0/0 .text
* rideCallBack__10daRfHole_cFP4dBgWP10fopAc_ac_cP10fopAc_ac_c */
void daRfHole_c::rideCallBack(dBgW* param_1, fopAc_ac_c* param_2, fopAc_ac_c* param_3) {
if (fopAcM_GetName(param_3) == PROC_ALINK && static_cast<daRfHole_c*>(param_2)->playerAreaCheck()) {
static_cast<daRfHole_c*>(param_2)->field_0x5ae = 1;
}
}
/* 80CB9BF4-80CB9C0C 000014 0018+00 4/4 0/0 0/0 .bss l_HIO */
static daRfHole_HIO_c l_HIO;
/* 80CB9194-80CB940C 000414 0278+00 1/1 0/0 0/0 .text playerAreaCheck__10daRfHole_cFv */
int daRfHole_c::playerAreaCheck() {
fopAc_ac_c* player = dComIfGp_getPlayer(0);
cXyz cStack_30(l_HIO.field_0x0c, 0.0f, 0.0f);
@@ -98,7 +90,6 @@ int daRfHole_c::playerAreaCheck() {
return rv;
}
/* 80CB940C-80CB9464 00068C 0058+00 1/0 0/0 0/0 .text Execute__10daRfHole_cFPPA3_A4_f */
int daRfHole_c::Execute(Mtx** i_mtx) {
holeProc();
*i_mtx = &mModel->getBaseTRMtx();
@@ -107,26 +98,22 @@ int daRfHole_c::Execute(Mtx** i_mtx) {
return 1;
}
/* 80CB9464-80CB9520 0006E4 00BC+00 1/1 0/0 0/0 .text holeProc__10daRfHole_cFv */
void daRfHole_c::holeProc() {
static ModeFunc mode_proc[] = {&daRfHole_c::modeWait, &daRfHole_c::modeBreak,
&daRfHole_c::modeBreakEff, &daRfHole_c::modeEnd};
(this->*(mode_proc[mMode]))();
}
/* 80CB9520-80CB952C 0007A0 000C+00 1/1 0/0 0/0 .text init_modeWait__10daRfHole_cFv */
void daRfHole_c::init_modeWait() {
mMode = MODE_WAIT;
}
/* 80CB952C-80CB9558 0007AC 002C+00 1/0 0/0 0/0 .text modeWait__10daRfHole_cFv */
void daRfHole_c::modeWait() {
if (field_0x5ae != 0) {
init_modeBreak();
}
}
/* 80CB9558-80CB96AC 0007D8 0154+00 1/1 0/0 0/0 .text init_modeBreak__10daRfHole_cFv */
void daRfHole_c::init_modeBreak() {
setBreakEffect();
dComIfGp_getVibration().StartShock(l_HIO.field_0x15, 15, cXyz(0.0f, 1.0f, 0.0f));
@@ -139,35 +126,28 @@ void daRfHole_c::init_modeBreak() {
mMode = MODE_BREAK;
}
/* 80CB96AC-80CB96CC 00092C 0020+00 1/0 0/0 0/0 .text modeBreak__10daRfHole_cFv */
void daRfHole_c::modeBreak() {
fopAcM_delete(this);
}
/* 80CB96CC-80CB971C 00094C 0050+00 1/1 0/0 0/0 .text init_modeBreakEff__10daRfHole_cFv
*/
void daRfHole_c::init_modeBreakEff() {
setBreakEffect();
fopAcM_onSwitch(this, (u8)fopAcM_GetParam(this));
mMode = MODE_BREAK_EFF;
}
/* 80CB971C-80CB973C 00099C 0020+00 1/0 0/0 0/0 .text modeBreakEff__10daRfHole_cFv */
void daRfHole_c::modeBreakEff() {
fopAcM_delete(this);
}
/* 80CB973C-80CB9748 0009BC 000C+00 1/1 0/0 0/0 .text init_modeEnd__10daRfHole_cFv */
void daRfHole_c::init_modeEnd() {
mMode = MODE_END;
}
/* 80CB9748-80CB9768 0009C8 0020+00 1/0 0/0 0/0 .text modeEnd__10daRfHole_cFv */
void daRfHole_c::modeEnd() {
fopAcM_delete(this);
}
/* 80CB9768-80CB9878 0009E8 0110+00 2/2 0/0 0/0 .text setBreakEffect__10daRfHole_cFv */
void daRfHole_c::setBreakEffect() {
static u16 const particle_id[5] = {
0x83B0, 0x83B1, 0x83B2, 0x83B3, 0x83B4,
@@ -182,7 +162,6 @@ void daRfHole_c::setBreakEffect() {
}
}
/* 80CB9878-80CB991C 000AF8 00A4+00 1/0 0/0 0/0 .text Draw__10daRfHole_cFv */
int daRfHole_c::Draw() {
g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(mModel, &tevStr);
@@ -192,34 +171,28 @@ int daRfHole_c::Draw() {
return 1;
}
/* 80CB991C-80CB994C 000B9C 0030+00 1/0 0/0 0/0 .text Delete__10daRfHole_cFv */
int daRfHole_c::Delete() {
dComIfG_resDelete(&mPhase, "Otosiana");
return 1;
}
/* 80CB994C-80CB9978 000BCC 002C+00 1/0 0/0 0/0 .text daRfHole_Draw__FP10daRfHole_c */
static int daRfHole_Draw(daRfHole_c* i_this) {
return i_this->MoveBGDraw();
}
/* 80CB9978-80CB9998 000BF8 0020+00 1/0 0/0 0/0 .text daRfHole_Execute__FP10daRfHole_c */
static int daRfHole_Execute(daRfHole_c* i_this) {
return i_this->MoveBGExecute();
}
/* 80CB9998-80CB99B8 000C18 0020+00 1/0 0/0 0/0 .text daRfHole_Delete__FP10daRfHole_c */
static int daRfHole_Delete(daRfHole_c* i_this) {
return i_this->MoveBGDelete();
}
/* 80CB99B8-80CB99D8 000C38 0020+00 1/0 0/0 0/0 .text daRfHole_Create__FP10fopAc_ac_c */
static int daRfHole_Create(fopAc_ac_c* i_this) {
fopAcM_GetID(i_this);
return static_cast<daRfHole_c*>(i_this)->create();
}
/* 80CB9B4C-80CB9B6C -00001 0020+00 1/0 0/0 0/0 .data l_daRfHole_Method */
static actor_method_class l_daRfHole_Method = {
(process_method_func)daRfHole_Create,
(process_method_func)daRfHole_Delete,
@@ -228,7 +201,6 @@ static actor_method_class l_daRfHole_Method = {
(process_method_func)daRfHole_Draw,
};
/* 80CB9B6C-80CB9B9C -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_RfHole */
extern actor_process_profile_definition g_profile_Obj_RfHole = {
fpcLy_CURRENT_e, // mLayerID
3, // mListID