From 91bff0b8b3d9aae81519b41df3fb14886b93db3e Mon Sep 17 00:00:00 2001 From: mrb0nk500 Date: Fri, 3 Feb 2023 20:51:33 -0400 Subject: TMainTask: Add, and match `func_0x10()` --- include/pso/TMainTask.h | 8 ++++++++ src/pso/TMainTask.cpp | 27 +++++++++++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/include/pso/TMainTask.h b/include/pso/TMainTask.h index 34c2d6c..1786c71 100644 --- a/include/pso/TMainTask.h +++ b/include/pso/TMainTask.h @@ -26,8 +26,16 @@ public: u32 mbr_0x24; public: TMainTask(); + void func_80228ae8(); + void func_80228a7c(); + void func_80228a3c(); + void func_80228928(); + void func_80228924(); + void func_802289d0(); + virtual ~TMainTask(); virtual void run_task(); + virtual void func_0x10(); private: void set_task_flags(u32 flags) { this->task_flags |= flags; diff --git a/src/pso/TMainTask.cpp b/src/pso/TMainTask.cpp index f255203..9403ed4 100644 --- a/src/pso/TMainTask.cpp +++ b/src/pso/TMainTask.cpp @@ -4,6 +4,33 @@ u32 some_main_task_flag = 1; u32 main_task_flags; u32 old_main_task_flags; +u32 lbl_805c5b98; +u32 lbl_805c5b9c; + +void TMainTask::func_80228ae8() {} +void TMainTask::func_80228a7c() {} +void TMainTask::func_80228a3c() {} +void TMainTask::func_80228928() {} +void TMainTask::func_80228924() {} +void TMainTask::func_802289d0() {} + +void TMainTask::func_0x10() { + SET_OR_CLEAR_CHILD_FLAGS(lbl_805c5b98, lbl_805c5b9c, 4); + set_task_flags(2); + some_main_task_flag = 0; + func_80228ae8(); + some_main_task_flag = 1; + func_80228a7c(); + some_main_task_flag = 0; + func_80228a3c(); + some_main_task_flag = 1; + func_80228928(); + some_main_task_flag = 0; + func_80228924(); + func_802289d0(); + clear_task_flags(2); + set_task_flags(0x100); +} void TMainTask::run_task() { SET_OR_CLEAR_CHILD_FLAGS(main_task_flags, old_main_task_flags, 3); -- cgit v1.2.3-13-gbd6f