mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-08 12:16:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

Link clerkb and clerkt (#2811)

Browse Source
This commit is contained in:
YunataSavior
2025-11-16 12:27:51 -08:00
committed by GitHub
parent 61abee7eac
commit 295c17e736
4 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.py
+2 -2
View File
@@ -1850,8 +1850,8 @@ config.libs = [
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_chat", extra_cflags=[DANPCF_C_HACK]),
ActorRel(NonMatching, "d_a_npc_chin"),
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_clerka"),
ActorRel(Equivalent, "d_a_npc_clerkb"),
ActorRel(Equivalent, "d_a_npc_clerkt"),
ActorRel(MatchingFor("GZ2E01"), "d_a_npc_clerkb"),
ActorRel(MatchingFor("GZ2E01"), "d_a_npc_clerkt"),
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_coach"),
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_df"),
ActorRel(NonMatching, "d_a_npc_doc"),
include/d/actor/d_a_npc_clerkb.h
+1 -3
View File
@@ -149,9 +149,7 @@ private:
/* 0x10D8 */ daNpcT_ActorMngr_c mActorMngr[1];
/* 0x10E0 */ actionFunc mNextAction;
/* 0x10EC */ actionFunc mAction;
/* 0x10F8 */ u8 field_0x10f8[0x10fa - 0x10f8];
/* 0x10FA */ s16 field_0x10fa;
/* 0x10FC */ u8 field_0x10fc[0x1100 - 0x10fc];
/* 0x10F8 */ csXyz field_0x10f8;
/* 0x1100 */ int mShopProcess;
/* 0x1104 */ int field_0x1104;
/* 0x1108 */ f32 field_0x1108;
include/d/actor/d_a_npc_clerkt.h
+5 -5
View File
@@ -80,11 +80,11 @@ public:
/* 8099B4DC */ int tend(void*);
/* 8099B60C */ int talk(void*);
/* 8099B804 */ int shop(void*);
/* 8099BCE8 */ void setParam();
/* 8099BE48 */ void setAfterTalkMotion();
/* 8099BEA8 */ void beforeMove();
/* 8099BF20 */ void setAttnPos();
/* 8099C1A0 */ void setCollision();
/* 8099BCE8 */ inline void setParam();
/* 8099BE48 */ inline void setAfterTalkMotion();
/* 8099BEA8 */ inline void beforeMove();
/* 8099BF20 */ inline void setAttnPos();
/* 8099C1A0 */ inline void setCollision();
/* 8099CF9C */ daNpcClerkT_c(
daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData,
daNpcT_motionAnmData_c const* i_motionAnmData,
src/d/actor/d_a_npc_clerkb.cpp
+2 -2
View File
@@ -464,7 +464,7 @@ void daNpc_clerkB_c::afterJntAnm(int param_1) {
mDoMtx_stack_c::ZrotM(mStagger.getAngleX(0));
}
if (param_1 == 9) {
mDoMtx_stack_c::XrotM(field_0x10fa);
mDoMtx_stack_c::XrotM(field_0x10f8.y);
}
}
@@ -626,7 +626,7 @@ void daNpc_clerkB_c::setAttnPos() {
cXyz cStack_3c(-30.0f, 15.0f, 0.0f);
cXyz cStack_48(0.0f, 15.0f, 0.0f);
field_0x10fa += cM_deg2s(6.0);
field_0x10f8.y += cM_deg2s(6.0);
mStagger.calc(FALSE);
mBpkAnm2.play();
f32 rad = cM_s2rad((s16)(mCurAngle.y - field_0xd7e.y));