mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-18 12:52:51 -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_npc_cd.cpp
-65
View File
@@ -1,14 +1,8 @@
//
// Generated By: dol2asm
// Translation Unit: a/npc/d_a_npc_cd
//
#include "d/dolzel.h" // IWYU pragma: keep
#include "d/actor/d_a_npc_cd.h"
#include "d/actor/d_a_player.h"
/* 80156010-8015605C 150950 004C+00 1/1 0/0 0/0 .text jntNodeCallBack__FP8J3DJointi */
static int jntNodeCallBack(J3DJoint* i_jnt, int param_1) {
if (param_1 == 0) {
J3DModel* model = j3dSys.getModel();
@@ -20,152 +14,122 @@ static int jntNodeCallBack(J3DJoint* i_jnt, int param_1) {
return 1;
}
/* 80392A18-80392A30 -00001 0018+00 2/1 0/0 0/0 .rodata l_resMANa */
static char* const l_resMANa[6] = {
"MAN_a_L", "MAN_a_LTW", "Mgenral_l", "Mspcial_l", "object_l", "objectLTW",
};
/* 80392A30-80392A48 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMADa */
static char* const l_resMADa[6] = {
"MAD_a_L", "MAD_a_LTW", "Mgenral_l", "Mspcial_l", "object_l", "objectLTW",
};
/* 80392A48-80392A60 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMCNa */
static char* const l_resMCNa[6] = {
"MCN_a_L", "MCN_a_LTW", "Mgenral_l", "Mspcial_l", "object_l", "objectLTW",
};
/* 80392A60-80392A78 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMONa */
static char* const l_resMONa[6] = {
"MON_a_L", "MON_a_LTW", "Mgenral_l", "Mspcial_l", "object_l", "objectLTW",
};
/* 80392A78-80392A90 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMANb */
static char* const l_resMANb[6] = {
"MAN_b_L", "MAN_b_LTW", "Mgenral_l", "Mspcial_l", "object_l", "objectLTW",
};
/* 80392A90-80392AA8 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMANc */
static char* const l_resMANc[6] = {
"MAN_c_L", "MAN_c_LTW", "Mgenral_l", "Mspcial_l", "object_l", "objectLTW",
};
/* 80392AA8-80392AC0 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMASa */
static char* const l_resMASa[6] = {
"MAS_a_L", "MAS_a_LTW", "Mgenral_l", "Mspcial_l", "object_l", "objectLTW",
};
/* 80392AC0-80392AD8 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMBNa */
static char* const l_resMBNa[6] = {
"MBN_a_L", "MBN_a_LTW", "Mgenral_l", "Mspcial_l", "object_l", "objectLTW",
};
/* 80392AD8-80392AF0 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMANa2 */
static char* const l_resMANa2[6] = {
"MAN_a2_L", "MAN_a2LTW", "Mgenral_l", "Mspcial_l", "object_l", "objectLTW",
};
/* 80392AF0-80392B08 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMADa2 */
static char* const l_resMADa2[6] = {
"MAD_a2_L", "MAD_a2LTW", "Mgenral_l", "Mspcial_l", "object_l", "objectLTW",
};
/* 80392B08-80392B20 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMCNa2 */
static char* const l_resMCNa2[6] = {
"MCN_a2_L", "MCN_a2LTW", "Mgenral_l", "Mspcial_l", "object_l", "objectLTW",
};
/* 80392B20-80392B38 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMONa2 */
static char* const l_resMONa2[6] = {
"MON_a2_L", "MON_a2LTW", "Mgenral_l", "Mspcial_l", "object_l", "objectLTW",
};
/* 80392B38-80392B50 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMANb2 */
static char* const l_resMANb2[6] = {
"MAN_b2_L", "MAN_b2LTW", "Mgenral_l", "Mspcial_l", "object_l", "objectLTW",
};
/* 80392B50-80392B68 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMANc2 */
static char* const l_resMANc2[6] = {
"MAN_c2_L", "MAN_c2LTW", "Mgenral_l", "Mspcial_l", "object_l", "objectLTW",
};
/* 80392B68-80392B80 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMASa2 */
static char* const l_resMASa2[6] = {
"MAS_a2_L", "MAS_a2LTW", "Mgenral_l", "Mspcial_l", "object_l", "objectLTW",
};
/* 80392B80-80392B98 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMBNa2 */
static char* const l_resMBNa2[6] = {
"MBN_a2_L", "MBN_a2LTW", "Mgenral_l", "Mspcial_l", "object_l", "objectLTW",
};
/* 80392B98-80392BB0 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWANa */
static char* const l_resWANa[6] = {
"WAN_a_L", "WAN_a_LTW", "Wgenral_l", "Wspcial_l", "object_l", "objectLTW",
};
/* 80392BB0-80392BC8 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWADa */
static char* const l_resWADa[6] = {
"WAD_a_L", "WAD_a_LTW", "Wgenral_l", "Wspcial_l", "object_l", "objectLTW",
};
/* 80392BC8-80392BE0 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMATa */
static char* const l_resMATa[6] = {
"MAT_a_L", "MAT_a_LTW", "Wgenral_l", "Wspcial_l", "object_l", "objectLTW",
};
/* 80392BE0-80392BF8 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWCNa */
static char* const l_resWCNa[6] = {
"WCN_a_L", "WCN_a_LTW", "Wgenral_l", "Wspcial_l", "object_l", "objectLTW",
};
/* 80392BF8-80392C10 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWONa */
static char* const l_resWONa[6] = {
"WON_a_L", "WON_a_LTW", "Wgenral_l", "Wspcial_l", "object_l", "objectLTW",
};
/* 80392C10-80392C28 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWGNa */
static char* const l_resWGNa[6] = {
"WGN_a_L", "WGN_a_LTW", "Wgenral_l", "Wspcial_l", "object_l", "objectLTW",
};
/* 80392C28-80392C40 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWANb */
static char* const l_resWANb[6] = {
"WAN_b_L", "WAN_b_LTW", "Wgenral_l", "Wspcial_l", "object_l", "objectLTW",
};
/* 80392C40-80392C58 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWANa2 */
static char* const l_resWANa2[6] = {
"WAN_a2_L", "WAN_a2LTW", "Wgenral_l", "Wspcial_l", "object_l", "objectLTW",
};
/* 80392C58-80392C70 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWADa2 */
static char* const l_resWADa2[6] = {
"WAD_a2_L", "WAD_a2LTW", "Wgenral_l", "Wspcial_l", "object_l", "objectLTW",
};
/* 80392C70-80392C88 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMATa2 */
static char* const l_resMATa2[6] = {
"MAT_a2_L", "MAT_a2LTW", "Wgenral_l", "Wspcial_l", "object_l", "objectLTW",
};
/* 80392C88-80392CA0 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWCNa2 */
static char* const l_resWCNa2[6] = {
"WCN_a2_L", "WCN_a2LTW", "Wgenral_l", "Wspcial_l", "object_l", "objectLTW",
};
/* 80392CA0-80392CB8 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWONa2 */
static char* const l_resWONa2[6] = {
"WON_a2_L", "WON_a2LTW", "Wgenral_l", "Wspcial_l", "object_l", "objectLTW",
};
/* 80392CB8-80392CD0 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWGNa2 */
static char* const l_resWGNa2[6] = {
"WGN_a2_L", "WGN_a2LTW", "Wgenral_l", "Wspcial_l", "object_l", "objectLTW",
};
/* 80392CD0-80392CE8 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWANb2 */
static char* const l_resWANb2[6] = {
"WAN_b2_L", "WAN_b2LTW", "Wgenral_l", "Wspcial_l", "object_l", "objectLTW",
};
@@ -175,31 +139,26 @@ struct anmTblPrm {
int resource_index;
};
/* 80392CE8-80392D30 -00001 0048+00 1/1 0/0 0/0 .rodata l_objTbl */
static anmTblPrm const l_objTbl[9] = {
{"object_l", 6}, {"object_l", 6}, {"object_l", 5}, {"object_l", 3}, {"object_l", 7},
{"object_l", 8}, {"object_l", -1}, {"object_l", -1}, {"object_l", 4},
};
/* 80392D30-80392D78 -00001 0048+00 1/1 0/0 0/0 .rodata l_objTWTbl */
static anmTblPrm const l_objTWTbl[9] = {
{"objectLTW", 6}, {"objectLTW", 6}, {"objectLTW", 5}, {"objectLTW", 3}, {"objectLTW", 7},
{"objectLTW", 8}, {"objectLTW", -1}, {"objectLTW", -1}, {"objectLTW", 4},
};
/* 80392D78-80392DC8 -00001 0050+00 1/1 0/0 0/0 .rodata l_bckTbl_M */
static anmTblPrm const l_bckTbl_M[10] = {
{"Mgenral_l", 5}, {"Mgenral_l", 6}, {"Mgenral_l", 3}, {"Mgenral_l", 4}, {"Mspcial_l", 6},
{"Mspcial_l", 7}, {"Mspcial_l", 8}, {"Mspcial_l", 3}, {"Mspcial_l", 4}, {"Mspcial_l", 5},
};
/* 80392DC8-80392E18 -00001 0050+00 1/1 0/0 0/0 .rodata l_bckTbl_W */
static anmTblPrm const l_bckTbl_W[10] = {
{"Wgenral_l", 5}, {"Wgenral_l", 6}, {"Wgenral_l", 3}, {"Wgenral_l", 4}, {"Wspcial_l", 6},
{"Wspcial_l", 7}, {"Wspcial_l", 8}, {"Wspcial_l", 3}, {"Wspcial_l", 4}, {"Wspcial_l", 5},
};
/* 80392E18-80392E5C 01F478 0044+00 0/0 0/0 1/1 .rodata m_cylDat__9daNpcCd_c */
dCcD_SrcCyl const daNpcCd_c::m_cylDat = {
{
{0x0, {{0x0, 0x0, 0x0}, {0, 0}, 0x79}}, // mObj
@@ -214,7 +173,6 @@ dCcD_SrcCyl const daNpcCd_c::m_cylDat = {
} // mCyl
};
/* 8015605C-801561E8 15099C 018C+00 0/0 0/0 1/1 .text NpcCreate__9daNpcCd_cFi */
int daNpcCd_c::NpcCreate(int param_1) {
J3DModelData* a_mdlData_p = getNpcMdlDataP(param_1);
@@ -267,7 +225,6 @@ int daNpcCd_c::NpcCreate(int param_1) {
return 1;
}
/* 801561E8-80156228 150B28 0040+00 0/0 0/0 1/1 .text ObjCreate__9daNpcCd_cFi */
J3DModel* daNpcCd_c::ObjCreate(int param_0) {
J3DModelData* modelData = getObjMdlDataP(param_0);
if (modelData) {
@@ -276,14 +233,12 @@ J3DModel* daNpcCd_c::ObjCreate(int param_0) {
return NULL;
}
/* 80156228-80156248 150B68 0020+00 1/1 0/0 0/0 .text isM___9daNpcCd_cFv */
BOOL daNpcCd_c::isM_() {
// JUT_ASSERT(574, m_type < MdlNUM_e); // Not yet configured in DEBUG
return m_type < 16;
}
/* 80156248-801563C8 150B88 0180+00 0/0 0/0 1/1 .text getAnmP__9daNpcCd_cFii */
J3DAnmTransform* daNpcCd_c::getAnmP(int param_1, int param_2) {
int a_anmNum = param_1;
switch (a_anmNum) {
@@ -359,7 +314,6 @@ J3DAnmTransform* daNpcCd_c::getAnmP(int param_1, int param_2) {
return (J3DAnmTransform*)dComIfG_getObjectRes(anmTbl.arc_name, anmTbl.resource_index);
}
/* 803B3B8C-803B3C04 -00001 0078+00 2/2 0/0 0/0 .data l_resNameTbl */
static char* const* l_resNameTbl[30] = {
l_resMANa, l_resMADa, l_resMCNa, l_resMONa, l_resMANb, l_resMANc, l_resMASa, l_resMBNa,
l_resMANa2, l_resMADa2, l_resMCNa2, l_resMONa2, l_resMANb2, l_resMANc2, l_resMASa2, l_resMBNa2,
@@ -367,7 +321,6 @@ static char* const* l_resNameTbl[30] = {
l_resWADa2, l_resMATa2, l_resWCNa2, l_resWONa2, l_resWGNa2, l_resWANb2,
};
/* 803B3C04-803B3CF4 010D24 00F0+00 2/2 0/0 0/0 .data l_bmdTbl */
static anmTblPrm const l_bmdTbl[30] = {
{l_resMANa[0], 3}, {l_resMADa[0], 3}, {l_resMCNa[0], 3}, {l_resMONa[0], 3},
{l_resMANb[0], 3}, {l_resMANc[0], 3}, {l_resMASa[0], 3}, {l_resMBNa[0], 3},
@@ -379,7 +332,6 @@ static anmTblPrm const l_bmdTbl[30] = {
{l_resWGNa2[0], 3}, {l_resWANb2[0], 3},
};
/* 803B3CF4-803B3DE4 010E14 00F0+00 2/2 0/0 0/0 .data l_bmdTWTbl */
static anmTblPrm const l_bmdTWTbl[30] = {
{l_resMANa[1], 3}, {l_resMADa[1], 3}, {l_resMCNa[1], 3}, {l_resMONa[1], 3},
{l_resMANb[1], 3}, {l_resMANc[1], 3}, {l_resMASa[1], 3}, {l_resMBNa[1], 3},
@@ -391,10 +343,8 @@ static anmTblPrm const l_bmdTWTbl[30] = {
{l_resWGNa2[1], 3}, {l_resWANb2[1], 3},
};
/* 80425984-80428340 0526A4 29BC+00 2/3 0/0 4/4 .bss l_Cd_HIO */
daNpcCd_HIO_c l_Cd_HIO;
/* 801563C8-80156B4C 150D08 0784+00 0/0 0/0 2/2 .text setAttention__9daNpcCd_cFi */
int daNpcCd_c::setAttention(int i_idx) {
static cXyz const a_eyeOfsTbl[30] = {
cXyz(0.0f, 10.0f, 0.0f), cXyz(0.0f, 10.0f, 0.0f), cXyz(0.0f, 10.0f, 0.0f),
@@ -415,7 +365,6 @@ int daNpcCd_c::setAttention(int i_idx) {
return 1;
}
/* 80156B4C-80156C50 15148C 0104+00 0/0 0/0 1/1 .text loadResrc__9daNpcCd_cFii */
int daNpcCd_c::loadResrc(int param_0, int param_1) {
int result = cPhs_COMPLEATE_e;
@@ -450,7 +399,6 @@ int daNpcCd_c::loadResrc(int param_0, int param_1) {
return result;
}
/* 80156C50-80156D1C 151590 00CC+00 0/0 0/0 1/1 .text removeResrc__9daNpcCd_cFii */
int daNpcCd_c::removeResrc(int idx, int param_1) {
if (mIsDarkWorld) {
dComIfG_resDelete(&mPhase1, l_resNameTbl[idx][1]);
@@ -464,20 +412,17 @@ int daNpcCd_c::removeResrc(int idx, int param_1) {
return 1;
}
/* 80156D1C-80156D78 15165C 005C+00 0/0 0/0 1/1 .text setEnvTevCol__9daNpcCd_cFv */
void daNpcCd_c::setEnvTevCol() {
tevStr.YukaCol = dComIfG_Bgsp().GetPolyColor(mAcch.m_gnd);
tevStr.room_no = dComIfG_Bgsp().GetRoomId(mAcch.m_gnd);
}
/* 80156D78-80156DBC 1516B8 0044+00 0/0 0/0 1/1 .text setRoomNo__9daNpcCd_cFv */
void daNpcCd_c::setRoomNo() {
s8 id = dComIfG_Bgsp().GetRoomId(mAcch.m_gnd);
fopAcM_SetRoomNo(this, id);
mStts.SetRoomId(id);
}
/* 80156DBC-80156E20 1516FC 0064+00 0/0 0/0 1/1 .text animation__9daNpcCd_cFv */
void daNpcCd_c::animation() {
f32 lastframe = mpMorf->getFrame();
mpMorf->play(0, 0);
@@ -486,8 +431,6 @@ void daNpcCd_c::animation() {
}
}
/* 80156E20-80156E8C 151760 006C+00 0/0 0/0 1/1 .text setAnm__9daNpcCd_cFP18J3DAnmTransformKeyffiii
*/
void daNpcCd_c::setAnm(J3DAnmTransformKey* i_anm, f32 i_rate, f32 i_morf, int i_attr, int i_start,
int i_end) {
if (i_anm != (J3DAnmTransformKey*)mpMorf->getAnm()) {
@@ -495,7 +438,6 @@ void daNpcCd_c::setAnm(J3DAnmTransformKey* i_anm, f32 i_rate, f32 i_morf, int i_
}
}
/* 80156E8C-80156F74 1517CC 00E8+00 0/0 0/0 1/1 .text drawObj__9daNpcCd_cFiP8J3DModelf */
int daNpcCd_c::drawObj(int idx, J3DModel* i_model, f32 i_scale) {
static s32 const a_jntNumTbl[9] = {
-1, 3, 5, 5, 3, 5, 3, 0, 0,
@@ -517,7 +459,6 @@ int daNpcCd_c::drawObj(int idx, J3DModel* i_model, f32 i_scale) {
return 1;
}
/* 80156F74-80157084 1518B4 0110+00 0/0 0/0 1/1 .text drawNpc__9daNpcCd_cFv */
int daNpcCd_c::drawNpc() {
if (mIsDarkWorld && !daPy_py_c::checkNowWolfEyeUp()) {
setHitodamaParticle();
@@ -544,7 +485,6 @@ int daNpcCd_c::drawNpc() {
return 1;
}
/* 80157084-8015736C 1519C4 02E8+00 1/1 0/0 0/0 .text jntNodeCB__9daNpcCd_cFP8J3DJointP8J3DModel */
int daNpcCd_c::jntNodeCB(J3DJoint* i_jnt, J3DModel* i_model) {
J3DJoint* i_jnt_ = i_jnt;
int jntNo = i_jnt_->getJntNo();
@@ -561,8 +501,6 @@ int daNpcCd_c::jntNodeCB(J3DJoint* i_jnt, J3DModel* i_model) {
return 1;
}
/* 8015736C-80157524 151CAC 01B8+00 1/1 0/0 0/0 .text setHitodamaParticle__9daNpcCd_cFv
*/
void daNpcCd_c::setHitodamaParticle() {
static const u16 id[2] = {
0x8497,
@@ -597,7 +535,6 @@ void daNpcCd_c::setHitodamaParticle() {
}
}
/* 80157524-80157588 151E64 0064+00 1/1 0/0 0/0 .text getNpcMdlDataP__9daNpcCd_cFi */
J3DModelData* daNpcCd_c::getNpcMdlDataP(int param_1) {
const anmTblPrm* l_bmd;
if (mIsDarkWorld) {
@@ -609,7 +546,6 @@ J3DModelData* daNpcCd_c::getNpcMdlDataP(int param_1) {
return (J3DModelData*)dComIfG_getObjectRes(l_bmd->arc_name, l_bmd->resource_index);
}
/* 80157588-80157600 151EC8 0078+00 1/1 0/0 0/0 .text getObjMdlDataP__9daNpcCd_cFi */
J3DModelData* daNpcCd_c::getObjMdlDataP(int param_1) {
J3DModelData* model_data = NULL;
const anmTblPrm* def;
@@ -624,7 +560,6 @@ J3DModelData* daNpcCd_c::getObjMdlDataP(int param_1) {
return model_data;
}
/* 80157600-801577A0 151F40 01A0+00 1/1 0/0 0/0 .text __ct__13daNpcCd_HIO_cFv */
daNpcCd_HIO_c::daNpcCd_HIO_c() {
/* 803B3DE4-803B4CE4 010F04 0F00+00 0/1 0/0 0/0 .data a_jntTbl_M$3905 */
static u8 a_jntTbl_M[16][12][20] = {