Merge pull request #422 from garakmon/frontier_data_1

Battle tower data

src/battle_dome.c

@@ -26,6 +26,7 @@
 #include "international_string_util.h"
 #include "trainer_pokemon_sprites.h"
 #include "scanline_effect.h"
+#include "script_pokemon_util_80F87D8.h"
 #include "graphics.h"
 #include "constants/species.h"
 #include "constants/moves.h"
@@ -57,19 +58,9 @@ struct UnkStruct_860DD10
 };
 
 extern void sub_81B8558(void);
-extern u16 GetFrontierBrainMonMove(u8 monId, u8 moveSlotId);
-extern u8 GetFrontierBrainMonEvs(u8, u8);
-extern u8 GetFrontierBrainMonNature(u8);
-extern void sub_81A4C30(void);
-extern u8 sub_81A3610(void);
-extern u16 GetFrontierBrainMonSpecies(u8);
-extern void ReducePlayerPartyToSelectedMons(void);
 
 extern u8 gSelectedOrderFromParty[];
 
-extern const u16 gBattleFrontierHeldItems[];
-extern const struct FacilityMon gBattleFrontierMons[];
-extern const struct BattleFrontierTrainer gBattleFrontierTrainers[];
 extern const struct SpriteTemplate gUnknown_0860CFA8;
 
 // text

src/battle_factory.c

@@ -13,11 +13,6 @@
 #include "constants/trainers.h"
 #include "constants/moves.h"
 
-extern const struct FacilityMon gBattleFrontierMons[];
-extern const struct FacilityMon gSlateportBattleTentMons[];
-extern const struct BattleFrontierTrainer gBattleFrontierTrainers[];
-extern const u16 gBattleFrontierHeldItems[];
-
 // IWRAM bss
 static IWRAM_DATA bool8 gUnknown_03001288;
 

src/battle_pike.c

@@ -50,8 +50,6 @@ struct PikeWildMon
     u16 moves[4];
 };
 
-extern const struct BattleFrontierTrainer gBattleFrontierTrainers[];
-
 // IWRAM bss
 static IWRAM_DATA u8 sRoomType;
 static IWRAM_DATA u8 sStatusMon;

src/battle_pyramid.c

@@ -37,9 +37,6 @@ extern void door_upload_tiles(void);
 
 extern const struct MapLayout *const gMapLayouts[];
 extern const u16 gUnknown_08D856C8[][16];
-extern const u16 gBattleFrontierHeldItems[];
-extern const struct FacilityMon gBattleFrontierMons[];
-extern const struct BattleFrontierTrainer gBattleFrontierTrainers[];
 
 #define TOTAL_ROUNDS 20
 #define PICKUP_ITEMS_PER_ROUND 10

src/battle_tent.c

@@ -14,10 +14,6 @@
 #include "constants/items.h"
 #include "constants/region_map_sections.h"
 
-extern const struct BattleFrontierTrainer gSlateportBattleTentTrainers[];
-extern const struct FacilityMon gSlateportBattleTentMons[];
-extern const u16 gBattleFrontierHeldItems[];
-
 // This file's functions.
 static void sub_81B99D4(void);
 static void sub_81B9A28(void);

src/frontier_util.c

@@ -48,8 +48,6 @@ struct FrontierBrainMon
     u16 moves[4];
 };
 
-extern const struct BattleFrontierTrainer gBattleFrontierTrainers[];
-
 extern void sub_81B8558(void);
 
 // This file's functions.