remove old externs

8 files changed, 20 insertions, 42 deletions

diff --git a/arm9/src/communication_error.c b/arm9/src/communication_error.c
index 04058b83..2c6752a5 100644
--- a/arm9/src/communication_error.c
+++ b/arm9/src/communication_error.c
@@ -7,9 +7,8 @@
 #include "msgdata/msg.naix"
 #include "text.h"
 #include "brightness.h"
+#include "unk_0200CABC.h"
 
-extern void FUN_0200CB00(struct BgConfig* bg_config, enum GFBgLayer layer, u32 num_tiles, u32, u8, u32 heap_id);
-extern void FUN_0200CCA4(struct Window* window, BOOL copy_to_vram, u16 fill_value, u32 palette_num);
 extern void FUN_0200E394(BOOL set_brightness_on_bottom_screen);
 extern void FUN_0200E3A0(BOOL set_brightness_on_bottom_screen, s32);
 
diff --git a/arm9/src/error_message_reset.c b/arm9/src/error_message_reset.c
index 97bc7c70..66a71a75 100644
--- a/arm9/src/error_message_reset.c
+++ b/arm9/src/error_message_reset.c
@@ -7,6 +7,7 @@
 #include "PAD_pad.h"
 #include "font.h"
 #include "brightness.h"
