diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-11-12 14:05:40 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-12 14:05:40 -0600 |
| commit | f639c7c309bbd32fc60278eafa726db5c0c49914 (patch) | |
| tree | cca355371fd2cdd9d9b6fd86c266a500837123a8 /asm/macros/battle_script.inc | |
| parent | 54ad6794bce3ee534aa78a8c6e7f32715cd8f6a9 (diff) | |
| parent | b5ea69cf74e24ab2b09572b3324ac4b3bbd8818a (diff) | |
Merge pull request #380 from DizzyEggg/frontier_2
More battle frontier
Diffstat (limited to 'asm/macros/battle_script.inc')
| -rw-r--r-- | asm/macros/battle_script.inc | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/asm/macros/battle_script.inc b/asm/macros/battle_script.inc index 927a0edd1..8ab0f3ce5 100644 --- a/asm/macros/battle_script.inc +++ b/asm/macros/battle_script.inc @@ -1251,20 +1251,20 @@ various \battler, 8 .endm - .macro various9 battler - various \battler, 9 + .macro arenajudgmentwindow + various BS_ATTACKER, VARIOUS_ARENA_JUDGMENT_WINDOW .endm - .macro various10 battler - various \battler, 10 + .macro arenaopponentmonlost + various BS_ATTACKER, VARIOUS_ARENA_OPPONENT_MON_LOST .endm - .macro various11 battler - various \battler, 11 + .macro arenaplayermonlost + various BS_ATTACKER, VARIOUS_ARENA_PLAYER_MON_LOST .endm - .macro various12 battler - various \battler, 12 + .macro arenabothmonlost + various BS_ATTACKER, VARIOUS_ARENA_BOTH_MONS_LOST .endm .macro forfeityesnobox battler @@ -1279,12 +1279,12 @@ various \battler, 15 .endm - .macro various16 battler - various \battler, 16 + .macro arenajudmengtstring id + various \id, VARIOUS_ARENA_JUDGMENT_STRING .endm - .macro various17 battler - various \battler, 17 + .macro arenawaitmessage id + various \id, VARIOUS_ARENA_WAIT_STRING .endm .macro waitcry battler @@ -1307,7 +1307,7 @@ various BS_ATTACKER, VARIOUS_VOLUME_UP .endm - .macro various23 battler + .macro setalreadystatusedmoveattempt battler various \battler, 23 .endm |