summaryrefslogtreecommitdiff
path: root/src/frontier_util.c
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2019-05-11 21:22:09 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2019-05-11 21:22:09 -0400
commit539d47279625a3d7a274726a02468bb5c1c56514 (patch)
tree08f68b473f37d1a74396ef2e28e1a0cecc60a9f1 /src/frontier_util.c
parenta58d9a16dd7e4f263ebccda50e70103e7490886b (diff)
parentfc72b74e6ca6626dbaffa353eabf49429ff5e75f (diff)
Merge branch 'master' into dodrio_berry_picking
Diffstat (limited to 'src/frontier_util.c')
-rw-r--r--src/frontier_util.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/frontier_util.c b/src/frontier_util.c
index bce7b926f..4dd8159cb 100644
--- a/src/frontier_util.c
+++ b/src/frontier_util.c
@@ -21,7 +21,7 @@
#include "apprentice.h"
#include "pokedex.h"
#include "recorded_battle.h"
-#include "data2.h"
+#include "data.h"
#include "record_mixing.h"
#include "strings.h"
#include "alloc.h"