From 52862236e347c9f4c74e0227439f0d94303cb434 Mon Sep 17 00:00:00 2001 From: Aetias Date: Tue, 16 Apr 2024 20:52:22 +0200 Subject: [PATCH] Finish `AdventureFlags` --- include/Cutscene/CutsceneHandler.hpp | 6 ++++++ include/Save/AdventureFlags.hpp | 3 ++- src/00_Core/Save/AdventureFlags.cpp | 6 +++--- 3 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 include/Cutscene/CutsceneHandler.hpp diff --git a/include/Cutscene/CutsceneHandler.hpp b/include/Cutscene/CutsceneHandler.hpp new file mode 100644 index 00000000..3f1858df --- /dev/null +++ b/include/Cutscene/CutsceneHandler.hpp @@ -0,0 +1,6 @@ +#pragma once + +#include "global.h" +#include "types.h" + +class CutsceneHandler; diff --git a/include/Save/AdventureFlags.hpp b/include/Save/AdventureFlags.hpp index 1a26233a..78999ee7 100644 --- a/include/Save/AdventureFlags.hpp +++ b/include/Save/AdventureFlags.hpp @@ -3,6 +3,7 @@ #include "global.h" #include "types.h" +#include "Cutscene/CutsceneHandler.hpp" #include "Render/FadeControl.hpp" #include "System/SysNew.hpp" @@ -46,7 +47,7 @@ struct FlagsUnk { class AdventureFlags : public SysObject { /* 00 */ unk32 mFlags[16]; - /* 40 */ void *mUnk_40; // contains a fade control + /* 40 */ CutsceneHandler *mCutsceneHandler; /* 44 */ void *mUnk_44; /* 48 */ diff --git a/src/00_Core/Save/AdventureFlags.cpp b/src/00_Core/Save/AdventureFlags.cpp index 7598a941..dd05dff6 100644 --- a/src/00_Core/Save/AdventureFlags.cpp +++ b/src/00_Core/Save/AdventureFlags.cpp @@ -39,9 +39,9 @@ bool AdventureFlags::func_ov00_02097e6c() {} bool AdventureFlags::func_ov00_02097e7c() {} bool AdventureFlags::func_ov00_02097ea4() {} unk32 AdventureFlags::func_ov00_02097ecc() {} -void*AdventureFlags:: func_ov00_02097f8c() {} -void*AdventureFlags:: func_ov00_02097fac() {} -void*AdventureFlags:: func_ov00_02097fd0() {} +void* AdventureFlags::func_ov00_02097f8c() {} +void* AdventureFlags::func_ov00_02097fac() {} +void* AdventureFlags::func_ov00_02097fd0() {} void AdventureFlags::func_ov00_02097ff4(bool param1, bool param2) {} unk32 AdventureFlags::func_ov00_02098058() {} bool AdventureFlags::func_ov00_02098064(unk32 param1) {}