Fix headers of GameSystemInfo and Scene (23d72f3)

Co-authored-by: Sanae <atmatm6000@outlook.com>

lib/al/Library/Scene/Scene.h

@@ -17,6 +17,7 @@ class SceneMsgCtrl;
 class SceneStopCtrl;
 class ScreenCoverCtrl;
 class GraphicsInitArg;
+struct DrawSystemInfo;
 
 class Scene : public NerveExecutor,
               public IUseAudioKeeper,
@@ -26,7 +27,7 @@ public:
     Scene(const char*);
 
     virtual ~Scene();
-    virtual void init(const SceneInitInfo&);
+    virtual void init(const SceneInitInfo& initInfo);
     virtual void appear();
     virtual void kill();
     virtual void movement();
@@ -66,7 +67,7 @@ private:
     ScreenCoverCtrl* mScreenCoverCtrl;
     AudioDirector* mAudioDirector;
     AudioKeeper* mAudioKeeper;
-    NerveKeeper* mNerveKeeper;
+    DrawSystemInfo* mDrawSystemInfo;
 };
 
 class StageScene : public Scene {

lib/al/Library/Sequence/Sequence.h

@@ -35,7 +35,7 @@ public:
     void initDrawSystemInfo(const SequenceInitInfo&);
     AudioSystemInfo* getAudioSystemInfo();
 
-    GameDrawInfo* getDrawInfo() const { return mGameDrawInfo; }
+    DrawSystemInfo* getDrawInfo() const { return mDrawSystemInfo; }
 
 private:
     sead::FixedSafeString<0x40> mName;
@@ -44,7 +44,7 @@ private:
     SceneCreator* mSceneCreator;
     AudioDirector* mAudioDirector;
     AudioKeeper* mAudioKeeper;
-    GameDrawInfo* mGameDrawInfo;
+    DrawSystemInfo* mDrawSystemInfo;
     bool mIsAlive;
 };
 }  // namespace al

lib/al/Library/System/GameSystemInfo.h

@@ -3,9 +3,6 @@
 #include <basis/seadTypes.h>
 #include <common/aglRenderBuffer.h>
 
-class ProjectNfpDirector;
-class ApplicationMessageReceiver;
-
 namespace al {
 class EffectSystem;
 class LayoutSystem;
@@ -15,8 +12,11 @@ class AudioSystem;
 class GamePadSystem;
 class HtmlViewer;
 class WaveVibrationHolder;
+class NfpDirector;
+class ApplicationMessageReceiver;
+class FontHolder;
 
-struct GameDrawInfo {
+struct DrawSystemInfo {
     agl::RenderBuffer* dockedRenderBuffer;
     agl::RenderBuffer* handheldRenderBuffer;
     bool isDocked;
@@ -24,18 +24,19 @@ struct GameDrawInfo {
 };
 
 struct GameSystemInfo {
-    u64 _0;
-    EffectSystem* mEffectSys;
-    LayoutSystem* mLayoutSys;
-    MessageSystem* mMessageSys;
-    NetworkSystem* mNetworkSys;
-    AudioSystem* mAudioSys;
-    GamePadSystem* mGamePadSys;
-    GameDrawInfo* mDrawInfo;
-    ProjectNfpDirector* mProjNfpDirector;
-    HtmlViewer* mHtmlViewer;
-    ApplicationMessageReceiver* mMessageReciever;
-    WaveVibrationHolder* mWaveVibrationHolder;
+    AudioSystem* audioSystem;
+    EffectSystem* effectSystem;
+    LayoutSystem* layoutSystem;
+    MessageSystem* messageSystem;
+    NetworkSystem* networkSystem;
+    void* field_28;
+    GamePadSystem* gamePadSystem;
+    DrawSystemInfo* drawSystemInfo;
+    FontHolder* mFontHolder;
+    NfpDirector* nfpDirector;
+    HtmlViewer* htmlViewer;
+    ApplicationMessageReceiver* applicationMessageReciever;
+    WaveVibrationHolder* waveVibrationHolder;
 };
 
 }  // namespace al

lib/al/Project/Scene/SceneCreator.h

@@ -7,7 +7,7 @@ class SceneFactory;
 }
 
 namespace al {
-class GameSystemInfo;
+struct GameSystemInfo;
 class GameDataHolderBase;
 class ScreenCaptureExecutor;
 class InitializeThread;

lib/game/System/Application.h

@@ -6,7 +6,7 @@ namespace al {
 class SystemKit;
 class GameFrameworkNx;
 class AccountHolder;
-struct GameDrawInfo;
+struct DrawSystemInfo;
 }  // namespace al
 
 class RootTask;
@@ -23,13 +23,13 @@ public:
     al::SystemKit* getSystemKit() const { return mSystemKit; }
     al::GameFrameworkNx* getGameFramework() const { return mGameFramework; }
     al::AccountHolder* getAccountHolder() const { return mAccountHolder; }
-    al::GameDrawInfo* getGameDrawInfo() const { return mDrawInfo; }
+    al::DrawSystemInfo* getDrawSystemInfo() const { return mDrawSystemInfo; }
 
 private:
     al::SystemKit* mSystemKit;
     al::GameFrameworkNx* mGameFramework;
     al::AccountHolder* mAccountHolder;
-    al::GameDrawInfo* mDrawInfo;
+    al::DrawSystemInfo* mDrawSystemInfo;
 };
 
 namespace agl {

lib/game/System/GameSystem.h

@@ -16,6 +16,7 @@ class ApplicationMessageReceiver;
 }
 
 class GameConfigData;
+class ProjectNfpDirector;
 
 class GameSystem : public al::NerveExecutor {
 public: