diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2019-01-14 14:18:29 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-14 14:18:29 -0600 |
| commit | b4b4fb951a588dd50b4589efea11d1a17fd88342 (patch) | |
| tree | 8bce21f083717e8b39df833136fdab956673001b /src/trainer_see.c | |
| parent | e13895e58ab38c8adbde1e572068692e8ee5ee35 (diff) | |
| parent | 87763d133fadac8270dab0cba3d964a47b5b0dd2 (diff) | |
Merge pull request #519 from DizzyEggg/trainer_hill
Trainer Hill
Diffstat (limited to 'src/trainer_see.c')
| -rw-r--r-- | src/trainer_see.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/trainer_see.c b/src/trainer_see.c index eeebcb575..3846eca46 100644 --- a/src/trainer_see.c +++ b/src/trainer_see.c @@ -6,18 +6,16 @@ #include "field_effect.h" #include "field_player_avatar.h" #include "pokemon.h" -#include "pokenav.h" #include "script.h" #include "script_movement.h" #include "sprite.h" #include "task.h" #include "trainer_see.h" +#include "trainer_hill.h" #include "util.h" #include "battle_pyramid.h" #include "constants/field_effects.h" -extern bool32 InTrainerHill(void); -extern bool8 GetTrainerHillTrainerFlag(u8 eventObjectId); extern void sub_809BE48(u16 npcId); // this file's functions @@ -240,7 +238,7 @@ static u8 CheckTrainer(u8 eventObjectId) } else if (InTrainerHill() == TRUE) { - if (GetTrainerHillTrainerFlag(eventObjectId)) + if (GetHillTrainerFlag(eventObjectId)) return 0; } else |