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/fieldmap.c | |
| parent | 18124740a4d75ae95948f95ca6f63c320e51501c (diff) | |
| parent | 6df2042b3b3ea8e7bf61cfd95bd24ee06e7b4b32 (diff) | |
fixing merge conflicts
Diffstat (limited to 'src/fieldmap.c')
| -rw-r--r-- | src/fieldmap.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/fieldmap.c b/src/fieldmap.c index 96f5d2b85..0d8a706b1 100644 --- a/src/fieldmap.c +++ b/src/fieldmap.c @@ -1,18 +1,20 @@ #include "global.h" -#include "overworld.h" #include "bg.h" -#include "battle_frontier_2.h" -#include "constants/rgb.h" #include "fieldmap.h" #include "fldeff_80F9BCC.h" #include "fldeff_cut.h" #include "fldeff_groundshake.h" +#include "frontier_util.h" #include "menu.h" +#include "overworld.h" #include "palette.h" #include "pokenav.h" #include "script.h" #include "secret_base.h" #include "tv.h" +#include "constants/rgb.h" + +extern void sub_81AA078(u16*, u8); struct ConnectionFlags { |