diff options
| author | scnorton <scnorton@biociphers.org> | 2017-10-16 14:12:59 -0400 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2017-10-16 14:12:59 -0400 |
| commit | a6d2bfaebd16940fc0ac1be3ca29caf0888296ca (patch) | |
| tree | 7ec979bc8481b2c2d55874aef3e9004ddb715781 /include/data2.h | |
| parent | 96ebc5d46287e33df7bda74a6fb340281cdaa4c5 (diff) | |
| parent | 7d657ef56716fd01bacf4a47df50ad0ec3d03b10 (diff) | |
Merge branch 'master' into secret_base
Diffstat (limited to 'include/data2.h')
| -rw-r--r-- | include/data2.h | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/include/data2.h b/include/data2.h index 9dd26fd5f..53a90944d 100644 --- a/include/data2.h +++ b/include/data2.h @@ -3,12 +3,7 @@ #include "sprite.h" -struct UnknownStructD2 -{ - u32 unk0; - u32 unk4; - u32 unk8; -}; +struct UnknownTaskStruct; struct MonCoords { @@ -44,8 +39,10 @@ extern u8 gEnemyMonElevation[]; extern const u8 gTrainerClassNames[][13]; extern const struct Trainer gTrainers[]; extern u8 gSpeciesNames[][11]; -extern u8 gMoveNames[][13]; -extern const struct UnknownStructD2 gUnknown_081F9674; +extern const u8 gMoveNames[][13]; +extern const u8 gAbilityNames[][13]; +extern const u8 gTypeNames[][7]; +extern const struct UnknownTaskStruct gUnknown_081F9674; extern const u8 gUnknown_081F96C8[]; extern struct CompressedSpriteSheet gUnknown_081FAEA4; extern struct CompressedSpritePalette gUnknown_081FAEAC; |