Merge branch 'master' into placement

1 files changed, 5 insertions, 3 deletions

diff --git a/src/KingSystem/ActorSystem/actActorParam.cpp b/src/KingSystem/ActorSystem/actActorParam.cpp
index b358375a..dbe2096e 100644
--- a/src/KingSystem/ActorSystem/actActorParam.cpp
+++ b/src/KingSystem/ActorSystem/actActorParam.cpp
@@ -3,7 +3,7 @@
 #include <prim/seadScopedLock.h>
 #include "KingSystem/ActorSystem/actActorParamMgr.h"
 #include "KingSystem/ActorSystem/actActorTemplate.h"
-#include "KingSystem/Utils/Byaml.h"
+#include "KingSystem/Utils/Byaml/Byaml.h"
 
 namespace ksys::act {
 
@@ -49,8 +49,8 @@ void ActorParam::deleteResHandles() {
         handles.freeBuffer();
 }
 
-bool ActorParam::isDummyParam(res::ActorLink::Users::User user) const {
-    return mRes.mActorLink->getUsers().getUserName(user) == "Dummy";
+bool ActorParam::isDummyParam(res::ActorLink::User user) const {
+    return sead::SafeString(mRes.mActorLink->getUserName(user)) == "Dummy";
 }
 
 void ActorParam::allocResHandles(sead::Heap* heap, u32 buffer_idx, s32 count) {
@@ -154,4 +154,6 @@ void ActorParam::setProfileAndPriority(const char* profile, const char* priority
     }
 }
 
+void ActorParam::onLoadFinished(ActorParamMgr*) {}
+
 }  // namespace ksys::act