diff options
| author | Marco Willems (M17.1) <progreon@gmail.com> | 2018-01-14 01:17:28 +0100 |
|---|---|---|
| committer | Marco Willems (M17.1) <progreon@gmail.com> | 2018-01-14 01:17:28 +0100 |
| commit | 30858625ff6c82d7a6380a44acf5c75baa988f20 (patch) | |
| tree | 5814ac66984c481382418db28ff97f018ffc04d7 /include/data2.h | |
| parent | 29d16a0af10c2de52de8ff37c13dd5aa3401c98f (diff) | |
| parent | 2e8f0cd4b33a7a3ea92b2b42742d78d98959d1e5 (diff) | |
Merge remote-tracking branch 'upstream/master' into battle_anim_data
Diffstat (limited to 'include/data2.h')
| -rw-r--r-- | include/data2.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/data2.h b/include/data2.h index 9f6644714..2fe8d39f8 100644 --- a/include/data2.h +++ b/include/data2.h @@ -47,7 +47,8 @@ extern const u8 gUnknown_081F96C8[]; extern struct CompressedSpriteSheet gUnknown_081FAEA4; extern struct CompressedSpritePalette gUnknown_081FAEAC; extern const struct SpriteTemplate gSpriteTemplate_81FAF0C; -extern void *const gUnknown_081FAF4C[]; +extern u8 *const gUnknown_081FAF4C[]; +//extern u8 (*const gUnknown_081FAF4C[])[0x800]; extern struct BattleMove gBattleMoves[]; // data/graphics/trainers/front_pic_coords.inc |