diff options
author | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-28 20:56:21 -0500 |
---|---|---|
committer | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-28 20:56:21 -0500 |
commit | 4c35f3ac8506e5f326658bbab91c257584f7b716 (patch) | |
tree | 980025fbbc41e001e260a65ed7c035dd6073e864 /macros/scripts/battle_commands.asm | |
parent | bb005694b31b6a8cbaeefa8751ea72117e904e02 (diff) | |
parent | 82a05a1752b476caab8951fe03f539dcc1a63669 (diff) |
Merge branch 'master' of https://github.com/pret/pokecrystal
# Conflicts:
# macros/scripts/maps.asm
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 5ac9009ff..5933740f0 100644 --- a/macros/scripts/battle_commands.asm +++ b/macros/scripts/battle_commands.asm @@ -1,7 +1,7 @@ -command: macro +command: MACRO enum \1_command -\1 equs "db \1_command" -endm +\1 EQUS "db \1_command" +ENDM ; BattleCommandPointers indexes (see data/battle_command_pointers.asm) enum_start 1 |