diff --git a/data/uking_functions.csv b/data/uking_functions.csv index 5bb17e0d..2b6c0a97 100644 --- a/data/uking_functions.csv +++ b/data/uking_functions.csv @@ -40494,7 +40494,7 @@ 0x0000007100683ec0,AI_Query_BranchByDyeColor::doQuery,36, 0x0000007100683ee4,AI_Query_BranchByDyeColor::m10,4, 0x0000007100683ee8,AI_Query_BranchByDyeColor::loadParams,4, -0x0000007100683eec,AI_QueryBase::m8n,4,_ZN4ksys3act2ai5Query8preInit_Ev +0x0000007100683eec,AI_QueryBase::m8n,4,_ZN4ksys3act2ai5Query10loadParamsEv 0x0000007100683ef0,AI_Query_BranchByDyeColor::rtti1,204, 0x0000007100683fbc,AI_Query_BranchByDyeColor::rtti2,92, 0x0000007100684018,AI_QueryBase::m4r0,8,_ZN4ksys3act2ai5Query2m4Ev diff --git a/src/KingSystem/ActorSystem/actAiQuery.cpp b/src/KingSystem/ActorSystem/actAiQuery.cpp index 3ff02b07..d2259fd8 100644 --- a/src/KingSystem/ActorSystem/actAiQuery.cpp +++ b/src/KingSystem/ActorSystem/actAiQuery.cpp @@ -25,7 +25,7 @@ bool Query::init(sead::Heap* heap) { mActor->getRootAi()->loadAITreeParams(set.ai_tree_params, heap) && (set.dynamic_params.num_params < 1 || mParamPack.load(*mActor, set.dynamic_params, heap, AIDefInstParamKind::Dynamic))) { - preInit_(); + loadParams(); return init_(heap); } } diff --git a/src/KingSystem/ActorSystem/actAiQuery.h b/src/KingSystem/ActorSystem/actAiQuery.h index 5d41f689..18f9efcf 100644 --- a/src/KingSystem/ActorSystem/actAiQuery.h +++ b/src/KingSystem/ActorSystem/actAiQuery.h @@ -54,7 +54,7 @@ public: virtual bool m5() { return false; } virtual void m6() {} virtual bool init_(sead::Heap* heap) { return true; } - virtual void preInit_() {} + virtual void loadParams() {} virtual int doQuery() { return 0; } virtual void m10() {} virtual bool m11() { return true; }