diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2018-12-25 15:03:13 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2018-12-25 15:03:13 -0600 |
| commit | d8948a5cda2e385c1d4b5c6190c4fe0fb53359fb (patch) | |
| tree | fa882b0733f88cc17dcbaef8c25c30c7198bdca1 /src/fieldmap.c | |
| parent | dea41e1a7e6e73789431153d6c28dac3a3a73ac6 (diff) | |
| parent | a54aa03d20dacc88879404b87a5f6a7eb7babc54 (diff) | |
Merge remote-tracking branch 'pret/master' into trade
Diffstat (limited to 'src/fieldmap.c')
| -rw-r--r-- | src/fieldmap.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/fieldmap.c b/src/fieldmap.c index cab200208..abdddb373 100644 --- a/src/fieldmap.c +++ b/src/fieldmap.c @@ -1,9 +1,8 @@ #include "global.h" #include "bg.h" #include "fieldmap.h" -#include "fldeff_80F9BCC.h" -#include "fldeff_cut.h" -#include "fldeff_groundshake.h" +#include "fldeff.h" +#include "fldeff_misc.h" #include "frontier_util.h" #include "menu.h" #include "overworld.h" |