diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-04-04 23:56:40 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-04-04 23:56:40 -0400 |
| commit | 81306889e33c599f8015bc4e653929bb7de00967 (patch) | |
| tree | 7a812968ba565a13ef400cdcb5230e6e8185a1ec /macros | |
| parent | 145efc13535fbc9d8ab2786d29209d97aebf0481 (diff) | |
| parent | f750d4f4185529cfb440ac7825d202ebcf160766 (diff) | |
Merge branch 'master' of https://github.com/pret/pokecrystal
Diffstat (limited to 'macros')
| -rw-r--r-- | macros/scripts/battle_commands.asm | 10 | ||||
| -rw-r--r--[-rwxr-xr-x] | macros/wram.asm | 0 |
2 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 diff --git a/macros/wram.asm b/macros/wram.asm index 469cc1022..469cc1022 100755..100644 --- a/macros/wram.asm +++ b/macros/wram.asm |