falso
/
tp
mirror of https://github.com/zeldaret/tp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

npc_kakashi done (#2651)

This commit is contained in:
TakaRikka 2025-09-12 14:29:20 -07:00 committed by GitHub
parent 8a3a6d2997
commit f91257cc62
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
49 changed files with 1390 additions and 1705 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.py
View File

@ -1609,7 +1609,7 @@ config.libs = [
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_npc_fairy_seirei"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_npc_fish"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_npc_henna"),
ActorRel(NonMatching, "d_a_npc_kakashi"),
ActorRel(MatchingFor("GZ2E01"), "d_a_npc_kakashi"),
ActorRel(NonMatching, "d_a_npc_kkri"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_npc_kolin"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_npc_maro"),

2
include/d/actor/d_a_npc.h
View File

@ -790,6 +790,8 @@ BOOL daNpcT_chkTmpBit(u32 i_idx);
BOOL daNpcT_getPlayerInfoFromPlayerList(int param_0, int i_roomNo, cXyz* o_spawnPos,
csXyz* o_angle);
int daNpcT_judgeRace(dPath* i_path, fopAc_ac_c** param_1, daNpcT_pntData_c* i_pntData, int param_3, int* param_4);
BOOL daNpcT_chkActorInScreen(fopAc_ac_c* i_ActorP, f32 param_1, f32 param_2, f32 param_3,
f32 param_4, f32 param_5, f32 param_6, f32 param_7, int param_8);
class daBaseNpc_matAnm_c : public J3DMaterialAnm {
public:

137
include/d/actor/d_a_npc_kakashi.h
View File

@ -11,63 +11,116 @@
* @details
*
*/
class daNpc_Kakashi_c : public fopAc_ac_c {
class daNpc_Kakashi_c : public daNpcT_c {
public:
/* 8054B36C */ ~daNpc_Kakashi_c();
/* 8054B4E8 */ void create();
/* 8054B7D8 */ void CreateHeap();
/* 8054B908 */ void Delete();
/* 8054B93C */ void Execute();
/* 8054B994 */ void Draw();
/* 8054B9D8 */ void ctrlJoint(J3DJoint*, J3DModel*);
/* 8054BB34 */ void createHeapCallBack(fopAc_ac_c*);
/* 8054BB54 */ void ctrlJointCallBack(J3DJoint*, int);
/* 8054BBAC */ void getType();
/* 8054BC10 */ void isDelete();
typedef int (daNpc_Kakashi_c::*ActionFunc)(void*);
/* 8054B4E8 */ int create();
/* 8054B7D8 */ int CreateHeap();
/* 8054B908 */ int Delete();
/* 8054B93C */ int Execute();
/* 8054B994 */ int Draw();
/* 8054BB34 */ static int createHeapCallBack(fopAc_ac_c*);
/* 8054BB54 */ static int ctrlJointCallBack(J3DJoint*, int);
/* 8054BBAC */ int getType();
/* 8054BC10 */ int isDelete();
/* 8054BC98 */ void reset();
/* 8054BEA8 */ void setParam();
/* 8054BF88 */ void srchActors();
/* 8054BF8C */ void checkChangeEvt();
/* 8054C034 */ void evtTalk();
/* 8054C0D4 */ void evtEndProc();
/* 8054C0E8 */ void evtCutProc();
/* 8054C1B0 */ void action();
/* 8054C268 */ void beforeMove();
/* 8054C2E0 */ void setAttnPos();
/* 8054C584 */ void setCollision();
/* 8054C924 */ bool drawDbgInfo();
/* 8054C92C */ void selectAction();
/* 8054CA1C */ void chkAction(int (daNpc_Kakashi_c::*)(void*));
/* 8054CA48 */ void setAction(int (daNpc_Kakashi_c::*)(void*));
/* 8054CAF0 */ void hitChk();
/* 8054C92C */ int selectAction();
/* 8054CA1C */ BOOL chkAction(ActionFunc);
/* 8054CA48 */ int setAction(ActionFunc);
/* 8054CAF0 */ fopAc_ac_c* hitChk();
/* 8054CEA0 */ void setStaggerParam(fopAc_ac_c*);
/* 8054D26C */ void setPrtcls(int);
/* 8054D374 */ void judgeSwdTutorial();
/* 8054D490 */ void cutSwdTutorial(int);
/* 8054D57C */ void cutGetWoodSwd(int);
/* 8054D604 */ void cutMarosWhisper(int);
/* 8054D668 */ void wait(void*);
/* 8054D694 */ void swdTutorial(void*);
/* 8054D8BC */ void talk(void*);
/* 8054E804 */ daNpc_Kakashi_c(daNpcT_faceMotionAnmData_c const*, daNpcT_motionAnmData_c const*,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_evtData_c const*, char**);
/* 8054D374 */ int judgeSwdTutorial();
/* 8054D490 */ int cutSwdTutorial(int);
/* 8054D57C */ int cutGetWoodSwd(int);
/* 8054D604 */ int cutMarosWhisper(int);
/* 8054D668 */ int wait(void*);
/* 8054D694 */ int swdTutorial(void*);
/* 8054D8BC */ int talk(void*);
static void* mCutNameList[4];
static u8 mCutList[48];
/* 8054E804 */ daNpc_Kakashi_c(daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData,
daNpcT_motionAnmData_c const* i_motionAnmData,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
int i_faceMotionStepNum,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, int i_motionStepNum,
daNpcT_evtData_c const* i_evtData, char** i_arcNames)
: daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
i_arcNames)
{
OS_REPORT("|%06d:%x|daNpc_Kakashi_c -> コンストラクト\n", g_Counter.mCounter0, this);
}
/* 8054B36C */ virtual ~daNpc_Kakashi_c();
/* 8054B9D8 */ virtual int ctrlJoint(J3DJoint*, J3DModel*);
/* 8054BEA8 */ virtual void setParam();
/* 8054BF8C */ virtual BOOL checkChangeEvt();
/* 8054C034 */ virtual BOOL evtTalk();
/* 8054C0D4 */ virtual BOOL evtEndProc();
/* 8054C0E8 */ virtual BOOL evtCutProc();
/* 8054C1B0 */ virtual void action();
/* 8054C268 */ virtual void beforeMove();
/* 8054C2E0 */ virtual void setAttnPos();
/* 8054C584 */ virtual void setCollision();
/* 8054C924 */ virtual int drawDbgInfo();
int getFlowNodeNo() {
u16 prm = home.angle.x;
return prm == 0xFFFF ? -1 : prm;
}
u8 getTalkPattern() {
u8 var_r31 = (fopAcM_GetParam(this) & 0xF0000000) >> 0x1C;
if (var_r31 == 15) {
var_r31 = 0;
}
return var_r31;
}
u8 getBitSW() { return (fopAcM_GetParam(this) & 0xFF00) >> 8; }
u8 getBitSW2() { return (fopAcM_GetParam(this) & 0xFF0000) >> 16; }
static char* mCutNameList[4];
static int (daNpc_Kakashi_c::*mCutList[])(int);
private:
/* 0x568 */ u8 field_0x568[0x1398 - 0x568];
/* 0x0E40 */ u8 field_0xE40[0xE44 - 0xE40];
/* 0x0E44 */ Z2SoundObjSimple mSound;
/* 0x0E64 */ dCcD_Cyl mCcCyl;
/* 0x0FA0 */ dCcD_Sph mCcSph[3];
/* 0x1348 */ u8 mType;
/* 0x134C */ ActionFunc mSelectAction;
/* 0x1358 */ ActionFunc mAction;
/* 0x1364 */ csXyz field_0x1364[3];
/* 0x1378 */ f32 field_0x1378[3];
/* 0x1384 */ s16 field_0x1384[3];
/* 0x138A */ u8 field_0x138A[0x138C - 0x138A];
/* 0x138C */ s16 field_0x138c;
/* 0x138E */ u8 field_0x138e;
/* 0x138F */ u8 field_0x138f;
/* 0x1390 */ u8 field_0x1390;
/* 0x1391 */ u8 field_0x1391;
/* 0x1392 */ u8 field_0x1392;
/* 0x1393 */ u8 field_0x1393;
/* 0x1394 */ u8 field_0x1394;
};
STATIC_ASSERT(sizeof(daNpc_Kakashi_c) == 0x1398);
struct daNpc_Kakashi_HIOParam {
/* 0x00 */ daNpcT_HIOParam common;
/* 0x8C */ f32 field_0x8c;
/* 0x90 */ f32 field_0x90;
/* 0x94 */ f32 field_0x94;
};
class daNpc_Kakashi_Param_c {
public:
/* 8054EA58 */ ~daNpc_Kakashi_Param_c();
/* 8054EA58 */ virtual ~daNpc_Kakashi_Param_c() {}
static u8 const m[152];
static const daNpc_Kakashi_HIOParam m;
};

4
include/d/d_com_static.h
View File

@ -6,9 +6,11 @@
u8 daNpcKakashi_getSwdTutorialStep();
void daNpcKakashi_setSwdTutorialStep(u8 iEvtNum);
bool daNpcKakashi_getSwdTutorialResult();
BOOL daNpcKakashi_chkSwdTutorialStage();
u8 daNpcKakashi_chkSwdTutorialStage();
u8 daNpcKakashi_getSuccessCount();
void daNpcKakashi_clrSuccessCount();
void daNpcKakashi_setSwdTutorialResult(bool param_0);
void daNpcKakashi_incSuccessCount();
int daNpcMsg_setEvtNum(u8 iEvtNum);
#endif /* D_COM_D_COM_STATIC_H */

59
include/f_op/f_op_actor_mng.h
View File

@ -114,35 +114,36 @@ struct DOUBLE_POS {
};
enum fopAcM_STATUS {
/* 0x0000001 */ fopAcM_STATUS_UNK_000001 = 1 << 0,
/* 0x0000002 */ fopAcM_STATUS_UNK_000002 = 1 << 1,
/* 0x0000004 */ fopAcM_STATUS_UNK_000004 = 1 << 2,
/* 0x0000008 */ fopAcM_STATUS_UNK_000008 = 1 << 3,
/* 0x0000010 */ fopAcM_STATUS_UNK_000010 = 1 << 4,
/* 0x0000020 */ fopAcM_STATUS_UNK_000020 = 1 << 5,
/* 0x0000040 */ fopAcM_STATUS_UNK_000040 = 1 << 6,
/* 0x0000080 */ fopAcM_STATUS_UNK_000080 = 1 << 7,
/* 0x0000100 */ fopAcM_STATUS_UNK_000100 = 1 << 8,
/* 0x0000200 */ fopAcM_STATUS_UNK_000200 = 1 << 9,
/* 0x0000400 */ fopAcM_STATUS_UNK_000400 = 1 << 10,
/* 0x0000800 */ fopAcM_STATUS_UNK_000800 = 1 << 11,
/* 0x0001000 */ fopAcM_STATUS_UNK_001000 = 1 << 12,
/* 0x0002000 */ fopAcM_STATUS_CARRY_NOW = 1 << 13,
/* 0x0004000 */ fopAcM_STATUS_UNK_004000 = 1 << 14,
/* 0x0008000 */ fopAcM_STATUS_UNK_008000 = 1 << 15,
/* 0x0010000 */ fopAcM_STATUS_UNK_010000 = 1 << 16,
/* 0x0020000 */ fopAcM_STATUS_UNK_200000 = 1 << 17,
/* 0x0040000 */ fopAcM_STATUS_UNK_400000 = 1 << 18,
/* 0x0080000 */ fopAcM_STATUS_UNK_800000 = 1 << 19,
/* 0x0100000 */ fopAcM_STATUS_HOOK_CARRY_NOW = 1 << 20,
/* 0x0200000 */ fopAcM_STATUS_UNK_2000000 = 1 << 21,
/* 0x0400000 */ fopAcM_STATUS_UNK_4000000 = 1 << 22,
/* 0x0800000 */ fopAcM_STATUS_UNK_8000000 = 1 << 23,
/* 0x1000000 */ fopAcM_STATUS_UNK_10000000 = 1 << 24,
/* 0x2000000 */ fopAcM_STATUS_UNK_20000000 = 1 << 25,
/* 0x4000000 */ fopAcM_STATUS_UNK_40000000 = 1 << 26,
/* 0x8000000 */ fopAcM_STATUS_UNK_80000000 = 1 << 27,
/* 0x8000000 */ fopAcM_STATUS_HAWK_CARRY_NOW = 1 << 31,
/* 0x00000001 */ fopAcM_STATUS_UNK_0x1 = 1 << 0,
/* 0x00000002 */ fopAcM_STATUS_UNK_0x2 = 1 << 1,
/* 0x00000004 */ fopAcM_STATUS_UNK_0x4 = 1 << 2,
/* 0x00000008 */ fopAcM_STATUS_UNK_0x8 = 1 << 3,
/* 0x00000010 */ fopAcM_STATUS_UNK_0x10 = 1 << 4,
/* 0x00000020 */ fopAcM_STATUS_UNK_0x20 = 1 << 5,
/* 0x00000040 */ fopAcM_STATUS_UNK_0x40 = 1 << 6,
/* 0x00000080 */ fopAcM_STATUS_UNK_0x80 = 1 << 7,
/* 0x00000100 */ fopAcM_STATUS_UNK_0x100 = 1 << 8,
/* 0x00000200 */ fopAcM_STATUS_UNK_0x200 = 1 << 9,
/* 0x00000400 */ fopAcM_STATUS_UNK_0x400 = 1 << 10,
/* 0x00000800 */ fopAcM_STATUS_UNK_0x800 = 1 << 11,
/* 0x00001000 */ fopAcM_STATUS_UNK_0x1000 = 1 << 12,
/* 0x00002000 */ fopAcM_STATUS_CARRY_NOW = 1 << 13,
/* 0x00004000 */ fopAcM_STATUS_UNK_0x4000 = 1 << 14,
/* 0x00008000 */ fopAcM_STATUS_UNK_0x8000 = 1 << 15,
/* 0x00010000 */ fopAcM_STATUS_UNK_0x10000 = 1 << 16,
/* 0x00020000 */ fopAcM_STATUS_UNK_0x20000 = 1 << 17,
/* 0x00040000 */ fopAcM_STATUS_UNK_0x40000 = 1 << 18,
/* 0x00080000 */ fopAcM_STATUS_UNK_0x80000 = 1 << 19,
/* 0x00100000 */ fopAcM_STATUS_HOOK_CARRY_NOW = 1 << 20,
/* 0x00200000 */ fopAcM_STATUS_UNK_0x200000 = 1 << 21,
/* 0x00400000 */ fopAcM_STATUS_UNK_0x400000 = 1 << 22,
/* 0x00800000 */ fopAcM_STATUS_UNK_0x800000 = 1 << 23,
/* 0x01000000 */ fopAcM_STATUS_UNK_0x1000000 = 1 << 24,
/* 0x02000000 */ fopAcM_STATUS_UNK_0x2000000 = 1 << 25,
/* 0x04000000 */ fopAcM_STATUS_UNK_0x4000000 = 1 << 26,
/* 0x08000000 */ fopAcM_STATUS_UNK_0x8000000 = 1 << 27,
/* 0x80000000 */ fopAcM_STATUS_HAWK_CARRY_NOW = 1 << 31,
};
inline s8 fopAcM_GetRoomNo(const fopAc_ac_c* i_actor) {

10
src/d/actor/d_a_cow.cpp
View File

@ -1957,7 +1957,7 @@ void daCow_c::executeCrazyWait() {
mAcchCir.SetWall(100.0f, 110.0f);
mTimer1 = 30;
fopAcM_OffStatus(this, fopAcM_STATUS_UNK_000100);
fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x100);
}
}
@ -2471,7 +2471,7 @@ void daCow_c::executeCrazyBack() {
}
break;
case daCow_c::Action_4:
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_000100);
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x100);
if (fopAcM_CheckCondition(this, fopAcCnd_NODRAW_e)) {
fopAcM_delete(this);
}
@ -2547,19 +2547,19 @@ void daCow_c::action_crazy() {
dComIfGoat_SetThrow(this);
mMode = daCow_c::Mode_1;
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_000100);
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x100);
break;
case daCow_c::Mode_1:
TICK_TIMER(mForgetCowPTimer);
TICK_TIMER(mTimer1);
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_004000);
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x4000);
if (dComIfGp_event_runCheck() &&
strcmp(dComIfGp_getEventManager().getRunEventName(), "WILDGOAT") &&
strcmp(dComIfGp_getEventManager().getRunEventName(), "WILDGOAT_SUCCESS") &&
strcmp(dComIfGp_getEventManager().getRunEventName(), "WILDGOAT_FAILURE"))
{
fopAcM_OffStatus(this, fopAcM_STATUS_UNK_004000);
fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x4000);
}
switch (mCrazy) {

2
src/d/actor/d_a_e_bi.cpp
View File

@ -805,7 +805,7 @@ static int daE_BI_Execute(e_bi_class* i_this) {
a_this->attention_info.position.y += KREG_F(3) + 45.0f;
f32 fVar1 = 0.0f;
if (dComIfGp_checkPlayerStatus0(0, fopAcM_STATUS_UNK_800000)) {
if (dComIfGp_checkPlayerStatus0(0, fopAcM_STATUS_UNK_0x80000)) {
fVar1 = 100.0f;
}

4
src/d/actor/d_a_e_dn.cpp
View File

@ -3372,7 +3372,7 @@ static cPhs__Step daE_DN_Create(fopAc_ac_c* a_this) {
l_HIO.field_0x4 = -1;
}
fopAcM_OnStatus(a_this, fopAcM_STATUS_UNK_000100);
fopAcM_OnStatus(a_this, fopAcM_STATUS_UNK_0x100);
a_this->attention_info.flags = fopAc_AttnFlag_BATTLE_e;
fopAcM_SetMtx(a_this, i_this->mpModelMorf->getModel()->getBaseTRMtx());
fopAcM_SetMin(a_this, -200.0f, -200.0f, -200.0f);
@ -3444,7 +3444,7 @@ static cPhs__Step daE_DN_Create(fopAc_ac_c* a_this) {
if ((i_this->field_0x5b6 == 13 || i_this->field_0x5b6 == 14) || (i_this->field_0x5b6 == 15 || i_this->field_0x5b6 == 16)) {
i_this->field_0x10d8 = 1;
i_this->mAction = ACTION_REG;
fopAcM_OnStatus(a_this, fopAcM_STATUS_UNK_004000);
fopAcM_OnStatus(a_this, fopAcM_STATUS_UNK_0x4000);
i_this->mAcchCir.SetWall(80.0f, 2.0f);
}

2
src/d/actor/d_a_e_fz.cpp
View File

@ -993,7 +993,7 @@ s32 daE_FZ_c::create() {
speedF = rng + 4.0f;
field_0x6fc = rng + 4.0f;
if (field_0x714 == 1) {
fopAcM_OnStatus(this,fopAcM_STATUS_UNK_004000);
fopAcM_OnStatus(this,fopAcM_STATUS_UNK_0x4000);
}
}

4
src/d/actor/d_a_e_mf.cpp
View File

@ -3234,7 +3234,7 @@ static cPhs__Step daE_MF_Create(fopAc_ac_c* a_this) {
l_HIO.field_0x4 = -1;
}
fopAcM_OnStatus(a_this, fopAcM_STATUS_UNK_000100);
fopAcM_OnStatus(a_this, fopAcM_STATUS_UNK_0x100);
a_this->attention_info.flags = fopAc_AttnFlag_BATTLE_e;
fopAcM_SetMtx(a_this, i_this->mpModelMorf->getModel()->getBaseTRMtx());
fopAcM_SetMin(a_this, -200.0f, -200.0f, -200.0f);
@ -3302,7 +3302,7 @@ static cPhs__Step daE_MF_Create(fopAc_ac_c* a_this) {
i_this->mAtInfo.mpSound = &i_this->mSound;
if (strcmp(dComIfGp_getStartStageName(), "D_MN09") == 0) {
fopAcM_OnStatus(a_this, fopAcM_STATUS_UNK_004000);
fopAcM_OnStatus(a_this, fopAcM_STATUS_UNK_0x4000);
}
c_start = 1;

6
src/d/actor/d_a_e_po.cpp
View File

@ -1513,7 +1513,7 @@ static void e_po_limbering(e_po_class* i_this) {
dComIfGp_event_reset();
daPy_getPlayerActorClass()->cancelOriginalDemo();
mRollDemoFlag = 2;
fopAcM_OffStatus(a_this, fopAcM_STATUS_UNK_004000);
fopAcM_OffStatus(a_this, fopAcM_STATUS_UNK_0x4000);
i_this->field_0x74A[2] = 0;
i_this->mActionID = ACT_ROLL_MOVE;
i_this->mType = 0;
@ -1571,7 +1571,7 @@ static void e_po_roll_move(e_po_class* i_this) {
if (mRollDemoFlag != 0) {
anm_init(i_this, ANM_WAIT02, 10.0f, 2, 1.0f);
i_this->field_0x74A[1] = 2;
fopAcM_OffStatus(a_this, fopAcM_STATUS_UNK_004000);
fopAcM_OffStatus(a_this, fopAcM_STATUS_UNK_0x4000);
} else {
anm_init(i_this, ANM_RUN_AFTER2, 10.0f, 2, 1.0f);
i_this->field_0x74A[1] = 20;
@ -1602,7 +1602,7 @@ static void e_po_roll_move(e_po_class* i_this) {
if (mRollPlus != 0) {
if (i_this->mAnmID == ANM_AWAKE) {
anm_init(i_this, ANM_WAIT02, 10.0f, 2, 1.0f);
fopAcM_OffStatus(a_this, fopAcM_STATUS_UNK_004000);
fopAcM_OffStatus(a_this, fopAcM_STATUS_UNK_0x4000);
}
i_this->field_0x7D4 = 0.0f;
i_this->mType = 2;

8
src/d/actor/d_a_e_rd.cpp
View File

@ -7285,7 +7285,7 @@ static cPhs__Step daE_RD_Create(fopAc_ac_c* a_this) {
i_this->field_0x12a0 = 0;
}
fopAcM_OnStatus(a_this, fopAcM_STATUS_UNK_000100);
fopAcM_OnStatus(a_this, fopAcM_STATUS_UNK_0x100);
a_this->attention_info.flags = fopAc_AttnFlag_BATTLE_e;
if (i_this->field_0x5b6 == 6) {
@ -7333,7 +7333,7 @@ static cPhs__Step daE_RD_Create(fopAc_ac_c* a_this) {
i_this->mAction = ACTION_REG;
i_this->mMode = 0;
i_this->field_0xafb = 1;
fopAcM_OffStatus(a_this, fopAcM_STATUS_UNK_000100);
fopAcM_OffStatus(a_this, fopAcM_STATUS_UNK_0x100);
}
if (i_this->field_0x5b6 > 2) {
@ -7445,10 +7445,10 @@ static cPhs__Step daE_RD_Create(fopAc_ac_c* a_this) {
if (data_80519200 != 0 || strcmp(dComIfGp_getStartStageName(), "F_SP115") == 0 ||
(strcmp(dComIfGp_getStartStageName(), "F_SP121") == 0 && fopAcM_GetRoomNo(a_this) == 0)) {
// Lake Hylia or Hyrule Field
fopAcM_OffStatus(a_this, fopAcM_STATUS_UNK_004000);
fopAcM_OffStatus(a_this, fopAcM_STATUS_UNK_0x4000);
}
} else if (i_this->mBossMode != 4) {
fopAcM_OffStatus(a_this, fopAcM_STATUS_UNK_004000);
fopAcM_OffStatus(a_this, fopAcM_STATUS_UNK_0x4000);
}
if (strcmp(dComIfGp_getStartStageName(), "F_SP121") == 0 && fopAcM_GetRoomNo(a_this) == 0) {

4
src/d/actor/d_a_e_sm.cpp
View File

@ -1641,7 +1641,7 @@ void daE_SM_c::CoreAction() {
}
field_0xa60.CrrPos(dComIfG_Bgsp());
fopAcM_OffStatus(this, fopAcM_STATUS_UNK_000100);
fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x100);
}
}
@ -1714,7 +1714,7 @@ int daE_SM_c::Execute() {
field_0x6d6--;
}
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_000100);
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x100);
Action();
CoreAction();
cXyz i_effSize(1.0f, 1.0f, 1.0f);

2
src/d/actor/d_a_e_sm2.cpp
View File

@ -955,7 +955,7 @@ static void damage_check(e_sm2_class* i_this) {
i_this->isPiece = TRUE;
actor->speed.y = 20.0f + BREG_F(6);
i_this->field_0xfd4 = 1;
fopAcM_OffStatus(actor, fopAcM_STATUS_UNK_000100);
fopAcM_OffStatus(actor, fopAcM_STATUS_UNK_0x100);
}
return;
}

2
src/d/actor/d_a_e_sw.cpp
View File

@ -1198,7 +1198,7 @@ static void* s_child_sub(void* i_actor, void* i_data) {
void daE_SW_c::executeMaster() {
camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
fopAcM_OffStatus(this, fopAcM_STATUS_UNK_000100);
fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x100);
attention_info.flags = 0;
field_0x98c.OffTgSetBit();
field_0x98c.OffCoSetBit();

8
src/d/actor/d_a_e_ww.cpp
View File

@ -682,7 +682,7 @@ void daE_WW_c::executeMaster() {
f32 temp_f30 = sp48.absXZ(current.pos);
cXyz sp3C;
cXyz sp30;
fopAcM_OffStatus(this, fopAcM_STATUS_UNK_004000);
fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x4000);
field_0x724 = 10;
switch (mActionMode) {
case ACTION_MODE_0:
@ -814,7 +814,7 @@ void daE_WW_c::executeMaster() {
void daE_WW_c::executeWait() {
switch (mActionMode) {
case ACTION_MODE_0:
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_004000);
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x4000);
setBck(BCK_WW_APPEAR, J3DFrameCtrl::EMode_NONE, 0.0f, 1.0f);
mActionMode = ACTION_MODE_1;
break;
@ -854,7 +854,7 @@ void daE_WW_c::executeWait() {
}
}
fopAcM_OffStatus(this, fopAcM_STATUS_UNK_004000);
fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x4000);
if (var_r28) {
setActionMode(ACTION_ATTACK, ACTION_MODE_0);
field_0x756 = 1;
@ -1511,7 +1511,7 @@ void daE_WW_c::executeMoveOut() {
mActionMode = ACTION_MODE_11;
}
} else if (fVar1 > nREG_F(18) + 3000.0f + mDistCheckModifier) {
if (fopAcM_CheckCondition(this, fopAcM_STATUS_UNK_000004)) {
if (fopAcM_CheckCondition(this, fopAcM_STATUS_UNK_0x4)) {
fopAcM_delete(this);
break;
}

2
src/d/actor/d_a_e_ymb.cpp
View File

@ -2112,7 +2112,7 @@ void daE_YMB_c::setCreateDrop() {
mDoMtx_stack_c::multVecZero(&sp1c);
drop->setPos(sp1c);
drop->setAppear();
fopAcM_OnStatus(drop, fopAcM_STATUS_UNK_004000);
fopAcM_OnStatus(drop, fopAcM_STATUS_UNK_0x4000);
}
field_0x721 = 1;

4
src/d/actor/d_a_e_zh.cpp
View File

@ -803,7 +803,7 @@ void daE_ZH_c::executeStartDemo() {
camera->mCamera.SetTrimSize(0);
dComIfGp_event_reset();
fopAcM_onSwitch(this, 0x12);
fopAcM_OffStatus(this , fopAcM_STATUS_UNK_004000);
fopAcM_OffStatus(this , fopAcM_STATUS_UNK_0x4000);
setActionMode(ACTION_EXECUTE_WAIT, 1);
}
break;
@ -2326,7 +2326,7 @@ cPhs__Step daE_ZH_c::create() {
attention_info.flags &= ~fopAc_AttnFlag_BATTLE_e;
if (fopAcM_GetRoomNo(this) == 0x33 && !fopAcM_isSwitch(this, 18)) {
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_004000);
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x4000);
setActionMode(ACTION_EXECUTE_START_DEMO, 0);
} else {
setActionMode(ACTION_EXECUTE_WAIT, 1);

2
src/d/actor/d_a_npc.cpp
View File

@ -2605,7 +2605,7 @@ void daNpcT_c::setHitodamaPrtcl() {
/* 8014C200-8014C384 146B40 0184+00 0/0 0/0 2/2 .text
* daNpcT_chkActorInScreen__FP10fopAc_ac_cfffffffi */
bool daNpcT_chkActorInScreen(fopAc_ac_c* i_ActorP, f32 param_1, f32 param_2, f32 param_3,
BOOL daNpcT_chkActorInScreen(fopAc_ac_c* i_ActorP, f32 param_1, f32 param_2, f32 param_3,
f32 param_4, f32 param_5, f32 param_6, f32 param_7, int param_8) {
cXyz proj;
cXyz pos_array[8];

4
src/d/actor/d_a_npc_coach.cpp
View File

@ -795,7 +795,7 @@ void daNpcCoach_c::checkCoachDamage() {
((daCoach2D_c*)fpcM_SearchByID(field_0x2554))->setHitCount((field_0x24c4 / (attr().damage_durability / 20)));
if (field_0x24c4 >= attr().damage_durability) {
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_004000);
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x4000);
mChHorse.field_0x784 = 0.0f;
daNpcTheB_c* telmaB_p = (daNpcTheB_c*)fpcM_SearchByID(parentActorID);
@ -1989,7 +1989,7 @@ cPhs__Step daNpcCoach_c::create() {
void daNpcCoach_c::create_init() {
// NONMATCHING
if (strcmp(dComIfGp_getStartStageName(), "F_SP123") == 0) {
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_004000);
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x4000);
}
fopAcM_setStageLayer(this);

2693
src/d/actor/d_a_npc_kakashi.cpp
View File

File diff suppressed because it is too large Load Diff

16
src/d/actor/d_a_npc_kasi_hana.cpp
View File

@ -399,7 +399,7 @@ BOOL daNpcKasi_Mng_c::createHearts() {
&i_scale, &i_speedF, &i_speedY, -1, 0, NULL);
if (heart_p != NULL) {
Z2GetAudioMgr()->seStart(Z2SE_GIRLS_HEART, &i_pos, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
fopAcM_OnStatus(heart_p, fopAcM_STATUS_UNK_004000);
fopAcM_OnStatus(heart_p, fopAcM_STATUS_UNK_0x4000);
}
}
}
@ -411,17 +411,17 @@ BOOL daNpcKasi_Mng_c::createHearts() {
void daNpcKasi_Mng_c::allDemoMove() {
daNpcKasiHana_c* hana_p = (daNpcKasiHana_c*)mHanaActorMngr.getActorP();
if (hana_p != NULL) {
fopAcM_OnStatus(hana_p, fopAcM_STATUS_UNK_004000);
fopAcM_OnStatus(hana_p, fopAcM_STATUS_UNK_0x4000);
}
daNpcKasiKyu_c* kyu_p = (daNpcKasiKyu_c*)mKyuActorMngr.getActorP();
if (kyu_p != NULL) {
fopAcM_OnStatus(kyu_p, fopAcM_STATUS_UNK_004000);
fopAcM_OnStatus(kyu_p, fopAcM_STATUS_UNK_0x4000);
}
daNpcKasiMich_c* mich_p = (daNpcKasiMich_c*)mMichActorMngr.getActorP();
if (mich_p != NULL) {
fopAcM_OnStatus(mich_p, fopAcM_STATUS_UNK_004000);
fopAcM_OnStatus(mich_p, fopAcM_STATUS_UNK_0x4000);
}
}
@ -429,17 +429,17 @@ void daNpcKasi_Mng_c::allDemoMove() {
void daNpcKasi_Mng_c::allDemoNotMove() {
daNpcKasiHana_c* hana_p = (daNpcKasiHana_c*)mHanaActorMngr.getActorP();
if (hana_p != NULL) {
fopAcM_OffStatus(hana_p, fopAcM_STATUS_UNK_004000);
fopAcM_OffStatus(hana_p, fopAcM_STATUS_UNK_0x4000);
}
daNpcKasiKyu_c* kyu_p = (daNpcKasiKyu_c*)mKyuActorMngr.getActorP();
if (kyu_p != NULL) {
fopAcM_OffStatus(kyu_p, fopAcM_STATUS_UNK_004000);
fopAcM_OffStatus(kyu_p, fopAcM_STATUS_UNK_0x4000);
}
daNpcKasiMich_c* mich_p = (daNpcKasiMich_c*)mMichActorMngr.getActorP();
if (mich_p != NULL) {
fopAcM_OffStatus(mich_p, fopAcM_STATUS_UNK_004000);
fopAcM_OffStatus(mich_p, fopAcM_STATUS_UNK_0x4000);
}
}
@ -953,7 +953,7 @@ void daNpcKasiHana_c::reset() {
mPath.setPathInfo(getRailNo(), fopAcM_GetRoomNo(this), 0);
mPath.setIdx(6);
} else if (mType == TYPE_CHEER) {
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_004000);
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x4000);
}
field_0x1441 = 0;

2
src/d/actor/d_a_npc_kasi_kyu.cpp
View File

@ -491,7 +491,7 @@ void daNpcKasiKyu_c::reset() {
mPath.setPathInfo(getRailNo(), fopAcM_GetRoomNo(this), 0);
mPath.setIdx(6);
} else if (mType == 1) {
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_004000);
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x4000);
}
field_0x1430 = 0;

2
src/d/actor/d_a_npc_kasi_mich.cpp
View File

@ -491,7 +491,7 @@ void daNpcKasiMich_c::reset() {
mPath.setPathInfo(getRailNo(), fopAcM_GetRoomNo(this), 0);
mPath.setIdx(6);
} else if (mType == 1) {
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_004000);
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x4000);
}
field_0x1430 = 0;

2
src/d/actor/d_a_npc_kn.cpp
View File

@ -469,7 +469,7 @@ int daNpc_Kn_c::create() {
J3DModelData* model_data = mpModelMorf[0]->getModel()->getModelData();
fopAcM_SetMtx(this, mpModelMorf[0]->getModel()->getBaseTRMtx());
fopAcM_setCullSizeBox(this, -300.0f, -50.0f, -300.0f, 300.0f, 450.0f, 300.0f);
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_80000000);
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x8000000);
mSound.init(&current.pos, &eyePos, 3, 1);
dKy_tevstr_init(&mTevStr, fopAcM_GetRoomNo(this), 0xFF);

6
src/d/actor/d_a_npc_kolin.cpp
View File

@ -796,7 +796,7 @@ void daNpc_Kolin_c::setParam() {
attention_info.flags = fopAc_AttnFlag_SPEAK_e | fopAc_AttnFlag_TALK_e;
if (mType == 4) {
fopAcM_OffStatus(this, fopAcM_STATUS_UNK_000100);
fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x100);
}
scale.set(daNpc_Kolin_Param_c::m.common.scale, daNpc_Kolin_Param_c::m.common.scale, daNpc_Kolin_Param_c::m.common.scale);
@ -981,10 +981,10 @@ void daNpc_Kolin_c::action() {
/* 8055574C-80555810 00184C 00C4+00 1/0 0/0 0/0 .text beforeMove__13daNpc_Kolin_cFv */
void daNpc_Kolin_c::beforeMove() {
fopAcM_OffStatus(this, fopAcM_STATUS_UNK_80000000);
fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x8000000);
if (checkHide()) {
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_80000000);
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x8000000);
}
if (checkHide() || mNoDraw) {

4
src/d/actor/d_a_npc_kolinb.cpp
View File

@ -576,10 +576,10 @@ void daNpc_Kolinb_c::action() {
/* 80A46824-80A468E8 000F84 00C4+00 1/0 0/0 0/0 .text beforeMove__14daNpc_Kolinb_cFv */
void daNpc_Kolinb_c::beforeMove() {
fopAcM_OffStatus(this, fopAcM_STATUS_UNK_80000000);
fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x8000000);
if (checkHide()) {
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_80000000);
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x8000000);
}
if (checkHide() || mNoDraw) {

4
src/d/actor/d_a_npc_maro.cpp
View File

@ -1003,9 +1003,9 @@ void daNpc_Maro_c::action() {
/* 8055D5C4-8055D688 002124 00C4+00 1/0 0/0 0/0 .text beforeMove__12daNpc_Maro_cFv */
void daNpc_Maro_c::beforeMove() {
fopAcM_OffStatus(this, fopAcM_STATUS_UNK_80000000);
fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x8000000);
if (checkHide()) {
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_80000000);
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x8000000);
}
if (checkHide() || mNoDraw) {
attention_info.flags = 0;

2
src/d/actor/d_a_npc_moir.cpp
View File

@ -305,7 +305,7 @@ cPhs__Step daNpcMoiR_c::Create() {
return cPhs_ERROR_e;
}
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_004000);
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x4000);
mMode = MODE_2;
}

6
src/d/actor/d_a_npc_shad.cpp
View File

@ -390,7 +390,7 @@ cPhs__Step daNpcShad_c::Create() {
return cPhs_ERROR_e;
}
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_004000);
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x4000);
mMode = 2;
}
}
@ -845,7 +845,7 @@ void daNpcShad_c::reset() {
mMotionMorfOverride = 0.0f;
if (isSneaking()) {
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_004000);
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x4000);
}
setWaitAction();
@ -1886,7 +1886,7 @@ BOOL daNpcShad_c::EvCut_ToChantSpell2(int i_cutIndex) {
actor = NULL;
fopAcM_SearchByName(PROC_CSTAF, (fopAc_ac_c**)&actor);
if (actor != NULL) {
fopAcM_OnStatus(actor, fopAcM_STATUS_UNK_000800);
fopAcM_OnStatus(actor, fopAcM_STATUS_UNK_0x800);
}
dComIfGp_getEvent().startCheckSkipEdge(this);

4
src/d/actor/d_a_npc_taro.cpp
View File

@ -993,9 +993,9 @@ void daNpc_Taro_c::action() {
/* 80567EB4-80567F78 002114 00C4+00 1/0 0/0 0/0 .text beforeMove__12daNpc_Taro_cFv */
void daNpc_Taro_c::beforeMove() {
fopAcM_OffStatus(this, fopAcM_STATUS_UNK_80000000);
fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x8000000);
if (checkHide()) {
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_80000000);
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x8000000);
}
if (checkHide() || mNoDraw) {
attention_info.flags = 0;

6
src/d/actor/d_a_npc_tk.cpp
View File

@ -147,7 +147,7 @@ void daNPC_TK_c::setActionMode(int param_0) {
field_0x694 = 0;
field_0x6c5 = 0;
current.angle.y = shape_angle.y;
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_004000);
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x4000);
}
}
@ -1547,7 +1547,7 @@ void daNPC_TK_c::executeAttackLink() {
field_0x694 = 1;
setBck(8, 2, 10.0f, 1.0f);
mSound.startCreatureVoice(Z2SE_HAWK_V_TAKE_OFF, -1);
fopAcM_OffStatus(this, fopAcM_STATUS_UNK_004000);
fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x4000);
field_0x6b4 = 0x1e;
break;
}
@ -1653,7 +1653,7 @@ void daNPC_TK_c::executeAttackLink() {
cLib_chaseF(&speedF, 30.0f, 3.0f);
if (field_0x6b0 == 0) {
if (dComIfGp_checkPlayerStatus0(0, fopAcM_STATUS_HOOK_CARRY_NOW) ||
dComIfGp_checkPlayerStatus0(0, fopAcM_STATUS_UNK_000100) ||
dComIfGp_checkPlayerStatus0(0, fopAcM_STATUS_UNK_0x100) ||
daPy_getPlayerActorClass()->checkWolfTagLockJumpReady())
{
field_0x6b0 = 10;

2
src/d/actor/d_a_npc_yamid.cpp
View File

@ -189,7 +189,7 @@ cPhs__Step daNpc_yamiD_c::create() {
fopAcM_SetMtx(this, mpMorf[0]->getModel()->getBaseTRMtx());
fopAcM_setCullSizeFar(this, 3.0f);
fopAcM_setCullSizeBox(this, -300.0f, -50.0f, -300.0f, 300.0f, 450.0f, 300.0f);
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_80000000);
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x8000000);
mSound.init(&current.pos, &eyePos, 3, 1);

18
src/d/actor/d_a_npc_ykm.cpp
View File

@ -902,7 +902,7 @@ void daNpc_ykM_c::reset() {
case TYPE_3:
mHide = true;
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_80000000);
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x8000000);
break;
case TYPE_4:
@ -911,13 +911,13 @@ void daNpc_ykM_c::reset() {
case TYPE_5:
mHide = true;
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_80000000);
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x8000000);
eventInfo.setIdx(1);
break;
case TYPE_6:
mHide = true;
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_80000000);
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x8000000);
eventInfo.setIdx(2);
break;
}
@ -991,15 +991,15 @@ void daNpc_ykM_c::setParam() {
mAcchCir.SetWallR(mWallR);
mAcchCir.SetWallH(daNpc_ykM_Param_c::m.common.knee_length);
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_000100);
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x100);
mRealShadowSize = daNpc_ykM_Param_c::m.common.real_shadow_size;
if (field_0x157b != 0) {
fopAcM_OffStatus(this, fopAcM_STATUS_UNK_000100);
fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x100);
}
if (mType == TYPE_3) {
fopAcM_OffStatus(this, fopAcM_STATUS_UNK_000100);
fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x100);
mRealShadowSize = 1800.0f;
}
@ -1221,10 +1221,10 @@ void daNpc_ykM_c::action() {
/* 80B55658-80B5571C 002258 00C4+00 1/0 0/0 0/0 .text beforeMove__11daNpc_ykM_cFv */
void daNpc_ykM_c::beforeMove() {
fopAcM_OffStatus(this, fopAcM_STATUS_UNK_80000000);
fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x8000000);
if (checkHide()) {
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_80000000);
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x8000000);
}
if (checkHide() || mNoDraw) {
@ -2422,7 +2422,7 @@ int daNpc_ykM_c::cutLv5DungeonClear(int i_cutIndex) {
mMotionSeqMngr.setNo(MOTION_WAIT_X, 0.0f, FALSE, 0);
mJntAnm.lookNone(1);
mHide = false;
fopAcM_OffStatus(this, fopAcM_STATUS_UNK_80000000);
fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x8000000);
break;
case 1:

20
src/d/actor/d_a_npc_ykw.cpp
View File

@ -700,14 +700,14 @@ void daNpc_ykW_c::reset() {
}
mHide = true;
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_80000000);
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x8000000);
break;
case 5:
case 6:
eventInfo.setIdx(1);
mHide = true;
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_80000000);
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x8000000);
break;
default:
@ -790,7 +790,7 @@ void daNpc_ykW_c::setParam() {
mRealShadowSize = HIO_PARAM(this)->common.real_shadow_size;
if (field_0xf80 == 4) {
fopAcM_OffStatus(this, fopAcM_STATUS_UNK_000100);
fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x100);
mRealShadowSize = 1500.0f;
}
@ -939,9 +939,9 @@ void daNpc_ykW_c::action() {
/* 80B60AFC-80B60BC0 001CDC 00C4+00 1/0 0/0 0/0 .text beforeMove__11daNpc_ykW_cFv */
void daNpc_ykW_c::beforeMove() {
fopAcM_OffStatus(this, fopAcM_STATUS_UNK_80000000);
fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x8000000);
if (checkHide()) {
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_80000000);
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x8000000);
}
if (checkHide() || mNoDraw != 0) {
attention_info.flags = 0;
@ -1666,7 +1666,7 @@ BOOL daNpc_ykW_c::cutLv5DungeonClear(int param_0) {
mHide = false;
fopAcM_OffStatus(this, fopAcM_STATUS_UNK_80000000);
fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x8000000);
newPlayerPos.setall(0.0f);
@ -1864,7 +1864,7 @@ BOOL daNpc_ykW_c::cutLv5DungeonClear(int param_0) {
mFindCount = 0;
fpcM_Search(srchItemHeart, this);
for (unkInt1 = 0; unkInt1 < mFindCount; unkInt1++) {
fopAcM_OffStatus(mFindActorPtrs[unkInt1], fopAcM_STATUS_UNK_004000);
fopAcM_OffStatus(mFindActorPtrs[unkInt1], fopAcM_STATUS_UNK_0x4000);
}
}
}
@ -1905,7 +1905,7 @@ BOOL daNpc_ykW_c::cutLv5DungeonClear(int param_0) {
&unkXyz1, &unkFloat2, &unkFloat3, -1, NULL, NULL);
if (unkActor1 != NULL) {
mDoAud_seStart(Z2SE_OBJ_YO_HEART_S, &itemPos, 0, 0);
fopAcM_OnStatus(unkActor1, fopAcM_STATUS_UNK_004000);
fopAcM_OnStatus(unkActor1, fopAcM_STATUS_UNK_0x4000);
}
mEventTimer = (int)(unkFloat1 * 1.8000001f) + 6;
field_0x1038++;
@ -2380,7 +2380,7 @@ int daNpc_ykW_c::cutHug(int param_0) {
&heartScale, &heartSpeed, &heartSpeedY, -1, 0, 0);
if (itemActor != NULL) {
mDoAud_seStart(Z2SE_OBJ_YO_HEART_S, &heartPos, 0, 0);
fopAcM_OnStatus(itemActor, fopAcM_STATUS_UNK_004000);
fopAcM_OnStatus(itemActor, fopAcM_STATUS_UNK_0x4000);
}
mEventTimer = timer;
@ -2489,7 +2489,7 @@ int daNpc_ykW_c::wait(void* param_0) {
case 2:
if (field_0x106f != 0) {
mHide = true;
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_80000000);
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x8000000);
if (putUtuwaHeart(0, 0.0f, 0.0f, 0x5000, 0)) {
fopAcM_delete(this);
}

