Remove some externs

include/code_8031D70.h

@@ -0,0 +1,9 @@
+#ifndef GUARD_CODE_8031D70_H
+#define GUARD_CODE_8031D70_H
+
+bool8 sub_8031D70(u32 mailIndex, s32 param_2);
+u32 sub_8031DCC(void);
+void sub_8031E00(void);
+void sub_8031E10(void);
+
+#endif // GUARD_CODE_8031D70_H

include/code_803C1B4.h

@@ -2,8 +2,15 @@
 #define GUARD_CODE_803C1B4_H
 
 #include "structs/str_dungeon_location.h"
+#include "structs/str_wonder_mail.h"
 
-void sub_803C37C(DungeonLocation *location, u8 r1, u8 *itemReward);
 u32 GetDungeonTeamRankPts(DungeonLocation *dungeon, u8 r1);
 
+void sub_803C37C(DungeonLocation *location, u8 r1, u8 *itemReward);
+bool8 sub_803C4F0(WonderMail *mail);
+bool8 sub_803C3E0(WonderMail *mail);
+bool8 sub_803C45C(WonderMail *mail);
+bool8 sub_803C610(WonderMail *param_1);
+bool8 sub_803C580(WonderMail *param_1);
+
 #endif // GUARD_CODE_803C1B4_H

include/code_803C1D0.h

@@ -3,9 +3,8 @@
 
 #include "structs/str_wonder_mail.h"
 
-// code_803C1D0.s
-extern u8 sub_803C1D0(DungeonLocation *, u8);
-extern u8 *GetMissionRankText(u8);
-extern void sub_803C21C(WonderMail *, unkStruct_802F204 *);
+u8 sub_803C1D0(DungeonLocation *, u8);
+const u8 *GetMissionRankText(u8 index);
+void sub_803C21C(WonderMail *, unkStruct_802F204 *);
 
 #endif // GUARD_CODE_803C1D0_H

include/code_8040094_1.h

@@ -0,0 +1,6 @@
+#ifndef GUARD_CODE_8040094_1_H
+#define GUARD_CODE_8040094_1_H
+
+void sub_8041168(Entity *entity, Entity *entity2, Move *move, DungeonPos *pos);
+
+#endif // GUARD_CODE_8040094_1_H

include/effect_main.h

@@ -27,6 +27,8 @@ struct UnkStruct_8040094
     s32 unk10;
 };
 
+bool8 EffectiveMoveHasSineWobble(s32 moveId);
+
 void sub_800DAC0(u32 fileSelection);
 void sub_800DB7C(void);
 void sub_800DBBC(void);

include/move_orb_actions_3.h

@@ -4,6 +4,8 @@
 #include "structs/dungeon_entity.h"
 #include "structs/str_stat_index.h"
 
+extern const s32 gUnknown_8106A8C[];
+
 bool8 PoisonStingMoveAction(Entity *pokemon, Entity *target, Move *move, s32 itemId);
 bool8 TriAttackMoveAction(Entity *pokemon, Entity *target, Move *move, s32 itemId);
 bool8 TrickMoveAction(Entity *pokemon, Entity *target, Move *move, s32 itemId);

include/rescue_password_menu.h

@@ -44,4 +44,6 @@ void CreateRescuePasswordMenu(u32 currMenu);
 s32 UpdateRescuePasswordMenu(void);
 void CleanRescuePasswordMenu(void);
 
-#endif
+u32 sub_8039068(u32 mailMode, u8 *passwordBuffer, unkStruct_203B480 *param_3);
+
+#endif // GUARD_RESCUE_PASSWORD_MENU_H

include/thank_you_wonder_mail.h

@@ -20,7 +20,7 @@ typedef struct WonderMailStruct_203B2C4
     u8 filler48[0x1B8 - 0x48];
     unkStruct_203B480 unk1B8;
     unkStruct_203B480 unk1E8;
-    /* 0x218 */ s8 mailIndex;
+    /* 0x218 */ u8 mailIndex;
     MenuStruct unk21C[4];
     WindowTemplates unk35C;
     WindowTemplates unk3BC;

include/unk_menu_203B360.h

