summaryrefslogtreecommitdiff
path: root/asm/macros/battle_script.inc
diff options
context:
space:
mode:
authorGarak <thomastaps194@comcast.net>2018-07-17 09:24:30 -0400
committerGitHub <noreply@github.com>2018-07-17 09:24:30 -0400
commit5e46a0fcc57d421879c1f65b40b4692bbe65a813 (patch)
tree398b53f56158397a04e0e8de8159e00eeba9acc3 /asm/macros/battle_script.inc
parente06b63efc9ea39875b17f00e5ff20c2e0fcb0415 (diff)
parent06b3ce408f774c7192202308e783cc22bb8e7643 (diff)
Merge pull request #2 from pret/master
sync with source repo
Diffstat (limited to 'asm/macros/battle_script.inc')
-rw-r--r--asm/macros/battle_script.inc6
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/macros/battle_script.inc b/asm/macros/battle_script.inc
index 083107c08..c03d78df7 100644
--- a/asm/macros/battle_script.inc
+++ b/asm/macros/battle_script.inc
@@ -511,7 +511,7 @@
.byte \bank
.endm
- .macro atk5F
+ .macro swapattackerwithtarget
.byte 0x5f
.endm
@@ -525,7 +525,7 @@
.byte \bank
.endm
- .macro atk62 bank
+ .macro hidepartystatussummary bank
.byte 0x62
.byte \bank
.endm
@@ -1163,7 +1163,7 @@
.4byte \param0
.endm
- .macro snatchsetbanks
+ .macro snatchsetbattlers
.byte 0xed
.endm