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 /macros/scripts/battle_commands.asm | |
| parent | fe4377ce532d1fea1b28d2c52e4f62f0ca702a30 (diff) | |
| parent | d4025863cf56466b79827bace6d6b3e48ffd05e9 (diff) | |
Merge pull request #505 from mid-kid/battlecommands
Battle command fixes
Diffstat (limited to 'macros/scripts/battle_commands.asm')
| -rw-r--r-- | macros/scripts/battle_commands.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/macros/scripts/battle_commands.asm b/macros/scripts/battle_commands.asm index 33d7dc611..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 @@ -169,13 +169,13 @@ ENDM command ragedamage ; a2 command resettypematchup ; a3 command allstatsup ; a4 - command effect0xa5 ; a5 + command bidefailtext ; a5 command raisesubnoanim ; a6 command lowersubnoanim ; a7 - command effect0xa8 ; a8 + command beatupfailtext ; a8 command clearmissdamage ; a9 command movedelay ; aa - command hittarget ; ab + command moveanim ; ab command tristatuschance ; ac command supereffectivelooptext ; ad command startloop ; ae |