Merge branch 'master' of https://github.com/pret/pokeemerald into menu

2018-02-07 18:06:59 -06:00
parent 5db765a475 48e63979c8
commit 772fd47564
385 changed files with 26738 additions and 46633 deletions
--- a/src/pokeblock.c
+++ b/src/pokeblock.c
@@ -13,7 +13,7 @@
 #include "battle.h"
 #include "battle_controllers.h"
 #include "palette.h"
-#include "unknown_task.h"
+#include "scanline_effect.h"
 #include "list_menu.h"
 #include "gpu_regs.h"
 #include "decompress.h"