diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-14 10:53:36 -0500 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-14 10:53:36 -0500 |
commit | 1ff1e8ce9547d646b17b135b3013a516d17f35db (patch) | |
tree | c23fbb425b230e81529932482ddb0fe7fc6a1376 /include/data2.h | |
parent | daa0a98ee0129be1797274de318a35df30d39020 (diff) | |
parent | b9388f078ed95e80ac73b35eeb206e52ce376b0c (diff) |
Merge branch 'master' into pokemon_storage_system
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 |