some PSMainSide_DirectorMgr.cpp fixes

projectPiki · Sep 29, 2023 · 54a9b9e · 54a9b9e
1 parent da50edf
commit 54a9b9e
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 293 deletions.
diff --git a/include/PSM/Director.h b/include/PSM/Director.h
@@ -89,7 +89,6 @@ struct PikminNumberDirector_AutoBgm : public PikminNumberDirector {
 
 	// _00     = VTBL
 	// _00-_4C = PikminNumberDirector
-	u8 _4C;                                // _4C
 	::PSSystem::DirectedBgm* mDirectedBgm; // _50
 };
 
@@ -321,7 +320,7 @@ struct DirectorUpdator {
 	::PSSystem::DirectorBase* mDirector; // _0C
 };
 
-struct ListDirectorActor : public ::PSSystem::DirectorCopyActor {
+struct ListDirectorActor : public ::PSSystem::DirectorCopyActor, public JSUPtrList {
 	ListDirectorActor()
 	    : ::PSSystem::DirectorCopyActor(nullptr, nullptr)
 	{
@@ -330,7 +329,7 @@ struct ListDirectorActor : public ::PSSystem::DirectorCopyActor {
 
 	// _00     = VTBL
 	// _00-_0C = PSSystem::DirectorCopyActor
-	JSUPtrList mPtrList; // _0C
+	// _0C-_18 = JSUPtrList
 };
 } // namespace PSM
 

diff --git a/include/PSM/DirectorMgr.h b/include/PSM/DirectorMgr.h
@@ -30,6 +30,10 @@ struct DirectorMgr_Scene : public ::PSSystem::DirectorMgrBase, public JKRDispose
 	void initTrackMap(::PSSystem::DirectedBgm&);
 	void adaptDirectorActor(::PSSystem::DirectorBase*, u8);
 
+	inline ::PSSystem::DirectorCopyActor* getCopyActorList(int i) { return mCopyActorList[i]; }
+
+	inline void setCopyActorList(int i, ::PSSystem::DirectorCopyActor* list) { mCopyActorList[i] = list; }
+
 	// _00     = VTBL 1 (DirectorMgrBase)
 	// _0C     = VTBL 2 (JKRDisposer + Self)
 	// _00-_0C = PSSystem::DirectorMgrBase