diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle.h | 12 | ||||
| -rw-r--r-- | include/pokeball.h | 2 | ||||
| -rw-r--r-- | include/sprite.h | 2 |
3 files changed, 9 insertions, 7 deletions
diff --git a/include/battle.h b/include/battle.h index 18a24a761..93b251cd8 100644 --- a/include/battle.h +++ b/include/battle.h @@ -520,12 +520,12 @@ enum struct BattleSpriteInfo { - u16 invisible : 1; // 0x1 - u16 lowHpSong : 1; // 0x2 - u16 behindSubstitute : 1; // 0x4 - u16 flag_x8 : 1; // 0x8 - u16 hpNumbersNoBars : 1; // 0x10 - u16 transformSpecies; + /*0x0*/ u16 invisible : 1; // 0x1 + u16 lowHpSong : 1; // 0x2 + u16 behindSubstitute : 1; // 0x4 + u16 flag_x8 : 1; // 0x8 + u16 hpNumbersNoBars : 1; // 0x10 + /*0x2*/ u16 transformSpecies; }; struct BattleAnimationInfo diff --git a/include/pokeball.h b/include/pokeball.h index 884ded22e..9e135db99 100644 --- a/include/pokeball.h +++ b/include/pokeball.h @@ -20,6 +20,8 @@ enum POKEBALL_COUNT }; +extern const struct SpriteTemplate gBallSpriteTemplates[]; + #define POKEBALL_PLAYER_SENDOUT 0xFF #define POKEBALL_OPPONENT_SENDOUT 0xFE diff --git a/include/sprite.h b/include/sprite.h index 84b3ee123..7432306a4 100644 --- a/include/sprite.h +++ b/include/sprite.h @@ -210,7 +210,7 @@ struct Sprite /*0x2D*/ u8 animLoopCounter; // general purpose data fields - /*0x2E*/ s16 data[8]; //2e, 30, 32, 34, 36, + /*0x2E*/ s16 data[8]; /*0x3E*/ u16 inUse:1; //1 u16 coordOffsetEnabled:1; //2 |