diff options
| author | mid-kid <esteve.varela@gmail.com> | 2018-04-04 23:27:40 +0200 |
|---|---|---|
| committer | mid-kid <esteve.varela@gmail.com> | 2018-04-04 23:27:40 +0200 |
| commit | d4025863cf56466b79827bace6d6b3e48ffd05e9 (patch) | |
| tree | 0c12d4c119da0cab5a7acb17ddaba5d389bc1f8f /data/battle/effect_command_pointers.asm | |
| parent | 2958188fc6d1ea8d9a5c2d4f0d5a4e3d6ca8faaa (diff) | |
Rename some battle commands
`hittarget` was misleading, as it doesn't actually "hit" the target, it
only plays the animation. As such, I've renamed it to `moveanim`.
`checkfaint` has nothing to do with checking if the user or target has
fainted, instead, it applies wCurDamage onto the target's HP, hitting
the substitute if applicable. I've renamed the command to `applydamage`
and all of its subfunctions accordingly.
Diffstat (limited to 'data/battle/effect_command_pointers.asm')
| -rw-r--r-- | data/battle/effect_command_pointers.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/data/battle/effect_command_pointers.asm b/data/battle/effect_command_pointers.asm index a57e08be7..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 @@ -174,7 +174,7 @@ BattleCommandPointers: ; 3fd28 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 |