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 /src/battle/battle_anim.c | |
| parent | cd2b75a677bf15756734222a9a57f0f9153fc918 (diff) | |
Sync gAnimDisableStructPtr and gTransformedPersonalities with pokeemerald
Diffstat (limited to 'src/battle/battle_anim.c')
| -rw-r--r-- | src/battle/battle_anim.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle/battle_anim.c b/src/battle/battle_anim.c index 8c37e6010..8242a1ddd 100644 --- a/src/battle/battle_anim.c +++ b/src/battle/battle_anim.c @@ -31,7 +31,7 @@ EWRAM_DATA s8 gAnimFramesToWait = 0; EWRAM_DATA u8 gAnimScriptActive = FALSE; EWRAM_DATA u8 gAnimVisualTaskCount = 0; EWRAM_DATA u8 gAnimSoundTaskCount = 0; -EWRAM_DATA u32 gDisableStructMoveAnim = 0; +EWRAM_DATA struct DisableStruct *gAnimDisableStructPtr = NULL; EWRAM_DATA u32 gAnimMoveDmg = 0; EWRAM_DATA u16 gAnimMovePower = 0; EWRAM_DATA u8 gAnimFriendship = 0; @@ -186,7 +186,7 @@ void ClearBattleAnimationVars(void) gAnimScriptActive = FALSE; gAnimVisualTaskCount = 0; gAnimSoundTaskCount = 0; - gDisableStructMoveAnim = 0; + gAnimDisableStructPtr = NULL; gAnimMoveDmg = 0; gAnimMovePower = 0; gAnimFriendship = 0; |