summaryrefslogtreecommitdiff
path: root/src/fieldmap.c
diff options
context:
space:
mode:
authorDiegoisawesome <diego@domoreaweso.me>2018-11-06 11:40:17 -0600
committerDiegoisawesome <diego@domoreaweso.me>2018-11-06 11:40:17 -0600
commit9afe7a896e7bf9257d3c73c8fb592f0b9243d520 (patch)
tree490f5c185053db27730eefe1f6764b406d4adfb2 /src/fieldmap.c
parent43a8534fced2c4327acdd8dc9690f5bc6751e2db (diff)
parentccc5d27fcb8647225656b06a60a7d79ad0fa299f (diff)
Merge remote-tracking branch 'pret/master' into render_text
Diffstat (limited to 'src/fieldmap.c')
-rw-r--r--src/fieldmap.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/fieldmap.c b/src/fieldmap.c
index 96f5d2b85..5019b5dc7 100644
--- a/src/fieldmap.c
+++ b/src/fieldmap.c
@@ -1,7 +1,7 @@
#include "global.h"
#include "overworld.h"
#include "bg.h"
-#include "battle_frontier_2.h"
+#include "frontier_util.h"
#include "constants/rgb.h"
#include "fieldmap.h"
#include "fldeff_80F9BCC.h"
@@ -14,6 +14,8 @@
#include "secret_base.h"
#include "tv.h"
+extern void sub_81AA078(u16*, u8);
+
struct ConnectionFlags
{
u8 south:1;