diff --git a/include/dungeon_misc.h b/include/dungeon_misc.h
index 4b5b018d8..8c6a3eb0d 100644
--- a/include/dungeon_misc.h
+++ b/include/dungeon_misc.h
@@ -70,8 +70,7 @@ void sub_806A898(Entity *entity, bool8 r7, bool8 showRunAwayEffect);
 void sub_806A914(bool8 a0, bool8 a1, bool8 showRunAwayEffect);
 void sub_806A974(void);
 void sub_806A9B4(Entity *entity, s32 moveIndex);
-// s16 memes
-//bool8 sub_806AA0C(s16 _species, bool32 _a1);
+bool8 sub_806AA0C(s32 _species, bool32 _a1);
 void sub_806AA70(void);
 void sub_806AB2C(void);
 void EndAbilityImmuneStatus(Entity *attacker, Entity *target);
diff --git a/include/weather.h b/include/weather.h
index d7694cc2f..05ae88a38 100644
--- a/include/weather.h
+++ b/include/weather.h
@@ -5,5 +5,11 @@
 
 u8 GetApparentWeather(Entity *pokemon);
 void sub_807E5E4(u8 weather);
+void sub_807E7FC(bool8 r0);
+void sub_807E88C(void);
+void sub_807E8F0(Entity *pokemon);
+void GetWeatherName(u8 *buffer, u8 weather);
+void MudWaterSportEffect(u8 which);
+bool8 sub_807EAA0(bool8 arg0, bool8 arg1);
 
 #endif
diff --git a/src/code_8069E0C.c b/src/code_8069E0C.c
index 964c15ff0..75552de8b 100644
--- a/src/code_8069E0C.c
+++ b/src/code_8069E0C.c
@@ -58,7 +58,6 @@ extern void EntityUpdateStatusSprites(Entity *);
 extern Entity *sub_80696A8(Entity *a0);
 extern s32 GetMonsterApparentID(Entity *pokemon, s32 _id);
 extern void sub_806A898(Entity *entity, bool8 r7, bool8 showRunAwayEffect);
-extern bool8 sub_806AA0C(s16 _species, bool32 _a1);
 extern void sub_806A6E8(Entity *entity);
 
 s32 sub_806C444(s32 species, s32 level);
diff --git a/src/code_8073CF0.c b/src/code_8073CF0.c
index ef8b165e3..560800e76 100644
--- a/src/code_8073CF0.c
+++ b/src/code_8073CF0.c
@@ -33,10 +33,9 @@
 #include "dungeon_engine.h"
 #include "dungeon_damage.h"
 #include "dungeon_range.h"
+#include "warp_target.h"
 
 extern void sub_805229C(void);
-extern void sub_807E8F0(Entity *);
-extern void WarpTarget(Entity *pokemon, Entity *r1, u32 r2, DungeonPos *r3);
 extern void sub_80420B8(Entity *pokemon);
 extern void sub_8041C4C(Entity *pokemon, u32 r1);
 extern void sub_805E804(void);
diff --git a/src/code_8075708.c b/src/code_8075708.c
index 68640334f..c15f53071 100644
--- a/src/code_8075708.c
+++ b/src/code_8075708.c
@@ -44,12 +44,11 @@
 #include "dungeon_kecleon_shop.h"
 #include "dungeon_misc.h"
 #include "dungeon_pos_data.h"
+#include "warp_target.h"
 
 extern void sub_8073D14(Entity *);
 extern void sub_8075708(Entity *entity);
 extern void sub_805229C(void);
-extern void sub_807E8F0(Entity *);
-extern void WarpTarget(Entity *pokemon, Entity *r1, u32 r2, DungeonPos *r3);
 extern void sub_80420B8(Entity *pokemon);
 extern void sub_8041C4C(Entity *pokemon, u32 r1);
 extern void sub_805E804(void);
diff --git a/src/code_8077274_1.c b/src/code_8077274_1.c
index 032329298..86f758dc1 100644
--- a/src/code_8077274_1.c
+++ b/src/code_8077274_1.c
@@ -26,9 +26,9 @@
 #include "dungeon_config.h"
 #include "dungeon_logic.h"
 #include "dungeon_strings.h"
+#include "dungeon_spawns.h"
+#include "dungeon_misc.h"
 
-extern bool8 sub_806AA0C(s32, u32);
-extern s16 GetRandomFloorMonsterId(u32);
 extern void sub_804178C(u32);
 
 void sub_807AA30(void)
