Merge branch 'master' into link

2018-02-03 09:42:19 -05:00
parent d4e8c20f84 eb6aed50e5
commit d52f52fa73
133 changed files with 14287 additions and 26107 deletions
--- a/src/main.c
+++ b/src/main.c
@@ -7,7 +7,7 @@
 #include "m4a.h"
 #include "bg.h"
 #include "rtc.h"
-#include "unknown_task.h"
+#include "scanline_effect.h"
 #include "overworld.h"
 #include "play_time.h"
 #include "random.h"