2
src/d/actor/d_a_npc_zelda.cpp
View File

@ -201,7 +201,7 @@ int daNpc_Zelda_c::create() {
J3DModelData* unusedModelData = mpMorf[0]->getModel()->getModelData();
fopAcM_SetMtx(this, mpMorf[0]->getModel()->getBaseTRMtx());
fopAcM_setCullSizeBox(this, -200.0f, -100.0f, -200.0f, 200.0f, 300.0f, 200.0f);
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_80000000);
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x8000000);
mSound.init(&current.pos, &eyePos, 3, 1);
#if DEBUG

2
src/d/actor/d_a_obj_batta.cpp
View File

@ -336,7 +336,7 @@ void daObjBATTA_c::bin_wait() {
if (field_0x9e8 == 0) {
J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes("Bat", 8);
mpMorf->setAnm(anm, 2, 4.0f, 1.0f, 0.0f, -1.0f);
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_004000);
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x4000);
mDraw = false;
gravity = 0.0f;
maxFallSpeed = 0.0f;

2
src/d/actor/d_a_obj_crvfence.cpp
View File

@ -184,7 +184,7 @@ void daObjCRVFENCE_c::NormalAction() {
if (!field_0x5f4) {
e_wb_class* wb_p = (e_wb_class*)fpcM_Search(s_obj_sub, this);
if (wb_p != NULL && wb_p->mActionID == ACT_PL_RIDE2) {
fopAcM_OffStatus(this, fopAcM_STATUS_UNK_000100);
fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x100);
fopAcM_seStartCurrent(this, Z2SE_OBJ_SAKU_BREAK, 0);
cXyz sp5c(fopAcM_GetPosition(&wb_p->mEnemy));
Mtx mtx;

2
src/d/actor/d_a_obj_gomikabe.cpp
View File

@ -133,7 +133,7 @@ void daObjGOMIKABE_c::BreakSet() {
field_0x5a2++;
mAction++;
Z2GetAudioMgr()->seStart(Z2SE_OBJ_G_KABE_BRK, &current.pos, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
fopAcM_OffStatus(this, fopAcM_STATUS_UNK_000100);
fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x100);
if (mpBgW != NULL && mpBgW->ChkUsed()) {
dComIfG_Bgsp().Release(mpBgW);
}

2
src/d/actor/d_a_obj_gra2.cpp
View File

@ -639,7 +639,7 @@ int daObj_GrA_c::init() {
setRoomNo();
if (mMode == 2) {
fopAcM_OffStatus(this, fopAcM_STATUS_UNK_004000);
fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x4000);
}
field_0x1528.setPathInfo(getPathNo(), fopAcM_GetRoomNo(this), 1);

10
src/d/actor/d_a_obj_gra2_soldier.inc
View File

@ -1411,7 +1411,7 @@ int daObj_GrA_c::thrown(void* param_1) {
switch (field_0xa7c) {
case 0:
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_004000);
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x4000);
field_0x1ff0 = 1;
mDemoCamMode = 0;
field_0x209c = 1;
@ -2229,9 +2229,9 @@ int daObj_GrA_c::waitDemo(void* param_1) {
} else {
#ifdef DEBUG
if (daObj_GrA_Param_c::m.field_0x8a) {
fopAcM_OffStatus(this, fopAcM_STATUS_UNK_000100);
fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x100);
} else {
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_000100);
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x100);
}
#endif
@ -2245,7 +2245,7 @@ int daObj_GrA_c::waitDemo(void* param_1) {
case 2:
#ifdef DEBUG
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_000100);
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x100);
#endif
break;
}
@ -2318,7 +2318,7 @@ int daObj_GrA_c::startDemo(void* param_1) {
player->changeOriginalDemo();
gra_p->field_0x204c.entry(this);
gra_p->setProcess(&daObj_GrA_c::soldierDemo);
fopAcM_OnStatus(gra_p, fopAcM_STATUS_UNK_008000);
fopAcM_OnStatus(gra_p, fopAcM_STATUS_UNK_0x8000);
field_0x2056 = 0;
dComIfGp_getEvent().setSkipProc(this, skipCallBack, 0);
dComIfGp_getEvent().onSkipFade();

2
src/d/actor/d_a_obj_kag.cpp
View File

@ -395,7 +395,7 @@ void daObjKAG_c::walk() {
void daObjKAG_c::bin_wait() {
if (field_0x83c == 0) {
mpModelMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("I_Kag", BCK_KAG_FLY), J3DFrameCtrl::EMode_LOOP, 5.0f, 0.0f, 0.0f, -1.0f);
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_004000);
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x4000);
mDraw = false;
gravity = 0.0f;
maxFallSpeed = 0.0f;

2
src/d/actor/d_a_obj_kamakiri.cpp
View File

@ -804,7 +804,7 @@ int daObjKAM_c::create() {
if (field_0x9c0 == 2) {
field_0x56c = 0;
shape_angle.x -= (s16)0x2000;
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_004000);
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x4000);
} else {
mDraw = true;
}

