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/player_pc.c
+++ b/src/player_pc.c
@@ -3,9 +3,8 @@
 #include "bg.h"
 #include "decoration.h"
 #include "event_scripts.h"
-#include "field_fadetransition.h"
 #include "event_object_movement.h"
-#include "field_screen.h"
+#include "field_screen_effect.h"
 #include "field_weather.h"
 #include "international_string_util.h"
 #include "item.h"