mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-06-09 04:40:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

NPC str cleanup and misc for 100% linkability (#2723)

Browse Source 
* NPC str cleanup and misc for 100% linkability

* d_msg_object equiv
This commit is contained in:
YunataSavior
2025-10-03 01:10:14 -07:00
committed by GitHub
parent 009f08f2f3
commit db219f067f
67 changed files with 959 additions and 1181 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/actor/d_a_npc_bans.h
+1 -1
View File
@@ -63,7 +63,7 @@ public:
/* 80967C04 */ void checkChangeJoint(int);
/* 80967C14 */ void checkRemoveJoint(int);
static void* mCutNameList[4];
static char* mCutNameList[4];
static u8 mCutList[48];
private:
/* 0x568 */ u8 field_0x568[0x1270 - 0x568];
include/d/actor/d_a_npc_clerka.h
+1 -1
View File
@@ -54,7 +54,7 @@ public:
/* 809956B4 */ void checkChangeJoint(int);
/* 809956C4 */ void checkRemoveJoint(int);
static void* mCutNameList;
static char* mCutNameList[1];
static u8 mCutList[12];
private:
include/d/actor/d_a_npc_clerkb.h
+1 -1
View File
@@ -58,7 +58,7 @@ public:
/* 809997CC */ void checkChangeJoint(int);
/* 809997DC */ void checkRemoveJoint(int);
static void* mCutNameList;
static char* mCutNameList[1];
static u8 mCutList[12];
private:
include/d/actor/d_a_npc_clerkt.h
+1 -1
View File
@@ -52,7 +52,7 @@ public:
/* 8099D098 */ s32 getNeckJointNo();
/* 8099D0A0 */ s32 getHeadJointNo();
static void* mCutNameList;
static char* mCutNameList[1];
static u8 mCutList[12];
private:
include/d/actor/d_a_npc_doc.h
+1 -1
View File
@@ -56,7 +56,7 @@ public:
/* 809AA294 */ s32 getFootRJointNo();
/* 809AA29C */ void chkXYItems();
static void* mCutNameList;
static char* mCutNameList[1];
static u8 mCutList[12];
private:
include/d/actor/d_a_npc_fairy.h
+1 -1
View File
@@ -114,7 +114,7 @@ public:
/* 809B9258 */ void checkChangeJoint(int);
/* 809B9268 */ void checkRemoveJoint(int);
static void* mCutNameList[18];
static char* mCutNameList[18];
static u8 mCutList[216];
private:
/* 0x568 */ u8 field_0x568[0x10c8 - 0x568];
include/d/actor/d_a_npc_gra.h
+1 -1
View File
@@ -97,7 +97,7 @@ public:
int getType() { return mType; }
static void* mEvtCutNameList[12];
static char* mEvtCutNameList[12];
static u8 mEvtCutList[144];
private:
include/d/actor/d_a_npc_grd.h
+1 -1
View File
@@ -53,7 +53,7 @@ public:
/* 809D2C9C */ void ECut_nodToGrz(int);
/* 809D3994 */ void adjustShapeAngle();
static void* mEvtCutNameList[2];
static char* mEvtCutNameList[2];
static u8 mEvtCutList[24];
private:
include/d/actor/d_a_npc_grm.h
+1 -1
View File
@@ -57,7 +57,7 @@ public:
/* 809D5FB8 */ void checkChangeJoint(int);
/* 809D5FC8 */ void checkRemoveJoint(int);
static void* mCutNameList[2];
static char* mCutNameList[2];
static u8 mCutList[24];
private:
include/d/actor/d_a_npc_gro.h
+1 -1
View File
@@ -56,7 +56,7 @@ public:
/* 809DE4EC */ void test(void*);
/* 809DEF0C */ void adjustShapeAngle();
static void* mEvtCutNameList[3];
static char* mEvtCutNameList[3];
static u8 mEvtCutList[36];
private:
include/d/actor/d_a_npc_grs.h
+1 -1
View File
@@ -54,7 +54,7 @@ public:
/* 809E7300 */ void setPrtcl();
/* 809E7D5C */ void adjustShapeAngle();
static void* mEvtCutNameList[2];
static char* mEvtCutNameList[2];
static u8 mEvtCutList[24];
private:
include/d/actor/d_a_npc_hoz.h
+1 -1
View File
@@ -81,7 +81,7 @@ public:
bool getGameStartFlag() { return mGameStartFlag; }
void setPotBreakFlag() { mPotBreakFlag = true; }
static void* mCutNameList[8];
static char* mCutNameList[8];
static u8 mCutList[96];
private:
include/d/actor/d_a_npc_kn.h
+6 -2
View File
@@ -363,8 +363,12 @@ public:
/* 80A3B708 */ virtual void decTmr();
/* 80A3A504 */ virtual void clrParam();
/* 80A3B7C4 */ virtual bool afterSetFaceMotionAnm(int, int, f32, int) { return true; }
/* 80A3B7CC */ virtual daNpcT_faceMotionAnmData_c getFaceMotionAnm(daNpcT_faceMotionAnmData_c);
/* 80A3B7FC */ virtual daNpcT_motionAnmData_c getMotionAnm(daNpcT_motionAnmData_c);
/* 80A3B7CC */ virtual daNpcT_faceMotionAnmData_c getFaceMotionAnm(daNpcT_faceMotionAnmData_c arg0) {
return arg0;
}
/* 80A3B7FC */ virtual daNpcT_motionAnmData_c getMotionAnm(daNpcT_motionAnmData_c arg0) {
return arg0;
}
/* 80A2AA0C */ virtual ~daNpc_Kn_c();
/* 80A2D060 */ virtual bool afterSetMotionAnm(int, int, f32, int);
include/d/actor/d_a_npc_knj.h
+1 -1
View File
@@ -44,7 +44,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_evtData_c const*, char**);
static void* mCutNameList;
static char* mCutNameList[1];
static u8 mCutList[12];
private:
include/d/actor/d_a_npc_kyury.h
+1 -1
View File
@@ -54,7 +54,7 @@ public:
/* 80A63820 */ void checkChangeJoint(int);
/* 80A63830 */ void checkRemoveJoint(int);
static void* mCutNameList[2];
static char* mCutNameList[2];
static u8 mCutList[24];
private:
include/d/actor/d_a_npc_len.h
+1 -1
View File
@@ -60,7 +60,7 @@ public:
/* 80A68E28 */ s32 getFootRJointNo();
/* 80A68E30 */ bool chkXYItems();
static void* mCutNameList[4];
static char* mCutNameList[4];
static u8 mCutList[48];
private:
include/d/actor/d_a_npc_myna2.h
+1 -1
View File
@@ -51,7 +51,7 @@ public:
/* 80A86BEC */ void ECut_gameGoalSuccess(int);
/* 80A86E8C */ void calcHovering(int, int);
static void* mEvtCutNameList[5];
static char* mEvtCutNameList[5];
static u8 mEvtCutList[60];
private:
include/d/actor/d_a_npc_pachi_maro.h
+1 -1
View File
@@ -89,7 +89,7 @@ public:
/* 80A9B800 */ void checkChangeJoint(int);
/* 80A9B810 */ void checkRemoveJoint(int);
static void* mCutNameList[11];
static char* mCutNameList[11];
static u8 mCutList[132];
private:
include/d/actor/d_a_npc_pachi_taro.h
+1 -1
View File
@@ -107,7 +107,7 @@ public:
void clrMesPat() { mMesPat = -1; }
static void* mCutNameList[11];
static char* mCutNameList[11];
static u8 mCutList[132];
private:
include/d/actor/d_a_npc_post.h
+1 -1
View File
@@ -62,7 +62,7 @@ public:
/* 80AAD110 */ s32 getFootLJointNo();
/* 80AAD118 */ s32 getFootRJointNo();
static void* mCutNameList[2];
static char* mCutNameList[2];
static u8 mCutList[24];
private:
include/d/actor/d_a_npc_pouya.h
+1 -1
View File
@@ -59,7 +59,7 @@ public:
MtxP getHeadMtx() { return mpMorf->getModel()->getAnmMtx(4); }
static void* mCutNameList[3];
static char* mCutNameList[3];
static u8 mCutList[36];
private:
include/d/actor/d_a_npc_shaman.h
+1 -1
View File
@@ -66,7 +66,7 @@ public:
/* 80AE6B3C */ void checkChangeJoint(int);
/* 80AE6B4C */ void checkRemoveJoint(int);
static void* mCutNameList[2];
static char* mCutNameList[2];
static u8 mCutList[24];
static u8 mEvtBitLabels[12];
static u8 mTmpBitLabels[12];
include/d/actor/d_a_npc_sola.h
+1 -1
View File
@@ -49,7 +49,7 @@ public:
/* 80AEF084 */ s32 getNeckJointNo();
/* 80AEF08C */ bool getBackboneJointNo();
static void* mCutNameList;
static char* mCutNameList[1];
static u8 mCutList[12];
private:
include/d/actor/d_a_npc_soldierA.h
+1 -1
View File
@@ -48,7 +48,7 @@ public:
/* 80AF1B8C */ void ECut_listenLake(int);
/* 80AF1CA4 */ void test(void*);
static void* mEvtCutNameList[3];
static char* mEvtCutNameList[3];
static u8 mEvtCutList[36];
private:
include/d/actor/d_a_npc_soldierB.h
+1 -1
View File
@@ -47,7 +47,7 @@ public:
/* 80AF4F54 */ void ECut_listenLake(int);
/* 80AF50AC */ void test(void*);
static void* mEvtCutNameList[2];
static char* mEvtCutNameList[2];
static u8 mEvtCutList[24];
private:
include/d/actor/d_a_npc_the.h
+1 -1
View File
@@ -113,7 +113,7 @@ public:
/* 80AFAEC8 */ void setAttnPos();
/* 80AFB1C4 */ void lookat();
/* 80AFB488 */ BOOL drawDbgInfo();
/* 80AFBD9C */ void adjustShapeAngle();
/* 80AFBD9C */ void adjustShapeAngle() {}
u8 getTypeFromParam() {
switch (fopAcM_GetParam(this) & 0xff) {
include/d/actor/d_a_npc_toby.h
+1 -1
View File
@@ -70,7 +70,7 @@ public:
/* 80B24968 */ s32 getFootRJointNo();
/* 80B24970 */ bool chkXYItems();
static void* mCutNameList[7];
static char* mCutNameList[7];
static u8 mCutList[84];
private:
include/d/actor/d_a_npc_yamis.h
+1 -1
View File
@@ -57,7 +57,7 @@ public:
/* 80B495C8 */ void checkRemoveJoint(int);
/* 80B495D8 */ void evtEndProc();
static void* mCutNameList[2];
static char* mCutNameList[2];
static u8 mCutList[24];
private:
include/d/actor/d_a_npc_yamit.h
+1 -1
View File
@@ -59,7 +59,7 @@ public:
/* 80B4CD18 */ void checkChangeJoint(int);
/* 80B4CD28 */ void checkRemoveJoint(int);
static void* mCutNameList[2];
static char* mCutNameList[2];
static u8 mCutList[24];
private:
include/d/actor/d_a_npc_zanb.h
+1 -1
View File
@@ -53,7 +53,7 @@ public:
/* 80B6BC38 */ void checkChangeJoint(int);
/* 80B6BC48 */ void checkRemoveJoint(int);
static void* mCutNameList;
static char* mCutNameList[1];
static u8 mCutList[12];
private: