clean up externs in code 8041AD0

include/code_8041AD0.h

@@ -1,11 +0,0 @@
-#ifndef GUARD_CODE_8041AD0_H
-#define GUARD_CODE_8041AD0_H
-
-#include "structs/dungeon_entity.h"
-#include "structs/str_damage.h"
-
-u32 EntityGetStatusSprites(Entity *entity);
-void sub_80420E8(Entity *pokemon, DamageStruct *dmgStruct);
-void sub_80421C0(Entity *pokemon, u16);
-
-#endif // GUARD_CODE_8041AD0_H

include/code_804267C.h

@@ -1,13 +0,0 @@
-#ifndef GUARD_CODE_804267C_H
-#define GUARD_CODE_804267C_H
-
-#include "structs/dungeon_entity.h"
-
-void PlayStairsSound(void);
-void sub_80426C8(u32 a0, u32 a1);
-void sub_8042730(Entity *a0, void *unused);
-bool8 sub_8042768(Entity* pokemon);
-void sub_80427AC(void);
-void sub_8042818(u8 a0, bool8 a1);
-
-#endif

include/dungeon_8041AD0.h

@@ -0,0 +1,167 @@
+#ifndef GUARD_DUNGEON_8041AD0_H
+#define GUARD_DUNGEON_8041AD0_H
+
+#include "structs/dungeon_entity.h"
+#include "structs/str_damage.h"
+
+s32 sub_80416E0(PixelPos *pos, u32 param_2, bool8 param_3);
+void sub_804178C(u8 param_1);
+u32 EntityGetStatusSprites(Entity *entity);
+void sub_8041888(u8 param_1);
+void EntityUpdateStatusSprites(Entity *entity);
+void sub_8041AD0(Entity *pokemon);
+void sub_8041AE0(Entity *pokemon);
+void sub_8041AF4(Entity *pokemon);
+void nullsub_57(Entity *pokemon);
+void sub_8041B18(Entity *pokemon);
+void nullsub_58(Entity *pokemon);
+void nullsub_59(Entity *pokemon);
+void sub_8041B34(Entity *pokemon);
+void nullsub_60(Entity *pokemon);
+void sub_8041B48(Entity *pokemon);
+void nullsub_61(Entity *pokemon);
+void sub_8041B5C(Entity *pokemon);
+void nullsub_62(Entity *pokemon);
+void sub_8041B74(Entity *pokemon);
+void nullsub_63(Entity *pokemon);
+void nullsub_64(Entity *pokemon);
+void sub_8041B90(Entity *pokemon);
+void nullsub_65(Entity *pokemon);
+void nullsub_66(Entity *pokemon);
+void sub_8041BA8(Entity *pokemon);
+void nullsub_67(Entity *pokemon);
+void sub_8041BBC(Entity *pokemon);
+void nullsub_68(Entity *pokemon);
+void sub_8041BD0(Entity *pokemon, u8 r1);
+void sub_8041BE8(Entity *pokemon);
+void sub_8041BF8(Entity *pokemon);
+void sub_8041C08(Entity *pokemon);
+void sub_8041C1C(Entity *pokemon);
+void nullsub_69(Entity *pokemon, Entity *target);
+void sub_8041C34(Entity *pokemon);
+void nullsub_70(Entity *pokemon);
+void nullsub_71(Entity *pokemon);
+void sub_8041C4C(Entity *pokemon, u32 r1);
+void sub_8041C58(Entity *pokemon);
+void sub_8041C6C(Entity *pokemon);
+void sub_8041C7C(Entity *pokemon);
+void nullsub_72(Entity *pokemon);
+void nullsub_73(Entity *pokemon);
+void sub_8041C94(Entity *pokemon);
+void sub_8041CA8(Entity *pokemon);
+void sub_8041CB8(Entity *pokemon);
+void sub_8041CCC(Entity *pokemon);
+void sub_8041CDC(Entity *pokemon);
+void sub_8041CEC(Entity *pokemon);
+void nullsub_74(Entity *pokemon);
+void sub_8041D00(Entity *pokemon, Entity *target);
+void nullsub_75(Entity *pokemon);
+void nullsub_76(Entity *pokemon);
+void nullsub_77(Entity *pokemon);
+void nullsub_78(Entity *pokemon);
+void nullsub_79(Entity *pokemon);
+void nullsub_80(Entity *pokemon);
+void sub_8041D38(Entity * pokemon);
+void sub_8041D48(Entity * pokemon);
+void nullsub_81(Entity *pokemon);
+void sub_8041D5C(Entity *pokemon);
+void sub_8041D84(Entity *pokemon);
+void nullsub_82(Entity *pokemon);
+void nullsub_83(Entity *pokemon);
+void sub_8041D9C(Entity *pokemon);
+void sub_8041DB0(Entity *pokemon);
+void nullsub_84(Entity *pokemon);
+void nullsub_85(Entity *pokemon);
+void nullsub_86(Entity *pokemon);
+void nullsub_87(Entity *pokemon);
+void nullsub_88(Entity *pokemon);
+void sub_8041DD8(Entity *pokemon, s32 r1);
+void nullsub_89(Entity *pokemon);
+void sub_8041E0C(Entity *pokemon);
+void sub_8041E1C(Entity *pokemon);
+void sub_8041E3C(Entity *pokemon);
+void sub_8041E4C(Entity *pokemon);
+void sub_8041E60(Entity *pokemon);
+void sub_8041E74(Entity *pokemon);
+void sub_8041E84(Entity *pokemon);
+void sub_8041E94(Entity *pokemon);
+void sub_8041EA4(Entity *pokemon);
+void sub_8041EB4(Entity *pokemon);
+void sub_8041EC8(Entity *pokemon);
+void sub_8041ED8(Entity *pokemon);
+void sub_8041EE8(Entity *pokemon);
+void sub_8041EF8(Entity *pokemon);
+void sub_8041F08(Entity *pokemon);
+void nullsub_90(Entity *pokemon);
+void sub_8041F28(Entity *pokemon, u32 r1);
+void sub_8041F4C(Entity *pokemon, u32 r1);
+void sub_8041F70(Entity *pokemon, u32 r1);
+void sub_8041F94(Entity *pokemon, u32 r1);
+void sub_8041FB4(Entity *pokemon, u32 r1);
+void sub_8041FD8(Entity *pokemon, u32 r1);
+void sub_8041FFC(Entity *pokemon, u32 r1);
+void sub_804201C(Entity *pokemon, u32 r1);
+void sub_8042040(Entity *pokemon, u32 r1);
+void sub_8042060(Entity *pokemon, u32 r1);
+void sub_8042080(Entity *pokemon, u32 r1);
+void sub_80420A0(Entity *pokemon);
+void nullsub_91(Entity *pokemon);
+void sub_80420B8(Entity *pokemon);
+void sub_80420C8(Entity *pokemon);
+void nullsub_92(Entity *pokemon);
+void sub_80420E8(Entity *pokemon, struct DamageStruct *dmgStruct);
+void sub_8042148(Entity *pokemon);
+void nullsub_93(DungeonPos *pos);
+void sub_804216C(Entity *pokemon, Entity *target, u32 r2);
+void sub_804218C(Entity *pokemon, Entity *target);
+void sub_804219C(PixelPos *pos);
+void sub_80421AC(Entity *pokemon, Entity * target);
+void sub_80421C0(Entity *pokemon, u16 r1);
+void sub_80421EC(DungeonPos *pos, u16 r1);
+void sub_8042208(Entity *pokemon, u8 r1);
+void sub_8042238(Entity *pokemon, Entity *target);
+void sub_804225C(Entity *entity, DungeonPos *pos, u8 trapId);
+void sub_8042390(Entity *entity, Item *item);
+void sub_804245C(Entity *entity, Item *item);
+s32 sub_8042520(Entity *a0);
+void PlayStairsSound(void);
+void sub_80426C8(u32 a0, u32 a1);
+void sub_8042730(Entity *a0, Entity *unused);
+bool8 sub_8042768(Entity* pokemon);
+void sub_80427AC(void);
+void sub_8042818(u8 a0, bool8 a1);
+void sub_80428A0(Entity *r0);
+void sub_80428B0(Entity *r0);
+void sub_80428C4(Entity *r0);
+void sub_80428D8(Entity *r0);
+void sub_80428EC(Entity *r0);
+void sub_8042900(Entity *r0);
+void ShowVisualFlags(Entity *r0);
+void sub_8042920(Entity *r0);
+void sub_8042930(Entity *r0);
+void sub_8042940(Entity *r0);
+void sub_8042950(Entity *r0);
+void sub_8042968(Entity *r0);
+void sub_8042978(Entity *r0);
+void sub_804298C(Entity *r0);
+void sub_80429A0(Entity *r0);
+void sub_80429B4(Entity *r0);
+void sub_80429C8(Entity *r0);
+void sub_80429D8(Entity *r0);
+void sub_80429E8(Entity *r0);
+void sub_80429FC(DungeonPos *r0);
+void sub_8042A14(DungeonPos *r0);
+void sub_8042A24(Entity *r0);
+void sub_8042A34(DungeonPos *r0);
+void sub_8042A44(Entity *r0);
+void sub_8042A54(DungeonPos *r0);
+void sub_8042A64(DungeonPos *r0);
+void sub_8042A74(Entity *r0);
+void sub_8042B0C(Entity *entity);
+void sub_8042B20(Entity *entity);
+void sub_8042DD4(s32 a0, Entity *a1, s32 a2);
+void sub_8042E5C(void);
+void sub_8042E98(void);
+void sub_8042EC8(Entity *a0, s32 a1);
+
+#endif // GUARD_DUNGEON_8041AD0_H

include/dungeon_recruit_release_menu.h

@@ -0,0 +1,8 @@
+#ifndef GUARD_DUNGEON_RECRUIT_RELEASE_MENU_H
+#define GUARD_DUNGEON_RECRUIT_RELEASE_MENU_H
+
+#include "structs/str_pokemon.h"
+
+void ShowRecruitReleaseMenu(u8 a0, s32 a1, s32 a2, Pokemon **a3);
+
+#endif // GUARD_DUNGEON_RECRUIT_RELEASE_MENU_H

ld_script.ld