2
src/d/actor/d_a_obj_kshutter.cpp
View File

@ -214,7 +214,7 @@ int daObjKshtr_c::Create() {
}
if (mType == TYPE_V_SHUTTER) {
fopAcM_OffStatus(this, fopAcM_STATUS_UNK_000100);
fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x100);
}
initBaseMtx();

2
src/d/actor/d_a_obj_scannon.cpp
View File

@ -754,7 +754,7 @@ void daSCannon_c::changeScene() {
dComIfGp_getVibration().StopQuake(0x1F);
}
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_000080);
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x80);
if (field_0x619 == 0) {
field_0x619 = 1;

4
src/d/actor/d_a_obj_scannon_ten.cpp
View File

@ -371,7 +371,7 @@ void daObjSCannonTen_c::demoInitFinish() {
mDoAud_seStart(Z2SE_AL_V_CANON_JUMP, NULL, 0, 0);
initEmtLine();
fopAcM_OffStatus(this, fopAcM_STATUS_UNK_000080);
fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x80);
int* timer_p = dComIfGp_evmng_getMyIntegerP(mStaffId, "Timer");
if (timer_p != NULL) {
@ -414,7 +414,7 @@ void daObjSCannonTen_c::changeScene() {
dComIfGp_getVibration().StopQuake(0x1F);
}
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_000080);
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x80);
dStage_changeScene(1, 0.0f, 0, fopAcM_GetRoomNo(this), 0, -1);
}

