diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-07-31 13:30:40 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-31 13:30:40 -0400 |
| commit | 3e60a7840653e50845abf10bb02cd1b519dcd80f (patch) | |
| tree | cb4a0d227a238ebdeb3b6cb9fdb92781bcc4f5e7 /include/data.h | |
| parent | 602855ea99d8015ef5b7709f6fb1e9fd167239e2 (diff) | |
| parent | d391486247cc9f29d85787d6711f7cb993cf6585 (diff) | |
Merge branch 'master' into doc-frontierpass2
Diffstat (limited to 'include/data.h')
| -rw-r--r-- | include/data.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/include/data.h b/include/data.h index 2f8c44746..f94f55a8f 100644 --- a/include/data.h +++ b/include/data.h @@ -5,6 +5,12 @@ #define SPECIES_SHINY_TAG 500 +enum { + BATTLER_AFFINE_NORMAL, + BATTLER_AFFINE_EMERGE, + BATTLER_AFFINE_RETURN, +}; + struct MonCoords { // This would use a bitfield, but some function @@ -87,9 +93,9 @@ extern const struct SpriteFrameImage gTrainerBackPicTable_Steven[]; extern const union AffineAnimCmd *const gAffineAnims_BattleSpritePlayerSide[]; extern const union AffineAnimCmd *const gAffineAnims_BattleSpriteOpponentSide[]; -extern const union AffineAnimCmd *const gUnknown_082FF6C0[]; +extern const union AffineAnimCmd *const gAffineAnims_BattleSpriteContest[]; -extern const union AnimCmd *const gUnknown_082FF70C[]; +extern const union AnimCmd *const gAnims_MonPic[]; extern const struct MonCoords gMonFrontPicCoords[]; extern const struct CompressedSpriteSheet gMonStillFrontPicTable[]; extern const struct MonCoords gMonBackPicCoords[]; |