diff options
author | DizzyEggg <jajkodizzy@wp.pl> | 2018-08-12 12:11:35 +0200 |
---|---|---|
committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-08-12 12:11:35 +0200 |
commit | 957dcd01b382fb74e9b1967851ef3cfb6ca983eb (patch) | |
tree | 5eb81cbb67be2303952d85da2ca5f9b2ec61c044 /include/data2.h | |
parent | e787d5b60230550a4a8f1f3251b90e141bfcc5ff (diff) | |
parent | 40cf61307b411ea4de858902c7081fde8ef71ea5 (diff) |
merge with master
Diffstat (limited to 'include/data2.h')
-rw-r--r-- | include/data2.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/data2.h b/include/data2.h index 2cc13d88e..176365146 100644 --- a/include/data2.h +++ b/include/data2.h @@ -1,7 +1,7 @@ #ifndef GUARD_DATA2_H #define GUARD_DATA2_H -#include "constants/species.h" +#define MOVE_NAME_LENGTH 12 struct MonCoords { @@ -15,10 +15,10 @@ extern struct MonCoords gTrainerBackPicCoords[]; extern 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[NUM_SPECIES]; +extern const struct CompressedSpriteSheet gMonBackPicTable[]; #endif // GUARD_DATA2_H |