summaryrefslogtreecommitdiff
path: root/src/scanline_effect.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/scanline_effect.c
parentad2a97935e1c1f4362f0dffa58ef437d191bab4e (diff)
parentc3cfd6065825ec8ddd5e1782998071518efaa322 (diff)
Merge branch 'master' into pokenav-decomp-again
Diffstat (limited to 'src/scanline_effect.c')
-rw-r--r--src/scanline_effect.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/scanline_effect.c b/src/scanline_effect.c
index a9ae9427b..0a4b0b8fd 100644
--- a/src/scanline_effect.c
+++ b/src/scanline_effect.c
@@ -1,6 +1,6 @@
#include "global.h"
#include "battle.h"
-#include "data2.h"
+#include "data.h"
#include "task.h"
#include "trig.h"
#include "scanline_effect.h"