diff options
| author | yenatch <yenatch@gmail.com> | 2018-04-04 21:18:15 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-04 21:18:15 -0400 |
| commit | f750d4f4185529cfb440ac7825d202ebcf160766 (patch) | |
| tree | 7bccc72ff98e0b6d221f46865780050c471c3b75 /data/battle/effect_command_pointers.asm | |
| parent | fe4377ce532d1fea1b28d2c52e4f62f0ca702a30 (diff) | |
| parent | d4025863cf56466b79827bace6d6b3e48ffd05e9 (diff) | |
Merge pull request #505 from mid-kid/battlecommands
Battle command fixes
Diffstat (limited to 'data/battle/effect_command_pointers.asm')
| -rw-r--r-- | data/battle/effect_command_pointers.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/data/battle/effect_command_pointers.asm b/data/battle/effect_command_pointers.asm index b3eeea273..f18e3c230 100644 --- a/data/battle/effect_command_pointers.asm +++ b/data/battle/effect_command_pointers.asm @@ -14,10 +14,10 @@ BattleCommandPointers: ; 3fd28 dw BattleCommand_DamageVariation ; 34cfd dw BattleCommand_CheckHit ; 34d32 dw BattleCommand_LowerSub ; 34eee - dw BattleCommand_HitTargetNoSub ; 34f60 + dw BattleCommand_MoveAnimNoSub ; 34f60 dw BattleCommand_RaiseSub ; 35004 dw BattleCommand_FailureText ; 35023 - dw BattleCommand_CheckFaint ; 3505e + dw BattleCommand_ApplyDamage ; 3505e dw BattleCommand_CriticalText ; 35175 dw BattleCommand_SuperEffectiveText ; 351ad dw BattleCommand_CheckDestinyBond ; 351c0 @@ -168,13 +168,13 @@ BattleCommandPointers: ; 3fd28 dw BattleCommand_RageDamage ; 3527b dw BattleCommand_ResetTypeMatchup ; 34833 dw BattleCommand_AllStatsUp ; 36500 - dw BattleCommanda5 ; 35165 + dw BattleCommand_BideFailText ; 35165 dw BattleCommand_RaiseSubNoAnim ; 365af dw BattleCommand_LowerSubNoAnim ; 365c3 - dw BattleCommanda8 ; 355b5 + dw BattleCommand_BeatUpFailText ; 355b5 dw BattleCommand_ClearMissDamage ; 355d5 - a9 dw BattleCommand_MoveDelay ; 37e80 - dw BattleCommand_HitTarget ; 34f57 + dw BattleCommand_MoveAnim ; 34f57 dw BattleCommand_TriStatusChance ; 3658f dw BattleCommand_SuperEffectiveLoopText ; 351a5 dw BattleCommand_StartLoop ; 35197 |