From ba448bd9b6c1f686f0d4c17bee584d9900c6a581 Mon Sep 17 00:00:00 2001
From: Gabbo <gabry.lim06@gmail.com>
Date: Wed, 16 Oct 2024 23:30:21 +0200
Subject: [PATCH] linked SpkData and AnmModelObj

---
 include/Game/MapObj/AnmModelObj.hpp | 4 ++--
 src/Game/Speaker/SpkData.cpp        | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/Game/MapObj/AnmModelObj.hpp b/include/Game/MapObj/AnmModelObj.hpp
index f2645d73..cbf28ad6 100644
--- a/include/Game/MapObj/AnmModelObj.hpp
+++ b/include/Game/MapObj/AnmModelObj.hpp
@@ -18,7 +18,7 @@ public:
     virtual bool isKilledAtMoveDone() const;
     virtual bool isRepeat() const;
     virtual void startInner();
-    virtual void moveInner();
+    virtual inline void moveInner();
     virtual void stopInner();
 
     inline void exeWait();
@@ -78,4 +78,4 @@ namespace NrvAnmModelObj {
     NERVE_DECL(HostTypeWait, AnmModelObj, AnmModelObj::exeWait);
     NERVE_DECL(HostTypeMove, AnmModelObj, AnmModelObj::exeMove);
     NERVE_DECL(HostTypeDone, AnmModelObj, AnmModelObj::exeDone);
-};
\ No newline at end of file
+};
diff --git a/src/Game/Speaker/SpkData.cpp b/src/Game/Speaker/SpkData.cpp
index 0a484eb4..168222ef 100644
--- a/src/Game/Speaker/SpkData.cpp
+++ b/src/Game/Speaker/SpkData.cpp
@@ -5,15 +5,15 @@ SpkData::SpkData(JKRArchive * archive) {
 }
 
 void SpkData::loadTable(u16 table) {
-    void* resource = FUN_8040f918(mArchive, table);
+    void* resource = mArchive->getResource(table);
     mTable.setResource(resource);
 }
 
 void SpkData::loadWave(u16 wave) {
-    void* resource = FUN_8040f918(mArchive, wave);
+    void* resource = mArchive->getResource(wave);
     mWave.setResource(resource);
 }
 
 bool SpkData::isValid() const {
     return mTable.mInitialized && mWave.mResource;
-}
\ No newline at end of file
+}