diff options
| author | yenatch <yenatch@gmail.com> | 2017-07-05 21:37:14 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2017-07-05 21:37:14 -0400 |
| commit | 06bf25405c98257e47953b5d3c327e314ea371b3 (patch) | |
| tree | 81be5b612621bdd74f632dbedb9f85c4d1d203b9 /include/data2.h | |
| parent | 282cae4a9fbd019a973fb6618337d29a61f97f42 (diff) | |
| parent | be05c5bd52769b58316986bd7451cb2483571099 (diff) | |
Merge remote-tracking branch 'origin/master' into merge-pika
Conflicts:
include/use_pokeblock.h
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 |