@@ -3,5 +3,6 @@
 
 void sub_80383A8(void);
 u32 sub_80383D4(void);
+void sub_8038440(void);
 
-#endif // GUARD_UNK_MENU_203B360_H
+#endif // GUARD_UNK_MENU_203B360_H

include/wonder_mail_6.h

@@ -0,0 +1,8 @@
+#ifndef GUARD_WONDER_MAIL_6_H
+#define GUARD_WONDER_MAIL_6_H
+
+bool8 sub_8030F58(u32 wonderMailType);
+u32 sub_8031050(void);
+void sub_80310B4(void);
+
+#endif // GUARD_WONDER_MAIL_6_H

src/code_800D090.c

@@ -158,6 +158,7 @@ EWRAM_DATA u32 gUnknown_202DBB8[80] = {0};
 
 EWRAM_DATA struct UnkStruct_202DCF8 gUnknown_202DCF8 = {0};
 
+// arm_funcs.s
 extern u32 sub_80001E8(void);
 extern void sub_8000228(void);
 

src/code_801F808.c

@@ -41,13 +41,11 @@ static const WindowTemplate sUnknown_80DC2F8 = {
     NULL
 };
 
-const u8 gUnknown_80DC310[] = _("{POKEMON_0}");
-
-extern void sub_801F918(s32);
-extern void sub_801FA58(void);
-extern void sub_801FAD4(void);
-extern void sub_801F930(void);
-extern void sub_801F9A4(void);
+static void sub_801F918(s32);
+static void sub_801FA58(void);
+static void sub_801FAD4(void);
+static void sub_801F930(void);
+static void sub_801F9A4(void);
 
 bool8 sub_801F808(u16 *moveIDs)
 {
@@ -102,14 +100,14 @@ void sub_801F8D0(void)
     }
 }
 
-void sub_801F918(s32 newState)
+static void sub_801F918(s32 newState)
 {
     gUnknown_203B278->state = newState;
     sub_801F930();
     sub_801F9A4();
 }
 
-void sub_801F930(void)
+static void sub_801F930(void)
 {
     sub_80140B4(&gUnknown_203B278->windows);
     switch(gUnknown_203B278->state)
@@ -132,7 +130,7 @@ void sub_801F930(void)
     }
 }
 
-void sub_801F9A4(void)
+static void sub_801F9A4(void)
 {
     switch (gUnknown_203B278->state) {
         case 0:
@@ -145,7 +143,7 @@ void sub_801F9A4(void)
             CallPrepareTextbox_8008C54(gUnknown_203B278->unk5C);
             sub_80073B8(gUnknown_203B278->unk5C);
             InlineStrcpy(gFormatBuffer_Monsters[0], gUnknown_203B278->unk14[gUnknown_203B278->unkC]->name);
-            PrintFormattedStringOnWindow(0x10,0,gUnknown_80DC310,gUnknown_203B278->unk5C,0); // $m0
+            PrintFormattedStringOnWindow(0x10,0,_("{POKEMON_0}"),gUnknown_203B278->unk5C,0);
             PrintFormattedStringOnWindow(4,0x10,gUnknown_203B278->unk14[gUnknown_203B278->unkC]->desc,gUnknown_203B278->unk5C,0);
             sub_80073E0(gUnknown_203B278->unk5C);
             break;
@@ -154,7 +152,7 @@ void sub_801F9A4(void)
     }
 }
 
-void sub_801FA58(void)
+static void sub_801FA58(void)
 {
     if(gUnknown_203B278->unk10 != 0)
     {
@@ -190,7 +188,7 @@ void sub_801FA58(void)
     }
 }
 
