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

d_a_npc_zelda equivalent (#2528)

This commit is contained in:
Max Roncace 2025-07-11 19:00:18 +00:00 committed by GitHub
parent b83ff69589
commit 92e14253ca
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
114 changed files with 1165 additions and 1318 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.py
View File

@ -1861,7 +1861,7 @@ config.libs = [
ActorRel(NonMatching, "d_a_npc_zant"),
ActorRel(NonMatching, "d_a_npc_zelR"),
ActorRel(NonMatching, "d_a_npc_zelRo"),
ActorRel(NonMatching, "d_a_npc_zelda"),
ActorRel(Equivalent, "d_a_npc_zelda"), # weak function order
ActorRel(NonMatching, "d_a_npc_zra"),
ActorRel(NonMatching, "d_a_npc_zrc"),
ActorRel(NonMatching, "d_a_npc_zrz"),

2
include/Z2AudioLib/Z2AudioCS.h
View File

@ -16,7 +16,7 @@ public:
static void extensionProcess(s32, s32);
u32 getHandleSoundID(s32);
void start(s32, s32);
static void startLevel(s32, s32);
static int startLevel(s32, s32);
};
#endif /* Z2AUDIOCS_H */

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

@ -2,6 +2,7 @@
#define D_A_D_A_NPC_H
#include "JSystem/J3DGraphAnimator/J3DMaterialAnm.h"
#include "SSystem/SComponent/c_counter.h"
#include "SSystem/SComponent/c_math.h"
#include "Z2AudioLib/Z2Creature.h"
#include "d/actor/d_a_player.h"
@ -55,8 +56,8 @@ public:
void setNowOffsetX(f32 i_value) { mNowOffsetX = i_value; }
void setNowOffsetY(f32 i_value) { mNowOffsetY = i_value; }
void onEyeMoveFlg() { mEyeMoveFlg = 1; }
void offEyeMoveFlg() { mEyeMoveFlg = 0; }
void onEyeMoveFlag() { mEyeMoveFlg = 1; }
void offEyeMoveFlag() { mEyeMoveFlg = 0; }
void setMorfFrm(u8 i_value) { mMorfFrm = i_value; }
};
@ -157,7 +158,7 @@ public:
mEyeAngle.x = field_0x132.x * (1.0f - 1.0f / param_2) +
sVar3 * (1.0f / param_2);
}
void setEyeAngleY(cXyz param_1, s16 param_2, BOOL param_3, f32 param_4, s16 param_5) {
cXyz cStack_50;
s16 sVar3 = 0;
@ -266,7 +267,7 @@ public:
setMode(LOOK_PLAYER, FALSE);
setDirect(isDirect);
}
void lookCamera(u8 isDirect) {
setMode(LOOK_CAMERA, FALSE);
setDirect(isDirect);
@ -313,8 +314,9 @@ public:
/* 80147E3C */ void calc(BOOL);
void initialize() {
u8 zero = 0;
for (int i = 0; i < 2; i++) {
mAngle[i].setall(0);
mAngle[i].setall(zero);
mPower[i] = 0.0f;
}
mStagger = 0;
@ -481,7 +483,7 @@ public:
/* 0x9C0 */ dPaPoT_c field_0x9c0;
/* 0xA40 */ dCcD_Stts field_0xa40;
/* 0xA7C */ u32 mFlowNodeNo;
/* 0xA80 */ f32 field_0xa80;
/* 0xA80 */ f32 mExpressionMorfFrame;
/* 0xA84 */ f32 mMorfFrames;
/* 0xA88 */ bool mCreating;
/* 0xA89 */ bool mTwilight;
@ -530,7 +532,7 @@ public:
/* 0xDDC */ f32 mTurnCount;
/* 0xDE0 */ f32 field_0xde0;
/* 0xDE4 */ f32 field_0xde4;
/* 0xDE8 */ f32 field_0xde8;
/* 0xDE8 */ f32 mRealShadowSize;
/* 0xDEC */ f32 mCylH;
/* 0xDF0 */ f32 mWallR;
/* 0xDF4 */ f32 mGroundH;
@ -578,6 +580,7 @@ public:
mpArcNames(i_arcNames),
mFaceMotionSeqMngr(i_faceMotionSequenceData, i_faceMotionStepNum),
mMotionSeqMngr(i_motionSequenceData, i_motionStepNum) {
OS_REPORT("|%06d:%x|daNpcT_c -> コンストラクト\n", g_Counter.mCounter0, this);
initialize();
}
@ -644,9 +647,9 @@ public:
/* 8014CC4C */ virtual s32 getHeadJointNo() { return -1; }
/* 8014CC90 */ virtual s32 getFootLJointNo() { return -1; }
/* 8014CC88 */ virtual s32 getFootRJointNo() { return -1; }
/* 8014D0A8 */ virtual s32 getEyeballLMaterialNo() { return 0; }
/* 8014D0B0 */ virtual s32 getEyeballRMaterialNo() { return 0; }
/* 8014D0B8 */ virtual s32 getEyeballMaterialNo() { return 0; }
/* 8014D0A8 */ virtual u16 getEyeballLMaterialNo() { return 0; }
/* 8014D0B0 */ virtual u16 getEyeballRMaterialNo() { return 0; }
/* 8014D0B8 */ virtual u16 getEyeballMaterialNo() { return 0; }
/* 8014951C */ virtual int ctrlJoint(J3DJoint*, J3DModel*);
/* 8014CC48 */ virtual void afterJntAnm(int) {}
/* 8014CC24 */ virtual void setParam() {}
@ -1222,7 +1225,7 @@ private:
/* 0x00 */ u16 mNurbs;
/* 0x02 */ u16 field_0x02;
/* 0x04 */ u8 mIsReversed;
/* 0x05 */ bool mIsClosed;
/* 0x05 */ u8 mIsClosed;
/* 0x08 */ dPnt mPoints[96];
public:
@ -1368,6 +1371,10 @@ struct daNpcT_HIOParam {
/* 0x88 */ f32 box_offset;
};
void daNpcT_cmnGenMessage(JORMContext*, daNpcT_HIOParam* param_1);
void daNpcT_cmnListenPropertyEvent(char*, int*, daNpcT_HIOParam*);
struct daNpcF_HIOParam {
/* 0x00 */ f32 attention_offset;
/* 0x04 */ f32 gravity;

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

@ -65,7 +65,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_evtData_c const*, char**);
/* 809575B4 */ s32 getEyeballMaterialNo();
/* 809575B4 */ u16 getEyeballMaterialNo();
/* 809575BC */ s32 getHeadJointNo();
/* 809575C4 */ s32 getNeckJointNo();
/* 809575CC */ bool getBackboneJointNo();

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

@ -56,7 +56,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_evtData_c const*, char**);
/* 80967BE4 */ s32 getEyeballMaterialNo();
/* 80967BE4 */ u16 getEyeballMaterialNo();
/* 80967BEC */ s32 getHeadJointNo();
/* 80967BF4 */ s32 getNeckJointNo();
/* 80967BFC */ bool getBackboneJointNo();

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

@ -90,7 +90,7 @@ public:
// "construct"
OS_REPORT("|%06d:%x|daNpc_Besu_c -> コンストラクト\n", g_Counter.mCounter0, this);
}
/* 8053E6A8 */ s32 getEyeballMaterialNo() { return 2; }
/* 8053E6A8 */ u16 getEyeballMaterialNo() { return 2; }
/* 8053E6B0 */ s32 getHeadJointNo() { return 4; }
/* 8053E6B8 */ s32 getNeckJointNo() { return 3; }
/* 8053E6C0 */ s32 getBackboneJointNo() { return true; }

4
include/d/actor/d_a_npc_bou.h
View File

@ -117,7 +117,7 @@ public:
/* 809727CC */ virtual s32 getBackboneJointNo();
/* 809727C4 */ virtual s32 getNeckJointNo();
/* 809727BC */ virtual s32 getHeadJointNo();
/* 809727B4 */ virtual s32 getEyeballMaterialNo();
/* 809727B4 */ virtual u16 getEyeballMaterialNo();
/* 8096DD44 */ virtual void afterJntAnm(int);
/* 8096DDC8 */ virtual void setParam();
/* 8096DF9C */ virtual BOOL checkChangeEvt();
@ -206,7 +206,7 @@ private:
STATIC_ASSERT(sizeof(daNpc_Bou_c) == 0xffc);
/* 809727B4-809727BC 005914 0008+00 1/0 0/0 0/0 .text getEyeballMaterialNo__11daNpc_Bou_cFv */
s32 daNpc_Bou_c::getEyeballMaterialNo() {
u16 daNpc_Bou_c::getEyeballMaterialNo() {
return 1;
}

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

@ -47,7 +47,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_evtData_c const*, char**);
/* 80995694 */ s32 getEyeballMaterialNo();
/* 80995694 */ u16 getEyeballMaterialNo();
/* 8099569C */ s32 getHeadJointNo();
/* 809956A4 */ s32 getNeckJointNo();
/* 809956AC */ bool getBackboneJointNo();

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

@ -51,7 +51,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_evtData_c const*, char**);
/* 809997AC */ s32 getEyeballMaterialNo();
/* 809997AC */ u16 getEyeballMaterialNo();
/* 809997B4 */ s32 getHeadJointNo();
/* 809997BC */ s32 getNeckJointNo();
/* 809997C4 */ bool getBackboneJointNo();

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

@ -45,7 +45,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_evtData_c const*, char**);
/* 8099D068 */ s32 getEyeballMaterialNo();
/* 8099D068 */ u16 getEyeballMaterialNo();
/* 8099D070 */ void checkChangeJoint(int);
/* 8099D080 */ void checkRemoveJoint(int);
/* 8099D090 */ s32 getBackboneJointNo();

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

@ -46,7 +46,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_evtData_c const*, char**);
/* 809AA24C */ s32 getEyeballMaterialNo();
/* 809AA24C */ u16 getEyeballMaterialNo();
/* 809AA254 */ s32 getHeadJointNo();
/* 809AA25C */ s32 getNeckJointNo();
/* 809AA264 */ bool getBackboneJointNo();

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

@ -107,7 +107,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_evtData_c const*, char**);
/* 809B9238 */ s32 getEyeballMaterialNo();
/* 809B9238 */ u16 getEyeballMaterialNo();
/* 809B9240 */ s32 getHeadJointNo();
/* 809B9248 */ s32 getNeckJointNo();
/* 809B9250 */ bool getBackboneJointNo();

4
include/d/actor/d_a_npc_gnd.h
View File

@ -56,8 +56,8 @@ public:
daNpcT_evtData_c const* param_7, char** param_8) :
daNpcT_c(param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8)
{}
/* 809BE40C */ s32 getEyeballRMaterialNo();
/* 809BE414 */ s32 getEyeballLMaterialNo();
/* 809BE40C */ u16 getEyeballRMaterialNo();
/* 809BE414 */ u16 getEyeballLMaterialNo();
/* 809BE41C */ s32 getHeadJointNo();
/* 809BE424 */ s32 getNeckJointNo();
/* 809BE42C */ s32 getBackboneJointNo();

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

@ -50,7 +50,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_evtData_c const*, char**);
/* 809D5F98 */ s32 getEyeballMaterialNo();
/* 809D5F98 */ u16 getEyeballMaterialNo();
/* 809D5FA0 */ s32 getHeadJointNo();
/* 809D5FA8 */ s32 getNeckJointNo();
/* 809D5FB0 */ bool getBackboneJointNo();

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

@ -53,7 +53,7 @@ public:
/* 809D8FE4 */ bool getBackboneJointNo();
/* 809D8FEC */ void checkChangeJoint(int);
/* 809D8FFC */ void checkRemoveJoint(int);
/* 809D900C */ s32 getEyeballMaterialNo();
/* 809D900C */ u16 getEyeballMaterialNo();
static void* mCutNameList;
static u8 mCutList[12];

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

@ -157,7 +157,7 @@ public:
daNpcT_evtData_c const* param_7, char** param_8) :
daNpcT_c(param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8)
{}
/* 80A00334 */ s32 getEyeballMaterialNo() { return 2; }
/* 80A00334 */ u16 getEyeballMaterialNo() { return 2; }
/* 80A004D0 */ s32 getHeadJointNo() { return 4; }
/* 80A004D8 */ s32 getNeckJointNo() { return 3; }
/* 80A004E0 */ s32 getBackboneJointNo() { return 1; }

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

@ -71,7 +71,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_evtData_c const*, char**);
/* 80A065A4 */ s32 getEyeballMaterialNo();
/* 80A065A4 */ u16 getEyeballMaterialNo();
/* 80A065AC */ s32 getHeadJointNo();
/* 80A065B4 */ s32 getNeckJointNo();
/* 80A065BC */ s32 getBackboneJointNo();

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

