diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-17 20:22:56 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-17 20:22:56 +0100 |
| commit | 46fa2557d777096803ff90ba95d5500a9c03d2c5 (patch) | |
| tree | ded4f0e046be43e371631fca3ac013d96fa244e0 /src/field_special_scene.c | |
| parent | 930fea6fad24692773b930ec7448c59d599844b8 (diff) | |
| parent | 6d73bb4b57efb3ff81dcc2aa0d00d5de380add9e (diff) | |
merge mail with master, fix conflicts
Diffstat (limited to 'src/field_special_scene.c')
| -rwxr-xr-x | src/field_special_scene.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/field_special_scene.c b/src/field_special_scene.c index f92f342eb..d46ddeaa6 100755 --- a/src/field_special_scene.c +++ b/src/field_special_scene.c @@ -2,11 +2,11 @@ #include "task.h" #include "sprite.h" #include "field_map_obj.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "palette.h" #include "script.h" -#include "vars.h" +#include "constants/vars.h" #include "event_data.h" #include "main.h" |