diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-19 17:37:53 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-19 17:37:53 +0100 |
| commit | 75812185693793e97a16908fb8d7bc8063d438ee (patch) | |
| tree | aa34986f9b7c27ecd0162b24bf8bea573a4bcba8 /asm/macros | |
| parent | eb8055eb07f4ed6e3dd1d04d61e66ad9fb0d08b8 (diff) | |
| parent | 6a674e1e83db097d7a31a3786d12e42987f09f70 (diff) | |
Merge branch 'master' into decompile_battle1
Diffstat (limited to 'asm/macros')
| -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 |