diff --git a/include/code_8066D04.h b/include/code_8066D04.h
deleted file mode 100644
index 227aa9bf3..000000000
--- a/include/code_8066D04.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef GUARD_CODE_8066D04_H
-#define GUARD_CODE_8066D04_H
-
-void HandleSetItemAction(Entity *, bool8);
-
-#endif // GUARD_CODE_8066D04_H
diff --git a/include/dungeon_action_handler.h b/include/dungeon_action_handler.h
new file mode 100644
index 000000000..9816b3de8
--- /dev/null
+++ b/include/dungeon_action_handler.h
@@ -0,0 +1,24 @@
+#ifndef GUARD_DUNGEON_ACTION_HANDLER_H
+#define GUARD_DUNGEON_ACTION_HANDLER_H
+
+#include "structs/dungeon_entity.h"
+
+void HandlePickUpPlayerAction(Entity *entity);
+void HandleSetItemAction(Entity *param_1, bool8 param_2);
+void HandleUnsetItemAction(Entity *entity, bool8 enableMessage);
+void HandleGiveItemAction(Entity *param_1);
+void HandleTakeItemAction(Entity *param_1);
+void sub_8066BD4(Entity *param_1);
+void HandleUseItemAction(Entity *param_1);
+void HandlePlaceItemAction(Entity *entity);
+void sub_8066E14(Entity *entity);
+void sub_8066FA4(Entity *entity);
+void sub_8067110(Entity *entity);
+void sub_80671A0(Entity *entity);
+void HandleTalkFieldAction(Entity *entity);
+void sub_806752C(ActionContainer *a0);
+void sub_8067768(ActionContainer *a0);
+void HandleUseMovePlayerAction(Entity *entity);
+void sub_8067904(Entity *entity, u16 moveId);
+
+#endif // GUARD_DUNGEON_ACTION_HANDLER_H
diff --git a/ld_script.ld b/ld_script.ld
index cfdedf3d6..08e8c7451 100755
--- a/ld_script.ld
+++ b/ld_script.ld
@@ -232,7 +232,7 @@ SECTIONS {
         src/dungeon_menu_stairs.o(.text);
         src/dungeon_menu_others.o(.text);
         src/dungeon_menu_recruitment.o(.text);
-        src/code_8066D04.o(.text);
+        src/dungeon_action_handler.o(.text);
         src/dungeon_recruit_release_menu.o(.text);
         src/dungeon_misc.o(.text);
         src/dungeon_mon_spawn.o(.text);
@@ -617,7 +617,7 @@ SECTIONS {
         src/dungeon_menu_stairs.o(.rodata);
         src/dungeon_menu_others.o(.rodata);
         src/dungeon_menu_recruitment.o(.rodata);
-        src/code_8066D04.o(.rodata);
+        src/dungeon_action_handler.o(.rodata);
         src/dungeon_recruit_release_menu.o(.rodata);
         src/dungeon_misc.o(.rodata);
         src/dungeon_mon_spawn.o(.rodata);
diff --git a/src/dungeon_action_execution.c b/src/dungeon_action_execution.c
index 783f5d583..72292d3f0 100644
--- a/src/dungeon_action_execution.c
+++ b/src/dungeon_action_execution.c
@@ -5,7 +5,7 @@
 #include "dungeon_move_util.h"
 #include "dungeon_vram.h"
 #include "dungeon_8041AD0.h"
-#include "code_8066D04.h"
+#include "dungeon_action_handler.h"
 #include "dungeon_message.h"
 #include "constants/dungeon_action.h"
 #include "constants/dungeon.h"
@@ -42,25 +42,10 @@
 
 void sub_8075BA4(Entity *param_1, u8 param_2);
 void nullsub_95(Entity *);
-extern void sub_80671A0(Entity *);
-extern void sub_8067110(Entity *);
 void HandleUseMoveAIAction(Entity *target);
 void sub_8041888(u8 param_1);
 void sub_805EFB4(Entity *, u8);
-void HandlePlaceItemAction(Entity *);
-void HandlePickUpPlayerAction(Entity *);
-void sub_8066E14(Entity * );
-void sub_8066BD4(Entity*);
-void HandleTalkFieldAction(Entity *);
-void HandleUseMovePlayerAction(Entity *);
 void HandleUseOrbAction(Entity *);
-void sub_8067904(Entity *, u32);
-void HandleGiveItemAction(Entity *);
-void HandleTakeItemAction(Entity *);
-void HandleUseItemAction(Entity *);
-void sub_8066FA4(Entity *);
-void HandleUnsetItemAction(Entity *,bool8);
-extern u8 DisplayActions(Entity *);
 void sub_806A1E8(Entity *pokemon);
 void HandlePickUpAIAction(Entity *pokemon);
 void HandleThrowItemAIAction(Entity *pokemon);
diff --git a/src/code_8066D04.c b/src/dungeon_action_handler.c
similarity index 98%
rename from src/code_8066D04.c
rename to src/dungeon_action_handler.c
index b26c4797e..ca19263b2 100644
--- a/src/code_8066D04.c
+++ b/src/dungeon_action_handler.c
@@ -1,5 +1,6 @@
 #include "global.h"
 #include "globaldata.h"
+#include "dungeon_action_handler.h"
 #include "constants/dungeon.h"
 #include "constants/dungeon_exit.h"
 #include "constants/item.h"
@@ -8,7 +9,6 @@
 #include "dungeon_tilemap.h"
 #include "dungeon_8041AD0.h"
 #include "dungeon_action.h"
-#include "code_8066D04.h"
 #include "dungeon_mon_sprite_render.h"
 #include "dungeon_jobs.h"
 #include "run_dungeon.h"
@@ -46,9 +46,9 @@
 #include "warp_target.h"
 #include "move_orb_effects_5.h"
 
-Entity *sub_806773C(Entity *entity);
-void sub_8067558(Entity *entity, Entity *targetEntity, s32 a2);
-void sub_8067794(Entity *entity, Entity *targetEntity, s32 a2);
+static void sub_8067558(Entity *entity, Entity *targetEntity, s32 a2);
+static Entity *sub_806773C(Entity *entity);
+static void sub_8067794(Entity *entity, Entity *targetEntity, s32 a2);
 
 void HandlePickUpPlayerAction(Entity *entity)
 {
@@ -98,7 +98,7 @@ void HandleSetItemAction(Entity *param_1, bool8 param_2)
   }
 }
 
-void HandleUnsetItemAction(Entity *entity,bool8 enableMessage)
+void HandleUnsetItemAction(Entity *entity, bool8 enableMessage)
 {
   Item *item;
   int index;
@@ -596,7 +596,7 @@ void sub_806752C(ActionContainer *a0)
     sub_8067558(GetLeader(), targetEntity, 0);
 }
 
-void sub_8067558(Entity *entity, Entity *targetEntity, s32 a2)
+static void sub_8067558(Entity *entity, Entity *targetEntity, s32 a2)
 {
     EntityInfo *info1 = GetEntInfo(entity);
 
@@ -679,7 +679,7 @@ void sub_8067558(Entity *entity, Entity *targetEntity, s32 a2)
     }
 }
 
