diff options
| author | yenatch <yenatch@gmail.com> | 2017-07-05 17:48:21 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-05 17:48:21 -0400 |
| commit | 124e2eb02c4adc46265e5b34b47ac0c625a24ec3 (patch) | |
| tree | 5c0af98d9e49a767f455fff1ceec5d07cb8539b8 /include/data2.h | |
| parent | 123d5cc8b26d2a93fa3981beaccb84377c6ae20f (diff) | |
| parent | 813c1846c94fa14b55bf75cf4c14465f1fb26635 (diff) | |
Merge branch 'master' into master
Diffstat (limited to 'include/data2.h')
| -rw-r--r-- | include/data2.h | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/include/data2.h b/include/data2.h index f292472ef..9dd26fd5f 100644 --- a/include/data2.h +++ b/include/data2.h @@ -18,6 +18,15 @@ struct MonCoords u8 y_offset; }; +extern const struct OamData gOamData_81F96F0; +extern const struct OamData gOamData_81F96E8; +extern const struct SpriteFrameImage gSpriteImageTable_81E7A10[]; +extern const struct SpriteFrameImage gSpriteImageTable_81E7A30[]; +extern const struct SpriteFrameImage gSpriteImageTable_81E7A50[]; +extern const struct SpriteFrameImage gSpriteImageTable_81E7A70[]; +extern const union AffineAnimCmd *const gSpriteAffineAnimTable_81E7B70[]; +extern const union AffineAnimCmd *const gSpriteAffineAnimTable_81E7BEC[]; + extern const union AffineAnimCmd *const gSpriteAffineAnimTable_81E7C18; extern const union AnimCmd *const gSpriteAnimTable_81E7C64[]; extern struct MonCoords gMonFrontPicCoords[]; @@ -44,4 +53,14 @@ extern const struct SpriteTemplate gSpriteTemplate_81FAF0C; extern void *const gUnknown_081FAF4C[]; extern struct BattleMove gBattleMoves[]; +// data/graphics/trainers/front_pic_coords.inc +extern const struct MonCoords gTrainerFrontPicCoords[]; + +// data/graphics/trainers/front_pic_table.inc +extern const struct CompressedSpriteSheet gTrainerFrontPicTable[]; + +// data/graphics/trainers/front_pic_palette_table.inc +extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; + + #endif // GUARD_DATA2_H |