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/trainer_see.c | |
| parent | f02cb667bbddf4f4a1152c86cbf9616468e7f0d2 (diff) | |
| parent | c909aa92dee0a8d202d9195d80d0cc96b0d1ebc8 (diff) | |
Merge remote-tracking branch 'upstream/master' into fldeff
Diffstat (limited to 'src/trainer_see.c')
| -rw-r--r-- | src/trainer_see.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/trainer_see.c b/src/trainer_see.c index 726d89847..b74608d0b 100644 --- a/src/trainer_see.c +++ b/src/trainer_see.c @@ -12,11 +12,10 @@ #include "task.h" #include "trainer_see.h" #include "util.h" +#include "battle_pyramid.h" #include "constants/field_effects.h" -extern bool8 InBattlePyramid(void); extern bool32 InTrainerHill(void); -extern bool8 GetBattlePyramidTrainerFlag(u8 eventObjectId); extern bool8 GetTrainerHillTrainerFlag(u8 eventObjectId); extern void sub_809BE48(u16 npcId); |