From bd344c296cac13fe111b888f4316f7e31a37bd68 Mon Sep 17 00:00:00 2001
From: gijs <ogre@noest.dev>
Date: Mon, 25 Sep 2023 16:39:31 +0200
Subject: [PATCH] Renamed main_ to obMain along with it's Thread and Stack

---
 include/common.h                | 9 +++++----
 linker_scripts/symbols/addr.txt | 9 +++++----
 splat.yaml                      | 2 +-
 src/boot.c                      | 4 ++--
 src/main.c                      | 2 +-
 5 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/include/common.h b/include/common.h
index 7a15f35..4a550c3 100644
--- a/include/common.h
+++ b/include/common.h
@@ -328,15 +328,16 @@ extern void AddHeap(void* start, u32 length);
 extern void __some_logging(const char* format, ...); 
 
 
-extern void main_(void*);
 extern void __idle_start_4_threads(s32, s32);
 extern void (*D_800E7A18)();
 
 extern void boot(void);
-extern void obIdle(void* arg);
 
-extern OSThread THREAD_FIRST_DMA_LOAD;
-extern u8 SP_THREAD_FIRST_DMA_LOAD[];
+extern void obIdle(void*);
+extern void obMain(void*);
+
+extern OSThread obThreadMain;
+extern u8 obStackMain[];
 
 extern OSThread obThreadIdle;
 extern u8 obStackIdle[];
diff --git a/linker_scripts/symbols/addr.txt b/linker_scripts/symbols/addr.txt
index d57009b..bbb8c27 100644
--- a/linker_scripts/symbols/addr.txt
+++ b/linker_scripts/symbols/addr.txt
@@ -793,7 +793,6 @@ __start_thread_800B9C88 = 0x80089660;
 
 magnitude = 0x8009C780;
 
-main_ = 0x80071EB0;
 
 __dma_load_loop = 0x80089A30;
 
@@ -828,12 +827,10 @@ OSMESG_800BE048 = 0x800BE048;
 OSMESG_800B9C58 = 0x800B9C58;
 OSMESG_800B9C80 = 0x800B9C80;
 
-SP_THREAD_FIRST_DMA_LOAD = 0x800C6D60;
 SP_THREAD_800BE1C0 = 0x800C2370;
 SP_THREAD_800B9C88 = 0x800BBE40;
 
 THREAD_CONTROLLER = 0x800BBE80;
-THREAD_FIRST_DMA_LOAD = 0x800AF5F0;
 THREAD_800B7A90 = 0x800B7A90;
 THREAD_800BE1C0 = 0x800BE1C0;
 THREAD_800B9C88 = 0x800B9C88;
@@ -922,9 +919,13 @@ __controller_thread_80089D9C = 0x80089D9C;
 
 
 
+obIdle = 0x8007F8E4;
 obThreadIdle = 0x800AF440;
 obStackIdle = 0x800B17A0;
-obIdle = 0x8007F8E4;
+
+obMain = 0x80071EB0;
+obThreadMain = 0x800AF5F0;
+obStackMain = 0x800C6D60;
 
 obInitializePi = 0x80089F40;
 
diff --git a/splat.yaml b/splat.yaml
index ba9f77a..2d57447 100644
--- a/splat.yaml
+++ b/splat.yaml
@@ -50,7 +50,7 @@ segments:
     bss_size: 0x3AE70
     find_file_boundaries: False
     subsegments:
-      - [0x1060, asm, "main"]
+      - [0x1060, c, "main"]
       - [0x4AC0, asm]
       - [0x5FC0, asm, "5FC0"]
       - [0x68E0, asm]
diff --git a/src/boot.c b/src/boot.c
index f1d4f21..4130ccf 100644
--- a/src/boot.c
+++ b/src/boot.c
@@ -14,8 +14,8 @@ void obIdle(void* arg) {
 
     osViSetSpecialFeatures(OS_VI_DIVOT_ON | OS_VI_DITHER_FILTER_ON | OS_VI_GAMMA_OFF | OS_VI_GAMMA_DITHER_OFF);
 
-    osCreateThread(&THREAD_FIRST_DMA_LOAD, 3, main_, NULL, SP_THREAD_FIRST_DMA_LOAD, 0xA);
-    osStartThread(&THREAD_FIRST_DMA_LOAD);
+    osCreateThread(&obThreadMain, 3, obMain, NULL, obStackMain, 0xA);
+    osStartThread(&obThreadMain);
 
     osSetThreadPri(&obThreadIdle, OS_PRIORITY_IDLE);
 
diff --git a/src/main.c b/src/main.c
index 937edb9..ea481ae 100644
--- a/src/main.c
+++ b/src/main.c
@@ -39,7 +39,7 @@ INCLUDE_ASM(const s32, "main", func_80071C04);
 
 INCLUDE_ASM(const s32, "main", func_80071E74);
 
-INCLUDE_ASM(const s32, "main", main_);
+INCLUDE_ASM(const s32, "main", obMain);
 
 INCLUDE_ASM(const s32, "main", func_80072398);