diff options
| author | U-User-PC\User <golemgalvanize@github.com> | 2017-10-18 19:28:36 -0400 |
|---|---|---|
| committer | U-User-PC\User <golemgalvanize@github.com> | 2017-10-18 19:28:36 -0400 |
| commit | d4532c70cb03962d38517fef2d723f81a9b27c1b (patch) | |
| tree | 70220c06025360d7089011f5d80239b61ac183af /include/species.h | |
| parent | 11f9a27640a9f921c6dc1858261d9a609a6599ca (diff) | |
| parent | 0f0ba1e28c5c14bb93d403fd2df4a2d89e057a65 (diff) | |
fix merge conflicts
Diffstat (limited to 'include/species.h')
| -rw-r--r-- | include/species.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/species.h b/include/species.h index 9ab0565cb..ac0797418 100644 --- a/include/species.h +++ b/include/species.h @@ -449,5 +449,6 @@ enum }; #define NUM_SPECIES SPECIES_EGG +extern const u8 gSpeciesNames[][11]; #endif // GUARD_SPECIES_H |