Moved functions to correct places/files, formatting

1 files changed, 29 insertions, 8 deletions

diff --git a/src/KingSystem/Map/mapPlacementMap.cpp b/src/KingSystem/Map/mapPlacementMap.cpp
index 66e4bd48..d5b04963 100644
--- a/src/KingSystem/Map/mapPlacementMap.cpp
+++ b/src/KingSystem/Map/mapPlacementMap.cpp
@@ -2,14 +2,35 @@
 
 namespace ksys::map {
 
-SEAD_SINGLETON_DISPOSER_IMPL(PlacementMapMgr)
-
-void PlacementMapMgr::junk() {
-    /*  Here to force the compiler to include PlacementMap */
-    PlacementMap x;
-    auto y = new PlacementMap;
-    (void)(x);
-    (void)(y);
+PlacementMap::PlacementMap() {
+    mInitStatus = InitStatus::None;
+    mParsedNumStaticObjs = 0xFFFFFFFF;
+    mStaticMapLoaded = StaticMap_None;
+    mNumStaticObjs = 0xFFFFFFFF;
+    mMat = sead::Matrix34f::ident;
+    mDistanceToCurrentMapUnit = 0;
+    mSkipLoadStaticMap = 0;
+    _38c = 0xFFFFFFFF;
+    mIdx = 0;
+    _388 = 0;
+    mCol = 0;
+    mRow = 0;
+    mNumRoutes = 0;
+    mP18 = 0;
+    mMgr = 0;
+    mPa = 0;
+    mDynamicGroupIdx = 0xFFFFFFFF;
+    mRes[0].mStatus = HkscRes::Status::_0;
+    mRes[1].mStatus = HkscRes::Status::_0;
+    mRes[2].mStatus = HkscRes::Status::_0;
+    mRes[3].mStatus = HkscRes::Status::_0;
+}
+
+PlacementMap::~PlacementMap() {
+    mRoutes.freeBuffer();
+    for (auto& r : mRes) {
+        r.cleanup();
+    }
 }
 
 }  // namespace ksys::map