diff options
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/map_constants.asm | 32 | ||||
| -rw-r--r-- | constants/misc_constants.asm | 16 | ||||
| -rw-r--r-- | constants/wram_constants.asm | 13 |
3 files changed, 33 insertions, 28 deletions
diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 58dcf993f..8e04c5782 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -716,22 +716,22 @@ NUM_FRUIT_TREES EQU const_value +- 1 ; elevator floors ; used by `elevfloor` const_def - const _B4F - const _B3F - const _B2F - const _B1F - const _1F - const _2F - const _3F - const _4F - const _5F - const _6F - const _7F - const _8F - const _9F - const _10F - const _11F - const _ROOF + const FLOOR_B4F + const FLOOR_B3F + const FLOOR_B2F + const FLOOR_B1F + const FLOOR_1F + const FLOOR_2F + const FLOOR_3F + const FLOOR_4F + const FLOOR_5F + const FLOOR_6F + const FLOOR_7F + const FLOOR_8F + const FLOOR_9F + const FLOOR_10F + const FLOOR_11F + const FLOOR_ROOF ; command queue members CMDQUEUE_TYPE EQU 0 diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm index 6ae41e989..94244b481 100644 --- a/constants/misc_constants.asm +++ b/constants/misc_constants.asm @@ -50,14 +50,14 @@ NUM_HOF_TEAMS = 30 ; joypad const_def - const A_BUTTON_F - const B_BUTTON_F - const SELECT_F - const START_F - const D_RIGHT_F - const D_LEFT_F - const D_UP_F - const D_DOWN_F + const A_BUTTON_F ; 0 + const B_BUTTON_F ; 1 + const SELECT_F ; 2 + const START_F ; 3 + const D_RIGHT_F ; 4 + const D_LEFT_F ; 5 + const D_UP_F ; 6 + const D_DOWN_F ; 7 NO_INPUT EQU %00000000 A_BUTTON EQU 1 << A_BUTTON_F diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm index 424595ec4..ade157165 100644 --- a/constants/wram_constants.asm +++ b/constants/wram_constants.asm @@ -46,10 +46,15 @@ FACE_RIGHT EQU 1 ; TimeOfDay: ; d269 const_def - const MORN ; 0 - const DAY ; 1 - const NITE ; 2 - const DARKNESS ; 3 + const MORN_F ; 0 + const DAY_F ; 1 + const NITE_F ; 2 + const DARKNESS_F ; 3 + +MORN EQU 1 << MORN_F +DAY EQU 1 << DAY_F +NITE EQU 1 << NITE_F +DARKNESS EQU 1 << DARKNESS_F ; ScriptFlags: ; d434 SCRIPT_RUNNING EQU 2 |