diff options
| author | Bryan Bishop <kanzure@gmail.com> | 2013-08-31 12:47:23 -0500 |
|---|---|---|
| committer | Bryan Bishop <kanzure@gmail.com> | 2013-08-31 12:47:23 -0500 |
| commit | 12c1d874b94cf51523b072477a59b0cc398fc8d3 (patch) | |
| tree | a3940230cf443d809780f8f7b19748f782b17fdd /constants.asm | |
| parent | 724215ea7519c28b602f72440e1ec73e2e6cf388 (diff) | |
| parent | c0a01c998240bacae77addbb08a5d2133cf58a21 (diff) | |
Merge branch 'master' into refactor-preprocessor
Conflicts:
preprocessor.py
Also bump the extras submodule to a version of pokemontools with a
suitable version of the preprocessor. The changes from 'master' for
preprocessor.py have been inserted into pokemontools prior to the
submodule bump.
Diffstat (limited to 'constants.asm')
| -rw-r--r-- | constants.asm | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/constants.asm b/constants.asm index e929a48f2..19049702e 100644 --- a/constants.asm +++ b/constants.asm @@ -13,6 +13,8 @@ INCLUDE "constants/map_constants.asm" INCLUDE "constants/item_constants.asm" INCLUDE "constants/trainer_constants.asm" INCLUDE "constants/script_constants.asm" +INCLUDE "constants/event_flags.asm" +INCLUDE "constants/engine_flags.asm" INCLUDE "constants/music_constants.asm" @@ -231,6 +233,7 @@ PREDEF_PRINT_MOVE_DESCRIPTION EQU $11 PREDEF_UPDATE_PLAYER_HUD EQU $12 PREDEF_FILL_BOX EQU $13 PREDEF_UPDATE_ENEMY_HUD EQU $15 +PREDEF_START_BATTLE EQU $16 PREDEF_FILL_IN_EXP_BAR EQU $17 PREDEF_FILLMOVES EQU $1B PREDEF_GET_GENDER EQU $24 @@ -243,6 +246,7 @@ PREDEF_PRINT_TYPE EQU $2B PREDEF_GET_UNOWN_LETTER EQU $2D PREDEF_LOAD_SGB_LAYOUT EQU $31 PREDEF_CHECK_CONTEST_MON EQU $33 +PREDEF_BATTLE_TRANSITION EQU $34 PREDEF_PARTYMON_ITEM_NAME EQU $3B PREDEF_DECOMPRESS EQU $40 |