summaryrefslogtreecommitdiff
path: root/src/frontier_util.c
diff options
context:
space:
mode:
authorPhlosioneer <mattmdrr2@gmail.com>2019-04-07 01:56:36 -0400
committerPhlosioneer <mattmdrr2@gmail.com>2019-04-07 01:56:36 -0400
commitd84d94e29a1424dd1d12ff821957bb6b1bc847d6 (patch)
treec5ba0778afca66a91f71815cd53fe9abef1bdac6 /src/frontier_util.c
parentad2a97935e1c1f4362f0dffa58ef437d191bab4e (diff)
parentc3cfd6065825ec8ddd5e1782998071518efaa322 (diff)
Merge branch 'master' into pokenav-decomp-again
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"