summaryrefslogtreecommitdiff
path: root/src/field_special_scene.c
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2017-06-20 20:41:33 -0400
committerGitHub <noreply@github.com>2017-06-20 20:41:33 -0400
commit4ba573ed1eba7c37160ce6107d95447f42902385 (patch)
tree5973f1e72156bb75cb6561a11dd7f333b90fcb3f /src/field_special_scene.c
parent13b02fc8232ce61062afe46ca13a1930a3bbc286 (diff)
parentb22e5219ba01c70da9a03397430bff10d0b99060 (diff)
Merge branch 'master' into patch-1
Diffstat (limited to 'src/field_special_scene.c')
-rw-r--r--src/field_special_scene.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/field_special_scene.c b/src/field_special_scene.c
index 9e06ede81..c88ac8f65 100644
--- a/src/field_special_scene.c
+++ b/src/field_special_scene.c
@@ -1,11 +1,16 @@
#include "global.h"
#include "field_special_scene.h"
-#include "asm.h"
#include "event_data.h"
#include "field_camera.h"
+#include "field_fadetransition.h"
+#include "field_map_obj.h"
+#include "field_specials.h"
+#include "fieldmap.h"
+#include "main.h"
#include "palette.h"
#include "rom4.h"
#include "script.h"
+#include "script_movement.h"
#include "songs.h"
#include "sound.h"
#include "sprite.h"