From 1be1d00092c6ed6fa7e994b8d04fd1de412c07a5 Mon Sep 17 00:00:00 2001
From: Ryan Myers <ryan.p.myers@gmail.com>
Date: Sun, 12 Sep 2021 12:12:01 -0400
Subject: [PATCH] Create main.h

---
 src/main.c | 17 ++++++-----------
 src/main.h | 15 +++++++++++++++
 2 files changed, 21 insertions(+), 11 deletions(-)
 create mode 100644 src/main.h

diff --git a/src/main.c b/src/main.c
index d7164f05..09b7d5fb 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,9 +1,7 @@
 /* The comment below is needed for this file to be picked up by generate_ld */
 /* RAM_POS: 0x80065D40 */
 
-#include "types.h"
-#include "macros.h"
-#include "libultra_internal.h"
+#include "main.h"
 
 /************ .rodata ************/
 
@@ -16,12 +14,12 @@ const char D_800E6ED0[] = "WARNING: Stack overflow/underflow!!!\n";
 
 /************ .bss ************/
 
-s32 *D_8011D750; // stack pointer for thread 1
+s32 *gThread1StackPointer; // stack pointer for thread 1
 s32 D_8011D754;
 s32 D_8011D758[2048];
 s32 *D_8011F758;
 s32 D_8011F75C;
-OSThread *D_8011F760; // OSThread for thread 1
+OSThread *gThread1; // OSThread for thread 1
 s32 D_8011F764;
 s32 D_8011F768[106];
 OSThread *D_8011F910; // OSThread for thread 3
@@ -30,19 +28,16 @@ s32 D_8011F918[1130];
 
 /******************************/
 
-void func_80065D98(s32 arg0);
-void thread3_main(s32 arg0);
-
 void main(void) {
     osInitialize();
-    osCreateThread(&D_8011F760, 1, &func_80065D98, 0, &D_8011D750, 0);
-    osStartThread(&D_8011F760);
+    osCreateThread(&gThread1, 1, (OSId) &func_80065D98, 0, &gThread1StackPointer, (OSPri) 0);
+    osStartThread(&gThread1);
 }
 
 #ifdef NON_MATCHING
 void func_80065D98(s32 arg0) {
     func_800B6F50();
-    osCreateThread(&D_8011F910, 3, &thread3_main, 0, &D_8011F758, 10);
+    osCreateThread(&D_8011F910, 3, (OSId) &thread3_main, 0, &D_8011F758, (OSPri) 10);
     D_8011D758[2049] = 0;
     D_8011D758[2048] = 0;
     D_8011D758[1] = 0;
diff --git a/src/main.h b/src/main.h
new file mode 100644
index 00000000..340ad3f4
--- /dev/null
+++ b/src/main.h
@@ -0,0 +1,15 @@
+#ifndef _MAIN_H_
+#define _MAIN_H_
+
+#include "types.h"
+#include "macros.h"
+#include "libultra_internal.h"
+
+void thread3_main(s32 arg0); //unknown_06B2B0.c
+
+void main(void);
+
+void func_80065D98(s32 arg0); //Non Matching
+//void func_80065E30(void); //Non Matching
+
+#endif