mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-05 17:43:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_npc_mk matching (#1115)

Browse Source 
* matching

* cleanup

* d_a_npc_tt matching outside of _create and rodata

* matching

* all symbols matching order wrong fake inline usage

* matching

* cleanup, naming of some fields and enums

* undo changes
This commit is contained in:
Zeclos
2026-07-16 23:23:52 +02:00
committed by GitHub
parent c562f05ffa
commit d3d65a4d8c
6 changed files with 1717 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.py
+1 -1
View File
@@ -1681,7 +1681,7 @@ config.libs = [
ActorRel(NonMatching, "d_a_npc_ko1"),
ActorRel(NonMatching, "d_a_npc_kp1"),
ActorRel(Matching, "d_a_npc_ls1"),
ActorRel(NonMatching, "d_a_npc_mk"),
ActorRel(Matching, "d_a_npc_mk"),
ActorRel(NonMatching, "d_a_npc_mn"),
ActorRel(Matching, "d_a_npc_mt"),
ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_npc_nz"),
include/d/actor/d_a_npc_mk.h
+186 -56
View File
@@ -2,88 +2,218 @@
#define D_A_NPC_MK_H
#include "f_op/f_op_actor.h"
#include "d/d_npc.h"
#include "d/actor/d_a_npc_mk_static.h"
class daNpc_Mk_c : public fopAc_ac_c {
public:
void ChkOrder(unsigned char) {}
void ClrOrder(unsigned char) {}
void SetOrder(unsigned char) {}
void chkAngry() {}
void chkFlag(unsigned short) {}
void clrFlag(unsigned short) {}
void getBackboneJntNum() {}
void getBackbone_x() {}
void getBackbone_y() {}
void getHeadJntNum() {}
void getHead_x() {}
void getHead_y() {}
void getVisitMode() {}
void incAttnSetCount() {}
void setAction(int (daNpc_Mk_c::*)(void*), void*) {}
void setAttentionBasePos(cXyz) {}
void setEyePos(cXyz) {}
void setFlag(unsigned short) {}
void initTexPatternAnm(bool);
enum TalkStates {
TALK_FINISHED = -1,
TALK_INIT = 0,
TALK_MSG_CREATE = 1,
TALK_ACTIVE = 2
};
enum ActionStatus {
ACTION_STARTING = 0,
ACTION_ONGOING = 1,
ACTION_ENDING = -1,
};
enum VisitModes {
VISIT_START = 0,
VISIT_TALK = 1,
VISIT_WALK_PATH = 2,
VISIT_RUN_LINK = 3,
VISIT_WALK_AROUND_LINK = 4,
VISIT_REACHED_LINK = 5,
VISIT_NOTICE_LINK = 6,
VISIT_LEFT_PATH = 7,
VISIT_WALK_PATH_FAST = 8,
VISIT_WALK_PATH_IGNORE_LINK = 9,
};
enum States {
STATE_WAIT = 0,
STATE_TALK01 = 1,
STATE_TALK02 = 2,
STATE_VISIT = 3,
STATE_CLIMB01 = 4,
STATE_DROP01 = 5,
STATE_RUNAWAY = 6,
STATE_JUMP = 7,
STATE_JITANDA01 = 8,
STATE_JITANDA02 = 9,
STATE_DEMO01 = 10,
STATE_DEMO02 = 11,
STATE_DEMO03 = 12,
STATE_13 = 13 // unsure how to call
};
enum Types {
TYPE_NONE = 0, // unsure how to call
TYPE_NORMAL = 1,
TYPE_MINIGAME = 2,
};
typedef BOOL (daNpc_Mk_c::*ActionFunc)(void*);
bool ChkOrder(u8 temp) { return mOrderFlags & temp; }
void ClrOrder() { mOrderFlags &= ~0xFF; }
void SetOrder(u8 temp) { mOrderFlags |= temp; }
void chkAngry() {}
bool chkFlag(u16 flag) { return (mFlags & flag) == flag; }
void clrFlag(u16 flag) { mFlags &= ~flag; }
s8 getBackboneJntNum() { return m_jnt.getBackboneJntNum(); }
s16 getBackbone_x() { return m_jnt.getBackbone_x(); }
s16 getBackbone_y() { return m_jnt.getBackbone_y(); }
s8 getHeadJntNum() { return m_jnt.getHeadJntNum(); }
s16 getHead_x() { return m_jnt.getHead_x(); }
s16 getHead_y() { return m_jnt.getHead_y(); }
void getVisitMode() {}
void incAttnSetCount() {
if (mAttnSetCount != 0xff) {
mAttnSetCount++;
}
}
BOOL setAction(ActionFunc actionFunc, void* arg) {
if (mCurrActionFunc != actionFunc) {
if (mCurrActionFunc != NULL) {
mActionStatus = ACTION_ENDING;
(this->*mCurrActionFunc)(arg);
}
mCurrActionFunc = actionFunc;
mActionStatus = ACTION_STARTING;
(this->*mCurrActionFunc)(arg);
}
return TRUE;
}
void setAttentionBasePos(cXyz i_attnBasePos) { mAttnBasePos = i_attnBasePos; }
void setEyePos(cXyz i_eyePos) { mEyePos = i_eyePos; }
void setFlag(u16 flag) { mFlags |= flag; }
BOOL initTexPatternAnm(bool);
void playTexPatternAnm();
void setAnm(signed char);
void setAnm(s8);
void setAnmStatus();
void chkAttentionLocal();
bool chkAttentionLocal();
void chkAttention();
void eventOrder();
void checkOrder();
void next_msgStatus(unsigned long*);
void getMsg();
u16 next_msgStatus(u32*);
u32 getMsg();
void setCollision();
void msgAnm(unsigned char);
void msgAnm(u8);
void talkInit();
void msgPushButton();
void talk();
void checkDemoStart();
void getNowEventAction();
void init();
void getType();
void getPath();
void nextVisitMode();
void visitInit(unsigned char);
u16 talk();
BOOL checkDemoStart();
s32 getNowEventAction();
BOOL init();
u8 getType();
u8 getPath();
u8 nextVisitMode();
void visitInit(u8);
void visitProc();
void runawayInit();
void walkPath(unsigned char);
void walkPath(u8);
void runLink();
void aroundLink();
void remove_Um2();
void demoInitCom();
void demoProc();
bool demoProc();
void setAttention(bool);
void getLookBackMode();
u8 getLookBackMode();
void lookBack();
void wait01();
void talk01();
void talk02();
void visitTalkInit();
bool wait01();
bool talk01();
bool talk02();
u8 visitTalkInit();
void visitSetEvent();
void visit01();
void climb01();
void drop01();
void runaway();
void jump();
void jitanda01();
void jitanda02();
void demo01();
void demo02();
void demo03();
void wait_action(void*);
void seek_action(void*);
void hind_action(void*);
void visit_action(void*);
bool visit01();
bool climb01();
bool drop01();
bool runaway();
bool jump();
bool jitanda01();
bool jitanda02();
bool demo01();
bool demo02();
bool demo03();
BOOL wait_action(void*);
BOOL seek_action(void*);
BOOL hind_action(void*);
BOOL visit_action(void*);
BOOL _draw();
BOOL _execute();
BOOL _delete();
cPhs_State _create();
void CreateHeap();
BOOL CreateHeap();
public:
/* Place member variables here */
};
/* 0x290 */ request_of_phase_process_class mPhs;
/* 0x298 */ mDoExt_McaMorf* mpMorf;
/* 0x29C */ u32 mShadowId;
/* 0x2A0 */ J3DAnmTexPattern* m_head_tex_pattern;
/* 0x2A4 */ mDoExt_btpAnm mBtpAnm;
/* 0x2B8 */ u8 mBlinkFrame;
/* 0x2B9 */ u8 field_0x2B9[0x2BA - 0x2B9];
/* 0x2BA */ s16 mBlinkTimer;
/* 0x2BC */ dBgS_ObjAcch mObjAcch;
/* 0x480 */ dBgS_AcchCir mAcchCir;
/* 0x4C0 */ dCcD_Stts mStts;
/* 0x4FC */ dCcD_Cyl mCyl;
/* 0x62C */ dNpc_JntCtrl_c m_jnt;
/* 0x660 */ cXyz mEyePos;
/* 0x66C */ cXyz mAttnBasePos;
/* 0x678 */ s16 mMaxHeadTurnVelocity;
/* 0x67A */ s8 mAnmEnded;
/* 0x67B */ u8 mAttnSetCount;
/* 0x67C */ f32 mAnmTimer;
/* 0x680 */ u32 mCurrMsgNo;
/* 0x684 */ u16 mFlags;
/* 0x686 */ u8 mAttentionTimer;
/* 0x687 */ u8 mMsgSelectNum;
/* 0x688 */ dNpc_PathRun_c field_0x688;
/* 0x690 */ dNpc_PathRun_c field_0x690;
/* 0x698 */ dNpc_PathRun_c field_0x698;
/* 0x6A0 */ u8 mVisitMode;
/* 0x6A1 */ u8 mWaitTimer;
/* 0x6A2 */ u8 mRunAroundLinkTimer;
/* 0x6A3 */ u8 mTimerToReachLink;
/* 0x6A4 */ u16 field_0x6A4;
/* 0x6A6 */ u8 field_0x6A6[0x6A8 - 0x6A6];
/* 0x6A8 */ ActionFunc mCurrActionFunc;
/* 0x6B4 */ s8 mTexPatternIdx;
/* 0x6B5 */ s8 mAnmIdx;
/* 0x6B6 */ u8 field_0x6B6[0x6B8 - 0x6B6];
/* 0x6B8 */ int mStaffIdx;
/* 0x6BC */ s32 mEventAction;
/* 0x6C0 */ u8 mOrderFlags;
/* 0x6C1 */ s8 mState;
/* 0x6C2 */ s8 mPrevState;
/* 0x6C3 */ s8 mType;
/* 0x6C4 */ s8 mActionStatus;
/* 0x6C5 */ s8 mTalkState;
/* 0x6C6 */ u8 mMsgAnmIdx;
/* 0x6C7 */ u8 field_0x6C7[0x6C8 - 0x6C7];
/* 0x6C8 */ u32 mMtrlSndId;
/* 0x6CC */ s8 mReverb;
/* 0x6CD */ u8 field_0x6CD[0x6D0 - 0x6CD];
/* 0x6D0 */ cXyz field_0x6D0;
/* 0x6DC */ cXyz field_0x6DC;
/* 0x6E8 */ s16 field_0x6E8;
/* 0x6EA */ s16 mEventIdx;
/* 0x6EC */ char* mpName;
/* 0x6F0 */ s16 field_0x6F0;
/* 0x6F2 */ u8 field_0x6F2[0x6F4 - 0x6F2];
/* 0x6F4 */ u32 mMsgNo;
/* 0x6F8 */ daNpc_Mk_Static_c mMkStatic;
}; // Size: 0x708
#endif /* D_A_NPC_MK_H */
include/d/actor/d_a_npc_mk_static.h
+2 -2
View File
@@ -18,9 +18,9 @@ public:
u8 goFarLink_2(fopAc_ac_c*, dNpc_PathRun_c*);
void runaway_com2(dNpc_PathRun_c*, u8);
u8 runAwayProc(fopAc_ac_c*, dNpc_PathRun_c*, dCcD_Cyl*, s16*);
bool chkGameSet();
BOOL chkGameSet();
void setRndPathPos(fopAc_ac_c*, dNpc_PathRun_c*);
bool chkPointPass(cXyz*, cXyz*, cXyz*);
BOOL chkPointPass(cXyz*, cXyz*, cXyz*);
/* 0x00 */ u8 m0;
/* 0x04 */ f32 m4;
include/d/d_snap.h
+1 -1
View File
@@ -102,7 +102,7 @@ enum {
/* 0x5E */ DSNAP_TYPE_NPC_PHOTO,
/* 0x5F */ DSNAP_TYPE_RSH1,
/* 0x60 */ DSNAP_TYPE_HO,
/* 0x61 */ DSNAP_TYPE_UNK61,
/* 0x61 */ DSNAP_TYPE_MK,
/* 0x62 */ DSNAP_TYPE_UNK62,
/* 0x63 */ DSNAP_TYPE_UNK63,
/* 0x64 */ DSNAP_TYPE_UNK64,
src/d/actor/d_a_npc_mk.cpp
+1519 -98
View File
File diff suppressed because it is too large Load Diff
src/d/d_a_npc_mk_static.cpp
+8 -8
View File
@@ -304,11 +304,11 @@ u8 daNpc_Mk_Static_c::runAwayProc(fopAc_ac_c* param_1, dNpc_PathRun_c* param_2,
}
/* 800CC374-800CC400 .text chkGameSet__17daNpc_Mk_Static_cFv */
bool daNpc_Mk_Static_c::chkGameSet() {
BOOL daNpc_Mk_Static_c::chkGameSet() {
if (dComIfGs_isTmpBit(dSv_event_tmp_flag_c::UNK_0020) && dComIfGs_isTmpBit(dSv_event_tmp_flag_c::UNK_0010) && dComIfGs_isTmpBit(dSv_event_tmp_flag_c::UNK_0008) && dComIfGs_isTmpBit(dSv_event_tmp_flag_c::UNK_0004)) {
return true;
return TRUE;
} else {
return false;
return FALSE;
}
}
@@ -333,14 +333,14 @@ void daNpc_Mk_Static_c::setRndPathPos(fopAc_ac_c* param_1, dNpc_PathRun_c* param
}
/* 800CC664-800CC734 .text chkPointPass__17daNpc_Mk_Static_cFP4cXyzP4cXyzP4cXyz */
bool daNpc_Mk_Static_c::chkPointPass(cXyz* param_1, cXyz* param_2, cXyz* param_3) {
BOOL daNpc_Mk_Static_c::chkPointPass(cXyz* param_1, cXyz* param_2, cXyz* param_3) {
if (param_1->x == param_2->x && param_1->z == param_2->z) {
return true;
return TRUE;
} else if (param_3->x == param_2->x && param_3->z == param_2->z) {
return true;
return TRUE;
} else if (cM_scos(cLib_targetAngleY(param_1, param_2) - cLib_targetAngleY(param_3, param_2)) < 0.0f) {
return true;
return TRUE;
} else {
return false;
return FALSE;
}
}