Merge branch 'master' into easy_chat

2017-10-28 20:03:24 -04:00
parent d160ca4679 5ea2f463d7
commit 975e28c01e
890 changed files with 93754 additions and 135440 deletions
--- a/src/easy_chat.c
+++ b/src/easy_chat.c
@@ -3,7 +3,7 @@
 #include "global.h"
 #include "songs.h"
 #include "sound.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "task.h"
 #include "main.h"
 #include "window.h"