@@ -201,7 +201,7 @@ SECTIONS {
         src/dungeon_tilemap.o(.text);
         src/dungeon_map.o(.text);
         src/code_8040094_1.o(.text);
-        src/code_8041AD0.o(.text);
+        src/dungeon_8041AD0.o(.text);
         src/run_dungeon.o(.text);
         src/dungeon_engine.o(.text);
         src/dungeon_action.o(.text);
@@ -233,7 +233,7 @@ SECTIONS {
         src/dungeon_menu_others.o(.text);
         src/dungeon_menu_recruitment.o(.text);
         src/code_8066D04.o(.text);
-        src/dungeon_8067A80.o(.text);
+        src/dungeon_recruit_release_menu.o(.text);
         src/dungeon_misc.o(.text);
         src/dungeon_mon_spawn.o(.text);
         src/dungeon_mon_sprite_render.o(.text);
@@ -583,7 +583,7 @@ SECTIONS {
         src/dungeon_map.o(.rodata);
         src/code_8040094_1.o(.rodata);
         data/pksdir_0.o(.rodata);
-        src/code_8041AD0.o(.rodata);
+        src/dungeon_8041AD0.o(.rodata);
         src/run_dungeon.o(.rodata);
         src/dungeon_engine.o(.rodata);
         src/dungeon_action.o(.rodata);
@@ -618,7 +618,7 @@ SECTIONS {
         src/dungeon_menu_others.o(.rodata);
         src/dungeon_menu_recruitment.o(.rodata);
         src/code_8066D04.o(.rodata);
-        src/dungeon_8067A80.o(.rodata);
+        src/dungeon_recruit_release_menu.o(.rodata);
         src/dungeon_misc.o(.rodata);
         src/dungeon_mon_spawn.o(.rodata);
         src/dungeon_mon_sprite_render.o(.rodata);

src/blow_away.c

@@ -20,7 +20,7 @@
 #include "move_orb_effects_1.h"
 #include "moves.h"
 #include "move_util.h"
-#include "code_8041AD0.h"
+#include "dungeon_8041AD0.h"
 #include "weather.h"
 #include "dungeon_config.h"
 #include "dungeon_misc.h"
@@ -35,7 +35,6 @@
 #include "expose_trap.h"
 
 extern void sub_804EB30();
-extern void sub_80421AC(Entity * pokemon, Entity * target);
 extern void sub_807BB78(Entity *pokemon);
 
 void BlowAwayTarget(Entity *pokemon, Entity *target, u32 direction)

src/code_8040094_1.c

@@ -10,7 +10,6 @@
 #include "effect_data.h"
 #include "effect_sub_1.h"
 #include "dungeon_vram.h"
-#include "code_804267C.h"
 #include "dungeon_info.h"
 #include "dungeon_message.h"
 #include "dungeon_move.h"
@@ -22,6 +21,7 @@
 #include "dungeon_map_access.h"
 #include "dungeon_strings.h"
 #include "dungeon_mon_sprite_render.h"
+#include "dungeon_8041AD0.h"
 
 struct UnkStruct_8040094
 {
@@ -36,7 +36,6 @@ struct UnkStruct_8040094
 extern u8 sub_800EC94(s32 param_1);
 extern s32 sub_800E710(s32 species, u16 moveId);
 extern void sub_800EEC8(u16 r0);
-extern void sub_8042DD4(s32 a0, Entity *a1, s32 a2);
 extern u8 sub_800EA44(s32 species, u16 a2);
 extern s32 sub_800E790(s32 species, u16 a2);
 extern s32 sub_800E52C(struct UnkStruct_8040094 *a0);
@@ -51,7 +50,6 @@ extern bool8 sub_800E7D0(struct UnkStruct_8040094 *a0);
 extern bool8 EffectiveMoveHasSineWobble(s32 moveId);
 extern bool8 MoveMatchesBideClassStatus(Entity *pokemon, Move *move);
 extern bool8 IsSleeping(Entity *pokemon);
-extern void sub_80421C0(Entity *pokemon, u16);
 
 extern const s32 gUnknown_8106A8C[];
 

src/code_8066D04.c

@@ -6,7 +6,7 @@
 #include "constants/move_id.h"
 #include "dungeon_vram.h"
 #include "dungeon_tilemap.h"
-#include "code_8041AD0.h"
+#include "dungeon_8041AD0.h"
 #include "dungeon_action.h"
 #include "code_8066D04.h"
 #include "dungeon_mon_sprite_render.h"
@@ -46,8 +46,6 @@
 #include "warp_target.h"
 #include "move_orb_effects_5.h"
 
-extern void sub_8042208(Entity *pokemon, u8 r1);
-
 Entity *sub_806773C(Entity *entity);
 void sub_8067558(Entity *entity, Entity *targetEntity, s32 a2);
 void sub_8067794(Entity *entity, Entity *targetEntity, s32 a2);

src/drought_orb.c

@@ -18,7 +18,7 @@
 #include "move_orb_effects_1.h"
 #include "moves.h"
 #include "move_util.h"
-#include "code_8041AD0.h"
+#include "dungeon_8041AD0.h"
 #include "weather.h"
 #include "dungeon_config.h"
 #include "dungeon_misc.h"

src/dungeon_8041AD0.c

@@ -1,5 +1,6 @@
 #include "global.h"
 #include "globaldata.h"
+#include "dungeon_8041AD0.h"
 #include "constants/direction.h"
 #include "constants/status.h"
 #include "constants/type.h"
@@ -11,8 +12,6 @@
 #include "effect_sub_1.h"
 #include "dungeon_vram.h"
 #include "dungeon_tilemap.h"
-#include "code_8041AD0.h"
-#include "code_804267C.h"
 #include "dungeon_mon_sprite_render.h"
 #include "dungeon_config.h"
 #include "dungeon_logic.h"
@@ -36,25 +35,13 @@
 
 // Unknown dungeon file. File split is correct.
 
-
-void EntityUpdateStatusSprites(Entity *entity);
-
-
 extern void sub_800DBBC(void);
-extern void sub_8042E98(void);
 extern void sub_800EF28(u8);
-extern void sub_80429A0(Entity *);
-void sub_8042B34(s32 a0, s32 a1, s32 a2);
-extern bool8 sub_8042CC0(void);
-extern void sub_8042D7C(void);
 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);
 
-s32 sub_80416E0(PixelPos *pos, u32 param_2, bool8 param_3);
-void sub_804178C(u8 param_1);
-
 struct UnkStruct_80F6624
 {
     s16 unk0;
@@ -190,6 +177,9 @@ static const u32 sStatusSpriteMasks_MuzzledStatus[] = {
 
 static s32 sub_8041550(Entity *entity, s32 a1, u8 a2, u8 a3, s32 a4, u8 a5);
 static u32 sub_8041764(unkStruct_80416E0 *param_1, bool8 param_2);
+static void sub_8042B34(s32 a0, s32 a1, s32 a2);
+static bool8 sub_8042CC0(void);
+static void sub_8042D7C(void);
 
 static s32 sub_804151C(Entity *entity, s32 r1, u8 r2)
 {
@@ -461,7 +451,7 @@ void sub_8041AF4(Entity *pokemon)
     sub_80421C0(pokemon, 407);
 }
 
-void nullsub_57(void)
+void nullsub_57(Entity *pokemon)
 {
 }
 
@@ -470,11 +460,11 @@ void sub_8041B18(Entity *pokemon)
     sub_804151C(pokemon, 321, 1);
 }
 
-void nullsub_58(void)
+void nullsub_58(Entity *pokemon)
 {
 }
 
-void nullsub_59(void)
+void nullsub_59(Entity *pokemon)
 {
 }
 
@@ -483,7 +473,7 @@ void sub_8041B34(Entity *pokemon)
     sub_804151C(pokemon, 7, 1);
 }
 
-void nullsub_60(void)
+void nullsub_60(Entity *pokemon)
 {
 }
 
@@ -492,7 +482,7 @@ void sub_8041B48(Entity *pokemon)
     sub_804151C(pokemon, 4, 0);
 }
 
-void nullsub_61(void)
+void nullsub_61(Entity *pokemon)
 {
 }
 
@@ -510,11 +500,11 @@ void sub_8041B74(Entity *pokemon)
     sub_804151C(pokemon, 369, 0);
 }
 
-void nullsub_63(void)
+void nullsub_63(Entity *pokemon)
 {
 }
 
-void nullsub_64(void)
+void nullsub_64(Entity *pokemon)
 {
 }
 
@@ -523,11 +513,11 @@ void sub_8041B90(Entity *pokemon)
     sub_804151C(pokemon, 428, 0);
 }
 
-void nullsub_65(void)
+void nullsub_65(Entity *pokemon)
 {
 }
 
-void nullsub_66(void)
+void nullsub_66(Entity *pokemon)
 {
 }
 
@@ -536,7 +526,7 @@ void sub_8041BA8(Entity *pokemon)
     sub_804151C(pokemon, 4, 1);
 }
 
-void nullsub_67(void)
+void nullsub_67(Entity *pokemon)
 {
 }
 
@@ -545,7 +535,7 @@ void sub_8041BBC(Entity *pokemon)
     sub_804151C(pokemon, 424, 1);
 }
 
-void nullsub_68(void)
+void nullsub_68(Entity *pokemon)
 {
 }
 
@@ -578,7 +568,7 @@ void sub_8041C1C(Entity *pokemon)
     sub_804151C(pokemon, 423, 1);
 }
 
-void nullsub_69(void)
+void nullsub_69(Entity *pokemon, Entity *target)
 {
 }
 
@@ -587,11 +577,11 @@ void sub_8041C34(Entity *pokemon)
     sub_804151C(pokemon, 0x4C, 1);
 }
 
-void nullsub_70(void)
+void nullsub_70(Entity *pokemon)
 {
 }
 
-void nullsub_71(void)
+void nullsub_71(Entity *pokemon)
 {
 }
 
@@ -615,11 +605,11 @@ void sub_8041C7C(Entity *pokemon)
     sub_804151C(pokemon, 0x9D << 1, 1);
 }
 
-void nullsub_72(void)
+void nullsub_72(Entity *pokemon)
 {
 }
 
-void nullsub_73(void)
+void nullsub_73(Entity *pokemon)
 {
 }
 
@@ -653,7 +643,7 @@ void sub_8041CEC(Entity *pokemon)
     sub_80421C0(pokemon, 0x19d);
 }
 
-void nullsub_74(void)
+void nullsub_74(Entity *pokemon)
 {
 }
 
@@ -697,7 +687,7 @@ void sub_8041D48(Entity * pokemon)
     sub_80421C0(pokemon, 0x191);
 }
 
-void nullsub_81(void)
+void nullsub_81(Entity *pokemon)
 {
 }
 
@@ -714,11 +704,11 @@ void sub_8041D84(Entity *pokemon)
     sub_80421C0(pokemon, 0x19f);
 }
 
-void nullsub_82(void)
+void nullsub_82(Entity *pokemon)
 {
 }
 
-void nullsub_83(void)
+void nullsub_83(Entity *pokemon)
 {
 }
 
@@ -732,42 +722,41 @@ void sub_8041DB0(Entity *pokemon)
     sub_804151C(pokemon, 0x30, 1);
 }
 
-void nullsub_84(void)
+void nullsub_84(Entity *pokemon)
 {
 }
 
-void nullsub_85(void)
+void nullsub_85(Entity *pokemon)
 {
 }
 
-void nullsub_204(void)
+UNUSED static void nullsub_204(void)
 {
 }
 
-void nullsub_86(void)
+void nullsub_86(Entity *pokemon)
 {
 }
 
-void nullsub_87(void)
+void nullsub_87(Entity *pokemon)
 {
 }
 
-void nullsub_88(void)
+void nullsub_88(Entity *pokemon)
 {
 }
 
-void sub_8041DD8(Entity *pokemon, s16 r1)
+void sub_8041DD8(Entity *pokemon, s32 r1)
 {
-    u32 temp;
-    temp = r1;
+    s32 temp = (s16) r1;
 
-    if(MonsterIsType(pokemon, TYPE_GHOST) != 0)
+    if (MonsterIsType(pokemon, TYPE_GHOST))
         sub_804151C(pokemon, temp, 1);
     else
         sub_804151C(pokemon, TYPE_GHOST, 1);
 }
 
