diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-02-21 20:50:44 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-21 20:50:44 -0500 |
| commit | e194cf83d257796591e6a7a2cb88e208ac7de968 (patch) | |
| tree | f39d5da19fd92a02d1b66ac4f2eb1dae325952ab /src/battle_setup.c | |
| parent | 4280723f0ef24ff218cb81fd4ce8eb7abf063d34 (diff) | |
| parent | 7624b5e5c0d4d8290356dc897c2ea179c842d2b8 (diff) | |
Merge pull request #262 from PikalaxALT/trainer_see
Trainer see
Diffstat (limited to 'src/battle_setup.c')
| -rw-r--r-- | src/battle_setup.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/battle_setup.c b/src/battle_setup.c index 73e7acc1a..354487abd 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -13,7 +13,7 @@ #include "strings.h" #include "string_util.h" #include "event_data.h" -#include "event_object_80688E4.h" +#include "event_object_movement.h" #include "metatile_behavior.h" #include "event_scripts.h" #include "fldeff.h" @@ -22,10 +22,8 @@ #include "field_player_avatar.h" #include "field_screen_effect.h" #include "field_message_box.h" -#include "event_object_movement.h" #include "vs_seeker.h" #include "battle.h" -#include "battle_setup.h" #include "battle_transition.h" #include "battle_controllers.h" #include "constants/battle_setup.h" @@ -37,7 +35,6 @@ #include "constants/pokemon.h" #include "constants/trainers.h" #include "constants/trainer_classes.h" -#include "constants/maps.h" enum { |