diff options
| author | yenatch <yenatch@gmail.com> | 2017-12-23 17:14:09 -0500 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2017-12-23 17:14:09 -0500 |
| commit | c51968f0de6b8420c141dde27339e82a42837c5b (patch) | |
| tree | 782f2b25f21adacb48fd516694b8a82864fe0b99 /constants/misc_constants.asm | |
| parent | c883ab4d34ecb4890010e808d6b6d533f5d8ad56 (diff) | |
| parent | 878092004956418bfd77bfdb9fc9dd7f640f80d2 (diff) | |
Merge remote-tracking branch 'origin/master' into master
Diffstat (limited to 'constants/misc_constants.asm')
| -rw-r--r-- | constants/misc_constants.asm | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm index 7510fdf50..25032cc10 100644 --- a/constants/misc_constants.asm +++ b/constants/misc_constants.asm @@ -27,7 +27,7 @@ ITEM_NAME_LENGTH EQU 13 TRAINER_CLASS_NAME_LENGTH EQU 13 NAME_LENGTH_JAPANESE EQU 6 -; GetName types (see home.asm) +; GetName types (see home/names.asm) PKMN_NAME EQU 1 MOVE_NAME EQU 2 ; dummied out EQU 3 @@ -44,12 +44,13 @@ const_value set 5 const PRINTNUM_RIGHTALIGN_F ; 6 const PRINTNUM_LEADINGZEROS_F ; 7 +; PrintNum arguments (see engine/printnum.asm) PRINTNUM_MONEY EQU 1 << PRINTNUM_MONEY_F PRINTNUM_RIGHTALIGN EQU 1 << PRINTNUM_RIGHTALIGN_F PRINTNUM_LEADINGZEROS EQU 1 << PRINTNUM_LEADINGZEROS_F -; movement +; DoPlayerMovement.DoStep arguments (see engine/player_movement.asm) const_def const STEP_SLOW ; 0 const STEP_WALK ; 1 @@ -61,10 +62,16 @@ PRINTNUM_LEADINGZEROS EQU 1 << PRINTNUM_LEADINGZEROS_F const STEP_WALK_IN_PLACE ; 7 +; hMenuReturn HMENURETURN_SCRIPT EQU %10000000 HMENURETURN_ASM EQU %11111111 +; save file corruption check values +SAVE_CHECK_VALUE_1 EQU 99 +SAVE_CHECK_VALUE_2 EQU 127 + + ; time of day boundaries MORN_HOUR EQU 4 ; 4 AM DAY_HOUR EQU 10 ; 10 AM |