-void nullsub_89(void)
+void nullsub_89(Entity *pokemon)
 {
 }
 
@@ -847,7 +836,7 @@ void sub_8041F08(Entity *pokemon)
     sub_8041550(pokemon, 0x15, 1, 3, 2, 0);
 }
 
-void nullsub_90(void)
+void nullsub_90(Entity *pokemon)
 {
 }
 
@@ -983,16 +972,16 @@ void sub_8042080(Entity *pokemon, u32 r1)
     }
 }
 
-void sub_80420A0(Entity *pokemon, u32 r1)
+void sub_80420A0(Entity *pokemon)
 {
     sub_804151C(pokemon, 0x143, 1);
 }
 
-void nullsub_91(void)
+void nullsub_91(Entity *pokemon)
 {
 }
 
-void sub_80420B8(Entity *pokemon, u32 r1)
+void sub_80420B8(Entity *pokemon)
 {
     sub_804151C(pokemon, 0x19, 1);
 }
@@ -1038,7 +1027,7 @@ void sub_8042148(Entity *pokemon)
     sub_804151C(pokemon, 0x9F << 1, 1);
 }
 
-void nullsub_93()
+void nullsub_93(DungeonPos *pos)
 {
 }
 
@@ -1299,7 +1288,7 @@ void sub_80426C8(u32 a0, u32 a1)
     sub_8052210(1);
 }
 
-void sub_8042730(Entity *a0, void *unused)
+void sub_8042730(Entity *a0, Entity *unused)
 {
     s32 i;
 
@@ -1513,7 +1502,7 @@ void sub_8042A74(Entity *r0)
     sub_804151C(r0, 0x18, 1);
 }
 
-void sub_8042A84(s16 param_1, Entity *entity, u32 param_3)
+static void sub_8042A84(s16 param_1, Entity *entity, u32 param_3)
 {
   s32 iVar3;
   s32 r6;
@@ -1549,7 +1538,7 @@ void sub_8042B20(Entity *entity)
 
 static const unkStruct_2039DB0 gUnknown_80F683C = DEFAULT_UNK_2039DB0_MASKS;
 
-void sub_8042B34(s32 a0, s32 a1, s32 a2)
+static void sub_8042B34(s32 a0, s32 a1, s32 a2)
 {
     unkStruct_80416E0 spStruct;
     s32 i;
@@ -1593,7 +1582,7 @@ void sub_8042B34(s32 a0, s32 a1, s32 a2)
     }
 }
 
-bool8 sub_8042CC0(void)
+static bool8 sub_8042CC0(void)
 {
     s32 i;
     bool8 ret = FALSE;
@@ -1623,7 +1612,7 @@ bool8 sub_8042CC0(void)
     return ret;
 }
 
