summaryrefslogtreecommitdiff
path: root/macros/move_effect.asm
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2015-11-13 00:44:06 -0500
committeryenatch <yenatch@gmail.com>2015-11-13 00:44:06 -0500
commit9c5473e965520f672640daf4ee76622640e0de15 (patch)
tree33d513a05a026cb6c094eb7ee73ad52ee36d0888 /macros/move_effect.asm
parent1c1fe276ca59726bb0008c60006c6b48cd093573 (diff)
parent40802da3cf27a453f62c8c4b712e876b06a9d834 (diff)
Merge pull request #326 from PikalaxALT/master
Reopen #325
Diffstat (limited to 'macros/move_effect.asm')
-rw-r--r--macros/move_effect.asm22
1 files changed, 11 insertions, 11 deletions
diff --git a/macros/move_effect.asm b/macros/move_effect.asm
index 6cca15b2d..d25db45bd 100644
--- a/macros/move_effect.asm
+++ b/macros/move_effect.asm
@@ -14,10 +14,10 @@ endm
command stab
command damagevariation
command checkhit
- command effect0x0a
- command effect0x0b
- command effect0x0c
- command resulttext
+ command lowersub
+ command hittargetnosub
+ command raisesub
+ command failuretext
command checkfaint
command criticaltext
command supereffectivetext
@@ -144,13 +144,13 @@ endm
command specialdefensedown2
command accuracydown2
command evasiondown2
- command statmessageuser
- command statmessagetarget
+ command statupmessage
+ command statdownmessage
command statupfailtext
command statdownfailtext
command effectchance
- command effect0x91
- command effect0x92
+ command statdownanim
+ command statupanim
command switchturn
command fakeout
command bellydrum
@@ -167,11 +167,11 @@ endm
command teleport
command beatup
command ragedamage
- command effect0xa3
+ command resettypematchup
command allstatsup
command effect0xa5
- command effect0xa6
- command effect0xa7
+ command raisesubnoanim
+ command lowersubnoanim
command effect0xa8
command clearmissdamage
command movedelay