diff options
author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-12-07 20:20:57 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-12-07 20:20:57 -0500 |
commit | f21b113bc6caee136d696aadfe8dc13d6e8f3622 (patch) | |
tree | dfa380ca2de409279e0ee0c7ecc06d704a84858a /include/battle.h | |
parent | 22a73c654b33878d8861109a3898bddc0d30c6b3 (diff) | |
parent | 88fae7ed40e47eff562b70cd0a504aeed5bb7102 (diff) |
Merge pull request #177 from ghoulslash/battle-anim
battle_anim*
Diffstat (limited to 'include/battle.h')
-rw-r--r-- | include/battle.h | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/include/battle.h b/include/battle.h index 54aef5106..bed12204f 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 @@ -546,8 +546,7 @@ struct BattleAnimationInfo u8 field_9_x80 : 1; u8 field_A; u8 field_B; - u8 field_C; - u8 field_D; + s16 field_C; u8 field_E; u8 field_F; }; |