summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorYunataSavior <58997725+YunataSavior@users.noreply.github.com>2025-10-03 01:10:14 -0700
committerGitHub <noreply@github.com>2025-10-03 01:10:14 -0700
commitdb219f067f1168f1b4d4748f21437c1917cdfa9b (patch)
tree0dc672b30dceebbbcb647bcd6d0d2ed254f431bd /include
parent009f08f2f3537bb0032052b68adec79971beeff0 (diff)
NPC str cleanup and misc for 100% linkability (#2723)
* NPC str cleanup and misc for 100% linkability * d_msg_object equiv
Diffstat (limited to 'include')
-rw-r--r--include/d/actor/d_a_npc_bans.h2
-rw-r--r--include/d/actor/d_a_npc_clerka.h2
-rw-r--r--include/d/actor/d_a_npc_clerkb.h2
-rw-r--r--include/d/actor/d_a_npc_clerkt.h2
-rw-r--r--include/d/actor/d_a_npc_doc.h2
-rw-r--r--include/d/actor/d_a_npc_fairy.h2
-rw-r--r--include/d/actor/d_a_npc_gra.h2
-rw-r--r--include/d/actor/d_a_npc_grd.h2
-rw-r--r--include/d/actor/d_a_npc_grm.h2
-rw-r--r--include/d/actor/d_a_npc_gro.h2
-rw-r--r--include/d/actor/d_a_npc_grs.h2
-rw-r--r--include/d/actor/d_a_npc_hoz.h2
-rw-r--r--include/d/actor/d_a_npc_kn.h8
-rw-r--r--include/d/actor/d_a_npc_knj.h2
-rw-r--r--include/d/actor/d_a_npc_kyury.h2
-rw-r--r--include/d/actor/d_a_npc_len.h2
-rw-r--r--include/d/actor/d_a_npc_myna2.h2
-rw-r--r--include/d/actor/d_a_npc_pachi_maro.h2
-rw-r--r--include/d/actor/d_a_npc_pachi_taro.h2
-rw-r--r--include/d/actor/d_a_npc_post.h2
-rw-r--r--include/d/actor/d_a_npc_pouya.h2
-rw-r--r--include/d/actor/d_a_npc_shaman.h2
-rw-r--r--include/d/actor/d_a_npc_sola.h2
-rw-r--r--include/d/actor/d_a_npc_soldierA.h2
-rw-r--r--include/d/actor/d_a_npc_soldierB.h2
-rw-r--r--include/d/actor/d_a_npc_the.h2
-rw-r--r--include/d/actor/d_a_npc_toby.h2
-rw-r--r--include/d/actor/d_a_npc_yamis.h2
-rw-r--r--include/d/actor/d_a_npc_yamit.h2
-rw-r--r--include/d/actor/d_a_npc_zanb.h2
30 files changed, 35 insertions, 31 deletions
diff --git a/include/d/actor/d_a_npc_bans.h b/include/d/actor/d_a_npc_bans.h
index 28021cda1e..1b6e96a69d 100644
--- a/include/d/actor/d_a_npc_bans.h
+++ b/include/d/actor/d_a_npc_bans.h
@@ -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];
diff --git a/include/d/actor/d_a_npc_clerka.h b/include/d/actor/d_a_npc_clerka.h
index f656fe18eb..6d5e9d72cb 100644
--- a/include/d/actor/d_a_npc_clerka.h
+++ b/include/d/actor/d_a_npc_clerka.h
@@ -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:
diff --git a/include/d/actor/d_a_npc_clerkb.h b/include/d/actor/d_a_npc_clerkb.h
index cdf5865b1c..fa691c1440 100644
--- a/include/d/actor/d_a_npc_clerkb.h
+++ b/include/d/actor/d_a_npc_clerkb.h
@@ -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:
diff --git a/include/d/actor/d_a_npc_clerkt.h b/include/d/actor/d_a_npc_clerkt.h
index f17a89dc43..c9bf7fe981 100644
--- a/include/d/actor/d_a_npc_clerkt.h
+++ b/include/d/actor/d_a_npc_clerkt.h
@@ -52,7 +52,7 @@ public:
/* 8099D098 */ s32 getNeckJointNo();
/* 8099D0A0 */ s32 getHeadJointNo();
- static void* mCutNameList;
+ static char* mCutNameList[1];
static u8 mCutList[12];
private:
diff --git a/include/d/actor/d_a_npc_doc.h b/include/d/actor/d_a_npc_doc.h
index 661f993824..8166f99927 100644
--- a/include/d/actor/d_a_npc_doc.h
+++ b/include/d/actor/d_a_npc_doc.h
@@ -56,7 +56,7 @@ public:
/* 809AA294 */ s32 getFootRJointNo();
/* 809AA29C */ void chkXYItems();
- static void* mCutNameList;
+ static char* mCutNameList[1];
static u8 mCutList[12];
private:
diff --git a/include/d/actor/d_a_npc_fairy.h b/include/d/actor/d_a_npc_fairy.h
index cf97cfa88e..fbf229cb83 100644
--- a/include/d/actor/d_a_npc_fairy.h
+++ b/include/d/actor/d_a_npc_fairy.h
@@ -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];
diff --git a/include/d/actor/d_a_npc_gra.h b/include/d/actor/d_a_npc_gra.h
index 9c9606b16c..c0c27a403b 100644
--- a/include/d/actor/d_a_npc_gra.h
+++ b/include/d/actor/d_a_npc_gra.h
@@ -97,7 +97,7 @@ public:
int getType() { return mType; }
- static void* mEvtCutNameList[12];
+ static char* mEvtCutNameList[12];
static u8 mEvtCutList[144];
private:
diff --git a/include/d/actor/d_a_npc_grd.h b/include/d/actor/d_a_npc_grd.h
index 5857deffeb..26584a2331 100644
--- a/include/d/actor/d_a_npc_grd.h
+++ b/include/d/actor/d_a_npc_grd.h
@@ -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:
diff --git a/include/d/actor/d_a_npc_grm.h b/include/d/actor/d_a_npc_grm.h
index 3f7ad48999..41e064899a 100644
--- a/include/d/actor/d_a_npc_grm.h
+++ b/include/d/actor/d_a_npc_grm.h
@@ -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:
diff --git a/include/d/actor/d_a_npc_gro.h b/include/d/actor/d_a_npc_gro.h
index d3beba12b3..c1eebfc9f1 100644
--- a/include/d/actor/d_a_npc_gro.h
+++ b/include/d/actor/d_a_npc_gro.h
@@ -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:
diff --git a/include/d/actor/d_a_npc_grs.h b/include/d/actor/d_a_npc_grs.h
index d18be8111c..70f5ab2179 100644
--- a/include/d/actor/d_a_npc_grs.h
+++ b/include/d/actor/d_a_npc_grs.h
@@ -54,7 +54,7 @@ public:
/* 809E7300 */ void setPrtcl();
/* 809E7D5C */ void adjustShapeAngle();
- static void* mEvtCutNameList[2];
+ static char* mEvtCutNameList[2];
static u8 mEvtCutList[24];
private:
diff --git a/include/d/actor/d_a_npc_hoz.h b/include/d/actor/d_a_npc_hoz.h
index 7c03efa125..6175729534 100644
--- a/include/d/actor/d_a_npc_hoz.h
+++ b/include/d/actor/d_a_npc_hoz.h
@@ -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:
diff --git a/include/d/actor/d_a_npc_kn.h b/include/d/actor/d_a_npc_kn.h
index 1080815256..971afb8b39 100644
--- a/include/d/actor/d_a_npc_kn.h
+++ b/include/d/actor/d_a_npc_kn.h
@@ -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);
diff --git a/include/d/actor/d_a_npc_knj.h b/include/d/actor/d_a_npc_knj.h
index 62c2887d2d..b6152dd240 100644
--- a/include/d/actor/d_a_npc_knj.h
+++ b/include/d/actor/d_a_npc_knj.h
@@ -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:
diff --git a/include/d/actor/d_a_npc_kyury.h b/include/d/actor/d_a_npc_kyury.h
index 45054716fe..17fc61c329 100644
--- a/include/d/actor/d_a_npc_kyury.h
+++ b/include/d/actor/d_a_npc_kyury.h
@@ -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:
diff --git a/include/d/actor/d_a_npc_len.h b/include/d/actor/d_a_npc_len.h
index 0464097760..1eedcaa060 100644
--- a/include/d/actor/d_a_npc_len.h
+++ b/include/d/actor/d_a_npc_len.h
@@ -60,7 +60,7 @@ public:
/* 80A68E28 */ s32 getFootRJointNo();
/* 80A68E30 */ bool chkXYItems();
- static void* mCutNameList[4];
+ static char* mCutNameList[4];
static u8 mCutList[48];
private:
diff --git a/include/d/actor/d_a_npc_myna2.h b/include/d/actor/d_a_npc_myna2.h
index ce1a6c3f12..01dc6db10f 100644
--- a/include/d/actor/d_a_npc_myna2.h
+++ b/include/d/actor/d_a_npc_myna2.h
@@ -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:
diff --git a/include/d/actor/d_a_npc_pachi_maro.h b/include/d/actor/d_a_npc_pachi_maro.h
index 57398a984c..1ab0e5ec6a 100644
--- a/include/d/actor/d_a_npc_pachi_maro.h
+++ b/include/d/actor/d_a_npc_pachi_maro.h
@@ -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:
diff --git a/include/d/actor/d_a_npc_pachi_taro.h b/include/d/actor/d_a_npc_pachi_taro.h
index 34c282ef97..124f0a3c96 100644
--- a/include/d/actor/d_a_npc_pachi_taro.h
+++ b/include/d/actor/d_a_npc_pachi_taro.h
@@ -107,7 +107,7 @@ public:
void clrMesPat() { mMesPat = -1; }
- static void* mCutNameList[11];
+ static char* mCutNameList[11];
static u8 mCutList[132];
private:
diff --git a/include/d/actor/d_a_npc_post.h b/include/d/actor/d_a_npc_post.h
index 1326aaf07a..086954b26d 100644
--- a/include/d/actor/d_a_npc_post.h
+++ b/include/d/actor/d_a_npc_post.h
@@ -62,7 +62,7 @@ public:
/* 80AAD110 */ s32 getFootLJointNo();
/* 80AAD118 */ s32 getFootRJointNo();
- static void* mCutNameList[2];
+ static char* mCutNameList[2];
static u8 mCutList[24];
private:
diff --git a/include/d/actor/d_a_npc_pouya.h b/include/d/actor/d_a_npc_pouya.h
index f7cdd65d45..d91b93014f 100644
--- a/include/d/actor/d_a_npc_pouya.h
+++ b/include/d/actor/d_a_npc_pouya.h
@@ -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:
diff --git a/include/d/actor/d_a_npc_shaman.h b/include/d/actor/d_a_npc_shaman.h
index d8a33bb530..b073939090 100644
--- a/include/d/actor/d_a_npc_shaman.h
+++ b/include/d/actor/d_a_npc_shaman.h
@@ -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];
diff --git a/include/d/actor/d_a_npc_sola.h b/include/d/actor/d_a_npc_sola.h
index d346fa543e..ac561bbd2f 100644
--- a/include/d/actor/d_a_npc_sola.h
+++ b/include/d/actor/d_a_npc_sola.h
@@ -49,7 +49,7 @@ public:
/* 80AEF084 */ s32 getNeckJointNo();
/* 80AEF08C */ bool getBackboneJointNo();
- static void* mCutNameList;
+ static char* mCutNameList[1];
static u8 mCutList[12];
private:
diff --git a/include/d/actor/d_a_npc_soldierA.h b/include/d/actor/d_a_npc_soldierA.h
index eeb6b8f642..984e9c7b46 100644
--- a/include/d/actor/d_a_npc_soldierA.h
+++ b/include/d/actor/d_a_npc_soldierA.h
@@ -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:
diff --git a/include/d/actor/d_a_npc_soldierB.h b/include/d/actor/d_a_npc_soldierB.h
index b0f023b930..7e816e2208 100644
--- a/include/d/actor/d_a_npc_soldierB.h
+++ b/include/d/actor/d_a_npc_soldierB.h
@@ -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:
diff --git a/include/d/actor/d_a_npc_the.h b/include/d/actor/d_a_npc_the.h
index 8b391cc449..7b0adb1280 100644
--- a/include/d/actor/d_a_npc_the.h
+++ b/include/d/actor/d_a_npc_the.h
@@ -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) {
diff --git a/include/d/actor/d_a_npc_toby.h b/include/d/actor/d_a_npc_toby.h
index dcbe3cd4a1..d2cc7ea278 100644
--- a/include/d/actor/d_a_npc_toby.h
+++ b/include/d/actor/d_a_npc_toby.h
@@ -70,7 +70,7 @@ public:
/* 80B24968 */ s32 getFootRJointNo();
/* 80B24970 */ bool chkXYItems();
- static void* mCutNameList[7];
+ static char* mCutNameList[7];
static u8 mCutList[84];
private:
diff --git a/include/d/actor/d_a_npc_yamis.h b/include/d/actor/d_a_npc_yamis.h
index d05cde81f0..77e81a709a 100644
--- a/include/d/actor/d_a_npc_yamis.h
+++ b/include/d/actor/d_a_npc_yamis.h
@@ -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:
diff --git a/include/d/actor/d_a_npc_yamit.h b/include/d/actor/d_a_npc_yamit.h
index 1dddc33826..298d206f8b 100644
--- a/include/d/actor/d_a_npc_yamit.h
+++ b/include/d/actor/d_a_npc_yamit.h
@@ -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:
diff --git a/include/d/actor/d_a_npc_zanb.h b/include/d/actor/d_a_npc_zanb.h
index a04a8be526..95398c1aa4 100644
--- a/include/d/actor/d_a_npc_zanb.h
+++ b/include/d/actor/d_a_npc_zanb.h
@@ -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:
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-06 06:32:02 +0000