From 2b97db18bfc9af6723a8d3ed367d83c4417ff5c5 Mon Sep 17 00:00:00 2001 From: slaw-22 <> Date: Sat, 11 Oct 2025 12:00:09 +0000 Subject: [PATCH] Tidy up externs and organise includes --- src/dungeon_recruitment.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/dungeon_recruitment.c b/src/dungeon_recruitment.c index d626bb5b..352def0d 100644 --- a/src/dungeon_recruitment.c +++ b/src/dungeon_recruitment.c @@ -1,27 +1,25 @@ -#include "dungeon_recruitment.h" -#include "dg_random.h" +#include "dungeon.h" #include "dungeon_logic_3.h" +#include "dungeon_logic_7.h" #include "dungeon_mode.h" #include "dungeon_pokemon_attributes_1.h" +#include "dungeon_recruitment.h" +#include "dungeon_recruitment_2.h" +#include "dg_random.h" #include "dungeon_visibility.h" -#include "dungeon.h" #include "enums.h" +#include "fixed_room_data_1.h" #include "main_0205283C.h" // GetRecruitRate1 and GetRecruitRate2 #include "main_0208655C.h" #include "math.h" #include "overlay_29_0230E578.h" // ItemIsActive__0230E578 -#include "dungeon_logic_7.h" -extern bool8 IsRecruitingAllowed(u8 dungeon_id); -extern bool8 IsFullFloorFixedRoom(void); extern bool8 IsLegendaryChallengeFloor(void); extern bool8 IsCurrentMissionTypeExact(u32 mission_type, u32 mission_subtype); extern bool8 IsMonsterOnTeam(s16 monsterId, s32 checkType); extern void ov29_022E1B28(s32); extern void ov29_022E81F8(void); extern bool8 HasPlayedOldGame(void); -extern s16 GetRecruitRate1(s16 monsterId); -extern s16 GetRecruitRate2(s16 monsterId); extern s32 GetFirstEmptyMemberIdx(u32); extern const s16 FRIEND_BOW_FAST_FRIEND_BOOST;