diff --git a/include/code_80869E4.h b/include/code_80869E4.h
index c6532bab4..4c7dd7587 100644
--- a/include/code_80869E4.h
+++ b/include/code_80869E4.h
@@ -13,6 +13,7 @@ struct unkStruct_202F3D0
     u8 unk5;
 };
 
+void SpriteLookAroundEffect(Entity *);
 void SpriteShockEffect(Entity *);
 
 void sub_8086448(void);
@@ -29,7 +30,12 @@ void sub_8086794(void);
 void sub_80867F4(void);
 void sub_808680C(void);
 void sub_808682C(void);
-
-void sub_80869E4(struct Entity *, s32, u8, s8);
+void sub_8086838(u8, u8, u8);
+void sub_8086848(u8, u8);
+void sub_8086854(void);
+void sub_80868F4(Entity *);
+void sub_8086910(Entity *);
+void sub_808692C(void);
+void sub_80869E4(Entity *, s32, u8, s8);
 
 #endif // GUARD_CODE_80869E4_H
\ No newline at end of file
diff --git a/src/code_8057824_1.c b/src/code_8057824_1.c
index 54599929f..5d04f776b 100644
--- a/src/code_8057824_1.c
+++ b/src/code_8057824_1.c
@@ -321,7 +321,6 @@ extern void sub_8068FE0(Entity *, u32, u32);
 
 extern void sub_803E708(u32, u32);
 extern void sub_8086448(void);
-extern void SpriteLookAroundEffect(Entity *);
 extern void PlaySoundEffect(u32);
 extern void IncreaseEntityPixelPos(Entity *, u32, u32);
 extern void sub_8042B0C(Entity *);
@@ -393,13 +392,8 @@ extern void sub_808B1CC(u8);
 extern void sub_80464C8(Entity *, u32 *, Item *);
 extern void SetDungeonBGColorRGB(u32, u32, u32, u32, u32);
 extern void sub_803E46C(u32);
-extern void sub_808692C();
 
-extern void sub_80868F4();
-extern void sub_8086910();
 extern u32 sub_8085EC8(u32, u32, u32, Position *, u32);
-extern void sub_8086854();
-extern void sub_8086838(u32, u32, u32);
 extern void sub_80426C8(u32, u32);
 extern void sub_807EAA0(u32, u32);
 
@@ -433,7 +427,6 @@ extern u8 sub_8086AE4(u32);
 extern void sub_8072008(Entity *, Entity *, s16, u32, u32);
 extern void sub_8085374();
 
-extern void sub_8086848(u32 ,u32);
 extern void sub_80856C8(Entity *, s32, s32);
 extern void sub_8086A54(Entity *);
 
diff --git a/src/code_80869E4.c b/src/code_80869E4.c
index f54c31db7..bdcb85c2c 100644
--- a/src/code_80869E4.c
+++ b/src/code_80869E4.c
@@ -10,6 +10,7 @@
 
 // ???
 extern u32 gUnknown_202EDC8;
+
 EWRAM_DATA struct unkStruct_202F3D0 gUnknown_202F3D0;
 
 // data_8107010.s
@@ -21,7 +22,6 @@ extern void sub_803E46C(u32);
 extern void sub_803E9D0(void);
 extern void SetDungeonBGColorRGB(u32, u32, u32, u32, u32);
 extern void PlaySoundEffect(u32);
-void SpriteLookAroundEffect(Entity *entity);
 extern void DisplayDungeonDialogue(const u8 *);
 
 
@@ -384,18 +384,6 @@ void sub_808682C(void)
     gUnknown_202F3D0.unk0 = 0;
 }
 
-
-
-
-
-
-
-// CONTINUE HEREEEEEEEEEE FOR THE HHHHHHHHHH :)
-
-
-
-
-
 void sub_8086838(u8 entity, u8 r1, u8 r2)
 {
     gUnknown_202F3D0.unk1 = entity;
@@ -489,7 +477,7 @@ void SpriteLookAroundEffect(Entity *entity)
 }
 
 #ifdef NONMATCHING // 100% match, but params for sub_8002A70 are disputed... https://decomp.me/scratch/E3iF1
-void sub_80869E4(struct Entity *a0, s32 a1, u8 a2, s8 a3)
+void sub_80869E4(Entity *a0, s32 a1, u8 a2, s8 a3)
 {
     u32 r4;
     s8 *r5;
@@ -509,7 +497,7 @@ void sub_80869E4(struct Entity *a0, s32 a1, u8 a2, s8 a3)
 }
 #else
 NAKED
-void sub_80869E4(struct Entity *a0, s32 a1, u8 a2, s8 a3)
+void sub_80869E4(Entity *a0, s32 a1, u8 a2, s8 a3)
 {
     asm_unified(
     "push {r4-r7,lr}\n"
diff --git a/src/code_8086A3C.c b/src/code_8086A3C.c
index e670c05a9..c7b17fea0 100644
--- a/src/code_8086A3C.c
+++ b/src/code_8086A3C.c
@@ -23,7 +23,6 @@ extern void DisplayDungeonDialogue(const u8 *);
 extern void sub_803E708(u32, u32);
 extern void sub_8086448(void);
 extern void SkarmoryEntry(Entity *);
-extern void SpriteLookAroundEffect(Entity *);
 extern void sub_8086A54(Entity *);
 extern void sub_808563C(void *);
 extern void sub_8087144();