diff options
| author | Bryan Bishop <kanzure@gmail.com> | 2013-08-30 11:43:23 -0700 |
|---|---|---|
| committer | Bryan Bishop <kanzure@gmail.com> | 2013-08-30 11:43:23 -0700 |
| commit | a5f226246e068adf0ddabc8abe1afa868749162b (patch) | |
| tree | b2a055fcdf9f89c6d6d1c08e0adfa6c471e4423d /constants.asm | |
| parent | 9ce504f528a997b0d5bb1bd1c80fed91f9a8fa2a (diff) | |
| parent | 886ab6888409dc6ac0502c6866c74aade7d3568e (diff) | |
Merge pull request #175 from yenatch/rename-bittables
toss the useless "bittable" convention for event and engine flags
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 |