diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-18 16:58:14 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-18 16:58:14 +0100 |
| commit | cb229f56e8951e3f9efc35516447a54e18e8fef0 (patch) | |
| tree | 656599caae716c6cc8e81121f2b1cd061927b99e /asm/macros/event.inc | |
| parent | c3abe2863feb8ebb21921c40d3c685a27a4135c4 (diff) | |
| parent | 6a674e1e83db097d7a31a3786d12e42987f09f70 (diff) | |
fix pokeblock conflicts
Diffstat (limited to 'asm/macros/event.inc')
| -rw-r--r-- | asm/macros/event.inc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/asm/macros/event.inc b/asm/macros/event.inc index 69cdb38e5..a88db5f1f 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -663,11 +663,13 @@ .byte 0x5d .endm - .macro ontrainerbattleend + @ Goes to address after the trainerbattle command (called by the battle functions, see battle_setup.c) + .macro gotopostbattlescript .byte 0x5e .endm - .macro ontrainerbattleendgoto + @ Goes to address specified in the trainerbattle command (called by the battle functions, see battle_setup.c) + .macro gotobeatenscript .byte 0x5f .endm |