1 files changed, 11 insertions, 28 deletions
diff --git a/arm9/src/main.c b/arm9/src/main.c
index bc3ca71a..a038cd9a 100644
--- a/arm9/src/main.c
+++ b/arm9/src/main.c
@@ -1,6 +1,5 @@
 #include "global.h"
 #include "SPI_pm.h"
-#include "OS_interrupt.h"
 #include "OS_system.h"
 #include "CARD_backup.h"
 #include "CARD_pullOut.h"
@@ -14,27 +13,22 @@ FS_EXTERN_OVERLAY(MODULE_63);
 
 #define SOFT_RESET_KEY (PAD_BUTTON_L | PAD_BUTTON_R | PAD_BUTTON_START | PAD_BUTTON_SELECT)
 
-extern struct Unk21C48B8 gUnknown21C48B8;
-
 struct Unk2106FA0 gBacklightTop;
 
 extern BOOL FUN_02006234(struct Unk21DBE18 *, s32 *, int);
 extern BOOL FUN_02006290(int);
 extern void FUN_02006260(int);
 extern BOOL FUN_02033678(void);
-extern int FUN_020335B8(void);
+extern u32 FUN_020335B8(void);
 extern BOOL FUN_0202FB80(void);
-extern void FUN_02000FE8(void);
 extern void FUN_02016464(void);
 
-extern void OS_WaitIrq();
 extern void FUN_02016438(s32);
 extern void InitSystemForTheGame(void);
 extern void InitGraphicMemory(void);
 extern void FUN_020163BC(void);
 extern void FUN_02022294(void);
 extern void FUN_0201259C(void);
-extern void FUN_02000DF4(void);
 extern void FUN_02002C14(void);
 extern void FUN_02002C50(int, int);
 extern struct UnkStruct_021C59C8 * FUN_0202254C(void);
@@ -46,14 +40,8 @@ extern int FUN_020337E8(int);
 extern void FUN_02034188(int, int);
 extern int FUN_020227FC(struct UnkStruct_021C59C8 *);
 extern void FUN_02089D90(int);
-extern void FUN_02000E7C(FSOverlayID, struct Unk21DBE18 *);
-extern void InitializeMainRNG(void);
 extern void FUN_0200A2AC(void);
 extern void FUN_02015E30(void);
-extern void FUN_02000EE8(void);
-void DoSoftReset(u32 parameter);
-extern BOOL FUN_0202FB80(void);
-extern void FUN_02000E0C(void);
 extern void FUN_0201B5CC(int);
 extern void FUN_020125D4(void);
 extern void FUN_02015E60(void);
@@ -61,11 +49,6 @@ extern void FUN_020222C4(void);
 extern void FUN_0200A318(void);
 extern void FUN_0200E2D8(void);
 extern void FUN_02003C10(void);
-extern void FUN_02000FE8(void);
-extern void FUN_02016464(void);
-
-void FUN_02000F4C(int arg0, int arg1);
-void FUN_02000FE8(void);
 
 extern struct Unk21DBE18 MOD63_UNK_021DBE18; 
 extern struct Unk21DBE18 MOD52_UNK_021D76C8;
@@ -162,9 +145,9 @@ THUMB_FUNC void NitroMain(void)
 
 THUMB_FUNC void FUN_02000DF4(void)
 {
-    gBacklightTop.unk8 = -1;
+    gBacklightTop.unk8 = (FSOverlayID)-1;
     gBacklightTop.unkC = 0;
-    gBacklightTop.unk10 = -1; // overlay invalid
+    gBacklightTop.unk10 = (FSOverlayID)-1; // overlay invalid
     gBacklightTop.unk14 = NULL;
 }
 
@@ -219,7 +202,7 @@ THUMB_FUNC void FUN_02000EC8(u32 parameter)
 
 THUMB_FUNC void FUN_02000EE8(void)
 {
-    int r1 = FUN_020335B8();
+    u32 r1 = FUN_020335B8();
     switch (r1)
     {
     case 1:
@@ -258,7 +241,7 @@ THUMB_FUNC void DoSoftReset(u32 parameter)
 
 extern void FUN_02033F70(int, int, int);
 
-THUMB_FUNC void FUN_02000F4C(int arg0, int arg1)
+THUMB_FUNC void FUN_02000F4C(u32 arg0, u32 arg1)
 {
     if (arg1 == 3)
     {
@@ -285,17 +268,17 @@ THUMB_FUNC void FUN_02000F4C(int arg0, int arg1)
 }
 
 extern void FUN_0201265C(struct Unk21C4818 *, struct Unk21C4828 *);
-extern void seedr_MT(int);
-extern void seedr_LC(int);
+extern void seedr_MT(u32);
+extern void seedr_LC(u32);
 
-void InitializeMainRNG(void)
+THUMB_FUNC void InitializeMainRNG(void)
 {
     struct Unk21C4818 spC;
     struct Unk21C4828 sp0;
     FUN_0201265C(&spC, &sp0);
     {
-        int r4 = gUnknown21C48B8.unk2C;
-        int r5 = ((sp0.unk4 + sp0.unk8) << 24) + (spC.unk0 + ((256 * spC.unk4 * spC.unk8) << 16) + (sp0.unk0 << 16));
+        u32 r4 = gUnknown21C48B8.unk2C;
+        u32 r5 = ((sp0.unk4 + sp0.unk8) << 24) + (spC.unk0 + ((256 * spC.unk4 * spC.unk8) << 16) + (sp0.unk0 << 16));
         seedr_MT(r4 + r5);
         seedr_LC(r4 + r5);
     }
@@ -304,7 +287,7 @@ void InitializeMainRNG(void)
 extern void FUN_0201CE04(void);
 extern void FUN_0201CDD0(void);
 
-void FUN_02000FE8(void)
+THUMB_FUNC void FUN_02000FE8(void)
 {
     PMBackLightSwitch top, bottom;
     if (PAD_DetectFold())