diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2019-05-11 21:22:09 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-05-11 21:22:09 -0400 |
commit | 539d47279625a3d7a274726a02468bb5c1c56514 (patch) | |
tree | 08f68b473f37d1a74396ef2e28e1a0cecc60a9f1 /include/data2.h | |
parent | a58d9a16dd7e4f263ebccda50e70103e7490886b (diff) | |
parent | fc72b74e6ca6626dbaffa353eabf49429ff5e75f (diff) |
Merge branch 'master' into dodrio_berry_picking
Diffstat (limited to 'include/data2.h')
-rw-r--r-- | include/data2.h | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/include/data2.h b/include/data2.h deleted file mode 100644 index c1a2608ae..000000000 --- a/include/data2.h +++ /dev/null @@ -1,22 +0,0 @@ -#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 size; // u8 width:4, height:4; - u8 y_offset; -}; - -extern const struct MonCoords gTrainerBackPicCoords[]; -extern const struct MonCoords gTrainerFrontPicCoords[]; - -extern const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1]; -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 |