mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-19 05:02:12 -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_riverrock.cpp
-33
View File
@@ -10,17 +10,14 @@
#include "d/d_cc_d.h"
#include "d/d_com_inf_game.h"
/* 80CBDB40-80CBDB44 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */
static char* l_arcName = "RiverRock";
/* 80CBC6CC-80CBC6F4 0000EC 0028+00 1/1 0/0 0/0 .text __ct__20daObjRIVERROCK_HIO_cFv */
daObjRIVERROCK_HIO_c::daObjRIVERROCK_HIO_c() {
field_0x4 = -1;
field_0x8 = 0.0f;
field_0xc = 0.0f;
}
/* 80CBC6F4-80CBC754 000114 0060+00 1/1 0/0 0/0 .text initCcCylinder__16daObjRIVERROCK_cFv */
void daObjRIVERROCK_c::initCcCylinder() {
const static dCcD_SrcCyl ccCylSrc = {
{
@@ -42,26 +39,21 @@ void daObjRIVERROCK_c::initCcCylinder() {
mCyl.SetC(current.pos);
}
/* 80CBC754-80CBC7B4 000174 0060+00 1/1 0/0 0/0 .text SetCcCyl__16daObjRIVERROCK_cFv */
void daObjRIVERROCK_c::SetCcCyl() {
mCyl.SetC(current.pos);
mCyl.SetR(field_0x5c4.x * 1000.0f);
dComIfG_Ccsp()->Set(&mCyl);
}
/* 80CBC7B4-80CBC7D4 0001D4 0020+00 1/0 0/0 0/0 .text daObjRIVERROCK_Create__FP10fopAc_ac_c */
static int daObjRIVERROCK_Create(fopAc_ac_c* i_this) {
return static_cast<daObjRIVERROCK_c*>(i_this)->create();
}
/* 80CBC7D4-80CBC7F8 0001F4 0024+00 1/0 0/0 0/0 .text daObjRIVERROCK_Delete__FP16daObjRIVERROCK_c
*/
static int daObjRIVERROCK_Delete(daObjRIVERROCK_c* i_this) {
i_this->MoveBGDelete();
return 1;
}
/* 80CBC7F8-80CBC8BC 000218 00C4+00 1/1 0/0 0/0 .text BreakWaitAction__16daObjRIVERROCK_cFv */
void daObjRIVERROCK_c::BreakWaitAction() {
shape_angle.x = field_0x5b4 * cM_ssin(field_0x5aa);
cLib_addCalcAngleS(&field_0x5b0, 0x10, 0x100, 0x50, 0);
@@ -72,7 +64,6 @@ void daObjRIVERROCK_c::BreakWaitAction() {
}
}
/* 80CBC8BC-80CBCC3C 0002DC 0380+00 1/1 0/0 0/0 .text CheckBG__16daObjRIVERROCK_cFv */
void daObjRIVERROCK_c::CheckBG() {
mSoundObj.startLevelSound(Z2SE_OBJ_RG_ROCKPOLE_FALL, 0, -1);
cXyz particlePos(0.0f, 5650.0f * field_0x5c4.y, field_0x5c4.z * 700.0f);
@@ -112,13 +103,10 @@ void daObjRIVERROCK_c::CheckBG() {
field_0x5d0 = particlePos;
}
/* 80CBDBE8-80CBDBEC 000008 0004+00 2/2 0/0 0/0 .bss None */
static bool mHIOInitialized;
/* 80CBDBF8-80CBDC08 000018 0010+00 4/4 0/0 0/0 .bss l_HIO */
static daObjRIVERROCK_HIO_c l_HIO;
/* 80CBCC3C-80CBCCC0 00065C 0084+00 1/1 0/0 0/0 .text BreakMoveAction__16daObjRIVERROCK_cFv */
void daObjRIVERROCK_c::BreakMoveAction() {
cLib_addCalcAngleS(&field_0x5aa, 0x1500, l_HIO.field_0x8 + 3628.0f, 0x1500, 0);
field_0x5e8.x += field_0x5aa;
@@ -126,8 +114,6 @@ void daObjRIVERROCK_c::BreakMoveAction() {
CheckBG();
}
/* 80CBCCC0-80CBCD94 0006E0 00D4+00 1/1 0/0 0/0 .text BrokenAction__16daObjRIVERROCK_cFv
*/
void daObjRIVERROCK_c::BrokenAction() {
s16 sVar1 = field_0x5b4 * cM_ssin(field_0x5aa);
if (sVar1 > 0) {
@@ -141,8 +127,6 @@ void daObjRIVERROCK_c::BrokenAction() {
}
}
/* 80CBCD94-80CBCDE8 0007B4 0054+00 1/1 0/0 0/0 .text BreakAction__16daObjRIVERROCK_cFv
*/
void daObjRIVERROCK_c::BreakAction() {
switch (mBreakSubAction) {
case BREAK_WAIT:
@@ -160,7 +144,6 @@ void daObjRIVERROCK_c::BreakAction() {
}
}
/* 80CBCDE8-80CBCE2C 000808 0044+00 1/1 0/0 0/0 .text Action__16daObjRIVERROCK_cFv */
void daObjRIVERROCK_c::Action() {
switch (mAction) {
case ACTION_WAIT:
@@ -172,7 +155,6 @@ void daObjRIVERROCK_c::Action() {
}
}
/* 80CBCE2C-80CBD1C4 00084C 0398+00 3/3 0/0 0/0 .text BreakSet__16daObjRIVERROCK_cFv */
void daObjRIVERROCK_c::BreakSet() {
eyePos = current.pos;
fopAcM_seStart(this, Z2SE_OBJ_RG_ROCK_BREAK, 0);
@@ -200,14 +182,12 @@ void daObjRIVERROCK_c::BreakSet() {
mBreakSubAction = BREAK_WAIT;
}
/* 80CBD1C4-80CBD204 000BE4 0040+00 1/1 0/0 0/0 .text WaitAction__16daObjRIVERROCK_cFv */
void daObjRIVERROCK_c::WaitAction() {
if (mCyl.ChkTgHit()) {
BreakSet();
}
}
/* 80CBD204-80CBD2FC 000C24 00F8+00 1/1 0/0 0/0 .text setBaseMtx__16daObjRIVERROCK_cFv */
void daObjRIVERROCK_c::setBaseMtx() {
if (mBreakSubAction == BREAK_MOVE || mBreakSubAction == BREAK_BROKEN ||
mBreakSubAction == BREAK_3)
@@ -228,18 +208,14 @@ void daObjRIVERROCK_c::setBaseMtx() {
cMtx_copy(mDoMtx_stack_c::get(), mBgMtx);
}
/* 80CBD2FC-80CBD328 000D1C 002C+00 1/0 0/0 0/0 .text daObjRIVERROCK_Draw__FP16daObjRIVERROCK_c */
static int daObjRIVERROCK_Draw(daObjRIVERROCK_c* i_this) {
return i_this->Draw();
}
/* 80CBD328-80CBD348 000D48 0020+00 2/1 0/0 0/0 .text daObjRIVERROCK_Execute__FP16daObjRIVERROCK_c
*/
static int daObjRIVERROCK_Execute(daObjRIVERROCK_c* i_this) {
return i_this->MoveBGExecute();
}
/* 80CBD348-80CBD3C0 000D68 0078+00 1/0 0/0 0/0 .text CreateHeap__16daObjRIVERROCK_cFv */
int daObjRIVERROCK_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*) dComIfG_getObjectRes(l_arcName, "M_RiverRock.bmd");
JUT_ASSERT(242, modelData != NULL);
@@ -247,7 +223,6 @@ int daObjRIVERROCK_c::CreateHeap() {
return mModel != NULL ? TRUE : FALSE;
}
/* 80CBD3C0-80CBD71C 000DE0 035C+00 1/1 0/0 0/0 .text create__16daObjRIVERROCK_cFv */
int daObjRIVERROCK_c::create() {
fopAcM_ct(this, daObjRIVERROCK_c);
int rv = dComIfG_resLoad(&mPhase, l_arcName);
@@ -291,13 +266,10 @@ int daObjRIVERROCK_c::create() {
return rv;
}
/* 80CBD7AC-80CBD7B4 0011CC 0008+00 1/0 0/0 0/0 .text
* daObjRIVERROCK_IsDelete__FP16daObjRIVERROCK_c */
static int daObjRIVERROCK_IsDelete(daObjRIVERROCK_c* i_this) {
return 1;
}
/* 80CBD7B4-80CBD814 0011D4 0060+00 1/0 0/0 0/0 .text Create__16daObjRIVERROCK_cFv */
int daObjRIVERROCK_c::Create() {
fopAcM_setCullSizeBox(this, field_0x5c4.x * -1000.0f, field_0x5c4.y * -500.0f,
field_0x5c4.z * -1000.0f, field_0x5c4.x * 1000.0f, field_0x5c4.y * 500.0f,
@@ -305,7 +277,6 @@ int daObjRIVERROCK_c::Create() {
return cPhs_COMPLEATE_e;
}
/* 80CBD814-80CBD8E0 001234 00CC+00 1/0 0/0 0/0 .text Execute__16daObjRIVERROCK_cFPPA3_A4_f */
int daObjRIVERROCK_c::Execute(Mtx** ppMtx) {
Action();
field_0x5a9 = fopAcM_GetParam(this) >> 24;
@@ -322,7 +293,6 @@ int daObjRIVERROCK_c::Execute(Mtx** ppMtx) {
return 1;
}
/* 80CBD8E0-80CBD964 001300 0084+00 1/0 0/0 0/0 .text Draw__16daObjRIVERROCK_cFv */
int daObjRIVERROCK_c::Draw() {
g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(mModel, &tevStr);
@@ -331,7 +301,6 @@ int daObjRIVERROCK_c::Draw() {
return 1;
}
/* 80CBD964-80CBD9C4 001384 0060+00 1/0 0/0 0/0 .text Delete__16daObjRIVERROCK_cFv */
int daObjRIVERROCK_c::Delete() {
dComIfG_resDelete(&mPhase, l_arcName);
if (mHIONeedDelete) {
@@ -341,7 +310,6 @@ int daObjRIVERROCK_c::Delete() {
return 1;
}
/* 80CBDB44-80CBDB64 -00001 0020+00 1/0 0/0 0/0 .data l_daObjRIVERROCK_Method */
static actor_method_class l_daObjRIVERROCK_Method = {
(process_method_func)daObjRIVERROCK_Create,
(process_method_func)daObjRIVERROCK_Delete,
@@ -350,7 +318,6 @@ static actor_method_class l_daObjRIVERROCK_Method = {
(process_method_func)daObjRIVERROCK_Draw,
};
/* 80CBDB64-80CBDB94 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_RIVERROCK */
extern actor_process_profile_definition g_profile_Obj_RIVERROCK = {
fpcLy_CURRENT_e, // mLayerID
3, // mListID