mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-18 04:48:21 -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_shield.cpp
-36
View File
@@ -13,7 +13,6 @@
#include "d/d_item_data.h"
#include "cmath.h"
/* 80CD8274-80CD82B8 000000 0044+00 5/5 0/0 0/0 .rodata l_cyl_src */
const static dCcD_SrcCyl l_cyl_src = {
{
{0x0, {{0x0, 0x0, 0x0}, {0xffffffff, 0x11}, 0x59}}, // mObj
@@ -28,8 +27,6 @@ const static dCcD_SrcCyl l_cyl_src = {
} // mCyl
};
/* 80CD6A58-80CD6D54 000078 02FC+00 1/1 0/0 0/0 .text Reflect__FP4cXyzRC13cBgS_PolyInfof
*/
static f32 Reflect(cXyz* pSpeed, cBgS_PolyInfo const& param_2, f32 param_3) {
cM3dGPla acStack_3c;
if (dComIfG_Bgsp().GetTriPla(param_2, &acStack_3c)) {
@@ -42,13 +39,11 @@ static f32 Reflect(cXyz* pSpeed, cBgS_PolyInfo const& param_2, f32 param_3) {
return 0;
}
/* 80CD6D9C-80CD6DD8 0003BC 003C+00 1/1 0/0 0/0 .text initBaseMtx__14daItemShield_cFv */
void daItemShield_c::initBaseMtx() {
mpModel->setBaseScale(scale);
setBaseMtx();
}
/* 80CD6DD8-80CD7094 0003F8 02BC+00 2/2 0/0 0/0 .text setBaseMtx__14daItemShield_cFv */
void daItemShield_c::setBaseMtx() {
cLib_addCalcAngleS(&field_0x952, field_0x954, 3, 500, 100);
if (field_0x950 > -9000 && field_0x954 > 0) {
@@ -78,7 +73,6 @@ void daItemShield_c::setBaseMtx() {
mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
}
/* 80CD7094-80CD724C 0006B4 01B8+00 1/1 0/0 0/0 .text Create__14daItemShield_cFv */
int daItemShield_c::Create() {
initBaseMtx();
fopAcM_SetMtx(this, mpModel->getBaseTRMtx());
@@ -106,12 +100,10 @@ int daItemShield_c::Create() {
return 1;
}
/* 80CD724C-80CD7254 00086C 0008+00 1/0 0/0 0/0 .text __CreateHeap__14daItemShield_cFv */
int daItemShield_c::__CreateHeap() {
return 1;
}
/* 80CD7254-80CD7420 000874 01CC+00 1/1 0/0 0/0 .text create__14daItemShield_cFv */
int daItemShield_c::create() {
fopAcM_ct(this, daItemShield_c);
m_itemNo = fpcNm_ITEM_WOOD_SHIELD;
@@ -137,7 +129,6 @@ int daItemShield_c::create() {
return rv;
}
/* 80CD75EC-80CD7734 000C0C 0148+00 1/1 0/0 0/0 .text bg_check__14daItemShield_cFv */
void daItemShield_c::bg_check() {
f32 dVar6 = 0.7f;
if (mAcch.ChkWallHit()) {
@@ -162,7 +153,6 @@ void daItemShield_c::bg_check() {
}
}
/* 80CD7734-80CD77F0 000D54 00BC+00 1/1 0/0 0/0 .text action_proc_call__14daItemShield_cFv */
int daItemShield_c::action_proc_call() {
static daItemShield_c::actionFunc l_actionFunc[4] = {
&daItemShield_c::actionInit,
@@ -173,15 +163,12 @@ int daItemShield_c::action_proc_call() {
return (this->*(l_actionFunc[mStatus]))();
}
/* 80CD77F0-80CD7828 000E10 0038+00 1/0 0/0 0/0 .text actionInit__14daItemShield_cFv */
int daItemShield_c::actionInit() {
daItemBase_c::show();
actionWaitInit();
return 1;
}
/* 80CD7828-80CD7890 000E48 0068+00 2/2 0/0 0/0 .text actionWaitInit__14daItemShield_cFv
*/
int daItemShield_c::actionWaitInit() {
mCcCyl.OffTgSPrmBit(1);
mCcCyl.OnCoSPrmBit(1);
@@ -191,7 +178,6 @@ int daItemShield_c::actionWaitInit() {
return 1;
}
/* 80CD7890-80CD7C68 000EB0 03D8+00 1/0 0/0 0/0 .text actionWait__14daItemShield_cFv */
int daItemShield_c::actionWait() {
daPy_py_c* player = daPy_getPlayerActorClass();
if ((player->checkWolfAttackReverse() || daPy_getPlayerActorClass()->checkFrontRollCrash()) &&
@@ -245,8 +231,6 @@ int daItemShield_c::actionWait() {
return 1;
}
/* 80CD7C68-80CD7D04 001288 009C+00 1/1 0/0 0/0 .text initActionOrderGetDemo__14daItemShield_cFv
*/
int daItemShield_c::initActionOrderGetDemo() {
cLib_offBit<u32>(attention_info.flags, fopAc_AttnFlag_CARRY_e);
mCcCyl.OffTgSPrmBit(1);
@@ -261,7 +245,6 @@ int daItemShield_c::initActionOrderGetDemo() {
return 1;
}
/* 80CD7D04-80CD7D80 001324 007C+00 1/0 0/0 0/0 .text actionOrderGetDemo__14daItemShield_cFv */
int daItemShield_c::actionOrderGetDemo() {
if (eventInfo.checkCommandItem()) {
setStatus(STATUS_GETDEMO);
@@ -275,8 +258,6 @@ int daItemShield_c::actionOrderGetDemo() {
return 1;
}
/* 80CD7D80-80CD7E00 0013A0 0080+00 1/0 0/0 0/0 .text actionGetDemo__14daItemShield_cFv
*/
int daItemShield_c::actionGetDemo() {
if (dComIfGp_evmng_endCheck("DEFAULT_GETITEM")) {
dComIfGp_event_reset();
@@ -286,8 +267,6 @@ int daItemShield_c::actionGetDemo() {
return 1;
}
/* 80CD7E00-80CD7EBC 001420 00BC+00 1/1 0/0 0/0 .text event_proc_call__14daItemShield_cFv
*/
void daItemShield_c::event_proc_call() {
static daItemShield_c::camActionFunc l_func[4] = {
&daItemShield_c::actionWaitCamDemo,
@@ -299,7 +278,6 @@ void daItemShield_c::event_proc_call() {
(this->*(l_func[mAction]))();
}
/* 80CD7EBC-80CD7F20 0014DC 0064+00 1/0 0/0 0/0 .text actionWaitCamDemo__14daItemShield_cFv */
void daItemShield_c::actionWaitCamDemo() {
if (field_0x937) {
setAction(ACTION_ORDER_CAM_DEMO);
@@ -309,7 +287,6 @@ void daItemShield_c::actionWaitCamDemo() {
}
}
/* 80CD7F20-80CD7F88 001540 0068+00 1/0 0/0 0/0 .text actionOrderCamDemo__14daItemShield_cFv */
void daItemShield_c::actionOrderCamDemo() {
if (eventInfo.checkCommandDemoAccrpt()) {
setAction(ACTION_CAM_DEMO);
@@ -320,8 +297,6 @@ void daItemShield_c::actionOrderCamDemo() {
}
}
/* 80CD7F88-80CD7FE4 0015A8 005C+00 1/0 0/0 0/0 .text actionCamDemo__14daItemShield_cFv
*/
void daItemShield_c::actionCamDemo() {
if (dComIfGp_evmng_endCheck(mEventIdx)) {
setAction(ACTION_CAM_DEMO_END);
@@ -329,11 +304,9 @@ void daItemShield_c::actionCamDemo() {
}
}
/* 80CD7FE4-80CD7FE8 001604 0004+00 1/0 0/0 0/0 .text actionCamDemoEnd__14daItemShield_cFv */
void daItemShield_c::actionCamDemoEnd() {
}
/* 80CD7FE8-80CD80EC 001608 0104+00 1/1 0/0 0/0 .text execute__14daItemShield_cFv */
int daItemShield_c::execute() {
field_0x938 = speed;
mRotAngleCoeff++;
@@ -353,7 +326,6 @@ int daItemShield_c::execute() {
return 1;
}
/* 80CD80EC-80CD8140 00170C 0054+00 1/1 0/0 0/0 .text draw__14daItemShield_cFv */
int daItemShield_c::draw() {
if (!daItemBase_c::chkDraw()) {
return 1;
@@ -363,34 +335,27 @@ int daItemShield_c::draw() {
return 1;
}
/* 80CD8140-80CD8178 001760 0038+00 1/1 0/0 0/0 .text _delete__14daItemShield_cFv */
int daItemShield_c::_delete() {
daItemBase_c::DeleteBase(dItem_data::getFieldArc(m_itemNo));
return 1;
}
/* 80CD8178-80CD8198 001798 0020+00 1/0 0/0 0/0 .text daItemShield_Draw__FP14daItemShield_c */
static int daItemShield_Draw(daItemShield_c* i_this) {
return i_this->draw();
}
/* 80CD8198-80CD81B8 0017B8 0020+00 1/0 0/0 0/0 .text daItemShield_Execute__FP14daItemShield_c */
static int daItemShield_Execute(daItemShield_c* i_this) {
return i_this->execute();
}
/* 80CD81B8-80CD81D8 0017D8 0020+00 1/0 0/0 0/0 .text daItemShield_Delete__FP14daItemShield_c */
static int daItemShield_Delete(daItemShield_c* i_this) {
return i_this->_delete();
}
/* 80CD81D8-80CD81F8 0017F8 0020+00 1/0 0/0 0/0 .text daItemShield_Create__FP10fopAc_ac_c
*/
static int daItemShield_Create(fopAc_ac_c* i_this) {
return static_cast<daItemShield_c*>(i_this)->create();
}
/* 80CD841C-80CD843C -00001 0020+00 1/0 0/0 0/0 .data l_daItemShield_Method */
static actor_method_class l_daItemShield_Method = {
(process_method_func)daItemShield_Create,
(process_method_func)daItemShield_Delete,
@@ -399,7 +364,6 @@ static actor_method_class l_daItemShield_Method = {
(process_method_func)daItemShield_Draw,
};
/* 80CD843C-80CD846C -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Shield */
extern actor_process_profile_definition g_profile_Obj_Shield = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID