diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-16 11:42:59 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-16 11:42:59 +0100 |
| commit | f4ab21ee67eb3d254e086c95467ac08b08a6014c (patch) | |
| tree | b54ca1eb6800b5c07b94c134e401f2e4ef00dc79 /src/decoration.c | |
| parent | 435167674968749684710d7ad5c4f628c6b4ae86 (diff) | |
| parent | 224fdbf026cfb0ff88aac519875a39fb038e4bb1 (diff) | |
Merge branch 'master' into decompile_use_pokeblock
Diffstat (limited to 'src/decoration.c')
| -rw-r--r-- | src/decoration.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/decoration.c b/src/decoration.c index 974b60c7a..faef779b7 100644 --- a/src/decoration.c +++ b/src/decoration.c @@ -1,4 +1,5 @@ #include "global.h" +#include "constants/decorations.h" #include "decompress.h" #include "malloc.h" #include "text.h" @@ -8,7 +9,7 @@ #include "task.h" #include "main.h" #include "palette.h" -#include "songs.h" +#include "constants/songs.h" #include "overworld.h" #include "fieldmap.h" #include "metatile_behavior.h" @@ -32,7 +33,7 @@ #include "tilesets.h" #include "item_icon.h" #include "trader.h" -#include "map_object_constants.h" +#include "constants/map_objects.h" #include "decoration_inventory.h" #include "decoration.h" #include "graphics.h" |