-void sub_801FAD4(void)
+static void sub_801FAD4(void)
 {
     if(gUnknown_203B278->unkC < gUnknown_203B278->unk10 - 1)
     {

src/code_8031D70.c

@@ -4,6 +4,7 @@
 #include "constants/colors.h"
 #include "structs/str_dungeon.h"
 #include "music_util.h"
+#include "code_8031D70.h"
 #include "code_803D0D8.h"
 #include "code_8094F88.h"
 #include "input.h"
@@ -50,7 +51,6 @@ const WindowTemplate gUnknown_80E1FC4 = {
 
 ALIGNED(4) const u8 gUnknown_80E1FDC[] = "Password";
 
-void sub_8031E00(void);
 void sub_8031E58(void);
 void DrawSOSPasswordScreen(void);
 

src/code_803C1B4.c

@@ -21,7 +21,7 @@ s32 sub_803C1B4(DungeonLocation *dungeon, u8 missionType)
     return temp;
 }
 
-u8 sub_803C1D0(struct DungeonLocation *dungeon, u8 missionType)
+u8 sub_803C1D0(DungeonLocation *dungeon, u8 missionType)
 {
     s32 a = sub_803C1B4(dungeon, missionType);
     a /= 2;
@@ -32,7 +32,7 @@ u8 sub_803C1D0(struct DungeonLocation *dungeon, u8 missionType)
     return a;
 }
 
-u8 *GetMissionRankText(u8 index)
+const u8 *GetMissionRankText(u8 index)
 {
     return gMissionRankText[index];
 }

src/code_8040094_1.c

@@ -6,35 +6,28 @@
 #include "structs/dungeon_entity.h"
 #include "structs/str_dungeon.h"
 #include "code_800558C.h"
-#include "graphics_memory.h"
-#include "effect_data.h"
-#include "effect_sub_1.h"
-#include "dungeon_vram.h"
+#include "code_8040094_1.h"
+#include "dungeon_8041AD0.h"
 #include "dungeon_info.h"
+#include "dungeon_logic.h"
+#include "dungeon_map_access.h"
 #include "dungeon_message.h"
+#include "dungeon_mon_sprite_render.h"
 #include "dungeon_move.h"
 #include "dungeon_move_util.h"
 #include "dungeon_music.h"
 #include "dungeon_random.h"
+#include "dungeon_strings.h"
+#include "dungeon_tilemap.h"
 #include "dungeon_util.h"
-#include "dungeon_logic.h"
+#include "dungeon_vram.h"
+#include "effect_data.h"
+#include "effect_main.h"
+#include "effect_sub_1.h"
+#include "graphics_memory.h"
+#include "move_orb_actions_3.h"
 #include "sprite.h"
 #include "weather.h"
-#include "dungeon_map_access.h"
-#include "dungeon_strings.h"
-#include "dungeon_mon_sprite_render.h"
-#include "dungeon_8041AD0.h"
-#include "effect_main.h"
-
-extern u8 sub_800EC94(s32 param_1);
-extern void sub_800EEC8(u16 r0);
-extern bool8 sub_800E9A8(s32 a0);
-extern void sub_800EEF8(u16 a0);
-extern bool8 sub_803F428(DungeonPos *pos);
-extern void sub_800EEE0(u16 a0);
-extern bool8 EffectiveMoveHasSineWobble(s32 moveId);
-
-extern const s32 gUnknown_8106A8C[];
 
 u16 GetEffectiveMoveId(u16 moveId, u8 weather, bool32 hasSpecialEffect);
 static bool32 MoveHasSpecialEffect(Entity *entity, Move *move);

src/code_80958E8.c

@@ -1,5 +1,6 @@
 #include "global.h"
 #include "globaldata.h"
+#include "code_803C1B4.h"
 #include "code_803C1D0.h"
 #include "code_80958E8.h"
 #include "code_80A26CC.h"
@@ -17,28 +18,30 @@
 #include "pokemon_mail.h"
 #include "event_flag.h"
 #include "rescue_team_info.h"
-#include "code_803C1B4.h"
 
-bool8 sub_8095E38(WonderMail *mail, u8 dungeon, u32 floor, u8 param_4);
-u8 sub_8095F28(u8 param_1);
-bool8 GenerateMailJobDungeonInfo(WonderMail *mail);
-bool8 GenerateMailJobInfo(WonderMail *);
-bool8 sub_8096E80(u8);
-u8 sub_8095E78(void);
-bool8 sub_80963B4(void);
-s32 CalculateMailChecksum(WonderMail *mail);
+static const u8 sPossibleMissionTypes[8] = {
+    MISSION_TYPE_FRIEND_RESCUE,
+    MISSION_TYPE_FIND_ITEM,
+    MISSION_TYPE_DELIVER_ITEM,
+    MISSION_TYPE_RESCUE_CLIENT,
+    MISSION_TYPE_RESCUE_TARGET,
+    MISSION_TYPE_DELIVER_ITEM,
+    MISSION_TYPE_FIND_ITEM,
+    MISSION_TYPE_FRIEND_RESCUE
+};
 
-extern void sub_803C4F0(WonderMail *);
-extern void sub_803C3E0(WonderMail *);
-extern void sub_803C45C(WonderMail *);
-extern void sub_803C610(WonderMail *);
-extern void sub_803C580(WonderMail *);
+static EWRAM_DATA unkStruct_203B490 sUnknown_2039448 = { 0 };
 
-static const u8 sPossibleMissionTypes[] = {MISSION_TYPE_FRIEND_RESCUE, MISSION_TYPE_FIND_ITEM, MISSION_TYPE_DELIVER_ITEM, MISSION_TYPE_RESCUE_CLIENT, MISSION_TYPE_RESCUE_TARGET, MISSION_TYPE_DELIVER_ITEM, MISSION_TYPE_FIND_ITEM, MISSION_TYPE_FRIEND_RESCUE};
+EWRAM_INIT unkStruct_203B490 *gUnknown_203B490 = { NULL };
 
-static EWRAM_DATA unkStruct_203B490 sUnknown_2039448 = {0};
-
-EWRAM_INIT unkStruct_203B490 *gUnknown_203B490 = {0};
+static bool8 sub_8095E38(WonderMail *mail, u8 dungeon, u32 floor, u8 param_4);
+static u8 sub_8095F28(u8 param_1);
+static bool8 GenerateMailJobDungeonInfo(WonderMail *mail);
+static bool8 GenerateMailJobInfo(WonderMail *);
+static bool8 sub_8096E80(u8);
+static u8 sub_8095E78(void);
+static bool8 sub_80963B4(void);
+static s32 CalculateMailChecksum(WonderMail *mail);
 
 void LoadMailInfo(void)
 {
@@ -169,7 +172,7 @@ bool8 ValidateWonderMail(WonderMail *data)
     }
 }
 
-bool8 GenerateMailJobInfo(struct WonderMail *mail)
+static bool8 GenerateMailJobInfo(WonderMail *mail)
 {
     s32 missionType;
     s32 i;
@@ -262,7 +265,7 @@ bool8 GenerateMailJobInfo(struct WonderMail *mail)
     return TRUE;
 }
 
-bool8 GenerateMailJobDungeonInfo(WonderMail *mail)
+static bool8 GenerateMailJobDungeonInfo(WonderMail *mail)
 {
   s32 counter;
   s32 floor;
@@ -342,7 +345,7 @@ bool8 GenerateMailJobDungeonInfo(WonderMail *mail)
   } while( TRUE );
 }
 