@ -146,7 +146,7 @@ public:
daNpcT_evtData_c const* param_7, char** param_8) :
daNpcT_c(param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8)
{}
/* 80A1A274 */ s32 getEyeballMaterialNo() { return 1; }
/* 80A1A274 */ u16 getEyeballMaterialNo() { return 1; }
/* 80A1A27C */ s32 getHeadJointNo() { return 4; }
/* 80A1A284 */ s32 getNeckJointNo() { return 3; }
/* 80A1A28C */ s32 getBackboneJointNo() { return 1; }

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

@ -50,7 +50,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_evtData_c const*, char**);
/* 805533E4 */ s32 getEyeballMaterialNo();
/* 805533E4 */ u16 getEyeballMaterialNo();
/* 805533EC */ s32 getHeadJointNo();
/* 805533F4 */ s32 getNeckJointNo();
/* 805533FC */ bool getBackboneJointNo();

6
include/d/actor/d_a_npc_kn.h
View File

@ -317,9 +317,9 @@ public:
/* 80A3949C */ virtual int ctrlBtk();
/* 80A3B7B4 */ virtual s32 getFootLJointNo();
/* 80A3B7AC */ virtual s32 getFootRJointNo();
/* 80A3BD1C */ virtual int getEyeballLMaterialNo();
/* 80A3BD24 */ virtual s32 getEyeballRMaterialNo();
/* 80A3BD14 */ virtual s32 getEyeballMaterialNo();
/* 80A3BD1C */ virtual u16 getEyeballLMaterialNo();
/* 80A3BD24 */ virtual u16 getEyeballRMaterialNo();
/* 80A3BD14 */ virtual u16 getEyeballMaterialNo();
/* 80A3989C */ virtual int ctrlJoint(J3DJoint*, J3DModel*);
/* 80A3B720 */ virtual void afterJntAnm(int);
/* 80A3B7A4 */ virtual BOOL checkChangeEvt();

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

@ -58,7 +58,7 @@ public:
/* 8055A4A0 */ virtual s32 getHeadJointNo();
/* 8055A4D8 */ virtual s32 getFootLJointNo();
/* 8055A4E0 */ virtual s32 getFootRJointNo();
/* 8055A498 */ virtual s32 getEyeballMaterialNo();
/* 8055A498 */ virtual u16 getEyeballMaterialNo();
/* 80554EBC */ virtual void afterJntAnm(int);
/* 80554F48 */ virtual void setParam();
/* 80555118 */ virtual BOOL checkChangeEvt();

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

@ -47,7 +47,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_evtData_c const*, char**);
/* 80A63800 */ s32 getEyeballMaterialNo();
/* 80A63800 */ u16 getEyeballMaterialNo();
/* 80A63808 */ s32 getHeadJointNo();
/* 80A63810 */ s32 getNeckJointNo();
/* 80A63818 */ bool getBackboneJointNo();

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

@ -50,7 +50,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_evtData_c const*, char**);
/* 80A68DE0 */ s32 getEyeballMaterialNo();
/* 80A68DE0 */ u16 getEyeballMaterialNo();
/* 80A68DE8 */ s32 getHeadJointNo();
/* 80A68DF0 */ s32 getNeckJointNo();
/* 80A68DF8 */ bool getBackboneJointNo();

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

@ -58,7 +58,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_evtData_c const*, char**);
/* 80A6FCD0 */ s32 getEyeballMaterialNo();
/* 80A6FCD0 */ u16 getEyeballMaterialNo();
/* 80A6FCD8 */ s32 getHeadJointNo();
/* 80A6FCE0 */ s32 getNeckJointNo();
/* 80A6FCE8 */ bool getBackboneJointNo();

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

@ -108,7 +108,7 @@ public:
i_arcNames) {
OS_REPORT("|%06d:%x|daNpc_Maro_c -> コンストラクト\n", g_Counter.mCounter0, this);
}
/* 80564970 */ s32 getEyeballMaterialNo();
/* 80564970 */ u16 getEyeballMaterialNo();
/* 80564978 */ s32 getHeadJointNo();
/* 80564980 */ s32 getNeckJointNo();
/* 80564988 */ s32 getBackboneJointNo();

4
include/d/actor/d_a_npc_midp.h
View File

@ -55,8 +55,8 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_5, int param_6,
daNpcT_evtData_c const* param_7, char** param_8) :
daNpcT_c(param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8) {}
/* 80A7390C */ s32 getEyeballRMaterialNo();
/* 80A73914 */ s32 getEyeballLMaterialNo();
/* 80A7390C */ u16 getEyeballRMaterialNo();
/* 80A73914 */ u16 getEyeballLMaterialNo();
/* 80A7391C */ s32 getHeadJointNo();
/* 80A73924 */ s32 getNeckJointNo();
/* 80A7392C */ s32 getBackboneJointNo();

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

@ -146,7 +146,7 @@ public:
: daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
i_arcNames) {}
/* 80A7AE0C */ s32 getEyeballMaterialNo() { return chkMoiN() ? 4 : 2; }
/* 80A7AE0C */ u16 getEyeballMaterialNo() { if (chkMoiN()) { return 4; } else { return 2; } }
/* 80A7AE3C */ s32 getHeadJointNo() { return 4; }
/* 80A7AE44 */ s32 getNeckJointNo() { return 3; }
/* 80A7AE4C */ s32 getBackboneJointNo() { return 1; }

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

@ -80,7 +80,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_evtData_c const*, char**);
/* 80A969C0 */ s32 getEyeballMaterialNo();
/* 80A969C0 */ u16 getEyeballMaterialNo();
/* 80A969C8 */ s32 getHeadJointNo();
/* 80A969D0 */ s32 getNeckJointNo();
/* 80A969D8 */ bool getBackboneJointNo();

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

@ -82,7 +82,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_evtData_c const*, char**);
/* 80A9B7E0 */ s32 getEyeballMaterialNo();
/* 80A9B7E0 */ u16 getEyeballMaterialNo();
/* 80A9B7E8 */ s32 getHeadJointNo();
/* 80A9B7F0 */ s32 getNeckJointNo();
/* 80A9B7F8 */ bool getBackboneJointNo();

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

@ -98,7 +98,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_evtData_c const*, char**);
/* 80AA1558 */ s32 getEyeballMaterialNo();
/* 80AA1558 */ u16 getEyeballMaterialNo();
/* 80AA1560 */ s32 getHeadJointNo();
/* 80AA1568 */ s32 getNeckJointNo();
/* 80AA1570 */ bool getBackboneJointNo();

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

@ -53,7 +53,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_evtData_c const*, char**);
/* 80AAD0D0 */ s32 getEyeballMaterialNo();
/* 80AAD0D0 */ u16 getEyeballMaterialNo();
/* 80AAD0D8 */ s32 getHeadJointNo();
/* 80AAD0E0 */ s32 getNeckJointNo();
/* 80AAD0E8 */ bool getBackboneJointNo();

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

@ -50,7 +50,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_evtData_c const*, char**);
/* 80AB1F54 */ s32 getEyeballMaterialNo();
/* 80AB1F54 */ u16 getEyeballMaterialNo();
/* 80AB1F5C */ s32 getHeadJointNo();
/* 80AB1F64 */ s32 getNeckJointNo();
/* 80AB1F6C */ bool getBackboneJointNo();

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

@ -47,7 +47,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_evtData_c const*, char**);
/* 80AB8DAC */ s32 getEyeballMaterialNo();
/* 80AB8DAC */ u16 getEyeballMaterialNo();
/* 80AB8DB4 */ s32 getHeadJointNo();
/* 80AB8DBC */ s32 getNeckJointNo();
/* 80AB8DC4 */ bool getBackboneJointNo();

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

@ -66,7 +66,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_evtData_c const*, char**);
/* 80ACFC14 */ s32 getEyeballMaterialNo();
/* 80ACFC14 */ u16 getEyeballMaterialNo();
/* 80ACFC1C */ s32 getHeadJointNo();
/* 80ACFC24 */ s32 getNeckJointNo();
/* 80ACFC2C */ bool getBackboneJointNo();

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

@ -58,7 +58,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_evtData_c const*, char**);
/* 80AD4884 */ s32 getEyeballMaterialNo();
/* 80AD4884 */ u16 getEyeballMaterialNo();
/* 80AD488C */ s32 getHeadJointNo();
/* 80AD4894 */ s32 getNeckJointNo();
/* 80AD489C */ bool getBackboneJointNo();

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

@ -59,7 +59,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_evtData_c const*, char**);
/* 80AE6B1C */ s32 getEyeballMaterialNo();
/* 80AE6B1C */ u16 getEyeballMaterialNo();
/* 80AE6B24 */ s32 getHeadJointNo();
/* 80AE6B2C */ s32 getNeckJointNo();
/* 80AE6B34 */ bool getBackboneJointNo();

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

@ -163,7 +163,7 @@ public:
i_arcNames) {
OS_REPORT("|%06d:%x|daNpc_Taro_c -> コンストラクト\n", g_Counter.mCounter0, this);
}
/* 805715AC */ s32 getEyeballMaterialNo() { return 2; }
/* 805715AC */ u16 getEyeballMaterialNo() { return 2; }
/* 805715B4 */ s32 getHeadJointNo() { return 4; }
/* 805715BC */ s32 getNeckJointNo() { return 3; }
/* 805715C4 */ s32 getBackboneJointNo() { return 1; }

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

@ -45,7 +45,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_evtData_c const*, char**);
/* 805764EC */ s32 getEyeballMaterialNo();
/* 805764EC */ u16 getEyeballMaterialNo();
/* 805764F4 */ s32 getHeadJointNo();
/* 805764FC */ s32 getNeckJointNo();
/* 80576504 */ s32 getBackboneJointNo();

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

@ -60,7 +60,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_evtData_c const*, char**);
/* 80B24920 */ s32 getEyeballMaterialNo();
/* 80B24920 */ u16 getEyeballMaterialNo();
/* 80B24928 */ s32 getHeadJointNo();
/* 80B24930 */ s32 getNeckJointNo();
/* 80B24938 */ bool getBackboneJointNo();

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

@ -139,7 +139,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_5,
int param_6, daNpcT_evtData_c const* param_7, char** param_8)
: daNpcT_c(param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8) {}
/* 80B2CD44 */ s32 getEyeballMaterialNo() { return 2; }
/* 80B2CD44 */ u16 getEyeballMaterialNo() { return 2; }
/* 80B2CD4C */ s32 getHeadJointNo() { return 4; }
/* 80B2CD54 */ s32 getNeckJointNo() { return 3; }
/* 80B2CD5C */ s32 getBackboneJointNo() { return 1; }

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

@ -49,7 +49,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_evtData_c const*, char**);
/* 80B45F34 */ s32 getEyeballMaterialNo();
/* 80B45F34 */ u16 getEyeballMaterialNo();
/* 80B45F3C */ s32 getHeadJointNo();
/* 80B45F44 */ s32 getNeckJointNo();
/* 80B45F4C */ bool getBackboneJointNo();

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

@ -49,7 +49,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_evtData_c const*, char**);
/* 80B49598 */ s32 getEyeballMaterialNo();
/* 80B49598 */ u16 getEyeballMaterialNo();
/* 80B495A0 */ s32 getHeadJointNo();
/* 80B495A8 */ s32 getNeckJointNo();
/* 80B495B0 */ bool getBackboneJointNo();

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

@ -52,7 +52,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_evtData_c const*, char**);
/* 80B4CCF8 */ s32 getEyeballMaterialNo();
/* 80B4CCF8 */ u16 getEyeballMaterialNo();
/* 80B4CD00 */ s32 getHeadJointNo();
/* 80B4CD08 */ s32 getNeckJointNo();
/* 80B4CD10 */ bool getBackboneJointNo();

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

@ -58,7 +58,7 @@ public:
: daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
i_arcNames) {}
/* 80B521E4 */ s32 getEyeballMaterialNo() { return 1; }
/* 80B521E4 */ u16 getEyeballMaterialNo() { return 1; }
/* 80B521EC */ s32 getHeadJointNo() { return 4; }
/* 80B521F4 */ s32 getNeckJointNo() { return 3; }
/* 80B521FC */ s32 getBackboneJointNo() { return 1; }

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

@ -73,7 +73,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_evtData_c const*, char**);
/* 80B5D688 */ s32 getEyeballMaterialNo();
/* 80B5D688 */ u16 getEyeballMaterialNo();
/* 80B5D690 */ s32 getHeadJointNo();
/* 80B5D698 */ s32 getNeckJointNo();
/* 80B5D6A0 */ bool getBackboneJointNo();

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

@ -66,7 +66,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_evtData_c const*, char**);
/* 80B67B1C */ s32 getEyeballMaterialNo();
/* 80B67B1C */ u16 getEyeballMaterialNo();
/* 80B67B24 */ s32 getHeadJointNo();
/* 80B67B2C */ s32 getNeckJointNo();
/* 80B67B34 */ bool getBackboneJointNo();

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

@ -46,7 +46,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_evtData_c const*, char**);
/* 80B6BC18 */ s32 getEyeballMaterialNo();
/* 80B6BC18 */ u16 getEyeballMaterialNo();
/* 80B6BC20 */ s32 getHeadJointNo();
/* 80B6BC28 */ s32 getNeckJointNo();
/* 80B6BC30 */ bool getBackboneJointNo();

