diff options
| author | garak <garakmon@gmail.com> | 2018-09-24 08:40:33 -0400 |
|---|---|---|
| committer | garak <garakmon@gmail.com> | 2018-09-24 08:40:33 -0400 |
| commit | 72f9afcbf4a81909019f21acad0484b72ed217f6 (patch) | |
| tree | bc7e9a48b8056e28403e251dab7ac64f649ad9e4 /include/data2.h | |
| parent | 3964dbd4822f1b22bbc696add7e56ff0c5b2caea (diff) | |
| parent | 7ceabffc842dfdf127fd594055f895a0803f54f6 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/data2.h')
| -rw-r--r-- | include/data2.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/include/data2.h b/include/data2.h index d71958201..268dc9ac8 100644 --- a/include/data2.h +++ b/include/data2.h @@ -1,6 +1,8 @@ #ifndef GUARD_DATA2_H #define GUARD_DATA2_H +#define MOVE_NAME_LENGTH 12 + struct MonCoords { // This would use a bitfield, but some function @@ -9,14 +11,14 @@ struct MonCoords u8 y_offset; }; -extern struct MonCoords gTrainerBackPicCoords[]; -extern struct MonCoords gTrainerFrontPicCoords[]; +extern const struct MonCoords gTrainerBackPicCoords[]; +extern const struct MonCoords gTrainerFrontPicCoords[]; extern const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1]; -extern const u8 gMoveNames[][13]; +extern const u8 gMoveNames[][MOVE_NAME_LENGTH + 1]; extern struct CompressedSpriteSheet gUnknown_0831C620; extern struct CompressedSpritePalette gUnknown_0831C628; extern const struct SpriteTemplate gUnknown_0831C688; - +extern const struct CompressedSpriteSheet gMonBackPicTable[]; #endif // GUARD_DATA2_H |