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/data2.h | |
parent | 11f9a27640a9f921c6dc1858261d9a609a6599ca (diff) | |
parent | 0f0ba1e28c5c14bb93d403fd2df4a2d89e057a65 (diff) |
fix merge conflicts
Diffstat (limited to 'include/data2.h')
-rw-r--r-- | include/data2.h | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/include/data2.h b/include/data2.h new file mode 100644 index 000000000..db9532811 --- /dev/null +++ b/include/data2.h @@ -0,0 +1,19 @@ +#ifndef GUARD_DATA2_H +#define GUARD_DATA2_H + +struct MonCoords +{ + // This would use a bitfield, but some function + // uses it as a u8 and casting won't match. + u8 coords; // u8 x:4, y:4; + u8 y_offset; +}; + +extern struct MonCoords gTrainerBackPicCoords[]; + +extern const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1]; +extern const u8 gMoveNames[][13]; +extern const u8 gAbilityNames[][13]; +extern const u8 gTypeNames[][7]; + +#endif // GUARD_DATA2_H |