4
include/d/actor/d_a_npc_zelR.h
View File

@ -57,8 +57,8 @@ public:
daNpcT_evtData_c const* param_7, char** param_8) :
daNpcT_c(param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8)
{}
/* 80B71A34 */ s32 getEyeballRMaterialNo();
/* 80B71A3C */ s32 getEyeballLMaterialNo();
/* 80B71A34 */ u16 getEyeballRMaterialNo();
/* 80B71A3C */ u16 getEyeballLMaterialNo();
/* 80B71A44 */ s32 getHeadJointNo();
/* 80B71A4C */ s32 getBackboneJointNo();
/* 80B71A54 */ BOOL checkChangeJoint(int param_1) { return param_1 == 3; };

4
include/d/actor/d_a_npc_zelRo.h
View File

@ -47,8 +47,8 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_evtData_c const*, char**);
/* 80B74BA8 */ s32 getEyeballRMaterialNo();
/* 80B74BB0 */ s32 getEyeballLMaterialNo();
/* 80B74BA8 */ u16 getEyeballRMaterialNo();
/* 80B74BB0 */ u16 getEyeballLMaterialNo();
/* 80B74BB8 */ s32 getHeadJointNo();
/* 80B74BC0 */ s32 getNeckJointNo();
/* 80B74BC8 */ bool getBackboneJointNo();

113
include/d/actor/d_a_npc_zelda.h
View File

@ -3,6 +3,41 @@
#include "d/actor/d_a_npc.h"
class daNpc_Zelda_HIOParam {
public:
/* 0x00 */ daNpcT_HIOParam common;
};
STATIC_ASSERT(sizeof(daNpc_Zelda_HIOParam) == 0x8c);
class daNpc_Zelda_Param_c {
public:
/* 80B77F5C */ virtual ~daNpc_Zelda_Param_c();
static const daNpc_Zelda_HIOParam m;
};
class daNpc_Zelda_HIO_c
#if DEBUG
: public mDoHIO_entry_c
#endif
{
public:
daNpc_Zelda_HIO_c();
void genMessage(JORMContext* ctx);
void listenPropertyEvent(const JORPropertyEvent*);
#if DEBUG
daNpc_Zelda_HIOParam param;
#endif
};
class daNpc_Zelda_c;
typedef int (daNpc_Zelda_c::*cutFunc)(int);
typedef int (daNpc_Zelda_c::*actionFunc)(void*);
/**
* @ingroup actors-npcs
* @class daNpc_Zelda_c
@ -11,64 +46,68 @@
* @details
*
*/
class daNpc_Zelda_c : public fopAc_ac_c {
class daNpc_Zelda_c : public daNpcT_c {
public:
/* 80B7512C */ ~daNpc_Zelda_c();
/* 80B7524C */ void create();
/* 80B75530 */ void CreateHeap();
/* 80B75978 */ void Delete();
/* 80B759AC */ void Execute();
/* 80B759CC */ void Draw();
/* 80B75A90 */ void createHeapCallBack(fopAc_ac_c*);
/* 80B75AB0 */ void ctrlJointCallBack(J3DJoint*, int);
/* 80B75B08 */ void getType();
/* 80B75B28 */ bool isDelete();
/* 80B7512C */ virtual ~daNpc_Zelda_c();
u8 getPathID() {
return (fopAcM_GetParam(this) & 0xff00) >> 8;
}
int getFlowNodeNo() {
u16 pitch = home.angle.x;
return pitch == 0xffff ? -1 : pitch;
}
/* 80B7524C */ int create();
/* 80B75530 */ int CreateHeap();
/* 80B75978 */ int Delete();
/* 80B759AC */ int Execute();
/* 80B759CC */ int Draw();
/* 80B75A90 */ static int createHeapCallBack(fopAc_ac_c*);
/* 80B75AB0 */ static int ctrlJointCallBack(J3DJoint*, int);
/* 80B75B08 */ u8 getType();
/* 80B75B28 */ int isDelete();
/* 80B75B30 */ void reset();
/* 80B75C9C */ void afterJntAnm(int);
/* 80B75D28 */ void ctrlBtk();
/* 80B75E34 */ void checkChangeEvt();
/* 80B75D28 */ int ctrlBtk();
/* 80B75E34 */ int checkChangeEvt();
/* 80B75EE8 */ void setParam();
/* 80B76014 */ void setAfterTalkMotion();
/* 80B76074 */ void srchActors();
/* 80B76078 */ void evtTalk();
/* 80B76118 */ void evtCutProc();
/* 80B76078 */ int evtTalk();
/* 80B76118 */ int evtCutProc();
/* 80B761E0 */ void action();
/* 80B762CC */ void beforeMove();
/* 80B76344 */ void setAttnPos();
/* 80B765D4 */ void setCollision();
/* 80B76774 */ bool drawDbgInfo();
/* 80B7677C */ void selectAction();
/* 80B767C4 */ void chkAction(int (daNpc_Zelda_c::*)(void*));
/* 80B767F0 */ void setAction(int (daNpc_Zelda_c::*)(void*));
/* 80B76898 */ void wait(void*);
/* 80B76B74 */ void talk(void*);
/* 80B76774 */ int drawDbgInfo();
/* 80B7677C */ int selectAction();
/* 80B767C4 */ BOOL chkAction(actionFunc);
/* 80B767F0 */ BOOL setAction(actionFunc);
/* 80B76898 */ int wait(void*);
/* 80B76B74 */ int talk(void*);
/* 80B77DD8 */ daNpc_Zelda_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**);
/* 80B77F14 */ s32 getEyeballRMaterialNo();
/* 80B77F1C */ s32 getEyeballLMaterialNo();
/* 80B77F14 */ u16 getEyeballRMaterialNo();
/* 80B77F1C */ u16 getEyeballLMaterialNo();
/* 80B77F24 */ s32 getHeadJointNo();
/* 80B77F2C */ s32 getNeckJointNo();
/* 80B77F34 */ bool getBackboneJointNo();
/* 80B77F3C */ void checkChangeJoint(int);
/* 80B77F4C */ void checkRemoveJoint(int);
/* 80B77F34 */ s32 getBackboneJointNo();
/* 80B77F3C */ int checkChangeJoint(int);
/* 80B77F4C */ int checkRemoveJoint(int);
static void* mCutNameList;
static u8 mCutList[12];
static const char* mCutNameList;
static cutFunc mCutList[1];
private:
/* 0x568 */ u8 field_0x568[0xfa0 - 0x568];
/* 0xE40 */ daNpc_Zelda_HIO_c* mHIO;
/* 0xE44 */ dCcD_Cyl mCyl;
/* 0xF80 */ u8 field_0xf80;
/* 0xF84 */ actionFunc mAction1;
/* 0xF90 */ actionFunc mAction2;
/* 0xF9C */ u8 field_0xf9c[0xfa0 - 0xf9c];
};
STATIC_ASSERT(sizeof(daNpc_Zelda_c) == 0xfa0);
class daNpc_Zelda_Param_c {
public:
/* 80B77F5C */ ~daNpc_Zelda_Param_c();
static u8 const m[140];
};
#endif /* D_A_NPC_ZELDA_H */

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

@ -68,7 +68,7 @@ public:
: daNpcT_c(param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8) {
OS_REPORT("|%06d:%x|daPeru_c -> コンストラクト\n", g_Counter.mCounter0, this);
}
/* 80D4BEC4 */ s32 getEyeballMaterialNo() { return 1; }
/* 80D4BEC4 */ u16 getEyeballMaterialNo() { return 1; }
/* 80D4BECC */ s32 getHeadJointNo() { return 4; }
/* 80D4BED4 */ s32 getNeckJointNo() { return 3; }
/* 80D4BEDC */ s32 getBackboneJointNo() { return 1; }

2
include/d/d_path.h
View File

@ -25,7 +25,7 @@ struct dPath {
/* 0x8 */ dPnt* m_points;
};
inline BOOL dPath_ChkClose(dPath* i_path) { return i_path->m_closed & 1; }
inline BOOL dPath_ChkClose(const dPath* i_path) { return i_path->m_closed & 1; }
dPath* dPath_GetRoomPath(int path_index, int room_no);
dPath* dPath_GetNextRoomPath(dPath const* i_path, int room_no);

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

