diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-10-13 10:22:58 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-10-13 10:22:58 -0500 |
| commit | b24559d69b6fa0abf042a1b7cdbcab3d1ec91fd6 (patch) | |
| tree | 7b51d7b9cb9a370fe1dd9db8eeadc23089ba1328 /asm/macros/battle_script.inc | |
| parent | fa9d1759bd7fa17ced37225bd31d46466da857c6 (diff) | |
| parent | a2a6700966cc802185577e44ba88a9154429c93b (diff) | |
Merge remote-tracking branch 'upstream/master' into shop
# Conflicts:
# asm/shop.s
Diffstat (limited to 'asm/macros/battle_script.inc')
| -rw-r--r-- | asm/macros/battle_script.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/macros/battle_script.inc b/asm/macros/battle_script.inc index 34d529cc7..927a0edd1 100644 --- a/asm/macros/battle_script.inc +++ b/asm/macros/battle_script.inc @@ -530,7 +530,7 @@ .byte \battler .endm - .macro jumptorandomattack param0 + .macro jumptocalledmove param0 .byte 0x63 .byte \param0 .endm |