diff --git a/src/dungeon_8071B48.c b/src/dungeon_8071B48.c
index 660c6c6fe..1a3166267 100644
--- a/src/dungeon_8071B48.c
+++ b/src/dungeon_8071B48.c
@@ -17,9 +17,9 @@
 #include "dungeon_logic.h"
 #include "dungeon_spawns.h"
 #include "dungeon_strings.h"
+#include "dungeon_misc.h"
 
 extern void sub_8042920(struct Entity *r0);
-extern bool8 sub_806AA0C(s32, u32);
 
 void sub_8071B48(void)
 {
diff --git a/src/dungeon_cutscene_articuno.c b/src/dungeon_cutscene_articuno.c
index 70547f154..e15b07520 100644
--- a/src/dungeon_cutscene_articuno.c
+++ b/src/dungeon_cutscene_articuno.c
@@ -31,6 +31,7 @@
 #include "math.h"
 #include "dungeon_config.h"
 #include "dungeon_boss_dialogue.h"
+#include "weather.h"
 
 extern void sub_8042B0C(Entity *);
 extern u8 sub_806FD18(Entity *);
@@ -48,7 +49,6 @@ extern void sub_8052D44(s16 *, Entity *, Entity *);
 extern void SpawnDroppedItemWrapper(Entity *, DungeonPos *, Item *);
 extern void SetDungeonBGColorRGB(u32, u32, u32, u32, u32);
 extern u32 sub_8085EC8(u32, u32, u32, DungeonPos *, u32);
-extern void sub_807EAA0(u32, u32);
 extern void sub_8072008(Entity *, Entity *, s16, u32, u32);
 extern void sub_8085374(void);
 extern bool8 sub_8085B80(struct_8085B80 *);
diff --git a/src/dungeon_cutscene_celebi.c b/src/dungeon_cutscene_celebi.c
index 920435672..8ca2cb50b 100644
--- a/src/dungeon_cutscene_celebi.c
+++ b/src/dungeon_cutscene_celebi.c
@@ -32,6 +32,7 @@
 #include "dungeon_config.h"
 #include "dungeon_boss_dialogue.h"
 #include "dungeon_tilemap.h"
+#include "weather.h"
 
 extern void sub_8042B0C(Entity *);
 extern u8 sub_806FD18(Entity *);
@@ -49,7 +50,6 @@ extern void sub_8052D44(s16 *, Entity *, Entity *);
 extern void SpawnDroppedItemWrapper(Entity *, DungeonPos *, Item *);
 extern void SetDungeonBGColorRGB(u32, u32, u32, u32, u32);
 extern u32 sub_8085EC8(u32, u32, u32, DungeonPos *, u32);
-extern void sub_807EAA0(u32, u32);
 extern void sub_8072008(Entity *, Entity *, s16, u32, u32);
 extern void sub_8085374(void);
 extern bool8 sub_8085B80(struct_8085B80 *);
diff --git a/src/dungeon_cutscene_deoxys.c b/src/dungeon_cutscene_deoxys.c
index 4aa86db95..219445b62 100644
--- a/src/dungeon_cutscene_deoxys.c
+++ b/src/dungeon_cutscene_deoxys.c
@@ -49,7 +49,6 @@ extern void sub_8052D44(s16 *, Entity *, Entity *);
 extern void SpawnDroppedItemWrapper(Entity *, DungeonPos *, Item *);
 extern void SetDungeonBGColorRGB(u32, u32, u32, u32, u32);
 extern u32 sub_8085EC8(u32, u32, u32, DungeonPos *, u32);
-extern void sub_807EAA0(u32, u32);
 extern void sub_8072008(Entity *, Entity *, s16, u32, u32);
 extern void sub_8085374(void);
 extern bool8 sub_8085B80(struct_8085B80 *);
diff --git a/src/dungeon_cutscene_entei.c b/src/dungeon_cutscene_entei.c
index 0c44e4cf9..b84d47776 100644
--- a/src/dungeon_cutscene_entei.c
+++ b/src/dungeon_cutscene_entei.c
@@ -48,7 +48,6 @@ extern void sub_8052D44(s16 *, Entity *, Entity *);
 extern void SpawnDroppedItemWrapper(Entity *, DungeonPos *, Item *);
 extern void SetDungeonBGColorRGB(u32, u32, u32, u32, u32);
 extern u32 sub_8085EC8(u32, u32, u32, DungeonPos *, u32);
-extern void sub_807EAA0(u32, u32);
 extern void sub_8072008(Entity *, Entity *, s16, u32, u32);
 extern void sub_8085374(void);
 extern bool8 sub_8085B80(struct_8085B80 *);
diff --git a/src/dungeon_cutscene_groudon.c b/src/dungeon_cutscene_groudon.c
index 66120b804..95d9813b7 100644
--- a/src/dungeon_cutscene_groudon.c
+++ b/src/dungeon_cutscene_groudon.c
@@ -49,7 +49,6 @@ extern void sub_8052D44(s16 *, Entity *, Entity *);
 extern void SpawnDroppedItemWrapper(Entity *, DungeonPos *, Item *);
 extern void SetDungeonBGColorRGB(u32, u32, u32, u32, u32);
 extern u32 sub_8085EC8(u32, u32, u32, DungeonPos *, u32);
-extern void sub_807EAA0(u32, u32);
 extern void sub_8072008(Entity *, Entity *, s16, u32, u32);
 extern void sub_8085374(void);
 extern bool8 sub_8085B80(struct_8085B80 *);
diff --git a/src/dungeon_cutscene_hooh.c b/src/dungeon_cutscene_hooh.c
index 2e6b99fe4..40fc9be96 100644
--- a/src/dungeon_cutscene_hooh.c
+++ b/src/dungeon_cutscene_hooh.c
@@ -48,7 +48,6 @@ extern void sub_8052D44(s16 *, Entity *, Entity *);
 extern void SpawnDroppedItemWrapper(Entity *, DungeonPos *, Item *);
 extern void SetDungeonBGColorRGB(u32, u32, u32, u32, u32);
 extern u32 sub_8085EC8(u32, u32, u32, DungeonPos *, u32);
-extern void sub_807EAA0(u32, u32);
 extern void sub_8072008(Entity *, Entity *, s16, u32, u32);
 extern void sub_8085374(void);
 extern bool8 sub_8085B80(struct_8085B80 *);
diff --git a/src/dungeon_cutscene_jirachi.c b/src/dungeon_cutscene_jirachi.c
index 74843d22b..02f16b8f5 100644
--- a/src/dungeon_cutscene_jirachi.c
+++ b/src/dungeon_cutscene_jirachi.c
@@ -50,7 +50,6 @@ extern void sub_8052D44(s16 *, Entity *, Entity *);
 extern void SpawnDroppedItemWrapper(Entity *, DungeonPos *, Item *);
 extern void SetDungeonBGColorRGB(u32, u32, u32, u32, u32);
 extern u32 sub_8085EC8(u32, u32, u32, DungeonPos *, u32);
-extern void sub_807EAA0(u32, u32);
 extern void sub_8072008(Entity *, Entity *, s16, u32, u32);
 extern void sub_8085374(void);
 extern bool8 sub_8085B80(struct_8085B80 *);
diff --git a/src/dungeon_cutscene_kyogre.c b/src/dungeon_cutscene_kyogre.c
index f44c38974..b76ed58a2 100644
--- a/src/dungeon_cutscene_kyogre.c
+++ b/src/dungeon_cutscene_kyogre.c
@@ -50,7 +50,6 @@ extern void sub_8052D44(s16 *, Entity *, Entity *);
 extern void SpawnDroppedItemWrapper(Entity *, DungeonPos *, Item *);
 extern void SetDungeonBGColorRGB(u32, u32, u32, u32, u32);
 extern u32 sub_8085EC8(u32, u32, u32, DungeonPos *, u32);
-extern void sub_807EAA0(u32, u32);
 extern void sub_8072008(Entity *, Entity *, s16, u32, u32);
 extern void sub_8085374(void);
 extern bool8 sub_8085B80(struct_8085B80 *);
diff --git a/src/dungeon_cutscene_latios.c b/src/dungeon_cutscene_latios.c
index d300737d9..7b641c81b 100644
--- a/src/dungeon_cutscene_latios.c
+++ b/src/dungeon_cutscene_latios.c
@@ -49,7 +49,6 @@ extern void sub_8052D44(s16 *, Entity *, Entity *);
 extern void SpawnDroppedItemWrapper(Entity *, DungeonPos *, Item *);
 extern void SetDungeonBGColorRGB(u32, u32, u32, u32, u32);
 extern u32 sub_8085EC8(u32, u32, u32, DungeonPos *, u32);
-extern void sub_807EAA0(u32, u32);
 extern void sub_8072008(Entity *, Entity *, s16, u32, u32);
 extern void sub_8085374(void);
 extern bool8 sub_8085B80(struct_8085B80 *);
diff --git a/src/dungeon_cutscene_lugia.c b/src/dungeon_cutscene_lugia.c
index cc78c342f..ba1d79fa4 100644
--- a/src/dungeon_cutscene_lugia.c
+++ b/src/dungeon_cutscene_lugia.c
@@ -49,7 +49,6 @@ extern void sub_8052D44(s16 *, Entity *, Entity *);
 extern void SpawnDroppedItemWrapper(Entity *, DungeonPos *, Item *);
 extern void SetDungeonBGColorRGB(u32, u32, u32, u32, u32);
 extern u32 sub_8085EC8(u32, u32, u32, DungeonPos *, u32);
-extern void sub_807EAA0(u32, u32);
 extern void sub_8072008(Entity *, Entity *, s16, u32, u32);
 extern void sub_8085374(void);
 extern bool8 sub_8085B80(struct_8085B80 *);
diff --git a/src/dungeon_cutscene_magma_cavern.c b/src/dungeon_cutscene_magma_cavern.c
index c23709bc5..d0603af01 100644
--- a/src/dungeon_cutscene_magma_cavern.c
+++ b/src/dungeon_cutscene_magma_cavern.c
@@ -48,7 +48,6 @@ extern void sub_8052D44(s16 *, Entity *, Entity *);
 extern void SpawnDroppedItemWrapper(Entity *, DungeonPos *, Item *);
 extern void SetDungeonBGColorRGB(u32, u32, u32, u32, u32);
 extern u32 sub_8085EC8(u32, u32, u32, DungeonPos *, u32);
-extern void sub_807EAA0(u32, u32);
 extern void sub_8072008(Entity *, Entity *, s16, u32, u32);
 extern void sub_8085374(void);
 extern bool8 sub_8085B80(struct_8085B80 *);
diff --git a/src/dungeon_cutscene_mankey.c b/src/dungeon_cutscene_mankey.c
index 41857f52c..89b6d9432 100644
--- a/src/dungeon_cutscene_mankey.c
+++ b/src/dungeon_cutscene_mankey.c
@@ -48,7 +48,6 @@ extern void sub_8052D44(s16 *, Entity *, Entity *);
 extern void SpawnDroppedItemWrapper(Entity *, DungeonPos *, Item *);
 extern void SetDungeonBGColorRGB(u32, u32, u32, u32, u32);
 extern u32 sub_8085EC8(u32, u32, u32, DungeonPos *, u32);
-extern void sub_807EAA0(u32, u32);
 extern void sub_8072008(Entity *, Entity *, s16, u32, u32);
 extern void sub_8085374(void);
 extern bool8 sub_8085B80(struct_8085B80 *);
diff --git a/src/dungeon_cutscene_meanies.c b/src/dungeon_cutscene_meanies.c
index eb229fc94..4a37a5ebd 100644
--- a/src/dungeon_cutscene_meanies.c
+++ b/src/dungeon_cutscene_meanies.c
@@ -48,7 +48,6 @@ extern void sub_8052D44(s16 *, Entity *, Entity *);
 extern void SpawnDroppedItemWrapper(Entity *, DungeonPos *, Item *);
 extern void SetDungeonBGColorRGB(u32, u32, u32, u32, u32);
 extern u32 sub_8085EC8(u32, u32, u32, DungeonPos *, u32);
-extern void sub_807EAA0(u32, u32);
 extern void sub_8072008(Entity *, Entity *, s16, u32, u32);
 extern void sub_8085374(void);
 extern bool8 sub_8085B80(struct_8085B80 *);
diff --git a/src/dungeon_cutscene_medicham.c b/src/dungeon_cutscene_medicham.c
index 475b2362e..59b38b553 100644
--- a/src/dungeon_cutscene_medicham.c
+++ b/src/dungeon_cutscene_medicham.c
@@ -48,7 +48,6 @@ extern void sub_8052D44(s16 *, Entity *, Entity *);
 extern void SpawnDroppedItemWrapper(Entity *, DungeonPos *, Item *);
 extern void SetDungeonBGColorRGB(u32, u32, u32, u32, u32);
 extern u32 sub_8085EC8(u32, u32, u32, DungeonPos *, u32);
-extern void sub_807EAA0(u32, u32);
 extern void sub_8072008(Entity *, Entity *, s16, u32, u32);
 extern void sub_8085374(void);
 extern bool8 sub_8085B80(struct_8085B80 *);
diff --git a/src/dungeon_cutscene_mewtwo.c b/src/dungeon_cutscene_mewtwo.c
index 9543f7513..cc8cd8130 100644
--- a/src/dungeon_cutscene_mewtwo.c
+++ b/src/dungeon_cutscene_mewtwo.c
@@ -48,7 +48,6 @@ extern void sub_8052D44(s16 *, Entity *, Entity *);
 extern void SpawnDroppedItemWrapper(Entity *, DungeonPos *, Item *);
 extern void SetDungeonBGColorRGB(u32, u32, u32, u32, u32);
 extern u32 sub_8085EC8(u32, u32, u32, DungeonPos *, u32);
-extern void sub_807EAA0(u32, u32);
 extern void sub_8072008(Entity *, Entity *, s16, u32, u32);
 extern void sub_8085374(void);
 extern bool8 sub_8085B80(struct_8085B80 *);
diff --git a/src/dungeon_cutscene_moltres.c b/src/dungeon_cutscene_moltres.c
index d38a2642c..1833db773 100644
--- a/src/dungeon_cutscene_moltres.c
+++ b/src/dungeon_cutscene_moltres.c
@@ -49,7 +49,6 @@ extern void sub_8052D44(s16 *, Entity *, Entity *);
 extern void SpawnDroppedItemWrapper(Entity *, DungeonPos *, Item *);
 extern void SetDungeonBGColorRGB(u32, u32, u32, u32, u32);
 extern u32 sub_8085EC8(u32, u32, u32, DungeonPos *, u32);
-extern void sub_807EAA0(u32, u32);
 extern void sub_8072008(Entity *, Entity *, s16, u32, u32);
 extern void sub_8085374(void);
 extern bool8 sub_8085B80(struct_8085B80 *);
diff --git a/src/dungeon_cutscene_raikou.c b/src/dungeon_cutscene_raikou.c
index 495a42081..7df79ba1d 100644
--- a/src/dungeon_cutscene_raikou.c
+++ b/src/dungeon_cutscene_raikou.c
@@ -31,6 +31,7 @@
 #include "math.h"
 #include "dungeon_config.h"
 #include "dungeon_boss_dialogue.h"
+#include "weather.h"
 
 extern void sub_8042B0C(Entity *);
 extern u8 sub_806FD18(Entity *);
@@ -48,7 +49,6 @@ extern void sub_8052D44(s16 *, Entity *, Entity *);
 extern void SpawnDroppedItemWrapper(Entity *, DungeonPos *, Item *);
 extern void SetDungeonBGColorRGB(u32, u32, u32, u32, u32);
 extern u32 sub_8085EC8(u32, u32, u32, DungeonPos *, u32);
-extern void sub_807EAA0(u32, u32);
 extern void sub_8072008(Entity *, Entity *, s16, u32, u32);
 extern void sub_8085374(void);
 extern bool8 sub_8085B80(struct_8085B80 *);
diff --git a/src/dungeon_cutscene_rayquaza.c b/src/dungeon_cutscene_rayquaza.c
index 1a07b1c3c..e3738b132 100644
--- a/src/dungeon_cutscene_rayquaza.c
+++ b/src/dungeon_cutscene_rayquaza.c
@@ -48,7 +48,6 @@ extern void sub_8052D44(s16 *, Entity *, Entity *);
 extern void SpawnDroppedItemWrapper(Entity *, DungeonPos *, Item *);
 extern void SetDungeonBGColorRGB(u32, u32, u32, u32, u32);
 extern u32 sub_8085EC8(u32, u32, u32, DungeonPos *, u32);
-extern void sub_807EAA0(u32, u32);
 extern void sub_8072008(Entity *, Entity *, s16, u32, u32);
 extern void sub_8085374(void);
 extern bool8 sub_8085B80(struct_8085B80 *);
diff --git a/src/dungeon_cutscene_regis.c b/src/dungeon_cutscene_regis.c
index 3cbd5f120..9a6739b07 100644
--- a/src/dungeon_cutscene_regis.c
+++ b/src/dungeon_cutscene_regis.c
@@ -48,7 +48,6 @@ extern void sub_8052D44(s16 *, Entity *, Entity *);
 extern void SpawnDroppedItemWrapper(Entity *, DungeonPos *, Item *);
 extern void SetDungeonBGColorRGB(u32, u32, u32, u32, u32);
 extern u32 sub_8085EC8(u32, u32, u32, DungeonPos *, u32);
-extern void sub_807EAA0(u32, u32);
 extern void sub_8072008(Entity *, Entity *, s16, u32, u32);
 extern void sub_8085374(void);
 extern bool8 sub_8085B80(struct_8085B80 *);
diff --git a/src/dungeon_cutscene_skarmory.c b/src/dungeon_cutscene_skarmory.c
index e7e8e8046..6db25e49a 100644
--- a/src/dungeon_cutscene_skarmory.c
+++ b/src/dungeon_cutscene_skarmory.c
@@ -48,7 +48,6 @@ extern void sub_8052D44(s16 *, Entity *, Entity *);
 extern void SpawnDroppedItemWrapper(Entity *, DungeonPos *, Item *);
 extern void SetDungeonBGColorRGB(u32, u32, u32, u32, u32);
 extern u32 sub_8085EC8(u32, u32, u32, DungeonPos *, u32);
-extern void sub_807EAA0(u32, u32);
 extern void sub_8072008(Entity *, Entity *, s16, u32, u32);
 extern void sub_8085374(void);
 extern bool8 sub_8085B80(struct_8085B80 *);
diff --git a/src/dungeon_cutscene_smeargle.c b/src/dungeon_cutscene_smeargle.c
index 17cd1c8ad..f6b8be1e6 100644
--- a/src/dungeon_cutscene_smeargle.c
+++ b/src/dungeon_cutscene_smeargle.c
@@ -48,7 +48,6 @@ extern void sub_8052D44(s16 *, Entity *, Entity *);
 extern void SpawnDroppedItemWrapper(Entity *, DungeonPos *, Item *);
 extern void SetDungeonBGColorRGB(u32, u32, u32, u32, u32);
 extern u32 sub_8085EC8(u32, u32, u32, DungeonPos *, u32);
-extern void sub_807EAA0(u32, u32);
 extern void sub_8072008(Entity *, Entity *, s16, u32, u32);
 extern void sub_8085374(void);
 extern bool8 sub_8085B80(struct_8085B80 *);
diff --git a/src/dungeon_cutscene_suicune.c b/src/dungeon_cutscene_suicune.c
index aa8eb1b60..b963593fd 100644
--- a/src/dungeon_cutscene_suicune.c
+++ b/src/dungeon_cutscene_suicune.c
@@ -48,7 +48,6 @@ extern void sub_8052D44(s16 *, Entity *, Entity *);
 extern void SpawnDroppedItemWrapper(Entity *, DungeonPos *, Item *);
 extern void SetDungeonBGColorRGB(u32, u32, u32, u32, u32);
 extern u32 sub_8085EC8(u32, u32, u32, DungeonPos *, u32);
-extern void sub_807EAA0(u32, u32);
 extern void sub_8072008(Entity *, Entity *, s16, u32, u32);
 extern void sub_8085374(void);
 extern bool8 sub_8085B80(struct_8085B80 *);
diff --git a/src/dungeon_cutscene_zapdos.c b/src/dungeon_cutscene_zapdos.c
index cd4e3ec50..0c9b8e9c7 100644
--- a/src/dungeon_cutscene_zapdos.c
+++ b/src/dungeon_cutscene_zapdos.c
@@ -48,7 +48,6 @@ extern void sub_8052D44(s16 *, Entity *, Entity *);
 extern void SpawnDroppedItemWrapper(Entity *, DungeonPos *, Item *);
 extern void SetDungeonBGColorRGB(u32, u32, u32, u32, u32);
 extern u32 sub_8085EC8(u32, u32, u32, DungeonPos *, u32);
-extern void sub_807EAA0(u32, u32);
 extern void sub_8072008(Entity *, Entity *, s16, u32, u32);
 extern void sub_8085374(void);
 extern bool8 sub_8085B80(struct_8085B80 *);
diff --git a/src/dungeon_engine.c b/src/dungeon_engine.c
index 59c3532a0..864856c37 100644
--- a/src/dungeon_engine.c
+++ b/src/dungeon_engine.c
@@ -13,6 +13,7 @@
 #include "constants/ability.h"
 #include "dungeon_logic.h"
 #include "menu_input.h"
+#include "weather.h"
 
 extern void sub_807E378(void);
 extern u8 DisplayActions(u32);
@@ -24,7 +25,6 @@ extern void DungeonHandlePlayerInput(void);
 extern void sub_805F02C(void);
 extern void sub_8074094(Entity *);
 extern void sub_8071B48(void);
-extern void sub_807EAA0(u32, u32);
 
 static void sub_8044454(void);
 static bool8 RunLeaderTurn(bool8);
diff --git a/src/dungeon_main.c b/src/dungeon_main.c
index a898ddcde..693aa5f16 100644
--- a/src/dungeon_main.c
+++ b/src/dungeon_main.c
@@ -84,7 +84,6 @@ void sub_806752C(ActionContainer *a0);
 void sub_8067768(ActionContainer *a0);
 void ChangeDungeonCameraPos(DungeonPos *pos, s32 a1, u8 a2, u8 a3);
 extern bool8 sub_8071A8C(Entity *pokemon);
-extern void GetWeatherName(u8 *dst, u8 weatherId);
 extern bool8 sub_8070F14(Entity * pokemon, s32 direction);
 extern Entity *sub_80696A8(Entity *a0);
 extern void sub_8041AD0(Entity *pokemon);
diff --git a/src/dungeon_misc.c b/src/dungeon_misc.c
index d5a663813..17c819c75 100644
--- a/src/dungeon_misc.c
+++ b/src/dungeon_misc.c
@@ -1649,11 +1649,11 @@ void sub_806A9B4(Entity *entity, s32 moveIndex)
 }
 
 // s16 again...
