1 files changed, 30 insertions, 33 deletions
diff --git a/src/pokemon.c b/src/pokemon.c
index b858ee925..47c4f9217 100644
--- a/src/pokemon.c
+++ b/src/pokemon.c
@@ -1,41 +1,42 @@
 #include "global.h"
-#include "pokemon.h"
+#include "apprentice.h"
 #include "battle.h"
-#include "battle_setup.h"
-#include "battle_message.h"
-#include "random.h"
-#include "main.h"
-#include "constants/species.h"
-#include "constants/abilities.h"
-#include "constants/items.h"
-#include "constants/trainers.h"
-#include "constants/moves.h"
-#include "constants/hold_effects.h"
-#include "constants/battle_move_effects.h"
-#include "constants/songs.h"
-#include "constants/battle_frontier.h"
-#include "string_util.h"
-#include "text.h"
-#include "link.h"
-#include "event_data.h"
-#include "item.h"
 #include "battle_controllers.h"
 #include "battle_message.h"
+#include "battle_pike.h"
+#include "battle_setup.h"
+#include "battle_tower.h"
+#include "event_data.h"
 #include "evolution_scene.h"
-#include "pokemon_animation.h"
+#include "item.h"
+#include "link.h"
+#include "main.h"
+#include "malloc.h"
+#include "m4a.h"
 #include "pokedex.h"
 #include "pokeblock.h"
+#include "pokemon.h"
+#include "pokemon_animation.h"
+#include "pokemon_storage_system.h"
+#include "pokenav.h"
+#include "random.h"
+#include "recorded_battle.h"
+#include "rtc.h"
 #include "sound.h"
+#include "string_util.h"
+#include "strings.h"
 #include "task.h"
-#include "rtc.h"
-#include "m4a.h"
-#include "malloc.h"
+#include "text.h"
 #include "util.h"
-#include "strings.h"
-#include "pokenav.h"
-#include "pokemon_storage_system.h"
-#include "recorded_battle.h"
-#include "apprentice.h"
+#include "constants/abilities.h"
+#include "constants/battle_frontier.h"
+#include "constants/battle_move_effects.h"
+#include "constants/hold_effects.h"
+#include "constants/items.h"
+#include "constants/moves.h"
+#include "constants/songs.h"
+#include "constants/species.h"
+#include "constants/trainers.h"
 
 struct SpeciesItem
 {
@@ -80,14 +81,10 @@ extern u8 StorageGetCurrentBox(void);
 extern void set_unknown_box_id(u8);
 extern void sub_803FA70(u8 battlerId);
 extern u8 sav1_map_get_name(void);
-extern u8 GetFrontierEnemyMonLevel(u8);
 extern bool8 InBattlePyramid(void);
-extern bool8 InBattlePike(void);
 extern bool8 sub_806F104(void);
 extern u8 GetTrainerEncounterMusicIdInBattlePyramind(u16 trainerOpponentId);
 extern u8 sub_81D63C8(u16 trainerOpponentId);
-extern u8 GetFrontierOpponentClass(u16 trainerId);
-extern void GetFrontierTrainerName(u8* dest, u16 trainerId);
 extern void SummaryScreen_SetUnknownTaskId(u8);
 
 // this file's functions
@@ -2904,7 +2901,7 @@ void CreateApprenticeMon(struct Pokemon *mon, const struct Apprentice *src, u8 m
     CalculateMonStats(mon);
 }
 
-void CreateMonWithEVSpreadPersonalityOTID(struct Pokemon *mon, u16 species, u8 level, u8 nature, u8 fixedIV, u8 evSpread, u32 otId)
+void CreateMonWithEVSpreadNatureOTID(struct Pokemon *mon, u16 species, u8 level, u8 nature, u8 fixedIV, u8 evSpread, u32 otId)
 {
     s32 i;
     s32 statCount = 0;