Skip to content

npc_maro Matching #2600

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hatal175 merged 1 commit into from
Aug 24, 2025
Merged

npc_maro Matching #2600

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion configure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1583,7 +1583,7 @@ def MatchingFor(*versions) -> bool:
ActorRel(NonMatching, "d_a_npc_kakashi"),
ActorRel(NonMatching, "d_a_npc_kkri"),
ActorRel(MatchingFor("GZ2E01"), "d_a_npc_kolin"),
ActorRel(Equivalent, "d_a_npc_maro"), # weak func order
ActorRel(MatchingFor("GZ2E01"), "d_a_npc_maro"),
ActorRel(NonMatching, "d_a_npc_taro"),
ActorRel(NonMatching, "d_a_npc_tkj"),
ActorRel(NonMatching, "d_a_obj_bhashi"),
Expand Down
8 changes: 4 additions & 4 deletions include/d/actor/d_a_npc_maro.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,10 +108,10 @@ class daNpc_Maro_c : public dShopSystem_c {
i_arcNames) {
OS_REPORT("|%06d:%x|daNpc_Maro_c -> コンストラクト\n", g_Counter.mCounter0, this);
}
/* 80564970 */ u16 getEyeballMaterialNo();
/* 80564978 */ s32 getHeadJointNo();
/* 80564980 */ s32 getNeckJointNo();
/* 80564988 */ s32 getBackboneJointNo();
/* 80564970 */ u16 getEyeballMaterialNo() { return 1; }
/* 80564978 */ s32 getHeadJointNo() { return 4; }
/* 80564980 */ s32 getNeckJointNo() { return 3; }
/* 80564988 */ s32 getBackboneJointNo() { return 1; }
/* 80564990 */ BOOL checkChangeJoint(int arg0) { return arg0 == 4; };
/* 805649A0 */ BOOL checkRemoveJoint(int arg0) { return arg0 == 6; };

Expand Down
20 changes: 0 additions & 20 deletions src/d/actor/d_a_npc_maro.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3477,26 +3477,6 @@ static int daNpc_Maro_IsDelete(void* i_this) {
/* 80565D94-80565D98 000014 0004+00 1/1 0/0 0/0 .bss l_HIO */
static daNpc_Maro_Param_c l_HIO;

/* 80564970-80564978 0094D0 0008+00 1/0 0/0 0/0 .text getEyeballMaterialNo__12daNpc_Maro_cFv */
u16 daNpc_Maro_c::getEyeballMaterialNo() {
return 1;
}

/* 80564978-80564980 0094D8 0008+00 1/0 0/0 0/0 .text getHeadJointNo__12daNpc_Maro_cFv */
s32 daNpc_Maro_c::getHeadJointNo() {
return 4;
}

/* 80564980-80564988 0094E0 0008+00 1/0 0/0 0/0 .text getNeckJointNo__12daNpc_Maro_cFv */
s32 daNpc_Maro_c::getNeckJointNo() {
return 3;
}

/* 80564988-80564990 0094E8 0008+00 1/0 0/0 0/0 .text getBackboneJointNo__12daNpc_Maro_cFv */
s32 daNpc_Maro_c::getBackboneJointNo() {
return 1;
}

/* 80565BB8-80565BD8 -00001 0020+00 1/0 0/0 0/0 .data daNpc_Maro_MethodTable */
static actor_method_class daNpc_Maro_MethodTable = {
(process_method_func)daNpc_Maro_Create,
Expand Down