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
@@ -16,7 +16,7 @@
 #include "field_weather.h"
 #include "field_player_avatar.h"
 #include "field_camera.h"
-#include "field_screen.h"
+#include "field_screen_effect.h"
 #include "event_object_movement.h"
 #include "list_menu.h"
 #include "menu_helpers.h"