Merge branch 'master' into fldeff

2018-12-16 20:05:31 -05:00
parent 10237e8d13 d1e6e705cc
commit e292d0ca83
714 changed files with 111097 additions and 142352 deletions
--- a/src/secret_base.c
+++ b/src/secret_base.c
@@ -1,9 +1,7 @@
-
-// Includes
 #include "global.h"
 #include "constants/bg_event_constants.h"
 #include "constants/decorations.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "main.h"
 #include "task.h"
 #include "palette.h"
@@ -19,7 +17,7 @@
 #include "fieldmap.h"
 #include "field_camera.h"
 #include "field_player_avatar.h"
-#include "field_screen.h"
+#include "field_screen_effect.h"
 #include "field_weather.h"
 #include "event_object_movement.h"
 #include "field_effect.h"