diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-12-07 14:47:20 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-12-07 14:47:20 -0500 |
| commit | 53fac4417b53fcee2cc9e46d72ad598b016cc967 (patch) | |
| tree | 07e69072826569c7c31230cb4671a5d321e5f972 /src/trainer_see.c | |
| parent | 18124740a4d75ae95948f95ca6f63c320e51501c (diff) | |
| parent | 6df2042b3b3ea8e7bf61cfd95bd24ee06e7b4b32 (diff) | |
fixing merge conflicts
Diffstat (limited to 'src/trainer_see.c')
| -rw-r--r-- | src/trainer_see.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/trainer_see.c b/src/trainer_see.c index f5e9c300e..d3d450de4 100644 --- a/src/trainer_see.c +++ b/src/trainer_see.c @@ -1,21 +1,22 @@ #include "global.h" -#include "trainer_see.h" +#include "constants/battle_setup.h" #include "battle_setup.h" -#include "pokemon.h" -#include "sprite.h" -#include "field_effect.h" +#include "event_data.h" #include "event_object_movement.h" +#include "field_effect.h" #include "field_player_avatar.h" +#include "pokemon.h" #include "pokenav.h" -#include "task.h" -#include "util.h" #include "script.h" -#include "event_data.h" #include "script_movement.h" +#include "sprite.h" +#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); |