+#include "unk_0200CABC.h"
 
 
 const struct WindowTemplate UNK_020FF49C = {
@@ -44,8 +45,6 @@ const struct GraphicsBanks UNK_020FF4D8 = { .bg = 3 };
 u32 sErrorMessagePrinterLock;
 
 extern void FUN_0200E3A0(PMLCDTarget, int);
-extern void FUN_0200CB00(struct BgConfig *param0, u32 param1, u32 param2, u32 param3, u8 param4, u32 param5);
-extern void FUN_0200CCA4(struct Window *param0, u32 param1, u32 param2, u32 param3);
 extern void FUN_0200E394(u32 param0);
 
 THUMB_FUNC void VBlankHandler()
diff --git a/arm9/src/save_data_read_error.c b/arm9/src/save_data_read_error.c
index 9524475c..7e378304 100644
--- a/arm9/src/save_data_read_error.c
+++ b/arm9/src/save_data_read_error.c
@@ -6,10 +6,9 @@
 #include "msgdata/msg.naix"
 #include "save_data_read_error.h"
 #include "text.h"
+#include "unk_0200CABC.h"
 
 extern void FUN_02002ED0(enum GFBgLayer layer, u32 base_addr, u32 heap_id);
-extern void FUN_0200CB00(struct BgConfig* bg_config, enum GFBgLayer layer, u32 num_tiles, u32, u8, u32 heap_id);
-extern void FUN_0200CCA4(struct Window* window, BOOL copy_to_vram, u16 fill_value, u32 palette_num);
 extern void FUN_0200E394(BOOL set_brightness_on_bottom_screen);
 extern void FUN_0200E3A0(BOOL set_brightness_on_bottom_screen, s32);
 
diff --git a/arm9/src/save_data_write_error.c b/arm9/src/save_data_write_error.c
index 71edb91d..04f2d686 100644
--- a/arm9/src/save_data_write_error.c
+++ b/arm9/src/save_data_write_error.c
@@ -6,10 +6,9 @@
 #include "msgdata/msg.naix"
 #include "save_data_write_error.h"
 #include "text.h"
+#include "unk_0200CABC.h"
 
 extern void FUN_02002ED0(enum GFBgLayer layer, u32 base_addr, u32 heap_id);
-extern void FUN_0200CB00(struct BgConfig* bg_config, enum GFBgLayer layer, u32 num_tiles, u32, u8, u32 heap_id);
-extern void FUN_0200CCA4(struct Window* window, BOOL copy_to_vram, u16 fill_value, u32 palette_num);
 extern void FUN_0200E394(BOOL set_brightness_on_bottom_screen);
 extern void FUN_0200E3A0(BOOL set_brightness_on_bottom_screen, s32);
 
diff --git a/arm9/src/scrcmd.c b/arm9/src/scrcmd.c
index ceb1a1cf..007b1bcf 100644
--- a/arm9/src/scrcmd.c
+++ b/arm9/src/scrcmd.c
@@ -6,6 +6,9 @@
 #include "player_data.h"
 #include "text.h"
 #include "bg_window.h"
+#include "unk_0200CABC.h"
+#include "text_02054590.h"
+
 
 extern void *FUN_02039438(struct UnkSavStruct80* arg, u32 id);
 extern void *CreateScriptContext(struct UnkSavStruct80* arg, u16 id);
@@ -22,27 +25,19 @@ extern void MOD05_021E2C58(struct ScriptContext *ctx, u16 typ, u16 id, u16 word1
 extern struct ScrStrBufs *MOD06_02244210(struct SaveBlock2 *sav, u16 poke, u16 sex, u8 flag, u8 *unk);
 extern void MOD05_021E2CBC(struct ScriptContext *ctx, struct ScrStrBufs *str, u8 param2, u32 param3);
 extern void MOD05_021E2BB8(void *param0, struct ScriptContext *ctx);
-extern BOOL FUN_020546C8(u8 param0);
 extern u32 FUN_02058488(u32 param0);
 extern BOOL FUN_02030F40(void);
 extern void FUN_02055304(u32 param0, u32 param1);
 extern void FUN_02039460(struct UnkSavStruct80 *arg);
-extern void FUN_020545B8(u32 param0, u8 *param1, u32 param2);
-extern void FUN_02054608(u8 *param0, struct Options *options);
-extern void FUN_0200D0E0(struct Window *param0, u32 param1);
 extern u32 FUN_02058510(u32 param0, u32 param1);
 extern void MOD05_021E8128(u32 param0, u8 type, u16 map);
 extern void MOD05_021E8130(u32 param0, u32 param1);
 extern void MOD05_021E8158(struct UnkSavStruct80 *unk80);
 extern struct Window * MOD05_021E8140(u32 param0);
 extern BOOL MOD05_021E8148(u32 param0);
-extern u8 FUN_02054658(struct Window * param0, struct String *str, struct Options *opt, u32 param3);
 extern void MOD05_021E8144(u32 param0);
-extern void FUN_0200CB00(u32 param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5);
-extern u32 Std_CreateYesNoMenu(u32 param0, u8 **param1, u32 param2, u32 param3, u32 param4);
+extern u32 Std_CreateYesNoMenu(struct BgConfig *param0, u8 **param1, u32 param2, u32 param3, u32 param4);
 extern u32 FUN_020021AC(u32 param0, u32 param1);
-extern u32 FUN_0200D858(u32 *param0, u32 param1);
-extern void FUN_0200DBFC(u32 param0);
 extern u32 MOD05_021E1BF8(struct UnkSavStruct80 *arg, u8 param1, u8 param2, u8 param3, u8 param4, u16 *param5, u32 param6, u32 *param7, struct MsgData *msgData);
 extern void MOD05_021E1C4C(u32 param0, u32 param1, u32 param2);
 extern void MOD05_021E1C54(u32 param0);
@@ -773,8 +768,8 @@ THUMB_FUNC BOOL ScrCmd_Unk0033(struct ScriptContext *ctx)
 {
     struct UnkSavStruct80 *unk80 = ctx->unk80;
     u8 *unk = (u8 *)FUN_02039438(unk80, 6);
-    FUN_020545B8(unk80->unk08, FUN_02039438(unk80, 1), 3);
-    FUN_02054608(FUN_02039438(unk80, 1), Sav2_PlayerData_GetOptionsAddr(ctx->unk80->saveBlock2));
+    FUN_020545B8(unk80->unk08, (struct Window *)FUN_02039438(unk80, 1), 3);
+    FUN_02054608((struct Window *)FUN_02039438(unk80, 1), Sav2_PlayerData_GetOptionsAddr(ctx->unk80->saveBlock2));
     *unk = 1;
     return FALSE;
 }
@@ -958,7 +953,7 @@ THUMB_FUNC BOOL ScrCmd_Unk003A(struct ScriptContext *ctx)
     ReadMsgDataIntoString(ctx->msgData, msg, *unk2);
     StringExpandPlaceholders(*unk4, *unk3, *unk2);
 
-    *unk1 = FUN_02054658(MOD05_021E8140(unk80->unk60), *unk3, Sav2_PlayerData_GetOptionsAddr(ctx->unk80->saveBlock2), 1);
+    *unk1 = (u8)FUN_02054658(MOD05_021E8140(unk80->unk60), *unk3, Sav2_PlayerData_GetOptionsAddr(ctx->unk80->saveBlock2), 1);
     ctx->data[0] = wk;
     SetupNativeScript(ctx, FUN_0203A94C);
     return TRUE;
@@ -1112,15 +1107,16 @@ THUMB_FUNC static BOOL FUN_0203AB00(struct ScriptContext *ctx)
 
 THUMB_FUNC BOOL ScrCmd_ShowSaveClock(struct ScriptContext *ctx)
 {
-    u32 *unk = FUN_02039438(ctx->unk80, 1);
-    u32 *unk2 = FUN_02039438(ctx->unk80, 18);
+    struct Window *unk = (struct Window *)FUN_02039438(ctx->unk80, 1);
+    struct UnkStruct_0200CABC_1 **unk2 = (struct UnkStruct_0200CABC_1 **)FUN_02039438(ctx->unk80, 18);
     *unk2 = FUN_0200D858(unk, 994);
     return FALSE;
 }
 
+
 THUMB_FUNC BOOL ScrCmd_HideSaveClock(struct ScriptContext *ctx)
 {
-    u32 *unk = FUN_02039438(ctx->unk80, 18);
+    struct UnkStruct_0200CABC_1 **unk = (struct UnkStruct_0200CABC_1 **)FUN_02039438(ctx->unk80, 18);
     FUN_0200DBFC(*unk);
     return FALSE;
 }
@@ -1345,13 +1341,13 @@ THUMB_FUNC BOOL ScrCmd_Unk02A1(struct ScriptContext *ctx)
     {
         unk4[0] = 15;
         pos++;
-        unk4[1] = unk1 - unk5;
+        unk4[1] = (u16)(unk1 - unk5);
     }
     else if (unk5 > unk1)
     {
         unk4[0] = 14;
         pos++;
-        unk4[1] = unk5 - unk1;
+        unk4[1] = (u16)(unk5 - unk1);
     }
 
     if (unk6 < unk2)
diff --git a/arm9/src/text_02054590.c b/arm9/src/text_02054590.c
index 3c3d0fed..7b6ddeb7 100644
--- a/arm9/src/text_02054590.c
+++ b/arm9/src/text_02054590.c
@@ -3,22 +3,10 @@
 #include "bg_window.h"
 #include "font.h"
 #include "render_text.h"
+#include "unk_0200CABC.h"
 
 extern void FUN_0201BD5C(void);
 
-extern void FUN_0200CD68(
-    struct BgConfig *param0, u32 param1, u32 param2, u32 param3, u8 param4, u32 param5);
-extern void FUN_0200D0BC(struct Window *param0, u32 param1, u32 param2, u32 param3);
-
-extern void FUN_0200D300(struct BgConfig *param0,
-    u32 param1,
-    u32 param2,
-    u32 param3,
-    u8 param4,
-    u32 param5,
-    u32 param6);
-extern void FUN_0200D6F8(struct Window *param0, u32 param1, u32 param2, u32 param3, u8 param4);
-
 THUMB_FUNC void FUN_02054590(u32 param0, u32 param1)
 {
     if (param1 == 1)
@@ -99,7 +87,7 @@ THUMB_FUNC void FUN_020546E0(
     }
 }
 
-THUMB_FUNC void FUN_02054744(struct Window *param0, u32 param1, u32 param2)
+THUMB_FUNC void FUN_02054744(struct Window *param0, u32 param1, u16 param2)
 {
     FUN_0200D300(param0->bgConfig, GetWindowBgId(param0), 0x399, 9, (u8)param1, param2, 4);
     FillWindowPixelBuffer(param0, 15);
diff --git a/arm9/src/unk_0200CABC.c b/arm9/src/unk_0200CABC.c
index 17f646f9..2004ff29 100644
--- a/arm9/src/unk_0200CABC.c
+++ b/arm9/src/unk_0200CABC.c
@@ -29,7 +29,6 @@ extern u32 FUN_0202022C(u32 param0);
 extern void FUN_020201E4(u32 param0, u32 param1);
 extern void FUN_0201FDEC(u32 param0);
 extern void MOD05_021D99F8(struct UnkStruct_0200CABC_2 *param0);
-extern void FUN_0200E188(struct UnkStruct_0200CABC_2 *param0);
 extern void *FUN_0201B6C8(BOOL);
 extern void MOD05_021D959C(
     struct UnkStruct_0200CABC_2 *param0, void *param1, u32 param2, u32 param3);
diff --git a/arm9/src/wfc_user_info_warning.c b/arm9/src/wfc_user_info_warning.c
index da547f3d..ced5d707 100644
--- a/arm9/src/wfc_user_info_warning.c
+++ b/arm9/src/wfc_user_info_warning.c
@@ -11,10 +11,9 @@
 #include "text.h"
 #include "wfc_user_info_warning.h"
 #include "brightness.h"
+#include "unk_0200CABC.h"
 
 extern void FUN_02002ED0(enum GFBgLayer layer, u32 base_addr, u32 heap_id);
-extern void FUN_0200CB00(struct BgConfig* bg_config, enum GFBgLayer layer, u32 num_tiles, u32, u8, u32 heap_id);
-extern void FUN_0200CCA4(struct Window* window, BOOL copy_to_vram, u16 fill_value, u32 palette_num);
 extern void FUN_0200E394(BOOL set_brightness_on_bottom_screen);
 extern void FUN_0200E3A0(BOOL set_brightness_on_bottom_screen, s32);