From 2b94b732c9e71a5884de4729ca50d9a8eda42049 Mon Sep 17 00:00:00 2001 From: mrb0nk500 Date: Mon, 30 Jan 2023 11:29:51 -0400 Subject: TObject, TObject2: Create `TObject2.cpp`, and move flag functions into it This is necessary to get the function placement correct. --- obj_files.mk | 1 + src/pso/TObject.cpp | 16 ---------------- src/pso/TObject2.cpp | 17 +++++++++++++++++ 3 files changed, 18 insertions(+), 16 deletions(-) create mode 100644 src/pso/TObject2.cpp diff --git a/obj_files.mk b/obj_files.mk index 4677312..803ad16 100644 --- a/obj_files.mk +++ b/obj_files.mk @@ -1,6 +1,7 @@ O_FILES := $(BUILD_DIR)/src/main.o \ $(BUILD_DIR)/src/pso/TMainTask.o \ $(BUILD_DIR)/src/pso/TObject.o \ + $(BUILD_DIR)/src/pso/TObject2.o \ $(BUILD_DIR)/src/Runtime/global_destructor_chain.o \ $(BUILD_DIR)/src/Runtime/Gecko_ExceptionPPC.o \ $(BUILD_DIR)/src/Runtime/__init_cpp_exceptions.o \ diff --git a/src/pso/TObject.cpp b/src/pso/TObject.cpp index 8957b5c..012b62f 100644 --- a/src/pso/TObject.cpp +++ b/src/pso/TObject.cpp @@ -165,19 +165,3 @@ TObject::TObject(TObject *parent) { name = TObject_name; add_parent(parent, false); } - -void TObject::clear_flag_9() { - clear_flags(0x200); -} - -void TObject::set_flag_9() { - set_flags(0x200); -} - -u32 TObject::get_flag_9() { - return get_flags(0x200); -} - -void TObject::set_flag_0() { - set_flags(1); -} diff --git a/src/pso/TObject2.cpp b/src/pso/TObject2.cpp new file mode 100644 index 0000000..157544c --- /dev/null +++ b/src/pso/TObject2.cpp @@ -0,0 +1,17 @@ +#include "pso/TObject.h" + +void TObject::clear_flag_9() { + clear_flags(0x200); +} + +void TObject::set_flag_9() { + set_flags(0x200); +} + +u32 TObject::get_flag_9() { + return get_flags(0x200); +} + +void TObject::set_flag_0() { + set_flags(1); +} -- cgit v1.2.3-13-gbd6f