merge with master

This commit is contained in:
DizzyEggg
2018-08-12 12:11:35 +02:00
148 changed files with 6964 additions and 11586 deletions

View File

@@ -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