From 2fdd70e4eeb6b2ac82eb8be81fd23fa61bc2baeb Mon Sep 17 00:00:00 2001
From: mrb0nk500 <b0nk@b0nk.xyz>
Date: Sat, 11 Feb 2023 17:25:38 -0400
Subject: TMainTask: Make the function order match the original

---
 context.h               |   6 +--
 include/pso/TMainTask.h |   6 +--
 src/pso/TMainTask.cpp   | 134 ++++++++++++++++++++++++------------------------
 3 files changed, 73 insertions(+), 73 deletions(-)

diff --git a/context.h b/context.h
index 47b98d0..0af5667 100644
--- a/context.h
+++ b/context.h
@@ -311,12 +311,12 @@ public:
 	u32 mbr_0x24;
 public:
 	TMainTask();
-	void render_particle_effects();
-	void render_effects();
-	void render_geometry();
 	void unused_render_func();
 	void render_objects();
 	void render_ui();
+	void render_particle_effects();
+	void render_effects();
+	void render_geometry();
 	void func_80228bbc();
 	void func_80228c44(s32 arg0);
 	void func_80228dbc();
diff --git a/include/pso/TMainTask.h b/include/pso/TMainTask.h
index 1649275..3eab543 100644
--- a/include/pso/TMainTask.h
+++ b/include/pso/TMainTask.h
@@ -41,12 +41,12 @@ public:
 	u32 mbr_0x24;
 public:
 	TMainTask();
-	void render_particle_effects();
-	void render_effects();
-	void render_geometry();
 	void unused_render_func();
 	void render_objects();
 	void render_ui();
+	void render_particle_effects();
+	void render_effects();
+	void render_geometry();
 	void func_80228bbc();
 	void func_80228c44(s32 arg0);
 	void func_80228dbc();
diff --git a/src/pso/TMainTask.cpp b/src/pso/TMainTask.cpp
index 6bd7ebe..e8e2715 100644
--- a/src/pso/TMainTask.cpp
+++ b/src/pso/TMainTask.cpp
@@ -36,6 +36,73 @@ void set_some_id(u32 id) {
 void func_803e11e8(u32 arg1) {}
 void func_803e11f0() {}
 
+void TMainTask::render() {
+	DISALLOW_OR_ALLOW_CHILD(render_flags, old_render_flags, rendering);
+	set_task_flags(2);
+	some_main_task_flag = 0;
+	render_geometry();
+	some_main_task_flag = 1;
+	render_effects();
+	some_main_task_flag = 0;
+	render_particle_effects();
+	some_main_task_flag = 1;
+	render_objects();
+	some_main_task_flag = 0;
+	unused_render_func();
+	render_ui();
+	clear_task_flags(2);
+	set_task_flags(0x100);
+}
+
+void TMainTask::unused_render_func() {
+
+}
+
+void TMainTask::render_objects() {
+	set_task_flags(0x200);
+
+	tl_03->render_nodes2();
+	tl_04->render_nodes2();
+
+	set_depth_buffer_settings_id(0);
+	func_803e11e8(4);
+
+	tl_item_equip->allow_rendering();
+	tl_item_equip->render_nodes();
+
+	func_80141618();
+	func_803e11f0();
+
+	clear_task_flags(0x200);
+
+	set_depth_buffer_settings_id(2);
+	func_803e11e8(2);
+
+	tl_item_equip->allow_rendering();
+	tl_item_equip->render_nodes();
+	tl_item_equip->disallow_rendering();
+
+	func_803e11f0();
+	func_80141618();
+}
+
+void TMainTask::render_ui() {
+	u32 some_id;
+	set_depth_buffer_settings_2();
+	set_depth_buffer_settings_id(1);
+	save_depth_buffer_settings();
+	some_id = some_id_805c6f74;
+	set_some_id(1);
+
+	tl_window->allow_rendering();
+	tl_window->render_nodes();
+	tl_radermap->allow_rendering();
+	tl_radermap->render_nodes();
+
+	set_some_id(some_id);
+	restore_depth_buffer_settings();
+}
+
 void TMainTask::render_particle_effects() {
 	set_depth_buffer_settings_1();
 	set_depth_buffer_settings_id(1);
@@ -97,73 +164,6 @@ void TMainTask::render_geometry() {
 	func_80141618();
 }
 
-void TMainTask::unused_render_func() {
-
-}
-
-void TMainTask::render_objects() {
-	set_task_flags(0x200);
-
-	tl_03->render_nodes2();
-	tl_04->render_nodes2();
-
-	set_depth_buffer_settings_id(0);
-	func_803e11e8(4);
-
-	tl_item_equip->allow_rendering();
-	tl_item_equip->render_nodes();
-
-	func_80141618();
-	func_803e11f0();
-
-	clear_task_flags(0x200);
-
-	set_depth_buffer_settings_id(2);
-	func_803e11e8(2);
-
-	tl_item_equip->allow_rendering();
-	tl_item_equip->render_nodes();
-	tl_item_equip->disallow_rendering();
-
-	func_803e11f0();
-	func_80141618();
-}
-
-void TMainTask::render_ui() {
-	u32 some_id;
-	set_depth_buffer_settings_2();
-	set_depth_buffer_settings_id(1);
-	save_depth_buffer_settings();
-	some_id = some_id_805c6f74;
-	set_some_id(1);
-
-	tl_window->allow_rendering();
-	tl_window->render_nodes();
-	tl_radermap->allow_rendering();
-	tl_radermap->render_nodes();
-
-	set_some_id(some_id);
-	restore_depth_buffer_settings();
-}
-
-void TMainTask::render() {
-	DISALLOW_OR_ALLOW_CHILD(render_flags, old_render_flags, rendering);
-	set_task_flags(2);
-	some_main_task_flag = 0;
-	render_geometry();
-	some_main_task_flag = 1;
-	render_effects();
-	some_main_task_flag = 0;
-	render_particle_effects();
-	some_main_task_flag = 1;
-	render_objects();
-	some_main_task_flag = 0;
-	unused_render_func();
-	render_ui();
-	clear_task_flags(2);
-	set_task_flags(0x100);
-}
-
 void TMainTask::func_80228bbc() {
 	set_task_flags(0x40);
 	some_main_task_flag = 0;
-- 
cgit v1.2.3-13-gbd6f