4 files changed, 16 insertions, 20 deletions
diff --git a/include/party_menu.h b/include/party_menu.h
index 74ef72519..8b4b592db 100644
--- a/include/party_menu.h
+++ b/include/party_menu.h
@@ -70,6 +70,7 @@ extern u8 ewram[];
 #define ewram1B000_alt (*(struct Struct201B000 *)(ewram + 0x1B000))
 #define EWRAM_1B000 ewram1B000_alt
 
+void sub_806C658(u8 taskId, s8 directionPressed);
 void sub_806AEDC(void);
 void sub_806AF4C(u8 a, u8 battleFlags, TaskFunc func, u8 d);
 void OpenPartyMenu(u8 a, u8 b);
diff --git a/include/pokemon_icon.h b/include/pokemon_icon.h
index 62b3eb438..7e26c1c9b 100644
--- a/include/pokemon_icon.h
+++ b/include/pokemon_icon.h
@@ -1,6 +1,8 @@
 #ifndef GUARD_POKEMON_ICON_H
 #define GUARD_POKEMON_ICON_H
 
+u8 CreateMonIcon(u16 species, void (*callback)(struct Sprite *), s16 x, s16 y, u8 subpriority, u32 personality);
+u8 UpdateMonIconFrame(struct Sprite *sprite);
 u8 sub_809D3A4(u16 arg0, void (*)(struct Sprite *), int, u8 arg3, u32 arg4);
 u16 GetUnownLetterByPersonality(u32);
 u16 sub_809D4A8(u16);
@@ -8,6 +10,7 @@ void sub_809D510(struct Sprite *);
 void sub_809D51C(void);
 void sub_809D580(u16);
 void sub_809D608(u16);
+void sub_809D62C(struct Sprite *sprite);
 void sub_809D824(struct Sprite *sprite, u8 animNum);
 
 #endif // GUARD_POKEMON_ICON_H
diff --git a/src/choose_party.c b/src/choose_party.c
index cd63947a4..ea310b0e3 100644
--- a/src/choose_party.c
+++ b/src/choose_party.c
@@ -47,7 +47,6 @@ extern void PartyMenuPrintMonsLevelOrStatus(void);
 extern void sub_806BC3C(u8, u8);
 extern u8 sub_806B58C(u8);
 extern u8 sub_806B124();
-extern void sub_806C658();
 extern void sub_806AEDC(void);
 extern void sub_806AF4C();
 extern void ShowPokemonSummaryScreen(struct Pokemon *, u8, u8, void (*)(void), int);
diff --git a/src/party_menu.c b/src/party_menu.c
index b84b139bc..bcc5ece9f 100644
--- a/src/party_menu.c
+++ b/src/party_menu.c
@@ -160,6 +160,18 @@ static void sub_806D014(u8 taskId);
 static void sub_806D118(u8 taskId);
 static void sub_806B460(void);
 static void sub_806B548(void);
+static void sub_806BA94(s16 a, u16 b, u8 c, u8 d);
+static void sub_806B9A4(s16 a, u16 b, u8 c);
+static void sub_806CA18(u8 taskId, u8 b);
+static void sub_806C310(u8 spriteId, u8 menuIndex, s8 directionPressed);
+static void sub_806C1E4(u8 spriteId, u8 menuIndex, s8 directionPressed);
+static void sub_806C490(u8 spriteId, u8 menuIndex, s8 directionPressed);
+static void UpdateMonIconFrame_806DA0C(struct Sprite *sprite);
+static void UpdateMonIconFrame_806DA38(struct Sprite *sprite);
+static void UpdateMonIconFrame_806DA44(u8 taskId, u8 monIndex, u8 c);
+static u8 sub_806CA00(u8 taskId);
+static void SpriteCB_sub_806D37C(struct Sprite *sprite);
+static u8 GetMonIconSpriteId_maybe(u8 taskId, u8 monIndex);
 
 #if ENGLISH
 #define WINDOW_LEFT (3)
@@ -169,25 +181,6 @@ static void sub_806B548(void);
 #define WINDOW_RIGHT (29)
 #endif
 
-extern u8 UpdateMonIconFrame(struct Sprite *sprite);
-extern u8 GetMonIconSpriteId_maybe(u8 taskId, u8 monIndex);
-extern u8 CreateMonIcon(u16 species, void (*callback)(struct Sprite *), s16 x, s16 y, u8 subpriority, u32 personality);
-extern void sub_809D62C(struct Sprite *sprite);
-extern void UpdateMonIconFrame_806DA0C(struct Sprite *sprite);
-extern void UpdateMonIconFrame_806DA38(struct Sprite *sprite);
-extern void SpriteCB_sub_806D37C(struct Sprite *sprite);
-extern void sub_806CD44(u8 taskId);
-extern u8 sub_806CA00(u8 taskId);
-extern void sub_806BA34(s16 a, u16 b);
-extern void UpdateMonIconFrame_806DA44(u8 taskId, u8 monIndex, u8 c);
-extern void sub_806C490(u8 spriteId, u8 menuIndex, s8 directionPressed);
-extern void sub_806C1E4(u8 spriteId, u8 menuIndex, s8 directionPressed);
-extern void sub_806C310(u8 spriteId, u8 menuIndex, s8 directionPressed);
-extern void sub_806C658(u8 taskId, s8 directionPressed);
-extern void sub_806CA18(u8 taskId, u8 b);
-extern void sub_806B9A4(s16 a, u16 b, u8 c);
-extern void sub_806BA94(s16 a, u16 b, u8 c, u8 d);
-
 
 #ifdef NONMATCHING
 void sub_806AEDC(void)