diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2018-08-11 16:32:03 -0700 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2018-08-11 16:32:03 -0700 |
| commit | cf9518f2374dae7aa30fe8694e2c01d980efda3f (patch) | |
| tree | b3cfd813c4b9af125612b9a79f99292cb28d0591 /include/data2.h | |
| parent | 57b3393192106f628bde9032308917f7fc3f39cf (diff) | |
| parent | 94eef0bfa5b67a3ef3061b151e6ff113b45adc2e (diff) | |
Merge branch 'master' of github.com:pret/pokeemerald
Diffstat (limited to 'include/data2.h')
| -rw-r--r-- | include/data2.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/data2.h b/include/data2.h index d71958201..af830a4c4 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 @@ -13,10 +15,9 @@ 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; - #endif // GUARD_DATA2_H |