-void sub_8042D7C(void)
+static void sub_8042D7C(void)
 {
     s32 i;
 

src/dungeon_action_execution.c

@@ -4,8 +4,7 @@
 #include "dungeon_ai_leader.h"
 #include "dungeon_move_util.h"
 #include "dungeon_vram.h"
-#include "code_8041AD0.h"
-#include "code_804267C.h"
+#include "dungeon_8041AD0.h"
 #include "code_8066D04.h"
 #include "dungeon_message.h"
 #include "constants/dungeon_action.h"
@@ -42,7 +41,6 @@
 #include "dungeon_entity_movement.h"
 
 void sub_8075BA4(Entity *param_1, u8 param_2);
-void sub_804178C(u8 param_1);
 void nullsub_95(Entity *);
 extern void sub_80671A0(Entity *);
 extern void sub_8067110(Entity *);

src/dungeon_cutscene_articuno.c

@@ -3,8 +3,7 @@
 #include "dungeon_cutscene.h"
 #include "effect_main.h"
 #include "dungeon_vram.h"
-#include "code_8041AD0.h"
-#include "code_804267C.h"
+#include "dungeon_8041AD0.h"
 #include "dungeon_mon_sprite_render.h"
 #include "constants/bg_music.h"
 #include "constants/direction.h"
@@ -33,10 +32,8 @@
 #include "dungeon_leveling.h"
 #include "weather.h"
 
-extern void sub_8042B0C(Entity *);
 extern void sub_8049884(void);
 extern void sub_8049B8C(void);
-extern void sub_8041888(u32);
 extern void sub_8052D44(s16 *, Entity *, Entity *);
 
 static void sub_8088484(Entity *param_1);

src/dungeon_cutscene_celebi.c

@@ -3,8 +3,7 @@
 #include "dungeon_cutscene.h"
 #include "effect_main.h"
 #include "dungeon_vram.h"
-#include "code_8041AD0.h"
-#include "code_804267C.h"
+#include "dungeon_8041AD0.h"
 #include "dungeon_mon_sprite_render.h"
 #include "constants/bg_music.h"
 #include "constants/direction.h"
@@ -34,10 +33,8 @@
 #include "weather.h"
 #include "dungeon_mon_recruit.h"
 
-extern void sub_8042B0C(Entity *);
 extern void sub_8049884(void);
 extern void sub_8049B8C(void);
-extern void sub_8041888(u32);
 extern void sub_8052D44(s16 *, Entity *, Entity *);
 
 static void sub_808C8E0(Entity *entity);

src/dungeon_cutscene_deoxys.c

@@ -3,8 +3,7 @@
 #include "dungeon_cutscene.h"
 #include "effect_main.h"
 #include "dungeon_vram.h"
-#include "code_8041AD0.h"
-#include "code_804267C.h"
+#include "dungeon_8041AD0.h"
 #include "dungeon_mon_sprite_render.h"
 #include "constants/bg_music.h"
 #include "constants/direction.h"
@@ -32,10 +31,8 @@
 #include "dungeon_boss_dialogue.h"
 
 
-extern void sub_8042B0C(Entity *);
 extern void sub_8049884(void);
 extern void sub_8049B8C(void);
-extern void sub_8041888(u32);
 extern void sub_8052D44(s16 *, Entity *, Entity *);
 
 static void DeoxysScreenFlash(void);

src/dungeon_cutscene_empty_summit.c

@@ -3,8 +3,7 @@
 #include "dungeon_cutscene.h"
 #include "effect_main.h"
 #include "dungeon_vram.h"
-#include "code_8041AD0.h"
-#include "code_804267C.h"
+#include "dungeon_8041AD0.h"
 #include "dungeon_mon_sprite_render.h"
 #include "constants/bg_music.h"
 #include "constants/direction.h"

src/dungeon_cutscene_entei.c

@@ -3,8 +3,7 @@
 #include "dungeon_cutscene.h"
 #include "effect_main.h"
 #include "dungeon_vram.h"
-#include "code_8041AD0.h"
-#include "code_804267C.h"
+#include "dungeon_8041AD0.h"
 #include "dungeon_mon_sprite_render.h"
 #include "constants/bg_music.h"
 #include "constants/direction.h"
@@ -31,10 +30,8 @@
 #include "dungeon_config.h"
 #include "dungeon_boss_dialogue.h"
 
-extern void sub_8042B0C(Entity *);
 extern void sub_8049884(void);
 extern void sub_8049B8C(void);
-extern void sub_8041888(u32);
 extern void sub_8052D44(s16 *, Entity *, Entity *);
 
 static void EnteiScreenFlash(void);

src/dungeon_cutscene_groudon.c

@@ -3,8 +3,7 @@
 #include "dungeon_cutscene.h"
 #include "effect_main.h"
 #include "dungeon_vram.h"
-#include "code_8041AD0.h"
-#include "code_804267C.h"
+#include "dungeon_8041AD0.h"
 #include "dungeon_mon_sprite_render.h"
 #include "constants/bg_music.h"
 #include "constants/direction.h"
@@ -33,10 +32,8 @@
 #include "dungeon_tilemap.h"
 #include "dungeon_leveling.h"
 
-extern void sub_8042B0C(Entity *);
 extern void sub_8049884(void);
 extern void sub_8049B8C(void);
-extern void sub_8041888(u32);
 extern void sub_8052D44(s16 *, Entity *, Entity *);
 
 static void SceneGroudonMovement(Entity * groudonEntity);

src/dungeon_cutscene_hooh.c

@@ -3,8 +3,7 @@
 #include "dungeon_cutscene.h"
 #include "effect_main.h"
 #include "dungeon_vram.h"
-#include "code_8041AD0.h"
-#include "code_804267C.h"
+#include "dungeon_8041AD0.h"
 #include "dungeon_mon_sprite_render.h"
 #include "constants/bg_music.h"
 #include "constants/direction.h"
@@ -31,10 +30,8 @@
 #include "dungeon_config.h"
 #include "dungeon_boss_dialogue.h"
 
-extern void sub_8042B0C(Entity *);
 extern void sub_8049884(void);
 extern void sub_8049B8C(void);
-extern void sub_8041888(u32);
 extern void sub_8052D44(s16 *, Entity *, Entity *);
 
 static void HoOhDropInEffect(Entity * param_1);

src/dungeon_cutscene_jirachi.c

@@ -3,8 +3,7 @@
 #include "dungeon_cutscene.h"
 #include "effect_main.h"
 #include "dungeon_vram.h"
-#include "code_8041AD0.h"
-#include "code_804267C.h"
+#include "dungeon_8041AD0.h"
 #include "dungeon_mon_sprite_render.h"
 #include "constants/bg_music.h"
 #include "constants/direction.h"
@@ -33,11 +32,10 @@
 #include "dungeon_floor_spawns.h"
 #include "dungeon_map.h"
 #include "dungeon_mon_spawn.h"
+#include "dungeon_8041AD0.h"
 
-extern void sub_8042B0C(Entity *);
 extern void sub_8049884(void);
 extern void sub_8049B8C(void);
-extern void sub_8041888(u32);
 extern void sub_8052D44(s16 *, Entity *, Entity *);
 
 static void sub_808B50C(void);

src/dungeon_cutscene_kyogre.c

@@ -3,8 +3,7 @@
 #include "dungeon_cutscene.h"
 #include "effect_main.h"
 #include "dungeon_vram.h"
-#include "code_8041AD0.h"
-#include "code_804267C.h"
+#include "dungeon_8041AD0.h"
 #include "dungeon_mon_sprite_render.h"
 #include "constants/bg_music.h"
 #include "constants/direction.h"
@@ -33,10 +32,8 @@
 #include "dungeon_tilemap.h"
 #include "dungeon_map.h"
 
-extern void sub_8042B0C(Entity *);
 extern void sub_8049884(void);
 extern void sub_8049B8C(void);
-extern void sub_8041888(u32);
 extern void sub_8052D44(s16 *, Entity *, Entity *);
 
 static void nullsub_99(void);

src/dungeon_cutscene_latios.c

@@ -3,8 +3,7 @@
 #include "dungeon_cutscene.h"
 #include "effect_main.h"
 #include "dungeon_vram.h"
-#include "code_8041AD0.h"
-#include "code_804267C.h"
+#include "dungeon_8041AD0.h"
 #include "dungeon_mon_sprite_render.h"
 #include "constants/bg_music.h"
 #include "constants/direction.h"
@@ -32,10 +31,8 @@
 #include "dungeon_boss_dialogue.h"
 
 
-extern void sub_8042B0C(Entity *);
 extern void sub_8049884(void);
 extern void sub_8049B8C(void);
-extern void sub_8041888(u32);
 extern void sub_8052D44(s16 *, Entity *, Entity *);
 
 static void LatiosScreenFlash(void);

src/dungeon_cutscene_lugia.c

@@ -3,8 +3,7 @@
 #include "dungeon_cutscene.h"
 #include "effect_main.h"
 #include "dungeon_vram.h"
-#include "code_8041AD0.h"
-#include "code_804267C.h"
+#include "dungeon_8041AD0.h"
 #include "dungeon_mon_sprite_render.h"
 #include "constants/bg_music.h"
 #include "constants/direction.h"
@@ -32,10 +31,8 @@
 #include "dungeon_boss_dialogue.h"
 
 
-extern void sub_8042B0C(Entity *);
 extern void sub_8049884(void);
 extern void sub_8049B8C(void);
-extern void sub_8041888(u32);
 extern void sub_8052D44(s16 *, Entity *, Entity *);
 
 static void LugiaScreenFlash(void);

src/dungeon_cutscene_magma_cavern.c

@@ -3,8 +3,7 @@
 #include "dungeon_cutscene.h"
 #include "effect_main.h"
 #include "dungeon_vram.h"
-#include "code_8041AD0.h"
-#include "code_804267C.h"
+#include "dungeon_8041AD0.h"
 #include "dungeon_mon_sprite_render.h"
 #include "constants/bg_music.h"
 #include "constants/direction.h"
@@ -31,10 +30,8 @@
 #include "dungeon_config.h"
 #include "dungeon_boss_dialogue.h"
 
-extern void sub_8042B0C(Entity *);
 extern void sub_8049884(void);
 extern void sub_8049B8C(void);
-extern void sub_8041888(u32);
 extern void sub_8052D44(s16 *, Entity *, Entity *);
 
 static void sub_80891F0(void);

src/dungeon_cutscene_mankey.c

@@ -3,8 +3,7 @@
 #include "dungeon_cutscene.h"
 #include "effect_main.h"
 #include "dungeon_vram.h"
-#include "code_8041AD0.h"
-#include "code_804267C.h"
+#include "dungeon_8041AD0.h"
 #include "dungeon_mon_sprite_render.h"
 #include "constants/bg_music.h"
 #include "constants/direction.h"
@@ -31,10 +30,8 @@
 #include "dungeon_config.h"
 #include "dungeon_boss_dialogue.h"
 
-extern void sub_8042B0C(Entity *);
 extern void sub_8049884(void);
 extern void sub_8049B8C(void);
-extern void sub_8041888(u32);
 extern void sub_8052D44(s16 *, Entity *, Entity *);
 
 static void sub_80898F8(Entity *r0);

src/dungeon_cutscene_meanies.c

@@ -3,8 +3,7 @@
 #include "dungeon_cutscene.h"
 #include "effect_main.h"
 #include "dungeon_vram.h"
-#include "code_8041AD0.h"
-#include "code_804267C.h"
+#include "dungeon_8041AD0.h"
 #include "dungeon_mon_sprite_render.h"
 #include "constants/bg_music.h"
 #include "constants/direction.h"
@@ -30,10 +29,8 @@
 #include "dungeon_config.h"
 #include "dungeon_boss_dialogue.h"
 
-extern void sub_8042B0C(Entity *);
 extern void sub_8049884(void);
 extern void sub_8049B8C(void);
-extern void sub_8041888(u32);
 extern void sub_8052D44(s16 *, Entity *, Entity *);
 
 static void sub_8087144(void);

src/dungeon_cutscene_medicham.c

@@ -3,8 +3,7 @@
 #include "dungeon_cutscene.h"
 #include "effect_main.h"
 #include "dungeon_vram.h"
-#include "code_8041AD0.h"
-#include "code_804267C.h"
+#include "dungeon_8041AD0.h"
 #include "dungeon_mon_sprite_render.h"
 #include "constants/bg_music.h"
 #include "constants/direction.h"
@@ -31,10 +30,8 @@
 #include "dungeon_config.h"
 #include "dungeon_boss_dialogue.h"
 
-extern void sub_8042B0C(Entity *);
 extern void sub_8049884(void);
 extern void sub_8049B8C(void);
-extern void sub_8041888(u32);
 extern void sub_8052D44(s16 *, Entity *, Entity *);
 
 void sub_808C9C4(void)

src/dungeon_cutscene_mewtwo.c

@@ -3,8 +3,7 @@
 #include "dungeon_cutscene.h"
 #include "effect_main.h"
 #include "dungeon_vram.h"
-#include "code_8041AD0.h"
-#include "code_804267C.h"
+#include "dungeon_8041AD0.h"
 #include "dungeon_mon_sprite_render.h"
 #include "constants/bg_music.h"
 #include "constants/direction.h"
@@ -31,10 +30,8 @@
 #include "dungeon_config.h"
 #include "dungeon_boss_dialogue.h"
 
-extern void sub_8042B0C(Entity *);
 extern void sub_8049884(void);
 extern void sub_8049B8C(void);
-extern void sub_8041888(u32);
 extern void sub_8052D44(s16 *, Entity *, Entity *);
 
 static void MewtwoDropInEffect(Entity *mewtwoEntity);

src/dungeon_cutscene_moltres.c

@@ -3,8 +3,7 @@
 #include "dungeon_cutscene.h"
 #include "effect_main.h"
 #include "dungeon_vram.h"
-#include "code_8041AD0.h"
-#include "code_804267C.h"
+#include "dungeon_8041AD0.h"
 #include "dungeon_mon_sprite_render.h"
 #include "constants/bg_music.h"
 #include "constants/direction.h"
@@ -33,10 +32,8 @@
 #include "dungeon_tilemap.h"
 #include "dungeon_leveling.h"
 
-extern void sub_8042B0C(Entity *);
 extern void sub_8049884(void);
 extern void sub_8049B8C(void);
-extern void sub_8041888(u32);
 extern void sub_8052D44(s16 *, Entity *, Entity *);
 
 static void MoltresDropInEffect(Entity * moltresEntity);

src/dungeon_cutscene_raikou.c

@@ -3,8 +3,7 @@
 #include "dungeon_cutscene.h"
 #include "effect_main.h"
 #include "dungeon_vram.h"
-#include "code_8041AD0.h"
-#include "code_804267C.h"
+#include "dungeon_8041AD0.h"
 #include "dungeon_mon_sprite_render.h"
 #include "constants/bg_music.h"
 #include "constants/direction.h"
@@ -32,10 +31,8 @@
 #include "dungeon_boss_dialogue.h"
 #include "weather.h"
 
-extern void sub_8042B0C(Entity *);
 extern void sub_8049884(void);
 extern void sub_8049B8C(void);
-extern void sub_8041888(u32);
 extern void sub_8052D44(s16 *, Entity *, Entity *);
 
 static void RaikouScreenFlash(void);

src/dungeon_cutscene_rayquaza.c

@@ -3,8 +3,7 @@
 #include "dungeon_cutscene.h"
 #include "effect_main.h"
 #include "dungeon_vram.h"
-#include "code_8041AD0.h"
-#include "code_804267C.h"
+#include "dungeon_8041AD0.h"
 #include "dungeon_mon_sprite_render.h"
 #include "constants/bg_music.h"
 #include "constants/direction.h"
@@ -32,10 +31,8 @@
 #include "dungeon_boss_dialogue.h"
 #include "dungeon_leveling.h"
 
-extern void sub_8042B0C(Entity *);
 extern void sub_8049884(void);
 extern void sub_8049B8C(void);
-extern void sub_8041888(u32);
 extern void sub_8052D44(s16 *, Entity *, Entity *);
 
 static void RayquazaDropInEffect(Entity *rayquazaEntity);

src/dungeon_cutscene_regis.c

@@ -3,8 +3,7 @@
 #include "dungeon_cutscene.h"
 #include "effect_main.h"
 #include "dungeon_vram.h"
-#include "code_8041AD0.h"
-#include "code_804267C.h"
+#include "dungeon_8041AD0.h"
 #include "dungeon_mon_sprite_render.h"
 #include "constants/bg_music.h"
 #include "constants/direction.h"
@@ -32,10 +31,8 @@
 #include "dungeon_boss_dialogue.h"
 #include "dungeon_map.h"
 
-extern void sub_8042B0C(Entity *);
 extern void sub_8049884(void);
 extern void sub_8049B8C(void);
-extern void sub_8041888(u32);
 extern void sub_8052D44(s16 *, Entity *, Entity *);
 
 static void sub_808B1CC(u8 itemID);

src/dungeon_cutscene_skarmory.c

@@ -3,8 +3,7 @@
 #include "dungeon_cutscene.h"
 #include "effect_main.h"
 #include "dungeon_vram.h"
-#include "code_8041AD0.h"
-#include "code_804267C.h"
+#include "dungeon_8041AD0.h"
 #include "dungeon_mon_sprite_render.h"
 #include "constants/bg_music.h"
 #include "constants/direction.h"
@@ -31,10 +30,8 @@
 #include "dungeon_config.h"
 #include "dungeon_boss_dialogue.h"
 
-extern void sub_8042B0C(Entity *);
 extern void sub_8049884(void);
 extern void sub_8049B8C(void);
-extern void sub_8041888(u32);
 extern void sub_8052D44(s16 *, Entity *, Entity *);
 
 static void SkarmoryEntry(Entity * skarmoryEntity);

src/dungeon_cutscene_smeargle.c

@@ -3,8 +3,7 @@
 #include "dungeon_cutscene.h"
 #include "effect_main.h"
 #include "dungeon_vram.h"
-#include "code_8041AD0.h"
-#include "code_804267C.h"
+#include "dungeon_8041AD0.h"
 #include "dungeon_mon_sprite_render.h"
 #include "constants/bg_music.h"
 #include "constants/direction.h"
@@ -31,10 +30,8 @@
 #include "dungeon_config.h"
 #include "dungeon_boss_dialogue.h"
 
-extern void sub_8042B0C(Entity *);
 extern void sub_8049884(void);
 extern void sub_8049B8C(void);
-extern void sub_8041888(u32);
 extern void sub_8052D44(s16 *, Entity *, Entity *);
 
 void DummyFightDialogue(void)

src/dungeon_cutscene_suicune.c

@@ -3,8 +3,7 @@
 #include "dungeon_cutscene.h"
 #include "effect_main.h"
 #include "dungeon_vram.h"
-#include "code_8041AD0.h"
-#include "code_804267C.h"
+#include "dungeon_8041AD0.h"
 #include "dungeon_mon_sprite_render.h"
 #include "constants/bg_music.h"
 #include "constants/direction.h"
@@ -31,10 +30,8 @@
 #include "dungeon_config.h"
 #include "dungeon_boss_dialogue.h"
 
-extern void sub_8042B0C(Entity *);
 extern void sub_8049884(void);
 extern void sub_8049B8C(void);
-extern void sub_8041888(u32);
 extern void sub_8052D44(s16 *, Entity *, Entity *);
 
 static void sub_808A528(Entity * param_1);

src/dungeon_cutscene_zapdos.c

@@ -3,8 +3,7 @@
 #include "dungeon_cutscene.h"
 #include "effect_main.h"
 #include "dungeon_vram.h"
-#include "code_8041AD0.h"
-#include "code_804267C.h"
+#include "dungeon_8041AD0.h"
 #include "dungeon_mon_sprite_render.h"
 #include "constants/bg_music.h"
 #include "constants/direction.h"
@@ -32,10 +31,8 @@
 #include "dungeon_boss_dialogue.h"
 #include "dungeon_leveling.h"
 
-extern void sub_8042B0C(Entity *);
 extern void sub_8049884(void);
 extern void sub_8049B8C(void);
-extern void sub_8041888(u32);
 extern void sub_8052D44(s16 *, Entity *, Entity *);
 
 struct Zapdos1

src/dungeon_damage.c

@@ -31,8 +31,7 @@
 #include "constants/direction.h"
 #include "constants/dungeon.h"
 #include "dungeon_vram.h"
-#include "code_8041AD0.h"
-#include "code_804267C.h"
+#include "dungeon_8041AD0.h"
 #include "code_805D8C8.h"
 #include "dungeon_map_access.h"
 #include "dungeon_data.h"
@@ -49,28 +48,12 @@
 #include "move_orb_effects_2.h"
 #include "move_orb_effects_5.h"
 
-extern void sub_8041B18(Entity *pokemon);
-extern void sub_8041B90(Entity *pokemon);
-extern void sub_8041D00(Entity *pokemon, Entity *target);
-extern void sub_8042238(Entity *pokemon, Entity *target);
 extern void sub_803ED30(s32, Entity *r0, u8, s32);
 extern bool8 sub_806A458(Entity *);
 extern bool8 sub_806A58C(s16 a0);
-extern void sub_8042148(Entity *pokemon);
-extern void sub_8042A24(Entity *r0);
 extern void sub_806A390(Entity *r0);
 extern void sub_800DBBC(void);
-extern void EntityUpdateStatusSprites(Entity *);
 extern void PointCameraToMonster(Entity *);
-extern void sub_8041B74(Entity *pokemon);
-extern void sub_8041B5C(Entity *pokemon);
-extern void sub_8042940(Entity *r0);
-extern void sub_80428B0(Entity *r0);
-extern void sub_80428C4(Entity *r0);
-extern void sub_80428D8(Entity *);
-extern void sub_8042978(Entity *);
-extern void sub_804298C(Entity *);
-extern void sub_80428EC(Entity *);
 
 static bool8 HandleDealingDamageInternal(Entity *attacker, Entity *target, struct DamageStruct *r5, bool32 isFalseSwipe, bool32 giveExp, s16 dungeonExitReason_, s32 arg8);
 static bool8 sub_806E100(s48_16 *param_1, Entity *pokemon, Entity *target, u8 type, DamageStruct *dmgStruct);

src/dungeon_entity_movement.c

@@ -52,6 +52,7 @@
 #include "dungeon_action_execution.h"
 #include "dungeon_tilemap.h"
 #include "run_dungeon.h"
+#include "dungeon_8041AD0.h"
 
 static EWRAM_DATA s32 sSpeedMultiplier = 0;
 
@@ -59,7 +60,6 @@ static void sub_8075050(EntityInfo *info, Unk_Entity_x184 *strPtr);
 static void nullsub_97(Entity *entity);
 static void TryInteractWithTile(Entity *entity);
 
-extern void sub_8041888(u32);
 extern void sub_8073D14(Entity *entity);
 
 static inline void SetSpeedMultiplier(void)

src/dungeon_generation.c

@@ -24,7 +24,6 @@
 
 extern s32 sub_803DA20(s16 species);
 extern void sub_8049840(void);
-extern void sub_80429FC(DungeonPos *r0);
 extern void sub_80498A8(s32, s32);
 extern void sub_8049B8C(void);
 

src/dungeon_generation_fixed.c

@@ -14,8 +14,7 @@
 #include "constants/trap.h"
 #include "constants/item.h"
 #include "dungeon_mon_spawn.h"
-
-extern void sub_80429FC(DungeonPos *r0);
+#include "dungeon_8041AD0.h"
 
 static bool8 sub_805210C(u8 itemId);
 

src/dungeon_item_action.c

@@ -1,7 +1,7 @@
 #include "global.h"
 #include "globaldata.h"
 #include "dungeon_item_action.h"
-#include "code_8041AD0.h"
+#include "dungeon_8041AD0.h"
 #include "dungeon_message.h"
 #include "dungeon_random.h"
 #include "constants/dungeon_action.h"
@@ -41,10 +41,6 @@
 #include "move_orb_effects_2.h"
 #include "move_orb_effects_5.h"
 
-extern void sub_804245C(Entity *, Item *);
-extern s32 sub_8042520(Entity *);
-extern void sub_8042390(Entity *, Item *);
-
 static void StunSeedItemAction(Entity *, Entity *);
 static void MaxElixirAction(Entity *, Entity *);
 static void ProteinItemAction(Entity *, Entity *);

src/dungeon_items.c

@@ -1,7 +1,7 @@
 #include "global.h"
 #include "globaldata.h"
 #include "dungeon_items.h"
-#include "code_8041AD0.h"
+#include "dungeon_8041AD0.h"
 #include "dungeon_range.h"
 #include "dungeon_random.h"
 #include "dungeon_util.h"
@@ -28,10 +28,6 @@
 #include "dungeon_vram.h"
 #include "sprite.h"
 
-extern void sub_80416E0(PixelPos *r0, u32, bool8);
-extern void sub_804178C(u32);
-extern void sub_804219C(PixelPos *pos);
-
 static void MusicBoxCreation(void);
 static u8 sub_8046D70(void);
 

src/dungeon_jobs.c

@@ -9,6 +9,7 @@
 #include "dungeon_range.h"
 #include "string_format.h"
 #include "code_80958E8.h"
+#include "dungeon_8041AD0.h"
 #include "mailbox.h"
 #include "items.h"
 #include "pokemon.h"
@@ -16,9 +17,6 @@
 #include "constants/dungeon.h"
 #include "constants/dungeon_exit.h"
 
-extern void sub_8042A34(DungeonPos *r0);
-extern void sub_804178C(u32);
-
 void sub_80842F0(void)
 {
     s32 i;

src/dungeon_kecleon_shop.c

@@ -2,7 +2,6 @@
 #include "globaldata.h"
 #include "dungeon_kecleon_shop.h"
 #include "weather.h"
-#include "code_804267C.h"
 #include "dungeon_vram.h"
 #include "dungeon_info.h"
 #include "dungeon_config.h"

src/dungeon_leveling.c

@@ -5,7 +5,7 @@
 #include "dungeon_config.h"
 #include "dungeon_range.h"
 #include "dungeon_message.h"
-#include "code_8041AD0.h"
+#include "dungeon_8041AD0.h"
 #include "constants/dungeon.h"
 #include "dungeon_map_access.h"
 #include "dungeon_misc.h"

src/dungeon_logic.c

@@ -30,12 +30,10 @@
 #include "dungeon_config.h"
 #include "dungeon_pos_data.h"
 #include "dungeon_data.h"
+#include "dungeon_8041AD0.h"
 
 // This file deals with things like controlling movement, walkable tiles, ai targeting, status checks and pokemon attributes.
 
-extern void sub_80429B4(Entity *r0);
-extern void ShowVisualFlags(Entity *r0);
-
 EWRAM_DATA u8 gWalkableTileToCrossableTerrain[8] = {0};
 
 u8 GetCrossableTerrain(s16 species)

src/dungeon_main.c

@@ -60,6 +60,7 @@
 #include "dungeon_item_action.h"
 #include "dungeon_strings.h"
 #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);
@@ -75,8 +76,6 @@ bool8 sub_8070F80(Entity * pokemon, s32 direction);
 void sub_806752C(ActionContainer *a0);
 void sub_8067768(ActionContainer *a0);
 extern bool8 sub_8071A8C(Entity *pokemon);
-extern void sub_8041AD0(Entity *pokemon);
-extern void sub_8041AE0(Entity *pokemon);
 
 static EWRAM_DATA bool8 sInDiagonalMode = 0;
 static EWRAM_DATA bool8 sInRotateMode = 0;

src/dungeon_map_access.c

@@ -19,8 +19,7 @@
 #include "dungeon_mon_sprite_render.h"
 #include "dungeon_pos_data.h"
 #include "dungeon_data.h"
-
-extern void sub_8042A14(DungeonPos *);
+#include "dungeon_8041AD0.h"
 
 EWRAM_DATA OpenedFile *gDungeonPaletteFile = {0};
 EWRAM_DATA unkStruct_202EE8C gUnknown_202EE8C[32] = {0};

src/dungeon_menu_items.c

@@ -29,9 +29,7 @@
 #include "code_801B3C0.h"
 #include "dungeon_engine.h"
 #include "dungeon_strings.h"
-
-extern void sub_8041AD0(Entity *pokemon);
-extern void sub_8041AE0(Entity *pokemon);
+#include "dungeon_8041AD0.h"
 
 static EWRAM_DATA ActionParameter sUnknownActionUnk4 = {0};
 static EWRAM_DATA s32 sUnknown_202F240 = 0;

src/dungeon_misc.c

@@ -53,30 +53,22 @@
 #include "dungeon_monster_house.h"
 #include "move_orb_effects_2.h"
 #include "move_orb_effects_5.h"
+#include "dungeon_recruit_release_menu.h"
+#include "dungeon_8041AD0.h"
 
 static void EnsureCastformLoaded(void);
 static void EnsureDeoxysLoaded(void);
 
 extern bool8 sub_806A58C(s16 r0);
-extern void sub_8067A80(u8 a0, s32 a1, s32 a2, Pokemon **a3);
 extern bool8 sub_8070F80(Entity * pokemon, s32 direction);
 extern s32 sub_806A4DC(EntityInfo *info);
-extern void sub_8042900(Entity *r0);
-extern void sub_8042968(Entity *r0);
-extern void sub_8041BBC(Entity *r0);
-extern void sub_804178C(u32);
-extern void sub_8042B20(Entity *entity);
-extern void sub_8042B0C(Entity *entity);
 extern s16 sub_803D970(u32);
 extern bool8 sub_80860A8(u8 id);
 extern u8 sub_803D73C(s32 a0);
 extern void DeletePokemonDungeonSprite(s32 id);
-extern void sub_80429E8(Entity *r0);
 extern s32 sub_803DA20(s32 param_1);
-extern void sub_8042EC8(Entity *a0, s32 a1);
 extern Entity *sub_804550C(s16 a);
 extern Entity *sub_80453AC(s16 id);
-extern void EntityUpdateStatusSprites(Entity *);
 
 extern u8 gUnknown_202F32C;
 
@@ -394,7 +386,7 @@ void sub_8068BDC(bool8 a0)
             WriteFriendAreaName(gFormatBuffer_Items[0], friendAreaId, FALSE);
             DisplayDungeonMessage(NULL, gUnknown_80FE1A4, TRUE); // The Friend Area is full, a friend must be released.
             while (1) {
-                sub_8067A80(friendAreaId, j - areaCapacity.maxPokemon, j, monPointers);
+                ShowRecruitReleaseMenu(friendAreaId, j - areaCapacity.maxPokemon, j, monPointers);
                 for (id = 0; id < j; id++) {
                     Pokemon *monPtr = monPointers[id];
                     if (PokemonExists(monPtr) && (monPtr->flags & POKEMON_FLAG_x8000)) {

src/dungeon_mon_spawn.c

@@ -36,19 +36,12 @@
 #include "dungeon_tilemap.h"
 #include "dungeon_engine.h"
 #include "dungeon_leveling.h"
+#include "dungeon_8041AD0.h"
 
-extern void sub_8042900(Entity *r0);
-extern void sub_8042968(Entity *r0);
-void sub_8041BBC(Entity *r0);
-extern void sub_804178C(u32);
-extern void sub_8042B20(Entity *entity);
-extern void sub_8042B0C(Entity *entity);
 extern bool8 sub_80860A8(u8 id);
 extern u8 gUnknown_202F32C;
-extern void sub_80429E8(Entity *r0);
 extern Entity *sub_804550C(s16 a);
 extern Entity *sub_80453AC(s16 id);
-extern void EntityUpdateStatusSprites(Entity *);
 
 static s32 CalcSpeciesHPAtLevel(s32 species, s32 level);
 static s32 CalcSpeciesAtkAtLevel(s32 species, s32 level, s32 categoryIndex);

src/dungeon_mon_sprite_render.c

@@ -9,8 +9,7 @@
 #include "constants/iq_skill.h"
 #include "structs/str_dungeon.h"
 #include "dungeon_vram.h"
-#include "code_8041AD0.h"
-#include "code_804267C.h"
+#include "dungeon_8041AD0.h"
 #include "code_805D8C8.h"
 #include "dungeon_config.h"
 #include "dungeon_items.h"
@@ -32,8 +31,6 @@
 #include "sprite.h"
 #include "random.h"
 
-extern void sub_8042EC8(Entity *a0, s32 a1);
-
 static const u8 gUnknown_8106EC8[][13] = {
     {0, 1, 7, 7, 7, 5, 6, 7, 7, 7, 7, 7, 7},
     {7, 7, 7, 7, 7, 5, 6, 7, 7, 7, 7, 7, 7},

src/dungeon_monster_house.c

@@ -29,8 +29,7 @@
 #include "dungeon_misc.h"
 #include "dungeon_mon_spawn.h"
 #include "move_orb_effects_5.h"
-
-extern void sub_804178C(u32);
+#include "dungeon_8041AD0.h"
 
 void TryWakeSleepingWildPokemon(void)
 {

src/dungeon_move.c

@@ -11,7 +11,7 @@
 #include "effect_data.h"
 #include "dungeon_vram.h"
 #include "dungeon_tilemap.h"
-#include "code_8041AD0.h"
+#include "dungeon_8041AD0.h"
 #include "dungeon_mon_sprite_render.h"
 #include "dungeon_random.h"
 #include "dungeon_logic.h"
@@ -44,22 +44,14 @@
 #include "dungeon_engine.h"
 #include "warp_target.h"
 
-extern void sub_80429C8(Entity *r0);
 extern s16 GetDungeonExitReasonFromMoveOrItem(Move *move, s32 itemID);
-extern void sub_8042238(Entity *pokemon, Entity *target);
 extern void sub_806A1E8(Entity *pokemon);
-extern void sub_804178C(u32);
-extern void sub_80428A0(Entity *r0);
 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_800EF10(u16 r0);
 extern void sub_800E3AC(s32 a0, DungeonPos *pos, s32 a2);
 extern void sub_8041168(Entity *entity, Entity *entity2, Move *,DungeonPos *);
-extern void sub_8042930(Entity *r0);
-extern void sub_8041B48(Entity *pokemon);
-extern void sub_8041BA8(Entity *pokemon);
-extern void sub_8042950(Entity *r0);
 
 static s32 TryHitTarget(Entity *attacker, Entity *target, Move *move, struct DamageStruct *dmgStruct, s16 unk_);
 

src/dungeon_move_util.c

@@ -11,7 +11,7 @@
 #include "effect_sub_1.h"
 #include "dungeon_vram.h"
 #include "dungeon_tilemap.h"
-#include "code_8041AD0.h"
+#include "dungeon_8041AD0.h"
 #include "dungeon_mon_sprite_render.h"
 #include "dungeon_random.h"
 #include "dungeon_logic.h"
@@ -44,10 +44,7 @@
 #include "dungeon_damage.h"
 #include "dungeon_leveling.h"
 
-extern void sub_80429C8(Entity *r0);
 extern void sub_806A1E8(Entity *pokemon);
-extern void sub_804178C(u32);
-extern void sub_80428A0(Entity *r0);
 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);

src/dungeon_recruit_release_menu.c

@@ -5,7 +5,7 @@
 #include "constants/move_id.h"
 #include "dungeon_vram.h"
 #include "dungeon_tilemap.h"
-#include "code_8041AD0.h"
+#include "dungeon_8041AD0.h"
 #include "dungeon_action.h"
 #include "code_8066D04.h"
 #include "dungeon_mon_sprite_render.h"
@@ -37,23 +37,22 @@
 #include "dungeon_submenu.h"
 #include "dungeon_engine.h"
 
-extern void sub_80684C4(void);
-extern void sub_8068344(void);
-void sub_8068310(s32 n, Pokemon **monPtrs);
-void sub_8067F00(u8 a0, Pokemon **a1, s32 a2, s32 a3, s32 a4);
-void sub_806806C(Pokemon *a0);
-
-
-static EWRAM_DATA WindowHeader gUnknown_202F308 = {0};
+static EWRAM_DATA WindowHeader sReleaseMenuWinHeader = {0};
 static EWRAM_DATA s32 gUnknown_202F30C = 0;
 static EWRAM_DATA s32 gUnknown_202F310 = 0;
 
+static void sub_8067F00(u8 a0, Pokemon **a1, s32 a2_, s32 a3, s32 a4);
+static void ShowPokemonSummary(Pokemon *a0);
+static void sub_8068310(s32 n, Pokemon **monPtrs);
+static void ShowUpArrowSprite(void);
+static void ShowDownArrowSprite(void);
+
 // It's likely a struct only used in Blue version. Touchpad maybe?
 static const u8 sTouchScreenArrowPressData[] = {
     0x01, 0, 0x38, 0, 0, 0, 0x18, 0, 0x18, 0, 0, 0, 0x02, 0, 0x38, 0, 0x68, 0, 0x18, 0, 0x18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 };
 
-static const WindowTemplates gUnknown_8106DC8 = {
+static const WindowTemplates sReleaseMenuWindowTemplates = {
     .id = {
         [0] =
         {
@@ -64,7 +63,7 @@ static const WindowTemplates gUnknown_8106DC8 = {
             .height = 0x0E,
             .unk10 = 0x12,
             .unk12 = 0x02,
-            .header = &gUnknown_202F308
+            .header = &sReleaseMenuWinHeader
         },
         [1] =
         {
@@ -82,11 +81,11 @@ static const WindowTemplates gUnknown_8106DC8 = {
     }
 };
 
-void sub_8067A80(u8 a0, s32 a1, s32 a2, Pokemon **a3)
+void ShowRecruitReleaseMenu(u8 a0, s32 a1, s32 a2, Pokemon **a3)
 {
     s32 i;
     s32 r10;
-    WindowTemplates spTxtStruct = gUnknown_8106DC8;
+    WindowTemplates winTemplates = sReleaseMenuWindowTemplates;
 
     gUnknown_202F30C = 0;
     r10 = 0;
@@ -101,14 +100,14 @@ void sub_8067A80(u8 a0, s32 a1, s32 a2, Pokemon **a3)
         while (1) {
             s32 r7 = 0, r5 = 0;
 
-            gUnknown_202F308.count = 1;
-            gUnknown_202F308.currId = 0;
-            gUnknown_202F308.width = 0xE;
-            gUnknown_202F308.f3 = 0;
+            sReleaseMenuWinHeader.count = 1;
+            sReleaseMenuWinHeader.currId = 0;
+            sReleaseMenuWinHeader.width = 0xE;
+            sReleaseMenuWinHeader.f3 = 0;
 
             ASM_MATCH_TRICK(r7);
 
-            DungeonShowWindows(&spTxtStruct, 1);
+            DungeonShowWindows(&winTemplates, 1);
             sub_8067F00(a0, a3, gUnknown_202F30C, a2, a1);
             gDungeonMenu.currPageEntries = min(a2, 8);
             gDungeonMenu.menuIndex = r10;
@@ -131,11 +130,11 @@ void sub_8067A80(u8 a0, s32 a1, s32 a2, Pokemon **a3)
                 r7 = 0;
                 if (a2 - gUnknown_202F30C > 8) {
                     r5 = 1;
-                    sub_80684C4();
+                    ShowDownArrowSprite();
                 }
                 if (gUnknown_202F30C != 0) {
                     r7 = 1;
-                    sub_8068344();
+                    ShowUpArrowSprite();
                 }
 
                 touchScreenArrow = GetTouchScreenArrowPress(0, sTouchScreenArrowPressData);
@@ -243,7 +242,7 @@ void sub_8067A80(u8 a0, s32 a1, s32 a2, Pokemon **a3)
             }
             else if (r7 == 3) {
                 r10 = gDungeonMenu.menuIndex;
-                sub_806806C(a3[gUnknown_202F30C + r10]);
+                ShowPokemonSummary(a3[gUnknown_202F30C + r10]);
                 continue;
             }
             else {
@@ -270,7 +269,7 @@ void sub_8067A80(u8 a0, s32 a1, s32 a2, Pokemon **a3)
                 }
 
                 sub_8045064();
-                CreateDungeonMenuSubWindow(&spTxtStruct.id[0], 0x15);
+                CreateDungeonMenuSubWindow(&winTemplates.id[0], 0x15);
 
                 while (1) {
                     AddMenuCursorSprite(&gDungeonMenu);
@@ -312,7 +311,7 @@ void sub_8067A80(u8 a0, s32 a1, s32 a2, Pokemon **a3)
                         sub_8068310(a2, a3);
                     }
                     else {
-                        sub_806806C(a3[arrId]);
+                        ShowPokemonSummary(a3[arrId]);
                     }
                 }
                 continue;
@@ -321,7 +320,7 @@ void sub_8067A80(u8 a0, s32 a1, s32 a2, Pokemon **a3)
     }
 }
 
-void sub_8067F00(u8 a0, Pokemon **a1, s32 a2_, s32 a3, s32 a4)
+static void sub_8067F00(u8 a0, Pokemon **a1, s32 a2_, s32 a3, s32 a4)
 {
     s32 i, y;
     s32 a2;
@@ -375,24 +374,24 @@ void sub_8067F00(u8 a0, Pokemon **a1, s32 a2_, s32 a3, s32 a4)
     sub_80073E0(1);
 }
 
-void sub_806806C(Pokemon *a0)
+static void ShowPokemonSummary(Pokemon *a0)
 {
     struct MonSummaryInfo unkStruct;
     struct UnkInfoTabStruct var_C8;
-    WindowTemplates spTxtStruct = {0};
+    WindowTemplates winTemplates = {0};
     s32 r7;
 
-    spTxtStruct.id[0].type = WINDOW_TYPE_WITH_HEADER;
-    spTxtStruct.id[0].pos.x = 2;
-    spTxtStruct.id[0].pos.y = 2;
-    spTxtStruct.id[0].width = 0x12;
-    spTxtStruct.id[0].height = 0xE;
-    spTxtStruct.id[0].unk10 = 0x12;
-    spTxtStruct.id[0].unk12 = 2;
-    spTxtStruct.id[0].header = &gUnknown_202F308;
-    spTxtStruct.id[1].type = WINDOW_TYPE_NORMAL;
-    spTxtStruct.id[2].type = WINDOW_TYPE_NORMAL;
-    spTxtStruct.id[3].type = WINDOW_TYPE_NORMAL;
+    winTemplates.id[0].type = WINDOW_TYPE_WITH_HEADER;
+    winTemplates.id[0].pos.x = 2;
+    winTemplates.id[0].pos.y = 2;
+    winTemplates.id[0].width = 0x12;
+    winTemplates.id[0].height = 0xE;
+    winTemplates.id[0].unk10 = 0x12;
+    winTemplates.id[0].unk12 = 2;
+    winTemplates.id[0].header = &sReleaseMenuWinHeader;
+    winTemplates.id[1].type = WINDOW_TYPE_NORMAL;
+    winTemplates.id[2].type = WINDOW_TYPE_NORMAL;
+    winTemplates.id[3].type = WINDOW_TYPE_NORMAL;
 
     r7 = 0;
     unkStruct.unk40 = 0;
@@ -403,10 +402,10 @@ void sub_806806C(Pokemon *a0)
         bool32 loopBreak = FALSE;
         s32 spF8[4] = {2, 3, 4, 5};
 
-        gUnknown_202F308.count = 4;
-        gUnknown_202F308.currId = r7;
-        gUnknown_202F308.width = 10;
-        gUnknown_202F308.f3 = 0;
+        sReleaseMenuWinHeader.count = 4;
+        sReleaseMenuWinHeader.currId = r7;
+        sReleaseMenuWinHeader.width = 10;
+        sReleaseMenuWinHeader.f3 = 0;
 
         gDungeonMenu.currPage = r7;
         gDungeonMenu.pagesCount = 4;
@@ -419,7 +418,7 @@ void sub_806806C(Pokemon *a0)
         gDungeonMenu.windowId = 0;
 
         ResetTouchScreenMenuInput(&gDungeonMenu.touchScreen);
-        DungeonShowWindows(&spTxtStruct, 1);
+        DungeonShowWindows(&winTemplates, 1);
         SetMonSummaryInfo(&unkStruct, a0, gDungeon->unk644.unk16);
         ShowPokemonSummaryWindow(spF8[r7], r7, &unkStruct, &var_C8, 0);
 
@@ -432,10 +431,10 @@ void sub_806806C(Pokemon *a0)
             AddMenuCursorSprite(&gDungeonMenu);
             if (spF8[r7] == 4) {
                 if (var_C8.unk0[8] != 0) {
-                    sub_80684C4();
+                    ShowDownArrowSprite();
                 }
                 if (unkStruct.unk40 != 0) {
-                    sub_8068344();
+                    ShowUpArrowSprite();
                 }
             }
 
@@ -506,7 +505,7 @@ void sub_806806C(Pokemon *a0)
     sub_803EAF0(0, NULL);
 }
 
-void sub_8068310(s32 n, Pokemon **monPtrs)
+static void sub_8068310(s32 n, Pokemon **monPtrs)
 {
     s32 i;
     s32 counter = 0;
@@ -519,7 +518,8 @@ void sub_8068310(s32 n, Pokemon **monPtrs)
     gUnknown_202F310 = counter;
 }
 
-void sub_8068344(void)
+// Identical to the functions in dungeon_menu_team.c
+static void ShowUpArrowSprite(void)
 {
     if ((gDungeonFramesCounter & 8) != 0) {
         Window *window = &gWindows[0];
@@ -542,8 +542,7 @@ void sub_8068344(void)
     }
 }
 
-// The same as sub_80623B0
-void sub_80684C4(void)
+static void ShowDownArrowSprite(void)
 {
     if ((gDungeonFramesCounter & 8) != 0) {
         Window *window = &gWindows[0];

src/dungeon_tilemap.c

@@ -32,8 +32,7 @@
 #include "dungeon_strings.h"
 #include "run_dungeon.h"
 #include "effect_main.h"
-
-extern void sub_8041888(u8 param_1);
+#include "dungeon_8041AD0.h"
 
 static void sub_803F38C(void);
 static void sub_803F7BC(void);

src/dungeon_turn_effects.c

@@ -40,12 +40,11 @@
 #include "move_orb_effects_1.h"
 #include "warp_target.h"
 #include "move_orb_effects_5.h"
+#include "dungeon_8041AD0.h"
+#include "dungeon_entity_movement.h"
 
 extern void sub_805229C(void);
-extern void sub_80420B8(Entity *pokemon);
-extern void sub_8041C4C(Entity *pokemon, u32 r1);
 extern void sub_805E804(void);
-extern bool8 DisplayActions(Entity *a0);
 
 void ApplyEndOfTurnEffects(Entity *entity)
 {

src/dungeon_util.c

@@ -4,7 +4,7 @@
 #include "structs/str_dungeon.h"
 #include "structs/str_traps.h"
 #include "structs/map.h"
-#include "code_8041AD0.h"
+#include "dungeon_8041AD0.h"
 #include "dungeon_mon_sprite_render.h"
 #include "dungeon_items.h"
 #include "dungeon_map_access.h"

src/dungeon_wild_mon_spawn.c

@@ -5,7 +5,7 @@
 #include "dungeon_config.h"
 #include "dungeon_range.h"
 #include "dungeon_message.h"
-#include "code_8041AD0.h"
+#include "dungeon_8041AD0.h"
 #include "constants/dungeon.h"
 #include "dungeon_map_access.h"
 #include "dungeon_random.h"
@@ -19,8 +19,6 @@
 #include "dungeon_misc.h"
 #include "dungeon_mon_spawn.h"
 
-extern void sub_8042920(struct Entity *r0);
-
 void TrySpawnWildMonster(void)
 {
     s32 i;

src/dungeon_wind.c

@@ -2,7 +2,6 @@
 #include "globaldata.h"
 #include "dungeon_wind.h"
 #include "dungeon_misc.h"
-#include "code_804267C.h"
 #include "dungeon_message.h"
 #include "constants/ability.h"
 #include "constants/dungeon_exit.h"
@@ -21,6 +20,7 @@
 #include "structs/str_dungeon.h"
 #include "dungeon_engine.h"
 #include "dungeon_entity_movement.h"
+#include "dungeon_8041AD0.h"
 
 void UpdateWindTurns(void)
 {

src/explosion.c

@@ -19,7 +19,7 @@
 #include "move_orb_effects_1.h"
 #include "moves.h"
 #include "move_util.h"
-#include "code_8041AD0.h"
+#include "dungeon_8041AD0.h"
 #include "weather.h"
 #include "dungeon_config.h"
 #include "dungeon_misc.h"
@@ -28,9 +28,6 @@
 #include "dungeon_engine.h"
 #include "dungeon_damage.h"
 
-extern void sub_804216C(Entity *pokemon, Entity *target, u32 r2);
-extern void sub_804218C(Entity *pokemon, Entity *target);
-
 static EWRAM_INIT u32 gUnknown_203B444[3] = {0x28, 0x28, 0x50};
 
 static const DungeonPos gUnknown_81070E8[] = {

src/expose_trap.c

@@ -18,7 +18,7 @@
 #include "move_orb_effects_1.h"
 #include "moves.h"
 #include "move_util.h"
-#include "code_8041AD0.h"
+#include "dungeon_8041AD0.h"
 #include "weather.h"
 #include "dungeon_config.h"
 #include "dungeon_misc.h"

src/hurl_orb.c

@@ -2,8 +2,7 @@
 #include "globaldata.h"
 #include "hurl_orb.h"
 #include "dungeon_vram.h"
-#include "code_8041AD0.h"
-#include "code_804267C.h"
+#include "dungeon_8041AD0.h"
 #include "code_805D8C8.h"
 #include "dungeon_mon_sprite_render.h"
 #include "constants/ability.h"

src/move_orb_actions_5.c

@@ -17,9 +17,7 @@
 #include "hurl_orb.h"
 #include "trap.h"
 #include "move_orb_effects_2.h"
-
-extern void sub_8042A54(DungeonPos *);
-extern void sub_8042A64(DungeonPos *);
+#include "dungeon_8041AD0.h"
 
 bool8 FillInOrbAction(Entity *pokemon,Entity *target, Move *move, s32 itemId)
 {

src/move_orb_effects_1.c

@@ -32,40 +32,7 @@
 #include "dungeon_vram.h"
 #include "dungeon_pos_data.h"
 #include "dungeon_data.h"
-
-extern void sub_80420A0(Entity *);
-extern void sub_8041C58(Entity *r0);
-extern void sub_8041F28(Entity *, s32);
-extern void sub_8041F4C(Entity *, s32);
-extern void sub_8041F70(Entity *, s32);
-extern void sub_8041F94(Entity *, s32);
-extern void sub_8041C08(Entity *);
-extern void sub_8076CB4(s32);
-extern void sub_8041F08(Entity *);
-extern void sub_8041C7C(Entity *);
-extern void sub_8041C6C(Entity *);
-extern void sub_8041C34(Entity *);
-extern void sub_8041EF8(Entity *);
-extern void sub_8041EE8(Entity *);
-extern void sub_8041EC8(Entity *);
-extern void sub_8041ED8(Entity *);
-extern void EntityUpdateStatusSprites(Entity *);
-extern void sub_8041AF4(Entity *);
-extern void nullsub_91(Entity *);
-extern void nullsub_90(Entity *);
-extern void nullsub_72(Entity *);
-extern void nullsub_71(Entity *);
-extern void nullsub_70(Entity *);
-extern void nullsub_69(Entity *, Entity *);
-extern void sub_8041CB8(Entity *r0);
-extern void sub_8041C1C(Entity *r0);
-extern void sub_8042060(Entity *, s32);
-extern void sub_8041FB4(Entity *r0, u32 r1);
-extern void sub_8041FD8(Entity *r0, u32 r1);
-extern void sub_804201C(Entity *r0, u32 r1);
-extern void sub_8041FFC(Entity *r0, u32 r1);
-extern void sub_8041CCC(Entity *);
-extern void sub_8042040(Entity *, s32);
+#include "dungeon_8041AD0.h"
 
 u8 sub_8075BF4(Entity * pokemon, s32 sleepClassStatusTurns)
 {

src/move_orb_effects_2.c

@@ -30,65 +30,7 @@
 #include "move_orb_actions_1.h"
 #include "move_orb_effects_5.h"
 #include "run_dungeon.h"
-
-extern void sub_8041D84(Entity *);
-extern void sub_804178C(u32);
-extern void sub_8041D5C(Entity *);
-extern void sub_8041D48(Entity *);
-extern void sub_8041D38(Entity * pokemon);
-extern void sub_8041CDC(Entity *pokemon);
-extern void sub_8041CEC(Entity *pokemon);
-extern void nullsub_73(Entity *);
-extern void nullsub_74(Entity *);
-extern void nullsub_75(Entity *);
-extern void nullsub_76(Entity *);
-extern void nullsub_77(Entity *);
-extern void nullsub_78(Entity *);
-extern void nullsub_79(Entity *);
-extern void nullsub_80(Entity *);
-extern void nullsub_81(Entity *);
-extern void nullsub_82(Entity *);
-extern void nullsub_83(Entity *);
-extern void nullsub_84(Entity *);
-extern void nullsub_85(Entity *);
-extern void EntityUpdateStatusSprites(Entity *);
-extern void sub_8042A74(Entity *r0);
-extern void sub_80420C8(Entity *r0);
-extern void nullsub_68(Entity *);
-extern void nullsub_67(Entity *);
-extern void nullsub_66(Entity *);
-extern void nullsub_65(Entity *);
-extern void nullsub_64(Entity *);
-extern void nullsub_63(Entity *);
-extern void nullsub_62(Entity *);
-extern void nullsub_61(Entity *);
-extern void nullsub_60(Entity *);
-extern void nullsub_59(Entity *);
-extern void nullsub_58(Entity *);
-extern void nullsub_57(Entity *);
-extern void sub_8041B34(Entity *);
-void sub_8041BD0(Entity *r0, u8 r1);
-void sub_8041EB4(Entity *);
-void sub_8041EA4(Entity *);
-extern void sub_8041E84(Entity *);
-extern void sub_8041E94(Entity *);
-extern void sub_8041E74(Entity *);
-extern void sub_8041E60(Entity *);
-extern void sub_8041E4C(Entity *);
-extern void sub_8041E3C(Entity *);
-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 void sub_8041DD8(Entity *r0, s32 r1); // NOTE: is s16 in another file
-extern void sub_8041D9C(Entity *);
-extern void sub_8041DB0(Entity *pokemon);
-extern void sub_8041CA8(Entity *);
-extern void sub_8041C94(Entity *);
-extern void sub_8041BF8(Entity *);
-extern void sub_8041BE8(Entity *);
+#include "dungeon_8041AD0.h"
 
 void ConfuseStatusTarget(Entity * pokemon, Entity * target, bool8 displayMessage)
 {

src/move_orb_effects_3.c

@@ -26,9 +26,7 @@
 #include "dungeon_config.h"
 #include "dungeon_strings.h"
 #include "dungeon_pos_data.h"
-
-extern void sub_8041BD0(Entity *r0, u8 r1);
-extern void EntityUpdateStatusSprites(Entity *);
+#include "dungeon_8041AD0.h"
 
 void SetChargeStatusTarget(Entity *pokemon, Entity *target, u8 newStatus, Move *move, const u8 *message)
 {

src/move_orb_effects_4.c

@@ -26,22 +26,7 @@
 #include "dungeon_config.h"
 #include "dungeon_strings.h"
 #include "dungeon_misc.h"
-
-extern void EntityUpdateStatusSprites(Entity *);
-extern void nullsub_68(Entity *);
-extern void nullsub_67(Entity *);
-extern void nullsub_66(Entity *);
-extern void nullsub_65(Entity *);
-extern void nullsub_64(Entity *);
-extern void nullsub_63(Entity *);
-extern void nullsub_62(Entity *);
-extern void nullsub_61(Entity *);
-extern void nullsub_60(Entity *);
-extern void nullsub_59(Entity *);
-extern void nullsub_58(Entity *);
-extern void nullsub_57(Entity *);
-extern void sub_8041B34(Entity *pokemon);
-extern void sub_80420C8(Entity *pokemon);
+#include "dungeon_8041AD0.h"
 
 void CounterStatusTarget(Entity * pokemon, Entity * target, u8 newStatus)
 {

src/move_orb_effects_5.c

@@ -34,38 +34,7 @@
 #include "dungeon_kecleon_shop.h"
 #include "dungeon_map.h"
 #include "move_orb_effects_2.h"
-
-extern void EntityUpdateStatusSprites(Entity *);
-extern void sub_8042A74(Entity *r0);
-extern void sub_80420C8(Entity *r0);
-extern void nullsub_68(Entity *);
-extern void nullsub_67(Entity *);
-extern void nullsub_66(Entity *);
-extern void nullsub_65(Entity *);
-extern void nullsub_64(Entity *);
-extern void nullsub_63(Entity *);
-extern void nullsub_62(Entity *);
-extern void nullsub_61(Entity *);
-extern void nullsub_60(Entity *);
-extern void nullsub_59(Entity *);
-extern void nullsub_58(Entity *);
-extern void nullsub_57(Entity *);
-extern void sub_8041B34(Entity *);
-void sub_8041BD0(Entity *r0, u8 r1);
-void sub_8041EB4(Entity *);
-void sub_8041EA4(Entity *);
-extern void sub_8041E84(Entity *);
-extern void sub_8041E94(Entity *);
-extern void sub_8041E74(Entity *);
-extern void sub_8041E60(Entity *);
-extern void sub_8041E4C(Entity *);
-extern void sub_8041E3C(Entity *);
-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 *);
+#include "dungeon_8041AD0.h"
 
 void sub_8079F20(Entity * pokemon, Entity * target, u8 param_3, u8 param_4)
 {

src/one_room_orb.c

@@ -18,7 +18,7 @@
 #include "move_orb_effects_1.h"
 #include "moves.h"
 #include "move_util.h"
-#include "code_8041AD0.h"
+#include "dungeon_8041AD0.h"
 #include "weather.h"
 #include "dungeon_config.h"
 #include "dungeon_misc.h"

src/pounce_orb.c

@@ -18,7 +18,7 @@
 #include "move_orb_effects_1.h"
 #include "moves.h"
 #include "move_util.h"
-#include "code_8041AD0.h"
+#include "dungeon_8041AD0.h"
 #include "weather.h"
 #include "dungeon_config.h"
 #include "dungeon_misc.h"

src/run_dungeon.c

@@ -59,13 +59,13 @@
 #include "dungeon_cutscene.h"
 #include "dungeon_mon_spawn.h"
 #include "dungeon_action_execution.h"
+#include "dungeon_8041AD0.h"
 
 EWRAM_INIT struct UnkStruct_203B414 *gUnknown_203B414 = NULL;
 EWRAM_INIT Dungeon *gDungeon = NULL;
 static EWRAM_INIT u8 *gSerializedData_203B41C = NULL;
 
 extern void sub_8068BDC(u8 r0);
-extern void sub_8041888(u8 param_1);
 extern void sub_803D4AC(void);
 extern void sub_804513C(void);
 extern void sub_8068F28(void);
@@ -78,7 +78,6 @@ extern void sub_807E5AC(void);
 extern void nullsub_16(void);
 extern void sub_80521D0(void);
 extern void sub_8068A84(Pokemon *pokemon);
-extern void sub_80427AC(void);
 extern void sub_806AA70(void);
 extern void ReevaluateSnatchMonster(void);
 extern void sub_8051E3C(void);
@@ -86,10 +85,8 @@ extern void sub_807FA18(void);
 extern void sub_806A974(void);
 extern void DetermineAllMonsterShadow(void);
 extern void sub_8068F80(void);
-extern void sub_8042E98(void);
 extern bool8 TryForcedLoss(bool8);
 extern void sub_806A914(bool8 a0, bool8 a1, bool8 showRunAwayEffect);
-extern void sub_8042B0C(Entity *);
 
 extern u8 gUnknown_202F1A8;
 

src/switcher_orb.c

@@ -18,7 +18,7 @@
 #include "move_orb_effects_1.h"
 #include "moves.h"
 #include "move_util.h"
-#include "code_8041AD0.h"
+#include "dungeon_8041AD0.h"
 #include "weather.h"
 #include "dungeon_config.h"
 #include "dungeon_misc.h"
@@ -26,8 +26,6 @@
 #include "dungeon_strings.h"
 #include "dungeon_kecleon_shop.h"
 
-extern void nullsub_93(DungeonPos *);
-
 void HandleSwitcherOrb(Entity *pokemon, Entity *target, bool8 unused)
 {
   DungeonPos pokemonPos;

src/trap.c

@@ -2,7 +2,7 @@
 #include "globaldata.h"
 #include "trap.h"
 #include "dungeon_tilemap.h"
-#include "code_8041AD0.h"
+#include "dungeon_8041AD0.h"
 #include "dungeon_message.h"
 #include "dungeon_random.h"
 #include "dungeon_mon_sprite_render.h"
@@ -39,8 +39,6 @@
 #include "move_orb_effects_2.h"
 #include "move_orb_effects_4.h"
 
-void sub_80421EC(DungeonPos *, u32);
-void sub_804225C(Entity *, DungeonPos *, u8);
 void sub_806A1E8(Entity *pokemon);
 Entity *sub_8045684(u8, DungeonPos *, u8);
 

src/trawl_orb.c

@@ -18,7 +18,7 @@
 #include "move_orb_effects_1.h"
 #include "moves.h"
 #include "move_util.h"
-#include "code_8041AD0.h"
+#include "dungeon_8041AD0.h"
 #include "weather.h"
 #include "dungeon_config.h"
 #include "dungeon_misc.h"

src/warp_target.c

@@ -18,7 +18,7 @@
 #include "move_orb_effects_1.h"
 #include "moves.h"
 #include "move_util.h"
-#include "code_8041AD0.h"
+#include "dungeon_8041AD0.h"
 #include "weather.h"
 #include "dungeon_config.h"
 #include "dungeon_tilemap.h"

src/weather.c

@@ -5,7 +5,6 @@
 #include "constants/move_id.h"
 #include "constants/weather.h"
 #include "structs/str_dungeon.h"
-#include "code_804267C.h"
 #include "dungeon_vram.h"
 #include "dungeon_info.h"
 #include "dungeon_config.h"
@@ -33,9 +32,7 @@
 #include "dungeon_misc.h"
 #include "sprite.h"
 #include "dungeon_strings.h"
-
-extern void sub_804178C(u32);
-extern void sub_80429D8(Entity *r0);
+#include "dungeon_8041AD0.h"
 
 extern OpenedFile *gUnknown_202ECA0;
 

sym_ewram.txt

@@ -50,7 +50,7 @@
     .include "src/dungeon_menu_others.o"
     .include "src/dungeon_menu_recruitment.o"
     .include "src/code_8066D04.o"
-    .include "src/dungeon_8067A80.o"
+    .include "src/dungeon_recruit_release_menu.o"
     .include "src/dungeon_logic.o"
     .include "src/dungeon_leveling.o"
     .include "src/dungeon_action_execution.o"