diff options
author | garak <garakmon@gmail.com> | 2018-11-27 13:31:07 -0500 |
---|---|---|
committer | garak <garakmon@gmail.com> | 2018-11-27 13:31:07 -0500 |
commit | 50f00b0827a4952a12f90009bd992f23c80a56af (patch) | |
tree | 6a5f78b04b42c162ed95cfc66c91a8b24f4051b2 /src/battle_tent.c | |
parent | f02cb667bbddf4f4a1152c86cbf9616468e7f0d2 (diff) | |
parent | c909aa92dee0a8d202d9195d80d0cc96b0d1ebc8 (diff) |
Merge remote-tracking branch 'upstream/master' into fldeff
Diffstat (limited to 'src/battle_tent.c')
-rw-r--r-- | src/battle_tent.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/battle_tent.c b/src/battle_tent.c index 678222ff5..c7e70912c 100644 --- a/src/battle_tent.c +++ b/src/battle_tent.c @@ -10,6 +10,7 @@ #include "item.h" #include "battle_factory_screen.h" #include "frontier_util.h" +#include "string_util.h" #include "constants/items.h" #include "constants/region_map_sections.h" @@ -17,10 +18,6 @@ extern const struct BattleFrontierTrainer gSlateportBattleTentTrainers[]; extern const struct FacilityMon gSlateportBattleTentMons[]; extern const u16 gBattleFrontierHeldItems[]; -extern u16 gUnknown_03006298[]; - -extern void sub_81A4C30(void); - // This file's functions. static void sub_81B99D4(void); static void sub_81B9A28(void); |