diff options
author | Cameron Hall <camthesaxman@users.noreply.github.com> | 2018-01-11 13:51:45 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-11 13:51:45 -0600 |
commit | 2b56f43fce75871f2be993d43b483ceefd0bfc0f (patch) | |
tree | 6fefa6a95a940c731ce7e551d1bc5c00a2626db0 /include/data2.h | |
parent | a51b95150ba86a3982f613886471626f742aeacd (diff) | |
parent | e7672a1aeb5e42d6f4e416ede9f6220122d11743 (diff) |
Merge branch 'master' into assert
Diffstat (limited to 'include/data2.h')
-rw-r--r-- | include/data2.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/data2.h b/include/data2.h index 97cb4fd7a..9f6644714 100644 --- a/include/data2.h +++ b/include/data2.h @@ -3,7 +3,7 @@ #include "sprite.h" -struct UnknownTaskStruct; +struct ScanlineEffectParams; struct MonCoords { @@ -42,7 +42,7 @@ extern u8 gSpeciesNames[][11]; extern const u8 gMoveNames[][13]; extern const u8 gAbilityNames[][13]; extern const u8 gTypeNames[][7]; -extern const struct UnknownTaskStruct gUnknown_081F9674; +extern const struct ScanlineEffectParams gUnknown_081F9674; extern const u8 gUnknown_081F96C8[]; extern struct CompressedSpriteSheet gUnknown_081FAEA4; extern struct CompressedSpritePalette gUnknown_081FAEAC; |