-bool8 sub_8095E38(WonderMail *mail, u8 dungeon, u32 floor, u8 param_4)
+static bool8 sub_8095E38(WonderMail *mail, u8 dungeon, u32 floor, u8 param_4)
 {
     if (mail->mailType != MAIL_TYPE_NONE) {
         if ((mail->missionType == WONDER_MAIL_MISSION_TYPE_ESCORT_CLIENT) && (param_4 == 1)) {
@@ -357,7 +360,7 @@ bool8 sub_8095E38(WonderMail *mail, u8 dungeon, u32 floor, u8 param_4)
     return FALSE;
 }
 
-u8 sub_8095E78(void)
+static u8 sub_8095E78(void)
 {
   bool8 flag;
   s32 index;
@@ -401,7 +404,7 @@ u8 sub_8095E78(void)
   }
 }
 
-u8 sub_8095F28(u8 param_1)
+static u8 sub_8095F28(u8 param_1)
 {
   s32 itemID;
   s32 counter;
@@ -613,7 +616,8 @@ _0809638E:
         if(GenerateMailJobInfo(slot))
         {
             friendAreaReward = sub_8095E78();
-            if(!sub_803C1D0(&slot->dungeonSeed.location, slot->missionType)) friendAreaReward = FRIEND_AREA_NONE;
+            if (sub_803C1D0(&slot->dungeonSeed.location, slot->missionType) == 0)
+                friendAreaReward = FRIEND_AREA_NONE;
             slot->rewardType = RandRange(MONEY1, END_REWARDS);
             if(slot->rewardType == FRIEND_AREA)
             {
@@ -643,7 +647,7 @@ _08096392:
     return flag;
 }
 
-bool8 sub_80963B4(void)
+static bool8 sub_80963B4(void)
 {
     u8 floor;
     s32 num;
@@ -1257,12 +1261,13 @@ u8 sub_8096E2C(void)
 
     for(index = floor; index < 0x32; index++)
     {
-        if(!gUnknown_203B490->PKMNNewsReceived[index]) return index;
+        if(!gUnknown_203B490->PKMNNewsReceived[index])
+            return index;
     }
     return 0x38;
 }
 
-bool8 sub_8096E80(u8 floor)
+static bool8 sub_8096E80(u8 floor)
 {
     s32 index;
     for(index = 0; index < NUM_MAILBOX_SLOTS; index++)
@@ -1276,7 +1281,7 @@ bool8 sub_8096E80(u8 floor)
     return FALSE;
 }
 
-s32 CalculateMailChecksum(WonderMail *mail)
+static s32 CalculateMailChecksum(WonderMail *mail)
 {
     s32 sum;
 

src/dungeon_8041AD0.c

@@ -10,6 +10,7 @@
 #include "code_800558C.h"
 #include "effect_main.h"
 #include "effect_sub_1.h"
+#include "effect_sub_2.h"
 #include "dungeon_vram.h"
 #include "dungeon_tilemap.h"
 #include "dungeon_mon_sprite_render.h"
@@ -35,13 +36,6 @@
 
 // Unknown dungeon file. File split is correct.
 
-extern void sub_800DBBC(void);
-extern void sub_800EF28(u8);
-extern void sub_800F15C(s32);
-extern void sub_800EF40(u8 r0, u8 r1);
-extern s32 sub_800E6D8(s32);
-extern void sub_800EB24(s32 param_1, DungeonPos *param_2, DungeonPos *param_3, s32 param_4, s32 param_5);
-
 struct UnkStruct_80F6624
 {
     s16 unk0;

src/dungeon_misc.c

@@ -194,7 +194,7 @@ void SetDungeonMonsFromTeam(void)
         if (PokemonExists(pokeStruct) && PokemonIsOnTeam(pokeStruct)) {
             RecruitedPokemonToDungeonMon(&gRecruitedPokemonRef->dungeonTeam[index],recruitedId);
             if (IsLevelResetDungeon(gDungeon->unk644.dungeonLocation.id)) {
-                struct DungeonLocation dungeonLoc = {.id = DUNGEON_TINY_WOODS, .floor = 1};
+                DungeonLocation dungeonLoc = { .id = DUNGEON_TINY_WOODS, .floor = 1 };
                 CreateLevel1Pokemon(&lvl1Mon,pokeStruct->speciesNum,0,0,&dungeonLoc,0);
                 gRecruitedPokemonRef->dungeonTeam[index].level = lvl1Mon.level;
                 gRecruitedPokemonRef->dungeonTeam[index].IQ = lvl1Mon.IQ;

src/dungeon_move.c

@@ -6,6 +6,7 @@
 #include "constants/iq_skill.h"
 #include "constants/status.h"
 #include "constants/weather.h"
+#include "code_8040094_1.h"
 #include "dungeon_move_util.h"
 #include "effect_main.h"
 #include "effect_data.h"
@@ -44,8 +45,6 @@
 #include "warp_target.h"
 #include "dungeon_ai_attack.h"
 
-extern void sub_8041168(Entity *entity, Entity *entity2, Move *,DungeonPos *);
-
 static s32 TryHitTarget_Async(Entity *attacker, Entity *target, Move *move, struct DamageStruct *dmgStruct, s16 unk_);
 
 EWRAM_DATA s32 gUnknown_202F208 = 0;

src/dungeon_move_util.c

@@ -5,6 +5,7 @@
 #include "constants/iq_skill.h"
 #include "constants/status.h"
 #include "constants/weather.h"
+#include "code_8040094_1.h"
 #include "dungeon_move_util.h"
 #include "effect_main.h"
 #include "effect_data.h"
@@ -47,7 +48,6 @@
 extern bool8 sub_8040BB0(Entity *entity, Move *move, bool8);
 extern void sub_8040DA0(Entity *entity, Move *move);
 extern u16 GetEffectiveMoveId(u16 moveId, u8 weather, u8 hasSpecialEffect);
-extern void sub_8041168(Entity *entity, Entity *entity2, Move *,DungeonPos *);
 
 static u8 ToItemID(u32 itemID);
 

src/friend_rescue.c

@@ -29,6 +29,7 @@
 #include "wonder_mail_5.h"
 #include "naming_screen.h"
 #include "code_803C1B4.h"
+#include "code_8031D70.h"
 
 extern void SetFriendRescueMenuState(u32);
 
@@ -579,13 +580,7 @@ void sub_80353BC(void);
 void sub_8035424(void);
 void sub_8035430(void);
 
-extern u32 sub_8031DCC(void);
-extern void sub_8031E00(void);
-extern u32 sub_8039068(u32, u8 *passwordBuffer, unkStruct_203B480 *r0);
-
-extern void sub_8031E10(void);
 extern u8 sub_800D588(void);
-extern bool8 sub_8031D70(u32 mailIndex, s32);
 
 u32 CreateFriendRescueMenu(void)
 {

src/rescue_password_menu.c

@@ -2,6 +2,7 @@
 #include "globaldata.h"
 #include "constants/main_menu.h"
 #include "code_803D0D8.h"
+#include "code_8031D70.h"
 #include "code_8094F88.h"
 #include "dungeon_info.h"
 #include "input.h"
@@ -243,15 +244,9 @@ const MenuItem gUnknown_80E75A0[4] = {
 ALIGNED(4) const u8 sUnknown_80E75C0[] = _("{CENTER_ALIGN}new mail.");
 ALIGNED(4) const u8 sUnknown_80E75CC[] = _("{CENTER_ALIGN}There is no space for receiving");
 
-extern void sub_8031D70(u32, u32);
-extern void sub_8031E10(void);
-extern u32 sub_8031DCC(void);
-extern void sub_8031E00(void);
-
 void DisplayRescuePasswordError(u32 error);
 void sub_8039174(void);
 void DisplayPasswordAcceptScreen(void);
-u32 sub_8039068(u32, u8 *passwordBuffer, unkStruct_203B480 *r0);
 void sub_80391F8(void);
 u32 ConvertMenutoRescuePasswordState(u32);
 

src/save_menu.c

@@ -117,9 +117,6 @@ ALIGNED(4) const u8 gUnknown_80E7178[] = _("{CENTER_ALIGN}The data could not be
 static void sub_8038830(void);
 static void sub_80388C4(void);
 
-extern void sub_8038440(void);
-extern void sub_80140F8(void);
-
 void CreateSaveMenu(s32 currMenu)
 {
   s32 index;

src/thank_you_wonder_mail.c

@@ -6,6 +6,8 @@
 #include "code_801B3C0.h"
 #include "code_801C8C4.h"
 #include "code_802F204.h"
+#include "code_8031D70.h"
+#include "code_803C1B4.h"
 #include "code_8094F88.h"
 #include "cpu.h"
 #include "input.h"
@@ -25,7 +27,6 @@
 #include "wonder_mail_4.h"
 #include "wonder_mail_5.h"
 #include "naming_screen.h"
-#include "code_803C1B4.h"
 
 static EWRAM_INIT WonderMailStruct_203B2C4 *sUnknown_203B2C4 = {NULL};
 
@@ -172,8 +173,6 @@ const MenuItem gUnknown_80DEEE4[] =
 #include "data/thank_you_wonder_mail.h"
 
 
-extern u32 sub_8031DCC(void);
-extern void sub_8031E00(void);
 extern void HandleThankYouMailPelipperMainMenu();
 extern void sub_802AAC8();
 extern void ReturnToThankYouMailMainMenu();
@@ -214,13 +213,10 @@ extern void HandleThankYouMailPasswordMenu();
 extern void sub_802A9FC();
 extern void sub_802A828();
 extern void sub_802A850();
-extern void sub_8031E10();
 extern void SetThankYouMailMenuState(u32);
 extern u8 sub_800D588(void);
-extern void sub_8031D70(u8, u32);
 
 extern void sub_8011C28(u32);
-extern u32 sub_8039068(u32, u8 *r1, unkStruct_203B480 *r0);
 
 
 bool8 CreateThankYouMailPelipper(void)

src/unk_menu_203B360.c

@@ -56,8 +56,7 @@ ALIGNED(4) const u8 StorageEmpty_80E6EE4[] = _("{CENTER_ALIGN}The storage space
 ALIGNED(4) const u8 Caution_80E6F04[] = _("{CENTER_ALIGN}{COLOR RED}Caution!{RESET} ");
 static const u8 fill0[] = "pksdir0";
 
-extern void sub_8038440();
-
+void sub_8038440(void);
 static void sub_80384D0(void);
 
 void sub_80382E4(s32 currMenu)

src/wonder_mail_5.c

@@ -53,10 +53,9 @@ const WindowTemplate gUnknown_80E091C = {
 const u8 gUnknown_80E0934[] = "ID:";
 const u8 gUnknown_80E0938[] = "%-4d";
 
-extern void sub_8030DD4(void);
-
-void sub_8030E2C(void);
-void sub_8030E48(void);
+static void sub_8030DD4(void);
+static void sub_8030E2C(void);
+static void sub_8030E48(void);
 
 bool8 sub_8030D40(u8 mailIndex, s32 windowID)
 {
@@ -86,7 +85,7 @@ u32 sub_8030DA0(void)
   }
 }
 
-void sub_8030DD4(void)
+static void sub_8030DD4(void)
 {
     sub_8030E2C();
     sub_8030E48();
@@ -104,13 +103,13 @@ void sub_8030DE4(void)
   }
 }
 
-void sub_8030E2C(void)
+static void sub_8030E2C(void)
 {
     ResetUnusedInputStruct();
     ShowWindows(&gUnknown_203B324->unk18, TRUE, TRUE);
 }
 
-void sub_8030E48(void)
+static void sub_8030E48(void)
 {
   u16 uVar2;
   unkStruct_203B480 *mail;

src/wonder_mail_6.c

@@ -9,6 +9,7 @@
 #include "text_1.h"
 #include "wonder_mail_4.h"
 #include "wonder_mail_5.h"
+#include "wonder_mail_6.h"
 
 struct unkStruct_203B328
 {
@@ -137,7 +138,7 @@ bool8 sub_8030F58(u32 wonderMailType)
   return TRUE;
 }
 
-s32 sub_8031050(void)
+u32 sub_8031050(void)
 {
     switch(gUnknown_203B328->state)
     {

src/wonder_mail_main_menu.c

@@ -2,15 +2,17 @@
 #include "globaldata.h"
 #include "constants/communication_error_codes.h"
 #include "constants/wonder_mail.h"
-#include "music_util.h"
 #include "code_801B3C0.h"
 #include "code_801C8C4.h"
+#include "code_8031D70.h"
 #include "code_803B050.h"
 #include "code_803D0D8.h"
 #include "code_8094F88.h"
 #include "cpu.h"
 #include "input.h"
 #include "memory.h"
+#include "music_util.h"
+#include "naming_screen.h"
 #include "other_menus2.h"
 #include "save.h"
 #include "save_write.h"
@@ -20,7 +22,6 @@
 #include "wonder_mail_5.h"
 #include "wonder_mail_802D098.h"
 #include "wonder_mail_main_menu.h"
-#include "naming_screen.h"
 
 #define SELECT_WONDER_MAIL_MODE_MAIN_SCREEN 0
 #define SEND_WONDER_MAIL_MAIN_SCREEN 1
@@ -71,7 +72,6 @@ EWRAM_INIT struct unkStruct_203B3E8 *gUnknown_203B3E8 = {NULL};
 #include "data/wonder_mail_main_menu.h"
 
 extern void SetWonderMailMainMenuState(u8);
-extern void sub_8031E10(void);
 extern u8 sub_800D588(void);
 extern void sub_802EF48(void);