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_npc_cd2.cpp
+2 -107
View File
@@ -1,17 +1,10 @@
//
// Generated By: dol2asm
// Translation Unit: a/npc/d_a_npc_cd2
//
#include "d/dolzel.h" // IWYU pragma: keep
#include "d/actor/d_a_npc_cd2.h"
#include "d/actor/d_a_player.h"
#include "d/d_path.h"
#include "dol2asm.h"
#include "f_op/f_op_actor_mng.h"
/* 80157CB4-80157D00 1525F4 004C+00 1/1 0/0 0/0 .text jntNodeCallBack__FP8J3DJointi */
static int jntNodeCallBack(J3DJoint* i_jnt, int param_1) {
if (param_1 == 0) {
if (j3dSys.getModel()->getUserArea() != 0) {
@@ -21,152 +14,122 @@ static int jntNodeCallBack(J3DJoint* i_jnt, int param_1) {
return 1;
}
/* 80393250-80393268 -00001 0018+00 2/1 0/0 0/0 .rodata l_resMANa */
static char* const l_resMANa[6] = {
"MAN_a", "MAN_a_TW", "Mgeneral", "Mspecial", "object", "objectTW",
};
/* 80393268-80393280 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMADa */
static char* const l_resMADa[6] = {
"MAD_a", "MAD_a_TW", "Mgeneral", "Mspecial", "object", "objectTW",
};
/* 80393280-80393298 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMCNa */
static char* const l_resMCNa[6] = {
"MCN_a", "MCN_a_TW", "Mgeneral", "Mspecial", "object", "objectTW",
};
/* 80393298-803932B0 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMONa */
static char* const l_resMONa[6] = {
"MON_a", "MON_a_TW", "Mgeneral", "Mspecial", "object", "objectTW",
};
/* 803932B0-803932C8 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMANb */
static char* const l_resMANb[6] = {
"MAN_b", "MAN_b_TW", "Mgeneral", "Mspecial", "object", "objectTW",
};
/* 803932C8-803932E0 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMANc */
static char* const l_resMANc[6] = {
"MAN_c", "MAN_c_TW", "Mgeneral", "Mspecial", "object", "objectTW",
};
/* 803932E0-803932F8 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMASa */
static char* const l_resMASa[6] = {
"MAS_a", "MAS_a_TW", "Mgeneral", "Mspecial", "object", "objectTW",
};
/* 803932F8-80393310 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMBNa */
static char* const l_resMBNa[6] = {
"MBN_a", "MBN_a_TW", "Mgeneral", "Mspecial", "object", "objectTW",
};
/* 80393310-80393328 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMANa2 */
static char* const l_resMANa2[6] = {
"MAN_a2", "MAN_a2_TW", "Mgeneral", "Mspecial", "object", "objectTW",
};
/* 80393328-80393340 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMADa2 */
static char* const l_resMADa2[6] = {
"MAD_a2", "MAD_a2_TW", "Mgeneral", "Mspecial", "object", "objectTW",
};
/* 80393340-80393358 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMCNa2 */
static char* const l_resMCNa2[6] = {
"MCN_a2", "MCN_a2_TW", "Mgeneral", "Mspecial", "object", "objectTW",
};
/* 80393358-80393370 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMONa2 */
static char* const l_resMONa2[6] = {
"MON_a2", "MON_a2_TW", "Mgeneral", "Mspecial", "object", "objectTW",
};
/* 80393370-80393388 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMANb2 */
static char* const l_resMANb2[6] = {
"MAN_b2", "MAN_b2_TW", "Mgeneral", "Mspecial", "object", "objectTW",
};
/* 80393388-803933A0 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMANc2 */
static char* const l_resMANc2[6] = {
"MAN_c2", "MAN_c2_TW", "Mgeneral", "Mspecial", "object", "objectTW",
};
/* 803933A0-803933B8 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMASa2 */
static char* const l_resMASa2[6] = {
"MAS_a2", "MAS_a2_TW", "Mgeneral", "Mspecial", "object", "objectTW",
};
/* 803933B8-803933D0 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMBNa2 */
static char* const l_resMBNa2[6] = {
"MBN_a2", "MBN_a2_TW", "Mgeneral", "Mspecial", "object", "objectTW",
};
/* 803933D0-803933E8 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWANa */
static char* const l_resWANa[6] = {
"WAN_a", "WAN_a_TW", "Wgeneral", "Wspecial", "object", "objectTW",
};
/* 803933E8-80393400 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWADa */
static char* const l_resWADa[6] = {
"WAD_a", "WAD_a_TW", "Wgeneral", "Wspecial", "object", "objectTW",
};
/* 80393400-80393418 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMATa */
static char* const l_resMATa[6] = {
"MAT_a", "MAT_a_TW", "Wgeneral", "Wspecial", "object", "objectTW",
};
/* 80393418-80393430 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWCNa */
static char* const l_resWCNa[6] = {
"WCN_a", "WCN_a_TW", "Wgeneral", "Wspecial", "object", "objectTW",
};
/* 80393430-80393448 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWONa */
static char* const l_resWONa[6] = {
"WON_a", "WON_a_TW", "Wgeneral", "Wspecial", "object", "objectTW",
};
/* 80393448-80393460 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWGNa */
static char* const l_resWGNa[6] = {
"WGN_a", "WGN_a_TW", "Wgeneral", "Wspecial", "object", "objectTW",
};
/* 80393460-80393478 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWANb */
static char* const l_resWANb[6] = {
"WAN_b", "WAN_b_TW", "Wgeneral", "Wspecial", "object", "objectTW",
};
/* 80393478-80393490 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWANa2 */
static char* const l_resWANa2[6] = {
"WAN_a2", "WAN_a2_TW", "Wgeneral", "Wspecial", "object", "objectTW",
};
/* 80393490-803934A8 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWADa2 */
static char* const l_resWADa2[6] = {
"WAD_a2", "WAD_a2_TW", "Wgeneral", "Wspecial", "object", "objectTW",
};
/* 803934A8-803934C0 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMATa2 */
static char* const l_resMATa2[6] = {
"MAT_a2", "MAT_a2_TW", "Wgeneral", "Wspecial", "object", "objectTW",
};
/* 803934C0-803934D8 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWCNa2 */
static char* const l_resWCNa2[6] = {
"WCN_a2", "WCN_a2_TW", "Wgeneral", "Wspecial", "object", "objectTW",
};
/* 803934D8-803934F0 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWONa2 */
static char* const l_resWONa2[6] = {
"WON_a2", "WON_a2_TW", "Wgeneral", "Wspecial", "object", "objectTW",
};
/* 803934F0-80393508 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWGNa2 */
static char* const l_resWGNa2[6] = {
"WGN_a2", "WGN_a2_TW", "Wgeneral", "Wspecial", "object", "objectTW",
};
/* 80393508-80393520 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWANb2 */
static char* const l_resWANb2[6] = {
"WAN_b2", "WAN_b2_TW", "Wgeneral", "Wspecial", "object", "objectTW",
};
@@ -176,21 +139,18 @@ struct anmTblPrm {
int index;
};
/* 80393520-80393588 -00001 0068+00 1/1 0/0 0/0 .rodata l_objTbl */
SECTION_RODATA static anmTblPrm const l_objTbl[13] = {
static anmTblPrm const l_objTbl[13] = {
{"object", 9}, {"object", 9}, {"object", 8}, {"object", 3}, {"object", 13},
{"object", 14}, {"object", 12}, {"object", 6}, {"object", 7}, {"object", 10},
{"object", 11}, {"object", 15}, {"object", 16},
};
/* 80393588-803935F0 -00001 0068+00 1/1 0/0 0/0 .rodata l_objTWTbl */
static anmTblPrm const l_objTWTbl[13] = {
{"objectTW", 9}, {"objectTW", 9}, {"objectTW", 8}, {"objectTW", 3}, {"objectTW", 13},
{"objectTW", 14}, {"objectTW", 12}, {"objectTW", 6}, {"objectTW", 7}, {"objectTW", 10},
{"objectTW", 11}, {"objectTW", -1}, {"objectTW", -1},
};
/* 803935F0-803937A0 -00001 01B0+00 1/1 0/0 0/0 .rodata l_bckTbl_M */
static anmTblPrm const l_bckTbl_M[54] = {
{"Mgeneral", 26}, {"Mgeneral", 27}, {"Mgeneral", 29}, {"Mgeneral", 30}, {"Mgeneral", 8},
{"Mgeneral", 9}, {"Mgeneral", 20}, {"Mgeneral", 21}, {"Mgeneral", 23}, {"Mgeneral", 5},
@@ -205,8 +165,7 @@ static anmTblPrm const l_bckTbl_M[54] = {
{"Mgeneral", -1}, {"Mgeneral", -1}, {"Mgeneral", -1}, {"Mgeneral", 10},
};
/* 803937A0-80393950 -00001 01B0+00 1/1 0/0 0/0 .rodata l_bckTbl_W */
SECTION_RODATA static anmTblPrm const l_bckTbl_W[54] = {
static anmTblPrm const l_bckTbl_W[54] = {
{"Wgeneral", 31}, {"Wgeneral", 32}, {"Wgeneral", 34}, {"Wgeneral", 35}, {"Wgeneral", 13},
{"Wgeneral", 14}, {"Wgeneral", 25}, {"Wgeneral", 26}, {"Wgeneral", 28}, {"Wgeneral", 10},
{"Wgeneral", 11}, {"Wgeneral", 33}, {"Wgeneral", 29}, {"Wgeneral", 27}, {"Wgeneral", 22},
@@ -220,7 +179,6 @@ SECTION_RODATA static anmTblPrm const l_bckTbl_W[54] = {
{"Wgeneral", 5}, {"Wgeneral", 6}, {"Wgeneral", 9}, {"Wgeneral", 15},
};
/* 80393950-80393994 01FFB0 0044+00 0/0 0/0 4/4 .rodata m_cylDat__10daNpcCd2_c */
dCcD_SrcCyl const daNpcCd2_c::m_cylDat = {
{
{0x0, {{0x0, 0x0, 0x0}, {0, 0}, 0x79}}, // mObj
@@ -235,7 +193,6 @@ dCcD_SrcCyl const daNpcCd2_c::m_cylDat = {
} // mCyl
};
/* 80393994-80393AFC 01FFF4 0168+00 1/1 0/0 0/0 .rodata a_transScaleTbl$3998 */
static Vec const a_transScaleTbl[30] = {
{1.0f, 1.0f, 1.0f}, {1.0f, 1.1983438f, 2.173357f},
{1.0f, 0.5581154f, 1.0f}, {1.0f, 0.95, 1.0f},
@@ -254,7 +211,6 @@ static Vec const a_transScaleTbl[30] = {
{1.0f, 0.8630768f, 1.0f}, {1.0f, 1.0529536f, 1.0f},
};
/* 80157D00-80157F28 152640 0228+00 0/0 0/0 4/4 .text NpcCreate__10daNpcCd2_cFi */
int daNpcCd2_c::NpcCreate(int param_1) {
J3DModelData* a_mdlData_p = getNpcMdlDataP(param_1);
JUT_ASSERT(590, NULL != a_mdlData_p);
@@ -295,7 +251,6 @@ int daNpcCd2_c::NpcCreate(int param_1) {
return 1;
}
/* 80157F28-80157F68 152868 0040+00 0/0 0/0 4/4 .text ObjCreate__10daNpcCd2_cFi */
J3DModel* daNpcCd2_c::ObjCreate(int param_0) {
J3DModel* model;
J3DModelData* modelData = getObjMdlDataP(param_0);
@@ -307,7 +262,6 @@ J3DModel* daNpcCd2_c::ObjCreate(int param_0) {
return model;
}
/* 80157F68-801580A8 1528A8 0140+00 0/0 0/0 1/1 .text ChairCreate__10daNpcCd2_cFf */
J3DModel* daNpcCd2_c::ChairCreate(f32 param_1) {
const char* resName = (mIsDarkWorld) ? "objectTW" : "object";
int resIndex = isM_() ? ((mIsDarkWorld != 0) ? 4 : 4) : ((mIsDarkWorld != 0) ? 5 : 5);
@@ -328,7 +282,6 @@ J3DModel* daNpcCd2_c::ChairCreate(f32 param_1) {
return NULL;
}
/* 801580A8-801580F0 1529E8 0048+00 4/4 0/0 5/5 .text isM___10daNpcCd2_cFv */
bool daNpcCd2_c::isM_() {
if (mpMorf == NULL) {
return m_type < 16;
@@ -338,7 +291,6 @@ bool daNpcCd2_c::isM_() {
return a_jntNum == JntM_NUM_e;
}
/* 803B61CC-803B6244 -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,
@@ -346,7 +298,6 @@ static char* const* l_resNameTbl[30] = {
l_resWADa2, l_resMATa2, l_resWCNa2, l_resWONa2, l_resWGNa2, l_resWANb2,
};
/* 803B6244-803B6334 013364 00F0+00 1/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], 4, l_resMONa[0], 4, l_resMANb[0], 3,
l_resMANc[0], 4, l_resMASa[0], 4, l_resMBNa[0], 4, l_resMANa2[0], 4, l_resMADa2[0], 4,
@@ -356,7 +307,6 @@ static anmTblPrm const l_bmdTbl[30] = {
l_resMATa2[0], 3, l_resWCNa2[0], 4, l_resWONa2[0], 4, l_resWGNa2[0], 4, l_resWANb2[0], 4,
};
/* 803B6334-803B6424 013454 00F0+00 1/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], 4, l_resMONa[1], 4, l_resMANb[1], 3,
l_resMANc[1], 4, l_resMASa[1], 4, l_resMBNa[1], 4, l_resMANa2[1], 4, l_resMADa2[1], 3,
@@ -366,7 +316,6 @@ static anmTblPrm const l_bmdTWTbl[30] = {
l_resMATa2[1], 3, l_resWCNa2[1], 4, l_resWONa2[1], 4, l_resWGNa2[1], 4, l_resWANb2[1], 4,
};
/* 803B6424-803B6514 013544 00F0+00 1/2 0/0 0/0 .data l_btpTbl */
static anmTblPrm const l_btpTbl[30] = {
l_resMANa[0], -1, l_resMADa[0], -1, l_resMCNa[0], 7, l_resMONa[0], 7, l_resMANb[0], -1,
l_resMANc[0], 7, l_resMASa[0], 7, l_resMBNa[0], 7, l_resMANa2[0], 7, l_resMADa2[0], 7,
@@ -376,7 +325,6 @@ static anmTblPrm const l_btpTbl[30] = {
l_resMATa2[0], -1, l_resWCNa2[0], 7, l_resWONa2[0], 7, l_resWGNa2[0], 7, l_resWANb2[0], 7,
};
/* 803B6514-803B6604 013634 00F0+00 1/2 0/0 0/0 .data l_btpTWTbl */
static anmTblPrm const l_btpTWTbl[30] = {
l_resMANa[1], -1, l_resMADa[1], -1, l_resMCNa[1], 7, l_resMONa[1], 7, l_resMANb[1], -1,
l_resMANc[1], 7, l_resMASa[1], 7, l_resMBNa[1], 7, l_resMANa2[1], 7, l_resMADa2[1], -1,
@@ -388,7 +336,6 @@ static anmTblPrm const l_btpTWTbl[30] = {
// TODO: these four tables should be converted into proper structs instead of byte arrays
/* 803B6604-803B7DC4 013724 17C0+00 0/1 0/0 0/0 .data a_jntTbl_M$3910 */
#pragma push
#pragma force_active on
static u8 a_jntTbl_M[16][19][20] = {
@@ -775,7 +722,6 @@ static u8 a_jntTbl_M[16][19][20] = {
};
#pragma pop
/* 803B7DC4-803B81C4 014EE4 0400+00 0/1 0/0 0/0 .data a_prmTbl_M$3911 */
#pragma push
#pragma force_active on
static u8 a_prmTbl_M[1024] = {
@@ -846,7 +792,6 @@ static u8 a_prmTbl_M[1024] = {
};
#pragma pop
/* 803B81C4-803B98BC 0152E4 16F8+00 0/1 0/0 0/0 .data a_jntTbl_W$3912 */
#pragma push
#pragma force_active on
static u8 a_jntTbl_W[14][21][20] = {
@@ -1221,7 +1166,6 @@ static u8 a_jntTbl_W[14][21][20] = {
};
#pragma pop
/* 803B98BC-803B9C3C 0169DC 0380+00 0/1 0/0 0/0 .data a_prmTbl_W$3913 */
#pragma push
#pragma force_active on
static u8 a_prmTbl_W[896] = {
@@ -1284,7 +1228,6 @@ static u8 a_prmTbl_W[896] = {
};
#pragma pop
/* 801580F0-80158420 152A30 0330+00 2/0 0/0 93/93 .text getAnmP__10daNpcCd2_cFii */
J3DAnmTransform* daNpcCd2_c::getAnmP(int param_1, int param_2) {
int a_anmNum = param_1;
switch (a_anmNum) {
@@ -1545,14 +1488,10 @@ J3DAnmTransform* daNpcCd2_c::getAnmP(int param_1, int param_2) {
return (J3DAnmTransform*)dComIfG_getObjectRes(name, index);
}
/* ############################################################################################## */
/* 80428610-8042861C 055330 000C+00 2/2 0/0 0/0 .bss @3982 */
//static u8 lit_3982[12];
/* 8042861C-8042C628 05533C 400C+00 2/3 0/0 20/20 .bss l_Cd2_HIO */
daNpcCd2_HIO_c l_Cd2_HIO;
/* 80158420-80158BB8 152D60 0798+00 0/0 0/0 5/5 .text setAttention__10daNpcCd2_cFi */
int daNpcCd2_c::setAttention(int param_1) {
static cXyz a_eyeOfsTbl[30] = {
cXyz(0.0f, 10.0f, 0.0f),
@@ -1594,7 +1533,6 @@ int daNpcCd2_c::setAttention(int param_1) {
return 1;
}
/* 80158BB8-80158CBC 1534F8 0104+00 0/0 0/0 4/4 .text loadResrc__10daNpcCd2_cFii */
int daNpcCd2_c::loadResrc(int idx, int param_1) {
int result;
if (mIsDarkWorld) {
@@ -1627,7 +1565,6 @@ int daNpcCd2_c::loadResrc(int idx, int param_1) {
return result;
}
/* 80158CBC-80158D88 1535FC 00CC+00 0/0 0/0 4/4 .text removeResrc__10daNpcCd2_cFii */
int daNpcCd2_c::removeResrc(int idx, int param_1) {
if (mIsDarkWorld) {
dComIfG_resDelete(&mPhase1, l_resNameTbl[idx][1]);
@@ -1641,20 +1578,17 @@ int daNpcCd2_c::removeResrc(int idx, int param_1) {
return 1;
}
/* 80158D88-80158DE4 1536C8 005C+00 0/0 0/0 4/4 .text setEnvTevCol__10daNpcCd2_cFv */
void daNpcCd2_c::setEnvTevCol() {
tevStr.YukaCol = dComIfG_Bgsp().GetPolyColor(mAcch.m_gnd);
tevStr.room_no = dComIfG_Bgsp().GetRoomId(mAcch.m_gnd);
}
/* 80158DE4-80158E28 153724 0044+00 0/0 0/0 4/4 .text setRoomNo__10daNpcCd2_cFv */
void daNpcCd2_c::setRoomNo() {
s32 id = dComIfG_Bgsp().GetRoomId(mAcch.m_gnd);
fopAcM_SetRoomNo(this, id);
mStts.SetRoomId(id);
}
/* 80158E28-80158F00 153768 00D8+00 0/0 0/0 3/3 .text animation__10daNpcCd2_cFi */
void daNpcCd2_c::animation(int param_1) {
if (mpBtpAnm != NULL && cLib_calcTimer(&field_0xaa4) == 0) {
field_0xac4++;
@@ -1670,8 +1604,6 @@ void daNpcCd2_c::animation(int param_1) {
}
}
/* 80158F00-80158F6C 153840 006C+00 0/0 0/0 92/92 .text
* setAnm__10daNpcCd2_cFP18J3DAnmTransformKeyffiii */
void daNpcCd2_c::setAnm(J3DAnmTransformKey* param_1, f32 param_2, f32 param_3, int param_4,
int param_5, int param_6) {
if (param_1 != mpMorf->getAnm()) {
@@ -1679,7 +1611,6 @@ void daNpcCd2_c::setAnm(J3DAnmTransformKey* param_1, f32 param_2, f32 param_3, i
}
}
/* 80158F6C-80158FF0 1538AC 0084+00 0/0 0/0 4/4 .text drawShadow__10daNpcCd2_cFf */
int daNpcCd2_c::drawShadow(f32 param_0) {
if (mIsDarkWorld && !daPy_py_c::checkNowWolfEyeUp()) {
return 1;
@@ -1690,14 +1621,11 @@ int daNpcCd2_c::drawShadow(f32 param_0) {
return 1;
}
/* ############################################################################################## */
/* 80393B08-80393B70 020168 0068+00 1/1 0/0 0/0 .rodata a_jntNumTbl$4692 */
static s32 const a_jntNumTbl[13][2] = {
{-1, -1}, {7, -1}, {11, -1}, {-1, 11}, {7, -1}, {-1, 11}, {1, -1},
{-1, 11}, {-1, 7}, {10, -1}, {-1, 11}, {10, -1}, {-1, 11},
};
/* 80158FF0-801590FC 153930 010C+00 0/0 0/0 4/4 .text drawObj__10daNpcCd2_cFiP8J3DModelf */
int daNpcCd2_c::drawObj(int idx, J3DModel* i_model, f32 i_scale) {
if (i_model == NULL) {
return 0;
@@ -1717,7 +1645,6 @@ int daNpcCd2_c::drawObj(int idx, J3DModel* i_model, f32 i_scale) {
return 1;
}
/* 801590FC-80159258 153A3C 015C+00 0/0 0/0 4/4 .text drawNpc__10daNpcCd2_cFv */
int daNpcCd2_c::drawNpc() {
if (mIsDarkWorld) {
g_env_light.settingTevStruct(4, &current.pos, &tevStr);
@@ -1805,8 +1732,6 @@ static inline s16 Cd2_HIO_jntRX(int param_1, int param_2) {
return 182.04444885253906f * rv;
}
/* 80159258-80159550 153B98 02F8+00 1/1 0/0 0/0 .text jntNodeCB__10daNpcCd2_cFP8J3DJointP8J3DModel
*/
int daNpcCd2_c::jntNodeCB(J3DJoint* param_1, J3DModel* param_2) {
int jntNo = param_1->getJntNo();
cXyz cStack_3c(Cd2_HIO_jntTX(m_type, jntNo), Cd2_HIO_jntTY(m_type, jntNo), Cd2_HIO_jntTZ(m_type, jntNo));
@@ -1822,8 +1747,6 @@ int daNpcCd2_c::jntNodeCB(J3DJoint* param_1, J3DModel* param_2) {
return 1;
}
/* 80159550-80159708 153E90 01B8+00 1/1 0/0 0/0 .text setHitodamaParticle__10daNpcCd2_cFv
*/
void daNpcCd2_c::setHitodamaParticle() {
static const u16 id[2] = {
0x8497,
@@ -1854,17 +1777,12 @@ void daNpcCd2_c::setHitodamaParticle() {
}
}
/* ############################################################################################## */
/* 80451004-80451008 000504 0004+00 2/2 0/0 0/0 .sbss target */
static void* target;
/* 80451008-8045100C 000508 0004+00 1/1 0/0 0/0 .sbss targetWay */
static f32 targetWay;
/* 8045100C-80451010 00050C 0002+02 2/2 0/0 0/0 .sbss wolfAngle */
static s16 wolfAngle;
/* 80159708-801597C0 154048 00B8+00 1/1 0/0 0/0 .text s_sub1__FPvPv */
static void* s_sub1(void* param_0, void* param_1) {
if (fopAc_IsActor(param_0) && fopAcM_GetName(param_0) == 0x28A) {
s16 angle = fopAcM_searchActorAngleY((fopAc_ac_c*)param_1, (fopAc_ac_c*)param_0);
@@ -1884,7 +1802,6 @@ static void* s_sub1(void* param_0, void* param_1) {
return NULL;
}
/* 801597C0-80159818 154100 0058+00 0/0 0/0 2/2 .text getEscapeTag__10daNpcCd2_cFv */
daTagEscape_c* daNpcCd2_c::getEscapeTag() {
target = NULL;
wolfAngle = fopAcM_searchPlayerAngleY(this);
@@ -1892,8 +1809,6 @@ daTagEscape_c* daNpcCd2_c::getEscapeTag() {
return (daTagEscape_c*)target;
}
/* 80159818-801598E8 154158 00D0+00 0/0 0/0 5/5 .text checkFearSituation__10daNpcCd2_cFv
*/
bool daNpcCd2_c::checkFearSituation() {
f32 dVar10 =
fopAcM_GetPosition_p(this)->y - fopAcM_GetPosition_p(daPy_getPlayerActorClass())->y;
@@ -1903,7 +1818,6 @@ bool daNpcCd2_c::checkFearSituation() {
fopAcM_searchPlayerDistanceXZ2(this) < std::pow(500.0f, 2.0f);
}
/* 801598E8-8015994C 154228 0064+00 1/1 0/0 0/0 .text getNpcMdlDataP__10daNpcCd2_cFi */
J3DModelData* daNpcCd2_c::getNpcMdlDataP(int param_1) {
const anmTblPrm* def;
if (mIsDarkWorld) {
@@ -1914,7 +1828,6 @@ J3DModelData* daNpcCd2_c::getNpcMdlDataP(int param_1) {
return (J3DModelData*)dComIfG_getObjectRes(def->name, def->index);
}
/* 8015994C-801599C4 15428C 0078+00 1/1 0/0 0/0 .text getObjMdlDataP__10daNpcCd2_cFi */
J3DModelData* daNpcCd2_c::getObjMdlDataP(int param_1) {
J3DModelData* model_data = NULL;
const anmTblPrm* def;
@@ -1929,7 +1842,6 @@ J3DModelData* daNpcCd2_c::getObjMdlDataP(int param_1) {
return model_data;
}
/* 801599C4-80159A38 154304 0074+00 1/1 0/0 0/0 .text getTexAnmP__10daNpcCd2_cFi */
J3DAnmTexPattern* daNpcCd2_c::getTexAnmP(int param_1) {
const anmTblPrm* def;
if (mIsDarkWorld) {
@@ -1943,8 +1855,6 @@ J3DAnmTexPattern* daNpcCd2_c::getTexAnmP(int param_1) {
return NULL;
}
/* 80159A38-80159C14 154378 01DC+00 0/0 0/0 9/9 .text setPath__11PathTrace_cFiiiP4cXyzb
*/
bool PathTrace_c::setPath(int param_1, int param_2, int param_3, cXyz* param_4, bool param_5) {
mPath = NULL;
mPath = dPath_GetRoomPath(param_1, param_2);
@@ -1970,7 +1880,6 @@ bool PathTrace_c::setPath(int param_1, int param_2, int param_3, cXyz* param_4,
return TRUE;
}
/* 80159C14-80159DC0 154554 01AC+00 1/1 0/0 6/6 .text checkPoint__11PathTrace_cF4cXyzf */
bool PathTrace_c::checkPoint(cXyz param_1, f32 param_2) {
dPnt* pnt = dPath_GetPnt(mPath, field_0x20);
f32 dist = param_1.absXZ(pnt->m_position);
@@ -1982,8 +1891,6 @@ bool PathTrace_c::checkPoint(cXyz param_1, f32 param_2) {
return mNextPoint < 0.0f;
}
/* 80159DC0-80159E54 154700 0094+00 0/0 0/0 6/6 .text checkPathEnd__11PathTrace_cF4cXyzf
*/
bool PathTrace_c::checkPathEnd(cXyz param_1, f32 param_2) {
if (checkPoint(param_1, param_2)) {
if (field_0x24 > 0) {
@@ -1997,7 +1904,6 @@ bool PathTrace_c::checkPathEnd(cXyz param_1, f32 param_2) {
return false;
}
/* 80159E54-80159ECC 154794 0078+00 0/0 0/0 10/10 .text getTargetPoint__11PathTrace_cFP3Vec */
void PathTrace_c::getTargetPoint(Vec* targetPoint) {
if (mObstacle == NULL) {
dPnt* pnt = dPath_GetPnt(mPath, field_0x20);
@@ -2007,7 +1913,6 @@ void PathTrace_c::getTargetPoint(Vec* targetPoint) {
}
}
/* 80159ECC-80159F98 15480C 00CC+00 1/1 0/0 0/0 .text setAvoidPoint__11PathTrace_cFv */
void PathTrace_c::setAvoidPoint() {
JUT_ASSERT(1602, mPath != NULL);
JUT_ASSERT(1603, mMyself != NULL);
@@ -2029,14 +1934,11 @@ void PathTrace_c::setAvoidPoint() {
mDoMtx_stack_c::multVec(&mAvoidPoint, &mAvoidPoint);
}
/* 80159F98-8015A0D0 1548D8 0138+00 0/0 0/0 8/8 .text setNextPoint__11PathTrace_cFR4cXyz
*/
void PathTrace_c::setNextPoint(cXyz& param_1) {
setNextPoint();
mNextPoint = param_1.abs(dPath_GetPnt(mPath, field_0x20)->m_position);
}
/* 8015A0D0-8015A264 154A10 0194+00 1/1 0/0 0/0 .text setNextPoint__11PathTrace_cFv */
void PathTrace_c::setNextPoint() {
dPnt* pnt1 = dPath_GetPnt(mPath, field_0x20);
if (field_0x24 > 0) {
@@ -2050,7 +1952,6 @@ void PathTrace_c::setNextPoint() {
mNextPoint = G_CM3D_F_INF;
}
/* 8015A264-8015A294 154BA4 0030+00 1/1 0/0 0/0 .text incIndex__11PathTrace_cFi */
int PathTrace_c::incIndex(int param_1) {
if (++param_1 < mPath->m_num) {
return param_1;
@@ -2062,7 +1963,6 @@ int PathTrace_c::incIndex(int param_1) {
}
}
/* 8015A294-8015A2C4 154BD4 0030+00 1/1 0/0 0/0 .text decIndex__11PathTrace_cFi */
int PathTrace_c::decIndex(int param_1) {
int rv = param_1 - 1;
if (rv < 0) {
@@ -2075,7 +1975,6 @@ int PathTrace_c::decIndex(int param_1) {
return rv;
}
/* 8015A2C4-8015A370 154C04 00AC+00 1/1 0/0 0/0 .text s_sub__FPvPv */
static void* s_sub(void* param_1, void* param_2) {
if (fopAcM_IsActor(param_1) &&
((fopAcM_GetName(param_1) == PROC_ALINK && !dKy_darkworld_check()) ||
@@ -2090,7 +1989,6 @@ static void* s_sub(void* param_1, void* param_2) {
return NULL;
}
/* 8015A370-8015A3E4 154CB0 0074+00 0/0 0/0 4/4 .text checkObstacle__11PathTrace_cFP10fopAc_ac_c */
fopAc_ac_c* PathTrace_c::checkObstacle(fopAc_ac_c* param_0) {
mMyself = param_0;
mObstacle = NULL;
@@ -2104,8 +2002,6 @@ fopAc_ac_c* PathTrace_c::checkObstacle(fopAc_ac_c* param_0) {
return mObstacle;
}
/* 8015A3E4-8015A4D8 154D24 00F4+00 1/1 0/0 0/0 .text
* checkObstacleSub__11PathTrace_cFP10fopAc_ac_c */
void PathTrace_c::checkObstacleSub(fopAc_ac_c* pObstacle) {
if (mMyself != pObstacle) {
JUT_ASSERT(1816, mPath != NULL);
@@ -2133,7 +2029,6 @@ void PathTrace_c::checkObstacleSub(fopAc_ac_c* pObstacle) {
}
}
/* 8015A4D8-8015A678 154E18 01A0+00 1/1 0/0 0/0 .text __ct__14daNpcCd2_HIO_cFv */
daNpcCd2_HIO_c::daNpcCd2_HIO_c() {
for (int i = 0; i < 16; i++) {
for (int j = 0; j < 19; j++) {