-Entity *sub_806773C(Entity *entity)
+static Entity *sub_806773C(Entity *entity)
 {
     Entity *ret = sub_80696A8(entity);
     if (ret == NULL) return NULL;
@@ -695,7 +695,7 @@ void sub_8067768(ActionContainer *a0)
     sub_8067794(GetLeader(), targetEntity, 0);
 }
 
-void sub_8067794(Entity *entity, Entity *targetEntity, s32 a2)
+static void sub_8067794(Entity *entity, Entity *targetEntity, s32 a2)
 {
     const u8 *stringPtr1;
     const u8 *stringPtr2;
diff --git a/src/dungeon_ai_items.c b/src/dungeon_ai_items.c
index a09671db2..653798648 100644
--- a/src/dungeon_ai_items.c
+++ b/src/dungeon_ai_items.c
@@ -25,9 +25,7 @@
 #include "dungeon_items.h"
 #include "constants/dungeon.h"
 #include "dungeon_engine.h"
-
-extern void sub_8067110(Entity *);
-extern void sub_80671A0(Entity *);
+#include "dungeon_action_handler.h"
 
 #define NUM_POTENTIAL_ROCK_TARGETS 20
 #define GROUND_ITEM_TOOLBOX_INDEX 0x80
diff --git a/src/dungeon_cutscene_articuno.c b/src/dungeon_cutscene_articuno.c
index 15457e540..2777bf5bb 100644
--- a/src/dungeon_cutscene_articuno.c
+++ b/src/dungeon_cutscene_articuno.c
@@ -32,9 +32,6 @@
 #include "dungeon_leveling.h"
 #include "weather.h"
 
-extern void sub_8049884(void);
-extern void sub_8049B8C(void);
-extern void sub_8052D44(s16 *, Entity *, Entity *);
 
 static void sub_8088484(Entity *param_1);
 static void ArticunoScreenFlash(void);
diff --git a/src/dungeon_cutscene_celebi.c b/src/dungeon_cutscene_celebi.c
index e42c9fb75..ae939d673 100644
--- a/src/dungeon_cutscene_celebi.c
+++ b/src/dungeon_cutscene_celebi.c
@@ -33,9 +33,6 @@
 #include "weather.h"
 #include "dungeon_mon_recruit.h"
 
-extern void sub_8049884(void);
-extern void sub_8049B8C(void);
-extern void sub_8052D44(s16 *, Entity *, Entity *);
 
 static void sub_808C8E0(Entity *entity);
 static void sub_808C9B0(Entity *param_1);
diff --git a/src/dungeon_cutscene_deoxys.c b/src/dungeon_cutscene_deoxys.c
index 0c4f9aec0..9a991f3c5 100644
--- a/src/dungeon_cutscene_deoxys.c
+++ b/src/dungeon_cutscene_deoxys.c
@@ -31,9 +31,6 @@
 #include "dungeon_boss_dialogue.h"
 
 
-extern void sub_8049884(void);
-extern void sub_8049B8C(void);
-extern void sub_8052D44(s16 *, Entity *, Entity *);
 
 static void DeoxysScreenFlash(void);
 static void sub_808C550(void);
diff --git a/src/dungeon_cutscene_entei.c b/src/dungeon_cutscene_entei.c
index 7319d4832..c71550c82 100644
--- a/src/dungeon_cutscene_entei.c
+++ b/src/dungeon_cutscene_entei.c
@@ -30,9 +30,6 @@
 #include "dungeon_config.h"
 #include "dungeon_boss_dialogue.h"
 
-extern void sub_8049884(void);
-extern void sub_8049B8C(void);
-extern void sub_8052D44(s16 *, Entity *, Entity *);
 
 static void EnteiScreenFlash(void);
 
diff --git a/src/dungeon_cutscene_groudon.c b/src/dungeon_cutscene_groudon.c
index d9dbaad8c..c55bc85b9 100644
--- a/src/dungeon_cutscene_groudon.c
+++ b/src/dungeon_cutscene_groudon.c
@@ -32,9 +32,6 @@
 #include "dungeon_tilemap.h"
 #include "dungeon_leveling.h"
 
-extern void sub_8049884(void);
-extern void sub_8049B8C(void);
-extern void sub_8052D44(s16 *, Entity *, Entity *);
 
 static void SceneGroudonMovement(Entity * groudonEntity);
 static void GroudonScreenFlash(void);
diff --git a/src/dungeon_cutscene_hooh.c b/src/dungeon_cutscene_hooh.c
index 1a590bf58..48319bdde 100644
--- a/src/dungeon_cutscene_hooh.c
+++ b/src/dungeon_cutscene_hooh.c
@@ -30,9 +30,6 @@
 #include "dungeon_config.h"
 #include "dungeon_boss_dialogue.h"
 
-extern void sub_8049884(void);
-extern void sub_8049B8C(void);
-extern void sub_8052D44(s16 *, Entity *, Entity *);
 
 static void HoOhDropInEffect(Entity * param_1);
 static void HoOhScreenFlash(void);
diff --git a/src/dungeon_cutscene_jirachi.c b/src/dungeon_cutscene_jirachi.c
index 9c3d5635a..98193a369 100644
--- a/src/dungeon_cutscene_jirachi.c
+++ b/src/dungeon_cutscene_jirachi.c
@@ -34,9 +34,6 @@
 #include "dungeon_mon_spawn.h"
 #include "dungeon_8041AD0.h"
 
-extern void sub_8049884(void);
-extern void sub_8049B8C(void);
-extern void sub_8052D44(s16 *, Entity *, Entity *);
 
 static void sub_808B50C(void);
 static void JirachiWish(void);
diff --git a/src/dungeon_cutscene_kyogre.c b/src/dungeon_cutscene_kyogre.c
index 6c7a1803e..18c5e8be9 100644
--- a/src/dungeon_cutscene_kyogre.c
+++ b/src/dungeon_cutscene_kyogre.c
@@ -32,9 +32,6 @@
 #include "dungeon_tilemap.h"
 #include "dungeon_map.h"
 
-extern void sub_8049884(void);
-extern void sub_8049B8C(void);
-extern void sub_8052D44(s16 *, Entity *, Entity *);
 
 static void nullsub_99(void);
 static void KyogreScreenFlash(void);
diff --git a/src/dungeon_cutscene_latios.c b/src/dungeon_cutscene_latios.c
index efd61c979..5136c8263 100644
--- a/src/dungeon_cutscene_latios.c
+++ b/src/dungeon_cutscene_latios.c
@@ -31,9 +31,6 @@
 #include "dungeon_boss_dialogue.h"
 
 
-extern void sub_8049884(void);
-extern void sub_8049B8C(void);
-extern void sub_8052D44(s16 *, Entity *, Entity *);
 
 static void LatiosScreenFlash(void);
 
diff --git a/src/dungeon_cutscene_lugia.c b/src/dungeon_cutscene_lugia.c
index cdf7e36d7..f34abfa65 100644
--- a/src/dungeon_cutscene_lugia.c
+++ b/src/dungeon_cutscene_lugia.c
@@ -31,9 +31,6 @@
 #include "dungeon_boss_dialogue.h"
 
 
-extern void sub_8049884(void);
-extern void sub_8049B8C(void);
-extern void sub_8052D44(s16 *, Entity *, Entity *);
 
 static void LugiaScreenFlash(void);
 static void LugiaScreenFlash2(void);
diff --git a/src/dungeon_cutscene_magma_cavern.c b/src/dungeon_cutscene_magma_cavern.c
index abb7ec563..143a007d8 100644
--- a/src/dungeon_cutscene_magma_cavern.c
+++ b/src/dungeon_cutscene_magma_cavern.c
@@ -30,9 +30,6 @@
 #include "dungeon_config.h"
 #include "dungeon_boss_dialogue.h"
 
-extern void sub_8049884(void);
-extern void sub_8049B8C(void);
-extern void sub_8052D44(s16 *, Entity *, Entity *);
 
 static void sub_80891F0(void);
 static void sub_8089294(void);
diff --git a/src/dungeon_cutscene_mankey.c b/src/dungeon_cutscene_mankey.c
index 066949a58..5960cfe8f 100644
--- a/src/dungeon_cutscene_mankey.c
+++ b/src/dungeon_cutscene_mankey.c
@@ -30,9 +30,6 @@
 #include "dungeon_config.h"
 #include "dungeon_boss_dialogue.h"
 
-extern void sub_8049884(void);
-extern void sub_8049B8C(void);
-extern void sub_8052D44(s16 *, Entity *, Entity *);
 
 static void sub_80898F8(Entity *r0);
 static void sub_8089908(Entity *r0);
diff --git a/src/dungeon_cutscene_meanies.c b/src/dungeon_cutscene_meanies.c
index 16423a3ea..180d18910 100644
--- a/src/dungeon_cutscene_meanies.c
+++ b/src/dungeon_cutscene_meanies.c
@@ -29,9 +29,6 @@
 #include "dungeon_config.h"
 #include "dungeon_boss_dialogue.h"
 
-extern void sub_8049884(void);
-extern void sub_8049B8C(void);
-extern void sub_8052D44(s16 *, Entity *, Entity *);
 
 static void sub_8087144(void);
 
diff --git a/src/dungeon_cutscene_medicham.c b/src/dungeon_cutscene_medicham.c
index 2949d3b9c..3909a66b9 100644
--- a/src/dungeon_cutscene_medicham.c
+++ b/src/dungeon_cutscene_medicham.c
@@ -30,9 +30,6 @@
 #include "dungeon_config.h"
 #include "dungeon_boss_dialogue.h"
 
-extern void sub_8049884(void);
-extern void sub_8049B8C(void);
-extern void sub_8052D44(s16 *, Entity *, Entity *);
 
 void sub_808C9C4(void)
 {
diff --git a/src/dungeon_cutscene_mewtwo.c b/src/dungeon_cutscene_mewtwo.c
index 833f0d33c..df90972ac 100644
--- a/src/dungeon_cutscene_mewtwo.c
+++ b/src/dungeon_cutscene_mewtwo.c
@@ -30,9 +30,6 @@
 #include "dungeon_config.h"
 #include "dungeon_boss_dialogue.h"
 
-extern void sub_8049884(void);
-extern void sub_8049B8C(void);
-extern void sub_8052D44(s16 *, Entity *, Entity *);
 
 static void MewtwoDropInEffect(Entity *mewtwoEntity);
 static void MewtwoScreenFlash(void);
diff --git a/src/dungeon_cutscene_moltres.c b/src/dungeon_cutscene_moltres.c
index 8e8133c24..d1064d6e6 100644
--- a/src/dungeon_cutscene_moltres.c
+++ b/src/dungeon_cutscene_moltres.c
@@ -32,9 +32,6 @@
 #include "dungeon_tilemap.h"
 #include "dungeon_leveling.h"
 
-extern void sub_8049884(void);
-extern void sub_8049B8C(void);
-extern void sub_8052D44(s16 *, Entity *, Entity *);
 
 static void MoltresDropInEffect(Entity * moltresEntity);
 static void MoltresScreenFlash1(s32 xArg, s32 yArg);
diff --git a/src/dungeon_cutscene_raikou.c b/src/dungeon_cutscene_raikou.c
index 95b30d259..497828fe7 100644
--- a/src/dungeon_cutscene_raikou.c
+++ b/src/dungeon_cutscene_raikou.c
@@ -31,9 +31,6 @@
 #include "dungeon_boss_dialogue.h"
 #include "weather.h"
 
-extern void sub_8049884(void);
-extern void sub_8049B8C(void);
-extern void sub_8052D44(s16 *, Entity *, Entity *);
 
 static void RaikouScreenFlash(void);
 
diff --git a/src/dungeon_cutscene_rayquaza.c b/src/dungeon_cutscene_rayquaza.c
index 7d98bbd52..17717c4a6 100644
--- a/src/dungeon_cutscene_rayquaza.c
+++ b/src/dungeon_cutscene_rayquaza.c
@@ -31,9 +31,6 @@
 #include "dungeon_boss_dialogue.h"
 #include "dungeon_leveling.h"
 
-extern void sub_8049884(void);
-extern void sub_8049B8C(void);
-extern void sub_8052D44(s16 *, Entity *, Entity *);
 
 static void RayquazaDropInEffect(Entity *rayquazaEntity);
 static void RayquazaScreenFlash(void);
diff --git a/src/dungeon_cutscene_regis.c b/src/dungeon_cutscene_regis.c
index 1aff0cf65..8040ea9f5 100644
--- a/src/dungeon_cutscene_regis.c
+++ b/src/dungeon_cutscene_regis.c
@@ -31,9 +31,6 @@
 #include "dungeon_boss_dialogue.h"
 #include "dungeon_map.h"
 
-extern void sub_8049884(void);
-extern void sub_8049B8C(void);
-extern void sub_8052D44(s16 *, Entity *, Entity *);
 
 static void sub_808B1CC(u8 itemID);
 static void SetupRegiFacingDirection(Entity *regiEntity);
diff --git a/src/dungeon_cutscene_skarmory.c b/src/dungeon_cutscene_skarmory.c
index 3cf446119..dfbaf6d50 100644
--- a/src/dungeon_cutscene_skarmory.c
+++ b/src/dungeon_cutscene_skarmory.c
@@ -30,9 +30,6 @@
 #include "dungeon_config.h"
 #include "dungeon_boss_dialogue.h"
 
-extern void sub_8049884(void);
-extern void sub_8049B8C(void);
-extern void sub_8052D44(s16 *, Entity *, Entity *);
 
 static void SkarmoryEntry(Entity * skarmoryEntity);
 
diff --git a/src/dungeon_cutscene_smeargle.c b/src/dungeon_cutscene_smeargle.c
index 707f74367..04d98233f 100644
--- a/src/dungeon_cutscene_smeargle.c
+++ b/src/dungeon_cutscene_smeargle.c
@@ -30,9 +30,6 @@
 #include "dungeon_config.h"
 #include "dungeon_boss_dialogue.h"
 
-extern void sub_8049884(void);
-extern void sub_8049B8C(void);
-extern void sub_8052D44(s16 *, Entity *, Entity *);
 
 void DummyFightDialogue(void)
 {
diff --git a/src/dungeon_cutscene_suicune.c b/src/dungeon_cutscene_suicune.c
index 1931c8c97..412128ace 100644
--- a/src/dungeon_cutscene_suicune.c
+++ b/src/dungeon_cutscene_suicune.c
@@ -30,9 +30,6 @@
 #include "dungeon_config.h"
 #include "dungeon_boss_dialogue.h"
 
-extern void sub_8049884(void);
-extern void sub_8049B8C(void);
-extern void sub_8052D44(s16 *, Entity *, Entity *);
 
 static void sub_808A528(Entity * param_1);
 static void SuicuneScreenFlash(void);
diff --git a/src/dungeon_cutscene_zapdos.c b/src/dungeon_cutscene_zapdos.c
index 9f4d87768..d37942aa8 100644
--- a/src/dungeon_cutscene_zapdos.c
+++ b/src/dungeon_cutscene_zapdos.c
@@ -31,9 +31,6 @@
 #include "dungeon_boss_dialogue.h"
 #include "dungeon_leveling.h"
 
-extern void sub_8049884(void);
-extern void sub_8049B8C(void);
-extern void sub_8052D44(s16 *, Entity *, Entity *);
 
 struct Zapdos1
 {
diff --git a/src/dungeon_generation.c b/src/dungeon_generation.c
index 750e3dc01..f1076645d 100644
--- a/src/dungeon_generation.c
+++ b/src/dungeon_generation.c
@@ -25,7 +25,6 @@
 extern s32 sub_803DA20(s16 species);
 extern void sub_8049840(void);
 extern void sub_80498A8(s32, s32);
-extern void sub_8049B8C(void);
 
 enum CardinalDirection
 {
diff --git a/src/dungeon_main.c b/src/dungeon_main.c
index 2c545c364..ff49aaff6 100644
--- a/src/dungeon_main.c
+++ b/src/dungeon_main.c
@@ -18,7 +18,7 @@
 #include "dungeon_vram.h"
 #include "dungeon_tilemap.h"
 #include "dungeon_action.h"
-#include "code_8066D04.h"
+#include "dungeon_action_handler.h"
 #include "dungeon_mon_sprite_render.h"
 #include "dungeon_action.h"
 #include "dungeon_ai_movement.h"
@@ -62,19 +62,14 @@
 #include "dungeon_entity_movement.h"
 #include "dungeon_8041AD0.h"
 
-extern void HandleUnsetItemAction(Entity *,bool8);
-extern void TryTriggerTrap(Entity *pokemon, DungeonPos *pos, int param_3, char param_4);
 void TryPointCameraToMonster(Entity *a0, u8 a1);
 bool8 sub_80701A4(Entity *a0);
 void ClearUnpaidFlagFromAllItems(void);
 void sub_806A914(u8 a0, u8 a1, u8 a2);
 u16 GetLeaderActionId(void);
 void sub_80978C8(s16 a0);
-void HandleTalkFieldAction(Entity *);
 s32 GetTeamMemberEntityIndex(Entity *pokemon);
 bool8 sub_8070F80(Entity * pokemon, s32 direction);
-void sub_806752C(ActionContainer *a0);
-void sub_8067768(ActionContainer *a0);
 extern bool8 sub_8071A8C(Entity *pokemon);
 
 static EWRAM_DATA bool8 sInDiagonalMode = 0;
diff --git a/src/dungeon_menu_moves.c b/src/dungeon_menu_moves.c
index 3a6a078fa..588e24eee 100644
--- a/src/dungeon_menu_moves.c
+++ b/src/dungeon_menu_moves.c
@@ -31,9 +31,7 @@
 #include "text_3.h"
 
 extern s32 GetTeamMemberEntityIndex(Entity *pokemon);
-extern void sub_806752C(ActionContainer *a0);
 extern void ShowDungeonSummaryOrIQMenu(ActionContainer *a0, bool8 a1);
-extern void sub_8067768(ActionContainer *a0);
 extern bool8 sub_8071A8C(Entity *pokemon);
 
 
diff --git a/src/ground_link.c b/src/ground_link.c
index 7189454ac..6c9667914 100644
--- a/src/ground_link.c
+++ b/src/ground_link.c
@@ -3,38 +3,37 @@
 #include "ground_link.h"
 #include "debug.h"
 #include "ground_script.h"
+#include "ground_script_file.h"
 #include "number_util.h"
 
-EWRAM_INIT const struct GroundLink *gCurrentGroundLink = NULL;
-extern DebugLocation gUnknown_8118798;
-extern const struct GroundScriptHeader *GetGroundScript(s16 r0, DebugLocation *r1);
+EWRAM_INIT static const struct GroundLink *sCurrentGroundLink = NULL;
 
-void sub_80AD868(void)
+UNUSED static void sub_80AD868(void)
 {
-    gCurrentGroundLink = NULL;
+    sCurrentGroundLink = NULL;
 }
 
-void sub_80AD874(void)
+UNUSED static void sub_80AD874(void)
 {
-    gCurrentGroundLink = NULL;
+    sCurrentGroundLink = NULL;
 }
 
 void GroundLink_Select(s16 r0)
 {
     const struct GroundScriptHeader *gs = GetGroundScript(r0, DEBUG_LOC_PTR("../ground/ground_link.c", 77, "GroundLink_Select"));
-    gCurrentGroundLink = gs->links;
+    sCurrentGroundLink = gs->links;
 }
 
-const struct GroundLink *GetCurrentGroundLink(s16 r0)
+UNUSED static const struct GroundLink *GetCurrentGroundLink(s16 r0)
 {
     u32 a = r0;
-    return &gCurrentGroundLink[a];
+    return &sCurrentGroundLink[a];
 }
 
 s32 GroundLink_GetPos(s32 _arg0, PixelPos *pos)
 {
     s32 arg0 = (s16)(_arg0);
-    const struct GroundLink *ptr = &gCurrentGroundLink[arg0];
+    const struct GroundLink *ptr = &sCurrentGroundLink[arg0];
 
     SetUnkInGroundEvent(&ptr->pos, pos);
 
@@ -44,7 +43,7 @@ s32 GroundLink_GetPos(s32 _arg0, PixelPos *pos)
 s32 GroundLink_GetArea(s32 _arg0, PixelPos *arg1, PixelPos *arg2, PixelPos *arg3)
 {
     s32 arg0 = (s16) _arg0;
-    const struct GroundLink *ptr = &gCurrentGroundLink[arg0];
+    const struct GroundLink *ptr = &sCurrentGroundLink[arg0];
 
     *arg1 = *arg3;
 
diff --git a/src/ground_main.c b/src/ground_main.c
index bcf6247c8..031e15197 100644
--- a/src/ground_main.c
+++ b/src/ground_main.c
@@ -71,7 +71,6 @@ extern void sub_809975C(void);
 extern void sub_8099BE4(void);
 extern void sub_8099744(void);
 extern void WaitForNextFrameAndAdvanceRNG(void);
-extern void LoadBufferedInputs(void);
 extern void sub_8099750(void);
 extern void nullsub_16(void);
 extern void UpdateAdventureAchievements(void);
diff --git a/sym_ewram.txt b/sym_ewram.txt
index 8ea49be54..283f7c7de 100644
--- a/sym_ewram.txt
+++ b/sym_ewram.txt
@@ -49,7 +49,6 @@
 	.space 4
     .include "src/dungeon_menu_others.o"
     .include "src/dungeon_menu_recruitment.o"
-    .include "src/code_8066D04.o"
     .include "src/dungeon_recruit_release_menu.o"
     .include "src/dungeon_logic.o"
     .include "src/dungeon_leveling.o"