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 /macros/scripts/battle_commands.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 'macros/scripts/battle_commands.asm')
-rw-r--r-- | macros/scripts/battle_commands.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/macros/scripts/battle_commands.asm b/macros/scripts/battle_commands.asm index db446d9ff..48e034bdf 100644 --- a/macros/scripts/battle_commands.asm +++ b/macros/scripts/battle_commands.asm @@ -15,10 +15,10 @@ ENDM command damagevariation ; 08 command checkhit ; 09 command lowersub ; 0a - command hittargetnosub ; 0b + command moveanimnosub ; 0b command raisesub ; 0c command failuretext ; 0d - command checkfaint ; 0e + command applydamage ; 0e command criticaltext ; 0f command supereffectivetext ; 10 command checkdestinybond ; 11 @@ -175,7 +175,7 @@ ENDM command beatupfailtext ; a8 command clearmissdamage ; a9 command movedelay ; aa - command hittarget ; ab + command moveanim ; ab command tristatuschance ; ac command supereffectivelooptext ; ad command startloop ; ae |