diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-12-30 11:59:31 -0600 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2017-12-30 11:59:31 -0600 |
| commit | ea3a851403a675c5b36daa77270aed0f8a3a5238 (patch) | |
| tree | 2db7bcf3982eab602a3710ea6c0cbb78bc777fa5 /include | |
| parent | cd2b75a677bf15756734222a9a57f0f9153fc918 (diff) | |
Sync gAnimDisableStructPtr and gTransformedPersonalities with pokeemerald
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle.h | 2 | ||||
| -rw-r--r-- | include/battle_anim.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/battle.h b/include/battle.h index f34260e16..0881cf82c 100644 --- a/include/battle.h +++ b/include/battle.h @@ -306,7 +306,7 @@ struct BattleStruct /* 0x2000000 */ struct DisableStruct { - /*0x00*/ u32 unk0; + /*0x00*/ u32 transformedMonPersonality; /*0x04*/ u16 disabledMove; /*0x06*/ u16 encoredMove; /*0x08*/ u8 protectUses; diff --git a/include/battle_anim.h b/include/battle_anim.h index 2db27599f..d456950f6 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -46,6 +46,7 @@ extern void (*gAnimScriptCallback)(void); extern u8 gAnimScriptActive; extern u8 gAnimFriendship; extern u8 gAnimMoveTurn; +extern struct DisableStruct *gAnimDisableStructPtr; void DoMoveAnim(u16 move); void LaunchBattleAnimation(const u8 *const moveAnims[], u16 b, u8 c); |