Merge branch 'master' into mail

2017-10-14 09:52:56 -04:00
parent 1112af4e19 0d38d443b5
commit a252140f3b
148 changed files with 4332 additions and 11135 deletions
@@ -2,7 +2,7 @@
 // Includes
 #include "global.h"
 #include "main.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "task.h"
 #include "unknown_task.h"
 #include "palette.h"