Skip to content

Commit e49ed12

Browse files
authored
d_a_npc_ykm work (#2566)
* initial work * got to cut functions * Tiny work * All functions worked on * took out param dtor * naming work * cleanup * pr cleanup
1 parent 3caf422 commit e49ed12

File tree

9 files changed

+3763
-2719
lines changed

9 files changed

+3763
-2719
lines changed

include/d/actor/d_a_npc.h

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,15 @@ class daNpcT_JntAnm_c {
289289
setDirect(i_direct);
290290
}
291291

292+
void lookAround2(u8 i_direct, int i_baseTimer) {
293+
if (setMode(LOOK_MODE_8, FALSE)) {
294+
mTimer = 0;
295+
}
296+
297+
mBaseTimer = i_baseTimer;
298+
setDirect(i_direct);
299+
}
300+
292301
void sorasu1(cXyz *arg0, u8 arg1) {
293302
BOOL diff_ptrs = mAttnPosP != arg0;
294303
if (setMode(5, diff_ptrs) != 0) {
@@ -334,6 +343,9 @@ class daNpcT_DmgStagger_c {
334343
mPower[i] = power;
335344
}
336345
}
346+
void setRebirth() {
347+
mRebirth = true;
348+
}
337349

338350
/* 0x00 */ csXyz mAngle[2];
339351
/* 0x0C */ f32 mPower[2];
@@ -432,6 +444,8 @@ class daNpcT_Path_c {
432444

433445
Vec getPntPos(int i_idx) { return mPathInfo->m_points[i_idx].m_position; }
434446

447+
u8 getArg0() { return mPathInfo->m_points[mIdx].mArg0; }
448+
435449
int chkClose() {
436450
BOOL rt = dPath_ChkClose(mPathInfo);
437451
return rt;
@@ -456,6 +470,8 @@ class daNpcT_Path_c {
456470
mDirection = 0;
457471
field_0x1E = 1;
458472
}
473+
474+
BOOL chkNextId() { return mPathInfo->m_nextID != 0xFFFF; }
459475
};
460476

461477
class mDoExt_McaMorfSO;
@@ -761,6 +777,7 @@ void daNpcT_onEvtBit(u32 i_idx);
761777
BOOL daNpcT_chkTmpBit(u32 i_idx);
762778
BOOL daNpcT_getPlayerInfoFromPlayerList(int param_0, int i_roomNo, cXyz* o_spawnPos,
763779
csXyz* o_angle);
780+
int daNpcT_judgeRace(dPath* i_path, fopAc_ac_c** param_1, daNpcT_pntData_c* i_pntData, int param_3, int* param_4);
764781

765782
class daBaseNpc_matAnm_c : public J3DMaterialAnm {
766783
public:

0 commit comments

Comments
 (0)