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/braille_puzzles.c | |
| parent | 930fea6fad24692773b930ec7448c59d599844b8 (diff) | |
| parent | 6d73bb4b57efb3ff81dcc2aa0d00d5de380add9e (diff) | |
merge mail with master, fix conflicts
Diffstat (limited to 'src/braille_puzzles.c')
| -rwxr-xr-x | src/braille_puzzles.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/braille_puzzles.c b/src/braille_puzzles.c index 85b2bc509..d6924de9f 100755 --- a/src/braille_puzzles.c +++ b/src/braille_puzzles.c @@ -1,12 +1,12 @@ #include "global.h" #include "event_data.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "script.h" -#include "species.h" +#include "constants/species.h" #include "task.h" #include "field_effect.h" -#include "flags.h" +#include "constants/flags.h" extern void MapGridSetMetatileIdAt(s32 x, s32 y, u16 metatileId); // fieldmap extern void DrawWholeMapView(); // field_camera |