main attempt

7 files changed, 13 insertions, 13 deletions

diff --git a/include/d/d_com/d_com_inf_game/asm/func_80030244.s b/include/d/d_com/d_com_inf_game/asm/func_80030244.s
index e342b05e4d..76e8fd517d 100644
--- a/include/d/d_com/d_com_inf_game/asm/func_80030244.s
+++ b/include/d/d_com/d_com_inf_game/asm/func_80030244.s
@@ -185,7 +185,7 @@
 /* 8003049C 0002D3DC  38 E0 00 40 */ li r7, 0x40
 /* 800304A0 0002D3E0  48 33 18 C1 */ bl func_80361D60
 /* 800304A4 0002D3E4  7F E3 FB 78 */ mr r3, r31
-/* 800304A8 0002D3E8  4B FF C7 3D */ bl dComIfG_inf_c_NS_ct
+/* 800304A8 0002D3E8  4B FF C7 3D */ bl ct__13dComIfG_inf_cFv
 /* 800304AC 0002D3EC  7F E3 FB 78 */ mr r3, r31
 /* 800304B0 0002D3F0  39 61 00 20 */ addi r11, r1, 0x20
 /* 800304B4 0002D3F4  48 33 1D 75 */ bl _restgpr_29
diff --git a/include/d/d_com/d_com_inf_game/d_com_inf_game.h b/include/d/d_com/d_com_inf_game/d_com_inf_game.h
index 97bb120e97..60704a170d 100644
--- a/include/d/d_com/d_com_inf_game/d_com_inf_game.h
+++ b/include/d/d_com/d_com_inf_game/d_com_inf_game.h
@@ -217,6 +217,7 @@ private:  // NEEDS TO BE FIXED
 class dComIfG_inf_c {
 public:
     dComIfG_inf_c(void);
+    void ct(void);
 
     // temp until we map the item short function names
     item_func& getPlayGiveItem() { return play.getGiveItem(); }
diff --git a/include/dvd/dvd.h b/include/dvd/dvd.h
index e88d5709fb..bd47a5eb27 100644
--- a/include/dvd/dvd.h
+++ b/include/dvd/dvd.h
@@ -74,7 +74,7 @@ extern "C" {
 s32 DVDOpen(const char*, DVDFileInfo*);
 s32 DVDClose(DVDFileInfo*);
 void DVDReadPrio(DVDFileInfo*, void*, s32, s32, s32);
-void DVDGetCurrentDiskID(void);
+DVDDiskID* DVDGetCurrentDiskID(void);
 s32 DVDFastOpen(long, DVDFileInfo*);
 int DVDGetCommandBlockStatus(DVDCommandBlock*);
 s32 DVDReadAsyncPrio(DVDFileInfo*, void*, long, long, DVDCallback, long);
diff --git a/include/m_Do/m_Do_main/asm/func_80006454.s b/include/m_Do/m_Do_main/asm/func_80006454.s
index c8757b83a1..be965eb9dd 100644
--- a/include/m_Do/m_Do_main/asm/func_80006454.s
+++ b/include/m_Do/m_Do_main/asm/func_80006454.s
@@ -51,7 +51,7 @@ lbl_800064A8:
 lbl_80006514:
 /* 80006514 00003454  3C 60 80 40 */	lis r3, g_dComIfG_gameInfo@ha
 /* 80006518 00003458  38 63 61 C0 */	addi r3, r3, g_dComIfG_gameInfo@l
-/* 8000651C 0000345C  48 02 66 C9 */	bl dComIfG_inf_c_NS_ct
+/* 8000651C 0000345C  48 02 66 C9 */	bl ct__13dComIfG_inf_cFv
 /* 80006520 00003460  88 0D 80 00 */	lbz r0, lbl_80450580-_SDA_BASE_(r13)
 /* 80006524 00003464  7C 00 07 75 */	extsb. r0, r0
 /* 80006528 00003468  40 80 00 40 */	bge lbl_80006568
diff --git a/include/m_Do/m_Do_main/m_Do_main.h b/include/m_Do/m_Do_main/m_Do_main.h
index 69cf8cb13a..8120beee1f 100644
--- a/include/m_Do/m_Do_main/m_Do_main.h
+++ b/include/m_Do/m_Do_main/m_Do_main.h
@@ -36,7 +36,6 @@ extern HeapCheck lbl_803D32E0[8];  // RootHeapCheck
 // extern HeapCheck lbl_803D33A8; // J2dHeapCheck
 // extern HeapCheck lbl_803D33D0; // HostioHeapCheck
 // extern HeapCheck lbl_803D33F8; // CommandHeapCheck
-extern s8 lbl_80450580[4];
 extern u8 lbl_80450B1A[2];
 extern u8 lbl_80450B18;
 extern u8 lbl_80450588[8];
diff --git a/include/os/OS.h b/include/os/OS.h
index 52354b8278..5b5bba5306 100644
--- a/include/os/OS.h
+++ b/include/os/OS.h
@@ -133,7 +133,7 @@ OSThread* OSGetCurrentThread(void);
 s32 OSSuspendThread(OSThread* thread);
 s32 OSSetThreadPriority(OSThread* thread, u32 pri);
 s32 OSGetThreadPriority(OSThread* thread);
-s32 OSCreateThread(OSThread* thread, void* (*func)(void*), void* param, void* stack, u32 stackSize,
+s32 OSCreateThread(OSThread* thread, void* func, void* param, void* stack, u32 stackSize,
                    int param_6, int param_7);
 void OSCancelThread(OSThread* thread);
 void OSDetachThread(OSThread* thread);
@@ -149,7 +149,7 @@ BOOL OSSendMessage(OSMessageQueue* queue, OSMessage message, int flags);
 BOOL OSJamMessage(OSMessageQueue* queue, OSMessage message, int flags);
 
 s32 OSGetConsoleType(void);
-s32 OSGetResetCode(void);
+u32 OSGetResetCode(void);
 
 u32 OSGetSoundMode(void);
 void OSSetSoundMode(OSSoundMode mode);
@@ -176,7 +176,7 @@ u32 OSGetArenaHi();
 u32 OSInitAlloc(u32 low, u32 high, int param_3);
 void OSSetArenaLo(u32 param_1);
 void OSSetArenaHi(u32 param_1);
-void OSAllocFromArenaLo(u32 size, int alignment);
+void* OSAllocFromArenaLo(u32 size, int alignment);
 
 // void OSCancelAlarm(OSAlarm *alarm);
 
diff --git a/include/variables.h b/include/variables.h
index 7de1c1b115..713834892c 100644
--- a/include/variables.h
+++ b/include/variables.h
@@ -35,7 +35,7 @@ extern u8 lbl_80450C28;
 extern u8 lbl_80450C34;
 extern u8 lbl_80450B24;
 extern u8 lbl_80450B1C;
-extern s8 lbl_80450580[4];
+extern s8 lbl_80450580;
 // extern u8 lbl_80450B1A;
 struct JUTGamePad;
 extern JUTGamePad* m_gamePad[4];
@@ -46,12 +46,12 @@ extern u8 lbl_80450B34;
 extern u8 lbl_80450B00;
 extern u8 lbl_80450C80;
 extern u8 LOAD_COPYDATE__FPv;
-extern u8 lbl_803D3420;
-extern u8 lbl_80450B0C;
+extern u32 lbl_803D3420[8192];
+extern u32 lbl_80450B0C;
 // struct ResetData;
-extern u8 lbl_80450B08;
-extern u8 lbl_803DB420;
-extern u8 main01__Fv;
+extern u32 lbl_80450B08;
+extern OSThread lbl_803DB420;
+//extern u8 main01__Fv;
 extern u8 lbl_803BB598;
 extern u8 lbl_803A6F88;
 extern u8 lbl_803BB588;