More splitting

4 files changed, 7 insertions, 16 deletions

diff --git a/arm9/src/FUN_02000DE4.c b/arm9/src/FUN_02000DE4.c
index 851f39b8..9a7d8566 100644
--- a/arm9/src/FUN_02000DE4.c
+++ b/arm9/src/FUN_02000DE4.c
@@ -17,7 +17,6 @@ extern void FUN_02006260(int);
 extern BOOL FUN_02033678(void);
 extern int FUN_020335B8(void);
 extern BOOL FUN_0202FB80(void);
-extern void ErrorHandling(void);
 extern void FUN_02000FE8(void);
 extern void FUN_02016464(void);
 
@@ -152,7 +151,7 @@ extern void FUN_0201265C(struct Unk21C4818 *, struct Unk21C4828 *);
 extern void seedr_MT(int);
 extern void seedr_LC(int);
 
-void FUN_02000FA4(void)
+void InitializeMainRNG(void)
 {
     struct Unk21C4818 spC;
     struct Unk21C4828 sp0;
diff --git a/arm9/src/main.c b/arm9/src/main.c
index f6c09fa1..c097bfca 100644
--- a/arm9/src/main.c
+++ b/arm9/src/main.c
@@ -1,9 +1,6 @@
 #include "global.h"
 #include "main.h"
 #include "PAD_pad.h"
-#include "CARD_pullOut.h"
-#include "CARD_backup.h"
-#include "CTRDG_common.h"
 #include "poke_overlay.h"
 
 FS_EXTERN_OVERLAY(MODULE_52);
@@ -23,18 +20,17 @@ extern void FUN_0201259C(void);
 extern void FUN_02000DF4(void);
 extern void FUN_02002C14(void);
 extern void FUN_02002C50(int, int);
-extern int FUN_0202254C(void);
+extern struct UnkStruct_021C59C8 * FUN_0202254C(void);
 extern void FUN_02003B98(int, int);
-extern int FUN_02029EF8(int);
-extern int LoadPlayerDataAddress(int);
+extern int FUN_02029EF8(struct UnkStruct_021C59C8 *);
+extern int LoadPlayerDataAddress(struct UnkStruct_021C59C8 *);
 extern void FUN_02020AFC(void);
 extern int FUN_020337E8(int);
 extern void FUN_02034188(int, int);
-extern int FUN_020227FC(int);
+extern int FUN_020227FC(struct UnkStruct_021C59C8 *);
 extern void FUN_02089D90(int);
 extern void FUN_02000E7C(FSOverlayID, struct Unk21DBE18 *);
-extern void ErrorHandling(void);
-extern void FUN_02000FA4(void);
+extern void InitializeMainRNG(void);
 extern void FUN_0200A2AC(void);
 extern void FUN_02015E30(void);
 extern void FUN_02000EE8(void);
@@ -100,7 +96,7 @@ THUMB_FUNC void NitroMain(void)
     }
     gUnknown21C48B8.unk6C = 1;
     gUnknown21C48B8.unk30 = 0;
-    FUN_02000FA4();
+    InitializeMainRNG();
     FUN_0200A2AC();
     FUN_02015E30();
     gBacklightTop.unk4 = 0;
diff --git a/arm9/src/poke_overlay.c b/arm9/src/poke_overlay.c
index 4cf1ea67..2b6fe790 100644
--- a/arm9/src/poke_overlay.c
+++ b/arm9/src/poke_overlay.c
@@ -3,8 +3,6 @@
 #include "FS_file.h"
 #include "poke_overlay.h"
 
-extern void ErrorHandling(void);
-
 struct LoadedOverlay {
     FSOverlayID id;
     BOOL active;
diff --git a/arm9/src/script.c b/arm9/src/script.c
index cb218b1a..8a36f924 100644
--- a/arm9/src/script.c
+++ b/arm9/src/script.c
@@ -47,8 +47,6 @@ THUMB_FUNC void FUN_02038B6C(struct ScriptContext *ctx, int r1)
     ctx->unk74 = r1;

 }

 

-extern void ErrorHandling(void);

-

 THUMB_FUNC u8 RunScriptCommand(struct ScriptContext *ctx)

 {

     if (ctx->mode == 0)