diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-02-19 08:47:50 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-02-19 08:47:50 -0500 |
| commit | 9d44bc0bda9294c4d4cb3744efe9c2d96278c3bd (patch) | |
| tree | 6ac0ef8acbace05710da0052b4decaf4146d5d3f /src/battle_setup.c | |
| parent | 9397d6d23ad460f7019d4a12da035f53a450d237 (diff) | |
| parent | 71fec599bbe144af8d4a16e98ec32454fd10a4a8 (diff) | |
Merge branch 'master' of github.com:pret/pokefirered into pokemon_jump
Diffstat (limited to 'src/battle_setup.c')
| -rw-r--r-- | src/battle_setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/battle_setup.c b/src/battle_setup.c index ae6aaf8be..73e7acc1a 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -37,7 +37,7 @@ #include "constants/pokemon.h" #include "constants/trainers.h" #include "constants/trainer_classes.h" -#include "constants/map_types.h" +#include "constants/maps.h" enum { |