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 /include/data | |
| parent | 930fea6fad24692773b930ec7448c59d599844b8 (diff) | |
| parent | 6d73bb4b57efb3ff81dcc2aa0d00d5de380add9e (diff) | |
merge mail 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; |