From 7ba5df40148fabe7503fe9fa329093634f985aed Mon Sep 17 00:00:00 2001 From: YunataSavior <58997725+YunataSavior@users.noreply.github.com> Date: Wed, 19 Nov 2025 22:49:08 -0800 Subject: [PATCH] Link npc_shoe (#2833) --- configure.py | 2 +- include/d/actor/d_a_npc_shoe.h | 2 +- src/d/actor/d_a_npc_shoe.cpp | 6 +----- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/configure.py b/configure.py index 951f5dcf81..97543e2d7a 100755 --- a/configure.py +++ b/configure.py @@ -1922,7 +1922,7 @@ config.libs = [ ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_seirei"), ActorRel(Equivalent, "d_a_npc_shad"), # weak func order ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_shaman"), - ActorRel(NonMatching, "d_a_npc_shoe"), + ActorRel(MatchingFor("GZ2E01"), "d_a_npc_shoe"), ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_shop0"), ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_shop_maro"), ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_sola"), diff --git a/include/d/actor/d_a_npc_shoe.h b/include/d/actor/d_a_npc_shoe.h index c894263a12..0f5e0f7a0b 100644 --- a/include/d/actor/d_a_npc_shoe.h +++ b/include/d/actor/d_a_npc_shoe.h @@ -83,7 +83,7 @@ public: /* 80AE9820 */ inline void lookat(); /* 80AE9A00 */ void setMotionAnm(int, f32); /* 80AE9AD0 */ inline BOOL drawDbgInfo(); - /* 80AEA340 */ inline void adjustShapeAngle(); + /* 80AEA340 */ inline void adjustShapeAngle() {} s16 getMessageNo() { return fopAcM_GetParam(this) >> 0x10; } diff --git a/src/d/actor/d_a_npc_shoe.cpp b/src/d/actor/d_a_npc_shoe.cpp index 55d5f0e0ca..874a17f04d 100644 --- a/src/d/actor/d_a_npc_shoe.cpp +++ b/src/d/actor/d_a_npc_shoe.cpp @@ -104,7 +104,7 @@ static char* l_arcNames[3] = { }; /* 80AEA5AC-80AEA5B0 000074 0004+00 0/1 0/0 0/0 .data l_evtNames */ -static char* l_evtNames[1] = {l_arcNames[0]}; +static char* l_evtNames[1] = {NULL}; /* 80AEA5B0-80AEA5B4 -00001 0004+00 0/2 0/0 0/0 .data l_myName */ static char* l_myName = "Shoe"; @@ -774,10 +774,6 @@ BOOL daNpcShoe_c::drawDbgInfo() { return FALSE; } -/* 80AEA340-80AEA344 002AE0 0004+00 1/0 0/0 0/0 .text adjustShapeAngle__11daNpcShoe_cFv - */ -void daNpcShoe_c::adjustShapeAngle() {} - /* 80AEA608-80AEA628 -00001 0020+00 1/0 0/0 0/0 .data daNpcShoe_MethodTable */ static actor_method_class daNpcShoe_MethodTable = { (process_method_func)daNpcShoe_Create, (process_method_func)daNpcShoe_Delete,