2
src/d/actor/d_a_obj_ten.cpp
View File

@ -737,7 +737,7 @@ int daObjTEN_c::create() {
if (field_0x624 == 2) {
field_0x56c = 0;
shape_angle.x -= 0x2000;
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_004000);
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x4000);
} else {
mDraw = true;
}

2
src/d/actor/d_a_obj_tombo.cpp
View File

@ -656,7 +656,7 @@ int daObjTOMBO_c::create() {
if (field_0x75c == 2) {
field_0x56c = 0;
shape_angle.x -= 0x2000;
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_004000);
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x4000);
} else {
mDraw = true;
}

4
src/d/d_com_static.cpp
View File

@ -230,8 +230,8 @@ int daNpcMsg_setEvtNum(u8 iEvtNum) {
}
/* 80031648-800316A8 02BF88 0060+00 0/0 0/0 6/6 .text daNpcKakashi_chkSwdTutorialStage__Fv */
BOOL daNpcKakashi_chkSwdTutorialStage() {
return !strcmp(dComIfGp_getStartStageName(), "F_SP103") && dComIfG_play_c::getLayerNo(0) == 8;
u8 daNpcKakashi_chkSwdTutorialStage() {
return strcmp(dComIfGp_getStartStageName(), "F_SP103") == 0 && dComIfG_play_c::getLayerNo(0) == 8;
}
/* 800316A8-800316E0 02BFE8 0038+00 0/0 0/0 3/3 .text daNpcKakashi_setSwdTutorialStep__FUc */