-bool8 sub_806AA0C(s16 _species, bool32 _a1)
+bool8 sub_806AA0C(s32 _species, bool32 _a1)
 {
-    s32 species = _species;
+    s32 species = (s16) _species;
     bool8 a1 = _a1;
-    if (!IsExclusivePokemonUnlocked(_species))
+    if (!IsExclusivePokemonUnlocked(species))
         return FALSE;
 
     if (gDungeon->unk37FD && GetBaseSpecies(species) == MONSTER_DEOXYS_NORMAL)
diff --git a/src/move_orb_actions_1.c b/src/move_orb_actions_1.c
index 3fff374d7..2d4ae52b7 100644
--- a/src/move_orb_actions_1.c
+++ b/src/move_orb_actions_1.c
@@ -34,10 +34,6 @@
 #include "dungeon_damage.h"
 #include "move_util.h"
 
-extern void sub_806A5B8(Entity *entity);
-void sub_8075900(Entity *pokemon, u8 r1);
-extern u8 sub_807EAA0(u32, u32);
-
 // Note: For some reason I have to define these as an array of 1 to match asm.
 const s32 gUnknown_8106A4C[1] = {0};
 const s32 gUnknown_8106A50[1] = {1};
diff --git a/src/move_orb_actions_2.c b/src/move_orb_actions_2.c
index fefa8d08b..49afe60ae 100644
--- a/src/move_orb_actions_2.c
+++ b/src/move_orb_actions_2.c
@@ -38,7 +38,6 @@
 
 extern void EndAbilityImmuneStatus(Entity *, Entity *);
 extern void nullsub_92(Entity *);
-extern u8 sub_807EAA0(u32, u32);
 
 extern u32 gUnknown_8106A4C;
 extern u32 gUnknown_8106A50;
diff --git a/src/move_orb_actions_3.c b/src/move_orb_actions_3.c
index 9d7f194de..82594ac31 100644
--- a/src/move_orb_actions_3.c
+++ b/src/move_orb_actions_3.c
@@ -45,9 +45,7 @@
 #include "warp_target.h"
 
 static void sub_805A7D4(Entity *, Entity *, Item *, DungeonPos *);
-extern void MudWaterSportEffect(u32);
 extern void sub_806A6E8(Entity *);
-extern u8 sub_807EAA0(u32, u32);
 
 extern u32 gUnknown_8106A4C;
 extern u32 gUnknown_8106A50;
diff --git a/src/move_orb_actions_4.c b/src/move_orb_actions_4.c
index 8c1eff02b..5e910ea8a 100644
--- a/src/move_orb_actions_4.c
+++ b/src/move_orb_actions_4.c
@@ -46,7 +46,6 @@
 #include "trawl_orb.h"
 
 extern void UpdateMinimap(void);
-extern bool8 sub_806AA0C(s32, u32);
 extern void sub_806BB6C(Entity *, s32);
 
 extern u32 gUnknown_8106A50;
diff --git a/src/move_orb_effects_2.c b/src/move_orb_effects_2.c
index 4f4d9f0af..dd2072150 100644
--- a/src/move_orb_effects_2.c
+++ b/src/move_orb_effects_2.c
@@ -87,7 +87,6 @@ extern void nullsub_87(Entity *);
 extern void nullsub_86(Entity *);
 extern void sub_8041E0C(Entity *);
 extern void sub_8041DD8(Entity *r0, s32 r1); // NOTE: is s16 in another file
-extern bool8 sub_806AA0C(s32, u32);
 extern void UpdateMinimap(void);
 extern void sub_8041D9C(Entity *);
 extern void sub_8041DB0(Entity *pokemon);
diff --git a/src/move_orb_effects_4.c b/src/move_orb_effects_4.c
index fb641d637..49bc88ab6 100644
--- a/src/move_orb_effects_4.c
+++ b/src/move_orb_effects_4.c
@@ -57,14 +57,12 @@ extern void sub_8041E74(Entity *);
 extern void sub_8041E60(Entity *);
 extern void sub_8041E4C(Entity *);
 extern void sub_8041E3C(Entity *);
-extern void UpdateCamera(u32);
 extern void sub_8041E1C(Entity *);
 extern void nullsub_89(Entity *);
 extern void nullsub_88(Entity *);
 extern void nullsub_87(Entity *);
 extern void nullsub_86(Entity *);
 extern void sub_8041E0C(Entity *);
-extern bool8 sub_806AA0C(s32, u32);
 
 void CounterStatusTarget(Entity * pokemon, Entity * target, u8 newStatus)
 {
diff --git a/src/move_orb_effects_5.c b/src/move_orb_effects_5.c
index 1f9a824ef..d7babb00e 100644
--- a/src/move_orb_effects_5.c
+++ b/src/move_orb_effects_5.c
@@ -60,14 +60,12 @@ extern void sub_8041E74(Entity *);
 extern void sub_8041E60(Entity *);
 extern void sub_8041E4C(Entity *);
 extern void sub_8041E3C(Entity *);
-extern void UpdateCamera(u32);
 extern void sub_8041E1C(Entity *);
 extern void nullsub_89(Entity *);
 extern void nullsub_88(Entity *);
 extern void nullsub_87(Entity *);
 extern void nullsub_86(Entity *);
 extern void sub_8041E0C(Entity *);
-extern bool8 sub_806AA0C(s32, u32);
 
 void sub_8079F20(Entity * pokemon, Entity * target, u8 param_3, u8 param_4)
 {
diff --git a/src/run_dungeon.c b/src/run_dungeon.c
index e96935e6e..6dac666dc 100644
--- a/src/run_dungeon.c
+++ b/src/run_dungeon.c
@@ -78,12 +78,9 @@ extern void sub_8083D68(void);
 extern void UpdateMinimap(void);
 extern void sub_807E5AC(void);
 extern void TryActivateArtificialWeatherAbilities(void);
-extern void sub_807E88C(void);
 extern void nullsub_16(void);
 extern void sub_80521D0(void);
-extern void sub_807E7FC(u8);
 extern void sub_8068A84(Pokemon *pokemon);
-extern void sub_807EAA0(u32, u32);
 extern void sub_80427AC(void);
 extern void sub_806AA70(void);
 extern void sub_806AD3C(void);
diff --git a/src/trap.c b/src/trap.c
index 10a95fa86..70a24d53e 100644
--- a/src/trap.c
+++ b/src/trap.c
@@ -38,7 +38,6 @@
 extern u32 gUnknown_8106A4C;
 extern u32 gUnknown_8106A50;
 
-bool8 sub_806AA0C(s32, s32);
 void sub_80421EC(DungeonPos *, u32);
 u8 GetFloorType(void);
 void sub_8045BF8(u8 *, Item *);
diff --git a/src/weather.c b/src/weather.c
index d82f6fdf5..a4d4b1a69 100644
--- a/src/weather.c
+++ b/src/weather.c
@@ -35,16 +35,10 @@
 #include "dungeon_strings.h"
 
 extern void sub_804178C(u32);
-extern s32 CalculateStatusTurns(Entity *target, const s16 *turnRange, bool8 factorCurerSkills);
 extern void sub_80429D8(Entity *r0);
 
 extern OpenedFile *gUnknown_202ECA0;
 
-void sub_807E7FC(bool8 arg0);
-void sub_807E8F0(Entity *pokemon);
-void GetWeatherName(u8 *buffer, u8 weather);
-bool8 sub_807EAA0(bool8 arg0, bool8 arg1);
-
 u8 GetApparentWeather(Entity *pokemon)
 {
     if (pokemon != NULL && HasHeldItem(pokemon, ITEM_WEATHER_BAND))
@@ -91,7 +85,7 @@ void sub_807E5E4(u8 weather)
 }
 
 // Note: gUnknown_202ECA0 file's 2d array is read as 1d array in functions below, be careful!
-void sub_807E698(bool8 arg0)
+static void sub_807E698(bool8 arg0)
 {
     s32 i, j;
     s32 weatherArrId = GetApparentWeather(NULL) * COLOR_RAMP_COUNT;