diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-16 01:08:55 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-16 01:08:55 +0100 |
| commit | 44abbae60b6a39e2a1432426005e1860be196abb (patch) | |
| tree | f2405db72863761afcdcda57a88cf6ab0346e4fd /include/data | |
| parent | 039c9f4bd8ee6bfb299d4422372804c569eddebd (diff) | |
| parent | 224fdbf026cfb0ff88aac519875a39fb038e4bb1 (diff) | |
nerge with master, fix conflicts
Diffstat (limited to 'include/data')
| -rw-r--r-- | include/data/bard_music/pokemon.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/data/bard_music/pokemon.h b/include/data/bard_music/pokemon.h index 7b4081a3c..693005360 100644 --- a/include/data/bard_music/pokemon.h +++ b/include/data/bard_music/pokemon.h @@ -1,6 +1,6 @@ #ifndef GUARD_DATA_BARD_MUSIC_POKEMON_H #define GUARD_DATA_BARD_MUSIC_POKEMON_H -#include "species.h" +#include "constants/species.h" const u16 gUnknown_085F5490 = NUM_SPECIES; |