@ -1581,7 +1581,7 @@ BOOL daNpcT_c::ctrlBtk() {
field_0xe2a = 0;
}
mpMatAnm[0]->onEyeMoveFlg();
mpMatAnm[0]->onEyeMoveFlag();
return TRUE;
}
@ -1590,7 +1590,7 @@ BOOL daNpcT_c::ctrlBtk() {
field_0xe2a = 0;
}
mpMatAnm[0]->offEyeMoveFlg();
mpMatAnm[0]->offEyeMoveFlag();
}
return FALSE;
@ -1629,11 +1629,11 @@ void daNpcT_c::ctrlFaceMotion() {
setFaceMotionAnm(motionNo, true);
if (morfFrm < 0.0f) {
mpMorf[0]->setMorf(field_0xa80);
field_0xdfc = field_0xa80;
mpMorf[0]->setMorf(mExpressionMorfFrame);
field_0xdfc = mExpressionMorfFrame;
if (mpMorf[1]) {
mpMorf[1]->setMorf(field_0xa80);
mpMorf[1]->setMorf(mExpressionMorfFrame);
}
} else {
mpMorf[0]->setMorf(morfFrm);
@ -2841,6 +2841,149 @@ BOOL daNpcT_chkTmpBit(u32 i_no) {
return dComIfGs_isTmpBit(dSv_event_tmp_flag_c::tempBitLabels[i_no]);
}
void daNpcT_cmnGenMessage(JORMContext* ctx, daNpcT_HIOParam* i_hioParam) {
ctx->genSlider("注目オフセット ", &i_hioParam->attention_offset,
0.0f, 1000.0f, 0, NULL, 0xffff, 0xffff, 512, 24);
ctx->genSlider("重力 ", &i_hioParam->gravity,
-100.0f, 100.0f, 0, NULL, 0xffff, 0xffff, 512, 24);
ctx->genSlider("スケ−ル ", &i_hioParam->scale,
0.0f, 100.0f, 0, NULL, 0xffff, 0xffff, 512, 24);
ctx->genSlider("リアル影サイズ ", &i_hioParam->real_shadow_size,
0.0f, 10000.0f, 0, NULL, 0xffff, 0xffff, 512, 24);
ctx->genSlider("体重 ", &i_hioParam->weight,
0.0f, 255.0f, 0, NULL, 0xffff, 0xffff, 512, 24);
ctx->genSlider("高さ ", &i_hioParam->height,
0.0f, 1000.0f, 0, NULL, 0xffff, 0xffff, 512, 24);
ctx->genSlider("ひざ丈 ", &i_hioParam->knee_length,
0.0f, 1000.0f, 0, NULL, 0xffff, 0xffff, 512, 24);
ctx->genSlider("幅 ", &i_hioParam->width,
0.0f, 1000.0f, 0, NULL, 0xffff, 0xffff, 512, 24);
ctx->genSlider("腰のＸ角上限 ", &i_hioParam->body_angleX_max, -90.0f, 90.0f, 0, NULL,
0xffff, 0xffff, 512, 24);
ctx->genSlider("腰のＸ角下限 ", &i_hioParam->body_angleX_min, -90.0f, 90.0f, 0, NULL,
0xffff, 0xffff, 512, 24);
ctx->genSlider("腰のＹ角上限 ", &i_hioParam->body_angleY_max, -180.0f, 179.0f, 0, NULL,
0xffff, 0xffff, 512, 24);
ctx->genSlider("腰のＹ角下限 ", &i_hioParam->body_angleY_min, -180.0f, 179.0f, 0, NULL,
0xffff, 0xffff, 512, 24);
ctx->genSlider("頭のＸ角上限 ", &i_hioParam->head_angleX_max, -90.0f, 90.0f, 0, NULL,
0xffff, 0xffff, 512, 24);
ctx->genSlider("頭のＸ角下限 ", &i_hioParam->head_angleX_min, -90.0f, 90.0f, 0, NULL,
0xffff, 0xffff, 512, 24);
ctx->genSlider("頭のＹ角上限 ", &i_hioParam->head_angleY_max, -180.0f, 179.0f, 0, NULL,
0xffff, 0xffff, 512, 24);
ctx->genSlider("頭のＹ角下限 ", &i_hioParam->head_angleY_min, -180.0f, 179.0f, 0, NULL,
0xffff, 0xffff, 512, 24);
ctx->genSlider("首の移動割合 ", &i_hioParam->neck_rotation_ratio,
0.0f, 1.0f, 0, NULL, 0xffff, 0xffff, 512, 24);
ctx->genSlider("補間フレ－ム ", &i_hioParam->morf_frame,
0.0f, 100.0f, 0, NULL, 0xffff, 0xffff, 512, 24);
ctx->startComboBox("会話距離 ", &i_hioParam->talk_distance,
0, NULL, 0xffff, 0xffff, 0x100, 26);
ctx->genComboBoxItem(" 50", 0);
ctx->genComboBoxItem(" 100", 1);
ctx->genComboBoxItem(" 150", 2);
ctx->genComboBoxItem(" 200", 3);
ctx->genComboBoxItem(" 250", 4);
ctx->genComboBoxItem(" 300", 5);
ctx->genComboBoxItem(" 350", 6);
ctx->genComboBoxItem(" 400", 7);
ctx->genComboBoxItem(" 450", 8);
ctx->genComboBoxItem(" 500", 9);
ctx->genComboBoxItem(" 550", 10);
ctx->genComboBoxItem(" 600", 11);
ctx->genComboBoxItem(" 650", 12);
ctx->genComboBoxItem(" 700", 13);
ctx->genComboBoxItem(" 750", 14);
ctx->genComboBoxItem(" 800", 15);
ctx->genComboBoxItem(" 850", 16);
ctx->genComboBoxItem(" 900", 17);
ctx->genComboBoxItem(" 950", 18);
ctx->genComboBoxItem("1000", 19);
ctx->endComboBox();
ctx->startComboBox("会話角度 ", &i_hioParam->talk_angle,
0, NULL, 0xffff, 0xffff, 0x100, 26);
ctx->genComboBoxItem(" 30", 0);
ctx->genComboBoxItem(" 45", 1);
ctx->genComboBoxItem(" 60", 2);
ctx->genComboBoxItem(" 90", 3);
ctx->genComboBoxItem(" 110", 4);
ctx->genComboBoxItem(" 135", 5);
ctx->genComboBoxItem(" 180", 6);
ctx->endComboBox();
ctx->startComboBox("注目距離 ", &i_hioParam->attention_distance,
0, NULL, 0xffff, 0xffff, 0x100, 26);
ctx->genComboBoxItem(" 50", 0);
ctx->genComboBoxItem(" 100", 1);
ctx->genComboBoxItem(" 150", 2);
ctx->genComboBoxItem(" 200", 3);
ctx->genComboBoxItem(" 250", 4);
ctx->genComboBoxItem(" 300", 5);
ctx->genComboBoxItem(" 350", 6);
ctx->genComboBoxItem(" 400", 7);
ctx->genComboBoxItem(" 450", 8);
ctx->genComboBoxItem(" 500", 9);
ctx->genComboBoxItem(" 550", 10);
ctx->genComboBoxItem(" 600", 11);
ctx->genComboBoxItem(" 650", 12);
ctx->genComboBoxItem(" 700", 13);
ctx->genComboBoxItem(" 750", 14);
ctx->genComboBoxItem(" 800", 15);
ctx->genComboBoxItem(" 850", 16);
ctx->genComboBoxItem(" 900", 17);
ctx->genComboBoxItem(" 950", 18);
ctx->genComboBoxItem("1000", 19);
ctx->endComboBox();
ctx->startComboBox("注目角度 ", &i_hioParam->attention_angle,
0, NULL, 0xffff, 0xffff, 0x100, 26);
ctx->genComboBoxItem(" 30", 0);
ctx->genComboBoxItem(" 45", 1);
ctx->genComboBoxItem(" 60", 2);
ctx->genComboBoxItem(" 90", 3);
ctx->genComboBoxItem(" 110", 4);
ctx->genComboBoxItem(" 135", 5);
ctx->genComboBoxItem(" 180", 6);
ctx->endComboBox();
ctx->genSlider("視界 ", &i_hioParam->fov,
0.0f, 180.0f, 0, NULL, 0xffff, 0xffff, 512, 24);
ctx->genSlider("サ－チ距離 ", &i_hioParam->search_distance,
0.0f, 10000.0f, 0, NULL, 0xffff, 0xffff, 512, 24);
ctx->genSlider("サ－チ高さ ", &i_hioParam->search_height,
-10000.0f, 10000.0f, 0, NULL, 0xffff, 0xffff, 512, 24);
ctx->genSlider("サ－チ低さ ", &i_hioParam->search_depth,
-10000.0f, 10000.0f, 0, NULL, 0xffff, 0xffff, 512, 24);
ctx->genSlider("？ ", &i_hioParam->attention_time,
0, 10000, 0, NULL, 0xffff, 0xffff, 512, 24);
ctx->genSlider("？ ", &i_hioParam->damage_time,
0, 10000, 0, NULL, 0xffff, 0xffff, 512, 24);
ctx->genSlider("表情 ", &i_hioParam->face_expression,
0, 0xff, 0, NULL, 0xffff, 0xffff, 512, 24);
ctx->genSlider("動作 ", &i_hioParam->motion,
0, 0xff, 0, NULL, 0xffff, 0xffff, 512, 24);
ctx->genSlider("注視モ－ド ", &i_hioParam->look_mode,
0, 0xff, 0, NULL, 0xffff, 0xffff, 512, 24);
ctx->genCheckBox("デバグモ－ドＯＮ", &i_hioParam->debug_mode_ON, 1, 0, NULL,
0xffff, 0xffff, 512, 24);
ctx->genCheckBox("デバグ情報ＯＮ ", &i_hioParam->debug_info_ON, 1, 0, NULL,
0xffff, 0xffff, 512, 24);
ctx->genSlider("表情補間フレ－ム", &i_hioParam->expression_morf_frame,
0.0f, 100.0f, 0, NULL, 0xffff, 0xffff, 512, 24);
ctx->genSlider("箱最小ｘ ", &i_hioParam->box_min_x,
-1000.0f, 1000.0f, 0, NULL, 0xffff, 0xffff, 512, 24);
ctx->genSlider("箱最小ｙ ", &i_hioParam->box_min_y,
-1000.0f, 1000.0f, 0, NULL, 0xffff, 0xffff, 512, 24);
ctx->genSlider("箱最小ｚ ", &i_hioParam->box_min_z,
-1000.0f, 1000.0f, 0, NULL, 0xffff, 0xffff, 512, 24);
ctx->genSlider("箱最大ｘ ", &i_hioParam->box_max_x,
-1000.0f, 1000.0f, 0, NULL, 0xffff, 0xffff, 512, 24);
ctx->genSlider("箱最大ｙ ", &i_hioParam->box_max_y,
-1000.0f, 1000.0f, 0, NULL, 0xffff, 0xffff, 512, 24);
ctx->genSlider("箱最大ｚ ", &i_hioParam->box_max_z,
-1000.0f, 1000.0f, 0, NULL, 0xffff, 0xffff, 512, 24);
ctx->genSlider("箱オフセット ", &i_hioParam->box_offset,
-1000.0f, 1000.0f, 0, NULL, 0xffff, 0xffff, 512, 24);
}
/* 80392680-803926B0 01ECE0 0030+00 1/1 0/0 4/4 .rodata mCcDObjData__8daNpcT_c */
const dCcD_SrcGObjInf daNpcT_c::mCcDObjData = {
{0, {{0, 0, 0}, {0, 0x00}, {0x79}}},

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

@ -117,7 +117,7 @@ extern "C" void func_809573B0(void* _this, f32, f32);
extern "C" void __sinit_d_a_npc_aru_cpp();
extern "C" void
__ct__11daNpc_Aru_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc();
extern "C" s32 getEyeballMaterialNo__11daNpc_Aru_cFv();
extern "C" u16 getEyeballMaterialNo__11daNpc_Aru_cFv();
extern "C" s32 getHeadJointNo__11daNpc_Aru_cFv();
extern "C" s32 getNeckJointNo__11daNpc_Aru_cFv();
extern "C" bool getBackboneJointNo__11daNpc_Aru_cFv();
@ -1884,7 +1884,7 @@ daNpc_Aru_c::daNpc_Aru_c(daNpcT_faceMotionAnmData_c const* param_0,
}
/* 809575B4-809575BC 005F14 0008+00 1/0 0/0 0/0 .text getEyeballMaterialNo__11daNpc_Aru_cFv */
s32 daNpc_Aru_c::getEyeballMaterialNo() {
u16 daNpc_Aru_c::getEyeballMaterialNo() {
return 2;
}

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

@ -108,7 +108,7 @@ extern "C" void func_809679F4(void* _this, u8*);
extern "C" void __sinit_d_a_npc_bans_cpp();
extern "C" void
__ct__12daNpc_Bans_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc();
extern "C" s32 getEyeballMaterialNo__12daNpc_Bans_cFv();
extern "C" u16 getEyeballMaterialNo__12daNpc_Bans_cFv();
extern "C" s32 getHeadJointNo__12daNpc_Bans_cFv();
extern "C" s32 getNeckJointNo__12daNpc_Bans_cFv();
extern "C" bool getBackboneJointNo__12daNpc_Bans_cFv();
@ -1662,7 +1662,7 @@ daNpc_Bans_c::daNpc_Bans_c(daNpcT_faceMotionAnmData_c const* param_0,
}
/* 80967BE4-80967BEC 005404 0008+00 1/0 0/0 0/0 .text getEyeballMaterialNo__12daNpc_Bans_cFv */
s32 daNpc_Bans_c::getEyeballMaterialNo() {
u16 daNpc_Bans_c::getEyeballMaterialNo() {
return 2;
}

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

@ -498,7 +498,7 @@ int daNpc_Besu_c::Draw() {
material->setMaterialAnm(matAnm);
}
return draw(FALSE, 0, field_0xde8, NULL, 100.0f, 0, 0, 0);
return draw(FALSE, 0, mRealShadowSize, NULL, 100.0f, 0, 0, 0);
}
/* 805379FC-80537A1C 000C9C 0020+00 1/1 0/0 0/0 .text
@ -740,12 +740,12 @@ void daNpc_Besu_c::setParam() {
mAcchCir.SetWallR(mWallR);
mAcchCir.SetWallH(daNpc_Besu_Param_c::m.common.knee_length);
field_0xde8 = daNpc_Besu_Param_c::m.common.real_shadow_size;
mRealShadowSize = daNpc_Besu_Param_c::m.common.real_shadow_size;
if (chkNurse()) {
field_0xde8 = 500.0f;
mRealShadowSize = 500.0f;
}
field_0xa80 = daNpc_Besu_Param_c::m.common.expression_morf_frame;
mExpressionMorfFrame = daNpc_Besu_Param_c::m.common.expression_morf_frame;
mMorfFrames = daNpc_Besu_Param_c::m.common.morf_frame;
gravity = daNpc_Besu_Param_c::m.common.gravity;
}

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

@ -288,7 +288,7 @@ int daNpc_Bou_c::Draw() {
J3DModelData* modelData = mpMorf[0]->getModel()->getModelData();
modelData->getMaterialNodePointer(getEyeballMaterialNo())->setMaterialAnm(mpMatAnm[0]);
}
return daNpcT_c::draw(0, 0, field_0xde8, NULL, 100.0f, 0, 0, 0);
return daNpcT_c::draw(0, 0, mRealShadowSize, NULL, 100.0f, 0, 0, 0);
}
/* 8096D8A0-8096D8C0 000A00 0020+00 1/1 0/0 0/0 .text
@ -480,8 +480,8 @@ void daNpc_Bou_c::setParam() {
mAttnFovY = daNpc_Bou_Param_c::m.field_0x50;
mAcchCir.SetWallR(mWallR);
mAcchCir.SetWallH(daNpc_Bou_Param_c::m.field_0x18);
field_0xde8 = daNpc_Bou_Param_c::m.field_0x0c;
field_0xa80 = daNpc_Bou_Param_c::m.field_0x6c;
mRealShadowSize = daNpc_Bou_Param_c::m.field_0x0c;
mExpressionMorfFrame = daNpc_Bou_Param_c::m.field_0x6c;
mMorfFrames = daNpc_Bou_Param_c::m.field_0x44;
gravity = daNpc_Bou_Param_c::m.field_0x04;
}

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

@ -98,7 +98,7 @@ extern "C" void func_80995544(void* _this, int*);
extern "C" void __sinit_d_a_npc_clerka_cpp();
extern "C" void
__ct__14daNpc_clerkA_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc();
extern "C" s32 getEyeballMaterialNo__14daNpc_clerkA_cFv();
extern "C" u16 getEyeballMaterialNo__14daNpc_clerkA_cFv();
extern "C" s32 getHeadJointNo__14daNpc_clerkA_cFv();
extern "C" s32 getNeckJointNo__14daNpc_clerkA_cFv();
extern "C" bool getBackboneJointNo__14daNpc_clerkA_cFv();
@ -1302,7 +1302,7 @@ daNpc_clerkA_c::daNpc_clerkA_c(daNpcT_faceMotionAnmData_c const* param_0,
}
/* 80995694-8099569C 003254 0008+00 1/0 0/0 0/0 .text getEyeballMaterialNo__14daNpc_clerkA_cFv */
s32 daNpc_clerkA_c::getEyeballMaterialNo() {
u16 daNpc_clerkA_c::getEyeballMaterialNo() {
return 3;
}

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

@ -101,7 +101,7 @@ extern "C" void __sinit_d_a_npc_clerkb_cpp();
extern "C" void
__ct__14daNpc_clerkB_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc();
extern "C" void __dt__5csXyzFv();
extern "C" s32 getEyeballMaterialNo__14daNpc_clerkB_cFv();
extern "C" u16 getEyeballMaterialNo__14daNpc_clerkB_cFv();
extern "C" s32 getHeadJointNo__14daNpc_clerkB_cFv();
extern "C" s32 getNeckJointNo__14daNpc_clerkB_cFv();
extern "C" bool getBackboneJointNo__14daNpc_clerkB_cFv();
@ -1367,7 +1367,7 @@ extern "C" void __dt__5csXyzFv() {
}
/* 809997AC-809997B4 00396C 0008+00 1/0 0/0 0/0 .text getEyeballMaterialNo__14daNpc_clerkB_cFv */
s32 daNpc_clerkB_c::getEyeballMaterialNo() {
u16 daNpc_clerkB_c::getEyeballMaterialNo() {
return 3;
}

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

@ -95,7 +95,7 @@ extern "C" void changeBtk__8daNpcT_cFPiPi();
extern "C" void __sinit_d_a_npc_clerkt_cpp();
extern "C" void
__ct__13daNpcClerkT_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc();
extern "C" s32 getEyeballMaterialNo__13daNpcClerkT_cFv();
extern "C" u16 getEyeballMaterialNo__13daNpcClerkT_cFv();
extern "C" void checkChangeJoint__13daNpcClerkT_cFi();
extern "C" void checkRemoveJoint__13daNpcClerkT_cFi();
extern "C" s32 getBackboneJointNo__13daNpcClerkT_cFv();
@ -1252,7 +1252,7 @@ daNpcClerkT_c::daNpcClerkT_c(daNpcT_faceMotionAnmData_c const* param_0,
}
/* 8099D068-8099D070 003008 0008+00 1/0 0/0 0/0 .text getEyeballMaterialNo__13daNpcClerkT_cFv */
s32 daNpcClerkT_c::getEyeballMaterialNo() {
u16 daNpcClerkT_c::getEyeballMaterialNo() {
return 2;
}

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

@ -94,7 +94,7 @@ extern "C" void changeBtk__8daNpcT_cFPiPi();
extern "C" void __sinit_d_a_npc_doc_cpp();
extern "C" void
__ct__11daNpc_Doc_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc();
extern "C" s32 getEyeballMaterialNo__11daNpc_Doc_cFv();
extern "C" u16 getEyeballMaterialNo__11daNpc_Doc_cFv();
extern "C" s32 getHeadJointNo__11daNpc_Doc_cFv();
extern "C" s32 getNeckJointNo__11daNpc_Doc_cFv();
extern "C" bool getBackboneJointNo__11daNpc_Doc_cFv();
@ -1430,7 +1430,7 @@ daNpc_Doc_c::daNpc_Doc_c(daNpcT_faceMotionAnmData_c const* param_0,
}
/* 809AA24C-809AA254 0036AC 0008+00 1/0 0/0 0/0 .text getEyeballMaterialNo__11daNpc_Doc_cFv */
s32 daNpc_Doc_c::getEyeballMaterialNo() {
u16 daNpc_Doc_c::getEyeballMaterialNo() {
return 4;
}

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

@ -161,7 +161,7 @@ __ct__13daNpc_Fairy_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPC
extern "C" void __dt__12J3DFrameCtrlFv();
extern "C" void __dt__8cM3dGCylFv();
extern "C" void __dt__8cM3dGAabFv();
extern "C" s32 getEyeballMaterialNo__13daNpc_Fairy_cFv();
extern "C" u16 getEyeballMaterialNo__13daNpc_Fairy_cFv();
extern "C" s32 getHeadJointNo__13daNpc_Fairy_cFv();
extern "C" s32 getNeckJointNo__13daNpc_Fairy_cFv();
extern "C" bool getBackboneJointNo__13daNpc_Fairy_cFv();
@ -2699,7 +2699,7 @@ extern "C" void __dt__8cM3dGAabFv() {
}
/* 809B9238-809B9240 007818 0008+00 1/0 0/0 0/0 .text getEyeballMaterialNo__13daNpc_Fairy_cFv */
s32 daNpc_Fairy_c::getEyeballMaterialNo() {
u16 daNpc_Fairy_c::getEyeballMaterialNo() {
return true;
}

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

@ -177,8 +177,8 @@ void daNpc_FairySeirei_c::setParam() {
mAttnFovY = daNpc_FairySeirei_Param_c::m[20];
mAcchCir.SetWallR(mWallR);
mAcchCir.SetWallH(daNpc_FairySeirei_Param_c::m[6]);
field_0xde8 = daNpc_FairySeirei_Param_c::m[3];
field_0xa80 = daNpc_FairySeirei_Param_c::m[27];
mRealShadowSize = daNpc_FairySeirei_Param_c::m[3];
mExpressionMorfFrame = daNpc_FairySeirei_Param_c::m[27];
mMorfFrames = daNpc_FairySeirei_Param_c::m[17];
gravity = daNpc_FairySeirei_Param_c::m[1];
}

12
src/d/actor/d_a_npc_gnd.cpp
View File

@ -78,7 +78,7 @@ extern "C" bool checkChangeJoint__8daNpcT_cFi();
extern "C" bool checkRemoveJoint__8daNpcT_cFi();
extern "C" s32 getFootLJointNo__8daNpcT_cFv();
extern "C" s32 getFootRJointNo__8daNpcT_cFv();
extern "C" s32 getEyeballMaterialNo__8daNpcT_cFv();
extern "C" u16 getEyeballMaterialNo__8daNpcT_cFv();
extern "C" bool checkChangeEvt__8daNpcT_cFv();
extern "C" bool evtEndProc__8daNpcT_cFv();
extern "C" void afterMoved__8daNpcT_cFv();
@ -98,8 +98,8 @@ extern "C" void
__ct__11daNpc_Gnd_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc();
extern "C" void __dt__8cM3dGCylFv();
extern "C" void __dt__8cM3dGAabFv();
extern "C" s32 getEyeballRMaterialNo__11daNpc_Gnd_cFv();
extern "C" s32 getEyeballLMaterialNo__11daNpc_Gnd_cFv();
extern "C" u16 getEyeballRMaterialNo__11daNpc_Gnd_cFv();
extern "C" u16 getEyeballLMaterialNo__11daNpc_Gnd_cFv();
extern "C" s32 getHeadJointNo__11daNpc_Gnd_cFv();
extern "C" s32 getNeckJointNo__11daNpc_Gnd_cFv();
extern "C" bool getBackboneJointNo__11daNpc_Gnd_cFv();
@ -715,7 +715,7 @@ int daNpc_Gnd_c::Draw() {
J3DModelData* modelData = mpMorf[0]->getModel()->getModelData();
modelData->getMaterialNodePointer(getEyeballMaterialNo())->setMaterialAnm(mpMatAnm[0]);
}
return daNpcT_c::draw(0, 0, field_0xde8, NULL, 100.0f, 0, 0, 0);
return daNpcT_c::draw(0, 0, mRealShadowSize, NULL, 100.0f, 0, 0, 0);
}
/* 809BBF44-809BBF64 000A24 0020+00 1/1 0/0 0/0 .text
@ -1205,12 +1205,12 @@ REGISTER_CTORS(0x809BE268, __sinit_d_a_npc_gnd_cpp);
// }
/* 809BE40C-809BE414 002EEC 0008+00 1/0 0/0 0/0 .text getEyeballRMaterialNo__11daNpc_Gnd_cFv */
s32 daNpc_Gnd_c::getEyeballRMaterialNo() {
u16 daNpc_Gnd_c::getEyeballRMaterialNo() {
return 3;
}
/* 809BE414-809BE41C 002EF4 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__11daNpc_Gnd_cFv */
s32 daNpc_Gnd_c::getEyeballLMaterialNo() {
u16 daNpc_Gnd_c::getEyeballLMaterialNo() {
return 2;
}

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

@ -54,7 +54,7 @@ __ct__11daNpc_grM_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ2
extern "C" void __dt__8cM3dGCylFv();
extern "C" void __dt__8cM3dGAabFv();
extern "C" void __dt__4cXyzFv();
extern "C" s32 getEyeballMaterialNo__11daNpc_grM_cFv();
extern "C" u16 getEyeballMaterialNo__11daNpc_grM_cFv();
extern "C" s32 getHeadJointNo__11daNpc_grM_cFv();
extern "C" s32 getNeckJointNo__11daNpc_grM_cFv();
extern "C" bool getBackboneJointNo__11daNpc_grM_cFv();
@ -982,7 +982,7 @@ extern "C" void __dt__4cXyzFv() {
}
/* 809D5F98-809D5FA0 002018 0008+00 1/0 0/0 0/0 .text getEyeballMaterialNo__11daNpc_grM_cFv */
s32 daNpc_grM_c::getEyeballMaterialNo() {
u16 daNpc_grM_c::getEyeballMaterialNo() {
return true;
}

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

@ -57,7 +57,7 @@ extern "C" s32 getNeckJointNo__12daNpc_grMC_cFv();
extern "C" bool getBackboneJointNo__12daNpc_grMC_cFv();
extern "C" void checkChangeJoint__12daNpc_grMC_cFi();
extern "C" void checkRemoveJoint__12daNpc_grMC_cFi();
extern "C" s32 getEyeballMaterialNo__12daNpc_grMC_cFv();
extern "C" u16 getEyeballMaterialNo__12daNpc_grMC_cFv();
extern "C" void __dt__18daNpc_grMC_Param_cFv();
extern "C" static void func_809D905C();
extern "C" static void func_809D9064();
@ -1004,7 +1004,7 @@ void daNpc_grMC_c::checkRemoveJoint(int param_0) {
}
/* 809D900C-809D9014 001CEC 0008+00 1/0 0/0 0/0 .text getEyeballMaterialNo__12daNpc_grMC_cFv */
s32 daNpc_grMC_c::getEyeballMaterialNo() {
u16 daNpc_grMC_c::getEyeballMaterialNo() {
return true;
}

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

@ -340,7 +340,7 @@ int daNpc_Hanjo_c::Draw() {
J3DModelData* modelData = mpMorf[0]->getModel()->getModelData();
modelData->getMaterialNodePointer(getEyeballMaterialNo())->setMaterialAnm(mpMatAnm[0]);
}
return daNpcT_c::draw(0, 0, field_0xde8, NULL, 100.0f, 0, 0, 0);
return daNpcT_c::draw(0, 0, mRealShadowSize, NULL, 100.0f, 0, 0, 0);
}
/* 809F9C20-809F9C40 000C80 0020+00 1/1 0/0 0/0 .text
@ -486,8 +486,8 @@ void daNpc_Hanjo_c::setParam() {
mAttnFovY = daNpc_Hanjo_Param_c::m.field_0x50;
mAcchCir.SetWallR(mWallR);
mAcchCir.SetWallH(daNpc_Hanjo_Param_c::m.field_0x18);
field_0xde8 = daNpc_Hanjo_Param_c::m.field_0x0c;
field_0xa80 = daNpc_Hanjo_Param_c::m.field_0x6c;
mRealShadowSize = daNpc_Hanjo_Param_c::m.field_0x0c;
mExpressionMorfFrame = daNpc_Hanjo_Param_c::m.field_0x6c;
mMorfFrames = daNpc_Hanjo_Param_c::m.field_0x44;
gravity = daNpc_Hanjo_Param_c::m.field_0x04;
}

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

@ -116,7 +116,7 @@ extern "C" void func_80A063B4(void* _this, int*);
extern "C" void __sinit_d_a_npc_hoz_cpp();
extern "C" void
__ct__11daNpc_Hoz_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc();
extern "C" s32 getEyeballMaterialNo__11daNpc_Hoz_cFv();
extern "C" u16 getEyeballMaterialNo__11daNpc_Hoz_cFv();
extern "C" s32 getHeadJointNo__11daNpc_Hoz_cFv();
extern "C" s32 getNeckJointNo__11daNpc_Hoz_cFv();
extern "C" bool getBackboneJointNo__11daNpc_Hoz_cFv();
@ -1770,7 +1770,7 @@ daNpc_Hoz_c::daNpc_Hoz_c(daNpcT_faceMotionAnmData_c const* param_1,
}
/* 80A065A4-80A065AC 005184 0008+00 1/0 0/0 0/0 .text getEyeballMaterialNo__11daNpc_Hoz_cFv */
s32 daNpc_Hoz_c::getEyeballMaterialNo() {
u16 daNpc_Hoz_c::getEyeballMaterialNo() {
return true;
}

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

@ -304,7 +304,7 @@ int daNpc_Jagar_c::Draw() {
J3DModelData* modelData = mpMorf[0]->getModel()->getModelData();
modelData->getMaterialNodePointer(getEyeballMaterialNo())->setMaterialAnm(mpMatAnm[0]);
}
return daNpcT_c::draw(0, 0, field_0xde8, NULL, 100.0f, 0, 0, 0);
return daNpcT_c::draw(0, 0, mRealShadowSize, NULL, 100.0f, 0, 0, 0);
}
/* 80A15034-80A15054 000A14 0020+00 1/1 0/0 0/0 .text createHeapCallBack__13daNpc_Jagar_cFP10fopAc_ac_c */
@ -460,8 +460,8 @@ void daNpc_Jagar_c::setParam() {
mAttnFovY = daNpc_Jagar_Param_c::m.field_0x50;
mAcchCir.SetWallR(mWallR);
mAcchCir.SetWallH(daNpc_Jagar_Param_c::m.field_0x18);
field_0xde8 = daNpc_Jagar_Param_c::m.field_0x0c;
field_0xa80 = daNpc_Jagar_Param_c::m.field_0x6c;
mRealShadowSize = daNpc_Jagar_Param_c::m.field_0x0c;
mExpressionMorfFrame = daNpc_Jagar_Param_c::m.field_0x6c;
mMorfFrames = daNpc_Jagar_Param_c::m.field_0x44;
gravity = daNpc_Jagar_Param_c::m.field_0x04;
}

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

@ -76,7 +76,7 @@ extern "C" s32 getFootLJointNo__8daNpcT_cFv();
extern "C" s32 getFootRJointNo__8daNpcT_cFv();
extern "C" bool getEyeballLMaterialNo__8daNpcT_cFv();
extern "C" bool getEyeballRMaterialNo__8daNpcT_cFv();
extern "C" s32 getEyeballMaterialNo__8daNpcT_cFv();
extern "C" u16 getEyeballMaterialNo__8daNpcT_cFv();
extern "C" void afterJntAnm__8daNpcT_cFi();
extern "C" void setAfterTalkMotion__8daNpcT_cFv();
extern "C" void afterMoved__8daNpcT_cFv();

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

@ -105,7 +105,7 @@ extern "C" void func_805531EC(void* _this, int, int);
extern "C" void __sinit_d_a_npc_kkri_cpp();
extern "C" void
__ct__12daNpc_Kkri_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc();
extern "C" s32 getEyeballMaterialNo__12daNpc_Kkri_cFv();
extern "C" u16 getEyeballMaterialNo__12daNpc_Kkri_cFv();
extern "C" s32 getHeadJointNo__12daNpc_Kkri_cFv();
extern "C" s32 getNeckJointNo__12daNpc_Kkri_cFv();
extern "C" bool getBackboneJointNo__12daNpc_Kkri_cFv();
@ -1490,7 +1490,7 @@ daNpc_Kkri_c::daNpc_Kkri_c(daNpcT_faceMotionAnmData_c const* param_0,
}
/* 805533E4-805533EC 004124 0008+00 1/0 0/0 0/0 .text getEyeballMaterialNo__12daNpc_Kkri_cFv */
s32 daNpc_Kkri_c::getEyeballMaterialNo() {
u16 daNpc_Kkri_c::getEyeballMaterialNo() {
return 2;
}

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

@ -3561,17 +3561,17 @@ daNpc_Kn_c::daNpc_Kn_c(daNpcT_faceMotionAnmData_c const* param_0,
}
/* 80A3BD14-80A3BD1C 0113F4 0008+00 1/0 0/0 0/0 .text getEyeballMaterialNo__10daNpc_Kn_cFv */
s32 daNpc_Kn_c::getEyeballMaterialNo() {
u16 daNpc_Kn_c::getEyeballMaterialNo() {
return false;
}
/* 80A3BD1C-80A3BD24 0113FC 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__10daNpc_Kn_cFv */
int daNpc_Kn_c::getEyeballLMaterialNo() {
u16 daNpc_Kn_c::getEyeballLMaterialNo() {
return false;
}
/* 80A3BD24-80A3BD2C 011404 0008+00 1/0 0/0 0/0 .text getEyeballRMaterialNo__10daNpc_Kn_cFv */
s32 daNpc_Kn_c::getEyeballRMaterialNo() {
u16 daNpc_Kn_c::getEyeballRMaterialNo() {
return false;
}

4
src/d/actor/d_a_npc_kn_base.inc
View File

@ -424,7 +424,7 @@ int daNpc_Kn_c::ctrlBtk() {
field_0xe31 = 0;
}
mpMatAnm->onEyeMoveFlg();
mpMatAnm->onEyeMoveFlag();
return 1;
}
@ -433,7 +433,7 @@ int daNpc_Kn_c::ctrlBtk() {
field_0xe31 = 0;
}
mpMatAnm->offEyeMoveFlg();
mpMatAnm->offEyeMoveFlag();
}
return 0;

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

@ -56,7 +56,7 @@ extern "C" void __dt__12dBgS_AcchCirFv();
extern "C" void __dt__10dCcD_GSttsFv();
extern "C" void __dt__12dBgS_ObjAcchFv();
extern "C" void __dt__12J3DFrameCtrlFv();
extern "C" s32 getEyeballMaterialNo__8daNpcT_cFv();
extern "C" u16 getEyeballMaterialNo__8daNpcT_cFv();
extern "C" void ctrlSubFaceMotion__8daNpcT_cFi();
extern "C" bool checkChangeJoint__8daNpcT_cFi();
extern "C" bool checkRemoveJoint__8daNpcT_cFi();

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

@ -96,8 +96,8 @@ extern "C" void __dt__12J3DFrameCtrlFv();
extern "C" void setEyeAngleY__15daNpcT_JntAnm_cF4cXyzsifs();
extern "C" void setEyeAngleX__15daNpcT_JntAnm_cF4cXyzfs();
extern "C" void ctrlSubFaceMotion__8daNpcT_cFi();
extern "C" bool getEyeballLMaterialNo__8daNpcT_cFv();
extern "C" bool getEyeballRMaterialNo__8daNpcT_cFv();
extern "C" u16 getEyeballLMaterialNo__8daNpcT_cFv();
extern "C" u16 getEyeballRMaterialNo__8daNpcT_cFv();
extern "C" bool evtEndProc__8daNpcT_cFv();
extern "C" void afterMoved__8daNpcT_cFv();
extern "C" bool chkXYItems__8daNpcT_cFv();
@ -114,7 +114,7 @@ extern "C" void func_8055A1E0(void* _this, int, int);
extern "C" void __sinit_d_a_npc_kolin_cpp();
extern "C" void
__ct__13daNpc_Kolin_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc();
extern "C" s32 getEyeballMaterialNo__13daNpc_Kolin_cFv();
extern "C" u16 getEyeballMaterialNo__13daNpc_Kolin_cFv();
extern "C" s32 getHeadJointNo__13daNpc_Kolin_cFv();
extern "C" s32 getNeckJointNo__13daNpc_Kolin_cFv();
extern "C" bool getBackboneJointNo__13daNpc_Kolin_cFv();
@ -2023,14 +2023,14 @@ extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() {
/* 8055A10C-8055A114 00620C 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__8daNpcT_cFv
*/
// bool daNpcT_c::getEyeballLMaterialNo() {
extern "C" bool getEyeballLMaterialNo__8daNpcT_cFv() {
extern "C" u16 getEyeballLMaterialNo__8daNpcT_cFv() {
return false;
}
/* 8055A114-8055A11C 006214 0008+00 1/0 0/0 0/0 .text getEyeballRMaterialNo__8daNpcT_cFv
*/
// bool daNpcT_c::getEyeballRMaterialNo() {
extern "C" bool getEyeballRMaterialNo__8daNpcT_cFv() {
extern "C" u16 getEyeballRMaterialNo__8daNpcT_cFv() {
return false;
}
@ -2138,7 +2138,7 @@ REGISTER_CTORS(0x8055A25C, __sinit_d_a_npc_kolin_cpp);
} */
/* 8055A498-8055A4A0 006598 0008+00 1/0 0/0 0/0 .text getEyeballMaterialNo__13daNpc_Kolin_cFv */
s32 daNpc_Kolin_c::getEyeballMaterialNo() {
u16 daNpc_Kolin_c::getEyeballMaterialNo() {
return 2;
}

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

@ -66,7 +66,7 @@ extern "C" void __dt__12dBgS_AcchCirFv();
extern "C" void __dt__10dCcD_GSttsFv();
extern "C" void __dt__12dBgS_ObjAcchFv();
extern "C" void __dt__12J3DFrameCtrlFv();
extern "C" s32 getEyeballMaterialNo__8daNpcT_cFv();
extern "C" u16 getEyeballMaterialNo__8daNpcT_cFv();
extern "C" void ctrlSubFaceMotion__8daNpcT_cFi();
extern "C" s32 getFootLJointNo__8daNpcT_cFv();
extern "C" s32 getFootRJointNo__8daNpcT_cFv();

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

@ -98,7 +98,7 @@ extern "C" void changeBtk__8daNpcT_cFPiPi();
extern "C" void __sinit_d_a_npc_kyury_cpp();
extern "C" void
__ct__13daNpc_Kyury_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc();
extern "C" s32 getEyeballMaterialNo__13daNpc_Kyury_cFv();
extern "C" u16 getEyeballMaterialNo__13daNpc_Kyury_cFv();
extern "C" s32 getHeadJointNo__13daNpc_Kyury_cFv();
extern "C" s32 getNeckJointNo__13daNpc_Kyury_cFv();
extern "C" bool getBackboneJointNo__13daNpc_Kyury_cFv();
@ -1391,7 +1391,7 @@ daNpc_Kyury_c::daNpc_Kyury_c(daNpcT_faceMotionAnmData_c const* param_0,
}
/* 80A63800-80A63808 003820 0008+00 1/0 0/0 0/0 .text getEyeballMaterialNo__13daNpc_Kyury_cFv */
s32 daNpc_Kyury_c::getEyeballMaterialNo() {
u16 daNpc_Kyury_c::getEyeballMaterialNo() {
return 2;
}

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

@ -101,7 +101,7 @@ extern "C" void func_80A68BD0(void* _this, int, int);
extern "C" void __sinit_d_a_npc_len_cpp();
extern "C" void
__ct__11daNpc_Len_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc();
extern "C" s32 getEyeballMaterialNo__11daNpc_Len_cFv();
extern "C" u16 getEyeballMaterialNo__11daNpc_Len_cFv();
extern "C" s32 getHeadJointNo__11daNpc_Len_cFv();
extern "C" s32 getNeckJointNo__11daNpc_Len_cFv();
extern "C" bool getBackboneJointNo__11daNpc_Len_cFv();
@ -1542,7 +1542,7 @@ daNpc_Len_c::daNpc_Len_c(daNpcT_faceMotionAnmData_c const* param_0,
}
/* 80A68DE0-80A68DE8 004BA0 0008+00 1/0 0/0 0/0 .text getEyeballMaterialNo__11daNpc_Len_cFv */
s32 daNpc_Len_c::getEyeballMaterialNo() {
u16 daNpc_Len_c::getEyeballMaterialNo() {
return true;
}

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

@ -108,7 +108,7 @@ extern "C" void func_80A6FAD4(void* _this, int*);
extern "C" void __sinit_d_a_npc_lud_cpp();
extern "C" void
__ct__11daNpc_Lud_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc();
extern "C" s32 getEyeballMaterialNo__11daNpc_Lud_cFv();
extern "C" u16 getEyeballMaterialNo__11daNpc_Lud_cFv();
extern "C" s32 getHeadJointNo__11daNpc_Lud_cFv();
extern "C" s32 getNeckJointNo__11daNpc_Lud_cFv();
extern "C" bool getBackboneJointNo__11daNpc_Lud_cFv();
@ -1721,7 +1721,7 @@ daNpc_Lud_c::daNpc_Lud_c(daNpcT_faceMotionAnmData_c const* param_0,
}
/* 80A6FCD0-80A6FCD8 005210 0008+00 1/0 0/0 0/0 .text getEyeballMaterialNo__11daNpc_Lud_cFv */
s32 daNpc_Lud_c::getEyeballMaterialNo() {
u16 daNpc_Lud_c::getEyeballMaterialNo() {
return true;
}

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

@ -362,7 +362,7 @@ int daNpc_Maro_c::Draw() {
J3DModelData* modelData = mpMorf[0]->getModel()->getModelData();
modelData->getMaterialNodePointer(getEyeballMaterialNo())->setMaterialAnm(mpMatAnm[0]);
}
return daNpcT_c::draw(0, 0, field_0xde8, NULL, 100.0f, 0, 0, 0);
return daNpcT_c::draw(0, 0, mRealShadowSize, NULL, 100.0f, 0, 0, 0);
}
/* 8055BFA0-8055BFC0 000B00 0020+00 1/1 0/0 0/0 .text
@ -691,8 +691,8 @@ void daNpc_Maro_c::setParam() {
mAttnFovY = daNpc_Maro_Param_c::m.common.fov;
mAcchCir.SetWallR(mWallR);
mAcchCir.SetWallH(daNpc_Maro_Param_c::m.common.knee_length);
field_0xde8 = daNpc_Maro_Param_c::m.common.real_shadow_size;
field_0xa80 = daNpc_Maro_Param_c::m.common.expression_morf_frame;
mRealShadowSize = daNpc_Maro_Param_c::m.common.real_shadow_size;
mExpressionMorfFrame = daNpc_Maro_Param_c::m.common.expression_morf_frame;
mMorfFrames = daNpc_Maro_Param_c::m.common.morf_frame;
gravity = daNpc_Maro_Param_c::m.common.gravity;
}
@ -3478,7 +3478,7 @@ static int daNpc_Maro_IsDelete(void* i_this) {
static daNpc_Maro_Param_c l_HIO;
/* 80564970-80564978 0094D0 0008+00 1/0 0/0 0/0 .text getEyeballMaterialNo__12daNpc_Maro_cFv */
s32 daNpc_Maro_c::getEyeballMaterialNo() {
u16 daNpc_Maro_c::getEyeballMaterialNo() {
return 1;
}

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

@ -230,7 +230,7 @@ int daNpc_midP_c::Draw() {
modelData->getMaterialNodePointer(getEyeballRMaterialNo())->setMaterialAnm(mpMatAnm[1]);
}
return daNpcT_c::draw(0, 0, field_0xde8, NULL, 0.0f, 1, 0, 0);
return daNpcT_c::draw(0, 0, mRealShadowSize, NULL, 0.0f, 1, 0, 0);
}
/* 80A715D4-80A715F4 000A54 0020+00 1/1 0/0 0/0 .text createHeapCallBack__12daNpc_midP_cFP10fopAc_ac_c */
@ -312,8 +312,8 @@ BOOL daNpc_midP_c::ctrlBtk() {
field_0xe2a = 0;
}
mpMatAnm[0]->onEyeMoveFlg();
mpMatAnm[1]->onEyeMoveFlg();
mpMatAnm[0]->onEyeMoveFlag();
mpMatAnm[1]->onEyeMoveFlag();
return TRUE;
}
@ -323,8 +323,8 @@ BOOL daNpc_midP_c::ctrlBtk() {
field_0xe2a = 0;
}
mpMatAnm[0]->offEyeMoveFlg();
mpMatAnm[1]->offEyeMoveFlg();
mpMatAnm[0]->offEyeMoveFlag();
mpMatAnm[1]->offEyeMoveFlag();
}
return FALSE;
@ -352,8 +352,8 @@ void daNpc_midP_c::setParam() {
mAttnFovY = daNpc_midP_Param_c::m.mAttnFovY;
mAcchCir.SetWallR(mWallR);
mAcchCir.SetWallH(daNpc_midP_Param_c::m.mWallH);
field_0xde8 = daNpc_midP_Param_c::m.field_0x0c;
field_0xa80 = daNpc_midP_Param_c::m.field_0x6c;
mRealShadowSize = daNpc_midP_Param_c::m.field_0x0c;
mExpressionMorfFrame = daNpc_midP_Param_c::m.field_0x6c;
mMorfFrames = daNpc_midP_Param_c::m.mMorfFrames;
gravity = daNpc_midP_Param_c::m.mGravity;
}
@ -647,12 +647,12 @@ static u8 lit_3811[12];
static u8 l_HIO[4];
/* 80A7390C-80A73914 002D8C 0008+00 1/0 0/0 0/0 .text getEyeballRMaterialNo__12daNpc_midP_cFv */
s32 daNpc_midP_c::getEyeballRMaterialNo() {
u16 daNpc_midP_c::getEyeballRMaterialNo() {
return 3;
}
/* 80A73914-80A7391C 002D94 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__12daNpc_midP_cFv */
s32 daNpc_midP_c::getEyeballLMaterialNo() {
u16 daNpc_midP_c::getEyeballLMaterialNo() {
return 2;
}

12
src/d/actor/d_a_npc_moi.cpp
View File

@ -438,7 +438,7 @@ int daNpc_Moi_c::Draw() {
}
}
return daNpcT_c::draw(0, 0, field_0xde8, NULL, 100.0f, 0, 0, 0);
return daNpcT_c::draw(0, 0, mRealShadowSize, NULL, 100.0f, 0, 0, 0);
}
/* 80A74B80-80A74BA0 000D20 0020+00 1/1 0/0 0/0 .text
@ -664,17 +664,17 @@ void daNpc_Moi_c::setParam() {
}
mAcchCir.SetWallR(mWallR);
mAcchCir.SetWallH(daNpc_Moi_Param_c::m.field_0x18);
field_0xde8 = daNpc_Moi_Param_c::m.field_0x0c;
mRealShadowSize = daNpc_Moi_Param_c::m.field_0x0c;
if (mType == TYPE_1) {
field_0xde8 = 600.0f;
mRealShadowSize = 600.0f;
} else if (mType == TYPE_2) {
field_0xde8 = 600.0f;
mRealShadowSize = 600.0f;
if (field_0x166d) {
field_0xde8 = 800.0f;
mRealShadowSize = 800.0f;
}
}
gravity = daNpc_Moi_Param_c::m.field_0x04;
field_0xa80 = daNpc_Moi_Param_c::m.field_0x6c;
mExpressionMorfFrame = daNpc_Moi_Param_c::m.field_0x6c;
mMorfFrames = daNpc_Moi_Param_c::m.field_0x44;
if (mType == TYPE_3) {
mAcch.SetGrndNone();

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

@ -129,7 +129,7 @@ extern "C" void changeBtk__8daNpcT_cFPiPi();
extern "C" void __sinit_d_a_npc_pachi_besu_cpp();
extern "C" void
__ct__18daNpc_Pachi_Besu_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc();
extern "C" s32 getEyeballMaterialNo__18daNpc_Pachi_Besu_cFv();
extern "C" u16 getEyeballMaterialNo__18daNpc_Pachi_Besu_cFv();
extern "C" s32 getHeadJointNo__18daNpc_Pachi_Besu_cFv();
extern "C" s32 getNeckJointNo__18daNpc_Pachi_Besu_cFv();
extern "C" bool getBackboneJointNo__18daNpc_Pachi_Besu_cFv();
@ -1931,7 +1931,7 @@ daNpc_Pachi_Besu_c::daNpc_Pachi_Besu_c(
/* 80A969C0-80A969C8 003D40 0008+00 1/0 0/0 0/0 .text getEyeballMaterialNo__18daNpc_Pachi_Besu_cFv
*/
s32 daNpc_Pachi_Besu_c::getEyeballMaterialNo() {
u16 daNpc_Pachi_Besu_c::getEyeballMaterialNo() {
return 2;
}

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

@ -129,7 +129,7 @@ extern "C" void changeBtk__8daNpcT_cFPiPi();
extern "C" void __sinit_d_a_npc_pachi_maro_cpp();
extern "C" void
__ct__18daNpc_Pachi_Maro_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc();
extern "C" s32 getEyeballMaterialNo__18daNpc_Pachi_Maro_cFv();
extern "C" u16 getEyeballMaterialNo__18daNpc_Pachi_Maro_cFv();
extern "C" s32 getHeadJointNo__18daNpc_Pachi_Maro_cFv();
extern "C" s32 getNeckJointNo__18daNpc_Pachi_Maro_cFv();
extern "C" bool getBackboneJointNo__18daNpc_Pachi_Maro_cFv();
@ -1691,7 +1691,7 @@ daNpc_Pachi_Maro_c::daNpc_Pachi_Maro_c(
/* 80A9B7E0-80A9B7E8 003C40 0008+00 1/0 0/0 0/0 .text getEyeballMaterialNo__18daNpc_Pachi_Maro_cFv
*/
s32 daNpc_Pachi_Maro_c::getEyeballMaterialNo() {
u16 daNpc_Pachi_Maro_c::getEyeballMaterialNo() {
return true;
}

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

@ -146,7 +146,7 @@ extern "C" void changeBtk__8daNpcT_cFPiPi();
extern "C" void __sinit_d_a_npc_pachi_taro_cpp();
extern "C" void
__ct__18daNpc_Pachi_Taro_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc();
extern "C" s32 getEyeballMaterialNo__18daNpc_Pachi_Taro_cFv();
extern "C" u16 getEyeballMaterialNo__18daNpc_Pachi_Taro_cFv();
extern "C" s32 getHeadJointNo__18daNpc_Pachi_Taro_cFv();
extern "C" s32 getNeckJointNo__18daNpc_Pachi_Taro_cFv();
extern "C" bool getBackboneJointNo__18daNpc_Pachi_Taro_cFv();
@ -2352,7 +2352,7 @@ daNpc_Pachi_Taro_c::daNpc_Pachi_Taro_c(
/* 80AA1558-80AA1560 0053B8 0008+00 1/0 0/0 0/0 .text getEyeballMaterialNo__18daNpc_Pachi_Taro_cFv
*/
s32 daNpc_Pachi_Taro_c::getEyeballMaterialNo() {
u16 daNpc_Pachi_Taro_c::getEyeballMaterialNo() {
return 2;
}

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

@ -102,7 +102,7 @@ extern "C" void func_80AACF2C(void* _this, f32, f32);
extern "C" void __sinit_d_a_npc_post_cpp();
extern "C" void
__ct__12daNpc_Post_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc();
extern "C" s32 getEyeballMaterialNo__12daNpc_Post_cFv();
extern "C" u16 getEyeballMaterialNo__12daNpc_Post_cFv();
extern "C" s32 getHeadJointNo__12daNpc_Post_cFv();
extern "C" s32 getNeckJointNo__12daNpc_Post_cFv();
extern "C" bool getBackboneJointNo__12daNpc_Post_cFv();
@ -1705,7 +1705,7 @@ daNpc_Post_c::daNpc_Post_c(daNpcT_faceMotionAnmData_c const* param_0,
}
/* 80AAD0D0-80AAD0D8 004530 0008+00 1/0 0/0 0/0 .text getEyeballMaterialNo__12daNpc_Post_cFv */
s32 daNpc_Post_c::getEyeballMaterialNo() {
u16 daNpc_Post_c::getEyeballMaterialNo() {
return true;
}

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

@ -99,7 +99,7 @@ extern "C" void func_80AB1DDC(void* _this, int*);
extern "C" void __sinit_d_a_npc_pouya_cpp();
extern "C" void
__ct__13daNpc_Pouya_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc();
extern "C" s32 getEyeballMaterialNo__13daNpc_Pouya_cFv();
extern "C" u16 getEyeballMaterialNo__13daNpc_Pouya_cFv();
extern "C" s32 getHeadJointNo__13daNpc_Pouya_cFv();
extern "C" s32 getNeckJointNo__13daNpc_Pouya_cFv();
extern "C" bool getBackboneJointNo__13daNpc_Pouya_cFv();
@ -1586,7 +1586,7 @@ daNpc_Pouya_c::daNpc_Pouya_c(daNpcT_faceMotionAnmData_c const* param_0,
}
/* 80AB1F54-80AB1F5C 004294 0008+00 1/0 0/0 0/0 .text getEyeballMaterialNo__13daNpc_Pouya_cFv */
s32 daNpc_Pouya_c::getEyeballMaterialNo() {
u16 daNpc_Pouya_c::getEyeballMaterialNo() {
return true;
}

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

@ -98,7 +98,7 @@ extern "C" void changeBtk__8daNpcT_cFPiPi();
extern "C" void __sinit_d_a_npc_raca_cpp();
extern "C" void
__ct__12daNpc_Raca_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc();
extern "C" s32 getEyeballMaterialNo__12daNpc_Raca_cFv();
extern "C" u16 getEyeballMaterialNo__12daNpc_Raca_cFv();
extern "C" s32 getHeadJointNo__12daNpc_Raca_cFv();
extern "C" s32 getNeckJointNo__12daNpc_Raca_cFv();
extern "C" bool getBackboneJointNo__12daNpc_Raca_cFv();
@ -1263,7 +1263,7 @@ daNpc_Raca_c::daNpc_Raca_c(daNpcT_faceMotionAnmData_c const* param_0,
}
/* 80AB8DAC-80AB8DB4 0031EC 0008+00 1/0 0/0 0/0 .text getEyeballMaterialNo__12daNpc_Raca_cFv */
s32 daNpc_Raca_c::getEyeballMaterialNo() {
u16 daNpc_Raca_c::getEyeballMaterialNo() {
return 2;
}

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

@ -302,7 +302,7 @@ int daNpc_Saru_c::Execute() {
/* 80AC0AA8-80AC0AEC 000768 0044+00 1/1 0/0 0/0 .text Draw__12daNpc_Saru_cFv */
int daNpc_Saru_c::Draw() {
return draw(FALSE, FALSE, field_0xde8, NULL, 100.0f, FALSE, FALSE, FALSE);
return draw(FALSE, FALSE, mRealShadowSize, NULL, 100.0f, FALSE, FALSE, FALSE);
}
/* 80AC0AEC-80AC0B0C 0007AC 0020+00 1/1 0/0 0/0 .text createHeapCallBack__12daNpc_Saru_cFP10fopAc_ac_c */
@ -463,8 +463,8 @@ void daNpc_Saru_c::setParam() {
mAttnFovY = daNpc_Saru_Param_c::m.mAttnFovy;
mAcchCir.SetWallR(mWallR);
mAcchCir.SetWallH(daNpc_Saru_Param_c::m.mWallH);
field_0xde8 = daNpc_Saru_Param_c::m.field_0x0c;
field_0xa80 = daNpc_Saru_Param_c::m.field_0x6c;
mRealShadowSize = daNpc_Saru_Param_c::m.field_0x0c;
mExpressionMorfFrame = daNpc_Saru_Param_c::m.field_0x6c;
mMorfFrames = daNpc_Saru_Param_c::m.mMorfFrames;
gravity = daNpc_Saru_Param_c::m.mGravity;
}

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

@ -201,7 +201,7 @@ int daNpc_seiB_c::Draw() {
mdlData_p->getMaterialNodePointer(getEyeballMaterialNo())->setMaterialAnm(mpMatAnm[0]);
}
return draw(FALSE, TRUE, field_0xde8, NULL, 100.0f, FALSE, FALSE, FALSE);
return draw(FALSE, TRUE, mRealShadowSize, NULL, 100.0f, FALSE, FALSE, FALSE);
}
/* 80AC5608-80AC5628 000608 0020+00 1/1 0/0 0/0 .text
@ -269,9 +269,9 @@ void daNpc_seiB_c::setParam() {
mAcchCir.SetWallR(mWallR);
mAcchCir.SetWallH(mpParam->m.mWallH);
field_0xde8 = mpParam->m.field_0xc;
mRealShadowSize = mpParam->m.field_0xc;
gravity = mpParam->m.mGravity;
field_0xa80 = mpParam->m.field_0x6c;
mExpressionMorfFrame = mpParam->m.field_0x6c;
mMorfFrames = mpParam->m.mMorfFrames;
}

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

@ -220,7 +220,7 @@ int daNpc_seiC_c::Draw() {
J3DMaterial* material = modelData->getMaterialNodePointer(getEyeballMaterialNo());
material->setMaterialAnm(matAnm);
}
return draw(FALSE, TRUE, field_0xde8, NULL, 100.0f, FALSE, FALSE, FALSE);
return draw(FALSE, TRUE, mRealShadowSize, NULL, 100.0f, FALSE, FALSE, FALSE);
}
/* 80AC7A68-80AC7A88 000608 0020+00 1/1 0/0 0/0 .text createHeapCallBack__12daNpc_seiC_cFP10fopAc_ac_c */
@ -290,9 +290,9 @@ void daNpc_seiC_c::setParam() {
mWallR = daNpc_seiC_Param_c::m.mWallR;
mAcchCir.SetWallR(mWallR);
mAcchCir.SetWallH(daNpc_seiC_Param_c::m.mWallH);
field_0xde8 = daNpc_seiC_Param_c::m.field_0x0c;
mRealShadowSize = daNpc_seiC_Param_c::m.field_0x0c;
gravity = daNpc_seiC_Param_c::m.mGravity;
field_0xa80 = daNpc_seiC_Param_c::m.field_0x6c;
mExpressionMorfFrame = daNpc_seiC_Param_c::m.field_0x6c;
mMorfFrames = daNpc_seiC_Param_c::m.mMorfFrames;
}

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

@ -221,7 +221,7 @@ int daNpc_seiD_c::Draw() {
J3DMaterial* material = modelData->getMaterialNodePointer(getEyeballMaterialNo());
material->setMaterialAnm(matAnm);
}
return draw(FALSE, TRUE, field_0xde8, NULL, 100.0f, FALSE, FALSE, FALSE);
return draw(FALSE, TRUE, mRealShadowSize, NULL, 100.0f, FALSE, FALSE, FALSE);
}
/* 80AC9BA8-80AC9BC8 000608 0020+00 1/1 0/0 0/0 .text createHeapCallBack__12daNpc_seiD_cFP10fopAc_ac_c */
@ -289,9 +289,9 @@ void daNpc_seiD_c::setParam() {
mWallR = daNpc_seiD_Param_c::m.mWallR;
mAcchCir.SetWallR(mWallR);
mAcchCir.SetWallH(daNpc_seiD_Param_c::m.mWallH);
field_0xde8 = daNpc_seiD_Param_c::m.field_0x0c;
mRealShadowSize = daNpc_seiD_Param_c::m.field_0x0c;
gravity = daNpc_seiD_Param_c::m.mGravity;
field_0xa80 = daNpc_seiD_Param_c::m.field_0x6c;
mExpressionMorfFrame = daNpc_seiD_Param_c::m.field_0x6c;
mMorfFrames = daNpc_seiD_Param_c::m.mMorfFrames;
}

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

@ -112,7 +112,7 @@ extern "C" void func_80ACFA44(void* _this, int, int);
extern "C" void __sinit_d_a_npc_seira_cpp();
extern "C" void
__ct__13daNpc_Seira_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc();
extern "C" s32 getEyeballMaterialNo__13daNpc_Seira_cFv();
extern "C" u16 getEyeballMaterialNo__13daNpc_Seira_cFv();
extern "C" s32 getHeadJointNo__13daNpc_Seira_cFv();
extern "C" s32 getNeckJointNo__13daNpc_Seira_cFv();
extern "C" bool getBackboneJointNo__13daNpc_Seira_cFv();
@ -1690,7 +1690,7 @@ daNpc_Seira_c::daNpc_Seira_c(daNpcT_faceMotionAnmData_c const* param_0,
}
/* 80ACFC14-80ACFC1C 004534 0008+00 1/0 0/0 0/0 .text getEyeballMaterialNo__13daNpc_Seira_cFv */
s32 daNpc_Seira_c::getEyeballMaterialNo() {
u16 daNpc_Seira_c::getEyeballMaterialNo() {
return 2;
}

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

@ -109,7 +109,7 @@ extern "C" void func_80AD46D4(void* _this, int, int);
extern "C" void __sinit_d_a_npc_seira2_cpp();
extern "C" void
__ct__14daNpc_Seira2_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc();
extern "C" s32 getEyeballMaterialNo__14daNpc_Seira2_cFv();
extern "C" u16 getEyeballMaterialNo__14daNpc_Seira2_cFv();
extern "C" s32 getHeadJointNo__14daNpc_Seira2_cFv();
extern "C" s32 getNeckJointNo__14daNpc_Seira2_cFv();
extern "C" bool getBackboneJointNo__14daNpc_Seira2_cFv();
@ -1565,7 +1565,7 @@ daNpc_Seira2_c::daNpc_Seira2_c(daNpcT_faceMotionAnmData_c const* param_0,
}
/* 80AD4884-80AD488C 003D64 0008+00 1/0 0/0 0/0 .text getEyeballMaterialNo__14daNpc_Seira2_cFv */
s32 daNpc_Seira2_c::getEyeballMaterialNo() {
u16 daNpc_Seira2_c::getEyeballMaterialNo() {
return 2;
}

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

@ -60,7 +60,7 @@ extern "C" void __dt__12dBgS_AcchCirFv();
extern "C" void __dt__10dCcD_GSttsFv();
extern "C" void __dt__12dBgS_ObjAcchFv();
extern "C" void __dt__12J3DFrameCtrlFv();
extern "C" s32 getEyeballMaterialNo__8daNpcT_cFv();
extern "C" u16 getEyeballMaterialNo__8daNpcT_cFv();
extern "C" void ctrlSubFaceMotion__8daNpcT_cFi();
extern "C" bool checkChangeJoint__8daNpcT_cFi();
extern "C" bool checkRemoveJoint__8daNpcT_cFi();

5
src/d/actor/d_a_npc_shaman.cpp
View File

@ -111,7 +111,7 @@ extern "C" void
__ct__11daNpc_Sha_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc();
extern "C" void __dt__8cM3dGCylFv();
extern "C" void __dt__8cM3dGAabFv();
extern "C" s32 getEyeballMaterialNo__11daNpc_Sha_cFv();
extern "C" u16 getEyeballMaterialNo__11daNpc_Sha_cFv();
extern "C" s32 getHeadJointNo__11daNpc_Sha_cFv();
extern "C" s32 getNeckJointNo__11daNpc_Sha_cFv();
extern "C" bool getBackboneJointNo__11daNpc_Sha_cFv();
@ -271,7 +271,6 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22];
extern "C" extern void* __vt__9cCcD_Stts[8];
extern "C" extern void* __vt__14J3DMaterialAnm[4];
extern "C" u8 now__14mDoMtx_stack_c[48];
extern "C" extern u8 g_Counter[12 + 4 /* padding */];
extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
extern "C" void __register_global_object();
@ -1955,7 +1954,7 @@ extern "C" void __dt__8cM3dGAabFv() {
}
/* 80AE6B1C-80AE6B24 003E3C 0008+00 1/0 0/0 0/0 .text getEyeballMaterialNo__11daNpc_Sha_cFv */
s32 daNpc_Sha_c::getEyeballMaterialNo() {
u16 daNpc_Sha_c::getEyeballMaterialNo() {
return true;
}

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

@ -58,7 +58,7 @@ extern "C" void __dt__12dBgS_AcchCirFv();
extern "C" void __dt__10dCcD_GSttsFv();
extern "C" void __dt__12dBgS_ObjAcchFv();
extern "C" void __dt__12J3DFrameCtrlFv();
extern "C" s32 getEyeballMaterialNo__8daNpcT_cFv();
extern "C" u16 getEyeballMaterialNo__8daNpcT_cFv();
extern "C" void setEyeAngleY__15daNpcT_JntAnm_cF4cXyzsifs();
extern "C" void setEyeAngleX__15daNpcT_JntAnm_cF4cXyzfs();
extern "C" void ctrlSubFaceMotion__8daNpcT_cFi();

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

@ -520,7 +520,7 @@ int daNpc_Taro_c::Draw() {
material->setMaterialAnm(matAnm);
}
return draw(FALSE, 0, field_0xde8, NULL, 100.0f, 0, 0, 0);
return draw(FALSE, 0, mRealShadowSize, NULL, 100.0f, 0, 0, 0);
}
/* 805669F8-80566A18 000C58 0020+00 1/1 0/0 0/0 .text
@ -780,11 +780,11 @@ void daNpc_Taro_c::setParam() {
}
mAcchCir.SetWallR(mWallR);
mAcchCir.SetWallH(daNpc_Taro_Param_c::m.mWallH);
field_0xde8 = daNpc_Taro_Param_c::m.field_0x0c;
mRealShadowSize = daNpc_Taro_Param_c::m.field_0x0c;
if (&daNpc_Taro_c::practice == mAction) {
field_0xde8 = 500.0f;
mRealShadowSize = 500.0f;
}
field_0xa80 = daNpc_Taro_Param_c::m.field_0x6c;
mExpressionMorfFrame = daNpc_Taro_Param_c::m.field_0x6c;
mMorfFrames = daNpc_Taro_Param_c::m.mMorfFrames;
gravity = daNpc_Taro_Param_c::m.mGravity;
}

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

@ -97,7 +97,7 @@ extern "C" void
__ct__10daNpcTkj_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc();
extern "C" void __dt__8cM3dGCylFv();
extern "C" void __dt__8cM3dGAabFv();
extern "C" s32 getEyeballMaterialNo__10daNpcTkj_cFv();
extern "C" u16 getEyeballMaterialNo__10daNpcTkj_cFv();
extern "C" s32 getHeadJointNo__10daNpcTkj_cFv();
extern "C" s32 getNeckJointNo__10daNpcTkj_cFv();
extern "C" s32 getBackboneJointNo__10daNpcTkj_cFv();
@ -1204,7 +1204,7 @@ extern "C" void __dt__8cM3dGAabFv() {
}
/* 805764EC-805764F4 002EAC 0008+00 1/0 0/0 0/0 .text getEyeballMaterialNo__10daNpcTkj_cFv */
s32 daNpcTkj_c::getEyeballMaterialNo() {
u16 daNpcTkj_c::getEyeballMaterialNo() {
return 2;
}

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

@ -106,7 +106,7 @@ extern "C" void func_80B24728(void* _this, int*);
extern "C" void __sinit_d_a_npc_toby_cpp();
extern "C" void
__ct__12daNpc_Toby_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc();
extern "C" s32 getEyeballMaterialNo__12daNpc_Toby_cFv();
extern "C" u16 getEyeballMaterialNo__12daNpc_Toby_cFv();
extern "C" s32 getHeadJointNo__12daNpc_Toby_cFv();
extern "C" s32 getNeckJointNo__12daNpc_Toby_cFv();
extern "C" bool getBackboneJointNo__12daNpc_Toby_cFv();
@ -2062,7 +2062,7 @@ daNpc_Toby_c::daNpc_Toby_c(daNpcT_faceMotionAnmData_c const* param_0,
}
/* 80B24920-80B24928 0063C0 0008+00 1/0 0/0 0/0 .text getEyeballMaterialNo__12daNpc_Toby_cFv */
s32 daNpc_Toby_c::getEyeballMaterialNo() {
u16 daNpc_Toby_c::getEyeballMaterialNo() {
return 2;
}

Some files were not shown because too many files have changed in this diff Show More