diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-28 21:41:17 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-28 21:41:17 -0400 |
| commit | 6235276ca255a2b345c3a97be23c6b53be6eba0f (patch) | |
| tree | 81930ebec5d50f4b44575b28979549c34f2e1b0e /include/data2.h | |
| parent | 170c82f299905b6e55b20a5c2c04f92353131d0e (diff) | |
| parent | c1c2015f7046676b043641c0d1f9d9e29bc73647 (diff) | |
Merge branch 'master' into daycare
Diffstat (limited to 'include/data2.h')
| -rw-r--r-- | include/data2.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/include/data2.h b/include/data2.h index 2837a4451..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,10 +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 u8 gMoveNames[][13]; extern const u8 gAbilityNames[][13]; extern const u8 gTypeNames[][7]; -extern const struct UnknownStructD2 gUnknown_081F9674; +extern const struct UnknownTaskStruct gUnknown_081F9674; extern const u8 gUnknown_081F96C8[]; extern struct CompressedSpriteSheet gUnknown_081FAEA4; extern struct CompressedSpritePalette gUnknown_081FAEAC; |