Merge with master

2018-12-20 22:53:08 +01:00
parent 7dcb614cca 6ef9671718
commit ecee02816d
323 changed files with 74857 additions and 128444 deletions
--- a/src/walda_phrase.c
+++ b/src/walda_phrase.c
@@ -8,7 +8,7 @@
 #include "new_game.h"
 #include "overworld.h"
 #include "pokemon_storage_system.h"
-#include "field_screen.h"
+#include "field_screen_effect.h"

 extern const u8 gText_Peekaboo[];